From 1e8523aae655539f6c4c0d1ff4ca5c5c01ce3e4c Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 26 Nov 2014 14:24:19 +0100
Subject: [PATCH 0001/2920] Add Cookie helper class for cookie support
 detection

refs #7383
---
 library/Icinga/Web/Cookie.php | 79 +++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 library/Icinga/Web/Cookie.php

diff --git a/library/Icinga/Web/Cookie.php b/library/Icinga/Web/Cookie.php
new file mode 100644
index 000000000..888425151
--- /dev/null
+++ b/library/Icinga/Web/Cookie.php
@@ -0,0 +1,79 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Web;
+
+/**
+ * Helper Class Cookie
+ *
+ * @package Icinga\Web
+ */
+class Cookie
+{
+    /**
+     * The name of the control cookie
+     */
+    const CHECK_COOKIE = '_chc';
+
+    /**
+     * Check whether cookies are supported or not
+     *
+     * @return bool
+     */
+    public static function isSupported()
+    {
+        if (! empty($_COOKIE)) {
+            self::cleanupCheck();
+            return true;
+        }
+
+        if (isset($_REQUEST['_checkCookie']) && empty($_COOKIE)) {
+            return false;
+        }
+
+        if (! isset($_REQUEST['_checkCookie'])) {
+            self::provideCheck();
+        }
+
+        return false;
+    }
+
+    /**
+     * Redirect to a given uri
+     *
+     * @param string $uri
+     */
+    public static function redirect($uri)
+    {
+        header('location: ' . $uri);
+        exit(0);
+    }
+
+    /**
+     * Prepare check to detect cookie support
+     */
+    public static function provideCheck()
+    {
+        setcookie(self::CHECK_COOKIE, '1');
+
+        if (parse_url($_SERVER['REQUEST_URI'], PHP_URL_QUERY)) {
+            $requestUri = $_SERVER['REQUEST_URI'] . '&_checkCookie=1';
+        } else {
+            $requestUri = $_SERVER['REQUEST_URI'] . '?_checkCookie=1';
+        }
+
+        self::redirect($requestUri);
+    }
+
+    /**
+     * Cleanup the cookie support check
+     */
+    public static function cleanupCheck()
+    {
+        if (isset($_REQUEST['_checkCookie']) && isset($_COOKIE[self::CHECK_COOKIE])) {
+            $requestUri = preg_replace('/([&|\?]_checkCookie=1)/', '', $_SERVER['REQUEST_URI']);
+            self::redirect($requestUri);
+        }
+    }
+}

From d40e48cd8f9b873274c902978b0573a47025c134 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 26 Nov 2014 14:25:05 +0100
Subject: [PATCH 0002/2920] Add cookie support detection

refs #7383
---
 library/Icinga/Application/Web.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 37ec5138a..8c103e01c 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -12,6 +12,7 @@ use Icinga\Exception\ConfigurationError;
 use Icinga\Exception\NotReadableError;
 use Icinga\Application\Logger;
 use Icinga\Util\TimezoneDetect;
+use Icinga\Web\Cookie;
 use Icinga\Web\Request;
 use Icinga\Web\Response;
 use Icinga\Web\View;
@@ -91,6 +92,7 @@ class Web extends ApplicationBootstrap
     {
         return $this
             ->setupZendAutoloader()
+            ->detectCookieSupport()
             ->setupLogging()
             ->setupErrorHandling()
             ->loadConfig()
@@ -337,5 +339,20 @@ class Web extends ApplicationBootstrap
         );
         return $this;
     }
+
+    /**
+     * Check cookie support
+     *
+     * @return $this
+     */
+    protected function detectCookieSupport()
+    {
+        if (! Cookie::isSupported()) {
+            echo 'Cookies must be enabled to run this application.';
+            exit(1);
+        }
+
+        return $this;
+    }
 }
 // @codeCoverageIgnoreEnd

From 00a09284efa406c1f704a5a22048eeffe3f28505 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 12:28:23 +0100
Subject: [PATCH 0003/2920] lib: Add NonEmptyFileIterator

Add iterator for iterating over non-empty files.
---
 library/Icinga/File/NonEmptyFileIterator.php | 49 ++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 library/Icinga/File/NonEmptyFileIterator.php

diff --git a/library/Icinga/File/NonEmptyFileIterator.php b/library/Icinga/File/NonEmptyFileIterator.php
new file mode 100644
index 000000000..c5c7fda45
--- /dev/null
+++ b/library/Icinga/File/NonEmptyFileIterator.php
@@ -0,0 +1,49 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}
+
+namespace Icinga\File;
+
+use FilterIterator;
+
+/**
+ * Iterator over non-empty files
+ *
+ * Usage example:
+ * <code>
+ * <?php
+ *
+ * namespace Icinga\Example;
+ *
+ * use RecursiveDirectoryIterator;
+ * use RecursiveIteratorIterator;
+ * use Icinga\File\NonEmptyFilterIterator;
+ *
+ * $nonEmptyFiles = new NonEmptyFileIterator(
+ *     new RecursiveIteratorIterator(
+ *         new RecursiveDirectoryIterator(__DIR__),
+ *         RecursiveIteratorIterator::SELF_FIRST
+ *     )
+ * );
+ * </code>
+ */
+class NonEmptyFileIterator extends FilterIterator
+{
+    /**
+     * Accept non-empty files
+     *
+     * @return bool Whether the current element of the iterator is acceptable
+     *              through this filter
+     */
+    public function accept()
+    {
+        $current = $this->current();
+        /** @type $current \SplFileInfo */
+        if (! $current->isFile()
+            || $current->getSize() === 0
+        ) {
+            return false;
+        }
+        return true;
+    }
+}

From 1afc2a0b1dd86469c124d90b9913fd72a3c5ff94 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 12:28:49 +0100
Subject: [PATCH 0004/2920] lib: Add FileExtensionFilterIterator

Add iterator for iterating over files having a specific file extension.
---
 .../File/FileExtensionFilterIterator.php      | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 library/Icinga/File/FileExtensionFilterIterator.php

diff --git a/library/Icinga/File/FileExtensionFilterIterator.php b/library/Icinga/File/FileExtensionFilterIterator.php
new file mode 100644
index 000000000..909156749
--- /dev/null
+++ b/library/Icinga/File/FileExtensionFilterIterator.php
@@ -0,0 +1,71 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\File;
+
+use FilterIterator;
+use Iterator;
+
+/**
+ * Iterator over files having a specific file extension
+ *
+ * Usage example:
+ * <code>
+ * <?php
+ *
+ * namespace Icinga\Example;
+ *
+ * use RecursiveDirectoryIterator;
+ * use RecursiveIteratorIterator;
+ * use Icinga\File\FileExtensionFilterIterator;
+ *
+ * $markdownFiles = new FileExtensionFilterIterator(
+ *     new RecursiveIteratorIterator(
+ *         new RecursiveDirectoryIterator(__DIR__),
+ *         RecursiveIteratorIterator::SELF_FIRST
+ *     ),
+ *     'md'
+ * );
+ * </code>
+ */
+class FileExtensionFilterIterator extends FilterIterator
+{
+    /**
+     * The extension to filter for
+     *
+     * @type string
+     */
+    protected $extension;
+
+    /**
+     * Create a new FileExtensionFilterIterator
+     *
+     * @param Iterator  $iterator   Apply filter to this iterator
+     * @param string    $extension  The file extension to filter for. The file extension may not contain the leading dot
+     */
+    public function __construct(Iterator $iterator, $extension)
+    {
+        $this->extension = '.' . ltrim(strtolower((string) $extension), '.');
+        parent::__construct($iterator);
+    }
+
+    /**
+     * Accept files which match the file extension to filter for
+     *
+     * @return bool Whether the current element of the iterator is acceptable
+     *              through this filter
+     */
+    public function accept()
+    {
+        $current = $this->current();
+        /* @var $current \SplFileInfo */
+        if (! $current->isFile()) {
+            return false;
+        }
+        // SplFileInfo::getExtension() is only available since PHP 5 >= 5.3.6
+        $filename = $current->getFilename();
+        $sfx = substr($filename, -strlen($this->extension));
+        return $sfx === false ? false : strtolower($sfx) === $this->extension;
+    }
+}

From 5f772c36202422162ab4e40884f0b9a79759c040 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 12:29:48 +0100
Subject: [PATCH 0005/2920] doc: Use Icinga Web 2's iterators

---
 modules/doc/library/Doc/DocIterator.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/doc/library/Doc/DocIterator.php b/modules/doc/library/Doc/DocIterator.php
index 43a9c7727..3045b6309 100644
--- a/modules/doc/library/Doc/DocIterator.php
+++ b/modules/doc/library/Doc/DocIterator.php
@@ -9,6 +9,8 @@ use Countable;
 use IteratorAggregate;
 use RecursiveIteratorIterator;
 use RecursiveDirectoryIterator;
+use Icinga\File\NonEmptyFileIterator;
+use Icinga\File\FileExtensionFilterIterator;
 
 /**
  * Iterator over non-empty Markdown files ordered by the case insensitive "natural order" of file names
@@ -29,12 +31,14 @@ class DocIterator implements Countable, IteratorAggregate
      */
     public function __construct($path)
     {
-        $it = new RecursiveIteratorIterator(
+        $it = new FileExtensionFilterIterator(
             new NonEmptyFileIterator(
-                new MarkdownFileIterator(
-                    new RecursiveDirectoryIterator($path)
+                new RecursiveIteratorIterator(
+                    new RecursiveDirectoryIterator($path),
+                    RecursiveIteratorIterator::SELF_FIRST
                 )
-            )
+            ),
+            'md'
         );
         // Unfortunately we have no chance to sort the iterator
         $fileInfo = iterator_to_array($it);

From 001eba73e73e83b53ac5ff344f3ab64622834109 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 12:30:08 +0100
Subject: [PATCH 0006/2920] doc: Remove iterators because they are superseded
 by iterators from Icinga Web 2's library

---
 .../doc/library/Doc/MarkdownFileIterator.php  | 31 -------------------
 .../doc/library/Doc/NonEmptyFileIterator.php  | 31 -------------------
 2 files changed, 62 deletions(-)
 delete mode 100644 modules/doc/library/Doc/MarkdownFileIterator.php
 delete mode 100644 modules/doc/library/Doc/NonEmptyFileIterator.php

diff --git a/modules/doc/library/Doc/MarkdownFileIterator.php b/modules/doc/library/Doc/MarkdownFileIterator.php
deleted file mode 100644
index 6f317ce6a..000000000
--- a/modules/doc/library/Doc/MarkdownFileIterator.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Doc;
-
-use RecursiveFilterIterator;
-
-/**
- * Recursive iterator over Markdown files
- */
-class MarkdownFileIterator extends RecursiveFilterIterator
-{
-    /**
-     * Accept files with '.md' suffix
-     *
-     * @return bool Whether the current element of the iterator is acceptable
-     *              through this filter
-     */
-    public function accept()
-    {
-        $current = $this->getInnerIterator()->current();
-        /* @var $current \SplFileInfo */
-        if (! $current->isFile()) {
-            return false;
-        }
-        $filename = $current->getFilename();
-        $sfx = substr($filename, -3);
-        return $sfx === false ? false : strtolower($sfx) === '.md';
-    }
-}
diff --git a/modules/doc/library/Doc/NonEmptyFileIterator.php b/modules/doc/library/Doc/NonEmptyFileIterator.php
deleted file mode 100644
index 71bf5acfa..000000000
--- a/modules/doc/library/Doc/NonEmptyFileIterator.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}
-
-namespace Icinga\Module\Doc;
-
-use RecursiveFilterIterator;
-
-/**
- * Recursive iterator over non-empty files
- */
-class NonEmptyFileIterator extends RecursiveFilterIterator
-{
-    /**
-     * Accept non-empty files
-     *
-     * @return bool Whether the current element of the iterator is acceptable
-     *              through this filter
-     */
-    public function accept()
-    {
-        $current = $this->getInnerIterator()->current();
-        /* @var $current \SplFileInfo */
-        if (! $current->isFile()
-            || $current->getSize() === 0
-        ) {
-            return false;
-        }
-        return true;
-    }
-}

From ca8dbdb9386e8a23ae246eac3f532039c31dd31c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 12:50:29 +0100
Subject: [PATCH 0007/2920] doc: Make path to Icinga Web 2's doc configureable

refs #7196
---
 .../controllers/IcingawebController.php            | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/doc/application/controllers/IcingawebController.php b/modules/doc/application/controllers/IcingawebController.php
index 5740f50a9..d052d8268 100644
--- a/modules/doc/application/controllers/IcingawebController.php
+++ b/modules/doc/application/controllers/IcingawebController.php
@@ -8,12 +8,20 @@ use Icinga\Module\Doc\DocController;
 
 class Doc_IcingawebController extends DocController
 {
+    /**
+     * Get the path to Icinga Web 2's documentation
+     */
+    protected function getDocPath()
+    {
+        return $this->Config()->get('documentation', 'path', Icinga::app()->getBaseDir('doc'));
+    }
+
     /**
      * View the toc of Icinga Web 2's documentation
      */
     public function tocAction()
     {
-        return $this->renderToc(Icinga::app()->getApplicationDir('/../doc'), 'Icinga Web 2', 'doc/icingaweb/chapter');
+        return $this->renderToc($this->getDocPath(), 'Icinga Web 2', 'doc/icingaweb/chapter');
     }
 
     /**
@@ -31,7 +39,7 @@ class Doc_IcingawebController extends DocController
             );
         }
         return $this->renderChapter(
-            Icinga::app()->getApplicationDir('/../doc'),
+            $this->getDocPath(),
             $chapterId,
             'doc/icingaweb/toc',
             'doc/icingaweb/chapter'
@@ -43,6 +51,6 @@ class Doc_IcingawebController extends DocController
      */
     public function pdfAction()
     {
-        return $this->renderPdf(Icinga::app()->getApplicationDir('/../doc'), 'Icinga Web 2', 'doc/icingaweb/chapter');
+        return $this->renderPdf($this->getDocPath(), 'Icinga Web 2', 'doc/icingaweb/chapter');
     }
 }

From cc619e0a7b8c1d27d14ababa3f5cc6d921b8f59e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 12:53:44 +0100
Subject: [PATCH 0008/2920] doc/configuration.php: Prefer @type over @var

---
 modules/doc/configuration.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/doc/configuration.php b/modules/doc/configuration.php
index 87e5da77a..6e924e964 100644
--- a/modules/doc/configuration.php
+++ b/modules/doc/configuration.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-/* @var $this \Icinga\Application\Modules\Module */
+/** @type $this \Icinga\Application\Modules\Module */
 
 $section = $this->menuSection($this->translate('Documentation'), array(
     'title'    => 'Documentation',

From da575910e6c844067adb37c6bccb143266ea029f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 12:54:41 +0100
Subject: [PATCH 0009/2920] doc/run.php: Remove superfluous newline

---
 modules/doc/run.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/doc/run.php b/modules/doc/run.php
index 7392e4c22..31aff8ff0 100644
--- a/modules/doc/run.php
+++ b/modules/doc/run.php
@@ -47,4 +47,3 @@ $this->addRoute('doc/module/chapter', $docModuleChapter);
 $this->addRoute('doc/icingaweb/chapter', $docIcingaWebChapter);
 $this->addRoute('doc/module/toc', $docModuleToc);
 $this->addRoute('doc/module/pdf', $docModulePdf);
-

From 19d89f0a67de95ce5314dd6a15d39b0917d05597 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 12:55:12 +0100
Subject: [PATCH 0010/2920] monitoring/configuration.php: Prefer @type over
 @var

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

diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index d61e32858..b1cdee2de 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-/** @var $this \Icinga\Application\Modules\Module */
+/** @type $this \Icinga\Application\Modules\Module */
 
 $this->providePermission(
     'monitoring/command/*',

From 51b47df4c5bb67337e333a505e330e59ac878fe3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 12:55:29 +0100
Subject: [PATCH 0011/2920] doc: Set version to 2.0.0

---
 modules/doc/module.info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/doc/module.info b/modules/doc/module.info
index 2826d72de..1689fd940 100644
--- a/modules/doc/module.info
+++ b/modules/doc/module.info
@@ -1,4 +1,4 @@
 Module: doc
-Version: 2.0.0~alpha4
+Version: 2.0.0
 Description: Documentation module
  Extracts, shows and exports documentation for Icinga Web 2 and it's modules.

From 7edb1217c6ac936e1a351eb2a76caaa44404aa0d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 12:57:16 +0100
Subject: [PATCH 0012/2920] doc: Use sprintf for "Missing parameter x"
 exceptions

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

diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php
index 1e9cf43b1..adc46a991 100644
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@@ -37,7 +37,7 @@ class Doc_ModuleController extends DocController
     {
         if (empty($moduleName)) {
             throw new Zend_Controller_Action_Exception(
-                $this->translate('Missing parameter \'moduleName\''),
+                sprintf($this->translate('Missing parameter \'%s\''), 'moduleName'),
                 404
             );
         }

From 40b709848005098f6a0e20db27392f2326101f9d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 14:24:11 +0100
Subject: [PATCH 0013/2920] doc/parser: Fix PHPDoc indentation

---
 modules/doc/library/Doc/DocParser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/doc/library/Doc/DocParser.php b/modules/doc/library/Doc/DocParser.php
index c63532dc1..6cfeca418 100644
--- a/modules/doc/library/Doc/DocParser.php
+++ b/modules/doc/library/Doc/DocParser.php
@@ -31,7 +31,7 @@ class DocParser
     /**
      * Create a new documentation parser for the given path
      *
-     * @param   string $path Path to the documentation
+     * @param   string $path        Path to the documentation
      *
      * @throws  DocException        If the documentation directory does not exist
      * @throws  NotReadableError    If the documentation directory is not readable

From 823d338f73cd1470315bffb5c4d83f8728e2de93 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 14:24:45 +0100
Subject: [PATCH 0014/2920] doc/Controller: Do not use 'void' results

---
 modules/doc/library/Doc/DocController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/doc/library/Doc/DocController.php b/modules/doc/library/Doc/DocController.php
index bc782953f..0d12f58df 100644
--- a/modules/doc/library/Doc/DocController.php
+++ b/modules/doc/library/Doc/DocController.php
@@ -28,7 +28,7 @@ class DocController extends ModuleActionController
             $urlParams
         );
         $this->view->title = $chapterId;
-        return $this->render('chapter', null, true);
+        $this->render('chapter', null, true);
     }
 
     /**
@@ -46,7 +46,7 @@ class DocController extends ModuleActionController
         $name = ucfirst($name);
         $this->view->docName = $name;
         $this->view->title = sprintf($this->translate('%s Documentation'), $name);
-        return $this->render('toc', null, true);
+        $this->render('toc', null, true);
     }
 
     /**
@@ -71,6 +71,6 @@ class DocController extends ModuleActionController
         );
         $this->view->docName = $name;
         $this->_request->setParam('format', 'pdf');
-        return $this->render('pdf', null, true);
+        $this->render('pdf', null, true);
     }
 }

From 08bbe596790285aa7eee78a75f0b8df05a774e3d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 14:27:02 +0100
Subject: [PATCH 0015/2920] doc: Throw an exception if Icinga Web 2's
 documentation is not avaiable

refs #7196
---
 .../controllers/IcingawebController.php       | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/modules/doc/application/controllers/IcingawebController.php b/modules/doc/application/controllers/IcingawebController.php
index d052d8268..b989bc883 100644
--- a/modules/doc/application/controllers/IcingawebController.php
+++ b/modules/doc/application/controllers/IcingawebController.php
@@ -10,10 +10,26 @@ class Doc_IcingawebController extends DocController
 {
     /**
      * Get the path to Icinga Web 2's documentation
+     *
+     * @return  string
+     *
+     * @throws  Zend_Controller_Action_Exception    If Icinga Web 2's documentation is not available
      */
-    protected function getDocPath()
+    protected function getPath()
     {
-        return $this->Config()->get('documentation', 'path', Icinga::app()->getBaseDir('doc'));
+        if (($path = $this->Config()->get('documentation', 'icingaweb2')) !== null) {
+            if (is_dir($path)) {
+                return $path;
+            }
+        }
+        $path = Icinga::app()->getBaseDir('doc');
+        if (is_dir($path)) {
+            return $path;
+        }
+        throw new Zend_Controller_Action_Exception(
+            $this->translate('Documentation for Icinga Web 2 is not available'),
+            404
+        );
     }
 
     /**
@@ -21,7 +37,7 @@ class Doc_IcingawebController extends DocController
      */
     public function tocAction()
     {
-        return $this->renderToc($this->getDocPath(), 'Icinga Web 2', 'doc/icingaweb/chapter');
+        return $this->renderToc($this->getPath(), 'Icinga Web 2', 'doc/icingaweb/chapter');
     }
 
     /**
@@ -39,7 +55,7 @@ class Doc_IcingawebController extends DocController
             );
         }
         return $this->renderChapter(
-            $this->getDocPath(),
+            $this->getPath(),
             $chapterId,
             'doc/icingaweb/toc',
             'doc/icingaweb/chapter'
@@ -51,6 +67,6 @@ class Doc_IcingawebController extends DocController
      */
     public function pdfAction()
     {
-        return $this->renderPdf($this->getDocPath(), 'Icinga Web 2', 'doc/icingaweb/chapter');
+        return $this->renderPdf($this->getPath(), 'Icinga Web 2', 'doc/icingaweb/chapter');
     }
 }

From 7605076dc525832eea119eb2520abe22f8cf7a64 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 14:28:10 +0100
Subject: [PATCH 0016/2920] doc/IcingawebController: Use sprintf for "Missing
 parameter x" exceptions

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

diff --git a/modules/doc/application/controllers/IcingawebController.php b/modules/doc/application/controllers/IcingawebController.php
index b989bc883..b51c126ae 100644
--- a/modules/doc/application/controllers/IcingawebController.php
+++ b/modules/doc/application/controllers/IcingawebController.php
@@ -50,7 +50,7 @@ class Doc_IcingawebController extends DocController
         $chapterId = $this->getParam('chapterId');
         if ($chapterId === null) {
             throw new Zend_Controller_Action_Exception(
-                $this->translate('Missing parameter \'chapterId\''),
+                sprintf($this->translate('Missing parameter \'%s\''), 'chapterId'),
                 404
             );
         }

From e901e545c3b78e376bb653dcf446b0415ed56100 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 14:28:58 +0100
Subject: [PATCH 0017/2920] doc/IcingawebController: Do not use 'void' results

---
 modules/doc/application/controllers/IcingawebController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/doc/application/controllers/IcingawebController.php b/modules/doc/application/controllers/IcingawebController.php
index b51c126ae..c07b65798 100644
--- a/modules/doc/application/controllers/IcingawebController.php
+++ b/modules/doc/application/controllers/IcingawebController.php
@@ -37,7 +37,7 @@ class Doc_IcingawebController extends DocController
      */
     public function tocAction()
     {
-        return $this->renderToc($this->getPath(), 'Icinga Web 2', 'doc/icingaweb/chapter');
+        $this->renderToc($this->getPath(), 'Icinga Web 2', 'doc/icingaweb/chapter');
     }
 
     /**
@@ -54,7 +54,7 @@ class Doc_IcingawebController extends DocController
                 404
             );
         }
-        return $this->renderChapter(
+        $this->renderChapter(
             $this->getPath(),
             $chapterId,
             'doc/icingaweb/toc',
@@ -67,6 +67,6 @@ class Doc_IcingawebController extends DocController
      */
     public function pdfAction()
     {
-        return $this->renderPdf($this->getPath(), 'Icinga Web 2', 'doc/icingaweb/chapter');
+        $this->renderPdf($this->getPath(), 'Icinga Web 2', 'doc/icingaweb/chapter');
     }
 }

From c7e6252acab649bb0a2f21a296cb13255b36dfa5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 14:30:10 +0100
Subject: [PATCH 0018/2920] doc: Make path to module documentations
 configureable

refs #7196
---
 .../controllers/ModuleController.php          | 81 +++++++++++++------
 1 file changed, 56 insertions(+), 25 deletions(-)

diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php
index adc46a991..12c4a9246 100644
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@@ -9,6 +9,40 @@ use Icinga\Module\Doc\Exception\DocException;
 
 class Doc_ModuleController extends DocController
 {
+    /**
+     * Get the path to a module documentation
+     *
+     * @param   string  $module                     The name of the module
+     * @param   string  $default                    The default path
+     * @param   bool    $suppressErrors             Whether to not throw an exception if the module documentation is not
+     *                                              available
+     *
+     * @return  string|null                         Path to the documentation or null if the module documentation is not
+     *                                              available and errors are suppressed
+     *
+     * @throws  Zend_Controller_Action_Exception    If the module documentation is not available and errors are not
+     *                                              suppressed
+     */
+    protected function getPath($module, $default, $suppressErrors = false)
+    {
+        if (($path = $this->Config()->get('documentation', 'modules')) !== null) {
+            $path = str_replace('{module}', $module, $path);
+            if (is_dir($path)) {
+                return $path;
+            }
+        }
+        if (is_dir($default)) {
+            return $default;
+        }
+        if ($suppressErrors) {
+            return null;
+        }
+        throw new Zend_Controller_Action_Exception(
+            sprintf($this->translate('Documentation for module \'%s\' is not available'), $module),
+            404
+        );
+    }
+
     /**
      * List modules which are enabled and having the 'doc' directory
      */
@@ -16,10 +50,10 @@ class Doc_ModuleController extends DocController
     {
         $moduleManager = Icinga::app()->getModuleManager();
         $modules = array();
-        foreach (Icinga::app()->getModuleManager()->listEnabledModules() as $enabledModule) {
-            $docDir = $moduleManager->getModuleDir($enabledModule, '/doc');
-            if (is_dir($docDir)) {
-                $modules[] = $enabledModule;
+        foreach (Icinga::app()->getModuleManager()->listEnabledModules() as $module) {
+            $path = $this->getPath($module, $moduleManager->getModuleDir($module, '/doc'), true);
+            if ($path !== null) {
+                $modules[] = $module;
             }
         }
         $this->view->modules = $modules;
@@ -63,16 +97,15 @@ class Doc_ModuleController extends DocController
      */
     public function tocAction()
     {
-        $moduleName = $this->getParam('moduleName');
-        $this->assertModuleEnabled($moduleName);
-        $this->view->moduleName = $moduleName;
-        $moduleManager = Icinga::app()->getModuleManager();
+        $module = $this->getParam('moduleName');
+        $this->assertModuleEnabled($module);
+        $this->view->moduleName = $module;
         try {
             return $this->renderToc(
-                $moduleManager->getModuleDir($moduleName, '/doc'),
-                $moduleName,
+                $this->getPath($module, Icinga::app()->getModuleManager()->getModuleDir($module, '/doc')),
+                $module,
                 'doc/module/chapter',
-                array('moduleName' => $moduleName)
+                array('moduleName' => $module)
             );
         } catch (DocException $e) {
             throw new Zend_Controller_Action_Exception($e->getMessage(), 404);
@@ -88,24 +121,23 @@ class Doc_ModuleController extends DocController
      */
     public function chapterAction()
     {
-        $moduleName = $this->getParam('moduleName');
-        $this->assertModuleEnabled($moduleName);
+        $module = $this->getParam('moduleName');
+        $this->assertModuleEnabled($module);
         $chapterId = $this->getParam('chapterId');
         if ($chapterId === null) {
             throw new Zend_Controller_Action_Exception(
-                $this->translate('Missing parameter \'chapterId\''),
+                sprintf($this->translate('Missing parameter \'%s\''), 'chapterId'),
                 404
             );
         }
-        $this->view->moduleName = $moduleName;
-        $moduleManager = Icinga::app()->getModuleManager();
+        $this->view->moduleName = $module;
         try {
             return $this->renderChapter(
-                $moduleManager->getModuleDir($moduleName, '/doc'),
+                $this->getPath($module, Icinga::app()->getModuleManager()->getModuleDir($module, '/doc')),
                 $chapterId,
-                $this->_helper->url->url(array('moduleName' => $moduleName), 'doc/module/toc'),
+                $this->_helper->url->url(array('moduleName' => $module), 'doc/module/toc'),
                 'doc/module/chapter',
-                array('moduleName' => $moduleName)
+                array('moduleName' => $module)
             );
         } catch (DocException $e) {
             throw new Zend_Controller_Action_Exception($e->getMessage(), 404);
@@ -119,14 +151,13 @@ class Doc_ModuleController extends DocController
      */
     public function pdfAction()
     {
-        $moduleName = $this->getParam('moduleName');
-        $this->assertModuleEnabled($moduleName);
-        $moduleManager = Icinga::app()->getModuleManager();
+        $module = $this->getParam('moduleName');
+        $this->assertModuleEnabled($module);
         return $this->renderPdf(
-            $moduleManager->getModuleDir($moduleName, '/doc'),
-            $moduleName,
+            $this->getPath($module, Icinga::app()->getModuleManager()->getModuleDir($module, '/doc')),
+            $module,
             'doc/module/chapter',
-            array('moduleName' => $moduleName)
+            array('moduleName' => $module)
         );
     }
 }

From 3120a0c090b7d54775cef12d93c772e2835fc122 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 14:30:57 +0100
Subject: [PATCH 0019/2920] doc/ModuleController: Do not use 'void' results

---
 modules/doc/application/controllers/ModuleController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php
index 12c4a9246..cf9ddea16 100644
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@@ -101,7 +101,7 @@ class Doc_ModuleController extends DocController
         $this->assertModuleEnabled($module);
         $this->view->moduleName = $module;
         try {
-            return $this->renderToc(
+            $this->renderToc(
                 $this->getPath($module, Icinga::app()->getModuleManager()->getModuleDir($module, '/doc')),
                 $module,
                 'doc/module/chapter',
@@ -132,7 +132,7 @@ class Doc_ModuleController extends DocController
         }
         $this->view->moduleName = $module;
         try {
-            return $this->renderChapter(
+            $this->renderChapter(
                 $this->getPath($module, Icinga::app()->getModuleManager()->getModuleDir($module, '/doc')),
                 $chapterId,
                 $this->_helper->url->url(array('moduleName' => $module), 'doc/module/toc'),
@@ -153,7 +153,7 @@ class Doc_ModuleController extends DocController
     {
         $module = $this->getParam('moduleName');
         $this->assertModuleEnabled($module);
-        return $this->renderPdf(
+        $this->renderPdf(
             $this->getPath($module, Icinga::app()->getModuleManager()->getModuleDir($module, '/doc')),
             $module,
             'doc/module/chapter',

From d2a7254a37ebdeefd3b176d69f66fc54582591a6 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 14:55:24 +0100
Subject: [PATCH 0020/2920] doc: Prefer "root" doc path over configured path

If the "root" doc path, i.e. application/doc exists, it is preferred over the configured
one.

refs #4075
---
 .../doc/application/controllers/IcingawebController.php   | 8 ++++----
 modules/doc/application/controllers/ModuleController.php  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/doc/application/controllers/IcingawebController.php b/modules/doc/application/controllers/IcingawebController.php
index c07b65798..60c5da5ee 100644
--- a/modules/doc/application/controllers/IcingawebController.php
+++ b/modules/doc/application/controllers/IcingawebController.php
@@ -17,15 +17,15 @@ class Doc_IcingawebController extends DocController
      */
     protected function getPath()
     {
+        $path = Icinga::app()->getBaseDir('doc');
+        if (is_dir($path)) {
+            return $path;
+        }
         if (($path = $this->Config()->get('documentation', 'icingaweb2')) !== null) {
             if (is_dir($path)) {
                 return $path;
             }
         }
-        $path = Icinga::app()->getBaseDir('doc');
-        if (is_dir($path)) {
-            return $path;
-        }
         throw new Zend_Controller_Action_Exception(
             $this->translate('Documentation for Icinga Web 2 is not available'),
             404
diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php
index cf9ddea16..a4d14cf61 100644
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@@ -25,15 +25,15 @@ class Doc_ModuleController extends DocController
      */
     protected function getPath($module, $default, $suppressErrors = false)
     {
+        if (is_dir($default)) {
+            return $default;
+        }
         if (($path = $this->Config()->get('documentation', 'modules')) !== null) {
             $path = str_replace('{module}', $module, $path);
             if (is_dir($path)) {
                 return $path;
             }
         }
-        if (is_dir($default)) {
-            return $default;
-        }
         if ($suppressErrors) {
             return null;
         }

From bca2335aa341836f1c102a8ba7e3bcf90755590c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 14:58:18 +0100
Subject: [PATCH 0021/2920] doc: Add module documentation

---
 modules/doc/doc/1-module-documentation.md |  59 ++++++++++++++++++++++
 modules/doc/public/img/doc/markdown.png   | Bin 0 -> 2180 bytes
 2 files changed, 59 insertions(+)
 create mode 100644 modules/doc/doc/1-module-documentation.md
 create mode 100644 modules/doc/public/img/doc/markdown.png

diff --git a/modules/doc/doc/1-module-documentation.md b/modules/doc/doc/1-module-documentation.md
new file mode 100644
index 000000000..968dd32d7
--- /dev/null
+++ b/modules/doc/doc/1-module-documentation.md
@@ -0,0 +1,59 @@
+# <a id="module-documentation"></a> Writing Module Documentation
+
+![Markdown](/img/doc/doc/markdown.png)
+
+Icinga Web 2 is capable of viewing your module's documentation, if the documentation is written in
+[Markdown](http://en.wikipedia.org/wiki/Markdown). Please refer to
+[Markdown Syntax Documentation](http://daringfireball.net/projects/markdown/syntax) for Markdown's formatting syntax.
+
+## <a id="location"></a> Where to Put Module Documentation?
+
+By default, your module's Markdown documentation files must be placed in the `doc` directory beneath your module's root
+directory, e.g.:
+
+    example-module/doc
+
+## <a id="chapters"></a> Chapters
+
+Each Markdown documentation file represents a chapter of your module's documentation. The first found heading inside
+each file is the chapter's title. The order of chapters is based on the case insensitive "Natural Order" of your files'
+names. <dfn>Natural Order</dfn> means that the file names are ordered in the way which seems natural to humans.
+It is best practice to prefix Markdown documentation file names with numbers to ensure that they appear in the correct
+order, e.g.:
+
+    1-about.md
+    2-installation.md
+    3-configuration.md
+
+## <a id="toc"></a> Table Of Contents
+
+The table of contents for your module's documentation is auto-generated based on all found headings inside each
+Markdown documentation file.
+
+## <a id="linking"></a> Linking Between Headings
+
+For linking between headings, place an anchor where you want to link to, e.g.:
+
+    # <a id="heading"></a> Heading
+
+Now you can reference the anchor either in the same or **in another** Markdown documentation file, e.g.:
+
+    This is a link to [Heading](#heading).
+
+## <a id="images"></a> Including Images
+
+Images must placed in the `img` directory beneath your module's `public` directory, e.g.:
+
+    example-module/public/img/doc
+
+Module images can be accessed using the following URL:
+
+    {baseURL}/img/{moduleName}/{file} e.g. icingaweb/img/example-module/doc/example.png
+
+Markdown's image syntax is very similar to Markdown's link syntax, but prefixed with an exclamation mark, e.g.:
+
+    ![Alt text](http://path/to/img.png "Optional Title")
+
+URLs to images inside your Markdown documentation files must be specified without the base URL, e.g.:
+
+    ![Example](/img/example-module/doc/example.png)
diff --git a/modules/doc/public/img/doc/markdown.png b/modules/doc/public/img/doc/markdown.png
new file mode 100644
index 0000000000000000000000000000000000000000..93e729bc77ca37a36b97509e4cd552e1033973f9
GIT binary patch
literal 2180
zcmaJ@3pCSxAD^wcY}Rs*WtD5G;fWbxQ?n;Z>?w^%R6I%eyW|avwnDTzlpgZBtwM^W
z$&fc$p0XlZVkGpJ%9=})+uYyj>FGV^J@0wX@BDth^Z8yr-|z2ozQ11@)qNKVp@)D#
zAShQC=Y8^7DDMnqMfn(SHgsM-DIVRk%Neq~(%AL4Ga(RVJ6Go&p0RnOeIBWSURr{2
zV9NH=6SaIdWsU6zYpF*>w^r?SPJ8+5^CpE~4C*p6D4tIbHc`%DUNAB?veYywr;e#^
zaz?4Cq&-PC+*Haou<j=Bj>xvm2{sx1AYzT)DwFiqExY&4%=43HC+dds?#|>&h%xi^
zx;6p^oiWdh=I8VE`M9QZo$(Po7!<HxhLi3Gjls`#=seEs{As8TQ;BJH0)H{|4?8Ii
zRF^iJ6oPM99#QOK`~Y5wNJ$z@`p7dsw5R3G9C6o~mTgPw;m0FE*dUCOv|i)z<^H*T
zakrQOK+v7#E`h8(<3|Wb!orgQFE)~&9^z$GnM_o1KrJJMt{@QHZgMmd6}vtn;rO_c
zKV?9T+XH_L9nccn4xozO`O=IkgFf^9ATw%&wt3wMZ0zZ&tCVJ2itX*QI}T|R5z^LF
zw9F?z(fOZonsltW!lPgZS<c11sa1gq#_`yISFzHBDT&Sri9@y9f<Bls4!*(LuQ?&M
z3C*b``YtpcHT~dyCCmoaU$w6G!BR%eCWmcWpQ9a3oD8<zgrpf!8P4jPoD5VnH(XhT
z$Z&zeU5uDeqpMB|>aOhnQsZFP=G)5(%X|~By~=Fx_lO@0<IwhgN)#@mdVSe#o-^tp
z!?Q-iTtYObewCOJk)GWL<%Nf2Q}?GGcKpJvaa9yUWT=RnPW4>(H6fcjZ<{(!+q{M7
zL%a|jm|;W^eX>Z<Z=%nJHTq5Y#6?j29P<OuW9hkP7(OVi-6)hp!4J5)l;pX|&RQCK
z6%{|SSHY*;hn(C_hNYXnWefT>+2pb&>WxVuf6&!N%q75st9Gx}3Q_&xzMt`HSqJro
z=%-qo`Uky~8XXLd8(}89bD>p%pY+T+uzIl$FBBc8OCTI?yA%ZPf+E(Vaz}doW~Y<1
zX6lV+Kiz{{drp-KLw>pkdUMIiS$`+v#&ciXRrd<waRg(Q=e>?z5=^O#DOo^RZ*8I8
zn39t$x64;()pZw=%nK<6kNl+3e3*sOdh~bFR-Jm$nF9xz(E1$M5aT54{a2{h_-um5
z*pMM*Y^a?KloXT@o!8nscnXD1qV_Gq*X9~?3AHgBx5Uc)<1OEMZGZ>U<7{6jW}-44
zCu#gV*-1_ISDtx5^4Dr}r{*u8E_V#_k#Hg)i9hn2Z#rPJI({T93Mgt*{`&UNvsduX
z6>9z0^WO{=g$R!UnR$(^OeBApgWT8=!K7xMD$lkUSUqunHu{krPhb%(-@D)M@dS_^
z@79xSB?80v@7rlJ3*qURsglq4EH>5lf{`b91>MqLwvo{Ig8SE?`z7|U5gl1g7AGMK
zAaY(;bgIhSlLfb?=4^7&MlWBHFPm;H=6B4EDTZsxW}1eZKD-a<tLTgbbD%MC2R&c{
zb?o|y3F@%QyDI*=sm`@#<^OV{wI*`H6%zf})uQ2N6kxNQrPVYv6B^y=6;&GWuw>_G
zBF7ze){N?3Hl+mm>0)){4D%{1oTXPnaSEa(MUgXqnTs6JD&<c17{1RHBZO*EXf2xj
zI!<B+w@NFZF(RMkRsFf+<5Wi0bG)ZF!CKl5TtY)Dv`cxD@j<`Q-4Q~B{0?!uMExlc
zg)`7XuZ=#{hn0wj!AL4Y<f3a98g=@DXt7DA8u7rX^<mdukhwFR39V`>A;X7-0p&3b
zTyyPGyO}!gaytCE(LYMpSXr-~5CY`_WJmr<$HVsl1IhJM3_j5_RbTH?+!sPh7ml>q
z_f)wiTRH2-PKn=R$0^L8@3IOzaNB7JYS965^17O&NfDrG;hPv0`kK3sVSvM!g>IL#
zihy#FTo|?@w6VmR6{(_{9Hud4omqvB691u{3OzzgPnVT2qXgP0j`Xlb?7i7Z<*~~W
zvV}fIpmA^{<LVVro1Fg(j#T^ubOU$fn(xMKlRZG%e?TwLCO7+`=>_iLNcbN<{eUE^
z&}U^G8;+L<zn1tWhJ>%=m6x--fhz~VUtnK@2uGsJ9%{8-hkkt7G3QtF>2{~K{ucQ2
zoI6v<mYRjC-kZmYA$C^0M5RF-iSt(|H_rP%Q*b1#JXTJ@g&O=8kCKl{e7dq}9~#qj
z^*~FmDl7K)W(q*i)xNX)e-y+2Q!9@`i~71(ifqCKsm3|&ns6HHxyUZeVT`9A5bhxB
zO?j3Ynu}hWPS+jLX{6iGa}1VVGKTI4eVEk;?~ZE}Dq&yvaZ(Mfz~OF-_;2>wN`gZ#
zKMW;V<~MuSy6m~FJT&>>Y0$tit47L`8RomPY+Pl%{Qa=!pJkY0bPOxQ%wd4)#8@WZ
zpK0IIX;_J$X3oI6E)e$l!yk9t!(QQh3j((<ETb+jxy2gKQCSzAtDhQ!X#<2o`*VvI
zBMvM+z;981tL~wIjuhWy4MOzSg!4{AWtKh5CeV#K=?Z8VfL&tU8gq?<EU3$nQZ-P&
zxJ)B5boCjgai-(|A!gAq0v>zbGSW7u-de3;TBTxpAw02RWW#WF@b|}A1v5Hkbm`Ii
v0@|%qBtaQNUf$8&Gpzv{H;#JK<}AKdSfrDxI5YBZ1;mx&?tE`&z`1_|&HV@>

literal 0
HcmV?d00001


From 28f08078f05e6f422d72a55d14b5a7373aa35ed8 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 14:58:39 +0100
Subject: [PATCH 0022/2920] doc: Add module config.ini for packaging

resolves #7196
---
 packages/files/modules/doc/config.ini | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 packages/files/modules/doc/config.ini

diff --git a/packages/files/modules/doc/config.ini b/packages/files/modules/doc/config.ini
new file mode 100644
index 000000000..80df20784
--- /dev/null
+++ b/packages/files/modules/doc/config.ini
@@ -0,0 +1,3 @@
+[documentation]
+icingaweb2 = /usr/share/doc/icingaweb2/markdown
+modules = /usr/share/doc/icingaweb2/modules/{module}/markdown

From 7d00f68660af4f54652e1f7bfd7941c9ca9a20d2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 16:27:04 +0100
Subject: [PATCH 0023/2920] Revert "Load core modules also when bootstrapping
 the CLI"

This reverts commit f12473d34bf55b2acea2a196d5455ad851dbf86b.

The CLI must not load core modules, i.e. setup.
---
 library/Icinga/Application/Cli.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/library/Icinga/Application/Cli.php b/library/Icinga/Application/Cli.php
index abf46262f..7d1a98eec 100644
--- a/library/Icinga/Application/Cli.php
+++ b/library/Icinga/Application/Cli.php
@@ -43,8 +43,7 @@ class Cli extends ApplicationBootstrap
             ->parseBasicParams()
             ->setupLogger()
             ->setupResourceFactory()
-            ->setupModuleManager()
-            ->loadCoreModules();
+            ->setupModuleManager();
     }
 
     protected function setupLogging()

From 916868a051755bdacc899c9d61557b1d11e54014 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 16:28:05 +0100
Subject: [PATCH 0024/2920] Revert "Add support for "core" modules and make the
 setup module such a module"

This reverts commit 8af13f564b3f8e69c2c1abcda5d7e2e5266c3c7d.

The setup module must only be loaded when necessary not always.
---
 .../Application/ApplicationBootstrap.php      | 15 ---------
 .../Icinga/Application/Modules/Manager.php    | 32 ++-----------------
 library/Icinga/Application/Web.php            |  1 -
 .../Util/GettextTranslationHelper.php         |  2 +-
 4 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 7f1667e5b..733cdbf83 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -378,21 +378,6 @@ abstract class ApplicationBootstrap
         return $this;
     }
 
-    /**
-     * Load all core modules
-     *
-     * @return self
-     */
-    protected function loadCoreModules()
-    {
-        try {
-            $this->moduleManager->loadCoreModules();
-        } catch (NotReadableError $e) {
-            Logger::error(new IcingaException('Cannot load core modules. An exception was thrown:', $e));
-        }
-        return $this;
-    }
-
     /**
      * Load all enabled modules
      *
diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php
index 6469d3929..7ee2461f9 100644
--- a/library/Icinga/Application/Modules/Manager.php
+++ b/library/Icinga/Application/Modules/Manager.php
@@ -68,18 +68,6 @@ class Manager
      */
     private $modulePaths        = array();
 
-    /**
-     * The core modules
-     *
-     * Core modules do not need to be enabled to load and cannot be disabled
-     * by the user. This must not be writable programmatically!
-     *
-     * @var array
-     */
-    private $coreModules = array(
-        'setup'
-    );
-
     /**
      *  Create a new instance of the module manager
      *
@@ -170,21 +158,7 @@ class Manager
     }
 
     /**
-     * Try to set all core modules in loaded state
-     *
-     * @return  self
-     * @see     Manager::loadModule()
-     */
-    public function loadCoreModules()
-    {
-        foreach ($this->coreModules as $name) {
-            $this->loadModule($name);
-        }
-        return $this;
-    }
-
-    /**
-     * Try to set all enabled modules in loaded state
+     * Try to set all enabled modules in loaded sate
      *
      * @return  self
      * @see     Manager::loadModule()
@@ -239,8 +213,6 @@ class Manager
                 'Cannot enable module "%s". Module is not installed.',
                 $name
             );
-        } elseif (in_array($name, $this->coreModules)) {
-            return $this;
         }
 
         clearstatcache(true);
@@ -458,7 +430,7 @@ class Manager
         }
 
         $installed = $this->listInstalledModules();
-        foreach (array_diff($installed, $this->coreModules) as $name) {
+        foreach ($installed as $name) {
             $info[$name] = (object) array(
                 'name'    => $name,
                 'path'    => $this->installedBaseDirs[$name],
diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 37ec5138a..a21f21025 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -104,7 +104,6 @@ class Web extends ApplicationBootstrap
             ->setupZendMvc()
             ->setupFormNamespace()
             ->setupModuleManager()
-            ->loadCoreModules()
             ->loadEnabledModules()
             ->setupRoute()
             ->setupPagination();
diff --git a/modules/translation/library/Translation/Util/GettextTranslationHelper.php b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
index 0d5a950e1..5702def85 100644
--- a/modules/translation/library/Translation/Util/GettextTranslationHelper.php
+++ b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
@@ -101,7 +101,7 @@ class GettextTranslationHelper
      */
     public function __construct(ApplicationBootstrap $bootstrap, $locale)
     {
-        $this->moduleMgr = $bootstrap->getModuleManager()->loadCoreModules()->loadEnabledModules();
+        $this->moduleMgr = $bootstrap->getModuleManager()->loadEnabledModules();
         $this->appDir = $bootstrap->getApplicationDir();
         $this->locale = $locale;
     }

From d0e8718d619f7a6671e23aa23a6cc9c7e2d348e4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 9 Dec 2014 16:56:06 +0100
Subject: [PATCH 0025/2920] packages: Rename icingaweb.conf to icingaweb2.conf

---
 packages/files/apache/{icingaweb.conf => icingaweb2.conf} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packages/files/apache/{icingaweb.conf => icingaweb2.conf} (100%)

diff --git a/packages/files/apache/icingaweb.conf b/packages/files/apache/icingaweb2.conf
similarity index 100%
rename from packages/files/apache/icingaweb.conf
rename to packages/files/apache/icingaweb2.conf

From ef00765ff0828c9225c97f353fbcb57b20245c8e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 10 Dec 2014 09:29:38 +0100
Subject: [PATCH 0026/2920] packages: Use 'icingaweb2' as the web path

refs #4075
---
 packages/files/apache/icingaweb2.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/files/apache/icingaweb2.conf b/packages/files/apache/icingaweb2.conf
index 2c52b73e3..6bf0b7a66 100644
--- a/packages/files/apache/icingaweb2.conf
+++ b/packages/files/apache/icingaweb2.conf
@@ -1,4 +1,4 @@
-Alias /icingaweb "/usr/share/icingaweb2/public"
+Alias /icingaweb2 "/usr/share/icingaweb2/public"
 
 <Directory "/usr/share/icingaweb2/public">
     Options SymLinksIfOwnerMatch
@@ -23,7 +23,7 @@ Alias /icingaweb "/usr/share/icingaweb2/public"
 
     <IfModule mod_rewrite.c>
         RewriteEngine on
-        RewriteBase /icingaweb/
+        RewriteBase /icingaweb2/
         RewriteCond %{REQUEST_FILENAME} -s [OR]
         RewriteCond %{REQUEST_FILENAME} -l [OR]
         RewriteCond %{REQUEST_FILENAME} -d

From 2b5fe7baf4a8e0cd50eefe834e061c8dd5696d87 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 10 Dec 2014 09:30:12 +0100
Subject: [PATCH 0027/2920] Set default config dir to '/etc/icingaweb2'

---
 library/Icinga/Application/ApplicationBootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 733cdbf83..5e2a787c7 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -133,7 +133,7 @@ abstract class ApplicationBootstrap
             if (array_key_exists('ICINGAWEB_CONFIGDIR', $_SERVER)) {
                 $configDir = $_SERVER['ICINGAWEB_CONFIGDIR'];
             } else {
-                $configDir = '/etc/icingaweb';
+                $configDir = '/etc/icingaweb2';
             }
         }
         $canonical = realpath($configDir);

From 613cbae5bfc7d278da24923ab3970c43a289cf95 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 10 Dec 2014 09:30:35 +0100
Subject: [PATCH 0028/2920] packages: Fix base dir path in the icingacli

refs #4075
---
 packages/files/bin/icingacli | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/files/bin/icingacli b/packages/files/bin/icingacli
index 10b4857aa..5b41e4e8c 100755
--- a/packages/files/bin/icingacli
+++ b/packages/files/bin/icingacli
@@ -3,4 +3,4 @@
 
 require_once '/usr/share/php/Icinga/Application/Cli.php';
 
-Icinga\Application\Cli::start('/usr/share/icingaweb')->dispatch();
+Icinga\Application\Cli::start('/usr/share/icingaweb2')->dispatch();

From 888fa90fe209edcd19b278ced262e70c5a638f6a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 10 Dec 2014 09:31:37 +0100
Subject: [PATCH 0029/2920] Fix typo in PHPDoc in EmbeddedWeb

---
 library/Icinga/Application/EmbeddedWeb.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Application/EmbeddedWeb.php b/library/Icinga/Application/EmbeddedWeb.php
index 23cb365f0..72a4ec919 100644
--- a/library/Icinga/Application/EmbeddedWeb.php
+++ b/library/Icinga/Application/EmbeddedWeb.php
@@ -9,7 +9,7 @@ require_once dirname(__FILE__) . '/ApplicationBootstrap.php';
 use Icinga\Exception\ProgrammingError;
 
 /**
- * Use this if you want to make use of Icinga funtionality in other web projects
+ * Use this if you want to make use of Icinga functionality in other web projects
  *
  * Usage example:
  * <code>

From 68e460b5d12e468e95ad058f649153fa96a59cdd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 10 Dec 2014 09:32:02 +0100
Subject: [PATCH 0030/2920] Remove unused use in EmbeddedWeb

---
 library/Icinga/Application/EmbeddedWeb.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/library/Icinga/Application/EmbeddedWeb.php b/library/Icinga/Application/EmbeddedWeb.php
index 72a4ec919..b9ed067a2 100644
--- a/library/Icinga/Application/EmbeddedWeb.php
+++ b/library/Icinga/Application/EmbeddedWeb.php
@@ -6,8 +6,6 @@ namespace Icinga\Application;
 
 require_once dirname(__FILE__) . '/ApplicationBootstrap.php';
 
-use Icinga\Exception\ProgrammingError;
-
 /**
  * Use this if you want to make use of Icinga functionality in other web projects
  *

From 311ebfbcbac2a961c41ce12c1d988fc37c754a01 Mon Sep 17 00:00:00 2001
From: Carlos Cesario <carloscesario@gmail.com>
Date: Wed, 10 Dec 2014 10:44:45 -0200
Subject: [PATCH 0031/2920] Add support to untranslated strings

Add support to untranslated strings

refs #7988
---
 .../application/controllers/AlertsummaryController.php      | 6 +++---
 .../monitoring/application/controllers/ListController.php   | 2 +-
 .../monitoring/application/views/scripts/list/hosts.phtml   | 2 +-
 .../application/views/scripts/list/notifications.phtml      | 6 +++---
 .../monitoring/application/views/scripts/process/info.phtml | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 75f0fc1fe..fdb1ec99f 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -193,11 +193,11 @@ class Monitoring_AlertsummaryController extends Controller
 
         $out = new stdClass();
         if ($yesterday === $today) {
-            $out->trend = 'unchanged';
+            $out->trend = $this->translate('unchanged');
         } elseif ($yesterday > $today) {
-            $out->trend = 'down';
+            $out->trend = $this->translate('down');
         } else {
-            $out->trend = 'up';
+            $out->trend = $this->translate('up');
         }
 
         if ($yesterday <= 0) {
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 4f92a25b1..35dcd811f 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -605,7 +605,7 @@ class Monitoring_ListController extends Controller
         $this->filterQuery($query);
 
         $this->setupSortControl(array(
-            'timestamp' => 'Occurence'
+            'timestamp' => $this->translate('Occurence')
         ));
         $this->view->history = $query->paginate();
     }
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 588d39712..d7d700185 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -42,7 +42,7 @@ if ($hosts->count() === 0) {
   <?php foreach($hosts as $host):
 
     $hostStateName = strtolower($this->util()->getHostStateName($host->host_state));
-    $hostLink = $this->href('monitoring/host/show', array('host' => $host->host_name));
+    $hostLink = $this->href('monitoring/host/show', array('host' => $host->host_display_name));
 
     $icons = array();
     if (! $host->host_handled && $host->host_state > 0){
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 365d32f56..28c71c0b8 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -56,7 +56,7 @@ foreach ($notifications as $notification):
     </td>
     <td style="font-size: 0.8em">
       <?php if ($isService): ?>
-        <a href="<?= $href ?>"><?= $notification->service ?></a> on <?= $notification->host ?>
+        <?= sprintf($this->translate('%s on %s'), "<a href=\"$href\">$notification->service</a>", $notification->host); ?>
       <?php else: ?>
         <a href="<?= $href ?>"><?= $notification->host ?></a>
       <?php endif; ?>
@@ -65,10 +65,10 @@ foreach ($notifications as $notification):
       <br />
       <?php if (!$this->contact): ?>
       <small>
-          Sent to <a href="<?= $this->href(
+          <?= sprintf($this->translate('Sent to %s'), "<a href=\"$this->href(
               'monitoring/show/contact',
               array('contact' => $notification->notification_contact)
-          ) ?>"><?= $this->escape($notification->notification_contact) ?></a>
+          )\">$this->escape($notification->notification_contact)</a>"); ?>
       </small>
       <?php endif ?>
     </td>
diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml
index 02b8eeb80..92bb6cb63 100644
--- a/modules/monitoring/application/views/scripts/process/info.phtml
+++ b/modules/monitoring/application/views/scripts/process/info.phtml
@@ -26,11 +26,11 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
                 </tr>
                 <tr>
                     <th><?= $this->translate('Last Status Update'); ?></th>
-                    <td><?= $this->timeSince($this->programStatus->status_update_time) ?> ago</td>
+                    <td><?= sprintf($this->translate('%s ago'), $this->timeSince($this->programStatus->status_update_time)); ?></td>
                 </tr>
                 <tr>
                     <th><?= $this->translate('Last External Command Check'); ?></th>
-                    <td><?= $this->timeSince($this->programStatus->last_command_check) ?> ago</td>
+                    <td><?= sprintf($this->translate('%s ago'), $this->timeSince($this->programStatus->last_command_check)); ?></td>
                 </tr>
                 <tr>
                     <th><?= $this->translate('Last Log File Rotation'); ?></th>

From eca176f19135d5d52c9622c2f5a31813eb975d6c Mon Sep 17 00:00:00 2001
From: Carlos Cesario <carloscesario@gmail.com>
Date: Wed, 10 Dec 2014 11:30:59 -0200
Subject: [PATCH 0032/2920] Fix wrong change

Fix wrong change host->host_display_name to host->host_name.

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

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index d7d700185..588d39712 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -42,7 +42,7 @@ if ($hosts->count() === 0) {
   <?php foreach($hosts as $host):
 
     $hostStateName = strtolower($this->util()->getHostStateName($host->host_state));
-    $hostLink = $this->href('monitoring/host/show', array('host' => $host->host_display_name));
+    $hostLink = $this->href('monitoring/host/show', array('host' => $host->host_name));
 
     $icons = array();
     if (! $host->host_handled && $host->host_state > 0){

From d4bbd3a323f8db52009a1405c9a416979aa3f010 Mon Sep 17 00:00:00 2001
From: Carlos Cesario <carloscesario@gmail.com>
Date: Tue, 16 Dec 2014 09:31:20 -0200
Subject: [PATCH 0033/2920] Add more support to plural strings translation

Add more support to plural strings translation

refs #8092
---
 .../application/views/scripts/hosts/show.phtml  | 17 +++++++++++------
 .../scripts/multi/components/comments.phtml     |  4 ++--
 .../views/scripts/services/show.phtml           |  8 ++++----
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 6ab717635..8ae19aa0b 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -6,7 +6,7 @@
         <?= $this->translate('No hosts matching the filter') ?>
     <?php else: ?>
         <div class="hbox-item">
-            <b><?= sprintf($this->translate('Hosts (%u)'), array_sum(array_values($hostStates)))  ?></b>
+            <b><?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', array_sum(array_values($hostStates))), array_sum(array_values($hostStates))) ?></b>
         </div>
         <div class="hbox-item">
             <?= $this->hostStatesPieChart ?>
@@ -18,9 +18,14 @@
         </div>
 
         <h3>
-            <?= sprintf($this->translate('%u Hosts'),
-                count($objects))
-            ?>
+            <?= sprintf(
+                $this->translatePlural(
+                    '%u Host',
+                    '%u Hosts',
+                     count($objects)
+                ), 
+                count($objects)
+            ) ?>
         </h3>
 
         <div>
@@ -102,7 +107,7 @@
                 <a href="<?= $inDowntimeLink ?>"
                    title="<?= $this->translate('Hosts in downtime') ?>">
                     <?= $this->icon('plug') ?>
-                    <?= $this->translate(sprintf('%u hosts are in downtime', count($objectsInDowntime))) ?>
+                    <?= sprintf($this->translatePlural('%u host is in downtime', '%u hosts are in downtime', count($objectsInDowntime)),count($objectsInDowntime)) ?>
                 </a>
             </h2>
         <?php endif ?>
@@ -112,7 +117,7 @@
                 <a href="<?= $havingCommentsLink ?>"
                    title="<?= $this->translate('Comments') ?>">
                     <?= $this->icon('comment') ?>
-                    <?= $this->translate(sprintf('%u comments', count($objects->getComments()))) ?>
+                    <?= sprintf($this->translatePlural('%u comment', '%u comments', count($objects->getComments())), count($objects->getComments())) ?>
                 </a>
             </h2>
         <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/multi/components/comments.phtml b/modules/monitoring/application/views/scripts/multi/components/comments.phtml
index f0b262c9d..f477cd953 100644
--- a/modules/monitoring/application/views/scripts/multi/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/multi/components/comments.phtml
@@ -3,7 +3,7 @@
 $objectName = $this->is_service ? 'Services' : 'Hosts';
 
 ?><tr class="newsection" data-base-target="_next">
-  <th><a href=<?= count($comments) ?> <?= $this->translate('Comments') ?></th>
+  <th><a href=<?= sprintf($this->translatePlural('%u Comment', '%u Comments', count($comments)), count($comments)) ?></th>
   <td>
     <a href="<?= $this->href('monitoring/command/removecomment', $this->target) ?>"><?=
         $this->icon('cancel')
@@ -20,6 +20,6 @@ $objectName = $this->is_service ? 'Services' : 'Hosts';
           'monitoring/list/comments',
           array('comment_internal_id' => '(' . implode('|', $this->comments) . ')')
       );
-      ?>"> <?= count($comments) ?> comments </a>.
+      ?>"> <?= sprintf($this->translatePlural('%u comment', '%u comments', count($comments)), count($comments)) ?></a>.
   </td>
 </tr>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 18071c152..e8a4c70a1 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -8,7 +8,7 @@
 
         <div class="hbox">
             <div class="hbox-item" style="width: 6em;">
-                <b><?= sprintf($this->translate('Services (%u)'), array_sum(array_values($serviceStates))) ?></b>
+                <b><?= sprintf($this->translatePlural('Service (%u)', 'Services (%u)', array_sum(array_values($serviceStates))), array_sum(array_values($serviceStates))) ?></b>
             </div>
             <div class="hbox-item">
                 <?= $this->serviceStatesPieChart ?>
@@ -22,7 +22,7 @@
 
         <div class="hbox">
             <div class="hbox-item" style="width: 6em;">
-                <b><?= sprintf($this->translate('Hosts (%u)'), array_sum(array_values($hostStates)))  ?></b>
+                <b><?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', array_sum(array_values($hostStates))), array_sum(array_values($hostStates))) ?></b>
             </div>
             <div class="hbox-item">
                 <?= $this->hostStatesPieChart ?>
@@ -114,7 +114,7 @@
                 <a href="<?= $inDowntimeLink ?>"
                    title="<?= $this->translate('Services in downtime') ?>">
                     <?= $this->icon('plug') ?>
-                    <?= $this->translate(sprintf('%u services are in downtime', count($objectsInDowntime))) ?>
+                    <?= sprintf($this->translatePlural('%u service is in downtime', '%u services are in downtime', count($objectsInDowntime)), count($objectsInDowntime)) ?>
                 </a>
             </h2>
         <?php endif ?>
@@ -124,7 +124,7 @@
                 <a href="<?= $havingCommentsLink ?>"
                    title="<?= $this->translate('Comments') ?>">
                     <?= $this->icon('comment') ?>
-                    <?= $this->translate(sprintf('%u comments', count($objects->getComments()))) ?>
+                    <?= sprintf($this->translatePlural('%u comment', '%u comments', count($objects->getComments())), count($objects->getComments())) ?>
                 </a>
             </h2>
         <?php endif ?>

From 2f3667aa3dba85224483ed48e324b4a27f09844a Mon Sep 17 00:00:00 2001
From: Carlos Cesario <carloscesario@gmail.com>
Date: Wed, 17 Dec 2014 10:00:15 -0200
Subject: [PATCH 0034/2920] Use hosts link instead services link

Use hosts link instead services link to show hosts group.

refs #7259
---
 .../monitoring/application/views/scripts/list/hostgroups.phtml  | 2 +-
 .../application/views/scripts/show/components/hostgroups.phtml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index a15b5be7e..0e21dc3ee 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -79,7 +79,7 @@
         </td>
        <?php endif ?>
         <td class="groupname">
-          <a href="<?= $this->href('monitoring/list/services', array('hostgroup' => $h->hostgroup)); ?>">
+          <a href="<?= $this->href('monitoring/list/hosts', array('hostgroup' => $h->hostgroup)); ?>">
             <?= $h->hostgroup; ?>
           </a>
         </td>
diff --git a/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml b/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
index 40db3e5c4..165df627a 100644
--- a/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
@@ -4,7 +4,7 @@ if (empty($object->hostgroups)) return;
 
 $list = array();
 foreach ($object->hostgroups as $name => $alias) {
-    $list[] = $this->qlink($alias, 'monitoring/list/services', array(
+    $list[] = $this->qlink($alias, 'monitoring/list/hosts', array(
         'hostgroup' => $name
     ));
 }

From 8728b3f12596f7ee4315d26c7cd670a91ce336bf Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 18 Dec 2014 17:17:59 +0100
Subject: [PATCH 0035/2920] puppet: Add user 'vagrant' to group 'icingaweb'

---
 .puppet/manifests/site.pp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.puppet/manifests/site.pp b/.puppet/manifests/site.pp
index 77ebfa0a7..08120d911 100644
--- a/.puppet/manifests/site.pp
+++ b/.puppet/manifests/site.pp
@@ -12,4 +12,6 @@ node default {
   file { '/etc/profile.d/env.sh':
     source => 'puppet:////vagrant/.puppet/files/etc/profile.d/env.sh'
   }
+  @user { vagrant: ensure => present }
+  User <| title == vagrant |> { groups +> icingaweb }
 }

From 4dfac2839303178a101d43488dd57d846988471d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 18 Dec 2014 17:21:06 +0100
Subject: [PATCH 0036/2920] lib: Fix PHPDoc of Form::setOnSuccess()

---
 library/Icinga/Web/Form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 37d8789fe..647be721d 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -147,7 +147,7 @@ class Form extends Zend_Form
     /**
      * Set a callback that is called instead of this form's onSuccess method
      *
-     * It is called using the following signature: (Request $request, Form $form).
+     * It is called using the following signature: (Form $this).
      *
      * @param   callable    $onSuccess  Callback
      *

From 1468ed0a1979574ff20d859cd7f4f6128b93d2b2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 18 Dec 2014 17:23:54 +0100
Subject: [PATCH 0037/2920] lib: Add separator parameter to String::cname()

---
 library/Icinga/Util/String.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Util/String.php b/library/Icinga/Util/String.php
index 0bebb06e7..248ab0d34 100644
--- a/library/Icinga/Util/String.php
+++ b/library/Icinga/Util/String.php
@@ -23,16 +23,17 @@ class String
     }
 
     /**
-     * Uppercase the first character of each word in a string assuming and removing the underscore as word separator
+     * Uppercase the first character of each word in a string
      *
      * Converts 'first_name' to 'firstName' for example.
      *
      * @param   string $name
+     * @param   string $separator Word separator
      *
      * @return  string
      */
-    public static function cname($name)
+    public static function cname($name, $separator = '_')
     {
-        return str_replace(' ', '', ucwords(str_replace('_', ' ', strtolower($name))));
+        return str_replace(' ', '', ucwords(str_replace($separator, ' ', strtolower($name))));
     }
 }

From b0ab6c3a768f4a20a01676eff8520bc9aaf593ce Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 19 Dec 2014 10:43:14 +0100
Subject: [PATCH 0038/2920] monitoring: Remove css class 'control-group' from
 the expire time element

This CSS class does no longer exist.
---
 .../forms/Command/Object/AcknowledgeProblemCommandForm.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
index 3456e1bfb..25ac76c25 100644
--- a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
@@ -104,7 +104,7 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 array(
                     'decorators' => array(
                         'FormElements',
-                        array('HtmlTag', array('tag' => 'div', 'class' => 'control-group'))
+                        array('HtmlTag', array('tag' => 'div'))
                     )
                 )
             );

From fa226f261e1d1f3094fd7299d136afab45eb2e3b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 19 Dec 2014 10:45:23 +0100
Subject: [PATCH 0039/2920] monitoring: Remove css class 'control-group' from
 date and time elements in the schedule downtime command form

This CSS class does no longer exist.
---
 .../Command/Object/ScheduleServiceDowntimeCommandForm.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
index 9fd86a82b..9961d4b65 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
@@ -130,7 +130,7 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
             array(
                 'decorators' => array(
                     'FormElements',
-                    array('HtmlTag', array('tag' => 'div', 'class' => 'control-group'))
+                    array('HtmlTag', array('tag' => 'div'))
                 )
             )
         );
@@ -169,7 +169,7 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                     ),
                     'decorators' => array(
                         'FormElements',
-                        array('HtmlTag', array('tag' => 'div', 'class' => 'control-group')),
+                        array('HtmlTag', array('tag' => 'div')),
                         array(
                             'Description',
                             array('tag' => 'span', 'class' => 'description', 'placement' => 'prepend')

From e5d2d4cec2f5941a3092ef5884cfae0cc9ac2c42 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 19 Dec 2014 11:29:24 +0100
Subject: [PATCH 0040/2920] Add module-aware Form::translate and
 Form::translatePlural

refs #7551
---
 library/Icinga/Util/Translator.php |  7 +++---
 library/Icinga/Web/Form.php        | 35 ++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Util/Translator.php b/library/Icinga/Util/Translator.php
index 52a84bd62..87d9e4c88 100644
--- a/library/Icinga/Util/Translator.php
+++ b/library/Icinga/Util/Translator.php
@@ -4,7 +4,6 @@
 
 namespace Icinga\Util;
 
-use Exception;
 use Icinga\Exception\IcingaException;
 
 /**
@@ -34,8 +33,8 @@ class Translator
      *
      * Falls back to the default domain in case the string cannot be translated using the given domain
      *
-     * @param   string  $text           The string to translate
-     * @param   string  $domain         The primary domain to use
+     * @param   string      $text       The string to translate
+     * @param   string      $domain     The primary domain to use
      * @param   string|null $context    Optional parameter for context based translation
      *
      * @return  string                  The translated string
@@ -64,7 +63,7 @@ class Translator
      *
      * @param   string      $textSingular   The string in singular form to translate
      * @param   string      $textPlural     The string in plural form to translate
-     * @param   integer     $number         The number to get the plural or singular string
+     * @param   integer     $number         The amount to determine from whether to return singular or plural
      * @param   string      $domain         The primary domain to use
      * @param   string|null $context        Optional parameter for context based translation
      *
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 647be721d..205c4e238 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -9,6 +9,7 @@ use Zend_Config;
 use Zend_Form;
 use Zend_View_Interface;
 use Icinga\Application\Icinga;
+use Icinga\Util\Translator;
 use Icinga\Web\Form\Decorator\NoScriptApply;
 use Icinga\Web\Form\Element\CsrfCounterMeasure;
 
@@ -804,6 +805,40 @@ class Form extends Zend_Form
         return array();
     }
 
+    /**
+     * Translate a string
+     *
+     * @param   string      $text       The string to translate
+     * @param   string|null $context    Optional parameter for context based translation
+     *
+     * @return  string                  The translated string
+     */
+    protected function translate($text, $context = null)
+    {
+        return Translator::translate($text, $this->request->getModuleName(), $context);
+    }
+
+    /**
+     * Translate a plural string
+     *
+     * @param   string      $textSingular   The string in singular form to translate
+     * @param   string      $textPlural     The string in plural form to translate
+     * @param   integer     $number         The amount to determine from whether to return singular or plural
+     * @param   string|null $context        Optional parameter for context based translation
+     *
+     * @return  string                      The translated string
+     */
+    protected function translatePlural($textSingular, $textPlural, $number, $context = null)
+    {
+        return Translator::translatePlural(
+            $textSingular,
+            $textPlural,
+            $number,
+            $this->request->getModuleName(),
+            $context
+        );
+    }
+
     /**
      * Render this form
      *

From cf43b814009c2109c3990e4743ef0738bce5b459 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 19 Dec 2014 12:08:54 +0100
Subject: [PATCH 0041/2920] Use the class namespace instead of the request in
 Form::translate(Plural)

refs #7551
---
 library/Icinga/Web/Form.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 205c4e238..f3810903c 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -805,6 +805,20 @@ class Form extends Zend_Form
         return array();
     }
 
+    /**
+     * Return the translation domain for this form
+     *
+     * @return  string
+     */
+    protected function getTranslationDomain()
+    {
+        if (preg_match('@^Icinga\\\\Module\\\\([A-z]+)\\\\.*$@', get_called_class(), $matches) === 1) {
+            return strtolower($matches[0]);
+        }
+
+        return $this->getRequest()->getModuleName();
+    }
+
     /**
      * Translate a string
      *
@@ -815,7 +829,7 @@ class Form extends Zend_Form
      */
     protected function translate($text, $context = null)
     {
-        return Translator::translate($text, $this->request->getModuleName(), $context);
+        return Translator::translate($text, $this->getTranslationDomain(), $context);
     }
 
     /**
@@ -834,7 +848,7 @@ class Form extends Zend_Form
             $textSingular,
             $textPlural,
             $number,
-            $this->request->getModuleName(),
+            $this->getTranslationDomain(),
             $context
         );
     }

From 6d263ae316f24d3e27abf42bde15f4f43bff27df Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 19 Dec 2014 13:07:51 +0100
Subject: [PATCH 0042/2920] Do NOT fetch the translation domain from the
 request in Form::translate(..)

It might be the case that a module is using a library form...

refs #7551
---
 library/Icinga/Web/Form.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index f3810903c..850285baa 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -808,6 +808,9 @@ class Form extends Zend_Form
     /**
      * Return the translation domain for this form
      *
+     * The returned translation domain is either determined based on
+     * this form's class path or it is the default `icinga' domain
+     *
      * @return  string
      */
     protected function getTranslationDomain()
@@ -816,7 +819,7 @@ class Form extends Zend_Form
             return strtolower($matches[0]);
         }
 
-        return $this->getRequest()->getModuleName();
+        return 'icinga';
     }
 
     /**

From 8e6c8c3e0e5260b85cf370ba8f7a2b980e9a1303 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Fri, 19 Dec 2014 15:18:59 +0100
Subject: [PATCH 0043/2920] Hostgroups list: improve tooltips

refs #8110
---
 .../views/scripts/list/hostgroups.phtml       | 80 +++++++++++++++++--
 1 file changed, 72 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index a15b5be7e..6238c1963 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -96,7 +96,15 @@
                 'hostgroup'     => $h->hostgroup,
                 'sort'          => 'service_severity'
               )
-            ); ?>" title="<?= $this->translate('Services OK'); ?>">
+            ); ?>" title="<?php printf(
+              $this->translatePlural(
+                '%s Service OK in hostgroup `%s\'',
+                '%s Services OK in hostgroup `%s\'',
+                $h->services_ok
+              ),
+              $h->services_ok,
+              $h->hostgroup
+            ); ?>">
               <?= $h->services_ok; ?>
             </a>
           </span>
@@ -113,7 +121,15 @@
                 'hostgroup'             => $h->hostgroup,
                 'sort'                  => 'service_severity'
               )
-            ); ?>" title="<?= $this->translate('Services CRITICAL Unhandled'); ?>">
+            ); ?>" title="<?php printf(
+              $this->translatePlural(
+                '%s Service CRITICAL Unhandled in hostgroup `%s\'',
+                '%s Services CRITICAL Unhandled in hostgroup `%s\'',
+                $h->services_critical_unhandled
+              ),
+              $h->services_critical_unhandled,
+              $h->hostgroup
+            ); ?>">
               <?= $h->services_critical_unhandled; ?>
             </a>
         <?php endif ?>
@@ -127,7 +143,15 @@
                   'hostgroup'         => $h->hostgroup,
                   'sort'              => 'service_severity'
                 )
-              ); ?>" title="<?= $this->translate('Services CRITICAL Handled'); ?>">
+              ); ?>" title="<?php printf(
+                $this->translatePlural(
+                  '%s Service CRITICAL Handled in hostgroup `%s\'',
+                  '%s Services CRITICAL Handled in hostgroup `%s\'',
+                  $h->services_critical_handled
+                ),
+                $h->services_critical_handled,
+                $h->hostgroup
+              ); ?>">
                 <?= $h->services_critical_handled; ?>
               </a>
             </span>
@@ -147,7 +171,15 @@
                 'hostgroup'             => $h->hostgroup,
                 'sort'                  => 'service_severity'
               )
-            ); ?>" title="<?= $this->translate('Services UNKNOWN Unhandled'); ?>">
+            ); ?>" title="<?php printf(
+              $this->translatePlural(
+                '%s Service UNKNOWN Unhandled in hostgroup `%s\'',
+                '%s Services UNKNOWN Unhandled in hostgroup `%s\'',
+                $h->services_unknown_unhandled
+              ),
+              $h->services_unknown_unhandled,
+              $h->hostgroup
+            ); ?>">
               <?= $h->services_unknown_unhandled; ?>
             </a>
         <?php endif ?>
@@ -161,7 +193,15 @@
                   'hostgroup'         => $h->hostgroup,
                   'sort'              => 'service_severity'
                 )
-              ); ?>" title="<?= $this->translate('Services UNKNOWN Handled'); ?>">
+              ); ?>" title="<?php printf(
+                $this->translatePlural(
+                  '%s Service UNKNOWN Handled in hostgroup `%s\'',
+                  '%s Services UNKNOWN Handled in hostgroup `%s\'',
+                  $h->services_unknown_handled
+                ),
+                $h->services_unknown_handled,
+                $h->hostgroup
+              ); ?>">
                 <?= $h->services_unknown_handled; ?>
               </a>
             </span>
@@ -181,7 +221,15 @@
                 'hostgroup'             => $h->hostgroup,
                 'sort'                  => 'service_severity'
               )
-            ); ?>" title="<?= $this->translate('Services WARNING Unhandled'); ?>">
+            ); ?>" title="<?php printf(
+              $this->translatePlural(
+                '%s Service WARNING Unhandled in hostgroup `%s\'',
+                '%s Services WARNING Unhandled in hostgroup `%s\'',
+                $h->services_warning_unhandled
+              ),
+              $h->services_warning_unhandled,
+              $h->hostgroup
+            ); ?>">
               <?= $h->services_warning_unhandled; ?>
             </a>
         <?php endif ?>
@@ -195,7 +243,15 @@
                     'hostgroup'         => $h->hostgroup,
                     'sort'              => 'service_severity'
                 )
-              ); ?>" title="<?= $this->translate('Services WARNING Handled'); ?>">
+              ); ?>" title="<?php printf(
+                $this->translatePlural(
+                  '%s Service WARNING Handled in hostgroup `%s\'',
+                  '%s Services WARNING Handled in hostgroup `%s\'',
+                  $h->services_warning_handled
+                ),
+                $h->services_warning_handled,
+                $h->hostgroup
+              ); ?>">
                 <?= $h->services_warning_handled; ?>
               </a>
             </span>
@@ -212,7 +268,15 @@
                 'hostgroup'     => $h->hostgroup,
                 'sort'          => 'service_severity'
               )
-            ); ?>" title="<?= $this->translate('Services PENDING'); ?>">
+            ); ?>" title="<?php printf(
+              $this->translatePlural(
+                '%s Service PENDING in hostgroup `%s\'',
+                '%s Services PENDING in hostgroup `%s\'',
+                $h->services_pending
+              ),
+              $h->services_pending,
+              $h->hostgroup
+            ); ?>">
               <?= $h->services_pending; ?>
             </a>
           </span>

From bdbca6a774aa0973365b52af118d6fa04d60dbad Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Fri, 19 Dec 2014 15:18:59 +0100
Subject: [PATCH 0044/2920] Servicegroups list: improve tooltips

refs #8110
---
 .../views/scripts/list/servicegroups.phtml    | 80 +++++++++++++++++--
 1 file changed, 72 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index ceb3929c0..09abae6a1 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -96,7 +96,15 @@
                 'servicegroup'  => $s->servicegroup,
                 'sort'          => 'service_severity'
               )
-            ); ?>" title="<?= $this->translate('Services OK'); ?>">
+            ); ?>" title="<?php printf(
+              $this->translatePlural(
+                '%s Service OK in servicegroup `%s\'',
+                '%s Services OK in servicegroup `%s\'',
+                $s->services_ok
+              ),
+              $s->services_ok,
+              $s->servicegroup
+            ); ?>">
               <?= $s->services_ok; ?>
             </a>
           </span>
@@ -113,7 +121,15 @@
                 'servicegroup'          => $s->servicegroup,
                 'sort'                  => 'service_severity'
               )
-            ); ?>" title="<?= $this->translate('Services CRITICAL Unhandled'); ?>">
+            ); ?>" title="<?php printf(
+              $this->translatePlural(
+                '%s Service CRITICAL Unhandled in servicegroup `%s\'',
+                '%s Services CRITICAL Unhandled in servicegroup `%s\'',
+                $s->services_critical_unhandled
+              ),
+              $s->services_critical_unhandled,
+              $s->servicegroup
+            ); ?>">
               <?= $s->services_critical_unhandled; ?>
             </a>
         <?php endif ?>
@@ -127,7 +143,15 @@
                   'servicegroup'      => $s->servicegroup,
                   'sort'              => 'service_severity'
                 )
-              ); ?>" title="<?= $this->translate('Services CRITICAL Handled'); ?>">
+              ); ?>" title="<?php printf(
+                $this->translatePlural(
+                  '%s Service CRITICAL Handled in servicegroup `%s\'',
+                  '%s Services CRITICAL Handled in servicegroup `%s\'',
+                  $s->services_critical_handled
+                ),
+                $s->services_critical_handled,
+                $s->servicegroup
+              ); ?>">
                 <?= $s->services_critical_handled; ?>
               </a>
             </span>
@@ -147,7 +171,15 @@
                 'servicegroup'          => $s->servicegroup,
                 'sort'                  => 'service_severity'
               )
-            ); ?>" title="<?= $this->translate('Services UNKNOWN Unhandled'); ?>">
+            ); ?>" title="<?php printf(
+              $this->translatePlural(
+                '%s Service UNKNOWN Unhandled in servicegroup `%s\'',
+                '%s Services UNKNOWN Unhandled in servicegroup `%s\'',
+                $s->services_unknown_unhandled
+              ),
+              $s->services_unknown_unhandled,
+              $s->servicegroup
+            ); ?>">
               <?= $s->services_unknown_unhandled; ?>
             </a>
         <?php endif ?>
@@ -161,7 +193,15 @@
                   'servicegroup'      => $s->servicegroup,
                   'sort'              => 'service_severity'
                 )
-              ); ?>" title="<?= $this->translate('Services UNKNOWN Handled'); ?>">
+              ); ?>" title="<?php printf(
+                $this->translatePlural(
+                  '%s Service UNKNOWN Handled in servicegroup `%s\'',
+                  '%s Services UNKNOWN Handled in servicegroup `%s\'',
+                  $s->services_unknown_handled
+                ),
+                $s->services_unknown_handled,
+                $s->servicegroup
+              ); ?>">
                 <?= $s->services_unknown_handled; ?>
               </a>
             </span>
@@ -181,7 +221,15 @@
                 'servicegroup'          => $s->servicegroup,
                 'sort'                  => 'service_severity'
               )
-            ); ?>" title="<?= $this->translate('Services WARNING Unhandled'); ?>">
+            ); ?>" title="<?php printf(
+              $this->translatePlural(
+                '%s Service WARNING Unhandled in servicegroup `%s\'',
+                '%s Services WARNING Unhandled in servicegroup `%s\'',
+                $s->services_warning_unhandled
+              ),
+              $s->services_warning_unhandled,
+              $s->servicegroup
+            ); ?>">
               <?= $s->services_warning_unhandled; ?>
             </a>
         <?php endif ?>
@@ -195,7 +243,15 @@
                     'servicegroup'      => $s->servicegroup,
                     'sort'              => 'service_severity'
                 )
-              ); ?>" title="<?= $this->translate('Services WARNING Handled'); ?>">
+              ); ?>" title="<?php printf(
+                $this->translatePlural(
+                  '%s Service WARNING Handled in servicegroup `%s\'',
+                  '%s Services WARNING Handled in servicegroup `%s\'',
+                  $s->services_warning_handled
+                ),
+                $s->services_warning_handled,
+                $s->servicegroup
+              ); ?>">
                 <?= $s->services_warning_handled; ?>
               </a>
             </span>
@@ -212,7 +268,15 @@
                 'servicegroup'  => $s->servicegroup,
                 'sort'          => 'service_severity'
               )
-            ); ?>" title="<?= $this->translate('Services PENDING'); ?>">
+            ); ?>" title="<?php printf(
+              $this->translatePlural(
+                '%s Service PENDING in servicegroup `%s\'',
+                '%s Services PENDING in servicegroup `%s\'',
+                $s->services_pending
+              ),
+              $s->services_pending,
+              $s->servicegroup
+            ); ?>">
               <?= $s->services_pending; ?>
             </a>
           </span>

From a02d9cecfe4fd60fac5d685228af494f2fbcfe01 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Fri, 19 Dec 2014 17:15:14 +0100
Subject: [PATCH 0045/2920] Improve and translate the logout button's title

refs #8110
---
 application/layouts/scripts/parts/topbar.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/layouts/scripts/parts/topbar.phtml b/application/layouts/scripts/parts/topbar.phtml
index 39d559f57..68f919951 100644
--- a/application/layouts/scripts/parts/topbar.phtml
+++ b/application/layouts/scripts/parts/topbar.phtml
@@ -32,7 +32,7 @@
           <a href="<?= $this->href('/preference'); ?>"><?= $this->translate('Preferences'); ?> </a>
         </li>
         <li id="icinga_app_nav_logout">
-          <a href="<?= $this->href('/authentication/logout'); ?>" title="Logout"><?= $this->translate('Logout'); ?></a>
+          <a href="<?= $this->href('/authentication/logout'); ?>" title="<?= $this->translate('Logout from Icinga Web 2') ?>"><?= $this->translate('Logout'); ?></a>
         </li>
       </ul>
     </li>

From ebc539bc3770d5a27e0a96cae6de84542f8025f4 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Fri, 19 Dec 2014 17:15:14 +0100
Subject: [PATCH 0046/2920] JoystickPagination view script: show axis type
 (x/y) in titles

refs #8110
---
 application/views/scripts/joystickPagination.phtml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/application/views/scripts/joystickPagination.phtml b/application/views/scripts/joystickPagination.phtml
index 27cafa309..a89d2601d 100644
--- a/application/views/scripts/joystickPagination.phtml
+++ b/application/views/scripts/joystickPagination.phtml
@@ -6,7 +6,7 @@ if ($xAxisPaginator->count() <= 1 && $yAxisPaginator->count() <= 1) {
     return; // Display this pagination only if there are multiple pages
 }
 
-$fromTo = t('%s: %d to %d of %d');
+$fromTo = t('%s: %d to %d of %d (on the %s-axis)');
 $xAxisPages = $xAxisPaginator->getPages('all');
 $yAxisPages = $yAxisPaginator->getPages('all');
 
@@ -35,7 +35,8 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
           t('Hosts'),
           ($prevYAxisPage - 1) * $yAxisPages->itemCountPerPage + 1,
           $prevYAxisPage * $yAxisPages->itemCountPerPage,
-          $yAxisPages->totalItemCount
+          $yAxisPages->totalItemCount,
+          'y'
         ); ?>"><?= $this->icon('up-open'); ?></a>
       <?php else: ?>
         <?= $this->icon('up-open'); ?>
@@ -53,7 +54,8 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
           t('Services'),
           ($prevXAxisPage - 1) * $xAxisPages->itemCountPerPage + 1,
           $prevXAxisPage * $xAxisPages->itemCountPerPage,
-          $xAxisPages->totalItemCount
+          $xAxisPages->totalItemCount,
+          'x'
         ); ?>"><?= $this->icon('left-open'); ?></a>
       <?php else: ?>
         <?= $this->icon('left-open'); ?>
@@ -69,7 +71,8 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
           t('Services'),
           $currentXAxisPage * $xAxisPages->itemCountPerPage + 1,
           $nextXAxisPage === $xAxisPages->last ? $xAxisPages->totalItemCount : $nextXAxisPage * $xAxisPages->itemCountPerPage,
-          $xAxisPages->totalItemCount
+          $xAxisPages->totalItemCount,
+          'x'
         ); ?>"><?= $this->icon('right-open'); ?></a>
       <?php else: ?>
         <?= $this->icon('right-open'); ?>
@@ -87,7 +90,8 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
           t('Hosts'),
           $currentYAxisPage * $yAxisPages->itemCountPerPage + 1,
           $nextYAxisPage === $yAxisPages->last ? $yAxisPages->totalItemCount : $nextYAxisPage * $yAxisPages->itemCountPerPage,
-          $yAxisPages->totalItemCount
+          $yAxisPages->totalItemCount,
+          'y'
         ); ?>"><?= $this->icon('down-open'); ?></a>
       <?php else: ?>
         <?= $this->icon('down-open'); ?>

From ff1cda94ef111442bb6aa13034b555ee365308b9 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Fri, 19 Dec 2014 17:15:14 +0100
Subject: [PATCH 0047/2920] PivottablePagination view script: show axis type
 (x/y) in titles

refs #8110
---
 application/views/scripts/pivottablePagination.phtml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/views/scripts/pivottablePagination.phtml b/application/views/scripts/pivottablePagination.phtml
index 52bcb0351..ce180146e 100644
--- a/application/views/scripts/pivottablePagination.phtml
+++ b/application/views/scripts/pivottablePagination.phtml
@@ -6,7 +6,7 @@ if ($xAxisPaginator->count() <= 1 && $yAxisPaginator->count() <= 1) {
     return; // Display this pagination only if there are multiple pages
 }
 
-$fromTo = t('%s: %d to %d of %d');
+$fromTo = t('%s: %d to %d of %d (on the %s-axis)');
 $xAxisPages = $xAxisPaginator->getPages('all');
 $yAxisPages = $yAxisPaginator->getPages('all');
 
@@ -28,13 +28,15 @@ $yAxisPages = $yAxisPaginator->getPages('all');
                         t('Hosts'),
                         ($yAxisPage - 1) * $yAxisPages->itemCountPerPage + 1,
                         $yAxisPage === $yAxisPages->last ? $yAxisPages->totalItemCount : $yAxisPage * $yAxisPages->itemCountPerPage,
-                        $yAxisPages->totalItemCount
+                        $yAxisPages->totalItemCount,
+                        'y'
                     ) . '; ' . sprintf(
                         $fromTo,
                         t('Services'),
                         ($xAxisPage - 1) * $xAxisPages->itemCountPerPage + 1,
                         $xAxisPage === $xAxisPages->last ? $xAxisPages->totalItemCount : $xAxisPage * $xAxisPages->itemCountPerPage,
-                        $xAxisPages->totalItemCount
+                        $xAxisPages->totalItemCount,
+                        'x'
                     ); ?>"></a>
 <?php endif ?>
                 </td>

From 4c4c0c97a5de5ed09d3a6cef9364712e140bad5b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 22 Dec 2014 08:30:08 +0100
Subject: [PATCH 0048/2920] Fix incorrect token generation example on the
 wizard's welcome page

fixes #8135
---
 .../setup/application/views/scripts/form/setup-welcome.phtml  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/setup/application/views/scripts/form/setup-welcome.phtml b/modules/setup/application/views/scripts/form/setup-welcome.phtml
index 6c8228541..9aad09dbc 100644
--- a/modules/setup/application/views/scripts/form/setup-welcome.phtml
+++ b/modules/setup/application/views/scripts/form/setup-welcome.phtml
@@ -51,9 +51,7 @@ $cliPath = realpath(Icinga::app()->getApplicationDir() . '/../bin/icingacli');
       </div>
       <p><?= mt('setup', 'In case the IcingaCLI is missing you can create the token manually:'); ?></p>
       <div class="code">
-        <span>su <?= ($user = Platform::getPhpUser()) !== null ? $user : 'your_webserver_group'; ?> && mkdir -m 2770 <?= dirname($setupTokenPath); ?>;</span>
-        <span>head -c 12 /dev/urandom | base64 | tee <?= $setupTokenPath; ?>;</span>
-        <span>chmod 0660 <?= $setupTokenPath; ?>;</span>
+        <span>su <?= ($user = Platform::getPhpUser()) !== null ? $user : 'your_webserver_user'; ?> -c "mkdir -m 2770 <?= dirname($setupTokenPath); ?>; head -c 12 /dev/urandom | base64 | tee <?= $setupTokenPath; ?>; chmod 0660 <?= $setupTokenPath; ?>;";</span>
       </div>
       <p><?= sprintf(
         mt('setup', 'Please see the %s for an extensive description on how to access and use this wizard.'),

From f50d0bc3cfd3d12f201c39f90ca3594a9880bf4c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 22 Dec 2014 09:14:19 +0100
Subject: [PATCH 0049/2920] Fix the config warning's grammar on the login
 screen

---
 application/views/scripts/authentication/login.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index 584d8ad16..416e651d1 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -18,7 +18,7 @@
    <?php if ($configMissing): ?>
    <div class="config-note"><?= sprintf(
      t(
-       'You seem not to have Icinga Web 2 configured yet so it\'s not possible to log in without any defined '
+       'It appears that you did not configure Icinga Web 2 yet so it\'s not possible to log in without any defined '
        . 'authentication method. Please define a authentication method by following the instructions in the'
        . ' %1$sdocumentation%3$s or by using our %2$sweb-based setup-wizard%3$s.'
      ),

From f0438d1ea0f02a6ab0ce9cd16931c2d743232b34 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 22 Dec 2014 09:37:01 +0100
Subject: [PATCH 0050/2920] There is no copy-on-write for objects in PHP

fixes #8088
---
 application/views/scripts/roles/index.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml
index 0f40f8279..79eda5dac 100644
--- a/application/views/scripts/roles/index.phtml
+++ b/application/views/scripts/roles/index.phtml
@@ -30,7 +30,7 @@
                         <td>
                             <?php
                             // TODO(el): $role->without(...) or $role->shift(...) would be nice!
-                            $restrictions = $role;
+                            $restrictions = clone $role;
                             unset($restrictions['users']);
                             unset($restrictions['groups']);
                             unset($restrictions['permissions']);

From 706e5504e651e63b7fee1e5a116f924452bf33d3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 22 Dec 2014 10:46:29 +0100
Subject: [PATCH 0051/2920] Escape restriction names manually in
 Forms\Security\RoleForm

fixes #8086
---
 application/forms/Security/RoleForm.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 0fb53e858..4edb33d07 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -93,7 +93,7 @@ class RoleForm extends ConfigForm
         foreach ($this->providedRestrictions as $name => $description) {
             $this->addElement(
                 'text',
-                $name,
+                str_replace('/', '_', $name),
                 array(
                     'label'         => $name,
                     'description'   => $description
@@ -129,6 +129,12 @@ class RoleForm extends ConfigForm
             ? String::trimSplit($role['permissions'])
             : null;
         $role['name'] = $name;
+        foreach (array_keys($role) as $key) {
+            // Slashes are not allowed in a form's element name
+            $value = $role[$key];
+            unset($role[$key]);
+            $role[str_replace('/', '_', $key)] = $value;
+        }
         $this->populate($role);
         return $this;
     }
@@ -230,6 +236,12 @@ class RoleForm extends ConfigForm
         if (isset($values['permissions'])) {
             $values['permissions'] = implode(', ', $values['permissions']);
         }
+        foreach (array_keys($values) as $key) {
+            // Slashes are not allowed in a form's element name
+            $value = $values[$key];
+            unset($values[$key]);
+            $values[str_replace('/', '_', $key)] = $value;
+        }
         return $values;
     }
 }

From f7d11ce11f82b8e2716ed065ecdb0f4109ddd25a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 22 Dec 2014 11:02:48 +0100
Subject: [PATCH 0052/2920] Relax session storage check to the `files' save
 handler

fixes #8053
---
 library/Icinga/Web/Session/PhpSession.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Session/PhpSession.php b/library/Icinga/Web/Session/PhpSession.php
index bef978c0b..094685fe4 100644
--- a/library/Icinga/Web/Session/PhpSession.php
+++ b/library/Icinga/Web/Session/PhpSession.php
@@ -78,7 +78,7 @@ class PhpSession extends Session
             }
         }
 
-        if (!is_writable(session_save_path())) {
+        if (ini_get('session.save_handler') === 'files' && !is_writable(session_save_path())) {
             throw new ConfigurationError('Can\'t save session');
         }
 

From 086334c8618ce218f5df872b1bca5de33604dbc6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 22 Dec 2014 13:59:03 +0100
Subject: [PATCH 0053/2920] Properly build the unhandled action links when
 showing multiple objects

The links designated to acknowledge unhandled problems or to schedule
a downtime for them were generated based on the full list of objects and
limited by non-supported filter parameters. As we are already aware of the
exact "unhandled" objects this list is now used to generate proper links.
(Btw applying filters to URLs is a mess...)

fixes #8017
---
 .../controllers/HostsController.php            | 12 ++++++------
 .../controllers/ServicesController.php         | 18 ++++++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 4944cc237..37611a001 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -108,12 +108,12 @@ class Monitoring_HostsController extends Controller
         $this->view->hostStates = $hostStates;
         $this->view->objects = $this->hostList;
         $this->view->unhandledObjects = $unhandledObjects;
-        $this->view->acknowledgeUnhandledLink = Url::fromRequest()
-            ->setPath('monitoring/hosts/acknowledge-problem')
-            ->addParams(array('host_problem' => 1, 'host_handled' => 0));
-        $this->view->downtimeUnhandledLink = Url::fromRequest()
-            ->setPath('monitoring/hosts/schedule-downtime')
-            ->addParams(array('host_problem' => 1, 'host_handled' => 0));
+        $this->view->acknowledgeUnhandledLink = Url::fromPath('monitoring/hosts/acknowledge-problem')->setQueryString(
+            Filter::where('host', array_map(function ($h) { return $h->host; }, $unhandledObjects))->toQueryString()
+        );
+        $this->view->downtimeUnhandledLink = Url::fromPath('monitoring/hosts/schedule-downtime')->setQueryString(
+            Filter::where('host', array_map(function ($h) { return $h->host; }, $unhandledObjects))->toQueryString()
+        );
         $this->view->acknowledgedObjects = $acknowledgedObjects;
         $this->view->objectsInDowntime = $objectsInDowntime;
         $this->view->inDowntimeLink = Url::fromRequest()
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index cdf86f460..f859f6790 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -125,12 +125,18 @@ class Monitoring_ServicesController extends Controller
         $this->view->serviceStates = $serviceStates;
         $this->view->objects = $this->serviceList;
         $this->view->unhandledObjects = $unhandledObjects;
-        $this->view->acknowledgeUnhandledLink = Url::fromRequest()
-            ->setPath('monitoring/services/acknowledge-problem')
-            ->addParams(array('service_problem' => 1, 'service_handled' => 0));
-        $this->view->downtimeUnhandledLink = Url::fromRequest()
-            ->setPath('monitoring/services/schedule-downtime')
-            ->addParams(array('service_problem' => 1, 'service_handled' => 0));
+        $unhandledFilterExpressions = array();
+        foreach ($unhandledObjects as $service) {
+            $unhandledFilterExpressions[] = Filter::matchAll(
+                Filter::expression('host', '=', $service->getHost()->getName()),
+                Filter::expression('service', '=', $service->getName())
+            );
+        }
+        $queryString = Filter::matchAny($unhandledFilterExpressions)->toQueryString();
+        $this->view->acknowledgeUnhandledLink = Url::fromPath('monitoring/services/acknowledge-problem');
+        $this->view->acknowledgeUnhandledLink->setQueryString($queryString);
+        $this->view->downtimeUnhandledLink = Url::fromPath('monitoring/services/schedule-downtime');
+        $this->view->downtimeUnhandledLink->setQueryString($queryString);
         $this->view->acknowledgedObjects = $acknowledgedObjects;
         $this->view->objectsInDowntime = $objectsInDowntime;
         $this->view->inDowntimeLink = Url::fromRequest()

From c5915f24cc4f1ae3846cac0ac129b3e61d8e644e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 22 Dec 2014 14:44:09 +0100
Subject: [PATCH 0054/2920] Make it easier to distinguish host and service
 downtimes

Added an icon to the left of a host's or service's label and an additional
textual indicator.

refs #8008
---
 .../views/scripts/list/downtimes.phtml        | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 37b34fe5e..8a8e5576c 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -53,7 +53,7 @@ use Icinga\Module\Monitoring\Object\Service;
         </td>
         <td>
         <?php if (isset($downtime->service)): ?>
-          <a href="<?= $this->href('monitoring/service/show', array(
+          <?= $this->icon('service'); ?> <a href="<?= $this->href('monitoring/service/show', array(
             'host'      => $downtime->host,
             'service'   => $downtime->service
           )); ?>">
@@ -63,7 +63,7 @@ use Icinga\Module\Monitoring\Object\Service;
             <?= $this->translate('on'); ?> <?= $downtime->host; ?>
           </small>
         <?php else: ?>
-          <a href="<?= $this->href('monitoring/host/show', array(
+          <?= $this->icon('host'); ?> <a href="<?= $this->href('monitoring/host/show', array(
             'host' => $downtime->host
           )); ?>">
             <?= $downtime->host; ?>
@@ -76,7 +76,9 @@ use Icinga\Module\Monitoring\Object\Service;
         <?php if ($downtime->is_flexible): ?>
           <?php if ($downtime->is_in_effect): ?>
             <?= sprintf(
-              $this->translate('This flexible downtime was started on %s at %s and lasts for %s until %s at %s.'),
+              isset($downtime->service)
+                ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
+                : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
               date('d.m.y', $downtime->start),
               date('H:i', $downtime->start),
               $this->format()->duration($downtime->duration),
@@ -85,7 +87,9 @@ use Icinga\Module\Monitoring\Object\Service;
             ); ?>
           <?php else: ?>
             <?= sprintf(
-              $this->translate('This flexible downtime has been scheduled to start between %s - %s and to last for %s.'),
+              isset($downtime->service)
+                ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
+                : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
               date('d.m.y H:i', $downtime->scheduled_start),
               date('d.m.y H:i', $downtime->scheduled_end),
               $this->format()->duration($downtime->duration)
@@ -94,7 +98,9 @@ use Icinga\Module\Monitoring\Object\Service;
         <?php else: ?>
           <?php if ($downtime->is_in_effect): ?>
             <?= sprintf(
-              $this->translate('This fixed downtime was started on %s at %s and expires on %s at %s.'),
+              isset($downtime->service)
+                ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
+                : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
               date('d.m.y', $downtime->start),
               date('H:i', $downtime->start),
               date('d.m.y', $downtime->end),
@@ -102,7 +108,9 @@ use Icinga\Module\Monitoring\Object\Service;
             ); ?>
           <?php else: ?>
             <?= sprintf(
-              $this->translate('This fixed downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
+              isset($downtime->service)
+                ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
+                : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
               date('d.m.y', $downtime->scheduled_start),
               date('H:i', $downtime->scheduled_start),
               date('d.m.y', $downtime->scheduled_end),

From 5b0c8763620a474fe8bfb173490f27283f426375 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 22 Dec 2014 16:18:39 +0100
Subject: [PATCH 0055/2920] Use the service_handled column instead of
 acknowledged and in_downtime

Only service_handled takes the host's state into consideration.

refs #8013
---
 .../monitoring/application/views/scripts/list/hosts.phtml  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index debef375c..2f339b1bf 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -108,10 +108,9 @@ if ($hosts->count() === 0) {
                $host->host_unhandled_services),
            'monitoring/show/services',
            array(
-               'host'                 => $host->host_name,
-               'service_problem'      => 1,
-               'service_acknowledged' => 0,
-               'service_in_downtime'  => 0
+               'host'               => $host->host_name,
+               'service_problem'    => 1,
+               'service_handled'    => 0
            ),
            array('style' => 'font-weight: normal')
         ) ?>)</span>

From f513e7959e1c2c515fe0304571ea1d154a108fd5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 22 Dec 2014 16:20:12 +0100
Subject: [PATCH 0056/2920] Consider also the host's state when counting its
 service problems

refs #8013
---
 .../library/Monitoring/Backend/Ido/Query/StatusQuery.php    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index e390aa114..28b06dc80 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -518,12 +518,14 @@ class StatusQuery extends IdoQuery
     protected function joinServiceproblemsummary()
     {
         $sub = new Zend_Db_Expr('(SELECT'
-             . ' SUM(CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN 0 ELSE 1 END) AS unhandled_services_count,'
-             . ' SUM(CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN 1 ELSE 0 END) AS handled_services_count,'
+             . ' SUM(CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0 THEN 0 ELSE 1 END) AS unhandled_services_count,'
+             . ' SUM(CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0 THEN 1 ELSE 0 END) AS handled_services_count,'
              . ' s.host_object_id FROM icinga_servicestatus ss'
              . ' JOIN icinga_services s'
              . ' ON s.service_object_id = ss.service_object_id'
              . ' AND ss.current_state > 0'
+             . ' JOIN icinga_hoststatus hs'
+             . ' ON hs.host_object_id = s.host_object_id'
              . ' GROUP BY s.host_object_id)');
         $this->select->joinLeft(
             array('sps' => $sub),

From 64a2acd12eb84f6d62d577b7a49b637efa11a418 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 18 Dec 2014 16:44:55 +0100
Subject: [PATCH 0057/2920] Do not display labels for single data sets in
 perfdata piecharts

Display generic chart titles for the whole piechart that only contain title and percentage and don't style perfdata piecharts using HTML properties.

refs #7077
refs #6200
refs #7304
---
 library/Icinga/Web/Widget/Chart/InlinePie.php | 210 +++++-------------
 .../controllers/MultiController.php           |   2 +-
 .../controllers/ServicesController.php        |   3 +-
 .../application/views/helpers/Perfdata.php    |  14 +-
 public/css/icinga/widgets.less                |  12 +
 public/js/icinga/behavior/sparkline.js        |  51 ++---
 6 files changed, 107 insertions(+), 185 deletions(-)

diff --git a/library/Icinga/Web/Widget/Chart/InlinePie.php b/library/Icinga/Web/Widget/Chart/InlinePie.php
index 618d2903b..3acb83f5c 100644
--- a/library/Icinga/Web/Widget/Chart/InlinePie.php
+++ b/library/Icinga/Web/Widget/Chart/InlinePie.php
@@ -34,30 +34,20 @@ class InlinePie extends AbstractWidget
      * @var string
      */
     private $template =<<<'EOD'
-    <span
-        class="sparkline"
-        sparkTitle="{title}"
-        sparkWidth="{width}"
-        sparkHeight="{height}"
-        sparkBorderWidth="{borderWidth}"
-        sparkBorderColor="{borderColor}"
-        sparkTooltipChartTitle="{title}"
-        style="{style}"
-        labels="{labels}"
-        formatted="{formatted}"
-        hideEmptyLabel={hideEmptyLabel}
-        values="{data}"
-        tooltipFormat="{tooltipFormat}"
-        sparkSliceColors="[{colors}]"
-        sparkType="pie"></span>
-    <noscript>
-    <img class="inlinepie"
-        title="{title}" src="{url}" style="position: relative; top: 10px; width: {width}px; height: {height}px; {style}"
-        data-icinga-colors="{colors}" data-icinga-values="{data}"
-    />
-    </noscript>
+<span sparkType="pie" class="sparkline" {title} {disableTooltips} {size}
+    sparkSliceColors="[{colors}]" labels="{labels}" formatted="{formatted}" values="{data}"
+    tooltipFormat="{tooltipFormat}">
+</span>
+{noscript}
 EOD;
 
+    private $noscript =<<<'EOD'
+<noscript>
+  <img class="inlinepie {class}" {title} src="{url}" data-icinga-colors="{colors}" data-icinga-values="{data}"/>
+</noscript>
+EOD;
+
+
     /**
      * @var Url
      */
@@ -70,34 +60,6 @@ EOD;
      */
     private $colors = array('#44bb77', '#ffaa44', '#ff5566', '#ddccdd');
 
-    /**
-     * The width of the rendered chart
-     *
-     * @var int The value in px
-     */
-    private $width = 16;
-
-    /**
-     * The height of the rendered chart
-     *
-     * @var int The value in px
-     */
-    private $height = 16;
-
-    /**
-     * PieChart border width
-     *
-     * @var float
-     */
-    private $borderWidth = 1;
-
-    /**
-     * The color of the border
-     *
-     * @var string
-     */
-    private $borderColor = '#fff';
-
     /**
      * The title of the chart
      *
@@ -106,11 +68,9 @@ EOD;
     private $title;
 
     /**
-     * The style for the HtmlElement
-     *
-     * @var string
+     * @var
      */
-    private $style = '';
+    private $size;
 
     /**
      * The data displayed by the pie-chart
@@ -126,19 +86,17 @@ EOD;
      */
     private $labels = array();
 
-    /**
-     * If the tooltip for the "empty" area should be hidden
-     *
-     * @var bool
-     */
-    private $hideEmptyLabel = false;
-
     /**
      * The format string used to display tooltips
      *
      * @var string
      */
-    private $tooltipFormat = '<b>{{title}}</b></br> {{label}}: {{formatted}} ({{percent}}%)';
+    private $tooltipFormat = '<b>{{title}}</b></br> {{label}} {{formatted}} ({{percent}}%)';
+
+    /**
+     * @var string
+     */
+    private $disableTooltips = '';
 
     /**
      * The number format used to render numeric values in tooltips
@@ -147,19 +105,6 @@ EOD;
      */
     private $format = self::NUMBER_FORMAT_NONE;
 
-    /**
-     * Set if the tooltip for the empty area should be hidden
-     *
-     * @param   bool $hide    Whether to hide the empty area
-     *
-     * @return  $this
-     */
-    public function setHideEmptyLabel($hide = true)
-    {
-        $this->hideEmptyLabel = $hide;
-        return $this;
-    }
-
     /**
      * Set the data to be displayed.
      *
@@ -174,6 +119,27 @@ EOD;
         return $this;
     }
 
+    /**
+     * Set the size of the inline pie
+     *
+     * @param int $size     Sets both, the height and width
+     *
+     * @return $this
+     */
+    public function setSize($size = null)
+    {
+        $this->size = $size;
+        return $this;
+    }
+
+    /**
+     * Do not display the NoScript fallback html
+     */
+    public function disableNoScript()
+    {
+        $this->noscript = '';
+    }
+
     /**
      * The labels to be displayed in the pie-chart
      *
@@ -186,7 +152,7 @@ EOD;
         if (is_array($label)) {
             $this->url->setParam('labels', implode(',', array_keys($label)));
         } elseif ($label != null) {
-            $labelArr =  array($label, $label, $label, '');
+            $labelArr =  array($label, $label, $label, $label);
             $this->url->setParam('labels', implode(',', $labelArr));
             $label = $labelArr;
         } else {
@@ -250,69 +216,6 @@ EOD;
         return $this;
     }
 
-    /**
-     * Set the height
-     *
-     * @param   $height
-     *
-     * @return  $this
-     */
-    public function setHeight($height)
-    {
-        $this->height = $height;
-        return $this;
-    }
-
-    /**
-     * Set the border width of the pie chart
-     *
-     * @param   float $width    Width in px
-     *
-     * @return  $this
-     */
-    public function setBorderWidth($width)
-    {
-        $this->borderWidth = $width;
-        return $this;
-    }
-
-    /**
-     * Set the color of the pie chart border
-     *
-     * @param   string $col   The color string
-     *
-     * @return  $this
-     */
-    public function setBorderColor($col)
-    {
-        $this->borderColor = $col;
-    }
-
-    /**
-     * Set the width
-     *
-     * @param   $width
-     *
-     * @return  $this
-     */
-    public function setWidth($width)
-    {
-        $this->width = $width;
-        return $this;
-    }
-
-    /**
-     * Set the styling of the created HtmlElement
-     *
-     * @param   string $style
-     *
-     * @return  $this
-     */
-    public function setStyle($style)
-    {
-        $this->style = $style;
-    }
-
     /**
      * Set the title of the displayed Data
      *
@@ -322,10 +225,20 @@ EOD;
      */
     public function setTitle($title)
     {
-        $this->title = $title;
+        $this->title = 'title="' .  htmlspecialchars($title) . '"';
         return $this;
     }
 
+    /**
+     * Whether to display tooltips for the InlinePie
+     *
+     * @param bool $val
+     */
+    public function setDisableTooltip($val = true)
+    {
+        $this->disableTooltips = $val !== true ? '' : 'sparkDisableTooltips="true"';
+    }
+
     /**
      * Create a new InlinePie
      *
@@ -335,7 +248,7 @@ EOD;
      */
     public function __construct(array $data, $title, $colors = null)
     {
-        $this->title = $title;
+        $this->setTitle($title);
         $this->url = Url::fromPath('svg/chart.php');
         if (array_key_exists('data', $data)) {
             $this->data = $data['data'];
@@ -386,7 +299,7 @@ EOD;
             ));
 
             try {
-                $png = $pie->toPng($this->width, $this->height);
+                $png = $pie->toPng($this->size, $this->size);
                 return '<img class="inlinepie" src="data:image/png;base64,' . base64_encode($png) . '" />';
             } catch (IcingaException $_) {
                 return '';
@@ -394,17 +307,15 @@ EOD;
         }
 
         $template = $this->template;
+        // TODO: Check whether we are XHR and don't send
+        $template = str_replace('{noscript}', $this->noscript, $template);
         $template = str_replace('{url}', $this->url, $template);
 
         // style
-        $template = str_replace('{width}', $this->width, $template);
-        $template = str_replace('{height}', $this->height, $template);
-        $template = str_replace('{title}', htmlspecialchars($this->title), $template);
-        $template = str_replace('{style}', $this->style, $template);
+        $template = str_replace('{size}',
+            isset($this->size) ? 'sparkWidth="' . $this->size . '" sparkHeight="' . $this->size . '" ' : '', $template);
+        $template = str_replace('{title}', $this->title, $template);
         $template = str_replace('{colors}', implode(',', $this->colors), $template);
-        $template = str_replace('{borderWidth}', $this->borderWidth, $template);
-        $template = str_replace('{borderColor}', $this->borderColor, $template);
-        $template = str_replace('{hideEmptyLabel}', $this->hideEmptyLabel ? 'true' : 'false', $template);
 
         // Locale-ignorant string cast. Please. Do. NOT. Remove. This. Again.
         // Problem is that implode respects locales when casting floats. This means
@@ -423,6 +334,7 @@ EOD;
         $template = str_replace('{formatted}', htmlspecialchars(implode('|', $formatted)), $template);
         $template = str_replace('{labels}', htmlspecialchars($this->createLabelString()), $template);
         $template = str_replace('{tooltipFormat}', $this->tooltipFormat, $template);
+        $template = str_replace('{disableTooltips}', $this->disableTooltips, $template);
         return $template;
     }
 
diff --git a/modules/monitoring/application/controllers/MultiController.php b/modules/monitoring/application/controllers/MultiController.php
index 52d927ffb..6deff2fc3 100644
--- a/modules/monitoring/application/controllers/MultiController.php
+++ b/modules/monitoring/application/controllers/MultiController.php
@@ -221,7 +221,7 @@ class Monitoring_MultiController extends Controller
     private function createPie($states, $colors, $title)
     {
         $chart = new InlinePie(array_values($states), $title, $colors);
-        $chart->setLabel(array_keys($states))->setHeight(100)->setWidth(100);
+        $chart->setLabel(array_keys($states))->setSize(100);
         $chart->setTitle($title);
         return $chart;
     }
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index f859f6790..a7b2d0294 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -160,8 +160,7 @@ class Monitoring_ServicesController extends Controller
         $chart = new InlinePie(array_values($states), $title, $colors);
         return $chart
             ->setLabel(array_map('strtoupper', array_keys($states)))
-            ->setHeight(100)
-            ->setWidth(100)
+            ->setSize(100)
             ->setTitle($title);
     }
 
diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index eb649e77d..6e168c90f 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -84,21 +84,19 @@ 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->setHideEmptyLabel();
+        $pieChart = new InlinePie($this->calculatePieChartData($perfdata),
+            $perfdata->getLabel() . ' ' . (int)$perfdata->getPercentage() . '%');
+        $pieChart->setDisableTooltip();
+        if (Zend_Controller_Front::getInstance()->getRequest()->isXmlHttpRequest()) {
+            $pieChart->disableNoScript();
+        }
 
-        //$pieChart->setHeight(32)->setWidth(32);
         if ($perfdata->isBytes()) {
-            $pieChart->setTooltipFormat('{{label}}: {{formatted}} ({{percent}}%)');
             $pieChart->setNumberFormat(InlinePie::NUMBER_FORMAT_BYTES);
         } else if ($perfdata->isSeconds()) {
-            $pieChart->setTooltipFormat('{{label}}: {{formatted}} ({{percent}}%)');
             $pieChart->setNumberFormat(InlinePie::NUMBER_FORMAT_TIME);
         } else {
-            $pieChart->setTooltipFormat('{{label}}: {{formatted}}%');
             $pieChart->setNumberFormat(InlinePie::NUMBER_FORMAT_RATIO);
-            $pieChart->setHideEmptyLabel();
         }
         return $pieChart;
     }
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index 93625b0dc..87941157c 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -285,3 +285,15 @@ li li .badge {
 .widgetFilter li.active {
     background-color: #eee;
 }
+
+.sparkline {
+  width: 12px;
+  height: 12px;
+}
+
+.inlinepie {
+  width: 12px;
+  height: 12px;
+  position: relative;
+  top: 10px;
+}
\ No newline at end of file
diff --git a/public/js/icinga/behavior/sparkline.js b/public/js/icinga/behavior/sparkline.js
index 33cc0d34b..1992bae0a 100644
--- a/public/js/icinga/behavior/sparkline.js
+++ b/public/js/icinga/behavior/sparkline.js
@@ -21,31 +21,32 @@
             var $spark            = $(element);
             var labels            = $spark.attr('labels').split('|');
             var formatted         = $spark.attr('formatted').split('|');
-            var tooltipChartTitle = $spark.attr('sparkTooltipChartTitle') || '';
-            var format            = $spark.attr('tooltipformat');
-            var hideEmpty         = $spark.attr('hideEmptyLabel') === 'true';
-            $spark.sparkline(
-                'html',
-                {
-                    enableTagOptions: true,
-                    tooltipFormatter: function (sparkline, options, fields) {
-                        var out       = format;
-                        if (hideEmpty && fields.offset === 3) {
-                            return '';
-                        }
-                        var replace   = {
-                            title:     tooltipChartTitle,
-                            label:     labels[fields.offset] ? labels[fields.offset] : fields.offset,
-                            formatted: formatted[fields.offset] ? formatted[fields.offset] : '',
-                            value:     fields.value,
-                            percent:   Math.round(fields.percent * 100) / 100
-                        };
-                        $.each(replace, function(key, value) {
-                            out = out.replace('{{' + key + '}}', value);
-                        });
-                        return out;
-                    }
-            });
+            var title             = $spark.attr('title');
+            var format            = $spark.attr('tooltipFormat');
+
+            if ($spark.attr('labels')) {
+                $spark.removeAttr('original-title');
+            }
+            var options = {
+                enableTagOptions: true,
+                width: $spark.attr('sparkWidth') || 12,
+                height: $spark.attr('sparkHeight') || 12,
+                tooltipFormatter: function (sparkline, options, fields) {
+                    var out       = format;
+                    var replace   = {
+                        title:     title,
+                        label:     labels[fields.offset] ? labels[fields.offset] : fields.offset,
+                        formatted: formatted[fields.offset] ? formatted[fields.offset] : '',
+                        value:     fields.value,
+                        percent:   Math.round(fields.percent * 100) / 100
+                    };
+                    $.each(replace, function(key, value) {
+                        out = out.replace('{{' + key + '}}', value);
+                    });
+                    return out;
+                }
+            };
+            $spark.sparkline('html', options);
         });
     };
 

From cda5a6a9034cd961cc6b6faeed732e55ab4cce5a Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 23 Dec 2014 15:26:45 +0100
Subject: [PATCH 0058/2920] Streamline chart implementation

Define sparkline layout through CSS class and remove label/tooltip formatting.

fixes #7077
---
 library/Icinga/Web/Widget/Chart/InlinePie.php | 150 ++----------------
 .../controllers/HostsController.php           |   3 -
 .../controllers/ServicesController.php        |   7 +-
 public/js/icinga/behavior/sparkline.js        |  48 +++---
 4 files changed, 39 insertions(+), 169 deletions(-)

diff --git a/library/Icinga/Web/Widget/Chart/InlinePie.php b/library/Icinga/Web/Widget/Chart/InlinePie.php
index 3acb83f5c..69de8ebd5 100644
--- a/library/Icinga/Web/Widget/Chart/InlinePie.php
+++ b/library/Icinga/Web/Widget/Chart/InlinePie.php
@@ -5,6 +5,7 @@
 namespace Icinga\Web\Widget\Chart;
 
 use Icinga\Chart\PieChart;
+use Icinga\Module\Monitoring\Plugin\PerfdataSet;
 use Icinga\Web\Widget\AbstractWidget;
 use Icinga\Web\Url;
 use Icinga\Util\Format;
@@ -28,15 +29,12 @@ class InlinePie extends AbstractWidget
     const NUMBER_FORMAT_RATIO = 'ratio';
 
     /**
-     * The template string used for rendering this widget
      * The template string used for rendering this widget
      *
      * @var string
      */
     private $template =<<<'EOD'
-<span sparkType="pie" class="sparkline" {title} {disableTooltips} {size}
-    sparkSliceColors="[{colors}]" labels="{labels}" formatted="{formatted}" values="{data}"
-    tooltipFormat="{tooltipFormat}">
+<span sparkType="pie" class="sparkline {class}" {title} {size} sparkSliceColors="[{colors}]" values="{data}">
 </span>
 {noscript}
 EOD;
@@ -80,30 +78,9 @@ EOD;
     private $data;
 
     /**
-     * The labels to display for each data set
-     *
-     * @var array
+     * @var
      */
-    private $labels = array();
-
-    /**
-     * The format string used to display tooltips
-     *
-     * @var string
-     */
-    private $tooltipFormat = '<b>{{title}}</b></br> {{label}} {{formatted}} ({{percent}}%)';
-
-    /**
-     * @var string
-     */
-    private $disableTooltips = '';
-
-    /**
-     * The number format used to render numeric values in tooltips
-     *
-     * @var array
-     */
-    private $format = self::NUMBER_FORMAT_NONE;
+    private $class = '';
 
     /**
      * Set the data to be displayed.
@@ -141,24 +118,15 @@ EOD;
     }
 
     /**
-     * The labels to be displayed in the pie-chart
+     * Set the class to define the
      *
-     * @param   mixed $label     The label of the displayed value, or null for no labels
+     * @param  $class
      *
-     * @return  $this
+     * @return $this
      */
-    public function setLabel($label)
+    public function setSparklineClass($class)
     {
-        if (is_array($label)) {
-            $this->url->setParam('labels', implode(',', array_keys($label)));
-        } elseif ($label != null) {
-            $labelArr =  array($label, $label, $label, $label);
-            $this->url->setParam('labels', implode(',', $labelArr));
-            $label = $labelArr;
-        } else {
-            $this->url->removeKey('labels');
-        }
-        $this->labels = $label;
+        $this->class = $class;
         return $this;
     }
 
@@ -180,42 +148,6 @@ EOD;
         return $this;
     }
 
-    /**
-     * Set the used number format
-     *
-     * @param   $format   string  'bytes' or 'time'
-     *
-     * @return  $this
-     */
-    public function setNumberFormat($format)
-    {
-        $this->format = $format;
-        return $this;
-    }
-
-    /**
-     * A format string used to render the content of the piechart tooltips
-     *
-     * Placeholders using curly braces '{FOO}' are replace with their specific values. The format
-     * String may contain HTML-Markup. The available replaceable values are:
-     * <ul>
-     *      <li><b>label</b>:     The description for the current value </li>
-     *      <li><b>formatted</b>: A string representing the formatted value </li>
-     *      <li><b>value</b>:     The raw (non-formatted) value used to render the piechart </li>
-     *      <li><b>percent</b>:   The percentage of the current value </li>
-     * </ul>
-     * Note: Changes will only affect JavaScript sparklines and not the SVG charts used for fallback
-     *
-     * @param   $format
-     *
-     * @return  $this
-     */
-    public function setTooltipFormat($format)
-    {
-        $this->tooltipFormat = $format;
-        return $this;
-    }
-
     /**
      * Set the title of the displayed Data
      *
@@ -229,16 +161,6 @@ EOD;
         return $this;
     }
 
-    /**
-     * Whether to display tooltips for the InlinePie
-     *
-     * @param bool $val
-     */
-    public function setDisableTooltip($val = true)
-    {
-        $this->disableTooltips = $val !== true ? '' : 'sparkDisableTooltips="true"';
-    }
-
     /**
      * Create a new InlinePie
      *
@@ -252,9 +174,6 @@ EOD;
         $this->url = Url::fromPath('svg/chart.php');
         if (array_key_exists('data', $data)) {
             $this->data = $data['data'];
-            if (array_key_exists('labels', $data)) {
-                $this->labels = $data['labels'];
-            }
             if (array_key_exists('colors', $data)) {
                 $this->colors = $data['colors'];
             }
@@ -267,21 +186,6 @@ EOD;
             $this->setColors($this->colors);
         }
     }
-
-    /**
-     * Create a serialization containing the current label array
-     *
-     * @return string   A serialized array of labels
-     */
-    private function createLabelString ()
-    {
-        $labels = $this->labels;
-        foreach ($labels as $key => $label) {
-            $labels[$key] = str_replace('|', '', $label);
-        }
-        return isset($this->labels) && is_array($this->labels) ? implode('|', $this->labels) : '';
-    }
-
     /**
      * Renders this widget via the given view and returns the
      * HTML as a string
@@ -295,7 +199,7 @@ EOD;
             $pie->alignTopLeft();
             $pie->disableLegend();
             $pie->drawPie(array(
-                'data' => $this->data, 'colors' => $this->colors, 'labels' => $this->labels
+                'data' => $this->data, 'colors' => $this->colors
             ));
 
             try {
@@ -310,11 +214,13 @@ EOD;
         // TODO: Check whether we are XHR and don't send
         $template = str_replace('{noscript}', $this->noscript, $template);
         $template = str_replace('{url}', $this->url, $template);
+        $template = str_replace('{class}', $this->class, $template);
 
         // style
         $template = str_replace('{size}',
             isset($this->size) ? 'sparkWidth="' . $this->size . '" sparkHeight="' . $this->size . '" ' : '', $template);
         $template = str_replace('{title}', $this->title, $template);
+
         $template = str_replace('{colors}', implode(',', $this->colors), $template);
 
         // Locale-ignorant string cast. Please. Do. NOT. Remove. This. Again.
@@ -325,39 +231,7 @@ EOD;
             $data[] = sprintf('%F', $dat);
         }
 
-        // values
-        $formatted = array();
-        foreach ($this->data as $key => $value) {
-            $formatted[$key] = $this->formatValue($value);
-        }
         $template = str_replace('{data}', htmlspecialchars(implode(',', $data)), $template);
-        $template = str_replace('{formatted}', htmlspecialchars(implode('|', $formatted)), $template);
-        $template = str_replace('{labels}', htmlspecialchars($this->createLabelString()), $template);
-        $template = str_replace('{tooltipFormat}', $this->tooltipFormat, $template);
-        $template = str_replace('{disableTooltips}', $this->disableTooltips, $template);
         return $template;
     }
-
-    /**
-     * Format the given value depending on the current value of numberFormat
-     *
-     * @param   float   $value  The value to format
-     *
-     * @return  string          The formatted value
-     */
-    private function formatValue($value)
-    {
-        if ($this->format === self::NUMBER_FORMAT_NONE) {
-            return (string)$value;
-        } elseif ($this->format === self::NUMBER_FORMAT_BYTES) {
-            return Format::bytes($value);
-        } elseif ($this->format === self::NUMBER_FORMAT_TIME) {
-            return Format::duration($value);
-        } elseif ($this->format === self::NUMBER_FORMAT_RATIO) {
-            return $value;
-        } else {
-            Logger::warning('Unknown format string "' . $this->format . '" for InlinePie, value not formatted.');
-            return $value;
-        }
-    }
 }
diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 37611a001..451f6e44d 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -131,9 +131,6 @@ class Monitoring_HostsController extends Controller
     {
         $chart = new InlinePie(array_values($states), $title, $colors);
         return $chart
-            ->setLabel(array_map('strtoupper', array_keys($states)))
-            ->setHeight(100)
-            ->setWidth(100)
             ->setTitle($title);
     }
 
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index a7b2d0294..315737b31 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -159,9 +159,10 @@ class Monitoring_ServicesController extends Controller
     {
         $chart = new InlinePie(array_values($states), $title, $colors);
         return $chart
-            ->setLabel(array_map('strtoupper', array_keys($states)))
-            ->setSize(100)
-            ->setTitle($title);
+            // ->setLabel(array_map('strtoupper', array_keys($states)))
+            ->setSize(50)
+            ->setTitle($title)
+            ->setSparklineClass('sparkline-multi');
     }
 
     /**
diff --git a/public/js/icinga/behavior/sparkline.js b/public/js/icinga/behavior/sparkline.js
index 1992bae0a..e0d0fb0c7 100644
--- a/public/js/icinga/behavior/sparkline.js
+++ b/public/js/icinga/behavior/sparkline.js
@@ -18,35 +18,33 @@
 
         $('span.sparkline', el).each(function(i, element) {
             // read custom options
-            var $spark            = $(element);
-            var labels            = $spark.attr('labels').split('|');
-            var formatted         = $spark.attr('formatted').split('|');
-            var title             = $spark.attr('title');
-            var format            = $spark.attr('tooltipFormat');
+            var $spark = $(element);
+            var title  = $spark.attr('title');
 
             if ($spark.attr('labels')) {
                 $spark.removeAttr('original-title');
             }
-            var options = {
-                enableTagOptions: true,
-                width: $spark.attr('sparkWidth') || 12,
-                height: $spark.attr('sparkHeight') || 12,
-                tooltipFormatter: function (sparkline, options, fields) {
-                    var out       = format;
-                    var replace   = {
-                        title:     title,
-                        label:     labels[fields.offset] ? labels[fields.offset] : fields.offset,
-                        formatted: formatted[fields.offset] ? formatted[fields.offset] : '',
-                        value:     fields.value,
-                        percent:   Math.round(fields.percent * 100) / 100
-                    };
-                    $.each(replace, function(key, value) {
-                        out = out.replace('{{' + key + '}}', value);
-                    });
-                    return out;
-                }
-            };
-            $spark.sparkline('html', options);
+
+            var options;
+            if ($spark.hasClass('sparkline-perfdata')) {
+                options = {
+                    enableTagOptions: true,
+                    width: 12,
+                    height: 12,
+                    title: title,
+                    disableTooltips: true
+                };
+                $spark.sparkline('html', options);
+            } else if ($spark.hasClass('sparkline-multi')) {
+                options = {
+                    width: 100,
+                    height: 100,
+                    title: title,
+                    enableTagOptions: true
+                };
+                $spark.sparkline('html', options);
+            }
+
         });
     };
 

From c93b13b1387c1017d4ef4e58d7b9e078a2d4e0bb Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 23 Dec 2014 15:45:45 +0100
Subject: [PATCH 0059/2920] Rework behavior of perfdata visualization

Determine perfdata pie color from host or service state, display zero percent piecharts, only render displayabl PieCharts with min and max values, move perfdata to piechart conversion functions into the Perfdata object.

fixes #6423
fixes #6200
fixes #7170
fixes #7304
---
 .../application/views/helpers/Perfdata.php    | 89 ++++++-------------
 .../library/Monitoring/Plugin/Perfdata.php    | 63 +++++++++++++
 public/css/icinga/widgets.less                |  7 +-
 3 files changed, 90 insertions(+), 69 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 6e168c90f..ada99da9f 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -9,33 +9,36 @@ use Icinga\Module\Monitoring\Plugin\PerfdataSet;
 
 class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
 {
-    public function perfdata($perfdataStr, $compact = false)
+
+    /**
+     * Display the given perfdata string to the user
+     *
+     * @param      $perfdataStr The perfdata string
+     * @param bool $compact     Whether to display the perfdata in compact mode
+     * @param      $color       The color indicating the perfdata state
+     *
+     * @return string
+     */
+    public function perfdata($perfdataStr, $compact = false, $color = Perfdata::PERFDATA_GREEN)
     {
-        $pset = PerfdataSet::fromString($perfdataStr)->asArray();
-        $onlyPieChartData = array_filter($pset, function ($e) { return $e->getPercentage() > 0; });
-        if ($compact) {
-            $onlyPieChartData = array_slice($onlyPieChartData, 0, 5);
-        } else {
-            $nonPieChartData = array_filter($pset, function ($e) { return $e->getPercentage() == 0; });
-        }
+        $pieChartData = PerfdataSet::fromString($perfdataStr)->asArray();
 
         $result = '';
         $table = array();
-        foreach ($onlyPieChartData as $perfdata) {
-            $pieChart = $this->createInlinePie($perfdata);
-            if ($compact) {
-                $result .= $pieChart->render();
-            } else {
-                if (! $perfdata->isPercentage()) {
-                    // TODO: Should we trust sprintf-style placeholders in perfdata titles?
-                    $pieChart->setTooltipFormat('{{label}}: {{formatted}} ({{percent}}%)');
+        foreach ($pieChartData as $perfdata) {
+            if ($perfdata->isVisualizable()) {
+                $pieChart = $perfdata->asInlinePie($color);
+                if ($compact) {
+                    $result .= $pieChart->render();
+                } else {
+                    $table[] = '<tr><th>' . $pieChart->render()
+                        . htmlspecialchars($perfdata->getLabel())
+                        . '</th><td> '
+                        . htmlspecialchars($this->formatPerfdataValue($perfdata)) .
+                        ' </td></tr>';
                 }
-                // $pieChart->setStyle('margin: 0.2em 0.5em 0.2em 0.5em;');
-                $table[] = '<tr><th>' . $pieChart->render()
-                    . htmlspecialchars($perfdata->getLabel())
-                    . '</th><td> '
-                    . htmlspecialchars($this->formatPerfdataValue($perfdata)) .
-                    ' </td></tr>';
+            } else {
+                $table[] = (string)$perfdata;
             }
         }
 
@@ -43,32 +46,10 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
             return $result;
         } else {
             $pieCharts = empty($table) ? '' : '<table class="perfdata">' . implode("\n", $table) . '</table>';
-            return $pieCharts . "\n" . implode("<br>\n", $nonPieChartData);
+            return $pieCharts;
         }
     }
 
-    protected function calculatePieChartData(Perfdata $perfdata)
-    {
-        $rawValue = $perfdata->getValue();
-        $minValue = $perfdata->getMinimumValue() !== null ? $perfdata->getMinimumValue() : 0;
-        $maxValue = $perfdata->getMaximumValue();
-        $usedValue = ($rawValue - $minValue);
-        $unusedValue = ($maxValue - $minValue) - $usedValue;
-
-        $gray = $unusedValue;
-        $green = $orange = $red = 0;
-        // TODO(#6122): Add proper treshold parsing.
-        if ($perfdata->getCriticalThreshold() && $perfdata->getValue() > $perfdata->getCriticalThreshold()) {
-            $red = $usedValue;
-        } elseif ($perfdata->getWarningThreshold() && $perfdata->getValue() > $perfdata->getWarningThreshold()) {
-            $orange = $usedValue;
-        } else {
-            $green = $usedValue;
-        }
-
-        return array($green, $orange, $red, $gray);
-    }
-
     protected function formatPerfdataValue(Perfdata $perfdata)
     {
         if ($perfdata->isBytes()) {
@@ -82,22 +63,4 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
         return $perfdata->getValue();
     }
 
-    protected function createInlinePie(Perfdata $perfdata)
-    {
-        $pieChart = new InlinePie($this->calculatePieChartData($perfdata),
-            $perfdata->getLabel() . ' ' . (int)$perfdata->getPercentage() . '%');
-        $pieChart->setDisableTooltip();
-        if (Zend_Controller_Front::getInstance()->getRequest()->isXmlHttpRequest()) {
-            $pieChart->disableNoScript();
-        }
-
-        if ($perfdata->isBytes()) {
-            $pieChart->setNumberFormat(InlinePie::NUMBER_FORMAT_BYTES);
-        } else if ($perfdata->isSeconds()) {
-            $pieChart->setNumberFormat(InlinePie::NUMBER_FORMAT_TIME);
-        } else {
-            $pieChart->setNumberFormat(InlinePie::NUMBER_FORMAT_RATIO);
-        }
-        return $pieChart;
-    }
 }
diff --git a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
index 6af3cde17..1b687d243 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -5,9 +5,16 @@
 namespace Icinga\Module\Monitoring\Plugin;
 
 use InvalidArgumentException;
+use Icinga\Exception\ProgrammingError;
+use Icinga\Web\Widget\Chart\InlinePie;
+use Zend_Controller_Front;
 
 class Perfdata
 {
+    const PERFDATA_GREEN = 'green';
+    const PERFDATA_ORANGE = 'orange';
+    const PERFDATA_RED = 'red';
+
     /**
      * The performance data value being parsed
      *
@@ -159,6 +166,16 @@ class Perfdata
         return $this->unit === 'c';
     }
 
+    /**
+     * Returns whether it is possible to display a visual representation
+     *
+     * @return  bool    True when the perfdata is visualizable
+     */
+    public function isVisualizable()
+    {
+        return isset($this->minValue) && isset($this->maxValue) && isset($this->value);
+    }
+
     /**
      * Return this perfomance data's label
      */
@@ -316,4 +333,50 @@ class Perfdata
             }
         }
     }
+
+    protected function calculatePieChartData( $color)
+    {
+        $rawValue = $this->getValue();
+        $minValue = $this->getMinimumValue() !== null ? $this->getMinimumValue() : 0;
+        $maxValue = $this->getMaximumValue();
+        $usedValue = ($rawValue - $minValue);
+        $unusedValue = ($maxValue - $minValue) - $usedValue;
+
+        $gray = $unusedValue;
+        $green = $orange = $red = 0;
+
+        switch ($color) {
+            case self::PERFDATA_GREEN:
+                $green = $usedValue;
+                break;
+
+            case self::PERFDATA_RED:
+                $red = $usedValue;
+                break;
+
+            case self::PERFDATA_ORANGE:
+                $orange = $usedValue;
+                break;
+        }
+        // TODO(#6122): Add proper treshold parsing.
+
+        return array($green, $orange, $red, $gray);
+    }
+
+
+    public function asInlinePie($color)
+    {
+        if (! $this->isVisualizable()) {
+            throw new ProgrammingError('Cannot calculate piechart data for unvisualizable perfdata entry.');
+        }
+
+        $data = $this->calculatePieChartData($color);
+        $pieChart = new InlinePie($data, $this->getLabel() . ' ' . number_format($this->getPercentage(), 2) . '%');
+        $pieChart->setSparklineClass('sparkline-perfdata');
+
+        if (Zend_Controller_Front::getInstance()->getRequest()->isXmlHttpRequest()) {
+            $pieChart->disableNoScript();
+        }
+        return $pieChart;
+    }
 }
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index 87941157c..e2e37d7ab 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -289,11 +289,6 @@ li li .badge {
 .sparkline {
   width: 12px;
   height: 12px;
-}
-
-.inlinepie {
-  width: 12px;
-  height: 12px;
   position: relative;
-  top: 10px;
+  top: 4px;
 }
\ No newline at end of file

From 41c101d99fa8ec161b211b851bbf234907333feb Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 23 Dec 2014 16:12:25 +0100
Subject: [PATCH 0060/2920] Use neutral default color in perfdata piecharts

If nothing is known about the state of the monitoring object, the piecharts should neither indicate OK nor Critical.
---
 library/Icinga/Web/Widget/Chart/InlinePie.php                | 2 +-
 modules/monitoring/application/views/helpers/Perfdata.php    | 2 +-
 .../monitoring/application/views/scripts/list/services.phtml | 1 +
 modules/monitoring/library/Monitoring/Plugin/Perfdata.php    | 5 ++---
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Web/Widget/Chart/InlinePie.php b/library/Icinga/Web/Widget/Chart/InlinePie.php
index 69de8ebd5..04e3e7318 100644
--- a/library/Icinga/Web/Widget/Chart/InlinePie.php
+++ b/library/Icinga/Web/Widget/Chart/InlinePie.php
@@ -56,7 +56,7 @@ EOD;
      *
      * @var array
      */
-    private $colors = array('#44bb77', '#ffaa44', '#ff5566', '#ddccdd');
+    private $colors = array('#049BAF', '#ffaa44', '#ff5566', '#ddccdd');
 
     /**
      * The title of the chart
diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index ada99da9f..47c34d156 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -19,7 +19,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
      *
      * @return string
      */
-    public function perfdata($perfdataStr, $compact = false, $color = Perfdata::PERFDATA_GREEN)
+    public function perfdata($perfdataStr, $compact = false, $color = Perfdata::PERFDATA_DEFAULT)
     {
         $pieChartData = PerfdataSet::fromString($perfdataStr)->asArray();
 
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 994304f08..8ef6f7fe8 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -1,6 +1,7 @@
 <?php
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
+use Icinga\Module\Monitoring\Plugin\Perfdata;
 
 $helper = $this->getHelper('MonitoringState');
 
diff --git a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
index 1b687d243..7da4559fd 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -11,8 +11,7 @@ use Zend_Controller_Front;
 
 class Perfdata
 {
-    const PERFDATA_GREEN = 'green';
-    const PERFDATA_ORANGE = 'orange';
+    const PERFDATA_DEFAULT = 'green';
     const PERFDATA_RED = 'red';
 
     /**
@@ -346,7 +345,7 @@ class Perfdata
         $green = $orange = $red = 0;
 
         switch ($color) {
-            case self::PERFDATA_GREEN:
+            case self::PERFDATA_DEFAULT:
                 $green = $usedValue;
                 break;
 

From 7f5ba135eee69a1ec3378e02131fff624e9138e3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 09:25:30 +0100
Subject: [PATCH 0061/2920] Revert "Relax session storage check to the `files'
 save handler"

This reverts commit f7d11ce11f82b8e2716ed065ecdb0f4109ddd25a.

Sorry mate but a guy on GitHub was faster ;)

refs #8053
---
 library/Icinga/Web/Session/PhpSession.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Session/PhpSession.php b/library/Icinga/Web/Session/PhpSession.php
index 094685fe4..bef978c0b 100644
--- a/library/Icinga/Web/Session/PhpSession.php
+++ b/library/Icinga/Web/Session/PhpSession.php
@@ -78,7 +78,7 @@ class PhpSession extends Session
             }
         }
 
-        if (ini_get('session.save_handler') === 'files' && !is_writable(session_save_path())) {
+        if (!is_writable(session_save_path())) {
             throw new ConfigurationError('Can\'t save session');
         }
 

From 5e40ce2088ed1a0ae8da5ab4a6148d9e8528387c Mon Sep 17 00:00:00 2001
From: Boden Garman <boden.garman@spintel.net.au>
Date: Mon, 15 Dec 2014 13:24:18 +1100
Subject: [PATCH 0062/2920] Only check the session save path is writable if the
 session handler is 'files'

fixes #8053

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
---
 library/Icinga/Web/Session/PhpSession.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 library/Icinga/Web/Session/PhpSession.php

diff --git a/library/Icinga/Web/Session/PhpSession.php b/library/Icinga/Web/Session/PhpSession.php
old mode 100644
new mode 100755
index bef978c0b..fa545fd8d
--- a/library/Icinga/Web/Session/PhpSession.php
+++ b/library/Icinga/Web/Session/PhpSession.php
@@ -78,8 +78,9 @@ class PhpSession extends Session
             }
         }
 
-        if (!is_writable(session_save_path())) {
-            throw new ConfigurationError('Can\'t save session');
+        $sessionSavePath = session_save_path();
+        if (session_module_name() === 'files' && !is_writable($sessionSavePath)) {
+            throw new ConfigurationError("Can't save session, path '$sessionSavePath' is not writable.");
         }
 
         if ($this->exists()) {

From 6960a08de04bedc1594dbfdef57d58505bcc13cc Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 09:39:23 +0100
Subject: [PATCH 0063/2920] Revert "Escape restriction names manually in
 Forms\Security\RoleForm"

This reverts commit 706e5504e651e63b7fee1e5a116f924452bf33d3.

HTML5 does allow any non-empty value for the name attribute but Zend only permits
alphanumerics, the underscore, the circumflex and any ASCII character in range \x7f to \xff (127 to 255).
Thus only escaping the slash (/) is wrong.

refs #8086
---
 application/forms/Security/RoleForm.php | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 4edb33d07..0fb53e858 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -93,7 +93,7 @@ class RoleForm extends ConfigForm
         foreach ($this->providedRestrictions as $name => $description) {
             $this->addElement(
                 'text',
-                str_replace('/', '_', $name),
+                $name,
                 array(
                     'label'         => $name,
                     'description'   => $description
@@ -129,12 +129,6 @@ class RoleForm extends ConfigForm
             ? String::trimSplit($role['permissions'])
             : null;
         $role['name'] = $name;
-        foreach (array_keys($role) as $key) {
-            // Slashes are not allowed in a form's element name
-            $value = $role[$key];
-            unset($role[$key]);
-            $role[str_replace('/', '_', $key)] = $value;
-        }
         $this->populate($role);
         return $this;
     }
@@ -236,12 +230,6 @@ class RoleForm extends ConfigForm
         if (isset($values['permissions'])) {
             $values['permissions'] = implode(', ', $values['permissions']);
         }
-        foreach (array_keys($values) as $key) {
-            // Slashes are not allowed in a form's element name
-            $value = $values[$key];
-            unset($values[$key]);
-            $values[str_replace('/', '_', $key)] = $value;
-        }
         return $values;
     }
 }

From 2c1a37afa3a5be52af78fd1a395a5671df5fc54b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 10:51:12 +0100
Subject: [PATCH 0064/2920] Use Zend_Form_Element::filterName() for translating
 restriction names to element names

fixes #8086
---
 application/forms/Security/RoleForm.php | 39 ++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 0fb53e858..a45ca16ac 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -6,6 +6,7 @@ namespace Icinga\Forms\Security;
 
 use InvalidArgumentException;
 use LogicException;
+use Zend_Form_Element;
 use Icinga\Application\Icinga;
 use Icinga\Forms\ConfigForm;
 use Icinga\Util\String;
@@ -35,6 +36,7 @@ class RoleForm extends ConfigForm
      */
     public function init()
     {
+        $helper = new Zend_Form_Element('bogus');
         foreach (Icinga::app()->getModuleManager()->getLoadedModules() as $module) {
             foreach ($module->getProvidedPermissions() as $permission) {
                 /** @var object $permission */
@@ -42,7 +44,18 @@ class RoleForm extends ConfigForm
             }
             foreach ($module->getProvidedRestrictions() as $restriction) {
                 /** @var object $restriction */
-                $this->providedRestrictions[$restriction->name] = $restriction->description;
+                $name = $helper->filterName($restriction->name); // Zend only permits alphanumerics, the underscore,
+                                                                 // the circumflex and any ASCII character in range
+                                                                 // \x7f to \xff (127 to 255)
+                while (isset($this->providedRestrictions[$name])) {
+                    // Because Zend_Form_Element::filterName() replaces any not permitted character with the empty
+                    // string we may have duplicate names, e.g. 're/striction' and 'restriction'
+                    $name .= '_';
+                }
+                $this->providedRestrictions[$name] = array(
+                    'description'   => $restriction->description,
+                    'name'          => $restriction->name
+                );
             }
         }
     }
@@ -90,13 +103,13 @@ class RoleForm extends ConfigForm
                 )
             )
         ));
-        foreach ($this->providedRestrictions as $name => $description) {
+        foreach ($this->providedRestrictions as $name => $spec) {
             $this->addElement(
                 'text',
                 $name,
                 array(
-                    'label'         => $name,
-                    'description'   => $description
+                    'label'         => $spec['name'],
+                    'description'   => $spec['description']
                 )
             );
         }
@@ -129,6 +142,15 @@ class RoleForm extends ConfigForm
             ? String::trimSplit($role['permissions'])
             : null;
         $role['name'] = $name;
+        $restrictions = array();
+        foreach ($this->providedRestrictions as $name => $spec) {
+            if (isset($role[$spec['name']])) {
+                // Translate restriction names to filtered element names
+                $restrictions[$name] = $role[$spec['name']];
+                unset($role[$spec['name']]);
+            }
+        }
+        $role = array_merge($role, $restrictions);
         $this->populate($role);
         return $this;
     }
@@ -230,6 +252,15 @@ class RoleForm extends ConfigForm
         if (isset($values['permissions'])) {
             $values['permissions'] = implode(', ', $values['permissions']);
         }
+        $restrictions = array();
+        foreach ($this->providedRestrictions as $name => $spec) {
+            if (isset($values[$name])) {
+                // Translate filtered element names to restriction names
+                $restrictions[$spec['name']] = $values[$name];
+                unset($values[$name]);
+            }
+        }
+        $values = array_merge($values, $restrictions);
         return $values;
     }
 }

From 49dad43a0affbab49285b80ba5e0de668cedad24 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 11:53:06 +0100
Subject: [PATCH 0065/2920] Use @type instead of @var in Security/RoleForm.php

---
 application/forms/Security/RoleForm.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index a45ca16ac..eed9ea441 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -19,14 +19,14 @@ class RoleForm extends ConfigForm
     /**
      * Provided permissions by currently loaded modules
      *
-     * @var array
+     * @type array
      */
     protected $providedPermissions = array();
 
     /**
      * Provided restrictions by currently loaded modules
      *
-     * @var array
+     * @type array
      */
     protected $providedRestrictions = array();
 
@@ -39,11 +39,11 @@ class RoleForm extends ConfigForm
         $helper = new Zend_Form_Element('bogus');
         foreach (Icinga::app()->getModuleManager()->getLoadedModules() as $module) {
             foreach ($module->getProvidedPermissions() as $permission) {
-                /** @var object $permission */
+                /** @type object $permission */
                 $this->providedPermissions[$permission->name] = $permission->name . ': ' . $permission->description;
             }
             foreach ($module->getProvidedRestrictions() as $restriction) {
-                /** @var object $restriction */
+                /** @type object $restriction */
                 $name = $helper->filterName($restriction->name); // Zend only permits alphanumerics, the underscore,
                                                                  // the circumflex and any ASCII character in range
                                                                  // \x7f to \xff (127 to 255)

From 4441c1d4de54295ade7fc57ff290534a33da2189 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 11:53:55 +0100
Subject: [PATCH 0066/2920] Allow to grant every permission

---
 application/forms/Security/RoleForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index eed9ea441..b27a4ec8b 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -21,7 +21,7 @@ class RoleForm extends ConfigForm
      *
      * @type array
      */
-    protected $providedPermissions = array();
+    protected $providedPermissions = array('*' => '*');
 
     /**
      * Provided restrictions by currently loaded modules

From 2db286543385f569f18c0901ee59608ed560a2b5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 12:11:49 +0100
Subject: [PATCH 0067/2920] Do not use an extra loop for generating the
 unhandled objects filter in ServicesController.php

---
 .../controllers/ServicesController.php        | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 315737b31..fdc040d29 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -74,6 +74,7 @@ class Monitoring_ServicesController extends Controller
             'service_obsessing'*/
         ));
         $unhandledObjects = array();
+        $unhandledFilterExpressions = array();
         $acknowledgedObjects = array();
         $objectsInDowntime = array();
         $serviceStates = array(
@@ -94,6 +95,10 @@ class Monitoring_ServicesController extends Controller
             /** @var Service $service */
             if ((bool) $service->problem === true && (bool) $service->handled === false) {
                 $unhandledObjects[] = $service;
+                $unhandledFilterExpressions[] = Filter::matchAll(
+                    Filter::where('host', $service->getHost()->getName()),
+                    Filter::where('service', $service->getName())
+                );
             }
             if ((bool) $service->acknowledged === true) {
                 $acknowledgedObjects[] = $service;
@@ -125,18 +130,11 @@ class Monitoring_ServicesController extends Controller
         $this->view->serviceStates = $serviceStates;
         $this->view->objects = $this->serviceList;
         $this->view->unhandledObjects = $unhandledObjects;
-        $unhandledFilterExpressions = array();
-        foreach ($unhandledObjects as $service) {
-            $unhandledFilterExpressions[] = Filter::matchAll(
-                Filter::expression('host', '=', $service->getHost()->getName()),
-                Filter::expression('service', '=', $service->getName())
-            );
-        }
-        $queryString = Filter::matchAny($unhandledFilterExpressions)->toQueryString();
-        $this->view->acknowledgeUnhandledLink = Url::fromPath('monitoring/services/acknowledge-problem');
-        $this->view->acknowledgeUnhandledLink->setQueryString($queryString);
-        $this->view->downtimeUnhandledLink = Url::fromPath('monitoring/services/schedule-downtime');
-        $this->view->downtimeUnhandledLink->setQueryString($queryString);
+        $unhandledFilterQueryString = Filter::matchAny($unhandledFilterExpressions)->toQueryString();
+        $this->view->acknowledgeUnhandledLink = Url::fromPath('monitoring/services/acknowledge-problem')
+            ->setQueryString($unhandledFilterQueryString);
+        $this->view->downtimeUnhandledLink = Url::fromPath('monitoring/services/schedule-downtime')
+            ->setQueryString($unhandledFilterQueryString);
         $this->view->acknowledgedObjects = $acknowledgedObjects;
         $this->view->objectsInDowntime = $objectsInDowntime;
         $this->view->inDowntimeLink = Url::fromRequest()

From f1f808b7a3d820eaf8a004954dfc41a7e799d798 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 12:17:17 +0100
Subject: [PATCH 0068/2920] Do not use array_map for generating the unhandled
 objects filter in HostsController.php

---
 .../application/controllers/HostsController.php   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 451f6e44d..8fe431ca2 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -72,6 +72,7 @@ class Monitoring_HostsController extends Controller
             'host_obsessing'*/
         ));
         $unhandledObjects = array();
+        $unhandledFilterExpressions = array();
         $acknowledgedObjects = array();
         $objectsInDowntime = array();
         $hostStates = array(
@@ -81,9 +82,10 @@ class Monitoring_HostsController extends Controller
             Host::getStateText(Host::STATE_PENDING) => 0,
         );
         foreach ($this->hostList as $host) {
-            /** @var Service $host */
+            /** @var Host $host */
             if ((bool) $host->problem === true && (bool) $host->handled === false) {
                 $unhandledObjects[] = $host;
+                $unhandledFilterExpressions[] = Filter::where('host', $host->getName());
             }
             if ((bool) $host->acknowledged === true) {
                 $acknowledgedObjects[] = $host;
@@ -108,12 +110,11 @@ class Monitoring_HostsController extends Controller
         $this->view->hostStates = $hostStates;
         $this->view->objects = $this->hostList;
         $this->view->unhandledObjects = $unhandledObjects;
-        $this->view->acknowledgeUnhandledLink = Url::fromPath('monitoring/hosts/acknowledge-problem')->setQueryString(
-            Filter::where('host', array_map(function ($h) { return $h->host; }, $unhandledObjects))->toQueryString()
-        );
-        $this->view->downtimeUnhandledLink = Url::fromPath('monitoring/hosts/schedule-downtime')->setQueryString(
-            Filter::where('host', array_map(function ($h) { return $h->host; }, $unhandledObjects))->toQueryString()
-        );
+        $unhandledFilterQueryString = Filter::matchAny($unhandledFilterExpressions)->toQueryString();
+        $this->view->acknowledgeUnhandledLink = Url::fromPath('monitoring/hosts/acknowledge-problem')
+            ->setQueryString($unhandledFilterQueryString);
+        $this->view->downtimeUnhandledLink = Url::fromPath('monitoring/hosts/schedule-downtime')
+            ->setQueryString($unhandledFilterQueryString);
         $this->view->acknowledgedObjects = $acknowledgedObjects;
         $this->view->objectsInDowntime = $objectsInDowntime;
         $this->view->inDowntimeLink = Url::fromRequest()

From 26bc56e9df306cea1e1937720d07c1dc5b6f519b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 12:19:37 +0100
Subject: [PATCH 0069/2920] monitoring: Fix the link to hosts in downtime when
 multiple hosts are selected

---
 .../monitoring/application/controllers/HostsController.php  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 8fe431ca2..09957a4a0 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -75,6 +75,7 @@ class Monitoring_HostsController extends Controller
         $unhandledFilterExpressions = array();
         $acknowledgedObjects = array();
         $objectsInDowntime = array();
+        $downtimeFilterExpressions = array();
         $hostStates = array(
             Host::getStateText(Host::STATE_UP) => 0,
             Host::getStateText(Host::STATE_DOWN) => 0,
@@ -92,6 +93,7 @@ class Monitoring_HostsController extends Controller
             }
             if ((bool) $host->in_downtime === true) {
                 $objectsInDowntime[] = $host;
+                $downtimeFilterExpressions[] = Filter::where('downtime_host', $host->getName());
             }
             ++$hostStates[$host::getStateText($host->state)];
         }
@@ -117,8 +119,8 @@ class Monitoring_HostsController extends Controller
             ->setQueryString($unhandledFilterQueryString);
         $this->view->acknowledgedObjects = $acknowledgedObjects;
         $this->view->objectsInDowntime = $objectsInDowntime;
-        $this->view->inDowntimeLink = Url::fromRequest()
-            ->setPath('monitoring/list/downtimes');
+        $this->view->inDowntimeLink = Url::fromPath('monitoring/list/downtimes')
+            ->setQueryString(Filter::matchAny($downtimeFilterExpressions)->toQueryString());
         $this->view->havingCommentsLink = Url::fromRequest()
             ->setPath('monitoring/list/comments');
         $this->view->hostStatesPieChart = $this->createPieChart(

From bf92f9fa85476450e898333293da3c49575f2e0b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 12:25:41 +0100
Subject: [PATCH 0070/2920] monitoring: Fix the link to services in downtime
 when multiple services are selected

---
 .../application/controllers/ServicesController.php       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index fdc040d29..4d08622c2 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -77,6 +77,7 @@ class Monitoring_ServicesController extends Controller
         $unhandledFilterExpressions = array();
         $acknowledgedObjects = array();
         $objectsInDowntime = array();
+        $downtimeFilterExpressions = array();
         $serviceStates = array(
             Service::getStateText(Service::STATE_OK) => 0,
             Service::getStateText(Service::STATE_WARNING) => 0,
@@ -105,6 +106,10 @@ class Monitoring_ServicesController extends Controller
             }
             if ((bool) $service->in_downtime === true) {
                 $objectsInDowntime[] = $service;
+                $downtimeFilterExpressions[] = Filter::matchAll(
+                    Filter::where('downtime_host', $service->getHost()->getName()),
+                    Filter::where('downtime_service', $service->getName())
+                );
             }
             ++$serviceStates[$service::getStateText($service->state)];
             if (! isset($knownHostStates[$service->getHost()->getName()])) {
@@ -137,8 +142,8 @@ class Monitoring_ServicesController extends Controller
             ->setQueryString($unhandledFilterQueryString);
         $this->view->acknowledgedObjects = $acknowledgedObjects;
         $this->view->objectsInDowntime = $objectsInDowntime;
-        $this->view->inDowntimeLink = Url::fromRequest()
-            ->setPath('monitoring/list/downtimes');
+        $this->view->inDowntimeLink = Url::fromPath('monitoring/list/downtimes')
+            ->setQueryString(Filter::matchAny($downtimeFilterExpressions)->toQueryString());
         $this->view->havingCommentsLink = Url::fromRequest()
             ->setPath('monitoring/list/comments');
         $this->view->serviceStatesPieChart = $this->createPieChart(

From a48adb5e4bea9fd72ddc2f39be60ec1b671cda7f Mon Sep 17 00:00:00 2001
From: root <sylph.lin@gmail.com>
Date: Wed, 24 Dec 2014 16:30:30 +0000
Subject: [PATCH 0071/2920] doc: Fix typo in installation.md

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
---
 doc/installation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/installation.md b/doc/installation.md
index 88c9c3650..6eb6737ec 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -26,7 +26,7 @@ repository either via git or http protocol using the following URLs:
   * http://git.icinga.org/icingaweb2.git
 
 There is also a browsable version available at
-[gi.icinga.org](https://git.icinga.org/?p=icingaweb2.git;a=summary "Icinga Web 2 Git Repository").
+[git.icinga.org](https://git.icinga.org/?p=icingaweb2.git;a=summary "Icinga Web 2 Git Repository").
 This version also offers snapshots for easy download which you can use if you do not have git present on your system.
 
 ````

From 7d36a59c67dba7b177f53361f479929c5e19ccd5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 14:01:19 +0100
Subject: [PATCH 0072/2920] Use '@return $this' instead of '@return self' for
 document fluent interfaces in ApplicationBootstrap.php

---
 .../Icinga/Application/ApplicationBootstrap.php  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 81230a7fb..86dcef8c4 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -333,7 +333,7 @@ abstract class ApplicationBootstrap
     /**
      * Setup Icinga auto loader
      *
-     * @return self
+     * @return $this
      */
     public function setupAutoloader()
     {
@@ -366,7 +366,7 @@ abstract class ApplicationBootstrap
     /**
      * Setup module manager
      *
-     * @return self
+     * @return $this
      */
     protected function setupModuleManager()
     {
@@ -381,7 +381,7 @@ abstract class ApplicationBootstrap
     /**
      * Load all enabled modules
      *
-     * @return self
+     * @return $this
      */
     protected function loadEnabledModules()
     {
@@ -396,7 +396,7 @@ abstract class ApplicationBootstrap
     /**
      * Setup default logging
      *
-     * @return  self
+     * @return $this
      */
     protected function setupLogging()
     {
@@ -413,7 +413,7 @@ abstract class ApplicationBootstrap
     /**
      * Load Configuration
      *
-     * @return self
+     * @return $this
      */
     protected function loadConfig()
     {
@@ -432,7 +432,7 @@ abstract class ApplicationBootstrap
     /**
      * Error handling configuration
      *
-     * @return self
+     * @return $this
      */
     protected function setupErrorHandling()
     {
@@ -458,7 +458,7 @@ abstract class ApplicationBootstrap
     /**
      * Set up logger
      *
-     * @return self
+     * @return $this
      */
     protected function setupLogger()
     {
@@ -475,7 +475,7 @@ abstract class ApplicationBootstrap
     /**
      * Set up the resource factory
      *
-     * @return self
+     * @return $this
      */
     protected function setupResourceFactory()
     {

From 611d01788f787bd4c2451bb75c05f224174ff984 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 14:29:31 +0100
Subject: [PATCH 0073/2920] Add setup related utility functions to
 ApplicationBootstrap.php

---
 .../Application/ApplicationBootstrap.php      | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 86dcef8c4..92e97ba39 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -113,6 +113,13 @@ abstract class ApplicationBootstrap
      */
     protected $isWeb = false;
 
+    /**
+     * Whether Icinga Web 2 requires setup
+     *
+     * @type bool
+     */
+    protected $requiresSetup = false;
+
     /**
      * Constructor
      *
@@ -393,6 +400,40 @@ abstract class ApplicationBootstrap
         return $this;
     }
 
+    /**
+     * Load the setup module if Icinga Web 2 requires setup
+     *
+     * @return $this
+     */
+    protected function loadSetupModuleIfNecessary()
+    {
+        if (! @file_exists($this->config->resolvePath('config.ini'))) {
+            $this->requiresSetup = true;
+            $this->moduleManager->loadModule('setup');
+        }
+        return $this;
+    }
+
+    /**
+     * Get whether Icinga Web 2 requires setup
+     *
+     * @return bool
+     */
+    public function requiresSetup()
+    {
+        return $this->requiresSetup;
+    }
+
+    /**
+     * Get whether the setup token exists
+     *
+     * @return bool
+     */
+    public function setupTokenExists()
+    {
+        return @file_exists($this->config->resolvePath('setup.token'));
+    }
+
     /**
      * Setup default logging
      *

From 9d8fab51b1c4f147d70cef111c5cdd360b66fe6f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 14:30:06 +0100
Subject: [PATCH 0074/2920] Use the setup related utility functions in
 AuthenticationController.php

---
 application/controllers/AuthenticationController.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index 00dae1c6d..d2c9d4873 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -15,6 +15,7 @@ use Icinga\Exception\NotReadableError;
 use Icinga\Exception\ConfigurationError;
 use Icinga\User;
 use Icinga\Web\Url;
+use Icinga\Application\Icinga;
 
 /**
  * Application wide controller for authentication
@@ -33,7 +34,8 @@ class AuthenticationController extends ActionController
      */
     public function loginAction()
     {
-        if (@file_exists(Config::resolvePath('setup.token')) && !@file_exists(Config::resolvePath('config.ini'))) {
+        $icinga = Icinga::app();
+        if ($icinga->setupTokenExists() && $icinga->requiresSetup()) {
             $this->redirectNow(Url::fromPath('setup'));
         }
 
@@ -139,7 +141,7 @@ class AuthenticationController extends ActionController
             $this->view->errorInfo = $e->getMessage();
         }
 
-        $this->view->configMissing = is_dir(Config::$configDir) === false;
+        $this->view->requiresSetup = Icinga::app()->requiresSetup();
     }
 
     /**

From 250e05f2e81d448f9f03e6e20fbbfd42331038dd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 14:30:47 +0100
Subject: [PATCH 0075/2920] Optimize imports in AuthenticationController.php

---
 .../controllers/AuthenticationController.php  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index d2c9d4873..2d7926819 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -4,18 +4,18 @@
 
 # namespace Icinga\Application\Controllers;
 
-use Icinga\Authentication\Backend\AutoLoginBackend;
-use Icinga\Web\Controller\ActionController;
-use Icinga\Forms\Authentication\LoginForm;
-use Icinga\Authentication\AuthChain;
 use Icinga\Application\Config;
-use Icinga\Application\Logger;
-use Icinga\Exception\AuthenticationException;
-use Icinga\Exception\NotReadableError;
-use Icinga\Exception\ConfigurationError;
-use Icinga\User;
-use Icinga\Web\Url;
 use Icinga\Application\Icinga;
+use Icinga\Application\Logger;
+use Icinga\Authentication\AuthChain;
+use Icinga\Authentication\Backend\AutoLoginBackend;
+use Icinga\Exception\AuthenticationException;
+use Icinga\Exception\ConfigurationError;
+use Icinga\Exception\NotReadableError;
+use Icinga\Forms\Authentication\LoginForm;
+use Icinga\User;
+use Icinga\Web\Controller\ActionController;
+use Icinga\Web\Url;
 
 /**
  * Application wide controller for authentication

From 74ce666cd85a4ca3b1abf38874cf78b686986a19 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 14:31:07 +0100
Subject: [PATCH 0076/2920] Use the requiresSetup variable instead of
 configMissing in login.phtml

---
 application/views/scripts/authentication/login.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index 416e651d1..a3d8fcfa9 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -15,7 +15,7 @@
    <?php endif ?>
    <?= $this->form ?>
    <div class="footer">Icinga Web 2 &copy; 2013-2014<br><a href="https://www.icinga.org">The Icinga Project</a></div>
-   <?php if ($configMissing): ?>
+   <?php if ($requiresSetup): ?>
    <div class="config-note"><?= sprintf(
      t(
        'It appears that you did not configure Icinga Web 2 yet so it\'s not possible to log in without any defined '

From 839523a73f00a19fcf638751b0befc17182b11ef Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 14:31:34 +0100
Subject: [PATCH 0077/2920] Web: Load setup module if necessary

---
 library/Icinga/Application/Web.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index a21f21025..5b18f1be8 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -104,6 +104,7 @@ class Web extends ApplicationBootstrap
             ->setupZendMvc()
             ->setupFormNamespace()
             ->setupModuleManager()
+            ->loadSetupModuleIfNecessary()
             ->loadEnabledModules()
             ->setupRoute()
             ->setupPagination();

From 19387b24ab726529d3a7fb7cd25b7bfc83c44f55 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 14:32:20 +0100
Subject: [PATCH 0078/2920] Do not use a new function for getting the
 configuration directory in our web wizard

---
 modules/setup/library/Setup/WebWizard.php | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index faa123fe8..8dff112f5 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -9,6 +9,7 @@ use Icinga\Web\Form;
 use Icinga\Web\Wizard;
 use Icinga\Web\Request;
 use Icinga\Application\Config;
+use Icinga\Application\Icinga;
 use Icinga\Application\Platform;
 use Icinga\Module\Setup\Forms\ModulePage;
 use Icinga\Module\Setup\Forms\WelcomePage;
@@ -343,7 +344,7 @@ class WebWizard extends Wizard implements SetupWizard
             );
         }
 
-        $configDir = $this->getConfigDir();
+        $configDir = Icinga::app()->getConfigDir();
         $setup->addStep(
             new MakeDirStep(
                 array(
@@ -528,7 +529,7 @@ class WebWizard extends Wizard implements SetupWizard
             )
         );
 
-        $configDir = $this->getConfigDir();
+        $configDir = Icinga::app()->getConfigDir();
         $requirements->addMandatory(
             mt('setup', 'Writable Config Directory'),
             mt(
@@ -551,21 +552,4 @@ class WebWizard extends Wizard implements SetupWizard
 
         return $requirements;
     }
-
-    /**
-     * Return the configuration directory of Icinga Web 2
-     *
-     * @return  string
-     */
-    protected function getConfigDir()
-    {
-        if (array_key_exists('ICINGAWEB_CONFIGDIR', $_SERVER)) {
-            $configDir = $_SERVER['ICINGAWEB_CONFIGDIR'];
-        } else {
-            $configDir = '/etc/icingaweb';
-        }
-
-        $canonical = realpath($configDir);
-        return $canonical ? $canonical : $configDir;
-    }
 }

From daaf242145fb2d75209d0917e528fedc526421dc Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 14:33:07 +0100
Subject: [PATCH 0079/2920] Fix the default configuration path in our web
 wizard

---
 modules/setup/library/Setup/WebWizard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 8dff112f5..e4d61dfd7 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -534,7 +534,7 @@ class WebWizard extends Wizard implements SetupWizard
             mt('setup', 'Writable Config Directory'),
             mt(
                 'setup',
-                'The Icinga Web 2 configuration directory defaults to "/etc/icingaweb", if' .
+                'The Icinga Web 2 configuration directory defaults to "/etc/icingaweb2", if' .
                 ' not explicitly set in the environment variable "ICINGAWEB_CONFIGDIR".'
             ),
             is_writable($configDir),

From 2bd9d27e054fcf86970e07f59127b19bf676688a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 14:33:37 +0100
Subject: [PATCH 0080/2920] Do not validate the mode of the setup.token

Relying on the mode of the configuration directory must be sufficient.
---
 .../Setup/Web/Form/Validator/TokenValidator.php        | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php b/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php
index 7dc2ea2f9..fa858f531 100644
--- a/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php
+++ b/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php
@@ -38,10 +38,6 @@ class TokenValidator extends Zend_Validate_Abstract
                 mt('setup', 'Cannot validate token, file "%s" is empty. Please define a token.'),
                 $tokenPath
             ),
-            'TOKEN_FILE_PUBLIC' => sprintf(
-                mt('setup', 'Cannot validate token, file "%s" must only be accessible by the webserver\'s user.'),
-                $tokenPath
-            ),
             'TOKEN_INVALID'     => mt('setup', 'Invalid token supplied.')
         );
     }
@@ -56,12 +52,6 @@ class TokenValidator extends Zend_Validate_Abstract
      */
     public function isValid($value, $context = null)
     {
-        $tokenStats = @stat($this->tokenPath);
-        if (($tokenStats['mode'] & 4) === 4) {
-            $this->_error('TOKEN_FILE_PUBLIC');
-            return false;
-        }
-
         try {
             $file = new File($this->tokenPath);
             $expectedToken = trim($file->fgets());

From 94a4b4425f82412dead4a26c57af9763b53d12cd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 15:42:24 +0100
Subject: [PATCH 0081/2920] puppet: Use icingaweb2 instead of icingaweb in
 paths and database setup

---
 .puppet/hiera/common.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.puppet/hiera/common.yaml b/.puppet/hiera/common.yaml
index 0a85ba63a..c76b904bf 100644
--- a/.puppet/hiera/common.yaml
+++ b/.puppet/hiera/common.yaml
@@ -1,7 +1,7 @@
 ---
-icingaweb2::config:   /etc/icingaweb
-icingaweb2::log:      /var/log/icingaweb/icingaweb.log
-icingaweb2::web_path: icingaweb
-icingaweb2::db_user:  icingaweb
-icingaweb2::db_pass:  icingaweb
-icingaweb2::db_name:  icingaweb
+icingaweb2::config:   /etc/icingaweb2
+icingaweb2::log:      /var/log/icingaweb2/icingaweb2.log
+icingaweb2::web_path: icingaweb2
+icingaweb2::db_user:  icingaweb2
+icingaweb2::db_pass:  icingaweb2
+icingaweb2::db_name:  icingaweb2

From e1bedc9afedfa163268f8cb536e18f4f26ad54ca Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 15:55:57 +0100
Subject: [PATCH 0082/2920] Use Icinga 2's default Livestatus socket path as
 default when configuring a livestatus resource

---
 application/forms/Config/Resource/LivestatusResourceForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/forms/Config/Resource/LivestatusResourceForm.php b/application/forms/Config/Resource/LivestatusResourceForm.php
index d90600370..2262cf583 100644
--- a/application/forms/Config/Resource/LivestatusResourceForm.php
+++ b/application/forms/Config/Resource/LivestatusResourceForm.php
@@ -44,7 +44,7 @@ class LivestatusResourceForm extends Form
                 'required'      => true,
                 'label'         => t('Socket'),
                 'description'   => t('The path to your livestatus socket used for querying monitoring data'),
-                'value'         => realpath(Icinga::app()->getApplicationDir() . '/../var/rw/livestatus')
+                'value'         => '/var/run/icinga2/cmd/livestatus'
             )
         );
 

From cfb52eeadb1c0a0404d47bf5b74a9a48cff68ad0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 15:56:32 +0100
Subject: [PATCH 0083/2920] Do not use a default regular expression for
 stripping off parts of a username when configuring an auto-login backend

There's no safe default for this.
---
 .../forms/Config/Authentication/AutologinBackendForm.php    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/forms/Config/Authentication/AutologinBackendForm.php b/application/forms/Config/Authentication/AutologinBackendForm.php
index a21d2c006..97b5dfed7 100644
--- a/application/forms/Config/Authentication/AutologinBackendForm.php
+++ b/application/forms/Config/Authentication/AutologinBackendForm.php
@@ -53,8 +53,10 @@ class AutologinBackendForm extends Form
             'strip_username_regexp',
             array(
                 'label'         => t('Filter Pattern'),
-                'description'   => t('The regular expression to use to strip specific parts off from usernames. Leave empty if you do not want to strip off anything'),
-                'value'         => '/\@[^$]+$/',
+                'description'   => t(
+                    'The regular expression to use to strip specific parts off from usernames.'
+                    . ' Leave empty if you do not want to strip off anything'
+                ),
                 'validators'    => array(
                     new Zend_Validate_Callback(function ($value) {
                         return @preg_match($value, '') !== false;

From 5bc2144b18670fdc98756b87ecfc979be97c5808 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 16:01:07 +0100
Subject: [PATCH 0084/2920] Use 'icingaweb2' as default application prefix for
 logging to syslog

---
 application/forms/Config/General/LoggingConfigForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php
index deed06011..bb9bea33a 100644
--- a/application/forms/Config/General/LoggingConfigForm.php
+++ b/application/forms/Config/General/LoggingConfigForm.php
@@ -67,7 +67,7 @@ class LoggingConfigForm extends Form
                     'required'      => true,
                     'label'         => t('Application Prefix'),
                     'description'   => t('The name of the application by which to prefix syslog messages.'),
-                    'value'         => 'icingaweb',
+                    'value'         => 'icingaweb2',
                     'validators'    => array(
                         array(
                             'Regex',

From f0fe6246acf8e3b1c0d1b9c8b7524ac450b7d99c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 16:02:40 +0100
Subject: [PATCH 0085/2920] Use '/var/log/icingaweb2/icingaweb2.log' as default
 path when logging to file

---
 .../forms/Config/General/LoggingConfigForm.php       | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php
index bb9bea33a..759c2a6e3 100644
--- a/application/forms/Config/General/LoggingConfigForm.php
+++ b/application/forms/Config/General/LoggingConfigForm.php
@@ -106,7 +106,7 @@ class LoggingConfigForm extends Form
                     'required'      => true,
                     'label'         => t('File path'),
                     'description'   => t('The full path to the log file to write messages to.'),
-                    'value'         => $this->getDefaultLogDir(),
+                    'value'         => '/var/log/icingaweb2/icingaweb2.log',
                     'validators'    => array(new WritablePathValidator())
                 )
             );
@@ -114,14 +114,4 @@ class LoggingConfigForm extends Form
 
         return $this;
     }
-
-    /**
-     * Return the default logging directory for type 'file'
-     *
-     * @return string
-     */
-    protected function getDefaultLogDir()
-    {
-        return realpath(Icinga::app()->getApplicationDir('../var/log/icingaweb.log'));
-    }
 }

From ff17c3729cfa1b073277f8f5c4278c554a5c26a5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 16:06:34 +0100
Subject: [PATCH 0086/2920] setup: Use 'icingaweb2' as default authentication
 backend name

---
 modules/setup/application/forms/AuthBackendPage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index fac2a7bbd..bd820d352 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -112,7 +112,7 @@ class AuthBackendPage extends Form
         }
 
         $this->addElements($backendForm->getElements());
-        $this->getElement('name')->setValue('icingaweb');
+        $this->getElement('name')->setValue('icingaweb2');
     }
 
     /**

From 4cf8da4bb9bd0bf09cb80ac82b79852126e7ba0c Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 29 Dec 2014 13:30:54 +0100
Subject: [PATCH 0087/2920] Do not focus logout menu item after a recurring
 login

Implement new MenuItemRenderer made for pages that are not part
of the regular site navigation and should trigger a complete site reload
instead of handling it via XHR.
---
 library/Icinga/Web/Menu.php                   |  3 ++-
 .../Web/Menu/ForeignMenuItemRenderer.php      | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 library/Icinga/Web/Menu/ForeignMenuItemRenderer.php

diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 18a17ea67..a74112dc4 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -248,7 +248,8 @@ class Menu implements RecursiveIterator
 
             $section->add(t('Logout'), array(
                 'url'      => 'authentication/logout',
-                'priority' => 700
+                'priority' => 700,
+                'renderer' => 'ForeignMenuItemRenderer'
             ));
         }
     }
diff --git a/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php b/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
new file mode 100644
index 000000000..659709868
--- /dev/null
+++ b/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
@@ -0,0 +1,24 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Web\Menu;
+
+use Icinga\Web\Menu;
+use Icinga\Web\Url;
+
+/**
+ * A menu item with a link that surpasses the regular navigation link behavior
+ */
+class ForeignMenuItemRenderer implements MenuItemRenderer {
+
+    public function render(Menu $menu)
+    {
+        return sprintf(
+            '<a href="%s" target="_self">%s%s<span></span></a>',
+            $menu->getUrl() ?: '#',
+            $menu->getIcon() ? '<img src="' . Url::fromPath($menu->getIcon()) . '" class="icon" /> ' : '',
+            htmlspecialchars($menu->getTitle())
+        );
+    }
+}

From 3d07049fbfc863f28969afd0b16c6bfe9a2ab15f Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 29 Dec 2014 16:14:12 +0100
Subject: [PATCH 0088/2920] Re-render menu item after setting class to active

Force the browser to re-render the menu item, to update the link layout immediately
by recreting the content html.

fixes #7897
---
 public/js/icinga/behavior/navigation.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/public/js/icinga/behavior/navigation.js b/public/js/icinga/behavior/navigation.js
index fde043c01..53fc5c8af 100644
--- a/public/js/icinga/behavior/navigation.js
+++ b/public/js/icinga/behavior/navigation.js
@@ -32,6 +32,15 @@
             if ($outerMenu.size()) {
                 $outerMenu.addClass('active');
             }
+
+            /*
+              Recreate the html content of the menu item to force the browser to update the layout, or else
+              the link would only be visible as active after another click or page reload in Gecko and WebKit.
+              
+              fixes #7897
+            */
+            $selectedMenu.html($selectedMenu.html());
+
         } else {
             // store menu state
             var $menus = $('#menu li.active', el);

From a1950aabbac1699136d1567583bc58a42e52b290 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 29 Dec 2014 16:27:28 +0100
Subject: [PATCH 0089/2920] Fix some obsolete or wrong docstrings

---
 library/Icinga/Web/Controller/ActionController.php | 2 +-
 library/Icinga/Web/Menu.php                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 400803dce..013f31099 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -270,7 +270,7 @@ class ActionController extends Zend_Controller_Action
     /**
      * Redirect to the login path
      *
-     * @param   string      $afterLogin   The action to call when the login was successful. Defaults to '/index/welcome'
+     * @param   Url         $afterLogin   The action to call when the login was successful. Defaults to '/index/welcome'
      *
      * @throws  \Exception
      */
diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index a74112dc4..f0279ea9c 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -367,7 +367,7 @@ class Menu implements RecursiveIterator
     /**
      * Return the url of this menu
      *
-     * @return  string
+     * @return  Url
      */
     public function getUrl()
     {

From 0b8ab18243da17af6c128da18ad691491013a144 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 16:30:44 +0100
Subject: [PATCH 0090/2920] Parsedown: Rename LICENSE.txt to LICENSE

---
 library/vendor/Parsedown/{LICENSE.txt => LICENSE} | 0
 library/vendor/Parsedown/SOURCE                   | 1 +
 2 files changed, 1 insertion(+)
 rename library/vendor/Parsedown/{LICENSE.txt => LICENSE} (100%)

diff --git a/library/vendor/Parsedown/LICENSE.txt b/library/vendor/Parsedown/LICENSE
similarity index 100%
rename from library/vendor/Parsedown/LICENSE.txt
rename to library/vendor/Parsedown/LICENSE
diff --git a/library/vendor/Parsedown/SOURCE b/library/vendor/Parsedown/SOURCE
index c5a2c7c28..43ee6c61c 100644
--- a/library/vendor/Parsedown/SOURCE
+++ b/library/vendor/Parsedown/SOURCE
@@ -4,3 +4,4 @@ DESTINATION=.
 wget -O ${FILENAME}.tar.gz https://github.com/erusev/parsedown/archive/${RELEASE}.tar.gz
 tar xfz ${FILENAME}.tar.gz -C $DESTINATION/ --strip-components 1 $FILENAME/Parsedown.php $FILENAME/LICENSE.txt
 chmod 644 $DESTINATION/Parsedown.php
+mv LICENSE.txt LICENSE

From 57121bf0ea1ddfb099e80286a2d8a65d7316f3a5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 16:31:21 +0100
Subject: [PATCH 0091/2920] dompdf: Rename LICENSE.LGPL to LICENSE

---
 library/vendor/dompdf/{LICENSE.LGPL => LICENSE} | 0
 library/vendor/dompdf/SOURCE                    | 1 +
 2 files changed, 1 insertion(+)
 rename library/vendor/dompdf/{LICENSE.LGPL => LICENSE} (100%)

diff --git a/library/vendor/dompdf/LICENSE.LGPL b/library/vendor/dompdf/LICENSE
similarity index 100%
rename from library/vendor/dompdf/LICENSE.LGPL
rename to library/vendor/dompdf/LICENSE
diff --git a/library/vendor/dompdf/SOURCE b/library/vendor/dompdf/SOURCE
index 9343b58cf..c26253e30 100644
--- a/library/vendor/dompdf/SOURCE
+++ b/library/vendor/dompdf/SOURCE
@@ -1,6 +1,7 @@
 curl https://codeload.github.com/dompdf/dompdf/tar.gz/v0.6.1 -o dompdf-0.6.1.tar.gz
 tar xzf dompdf-0.6.1.tar.gz --strip-components 1 dompdf-0.6.1/{include/*.php,lib,dompdf*.php,LICENSE.LGPL}
 rm dompdf-0.6.1.tar.gz
+mv LICENSE.LGPL LICENSE
 
 curl https://codeload.github.com/PhenX/php-font-lib/tar.gz/0.3.1 -o php-font-lib-0.3.1.tar.gz
 mkdir lib/php-font-lib/classes

From 2d0153464d20ebf3bbb43b1c486757ad33616201 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 16:48:18 +0100
Subject: [PATCH 0092/2920] Add spec file for RHEL (CentOS and Fedora) packages

refs #6401
fixes #6894
---
 icingaweb2.spec | 398 ++++++++++++++++++++++++------------------------
 1 file changed, 198 insertions(+), 200 deletions(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index fb628f995..0b4813bc4 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -1,237 +1,235 @@
-#/**
-# * This file is part of Icinga Web 2.
-# *
-# * Icinga Web 2 - Head for multiple monitoring backends.
-# * Copyright (C) 2014 Icinga Development Team
-# *
-# * This program is free software; you can redistribute it and/or
-# * modify it under the terms of the GNU General Public License
-# * as published by the Free Software Foundation; either version 2
-# * of the License, or (at your option) any later version.
-# *
-# * This program is distributed in the hope that it will be useful,
-# * but WITHOUT ANY WARRANTY; without even the implied warranty of
-# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# * GNU General Public License for more details.
-# *
-# * You should have received a copy of the GNU General Public License
-# * along with this program; if not, write to the Free Software
-# * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-# *
-# * @copyright  2014 Icinga Development Team <info@icinga.org>
-# * @license    http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
-# * @author     Icinga Development Team <info@icinga.org>
-# *
-# */
-
-%define revision 1
-
-%define configdir %{_sysconfdir}/%{name}
-%define sharedir %{_datadir}/%{name}
-%define prefixdir %{_datadir}/%{name}
-%define usermodparam -a -G
-%define logdir %{_localstatedir}/log/%{name}
-%define docdir %{sharedir}/doc
-
-%if "%{_vendor}" == "suse"
-%define phpname php5
-%define phpzendname php5-ZendFramework
-%define apache2modphpname apache2-mod_php5
-%endif
-# SLE 11 = 1110
-%if 0%{?suse_version} == 1110
-%define phpname php53
-%define apache2modphpname apache2-mod_php53
-%define usermodparam -A
-%endif
-
-%if "%{_vendor}" == "redhat"
-%define phpname php
-%define phpzendname php-ZendFramework
-%endif
-
-# el5 requires newer php53 rather than php (5.1)
-%if 0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5"
-%define phpname php53
-%endif
-
-%if "%{_vendor}" == "suse"
-%define apacheconfdir  %{_sysconfdir}/apache2/conf.d
-%define apacheuser wwwrun
-%define apachegroup www
-%define extcmdfile %{_localstatedir}/run/icinga2/cmd/icinga.cmd
-%define livestatussocket %{_localstatedir}/run/icinga2/cmd/livestatus
-%endif
-%if "%{_vendor}" == "redhat"
-%define apacheconfdir %{_sysconfdir}/httpd/conf.d
-%define apacheuser apache
-%define apachegroup apache
-%define extcmdfile %{_localstatedir}/run/icinga2/cmd/icinga.cmd
-%define livestatussocket %{_localstatedir}/run/icinga2/cmd/livestatus
-%endif
-
-Summary:        Open Source host, service and network monitoring Web UI
 Name:           icingaweb2
-Version:        0.0.1
-Release:        %{revision}%{?dist}
-License:        GPLv2
+Version:        2.0.0
+Release:        1.beta2%{?dist}
+Summary:        Icinga Web 2
 Group:          Applications/System
-URL:            http://www.icinga.org
+License:        GPL
+URL:            https://icinga.org
+Source0:        https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
 BuildArch:      noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
+Packager:       Icinga Team <info@icinga.org>
 
-%if "%{_vendor}" == "suse"
-AutoReqProv:    Off
+%if 0%{?fedora} || 0%{?rhel}
+%define wwwconfigdir    %{_sysconfdir}/httpd/conf.d
+%define wwwuser         apache
+%if 0%{?rhel} == 5
+%define php     php53
+%define php_cli php53-cli
+%else
+%define php     php
+%define php_cli php-cli
+%endif
+%if 0%{rhel} == 6
+%define zend php-ZendFramework
+%else
+%define zend %{name}-vendor-Zend
+%endif
 %endif
 
-Source:        icingaweb2-%{version}.tar.gz
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-
-BuildRequires:  %{phpname} >= 5.3.0
-BuildRequires:  %{phpname}-devel >= 5.3.0
-BuildRequires:  %{phpname}-ldap
-BuildRequires:  %{phpname}-pdo
-BuildRequires:  %{phpzendname}
-%if "%{_vendor}" != "suse"
-BuildRequires:  %{phpzendname}-Db-Adapter-Pdo
-BuildRequires:  %{phpzendname}-Db-Adapter-Pdo-Mysql
-BuildRequires:  %{phpzendname}-Db-Adapter-Pdo-Pgsql
-%endif
-
-%if "%{_vendor}" == "redhat"
-%endif
-%if "%{_vendor}" == "suse"
-Requires:       %{phpname}-devel >= 5.3.0
-BuildRequires:  %{phpname}-json
-BuildRequires:  %{phpname}-sockets
-BuildRequires:  %{phpname}-dom
-%endif
-
-Requires:       %{phpname} >= 5.3.0
-Requires:       %{phpzendname}
-Requires:       %{phpname}-ldap
-Requires:       %{phpname}-pdo
-%if "%{_vendor}" == "redhat"
-Requires:       %{phpname}-common
-Requires:       %{phpzendname}-Db-Adapter-Pdo
-Requires:       %{phpzendname}-Db-Adapter-Pdo-Mysql
-Requires:       php-pear
-%endif
-%if "%{_vendor}" == "suse"
-Requires:       %{phpname}-pear
-Requires:       %{phpname}-dom
-Requires:       %{phpname}-tokenizer
-Requires:       %{phpname}-gettext
-Requires:       %{phpname}-ctype
-Requires:       %{phpname}-json
-Requires:       %{apache2modphpname}
-%endif
-
-Requires:       php-Icinga
+Requires(pre):  shadow-utils
+Requires:       %{name}-common = %{version}-%{release}
+Requires:       php-Icinga = %{version}-%{release}
+Requires:       %{name}-vendor-dompdf
+Requires:       %{name}-vendor-HTMLPurifier
+Requires:       %{name}-vendor-JShrink
+Requires:       %{name}-vendor-lessphp
+Requires:       %{name}-vendor-Parsedown
+Requires:       %{zend}
 
 
 %description
-Icinga Web 2 for Icinga 2 or Icinga 1.x using multiple backends
-for example DB IDO.
+Icinga Web 2
+
+
+%define basedir         %{_datadir}/%{name}
+%define bindir          %{_bindir}
+%define configdir       %{_sysconfdir}/%{name}
+%define logdir          %{_localstatedir}/log/%{name}
+%define phpdir          %{_datadir}/php
+%define icingawebgroup  icingaweb2
+
+
+%package common
+Summary:    Common files for Icinga Web 2 and the Icinga CLI
+Group:      Applications/System
+
+%description common
+Common files for Icinga Web 2 and the Icinga CLI
+
+
+%package -n php-Icinga
+Summary:    Icinga Web 2 PHP library
+Group:      Development/Libraries
+Requires:   %{php} >= 5.3.0
+
+%description -n php-Icinga
+Icinga Web 2 PHP library
+
 
 %package -n icingacli
 Summary:        Icinga CLI
 Group:          Applications/System
-Requires:       %{name} = %{version}-%{release}
-Requires:       php-Icinga
+Requires:       %{name}-common = %{version}-%{release}
+Requires:       php-Icinga = %{version}-%{release}
+Requires:       %{php_cli} >= 5.3.0
 
 %description -n icingacli
-Icinga CLI using php-Icinga Icinga Web 2 backend.
-
-%package -n php-Icinga
-Summary:        Icinga Web 2 PHP Libraries
-Group:          Applications/System
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{phpname} >= 5.3.0
-Requires:       %{phpzendname}
+Icinga CLI
 
 
-%description -n php-Icinga
-Icinga Web 2 PHP Libraries required by the web frontend and cli tool.
+%package vendor-dompdf
+Version:    0.6.1
+Release:    1%{?dist}
+Summary:    Icinga Web 2 vendor library dompdf
+Group:      Development/Libraries
+Requires:   %{php} >= 5.3.0
+
+%description vendor-dompdf
+Icinga Web 2 vendor library dompdf
+
+
+%package vendor-HTMLPurifier
+Version:    4.6.0
+Release:    1%{?dist}
+Summary:    Icinga Web 2 vendor library HTMLPurifier
+Group:      Development/Libraries
+Requires:   %{php} >= 5.3.0
+
+%description vendor-HTMLPurifier
+Icinga Web 2 vendor library HTMLPurifier
+
+
+%package vendor-JShrink
+Version:    1.0.1
+Release:    1%{?dist}
+Summary:    Icinga Web 2 vendor library JShrink
+Group:      Development/Libraries
+Requires:   %{php} >= 5.3.0
+
+%description vendor-JShrink
+Icinga Web 2 vendor library JShrink
+
+
+%package vendor-lessphp
+Version:    0.4.0
+Release:    1%{?dist}
+Summary:    Icinga Web 2 vendor library lessphp
+Group:      Development/Libraries
+Requires:   %{php} >= 5.3.0
+
+%description vendor-lessphp
+Icinga Web 2 vendor library lessphp
+
+
+%package vendor-Parsedown
+Version:    1.0.0
+Release:    1%{?dist}
+Summary:    Icinga Web 2 vendor library Parsedown
+Group:      Development/Libraries
+Requires:   %{php} >= 5.3.0
+
+%description vendor-Parsedown
+Icinga Web 2 vendor library Parsedown
+
+
+%package vendor-Zend
+Version:    1.12.9
+Release:    1%{?dist}
+Summary:    Icinga Web 2 vendor library Zend Framework
+Group:      Development/Libraries
+Requires:   %{php} >= 5.3.0
+
+%description vendor-Zend
+Icinga Web 2 vendor library Zend
 
 
 %prep
-#VERSION=0.0.1; git archive --format=tar --prefix=icingaweb2-$VERSION/ HEAD | gzip >icingaweb2-$VERSION.tar.gz
-%setup -q -n %{name}-%{version}
+%setup -q
 
 %build
 
 %install
-[ "%{buildroot}" != "/" ] && [ -d "%{buildroot}" ] && rm -rf %{buildroot}
-
-# prepare configuration for sub packages
-
-# install rhel apache config
-install -D -m0644 packages/files/apache/icingaweb.conf %{buildroot}/%{apacheconfdir}/icingaweb.conf
-
-# install public, library, modules
-%{__mkdir} -p %{buildroot}/%{sharedir}
-%{__mkdir} -p %{buildroot}/%{logdir}
-%{__mkdir} -p %{buildroot}/%{docdir}
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/dashboard
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}/modules
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}/modules/monitoring
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}/enabledModules
-
-# make sure to install local icingacli for setup wizard token generation & webserver config
-%{__cp} -r application doc library modules public bin %{buildroot}/%{sharedir}/
-
-# enable the monitoring module by default
-ln -s %{sharedir}/modules/monitoring %{buildroot}/%{_sysconfdir}/%{name}/enabledModules/monitoring
-## config
-
-# symlink icingacli
-mkdir -p %{buildroot}/usr/bin
-ln -sf %{sharedir}/bin/icingacli %{buildroot}/usr/bin/icingacli
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/{%{basedir}/{modules,library,public},%{bindir},%{configdir},%{logdir},%{phpdir},%{wwwconfigdir}}
+cp -prv application doc var %{buildroot}/%{basedir}
+cp -prv modules/{monitoring,setup} %{buildroot}/%{basedir}/modules
+cp -prv library/Icinga %{buildroot}/%{phpdir}
+cp -prv library/vendor %{buildroot}/%{basedir}/library
+cp -prv public/{css,img,js,error_norewrite.html} %{buildroot}/%{basedir}/public
+cp -pv packages/files/apache/icingaweb2.conf %{buildroot}/%{wwwconfigdir}/icingaweb2.conf
+cp -pv packages/files/bin/icingacli %{buildroot}/%{bindir}
+cp -pv packages/files/public/index.php %{buildroot}/%{basedir}/public
 
 %pre
-# Add apacheuser in the icingacmd group
-# If the group exists, add the apacheuser in the icingacmd group.
-# It is not neccessary that icinga2-web is installed on the same system as
-# icinga and only on systems with icinga installed the icingacmd
-# group exists. In all other cases the user used for ssh access has
-# to be added to the icingacmd group on the remote icinga server.
-getent group icingacmd > /dev/null
-
-if [ $? -eq 0 ]; then
-%{_sbindir}/usermod %{usermodparam} icingacmd %{apacheuser}
-fi
-
-%preun
-
-%post
+getent group icingacmd >/dev/null || groupadd -r icingacmd
+usermod -a -G icingacmd,%{icingawebgroup} %{wwwuser}
+exit 0
 
 %clean
-[ "%{buildroot}" != "/" ] && [ -d "%{buildroot}" ] && rm -rf %{buildroot}
+rm -rf %{buildroot}
 
 %files
-# main dirs
 %defattr(-,root,root)
-%doc etc/schema doc packages/RPM.md
-%attr(755,%{apacheuser},%{apachegroup}) %{sharedir}/public
-%attr(755,%{apacheuser},%{apachegroup}) %{sharedir}/modules
-# configs
+%{basedir}/application/controllers
+%{basedir}/application/fonts
+%{basedir}/application/forms
+%{basedir}/application/layouts
+%{basedir}/application/views
+%{basedir}/doc
+%{basedir}/modules
+%{basedir}/public
+%{wwwconfigdir}/icingaweb2.conf
+%attr(2775,root,%{icingawebgroup}) %dir %{logdir}
+
+
+%pre common
+getent group %{icingawebgroup} >/dev/null || groupadd -r %{icingawebgroup}
+exit 0
+
+%files common
 %defattr(-,root,root)
-%config(noreplace) %attr(-,root,root) %{apacheconfdir}/icingaweb.conf
-%config(noreplace) %attr(-,%{apacheuser},%{apachegroup}) %{configdir}
-# logs
-%attr(2775,%{apacheuser},%{apachegroup}) %dir %{logdir}
-# shipped docs
-%attr(755,%{apacheuser},%{apachegroup}) %{sharedir}/doc
+%{basedir}/application/locale
+%dir %{basedir}/modules
+%attr(2770,root,%{icingawebgroup}) %config(noreplace) %{configdir}
+
 
 %files -n php-Icinga
-%attr(755,%{apacheuser},%{apachegroup}) %{sharedir}/application
-%attr(755,%{apacheuser},%{apachegroup}) %{sharedir}/library
+%defattr(-,root,root)
+%{phpdir}/Icinga
+
 
 %files -n icingacli
-%attr(0755,root,root) /usr/bin/icingacli
-%attr(0755,root,root) %{sharedir}/bin/icingacli
-%attr(0755,root,root) %{sharedir}/bin/license_writer.py
+%defattr(-,root,root)
+%{basedir}/application/clicommands
+%attr(0755,root,root) %{bindir}/icingacli
 
-%changelog
+
+%files vendor-dompdf
+%defattr(-,root,root)
+%{basedir}/library/vendor/dompdf
+
+
+%files vendor-HTMLPurifier
+%defattr(-,root,root)
+%{basedir}/library/vendor/HTMLPurifier
+
+
+%files vendor-JShrink
+%defattr(-,root,root)
+%{basedir}/library/vendor/JShrink
+
+
+%files vendor-lessphp
+%defattr(-,root,root)
+%{basedir}/library/vendor/lessphp
+
+
+%files vendor-Parsedown
+%defattr(-,root,root)
+%{basedir}/library/vendor/Parsedown
+
+
+%files vendor-Zend
+%defattr(-,root,root)
+%{basedir}/library/vendor/Zend

From fd044017fb385e93145243fbe6f51bd98d7c0595 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 17:31:00 +0100
Subject: [PATCH 0093/2920] Revert "Highlight hovered state rows even if there
 is no href"

This reverts commit 73f9328f12a4f3c41c138e77ad2e92a588f1ca59.

Highlighting table rows which do not contain a link does not make sense.

refs #8024
---
 public/css/icinga/monitoring-colors.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index 86268d2ce..1e657101f 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -195,7 +195,7 @@ tr.state.handled td.state {
 }
 
 /* HOVER colors */
-tr.state:hover, tr[href]:hover {
+tr[href]:hover {
   color: black;
   background-color: #eee;
 }

From e376bd628578f816644eac5f2ae417f1f4cc76ef Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 17:54:09 +0100
Subject: [PATCH 0094/2920] monitoring: Fix that exporting a object's history
 throws an exception

fixes #6586
---
 modules/monitoring/application/controllers/ShowController.php  | 3 +--
 .../monitoring/library/Monitoring/Object/MonitoredObject.php   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index efec6665a..ba865deaa 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -73,9 +73,8 @@ class Monitoring_ShowController extends Controller
     public function historyAction()
     {
         $this->getTabs()->activate('history');
-        //$this->view->object->populate();
         $this->view->object->fetchEventHistory();
-        $this->view->history = $this->view->object->eventhistory->paginate($this->params->get('limit', 50));
+        $this->view->history = $this->view->object->eventhistory->getQuery()->paginate($this->params->get('limit', 50));
         $this->handleFormatRequest($this->view->object->eventhistory);
         $this->fetchHostStats();
     }
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 4be004d99..2d9f1f30c 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -421,7 +421,7 @@ abstract class MonitoredObject
         if ($this->type === self::TYPE_SERVICE) {
             $eventHistory->where('service_description', $this->service_description);
         }
-        $this->eventhistory = $eventHistory->getQuery();
+        $this->eventhistory = $eventHistory;
         return $this;
     }
 

From 3bd24c48ff453f2e47b0be154e9f7214b0ccc079 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 17:54:39 +0100
Subject: [PATCH 0095/2920] monitoring: Do not provide export when viewing a
 monitored object

This is simply not possible at the moment.
---
 .../Monitoring/Web/Controller/MonitoredObjectController.php   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 7ee73d575..94dbe3f10 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -223,8 +223,6 @@ abstract class MonitoredObjectController extends Controller
                 )
             );
         }
-        $tabs
-            ->extend(new OutputFormat())
-            ->extend(new DashboardAction());
+        $tabs->extend(new DashboardAction());
     }
 }

From fc05f4d53e50e7f02e0fcfc9ff0c2bd7f650dc74 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 29 Dec 2014 17:55:34 +0100
Subject: [PATCH 0096/2920] setup: Fix the mode of created directories

---
 modules/setup/library/Setup/WebWizard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index e4d61dfd7..102c2c6a0 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -352,7 +352,7 @@ class WebWizard extends Wizard implements SetupWizard
                     $configDir . '/preferences',
                     $configDir . '/enabledModules'
                 ),
-                0775
+                2770
             )
         );
 

From 58cfb679830cdbcf32ecda8e7e30df5ff65b5988 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 09:27:18 +0100
Subject: [PATCH 0097/2920] Load setup module when necessary when bootstrapping
 the CLI

fixes #8146
---
 library/Icinga/Application/Cli.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Application/Cli.php b/library/Icinga/Application/Cli.php
index 7d1a98eec..6341d561e 100644
--- a/library/Icinga/Application/Cli.php
+++ b/library/Icinga/Application/Cli.php
@@ -43,7 +43,8 @@ class Cli extends ApplicationBootstrap
             ->parseBasicParams()
             ->setupLogger()
             ->setupResourceFactory()
-            ->setupModuleManager();
+            ->setupModuleManager()
+            ->loadSetupModuleIfNecessary();
     }
 
     protected function setupLogging()

From c1aff80f7b31b319e93665fcaf7bf4ba6d0683af Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 09:39:11 +0100
Subject: [PATCH 0098/2920] monitoring: Fix "Show resource configuration" link

---
 .../monitoring/application/forms/Config/BackendConfigForm.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index 4b1aa65b6..c60848858 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -253,7 +253,7 @@ class BackendConfigForm extends ConfigForm
                 array(
                     'value' => sprintf(
                         '<a href="%s" data-base-target="_main">%s</a>',
-                        $this->getView()->href('/icingaweb/config/editresource', array('resource' => $resourceName)),
+                        $this->getView()->url('config/editresource', array('resource' => $resourceName)),
                         mt('monitoring', 'Show resource configuration')
                     ),
                     'escape' => false

From d595541d42425e3f793381fc27998bb05155b907 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 09:40:09 +0100
Subject: [PATCH 0099/2920] monitoring: optimize imports in the backend
 configuration form

---
 .../monitoring/application/forms/Config/BackendConfigForm.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index c60848858..3953830fd 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -5,10 +5,10 @@
 namespace Icinga\Module\Monitoring\Forms\Config;
 
 use InvalidArgumentException;
-use Icinga\Web\Notification;
-use Icinga\Forms\ConfigForm;
 use Icinga\Application\Config;
 use Icinga\Exception\ConfigurationError;
+use Icinga\Forms\ConfigForm;
+use Icinga\Web\Notification;
 
 /**
  * Form class for creating/modifying monitoring backends

From 2a1f12354e19f723d7b309d7f298679b1bbe52d4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 09:41:22 +0100
Subject: [PATCH 0100/2920] monitoring: Use '@return $this' when documenting
 fluent interfaces in the backend configuration form

---
 .../monitoring/application/forms/Config/BackendConfigForm.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index 3953830fd..c25c73544 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -36,7 +36,7 @@ class BackendConfigForm extends ConfigForm
      *
      * @param   Config      $resources      The resource configuration
      *
-     * @return  self
+     * @return  $this
      *
      * @throws  ConfigurationError          In case there are no valid monitoring backend resources
      */
@@ -64,7 +64,7 @@ class BackendConfigForm extends ConfigForm
      *
      * @param   array   $values             The values to extend the configuration with
      *
-     * @return  self
+     * @return  $this
      *
      * @throws  InvalidArgumentException    In case the backend does already exist
      */

From 6a67b7fee39928dc81d87db1ff756b58ba7c2a68 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 09:43:35 +0100
Subject: [PATCH 0101/2920] monitoring: add description to @see tags in the
 backend configuration form

---
 .../application/forms/Config/BackendConfigForm.php         | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index c25c73544..54bd8371c 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -160,9 +160,7 @@ class BackendConfigForm extends ConfigForm
     /**
      * Populate the form in case a monitoring backend is being edited
      *
-     * @see Form::onRequest()
-     *
-     * @throws  ConfigurationError      In case the backend name is missing in the request or is invalid
+     * @throws  ConfigurationError  In case the backend name is missing in the request or is invalid
      */
     public function onRequest()
     {
@@ -181,7 +179,8 @@ class BackendConfigForm extends ConfigForm
     }
 
     /**
-     * @see Form::createElements()
+     * (non-PHPDoc)
+     * @see Form::createElements() For the method documentation.
      */
     public function createElements(array $formData)
     {

From 27110ce5943e357d11bcdb9de73c8e9e861bdbfb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 09:44:33 +0100
Subject: [PATCH 0102/2920] monitoring: use @type instead of @var in the
 backend configuration form

---
 .../monitoring/application/forms/Config/BackendConfigForm.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index 54bd8371c..80afbc653 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -18,7 +18,7 @@ class BackendConfigForm extends ConfigForm
     /**
      * The available monitoring backend resources split by type
      *
-     * @var array
+     * @type array
      */
     protected $resources;
 

From 24b2369adba047d49568f15c678946404e878e45 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 09:45:24 +0100
Subject: [PATCH 0103/2920] monitoring: Fix PHPDoc of
 BackendConfigForm::setResourceConfig()

---
 .../monitoring/application/forms/Config/BackendConfigForm.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index 80afbc653..67672dd20 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -34,7 +34,7 @@ class BackendConfigForm extends ConfigForm
     /**
      * Set the resource configuration to use
      *
-     * @param   Config      $resources      The resource configuration
+     * @param   Config  $resourceConfig     The resource configuration
      *
      * @return  $this
      *

From e72361c2cba622da5f441a04b20528dbbe6c52ca Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 09:47:19 +0100
Subject: [PATCH 0104/2920] monitoring: Fix missing return argument in the
 backend configuration form

---
 .../monitoring/application/forms/Config/BackendConfigForm.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index 67672dd20..51d5b5542 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -147,7 +147,7 @@ class BackendConfigForm extends ConfigForm
             }
         } catch (InvalidArgumentException $e) {
             Notification::error($e->getMessage());
-            return;
+            return null;
         }
 
         if ($this->save()) {

From e05e04bb744a803c0f6802bf1e70699920fce564 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 09:47:45 +0100
Subject: [PATCH 0105/2920] monitoring: Uppercasse the first word of comments
 in the backend configuration form

---
 .../monitoring/application/forms/Config/BackendConfigForm.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index 51d5b5542..3ad18c830 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -138,10 +138,10 @@ class BackendConfigForm extends ConfigForm
     {
         $monitoringBackend = $this->request->getQuery('backend');
         try {
-            if ($monitoringBackend === null) { // create new backend
+            if ($monitoringBackend === null) { // Create new backend
                 $this->add($this->getValues());
                 $message = mt('monitoring', 'Monitoring backend "%s" has been successfully created');
-            } else { // edit existing backend
+            } else { // Edit existing backend
                 $this->edit($monitoringBackend, $this->getValues());
                 $message = mt('monitoring', 'Monitoring backend "%s" has been successfully changed');
             }

From d6e331018bb36e7562b870c4fd27f950dfd53d97 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:02:31 +0100
Subject: [PATCH 0106/2920] monitoring: Use Form::translate() in the backend
 configuration form

refs #7551
---
 .../forms/Config/BackendConfigForm.php        | 44 +++++++++----------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index 3ad18c830..ca45c068b 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -28,7 +28,7 @@ class BackendConfigForm extends ConfigForm
     public function init()
     {
         $this->setName('form_config_monitoring_backends');
-        $this->setSubmitLabel(mt('monitoring', 'Save Changes'));
+        $this->setSubmitLabel($this->translate('Save Changes'));
     }
 
     /**
@@ -50,7 +50,7 @@ class BackendConfigForm extends ConfigForm
         }
 
         if (empty($resources)) {
-            throw new ConfigurationError(mt('monitoring', 'Could not find any valid monitoring backend resources'));
+            throw new ConfigurationError($this->translate('Could not find any valid monitoring backend resources'));
         }
 
         $this->resources = $resources;
@@ -72,9 +72,9 @@ class BackendConfigForm extends ConfigForm
     {
         $name = isset($values['name']) ? $values['name'] : '';
         if (! $name) {
-            throw new InvalidArgumentException(mt('monitoring', 'Monitoring backend name missing'));
+            throw new InvalidArgumentException($this->translate('Monitoring backend name missing'));
         } elseif ($this->config->hasSection($name)) {
-            throw new InvalidArgumentException(mt('monitoring', 'Monitoring backend already exists'));
+            throw new InvalidArgumentException($this->translate('Monitoring backend already exists'));
         }
 
         unset($values['name']);
@@ -95,11 +95,11 @@ class BackendConfigForm extends ConfigForm
     public function edit($name, array $values)
     {
         if (! $name) {
-            throw new InvalidArgumentException(mt('monitoring', 'Old monitoring backend name missing'));
+            throw new InvalidArgumentException($this->translate('Old monitoring backend name missing'));
         } elseif (! ($newName = isset($values['name']) ? $values['name'] : '')) {
-            throw new InvalidArgumentException(mt('monitoring', 'New monitoring backend name missing'));
+            throw new InvalidArgumentException($this->translate('New monitoring backend name missing'));
         } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException(mt('monitoring', 'Unknown monitoring backend provided'));
+            throw new InvalidArgumentException($this->translate('Unknown monitoring backend provided'));
         }
 
         unset($values['name']);
@@ -119,9 +119,9 @@ class BackendConfigForm extends ConfigForm
     public function remove($name)
     {
         if (! $name) {
-            throw new InvalidArgumentException(mt('monitoring', 'Monitoring backend name missing'));
+            throw new InvalidArgumentException($this->translate('Monitoring backend name missing'));
         } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException(mt('monitoring', 'Unknown monitoring backend provided'));
+            throw new InvalidArgumentException($this->translate('Unknown monitoring backend provided'));
         }
 
         $backendConfig = $this->config->getSection($name);
@@ -131,8 +131,6 @@ class BackendConfigForm extends ConfigForm
 
     /**
      * Add or edit a monitoring backend and save the configuration
-     *
-     * @see Form::onSuccess()
      */
     public function onSuccess()
     {
@@ -140,10 +138,10 @@ class BackendConfigForm extends ConfigForm
         try {
             if ($monitoringBackend === null) { // Create new backend
                 $this->add($this->getValues());
-                $message = mt('monitoring', 'Monitoring backend "%s" has been successfully created');
+                $message = $this->translate('Monitoring backend "%s" has been successfully created');
             } else { // Edit existing backend
                 $this->edit($monitoringBackend, $this->getValues());
-                $message = mt('monitoring', 'Monitoring backend "%s" has been successfully changed');
+                $message = $this->translate('Monitoring backend "%s" has been successfully changed');
             }
         } catch (InvalidArgumentException $e) {
             Notification::error($e->getMessage());
@@ -167,9 +165,9 @@ class BackendConfigForm extends ConfigForm
         $monitoringBackend = $this->request->getQuery('backend');
         if ($monitoringBackend !== null) {
             if ($monitoringBackend === '') {
-                throw new ConfigurationError(mt('monitoring', 'Monitoring backend name missing'));
+                throw new ConfigurationError($this->translate('Monitoring backend name missing'));
             } elseif (! $this->config->hasSection($monitoringBackend)) {
-                throw new ConfigurationError(mt('monitoring', 'Unknown monitoring backend provided'));
+                throw new ConfigurationError($this->translate('Unknown monitoring backend provided'));
             }
 
             $backendConfig = $this->config->getSection($monitoringBackend)->toArray();
@@ -199,7 +197,7 @@ class BackendConfigForm extends ConfigForm
             'disabled',
             array(
                 'required'  => true,
-                'label'     => mt('monitoring', 'Disable This Backend')
+                'label'     => $this->translate('Disable This Backend')
             )
         );
         $this->addElement(
@@ -207,8 +205,8 @@ class BackendConfigForm extends ConfigForm
             'name',
             array(
                 'required'      => true,
-                'label'         => mt('monitoring', 'Backend Name'),
-                'description'   => mt('monitoring', 'The identifier of this backend')
+                'label'         => $this->translate('Backend Name'),
+                'description'   => $this->translate('The identifier of this backend')
             )
         );
         $this->addElement(
@@ -217,8 +215,8 @@ class BackendConfigForm extends ConfigForm
             array(
                 'required'      => true,
                 'autosubmit'    => true,
-                'label'         => mt('monitoring', 'Backend Type'),
-                'description'   => mt('monitoring', 'The data source used for retrieving monitoring information'),
+                'label'         => $this->translate('Backend Type'),
+                'description'   => $this->translate('The data source used for retrieving monitoring information'),
                 'multiOptions'  => $resourceTypes,
                 'value'         => $resourceType
             )
@@ -229,8 +227,8 @@ class BackendConfigForm extends ConfigForm
             'resource',
             array(
                 'required'      => true,
-                'label'         => mt('monitoring', 'Resource'),
-                'description'   => mt('monitoring', 'The resource to use'),
+                'label'         => $this->translate('Resource'),
+                'description'   => $this->translate('The resource to use'),
                 'multiOptions'  => $this->resources[$resourceType],
                 'autosubmit'    => true
             )
@@ -253,7 +251,7 @@ class BackendConfigForm extends ConfigForm
                     'value' => sprintf(
                         '<a href="%s" data-base-target="_main">%s</a>',
                         $this->getView()->url('config/editresource', array('resource' => $resourceName)),
-                        mt('monitoring', 'Show resource configuration')
+                        $this->translate('Show resource configuration')
                     ),
                     'escape' => false
                 )

From 50bbf77d0c499afa015b4a6317be3ce69bf01400 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:08:33 +0100
Subject: [PATCH 0107/2920] Fix module domain detection in
 Form::getTranslationDomain()

The usage of preg_replace had two errors:
1) The regular expression was wrong
2) $matches[0] always contains the full matched string, not the first parenthesized subpattern

The correct version of preg_replace would've been:

if (preg_match('/^Icinga\\\\Module\\\\([A-Za-z]+)\\\\/', get_called_class(), $matches) === 1) {
    return strtolower($matches[1]);
}

But since there's no benefit of using a regular expression here except less speed, I replaced it
with using explode.

refs #7551
---
 library/Icinga/Web/Form.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 850285baa..64712961f 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -806,19 +806,20 @@ class Form extends Zend_Form
     }
 
     /**
-     * Return the translation domain for this form
+     * Get the translation domain for this form
      *
-     * The returned translation domain is either determined based on
-     * this form's class path or it is the default `icinga' domain
+     * The returned translation domain is either determined based on this form's qualified name or it is the default
+     * 'icinga' domain
      *
-     * @return  string
+     * @return string
      */
     protected function getTranslationDomain()
     {
-        if (preg_match('@^Icinga\\\\Module\\\\([A-z]+)\\\\.*$@', get_called_class(), $matches) === 1) {
-            return strtolower($matches[0]);
+        $parts = explode('\\', get_called_class());
+        if ($parts[1] === 'Module') {
+            // Assume format Icinga\Module\ModuleName\Forms\...
+            return strtolower($parts[2]);
         }
-
         return 'icinga';
     }
 

From c87733debc65ceba04c499cc31ad5fbd680a6091 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:26:19 +0100
Subject: [PATCH 0108/2920] monitoring: Count hosts once in hosts/show.phtml

---
 .../application/views/scripts/hosts/show.phtml        | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 8ae19aa0b..a4629e652 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -2,11 +2,12 @@
     <?= $this->tabs ?>
 </div>
 <div class="content">
-    <?php if (count($objects) === 0): ?>
+    <?php $hostCount = count($objects) ?>
+    <?php if ($hostCount === 0): ?>
         <?= $this->translate('No hosts matching the filter') ?>
     <?php else: ?>
         <div class="hbox-item">
-            <b><?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', array_sum(array_values($hostStates))), array_sum(array_values($hostStates))) ?></b>
+            <b><?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', $hostCount), $hostCount) ?></b>
         </div>
         <div class="hbox-item">
             <?= $this->hostStatesPieChart ?>
@@ -22,9 +23,9 @@
                 $this->translatePlural(
                     '%u Host',
                     '%u Hosts',
-                     count($objects)
-                ), 
-                count($objects)
+                     $hostCount
+                ),
+                $hostCount
             ) ?>
         </h3>
 

From 507aefa9dd64cf3e934f4ebd1b9cea74a238e68d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:30:31 +0100
Subject: [PATCH 0109/2920] monitoring: Count unhandled hosts once in
 hosts/show.phtml

---
 .../monitoring/application/views/scripts/hosts/show.phtml    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index a4629e652..f1db2d9b0 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -62,13 +62,14 @@
 
         <?php if (! empty($unhandledObjects)): ?>
         <h3>
+            <?php $unhandledCount = count($unhandledObjects) ?>
             <?= sprintf(
                 $this->translatePlural(
                     '%u Unhandled Host Problem',
                     '%u Unhandled Host Problems',
-                    count($unhandledObjects)
+                    $unhandledCount
                 ),
-                count($unhandledObjects)
+                $unhandledCount
             ) ?>
         </h3>
         <div>

From 3745d3ebefce5b370d98c896d02521c8a22b0098 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:31:23 +0100
Subject: [PATCH 0110/2920] monitoring: Count acknowledged hosts once in
 hosts/show.phtml

---
 .../monitoring/application/views/scripts/hosts/show.phtml    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index f1db2d9b0..e6fc7f8be 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -90,13 +90,14 @@
 
         <?php if (! empty($acknowledgedObjects)): ?>
             <h2>
+                <?php $acknowledgedCount = count($acknowledgedObjects) ?>
                 <?= sprintf(
                     $this->translatePlural(
                         '%u Acknowledged Host Problem',
                         '%u Acknowledged Host Problems',
-                        count($acknowledgedObjects)
+                        $acknowledgedCount
                     ),
-                    count($acknowledgedObjects)
+                    $acknowledgedCount
                 ) ?>
             </h2>
             <div>

From b82f4e53565b0ceb0ba8930cbbc1555f1093f4d5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:33:32 +0100
Subject: [PATCH 0111/2920] monitoring: Count hosts in downtime once in
 hosts/show.phtml

---
 .../application/views/scripts/hosts/show.phtml         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index e6fc7f8be..dc0165497 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -107,10 +107,18 @@
 
         <?php if (! empty($objectsInDowntime)): ?>
             <h2>
+                <?php $inDowntimeCount = count($objectsInDowntime) ?>
                 <a href="<?= $inDowntimeLink ?>"
                    title="<?= $this->translate('Hosts in downtime') ?>">
                     <?= $this->icon('plug') ?>
-                    <?= sprintf($this->translatePlural('%u host is in downtime', '%u hosts are in downtime', count($objectsInDowntime)),count($objectsInDowntime)) ?>
+                    <?= sprintf(
+                        $this->translatePlural(
+                            '%u host is in downtime',
+                            '%u hosts are in downtime',
+                            $inDowntimeCount
+                        ),
+                        $inDowntimeCount
+                    ) ?>
                 </a>
             </h2>
         <?php endif ?>

From 56102a1e39092c9229f9730a48974ddce740a14e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:35:18 +0100
Subject: [PATCH 0112/2920] monitoring: Count hosts having comments once in
 hosts/show.phtml

---
 .../application/views/scripts/hosts/show.phtml       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index dc0165497..739069416 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -123,12 +123,20 @@
             </h2>
         <?php endif ?>
 
-        <?php if (count($objects->getComments())): ?>
+        <?php $havingCommentsCount = count($objects->getComments()) ?>
+        <?php if ($havingCommentsCount): ?>
             <h2>
                 <a href="<?= $havingCommentsLink ?>"
                    title="<?= $this->translate('Comments') ?>">
                     <?= $this->icon('comment') ?>
-                    <?= sprintf($this->translatePlural('%u comment', '%u comments', count($objects->getComments())), count($objects->getComments())) ?>
+                    <?= sprintf(
+                        $this->translatePlural(
+                            '%u comment',
+                            '%u comments',
+                            $havingCommentsCount
+                        ),
+                        $havingCommentsCount
+                    ) ?>
                 </a>
             </h2>
         <?php endif ?>

From 8594ff6843b4767609cb5f48ca2ee370597ee227 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:38:02 +0100
Subject: [PATCH 0113/2920] monitoring: Remove multi/* view scripts

They are no longer used.
---
 .../scripts/multi/components/comments.phtml   | 25 -------
 .../scripts/multi/components/downtimes.phtml  | 19 ------
 .../scripts/multi/components/flags.phtml      | 25 -------
 .../scripts/multi/components/objectlist.phtml | 65 -------------------
 .../scripts/multi/components/summary.phtml    | 59 -----------------
 .../views/scripts/multi/host.phtml            | 62 ------------------
 .../views/scripts/multi/service.phtml         | 61 -----------------
 7 files changed, 316 deletions(-)
 delete mode 100644 modules/monitoring/application/views/scripts/multi/components/comments.phtml
 delete mode 100644 modules/monitoring/application/views/scripts/multi/components/downtimes.phtml
 delete mode 100644 modules/monitoring/application/views/scripts/multi/components/flags.phtml
 delete mode 100644 modules/monitoring/application/views/scripts/multi/components/objectlist.phtml
 delete mode 100644 modules/monitoring/application/views/scripts/multi/components/summary.phtml
 delete mode 100644 modules/monitoring/application/views/scripts/multi/host.phtml
 delete mode 100644 modules/monitoring/application/views/scripts/multi/service.phtml

diff --git a/modules/monitoring/application/views/scripts/multi/components/comments.phtml b/modules/monitoring/application/views/scripts/multi/components/comments.phtml
deleted file mode 100644
index f477cd953..000000000
--- a/modules/monitoring/application/views/scripts/multi/components/comments.phtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-$objectName = $this->is_service ? 'Services' : 'Hosts';
-
-?><tr class="newsection" data-base-target="_next">
-  <th><a href=<?= sprintf($this->translatePlural('%u Comment', '%u Comments', count($comments)), count($comments)) ?></th>
-  <td>
-    <a href="<?= $this->href('monitoring/command/removecomment', $this->target) ?>"><?=
-        $this->icon('cancel')
-    ?> <?= $this->translate('Remove Comments') ?></a><br />
-    <a href="<?= $this->href('monitoring/command/delaynotifications', $this->target); ?>"><?=
-        $this->icon('bell-off-empty')
-    ?> <?= $this->translate('Delay Notifications') ?></a><br />
-    <a title="<?= $this->translate('Acknowledge all problems on the selected hosts or services') ?>"
-        href="<?= $this->href('monitoring/command/acknowledgeproblem') ?>, $this->target); ?>">
-        <?= $this->icon('ok') ?> Acknowledge
-    </a>
-  </td>
-  <td><a href=" <?= $this->href(
-          'monitoring/list/comments',
-          array('comment_internal_id' => '(' . implode('|', $this->comments) . ')')
-      );
-      ?>"> <?= sprintf($this->translatePlural('%u comment', '%u comments', count($comments)), count($comments)) ?></a>.
-  </td>
-</tr>
diff --git a/modules/monitoring/application/views/scripts/multi/components/downtimes.phtml b/modules/monitoring/application/views/scripts/multi/components/downtimes.phtml
deleted file mode 100644
index af8d841b4..000000000
--- a/modules/monitoring/application/views/scripts/multi/components/downtimes.phtml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-$objectName = $this->is_service ? 'Services' : 'Hosts';
-
-?>
-<tr class="newsection">
-  <th><?= count($downtimes) ?> Downtimes</th>
-  <td>
-    <a href="<?=$this->href('monitoring/command/removedowntime', $this->target); ?>"><?=
-      $this->icon('cancel') ?>Remove Downtimes</a><br />
-    <a title="Schedule downtimes for all selected <?= $objectName ?>" href="<?=
-      $this->href('monitoring/command/scheduledowntime', $this->target) ?>"><?=
-      $this->icon('plug')
-      ?> Schedule Downtimes</a>
-  </td>
-  <td>
-    Change <a data-base-target='_next' href="<?= $this->href('') ?>"> <?= count($downtimes) ?> downtimes</a>.
-  </td>
-</tr>
diff --git a/modules/monitoring/application/views/scripts/multi/components/flags.phtml b/modules/monitoring/application/views/scripts/multi/components/flags.phtml
deleted file mode 100644
index 1269e2f49..000000000
--- a/modules/monitoring/application/views/scripts/multi/components/flags.phtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<form
-    id="<?= $form->getId() ?>"
-    name="<?= $form->getName() ?>"
-    enctype="<?= $form->getEnctype() ?>"
-    action="<?= $form->getAction() ?>"
-    method="post"
->
-  <table class="avp newsection">
-  <?php foreach($this->form->getElements() as $name => $element):
-    if ($element instanceof \Icinga\Web\Form\Element\TriStateCheckbox):
-        $element->setDecorators(array('ViewHelper'));
-    ?>
-    <tr>
-      <th><label for="<?= $element->getName() ?>"> <?= $element->getLabel() ?> </label></th>
-      <td><?= $element->render() ?></td>
-    </tr>
-    <?php else: ?>
-    <tr>
-      <th></th>
-      <td><?= $element->render() ?></td>
-    </tr>
-    <?php endif ?>
-  <?php endforeach ?>
-  </table>
-</form>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/multi/components/objectlist.phtml b/modules/monitoring/application/views/scripts/multi/components/objectlist.phtml
deleted file mode 100644
index 879a13a1d..000000000
--- a/modules/monitoring/application/views/scripts/multi/components/objectlist.phtml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-  
-$objectCount = count($objects);
-
-$links = array();
-for ($i = 0; $i < $objectCount && $i < 5; $i++) {
-    $object = $objects[$i];    
-
-    if ($this->is_service) {
-        $links[] = $this->qlink(
-            $object->host_name . ' ' . $object->service_description,
-            'monitoring/show/service',
-            array(
-                'host' => $object->host_name,
-                'service' => $object->service_description
-            )
-        );
-    } else {
-        $links[] =  $this->qlink(
-            $object->host_name,
-            'monitoring/show/host',
-            array(
-                'host' => $object->host_name
-            )
-        );
-    }
-}
-
-if ($this->is_service) {
-    $objectName = $this->translate('Services');
-    $link = 'monitoring/list/services';
-    $target = array(
-        'host'    => $this->hostquery,
-        'service' => $this->servicequery
-    );
-} else {
-    $objectName = $this->translate('Hosts');
-    $link = 'monitoring/list/hosts';
-    $target = array(
-        'host' => $this->hostquery
-    );
-}
-
-$more = clone $this->url;
-
-
-?><tr class="newsection" data-base-target="_next">
-<th><?= $this->qlink(
-    $this->translate('List all'),
-    $more->setPath($link),
-    null,
-    array('title' => $this->translate('List all selected objects'))
-) ?></th>
-<td colspan="3">
-<?php
-
-echo implode(', ', $links);
-
-if ($objectCount > 5) {
-    echo ' ' . sprintf($this->translate('and %d more'), count($objects) - 5);
-}
-
-?>
-</td>
-</tr>
diff --git a/modules/monitoring/application/views/scripts/multi/components/summary.phtml b/modules/monitoring/application/views/scripts/multi/components/summary.phtml
deleted file mode 100644
index d832624c7..000000000
--- a/modules/monitoring/application/views/scripts/multi/components/summary.phtml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-$cf = $this->getHelper('CommandForm');
-$servicequery = isset($this->servicequery) ? $this->servicequery : '';
-$objectName = $this->is_service ? $this->translate('Services') : $this->translate('Hosts');
-
-$params = array(
-    'host'       => $this->target['host'],
-    'service'    => null,
-    'checktime'  => time(),
-    'forcecheck' => '1'
-);
-if (array_key_exists('service', $this->target)) {
-    $params['service'] = $this->target['service'];
-} else {
-    unset($params['service']);
-}
-?>
-<tr class="newsection">
-  <th><?= count($objects) . ' ' . $objectName ?></th>
-  <td>
-    <a href="<?=
-      $this->href('monitoring/command/reschedulenextcheck', $params) ?>"><?=
-        $this->icon('rescheduel')
-      ?> Recheck</a><br />
-    <a href="<?= $this->href('monitoring/command/reschedulenextcheck', $this->target) ?>"><?=
-       $this->icon('reschedule')
-    ?> Reschedule</a><br />
-  </td>
-  <td>Perform actions on <?=  count($objects) . ' ' . $objectName ?>.</td>
-</tr>
-
-<tr class="newsection">
-  <th><?= $this->problems ?> Problems</th>
-  <td>
-    <a title="Schedule downtimes for all selected hosts" href="<?=
-      $this->href('monitoring/command/scheduledowntime', $this->target) ?>"><?=
-      $this->icon('plug')
-      ?> Schedule Downtimes</a>
-  </td>
-  <td><?= sprintf(
-      'Handle %d problems on %d %s.',
-      $this->problems,
-      count($this->objects),
-      $objectName
-  ) ?></td>
-</tr>
-<tr>
-  <th><?= count($this->unhandled) ?> Unhandled</th>
-  <td colspan="2">
-    <a title="Acknowledge all problems on the selected hosts or services" href="<?=
-      $this->href('monitoring/command/acknowledgeproblem', $this->target) ?>"><?=
-      $this->icon('ok')
-      ?> Acknowledge</a><br />
-    <a title="Remove all acknowledgements from all selected hosts or services" href="<?=
-      $this->href('monitoring/command/removeacknowledgement', $target) ?>"><?=
-      $this->icon('remove_petrol.png') ?> Remove Acknowledgements</a>
-  </td>
-</tr>
diff --git a/modules/monitoring/application/views/scripts/multi/host.phtml b/modules/monitoring/application/views/scripts/multi/host.phtml
deleted file mode 100644
index 6179f6339..000000000
--- a/modules/monitoring/application/views/scripts/multi/host.phtml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-$this->is_service = false;
-$this->hostquery = implode($this->hostnames, ',');
-$this->target = array('host'	=> $this->hostquery);
-?>
-
-<div class="controls">
-    <?= $this->tabs; ?>
-</div>
-
-<div class="content">
-    <?php if (count($objects) === 0): ?>
-         <?= mt('monitoring', 'No hosts matching the filter'); ?>
-    <?php else: ?>
-    <h1> Summary for <?= count($objects) ?> hosts </h1>
-    <?= $this->render('multi/components/objectlist.phtml'); ?>
-    <table class="avp">
-        <tr>
-            <th align="center">
-                <h3><?= array_sum(array_values($states)) ?> Hosts</h3>
-            </th>
-            <th></th>
-        </tr>
-        <tr>
-            <td align="center">
-                <?= $this->pie->render(); ?>
-            </td>
-            <td>
-                <?php
-                foreach ($states as $state => $count) {
-                    if ($count > 0) {
-                        echo ucfirst($state) . ': ' . $count . '<br />';
-                    }
-                }
-                ?>
-            </td>
-            <td></td>
-        </tr>
-    </table>
-
-    <h2> <?=$this->icon('host')?> Host Actions </h2>
-
-        <table class="avp newsection">
-            <tbody>
-                <?= $this->render('multi/components/summary.phtml'); ?>
-                <?= $this->render('multi/components/comments.phtml'); ?>
-                <?= $this->render('multi/components/downtimes.phtml'); ?>
-            </tbody>
-        </table>
-
-    <?= $this->render('multi/components/flags.phtml') ?>
-    <?php endif ?>
-</div>
-
-<a
-    rel="tooltip"
-    title="Submit passive checkresults"
-    href="<?= $this->href('monitoring/command/submitpassivecheckresult', $this->target); ?>"
-    class="button btn-cta btn-common btn-small"
->
-    <i class="icinga-icon-submit"></i>
-</a>
diff --git a/modules/monitoring/application/views/scripts/multi/service.phtml b/modules/monitoring/application/views/scripts/multi/service.phtml
deleted file mode 100644
index dc2e9f19e..000000000
--- a/modules/monitoring/application/views/scripts/multi/service.phtml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-$this->is_service = true;
-$this->hostquery = implode($this->hostnames, ',');
-$this->servicequery = implode($this->servicenames, ',');
-$this->target = array(
-    'host' => $this->hostquery,
-    'service' => $this->servicequery
-);
-?>
-
-<div class="controls">
-<?= $this->tabs ?>
-</div>
-
-<div class="content">
-  <?php if (count($objects) === 0): ?>
-      <?= mt('monitoring', 'No services matching the filter'); ?>
-  <?php else: ?>
-  <h1> Summary for <?= count($objects) ?> services </h1>
-
-  <table style="width: 100%; font-size: 0.8em;">
-    <tr>
-      <th colspan="2"><?= array_sum(array_values($service_states)) ?> Services</th>
-      <th colspan="2"><?= array_sum(array_values($host_states)) ?> Hosts</th>
-    </tr>
-    <tr>
-      <td align="center"><?= $this->service_pie->render() ?></td>
-      <td><?php
-
-          foreach ($service_states as $state => $count) {
-              if ($count > 0) {
-                  echo ucfirst($state) . ': ' . $count . '<br />';
-              }
-          }
-
-      ?></td>
-      <td align="center"><?= $this->host_pie->render() ?></td>
-      <td><?php
-          foreach ($host_states as $state => $count) {
-              if ($count > 0) {
-                  echo ucfirst($state) . ': ' . $count . '<br />';
-              }
-          }
-      ?></td>
-    </tr>
-  </table>
-
-  <h2><?=$this->icon('conf')?> Service Actions</h2>
-
-  <table class="avp newsection">
-    <tbody>
-      <?= $this->render('multi/components/objectlist.phtml') ?>
-      <?= $this->render('multi/components/summary.phtml') ?>
-      <?= $this->render('multi/components/comments.phtml') ?>
-      <?= $this->render('multi/components/downtimes.phtml') ?>
-    </tbody>
-  </table>
-
-  <?= $this->render('multi/components/flags.phtml') ?>
-  <?php endif ?>
-</div>

From b7d6ee75f245250c9dd971b474e8a944c9c3ee84 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:38:43 +0100
Subject: [PATCH 0114/2920] monitoring: Remove the MultiController

The controller is no longer used.
---
 .../controllers/MultiController.php           | 282 ------------------
 1 file changed, 282 deletions(-)
 delete mode 100644 modules/monitoring/application/controllers/MultiController.php

diff --git a/modules/monitoring/application/controllers/MultiController.php b/modules/monitoring/application/controllers/MultiController.php
deleted file mode 100644
index 6deff2fc3..000000000
--- a/modules/monitoring/application/controllers/MultiController.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-use Icinga\Module\Monitoring\Controller;
-use Icinga\Web\Widget\Chart\InlinePie;
-use Icinga\Module\Monitoring\Forms\Command\MultiCommandFlagForm;
-use Icinga\Web\Widget;
-use Icinga\Data\Filter\Filter;
-
-/**
- * Displays aggregations collections of multiple objects.
- */
-class Monitoring_MultiController extends Controller
-{
-    public function hostAction()
-    {
-        $errors  = array();
-        $query = $this->backend->select()->from(
-            'hostStatus',
-            array(
-                'host_name',
-                'host_in_downtime',
-                'host_passive_checks_enabled',
-                'host_obsessing',
-                'host_state',
-                'host_notifications_enabled',
-                'host_event_handler_enabled',
-                'host_flap_detection_enabled',
-                'host_active_checks_enabled',
-                // columns intended for filter-request
-                'host_problem',
-                'host_handled'
-            )
-        )->getQuery();
-        $this->applyQueryFilter($query);
-        $hosts = $query->fetchAll();
-
-        $comments = $this->backend->select()->from('comment', array(
-            'comment_internal_id',
-            'comment_host',
-        ));
-        $this->applyQueryFilter($comments);
-        $uniqueComments = array_keys($this->getUniqueValues($comments->getQuery()->fetchAll(), 'comment_internal_id'));
-
-        // Populate view
-        $this->view->objects = $this->view->hosts = $hosts;
-        $this->view->problems = $this->getProblems($hosts);
-        $this->view->comments = $uniqueComments;
-        $this->view->hostnames = $this->getProperties($hosts, 'host_name');
-        $this->view->downtimes = $this->getDowntimes($hosts);
-        $this->view->errors = $errors;
-        $this->view->states = $this->countStates($hosts, 'host', 'host_name');
-        $this->view->pie = $this->createPie(
-            $this->view->states,
-            $this->view->getHelper('MonitoringState')->getHostStateColors(),
-            mt('monitoring', 'Host State')
-        );
-
-        // Handle configuration changes
-        $this->handleConfigurationForm(array(
-            'host_passive_checks_enabled' => $this->translate('Passive Checks'),
-            'host_active_checks_enabled'  => $this->translate('Active Checks'),
-            'host_notifications_enabled'  => $this->translate('Notifications'),
-            'host_event_handler_enabled'  => $this->translate('Event Handler'),
-            'host_flap_detection_enabled' => $this->translate('Flap Detection'),
-            'host_obsessing'              => $this->translate('Obsessing')
-        ));
-    }
-
-    public function serviceAction()
-    {
-        $errors = array();
-        $query = $this->backend->select()->from('serviceStatus', array(
-            'host_name',
-            'host_state',
-            'service_description',
-            'service_handled',
-            'service_state',
-            'service_in_downtime',
-            'service_passive_checks_enabled',
-            'service_notifications_enabled',
-            'service_event_handler_enabled',
-            'service_flap_detection_enabled',
-            'service_active_checks_enabled',
-            'service_obsessing',
-             // also accept all filter-requests from ListView
-            'service_problem',
-            'service_severity',
-            'service_last_check',
-            'service_state_type',
-            'host_severity',
-            'host_address',
-            'host_last_check'
-        ));
-
-        $this->applyQueryFilter($query);
-        $services = $query->getQuery()->fetchAll();
-
-        $comments = $this->backend->select()->from('comment', array(
-            'comment_internal_id',
-            'comment_host',
-            'comment_service'
-        ));
-        $this->applyQueryFilter($comments);
-        $uniqueComments = array_keys($this->getUniqueValues($comments->getQuery()->fetchAll(), 'comment_internal_id'));
-
-        // populate the view
-        $this->view->objects        = $this->view->services = $services;
-        $this->view->problems       = $this->getProblems($services);
-        $this->view->comments       = $uniqueComments;
-        $this->view->hostnames      = $this->getProperties($services, 'host_name');
-        $this->view->servicenames   = $this->getProperties($services, 'service_description');
-        $this->view->downtimes      = $this->getDowntimes($services);
-        $this->view->service_states = $this->countStates($services, 'service');
-        $this->view->host_states    = $this->countStates($services, 'host', 'host_name');
-        $this->view->service_pie    = $this->createPie(
-            $this->view->service_states,
-            $this->view->getHelper('MonitoringState')->getServiceStateColors(),
-            mt('monitoring', 'Service State')
-        );
-        $this->view->host_pie       = $this->createPie(
-            $this->view->host_states,
-            $this->view->getHelper('MonitoringState')->getHostStateColors(),
-            mt('monitoring', 'Host State')
-        );
-        $this->view->errors         = $errors;
-
-        $this->handleConfigurationForm(array(
-            'service_passive_checks_enabled' => $this->translate('Passive Checks'),
-            'service_active_checks_enabled'  => $this->translate('Active Checks'),
-            'service_notifications_enabled'  => $this->translate('Notifications'),
-            'service_event_handler_enabled'  => $this->translate('Event Handler'),
-            'service_flap_detection_enabled' => $this->translate('Flap Detection'),
-            'service_obsessing'              => $this->translate('Obsessing'),
-        ));
-    }
-
-    protected function applyQueryFilter($query)
-    {
-        $params = clone $this->params;
-        $modifyFilter = $params->shift('modifyFilter');
-
-        $filter = Filter::fromQueryString((string) $params);
-        if ($modifyFilter) {
-            $this->view->filterWidget = Widget::create('filterEditor', array(
-                'filter' => $filter,
-                'query'  => $query
-            ));
-        }
-        $this->view->filter = $filter;
-        $query->applyFilter($filter);
-        return $query;
-    }
-
-    /**
-     * Create an array with all unique values as keys.
-     *
-     * @param array $values     The array containing the objects
-     * @param       $key        The key to access
-     *
-     * @return array
-     */
-    private function getUniqueValues($values, $key)
-    {
-        $unique = array();
-        foreach ($values as $value) {
-            if (is_array($value)) {
-                $unique[$value[$key]] = $value[$key];
-            } else {
-                $unique[$value->$key] = $value->$key;
-            }
-        }
-        return $unique;
-    }
-
-    /**
-     * Get the numbers of problems of the given objects
-     *
-     * @param $objects  The objects containing the problems
-     *
-     * @return int  The problem count
-     */
-    private function getProblems($objects)
-    {
-        $problems = 0;
-        foreach ($objects as $object) {
-            if (property_exists($object, 'host_unhandled_service_count')) {
-                $problems += $object->host_unhandled_service_count;
-            } else if (
-                property_exists($object, 'service_handled') &&
-                !$object->service_handled &&
-                $object->service_state > 0
-            ) {
-                $problems++;
-            }
-        }
-        return $problems;
-    }
-
-    private function countStates($objects, $type = 'host', $unique = null)
-    {
-        $known  = array();
-        if ($type === 'host') {
-            $states = array_fill_keys($this->view->getHelper('MonitoringState')->getHostStateNames(), 0);
-        } else {
-            $states = array_fill_keys($this->view->getHelper('MonitoringState')->getServiceStateNames(), 0);
-        }
-        foreach ($objects as $object) {
-            if (isset($unique)) {
-                if (array_key_exists($object->$unique, $known)) {
-                    continue;
-                }
-                $known[$object->$unique] = true;
-            }
-            $states[$this->view->monitoringState($object, $type)]++;
-        }
-        return $states;
-    }
-
-    private function createPie($states, $colors, $title)
-    {
-        $chart = new InlinePie(array_values($states), $title, $colors);
-        $chart->setLabel(array_keys($states))->setSize(100);
-        $chart->setTitle($title);
-        return $chart;
-    }
-
-
-    private function getComments($objects)
-    {
-        $unique = array();
-        foreach ($objects as $object) {
-            $unique = array_merge($unique, $this->getUniqueValues($object->comments, 'comment_internal_id'));
-        }
-        return array_keys($unique);
-    }
-
-    private function getProperties($objects, $property)
-    {
-        $objectnames = array();
-        foreach ($objects as $object) {
-            $objectnames[] = $object->$property;
-        }
-        return $objectnames;
-    }
-
-    private function getDowntimes($objects)
-    {
-        $downtimes = array();
-        foreach ($objects as $object)
-        {
-            if (
-                (property_exists($object, 'host_in_downtime') && $object->host_in_downtime) ||
-                (property_exists($object, 'service_in_downtime') && $object->service_in_downtime)
-            ) {
-                $downtimes[] = true;
-            }
-        }
-        return $downtimes;
-    }
-
-
-    /**
-     * Handle the form to edit configuration flags.
-     *
-     * @param $flags array  The used flags.
-     */
-    private function handleConfigurationForm(array $flags)
-    {
-        $this->view->form = $form = new MultiCommandFlagForm($flags);
-        $this->view->formElements = $form->buildCheckboxes();
-        $form->setRequest($this->_request);
-        if ($form->isSubmittedAndValid()) {
-            // TODO: Handle commands
-            $changed = $form->getChangedValues();
-        }
-        if ($this->_request->isPost() === false) {
-            $this->view->form->initFromItems($this->view->objects);
-        }
-    }
-}

From 41ef926fd6511aecba184a803c2ed81b3a044a5d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:39:33 +0100
Subject: [PATCH 0115/2920] monitoring: Remove the CommandController

The controller is no longer used.
---
 .../controllers/CommandController.php         | 1098 -----------------
 1 file changed, 1098 deletions(-)
 delete mode 100644 modules/monitoring/application/controllers/CommandController.php

diff --git a/modules/monitoring/application/controllers/CommandController.php b/modules/monitoring/application/controllers/CommandController.php
deleted file mode 100644
index d2615104a..000000000
--- a/modules/monitoring/application/controllers/CommandController.php
+++ /dev/null
@@ -1,1098 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-use Icinga\Application\Icinga;
-use Icinga\Application\Config;
-use Icinga\Application\Logger;
-use Icinga\Module\Monitoring\Forms\Command\DisableNotificationWithExpireForm;
-use Icinga\Module\Monitoring\Forms\Command\SingleArgumentCommandForm;
-use Icinga\Web\Form;
-use Icinga\Web\Url;
-use Icinga\Web\Notification;
-use Icinga\Module\Monitoring\Controller;
-use Icinga\Protocol\Commandpipe\CommandPipe;
-use Icinga\Exception\ConfigurationError;
-use Icinga\Exception\MissingParameterException;
-use Icinga\Module\Monitoring\Forms\Command\AcknowledgeForm;
-use Icinga\Module\Monitoring\Forms\Command\CommentForm;
-use Icinga\Module\Monitoring\Forms\Command\CommandForm;
-use Icinga\Module\Monitoring\Forms\Command\CustomNotificationForm;
-use Icinga\Module\Monitoring\Forms\Command\DelayNotificationForm;
-use Icinga\Module\Monitoring\Forms\Command\RescheduleNextCheckForm;
-use Icinga\Module\Monitoring\Forms\Command\ScheduleDowntimeForm;
-use Icinga\Module\Monitoring\Forms\Command\SubmitPassiveCheckResultForm;
-use Icinga\Exception\IcingaException;
-
-/**
- * Class Monitoring_CommandController
- *
- * Interface to send commands and display forms
- */
-class Monitoring_CommandController extends Controller
-{
-    const DEFAULT_VIEW_SCRIPT = 'renderform';
-
-    /**
-     * Command target
-     *
-     * @var CommandPipe
-     */
-    private $target;
-
-    /**
-     * Current form working on
-     *
-     * @var Form
-     */
-    private $form;
-
-    /**
-     * Setter for form
-     *
-     * @param CommandForm $form
-     */
-    public function setForm(CommandForm $form)
-    {
-        $this->form = $form;
-    }
-
-    /**
-     * Test if we have a valid form object
-     *
-     * @return bool
-     */
-    public function issetForm()
-    {
-        return $this->form !== null && ($this->form instanceof Form);
-    }
-
-    protected function addTitleTab($action)
-    {
-        $this->getTabs()->add($action, array(
-            'title' => ucfirst($action),
-            'url' => Url::fromRequest()
-        ))->activate($action);
-    }
-
-    /**
-     * Post dispatch method
-     *
-     * When we have a form put it into the view
-     */
-    public function postDispatch()
-    {
-
-        if ($this->issetForm()) {
-            if ($this->form->isSubmittedAndValid()) {
-                $this->_helper->viewRenderer->setNoRender(true);
-                $this->_helper->layout()->disableLayout();
-                $this->ignoreXhrBody();
-                if ($this->_request->getHeader('referer') && ! $this->getRequest()->isXmlHttpRequest()) {
-                    $this->redirect($this->_request->getHeader('referer'));
-                }
-            } else {
-                $this->view->form = $this->form;
-            }
-        }
-        parent::postDispatch();
-    }
-
-    /**
-     * Controller configuration
-     *
-     * @throws Icinga\Exception\ConfigurationError
-     */
-    public function init()
-    {
-        if ($this->_request->isPost()) {
-            $instance = $this->_request->getPost('instance');
-            $targetConfig = Config::module('monitoring', 'instances');
-            if ($instance) {
-                if ($targetConfig->get($instance)) {
-                    $this->target = new CommandPipe($targetConfig->get($instance));
-                } else {
-                    throw new ConfigurationError(
-                        $this->translate('Instance is not configured: %s'),
-                        $instance
-                    );
-                }
-            } else {
-                if ($targetConfig && $targetInfo = $targetConfig->current()) {
-                    // Take the very first section
-                    $this->target = new CommandPipe($targetInfo);
-                } else {
-                    throw new ConfigurationError($this->translate('No instances are configured yet'));
-                }
-            }
-        }
-
-        if ($this->getRequest()->getActionName() !== 'list') {
-            $this->_helper->viewRenderer->setRender(self::DEFAULT_VIEW_SCRIPT);
-        }
-
-        $this->view->objects = array();
-    }
-
-    /**
-     * Retrieve all existing targets for host- and service combination
-     *
-     * @param $hostOnly         Ignore the service parameters
-     *                          (for example when using commands that only make sense for hosts)
-     * @return array            Array of monitoring objects
-     * @throws Icinga\Exception\MissingParameterException
-     */
-    private function selectCommandTargets($hostOnly = false)
-    {
-        $query = null;
-
-        $fields = array(
-            'host_name',
-            'host_state'
-        );
-
-        try {
-            $hostname    =  $this->getParam('host', null);
-            $servicename =  $this->getParam('service', null);
-
-            if (!$hostname && !$servicename) {
-                throw new MissingParameterException('No target given for this command');
-            }
-
-            if ($servicename && !$hostOnly) {
-                $fields[] = 'service_description';
-                $query = $this->backend->select()
-                    ->from('serviceStatus', $fields)
-                    ->where('host', $hostname)
-                    ->where('service', $servicename);
-            } elseif ($hostname) {
-                $query = $this->backend->select()->from('hostStatus', $fields)->where('host', $hostname);
-            } else {
-                throw new MissingParameterException('hostOnly command got no hostname');
-            }
-            return $query->getQuery()->fetchAll();
-
-        } catch (\Exception $e) {
-            Logger::error(
-                "CommandController: SQL Query '%s' failed (message %s) ",
-                $query ? (string) $query->dump() : '--', $e->getMessage()
-            );
-            return array();
-        }
-    }
-
-    /**
-     * Convert other params into valid command structure
-     *
-     * @param   array   $supported  Array of supported parameter names
-     * @param   array   $params     Parameters from request
-     *
-     * @return  array               Return
-     */
-    private function selectOtherTargets(array $supported, array $params)
-    {
-        $others = array_diff_key($supported, array('host' => true, 'service' => true));
-        $otherParams = array_intersect_key($params, $others);
-        $out = array();
-
-        foreach ($otherParams as $name => $value) {
-            $data = new stdClass();
-            $data->{$name} = $value;
-            $out[] = $data;
-        }
-
-        return $out;
-    }
-
-    /**
-     * Displays a list of all commands
-     *
-     * This method uses reflection on the sourcecode to determine all *Action classes and return
-     * a list of them (ignoring the listAction)
-     */
-    public function listAction()
-    {
-        $reflection = new ReflectionObject($this);
-        $commands = array();
-        $methods = $reflection->getMethods(ReflectionMethod::IS_PUBLIC);
-        foreach ($methods as $method) {
-            $name = $method->getName();
-            if ($name !== 'listAction' && preg_match('/Action$/', $name)) {
-                $commands[] = preg_replace('/Action$/', '', $name);
-            }
-        }
-        $this->view->commands = $commands;
-    }
-
-    /**
-     * Tell the controller that at least one of the parameters in $supported is required to be availabe
-     *
-     * @param  array    $supported      An array of properties to check for existence in the POST or GET parameter list
-     * @throws Exception                When non of the supported parameters is given
-     */
-    private function setSupportedParameters(array $supported)
-    {
-        $objects = array();
-
-        $supported = array_flip($supported);
-
-        $given = array_intersect_key($supported, $this->getRequest()->getParams());
-
-        if (empty($given)) {
-            throw new IcingaException(
-                'Missing parameter, supported: %s',
-                implode(', ', array_flip($supported))
-            );
-        }
-
-        if (isset($given['host'])) {
-            $objects = $this->selectCommandTargets(!in_array("service", $supported));
-            if (empty($objects)) {
-                throw new IcingaException('No objects found for your command');
-            }
-        }
-
-        $this->view->objects = $objects;
-    }
-
-    // ------------------------------------------------------------------------
-    // Commands for hosts / services
-    // ------------------------------------------------------------------------
-
-    /**
-     * Handle command disableactivechecks
-     */
-    public function disableactivechecksAction()
-    {
-        $this->setSupportedParameters(array('host', 'service', 'global'));
-
-        $form = new SingleArgumentCommandForm();
-
-        $form->setCommand(
-            'DISABLE_HOST_CHECK',
-            'DISABLE_SVC_CHECK'
-        );
-
-        $form->setGlobalCommands(
-            'STOP_EXECUTING_HOST_CHECKS',
-            'STOP_EXECUTING_SVC_CHECKS'
-        );
-
-        $form->setRequest($this->getRequest());
-        $form->setSubmitLabel($this->translate('Disable Active Checks'));
-
-        if ($form->provideGlobalCommand()) {
-            $form->addNote($this->translate('Disable active checks on a program-wide basis.'));
-        } else {
-            $form->addNote($this->translate('Disable active checks for this object.'));
-        }
-
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, active checks will be disabled'));
-        }
-    }
-
-    /**
-     * Handle command  enableactivechecks
-     */
-    public function enableactivechecksAction()
-    {
-        $this->setSupportedParameters(array('host', 'service', 'global'));
-        $form = new SingleArgumentCommandForm();
-        $form->setCommand('ENABLE_HOST_CHECK', 'ENABLE_SVC_CHECK');
-        $form->setGlobalCommands('START_EXECUTING_HOST_CHECKS', 'START_EXECUTING_SVC_CHECKS');
-
-        $form->setRequest($this->getRequest());
-        $form->setSubmitLabel($this->translate('Enable Active Checks'));
-        if ($form->provideGlobalCommand()) {
-            $form->addNote($this->translate('Enable active checks on a program-wide basis.'));
-        } else {
-            $form->addNote($this->translate('Enable active checks for this object.'));
-        }
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, active checks will be enabled'));
-        }
-    }
-
-    /**
-     * Handle command  reschedulenextcheck
-     */
-    public function reschedulenextcheckAction()
-    {
-        $this->addTitleTab('Reschedule Next Check');
-        $this->setSupportedParameters(array('host', 'service'));
-        $form = new RescheduleNextCheckForm();
-        $form->setRequest($this->getRequest());
-        $form->setConfiguration(Config::app());
-
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, check will be rescheduled'));
-        }
-    }
-
-    /**
-     * Handle command  submitpassivecheckresult
-     */
-    public function submitpassivecheckresultAction()
-    {
-        $this->setSupportedParameters(array('host', 'service'));
-        $type = SubmitPassiveCheckResultForm::TYPE_SERVICE;
-        if ($this->getParam('service', null) === null) {
-            $type = SubmitPassiveCheckResultForm::TYPE_HOST;
-        }
-
-        $form = new SubmitPassiveCheckResultForm();
-        $form->setRequest($this->getRequest());
-        $form->setType($type);
-
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Passive check result has been submitted'));
-        }
-    }
-
-    /**
-     * Handle command stopobsessing
-     */
-    public function stopobsessingAction()
-    {
-        $this->setSupportedParameters(array('host', 'service', 'global'));
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->getRequest());
-        $form->setSubmitLabel($this->translate('Stop obsessing'));
-
-        if ($form->provideGlobalCommand() === true) {
-            $form->addNote($this->translate('Disable obsessing on a program-wide basis.'));
-        } else {
-            $form->addNote($this->translate('Stop obsessing over this object.'));
-        }
-
-        $form->setCommand(
-            'STOP_OBSESSING_OVER_HOST',
-            'STOP_OBSESSING_OVER_SVC'
-        );
-
-        $form->setGlobalCommands(
-            'STOP_OBSESSING_OVER_HOST_CHECKS',
-            'STOP_OBSESSING_OVER_SVC_CHECKS'
-        );
-
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, obsessing will be disabled'));
-        }
-    }
-
-    /**
-     * Handle command startobsessing
-     */
-    public function startobsessingAction()
-    {
-        $this->setSupportedParameters(array('host', 'service', 'global'));
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->getRequest());
-        $form->setSubmitLabel($this->translate('Start obsessing'));
-
-        if ($form->provideGlobalCommand() === true) {
-            $form->addNote($this->translate('Enable obsessing on a program-wide basis.'));
-        } else {
-            $form->addNote($this->translate('Start obsessing over this object.'));
-        }
-
-        $form->setCommand(
-            'START_OBSESSING_OVER_HOST',
-            'START_OBSESSING_OVER_SVC'
-        );
-
-        $form->setGlobalCommands(
-            'START_OBSESSING_OVER_HOST_CHECKS',
-            'START_OBSESSING_OVER_SVC_CHECKS'
-        );
-
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, obsessing will be enabled'));
-        }
-    }
-
-    /**
-     * Handle command stopacceptingpassivechecks
-     */
-    public function stopacceptingpassivechecksAction()
-    {
-        $this->setSupportedParameters(array('host', 'service', 'global'));
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->getRequest());
-        $form->setSubmitLabel($this->translate('Stop Accepting Passive Checks'));
-
-        if ($form->provideGlobalCommand() === true) {
-            $form->addNote($this->translate('Disable passive checks on a program-wide basis.'));
-        } else {
-            $form->addNote($this->translate('Passive checks for this object will be omitted.'));
-        }
-
-        $form->setCommand(
-            'DISABLE_PASSIVE_HOST_CHECKS',
-            'DISABLE_PASSIVE_SVC_CHECKS'
-        );
-
-        $form->setGlobalCommands(
-            'STOP_ACCEPTING_PASSIVE_HOST_CHECKS',
-            'STOP_ACCEPTING_PASSIVE_SVC_CHECKS'
-        );
-
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, passive check results will be refused'));
-        }
-    }
-
-    /**
-     * Handle command startacceptingpassivechecks
-     */
-    public function startacceptingpassivechecksAction()
-    {
-        $this->setSupportedParameters(array('host', 'service', 'global'));
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->getRequest());
-        $form->setSubmitLabel($this->translate('Start Accepting Passive Checks'));
-
-        if ($form->provideGlobalCommand() === true) {
-            $form->addNote($this->translate('Enable passive checks on a program-wide basis.'));
-        } else {
-            $form->addNote($this->translate('Passive checks for this object will be accepted.'));
-        }
-
-        $form->setCommand(
-            'ENABLE_PASSIVE_HOST_CHECKS',
-            'ENABLE_PASSIVE_SVC_CHECKS'
-        );
-
-        $form->setGlobalCommands(
-            'START_ACCEPTING_PASSIVE_HOST_CHECKS',
-            'START_ACCEPTING_PASSIVE_SVC_CHECKS'
-        );
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, passive check results will be accepted'));
-        }
-    }
-
-    /**
-     * Disable notifications with expiration
-     *
-     * This is a global command only
-     */
-    public function disablenotificationswithexpireAction()
-    {
-        $this->setParam('global', 1);
-        $form = new DisableNotificationWithExpireForm();
-        $form->setRequest($this->_request);
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, notifications will be disabled'));
-        }
-    }
-
-    /**
-     * Handle command disablenotifications
-     */
-    public function disablenotificationsAction()
-    {
-        $this->setSupportedParameters(array('host', 'service', 'global'));
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->getRequest());
-
-        $form->setSubmitLabel($this->translate('Disable Notifications'));
-
-        if ($form->provideGlobalCommand() === true) {
-            $form->addNote($this->translate('Disable notifications on a program-wide basis.'));
-        } else {
-            $form->addNote($this->translate('Notifications for this object will be disabled.'));
-        }
-
-        $form->setCommand('DISABLE_HOST_NOTIFICATIONS', 'DISABLE_SVC_NOTIFICATIONS');
-        $form->setGlobalCommands('DISABLE_NOTIFICATIONS');
-
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, notifications will be disabled'));
-        }
-
-    }
-
-    /**
-     * Handle command enablenotifications
-     */
-    public function enablenotificationsAction()
-    {
-        $this->addTitleTab('Enable Notifications');
-        $this->setSupportedParameters(array('host', 'service', 'global'));
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->getRequest());
-
-        $form->setSubmitLabel($this->translate('Enable Notifications'));
-
-        if ($form->provideGlobalCommand() === true) {
-            $form->addNote($this->translate('Enable notifications on a program-wide basis.'));
-        } else {
-            $form->addNote($this->translate('Notifications for this object will be enabled.'));
-        }
-
-        $form->setCommand('ENABLE_HOST_NOTIFICATIONS', 'ENABLE_SVC_NOTIFICATIONS');
-        $form->setGlobalCommands('ENABLE_NOTIFICATIONS');
-
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, notifications will be enabled'));
-        }
-    }
-
-    /**
-     * Handle command sendcustomnotification
-     */
-    public function sendcustomnotificationAction()
-    {
-        $this->setSupportedParameters(array('host', 'service'));
-        $form = new CustomNotificationForm();
-        $form->setRequest($this->getRequest());
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Custom notification has been sent'));
-        }
-    }
-
-    /**
-     * Handle command scheduledowntime
-     */
-    public function scheduledowntimeAction()
-    {
-        $this->addTitleTab('Schedule Downtime');
-        $this->setSupportedParameters(array('host', 'service'));
-        $form = new ScheduleDowntimeForm();
-        $form->setRequest($this->getRequest());
-        $form->setConfiguration(Config::app());
-        $form->setWithChildren(false);
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Downtime scheduling requested'));
-        }
-    }
-
-    /**
-     * Handle command scheduledowntimeswithchildren
-     */
-    public function scheduledowntimeswithchildrenAction()
-    {
-        $this->setSupportedParameters(array('host'));
-        $form = new ScheduleDowntimeForm();
-        $form->setRequest($this->getRequest());
-        $form->setConfiguration(Config::app());
-        $form->setWithChildren(true);
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Downtime scheduling requested'));
-        }
-    }
-
-    /**
-     * Handle command removedowntimeswithchildren
-     */
-    public function removedowntimeswithchildrenAction()
-    {
-        $this->setSupportedParameters(array('host'));
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->getRequest());
-        $form->setSubmitLabel($this->translate('Remove Downtime(s)'));
-        $form->addNote($this->translate('Remove downtime(s) from this host and its services.'));
-        $form->setCommand('DEL_DOWNTIME_BY_HOST_NAME', 'DEL_DOWNTIME_BY_HOST_NAME');
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Downtime removal requested'));
-        }
-    }
-
-    /**
-     * Handle command disablenotificationswithchildren
-     */
-    public function disablenotificationswithchildrenAction()
-    {
-        $this->setSupportedParameters(array('host'));
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->getRequest());
-        $form->setSubmitLabel($this->translate('Disable Notifications'));
-        $form->addNote($this->translate('Notifications for this host and its services will be disabled.'));
-        $form->setCommand('DISABLE_ALL_NOTIFICATIONS_BEYOND_HOST');
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            $form->setCommand('DISABLE_HOST_NOTIFICATIONS', 'DISABLE_SVC_NOTIFICATIONS');
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, notifications will be disabled'));
-        }
-    }
-
-    /**
-     * Handle command enablenotificationswithchildren
-     */
-    public function enablenotificationswithchildrenAction()
-    {
-        $this->setSupportedParameters(array('host'));
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->getRequest());
-        $form->setSubmitLabel($this->translate('Enable Notifications'));
-        $form->addNote($this->translate('Notifications for this host and its services will be enabled.'));
-        $form->setCommand('ENABLE_ALL_NOTIFICATIONS_BEYOND_HOST');
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            $form->setCommand('ENABLE_HOST_NOTIFICATIONS', 'ENABLE_SVC_NOTIFICATIONS');
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, notifications will be enabled'));
-        }
-    }
-
-    /**
-     * Handle command reschedulenextcheckwithchildren
-     */
-    public function reschedulenextcheckwithchildrenAction()
-    {
-        $this->setSupportedParameters(array('host'));
-        $form = new RescheduleNextCheckForm();
-        $form->setRequest($this->getRequest());
-        $form->setConfiguration(Config::app());
-        $form->setWithChildren(true);
-
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, checks will be rescheduled'));
-        }
-    }
-
-    /**
-     * Handle command disableactivecheckswithchildren
-     */
-    public function disableactivecheckswithchildrenAction()
-    {
-        $this->setSupportedParameters(array('host'));
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->getRequest());
-        $form->setSubmitLabel($this->translate('Disable Active Checks'));
-        $form->addNote($this->translate('Disable active checks for this host and its services.'));
-        $form->setCommand('DISABLE_HOST_CHECK');
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            // @TODO(mh): Missing child command
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, active checks will be disabled'));
-        }
-    }
-
-    /**
-     * Handle command enableactivecheckswithchildren
-     */
-    public function enableactivecheckswithchildrenAction()
-    {
-        $this->setSupportedParameters(array('host'));
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->getRequest());
-        $form->setSubmitLabel($this->translate('Enable Active Checks'));
-        $form->addNote($this->translate('Enable active checks for this host and its services.'));
-        $form->setCommand('ENABLE_HOST_CHECK');
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            // @TODO(mh): Missing child command
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, active checks will be enabled'));
-        }
-    }
-
-    /**
-     * Handle command disableeventhandler
-     */
-    public function disableeventhandlerAction()
-    {
-        $this->setSupportedParameters(array('host', 'service', 'global'));
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->getRequest());
-        $form->setSubmitLabel($this->translate('Disable Event Handler'));
-
-        if ($form->provideGlobalCommand() === true) {
-            $form->addNote($this->translate('Disable event handler for the whole system.'));
-        } else {
-            $form->addNote($this->translate('Disable event handler for this object.'));
-        }
-
-        $form->setCommand(
-            'DISABLE_HOST_EVENT_HANDLER',
-            'DISABLE_SVC_EVENT_HANDLER'
-        );
-
-        $form->setGlobalCommands('DISABLE_EVENT_HANDLERS');
-
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, event handlers will be disabled'));
-        }
-    }
-
-    /**
-     * Handle command enableeventhandler
-     */
-    public function enableeventhandlerAction()
-    {
-        $this->setSupportedParameters(array('host', 'service', 'global'));
-
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->getRequest());
-        $form->setSubmitLabel($this->translate('Enable Event Handler'));
-
-        if ($form->provideGlobalCommand() === true) {
-            $form->addNote($this->translate('Enable event handlers on the whole system.'));
-        } else {
-            $form->addNote($this->translate('Enable event handler for this object.'));
-        }
-
-        $form->setCommand(
-            'ENABLE_HOST_EVENT_HANDLER',
-            'ENABLE_SVC_EVENT_HANDLER'
-        );
-
-        $form->setGlobalCommands('ENABLE_EVENT_HANDLERS');
-
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, event handlers will be enabled'));
-        }
-    }
-
-    /**
-     * Handle command disableflapdetection
-     */
-    public function disableflapdetectionAction()
-    {
-        $this->setSupportedParameters(array('host', 'service', 'global'));
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->getRequest());
-        $form->setSubmitLabel($this->translate('Disable Flapping Detection'));
-
-        if ($form->provideGlobalCommand() === true) {
-            $form->addNote($this->translate('Disable flapping detection on a program-wide basis.'));
-        } else {
-            $form->addNote($this->translate('Disable flapping detection for this object.'));
-        }
-
-        $form->setCommand(
-            'DISABLE_HOST_FLAP_DETECTION',
-            'DISABLE_SVC_FLAP_DETECTION'
-        );
-
-        $form->setGlobalCommands(
-            'DISABLE_FLAP_DETECTION'
-        );
-
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, flap detection will be disabled'));
-        }
-    }
-
-    /**
-     * Handle command enableflapdetection
-     */
-    public function enableflapdetectionAction()
-    {
-        $this->setSupportedParameters(array('host', 'service', 'global'));
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->getRequest());
-        $form->setSubmitLabel($this->translate('Enable Flapping Detection'));
-
-        if ($form->provideGlobalCommand() === true) {
-            $form->addNote($this->translate('Enable flapping detection on a program-wide basis.'));
-        } else {
-            $form->addNote($this->translate('Enable flapping detection for this object.'));
-        }
-
-        $form->setCommand(
-            'ENABLE_HOST_FLAP_DETECTION',
-            'ENABLE_SVC_FLAP_DETECTION'
-        );
-
-        $form->setGlobalCommands(
-            'ENABLE_FLAP_DETECTION'
-        );
-
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, flap detection will be enabled'));
-        }
-    }
-
-    /**
-     * Handle command addcomment
-     */
-    public function addcommentAction()
-    {
-        $this->addTitleTab('Add comment');
-        $this->setSupportedParameters(array('host', 'service'));
-        $form = new CommentForm();
-        $form->setRequest($this->_request);
-
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Your new comment has been submitted'));
-        }
-    }
-
-    /**
-     * Remove a single comment
-     */
-    public function removecommentAction()
-    {
-        $this->addTitleTab('Remove Comment');
-        $this->setSupportedParameters(array('commentid', 'host', 'service'));
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->_request);
-        $form->setCommand('DEL_HOST_COMMENT', 'DEL_SVC_COMMENT');
-        $form->setParameterName('commentid');
-        $form->setSubmitLabel($this->translate('Remove comment'));
-        $form->setObjectIgnoreFlag(true);
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Comment removal has been requested'));
-        }
-    }
-
-    /**
-     * Handle command resetattributes
-     */
-    public function resetattributesAction()
-    {
-        $this->setSupportedParameters(array('host', 'service'));
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->getRequest());
-        $form->setSubmitLabel($this->translate('Reset Attributes'));
-        $form->addNote($this->translate('Reset modified attributes to its default.'));
-        $form->setCommand('CHANGE_HOST_MODATTR', 'CHANGE_SVC_MODATTR');
-        $form->setParameterValue(0);
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-        }
-    }
-
-    /**
-     * Handle command acknowledgeproblem
-     */
-    public function acknowledgeproblemAction()
-    {
-        $this->addTitleTab('Acknowledge Problem');
-        $this->setSupportedParameters(array('host', 'service'));
-        $form = new AcknowledgeForm();
-        $form->setRequest($this->getRequest());
-        $form->setConfiguration(Config::app());
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Acknowledgement has been sent'));
-        }
-
-        $this->setForm($form);
-    }
-
-    /**
-     * Handle command removeacknowledgement
-     */
-    public function removeacknowledgementAction()
-    {
-        $this->addTitleTab('Remove Acknowledgement');
-        $this->setSupportedParameters(array('host', 'service'));
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->getRequest());
-        $form->setSubmitLabel($this->translate('Remove Problem Acknowledgement'));
-        $form->addNote($this->translate('Remove problem acknowledgement for this object.'));
-        $form->setCommand('REMOVE_HOST_ACKNOWLEDGEMENT', 'REMOVE_SVC_ACKNOWLEDGEMENT');
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Acknowledgement removal has been requested'));
-        }
-    }
-
-    /**
-     * Handle command delaynotification
-     */
-    public function delaynotificationAction()
-    {
-        $this->setSupportedParameters(array('host', 'service'));
-        $form = new DelayNotificationForm();
-        $form->setRequest($this->getRequest());
-
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Notification delay has been requested'));
-        }
-    }
-
-    /**
-     * Handle command removedowntime
-     */
-    public function removedowntimeAction()
-    {
-        $this->setSupportedParameters(array('host', 'service', 'downtimeid'));
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->getRequest());
-
-        $form->setSubmitLabel($this->translate('Delete Downtime'));
-        $form->setParameterName('downtimeid');
-        $form->addNote($this->translate('Delete a single downtime with the id shown above'));
-        $form->setCommand('DEL_HOST_DOWNTIME', 'DEL_SVC_DOWNTIME');
-        $form->setObjectIgnoreFlag(true);
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Downtime removal has been requested'));
-        }
-    }
-
-    /**
-     * Shutdown the icinga process
-     */
-    public function shutdownprocessAction()
-    {
-        $this->setParam('global', '1');
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->_request);
-
-        $form->setSubmitLabel($this->translate('Shutdown monitoring process'));
-        $form->addNote($this->translate('Stop monitoring instance. You have to start it again from command line.'));
-        $form->setGlobalCommands('SHUTDOWN_PROCESS');
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, process will shut down'));
-        }
-    }
-
-    /**
-     * Restart the icinga process
-     */
-    public function restartprocessAction()
-    {
-        $this->setParam('global', '1');
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->_request);
-
-        $form->setSubmitLabel($this->translate('Restart monitoring process'));
-        $form->addNote($this->translate('Restart the monitoring process.'));
-        $form->setGlobalCommands('RESTART_PROCESS');
-
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, monitoring process will restart now'));
-        }
-    }
-
-    /**
-     * Disable processing of performance data
-     */
-    public function disableperformancedataAction()
-    {
-        $this->setParam('global', 1);
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->_request);
-
-        $form->setSubmitLabel($this->translate('Disable Performance Data'));
-        $form->addNote($this->translate('Disable processing of performance data on a program-wide basis.'));
-
-        $form->setGlobalCommands('DISABLE_PERFORMANCE_DATA');
-
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, performance data processing will be disabled'));
-        }
-    }
-
-    /**
-     * Enable processing of performance data
-     */
-    public function enableperformancedataAction()
-    {
-        $this->setParam('global', 1);
-        $form = new SingleArgumentCommandForm();
-        $form->setRequest($this->_request);
-
-        $form->setSubmitLabel($this->translate('Enable Performance Data'));
-        $form->addNote($this->translate('Enable processing of performance data on a program-wide basis.'));
-
-        $form->setGlobalCommands('ENABLE_PERFORMANCE_DATA');
-
-        $this->setForm($form);
-
-        if ($form->IsSubmittedAndValid() === true) {
-            $this->target->sendCommand($form->createCommand(), $this->view->objects);
-            Notification::success($this->translate('Command has been sent, performance data processing will be enabled'));
-        }
-    }
-}

From c28f4284e4536378e81856e5c3d4934c70999381 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:40:56 +0100
Subject: [PATCH 0116/2920] monitoring: Remove the command/* view scripts

They are no longer used.
---
 .../views/scripts/command/list.phtml          | 10 --------
 .../views/scripts/command/renderform.phtml    | 25 -------------------
 2 files changed, 35 deletions(-)
 delete mode 100644 modules/monitoring/application/views/scripts/command/list.phtml
 delete mode 100644 modules/monitoring/application/views/scripts/command/renderform.phtml

diff --git a/modules/monitoring/application/views/scripts/command/list.phtml b/modules/monitoring/application/views/scripts/command/list.phtml
deleted file mode 100644
index 747dd4b5e..000000000
--- a/modules/monitoring/application/views/scripts/command/list.phtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<h4><?= mt('monitoring', 'List Of Supported Commands'); ?></h4>
-<ul>
-  <?php foreach($this->commands as $command): ?>
-  <li>
-    <a href="<?= $this->href('monitoring/command/'. $command); ?>">
-      <?= $this->escape($command); ?>
-    </a>
-  </li>
-  <?php endforeach; ?>
-</ul>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/command/renderform.phtml b/modules/monitoring/application/views/scripts/command/renderform.phtml
deleted file mode 100644
index 9c8e79428..000000000
--- a/modules/monitoring/application/views/scripts/command/renderform.phtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="controls">
-<?= $this->tabs ?>
-</div>
-<div class="content">
-<?php if (isset($this->objects) && !empty($this->objects) && isset($this->objects[0]->host_name)): ?>
-<table class="objectlist">
-  <thead>
-    <tr>
-      <th><?= $this->icon('host') ?> Host</th>
-      <th><?= $this->icon('conf') ?> Service</th>
-    </tr>
-  </thead>
-    <tbody>
-<?php foreach ($this->objects as $object): ?>
-      <tr>
-        <td><?= $object->host_name; ?></td>
-        <td><?= (isset($object->service_description) ? $object->service_description : '') ?></td>
-      </tr>
-<?php endforeach; ?>
-    </tbody>
-</table>
-
-<?php endif ?>
-<?= $this->form ?>
-</div>

From 3d95e37b7f99ad42d9990b50c28a4635b88a017b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:43:39 +0100
Subject: [PATCH 0117/2920] monitoring: Count services once in
 services/show.phtml

---
 .../monitoring/application/views/scripts/services/show.phtml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index e8a4c70a1..5b39489e2 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -2,13 +2,14 @@
     <?= $this->tabs ?>
 </div>
 <div class="content">
-    <?php if (count($objects) === 0): ?>
+    <?php $serviceCount = count($objects) ?>
+    <?php if ($serviceCount === 0): ?>
         <?= $this->translate('No services matching the filter') ?>
     <?php else: ?>
 
         <div class="hbox">
             <div class="hbox-item" style="width: 6em;">
-                <b><?= sprintf($this->translatePlural('Service (%u)', 'Services (%u)', array_sum(array_values($serviceStates))), array_sum(array_values($serviceStates))) ?></b>
+                <b><?= sprintf($this->translatePlural('Service (%u)', 'Services (%u)', $serviceCount), $serviceCount) ?></b>
             </div>
             <div class="hbox-item">
                 <?= $this->serviceStatesPieChart ?>

From a7a99b5856423ddbb29807886a11a2f5d2b1ca6f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:44:22 +0100
Subject: [PATCH 0118/2920] monitoring: Count hosts once in services/show.phtml

---
 .../monitoring/application/views/scripts/services/show.phtml   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 5b39489e2..2e73c8c5d 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -23,7 +23,8 @@
 
         <div class="hbox">
             <div class="hbox-item" style="width: 6em;">
-                <b><?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', array_sum(array_values($hostStates))), array_sum(array_values($hostStates))) ?></b>
+                <?php $hostCount = array_sum(array_values($hostStates)) ?>
+                <b><?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', $hostCount), $hostCount) ?></b>
             </div>
             <div class="hbox-item">
                 <?= $this->hostStatesPieChart ?>

From df3d7d2034772d12c7cac6e49d6663babeaf4970 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:45:24 +0100
Subject: [PATCH 0119/2920] monitoring: Count unhandled services once in
 services/show.phtml

---
 .../monitoring/application/views/scripts/services/show.phtml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 2e73c8c5d..794849141 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -70,13 +70,14 @@
 
         <?php if (! empty($unhandledObjects)): ?>
         <h3>
+            <?php $unhandledCount = count($unhandledObjects) ?>
             <?= sprintf(
                 $this->translatePlural(
                     '%u Unhandled Service Problem',
                     '%u Unhandled Service Problems',
-                    count($unhandledObjects)
+                    $unhandledCount
                 ),
-                count($unhandledObjects)
+                $unhandledCount
             ) ?>
         </h3>
         <div>

From 128f6822f1baf4fb562de8aaff0df8364cd0c8c3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:46:08 +0100
Subject: [PATCH 0120/2920] monitoring: Count acknowledged services once in
 services/show.phtml

---
 .../monitoring/application/views/scripts/services/show.phtml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 794849141..46e3babf1 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -98,13 +98,14 @@
 
         <?php if (! empty($acknowledgedObjects)): ?>
             <h2>
+                <?php $acknowledgedCount = count($acknowledgedObjects) ?>
                 <?= sprintf(
                     $this->translatePlural(
                         '%u Acknowledged Service Problem',
                         '%u Acknowledged Service Problems',
-                        count($acknowledgedObjects)
+                        $acknowledgedCount
                     ),
-                    count($acknowledgedObjects)
+                    $acknowledgedCount
                 ) ?>
             </h2>
             <div>

From 2e4e04551d8e062426ac0df959e768b97b59c801 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:47:10 +0100
Subject: [PATCH 0121/2920] monitoring: Count services in downtime once in
 services/show.phtml

---
 .../application/views/scripts/services/show.phtml      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 46e3babf1..cb19c2f5f 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -115,10 +115,18 @@
 
         <?php if (! empty($objectsInDowntime)): ?>
             <h2>
+                <?php $inDowntimeCount = count($objectsInDowntime) ?>
                 <a href="<?= $inDowntimeLink ?>"
                    title="<?= $this->translate('Services in downtime') ?>">
                     <?= $this->icon('plug') ?>
-                    <?= sprintf($this->translatePlural('%u service is in downtime', '%u services are in downtime', count($objectsInDowntime)), count($objectsInDowntime)) ?>
+                    <?= sprintf(
+                        $this->translatePlural(
+                            '%u service is in downtime',
+                            '%u services are in downtime',
+                            $inDowntimeCount
+                        ),
+                        $inDowntimeCount
+                    ) ?>
                 </a>
             </h2>
         <?php endif ?>

From 9c989306d9ba8ca4fddf27793876e8abd55fe768 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:48:30 +0100
Subject: [PATCH 0122/2920] monitoring: Count services having comments once in
 services/show.phtml

---
 .../application/views/scripts/services/show.phtml    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index cb19c2f5f..65049b792 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -131,12 +131,20 @@
             </h2>
         <?php endif ?>
 
-        <?php if (count($objects->getComments())): ?>
+        <?php $havingCommentsCount = count($objects->getComments()) ?>
+        <?php if ($havingCommentsCount): ?>
             <h2>
                 <a href="<?= $havingCommentsLink ?>"
                    title="<?= $this->translate('Comments') ?>">
                     <?= $this->icon('comment') ?>
-                    <?= sprintf($this->translatePlural('%u comment', '%u comments', count($objects->getComments())), count($objects->getComments())) ?>
+                    <?= sprintf(
+                        $this->translatePlural(
+                            '%u comment',
+                            '%u comments',
+                            $havingCommentsCount
+                        ),
+                        $havingCommentsCount
+                    ) ?>
                 </a>
             </h2>
         <?php endif ?>

From a37d68b235ffefb4f47d2a3c07eef95287062cc7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:51:33 +0100
Subject: [PATCH 0123/2920] monitoring: Remove run.php

The monitoring module still registered the obsolete top bar hook.
---
 modules/monitoring/run.php | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 modules/monitoring/run.php

diff --git a/modules/monitoring/run.php b/modules/monitoring/run.php
deleted file mode 100644
index 8f4ee1b67..000000000
--- a/modules/monitoring/run.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-$this->registerHook(
-    'TopBar',
-    'Icinga\\Module\\Monitoring\\Web\\Hook\\TopBar'
-);

From c59c0e6cdb180efcca6d5afa00125c2e27c0e6d1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:52:12 +0100
Subject: [PATCH 0124/2920] monitoring: Remove top bar hook layout

No longer in use.
---
 .../views/scripts/layout/topbar.phtml         | 65 -------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 modules/monitoring/application/views/scripts/layout/topbar.phtml

diff --git a/modules/monitoring/application/views/scripts/layout/topbar.phtml b/modules/monitoring/application/views/scripts/layout/topbar.phtml
deleted file mode 100644
index f7c58db85..000000000
--- a/modules/monitoring/application/views/scripts/layout/topbar.phtml
+++ /dev/null
@@ -1,65 +0,0 @@
-<div class="nav navbar-nav topbar-host-status-summary">
-    <span class="topbar-status-up">
-        <a href="<?= $this->href('monitoring/list/hosts', array('host_state' => 0)); ?>" title="<?= $this->translate('Hosts Up') ?>">
-            <?= $hostSummary->hosts_up ?>
-        </a>
-    </span>
-    <span class="topbar-status-down">
-        <a href="<?= $this->href('monitoring/list/hosts', array('host_state' => 1, 'host_unhandled' => 1)); ?>" title="<?= $this->translate('Hosts Down Unhandled') ?>">
-            <?= $hostSummary->hosts_down_unhandled ?>
-        </a>/
-        <a href="<?= $this->href('monitoring/list/hosts', array('host_state' => 1, 'host_handled' => 1)); ?>" title="<?= $this->translate('Hosts Down Handled') ?>">
-            <?= $hostSummary->hosts_down_handled ?>
-        </a>
-    </span>
-    <span class="topbar-status-unreachable">
-        <a href="<?= $this->href('monitoring/list/hosts', array('host_state' => 2, 'host_unhandled' => 1)); ?>" title="<?= $this->translate('Hosts Unreachable Unhandled') ?>">
-            <?= $hostSummary->hosts_unreachable_unhandled ?>
-        </a>/
-        <a href="<?= $this->href('monitoring/list/hosts', array('host_state' => 2, 'host_handled' => 1)); ?>" title="<?= $this->translate('Hosts Unreachable Handled') ?>">
-            <?= $hostSummary->hosts_unreachable_handled ?>
-        </a>
-    </span>
-    <span class="topbar-status-pending">
-        <a href="<?= $this->href('monitoring/list/hosts', array('host_state' => 99)); ?>" title="<?= $this->translate('Hosts Pending') ?>">
-            <?= $hostSummary->hosts_pending ?>
-        </a>
-    </span>
-</div>
-
-<div class="nav navbar-nav topbar-service-status-summary">
-    <span class="topbar-status-ok">
-        <a href="<?= $this->href('monitoring/list/services', array('service_state' => 0)); ?>" title="<?= $this->translate('Services Ok') ?>">
-            <?= $serviceSummary->services_ok ?>
-        </a>
-    </span>
-    <span class="topbar-status-critical">
-        <a href="<?= $this->href('monitoring/list/services', array('service_state' => 2, 'service_unhandled' => 1)); ?>" title="<?= $this->translate('Services Critical Unhandled') ?>">
-            <?= $serviceSummary->services_critical_unhandled ?>
-        </a>/
-        <a href="<?= $this->href('monitoring/list/services', array('service_state' => 2, 'service_handled' => 1)); ?>" title="<?= $this->translate('Services Critical Handled') ?>">
-            <?= $serviceSummary->services_critical_handled ?>
-        </a>
-    </span>
-    <span class="topbar-status-warning">
-        <a href="<?= $this->href('monitoring/list/services', array('service_state' => 1, 'service_unhandled' => 1)); ?>" title="<?= $this->translate('Services Warning Unhandled') ?>">
-            <?= $serviceSummary->services_warning_unhandled ?>
-        </a>/
-        <a href="<?= $this->href('monitoring/list/services', array('service_state' => 1, 'service_handled' => 1)); ?>" title="<?= $this->translate('Services Warning Handled') ?>">
-            <?= $serviceSummary->services_warning_handled ?>
-        </a>
-    </span>
-    <span class="topbar-status-unknown">
-        <a href="<?= $this->href('monitoring/list/services', array('service_state' => 3, 'service_unhandled' => 1)); ?>" title="<?= $this->translate('Services Unknown Unhandled') ?>">
-            <?= $serviceSummary->services_unknown_unhandled ?>
-        </a>/
-        <a href="<?= $this->href('monitoring/list/services', array('service_state' => 3, 'service_handled' => 1)); ?>" title="<?= $this->translate('Services Unknown Handled') ?>">
-            <?= $serviceSummary->services_unknown_handled ?>
-        </a>
-    </span>
-    <span class="topbar-status-pending">
-        <a href="<?= $this->href('monitoring/list/services', array('service_state' => 99)); ?>" title="<?= $this->translate('Services Pending') ?>">
-            <?= $serviceSummary->services_pending ?>
-        </a>
-    </span>
-</div>

From a781b8c60705d7072e796234025f17a18e22116b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 10:52:57 +0100
Subject: [PATCH 0125/2920] monitoring: Remove the top bar hook

No longer in use.
---
 .../library/Monitoring/Web/Hook/TopBar.php    | 61 -------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 modules/monitoring/library/Monitoring/Web/Hook/TopBar.php

diff --git a/modules/monitoring/library/Monitoring/Web/Hook/TopBar.php b/modules/monitoring/library/Monitoring/Web/Hook/TopBar.php
deleted file mode 100644
index 082a03c5b..000000000
--- a/modules/monitoring/library/Monitoring/Web/Hook/TopBar.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Monitoring\Web\Hook;
-
-use Icinga\Web\Hook\TopBarHook;
-use Icinga\Module\Monitoring\DataView\StatusSummary as StatusSummaryView;
-use Icinga\Web\Request;
-use Zend_View;
-
-/**
- * Render status summary into the topbar of icinga
- */
-class TopBar extends TopBarHook
-{
-    /**
-     * Function to generate top bar content
-     *
-     * @param   Request $request
-     *
-     * @return  string
-     */
-    public function getHtml($request)
-    {
-        $hostSummary = StatusSummaryView::fromRequest(
-            $request,
-            array(
-                'hosts_up',
-                'hosts_unreachable_handled',
-                'hosts_unreachable_unhandled',
-                'hosts_down_handled',
-                'hosts_down_unhandled',
-                'hosts_pending'
-            )
-        )->getQuery()->fetchRow();
-
-        $serviceSummary = StatusSummaryView::fromRequest(
-            $request,
-            array(
-                'services_ok',
-                'services_critical_handled',
-                'services_critical_unhandled',
-                'services_warning_handled',
-                'services_warning_unhandled',
-                'services_unknown_handled',
-                'services_unknown_unhandled',
-                'services_pending'
-            )
-        )->getQuery()->fetchRow();
-
-        return $this->getView()->partial(
-            'layout/topbar.phtml',
-            'monitoring',
-            array(
-                'hostSummary'       => $hostSummary,
-                'serviceSummary'    => $serviceSummary
-            )
-        );
-    }
-}

From a5122f540d7506ecc51cdfecc26f1628f5f0f873 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 11:14:13 +0100
Subject: [PATCH 0126/2920] monitoring: Add 'Notifications' to the 'Overview'
 menu section

---
 modules/monitoring/configuration.php | 29 ++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index b1cdee2de..f56c23d5c 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -127,22 +127,27 @@ $section->add($this->translate('Hostgroups'), array(
     'url'      => 'monitoring/list/hostgroups',
     'priority' => 60
 ));
-$section->add($this->translate('Contactgroups'), array(
-    'url'      => 'monitoring/list/contactgroups',
-    'priority' => 61
-));
-$section->add($this->translate('Downtimes'), array(
-    'url'      => 'monitoring/list/downtimes',
-    'priority' => 71
-));
-$section->add($this->translate('Comments'), array(
-    'url'      => 'monitoring/list/comments?comment_type=(comment|ack)',
-    'priority' => 70
-));
 $section->add($this->translate('Contacts'), array(
     'url'      => 'monitoring/list/contacts',
     'priority' => 70
 ));
+$section->add($this->translate('Contactgroups'), array(
+    'url'      => 'monitoring/list/contactgroups',
+    'priority' => 70
+));
+$section->add($this->translate('Comments'), array(
+    'url'      => 'monitoring/list/comments?comment_type=(comment|ack)',
+    'priority' => 80
+));
+$section->add($this->translate('Downtimes'), array(
+    'url'      => 'monitoring/list/downtimes',
+    'priority' => 80
+));
+$section->add($this->translate('Notifications'), array(
+    'url'      => 'monitoring/list/notifications',
+    'priority' => 80
+));
+
 
 /*
  * History Section

From ac56cc02acd034fe0be68f440febc94ffe847839 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 11:14:30 +0100
Subject: [PATCH 0127/2920] monitoring: Fix the notifications view script

---
 .../views/scripts/list/notifications.phtml    | 140 ++++++++----------
 1 file changed, 65 insertions(+), 75 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 13736b9f3..939d46eba 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -5,85 +5,75 @@ use Icinga\Module\Monitoring\Object\Service;
 
 ?>
 
-<?php if (!$this->compact): ?>
+<?php if (! $this->compact): ?>
 <div class="controls">
-  <?= $this->tabs ?>
-  <div class="dontprint" style="margin: 1em;">
-    <?= $this->translate('Sort by') ?> <?=  $this->sortControl->render($this) ?>
-  </div>
-  <?= $this->widget('limiter') ?>
-  <?=  $this->paginationControl($notifications, null, null, array('preserve' => $this->preserve)) ?>
- </div>
+    <?= $this->tabs ?>
+    <div class="dontprint" style="margin: 1em;">
+        <?= $this->translate('Sort by') ?> <?= $this->sortControl->render($this) ?>
+    </div>
+    <?= $this->widget('limiter') ?>
+    <?= $this->paginationControl($notifications, null, null, array('preserve' => $this->preserve)) ?>
+</div>
 <?php endif ?>
 
-<?php if (! $this->inline): ?>
 <div class="content">
-<?php endif; ?>
+    <?php if (count($notifications) === 0): ?>
+    <?= $this->translate('No notifications matching the filter') ?>
+    <?php return; endif ?>
 
-<?php
-
-if (empty($this->notifications)) {
-    echo 'No notifications yet</div>';
-    return;
-}
-?>
-
-<table data-base-target="_next" class="action">
-<tbody>
-<?php
-
-if (count($notifications) === 0) {
-    echo mt('monitoring', 'No notifications matching the filter');
-}
-foreach ($notifications as $notification):
-
-  if (isset($notification->service)) {
-      $isService = true;
-      $href = $this->href('monitoring/show/service', array(
-          'host'    => $notification->host,
-          'service' => $notification->service
-      ));
-      $stateName = Service::getStateText($notification->notification_state);
-  } else {
-      $isService = false;
-      $href = $this->href('monitoring/show/host', array(
-          'host'    => $notification->host
-      ));
-      $stateName = Host::getStateText($notification->notification_state);
-  }
-?>
-  <tr class="state <?= $stateName ?>">
-    <td class="state">
-        <?= $this->dateTimeRenderer($notification->notification_start_time)->render(
-                $this->translate('on %s', 'datetime'),
-                $this->translate('at %s', 'time'),
-                $this->translate('%s ago', 'timespan')
-            );
+    <table data-base-target="_next" class="action">
+    <tbody>
+    <?php foreach ($notifications as $notification):
+        if (isset($notification->service)) {
+        $isService = true;
+        $href = $this->href('monitoring/show/service', array(
+            'host'    => $notification->host,
+            'service' => $notification->service
+        ));
+        $stateName = Service::getStateText($notification->notification_state);
+        } else {
+            $isService = false;
+            $href = $this->href('monitoring/show/host', array(
+                'host' => $notification->host
+            ));
+            $stateName = Host::getStateText($notification->notification_state);
+        }
         ?>
-    </td>
-    <td style="font-size: 0.8em">
-      <?php if ($isService): ?>
-        <?= sprintf($this->translate('%s on %s'), "<a href=\"$href\">$notification->service</a>", $notification->host); ?>
-      <?php else: ?>
-        <a href="<?= $href ?>"><?= $notification->host ?></a>
-      <?php endif; ?>
-      <br />
-      <?= $this->escape(substr(strip_tags($notification->notification_output), 0, 10000)); ?>
-      <br />
-      <?php if (!$this->contact): ?>
-      <small>
-          <?= sprintf($this->translate('Sent to %s'), "<a href=\"$this->href(
-              'monitoring/show/contact',
-              array('contact' => $notification->notification_contact)
-          )\">$this->escape($notification->notification_contact)</a>"); ?>
-      </small>
-      <?php endif ?>
-    </td>
-  </tr>
-<?php endforeach ?>
-</tbody>
-</table>
-
-<?php if (!$this->inline): ?>
+        <tr class="state <?= $stateName ?>">
+            <td class="state">
+                <?= $this->dateTimeRenderer($notification->notification_start_time)->render(
+                    $this->translate('on %s', 'datetime'),
+                    $this->translate('at %s', 'time'),
+                    $this->translate('%s ago', 'timespan')
+                ) ?>
+            </td>
+            <td style="font-size: 0.8em">
+                <?php if ($isService): ?>
+                    <?= sprintf(
+                        $this->translate('%s on %s'),
+                        $this->qlink($notification->service, $href), $notification->host
+                    ) ?>
+                <?php else: ?>
+                    <?= $this->qlink($notification->host, $href) ?>
+                <?php endif ?>
+                <br>
+                <?= $this->escape(substr(strip_tags($notification->notification_output), 0, 10000)); ?>
+                <br>
+                <?php if (! $this->contact): ?>
+                    <small>
+                        <?= sprintf(
+                            $this->translate('Sent to %s'),
+                            $this->qlink(
+                                $notification->notification_contact,
+                                'monitoring/show/contact',
+                                array('contact' => $notification->notification_contact)
+                            )
+                        ) ?>
+                    </small>
+                <?php endif ?>
+            </td>
+        </tr>
+    <?php endforeach ?>
+    </tbody>
+    </table>
 </div>
-<?php endif; ?>

From 9af46838b0611edcad7c5c52301bcd6f8d5a635b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 12:26:40 +0100
Subject: [PATCH 0128/2920] Remove the var/log directory

---
 var/log/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 var/log/.gitkeep

diff --git a/var/log/.gitkeep b/var/log/.gitkeep
deleted file mode 100644
index e69de29bb..000000000

From 8eb37d9d766769f49e634e22a8eaf305afdecd74 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 14:33:36 +0100
Subject: [PATCH 0129/2920] Cli/Command: Add @type PHPDoc to params

---
 library/Icinga/Cli/Command.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/library/Icinga/Cli/Command.php b/library/Icinga/Cli/Command.php
index 7546f871f..59d33ae4b 100644
--- a/library/Icinga/Cli/Command.php
+++ b/library/Icinga/Cli/Command.php
@@ -16,6 +16,10 @@ abstract class Command
 {
     protected $app;
     protected $docs;
+
+    /**
+     * @type Params
+     */
     protected $params;
     protected $screen;
     protected $isVerbose;

From 5e812c72f1197c55555aad86042f104b293574f7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 14:37:34 +0100
Subject: [PATCH 0130/2920] cli/webserver config: Fix --config sanity check

---
 modules/setup/application/clicommands/ConfigCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index 676572542..aa1cb98cf 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -113,7 +113,7 @@ class ConfigCommand extends Command
             ));
         }
         $configDir = $this->params->get('config', $webserver->getConfigDir());
-        if (! is_string($documentRoot) || strlen(trim($documentRoot)) === 0) {
+        if (! is_string($configDir) || strlen(trim($configDir)) === 0) {
             $this->fail($this->translate(
                 'The argument --config expects a path to Icinga Web 2\'s configuration files'
             ));

From 70c564bb0e56bca5ba23ba9a2c9b01f7115d5b35 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 14:41:00 +0100
Subject: [PATCH 0131/2920] Cli: Remove useless sprintf format in
 Command::fail()

---
 library/Icinga/Cli/Command.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Cli/Command.php b/library/Icinga/Cli/Command.php
index 59d33ae4b..c410cfc0e 100644
--- a/library/Icinga/Cli/Command.php
+++ b/library/Icinga/Cli/Command.php
@@ -128,7 +128,7 @@ abstract class Command
 
     public function fail($msg)
     {
-        throw new IcingaException('%s', $msg);
+        throw new IcingaException($msg);
     }
 
     public function getDefaultActionName()

From 60b74ddcec094eb342ab0ec49202bd514576126c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 14:41:35 +0100
Subject: [PATCH 0132/2920] Cli: Fix parameter documentation for
 ConfigCommand::webserverAction()

We speak of icingaweb2 not icingaweb now.
---
 .../setup/application/clicommands/ConfigCommand.php    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index aa1cb98cf..d26dfdd80 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -73,11 +73,11 @@ class ConfigCommand extends Command
      *
      * OPTIONS:
      *
-     *  --path=<urlpath>                    The URL path to Icinga Web 2 [/icingaweb]
+     *  --path=<urlpath>                    The URL path to Icinga Web 2 [/icingaweb2]
      *
-     *  --root/--document-root=<directory>  The directory from which the webserver will serve files [./public]
+     *  --root/--document-root=<directory>  The directory from which the webserver will serve files [/path/to/icingaweb2/public]
      *
-     *  --config=<directory>                Path to Icinga Web 2's configuration files [/etc/icingaweb]
+     *  --config=<directory>                Path to Icinga Web 2's configuration files [/etc/icingaweb2]
      *
      *  --file=<filename>                   Write configuration to file [stdout]
      *
@@ -86,9 +86,9 @@ class ConfigCommand extends Command
      *
      * icingacli setup config webserver apache
      *
-     * icingacli setup config webserver apache --path /icingaweb --document-root /usr/share/icingaweb/public --config=/etc/icingaweb
+     * icingacli setup config webserver apache --path /icingaweb2 --document-root /usr/share/icingaweb2/public --config=/etc/icingaweb2
      *
-     * icingacli setup config webserver apache --file /etc/apache2/conf.d/icingaweb.conf
+     * icingacli setup config webserver apache --file /etc/apache2/conf.d/icingaweb2.conf
      *
      * icingacli setup config webserver nginx
      */

From 2d69e4484684019352ce3a56e0da6acc229e1d03 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 14:42:42 +0100
Subject: [PATCH 0133/2920] setup: Set default URL path to /icingaweb2

---
 modules/setup/library/Setup/Webserver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/library/Setup/Webserver.php b/modules/setup/library/Setup/Webserver.php
index 2449f9b9e..dbc55b6a2 100644
--- a/modules/setup/library/Setup/Webserver.php
+++ b/modules/setup/library/Setup/Webserver.php
@@ -24,7 +24,7 @@ abstract class Webserver
      *
      * @var string
      */
-    protected $urlPath = '/icingaweb';
+    protected $urlPath = '/icingaweb2';
 
     /**
      * Path to Icinga Web 2's configuration files

From aea7b068daf8db77ac059c201a511dc8cd77ad2b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 14:43:19 +0100
Subject: [PATCH 0134/2920] setup: Add --config switch to
 TokenCommand::showAction()

refs #7906
---
 .../application/clicommands/TokenCommand.php      | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/setup/application/clicommands/TokenCommand.php b/modules/setup/application/clicommands/TokenCommand.php
index ff0229cfe..0d665cec6 100644
--- a/modules/setup/application/clicommands/TokenCommand.php
+++ b/modules/setup/application/clicommands/TokenCommand.php
@@ -22,11 +22,22 @@ class TokenCommand extends Command
      *
      * USAGE:
      *
-     *   icingacli setup token show
+     *   icingacli setup token show [options]
+     *
+     * OPTIONS:
+     *
+     *  --config=<directory>    Path to Icinga Web 2's configuration files [/etc/icingaweb2]
      */
     public function showAction()
     {
-        $token = file_get_contents($this->app->getConfigDir() . '/setup.token');
+        $configDir = $this->params->get('config', $this->app->getConfigDir());
+        if (! is_string($configDir) || strlen(trim($configDir)) === 0) {
+            $this->fail($this->translate(
+                'The argument --config expects a path to Icinga Web 2\'s configuration files'
+            ));
+        }
+
+        $token = file_get_contents($configDir . '/setup.token');
         if (! $token) {
             $this->fail(
                 $this->translate('Nothing to show. Please create a new setup token using the generateToken action.')

From bee3fe7027aefe0f66ff1101a24b2012cfb3c3a5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 14:44:17 +0100
Subject: [PATCH 0135/2920] rpm: Install bash completion for icingacli

---
 icingaweb2.spec | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index 0b4813bc4..f469d3c92 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -68,11 +68,12 @@ Icinga Web 2 PHP library
 
 
 %package -n icingacli
-Summary:        Icinga CLI
-Group:          Applications/System
-Requires:       %{name}-common = %{version}-%{release}
-Requires:       php-Icinga = %{version}-%{release}
-Requires:       %{php_cli} >= 5.3.0
+Summary:            Icinga CLI
+Group:              Applications/System
+Requires:           %{name}-common = %{version}-%{release}
+Requires:           php-Icinga = %{version}-%{release}
+Requires:           %{php_cli} >= 5.3.0
+%{?rhel:Requires:   bash-completion}
 
 %description -n icingacli
 Icinga CLI
@@ -151,8 +152,9 @@ Icinga Web 2 vendor library Zend
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/{%{basedir}/{modules,library,public},%{bindir},%{configdir},%{logdir},%{phpdir},%{wwwconfigdir}}
+mkdir -p %{buildroot}/{%{basedir}/{modules,library,public},%{bindir},%{configdir},%{logdir},%{phpdir},%{wwwconfigdir},{_sysconfdir}/bash_completion.d}
 cp -prv application doc var %{buildroot}/%{basedir}
+cp -pv etc/bash_completion.d/icingacli %{buildroot}/{_sysconfdir}/bash_completion.d
 cp -prv modules/{monitoring,setup} %{buildroot}/%{basedir}/modules
 cp -prv library/Icinga %{buildroot}/%{phpdir}
 cp -prv library/vendor %{buildroot}/%{basedir}/library
@@ -202,6 +204,7 @@ exit 0
 %files -n icingacli
 %defattr(-,root,root)
 %{basedir}/application/clicommands
+{_sysconfdir}/bash_completion.d/icingacli
 %attr(0755,root,root) %{bindir}/icingacli
 
 

From deec606a226971810e069eb9c5c197c0c7eabd2a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 14:48:02 +0100
Subject: [PATCH 0136/2920] rpm: Do not copy var/ to build root

This directory does no longer exist.
---
 icingaweb2.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index f469d3c92..1b5e17797 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -153,7 +153,7 @@ Icinga Web 2 vendor library Zend
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/{%{basedir}/{modules,library,public},%{bindir},%{configdir},%{logdir},%{phpdir},%{wwwconfigdir},{_sysconfdir}/bash_completion.d}
-cp -prv application doc var %{buildroot}/%{basedir}
+cp -prv application doc %{buildroot}/%{basedir}
 cp -pv etc/bash_completion.d/icingacli %{buildroot}/{_sysconfdir}/bash_completion.d
 cp -prv modules/{monitoring,setup} %{buildroot}/%{basedir}/modules
 cp -prv library/Icinga %{buildroot}/%{phpdir}

From cc68c58fe31698909fc107773a504eb1dd6b7a78 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 14:48:47 +0100
Subject: [PATCH 0137/2920] rpm: Fix typo

---
 icingaweb2.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index 1b5e17797..fc6f7f6e0 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -204,7 +204,7 @@ exit 0
 %files -n icingacli
 %defattr(-,root,root)
 %{basedir}/application/clicommands
-{_sysconfdir}/bash_completion.d/icingacli
+%{_sysconfdir}/bash_completion.d/icingacli
 %attr(0755,root,root) %{bindir}/icingacli
 
 

From 59dc5c5bc315fd385f81505ac44825072da1e3c8 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 14:51:18 +0100
Subject: [PATCH 0138/2920] rpm: Fix {_sysconfig} usages missing the leading %

---
 icingaweb2.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index fc6f7f6e0..0a854047c 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -152,9 +152,9 @@ Icinga Web 2 vendor library Zend
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/{%{basedir}/{modules,library,public},%{bindir},%{configdir},%{logdir},%{phpdir},%{wwwconfigdir},{_sysconfdir}/bash_completion.d}
+mkdir -p %{buildroot}/{%{basedir}/{modules,library,public},%{bindir},%{configdir},%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d}
 cp -prv application doc %{buildroot}/%{basedir}
-cp -pv etc/bash_completion.d/icingacli %{buildroot}/{_sysconfdir}/bash_completion.d
+cp -pv etc/bash_completion.d/icingacli %{buildroot}/%{_sysconfdir}/bash_completion.d/icingacli
 cp -prv modules/{monitoring,setup} %{buildroot}/%{basedir}/modules
 cp -prv library/Icinga %{buildroot}/%{phpdir}
 cp -prv library/vendor %{buildroot}/%{basedir}/library

From 4b6ea55cbb0993cad0ee355ebd6b60b06fe48f0d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 14:55:44 +0100
Subject: [PATCH 0139/2920] setup: Add --config switch to
 TokenCommand::createAction()

refs #7906
---
 .../application/clicommands/TokenCommand.php  | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/modules/setup/application/clicommands/TokenCommand.php b/modules/setup/application/clicommands/TokenCommand.php
index 0d665cec6..6f6e2b08e 100644
--- a/modules/setup/application/clicommands/TokenCommand.php
+++ b/modules/setup/application/clicommands/TokenCommand.php
@@ -54,24 +54,35 @@ class TokenCommand extends Command
      *
      * USAGE:
      *
-     *   icingacli setup token create
+     *   icingacli setup token create [options]
+     *
+     * OPTIONS:
+     *
+     *  --config=<directory>    Path to Icinga Web 2's configuration files [/etc/icingaweb2]
      */
     public function createAction()
     {
+        $configDir = $this->params->get('config', $this->app->getConfigDir());
+        if (! is_string($configDir) || strlen(trim($configDir)) === 0) {
+            $this->fail($this->translate(
+                'The argument --config expects a path to Icinga Web 2\'s configuration files'
+            ));
+        }
+
+        $file = $configDir . '/setup.token';
+
         if (function_exists('openssl_random_pseudo_bytes')) {
             $token = bin2hex(openssl_random_pseudo_bytes(8));
         } else {
             $token = substr(md5(mt_rand()), 16);
         }
 
-        $filepath = $this->app->getConfigDir() . '/setup.token';
-
-        if (false === file_put_contents($filepath, $token)) {
-            $this->fail(sprintf($this->translate('Cannot write setup token "%s" to disk.'), $filepath));
+        if (false === file_put_contents($file, $token)) {
+            $this->fail(sprintf($this->translate('Cannot write setup token "%s" to disk.'), $file));
         }
 
-        if (false === chmod($filepath, 0660)) {
-            $this->fail(sprintf($this->translate('Cannot change access mode of "%s" to %o.'), $filepath, 0660));
+        if (! chmod($file, 0660)) {
+            $this->fail(sprintf($this->translate('Cannot change access mode of "%s" to %o.'), $file, 0660));
         }
 
         printf($this->translate("The newly generated setup token is: %s\n"), $token);

From 861252b1e7ec65ac9b96ba2ac3d4e8f550102ec3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 14:59:23 +0100
Subject: [PATCH 0140/2920] setup: Rename createDirectory to diretory

'icingacli setup config directory' does not suffer from camel case notation and explains
pretty much what it does.
---
 .../setup/application/clicommands/ConfigCommand.php  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index d26dfdd80..a2d98b0fe 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -12,14 +12,14 @@ use Icinga\Module\Setup\Webserver;
 class ConfigCommand extends Command
 {
     /**
-     * Create the configuration directory
+     * Create Icinga Web 2's configuration directory
      *
      * This command creates the configuration directory for Icinga Web 2. The `group' argument
      * is mandatory and should be the groupname of the user your web server is running as.
      *
      * USAGE:
      *
-     *   icingacli setup config createDirectory <group> [options]
+     *   icingacli setup config directory <group> [options]
      *
      * OPTIONS:
      *
@@ -28,11 +28,11 @@ class ConfigCommand extends Command
      *
      * EXAMPLES:
      *
-     *   icingacli setup config createDirectory apache
-     *   icingacli setup config createDirectory apache --mode 2775
-     *   icingacli setup config createDirectory apache --path /some/path
+     *   icingacli setup config directory apache
+     *   icingacli setup config directory apache --mode 2775
+     *   icingacli setup config directory apache --path /some/path
      */
-    public function createDirectoryAction()
+    public function directoryAction()
     {
         $group = $this->params->getStandalone();
         if ($group === null) {

From bad7aad05e962ca9e8a8bd7da3f7a375f7a2f323 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 15:22:53 +0100
Subject: [PATCH 0141/2920] cli/setup: Do not use the webserver user's group
 but 'icingaweb2'

---
 .../application/clicommands/ConfigCommand.php | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index a2d98b0fe..562c1b30d 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -14,30 +14,31 @@ class ConfigCommand extends Command
     /**
      * Create Icinga Web 2's configuration directory
      *
-     * This command creates the configuration directory for Icinga Web 2. The `group' argument
-     * is mandatory and should be the groupname of the user your web server is running as.
-     *
      * USAGE:
      *
-     *   icingacli setup config directory <group> [options]
+     *  icingacli setup config directory [options]
      *
      * OPTIONS:
      *
-     *   --mode  The access mode to use. Default is: 2770
-     *   --path  The path to the configuration directory. If omitted the default is used.
+     *  --mode=<mode>           The access mode to use [2770]
+     *
+     *  --path=<directory>      Path to Icinga Web 2's configuration files [/etc/icingaweb2]
+     *
+     *  --group=<group>         Owner group for the configuration directory [icingaweb2]
      *
      * EXAMPLES:
      *
-     *   icingacli setup config directory apache
-     *   icingacli setup config directory apache --mode 2775
-     *   icingacli setup config directory apache --path /some/path
+     *  icingacli setup config directory
+     *
+     *  icingacli setup config directory --mode 2775 --config /opt/icingaweb2/etc
      */
     public function directoryAction()
     {
-        $group = $this->params->getStandalone();
-        if ($group === null) {
-            $this->fail($this->translate('The `group\' argument is mandatory.'));
-            return false;
+        $group = trim($this->params->get('group', 'icingaweb2'));
+        if (strlen($group) === 0) {
+            $this->fail($this->translate(
+                'The argument --group expects a owner group for the configuration directory'
+            ));
         }
 
         $path = $this->params->get('path', $this->app->getConfigDir());
@@ -81,16 +82,15 @@ class ConfigCommand extends Command
      *
      *  --file=<filename>                   Write configuration to file [stdout]
      *
-     *
      * EXAMPLES:
      *
-     * icingacli setup config webserver apache
+     *  icingacli setup config webserver apache
      *
-     * icingacli setup config webserver apache --path /icingaweb2 --document-root /usr/share/icingaweb2/public --config=/etc/icingaweb2
+     *  icingacli setup config webserver apache --path /icingaweb2 --document-root /usr/share/icingaweb2/public --config=/etc/icingaweb2
      *
-     * icingacli setup config webserver apache --file /etc/apache2/conf.d/icingaweb2.conf
+     *  icingacli setup config webserver apache --file /etc/apache2/conf.d/icingaweb2.conf
      *
-     * icingacli setup config webserver nginx
+     *  icingacli setup config webserver nginx
      */
     public function webserverAction()
     {

From 082cdd6dd25ccbf1a00378c428528b9e62b72c65 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 15:24:31 +0100
Subject: [PATCH 0142/2920] cli/setup: Rename --path switch to --config for the
 directory action

All other actions use --config too.
---
 .../application/clicommands/ConfigCommand.php | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index 562c1b30d..a1cf3c19a 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -22,7 +22,7 @@ class ConfigCommand extends Command
      *
      *  --mode=<mode>           The access mode to use [2770]
      *
-     *  --path=<directory>      Path to Icinga Web 2's configuration files [/etc/icingaweb2]
+     *  --config=<directory>    Path to Icinga Web 2's configuration files [/etc/icingaweb2]
      *
      *  --group=<group>         Owner group for the configuration directory [icingaweb2]
      *
@@ -41,28 +41,28 @@ class ConfigCommand extends Command
             ));
         }
 
-        $path = $this->params->get('path', $this->app->getConfigDir());
-        if (file_exists($path)) {
-            printf($this->translate("Configuration directory already exists at: %s\n"), $path);
+        $config = $this->params->get('config', $this->app->getConfigDir());
+        if (file_exists($config)) {
+            printf($this->translate("Configuration directory already exists at: %s\n"), $config);
             return true;
         }
 
         $mode = octdec($this->params->get('mode', '2770'));
-        if (false === mkdir($path)) {
-            $this->fail(sprintf($this->translate('Unable to create path: %s'), $path));
+        if (false === mkdir($config)) {
+            $this->fail(sprintf($this->translate('Unable to create path: %s'), $config));
             return false;
         }
 
         $old = umask(0); // Prevent $mode from being mangled by the system's umask ($old)
-        chmod($path, $mode);
+        chmod($config, $mode);
         umask($old);
 
-        if (chgrp($path, $group) === false) {
-            $this->fail(sprintf($this->translate('Unable to change the group of "%s" to "%s".'), $path, $group));
+        if (chgrp($config, $group) === false) {
+            $this->fail(sprintf($this->translate('Unable to change the group of "%s" to "%s".'), $config, $group));
             return false;
         }
 
-        printf($this->translate("Successfully created configuration directory at: %s\n"), $path);
+        printf($this->translate("Successfully created configuration directory at: %s\n"), $config);
     }
 
     /**

From f84a9a6529467de33cef675d1c7336d207460113 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 15:33:01 +0100
Subject: [PATCH 0143/2920] cli/setup: Do not use umask(0)

chmod is not affected in any way by the umask.
---
 modules/setup/application/clicommands/ConfigCommand.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index a1cf3c19a..d3b2900bc 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -53,9 +53,7 @@ class ConfigCommand extends Command
             return false;
         }
 
-        $old = umask(0); // Prevent $mode from being mangled by the system's umask ($old)
         chmod($config, $mode);
-        umask($old);
 
         if (chgrp($config, $group) === false) {
             $this->fail(sprintf($this->translate('Unable to change the group of "%s" to "%s".'), $config, $group));

From fbe252063bfa5b60bcdde2e05e496d5ff4743110 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 15:39:03 +0100
Subject: [PATCH 0144/2920] IniWriter: Do not use umask(0)

chmod is not affected in any way by the umask.
---
 library/Icinga/File/Ini/IniWriter.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/library/Icinga/File/Ini/IniWriter.php b/library/Icinga/File/Ini/IniWriter.php
index 94a20faa5..28ca53ff0 100644
--- a/library/Icinga/File/Ini/IniWriter.php
+++ b/library/Icinga/File/Ini/IniWriter.php
@@ -90,11 +90,9 @@ class IniWriter extends Zend_Config_Writer_FileAbstract
 
         if ($setMode) {
             $mode = isset($this->options['filemode']) ? $this->options['filemode'] : static::$fileMode;
-            $old = umask(0); // Make sure that the mode we're going to set doesn't get mangled
             if (is_int($mode) && false === @chmod($filePath, $mode)) {
                 throw new Zend_Config_Exception(sprintf('Failed to set file mode "%o" on file "%s"', $mode, $filePath));
             }
-            umask($old);
         }
     }
 
@@ -234,7 +232,7 @@ class IniWriter extends Zend_Config_Writer_FileAbstract
 
     /**
      * Getter for filename
-     * 
+     *
      * @return string
      */
     public function getFilename()

From d3dcf152fb6e06837b9ce0f77d4749d9bf5dfb30 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 15:40:06 +0100
Subject: [PATCH 0145/2920] setup: Do not use umask(0)

chmod is not affected in any way by the umask.
---
 modules/setup/library/Setup/Utils/MakeDirStep.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/setup/library/Setup/Utils/MakeDirStep.php b/modules/setup/library/Setup/Utils/MakeDirStep.php
index d15c7db6a..b758ccd79 100644
--- a/modules/setup/library/Setup/Utils/MakeDirStep.php
+++ b/modules/setup/library/Setup/Utils/MakeDirStep.php
@@ -35,9 +35,7 @@ class MakeDirStep extends Step
                     $success = false;
                 } else {
                     $this->errors[$path] = null;
-                    $old = umask(0);
                     chmod($path, $this->dirmode);
-                    umask($old);
                 }
             }
         }

From 672500029cd304aeb4ccb40d1432f71c7a86b7f6 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 15:46:22 +0100
Subject: [PATCH 0146/2920] cli/setup: Add sanity check for the --mode switch
 when creating the config directory

---
 .../application/clicommands/ConfigCommand.php | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index d3b2900bc..4421c7600 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -20,10 +20,10 @@ class ConfigCommand extends Command
      *
      * OPTIONS:
      *
-     *  --mode=<mode>           The access mode to use [2770]
-     *
      *  --config=<directory>    Path to Icinga Web 2's configuration files [/etc/icingaweb2]
      *
+     *  --mode=<mode>           The access mode to use [2770]
+     *
      *  --group=<group>         Owner group for the configuration directory [icingaweb2]
      *
      * EXAMPLES:
@@ -34,6 +34,13 @@ class ConfigCommand extends Command
      */
     public function directoryAction()
     {
+        $configDir = trim($this->params->get('config', $this->app->getConfigDir()));
+        if (strlen($configDir) === 0) {
+            $this->fail($this->translate(
+                'The argument --config expects a path to Icinga Web 2\'s configuration files'
+            ));
+        }
+
         $group = trim($this->params->get('group', 'icingaweb2'));
         if (strlen($group) === 0) {
             $this->fail($this->translate(
@@ -41,26 +48,32 @@ class ConfigCommand extends Command
             ));
         }
 
-        $config = $this->params->get('config', $this->app->getConfigDir());
-        if (file_exists($config)) {
-            printf($this->translate("Configuration directory already exists at: %s\n"), $config);
+        $mode = trim($this->params->get('mode', '2770'));
+        if (strlen($mode) === 0) {
+            $this->fail($this->translate(
+                'The argument --mode expects an access mode for the configuration directory'
+            ));
+        }
+
+        if (file_exists($configDir)) {
+            printf($this->translate("Configuration directory already exists at: %s\n"), $configDir);
             return true;
         }
 
-        $mode = octdec($this->params->get('mode', '2770'));
-        if (false === mkdir($config)) {
-            $this->fail(sprintf($this->translate('Unable to create path: %s'), $config));
+        $mode = octdec($mode);
+        if (false === mkdir($configDir)) {
+            $this->fail(sprintf($this->translate('Unable to create path: %s'), $configDir));
             return false;
         }
 
-        chmod($config, $mode);
+        chmod($configDir, $mode);
 
-        if (chgrp($config, $group) === false) {
-            $this->fail(sprintf($this->translate('Unable to change the group of "%s" to "%s".'), $config, $group));
+        if (chgrp($configDir, $group) === false) {
+            $this->fail(sprintf($this->translate('Unable to change the group of "%s" to "%s".'), $configDir, $group));
             return false;
         }
 
-        printf($this->translate("Successfully created configuration directory at: %s\n"), $config);
+        printf($this->translate("Successfully created configuration directory at: %s\n"), $configDir);
     }
 
     /**

From 9c40372b619987ae11d4b3a2f7bf260e185443fd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 15:49:11 +0100
Subject: [PATCH 0147/2920] cli/setup: Do not translate \n

---
 .../setup/application/clicommands/ConfigCommand.php    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index 4421c7600..27daa8b89 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -41,6 +41,11 @@ class ConfigCommand extends Command
             ));
         }
 
+        if (file_exists($configDir)) {
+            printf($this->translate('Configuration directory already exists at: %s') . PHP_EOL, $configDir);
+            return true;
+        }
+
         $group = trim($this->params->get('group', 'icingaweb2'));
         if (strlen($group) === 0) {
             $this->fail($this->translate(
@@ -55,11 +60,6 @@ class ConfigCommand extends Command
             ));
         }
 
-        if (file_exists($configDir)) {
-            printf($this->translate("Configuration directory already exists at: %s\n"), $configDir);
-            return true;
-        }
-
         $mode = octdec($mode);
         if (false === mkdir($configDir)) {
             $this->fail(sprintf($this->translate('Unable to create path: %s'), $configDir));

From 9de1b20d3cced9308f3376c26122ab7ca7b349f7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 15:51:00 +0100
Subject: [PATCH 0148/2920] cli/setup: Issue an error if chmod fails when
 setting up the configuration directory

---
 modules/setup/application/clicommands/ConfigCommand.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index 27daa8b89..5c7ad6c23 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -60,13 +60,16 @@ class ConfigCommand extends Command
             ));
         }
 
-        $mode = octdec($mode);
         if (false === mkdir($configDir)) {
             $this->fail(sprintf($this->translate('Unable to create path: %s'), $configDir));
             return false;
         }
 
-        chmod($configDir, $mode);
+        if (! chmod($configDir, octdec($mode))) {
+            $this->fail($this->translate(
+                'Unable to change the mode of the configuration directory'
+            ));
+        }
 
         if (chgrp($configDir, $group) === false) {
             $this->fail(sprintf($this->translate('Unable to change the group of "%s" to "%s".'), $configDir, $group));

From f9ca0296a4d9d6932b867dcd7eaca2ac9e4eb237 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 15:54:07 +0100
Subject: [PATCH 0149/2920] cli/setup: Do not return false; after $this->fail()

$this-fail() throws an exception.
---
 .../application/clicommands/ConfigCommand.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index 5c7ad6c23..1999764c9 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -60,20 +60,23 @@ class ConfigCommand extends Command
             ));
         }
 
-        if (false === mkdir($configDir)) {
-            $this->fail(sprintf($this->translate('Unable to create path: %s'), $configDir));
-            return false;
+        if (! mkdir($configDir)) {
+            $this->fail(sprintf($this->translate('Can\'t create configuration directory %s'), $configDir));
         }
 
         if (! chmod($configDir, octdec($mode))) {
-            $this->fail($this->translate(
-                'Unable to change the mode of the configuration directory'
+            $this->fail(sprintf(
+                $this->translate('Can\'t change the mode of the configuration directory to %s'),
+                $mode
             ));
         }
 
-        if (chgrp($configDir, $group) === false) {
-            $this->fail(sprintf($this->translate('Unable to change the group of "%s" to "%s".'), $configDir, $group));
-            return false;
+        if (! chgrp($configDir, $group)) {
+            $this->fail(sprintf(
+                $this->translate('Can\'t change the  to change the group of %s to %s'),
+                $configDir,
+                $group
+            ));
         }
 
         printf($this->translate("Successfully created configuration directory at: %s\n"), $configDir);

From 90fb44122bff415d02aa4e99505a41b666056c69 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 15:55:14 +0100
Subject: [PATCH 0150/2920] cli/setup: Do not translate \n again

---
 modules/setup/application/clicommands/ConfigCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index 1999764c9..282590872 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -79,7 +79,7 @@ class ConfigCommand extends Command
             ));
         }
 
-        printf($this->translate("Successfully created configuration directory at: %s\n"), $configDir);
+        printf($this->translate('Successfully created configuration directory %s') . PHP_EOL, $configDir);
     }
 
     /**

From 865b5c126ad03e0f117e3517d828178af7cbb32c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 15:56:42 +0100
Subject: [PATCH 0151/2920] cli/setup: Do not exit setup config directory when
 the directory already exists

mkdir may succeed but chmod or chgrp may fail. The next time the command is called
it will ll exit before trying to chmod or chgrp again because the directory already exists.
---
 modules/setup/application/clicommands/ConfigCommand.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index 282590872..6598d3f28 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -41,11 +41,6 @@ class ConfigCommand extends Command
             ));
         }
 
-        if (file_exists($configDir)) {
-            printf($this->translate('Configuration directory already exists at: %s') . PHP_EOL, $configDir);
-            return true;
-        }
-
         $group = trim($this->params->get('group', 'icingaweb2'));
         if (strlen($group) === 0) {
             $this->fail($this->translate(

From 9f545535a0ad9d46214cb90326d3f52db5f44ab4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 16:03:05 +0100
Subject: [PATCH 0152/2920] cli/setup: Issue nice error messages when creating
 the config directory fails

---
 .../application/clicommands/ConfigCommand.php | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index 6598d3f28..d4d60e8e2 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -55,22 +55,31 @@ class ConfigCommand extends Command
             ));
         }
 
-        if (! mkdir($configDir)) {
-            $this->fail(sprintf($this->translate('Can\'t create configuration directory %s'), $configDir));
-        }
-
-        if (! chmod($configDir, octdec($mode))) {
+        if (! file_exists($configDir) && ! @mkdir($configDir)) {
+            $e = error_get_last();
             $this->fail(sprintf(
-                $this->translate('Can\'t change the mode of the configuration directory to %s'),
-                $mode
+                $this->translate('Can\'t create configuration directory %s: %s'),
+                $configDir,
+                $e['message']
             ));
         }
 
-        if (! chgrp($configDir, $group)) {
+        if (! @chmod($configDir, octdec($mode))) {
+            $e = error_get_last();
             $this->fail(sprintf(
-                $this->translate('Can\'t change the  to change the group of %s to %s'),
+                $this->translate('Can\'t change the mode of the configuration directory to %s: %s'),
+                $mode,
+                $e['message']
+            ));
+        }
+
+        if (! @chgrp($configDir, $group)) {
+            $e = error_get_last();
+            $this->fail(sprintf(
+                $this->translate('Can\'t change the group of %s to %s: %s'),
                 $configDir,
-                $group
+                $group,
+                $e['message']
             ));
         }
 

From e47eb73499880959564e05f45cb94c45bd4181b9 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 30 Dec 2014 13:53:46 +0100
Subject: [PATCH 0153/2920] Improve visibility of focus

Display navigation focus in a visible color and display focus outline in regular site body more prominently.

fixes #6164
---
 public/css/icinga/menu.less | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index c8ab698a5..0f3f2691e 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -62,15 +62,6 @@
   color: @colorPetrol;
 }
 
-#menu > ul > li.active li a:focus {
-  color: @colorTextDefault;
-}
-
-#menu > ul > li > a:focus {
-  color: @colorTextDefault;
-  text-shadow: none;
-}
-
 #menu > ul > li.active li a:hover {
   text-decoration: underline;
 }
@@ -264,3 +255,16 @@ html.ie8 #menu input.search {
 
 input:focus { outline: none; }
 
+/* Make focus outline properly visible */
+a:focus {
+  outline: dotted black 1px;
+}
+
+/* Displaying the outline in the navigation is not possible because of the messed up link borders,
+   color those links instead. */
+#menu a:focus,
+#menu > ul > li > a:focus,
+#menu .active ul li a:focus {
+  color: #21b5ad;
+  outline: none;
+}

From b5747797b785de7a6349f7fbe338469703bd549d Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 30 Dec 2014 16:31:37 +0100
Subject: [PATCH 0154/2920] Fix perfdata output

Display all perfdata key-value pairs in a formatted table, add padding to table css
improve piechart label.
---
 .../application/views/helpers/Perfdata.php    | 55 +++++++++---------
 .../library/Monitoring/Plugin/Perfdata.php    | 58 +++++++++++++++++--
 public/css/icinga/main-content.less           |  1 +
 3 files changed, 81 insertions(+), 33 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 47c34d156..dd451bc1a 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -24,21 +24,36 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
         $pieChartData = PerfdataSet::fromString($perfdataStr)->asArray();
 
         $result = '';
-        $table = array();
+        $table = array(
+            '<td><b>' . implode(
+                '</b></td><td><b>',
+                array('', t('Label'), t('Value'), t('Min'), t('Max'), t('Warning'), t('Critical'))
+            ) . '<b></td>'
+        );
         foreach ($pieChartData as $perfdata) {
-            if ($perfdata->isVisualizable()) {
-                $pieChart = $perfdata->asInlinePie($color);
-                if ($compact) {
-                    $result .= $pieChart->render();
-                } else {
-                    $table[] = '<tr><th>' . $pieChart->render()
-                        . htmlspecialchars($perfdata->getLabel())
-                        . '</th><td> '
-                        . htmlspecialchars($this->formatPerfdataValue($perfdata)) .
-                        ' </td></tr>';
-                }
+
+            if ($compact && $perfdata->isVisualizable()) {
+                $result .= $perfdata->asInlinePie($color)->render();
             } else {
-                $table[] = (string)$perfdata;
+                $row = '<tr>';
+
+                $row .= '<td>';
+                if ($perfdata->isVisualizable()) {
+                    $row .= $perfdata->asInlinePie($color)->render() . '&nbsp;';
+                }
+                $row .= '</td>';
+
+                if (!$compact) {
+                    foreach ($perfdata->toArray() as $value) {
+                        if ($value === '') {
+                            $value = '-';
+                        }
+                        $row .= '<td>' . (string)$value  . '</td>';
+                    }
+                }
+
+                $row .= '</tr>';
+                $table[] = $row;
             }
         }
 
@@ -49,18 +64,4 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
             return $pieCharts;
         }
     }
-
-    protected function formatPerfdataValue(Perfdata $perfdata)
-    {
-        if ($perfdata->isBytes()) {
-            return Format::bytes($perfdata->getValue());
-        } elseif ($perfdata->isSeconds()) {
-            return Format::seconds($perfdata->getValue());
-        } elseif ($perfdata->isPercentage()) {
-            return $perfdata->getValue() . '%';
-        }
-
-        return $perfdata->getValue();
-    }
-
 }
diff --git a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
index 7da4559fd..3e0237184 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Monitoring\Plugin;
 
+use Icinga\Util\Format;
 use InvalidArgumentException;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Web\Widget\Chart\InlinePie;
@@ -263,7 +264,7 @@ class Perfdata
      */
     public function __toString()
     {
-        return sprintf(strpos($this->label, ' ') === false ? '%s=%s' : "'%s'=%s", $this->label, $this->perfdataValue);
+        return $this->formatLabel();
     }
 
     /**
@@ -294,11 +295,9 @@ class Perfdata
                     $this->minValue = self::convert($parts[3], $this->unit);
                 }
             case 3:
-                // TODO(#6123): Tresholds have the same UOM and need to be converted as well!
-                $this->criticalThreshold = trim($parts[2]) ? trim($parts[2]) : null;
+                $this->criticalThreshold = trim($parts[2]) ? self::convert(trim($parts[2]), $this->unit) : null;
             case 2:
-                // TODO(#6123): Tresholds have the same UOM and need to be converted as well!
-                $this->warningThreshold = trim($parts[1]) ? trim($parts[1]) : null;
+                $this->warningThreshold = trim($parts[1]) ? self::convert(trim($parts[1]), $this->unit) : null;
         }
     }
 
@@ -370,7 +369,7 @@ class Perfdata
         }
 
         $data = $this->calculatePieChartData($color);
-        $pieChart = new InlinePie($data, $this->getLabel() . ' ' . number_format($this->getPercentage(), 2) . '%');
+        $pieChart = new InlinePie($data, $this);
         $pieChart->setSparklineClass('sparkline-perfdata');
 
         if (Zend_Controller_Front::getInstance()->getRequest()->isXmlHttpRequest()) {
@@ -378,4 +377,51 @@ class Perfdata
         }
         return $pieChart;
     }
+
+    /**
+     * Format the given value depending on the currently used unit
+     */
+    protected function format($value)
+    {
+        if ($this->isPercentage()) {
+            return (string)$value . '%';
+        }
+        if ($this->isBytes()) {
+            return Format::bytes($value);
+        }
+        if ($this->isSeconds()) {
+            return Format::seconds($value);
+        }
+        return number_format($value, 2);
+    }
+
+    /**
+     * Format the title string that represents this perfdata set
+     *
+     * @param bool $html
+     *
+     * @return stringS
+     */
+    public function formatLabel($html = false)
+    {
+        return sprintf(
+            $html ? t('<b>%s %s</b> (%s%%)') : t('%s %s (%s%%)'),
+            htmlspecialchars($this->getLabel()),
+            $this->format($this->value),
+            number_format($this->getPercentage(), 2)
+        );
+    }
+
+    public function toArray()
+    {
+        $parts = array(
+            $this->getLabel(),
+            'value' => $this->format($this->getvalue()),
+            'min' => isset($this->minValue) && !$this->isPercentage() ? $this->format($this->minValue) : '',
+            'max' => isset($this->maxValue) && !$this->isPercentage() ? $this->format($this->maxValue) : '',
+            'warn' => isset($this->warningThreshold) ? $this->format($this->warningThreshold) : '',
+            'crit' => isset($this->criticalThreshold) ? $this->format($this->criticalThreshold) : ''
+        );
+        return $parts;
+    }
 }
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 6972e95dc..5b142184d 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -154,6 +154,7 @@ table.perfdata th {
 
 table.perfdata td {
   white-space: nowrap;
+  padding-right: 0.5em;
 }
 
 table.objectlist {

From 80730e0bb2ed6c0b804734d0bc8b7dd67c4cfc98 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 30 Dec 2014 18:49:47 +0100
Subject: [PATCH 0155/2920] cli/setup: Remove is_string checks for switches of
 the webserver generation

---
 .../application/clicommands/ConfigCommand.php      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index d4d60e8e2..e63e770b8 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -123,18 +123,20 @@ class ConfigCommand extends Command
         } catch (ProgrammingError $e) {
             $this->fail($this->translate('Unknown type') . ': ' . $type);
         }
-        $urlPath = $this->params->get('path', $webserver->getUrlPath());
-        if (! is_string($urlPath) || strlen(trim($urlPath)) === 0) {
+        $urlPath = trim($this->params->get('path', $webserver->getUrlPath()));
+        if (strlen($urlPath) === 0) {
             $this->fail($this->translate('The argument --path expects a URL path'));
         }
-        $documentRoot = $this->params->get('root', $this->params->get('document-root', $webserver->getDocumentRoot()));
-        if (! is_string($documentRoot) || strlen(trim($documentRoot)) === 0) {
+        $documentRoot = trim(
+            $this->params->get('root', $this->params->get('document-root', $webserver->getDocumentRoot()))
+        );
+        if (strlen($documentRoot) === 0) {
             $this->fail($this->translate(
                 'The argument --root/--document-root expects a directory from which the webserver will serve files'
             ));
         }
-        $configDir = $this->params->get('config', $webserver->getConfigDir());
-        if (! is_string($configDir) || strlen(trim($configDir)) === 0) {
+        $configDir = trim($this->params->get('config', $webserver->getConfigDir()));
+        if (strlen($configDir) === 0) {
             $this->fail($this->translate(
                 'The argument --config expects a path to Icinga Web 2\'s configuration files'
             ));

From ec38c0c817e8dae2389c34765f745390e74a3e32 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 5 Jan 2015 11:30:51 +0100
Subject: [PATCH 0156/2920] Fix pies in multi views

---
 .../monitoring/application/controllers/HostsController.php   | 4 +++-
 .../application/controllers/ServicesController.php           | 5 ++---
 .../monitoring/application/views/scripts/hosts/show.phtml    | 2 +-
 .../monitoring/application/views/scripts/services/show.phtml | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 09957a4a0..869be92d8 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -134,7 +134,9 @@ class Monitoring_HostsController extends Controller
     {
         $chart = new InlinePie(array_values($states), $title, $colors);
         return $chart
-            ->setTitle($title);
+            ->setSize(75)
+            ->setTitle('')
+            ->setSparklineClass('sparkline-multi');
     }
 
     /**
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 4d08622c2..dc7feb2da 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -162,9 +162,8 @@ class Monitoring_ServicesController extends Controller
     {
         $chart = new InlinePie(array_values($states), $title, $colors);
         return $chart
-            // ->setLabel(array_map('strtoupper', array_keys($states)))
-            ->setSize(50)
-            ->setTitle($title)
+            ->setSize(75)
+            ->setTitle('')
             ->setSparklineClass('sparkline-multi');
     }
 
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 739069416..3c7dafbc5 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -10,7 +10,7 @@
             <b><?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', $hostCount), $hostCount) ?></b>
         </div>
         <div class="hbox-item">
-            <?= $this->hostStatesPieChart ?>
+            &nbsp;<?= $this->hostStatesPieChart ?>
         </div>
         <div class="hbox-item" style="font-size: 14px">
             <?php foreach (array_filter($hostStates) as $text => $count) {
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 65049b792..93e4ae84a 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -12,7 +12,7 @@
                 <b><?= sprintf($this->translatePlural('Service (%u)', 'Services (%u)', $serviceCount), $serviceCount) ?></b>
             </div>
             <div class="hbox-item">
-                <?= $this->serviceStatesPieChart ?>
+                &nbsp;<?= $this->serviceStatesPieChart ?>
             </div>
             <div class="hbox-item" style="font-size: 14px">
                 <?php foreach (array_filter($serviceStates) as $text => $count) {
@@ -27,7 +27,7 @@
                 <b><?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', $hostCount), $hostCount) ?></b>
             </div>
             <div class="hbox-item">
-                <?= $this->hostStatesPieChart ?>
+                &nbsp;<?= $this->hostStatesPieChart ?>
             </div>
             <div class="hbox-item" style="font-size: 14px">
                 <?php foreach (array_filter($hostStates) as $text => $count) {

From be91fce75f4234d38b1db02cd8a973708a20a4cf Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 12 Jan 2015 16:19:14 +0100
Subject: [PATCH 0157/2920] rpm: Install schema files to
 /usr/share/doc/icingaweb2

refs #4075
---
 icingaweb2.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index 0a854047c..f5dbfbd53 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -152,7 +152,7 @@ Icinga Web 2 vendor library Zend
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/{%{basedir}/{modules,library,public},%{bindir},%{configdir},%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d}
+mkdir -p %{buildroot}/{%{basedir}/{modules,library,public},%{bindir},%{configdir},%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d,%{_datadir}/doc/%{name}}
 cp -prv application doc %{buildroot}/%{basedir}
 cp -pv etc/bash_completion.d/icingacli %{buildroot}/%{_sysconfdir}/bash_completion.d/icingacli
 cp -prv modules/{monitoring,setup} %{buildroot}/%{basedir}/modules
@@ -162,6 +162,7 @@ cp -prv public/{css,img,js,error_norewrite.html} %{buildroot}/%{basedir}/public
 cp -pv packages/files/apache/icingaweb2.conf %{buildroot}/%{wwwconfigdir}/icingaweb2.conf
 cp -pv packages/files/bin/icingacli %{buildroot}/%{bindir}
 cp -pv packages/files/public/index.php %{buildroot}/%{basedir}/public
+cp -prv etc/schema %{buildroot}/%{_datadir}/doc/%{name}
 
 %pre
 getent group icingacmd >/dev/null || groupadd -r icingacmd
@@ -183,6 +184,8 @@ rm -rf %{buildroot}
 %{basedir}/public
 %{wwwconfigdir}/icingaweb2.conf
 %attr(2775,root,%{icingawebgroup}) %dir %{logdir}
+%{_datadir}/doc/%{name}
+%docdir %{_datadir}/doc/%{name}
 
 
 %pre common

From e842abf80fc78c7f229ac1b3d6314a92d9d27cd4 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@netways.de>
Date: Tue, 13 Jan 2015 08:59:36 +0100
Subject: [PATCH 0158/2920] spec: Add %revision macro for snapshot builds

fixes #8193
---
 icingaweb2.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index f5dbfbd53..b4d120923 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -1,6 +1,8 @@
+%define revision 1.beta2
+
 Name:           icingaweb2
 Version:        2.0.0
-Release:        1.beta2%{?dist}
+Release:        %{revision}%{?dist}
 Summary:        Icinga Web 2
 Group:          Applications/System
 License:        GPL

From 5e2594d250c5c43403b08e8a8b1c1572b70cf1d9 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 13 Jan 2015 10:59:33 +0100
Subject: [PATCH 0159/2920] Parse perfdata thresholds provisionary

Use a heuristic to determine whether thresholds should be inverted, to support plugins with non-standard perfdata output while still being able to parse standard-compliant perfdata input.
---
 .../application/views/helpers/Perfdata.php    |  4 +-
 .../library/Monitoring/Plugin/Perfdata.php    | 60 ++++++++++++++-----
 2 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index dd451bc1a..4c2bee89a 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -8,7 +8,7 @@ use Icinga\Module\Monitoring\Plugin\Perfdata;
 use Icinga\Module\Monitoring\Plugin\PerfdataSet;
 
 class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
-{
+{#
 
     /**
      * Display the given perfdata string to the user
@@ -19,7 +19,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
      *
      * @return string
      */
-    public function perfdata($perfdataStr, $compact = false, $color = Perfdata::PERFDATA_DEFAULT)
+    public function perfdata($perfdataStr, $compact = false, $color = Perfdata::PERFDATA_OK)
     {
         $pieChartData = PerfdataSet::fromString($perfdataStr)->asArray();
 
diff --git a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
index 3e0237184..f51801192 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -12,8 +12,9 @@ use Zend_Controller_Front;
 
 class Perfdata
 {
-    const PERFDATA_DEFAULT = 'green';
-    const PERFDATA_RED = 'red';
+    const PERFDATA_OK = 'ok';
+    const PERFDATA_WARNING = 'warning';
+    const PERFDATA_CRITICAL = 'critical';
 
     /**
      * The performance data value being parsed
@@ -60,6 +61,8 @@ class Perfdata
     /**
      * The WARNING threshold
      *
+     * TODO: Should be parsed Range-Object instead of string
+     *
      * @var string
      */
     protected $warningThreshold;
@@ -67,6 +70,8 @@ class Perfdata
     /**
      * The CRITICAL threshold
      *
+     * TODO: Should be parsed Range-Object instead of string
+     *
      * @var string
      */
     protected $criticalThreshold;
@@ -240,7 +245,7 @@ class Perfdata
     /**
      * Return the minimum value or null if it is not available
      *
-     * @return  null|float
+     * @return  null|string
      */
     public function getMinimumValue()
     {
@@ -295,9 +300,9 @@ class Perfdata
                     $this->minValue = self::convert($parts[3], $this->unit);
                 }
             case 3:
-                $this->criticalThreshold = trim($parts[2]) ? self::convert(trim($parts[2]), $this->unit) : null;
+                $this->criticalThreshold = trim($parts[2]) ? trim($parts[2]) : null;
             case 2:
-                $this->warningThreshold = trim($parts[1]) ? self::convert(trim($parts[1]), $this->unit) : null;
+                $this->warningThreshold = trim($parts[1]) ? trim($parts[1]) : null;
         }
     }
 
@@ -332,7 +337,7 @@ class Perfdata
         }
     }
 
-    protected function calculatePieChartData( $color)
+    protected function calculatePieChartData()
     {
         $rawValue = $this->getValue();
         $minValue = $this->getMinimumValue() !== null ? $this->getMinimumValue() : 0;
@@ -340,36 +345,61 @@ class Perfdata
         $usedValue = ($rawValue - $minValue);
         $unusedValue = ($maxValue - $minValue) - $usedValue;
 
+        $warningThreshold = $this->convert($this->warningThreshold, $this->unit);
+        $criticalThreshold = $this->convert($this->criticalThreshold, $this->unit);
+
         $gray = $unusedValue;
         $green = $orange = $red = 0;
 
-        switch ($color) {
-            case self::PERFDATA_DEFAULT:
+        $pieState = self::PERFDATA_OK;
+        if ($warningThreshold > $criticalThreshold) {
+            // inverted threshold parsing OK > warning > critical
+            if (isset($warningThreshold) && $this->value <= $warningThreshold) {
+                $pieState = self::PERFDATA_WARNING;
+            }
+            if (isset($criticalThreshold) && $this->value <= $criticalThreshold) {
+                $pieState = self::PERFDATA_CRITICAL;
+            }
+
+        } else {
+            // TODO: Use standard perfdata range format to decide the state #8194
+
+            // regular threshold parsing  OK < warning < critical
+            if (isset($warningThreshold) && $rawValue > $warningThreshold) {
+                $pieState = self::PERFDATA_WARNING;
+            }
+            if (isset($criticalThreshold) && $rawValue > $criticalThreshold) {
+                $pieState = self::PERFDATA_CRITICAL;
+            }
+        }
+
+        switch ($pieState) {
+            case self::PERFDATA_OK:
                 $green = $usedValue;
                 break;
 
-            case self::PERFDATA_RED:
+            case self::PERFDATA_CRITICAL:
                 $red = $usedValue;
                 break;
 
-            case self::PERFDATA_ORANGE:
+            case self::PERFDATA_WARNING:
                 $orange = $usedValue;
                 break;
         }
-        // TODO(#6122): Add proper treshold parsing.
 
         return array($green, $orange, $red, $gray);
     }
 
 
-    public function asInlinePie($color)
+    public function asInlinePie()
     {
         if (! $this->isVisualizable()) {
             throw new ProgrammingError('Cannot calculate piechart data for unvisualizable perfdata entry.');
         }
 
-        $data = $this->calculatePieChartData($color);
+        $data = $this->calculatePieChartData();
         $pieChart = new InlinePie($data, $this);
+        $pieChart->setColors(array('#44bb77', '#ffaa44', '#ff5566', '#ddccdd'));
         $pieChart->setSparklineClass('sparkline-perfdata');
 
         if (Zend_Controller_Front::getInstance()->getRequest()->isXmlHttpRequest()) {
@@ -419,8 +449,8 @@ class Perfdata
             'value' => $this->format($this->getvalue()),
             'min' => isset($this->minValue) && !$this->isPercentage() ? $this->format($this->minValue) : '',
             'max' => isset($this->maxValue) && !$this->isPercentage() ? $this->format($this->maxValue) : '',
-            'warn' => isset($this->warningThreshold) ? $this->format($this->warningThreshold) : '',
-            'crit' => isset($this->criticalThreshold) ? $this->format($this->criticalThreshold) : ''
+            'warn' => isset($this->warningThreshold) ? $this->format(self::convert($this->warningThreshold, $this->unit)) : '',
+            'crit' => isset($this->criticalThreshold) ? $this->format(self::convert($this->criticalThreshold, $this->unit)) : ''
         );
         return $parts;
     }

From 3961a447693b8300e490042dc2abb020041735f7 Mon Sep 17 00:00:00 2001
From: Rene Moser <rene.moser@swisstxt.ch>
Date: Mon, 12 Jan 2015 10:38:37 +0100
Subject: [PATCH 0160/2920] setup-welcome: fix cli doc

* `createDirectory` does not exist, this should be `direcotory`.
* For changing the group option `--group` must be used.
* Default config directory is `/etc/icingaweb2` not `/etc/icingaweb`.

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
---
 .../setup/application/views/scripts/form/setup-welcome.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/application/views/scripts/form/setup-welcome.phtml b/modules/setup/application/views/scripts/form/setup-welcome.phtml
index 9aad09dbc..8d3ba67c5 100644
--- a/modules/setup/application/views/scripts/form/setup-welcome.phtml
+++ b/modules/setup/application/views/scripts/form/setup-welcome.phtml
@@ -46,7 +46,7 @@ $cliPath = realpath(Icinga::app()->getApplicationDir() . '/../bin/icingacli');
       ); ?></p>
       <p><?= mt('setup', 'If you\'ve got the IcingaCLI installed you can do the following:'); ?></p>
       <div class="code">
-        <span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup config createDirectory <?= ($user = Platform::getPhpUser()) !== null ? $user : 'your_webserver_group'; ?><?= $configDir !== '/etc/icingaweb' ? ' --path ' . $configDir : ''; ?>;</span>
+        <span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup config directory --group <?= ($user = Platform::getPhpUser()) !== null ? $user : 'your_webserver_group'; ?><?= $configDir !== '/etc/icingaweb2' ? ' --config ' . $configDir : ''; ?>;</span>
         <span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup token create;</span>
       </div>
       <p><?= mt('setup', 'In case the IcingaCLI is missing you can create the token manually:'); ?></p>

From e2667dfb63a40d360ebb1185a8aa7d2f97808f3b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 13 Jan 2015 13:08:09 +0100
Subject: [PATCH 0161/2920] doc: Use icingaweb2 as directory instead of
 icingaweb

---
 doc/installation.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/installation.md b/doc/installation.md
index 6eb6737ec..6928cb2e3 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -38,7 +38,7 @@ git clone git://git.icinga.org/icingaweb2.git
 Choose a target directory and move Icinga Web 2 there.
 
 ````
-mv icingaweb2 /usr/share/icingaweb
+mv icingaweb2 /usr/share/icingaweb2
 ````
 
 **Step 3: Configuring the Web Server**
@@ -48,13 +48,13 @@ Use `icingacli` to generate web server configuration for either Apache or nginx.
 *Apache*
 
 ````
-./bin/icingacli setup config webserver apache --document-root /usr/share/icingaweb/public
+./bin/icingacli setup config webserver apache --document-root /usr/share/icingaweb2/public
 ````
 
 *nginx*
 
 ````
-./bin/icingacli setup config webserver nginx --document-root /usr/share/icingaweb/public
+./bin/icingacli setup config webserver nginx --document-root /usr/share/icingaweb2/public
 ````
 
 **Step 4: Web Setup**

From debc30578985970ff952c7d53cf13cc5b80fd2aa Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 2 Dec 2014 17:24:34 +0100
Subject: [PATCH 0162/2920] Add logarithmic AxisUnit

resolves #7845
---
 library/Icinga/Chart/Unit/LogarithmicUnit.php | 264 ++++++++++++++++++
 .../controllers/ChartController.php           |  99 ++++++-
 .../views/scripts/chart/test.phtml            |  11 +-
 3 files changed, 366 insertions(+), 8 deletions(-)
 create mode 100644 library/Icinga/Chart/Unit/LogarithmicUnit.php

diff --git a/library/Icinga/Chart/Unit/LogarithmicUnit.php b/library/Icinga/Chart/Unit/LogarithmicUnit.php
new file mode 100644
index 000000000..44580b15e
--- /dev/null
+++ b/library/Icinga/Chart/Unit/LogarithmicUnit.php
@@ -0,0 +1,264 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Chart\Unit;
+
+/**
+ * Logarithmic tick distribution over the axis
+ *
+ * This class does not use the actual logarithm, but a slightly altered version called the
+ * Log-Modulo transformation. This is necessary, since a regular logarithmic scale is not able to display negative
+ * values and zero-points. See <a href="http://blogs.sas.com/content/iml/2014/07/14/log-transformation-of-pos-neg>
+ * this article </a> for a more detailed description.
+ */
+class LogarithmicUnit implements AxisUnit
+{
+    /**
+     * @var int
+     */
+    protected $base;
+
+    /**
+     * @var
+     */
+    protected $currentTick;
+
+    /**
+     * @var
+     */
+    protected $minExp;
+
+    /**
+     * @var
+     */
+    protected $maxExp;
+
+    /**
+     * True when the minimum value is static and isn't affected by the data set
+     *
+     * @var bool
+     */
+    protected $staticMin = false;
+
+    /**
+     * True when the maximum value is static and isn't affected by the data set
+     *
+     * @var bool
+     */
+    protected $staticMax = false;
+
+    /**
+     * Create and initialize this AxisUnit
+     *
+     * @param int $nrOfTicks The number of ticks to use
+     */
+    public function __construct($base = 10)
+    {;
+        $this->base = $base;
+        $this->minExp = PHP_INT_MAX;
+        $this->maxExp = ~PHP_INT_MAX;
+    }
+
+    /**
+     * Add a dataset and calculate the minimum and maximum value for this AxisUnit
+     *
+     * @param   array $dataset  The dataset to add
+     * @param   int $idx        The idx (0 for x, 1 for y)
+     *
+     * @return  self            Fluent interface
+     */
+    public function addValues(array $dataset, $idx = 0)
+    {
+        $datapoints = array();
+
+        foreach ($dataset['data'] as $points) {
+            $datapoints[] = $points[$idx];
+        }
+        if (empty($datapoints)) {
+            return $this;
+        }
+        sort($datapoints);
+        if (!$this->staticMax) {
+            $this->maxExp = max($this->maxExp, $this->logCeil($datapoints[count($datapoints) - 1]));
+        }
+        if (!$this->staticMin) {
+            $this->minExp = min($this->minExp, $this->logFloor($datapoints[0]));
+        }
+        $this->currentTick = 0;
+
+        return $this;
+    }
+
+    /**
+     * Transform the absolute value to an axis relative value
+     *
+     * @param   int $value  The absolute coordinate from the data set
+     * @return  float|int   The axis relative coordinate (between 0 and 100)
+     */
+    public function transform($value)
+    {
+        if ($value < $this->pow($this->minExp)) {
+            return 0;
+        } elseif ($value > $this->pow($this->maxExp)) {
+            return 100;
+        } else {
+            return 100 * ($this->log($value) - $this->minExp) / $this->getTicks();
+        }
+    }
+
+    /**
+     * Return the position of the current tick
+     *
+     * @return int
+     */
+    public function current()
+    {
+        return $this->currentTick * (100 / $this->getTicks());
+    }
+
+    /**
+     * Calculate the next tick and tick value
+     */
+    public function next()
+    {
+        ++ $this->currentTick;
+    }
+
+    /**
+     * Return the label for the current tick
+     *
+     * @return string The label for the current tick
+     */
+    public function key()
+    {
+        $currentBase = $this->currentTick + $this->minExp;
+        if (abs($currentBase) > 4) {
+            return '10E' . $currentBase;
+        }
+        return (string) intval($this->pow($currentBase));
+    }
+
+    /**
+     * True when we're at a valid tick (iterator interface)
+     *
+     * @return bool
+     */
+    public function valid()
+    {
+        return $this->currentTick >= 0 && $this->currentTick < $this->getTicks();
+    }
+
+    /**
+     * Reset the current tick and label value
+     */
+    public function rewind()
+    {
+        $this->currentTick = 0;
+    }
+
+    /**
+     * Perform a log-modulo transformation
+     *
+     * @param $value    The value to transform
+     *
+     * @return double   The transformed value
+     */
+    protected function log($value)
+    {
+        $sign = $value > 0 ? 1 : -1;
+        return $sign * log1p($sign * $value) / log($this->base);
+    }
+
+    /**
+     * Calculate the biggest exponent necessary to display the given data point
+     *
+     * @param $value
+     *
+     * @return float
+     */
+    protected function logCeil($value)
+    {
+        return ceil($this->log($value)) + 1;
+    }
+
+    /**
+     * Calculate the smallest exponent necessary to display the given data point
+     *
+     * @param $value
+     *
+     * @return float
+     */
+    protected function logFloor($value)
+    {
+        return floor($this->log($value));
+    }
+
+    /**
+     * Inverse function to the log-modulo transformation
+     *
+     * @param $value
+     *
+     * @return double
+     */
+    protected function pow($value)
+    {
+        if ($value == 0) {
+            return 0;
+        }
+        $sign = $value > 0 ? 1 : -1;
+        return $sign * (pow($this->base, $sign * $value));
+    }
+
+    /**
+     * Set the axis minimum value to a fixed value
+     *
+     * @param int $min The new minimum value
+     */
+    public function setMin($min)
+    {
+        $this->minExp = $this->logFloor($min);
+        $this->staticMin = true;
+    }
+
+    /**
+     * Set the axis maximum value to a fixed value
+     *
+     * @param int $max The new maximum value
+     */
+    public function setMax($max)
+    {
+        $this->maxExp = $this->logCeil($max);
+        $this->staticMax = true;
+    }
+
+    /**
+     * Return the current minimum value of the axis
+     *
+     * @return int The minimum set for this axis
+     */
+    public function getMin()
+    {
+        return $this->pow($this->minExp);
+    }
+
+    /**
+     * Return the current maximum value of the axis
+     *
+     * @return int The maximum set for this axis
+     */
+    public function getMax()
+    {
+        return $this->pow($this->maxExp);
+    }
+
+    /**
+     * Get the amount of ticks necessary to display this AxisUnit
+     *
+     * @return int
+     */
+    protected function getTicks()
+    {
+        return $this->maxExp - $this->minExp;
+    }
+}
diff --git a/modules/monitoring/application/controllers/ChartController.php b/modules/monitoring/application/controllers/ChartController.php
index 2024f83f4..640ee2520 100644
--- a/modules/monitoring/application/controllers/ChartController.php
+++ b/modules/monitoring/application/controllers/ChartController.php
@@ -6,6 +6,8 @@ use Icinga\Module\Monitoring\Controller;
 use Icinga\Chart\GridChart;
 use Icinga\Chart\PieChart;
 use Icinga\Chart\Unit\StaticAxis;
+use Icinga\Chart\Unit\LogarithmicUnit;
+use Icinga\Chart\Unit\LinearUnit;
 
 /**
  * Class Monitoring_CommandController
@@ -20,6 +22,95 @@ class Monitoring_ChartController extends Controller
         $this->view->compact = $this->_request->getParam('view') === 'compact';
     }
 
+    private function drawLogChart1()
+    {
+        $chart = new GridChart();
+        $chart->alignTopLeft();
+        $chart->setAxisLabel('X axis label', 'Y axis label')
+            ->setYAxis(new LogarithmicUnit());
+
+        for ($i = -15; $i < 15; $i++) {
+            $data1[] = array($i, -$i * rand(1, 10) * pow(2, rand(1, 2)));
+        }
+        for ($i = -15; $i < 15; $i++) {
+            $data2[] = array($i, 1000 + $i * rand(1, 35) * pow(2, rand(1, 2)));
+        }
+        for ($i = -15; $i < 15; $i++) {
+            $data3[] = array($i, $i * rand(1, 100) * pow(2, rand(1, 10)) - 1000);
+        }
+
+        $chart->drawLines(
+            array(
+                'label' => 'Random 1',
+                'color' => 'red',
+                'data'  =>  $data1,
+                'showPoints' => true
+            )
+        );
+        $chart->drawLines(
+            array(
+                'label' => 'Random 2',
+                'color' => 'blue',
+                'data'  =>  $data2,
+                'showPoints' => true
+            )
+        );
+        $chart->drawLines(
+            array(
+                'label' => 'Random 3',
+                'color' => 'green',
+                'data'  =>  $data3,
+                'showPoints' => true
+            )
+        );
+        return $chart;
+    }
+
+    private function drawLogChart2()
+    {
+        $chart = new GridChart();
+        $chart->alignTopLeft();
+        $chart->setAxisLabel('X axis label', 'Y axis label')
+            ->setYAxis(new LogarithmicUnit());
+
+        for ($i = -10; $i < 10; $i++) {
+            $sign = $i > 0 ?  1 :
+                   ($i < 0 ? -1 : 0);
+            $data[] = array($i, $sign * pow(10, abs($i)));
+        }
+        $chart->drawLines(
+            array(
+                'label' => 'f(x): sign(x) * 10^|x|',
+                'color' => 'red',
+                'data'  =>  $data,
+                'showPoints' => true
+            )
+        );
+        return $chart;
+    }
+    private function drawLogChart3()
+    {
+        $chart = new GridChart();
+        $chart->alignTopLeft();
+        $chart->setAxisLabel('X axis label', 'Y axis label')
+            ->setYAxis(new LogarithmicUnit());
+
+        for ($i = -2; $i < 3; $i++) {
+            $sign = $i > 0 ?  1 :
+                ($i < 0 ? -1 : 0);
+            $data[] = array($i, $sign * pow(10, abs($i)));
+        }
+        $chart->drawLines(
+            array(
+                'label' => 'f(x): sign(x) * 10^|x|',
+                'color' => 'red',
+                'data'  =>  $data,
+                'showPoints' => true
+            )
+        );
+        return $chart;
+    }
+
     public function testAction()
     {
         $this->chart = new GridChart();
@@ -52,7 +143,7 @@ class Monitoring_ChartController extends Controller
 */
         $this->chart->drawBars(
             array(
-                'label' => 'Some other line',
+                'label' => 'A big amount of data',
                 'color' => 'green',
                 'data'  =>  $data3,
                 'showPoints' => true
@@ -68,7 +159,11 @@ class Monitoring_ChartController extends Controller
             )
         );
 */
-        $this->view->svg = $this->chart;
+        $this->view->svgs = array();
+        $this->view->svgs[] = $this->drawLogChart1();
+        $this->view->svgs[] = $this->drawLogChart2();
+        $this->view->svgs[] = $this->drawLogChart3();
+        $this->view->svgs[] = $this->chart;
     }
 
     public function hostgroupAction()
diff --git a/modules/monitoring/application/views/scripts/chart/test.phtml b/modules/monitoring/application/views/scripts/chart/test.phtml
index 1c2046bdf..214f44d33 100644
--- a/modules/monitoring/application/views/scripts/chart/test.phtml
+++ b/modules/monitoring/application/views/scripts/chart/test.phtml
@@ -1,6 +1,5 @@
-mah
-<div style="border:1px dashed black;width:900px;height:520px">
-<?=
-  $svg->render();
-?>
-</div>
\ No newline at end of file
+<?php foreach ($svgs as $svg) { ?>
+    <div style="border:1px dashed black;width:900px;height:520px">
+        <?= $svg->render() ?>
+    </div>
+<?php } ?>
\ No newline at end of file

From 807666bf8860579d248f03e48992c5ed86db992c Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 5 Jan 2015 17:49:11 +0100
Subject: [PATCH 0163/2920] Improve chart axis readability

Introduce different line weights to separate between the smallest visible separator (steps) and single chart values (ticks). Calculate the amount of ticks per step using the available chart space.

fixes #7846
---
 library/Icinga/Chart/Axis.php                 | 143 ++++++++++++------
 library/Icinga/Chart/Graph/BarGraph.php       |   2 +-
 library/Icinga/Chart/Unit/AxisUnit.php        |  10 +-
 library/Icinga/Chart/Unit/LinearUnit.php      |  57 ++-----
 library/Icinga/Chart/Unit/LogarithmicUnit.php |   4 +-
 library/Icinga/Chart/Unit/StaticAxis.php      |  10 ++
 6 files changed, 137 insertions(+), 89 deletions(-)

diff --git a/library/Icinga/Chart/Axis.php b/library/Icinga/Chart/Axis.php
index 00a5f5679..74c40b495 100644
--- a/library/Icinga/Chart/Axis.php
+++ b/library/Icinga/Chart/Axis.php
@@ -77,6 +77,20 @@ class Axis implements Drawable
      */
     private $yUnit = null;
 
+    /**
+     * The minimum amount of units each step must take up
+     *
+     * @var int
+     */
+    public $minUnitsPerStep = 80;
+
+    /**
+     * The minimum amount of units each tick must take up
+     *
+     * @var int
+     */
+    public $minUnitsPerTick = 15;
+
     /**
      * If the displayed labels should be aligned horizontally or diagonally
      */
@@ -160,6 +174,14 @@ class Axis implements Drawable
      */
     private function renderHorizontalAxis(RenderContext $ctx, DOMElement $group)
     {
+        $steps = $this->ticksPerX($this->xUnit->getTicks(), $ctx->getNrOfUnitsX(), $this->minUnitsPerStep);
+        $ticks = $this->ticksPerX($this->xUnit->getTicks(), $ctx->getNrOfUnitsX(), $this->minUnitsPerTick);
+
+        // Steps should always be ticks
+        if ($ticks !== $steps) {
+            $steps = $ticks * 5;
+        }
+
         $line = new Line(0, 100, 100, 100);
         $line->setStrokeWidth(2);
         $group->appendChild($line->toSvg($ctx));
@@ -168,41 +190,48 @@ class Axis implements Drawable
         $lastLabelEnd = -1;
         $shift = 0;
 
+        $i = 0;
         foreach ($this->xUnit as $label => $pos) {
-            if ($this->labelRotationStyle === self::LABEL_ROTATE_HORIZONTAL) {
-                // If the  last label would overlap this label we shift the y axis a bit
-                if ($lastLabelEnd > $pos) {
-                    $shift = ($shift + 5) % 10;
-                } else {
-                    $shift = 0;
+
+            if ($i % $ticks === 0) {
+                $tick = new Line($pos, 100, $pos, 101);
+                $group->appendChild($tick->toSvg($ctx));
+            }
+
+            if ($i % $steps === 0) {
+                if ($this->labelRotationStyle === self::LABEL_ROTATE_HORIZONTAL) {
+                    // If the  last label would overlap this label we shift the y axis a bit
+                    if ($lastLabelEnd > $pos) {
+                        $shift = ($shift + 5) % 10;
+                    } else {
+                        $shift = 0;
+                    }
                 }
+
+                $labelField = new Text($pos + 0.5, ($this->xLabel ? 107 : 105) + $shift, $label);
+                if ($this->labelRotationStyle === self::LABEL_ROTATE_HORIZONTAL) {
+                    $labelField->setAlignment(Text::ALIGN_MIDDLE)
+                        ->setFontSize('1.8em');
+                } else {
+                    $labelField->setFontSize('2.5em');
+                }
+
+                if ($this->labelRotationStyle === self::LABEL_ROTATE_DIAGONAL) {
+                    $labelField = new Rotator($labelField, 45);
+                }
+                $labelField = $labelField->toSvg($ctx);
+
+                $group->appendChild($labelField);
+
+                if ($this->drawYGrid) {
+                    $bgLine = new Line($pos, 0, $pos, 100);
+                    $bgLine->setStrokeWidth(0.5)
+                        ->setStrokeColor('#232');
+                    $group->appendChild($bgLine->toSvg($ctx));
+                }
+                $lastLabelEnd = $pos + strlen($label) * 1.2;
             }
-
-            $tick = new Line($pos, 100, $pos, 102);
-            $group->appendChild($tick->toSvg($ctx));
-
-            $labelField = new Text($pos + 0.5, ($this->xLabel ? 107 : 105) + $shift, $label);
-            if ($this->labelRotationStyle === self::LABEL_ROTATE_HORIZONTAL) {
-                $labelField->setAlignment(Text::ALIGN_MIDDLE)
-                    ->setFontSize('1.8em');
-            } else {
-                $labelField->setFontSize('2.5em');
-            }
-
-            if ($this->labelRotationStyle === self::LABEL_ROTATE_DIAGONAL) {
-                $labelField = new Rotator($labelField, 45);
-            }
-            $labelField = $labelField->toSvg($ctx);
-
-            $group->appendChild($labelField);
-
-            if ($this->drawYGrid) {
-                $bgLine = new Line($pos, 0, $pos, 100);
-                $bgLine->setStrokeWidth(0.5)
-                    ->setStrokeColor('#232');
-                $group->appendChild($bgLine->toSvg($ctx));
-            }
-            $lastLabelEnd = $pos + strlen($label) * 1.2;
+            $i++;
         }
 
         // render the label for this axis
@@ -223,26 +252,42 @@ class Axis implements Drawable
      */
     private function renderVerticalAxis(RenderContext $ctx, DOMElement $group)
     {
+        $steps = $this->ticksPerX($this->yUnit->getTicks(), $ctx->getNrOfUnitsY(), $this->minUnitsPerStep);
+        $ticks = $this->ticksPerX($this->yUnit->getTicks(), $ctx->getNrOfUnitsY(), $this->minUnitsPerTick);
+
+        // Steps should always be ticks
+        if ($ticks !== $steps) {
+            $steps = $ticks * 5;
+        }
         $line = new Line(0, 0, 0, 100);
         $line->setStrokeWidth(2);
         $group->appendChild($line->toSvg($ctx));
 
+        $i = 0;
         foreach ($this->yUnit as $label => $pos) {
             $pos = 100 - $pos;
-            $tick = new Line(0, $pos, -1, $pos);
-            $group->appendChild($tick->toSvg($ctx));
 
-            $labelField = new Text(-0.5, $pos+0.5, $label);
-            $labelField->setFontSize('1.8em')
-                ->setAlignment(Text::ALIGN_END);
-
-            $group->appendChild($labelField->toSvg($ctx));
-            if ($this->drawXGrid) {
-                $bgLine = new Line(0, $pos, 100, $pos);
-                $bgLine->setStrokeWidth(0.5)
-                    ->setStrokeColor('#343');
-                $group->appendChild($bgLine->toSvg($ctx));
+            if ($i % $ticks === 0) {
+                // draw a tick
+                $tick = new Line(0, $pos, -1, $pos);
+                $group->appendChild($tick->toSvg($ctx));
             }
+
+            if ($i % $steps === 0) {
+                // draw a step
+                $labelField = new Text(-0.5, $pos+0.5, $label);
+                $labelField->setFontSize('1.8em')
+                    ->setAlignment(Text::ALIGN_END);
+
+                $group->appendChild($labelField->toSvg($ctx));
+                if ($this->drawXGrid) {
+                    $bgLine = new Line(0, $pos, 100, $pos);
+                    $bgLine->setStrokeWidth(0.5)
+                        ->setStrokeColor('#343');
+                    $group->appendChild($bgLine->toSvg($ctx));
+                }
+            }
+            $i++;
         }
 
         if ($this->yLabel) {
@@ -416,4 +461,14 @@ class Axis implements Drawable
         $this->renderVerticalAxis($ctx, $group);
         return $group;
     }
+
+    protected function ticksPerX($ticks, $units, $min)
+    {
+        $per = 1;
+        while ($per * $units / $ticks < $min) {
+            $per++;
+        }
+        return $per;
+    }
+
 }
diff --git a/library/Icinga/Chart/Graph/BarGraph.php b/library/Icinga/Chart/Graph/BarGraph.php
index 1225307ad..0ec5e77a9 100644
--- a/library/Icinga/Chart/Graph/BarGraph.php
+++ b/library/Icinga/Chart/Graph/BarGraph.php
@@ -28,7 +28,7 @@ class BarGraph extends Styleable implements Drawable
      *
      * @var int
      */
-    private $barWidth = 4;
+    private $barWidth = 1;
 
     /**
      * The dataset to use for this bar graph
diff --git a/library/Icinga/Chart/Unit/AxisUnit.php b/library/Icinga/Chart/Unit/AxisUnit.php
index dc57f99e0..fba521778 100644
--- a/library/Icinga/Chart/Unit/AxisUnit.php
+++ b/library/Icinga/Chart/Unit/AxisUnit.php
@@ -9,13 +9,14 @@ use Iterator;
 /**
  * Base class for Axis Units
  *
+ * An AxisUnit takes a set of values and places them on a given range
+ *
  * Concrete subclasses must implement the iterator interface, with
  * getCurrent returning the axis relative position and getValue the label
  * that will be displayed
  */
 interface AxisUnit extends Iterator
 {
-
     /**
      * Add a dataset to this AxisUnit, required for dynamic min and max vlaues
      *
@@ -46,4 +47,11 @@ interface AxisUnit extends Iterator
      * @param int $max The new maximum value
      */
     public function setMax($max);
+
+    /**
+     * Get the amount of ticks of this axis
+     *
+     * @return int
+     */
+    public function getTicks();
 }
diff --git a/library/Icinga/Chart/Unit/LinearUnit.php b/library/Icinga/Chart/Unit/LinearUnit.php
index d776fe304..fe80971d4 100644
--- a/library/Icinga/Chart/Unit/LinearUnit.php
+++ b/library/Icinga/Chart/Unit/LinearUnit.php
@@ -9,7 +9,6 @@ namespace Icinga\Chart\Unit;
  */
 class LinearUnit implements AxisUnit
 {
-
     /**
      * The minimum value to display
      *
@@ -43,7 +42,7 @@ class LinearUnit implements AxisUnit
      *
      * @var int
      */
-    private $nrOfTicks = 10;
+    protected $nrOfTicks = 10;
 
     /**
      * The currently displayed tick
@@ -95,45 +94,13 @@ class LinearUnit implements AxisUnit
         if (!$this->staticMin) {
             $this->min = min($this->min, $datapoints[0]);
         }
-        if (!$this->staticMin || !$this->staticMax) {
-            $this->updateMaxValue();
-        }
         $this->currentTick = 0;
         $this->currentValue = $this->min;
-        return $this;
-    }
-
-    /**
-     * Refresh the range depending on the current values of min, max and nrOfTicks
-     */
-    private function updateMaxValue()
-    {
-        $this->max = $this->calculateTickRange($this->max - $this->min, $this->nrOfTicks) *
-             $this->nrOfTicks + $this->min;
-    }
-
-    /**
-     * Determine the minimum tick range that is necessary to display the given value range
-     * correctly
-     *
-     * @param   int range   The range to display
-     * @param   int ticks   The amount of ticks to use
-     *
-     * @return  int         The value for each tick
-     */
-    private function calculateTickRange($range, $ticks)
-    {
-        $factor = 1;
-        $steps = array(1, 2, 5);
-        $step = 0;
-        while ($range / ($factor * $steps[$step]) > $ticks) {
-            $step++;
-            if ($step === count($steps)) {
-                $step = 0;
-                $factor *= 10;
-            }
+        if ($this->max === $this->min) {
+            $this->max = $this->min + 10;
         }
-        return $steps[$step] * $factor;
+        $this->nrOfTicks = $this->max - $this->min;
+        return $this;
     }
 
     /**
@@ -149,7 +116,7 @@ class LinearUnit implements AxisUnit
         } elseif ($value > $this->max) {
             return 100;
         } else {
-            return 100 * ($value - $this->min) / $this->max - $this->min;
+            return 100 * ($value - $this->min) / $this->nrOfTicks;
         }
     }
 
@@ -211,7 +178,6 @@ class LinearUnit implements AxisUnit
         if ($max !== null) {
             $this->max = $max;
             $this->staticMax = true;
-            $this->updateMaxValue();
         }
     }
 
@@ -225,7 +191,6 @@ class LinearUnit implements AxisUnit
         if ($min !== null) {
             $this->min = $min;
             $this->staticMin = true;
-            $this->updateMaxValue();
         }
     }
 
@@ -248,4 +213,14 @@ class LinearUnit implements AxisUnit
     {
         return $this->max;
     }
+
+    /**
+     * Get the amount of ticks necessary to display this AxisUnit
+     *
+     * @return int
+     */
+    public function getTicks()
+    {
+        return $this->nrOfTicks;
+    }
 }
diff --git a/library/Icinga/Chart/Unit/LogarithmicUnit.php b/library/Icinga/Chart/Unit/LogarithmicUnit.php
index 44580b15e..6d07f3d45 100644
--- a/library/Icinga/Chart/Unit/LogarithmicUnit.php
+++ b/library/Icinga/Chart/Unit/LogarithmicUnit.php
@@ -134,7 +134,7 @@ class LogarithmicUnit implements AxisUnit
     {
         $currentBase = $this->currentTick + $this->minExp;
         if (abs($currentBase) > 4) {
-            return '10E' . $currentBase;
+            return $this->base . 'E' . $currentBase;
         }
         return (string) intval($this->pow($currentBase));
     }
@@ -257,7 +257,7 @@ class LogarithmicUnit implements AxisUnit
      *
      * @return int
      */
-    protected function getTicks()
+    public function getTicks()
     {
         return $this->maxExp - $this->minExp;
     }
diff --git a/library/Icinga/Chart/Unit/StaticAxis.php b/library/Icinga/Chart/Unit/StaticAxis.php
index 6458ae599..c7e9c2be5 100644
--- a/library/Icinga/Chart/Unit/StaticAxis.php
+++ b/library/Icinga/Chart/Unit/StaticAxis.php
@@ -118,4 +118,14 @@ class StaticAxis implements AxisUnit
     {
         return reset($this->items);
     }
+
+    /**
+     * Get the amount of ticks of this axis
+     *
+     * @return int
+     */
+    public function getTicks()
+    {
+        return count($this->items);
+    }
 }

From d1c7d9d2f9cd8481b7d2a15830da8635189c6eaa Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 13 Jan 2015 18:21:11 +0100
Subject: [PATCH 0164/2920] Improve SVG layout

---
 library/Icinga/Chart/Axis.php             | 20 +++++++++++++-------
 library/Icinga/Chart/Graph/LineGraph.php  | 11 +++++++++--
 library/Icinga/Chart/Primitive/Circle.php |  2 +-
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/library/Icinga/Chart/Axis.php b/library/Icinga/Chart/Axis.php
index 74c40b495..e6046705a 100644
--- a/library/Icinga/Chart/Axis.php
+++ b/library/Icinga/Chart/Axis.php
@@ -182,9 +182,11 @@ class Axis implements Drawable
             $steps = $ticks * 5;
         }
 
+        /*
         $line = new Line(0, 100, 100, 100);
         $line->setStrokeWidth(2);
         $group->appendChild($line->toSvg($ctx));
+        */
 
         // contains the approximate end position of the last label
         $lastLabelEnd = -1;
@@ -194,8 +196,10 @@ class Axis implements Drawable
         foreach ($this->xUnit as $label => $pos) {
 
             if ($i % $ticks === 0) {
+                /*
                 $tick = new Line($pos, 100, $pos, 101);
                 $group->appendChild($tick->toSvg($ctx));
+                */
             }
 
             if ($i % $steps === 0) {
@@ -211,7 +215,7 @@ class Axis implements Drawable
                 $labelField = new Text($pos + 0.5, ($this->xLabel ? 107 : 105) + $shift, $label);
                 if ($this->labelRotationStyle === self::LABEL_ROTATE_HORIZONTAL) {
                     $labelField->setAlignment(Text::ALIGN_MIDDLE)
-                        ->setFontSize('1.8em');
+                        ->setFontSize('2.5em');
                 } else {
                     $labelField->setFontSize('2.5em');
                 }
@@ -226,7 +230,7 @@ class Axis implements Drawable
                 if ($this->drawYGrid) {
                     $bgLine = new Line($pos, 0, $pos, 100);
                     $bgLine->setStrokeWidth(0.5)
-                        ->setStrokeColor('#232');
+                        ->setStrokeColor('#BFBFBF');
                     $group->appendChild($bgLine->toSvg($ctx));
                 }
                 $lastLabelEnd = $pos + strlen($label) * 1.2;
@@ -259,9 +263,11 @@ class Axis implements Drawable
         if ($ticks !== $steps) {
             $steps = $ticks * 5;
         }
+        /*
         $line = new Line(0, 0, 0, 100);
         $line->setStrokeWidth(2);
         $group->appendChild($line->toSvg($ctx));
+        */
 
         $i = 0;
         foreach ($this->yUnit as $label => $pos) {
@@ -269,21 +275,21 @@ class Axis implements Drawable
 
             if ($i % $ticks === 0) {
                 // draw a tick
-                $tick = new Line(0, $pos, -1, $pos);
-                $group->appendChild($tick->toSvg($ctx));
+                //$tick = new Line(0, $pos, -1, $pos);
+                //$group->appendChild($tick->toSvg($ctx));
             }
 
             if ($i % $steps === 0) {
                 // draw a step
-                $labelField = new Text(-0.5, $pos+0.5, $label);
-                $labelField->setFontSize('1.8em')
+                $labelField = new Text(-0.5, $pos + 0.5, $label);
+                $labelField->setFontSize('2.5em')
                     ->setAlignment(Text::ALIGN_END);
 
                 $group->appendChild($labelField->toSvg($ctx));
                 if ($this->drawXGrid) {
                     $bgLine = new Line(0, $pos, 100, $pos);
                     $bgLine->setStrokeWidth(0.5)
-                        ->setStrokeColor('#343');
+                        ->setStrokeColor('#BFBFBF');
                     $group->appendChild($bgLine->toSvg($ctx));
                 }
             }
diff --git a/library/Icinga/Chart/Graph/LineGraph.php b/library/Icinga/Chart/Graph/LineGraph.php
index d12d4eed9..3644f1492 100644
--- a/library/Icinga/Chart/Graph/LineGraph.php
+++ b/library/Icinga/Chart/Graph/LineGraph.php
@@ -45,6 +45,13 @@ class LineGraph extends Styleable implements Drawable
      */
     public $strokeWidth = 5;
 
+    /**
+     * The size of the displayed dots
+     *
+     * @var int
+     */
+    public $dotWith = 0;
+
     /**
      * Create a new LineGraph displaying the given dataset
      *
@@ -138,8 +145,8 @@ class LineGraph extends Styleable implements Drawable
         $group = $path->toSvg($ctx);
         if ($this->showDataPoints === true) {
             foreach ($this->dataset as $point) {
-                $dot = new Circle($point[0], $point[1], $this->strokeWidth*5);
-                $dot->setFill('black');
+                $dot = new Circle($point[0], $point[1], $this->dotWith);
+                $dot->setFill($this->strokeColor);
 
                 $group->appendChild($dot->toSvg($ctx));
             }
diff --git a/library/Icinga/Chart/Primitive/Circle.php b/library/Icinga/Chart/Primitive/Circle.php
index 058211bf7..da5f1785e 100644
--- a/library/Icinga/Chart/Primitive/Circle.php
+++ b/library/Icinga/Chart/Primitive/Circle.php
@@ -61,7 +61,7 @@ class Circle extends Styleable implements Drawable
         $circle = $ctx->getDocument()->createElement('circle');
         $circle->setAttribute('cx', Format::formatSVGNumber($coords[0]));
         $circle->setAttribute('cy', Format::formatSVGNumber($coords[1]));
-        $circle->setAttribute('r', 5);
+        $circle->setAttribute('r', $this->radius);
         $circle->setAttribute('style', $this->getStyle());
         $this->applyAttributes($circle);
         return $circle;

From 1732fa90e83aa4adcf50b41a583466fc42a1de76 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 13 Jan 2015 18:24:04 +0100
Subject: [PATCH 0165/2920] Fix axisMin in alert summary

---
 .../application/controllers/AlertsummaryController.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index fdb1ec99f..1344d03f4 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -344,8 +344,8 @@ class Monitoring_AlertsummaryController extends Controller
         $gridChart->alignTopLeft();
         $gridChart->setAxisLabel('', mt('monitoring', 'Notifications'))
             ->setXAxis(new StaticAxis())
-            ->setAxisMin(null, 0)
-            ->setYAxis(new LinearUnit(10));
+            ->setYAxis(new LinearUnit(10))
+            ->setAxisMin(null, 0);
 
         $interval = $this->getInterval();
 

From 76d3e5435fada8d4ff5c496bed818722ec20cd22 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 13 Jan 2015 18:25:19 +0100
Subject: [PATCH 0166/2920] Display bigger legend labels correctly without
 overlapping

---
 library/Icinga/Chart/Legend.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Chart/Legend.php b/library/Icinga/Chart/Legend.php
index 46ba8081c..df334089f 100644
--- a/library/Icinga/Chart/Legend.php
+++ b/library/Icinga/Chart/Legend.php
@@ -66,13 +66,14 @@ class Legend implements Drawable
         $outer->getLayout()->setPadding(2, 2, 2, 2);
         $nrOfColumns = 4;
 
-        $leftstep = 100 / $nrOfColumns;
         $topstep = 10 / $nrOfColumns + 2;
 
         $top = 0;
         $left = 0;
         $lastLabelEndPos = -1;
         foreach ($this->dataset as $color => $text) {
+            $leftstep = 100 / $nrOfColumns + strlen($text);
+
             // Make sure labels don't overlap each other
             while ($lastLabelEndPos >= $left) {
                 $left += $leftstep;

From be7e3f98e91fe3b4b083cccdb10d7d5fe936f6cc Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 13 Jan 2015 18:26:39 +0100
Subject: [PATCH 0167/2920] Improve testAction

Add charts to test logarithmic scale, use less annoying colors
---
 .../controllers/ChartController.php           | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/modules/monitoring/application/controllers/ChartController.php b/modules/monitoring/application/controllers/ChartController.php
index 640ee2520..757329bfe 100644
--- a/modules/monitoring/application/controllers/ChartController.php
+++ b/modules/monitoring/application/controllers/ChartController.php
@@ -42,7 +42,7 @@ class Monitoring_ChartController extends Controller
         $chart->drawLines(
             array(
                 'label' => 'Random 1',
-                'color' => 'red',
+                'color' => '#F56',
                 'data'  =>  $data1,
                 'showPoints' => true
             )
@@ -50,7 +50,7 @@ class Monitoring_ChartController extends Controller
         $chart->drawLines(
             array(
                 'label' => 'Random 2',
-                'color' => 'blue',
+                'color' => '#fa4',
                 'data'  =>  $data2,
                 'showPoints' => true
             )
@@ -58,7 +58,7 @@ class Monitoring_ChartController extends Controller
         $chart->drawLines(
             array(
                 'label' => 'Random 3',
-                'color' => 'green',
+                'color' => '#4b7',
                 'data'  =>  $data3,
                 'showPoints' => true
             )
@@ -81,7 +81,7 @@ class Monitoring_ChartController extends Controller
         $chart->drawLines(
             array(
                 'label' => 'f(x): sign(x) * 10^|x|',
-                'color' => 'red',
+                'color' => '#F56',
                 'data'  =>  $data,
                 'showPoints' => true
             )
@@ -103,7 +103,7 @@ class Monitoring_ChartController extends Controller
         $chart->drawLines(
             array(
                 'label' => 'f(x): sign(x) * 10^|x|',
-                'color' => 'red',
+                'color' => '#F56',
                 'data'  =>  $data,
                 'showPoints' => true
             )
@@ -119,7 +119,7 @@ class Monitoring_ChartController extends Controller
         $data1 = array();
         $data2 = array();
         $data3 = array();
-        for ($i = 0; $i < 25; $i++) {
+        for ($i = 0; $i < 50; $i++) {
             $data3[] = array('Label ' . $i, rand(0, 30));
         }
 
@@ -127,13 +127,13 @@ class Monitoring_ChartController extends Controller
         $this->chart->drawLines(
             array(
                 'label' => 'Nr of outtakes',
-                'color' => 'red',
+                'color' => '#F56',
                 'width' => '5',
 
                 'data'  => $data
             ), array(
                 'label' => 'Some line',
-                'color' => 'blue',
+                'color' => '#fa4',
                 'width' => '4',
 
                 'data'  =>  $data3,
@@ -144,7 +144,7 @@ class Monitoring_ChartController extends Controller
         $this->chart->drawBars(
             array(
                 'label' => 'A big amount of data',
-                'color' => 'green',
+                'color' => '#4b7',
                 'data'  =>  $data3,
                 'showPoints' => true
             )
@@ -280,18 +280,15 @@ class Monitoring_ChartController extends Controller
         $upBars = array();
         $downBars = array();
         $unreachableBars = array();
-        foreach ($query as $hostgroup) {
+        for ($i = 0; $i < 50; $i++) {
             $upBars[] = array(
-                $hostgroup->hostgroup,
-                $hostgroup->hosts_up
+                (string)$i, rand(1, 200), rand(1, 200)
             );
             $downBars[] = array(
-                $hostgroup->hostgroup,
-                $hostgroup->hosts_down_unhandled
+                (string)$i, rand(1, 200), rand(1, 200)
             );
             $unreachableBars[] = array(
-                $hostgroup->hostgroup,
-                $hostgroup->hosts_unreachable_unhandled
+                (string)$i, rand(1, 200), rand(1, 200)
             );
         }
         $tooltip = mt('monitoring', '<b>{title}:</b><br> {value} of {sum} hosts are {label}');
@@ -367,7 +364,14 @@ class Monitoring_ChartController extends Controller
                 (int) $query->hosts_unreachable_unhandled,
                 (int) $query->hosts_pending
             ),
-            'colors' => array('#44bb77', '#ff4444', '#ff0000', '#E066FF', '#f099FF', '#fefefe'),
+            'colors' => array(
+                '#44bb77',   // 'Ok'
+                '#ff4444',   // 'Warning'
+                '#ff0000',   // 'WarningHandled'
+                '#E066FF',
+                '#f099FF',
+                '#fefefe'
+            ),
             'labels'=> array(
                 (int) $query->hosts_up . mt('monitoring', ' Up Hosts'),
                 (int) $query->hosts_down_handled . mt('monitoring', ' Down Hosts (Handled)'),

From 0dbd4eb496459b0d21b01c2e41b95ee27319c983 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 14 Jan 2015 10:58:36 +0100
Subject: [PATCH 0168/2920] Web\Hook: support hook base classes in modules

refs #8207
---
 library/Icinga/Web/Hook.php | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Web/Hook.php b/library/Icinga/Web/Hook.php
index 01d1e0e2c..7ace738d7 100644
--- a/library/Icinga/Web/Hook.php
+++ b/library/Icinga/Web/Hook.php
@@ -113,6 +113,18 @@ class Hook
         return $instance;
     }
 
+    protected static function splitHookName($name)
+    {
+        $sep = '\\';
+        if (false === $module = strpos($name, $sep)) {
+            return array(null, $name);
+        }
+        return array(
+            substr($name, 0, $module),
+            substr($name, $module + 1)
+        );
+    }
+
     /**
      * Test for a valid class name
      *
@@ -123,10 +135,24 @@ class Hook
      */
     private static function assertValidHook($instance, $name)
     {
-        $base_class = self::$BASE_NS . ucfirst($name) . 'Hook';
+        $suffix = self::$classSuffix; // 'Hook'
+        $base = self::$BASE_NS;       // 'Icinga\\Web\\Hook\\'
 
-        if (strpos($base_class, self::$classSuffix) === false) {
-            $base_class .= self::$classSuffix;
+        list($module, $name) = self::splitHookName($name);
+
+        if ($module === null) {
+            $base_class = $base . ucfirst($name) . 'Hook';
+
+            // I'm unsure whether this makes sense. Unused and Wrong.
+            if (strpos($base_class, $suffix) === false) {
+                $base_class .= $suffix;
+            }
+        } else {
+            $base_class = 'Icinga\\Module\\'
+                        . ucfirst($module)
+                        . '\\Web\\Hook\\'
+                        . ucfirst($name)
+                        . $suffix;
         }
 
         if (!$instance instanceof $base_class) {

From 5e4b611860da8365b47d2ab750851a426b2f2fd1 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 14 Jan 2015 11:00:26 +0100
Subject: [PATCH 0169/2920] HostActionsHook: initial very simple implementation

refs #8208
---
 .../library/Monitoring/Web/Hook/HostActionsHook.php    | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php

diff --git a/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php b/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
new file mode 100644
index 000000000..c1ccdfbca
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Icinga\Module\Monitoring\Web\Hook;
+
+use Icinga\Module\Monitoring\Object\Host;
+
+abstract class HostActionsHook
+{
+    abstract public function getActionsForHost(Host $host);
+}

From 5e94d65a6c97f968a62a464b8cc8a52f594ec798 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 14 Jan 2015 11:01:39 +0100
Subject: [PATCH 0170/2920] HostController: use host actions hook

refs #8208
---
 .../application/controllers/HostController.php    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index ab62c3756..2f3eedf30 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -9,6 +9,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostCheckCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostDowntimeCommandForm;
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Web\Controller\MonitoredObjectController;
+use Icinga\Web\Hook;
 
 class Monitoring_HostController extends MonitoredObjectController
 {
@@ -33,12 +34,26 @@ class Monitoring_HostController extends MonitoredObjectController
         $this->createTabs();
     }
 
+    protected function getHostActions()
+    {
+        $urls = array();
+
+        foreach (Hook::all('Monitoring\\HostActions') as $hook) {
+            foreach ($hook->getActionsForHost($this->object) as $id => $url) {
+                $urls[$id] = $url;
+            }
+        }
+
+        return $urls;
+    }
+
     /**
      * Show a host
      */
     public function showAction()
     {
         $this->getTabs()->activate('host');
+        $this->view->hostActions = $this->getHostActions();
         parent::showAction();
     }
 

From 0d3131fbd0335f6b8aa627b85057349347946530 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 14 Jan 2015 11:02:06 +0100
Subject: [PATCH 0171/2920] host/show: show action urls above perfdata

---
 modules/monitoring/application/views/scripts/host/show.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/host/show.phtml b/modules/monitoring/application/views/scripts/host/show.phtml
index 8023c1821..02f49b561 100644
--- a/modules/monitoring/application/views/scripts/host/show.phtml
+++ b/modules/monitoring/application/views/scripts/host/show.phtml
@@ -13,9 +13,9 @@
         <?= $this->render('show/components/notifications.phtml') ?>
         <?= $this->render('show/components/downtime.phtml') ?>
         <?= $this->render('show/components/flapping.phtml') ?>
+        <?= $this->render('show/components/actions.phtml') ?>
         <?= $this->render('show/components/perfdata.phtml') ?>
         <?= $this->render('show/components/checksource.phtml') ?>
-        <?= $this->render('show/components/actions.phtml') ?>
         <?= $this->render('show/components/command.phtml') ?>
         <?= $this->render('show/components/hostgroups.phtml') ?>
         <?= $this->render('show/components/contacts.phtml') ?>

From 0fa31acf5fb89ea25addbc578768058f30c4dbda Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 14 Jan 2015 11:02:43 +0100
Subject: [PATCH 0172/2920] components/actions: show host action urls if given

---
 .../views/scripts/show/components/actions.phtml            | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/show/components/actions.phtml b/modules/monitoring/application/views/scripts/show/components/actions.phtml
index 9f3211bd3..c34141084 100644
--- a/modules/monitoring/application/views/scripts/show/components/actions.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/actions.phtml
@@ -6,6 +6,7 @@ if (! $object->action_url && ! $object->notes_url) {
 
 $links = array();
 $linkText = '<a href="%s" target="_blank">%s</a>';
+$localLinkText = '<a href="%s">%s</a>';
 
 if ($object->notes_url) {
     if (strpos($object->notes_url, "' ") === false) {
@@ -32,6 +33,12 @@ if ($object->action_url) {
     }
 }
 
+if (isset($this->hostActions)) {
+    foreach ($this->hostActions as $id => $action) {
+        $links[] = sprintf($localLinkText, $action, $id);
+    }
+}
+
 ?>
 <tr>
   <th>Foreign URLs</th>

From b5cddc0a4f246c0887c544bcb5ecfd69419de227 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 14 Jan 2015 11:50:03 +0100
Subject: [PATCH 0173/2920] components/actions: show links if available

Now we show links regardless of whether we have host actions, there
might be hook-provided links only. Renamed "Foreign URLs" to "Actions"
and made it translatable.
---
 .../views/scripts/show/components/actions.phtml        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/actions.phtml b/modules/monitoring/application/views/scripts/show/components/actions.phtml
index c34141084..1d926b33a 100644
--- a/modules/monitoring/application/views/scripts/show/components/actions.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/actions.phtml
@@ -1,9 +1,5 @@
 <?php
 
-if (! $object->action_url && ! $object->notes_url) {
-    return;
-}
-
 $links = array();
 $linkText = '<a href="%s" target="_blank">%s</a>';
 $localLinkText = '<a href="%s">%s</a>';
@@ -39,8 +35,12 @@ if (isset($this->hostActions)) {
     }
 }
 
+if (empty($links)) {
+    return;
+}
+
 ?>
 <tr>
-  <th>Foreign URLs</th>
+  <th><?= $this->translate('Actions') ?></th>
   <td><?= implode("\n ", $links) . "\n" ?></td>
 </tr>

From 4971037b379c173b4934d4531f1bdd70aac6358c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 14 Jan 2015 13:24:04 +0100
Subject: [PATCH 0174/2920] doc/installation: Add section Preparing Web Setup

---
 doc/installation.md | 58 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/doc/installation.md b/doc/installation.md
index 6928cb2e3..c4496cbf4 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -45,18 +45,66 @@ mv icingaweb2 /usr/share/icingaweb2
 
 Use `icingacli` to generate web server configuration for either Apache or nginx.
 
-*Apache*
-
+Apache:
 ````
 ./bin/icingacli setup config webserver apache --document-root /usr/share/icingaweb2/public
 ````
 
-*nginx*
-
+nginx:
 ````
 ./bin/icingacli setup config webserver nginx --document-root /usr/share/icingaweb2/public
 ````
 
-**Step 4: Web Setup**
+**Step 4: Preparing Web Setup**
+
+Because both web and CLI must have access to configuration and logs, permissions will be managed using a special
+system group. The web server user and CLI user have to be added to this system group.
+
+Add the system group `icingaweb2` in the first place.
+
+Fedora, RHEL, CentOS, SLES and OpenSUSE:
+````
+groupadd -r icingaweb2
+````
+
+Debian and Ubuntu:
+````
+addgroup --system icingaweb2
+````
+
+Add your web server's user to the system group `icingaweb2`:
+
+Fedora, RHEL and CentOS:
+````
+usermod -a -G icingaweb2 apache
+````
+
+SLES and OpenSUSE:
+````
+usermod -G icingaweb2 wwwrun
+````
+
+Debian and Ubuntu:
+````
+usermod -a -G icingaweb2 wwwrun
+````
+
+Use `icingacli` to create the configuration directory which defaults to **/etc/icingaweb2**:
+````
+./bin/icingacli setup config directory
+````
+
+When using the web setup you are required to authenticate using a token. In order to generate a token use the
+`icingacli`:
+````
+./bin/icingacli setup token create
+````
+
+In case you do not remember the token you can show it using the `icingacli`:
+````
+./bin/icingacli setup token show
+````
+
+**Step 5: Web Setup**
 
 Visit Icinga Web 2 in your browser and complete installation using the web setup.

From b983f1901ba093ccd8433073db4a113e8e672651 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 14 Jan 2015 13:24:31 +0100
Subject: [PATCH 0175/2920] modules: Fix that the forms namespace is not
 registered when the module does not have any library file

---
 library/Icinga/Application/Modules/Module.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index 99722f2b6..96bbae7be 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -759,15 +759,15 @@ class Module
     protected function registerAutoloader()
     {
         $moduleName = ucfirst($this->getName());
+
         $moduleLibraryDir = $this->getLibDir(). '/'. $moduleName;
-        if (is_dir($this->getBaseDir()) && is_dir($this->getLibDir()) && is_dir($moduleLibraryDir)) {
+        if (is_dir($moduleLibraryDir)) {
             $this->app->getLoader()->registerNamespace('Icinga\\Module\\' . $moduleName, $moduleLibraryDir);
-            if (is_dir($this->getFormDir())) {
-                $this->app->getLoader()->registerNamespace(
-                    'Icinga\\Module\\' . $moduleName. '\\Forms',
-                    $this->getFormDir()
-                );
-            }
+        }
+
+        $moduleFormDir = $this->getFormDir();
+        if (is_dir($moduleFormDir)) {
+            $this->app->getLoader()->registerNamespace('Icinga\\Module\\' . $moduleName. '\\Forms',  $moduleFormDir);
         }
 
         return $this;

From b8288b28a7717e752250f29041521ddeb5ffa80c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 14 Jan 2015 14:14:44 +0100
Subject: [PATCH 0176/2920] doc/installation: Add PHP gettext and PHP OpenSSL
 support as requirement

---
 doc/installation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/installation.md b/doc/installation.md
index c4496cbf4..def23ffaf 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -6,7 +6,7 @@ system and distribution you are running. But it is also possible to install Icin
 ## <a id="installation-requirements"></a> Installing Requirements
 
 * A web server, e.g. Apache or nginx
-* PHP >= 5.3.0
+* PHP >= 5.3.0 w/ gettext and OpenSSL support
 * MySQL or PostgreSQL PHP libraries when using a database for authentication or storing user preferences into a database
 * LDAP PHP library when using Active Directory or LDAP for authentication
 * Icinga 1.x w/ Livestatus or IDO, Icinga 2 w/ Livestatus or IDO feature enabled

From 37880c6c89dec056ae1d61377afb05c746a03d67 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 14 Jan 2015 14:15:24 +0100
Subject: [PATCH 0177/2920] rpm: Support SUSE packages

resolves #6403
---
 icingaweb2.spec | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index b4d120923..b77f42d86 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -29,6 +29,20 @@ Packager:       Icinga Team <info@icinga.org>
 %endif
 %endif
 
+
+%if 0%{?suse_version}
+%define wwwconfigdir    %{_sysconfdir}/apache2/conf.d
+%define wwwuser         wwwrun
+%define zend            php5-ZendFramework
+%if 0%{?suse_version} == 1110
+%define php php53
+Requires: apache2-mod_php53
+%else
+%define php php5
+Requires: apache2-mod_php5
+%endif
+%endif
+
 Requires(pre):  shadow-utils
 Requires:       %{name}-common = %{version}-%{release}
 Requires:       php-Icinga = %{version}-%{release}
@@ -61,21 +75,23 @@ Common files for Icinga Web 2 and the Icinga CLI
 
 
 %package -n php-Icinga
-Summary:    Icinga Web 2 PHP library
-Group:      Development/Libraries
-Requires:   %{php} >= 5.3.0
+Summary:                    Icinga Web 2 PHP library
+Group:                      Development/Libraries
+Requires:                   %{php} >= 5.3.0
+%{?suse_version:Requires:   %{php}-gettext %{php}-openssl}
 
 %description -n php-Icinga
 Icinga Web 2 PHP library
 
 
 %package -n icingacli
-Summary:            Icinga CLI
-Group:              Applications/System
-Requires:           %{name}-common = %{version}-%{release}
-Requires:           php-Icinga = %{version}-%{release}
-Requires:           %{php_cli} >= 5.3.0
-%{?rhel:Requires:   bash-completion}
+Summary:                    Icinga CLI
+Group:                      Applications/System
+Requires:                   %{name}-common = %{version}-%{release}
+Requires:                   php-Icinga = %{version}-%{release}
+%{?suse_version:Requires:   %{php} >= 5.3.0}
+%{?rhel:Requires:           %{php_cli} >= 5.3.0}
+%{?rhel:Requires:           bash-completion}
 
 %description -n icingacli
 Icinga CLI
@@ -168,7 +184,11 @@ cp -prv etc/schema %{buildroot}/%{_datadir}/doc/%{name}
 
 %pre
 getent group icingacmd >/dev/null || groupadd -r icingacmd
+%if 0%{?suse_version}
+usermod -G icingacmd,%{icingawebgroup} %{wwwuser}
+%else
 usermod -a -G icingacmd,%{icingawebgroup} %{wwwuser}
+%endif
 exit 0
 
 %clean

From 35e090c17eef7e2525c97e7061b207e063f16ff4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 16 Jan 2015 13:12:10 +0100
Subject: [PATCH 0178/2920] monitoring: Support format query parameters for
 process/info

---
 .../monitoring/application/controllers/ProcessController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php
index 62334d7e8..bb5a4e5c2 100644
--- a/modules/monitoring/application/controllers/ProcessController.php
+++ b/modules/monitoring/application/controllers/ProcessController.php
@@ -64,8 +64,9 @@ class Monitoring_ProcessController extends Controller
                     'process_performance_data'
                 )
             )
-            ->getQuery()
-            ->fetchRow();
+            ->getQuery();
+        $this->handleFormatRequest($programStatus);
+        $programStatus = $programStatus->fetchRow();
         if ($programStatus === false) {
             return $this->render('not-running', true, null);
         }

From e93e8f633045d7fd0f844e797848d4d6fe32ca9e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 16 Jan 2015 13:13:13 +0100
Subject: [PATCH 0179/2920] setup: Convert octal directory mode to decimal
 notation

PHP's chmod sets wrong permissions when using 2770 as directory mode for example.

fixes #8233
---
 modules/setup/library/Setup/Utils/MakeDirStep.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/setup/library/Setup/Utils/MakeDirStep.php b/modules/setup/library/Setup/Utils/MakeDirStep.php
index b758ccd79..27919820b 100644
--- a/modules/setup/library/Setup/Utils/MakeDirStep.php
+++ b/modules/setup/library/Setup/Utils/MakeDirStep.php
@@ -16,12 +16,12 @@ class MakeDirStep extends Step
 
     /**
      * @param array $paths
-     * @param int   $dirmode
+     * @param int   $dirmode    Directory mode in octal notation
      */
     public function __construct($paths, $dirmode)
     {
         $this->paths = $paths;
-        $this->dirmode = $dirmode;
+        $this->dirmode = octdec($dirmode);
         $this->errors = array();
     }
 

From a6861789bb668877fb4a1101ab3dcb97fe4a80bf Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 16 Jan 2015 17:00:44 +0100
Subject: [PATCH 0180/2920] lib: Remove superfluous return false from IdoQuery

---
 .../monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index 4682487d2..0b505cd73 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -292,7 +292,6 @@ abstract class IdoQuery extends DbQuery
         $mapped = $this->getMappedField($field);
         if ($mapped === null) {
             return stripos($field, 'UNIX_TIMESTAMP') !== false;
-            return false;
         }
         return stripos($mapped, 'UNIX_TIMESTAMP') !== false;
     }

From dae3ccd90cf040fc4add11b12e51049491affbce Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 16 Jan 2015 17:02:35 +0100
Subject: [PATCH 0181/2920] monitoring: Take status_update_time into account
 when is_currently_running is 1

fixes #8210
---
 .../Backend/Ido/Query/ProgramstatusQuery.php  | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
index e6abd4f77..989c2b698 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
@@ -11,17 +11,27 @@ class ProgramstatusQuery extends IdoQuery
 {
     protected $columnMap = array(
         'programstatus' => array(
-            'id'                                => 'programstatus_id',
-            'status_update_time'                => 'UNIX_TIMESTAMP(status_update_time)',
-            'program_start_time'                => 'UNIX_TIMESTAMP(program_start_time)',
-            'program_end_time'                  => 'UNIX_TIMESTAMP(program_end_time)',
-            'is_currently_running'              => 'is_currently_running',
+            'id'                    => 'programstatus_id',
+            'status_update_time'    => 'UNIX_TIMESTAMP(programstatus.status_update_time)',
+            'program_start_time'    => 'UNIX_TIMESTAMP(programstatus.program_start_time)',
+            'program_end_time'      => 'UNIX_TIMESTAMP(programstatus.program_end_time)',
+            'is_currently_running'  => 'CASE WHEN (programstatus.is_currently_running = 0)
+                THEN
+                    0
+                ELSE
+                    CASE WHEN (UNIX_TIMESTAMP(programstatus.status_update_time) + 60 > UNIX_TIMESTAMP(NOW()))
+                    THEN
+                        1
+                    ELSE
+                        0
+                    END
+                END',
             'process_id'                        => 'process_id',
             'daemon_mode'                       => 'daemon_mode',
-            'last_command_check'                => 'UNIX_TIMESTAMP(last_command_check)',
-            'last_log_rotation'                 => 'UNIX_TIMESTAMP(last_log_rotation)',
+            'last_command_check'                => 'UNIX_TIMESTAMP(programstatus.last_command_check)',
+            'last_log_rotation'                 => 'UNIX_TIMESTAMP(programstatus.last_log_rotation)',
             'notifications_enabled'             => 'notifications_enabled',
-            'disable_notif_expire_time'         => 'UNIX_TIMESTAMP(disable_notif_expire_time)',
+            'disable_notif_expire_time'         => 'UNIX_TIMESTAMP(programstatus.disable_notif_expire_time)',
             'active_service_checks_enabled'     => 'active_service_checks_enabled',
             'passive_service_checks_enabled'    => 'passive_service_checks_enabled',
             'active_host_checks_enabled'        => 'active_host_checks_enabled',

From 09d5ec6b7a097fcc65a32e8c9272440c64b52882 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 16 Jan 2015 17:05:50 +0100
Subject: [PATCH 0182/2920] postgres: Return 0 if a timestamp looks like the
 default timestamp

The PostgreSQL IDO schema sets the default value for timestamps with time zone
to the epoch time w/o giving the time zone +00. Thus default timestamps are always
wrong when using a time zone other than 'UTC'.

refs #7919
---
 .../library/Monitoring/Backend/Ido/Query/IdoQuery.php        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index 0b505cd73..f2e5bd15f 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -323,6 +323,11 @@ abstract class IdoQuery extends DbQuery
             foreach ($columns as $key => & $value) {
                 $value = preg_replace('/ COLLATE .+$/', '', $value);
                 $value = preg_replace('/inet_aton\(([[:word:].]+)\)/i', '$1::inet - \'0.0.0.0\'', $value);
+                $value = preg_replace(
+                    '/(UNIX_TIMESTAMP(\((?>[^()]|(?-1))*\)))/i',
+                    'CASE WHEN ($1 = EXTRACT(TIMEZONE FROM NOW()) * -1) THEN 0 ELSE $1 END',
+                    $value
+                );
             }
         }
     }

From bab92b1b16bfec9fd7bae6b3783b163cbf4196b4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 16 Jan 2015 17:38:22 +0100
Subject: [PATCH 0183/2920] rpm: Use a macro for the docs directory

refs #4075
---
 icingaweb2.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index b77f42d86..4fa670333 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -64,6 +64,7 @@ Icinga Web 2
 %define logdir          %{_localstatedir}/log/%{name}
 %define phpdir          %{_datadir}/php
 %define icingawebgroup  icingaweb2
+%define docsdir          %{_datadir}/doc/%{name}
 
 
 %package common
@@ -170,7 +171,7 @@ Icinga Web 2 vendor library Zend
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/{%{basedir}/{modules,library,public},%{bindir},%{configdir},%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d,%{_datadir}/doc/%{name}}
+mkdir -p %{buildroot}/{%{basedir}/{modules,library,public},%{bindir},%{configdir},%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d,%{docsdir}}
 cp -prv application doc %{buildroot}/%{basedir}
 cp -pv etc/bash_completion.d/icingacli %{buildroot}/%{_sysconfdir}/bash_completion.d/icingacli
 cp -prv modules/{monitoring,setup} %{buildroot}/%{basedir}/modules
@@ -180,7 +181,7 @@ cp -prv public/{css,img,js,error_norewrite.html} %{buildroot}/%{basedir}/public
 cp -pv packages/files/apache/icingaweb2.conf %{buildroot}/%{wwwconfigdir}/icingaweb2.conf
 cp -pv packages/files/bin/icingacli %{buildroot}/%{bindir}
 cp -pv packages/files/public/index.php %{buildroot}/%{basedir}/public
-cp -prv etc/schema %{buildroot}/%{_datadir}/doc/%{name}
+cp -prv etc/schema %{buildroot}/%{docsdir}
 
 %pre
 getent group icingacmd >/dev/null || groupadd -r icingacmd
@@ -206,8 +207,8 @@ rm -rf %{buildroot}
 %{basedir}/public
 %{wwwconfigdir}/icingaweb2.conf
 %attr(2775,root,%{icingawebgroup}) %dir %{logdir}
-%{_datadir}/doc/%{name}
-%docdir %{_datadir}/doc/%{name}
+%{docsdir}
+%docdir %{docsdir}
 
 
 %pre common

From 970006838cb2791091dfb2632b1c7eea9d4a243f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 19 Jan 2015 10:49:02 +0100
Subject: [PATCH 0184/2920] Replace t() and mt() with translate() in the
 monitoring module's forms

refs #7551
---
 .../DisableNotificationsExpireCommandForm.php | 11 ++--
 .../ToggleInstanceFeaturesCommandForm.php     | 28 +++++-----
 .../Object/AcknowledgeProblemCommandForm.php  | 34 ++++++------
 .../Command/Object/AddCommentCommandForm.php  | 13 ++---
 .../Command/Object/CheckNowCommandForm.php    |  4 +-
 .../Object/DeleteCommentCommandForm.php       |  4 +-
 .../Object/DeleteDowntimeCommandForm.php      |  4 +-
 .../Object/ProcessCheckResultCommandForm.php  | 30 +++++------
 .../Object/ScheduleHostCheckCommandForm.php   |  5 +-
 .../ScheduleHostDowntimeCommandForm.php       | 16 +++---
 .../ScheduleServiceCheckCommandForm.php       | 17 +++---
 .../ScheduleServiceDowntimeCommandForm.php    | 34 ++++++------
 .../ToggleObjectFeaturesCommandForm.php       | 16 +++---
 .../Config/Instance/LocalInstanceForm.php     |  4 +-
 .../Config/Instance/RemoteInstanceForm.php    | 16 +++---
 .../RemoteInstanceKeyResourcePage.php         | 54 +++++++++++++++++++
 .../forms/Config/InstanceConfigForm.php       | 34 ++++++------
 .../forms/Config/SecurityConfigForm.php       |  8 +--
 .../application/forms/EventOverviewForm.php   | 10 ++--
 .../application/forms/Setup/BackendPage.php   | 15 +++---
 .../forms/Setup/IdoResourcePage.php           | 11 ++--
 .../application/forms/Setup/InstancePage.php  |  5 +-
 .../forms/Setup/LivestatusResourcePage.php    | 11 ++--
 .../application/forms/Setup/SecurityPage.php  |  5 +-
 .../application/forms/Setup/WelcomePage.php   | 10 ++--
 .../application/forms/StatehistoryForm.php    | 42 +++++++--------
 26 files changed, 237 insertions(+), 204 deletions(-)
 create mode 100644 modules/monitoring/application/forms/Config/Instance/RemoteInstanceKeyResourcePage.php

diff --git a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
index 0e64a4b03..21d926b58 100644
--- a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
@@ -21,7 +21,7 @@ class DisableNotificationsExpireCommandForm extends CommandForm
      */
     public function init()
     {
-        $this->setSubmitLabel(mt('monitoring', 'Disable Notifications'));
+        $this->setSubmitLabel($this->translate('Disable Notifications'));
     }
 
     /**
@@ -30,8 +30,7 @@ class DisableNotificationsExpireCommandForm extends CommandForm
      */
     public function getHelp()
     {
-        return mt(
-            'monitoring',
+        return $this->translate(
             'This command is used to disable host and service notifications for a specific time.'
         );
     }
@@ -49,8 +48,8 @@ class DisableNotificationsExpireCommandForm extends CommandForm
             'expire_time',
             array(
                 'required'      => true,
-                'label'         => mt('monitoring', 'Expire Time'),
-                'description'   => mt('monitoring', 'Set the expire time.'),
+                'label'         => $this->translate('Expire Time'),
+                'description'   => $this->translate('Set the expire time.'),
                 'value'         => $expireTime
             )
         );
@@ -67,7 +66,7 @@ class DisableNotificationsExpireCommandForm extends CommandForm
         $disableNotifications
             ->setExpireTime($this->getElement('expire_time')->getValue()->getTimestamp());
         $this->getTransport($this->request)->send($disableNotifications);
-        Notification::success(mt('monitoring', 'Disabling host and service notifications..'));
+        Notification::success($this->translate('Disabling host and service notifications..'));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index 291619b2f..469c1b6eb 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -61,13 +61,13 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
         if ((bool) $this->status->notifications_enabled) {
             $notificationDescription = sprintf(
                 '<a title="%s" href="%s" data-base-target="_next">%s</a>',
-                mt('monitoring', 'Disable notifications for a specific time on a program-wide basis'),
+                $this->translate('Disable notifications for a specific time on a program-wide basis'),
                 $this->getView()->href('monitoring/process/disable-notifications'),
-                mt('monitoring', 'Disable temporarily')
+                $this->translate('Disable temporarily')
             );
         } elseif ($this->status->disable_notif_expire_time) {
             $notificationDescription = sprintf(
-                mt('monitoring', 'Notifications will be re-enabled in <strong>%s</strong>'),
+                $this->translate('Notifications will be re-enabled in <strong>%s</strong>'),
                 $this->getView()->timeUntil($this->status->disable_notif_expire_time)
             );
         } else {
@@ -78,7 +78,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_ACTIVE_HOST_CHECKS,
                 array(
-                    'label'         =>  mt('monitoring', 'Active Host Checks Being Executed'),
+                    'label'         =>  $this->translate('Active Host Checks Being Executed'),
                     'autosubmit'    => true
                 )
             ),
@@ -86,7 +86,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_ACTIVE_SERVICE_CHECKS,
                 array(
-                    'label'         =>  mt('monitoring', 'Active Service Checks Being Executed'),
+                    'label'         =>  $this->translate('Active Service Checks Being Executed'),
                     'autosubmit'    => true
                 )
             ),
@@ -94,7 +94,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_EVENT_HANDLERS,
                 array(
-                    'label'         => mt('monitoring', 'Event Handlers Enabled'),
+                    'label'         => $this->translate('Event Handlers Enabled'),
                     'autosubmit'    => true
                 )
             ),
@@ -102,7 +102,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_FLAP_DETECTION,
                 array(
-                    'label'         => mt('monitoring', 'Flap Detection Enabled'),
+                    'label'         => $this->translate('Flap Detection Enabled'),
                     'autosubmit'    => true
                 )
             ),
@@ -110,7 +110,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_NOTIFICATIONS,
                 array(
-                    'label'         => mt('monitoring', 'Notifications Enabled'),
+                    'label'         => $this->translate('Notifications Enabled'),
                     'autosubmit'    => true,
                     'description'   => $notificationDescription,
                     'decorators'    => array(
@@ -129,7 +129,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_HOST_OBSESSING,
                 array(
-                    'label'         => mt('monitoring', 'Obsessing Over Hosts'),
+                    'label'         => $this->translate('Obsessing Over Hosts'),
                     'autosubmit'    => true
                 )
             ),
@@ -137,7 +137,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_SERVICE_OBSESSING,
                 array(
-                    'label'         => mt('monitoring', 'Obsessing Over Services'),
+                    'label'         => $this->translate('Obsessing Over Services'),
                     'autosubmit'    => true
                 )
             ),
@@ -145,7 +145,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_PASSIVE_HOST_CHECKS,
                 array(
-                    'label'         =>  mt('monitoring', 'Passive Host Checks Being Accepted'),
+                    'label'         =>  $this->translate('Passive Host Checks Being Accepted'),
                     'autosubmit'    => true
                 )
             ),
@@ -153,7 +153,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_PASSIVE_SERVICE_CHECKS,
                 array(
-                    'label'         =>  mt('monitoring', 'Passive Service Checks Being Accepted'),
+                    'label'         =>  $this->translate('Passive Service Checks Being Accepted'),
                     'autosubmit'    => true
                 )
             ),
@@ -161,7 +161,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_PERFORMANCE_DATA,
                 array(
-                    'label'         =>  mt('monitoring', 'Performance Data Being Processed'),
+                    'label'         =>  $this->translate('Performance Data Being Processed'),
                     'autosubmit'    => true
                 )
             )
@@ -198,7 +198,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 ->setEnabled($enabled);
             $this->getTransport($this->request)->send($toggleFeature);
         }
-        Notification::success(mt('monitoring', 'Toggling feature..'));
+        Notification::success($this->translate('Toggling feature..'));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
index 25ac76c25..df3731837 100644
--- a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
@@ -31,8 +31,7 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
      */
     public function getHelp()
     {
-        return mt(
-            'monitoring',
+        return $this->translate(
             'This command is used to acknowledge host or service problems. When a problem is acknowledged,'
             . ' future notifications about problems are temporarily disabled until the host or service'
             . ' recovers.'
@@ -51,9 +50,8 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 'comment',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'Comment'),
-                    'description'   => mt(
-                        'monitoring',
+                    'label'         => $this->translate('Comment'),
+                    'description'   => $this->translate(
                         'If you work with other administrators, you may find it useful to share information about the'
                         . ' the host or service that is having problems. Make sure you enter a brief description of'
                         . ' what you are doing.'
@@ -64,9 +62,8 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 'checkbox',
                 'persistent',
                 array(
-                    'label'         => mt('monitoring', 'Persistent Comment'),
-                    'description'   => mt(
-                        'monitoring',
+                    'label'         => $this->translate('Persistent Comment'),
+                    'description'   => $this->translate(
                         'If you would like the comment to remain even when the acknowledgement is removed, check this'
                         . ' option.'
                     )
@@ -76,8 +73,10 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 'checkbox',
                 'expire',
                 array(
-                    'label'         => mt('monitoring', 'Use Expire Time'),
-                    'description'   => mt('monitoring', 'If the acknowledgement should expire, check this option.'),
+                    'label'         => $this->translate('Use Expire Time'),
+                    'description'   => $this->translate(
+                        'If the acknowledgement should expire, check this option.'
+                    ),
                     'autosubmit'    => true
                 )
             )
@@ -89,10 +88,9 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 'dateTimePicker',
                 'expire_time',
                 array(
-                    'label'         => mt('monitoring', 'Expire Time'),
+                    'label'         => $this->translate('Expire Time'),
                     'value'         => $expireTime,
-                    'description'   => mt(
-                        'monitoring',
+                    'description'   => $this->translate(
                         'Enter the expire date and time for this acknowledgement here. Icinga will delete the'
                         . ' acknowledgement after this time expired.'
                     )
@@ -114,10 +112,9 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 'checkbox',
                 'sticky',
                 array(
-                    'label'         => mt('monitoring', 'Sticky Acknowledgement'),
+                    'label'         => $this->translate('Sticky Acknowledgement'),
                     'value'         => true,
-                    'description'   => mt(
-                        'monitoring',
+                    'description'   => $this->translate(
                         'If you want the acknowledgement to disable notifications until the host or service recovers,'
                         . ' check this option.'
                     )
@@ -127,10 +124,9 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 'checkbox',
                 'notify',
                 array(
-                    'label'         => mt('monitoring', 'Send Notification'),
+                    'label'         => $this->translate('Send Notification'),
                     'value'         => true,
-                    'description'   => mt(
-                        'monitoring',
+                    'description'   => $this->translate(
                         'If you do not want an acknowledgement notification to be sent out to the appropriate contacts,'
                         . ' uncheck this option.'
                     )
diff --git a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
index f5adf6c71..e7f7e91f9 100644
--- a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
@@ -29,8 +29,7 @@ class AddCommentCommandForm extends ObjectsCommandForm
      */
     public function getHelp()
     {
-        return mt(
-            'monitoring',
+        return $this->translate(
             'This command is used to add host or service comments.'
         );
     }
@@ -47,9 +46,8 @@ class AddCommentCommandForm extends ObjectsCommandForm
                 'comment',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'Comment'),
-                    'description'   => mt(
-                        'monitoring',
+                    'label'         => $this->translate('Comment'),
+                    'description'   => $this->translate(
                         'If you work with other administrators, you may find it useful to share information about the'
                         . ' the host or service that is having problems. Make sure you enter a brief description of'
                         . ' what you are doing.'
@@ -60,10 +58,9 @@ class AddCommentCommandForm extends ObjectsCommandForm
                 'checkbox',
                 'persistent',
                 array(
-                    'label'         => mt('monitoring', 'Persistent'),
+                    'label'         => $this->translate('Persistent'),
                     'value'         => true,
-                    'description'   => mt(
-                        'monitoring',
+                    'description'   => $this->translate(
                         'If you uncheck this option, the comment will automatically be deleted the next time Icinga is'
                         . ' restarted.'
                     )
diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
index 01006683f..1054aae05 100644
--- a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
@@ -35,8 +35,8 @@ class CheckNowCommandForm extends ObjectsCommandForm
                 array(
                     'ignore'        => true,
                     'type'          => 'submit',
-                    'value'         => mt('monitoring', 'Check now'),
-                    'label'         => '<i class="icon-reschedule"></i> ' . mt('monitoring', 'Check now'),
+                    'value'         => $this->translate('Check now'),
+                    'label'         => '<i class="icon-reschedule"></i> ' . $this->translate('Check now'),
                     'decorators'    => array('ViewHelper'),
                     'escape'        => false,
                     'class'         => 'link-like'
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
index 3d85afcec..0f7858ad9 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
@@ -55,7 +55,7 @@ class DeleteCommentCommandForm extends ObjectsCommandForm
             array(
                 'ignore'        => true,
                 'label'         => 'X',
-                'title'         => mt('monitoring', 'Delete comment'),
+                'title'         => $this->translate('Delete comment'),
                 'decorators'    => array('ViewHelper')
             )
         );
@@ -80,7 +80,7 @@ class DeleteCommentCommandForm extends ObjectsCommandForm
         if (! empty($redirect)) {
             $this->setRedirectUrl($redirect);
         }
-        Notification::success(mt('monitoring', 'Deleting comment..'));
+        Notification::success($this->translate('Deleting comment..'));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
index 1c7095b82..43ca52b05 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -55,7 +55,7 @@ class DeleteDowntimeCommandForm extends ObjectsCommandForm
             array(
                 'ignore'        => true,
                 'label'         => 'X',
-                'title'         => mt('monitoring', 'Delete downtime'),
+                'title'         => $this->translate('Delete downtime'),
                 'decorators'    => array('ViewHelper')
             )
         );
@@ -80,7 +80,7 @@ class DeleteDowntimeCommandForm extends ObjectsCommandForm
         if (! empty($redirect)) {
             $this->setRedirectUrl($redirect);
         }
-        Notification::success(mt('monitoring', 'Deleting downtime..'));
+        Notification::success($this->translate('Deleting downtime..'));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
index 48ee00ab3..44e248956 100644
--- a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
@@ -29,8 +29,7 @@ class ProcessCheckResultCommandForm extends ObjectsCommandForm
      */
     public function getHelp()
     {
-        return mt(
-            'monitoring',
+        return $this->translate(
             'This command is used to submit passive host or service check results.'
         );
     }
@@ -53,17 +52,17 @@ class ProcessCheckResultCommandForm extends ObjectsCommandForm
             'status',
             array(
                 'required'      => true,
-                'label'         => mt('monitoring', 'Status'),
-                'description'   => mt('monitoring', 'The state this check result should report'),
+                'label'         => $this->translate('Status'),
+                'description'   => $this->translate('The state this check result should report'),
                 'multiOptions'  => $object->getType() === $object::TYPE_HOST ? array(
-                    ProcessCheckResultCommand::HOST_UP          => mt('monitoring', 'UP', 'icinga.state'),
-                    ProcessCheckResultCommand::HOST_DOWN        => mt('monitoring', 'DOWN', 'icinga.state'),
-                    ProcessCheckResultCommand::HOST_UNREACHABLE => mt('monitoring', 'UNREACHABLE', 'icinga.state')
+                    ProcessCheckResultCommand::HOST_UP          => $this->translate('UP', 'icinga.state'),
+                    ProcessCheckResultCommand::HOST_DOWN        => $this->translate('DOWN', 'icinga.state'),
+                    ProcessCheckResultCommand::HOST_UNREACHABLE => $this->translate('UNREACHABLE', 'icinga.state')
                 ) : array(
-                    ProcessCheckResultCommand::SERVICE_OK       => mt('monitoring', 'OK', 'icinga.state'),
-                    ProcessCheckResultCommand::SERVICE_WARNING  => mt('monitoring', 'WARNING', 'icinga.state'),
-                    ProcessCheckResultCommand::SERVICE_CRITICAL => mt('monitoring', 'CRITICAL', 'icinga.state'),
-                    ProcessCheckResultCommand::SERVICE_UNKNOWN  => mt('monitoring', 'UNKNOWN', 'icinga.state')
+                    ProcessCheckResultCommand::SERVICE_OK       => $this->translate('OK', 'icinga.state'),
+                    ProcessCheckResultCommand::SERVICE_WARNING  => $this->translate('WARNING', 'icinga.state'),
+                    ProcessCheckResultCommand::SERVICE_CRITICAL => $this->translate('CRITICAL', 'icinga.state'),
+                    ProcessCheckResultCommand::SERVICE_UNKNOWN  => $this->translate('UNKNOWN', 'icinga.state')
                 )
             )
         );
@@ -72,8 +71,8 @@ class ProcessCheckResultCommandForm extends ObjectsCommandForm
             'output',
             array(
                 'required'      => true,
-                'label'         => mt('monitoring', 'Output'),
-                'description'   => mt('monitoring', 'The plugin output of this check result')
+                'label'         => $this->translate('Output'),
+                'description'   => $this->translate('The plugin output of this check result')
             )
         );
         $this->addElement(
@@ -81,9 +80,8 @@ class ProcessCheckResultCommandForm extends ObjectsCommandForm
             'perfdata',
             array(
                 'allowEmpty'    => true,
-                'label'         => mt('monitoring', 'Performance Data'),
-                'description'   => mt(
-                    'monitoring',
+                'label'         => $this->translate('Performance Data'),
+                'description'   => $this->translate(
                     'The performance data of this check result. Leave empty'
                     . ' if this check result has no performance data'
                 )
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
index 82a9b2e52..949ec33e1 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
@@ -24,9 +24,8 @@ class ScheduleHostCheckCommandForm extends ScheduleServiceCheckCommandForm
                 'checkbox',
                 'all_services',
                 array(
-                    'label'         => mt('monitoring', 'All Services'),
-                    'description'   => mt(
-                        'monitoring',
+                    'label'         => $this->translate('All Services'),
+                    'description'   => $this->translate(
                         'Schedule check for all services on the hosts and the hosts themselves.'
                     )
                 )
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
index beb0793ef..f84069a9a 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
@@ -27,9 +27,8 @@ class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
                 'checkbox',
                 'all_services',
                 array(
-                    'label'         => mt('monitoring', 'All Services'),
-                    'description'   => mt(
-                        'monitoring',
+                    'label'         => $this->translate('All Services'),
+                    'description'   => $this->translate(
                         'Schedule downtime for all services on the hosts and the hosts themselves.'
                     )
                 )
@@ -38,15 +37,14 @@ class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
                 'select',
                 'child_hosts',
                 array(
-                    'label'        => mt('monitoring', 'Child Hosts'),
+                    'label'        => $this->translate('Child Hosts'),
                     'required'     => true,
                     'multiOptions' => array(
-                        0 => mt('monitoring', 'Do nothing with child hosts'),
-                        1 => mt('monitoring', 'Schedule triggered downtime for all child hosts'),
-                        2 => mt('monitoring', 'Schedule non-triggered downtime for all child hosts')
+                        0 => $this->translate('Do nothing with child hosts'),
+                        1 => $this->translate('Schedule triggered downtime for all child hosts'),
+                        2 => $this->translate('Schedule non-triggered downtime for all child hosts')
                     ),
-                    'description' => mt(
-                        'monitoring',
+                    'description' => $this->translate(
                         'Define what should be done with the child hosts of the hosts.'
                     )
                 )
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
index 9e04a2254..b34472d49 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
@@ -32,8 +32,7 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
      */
     public function getHelp()
     {
-        return mt(
-            'monitoring',
+        return $this->translate(
             'This command is used to schedule the next check of hosts or services. Icinga will re-queue the'
             . ' hosts or services to be checked at the time you specify.'
         );
@@ -52,8 +51,7 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
                 'note',
                 'command-info',
                 array(
-                    'value' => mt(
-                        'monitoring',
+                    'value' => $this->translate(
                         'This command is used to schedule the next check of hosts or services. Icinga will re-queue the'
                         . ' hosts or services to be checked at the time you specify.'
                     )
@@ -64,8 +62,10 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
                 'check_time',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'Check Time'),
-                    'description'   => mt('monitoring', 'Set the date and time when the check should be scheduled.'),
+                    'label'         => $this->translate('Check Time'),
+                    'description'   => $this->translate(
+                        'Set the date and time when the check should be scheduled.'
+                    ),
                     'value'         => $checkTime
                 )
             ),
@@ -73,9 +73,8 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
                 'checkbox',
                 'force_check',
                 array(
-                    'label'         => mt('monitoring', 'Force Check'),
-                    'description'   => mt(
-                        'monitoring',
+                    'label'         => $this->translate('Force Check'),
+                    'description'   => $this->translate(
                         'If you select this option, Icinga will force a check regardless of both what time the'
                         . ' scheduled check occurs and whether or not checks are enabled.'
                     )
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
index 9961d4b65..4f66898f6 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
@@ -42,8 +42,7 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
      */
     public function getHelp()
     {
-        return mt(
-            'monitoring',
+        return $this->translate(
             'This command is used to schedule host and service downtimes. During the specified downtime,'
             . ' Icinga will not send notifications out about the hosts and services. When the scheduled'
             . ' downtime expires, Icinga will send out notifications for the hosts and services as it'
@@ -67,9 +66,8 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                 'comment',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'Comment'),
-                    'description'   => mt(
-                        'monitoring',
+                    'label'         => $this->translate('Comment'),
+                    'description'   => $this->translate(
                         'If you work with other administrators, you may find it useful to share information about the'
                         . ' the host or service that is having problems. Make sure you enter a brief description of'
                         . ' what you are doing.'
@@ -81,8 +79,8 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                 'start',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'Start Time'),
-                    'description'   => mt('monitoring', 'Set the start date and time for the downtime.'),
+                    'label'         => $this->translate('Start Time'),
+                    'description'   => $this->translate('Set the start date and time for the downtime.'),
                     'value'         => $start
                 )
             ),
@@ -91,8 +89,8 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                 'end',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'End Time'),
-                    'description'   => mt('monitoring', 'Set the end date and time for the downtime.'),
+                    'label'         => $this->translate('End Time'),
+                    'description'   => $this->translate('Set the end date and time for the downtime.'),
                     'value'         => $end
                 )
             ),
@@ -102,17 +100,16 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                 array(
                     'required'      => true,
                     'autosubmit'    => true,
-                    'label'         => mt('monitoring', 'Type'),
-                    'description'   => mt(
-                        'monitoring',
+                    'label'         => $this->translate('Type'),
+                    'description'   => $this->translate(
                         'If you select the fixed option, the downtime will be in effect between the start and end'
                         . ' times you specify whereas a flexible downtime starts when the host or service enters a'
                         . ' problem state sometime between the start and end times you specified and lasts as long'
                         . ' as the duration time you enter. The duration fields do not apply for fixed downtimes.'
                     ),
                     'multiOptions' => array(
-                        self::FIXED     => mt('monitoring', 'Fixed'),
-                        self::FLEXIBLE  => mt('monitoring', 'Flexible')
+                        self::FIXED     => $this->translate('Fixed'),
+                        self::FLEXIBLE  => $this->translate('Flexible')
                     ),
                     'validators' => array(
                         array(
@@ -141,7 +138,7 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                     'hours',
                     array(
                         'required'  => true,
-                        'label'     => mt('monitoring', 'Hours'),
+                        'label'     => $this->translate('Hours'),
                         'value'     => 2,
                         'min'       => -1
                     )
@@ -151,7 +148,7 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                     'minutes',
                     array(
                         'required'  => true,
-                        'label'     => mt('monitoring', 'Minutes'),
+                        'label'     => $this->translate('Minutes'),
                         'value'     => 0,
                         'min'       => -1
                     )
@@ -161,9 +158,8 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                 array('hours', 'minutes'),
                 'duration',
                 array(
-                    'legend'        => mt('monitoring', 'Flexible Duration'),
-                    'description'   => mt(
-                        'monitoring',
+                    'legend'        => $this->translate('Flexible Duration'),
+                    'description'   => $this->translate(
                         'Enter here the duration of the downtime. The downtime will be automatically deleted after this'
                         . ' time expired.'
                     ),
diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
index c33527895..bf0a1d8b1 100644
--- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
@@ -33,7 +33,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_ACTIVE_CHECKS,
                 array(
-                    'label'         => mt('monitoring', 'Active Checks'),
+                    'label'         => $this->translate('Active Checks'),
                     'autosubmit'    => true
                 )
             ),
@@ -41,7 +41,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_PASSIVE_CHECKS,
                 array(
-                    'label'         => mt('monitoring', 'Passive Checks'),
+                    'label'         => $this->translate('Passive Checks'),
                     'autosubmit'    => true
                 )
             ),
@@ -49,7 +49,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_OBSESSING,
                 array(
-                    'label'         => mt('monitoring', 'Obsessing'),
+                    'label'         => $this->translate('Obsessing'),
                     'autosubmit'    => true
                 )
             ),
@@ -57,7 +57,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_NOTIFICATIONS,
                 array(
-                    'label'         => mt('monitoring', 'Notifications'),
+                    'label'         => $this->translate('Notifications'),
                     'autosubmit'    => true
                 )
             ),
@@ -65,7 +65,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_EVENT_HANDLER,
                 array(
-                    'label'         => mt('monitoring', 'Event Handler'),
+                    'label'         => $this->translate('Event Handler'),
                     'autosubmit'    => true
                 )
             ),
@@ -73,7 +73,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_FLAP_DETECTION,
                 array(
-                    'label'         => mt('monitoring', 'Flap Detection'),
+                    'label'         => $this->translate('Flap Detection'),
                     'autosubmit'    => true
                 )
             )
@@ -95,7 +95,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
             $element = $this->getElement($feature);
             $element->setChecked($object->{$feature});
             if ((bool) $object->{$feature . '_changed'} === true) {
-                $element->setDescription(mt('monitoring', 'changed'));
+                $element->setDescription($this->translate('changed'));
             }
         }
         return $this;
@@ -120,7 +120,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 }
             }
         }
-        Notification::success(mt('monitoring', 'Toggling feature..'));
+        Notification::success($this->translate('Toggling feature..'));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
index daabe7e02..405bac144 100644
--- a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
@@ -28,9 +28,9 @@ class LocalInstanceForm extends Form
             'path',
             array(
                 'required'      => true,
-                'label'         => mt('monitoring', 'Command File'),
+                'label'         => $this->translate('Command File'),
                 'value'         => '/var/run/icinga2/cmd/icinga2.cmd',
-                'description'   => mt('monitoring', 'Path to the local Icinga command file')
+                'description'   => $this->translate('Path to the local Icinga command file')
             )
         );
         return $this;
diff --git a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
index 7c55f655a..47b2a0316 100644
--- a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
@@ -29,8 +29,8 @@ class RemoteInstanceForm extends Form
                 'host',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'Host'),
-                    'description'   => mt('monitoring',
+                    'label'         => $this->translate('Host'),
+                    'description'   => $this->translate(
                         'Hostname or address of the remote Icinga instance'
                     )
                 )
@@ -40,8 +40,8 @@ class RemoteInstanceForm extends Form
                 'port',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'Port'),
-                    'description'   => mt('monitoring', 'SSH port to connect to on the remote Icinga instance'),
+                    'label'         => $this->translate('Port'),
+                    'description'   => $this->translate('SSH port to connect to on the remote Icinga instance'),
                     'value'         => 22
                 )
             ),
@@ -50,8 +50,8 @@ class RemoteInstanceForm extends Form
                 'user',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'User'),
-                    'description'   => mt('monitoring',
+                    'label'         => $this->translate('User'),
+                    'description'   => $this->translate(
                         'User to log in as on the remote Icinga instance. Please note that key-based SSH login must be'
                         . ' possible for this user'
                     )
@@ -62,9 +62,9 @@ class RemoteInstanceForm extends Form
                 'path',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'Command File'),
+                    'label'         => $this->translate('Command File'),
                     'value'         => '/var/run/icinga2/cmd/icinga2.cmd',
-                    'description'   => mt('monitoring', 'Path to the Icinga command file on the remote Icinga instance')
+                    'description'   => $this->translate('Path to the Icinga command file on the remote Icinga instance')
                 )
             )
         ));
diff --git a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceKeyResourcePage.php b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceKeyResourcePage.php
new file mode 100644
index 000000000..454c67d47
--- /dev/null
+++ b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceKeyResourcePage.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Icinga\Module\Monitoring\Forms\Config\Instance;
+
+use Icinga\Web\Form;
+use Icinga\Web\Wizard;
+use Icinga\Web\WizardPage;
+
+class RemoteInstanceKeyResourcePage extends Form implements WizardPage
+{
+    public function onRequest()
+    {
+        
+    }
+
+    public function onSuccess()
+    {
+        
+    }
+
+    public function createElements(array $formData)
+    {
+        
+    }
+
+    public function setup(Wizard $wizard)
+    {
+        
+    }
+
+    public function isRequired(Wizard $wizard)
+    {
+        return true;
+    }
+
+    public function addNextButton($pageName)
+    {
+        $this->addElement(
+            'button',
+            Wizard::BTN_NEXT,
+            array(
+                'type'          => 'submit',
+                'value'         => $pageName,
+                'label'         => $this->translate('Save Changes'),
+                'decorators'    => array('ViewHelper')
+            )
+        );
+    }
+
+    public function addPreviousButton($pageName)
+    {
+        
+    }
+}
diff --git a/modules/monitoring/application/forms/Config/InstanceConfigForm.php b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
index b89e48c0a..5618f27ee 100644
--- a/modules/monitoring/application/forms/Config/InstanceConfigForm.php
+++ b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
@@ -25,7 +25,7 @@ class InstanceConfigForm extends ConfigForm
     public function init()
     {
         $this->setName('form_config_monitoring_instance');
-        $this->setSubmitLabel(mt('monitoring', 'Save Changes'));
+        $this->setSubmitLabel($this->translate('Save Changes'));
     }
 
     /**
@@ -48,7 +48,7 @@ class InstanceConfigForm extends ConfigForm
                 break;
             default:
                 throw new InvalidArgumentException(
-                    sprintf(mt('monitoring', 'Invalid instance type "%s" given'), $type)
+                    sprintf($this->translate('Invalid instance type "%s" given'), $type)
                 );
         }
         return $form;
@@ -69,10 +69,10 @@ class InstanceConfigForm extends ConfigForm
     {
         $name = isset($values['name']) ? $values['name'] : '';
         if (! $name) {
-            throw new InvalidArgumentException(mt('monitoring', 'Instance name missing'));
+            throw new InvalidArgumentException($this->translate('Instance name missing'));
         }
         if ($this->config->hasSection($name)) {
-            throw new InvalidArgumentException(mt('monitoring', 'Instance already exists'));
+            throw new InvalidArgumentException($this->translate('Instance already exists'));
         }
 
         unset($values['name']);
@@ -93,11 +93,11 @@ class InstanceConfigForm extends ConfigForm
     public function edit($name, array $values)
     {
         if (! $name) {
-            throw new InvalidArgumentException(mt('monitoring', 'Old instance name missing'));
+            throw new InvalidArgumentException($this->translate('Old instance name missing'));
         } elseif (! ($newName = isset($values['name']) ? $values['name'] : '')) {
-            throw new InvalidArgumentException(mt('monitoring', 'New instance name missing'));
+            throw new InvalidArgumentException($this->translate('New instance name missing'));
         } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException(mt('monitoring', 'Unknown instance name provided'));
+            throw new InvalidArgumentException($this->translate('Unknown instance name provided'));
         }
 
         unset($values['name']);
@@ -117,9 +117,9 @@ class InstanceConfigForm extends ConfigForm
     public function remove($name)
     {
         if (! $name) {
-            throw new InvalidArgumentException(mt('monitoring', 'Instance name missing'));
+            throw new InvalidArgumentException($this->translate('Instance name missing'));
         } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException(mt('monitoring', 'Unknown instance name provided'));
+            throw new InvalidArgumentException($this->translate('Unknown instance name provided'));
         }
 
         $instanceConfig = $this->config->getSection($name);
@@ -136,10 +136,10 @@ class InstanceConfigForm extends ConfigForm
         $instanceName = $this->request->getQuery('instance');
         if ($instanceName !== null) {
             if (! $instanceName) {
-                throw new ConfigurationError(mt('monitoring', 'Instance name missing'));
+                throw new ConfigurationError($this->translate('Instance name missing'));
             }
             if (! $this->config->hasSection($instanceName)) {
-                throw new ConfigurationError(mt('monitoring', 'Unknown instance name given'));
+                throw new ConfigurationError($this->translate('Unknown instance name given'));
             }
 
             $instanceConfig = $this->config->getSection($instanceName)->toArray();
@@ -158,10 +158,10 @@ class InstanceConfigForm extends ConfigForm
         try {
             if ($instanceName === null) { // create new instance
                 $this->add($this->getValues());
-                $message = mt('monitoring', 'Instance "%s" created successfully.');
+                $message = $this->translate('Instance "%s" created successfully.');
             } else { // edit existing instance
                 $this->edit($instanceName, $this->getValues());
-                $message = mt('monitoring', 'Instance "%s" edited successfully.');
+                $message = $this->translate('Instance "%s" edited successfully.');
             }
         } catch (InvalidArgumentException $e) {
             Notification::error($e->getMessage());
@@ -189,7 +189,7 @@ class InstanceConfigForm extends ConfigForm
                 'name',
                 array(
                     'required'  => true,
-                    'label'     => mt('monitoring', 'Instance Name')
+                    'label'     => $this->translate('Instance Name')
                 )
             ),
             array(
@@ -198,10 +198,10 @@ class InstanceConfigForm extends ConfigForm
                 array(
                     'required'      => true,
                     'autosubmit'    => true,
-                    'label'         => mt('monitoring', 'Instance Type'),
+                    'label'         => $this->translate('Instance Type'),
                     'multiOptions'  => array(
-                        LocalCommandFile::TRANSPORT     => mt('monitoring', 'Local Command File'),
-                        RemoteCommandFile::TRANSPORT    => mt('monitoring', 'Remote Command File')
+                        LocalCommandFile::TRANSPORT     => $this->translate('Local Command File'),
+                        RemoteCommandFile::TRANSPORT    => $this->translate('Remote Command File')
                     ),
                     'value' => $instanceType
                 )
diff --git a/modules/monitoring/application/forms/Config/SecurityConfigForm.php b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
index 40c0b7b8c..b202f5938 100644
--- a/modules/monitoring/application/forms/Config/SecurityConfigForm.php
+++ b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
@@ -18,7 +18,7 @@ class SecurityConfigForm extends ConfigForm
     public function init()
     {
         $this->setName('form_config_monitoring_security');
-        $this->setSubmitLabel(mt('monitoring', 'Save Changes'));
+        $this->setSubmitLabel($this->translate('Save Changes'));
     }
 
     /**
@@ -29,7 +29,7 @@ class SecurityConfigForm extends ConfigForm
         $this->config->setSection('security', $this->getValues());
 
         if ($this->save()) {
-            Notification::success(mt('monitoring', 'New security configuration has successfully been stored'));
+            Notification::success($this->translate('New security configuration has successfully been stored'));
         } else {
             return false;
         }
@@ -54,8 +54,8 @@ class SecurityConfigForm extends ConfigForm
             array(
                 'allowEmpty'    => true,
                 'value'         => '*pw*,*pass*,community',
-                'label'         => mt('monitoring', 'Protected Custom Variables'),
-                'description'   => mt('monitoring',
+                'label'         => $this->translate('Protected Custom Variables'),
+                'description'   => $this->translate(
                     'Comma separated case insensitive list of protected custom variables.'
                     . ' Use * as a placeholder for zero or more wildcard characters.'
                     . ' Existance of those custom variables will be shown, but their values will be masked.'
diff --git a/modules/monitoring/application/forms/EventOverviewForm.php b/modules/monitoring/application/forms/EventOverviewForm.php
index 25d268f76..dc697b940 100644
--- a/modules/monitoring/application/forms/EventOverviewForm.php
+++ b/modules/monitoring/application/forms/EventOverviewForm.php
@@ -44,7 +44,7 @@ class EventOverviewForm extends Form
             'checkbox',
             'statechange',
             array(
-                'label' => t('State Changes'),
+                'label' => $this->translate('State Changes'),
                 'class' => 'autosubmit',
                 'decorators' => $decorators,
                 'value' => strpos($url, $this->stateChangeFilter()->toQueryString()) === false ? 0 : 1
@@ -54,7 +54,7 @@ class EventOverviewForm extends Form
             'checkbox',
             'downtime',
             array(
-                'label' => t('Downtimes'),
+                'label' => $this->translate('Downtimes'),
                 'class' => 'autosubmit',
                 'decorators' => $decorators,
                 'value' => strpos($url, $this->downtimeFilter()->toQueryString()) === false ? 0 : 1
@@ -64,7 +64,7 @@ class EventOverviewForm extends Form
             'checkbox',
             'comment',
             array(
-                'label' => t('Comments'),
+                'label' => $this->translate('Comments'),
                 'class' => 'autosubmit',
                 'decorators' => $decorators,
                 'value' => strpos($url, $this->commentFilter()->toQueryString()) === false ? 0 : 1
@@ -74,7 +74,7 @@ class EventOverviewForm extends Form
             'checkbox',
             'notification',
             array(
-                'label' => t('Notifications'),
+                'label' => $this->translate('Notifications'),
                 'class' => 'autosubmit',
                 'decorators' => $decorators,
                 'value' => strpos($url, $this->notificationFilter()->toQueryString()) === false ? 0 : 1
@@ -84,7 +84,7 @@ class EventOverviewForm extends Form
             'checkbox',
             'flapping',
             array(
-                'label' => t('Flapping'),
+                'label' => $this->translate('Flapping'),
                 'class' => 'autosubmit',
                 'decorators' => $decorators,
                 'value' => strpos($url, $this->flappingFilter()->toQueryString()) === false ? 0 : 1
diff --git a/modules/monitoring/application/forms/Setup/BackendPage.php b/modules/monitoring/application/forms/Setup/BackendPage.php
index 1f6ef6894..b5ab2ffd6 100644
--- a/modules/monitoring/application/forms/Setup/BackendPage.php
+++ b/modules/monitoring/application/forms/Setup/BackendPage.php
@@ -20,7 +20,7 @@ class BackendPage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('monitoring', 'Monitoring Backend', 'setup.page.title'),
+                'value'         => $this->translate('Monitoring Backend', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -31,8 +31,7 @@ class BackendPage extends Form
             'note',
             'description',
             array(
-                'value' => mt(
-                    'monitoring',
+                'value' => $this->translate(
                     'Please configure below how Icinga Web 2 should retrieve monitoring information.'
                 )
             )
@@ -44,8 +43,8 @@ class BackendPage extends Form
             array(
                 'required'      => true,
                 'value'         => 'icinga',
-                'label'         => mt('monitoring', 'Backend Name'),
-                'description'   => mt('monitoring', 'The identifier of this backend')
+                'label'         => $this->translate('Backend Name'),
+                'description'   => $this->translate('The identifier of this backend')
             )
         );
 
@@ -60,8 +59,10 @@ class BackendPage extends Form
             'type',
             array(
                 'required'      => true,
-                'label'         => mt('monitoring', 'Backend Type'),
-                'description'   => mt('monitoring', 'The data source used for retrieving monitoring information'),
+                'label'         => $this->translate('Backend Type'),
+                'description'   => $this->translate(
+                    'The data source used for retrieving monitoring information'
+                ),
                 'multiOptions'  => $resourceTypes
             )
         );
diff --git a/modules/monitoring/application/forms/Setup/IdoResourcePage.php b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
index 189d65fea..c28b52e6b 100644
--- a/modules/monitoring/application/forms/Setup/IdoResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
@@ -28,7 +28,7 @@ class IdoResourcePage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('monitoring', 'Monitoring IDO Resource', 'setup.page.title'),
+                'value'         => $this->translate('Monitoring IDO Resource', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -39,8 +39,7 @@ class IdoResourcePage extends Form
             'note',
             'description',
             array(
-                'value' => mt(
-                    'monitoring',
+                'value' => $this->translate(
                     'Please fill out the connection details below to access'
                     . ' the IDO database of your monitoring environment.'
                 )
@@ -91,8 +90,10 @@ class IdoResourcePage extends Form
             'skip_validation',
             array(
                 'required'      => true,
-                'label'         => t('Skip Validation'),
-                'description'   => t('Check this to not to validate connectivity with the given database server')
+                'label'         => $this->translate('Skip Validation'),
+                'description'   => $this->translate(
+                    'Check this to not to validate connectivity with the given database server'
+                )
             )
         );
     }
diff --git a/modules/monitoring/application/forms/Setup/InstancePage.php b/modules/monitoring/application/forms/Setup/InstancePage.php
index dccfd1d91..8f151554d 100644
--- a/modules/monitoring/application/forms/Setup/InstancePage.php
+++ b/modules/monitoring/application/forms/Setup/InstancePage.php
@@ -20,7 +20,7 @@ class InstancePage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('monitoring', 'Monitoring Instance', 'setup.page.title'),
+                'value'         => $this->translate('Monitoring Instance', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -31,8 +31,7 @@ class InstancePage extends Form
             'note',
             'description',
             array(
-                'value' => mt(
-                    'monitoring',
+                'value' => $this->translate(
                     'Please define the settings specific to your monitoring instance below.'
                 )
             )
diff --git a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
index 4faa17416..245d2abcc 100644
--- a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
@@ -28,7 +28,7 @@ class LivestatusResourcePage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('monitoring', 'Monitoring Livestatus Resource', 'setup.page.title'),
+                'value'         => $this->translate('Monitoring Livestatus Resource', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -39,8 +39,7 @@ class LivestatusResourcePage extends Form
             'note',
             'description',
             array(
-                'value' => mt(
-                    'monitoring',
+                'value' => $this->translate(
                     'Please fill out the connection details below to access the Livestatus'
                     . ' socket interface for your monitoring environment.'
                 )
@@ -91,8 +90,10 @@ class LivestatusResourcePage extends Form
             'skip_validation',
             array(
                 'required'      => true,
-                'label'         => t('Skip Validation'),
-                'description'   => t('Check this to not to validate connectivity with the given Livestatus socket')
+                'label'         => $this->translate('Skip Validation'),
+                'description'   => $this->translate(
+                    'Check this to not to validate connectivity with the given Livestatus socket'
+                )
             )
         );
     }
diff --git a/modules/monitoring/application/forms/Setup/SecurityPage.php b/modules/monitoring/application/forms/Setup/SecurityPage.php
index 0c7d3d1de..ba8083e50 100644
--- a/modules/monitoring/application/forms/Setup/SecurityPage.php
+++ b/modules/monitoring/application/forms/Setup/SecurityPage.php
@@ -20,7 +20,7 @@ class SecurityPage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('monitoring', 'Monitoring Security', 'setup.page.title'),
+                'value'         => $this->translate('Monitoring Security', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -31,8 +31,7 @@ class SecurityPage extends Form
             'note',
             'description',
             array(
-                'value' => mt(
-                    'monitoring',
+                'value' => $this->translate(
                     'To protect your monitoring environment against prying eyes please fill out the settings below.'
                 )
             )
diff --git a/modules/monitoring/application/forms/Setup/WelcomePage.php b/modules/monitoring/application/forms/Setup/WelcomePage.php
index d910e2e01..f79eb6c62 100644
--- a/modules/monitoring/application/forms/Setup/WelcomePage.php
+++ b/modules/monitoring/application/forms/Setup/WelcomePage.php
@@ -19,10 +19,7 @@ class WelcomePage extends Form
             'note',
             'welcome',
             array(
-                'value' => mt(
-                    'monitoring',
-                    'Welcome to the configuration of the monitoring module for Icinga Web 2!'
-                ),
+                'value' => $this->translate('Welcome to the configuration of the monitoring module for Icinga Web 2!'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -34,7 +31,7 @@ class WelcomePage extends Form
             'note',
             'core_hint',
             array(
-                'value' => mt('monitoring', 'This is the core module for Icinga Web 2.')
+                'value' => $this->translate('This is the core module for Icinga Web 2.')
             )
         );
 
@@ -42,8 +39,7 @@ class WelcomePage extends Form
             'note',
             'description',
             array(
-                'value' => mt(
-                    'monitoring',
+                'value' => $this->translate(
                     'It offers various status and reporting views with powerful filter capabilities that allow'
                     . ' you to keep track of the most important events in your monitoring environment.'
                 )
diff --git a/modules/monitoring/application/forms/StatehistoryForm.php b/modules/monitoring/application/forms/StatehistoryForm.php
index 9fa1bdc26..d859f5815 100644
--- a/modules/monitoring/application/forms/StatehistoryForm.php
+++ b/modules/monitoring/application/forms/StatehistoryForm.php
@@ -19,7 +19,7 @@ class StatehistoryForm extends Form
     public function init()
     {
         $this->setName('form_event_overview');
-        $this->setSubmitLabel(mt('monitoring', 'Apply'));
+        $this->setSubmitLabel($this->translate('Apply'));
     }
 
     /**
@@ -65,14 +65,14 @@ class StatehistoryForm extends Form
             'select',
             'from',
             array(
-                'label' => mt('monitoring', 'From'),
+                'label' => $this->translate('From'),
                 'value' => $this->getRequest()->getParam('from', strtotime('3 months ago')),
                 'multiOptions' => array(
-                    strtotime('midnight 3 months ago') => mt('monitoring', '3 Months'),
-                    strtotime('midnight 4 months ago') => mt('monitoring', '4 Months'),
-                    strtotime('midnight 8 months ago') => mt('monitoring', '8 Months'),
-                    strtotime('midnight 12 months ago') => mt('monitoring', '1 Year'),
-                    strtotime('midnight 24 months ago') => mt('monitoring', '2 Years')
+                    strtotime('midnight 3 months ago') => $this->translate('3 Months'),
+                    strtotime('midnight 4 months ago') => $this->translate('4 Months'),
+                    strtotime('midnight 8 months ago') => $this->translate('8 Months'),
+                    strtotime('midnight 12 months ago') => $this->translate('1 Year'),
+                    strtotime('midnight 24 months ago') => $this->translate('2 Years')
                 ),
                 'class' => 'autosubmit'
             )
@@ -81,10 +81,10 @@ class StatehistoryForm extends Form
             'select',
             'to',
             array(
-                'label' => mt('monitoring', 'To'),
+                'label' => $this->translate('To'),
                 'value' => $this->getRequest()->getParam('to', time()),
                 'multiOptions' => array(
-                    time() => mt('monitoring', 'Today')
+                    time() => $this->translate('Today')
                 ),
                 'class' => 'autosubmit'
             )
@@ -95,11 +95,11 @@ class StatehistoryForm extends Form
             'select',
             'objecttype',
             array(
-                'label' => mt('monitoring', 'Object type'),
+                'label' => $this->translate('Object type'),
                 'value' => $objectType,
                 'multiOptions' => array(
-                    'services' => mt('monitoring', 'Services'),
-                    'hosts' => mt('monitoring', 'Hosts')
+                    'services' => $this->translate('Services'),
+                    'hosts' => $this->translate('Hosts')
                 ),
                 'class' => 'autosubmit'
             )
@@ -113,13 +113,13 @@ class StatehistoryForm extends Form
                 'select',
                 'state',
                 array(
-                    'label' => mt('monitoring', 'State'),
+                    'label' => $this->translate('State'),
                     'value' => $serviceState,
                     'multiOptions' => array(
-                        'cnt_critical_hard' => mt('monitoring', 'Critical'),
-                        'cnt_warning_hard' => mt('monitoring', 'Warning'),
-                        'cnt_unknown_hard' => mt('monitoring', 'Unknown'),
-                        'cnt_ok' => mt('monitoring', 'Ok')
+                        'cnt_critical_hard' => $this->translate('Critical'),
+                        'cnt_warning_hard' => $this->translate('Warning'),
+                        'cnt_unknown_hard' => $this->translate('Unknown'),
+                        'cnt_ok' => $this->translate('Ok')
                     ),
                     'class' => 'autosubmit'
                 )
@@ -133,12 +133,12 @@ class StatehistoryForm extends Form
                 'select',
                 'state',
                 array(
-                    'label' => mt('monitoring', 'State'),
+                    'label' => $this->translate('State'),
                     'value' => $hostState,
                     'multiOptions' =>  array(
-                        'cnt_up' => mt('monitoring', 'Up'),
-                        'cnt_down_hard' => mt('monitoring', 'Down'),
-                        'cnt_unreachable_hard' => mt('monitoring', 'Unreachable')
+                        'cnt_up' => $this->translate('Up'),
+                        'cnt_down_hard' => $this->translate('Down'),
+                        'cnt_unreachable_hard' => $this->translate('Unreachable')
                     ),
                     'class' => 'autosubmit'
                 )

From 8c87a9df13d1452bfc5906218d25bab1b7809435 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 19 Jan 2015 11:07:39 +0100
Subject: [PATCH 0185/2920] Replace t() and mt() with translate() in setup
 module's forms

refs #7551
---
 .../application/forms/AdminAccountPage.php    | 35 +++++++++----------
 .../application/forms/AuthBackendPage.php     | 15 ++++----
 .../application/forms/AuthenticationPage.php  | 13 ++++---
 .../forms/DatabaseCreationPage.php            | 23 ++++++------
 .../application/forms/DbResourcePage.php      | 11 +++---
 .../application/forms/GeneralConfigPage.php   |  5 ++-
 .../forms/LdapDiscoveryConfirmPage.php        |  6 ++--
 .../application/forms/LdapDiscoveryPage.php   | 13 +++----
 .../application/forms/LdapResourcePage.php    | 10 +++---
 .../application/forms/PreferencesPage.php     | 15 ++++----
 .../setup/application/forms/WelcomePage.php   |  5 ++-
 11 files changed, 69 insertions(+), 82 deletions(-)

diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 6ef791d4e..3b2e6ec9f 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -74,16 +74,15 @@ class AdminAccountPage extends Form
         $choices = array();
 
         if ($this->backendConfig['backend'] !== 'db') {
-            $choices['by_name'] = mt('setup', 'By Name', 'setup.admin');
+            $choices['by_name'] = $this->translate('By Name', 'setup.admin');
             $this->addElement(
                 'text',
                 'by_name',
                 array(
                     'required'      => isset($formData['user_type']) && $formData['user_type'] === 'by_name',
                     'value'         => $this->getUsername(),
-                    'label'         => mt('setup', 'Username'),
-                    'description'   => mt(
-                        'setup',
+                    'label'         => $this->translate('Username'),
+                    'description'   => $this->translate(
                         'Define the initial administrative account by providing a username that reflects'
                         . ' a user created later or one that is authenticated using external mechanisms'
                     )
@@ -94,21 +93,20 @@ class AdminAccountPage extends Form
         if ($this->backendConfig['backend'] === 'db' || $this->backendConfig['backend'] === 'ldap') {
             $users = $this->fetchUsers();
             if (false === empty($users)) {
-                $choices['existing_user'] = mt('setup', 'Existing User');
+                $choices['existing_user'] = $this->translate('Existing User');
                 $this->addElement(
                     'select',
                     'existing_user',
                     array(
                         'required'      => isset($formData['user_type']) && $formData['user_type'] === 'existing_user',
-                        'label'         => mt('setup', 'Username'),
+                        'label'         => $this->translate('Username'),
                         'description'   => sprintf(
-                            mt(
-                                'setup',
+                            $this->translate(
                                 'Choose a user reported by the %s backend as the initial administrative account',
                                 'setup.admin'
                             ),
                             $this->backendConfig['backend'] === 'db'
-                                ? mt('setup', 'database', 'setup.admin.authbackend')
+                                ? $this->translate('database', 'setup.admin.authbackend')
                                 : 'LDAP'
                         ),
                         'multiOptions'  => array_combine($users, $users)
@@ -118,16 +116,15 @@ class AdminAccountPage extends Form
         }
 
         if ($this->backendConfig['backend'] === 'db') {
-            $choices['new_user'] = mt('setup', 'New User');
+            $choices['new_user'] = $this->translate('New User');
             $required = isset($formData['user_type']) && $formData['user_type'] === 'new_user';
             $this->addElement(
                 'text',
                 'new_user',
                 array(
                     'required'      => $required,
-                    'label'         => mt('setup', 'Username'),
-                    'description'   => mt(
-                        'setup',
+                    'label'         => $this->translate('Username'),
+                    'description'   => $this->translate(
                         'Enter the username to be used when creating an initial administrative account'
                     )
                 )
@@ -137,8 +134,8 @@ class AdminAccountPage extends Form
                 'new_user_password',
                 array(
                     'required'      => $required,
-                    'label'         => mt('setup', 'Password'),
-                    'description'   => mt('setup', 'Enter the password to assign to the newly created account')
+                    'label'         => $this->translate('Password'),
+                    'description'   => $this->translate('Enter the password to assign to the newly created account')
                 )
             );
             $this->addElement(
@@ -146,8 +143,8 @@ class AdminAccountPage extends Form
                 'new_user_2ndpass',
                 array(
                     'required'      => $required,
-                    'label'         => mt('setup', 'Repeat password'),
-                    'description'   => mt('setup', 'Please repeat the password given above to avoid typing errors'),
+                    'label'         => $this->translate('Repeat password'),
+                    'description'   => $this->translate('Please repeat the password given above to avoid typing errors'),
                     'validators'    => array(
                         array('identical', false, array('new_user_password'))
                     )
@@ -179,7 +176,7 @@ class AdminAccountPage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('setup', 'Administration', 'setup.page.title'),
+                'value'         => $this->translate('Administration', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -215,7 +212,7 @@ class AdminAccountPage extends Form
         }
 
         if ($data['user_type'] === 'new_user' && array_search($data['new_user'], $this->fetchUsers()) !== false) {
-            $this->getElement('new_user')->addError(mt('setup', 'Username already exists.'));
+            $this->getElement('new_user')->addError($this->translate('Username already exists.'));
             return false;
         }
 
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index bd820d352..ced0d9c59 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -62,7 +62,7 @@ class AuthBackendPage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('setup', 'Authentication Backend', 'setup.page.title'),
+                'value'         => $this->translate('Authentication Backend', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -71,20 +71,17 @@ class AuthBackendPage extends Form
         );
 
         if ($this->config['type'] === 'db') {
-            $note = mt(
-                'setup',
+            $note = $this->translate(
                 'As you\'ve chosen to use a database for authentication all you need '
                 . 'to do now is defining a name for your first authentication backend.'
             );
         } elseif ($this->config['type'] === 'ldap') {
-            $note = mt(
-                'setup',
+            $note = $this->translate(
                 'Before you are able to authenticate using the LDAP connection defined earlier you need to'
                 . ' provide some more information so that Icinga Web 2 is able to locate account details.'
             );
         } else { // if ($this->config['type'] === 'autologin'
-            $note = mt(
-                'setup',
+            $note = $this->translate(
                 'You\'ve chosen to authenticate using a web server\'s mechanism so it may be necessary'
                 . ' to adjust usernames before any permissions, restrictions, etc. are being applied.'
             );
@@ -150,8 +147,8 @@ class AuthBackendPage extends Form
                 'order'         => 2,
                 'ignore'        => true,
                 'required'      => true,
-                'label'         => mt('setup', 'Skip Validation'),
-                'description'   => mt('setup', 'Check this to not to validate authentication using this backend')
+                'label'         => $this->translate('Skip Validation'),
+                'description'   => $this->translate('Check this to not to validate authentication using this backend')
             )
         );
     }
diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
index 2a579e670..88db9c6d8 100644
--- a/modules/setup/application/forms/AuthenticationPage.php
+++ b/modules/setup/application/forms/AuthenticationPage.php
@@ -29,7 +29,7 @@ class AuthenticationPage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('setup', 'Authentication', 'setup.page.title'),
+                'value'         => $this->translate('Authentication', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -40,8 +40,7 @@ class AuthenticationPage extends Form
             'note',
             'description',
             array(
-                'value' => mt(
-                    'setup',
+                'value' => $this->translate(
                     'Please choose how you want to authenticate when accessing Icinga Web 2.'
                     . ' Configuring backend specific details follows in a later step.'
                 )
@@ -50,20 +49,20 @@ class AuthenticationPage extends Form
 
         $backendTypes = array();
         if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {
-            $backendTypes['db'] = t('Database');
+            $backendTypes['db'] = $this->translate('Database');
         }
         if (Platform::extensionLoaded('ldap')) {
             $backendTypes['ldap'] = 'LDAP';
         }
-        $backendTypes['autologin'] = t('Autologin');
+        $backendTypes['autologin'] = $this->translate('Autologin');
 
         $this->addElement(
             'select',
             'type',
             array(
                 'required'      => true,
-                'label'         => mt('setup', 'Authentication Type'),
-                'description'   => mt('setup', 'The type of authentication to use when accessing Icinga Web 2'),
+                'label'         => $this->translate('Authentication Type'),
+                'description'   => $this->translate('The type of authentication to use when accessing Icinga Web 2'),
                 'multiOptions'  => $backendTypes
             )
         );
diff --git a/modules/setup/application/forms/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php
index ec4a77ee1..be2974a52 100644
--- a/modules/setup/application/forms/DatabaseCreationPage.php
+++ b/modules/setup/application/forms/DatabaseCreationPage.php
@@ -90,7 +90,7 @@ class DatabaseCreationPage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('setup', 'Database Setup', 'setup.page.title'),
+                'value'         => $this->translate('Database Setup', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -101,8 +101,7 @@ class DatabaseCreationPage extends Form
             'note',
             'description',
             array(
-                'value' => mt(
-                    'setup',
+                'value' => $this->translate(
                     'It seems that either the database you defined earlier does not yet exist and cannot be created'
                     . ' using the provided access credentials or the database does not have the required schema to '
                     . 'be operated by Icinga Web 2. Please provide appropriate access credentials to solve this.'
@@ -116,16 +115,16 @@ class DatabaseCreationPage extends Form
             'username',
             array(
                 'required'      => false === $skipValidation,
-                'label'         => mt('setup', 'Username'),
-                'description'   => mt('setup', 'A user which is able to create databases and/or touch the database schema')
+                'label'         => $this->translate('Username'),
+                'description'   => $this->translate('A user which is able to create databases and/or touch the database schema')
             )
         );
         $this->addElement(
             'password',
             'password',
             array(
-                'label'         => mt('setup', 'Password'),
-                'description'   => mt('setup', 'The password for the database user defined above')
+                'label'         => $this->translate('Password'),
+                'description'   => $this->translate('The password for the database user defined above')
             )
         );
 
@@ -182,7 +181,7 @@ class DatabaseCreationPage extends Form
         // form need to be granted to create databases, users...
         if (false === $db->checkPrivileges($this->databaseSetupPrivileges)) {
             $this->addError(
-                mt('setup', 'The provided credentials cannot be used to create the database and/or the user.')
+                $this->translate('The provided credentials cannot be used to create the database and/or the user.')
             );
             $this->addSkipValidationCheckbox();
             return false;
@@ -191,8 +190,7 @@ class DatabaseCreationPage extends Form
         // ...and to grant all required usage privileges to others
         if (false === $db->isGrantable($this->databaseUsagePrivileges)) {
             $this->addError(sprintf(
-                mt(
-                    'setup',
+                $this->translate(
                     'The provided credentials cannot be used to grant all required privileges to the login "%s".'
                 ),
                 $this->config['username']
@@ -215,9 +213,8 @@ class DatabaseCreationPage extends Form
             array(
                 'order'         => 2,
                 'required'      => true,
-                'label'         => mt('setup', 'Skip Validation'),
-                'description'   => mt(
-                    'setup',
+                'label'         => $this->translate('Skip Validation'),
+                'description'   => $this->translate(
                     'Check this to not to validate the ability to login and required privileges'
                 )
             )
diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php
index 4a6535324..1901d8ca9 100644
--- a/modules/setup/application/forms/DbResourcePage.php
+++ b/modules/setup/application/forms/DbResourcePage.php
@@ -39,7 +39,7 @@ class DbResourcePage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('setup', 'Database Resource', 'setup.page.title'),
+                'value'         => $this->translate('Database Resource', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -50,8 +50,7 @@ class DbResourcePage extends Form
             'note',
             'description',
             array(
-                'value' => mt(
-                    'setup',
+                'value' => $this->translate(
                     'Now please configure your database resource. Note that the database itself does not need to'
                     . ' exist at this time as it is going to be created once the wizard is about to be finished.'
                 )
@@ -121,8 +120,10 @@ class DbResourcePage extends Form
             'skip_validation',
             array(
                 'required'      => true,
-                'label'         => mt('setup', 'Skip Validation'),
-                'description'   => mt('setup', 'Check this to not to validate connectivity with the given database server')
+                'label'         => $this->translate('Skip Validation'),
+                'description'   => $this->translate(
+                    'Check this to not to validate connectivity with the given database server'
+                )
             )
         );
     }
diff --git a/modules/setup/application/forms/GeneralConfigPage.php b/modules/setup/application/forms/GeneralConfigPage.php
index 309c1784d..e0a9d0fab 100644
--- a/modules/setup/application/forms/GeneralConfigPage.php
+++ b/modules/setup/application/forms/GeneralConfigPage.php
@@ -29,7 +29,7 @@ class GeneralConfigPage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('setup', 'Application Configuration', 'setup.page.title'),
+                'value'         => $this->translate('Application Configuration', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -40,8 +40,7 @@ class GeneralConfigPage extends Form
             'note',
             'description',
             array(
-                'value' => mt(
-                    'setup',
+                'value' => $this->translate(
                     'Now please adjust all application and logging related configuration options to fit your needs.'
                 )
             )
diff --git a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
index f76cbee07..66fd39001 100644
--- a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
@@ -82,7 +82,7 @@ EOT;
             'note',
             'title',
             array(
-                'value'         => mt('setup', 'LDAP Discovery Results', 'setup.page.title'),
+                'value'         => $this->translate('LDAP Discovery Results', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -94,7 +94,7 @@ EOT;
             'description',
             array(
                 'value' => sprintf(
-                    mt('setup', 'The following directory service has been found on domain "%s":'),
+                    $this->translate('The following directory service has been found on domain "%s":'),
                     $this->config['domain']
                 )
             )
@@ -119,7 +119,7 @@ EOT;
             'confirm',
             array(
                 'value' => '1',
-                'label' => mt('setup', 'Use this configuration?')
+                'label' => $this->translate('Use this configuration?')
             )
         );
     }
diff --git a/modules/setup/application/forms/LdapDiscoveryPage.php b/modules/setup/application/forms/LdapDiscoveryPage.php
index 8c61eb379..26b43803b 100644
--- a/modules/setup/application/forms/LdapDiscoveryPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryPage.php
@@ -36,7 +36,7 @@ class LdapDiscoveryPage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('setup', 'LDAP Discovery', 'setup.page.title'),
+                'value'         => $this->translate('LDAP Discovery', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -47,8 +47,7 @@ class LdapDiscoveryPage extends Form
             'note',
             'description',
             array(
-                'value' => mt(
-                    'setup',
+                'value' => $this->translate(
                     'You can use this page to discover LDAP or ActiveDirectory servers ' .
                     ' for authentication. If you don\' want to execute a discovery, just skip this step.'
                 )
@@ -66,8 +65,8 @@ class LdapDiscoveryPage extends Form
             'skip_validation',
             array(
                 'required'      => true,
-                'label'         => mt('setup', 'Skip'),
-                'description'   => mt('setup', 'Do not discover LDAP servers and enter all settings manually.')
+                'label'         => $this->translate('Skip'),
+                'description'   => $this->translate('Do not discover LDAP servers and enter all settings manually.')
             )
         );
     }
@@ -94,7 +93,9 @@ class LdapDiscoveryPage extends Form
                 return true;
             }
         }
-        $this->addError(sprintf(t('Could not find any LDAP servers on the domain "%s".'), $data['domain']));
+        $this->addError(
+            sprintf($this->translate('Could not find any LDAP servers on the domain "%s".'), $data['domain'])
+        );
         return false;
     }
 
diff --git a/modules/setup/application/forms/LdapResourcePage.php b/modules/setup/application/forms/LdapResourcePage.php
index 49bed69c3..f003a7370 100644
--- a/modules/setup/application/forms/LdapResourcePage.php
+++ b/modules/setup/application/forms/LdapResourcePage.php
@@ -37,7 +37,7 @@ class LdapResourcePage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('setup', 'LDAP Resource', 'setup.page.title'),
+                'value'         => $this->translate('LDAP Resource', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -48,8 +48,7 @@ class LdapResourcePage extends Form
             'note',
             'description',
             array(
-                'value' => mt(
-                    'setup',
+                'value' => $this->translate(
                     'Now please configure your AD/LDAP resource. This will later '
                     . 'be used to authenticate users logging in to Icinga Web 2.'
                 )
@@ -107,9 +106,8 @@ class LdapResourcePage extends Form
             'skip_validation',
             array(
                 'required'      => true,
-                'label'         => mt('setup', 'Skip Validation'),
-                'description'   => mt(
-                    'setup',
+                'label'         => $this->translate('Skip Validation'),
+                'description'   => $this->translate(
                     'Check this to not to validate connectivity with the given directory service'
                 )
             )
diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
index 26fd048e1..07e011ee1 100644
--- a/modules/setup/application/forms/PreferencesPage.php
+++ b/modules/setup/application/forms/PreferencesPage.php
@@ -30,8 +30,7 @@ class PreferencesPage extends Form
         $this->getElement('type')
             ->setValue('db')
             ->setDescription(
-                mt(
-                    'setup',
+                $this->translate(
                     'Note that choosing "Database" causes Icinga Web 2 to use the same database as for authentication.'
                 )
             );
@@ -47,7 +46,7 @@ class PreferencesPage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('setup', 'Preferences', 'setup.page.title'),
+                'value'         => $this->translate('Preferences', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -58,23 +57,23 @@ class PreferencesPage extends Form
             'note',
             'description',
             array(
-                'value' => mt('setup', 'Please choose how Icinga Web 2 should store user preferences.')
+                'value' => $this->translate('Please choose how Icinga Web 2 should store user preferences.')
             )
         );
 
         $storageTypes = array();
-        $storageTypes['ini'] = t('File System (INI Files)');
+        $storageTypes['ini'] = $this->translate('File System (INI Files)');
         if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {
-            $storageTypes['db'] = t('Database');
+            $storageTypes['db'] = $this->translate('Database');
         }
-        $storageTypes['null'] = t('Don\'t Store Preferences');
+        $storageTypes['null'] = $this->translate('Don\'t Store Preferences');
 
         $this->addElement(
             'select',
             'type',
             array(
                 'required'      => true,
-                'label'         => t('User Preference Storage Type'),
+                'label'         => $this->translate('User Preference Storage Type'),
                 'multiOptions'  => $storageTypes
             )
         );
diff --git a/modules/setup/application/forms/WelcomePage.php b/modules/setup/application/forms/WelcomePage.php
index 5da607683..66340ff25 100644
--- a/modules/setup/application/forms/WelcomePage.php
+++ b/modules/setup/application/forms/WelcomePage.php
@@ -32,9 +32,8 @@ class WelcomePage extends Form
             'token',
             array(
                 'required'      => true,
-                'label'         => mt('setup', 'Setup Token'),
-                'description'   => mt(
-                    'setup',
+                'label'         => $this->translate('Setup Token'),
+                'description'   => $this->translate(
                     'For security reasons we need to ensure that you are permitted to run this wizard.'
                     . ' Please provide a token by following the instructions below.'
                 ),

From dbd69ba6935fb59de471123f3f55b01ad58ca167 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 19 Jan 2015 11:26:23 +0100
Subject: [PATCH 0186/2920] Replace t() and mt() with translate() in the
 application's forms

refs #7551
---
 .../forms/Authentication/LoginForm.php        | 10 ++--
 .../Authentication/AutologinBackendForm.php   |  8 +--
 .../Config/Authentication/DbBackendForm.php   | 14 +++---
 .../Config/Authentication/LdapBackendForm.php | 28 ++++++-----
 .../AuthenticationBackendConfigForm.php       | 50 ++++++++++---------
 .../AuthenticationBackendReorderForm.php      |  2 +-
 .../Config/General/ApplicationConfigForm.php  | 14 +++---
 .../Config/General/LoggingConfigForm.php      | 35 ++++++-------
 .../forms/Config/GeneralConfigForm.php        |  4 +-
 .../forms/Config/Resource/DbResourceForm.php  | 32 ++++++------
 .../Config/Resource/FileResourceForm.php      | 12 ++---
 .../Config/Resource/LdapResourceForm.php      | 32 +++++++-----
 .../Resource/LivestatusResourceForm.php       | 14 +++---
 .../forms/Config/ResourceConfigForm.php       | 38 +++++++-------
 application/forms/ConfirmRemovalForm.php      |  2 +-
 application/forms/Dashboard/DashletForm.php   | 27 +++++-----
 application/forms/LdapDiscoveryForm.php       | 14 +++---
 application/forms/PreferenceForm.php          | 22 ++++----
 application/forms/Security/RoleForm.php       | 26 +++++-----
 19 files changed, 203 insertions(+), 181 deletions(-)

diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index a6d69d15a..8be455dcc 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -18,7 +18,7 @@ class LoginForm extends Form
     public function init()
     {
         $this->setName('form_login');
-        $this->setSubmitLabel(t('Login'));
+        $this->setSubmitLabel($this->translate('Login'));
     }
 
     /**
@@ -31,8 +31,8 @@ class LoginForm extends Form
             'username',
             array(
                 'required'      => true,
-                'label'         => t('Username'),
-                'placeholder'   => t('Please enter your username...'),
+                'label'         => $this->translate('Username'),
+                'placeholder'   => $this->translate('Please enter your username...'),
                 'class'         => false === isset($formData['username']) ? 'autofocus' : ''
             )
         );
@@ -41,8 +41,8 @@ class LoginForm extends Form
             'password',
             array(
                 'required'      => true,
-                'label'         => t('Password'),
-                'placeholder'   => t('...and your password'),
+                'label'         => $this->translate('Password'),
+                'placeholder'   => $this->translate('...and your password'),
                 'class'         => isset($formData['username']) ? 'autofocus' : ''
             )
         );
diff --git a/application/forms/Config/Authentication/AutologinBackendForm.php b/application/forms/Config/Authentication/AutologinBackendForm.php
index 97b5dfed7..cd09d38ac 100644
--- a/application/forms/Config/Authentication/AutologinBackendForm.php
+++ b/application/forms/Config/Authentication/AutologinBackendForm.php
@@ -30,8 +30,8 @@ class AutologinBackendForm extends Form
             'name',
             array(
                 'required'      => true,
-                'label'         => t('Backend Name'),
-                'description'   => t(
+                'label'         => $this->translate('Backend Name'),
+                'description'   => $this->translate(
                     'The name of this authentication provider that is used to differentiate it from others'
                 ),
                 'validators'    => array(
@@ -52,8 +52,8 @@ class AutologinBackendForm extends Form
             'text',
             'strip_username_regexp',
             array(
-                'label'         => t('Filter Pattern'),
-                'description'   => t(
+                'label'         => $this->translate('Filter Pattern'),
+                'description'   => $this->translate(
                     'The regular expression to use to strip specific parts off from usernames.'
                     . ' Leave empty if you do not want to strip off anything'
                 ),
diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index 572a09c2e..f8a4fb832 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -53,8 +53,8 @@ class DbBackendForm extends Form
             'name',
             array(
                 'required'      => true,
-                'label'         => t('Backend Name'),
-                'description'   => t(
+                'label'         => $this->translate('Backend Name'),
+                'description'   => $this->translate(
                     'The name of this authentication provider that is used to differentiate it from others'
                 ),
             )
@@ -64,8 +64,10 @@ class DbBackendForm extends Form
             'resource',
             array(
                 'required'      => true,
-                'label'         => t('Database Connection'),
-                'description'   => t('The database connection to use for authenticating with this provider'),
+                'label'         => $this->translate('Database Connection'),
+                'description'   => $this->translate(
+                    'The database connection to use for authenticating with this provider'
+                ),
                 'multiOptions'  => false === empty($this->resources)
                     ? array_combine($this->resources, $this->resources)
                     : array()
@@ -107,11 +109,11 @@ class DbBackendForm extends Form
         try {
             $dbUserBackend = new DbUserBackend(ResourceFactory::createResource($form->getResourceConfig()));
             if ($dbUserBackend->count() < 1) {
-                $form->addError(t('No users found under the specified database backend'));
+                $form->addError($this->translate('No users found under the specified database backend'));
                 return false;
             }
         } catch (Exception $e) {
-            $form->addError(sprintf(t('Using the specified backend failed: %s'), $e->getMessage()));
+            $form->addError(sprintf($this->translate('Using the specified backend failed: %s'), $e->getMessage()));
             return false;
         }
 
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 9b48c3dbc..5915a0a10 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -54,8 +54,8 @@ class LdapBackendForm extends Form
             'name',
             array(
                 'required'      => true,
-                'label'         => t('Backend Name'),
-                'description'   => t(
+                'label'         => $this->translate('Backend Name'),
+                'description'   => $this->translate(
                     'The name of this authentication provider that is used to differentiate it from others'
                 )
             )
@@ -65,8 +65,8 @@ class LdapBackendForm extends Form
             'resource',
             array(
                 'required'      => true,
-                'label'         => t('LDAP Resource'),
-                'description'   => t('The resource to use for authenticating with this provider'),
+                'label'         => $this->translate('LDAP Resource'),
+                'description'   => $this->translate('The resource to use for authenticating with this provider'),
                 'multiOptions'  => false === empty($this->resources)
                     ? array_combine($this->resources, $this->resources)
                     : array()
@@ -77,8 +77,8 @@ class LdapBackendForm extends Form
             'user_class',
             array(
                 'required'      => true,
-                'label'         => t('LDAP User Object Class'),
-                'description'   => t('The object class used for storing users on the ldap server'),
+                'label'         => $this->translate('LDAP User Object Class'),
+                'description'   => $this->translate('The object class used for storing users on the ldap server'),
                 'value'         => 'inetOrgPerson'
             )
         );
@@ -87,8 +87,10 @@ class LdapBackendForm extends Form
             'user_name_attribute',
             array(
                 'required'      => true,
-                'label'         => t('LDAP User Name Attribute'),
-                'description'   => t('The attribute name used for storing the user name on the ldap server'),
+                'label'         => $this->translate('LDAP User Name Attribute'),
+                'description'   => $this->translate(
+                    'The attribute name used for storing the user name on the ldap server'
+                ),
                 'value'         => 'uid'
             )
         );
@@ -105,9 +107,11 @@ class LdapBackendForm extends Form
             'base_dn',
             array(
                 'required'      => false,
-                'label'         => t('Base DN'),
-                'description'   => t('The path where users can be found on the ldap server. ' .
-                    ' Leave empty to select all users available on the specified resource.')
+                'label'         => $this->translate('Base DN'),
+                'description'   => $this->translate(
+                    'The path where users can be found on the ldap server. Leave ' .
+                    'empty to select all users available on the specified resource.'
+                )
             )
         );
         return $this;
@@ -146,7 +150,7 @@ class LdapBackendForm extends Form
             $form->addError($e->getMessage());
             return false;
         } catch (Exception $e) {
-            $form->addError(sprintf(t('Unable to validate authentication: %s'), $e->getMessage()));
+            $form->addError(sprintf($this->translate('Unable to validate authentication: %s'), $e->getMessage()));
             return false;
         }
 
diff --git a/application/forms/Config/AuthenticationBackendConfigForm.php b/application/forms/Config/AuthenticationBackendConfigForm.php
index 12f407c69..076f8cb17 100644
--- a/application/forms/Config/AuthenticationBackendConfigForm.php
+++ b/application/forms/Config/AuthenticationBackendConfigForm.php
@@ -31,7 +31,7 @@ class AuthenticationBackendConfigForm extends ConfigForm
     public function init()
     {
         $this->setName('form_config_authbackend');
-        $this->setSubmitLabel(t('Save Changes'));
+        $this->setSubmitLabel($this->translate('Save Changes'));
     }
 
     /**
@@ -70,7 +70,7 @@ class AuthenticationBackendConfigForm extends ConfigForm
         } elseif ($type === 'autologin') {
             $form = new AutologinBackendForm();
         } else {
-            throw new InvalidArgumentException(sprintf(t('Invalid backend type "%s" provided'), $type));
+            throw new InvalidArgumentException(sprintf($this->translate('Invalid backend type "%s" provided'), $type));
         }
 
         return $form;
@@ -91,9 +91,9 @@ class AuthenticationBackendConfigForm extends ConfigForm
     {
         $name = isset($values['name']) ? $values['name'] : '';
         if (! $name) {
-            throw new InvalidArgumentException(t('Authentication backend name missing'));
+            throw new InvalidArgumentException($this->translate('Authentication backend name missing'));
         } elseif ($this->config->hasSection($name)) {
-            throw new InvalidArgumentException(t('Authentication backend already exists'));
+            throw new InvalidArgumentException($this->translate('Authentication backend already exists'));
         }
 
         unset($values['name']);
@@ -114,11 +114,11 @@ class AuthenticationBackendConfigForm extends ConfigForm
     public function edit($name, array $values)
     {
         if (! $name) {
-            throw new InvalidArgumentException(t('Old authentication backend name missing'));
+            throw new InvalidArgumentException($this->translate('Old authentication backend name missing'));
         } elseif (! ($newName = isset($values['name']) ? $values['name'] : '')) {
-            throw new InvalidArgumentException(t('New authentication backend name missing'));
+            throw new InvalidArgumentException($this->translate('New authentication backend name missing'));
         } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException(t('Unknown authentication backend provided'));
+            throw new InvalidArgumentException($this->translate('Unknown authentication backend provided'));
         }
 
         $backendConfig = $this->config->getSection($name);
@@ -144,9 +144,9 @@ class AuthenticationBackendConfigForm extends ConfigForm
     public function remove($name)
     {
         if (! $name) {
-            throw new InvalidArgumentException(t('Authentication backend name missing'));
+            throw new InvalidArgumentException($this->translate('Authentication backend name missing'));
         } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException(t('Unknown authentication backend provided'));
+            throw new InvalidArgumentException($this->translate('Unknown authentication backend provided'));
         }
 
         $backendConfig = $this->config->getSection($name);
@@ -167,9 +167,9 @@ class AuthenticationBackendConfigForm extends ConfigForm
     public function move($name, $position)
     {
         if (! $name) {
-            throw new InvalidArgumentException(t('Authentication backend name missing'));
+            throw new InvalidArgumentException($this->translate('Authentication backend name missing'));
         } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException(t('Unknown authentication backend provided'));
+            throw new InvalidArgumentException($this->translate('Unknown authentication backend provided'));
         }
 
         $backendOrder = $this->config->keys();
@@ -208,10 +208,10 @@ class AuthenticationBackendConfigForm extends ConfigForm
         try {
             if ($authBackend === null) { // create new backend
                 $this->add($this->getValues());
-                $message = t('Authentication backend "%s" has been successfully created');
+                $message = $this->translate('Authentication backend "%s" has been successfully created');
             } else { // edit existing backend
                 $this->edit($authBackend, $this->getValues());
-                $message = t('Authentication backend "%s" has been successfully changed');
+                $message = $this->translate('Authentication backend "%s" has been successfully changed');
             }
         } catch (InvalidArgumentException $e) {
             Notification::error($e->getMessage());
@@ -237,11 +237,13 @@ class AuthenticationBackendConfigForm extends ConfigForm
         $authBackend = $this->request->getQuery('auth_backend');
         if ($authBackend !== null) {
             if ($authBackend === '') {
-                throw new ConfigurationError(t('Authentication backend name missing'));
+                throw new ConfigurationError($this->translate('Authentication backend name missing'));
             } elseif (! $this->config->hasSection($authBackend)) {
-                throw new ConfigurationError(t('Unknown authentication backend provided'));
+                throw new ConfigurationError($this->translate('Unknown authentication backend provided'));
             } elseif ($this->config->getSection($authBackend)->backend === null) {
-                throw new ConfigurationError(sprintf(t('Backend "%s" has no `backend\' setting'), $authBackend));
+                throw new ConfigurationError(
+                    sprintf($this->translate('Backend "%s" has no `backend\' setting'), $authBackend)
+                );
             }
 
             $configValues = $this->config->getSection($authBackend)->toArray();
@@ -257,7 +259,7 @@ class AuthenticationBackendConfigForm extends ConfigForm
             );
 
             if (false === empty($autologinBackends)) {
-                throw new ConfigurationError(t('Could not find any resources for authentication'));
+                throw new ConfigurationError($this->translate('Could not find any resources for authentication'));
             }
         }
     }
@@ -276,8 +278,8 @@ class AuthenticationBackendConfigForm extends ConfigForm
             array(
                 'order'         => 0,
                 'ignore'        => true,
-                'label'         => t('Force Changes'),
-                'description'   => t('Check this box to enforce changes without connectivity validation')
+                'label'         => $this->translate('Force Changes'),
+                'description'   => $this->translate('Check this box to enforce changes without connectivity validation')
             )
         );
     }
@@ -291,7 +293,7 @@ class AuthenticationBackendConfigForm extends ConfigForm
         $backendType = isset($formData['type']) ? $formData['type'] : null;
 
         if (isset($this->resources['db'])) {
-            $backendTypes['db'] = t('Database');
+            $backendTypes['db'] = $this->translate('Database');
         }
         if (isset($this->resources['ldap']) && ($backendType === 'ldap' || Platform::extensionLoaded('ldap'))) {
             $backendTypes['ldap'] = 'LDAP';
@@ -304,7 +306,7 @@ class AuthenticationBackendConfigForm extends ConfigForm
             }
         );
         if ($backendType === 'autologin' || empty($autologinBackends)) {
-            $backendTypes['autologin'] = t('Autologin');
+            $backendTypes['autologin'] = $this->translate('Autologin');
         }
 
         if ($backendType === null) {
@@ -318,8 +320,10 @@ class AuthenticationBackendConfigForm extends ConfigForm
                 'ignore'            => true,
                 'required'          => true,
                 'autosubmit'        => true,
-                'label'             => t('Backend Type'),
-                'description'       => t('The type of the resource to use for this authenticaton provider'),
+                'label'             => $this->translate('Backend Type'),
+                'description'       => $this->translate(
+                    'The type of the resource to use for this authenticaton provider'
+                ),
                 'multiOptions'      => $backendTypes
             )
         );
diff --git a/application/forms/Config/AuthenticationBackendReorderForm.php b/application/forms/Config/AuthenticationBackendReorderForm.php
index 07200827a..a41224248 100644
--- a/application/forms/Config/AuthenticationBackendReorderForm.php
+++ b/application/forms/Config/AuthenticationBackendReorderForm.php
@@ -52,7 +52,7 @@ class AuthenticationBackendReorderForm extends ConfigForm
 
             try {
                 if ($configForm->move($backendName, $position)->save()) {
-                    Notification::success(t('Authentication order updated!'));
+                    Notification::success($this->translate('Authentication order updated!'));
                 } else {
                     return false;
                 }
diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php
index 95ad22071..8f718ccdf 100644
--- a/application/forms/Config/General/ApplicationConfigForm.php
+++ b/application/forms/Config/General/ApplicationConfigForm.php
@@ -33,10 +33,10 @@ class ApplicationConfigForm extends Form
             'text',
             'global_module_path',
             array(
-                'label'         => t('Module Path'),
+                'label'         => $this->translate('Module Path'),
                 'required'      => true,
                 'value'         => implode(':', Icinga::app()->getModuleManager()->getModuleDirs()),
-                'description'   => t(
+                'description'   => $this->translate(
                     'Contains the directories that will be searched for available modules, separated by '
                     . 'colons. Modules that don\'t exist in these directories can still be symlinked in '
                     . 'the module folder, but won\'t show up in the list of disabled modules.'
@@ -50,11 +50,11 @@ class ApplicationConfigForm extends Form
             array(
                 'required'      => true,
                 'autosubmit'    => true,
-                'label'         => t('User Preference Storage Type'),
+                'label'         => $this->translate('User Preference Storage Type'),
                 'multiOptions'  => array(
-                    'ini'   => t('File System (INI Files)'),
-                    'db'    => t('Database'),
-                    'null'  => t('Don\'t Store Preferences')
+                    'ini'   => $this->translate('File System (INI Files)'),
+                    'db'    => $this->translate('Database'),
+                    'null'  => $this->translate('Don\'t Store Preferences')
                 )
             )
         );
@@ -72,7 +72,7 @@ class ApplicationConfigForm extends Form
                 array(
                     'required'      => true,
                     'multiOptions'  => $backends,
-                    'label'         => t('Database Connection')
+                    'label'         => $this->translate('Database Connection')
                 )
             );
         }
diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php
index 759c2a6e3..997bd558a 100644
--- a/application/forms/Config/General/LoggingConfigForm.php
+++ b/application/forms/Config/General/LoggingConfigForm.php
@@ -4,7 +4,6 @@
 
 namespace Icinga\Forms\Config\General;
 
-use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
 use Icinga\Web\Form;
 use Icinga\Web\Form\Validator\WritablePathValidator;
@@ -31,12 +30,12 @@ class LoggingConfigForm extends Form
             array(
                 'required'      => true,
                 'autosubmit'    => true,
-                'label'         => t('Logging Type'),
-                'description'   => t('The type of logging to utilize.'),
+                'label'         => $this->translate('Logging Type'),
+                'description'   => $this->translate('The type of logging to utilize.'),
                 'multiOptions'  => array(
                     'syslog'    => 'Syslog',
-                    'file'      => t('File', 'app.config.logging.type'),
-                    'none'      => t('None', 'app.config.logging.type')
+                    'file'      => $this->translate('File', 'app.config.logging.type'),
+                    'none'      => $this->translate('None', 'app.config.logging.type')
                 )
             )
         );
@@ -47,13 +46,13 @@ class LoggingConfigForm extends Form
                 'logging_level',
                 array(
                     'required'      => true,
-                    'label'         => t('Logging Level'),
-                    'description'   => t('The maximum logging level to emit.'),
+                    'label'         => $this->translate('Logging Level'),
+                    'description'   => $this->translate('The maximum logging level to emit.'),
                     'multiOptions'  => array(
-                        Logger::$levels[Logger::ERROR]      => t('Error', 'app.config.logging.level'),
-                        Logger::$levels[Logger::WARNING]    => t('Warning', 'app.config.logging.level'),
-                        Logger::$levels[Logger::INFO]       => t('Information', 'app.config.logging.level'),
-                        Logger::$levels[Logger::DEBUG]      => t('Debug', 'app.config.logging.level')
+                        Logger::$levels[Logger::ERROR]   => $this->translate('Error', 'app.config.logging.level'),
+                        Logger::$levels[Logger::WARNING] => $this->translate('Warning', 'app.config.logging.level'),
+                        Logger::$levels[Logger::INFO]    => $this->translate('Information', 'app.config.logging.level'),
+                        Logger::$levels[Logger::DEBUG]   => $this->translate('Debug', 'app.config.logging.level')
                     )
                 )
             );
@@ -65,8 +64,10 @@ class LoggingConfigForm extends Form
                 'logging_application',
                 array(
                     'required'      => true,
-                    'label'         => t('Application Prefix'),
-                    'description'   => t('The name of the application by which to prefix syslog messages.'),
+                    'label'         => $this->translate('Application Prefix'),
+                    'description'   => $this->translate(
+                        'The name of the application by which to prefix syslog messages.'
+                    ),
                     'value'         => 'icingaweb2',
                     'validators'    => array(
                         array(
@@ -91,8 +92,8 @@ class LoggingConfigForm extends Form
 //                'logging_facility',
 //                array(
 //                    'required'      => true,
-//                    'label'         => t('Facility'),
-//                    'description'   => t('The syslog facility to utilize.'),
+//                    'label'         => $this->translate('Facility'),
+//                    'description'   => $this->translate('The syslog facility to utilize.'),
 //                    'multiOptions'  => array(
 //                        'user' => 'LOG_USER'
 //                    )
@@ -104,8 +105,8 @@ class LoggingConfigForm extends Form
                 'logging_file',
                 array(
                     'required'      => true,
-                    'label'         => t('File path'),
-                    'description'   => t('The full path to the log file to write messages to.'),
+                    'label'         => $this->translate('File path'),
+                    'description'   => $this->translate('The full path to the log file to write messages to.'),
                     'value'         => '/var/log/icingaweb2/icingaweb2.log',
                     'validators'    => array(new WritablePathValidator())
                 )
diff --git a/application/forms/Config/GeneralConfigForm.php b/application/forms/Config/GeneralConfigForm.php
index 0d81bb96b..7e3357d7b 100644
--- a/application/forms/Config/GeneralConfigForm.php
+++ b/application/forms/Config/GeneralConfigForm.php
@@ -20,7 +20,7 @@ class GeneralConfigForm extends ConfigForm
     public function init()
     {
         $this->setName('form_config_general');
-        $this->setSubmitLabel(t('Save Changes'));
+        $this->setSubmitLabel($this->translate('Save Changes'));
     }
 
     /**
@@ -52,7 +52,7 @@ class GeneralConfigForm extends ConfigForm
         }
 
         if ($this->save()) {
-            Notification::success(t('New configuration has successfully been stored'));
+            Notification::success($this->translate('New configuration has successfully been stored'));
         } else {
             return false;
         }
diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
index 36e69e9e1..9e4027299 100644
--- a/application/forms/Config/Resource/DbResourceForm.php
+++ b/application/forms/Config/Resource/DbResourceForm.php
@@ -41,8 +41,8 @@ class DbResourceForm extends Form
             'name',
             array(
                 'required'      => true,
-                'label'         => t('Resource Name'),
-                'description'   => t('The unique name of this resource')
+                'label'         => $this->translate('Resource Name'),
+                'description'   => $this->translate('The unique name of this resource')
             )
         );
         $this->addElement(
@@ -50,8 +50,8 @@ class DbResourceForm extends Form
             'db',
             array(
                 'required'      => true,
-                'label'         => t('Database Type'),
-                'description'   => t('The type of SQL database'),
+                'label'         => $this->translate('Database Type'),
+                'description'   => $this->translate('The type of SQL database'),
                 'multiOptions'  => $dbChoices
             )
         );
@@ -60,8 +60,8 @@ class DbResourceForm extends Form
             'host',
             array (
                 'required'      => true,
-                'label'         => t('Host'),
-                'description'   => t('The hostname of the database'),
+                'label'         => $this->translate('Host'),
+                'description'   => $this->translate('The hostname of the database'),
                 'value'         => 'localhost'
             )
         );
@@ -70,8 +70,8 @@ class DbResourceForm extends Form
             'port',
             array(
                 'required'      => true,
-                'label'         => t('Port'),
-                'description'   => t('The port to use'),
+                'label'         => $this->translate('Port'),
+                'description'   => $this->translate('The port to use'),
                 'value'         => 3306
             )
         );
@@ -80,8 +80,8 @@ class DbResourceForm extends Form
             'dbname',
             array(
                 'required'      => true,
-                'label'         => t('Database Name'),
-                'description'   => t('The name of the database to use')
+                'label'         => $this->translate('Database Name'),
+                'description'   => $this->translate('The name of the database to use')
             )
         );
         $this->addElement(
@@ -89,8 +89,8 @@ class DbResourceForm extends Form
             'username',
             array (
                 'required'      => true,
-                'label'         => t('Username'),
-                'description'   => t('The user name to use for authentication')
+                'label'         => $this->translate('Username'),
+                'description'   => $this->translate('The user name to use for authentication')
             )
         );
         $this->addElement(
@@ -99,8 +99,8 @@ class DbResourceForm extends Form
             array(
                 'required'          => true,
                 'renderPassword'    => true,
-                'label'             => t('Password'),
-                'description'       => t('The password to use for authentication')
+                'label'             => $this->translate('Password'),
+                'description'       => $this->translate('The password to use for authentication')
             )
         );
 
@@ -132,7 +132,9 @@ class DbResourceForm extends Form
             $resource = ResourceFactory::createResource(new ConfigObject($form->getValues()));
             $resource->getConnection()->getConnection();
         } catch (Exception $e) {
-            $form->addError(t('Connectivity validation failed, connection to the given resource not possible.'));
+            $form->addError(
+                $this->translate('Connectivity validation failed, connection to the given resource not possible.')
+            );
             return false;
         }
 
diff --git a/application/forms/Config/Resource/FileResourceForm.php b/application/forms/Config/Resource/FileResourceForm.php
index 8e2920313..960926114 100644
--- a/application/forms/Config/Resource/FileResourceForm.php
+++ b/application/forms/Config/Resource/FileResourceForm.php
@@ -30,8 +30,8 @@ class FileResourceForm extends Form
             'name',
             array(
                 'required'      => true,
-                'label'         => t('Resource Name'),
-                'description'   => t('The unique name of this resource')
+                'label'         => $this->translate('Resource Name'),
+                'description'   => $this->translate('The unique name of this resource')
             )
         );
         $this->addElement(
@@ -39,8 +39,8 @@ class FileResourceForm extends Form
             'filename',
             array(
                 'required'      => true,
-                'label'         => t('Filepath'),
-                'description'   => t('The filename to fetch information from'),
+                'label'         => $this->translate('Filepath'),
+                'description'   => $this->translate('The filename to fetch information from'),
                 'validators'    => array(new ReadablePathValidator())
             )
         );
@@ -49,8 +49,8 @@ class FileResourceForm extends Form
             'fields',
             array(
                 'required'      => true,
-                'label'         => t('Pattern'),
-                'description'   => t('The regular expression by which to identify columns')
+                'label'         => $this->translate('Pattern'),
+                'description'   => $this->translate('The regular expression by which to identify columns')
             )
         );
 
diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 6641b96bb..c113e2471 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -32,8 +32,8 @@ class LdapResourceForm extends Form
             'name',
             array(
                 'required'      => true,
-                'label'         => t('Resource Name'),
-                'description'   => t('The unique name of this resource')
+                'label'         => $this->translate('Resource Name'),
+                'description'   => $this->translate('The unique name of this resource')
             )
         );
         $this->addElement(
@@ -41,8 +41,10 @@ class LdapResourceForm extends Form
             'hostname',
             array(
                 'required'      => true,
-                'label'         => t('Host'),
-                'description'   => t('The hostname or address of the LDAP server to use for authentication'),
+                'label'         => $this->translate('Host'),
+                'description'   => $this->translate(
+                    'The hostname or address of the LDAP server to use for authentication'
+                ),
                 'value'         => 'localhost'
             )
         );
@@ -51,8 +53,8 @@ class LdapResourceForm extends Form
             'port',
             array(
                 'required'      => true,
-                'label'         => t('Port'),
-                'description'   => t('The port of the LDAP server to use for authentication'),
+                'label'         => $this->translate('Port'),
+                'description'   => $this->translate('The port of the LDAP server to use for authentication'),
                 'value'         => 389
             )
         );
@@ -61,8 +63,10 @@ class LdapResourceForm extends Form
             'root_dn',
             array(
                 'required'      => true,
-                'label'         => t('Root DN'),
-                'description'   => t('Only the root and its child nodes will be accessible on this resource.')
+                'label'         => $this->translate('Root DN'),
+                'description'   => $this->translate(
+                    'Only the root and its child nodes will be accessible on this resource.'
+                )
             )
         );
         $this->addElement(
@@ -70,8 +74,8 @@ class LdapResourceForm extends Form
             'bind_dn',
             array(
                 'required'      => true,
-                'label'         => t('Bind DN'),
-                'description'   => t('The user dn to use for querying the ldap server')
+                'label'         => $this->translate('Bind DN'),
+                'description'   => $this->translate('The user dn to use for querying the ldap server')
             )
         );
         $this->addElement(
@@ -80,8 +84,8 @@ class LdapResourceForm extends Form
             array(
                 'required'          => true,
                 'renderPassword'    => true,
-                'label'             => t('Bind Password'),
-                'description'       => t('The password to use for querying the ldap server')
+                'label'             => $this->translate('Bind Password'),
+                'description'       => $this->translate('The password to use for querying the ldap server')
             )
         );
 
@@ -119,7 +123,9 @@ class LdapResourceForm extends Form
                 throw new Exception();
             }
         } catch (Exception $e) {
-            $form->addError(t('Connectivity validation failed, connection to the given resource not possible.'));
+            $form->addError(
+                $this->translate('Connectivity validation failed, connection to the given resource not possible.')
+            );
             return false;
         }
 
diff --git a/application/forms/Config/Resource/LivestatusResourceForm.php b/application/forms/Config/Resource/LivestatusResourceForm.php
index 2262cf583..996827228 100644
--- a/application/forms/Config/Resource/LivestatusResourceForm.php
+++ b/application/forms/Config/Resource/LivestatusResourceForm.php
@@ -33,8 +33,8 @@ class LivestatusResourceForm extends Form
             'name',
             array(
                 'required'      => true,
-                'label'         => t('Resource Name'),
-                'description'   => t('The unique name of this resource')
+                'label'         => $this->translate('Resource Name'),
+                'description'   => $this->translate('The unique name of this resource')
             )
         );
         $this->addElement(
@@ -42,8 +42,8 @@ class LivestatusResourceForm extends Form
             'socket',
             array(
                 'required'      => true,
-                'label'         => t('Socket'),
-                'description'   => t('The path to your livestatus socket used for querying monitoring data'),
+                'label'         => $this->translate('Socket'),
+                'description'   => $this->translate('The path to your livestatus socket used for querying monitoring data'),
                 'value'         => '/var/run/icinga2/cmd/livestatus'
             )
         );
@@ -75,8 +75,10 @@ class LivestatusResourceForm extends Form
         try {
             $resource = ResourceFactory::createResource(new ConfigObject($form->getValues()));
             $resource->connect()->disconnect();
-        } catch (Exception $e) {
-            $form->addError(t('Connectivity validation failed, connection to the given resource not possible.'));
+        } catch (Exception $_) {
+            $form->addError(
+                $this->translate('Connectivity validation failed, connection to the given resource not possible.')
+            );
             return false;
         }
 
diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php
index e7933c18f..67912142a 100644
--- a/application/forms/Config/ResourceConfigForm.php
+++ b/application/forms/Config/ResourceConfigForm.php
@@ -22,7 +22,7 @@ class ResourceConfigForm extends ConfigForm
     public function init()
     {
         $this->setName('form_config_resource');
-        $this->setSubmitLabel(t('Save Changes'));
+        $this->setSubmitLabel($this->translate('Save Changes'));
     }
 
     /**
@@ -43,7 +43,7 @@ class ResourceConfigForm extends ConfigForm
         } elseif ($type === 'file') {
             return new FileResourceForm();
         } else {
-            throw new InvalidArgumentException(sprintf(t('Invalid resource type "%s" provided'), $type));
+            throw new InvalidArgumentException(sprintf($this->translate('Invalid resource type "%s" provided'), $type));
         }
     }
 
@@ -62,9 +62,9 @@ class ResourceConfigForm extends ConfigForm
     {
         $name = isset($values['name']) ? $values['name'] : '';
         if (! $name) {
-            throw new InvalidArgumentException(t('Resource name missing'));
+            throw new InvalidArgumentException($this->translate('Resource name missing'));
         } elseif ($this->config->hasSection($name)) {
-            throw new InvalidArgumentException(t('Resource already exists'));
+            throw new InvalidArgumentException($this->translate('Resource already exists'));
         }
 
         unset($values['name']);
@@ -85,11 +85,11 @@ class ResourceConfigForm extends ConfigForm
     public function edit($name, array $values)
     {
         if (! $name) {
-            throw new InvalidArgumentException(t('Old resource name missing'));
+            throw new InvalidArgumentException($this->translate('Old resource name missing'));
         } elseif (! ($newName = isset($values['name']) ? $values['name'] : '')) {
-            throw new InvalidArgumentException(t('New resource name missing'));
+            throw new InvalidArgumentException($this->translate('New resource name missing'));
         } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException(t('Unknown resource provided'));
+            throw new InvalidArgumentException($this->translate('Unknown resource provided'));
         }
 
         $resourceConfig = $this->config->getSection($name);
@@ -111,9 +111,9 @@ class ResourceConfigForm extends ConfigForm
     public function remove($name)
     {
         if (! $name) {
-            throw new InvalidArgumentException(t('Resource name missing'));
+            throw new InvalidArgumentException($this->translate('Resource name missing'));
         } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException(t('Unknown resource provided'));
+            throw new InvalidArgumentException($this->translate('Unknown resource provided'));
         }
 
         $resourceConfig = $this->config->getSection($name);
@@ -143,10 +143,10 @@ class ResourceConfigForm extends ConfigForm
         try {
             if ($resource === null) { // create new resource
                 $this->add($this->getValues());
-                $message = t('Resource "%s" has been successfully created');
+                $message = $this->translate('Resource "%s" has been successfully created');
             } else { // edit existing resource
                 $this->edit($resource, $this->getValues());
-                $message = t('Resource "%s" has been successfully changed');
+                $message = $this->translate('Resource "%s" has been successfully changed');
             }
         } catch (InvalidArgumentException $e) {
             Notification::error($e->getMessage());
@@ -172,9 +172,9 @@ class ResourceConfigForm extends ConfigForm
         $resource = $this->request->getQuery('resource');
         if ($resource !== null) {
             if ($resource === '') {
-                throw new ConfigurationError(t('Resource name missing'));
+                throw new ConfigurationError($this->translate('Resource name missing'));
             } elseif (! $this->config->hasSection($resource)) {
-                throw new ConfigurationError(t('Unknown resource provided'));
+                throw new ConfigurationError($this->translate('Unknown resource provided'));
             }
 
             $configValues = $this->config->getSection($resource)->toArray();
@@ -197,8 +197,8 @@ class ResourceConfigForm extends ConfigForm
             array(
                 'order'         => 0,
                 'ignore'        => true,
-                'label'         => t('Force Changes'),
-                'description'   => t('Check this box to enforce changes without connectivity validation')
+                'label'         => $this->translate('Force Changes'),
+                'description'   => $this->translate('Check this box to enforce changes without connectivity validation')
             )
         );
     }
@@ -211,14 +211,14 @@ class ResourceConfigForm extends ConfigForm
         $resourceType = isset($formData['type']) ? $formData['type'] : 'db';
 
         $resourceTypes = array(
-            'file'          => t('File'),
+            'file'          => $this->translate('File'),
             'livestatus'    => 'Livestatus',
         );
         if ($resourceType === 'ldap' || Platform::extensionLoaded('ldap')) {
             $resourceTypes['ldap'] = 'LDAP';
         }
         if ($resourceType === 'db' || Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {
-            $resourceTypes['db'] = t('SQL Database');
+            $resourceTypes['db'] = $this->translate('SQL Database');
         }
 
         $this->addElement(
@@ -227,8 +227,8 @@ class ResourceConfigForm extends ConfigForm
             array(
                 'required'          => true,
                 'autosubmit'        => true,
-                'label'             => t('Resource Type'),
-                'description'       => t('The type of resource'),
+                'label'             => $this->translate('Resource Type'),
+                'description'       => $this->translate('The type of resource'),
                 'multiOptions'      => $resourceTypes,
                 'value'             => $resourceType
             )
diff --git a/application/forms/ConfirmRemovalForm.php b/application/forms/ConfirmRemovalForm.php
index 02d7263df..6840db37d 100644
--- a/application/forms/ConfirmRemovalForm.php
+++ b/application/forms/ConfirmRemovalForm.php
@@ -17,6 +17,6 @@ class ConfirmRemovalForm extends Form
     public function init()
     {
         $this->setName('form_confirm_removal');
-        $this->setSubmitLabel(t('Confirm Removal'));
+        $this->setSubmitLabel($this->translate('Confirm Removal'));
     }
 }
diff --git a/application/forms/Dashboard/DashletForm.php b/application/forms/Dashboard/DashletForm.php
index 6c38ff97e..e58ca8aba 100644
--- a/application/forms/Dashboard/DashletForm.php
+++ b/application/forms/Dashboard/DashletForm.php
@@ -26,7 +26,7 @@ class DashletForm extends Form
     {
         $this->setName('form_dashboard_addurl');
         if (! $this->getSubmitLabel()) {
-            $this->setSubmitLabel(t('Add To Dashboard'));
+            $this->setSubmitLabel($this->translate('Add To Dashboard'));
         }
         $this->setAction(URL::fromRequest());
     }
@@ -66,9 +66,10 @@ class DashletForm extends Form
             'url',
             array(
                 'required'      => true,
-                'label'         => t('Url'),
-                'description'   =>
-                    t('Enter url being loaded in the dashlet. You can paste the full URL, including filters.')
+                'label'         => $this->translate('Url'),
+                'description'   => $this->translate(
+                    'Enter url being loaded in the dashlet. You can paste the full URL, including filters.'
+                )
             )
         );
         $this->addElement(
@@ -76,8 +77,8 @@ class DashletForm extends Form
             'dashlet',
             array(
                 'required'      => true,
-                'label'         => t('Dashlet Title'),
-                'description'   => t('Enter a title for the dashlet.')
+                'label'         => $this->translate('Dashlet Title'),
+                'description'   => $this->translate('Enter a title for the dashlet.')
             )
         );
         $this->addElement(
@@ -95,9 +96,8 @@ class DashletForm extends Form
                 'pane',
                 array(
                     'required'      => true,
-                    'label'         => t("New Dashboard Title"),
-                    'description'   =>
-                        t('Enter a title for the new pane.')
+                    'label'         => $this->translate("New Dashboard Title"),
+                    'description'   => $this->translate('Enter a title for the new pane.')
                 )
             );
         } else {
@@ -106,10 +106,9 @@ class DashletForm extends Form
                 'pane',
                 array(
                     'required'      => true,
-                    'label'         => t('Dashboard'),
+                    'label'         => $this->translate('Dashboard'),
                     'multiOptions'  => $panes,
-                    'description'   =>
-                        t('Select a pane you want to add the dashlet.')
+                    'description'   => $this->translate('Select a pane you want to add the dashlet.')
                 )
             );
         }
@@ -119,9 +118,9 @@ class DashletForm extends Form
             'create_new_pane',
             array(
                 'required'      => false,
-                'label'         => t('New dashboard'),
+                'label'         => $this->translate('New dashboard'),
                 'class'         => 'autosubmit',
-                'description'   => t('Check this box if you want to add the dashlet to a new dashboard')
+                'description'   => $this->translate('Check this box if you want to add the dashlet to a new dashboard')
             )
         );
     }
diff --git a/application/forms/LdapDiscoveryForm.php b/application/forms/LdapDiscoveryForm.php
index 0fd0ea0d3..ea5f3a99e 100644
--- a/application/forms/LdapDiscoveryForm.php
+++ b/application/forms/LdapDiscoveryForm.php
@@ -26,8 +26,8 @@ class LdapDiscoveryForm extends Form
             'domain',
             array(
                 'required'      => true,
-                'label'         => t('Search Domain'),
-                'description'   => t('Search this domain for records of available servers.'),
+                'label'         => $this->translate('Search Domain'),
+                'description'   => $this->translate('Search this domain for records of available servers.'),
             )
         );
 
@@ -36,7 +36,7 @@ class LdapDiscoveryForm extends Form
                 'note',
                 'additional_description',
                 array(
-                    'value' => t('No Ldap servers found on this domain.'
+                    'value' => $this->translate('No Ldap servers found on this domain.'
                         . ' You can try to specify host and port and try again, or just skip this step and '
                         . 'configure the server manually.'
                     )
@@ -47,8 +47,8 @@ class LdapDiscoveryForm extends Form
                 'hostname',
                 array(
                     'required'      => false,
-                    'label'         => t('Host'),
-                    'description'   => t('IP or host name to search.'),
+                    'label'         => $this->translate('Host'),
+                    'description'   => $this->translate('IP or host name to search.'),
                 )
             );
 
@@ -57,8 +57,8 @@ class LdapDiscoveryForm extends Form
                 'port',
                 array(
                     'required'      => false,
-                    'label'         => t('Port'),
-                    'description'   => t('Port', 389),
+                    'label'         => $this->translate('Port'),
+                    'description'   => $this->translate('Port', 389),
                 )
             );
         }
diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
index e3cfdf319..9b5a3ecf8 100644
--- a/application/forms/PreferenceForm.php
+++ b/application/forms/PreferenceForm.php
@@ -105,9 +105,9 @@ class PreferenceForm extends Form
         try {
             if ($this->getElement('btn_submit_preferences')->isChecked()) {
                 $this->save();
-                Notification::success(t('Preferences successfully saved'));
+                Notification::success($this->translate('Preferences successfully saved'));
             } else {
-                Notification::success(t('Preferences successfully saved for the current session'));
+                Notification::success($this->translate('Preferences successfully saved for the current session'));
             }
         } catch (Exception $e) {
             Logger::error($e);
@@ -142,13 +142,13 @@ class PreferenceForm extends Form
     public function createElements(array $formData)
     {
         $languages = array();
-        $languages['autodetect'] = sprintf(t('Browser (%s)', 'preferences.form'), $this->getLocale());
+        $languages['autodetect'] = sprintf($this->translate('Browser (%s)', 'preferences.form'), $this->getLocale());
         foreach (Translator::getAvailableLocaleCodes() as $language) {
             $languages[$language] = $language;
         }
 
         $tzList = array();
-        $tzList['autodetect'] = sprintf(t('Browser (%s)', 'preferences.form'), $this->getDefaultTimezone());
+        $tzList['autodetect'] = sprintf($this->translate('Browser (%s)', 'preferences.form'), $this->getDefaultTimezone());
         foreach (DateTimeZone::listIdentifiers() as $tz) {
             $tzList[$tz] = $tz;
         }
@@ -158,8 +158,8 @@ class PreferenceForm extends Form
             'language',
             array(
                 'required'      => true,
-                'label'         => t('Your Current Language'),
-                'description'   => t('Use the following language to display texts and messages'),
+                'label'         => $this->translate('Your Current Language'),
+                'description'   => $this->translate('Use the following language to display texts and messages'),
                 'multiOptions'  => $languages,
                 'value'         => substr(setlocale(LC_ALL, 0), 0, 5)
             )
@@ -170,8 +170,8 @@ class PreferenceForm extends Form
             'timezone',
             array(
                 'required'      => true,
-                'label'         => t('Your Current Timezone'),
-                'description'   => t('Use the following timezone for dates and times'),
+                'label'         => $this->translate('Your Current Timezone'),
+                'description'   => $this->translate('Use the following timezone for dates and times'),
                 'multiOptions'  => $tzList,
                 'value'         => $this->getDefaultTimezone()
             )
@@ -182,7 +182,7 @@ class PreferenceForm extends Form
             'show_benchmark',
             array(
                 'required'  => true,
-                'label'     => t('Use benchmark')
+                'label'     => $this->translate('Use benchmark')
             )
         );
 
@@ -191,7 +191,7 @@ class PreferenceForm extends Form
             'btn_submit_preferences',
             array(
                 'ignore'        => true,
-                'label'         => t('Save to the Preferences'),
+                'label'         => $this->translate('Save to the Preferences'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'div'))
@@ -204,7 +204,7 @@ class PreferenceForm extends Form
             'btn_submit_session',
             array(
                 'ignore'        => true,
-                'label'         => t('Save for the current Session'),
+                'label'         => $this->translate('Save for the current Session'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'div'))
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index b27a4ec8b..f32c0cab4 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -72,8 +72,8 @@ class RoleForm extends ConfigForm
                 'name',
                 array(
                     'required'      => true,
-                    'label'         => t('Role Name'),
-                    'description'   => t('The name of the role'),
+                    'label'         => $this->translate('Role Name'),
+                    'description'   => $this->translate('The name of the role'),
                     'ignore'        => true
                 ),
             ),
@@ -81,24 +81,26 @@ class RoleForm extends ConfigForm
                 'textarea',
                 'users',
                 array(
-                    'label'         => t('Users'),
-                    'description'   => t('Comma-separated list of users that are assigned to the role')
+                    'label'         => $this->translate('Users'),
+                    'description'   => $this->translate('Comma-separated list of users that are assigned to the role')
                 ),
             ),
             array(
                 'textarea',
                 'groups',
                 array(
-                    'label'         => t('Groups'),
-                    'description'   => t('Comma-separated list of groups that are assigned to the role')
+                    'label'         => $this->translate('Groups'),
+                    'description'   => $this->translate('Comma-separated list of groups that are assigned to the role')
                 ),
             ),
             array(
                 'multiselect',
                 'permissions',
                 array(
-                    'label'         => t('Permissions Set'),
-                    'description'   => t('The permissions to grant. You may select more than one permission'),
+                    'label'         => $this->translate('Permissions Set'),
+                    'description'   => $this->translate(
+                        'The permissions to grant. You may select more than one permission'
+                    ),
                     'multiOptions'  => $this->providedPermissions
                 )
             )
@@ -133,7 +135,7 @@ class RoleForm extends ConfigForm
         }
         if (! $this->config->hasSection($name)) {
             throw new InvalidArgumentException(sprintf(
-                t('Can\'t load role \'%s\'. Role does not exist'),
+                $this->translate('Can\'t load role \'%s\'. Role does not exist'),
                 $name
             ));
         }
@@ -174,7 +176,7 @@ class RoleForm extends ConfigForm
         }
         if ($this->config->hasSection($name)) {
             throw new InvalidArgumentException(sprintf(
-                t('Can\'t add role \'%s\'. Role already exists'),
+                $this->translate('Can\'t add role \'%s\'. Role already exists'),
                 $name
             ));
         }
@@ -200,7 +202,7 @@ class RoleForm extends ConfigForm
         }
         if (! $this->config->hasSection($name)) {
             throw new InvalidArgumentException(sprintf(
-                t('Can\'t remove role \'%s\'. Role does not exist'),
+                $this->translate('Can\'t remove role \'%s\'. Role does not exist'),
                 $name
             ));
         }
@@ -233,7 +235,7 @@ class RoleForm extends ConfigForm
         } else {
             if (! $this->config->hasSection($name)) {
                 throw new InvalidArgumentException(sprintf(
-                    t('Can\'t update role \'%s\'. Role does not exist'),
+                    $this->translate('Can\'t update role \'%s\'. Role does not exist'),
                     $name
                 ));
             }

From f6eb9a764f8d704cea792334a9b2a0555c1ca1ee Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 19 Jan 2015 11:33:21 +0100
Subject: [PATCH 0187/2920] Determine axis orientation based on max label
 length

---
 library/Icinga/Chart/Axis.php | 47 +++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/library/Icinga/Chart/Axis.php b/library/Icinga/Chart/Axis.php
index e6046705a..88718f976 100644
--- a/library/Icinga/Chart/Axis.php
+++ b/library/Icinga/Chart/Axis.php
@@ -94,22 +94,7 @@ class Axis implements Drawable
     /**
      * If the displayed labels should be aligned horizontally or diagonally
      */
-    private $labelRotationStyle = self::LABEL_ROTATE_DIAGONAL;
-
-    /**
-     * Set the label rotation style for the horizontal axis
-     *
-     * <ul>
-     *   <li><b>LABEL_ROTATE_HORIZONTAL</b>: Labels will be displayed horizontally </li>
-     *   <li><b>LABEL_ROTATE_DIAGONAL</b>: Labels will be rotated by 45° </li>
-     * </ul>
-     *
-     * @param $style    The rotation mode
-     */
-    public function setHorizontalLabelRotationStyle($style)
-    {
-        $this->labelRotationStyle = $style;
-    }
+    protected $labelRotationStyle = self::LABEL_ROTATE_HORIZONTAL;
 
     /**
      * Inform the axis about an added dataset
@@ -182,6 +167,12 @@ class Axis implements Drawable
             $steps = $ticks * 5;
         }
 
+        // Check whether there is enough room for regular labels
+        $labelRotationStyle = $this->labelRotationStyle;
+        if ($this->labelsOversized($this->xUnit, 6)) {
+            $labelRotationStyle = self::LABEL_ROTATE_DIAGONAL;
+        }
+
         /*
         $line = new Line(0, 100, 100, 100);
         $line->setStrokeWidth(2);
@@ -203,7 +194,7 @@ class Axis implements Drawable
             }
 
             if ($i % $steps === 0) {
-                if ($this->labelRotationStyle === self::LABEL_ROTATE_HORIZONTAL) {
+                if ($labelRotationStyle === self::LABEL_ROTATE_HORIZONTAL) {
                     // If the  last label would overlap this label we shift the y axis a bit
                     if ($lastLabelEnd > $pos) {
                         $shift = ($shift + 5) % 10;
@@ -213,14 +204,14 @@ class Axis implements Drawable
                 }
 
                 $labelField = new Text($pos + 0.5, ($this->xLabel ? 107 : 105) + $shift, $label);
-                if ($this->labelRotationStyle === self::LABEL_ROTATE_HORIZONTAL) {
+                if ($labelRotationStyle === self::LABEL_ROTATE_HORIZONTAL) {
                     $labelField->setAlignment(Text::ALIGN_MIDDLE)
                         ->setFontSize('2.5em');
                 } else {
                     $labelField->setFontSize('2.5em');
                 }
 
-                if ($this->labelRotationStyle === self::LABEL_ROTATE_DIAGONAL) {
+                if ($labelRotationStyle === self::LABEL_ROTATE_DIAGONAL) {
                     $labelField = new Rotator($labelField, 45);
                 }
                 $labelField = $labelField->toSvg($ctx);
@@ -477,4 +468,22 @@ class Axis implements Drawable
         return $per;
     }
 
+    /**
+     * Returns whether at least one label of the given Axis
+     * is bigger than the given maxLength
+     *
+     * @param   AxisUnit    $axis   The axis that contains the labels that will be checked
+     *
+     * @return  boolean             Whether at least one label is bigger than maxLength
+     */
+    private function labelsOversized(AxisUnit $axis, $maxLength = 5)
+    {
+        $oversized = false;
+        foreach ($axis as $label => $pos) {
+            if (strlen($label) > $maxLength) {
+                $oversized = true;
+            }
+        }
+        return $oversized;
+    }
 }

From a57f1b00a97abba9b21c6a4e61590e5196911d97 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 16 Jan 2015 17:41:49 +0100
Subject: [PATCH 0188/2920] rpm: Introduce config directory for packaged
 configuration files

refs #4075
---
 packages/files/{ => config}/modules/doc/config.ini | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packages/files/{ => config}/modules/doc/config.ini (100%)

diff --git a/packages/files/modules/doc/config.ini b/packages/files/config/modules/doc/config.ini
similarity index 100%
rename from packages/files/modules/doc/config.ini
rename to packages/files/config/modules/doc/config.ini

From 601436208917af59b9e08fba8100bef4f6723c4d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 16 Jan 2015 17:44:16 +0100
Subject: [PATCH 0189/2920] packages: Install custom setup module config w/
 correct path to the schema files

refs #4075
---
 packages/files/config/modules/setup/config.ini | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 packages/files/config/modules/setup/config.ini

diff --git a/packages/files/config/modules/setup/config.ini b/packages/files/config/modules/setup/config.ini
new file mode 100644
index 000000000..5158aae99
--- /dev/null
+++ b/packages/files/config/modules/setup/config.ini
@@ -0,0 +1,2 @@
+[schema]
+path = /usr/share/doc/icingaweb2/schema

From 556610adc18c2ebe3c62936bd9d915a596b6c63b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 16 Jan 2015 17:52:08 +0100
Subject: [PATCH 0190/2920] rpm: icingaweb2-common must not install any config
 file except the config directory

refs #4075
---
 icingaweb2.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index 4fa670333..7520d336c 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -219,7 +219,7 @@ exit 0
 %defattr(-,root,root)
 %{basedir}/application/locale
 %dir %{basedir}/modules
-%attr(2770,root,%{icingawebgroup}) %config(noreplace) %{configdir}
+%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}
 
 
 %files -n php-Icinga

From ef412688e9f853643091748fdb4c57299541e1ef Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 16 Jan 2015 18:10:19 +0100
Subject: [PATCH 0191/2920] setup: Require to set a path to the schema files

refs #8232
---
 modules/setup/library/Setup/Steps/DatabaseStep.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/setup/library/Setup/Steps/DatabaseStep.php b/modules/setup/library/Setup/Steps/DatabaseStep.php
index c6ec2ef2b..006b6c9ed 100644
--- a/modules/setup/library/Setup/Steps/DatabaseStep.php
+++ b/modules/setup/library/Setup/Steps/DatabaseStep.php
@@ -6,7 +6,6 @@ namespace Icinga\Module\Setup\Steps;
 
 use Exception;
 use PDOException;
-use Icinga\Application\Icinga;
 use Icinga\Module\Setup\Step;
 use Icinga\Module\Setup\Utils\DbTool;
 use Icinga\Module\Setup\Exception\SetupException;
@@ -71,7 +70,7 @@ class DatabaseStep extends Step
             $this->log(mt('setup', 'Database schema already exists...'));
         } else {
             $this->log(mt('setup', 'Creating database schema...'));
-            $db->import(Icinga::app()->getApplicationDir() . '/../etc/schema/mysql.schema.sql');
+            $db->import($this->data['schemaPath'] . '/mysql.schema.sql');
         }
 
         if ($db->hasLogin($this->data['resourceConfig']['username'])) {
@@ -122,7 +121,7 @@ class DatabaseStep extends Step
             $this->log(mt('setup', 'Database schema already exists...'));
         } else {
             $this->log(mt('setup', 'Creating database schema...'));
-            $db->import(Icinga::app()->getApplicationDir() . '/../etc/schema/pgsql.schema.sql');
+            $db->import($this->data['schemaPath'] . '/pgsql.schema.sql');
         }
 
         if ($db->hasLogin($this->data['resourceConfig']['username'])) {

From 70f080313dc44bb85ba324c32f9d63171f3124d5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 16 Jan 2015 18:10:54 +0100
Subject: [PATCH 0192/2920] setup: Use schema path from setup's config or
 default

refs #8232
---
 modules/setup/library/Setup/WebWizard.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 102c2c6a0..68632e305 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -295,7 +295,9 @@ class WebWizard extends Wizard implements SetupWizard
                         : null,
                     'adminPassword'     => isset($pageData['setup_database_creation']['password'])
                         ? $pageData['setup_database_creation']['password']
-                        : null
+                        : null,
+                    'schemaPath'        => Config::module('setup')
+                        ->get('schema', 'path', Icinga::app()->getBaseDir('etc/schema'))
                 ))
             );
         }

From 4819ebb6b22166d16c8bcfee8b9701220fdd0f23 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 16 Jan 2015 18:11:20 +0100
Subject: [PATCH 0193/2920] rpm: Install configuration for the setup module

refs #4075
refs #8232
---
 icingaweb2.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index 7520d336c..83ba9b4a7 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -171,7 +171,7 @@ Icinga Web 2 vendor library Zend
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/{%{basedir}/{modules,library,public},%{bindir},%{configdir},%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d,%{docsdir}}
+mkdir -p %{buildroot}/{%{basedir}/{modules,library,public},%{bindir},%{configdir}/modules/setup,%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d,%{docsdir}}
 cp -prv application doc %{buildroot}/%{basedir}
 cp -pv etc/bash_completion.d/icingacli %{buildroot}/%{_sysconfdir}/bash_completion.d/icingacli
 cp -prv modules/{monitoring,setup} %{buildroot}/%{basedir}/modules
@@ -182,6 +182,7 @@ cp -pv packages/files/apache/icingaweb2.conf %{buildroot}/%{wwwconfigdir}/icinga
 cp -pv packages/files/bin/icingacli %{buildroot}/%{bindir}
 cp -pv packages/files/public/index.php %{buildroot}/%{basedir}/public
 cp -prv etc/schema %{buildroot}/%{docsdir}
+cp -prv packages/files/config/modules/setup %{buildroot}/%{configdir}/modules/
 
 %pre
 getent group icingacmd >/dev/null || groupadd -r icingacmd
@@ -209,6 +210,7 @@ rm -rf %{buildroot}
 %attr(2775,root,%{icingawebgroup}) %dir %{logdir}
 %{docsdir}
 %docdir %{docsdir}
+%attr(2770,root,%{icingawebgroup}) %config(noreplace) %{configdir}/modules/setup
 
 
 %pre common

From f4ea24bfa07cdb1ec2a25b9ce2bcb369ca64041e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 10:50:27 +0100
Subject: [PATCH 0194/2920] rpm: Fix configuration files permissions

refs #4075
---
 icingaweb2.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index 83ba9b4a7..c98a8c65f 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -210,7 +210,8 @@ rm -rf %{buildroot}
 %attr(2775,root,%{icingawebgroup}) %dir %{logdir}
 %{docsdir}
 %docdir %{docsdir}
-%attr(2770,root,%{icingawebgroup}) %config(noreplace) %{configdir}/modules/setup
+%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules/setup
+%attr(0660,root,%{icingawebgroup}) %config(noreplace) %{configdir}/modules/setup/config.ini
 
 
 %pre common
@@ -222,6 +223,7 @@ exit 0
 %{basedir}/application/locale
 %dir %{basedir}/modules
 %attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}
+%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules
 
 
 %files -n php-Icinga

From abc74c7fb505b9b089b51a3695f6f8597c0b597a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 11:11:59 +0100
Subject: [PATCH 0195/2920] monitoring/setup: Fix directory mode of the
 monitoring configuration directory

We should introduce a CreateConfigDirectoryStep because module developers must not
provide a directory mode but use our default.
---
 modules/monitoring/library/Monitoring/MonitoringWizard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index 0ac4c7f63..f524a3d10 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -124,7 +124,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
         $pageData = $this->getPageData();
         $setup = new Setup();
 
-        $setup->addStep(new MakeDirStep(array($this->getConfigDir() . '/modules/monitoring'), 0775));
+        $setup->addStep(new MakeDirStep(array($this->getConfigDir() . '/modules/monitoring'), 2770));
 
         $setup->addStep(
             new BackendStep(array(

From c0444a81b24aea332b07eb1409af168c1c53f0c9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 11:14:24 +0100
Subject: [PATCH 0196/2920] setup: Fix octdec for directory modes

Modes prefixed w/ zero, e.g. 0775 require a string conversion before calling octdec.
---
 modules/setup/library/Setup/Utils/MakeDirStep.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/library/Setup/Utils/MakeDirStep.php b/modules/setup/library/Setup/Utils/MakeDirStep.php
index 27919820b..d7813541b 100644
--- a/modules/setup/library/Setup/Utils/MakeDirStep.php
+++ b/modules/setup/library/Setup/Utils/MakeDirStep.php
@@ -21,7 +21,7 @@ class MakeDirStep extends Step
     public function __construct($paths, $dirmode)
     {
         $this->paths = $paths;
-        $this->dirmode = octdec($dirmode);
+        $this->dirmode = octdec((string) $dirmode);
         $this->errors = array();
     }
 

From 7fc70c5a0238963da56aa2fa0414219d8d0ab10e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 11:16:17 +0100
Subject: [PATCH 0197/2920] IniWriter: Don't allow read for others on new files

---
 library/Icinga/File/Ini/IniWriter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/File/Ini/IniWriter.php b/library/Icinga/File/Ini/IniWriter.php
index 28ca53ff0..21402ab74 100644
--- a/library/Icinga/File/Ini/IniWriter.php
+++ b/library/Icinga/File/Ini/IniWriter.php
@@ -27,7 +27,7 @@ class IniWriter extends Zend_Config_Writer_FileAbstract
      *
      * @var int
      */
-    public static $fileMode = 0664;
+    public static $fileMode = 0660;
 
     /**
      * Create a new INI writer

From 599cb620d86a643b19dbc73a3015972f3ced256c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 11:23:43 +0100
Subject: [PATCH 0198/2920] Config: Don't throw NotReadableError if the file
 does not exist

---
 library/Icinga/Application/Config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Application/Config.php b/library/Icinga/Application/Config.php
index dcb837fde..ac37e8c69 100644
--- a/library/Icinga/Application/Config.php
+++ b/library/Icinga/Application/Config.php
@@ -292,7 +292,7 @@ class Config implements Countable, Iterator
             $config = new static(new ConfigObject(parse_ini_file($filepath, true)));
             $config->setConfigFile($filepath);
             return $config;
-        } else {
+        } elseif (@file_exists($filepath)) {
             throw new NotReadableError(t('Cannot read config file "%s". Permission denied'), $filepath);
         }
 

From 87adbacb3beda6c7236dfdb2d535b41cc3910141 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 11:24:41 +0100
Subject: [PATCH 0199/2920] Config: Fix coding style

---
 library/Icinga/Application/Config.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Application/Config.php b/library/Icinga/Application/Config.php
index ac37e8c69..676e237a4 100644
--- a/library/Icinga/Application/Config.php
+++ b/library/Icinga/Application/Config.php
@@ -322,7 +322,7 @@ class Config implements Countable, Iterator
      */
     public static function app($configname = 'config', $fromDisk = false)
     {
-        if (!isset(self::$app[$configname]) || $fromDisk) {
+        if (! isset(self::$app[$configname]) || $fromDisk) {
             self::$app[$configname] = static::fromIni(static::resolvePath($configname . '.ini'));
         }
 
@@ -341,12 +341,12 @@ class Config implements Countable, Iterator
      */
     public static function module($modulename, $configname = 'config', $fromDisk = false)
     {
-        if (!isset(self::$modules[$modulename])) {
+        if (! isset(self::$modules[$modulename])) {
             self::$modules[$modulename] = array();
         }
 
         $moduleConfigs = self::$modules[$modulename];
-        if (!isset($moduleConfigs[$configname]) || $fromDisk) {
+        if (! isset($moduleConfigs[$configname]) || $fromDisk) {
             $moduleConfigs[$configname] = static::fromIni(
                 static::resolvePath('modules/' . $modulename . '/' . $configname . '.ini')
             );

From ac503031a700506e1c1b3f958ae42aecf66d7932 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 11:25:06 +0100
Subject: [PATCH 0200/2920] Config: Fix PHPDoc for fromIni

---
 library/Icinga/Application/Config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Application/Config.php b/library/Icinga/Application/Config.php
index 676e237a4..361f5f11d 100644
--- a/library/Icinga/Application/Config.php
+++ b/library/Icinga/Application/Config.php
@@ -279,7 +279,7 @@ class Config implements Countable, Iterator
      *
      * @param   string      $file   The file to parse
      *
-     * @throws  NotReadableError    When the file does not exist or cannot be read
+     * @throws  NotReadableError    When the file cannot be read
      */
     public static function fromIni($file)
     {

From 64d4bb089c4041b60e4feb4c106b369c29d48f94 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 11:31:35 +0100
Subject: [PATCH 0201/2920] monitoring/setup: Remove function for getting the
 configuration directory

Getting the config directory is not a task for module wizards.
---
 .../library/Monitoring/MonitoringWizard.php   | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index f524a3d10..9c588e5b3 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Monitoring;
 
+use Icinga\Application\Icinga;
 use Icinga\Web\Form;
 use Icinga\Web\Wizard;
 use Icinga\Web\Request;
@@ -124,7 +125,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
         $pageData = $this->getPageData();
         $setup = new Setup();
 
-        $setup->addStep(new MakeDirStep(array($this->getConfigDir() . '/modules/monitoring'), 2770));
+        $setup->addStep(new MakeDirStep(array(Icinga::app()->getConfigDir() . '/modules/monitoring'), 2770));
 
         $setup->addStep(
             new BackendStep(array(
@@ -159,21 +160,4 @@ class MonitoringWizard extends Wizard implements SetupWizard
     {
         return new Requirements();
     }
-
-    /**
-     * Return the configuration directory of Icinga Web 2
-     *
-     * @return  string
-     */
-    protected function getConfigDir()
-    {
-        if (array_key_exists('ICINGAWEB_CONFIGDIR', $_SERVER)) {
-            $configDir = $_SERVER['ICINGAWEB_CONFIGDIR'];
-        } else {
-            $configDir = '/etc/icingaweb';
-        }
-
-        $canonical = realpath($configDir);
-        return $canonical ? $canonical : $configDir;
-    }
 }

From ae4a9fe50ccca9a520c269a24c8f1949596988f4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 11:43:13 +0100
Subject: [PATCH 0202/2920] puppet: Use hiera for defining the icinga web group

---
 .puppet/hiera/common.yaml                       |  1 +
 .puppet/modules/icingaweb2/manifests/config.pp  |  7 ++++---
 .../icingaweb2/manifests/config/general.pp      |  7 ++++---
 .../icingaweb2/manifests/config/module.pp       |  9 +++++----
 .../profiles/icingaweb2_dev/manifests/init.pp   | 17 +++++++++--------
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/.puppet/hiera/common.yaml b/.puppet/hiera/common.yaml
index c76b904bf..d7802181f 100644
--- a/.puppet/hiera/common.yaml
+++ b/.puppet/hiera/common.yaml
@@ -5,3 +5,4 @@ icingaweb2::web_path: icingaweb2
 icingaweb2::db_user:  icingaweb2
 icingaweb2::db_pass:  icingaweb2
 icingaweb2::db_name:  icingaweb2
+icingaweb2::group:    icingaweb2
diff --git a/.puppet/modules/icingaweb2/manifests/config.pp b/.puppet/modules/icingaweb2/manifests/config.pp
index 473d89d06..625c47b7a 100644
--- a/.puppet/modules/icingaweb2/manifests/config.pp
+++ b/.puppet/modules/icingaweb2/manifests/config.pp
@@ -1,14 +1,15 @@
 class icingaweb2::config (
-  $config = hiera('icingaweb2::config')
+  $config    = hiera('icingaweb2::config'),
+  $web_group = hiera('icingaweb2::group')
 ) {
-  group { 'icingaweb':
+  group { $web_group:
       ensure => present,
   }
 
   file { [ "${config}", "${config}/enabledModules", "${config}/modules", "${config}/preferences" ]:
     ensure  => directory,
     owner   => 'root',
-    group   => 'icingaweb',
+    group   => $web_group,
     mode    => '2770',
   }
 }
diff --git a/.puppet/modules/icingaweb2/manifests/config/general.pp b/.puppet/modules/icingaweb2/manifests/config/general.pp
index c2daec83f..8ccea172f 100644
--- a/.puppet/modules/icingaweb2/manifests/config/general.pp
+++ b/.puppet/modules/icingaweb2/manifests/config/general.pp
@@ -1,14 +1,15 @@
 define icingaweb2::config::general (
   $source,
-  $config   = hiera('icingaweb2::config'),
-  $replace  = true
+  $config    = hiera('icingaweb2::config'),
+  $web_group = hiera('icingaweb2::group'),
+  $replace   = true
 ) {
   include icingaweb2::config
 
   file { "${config}/${name}.ini":
      content => template("${source}/${name}.ini.erb"),
      owner   => 'root',
-     group   => 'icingaweb',
+     group   => $web_group,
      mode    => 0660,
      replace => $replace,
   }
diff --git a/.puppet/modules/icingaweb2/manifests/config/module.pp b/.puppet/modules/icingaweb2/manifests/config/module.pp
index 69e5abd6b..19db02250 100644
--- a/.puppet/modules/icingaweb2/manifests/config/module.pp
+++ b/.puppet/modules/icingaweb2/manifests/config/module.pp
@@ -1,8 +1,9 @@
 define icingaweb2::config::module (
   $module,
   $source,
-  $config  = hiera('icingaweb2::config'),
-  $replace = true
+  $config    = hiera('icingaweb2::config'),
+  $web_group = hiera('icingaweb2::group'),
+  $replace   = true
 ) {
   include icingaweb2::config
 
@@ -10,7 +11,7 @@ define icingaweb2::config::module (
     file { "${config}/modules/${module}":
       ensure  => directory,
       owner   => 'root',
-      group   => 'icingaweb',
+      group   => $web_group,
       mode    => '2770',
     }
   }
@@ -18,7 +19,7 @@ define icingaweb2::config::module (
   file { "${config}/modules/${module}/${name}.ini":
      source  => "${source}/modules/${module}/${name}.ini",
      owner   => 'root',
-     group   => 'icingaweb',
+     group   => $web_group,
      mode    => 0660,
      replace => $replace,
   }
diff --git a/.puppet/profiles/icingaweb2_dev/manifests/init.pp b/.puppet/profiles/icingaweb2_dev/manifests/init.pp
index 379f75247..157a9d80a 100644
--- a/.puppet/profiles/icingaweb2_dev/manifests/init.pp
+++ b/.puppet/profiles/icingaweb2_dev/manifests/init.pp
@@ -1,10 +1,11 @@
 class icingaweb2_dev (
-  $config   = hiera('icingaweb2::config'),
-  $log      = hiera('icingaweb2::log'),
-  $web_path = hiera('icingaweb2::web_path'),
-  $db_user  = hiera('icingaweb2::db_user'),
-  $db_pass  = hiera('icingaweb2::db_pass'),
-  $db_name  = hiera('icingaweb2::db_name'),
+  $config    = hiera('icingaweb2::config'),
+  $log       = hiera('icingaweb2::log'),
+  $web_path  = hiera('icingaweb2::web_path'),
+  $db_user   = hiera('icingaweb2::db_user'),
+  $db_pass   = hiera('icingaweb2::db_pass'),
+  $db_name   = hiera('icingaweb2::db_name'),
+  $web_group = hiera('icingaweb2::group'),
 ) {
   include apache
   include php
@@ -28,7 +29,7 @@ class icingaweb2_dev (
   Exec { path => '/usr/local/bin:/usr/bin:/bin' }
 
   # TODO(el): Enabling/disabling modules should be a resource
-  User <| alias == apache |> { groups +> 'icingaweb' }
+  User <| alias == apache |> { groups +> $web_group }
   -> exec { 'enable-monitoring-module':
     command => 'icingacli module enable monitoring',
     user    => 'apache',
@@ -50,7 +51,7 @@ class icingaweb2_dev (
   file { $log_dir:
     ensure  => directory,
     owner   => 'root',
-    group   => 'icingaweb',
+    group   => $web_group,
     mode    => '2775'
   }
 

From fecd4151d1c4284b0861ddf06818f65819517bed Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 19 Jan 2015 13:35:41 +0100
Subject: [PATCH 0203/2920] Move axis labels to the top of the chart

---
 library/Icinga/Chart/Axis.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/library/Icinga/Chart/Axis.php b/library/Icinga/Chart/Axis.php
index 88718f976..c12d9a904 100644
--- a/library/Icinga/Chart/Axis.php
+++ b/library/Icinga/Chart/Axis.php
@@ -228,15 +228,6 @@ class Axis implements Drawable
             }
             $i++;
         }
-
-        // render the label for this axis
-        if ($this->xLabel) {
-            $axisLabel = new Text(50, 104, $this->xLabel);
-            $axisLabel->setFontSize('2em')
-                ->setFontWeight('bold')
-                ->setAlignment(Text::ALIGN_MIDDLE);
-            $group->appendChild($axisLabel->toSvg($ctx));
-        }
     }
 
     /**
@@ -287,12 +278,19 @@ class Axis implements Drawable
             $i++;
         }
 
-        if ($this->yLabel) {
-            $axisLabel = new Text(-8, 50, $this->yLabel);
+        if ($this->yLabel || $this->xLabel) {
+            if ($this->yLabel && $this->xLabel) {
+                $txt = $this->yLabel . ' / ' . $this->xLabel;
+            } else if ($this->xLabel) {
+                $txt = $this->xLabel;
+            } else {
+                $txt = $this->yLabel;
+            }
+
+            $axisLabel = new Text(50, -3, $txt);
             $axisLabel->setFontSize('2em')
                 ->setFontWeight('bold')
                 ->setAlignment(Text::ALIGN_MIDDLE);
-            $axisLabel = new Rotator($axisLabel, 90);
 
             $group->appendChild($axisLabel->toSvg($ctx));
         }

From 23bbf63b73a70933944175dcde709d47437330df Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 19 Jan 2015 13:44:16 +0100
Subject: [PATCH 0204/2920] Revert "Replace t() and mt() with translate() in
 the monitoring module's forms"

This reverts commit 970006838cb2791091dfb2632b1c7eea9d4a243f.
---
 .../DisableNotificationsExpireCommandForm.php | 11 ++--
 .../ToggleInstanceFeaturesCommandForm.php     | 28 +++++-----
 .../Object/AcknowledgeProblemCommandForm.php  | 34 ++++++------
 .../Command/Object/AddCommentCommandForm.php  | 13 +++--
 .../Command/Object/CheckNowCommandForm.php    |  4 +-
 .../Object/DeleteCommentCommandForm.php       |  4 +-
 .../Object/DeleteDowntimeCommandForm.php      |  4 +-
 .../Object/ProcessCheckResultCommandForm.php  | 30 ++++++-----
 .../Object/ScheduleHostCheckCommandForm.php   |  5 +-
 .../ScheduleHostDowntimeCommandForm.php       | 16 +++---
 .../ScheduleServiceCheckCommandForm.php       | 17 +++---
 .../ScheduleServiceDowntimeCommandForm.php    | 34 ++++++------
 .../ToggleObjectFeaturesCommandForm.php       | 16 +++---
 .../Config/Instance/LocalInstanceForm.php     |  4 +-
 .../Config/Instance/RemoteInstanceForm.php    | 16 +++---
 .../RemoteInstanceKeyResourcePage.php         | 54 -------------------
 .../forms/Config/InstanceConfigForm.php       | 34 ++++++------
 .../forms/Config/SecurityConfigForm.php       |  8 +--
 .../application/forms/EventOverviewForm.php   | 10 ++--
 .../application/forms/Setup/BackendPage.php   | 15 +++---
 .../forms/Setup/IdoResourcePage.php           | 11 ++--
 .../application/forms/Setup/InstancePage.php  |  5 +-
 .../forms/Setup/LivestatusResourcePage.php    | 11 ++--
 .../application/forms/Setup/SecurityPage.php  |  5 +-
 .../application/forms/Setup/WelcomePage.php   | 10 ++--
 .../application/forms/StatehistoryForm.php    | 42 +++++++--------
 26 files changed, 204 insertions(+), 237 deletions(-)
 delete mode 100644 modules/monitoring/application/forms/Config/Instance/RemoteInstanceKeyResourcePage.php

diff --git a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
index 21d926b58..0e64a4b03 100644
--- a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
@@ -21,7 +21,7 @@ class DisableNotificationsExpireCommandForm extends CommandForm
      */
     public function init()
     {
-        $this->setSubmitLabel($this->translate('Disable Notifications'));
+        $this->setSubmitLabel(mt('monitoring', 'Disable Notifications'));
     }
 
     /**
@@ -30,7 +30,8 @@ class DisableNotificationsExpireCommandForm extends CommandForm
      */
     public function getHelp()
     {
-        return $this->translate(
+        return mt(
+            'monitoring',
             'This command is used to disable host and service notifications for a specific time.'
         );
     }
@@ -48,8 +49,8 @@ class DisableNotificationsExpireCommandForm extends CommandForm
             'expire_time',
             array(
                 'required'      => true,
-                'label'         => $this->translate('Expire Time'),
-                'description'   => $this->translate('Set the expire time.'),
+                'label'         => mt('monitoring', 'Expire Time'),
+                'description'   => mt('monitoring', 'Set the expire time.'),
                 'value'         => $expireTime
             )
         );
@@ -66,7 +67,7 @@ class DisableNotificationsExpireCommandForm extends CommandForm
         $disableNotifications
             ->setExpireTime($this->getElement('expire_time')->getValue()->getTimestamp());
         $this->getTransport($this->request)->send($disableNotifications);
-        Notification::success($this->translate('Disabling host and service notifications..'));
+        Notification::success(mt('monitoring', 'Disabling host and service notifications..'));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index 469c1b6eb..291619b2f 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -61,13 +61,13 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
         if ((bool) $this->status->notifications_enabled) {
             $notificationDescription = sprintf(
                 '<a title="%s" href="%s" data-base-target="_next">%s</a>',
-                $this->translate('Disable notifications for a specific time on a program-wide basis'),
+                mt('monitoring', 'Disable notifications for a specific time on a program-wide basis'),
                 $this->getView()->href('monitoring/process/disable-notifications'),
-                $this->translate('Disable temporarily')
+                mt('monitoring', 'Disable temporarily')
             );
         } elseif ($this->status->disable_notif_expire_time) {
             $notificationDescription = sprintf(
-                $this->translate('Notifications will be re-enabled in <strong>%s</strong>'),
+                mt('monitoring', 'Notifications will be re-enabled in <strong>%s</strong>'),
                 $this->getView()->timeUntil($this->status->disable_notif_expire_time)
             );
         } else {
@@ -78,7 +78,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_ACTIVE_HOST_CHECKS,
                 array(
-                    'label'         =>  $this->translate('Active Host Checks Being Executed'),
+                    'label'         =>  mt('monitoring', 'Active Host Checks Being Executed'),
                     'autosubmit'    => true
                 )
             ),
@@ -86,7 +86,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_ACTIVE_SERVICE_CHECKS,
                 array(
-                    'label'         =>  $this->translate('Active Service Checks Being Executed'),
+                    'label'         =>  mt('monitoring', 'Active Service Checks Being Executed'),
                     'autosubmit'    => true
                 )
             ),
@@ -94,7 +94,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_EVENT_HANDLERS,
                 array(
-                    'label'         => $this->translate('Event Handlers Enabled'),
+                    'label'         => mt('monitoring', 'Event Handlers Enabled'),
                     'autosubmit'    => true
                 )
             ),
@@ -102,7 +102,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_FLAP_DETECTION,
                 array(
-                    'label'         => $this->translate('Flap Detection Enabled'),
+                    'label'         => mt('monitoring', 'Flap Detection Enabled'),
                     'autosubmit'    => true
                 )
             ),
@@ -110,7 +110,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_NOTIFICATIONS,
                 array(
-                    'label'         => $this->translate('Notifications Enabled'),
+                    'label'         => mt('monitoring', 'Notifications Enabled'),
                     'autosubmit'    => true,
                     'description'   => $notificationDescription,
                     'decorators'    => array(
@@ -129,7 +129,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_HOST_OBSESSING,
                 array(
-                    'label'         => $this->translate('Obsessing Over Hosts'),
+                    'label'         => mt('monitoring', 'Obsessing Over Hosts'),
                     'autosubmit'    => true
                 )
             ),
@@ -137,7 +137,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_SERVICE_OBSESSING,
                 array(
-                    'label'         => $this->translate('Obsessing Over Services'),
+                    'label'         => mt('monitoring', 'Obsessing Over Services'),
                     'autosubmit'    => true
                 )
             ),
@@ -145,7 +145,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_PASSIVE_HOST_CHECKS,
                 array(
-                    'label'         =>  $this->translate('Passive Host Checks Being Accepted'),
+                    'label'         =>  mt('monitoring', 'Passive Host Checks Being Accepted'),
                     'autosubmit'    => true
                 )
             ),
@@ -153,7 +153,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_PASSIVE_SERVICE_CHECKS,
                 array(
-                    'label'         =>  $this->translate('Passive Service Checks Being Accepted'),
+                    'label'         =>  mt('monitoring', 'Passive Service Checks Being Accepted'),
                     'autosubmit'    => true
                 )
             ),
@@ -161,7 +161,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_PERFORMANCE_DATA,
                 array(
-                    'label'         =>  $this->translate('Performance Data Being Processed'),
+                    'label'         =>  mt('monitoring', 'Performance Data Being Processed'),
                     'autosubmit'    => true
                 )
             )
@@ -198,7 +198,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 ->setEnabled($enabled);
             $this->getTransport($this->request)->send($toggleFeature);
         }
-        Notification::success($this->translate('Toggling feature..'));
+        Notification::success(mt('monitoring', 'Toggling feature..'));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
index df3731837..25ac76c25 100644
--- a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
@@ -31,7 +31,8 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
      */
     public function getHelp()
     {
-        return $this->translate(
+        return mt(
+            'monitoring',
             'This command is used to acknowledge host or service problems. When a problem is acknowledged,'
             . ' future notifications about problems are temporarily disabled until the host or service'
             . ' recovers.'
@@ -50,8 +51,9 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 'comment',
                 array(
                     'required'      => true,
-                    'label'         => $this->translate('Comment'),
-                    'description'   => $this->translate(
+                    'label'         => mt('monitoring', 'Comment'),
+                    'description'   => mt(
+                        'monitoring',
                         'If you work with other administrators, you may find it useful to share information about the'
                         . ' the host or service that is having problems. Make sure you enter a brief description of'
                         . ' what you are doing.'
@@ -62,8 +64,9 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 'checkbox',
                 'persistent',
                 array(
-                    'label'         => $this->translate('Persistent Comment'),
-                    'description'   => $this->translate(
+                    'label'         => mt('monitoring', 'Persistent Comment'),
+                    'description'   => mt(
+                        'monitoring',
                         'If you would like the comment to remain even when the acknowledgement is removed, check this'
                         . ' option.'
                     )
@@ -73,10 +76,8 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 'checkbox',
                 'expire',
                 array(
-                    'label'         => $this->translate('Use Expire Time'),
-                    'description'   => $this->translate(
-                        'If the acknowledgement should expire, check this option.'
-                    ),
+                    'label'         => mt('monitoring', 'Use Expire Time'),
+                    'description'   => mt('monitoring', 'If the acknowledgement should expire, check this option.'),
                     'autosubmit'    => true
                 )
             )
@@ -88,9 +89,10 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 'dateTimePicker',
                 'expire_time',
                 array(
-                    'label'         => $this->translate('Expire Time'),
+                    'label'         => mt('monitoring', 'Expire Time'),
                     'value'         => $expireTime,
-                    'description'   => $this->translate(
+                    'description'   => mt(
+                        'monitoring',
                         'Enter the expire date and time for this acknowledgement here. Icinga will delete the'
                         . ' acknowledgement after this time expired.'
                     )
@@ -112,9 +114,10 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 'checkbox',
                 'sticky',
                 array(
-                    'label'         => $this->translate('Sticky Acknowledgement'),
+                    'label'         => mt('monitoring', 'Sticky Acknowledgement'),
                     'value'         => true,
-                    'description'   => $this->translate(
+                    'description'   => mt(
+                        'monitoring',
                         'If you want the acknowledgement to disable notifications until the host or service recovers,'
                         . ' check this option.'
                     )
@@ -124,9 +127,10 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 'checkbox',
                 'notify',
                 array(
-                    'label'         => $this->translate('Send Notification'),
+                    'label'         => mt('monitoring', 'Send Notification'),
                     'value'         => true,
-                    'description'   => $this->translate(
+                    'description'   => mt(
+                        'monitoring',
                         'If you do not want an acknowledgement notification to be sent out to the appropriate contacts,'
                         . ' uncheck this option.'
                     )
diff --git a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
index e7f7e91f9..f5adf6c71 100644
--- a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
@@ -29,7 +29,8 @@ class AddCommentCommandForm extends ObjectsCommandForm
      */
     public function getHelp()
     {
-        return $this->translate(
+        return mt(
+            'monitoring',
             'This command is used to add host or service comments.'
         );
     }
@@ -46,8 +47,9 @@ class AddCommentCommandForm extends ObjectsCommandForm
                 'comment',
                 array(
                     'required'      => true,
-                    'label'         => $this->translate('Comment'),
-                    'description'   => $this->translate(
+                    'label'         => mt('monitoring', 'Comment'),
+                    'description'   => mt(
+                        'monitoring',
                         'If you work with other administrators, you may find it useful to share information about the'
                         . ' the host or service that is having problems. Make sure you enter a brief description of'
                         . ' what you are doing.'
@@ -58,9 +60,10 @@ class AddCommentCommandForm extends ObjectsCommandForm
                 'checkbox',
                 'persistent',
                 array(
-                    'label'         => $this->translate('Persistent'),
+                    'label'         => mt('monitoring', 'Persistent'),
                     'value'         => true,
-                    'description'   => $this->translate(
+                    'description'   => mt(
+                        'monitoring',
                         'If you uncheck this option, the comment will automatically be deleted the next time Icinga is'
                         . ' restarted.'
                     )
diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
index 1054aae05..01006683f 100644
--- a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
@@ -35,8 +35,8 @@ class CheckNowCommandForm extends ObjectsCommandForm
                 array(
                     'ignore'        => true,
                     'type'          => 'submit',
-                    'value'         => $this->translate('Check now'),
-                    'label'         => '<i class="icon-reschedule"></i> ' . $this->translate('Check now'),
+                    'value'         => mt('monitoring', 'Check now'),
+                    'label'         => '<i class="icon-reschedule"></i> ' . mt('monitoring', 'Check now'),
                     'decorators'    => array('ViewHelper'),
                     'escape'        => false,
                     'class'         => 'link-like'
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
index 0f7858ad9..3d85afcec 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
@@ -55,7 +55,7 @@ class DeleteCommentCommandForm extends ObjectsCommandForm
             array(
                 'ignore'        => true,
                 'label'         => 'X',
-                'title'         => $this->translate('Delete comment'),
+                'title'         => mt('monitoring', 'Delete comment'),
                 'decorators'    => array('ViewHelper')
             )
         );
@@ -80,7 +80,7 @@ class DeleteCommentCommandForm extends ObjectsCommandForm
         if (! empty($redirect)) {
             $this->setRedirectUrl($redirect);
         }
-        Notification::success($this->translate('Deleting comment..'));
+        Notification::success(mt('monitoring', 'Deleting comment..'));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
index 43ca52b05..1c7095b82 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -55,7 +55,7 @@ class DeleteDowntimeCommandForm extends ObjectsCommandForm
             array(
                 'ignore'        => true,
                 'label'         => 'X',
-                'title'         => $this->translate('Delete downtime'),
+                'title'         => mt('monitoring', 'Delete downtime'),
                 'decorators'    => array('ViewHelper')
             )
         );
@@ -80,7 +80,7 @@ class DeleteDowntimeCommandForm extends ObjectsCommandForm
         if (! empty($redirect)) {
             $this->setRedirectUrl($redirect);
         }
-        Notification::success($this->translate('Deleting downtime..'));
+        Notification::success(mt('monitoring', 'Deleting downtime..'));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
index 44e248956..48ee00ab3 100644
--- a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
@@ -29,7 +29,8 @@ class ProcessCheckResultCommandForm extends ObjectsCommandForm
      */
     public function getHelp()
     {
-        return $this->translate(
+        return mt(
+            'monitoring',
             'This command is used to submit passive host or service check results.'
         );
     }
@@ -52,17 +53,17 @@ class ProcessCheckResultCommandForm extends ObjectsCommandForm
             'status',
             array(
                 'required'      => true,
-                'label'         => $this->translate('Status'),
-                'description'   => $this->translate('The state this check result should report'),
+                'label'         => mt('monitoring', 'Status'),
+                'description'   => mt('monitoring', 'The state this check result should report'),
                 'multiOptions'  => $object->getType() === $object::TYPE_HOST ? array(
-                    ProcessCheckResultCommand::HOST_UP          => $this->translate('UP', 'icinga.state'),
-                    ProcessCheckResultCommand::HOST_DOWN        => $this->translate('DOWN', 'icinga.state'),
-                    ProcessCheckResultCommand::HOST_UNREACHABLE => $this->translate('UNREACHABLE', 'icinga.state')
+                    ProcessCheckResultCommand::HOST_UP          => mt('monitoring', 'UP', 'icinga.state'),
+                    ProcessCheckResultCommand::HOST_DOWN        => mt('monitoring', 'DOWN', 'icinga.state'),
+                    ProcessCheckResultCommand::HOST_UNREACHABLE => mt('monitoring', 'UNREACHABLE', 'icinga.state')
                 ) : array(
-                    ProcessCheckResultCommand::SERVICE_OK       => $this->translate('OK', 'icinga.state'),
-                    ProcessCheckResultCommand::SERVICE_WARNING  => $this->translate('WARNING', 'icinga.state'),
-                    ProcessCheckResultCommand::SERVICE_CRITICAL => $this->translate('CRITICAL', 'icinga.state'),
-                    ProcessCheckResultCommand::SERVICE_UNKNOWN  => $this->translate('UNKNOWN', 'icinga.state')
+                    ProcessCheckResultCommand::SERVICE_OK       => mt('monitoring', 'OK', 'icinga.state'),
+                    ProcessCheckResultCommand::SERVICE_WARNING  => mt('monitoring', 'WARNING', 'icinga.state'),
+                    ProcessCheckResultCommand::SERVICE_CRITICAL => mt('monitoring', 'CRITICAL', 'icinga.state'),
+                    ProcessCheckResultCommand::SERVICE_UNKNOWN  => mt('monitoring', 'UNKNOWN', 'icinga.state')
                 )
             )
         );
@@ -71,8 +72,8 @@ class ProcessCheckResultCommandForm extends ObjectsCommandForm
             'output',
             array(
                 'required'      => true,
-                'label'         => $this->translate('Output'),
-                'description'   => $this->translate('The plugin output of this check result')
+                'label'         => mt('monitoring', 'Output'),
+                'description'   => mt('monitoring', 'The plugin output of this check result')
             )
         );
         $this->addElement(
@@ -80,8 +81,9 @@ class ProcessCheckResultCommandForm extends ObjectsCommandForm
             'perfdata',
             array(
                 'allowEmpty'    => true,
-                'label'         => $this->translate('Performance Data'),
-                'description'   => $this->translate(
+                'label'         => mt('monitoring', 'Performance Data'),
+                'description'   => mt(
+                    'monitoring',
                     'The performance data of this check result. Leave empty'
                     . ' if this check result has no performance data'
                 )
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
index 949ec33e1..82a9b2e52 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
@@ -24,8 +24,9 @@ class ScheduleHostCheckCommandForm extends ScheduleServiceCheckCommandForm
                 'checkbox',
                 'all_services',
                 array(
-                    'label'         => $this->translate('All Services'),
-                    'description'   => $this->translate(
+                    'label'         => mt('monitoring', 'All Services'),
+                    'description'   => mt(
+                        'monitoring',
                         'Schedule check for all services on the hosts and the hosts themselves.'
                     )
                 )
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
index f84069a9a..beb0793ef 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
@@ -27,8 +27,9 @@ class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
                 'checkbox',
                 'all_services',
                 array(
-                    'label'         => $this->translate('All Services'),
-                    'description'   => $this->translate(
+                    'label'         => mt('monitoring', 'All Services'),
+                    'description'   => mt(
+                        'monitoring',
                         'Schedule downtime for all services on the hosts and the hosts themselves.'
                     )
                 )
@@ -37,14 +38,15 @@ class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
                 'select',
                 'child_hosts',
                 array(
-                    'label'        => $this->translate('Child Hosts'),
+                    'label'        => mt('monitoring', 'Child Hosts'),
                     'required'     => true,
                     'multiOptions' => array(
-                        0 => $this->translate('Do nothing with child hosts'),
-                        1 => $this->translate('Schedule triggered downtime for all child hosts'),
-                        2 => $this->translate('Schedule non-triggered downtime for all child hosts')
+                        0 => mt('monitoring', 'Do nothing with child hosts'),
+                        1 => mt('monitoring', 'Schedule triggered downtime for all child hosts'),
+                        2 => mt('monitoring', 'Schedule non-triggered downtime for all child hosts')
                     ),
-                    'description' => $this->translate(
+                    'description' => mt(
+                        'monitoring',
                         'Define what should be done with the child hosts of the hosts.'
                     )
                 )
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
index b34472d49..9e04a2254 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
@@ -32,7 +32,8 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
      */
     public function getHelp()
     {
-        return $this->translate(
+        return mt(
+            'monitoring',
             'This command is used to schedule the next check of hosts or services. Icinga will re-queue the'
             . ' hosts or services to be checked at the time you specify.'
         );
@@ -51,7 +52,8 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
                 'note',
                 'command-info',
                 array(
-                    'value' => $this->translate(
+                    'value' => mt(
+                        'monitoring',
                         'This command is used to schedule the next check of hosts or services. Icinga will re-queue the'
                         . ' hosts or services to be checked at the time you specify.'
                     )
@@ -62,10 +64,8 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
                 'check_time',
                 array(
                     'required'      => true,
-                    'label'         => $this->translate('Check Time'),
-                    'description'   => $this->translate(
-                        'Set the date and time when the check should be scheduled.'
-                    ),
+                    'label'         => mt('monitoring', 'Check Time'),
+                    'description'   => mt('monitoring', 'Set the date and time when the check should be scheduled.'),
                     'value'         => $checkTime
                 )
             ),
@@ -73,8 +73,9 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
                 'checkbox',
                 'force_check',
                 array(
-                    'label'         => $this->translate('Force Check'),
-                    'description'   => $this->translate(
+                    'label'         => mt('monitoring', 'Force Check'),
+                    'description'   => mt(
+                        'monitoring',
                         'If you select this option, Icinga will force a check regardless of both what time the'
                         . ' scheduled check occurs and whether or not checks are enabled.'
                     )
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
index 4f66898f6..9961d4b65 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
@@ -42,7 +42,8 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
      */
     public function getHelp()
     {
-        return $this->translate(
+        return mt(
+            'monitoring',
             'This command is used to schedule host and service downtimes. During the specified downtime,'
             . ' Icinga will not send notifications out about the hosts and services. When the scheduled'
             . ' downtime expires, Icinga will send out notifications for the hosts and services as it'
@@ -66,8 +67,9 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                 'comment',
                 array(
                     'required'      => true,
-                    'label'         => $this->translate('Comment'),
-                    'description'   => $this->translate(
+                    'label'         => mt('monitoring', 'Comment'),
+                    'description'   => mt(
+                        'monitoring',
                         'If you work with other administrators, you may find it useful to share information about the'
                         . ' the host or service that is having problems. Make sure you enter a brief description of'
                         . ' what you are doing.'
@@ -79,8 +81,8 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                 'start',
                 array(
                     'required'      => true,
-                    'label'         => $this->translate('Start Time'),
-                    'description'   => $this->translate('Set the start date and time for the downtime.'),
+                    'label'         => mt('monitoring', 'Start Time'),
+                    'description'   => mt('monitoring', 'Set the start date and time for the downtime.'),
                     'value'         => $start
                 )
             ),
@@ -89,8 +91,8 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                 'end',
                 array(
                     'required'      => true,
-                    'label'         => $this->translate('End Time'),
-                    'description'   => $this->translate('Set the end date and time for the downtime.'),
+                    'label'         => mt('monitoring', 'End Time'),
+                    'description'   => mt('monitoring', 'Set the end date and time for the downtime.'),
                     'value'         => $end
                 )
             ),
@@ -100,16 +102,17 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                 array(
                     'required'      => true,
                     'autosubmit'    => true,
-                    'label'         => $this->translate('Type'),
-                    'description'   => $this->translate(
+                    'label'         => mt('monitoring', 'Type'),
+                    'description'   => mt(
+                        'monitoring',
                         'If you select the fixed option, the downtime will be in effect between the start and end'
                         . ' times you specify whereas a flexible downtime starts when the host or service enters a'
                         . ' problem state sometime between the start and end times you specified and lasts as long'
                         . ' as the duration time you enter. The duration fields do not apply for fixed downtimes.'
                     ),
                     'multiOptions' => array(
-                        self::FIXED     => $this->translate('Fixed'),
-                        self::FLEXIBLE  => $this->translate('Flexible')
+                        self::FIXED     => mt('monitoring', 'Fixed'),
+                        self::FLEXIBLE  => mt('monitoring', 'Flexible')
                     ),
                     'validators' => array(
                         array(
@@ -138,7 +141,7 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                     'hours',
                     array(
                         'required'  => true,
-                        'label'     => $this->translate('Hours'),
+                        'label'     => mt('monitoring', 'Hours'),
                         'value'     => 2,
                         'min'       => -1
                     )
@@ -148,7 +151,7 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                     'minutes',
                     array(
                         'required'  => true,
-                        'label'     => $this->translate('Minutes'),
+                        'label'     => mt('monitoring', 'Minutes'),
                         'value'     => 0,
                         'min'       => -1
                     )
@@ -158,8 +161,9 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                 array('hours', 'minutes'),
                 'duration',
                 array(
-                    'legend'        => $this->translate('Flexible Duration'),
-                    'description'   => $this->translate(
+                    'legend'        => mt('monitoring', 'Flexible Duration'),
+                    'description'   => mt(
+                        'monitoring',
                         'Enter here the duration of the downtime. The downtime will be automatically deleted after this'
                         . ' time expired.'
                     ),
diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
index bf0a1d8b1..c33527895 100644
--- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
@@ -33,7 +33,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_ACTIVE_CHECKS,
                 array(
-                    'label'         => $this->translate('Active Checks'),
+                    'label'         => mt('monitoring', 'Active Checks'),
                     'autosubmit'    => true
                 )
             ),
@@ -41,7 +41,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_PASSIVE_CHECKS,
                 array(
-                    'label'         => $this->translate('Passive Checks'),
+                    'label'         => mt('monitoring', 'Passive Checks'),
                     'autosubmit'    => true
                 )
             ),
@@ -49,7 +49,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_OBSESSING,
                 array(
-                    'label'         => $this->translate('Obsessing'),
+                    'label'         => mt('monitoring', 'Obsessing'),
                     'autosubmit'    => true
                 )
             ),
@@ -57,7 +57,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_NOTIFICATIONS,
                 array(
-                    'label'         => $this->translate('Notifications'),
+                    'label'         => mt('monitoring', 'Notifications'),
                     'autosubmit'    => true
                 )
             ),
@@ -65,7 +65,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_EVENT_HANDLER,
                 array(
-                    'label'         => $this->translate('Event Handler'),
+                    'label'         => mt('monitoring', 'Event Handler'),
                     'autosubmit'    => true
                 )
             ),
@@ -73,7 +73,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_FLAP_DETECTION,
                 array(
-                    'label'         => $this->translate('Flap Detection'),
+                    'label'         => mt('monitoring', 'Flap Detection'),
                     'autosubmit'    => true
                 )
             )
@@ -95,7 +95,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
             $element = $this->getElement($feature);
             $element->setChecked($object->{$feature});
             if ((bool) $object->{$feature . '_changed'} === true) {
-                $element->setDescription($this->translate('changed'));
+                $element->setDescription(mt('monitoring', 'changed'));
             }
         }
         return $this;
@@ -120,7 +120,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 }
             }
         }
-        Notification::success($this->translate('Toggling feature..'));
+        Notification::success(mt('monitoring', 'Toggling feature..'));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
index 405bac144..daabe7e02 100644
--- a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
@@ -28,9 +28,9 @@ class LocalInstanceForm extends Form
             'path',
             array(
                 'required'      => true,
-                'label'         => $this->translate('Command File'),
+                'label'         => mt('monitoring', 'Command File'),
                 'value'         => '/var/run/icinga2/cmd/icinga2.cmd',
-                'description'   => $this->translate('Path to the local Icinga command file')
+                'description'   => mt('monitoring', 'Path to the local Icinga command file')
             )
         );
         return $this;
diff --git a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
index 47b2a0316..7c55f655a 100644
--- a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
@@ -29,8 +29,8 @@ class RemoteInstanceForm extends Form
                 'host',
                 array(
                     'required'      => true,
-                    'label'         => $this->translate('Host'),
-                    'description'   => $this->translate(
+                    'label'         => mt('monitoring', 'Host'),
+                    'description'   => mt('monitoring',
                         'Hostname or address of the remote Icinga instance'
                     )
                 )
@@ -40,8 +40,8 @@ class RemoteInstanceForm extends Form
                 'port',
                 array(
                     'required'      => true,
-                    'label'         => $this->translate('Port'),
-                    'description'   => $this->translate('SSH port to connect to on the remote Icinga instance'),
+                    'label'         => mt('monitoring', 'Port'),
+                    'description'   => mt('monitoring', 'SSH port to connect to on the remote Icinga instance'),
                     'value'         => 22
                 )
             ),
@@ -50,8 +50,8 @@ class RemoteInstanceForm extends Form
                 'user',
                 array(
                     'required'      => true,
-                    'label'         => $this->translate('User'),
-                    'description'   => $this->translate(
+                    'label'         => mt('monitoring', 'User'),
+                    'description'   => mt('monitoring',
                         'User to log in as on the remote Icinga instance. Please note that key-based SSH login must be'
                         . ' possible for this user'
                     )
@@ -62,9 +62,9 @@ class RemoteInstanceForm extends Form
                 'path',
                 array(
                     'required'      => true,
-                    'label'         => $this->translate('Command File'),
+                    'label'         => mt('monitoring', 'Command File'),
                     'value'         => '/var/run/icinga2/cmd/icinga2.cmd',
-                    'description'   => $this->translate('Path to the Icinga command file on the remote Icinga instance')
+                    'description'   => mt('monitoring', 'Path to the Icinga command file on the remote Icinga instance')
                 )
             )
         ));
diff --git a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceKeyResourcePage.php b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceKeyResourcePage.php
deleted file mode 100644
index 454c67d47..000000000
--- a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceKeyResourcePage.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Icinga\Module\Monitoring\Forms\Config\Instance;
-
-use Icinga\Web\Form;
-use Icinga\Web\Wizard;
-use Icinga\Web\WizardPage;
-
-class RemoteInstanceKeyResourcePage extends Form implements WizardPage
-{
-    public function onRequest()
-    {
-        
-    }
-
-    public function onSuccess()
-    {
-        
-    }
-
-    public function createElements(array $formData)
-    {
-        
-    }
-
-    public function setup(Wizard $wizard)
-    {
-        
-    }
-
-    public function isRequired(Wizard $wizard)
-    {
-        return true;
-    }
-
-    public function addNextButton($pageName)
-    {
-        $this->addElement(
-            'button',
-            Wizard::BTN_NEXT,
-            array(
-                'type'          => 'submit',
-                'value'         => $pageName,
-                'label'         => $this->translate('Save Changes'),
-                'decorators'    => array('ViewHelper')
-            )
-        );
-    }
-
-    public function addPreviousButton($pageName)
-    {
-        
-    }
-}
diff --git a/modules/monitoring/application/forms/Config/InstanceConfigForm.php b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
index 5618f27ee..b89e48c0a 100644
--- a/modules/monitoring/application/forms/Config/InstanceConfigForm.php
+++ b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
@@ -25,7 +25,7 @@ class InstanceConfigForm extends ConfigForm
     public function init()
     {
         $this->setName('form_config_monitoring_instance');
-        $this->setSubmitLabel($this->translate('Save Changes'));
+        $this->setSubmitLabel(mt('monitoring', 'Save Changes'));
     }
 
     /**
@@ -48,7 +48,7 @@ class InstanceConfigForm extends ConfigForm
                 break;
             default:
                 throw new InvalidArgumentException(
-                    sprintf($this->translate('Invalid instance type "%s" given'), $type)
+                    sprintf(mt('monitoring', 'Invalid instance type "%s" given'), $type)
                 );
         }
         return $form;
@@ -69,10 +69,10 @@ class InstanceConfigForm extends ConfigForm
     {
         $name = isset($values['name']) ? $values['name'] : '';
         if (! $name) {
-            throw new InvalidArgumentException($this->translate('Instance name missing'));
+            throw new InvalidArgumentException(mt('monitoring', 'Instance name missing'));
         }
         if ($this->config->hasSection($name)) {
-            throw new InvalidArgumentException($this->translate('Instance already exists'));
+            throw new InvalidArgumentException(mt('monitoring', 'Instance already exists'));
         }
 
         unset($values['name']);
@@ -93,11 +93,11 @@ class InstanceConfigForm extends ConfigForm
     public function edit($name, array $values)
     {
         if (! $name) {
-            throw new InvalidArgumentException($this->translate('Old instance name missing'));
+            throw new InvalidArgumentException(mt('monitoring', 'Old instance name missing'));
         } elseif (! ($newName = isset($values['name']) ? $values['name'] : '')) {
-            throw new InvalidArgumentException($this->translate('New instance name missing'));
+            throw new InvalidArgumentException(mt('monitoring', 'New instance name missing'));
         } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException($this->translate('Unknown instance name provided'));
+            throw new InvalidArgumentException(mt('monitoring', 'Unknown instance name provided'));
         }
 
         unset($values['name']);
@@ -117,9 +117,9 @@ class InstanceConfigForm extends ConfigForm
     public function remove($name)
     {
         if (! $name) {
-            throw new InvalidArgumentException($this->translate('Instance name missing'));
+            throw new InvalidArgumentException(mt('monitoring', 'Instance name missing'));
         } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException($this->translate('Unknown instance name provided'));
+            throw new InvalidArgumentException(mt('monitoring', 'Unknown instance name provided'));
         }
 
         $instanceConfig = $this->config->getSection($name);
@@ -136,10 +136,10 @@ class InstanceConfigForm extends ConfigForm
         $instanceName = $this->request->getQuery('instance');
         if ($instanceName !== null) {
             if (! $instanceName) {
-                throw new ConfigurationError($this->translate('Instance name missing'));
+                throw new ConfigurationError(mt('monitoring', 'Instance name missing'));
             }
             if (! $this->config->hasSection($instanceName)) {
-                throw new ConfigurationError($this->translate('Unknown instance name given'));
+                throw new ConfigurationError(mt('monitoring', 'Unknown instance name given'));
             }
 
             $instanceConfig = $this->config->getSection($instanceName)->toArray();
@@ -158,10 +158,10 @@ class InstanceConfigForm extends ConfigForm
         try {
             if ($instanceName === null) { // create new instance
                 $this->add($this->getValues());
-                $message = $this->translate('Instance "%s" created successfully.');
+                $message = mt('monitoring', 'Instance "%s" created successfully.');
             } else { // edit existing instance
                 $this->edit($instanceName, $this->getValues());
-                $message = $this->translate('Instance "%s" edited successfully.');
+                $message = mt('monitoring', 'Instance "%s" edited successfully.');
             }
         } catch (InvalidArgumentException $e) {
             Notification::error($e->getMessage());
@@ -189,7 +189,7 @@ class InstanceConfigForm extends ConfigForm
                 'name',
                 array(
                     'required'  => true,
-                    'label'     => $this->translate('Instance Name')
+                    'label'     => mt('monitoring', 'Instance Name')
                 )
             ),
             array(
@@ -198,10 +198,10 @@ class InstanceConfigForm extends ConfigForm
                 array(
                     'required'      => true,
                     'autosubmit'    => true,
-                    'label'         => $this->translate('Instance Type'),
+                    'label'         => mt('monitoring', 'Instance Type'),
                     'multiOptions'  => array(
-                        LocalCommandFile::TRANSPORT     => $this->translate('Local Command File'),
-                        RemoteCommandFile::TRANSPORT    => $this->translate('Remote Command File')
+                        LocalCommandFile::TRANSPORT     => mt('monitoring', 'Local Command File'),
+                        RemoteCommandFile::TRANSPORT    => mt('monitoring', 'Remote Command File')
                     ),
                     'value' => $instanceType
                 )
diff --git a/modules/monitoring/application/forms/Config/SecurityConfigForm.php b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
index b202f5938..40c0b7b8c 100644
--- a/modules/monitoring/application/forms/Config/SecurityConfigForm.php
+++ b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
@@ -18,7 +18,7 @@ class SecurityConfigForm extends ConfigForm
     public function init()
     {
         $this->setName('form_config_monitoring_security');
-        $this->setSubmitLabel($this->translate('Save Changes'));
+        $this->setSubmitLabel(mt('monitoring', 'Save Changes'));
     }
 
     /**
@@ -29,7 +29,7 @@ class SecurityConfigForm extends ConfigForm
         $this->config->setSection('security', $this->getValues());
 
         if ($this->save()) {
-            Notification::success($this->translate('New security configuration has successfully been stored'));
+            Notification::success(mt('monitoring', 'New security configuration has successfully been stored'));
         } else {
             return false;
         }
@@ -54,8 +54,8 @@ class SecurityConfigForm extends ConfigForm
             array(
                 'allowEmpty'    => true,
                 'value'         => '*pw*,*pass*,community',
-                'label'         => $this->translate('Protected Custom Variables'),
-                'description'   => $this->translate(
+                'label'         => mt('monitoring', 'Protected Custom Variables'),
+                'description'   => mt('monitoring',
                     'Comma separated case insensitive list of protected custom variables.'
                     . ' Use * as a placeholder for zero or more wildcard characters.'
                     . ' Existance of those custom variables will be shown, but their values will be masked.'
diff --git a/modules/monitoring/application/forms/EventOverviewForm.php b/modules/monitoring/application/forms/EventOverviewForm.php
index dc697b940..25d268f76 100644
--- a/modules/monitoring/application/forms/EventOverviewForm.php
+++ b/modules/monitoring/application/forms/EventOverviewForm.php
@@ -44,7 +44,7 @@ class EventOverviewForm extends Form
             'checkbox',
             'statechange',
             array(
-                'label' => $this->translate('State Changes'),
+                'label' => t('State Changes'),
                 'class' => 'autosubmit',
                 'decorators' => $decorators,
                 'value' => strpos($url, $this->stateChangeFilter()->toQueryString()) === false ? 0 : 1
@@ -54,7 +54,7 @@ class EventOverviewForm extends Form
             'checkbox',
             'downtime',
             array(
-                'label' => $this->translate('Downtimes'),
+                'label' => t('Downtimes'),
                 'class' => 'autosubmit',
                 'decorators' => $decorators,
                 'value' => strpos($url, $this->downtimeFilter()->toQueryString()) === false ? 0 : 1
@@ -64,7 +64,7 @@ class EventOverviewForm extends Form
             'checkbox',
             'comment',
             array(
-                'label' => $this->translate('Comments'),
+                'label' => t('Comments'),
                 'class' => 'autosubmit',
                 'decorators' => $decorators,
                 'value' => strpos($url, $this->commentFilter()->toQueryString()) === false ? 0 : 1
@@ -74,7 +74,7 @@ class EventOverviewForm extends Form
             'checkbox',
             'notification',
             array(
-                'label' => $this->translate('Notifications'),
+                'label' => t('Notifications'),
                 'class' => 'autosubmit',
                 'decorators' => $decorators,
                 'value' => strpos($url, $this->notificationFilter()->toQueryString()) === false ? 0 : 1
@@ -84,7 +84,7 @@ class EventOverviewForm extends Form
             'checkbox',
             'flapping',
             array(
-                'label' => $this->translate('Flapping'),
+                'label' => t('Flapping'),
                 'class' => 'autosubmit',
                 'decorators' => $decorators,
                 'value' => strpos($url, $this->flappingFilter()->toQueryString()) === false ? 0 : 1
diff --git a/modules/monitoring/application/forms/Setup/BackendPage.php b/modules/monitoring/application/forms/Setup/BackendPage.php
index b5ab2ffd6..1f6ef6894 100644
--- a/modules/monitoring/application/forms/Setup/BackendPage.php
+++ b/modules/monitoring/application/forms/Setup/BackendPage.php
@@ -20,7 +20,7 @@ class BackendPage extends Form
             'note',
             'title',
             array(
-                'value'         => $this->translate('Monitoring Backend', 'setup.page.title'),
+                'value'         => mt('monitoring', 'Monitoring Backend', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -31,7 +31,8 @@ class BackendPage extends Form
             'note',
             'description',
             array(
-                'value' => $this->translate(
+                'value' => mt(
+                    'monitoring',
                     'Please configure below how Icinga Web 2 should retrieve monitoring information.'
                 )
             )
@@ -43,8 +44,8 @@ class BackendPage extends Form
             array(
                 'required'      => true,
                 'value'         => 'icinga',
-                'label'         => $this->translate('Backend Name'),
-                'description'   => $this->translate('The identifier of this backend')
+                'label'         => mt('monitoring', 'Backend Name'),
+                'description'   => mt('monitoring', 'The identifier of this backend')
             )
         );
 
@@ -59,10 +60,8 @@ class BackendPage extends Form
             'type',
             array(
                 'required'      => true,
-                'label'         => $this->translate('Backend Type'),
-                'description'   => $this->translate(
-                    'The data source used for retrieving monitoring information'
-                ),
+                'label'         => mt('monitoring', 'Backend Type'),
+                'description'   => mt('monitoring', 'The data source used for retrieving monitoring information'),
                 'multiOptions'  => $resourceTypes
             )
         );
diff --git a/modules/monitoring/application/forms/Setup/IdoResourcePage.php b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
index c28b52e6b..189d65fea 100644
--- a/modules/monitoring/application/forms/Setup/IdoResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
@@ -28,7 +28,7 @@ class IdoResourcePage extends Form
             'note',
             'title',
             array(
-                'value'         => $this->translate('Monitoring IDO Resource', 'setup.page.title'),
+                'value'         => mt('monitoring', 'Monitoring IDO Resource', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -39,7 +39,8 @@ class IdoResourcePage extends Form
             'note',
             'description',
             array(
-                'value' => $this->translate(
+                'value' => mt(
+                    'monitoring',
                     'Please fill out the connection details below to access'
                     . ' the IDO database of your monitoring environment.'
                 )
@@ -90,10 +91,8 @@ class IdoResourcePage extends Form
             'skip_validation',
             array(
                 'required'      => true,
-                'label'         => $this->translate('Skip Validation'),
-                'description'   => $this->translate(
-                    'Check this to not to validate connectivity with the given database server'
-                )
+                'label'         => t('Skip Validation'),
+                'description'   => t('Check this to not to validate connectivity with the given database server')
             )
         );
     }
diff --git a/modules/monitoring/application/forms/Setup/InstancePage.php b/modules/monitoring/application/forms/Setup/InstancePage.php
index 8f151554d..dccfd1d91 100644
--- a/modules/monitoring/application/forms/Setup/InstancePage.php
+++ b/modules/monitoring/application/forms/Setup/InstancePage.php
@@ -20,7 +20,7 @@ class InstancePage extends Form
             'note',
             'title',
             array(
-                'value'         => $this->translate('Monitoring Instance', 'setup.page.title'),
+                'value'         => mt('monitoring', 'Monitoring Instance', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -31,7 +31,8 @@ class InstancePage extends Form
             'note',
             'description',
             array(
-                'value' => $this->translate(
+                'value' => mt(
+                    'monitoring',
                     'Please define the settings specific to your monitoring instance below.'
                 )
             )
diff --git a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
index 245d2abcc..4faa17416 100644
--- a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
@@ -28,7 +28,7 @@ class LivestatusResourcePage extends Form
             'note',
             'title',
             array(
-                'value'         => $this->translate('Monitoring Livestatus Resource', 'setup.page.title'),
+                'value'         => mt('monitoring', 'Monitoring Livestatus Resource', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -39,7 +39,8 @@ class LivestatusResourcePage extends Form
             'note',
             'description',
             array(
-                'value' => $this->translate(
+                'value' => mt(
+                    'monitoring',
                     'Please fill out the connection details below to access the Livestatus'
                     . ' socket interface for your monitoring environment.'
                 )
@@ -90,10 +91,8 @@ class LivestatusResourcePage extends Form
             'skip_validation',
             array(
                 'required'      => true,
-                'label'         => $this->translate('Skip Validation'),
-                'description'   => $this->translate(
-                    'Check this to not to validate connectivity with the given Livestatus socket'
-                )
+                'label'         => t('Skip Validation'),
+                'description'   => t('Check this to not to validate connectivity with the given Livestatus socket')
             )
         );
     }
diff --git a/modules/monitoring/application/forms/Setup/SecurityPage.php b/modules/monitoring/application/forms/Setup/SecurityPage.php
index ba8083e50..0c7d3d1de 100644
--- a/modules/monitoring/application/forms/Setup/SecurityPage.php
+++ b/modules/monitoring/application/forms/Setup/SecurityPage.php
@@ -20,7 +20,7 @@ class SecurityPage extends Form
             'note',
             'title',
             array(
-                'value'         => $this->translate('Monitoring Security', 'setup.page.title'),
+                'value'         => mt('monitoring', 'Monitoring Security', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -31,7 +31,8 @@ class SecurityPage extends Form
             'note',
             'description',
             array(
-                'value' => $this->translate(
+                'value' => mt(
+                    'monitoring',
                     'To protect your monitoring environment against prying eyes please fill out the settings below.'
                 )
             )
diff --git a/modules/monitoring/application/forms/Setup/WelcomePage.php b/modules/monitoring/application/forms/Setup/WelcomePage.php
index f79eb6c62..d910e2e01 100644
--- a/modules/monitoring/application/forms/Setup/WelcomePage.php
+++ b/modules/monitoring/application/forms/Setup/WelcomePage.php
@@ -19,7 +19,10 @@ class WelcomePage extends Form
             'note',
             'welcome',
             array(
-                'value' => $this->translate('Welcome to the configuration of the monitoring module for Icinga Web 2!'),
+                'value' => mt(
+                    'monitoring',
+                    'Welcome to the configuration of the monitoring module for Icinga Web 2!'
+                ),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -31,7 +34,7 @@ class WelcomePage extends Form
             'note',
             'core_hint',
             array(
-                'value' => $this->translate('This is the core module for Icinga Web 2.')
+                'value' => mt('monitoring', 'This is the core module for Icinga Web 2.')
             )
         );
 
@@ -39,7 +42,8 @@ class WelcomePage extends Form
             'note',
             'description',
             array(
-                'value' => $this->translate(
+                'value' => mt(
+                    'monitoring',
                     'It offers various status and reporting views with powerful filter capabilities that allow'
                     . ' you to keep track of the most important events in your monitoring environment.'
                 )
diff --git a/modules/monitoring/application/forms/StatehistoryForm.php b/modules/monitoring/application/forms/StatehistoryForm.php
index d859f5815..9fa1bdc26 100644
--- a/modules/monitoring/application/forms/StatehistoryForm.php
+++ b/modules/monitoring/application/forms/StatehistoryForm.php
@@ -19,7 +19,7 @@ class StatehistoryForm extends Form
     public function init()
     {
         $this->setName('form_event_overview');
-        $this->setSubmitLabel($this->translate('Apply'));
+        $this->setSubmitLabel(mt('monitoring', 'Apply'));
     }
 
     /**
@@ -65,14 +65,14 @@ class StatehistoryForm extends Form
             'select',
             'from',
             array(
-                'label' => $this->translate('From'),
+                'label' => mt('monitoring', 'From'),
                 'value' => $this->getRequest()->getParam('from', strtotime('3 months ago')),
                 'multiOptions' => array(
-                    strtotime('midnight 3 months ago') => $this->translate('3 Months'),
-                    strtotime('midnight 4 months ago') => $this->translate('4 Months'),
-                    strtotime('midnight 8 months ago') => $this->translate('8 Months'),
-                    strtotime('midnight 12 months ago') => $this->translate('1 Year'),
-                    strtotime('midnight 24 months ago') => $this->translate('2 Years')
+                    strtotime('midnight 3 months ago') => mt('monitoring', '3 Months'),
+                    strtotime('midnight 4 months ago') => mt('monitoring', '4 Months'),
+                    strtotime('midnight 8 months ago') => mt('monitoring', '8 Months'),
+                    strtotime('midnight 12 months ago') => mt('monitoring', '1 Year'),
+                    strtotime('midnight 24 months ago') => mt('monitoring', '2 Years')
                 ),
                 'class' => 'autosubmit'
             )
@@ -81,10 +81,10 @@ class StatehistoryForm extends Form
             'select',
             'to',
             array(
-                'label' => $this->translate('To'),
+                'label' => mt('monitoring', 'To'),
                 'value' => $this->getRequest()->getParam('to', time()),
                 'multiOptions' => array(
-                    time() => $this->translate('Today')
+                    time() => mt('monitoring', 'Today')
                 ),
                 'class' => 'autosubmit'
             )
@@ -95,11 +95,11 @@ class StatehistoryForm extends Form
             'select',
             'objecttype',
             array(
-                'label' => $this->translate('Object type'),
+                'label' => mt('monitoring', 'Object type'),
                 'value' => $objectType,
                 'multiOptions' => array(
-                    'services' => $this->translate('Services'),
-                    'hosts' => $this->translate('Hosts')
+                    'services' => mt('monitoring', 'Services'),
+                    'hosts' => mt('monitoring', 'Hosts')
                 ),
                 'class' => 'autosubmit'
             )
@@ -113,13 +113,13 @@ class StatehistoryForm extends Form
                 'select',
                 'state',
                 array(
-                    'label' => $this->translate('State'),
+                    'label' => mt('monitoring', 'State'),
                     'value' => $serviceState,
                     'multiOptions' => array(
-                        'cnt_critical_hard' => $this->translate('Critical'),
-                        'cnt_warning_hard' => $this->translate('Warning'),
-                        'cnt_unknown_hard' => $this->translate('Unknown'),
-                        'cnt_ok' => $this->translate('Ok')
+                        'cnt_critical_hard' => mt('monitoring', 'Critical'),
+                        'cnt_warning_hard' => mt('monitoring', 'Warning'),
+                        'cnt_unknown_hard' => mt('monitoring', 'Unknown'),
+                        'cnt_ok' => mt('monitoring', 'Ok')
                     ),
                     'class' => 'autosubmit'
                 )
@@ -133,12 +133,12 @@ class StatehistoryForm extends Form
                 'select',
                 'state',
                 array(
-                    'label' => $this->translate('State'),
+                    'label' => mt('monitoring', 'State'),
                     'value' => $hostState,
                     'multiOptions' =>  array(
-                        'cnt_up' => $this->translate('Up'),
-                        'cnt_down_hard' => $this->translate('Down'),
-                        'cnt_unreachable_hard' => $this->translate('Unreachable')
+                        'cnt_up' => mt('monitoring', 'Up'),
+                        'cnt_down_hard' => mt('monitoring', 'Down'),
+                        'cnt_unreachable_hard' => mt('monitoring', 'Unreachable')
                     ),
                     'class' => 'autosubmit'
                 )

From 7082ebaf7beb8d27db0f304b84ac728d1934d30f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 19 Jan 2015 13:47:01 +0100
Subject: [PATCH 0205/2920] Replace t() and mt() with translate() in the
 monitoring module's forms

refs #7551
---
 .../DisableNotificationsExpireCommandForm.php | 11 +++--
 .../ToggleInstanceFeaturesCommandForm.php     | 28 ++++++-------
 .../Object/AcknowledgeProblemCommandForm.php  | 34 +++++++--------
 .../Command/Object/AddCommentCommandForm.php  | 13 +++---
 .../Command/Object/CheckNowCommandForm.php    |  4 +-
 .../Object/DeleteCommentCommandForm.php       |  4 +-
 .../Object/DeleteDowntimeCommandForm.php      |  4 +-
 .../Object/ProcessCheckResultCommandForm.php  | 30 +++++++------
 .../Object/ScheduleHostCheckCommandForm.php   |  5 +--
 .../ScheduleHostDowntimeCommandForm.php       | 16 ++++---
 .../ScheduleServiceCheckCommandForm.php       | 17 ++++----
 .../ScheduleServiceDowntimeCommandForm.php    | 34 +++++++--------
 .../ToggleObjectFeaturesCommandForm.php       | 16 +++----
 .../Config/Instance/LocalInstanceForm.php     |  4 +-
 .../Config/Instance/RemoteInstanceForm.php    | 16 +++----
 .../forms/Config/InstanceConfigForm.php       | 34 +++++++--------
 .../forms/Config/SecurityConfigForm.php       |  8 ++--
 .../application/forms/EventOverviewForm.php   | 10 ++---
 .../application/forms/Setup/BackendPage.php   | 15 +++----
 .../forms/Setup/IdoResourcePage.php           | 11 ++---
 .../application/forms/Setup/InstancePage.php  |  5 +--
 .../forms/Setup/LivestatusResourcePage.php    | 11 ++---
 .../application/forms/Setup/SecurityPage.php  |  5 +--
 .../application/forms/Setup/WelcomePage.php   | 10 ++---
 .../application/forms/StatehistoryForm.php    | 42 +++++++++----------
 25 files changed, 183 insertions(+), 204 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
index 0e64a4b03..21d926b58 100644
--- a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
@@ -21,7 +21,7 @@ class DisableNotificationsExpireCommandForm extends CommandForm
      */
     public function init()
     {
-        $this->setSubmitLabel(mt('monitoring', 'Disable Notifications'));
+        $this->setSubmitLabel($this->translate('Disable Notifications'));
     }
 
     /**
@@ -30,8 +30,7 @@ class DisableNotificationsExpireCommandForm extends CommandForm
      */
     public function getHelp()
     {
-        return mt(
-            'monitoring',
+        return $this->translate(
             'This command is used to disable host and service notifications for a specific time.'
         );
     }
@@ -49,8 +48,8 @@ class DisableNotificationsExpireCommandForm extends CommandForm
             'expire_time',
             array(
                 'required'      => true,
-                'label'         => mt('monitoring', 'Expire Time'),
-                'description'   => mt('monitoring', 'Set the expire time.'),
+                'label'         => $this->translate('Expire Time'),
+                'description'   => $this->translate('Set the expire time.'),
                 'value'         => $expireTime
             )
         );
@@ -67,7 +66,7 @@ class DisableNotificationsExpireCommandForm extends CommandForm
         $disableNotifications
             ->setExpireTime($this->getElement('expire_time')->getValue()->getTimestamp());
         $this->getTransport($this->request)->send($disableNotifications);
-        Notification::success(mt('monitoring', 'Disabling host and service notifications..'));
+        Notification::success($this->translate('Disabling host and service notifications..'));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index 291619b2f..469c1b6eb 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -61,13 +61,13 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
         if ((bool) $this->status->notifications_enabled) {
             $notificationDescription = sprintf(
                 '<a title="%s" href="%s" data-base-target="_next">%s</a>',
-                mt('monitoring', 'Disable notifications for a specific time on a program-wide basis'),
+                $this->translate('Disable notifications for a specific time on a program-wide basis'),
                 $this->getView()->href('monitoring/process/disable-notifications'),
-                mt('monitoring', 'Disable temporarily')
+                $this->translate('Disable temporarily')
             );
         } elseif ($this->status->disable_notif_expire_time) {
             $notificationDescription = sprintf(
-                mt('monitoring', 'Notifications will be re-enabled in <strong>%s</strong>'),
+                $this->translate('Notifications will be re-enabled in <strong>%s</strong>'),
                 $this->getView()->timeUntil($this->status->disable_notif_expire_time)
             );
         } else {
@@ -78,7 +78,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_ACTIVE_HOST_CHECKS,
                 array(
-                    'label'         =>  mt('monitoring', 'Active Host Checks Being Executed'),
+                    'label'         =>  $this->translate('Active Host Checks Being Executed'),
                     'autosubmit'    => true
                 )
             ),
@@ -86,7 +86,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_ACTIVE_SERVICE_CHECKS,
                 array(
-                    'label'         =>  mt('monitoring', 'Active Service Checks Being Executed'),
+                    'label'         =>  $this->translate('Active Service Checks Being Executed'),
                     'autosubmit'    => true
                 )
             ),
@@ -94,7 +94,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_EVENT_HANDLERS,
                 array(
-                    'label'         => mt('monitoring', 'Event Handlers Enabled'),
+                    'label'         => $this->translate('Event Handlers Enabled'),
                     'autosubmit'    => true
                 )
             ),
@@ -102,7 +102,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_FLAP_DETECTION,
                 array(
-                    'label'         => mt('monitoring', 'Flap Detection Enabled'),
+                    'label'         => $this->translate('Flap Detection Enabled'),
                     'autosubmit'    => true
                 )
             ),
@@ -110,7 +110,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_NOTIFICATIONS,
                 array(
-                    'label'         => mt('monitoring', 'Notifications Enabled'),
+                    'label'         => $this->translate('Notifications Enabled'),
                     'autosubmit'    => true,
                     'description'   => $notificationDescription,
                     'decorators'    => array(
@@ -129,7 +129,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_HOST_OBSESSING,
                 array(
-                    'label'         => mt('monitoring', 'Obsessing Over Hosts'),
+                    'label'         => $this->translate('Obsessing Over Hosts'),
                     'autosubmit'    => true
                 )
             ),
@@ -137,7 +137,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_SERVICE_OBSESSING,
                 array(
-                    'label'         => mt('monitoring', 'Obsessing Over Services'),
+                    'label'         => $this->translate('Obsessing Over Services'),
                     'autosubmit'    => true
                 )
             ),
@@ -145,7 +145,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_PASSIVE_HOST_CHECKS,
                 array(
-                    'label'         =>  mt('monitoring', 'Passive Host Checks Being Accepted'),
+                    'label'         =>  $this->translate('Passive Host Checks Being Accepted'),
                     'autosubmit'    => true
                 )
             ),
@@ -153,7 +153,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_PASSIVE_SERVICE_CHECKS,
                 array(
-                    'label'         =>  mt('monitoring', 'Passive Service Checks Being Accepted'),
+                    'label'         =>  $this->translate('Passive Service Checks Being Accepted'),
                     'autosubmit'    => true
                 )
             ),
@@ -161,7 +161,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_PERFORMANCE_DATA,
                 array(
-                    'label'         =>  mt('monitoring', 'Performance Data Being Processed'),
+                    'label'         =>  $this->translate('Performance Data Being Processed'),
                     'autosubmit'    => true
                 )
             )
@@ -198,7 +198,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 ->setEnabled($enabled);
             $this->getTransport($this->request)->send($toggleFeature);
         }
-        Notification::success(mt('monitoring', 'Toggling feature..'));
+        Notification::success($this->translate('Toggling feature..'));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
index 25ac76c25..df3731837 100644
--- a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
@@ -31,8 +31,7 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
      */
     public function getHelp()
     {
-        return mt(
-            'monitoring',
+        return $this->translate(
             'This command is used to acknowledge host or service problems. When a problem is acknowledged,'
             . ' future notifications about problems are temporarily disabled until the host or service'
             . ' recovers.'
@@ -51,9 +50,8 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 'comment',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'Comment'),
-                    'description'   => mt(
-                        'monitoring',
+                    'label'         => $this->translate('Comment'),
+                    'description'   => $this->translate(
                         'If you work with other administrators, you may find it useful to share information about the'
                         . ' the host or service that is having problems. Make sure you enter a brief description of'
                         . ' what you are doing.'
@@ -64,9 +62,8 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 'checkbox',
                 'persistent',
                 array(
-                    'label'         => mt('monitoring', 'Persistent Comment'),
-                    'description'   => mt(
-                        'monitoring',
+                    'label'         => $this->translate('Persistent Comment'),
+                    'description'   => $this->translate(
                         'If you would like the comment to remain even when the acknowledgement is removed, check this'
                         . ' option.'
                     )
@@ -76,8 +73,10 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 'checkbox',
                 'expire',
                 array(
-                    'label'         => mt('monitoring', 'Use Expire Time'),
-                    'description'   => mt('monitoring', 'If the acknowledgement should expire, check this option.'),
+                    'label'         => $this->translate('Use Expire Time'),
+                    'description'   => $this->translate(
+                        'If the acknowledgement should expire, check this option.'
+                    ),
                     'autosubmit'    => true
                 )
             )
@@ -89,10 +88,9 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 'dateTimePicker',
                 'expire_time',
                 array(
-                    'label'         => mt('monitoring', 'Expire Time'),
+                    'label'         => $this->translate('Expire Time'),
                     'value'         => $expireTime,
-                    'description'   => mt(
-                        'monitoring',
+                    'description'   => $this->translate(
                         'Enter the expire date and time for this acknowledgement here. Icinga will delete the'
                         . ' acknowledgement after this time expired.'
                     )
@@ -114,10 +112,9 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 'checkbox',
                 'sticky',
                 array(
-                    'label'         => mt('monitoring', 'Sticky Acknowledgement'),
+                    'label'         => $this->translate('Sticky Acknowledgement'),
                     'value'         => true,
-                    'description'   => mt(
-                        'monitoring',
+                    'description'   => $this->translate(
                         'If you want the acknowledgement to disable notifications until the host or service recovers,'
                         . ' check this option.'
                     )
@@ -127,10 +124,9 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
                 'checkbox',
                 'notify',
                 array(
-                    'label'         => mt('monitoring', 'Send Notification'),
+                    'label'         => $this->translate('Send Notification'),
                     'value'         => true,
-                    'description'   => mt(
-                        'monitoring',
+                    'description'   => $this->translate(
                         'If you do not want an acknowledgement notification to be sent out to the appropriate contacts,'
                         . ' uncheck this option.'
                     )
diff --git a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
index f5adf6c71..e7f7e91f9 100644
--- a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
@@ -29,8 +29,7 @@ class AddCommentCommandForm extends ObjectsCommandForm
      */
     public function getHelp()
     {
-        return mt(
-            'monitoring',
+        return $this->translate(
             'This command is used to add host or service comments.'
         );
     }
@@ -47,9 +46,8 @@ class AddCommentCommandForm extends ObjectsCommandForm
                 'comment',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'Comment'),
-                    'description'   => mt(
-                        'monitoring',
+                    'label'         => $this->translate('Comment'),
+                    'description'   => $this->translate(
                         'If you work with other administrators, you may find it useful to share information about the'
                         . ' the host or service that is having problems. Make sure you enter a brief description of'
                         . ' what you are doing.'
@@ -60,10 +58,9 @@ class AddCommentCommandForm extends ObjectsCommandForm
                 'checkbox',
                 'persistent',
                 array(
-                    'label'         => mt('monitoring', 'Persistent'),
+                    'label'         => $this->translate('Persistent'),
                     'value'         => true,
-                    'description'   => mt(
-                        'monitoring',
+                    'description'   => $this->translate(
                         'If you uncheck this option, the comment will automatically be deleted the next time Icinga is'
                         . ' restarted.'
                     )
diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
index 01006683f..1054aae05 100644
--- a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
@@ -35,8 +35,8 @@ class CheckNowCommandForm extends ObjectsCommandForm
                 array(
                     'ignore'        => true,
                     'type'          => 'submit',
-                    'value'         => mt('monitoring', 'Check now'),
-                    'label'         => '<i class="icon-reschedule"></i> ' . mt('monitoring', 'Check now'),
+                    'value'         => $this->translate('Check now'),
+                    'label'         => '<i class="icon-reschedule"></i> ' . $this->translate('Check now'),
                     'decorators'    => array('ViewHelper'),
                     'escape'        => false,
                     'class'         => 'link-like'
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
index 3d85afcec..0f7858ad9 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
@@ -55,7 +55,7 @@ class DeleteCommentCommandForm extends ObjectsCommandForm
             array(
                 'ignore'        => true,
                 'label'         => 'X',
-                'title'         => mt('monitoring', 'Delete comment'),
+                'title'         => $this->translate('Delete comment'),
                 'decorators'    => array('ViewHelper')
             )
         );
@@ -80,7 +80,7 @@ class DeleteCommentCommandForm extends ObjectsCommandForm
         if (! empty($redirect)) {
             $this->setRedirectUrl($redirect);
         }
-        Notification::success(mt('monitoring', 'Deleting comment..'));
+        Notification::success($this->translate('Deleting comment..'));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
index 1c7095b82..43ca52b05 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -55,7 +55,7 @@ class DeleteDowntimeCommandForm extends ObjectsCommandForm
             array(
                 'ignore'        => true,
                 'label'         => 'X',
-                'title'         => mt('monitoring', 'Delete downtime'),
+                'title'         => $this->translate('Delete downtime'),
                 'decorators'    => array('ViewHelper')
             )
         );
@@ -80,7 +80,7 @@ class DeleteDowntimeCommandForm extends ObjectsCommandForm
         if (! empty($redirect)) {
             $this->setRedirectUrl($redirect);
         }
-        Notification::success(mt('monitoring', 'Deleting downtime..'));
+        Notification::success($this->translate('Deleting downtime..'));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
index 48ee00ab3..44e248956 100644
--- a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
@@ -29,8 +29,7 @@ class ProcessCheckResultCommandForm extends ObjectsCommandForm
      */
     public function getHelp()
     {
-        return mt(
-            'monitoring',
+        return $this->translate(
             'This command is used to submit passive host or service check results.'
         );
     }
@@ -53,17 +52,17 @@ class ProcessCheckResultCommandForm extends ObjectsCommandForm
             'status',
             array(
                 'required'      => true,
-                'label'         => mt('monitoring', 'Status'),
-                'description'   => mt('monitoring', 'The state this check result should report'),
+                'label'         => $this->translate('Status'),
+                'description'   => $this->translate('The state this check result should report'),
                 'multiOptions'  => $object->getType() === $object::TYPE_HOST ? array(
-                    ProcessCheckResultCommand::HOST_UP          => mt('monitoring', 'UP', 'icinga.state'),
-                    ProcessCheckResultCommand::HOST_DOWN        => mt('monitoring', 'DOWN', 'icinga.state'),
-                    ProcessCheckResultCommand::HOST_UNREACHABLE => mt('monitoring', 'UNREACHABLE', 'icinga.state')
+                    ProcessCheckResultCommand::HOST_UP          => $this->translate('UP', 'icinga.state'),
+                    ProcessCheckResultCommand::HOST_DOWN        => $this->translate('DOWN', 'icinga.state'),
+                    ProcessCheckResultCommand::HOST_UNREACHABLE => $this->translate('UNREACHABLE', 'icinga.state')
                 ) : array(
-                    ProcessCheckResultCommand::SERVICE_OK       => mt('monitoring', 'OK', 'icinga.state'),
-                    ProcessCheckResultCommand::SERVICE_WARNING  => mt('monitoring', 'WARNING', 'icinga.state'),
-                    ProcessCheckResultCommand::SERVICE_CRITICAL => mt('monitoring', 'CRITICAL', 'icinga.state'),
-                    ProcessCheckResultCommand::SERVICE_UNKNOWN  => mt('monitoring', 'UNKNOWN', 'icinga.state')
+                    ProcessCheckResultCommand::SERVICE_OK       => $this->translate('OK', 'icinga.state'),
+                    ProcessCheckResultCommand::SERVICE_WARNING  => $this->translate('WARNING', 'icinga.state'),
+                    ProcessCheckResultCommand::SERVICE_CRITICAL => $this->translate('CRITICAL', 'icinga.state'),
+                    ProcessCheckResultCommand::SERVICE_UNKNOWN  => $this->translate('UNKNOWN', 'icinga.state')
                 )
             )
         );
@@ -72,8 +71,8 @@ class ProcessCheckResultCommandForm extends ObjectsCommandForm
             'output',
             array(
                 'required'      => true,
-                'label'         => mt('monitoring', 'Output'),
-                'description'   => mt('monitoring', 'The plugin output of this check result')
+                'label'         => $this->translate('Output'),
+                'description'   => $this->translate('The plugin output of this check result')
             )
         );
         $this->addElement(
@@ -81,9 +80,8 @@ class ProcessCheckResultCommandForm extends ObjectsCommandForm
             'perfdata',
             array(
                 'allowEmpty'    => true,
-                'label'         => mt('monitoring', 'Performance Data'),
-                'description'   => mt(
-                    'monitoring',
+                'label'         => $this->translate('Performance Data'),
+                'description'   => $this->translate(
                     'The performance data of this check result. Leave empty'
                     . ' if this check result has no performance data'
                 )
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
index 82a9b2e52..949ec33e1 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
@@ -24,9 +24,8 @@ class ScheduleHostCheckCommandForm extends ScheduleServiceCheckCommandForm
                 'checkbox',
                 'all_services',
                 array(
-                    'label'         => mt('monitoring', 'All Services'),
-                    'description'   => mt(
-                        'monitoring',
+                    'label'         => $this->translate('All Services'),
+                    'description'   => $this->translate(
                         'Schedule check for all services on the hosts and the hosts themselves.'
                     )
                 )
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
index beb0793ef..f84069a9a 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
@@ -27,9 +27,8 @@ class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
                 'checkbox',
                 'all_services',
                 array(
-                    'label'         => mt('monitoring', 'All Services'),
-                    'description'   => mt(
-                        'monitoring',
+                    'label'         => $this->translate('All Services'),
+                    'description'   => $this->translate(
                         'Schedule downtime for all services on the hosts and the hosts themselves.'
                     )
                 )
@@ -38,15 +37,14 @@ class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
                 'select',
                 'child_hosts',
                 array(
-                    'label'        => mt('monitoring', 'Child Hosts'),
+                    'label'        => $this->translate('Child Hosts'),
                     'required'     => true,
                     'multiOptions' => array(
-                        0 => mt('monitoring', 'Do nothing with child hosts'),
-                        1 => mt('monitoring', 'Schedule triggered downtime for all child hosts'),
-                        2 => mt('monitoring', 'Schedule non-triggered downtime for all child hosts')
+                        0 => $this->translate('Do nothing with child hosts'),
+                        1 => $this->translate('Schedule triggered downtime for all child hosts'),
+                        2 => $this->translate('Schedule non-triggered downtime for all child hosts')
                     ),
-                    'description' => mt(
-                        'monitoring',
+                    'description' => $this->translate(
                         'Define what should be done with the child hosts of the hosts.'
                     )
                 )
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
index 9e04a2254..b34472d49 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
@@ -32,8 +32,7 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
      */
     public function getHelp()
     {
-        return mt(
-            'monitoring',
+        return $this->translate(
             'This command is used to schedule the next check of hosts or services. Icinga will re-queue the'
             . ' hosts or services to be checked at the time you specify.'
         );
@@ -52,8 +51,7 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
                 'note',
                 'command-info',
                 array(
-                    'value' => mt(
-                        'monitoring',
+                    'value' => $this->translate(
                         'This command is used to schedule the next check of hosts or services. Icinga will re-queue the'
                         . ' hosts or services to be checked at the time you specify.'
                     )
@@ -64,8 +62,10 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
                 'check_time',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'Check Time'),
-                    'description'   => mt('monitoring', 'Set the date and time when the check should be scheduled.'),
+                    'label'         => $this->translate('Check Time'),
+                    'description'   => $this->translate(
+                        'Set the date and time when the check should be scheduled.'
+                    ),
                     'value'         => $checkTime
                 )
             ),
@@ -73,9 +73,8 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
                 'checkbox',
                 'force_check',
                 array(
-                    'label'         => mt('monitoring', 'Force Check'),
-                    'description'   => mt(
-                        'monitoring',
+                    'label'         => $this->translate('Force Check'),
+                    'description'   => $this->translate(
                         'If you select this option, Icinga will force a check regardless of both what time the'
                         . ' scheduled check occurs and whether or not checks are enabled.'
                     )
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
index 9961d4b65..4f66898f6 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
@@ -42,8 +42,7 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
      */
     public function getHelp()
     {
-        return mt(
-            'monitoring',
+        return $this->translate(
             'This command is used to schedule host and service downtimes. During the specified downtime,'
             . ' Icinga will not send notifications out about the hosts and services. When the scheduled'
             . ' downtime expires, Icinga will send out notifications for the hosts and services as it'
@@ -67,9 +66,8 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                 'comment',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'Comment'),
-                    'description'   => mt(
-                        'monitoring',
+                    'label'         => $this->translate('Comment'),
+                    'description'   => $this->translate(
                         'If you work with other administrators, you may find it useful to share information about the'
                         . ' the host or service that is having problems. Make sure you enter a brief description of'
                         . ' what you are doing.'
@@ -81,8 +79,8 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                 'start',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'Start Time'),
-                    'description'   => mt('monitoring', 'Set the start date and time for the downtime.'),
+                    'label'         => $this->translate('Start Time'),
+                    'description'   => $this->translate('Set the start date and time for the downtime.'),
                     'value'         => $start
                 )
             ),
@@ -91,8 +89,8 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                 'end',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'End Time'),
-                    'description'   => mt('monitoring', 'Set the end date and time for the downtime.'),
+                    'label'         => $this->translate('End Time'),
+                    'description'   => $this->translate('Set the end date and time for the downtime.'),
                     'value'         => $end
                 )
             ),
@@ -102,17 +100,16 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                 array(
                     'required'      => true,
                     'autosubmit'    => true,
-                    'label'         => mt('monitoring', 'Type'),
-                    'description'   => mt(
-                        'monitoring',
+                    'label'         => $this->translate('Type'),
+                    'description'   => $this->translate(
                         'If you select the fixed option, the downtime will be in effect between the start and end'
                         . ' times you specify whereas a flexible downtime starts when the host or service enters a'
                         . ' problem state sometime between the start and end times you specified and lasts as long'
                         . ' as the duration time you enter. The duration fields do not apply for fixed downtimes.'
                     ),
                     'multiOptions' => array(
-                        self::FIXED     => mt('monitoring', 'Fixed'),
-                        self::FLEXIBLE  => mt('monitoring', 'Flexible')
+                        self::FIXED     => $this->translate('Fixed'),
+                        self::FLEXIBLE  => $this->translate('Flexible')
                     ),
                     'validators' => array(
                         array(
@@ -141,7 +138,7 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                     'hours',
                     array(
                         'required'  => true,
-                        'label'     => mt('monitoring', 'Hours'),
+                        'label'     => $this->translate('Hours'),
                         'value'     => 2,
                         'min'       => -1
                     )
@@ -151,7 +148,7 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                     'minutes',
                     array(
                         'required'  => true,
-                        'label'     => mt('monitoring', 'Minutes'),
+                        'label'     => $this->translate('Minutes'),
                         'value'     => 0,
                         'min'       => -1
                     )
@@ -161,9 +158,8 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
                 array('hours', 'minutes'),
                 'duration',
                 array(
-                    'legend'        => mt('monitoring', 'Flexible Duration'),
-                    'description'   => mt(
-                        'monitoring',
+                    'legend'        => $this->translate('Flexible Duration'),
+                    'description'   => $this->translate(
                         'Enter here the duration of the downtime. The downtime will be automatically deleted after this'
                         . ' time expired.'
                     ),
diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
index c33527895..bf0a1d8b1 100644
--- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
@@ -33,7 +33,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_ACTIVE_CHECKS,
                 array(
-                    'label'         => mt('monitoring', 'Active Checks'),
+                    'label'         => $this->translate('Active Checks'),
                     'autosubmit'    => true
                 )
             ),
@@ -41,7 +41,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_PASSIVE_CHECKS,
                 array(
-                    'label'         => mt('monitoring', 'Passive Checks'),
+                    'label'         => $this->translate('Passive Checks'),
                     'autosubmit'    => true
                 )
             ),
@@ -49,7 +49,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_OBSESSING,
                 array(
-                    'label'         => mt('monitoring', 'Obsessing'),
+                    'label'         => $this->translate('Obsessing'),
                     'autosubmit'    => true
                 )
             ),
@@ -57,7 +57,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_NOTIFICATIONS,
                 array(
-                    'label'         => mt('monitoring', 'Notifications'),
+                    'label'         => $this->translate('Notifications'),
                     'autosubmit'    => true
                 )
             ),
@@ -65,7 +65,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_EVENT_HANDLER,
                 array(
-                    'label'         => mt('monitoring', 'Event Handler'),
+                    'label'         => $this->translate('Event Handler'),
                     'autosubmit'    => true
                 )
             ),
@@ -73,7 +73,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_FLAP_DETECTION,
                 array(
-                    'label'         => mt('monitoring', 'Flap Detection'),
+                    'label'         => $this->translate('Flap Detection'),
                     'autosubmit'    => true
                 )
             )
@@ -95,7 +95,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
             $element = $this->getElement($feature);
             $element->setChecked($object->{$feature});
             if ((bool) $object->{$feature . '_changed'} === true) {
-                $element->setDescription(mt('monitoring', 'changed'));
+                $element->setDescription($this->translate('changed'));
             }
         }
         return $this;
@@ -120,7 +120,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 }
             }
         }
-        Notification::success(mt('monitoring', 'Toggling feature..'));
+        Notification::success($this->translate('Toggling feature..'));
         return true;
     }
 }
diff --git a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
index daabe7e02..405bac144 100644
--- a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
@@ -28,9 +28,9 @@ class LocalInstanceForm extends Form
             'path',
             array(
                 'required'      => true,
-                'label'         => mt('monitoring', 'Command File'),
+                'label'         => $this->translate('Command File'),
                 'value'         => '/var/run/icinga2/cmd/icinga2.cmd',
-                'description'   => mt('monitoring', 'Path to the local Icinga command file')
+                'description'   => $this->translate('Path to the local Icinga command file')
             )
         );
         return $this;
diff --git a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
index 7c55f655a..47b2a0316 100644
--- a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
@@ -29,8 +29,8 @@ class RemoteInstanceForm extends Form
                 'host',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'Host'),
-                    'description'   => mt('monitoring',
+                    'label'         => $this->translate('Host'),
+                    'description'   => $this->translate(
                         'Hostname or address of the remote Icinga instance'
                     )
                 )
@@ -40,8 +40,8 @@ class RemoteInstanceForm extends Form
                 'port',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'Port'),
-                    'description'   => mt('monitoring', 'SSH port to connect to on the remote Icinga instance'),
+                    'label'         => $this->translate('Port'),
+                    'description'   => $this->translate('SSH port to connect to on the remote Icinga instance'),
                     'value'         => 22
                 )
             ),
@@ -50,8 +50,8 @@ class RemoteInstanceForm extends Form
                 'user',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'User'),
-                    'description'   => mt('monitoring',
+                    'label'         => $this->translate('User'),
+                    'description'   => $this->translate(
                         'User to log in as on the remote Icinga instance. Please note that key-based SSH login must be'
                         . ' possible for this user'
                     )
@@ -62,9 +62,9 @@ class RemoteInstanceForm extends Form
                 'path',
                 array(
                     'required'      => true,
-                    'label'         => mt('monitoring', 'Command File'),
+                    'label'         => $this->translate('Command File'),
                     'value'         => '/var/run/icinga2/cmd/icinga2.cmd',
-                    'description'   => mt('monitoring', 'Path to the Icinga command file on the remote Icinga instance')
+                    'description'   => $this->translate('Path to the Icinga command file on the remote Icinga instance')
                 )
             )
         ));
diff --git a/modules/monitoring/application/forms/Config/InstanceConfigForm.php b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
index b89e48c0a..5618f27ee 100644
--- a/modules/monitoring/application/forms/Config/InstanceConfigForm.php
+++ b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
@@ -25,7 +25,7 @@ class InstanceConfigForm extends ConfigForm
     public function init()
     {
         $this->setName('form_config_monitoring_instance');
-        $this->setSubmitLabel(mt('monitoring', 'Save Changes'));
+        $this->setSubmitLabel($this->translate('Save Changes'));
     }
 
     /**
@@ -48,7 +48,7 @@ class InstanceConfigForm extends ConfigForm
                 break;
             default:
                 throw new InvalidArgumentException(
-                    sprintf(mt('monitoring', 'Invalid instance type "%s" given'), $type)
+                    sprintf($this->translate('Invalid instance type "%s" given'), $type)
                 );
         }
         return $form;
@@ -69,10 +69,10 @@ class InstanceConfigForm extends ConfigForm
     {
         $name = isset($values['name']) ? $values['name'] : '';
         if (! $name) {
-            throw new InvalidArgumentException(mt('monitoring', 'Instance name missing'));
+            throw new InvalidArgumentException($this->translate('Instance name missing'));
         }
         if ($this->config->hasSection($name)) {
-            throw new InvalidArgumentException(mt('monitoring', 'Instance already exists'));
+            throw new InvalidArgumentException($this->translate('Instance already exists'));
         }
 
         unset($values['name']);
@@ -93,11 +93,11 @@ class InstanceConfigForm extends ConfigForm
     public function edit($name, array $values)
     {
         if (! $name) {
-            throw new InvalidArgumentException(mt('monitoring', 'Old instance name missing'));
+            throw new InvalidArgumentException($this->translate('Old instance name missing'));
         } elseif (! ($newName = isset($values['name']) ? $values['name'] : '')) {
-            throw new InvalidArgumentException(mt('monitoring', 'New instance name missing'));
+            throw new InvalidArgumentException($this->translate('New instance name missing'));
         } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException(mt('monitoring', 'Unknown instance name provided'));
+            throw new InvalidArgumentException($this->translate('Unknown instance name provided'));
         }
 
         unset($values['name']);
@@ -117,9 +117,9 @@ class InstanceConfigForm extends ConfigForm
     public function remove($name)
     {
         if (! $name) {
-            throw new InvalidArgumentException(mt('monitoring', 'Instance name missing'));
+            throw new InvalidArgumentException($this->translate('Instance name missing'));
         } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException(mt('monitoring', 'Unknown instance name provided'));
+            throw new InvalidArgumentException($this->translate('Unknown instance name provided'));
         }
 
         $instanceConfig = $this->config->getSection($name);
@@ -136,10 +136,10 @@ class InstanceConfigForm extends ConfigForm
         $instanceName = $this->request->getQuery('instance');
         if ($instanceName !== null) {
             if (! $instanceName) {
-                throw new ConfigurationError(mt('monitoring', 'Instance name missing'));
+                throw new ConfigurationError($this->translate('Instance name missing'));
             }
             if (! $this->config->hasSection($instanceName)) {
-                throw new ConfigurationError(mt('monitoring', 'Unknown instance name given'));
+                throw new ConfigurationError($this->translate('Unknown instance name given'));
             }
 
             $instanceConfig = $this->config->getSection($instanceName)->toArray();
@@ -158,10 +158,10 @@ class InstanceConfigForm extends ConfigForm
         try {
             if ($instanceName === null) { // create new instance
                 $this->add($this->getValues());
-                $message = mt('monitoring', 'Instance "%s" created successfully.');
+                $message = $this->translate('Instance "%s" created successfully.');
             } else { // edit existing instance
                 $this->edit($instanceName, $this->getValues());
-                $message = mt('monitoring', 'Instance "%s" edited successfully.');
+                $message = $this->translate('Instance "%s" edited successfully.');
             }
         } catch (InvalidArgumentException $e) {
             Notification::error($e->getMessage());
@@ -189,7 +189,7 @@ class InstanceConfigForm extends ConfigForm
                 'name',
                 array(
                     'required'  => true,
-                    'label'     => mt('monitoring', 'Instance Name')
+                    'label'     => $this->translate('Instance Name')
                 )
             ),
             array(
@@ -198,10 +198,10 @@ class InstanceConfigForm extends ConfigForm
                 array(
                     'required'      => true,
                     'autosubmit'    => true,
-                    'label'         => mt('monitoring', 'Instance Type'),
+                    'label'         => $this->translate('Instance Type'),
                     'multiOptions'  => array(
-                        LocalCommandFile::TRANSPORT     => mt('monitoring', 'Local Command File'),
-                        RemoteCommandFile::TRANSPORT    => mt('monitoring', 'Remote Command File')
+                        LocalCommandFile::TRANSPORT     => $this->translate('Local Command File'),
+                        RemoteCommandFile::TRANSPORT    => $this->translate('Remote Command File')
                     ),
                     'value' => $instanceType
                 )
diff --git a/modules/monitoring/application/forms/Config/SecurityConfigForm.php b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
index 40c0b7b8c..b202f5938 100644
--- a/modules/monitoring/application/forms/Config/SecurityConfigForm.php
+++ b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
@@ -18,7 +18,7 @@ class SecurityConfigForm extends ConfigForm
     public function init()
     {
         $this->setName('form_config_monitoring_security');
-        $this->setSubmitLabel(mt('monitoring', 'Save Changes'));
+        $this->setSubmitLabel($this->translate('Save Changes'));
     }
 
     /**
@@ -29,7 +29,7 @@ class SecurityConfigForm extends ConfigForm
         $this->config->setSection('security', $this->getValues());
 
         if ($this->save()) {
-            Notification::success(mt('monitoring', 'New security configuration has successfully been stored'));
+            Notification::success($this->translate('New security configuration has successfully been stored'));
         } else {
             return false;
         }
@@ -54,8 +54,8 @@ class SecurityConfigForm extends ConfigForm
             array(
                 'allowEmpty'    => true,
                 'value'         => '*pw*,*pass*,community',
-                'label'         => mt('monitoring', 'Protected Custom Variables'),
-                'description'   => mt('monitoring',
+                'label'         => $this->translate('Protected Custom Variables'),
+                'description'   => $this->translate(
                     'Comma separated case insensitive list of protected custom variables.'
                     . ' Use * as a placeholder for zero or more wildcard characters.'
                     . ' Existance of those custom variables will be shown, but their values will be masked.'
diff --git a/modules/monitoring/application/forms/EventOverviewForm.php b/modules/monitoring/application/forms/EventOverviewForm.php
index 25d268f76..dc697b940 100644
--- a/modules/monitoring/application/forms/EventOverviewForm.php
+++ b/modules/monitoring/application/forms/EventOverviewForm.php
@@ -44,7 +44,7 @@ class EventOverviewForm extends Form
             'checkbox',
             'statechange',
             array(
-                'label' => t('State Changes'),
+                'label' => $this->translate('State Changes'),
                 'class' => 'autosubmit',
                 'decorators' => $decorators,
                 'value' => strpos($url, $this->stateChangeFilter()->toQueryString()) === false ? 0 : 1
@@ -54,7 +54,7 @@ class EventOverviewForm extends Form
             'checkbox',
             'downtime',
             array(
-                'label' => t('Downtimes'),
+                'label' => $this->translate('Downtimes'),
                 'class' => 'autosubmit',
                 'decorators' => $decorators,
                 'value' => strpos($url, $this->downtimeFilter()->toQueryString()) === false ? 0 : 1
@@ -64,7 +64,7 @@ class EventOverviewForm extends Form
             'checkbox',
             'comment',
             array(
-                'label' => t('Comments'),
+                'label' => $this->translate('Comments'),
                 'class' => 'autosubmit',
                 'decorators' => $decorators,
                 'value' => strpos($url, $this->commentFilter()->toQueryString()) === false ? 0 : 1
@@ -74,7 +74,7 @@ class EventOverviewForm extends Form
             'checkbox',
             'notification',
             array(
-                'label' => t('Notifications'),
+                'label' => $this->translate('Notifications'),
                 'class' => 'autosubmit',
                 'decorators' => $decorators,
                 'value' => strpos($url, $this->notificationFilter()->toQueryString()) === false ? 0 : 1
@@ -84,7 +84,7 @@ class EventOverviewForm extends Form
             'checkbox',
             'flapping',
             array(
-                'label' => t('Flapping'),
+                'label' => $this->translate('Flapping'),
                 'class' => 'autosubmit',
                 'decorators' => $decorators,
                 'value' => strpos($url, $this->flappingFilter()->toQueryString()) === false ? 0 : 1
diff --git a/modules/monitoring/application/forms/Setup/BackendPage.php b/modules/monitoring/application/forms/Setup/BackendPage.php
index 1f6ef6894..b5ab2ffd6 100644
--- a/modules/monitoring/application/forms/Setup/BackendPage.php
+++ b/modules/monitoring/application/forms/Setup/BackendPage.php
@@ -20,7 +20,7 @@ class BackendPage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('monitoring', 'Monitoring Backend', 'setup.page.title'),
+                'value'         => $this->translate('Monitoring Backend', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -31,8 +31,7 @@ class BackendPage extends Form
             'note',
             'description',
             array(
-                'value' => mt(
-                    'monitoring',
+                'value' => $this->translate(
                     'Please configure below how Icinga Web 2 should retrieve monitoring information.'
                 )
             )
@@ -44,8 +43,8 @@ class BackendPage extends Form
             array(
                 'required'      => true,
                 'value'         => 'icinga',
-                'label'         => mt('monitoring', 'Backend Name'),
-                'description'   => mt('monitoring', 'The identifier of this backend')
+                'label'         => $this->translate('Backend Name'),
+                'description'   => $this->translate('The identifier of this backend')
             )
         );
 
@@ -60,8 +59,10 @@ class BackendPage extends Form
             'type',
             array(
                 'required'      => true,
-                'label'         => mt('monitoring', 'Backend Type'),
-                'description'   => mt('monitoring', 'The data source used for retrieving monitoring information'),
+                'label'         => $this->translate('Backend Type'),
+                'description'   => $this->translate(
+                    'The data source used for retrieving monitoring information'
+                ),
                 'multiOptions'  => $resourceTypes
             )
         );
diff --git a/modules/monitoring/application/forms/Setup/IdoResourcePage.php b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
index 189d65fea..c28b52e6b 100644
--- a/modules/monitoring/application/forms/Setup/IdoResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
@@ -28,7 +28,7 @@ class IdoResourcePage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('monitoring', 'Monitoring IDO Resource', 'setup.page.title'),
+                'value'         => $this->translate('Monitoring IDO Resource', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -39,8 +39,7 @@ class IdoResourcePage extends Form
             'note',
             'description',
             array(
-                'value' => mt(
-                    'monitoring',
+                'value' => $this->translate(
                     'Please fill out the connection details below to access'
                     . ' the IDO database of your monitoring environment.'
                 )
@@ -91,8 +90,10 @@ class IdoResourcePage extends Form
             'skip_validation',
             array(
                 'required'      => true,
-                'label'         => t('Skip Validation'),
-                'description'   => t('Check this to not to validate connectivity with the given database server')
+                'label'         => $this->translate('Skip Validation'),
+                'description'   => $this->translate(
+                    'Check this to not to validate connectivity with the given database server'
+                )
             )
         );
     }
diff --git a/modules/monitoring/application/forms/Setup/InstancePage.php b/modules/monitoring/application/forms/Setup/InstancePage.php
index dccfd1d91..8f151554d 100644
--- a/modules/monitoring/application/forms/Setup/InstancePage.php
+++ b/modules/monitoring/application/forms/Setup/InstancePage.php
@@ -20,7 +20,7 @@ class InstancePage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('monitoring', 'Monitoring Instance', 'setup.page.title'),
+                'value'         => $this->translate('Monitoring Instance', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -31,8 +31,7 @@ class InstancePage extends Form
             'note',
             'description',
             array(
-                'value' => mt(
-                    'monitoring',
+                'value' => $this->translate(
                     'Please define the settings specific to your monitoring instance below.'
                 )
             )
diff --git a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
index 4faa17416..245d2abcc 100644
--- a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
@@ -28,7 +28,7 @@ class LivestatusResourcePage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('monitoring', 'Monitoring Livestatus Resource', 'setup.page.title'),
+                'value'         => $this->translate('Monitoring Livestatus Resource', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -39,8 +39,7 @@ class LivestatusResourcePage extends Form
             'note',
             'description',
             array(
-                'value' => mt(
-                    'monitoring',
+                'value' => $this->translate(
                     'Please fill out the connection details below to access the Livestatus'
                     . ' socket interface for your monitoring environment.'
                 )
@@ -91,8 +90,10 @@ class LivestatusResourcePage extends Form
             'skip_validation',
             array(
                 'required'      => true,
-                'label'         => t('Skip Validation'),
-                'description'   => t('Check this to not to validate connectivity with the given Livestatus socket')
+                'label'         => $this->translate('Skip Validation'),
+                'description'   => $this->translate(
+                    'Check this to not to validate connectivity with the given Livestatus socket'
+                )
             )
         );
     }
diff --git a/modules/monitoring/application/forms/Setup/SecurityPage.php b/modules/monitoring/application/forms/Setup/SecurityPage.php
index 0c7d3d1de..ba8083e50 100644
--- a/modules/monitoring/application/forms/Setup/SecurityPage.php
+++ b/modules/monitoring/application/forms/Setup/SecurityPage.php
@@ -20,7 +20,7 @@ class SecurityPage extends Form
             'note',
             'title',
             array(
-                'value'         => mt('monitoring', 'Monitoring Security', 'setup.page.title'),
+                'value'         => $this->translate('Monitoring Security', 'setup.page.title'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -31,8 +31,7 @@ class SecurityPage extends Form
             'note',
             'description',
             array(
-                'value' => mt(
-                    'monitoring',
+                'value' => $this->translate(
                     'To protect your monitoring environment against prying eyes please fill out the settings below.'
                 )
             )
diff --git a/modules/monitoring/application/forms/Setup/WelcomePage.php b/modules/monitoring/application/forms/Setup/WelcomePage.php
index d910e2e01..f79eb6c62 100644
--- a/modules/monitoring/application/forms/Setup/WelcomePage.php
+++ b/modules/monitoring/application/forms/Setup/WelcomePage.php
@@ -19,10 +19,7 @@ class WelcomePage extends Form
             'note',
             'welcome',
             array(
-                'value' => mt(
-                    'monitoring',
-                    'Welcome to the configuration of the monitoring module for Icinga Web 2!'
-                ),
+                'value' => $this->translate('Welcome to the configuration of the monitoring module for Icinga Web 2!'),
                 'decorators'    => array(
                     'ViewHelper',
                     array('HtmlTag', array('tag' => 'h2'))
@@ -34,7 +31,7 @@ class WelcomePage extends Form
             'note',
             'core_hint',
             array(
-                'value' => mt('monitoring', 'This is the core module for Icinga Web 2.')
+                'value' => $this->translate('This is the core module for Icinga Web 2.')
             )
         );
 
@@ -42,8 +39,7 @@ class WelcomePage extends Form
             'note',
             'description',
             array(
-                'value' => mt(
-                    'monitoring',
+                'value' => $this->translate(
                     'It offers various status and reporting views with powerful filter capabilities that allow'
                     . ' you to keep track of the most important events in your monitoring environment.'
                 )
diff --git a/modules/monitoring/application/forms/StatehistoryForm.php b/modules/monitoring/application/forms/StatehistoryForm.php
index 9fa1bdc26..d859f5815 100644
--- a/modules/monitoring/application/forms/StatehistoryForm.php
+++ b/modules/monitoring/application/forms/StatehistoryForm.php
@@ -19,7 +19,7 @@ class StatehistoryForm extends Form
     public function init()
     {
         $this->setName('form_event_overview');
-        $this->setSubmitLabel(mt('monitoring', 'Apply'));
+        $this->setSubmitLabel($this->translate('Apply'));
     }
 
     /**
@@ -65,14 +65,14 @@ class StatehistoryForm extends Form
             'select',
             'from',
             array(
-                'label' => mt('monitoring', 'From'),
+                'label' => $this->translate('From'),
                 'value' => $this->getRequest()->getParam('from', strtotime('3 months ago')),
                 'multiOptions' => array(
-                    strtotime('midnight 3 months ago') => mt('monitoring', '3 Months'),
-                    strtotime('midnight 4 months ago') => mt('monitoring', '4 Months'),
-                    strtotime('midnight 8 months ago') => mt('monitoring', '8 Months'),
-                    strtotime('midnight 12 months ago') => mt('monitoring', '1 Year'),
-                    strtotime('midnight 24 months ago') => mt('monitoring', '2 Years')
+                    strtotime('midnight 3 months ago') => $this->translate('3 Months'),
+                    strtotime('midnight 4 months ago') => $this->translate('4 Months'),
+                    strtotime('midnight 8 months ago') => $this->translate('8 Months'),
+                    strtotime('midnight 12 months ago') => $this->translate('1 Year'),
+                    strtotime('midnight 24 months ago') => $this->translate('2 Years')
                 ),
                 'class' => 'autosubmit'
             )
@@ -81,10 +81,10 @@ class StatehistoryForm extends Form
             'select',
             'to',
             array(
-                'label' => mt('monitoring', 'To'),
+                'label' => $this->translate('To'),
                 'value' => $this->getRequest()->getParam('to', time()),
                 'multiOptions' => array(
-                    time() => mt('monitoring', 'Today')
+                    time() => $this->translate('Today')
                 ),
                 'class' => 'autosubmit'
             )
@@ -95,11 +95,11 @@ class StatehistoryForm extends Form
             'select',
             'objecttype',
             array(
-                'label' => mt('monitoring', 'Object type'),
+                'label' => $this->translate('Object type'),
                 'value' => $objectType,
                 'multiOptions' => array(
-                    'services' => mt('monitoring', 'Services'),
-                    'hosts' => mt('monitoring', 'Hosts')
+                    'services' => $this->translate('Services'),
+                    'hosts' => $this->translate('Hosts')
                 ),
                 'class' => 'autosubmit'
             )
@@ -113,13 +113,13 @@ class StatehistoryForm extends Form
                 'select',
                 'state',
                 array(
-                    'label' => mt('monitoring', 'State'),
+                    'label' => $this->translate('State'),
                     'value' => $serviceState,
                     'multiOptions' => array(
-                        'cnt_critical_hard' => mt('monitoring', 'Critical'),
-                        'cnt_warning_hard' => mt('monitoring', 'Warning'),
-                        'cnt_unknown_hard' => mt('monitoring', 'Unknown'),
-                        'cnt_ok' => mt('monitoring', 'Ok')
+                        'cnt_critical_hard' => $this->translate('Critical'),
+                        'cnt_warning_hard' => $this->translate('Warning'),
+                        'cnt_unknown_hard' => $this->translate('Unknown'),
+                        'cnt_ok' => $this->translate('Ok')
                     ),
                     'class' => 'autosubmit'
                 )
@@ -133,12 +133,12 @@ class StatehistoryForm extends Form
                 'select',
                 'state',
                 array(
-                    'label' => mt('monitoring', 'State'),
+                    'label' => $this->translate('State'),
                     'value' => $hostState,
                     'multiOptions' =>  array(
-                        'cnt_up' => mt('monitoring', 'Up'),
-                        'cnt_down_hard' => mt('monitoring', 'Down'),
-                        'cnt_unreachable_hard' => mt('monitoring', 'Unreachable')
+                        'cnt_up' => $this->translate('Up'),
+                        'cnt_down_hard' => $this->translate('Down'),
+                        'cnt_unreachable_hard' => $this->translate('Unreachable')
                     ),
                     'class' => 'autosubmit'
                 )

From 2d957205eff8103e155cf90677854eabc94578de Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 19 Jan 2015 13:47:53 +0100
Subject: [PATCH 0206/2920] Using $this when not in object context, doesn't
 work.

refs #7551
---
 application/forms/Config/Authentication/DbBackendForm.php    | 4 ++--
 application/forms/Config/Authentication/LdapBackendForm.php  | 2 +-
 application/forms/Config/Resource/DbResourceForm.php         | 2 +-
 application/forms/Config/Resource/LdapResourceForm.php       | 2 +-
 application/forms/Config/Resource/LivestatusResourceForm.php | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index f8a4fb832..d3a5af51d 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -109,11 +109,11 @@ class DbBackendForm extends Form
         try {
             $dbUserBackend = new DbUserBackend(ResourceFactory::createResource($form->getResourceConfig()));
             if ($dbUserBackend->count() < 1) {
-                $form->addError($this->translate('No users found under the specified database backend'));
+                $form->addError($form->translate('No users found under the specified database backend'));
                 return false;
             }
         } catch (Exception $e) {
-            $form->addError(sprintf($this->translate('Using the specified backend failed: %s'), $e->getMessage()));
+            $form->addError(sprintf($form->translate('Using the specified backend failed: %s'), $e->getMessage()));
             return false;
         }
 
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 5915a0a10..1b8fc3f11 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -150,7 +150,7 @@ class LdapBackendForm extends Form
             $form->addError($e->getMessage());
             return false;
         } catch (Exception $e) {
-            $form->addError(sprintf($this->translate('Unable to validate authentication: %s'), $e->getMessage()));
+            $form->addError(sprintf($form->translate('Unable to validate authentication: %s'), $e->getMessage()));
             return false;
         }
 
diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
index 9e4027299..97dd951d1 100644
--- a/application/forms/Config/Resource/DbResourceForm.php
+++ b/application/forms/Config/Resource/DbResourceForm.php
@@ -133,7 +133,7 @@ class DbResourceForm extends Form
             $resource->getConnection()->getConnection();
         } catch (Exception $e) {
             $form->addError(
-                $this->translate('Connectivity validation failed, connection to the given resource not possible.')
+                $form->translate('Connectivity validation failed, connection to the given resource not possible.')
             );
             return false;
         }
diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index c113e2471..3293546c5 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -124,7 +124,7 @@ class LdapResourceForm extends Form
             }
         } catch (Exception $e) {
             $form->addError(
-                $this->translate('Connectivity validation failed, connection to the given resource not possible.')
+                $form->translate('Connectivity validation failed, connection to the given resource not possible.')
             );
             return false;
         }
diff --git a/application/forms/Config/Resource/LivestatusResourceForm.php b/application/forms/Config/Resource/LivestatusResourceForm.php
index 996827228..e893a4657 100644
--- a/application/forms/Config/Resource/LivestatusResourceForm.php
+++ b/application/forms/Config/Resource/LivestatusResourceForm.php
@@ -77,7 +77,7 @@ class LivestatusResourceForm extends Form
             $resource->connect()->disconnect();
         } catch (Exception $_) {
             $form->addError(
-                $this->translate('Connectivity validation failed, connection to the given resource not possible.')
+                $form->translate('Connectivity validation failed, connection to the given resource not possible.')
             );
             return false;
         }

From 56640fa64fd6ab1371d2aec54442258766b1614f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 13:50:03 +0100
Subject: [PATCH 0207/2920] postgres: Use timestamp comparison instead of
 timezone offset comparison for detecting the default timestamp

refs #7919
---
 .../library/Monitoring/Backend/Ido/Query/IdoQuery.php         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index f2e5bd15f..cf6968ea3 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -324,8 +324,8 @@ abstract class IdoQuery extends DbQuery
                 $value = preg_replace('/ COLLATE .+$/', '', $value);
                 $value = preg_replace('/inet_aton\(([[:word:].]+)\)/i', '$1::inet - \'0.0.0.0\'', $value);
                 $value = preg_replace(
-                    '/(UNIX_TIMESTAMP(\((?>[^()]|(?-1))*\)))/i',
-                    'CASE WHEN ($1 = EXTRACT(TIMEZONE FROM NOW()) * -1) THEN 0 ELSE $1 END',
+                    '/UNIX_TIMESTAMP(\((?>[^()]|(?-1))*\))/i',
+                    'CASE WHEN ($1 < \'1970-01-03 00:00:00+00\'::timestamp with time zone) THEN 0 ELSE UNIX_TIMESTAMP($1) END',
                     $value
                 );
             }

From ae927cf043779e631e45516e5dadb2c27c6fc436 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 13:53:39 +0100
Subject: [PATCH 0208/2920] puppet/postgres: Allow connections made by Icinga 2

fixes #8109
---
 .puppet/modules/pgsql/templates/pg_hba.conf.erb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.puppet/modules/pgsql/templates/pg_hba.conf.erb b/.puppet/modules/pgsql/templates/pg_hba.conf.erb
index f6fb19ebf..c37e6ffd4 100644
--- a/.puppet/modules/pgsql/templates/pg_hba.conf.erb
+++ b/.puppet/modules/pgsql/templates/pg_hba.conf.erb
@@ -71,6 +71,11 @@ local   icinga      icinga                            trust
 host    icinga      icinga      127.0.0.1/32          trust
 host    icinga      icinga      ::1/128               trust
 
+# icinga2
+local   icinga2     icinga2                           trust
+host    icinga2     icinga2     127.0.0.1/32          trust
+host    icinga2     icinga2     ::1/128               trust
+
 # icinga_unittest
 local   icinga_unittest      icinga_unittest                            trust
 host    icinga_unittest      icinga_unittest      127.0.0.1/32          trust

From a456c0434c87c36242c7dfa2e34c9a6f397027e9 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 19 Jan 2015 13:58:04 +0100
Subject: [PATCH 0209/2920] Add better axis labels to the alert summary chart

---
 .../controllers/AlertsummaryController.php    | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 1344d03f4..c89f51f48 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -342,7 +342,7 @@ class Monitoring_AlertsummaryController extends Controller
         $gridChart = new GridChart();
 
         $gridChart->alignTopLeft();
-        $gridChart->setAxisLabel('', mt('monitoring', 'Notifications'))
+        $gridChart->setAxisLabel($this->createPeriodDescription(), mt('monitoring', 'Notifications'))
             ->setXAxis(new StaticAxis())
             ->setYAxis(new LinearUnit(10))
             ->setAxisMin(null, 0);
@@ -470,7 +470,7 @@ class Monitoring_AlertsummaryController extends Controller
         $gridChart = new GridChart();
 
         $gridChart->alignTopLeft();
-        $gridChart->setAxisLabel('', mt('monitoring', 'Notifications'))
+        $gridChart->setAxisLabel($this->createPeriodDescription(), mt('monitoring', 'Notifications'))
             ->setXAxis(new StaticAxis())
             ->setAxisMin(null, 0)
             ->setYAxis(new LinearUnit(10));
@@ -623,4 +623,28 @@ class Monitoring_AlertsummaryController extends Controller
 
         return $interval;
     }
+
+    /**
+     * Create a human-readable description of the current interval size
+     *
+     * @return string   The description of the current interval size
+     */
+    private function createPeriodDescription()
+    {
+        $int = $this->getInterval();
+        switch ($int) {
+            case '1d':
+                return t('Hour');
+                break;
+            case '1w';
+                return t('Day');
+                break;
+            case '1m':
+                return t('Day');
+                break;
+            case '1y':
+                return t('Month');
+                break;
+        }
+    }
 }

From 10ebc3432c0a81ef52f41679aeaae49ea088f2ad Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 14:17:59 +0100
Subject: [PATCH 0210/2920] monitoring: Do not strip_tags when viewing host
 output in the host list

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

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 2f339b1bf..4d60eacf4 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -115,7 +115,7 @@ if ($hosts->count() === 0) {
            array('style' => 'font-weight: normal')
         ) ?>)</span>
         <?php endif ?>
-        <p class="pluginoutput"><?= $this->escape(substr(strip_tags($host->host_output), 0, 10000)) ?></p>
+        <p class="pluginoutput"><?= $this->escape(substr($host->host_output, 0, 10000)) ?></p>
       </td>
       <?php foreach($this->extraColumns as $col): ?>
       <td><?= $this->escape($host->$col) ?></td>

From f56ffd3426671aeb28ba4fb682ef019e1769f264 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 14:18:46 +0100
Subject: [PATCH 0211/2920] monitoring: Do not strip_tags when viewing service
 output in the service list

refs #8248
---
 .../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 8ef6f7fe8..26249b710 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -112,7 +112,7 @@ foreach ($services as $service):
   (<?= 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>
+        <p class="pluginoutput"><?= $this->escape(substr($service->service_output, 0, 10000)); ?></p>
       </td>
 <?php foreach($this->extraColumns as $col): ?>
       <td><?= $this->escape($service->$col) ?></td>

From a0a3241d1c42d138a588478f4199d3cdcd887d75 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 14:20:37 +0100
Subject: [PATCH 0212/2920] lib: Add String::ellipsis()

---
 library/Icinga/Util/String.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/library/Icinga/Util/String.php b/library/Icinga/Util/String.php
index 248ab0d34..69fb26927 100644
--- a/library/Icinga/Util/String.php
+++ b/library/Icinga/Util/String.php
@@ -36,4 +36,22 @@ class String
     {
         return str_replace(' ', '', ucwords(str_replace($separator, ' ', strtolower($name))));
     }
+
+    /**
+     * Add ellipsis when a string is longer than max length
+     *
+     * @param   string  $string
+     * @param   int     $maxLength
+     * @param   string  $ellipsis
+     *
+     * @return  string
+     */
+    public static function ellipsis($string, $maxLength, $ellipsis = '...')
+    {
+        if (strlen($string) > $maxLength) {
+            return substr($string, 0, $maxLength - strlen($ellipsis)) . $ellipsis;
+        }
+
+        return $string;
+    }
 }

From ab4cbc855f089d6a07ccfb200f9144b2afdbacab Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 19 Jan 2015 14:20:46 +0100
Subject: [PATCH 0213/2920] Fix order of setAxisMin calls

---
 .../application/controllers/AlertsummaryController.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index c89f51f48..79aad7f72 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -472,8 +472,8 @@ class Monitoring_AlertsummaryController extends Controller
         $gridChart->alignTopLeft();
         $gridChart->setAxisLabel($this->createPeriodDescription(), mt('monitoring', 'Notifications'))
             ->setXAxis(new StaticAxis())
-            ->setAxisMin(null, 0)
-            ->setYAxis(new LinearUnit(10));
+            ->setYAxis(new LinearUnit(10))
+            ->setAxisMin(null, 0);
 
         $gridChart->drawBars(
             array(

From a1a36301fe551bb3957f2c7da93892bd93cc653e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 14:20:57 +0100
Subject: [PATCH 0214/2920] View: Add string helpers

---
 library/Icinga/Web/View/helpers/string.php | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 library/Icinga/Web/View/helpers/string.php

diff --git a/library/Icinga/Web/View/helpers/string.php b/library/Icinga/Web/View/helpers/string.php
new file mode 100644
index 000000000..1d79d885a
--- /dev/null
+++ b/library/Icinga/Web/View/helpers/string.php
@@ -0,0 +1,8 @@
+<?php
+namespace Icinga\Web\View;
+
+use Icinga\Util\String;
+
+$this->addHelperFunction('ellipsis', function ($string, $maxLength, $ellipsis = '...') {
+    return String::ellipsis($string, $maxLength, $ellipsis);
+});

From 7580d57c1d85d281ffdd5fe5d165167cd693b962 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 14:21:55 +0100
Subject: [PATCH 0215/2920] monitoring: Use the ellipsis string helper when
 viewing plugin output in host and service list

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

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 4d60eacf4..920a77e01 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -115,7 +115,7 @@ if ($hosts->count() === 0) {
            array('style' => 'font-weight: normal')
         ) ?>)</span>
         <?php endif ?>
-        <p class="pluginoutput"><?= $this->escape(substr($host->host_output, 0, 10000)) ?></p>
+        <p class="pluginoutput"><?= $this->escape($this->ellipsis($host->host_output, 10000)) ?></p>
       </td>
       <?php foreach($this->extraColumns as $col): ?>
       <td><?= $this->escape($host->$col) ?></td>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 26249b710..0b63c7887 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -112,7 +112,7 @@ foreach ($services as $service):
   (<?= strtoupper(Host::getStateText($service->host_state, true)); ?>)
 <?php endif ?>
 </a><?php endif ?><br />
-        <p class="pluginoutput"><?= $this->escape(substr($service->service_output, 0, 10000)); ?></p>
+        <p class="pluginoutput"><?= $this->escape($this->ellipsis($service->service_output, 10000)); ?></p>
       </td>
 <?php foreach($this->extraColumns as $col): ?>
       <td><?= $this->escape($service->$col) ?></td>

From 5ccd29049060e7f25bab85449b7410da06387245 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 15:07:37 +0100
Subject: [PATCH 0216/2920] puppet/postgres: Allow connections made by Icinga
 Web 2

---
 .puppet/modules/pgsql/templates/pg_hba.conf.erb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.puppet/modules/pgsql/templates/pg_hba.conf.erb b/.puppet/modules/pgsql/templates/pg_hba.conf.erb
index c37e6ffd4..ca98bebd8 100644
--- a/.puppet/modules/pgsql/templates/pg_hba.conf.erb
+++ b/.puppet/modules/pgsql/templates/pg_hba.conf.erb
@@ -86,6 +86,11 @@ local   icingaweb      icingaweb                            trust
 host    icingaweb      icingaweb      127.0.0.1/32          trust
 host    icingaweb      icingaweb      ::1/128               trust
 
+# icingaweb2
+local   <%= scope.function_hiera(['icingaweb2::db_user']) %>    <%= scope.function_hiera(['icingaweb2::db_user']) %>                    trust
+host    <%= scope.function_hiera(['icingaweb2::db_user']) %>    <%= scope.function_hiera(['icingaweb2::db_user']) %>    127.0.0.1/32    trust
+host    <%= scope.function_hiera(['icingaweb2::db_user']) %>    <%= scope.function_hiera(['icingaweb2::db_user']) %>    ::1/128         trust
+
 # "local" is for Unix domain socket connections only
 local   all         all                               ident
 # IPv4 local connections:

From ba1007465a8e5750c74cd455a4dd0e476152d215 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 19 Jan 2015 15:12:00 +0100
Subject: [PATCH 0217/2920] Adapt bar width to amount of data points

---
 library/Icinga/Chart/Graph/BarGraph.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Chart/Graph/BarGraph.php b/library/Icinga/Chart/Graph/BarGraph.php
index 0ec5e77a9..febad8d09 100644
--- a/library/Icinga/Chart/Graph/BarGraph.php
+++ b/library/Icinga/Chart/Graph/BarGraph.php
@@ -28,7 +28,7 @@ class BarGraph extends Styleable implements Drawable
      *
      * @var int
      */
-    private $barWidth = 1;
+    private $barWidth = 3;
 
     /**
      * The dataset to use for this bar graph
@@ -122,6 +122,14 @@ class BarGraph extends Styleable implements Drawable
         $doc = $ctx->getDocument();
         $group = $doc->createElement('g');
         $idx = 0;
+
+        if (count($this->dataSet) > 15) {
+            $this->barWidth = 2;
+        }
+        if (count($this->dataSet) > 25) {
+            $this->barWidth = 1;
+        }
+
         foreach ($this->dataSet as $x => $point) {
             // add white background bar, to prevent other bars from altering transparency effects
             $bar = $this->drawSingleBar($point, $idx++, 'white', $this->strokeWidth, $idx)->toSvg($ctx);

From 80fc2a32db8036fd10e1c49c9f72215597bc4d3b Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 19 Jan 2015 15:14:09 +0100
Subject: [PATCH 0218/2920] Improve layout in AlertSummary

Use brighter color for notifications, render hours more readable.
---
 .../application/controllers/AlertsummaryController.php     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 79aad7f72..652c09be3 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -429,11 +429,10 @@ class Monitoring_AlertsummaryController extends Controller
             $item[1] = $item[1]/60/60;
         }
 
-
         $gridChart->drawBars(
             array(
                 'label' => $this->translate('Notifications'),
-                'color' => '#049baf',
+                'color' => '#07C0D9',
                 'data'  =>  $notifications,
                 'showPoints' => true
             )
@@ -478,7 +477,7 @@ class Monitoring_AlertsummaryController extends Controller
         $gridChart->drawBars(
             array(
                 'label' => $this->translate('Notifications'),
-                'color' => '#049baf',
+                'color' => '#07C0D9',
                 'data'  =>  $this->notificationData,
                 'showPoints' => true
             )
@@ -554,7 +553,7 @@ class Monitoring_AlertsummaryController extends Controller
     {
         $format = '';
         if ($interval === '1d') {
-            $format = '%H:00:00';
+            $format = '%H:00';
         } elseif ($interval === '1w') {
             $format = '%Y-%m-%d';
         } elseif ($interval === '1m') {

From d275bc0762e3ac9c4811773ff72ec423916d7617 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 15:50:05 +0100
Subject: [PATCH 0219/2920] rpm: Cover all dependencies

fixes #6302
refs #4075
---
 icingaweb2.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index c98a8c65f..56024a962 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -64,7 +64,7 @@ Icinga Web 2
 %define logdir          %{_localstatedir}/log/%{name}
 %define phpdir          %{_datadir}/php
 %define icingawebgroup  icingaweb2
-%define docsdir          %{_datadir}/doc/%{name}
+%define docsdir         %{_datadir}/doc/%{name}
 
 
 %package common
@@ -79,7 +79,10 @@ Common files for Icinga Web 2 and the Icinga CLI
 Summary:                    Icinga Web 2 PHP library
 Group:                      Development/Libraries
 Requires:                   %{php} >= 5.3.0
-%{?suse_version:Requires:   %{php}-gettext %{php}-openssl}
+Requires:                   %{php}-gd %{php}-intl
+%{?fedora:Requires:         php-pecl-imagick}
+%{?rhel:Requires:           php-pecl-imagick}
+%{?suse_version:Requires:   %{php}-gettext %{php}-openssl php5-imagick}
 
 %description -n php-Icinga
 Icinga Web 2 PHP library
@@ -90,9 +93,9 @@ Summary:                    Icinga CLI
 Group:                      Applications/System
 Requires:                   %{name}-common = %{version}-%{release}
 Requires:                   php-Icinga = %{version}-%{release}
+%{?fedora:Requires:         %{php_cli} >= 5.3.0 bash-completion}
+%{?rhel:Requires:           %{php_cli} >= 5.3.0 bash-completion}
 %{?suse_version:Requires:   %{php} >= 5.3.0}
-%{?rhel:Requires:           %{php_cli} >= 5.3.0}
-%{?rhel:Requires:           bash-completion}
 
 %description -n icingacli
 Icinga CLI

From 2bd2f32b2e8da6d0bf0f008497d731ffdd594372 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 19 Jan 2015 16:43:19 +0100
Subject: [PATCH 0220/2920] postgresql/auth: Fix that users cannot login when
 using PostgreSQL >= version 9.0

fixes #8251
---
 .../Icinga/Authentication/Backend/DbUserBackend.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Authentication/Backend/DbUserBackend.php b/library/Icinga/Authentication/Backend/DbUserBackend.php
index d2d0147e5..7865aa905 100644
--- a/library/Icinga/Authentication/Backend/DbUserBackend.php
+++ b/library/Icinga/Authentication/Backend/DbUserBackend.php
@@ -87,9 +87,16 @@ class DbUserBackend extends UserBackend
      */
     protected function getPasswordHash($username)
     {
-        $stmt = $this->conn->getDbAdapter()->prepare(
-            'SELECT password_hash FROM icingaweb_user WHERE name = :name AND active = 1'
-        );
+        if ($this->conn->getDbType() === 'pgsql') {
+            // Since PostgreSQL version 9.0 the default value for bytea_output is 'hex' instead of 'escape'
+            $stmt = $this->conn->getDbAdapter()->prepare(
+                'SELECT ENCODE(password_hash, \'escape\') FROM icingaweb_user WHERE name = :name AND active = 1'
+            );
+        } else {
+            $stmt = $this->conn->getDbAdapter()->prepare(
+                'SELECT password_hash FROM icingaweb_user WHERE name = :name AND active = 1'
+            );
+        }
         $stmt->execute(array(':name' => $username));
         $stmt->bindColumn(1, $lob, PDO::PARAM_LOB);
         $stmt->fetch(PDO::FETCH_BOUND);

From b065a9defd9ec4dd61ac09596871b1ef1b035259 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 10:07:27 +0100
Subject: [PATCH 0221/2920] puppet: Provision the PHP ImageMagick Module

resolves #8108
---
 .puppet/modules/php_imagick/manifests/init.pp | 29 +++++++++++++++++++
 .../profiles/icingaweb2_dev/manifests/init.pp |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 .puppet/modules/php_imagick/manifests/init.pp

diff --git a/.puppet/modules/php_imagick/manifests/init.pp b/.puppet/modules/php_imagick/manifests/init.pp
new file mode 100644
index 000000000..5ef0453af
--- /dev/null
+++ b/.puppet/modules/php_imagick/manifests/init.pp
@@ -0,0 +1,29 @@
+# Class: php_imagick
+#
+#   This class installs the ImageMagick PHP module.
+#
+# Parameters:
+#
+# Actions:
+#
+# Requires:
+#
+#   php
+#
+# Sample Usage:
+#
+#   include php_imagick
+#
+class php_imagick {
+  include php
+
+  $php_imagick = $::operatingsystem ? {
+    /(Debian|Ubuntu)/        => 'php5-imagick',
+    /(RedHat|CentOS|Fedora)/ => 'php-pecl-imagick',
+    /(SLES|OpenSuSE)/        => 'php5-imagick',
+  }
+
+  package { $php_imagick:
+    ensure => latest,
+  }
+}
diff --git a/.puppet/profiles/icingaweb2_dev/manifests/init.pp b/.puppet/profiles/icingaweb2_dev/manifests/init.pp
index 157a9d80a..7c2ec6828 100644
--- a/.puppet/profiles/icingaweb2_dev/manifests/init.pp
+++ b/.puppet/profiles/icingaweb2_dev/manifests/init.pp
@@ -9,6 +9,7 @@ class icingaweb2_dev (
 ) {
   include apache
   include php
+  include php_imagick
   include icingaweb2::config
   include icingacli
   include icinga_packages

From 478a0a0d47741733a9b4aec39ab5b113f96fc5b6 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 10:11:00 +0100
Subject: [PATCH 0222/2920] puppet: Provision the intl and gd PHP module

fixes #8107
---
 .puppet/profiles/icingaweb2_dev/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.puppet/profiles/icingaweb2_dev/manifests/init.pp b/.puppet/profiles/icingaweb2_dev/manifests/init.pp
index 7c2ec6828..404c6395e 100644
--- a/.puppet/profiles/icingaweb2_dev/manifests/init.pp
+++ b/.puppet/profiles/icingaweb2_dev/manifests/init.pp
@@ -21,7 +21,7 @@ class icingaweb2_dev (
   }
 
   # TODO(el): icinga-gui is not a icingaweb2_dev package
-  package { [ 'php-pdo', 'php-ldap', 'php-phpunit-PHPUnit', 'icinga-gui' ]:
+  package { [ 'php-gd', 'php-intl', php-pdo', 'php-ldap', 'php-phpunit-PHPUnit', 'icinga-gui' ]:
     ensure => latest,
     notify => Service['apache'],
     require => Class['icinga_packages'],

From 3a3b1fbe51459ea6e2ebcef5e6ee5755bbf53089 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 12:54:14 +0100
Subject: [PATCH 0223/2920] puppet: Fix typo introduced by last commit

---
 .puppet/profiles/icingaweb2_dev/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.puppet/profiles/icingaweb2_dev/manifests/init.pp b/.puppet/profiles/icingaweb2_dev/manifests/init.pp
index 404c6395e..b8bea040f 100644
--- a/.puppet/profiles/icingaweb2_dev/manifests/init.pp
+++ b/.puppet/profiles/icingaweb2_dev/manifests/init.pp
@@ -21,7 +21,7 @@ class icingaweb2_dev (
   }
 
   # TODO(el): icinga-gui is not a icingaweb2_dev package
-  package { [ 'php-gd', 'php-intl', php-pdo', 'php-ldap', 'php-phpunit-PHPUnit', 'icinga-gui' ]:
+  package { [ 'php-gd', 'php-intl', 'php-pdo', 'php-ldap', 'php-phpunit-PHPUnit', 'icinga-gui' ]:
     ensure => latest,
     notify => Service['apache'],
     require => Class['icinga_packages'],

From b0e27c4fe69da42244de373357440d3f6785bdf3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 13:43:53 +0100
Subject: [PATCH 0224/2920] monitoring: Remove duplicate array key
 'host_check_command' in the StatusQuery

---
 .../library/Monitoring/Backend/Ido/Query/StatusQuery.php       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index 28b06dc80..8dc6fa11e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -118,7 +118,6 @@ class StatusQuery extends IdoQuery
 
             'host_modified_host_attributes' => 'hs.modified_host_attributes',
             'host_event_handler' => 'hs.event_handler',
-            'host_check_command' => 'hs.check_command',
             'host_normal_check_interval' => 'hs.normal_check_interval',
             'host_retry_check_interval' => 'hs.retry_check_interval',
             'host_check_timeperiod_object_id' => 'hs.check_timeperiod_object_id',
@@ -368,7 +367,7 @@ class StatusQuery extends IdoQuery
 
             case 'CASE WHEN ss.current_state = 0 THEN 0 ELSE 1 END':
                 if ($sign !== '=') break;
-               
+
                 if ($expression) {
                     return 'ss.current_state > 0';
                 } else {

From e708054e286452cf6e93cac451fe159db465da83 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 13:50:05 +0100
Subject: [PATCH 0225/2920] doc/README.md: Rename 'General Information' to
 'About'

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 16eb1444a..d25969cf5 100644
--- a/README.md
+++ b/README.md
@@ -2,12 +2,12 @@
 
 ## Table of Contents
 
-0. [General Information](#general information)
+0. [About](#about)
 1. [Installation](#installation)
 2. [Support](#support)
 3. [Vagrant - Virtual development environment](#vagrant)
 
-## General Information
+## About
 
 `Icinga Web 2` is the next generation monitoring web interface, framework
 and CLI tool developed by the [Icinga Project](https://www.icinga.org/community/team/).

From a74a4d6ecac0c493b2876af772e08f4869525924 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 14:08:55 +0100
Subject: [PATCH 0226/2920] doc/README.md: Update about section

---
 README.md | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index d25969cf5..6ba47025c 100644
--- a/README.md
+++ b/README.md
@@ -9,19 +9,11 @@
 
 ## About
 
-`Icinga Web 2` is the next generation monitoring web interface, framework
-and CLI tool developed by the [Icinga Project](https://www.icinga.org/community/team/).
+**Icinga Web 2** is the next generation open source monitoring web interface, framework
+and command-line interface developed by the [Icinga Project](https://www.icinga.org/), supporting Icinga 2,
+Icinga Core and any other monitoring backend compatible with the Livestatus Protocol.
 
-Responsive and fast, rewritten from scratch supporting multiple backends and
-providing a CLI tool. Compatible with Icinga Core 2.x and 1.x.
-
-Check the Icinga website for some [insights](https://www.icinga.org/icinga/screenshots/icinga-web-2/).
-
-> **Note**
->
-> `Icinga Web 2` is still in development and not meant for production deployment.
-> Watch the [development roadmap](https://dev.icinga.org/projects/icingaweb2/roadmap)
-> and [Icinga website](https://www.icinga.org/) for release schedule updates!
+![Icinga Web 2](https://www.icinga.org/wp-content/uploads/2014/06/service_detail.png "Icinga Web 2")
 
 ## Installation
 

From efd7e0a3fe31cb2396717549c740e8a33ab42900 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 14:46:44 +0100
Subject: [PATCH 0227/2920] doc/README.md: Update support

---
 README.md | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 6ba47025c..6b822c5b1 100644
--- a/README.md
+++ b/README.md
@@ -17,19 +17,15 @@ Icinga Core and any other monitoring backend compatible with the Livestatus Prot
 
 ## Installation
 
-Please navigate to [doc/installation.md](doc/installation.md) for updated details.
+For installing Icinga Web 2 please read [doc/installation.md](doc/installation.md).
 
 ## Support
 
-Please head over to the [community support channels](https://www.icinga.org/icinga/faq/get-help/)
-in case of questions, bugs, etc.
+If you come across problems at some time, the [community support channels](https://support.icinga.org/) 
+are good places to ask for advice from other users and give some in return.
 
-Please make sure to provide the following details:
-
-* OS, distribution, version
-* PHP and/or MySQL/PostgreSQL version
-* Which browser and its version
-* Screenshot and problem description
+For status updates check the [Icinga website](https://www.icinga.org/) and the
+[Icinga Web 2 development roadmap](https://dev.icinga.org/projects/icingaweb2/roadmap).
 
 
 ## Vagrant

From a83aea44408faa69ec55348bd429f30a7369cfa5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 14:47:49 +0100
Subject: [PATCH 0228/2920] doc/README.md: Remove vagrant

---
 README.md | 229 ------------------------------------------------------
 1 file changed, 229 deletions(-)

diff --git a/README.md b/README.md
index 6b822c5b1..55e4e77ee 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,6 @@
 0. [About](#about)
 1. [Installation](#installation)
 2. [Support](#support)
-3. [Vagrant - Virtual development environment](#vagrant)
 
 ## About
 
@@ -26,231 +25,3 @@ are good places to ask for advice from other users and give some in return.
 
 For status updates check the [Icinga website](https://www.icinga.org/) and the
 [Icinga Web 2 development roadmap](https://dev.icinga.org/projects/icingaweb2/roadmap).
-
-
-## Vagrant
-
-### Requirements
-
-* Vagrant 1.2+
-* Virtualbox 4.2.16+
-* a fairly powerful hardware (quad core, 4gb ram, fast hdd)
-
-> **Note**
->
-> The deployment of the virtual machine is tested against Vagrant starting with version 1.2.
-> Unfortunately older versions will not work.
-
-### General
-
-The Icinga Web 2 project ships with a Vagrant virtual machine that integrates
-the source code with various services and example data in a controlled
-environment. This enables developers and users to test Livestatus, status.dat,
-MySQL and PostgreSQL backends as well as the LDAP authentication. All you
-have to do is install Vagrant and run:
-
-    vagrant up
-
-> **Note**
-> 
-> The first boot of the vm takes a fairly long time because
-> you'll download a plain CentOS base box and Vagrant will automatically
-> provision the environment on the first go.
-
-After you should be able to browse [localhost:8080/icingaweb](http://localhost:8080/icingaweb).
-
-### Environment
-
-**Forwarded ports**:
-
-<table>
-    <tr>
-        <th>Proctocol</th>
-        <th>Local port (virtual machine host)</th>
-        <th>Remote port (the virtual machine)</th>
-    </tr>
-    <tr>
-        <td>SSH</td>
-        <td>2222</td>
-        <td>22</td>
-    </tr>
-    <tr>
-        <td>HTTP</td>
-        <td>8080</td>
-        <td>80</td>
-    </tr>
-</table>
-
-**Installed packages**:
-
-* Apache2 with PHP enabled
-* PHP with MySQL and PostgreSQL libraries
-* MySQL server and client software
-* PostgreSQL server and client software
-* [Icinga prerequisites](http://docs.icinga.org/latest/en/quickstart-idoutils.html#installpackages)
-* OpenLDAP servers and clients
-
-**Installed users and groups**:
-
-* User icinga with group icinga and icinga-cmd
-* Webserver user added to group icinga-cmd
-
-**Installed software**:
-
-* Icinga with IDOUtils using a MySQL database
-* Icinga with IDOUtils using a PostgreSQL database
-* Icinga 2
-
-**Installed files**:
-
-* `/usr/share/icinga/htpasswd.users` account information for logging into the Icinga classic web interface for both icinga instances
-* `/usr/lib64/nagios/plugins` Monitoring Plugins for all Icinga instances
-
-#### Icinga with IDOUtils using a MySQL database
-
-**Installation path**: `/usr/local/icinga-mysql`
-
-**Services**:
-
-* `icinga-mysql`
-* `ido2db-mysql`
-
-Connect to the **icinga mysql database** using the following command:
-
-    mysql -u icinga -p icinga icinga
-
-Access the **Classic UI** (CGIs) via [localhost:8080/icinga-mysql](http://localhost:8080/icinga-mysql).
-For **logging into** the Icinga classic web interface use user *icingaadmin* with password *icinga*.
-
-#### Icinga with IDOUtils using a PostgreSQL database
-
-**Installation path**: `/usr/local/icinga-pgsql`
-
-**Services**:
-
-* `icinga-pgsql`
-* `ido2db-pgsql`
-
-Connect to the **icinga mysql database** using the following command:
-
-    sudo -u postgres psql -U icinga -d icinga
-
-Access the **Classic UI** (CGIs) via [localhost:8080/icinga-pgsql](http://localhost:8080/icinga-pgsql).
-For **logging into** the Icinga classic web interface use user *icingaadmin* with password *icinga*.
-
-#### Monitoring Test Config
-
-Test config is added to both the MySQL and PostgreSQL Icinga instance utilizing the Perl module
-**Monitoring::Generator::TestConfig** to generate test config to **/usr/local/share/misc/monitoring_test_config**
-which is then copied to **<instance>/etc/conf.d/test_config/**.
-Configuration can be adjusted and recreated with **/usr/local/share/misc/monitoring_test_config/recreate.pl**.
-**Note** that you have to run
-
-    vagrant provision
-
-in the host after any modification to the script just mentioned.
-
-#### MK Livestatus
-
-MK Livestatus is added to the Icinga installation using a MySQL database.
-
-**Installation path**:
-
-* `/usr/local/icinga-mysql/bin/unixcat`
-* `/usr/local/icinga-mysql/lib/mk-livestatus/livecheck`
-* `/usr/local/icinga-mysql/lib/mk-livestatus/livestatus.o`
-* `/usr/local/icinga-mysql/etc/modules/mk-livestatus.cfg`
-* `/usr/local/icinga-mysql/var/rw/live`
-
-**Example usage**:
-
-    echo "GET hosts" | /usr/local/icinga-mysql/bin/unixcat /usr/local/icinga-mysql/var/rw/live
-
-#### LDAP example data
-
-The environment includes a openldap server with example data. *Domain* suffix is **dc=icinga,dc=org**.
-Administrator (*rootDN*) of the slapd configuration database is **cn=admin,cn=config** and the
-administrator (*rootDN*) of our database instance is **cn=admin,dc=icinga,dc=org**. Both share
-the *password* `admin`.
-
-Examples to query the slapd configuration database:
-
-    ldapsearch -x -W -LLL -D cn=admin,cn=config -b cn=config dn
-    ldapsearch -Y EXTERNAL -H ldapi:/// -LLL -b cn=config dn
-
-Examples to query our database instance:
-
-    ldapsearch -x -W -LLL -D cn=admin,dc=icinga,dc=org -b dc=icinga,dc=org dn
-    ldapsearch -Y EXTERNAL -H ldapi:/// -LLL -b dc=icinga,dc=org dn
-
-This is what the **dc=icinga,dc=org** *DIT* looks like:
-
-> dn: dc=icinga,dc=org
->
-> dn: ou=people,dc=icinga,dc=org
->
-> dn: ou=groups,dc=icinga,dc=org
->
-> dn: cn=Users,ou=groups,dc=icinga,dc=org
-> cn: Users
-> uniqueMember: cn=Jon Doe,ou=people,dc=icinga,dc=org
-> uniqueMember: cn=Jane Smith,ou=people,dc=icinga,dc=org
-> uniqueMember: cn=John Q. Public,ou=people,dc=icinga,dc=org
-> uniqueMember: cn=Richard Roe,ou=people,dc=icinga,dc=org
->
-> dn: cn=John Doe,ou=people,dc=icinga,dc=org
-> cn: John Doe
-> uid: jdoe
->
-> dn: cn=Jane Smith,ou=people,dc=icinga,dc=org
-> cn: Jane Smith
-> uid: jsmith
->
-> dn: cn=John Q. Public,ou=people,dc=icinga,dc=org
-> cn: John Q. Public
-> uid: jqpublic
->
-> dn: cn=Richard Roe,ou=people,dc=icinga,dc=org
-> cn: Richard Roe
-> uid: rroe
-
-All users share the password `password`.
-
-#### Testing the code
-
-All software required to run tests is installed in the virtual machine.
-In order to run all tests you have to execute the following commands:
-
-    vagrant ssh -c /vagrant/test/php/runtests
-    vagrant ssh -c /vagrant/test/php/checkswag
-    vagrant ssh -c /vagrant/test/js/runtests
-    vagrant ssh -c /vagrant/test/js/checkswag
-    vagrant ssh -c /vagrant/test/frontend/runtests
-
-`runtests` will execute unit and regression tests and `checkswag` will report
-code style issues.
-
-#### Icinga 2
-
-Installed from the Icinga [snapshot package repository](http://packages.icinga.org/epel/).
-The configuration is located in `/etc/icinga2`.
-
-**Example usage**:
-
-    /etc/init.d/icinga2 (start|stop|restart|reload)
-
-
-## Log into Icinga Web 2
-
-If you've configure LDAP as authentication backend (which is the default) use the following login credentials:
-
-> **Username**: jdoe
-> **Password**: password
-
-Have a look at [LDAP example data](#ldap example data) for more accounts.
-
-Using MySQL as backend:
-
-> **Username**: icingaadmin
-> **Password**: icinga
-

From 925bc80115282449e21c0fb9225bd8db145878a9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 15:12:43 +0100
Subject: [PATCH 0229/2920] puppet: Add vagrant to the icingaweb2 group

---
 .puppet/manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.puppet/manifests/site.pp b/.puppet/manifests/site.pp
index 08120d911..043f24dbb 100644
--- a/.puppet/manifests/site.pp
+++ b/.puppet/manifests/site.pp
@@ -13,5 +13,5 @@ node default {
     source => 'puppet:////vagrant/.puppet/files/etc/profile.d/env.sh'
   }
   @user { vagrant: ensure => present }
-  User <| title == vagrant |> { groups +> icingaweb }
+  User <| title == vagrant |> { groups +> hiera('icingaweb2::group') }
 }

From e98b6f15605a78c57c9829337b8767ef3584237c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 15:13:07 +0100
Subject: [PATCH 0230/2920] puppet: Do not enable the Icinga 2 feature
 ido-pgsql

Because Icinga 2 does not handle more than one IDO connection properly, the ido-pgsql will not be enabled by default.
---
 .puppet/modules/icinga2_pgsql/manifests/init.pp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.puppet/modules/icinga2_pgsql/manifests/init.pp b/.puppet/modules/icinga2_pgsql/manifests/init.pp
index 2326449af..95bc71034 100644
--- a/.puppet/modules/icinga2_pgsql/manifests/init.pp
+++ b/.puppet/modules/icinga2_pgsql/manifests/init.pp
@@ -11,7 +11,8 @@ class icinga2_pgsql {
     password   => 'icinga2',
     schemafile => '/usr/share/icinga2-ido-pgsql/schema/pgsql.sql',
   }
-  -> icinga2::feature { 'ido-pgsql':
-    source => 'puppet:///modules/icinga2_pgsql',
-  }
+# Because Icinga 2 does not handle more than one IDO connection properly, The ido-pgsql will not be enabled by default.
+#  -> icinga2::feature { 'ido-pgsql':
+#    source => 'puppet:///modules/icinga2_pgsql',
+#  }
 }

From 9cecc4d6908ffe66c78e2365991485d46c94532c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 15:13:33 +0100
Subject: [PATCH 0231/2920] doc: Add vagrant.md

---
 doc/vagrant.md | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 doc/vagrant.md

diff --git a/doc/vagrant.md b/doc/vagrant.md
new file mode 100644
index 000000000..6bcc2def9
--- /dev/null
+++ b/doc/vagrant.md
@@ -0,0 +1,52 @@
+# Vagrant
+
+## Requirements
+
+* Vagrant &gt;= version 1.4
+* VirtualBox or Parallels
+
+> **Note:** The deployment of the virtual machine is tested against Vagrant starting with version 1.4.
+> Unfortunately older versions will not work.
+
+## General
+
+The Icinga Web 2 project ships with a Vagrant virtual machine that integrates
+the source code with various services and example data in a controlled
+environment. This enables developers and users to test Livestatus,
+MySQL and PostgreSQL backends as well as the LDAP authentication. All you
+have to do is install Vagrant and run:
+
+````
+vagrant up
+````
+
+> **Note:** The first boot of the vm takes a fairly long time because
+> you'll download a plain CentOS base box and Vagrant will automatically
+> provision the environment on the first go.
+
+After you should be able to browse [localhost:8080/icingaweb2](http://localhost:8080/icingaweb2).
+
+## Log into Icinga Web 2
+
+Both LDAP and a MySQL are configured as authentication backend. Please use one of the following login credentials:
+
+> LDAP:
+>> **Username**: `jdoe`
+
+>> **Password**: `password`
+
+>MySQL:
+>> **Username**: `icingaadmin`
+
+>> **Password**: `icinga`
+
+
+
+## Testing the Source Code
+
+All software required to run tests is installed in the virtual machine.
+In order to run all tests you have to execute the following command:
+
+````
+vagrant ssh -c "icingacli test php unit"
+````

From 2288e2a687bc2a1c62cf798e1f712333cd85cc54 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 20 Jan 2015 15:54:14 +0100
Subject: [PATCH 0232/2920] Add support for nested wizards

The amount of vertical dimensions is not limited as well as the location a
nested wizard can occur in the main wizard's order. In case a custom
implementation is used as nested wizard, all core functionalities are
still being utilized.

refs #8191
---
 library/Icinga/Web/Wizard.php | 125 ++++++++++++++++++++++++++++++++--
 1 file changed, 119 insertions(+), 6 deletions(-)

diff --git a/library/Icinga/Web/Wizard.php b/library/Icinga/Web/Wizard.php
index 2cc4abe5a..811374259 100644
--- a/library/Icinga/Web/Wizard.php
+++ b/library/Icinga/Web/Wizard.php
@@ -39,6 +39,13 @@ class Wizard
      */
     const BTN_PREV = 'btn_prev';
 
+    /**
+     * This wizard's parent
+     *
+     * @var Wizard
+     */
+    protected $parent;
+
     /**
      * The name of the wizard's current page
      *
@@ -71,19 +78,55 @@ class Wizard
 
     }
 
+    /**
+     * Return this wizard's parent or null in case it has none
+     *
+     * @return  Wizard|null
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Set this wizard's parent
+     *
+     * @param   Wizard  $wizard     The parent wizard
+     *
+     * @return  self
+     */
+    public function setParent(Wizard $wizard)
+    {
+        $this->parent = $wizard;
+        return $this;
+    }
+
     /**
      * Return the pages being part of this wizard
      *
+     * In case this is a nested wizard a flattened array of all contained pages is returned.
+     *
      * @return  array
      */
     public function getPages()
     {
-        return $this->pages;
+        $pages = array();
+        foreach ($this->pages as $page) {
+            if ($page instanceof self) {
+                $pages = array_merge($pages, $page->getPages());
+            } else {
+                $pages[] = $page;
+            }
+        }
+
+        return $pages;
     }
 
     /**
      * Return the page with the given name
      *
+     * Note that it's also possible to retrieve a nested wizard's page by using this method.
+     *
      * @param   string      $name   The name of the page to return
      *
      * @return  null|Form           The page or null in case there is no page with the given name
@@ -98,22 +141,31 @@ class Wizard
     }
 
     /**
-     * Add a new page to this wizard
+     * Add a new page or wizard to this wizard
      *
-     * @param   Form    $page   The page to add to the wizard
+     * @param   Form|Wizard     $page   The page or wizard to add to the wizard
      *
      * @return  self
      */
-    public function addPage(Form $page)
+    public function addPage($page)
     {
+        if (! $page instanceof Form && ! $page instanceof self) {
+            throw InvalidArgumentException(
+                'The $page argument must be an instance of Icinga\Web\Form '
+                . 'or Icinga\Web\Wizard but is of type: ' . get_class($page)
+            );
+        } elseif ($page instanceof self) {
+            $page->setParent($this);
+        }
+
         $this->pages[] = $page;
         return $this;
     }
 
     /**
-     * Add multiple pages to this wizard
+     * Add multiple pages or wizards to this wizard
      *
-     * @param   array   $pages      The pages to add to the wizard
+     * @param   array   $pages      The pages or wizards to add to the wizard
      *
      * @return  self
      */
@@ -148,6 +200,10 @@ class Wizard
      */
     public function getCurrentPage()
     {
+        if ($this->parent) {
+            return $this->parent->getCurrentPage();
+        }
+
         if ($this->currentPage === null) {
             $this->assertHasPages();
             $pages = $this->getPages();
@@ -202,6 +258,10 @@ class Wizard
     {
         $page = $this->getCurrentPage();
 
+        if (($wizard = $this->findWizard($page)) !== null) {
+            return $wizard->handleRequest($request);
+        }
+
         if ($request === null) {
             $request = $page->getRequest();
         }
@@ -238,6 +298,39 @@ class Wizard
         return $request;
     }
 
+    /**
+     * Return the wizard for the given page or null if its not part of a wizard
+     *
+     * @param   Form    $page   The page to return its wizard for
+     *
+     * @return  Wizard|null
+     */
+    protected function findWizard(Form $page)
+    {
+        foreach ($this->getWizards() as $wizard) {
+            if ($wizard->getPage($page->getName()) === $page) {
+                return $wizard;
+            }
+        }
+    }
+
+    /**
+     * Return this wizard's child wizards
+     *
+     * @return  array
+     */
+    protected function getWizards()
+    {
+        $wizards = array();
+        foreach ($this->pages as $pageOrWizard) {
+            if ($pageOrWizard instanceof self) {
+                $wizards[] = $pageOrWizard;
+            }
+        }
+
+        return $wizards;
+    }
+
     /**
      * Return the request data based on given form's request method
      *
@@ -264,6 +357,10 @@ class Wizard
      */
     protected function getRequestedPage(array $requestData)
     {
+        if ($this->parent) {
+            return $this->parent->getRequestedPage($requestData);
+        }
+
         if (isset($requestData[static::BTN_NEXT])) {
             return $requestData[static::BTN_NEXT];
         } elseif (isset($requestData[static::BTN_PREV])) {
@@ -280,6 +377,10 @@ class Wizard
      */
     protected function getDirection(Request $request = null)
     {
+        if ($this->parent) {
+            return $this->parent->getDirection($request);
+        }
+
         $currentPage = $this->getCurrentPage();
 
         if ($request === null) {
@@ -312,6 +413,10 @@ class Wizard
      */
     protected function getNewPage($requestedPage, Form $originPage)
     {
+        if ($this->parent) {
+            return $this->parent->getNewPage($requestedPage, $originPage);
+        }
+
         if (($page = $this->getPage($requestedPage)) !== null) {
             $permitted = true;
 
@@ -344,6 +449,10 @@ class Wizard
      */
     protected function isLastPage(Form $page)
     {
+        if ($this->parent) {
+            return $this->parent->isLastPage($page);
+        }
+
         $pages = $this->getPages();
         return $page->getName() === end($pages)->getName();
     }
@@ -421,6 +530,10 @@ class Wizard
      */
     public function getSession()
     {
+        if ($this->parent) {
+            return $this->parent->getSession();
+        }
+
         return Session::getSession()->getNamespace(get_class($this));
     }
 

From 0300a90d145a3e2254c5d3151292f1ba4215c2ec Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 16:08:47 +0100
Subject: [PATCH 0233/2920] monitoring: Remove duplicate array key 'host_state'
 in the ListController

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

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 35dcd811f..aa00673b1 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -143,8 +143,7 @@ class Monitoring_ListController extends Controller
             'host_severity'     => $this->translate('Severity'),
             'host_name'         => $this->translate('Hostname'),
             'host_address'      => $this->translate('Address'),
-            'host_state'        => $this->translate('Current State'),
-            'host_state'        => $this->translate('Hard State')
+            'host_state'        => $this->translate('Current State')
         ));
         $this->view->hosts = $query->paginate();
 

From 680b7e4ebab19781e3a8840fbd0d728c68944436 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 16:11:41 +0100
Subject: [PATCH 0234/2920] monitoring: Prever 'Hostname' over 'Host name' in
 PHPDoc

---
 modules/monitoring/library/Monitoring/Object/Host.php    | 8 ++++----
 modules/monitoring/library/Monitoring/Object/Service.php | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index fd08f6a20..79a760d82 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -47,7 +47,7 @@ class Host extends MonitoredObject
     public $prefix = 'host_';
 
     /**
-     * Host name
+     * Hostname
      *
      * @var string
      */
@@ -63,8 +63,8 @@ class Host extends MonitoredObject
     /**
      * Create a new host
      *
-     * @param MonitoringBackend   $backend    Backend to fetch host information from
-     * @param string    $host       Host name
+     * @param MonitoringBackend $backend    Backend to fetch host information from
+     * @param string            $host       Hostname
      */
     public function __construct(MonitoringBackend $backend, $host)
     {
@@ -73,7 +73,7 @@ class Host extends MonitoredObject
     }
 
     /**
-     * Get the host name
+     * Get the hostname
      *
      * @return string
      */
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 6d5245f0d..64bfe530b 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -68,9 +68,9 @@ class Service extends MonitoredObject
     /**
      * Create a new service
      *
-     * @param MonitoringBackend   $backend    Backend to fetch service information from
-     * @param string    $host       Host name the service is running on
-     * @param string    $service    Service name
+     * @param MonitoringBackend $backend    Backend to fetch service information from
+     * @param string            $host       Hostname the service is running on
+     * @param string            $service    Service name
      */
     public function __construct(MonitoringBackend $backend, $host, $service)
     {

From ab0910e09b5276172df8f743e33026715f0971fb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 16:12:10 +0100
Subject: [PATCH 0235/2920] monitoring: Prefer 'Hostname' over 'Host name'

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

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index aa00673b1..a83a01e32 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -234,7 +234,7 @@ class Monitoring_ListController extends Controller
             'service_state_type'    => $this->translate('Hard State'),
             'host_severity'         => $this->translate('Host Severity'),
             'host_state'            => $this->translate('Current Host State'),
-            'host_name'             => $this->translate('Host Name'),
+            'host_name'             => $this->translate('Hostname'),
             'host_address'          => $this->translate('Host Address'),
             'host_last_check'       => $this->translate('Last Host Check')
         ));

From f5acd0c7b50a14e9f5471f8d3b457e9d749e426a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 16:12:48 +0100
Subject: [PATCH 0236/2920] monitoring: Remove unused use ... in the
 ListController

---
 .../monitoring/application/controllers/ListController.php   | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index a83a01e32..a24982d93 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -1,6 +1,4 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Backend;
@@ -12,13 +10,9 @@ use Icinga\Web\Widget\Tabextension\DashboardAction;
 use Icinga\Web\Widget\Tabextension\OutputFormat;
 use Icinga\Web\Widget\Tabs;
 use Icinga\Web\Widget\SortBox;
-use Icinga\Web\Widget\FilterBox;
-use Icinga\Web\Widget\Chart\HistoryColorGrid;
 use Icinga\Data\Filter\Filter;
 use Icinga\Web\Widget;
-use Icinga\Module\Monitoring\Web\Widget\SelectBox;
 use Icinga\Module\Monitoring\Forms\StatehistoryForm;
-use Icinga\Module\Monitoring\Forms\EventOverviewForm;
 
 class Monitoring_ListController extends Controller
 {

From 0b557b7b29a66722263c8310eaba7bc6af3172ae Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 16:14:56 +0100
Subject: [PATCH 0237/2920] monitoring: Fix unused local variable 'stateType'
 in the ListController

---
 .../monitoring/application/controllers/ListController.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index a24982d93..0b4066e7b 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -91,12 +91,10 @@ class Monitoring_ListController extends Controller
         }
 
         // Handle soft and hard states
-        $stateType = $this->params->shift('stateType', 'soft');
-        if ($stateType == 'hard') {
+        if (strtolower($this->params->shift('stateType', 'soft')) === 'hard') {
             $stateColumn = 'host_hard_state';
             $stateChangeColumn = 'host_last_hard_state_change';
         } else {
-            $stateType = 'soft';
             $stateColumn = 'host_state';
             $stateChangeColumn = 'host_last_state_change';
         }
@@ -164,14 +162,12 @@ class Monitoring_ListController extends Controller
         }
 
         // Handle soft and hard states
-        $stateType = $this->params->shift('stateType', 'soft');
-        if ($stateType == 'hard') {
+        if (strtolower($this->params->shift('stateType', 'soft')) === 'hard') {
             $stateColumn = 'service_hard_state';
             $stateChangeColumn = 'service_last_hard_state_change';
         } else {
             $stateColumn = 'service_state';
             $stateChangeColumn = 'service_last_state_change';
-            $stateType = 'soft';
         }
 
         $this->addTitleTab('services', $this->translate('Services'));

From ab7a5763a67512d895e8f93cd381fdede7a96952 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 16:21:56 +0100
Subject: [PATCH 0238/2920] monitoring: Sort by host_display_name instead of
 name1 by default

refs #7843
---
 modules/monitoring/library/Monitoring/DataView/HostStatus.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index e9b5b60dd..86bff52bf 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -24,6 +24,7 @@ class HostStatus extends DataView
         return array(
             'host',
             'host_name',
+            'host_display_name',
             'host_alias',
             'host_address',
             'host_state',
@@ -90,7 +91,7 @@ class HostStatus extends DataView
     public function getSortRules()
     {
         return array(
-            'host_name' => array(
+            'host_display_name' => array(
                 'order' => self::SORT_ASC
             ),
             'host_address' => array(

From 9fd90c90cc84742c6f0e7871c0e24dace35a3c4f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 16:22:36 +0100
Subject: [PATCH 0239/2920] monitoring: Sort by host_display_name when sorting
 by 'Hostname' in the hosts overview

refs #7843
---
 modules/monitoring/application/controllers/ListController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 0b4066e7b..d680faaf8 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -133,7 +133,7 @@ class Monitoring_ListController extends Controller
         $this->setupSortControl(array(
             'host_last_check'   => $this->translate('Last Check'),
             'host_severity'     => $this->translate('Severity'),
-            'host_name'         => $this->translate('Hostname'),
+            'host_display_name' => $this->translate('Hostname'),
             'host_address'      => $this->translate('Address'),
             'host_state'        => $this->translate('Current State')
         ));

From f1ada110f8bdeac6756d2c3dac7a283db7d5366d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 16:23:12 +0100
Subject: [PATCH 0240/2920] monitoring: Select the host_display_name in the
 hosts overview

refs #7843
---
 modules/monitoring/application/controllers/ListController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index d680faaf8..46bb6245e 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -104,6 +104,7 @@ class Monitoring_ListController extends Controller
         $query = $this->backend->select()->from('hostStatus', array_merge(array(
             'host_icon_image',
             'host_name',
+            'host_display_name',
             'host_state' => $stateColumn,
             'host_address',
             'host_acknowledged',

From fe3bbb712d32f4d30c575f6ec7228e707cbf400c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 16:25:35 +0100
Subject: [PATCH 0241/2920] monitoring: Use host_display_name for displaying
 the host name in the hosts overview

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

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 920a77e01..91f59f422 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -98,7 +98,7 @@ if ($hosts->count() === 0) {
         <?= $this->icon($this->resolveMacros($host->host_icon_image, $host)) ?>
         <?php endif ?>
         <?= implode(' ', $icons) ?>
-        <a href="<?= $hostLink  ?>"><?= $host->host_name ?></a>
+        <a href="<?= $hostLink  ?>"><?= $host->host_display_name ?></a>
         <?php if (isset($host->host_unhandled_services) && $host->host_unhandled_services > 0): ?>
         <span title="<?=
             $host->host_unhandled_services

From e93628f4b421384c56d807afd24ac25e2169a640 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Jan 2015 16:53:27 +0100
Subject: [PATCH 0242/2920] Prefer 'hostname' over 'host name' in the
 LdapDiscoveryForm

---
 application/forms/LdapDiscoveryForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/forms/LdapDiscoveryForm.php b/application/forms/LdapDiscoveryForm.php
index ea5f3a99e..6a14c2ecd 100644
--- a/application/forms/LdapDiscoveryForm.php
+++ b/application/forms/LdapDiscoveryForm.php
@@ -48,7 +48,7 @@ class LdapDiscoveryForm extends Form
                 array(
                     'required'      => false,
                     'label'         => $this->translate('Host'),
-                    'description'   => $this->translate('IP or host name to search.'),
+                    'description'   => $this->translate('IP or hostname to search.'),
                 )
             );
 

From 095d9437b80dcc696b3a395e3d0bab04a203e397 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 20 Jan 2015 17:33:29 +0100
Subject: [PATCH 0243/2920] Adjust the wizard's progress bar

Moved the "Modules" step to the left and removed the "Summary" step.

refs #8191
---
 .../views/scripts/index/index.phtml           | 45 ++++++++-----------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/modules/setup/application/views/scripts/index/index.phtml b/modules/setup/application/views/scripts/index/index.phtml
index 9af37be7c..1c614a0a6 100644
--- a/modules/setup/application/views/scripts/index/index.phtml
+++ b/modules/setup/application/views/scripts/index/index.phtml
@@ -4,7 +4,7 @@ use Icinga\Web\Notification;
 
 $pages = $wizard->getPages();
 $finished = isset($success);
-$configPages = array_slice($pages, 2, count($pages) - 4, true);
+$configPages = array_slice($pages, 3, count($pages) - 1, true);
 $currentPos = array_search($wizard->getCurrentPage(), $pages, true);
 list($configPagesLeft, $configPagesRight) = array_chunk($configPages, count($configPages) / 2, true);
 
@@ -41,19 +41,32 @@ if ($notifications->hasMessages()) {
         </tr></tbody></table>
       </div>
       <div class="step" style="width: 10%;">
-        <h1><?= mt('setup', 'Requirements', 'setup.progress'); ?></h1>
+        <h1><?= $this->translate('Modules', 'setup.progress'); ?></h1>
         <?php $stateClass = $finished || $currentPos > 1 ? ' complete' : (
           $maxProgress > 1 ? ' visited' : (
             $currentPos === 1 ? ' active' : ''
           )
         ); ?>
+        <table><tbody><tr>
+          <td class="left"><div class="line left<?= $stateClass; ?>"></div></td>
+          <td class="middle"><div class="bubble <?= $stateClass; ?>"></div></td>
+          <td class="right"><div class="line right <?= $stateClass; ?>"></div></td>
+        </tr></tbody></table>
+      </div>
+      <div class="step" style="width: 10%;">
+        <h1><?= mt('setup', 'Requirements', 'setup.progress'); ?></h1>
+        <?php $stateClass = $finished || $currentPos > 2 ? ' complete' : (
+          $maxProgress > 2 ? ' visited' : (
+            $currentPos === 2 ? ' active' : ''
+          )
+        ); ?>
         <table><tbody><tr>
           <td class="left"><div class="line left<?= $stateClass; ?>"></div></td>
           <td class="middle"><div class="bubble<?= $stateClass; ?>"></div></td>
           <td class="right"><div class="line right<?= $stateClass; ?>"></div></td>
         </tr></tbody></table>
       </div>
-      <div class="step" style="width: 50%;">
+      <div class="step" style="width: 60%;">
         <h1><?= mt('setup', 'Configuration', 'setup.progress'); ?></h1>
         <table><tbody><tr>
           <td class="left">
@@ -64,7 +77,7 @@ if ($notifications->hasMessages()) {
           ?>
           <?php foreach ($configPagesLeft as $pos => $page): ?>
             <?php $stateClass = $finished || $pos < $currentPos ? ' complete' : (
-              $pos < $maxProgress ? ' visited' : ($currentPos > 1 ? ' active' : '')
+              $pos < $maxProgress ? ' visited' : ($currentPos > 2 ? ' active' : '')
             ); ?>
             <?php if ($page === $firstPage): ?>
             <div class="line left<?= $stateClass; ?>" style="float: left; width: <?= $lineWidth; ?>%; margin-right: 0"></div>
@@ -78,7 +91,7 @@ if ($notifications->hasMessages()) {
           <td class="middle">
             <div class="bubble<?= array_key_exists($currentPos, $configPagesLeft) ? (
               key($configPagesRight) <= $maxProgress ? ' visited' : ' active') : (
-              $finished || $currentPos > 1 ? ' complete' : (
+              $finished || $currentPos > 2 ? ' complete' : (
                 key($configPagesRight) < $maxProgress ? ' visited' : ''
               )
             ); ?>"></div>
@@ -91,7 +104,7 @@ if ($notifications->hasMessages()) {
           ?>
           <?php foreach ($configPagesRight as $pos => $page): ?>
             <?php $stateClass = $finished || $pos < $currentPos ? ' complete' : (
-              $pos < $maxProgress ? ' visited' : ($currentPos > 1 ? ' active' : '')
+              $pos < $maxProgress ? ' visited' : ($currentPos > 2 ? ' active' : '')
             ); ?>
             <?php if ($page === $firstPage): ?>
             <div class="line<?= $stateClass; ?>" style="float: left; width: <?= $lineWidth; ?>%; margin-left: -0.1em;"></div>
@@ -104,26 +117,6 @@ if ($notifications->hasMessages()) {
           </td>
         </tr></tbody></table>
       </div>
-      <div class="step" style="width: 10%;">
-        <h1><?= mt('setup', 'Modules', 'setup.progress'); ?></h1>
-        <?php $stateClass = $finished || $currentPos > count($pages) - 2 ? ' complete' : (
-          $maxProgress > count($pages) - 2 ? ' visited' : ($currentPos === count($pages) - 2 ? ' active' : '')
-        ); ?>
-        <table><tbody><tr>
-          <td class="left"><div class="line left<?= $stateClass; ?>"></div></td>
-          <td class="middle"><div class="bubble<?= $stateClass; ?>"></div></td>
-          <td class="right"><div class="line right<?= $stateClass; ?>"></div></td>
-        </tr></tbody></table>
-      </div>
-      <div class="step" style="width: 10%;">
-        <h1><?= mt('setup', 'Summary', 'setup.progress'); ?></h1>
-        <?php $stateClass = $finished ? ' complete' : ($currentPos === count($pages) - 1 ? ' active' : ''); ?>
-        <table><tbody><tr>
-          <td class="left"><div class="line left<?= $stateClass; ?>"></div></td>
-          <td class="middle"><div class="bubble<?= $stateClass; ?>"></div></td>
-          <td class="right"><div class="line right<?= $stateClass; ?>"></div></td>
-        </tr></tbody></table>
-      </div>
       <div class="step" style="width: 10%;">
         <h1><?= mt('setup', 'Finish', 'setup.progress'); ?></h1>
         <?php $stateClass = $finished ? ' active' : ''; ?>

From 99699a14ad1f47b1b971e2e210456142dd043a66 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 20 Jan 2015 17:39:47 +0100
Subject: [PATCH 0244/2920] Replace all mt() calls with translate() in the
 setup module's view scripts

---
 .../views/scripts/form/setup-modules.phtml    | 10 +++++-----
 .../scripts/form/setup-requirements.phtml     |  2 +-
 .../views/scripts/form/setup-summary.phtml    |  3 +--
 .../views/scripts/form/setup-welcome.phtml    | 19 ++++++++-----------
 .../views/scripts/index/index.phtml           |  8 ++++----
 .../views/scripts/index/parts/finish.phtml    |  8 ++++----
 6 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/modules/setup/application/views/scripts/form/setup-modules.phtml b/modules/setup/application/views/scripts/form/setup-modules.phtml
index a352803d7..304aad9b8 100644
--- a/modules/setup/application/views/scripts/form/setup-modules.phtml
+++ b/modules/setup/application/views/scripts/form/setup-modules.phtml
@@ -4,8 +4,8 @@ use Icinga\Web\Wizard;
 
 ?>
 <div class="module-menu">
-  <p><?= mt('setup', 'The following modules can be set up by using a web-based wizard as well. To setup a module, just complete its wizard and advance to the summary!'); ?></p>
-  <p><?= mt('setup', 'You can freely switch to a module\'s wizard by clicking its name below. The wizard you are currently looking at is written in bold. A small tick is shown on the right once a wizard has been completed.'); ?></p>
+  <p><?= $this->translate('The following modules can be set up by using a web-based wizard as well. To setup a module, just complete its wizard and advance to the summary!'); ?></p>
+  <p><?= $this->translate('You can freely switch to a module\'s wizard by clicking its name below. The wizard you are currently looking at is written in bold. A small tick is shown on the right once a wizard has been completed.'); ?></p>
   <form name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
     <?= $form->getElement($form->getTokenElementName()); ?>
     <?= $form->getElement($form->getUidElementName()); ?>
@@ -19,7 +19,7 @@ use Icinga\Web\Wizard;
           <?= $isActive ? '<strong>' : '' ?><?= $module->getTitle(); ?><?= $isActive ? '</strong>' : '' ?>
         </button>
        <?php if ($module->getSetupWizard()->isFinished()): ?>
-        <?= $this->icon('ok', mt('setup', 'Completed', 'setup.modules.wizard.state')); ?>
+        <?= $this->icon('ok', $this->translate('Completed', 'setup.modules.wizard.state')); ?>
        <?php else: ?>
         <?php $allFinished = false; ?>
        <?php endif ?>
@@ -29,9 +29,9 @@ use Icinga\Web\Wizard;
     </ul>
   </form>
  <?php if ($allFinished): ?>
-  <p class="all-completed"><?= mt('setup', 'You\'ve completed all module wizards!'); ?></p>
+  <p class="all-completed"><?= $this->translate('You\'ve completed all module wizards!'); ?></p>
  <?php else: ?>
-  <p style="font-size: 80%;"><?= mt('setup', 'Note that you can skip a specific module by just not completing its wizard.'); ?></p>
+  <p style="font-size: 80%;"><?= $this->translate('Note that you can skip a specific module by just not completing its wizard.'); ?></p>
  <?php endif ?>
 </div>
 <div class="module-wizard">
diff --git a/modules/setup/application/views/scripts/form/setup-requirements.phtml b/modules/setup/application/views/scripts/form/setup-requirements.phtml
index ca2556b95..09d337a02 100644
--- a/modules/setup/application/views/scripts/form/setup-requirements.phtml
+++ b/modules/setup/application/views/scripts/form/setup-requirements.phtml
@@ -22,7 +22,7 @@ $requirements = $form->getRequirements();
       <td></td>
       <td class="btn-update">
         <div class="buttons">
-          <a title="<?= $this->translate('You may also need to restart the web-server for the changes to take effect!'); ?>" href="<?= $this->href(); ?>" class="button-like"><?= mt('setup', 'Refresh'); ?></a>
+          <a title="<?= $this->translate('You may also need to restart the web-server for the changes to take effect!'); ?>" href="<?= $this->href(); ?>" class="button-like"><?= $this->translate('Refresh'); ?></a>
         </div>
       </td>
     </tr>
diff --git a/modules/setup/application/views/scripts/form/setup-summary.phtml b/modules/setup/application/views/scripts/form/setup-summary.phtml
index 714416833..fa354feb5 100644
--- a/modules/setup/application/views/scripts/form/setup-summary.phtml
+++ b/modules/setup/application/views/scripts/form/setup-summary.phtml
@@ -4,8 +4,7 @@ use Icinga\Web\Wizard;
 
 ?>
 <p><?= sprintf(
-  mt(
-    'setup',
+  $this->translate(
     'The wizard is now complete. You can review the changes supposed to be made before setting up %1$s.'
     . ' Make sure that everything is correct (Feel free to navigate back to make any corrections!) so'
     . ' that you can start using %1$s right after it has successfully been set up.'
diff --git a/modules/setup/application/views/scripts/form/setup-welcome.phtml b/modules/setup/application/views/scripts/form/setup-welcome.phtml
index 8d3ba67c5..aa51ffba6 100644
--- a/modules/setup/application/views/scripts/form/setup-welcome.phtml
+++ b/modules/setup/application/views/scripts/form/setup-welcome.phtml
@@ -11,16 +11,14 @@ $cliPath = realpath(Icinga::app()->getApplicationDir() . '/../bin/icingacli');
 
 ?>
 <div class="welcome-page">
-  <h2><?= mt('setup', 'Welcome to the configuration of Icinga Web 2!') ?></h2>
+  <h2><?= $this->translate('Welcome to the configuration of Icinga Web 2!') ?></h2>
  <?php if (false === file_exists($setupTokenPath) && file_exists(Config::resolvePath('config.ini'))): ?>
-  <p class="restart-warning"><?= mt(
-    'setup',
+  <p class="restart-warning"><?= $this->translate(
     'You\'ve already completed the configuration of Icinga Web 2. Note that most of your configuration'
       . ' files will be overwritten in case you\'ll re-configure Icinga Web 2 using this wizard!'
   ); ?></p>
  <?php else: ?>
-  <p><?= mt(
-    'setup',
+  <p><?= $this->translate(
     'This wizard will guide you through the configuration of Icinga Web 2. Once completed and successfully'
     . ' finished you are able to log in and to explore all the new and stunning features!'
   ); ?></p>
@@ -39,23 +37,22 @@ $cliPath = realpath(Icinga::app()->getApplicationDir() . '/../bin/icingacli');
     </div>
     <div>
       <p><?=
-        mt(
-          'setup',
+        $this->translate(
           'To run this wizard a user needs to authenticate using a token which is usually'
           . ' provided to him by an administrator who\'d followed the instructions below.'
       ); ?></p>
-      <p><?= mt('setup', 'If you\'ve got the IcingaCLI installed you can do the following:'); ?></p>
+      <p><?= $this->translate('If you\'ve got the IcingaCLI installed you can do the following:'); ?></p>
       <div class="code">
         <span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup config directory --group <?= ($user = Platform::getPhpUser()) !== null ? $user : 'your_webserver_group'; ?><?= $configDir !== '/etc/icingaweb2' ? ' --config ' . $configDir : ''; ?>;</span>
         <span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup token create;</span>
       </div>
-      <p><?= mt('setup', 'In case the IcingaCLI is missing you can create the token manually:'); ?></p>
+      <p><?= $this->translate('In case the IcingaCLI is missing you can create the token manually:'); ?></p>
       <div class="code">
         <span>su <?= ($user = Platform::getPhpUser()) !== null ? $user : 'your_webserver_user'; ?> -c "mkdir -m 2770 <?= dirname($setupTokenPath); ?>; head -c 12 /dev/urandom | base64 | tee <?= $setupTokenPath; ?>; chmod 0660 <?= $setupTokenPath; ?>;";</span>
       </div>
       <p><?= sprintf(
-        mt('setup', 'Please see the %s for an extensive description on how to access and use this wizard.'),
-        '<a href="http://docs.icinga.org/">' . mt('setup', 'Icinga Web 2 documentation') . '</a>' // TODO: Add link to iw2 docs which points to the installation topic
+        $this->translate('Please see the %s for an extensive description on how to access and use this wizard.'),
+        '<a href="http://docs.icinga.org/">' . $this->translate('Icinga Web 2 documentation') . '</a>' // TODO: Add link to iw2 docs which points to the installation topic
       ); ?></p>
     </div>
   </div>
diff --git a/modules/setup/application/views/scripts/index/index.phtml b/modules/setup/application/views/scripts/index/index.phtml
index 1c614a0a6..d12343d5b 100644
--- a/modules/setup/application/views/scripts/index/index.phtml
+++ b/modules/setup/application/views/scripts/index/index.phtml
@@ -30,7 +30,7 @@ if ($notifications->hasMessages()) {
     <?= $this->img('img/logo_icinga_big.png'); ?>
     <div class="progress-bar">
       <div class="step" style="width: 10%;">
-        <h1><?= mt('setup', 'Welcome', 'setup.progress'); ?></h1>
+        <h1><?= $this->translate('Welcome', 'setup.progress'); ?></h1>
         <?php $stateClass = $finished || $currentPos > 0 ? 'complete' : (
           $maxProgress > 0 ? 'visited' : 'active'
         ); ?>
@@ -54,7 +54,7 @@ if ($notifications->hasMessages()) {
         </tr></tbody></table>
       </div>
       <div class="step" style="width: 10%;">
-        <h1><?= mt('setup', 'Requirements', 'setup.progress'); ?></h1>
+        <h1><?= $this->translate('Requirements', 'setup.progress'); ?></h1>
         <?php $stateClass = $finished || $currentPos > 2 ? ' complete' : (
           $maxProgress > 2 ? ' visited' : (
             $currentPos === 2 ? ' active' : ''
@@ -67,7 +67,7 @@ if ($notifications->hasMessages()) {
         </tr></tbody></table>
       </div>
       <div class="step" style="width: 60%;">
-        <h1><?= mt('setup', 'Configuration', 'setup.progress'); ?></h1>
+        <h1><?= $this->translate('Configuration', 'setup.progress'); ?></h1>
         <table><tbody><tr>
           <td class="left">
           <?php
@@ -118,7 +118,7 @@ if ($notifications->hasMessages()) {
         </tr></tbody></table>
       </div>
       <div class="step" style="width: 10%;">
-        <h1><?= mt('setup', 'Finish', 'setup.progress'); ?></h1>
+        <h1><?= $this->translate('Finish', 'setup.progress'); ?></h1>
         <?php $stateClass = $finished ? ' active' : ''; ?>
         <table><tbody><tr>
           <td class="left"><div class="line left<?= $stateClass; ?>"></div></td>
diff --git a/modules/setup/application/views/scripts/index/parts/finish.phtml b/modules/setup/application/views/scripts/index/parts/finish.phtml
index 94217017d..e695d72ce 100644
--- a/modules/setup/application/views/scripts/index/parts/finish.phtml
+++ b/modules/setup/application/views/scripts/index/parts/finish.phtml
@@ -11,16 +11,16 @@
     <?php endif ?>
   <?php endforeach ?>
   <?php if ($success): ?>
-    <p class="success"><?= mt('setup', 'Congratulations! Icinga Web 2 has been successfully set up.'); ?></p>
+    <p class="success"><?= $this->translate('Congratulations! Icinga Web 2 has been successfully set up.'); ?></p>
   <?php else: ?>
-    <p class="failure"><?= mt('setup', 'Sorry! Failed to set up Icinga Web 2 successfully.'); ?></p>
+    <p class="failure"><?= $this->translate('Sorry! Failed to set up Icinga Web 2 successfully.'); ?></p>
   <?php endif ?>
   </div>
   <div class="buttons">
   <?php if ($success): ?>
-    <a href="<?= $this->href('authentication/login'); ?>" class="button-like login"><?= mt('setup', 'Login to Icinga Web 2'); ?></a>
+    <a href="<?= $this->href('authentication/login'); ?>" class="button-like login"><?= $this->translate('Login to Icinga Web 2'); ?></a>
   <?php else: ?>
-    <a href="<?= $this->href(); ?>" class="button-like"><?= mt('setup', 'Back'); ?></a>
+    <a href="<?= $this->href(); ?>" class="button-like"><?= $this->translate('Back'); ?></a>
   <?php endif ?>
   </div>
 </div>
\ No newline at end of file

From 9e8c897d6faec2860e3cbc8fe9866f3ed7d1ac22 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 09:13:10 +0100
Subject: [PATCH 0245/2920] monitoring: Order a data view before dumping

---
 modules/monitoring/library/Monitoring/DataView/DataView.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 1fdd8b4f9..5900df737 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -83,6 +83,7 @@ abstract class DataView implements Browsable, Countable, Filterable, Sortable
 
     public function dump()
     {
+        $this->order();
         return $this->query->dump();
     }
 

From e602717bd96bfce12f65cf8d0ebe23469033eb50 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 09:15:07 +0100
Subject: [PATCH 0246/2920] monitoring: Sort by display_names instead of name1
 and name2  by default in the services overview

refs #7843
---
 .../library/Monitoring/DataView/ServiceStatus.php        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index 9edcabc87..9ecc8e309 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -25,6 +25,7 @@ class ServiceStatus extends DataView
     {
         return array(
             'host_name',
+            'host_display_name',
             'host_state',
             'host_state_type',
             'host_last_state_change',
@@ -123,17 +124,17 @@ class ServiceStatus extends DataView
     public function getSortRules()
     {
         return array(
-            'host_name' => array(
+            'host_display_name' => array(
                 'columns' => array(
-                    'service_host_name',
-                    'service_description'
+                    'host_display_name',
+                    'service_display_name'
                 ),
                 'order' => self::SORT_ASC
             ),
             'host_address' => array(
                 'columns' => array(
                     'host_ipv4',
-                    'service_description'
+                    'service_display_name'
                 ),
                 'order' => self::SORT_ASC
             ),

From 9d5dccc484660d81bab277be4ea07af59293d264 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 09:22:44 +0100
Subject: [PATCH 0247/2920] monitoring: Sort by display_name when sorting by
 'Hostname' or 'Service Name' in the services overview

refs #7843
---
 modules/monitoring/application/controllers/ListController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 46bb6245e..136b9f9a4 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -221,11 +221,11 @@ class Monitoring_ListController extends Controller
             'service_last_check'    => $this->translate('Last Service Check'),
             'service_severity'      => $this->translate('Severity'),
             'service_state'         => $this->translate('Current Service State'),
-            'service_description'   => $this->translate('Service Name'),
+            'service_display_name'  => $this->translate('Service Name'),
             'service_state_type'    => $this->translate('Hard State'),
             'host_severity'         => $this->translate('Host Severity'),
             'host_state'            => $this->translate('Current Host State'),
-            'host_name'             => $this->translate('Hostname'),
+            'host_display_name'     => $this->translate('Hostname'),
             'host_address'          => $this->translate('Host Address'),
             'host_last_check'       => $this->translate('Last Host Check')
         ));

From a6ad5ad865ded93eeb457b9bc2d847bfd7ae276c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 09:30:33 +0100
Subject: [PATCH 0248/2920] monitoring: Reorder sort column combo box in the
 hosts overview

---
 modules/monitoring/application/controllers/ListController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 136b9f9a4..80375a33d 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -132,11 +132,11 @@ class Monitoring_ListController extends Controller
         $this->filterQuery($query);
 
         $this->setupSortControl(array(
-            'host_last_check'   => $this->translate('Last Check'),
             'host_severity'     => $this->translate('Severity'),
+            'host_state'        => $this->translate('Current State'),
             'host_display_name' => $this->translate('Hostname'),
             'host_address'      => $this->translate('Address'),
-            'host_state'        => $this->translate('Current State')
+            'host_last_check'   => $this->translate('Last Check')
         ));
         $this->view->hosts = $query->paginate();
 

From 5df6828889618a4924d37c8b1e14c08aa7c7c99f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 09:31:38 +0100
Subject: [PATCH 0249/2920] monitoring: Remove ununsed sort rule in the
 ServiceStatus

---
 .../monitoring/library/Monitoring/DataView/ServiceStatus.php   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index 9edcabc87..e90caef9e 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -137,9 +137,6 @@ class ServiceStatus extends DataView
                 ),
                 'order' => self::SORT_ASC
             ),
-            'host_last_state_change' => array(
-                'order' => self::SORT_ASC
-            ),
             'host_severity' => array(
                 'columns' => array(
                     'host_severity',

From f661713bbb68e97ac80dc4f501d4212e4f1edced Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 09:35:33 +0100
Subject: [PATCH 0250/2920] monitoring: Reorder the sort by combobox in the
 services overview

---
 .../monitoring/application/controllers/ListController.php    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 80375a33d..43fbd24c3 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -218,11 +218,10 @@ class Monitoring_ListController extends Controller
 
         $this->filterQuery($query);
         $this->setupSortControl(array(
-            'service_last_check'    => $this->translate('Last Service Check'),
-            'service_severity'      => $this->translate('Severity'),
+            'service_severity'      => $this->translate('Service Severity'),
             'service_state'         => $this->translate('Current Service State'),
             'service_display_name'  => $this->translate('Service Name'),
-            'service_state_type'    => $this->translate('Hard State'),
+            'service_last_check'    => $this->translate('Last Service Check'),
             'host_severity'         => $this->translate('Host Severity'),
             'host_state'            => $this->translate('Current Host State'),
             'host_display_name'     => $this->translate('Hostname'),

From c77996d5b924340f114adae87dc32cac2815df74 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 09:37:45 +0100
Subject: [PATCH 0251/2920] monitoring: Sort the services overview by service
 severity by default

---
 .../Monitoring/DataView/ServiceStatus.php     | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index a4c9cfee8..e7e2accb2 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -124,6 +124,20 @@ class ServiceStatus extends DataView
     public function getSortRules()
     {
         return array(
+            'service_severity' => array(
+                'columns' => array(
+                    'service_severity',
+                    'service_last_state_change'
+                ),
+                'order' => self::SORT_DESC
+            ),
+            'host_severity' => array(
+                'columns' => array(
+                    'host_severity',
+                    'host_last_state_change',
+                ),
+                'order' => self::SORT_ASC
+            ),
             'host_display_name' => array(
                 'columns' => array(
                     'host_display_name',
@@ -137,20 +151,6 @@ class ServiceStatus extends DataView
                     'service_display_name'
                 ),
                 'order' => self::SORT_ASC
-            ),
-            'host_severity' => array(
-                'columns' => array(
-                    'host_severity',
-                    'host_last_state_change',
-                ),
-                'order' => self::SORT_ASC
-            ),
-            'service_severity' => array(
-                'columns' => array(
-                    'service_severity',
-                    'service_last_state_change',
-                ),
-                'order' => self::SORT_DESC
             )
         );
     }

From 3bb5a9c7024f0c1fde28f5e7937e3bffab95d52e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 09:41:52 +0100
Subject: [PATCH 0252/2920] monitoring: Select the host_display_name column in
 the services overview

refs #7843
---
 modules/monitoring/application/controllers/ListController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 43fbd24c3..23400849c 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -182,6 +182,7 @@ class Monitoring_ListController extends Controller
 
         $columns = array_merge(array(
             'host_name',
+            'host_display_name',
             'host_state',
             'host_state_type',
             'host_last_state_change',

From 23243d40e393a3ae66628f5106159ebb003f11c1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 09:42:10 +0100
Subject: [PATCH 0253/2920] monitoring: Use host_display_name for displaying
 the host name in the services overview

refs #7843
---
 .../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 0b63c7887..5241c009b 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -107,7 +107,7 @@ foreach ($services as $service):
       <?php if ($service->service_icon_image && ! preg_match('/[\'"]/', $service->service_icon_image)): ?>
       <?= $this->icon($this->resolveMacros($service->service_icon_image, $service)) ?>
       <?php endif ?>
-<a href="<?= $serviceLink ?>"><?= $service->service_display_name ?></a><?php if ($this->showHost): ?> on <a href="<?= $hostLink ?>"><?= $service->host_name; ?>
+<a href="<?= $serviceLink ?>"><?= $service->service_display_name ?></a><?php if ($this->showHost): ?> on <a href="<?= $hostLink ?>"><?= $service->host_display_name; ?>
 <?php if ($service->host_state != 0): ?>
   (<?= strtoupper(Host::getStateText($service->host_state, true)); ?>)
 <?php endif ?>

From e55cf73f3481f22eecfa1f8bf17872a8ce0c5c9d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 09:55:17 +0100
Subject: [PATCH 0254/2920] monitoring: Select the host and service
 display_name columns in the eventhistory overview

refs #7843
---
 modules/monitoring/application/controllers/ListController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 23400849c..aefe93b15 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -580,7 +580,9 @@ class Monitoring_ListController extends Controller
 
         $query = $this->backend->select()->from('eventHistory', array(
             'host_name',
+            'host_display_name',
             'service_description',
+            'service_display_name',
             'object_type',
             'timestamp',
             'state',

From b468be2813ba2c073f46e281b8490591305eafba Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 21 Jan 2015 09:59:48 +0100
Subject: [PATCH 0255/2920] Drop the ModulePage

refs #8191
---
 .../setup/application/forms/ModulePage.php    | 161 ------------------
 modules/setup/library/Setup/WebWizard.php     |  15 --
 2 files changed, 176 deletions(-)
 delete mode 100644 modules/setup/application/forms/ModulePage.php

diff --git a/modules/setup/application/forms/ModulePage.php b/modules/setup/application/forms/ModulePage.php
deleted file mode 100644
index 5e8927dbc..000000000
--- a/modules/setup/application/forms/ModulePage.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Module\Setup\Forms;
-
-use InvalidArgumentException;
-use Icinga\Application\Icinga;
-use Icinga\Web\Form;
-use Icinga\Web\Session;
-use Icinga\Web\Request;
-
-class ModulePage extends Form
-{
-    protected $session;
-
-    protected $wizards;
-
-    protected $modules;
-
-    protected $pageData;
-
-    protected $modulePaths;
-
-    /**
-     * Initialize this page
-     */
-    public function init()
-    {
-        $this->setName('setup_modules');
-        $this->setViewScript('form/setup-modules.phtml');
-        $this->session = Session::getSession()->getNamespace(get_class($this));
-
-        $this->modulePaths = array();
-        if (($appModulePath = realpath(Icinga::app()->getApplicationDir() . '/../modules')) !== false) {
-            $this->modulePaths[] = $appModulePath;
-        }
-    }
-
-    public function setPageData(array $pageData)
-    {
-        $this->pageData = $pageData;
-        return $this;
-    }
-
-    public function handleRequest(Request $request = null)
-    {
-        $isPost = strtolower($request->getMethod()) === 'post';
-        if ($isPost && $this->wasSent($request->getPost())) {
-            if (($newModule = $request->getPost('module')) !== null) {
-                $this->setCurrentModule($newModule);
-                $this->getResponse()->redirectAndExit($this->getRedirectUrl());
-            } else {
-                // The user submitted this form but with the parent wizard's navigation
-                // buttons so it's now up to the parent wizard to handle the request..
-            }
-        } else {
-            $wizard = $this->getCurrentWizard();
-            $wizardPage = $wizard->getCurrentPage();
-
-            $wizard->handleRequest($request);
-            if ($isPost && $wizard->isFinished() && $wizardPage->wasSent($request->getPost())) {
-                $wizards = $this->getWizards();
-
-                $newModule = null;
-                foreach ($wizards as $moduleName => $moduleWizard) {
-                    if (false === $moduleWizard->isFinished()) {
-                        $newModule = $moduleName;
-                    }
-                }
-
-                if ($newModule === null) {
-                    // In case all module wizards were completed just pick the first one again
-                    reset($wizards);
-                    $newModule = key($wizards);
-                }
-
-                $this->setCurrentModule($newModule);
-            }
-        }
-    }
-
-    public function clearSession()
-    {
-        $this->session->clear();
-        foreach ($this->getWizards() as $wizard) {
-            $wizard->clearSession();
-        }
-    }
-
-    public function setCurrentModule($moduleName)
-    {
-        if (false === array_key_exists($moduleName, $this->getWizards())) {
-            throw new InvalidArgumentException(sprintf('Module "%s" does not provide a setup wizard', $moduleName));
-        }
-
-        $this->session->currentModule = $moduleName;
-    }
-
-    public function getCurrentModule()
-    {
-        $moduleName = $this->session->get('currentModule');
-        if ($moduleName === null) {
-            $moduleName = key($this->getWizards());
-            $this->setCurrentModule($moduleName);
-        }
-
-        return $moduleName;
-    }
-
-    public function getCurrentWizard()
-    {
-        $wizards = $this->getWizards();
-        return $wizards[$this->getCurrentModule()];
-    }
-
-    public function getModules()
-    {
-        if ($this->modules !== null) {
-            return $this->modules;
-        } else {
-            $this->modules = array();
-        }
-
-        $moduleManager = Icinga::app()->getModuleManager();
-        $moduleManager->detectInstalledModules($this->modulePaths);
-        foreach ($moduleManager->listInstalledModules() as $moduleName) {
-            $this->modules[] = $moduleManager->loadModule($moduleName)->getModule($moduleName);
-        }
-
-        return $this->modules;
-    }
-
-    public function getWizards()
-    {
-        if ($this->wizards !== null) {
-            return $this->wizards;
-        } else {
-            $this->wizards = array();
-        }
-
-        foreach ($this->getModules() as $module) {
-            if ($module->providesSetupWizard()) {
-                $this->wizards[$module->getName()] = $module->getSetupWizard();
-            }
-        }
-
-        $this->mergePageData($this->wizards);
-        return $this->wizards;
-    }
-
-    protected function mergePageData(array $wizards)
-    {
-        foreach ($wizards as $wizard) {
-            $wizardPageData = & $wizard->getPageData();
-            foreach ($this->pageData as $pageName => $pageData) {
-                $wizardPageData[$pageName] = $pageData;
-            }
-        }
-    }
-}
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 68632e305..a33b8c0d7 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -94,7 +94,6 @@ class WebWizard extends Wizard implements SetupWizard
         $this->addPage(new AdminAccountPage());
         $this->addPage(new GeneralConfigPage());
         $this->addPage(new DatabaseCreationPage());
-        $this->addPage(new ModulePage());
         $this->addPage(new SummaryPage());
     }
 
@@ -167,9 +166,6 @@ class WebWizard extends Wizard implements SetupWizard
                 unset($pageData['setup_admin_account']);
                 unset($pageData['setup_authentication_backend']);
             }
-        } elseif ($page->getName() === 'setup_modules') {
-            $page->setPageData($this->getPageData());
-            $page->handleRequest($request);
         }
     }
 
@@ -263,7 +259,6 @@ class WebWizard extends Wizard implements SetupWizard
     public function clearSession()
     {
         parent::clearSession();
-        $this->getPage('setup_modules')->clearSession();
 
         $tokenPath = Config::resolvePath('setup.token');
         if (file_exists($tokenPath)) {
@@ -358,12 +353,6 @@ class WebWizard extends Wizard implements SetupWizard
             )
         );
 
-        foreach ($this->getPage('setup_modules')->setPageData($this->getPageData())->getWizards() as $wizard) {
-            if ($wizard->isFinished()) {
-                $setup->addSteps($wizard->getSetup()->getSteps());
-            }
-        }
-
         return $setup;
     }
 
@@ -548,10 +537,6 @@ class WebWizard extends Wizard implements SetupWizard
             )
         );
 
-        foreach ($this->getPage('setup_modules')->setPageData($this->getPageData())->getWizards() as $wizard) {
-            $requirements->merge($wizard->getRequirements()->allOptional());
-        }
-
         return $requirements;
     }
 }

From 9018b36d7acad75f75428ae32b8c386da56066d0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 10:03:14 +0100
Subject: [PATCH 0256/2920] monitoring: Escape hostname, service name and event
 message in the eventhistory overview

---
 .../application/views/scripts/list/eventhistory.phtml     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index a9516aab1..6d6130a3d 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -110,21 +110,21 @@ use Icinga\Module\Monitoring\Object\Service;
             'host'      => $event->host,
             'service'   => $event->service
           )); ?>">
-            <?= $event->service; ?>
+            <?= $this->escape($event->service) ?>
           </a>
           <small>
-            <?= $this->translate('on') . ' ' . $event->host; ?>
+            <?= $this->translate('on') . ' ' . $this->escape($event->host) ?>
           </small>
         <?php else: ?>
           <a href="<?= $this->href('monitoring/show/host', array(
             'host' => $event->host
           )); ?>">
-            <?= $event->host; ?>
+            <?= $this->escape($event->host) ?>
           </a>
         <?php endif ?>
           <br>
           <div>
-            <?= $this->icon($icon, $title); ?> <?= empty($msg) ? '' : $msg; ?>
+            <?= $this->icon($icon, $title); ?> <?= empty($msg) ? '' : $this->escape($msg) ?>
           </div>
         </td>
       </tr>

From bfd133289169bf4230ee839e6a0183dc9b0f3e8d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 10:04:14 +0100
Subject: [PATCH 0257/2920] monitoring: Escape host and service display_name in
 the services overview

---
 .../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 5241c009b..962d22bda 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -107,7 +107,7 @@ foreach ($services as $service):
       <?php if ($service->service_icon_image && ! preg_match('/[\'"]/', $service->service_icon_image)): ?>
       <?= $this->icon($this->resolveMacros($service->service_icon_image, $service)) ?>
       <?php endif ?>
-<a href="<?= $serviceLink ?>"><?= $service->service_display_name ?></a><?php if ($this->showHost): ?> on <a href="<?= $hostLink ?>"><?= $service->host_display_name; ?>
+<a href="<?= $serviceLink ?>"><?= $this->escape($service->service_display_name) ?></a><?php if ($this->showHost): ?> on <a href="<?= $hostLink ?>"><?= $this->escape($service->host_display_name) ?>
 <?php if ($service->host_state != 0): ?>
   (<?= strtoupper(Host::getStateText($service->host_state, true)); ?>)
 <?php endif ?>

From d49c950aacde3834f01b5111bca2d709c1435705 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 10:04:59 +0100
Subject: [PATCH 0258/2920] monitoring: Escape host_display_name in the hosts
 overview

---
 modules/monitoring/application/views/scripts/list/hosts.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 91f59f422..4afc14731 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -98,7 +98,7 @@ if ($hosts->count() === 0) {
         <?= $this->icon($this->resolveMacros($host->host_icon_image, $host)) ?>
         <?php endif ?>
         <?= implode(' ', $icons) ?>
-        <a href="<?= $hostLink  ?>"><?= $host->host_display_name ?></a>
+        <a href="<?= $hostLink  ?>"><?= $this->escape($host->host_display_name) ?></a>
         <?php if (isset($host->host_unhandled_services) && $host->host_unhandled_services > 0): ?>
         <span title="<?=
             $host->host_unhandled_services

From 10571c3178aebd79730921a998685a5fbf8f4a7f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 10:10:07 +0100
Subject: [PATCH 0259/2920] monitoring: Fix duplicate array key
 'service_description' in the StatehistoryQuery

---
 .../Monitoring/Backend/Ido/Query/StatehistoryQuery.php        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
index e979cdc08..b8d320c9c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
@@ -23,13 +23,11 @@ class StatehistoryQuery extends IdoQuery
             'output'     => 'sh.output',
             'attempt'      => 'sh.current_check_attempt',
             'max_attempts' => 'sh.max_check_attempts',
-
             'host'                => 'sho.name1 COLLATE latin1_general_ci',
-            'service'             => 'sho.name2 COLLATE latin1_general_ci',
             'host_name'           => 'sho.name1 COLLATE latin1_general_ci',
+            'service'             => 'sho.name2 COLLATE latin1_general_ci',
             'service_description' => 'sho.name2 COLLATE latin1_general_ci',
             'service_host_name'   => 'sho.name1 COLLATE latin1_general_ci',
-            'service_description' => 'sho.name2 COLLATE latin1_general_ci',
             'object_type'         => "CASE WHEN sho.objecttype_id = 1 THEN 'host' ELSE 'service' END"
         )
     );

From 7d967d25b3fdef60b610107f5d1fb46c4aaeac25 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 10:12:14 +0100
Subject: [PATCH 0260/2920] monitoring: Fix code style in the StatehistoryQuery

---
 .../Backend/Ido/Query/StatehistoryQuery.php   | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
index b8d320c9c..dfa81b1ef 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
@@ -1,6 +1,4 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
@@ -8,27 +6,27 @@ class StatehistoryQuery extends IdoQuery
 {
     protected $types = array(
         'soft_state' => 0,
-        'hard_state' => 1,
+        'hard_state' => 1
     );
 
     protected $columnMap = array(
         'statehistory' => array(
-            'raw_timestamp' => 'sh.state_time',
-            'timestamp'  => 'UNIX_TIMESTAMP(sh.state_time)',
-            'state_time' => 'sh.state_time',
-            'object_id'  => 'sho.object_id',
-            'type'       => "(CASE WHEN sh.state_type = 1 THEN 'hard_state' ELSE 'soft_state' END)",
-            'state'      => 'sh.state',
-            'state_type' => 'sh.state_type',
-            'output'     => 'sh.output',
-            'attempt'      => 'sh.current_check_attempt',
-            'max_attempts' => 'sh.max_check_attempts',
-            'host'                => 'sho.name1 COLLATE latin1_general_ci',
-            'host_name'           => 'sho.name1 COLLATE latin1_general_ci',
-            'service'             => 'sho.name2 COLLATE latin1_general_ci',
-            'service_description' => 'sho.name2 COLLATE latin1_general_ci',
-            'service_host_name'   => 'sho.name1 COLLATE latin1_general_ci',
-            'object_type'         => "CASE WHEN sho.objecttype_id = 1 THEN 'host' ELSE 'service' END"
+            'raw_timestamp'         => 'sh.state_time',
+            'timestamp'             => 'UNIX_TIMESTAMP(sh.state_time)',
+            'state_time'            => 'sh.state_time',
+            'object_id'             => 'sho.object_id',
+            'type'                  => "(CASE WHEN sh.state_type = 1 THEN 'hard_state' ELSE 'soft_state' END)",
+            'state'                 => 'sh.state',
+            'state_type'            => 'sh.state_type',
+            'output'                => 'sh.output',
+            'attempt'               => 'sh.current_check_attempt',
+            'max_attempts'          => 'sh.max_check_attempts',
+            'host'                  => 'sho.name1 COLLATE latin1_general_ci',
+            'host_name'             => 'sho.name1 COLLATE latin1_general_ci',
+            'service'               => 'sho.name2 COLLATE latin1_general_ci',
+            'service_description'   => 'sho.name2 COLLATE latin1_general_ci',
+            'service_host_name'     => 'sho.name1 COLLATE latin1_general_ci',
+            'object_type'           => "CASE WHEN sho.objecttype_id = 1 THEN 'host' ELSE 'service' END"
         )
     );
 

From 1bba0b3d0f1c0ceb2a69f608b605cdb7aa1a1e70 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 10:15:58 +0100
Subject: [PATCH 0261/2920] monitoring: Fix coding style in the
 EventHistoryQuery

---
 .../Backend/Ido/Query/EventHistoryQuery.php   | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index 2d5a0a2d8..b95cb89de 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
@@ -1,11 +1,9 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
-use Icinga\Data\Filter\Filter;
 use Zend_Db_Select;
+use Icinga\Data\Filter\Filter;
 
 class EventHistoryQuery extends IdoQuery
 {
@@ -84,20 +82,20 @@ class EventHistoryQuery extends IdoQuery
 
     public function addFilter(Filter $filter)
     {
-  	    foreach ($this->subQueries as $sub) {
-		        $sub->applyFilter(clone $filter);
-		    }
-		    return $this;
+        foreach ($this->subQueries as $sub) {
+            $sub->applyFilter(clone $filter);
+        }
+        return $this;
     }
 
-	  public function where($condition, $value = null)
-	  {
-		  $this->requireColumn($condition);
-		  foreach ($this->subQueries as $sub) {
-		      $sub->where($condition, $value);
-		  }
-		  return $this;
-	  }
+    public function where($condition, $value = null)
+    {
+        $this->requireColumn($condition);
+        foreach ($this->subQueries as $sub) {
+            $sub->where($condition, $value);
+        }
+        return $this;
+    }
 
     protected function joinHostgroups()
     {
@@ -116,5 +114,4 @@ class EventHistoryQuery extends IdoQuery
         );
         return $this;
     }
-
 }

From aa976c41981471db10aebab436520b8b239b3a65 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 10:24:24 +0100
Subject: [PATCH 0262/2920] monitoring: Support host and service display_name
 in the EventHistoryQuery

This adds two left joins to the query when selecting host_display_name and service_display_name.
If performance suffers badly, we have to evaluate whether to support the display_name column for displaying
the host and service name in the eventhistory overview.

refs #7843
---
 .../Backend/Ido/Query/EventHistoryQuery.php   | 64 +++++++++++++------
 1 file changed, 45 insertions(+), 19 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index b95cb89de..306180ae6 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
@@ -11,28 +11,34 @@ class EventHistoryQuery extends IdoQuery
 
     protected $columnMap = array(
         'eventhistory' => array(
-            'cnt_notification'    => "SUM(CASE eh.type WHEN 'notify' THEN 1 ELSE 0 END)",
-            'cnt_hard_state'      => "SUM(CASE eh.type WHEN 'hard_state' THEN 1 ELSE 0 END)",
-            'cnt_soft_state'      => "SUM(CASE eh.type WHEN 'hard_state' THEN 1 ELSE 0 END)",
-            'cnt_downtime_start'  => "SUM(CASE eh.type WHEN 'dt_start' THEN 1 ELSE 0 END)",
-            'cnt_downtime_end'    => "SUM(CASE eh.type WHEN 'dt_end' THEN 1 ELSE 0 END)",
-            'host'                => 'eho.name1 COLLATE latin1_general_ci',
-            'service'             => 'eho.name2 COLLATE latin1_general_ci',
-            'host_name'           => 'eho.name1 COLLATE latin1_general_ci',
-            'service_description' => 'eho.name2 COLLATE latin1_general_ci',
-            'object_type'         => 'eh.object_type',
-            'timestamp'           => 'eh.timestamp',
-            'state'               => 'eh.state',
-            'attempt'             => 'eh.attempt',
-            'max_attempts'        => 'eh.max_attempts',
-            'output'              => 'eh.output', // we do not want long_output
-            'type'                => 'eh.type',
-            'service_host_name'   => 'eho.name1 COLLATE latin1_general_ci',
-            'service_description' => 'eho.name2 COLLATE latin1_general_ci'
+            'cnt_notification'      => "SUM(CASE eh.type WHEN 'notify' THEN 1 ELSE 0 END)",
+            'cnt_hard_state'        => "SUM(CASE eh.type WHEN 'hard_state' THEN 1 ELSE 0 END)",
+            'cnt_soft_state'        => "SUM(CASE eh.type WHEN 'hard_state' THEN 1 ELSE 0 END)",
+            'cnt_downtime_start'    => "SUM(CASE eh.type WHEN 'dt_start' THEN 1 ELSE 0 END)",
+            'cnt_downtime_end'      => "SUM(CASE eh.type WHEN 'dt_end' THEN 1 ELSE 0 END)",
+            'host'                  => 'eho.name1 COLLATE latin1_general_ci',
+            'service'               => 'eho.name2 COLLATE latin1_general_ci',
+            'host_name'             => 'eho.name1 COLLATE latin1_general_ci',
+            'service_description'   => 'eho.name2 COLLATE latin1_general_ci',
+            'object_type'           => 'eh.object_type',
+            'timestamp'             => 'eh.timestamp',
+            'state'                 => 'eh.state',
+            'attempt'               => 'eh.attempt',
+            'max_attempts'          => 'eh.max_attempts',
+            'output'                => 'eh.output', // we do not want long_output
+            'type'                  => 'eh.type',
+            'service_host_name'     => 'eho.name1 COLLATE latin1_general_ci',
+            'service_description'   => 'eho.name2 COLLATE latin1_general_ci'
         ),
         'hostgroups' => array(
-            'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup'             => 'hgo.name1 COLLATE latin1_general_ci',
         ),
+        'hosts' => array(
+            'host_display_name'     => 'h.display_name'
+        ),
+        'services' => array(
+            'service_display_name'  => 's.display_name'
+        )
     );
 
     protected $useSubqueryCount = true;
@@ -114,4 +120,24 @@ class EventHistoryQuery extends IdoQuery
         );
         return $this;
     }
+
+    protected function joinHosts()
+    {
+        $this->select->joinLeft(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = eho.object_id',
+            array()
+        );
+        return $this;
+    }
+
+    protected function joinServices()
+    {
+        $this->select->joinLeft(
+            array('s' => $this->prefix . 'services'),
+            's.service_object_id = eho.object_id',
+            array()
+        );
+        return $this;
+    }
 }

From 25c2e99122af66334f3bca794c18c967a1610cb3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 10:26:12 +0100
Subject: [PATCH 0263/2920] monitoring: Fix duplicate array key
 'service_description' in the EventHistoryQuery

---
 .../library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index 306180ae6..e6efb1e45 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
@@ -27,8 +27,7 @@ class EventHistoryQuery extends IdoQuery
             'max_attempts'          => 'eh.max_attempts',
             'output'                => 'eh.output', // we do not want long_output
             'type'                  => 'eh.type',
-            'service_host_name'     => 'eho.name1 COLLATE latin1_general_ci',
-            'service_description'   => 'eho.name2 COLLATE latin1_general_ci'
+            'service_host_name'     => 'eho.name1 COLLATE latin1_general_ci'
         ),
         'hostgroups' => array(
             'hostgroup'             => 'hgo.name1 COLLATE latin1_general_ci',

From 3e702ac255a5864b35fa7a94c9e9e669a6887797 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 10:28:21 +0100
Subject: [PATCH 0264/2920] monitoring: Support host and service display_name
 in the EventHistory data view

refs #7843
---
 .../library/Monitoring/DataView/EventHistory.php          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/EventHistory.php b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
index 09779b27d..f13815aae 100644
--- a/modules/monitoring/library/Monitoring/DataView/EventHistory.php
+++ b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
@@ -1,6 +1,4 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
@@ -20,7 +18,9 @@ class EventHistory extends DataView
             'cnt_downtime_start',
             'cnt_downtime_end',
             'host_name',
+            'host_display_name',
             'service_description',
+            'service_display_name',
             'object_type',
             'timestamp',
             'state',
@@ -38,8 +38,8 @@ class EventHistory extends DataView
     {
         return array(
             'timestamp' => array(
-                'columns' => array('timestamp'),
-                'order' => 'DESC'
+                'columns'   => array('timestamp'),
+                'order'     => 'DESC'
             )
         );
     }

From 7ff1948c1a508bba0125cc1e3f64d99a2d528fa1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 10:29:22 +0100
Subject: [PATCH 0265/2920] monitoring: Use host and service display_name for
 displaying host and service names in the eventhistory overview

refs #7843
---
 .../application/views/scripts/list/eventhistory.phtml       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 6d6130a3d..d96a4914b 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -110,16 +110,16 @@ use Icinga\Module\Monitoring\Object\Service;
             'host'      => $event->host,
             'service'   => $event->service
           )); ?>">
-            <?= $this->escape($event->service) ?>
+            <?= $this->escape($event->service_display_name) ?>
           </a>
           <small>
-            <?= $this->translate('on') . ' ' . $this->escape($event->host) ?>
+            <?= $this->translate('on') . ' ' . $this->escape($event->host_display_name) ?>
           </small>
         <?php else: ?>
           <a href="<?= $this->href('monitoring/show/host', array(
             'host' => $event->host
           )); ?>">
-            <?= $this->escape($event->host) ?>
+            <?= $this->escape($event->host_display_name) ?>
           </a>
         <?php endif ?>
           <br>

From cd03c2164a508bf75200ed9a1486177e8d7880ed Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 10:33:05 +0100
Subject: [PATCH 0266/2920] monitoring: Fix sorting by 'End Time' in the
 downtimes overview

---
 .../application/controllers/ListController.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index aefe93b15..325c0d612 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -292,15 +292,15 @@ class Monitoring_ListController extends Controller
         $this->filterQuery($query);
 
         $this->setupSortControl(array(
-            'downtime_is_in_effect'    => $this->translate('Is In Effect'),
-            'downtime_host'            => $this->translate('Host / Service'),
-            'downtime_entry_time'      => $this->translate('Entry Time'),
-            'downtime_author'          => $this->translate('Author'),
-            'downtime_start'           => $this->translate('Start Time'),
-            'downtime_start'           => $this->translate('End Time'),
-            'downtime_scheduled_start' => $this->translate('Scheduled Start'),
-            'downtime_scheduled_end'   => $this->translate('Scheduled End'),
-            'downtime_duration'        => $this->translate('Duration'),
+            'downtime_is_in_effect'     => $this->translate('Is In Effect'),
+            'downtime_host'             => $this->translate('Host / Service'),
+            'downtime_entry_time'       => $this->translate('Entry Time'),
+            'downtime_author'           => $this->translate('Author'),
+            'downtime_start'            => $this->translate('Start Time'),
+            'downtime_end'              => $this->translate('End Time'),
+            'downtime_scheduled_start'  => $this->translate('Scheduled Start'),
+            'downtime_scheduled_end'    => $this->translate('Scheduled End'),
+            'downtime_duration'         => $this->translate('Duration')
         ));
 
         $this->view->downtimes = $query->paginate();

From e881a0de33270d25d5e65600755f1744c908f571 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 10:35:10 +0100
Subject: [PATCH 0267/2920] monitoring: Remove useless PHPDoc in the
 DowntimeQuery

---
 .../Monitoring/Backend/Ido/Query/DowntimeQuery.php   | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index a53fd18e9..f9d0d93a2 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -1,18 +1,9 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
-/**
- * Handling downtime queries
- */
 class DowntimeQuery extends IdoQuery
 {
-    /**
-     * Column map
-     * @var array
-     */
     protected $columnMap = array(
         'downtime' => array(
             'downtime_author'          => 'sd.author_name',
@@ -39,9 +30,6 @@ class DowntimeQuery extends IdoQuery
         ),
     );
 
-    /**
-     * Join with scheduleddowntime
-     */
     protected function joinBaseTables()
     {
         $this->select->from(

From 2fdeabd39831968c5e84d65230ff9f5b65c05605 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 10:47:20 +0100
Subject: [PATCH 0268/2920] monitoring: Escape host and service name, author
 and comment in the downtimes overview

---
 .../application/views/scripts/list/downtimes.phtml        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 8a8e5576c..616f253c7 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -57,20 +57,20 @@ use Icinga\Module\Monitoring\Object\Service;
             'host'      => $downtime->host,
             'service'   => $downtime->service
           )); ?>">
-            <?= $downtime->service; ?>
+            <?= $this->escape($downtime->service) ?>
           </a>
           <small>
-            <?= $this->translate('on'); ?> <?= $downtime->host; ?>
+            <?= $this->translate('on'); ?> <?= $this->escape($downtime->host) ?>
           </small>
         <?php else: ?>
           <?= $this->icon('host'); ?> <a href="<?= $this->href('monitoring/host/show', array(
             'host' => $downtime->host
           )); ?>">
-            <?= $downtime->host; ?>
+            <?= $this->escape($downtime->host) ?>
           </a>
         <?php endif ?>
           <br>
-          <?= $this->icon('comment'); ?> [<?= $downtime->author; ?>] <?= $downtime->comment; ?>
+          <?= $this->icon('comment') ?> [<?= $this->escape($downtime->author) ?>] <?= $this->escape($downtime->comment) ?>
           <br>
           <small>
         <?php if ($downtime->is_flexible): ?>

From fdb3988efdecbeeeb16ca92af0650d0b829b5236 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 21 Jan 2015 11:15:38 +0100
Subject: [PATCH 0269/2920] Fix float formatting in the progress bar's css

refs #8191
---
 modules/setup/application/views/scripts/index/index.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/setup/application/views/scripts/index/index.phtml b/modules/setup/application/views/scripts/index/index.phtml
index d12343d5b..a55cfa198 100644
--- a/modules/setup/application/views/scripts/index/index.phtml
+++ b/modules/setup/application/views/scripts/index/index.phtml
@@ -73,7 +73,7 @@ if ($notifications->hasMessages()) {
           <?php
             $firstPage = current($configPagesLeft);
             $lastPage = end($configPagesLeft);
-            $lineWidth = round(100 / count($configPagesLeft), 2, PHP_ROUND_HALF_DOWN);
+            $lineWidth = sprintf('%.2F', round(100 / count($configPagesLeft), 2, PHP_ROUND_HALF_DOWN));
           ?>
           <?php foreach ($configPagesLeft as $pos => $page): ?>
             <?php $stateClass = $finished || $pos < $currentPos ? ' complete' : (
@@ -100,7 +100,7 @@ if ($notifications->hasMessages()) {
           <?php
             $firstPage = current($configPagesRight);
             $lastPage = end($configPagesRight);
-            $lineWidth = round(100 / count($configPagesRight), 2, PHP_ROUND_HALF_DOWN);
+            $lineWidth = sprintf('%.2F', round(100 / count($configPagesRight), 2, PHP_ROUND_HALF_DOWN));
           ?>
           <?php foreach ($configPagesRight as $pos => $page): ?>
             <?php $stateClass = $finished || $pos < $currentPos ? ' complete' : (

From 573c1046bbfd5dafa3929faf5684fb05d2ac04ec Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 21 Jan 2015 11:44:44 +0100
Subject: [PATCH 0270/2920] Ensure that the SummaryPage has a unique name when
 being utilized

refs #8191
---
 .../monitoring/library/Monitoring/MonitoringWizard.php    | 4 ++--
 modules/setup/application/forms/SummaryPage.php           | 8 +++++++-
 .../application/views/scripts/form/setup-summary.phtml    | 2 +-
 modules/setup/library/Setup/WebWizard.php                 | 2 +-
 public/css/icinga/setup.less                              | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index 9c588e5b3..a21ee9706 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -37,7 +37,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
         $this->addPage(new LivestatusResourcePage());
         $this->addPage(new InstancePage());
         $this->addPage(new SecurityPage());
-        $this->addPage(new SummaryPage());
+        $this->addPage(new SummaryPage(array('name' => 'setup_monitoring_summary')));
     }
 
     /**
@@ -47,7 +47,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
     {
         if ($page->getName() === 'setup_requirements') {
             $page->setRequirements($this->getRequirements());
-        } elseif ($page->getName() === 'setup_summary') {
+        } elseif ($page->getName() === 'setup_monitoring_summary') {
             $page->setSummary($this->getSetup()->getSummary());
             $page->setSubjectTitle(mt('monitoring', 'the monitoring module', 'setup.summary.subject'));
         } elseif (
diff --git a/modules/setup/application/forms/SummaryPage.php b/modules/setup/application/forms/SummaryPage.php
index 14ad93c56..9b42ec9d8 100644
--- a/modules/setup/application/forms/SummaryPage.php
+++ b/modules/setup/application/forms/SummaryPage.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Setup\Forms;
 
+use LogicException;
 use Icinga\Web\Form;
 
 /**
@@ -30,7 +31,12 @@ class SummaryPage extends Form
      */
     public function init()
     {
-        $this->setName('setup_summary');
+        if ($this->getName() === $this->filterName(get_class($this))) {
+            throw new LogicException(
+                'When utilizing ' . get_class($this) . ' it is required to set a unique name by using the form options'
+            );
+        }
+
         $this->setViewScript('form/setup-summary.phtml');
     }
 
diff --git a/modules/setup/application/views/scripts/form/setup-summary.phtml b/modules/setup/application/views/scripts/form/setup-summary.phtml
index fa354feb5..676dcd52f 100644
--- a/modules/setup/application/views/scripts/form/setup-summary.phtml
+++ b/modules/setup/application/views/scripts/form/setup-summary.phtml
@@ -20,7 +20,7 @@ use Icinga\Web\Wizard;
  <?php endif ?>
 <?php endforeach ?>
 </div>
-<form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
+<form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>" class="summary">
   <?= $form->getElement($form->getTokenElementName()); ?>
   <?= $form->getElement($form->getUidElementName()); ?>
   <div class="buttons">
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index a33b8c0d7..ad6f927cd 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -94,7 +94,7 @@ class WebWizard extends Wizard implements SetupWizard
         $this->addPage(new AdminAccountPage());
         $this->addPage(new GeneralConfigPage());
         $this->addPage(new DatabaseCreationPage());
-        $this->addPage(new SummaryPage());
+        $this->addPage(new SummaryPage(array('name' => 'setup_summary')));
     }
 
     /**
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index 166e47ff8..8ca669bdd 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -270,7 +270,7 @@
     }
   }
 
-  form#setup_summary {
+  form.summary {
     clear: left;
   }
 }

From d528ddc64118221796f8dab0f38eff008b25c39f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 12:51:47 +0100
Subject: [PATCH 0271/2920] monitoring: Fix that host_display_name is NULL when
 the object is a service in the evenhistory overview

refs #7843
---
 .../Monitoring/Backend/Ido/Query/EventHistoryQuery.php     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index e6efb1e45..2896f9536 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
@@ -33,7 +33,7 @@ class EventHistoryQuery extends IdoQuery
             'hostgroup'             => 'hgo.name1 COLLATE latin1_general_ci',
         ),
         'hosts' => array(
-            'host_display_name'     => 'h.display_name'
+            'host_display_name'     => 'CASE WHEN sh.display_name IS NOT NULL THEN sh.display_name ELSE h.display_name END'
         ),
         'services' => array(
             'service_display_name'  => 's.display_name'
@@ -137,6 +137,11 @@ class EventHistoryQuery extends IdoQuery
             's.service_object_id = eho.object_id',
             array()
         );
+        $this->select->joinLeft(
+            array('sh' => $this->prefix . 'hosts'),
+            'sh.host_object_id = s.host_object_id',
+            array()
+        );
         return $this;
     }
 }

From 85aa447516520759d26fa10aa4ae343cff74e416 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 12:52:29 +0100
Subject: [PATCH 0272/2920] monitoring: Support host and service display_name
 in the DowntimeQuery

refs #7843
---
 .../Backend/Ido/Query/DowntimeQuery.php       | 73 +++++++++++++------
 1 file changed, 52 insertions(+), 21 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index f9d0d93a2..efc10f6a5 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -6,28 +6,34 @@ class DowntimeQuery extends IdoQuery
 {
     protected $columnMap = array(
         'downtime' => array(
-            'downtime_author'          => 'sd.author_name',
-            'author'                   => 'sd.author_name',
-            'downtime_comment'         => 'sd.comment_data',
-            'downtime_entry_time'      => 'UNIX_TIMESTAMP(sd.entry_time)',
-            'downtime_is_fixed'        => 'sd.is_fixed',
-            'downtime_is_flexible'     => 'CASE WHEN sd.is_fixed = 0 THEN 1 ELSE 0 END',
-            'downtime_triggered_by_id' => 'sd.triggered_by_id',
-            'downtime_scheduled_start' => 'UNIX_TIMESTAMP(sd.scheduled_start_time)',
-            'downtime_scheduled_end'   => 'UNIX_TIMESTAMP(sd.scheduled_end_time)',
-            'downtime_start'           => "UNIX_TIMESTAMP(CASE WHEN UNIX_TIMESTAMP(sd.trigger_time) > 0 then sd.trigger_time ELSE sd.scheduled_start_time END)",
-            'downtime_end'             => 'CASE WHEN sd.is_fixed > 0 THEN UNIX_TIMESTAMP(sd.scheduled_end_time) ELSE UNIX_TIMESTAMP(sd.trigger_time) + sd.duration END',
-            'downtime_duration'        => 'sd.duration',
-            'downtime_is_in_effect'    => 'sd.is_in_effect',
-            'downtime_internal_id'     => 'sd.internal_downtime_id',
-            'downtime_host'            => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END COLLATE latin1_general_ci', // #7278, #7279
-            'host'                     => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END COLLATE latin1_general_ci',
-            'downtime_service'         => 'so.name2 COLLATE latin1_general_ci',
-            'service'                  => 'so.name2 COLLATE latin1_general_ci', // #7278, #7279
-            'downtime_objecttype'      => "CASE WHEN ho.object_id IS NOT NULL THEN 'host' ELSE CASE WHEN so.object_id IS NOT NULL THEN 'service' ELSE NULL END END",
-            'downtime_host_state'      => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END',
-            'downtime_service_state'   => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END'
+            'downtime_author'           => 'sd.author_name',
+            'author'                    => 'sd.author_name',
+            'downtime_comment'          => 'sd.comment_data',
+            'downtime_entry_time'       => 'UNIX_TIMESTAMP(sd.entry_time)',
+            'downtime_is_fixed'         => 'sd.is_fixed',
+            'downtime_is_flexible'      => 'CASE WHEN sd.is_fixed = 0 THEN 1 ELSE 0 END',
+            'downtime_triggered_by_id'  => 'sd.triggered_by_id',
+            'downtime_scheduled_start'  => 'UNIX_TIMESTAMP(sd.scheduled_start_time)',
+            'downtime_scheduled_end'    => 'UNIX_TIMESTAMP(sd.scheduled_end_time)',
+            'downtime_start'            => "UNIX_TIMESTAMP(CASE WHEN UNIX_TIMESTAMP(sd.trigger_time) > 0 then sd.trigger_time ELSE sd.scheduled_start_time END)",
+            'downtime_end'              => 'CASE WHEN sd.is_fixed > 0 THEN UNIX_TIMESTAMP(sd.scheduled_end_time) ELSE UNIX_TIMESTAMP(sd.trigger_time) + sd.duration END',
+            'downtime_duration'         => 'sd.duration',
+            'downtime_is_in_effect'     => 'sd.is_in_effect',
+            'downtime_internal_id'      => 'sd.internal_downtime_id',
+            'downtime_host'             => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END COLLATE latin1_general_ci', // #7278, #7279
+            'host'                      => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END COLLATE latin1_general_ci',
+            'downtime_service'          => 'so.name2 COLLATE latin1_general_ci',
+            'service'                   => 'so.name2 COLLATE latin1_general_ci', // #7278, #7279
+            'downtime_objecttype'       => "CASE WHEN ho.object_id IS NOT NULL THEN 'host' ELSE CASE WHEN so.object_id IS NOT NULL THEN 'service' ELSE NULL END END",
+            'downtime_host_state'       => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END',
+            'downtime_service_state'    => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END'
         ),
+        'hosts' => array(
+            'host_display_name'         => 'CASE WHEN sh.display_name IS NOT NULL THEN sh.display_name ELSE h.display_name END'
+        ),
+        'services' => array(
+            'service_display_name'      => 's.display_name'
+        )
     );
 
     protected function joinBaseTables()
@@ -58,4 +64,29 @@ class DowntimeQuery extends IdoQuery
         );
         $this->joinedVirtualTables = array('downtime' => true);
     }
+
+    protected function joinHosts()
+    {
+        $this->select->joinLeft(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = ho.object_id',
+            array()
+        );
+        return $this;
+    }
+
+    protected function joinServices()
+    {
+        $this->select->joinLeft(
+            array('s' => $this->prefix . 'services'),
+            's.service_object_id = so.object_id',
+            array()
+        );
+        $this->select->joinLeft(
+            array('sh' => $this->prefix . 'hosts'),
+            'sh.host_object_id = s.host_object_id',
+            array()
+        );
+        return $this;
+    }
 }

From 5f0b809619dceef06c76859adbfc087f5e53d5b3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 12:52:58 +0100
Subject: [PATCH 0273/2920] monitoring: Support host and service display_name
 columns in the Downtime data view

refs #7843
---
 modules/monitoring/library/Monitoring/DataView/Downtime.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index e075d658c..508620a6b 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -32,7 +32,9 @@ class Downtime extends DataView
             'downtime_host',
             'downtime_service',
             'downtime_host_state',
-            'downtime_service_state'
+            'downtime_service_state',
+            'host_display_name',
+            'service_display_name'
         );
     }
 
@@ -51,7 +53,7 @@ class Downtime extends DataView
                     'downtime_service'
                 ),
                 'order' => self::SORT_ASC
-            ),
+            )
         );
     }
 }

From ab6eed03e5ceb7045b70966f357aa9a13c779aea Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 12:53:26 +0100
Subject: [PATCH 0274/2920] monitoring: Select the host and service
 display_name in the downtimes overview

refs #7843
---
 modules/monitoring/application/controllers/ListController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 325c0d612..dce93098c 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -285,7 +285,9 @@ class Monitoring_ListController extends Controller
             'host'            => 'downtime_host',
             'service'         => 'downtime_service',
             'host_state'      => 'downtime_host_state',
-            'service_state'   => 'downtime_service_state'
+            'service_state'   => 'downtime_service_state',
+            'host_display_name',
+            'service_display_name'
         ))->order('downtime_is_in_effect', 'DESC')
           ->order('downtime_scheduled_start', 'DESC');
 

From 86cc56afe6512394ed482fe99cd0559807d86fb5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 12:53:47 +0100
Subject: [PATCH 0275/2920] monitoring: Display host and service names using
 the display_name column in the downtimes overview

refs #7843
---
 .../application/views/scripts/list/downtimes.phtml          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 616f253c7..98adb5883 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -57,16 +57,16 @@ use Icinga\Module\Monitoring\Object\Service;
             'host'      => $downtime->host,
             'service'   => $downtime->service
           )); ?>">
-            <?= $this->escape($downtime->service) ?>
+            <?= $this->escape($downtime->service_display_name) ?>
           </a>
           <small>
-            <?= $this->translate('on'); ?> <?= $this->escape($downtime->host) ?>
+            <?= $this->translate('on'); ?> <?= $this->escape($downtime->host_display_name) ?>
           </small>
         <?php else: ?>
           <?= $this->icon('host'); ?> <a href="<?= $this->href('monitoring/host/show', array(
             'host' => $downtime->host
           )); ?>">
-            <?= $this->escape($downtime->host) ?>
+            <?= $this->escape($downtime->host_display_name) ?>
           </a>
         <?php endif ?>
           <br>

From d340b0d49d0867d0e6214e5b7f1086a0168cb443 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 12:55:41 +0100
Subject: [PATCH 0276/2920] monitoring: Let the data view handle the default
 ordering in the downtime overview

refs #7843
---
 modules/monitoring/application/controllers/ListController.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index dce93098c..79a618616 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -288,8 +288,7 @@ class Monitoring_ListController extends Controller
             'service_state'   => 'downtime_service_state',
             'host_display_name',
             'service_display_name'
-        ))->order('downtime_is_in_effect', 'DESC')
-          ->order('downtime_scheduled_start', 'DESC');
+        ));
 
         $this->filterQuery($query);
 

From 5862fc98a54a594f0d96f7084bb98789be323bfa Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 12:58:46 +0100
Subject: [PATCH 0277/2920] monitoring: Sort by 'downtime_scheduled_start' too
 when sorting by 'Is In Effect'

---
 modules/monitoring/library/Monitoring/DataView/Downtime.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index 508620a6b..695cb256c 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -42,6 +42,10 @@ class Downtime extends DataView
     {
         return array(
             'downtime_is_in_effect' => array(
+                'columns' => array(
+                    'downtime_is_in_effect',
+                    'downtime_scheduled_start'
+                ),
                 'order' => self::SORT_DESC
             ),
             'downtime_start' => array(

From 91b7c31cda283ac12bd092784c1e45ac02d17b14 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 13:06:03 +0100
Subject: [PATCH 0278/2920] monitoring: Support sorting downtimes by host and
 service display_name

refs #7843
---
 .../library/Monitoring/DataView/Downtime.php        | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index 695cb256c..681608b17 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -51,10 +51,17 @@ class Downtime extends DataView
             'downtime_start' => array(
                 'order' => self::SORT_DESC
             ),
-            'downtime_host' => array(
+            'host_display_name' => array(
                 'columns' => array(
-                    'downtime_host',
-                    'downtime_service'
+                    'host_display_name',
+                    'service_display_name'
+                ),
+                'order' => self::SORT_ASC
+            ),
+            'service_display_name' => array(
+                'columns' => array(
+                    'service_display_name',
+                    'host_display_name'
                 ),
                 'order' => self::SORT_ASC
             )

From 7621de8ec02f080444aeb0d9b796ec3812675e0f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 13:06:32 +0100
Subject: [PATCH 0279/2920] monitoring: Add sort by 'Host' and 'Service' to the
 downtimes overview

refs #7843
---
 modules/monitoring/application/controllers/ListController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 79a618616..df7081519 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -294,7 +294,8 @@ class Monitoring_ListController extends Controller
 
         $this->setupSortControl(array(
             'downtime_is_in_effect'     => $this->translate('Is In Effect'),
-            'downtime_host'             => $this->translate('Host / Service'),
+            'host_display_name'         => $this->translate('Host'),
+            'service_display_name'      => $this->translate('Service'),
             'downtime_entry_time'       => $this->translate('Entry Time'),
             'downtime_author'           => $this->translate('Author'),
             'downtime_start'            => $this->translate('Start Time'),

From 1f6a81aefb553b91ca7cc7b916f64ecbc66a580e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 21 Jan 2015 13:07:08 +0100
Subject: [PATCH 0280/2920] Add Wizard::skipPage()

Required to not to duplicate code in custom wizards and to avoid errors
when detecting the direction.

refs #8191
---
 library/Icinga/Web/Wizard.php                 | 30 +++++++++++++++++++
 .../library/Monitoring/MonitoringWizard.php   | 18 +----------
 modules/setup/library/Setup/WebWizard.php     | 18 +----------
 3 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/library/Icinga/Web/Wizard.php b/library/Icinga/Web/Wizard.php
index 811374259..6fbfda533 100644
--- a/library/Icinga/Web/Wizard.php
+++ b/library/Icinga/Web/Wizard.php
@@ -440,6 +440,36 @@ class Wizard
         );
     }
 
+    /**
+     * Return the next or previous page based on the given one
+     *
+     * @param   Form    $page   The page to skip
+     *
+     * @return  Form
+     */
+    protected function skipPage(Form $page)
+    {
+        if ($this->parent) {
+            return $this->parent->skipPage($page);
+        }
+
+        if ($this->hasPageData($page->getName())) {
+            $pageData = & $this->getPageData();
+            unset($pageData[$page->getName()]);
+        }
+
+        $pages = $this->getPages();
+        if ($this->getDirection() === static::FORWARD) {
+            $nextPage = $pages[array_search($page, $pages, true) + 1];
+            $newPage = $this->getNewPage($nextPage->getName(), $page);
+        } else { // $this->getDirection() === static::BACKWARD
+            $previousPage = $pages[array_search($page, $pages, true) - 1];
+            $newPage = $this->getNewPage($previousPage->getName(), $page);
+        }
+
+        return $newPage;
+    }
+
     /**
      * Return whether the given page is this wizard's last page
      *
diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index a21ee9706..58a63a6ea 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -79,23 +79,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
             $skip = $backendData['type'] !== 'livestatus';
         }
 
-        if ($skip) {
-            if ($this->hasPageData($newPage->getName())) {
-                $pageData = & $this->getPageData();
-                unset($pageData[$newPage->getName()]);
-            }
-
-            $pages = $this->getPages();
-            if ($this->getDirection() === static::FORWARD) {
-                $nextPage = $pages[array_search($newPage, $pages, true) + 1];
-                $newPage = $this->getNewPage($nextPage->getName(), $newPage);
-            } else { // $this->getDirection() === static::BACKWARD
-                $previousPage = $pages[array_search($newPage, $pages, true) - 1];
-                $newPage = $this->getNewPage($previousPage->getName(), $newPage);
-            }
-        }
-
-        return $newPage;
+        return $skip ? $this->skipPage($newPage) : $newPage;
     }
 
     /**
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index ad6f927cd..da606bd99 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -218,23 +218,7 @@ class WebWizard extends Wizard implements SetupWizard
             }
         }
 
-        if ($skip) {
-            if ($this->hasPageData($newPage->getName())) {
-                $pageData = & $this->getPageData();
-                unset($pageData[$newPage->getName()]);
-            }
-
-            $pages = $this->getPages();
-            if ($this->getDirection() === static::FORWARD) {
-                $nextPage = $pages[array_search($newPage, $pages, true) + 1];
-                $newPage = $this->getNewPage($nextPage->getName(), $newPage);
-            } else { // $this->getDirection() === static::BACKWARD
-                $previousPage = $pages[array_search($newPage, $pages, true) - 1];
-                $newPage = $this->getNewPage($previousPage->getName(), $newPage);
-            }
-        }
-
-        return $newPage;
+        return $skip ? $this->skipPage($newPage) : $newPage;
     }
 
     /**

From 0bcca651b223257948cc289e77d2344417ea53b0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 13:12:26 +0100
Subject: [PATCH 0281/2920] monitoring: Remove useless PHPDoc in the
 NotificationQuery

---
 .../Monitoring/Backend/Ido/Query/NotificationQuery.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index 00b6957b8..70962a1c0 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -1,19 +1,9 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
-/**
- * Notification query
- */
 class NotificationQuery extends IdoQuery
 {
-    /**
-     * Column map
-     *
-     * @var array
-     */
     protected $columnMap = array(
         'notification' => array(
             'notification_output'       => 'n.output',

From 64a8006973ac63a210f08f4d8ea8708696fa453e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 21 Jan 2015 13:56:53 +0100
Subject: [PATCH 0282/2920] Add Wizard::isComplete()

Wizard::isFinished() is not applicable in case a wizard is a child of another
wizard. Wizard::isComplete() fulfills the need to check whether a user went
through a wizard entirely.

refs #8191
---
 library/Icinga/Web/Wizard.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/library/Icinga/Web/Wizard.php b/library/Icinga/Web/Wizard.php
index 6fbfda533..8e822abc9 100644
--- a/library/Icinga/Web/Wizard.php
+++ b/library/Icinga/Web/Wizard.php
@@ -487,6 +487,19 @@ class Wizard
         return $page->getName() === end($pages)->getName();
     }
 
+    /**
+     * Return whether all of this wizard's pages were visited by the user
+     *
+     * The base implementation just verifies that the very last page has page data available.
+     *
+     * @return  bool
+     */
+    public function isComplete()
+    {
+        $pages = $this->getPages();
+        return $this->hasPageData($pages[count($pages) - 1]->getName());
+    }
+
     /**
      * Set whether this wizard has been completed
      *

From 08e600a376f7da93a902df9c5f963ee596401095 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 21 Jan 2015 13:57:59 +0100
Subject: [PATCH 0283/2920] Re-introduce the ModulePage

Now with pretty checkboxes :)

refs #8191
---
 .../setup/application/forms/ModulePage.php    | 96 +++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 modules/setup/application/forms/ModulePage.php

diff --git a/modules/setup/application/forms/ModulePage.php b/modules/setup/application/forms/ModulePage.php
new file mode 100644
index 000000000..596a5d762
--- /dev/null
+++ b/modules/setup/application/forms/ModulePage.php
@@ -0,0 +1,96 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Module\Setup\Forms;
+
+use Icinga\Application\Icinga;
+use Icinga\Web\Form;
+
+class ModulePage extends Form
+{
+    protected $modules;
+
+    protected $modulePaths;
+
+    /**
+     * Initialize this page
+     */
+    public function init()
+    {
+        $this->setName('setup_modules');
+        //$this->setViewScript('form/setup-modules.phtml');
+
+        $this->modulePaths = array();
+        if (($appModulePath = realpath(Icinga::app()->getApplicationDir() . '/../modules')) !== false) {
+            $this->modulePaths[] = $appModulePath;
+        }
+    }
+
+    public function createElements(array $formData)
+    {
+        foreach ($this->getModules() as $module) {
+            $this->addElement(
+                'checkbox',
+                $module->getName(),
+                array(
+                    'label' => ucfirst($module->getName())
+                )
+            );
+            $this->addElement(
+                'note',
+                $module->getName() . '_desc',
+                array(
+                    'value' => $module->getDescription()
+                )
+            );
+        }
+    }
+
+    protected function getModules()
+    {
+        if ($this->modules !== null) {
+            return $this->modules;
+        } else {
+            $this->modules = array();
+        }
+
+        $moduleManager = Icinga::app()->getModuleManager();
+        $moduleManager->detectInstalledModules($this->modulePaths);
+        foreach ($moduleManager->listInstalledModules() as $moduleName) {
+            if ($moduleName !== 'setup') {
+                $this->modules[$moduleName] = $moduleManager->loadModule($moduleName)->getModule($moduleName);
+            }
+        }
+
+        return $this->modules;
+    }
+
+    public function getCheckedModules()
+    {
+        $modules = $this->getModules();
+
+        $checked = array();
+        foreach ($this->getElements() as $name => $element) {
+            if (array_key_exists($name, $modules) && $element->isChecked()) {
+                $checked[$name] = $modules[$name];
+            }
+        }
+
+        return $checked;
+    }
+
+    public function getModuleWizards()
+    {
+        $checked = $this->getCheckedModules();
+
+        $wizards = array();
+        foreach ($checked as $name => $module) {
+            if ($module->providesSetupWizard()) {
+                $wizards[$name] = $module->getSetupWizard();
+            }
+        }
+
+        return $wizards;
+    }
+}

From 817e4e937c06495e20041d230afdaaf0b2d76e78 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 21 Jan 2015 14:00:57 +0100
Subject: [PATCH 0284/2920] Run module wizards as part of the main
 application's wizard

A user now chooses right after the start which modules to install and
configures them as part of the main routine.

refs #8191
---
 modules/setup/library/Setup/WebWizard.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index da606bd99..7e36a3274 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -83,6 +83,7 @@ class WebWizard extends Wizard implements SetupWizard
     protected function init()
     {
         $this->addPage(new WelcomePage());
+        $this->addPage(new ModulePage());
         $this->addPage(new RequirementsPage());
         $this->addPage(new AuthenticationPage());
         $this->addPage(new PreferencesPage());
@@ -95,6 +96,13 @@ class WebWizard extends Wizard implements SetupWizard
         $this->addPage(new GeneralConfigPage());
         $this->addPage(new DatabaseCreationPage());
         $this->addPage(new SummaryPage(array('name' => 'setup_summary')));
+
+        if (($modulePageData = $this->getPageData('setup_modules')) !== null) {
+            $modulePage = $this->getPage('setup_modules')->populate($modulePageData);
+            foreach ($modulePage->getModuleWizards() as $moduleWizard) {
+                $this->addPage($moduleWizard);
+            }
+        }
     }
 
     /**
@@ -337,6 +345,12 @@ class WebWizard extends Wizard implements SetupWizard
             )
         );
 
+        foreach ($this->getWizards() as $wizard) {
+            if ($wizard->isComplete()) {
+                $setup->addSteps($wizard->getSetup()->getSteps());
+            }
+        }
+
         return $setup;
     }
 
@@ -521,6 +535,12 @@ class WebWizard extends Wizard implements SetupWizard
             )
         );
 
+        foreach ($this->getWizards() as $wizard) {
+            // TODO(8191): Ensure that equal requirements are not shown individually but only
+            //             once with their description properly being merged together!
+            $requirements->merge($wizard->getRequirements());
+        }
+
         return $requirements;
     }
 }

From 96390d34bf5d04018d93ebeb7786da1864586466 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 21 Jan 2015 15:03:34 +0100
Subject: [PATCH 0285/2920] Enable modules as part of the main installation
 routine

refs #8191
---
 .../library/Monitoring/MonitoringWizard.php   |  7 ---
 .../library/Setup/Utils/EnableModuleStep.php  | 48 +++++++++++--------
 modules/setup/library/Setup/WebWizard.php     | 11 +++--
 3 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index 58a63a6ea..f02faa4f3 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -4,15 +4,12 @@
 
 namespace Icinga\Module\Monitoring;
 
-use Icinga\Application\Icinga;
 use Icinga\Web\Form;
 use Icinga\Web\Wizard;
 use Icinga\Web\Request;
 use Icinga\Module\Setup\Setup;
 use Icinga\Module\Setup\SetupWizard;
 use Icinga\Module\Setup\Requirements;
-use Icinga\Module\Setup\Utils\MakeDirStep;
-use Icinga\Module\Setup\Utils\EnableModuleStep;
 use Icinga\Module\Setup\Forms\SummaryPage;
 use Icinga\Module\Monitoring\Forms\Setup\WelcomePage;
 use Icinga\Module\Monitoring\Forms\Setup\BackendPage;
@@ -109,8 +106,6 @@ class MonitoringWizard extends Wizard implements SetupWizard
         $pageData = $this->getPageData();
         $setup = new Setup();
 
-        $setup->addStep(new MakeDirStep(array(Icinga::app()->getConfigDir() . '/modules/monitoring'), 2770));
-
         $setup->addStep(
             new BackendStep(array(
                 'backendConfig'     => $pageData['setup_monitoring_backend'],
@@ -132,8 +127,6 @@ class MonitoringWizard extends Wizard implements SetupWizard
             ))
         );
 
-        $setup->addStep(new EnableModuleStep('monitoring'));
-
         return $setup;
     }
 
diff --git a/modules/setup/library/Setup/Utils/EnableModuleStep.php b/modules/setup/library/Setup/Utils/EnableModuleStep.php
index 3ca3eebd1..a23e532f2 100644
--- a/modules/setup/library/Setup/Utils/EnableModuleStep.php
+++ b/modules/setup/library/Setup/Utils/EnableModuleStep.php
@@ -12,13 +12,13 @@ class EnableModuleStep extends Step
 {
     protected $modulePaths;
 
-    protected $moduleName;
+    protected $moduleNames;
 
-    protected $error;
+    protected $errors;
 
-    public function __construct($moduleName)
+    public function __construct(array $moduleNames)
     {
-        $this->moduleName = $moduleName;
+        $this->moduleNames = $moduleNames;
 
         $this->modulePaths = array();
         if (($appModulePath = realpath(Icinga::app()->getApplicationDir() . '/../modules')) !== false) {
@@ -28,17 +28,20 @@ class EnableModuleStep extends Step
 
     public function apply()
     {
-        try {
-            $moduleManager = Icinga::app()->getModuleManager();
-            $moduleManager->detectInstalledModules($this->modulePaths);
-            $moduleManager->enableModule($this->moduleName);
-        } catch (Exception $e) {
-            $this->error = $e;
-            return false;
+        $moduleManager = Icinga::app()->getModuleManager();
+        $moduleManager->detectInstalledModules($this->modulePaths);
+
+        $success = true;
+        foreach ($this->moduleNames as $moduleName) {
+            try {
+                $moduleManager->enableModule($moduleName);
+            } catch (Exception $e) {
+                $this->errors[$moduleName] = $e;
+                $success = false;
+            }
         }
 
-        $this->error = false;
-        return true;
+        return $success;
     }
 
     public function getSummary()
@@ -48,12 +51,19 @@ class EnableModuleStep extends Step
 
     public function getReport()
     {
-        if ($this->error === false) {
-            return '<p>' . sprintf(mt('setup', 'Module "%s" has been successfully enabled.'), $this->moduleName) . '</p>';
-        } elseif ($this->error !== null) {
-            $message = mt('setup', 'Module "%s" could not be enabled. An error occured:');
-            return '<p class="error">' . sprintf($message, $this->moduleName) . '</p>'
-                . '<p>' . $this->error->getMessage() . '</p>';
+        $okMessage = mt('setup', 'Module "%s" has been successfully enabled.');
+        $failMessage = mt('setup', 'Module "%s" could not be enabled. An error occured:');
+
+        $report = '';
+        foreach ($this->moduleNames as $moduleName) {
+            if (isset($this->errors[$moduleName])) {
+                $report .= '<p class="error">' . sprintf($failMessage, $moduleName) . '</p>'
+                    . '<p>' . $this->errors[$moduleName]->getMessage() . '</p>';
+            } else {
+                $report .= '<p>' . sprintf($okMessage, $moduleName) . '</p>';
+            }
         }
+
+        return $report;
     }
 }
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 7e36a3274..395c5af8e 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -29,6 +29,7 @@ use Icinga\Module\Setup\Steps\DatabaseStep;
 use Icinga\Module\Setup\Steps\GeneralConfigStep;
 use Icinga\Module\Setup\Steps\ResourceStep;
 use Icinga\Module\Setup\Steps\AuthenticationStep;
+use Icinga\Module\Setup\Utils\EnableModuleStep;
 use Icinga\Module\Setup\Utils\MakeDirStep;
 use Icinga\Module\Setup\Utils\DbTool;
 
@@ -284,7 +285,7 @@ class WebWizard extends Wizard implements SetupWizard
                         ? $pageData['setup_database_creation']['password']
                         : null,
                     'schemaPath'        => Config::module('setup')
-                        ->get('schema', 'path', Icinga::app()->getBaseDir('etc/schema'))
+                        ->get('schema', 'path', Icinga::app()->getBaseDir('etc' . DIRECTORY_SEPARATOR . 'schema'))
                 ))
             );
         }
@@ -337,9 +338,9 @@ class WebWizard extends Wizard implements SetupWizard
         $setup->addStep(
             new MakeDirStep(
                 array(
-                    $configDir . '/modules',
-                    $configDir . '/preferences',
-                    $configDir . '/enabledModules'
+                    $configDir . DIRECTORY_SEPARATOR . 'modules',
+                    $configDir . DIRECTORY_SEPARATOR . 'preferences',
+                    $configDir . DIRECTORY_SEPARATOR . 'enabledModules'
                 ),
                 2770
             )
@@ -351,6 +352,8 @@ class WebWizard extends Wizard implements SetupWizard
             }
         }
 
+        $setup->addStep(new EnableModuleStep(array_keys($this->getPage('setup_modules')->getCheckedModules())));
+
         return $setup;
     }
 

From 10eacf9682b0b09d755791207028da8be304d192 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 21 Jan 2015 15:39:06 +0100
Subject: [PATCH 0286/2920] Allow jumping to already visited pages

This was already possible using just the base implementation of Wizard
but since WebWizard has optional pages it did not work with pages that
had such an optional page as previous page.

refs #8191
---
 library/Icinga/Web/Wizard.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Wizard.php b/library/Icinga/Web/Wizard.php
index 8e822abc9..42dea5c1c 100644
--- a/library/Icinga/Web/Wizard.php
+++ b/library/Icinga/Web/Wizard.php
@@ -400,7 +400,7 @@ class Wizard
     /**
      * Return the new page to set as current page
      *
-     * Permission is checked by verifying that the requested page's previous page has page data available.
+     * Permission is checked by verifying that the requested page or its previous page has page data available.
      * The requested page is automatically permitted without any checks if the origin page is its previous
      * page or one that occurs later in order.
      *
@@ -421,7 +421,7 @@ class Wizard
             $permitted = true;
 
             $pages = $this->getPages();
-            if (($index = array_search($page, $pages, true)) > 0) {
+            if (! $this->hasPageData($requestedPage) && ($index = array_search($page, $pages, true)) > 0) {
                 $previousPage = $pages[$index - 1];
                 if ($originPage === null || ($previousPage->getName() !== $originPage->getName()
                     && array_search($originPage, $pages, true) < $index))

From b05316340cbe9c7bb061f43a3498b017bae56437 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 15:46:41 +0100
Subject: [PATCH 0287/2920] monitoring: Add Link view helper

Most of the monitoring overviews link to detail information, e.g. the full information of the involved monitored
object. Instead of reintroducing link generation and translation in those views, this helper contains most
frequently used jump links.
---
 .../application/views/helpers/Link.php        | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 modules/monitoring/application/views/helpers/Link.php

diff --git a/modules/monitoring/application/views/helpers/Link.php b/modules/monitoring/application/views/helpers/Link.php
new file mode 100644
index 000000000..0d8c35861
--- /dev/null
+++ b/modules/monitoring/application/views/helpers/Link.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Helper for generating frequently used jump links
+ *
+ * Most of the monitoring overviews link to detail information, e.g. the full information of the involved monitored
+ * object. Instead of reintroducing link generation and translation in those views, this helper contains most
+ * frequently used jump links.
+ */
+class Zend_View_Helper_Link extends Zend_View_Helper_Abstract
+{
+    /**
+     * Helper entry point
+     *
+     * @return $this
+     */
+    public function link()
+    {
+        return $this;
+    }
+
+    /**
+     * Create a host link
+     *
+     * @param   string  $host       Hostname
+     * @param   string  $linkText   Link text, e.g. the host's display name
+     *
+     * @return  string
+     */
+    public function host($host, $linkText)
+    {
+        return $this->view->qlink(
+            $linkText,
+            $this->view->href('monitoring/host/show', array('host' => $host))
+        );
+    }
+
+    /**
+     * Create a service link
+     *
+     * @param   string  $service            Service name
+     * @param   string  $serviceLinkText    Text for the service link, e.g. the service's display name
+     * @param   string  $host               Hostname
+     * @param   string  $hostLinkText       Text for the host link, e.g. the host's display name
+     *
+     * @return  string
+     */
+    public function service($service, $serviceLinkText, $host, $hostLinkText)
+    {
+        return sprintf(
+            $this->view->translate('%s on %s', 'Service running on host'),
+            $this->view->qlink(
+                $serviceLinkText,
+                $this->view->href('monitoring/service/show', array('host' => $host, 'service' => $service))
+            ),
+            $this->host($host, $hostLinkText)
+        );
+    }
+}

From d8b1e632319c307ea943c002004b1fc5331f999b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 15:47:10 +0100
Subject: [PATCH 0288/2920] monitoring: Support host and service display_name
 in the NotificationQuery

refs #7843
---
 .../Backend/Ido/Query/NotificationQuery.php   | 49 +++++++++++++++----
 1 file changed, 40 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index 70962a1c0..3181eebbf 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -6,26 +6,32 @@ class NotificationQuery extends IdoQuery
 {
     protected $columnMap = array(
         'notification' => array(
-            'notification_output'       => 'n.output',
-            'notification_start_time'   => 'UNIX_TIMESTAMP(n.start_time)',
-            'notification_state'        => 'n.state',
-            'notification_object_id'    => 'n.object_id'
+            'notification_output'           => 'n.output',
+            'notification_start_time'       => 'UNIX_TIMESTAMP(n.start_time)',
+            'notification_state'            => 'n.state',
+            'notification_object_id'        => 'n.object_id'
         ),
         'objects' => array(
-            'host'                      => 'o.name1',
-            'service'                   => 'o.name2'
+            'host'                          => 'o.name1',
+            'service'                       => 'o.name2'
         ),
         'contact' => array(
-            'notification_contact'      => 'c_o.name1',
-            'contact_object_id'         => 'c_o.object_id'
+            'notification_contact'          => 'c_o.name1',
+            'contact_object_id'             => 'c_o.object_id'
         ),
         'command' => array(
-            'notification_command'      => 'cmd_o.name1'
+            'notification_command'          => 'cmd_o.name1'
         ),
         'acknowledgement' => array(
             'acknowledgement_entry_time'    => 'UNIX_TIMESTAMP(a.entry_time)',
             'acknowledgement_author_name'   => 'a.author_name',
             'acknowledgement_comment_data'  => 'a.comment_data'
+        ),
+        'hosts' => array(
+            'host_display_name'             => 'CASE WHEN sh.display_name IS NOT NULL THEN sh.display_name ELSE h.display_name END'
+        ),
+        'services' => array(
+            'service_display_name'          => 's.display_name'
         )
     );
 
@@ -100,4 +106,29 @@ class NotificationQuery extends IdoQuery
             array()
         );
     }
+
+    protected function joinHosts()
+    {
+        $this->select->joinLeft(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = o.object_id',
+            array()
+        );
+        return $this;
+    }
+
+    protected function joinServices()
+    {
+        $this->select->joinLeft(
+            array('s' => $this->prefix . 'services'),
+            's.service_object_id = o.object_id',
+            array()
+        );
+        $this->select->joinLeft(
+            array('sh' => $this->prefix . 'hosts'),
+            'sh.host_object_id = s.host_object_id',
+            array()
+        );
+        return $this;
+    }
 }

From ad879b1ee61de4ed78ad982293be2ee361bdc5ad Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 15:47:36 +0100
Subject: [PATCH 0289/2920] monitoring: Select the host and service
 display_name columns in the Notification data view

refs #7843
---
 .../monitoring/library/Monitoring/DataView/Notification.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php
index 6156a5f15..7f6fd238f 100644
--- a/modules/monitoring/library/Monitoring/DataView/Notification.php
+++ b/modules/monitoring/library/Monitoring/DataView/Notification.php
@@ -20,7 +20,9 @@ class Notification extends DataView
             'notification_start_time',
             'notification_contact',
             'notification_output',
-            'notification_command'
+            'notification_command',
+            'host_display_name',
+            'service_display_name'
         );
     }
 

From 846f39108094788bc0c05b3557230ab411957946 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 15:48:04 +0100
Subject: [PATCH 0290/2920] monitoring: Select the host and service
 display_name columns in the notifications overview

refs #7843
---
 modules/monitoring/application/controllers/ListController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index df7081519..8e8cfa766 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -325,7 +325,9 @@ class Monitoring_ListController extends Controller
             'notification_output',
             'notification_contact',
             'notification_start_time',
-            'notification_state'
+            'notification_state',
+            'host_display_name',
+            'service_display_name'
         ));
         $this->filterQuery($query);
         $this->view->notifications = $query->paginate();

From ece6bfe6bbcaeb43d5c324daf91a1ded87c4b254 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 15:48:45 +0100
Subject: [PATCH 0291/2920] monitoring: Use display_name for displaying the
 host and service name in the notifications overview

refs #7843
---
 .../views/scripts/list/notifications.phtml    | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 939d46eba..5e337dd24 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -25,20 +25,13 @@ use Icinga\Module\Monitoring\Object\Service;
     <tbody>
     <?php foreach ($notifications as $notification):
         if (isset($notification->service)) {
-        $isService = true;
-        $href = $this->href('monitoring/show/service', array(
-            'host'    => $notification->host,
-            'service' => $notification->service
-        ));
-        $stateName = Service::getStateText($notification->notification_state);
+            $isService = true;
+            $stateName = Service::getStateText($notification->notification_state);
         } else {
             $isService = false;
-            $href = $this->href('monitoring/show/host', array(
-                'host' => $notification->host
-            ));
             $stateName = Host::getStateText($notification->notification_state);
         }
-        ?>
+    ?>
         <tr class="state <?= $stateName ?>">
             <td class="state">
                 <?= $this->dateTimeRenderer($notification->notification_start_time)->render(
@@ -49,12 +42,14 @@ use Icinga\Module\Monitoring\Object\Service;
             </td>
             <td style="font-size: 0.8em">
                 <?php if ($isService): ?>
-                    <?= sprintf(
-                        $this->translate('%s on %s'),
-                        $this->qlink($notification->service, $href), $notification->host
+                    <?= $this->link()->service(
+                        $notification->service,
+                        $notification->service_display_name,
+                        $notification->host,
+                        $notification->host_display_name
                     ) ?>
                 <?php else: ?>
-                    <?= $this->qlink($notification->host, $href) ?>
+                    <?= $this->link()->host($notification->host, $notification->host_display_name) ?>
                 <?php endif ?>
                 <br>
                 <?= $this->escape(substr(strip_tags($notification->notification_output), 0, 10000)); ?>

From 0ceec816c6aec832f5abbea0d5de175b4fde5029 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 15:49:36 +0100
Subject: [PATCH 0292/2920] monitoring: Use notifications default ordering when
 showing a contact

---
 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 ba865deaa..d09a0ce83 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -166,7 +166,7 @@ class Monitoring_ShowController extends Controller
                 'notification_contact',
                 'notification_start_time',
                 'notification_state'
-            ))->order('notification_start_time');
+            ));
 
             $notifications->where('contact_object_id', $contact->contact_object_id);
 

From b6f87df90ea2f9e0ea602dc66c61cc88a4f4e827 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 15:50:32 +0100
Subject: [PATCH 0293/2920] monitoring: Select the host and service
 display_name column when viewing notifications for a contact

refs #7843
---
 modules/monitoring/application/controllers/ShowController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index d09a0ce83..0b7a2f897 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -165,7 +165,9 @@ class Monitoring_ShowController extends Controller
                 'notification_output',
                 'notification_contact',
                 'notification_start_time',
-                'notification_state'
+                'notification_state',
+                'host_display_name',
+                'service_display_name'
             ));
 
             $notifications->where('contact_object_id', $contact->contact_object_id);

From cbbd811adb9dc83dc1844182b77c8484f690fcf0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 15:51:14 +0100
Subject: [PATCH 0294/2920] monitoring: Do not strip_tags in the notifications
 overview

---
 .../application/views/scripts/list/notifications.phtml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 5e337dd24..7f1de0fde 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -52,7 +52,7 @@ use Icinga\Module\Monitoring\Object\Service;
                     <?= $this->link()->host($notification->host, $notification->host_display_name) ?>
                 <?php endif ?>
                 <br>
-                <?= $this->escape(substr(strip_tags($notification->notification_output), 0, 10000)); ?>
+                <?= $this->escape(substr($notification->notification_output, 0, 10000)); ?>
                 <br>
                 <?php if (! $this->contact): ?>
                     <small>

From 423e4c55a87237d68dc7f369c93a5797a0400c4c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 15:52:24 +0100
Subject: [PATCH 0295/2920] monitoring: Use the ellipsis view helper in the
 notifications overview

---
 .../application/views/scripts/list/notifications.phtml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 7f1de0fde..299144821 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -52,7 +52,7 @@ use Icinga\Module\Monitoring\Object\Service;
                     <?= $this->link()->host($notification->host, $notification->host_display_name) ?>
                 <?php endif ?>
                 <br>
-                <?= $this->escape(substr($notification->notification_output, 0, 10000)); ?>
+                <?= $this->escape($this->ellipsis($notification->notification_output, 10000)) ?>
                 <br>
                 <?php if (! $this->contact): ?>
                     <small>

From 439052ad973a6738b0e097cc7cd4c1d74ed8a5d2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 15:56:58 +0100
Subject: [PATCH 0296/2920] monitoring: Use the link helper in the downtimes
 overview

---
 .../views/scripts/list/downtimes.phtml        | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 98adb5883..485782e3c 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -31,8 +31,10 @@ use Icinga\Module\Monitoring\Object\Service;
     <?php foreach ($downtimes as $downtime): ?>
     <?php
       if (isset($downtime->service)) {
+          $isService = true;
           $stateName = Service::getStateText($downtime->service_state);
       } else {
+          $isService = false;
           $stateName = Host::getStateText($downtime->host_state);
       }
     ?>
@@ -52,22 +54,14 @@ use Icinga\Module\Monitoring\Object\Service;
             ?>
         </td>
         <td>
-        <?php if (isset($downtime->service)): ?>
-          <?= $this->icon('service'); ?> <a href="<?= $this->href('monitoring/service/show', array(
-            'host'      => $downtime->host,
-            'service'   => $downtime->service
-          )); ?>">
-            <?= $this->escape($downtime->service_display_name) ?>
-          </a>
-          <small>
-            <?= $this->translate('on'); ?> <?= $this->escape($downtime->host_display_name) ?>
-          </small>
+        <?php if ($isService): ?>
+          <?= $this->icon('service') ?>
+          <?= $this->link()->service(
+              $downtime->service, $downtime->service_display_name, $downtime->host, $downtime->host_display_name
+          ) ?>
         <?php else: ?>
-          <?= $this->icon('host'); ?> <a href="<?= $this->href('monitoring/host/show', array(
-            'host' => $downtime->host
-          )); ?>">
-            <?= $this->escape($downtime->host_display_name) ?>
-          </a>
+          <?= $this->icon('host') ?>
+          <?= $this->link()->host($downtime->host, $downtime->host_display_name) ?>
         <?php endif ?>
           <br>
           <?= $this->icon('comment') ?> [<?= $this->escape($downtime->author) ?>] <?= $this->escape($downtime->comment) ?>

From 9b7e67919fb954cf2517bf7f727a71eb6f5353f0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 15:59:20 +0100
Subject: [PATCH 0297/2920] monitoring: Use host and service icons in the
 notifications overview

---
 .../application/views/scripts/list/notifications.phtml          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 299144821..44f33851f 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -42,6 +42,7 @@ use Icinga\Module\Monitoring\Object\Service;
             </td>
             <td style="font-size: 0.8em">
                 <?php if ($isService): ?>
+                    <?= $this->icon('service') ?>
                     <?= $this->link()->service(
                         $notification->service,
                         $notification->service_display_name,
@@ -49,6 +50,7 @@ use Icinga\Module\Monitoring\Object\Service;
                         $notification->host_display_name
                     ) ?>
                 <?php else: ?>
+                    <?= $this->icon('host') ?>
                     <?= $this->link()->host($notification->host, $notification->host_display_name) ?>
                 <?php endif ?>
                 <br>

From a91a2eba6895b16e50cdcdbeaf8fd3c9962b41eb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 16:09:13 +0100
Subject: [PATCH 0298/2920] monitoring: Support host and service display_name
 columns in the CommentQuery

refs #7843
---
 .../Backend/Ido/Query/CommentQuery.php        | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
index 5145a96ad..a522d702e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
@@ -23,6 +23,12 @@ class CommentQuery extends IdoQuery
             'comment_service'       => 'so.name2 COLLATE latin1_general_ci',
             'service'               => 'so.name2 COLLATE latin1_general_ci', // #7278, #7279
             'comment_objecttype'    => "CASE WHEN ho.object_id IS NOT NULL THEN 'host' ELSE CASE WHEN so.object_id IS NOT NULL THEN 'service' ELSE NULL END END",
+        ),
+        'hosts' => array(
+            'host_display_name'     => 'CASE WHEN sh.display_name IS NOT NULL THEN sh.display_name ELSE h.display_name END'
+        ),
+        'services' => array(
+            'service_display_name'  => 's.display_name'
         )
     );
 
@@ -44,4 +50,29 @@ class CommentQuery extends IdoQuery
         );
         $this->joinedVirtualTables = array('comments' => true);
     }
+
+    protected function joinHosts()
+    {
+        $this->select->joinLeft(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = ho.object_id',
+            array()
+        );
+        return $this;
+    }
+
+    protected function joinServices()
+    {
+        $this->select->joinLeft(
+            array('s' => $this->prefix . 'services'),
+            's.service_object_id = so.object_id',
+            array()
+        );
+        $this->select->joinLeft(
+            array('sh' => $this->prefix . 'hosts'),
+            'sh.host_object_id = s.host_object_id',
+            array()
+        );
+        return $this;
+    }
 }

From 94be58e121f71c9cba9409c8b5d1e9d93bcb6117 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 16:09:36 +0100
Subject: [PATCH 0299/2920] monitoring: Support host and service display_name
 columns in the Comment data view

refs #7843
---
 modules/monitoring/library/Monitoring/DataView/Comment.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index 4d62fd27c..08928b5dd 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -29,6 +29,8 @@ class Comment extends DataView
             'comment_service',
             'host',
             'service',
+            'host_display_name',
+            'service_display_name'
         );
     }
 

From e933b9174c76611919c9ed80332d45723903e4f0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 16:10:02 +0100
Subject: [PATCH 0300/2920] monitoring: Select the host and service
 display_name columns in the comments overview

refs #7843
---
 modules/monitoring/application/controllers/ListController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 8e8cfa766..df12ff1f8 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -465,7 +465,9 @@ class Monitoring_ListController extends Controller
             'persistent' => 'comment_is_persistent',
             'expiration' => 'comment_expiration',
             'host'       => 'comment_host',
-            'service'    => 'comment_service'
+            'service'    => 'comment_service',
+            'host_display_name',
+            'service_display_name'
         ));
         $this->filterQuery($query);
         $this->view->comments = $query->paginate();

From cf391b056c99b4c111059965e7da5225cdf0d66c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 16:12:37 +0100
Subject: [PATCH 0301/2920] monitoring: Use display_name for displaying the
 host and service names in the comments overview

refs #7843
---
 .../views/scripts/list/comments.phtml         | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 677010f1b..29fc76d49 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -50,21 +50,13 @@
         </td>
         <td>
         <?php if ($comment->objecttype === 'service'): ?>
-          <?= $this->icon('conf'); ?> <a href="<?= $this->href('monitoring/service/show', array(
-            'host'    => $comment->host,
-            'service' => $comment->service,
-          )); ?>">
-            <?= $comment->service; ?>
-          </a>
-          <small>
-            <?= $this->translate('on') . ' ' . $comment->host; ?>
-          </small>
+          <?= $this->icon('service') ?>
+          <?= $this->link()->service(
+              $comment->service, $comment->service_display_name, $comment->host, $comment->host_display_name
+          ) ?>
         <?php else: ?>
-          <?= $this->icon('host'); ?> <a href="<?= $this->href('monitoring/host/show', array(
-            'host' => $comment->host
-          )); ?>">
-            <?= $comment->host; ?>
-          </a>
+          <?= $this->icon('host') ?>
+          <?= $this->link()->host($comment->host, $comment->host_display_name) ?>
         <?php endif ?>
           <br>
           <?= $this->icon('comment'); ?> <?= isset($comment->author)

From 3055531e2db7f01ded2578f025c13977c5b7c2df Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 16:15:09 +0100
Subject: [PATCH 0302/2920] monitoring: Support sorting by host and service
 display name in the Comment data view

refs #7843
---
 .../library/Monitoring/DataView/Comment.php         | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index 08928b5dd..4cd11e1a1 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -45,13 +45,20 @@ class Comment extends DataView
             'comment_timestamp' => array(
                 'order' => self::SORT_DESC
             ),
-            'comment_host' => array(
+            'host_display_name' => array(
                 'columns' => array(
-                    'comment_host',
-                    'comment_service'
+                    'host_display_name',
+                    'service_display_name'
                 ),
                 'order' => self::SORT_ASC
             ),
+            'service_display_name' => array(
+                'columns' => array(
+                    'service_display_name',
+                    'host_display_name'
+                ),
+                'order' => self::SORT_ASC
+            )
         );
     }
 }

From 6be0224d9d524786af9489ac0bd324bcb163da0b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 16:15:38 +0100
Subject: [PATCH 0303/2920] monitoring: Add sort by 'Host' and 'Service' in the
 comments overview

refs #7843
---
 .../application/controllers/ListController.php           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index df12ff1f8..f5afc9a24 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -474,10 +474,11 @@ class Monitoring_ListController extends Controller
 
         $this->setupSortControl(
             array(
-                'comment_timestamp'  => $this->translate('Comment Timestamp'),
-                'comment_host'       => $this->translate('Host / Service'),
-                'comment_type'       => $this->translate('Comment Type'),
-                'comment_expiration' => $this->translate('Expiration'),
+                'comment_timestamp'     => $this->translate('Comment Timestamp'),
+                'host_display_name'     => $this->translate('Host'),
+                'service_display_name'  => $this->translate('Service'),
+                'comment_type'          => $this->translate('Comment Type'),
+                'comment_expiration'    => $this->translate('Expiration')
             )
         );
         $this->view->delCommentForm = new DeleteCommentCommandForm();

From 913143f3a804802686143979ef3f46f587cf118e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 21 Jan 2015 16:52:38 +0100
Subject: [PATCH 0304/2920] Update the SummaryPage's description

A summary page isn't an indicator anymore for a complete wizard as
there are multiple summary pages now.

refs #8191
---
 .../setup/application/views/scripts/form/setup-summary.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/application/views/scripts/form/setup-summary.phtml b/modules/setup/application/views/scripts/form/setup-summary.phtml
index 676dcd52f..e8053a897 100644
--- a/modules/setup/application/views/scripts/form/setup-summary.phtml
+++ b/modules/setup/application/views/scripts/form/setup-summary.phtml
@@ -5,7 +5,7 @@ use Icinga\Web\Wizard;
 ?>
 <p><?= sprintf(
   $this->translate(
-    'The wizard is now complete. You can review the changes supposed to be made before setting up %1$s.'
+    'You\'ve configured %1$s successfully. You can review the changes supposed to be made before setting it up.'
     . ' Make sure that everything is correct (Feel free to navigate back to make any corrections!) so'
     . ' that you can start using %1$s right after it has successfully been set up.'
   ),

From 71fd1036deafd6ed12a2b5c02366f59fc1d84ee3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 21 Jan 2015 16:57:08 +0100
Subject: [PATCH 0305/2920] Pre-select the monitoring module in the setup
 wizard

It's TEH module!!1

refs #8191
---
 modules/setup/application/forms/ModulePage.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/setup/application/forms/ModulePage.php b/modules/setup/application/forms/ModulePage.php
index 596a5d762..7add2bb81 100644
--- a/modules/setup/application/forms/ModulePage.php
+++ b/modules/setup/application/forms/ModulePage.php
@@ -34,7 +34,8 @@ class ModulePage extends Form
                 'checkbox',
                 $module->getName(),
                 array(
-                    'label' => ucfirst($module->getName())
+                    'label' => ucfirst($module->getName()),
+                    'value' => $module->getName() === 'monitoring' ? 1 : 0
                 )
             );
             $this->addElement(

From 1ee873adfc031689f83d295619aaea584dd0e07a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 21 Jan 2015 17:00:30 +0100
Subject: [PATCH 0306/2920] Remove the "old" ModulePage view script

refs #8191
---
 .../views/scripts/form/setup-modules.phtml    | 47 -------------
 public/css/icinga/setup.less                  | 69 -------------------
 2 files changed, 116 deletions(-)
 delete mode 100644 modules/setup/application/views/scripts/form/setup-modules.phtml

diff --git a/modules/setup/application/views/scripts/form/setup-modules.phtml b/modules/setup/application/views/scripts/form/setup-modules.phtml
deleted file mode 100644
index 304aad9b8..000000000
--- a/modules/setup/application/views/scripts/form/setup-modules.phtml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-use Icinga\Web\Wizard;
-
-?>
-<div class="module-menu">
-  <p><?= $this->translate('The following modules can be set up by using a web-based wizard as well. To setup a module, just complete its wizard and advance to the summary!'); ?></p>
-  <p><?= $this->translate('You can freely switch to a module\'s wizard by clicking its name below. The wizard you are currently looking at is written in bold. A small tick is shown on the right once a wizard has been completed.'); ?></p>
-  <form name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
-    <?= $form->getElement($form->getTokenElementName()); ?>
-    <?= $form->getElement($form->getUidElementName()); ?>
-    <ul>
-    <?php $allFinished = true; ?>
-    <?php foreach ($form->getModules() as $module): ?>
-     <?php if ($module->providesSetupWizard()): ?>
-      <li>
-        <?php $isActive = $module->getName() === $form->getCurrentModule(); ?>
-        <button type="submit" name="module" value="<?= $module->getName(); ?>">
-          <?= $isActive ? '<strong>' : '' ?><?= $module->getTitle(); ?><?= $isActive ? '</strong>' : '' ?>
-        </button>
-       <?php if ($module->getSetupWizard()->isFinished()): ?>
-        <?= $this->icon('ok', $this->translate('Completed', 'setup.modules.wizard.state')); ?>
-       <?php else: ?>
-        <?php $allFinished = false; ?>
-       <?php endif ?>
-      </li>
-     <?php endif ?>
-    <?php endforeach ?>
-    </ul>
-  </form>
- <?php if ($allFinished): ?>
-  <p class="all-completed"><?= $this->translate('You\'ve completed all module wizards!'); ?></p>
- <?php else: ?>
-  <p style="font-size: 80%;"><?= $this->translate('Note that you can skip a specific module by just not completing its wizard.'); ?></p>
- <?php endif ?>
-</div>
-<div class="module-wizard">
-  <?= $form->getCurrentWizard()->getForm()->render(); ?>
-</div>
-<form name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
-  <?= $form->getElement($form->getTokenElementName()); ?>
-  <?= $form->getElement($form->getUidElementName()); ?>
-  <div class="buttons">
-    <?= $form->getElement(Wizard::BTN_PREV); ?>
-    <?= $form->getElement(Wizard::BTN_NEXT); ?>
-  </div>
-</form>
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index 8ca669bdd..0f69355b3 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -394,72 +394,3 @@
     margin-top: 0;
   }
 }
-
-#setup {
-  div.module-wizard {
-    width: auto;
-    padding: 1em;
-    overflow: hidden;
-    border: solid 1px lightgrey;
-
-    div.buttons {
-      margin: 1.5em 0 0;
-      float: right;
-
-      button[type=submit] {
-        padding: 0.5em;
-        line-height: 0.5em;
-	background-color: @colorPetrol;
-
-        &:hover, &:focus, &:active {
-          background-color: #666;
-        }
-      }
-    }
-  }
-
-  div.module-menu {
-    font-size: 0.9em;
-    width: 25%;
-    float: right;
-    margin-left: 1.5em;
-
-    p {
-      margin-top: 0;
-
-      &.all-completed {
-        .conspicuous-state-notification;
-        text-align: center;
-        font-size: 90%;
-        background-color: @colorOk;
-      }
-    }
-
-    ul {
-      padding-left: 1.2em;
-
-      button {
-        margin: 0 0 0.8em;
-        padding: 0;
-        color: black;
-        border: none;
-        outline: none;
-        font-size: 90%;
-        background-color: white;
-
-        &:hover {
-          color: #666;
-          cursor: pointer;
-        }
-
-        &:focus, &:active {
-          color: #666;
-        }
-      }
-
-      img {
-        margin: 0 0.5em 0.2em;
-      }
-    }
-  }
-}

From d064b0ac791266716b1f04298c544a954266c3a0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 21 Jan 2015 17:29:31 +0100
Subject: [PATCH 0307/2920] monitoring: Rename $showService to $isService in
 the header view script

Most views use $isService to set whether we are about to show a service.
---
 .../application/views/scripts/show/components/header.phtml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/header.phtml b/modules/monitoring/application/views/scripts/show/components/header.phtml
index ccf7d2d5e..25ed83cfd 100644
--- a/modules/monitoring/application/views/scripts/show/components/header.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/header.phtml
@@ -3,7 +3,7 @@
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
-$showService = $object->getType() === $object::TYPE_SERVICE;
+$isService = $object->getType() === $object::TYPE_SERVICE;
 
 ?>
 <?php if (!$this->compact): ?>
@@ -11,7 +11,7 @@ $showService = $object->getType() === $object::TYPE_SERVICE;
 <?php endif ?>
 <table class="objectstate">
     <tr class="state <?= Host::getStateText($object->host_state); ?><?= $object->host_handled ? ' handled' : '' ?>">
-    <td class="state"<?= $showService ? '' : ' rowspan="2"' ?>>
+    <td class="state"<?= $isService ? '' : ' rowspan="2"' ?>>
         <strong><?= strtoupper(Host::getStateText($object->host_state, true)); ?></strong><br />
       <?= $this->prefixedTimeSince($object->host_last_state_change, true) ?>
     </td>
@@ -21,7 +21,7 @@ $showService = $object->getType() === $object::TYPE_SERVICE;
 <?php endif ?>
     </td>
   </tr>
-<?php if ($showService): ?>
+<?php if ($isService): ?>
   <tr class="state <?= Service::getStateText($object->service_state); ?><?= $object->service_handled ? ' handled' : '' ?>">
     <td class="state">
       <strong><?= strtoupper(Service::getStateText($object->service_state, true)); ?></strong><br />

From 94d727dbb8d9ce3103b6f99876cd862e939aa5a6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 22 Jan 2015 09:21:50 +0100
Subject: [PATCH 0308/2920] Fix error in Icinga\Web\Form in case the label
 decorator is missing

Zend_Form::getDecorator() returns false instead of null in case the
decorator is not found.
---
 library/Icinga/Web/Form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 64712961f..1f3e0d4bd 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -512,7 +512,7 @@ class Form extends Zend_Form
 
         $el = parent::createElement($type, $name, $options);
 
-        if (($description = $el->getDescription()) !== null && ($label = $el->getDecorator('label')) !== null) {
+        if (($description = $el->getDescription()) !== null && ($label = $el->getDecorator('label')) !== false) {
             $label->setOptions(array(
                 'title' => $description,
                 'class' => 'has-feedback'

From 98acc9166a5b80b7dd290a5d43e0582c6b698702 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 10:24:44 +0100
Subject: [PATCH 0309/2920] monitoring: Fix coding style in
 components/header.phtml

---
 .../scripts/show/components/header.phtml      | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/header.phtml b/modules/monitoring/application/views/scripts/show/components/header.phtml
index 25ed83cfd..b57f1a482 100644
--- a/modules/monitoring/application/views/scripts/show/components/header.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/header.phtml
@@ -6,34 +6,34 @@ use Icinga\Module\Monitoring\Object\Service;
 $isService = $object->getType() === $object::TYPE_SERVICE;
 
 ?>
-<?php if (!$this->compact): ?>
+
+<?php if (! $this->compact): ?>
 <?= $tabs ?>
 <?php endif ?>
+
 <table class="objectstate">
     <tr class="state <?= Host::getStateText($object->host_state); ?><?= $object->host_handled ? ' handled' : '' ?>">
-    <td class="state"<?= $isService ? '' : ' rowspan="2"' ?>>
-        <strong><?= strtoupper(Host::getStateText($object->host_state, true)); ?></strong><br />
-      <?= $this->prefixedTimeSince($object->host_last_state_change, true) ?>
-    </td>
-    <td><b><?= $this->escape($object->host_name) ?></b><?php
- if ($object->host_address && $object->host_address !== $object->host_name): ?>
- <br><?= $this->escape($object->host_address) ?>
-<?php endif ?>
-    </td>
-  </tr>
+        <td class="state"<?= $isService ? '' : ' rowspan="2"' ?>>
+            <strong><?= strtoupper(Host::getStateText($object->host_state, true)); ?></strong><br />
+            <?= $this->prefixedTimeSince($object->host_last_state_change, true) ?>
+        </td>
+        <td>
+            <b><?= $this->escape($object->host_name) ?></b>
+            <?php if ($object->host_address && $object->host_address !== $object->host_name): ?>
+            <br><?= $this->escape($object->host_address) ?>
+            <?php endif ?>
+        </td>
+    </tr>
 <?php if ($isService): ?>
-  <tr class="state <?= Service::getStateText($object->service_state); ?><?= $object->service_handled ? ' handled' : '' ?>">
-    <td class="state">
-      <strong><?= strtoupper(Service::getStateText($object->service_state, true)); ?></strong><br />
-      <?= $this->prefixedTimeSince($object->service_last_state_change, true) ?>
-    </td>
-    <td><b><?= $this->translate('Service') ?>: <?= $this->escape($object->service_description) ?></b>
-
-    <?= $this->render('show/components/statusIcons.phtml') ?>
-
-</td>
+    <tr class="state <?= Service::getStateText($object->service_state); ?><?= $object->service_handled ? ' handled' : '' ?>">
+        <td class="state">
+            <strong><?= strtoupper(Service::getStateText($object->service_state, true)); ?></strong><br />
+            <?= $this->prefixedTimeSince($object->service_last_state_change, true) ?>
+        </td>
+        <td>
+            <b><?= $this->translate('Service') ?>: <?= $this->escape($object->service_description) ?></b>
+            <?= $this->render('show/components/statusIcons.phtml') ?>
+        </td>
   </tr>
-<?php else: ?>
-  <tr><td><!--<b>Host state</b>-->&nbsp;</td></tr>
 <?php endif ?>
 </table>

From ed7dc1beb639294ab3f25b42a76b2110b5f089f4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 10:29:57 +0100
Subject: [PATCH 0310/2920] monitoring: Use display_name when displaying the
 service name in the detail area

refs #7843
---
 .../application/views/scripts/show/components/header.phtml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/header.phtml b/modules/monitoring/application/views/scripts/show/components/header.phtml
index b57f1a482..b6ed49ed5 100644
--- a/modules/monitoring/application/views/scripts/show/components/header.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/header.phtml
@@ -31,7 +31,7 @@ $isService = $object->getType() === $object::TYPE_SERVICE;
             <?= $this->prefixedTimeSince($object->service_last_state_change, true) ?>
         </td>
         <td>
-            <b><?= $this->translate('Service') ?>: <?= $this->escape($object->service_description) ?></b>
+            <b><?= $this->translate('Service') ?>: <?= $this->escape($object->service_display_name) ?></b>
             <?= $this->render('show/components/statusIcons.phtml') ?>
         </td>
   </tr>

From e61edaaffbfe88b38e5eb949e2a5ac189ee1ed0f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 10:30:55 +0100
Subject: [PATCH 0311/2920] monitoring: Show service_description in the detail
 area too if it's different from the display_name

refs #7843
---
 .../application/views/scripts/show/components/header.phtml     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/show/components/header.phtml b/modules/monitoring/application/views/scripts/show/components/header.phtml
index b6ed49ed5..f0c118539 100644
--- a/modules/monitoring/application/views/scripts/show/components/header.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/header.phtml
@@ -32,6 +32,9 @@ $isService = $object->getType() === $object::TYPE_SERVICE;
         </td>
         <td>
             <b><?= $this->translate('Service') ?>: <?= $this->escape($object->service_display_name) ?></b>
+            <?php if ($object->service_display_name !== $object->service_description): ?>
+            <small>(<?= $this->escape($object->service_description) ?>)</small>
+            <?php endif ?>
             <?= $this->render('show/components/statusIcons.phtml') ?>
         </td>
   </tr>

From 4539462bc7039d1cbc0dbfe9b8c8781d69a72bf7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 10:34:35 +0100
Subject: [PATCH 0312/2920] monitoring: Select host_display_name in the host
 and service object

refs #7843
---
 modules/monitoring/library/Monitoring/Object/Host.php    | 1 +
 modules/monitoring/library/Monitoring/Object/Service.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 79a760d82..eeac94cb9 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -91,6 +91,7 @@ class Host extends MonitoredObject
     {
         $columns = array(
             'host_name',
+            'host_display_name',
             'host_alias',
             'host_address',
             'host_state',
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 64bfe530b..3b7bff4fa 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -108,6 +108,7 @@ class Service extends MonitoredObject
     {
         return $this->backend->select()->from('serviceStatus', array(
             'host_name',
+            'host_display_name',
             'host_state',
             'host_state_type',
             'host_last_state_change',

From 3d306c0a060bebd06622c236978fc78a4f5b9eec Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 10:35:06 +0100
Subject: [PATCH 0313/2920] monitoring: Use display_name for displaying the
 host name in the detail area

refs #7843
---
 .../application/views/scripts/show/components/header.phtml   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/header.phtml b/modules/monitoring/application/views/scripts/show/components/header.phtml
index f0c118539..ad0a773ff 100644
--- a/modules/monitoring/application/views/scripts/show/components/header.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/header.phtml
@@ -18,9 +18,10 @@ $isService = $object->getType() === $object::TYPE_SERVICE;
             <?= $this->prefixedTimeSince($object->host_last_state_change, true) ?>
         </td>
         <td>
-            <b><?= $this->escape($object->host_name) ?></b>
+            <b><?= $this->escape($object->host_display_name) ?></b>
             <?php if ($object->host_address && $object->host_address !== $object->host_name): ?>
-            <br><?= $this->escape($object->host_address) ?>
+            <br>
+            <?= $this->escape($object->host_address) ?>
             <?php endif ?>
         </td>
     </tr>

From 9e5d7f43ff2167ea46a5f8d579e127e57c323301 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 10:36:02 +0100
Subject: [PATCH 0314/2920] monitoring: Show host_name in the detail area too
 if it's different from the display_name

refs #7843
---
 .../application/views/scripts/show/components/header.phtml     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/show/components/header.phtml b/modules/monitoring/application/views/scripts/show/components/header.phtml
index ad0a773ff..cfd093473 100644
--- a/modules/monitoring/application/views/scripts/show/components/header.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/header.phtml
@@ -19,6 +19,9 @@ $isService = $object->getType() === $object::TYPE_SERVICE;
         </td>
         <td>
             <b><?= $this->escape($object->host_display_name) ?></b>
+            <?php if ($object->host_display_name !== $object->host_name): ?>
+            <small>(<?= $this->escape($object->host_name) ?>)</small>
+            <?php endif ?>
             <?php if ($object->host_address && $object->host_address !== $object->host_name): ?>
             <br>
             <?= $this->escape($object->host_address) ?>

From a1f4d124b41da7e0aba0b7d7864ebb5da2930afa Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 10:36:44 +0100
Subject: [PATCH 0315/2920] monitoring: Prefer <br> over <br /> in
 components/header.phtml

---
 .../application/views/scripts/show/components/header.phtml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/header.phtml b/modules/monitoring/application/views/scripts/show/components/header.phtml
index cfd093473..7f58790f4 100644
--- a/modules/monitoring/application/views/scripts/show/components/header.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/header.phtml
@@ -14,7 +14,7 @@ $isService = $object->getType() === $object::TYPE_SERVICE;
 <table class="objectstate">
     <tr class="state <?= Host::getStateText($object->host_state); ?><?= $object->host_handled ? ' handled' : '' ?>">
         <td class="state"<?= $isService ? '' : ' rowspan="2"' ?>>
-            <strong><?= strtoupper(Host::getStateText($object->host_state, true)); ?></strong><br />
+            <strong><?= strtoupper(Host::getStateText($object->host_state, true)); ?></strong><br>
             <?= $this->prefixedTimeSince($object->host_last_state_change, true) ?>
         </td>
         <td>
@@ -31,7 +31,7 @@ $isService = $object->getType() === $object::TYPE_SERVICE;
 <?php if ($isService): ?>
     <tr class="state <?= Service::getStateText($object->service_state); ?><?= $object->service_handled ? ' handled' : '' ?>">
         <td class="state">
-            <strong><?= strtoupper(Service::getStateText($object->service_state, true)); ?></strong><br />
+            <strong><?= strtoupper(Service::getStateText($object->service_state, true)); ?></strong><br>
             <?= $this->prefixedTimeSince($object->service_last_state_change, true) ?>
         </td>
         <td>

From fc62a63899d229bbbcd2d5e09038334bb883fb20 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 10:37:44 +0100
Subject: [PATCH 0316/2920] Remove require version comment in the Vagrantfile

---
 Vagrantfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 28b69cab9..1e5e3a073 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -4,7 +4,6 @@
 VAGRANTFILE_API_VERSION = "2"
 VAGRANT_REQUIRED_VERSION = "1.5.0"
 
-# Require 1.2.x at least
 if ! defined? Vagrant.require_version
   if Gem::Version.new(Vagrant::VERSION) < Gem::Version.new(VAGRANT_REQUIRED_VERSION)
     puts "Vagrant >= " + VAGRANT_REQUIRED_VERSION + " required. Your version is " + Vagrant::VERSION

From dd83f6f75796abb7638d6d07ddf8bf21fd807573 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 10:38:00 +0100
Subject: [PATCH 0317/2920] Fix copyright year

---
 application/views/scripts/authentication/login.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index a3d8fcfa9..7d8d15df8 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -14,7 +14,7 @@
     </div>
    <?php endif ?>
    <?= $this->form ?>
-   <div class="footer">Icinga Web 2 &copy; 2013-2014<br><a href="https://www.icinga.org">The Icinga Project</a></div>
+   <div class="footer">Icinga Web 2 &copy; 2013-2015<br><a href="https://www.icinga.org">The Icinga Project</a></div>
    <?php if ($requiresSetup): ?>
    <div class="config-note"><?= sprintf(
      t(

From d1715c8ec6645ed163515255c46d67e65787a540 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 10:45:14 +0100
Subject: [PATCH 0318/2920] monitoring: Escape event message in an object's
 event history

---
 modules/monitoring/application/views/scripts/show/history.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index 5b922d4a0..728b9bfc1 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -148,7 +148,7 @@ $output = $this->tickets ? preg_replace_callback(
         <?php endif ?>
           <br>
           <div>
-            <?= $this->icon($icon, $title); ?> <?= empty($msg) ? '' : $msg; ?>
+            <?= $this->icon($icon, $title); ?> <?= empty($msg) ? '' : $this->escape($msg) ?>
           </div>
         </td>
       </tr>

From 1aa91f0228ccb03af277baee6d702664b8a127cb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 10:57:15 +0100
Subject: [PATCH 0319/2920] monitoring: Select host and service display_name
 for an object's history

refs #7843
---
 .../monitoring/library/Monitoring/Object/MonitoredObject.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 2d9f1f30c..8d3246aab 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -408,7 +408,9 @@ abstract class MonitoredObject
         $eventHistory = $this->backend->select()->from('eventHistory', array(
                 'object_type',
                 'host_name',
+                'host_display_name',
                 'service_description',
+                'service_display_name',
                 'timestamp',
                 'state',
                 'attempt',

From c4c248cbb76d4a8d967765cefe3855f76973ac54 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 22 Jan 2015 10:57:41 +0100
Subject: [PATCH 0320/2920] Make the ModulePage's design more appealing

refs #8191
---
 .../setup/application/forms/ModulePage.php    | 16 +++----
 .../views/scripts/form/setup-modules.phtml    | 24 +++++++++++
 public/css/icinga/setup.less                  | 42 +++++++++++++++++++
 3 files changed, 72 insertions(+), 10 deletions(-)
 create mode 100644 modules/setup/application/views/scripts/form/setup-modules.phtml

diff --git a/modules/setup/application/forms/ModulePage.php b/modules/setup/application/forms/ModulePage.php
index 7add2bb81..ef765c0e7 100644
--- a/modules/setup/application/forms/ModulePage.php
+++ b/modules/setup/application/forms/ModulePage.php
@@ -19,7 +19,7 @@ class ModulePage extends Form
     public function init()
     {
         $this->setName('setup_modules');
-        //$this->setViewScript('form/setup-modules.phtml');
+        $this->setViewScript('form/setup-modules.phtml');
 
         $this->modulePaths = array();
         if (($appModulePath = realpath(Icinga::app()->getApplicationDir() . '/../modules')) !== false) {
@@ -34,15 +34,11 @@ class ModulePage extends Form
                 'checkbox',
                 $module->getName(),
                 array(
-                    'label' => ucfirst($module->getName()),
-                    'value' => $module->getName() === 'monitoring' ? 1 : 0
-                )
-            );
-            $this->addElement(
-                'note',
-                $module->getName() . '_desc',
-                array(
-                    'value' => $module->getDescription()
+                    'required'      => true,
+                    'description'   => $module->getDescription(),
+                    'label'         => ucfirst($module->getName()),
+                    'value'         => $module->getName() === 'monitoring' ? 1 : 0,
+                    'decorators'    => array('ViewHelper')
                 )
             );
         }
diff --git a/modules/setup/application/views/scripts/form/setup-modules.phtml b/modules/setup/application/views/scripts/form/setup-modules.phtml
new file mode 100644
index 000000000..8d8e9ecf9
--- /dev/null
+++ b/modules/setup/application/views/scripts/form/setup-modules.phtml
@@ -0,0 +1,24 @@
+<?php
+
+use Icinga\Web\Wizard;
+
+?>
+<form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
+<h2><?= $this->translate('Modules', 'setup.page.title'); ?></h2>
+<p><?= $this->translate('The following modules were found in your Icinga Web 2 installation. To enable and configure a module, just tick it and click "Next".'); ?></p>
+<?php foreach ($form->getElements() as $element): ?>
+ <?php if (! in_array($element->getName(), array(Wizard::BTN_PREV, Wizard::BTN_NEXT, $form->getTokenElementName(), $form->getUidElementName()))): ?>
+  <div class="module">
+    <h3><label for="<?= $element->getId(); ?>"><strong><?= $element->getLabel(); ?></strong></label></h3>
+    <label for="<?= $element->getId(); ?>"><?= $element->getDescription(); ?></label>
+    <?= $element; ?>
+  </div>
+ <?php endif ?>
+<?php endforeach ?>
+  <?= $form->getElement($form->getTokenElementName()); ?>
+  <?= $form->getElement($form->getUidElementName()); ?>
+  <div class="buttons">
+    <?= $form->getElement(Wizard::BTN_PREV); ?>
+    <?= $form->getElement(Wizard::BTN_NEXT); ?>
+  </div>
+</form>
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index 0f69355b3..d6692b501 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -394,3 +394,45 @@
     margin-top: 0;
   }
 }
+
+#setup_modules {
+  div.module {
+    float: left;
+    width: 15em;
+    height: 15em;
+    margin: 1em;
+    padding: 0.3em;
+    border: 1px solid #ccc;
+    background-color: snow;
+
+    h3 {
+      border: none;
+      margin: 0.5em 0;
+      text-align: center;
+
+      label {
+        margin: 0;
+        width: 15em;
+        cursor: pointer;
+      }
+    }
+
+    h3 + label {
+      width: 13.5em;
+      height: 13.9em;
+      overflow: auto;
+      cursor: pointer;
+      font-weight: normal;
+    }
+
+    input[type=checkbox] {
+      height: 10em;
+      float: right;
+    }
+  }
+
+  div.buttons {
+    padding-top: 1em;
+    clear: both;
+  }
+}
\ No newline at end of file

From 4589621f58e1127db7e0309c2a55bf0017ababc5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 10:57:44 +0100
Subject: [PATCH 0321/2920] monitoring: Use host and service display_name for
 displaying host and service names for an object's history

refs #7843
---
 .../views/scripts/show/history.phtml          | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index 728b9bfc1..a0cc4944e 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -136,13 +136,18 @@ $output = $this->tickets ? preg_replace_callback(
 
 ?>
         <?php if ($isService): ?>
-          <?= $hostContext ? $this->qlink(
-            $this->escape($event->service_description),
-            'monitoring/show/service',
-            array(
-              'host' => $event->host_name,
-              'service' => $event->service_description)
-            ) : $this->escape($event->service_description); ?> <?= $this->translate('on') . ' ' . $this->escape($event->host_name); ?>
+          <?= sprintf(
+              $this->translate('%s on %s', 'Service running on host'),
+              $hostContext ? $this->qlink(
+                  $this->escape($event->service_display_name),
+                  'monitoring/show/service',
+                  array(
+                      'host' => $event->host_name,
+                      'service' => $event->service_description
+                  )
+              ) : $this->escape($event->service_display_name),
+              $event->host_display_name
+          ) ?>
         <?php else: ?>
           <?= $this->escape($event->host_name); ?>
         <?php endif ?>

From 8bd56f4387c6f579bef062926bf5b94fe6e199da Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 10:58:16 +0100
Subject: [PATCH 0322/2920] monitoring: Use the Link helper in the eventhistory
 overview

---
 .../views/scripts/list/eventhistory.phtml      | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index d96a4914b..2970675e2 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -106,21 +106,11 @@ use Icinga\Module\Monitoring\Object\Service;
         </td>
         <td>
         <?php if ($isService): ?>
-          <a href="<?= $this->href('monitoring/show/service', array(
-            'host'      => $event->host,
-            'service'   => $event->service
-          )); ?>">
-            <?= $this->escape($event->service_display_name) ?>
-          </a>
-          <small>
-            <?= $this->translate('on') . ' ' . $this->escape($event->host_display_name) ?>
-          </small>
+          <?= $this->link()->service(
+              $event->service, $event->service_display_name, $event->host, $event->host_display_name
+          ) ?>
         <?php else: ?>
-          <a href="<?= $this->href('monitoring/show/host', array(
-            'host' => $event->host
-          )); ?>">
-            <?= $this->escape($event->host_display_name) ?>
-          </a>
+          <?= $this->link()->host($event->host, $event->host_display_name) ?>
         <?php endif ?>
           <br>
           <div>

From db9e2fe4cae6435bfd64d5f9e7cfa988c2d38072 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 11:06:05 +0100
Subject: [PATCH 0323/2920] doc/vagrant: Fix version requirement

---
 doc/vagrant.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/vagrant.md b/doc/vagrant.md
index 6bcc2def9..b1b98b436 100644
--- a/doc/vagrant.md
+++ b/doc/vagrant.md
@@ -2,10 +2,10 @@
 
 ## Requirements
 
-* Vagrant &gt;= version 1.4
+* Vagrant &gt;= version 1.5
 * VirtualBox or Parallels
 
-> **Note:** The deployment of the virtual machine is tested against Vagrant starting with version 1.4.
+> **Note:** The deployment of the virtual machine is tested against Vagrant starting with version 1.5.
 > Unfortunately older versions will not work.
 
 ## General

From 3040116c129a4705649ee019602c9352844b77a2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 22 Jan 2015 12:47:18 +0100
Subject: [PATCH 0324/2920] Combine duplicate requirements

refs #8191
---
 .../scripts/form/setup-requirements.phtml     | 12 ++-
 modules/setup/library/Setup/Requirements.php  | 75 ++++++++++++++-----
 modules/setup/library/Setup/WebWizard.php     | 17 ++++-
 public/css/icinga/setup.less                  |  6 ++
 4 files changed, 89 insertions(+), 21 deletions(-)

diff --git a/modules/setup/application/views/scripts/form/setup-requirements.phtml b/modules/setup/application/views/scripts/form/setup-requirements.phtml
index 09d337a02..47842efde 100644
--- a/modules/setup/application/views/scripts/form/setup-requirements.phtml
+++ b/modules/setup/application/views/scripts/form/setup-requirements.phtml
@@ -11,7 +11,17 @@ $requirements = $form->getRequirements();
 <?php foreach ($requirements as $requirement): ?>
     <tr>
       <td><h2><?= $requirement->title; ?></h2></td>
-      <td style="width: 50%"><?= $requirement->description; ?></td>
+      <td style="width: 50%">
+      <?php if (is_array($requirement->description)): ?>
+        <ul>
+        <?php foreach ($requirement->description as $desc): ?>
+          <li><?= $desc; ?></li>
+        <?php endforeach ?>
+        </ul>
+      <?php else: ?>
+        <?= $requirement->description; ?>
+      <?php endif ?>
+      </td>
       <td class="state <?= $requirement->state === Requirements::STATE_OK ? 'fulfilled' : (
         $requirement->state === Requirements::STATE_OPTIONAL ? 'not-available' : 'missing'
       ); ?>"><?= $requirement->message; ?></td>
diff --git a/modules/setup/library/Setup/Requirements.php b/modules/setup/library/Setup/Requirements.php
index 4b3d411cb..ab9e693e5 100644
--- a/modules/setup/library/Setup/Requirements.php
+++ b/modules/setup/library/Setup/Requirements.php
@@ -9,6 +9,9 @@ use IteratorAggregate;
 
 /**
  * Container to store and handle requirements
+ *
+ * TODO: Requirements should be registered as objects with a specific purpose (PhpModRequirement, PhpIniRequirement, ..)
+ *       so that it's not necessary to define unique identifiers which may differ between different modules.
  */
 class Requirements implements IteratorAggregate
 {
@@ -41,12 +44,40 @@ class Requirements implements IteratorAggregate
      *
      * @return  self
      */
-    public function add($requirement)
+    public function add($name, $requirement)
     {
-        $this->requirements[] = $requirement;
+        $this->requirements[$name] = array_key_exists($name, $this->requirements)
+            ? $this->combine($this->requirements[$name], $requirement)
+            : $requirement;
         return $this;
     }
 
+    /**
+     * Combine the two given requirements
+     *
+     * Returns the most important requirement with the description from the other one being added.
+     *
+     * @param   object  $oldRequirement
+     * @param   object  $newRequirement
+     *
+     * @return  object
+     */
+    protected function combine($oldRequirement, $newRequirement)
+    {
+        if ($newRequirement->state === static::STATE_MANDATORY && $oldRequirement->state === static::STATE_OPTIONAL) {
+            $tempRequirement = $oldRequirement;
+            $oldRequirement = $newRequirement;
+            $newRequirement = $tempRequirement;
+        }
+
+        if (! is_array($oldRequirement->description)) {
+            $oldRequirement->description = array($oldRequirement->description);
+        }
+
+        $oldRequirement->description[] = $newRequirement->description;
+        return $oldRequirement;
+    }
+
     /**
      * Return all registered requirements
      *
@@ -70,6 +101,7 @@ class Requirements implements IteratorAggregate
     /**
      * Register an optional requirement
      *
+     * @param   string      $name
      * @param   string      $title
      * @param   string      $description
      * @param   bool        $state
@@ -77,20 +109,24 @@ class Requirements implements IteratorAggregate
      *
      * @return  self
      */
-    public function addOptional($title, $description, $state, $message)
+    public function addOptional($name, $title, $description, $state, $message)
     {
-        $this->add((object) array(
-            'title'         => $title,
-            'message'       => $message,
-            'description'   => $description,
-            'state'         => (bool) $state ? static::STATE_OK : static::STATE_OPTIONAL
-        ));
+        $this->add(
+            $name,
+            (object) array(
+                'title'         => $title,
+                'message'       => $message,
+                'description'   => $description,
+                'state'         => (bool) $state ? static::STATE_OK : static::STATE_OPTIONAL
+            )
+        );
         return $this;
     }
 
     /**
      * Register a mandatory requirement
      *
+     * @param   string      $name
      * @param   string      $title
      * @param   string      $description
      * @param   bool        $state
@@ -98,14 +134,17 @@ class Requirements implements IteratorAggregate
      *
      * @return  self
      */
-    public function addMandatory($title, $description, $state, $message)
+    public function addMandatory($name, $title, $description, $state, $message)
     {
-        $this->add((object) array(
-            'title'         => $title,
-            'message'       => $message,
-            'description'   => $description,
-            'state'         => (bool) $state ? static::STATE_OK : static::STATE_MANDATORY
-        ));
+        $this->add(
+            $name,
+            (object) array(
+                'title'         => $title,
+                'message'       => $message,
+                'description'   => $description,
+                'state'         => (bool) $state ? static::STATE_OK : static::STATE_MANDATORY
+            )
+        );
         return $this;
     }
 
@@ -118,8 +157,8 @@ class Requirements implements IteratorAggregate
      */
     public function merge(Requirements $requirements)
     {
-        foreach ($requirements->getAll() as $requirement) {
-            $this->add($requirement);
+        foreach ($requirements->getAll() as $name => $requirement) {
+            $this->add($name, $requirement);
         }
 
         return $this;
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 395c5af8e..58c7c6259 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -366,6 +366,7 @@ class WebWizard extends Wizard implements SetupWizard
 
         $phpVersion = Platform::getPhpVersion();
         $requirements->addMandatory(
+            'php_version_>=_5_3_2',
             mt('setup', 'PHP Version'),
             mt(
                 'setup',
@@ -378,6 +379,7 @@ class WebWizard extends Wizard implements SetupWizard
 
         $defaultTimezone = Platform::getPhpConfig('date.timezone');
         $requirements->addMandatory(
+            'existing_default_timezone',
             mt('setup', 'Default Timezone'),
             sprintf(
                 mt('setup', 'It is required that a default timezone has been set using date.timezone in %s.'),
@@ -390,6 +392,7 @@ class WebWizard extends Wizard implements SetupWizard
         );
 
         $requirements->addOptional(
+            'platform=linux',
             mt('setup', 'Linux Platform'),
             mt(
                 'setup',
@@ -401,6 +404,7 @@ class WebWizard extends Wizard implements SetupWizard
         );
 
         $requirements->addMandatory(
+            'existing_php_mod_openssl',
             mt('setup', 'PHP Module: OpenSSL'),
             mt('setup', 'The PHP module for OpenSSL is required to generate cryptographically safe password salts.'),
             Platform::extensionLoaded('openssl'),
@@ -410,6 +414,7 @@ class WebWizard extends Wizard implements SetupWizard
         );
 
         $requirements->addOptional(
+            'existing_php_mod_json',
             mt('setup', 'PHP Module: JSON'),
             mt('setup', 'The JSON module for PHP is required for various export functionalities as well as APIs.'),
             Platform::extensionLoaded('json'),
@@ -419,6 +424,7 @@ class WebWizard extends Wizard implements SetupWizard
         );
 
         $requirements->addOptional(
+            'existing_php_mod_ldap',
             mt('setup', 'PHP Module: LDAP'),
             mt('setup', 'If you\'d like to authenticate users using LDAP the corresponding PHP module is required'),
             Platform::extensionLoaded('ldap'),
@@ -428,6 +434,7 @@ class WebWizard extends Wizard implements SetupWizard
         );
 
         $requirements->addOptional(
+            'existing_php_mod_intl',
             mt('setup', 'PHP Module: INTL'),
             mt(
                 'setup',
@@ -442,6 +449,7 @@ class WebWizard extends Wizard implements SetupWizard
 
         // TODO(6172): Remove this requirement once we do not ship dompdf with Icinga Web 2 anymore
         $requirements->addOptional(
+            'existing_php_mod_dom',
             mt('setup', 'PHP Module: DOM'),
             mt('setup', 'To be able to export views and reports to PDF, the DOM module for PHP is required.'),
             Platform::extensionLoaded('dom'),
@@ -451,6 +459,7 @@ class WebWizard extends Wizard implements SetupWizard
         );
 
         $requirements->addOptional(
+            'existing_php_mod_gd',
             mt('setup', 'PHP Module: GD'),
             mt(
                 'setup',
@@ -464,6 +473,7 @@ class WebWizard extends Wizard implements SetupWizard
         );
 
         $requirements->addOptional(
+            'existing_php_mod_imagick',
             mt('setup', 'PHP Module: Imagick'),
             mt(
                 'setup',
@@ -477,6 +487,7 @@ class WebWizard extends Wizard implements SetupWizard
         );
 
         $requirements->addOptional(
+            'existing_php_mod_pdo_mysql',
             mt('setup', 'PHP Module: PDO-MySQL'),
             mt(
                 'setup',
@@ -489,6 +500,7 @@ class WebWizard extends Wizard implements SetupWizard
         );
 
         $requirements->addOptional(
+            'existing_php_mod_pdo_pgsql',
             mt('setup', 'PHP Module: PDO-PostgreSQL'),
             mt(
                 'setup',
@@ -503,6 +515,7 @@ class WebWizard extends Wizard implements SetupWizard
 
         $mysqlAdapterFound = Platform::zendClassExists('Zend_Db_Adapter_Pdo_Mysql');
         $requirements->addOptional(
+            'existing_class_Zend_Db_Adapter_Pdo_Mysql',
             mt('setup', 'Zend Database Adapter For MySQL'),
             mt('setup', 'The Zend database adapter for MySQL is required to access a MySQL database.'),
             $mysqlAdapterFound,
@@ -513,6 +526,7 @@ class WebWizard extends Wizard implements SetupWizard
 
         $pgsqlAdapterFound = Platform::zendClassExists('Zend_Db_Adapter_Pdo_Pgsql');
         $requirements->addOptional(
+            'existing_class_Zend_Db_Adapter_Pdo_Pgsql',
             mt('setup', 'Zend Database Adapter For PostgreSQL'),
             mt('setup', 'The Zend database adapter for PostgreSQL is required to access a PostgreSQL database.'),
             $pgsqlAdapterFound,
@@ -523,6 +537,7 @@ class WebWizard extends Wizard implements SetupWizard
 
         $configDir = Icinga::app()->getConfigDir();
         $requirements->addMandatory(
+            'writable_directory_' . $configDir,
             mt('setup', 'Writable Config Directory'),
             mt(
                 'setup',
@@ -539,8 +554,6 @@ class WebWizard extends Wizard implements SetupWizard
         );
 
         foreach ($this->getWizards() as $wizard) {
-            // TODO(8191): Ensure that equal requirements are not shown individually but only
-            //             once with their description properly being merged together!
             $requirements->merge($wizard->getRequirements());
         }
 
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index d6692b501..0bf8eb7b2 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -176,6 +176,12 @@
       margin: 0 1em 0 0;
     }
 
+    ul {
+      margin: 0;
+      padding-left: 1em;
+      list-style-type: square;
+    }
+
     &.state {
       color: white;
       padding: 0.4em;

From 9c47b2d94943a2a4f81588c5e9c3b104c1731518 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 12:49:02 +0100
Subject: [PATCH 0325/2920] monitoring: Fix permission description for
 'monitoring/command/schedule'

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

diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index f56c23d5c..383f06a54 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -10,7 +10,7 @@ $this->providePermission(
 );
 $this->providePermission(
     'monitoring/command/schedule*',
-    $this->translate('Allow all scheduling checks and downtimes')
+    $this->translate('Allow scheduling checks and downtimes')
 );
 $this->providePermission(
     'monitoring/command/schedule-check',

From 32c64f7e3dcc1592d9cd9ccdb14c3a5685bd6a03 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 13:47:45 +0100
Subject: [PATCH 0326/2920] layout: Do not duplicate code from
 layout/menu.phtml in navigation.phtml

---
 .../layouts/scripts/parts/navigation.phtml    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml
index bed44ba5f..dc56b9199 100644
--- a/application/layouts/scripts/parts/navigation.phtml
+++ b/application/layouts/scripts/parts/navigation.phtml
@@ -3,7 +3,6 @@
 use Icinga\Web\Url;
 use Icinga\Web\Menu;
 use Icinga\Web\MenuRenderer;
-use Icinga\Web\Widget\SearchDashboard;
 
 // Don't render a menu for unauthenticated users unless menu is auth aware
 if (! $this->auth()->isAuthenticated()) {
@@ -11,15 +10,16 @@ if (! $this->auth()->isAuthenticated()) {
 }
 
 ?>
-<div
-    id="menu" data-last-update="<?= (time() - 14) ?>000" data-base-target="_main" class="container" data-icinga-url="<?=$this->href('layout/menu');?>"
-    data-icinga-refresh="15"
->
-  <? if (SearchDashboard::search('dummy')->getPane('search')->hasDashlets()): ?>
-      <form action="<?= $this->href('search') ?>" method="get" role="search">
-        <input type="text" name="q" class="search autofocus" placeholder="<?= $this->translate('Search...') ?>"
-               autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
-      </form>
-  <? endif; ?>
-  <?= new MenuRenderer(Menu::load(), Url::fromRequest()->without('renderLayout')->getRelativeUrl()); ?>
+<div  id="menu" data-last-update="<?= (time() - 14) ?>000" data-base-target="_main" class="container"
+      data-icinga-url="<?= $this->href('layout/menu') ?>"  data-icinga-refresh="15">
+    <?= $this->partial(
+        'layout/menu.phtml',
+        'default',
+        array(
+            'menuRenderer' => new MenuRenderer(
+                Menu::load(),
+                Url::fromRequest()->without('renderLayout')->getRelativeUrl()
+            )
+        )
+    ) ?>
 </div>

From bc3a475e907a6a2ad17b1d59d48f9674ade779c6 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 13:48:52 +0100
Subject: [PATCH 0327/2920] Never autofocus the search element by default

Automatically focusing the search element on the initial page load and on every auto-refresh of the menu is disruptive
for both mobile devices and screen readers.

fixes #7697
---
 application/views/scripts/layout/menu.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/scripts/layout/menu.phtml b/application/views/scripts/layout/menu.phtml
index 83196d362..a1e13b060 100644
--- a/application/views/scripts/layout/menu.phtml
+++ b/application/views/scripts/layout/menu.phtml
@@ -5,7 +5,7 @@ use Icinga\Web\Widget\SearchDashboard;
 <? if (SearchDashboard::search('dummy')->getPane('search')->hasDashlets()): ?>
     <form action="<?= $this->href('search') ?>" method="get" role="search">
         <input
-            type="text" name="q" class="search autofocus" placeholder="<?= $this->translate('Search...') ?>"
+            type="text" name="q" class="search" placeholder="<?= $this->translate('Search...') ?>"
             autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
         />
     </form>

From fecdab94631b11275569e04ee93d2264ba7c680e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 13:50:55 +0100
Subject: [PATCH 0328/2920] monitoring: Provide permission for processing host
 and service check results

---
 modules/monitoring/configuration.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index 383f06a54..432cb36ba 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -44,6 +44,10 @@ $this->providePermission(
     'monitoring/command/remove-downtime',
     $this->translate('Allow removing host and service downtimes')
 );
+$this->providePermission(
+    'monitoring/command/process-check-result',
+    $this->translate('Allow processing host and service check results')
+);
 
 $this->provideRestriction(
     'monitoring/filter',

From f4f50fde3c529c3799fbf236d6ced90e22a9e077 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 14:12:02 +0100
Subject: [PATCH 0329/2920] monitoring: Remove _RenderServicePerfdata view
 helper

This helper is not used anywhere.
---
 .../views/helpers/_RenderServicePerfdata.php  | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 modules/monitoring/application/views/helpers/_RenderServicePerfdata.php

diff --git a/modules/monitoring/application/views/helpers/_RenderServicePerfdata.php b/modules/monitoring/application/views/helpers/_RenderServicePerfdata.php
deleted file mode 100644
index d7612ac30..000000000
--- a/modules/monitoring/application/views/helpers/_RenderServicePerfdata.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-class Zend_View_Helper_RenderServicePerfdata extends Zend_View_Helper_Abstract
-{
-    private static $RENDERMAP = array(
-        "check_local_disk" =>  array("self::renderDiskPie")
-    );
-
-    public function renderServicePerfdata($service)
-    {
-        if (isset(self::$RENDERMAP[$service->check_command])) {
-            $fn = self::$RENDERMAP[$service->check_command];
-            $fn($service);
-        }
-    }
-
-    public static function renderDiskPie($service) {
-        $perfdata = $service->performance_data;
-        if(!$perfdata)
-            return "";
-
-    }
-}

From 78a6937c221c207b2ac01394c7314f80131b2e5b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 22 Jan 2015 14:33:09 +0100
Subject: [PATCH 0330/2920] Drop Zend_View_Helper_MonitoringState

It's not required anymore... finally.
---
 .../views/helpers/MonitoringState.php         | 108 ------------------
 .../views/scripts/alertsummary/index.phtml    |   3 -
 .../views/scripts/list/contacts.phtml         |   4 -
 .../views/scripts/list/hosts.phtml            |   2 -
 .../views/scripts/list/services.phtml         |   3 -
 5 files changed, 120 deletions(-)
 delete mode 100644 modules/monitoring/application/views/helpers/MonitoringState.php

diff --git a/modules/monitoring/application/views/helpers/MonitoringState.php b/modules/monitoring/application/views/helpers/MonitoringState.php
deleted file mode 100644
index 13bd93ea7..000000000
--- a/modules/monitoring/application/views/helpers/MonitoringState.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-/**
- * @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
-{
-    private $servicestates = array('ok', 'warning', 'critical', 'unknown', 99 => 'pending', null => 'pending');
-    private $hoststates = array('up', 'down', 'unreachable', 99 => 'pending', null => 'pending');
-
-    /**
-     * @deprecated Not used anywhere.
-     */
-    public function monitoringState($object, $type = 'service')
-    {
-        if ($type === 'service') {
-            return $this->servicestates[$object->service_state];
-        } elseif ($type === 'host') {
-            return $this->hoststates[$object->host_state];
-        }
-    }
-
-    /**
-     * @deprecated Not used anywhere.
-     */
-    public function monitoringStateById($id, $type = 'service')
-    {
-        if ($type === 'service') {
-            return $this->servicestates[$id];
-        } elseif ($type === 'host') {
-            return $this->hoststates[$id];
-        }
-    }
-
-    /**
-     * @deprecated Monitoring colors are clustered.
-     */
-    public function getServiceStateColors()
-    {
-        return array('#44bb77', '#FFCC66', '#FF5566', '#E066FF', '#77AAFF');
-    }
-
-    /**
-     * @deprecated Monitoring colors are clustered.
-     */
-    public function getHostStateColors()
-    {
-        return array('#44bb77', '#FF5566', '#E066FF', '#77AAFF');
-    }
-
-    /**
-     * @deprecated The service object must know about it's possible states.
-     */
-    public function getServiceStateNames()
-    {
-        return array_values($this->servicestates);
-    }
-
-    /**
-     * @deprecated The host object must know about it's possible states.
-     */
-    public function getHostStateNames()
-    {
-        return array_values($this->hoststates);
-    }
-
-    /**
-     * @deprecated Not used anywhere.
-     */
-    public function getStateFlags($object, $type = 'service')
-    {
-        $state_classes = array();
-        if ($type === 'host') {
-            $state_classes[] = $this->monitoringState($object, "host");
-            if ($object->host_acknowledged || $object->host_in_downtime) {
-                $state_classes[] = 'handled';
-            }
-            if ($object->host_last_state_change > (time() - 600)) {
-                $state_classes[] = 'new';
-            }
-        } else {
-            $state_classes[] = $this->monitoringState($object, "service");
-            if ($object->service_acknowledged || $object->service_in_downtime) {
-                $state_classes[] = 'handled';
-            }
-            if ($object->service_last_state_change > (time() - 600)) {
-                $state_classes[] = 'new';
-            }
-        }
-
-        return $state_classes;
-    }
-
-    /**
-     * @deprecated Not used anywhere.
-     */
-    public function getStateTitle($object, $type)
-    {
-        return sprintf(
-            '%s %s %s',
-             $this->view->translate(strtoupper($this->monitoringState($object, $type))),
-            $this->view->translate('since'),
-            date('Y-m-d H:i:s', $object->{$type.'_last_state_change'})
-        );
-    }
-}
diff --git a/modules/monitoring/application/views/scripts/alertsummary/index.phtml b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
index 624b942b3..dbfff6433 100644
--- a/modules/monitoring/application/views/scripts/alertsummary/index.phtml
+++ b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
@@ -1,6 +1,3 @@
-<?php
-$helper = $this->getHelper('MonitoringState');
-?>
 <div class="controls">
     <?= $this->tabs ?>
     <div style="margin: 1em;" class="dontprint">
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index f6face461..d8d2a2e72 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -1,7 +1,3 @@
-<?php
-$viewHelper = $this->getHelper('MonitoringState');
-$contactHelper = $this->getHelper('ContactFlags');
-?>
 <div class="controls">
     <?= $this->tabs ?>
     <div style="margin: 1em">
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 4afc14731..00e357aa5 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -1,8 +1,6 @@
 <?php
 use Icinga\Module\Monitoring\Object\Host;
 
-$helper = $this->getHelper('MonitoringState');
-
 if ($this->compact): ?>
 <div class="content">
 <?php else: ?>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 962d22bda..0e211dfa5 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -1,9 +1,6 @@
 <?php
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
-use Icinga\Module\Monitoring\Plugin\Perfdata;
-
-$helper = $this->getHelper('MonitoringState');
 
 $selfUrl = 'monitoring/list/services';
 

From 6845480b5f2f413acf2a4f8f700b4c632df2233c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 22 Jan 2015 14:36:22 +0100
Subject: [PATCH 0331/2920] Fix that strtoupper can't handle non ascii chars

Fixed by not using strtoupper or by using it prior
to the translation of the corresponding string.

fixes #8163
---
 .../application/views/scripts/hosts/show.phtml       |  2 +-
 .../scripts/list/components/servicesummary.phtml     |  8 ++++----
 .../views/scripts/list/eventhistory.phtml            | 12 ++----------
 .../application/views/scripts/list/hosts.phtml       |  2 +-
 .../application/views/scripts/list/services.phtml    |  4 ++--
 .../application/views/scripts/services/show.phtml    |  4 ++--
 .../views/scripts/show/components/header.phtml       |  4 ++--
 .../scripts/show/components/hostservicesummary.phtml |  8 ++++----
 .../application/views/scripts/show/history.phtml     | 12 ++----------
 .../monitoring/library/Monitoring/Object/Host.php    |  8 ++++----
 .../monitoring/library/Monitoring/Object/Service.php | 10 +++++-----
 11 files changed, 29 insertions(+), 45 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 3c7dafbc5..516e1be03 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -14,7 +14,7 @@
         </div>
         <div class="hbox-item" style="font-size: 14px">
             <?php foreach (array_filter($hostStates) as $text => $count) {
-                echo sprintf('%s: %u <br>', strtoupper($text), $count);
+                echo sprintf('%s: %u <br>', $this->translate(strtoupper($text)), $count);
             } ?>
         </div>
 
diff --git a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
index dab7071a1..c870b09b0 100644
--- a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
@@ -12,7 +12,7 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
     $this->stats->services_ok,
     $selfUrl,
     array('service_state' => 0),
-    array('title' => sprintf($this->translate('Services with state %s'), strtoupper($this->translate('ok'))))
+    array('title' => sprintf($this->translate('Services with state %s'), $this->translate('OK')))
 )  ?></span>
 <?php endif ?>
 
@@ -44,7 +44,7 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
                 $this->stats->$unhandled,
                 $selfUrl,
                 $paramsUnhandled,
-                array('title' => sprintf($this->translate('Unhandled services with state %s'), strtoupper($this->translate($state))))
+                array('title' => sprintf($this->translate('Unhandled services with state %s'), $this->translate(strtoupper($state))))
             );
         }
         if ($this->stats->$handled) {
@@ -61,7 +61,7 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
                 $this->stats->$handled,
                 $selfUrl,
                 $paramsHandled,
-                array('title' => sprintf($this->translate('Handled services with state %s'), strtoupper($this->translate($state))))
+                array('title' => sprintf($this->translate('Handled services with state %s'), $this->translate(strtoupper($state))))
             );
             if ($this->stats->$unhandled) {
                 echo "</span>\n";
@@ -77,7 +77,7 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
     $this->stats->services_pending,
     $selfUrl,
     array('service_state' => 99),
-    array('title' => sprintf($this->translate('Services with state %s'), strtoupper($this->translate('pending'))))
+    array('title' => sprintf($this->translate('Services with state %s'), $this->translate('PENDING')))
 )  ?></span>
 <?php endif ?>
 </span>
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 2970675e2..0b6b9bcec 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -70,21 +70,13 @@ use Icinga\Module\Monitoring\Object\Service;
           $icon = $isService ? 'service' : 'host';
           $msg = '[ ' . $event->attempt . '/' . $event->max_attempts . ' ] ' . $event->output;
           $stateName = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
-          $title = strtoupper(
-            $isService
-              ? Service::getStateText($event->state, true)
-              : Host::getStateText($event->state, true)
-          );
+          $title = $isService ? Service::getStateText($event->state, true) : Host::getStateText($event->state, true);
           break;
         case 'soft_state':
           $icon = 'lightbulb';
           $msg = '[ ' . $event->attempt . '/' . $event->max_attempts . ' ] ' . $event->output;
           $stateName = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
-          $title = strtoupper(
-            $isService
-              ? Service::getStateText($event->state, true)
-              : Host::getStateText($event->state, true)
-          );
+          $title = $isService ? Service::getStateText($event->state, true) : Host::getStateText($event->state, true);
           break;
         case 'dt_start':
           $icon = 'starttime';
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 00e357aa5..ea570a389 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -80,7 +80,7 @@ if ($hosts->count() === 0) {
     <tr class="state <?= $hostStateName ?><?= $host->host_handled ? ' handled' : '' ?>">
       <!-- State -->
       <td class="state">
-        <strong><?= strtoupper(Host::getStateText($host->host_state, true)); ?></strong><br />
+        <strong><?= 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/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 0e211dfa5..45d59adf5 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -56,7 +56,7 @@ foreach ($services as $service):
 ?>
     <tr class="state <?= $serviceStateName ?><?= $service->service_handled ? ' handled' : '' ?>">
       <td class="state">
-        <strong><?= strtoupper(Service::getStateText($service->service_state, true)); ?></strong><br />
+        <strong><?= 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 +106,7 @@ foreach ($services as $service):
       <?php endif ?>
 <a href="<?= $serviceLink ?>"><?= $this->escape($service->service_display_name) ?></a><?php if ($this->showHost): ?> on <a href="<?= $hostLink ?>"><?= $this->escape($service->host_display_name) ?>
 <?php if ($service->host_state != 0): ?>
-  (<?= strtoupper(Host::getStateText($service->host_state, true)); ?>)
+  (<?= Host::getStateText($service->host_state, true); ?>)
 <?php endif ?>
 </a><?php endif ?><br />
         <p class="pluginoutput"><?= $this->escape($this->ellipsis($service->service_output, 10000)); ?></p>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 93e4ae84a..522d32ce7 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -16,7 +16,7 @@
             </div>
             <div class="hbox-item" style="font-size: 14px">
                 <?php foreach (array_filter($serviceStates) as $text => $count) {
-                    echo sprintf(' %s: %u <br>', strtoupper($text), $count);
+                    echo sprintf(' %s: %u <br>', $this->translate(strtoupper($text)), $count);
                 } ?>
             </div>
         </div>
@@ -31,7 +31,7 @@
             </div>
             <div class="hbox-item" style="font-size: 14px">
                 <?php foreach (array_filter($hostStates) as $text => $count) {
-                    echo sprintf('%s: %u <br>', strtoupper($text), $count);
+                    echo sprintf('%s: %u <br>', $this->translate(strtoupper($text)), $count);
                 } ?>
             </div>
         </div>
diff --git a/modules/monitoring/application/views/scripts/show/components/header.phtml b/modules/monitoring/application/views/scripts/show/components/header.phtml
index 7f58790f4..8ba84da43 100644
--- a/modules/monitoring/application/views/scripts/show/components/header.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/header.phtml
@@ -14,7 +14,7 @@ $isService = $object->getType() === $object::TYPE_SERVICE;
 <table class="objectstate">
     <tr class="state <?= Host::getStateText($object->host_state); ?><?= $object->host_handled ? ' handled' : '' ?>">
         <td class="state"<?= $isService ? '' : ' rowspan="2"' ?>>
-            <strong><?= strtoupper(Host::getStateText($object->host_state, true)); ?></strong><br>
+            <strong><?= Host::getStateText($object->host_state, true); ?></strong><br>
             <?= $this->prefixedTimeSince($object->host_last_state_change, true) ?>
         </td>
         <td>
@@ -31,7 +31,7 @@ $isService = $object->getType() === $object::TYPE_SERVICE;
 <?php if ($isService): ?>
     <tr class="state <?= Service::getStateText($object->service_state); ?><?= $object->service_handled ? ' handled' : '' ?>">
         <td class="state">
-            <strong><?= strtoupper(Service::getStateText($object->service_state, true)); ?></strong><br>
+            <strong><?= Service::getStateText($object->service_state, true); ?></strong><br>
             <?= $this->prefixedTimeSince($object->service_last_state_change, true) ?>
         </td>
         <td>
diff --git a/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml b/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml
index 3c603786a..641dd026a 100644
--- a/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml
@@ -17,7 +17,7 @@ $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
     $object->stats->services_ok,
     $selfUrl,
     array('service_state' => 0),
-    array('title' => sprintf($this->translate('Services with state %s'), strtoupper($this->translate('ok'))))
+    array('title' => sprintf($this->translate('Services with state %s'), $this->translate('OK')))
 )  ?></span>
 <?php endif ?>
 <?php
@@ -48,7 +48,7 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
                 $object->stats->$unhandled,
                 $selfUrl,
                 $paramsUnhandled,
-                array('title' => sprintf($this->translate('Unhandled services with state %s'), strtoupper($this->translate($state))))
+                array('title' => sprintf($this->translate('Unhandled services with state %s'), $this->translate(strtoupper($state))))
             );
         }
         if ($object->stats->$handled) {
@@ -65,7 +65,7 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
                 $object->stats->$handled,
                 $selfUrl,
                 $paramsHandled,
-                array('title' => sprintf($this->translate('Handled services with state %s'), strtoupper($this->translate($state))))
+                array('title' => sprintf($this->translate('Handled services with state %s'), $this->translate(strtoupper($state))))
             );
             if ($object->stats->$unhandled) {
                 echo "</span>\n";
@@ -81,7 +81,7 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
     $object->stats->services_pending,
     $selfUrl,
     array('service_state' => 99),
-    array('title' => sprintf($this->translate('Services with state %s'), strtoupper($this->translate('pending'))))
+    array('title' => sprintf($this->translate('Services with state %s'), $this->translate('PENDING')))
 )  ?></span>
 <?php endif ?>
 </span>
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index a0cc4944e..40fb15363 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -92,21 +92,13 @@ function contactsLink($match, $view) {
           $msg = '[ ' . $event->attempt . '/' . $event->max_attempts . ' ] ' . $this->escape($event->output);
           $stateClass = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
           $icon = 'attention-alt';
-          $title = strtoupper(
-            $isService
-              ? Service::getStateText($event->state)
-              : Host::getStateText($event->state)
-          );
+          $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 = strtoupper(
-            $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';
diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index eeac94cb9..8f7df07cb 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -173,16 +173,16 @@ class Host extends MonitoredObject
         $translate = (bool) $translate;
         switch ((int) $state) {
             case self::STATE_UP:
-                $text = $translate ? mt('monitoring', 'up') : 'up';
+                $text = $translate ? mt('monitoring', 'UP') : 'up';
                 break;
             case self::STATE_DOWN:
-                $text = $translate ? mt('monitoring', 'down') : 'down';
+                $text = $translate ? mt('monitoring', 'DOWN') : 'down';
                 break;
             case self::STATE_UNREACHABLE:
-                $text = $translate ? mt('monitoring', 'unreachable') : 'unreachable';
+                $text = $translate ? mt('monitoring', 'UNREACHABLE') : 'unreachable';
                 break;
             case self::STATE_PENDING:
-                $text = $translate ? mt('monitoring', 'pending') : 'pending';
+                $text = $translate ? mt('monitoring', 'PENDING') : 'pending';
                 break;
             default:
                 throw new InvalidArgumentException('Invalid host state \'%s\'', $state);
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 3b7bff4fa..870ff78ba 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -214,19 +214,19 @@ class Service extends MonitoredObject
         $translate = (bool) $translate;
         switch ((int) $state) {
             case self::STATE_OK:
-                $text = $translate ? mt('monitoring', 'ok') : 'ok';
+                $text = $translate ? mt('monitoring', 'OK') : 'ok';
                 break;
             case self::STATE_WARNING:
-                $text = $translate ? mt('monitoring', 'warning') : 'warning';
+                $text = $translate ? mt('monitoring', 'WARNING') : 'warning';
                 break;
             case self::STATE_CRITICAL:
-                $text = $translate ? mt('monitoring', 'critical') : 'critical';
+                $text = $translate ? mt('monitoring', 'CRITICAL') : 'critical';
                 break;
             case self::STATE_UNKNOWN:
-                $text = $translate ? mt('monitoring', 'unknown') : 'unknown';
+                $text = $translate ? mt('monitoring', 'UNKNOWN') : 'unknown';
                 break;
             case self::STATE_PENDING:
-                $text = $translate ? mt('monitoring', 'pending') : 'pending';
+                $text = $translate ? mt('monitoring', 'PENDING') : 'pending';
                 break;
             default:
                 throw new InvalidArgumentException('Invalid service state \'%s\'', $state);

From f16aac515400a2521cae3179737be462261d80a9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 15:20:19 +0100
Subject: [PATCH 0332/2920] Security: Sort permissions only if not empty

---
 library/Icinga/User.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index 659767644..db80c929a 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -197,8 +197,8 @@ class User
      */
     public function setPermissions(array $permissions)
     {
-        natcasesort($permissions);
         if (! empty($permissions)) {
+            natcasesort($permissions);
             $this->permissions = array_combine($permissions, $permissions);
         }
         return $this;

From 9b7e75a616e753e25cda033c86fab44e1281d7e9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 15:20:38 +0100
Subject: [PATCH 0333/2920] Security: Temporary grant all permissions

We'll introduce permissions and restrictions in the next hours. Because our web setup
does not configure permissions yet, all permissions are granted for all users from now on.
---
 library/Icinga/Web/Controller/ActionController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 013f31099..cc4af4432 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -176,6 +176,7 @@ class ActionController extends Zend_Controller_Action
      */
     public function assertPermission($name)
     {
+        return;
         if (! $this->Auth()->hasPermission($name)) {
             // TODO: Shall this be an Auth Exception? Or a 404?
             throw new IcingaException(

From 44718e50126e8d785416feb878e24a0a8aa75355 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 15:22:20 +0100
Subject: [PATCH 0334/2920] Security: Require permissions for executing common
 host commands

---
 .../application/controllers/HostController.php         | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index ab62c3756..5daae0f23 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -47,6 +47,8 @@ class Monitoring_HostController extends MonitoredObjectController
      */
     public function acknowledgeProblemAction()
     {
+        $this->assertPermission('monitoring/command/acknowledge-problem');
+
         $this->view->title = $this->translate('Acknowledge Host Problem');
         $this->handleCommandForm(new AcknowledgeProblemCommandForm());
     }
@@ -56,6 +58,8 @@ class Monitoring_HostController extends MonitoredObjectController
      */
     public function addCommentAction()
     {
+        $this->assertPermission('monitoring/command/add-comment');
+
         $this->view->title = $this->translate('Add Host Comment');
         $this->handleCommandForm(new AddCommentCommandForm());
     }
@@ -65,6 +69,8 @@ class Monitoring_HostController extends MonitoredObjectController
      */
     public function rescheduleCheckAction()
     {
+        $this->assertPermission('monitoring/command/schedule-check');
+
         $this->view->title = $this->translate('Reschedule Host Check');
         $this->handleCommandForm(new ScheduleHostCheckCommandForm());
     }
@@ -74,6 +80,8 @@ class Monitoring_HostController extends MonitoredObjectController
      */
     public function scheduleDowntimeAction()
     {
+        $this->assertPermission('monitoring/command/schedule-downtime');
+
         $this->view->title = $this->translate('Schedule Host Downtime');
         $this->handleCommandForm(new ScheduleHostDowntimeCommandForm());
     }
@@ -83,6 +91,8 @@ class Monitoring_HostController extends MonitoredObjectController
      */
     public function processCheckResultAction()
     {
+        $this->assertPermission('monitoring/command/process-check-result');
+
         $this->view->title = $this->translate('Submit Passive Host Check Result');
         $this->handleCommandForm(new ProcessCheckResultCommandForm());
     }

From 3d7b375ab4f09ac810db5521f13a60b7072ac9f5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 15:23:02 +0100
Subject: [PATCH 0335/2920] Security: Require permissions for executing common
 service commands

---
 .../application/controllers/ServiceController.php      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index 06417cc6e..522a02efc 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -47,6 +47,8 @@ class Monitoring_ServiceController extends MonitoredObjectController
      */
     public function acknowledgeProblemAction()
     {
+        $this->assertPermission('monitoring/command/acknowledge-problem');
+
         $this->view->title = $this->translate('Acknowledge Service Problem');
         $this->handleCommandForm(new AcknowledgeProblemCommandForm());
     }
@@ -56,6 +58,8 @@ class Monitoring_ServiceController extends MonitoredObjectController
      */
     public function addCommentAction()
     {
+        $this->assertPermission('monitoring/command/add-comment');
+
         $this->view->title = $this->translate('Add Service Comment');
         $this->handleCommandForm(new AddCommentCommandForm());
     }
@@ -65,6 +69,8 @@ class Monitoring_ServiceController extends MonitoredObjectController
      */
     public function rescheduleCheckAction()
     {
+        $this->assertPermission('monitoring/command/schedule-check');
+
         $this->view->title = $this->translate('Reschedule Service Check');
         $this->handleCommandForm(new ScheduleServiceCheckCommandForm());
     }
@@ -74,6 +80,8 @@ class Monitoring_ServiceController extends MonitoredObjectController
      */
     public function scheduleDowntimeAction()
     {
+        $this->assertPermission('monitoring/command/schedule-downtime');
+
         $this->view->title = $this->translate('Schedule Service Downtime');
         $this->handleCommandForm(new ScheduleServiceDowntimeCommandForm());
     }
@@ -83,6 +91,8 @@ class Monitoring_ServiceController extends MonitoredObjectController
      */
     public function processCheckResultAction()
     {
+        $this->assertPermission('monitoring/command/process-check-result');
+
         $this->view->title = $this->translate('Submit Passive Service Check Result');
         $this->handleCommandForm(new ProcessCheckResultCommandForm());
     }

From 0f13c0428c4639137176a0768f327cacde13f626 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 15:47:16 +0100
Subject: [PATCH 0336/2920] Controller: Introduce method assertHttpMethod()

We have actions where only certain HTTP methods, e.g. POST are allowed but they are not restricted yet.
Controller::assertHttpMethod() takes a number of allowed HTTP methods and responds with HTTP 405 in case
the current request's method is not one of the given methods.
---
 .../Icinga/Web/Controller/ActionController.php   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index cc4af4432..ba75d366f 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -146,6 +146,22 @@ class ActionController extends Zend_Controller_Action
         return $this;
     }
 
+    /**
+     * Respond with HTTP 405 if the current request's method is not one of the given methods
+     *
+     * @param   string $httpMethod                  Unlimited number of allowed HTTP methods
+     *
+     * @throws  \Zend_Controller_Action_Exception   If the request method is not one of the given methods
+     */
+    public function assertHttpMethod($httpMethod)
+    {
+        $httpMethods = array_flip(array_map('strtoupper', func_get_args()));
+        if (! isset($httpMethods[$this->getRequest()->getMethod()])) {
+            $this->getResponse()->setHeader('Allow', implode(', ', array_keys($httpMethods)));
+            throw new \Zend_Controller_Action_Exception($this->translate('Method Not Allowed'), 405);
+        }
+    }
+
     /**
      * Return restriction information for an eventually authenticated user
      *

From ba7818db5f70c96c57c88411ac2998f40b81921c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 15:49:40 +0100
Subject: [PATCH 0337/2920] monitoring: Restrict delete downtime and delete
 comment to HTTP POST

---
 .../Web/Controller/MonitoredObjectController.php   | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 94dbe3f10..c3b08a3d4 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -143,12 +143,7 @@ abstract class MonitoredObjectController extends Controller
      */
     public function removeCommentAction()
     {
-        /*
-         * TODO(el): This is here because monitoring/list/comments has buttons to remove comments. Because of the nature
-         * of an action, the form is accessible via GET which does not make much sense because the form requires
-         * us to populate the ID of the comment which is to be deleted. We may introduce a combo box for choosing
-         * the comment ID on GET or deny GET access.
-         */
+        $this->assertHttpMethod('POST');
         $this->handleCommandForm(new DeleteCommentCommandForm());
     }
 
@@ -157,12 +152,7 @@ abstract class MonitoredObjectController extends Controller
      */
     public function deleteDowntimeAction()
     {
-        /*
-         * TODO(el): This is here because monitoring/list/downtimes has buttons to remove comments. Because of the
-         * nature of an action, the form is accessible via GET which does not make much sense because the form requires
-         * us to populate the ID of the downtime which is to be deleted. We may introduce a combo box for choosing
-         * the downtime ID on GET or deny GET access.
-         */
+        $this->assertHttpMethod('POST');
         $this->handleCommandForm(new DeleteDowntimeCommandForm());
     }
 

From 251030e1d8e10a829bb65508227cd864b13b101e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 16:03:22 +0100
Subject: [PATCH 0338/2920] monitoring: Rename remove-downtime to
 delete-downtime

---
 .../application/views/scripts/list/comments.phtml           | 4 ++--
 .../Monitoring/Web/Controller/MonitoredObjectController.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 29fc76d49..98daceecd 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -80,9 +80,9 @@
           $delCommentForm = clone $delCommentForm;
           $delCommentForm->populate(array('comment_id' => $comment->id, 'redirect' => $this->url));
           if ($comment->objecttype === 'host') {
-            $delCommentForm->setAction($this->url('monitoring/host/remove-comment', array('host' => $comment->host)));
+            $delCommentForm->setAction($this->url('monitoring/host/delete-comment', array('host' => $comment->host)));
           } else {
-            $delCommentForm->setAction($this->url('monitoring/service/remove-comment', array('host' => $comment->host, 'service' => $comment->service)));
+            $delCommentForm->setAction($this->url('monitoring/service/delete-comment', array('host' => $comment->host, 'service' => $comment->service)));
           }
           echo $delCommentForm;
           ?>
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index c3b08a3d4..a89a3fc49 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -139,16 +139,16 @@ abstract class MonitoredObjectController extends Controller
     abstract public function scheduleDowntimeAction();
 
     /**
-     * Remove a comment
+     * Delete a comment
      */
-    public function removeCommentAction()
+    public function deleteCommentAction()
     {
         $this->assertHttpMethod('POST');
         $this->handleCommandForm(new DeleteCommentCommandForm());
     }
 
     /**
-     * Remove a downtime
+     * Delete a downtime
      */
     public function deleteDowntimeAction()
     {

From 9a59f3529c927516e7eaf1c26839d49a4e2a61bb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 16:56:00 +0100
Subject: [PATCH 0339/2920] monitoring: Group permissions by topic where it
 makes sense, i.e. downtime and comment

---
 .../controllers/HostController.php            |  4 +-
 .../controllers/ServiceController.php         |  4 +-
 modules/monitoring/configuration.php          | 40 +++++++++----------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index 5daae0f23..d01335734 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -58,7 +58,7 @@ class Monitoring_HostController extends MonitoredObjectController
      */
     public function addCommentAction()
     {
-        $this->assertPermission('monitoring/command/add-comment');
+        $this->assertPermission('monitoring/command/comment/add');
 
         $this->view->title = $this->translate('Add Host Comment');
         $this->handleCommandForm(new AddCommentCommandForm());
@@ -80,7 +80,7 @@ class Monitoring_HostController extends MonitoredObjectController
      */
     public function scheduleDowntimeAction()
     {
-        $this->assertPermission('monitoring/command/schedule-downtime');
+        $this->assertPermission('monitoring/command/downtime/schedule');
 
         $this->view->title = $this->translate('Schedule Host Downtime');
         $this->handleCommandForm(new ScheduleHostDowntimeCommandForm());
diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index 522a02efc..c05683400 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -58,7 +58,7 @@ class Monitoring_ServiceController extends MonitoredObjectController
      */
     public function addCommentAction()
     {
-        $this->assertPermission('monitoring/command/add-comment');
+        $this->assertPermission('monitoring/command/comment/add');
 
         $this->view->title = $this->translate('Add Service Comment');
         $this->handleCommandForm(new AddCommentCommandForm());
@@ -80,7 +80,7 @@ class Monitoring_ServiceController extends MonitoredObjectController
      */
     public function scheduleDowntimeAction()
     {
-        $this->assertPermission('monitoring/command/schedule-downtime');
+        $this->assertPermission('monitoring/command/downtime/schedule');
 
         $this->view->title = $this->translate('Schedule Service Downtime');
         $this->handleCommandForm(new ScheduleServiceDowntimeCommandForm());
diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index 432cb36ba..ed94f1545 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -8,41 +8,41 @@ $this->providePermission(
     'monitoring/command/*',
     $this->translate('Allow all commands')
 );
-$this->providePermission(
-    'monitoring/command/schedule*',
-    $this->translate('Allow scheduling checks and downtimes')
-);
 $this->providePermission(
     'monitoring/command/schedule-check',
     $this->translate('Allow scheduling host and service checks')
 );
-$this->providePermission(
-    'monitoring/command/schedule-downtime',
-    $this->translate('Allow scheduling host and service downtimes')
-);
 $this->providePermission(
     'monitoring/command/acknowledge-problem',
     $this->translate('Allow acknowledging host and service problems')
 );
-$this->providePermission(
-    'monitoring/command/add-comment',
-    $this->translate('Allow commenting on hosts and services')
-);
-$this->providePermission(
-    'monitoring/command/remove*',
-    $this->translate('Allow removing problem acknowledgements, host and service comments and downtimes')
-);
 $this->providePermission(
     'monitoring/command/remove-acknowledgement',
     $this->translate('Allow removing problem acknowledgements')
 );
 $this->providePermission(
-    'monitoring/command/remove-comment',
-    $this->translate('Allow removing host and service comments')
+    'monitoring/command/comment/*',
+    $this->translate('Allow adding and deleting host and service comments')
 );
 $this->providePermission(
-    'monitoring/command/remove-downtime',
-    $this->translate('Allow removing host and service downtimes')
+    'monitoring/command/comment/add',
+    $this->translate('Allow commenting on hosts and services')
+);
+$this->providePermission(
+    'monitoring/command/comment/delete',
+    $this->translate('Allow deleting host and service comments')
+);
+$this->providePermission(
+    'monitoring/command/downtime/*',
+    $this->translate('Allow scheduling and deleting host and service downtimes')
+);
+$this->providePermission(
+    'monitoring/command/downtime/schedule',
+    $this->translate('Allow scheduling host and service downtimes')
+);
+$this->providePermission(
+    'monitoring/command/downtime/delete',
+    $this->translate('Allow deleting host and service downtimes')
 );
 $this->providePermission(
     'monitoring/command/process-check-result',

From ef0a7c0e771f4e173ddec23f58dea31637d5a432 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 17:11:53 +0100
Subject: [PATCH 0340/2920] Revert "Security: Temporary grant all permissions"

This reverts commit 9b7e75a616e753e25cda033c86fab44e1281d7e9.

Patching function hasPermission is not enough. A fix will follow.
---
 library/Icinga/Web/Controller/ActionController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index ba75d366f..64438fc1d 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -192,7 +192,6 @@ class ActionController extends Zend_Controller_Action
      */
     public function assertPermission($name)
     {
-        return;
         if (! $this->Auth()->hasPermission($name)) {
             // TODO: Shall this be an Auth Exception? Or a 404?
             throw new IcingaException(

From 44de790cc9d450370193e8e16e5ddb63dfdd03d5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 17:12:49 +0100
Subject: [PATCH 0341/2920] Security: Temporary grant all permissions

---
 library/Icinga/Authentication/Manager.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 0a9b40981..12269d98e 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -165,6 +165,7 @@ class Manager
      */
     public function hasPermission($permission)
     {
+        return true;
         if (! $this->isAuthenticated()) {
             return false;
         }

From a09ba158597798e862c2505f3eecd5761cde7427 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 17:13:35 +0100
Subject: [PATCH 0342/2920] monitoring/security: Hide 'Check Now' action if
 user lacks the respective permission

---
 .../scripts/show/components/checkstatistics.phtml   |  4 +++-
 .../Web/Controller/MonitoredObjectController.php    | 13 ++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index 50b40cdcc..e8c295298 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -23,7 +23,9 @@ if ($object->getType() === $object::TYPE_HOST) {
 <tr>
     <th><?= $this->translate('Last check') ?></th>
     <td data-base-target="_self">
-        <?= $checkNowForm ?>
+        <?php if (isset($checkNowForm)) { // Form is unset if the current user lacks the respective permission
+            echo $checkNowForm;
+        } ?>
         <?= $this->timeSince($object->last_check) ?>
     </td>
 </tr>
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index a89a3fc49..dd83f415b 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -57,11 +57,14 @@ abstract class MonitoredObjectController extends Controller
     public function showAction()
     {
         $this->setAutorefreshInterval(10);
-        $checkNowForm = new CheckNowCommandForm();
-        $checkNowForm
-            ->setObjects($this->object)
-            ->handleRequest();
-        $this->view->checkNowForm = $checkNowForm;
+        $auth = $this->Auth();
+        if ($auth->hasPermission('monitoring/command/schedule-check')) {
+            $checkNowForm = new CheckNowCommandForm();
+            $checkNowForm
+                ->setObjects($this->object)
+                ->handleRequest();
+            $this->view->checkNowForm = $checkNowForm;
+        }
         if ( ! in_array((int) $this->object->state, array(0, 99))) {
             if ((bool) $this->object->acknowledged) {
                 $removeAckForm = new RemoveAcknowledgementCommandForm();

From f46a5872666d2237c478baa3be10d589eef1e5b9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 17:25:30 +0100
Subject: [PATCH 0343/2920] monitoring/security: Hide 'Remove Problem
 Acknowledgement' action if user lacks the respective permission

---
 .../scripts/show/components/acknowledgement.phtml    |  8 +++++++-
 .../Web/Controller/MonitoredObjectController.php     | 12 +++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index 9b323e2f5..02415ec19 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -22,7 +22,13 @@ if ($object->getType() === $object::TYPE_HOST) {
 if ($object->acknowledged): ?>
     <tr>
         <th><?= $this->translate('Acknowledged') ?></th>
-        <td><?= $removeAckForm ?></td>
+        <td>
+            <?php if (isset($removeAckForm)) { // Form is unset if the current user lacks the respective permission
+                echo $removeAckForm;
+            } else {
+                echo '&#45;';
+            } ?>
+        </td>
     </tr>
 <?php else: ?>
     <tr>
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index dd83f415b..c9ba70dca 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -67,11 +67,13 @@ abstract class MonitoredObjectController extends Controller
         }
         if ( ! in_array((int) $this->object->state, array(0, 99))) {
             if ((bool) $this->object->acknowledged) {
-                $removeAckForm = new RemoveAcknowledgementCommandForm();
-                $removeAckForm
-                    ->setObjects($this->object)
-                    ->handleRequest();
-                $this->view->removeAckForm = $removeAckForm;
+                if ($auth->hasPermission('monitoring/command/remove-acknowledgement')) {
+                    $removeAckForm = new RemoveAcknowledgementCommandForm();
+                    $removeAckForm
+                        ->setObjects($this->object)
+                        ->handleRequest();
+                    $this->view->removeAckForm = $removeAckForm;
+                }
             } else {
                 $ackForm = new AcknowledgeProblemCommandForm();
                 $ackForm

From 4226f06d5d03fb1274a1a8dc610f318cf52e1388 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 17:28:33 +0100
Subject: [PATCH 0344/2920] monitoring: Remove unused variable in the
 MonitoredObjectController

---
 .../Web/Controller/MonitoredObjectController.php       | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index c9ba70dca..cb87d22ad 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -1,11 +1,8 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Web\Controller;
 
 use Icinga\Module\Monitoring\Controller;
-use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\CheckNowCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
@@ -15,7 +12,6 @@ use Icinga\Module\Monitoring\Forms\Command\Object\ToggleObjectFeaturesCommandFor
 use Icinga\Web\Hook;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
-use Icinga\Web\Widget\Tabextension\OutputFormat;
 
 /**
  * Base class for the host and service controller
@@ -74,12 +70,6 @@ abstract class MonitoredObjectController extends Controller
                         ->handleRequest();
                     $this->view->removeAckForm = $removeAckForm;
                 }
-            } else {
-                $ackForm = new AcknowledgeProblemCommandForm();
-                $ackForm
-                    ->setObjects($this->object)
-                    ->handleRequest();
-                $this->view->ackForm = $ackForm;
             }
         }
         if (count($this->object->comments) > 0) {

From a19c155d9f647d9a3a5dd7676baaea1fb60fa998 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 17:33:20 +0100
Subject: [PATCH 0345/2920] monitoring/security: Hide delete comment action if
 user lacks the respective permission

---
 .../views/scripts/show/components/comments.phtml      | 11 ++++++-----
 .../Web/Controller/MonitoredObjectController.php      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index 07968dfc8..d20cec0c2 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -34,10 +34,6 @@ foreach ($object->comments as $comment) {
         $this->escape($comment->comment)
     ) : $this->escape($comment->comment);
 
-
-    $form = clone $delCommentForm;
-    $form->populate(array('comment_id' => $comment->id));
-
     ?>
 
     <tr>
@@ -46,7 +42,12 @@ foreach ($object->comments as $comment) {
             <table>
                 <tr>
                     <td style="vertical-align: top;" data-base-target="_self">
-                        <?= $form ?> (<?= ucfirst($comment->type) ?>):
+                        <?php if (isset($delCommentForm)) { // Form is unset if the current user lacks the respective permission
+                            $form = clone $delCommentForm;
+                            $form->populate(array('comment_id' => $comment->id));
+                            echo $form;
+                        } ?>
+                        (<?= ucfirst($comment->type) ?>):
                     </td>
                     <td style="padding-left: .5em;">
                         <?= str_replace(array('\r\n', '\n'), '<br>', $text) ?>
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index cb87d22ad..8cbea2d37 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -72,7 +72,7 @@ abstract class MonitoredObjectController extends Controller
                 }
             }
         }
-        if (count($this->object->comments) > 0) {
+        if (count($this->object->comments) > 0 && $auth->hasPermission('monitoring/command/comment/delete')) {
             $delCommentForm = new DeleteCommentCommandForm();
             $delCommentForm
                 ->setObjects($this->object)

From 5967d5fe0416f673f953e49668725d7cd79cde75 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 22 Jan 2015 17:35:34 +0100
Subject: [PATCH 0346/2920] monitoring/security: Hide delete downtime action if
 user lacks the respective permission

---
 .../views/scripts/show/components/downtime.phtml       | 10 ++++++----
 .../Web/Controller/MonitoredObjectController.php       |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 2cd7147f1..c96d1b287 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -33,9 +33,6 @@ foreach ($object->downtimes as $downtime) {
         $this->escape($downtime->comment)
     ) : $this->escape($downtime->comment);
 
-    $form = clone $delDowntimeForm;
-    $form->populate(array('downtime_id' => $downtime->id));
-
     if ((bool) $downtime->is_in_effect) {
         $state = 'in downtime since ' . $this->timeSince($downtime->start);
     } else {
@@ -54,7 +51,12 @@ foreach ($object->downtimes as $downtime) {
             <table>
                 <tr>
                     <td style="vertical-align: top;" data-base-target="_self">
-                        <?= $form ?> <?= $state ?>
+                        <?php if (isset($delDowntimeForm)) { // Form is unset if the current user lacks the respective permission
+                            $form = clone $delDowntimeForm;
+                            $form->populate(array('downtime_id' => $downtime->id));
+                            echo $form;
+                        } ?>
+                        <?= $state ?>
                     </td>
                     <td style="padding-left: .5em;">
                         <?= str_replace(array('\r\n', '\n'), '<br>', $text) ?>
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 8cbea2d37..5de11e1e2 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -79,7 +79,7 @@ abstract class MonitoredObjectController extends Controller
                 ->handleRequest();
             $this->view->delCommentForm = $delCommentForm;
         }
-        if (count($this->object->downtimes > 0)) {
+        if (count($this->object->downtimes > 0) && $auth->hasPermission('monitoring/command/downtime/delete')) {
             $delDowntimeForm = new DeleteDowntimeCommandForm();
             $delDowntimeForm
                 ->setObjects($this->object)

From ac5ac10feb2077735a1c19dcfd2bff85e7b37da5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 09:16:30 +0100
Subject: [PATCH 0347/2920] monitoring/security: Hide delete downtime action in
 the downtimes overview if user lacks the respective permission

---
 .../monitoring/application/controllers/ListController.php    | 5 ++++-
 .../application/views/scripts/list/downtimes.phtml           | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index f5afc9a24..3ed9c4e62 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -306,7 +306,10 @@ class Monitoring_ListController extends Controller
         ));
 
         $this->view->downtimes = $query->paginate();
-        $this->view->delDowntimeForm = new DeleteDowntimeCommandForm();
+
+        if ($this->Auth()->hasPermission('monitoring/command/downtime/delete')) {
+            $this->view->delDowntimeForm = new DeleteDowntimeCommandForm();
+        }
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 485782e3c..eaf4b7f8e 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -114,6 +114,7 @@ use Icinga\Module\Monitoring\Object\Service;
         <?php endif ?>
           </small>
         </td>
+        <?php if (isset($delDowntimeForm)): // Form is unset if the current user lacks the respective permission ?>
         <td style="width: 2em" data-base-target="self">
           <?php
           $delDowntimeForm = clone $delDowntimeForm;
@@ -126,6 +127,7 @@ use Icinga\Module\Monitoring\Object\Service;
           echo $delDowntimeForm;
           ?>
         </td>
+        <?php endif ?>
       </tr>
 <?php endforeach ?>
     </tbody>

From bd65f4d50af3d46008bfb63dd32a29f8e5def676 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 09:18:29 +0100
Subject: [PATCH 0348/2920] monitoring/security: Hide delete comment action in
 the comments overview if user lacks the respective permission

---
 .../monitoring/application/controllers/ListController.php    | 5 ++++-
 .../monitoring/application/views/scripts/list/comments.phtml | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 3ed9c4e62..cb334b421 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -484,7 +484,10 @@ class Monitoring_ListController extends Controller
                 'comment_expiration'    => $this->translate('Expiration')
             )
         );
-        $this->view->delCommentForm = new DeleteCommentCommandForm();
+
+        if ($this->Auth()->hasPermission('monitoring/command/comment/delete')) {
+            $this->view->delCommentForm = new DeleteCommentCommandForm();
+        }
     }
 
     public function servicegroupsAction()
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 98daceecd..857017b4d 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -75,6 +75,7 @@
               date('H:i', $comment->expiration)
             ) : $this->translate('This comment does not expire.'); ?>
         </td>
+        <?php if (isset($delCommentForm)): // Form is unset if the current user lacks the respective permission ?>
         <td style="width: 2em" data-base-target="self">
           <?php
           $delCommentForm = clone $delCommentForm;
@@ -87,6 +88,7 @@
           echo $delCommentForm;
           ?>
         </td>
+        <?php endif ?>
       </tr>
 <?php endforeach ?>
     </tbody>

From 6da3cb84038a658f9fccce17de38677b952407e5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 09:36:05 +0100
Subject: [PATCH 0349/2920] lib: Reorder auth related functions in the
 ActionController

---
 .../Web/Controller/ActionController.php       | 86 +++++++++++--------
 1 file changed, 49 insertions(+), 37 deletions(-)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 64438fc1d..78fcaf7bf 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -5,7 +5,7 @@
 namespace Icinga\Web\Controller;
 
 use Exception;
-use Icinga\Authentication\Manager as AuthManager;
+use Icinga\Authentication\Manager;
 use Icinga\Application\Benchmark;
 use Icinga\Application\Config;
 use Icinga\Exception\IcingaException;
@@ -47,6 +47,11 @@ class ActionController extends Zend_Controller_Action
 
     private $xhrLayout = 'inline';
 
+    /**
+     * Authentication manager
+     *
+     * @type \Icinga\Authentication\Manager|null
+     */
     private $auth;
 
     protected $params;
@@ -101,6 +106,49 @@ class ActionController extends Zend_Controller_Action
     {
     }
 
+
+    /**
+     * Get the authentication manager
+     *
+     * @return Manager
+     */
+    public function Auth()
+    {
+        if ($this->auth === null) {
+            $this->auth = Manager::getInstance();
+        }
+        return $this->auth;
+    }
+
+    /**
+     * Whether the current user has the given permission
+     *
+     * @param   string  $permission Name of the permission
+     *
+     * @return  bool
+     */
+    public function hasPermission($permission)
+    {
+        return $this->Auth()->hasPermission($permission);
+    }
+
+    /**
+     * Throw an exception if user lacks the given permission
+     *
+     * @param  string  $name Permission name
+     * @throws Exception
+     */
+    public function assertPermission($name)
+    {
+        if (! $this->Auth()->hasPermission($name)) {
+            // TODO: Shall this be an Auth Exception? Or a 404?
+            throw new IcingaException(
+                'Auth error, no permission for "%s"',
+                $name
+            );
+        }
+    }
+
     public function Config($file = null)
     {
         if ($file === null) {
@@ -110,14 +158,6 @@ class ActionController extends Zend_Controller_Action
         }
     }
 
-    public function Auth()
-    {
-        if ($this->auth === null) {
-            $this->auth = AuthManager::getInstance();
-        }
-        return $this->auth;
-    }
-
     public function Window()
     {
         if ($this->window === null) {
@@ -173,34 +213,6 @@ class ActionController extends Zend_Controller_Action
         return $this->Auth()->getRestrictions($name);
     }
 
-    /**
-     * Whether the user currently authenticated has the given permission
-     *
-     * @param  string  $name Permission name
-     * @return bool
-     */
-    public function hasPermission($name)
-    {
-        return $this->Auth()->hasPermission($name);
-    }
-
-    /**
-     * Throws an exception if user lacks the given permission
-     *
-     * @param  string  $name Permission name
-     * @throws Exception
-     */
-    public function assertPermission($name)
-    {
-        if (! $this->Auth()->hasPermission($name)) {
-            // TODO: Shall this be an Auth Exception? Or a 404?
-            throw new IcingaException(
-                'Auth error, no permission for "%s"',
-                $name
-            );
-        }
-    }
-
     /**
      * Check whether the controller requires a login. That is when the controller requires authentication and the
      * user is currently not authenticated

From cd8822ceff7be9acc8ba7b93137d8231ce491f37 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 09:36:45 +0100
Subject: [PATCH 0350/2920] lib: Add View::hasPermission()

---
 library/Icinga/Web/View.php | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/View.php b/library/Icinga/Web/View.php
index 7a954934a..2122662ac 100644
--- a/library/Icinga/Web/View.php
+++ b/library/Icinga/Web/View.php
@@ -4,10 +4,11 @@
 
 namespace Icinga\Web;
 
+use Closure;
+use Zend_View_Abstract;
+use Icinga\Authentication\Manager;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Util\Translator;
-use Zend_View_Abstract;
-use Closure;
 
 /**
  * Icinga view
@@ -36,6 +37,13 @@ class View extends Zend_View_Abstract
      */
     private $helperFunctions = array();
 
+    /**
+     * Authentication manager
+     *
+     * @type \Icinga\Authentication\Manager|null
+     */
+    private $auth;
+
     /**
      * Create a new view object
      *
@@ -154,6 +162,31 @@ class View extends Zend_View_Abstract
         }
     }
 
+    /**
+     * Get the authentication manager
+     *
+     * @return Manager
+     */
+    public function Auth()
+    {
+        if ($this->auth === null) {
+            $this->auth = Manager::getInstance();
+        }
+        return $this->auth;
+    }
+
+    /**
+     * Whether the current user has the given permission
+     *
+     * @param   string  $permission Name of the permission
+     *
+     * @return  bool
+     */
+    public function hasPermission($permission)
+    {
+        return $this->Auth()->hasPermission($permission);
+    }
+
     /**
      * Use to include the view script in a scope that only allows public
      * members.

From 67be1b329b88ffa27244314a3dcff6d3ed69a9c7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 09:41:06 +0100
Subject: [PATCH 0351/2920] monitoring/security: Hide 'Add comment' link if
 user lacks the respective permission

---
 .../views/scripts/show/components/comments.phtml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index d20cec0c2..e128f8320 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -3,7 +3,7 @@
     <td>
         <?php
 
-        /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+        /** @type \Icinga\Module\Monitoring\Object\MonitoredObject $object */
 
         if ($object->getType() === $object::TYPE_HOST) {
             $addCommentLink = $this->href(
@@ -18,9 +18,15 @@
         }
 
         ?>
+
+        <?php if ($this->hasPermission('monitoring/command/comment/add')): ?>
         <a href="<?= $addCommentLink ?>">
-            <?= $this->icon('comment') ?> <?= $this->translate('Add comment') ?>
+            <?= $this->icon('comment') ?>
+            <?= $this->translate('Add comment') ?>
         </a>
+        <?php else: ?>
+        <?= '&#45;' ?>
+        <?php endif ?>
     </td>
 </tr>
 
@@ -43,9 +49,9 @@ foreach ($object->comments as $comment) {
                 <tr>
                     <td style="vertical-align: top;" data-base-target="_self">
                         <?php if (isset($delCommentForm)) { // Form is unset if the current user lacks the respective permission
-                            $form = clone $delCommentForm;
-                            $form->populate(array('comment_id' => $comment->id));
-                            echo $form;
+                            $delCommentForm = clone $delCommentForm;
+                            $delCommentForm->populate(array('comment_id' => $comment->id));
+                            echo $delCommentForm;
                         } ?>
                         (<?= ucfirst($comment->type) ?>):
                     </td>

From f47dae109283387144020ddd0ec37cff641c5dfb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 09:43:16 +0100
Subject: [PATCH 0352/2920] monitoring/security: Hide 'Schedule downtime' link
 if user lacks the respective permission

---
 .../scripts/show/components/downtime.phtml    | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index c96d1b287..e9d2cc5b3 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -3,7 +3,7 @@
     <td>
         <?php
 
-        /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+        /** @type \Icinga\Module\Monitoring\Object\MonitoredObject $object */
 
         if ($object->getType() === $object::TYPE_HOST) {
             $scheduleDowntimeLink = $this->href(
@@ -16,10 +16,17 @@
                 array('host' => $object->getHost()->getName(), 'service' => $object->getName())
             );
         }
+
         ?>
+
+        <?php if ($this->hasPermission('monitoring/command/downtime/schedule')): ?>
         <a href="<?= $scheduleDowntimeLink ?>">
-            <?= $this->icon('plug') ?> <?= $this->translate('Schedule downtime') ?>
+            <?= $this->icon('plug') ?>
+            <?= $this->translate('Schedule downtime') ?>
         </a>
+        <?php else: ?>
+        <?= '&#45;' ?>
+        <?php endif ?>
     </td>
 </tr>
 
@@ -52,9 +59,9 @@ foreach ($object->downtimes as $downtime) {
                 <tr>
                     <td style="vertical-align: top;" data-base-target="_self">
                         <?php if (isset($delDowntimeForm)) { // Form is unset if the current user lacks the respective permission
-                            $form = clone $delDowntimeForm;
-                            $form->populate(array('downtime_id' => $downtime->id));
-                            echo $form;
+                            $delDowntimeForm = clone $delDowntimeForm;
+                            $delDowntimeForm->populate(array('downtime_id' => $downtime->id));
+                            echo $delDowntimeForm;
                         } ?>
                         <?= $state ?>
                     </td>
@@ -66,4 +73,4 @@ foreach ($object->downtimes as $downtime) {
         </td>
     </tr>
 
-<?php }  // endforeach ?>
+<?php } // endforeach ?>

From d07e1329e873edba3c490eda3f1bdbbce6e5328d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 09:45:43 +0100
Subject: [PATCH 0353/2920] monitoring: Use nl2br instead of str_replace for
 downtime comment and comment text

---
 .../views/scripts/show/components/comments.phtml            | 6 +++---
 .../views/scripts/show/components/downtime.phtml            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index e128f8320..104f8176b 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -34,7 +34,7 @@
 
 foreach ($object->comments as $comment) {
     // Ticket hook sample
-    $text = $this->tickets ? preg_replace_callback(
+    $commentText = $this->tickets ? preg_replace_callback(
         $this->tickets->getPattern(),
         array($this->tickets, 'createLink'),
         $this->escape($comment->comment)
@@ -56,11 +56,11 @@ foreach ($object->comments as $comment) {
                         (<?= ucfirst($comment->type) ?>):
                     </td>
                     <td style="padding-left: .5em;">
-                        <?= str_replace(array('\r\n', '\n'), '<br>', $text) ?>
+                        <?= nl2br($commentText) ?>
                     </td>
                 </tr>
             </table>
         </td>
     </tr>
 
-<?php }  // endforeach ?>
+<?php } // endforeach ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index e9d2cc5b3..37eeef14b 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -34,7 +34,7 @@
 
 foreach ($object->downtimes as $downtime) {
     // Ticket hook sample
-    $text = $this->tickets ? preg_replace_callback(
+    $commentText = $this->tickets ? preg_replace_callback(
         $this->tickets->getPattern(),
         array($this->tickets, 'createLink'),
         $this->escape($downtime->comment)
@@ -66,7 +66,7 @@ foreach ($object->downtimes as $downtime) {
                         <?= $state ?>
                     </td>
                     <td style="padding-left: .5em;">
-                        <?= str_replace(array('\r\n', '\n'), '<br>', $text) ?>
+                        <?= nl2br($commentText) ?>
                     </td>
                 </tr>
             </table>

From af2698b075c1d4330bd364a5259362e0b6795123 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 10:15:55 +0100
Subject: [PATCH 0354/2920] monitoring: Do not generate 'Schedule downtime' and
 'Add comment' links if user lacks the respective permissions

---
 .../scripts/show/components/comments.phtml    | 37 ++++++++-----------
 .../scripts/show/components/downtime.phtml    | 37 ++++++++-----------
 2 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index 104f8176b..b967cc67e 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -1,32 +1,27 @@
 <tr>
     <th><?= $this->translate('Comments') ?></th>
     <td>
-        <?php
-
-        /** @type \Icinga\Module\Monitoring\Object\MonitoredObject $object */
-
-        if ($object->getType() === $object::TYPE_HOST) {
-            $addCommentLink = $this->href(
-                'monitoring/host/add-comment',
-                array('host' => $object->getName())
-            );
-        } else {
-            $addCommentLink = $this->href(
-                'monitoring/service/add-comment',
-                array('host' => $object->getHost()->getName(), 'service' => $object->getName())
-            );
-        }
-
+        <?php if ($this->hasPermission('monitoring/command/comment/add')) {
+            /** @type \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+            if ($object->getType() === $object::TYPE_HOST) {
+                $addCommentLink = $this->href(
+                    'monitoring/host/add-comment',
+                    array('host' => $object->getName())
+                );
+            } else {
+                $addCommentLink = $this->href(
+                    'monitoring/service/add-comment',
+                    array('host' => $object->getHost()->getName(), 'service' => $object->getName())
+                );
+            }
         ?>
-
-        <?php if ($this->hasPermission('monitoring/command/comment/add')): ?>
         <a href="<?= $addCommentLink ?>">
             <?= $this->icon('comment') ?>
             <?= $this->translate('Add comment') ?>
         </a>
-        <?php else: ?>
-        <?= '&#45;' ?>
-        <?php endif ?>
+        <?php } else {
+            echo '&#45;';
+        } ?>
     </td>
 </tr>
 
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 37eeef14b..f95ea582c 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -1,32 +1,27 @@
 <tr>
     <th><?= $this->translate('Downtimes') ?></th>
     <td>
-        <?php
-
-        /** @type \Icinga\Module\Monitoring\Object\MonitoredObject $object */
-
-        if ($object->getType() === $object::TYPE_HOST) {
-            $scheduleDowntimeLink = $this->href(
-                'monitoring/host/schedule-downtime',
-                array('host' => $object->getName())
-            );
-        } else {
-            $scheduleDowntimeLink = $this->href(
-                'monitoring/service/schedule-downtime',
-                array('host' => $object->getHost()->getName(), 'service' => $object->getName())
-            );
-        }
-
+        <?php if ($this->hasPermission('monitoring/command/downtime/schedule')) {
+            /** @type \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+            if ($object->getType() === $object::TYPE_HOST) {
+                $scheduleDowntimeLink = $this->href(
+                    'monitoring/host/schedule-downtime',
+                    array('host' => $object->getName())
+                );
+            } else {
+                $scheduleDowntimeLink = $this->href(
+                    'monitoring/service/schedule-downtime',
+                    array('host' => $object->getHost()->getName(), 'service' => $object->getName())
+                );
+            }
         ?>
-
-        <?php if ($this->hasPermission('monitoring/command/downtime/schedule')): ?>
         <a href="<?= $scheduleDowntimeLink ?>">
             <?= $this->icon('plug') ?>
             <?= $this->translate('Schedule downtime') ?>
         </a>
-        <?php else: ?>
-        <?= '&#45;' ?>
-        <?php endif ?>
+        <?php } else {
+            echo '&#45;';
+        } ?>
     </td>
 </tr>
 

From a166234e6d3242021c34a56b6f7ac67dcad6d2ba Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 10:40:48 +0100
Subject: [PATCH 0355/2920] monitoring/security: Hide 'Reschedule check' link
 if user lacks the respective permission

---
 .../show/components/checkstatistics.phtml     | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index e8c295298..5b54ae4ab 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -1,19 +1,13 @@
 <?php
 
-/** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+/** @type \Icinga\Module\Monitoring\Object\MonitoredObject $object */
 
 if ($object->getType() === $object::TYPE_HOST) {
-    $reschedule = $this->href(
-        'monitoring/host/reschedule-check',
-        array('host' => $object->getName())
-    );
+    $isService = false;
     $checkAttempts = $object->host_current_check_attempt . '/' . $object->host_max_check_attempts;
     $stateType = (int) $object->host_state_type;
 } else {
-    $reschedule = $this->href(
-        'monitoring/service/reschedule-check',
-        array('host' => $object->getHost()->getName(), 'service' => $object->getName())
-    );
+    $isService = true;
     $checkAttempts = $object->service_attempt;
     $stateType = (int) $object->service_state_type;
 }
@@ -32,29 +26,44 @@ if ($object->getType() === $object::TYPE_HOST) {
 <tr>
   <th><?= $this->translate('Next check') ?></th>
   <td>
+      <?php if ($this->hasPermission('monitoring/command/schedule-check')) {
+          if ($isService) {
+              $reschedule = $this->href(
+                  'monitoring/service/reschedule-check',
+                  array('host' => $object->getHost()->getName(), 'service' => $object->getName())
+              );
+          } else {
+              $reschedule = $this->href(
+                  'monitoring/host/reschedule-check',
+                  array('host' => $object->getName())
+              );
+          }
+      ?>
       <a href="<?= $reschedule ?>">
-          <?= $this->icon('reschedule') ?> <?= $this->translate('Reschedule') ?>
+          <?= $this->icon('reschedule') ?>
+          <?= $this->translate('Reschedule') ?>
       </a>
+      <?php } // endif ?>
       <?= $this->timeUntil($object->next_check) ?>
   </td>
 </tr>
 <tr>
     <th><?= $this->translate('Check attempts') ?></th>
     <?php if ($stateType === 0): ?>
-    <td><?= $checkAttempts ?> <?= $this->translate('(soft state)') ?></td>
+        <td><?= $checkAttempts ?> <?= $this->translate('(soft state)') ?></td>
     <?php else: ?>
-    <td><?= $checkAttempts ?> <?= $this->translate('(hard state)') ?></td>
+        <td><?= $checkAttempts ?> <?= $this->translate('(hard state)') ?></td>
     <?php endif; ?>
 </tr>
 <?php if ($object->check_execution_time): ?>
-<tr>
-  <th><?= $this->translate('Check execution time') ?></th>
-  <td><?= $object->check_execution_time ?>s</td>
-</tr>
+    <tr>
+        <th><?= $this->translate('Check execution time') ?></th>
+        <td><?= $object->check_execution_time ?>s</td>
+    </tr>
 <?php endif ?>
 <?php if ($object->check_latency): ?>
-<tr>
- <th><?= $this->translate('Check latency') ?></th>
- <td><?= $object->check_latency ?>s</td>
-</tr>
+    <tr>
+        <th><?= $this->translate('Check latency') ?></th>
+        <td><?= $object->check_latency ?>s</td>
+    </tr>
 <?php endif ?>

From 27c15002956a0fbd3ae7c124a1426da64da87df4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 10:41:42 +0100
Subject: [PATCH 0356/2920] monitoring: Do not translate brackets

---
 .../views/scripts/show/components/checkstatistics.phtml       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index 5b54ae4ab..9a6f24efc 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -50,9 +50,9 @@ if ($object->getType() === $object::TYPE_HOST) {
 <tr>
     <th><?= $this->translate('Check attempts') ?></th>
     <?php if ($stateType === 0): ?>
-        <td><?= $checkAttempts ?> <?= $this->translate('(soft state)') ?></td>
+        <td><?= $checkAttempts ?> (<?= $this->translate('soft state') ?>)</td>
     <?php else: ?>
-        <td><?= $checkAttempts ?> <?= $this->translate('(hard state)') ?></td>
+        <td><?= $checkAttempts ?> (<?= $this->translate('hard state') ?>)</td>
     <?php endif; ?>
 </tr>
 <?php if ($object->check_execution_time): ?>

From 2535d802b1d73e92d04ec17880abe7fac40fc668 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 10:45:10 +0100
Subject: [PATCH 0357/2920] monitoring: Add missing td closing tag

---
 .../application/views/scripts/show/components/command.phtml      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/views/scripts/show/components/command.phtml b/modules/monitoring/application/views/scripts/show/components/command.phtml
index a13ed1bee..dd8996d58 100644
--- a/modules/monitoring/application/views/scripts/show/components/command.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/command.phtml
@@ -20,6 +20,7 @@ $command = array_shift($parts);
     ); ?>"><?= $this->icon('reply'); ?> <?= $this->translate('Process check result'); ?></a>
    <?php endif ?>
   <?php endif ?>
+  </td>
 </tr>
 <?php
 

From 08e8d5d74236c892622eb82447d0c58ebffc411d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 10:48:21 +0100
Subject: [PATCH 0358/2920] monitoring/security: Hide 'Process check result'
 link if user lacks the respective permission

---
 .../scripts/show/components/command.phtml     | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/command.phtml b/modules/monitoring/application/views/scripts/show/components/command.phtml
index dd8996d58..5239dad41 100644
--- a/modules/monitoring/application/views/scripts/show/components/command.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/command.phtml
@@ -3,25 +3,32 @@
 $parts = explode('!', $object->check_command);
 $command = array_shift($parts);
 
-?><tr class="newsection">
-  <th><?= $this->translate('Command') ?></th>
-  <td>
-    <?= $this->escape($command) ?>
-  <?php if ($object->passive_checks_enabled): ?>
-   <?php if ($object->getType() === $object::TYPE_HOST): ?>
-    <a href="<?= $this->href(
-      'monitoring/host/process-check-result',
-      array('host' => $object->getName())
-    ); ?>"><?= $this->icon('reply'); ?> <?= $this->translate('Process check result'); ?></a>
-   <?php else: ?>
-    <a href="<?= $this->href(
-      'monitoring/service/process-check-result',
-      array('host' => $object->getHost()->getName(), 'service' => $object->getName())
-    ); ?>"><?= $this->icon('reply'); ?> <?= $this->translate('Process check result'); ?></a>
-   <?php endif ?>
-  <?php endif ?>
-  </td>
+?>
+
+<tr class="newsection">
+    <th><?= $this->translate('Command') ?></th>
+    <td>
+        <?= $this->escape($command) ?>
+        <?php if ($this->hasPermission('monitoring/command/schedule-check') && $object->passive_checks_enabled): ?>
+            <?php if ($object->getType() === $object::TYPE_HOST) {
+                $processCheckResult = $this->href(
+                    'monitoring/host/process-check-result',
+                    array('host' => $object->getName())
+                );
+            } else {
+                $processCheckResult = $this->href(
+                    'monitoring/service/process-check-result',
+                    array('host' => $object->getHost()->getName(), 'service' => $object->getName())
+                );
+            } ?>
+            <a href="<?= $processCheckResult ?>">
+                <?= $this->icon('reply') ?>
+                <?= $this->translate('Process check result') ?>
+            </a>
+        <?php endif ?>
+    </td>
 </tr>
+
 <?php
 
 $row = "<tr>\n  <th>%s</th>\n  <td>%s</td>\n</tr>\n";

From 3cb2dd0e8b09880dbe6e2053910ac16318ac0756 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 11:01:47 +0100
Subject: [PATCH 0359/2920] monitoring/security: Hide 'Acknowledge' link if
 user lacks the respective permission

---
 .../show/components/acknowledgement.phtml     | 29 ++++++++++---------
 .../scripts/show/components/comments.phtml    |  2 +-
 .../scripts/show/components/downtime.phtml    |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index 02415ec19..339652113 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -7,18 +7,6 @@ if (in_array((int) $object->state, array(0, 99))) {
     return;
 }
 
-if ($object->getType() === $object::TYPE_HOST) {
-    $ackLink = $this->href(
-        'monitoring/host/acknowledge-problem',
-        array('host' => $object->getName())
-    );
-} else {
-    $ackLink = $this->href(
-        'monitoring/service/acknowledge-problem',
-        array('host' => $object->getHost()->getName(), 'service' => $object->getName())
-    );
-}
-
 if ($object->acknowledged): ?>
     <tr>
         <th><?= $this->translate('Acknowledged') ?></th>
@@ -34,12 +22,25 @@ if ($object->acknowledged): ?>
     <tr>
         <th><?= $this->translate('Not acknowledged') ?></th>
         <td>
-            <?php
-
+            <?php if ($this->hasPermission('monitoring/command/acknowledge-problem')) {
+                if ($object->getType() === $object::TYPE_HOST) {
+                    $ackLink = $this->href(
+                        'monitoring/host/acknowledge-problem',
+                        array('host' => $object->getName())
+                    );
+                } else {
+                    $ackLink = $this->href(
+                        'monitoring/service/acknowledge-problem',
+                        array('host' => $object->getHost()->getName(), 'service' => $object->getName())
+                    );
+                }
             ?>
             <a href="<?= $ackLink ?>">
                 <?= $this->icon('ok') ?> <?= $this->translate('Acknowledge') ?>
             </a>
+            <?php } else {
+                echo '&#45;';
+            } // endif ?>
         </td>
     </tr>
 <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index b967cc67e..dde42c747 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -21,7 +21,7 @@
         </a>
         <?php } else {
             echo '&#45;';
-        } ?>
+        } // endif ?>
     </td>
 </tr>
 
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index f95ea582c..8f42a865e 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -21,7 +21,7 @@
         </a>
         <?php } else {
             echo '&#45;';
-        } ?>
+        } // endif ?>
     </td>
 </tr>
 

From 5ac1eaa513ba2eff9860951f31dec0245c5c961c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 11:11:34 +0100
Subject: [PATCH 0360/2920] monitoring: Fix indents in the GroupsummaryQuery

---
 .../Backend/Ido/Query/GroupsummaryQuery.php   | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
index 20e98fc63..de94f3055 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@@ -11,7 +11,7 @@ class GroupSummaryQuery extends IdoQuery
     protected $useSubqueryCount = true;
 
     protected $columnMap = array(
-        'hoststatussummary'     => array(
+        'hoststatussummary' => array(
             'hosts_up'                      => 'SUM(CASE WHEN object_type = \'host\' AND state = 0 THEN 1 ELSE 0 END)',
             'hosts_unreachable'             => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 THEN 1 ELSE 0 END)',
             'hosts_unreachable_handled'     => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 AND acknowledged + in_downtime != 0 THEN 1 ELSE 0 END)',
@@ -22,19 +22,19 @@ class GroupSummaryQuery extends IdoQuery
             'hosts_pending'                 => 'SUM(CASE WHEN object_type = \'host\' AND state = 99 THEN 1 ELSE 0 END)',
             'hostgroup'                     => 'hostgroup'
         ),
-        'servicestatussummary'  => array(
-            'services_total'                => 'SUM(CASE WHEN object_type = \'service\' THEN 1 ELSE 0 END)',
-            'services_ok'                   => 'SUM(CASE WHEN object_type = \'service\' AND state = 0 THEN 1 ELSE 0 END)',
-            'services_pending'              => 'SUM(CASE WHEN object_type = \'service\' AND state = 99 THEN 1 ELSE 0 END)',
-            'services_warning'              => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 THEN 1 ELSE 0 END)',
-            'services_warning_handled'      => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_state > 0 THEN 1 ELSE 0 END)',
-            'services_critical'             => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 THEN 1 ELSE 0 END)',
-            'services_critical_handled'     => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state > 0 THEN 1 ELSE 0 END)',
-            'services_unknown'              => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 THEN 1 ELSE 0 END)',
-            'services_unknown_handled'      => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND acknowledged + in_downtime + host_state > 0 THEN 1 ELSE 0 END)',
-            'services_warning_unhandled'    => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_state = 0 THEN 1 ELSE 0 END)',
-            'services_critical_unhandled'   => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state = 0 THEN 1 ELSE 0 END)',
-            'services_unknown_unhandled'    => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND acknowledged + in_downtime + host_state = 0 THEN 1 ELSE 0 END)',
+        'servicestatussummary' => array(
+            'services_total'                                => 'SUM(CASE WHEN object_type = \'service\' THEN 1 ELSE 0 END)',
+            'services_ok'                                   => 'SUM(CASE WHEN object_type = \'service\' AND state = 0 THEN 1 ELSE 0 END)',
+            'services_pending'                              => 'SUM(CASE WHEN object_type = \'service\' AND state = 99 THEN 1 ELSE 0 END)',
+            'services_warning'                              => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 THEN 1 ELSE 0 END)',
+            'services_warning_handled'                      => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_state > 0 THEN 1 ELSE 0 END)',
+            'services_critical'                             => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 THEN 1 ELSE 0 END)',
+            'services_critical_handled'                     => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state > 0 THEN 1 ELSE 0 END)',
+            'services_unknown'                              => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 THEN 1 ELSE 0 END)',
+            'services_unknown_handled'                      => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND acknowledged + in_downtime + host_state > 0 THEN 1 ELSE 0 END)',
+            'services_warning_unhandled'                    => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_state = 0 THEN 1 ELSE 0 END)',
+            'services_critical_unhandled'                   => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state = 0 THEN 1 ELSE 0 END)',
+            'services_unknown_unhandled'                    => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND acknowledged + in_downtime + host_state = 0 THEN 1 ELSE 0 END)',
             'services_severity'                             => 'MAX(CASE WHEN object_type = \'service\' THEN severity ELSE 0 END)',
             'services_ok_last_state_change'                 => 'MAX(CASE WHEN object_type = \'service\' AND state = 0 THEN state_change ELSE 0 END)',
             'services_pending_last_state_change'            => 'MAX(CASE WHEN object_type = \'service\' AND state = 99 THEN state_change ELSE 0 END)',
@@ -44,7 +44,7 @@ class GroupSummaryQuery extends IdoQuery
             'services_warning_last_state_change_unhandled'  => 'MAX(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
             'services_critical_last_state_change_unhandled' => 'MAX(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
             'services_unknown_last_state_change_unhandled'  => 'MAX(CASE WHEN object_type = \'service\' AND state = 3 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
-            'servicegroup'                  => 'servicegroup'
+            'servicegroup'                                  => 'servicegroup'
         )
     );
 

From b54564eb5c4843e1ad2aa2ff5b77f5a5c2dcbbad Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 11:20:00 +0100
Subject: [PATCH 0361/2920] monitoring: Escape the host group's name in the
 hostgroups overview

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

diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index 0e21dc3ee..9fae0ac31 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -80,7 +80,7 @@
        <?php endif ?>
         <td class="groupname">
           <a href="<?= $this->href('monitoring/list/hosts', array('hostgroup' => $h->hostgroup)); ?>">
-            <?= $h->hostgroup; ?>
+            <?= $this->escape($h->hostgroup) ?>
           </a>
         </td>
         <td class="total">

From e15c085f19bb1fe1e5345adca51b31935c11fd56 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 11:20:35 +0100
Subject: [PATCH 0362/2920] monitoring: Support selecting host group and
 service group alias in the StatusQuery

refs #8266
---
 .../library/Monitoring/Backend/Ido/Query/StatusQuery.php    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index 8dc6fa11e..0cc807ac8 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -160,10 +160,12 @@ class StatusQuery extends IdoQuery
             END'
         ),
         'hostgroups' => array(
-            'hostgroup' => 'hgo.name1',
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias'
         ),
         'servicegroups' => array(
-            'servicegroup' => 'sgo.name1',
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_alias'    => 'sg.alias'
         ),
         'services' => array(
             'service_host_name'      => 'so.name1 COLLATE latin1_general_ci',

From 74a0c1e2747add0c99af45f6d3baf176fa0bc3a2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 11:21:10 +0100
Subject: [PATCH 0363/2920] monitoring: Support selecting host group and
 service group alias in the HoststatusQuery

refs #8266
---
 .../Monitoring/Backend/Ido/Query/HoststatusQuery.php        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index e9903ec86..7cca01d31 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -84,10 +84,12 @@ class HoststatusQuery extends IdoQuery
             END'
         ),
         'hostgroups' => array(
-            'hostgroup'     => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias'
         ),
         'servicegroups' => array(
-            'servicegroup'  => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_alias'    => 'sg.alias'
         ),
         'contactgroups' => array(
             'contactgroup'  => 'contactgroup',

From 30eed015ba3022ba9817a8866b9b4c67a2fda692 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 11:21:29 +0100
Subject: [PATCH 0364/2920] monitoring: Support selecting host group and
 service group alias in the GroupsummaryQuery

refs #8266
---
 .../Backend/Ido/Query/GroupsummaryQuery.php        | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
index de94f3055..62447c7d6 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@@ -20,7 +20,8 @@ class GroupSummaryQuery extends IdoQuery
             'hosts_down_handled'            => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime != 0 THEN 1 ELSE 0 END)',
             'hosts_down_unhandled'          => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
             'hosts_pending'                 => 'SUM(CASE WHEN object_type = \'host\' AND state = 99 THEN 1 ELSE 0 END)',
-            'hostgroup'                     => 'hostgroup'
+            'hostgroup'                     => 'hostgroup',
+            'hostgroup_alias'               => 'hostgroup_alias'
         ),
         'servicestatussummary' => array(
             'services_total'                                => 'SUM(CASE WHEN object_type = \'service\' THEN 1 ELSE 0 END)',
@@ -44,7 +45,8 @@ class GroupSummaryQuery extends IdoQuery
             'services_warning_last_state_change_unhandled'  => 'MAX(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
             'services_critical_last_state_change_unhandled' => 'MAX(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
             'services_unknown_last_state_change_unhandled'  => 'MAX(CASE WHEN object_type = \'service\' AND state = 3 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
-            'servicegroup'                                  => 'servicegroup'
+            'servicegroup'                                  => 'servicegroup',
+            'servicegroup_alias'                            => 'servicegroup_alias'
         )
     );
 
@@ -52,7 +54,7 @@ class GroupSummaryQuery extends IdoQuery
     {
         $columns = array(
             'object_type',
-            'host_state',
+            'host_state'
         );
 
         // Prepend group column since we'll use columns index 0 later for grouping
@@ -61,6 +63,12 @@ class GroupSummaryQuery extends IdoQuery
         } else {
             array_unshift($columns, 'hostgroup');
         }
+        if (in_array('hostgroup_alias', $this->desiredColumns)) {
+            $columns[] = 'hostgroup_alias';
+        }
+        if (in_array('servicegroup_alias', $this->desiredColumns)) {
+            $columns[] = 'servicegroup_alias';
+        }
         $hosts = $this->createSubQuery(
             'Hoststatus',
             $columns + array(

From 42071118afa5661b175c8adb1ce882be7d2cad81 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 11:22:00 +0100
Subject: [PATCH 0365/2920] monitoring: Select hostgroup_alias in the
 hostgroups overview

refs #8266
---
 modules/monitoring/application/controllers/ListController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index cb334b421..102f56a33 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -546,6 +546,7 @@ class Monitoring_ListController extends Controller
         $this->setAutorefreshInterval(12);
         $query = $this->backend->select()->from('groupsummary', array(
             'hostgroup',
+            'hostgroup_alias',
             'hosts_up',
             'hosts_unreachable_handled',
             'hosts_unreachable_unhandled',

From 257186fb929341c9816d9ba4450297f2f578fcfd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 11:22:35 +0100
Subject: [PATCH 0366/2920] monitoring: Use hostgroup alias for displaying the
 host group's name in the hostgroups overview

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

diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index 9fae0ac31..cd3e68d7f 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -80,7 +80,7 @@
        <?php endif ?>
         <td class="groupname">
           <a href="<?= $this->href('monitoring/list/hosts', array('hostgroup' => $h->hostgroup)); ?>">
-            <?= $this->escape($h->hostgroup) ?>
+            <?= $this->escape($h->hostgroup_alias) ?>
           </a>
         </td>
         <td class="total">

From 9fe720e7154bae1ddcdd4dc895d6bdb5a3122e52 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 11:23:42 +0100
Subject: [PATCH 0367/2920] monitoring: Escape the service group name in the
 servicegroups overview

---
 .../application/views/scripts/list/servicegroups.phtml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index ceb3929c0..91787b7b2 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -80,7 +80,7 @@
        <?php endif ?>
         <td class="groupname">
           <a href="<?= $this->href('monitoring/list/services', array('servicegroup' => $s->servicegroup)); ?>">
-            <?= $s->servicegroup; ?>
+            <?= $this->translate($s->servicegroup) ?>
           </a>
         </td>
         <td class="total">

From 7e05de1255953c71b109f99f61ab95507421a21b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 11:23:59 +0100
Subject: [PATCH 0368/2920] monitoring: Select the service group alias in the
 servicegroups ovweview

refs #8266
---
 modules/monitoring/application/controllers/ListController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 102f56a33..9a0cd42a7 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -499,6 +499,7 @@ class Monitoring_ListController extends Controller
         $this->setAutorefreshInterval(12);
         $query = $this->backend->select()->from('groupsummary', array(
             'servicegroup',
+            'servicegroup_alias',
             'hosts_up',
             'hosts_unreachable_handled',
             'hosts_unreachable_unhandled',

From 86ac09d7b198940925535c09e5dd953aafc40599 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 11:24:39 +0100
Subject: [PATCH 0369/2920] monitoring: Use the service group alias for
 displaying service group names in the servicegroups overview

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

diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index 91787b7b2..0e180bfa7 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -80,7 +80,7 @@
        <?php endif ?>
         <td class="groupname">
           <a href="<?= $this->href('monitoring/list/services', array('servicegroup' => $s->servicegroup)); ?>">
-            <?= $this->translate($s->servicegroup) ?>
+            <?= $this->translate($s->servicegroup_alias) ?>
           </a>
         </td>
         <td class="total">

From c78d4aa0bd75bfefe411e1de7681325795d0c290 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 13:29:47 +0100
Subject: [PATCH 0370/2920] monitoring/security: Provide permissions for the
 feature commands

---
 modules/monitoring/configuration.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index ed94f1545..6b1fe1cda 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -1,6 +1,4 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
 
 /** @type $this \Icinga\Application\Modules\Module */
 
@@ -48,6 +46,14 @@ $this->providePermission(
     'monitoring/command/process-check-result',
     $this->translate('Allow processing host and service check results')
 );
+$this->providePermission(
+    'monitoring/command/feature/program',
+    $this->translate('Allow processing commands for toggling features on a program-wide basis')
+);
+$this->providePermission(
+    'monitoring/command/feature/object',
+    $this->translate('Allow processing commands for toggling features on host and service objects')
+);
 
 $this->provideRestriction(
     'monitoring/filter',

From 6284da451e2a3f1fecf8935f04701d889445203c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 23 Jan 2015 14:41:14 +0100
Subject: [PATCH 0371/2920] Fix that when chosing to not to store preferences
 an invalid config is created

fixes #8234
---
 application/forms/Config/General/ApplicationConfigForm.php | 4 ++--
 library/Icinga/Authentication/Manager.php                  | 5 ++---
 modules/setup/application/forms/PreferencesPage.php        | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php
index 8f718ccdf..6d00a5b47 100644
--- a/application/forms/Config/General/ApplicationConfigForm.php
+++ b/application/forms/Config/General/ApplicationConfigForm.php
@@ -48,13 +48,13 @@ class ApplicationConfigForm extends Form
             'select',
             'preferences_type',
             array(
-                'required'      => true,
+                'allowEmpty'    => true,
                 'autosubmit'    => true,
                 'label'         => $this->translate('User Preference Storage Type'),
                 'multiOptions'  => array(
                     'ini'   => $this->translate('File System (INI Files)'),
                     'db'    => $this->translate('Database'),
-                    'null'  => $this->translate('Don\'t Store Preferences')
+                    ''      => $this->translate('Don\'t Store Preferences')
                 )
             )
         );
diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 12269d98e..887c9674d 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -63,11 +63,10 @@ class Manager
             );
             $config = new Config();
         }
-        if ($config->hasSection('preferences')) {
-            $preferencesConfig = $config->getSection('preferences');
+        if ($config->get('preferences', 'type')) {
             try {
                 $preferencesStore = PreferencesStore::create(
-                    $preferencesConfig,
+                    $config->getSection('preferences'),
                     $user
                 );
                 $preferences = new Preferences($preferencesStore->load());
diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
index 07e011ee1..1309f59f9 100644
--- a/modules/setup/application/forms/PreferencesPage.php
+++ b/modules/setup/application/forms/PreferencesPage.php
@@ -66,13 +66,13 @@ class PreferencesPage extends Form
         if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {
             $storageTypes['db'] = $this->translate('Database');
         }
-        $storageTypes['null'] = $this->translate('Don\'t Store Preferences');
+        $storageTypes[''] = $this->translate('Don\'t Store Preferences');
 
         $this->addElement(
             'select',
             'type',
             array(
-                'required'      => true,
+                'allowEmpty'    => true,
                 'label'         => $this->translate('User Preference Storage Type'),
                 'multiOptions'  => $storageTypes
             )

From 14a4aaeb776d470ad670151aa609238aa1fb1a5b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 23 Jan 2015 15:23:43 +0100
Subject: [PATCH 0372/2920] Revert "Fix that when chosing to not to store
 preferences an invalid config is created"

This reverts commit 6284da451e2a3f1fecf8935f04701d889445203c.
---
 application/forms/Config/General/ApplicationConfigForm.php | 4 ++--
 library/Icinga/Authentication/Manager.php                  | 5 +++--
 modules/setup/application/forms/PreferencesPage.php        | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php
index 6d00a5b47..8f718ccdf 100644
--- a/application/forms/Config/General/ApplicationConfigForm.php
+++ b/application/forms/Config/General/ApplicationConfigForm.php
@@ -48,13 +48,13 @@ class ApplicationConfigForm extends Form
             'select',
             'preferences_type',
             array(
-                'allowEmpty'    => true,
+                'required'      => true,
                 'autosubmit'    => true,
                 'label'         => $this->translate('User Preference Storage Type'),
                 'multiOptions'  => array(
                     'ini'   => $this->translate('File System (INI Files)'),
                     'db'    => $this->translate('Database'),
-                    ''      => $this->translate('Don\'t Store Preferences')
+                    'null'  => $this->translate('Don\'t Store Preferences')
                 )
             )
         );
diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 887c9674d..12269d98e 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -63,10 +63,11 @@ class Manager
             );
             $config = new Config();
         }
-        if ($config->get('preferences', 'type')) {
+        if ($config->hasSection('preferences')) {
+            $preferencesConfig = $config->getSection('preferences');
             try {
                 $preferencesStore = PreferencesStore::create(
-                    $config->getSection('preferences'),
+                    $preferencesConfig,
                     $user
                 );
                 $preferences = new Preferences($preferencesStore->load());
diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
index 1309f59f9..07e011ee1 100644
--- a/modules/setup/application/forms/PreferencesPage.php
+++ b/modules/setup/application/forms/PreferencesPage.php
@@ -66,13 +66,13 @@ class PreferencesPage extends Form
         if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {
             $storageTypes['db'] = $this->translate('Database');
         }
-        $storageTypes[''] = $this->translate('Don\'t Store Preferences');
+        $storageTypes['null'] = $this->translate('Don\'t Store Preferences');
 
         $this->addElement(
             'select',
             'type',
             array(
-                'allowEmpty'    => true,
+                'required'      => true,
                 'label'         => $this->translate('User Preference Storage Type'),
                 'multiOptions'  => $storageTypes
             )

From 7500dd9c683600a354c5e85975547b12b73585c7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 15:16:34 +0100
Subject: [PATCH 0373/2920] Revert "GroupSummary/Postgres: Fix group by in
 initial join query"

This reverts commit f47bc466547e5bfe5d7b666e4af68292da4f16fc.

Conflicts:
	modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php

No need to reintroduce group columns.
---
 .../Monitoring/Backend/Ido/Query/GroupsummaryQuery.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
index 62447c7d6..14320567f 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@@ -100,16 +100,8 @@ class GroupSummaryQuery extends IdoQuery
                 'severity'     => 'service_severity'
             )
         );
-
-        $groupColumn = 'hostgroup';
-
-        if (in_array('servicegroup', $this->desiredColumns)) {
-            $groupColumn = 'servicegroup';
-        }
-
         $union = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL);
-        $this->select->from(array('statussummary' => $union), array())->group(array($groupColumn));
-
+        $this->select->from(array('statussummary' => $union), array())->group(array($columns[0]));
         $this->joinedVirtualTables = array(
             'servicestatussummary'  => true,
             'hoststatussummary'     => true

From 7bd42b476fd8d837ad6a5a0ee4255358a53e0dea Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 15:27:43 +0100
Subject: [PATCH 0374/2920] bootstrap: Load setup module in case the setup
 token exists

The web setup may write the config.ini even if it errors. Thus our bootstrap
has to load the setup module whenever the setup.token exists.
Another approach would to write the config.ini in our web setup at the very end.
---
 library/Icinga/Application/ApplicationBootstrap.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 92e97ba39..909431663 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -401,7 +401,7 @@ abstract class ApplicationBootstrap
     }
 
     /**
-     * Load the setup module if Icinga Web 2 requires setup
+     * Load the setup module if Icinga Web 2 requires setup or the setup token exists
      *
      * @return $this
      */
@@ -410,6 +410,9 @@ abstract class ApplicationBootstrap
         if (! @file_exists($this->config->resolvePath('config.ini'))) {
             $this->requiresSetup = true;
             $this->moduleManager->loadModule('setup');
+        } elseif ($this->setupTokenExists()) {
+            // Load setup module but do not require setup
+            $this->moduleManager->loadModule('setup');
         }
         return $this;
     }

From a07bff490f38dca91288c53a712787d561fe4e46 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 23 Jan 2015 15:31:45 +0100
Subject: [PATCH 0375/2920] Fix that the monitoring module's config directory
 is not being created

Forgot to re-add this when reverting a temporary change while adjusting
the module installation as part of #8191.
---
 modules/monitoring/library/Monitoring/MonitoringWizard.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index f02faa4f3..d7a3671a4 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -4,12 +4,14 @@
 
 namespace Icinga\Module\Monitoring;
 
+use Icinga\Application\Icinga;
 use Icinga\Web\Form;
 use Icinga\Web\Wizard;
 use Icinga\Web\Request;
 use Icinga\Module\Setup\Setup;
 use Icinga\Module\Setup\SetupWizard;
 use Icinga\Module\Setup\Requirements;
+use Icinga\Module\Setup\Utils\MakeDirStep;
 use Icinga\Module\Setup\Forms\SummaryPage;
 use Icinga\Module\Monitoring\Forms\Setup\WelcomePage;
 use Icinga\Module\Monitoring\Forms\Setup\BackendPage;
@@ -106,6 +108,8 @@ class MonitoringWizard extends Wizard implements SetupWizard
         $pageData = $this->getPageData();
         $setup = new Setup();
 
+        $setup->addStep(new MakeDirStep(array(Icinga::app()->getConfigDir() . '/modules/monitoring'), 2770));
+
         $setup->addStep(
             new BackendStep(array(
                 'backendConfig'     => $pageData['setup_monitoring_backend'],

From a1fbb3d93702b3980b1c527941447326518cbcdb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 15:40:33 +0100
Subject: [PATCH 0376/2920] monitoring: Fix host and service groups overviews
 when using PostgreSQL

fixes #8268
---
 .../Backend/Ido/Query/GroupsummaryQuery.php    | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
index 14320567f..53c1d7ed7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@@ -57,17 +57,14 @@ class GroupSummaryQuery extends IdoQuery
             'host_state'
         );
 
-        // Prepend group column since we'll use columns index 0 later for grouping
         if (in_array('servicegroup', $this->desiredColumns)) {
-            array_unshift($columns, 'servicegroup');
-        } else {
-            array_unshift($columns, 'hostgroup');
-        }
-        if (in_array('hostgroup_alias', $this->desiredColumns)) {
-            $columns[] = 'hostgroup_alias';
-        }
-        if (in_array('servicegroup_alias', $this->desiredColumns)) {
+            $columns[] = 'servicegroup';
             $columns[] = 'servicegroup_alias';
+            $groupColumns = array('servicegroup', 'servicegroup_alias');
+        } else {
+            $columns[] = 'hostgroup';
+            $columns[] = 'hostgroup_alias';
+            $groupColumns = array('hostgroup', 'hostgroup_alias');
         }
         $hosts = $this->createSubQuery(
             'Hoststatus',
@@ -83,6 +80,7 @@ class GroupSummaryQuery extends IdoQuery
             $hosts->group(array(
                 'sgo.name1',
                 'ho.object_id',
+                'sg.alias',
                 'state',
                 'acknowledged',
                 'in_downtime',
@@ -101,7 +99,7 @@ class GroupSummaryQuery extends IdoQuery
             )
         );
         $union = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL);
-        $this->select->from(array('statussummary' => $union), array())->group(array($columns[0]));
+        $this->select->from(array('statussummary' => $union), array())->group($groupColumns);
         $this->joinedVirtualTables = array(
             'servicestatussummary'  => true,
             'hoststatussummary'     => true

From 910065436b3b95186a3a1ab1c53c45d672cb2e30 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 15:41:58 +0100
Subject: [PATCH 0377/2920] monitoring: Support hostgroup_alias and
 servicegroup_alias filter

---
 .../monitoring/library/Monitoring/DataView/Groupsummary.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
index 7fe6d2e6d..a4736e47c 100644
--- a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
@@ -15,7 +15,9 @@ class Groupsummary extends DataView
     {
         return array(
             'servicegroup',
+            'servicegroup_alias',
             'hostgroup',
+            'hostgroup_alias',
             'hosts_up',
             'hosts_unreachable',
             'hosts_unreachable_handled',
@@ -47,7 +49,7 @@ class Groupsummary extends DataView
             'services_unknown_last_state_change_unhandled'
         );
     }
-    
+
     public function getSortRules()
     {
         return array(

From 53a4f10253806d7e78a9899d4141a8843468459e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 15:46:51 +0100
Subject: [PATCH 0378/2920] monitoring: Sort host groups and service groups by
 their alias

refs #7843
---
 .../controllers/ListController.php            | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 9a0cd42a7..a9ccb7ee8 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -523,18 +523,20 @@ class Monitoring_ListController extends Controller
             'services_critical_last_state_change_unhandled',
             'services_unknown_last_state_change_unhandled',
             'services_total'
-        ));
+        ))->order('services_severity')->order('servicegroup_alias');
+        // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
+        // service groups. We should separate them.
         $this->filterQuery($query);
         $this->view->servicegroups = $query->paginate();
         $this->setupSortControl(array(
-            'services_severity' => $this->translate('Severity'),
-            'servicegroup'      => $this->translate('Service Group Name'),
-            'services_total'    => $this->translate('Total Services'),
-            'services_ok'       => $this->translate('Services OK'),
-            'services_unknown'  => $this->translate('Services UNKNOWN'),
-            'services_critical' => $this->translate('Services CRITICAL'),
-            'services_warning'  => $this->translate('Services WARNING'),
-            'services_pending'  => $this->translate('Services PENDING')
+            'services_severity'     => $this->translate('Severity'),
+            'servicegroup_alias'    => $this->translate('Service Group Name'),
+            'services_total'        => $this->translate('Total Services'),
+            'services_ok'           => $this->translate('Services OK'),
+            'services_unknown'      => $this->translate('Services UNKNOWN'),
+            'services_critical'     => $this->translate('Services CRITICAL'),
+            'services_warning'      => $this->translate('Services WARNING'),
+            'services_pending'      => $this->translate('Services PENDING')
         ));
     }
 
@@ -571,12 +573,14 @@ class Monitoring_ListController extends Controller
             'services_critical_last_state_change_unhandled',
             'services_unknown_last_state_change_unhandled',
             'services_total'
-        ));
+        ))->order('services_severity')->order('hostgroup_alias');
+        // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
+        // service groups. We should separate them.
         $this->filterQuery($query);
         $this->view->hostgroups = $query->paginate();
         $this->setupSortControl(array(
             'services_severity' => $this->translate('Severity'),
-            'hostgroup'         => $this->translate('Host Group Name'),
+            'hostgroup_alias'   => $this->translate('Host Group Name'),
             'services_total'    => $this->translate('Total Services'),
             'services_ok'       => $this->translate('Services OK'),
             'services_unknown'  => $this->translate('Services UNKNOWN'),

From 5fe5e2239519c89d2f566aff01e40a2e71715c30 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 23 Jan 2015 16:00:15 +0100
Subject: [PATCH 0379/2920] doc: Support any link having a fragment except
 http(s) links for linking between headings

---
 modules/doc/doc/1-module-documentation.md   | 8 ++++++++
 modules/doc/library/Doc/SectionRenderer.php | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/doc/doc/1-module-documentation.md b/modules/doc/doc/1-module-documentation.md
index 968dd32d7..edf20aac2 100644
--- a/modules/doc/doc/1-module-documentation.md
+++ b/modules/doc/doc/1-module-documentation.md
@@ -36,10 +36,18 @@ For linking between headings, place an anchor where you want to link to, e.g.:
 
     # <a id="heading"></a> Heading
 
+Please note that anchors have to be unique across all your Markdown documentation files.
+
 Now you can reference the anchor either in the same or **in another** Markdown documentation file, e.g.:
 
     This is a link to [Heading](#heading).
 
+Other tools support linking between headings by giving the filename plus the anchor to link to, e.g.:
+
+    This is a link to [About/Heading](1-about.md#heading.md)
+
+This syntax is also supported in Icinga Web 2.
+
 ## <a id="images"></a> Including Images
 
 Images must placed in the `img` directory beneath your module's `public` directory, e.g.:
diff --git a/modules/doc/library/Doc/SectionRenderer.php b/modules/doc/library/Doc/SectionRenderer.php
index 2fdaf8e90..f923783f6 100644
--- a/modules/doc/library/Doc/SectionRenderer.php
+++ b/modules/doc/library/Doc/SectionRenderer.php
@@ -232,7 +232,7 @@ class SectionRenderer extends Renderer
                 $html
             );
             $content[] = preg_replace_callback(
-                '/<a\s+(?P<attribs>[^>]*?\s+)?href="#(?P<fragment>[^"]+)"/',
+                '/<a\s+(?P<attribs>[^>]*?\s+)?href="(?:(?!http:\/\/)[^#]*)#(?P<fragment>[^"]+)"/',
                 array($callback, 'render'),
                 $html
             );

From 2a543bb5ae5f5430131894fe3dd7098192977c08 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 23 Jan 2015 16:03:29 +0100
Subject: [PATCH 0380/2920] Rename the preference setting `type' to `store'

refs #8234
---
 application/forms/Config/General/ApplicationConfigForm.php | 6 ++----
 library/Icinga/User/Preferences/PreferencesStore.php       | 6 +++---
 modules/setup/application/forms/PreferencesPage.php        | 2 +-
 modules/setup/library/Setup/Steps/GeneralConfigStep.php    | 6 +++---
 modules/setup/library/Setup/WebWizard.php                  | 2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php
index 8f718ccdf..f59454ff3 100644
--- a/application/forms/Config/General/ApplicationConfigForm.php
+++ b/application/forms/Config/General/ApplicationConfigForm.php
@@ -4,10 +4,8 @@
 
 namespace Icinga\Forms\Config\General;
 
-use DateTimeZone;
 use Icinga\Application\Icinga;
 use Icinga\Data\ResourceFactory;
-use Icinga\Util\Translator;
 use Icinga\Web\Form;
 
 
@@ -46,7 +44,7 @@ class ApplicationConfigForm extends Form
 
         $this->addElement(
             'select',
-            'preferences_type',
+            'preferences_store',
             array(
                 'required'      => true,
                 'autosubmit'    => true,
@@ -58,7 +56,7 @@ class ApplicationConfigForm extends Form
                 )
             )
         );
-        if (isset($formData['preferences_type']) && $formData['preferences_type'] === 'db') {
+        if (isset($formData['preferences_store']) && $formData['preferences_store'] === 'db') {
             $backends = array();
             foreach (ResourceFactory::getResourceConfigs()->toArray() as $name => $resource) {
                 if ($resource['type'] === 'db') {
diff --git a/library/Icinga/User/Preferences/PreferencesStore.php b/library/Icinga/User/Preferences/PreferencesStore.php
index c2cba0c41..a9d9ec033 100644
--- a/library/Icinga/User/Preferences/PreferencesStore.php
+++ b/library/Icinga/User/Preferences/PreferencesStore.php
@@ -26,7 +26,7 @@ use Icinga\Data\Db\DbConnection;
  * // Create a INI store
  * $store = PreferencesStore::create(
  *     new ConfigObject(
- *         'type'        => 'ini',
+ *         'store'       => 'ini',
  *         'config_path' => '/path/to/preferences'
  *     ),
  *     $user // Instance of \Icinga\User
@@ -117,9 +117,9 @@ abstract class PreferencesStore
      */
     public static function create(ConfigObject $config, User $user)
     {
-        if (($type = $config->type) === null) {
+        if (($type = $config->store) === null) {
             throw new ConfigurationError(
-                'Preferences configuration is missing the type directive'
+                'Preferences configuration is missing the store directive'
             );
         }
 
diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
index 07e011ee1..83f036498 100644
--- a/modules/setup/application/forms/PreferencesPage.php
+++ b/modules/setup/application/forms/PreferencesPage.php
@@ -70,7 +70,7 @@ class PreferencesPage extends Form
 
         $this->addElement(
             'select',
-            'type',
+            'store',
             array(
                 'required'      => true,
                 'label'         => $this->translate('User Preference Storage Type'),
diff --git a/modules/setup/library/Setup/Steps/GeneralConfigStep.php b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
index ee9e2c581..39c160628 100644
--- a/modules/setup/library/Setup/Steps/GeneralConfigStep.php
+++ b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
@@ -29,7 +29,7 @@ class GeneralConfigStep extends Step
             $config[$section][$property] = $value;
         }
 
-        $config['preferences']['type'] = $this->data['preferencesType'];
+        $config['preferences']['store'] = $this->data['preferencesStore'];
         if (isset($this->data['preferencesResource'])) {
             $config['preferences']['resource'] = $this->data['preferencesResource'];
         }
@@ -58,11 +58,11 @@ class GeneralConfigStep extends Step
         $generalHtml = ''
             . '<ul>'
             . '<li>' . sprintf(
-                $this->data['preferencesType'] === 'ini' ? sprintf(
+                $this->data['preferencesStore'] === 'ini' ? sprintf(
                     t('Preferences will be stored per user account in INI files at: %s'),
                     Config::resolvePath('preferences')
                 ) : (
-                    $this->data['preferencesType'] === 'db' ? t('Preferences will be stored using a database.') : (
+                    $this->data['preferencesStore'] === 'db' ? t('Preferences will be stored using a database.') : (
                         t('Preferences will not be persisted across browser sessions.')
                     )
                 )
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 58c7c6259..d6874ed36 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -293,7 +293,7 @@ class WebWizard extends Wizard implements SetupWizard
         $setup->addStep(
             new GeneralConfigStep(array(
                 'generalConfig'         => $pageData['setup_general_config'],
-                'preferencesType'       => $pageData['setup_preferences_type']['type'],
+                'preferencesStore'       => $pageData['setup_preferences_type']['store'],
                 'preferencesResource'   => isset($pageData['setup_db_resource']['name'])
                     ? $pageData['setup_db_resource']['name']
                     : null

From 359336243c4f2aa3b1dceaee91ce723edec6472e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 23 Jan 2015 16:04:45 +0100
Subject: [PATCH 0381/2920] Save "none" instead of "null" when choosing to not
 to store preferences

refs #8234
---
 application/forms/Config/General/ApplicationConfigForm.php | 2 +-
 modules/setup/application/forms/PreferencesPage.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php
index f59454ff3..29b7b512e 100644
--- a/application/forms/Config/General/ApplicationConfigForm.php
+++ b/application/forms/Config/General/ApplicationConfigForm.php
@@ -52,7 +52,7 @@ class ApplicationConfigForm extends Form
                 'multiOptions'  => array(
                     'ini'   => $this->translate('File System (INI Files)'),
                     'db'    => $this->translate('Database'),
-                    'null'  => $this->translate('Don\'t Store Preferences')
+                    'none'  => $this->translate('Don\'t Store Preferences')
                 )
             )
         );
diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
index 83f036498..211d16fac 100644
--- a/modules/setup/application/forms/PreferencesPage.php
+++ b/modules/setup/application/forms/PreferencesPage.php
@@ -66,7 +66,7 @@ class PreferencesPage extends Form
         if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {
             $storageTypes['db'] = $this->translate('Database');
         }
-        $storageTypes['null'] = $this->translate('Don\'t Store Preferences');
+        $storageTypes['none'] = $this->translate('Don\'t Store Preferences');
 
         $this->addElement(
             'select',

From d452f3218d9a74b38f958d24f7e30bf5295fbfaf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 23 Jan 2015 16:07:38 +0100
Subject: [PATCH 0382/2920] Use "ini" as preferences store in case preferences
 are not configured

refs #8234
---
 application/controllers/PreferenceController.php     | 4 ----
 library/Icinga/Authentication/Manager.php            | 2 +-
 library/Icinga/User/Preferences/PreferencesStore.php | 8 +-------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/application/controllers/PreferenceController.php b/application/controllers/PreferenceController.php
index 7acab7c25..c45344fbf 100644
--- a/application/controllers/PreferenceController.php
+++ b/application/controllers/PreferenceController.php
@@ -7,7 +7,6 @@ use Icinga\Web\Url;
 use Icinga\Web\Widget\Tab;
 use Icinga\Application\Config;
 use Icinga\Forms\PreferenceForm;
-use Icinga\Exception\ConfigurationError;
 use Icinga\User\Preferences\PreferencesStore;
 
 /**
@@ -40,9 +39,6 @@ class PreferenceController extends BasePreferenceController
     public function indexAction()
     {
         $storeConfig = Config::app()->getSection('preferences');
-        if ($storeConfig->isEmpty()) {
-            throw new ConfigurationError(t('You need to configure how to store preferences first.'));
-        }
 
         $user = $this->getRequest()->getUser();
         $form = new PreferenceForm();
diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 12269d98e..8aee93c0e 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -63,7 +63,7 @@ class Manager
             );
             $config = new Config();
         }
-        if ($config->hasSection('preferences')) {
+        if ($config->get('preferences', 'store', 'ini') !== 'none') {
             $preferencesConfig = $config->getSection('preferences');
             try {
                 $preferencesStore = PreferencesStore::create(
diff --git a/library/Icinga/User/Preferences/PreferencesStore.php b/library/Icinga/User/Preferences/PreferencesStore.php
index a9d9ec033..11454a2f8 100644
--- a/library/Icinga/User/Preferences/PreferencesStore.php
+++ b/library/Icinga/User/Preferences/PreferencesStore.php
@@ -117,13 +117,7 @@ abstract class PreferencesStore
      */
     public static function create(ConfigObject $config, User $user)
     {
-        if (($type = $config->store) === null) {
-            throw new ConfigurationError(
-                'Preferences configuration is missing the store directive'
-            );
-        }
-
-        $type = ucfirst(strtolower($type));
+        $type = ucfirst(strtolower($config->get('store', 'ini')));
         $storeClass = 'Icinga\\User\\Preferences\\Store\\' . $type . 'Store';
         if (!class_exists($storeClass)) {
             throw new ConfigurationError(

From 55c20abddc078156d1f6f95893f880f5fb2ca1f6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 23 Jan 2015 16:19:39 +0100
Subject: [PATCH 0383/2920] Only show the "save to session" button in case
 preferences store = none

refs #8234
---
 .../controllers/PreferenceController.php      |  4 ++-
 application/forms/PreferenceForm.php          | 28 ++++++++++---------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/application/controllers/PreferenceController.php b/application/controllers/PreferenceController.php
index c45344fbf..832f57644 100644
--- a/application/controllers/PreferenceController.php
+++ b/application/controllers/PreferenceController.php
@@ -43,7 +43,9 @@ class PreferenceController extends BasePreferenceController
         $user = $this->getRequest()->getUser();
         $form = new PreferenceForm();
         $form->setPreferences($user->getPreferences());
-        $form->setStore(PreferencesStore::create($storeConfig, $user));
+        if ($storeConfig->get('store', 'ini') !== 'none') {
+            $form->setStore(PreferencesStore::create($storeConfig, $user));
+        }
         $form->handleRequest();
 
         $this->view->form = $form;
diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
index 9b5a3ecf8..ed20c58cd 100644
--- a/application/forms/PreferenceForm.php
+++ b/application/forms/PreferenceForm.php
@@ -86,7 +86,7 @@ class PreferenceForm extends Form
      */
     public function onSuccess()
     {
-        $this->preferences = new Preferences($this->store->load());
+        $this->preferences = new Preferences($this->store ? $this->store->load() : array());
 
         $webPreferences = $this->preferences->get('icingaweb', array());
         foreach ($this->getValues() as $key => $value) {
@@ -103,7 +103,7 @@ class PreferenceForm extends Form
         Session::getSession()->user->setPreferences($this->preferences);
 
         try {
-            if ($this->getElement('btn_submit_preferences')->isChecked()) {
+            if ($this->store && $this->getElement('btn_submit_preferences')->isChecked()) {
                 $this->save();
                 Notification::success($this->translate('Preferences successfully saved'));
             } else {
@@ -186,18 +186,20 @@ class PreferenceForm extends Form
             )
         );
 
-        $this->addElement(
-            'submit',
-            'btn_submit_preferences',
-            array(
-                'ignore'        => true,
-                'label'         => $this->translate('Save to the Preferences'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'div'))
+        if ($this->store) {
+            $this->addElement(
+                'submit',
+                'btn_submit_preferences',
+                array(
+                    'ignore'        => true,
+                    'label'         => $this->translate('Save to the Preferences'),
+                    'decorators'    => array(
+                        'ViewHelper',
+                        array('HtmlTag', array('tag' => 'div'))
+                    )
                 )
-            )
-        );
+            );
+        }
 
         $this->addElement(
             'submit',

From fb97e7445365b40b6460f5c844098fa5ed19c248 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 26 Jan 2015 07:39:31 +0100
Subject: [PATCH 0384/2920] Use the correct element identifier for the
 preference storage type selection

Used to be `type' but has changed to `store'
to get a more clear INI structure.

fixes #8275
---
 modules/setup/application/forms/PreferencesPage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
index 211d16fac..01b3296f4 100644
--- a/modules/setup/application/forms/PreferencesPage.php
+++ b/modules/setup/application/forms/PreferencesPage.php
@@ -27,7 +27,7 @@ class PreferencesPage extends Form
      */
     public function showDatabaseNote()
     {
-        $this->getElement('type')
+        $this->getElement('store')
             ->setValue('db')
             ->setDescription(
                 $this->translate(

From 0b73dbdd6da30fa8aa5d88241096990f34fcafba Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 26 Jan 2015 10:32:33 +0100
Subject: [PATCH 0385/2920] Fix exception "Undefined index: type" in the
 WebWizard's page logic

refs #8275
---
 modules/setup/library/Setup/WebWizard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index d6874ed36..8ae7344ea 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -188,7 +188,7 @@ class WebWizard extends Wizard implements SetupWizard
         if ($newPage->getName() === 'setup_db_resource') {
             $prefData = $this->getPageData('setup_preferences_type');
             $authData = $this->getPageData('setup_authentication_type');
-            $skip = $prefData['type'] !== 'db' && $authData['type'] !== 'db';
+            $skip = $prefData['store'] !== 'db' && $authData['type'] !== 'db';
         } elseif ($newPage->getname() === 'setup_ldap_discovery') {
             $authData = $this->getPageData('setup_authentication_type');
             $skip = $authData['type'] !== 'ldap';

From 555ab77c3df1f93d18a363cb1d5295d60e48dc8e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 26 Jan 2015 13:40:17 +0100
Subject: [PATCH 0386/2920] Fix "Undefined property:
 stdClass::$service_display_name" in the alert summary

fixes #8284
---
 .../application/controllers/AlertsummaryController.php        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 652c09be3..a4ef76b44 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -78,7 +78,9 @@ class Monitoring_AlertsummaryController extends Controller
             'notification',
             array(
                 'host',
+                'host_display_name',
                 'service',
+                'service_display_name',
                 'notification_output',
                 'notification_contact',
                 'notification_start_time',
@@ -506,7 +508,9 @@ class Monitoring_AlertsummaryController extends Controller
             'notification',
             array(
                 'host',
+                'host_display_name',
                 'service',
+                'service_display_name',
                 'notification_output',
                 'notification_contact',
                 'notification_start_time',

From 2ba78f24c3fd46aa65444598cabf6e42024f616c Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Mon, 26 Jan 2015 14:02:47 +0100
Subject: [PATCH 0387/2920] Roles view: show role's name in the title of the
 remove-link

---
 application/views/scripts/roles/index.phtml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml
index 0f40f8279..67c957661 100644
--- a/application/views/scripts/roles/index.phtml
+++ b/application/views/scripts/roles/index.phtml
@@ -52,7 +52,10 @@
                         <td><?= $this->escape($role->groups) ?></td>
                         <td>
                             <a href="<?= $this->url('roles/remove', array('role' => $name)) ?>"
-                               title="<?= $this->translate('Remove role') ?>">
+                               title="<?php printf(
+                                    $this->translate('Remove role "%s"'),
+                                    $name
+                                ); ?>">
                                 <?= $this->icon('cancel') ?>
                             </a>
                         </td>

From f0784caaadaf0bf10bafb260804ace9009fb7c68 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Mon, 26 Jan 2015 14:09:39 +0100
Subject: [PATCH 0388/2920] Hosts view: show object amounts in titles

---
 .../views/scripts/hosts/show.phtml            | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 6ab717635..6e114f2d8 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -24,7 +24,10 @@
         </h3>
 
         <div>
-            <a href="<?= $listAllLink ?>" title="<?= $this->translate('List all') ?>">
+            <a href="<?= $listAllLink ?>" title="<?php printf(
+                $this->translate('List all Hosts (%u)'),
+                count($objects)
+            ); ?>">
                 <?= $this->translate('List all') ?>
             </a>
         </div>
@@ -100,9 +103,19 @@
         <?php if (! empty($objectsInDowntime)): ?>
             <h2>
                 <a href="<?= $inDowntimeLink ?>"
-                   title="<?= $this->translate('Hosts in downtime') ?>">
+                   title="<?php printf(
+                        $this->translate('List all hosts in downtime (%u)'),
+                        count($objectsInDowntime)
+                    ); ?>">
                     <?= $this->icon('plug') ?>
-                    <?= $this->translate(sprintf('%u hosts are in downtime', count($objectsInDowntime))) ?>
+                    <?php printf(
+                        $this->translatePlural(
+                            '%u host is in downtime',
+                            '%u hosts are in downtime',
+                            count($objectsInDowntime)
+                        ),
+                        count($objectsInDowntime)
+                    ); ?>
                 </a>
             </h2>
         <?php endif ?>
@@ -110,7 +123,10 @@
         <?php if (count($objects->getComments())): ?>
             <h2>
                 <a href="<?= $havingCommentsLink ?>"
-                   title="<?= $this->translate('Comments') ?>">
+                   title="<?php printf(
+                        $this->translate('List all Comments (%u)'),
+                        count($objects->getComments())
+                    ); ?>">
                     <?= $this->icon('comment') ?>
                     <?= $this->translate(sprintf('%u comments', count($objects->getComments()))) ?>
                 </a>

From 7006bbf8b228b47219e98d63a40bd9bff7a10475 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 26 Jan 2015 14:13:10 +0100
Subject: [PATCH 0389/2920] Suggest "icingaweb2" as group instead of the
 webserver's user

..and note that it is necessary to create this group.
---
 .../application/views/scripts/form/setup-welcome.phtml    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/setup/application/views/scripts/form/setup-welcome.phtml b/modules/setup/application/views/scripts/form/setup-welcome.phtml
index aa51ffba6..d4bc1c3d7 100644
--- a/modules/setup/application/views/scripts/form/setup-welcome.phtml
+++ b/modules/setup/application/views/scripts/form/setup-welcome.phtml
@@ -41,14 +41,18 @@ $cliPath = realpath(Icinga::app()->getApplicationDir() . '/../bin/icingacli');
           'To run this wizard a user needs to authenticate using a token which is usually'
           . ' provided to him by an administrator who\'d followed the instructions below.'
       ); ?></p>
+      <p><?= $this->translate('In any case, make sure that a group called "icingaweb2" exists:'); ?></p>
+      <div class="code">
+        <span>groupadd icingaweb2;</span>
+      </div>
       <p><?= $this->translate('If you\'ve got the IcingaCLI installed you can do the following:'); ?></p>
       <div class="code">
-        <span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup config directory --group <?= ($user = Platform::getPhpUser()) !== null ? $user : 'your_webserver_group'; ?><?= $configDir !== '/etc/icingaweb2' ? ' --config ' . $configDir : ''; ?>;</span>
+        <span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup config directory --group icingaweb2<?= $configDir !== '/etc/icingaweb2' ? ' --config ' . $configDir : ''; ?>;</span>
         <span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup token create;</span>
       </div>
       <p><?= $this->translate('In case the IcingaCLI is missing you can create the token manually:'); ?></p>
       <div class="code">
-        <span>su <?= ($user = Platform::getPhpUser()) !== null ? $user : 'your_webserver_user'; ?> -c "mkdir -m 2770 <?= dirname($setupTokenPath); ?>; head -c 12 /dev/urandom | base64 | tee <?= $setupTokenPath; ?>; chmod 0660 <?= $setupTokenPath; ?>;";</span>
+        <span>su <?= ($user = Platform::getPhpUser()) !== null ? $user : 'your_webserver_user'; ?> -c "mkdir -m 2770 <?= dirname($setupTokenPath); ?>; chgrp icingaweb2 <?= dirname($setupTokenPath); ?>; head -c 12 /dev/urandom | base64 | tee <?= $setupTokenPath; ?>; chmod 0660 <?= $setupTokenPath; ?>;";</span>
       </div>
       <p><?= sprintf(
         $this->translate('Please see the %s for an extensive description on how to access and use this wizard.'),

From fccc2ffbcfe8e972f64037d1ad7c315902525d67 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Mon, 26 Jan 2015 14:17:48 +0100
Subject: [PATCH 0390/2920] Hosts list: use $this->translatePlural()

---
 .../monitoring/application/views/scripts/list/hosts.phtml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index debef375c..3953db975 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -100,9 +100,11 @@ if ($hosts->count() === 0) {
         <?= implode(' ', $icons) ?>
         <a href="<?= $hostLink  ?>"><?= $host->host_name ?></a>
         <?php if (isset($host->host_unhandled_services) && $host->host_unhandled_services > 0): ?>
-        <span title="<?=
-            $host->host_unhandled_services
-        ?> <?= $this->translate('Service Problems on Host') ?>"> (<?= $this->qlink(
+        <span title="<?php printf(
+          $this->translatePlural('%s Service Problem on Host "%s"', '%s Service Problems on Host "%s"', $host->host_unhandled_services),
+          $host->host_unhandled_services,
+          $host->host_name
+        ); ?>"> (<?= $this->qlink(
            sprintf(
                $this->translatePlural('%d unhandled service', '%d unhandled services', $host->host_unhandled_services),
                $host->host_unhandled_services),

From 917e5b81ba0f8f773981ebb5683a353e6634a517 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 26 Jan 2015 15:31:57 +0100
Subject: [PATCH 0391/2920] rpm: Fix bad %if condition

---
 icingaweb2.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index 56024a962..cd1ee485f 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -22,7 +22,7 @@ Packager:       Icinga Team <info@icinga.org>
 %define php     php
 %define php_cli php-cli
 %endif
-%if 0%{rhel} == 6
+%if 0%{?rhel} == 6
 %define zend php-ZendFramework
 %else
 %define zend %{name}-vendor-Zend

From 45408e45afd36dc91f92c2226d0b773ef409aaa7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 26 Jan 2015 15:51:34 +0100
Subject: [PATCH 0392/2920] Relax database permission checks in the setup
 wizard

The wizard considered all permissions being exclusively associated to their
most important context, which is, in the most common case, incorrect.
Permissions assigned on database level do not need to be assigned on
table level as well.

refs #8267
---
 modules/setup/library/Setup/Utils/DbTool.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index a368bfa1a..63184acd0 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -641,7 +641,8 @@ EOD;
             foreach ($mysqlPrivileges as $privilege) {
                 if (false === empty($context) && $this->mysqlGrantContexts[$privilege] & static::TABLE_LEVEL) {
                     $tablePrivileges[] = $privilege;
-                } elseif ($this->mysqlGrantContexts[$privilege] & static::DATABASE_LEVEL) {
+                }
+                if ($this->mysqlGrantContexts[$privilege] & static::DATABASE_LEVEL) {
                     $dbPrivileges[] = $privilege;
                 }
             }
@@ -661,7 +662,11 @@ EOD;
             }
 
             $tablePrivilegesGranted = true;
-            if (false === empty($tablePrivileges)) {
+            if (
+                false === empty($tablePrivileges) && (
+                    !$dbPrivilegesGranted || array_intersect($dbPrivileges, $tablePrivileges) != $tablePrivileges
+                )
+            ) {
                 $tableCondition = 'table_name IN (' . join(',', array_map(array($this, 'quote'), $context)) . ')';
                 $query = $this->query(
                     'SELECT COUNT(*) as matches'

From 0fa133abfb4dd636038baeab563c639e339d4ad7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 26 Jan 2015 16:58:40 +0100
Subject: [PATCH 0393/2920] setup: Display a note in case autologin is chosen
 while not being logged in

In case the user chooses to use autologin as authentication while not being
externally authenticated a note is displayed indicating that it is necessary
to set up the webserver's authentication to be able to login once the wizard
is complete.

refs #8274
---
 .../application/forms/AuthenticationPage.php  | 27 +++++++++++++++++++
 public/css/icinga/setup.less                  | 10 +++++++
 2 files changed, 37 insertions(+)

diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
index 88db9c6d8..ca182a4b1 100644
--- a/modules/setup/application/forms/AuthenticationPage.php
+++ b/modules/setup/application/forms/AuthenticationPage.php
@@ -36,6 +36,32 @@ class AuthenticationPage extends Form
                 )
             )
         );
+
+        if (isset($formData['type']) && $formData['type'] === 'autologin' && !isset($_SERVER['REMOTE_USER'])) {
+            $this->addElement(
+                'note',
+                'autologin_note',
+                array(
+                    'value'         => sprintf(
+                        $this->translate(
+                            'You\'re currently not authenticated using any of the web server\'s authentication '
+                            . 'mechanisms. Make sure you\'ll configure such either by using the %s or by setting'
+                            . ' it up manually, otherwise you\'ll not be able to log into Icinga Web 2 once the '
+                            . 'wizard is complete.'
+                        ),
+                        '<em title="icingacli help setup config webserver">IcingaCLI</em>'
+                    ),
+                    'decorators'    => array(
+                        'ViewHelper',
+                        array(
+                            'HtmlTag',
+                            array('tag' => 'p', 'class' => 'icon-info info')
+                        )
+                    )
+                )
+            );
+        }
+
         $this->addElement(
             'note',
             'description',
@@ -61,6 +87,7 @@ class AuthenticationPage extends Form
             'type',
             array(
                 'required'      => true,
+                'autosubmit'    => true,
                 'label'         => $this->translate('Authentication Type'),
                 'description'   => $this->translate('The type of authentication to use when accessing Icinga Web 2'),
                 'multiOptions'  => $backendTypes
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index 0bf8eb7b2..2c86a985a 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -220,6 +220,16 @@
   }
 }
 
+#setup_authentication_type p.info {
+  padding: 0.5em;
+  border: 1px solid lightgrey;
+  background-color: infobackground;
+
+  em {
+    text-decoration: underline;
+  }
+}
+
 #setup_ldap_discovery_confirm table {
   margin: 1em 0;
   border-collapse: separate;

From 50fc85d7ffc1ab8aee0608569997299cc16a0f26 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 27 Jan 2015 09:49:36 +0100
Subject: [PATCH 0394/2920] Rename authentication type "autologin" to
 "external"

refs #8274
---
 .../templates/authentication.ini.erb          |  2 +-
 ...ackendForm.php => ExternalBackendForm.php} | 10 +++++-----
 .../AuthenticationBackendConfigForm.php       | 20 +++++++++----------
 doc/authentication.md                         |  2 +-
 ...toLoginBackend.php => ExternalBackend.php} |  6 +++---
 library/Icinga/Authentication/UserBackend.php |  6 +++---
 .../application/forms/AuthBackendPage.php     |  8 ++++----
 .../application/forms/AuthenticationPage.php  |  6 +++---
 .../Setup/Steps/AuthenticationStep.php        |  2 +-
 9 files changed, 31 insertions(+), 31 deletions(-)
 rename application/forms/Config/Authentication/{AutologinBackendForm.php => ExternalBackendForm.php} (88%)
 rename library/Icinga/Authentication/Backend/{AutoLoginBackend.php => ExternalBackend.php} (91%)

diff --git a/.puppet/profiles/icingaweb2_dev/templates/authentication.ini.erb b/.puppet/profiles/icingaweb2_dev/templates/authentication.ini.erb
index f28395e18..87f9f53ed 100644
--- a/.puppet/profiles/icingaweb2_dev/templates/authentication.ini.erb
+++ b/.puppet/profiles/icingaweb2_dev/templates/authentication.ini.erb
@@ -1,5 +1,5 @@
 [autologin]
-backend = autologin
+backend = external
 
 [icingaweb-mysql]
 backend  = db
diff --git a/application/forms/Config/Authentication/AutologinBackendForm.php b/application/forms/Config/Authentication/ExternalBackendForm.php
similarity index 88%
rename from application/forms/Config/Authentication/AutologinBackendForm.php
rename to application/forms/Config/Authentication/ExternalBackendForm.php
index cd09d38ac..51000b2d2 100644
--- a/application/forms/Config/Authentication/AutologinBackendForm.php
+++ b/application/forms/Config/Authentication/ExternalBackendForm.php
@@ -8,16 +8,16 @@ use Zend_Validate_Callback;
 use Icinga\Web\Form;
 
 /**
- * Form class for adding/modifying autologin authentication backends
+ * Form class for adding/modifying authentication backends of type "external"
  */
-class AutologinBackendForm extends Form
+class ExternalBackendForm extends Form
 {
     /**
      * Initialize this form
      */
     public function init()
     {
-        $this->setName('form_config_authbackend_autologin');
+        $this->setName('form_config_authbackend_external');
     }
 
     /**
@@ -69,7 +69,7 @@ class AutologinBackendForm extends Form
             'backend',
             array(
                 'disabled'  => true,
-                'value'     => 'autologin'
+                'value'     => 'external'
             )
         );
 
@@ -79,7 +79,7 @@ class AutologinBackendForm extends Form
     /**
      * Validate the configuration by creating a backend and requesting the user count
      *
-     * Returns always true as autologin backends are just "passive" backends. (The webserver authenticates users.)
+     * Returns always true as backends of type "external" are just "passive" backends.
      *
      * @param   Form    $form   The form to fetch the configuration values from
      *
diff --git a/application/forms/Config/AuthenticationBackendConfigForm.php b/application/forms/Config/AuthenticationBackendConfigForm.php
index 076f8cb17..de3093ada 100644
--- a/application/forms/Config/AuthenticationBackendConfigForm.php
+++ b/application/forms/Config/AuthenticationBackendConfigForm.php
@@ -14,7 +14,7 @@ use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;
 use Icinga\Forms\Config\Authentication\DbBackendForm;
 use Icinga\Forms\Config\Authentication\LdapBackendForm;
-use Icinga\Forms\Config\Authentication\AutologinBackendForm;
+use Icinga\Forms\Config\Authentication\ExternalBackendForm;
 
 class AuthenticationBackendConfigForm extends ConfigForm
 {
@@ -67,8 +67,8 @@ class AuthenticationBackendConfigForm extends ConfigForm
         } elseif ($type === 'ldap') {
             $form = new LdapBackendForm();
             $form->setResources(isset($this->resources['ldap']) ? $this->resources['ldap'] : array());
-        } elseif ($type === 'autologin') {
-            $form = new AutologinBackendForm();
+        } elseif ($type === 'external') {
+            $form = new ExternalBackendForm();
         } else {
             throw new InvalidArgumentException(sprintf($this->translate('Invalid backend type "%s" provided'), $type));
         }
@@ -251,14 +251,14 @@ class AuthenticationBackendConfigForm extends ConfigForm
             $configValues['name'] = $authBackend;
             $this->populate($configValues);
         } elseif (empty($this->resources)) {
-            $autologinBackends = array_filter(
+            $externalBackends = array_filter(
                 $this->config->toArray(),
                 function ($authBackendCfg) {
-                    return isset($authBackendCfg['backend']) && $authBackendCfg['backend'] === 'autologin';
+                    return isset($authBackendCfg['backend']) && $authBackendCfg['backend'] === 'external';
                 }
             );
 
-            if (false === empty($autologinBackends)) {
+            if (false === empty($externalBackends)) {
                 throw new ConfigurationError($this->translate('Could not find any resources for authentication'));
             }
         }
@@ -299,14 +299,14 @@ class AuthenticationBackendConfigForm extends ConfigForm
             $backendTypes['ldap'] = 'LDAP';
         }
 
-        $autologinBackends = array_filter(
+        $externalBackends = array_filter(
             $this->config->toArray(),
             function ($authBackendCfg) {
-                return isset($authBackendCfg['backend']) && $authBackendCfg['backend'] === 'autologin';
+                return isset($authBackendCfg['backend']) && $authBackendCfg['backend'] === 'external';
             }
         );
-        if ($backendType === 'autologin' || empty($autologinBackends)) {
-            $backendTypes['autologin'] = $this->translate('Autologin');
+        if ($backendType === 'external' || empty($externalBackends)) {
+            $backendTypes['external'] = $this->translate('External');
         }
 
         if ($backendType === null) {
diff --git a/doc/authentication.md b/doc/authentication.md
index d36051e8f..542eb9934 100644
--- a/doc/authentication.md
+++ b/doc/authentication.md
@@ -24,7 +24,7 @@ For delegating authentication to the web server simply add `autologin` to your a
 
 ````
 [autologin]
-backend = autologin
+backend = external
 ````
 
 If your web server is not configured for authentication though the `autologin` section has no effect.
diff --git a/library/Icinga/Authentication/Backend/AutoLoginBackend.php b/library/Icinga/Authentication/Backend/ExternalBackend.php
similarity index 91%
rename from library/Icinga/Authentication/Backend/AutoLoginBackend.php
rename to library/Icinga/Authentication/Backend/ExternalBackend.php
index b4a70bd4f..d5eb491e5 100644
--- a/library/Icinga/Authentication/Backend/AutoLoginBackend.php
+++ b/library/Icinga/Authentication/Backend/ExternalBackend.php
@@ -11,7 +11,7 @@ use Icinga\User;
 /**
  * Test login with external authentication mechanism, e.g. Apache
  */
-class AutoLoginBackend extends UserBackend
+class ExternalBackend extends UserBackend
 {
     /**
      * Regexp expression to strip values from a username
@@ -21,7 +21,7 @@ class AutoLoginBackend extends UserBackend
     private $stripUsernameRegexp;
 
     /**
-     * Create new autologin backend
+     * Create new authentication backend of type "external"
      *
      * @param ConfigObject $config
      */
@@ -33,7 +33,7 @@ class AutoLoginBackend extends UserBackend
     /**
      * Count the available users
      *
-     * Autologin backends will always return 1
+     * Authenticaton backends of type "external" will always return 1
      *
      * @return int
      */
diff --git a/library/Icinga/Authentication/UserBackend.php b/library/Icinga/Authentication/UserBackend.php
index eaf39e49d..7215f4d41 100644
--- a/library/Icinga/Authentication/UserBackend.php
+++ b/library/Icinga/Authentication/UserBackend.php
@@ -5,7 +5,7 @@
 namespace Icinga\Authentication;
 
 use Countable;
-use Icinga\Authentication\Backend\AutoLoginBackend;
+use Icinga\Authentication\Backend\ExternalBackend;
 use Icinga\Authentication\Backend\DbUserBackend;
 use Icinga\Authentication\Backend\LdapUserBackend;
 use Icinga\Data\ConfigObject;
@@ -69,8 +69,8 @@ abstract class UserBackend implements Countable
             );
         }
         $backendType = strtolower($backendType);
-        if ($backendType === 'autologin') {
-            $backend = new AutoLoginBackend($backendConfig);
+        if ($backendType === 'external') {
+            $backend = new ExternalBackend($backendConfig);
             $backend->setName($name);
             return $backend;
         }
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index ced0d9c59..b123b5906 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -7,7 +7,7 @@ namespace Icinga\Module\Setup\Forms;
 use Icinga\Web\Form;
 use Icinga\Forms\Config\Authentication\DbBackendForm;
 use Icinga\Forms\Config\Authentication\LdapBackendForm;
-use Icinga\Forms\Config\Authentication\AutologinBackendForm;
+use Icinga\Forms\Config\Authentication\ExternalBackendForm;
 use Icinga\Data\ConfigObject;
 
 /**
@@ -80,7 +80,7 @@ class AuthBackendPage extends Form
                 'Before you are able to authenticate using the LDAP connection defined earlier you need to'
                 . ' provide some more information so that Icinga Web 2 is able to locate account details.'
             );
-        } else { // if ($this->config['type'] === 'autologin'
+        } else { // if ($this->config['type'] === 'external'
             $note = $this->translate(
                 'You\'ve chosen to authenticate using a web server\'s mechanism so it may be necessary'
                 . ' to adjust usernames before any permissions, restrictions, etc. are being applied.'
@@ -103,8 +103,8 @@ class AuthBackendPage extends Form
         } elseif ($this->config['type'] === 'ldap') {
             $backendForm = new LdapBackendForm();
             $backendForm->createElements($formData)->removeElement('resource');
-        } else { // $this->config['type'] === 'autologin'
-            $backendForm = new AutologinBackendForm();
+        } else { // $this->config['type'] === 'external'
+            $backendForm = new ExternalBackendForm();
             $backendForm->createElements($formData);
         }
 
diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
index ca182a4b1..6b25868ac 100644
--- a/modules/setup/application/forms/AuthenticationPage.php
+++ b/modules/setup/application/forms/AuthenticationPage.php
@@ -37,10 +37,10 @@ class AuthenticationPage extends Form
             )
         );
 
-        if (isset($formData['type']) && $formData['type'] === 'autologin' && !isset($_SERVER['REMOTE_USER'])) {
+        if (isset($formData['type']) && $formData['type'] === 'external' && !isset($_SERVER['REMOTE_USER'])) {
             $this->addElement(
                 'note',
-                'autologin_note',
+                'external_note',
                 array(
                     'value'         => sprintf(
                         $this->translate(
@@ -80,7 +80,7 @@ class AuthenticationPage extends Form
         if (Platform::extensionLoaded('ldap')) {
             $backendTypes['ldap'] = 'LDAP';
         }
-        $backendTypes['autologin'] = $this->translate('Autologin');
+        $backendTypes['external'] = $this->translate('External');
 
         $this->addElement(
             'select',
diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
index a15198c57..ce0b49f58 100644
--- a/modules/setup/library/Setup/Steps/AuthenticationStep.php
+++ b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -139,7 +139,7 @@ class AuthenticationStep extends Step
                 . '<td><strong>' . t('User Name Attribute') . '</strong></td>'
                 . '<td>' . $this->data['backendConfig']['user_name_attribute'] . '</td>'
                 . '</tr>'
-            ) : ($authType === 'autologin' ? (
+            ) : ($authType === 'external' ? (
                 '<tr>'
                 . '<td><strong>' . t('Filter Pattern') . '</strong></td>'
                 . '<td>' . $this->data['backendConfig']['strip_username_regexp'] . '</td>'

From afd4a9a134ebaedfaafd1ba055af41aa55fc7ca4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 27 Jan 2015 10:54:33 +0100
Subject: [PATCH 0395/2920] There will be '.. users create' instead of '..
 setup config webserver --with..'

refs #8274
---
 modules/setup/application/forms/AuthenticationPage.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
index 6b25868ac..1377ce230 100644
--- a/modules/setup/application/forms/AuthenticationPage.php
+++ b/modules/setup/application/forms/AuthenticationPage.php
@@ -45,11 +45,11 @@ class AuthenticationPage extends Form
                     'value'         => sprintf(
                         $this->translate(
                             'You\'re currently not authenticated using any of the web server\'s authentication '
-                            . 'mechanisms. Make sure you\'ll configure such either by using the %s or by setting'
-                            . ' it up manually, otherwise you\'ll not be able to log into Icinga Web 2 once the '
-                            . 'wizard is complete.'
+                            . 'mechanisms. Make sure you\'ll configure such either by using the %s once the '
+                            . 'wizard is complete or by setting it up manually, otherwise you\'ll not be able '
+                            . 'to log into Icinga Web 2.'
                         ),
-                        '<em title="icingacli help setup config webserver">IcingaCLI</em>'
+                        '<em title="icingacli help users">IcingaCLI</em>'
                     ),
                     'decorators'    => array(
                         'ViewHelper',

From 6c292f7e5659fc49fbe876c0655d0b6890aaf6bf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 27 Jan 2015 13:31:14 +0100
Subject: [PATCH 0396/2920] Move the configuration warning on the login screen
 further up

..and add translation support to the login screen.

refs #8274
refs #8134
---
 .../views/scripts/authentication/login.phtml  | 30 +++++++++----------
 public/css/icinga/login.less                  |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index 7d8d15df8..f05e51e43 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -1,11 +1,23 @@
  <div id="login">
   <div class="logo">
    <div class="image">
-    <img class="fade-in one" src="<?= $this->baseUrl('img/logo_icinga_big.png') ?>" alt="<?= t('The Icinga logo') ?>" >
+    <img class="fade-in one" src="<?= $this->baseUrl('img/logo_icinga_big.png'); ?>" alt="<?= $this->translate('The Icinga logo'); ?>" >
    </div>
   </div>
   <div class="form" data-base-target="layout">
-    <h1>Welcome to Icinga Web 2</h1>
+    <?php if ($requiresSetup): ?>
+    <div class="config-note"><?= sprintf(
+      $this->translate(
+        'It appears that you did not configure Icinga Web 2 yet so it\'s not possible to log in without any defined '
+        . 'authentication method. Please define a authentication method by following the instructions in the'
+        . ' %1$sdocumentation%3$s or by using our %2$sweb-based setup-wizard%3$s.'
+      ),
+      '<a href="http://docs.icinga.org/" title="' . $this->translate('Icinga Web 2 Documentation') . '">', // TODO: More exact documentation link..
+      '<a href="' . $this->href('setup') . '" title="' . $this->translate('Icinga Web 2 Setup-Wizard') . '">',
+      '</a>'
+    ); ?></div>
+    <?php endif ?>
+    <h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1>
    <?php
    /* TODO: remove this as soon as notifications and forms are ready */
    if (isset($this->errorInfo)): ?>
@@ -14,18 +26,6 @@
     </div>
    <?php endif ?>
    <?= $this->form ?>
-   <div class="footer">Icinga Web 2 &copy; 2013-2015<br><a href="https://www.icinga.org">The Icinga Project</a></div>
-   <?php if ($requiresSetup): ?>
-   <div class="config-note"><?= sprintf(
-     t(
-       'It appears that you did not configure Icinga Web 2 yet so it\'s not possible to log in without any defined '
-       . 'authentication method. Please define a authentication method by following the instructions in the'
-       . ' %1$sdocumentation%3$s or by using our %2$sweb-based setup-wizard%3$s.'
-     ),
-     '<a href="http://docs.icinga.org/" title="Icinga Web 2 Documentation">', // TODO: Documentation link
-     '<a href="' . $this->href('setup') . '" title="Icinga Web 2 Setup-Wizard">',
-     '</a>'
-   ); ?></div>
-   <?php endif ?>
+   <div class="footer">Icinga Web 2 &copy; 2013-2015<br><a href="https://www.icinga.org"><?= $this->translate('The Icinga Project'); ?></a></div>
   </div>
  </div>
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index cfae3c478..05649881f 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -116,7 +116,7 @@
   div.config-note {
     width: 50%;
     padding: 1em;
-    margin: 5em auto 0;
+    margin: 0 auto 2.5em;
     text-align: center;
     color: white;
     background-color: @colorCritical;

From 08795e7cf4dd63cca39dc985446b29f30ea56a3e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 27 Jan 2015 13:33:52 +0100
Subject: [PATCH 0397/2920] monitoring/security: Expect restriction name in
 ListController::applyRestriction()

Before, the restriction was hard coded to 'monitoring/filter'.
This restriction will be removed because we can not use the very same filter for all views.
---
 .../controllers/ListController.php            | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index a9ccb7ee8..823cb6a4e 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -2,6 +2,7 @@
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Backend;
+use Icinga\Module\Monitoring\DataView\DataView;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
 use Icinga\Web\Url;
@@ -216,8 +217,8 @@ class Monitoring_ListController extends Controller
             'max_check_attempts'    => 'service_max_check_attempts'
         ), $this->extraColumns());
         $query = $this->backend->select()->from('serviceStatus', $columns);
-
         $this->filterQuery($query);
+
         $this->setupSortControl(array(
             'service_severity'      => $this->translate('Service Severity'),
             'service_state'         => $this->translate('Current Service State'),
@@ -661,20 +662,24 @@ class Monitoring_ListController extends Controller
         if ($sort = $this->params->get('sort')) {
             $query->order($sort, $this->params->get('dir'));
         }
-        $this->applyRestrictions($query);
         $this->handleFormatRequest($query);
         return $query;
     }
 
     /**
-     * Apply current user's `monitoring/filter' restrictions on the given data view
+     * Apply a restriction on the given data view
+     *
+     * @param   string      $restriction    The name of restriction
+     * @param   DataView    $view           The view to restrict
+     *
+     * @return  DataView    $view
      */
-    protected function applyRestrictions($query)
+    protected function applyRestriction($restriction, DataView $view)
     {
-        foreach ($this->getRestrictions('monitoring/filter') as $restriction) {
-            // TODO: $query->applyFilter(Filter::fromQueryString());
+        foreach ($this->getRestrictions($restriction) as $filter) {
+            $view->applyFilter(Filter::fromQueryString($filter));
         }
-        return $query;
+        return $view;
     }
 
     protected function extraColumns()

From 47b27fcfe44a482b334ada1a7cb6bfa8f634cc31 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 27 Jan 2015 13:34:59 +0100
Subject: [PATCH 0398/2920] setup: Look for the authentication.ini instead of
 the config.ini

The config.ini does not include any settings mandatory to operate
Icinga Web 2, but the authentication.ini does.

refs #8134
---
 library/Icinga/Application/ApplicationBootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 909431663..89bca7b97 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -407,7 +407,7 @@ abstract class ApplicationBootstrap
      */
     protected function loadSetupModuleIfNecessary()
     {
-        if (! @file_exists($this->config->resolvePath('config.ini'))) {
+        if (! @file_exists($this->config->resolvePath('authentication.ini'))) {
             $this->requiresSetup = true;
             $this->moduleManager->loadModule('setup');
         } elseif ($this->setupTokenExists()) {

From 405e18a46f23634dd2e8ec77212955ebc7f02528 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 27 Jan 2015 13:37:28 +0100
Subject: [PATCH 0399/2920] monitoring: Fix PHPDoc for
 MonitoringBackend::from()

---
 .../library/Monitoring/Backend/MonitoringBackend.php          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
index c8f75f540..d165f1252 100644
--- a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
@@ -145,7 +145,7 @@ class MonitoringBackend implements Selectable, Queryable, ConnectionInterface
                 $this->type = lcfirst(substr($class, 0, -7));
             } else {
                 throw new ProgrammingError(
-                    '%s is not a valid monitoring backend class name', 
+                    '%s is not a valid monitoring backend class name',
                     $class
                 );
             }
@@ -251,7 +251,7 @@ class MonitoringBackend implements Selectable, Queryable, ConnectionInterface
      * @param   string  $name
      * @param   array   $columns
      *
-     * @return  DataView
+     * @return  \Icinga\Module\Monitoring\DataView\DataView
      */
     public function from($name, array $columns = null)
     {

From d99d147901901f5fd266a7f19c34312e40a09762 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 27 Jan 2015 13:45:13 +0100
Subject: [PATCH 0400/2920] Fix usages of AutoLoginBackend

refs #8274
---
 application/controllers/AuthenticationController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index 2d7926819..77925bd8c 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -8,7 +8,7 @@ use Icinga\Application\Config;
 use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
 use Icinga\Authentication\AuthChain;
-use Icinga\Authentication\Backend\AutoLoginBackend;
+use Icinga\Authentication\Backend\ExternalBackend;
 use Icinga\Exception\AuthenticationException;
 use Icinga\Exception\ConfigurationError;
 use Icinga\Exception\NotReadableError;
@@ -82,7 +82,7 @@ class AuthenticationController extends ActionController
                 }
 
                 foreach ($chain as $backend) {
-                    if ($backend instanceof AutoLoginBackend) {
+                    if ($backend instanceof ExternalBackend) {
                         continue;
                     }
                     ++$backendsTried;
@@ -126,7 +126,7 @@ class AuthenticationController extends ActionController
             } elseif ($request->isGet()) {
                 $user = new User('');
                 foreach ($chain as $backend) {
-                    if ($backend instanceof AutoLoginBackend) {
+                    if ($backend instanceof ExternalBackend) {
                         $authenticated  = $backend->authenticate($user);
                         if ($authenticated === true) {
                             $auth->setAuthenticated($user);

From f8aa9eb05c5693cddd726eac8bb97abb98a29464 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 27 Jan 2015 13:48:33 +0100
Subject: [PATCH 0401/2920] monitoring/security: Replace 'monitoring/filter'
 restrictions with filter for the hosts and the services view

---
 modules/monitoring/configuration.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index 6b1fe1cda..72df4e73f 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -56,8 +56,13 @@ $this->providePermission(
 );
 
 $this->provideRestriction(
-    'monitoring/filter',
-    $this->translate('Restrict views to the hosts and services that match the filter')
+    'monitoring/hosts/filter',
+    $this->translate('Restrict hosts view to the hosts that match the filter')
+);
+
+$this->provideRestriction(
+    'monitoring/services/filter',
+    $this->translate('Restrict services view to the services that match the filter')
 );
 
 $this->provideConfigTab('backends', array(

From c8084dde923bb6e0c66874004307130078c8bc37 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 27 Jan 2015 13:49:51 +0100
Subject: [PATCH 0402/2920] monitoring/security: Apply services restriction in
 the services overview

---
 modules/monitoring/application/controllers/ListController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 823cb6a4e..bd7c66e1b 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -217,8 +217,11 @@ class Monitoring_ListController extends Controller
             'max_check_attempts'    => 'service_max_check_attempts'
         ), $this->extraColumns());
         $query = $this->backend->select()->from('serviceStatus', $columns);
+
         $this->filterQuery($query);
 
+        $this->applyRestriction('monitoring/services/filter', $query);
+
         $this->setupSortControl(array(
             'service_severity'      => $this->translate('Service Severity'),
             'service_state'         => $this->translate('Current Service State'),

From f37cd0cb95a28f8b1d5f424c74abf8438e64a853 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 27 Jan 2015 13:51:15 +0100
Subject: [PATCH 0403/2920] monitoring/security: Apply hosts restriction in the
 hosts overview

---
 modules/monitoring/application/controllers/ListController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index bd7c66e1b..cd9e8077a 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -132,6 +132,8 @@ class Monitoring_ListController extends Controller
 
         $this->filterQuery($query);
 
+        $this->applyRestriction('monitoring/hosts/filter', $query);
+
         $this->setupSortControl(array(
             'host_severity'     => $this->translate('Severity'),
             'host_state'        => $this->translate('Current State'),

From 4a245ed8e09d211bc948d2e1622ce58c86ff902a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 27 Jan 2015 13:58:55 +0100
Subject: [PATCH 0404/2920] login: Wrap the config warning in paragraph tags
 instead of div

---
 application/views/scripts/authentication/login.phtml |  4 ++--
 public/css/icinga/login.less                         | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index f05e51e43..f372b6657 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -6,7 +6,7 @@
   </div>
   <div class="form" data-base-target="layout">
     <?php if ($requiresSetup): ?>
-    <div class="config-note"><?= sprintf(
+    <p class="config-note"><?= sprintf(
       $this->translate(
         'It appears that you did not configure Icinga Web 2 yet so it\'s not possible to log in without any defined '
         . 'authentication method. Please define a authentication method by following the instructions in the'
@@ -15,7 +15,7 @@
       '<a href="http://docs.icinga.org/" title="' . $this->translate('Icinga Web 2 Documentation') . '">', // TODO: More exact documentation link..
       '<a href="' . $this->href('setup') . '" title="' . $this->translate('Icinga Web 2 Setup-Wizard') . '">',
       '</a>'
-    ); ?></div>
+    ); ?></p>
     <?php endif ?>
     <h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1>
    <?php
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index 05649881f..a11d362d7 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -113,18 +113,18 @@
     margin-left: 5em;
   }
 
-  div.config-note {
+  p.config-note {
     width: 50%;
     padding: 1em;
     margin: 0 auto 2.5em;
     text-align: center;
     color: white;
     background-color: @colorCritical;
-  }
 
-  div.config-note a {
-    color: white;
-    font-weight: bold;
+    a {
+      color: white;
+      font-weight: bold;
+    }
   }
 }
 

From 23c36898dae578ea878cbd14216de058bf60c528 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 27 Jan 2015 14:05:41 +0100
Subject: [PATCH 0405/2920] Rename css class "info" to "info-box" and add it as
 generic box

refs #8274
---
 modules/setup/application/forms/AuthenticationPage.php |  2 +-
 public/css/icinga/main-content.less                    |  6 ++++++
 public/css/icinga/setup.less                           | 10 ++--------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
index 1377ce230..fdc076e60 100644
--- a/modules/setup/application/forms/AuthenticationPage.php
+++ b/modules/setup/application/forms/AuthenticationPage.php
@@ -55,7 +55,7 @@ class AuthenticationPage extends Form
                         'ViewHelper',
                         array(
                             'HtmlTag',
-                            array('tag' => 'p', 'class' => 'icon-info info')
+                            array('tag' => 'p', 'class' => 'icon-info info-box')
                         )
                     )
                 )
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 5b142184d..e3e31b397 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -203,3 +203,9 @@ table.benchmark {
 [class^="icon-"]:before, [class*=" icon-"]:before {
     text-decoration: none;
 }
+
+.info-box {
+  padding: 0.5em;
+  border: 1px solid lightgrey;
+  background-color: infobackground;
+}
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index 2c86a985a..9dff6fecf 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -220,14 +220,8 @@
   }
 }
 
-#setup_authentication_type p.info {
-  padding: 0.5em;
-  border: 1px solid lightgrey;
-  background-color: infobackground;
-
-  em {
-    text-decoration: underline;
-  }
+#setup_authentication_type p.info-box em {
+  text-decoration: underline;
 }
 
 #setup_ldap_discovery_confirm table {

From 3cbafe16f6923cf28550aa52677698951aafd3a3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 27 Jan 2015 14:22:37 +0100
Subject: [PATCH 0406/2920] monitoring/security: Move applyRestriction() to the
 module's base controller

---
 .../controllers/ListController.php            | 17 ----------------
 .../library/Monitoring/Controller.php         | 20 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index cd9e8077a..faaea713a 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -2,7 +2,6 @@
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Backend;
-use Icinga\Module\Monitoring\DataView\DataView;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
 use Icinga\Web\Url;
@@ -671,22 +670,6 @@ class Monitoring_ListController extends Controller
         return $query;
     }
 
-    /**
-     * Apply a restriction on the given data view
-     *
-     * @param   string      $restriction    The name of restriction
-     * @param   DataView    $view           The view to restrict
-     *
-     * @return  DataView    $view
-     */
-    protected function applyRestriction($restriction, DataView $view)
-    {
-        foreach ($this->getRestrictions($restriction) as $filter) {
-            $view->applyFilter(Filter::fromQueryString($filter));
-        }
-        return $view;
-    }
-
     protected function extraColumns()
     {
         $columns = preg_split(
diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php
index 32bafb8b2..de9ea8161 100644
--- a/modules/monitoring/library/Monitoring/Controller.php
+++ b/modules/monitoring/library/Monitoring/Controller.php
@@ -4,9 +4,11 @@
 
 namespace Icinga\Module\Monitoring;
 
+use Icinga\Data\Filter\Filter;
+use Icinga\File\Csv;
+use Icinga\Module\Monitoring\DataView\DataView;
 use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Web\Url;
-use Icinga\File\Csv;
 
 /**
  * Base class for all monitoring action controller
@@ -60,5 +62,21 @@ class Controller extends ModuleActionController
             exit;
         }
     }
+
+    /**
+     * Apply a restriction on the given data view
+     *
+     * @param   string      $restriction    The name of restriction
+     * @param   DataView    $view           The view to restrict
+     *
+     * @return  DataView    $view
+     */
+    protected function applyRestriction($restriction, DataView $view)
+    {
+        foreach ($this->getRestrictions($restriction) as $filter) {
+            $view->applyFilter(Filter::fromQueryString($filter));
+        }
+        return $view;
+    }
 }
 

From b2f93abb120bf6802edecdd0f02a977d1e27a94a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 27 Jan 2015 14:24:56 +0100
Subject: [PATCH 0407/2920] monitoring/security: Require a Filterable instead
 of a DataView in applyRestriction()

---
 modules/monitoring/library/Monitoring/Controller.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php
index de9ea8161..f294e9a2e 100644
--- a/modules/monitoring/library/Monitoring/Controller.php
+++ b/modules/monitoring/library/Monitoring/Controller.php
@@ -5,8 +5,8 @@
 namespace Icinga\Module\Monitoring;
 
 use Icinga\Data\Filter\Filter;
+use Icinga\Data\Filterable;
 use Icinga\File\Csv;
-use Icinga\Module\Monitoring\DataView\DataView;
 use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Web\Url;
 
@@ -67,11 +67,11 @@ class Controller extends ModuleActionController
      * Apply a restriction on the given data view
      *
      * @param   string      $restriction    The name of restriction
-     * @param   DataView    $view           The view to restrict
+     * @param   Filterable  $filterable     The filterable to restrict
      *
-     * @return  DataView    $view
+     * @return  Filterable  The filterable
      */
-    protected function applyRestriction($restriction, DataView $view)
+    protected function applyRestriction($restriction, Filterable $view)
     {
         foreach ($this->getRestrictions($restriction) as $filter) {
             $view->applyFilter(Filter::fromQueryString($filter));

From 7ad44b8411b5bffc038d4e019263bd7fcc07ac85 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 27 Jan 2015 14:26:06 +0100
Subject: [PATCH 0408/2920] login: Show a note if the only active external auth
 backend is not available

refs #8274
---
 application/controllers/AuthenticationController.php | 5 +++++
 application/views/scripts/authentication/login.phtml | 9 +++++++++
 public/css/icinga/login.less                         | 9 +++++++++
 3 files changed, 23 insertions(+)

diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index 77925bd8c..4e70894a1 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -39,6 +39,7 @@ class AuthenticationController extends ActionController
             $this->redirectNow(Url::fromPath('setup'));
         }
 
+        $triedOnlyExternalAuth = null;
         $auth = $this->Auth();
         $this->view->form = $form = new LoginForm();
         $this->view->title = $this->translate('Icingaweb Login');
@@ -126,6 +127,7 @@ class AuthenticationController extends ActionController
             } elseif ($request->isGet()) {
                 $user = new User('');
                 foreach ($chain as $backend) {
+                    $triedOnlyExternalAuth = $triedOnlyExternalAuth === null;
                     if ($backend instanceof ExternalBackend) {
                         $authenticated  = $backend->authenticate($user);
                         if ($authenticated === true) {
@@ -134,6 +136,8 @@ class AuthenticationController extends ActionController
                                 Url::fromPath(Url::fromRequest()->getParam('redirect', 'dashboard'))
                             );
                         }
+                    } else {
+                        $triedOnlyExternalAuth = false;
                     }
                 }
             }
@@ -141,6 +145,7 @@ class AuthenticationController extends ActionController
             $this->view->errorInfo = $e->getMessage();
         }
 
+        $this->view->requiresExternalAuth = $triedOnlyExternalAuth && !$auth->isAuthenticated();
         $this->view->requiresSetup = Icinga::app()->requiresSetup();
     }
 
diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index f372b6657..5f99aff17 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -16,6 +16,15 @@
       '<a href="' . $this->href('setup') . '" title="' . $this->translate('Icinga Web 2 Setup-Wizard') . '">',
       '</a>'
     ); ?></p>
+    <?php elseif ($requiresExternalAuth): ?>
+    <p class="icon-info info-box"><?= sprintf(
+      $this->translate(
+        'You\'re currently not authenticated using any of the web server\'s authentication mechanisms.'
+          . ' Make sure you\'ll configure such either by using the %s or by setting it up manually,'
+          . ' otherwise you\'ll not be able to login.'
+      ),
+      '<em title="icingacli help users">IcingaCLI</em>'
+    ); ?></p>
     <?php endif ?>
     <h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1>
    <?php
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index a11d362d7..223a388d2 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -126,6 +126,15 @@
       font-weight: bold;
     }
   }
+
+  p.info-box {
+    width: 50%;
+    margin: 0 auto 2.5em;
+
+    em {
+      text-decoration: underline;
+    }
+  }
 }
 
   /* make keyframes that tell the start state and the end state of our object */

From c53b1d27e9ec6c25b9719a9aa8842cb2b55ae3af Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 27 Jan 2015 14:33:46 +0100
Subject: [PATCH 0409/2920] lib: Deprecate Data\Filterable because of ...

addFilter and applyFilter do the same in all usages.
addFilter could be replaced w/ getFilter()->add().
We must no require classes implementing this interface to implement redundant methods over and over again.
The interface must be moved to the namespace Icinga\Data\Filter.
It lacks documentation.
---
 library/Icinga/Data/Filterable.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/library/Icinga/Data/Filterable.php b/library/Icinga/Data/Filterable.php
index 73ce5dcb4..25d1fc9f5 100644
--- a/library/Icinga/Data/Filterable.php
+++ b/library/Icinga/Data/Filterable.php
@@ -8,6 +8,11 @@ use Icinga\Data\Filter\Filter;
 
 /**
  * Interface for filtering a result set
+ *
+ * @deprecated(EL): addFilter and applyFilter do the same in all usages.
+ * addFilter could be replaced w/ getFilter()->add(). We must no require classes implementing this interface to
+ * implement redundant methods over and over again. This interface must be moved to the namespace Icinga\Data\Filter.
+ * It lacks documentation.
  */
 interface Filterable
 {

From e086905384837e49e772fc893451ad0c5a3cb0ce Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 27 Jan 2015 14:52:13 +0100
Subject: [PATCH 0410/2920] monitoring: Deprecate DataView::addFilter() and
 DataView::setFilter()

The from now on deprecated interface Filterable has proven that it sucks in the DataView.
Because of requiring us to implement trillion stupid methods, only DataView::applyFilter()
does not forget to handle column validation. Thus only DataView::applyFilter() must be used in order
to apply filters.
For setFilter() a wrapping Filter::matchAny() for the IdoQuery (or the DbQuery or the SimpleQuery I didn't have a look)
is required for the filter to work properly.
The deprecation is just for the records. I guess we do not use the other methods.
---
 .../monitoring/library/Monitoring/DataView/DataView.php  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 5900df737..da48f31c3 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -355,12 +355,21 @@ abstract class DataView implements Browsable, Countable, Filterable, Sortable
         return $this;
     }
 
+    /**
+     * @deprecated(EL): Only use DataView::applyFilter() for applying filter because all other functions are missing
+     * column validation. Filter::matchAny() for the IdoQuery (or the DbQuery or the SimpleQuery I didn't have a look)
+     * is required for the filter to work properly.
+     */
     public function setFilter(Filter $filter)
     {
         $this->query->setFilter($filter);
         return $this;
     }
 
+    /**
+     * @deprecated(EL): Only use DataView::applyFilter() for applying filter because all other functions are missing
+     * column validation.
+     */
     public function addFilter(Filter $filter)
     {
         $this->query->addFilter(clone($filter));

From 7bf6bd39e9d2a21e25dfd04efc095ebe6f95eeb3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 27 Jan 2015 14:54:21 +0100
Subject: [PATCH 0411/2920] monitoring: Implement Filterable in MonitoredObject

---
 .../Monitoring/Object/MonitoredObject.php     | 42 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 8d3246aab..213cf47b8 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -7,13 +7,15 @@ namespace Icinga\Module\Monitoring\Object;
 use InvalidArgumentException;
 use Icinga\Application\Config;
 use Icinga\Exception\InvalidPropertyException;
+use Icinga\Data\Filter\Filter;
+use Icinga\Data\Filterable;
 use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 use Icinga\Web\UrlParams;
 
 /**
  * A monitored Icinga object, i.e. host or service
  */
-abstract class MonitoredObject
+abstract class MonitoredObject implements Filterable
 {
     /**
      * Type host
@@ -116,6 +118,13 @@ abstract class MonitoredObject
      */
     protected $stats;
 
+    /**
+     * Filter
+     *
+     * @type Filter
+     */
+    protected $filter;
+
     /**
      * Create a monitored object, i.e. host or service
      *
@@ -133,6 +142,35 @@ abstract class MonitoredObject
      */
     abstract protected function getDataView();
 
+    public function applyFilter(Filter $filter)
+    {
+        $this->getFilter()->addFilter($filter);
+        return $this;
+    }
+
+    public function setFilter(Filter $filter)
+    {
+        // Left out on purpose. Interface is deprecated.
+    }
+
+    public function getFilter()
+    {
+        if ($this->filter === null) {
+            $this->filter = Filter::matchAny();
+        }
+        return $this->filter;
+    }
+
+    public function addFilter(Filter $filter)
+    {
+        // Left out on purpose. Interface is deprecated.
+    }
+
+    public function where($condition, $value = null)
+    {
+        // Left out on purpose. Interface is deprecated.
+    }
+
     /**
      * Fetch the object's properties
      *
@@ -140,7 +178,7 @@ abstract class MonitoredObject
      */
     public function fetch()
     {
-        $this->properties = $this->getDataView()->getQuery()->fetchRow();
+        $this->properties = $this->getDataView()->applyFilter($this->getFilter())->getQuery()->fetchRow();
         if ($this->properties === false) {
             return false;
         }

From 49d4d74dbbefe25434621b716c46c443d292e62d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 27 Jan 2015 14:57:22 +0100
Subject: [PATCH 0412/2920] monitoring/security: Apply hosts/filter restriction
 in the host detail view

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

diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index d01335734..3a5038ad6 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -26,6 +26,9 @@ class Monitoring_HostController extends MonitoredObjectController
     public function init()
     {
         $host = new Host($this->backend, $this->params->get('host'));
+
+        $this->applyRestriction('monitoring/hosts/filter', $host);
+
         if ($host->fetch() === false) {
             throw new Zend_Controller_Action_Exception($this->translate('Host not found'));
         }

From 49b82af70407c3cfafdc088556237423a3d98223 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 27 Jan 2015 14:57:54 +0100
Subject: [PATCH 0413/2920] monitoring/security: Apply services/filter
 restriction in the service detail view

---
 .../monitoring/application/controllers/ServiceController.php   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index c05683400..fe4795fb1 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -26,6 +26,9 @@ class Monitoring_ServiceController extends MonitoredObjectController
     public function init()
     {
         $service = new Service($this->backend, $this->params->get('host'), $this->params->get('service'));
+
+        $this->applyRestriction('monitoring/services/filter', $service);
+
         if ($service->fetch() === false) {
             throw new Zend_Controller_Action_Exception($this->translate('Service not found'));
         }

From 6fde4eec30054afa6f8580a864a3bf80ee1a0e44 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 28 Jan 2015 12:50:29 +0100
Subject: [PATCH 0414/2920] Show all tabs except "Add to Dashboard" when
 issuing a command

refs #8279
---
 library/Icinga/Web/Widget/Tabs.php            | 19 +++++++++++++++++++
 .../controllers/HostController.php            |  8 --------
 .../controllers/ServiceController.php         |  8 --------
 .../views/scripts/partials/command-form.phtml |  2 +-
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index 72522282e..c6a4bd31b 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -218,6 +218,25 @@ EOT;
         return $this;
     }
 
+    /**
+     * Remove a tab
+     *
+     * @param   string  $name
+     *
+     * @return  self
+     */
+    public function remove($name)
+    {
+        if ($this->has($name)) {
+            unset($this->tabs[$name]);
+            if (($dropdownIndex = array_search($name, $this->dropdownTabs)) !== false) {
+                array_splice($this->dropdownTabs, $dropdownIndex, 2);
+            }
+        }
+
+        return $this;
+    }
+
     /**
      * Add a tab to the dropdown on the right side of the tab-bar.
      *
diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index 3a5038ad6..4eccb8899 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -34,15 +34,7 @@ class Monitoring_HostController extends MonitoredObjectController
         }
         $this->object = $host;
         $this->createTabs();
-    }
-
-    /**
-     * Show a host
-     */
-    public function showAction()
-    {
         $this->getTabs()->activate('host');
-        parent::showAction();
     }
 
     /**
diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index fe4795fb1..4e4e67402 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -34,15 +34,7 @@ class Monitoring_ServiceController extends MonitoredObjectController
         }
         $this->object = $service;
         $this->createTabs();
-    }
-
-    /**
-     * Show a service
-     */
-    public function showAction()
-    {
         $this->getTabs()->activate('service');
-        parent::showAction();
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/partials/command-form.phtml b/modules/monitoring/application/views/scripts/partials/command-form.phtml
index 9832bfe17..380687a00 100644
--- a/modules/monitoring/application/views/scripts/partials/command-form.phtml
+++ b/modules/monitoring/application/views/scripts/partials/command-form.phtml
@@ -1,5 +1,5 @@
 <div class="controls">
-    <?= $this->tabs->showOnlyCloseButton() ?>
+    <?= $this->tabs->remove('dashboard') ?>
 </div>
 <div class="content">
     <h1><?= $title ?> <?= /** @var \Icinga\Module\Monitoring\Forms\Command\CommandForm $form */ $this->icon('help', $form->getHelp()) ?></h1>

From c19ff289bfcf52cdedc8a97b8fbc1cbc78a5346f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 28 Jan 2015 13:02:37 +0100
Subject: [PATCH 0415/2920] Open command forms in the same column where their
 link is located

refs #8279
---
 .../views/scripts/show/components/acknowledgement.phtml         | 2 +-
 .../views/scripts/show/components/checkstatistics.phtml         | 2 +-
 .../application/views/scripts/show/components/command.phtml     | 2 +-
 .../application/views/scripts/show/components/comments.phtml    | 2 +-
 .../application/views/scripts/show/components/downtime.phtml    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index 339652113..8da35590f 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -35,7 +35,7 @@ if ($object->acknowledged): ?>
                     );
                 }
             ?>
-            <a href="<?= $ackLink ?>">
+            <a href="<?= $ackLink ?>" data-base-target="_self">
                 <?= $this->icon('ok') ?> <?= $this->translate('Acknowledge') ?>
             </a>
             <?php } else {
diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index 9a6f24efc..ec0c2792a 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -39,7 +39,7 @@ if ($object->getType() === $object::TYPE_HOST) {
               );
           }
       ?>
-      <a href="<?= $reschedule ?>">
+      <a href="<?= $reschedule ?>" data-base-target="_self">
           <?= $this->icon('reschedule') ?>
           <?= $this->translate('Reschedule') ?>
       </a>
diff --git a/modules/monitoring/application/views/scripts/show/components/command.phtml b/modules/monitoring/application/views/scripts/show/components/command.phtml
index 5239dad41..a74b5b884 100644
--- a/modules/monitoring/application/views/scripts/show/components/command.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/command.phtml
@@ -21,7 +21,7 @@ $command = array_shift($parts);
                     array('host' => $object->getHost()->getName(), 'service' => $object->getName())
                 );
             } ?>
-            <a href="<?= $processCheckResult ?>">
+            <a href="<?= $processCheckResult ?>" data-base-target="_self">
                 <?= $this->icon('reply') ?>
                 <?= $this->translate('Process check result') ?>
             </a>
diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index dde42c747..a6503a70b 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -15,7 +15,7 @@
                 );
             }
         ?>
-        <a href="<?= $addCommentLink ?>">
+        <a href="<?= $addCommentLink ?>" data-base-target="_self">
             <?= $this->icon('comment') ?>
             <?= $this->translate('Add comment') ?>
         </a>
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 8f42a865e..4aa1e21c1 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -15,7 +15,7 @@
                 );
             }
         ?>
-        <a href="<?= $scheduleDowntimeLink ?>">
+        <a href="<?= $scheduleDowntimeLink ?>" data-base-target="_self">
             <?= $this->icon('plug') ?>
             <?= $this->translate('Schedule downtime') ?>
         </a>

From 7ef86ddf49cd1adba53c4a4c488b1d9c3ccb638c Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Wed, 28 Jan 2015 13:19:49 +0100
Subject: [PATCH 0416/2920] Navigation: Bypass error-prone hover selector for
 IE8

refs #6417
---
 public/js/icinga/behavior/navigation.js | 39 +++++++++++++++----------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/public/js/icinga/behavior/navigation.js b/public/js/icinga/behavior/navigation.js
index 53fc5c8af..b8a12064d 100644
--- a/public/js/icinga/behavior/navigation.js
+++ b/public/js/icinga/behavior/navigation.js
@@ -130,23 +130,26 @@
         }
 
         setTimeout(function () {
-            if (! $li.is('li:hover')) {
-                return;
-            }
-            if ($li.hasClass('active')) {
-                return;
-            }
+            try {
+                if (!$li.is('li:hover')) {
+                    return;
+                }
+                if ($li.hasClass('active')) {
+                    return;
+                }
+            } catch(e) { /* Bypass because if IE8 */ }
 
             $li.siblings().each(function () {
                 var $sibling = $(this);
-                if ($sibling.is('li:hover')) {
-                    return;
-                }
+                try {
+                    if ($sibling.is('li:hover')) {
+                        return;
+                    }
+                } catch(e) { /* Bypass because if IE8 */ };
                 if ($sibling.hasClass('hover')) {
                     $sibling.removeClass('hover');
                 }
             });
-
             self.hoverElement($li);
         }, delay);
     };
@@ -161,9 +164,11 @@
         }
 
         setTimeout(function () {
-            if ($li.is('li:hover') || $sidebar.is('sidebar:hover') ) {
-                return;
-            }
+            try {
+                if ($li.is('li:hover') || $sidebar.is('sidebar:hover')) {
+                    return;
+                }
+            } catch(e) { /* Bypass because if IE8 */ };
             $li.removeClass('hover');
             $('#layout').removeClass('hoveredmenu');
         }, 500);
@@ -183,9 +188,11 @@
             self = event.data.self;
         setTimeout(function () {
             // TODO: make this behave well together with keyboard navigation
-            if (! $li.is('li:hover') /*&& ! $li.find('a:focus')*/) {
-                $li.removeClass('hover');
-            }
+            try {
+                if (!$li.is('li:hover') /*&& ! $li.find('a:focus')*/) {
+                    $li.removeClass('hover');
+                }
+            } catch(e) { /* Bypass because if IE8 */ }
         }, 300);
     };
     Icinga.Behaviors.Navigation = Navigation;

From cf857c42571071ca760f8e66598dc5910de3b991 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 28 Jan 2015 14:15:16 +0100
Subject: [PATCH 0417/2920] Close forms when switching between the main app's
 configuration tabs

refs #6436
---
 application/views/scripts/config/authentication/reorder.phtml | 2 +-
 application/views/scripts/config/index.phtml                  | 2 +-
 application/views/scripts/config/resource.phtml               | 2 +-
 application/views/scripts/roles/index.phtml                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/authentication/reorder.phtml
index 688d99f88..807f80efe 100644
--- a/application/views/scripts/config/authentication/reorder.phtml
+++ b/application/views/scripts/config/authentication/reorder.phtml
@@ -1,4 +1,4 @@
-<div class="controls">
+<div class="controls" data-base-target="_main">
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">
diff --git a/application/views/scripts/config/index.phtml b/application/views/scripts/config/index.phtml
index dab0acc4f..1ffd120b4 100644
--- a/application/views/scripts/config/index.phtml
+++ b/application/views/scripts/config/index.phtml
@@ -1,4 +1,4 @@
-<div class="controls">
+<div class="controls" data-base-target="_main">
 <?= $this->tabs->render($this); ?>
 </div>
 
diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index c5d4ca0fc..f93b2af82 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -1,4 +1,4 @@
-<div class="controls">
+<div class="controls" data-base-target="_main">
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">
diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml
index 79eda5dac..925cdfa4e 100644
--- a/application/views/scripts/roles/index.phtml
+++ b/application/views/scripts/roles/index.phtml
@@ -1,4 +1,4 @@
-<div class="controls">
+<div class="controls" data-base-target="_main">
     <?= $tabs ?>
     <h1><?= $this->translate('Roles') ?></h1>
 </div>

From 618ab4f4b9cdc3975cc096eaabfe04da70244fb0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 28 Jan 2015 14:21:06 +0100
Subject: [PATCH 0418/2920] Introduce link target "_right" to keep a column
 with tabs rightmost

I'd have liked to get it to work that in case the tab control is not in the
rightmost column a "go back" in the history is being simulated causing
the preceding leftmost column(s) to be restored and the rightmost one
set to the one containing the tab control. But the history api does not
seem to support any read operations except for the current state..

refs #6436
---
 application/views/scripts/config/module.phtml          |  2 +-
 .../application/views/scripts/config/index.phtml       |  2 +-
 .../application/views/scripts/config/security.phtml    |  2 +-
 public/js/icinga/events.js                             | 10 ++++++++++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/application/views/scripts/config/module.phtml b/application/views/scripts/config/module.phtml
index cd6ad5af8..e26ade195 100644
--- a/application/views/scripts/config/module.phtml
+++ b/application/views/scripts/config/module.phtml
@@ -1,4 +1,4 @@
-<div class="controls">
+<div class="controls" data-base-target="_right">
 <?= $this->tabs ?>
 <h1><?= $this->escape($module->getTitle()) ?></h1>
 </div>
diff --git a/modules/monitoring/application/views/scripts/config/index.phtml b/modules/monitoring/application/views/scripts/config/index.phtml
index b1729f9b1..deca8d468 100644
--- a/modules/monitoring/application/views/scripts/config/index.phtml
+++ b/modules/monitoring/application/views/scripts/config/index.phtml
@@ -1,4 +1,4 @@
-<div class="controls">
+<div class="controls" data-base-target="_right">
   <?= $tabs; ?>
   <h1><?= $this->translate('Monitoring Backends') ?></h1>
 </div>
diff --git a/modules/monitoring/application/views/scripts/config/security.phtml b/modules/monitoring/application/views/scripts/config/security.phtml
index 71f2a341a..2a84b2469 100644
--- a/modules/monitoring/application/views/scripts/config/security.phtml
+++ b/modules/monitoring/application/views/scripts/config/security.phtml
@@ -1,4 +1,4 @@
-<div class="controls">
+<div class="controls" data-base-target="_right">
     <?= $this->tabs ?>
 </div>
 <div class="content">
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index e7ac3e3f1..b7f2f5cee 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -482,6 +482,16 @@
                     targetId = 'col1';
                     $target = $('#' + targetId);
                     self.icinga.ui.layout1col();
+                } else if (targetId === '_right') {
+                    // Ensure that the content is displayed in the rightmost column
+                    $target = $el.closest('.container');
+                    if ($target.attr('id') === 'col1') {
+                        // As it's not possible to detect what's preceding the current state in the
+                        // history stack this just simulates _main in case the respective element
+                        // is not part of the rightmost column
+                        $target = $('#col1');
+                        self.icinga.ui.layout1col();
+                    }
                 } else {
                     $target = $('#' + targetId);
                 }

From f486dabe6dea7d5b9cd5299889de582996c938ea Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 28 Jan 2015 14:22:42 +0100
Subject: [PATCH 0419/2920] Drop view script config/logging.phtml as it's not
 used anywhere

---
 .../views/scripts/config/logging.phtml        | 35 -------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 application/views/scripts/config/logging.phtml

diff --git a/application/views/scripts/config/logging.phtml b/application/views/scripts/config/logging.phtml
deleted file mode 100644
index da6d886cc..000000000
--- a/application/views/scripts/config/logging.phtml
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="controls">
-<?= $this->tabs->render($this); ?>
-</div>
-
-<div class="content">
-<?php $errors = $this->form->getErrorMessages(); ?>
-
-<?php if (isset($this->messageBox)): ?>
-  <?= $this->messageBox->render() ?>
-<?php endif ?>
-
-<?php if ($this->successMessage): ?>
-<div>
-  <i class="icinga-icon-success"></i>
-  <strong><?= $this->escape($this->successMessage); ?></strong>
-</div>
-<?php endif; ?>
-
-<?php if (!empty($errors)) : ?>
-<div>
-  <h4>Errors occured when trying to save the project.</h4>
-  <p>
-      The following errors occured when trying to save the configuration:
-  </p>
-  <ul>
-    <?php foreach($errors as $error): ?>
-    <li><?= $this->escape($error) ?></li>
-    <?php endforeach; ?>
-  </ul>
-</div>
-
-<?php endif; ?>
-<?= $this->form ?>
-</div>
-

From 78f5bf4f3d313f111ec3dbcc4745c16b8bedb819 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 28 Jan 2015 16:22:20 +0100
Subject: [PATCH 0420/2920] Phrase external auth warnings more neutral

refs #8274
---
 application/views/scripts/authentication/login.phtml | 10 +++-------
 .../setup/application/forms/AuthenticationPage.php   | 12 ++++--------
 public/css/icinga/login.less                         |  6 ++++++
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index 5f99aff17..805196b96 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -17,13 +17,9 @@
       '</a>'
     ); ?></p>
     <?php elseif ($requiresExternalAuth): ?>
-    <p class="icon-info info-box"><?= sprintf(
-      $this->translate(
-        'You\'re currently not authenticated using any of the web server\'s authentication mechanisms.'
-          . ' Make sure you\'ll configure such either by using the %s or by setting it up manually,'
-          . ' otherwise you\'ll not be able to login.'
-      ),
-      '<em title="icingacli help users">IcingaCLI</em>'
+    <p class="info-box"><span class="icon-info"></span><?= $this->translate(
+      'You\'re currently not authenticated using any of the web server\'s authentication mechanisms.'
+      . ' Make sure you\'ll configure such, otherwise you\'ll not be able to login.'
     ); ?></p>
     <?php endif ?>
     <h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1>
diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
index fdc076e60..f51ef946a 100644
--- a/modules/setup/application/forms/AuthenticationPage.php
+++ b/modules/setup/application/forms/AuthenticationPage.php
@@ -42,14 +42,10 @@ class AuthenticationPage extends Form
                 'note',
                 'external_note',
                 array(
-                    'value'         => sprintf(
-                        $this->translate(
-                            'You\'re currently not authenticated using any of the web server\'s authentication '
-                            . 'mechanisms. Make sure you\'ll configure such either by using the %s once the '
-                            . 'wizard is complete or by setting it up manually, otherwise you\'ll not be able '
-                            . 'to log into Icinga Web 2.'
-                        ),
-                        '<em title="icingacli help users">IcingaCLI</em>'
+                    'value'         => $this->translate(
+                        'You\'re currently not authenticated using any of the web server\'s authentication '
+                        . 'mechanisms. Make sure you\'ll configure such, otherwise you\'ll not be able to '
+                        . 'log into Icinga Web 2.'
                     ),
                     'decorators'    => array(
                         'ViewHelper',
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index 223a388d2..6b03b476a 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -129,8 +129,14 @@
 
   p.info-box {
     width: 50%;
+    height: 2.2em;
     margin: 0 auto 2.5em;
 
+    span.icon-info {
+      float: left;
+      height: 100%;
+    }
+
     em {
       text-decoration: underline;
     }

From 9d051905173e72790b11465009891b3ab36a51fa Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Wed, 28 Jan 2015 17:03:23 +0100
Subject: [PATCH 0421/2920] ifont: Fix empty font glyphs for IE8

The embedded font is included inline in the stylesheets. IE falls back and
tries to load one of the other font sources which was not exported by the web
server. This fix moves the fontello directory to public and add add a
prefix path to the embedded stylesheet.

refs #6417
---
 library/Icinga/Web/LessCompiler.php                 |   6 ++++--
 library/Icinga/Web/StyleSheet.php                   |   5 +++--
 .../fonts/fontello-ifont/LICENSE.txt                |   0
 .../fonts/fontello-ifont/README.txt                 |   0
 .../fonts/fontello-ifont/config.json                |   0
 .../fonts/fontello-ifont/css/animation.css          |   0
 .../fonts/fontello-ifont/css/ifont-codes.css        |   0
 .../fonts/fontello-ifont/css/ifont-embedded.less    |   6 +++---
 .../fonts/fontello-ifont/css/ifont-ie7-codes.css    |   0
 .../fonts/fontello-ifont/css/ifont-ie7.css          |   0
 .../fonts/fontello-ifont/css/ifont.css              |   0
 .../fonts/fontello-ifont/demo.html                  |   0
 .../fonts/fontello-ifont/font/ifont.eot             | Bin
 .../fonts/fontello-ifont/font/ifont.svg             |   0
 .../fonts/fontello-ifont/font/ifont.ttf             | Bin
 .../fonts/fontello-ifont/font/ifont.woff            | Bin
 public/fonts/fontello-ifont/icingaweb.md            |   6 ++++++
 17 files changed, 16 insertions(+), 7 deletions(-)
 rename {application => public}/fonts/fontello-ifont/LICENSE.txt (100%)
 rename {application => public}/fonts/fontello-ifont/README.txt (100%)
 rename {application => public}/fonts/fontello-ifont/config.json (100%)
 rename {application => public}/fonts/fontello-ifont/css/animation.css (100%)
 rename {application => public}/fonts/fontello-ifont/css/ifont-codes.css (100%)
 rename application/fonts/fontello-ifont/css/ifont-embedded.css => public/fonts/fontello-ifont/css/ifont-embedded.less (99%)
 rename {application => public}/fonts/fontello-ifont/css/ifont-ie7-codes.css (100%)
 rename {application => public}/fonts/fontello-ifont/css/ifont-ie7.css (100%)
 rename {application => public}/fonts/fontello-ifont/css/ifont.css (100%)
 rename {application => public}/fonts/fontello-ifont/demo.html (100%)
 rename {application => public}/fonts/fontello-ifont/font/ifont.eot (100%)
 rename {application => public}/fonts/fontello-ifont/font/ifont.svg (100%)
 rename {application => public}/fonts/fontello-ifont/font/ifont.ttf (100%)
 rename {application => public}/fonts/fontello-ifont/font/ifont.woff (100%)
 create mode 100644 public/fonts/fontello-ifont/icingaweb.md

diff --git a/library/Icinga/Web/LessCompiler.php b/library/Icinga/Web/LessCompiler.php
index 791fdbab0..a5349f1a4 100644
--- a/library/Icinga/Web/LessCompiler.php
+++ b/library/Icinga/Web/LessCompiler.php
@@ -38,15 +38,17 @@ class LessCompiler
 
     /**
      * Create a new instance
+     *
+     * @param   string  $basePath   Provide web base path optional
      */
-    public function __construct()
+    public function __construct($basePath = null)
     {
         require_once 'lessphp/lessc.inc.php';
         $this->lessc = new lessc();
 
         $this->lessc->setVariables(
             array(
-                'baseurl' => '\'' . Zend_Controller_Front::getInstance()->getBaseUrl(). '\''
+                'baseurl' => '\'' . $basePath. '\''
             )
         );
     }
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index 719d1c829..52bc4b27b 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -11,7 +11,7 @@ use Icinga\Web\LessCompiler;
 class StyleSheet
 {
     protected static $lessFiles = array(
-        '../application/fonts/fontello-ifont/css/ifont-embedded.css',
+        'fonts/fontello-ifont/css/ifont-embedded.less',
         'css/vendor/tipsy.css',
         'css/icinga/defaults.less',
         'css/icinga/layout-colors.less',
@@ -96,7 +96,8 @@ class StyleSheet
             $cache->send($cacheFile);
             return;
         }
-        $less = new LessCompiler();
+
+        $less = new LessCompiler(dirname($_SERVER['PHP_SELF']));
         foreach ($lessFiles as $file) {
             $less->addFile($file);
         }
diff --git a/application/fonts/fontello-ifont/LICENSE.txt b/public/fonts/fontello-ifont/LICENSE.txt
similarity index 100%
rename from application/fonts/fontello-ifont/LICENSE.txt
rename to public/fonts/fontello-ifont/LICENSE.txt
diff --git a/application/fonts/fontello-ifont/README.txt b/public/fonts/fontello-ifont/README.txt
similarity index 100%
rename from application/fonts/fontello-ifont/README.txt
rename to public/fonts/fontello-ifont/README.txt
diff --git a/application/fonts/fontello-ifont/config.json b/public/fonts/fontello-ifont/config.json
similarity index 100%
rename from application/fonts/fontello-ifont/config.json
rename to public/fonts/fontello-ifont/config.json
diff --git a/application/fonts/fontello-ifont/css/animation.css b/public/fonts/fontello-ifont/css/animation.css
similarity index 100%
rename from application/fonts/fontello-ifont/css/animation.css
rename to public/fonts/fontello-ifont/css/animation.css
diff --git a/application/fonts/fontello-ifont/css/ifont-codes.css b/public/fonts/fontello-ifont/css/ifont-codes.css
similarity index 100%
rename from application/fonts/fontello-ifont/css/ifont-codes.css
rename to public/fonts/fontello-ifont/css/ifont-codes.css
diff --git a/application/fonts/fontello-ifont/css/ifont-embedded.css b/public/fonts/fontello-ifont/css/ifont-embedded.less
similarity index 99%
rename from application/fonts/fontello-ifont/css/ifont-embedded.css
rename to public/fonts/fontello-ifont/css/ifont-embedded.less
index 92bcfdff9..294c342e3 100644
--- a/application/fonts/fontello-ifont/css/ifont-embedded.css
+++ b/public/fonts/fontello-ifont/css/ifont-embedded.less
@@ -1,8 +1,8 @@
 @font-face {
   font-family: 'ifont';
-  src: url('../font/ifont.eot?75097146');
-  src: url('../font/ifont.eot?75097146#iefix') format('embedded-opentype'),
-       url('../font/ifont.svg?75097146#ifont') format('svg');
+  src: url('@{baseurl}/fonts/fontello-ifont/font/ifont.eot?75097146');
+  src: url('@{baseurl}/fonts/fontello-ifont/font/ifont.eot?75097146#iefix') format('embedded-opentype'),
+       url('@{baseurl}/fonts/fontello-ifont/ifont.svg?75097146#ifont') format('svg');
   font-weight: normal;
   font-style: normal;
 }
diff --git a/application/fonts/fontello-ifont/css/ifont-ie7-codes.css b/public/fonts/fontello-ifont/css/ifont-ie7-codes.css
similarity index 100%
rename from application/fonts/fontello-ifont/css/ifont-ie7-codes.css
rename to public/fonts/fontello-ifont/css/ifont-ie7-codes.css
diff --git a/application/fonts/fontello-ifont/css/ifont-ie7.css b/public/fonts/fontello-ifont/css/ifont-ie7.css
similarity index 100%
rename from application/fonts/fontello-ifont/css/ifont-ie7.css
rename to public/fonts/fontello-ifont/css/ifont-ie7.css
diff --git a/application/fonts/fontello-ifont/css/ifont.css b/public/fonts/fontello-ifont/css/ifont.css
similarity index 100%
rename from application/fonts/fontello-ifont/css/ifont.css
rename to public/fonts/fontello-ifont/css/ifont.css
diff --git a/application/fonts/fontello-ifont/demo.html b/public/fonts/fontello-ifont/demo.html
similarity index 100%
rename from application/fonts/fontello-ifont/demo.html
rename to public/fonts/fontello-ifont/demo.html
diff --git a/application/fonts/fontello-ifont/font/ifont.eot b/public/fonts/fontello-ifont/font/ifont.eot
similarity index 100%
rename from application/fonts/fontello-ifont/font/ifont.eot
rename to public/fonts/fontello-ifont/font/ifont.eot
diff --git a/application/fonts/fontello-ifont/font/ifont.svg b/public/fonts/fontello-ifont/font/ifont.svg
similarity index 100%
rename from application/fonts/fontello-ifont/font/ifont.svg
rename to public/fonts/fontello-ifont/font/ifont.svg
diff --git a/application/fonts/fontello-ifont/font/ifont.ttf b/public/fonts/fontello-ifont/font/ifont.ttf
similarity index 100%
rename from application/fonts/fontello-ifont/font/ifont.ttf
rename to public/fonts/fontello-ifont/font/ifont.ttf
diff --git a/application/fonts/fontello-ifont/font/ifont.woff b/public/fonts/fontello-ifont/font/ifont.woff
similarity index 100%
rename from application/fonts/fontello-ifont/font/ifont.woff
rename to public/fonts/fontello-ifont/font/ifont.woff
diff --git a/public/fonts/fontello-ifont/icingaweb.md b/public/fonts/fontello-ifont/icingaweb.md
new file mode 100644
index 000000000..fa0a52c7d
--- /dev/null
+++ b/public/fonts/fontello-ifont/icingaweb.md
@@ -0,0 +1,6 @@
+# fontello-ifont has been moved
+
+The font directory has been moved to the public structure because of Internet Explorer version 8 compatibility. The
+common way for browsers is to include the binary embeded font type in the javascript. IE8 falls back and include one of
+the provided font sources. Therefore it is important to have the font files available public and exported by the
+HTTP server.
\ No newline at end of file

From 8383320f319ddea9a3bd0e730c13eb0c8c96d7be Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 28 Jan 2015 17:52:17 +0100
Subject: [PATCH 0422/2920] Update documentation covering external
 authentication

refs #8274
---
 doc/external_authentication.md | 125 ++++++++++++++++-----------------
 1 file changed, 59 insertions(+), 66 deletions(-)

diff --git a/doc/external_authentication.md b/doc/external_authentication.md
index 240713038..15df1e1cf 100644
--- a/doc/external_authentication.md
+++ b/doc/external_authentication.md
@@ -1,90 +1,83 @@
-# Externel Authentication
+# External Authentication
 
-It is possible to use the authentication mechanism of the webserver, 
-instead of using the internal authentication-manager to
-authenticate users. This might be useful if you only have very few users, and
-user management over *.htaccess* is sufficient, or if you must use some other
-authentication mechanism that is only available through your webserver.
+It is possible to utilize the authentication mechanism of the webserver instead
+of the internal authentication of Icinga Web 2 to authenticate users. This might
+be useful if you only have very few users and user management over **.htaccess**
+is not sufficient or if you are required to use some other authentication
+mechanism that is only available by utilizing the webserver.
 
-When external authentication is used, Icingaweb will entrust the 
-complete authentication process to the external authentication provider (the webserver):
-The provider should take care of authenticating the user and declining
-all requests with invalid or missing credentials. When the authentication 
-was succesful, it should provide the authenticated users name to its php-module
-and Icingaweb will assume that the user is authorized to access the page.
-Because of this it is very important that the webservers authentication is
-configured correctly, as wrong configuration could lead to unauthorized
-access to the site, or a broken login-process. 
+Icinga Web 2 will entrust the complete authentication process to the
+authentication provider of the webserver, if external authentication is used.
+So it is very important that the webserver's authentication is configured
+correctly as wrong configuration might lead to unauthorized access or a
+malfunction in the login-process.
 
+## Using External Authentication
 
-## Use External Authentication
+External authentication in Icinga Web 2 requires the following preparations:
 
-Using external authentication in Icingaweb requires two steps to work:
+1. The external authentication must be set up properly to correctly
+   authenticate users
+2. Icinga Web 2 must be configured to use external authentication
 
-1. The external authentication must be set up correctly to always
-   authenticate the users.
-2. Icingaweb must be configured to use the external authentication.
+### Preparing the External Authentication Provider
 
+This step depends heavily on the used webserver and authentication mechanism you
+want to use. It is not possible to cover all possibillities and you should
+probably read the documentation for your webserver to get detailed instructions
+on how to set up authentication properly.
 
-### Prepare the External Authentication Provider
-
-This step depends heavily on the used webserver and authentication 
-mechanism you want to use. It is not possible to cover all possibillities 
-and you should probably read the documentation for your webserver for
-detailed instructions on how to set up authentication properly.
-
-In general, you need to make sure that:
-
-	- All routes require authentication
-	- Only permitted users are allowed to authenticate
+In general you need to make sure that:
 
+- All routes require authentication
+- Only permitted users are allowed to authenticate
 
 #### Example Configuration for Apache and HTTPDigestAuthentication
 
-The following example will show how to enable external authentication in Apache using
-*HTTP Digest Authentication*.
+The following example will show how to enable external authentication in Apache
+using *HTTP Digest Authentication*.
 
-##### Create users
+##### Creating users
 
-To create users for a digest authentication we can use the tool *htdigest*.
-We choose *.icingawebdigest* as a name for the created file, containing
-the user credentials.
+To create users for digest authentication you can use the tool *htdigest*. In
+this example **.icingawebdigest** is the name of the file containing the user
+credentials.
 
-This command will create a new file with the user *jdoe*. *htdigest* 
-will prompt you for your password, after it has been executed. If you 
-want to add more users to the file you need to ommit the *-c* parameter 
-in all further commands to avoInid the file to be overwritten.
+This command creates a new file with the user *jdoe*. *htdigest* will prompt
+you for a password. If you want to add more users to the file you need to omit
+the *-c* parameter in all following commands to not to overwrite the file.
 
+````
+sudo htdigest -c /etc/icingaweb2/.icingawebdigest "Icinga Web 2" jdoe
+````
 
-		sudo htdigest -c /etc/httpd/conf.d/.icingawebdigest "Icingaweb 2" jdoe
+##### Configuring the Webserver
 
+The webserver should require authentication for all public Icinga Web 2 files.
 
-##### Set up authentication
+````
+<Directory "/usr/share/icingaweb2/public">
+    AuthType digest
+    AuthName "Icinga Web 2"
+    AuthDigestProvider file
+    AuthUserFile /etc/icingaweb2/.icingawebdigest
+    Require valid-user
+</Directory>
+````
 
-The webserver should require authentication for all public icingaweb files.
+### Preparing Icinga Web 2
 
+Once external authentication is set up correctly you need to configure Icinga
+Web 2. In case you already completed the setup wizard it is likely that you are
+now finished.
 
-		<Directory "/var/www/html/icingaweb">
-			AuthType digest
-			AuthName "Icingaweb 2"
-			AuthDigestProvider file
-			AuthUserFile /etc/httpd/conf.d/.icingawebdigest
-			Require valid-user
-		</Directory>		
+To get Icinga Web 2 to use external authentication the file
+**config/authentication.ini** is required. Just add the following section
+called "autologin", or any name of your choice, and save your changes:
 
-		
-### Prepare Icingaweb
+````
+[autologin]
+backend = external
+````
 
-When the external authentication is set up correctly, we need
-to configure IcingaWeb to use it as an authentication source. The
-configuration key *authenticationMode* in the section *global* defines
-if the authentication should be handled internally or externally. Since
-we want to delegate the authentication to the Webserver we choose 
-"external" as the new value:
-
-
-		[global]
-		; ...
-		authenticationMode = "external"
-		; ...
-		
+Congratulations! You are now logged in when visiting Icinga Web 2.
\ No newline at end of file

From 400fbccbb899b922931033165bda42c0dc44fc24 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 28 Jan 2015 17:59:43 +0100
Subject: [PATCH 0423/2920] Add setup route to the installation documentation

refs #7848
---
 doc/installation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/installation.md b/doc/installation.md
index def23ffaf..170199832 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -107,4 +107,4 @@ In case you do not remember the token you can show it using the `icingacli`:
 
 **Step 5: Web Setup**
 
-Visit Icinga Web 2 in your browser and complete installation using the web setup.
+Visit Icinga Web 2 in your browser and complete installation using the web setup: /icingaweb2/setup

From c1df1f822edeedd786fcb62fd0be4238dfc600de Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 29 Jan 2015 11:25:37 +0100
Subject: [PATCH 0424/2920] ifont: Reorganize files and drop use less
 attributes

fixes #6417
---
 .../fonts/fontello-ifont/LICENSE.txt                |   0
 .../fonts/fontello-ifont/README.txt                 |   0
 .../fonts/fontello-ifont/config.json                |   0
 .../fonts/fontello-ifont/css/animation.css          |   0
 .../fonts/fontello-ifont/css/ifont-codes.css        |   0
 .../fonts/fontello-ifont/css/ifont-embedded.css     |   6 +++---
 .../fonts/fontello-ifont/css/ifont-ie7-codes.css    |   0
 .../fonts/fontello-ifont/css/ifont-ie7.css          |   0
 .../fonts/fontello-ifont/css/ifont.css              |   0
 .../fonts/fontello-ifont/demo.html                  |   0
 application/fonts/icingaweb.md                      |   9 +++++++++
 library/Icinga/Web/LessCompiler.php                 |   8 --------
 library/Icinga/Web/StyleSheet.php                   |   4 ++--
 public/{fonts/fontello-ifont => }/font/ifont.eot    | Bin
 public/{fonts/fontello-ifont => }/font/ifont.svg    |   0
 public/{fonts/fontello-ifont => }/font/ifont.ttf    | Bin
 public/{fonts/fontello-ifont => }/font/ifont.woff   | Bin
 public/fonts/fontello-ifont/icingaweb.md            |   6 ------
 18 files changed, 14 insertions(+), 19 deletions(-)
 rename {public => application}/fonts/fontello-ifont/LICENSE.txt (100%)
 rename {public => application}/fonts/fontello-ifont/README.txt (100%)
 rename {public => application}/fonts/fontello-ifont/config.json (100%)
 rename {public => application}/fonts/fontello-ifont/css/animation.css (100%)
 rename {public => application}/fonts/fontello-ifont/css/ifont-codes.css (100%)
 rename public/fonts/fontello-ifont/css/ifont-embedded.less => application/fonts/fontello-ifont/css/ifont-embedded.css (99%)
 rename {public => application}/fonts/fontello-ifont/css/ifont-ie7-codes.css (100%)
 rename {public => application}/fonts/fontello-ifont/css/ifont-ie7.css (100%)
 rename {public => application}/fonts/fontello-ifont/css/ifont.css (100%)
 rename {public => application}/fonts/fontello-ifont/demo.html (100%)
 create mode 100644 application/fonts/icingaweb.md
 rename public/{fonts/fontello-ifont => }/font/ifont.eot (100%)
 rename public/{fonts/fontello-ifont => }/font/ifont.svg (100%)
 rename public/{fonts/fontello-ifont => }/font/ifont.ttf (100%)
 rename public/{fonts/fontello-ifont => }/font/ifont.woff (100%)
 delete mode 100644 public/fonts/fontello-ifont/icingaweb.md

diff --git a/public/fonts/fontello-ifont/LICENSE.txt b/application/fonts/fontello-ifont/LICENSE.txt
similarity index 100%
rename from public/fonts/fontello-ifont/LICENSE.txt
rename to application/fonts/fontello-ifont/LICENSE.txt
diff --git a/public/fonts/fontello-ifont/README.txt b/application/fonts/fontello-ifont/README.txt
similarity index 100%
rename from public/fonts/fontello-ifont/README.txt
rename to application/fonts/fontello-ifont/README.txt
diff --git a/public/fonts/fontello-ifont/config.json b/application/fonts/fontello-ifont/config.json
similarity index 100%
rename from public/fonts/fontello-ifont/config.json
rename to application/fonts/fontello-ifont/config.json
diff --git a/public/fonts/fontello-ifont/css/animation.css b/application/fonts/fontello-ifont/css/animation.css
similarity index 100%
rename from public/fonts/fontello-ifont/css/animation.css
rename to application/fonts/fontello-ifont/css/animation.css
diff --git a/public/fonts/fontello-ifont/css/ifont-codes.css b/application/fonts/fontello-ifont/css/ifont-codes.css
similarity index 100%
rename from public/fonts/fontello-ifont/css/ifont-codes.css
rename to application/fonts/fontello-ifont/css/ifont-codes.css
diff --git a/public/fonts/fontello-ifont/css/ifont-embedded.less b/application/fonts/fontello-ifont/css/ifont-embedded.css
similarity index 99%
rename from public/fonts/fontello-ifont/css/ifont-embedded.less
rename to application/fonts/fontello-ifont/css/ifont-embedded.css
index 294c342e3..92bcfdff9 100644
--- a/public/fonts/fontello-ifont/css/ifont-embedded.less
+++ b/application/fonts/fontello-ifont/css/ifont-embedded.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: 'ifont';
-  src: url('@{baseurl}/fonts/fontello-ifont/font/ifont.eot?75097146');
-  src: url('@{baseurl}/fonts/fontello-ifont/font/ifont.eot?75097146#iefix') format('embedded-opentype'),
-       url('@{baseurl}/fonts/fontello-ifont/ifont.svg?75097146#ifont') format('svg');
+  src: url('../font/ifont.eot?75097146');
+  src: url('../font/ifont.eot?75097146#iefix') format('embedded-opentype'),
+       url('../font/ifont.svg?75097146#ifont') format('svg');
   font-weight: normal;
   font-style: normal;
 }
diff --git a/public/fonts/fontello-ifont/css/ifont-ie7-codes.css b/application/fonts/fontello-ifont/css/ifont-ie7-codes.css
similarity index 100%
rename from public/fonts/fontello-ifont/css/ifont-ie7-codes.css
rename to application/fonts/fontello-ifont/css/ifont-ie7-codes.css
diff --git a/public/fonts/fontello-ifont/css/ifont-ie7.css b/application/fonts/fontello-ifont/css/ifont-ie7.css
similarity index 100%
rename from public/fonts/fontello-ifont/css/ifont-ie7.css
rename to application/fonts/fontello-ifont/css/ifont-ie7.css
diff --git a/public/fonts/fontello-ifont/css/ifont.css b/application/fonts/fontello-ifont/css/ifont.css
similarity index 100%
rename from public/fonts/fontello-ifont/css/ifont.css
rename to application/fonts/fontello-ifont/css/ifont.css
diff --git a/public/fonts/fontello-ifont/demo.html b/application/fonts/fontello-ifont/demo.html
similarity index 100%
rename from public/fonts/fontello-ifont/demo.html
rename to application/fonts/fontello-ifont/demo.html
diff --git a/application/fonts/icingaweb.md b/application/fonts/icingaweb.md
new file mode 100644
index 000000000..5699f07b2
--- /dev/null
+++ b/application/fonts/icingaweb.md
@@ -0,0 +1,9 @@
+# fontello-ifont font files moved
+
+New target is: public/font
+
+The font directory has been moved to the public structure because of
+Internet Explorer version 8 compatibility. The common way for browsers is to
+include the binary embeded font type in the javascript. IE8 falls back and
+include one of the provided font sources. Therefore it is important to have
+the font files available public and exported by the HTTP server.
diff --git a/library/Icinga/Web/LessCompiler.php b/library/Icinga/Web/LessCompiler.php
index a5349f1a4..5d5e04b22 100644
--- a/library/Icinga/Web/LessCompiler.php
+++ b/library/Icinga/Web/LessCompiler.php
@@ -38,19 +38,11 @@ class LessCompiler
 
     /**
      * Create a new instance
-     *
-     * @param   string  $basePath   Provide web base path optional
      */
     public function __construct($basePath = null)
     {
         require_once 'lessphp/lessc.inc.php';
         $this->lessc = new lessc();
-
-        $this->lessc->setVariables(
-            array(
-                'baseurl' => '\'' . $basePath. '\''
-            )
-        );
     }
 
     public function compress()
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index 52bc4b27b..9e6bd0bed 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -11,7 +11,7 @@ use Icinga\Web\LessCompiler;
 class StyleSheet
 {
     protected static $lessFiles = array(
-        'fonts/fontello-ifont/css/ifont-embedded.less',
+        '../application/fonts/fontello-ifont/css/ifont-embedded.css',
         'css/vendor/tipsy.css',
         'css/icinga/defaults.less',
         'css/icinga/layout-colors.less',
@@ -97,7 +97,7 @@ class StyleSheet
             return;
         }
 
-        $less = new LessCompiler(dirname($_SERVER['PHP_SELF']));
+        $less = new LessCompiler();
         foreach ($lessFiles as $file) {
             $less->addFile($file);
         }
diff --git a/public/fonts/fontello-ifont/font/ifont.eot b/public/font/ifont.eot
similarity index 100%
rename from public/fonts/fontello-ifont/font/ifont.eot
rename to public/font/ifont.eot
diff --git a/public/fonts/fontello-ifont/font/ifont.svg b/public/font/ifont.svg
similarity index 100%
rename from public/fonts/fontello-ifont/font/ifont.svg
rename to public/font/ifont.svg
diff --git a/public/fonts/fontello-ifont/font/ifont.ttf b/public/font/ifont.ttf
similarity index 100%
rename from public/fonts/fontello-ifont/font/ifont.ttf
rename to public/font/ifont.ttf
diff --git a/public/fonts/fontello-ifont/font/ifont.woff b/public/font/ifont.woff
similarity index 100%
rename from public/fonts/fontello-ifont/font/ifont.woff
rename to public/font/ifont.woff
diff --git a/public/fonts/fontello-ifont/icingaweb.md b/public/fonts/fontello-ifont/icingaweb.md
deleted file mode 100644
index fa0a52c7d..000000000
--- a/public/fonts/fontello-ifont/icingaweb.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# fontello-ifont has been moved
-
-The font directory has been moved to the public structure because of Internet Explorer version 8 compatibility. The
-common way for browsers is to include the binary embeded font type in the javascript. IE8 falls back and include one of
-the provided font sources. Therefore it is important to have the font files available public and exported by the
-HTTP server.
\ No newline at end of file

From dd483d98df9483f50c16ddde5041077d513c679f Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 29 Jan 2015 14:04:47 +0100
Subject: [PATCH 0425/2920] LessCompiler: Remove useless argument

refs #6417
---
 library/Icinga/Web/LessCompiler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/LessCompiler.php b/library/Icinga/Web/LessCompiler.php
index 5d5e04b22..261790579 100644
--- a/library/Icinga/Web/LessCompiler.php
+++ b/library/Icinga/Web/LessCompiler.php
@@ -39,7 +39,7 @@ class LessCompiler
     /**
      * Create a new instance
      */
-    public function __construct($basePath = null)
+    public function __construct()
     {
         require_once 'lessphp/lessc.inc.php';
         $this->lessc = new lessc();

From 7e792f5d2eab3657d87969433d9506dc99085c4a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 29 Jan 2015 15:40:37 +0100
Subject: [PATCH 0426/2920] Add explicit step-attribute to html5-datetime* 
 input elements

fixes #8314
---
 application/views/helpers/FormDateTime.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/helpers/FormDateTime.php b/application/views/helpers/FormDateTime.php
index cb760a620..b75dfec62 100644
--- a/application/views/helpers/FormDateTime.php
+++ b/application/views/helpers/FormDateTime.php
@@ -57,7 +57,7 @@ class Zend_View_Helper_FormDateTime extends Zend_View_Helper_FormElement
         $type = $attribs['local'] === true ? 'datetime-local' : 'datetime';
         unset($attribs['local']);  // Unset local to not render it again in $this->_htmlAttribs($attribs)
         $html5 =  sprintf(
-            '<input type="%s" name="%s" id="%s" value="%s"%s%s%s%s%s',
+            '<input type="%s" name="%s" id="%s" step="1" value="%s"%s%s%s%s%s',
             $type,
             $this->view->escape($name),
             $this->view->escape($id),

From 2a115e71d4924f416cb9eea4da4a5913d97d8680 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 29 Jan 2015 15:53:15 +0100
Subject: [PATCH 0427/2920] Add support for paged LDAP search results

fixes #8261
refs #6176
---
 .../Backend/LdapUserBackend.php               |   2 +-
 library/Icinga/Protocol/Ldap/Connection.php   | 122 ++++++++++++------
 library/Icinga/Protocol/Ldap/Query.php        |  13 ++
 3 files changed, 97 insertions(+), 40 deletions(-)

diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/Backend/LdapUserBackend.php
index a9ffba0c5..69fe795fc 100644
--- a/library/Icinga/Authentication/Backend/LdapUserBackend.php
+++ b/library/Icinga/Authentication/Backend/LdapUserBackend.php
@@ -213,7 +213,7 @@ class LdapUserBackend extends UserBackend
      */
     public function count()
     {
-        return $this->conn->count($this->selectUsers());
+        return $this->selectUsers()->count();
     }
 
     /**
diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 2f8737c8b..b0bf1f281 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Protocol\Ldap;
 
+use Exception;
 use Icinga\Protocol\Ldap\Exception as LdapException;
 use Icinga\Application\Platform;
 use Icinga\Application\Config;
@@ -97,6 +98,9 @@ class Connection
     protected $namingContexts;
     protected $discoverySuccess = false;
 
+    protected $lastResult;
+    protected $pageCookie;
+
     /**
      * Constructor
      *
@@ -250,44 +254,55 @@ class Connection
      */
     public function count(Query $query)
     {
-        $results = $this->runQuery($query, '+');
-        if (! $results) {
-            return 0;
+        $this->connect();
+        $this->bind();
+
+        $count = 0;
+        $results = $this->runQuery($query);
+        while (! empty($results)) {
+            $count += ldap_count_entries($this->ds, $results);
+            $results = $this->runQuery($query);
         }
-        return ldap_count_entries($this->ds, $results);
+
+        return $count;
     }
 
-    public function fetchAll($query, $fields = array())
+    public function fetchAll(Query $query, $fields = array())
     {
-        $offset = null;
-        $limit = null;
+        $this->connect();
+        $this->bind();
+
+        $offset = $limit = null;
         if ($query->hasLimit()) {
             $offset = $query->getOffset();
-            $limit  = $query->getLimit();
+            $limit = $query->getLimit();
         }
+
+        $count = 0;
         $entries = array();
         $results = $this->runQuery($query, $fields);
-        if (! $results) {
-            return array();
-        }
-        $entry = ldap_first_entry($this->ds, $results);
-        $count = 0;
-        while ($entry) {
-            if (($offset === null || $offset <= $count)
-                && ($limit === null || ($offset + $limit) >= $count)
-            ) {
-                $attrs = ldap_get_attributes($this->ds, $entry);
-                $entries[ldap_get_dn($this->ds, $entry)]
-                    = $this->cleanupAttributes($attrs);
+        while (! empty($results)) {
+            $entry = ldap_first_entry($this->ds, $results);
+            while ($entry) {
+                $count++;
+                if (($offset === null || $offset <= $count)
+                    && ($limit === null || ($offset + $limit) > $count)
+                ) {
+                    $entries[ldap_get_dn($this->ds, $entry)] = $this->cleanupAttributes(
+                        ldap_get_attributes($this->ds, $entry)
+                    );
+                }
+
+                $entry = ldap_next_entry($this->ds, $entry);
             }
-            $count++;
-            $entry = ldap_next_entry($this->ds, $entry);
+
+            $results = $this->runQuery($query, $fields);
         }
-        ldap_free_result($results);
+
         return $entries;
     }
 
-    public function cleanupAttributes(& $attrs)
+    protected function cleanupAttributes($attrs)
     {
         $clean = (object) array();
         for ($i = 0; $i < $attrs['count']; $i++) {
@@ -303,26 +318,55 @@ class Connection
         return $clean;
     }
 
-    protected function runQuery($query, $fields)
+    protected function runQuery(Query $query, $fields = array())
     {
-        $this->connect();
-        $this->bind();
-        if ($query instanceof Query) {
-            $fields = $query->listFields();
+        if ($query->getUsePagedResults()) {
+            if ($this->pageCookie === null) {
+                $this->pageCookie = '';
+            } else {
+                try {
+                    ldap_control_paged_result_response($this->ds, $this->lastResult, $this->pageCookie);
+                } catch (Exception $e) {
+                    $this->pageCookie = '';
+                    Logger::error(
+                        'Unable to request paged LDAP results. Does the server allow paged search requests? (%s)',
+                        $e->getMessage()
+                    );
+                }
+
+                ldap_free_result($this->lastResult);
+                if (! $this->pageCookie) {
+                    $this->pageCookie = $this->lastResult = null;
+                    // Abandon the paged search request so that subsequent requests succeed
+                    ldap_control_paged_result($this->ds, 0);
+                    return false;
+                }
+            }
+
+            // Does not matter whether we'll use a valid page size here,
+            // as the server applies its hard limit in case its too high
+            ldap_control_paged_result(
+                $this->ds,
+                $query->hasLimit() ? $query->getLimit() : 500,
+                true,
+                $this->pageCookie
+            );
+        } elseif ($this->lastResult !== null) {
+            ldap_free_result($this->lastResult);
+            $this->lastResult = null;
+            return false;
         }
-        // WARNING:
-        // We do not support pagination right now, and there is no chance to
-        // do so for PHP < 5.4. Warnings about "Sizelimit exceeded" will
-        // therefore not be hidden right now.
+
         $base = $query->hasBase() ? $query->getBase() : $this->root_dn;
         $results = @ldap_search(
             $this->ds,
             $base,
             $query->create(),
-            $fields,
+            empty($fields) ? $query->listFields() : $fields,
             0, // Attributes and values
             0  // No limit - at least where possible
         );
+
         if ($results === false) {
             if (ldap_errno($this->ds) === self::LDAP_NO_SUCH_OBJECT) {
                 return false;
@@ -336,12 +380,12 @@ class Connection
                 )
             );
         }
-        $list = array();
-        if ($query instanceof Query) {
-            foreach ($query->getSortColumns() as $col) {
-                ldap_sort($this->ds, $results, $col[0]);
-            }
+
+        foreach ($query->getSortColumns() as $col) {
+            ldap_sort($this->ds, $results, $col[0]);
         }
+
+        $this->lastResult = $results;
         return $results;
     }
 
diff --git a/library/Icinga/Protocol/Ldap/Query.php b/library/Icinga/Protocol/Ldap/Query.php
index 462c83d61..930cefa96 100644
--- a/library/Icinga/Protocol/Ldap/Query.php
+++ b/library/Icinga/Protocol/Ldap/Query.php
@@ -33,6 +33,7 @@ class Query
     protected $sort_columns = array();
     protected $count;
     protected $base;
+    protected $usePagedResults;
 
     /**
      * Constructor
@@ -43,6 +44,7 @@ class Query
     public function __construct(Connection $connection)
     {
         $this->connection = $connection;
+        $this->usePagedResults = version_compare(PHP_VERSION, '5.4.0') >= 0;
     }
 
     public function setBase($base)
@@ -61,6 +63,17 @@ class Query
         return $this->base;
     }
 
+    public function setUsePagedResults($state = true)
+    {
+        $this->usePagedResults = (bool) $state && version_compare(PHP_VERSION, '5.4.0') >= 0;
+        return $this;
+    }
+
+    public function getUsePagedResults()
+    {
+        return $this->usePagedResults;
+    }
+
     /**
      * Count result set, ignoring limits
      *

From 97cc37b99ca9c62f3bf75be77eef963544b7958c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 29 Jan 2015 15:59:03 +0100
Subject: [PATCH 0428/2920] Move php version check from ...\Ldap\Query to
 ...\Ldap\Connection

refs #8261
refs #6176
---
 library/Icinga/Protocol/Ldap/Connection.php | 2 +-
 library/Icinga/Protocol/Ldap/Query.php      | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index b0bf1f281..e340efc25 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -320,7 +320,7 @@ class Connection
 
     protected function runQuery(Query $query, $fields = array())
     {
-        if ($query->getUsePagedResults()) {
+        if ($query->getUsePagedResults() && version_compare(PHP_VERSION, '5.4.0') >= 0) {
             if ($this->pageCookie === null) {
                 $this->pageCookie = '';
             } else {
diff --git a/library/Icinga/Protocol/Ldap/Query.php b/library/Icinga/Protocol/Ldap/Query.php
index 930cefa96..c6f0d6fa1 100644
--- a/library/Icinga/Protocol/Ldap/Query.php
+++ b/library/Icinga/Protocol/Ldap/Query.php
@@ -33,7 +33,7 @@ class Query
     protected $sort_columns = array();
     protected $count;
     protected $base;
-    protected $usePagedResults;
+    protected $usePagedResults = true;
 
     /**
      * Constructor
@@ -44,7 +44,6 @@ class Query
     public function __construct(Connection $connection)
     {
         $this->connection = $connection;
-        $this->usePagedResults = version_compare(PHP_VERSION, '5.4.0') >= 0;
     }
 
     public function setBase($base)
@@ -65,7 +64,7 @@ class Query
 
     public function setUsePagedResults($state = true)
     {
-        $this->usePagedResults = (bool) $state && version_compare(PHP_VERSION, '5.4.0') >= 0;
+        $this->usePagedResults = (bool) $state;
         return $this;
     }
 

From 9ff0bbcfc02eb05e6062f472941096d14036e03a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 29 Jan 2015 17:07:58 +0100
Subject: [PATCH 0429/2920] Fix that Icinga\Protocol\Ldap\Connection does not
 correctly apply limits

---
 library/Icinga/Protocol/Ldap/Connection.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index e340efc25..7b1ca4567 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -285,8 +285,9 @@ class Connection
             $entry = ldap_first_entry($this->ds, $results);
             while ($entry) {
                 $count++;
-                if (($offset === null || $offset <= $count)
-                    && ($limit === null || ($offset + $limit) > $count)
+                if (
+                    ($offset === null || $offset <= $count)
+                    && ($limit === null || $limit > count($entries))
                 ) {
                     $entries[ldap_get_dn($this->ds, $entry)] = $this->cleanupAttributes(
                         ldap_get_attributes($this->ds, $entry)

From 6e533f223e85f6fb94263de93d911682de972f36 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 29 Jan 2015 17:12:59 +0100
Subject: [PATCH 0430/2920] Log warnings emitted by
 ldap_control_paged_result_response() as debug

Such a warning is emitted as well in case it's not critical. That is passing
an alternative overall result limit using ldap_search() to the server causes
it being applied across pages so ldap_control_paged_result_response()
does not indicate the "end" of the resultset just by adjusting the cookie
but by emitting the warning as well.
---
 library/Icinga/Protocol/Ldap/Connection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 7b1ca4567..37d8c4660 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -329,7 +329,7 @@ class Connection
                     ldap_control_paged_result_response($this->ds, $this->lastResult, $this->pageCookie);
                 } catch (Exception $e) {
                     $this->pageCookie = '';
-                    Logger::error(
+                    Logger::debug(
                         'Unable to request paged LDAP results. Does the server allow paged search requests? (%s)',
                         $e->getMessage()
                     );

From 3e128732b843ea2c22aab32b61ef43bd09a14080 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 29 Jan 2015 17:29:11 +0100
Subject: [PATCH 0431/2920] Apply a limit to results fetched via
 Ldap\Connection::fetchRow()

fixes #7993
---
 library/Icinga/Protocol/Ldap/Connection.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 37d8c4660..1f58f34da 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -242,7 +242,8 @@ class Connection
      */
     public function fetchRow($query, $fields = array())
     {
-        // TODO: This is ugly, make it better!
+        $query = clone $query;
+        $query->limit(1);
         $results = $this->fetchAll($query, $fields);
         return array_shift($results);
     }
@@ -365,7 +366,7 @@ class Connection
             $query->create(),
             empty($fields) ? $query->listFields() : $fields,
             0, // Attributes and values
-            0  // No limit - at least where possible
+            $query->hasLimit() ? $query->getOffset() + $query->getLimit() : 0 // No limit - at least where possible
         );
 
         if ($results === false) {

From 375345f8378a8988b9b2d56b1dd42dcf5c98da80 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 09:06:10 +0100
Subject: [PATCH 0432/2920] lib: Add SecurityException

All assertPermission() calls must throw this exception.
---
 library/Icinga/Security/SecurityException.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 library/Icinga/Security/SecurityException.php

diff --git a/library/Icinga/Security/SecurityException.php b/library/Icinga/Security/SecurityException.php
new file mode 100644
index 000000000..168d4a9be
--- /dev/null
+++ b/library/Icinga/Security/SecurityException.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Icinga\Security;
+
+use Icinga\Exception\IcingaException;
+
+/**
+ * Exception thrown when a caller does not have the permissions required to access a resource
+ */
+class SecurityException extends IcingaException
+{
+}

From d42017018f0a5673504c463eff3d0a7639b606d8 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 09:31:05 +0100
Subject: [PATCH 0433/2920] Return HTTP 403 in case a SecurityException was
 thrown

---
 application/controllers/ErrorController.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index 23051bd9a..0548b5c9c 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -1,12 +1,9 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
 
-// namespace Icinga\Application\Controllers;
-
-use Icinga\Application\Logger;
-use Icinga\Web\Controller\ActionController;
 use Icinga\Application\Icinga;
+use Icinga\Application\Logger;
+use Icinga\Security\SecurityException;
+use Icinga\Web\Controller\ActionController;
 
 /**
  * Application wide controller for displaying exceptions
@@ -44,6 +41,13 @@ class ErrorController extends ActionController
                 }
 
                 break;
+            case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_OTHER:
+                if ($exception instanceof SecurityException) {
+                    $this->getResponse()->setHttpResponseCode(403);
+                    $this->view->message = $exception->getMessage();
+                    break;
+                }
+                // Move to default
             default:
                 $title = preg_replace('/\r?\n.*$/s', '', $exception->getMessage());
                 $this->getResponse()->setHttpResponseCode(500);

From 63305fdf9aca81a477f677659062b12136325446 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 30 Jan 2015 09:32:08 +0100
Subject: [PATCH 0434/2920] Add Icinga\Application\Config::saveIni()

Simplifies saving INI files. Icinga\File\Ini\IniWriter does already require an
instance of Icinga\Application\Config so it's obvious to give "Config" the
task to initialize the writer.. We do also have a central place to handle
creating missing ancestor directories now.

refs #8219
---
 .../controllers/DashboardController.php       | 41 ++++++++-------
 application/forms/ConfigForm.php              | 12 +----
 .../views/scripts/dashboard/error.phtml       | 14 ++---
 library/Icinga/Application/Config.php         | 51 +++++++++++++++++++
 .../User/Preferences/Store/IniStore.php       | 39 +-------------
 library/Icinga/Web/Widget/Dashboard.php       | 21 ++------
 .../library/Monitoring/BackendStep.php        | 17 ++-----
 .../library/Monitoring/InstanceStep.php       |  9 ++--
 .../library/Monitoring/SecurityStep.php       |  9 ++--
 .../Setup/Steps/AuthenticationStep.php        | 17 +++----
 .../library/Setup/Steps/GeneralConfigStep.php |  9 ++--
 .../library/Setup/Steps/ResourceStep.php      | 10 ++--
 12 files changed, 109 insertions(+), 140 deletions(-)

diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index ba2125e12..7c70c9c5a 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -2,14 +2,13 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use Icinga\Application\Logger;
+use Exception;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Forms\ConfirmRemovalForm;
 use Icinga\Forms\Dashboard\DashletForm;
 use Icinga\Web\Form;
 use Icinga\Web\Notification;
 use Icinga\Web\Controller\ActionController;
-use Icinga\Web\Request;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Dashboard;
 use Icinga\Web\Widget\Tabextension\DashboardSettings;
@@ -56,11 +55,12 @@ class DashboardController extends ActionController
             $dashlet = new Dashboard\Dashlet($form->getValue('dashlet'), $form->getValue('url'), $pane);
             $dashlet->setUserWidget();
             $pane->addDashlet($dashlet);
+            $dashboardConfig = $dashboard->getConfig();
             try {
-                $dashboard->write();
-            } catch (\Zend_Config_Exception $e) {
+                $dashboardConfig->saveIni();
+            } catch (Exception $e) {
                 $action->view->error = $e;
-                $action->view->config = $dashboard->createWriter();
+                $action->view->config = $dashboardConfig;
                 $action->render('error');
                 return false;
             }
@@ -117,11 +117,12 @@ class DashboardController extends ActionController
                 $oldPane = $dashboard->getPane($form->getValue('org_pane'));
                 $oldPane->removeDashlet($dashlet->getTitle());
             }
+            $dashboardConfig = $dashboard->getConfig();
             try {
-                $dashboard->write();
-            } catch (\Zend_Config_Exception $e) {
+                $dashboardConfig->saveIni();
+            } catch (Exception $e) {
                 $action->view->error = $e;
-                $action->view->config = $dashboard->createWriter();
+                $action->view->config = $dashboardConfig;
                 $action->render('error');
                 return false;
             }
@@ -158,15 +159,16 @@ class DashboardController extends ActionController
         $dashlet = $this->_request->getParam('dashlet');
         $action = $this;
         $form->setOnSuccess(function (Form $form) use ($dashboard, $dashlet, $pane, $action) {
+            $pane = $dashboard->getPane($pane);
+            $pane->removeDashlet($dashlet);
+            $dashboardConfig = $dashboard->getConfig();
             try {
-                $pane = $dashboard->getPane($pane);
-                $pane->removeDashlet($dashlet);
-                $dashboard->write();
+                $dashboardConfig->saveIni();
                 Notification::success(t('Dashlet has been removed from') . ' ' . $pane->getTitle());
                 return true;
-            }  catch (\Zend_Config_Exception $e) {
+            }  catch (Exception $e) {
                 $action->view->error = $e;
-                $action->view->config = $dashboard->createWriter();
+                $action->view->config = $dashboardConfig;
                 $action->render('error');
                 return false;
             } catch (ProgrammingError $e) {
@@ -196,15 +198,16 @@ class DashboardController extends ActionController
         $pane = $this->_request->getParam('pane');
         $action = $this;
         $form->setOnSuccess(function (Form $form) use ($dashboard, $pane, $action) {
+            $pane = $dashboard->getPane($pane);
+            $dashboard->removePane($pane->getTitle());
+            $dashboardConfig = $dashboard->getConfig();
             try {
-                $pane = $dashboard->getPane($pane);
-                $dashboard->removePane($pane->getTitle());
-                $dashboard->write();
+                $dashboardConfig->saveIni();
                 Notification::success(t('Dashboard has been removed') . ': ' . $pane->getTitle());
                 return true;
-            }  catch (\Zend_Config_Exception $e) {
+            }  catch (Exception $e) {
                 $action->view->error = $e;
-                $action->view->config = $dashboard->createWriter();
+                $action->view->config = $dashboardConfig;
                 $action->render('error');
                 return false;
             } catch (ProgrammingError $e) {
@@ -241,7 +244,7 @@ class DashboardController extends ActionController
                 $this->view->title = $this->dashboard->getActivePane()->getTitle() . ' :: Dashboard';
                 if ($this->hasParam('remove')) {
                     $this->dashboard->getActivePane()->removeDashlet($this->getParam('remove'));
-                    $this->dashboard->write();
+                    $this->dashboard->getConfig()->saveIni();
                     $this->redirectNow(URL::fromRequest()->remove('remove'));
                 }
                 $this->view->tabs->add(
diff --git a/application/forms/ConfigForm.php b/application/forms/ConfigForm.php
index 28d3111ea..224633f1f 100644
--- a/application/forms/ConfigForm.php
+++ b/application/forms/ConfigForm.php
@@ -8,7 +8,6 @@ use Exception;
 use Zend_Form_Decorator_Abstract;
 use Icinga\Web\Form;
 use Icinga\Application\Config;
-use Icinga\File\Ini\IniWriter;
 
 /**
  * Form base-class providing standard functionality for configuration forms
@@ -44,21 +43,14 @@ class ConfigForm extends Form
      */
     public function save()
     {
-        $writer = new IniWriter(
-            array(
-                'config'    => $this->config,
-                'filename'  => $this->config->getConfigFile()
-            )
-        );
-
         try {
-            $writer->write();
+            $this->config->saveIni();
         } catch (Exception $e) {
             $this->addDecorator('ViewScript', array(
                 'viewModule'    => 'default',
                 'viewScript'    => 'showConfiguration.phtml',
                 'errorMessage'  => $e->getMessage(),
-                'configString'  => $writer->render(),
+                'configString'  => $this->config,
                 'filePath'      => $this->config->getConfigFile(),
                 'placement'     => Zend_Form_Decorator_Abstract::PREPEND
             ));
diff --git a/application/views/scripts/dashboard/error.phtml b/application/views/scripts/dashboard/error.phtml
index e5a0f3939..56e32faf4 100644
--- a/application/views/scripts/dashboard/error.phtml
+++ b/application/views/scripts/dashboard/error.phtml
@@ -1,13 +1,13 @@
 <div class="content">
-    <h1><?= t('Could not persist dashboard'); ?></h1>
+    <h1><?= $this->translate('Could not persist dashboard'); ?></h1>
     <p>
-        <?= t('Please copy the following dashboard snippet to '); ?>
-        <strong><?= $this->config->getFilename(); ?>;</strong>.
+        <?= $this->translate('Please copy the following dashboard snippet to '); ?>
+        <strong><?= $this->config->getConfigFile(); ?>;</strong>.
         <br>
-        <?= t('Make sure that the webserver can write to this file.'); ?>
+        <?= $this->translate('Make sure that the webserver can write to this file.'); ?>
     </p>
-    <pre><?= (string) $this->config->render(); ?></pre>
+    <pre><?= $this->config; ?></pre>
     <hr>
-    <h2><?= t('Error details') ?></h2>
+    <h2><?= $this->translate('Error details'); ?></h2>
     <p><?= $this->error->getMessage(); ?></p>
-</div>
+</div>
\ No newline at end of file
diff --git a/library/Icinga/Application/Config.php b/library/Icinga/Application/Config.php
index 361f5f11d..8d4914316 100644
--- a/library/Icinga/Application/Config.php
+++ b/library/Icinga/Application/Config.php
@@ -6,8 +6,10 @@ namespace Icinga\Application;
 
 use Iterator;
 use Countable;
+use LogicException;
 use UnexpectedValueException;
 use Icinga\Data\ConfigObject;
+use Icinga\File\Ini\IniWriter;
 use Icinga\Exception\NotReadableError;
 
 /**
@@ -299,6 +301,45 @@ class Config implements Countable, Iterator
         return $emptyConfig;
     }
 
+    /**
+     * Save configuration to the given INI file
+     *
+     * @param   string|null     $filePath   The path to the INI file or null in case this config's path should be used
+     * @param   int             $fileMode   The file mode to store the file with
+     *
+     * @throws  LogicException              In case this config has no path and none is passed in either
+     * @throws  NotWritableError            In case the INI file cannot be written
+     *
+     * @todo    create basepath and throw NotWritableError in case its not possible
+     */
+    public function saveIni($filePath = null, $fileMode = 0660)
+    {
+        if ($filePath === null && $this->configFile) {
+            $filePath = $this->configFile;
+        } elseif ($filePath === null) {
+            throw new LogicException('You need to pass $filePath or set a path using Config::setConfigFile()');
+        }
+
+        $this->getIniWriter($filePath, $fileMode)->write();
+    }
+
+    /**
+     * Return a IniWriter for this config
+     *
+     * @param   string|null     $filePath
+     * @param   int             $fileMode
+     *
+     * @return  IniWriter
+     */
+    protected function getIniWriter($filePath = null, $fileMode = null)
+    {
+        return new IniWriter(array(
+            'config' => $this,
+            'filename' => $filePath,
+            'filemode' => $fileMode
+        ));
+    }
+
     /**
      * Prepend configuration base dir to the given relative path
      *
@@ -354,4 +395,14 @@ class Config implements Countable, Iterator
 
         return $moduleConfigs[$configname];
     }
+
+    /**
+     * Return this config rendered as a INI structured string
+     *
+     * @return  string
+     */
+    public function __toString()
+    {
+        return $this->getIniWriter()->render();
+    }
 }
diff --git a/library/Icinga/User/Preferences/Store/IniStore.php b/library/Icinga/User/Preferences/Store/IniStore.php
index 1ba780184..1a096ea7b 100644
--- a/library/Icinga/User/Preferences/Store/IniStore.php
+++ b/library/Icinga/User/Preferences/Store/IniStore.php
@@ -7,10 +7,8 @@ namespace Icinga\User\Preferences\Store;
 use Icinga\Application\Config;
 use Icinga\Exception\NotReadableError;
 use Icinga\Exception\NotWritableError;
-use Icinga\File\Ini\IniWriter;
 use Icinga\User\Preferences;
 use Icinga\User\Preferences\PreferencesStore;
-use Icinga\Util\File;
 
 /**
  * Load and save user preferences from and to INI files
@@ -31,13 +29,6 @@ class IniStore extends PreferencesStore
      */
     protected $preferences = array();
 
-    /**
-     * Writer which stores the preferences
-     *
-     * @var IniWriter
-     */
-    protected $writer;
-
     /**
      * Initialize the store
      */
@@ -98,35 +89,7 @@ class IniStore extends PreferencesStore
      */
     public function write()
     {
-        if ($this->writer === null) {
-            if (! file_exists($this->preferencesFile)) {
-                if (! is_writable($this->getStoreConfig()->location)) {
-                    throw new NotWritableError(
-                        'Path to the preferences INI files %s is not writable',
-                        $this->getStoreConfig()->location
-                    );
-                }
-
-                File::create($this->preferencesFile, 0664);
-            }
-
-            if (! is_writable($this->preferencesFile)) {
-                throw new NotWritableError(
-                    'Preferences INI file %s for user %s is not writable',
-                    $this->preferencesFile,
-                    $this->getUser()->getUsername()
-                );
-            }
-
-            $this->writer = new IniWriter(
-                array(
-                    'config'    => Config::fromArray($this->preferences),
-                    'filename'  => $this->preferencesFile
-                )
-            );
-        }
-
-        $this->writer->write();
+        Config::fromArray($this->preferences)->saveIni($this->preferencesFile);
     }
 
     /**
diff --git a/library/Icinga/Web/Widget/Dashboard.php b/library/Icinga/Web/Widget/Dashboard.php
index 45e1e6830..fe4bba803 100644
--- a/library/Icinga/Web/Widget/Dashboard.php
+++ b/library/Icinga/Web/Widget/Dashboard.php
@@ -6,12 +6,10 @@ namespace Icinga\Web\Widget;
 
 use Icinga\Application\Icinga;
 use Icinga\Application\Config;
-use Icinga\Data\ConfigObject;
 use Icinga\Exception\ConfigurationError;
 use Icinga\Exception\NotReadableError;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Exception\SystemPermissionException;
-use Icinga\File\Ini\IniWriter;
 use Icinga\User;
 use Icinga\Web\Widget\Dashboard\Pane;
 use Icinga\Web\Widget\Dashboard\Dashlet as DashboardDashlet;
@@ -86,13 +84,12 @@ class Dashboard extends AbstractWidget
     }
 
     /**
-     * Create a writer object
+     * Create and return a Config object for this dashboard
      *
-     * @return IniWriter
+     * @return  Config
      */
-    public function createWriter()
+    public function getConfig()
     {
-        $configFile = $this->getConfigFile();
         $output = array();
         foreach ($this->panes as $pane) {
             if ($pane->isUserWidget() === true) {
@@ -105,17 +102,7 @@ class Dashboard extends AbstractWidget
             }
         }
 
-        $co = new ConfigObject($output);
-        $config = new Config($co);
-        return new IniWriter(array('config' => $config, 'filename' => $configFile));
-    }
-
-    /**
-     * Write user specific dashboards to disk
-     */
-    public function write()
-    {
-        $this->createWriter()->write();
+        return Config::fromArray($output)->setConfigFile($this->getConfigFile());
     }
 
     /**
diff --git a/modules/monitoring/library/Monitoring/BackendStep.php b/modules/monitoring/library/Monitoring/BackendStep.php
index c0dc3d4ea..7f9fc11cf 100644
--- a/modules/monitoring/library/Monitoring/BackendStep.php
+++ b/modules/monitoring/library/Monitoring/BackendStep.php
@@ -7,7 +7,6 @@ namespace Icinga\Module\Monitoring;
 use Exception;
 use Icinga\Module\Setup\Step;
 use Icinga\Application\Config;
-use Icinga\File\Ini\IniWriter;
 
 class BackendStep extends Step
 {
@@ -38,11 +37,9 @@ class BackendStep extends Step
         );
 
         try {
-            $writer = new IniWriter(array(
-                'config'    => Config::fromArray($config),
-                'filename'  => Config::resolvePath('modules/monitoring/backends.ini')
-            ));
-            $writer->write();
+            Config::fromArray($config)
+                ->setConfigFile(Config::resolvePath('modules/monitoring/backends.ini'))
+                ->saveIni();
         } catch (Exception $e) {
             $this->backendIniError = $e;
             return false;
@@ -61,13 +58,7 @@ class BackendStep extends Step
         try {
             $config = Config::app('resources', true);
             $config->setSection($resourceName, $resourceConfig);
-
-            $writer = new IniWriter(array(
-                'config'    => $config,
-                'filename'  => Config::resolvePath('resources.ini'),
-                'filemode'  => 0660
-            ));
-            $writer->write();
+            $config->saveIni();
         } catch (Exception $e) {
             $this->resourcesIniError = $e;
             return false;
diff --git a/modules/monitoring/library/Monitoring/InstanceStep.php b/modules/monitoring/library/Monitoring/InstanceStep.php
index 2cb8d7d8d..ab54b6548 100644
--- a/modules/monitoring/library/Monitoring/InstanceStep.php
+++ b/modules/monitoring/library/Monitoring/InstanceStep.php
@@ -7,7 +7,6 @@ namespace Icinga\Module\Monitoring;
 use Exception;
 use Icinga\Module\Setup\Step;
 use Icinga\Application\Config;
-use Icinga\File\Ini\IniWriter;
 
 class InstanceStep extends Step
 {
@@ -27,11 +26,9 @@ class InstanceStep extends Step
         unset($instanceConfig['name']);
 
         try {
-            $writer = new IniWriter(array(
-                'config'    => Config::fromArray(array($instanceName => $instanceConfig)),
-                'filename'  => Config::resolvePath('modules/monitoring/instances.ini')
-            ));
-            $writer->write();
+            Config::fromArray(array($instanceName => $instanceConfig))
+                ->setConfigFile(Config::resolvePath('modules/monitoring/instances.ini'))
+                ->saveIni();
         } catch (Exception $e) {
             $this->error = $e;
             return false;
diff --git a/modules/monitoring/library/Monitoring/SecurityStep.php b/modules/monitoring/library/Monitoring/SecurityStep.php
index 4a2c0f846..b3eda02c4 100644
--- a/modules/monitoring/library/Monitoring/SecurityStep.php
+++ b/modules/monitoring/library/Monitoring/SecurityStep.php
@@ -7,7 +7,6 @@ namespace Icinga\Module\Monitoring;
 use Exception;
 use Icinga\Module\Setup\Step;
 use Icinga\Application\Config;
-use Icinga\File\Ini\IniWriter;
 
 class SecurityStep extends Step
 {
@@ -26,11 +25,9 @@ class SecurityStep extends Step
         $config['security'] = $this->data['securityConfig'];
 
         try {
-            $writer = new IniWriter(array(
-                'config'    => Config::fromArray($config),
-                'filename'  => Config::resolvePath('modules/monitoring/config.ini')
-            ));
-            $writer->write();
+            Config::fromArray($config)
+                ->setConfigFile(Config::resolvePath('modules/monitoring/config.ini'))
+                ->saveIni();
         } catch (Exception $e) {
             $this->error = $e;
             return false;
diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
index ce0b49f58..c06b4e294 100644
--- a/modules/setup/library/Setup/Steps/AuthenticationStep.php
+++ b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -6,7 +6,6 @@ namespace Icinga\Module\Setup\Steps;
 
 use Exception;
 use Icinga\Application\Config;
-use Icinga\File\Ini\IniWriter;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
 use Icinga\Authentication\Backend\DbUserBackend;
@@ -50,11 +49,9 @@ class AuthenticationStep extends Step
         }
 
         try {
-            $writer = new IniWriter(array(
-                'config'    => Config::fromArray($config),
-                'filename'  => Config::resolvePath('authentication.ini')
-            ));
-            $writer->write();
+            Config::fromArray($config)
+                ->setConfigFile(Config::resolvePath('authentication.ini'))
+                ->saveIni();
         } catch (Exception $e) {
             $this->authIniError = $e;
             return false;
@@ -73,11 +70,9 @@ class AuthenticationStep extends Step
         );
 
         try {
-            $writer = new IniWriter(array(
-                'config'    => Config::fromArray($config),
-                'filename'  => Config::resolvePath('permissions.ini')
-            ));
-            $writer->write();
+            Config::fromArray($config)
+                ->setConfigFile(Config::resolvePath('permissions.ini'))
+                ->saveIni();
         } catch (Exception $e) {
             $this->permIniError = $e;
             return false;
diff --git a/modules/setup/library/Setup/Steps/GeneralConfigStep.php b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
index 39c160628..bf3d8cb89 100644
--- a/modules/setup/library/Setup/Steps/GeneralConfigStep.php
+++ b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
@@ -7,7 +7,6 @@ namespace Icinga\Module\Setup\Steps;
 use Exception;
 use Icinga\Application\Logger;
 use Icinga\Application\Config;
-use Icinga\File\Ini\IniWriter;
 use Icinga\Module\Setup\Step;
 
 class GeneralConfigStep extends Step
@@ -35,11 +34,9 @@ class GeneralConfigStep extends Step
         }
 
         try {
-            $writer = new IniWriter(array(
-                'config'    => Config::fromArray($config),
-                'filename'  => Config::resolvePath('config.ini')
-            ));
-            $writer->write();
+            Config::fromArray($config)
+                ->setConfigFile(Config::resolvePath('config.ini'))
+                ->saveIni();
         } catch (Exception $e) {
             $this->error = $e;
             return false;
diff --git a/modules/setup/library/Setup/Steps/ResourceStep.php b/modules/setup/library/Setup/Steps/ResourceStep.php
index c04cdbc79..aae1c3aca 100644
--- a/modules/setup/library/Setup/Steps/ResourceStep.php
+++ b/modules/setup/library/Setup/Steps/ResourceStep.php
@@ -6,7 +6,6 @@ namespace Icinga\Module\Setup\Steps;
 
 use Exception;
 use Icinga\Application\Config;
-use Icinga\File\Ini\IniWriter;
 use Icinga\Module\Setup\Step;
 
 class ResourceStep extends Step
@@ -38,12 +37,9 @@ class ResourceStep extends Step
         }
 
         try {
-            $writer = new IniWriter(array(
-                'config'    => Config::fromArray($resourceConfig),
-                'filename'  => Config::resolvePath('resources.ini'),
-                'filemode'  => 0660
-            ));
-            $writer->write();
+            Config::fromArray($resourceConfig)
+                ->setConfigFile(Config::resolvePath('resources.ini'))
+                ->saveIni();
         } catch (Exception $e) {
             $this->error = $e;
             return false;

From 2faf5f0ca16aefdac755ecfb22c72b4a83d2e179 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 09:34:19 +0100
Subject: [PATCH 0435/2920] Throw SecurityException in
 ActionController::assertPermission()

---
 .../Web/Controller/ActionController.php       | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 78fcaf7bf..87d293be6 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -1,23 +1,22 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Controller;
 
 use Exception;
-use Icinga\Authentication\Manager;
 use Icinga\Application\Benchmark;
 use Icinga\Application\Config;
+use Icinga\Authentication\Manager;
 use Icinga\Exception\IcingaException;
+use Icinga\Exception\ProgrammingError;
+use Icinga\File\Pdf;
+use Icinga\Security\SecurityException;
 use Icinga\Util\Translator;
+use Icinga\Web\Notification;
+use Icinga\Web\Session;
+use Icinga\Web\Url;
+use Icinga\Web\UrlParams;
 use Icinga\Web\Widget\Tabs;
 use Icinga\Web\Window;
-use Icinga\Web\Url;
-use Icinga\Web\Notification;
-use Icinga\File\Pdf;
-use Icinga\Exception\ProgrammingError;
-use Icinga\Web\Session;
-use Icinga\Web\UrlParams;
 use Zend_Controller_Action;
 use Zend_Controller_Action_HelperBroker as ActionHelperBroker;
 use Zend_Controller_Request_Abstract as Request;
@@ -50,7 +49,7 @@ class ActionController extends Zend_Controller_Action
     /**
      * Authentication manager
      *
-     * @type \Icinga\Authentication\Manager|null
+     * @type Manager|null
      */
     private $auth;
 
@@ -106,7 +105,6 @@ class ActionController extends Zend_Controller_Action
     {
     }
 
-
     /**
      * Get the authentication manager
      *
@@ -133,19 +131,16 @@ class ActionController extends Zend_Controller_Action
     }
 
     /**
-     * Throw an exception if user lacks the given permission
+     * Assert that the current user has the given permission
      *
-     * @param  string  $name Permission name
-     * @throws Exception
+     * @param   string  $permission     Name of the permission
+     *
+     * @throws  SecurityException       If the current user lacks the given permission
      */
-    public function assertPermission($name)
+    public function assertPermission($permission)
     {
-        if (! $this->Auth()->hasPermission($name)) {
-            // TODO: Shall this be an Auth Exception? Or a 404?
-            throw new IcingaException(
-                'Auth error, no permission for "%s"',
-                $name
-            );
+        if (! $this->Auth()->hasPermission($permission)) {
+            throw new SecurityException('No permission for %s', $permission);
         }
     }
 

From df29dd0e7ca587cc42656dc70c59b33d821c806d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 09:35:01 +0100
Subject: [PATCH 0436/2920] Implement Form::hasPermission() and
 Form::getPermission()

---
 library/Icinga/Web/Form.php | 50 +++++++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 1f3e0d4bd..daa6dcf40 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -1,6 +1,4 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
@@ -9,6 +7,8 @@ use Zend_Config;
 use Zend_Form;
 use Zend_View_Interface;
 use Icinga\Application\Icinga;
+use Icinga\Authentication\Manager;
+use Icinga\Security\SecurityException;
 use Icinga\Util\Translator;
 use Icinga\Web\Form\Decorator\NoScriptApply;
 use Icinga\Web\Form\Element\CsrfCounterMeasure;
@@ -109,6 +109,13 @@ class Form extends Zend_Form
      */
     protected $validatePartial = false;
 
+    /**
+     * Authentication manager
+     *
+     * @type Manager|null
+     */
+    private $auth;
+
     /**
      * Default element decorators
      *
@@ -869,4 +876,43 @@ class Form extends Zend_Form
         $this->create();
         return parent::render($view);
     }
+
+    /**
+     * Get the authentication manager
+     *
+     * @return Manager
+     */
+    public function Auth()
+    {
+        if ($this->auth === null) {
+            $this->auth = Manager::getInstance();
+        }
+        return $this->auth;
+    }
+
+    /**
+     * Whether the current user has the given permission
+     *
+     * @param   string  $permission Name of the permission
+     *
+     * @return  bool
+     */
+    public function hasPermission($permission)
+    {
+        return $this->Auth()->hasPermission($permission);
+    }
+
+    /**
+     * Assert that the current user has the given permission
+     *
+     * @param   string  $permission     Name of the permission
+     *
+     * @throws  SecurityException       If the current user lacks the given permission
+     */
+    public function assertPermission($permission)
+    {
+        if (! $this->Auth()->hasPermission($permission)) {
+            throw new SecurityException('No permission for %s', $permission);
+        }
+    }
 }

From 0108d44d635e628004c6bc5b711ef9ba2f0e6f36 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 30 Jan 2015 09:38:59 +0100
Subject: [PATCH 0437/2920] Fix "The use of non compound name 'Exception'..."

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

diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 7c70c9c5a..49a58426f 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use Exception;
+use \Exception;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Forms\ConfirmRemovalForm;
 use Icinga\Forms\Dashboard\DashletForm;

From d19e36d9370542e8a62fb8c1ed0f2b41a5fbc5eb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 09:57:31 +0100
Subject: [PATCH 0438/2920] monitoring/security: Require
 monitoring/command/feature/instance permission for disabling notifications

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

diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php
index bb5a4e5c2..5530f9c52 100644
--- a/modules/monitoring/application/controllers/ProcessController.php
+++ b/modules/monitoring/application/controllers/ProcessController.php
@@ -92,6 +92,7 @@ class Monitoring_ProcessController extends Controller
      */
     public function disableNotificationsAction()
     {
+        $this->assertPermission('monitoring/command/feature/instance');
         $this->view->title = $this->translate('Disable Notifications');
         $programStatus = $this->backend
             ->select()

From 7dbb8c684195b5e586ba34479a9452c04441cdbe Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 09:58:10 +0100
Subject: [PATCH 0439/2920] monitoring/security: Require
 monitoring/command/feature/instance permission for toggling instance features

---
 .../forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index 469c1b6eb..97a64dbd7 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -191,6 +191,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
      */
     public function onSuccess()
     {
+        $this->assertPermission('monitoring/command/feature/instance');
         foreach ($this->getValues() as $feature => $enabled) {
             $toggleFeature = new ToggleInstanceFeatureCommand();
             $toggleFeature

From 26613a010662f7b9e71eaa9a2bb0d2c8f9f3cd11 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 09:58:30 +0100
Subject: [PATCH 0440/2920] monitoring/security: Rename permission
 monitoring/command/feature/program to monitoring/command/feature/instance

---
 modules/monitoring/configuration.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index 72df4e73f..7eb3bbedf 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -47,8 +47,8 @@ $this->providePermission(
     $this->translate('Allow processing host and service check results')
 );
 $this->providePermission(
-    'monitoring/command/feature/program',
-    $this->translate('Allow processing commands for toggling features on a program-wide basis')
+    'monitoring/command/feature/instance',
+    $this->translate('Allow processing commands for toggling features on an instance-wide basis')
 );
 $this->providePermission(
     'monitoring/command/feature/object',

From 3716be4a48ba79a0c2c9dffcdf048819a7202bdf Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 10:01:03 +0100
Subject: [PATCH 0441/2920] monitoring/security: Disable toggling instance
 features if user lacks the permission monitoring/command/feature/instance

---
 .../ToggleInstanceFeaturesCommandForm.php     | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index 97a64dbd7..997bd378c 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -73,13 +73,15 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
         } else {
             $notificationDescription = null;
         }
+        $toggleDisabled = ! $this->hasPermission('monitoring/command/feature/instance');
         $this->addElements(array(
             array(
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_ACTIVE_HOST_CHECKS,
                 array(
                     'label'         =>  $this->translate('Active Host Checks Being Executed'),
-                    'autosubmit'    => true
+                    'autosubmit'    => true,
+                    'disabled'      => $toggleDisabled
                 )
             ),
             array(
@@ -87,7 +89,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 ToggleInstanceFeatureCommand::FEATURE_ACTIVE_SERVICE_CHECKS,
                 array(
                     'label'         =>  $this->translate('Active Service Checks Being Executed'),
-                    'autosubmit'    => true
+                    'autosubmit'    => true,
+                    'disabled'      => $toggleDisabled
                 )
             ),
             array(
@@ -95,7 +98,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 ToggleInstanceFeatureCommand::FEATURE_EVENT_HANDLERS,
                 array(
                     'label'         => $this->translate('Event Handlers Enabled'),
-                    'autosubmit'    => true
+                    'autosubmit'    => true,
+                    'disabled'      => $toggleDisabled
                 )
             ),
             array(
@@ -103,7 +107,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 ToggleInstanceFeatureCommand::FEATURE_FLAP_DETECTION,
                 array(
                     'label'         => $this->translate('Flap Detection Enabled'),
-                    'autosubmit'    => true
+                    'autosubmit'    => true,
+                    'disabled'      => $toggleDisabled
                 )
             ),
             array(
@@ -122,7 +127,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                         ),
                         'Label',
                         array('HtmlTag', array('tag' => 'div'))
-                    )
+                    ),
+                    'disabled'      => $toggleDisabled
                 )
             ),
             array(
@@ -130,7 +136,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 ToggleInstanceFeatureCommand::FEATURE_HOST_OBSESSING,
                 array(
                     'label'         => $this->translate('Obsessing Over Hosts'),
-                    'autosubmit'    => true
+                    'autosubmit'    => true,
+                    'disabled'      => $toggleDisabled
                 )
             ),
             array(
@@ -138,7 +145,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 ToggleInstanceFeatureCommand::FEATURE_SERVICE_OBSESSING,
                 array(
                     'label'         => $this->translate('Obsessing Over Services'),
-                    'autosubmit'    => true
+                    'autosubmit'    => true,
+                    'disabled'      => $toggleDisabled
                 )
             ),
             array(
@@ -146,7 +154,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 ToggleInstanceFeatureCommand::FEATURE_PASSIVE_HOST_CHECKS,
                 array(
                     'label'         =>  $this->translate('Passive Host Checks Being Accepted'),
-                    'autosubmit'    => true
+                    'autosubmit'    => true,
+                    'disabled'      => $toggleDisabled
                 )
             ),
             array(
@@ -154,7 +163,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 ToggleInstanceFeatureCommand::FEATURE_PASSIVE_SERVICE_CHECKS,
                 array(
                     'label'         =>  $this->translate('Passive Service Checks Being Accepted'),
-                    'autosubmit'    => true
+                    'autosubmit'    => true,
+                    'disabled'      => $toggleDisabled
                 )
             ),
             array(
@@ -162,7 +172,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 ToggleInstanceFeatureCommand::FEATURE_PERFORMANCE_DATA,
                 array(
                     'label'         =>  $this->translate('Performance Data Being Processed'),
-                    'autosubmit'    => true
+                    'autosubmit'    => true,
+                    'disabled'      => $toggleDisabled
                 )
             )
         ));

From 35b33647cf5bf72610289cbcfa93e4fb84144233 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 10:26:43 +0100
Subject: [PATCH 0442/2920] monitoring/security: Guard the link for disabling
 notifications on an instance-wide basis

The link in the monitoring health view will only be shown if the user has the permission monitoring/command/feature/instance.
---
 .../ToggleInstanceFeaturesCommandForm.php        | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index 997bd378c..d99db37c4 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -59,12 +59,16 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
     public function createElements(array $formData = array())
     {
         if ((bool) $this->status->notifications_enabled) {
-            $notificationDescription = sprintf(
-                '<a title="%s" href="%s" data-base-target="_next">%s</a>',
-                $this->translate('Disable notifications for a specific time on a program-wide basis'),
-                $this->getView()->href('monitoring/process/disable-notifications'),
-                $this->translate('Disable temporarily')
-            );
+            if ($this->hasPermission('monitoring/command/feature/instance')) {
+                $notificationDescription = sprintf(
+                    '<a title="%s" href="%s" data-base-target="_next">%s</a>',
+                    $this->translate('Disable notifications for a specific time on a program-wide basis'),
+                    $this->getView()->href('monitoring/process/disable-notifications'),
+                    $this->translate('Disable temporarily')
+                );
+            } else {
+                $notificationDescription = null;
+            }
         } elseif ($this->status->disable_notif_expire_time) {
             $notificationDescription = sprintf(
                 $this->translate('Notifications will be re-enabled in <strong>%s</strong>'),

From bdc637ff67af3506fa57eb71761bf61bb54d5fe9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 10:31:49 +0100
Subject: [PATCH 0443/2920] monitoring/security: Guard toggling object features

Toggling object features will only be possible if the user has the permission monitoring/command/feature/object.
---
 .../forms/Command/Object/ToggleObjectFeaturesCommandForm.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
index bf0a1d8b1..46858555f 100644
--- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
@@ -107,6 +107,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
      */
     public function onSuccess()
     {
+        $this->assertPermission('monitoring/command/feature/object');
         foreach ($this->objects as $object) {
             /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
             foreach ($this->getValues() as $feature => $enabled) {

From 1681f746c1ef5df9c1c14584a790a2b22757f389 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 10:46:24 +0100
Subject: [PATCH 0444/2920] monitoring/security: Disable toggling object
 features if user lacks the permission monitoring/command/feature/object

---
 .../ToggleObjectFeaturesCommandForm.php       | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
index 46858555f..d3cc63ecf 100644
--- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
@@ -28,13 +28,15 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
      */
     public function createElements(array $formData = array())
     {
+        $toggleDisabled = $this->hasPermission('monitoring/command/feature/instance')  ? null : '';
         $this->addElements(array(
             array(
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_ACTIVE_CHECKS,
                 array(
                     'label'         => $this->translate('Active Checks'),
-                    'autosubmit'    => true
+                    'autosubmit'    => true,
+                    'disabled'      => $toggleDisabled
                 )
             ),
             array(
@@ -42,7 +44,8 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 ToggleObjectFeatureCommand::FEATURE_PASSIVE_CHECKS,
                 array(
                     'label'         => $this->translate('Passive Checks'),
-                    'autosubmit'    => true
+                    'autosubmit'    => true,
+                    'disabled'      => $toggleDisabled
                 )
             ),
             array(
@@ -50,7 +53,8 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 ToggleObjectFeatureCommand::FEATURE_OBSESSING,
                 array(
                     'label'         => $this->translate('Obsessing'),
-                    'autosubmit'    => true
+                    'autosubmit'    => true,
+                    'disabled'      => $toggleDisabled
                 )
             ),
             array(
@@ -58,7 +62,8 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 ToggleObjectFeatureCommand::FEATURE_NOTIFICATIONS,
                 array(
                     'label'         => $this->translate('Notifications'),
-                    'autosubmit'    => true
+                    'autosubmit'    => true,
+                    'disabled'      => $toggleDisabled
                 )
             ),
             array(
@@ -66,7 +71,8 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 ToggleObjectFeatureCommand::FEATURE_EVENT_HANDLER,
                 array(
                     'label'         => $this->translate('Event Handler'),
-                    'autosubmit'    => true
+                    'autosubmit'    => true,
+                    'disabled'      => $toggleDisabled
                 )
             ),
             array(
@@ -74,7 +80,8 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 ToggleObjectFeatureCommand::FEATURE_FLAP_DETECTION,
                 array(
                     'label'         => $this->translate('Flap Detection'),
-                    'autosubmit'    => true
+                    'autosubmit'    => true,
+                    'disabled'      => $toggleDisabled
                 )
             )
         ));

From 127ce7abfe402c5102d070be342c56cf6f647dd4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 10:47:02 +0100
Subject: [PATCH 0445/2920] monitoring/security: Fix that toggling instance
 features is always disabled

In HTML5 the presence of a boolean attribute on an element represents the true value,
and the absence of the attribute represents the false value.

In Zend we have to set null for the absence of the attribute and the empty string for the
presence of the attribute.
---
 .../Command/Instance/ToggleInstanceFeaturesCommandForm.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index d99db37c4..60486307e 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -77,7 +77,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
         } else {
             $notificationDescription = null;
         }
-        $toggleDisabled = ! $this->hasPermission('monitoring/command/feature/instance');
+        $toggleDisabled = $this->hasPermission('monitoring/command/feature/instance') ? null : '';
         $this->addElements(array(
             array(
                 'checkbox',

From e5b0b528747c2ff76b0568f8ca6929e61b072495 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 11:20:05 +0100
Subject: [PATCH 0446/2920] lib: Reduce else { if { to elseif { in User::can()

---
 library/Icinga/User.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index db80c929a..bdc49275b 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -426,13 +426,11 @@ class User
         foreach ($this->permissions as $permitted) {
             $wildcard = strpos($permitted, '*');
             if ($wildcard !== false) {
-                if (substr($permission, 0, $wildcard) === substr($permitted, 0, $wildcard)) {
-                    return true;
-                } else {
-                    if ($permission === $permitted) {
-                        return true;
-                    }
-                }
+            }
+            if (substr($permission, 0, $wildcard) === substr($permitted, 0, $wildcard)) {
+                return true;
+            } elseif ($permission === $permitted) {
+                return true;
             }
         }
         return false;

From c8640cbae9eeec5f8e9269dfa691947ded14e09e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 12:44:34 +0100
Subject: [PATCH 0447/2920] rpm: Remove php5-imagick dependency for SUSE
 packages

---
 icingaweb2.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index cd1ee485f..0d3766fdd 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -82,7 +82,7 @@ Requires:                   %{php} >= 5.3.0
 Requires:                   %{php}-gd %{php}-intl
 %{?fedora:Requires:         php-pecl-imagick}
 %{?rhel:Requires:           php-pecl-imagick}
-%{?suse_version:Requires:   %{php}-gettext %{php}-openssl php5-imagick}
+%{?suse_version:Requires:   %{php}-gettext %{php}-openssl}
 
 %description -n php-Icinga
 Icinga Web 2 PHP library

From 932496c58c2e4a437772e99f968275398740cefe Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 12:51:06 +0100
Subject: [PATCH 0448/2920] rpm: Require json and posix PHP extensions for SUSE
 packages

---
 icingaweb2.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index 0d3766fdd..312d6ee39 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -82,7 +82,7 @@ Requires:                   %{php} >= 5.3.0
 Requires:                   %{php}-gd %{php}-intl
 %{?fedora:Requires:         php-pecl-imagick}
 %{?rhel:Requires:           php-pecl-imagick}
-%{?suse_version:Requires:   %{php}-gettext %{php}-openssl}
+%{?suse_version:Requires:   %{php}-gettext %{php}-json %{php}-openssl %{php}-posix}
 
 %description -n php-Icinga
 Icinga Web 2 PHP library

From e8619686aef903c82a3eb2acc327b70b2df2a098 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 30 Jan 2015 13:01:40 +0100
Subject: [PATCH 0449/2920] Add the sockets module as optional requirement of
 the monitoring module

---
 .../library/Monitoring/MonitoringWizard.php   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index d7a3671a4..43061e608 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -5,6 +5,7 @@
 namespace Icinga\Module\Monitoring;
 
 use Icinga\Application\Icinga;
+use Icinga\Application\Platform;
 use Icinga\Web\Form;
 use Icinga\Web\Wizard;
 use Icinga\Web\Request;
@@ -139,6 +140,22 @@ class MonitoringWizard extends Wizard implements SetupWizard
      */
     public function getRequirements()
     {
-        return new Requirements();
+        $requirements = new Requirements();
+
+        $requirements->addOptional(
+            'existing_php_mod_sockets',
+            mt('monitoring', 'PHP Module: Sockets'),
+            mt(
+                'monitoring',
+                'In case it\'s desired that a TCP connection is being used by Icinga Web 2 to'
+                . ' access a Livestatus interface, the Sockets module for PHP is required.'
+            ),
+            Platform::extensionLoaded('sockets'),
+            Platform::extensionLoaded('sockets') ? mt('monitoring', 'The PHP Module sockets is available.') : (
+                mt('monitoring', 'The PHP Module sockets is not available.')
+            )
+        );
+
+        return $requirements;
     }
 }

From 9dd179d8f387f7214a8c7b4b8b550acdbbd002c9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 13:18:29 +0100
Subject: [PATCH 0450/2920] rpm: Fix shadow-utils requirement on SUSE

---
 icingaweb2.spec | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index 312d6ee39..ca1345dc2 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -29,7 +29,6 @@ Packager:       Icinga Team <info@icinga.org>
 %endif
 %endif
 
-
 %if 0%{?suse_version}
 %define wwwconfigdir    %{_sysconfdir}/apache2/conf.d
 %define wwwuser         wwwrun
@@ -43,15 +42,17 @@ Requires: apache2-mod_php5
 %endif
 %endif
 
-Requires(pre):  shadow-utils
-Requires:       %{name}-common = %{version}-%{release}
-Requires:       php-Icinga = %{version}-%{release}
-Requires:       %{name}-vendor-dompdf
-Requires:       %{name}-vendor-HTMLPurifier
-Requires:       %{name}-vendor-JShrink
-Requires:       %{name}-vendor-lessphp
-Requires:       %{name}-vendor-Parsedown
-Requires:       %{zend}
+%{?fedora:Requires(pre):        shadow-utils}
+%{?rhel:Requires(pre):          shadow-utils}
+%{?suse_version:Requires(pre):  pwdutils}
+Requires:                       %{name}-common = %{version}-%{release}
+Requires:                       php-Icinga = %{version}-%{release}
+Requires:                       %{name}-vendor-dompdf
+Requires:                       %{name}-vendor-HTMLPurifier
+Requires:                       %{name}-vendor-JShrink
+Requires:                       %{name}-vendor-lessphp
+Requires:                       %{name}-vendor-Parsedown
+Requires:                       %{zend}
 
 
 %description
@@ -68,8 +69,11 @@ Icinga Web 2
 
 
 %package common
-Summary:    Common files for Icinga Web 2 and the Icinga CLI
-Group:      Applications/System
+Summary:                        Common files for Icinga Web 2 and the Icinga CLI
+Group:                          Applications/System
+%{?fedora:Requires(pre):        shadow-utils}
+%{?rhel:Requires(pre):          shadow-utils}
+%{?suse_version:Requires(pre):  pwdutils}
 
 %description common
 Common files for Icinga Web 2 and the Icinga CLI

From 65a2c47506588c0e48827bf89f37b681da8d30d3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 13:29:47 +0100
Subject: [PATCH 0451/2920] security: Provide permissions for our config
 actions

---
 application/forms/Security/RoleForm.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index f32c0cab4..18926972c 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -21,7 +21,14 @@ class RoleForm extends ConfigForm
      *
      * @type array
      */
-    protected $providedPermissions = array('*' => '*');
+    protected $providedPermissions = array(
+        '*'                             => '*',
+        'system/config/*'               => 'system/config/*',
+        'system/config/application'     => 'system/config/application',
+        'system/config/authentication'  => 'system/config/authentication',
+        'system/config/resources'       => 'system/config/resources',
+        'system/config/roles'           => 'system/config/roles'
+    );
 
     /**
      * Provided restrictions by currently loaded modules

From 72a616ede61c2bf3e25a32292593d55d0720ff42 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 13:30:18 +0100
Subject: [PATCH 0452/2920] spec: Fix license of Icinga Web 2

Vendor packages not yet concerned.
---
 icingaweb2.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index ca1345dc2..f747c3327 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -5,7 +5,7 @@ Version:        2.0.0
 Release:        %{revision}%{?dist}
 Summary:        Icinga Web 2
 Group:          Applications/System
-License:        GPL
+License:        GPLv2+
 URL:            https://icinga.org
 Source0:        https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
 BuildArch:      noarch

From d72e506202931488fb69740b47575272236549e0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 13:45:55 +0100
Subject: [PATCH 0453/2920] spec: Add lincese tag to vendor packages

---
 icingaweb2.spec | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index f747c3327..94d280fb8 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -110,6 +110,7 @@ Version:    0.6.1
 Release:    1%{?dist}
 Summary:    Icinga Web 2 vendor library dompdf
 Group:      Development/Libraries
+License:    LGPLv2.1
 Requires:   %{php} >= 5.3.0
 
 %description vendor-dompdf
@@ -121,6 +122,7 @@ Version:    4.6.0
 Release:    1%{?dist}
 Summary:    Icinga Web 2 vendor library HTMLPurifier
 Group:      Development/Libraries
+License:    LGPLv2.1
 Requires:   %{php} >= 5.3.0
 
 %description vendor-HTMLPurifier
@@ -132,6 +134,7 @@ Version:    1.0.1
 Release:    1%{?dist}
 Summary:    Icinga Web 2 vendor library JShrink
 Group:      Development/Libraries
+License:    BSD
 Requires:   %{php} >= 5.3.0
 
 %description vendor-JShrink
@@ -143,6 +146,7 @@ Version:    0.4.0
 Release:    1%{?dist}
 Summary:    Icinga Web 2 vendor library lessphp
 Group:      Development/Libraries
+License:    MIT
 Requires:   %{php} >= 5.3.0
 
 %description vendor-lessphp
@@ -154,6 +158,7 @@ Version:    1.0.0
 Release:    1%{?dist}
 Summary:    Icinga Web 2 vendor library Parsedown
 Group:      Development/Libraries
+License:    MIT
 Requires:   %{php} >= 5.3.0
 
 %description vendor-Parsedown
@@ -165,6 +170,7 @@ Version:    1.12.9
 Release:    1%{?dist}
 Summary:    Icinga Web 2 vendor library Zend Framework
 Group:      Development/Libraries
+License:    BSD
 Requires:   %{php} >= 5.3.0
 
 %description vendor-Zend

From 17b6d8512b54c27bc9afd3b0614965a6772501cf Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 30 Jan 2015 13:46:49 +0100
Subject: [PATCH 0454/2920] spec: Add MIT and BSD to the license tag

We ship jquery and some jquery plugins w/ Icinga Web 2. Their licenses
must be noted too.
---
 icingaweb2.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index 94d280fb8..a012751ea 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -5,7 +5,7 @@ Version:        2.0.0
 Release:        %{revision}%{?dist}
 Summary:        Icinga Web 2
 Group:          Applications/System
-License:        GPLv2+
+License:        GPLv2+ and MIT and BSD
 URL:            https://icinga.org
 Source0:        https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
 BuildArch:      noarch

From 6ec2ee753d2212b1a4c77505a06bfd3d6a846853 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 30 Jan 2015 14:50:25 +0100
Subject: [PATCH 0455/2920] Render error messages in the container itself

fixes #6280
---
 application/controllers/ErrorController.php |  1 +
 application/views/scripts/error/error.phtml |  5 +++--
 public/js/icinga/loader.js                  | 16 +---------------
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index 0548b5c9c..e198eca1c 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -19,6 +19,7 @@ class ErrorController extends ActionController
     {
         $error      = $this->_getParam('error_handler');
         $exception  = $error->exception;
+        $this->getTabs()->showOnlyCloseButton();
 
         Logger::error($exception);
         Logger::error('Stacktrace: %s', $exception->getTraceAsString());
diff --git a/application/views/scripts/error/error.phtml b/application/views/scripts/error/error.phtml
index 2a900651b..8e61e80f8 100644
--- a/application/views/scripts/error/error.phtml
+++ b/application/views/scripts/error/error.phtml
@@ -1,8 +1,9 @@
-<?php if ($this->title): ?>
 <div class="controls">
+<?= $this->tabs->render($this) ?>
+<?php if ($this->title): ?>
 <h1><?= $this->escape($title) ?></h1>
-</div>
 <?php endif ?>
+</div>
 <div class="content">
 <?php if ($this->message): ?>
   <p><strong><?= nl2br($this->escape($message)) ?></strong></p>
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 31a0d10a8..95ac5beeb 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -594,18 +594,7 @@
         onFailure: function (req, textStatus, errorThrown) {
             var url = req.url;
 
-            if (req.status === 500) {
-                if (this.exception === null) {
-                    req.$target.addClass('impact');
-
-                    this.exception = this.createNotice(
-                        'error',
-                        $('h1', $(req.responseText)).first().html(),
-                        true
-                    );
-                    this.icinga.ui.fixControls();
-                }
-            } else if (req.status > 0) {
+            if (req.status > 0) {
                 this.icinga.logger.error(
                     req.status,
                     errorThrown + ':',
@@ -617,9 +606,6 @@
                     req.action,
                     req.autorefresh
                 );
-
-                // Header example:
-                // Icinga.debug(req.getResponseHeader('X-Icinga-Redirect'));
             } else {
                 if (errorThrown === 'abort') {
                     this.icinga.logger.debug(

From 7b8332ccd89d102ea672a6d3eb4c48045969f97a Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 30 Jan 2015 15:25:03 +0100
Subject: [PATCH 0456/2920] Notifications do not disappear after autorefresh

This is not affected anymore because the errors goes directly
into the container. But this commit fixes the codes if someone
use the notifications in the loader. Also remove unused
variable this.exception.

fixes #6278
---
 public/js/icinga/loader.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 95ac5beeb..7d590757b 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -24,8 +24,6 @@
 
         this.failureNotice = null;
 
-        this.exception = null;
-
         /**
          * Pending requests
          */
@@ -313,15 +311,12 @@
         onResponse: function (data, textStatus, req) {
             var self = this;
             if (this.failureNotice !== null) {
-                this.failureNotice.remove();
+                if (! this.failureNotice.hasClass('fading-out')) {
+                    this.failureNotice.remove();
+                }
                 this.failureNotice = null;
             }
 
-            if (this.exception !== null) {
-                this.exception.remove();
-                this.exception = null;
-            }
-
             // Remove 'impact' class if there was such
             if (req.$target.hasClass('impact')) {
                 req.$target.removeClass('impact');
@@ -646,7 +641,13 @@
             var $notice = $(
                 '<li class="' + c + '">' + message + '</li>'
             ).appendTo($('#notifications'));
+
             this.icinga.ui.fixControls();
+
+            if (!persist) {
+                this.icinga.ui.fadeNotificationsAway();
+            }
+
             return $notice;
         },
 

From fdcec046e057f0eb4a765459caa71ebd2e3affce Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 30 Jan 2015 15:42:22 +0100
Subject: [PATCH 0457/2920] Make File::create(.., $recursive = true) create
 missing nested directories

refs #8219
---
 library/Icinga/Util/File.php | 72 +++++++++++++++++++++++++++++++++---
 1 file changed, 66 insertions(+), 6 deletions(-)

diff --git a/library/Icinga/Util/File.php b/library/Icinga/Util/File.php
index 9ce1ec893..99421b33d 100644
--- a/library/Icinga/Util/File.php
+++ b/library/Icinga/Util/File.php
@@ -23,6 +23,13 @@ class File extends SplFileObject
      */
     protected $openMode;
 
+    /**
+     * The access mode to use when creating directories
+     *
+     * @var int
+     */
+    public static $dirMode = 1528; // 2770
+
     /**
      * @see SplFileObject::__construct()
      */
@@ -37,21 +44,74 @@ class File extends SplFileObject
     }
 
     /**
-     * Create a file with an access mode
+     * Create a file using the given access mode and return a instance of File open for writing
      *
      * @param   string  $path           The path to the file
      * @param   int     $accessMode     The access mode to set
+     * @param   bool    $recursive      Whether missing nested directories of the given path should be created
+     *
+     * @return  File
      *
      * @throws  RuntimeException        In case the file cannot be created or the access mode cannot be set
+     * @throws  NotWritableError        In case the path's (existing) parent is not writable
      */
-    public static function create($path, $accessMode)
+    public static function create($path, $accessMode, $recursive = true)
     {
-        if (!@touch($path)) {
-            throw new RuntimeException('Cannot create file "' . $path . '" with acces mode "' . $accessMode . '"');
+        $dirPath = dirname($path);
+        if ($recursive && !is_dir($dirPath)) {
+            static::createDirectories($dirPath);
+        } elseif (! is_writable($dirPath)) {
+            throw new NotWritableError(sprintf('Path "%s" is not writable', $dirPath));
         }
 
-        if (!@chmod($path, $accessMode)) {
-            throw new RuntimeException('Cannot set access mode "' . $accessMode . '" on file "' . $path . '"');
+        $file = new static($path, 'x');
+
+        if (! @chmod($path, $accessMode)) {
+            $error = error_get_last();
+            throw new RuntimeException(sprintf(
+                'Cannot set access mode "%s" on file "%s" (%s)',
+                decoct($accessMode),
+                $path,
+                $error['message']
+            ));
+        }
+
+        return $file;
+    }
+
+    /**
+     * Create missing directories
+     *
+     * @param   string  $path
+     *
+     * @throws  RuntimeException        In case a directory cannot be created or the access mode cannot be set
+     */
+    protected static function createDirectories($path)
+    {
+        $part = strpos($path, DIRECTORY_SEPARATOR) === 0 ? DIRECTORY_SEPARATOR : '';
+        foreach (explode(DIRECTORY_SEPARATOR, ltrim($path, DIRECTORY_SEPARATOR)) as $dir) {
+            $part .= $dir . DIRECTORY_SEPARATOR;
+
+            if (! is_dir($part)) {
+                if (! @mkdir($part, static::$dirMode)) {
+                    $error = error_get_last();
+                    throw new RuntimeException(sprintf(
+                        'Failed to create missing directory "%s" (%s)',
+                        $part,
+                        $error['message']
+                    ));
+                }
+
+                if (! @chmod($part, static::$dirMode)) {
+                    $error = error_get_last();
+                    throw new RuntimeException(sprintf(
+                        'Failed to set access mode "%s" for directory "%s" (%s)',
+                        decoct(static::$dirMode),
+                        $part,
+                        $error['message']
+                    ));
+                }
+            }
         }
     }
 

From 9426a5bd234ef75eb468cdb98d2468029dd0a57b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 30 Jan 2015 15:43:02 +0100
Subject: [PATCH 0458/2920] Use File::create() in Config::saveIni() to create
 missing nested directories

refs #8219
---
 library/Icinga/Application/Config.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/library/Icinga/Application/Config.php b/library/Icinga/Application/Config.php
index 8d4914316..484cff6df 100644
--- a/library/Icinga/Application/Config.php
+++ b/library/Icinga/Application/Config.php
@@ -8,6 +8,7 @@ use Iterator;
 use Countable;
 use LogicException;
 use UnexpectedValueException;
+use Icinga\Util\File;
 use Icinga\Data\ConfigObject;
 use Icinga\File\Ini\IniWriter;
 use Icinga\Exception\NotReadableError;
@@ -320,6 +321,10 @@ class Config implements Countable, Iterator
             throw new LogicException('You need to pass $filePath or set a path using Config::setConfigFile()');
         }
 
+        if (! file_exists($filePath)) {
+            File::create($filePath, $fileMode);
+        }
+
         $this->getIniWriter($filePath, $fileMode)->write();
     }
 

From 6416fc421c8c4d89edf92d4db5734b9a6131e4ab Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 30 Jan 2015 15:43:39 +0100
Subject: [PATCH 0459/2920] Do not create directories which are created
 automatically if necessary

refs #8219
---
 .../library/Monitoring/MonitoringWizard.php          |  4 ----
 modules/setup/library/Setup/WebWizard.php            | 12 +-----------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index d7a3671a4..f02faa4f3 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -4,14 +4,12 @@
 
 namespace Icinga\Module\Monitoring;
 
-use Icinga\Application\Icinga;
 use Icinga\Web\Form;
 use Icinga\Web\Wizard;
 use Icinga\Web\Request;
 use Icinga\Module\Setup\Setup;
 use Icinga\Module\Setup\SetupWizard;
 use Icinga\Module\Setup\Requirements;
-use Icinga\Module\Setup\Utils\MakeDirStep;
 use Icinga\Module\Setup\Forms\SummaryPage;
 use Icinga\Module\Monitoring\Forms\Setup\WelcomePage;
 use Icinga\Module\Monitoring\Forms\Setup\BackendPage;
@@ -108,8 +106,6 @@ class MonitoringWizard extends Wizard implements SetupWizard
         $pageData = $this->getPageData();
         $setup = new Setup();
 
-        $setup->addStep(new MakeDirStep(array(Icinga::app()->getConfigDir() . '/modules/monitoring'), 2770));
-
         $setup->addStep(
             new BackendStep(array(
                 'backendConfig'     => $pageData['setup_monitoring_backend'],
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 8ae7344ea..c073723a3 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -334,17 +334,7 @@ class WebWizard extends Wizard implements SetupWizard
             );
         }
 
-        $configDir = Icinga::app()->getConfigDir();
-        $setup->addStep(
-            new MakeDirStep(
-                array(
-                    $configDir . DIRECTORY_SEPARATOR . 'modules',
-                    $configDir . DIRECTORY_SEPARATOR . 'preferences',
-                    $configDir . DIRECTORY_SEPARATOR . 'enabledModules'
-                ),
-                2770
-            )
-        );
+        $setup->addStep(new MakeDirStep(array(Config::resolvePath('enabledModules')), 2770));
 
         foreach ($this->getWizards() as $wizard) {
             if ($wizard->isComplete()) {

From d2dd66c9fd25b63287ae94363415f73007a3c64b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 30 Jan 2015 15:47:11 +0100
Subject: [PATCH 0460/2920] Revert "setup: Fix octdec for directory modes"

This reverts commit c0444a81b24aea332b07eb1409af168c1c53f0c9.
---
 modules/setup/library/Setup/Utils/MakeDirStep.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/library/Setup/Utils/MakeDirStep.php b/modules/setup/library/Setup/Utils/MakeDirStep.php
index d7813541b..27919820b 100644
--- a/modules/setup/library/Setup/Utils/MakeDirStep.php
+++ b/modules/setup/library/Setup/Utils/MakeDirStep.php
@@ -21,7 +21,7 @@ class MakeDirStep extends Step
     public function __construct($paths, $dirmode)
     {
         $this->paths = $paths;
-        $this->dirmode = octdec((string) $dirmode);
+        $this->dirmode = octdec($dirmode);
         $this->errors = array();
     }
 

From a95fd561cd09c91f094bfd65f58560945863c92b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 30 Jan 2015 15:47:21 +0100
Subject: [PATCH 0461/2920] Revert "setup: Convert octal directory mode to
 decimal notation"

This reverts commit e93e8f633045d7fd0f844e797848d4d6fe32ca9e.
---
 modules/setup/library/Setup/Utils/MakeDirStep.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/setup/library/Setup/Utils/MakeDirStep.php b/modules/setup/library/Setup/Utils/MakeDirStep.php
index 27919820b..b758ccd79 100644
--- a/modules/setup/library/Setup/Utils/MakeDirStep.php
+++ b/modules/setup/library/Setup/Utils/MakeDirStep.php
@@ -16,12 +16,12 @@ class MakeDirStep extends Step
 
     /**
      * @param array $paths
-     * @param int   $dirmode    Directory mode in octal notation
+     * @param int   $dirmode
      */
     public function __construct($paths, $dirmode)
     {
         $this->paths = $paths;
-        $this->dirmode = octdec($dirmode);
+        $this->dirmode = $dirmode;
         $this->errors = array();
     }
 

From f5a651664c2a2085c761aa8fbbff927c11fb310f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 30 Jan 2015 16:16:12 +0100
Subject: [PATCH 0462/2920] Create the enabledModules directory when necessary
 only as well

refs #8219
---
 .../Icinga/Application/Modules/Manager.php    | 46 +++++++++----------
 modules/setup/library/Setup/WebWizard.php     |  2 -
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php
index 7ee2461f9..0a1b23f78 100644
--- a/library/Icinga/Application/Modules/Manager.php
+++ b/library/Icinga/Application/Modules/Manager.php
@@ -103,25 +103,22 @@ class Manager
      */
     private function detectEnabledModules()
     {
-        $canonical = $this->enableDir;
-        if ($canonical === false || ! file_exists($canonical)) {
-            // TODO: I guess the check for false has something to do with a
-            //       call to realpath no longer present
+        if (! file_exists($this->enableDir)) {
             return;
         }
-        if (!is_dir($this->enableDir)) {
+        if (! is_dir($this->enableDir)) {
             throw new NotReadableError(
                 'Cannot read enabled modules. Module directory "%s" is not a directory',
                 $this->enableDir
             );
         }
-        if (!is_readable($this->enableDir)) {
+        if (! is_readable($this->enableDir)) {
             throw new NotReadableError(
                 'Cannot read enabled modules. Module directory "%s" is not readable',
                 $this->enableDir
             );
         }
-        if (($dh = opendir($canonical)) !== false) {
+        if (($dh = opendir($this->enableDir)) !== false) {
             $this->enabledDirs = array();
             while (($file = readdir($dh)) !== false) {
 
@@ -129,7 +126,7 @@ class Manager
                     continue;
                 }
 
-                $link = $this->enableDir . '/' . $file;
+                $link = $this->enableDir . DIRECTORY_SEPARATOR . $file;
                 if (! is_link($link)) {
                     Logger::warning(
                         'Found invalid module in enabledModule directory "%s": "%s" is not a symlink',
@@ -140,7 +137,7 @@ class Manager
                 }
 
                 $dir = realpath($link);
-                if (!file_exists($dir) || !is_dir($dir)) {
+                if (! file_exists($dir) || !is_dir($dir)) {
                     Logger::warning(
                         'Found invalid module in enabledModule directory "%s": "%s" points to non existing path "%s"',
                         $this->enableDir,
@@ -208,7 +205,7 @@ class Manager
      */
     public function enableModule($name)
     {
-        if (!$this->hasInstalled($name)) {
+        if (! $this->hasInstalled($name)) {
             throw new ConfigurationError(
                 'Cannot enable module "%s". Module is not installed.',
                 $name
@@ -217,11 +214,16 @@ class Manager
 
         clearstatcache(true);
         $target = $this->installedBaseDirs[$name];
-        $link = $this->enableDir . '/' . $name;
+        $link = $this->enableDir . DIRECTORY_SEPARATOR . $name;
 
-        if (! is_dir($this->enableDir)) {
-            throw new NotFoundError('Cannot enable module "%s". Path "%s" not found.', $name, $this->enableDir);
-        } elseif (!is_writable($this->enableDir)) {
+        if (! is_dir($this->enableDir) && !@mkdir($this->enableDir, 02770, true)) {
+            $error = error_get_last();
+            throw new SystemPermissionException(
+                'Failed to create enabledModule directory "%s" (%s)',
+                $this->enableDir,
+                $error['message']
+            );
+        } elseif (! is_writable($this->enableDir)) {
             throw new SystemPermissionException(
                 'Cannot enable module "%s". Insufficient system permissions for enabling modules.',
                 $name
@@ -232,7 +234,7 @@ class Manager
             return $this;
         }
 
-        if (!@symlink($target, $link)) {
+        if (! @symlink($target, $link)) {
             $error = error_get_last();
             if (strstr($error["message"], "File exists") === false) {
                 throw new SystemPermissionException(
@@ -246,9 +248,7 @@ class Manager
         }
 
         $this->enabledDirs[$name] = $link;
-
         $this->loadModule($name);
-
         return $this;
     }
 
@@ -264,22 +264,22 @@ class Manager
      */
     public function disableModule($name)
     {
-        if (!$this->hasEnabled($name)) {
+        if (! $this->hasEnabled($name)) {
             return $this;
         }
-        if (!is_writable($this->enableDir)) {
+        if (! is_writable($this->enableDir)) {
             throw new SystemPermissionException(
                 'Could not disable module. Module path is not writable.'
             );
         }
-        $link = $this->enableDir . '/' . $name;
-        if (!file_exists($link)) {
+        $link = $this->enableDir . DIRECTORY_SEPARATOR . $name;
+        if (! file_exists($link)) {
             throw new ConfigurationError(
                 'Could not disable module. The module %s was not found.',
                 $name
             );
         }
-        if (!is_link($link)) {
+        if (! is_link($link)) {
             throw new ConfigurationError(
                 'Could not disable module. The module "%s" is not a symlink. '
                 . 'It looks like you have installed this module manually and moved it to your module folder. '
@@ -290,7 +290,7 @@ class Manager
         }
 
         if (file_exists($link) && is_link($link)) {
-            if (!@unlink($link)) {
+            if (! @unlink($link)) {
                 $error = error_get_last();
                 throw new SystemPermissionException(
                     'Could not disable module "%s" due to file system errors. '
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index c073723a3..b580101ed 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -334,8 +334,6 @@ class WebWizard extends Wizard implements SetupWizard
             );
         }
 
-        $setup->addStep(new MakeDirStep(array(Config::resolvePath('enabledModules')), 2770));
-
         foreach ($this->getWizards() as $wizard) {
             if ($wizard->isComplete()) {
                 $setup->addSteps($wizard->getSetup()->getSteps());

From ad4ebf8fa5b40d224b8d681440554b1357ee6237 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Sun, 1 Feb 2015 23:30:48 +0100
Subject: [PATCH 0463/2920] monitoring: Fix that selecting a hostgroup displays
 its services instead of its hosts

fixes #8273
---
 .../application/views/scripts/list/hostgroups.phtml           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index cd3e68d7f..7d67c9d3a 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -28,7 +28,7 @@
     </thead>
     <tbody>
     <?php foreach ($hostgroups as $h): ?>
-      <tr href="<?= $this->href('monitoring/list/services', array('hostgroup' => $h->hostgroup)); ?>">
+      <tr href="<?= $this->href('monitoring/list/hosts', array('hostgroup' => $h->hostgroup)) ?>">
        <?php if ($h->services_critical_last_state_change_unhandled): ?>
         <td class="state change critical unhandled">
           <strong><?= $this->translate('CRITICAL'); ?></strong>
@@ -84,7 +84,7 @@
           </a>
         </td>
         <td class="total">
-          <?= $h->services_total; ?>
+            <?= $this->qlink($h->services_total, 'monitoring/list/services', array('hostgroup' => $h->hostgroup)) ?>
         </td>
         <td class="state">
         <?php if ($h->services_ok): ?>

From f2d639108f15f75796129d2005163ae2bea46c77 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 00:08:25 +0100
Subject: [PATCH 0464/2920] monitoring: Move "Service Grid" beneath "Problems"

The service grid is filtered by problems by default. Thus it makes sense
to move it beneath the problems section.
---
 modules/monitoring/configuration.php | 39 +++++++++++++++-------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index 7eb3bbedf..f34b4b0f5 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -87,29 +87,36 @@ $this->provideSearchUrl($this->translate('Servicegroups'), 'monitoring/list/serv
  * Problems Section
  */
 $section = $this->menuSection($this->translate('Problems'), array(
-    'renderer' => 'ProblemMenuItemRenderer',
-    'icon'     => 'block',
-    'priority' => 20
+    'renderer'  => 'ProblemMenuItemRenderer',
+    'icon'      => 'block',
+    'priority'  => 20
 ));
 $section->add($this->translate('Unhandled Hosts'), array(
-    'renderer' => 'UnhandledHostMenuItemRenderer',
-    'url'      => 'monitoring/list/hosts?host_problem=1&host_handled=0',
-    'priority' => 40
+    'renderer'  => 'UnhandledHostMenuItemRenderer',
+    'url'       => 'monitoring/list/hosts?host_problem=1&host_handled=0',
+    'priority'  => 30
 ));
 $section->add($this->translate('Unhandled Services'), array(
-    'renderer' => 'UnhandledServiceMenuItemRenderer',
-    'url'      => 'monitoring/list/services?service_problem=1&service_handled=0&sort=service_severity',
-    'priority' => 40
+    'renderer'  => 'UnhandledServiceMenuItemRenderer',
+    'url'       => 'monitoring/list/services?service_problem=1&service_handled=0&sort=service_severity',
+    'priority'  => 40
 ));
 $section->add($this->translate('Host Problems'), array(
-    'url'      => 'monitoring/list/hosts?host_problem=1&sort=host_severity',
-    'priority' => 50
+    'url'       => 'monitoring/list/hosts?host_problem=1&sort=host_severity',
+    'priority'  => 50
 ));
 $section->add($this->translate('Service Problems'), array(
-    'url'      => 'monitoring/list/services?service_problem=1&sort=service_severity&dir=desc',
-    'priority' => 50
+    'url'       => 'monitoring/list/services?service_problem=1&sort=service_severity&dir=desc',
+    'priority'  => 60
+));
+$section->add($this->translate('Service Grid'), array(
+    'url'       => 'monitoring/list/servicegrid?service_problem=1',
+    'priority'  => 70
+));
+$section->add($this->translate('Current Downtimes'), array(
+    'url'       => 'monitoring/list/downtimes?downtime_is_in_effect=1',
+    'priority'  => 80
 ));
-$section->add($this->translate('Current Downtimes'))->setUrl('monitoring/list/downtimes?downtime_is_in_effect=1');
 
 /*
  * Overview Section
@@ -130,10 +137,6 @@ $section->add($this->translate('Services'), array(
     'url'      => 'monitoring/list/services',
     'priority' => 50
 ));
-$section->add($this->translate('Service Grid'), array(
-    'url'      => 'monitoring/list/servicegrid?service_problem=1',
-    'priority' => 51
-));
 $section->add($this->translate('Servicegroups'), array(
     'url'      => 'monitoring/list/servicegroups',
     'priority' => 60

From 734c7b35466c42da5509ed3d0605190f69d9357e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 11:04:41 +0100
Subject: [PATCH 0465/2920] monitoring: Show close button when updating an
 instance

---
 .../application/views/scripts/config/editinstance.phtml      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/config/editinstance.phtml b/modules/monitoring/application/views/scripts/config/editinstance.phtml
index b12f262c3..2c91ee656 100644
--- a/modules/monitoring/application/views/scripts/config/editinstance.phtml
+++ b/modules/monitoring/application/views/scripts/config/editinstance.phtml
@@ -1,2 +1,5 @@
+<div class="controls">
+    <?= $tabs->showOnlyCloseButton() ?>
+</div>
 <h4><?= $this->translate('Edit Existing Instance'); ?></h4>
-<?= $form; ?>
\ No newline at end of file
+<?= $form; ?>

From d7cbfebbd0c9b0c7a3e3db66b0d3725691b9b63a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 11:05:32 +0100
Subject: [PATCH 0466/2920] monitoring: Show close button when removing an
 instance

---
 .../application/views/scripts/config/removeinstance.phtml    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/config/removeinstance.phtml b/modules/monitoring/application/views/scripts/config/removeinstance.phtml
index 306d41815..eee29fb02 100644
--- a/modules/monitoring/application/views/scripts/config/removeinstance.phtml
+++ b/modules/monitoring/application/views/scripts/config/removeinstance.phtml
@@ -1,4 +1,7 @@
+<div class="controls">
+    <?= $tabs->showOnlyCloseButton() ?>
+</div>
 <h4><?= $this->translate('Remove Existing Instance'); ?></h4>
 <p><?= $this->translate('Are you sure you want to remove this instance?'); ?></p>
 <p><?= $this->translate('If you have still any environments or views referring to this instance, you won\'t be able to send commands anymore after deletion.'); ?></p>
-<?= $form; ?>
\ No newline at end of file
+<?= $form; ?>

From cbc1a0313ab129e87a68672e93ac02a9df493f02 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 11:05:50 +0100
Subject: [PATCH 0467/2920] monitoring: Show close button when creating a
 backend

---
 .../application/views/scripts/config/createbackend.phtml     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/config/createbackend.phtml b/modules/monitoring/application/views/scripts/config/createbackend.phtml
index 0ef51cd6a..10ee02541 100644
--- a/modules/monitoring/application/views/scripts/config/createbackend.phtml
+++ b/modules/monitoring/application/views/scripts/config/createbackend.phtml
@@ -1,2 +1,5 @@
+<div class="controls">
+    <?= $tabs->showOnlyCloseButton() ?>
+</div>
 <h4><?= $this->translate('Add New Backend'); ?></h4>
-<?= $form; ?>
\ No newline at end of file
+<?= $form; ?>

From 42fe7079eee7ce804a890c7edef656ce4dcec211 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 11:06:20 +0100
Subject: [PATCH 0468/2920] monitoring: Show close button when creating an
 instance

---
 .../application/views/scripts/config/createinstance.phtml  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/config/createinstance.phtml b/modules/monitoring/application/views/scripts/config/createinstance.phtml
index 49c8b5ec5..3515514df 100644
--- a/modules/monitoring/application/views/scripts/config/createinstance.phtml
+++ b/modules/monitoring/application/views/scripts/config/createinstance.phtml
@@ -1,2 +1,5 @@
-<h4><?= $this->translate('Add New Instance'); ?></h4>
-<?= $form; ?>
\ No newline at end of file
+<div class="controls">
+    <?= $tabs->showOnlyCloseButton() ?>
+</div>
+<h4><?= $this->translate('Add New Instance') ?></h4>
+<?= $form; ?>

From a62acb4a8205972998604c6f9cf9f90e35a48a5e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 11:06:40 +0100
Subject: [PATCH 0469/2920] monitoring: Show close button when updating a
 backend

---
 .../application/views/scripts/config/editbackend.phtml     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/config/editbackend.phtml b/modules/monitoring/application/views/scripts/config/editbackend.phtml
index 58b6c18f1..630cb83f2 100644
--- a/modules/monitoring/application/views/scripts/config/editbackend.phtml
+++ b/modules/monitoring/application/views/scripts/config/editbackend.phtml
@@ -1,2 +1,5 @@
-<h4><?= $this->translate('Edit Existing Backend'); ?></h4>
-<?= $form; ?>
\ No newline at end of file
+<div class="controls">
+    <?= $tabs->showOnlyCloseButton() ?>
+</div>
+<h4><?= $this->translate('Edit Existing Backend') ?></h4>
+<?= $form; ?>

From cf944a7daf5708e001b4f8f7b732970f2ebf489e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 11:07:01 +0100
Subject: [PATCH 0470/2920] monitoring: Show close button when removing a
 backend

---
 .../application/views/scripts/config/removebackend.phtml   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/config/removebackend.phtml b/modules/monitoring/application/views/scripts/config/removebackend.phtml
index fc7da17e3..d297f615b 100644
--- a/modules/monitoring/application/views/scripts/config/removebackend.phtml
+++ b/modules/monitoring/application/views/scripts/config/removebackend.phtml
@@ -1,2 +1,5 @@
-<h4><?= $this->translate('Remove Existing Backend'); ?></h4>
-<?= $form; ?>
\ No newline at end of file
+<div class="controls">
+    <?= $tabs->showOnlyCloseButton() ?>
+</div>
+<h4><?= $this->translate('Remove Existing Backend') ?></h4>
+<?= $form; ?>

From cfe6701a924e08e012195704db8bc6bcc730767a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 11:08:27 +0100
Subject: [PATCH 0471/2920] Show close button when creating a role

refs #8087
---
 application/views/scripts/roles/new.phtml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/views/scripts/roles/new.phtml b/application/views/scripts/roles/new.phtml
index d7b277008..4c21c6f6b 100644
--- a/application/views/scripts/roles/new.phtml
+++ b/application/views/scripts/roles/new.phtml
@@ -1,4 +1,5 @@
 <div class="controls">
+    <?= $tabs->showOnlyCloseButton() ?>
     <h1><?= $this->translate('New Role') ?></h1>
 </div>
 <div class="content">

From 3818f1faec3d323cf064787bafb071f0ffb80f8e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 11:08:56 +0100
Subject: [PATCH 0472/2920] Show close button when removing a role

refs #8087
---
 application/views/scripts/roles/remove.phtml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/views/scripts/roles/remove.phtml b/application/views/scripts/roles/remove.phtml
index e2d01ed62..4abff566a 100644
--- a/application/views/scripts/roles/remove.phtml
+++ b/application/views/scripts/roles/remove.phtml
@@ -1,4 +1,5 @@
 <div class="controls">
+    <?= $tabs->showOnlyCloseButton() ?>
     <h1><?= sprintf($this->translate('Remove Role %s'), $name) ?></h1>
 </div>
 <div class="content">

From d64ca3da99e6e8277e5f5d1bba37bc61efa489b2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 11:09:13 +0100
Subject: [PATCH 0473/2920] Show close button when updating a role

fixes #8087
---
 application/views/scripts/roles/update.phtml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/views/scripts/roles/update.phtml b/application/views/scripts/roles/update.phtml
index 44f756b06..f48f1ca69 100644
--- a/application/views/scripts/roles/update.phtml
+++ b/application/views/scripts/roles/update.phtml
@@ -1,4 +1,5 @@
 <div class="controls">
+    <?= $tabs->showOnlyCloseButton() ?>
     <h1><?= sprintf($this->translate('Update Role %s'), $name) ?></h1>
 </div>
 <div class="content">

From f9047e85c50ca8b70851cbe2be78dad9286b503d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 11:12:27 +0100
Subject: [PATCH 0474/2920] monitoring: Fix wrong unhandled service problems
 count in the hosts overview

The query was missing the is_active = 1 condition. I'll open an issue for the other
affected queries.

fixes #8013
---
 .../Backend/Ido/Query/StatusQuery.php         | 52 ++++++++++---------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index 0cc807ac8..cd7d0aef7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -518,31 +518,35 @@ class StatusQuery extends IdoQuery
 
     protected function joinServiceproblemsummary()
     {
-        $sub = new Zend_Db_Expr('(SELECT'
-             . ' SUM(CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0 THEN 0 ELSE 1 END) AS unhandled_services_count,'
-             . ' SUM(CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0 THEN 1 ELSE 0 END) AS handled_services_count,'
-             . ' s.host_object_id FROM icinga_servicestatus ss'
-             . ' JOIN icinga_services s'
-             . ' ON s.service_object_id = ss.service_object_id'
-             . ' AND ss.current_state > 0'
-             . ' JOIN icinga_hoststatus hs'
-             . ' ON hs.host_object_id = s.host_object_id'
-             . ' GROUP BY s.host_object_id)');
+        $select = <<<'SQL'
+SELECT
+    SUM(
+        CASE WHEN(ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0
+        THEN 0
+        ELSE 1
+        END
+    ) AS unhandled_services_count,
+    SUM(
+        CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0) ) > 0
+        THEN 1
+        ELSE 0
+        END
+    ) AS handled_services_count,
+    s.host_object_id
+FROM
+    icinga_servicestatus ss
+    JOIN icinga_objects o ON o.object_id = ss.service_object_id
+    JOIN icinga_services s ON s.service_object_id = o.object_id
+    JOIN icinga_hoststatus hs ON hs.host_object_id = s.host_object_id
+WHERE
+    o.is_active = 1
+    AND o.objecttype_id = 2
+    AND ss.current_state > 0
+GROUP BY
+    s.host_object_id
+SQL;
         $this->select->joinLeft(
-            array('sps' => $sub),
-            'sps.host_object_id = hs.host_object_id',
-            array()
-        );
-        return;
-
-        $this->select->joinleft(
-            array ('sps' => new \Zend_Db_Expr(
-                '(SELECT COUNT(s.service_object_id) as unhandled_service_count, s.host_object_id as host_object_id '.
-                'FROM icinga_services s INNER JOIN icinga_servicestatus ss ON ss.current_state != 0 AND '.
-                'ss.problem_has_been_acknowledged = 0 AND ss.scheduled_downtime_depth = 0 AND '.
-                'ss.service_object_id = s.service_object_id '.
-                'GROUP BY s.host_object_id'.
-                ')')),
+            array('sps' => new Zend_Db_Expr('(' . $select . ')')),
             'sps.host_object_id = hs.host_object_id',
             array()
         );

From c0c0e7d9e53e1153e7ca7b873e8e39e9e2a37616 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 2 Feb 2015 11:57:50 +0100
Subject: [PATCH 0475/2920] Dashboard: Always replace title

This is needed if an error occurs and the exception title was rendered
into the container.
---
 public/js/icinga/loader.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 7d590757b..507a914e3 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -708,11 +708,12 @@
                 // $container.html(content);
 
             } else {
-                if ($container.closest('.dashboard').length &&
-                    ! $('h1', $content).length
+                if ($container.closest('.dashboard').length
                 ) {
-                    var title = $('h1', $container).first().detach();
-                    $('h1', $content).first().detach();
+                    if (! $('h1', $content).length) {
+                        var title = $('h1', $container).first().detach();
+                        $('h1', $content).first().detach();
+                    }
                     $container.html(title).append(content);
                 } else if (action === 'replace') {
                     $container.html(content);

From d1f13819e4e6e0a97b6dfed2c957f56c4ee1354a Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 2 Feb 2015 12:01:40 +0100
Subject: [PATCH 0476/2920] Revert "Dashboard: Always replace title"

This reverts commit c0c0e7d9e53e1153e7ca7b873e8e39e9e2a37616.

Syntax error
---
 public/js/icinga/loader.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 507a914e3..7d590757b 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -708,12 +708,11 @@
                 // $container.html(content);
 
             } else {
-                if ($container.closest('.dashboard').length
+                if ($container.closest('.dashboard').length &&
+                    ! $('h1', $content).length
                 ) {
-                    if (! $('h1', $content).length) {
-                        var title = $('h1', $container).first().detach();
-                        $('h1', $content).first().detach();
-                    }
+                    var title = $('h1', $container).first().detach();
+                    $('h1', $content).first().detach();
                     $container.html(title).append(content);
                 } else if (action === 'replace') {
                     $container.html(content);

From 190c1e8f042262f956d1d23019eb33d35feba0ca Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 2 Feb 2015 12:04:28 +0100
Subject: [PATCH 0477/2920] Revert "Revert "Dashboard: Always replace title""

This reverts commit d1f13819e4e6e0a97b6dfed2c957f56c4ee1354a.

Please do not ask. This was no syntax error.
---
 public/js/icinga/loader.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 7d590757b..507a914e3 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -708,11 +708,12 @@
                 // $container.html(content);
 
             } else {
-                if ($container.closest('.dashboard').length &&
-                    ! $('h1', $content).length
+                if ($container.closest('.dashboard').length
                 ) {
-                    var title = $('h1', $container).first().detach();
-                    $('h1', $content).first().detach();
+                    if (! $('h1', $content).length) {
+                        var title = $('h1', $container).first().detach();
+                        $('h1', $content).first().detach();
+                    }
                     $container.html(title).append(content);
                 } else if (action === 'replace') {
                     $container.html(content);

From 8c24dde17bce31cbf9e7e25a7d5f13dd588f8126 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 2 Feb 2015 12:08:20 +0100
Subject: [PATCH 0478/2920] Error Controller: Move close tab creation to
 template

---
 application/controllers/ErrorController.php | 1 -
 application/views/scripts/error/error.phtml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index e198eca1c..0548b5c9c 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -19,7 +19,6 @@ class ErrorController extends ActionController
     {
         $error      = $this->_getParam('error_handler');
         $exception  = $error->exception;
-        $this->getTabs()->showOnlyCloseButton();
 
         Logger::error($exception);
         Logger::error('Stacktrace: %s', $exception->getTraceAsString());
diff --git a/application/views/scripts/error/error.phtml b/application/views/scripts/error/error.phtml
index 8e61e80f8..d9422474c 100644
--- a/application/views/scripts/error/error.phtml
+++ b/application/views/scripts/error/error.phtml
@@ -1,5 +1,5 @@
 <div class="controls">
-<?= $this->tabs->render($this) ?>
+<?= $this->tabs->showOnlyCloseButton() ?>
 <?php if ($this->title): ?>
 <h1><?= $this->escape($title) ?></h1>
 <?php endif ?>

From 8c758a9f126f81cc50fe290691d284947ec1804d Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 2 Feb 2015 13:32:40 +0100
Subject: [PATCH 0479/2920] Failure requests: Fix auto refresh and history

Allow to change url's in history and stop auto auto refresh if
the container URL is not up to date.
---
 public/js/icinga/loader.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 507a914e3..4c273ffdb 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -107,7 +107,8 @@
                 url    : url,
                 data   : data,
                 headers: headers,
-                context: self
+                context: self,
+                failure: false
             });
 
             req.$target = $target;
@@ -553,7 +554,7 @@
             // Update history when necessary. Don't do so for requests triggered
             // by history or autorefresh events
             if (! req.historyTriggered && ! req.autorefresh) {
-                if (req.$target.hasClass('container')) {
+                if (req.$target.hasClass('container') && req.failure === false) {
                     // We only want to care about top-level containers
                     if (req.$target.parent().closest('.container').length === 0) {
                         this.icinga.history.pushCurrentState();
@@ -589,6 +590,17 @@
         onFailure: function (req, textStatus, errorThrown) {
             var url = req.url;
 
+            req.failure = true;
+
+            /*
+             * Test if a manual actions comes in and autorefresh is active: Stop refreshing
+             */
+            if (! req.historyTriggered && ! req.autorefresh && req.$target.data('icingaRefresh') > 0
+            && req.$target.data('icingaUrl') !== url) {
+                req.$target.data('icingaRefresh', 0);
+                req.$target.data('icingaUrl', url);
+            }
+
             if (req.status > 0) {
                 this.icinga.logger.error(
                     req.status,

From 53e7b44308a43b9b67fcecdaeef05e7adbf69722 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 13:29:55 +0100
Subject: [PATCH 0480/2920] security: Provide a permission for module
 configuration

---
 application/forms/Security/RoleForm.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 18926972c..cc5f4037e 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -26,6 +26,7 @@ class RoleForm extends ConfigForm
         'system/config/*'               => 'system/config/*',
         'system/config/application'     => 'system/config/application',
         'system/config/authentication'  => 'system/config/authentication',
+        'system/config/modules'         => 'system/config/modules',
         'system/config/resources'       => 'system/config/resources',
         'system/config/roles'           => 'system/config/roles'
     );

From 7a81133ad33231c62967ba721b4ca6147a54a8e7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 13:30:52 +0100
Subject: [PATCH 0481/2920] security: Guard configuring roles

---
 application/controllers/RolesController.php | 58 ++++++++++++++++-----
 1 file changed, 46 insertions(+), 12 deletions(-)

diff --git a/application/controllers/RolesController.php b/application/controllers/RolesController.php
index 90163812e..f4c6aeed2 100644
--- a/application/controllers/RolesController.php
+++ b/application/controllers/RolesController.php
@@ -1,6 +1,4 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Application\Config;
 use Icinga\Forms\ConfirmRemovalForm;
@@ -9,31 +7,57 @@ use Icinga\Web\Controller\ActionController;
 use Icinga\Web\Notification;
 use Icinga\Web\Widget;
 
+/**
+ * Roles configuration
+ */
 class RolesController extends ActionController
 {
+    /**
+     * Initialize tabs and validate the user's permissions
+     *
+     * @throws \Icinga\Security\SecurityException   If the user lacks permissions for configuring roles
+     */
     public function init()
     {
-        $this->view->tabs = Widget::create('tabs')->add('index', array(
-            'title' => $this->translate('Application'),
-            'url'   => 'config'
-        ))->add('authentication', array(
-            'title' => $this->translate('Authentication'),
-            'url'   => 'config/authentication'
-        ))->add('resources', array(
-            'title' => $this->translate('Resources'),
-            'url'   => 'config/resource'
-        ))->add('roles', array(
+        $this->assertPermission('system/config/roles');
+        $tabs = $this->getTabs();
+        $auth = $this->Auth();
+        if ($auth->hasPermission('system/config/application')) {
+            $tabs->add('application', array(
+                'title' => $this->translate('Application'),
+                'url'   => 'config'
+            ));
+        }
+        if ($auth->hasPermission('system/config/authentication')) {
+            $tabs->add('authentication', array(
+                'title' => $this->translate('Authentication'),
+                'url'   => 'config/authentication'
+            ));
+        }
+        if ($auth->hasPermission('system/config/resources')) {
+            $tabs->add('resource', array(
+                'title' => $this->translate('Resources'),
+                'url'   => 'config/resource'
+            ));
+        }
+        $tabs->add('roles', array(
             'title' => $this->translate('Roles'),
             'url'   => 'roles'
         ));
     }
 
+    /**
+     * List roles
+     */
     public function indexAction()
     {
         $this->view->tabs->activate('roles');
         $this->view->roles = Config::app('roles', true);
     }
 
+    /**
+     * Create a new role
+     */
     public function newAction()
     {
         $role = new RoleForm(array(
@@ -61,6 +85,11 @@ class RolesController extends ActionController
         $this->view->form = $role;
     }
 
+    /**
+     * Update a role
+     *
+     * @throws Zend_Controller_Action_Exception If the required parameter 'role' is missing or the role does not exist
+     */
     public function updateAction()
     {
         $name = $this->_request->getParam('role');
@@ -105,6 +134,11 @@ class RolesController extends ActionController
         $this->view->form = $role;
     }
 
+    /**
+     * Remove a role
+     *
+     * @throws Zend_Controller_Action_Exception If the required parameter 'role' is missing or the role does not exist
+     */
     public function removeAction()
     {
         $name = $this->_request->getParam('role');

From 5a1ebf9c89f96afb8ba1e9ed8b04763826e55197 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 13:32:09 +0100
Subject: [PATCH 0482/2920] lib: Implement Tab::getUrl()

---
 library/Icinga/Web/Widget/Tab.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index a06389b98..7eb5abeb1 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -138,6 +138,16 @@ class Tab extends AbstractWidget
         $this->url = $url;
     }
 
+    /**
+     * Get the tab's target URL
+     *
+     * @return Url
+     */
+    public function getUrl()
+    {
+        return $this->url;
+    }
+
     /**
      * Set the parameters to be set for this tabs Url
      *

From 9ac93421070bd7696cec8f003c44da7ed08515f7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 13:41:02 +0100
Subject: [PATCH 0483/2920] Revert "lib: Reduce else { if { to elseif { in
 User::can()"

This reverts commit e5b0b528747c2ff76b0568f8ca6929e61b072495.
---
 library/Icinga/User.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index bdc49275b..db80c929a 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -426,11 +426,13 @@ class User
         foreach ($this->permissions as $permitted) {
             $wildcard = strpos($permitted, '*');
             if ($wildcard !== false) {
-            }
-            if (substr($permission, 0, $wildcard) === substr($permitted, 0, $wildcard)) {
-                return true;
-            } elseif ($permission === $permitted) {
-                return true;
+                if (substr($permission, 0, $wildcard) === substr($permitted, 0, $wildcard)) {
+                    return true;
+                } else {
+                    if ($permission === $permitted) {
+                        return true;
+                    }
+                }
             }
         }
         return false;

From 94193abdc02a20ce6d4ed8ef62498f6e091d50d7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 13:44:54 +0100
Subject: [PATCH 0484/2920] lib: Fix User::can()

---
 library/Icinga/User.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index db80c929a..54b3e7632 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -428,11 +428,9 @@ class User
             if ($wildcard !== false) {
                 if (substr($permission, 0, $wildcard) === substr($permitted, 0, $wildcard)) {
                     return true;
-                } else {
-                    if ($permission === $permitted) {
-                        return true;
-                    }
                 }
+            } elseif ($permission === $permitted) {
+                return true;
             }
         }
         return false;

From 4bac5dfc3779291a6da9b10e18c7a73a5454bf9a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 13:46:35 +0100
Subject: [PATCH 0485/2920] security: Guard application and module
 configuration

---
 application/controllers/ConfigController.php  | 139 +++++++++++++-----
 .../config/{index.phtml => application.phtml} |   0
 2 files changed, 102 insertions(+), 37 deletions(-)
 rename application/views/scripts/config/{index.phtml => application.phtml} (100%)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 15ba0a6ff..078503346 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -1,41 +1,70 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
 
-use Icinga\Web\Controller\ActionController;
-use Icinga\Web\Notification;
-use Icinga\Application\Modules\Module;
-use Icinga\Web\Widget;
-use Icinga\Application\Icinga;
 use Icinga\Application\Config;
-use Icinga\Forms\Config\GeneralConfigForm;
-use Icinga\Forms\Config\AuthenticationBackendReorderForm;
+use Icinga\Application\Icinga;
+use Icinga\Application\Modules\Module;
+use Icinga\Data\ResourceFactory;
 use Icinga\Forms\Config\AuthenticationBackendConfigForm;
+use Icinga\Forms\Config\AuthenticationBackendReorderForm;
+use Icinga\Forms\Config\GeneralConfigForm;
 use Icinga\Forms\Config\ResourceConfigForm;
 use Icinga\Forms\ConfirmRemovalForm;
-use Icinga\Data\ResourceFactory;
-
+use Icinga\Security\SecurityException;
+use Icinga\Web\Controller\ActionController;
+use Icinga\Web\Notification;
+use Icinga\Web\Widget;
 
 /**
- * Application wide controller for application preferences
+ * Application and module configuration
  */
 class ConfigController extends ActionController
 {
+    /**
+     * The first allowed config action according to the user's permissions
+     *
+     * @type string
+     */
+    protected $firstAllowedAction;
+
+    /**
+     * Initialize tabs and validate the user's permissions
+     *
+     * @throws SecurityException    If the user does not have any configuration permission
+     */
     public function init()
     {
-        $this->view->tabs = Widget::create('tabs')->add('index', array(
-            'title' => $this->translate('Application'),
-            'url'   => 'config'
-        ))->add('authentication', array(
-            'title' => $this->translate('Authentication'),
-            'url'   => 'config/authentication'
-        ))->add('resources', array(
-            'title' => $this->translate('Resources'),
-            'url'   => 'config/resource'
-        ))->add('roles', array(
-            'title' => $this->translate('Roles'),
-            'url'   => 'roles'
-        ));
+        $tabs = $this->getTabs();
+        $auth = $this->Auth();
+        $allowedActions = array();
+        if ($auth->hasPermission('system/config/application')) {
+            $tabs->add('application', array(
+                'title' => $this->translate('Application'),
+                'url'   => 'config/application'
+            ));
+            $allowedActions[] = 'application';
+        }
+        if ($auth->hasPermission('system/config/authentication')) {
+            $tabs->add('authentication', array(
+                'title' => $this->translate('Authentication'),
+                'url'   => 'config/authentication'
+            ));
+            $allowedActions[] = 'authentication';
+        }
+        if ($auth->hasPermission('system/config/resources')) {
+            $tabs->add('resource', array(
+                'title' => $this->translate('Resources'),
+                'url'   => 'config/resource'
+            ));
+            $allowedActions[] = 'resource';
+        }
+        if ($auth->hasPermission('system/config/roles')) {
+            $tabs->add('roles', array(
+                'title' => $this->translate('Roles'),
+                'url'   => 'roles'
+            ));
+            $allowedActions[] = 'roles';
+        }
+        $this->firstAllowedAction = array_shift($allowedActions);
     }
 
     public function devtoolsAction()
@@ -44,16 +73,35 @@ class ConfigController extends ActionController
     }
 
     /**
-     * Index action, entry point for configuration
+     * Forward or redirect to the first allowed configuration action
      */
     public function indexAction()
     {
+        if ($this->firstAllowedAction === null) {
+            throw new SecurityException('No permission for configuration');
+        }
+        $action = $this->getTabs()->get($this->firstAllowedAction);
+        if (substr($action->getUrl()->getPath(), 0, 7) === 'config/') {
+            $this->forward($this->firstAllowedAction);
+        } else {
+            $this->redirectNow($action->getUrl());
+        }
+    }
+
+    /**
+     * Application configuration
+     *
+     * @throws SecurityException    If the user lacks the permission for configuring the application
+     */
+    public function applicationAction()
+    {
+        $this->assertPermission('system/config/application');
         $form = new GeneralConfigForm();
         $form->setIniConfig(Config::app());
         $form->handleRequest();
 
         $this->view->form = $form;
-        $this->view->tabs->activate('index');
+        $this->view->tabs->activate('application');
     }
 
     /**
@@ -61,16 +109,19 @@ class ConfigController extends ActionController
      */
     public function modulesAction()
     {
-        $this->view->tabs = Widget::create('tabs')->add('modules', array(
-            'title' => $this->translate('Modules'),
-            'url'   => 'config/modules'
-        ));
-
-        $this->view->tabs->activate('modules');
+        // Overwrite tabs created in init
+        // @TODO(el): This seems not natural to me. Module configuration should have its own controller.
+        $this->view->tabs = Widget::create('tabs')
+            ->add('modules', array(
+                'title' => $this->translate('Modules'),
+                'url'   => 'config/modules'
+            ))
+            ->activate('modules');
         $this->view->modules = Icinga::app()->getModuleManager()->select()
             ->from('modules')
             ->order('enabled', 'desc')
-            ->order('name')->paginate();
+            ->order('name')
+            ->paginate();
     }
 
     public function moduleAction()
@@ -79,8 +130,12 @@ class ConfigController extends ActionController
         $app = Icinga::app();
         $manager = $app->getModuleManager();
         if ($manager->hasInstalled($name)) {
-            $this->view->moduleData = Icinga::app()->getModuleManager()->select()
-            ->from('modules')->where('name', $name)->fetchRow();
+            $this->view->moduleData = Icinga::app()
+                ->getModuleManager()
+                ->select()
+                ->from('modules')
+                ->where('name', $name)
+                ->fetchRow();
             $module = new Module($app, $name, $manager->getModuleDir($name));
             $this->view->module = $module;
         } else {
@@ -94,6 +149,7 @@ class ConfigController extends ActionController
      */
     public function moduleenableAction()
     {
+        $this->assertPermission('system/config/modules');
         $module = $this->getParam('name');
         $manager = Icinga::app()->getModuleManager();
         try {
@@ -114,6 +170,7 @@ class ConfigController extends ActionController
      */
     public function moduledisableAction()
     {
+        $this->assertPermission('system/config/modules');
         $module = $this->getParam('name');
         $manager = Icinga::app()->getModuleManager();
         try {
@@ -133,6 +190,7 @@ class ConfigController extends ActionController
      */
     public function authenticationAction()
     {
+        $this->assertPermission('system/config/authentication');
         $form = new AuthenticationBackendReorderForm();
         $form->setIniConfig(Config::app('authentication'));
         $form->handleRequest();
@@ -147,6 +205,7 @@ class ConfigController extends ActionController
      */
     public function createauthenticationbackendAction()
     {
+        $this->assertPermission('system/config/authentication');
         $form = new AuthenticationBackendConfigForm();
         $form->setIniConfig(Config::app('authentication'));
         $form->setResourceConfig(ResourceFactory::getResourceConfigs());
@@ -163,6 +222,7 @@ class ConfigController extends ActionController
      */
     public function editauthenticationbackendAction()
     {
+        $this->assertPermission('system/config/authentication');
         $form = new AuthenticationBackendConfigForm();
         $form->setIniConfig(Config::app('authentication'));
         $form->setResourceConfig(ResourceFactory::getResourceConfigs());
@@ -179,6 +239,7 @@ class ConfigController extends ActionController
      */
     public function removeauthenticationbackendAction()
     {
+        $this->assertPermission('system/config/authentication');
         $form = new ConfirmRemovalForm(array(
             'onSuccess' => function ($form) {
                 $configForm = new AuthenticationBackendConfigForm();
@@ -215,8 +276,9 @@ class ConfigController extends ActionController
      */
     public function resourceAction()
     {
+        $this->assertPermission('system/config/resources');
         $this->view->resources = Config::app('resources', true)->keys();
-        $this->view->tabs->activate('resources');
+        $this->view->tabs->activate('resource');
     }
 
     /**
@@ -224,6 +286,7 @@ class ConfigController extends ActionController
      */
     public function createresourceAction()
     {
+        $this->assertPermission('system/config/resources');
         $form = new ResourceConfigForm();
         $form->setIniConfig(Config::app('resources'));
         $form->setRedirectUrl('config/resource');
@@ -238,6 +301,7 @@ class ConfigController extends ActionController
      */
     public function editresourceAction()
     {
+        $this->assertPermission('system/config/resources');
         $form = new ResourceConfigForm();
         $form->setIniConfig(Config::app('resources'));
         $form->setRedirectUrl('config/resource');
@@ -252,6 +316,7 @@ class ConfigController extends ActionController
      */
     public function removeresourceAction()
     {
+        $this->assertPermission('system/config/resources');
         $form = new ConfirmRemovalForm(array(
             'onSuccess' => function ($form) {
                 $configForm = new ResourceConfigForm();
diff --git a/application/views/scripts/config/index.phtml b/application/views/scripts/config/application.phtml
similarity index 100%
rename from application/views/scripts/config/index.phtml
rename to application/views/scripts/config/application.phtml

From 52c40bdc5b3bf3b32cbddf46bfa1039e7952b978 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 14:15:09 +0100
Subject: [PATCH 0486/2920] lib/SimpleQuery: Increase default limit to 25

Please follow the referenced issues.

fixes #8337
refs #8339
---
 library/Icinga/Data/SimpleQuery.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 41d050ea2..e865d86fa 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -320,7 +320,7 @@ class SimpleQuery implements QueryInterface, Queryable
             // Detect parameters from request
             $request = Icinga::app()->getFrontController()->getRequest();
             if ($itemsPerPage === null) {
-                $itemsPerPage = $request->getParam('limit', 20);
+                $itemsPerPage = $request->getParam('limit', 25);
             }
             if ($pageNumber === null) {
                 $pageNumber = $request->getParam('page', 0);

From bfb2f710a1353407fe1f88f6fa23d39fb9003e4f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 14:28:47 +0100
Subject: [PATCH 0487/2920] monitoring: Fix exception in the alert summary
 report when using the "One month" interval

fixes #8220
---
 .../application/controllers/AlertsummaryController.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index a4ef76b44..d9cc798a7 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -375,7 +375,7 @@ class Monitoring_AlertsummaryController extends Controller
 
         $query->order('notification_start_time', 'asc');
 
-        $records    = $query->getQuery()->fetchAll();
+        $records = $query->getQuery()->fetchAll();
 
         $interval       = $this->getInterval();
         $period         = $this->createPeriod($interval);
@@ -582,7 +582,7 @@ class Monitoring_AlertsummaryController extends Controller
         } elseif ($interval === '1w') {
             return new DatePeriod($this->getBeginDate($interval), new DateInterval('P1D'), 7);
         } elseif ($interval === '1m') {
-            return new DatePeriod($this->getBeginDate($interval), new DateInterval('P1D'), 30);
+            return new DatePeriod($this->getBeginDate($interval), new DateInterval('P1D'), 31);
         } elseif ($interval === '1y') {
             return new DatePeriod($this->getBeginDate($interval), new DateInterval('P1M'), 12);
         }

From 6555a2ec0a2d2c527dd7ca002f44bc9127073e51 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 2 Feb 2015 15:03:00 +0100
Subject: [PATCH 0488/2920] Menu: Move request handling to complete

If a failure occur the menu is still working.
---
 public/js/icinga/loader.js | 66 ++++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 4c273ffdb..1a8aadca5 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -342,42 +342,11 @@
             var rendered = false;
             var classes;
 
-            if (! req.autorefresh) {
-                // TODO: Hook for response/url?
-                var $forms = $('[action="' + this.icinga.utils.parseUrl(url).path + '"]');
-                var $matches = $.merge($('[href="' + url + '"]'), $forms);
-                $matches.each(function (idx, el) {
-                    if ($(el).closest('#menu').length) {
-                        if (req.$target[0].id === 'col1') {
-                            self.icinga.behaviors.navigation.resetActive();
-                        }
-                    } else if ($(el).closest('table.action').length) {
-                        $(el).closest('table.action').find('.active').removeClass('active');
-                    }
-                });
-
-                $matches.each(function (idx, el) {
-                    var $el = $(el);
-                    if ($el.closest('#menu').length) {
-                        if ($el.is('form')) {
-                            $('input', $el).addClass('active');
-                        } else {
-                            if (req.$target[0].id === 'col1') {
-                                self.icinga.behaviors.navigation.setActive($el);
-                            }
-                        }
-                        // Interrupt .each, only on menu item shall be active
-                        return false;
-                    } else if ($(el).closest('table.action').length) {
-                        $el.addClass('active');
-                    }
-                });
-            } else {
+            if (req.autorefresh) {
                 // TODO: next container url
                 active = $('[href].active', req.$target).attr('href');
             }
 
-
             var target = req.getResponseHeader('X-Icinga-Container');
             var newBody = false;
             var oldNotifications = false;
@@ -551,6 +520,39 @@
          * Regardless of whether a request succeeded of failed, clean up
          */
         onComplete: function (req, textStatus) {
+            if (! req.autorefresh) {
+                // TODO: Hook for response/url?
+                var url = req.url;
+                var $forms = $('[action="' + this.icinga.utils.parseUrl(url).path + '"]');
+                var $matches = $.merge($('[href="' + url + '"]'), $forms);
+                $matches.each(function (idx, el) {
+                    if ($(el).closest('#menu').length) {
+                        if (req.$target[0].id === 'col1') {
+                            self.icinga.behaviors.navigation.resetActive();
+                        }
+                    } else if ($(el).closest('table.action').length) {
+                        $(el).closest('table.action').find('.active').removeClass('active');
+                    }
+                });
+
+                $matches.each(function (idx, el) {
+                    var $el = $(el);
+                    if ($el.closest('#menu').length) {
+                        if ($el.is('form')) {
+                            $('input', $el).addClass('active');
+                        } else {
+                            if (req.$target[0].id === 'col1') {
+                                self.icinga.behaviors.navigation.setActive($el);
+                            }
+                        }
+                        // Interrupt .each, only on menu item shall be active
+                        return false;
+                    } else if ($(el).closest('table.action').length) {
+                        $el.addClass('active');
+                    }
+                });
+            }
+
             // Update history when necessary. Don't do so for requests triggered
             // by history or autorefresh events
             if (! req.historyTriggered && ! req.autorefresh) {

From 9d6906bd6449a21598614a633adcb711e8bfca62 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 15:05:47 +0100
Subject: [PATCH 0489/2920] Save user dashboards to Icinga Web 2's
 configuration directory

fixes #8056
---
 .../controllers/DashboardController.php       |  4 +--
 library/Icinga/Web/Widget/Dashboard.php       | 25 ++-----------------
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 49a58426f..12a5180c8 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -24,11 +24,11 @@ class DashboardController extends ActionController
      * @var Dashboard;
      */
     private $dashboard;
-    
+
     public function init()
     {
         $this->dashboard = new Dashboard();
-        $this->dashboard->setUser($this->getRequest()->getUser());
+        $this->dashboard->setUser($this->Auth()->getUser());
         $this->dashboard->load();
     }
 
diff --git a/library/Icinga/Web/Widget/Dashboard.php b/library/Icinga/Web/Widget/Dashboard.php
index fe4bba803..bb62cc8f9 100644
--- a/library/Icinga/Web/Widget/Dashboard.php
+++ b/library/Icinga/Web/Widget/Dashboard.php
@@ -9,7 +9,6 @@ use Icinga\Application\Config;
 use Icinga\Exception\ConfigurationError;
 use Icinga\Exception\NotReadableError;
 use Icinga\Exception\ProgrammingError;
-use Icinga\Exception\SystemPermissionException;
 use Icinga\User;
 use Icinga\Web\Widget\Dashboard\Pane;
 use Icinga\Web\Widget\Dashboard\Dashlet as DashboardDashlet;
@@ -425,28 +424,8 @@ class Dashboard extends AbstractWidget
     public function getConfigFile()
     {
         if ($this->user === null) {
-            return '';
+            throw new ProgrammingError('Can\'t load dashboards. User is not set');
         }
-
-        $baseDir = '/var/lib/icingaweb';
-
-        if (! file_exists($baseDir)) {
-            throw new NotReadableError('Could not read: ' . $baseDir);
-        }
-
-        $userDir = $baseDir . '/' . $this->user->getUsername();
-
-        if (! file_exists($userDir)) {
-            $success = @mkdir($userDir);
-            if (!$success) {
-                throw new SystemPermissionException('Could not create: ' . $userDir);
-            }
-        }
-
-        if (! file_exists($userDir)) {
-            throw new NotReadableError('Could not read: ' . $userDir);
-        }
-
-        return $userDir . '/dashboard.ini';
+        return Config::resolvePath('dashboards/' . $this->user->getUsername() . '/dashboard.ini');
     }
 }

From 67a426580d4c33ad00179d31f81005d6f32dc997 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 2 Feb 2015 15:18:05 +0100
Subject: [PATCH 0490/2920] loader: Remove gray out on complete handler

A failure did not remove the impact class which colorize
the background gray.
---
 public/js/icinga/loader.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 1a8aadca5..abf0d6684 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -318,11 +318,6 @@
                 this.failureNotice = null;
             }
 
-            // Remove 'impact' class if there was such
-            if (req.$target.hasClass('impact')) {
-                req.$target.removeClass('impact');
-            }
-
             var url = req.url;
             this.icinga.logger.debug(
                 'Got response for ', req.$target, ', URL was ' + url
@@ -520,6 +515,11 @@
          * Regardless of whether a request succeeded of failed, clean up
          */
         onComplete: function (req, textStatus) {
+            // Remove 'impact' class if there was such
+            if (req.$target.hasClass('impact')) {
+                req.$target.removeClass('impact');
+            }
+
             if (! req.autorefresh) {
                 // TODO: Hook for response/url?
                 var url = req.url;

From afa3431aedc826931becc1afc53bff3d5c6821f5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Feb 2015 16:26:55 +0100
Subject: [PATCH 0491/2920] Introduce new object- and command-view scripts

Represents how we plan to handle view scripts that are re-usable. Should
supersede all <action>/component/* view scripts in the upcoming future.
---
 .../command/object-command-form.phtml         | 13 +++
 .../command/objects-command-form.phtml        | 32 +++++++
 .../scripts/partials/host/object-header.phtml | 27 ++++++
 .../partials/host/objects-header.phtml        | 16 ++++
 .../partials/host/servicesummary.phtml        | 89 +++++++++++++++++++
 .../scripts/partials/host/statusicons.phtml   | 28 ++++++
 .../partials/service/object-header.phtml      | 41 +++++++++
 .../partials/service/objects-header.phtml     | 32 +++++++
 .../partials/service/statusicons.phtml        | 28 ++++++
 9 files changed, 306 insertions(+)
 create mode 100644 modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml
 create mode 100644 modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
 create mode 100644 modules/monitoring/application/views/scripts/partials/host/object-header.phtml
 create mode 100644 modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
 create mode 100644 modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
 create mode 100644 modules/monitoring/application/views/scripts/partials/host/statusicons.phtml
 create mode 100644 modules/monitoring/application/views/scripts/partials/service/object-header.phtml
 create mode 100644 modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
 create mode 100644 modules/monitoring/application/views/scripts/partials/service/statusicons.phtml

diff --git a/modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml b/modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml
new file mode 100644
index 000000000..7f4314cbf
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml
@@ -0,0 +1,13 @@
+<div class="controls">
+  <?php if ($object->getType() === $object::TYPE_HOST): ?>
+    <?= $this->render('partials/host/object-header.phtml'); ?>
+    <?= $this->render('partials/host/servicesummary.phtml'); ?>
+  <?php else: ?>
+    <?= $this->render('partials/service/object-header.phtml'); ?>
+    <hr class="command-separator">
+  <?php endif ?>
+</div>
+<div class="content">
+    <h1 class="command-title"><?= $title; ?> <?= /** @var \Icinga\Module\Monitoring\Forms\Command\CommandForm $form */ $this->icon('help', $form->getHelp()); ?></h1>
+    <?= $form ?>
+</div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml b/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
new file mode 100644
index 000000000..da58fc9cb
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
@@ -0,0 +1,32 @@
+<div class="controls">
+  <?php if (isset($serviceStates)): ?>
+    <?= $this->render('partials/service/objects-header.phtml'); ?>
+  <?php else: ?>
+    <?= $this->render('partials/host/objects-header.phtml'); ?>
+  <?php endif ?>
+</div>
+<div class="content">
+    <table class="objectlist">
+        <thead>
+            <tr>
+                <th><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
+                <th><?= $this->icon('conf'); ?> <?= $this->translate('Service'); ?></th>
+            </tr>
+        </thead>
+        <tbody>
+          <?php foreach ($form->getObjects() as $object): /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */ ?>
+            <tr>
+              <?php if ($object->getType() === $object::TYPE_HOST): ?>
+                <td colspan="2"><?= $this->escape($object->getName()); ?></td>
+              <?php else: ?>
+                <td><?= $this->escape($object->getHost()->getName()); ?></td>
+                <td><?= $this->escape($object->getName()); ?></td>
+              <?php endif ?>
+            </tr>
+          <?php endforeach ?>
+        </tbody>
+    </table>
+    <hr class="command-separator">
+    <h1 class="command-title"><?= $title ?> <?= /** @var \Icinga\Module\Monitoring\Forms\Command\CommandForm $form */ $this->icon('help', $form->getHelp()) ?></h1>
+    <?= $form ?>
+</div>
diff --git a/modules/monitoring/application/views/scripts/partials/host/object-header.phtml b/modules/monitoring/application/views/scripts/partials/host/object-header.phtml
new file mode 100644
index 000000000..69d0f62f5
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/host/object-header.phtml
@@ -0,0 +1,27 @@
+<?php
+
+use Icinga\Module\Monitoring\Object\Host;
+
+?>
+<?php if (! $this->compact): ?>
+    <?= $tabs; ?>
+<?php endif ?>
+<table class="objectstate">
+    <tr class="state <?= Host::getStateText($object->host_state); ?><?= $object->host_handled ? ' handled' : ''; ?>">
+        <td class="state">
+            <strong><?= Host::getStateText($object->host_state, true); ?></strong><br>
+            <?= $this->prefixedTimeSince($object->host_last_state_change, true); ?>
+        </td>
+        <td>
+            <strong><?= $this->escape($object->host_display_name); ?></strong>
+          <?php if ($object->host_display_name !== $object->host_name): ?>
+            <small>(<?= $this->escape($object->host_name); ?>)</small>
+          <?php endif ?>
+          <?php if ($object->host_address && $object->host_address !== $object->host_name): ?>
+            <br>
+            <?= $this->escape($object->host_address); ?>
+          <?php endif ?>
+            <?= $this->render('partials/host/statusicons.phtml'); ?>
+        </td>
+    </tr>
+</table>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
new file mode 100644
index 000000000..f5edd0213
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -0,0 +1,16 @@
+<?php if (! $this->compact): ?>
+    <?= $tabs; ?>
+<?php endif ?>
+<?php if (($hostCount = count($objects)) > 0): ?>
+<div class="hbox-item">
+    <strong><?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', $hostCount), $hostCount); ?></strong>
+</div>
+<div class="hbox-item">
+    &nbsp;<?= $hostStatesPieChart; ?>
+</div>
+<div class="hbox-item" style="font-size: 14px">
+  <?php foreach (array_filter($hostStates) as $text => $count): ?>
+    <?= sprintf('%s: %u', $this->translate(strtoupper($text)), $count); ?><br>
+  <?php endforeach ?>
+</div>
+<?php endif ?>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
new file mode 100644
index 000000000..641dd026a
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
@@ -0,0 +1,89 @@
+<?php
+
+use Icinga\Web\Url;
+$selfUrl = Url::fromPath('monitoring/show/services', array('host' => $this->object->host_name));
+$currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
+
+?>
+<h1 class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
+<?php if ($object->stats->services_total > 0): ?>
+<?= $this->qlink(sprintf($this->translatePlural('%d configured service:', '%d configured services:', $object->stats->services_total), $object->stats->services_total), $selfUrl) ?>
+<?php else: ?>
+<?= $this->translate('No services configured on this host'); ?>
+<?php endif; ?>
+<span class="badges">
+<?php if ($object->stats->services_ok > 0): ?>
+ <span class="state ok<?= $currentUrl === $selfUrl->with('service_state', 0)->getRelativeUrl() ? ' active' : '' ?>"><?= $this->qlink(
+    $object->stats->services_ok,
+    $selfUrl,
+    array('service_state' => 0),
+    array('title' => sprintf($this->translate('Services with state %s'), $this->translate('OK')))
+)  ?></span>
+<?php endif ?>
+<?php
+
+foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $state) {
+    $pre = 'services_' . $state;
+    if ($object->stats->$pre) {
+        $handled = $pre . '_handled';
+        $unhandled = $pre . '_unhandled';
+        $paramsHandled = array('service_state' => $stateId, 'service_handled' => 1);
+        $paramsUnhandled = array('service_state' => $stateId, 'service_handled' => 0);
+        if ($object->stats->$unhandled) {
+            $compareUrl = $selfUrl->with($paramsUnhandled)->getRelativeUrl();
+        } else {
+            $compareUrl = $selfUrl->with($paramsHandled)->getRelativeUrl();
+        }
+
+        if ($compareUrl === $currentUrl) {
+            $active = ' active';
+        } else {
+            $active = '';
+        }
+
+        echo '<span class="state ' . $state . $active . ($object->stats->$unhandled ? '' : ' handled') . '">';
+        if ($object->stats->$unhandled) {
+
+            echo $this->qlink(
+                $object->stats->$unhandled,
+                $selfUrl,
+                $paramsUnhandled,
+                array('title' => sprintf($this->translate('Unhandled services with state %s'), $this->translate(strtoupper($state))))
+            );
+        }
+        if ($object->stats->$handled) {
+
+            if ($selfUrl->with($paramsHandled)->getRelativeUrl() === $currentUrl) {
+                $active = ' active';
+            } else {
+                $active = '';
+            }
+            if ($object->stats->$unhandled) {
+                echo '<span class="state handled ' . $state . $active . '">';
+            }
+            echo $this->qlink(
+                $object->stats->$handled,
+                $selfUrl,
+                $paramsHandled,
+                array('title' => sprintf($this->translate('Handled services with state %s'), $this->translate(strtoupper($state))))
+            );
+            if ($object->stats->$unhandled) {
+                echo "</span>\n";
+            }
+        }
+        echo "</span>\n";
+    }
+}
+
+?>
+<?php if ($object->stats->services_pending): ?>
+ <span class="state pending<?= $currentUrl === $selfUrl->with('service_state', 99)->getRelativeUrl() ? ' active' : '' ?>"><?= $this->qlink(
+    $object->stats->services_pending,
+    $selfUrl,
+    array('service_state' => 99),
+    array('title' => sprintf($this->translate('Services with state %s'), $this->translate('PENDING')))
+)  ?></span>
+<?php endif ?>
+</span>
+</h1>
+
diff --git a/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml b/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml
new file mode 100644
index 000000000..4421c301f
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml
@@ -0,0 +1,28 @@
+<?php
+
+$icons = array();
+if (! $this->object->host_handled && $this->object->host_state > 0) {
+    $icons[] = $this->icon('attention-alt', $this->translate('Unhandled'));
+}
+
+if ($this->object->host_acknowledged && !$this->object->host_in_downtime) {
+    $icons[] = $this->icon('ok', $this->translate('Acknowledged'));
+}
+
+if (! $this->object->host_notifications_enabled) {
+    $icons[] = $this->icon('bell-off-empty', $this->translate('Notifications Disabled'));
+}
+
+if ($this->object->host_in_downtime) {
+    $icons[] = $this->icon('plug', $this->translate('In Downtime'));
+}
+
+if (! $this->object->host_active_checks_enabled) {
+    if ($this->object->host_passive_checks_enabled) {
+        $icons[] = $this->icon('eye-off', $this->translate('Active Checks Disabled'));
+    } else {
+        $icons[] = $this->icon('eye-off', $this->translate('Active And Passive Checks Disabled'));
+    }
+}
+
+?><?= implode("\n", $icons); ?>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/partials/service/object-header.phtml b/modules/monitoring/application/views/scripts/partials/service/object-header.phtml
new file mode 100644
index 000000000..5f3ccb70f
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/service/object-header.phtml
@@ -0,0 +1,41 @@
+<?php
+
+use Icinga\Module\Monitoring\Object\Host;
+use Icinga\Module\Monitoring\Object\Service;
+
+?>
+<?php if (! $this->compact): ?>
+    <?= $tabs; ?>
+<?php endif ?>
+<table class="objectstate">
+    <tr class="state <?= Host::getStateText($object->host_state); ?><?= $object->host_handled ? ' handled' : ''; ?>">
+        <td class="state">
+            <strong><?= Host::getStateText($object->host_state, true); ?></strong><br>
+            <?= $this->prefixedTimeSince($object->host_last_state_change, true); ?>
+        </td>
+        <td>
+            <strong><?= $this->escape($object->host_display_name); ?></strong>
+          <?php if ($object->host_display_name !== $object->host_name): ?>
+            <small>(<?= $this->escape($object->host_name); ?>)</small>
+          <?php endif ?>
+          <?php if ($object->host_address && $object->host_address !== $object->host_name): ?>
+            <br>
+            <?= $this->escape($object->host_address); ?>
+          <?php endif ?>
+            <?= $this->render('partials/host/statusicons.phtml'); ?>
+        </td>
+    </tr>
+    <tr class="state <?= Service::getStateText($object->service_state); ?><?= $object->service_handled ? ' handled' : ''; ?>">
+        <td class="state">
+            <strong><?= Service::getStateText($object->service_state, true); ?></strong><br>
+            <?= $this->prefixedTimeSince($object->service_last_state_change, true); ?>
+        </td>
+        <td>
+            <strong><?= $this->translate('Service'); ?>: <?= $this->escape($object->service_display_name); ?></strong>
+          <?php if ($object->service_display_name !== $object->service_description): ?>
+            <small>(<?= $this->escape($object->service_description); ?>)</small>
+          <?php endif ?>
+            <?= $this->render('partials/service/statusicons.phtml'); ?>
+        </td>
+    </tr>
+</table>
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
new file mode 100644
index 000000000..1ac27b934
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -0,0 +1,32 @@
+<?php if (! $this->compact): ?>
+    <?= $tabs; ?>
+<?php endif ?>
+<?php if (($serviceCount = count($objects)) > 0): ?>
+<div class="hbox">
+    <div class="hbox-item" style="width: 6em;">
+        <strong><?= sprintf($this->translatePlural('Service (%u)', 'Services (%u)', $serviceCount), $serviceCount); ?></strong>
+    </div>
+    <div class="hbox-item">
+        &nbsp;<?= $serviceStatesPieChart; ?>
+    </div>
+    <div class="hbox-item" style="font-size: 14px">
+      <?php foreach (array_filter($serviceStates) as $text => $count): ?>
+        <?= sprintf('%s: %u', $this->translate(strtoupper($text)), $count); ?><br>
+      <?php endforeach ?>
+    </div>
+</div>
+<div class="hbox">
+    <div class="hbox-item" style="width: 6em;">
+        <?php $hostCount = array_sum(array_values($hostStates)); ?>
+        <strong><?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', $hostCount), $hostCount); ?></strong>
+    </div>
+    <div class="hbox-item">
+        &nbsp;<?= $hostStatesPieChart; ?>
+    </div>
+    <div class="hbox-item" style="font-size: 14px">
+      <?php foreach (array_filter($hostStates) as $text => $count): ?>
+        <?= sprintf('%s: %u', $this->translate(strtoupper($text)), $count); ?><br>
+      <?php endforeach ?>
+    </div>
+</div>
+<?php endif ?>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml b/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml
new file mode 100644
index 000000000..8859bf189
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml
@@ -0,0 +1,28 @@
+<?php
+
+$icons = array();
+if (! $this->object->service_handled && $this->object->service_state > 0) {
+    $icons[] = $this->icon('attention-alt', $this->translate('Unhandled'));
+}
+
+if ($this->object->service_acknowledged && !$this->object->service_in_downtime) {
+    $icons[] = $this->icon('ok', $this->translate('Acknowledged'));
+}
+
+if (! $this->object->service_notifications_enabled) {
+    $icons[] = $this->icon('bell-off-empty', $this->translate('Notifications Disabled'));
+}
+
+if ($this->object->service_in_downtime) {
+    $icons[] = $this->icon('plug', $this->translate('In Downtime'));
+}
+
+if (! $this->object->service_active_checks_enabled) {
+    if ($this->object->service_passive_checks_enabled) {
+        $icons[] = $this->icon('eye-off', $this->translate('Active Checks Disabled'));
+    } else {
+        $icons[] = $this->icon('eye-off', $this->translate('Active And Passive Checks Disabled'));
+    }
+}
+
+?><?= implode("\n", $icons); ?>
\ No newline at end of file

From 2e99e476fe900cadaaeac4f2ab2ef36f4e0376d2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Feb 2015 16:28:35 +0100
Subject: [PATCH 0492/2920] Use the new object-view scripts

---
 .../application/views/scripts/host/show.phtml |  4 +--
 .../views/scripts/hosts/show.phtml            | 17 ++--------
 .../views/scripts/service/show.phtml          |  2 +-
 .../views/scripts/services/show.phtml         | 34 ++-----------------
 .../views/scripts/show/history.phtml          | 11 ++++--
 .../views/scripts/show/services.phtml         |  4 +--
 6 files changed, 17 insertions(+), 55 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/host/show.phtml b/modules/monitoring/application/views/scripts/host/show.phtml
index 8023c1821..00d579a29 100644
--- a/modules/monitoring/application/views/scripts/host/show.phtml
+++ b/modules/monitoring/application/views/scripts/host/show.phtml
@@ -1,6 +1,6 @@
 <div class="controls">
-    <?= $this->render('show/components/header.phtml') ?>
-    <?= $this->render('show/components/hostservicesummary.phtml') ?>
+    <?= $this->render('partials/host/object-header.phtml') ?>
+    <?= $this->render('partials/host/servicesummary.phtml') ?>
 </div>
 <div class="content" data-base-target="_next">
     <?= $this->render('show/components/output.phtml') ?>
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 516e1be03..7f8d775ab 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -1,23 +1,10 @@
 <div class="controls">
-    <?= $this->tabs ?>
+    <?= $this->render('partials/host/objects-header.phtml') ?>
 </div>
 <div class="content">
-    <?php $hostCount = count($objects) ?>
-    <?php if ($hostCount === 0): ?>
+    <?php if (($hostCount = count($objects)) === 0): ?>
         <?= $this->translate('No hosts matching the filter') ?>
     <?php else: ?>
-        <div class="hbox-item">
-            <b><?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', $hostCount), $hostCount) ?></b>
-        </div>
-        <div class="hbox-item">
-            &nbsp;<?= $this->hostStatesPieChart ?>
-        </div>
-        <div class="hbox-item" style="font-size: 14px">
-            <?php foreach (array_filter($hostStates) as $text => $count) {
-                echo sprintf('%s: %u <br>', $this->translate(strtoupper($text)), $count);
-            } ?>
-        </div>
-
         <h3>
             <?= sprintf(
                 $this->translatePlural(
diff --git a/modules/monitoring/application/views/scripts/service/show.phtml b/modules/monitoring/application/views/scripts/service/show.phtml
index a5c95fd61..3a09e2bf4 100644
--- a/modules/monitoring/application/views/scripts/service/show.phtml
+++ b/modules/monitoring/application/views/scripts/service/show.phtml
@@ -1,5 +1,5 @@
 <div class="controls">
-    <?= $this->render('show/components/header.phtml') ?>
+    <?= $this->render('partials/service/object-header.phtml') ?>
     <h1><?= $this->translate("Service detail information") ?></h1>
 </div>
 <div class="content" data-base-target="_next">
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 522d32ce7..d5d9df2d9 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -1,41 +1,11 @@
 <div class="controls">
-    <?= $this->tabs ?>
+    <?= $this->render('partials/service/objects-header.phtml') ?>
 </div>
 <div class="content">
-    <?php $serviceCount = count($objects) ?>
-    <?php if ($serviceCount === 0): ?>
+    <?php if (($serviceCount = count($objects)) === 0): ?>
         <?= $this->translate('No services matching the filter') ?>
     <?php else: ?>
 
-        <div class="hbox">
-            <div class="hbox-item" style="width: 6em;">
-                <b><?= sprintf($this->translatePlural('Service (%u)', 'Services (%u)', $serviceCount), $serviceCount) ?></b>
-            </div>
-            <div class="hbox-item">
-                &nbsp;<?= $this->serviceStatesPieChart ?>
-            </div>
-            <div class="hbox-item" style="font-size: 14px">
-                <?php foreach (array_filter($serviceStates) as $text => $count) {
-                    echo sprintf(' %s: %u <br>', $this->translate(strtoupper($text)), $count);
-                } ?>
-            </div>
-        </div>
-
-        <div class="hbox">
-            <div class="hbox-item" style="width: 6em;">
-                <?php $hostCount = array_sum(array_values($hostStates)) ?>
-                <b><?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', $hostCount), $hostCount) ?></b>
-            </div>
-            <div class="hbox-item">
-                &nbsp;<?= $this->hostStatesPieChart ?>
-            </div>
-            <div class="hbox-item" style="font-size: 14px">
-                <?php foreach (array_filter($hostStates) as $text => $count) {
-                    echo sprintf('%s: %u <br>', $this->translate(strtoupper($text)), $count);
-                } ?>
-            </div>
-        </div>
-
         <div>
             <a href="<?= $listAllLink ?>" title="<?= $this->translate('List all') ?>">
                 <?= $this->translate('List all') ?>
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index 40fb15363..5c20e800b 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -3,10 +3,17 @@
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
+$self = $this;
+$hostContext = $object->getType() === 'host';
+
 ?>
 
 <div class="controls">
-  <?= $this->render('show/components/header.phtml'); ?>
+<?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->widget('limiter', array('url' => $url, 'max' => $history->count())); ?>
   <?= $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
@@ -19,8 +26,6 @@ use Icinga\Module\Monitoring\Object\Service;
 <?php return; endif ?>
 
 <?php
-$self = $this;
-$hostContext = $object->getType() === 'host';
 function contactsLink($match, $view) {
     $links = array();
     foreach (preg_split('/,\s/', $match[1]) as $contact) {
diff --git a/modules/monitoring/application/views/scripts/show/services.phtml b/modules/monitoring/application/views/scripts/show/services.phtml
index ae4f8f699..57b4b204e 100644
--- a/modules/monitoring/application/views/scripts/show/services.phtml
+++ b/modules/monitoring/application/views/scripts/show/services.phtml
@@ -1,5 +1,5 @@
 <div class="controls">
-<?= $this->render('show/components/header.phtml') ?>
-<?= $this->render('show/components/hostservicesummary.phtml') ?>
+<?= $this->render('partials/host/object-header.phtml') ?>
+<?= $this->render('partials/host/servicesummary.phtml') ?>
 </div>
 <?= $services ?>

From 8b377cd65158f63da215132ac2c1d9ec5e79964e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Feb 2015 16:30:52 +0100
Subject: [PATCH 0493/2920] Use the new command-view scripts

---
 .../controllers/HostsController.php           | 30 +++++++++++-
 .../controllers/ServicesController.php        | 49 ++++++++++++++++++-
 .../Controller/MonitoredObjectController.php  |  4 +-
 modules/monitoring/public/css/module.less     |  9 ++++
 4 files changed, 88 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 869be92d8..dbe395b28 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -12,7 +12,6 @@ use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandFo
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostCheckCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostDowntimeCommandForm;
 use Icinga\Module\Monitoring\Object\Host;
-use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Module\Monitoring\Object\HostList;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Chart\InlinePie;
@@ -33,12 +32,39 @@ class Monitoring_HostsController extends Controller
 
     protected function handleCommandForm(ObjectsCommandForm $form)
     {
+        $this->hostList->setColumns(array(
+            'host_name',
+            'host_state',
+            'host_problem',
+            'host_handled',
+            'host_acknowledged',
+            'host_in_downtime'
+        ));
+
         $form
             ->setObjects($this->hostList)
             ->setRedirectUrl(Url::fromPath('monitoring/hosts/show')->setParams($this->params))
             ->handleRequest();
+
+        $hostStates = array(
+            Host::getStateText(Host::STATE_UP) => 0,
+            Host::getStateText(Host::STATE_DOWN) => 0,
+            Host::getStateText(Host::STATE_UNREACHABLE) => 0,
+            Host::getStateText(Host::STATE_PENDING) => 0,
+        );
+        foreach ($this->hostList as $host) {
+            ++$hostStates[$host::getStateText($host->state)];
+        }
+
         $this->view->form = $form;
-        $this->_helper->viewRenderer('partials/command-form', null, true);
+        $this->view->objects = $this->hostList;
+        $this->view->hostStates = $hostStates;
+        $this->view->hostStatesPieChart = $this->createPieChart(
+            $hostStates,
+            $this->translate('Host State'),
+            array('#44bb77', '#FF5566', '#E066FF', '#77AAFF')
+        );
+        $this->_helper->viewRenderer('partials/command/objects-command-form', null, true);
         return $form;
     }
 
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index dc7feb2da..88df52e46 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -33,12 +33,59 @@ class Monitoring_ServicesController extends Controller
 
     protected function handleCommandForm(ObjectsCommandForm $form)
     {
+        $this->serviceList->setColumns(array(
+            'host_name',
+            'host_state',
+            'service_description',
+            'service_state',
+            'service_problem',
+            'service_handled',
+            'service_acknowledged',
+            'service_in_downtime'
+        ));
+
         $form
             ->setObjects($this->serviceList)
             ->setRedirectUrl(Url::fromPath('monitoring/services/show')->setParams($this->params))
             ->handleRequest();
+
+        $serviceStates = array(
+            Service::getStateText(Service::STATE_OK) => 0,
+            Service::getStateText(Service::STATE_WARNING) => 0,
+            Service::getStateText(Service::STATE_CRITICAL) => 0,
+            Service::getStateText(Service::STATE_UNKNOWN) => 0,
+            Service::getStateText(Service::STATE_PENDING) => 0
+        );
+        $knownHostStates = array();
+        $hostStates = array(
+            Host::getStateText(Host::STATE_UP) => 0,
+            Host::getStateText(Host::STATE_DOWN) => 0,
+            Host::getStateText(Host::STATE_UNREACHABLE) => 0,
+            Host::getStateText(Host::STATE_PENDING) => 0,
+        );
+        foreach ($this->serviceList as $service) {
+            ++$serviceStates[$service::getStateText($service->state)];
+            if (! isset($knownHostStates[$service->getHost()->getName()])) {
+                $knownHostStates[$service->getHost()->getName()] = true;
+                ++$hostStates[$service->getHost()->getStateText($service->host_state)];
+            }
+        }
+
         $this->view->form = $form;
-        $this->_helper->viewRenderer('partials/command-form', null, true);
+        $this->view->objects = $this->serviceList;
+        $this->view->serviceStates = $serviceStates;
+        $this->view->hostStates = $hostStates;
+        $this->view->serviceStatesPieChart = $this->createPieChart(
+            $serviceStates,
+            $this->translate('Service State'),
+            array('#44bb77', '#FFCC66', '#FF5566', '#E066FF', '#77AAFF')
+        );
+        $this->view->hostStatesPieChart = $this->createPieChart(
+            $hostStates,
+            $this->translate('Host State'),
+            array('#44bb77', '#FF5566', '#E066FF', '#77AAFF')
+        );
+        $this->_helper->viewRenderer('partials/command/objects-command-form', null, true);
         return $form;
     }
 
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 5de11e1e2..1c3db0799 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -109,7 +109,9 @@ abstract class MonitoredObjectController extends Controller
             ->setRedirectUrl(Url::fromPath($this->commandRedirectUrl)->setParams($this->params))
             ->handleRequest();
         $this->view->form = $form;
-        $this->_helper->viewRenderer('partials/command-form', null, true);
+        $this->view->object = $this->object;
+        $this->view->tabs->remove('dashboard');
+        $this->_helper->viewRenderer('partials/command/object-command-form', null, true);
         return $form;
     }
 
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 675988056..82ee0b629 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -190,3 +190,12 @@ div.selection-info {
 .optionbox input {
   vertical-align: middle;
 }
+
+h1.command-title {
+  border: none;
+}
+
+hr.command-separator {
+  border: none;
+  border-bottom: 2px solid @colorPetrol;
+}
\ No newline at end of file

From 5382f73c535cc3c539f4481c0d6455eec86f264e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Feb 2015 16:31:25 +0100
Subject: [PATCH 0494/2920] Drop all old object- and command-view scripts

---
 .../views/scripts/partials/command-form.phtml | 28 ------
 .../scripts/show/components/header.phtml      | 46 ----------
 .../show/components/hostservicesummary.phtml  | 89 -------------------
 .../scripts/show/components/statusIcons.phtml | 49 ----------
 .../application/views/scripts/show/host.phtml | 31 -------
 .../views/scripts/show/service.phtml          | 31 -------
 6 files changed, 274 deletions(-)
 delete mode 100644 modules/monitoring/application/views/scripts/partials/command-form.phtml
 delete mode 100644 modules/monitoring/application/views/scripts/show/components/header.phtml
 delete mode 100644 modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml
 delete mode 100644 modules/monitoring/application/views/scripts/show/components/statusIcons.phtml
 delete mode 100644 modules/monitoring/application/views/scripts/show/host.phtml
 delete mode 100644 modules/monitoring/application/views/scripts/show/service.phtml

diff --git a/modules/monitoring/application/views/scripts/partials/command-form.phtml b/modules/monitoring/application/views/scripts/partials/command-form.phtml
deleted file mode 100644
index 380687a00..000000000
--- a/modules/monitoring/application/views/scripts/partials/command-form.phtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="controls">
-    <?= $this->tabs->remove('dashboard') ?>
-</div>
-<div class="content">
-    <h1><?= $title ?> <?= /** @var \Icinga\Module\Monitoring\Forms\Command\CommandForm $form */ $this->icon('help', $form->getHelp()) ?></h1>
-    <table class="objectlist">
-        <thead>
-            <tr>
-                <th><?= $this->icon('host') ?> <?= $this->translate('Host') ?></th>
-                <th><?= $this->icon('conf') ?> <?= $this->translate('Service') ?></th>
-            </tr>
-        </thead>
-        <tbody>
-        <?php foreach ($form->getObjects() as $object): /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */ ?>
-            <tr>
-                <?php if ($object->getType() === $object::TYPE_HOST): ?>
-                <td colspan="2"><?= $this->escape($object->getName()) ?></td>
-                <?php else: ?>
-                <td><?= $this->escape($object->getHost()->getName()) ?></td>
-                <td><?= $this->escape($object->getName()) ?></td>
-                <?php endif ?>
-            </tr>
-        <?php endforeach; ?>
-        </tbody>
-    </table>
-    <hr>
-    <?= $form ?>
-</div>
diff --git a/modules/monitoring/application/views/scripts/show/components/header.phtml b/modules/monitoring/application/views/scripts/show/components/header.phtml
deleted file mode 100644
index 8ba84da43..000000000
--- a/modules/monitoring/application/views/scripts/show/components/header.phtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-use Icinga\Module\Monitoring\Object\Host;
-use Icinga\Module\Monitoring\Object\Service;
-
-$isService = $object->getType() === $object::TYPE_SERVICE;
-
-?>
-
-<?php if (! $this->compact): ?>
-<?= $tabs ?>
-<?php endif ?>
-
-<table class="objectstate">
-    <tr class="state <?= Host::getStateText($object->host_state); ?><?= $object->host_handled ? ' handled' : '' ?>">
-        <td class="state"<?= $isService ? '' : ' rowspan="2"' ?>>
-            <strong><?= Host::getStateText($object->host_state, true); ?></strong><br>
-            <?= $this->prefixedTimeSince($object->host_last_state_change, true) ?>
-        </td>
-        <td>
-            <b><?= $this->escape($object->host_display_name) ?></b>
-            <?php if ($object->host_display_name !== $object->host_name): ?>
-            <small>(<?= $this->escape($object->host_name) ?>)</small>
-            <?php endif ?>
-            <?php if ($object->host_address && $object->host_address !== $object->host_name): ?>
-            <br>
-            <?= $this->escape($object->host_address) ?>
-            <?php endif ?>
-        </td>
-    </tr>
-<?php if ($isService): ?>
-    <tr class="state <?= Service::getStateText($object->service_state); ?><?= $object->service_handled ? ' handled' : '' ?>">
-        <td class="state">
-            <strong><?= Service::getStateText($object->service_state, true); ?></strong><br>
-            <?= $this->prefixedTimeSince($object->service_last_state_change, true) ?>
-        </td>
-        <td>
-            <b><?= $this->translate('Service') ?>: <?= $this->escape($object->service_display_name) ?></b>
-            <?php if ($object->service_display_name !== $object->service_description): ?>
-            <small>(<?= $this->escape($object->service_description) ?>)</small>
-            <?php endif ?>
-            <?= $this->render('show/components/statusIcons.phtml') ?>
-        </td>
-  </tr>
-<?php endif ?>
-</table>
diff --git a/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml b/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml
deleted file mode 100644
index 641dd026a..000000000
--- a/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-use Icinga\Web\Url;
-$selfUrl = Url::fromPath('monitoring/show/services', array('host' => $this->object->host_name));
-$currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
-
-?>
-<h1 class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
-<?php if ($object->stats->services_total > 0): ?>
-<?= $this->qlink(sprintf($this->translatePlural('%d configured service:', '%d configured services:', $object->stats->services_total), $object->stats->services_total), $selfUrl) ?>
-<?php else: ?>
-<?= $this->translate('No services configured on this host'); ?>
-<?php endif; ?>
-<span class="badges">
-<?php if ($object->stats->services_ok > 0): ?>
- <span class="state ok<?= $currentUrl === $selfUrl->with('service_state', 0)->getRelativeUrl() ? ' active' : '' ?>"><?= $this->qlink(
-    $object->stats->services_ok,
-    $selfUrl,
-    array('service_state' => 0),
-    array('title' => sprintf($this->translate('Services with state %s'), $this->translate('OK')))
-)  ?></span>
-<?php endif ?>
-<?php
-
-foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $state) {
-    $pre = 'services_' . $state;
-    if ($object->stats->$pre) {
-        $handled = $pre . '_handled';
-        $unhandled = $pre . '_unhandled';
-        $paramsHandled = array('service_state' => $stateId, 'service_handled' => 1);
-        $paramsUnhandled = array('service_state' => $stateId, 'service_handled' => 0);
-        if ($object->stats->$unhandled) {
-            $compareUrl = $selfUrl->with($paramsUnhandled)->getRelativeUrl();
-        } else {
-            $compareUrl = $selfUrl->with($paramsHandled)->getRelativeUrl();
-        }
-
-        if ($compareUrl === $currentUrl) {
-            $active = ' active';
-        } else {
-            $active = '';
-        }
-
-        echo '<span class="state ' . $state . $active . ($object->stats->$unhandled ? '' : ' handled') . '">';
-        if ($object->stats->$unhandled) {
-
-            echo $this->qlink(
-                $object->stats->$unhandled,
-                $selfUrl,
-                $paramsUnhandled,
-                array('title' => sprintf($this->translate('Unhandled services with state %s'), $this->translate(strtoupper($state))))
-            );
-        }
-        if ($object->stats->$handled) {
-
-            if ($selfUrl->with($paramsHandled)->getRelativeUrl() === $currentUrl) {
-                $active = ' active';
-            } else {
-                $active = '';
-            }
-            if ($object->stats->$unhandled) {
-                echo '<span class="state handled ' . $state . $active . '">';
-            }
-            echo $this->qlink(
-                $object->stats->$handled,
-                $selfUrl,
-                $paramsHandled,
-                array('title' => sprintf($this->translate('Handled services with state %s'), $this->translate(strtoupper($state))))
-            );
-            if ($object->stats->$unhandled) {
-                echo "</span>\n";
-            }
-        }
-        echo "</span>\n";
-    }
-}
-
-?>
-<?php if ($object->stats->services_pending): ?>
- <span class="state pending<?= $currentUrl === $selfUrl->with('service_state', 99)->getRelativeUrl() ? ' active' : '' ?>"><?= $this->qlink(
-    $object->stats->services_pending,
-    $selfUrl,
-    array('service_state' => 99),
-    array('title' => sprintf($this->translate('Services with state %s'), $this->translate('PENDING')))
-)  ?></span>
-<?php endif ?>
-</span>
-</h1>
-
diff --git a/modules/monitoring/application/views/scripts/show/components/statusIcons.phtml b/modules/monitoring/application/views/scripts/show/components/statusIcons.phtml
deleted file mode 100644
index d76c07cf2..000000000
--- a/modules/monitoring/application/views/scripts/show/components/statusIcons.phtml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-use Icinga\Module\Monitoring\Object\Service;
-
-$o = $this->object;
-
-$isService = $o instanceof Service;
-$obj = new \stdClass();
-$obj->handled =
-    ($isService) ? $o->service_handled : $o->host_handled;
-$obj->state =
-    ($isService) ? $o->service_state : $o->host_state;
-$obj->acknowledged =
-    ($isService) ? $o->service_acknowledged : $o->host_acknowledged;
-$obj->in_downtime =
-    ($isService) ? $o->in_downtime : $o->host_in_downtime;
-$obj->notifications_enabled =
-    ($isService) ? $o->notifications_enabled : $o->service_notifications_enabled;
-$obj->active_checks_enabled =
-    ($isService) ? $o->active_checks_enabled : $o->host_active_checks_enabled;
-$obj->passive_checks_enabled =
-    ($isService) ? $o->passive_checks_enabled : $o->host_passive_checks_enabled;
-
-$i = array();
-if (! $obj->handled && $obj->state > 0) {
-    $i[] = $this->icon('attention-alt', $this->translate('Unhandled'));
-}
-
-if ($obj->acknowledged && ! $obj->in_downtime) {
-    $i[] = $this->icon('ok', $this->translate('Acknowledged'));
-}
-
-if (!$obj->notifications_enabled) {
-    $i[] = $this->icon('bell-of-empty', $this->translate('Notifications Disabled'));
-}
-
-if ($obj->in_downtime) {
-    $i[] = $this->icon('plug', $this->translate('In Downtime'));
-}
-
-if (! $obj->active_checks_enabled) {
-    if ($obj->passive_checks_enabled) {
-        $i[] = $this->icon('eye-off', $this->translate('Active Checks Disabled'));
-    } else {
-        $i[] = $this->icon('eye-off', $this->translate('Active And Passive Checks Disabled'));
-    }
-}
-
-?><?= implode("\n", $i) ?>
diff --git a/modules/monitoring/application/views/scripts/show/host.phtml b/modules/monitoring/application/views/scripts/show/host.phtml
deleted file mode 100644
index c4e0ec9a8..000000000
--- a/modules/monitoring/application/views/scripts/show/host.phtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php if ($object->host_name !== false): ?>
-    <div class="controls">
-    <?= $this->render('show/components/header.phtml') ?>
-    <?= $this->render('show/components/hostservicesummary.phtml') ?>
-    </div>
-    <div class="content" data-base-target="_next">
-    <?= $this->render('show/components/output.phtml') ?>
-    <?= $this->render('show/components/grapher.phtml') ?>
-
-    <table class="avp newsection">
-     <tbody>
-    <?= $this->render('show/components/acknowledgement.phtml') ?>
-    <?= $this->render('show/components/comments.phtml') ?>
-    <?= $this->render('show/components/notifications.phtml') ?>
-    <?= $this->render('show/components/downtime.phtml') ?>
-    <?= $this->render('show/components/flapping.phtml') ?>
-    <?= $this->render('show/components/perfdata.phtml') ?>
-    <?= $this->render('show/components/checksource.phtml') ?>
-    <?= $this->render('show/components/actions.phtml') ?>
-    <?= $this->render('show/components/command.phtml') ?>
-    <?= $this->render('show/components/hostgroups.phtml') ?>
-    <?= $this->render('show/components/contacts.phtml') ?>
-    <?= $this->render('show/components/checkstatistics.phtml') ?>
-    <?= $this->render('show/components/customvars.phtml') ?>
-    <?= $this->render('show/components/flags.phtml') ?>
-     </tbody>
-    </table>
-    </div>
-<?php else: ?>
-    <p> Host not found </p>
-<?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/show/service.phtml b/modules/monitoring/application/views/scripts/show/service.phtml
deleted file mode 100644
index 126d60cb7..000000000
--- a/modules/monitoring/application/views/scripts/show/service.phtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php if ($object->host_name !== false): ?>
-    <div class="controls">
-    <?= $this->render('show/components/header.phtml') ?>
-    <h1><?= $this->translate("Service detail information") ?></h1>
-    </div>
-    <div class="content" data-base-target="_next">
-    <?= $this->render('show/components/output.phtml') ?>
-    <?= $this->render('show/components/grapher.phtml') ?>
-
-    <table class="avp newsection">
-     <tbody>
-    <?= $this->render('show/components/acknowledgement.phtml') ?>
-    <?= $this->render('show/components/comments.phtml') ?>
-    <?= $this->render('show/components/notifications.phtml') ?>
-    <?= $this->render('show/components/downtime.phtml') ?>
-    <?= $this->render('show/components/flapping.phtml') ?>
-    <?= $this->render('show/components/perfdata.phtml') ?>
-    <?= $this->render('show/components/checksource.phtml') ?>
-    <?= $this->render('show/components/actions.phtml') ?>
-    <?= $this->render('show/components/command.phtml') ?>
-    <?= $this->render('show/components/servicegroups.phtml') ?>
-    <?= $this->render('show/components/contacts.phtml') ?>
-    <?= $this->render('show/components/checkstatistics.phtml') ?>
-    <?= $this->render('show/components/customvars.phtml') ?>
-    <?= $this->render('show/components/flags.phtml') ?>
-     </tbody>
-    </table>
-    </div>
-<?php else: ?>
-    <p> Service not found </p>
-<?php endif ?>

From 9df2430cbe59e67232a671b20410897a26040db0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Feb 2015 16:31:57 +0100
Subject: [PATCH 0495/2920] Remove redundant help message when scheduling
 host/service checks

---
 .../Command/Object/ScheduleServiceCheckCommandForm.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
index b34472d49..4921f54ff 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
@@ -47,16 +47,6 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
         $checkTime = new DateTime();
         $checkTime->add(new DateInterval('PT1H'));
         $this->addElements(array(
-            array(
-                'note',
-                'command-info',
-                array(
-                    'value' => $this->translate(
-                        'This command is used to schedule the next check of hosts or services. Icinga will re-queue the'
-                        . ' hosts or services to be checked at the time you specify.'
-                    )
-                )
-            ),
             array(
                 'dateTimePicker',
                 'check_time',

From a5fe9a1fe1574f0b2cfba58723b0346937a7d7fe Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Feb 2015 16:34:29 +0100
Subject: [PATCH 0496/2920] Revert "Introduce link target "_right" to keep a
 column with tabs rightmost"

This reverts commit 618ab4f4b9cdc3975cc096eaabfe04da70244fb0.
---
 application/views/scripts/config/module.phtml          |  2 +-
 .../application/views/scripts/config/index.phtml       |  2 +-
 .../application/views/scripts/config/security.phtml    |  2 +-
 public/js/icinga/events.js                             | 10 ----------
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/application/views/scripts/config/module.phtml b/application/views/scripts/config/module.phtml
index e26ade195..cd6ad5af8 100644
--- a/application/views/scripts/config/module.phtml
+++ b/application/views/scripts/config/module.phtml
@@ -1,4 +1,4 @@
-<div class="controls" data-base-target="_right">
+<div class="controls">
 <?= $this->tabs ?>
 <h1><?= $this->escape($module->getTitle()) ?></h1>
 </div>
diff --git a/modules/monitoring/application/views/scripts/config/index.phtml b/modules/monitoring/application/views/scripts/config/index.phtml
index deca8d468..b1729f9b1 100644
--- a/modules/monitoring/application/views/scripts/config/index.phtml
+++ b/modules/monitoring/application/views/scripts/config/index.phtml
@@ -1,4 +1,4 @@
-<div class="controls" data-base-target="_right">
+<div class="controls">
   <?= $tabs; ?>
   <h1><?= $this->translate('Monitoring Backends') ?></h1>
 </div>
diff --git a/modules/monitoring/application/views/scripts/config/security.phtml b/modules/monitoring/application/views/scripts/config/security.phtml
index 2a84b2469..71f2a341a 100644
--- a/modules/monitoring/application/views/scripts/config/security.phtml
+++ b/modules/monitoring/application/views/scripts/config/security.phtml
@@ -1,4 +1,4 @@
-<div class="controls" data-base-target="_right">
+<div class="controls">
     <?= $this->tabs ?>
 </div>
 <div class="content">
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index b7f2f5cee..e7ac3e3f1 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -482,16 +482,6 @@
                     targetId = 'col1';
                     $target = $('#' + targetId);
                     self.icinga.ui.layout1col();
-                } else if (targetId === '_right') {
-                    // Ensure that the content is displayed in the rightmost column
-                    $target = $el.closest('.container');
-                    if ($target.attr('id') === 'col1') {
-                        // As it's not possible to detect what's preceding the current state in the
-                        // history stack this just simulates _main in case the respective element
-                        // is not part of the rightmost column
-                        $target = $('#col1');
-                        self.icinga.ui.layout1col();
-                    }
                 } else {
                     $target = $('#' + targetId);
                 }

From bc69a3b20f9fb254a55ee8ae2956e02ef7b73e02 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 2 Feb 2015 16:40:05 +0100
Subject: [PATCH 0497/2920] Revert "Failure requests: Fix auto refresh and
 history"

This reverts commit 8c758a9f126f81cc50fe290691d284947ec1804d.
---
 public/js/icinga/loader.js | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index abf0d6684..6a85a5144 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -107,8 +107,7 @@
                 url    : url,
                 data   : data,
                 headers: headers,
-                context: self,
-                failure: false
+                context: self
             });
 
             req.$target = $target;
@@ -556,7 +555,7 @@
             // Update history when necessary. Don't do so for requests triggered
             // by history or autorefresh events
             if (! req.historyTriggered && ! req.autorefresh) {
-                if (req.$target.hasClass('container') && req.failure === false) {
+                if (req.$target.hasClass('container')) {
                     // We only want to care about top-level containers
                     if (req.$target.parent().closest('.container').length === 0) {
                         this.icinga.history.pushCurrentState();
@@ -592,17 +591,6 @@
         onFailure: function (req, textStatus, errorThrown) {
             var url = req.url;
 
-            req.failure = true;
-
-            /*
-             * Test if a manual actions comes in and autorefresh is active: Stop refreshing
-             */
-            if (! req.historyTriggered && ! req.autorefresh && req.$target.data('icingaRefresh') > 0
-            && req.$target.data('icingaUrl') !== url) {
-                req.$target.data('icingaRefresh', 0);
-                req.$target.data('icingaUrl', url);
-            }
-
             if (req.status > 0) {
                 this.icinga.logger.error(
                     req.status,

From 1d99780a617b44d43f4bb508c8f5bcacf850b22e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 16:47:28 +0100
Subject: [PATCH 0498/2920] Remove quotes from tooltip in the roles overview

refs #8110
---
 application/views/scripts/roles/index.phtml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml
index db4a6aef2..758376c53 100644
--- a/application/views/scripts/roles/index.phtml
+++ b/application/views/scripts/roles/index.phtml
@@ -52,10 +52,10 @@
                         <td><?= $this->escape($role->groups) ?></td>
                         <td>
                             <a href="<?= $this->url('roles/remove', array('role' => $name)) ?>"
-                               title="<?php printf(
-                                    $this->translate('Remove role "%s"'),
-                                    $name
-                                ); ?>">
+                               title="<?= sprintf(
+                                   $this->translate('Remove role %s'),
+                                   $name
+                               ) ?>">
                                 <?= $this->icon('cancel') ?>
                             </a>
                         </td>

From 4fc8850e25dbf77d9ad4e7e4a47163eb2da440f3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 16:48:13 +0100
Subject: [PATCH 0499/2920] Use transplatePlural for hosts in downtime and
 hosts having comments tooltips

refs #8110
---
 .../views/scripts/hosts/show.phtml            | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index f21c09fd1..a5d36deb1 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -30,9 +30,9 @@
         </h3>
 
         <div>
-            <a href="<?= $listAllLink ?>" title="<?php printf(
-                $this->translate('List all Hosts (%u)'),
-                count($objects)
+            <a href="<?= $listAllLink ?>" title="<?= sprintf(
+                $this->translate('List all %u hosts'),
+                $hostCount
             ); ?>">
                 <?= $this->translate('List all') ?>
             </a>
@@ -112,10 +112,14 @@
             <h2>
                 <?php $inDowntimeCount = count($objectsInDowntime) ?>
                 <a href="<?= $inDowntimeLink ?>"
-                   title="<?php printf(
-                        $this->translate('List all hosts in downtime (%u)'),
-                        count($objectsInDowntime)
-                    ); ?>">
+                   title="<?= sprintf(
+                       $this->translatePlural(
+                           'List %u host which is in downtime',
+                           'List %u hosts which are in downtime',
+                           $inDowntimeCount
+                       ),
+                       $inDowntimeCount
+                   ) ?>">
                     <?= $this->icon('plug') ?>
                     <?= sprintf(
                         $this->translatePlural(
@@ -133,10 +137,14 @@
         <?php if ($havingCommentsCount): ?>
             <h2>
                 <a href="<?= $havingCommentsLink ?>"
-                   title="<?php printf(
-                        $this->translate('List all Comments (%u)'),
-                        count($objects->getComments())
-                    ); ?>">
+                   title="<?= sprintf(
+                       $this->translatePlural(
+                           'List %u host having comments',
+                           'List %u hosts having comments',
+                           $havingCommentsLink
+                       ),
+                       $havingCommentsLink
+                   ) ?>">
                     <?= $this->icon('comment') ?>
                     <?= sprintf(
                         $this->translatePlural(

From 8bb0e4e0a0ba9d3924a16f3f569ee38cbda0291c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Feb 2015 16:34:29 +0100
Subject: [PATCH 0500/2920] Failure requests: Fix auto refresh and history II

Allow to change url's in history and stop auto auto refresh if
the container URL is not up to date.

Use variable after ajax call and the check is more robust.
---
 public/js/icinga/loader.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 6a85a5144..417c47c1c 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -118,6 +118,8 @@
             req.historyTriggered = false;
             req.autorefresh = autorefresh;
             req.action = action;
+            req.failure = false;
+
             if (id) {
                 this.requests[id] = req;
             }
@@ -555,7 +557,7 @@
             // Update history when necessary. Don't do so for requests triggered
             // by history or autorefresh events
             if (! req.historyTriggered && ! req.autorefresh) {
-                if (req.$target.hasClass('container')) {
+                if (req.$target.hasClass('container') && ! req.failure) {
                     // We only want to care about top-level containers
                     if (req.$target.parent().closest('.container').length === 0) {
                         this.icinga.history.pushCurrentState();
@@ -591,6 +593,17 @@
         onFailure: function (req, textStatus, errorThrown) {
             var url = req.url;
 
+            req.failure = true;
+
+            /*
+             * Test if a manual actions comes in and autorefresh is active: Stop refreshing
+             */
+            if (! req.historyTriggered && ! req.autorefresh && req.$target.data('icingaRefresh') > 0
+            && req.$target.data('icingaUrl') !== url) {
+                req.$target.data('icingaRefresh', 0);
+                req.$target.data('icingaUrl', url);
+            }
+
             if (req.status > 0) {
                 this.icinga.logger.error(
                     req.status,

From c4c6d36b00e2eb6ae76a8f5cd24210aa273ffd81 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Feb 2015 16:55:21 +0100
Subject: [PATCH 0501/2920] setup: Clarify that the db user's credentials may
 be insufficient as well

---
 modules/setup/application/forms/DatabaseCreationPage.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/setup/application/forms/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php
index be2974a52..3b9ae649b 100644
--- a/modules/setup/application/forms/DatabaseCreationPage.php
+++ b/modules/setup/application/forms/DatabaseCreationPage.php
@@ -103,8 +103,9 @@ class DatabaseCreationPage extends Form
             array(
                 'value' => $this->translate(
                     'It seems that either the database you defined earlier does not yet exist and cannot be created'
-                    . ' using the provided access credentials or the database does not have the required schema to '
-                    . 'be operated by Icinga Web 2. Please provide appropriate access credentials to solve this.'
+                    . ' using the provided access credentials, the database does not have the required schema to be'
+                    . ' operated by Icinga Web 2 or the provided access credentials do not have the sufficient '
+                    . 'permissions to access the database. Please provide appropriate access credentials to solve this.'
                 )
             )
         );
@@ -116,7 +117,9 @@ class DatabaseCreationPage extends Form
             array(
                 'required'      => false === $skipValidation,
                 'label'         => $this->translate('Username'),
-                'description'   => $this->translate('A user which is able to create databases and/or touch the database schema')
+                'description'   => $this->translate(
+                    'A user which is able to create databases and/or touch the database schema'
+                )
             )
         );
         $this->addElement(

From 2722463372a462676546336989611a4a7f0409a9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 17:06:32 +0100
Subject: [PATCH 0502/2920] Prefix tooltips in the host groups overview with
 "List ..."

refs #8110
---
 .../views/scripts/list/hostgroups.phtml       | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index 69b30f717..0c5989bff 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -96,10 +96,10 @@
                 'hostgroup'     => $h->hostgroup,
                 'sort'          => 'service_severity'
               )
-            ); ?>" title="<?php printf(
+            ); ?>" title="<?= printf(
               $this->translatePlural(
-                '%s Service OK in hostgroup `%s\'',
-                '%s Services OK in hostgroup `%s\'',
+                'List %u service with status ok in host group %s',
+                'List %u services with status ok in host group %s',
                 $h->services_ok
               ),
               $h->services_ok,
@@ -123,8 +123,8 @@
               )
             ); ?>" title="<?php printf(
               $this->translatePlural(
-                '%s Service CRITICAL Unhandled in hostgroup `%s\'',
-                '%s Services CRITICAL Unhandled in hostgroup `%s\'',
+                'List %u service with status critical unhandled in host group %s',
+                'List %u services with status critical unhandled in host group %s',
                 $h->services_critical_unhandled
               ),
               $h->services_critical_unhandled,
@@ -145,8 +145,8 @@
                 )
               ); ?>" title="<?php printf(
                 $this->translatePlural(
-                  '%s Service CRITICAL Handled in hostgroup `%s\'',
-                  '%s Services CRITICAL Handled in hostgroup `%s\'',
+                  'List %u service with status critical handled in host group %s',
+                  'List %u services with status critical handled in host group %s',
                   $h->services_critical_handled
                 ),
                 $h->services_critical_handled,
@@ -173,8 +173,8 @@
               )
             ); ?>" title="<?php printf(
               $this->translatePlural(
-                '%s Service UNKNOWN Unhandled in hostgroup `%s\'',
-                '%s Services UNKNOWN Unhandled in hostgroup `%s\'',
+                'List %u service with status unknown unhandled in host group %s',
+                'List %u services with status unknown unhandled in host group %s',
                 $h->services_unknown_unhandled
               ),
               $h->services_unknown_unhandled,
@@ -195,8 +195,8 @@
                 )
               ); ?>" title="<?php printf(
                 $this->translatePlural(
-                  '%s Service UNKNOWN Handled in hostgroup `%s\'',
-                  '%s Services UNKNOWN Handled in hostgroup `%s\'',
+                  'List %u service with status unknown handled in host group %s',
+                  'List %u services with status unknown handled in host group %s',
                   $h->services_unknown_handled
                 ),
                 $h->services_unknown_handled,
@@ -223,8 +223,8 @@
               )
             ); ?>" title="<?php printf(
               $this->translatePlural(
-                '%s Service WARNING Unhandled in hostgroup `%s\'',
-                '%s Services WARNING Unhandled in hostgroup `%s\'',
+                'List %u service with status warning unhandled in host group %s',
+                'List %u services with status warning unhandled in host group %s',
                 $h->services_warning_unhandled
               ),
               $h->services_warning_unhandled,
@@ -245,8 +245,8 @@
                 )
               ); ?>" title="<?php printf(
                 $this->translatePlural(
-                  '%s Service WARNING Handled in hostgroup `%s\'',
-                  '%s Services WARNING Handled in hostgroup `%s\'',
+                  'List %u service with status warning handled in host group %s',
+                  'List %u services with status warning handled in host group %s',
                   $h->services_warning_handled
                 ),
                 $h->services_warning_handled,
@@ -270,8 +270,8 @@
               )
             ); ?>" title="<?php printf(
               $this->translatePlural(
-                '%s Service PENDING in hostgroup `%s\'',
-                '%s Services PENDING in hostgroup `%s\'',
+                'List %u service with status pending in host group %s',
+                'List %u services with status pending in host group %s',
                 $h->services_pending
               ),
               $h->services_pending,

From 3596e7ce62155eed4648143263ca199e879917e9 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 2 Feb 2015 17:07:54 +0100
Subject: [PATCH 0503/2920] FilterEditor: use preserved params

fixes #7904
---
 library/Icinga/Web/Widget/FilterEditor.php | 29 ++++++++++++++++------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 9ff8622b5..e694a32f2 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -34,6 +34,10 @@ class FilterEditor extends AbstractWidget
 
     protected $preserveParams = array();
 
+    protected $preservedParams = array();
+
+    protected $preservedUrl;
+
     protected $ignoreParams = array();
 
     /**
@@ -84,6 +88,14 @@ class FilterEditor extends AbstractWidget
         return $this->url;
     }
 
+    protected function preservedUrl()
+    {
+        if ($this->preservedUrl === null) {
+            $this->preservedUrl = $this->url()->with($this->preservedParams);
+        }
+        return $this->preservedUrl;
+    }
+
     public function setQuery($query)
     {
         $this->query = $query;
@@ -147,6 +159,7 @@ class FilterEditor extends AbstractWidget
                 $preserve[$key] = $value;
             }
         }
+        $this->preservedParams = $preserve;
 
         $add    = $params->shift('addFilter');
         $remove = $params->shift('removeFilter');
@@ -232,7 +245,7 @@ class FilterEditor extends AbstractWidget
         if ($modify) {
             if ($request->isPost()) {
                 if ($request->get('cancel') === 'Cancel') {
-                    $this->redirectNow($this->url()->without('modifyFilter'));
+                    $this->redirectNow($this->preservedUrl()->without('modifyFilter'));
                 }
 
                 $filter = $this->applyChanges($request->getPost());
@@ -295,7 +308,7 @@ class FilterEditor extends AbstractWidget
     {
         return $this->view()->qlink(
             '',
-            $this->url()->with('removeFilter', $filter->getId()),
+            $this->preservedUrl()->with('removeFilter', $filter->getId()),
             null,
             array(
                 'title' => t('Click to remove this part of your filter'),
@@ -308,7 +321,7 @@ class FilterEditor extends AbstractWidget
     {
         return $this->view()->qlink(
             '',
-            $this->url()->with('addFilter', $filter->getId()),
+            $this->preservedUrl()->with('addFilter', $filter->getId()),
             null,
             array(
                 'title' => t('Click to add another filter'),
@@ -321,7 +334,7 @@ class FilterEditor extends AbstractWidget
     {
         return $this->view()->qlink(
             '',
-            $this->url()->with('stripFilter', $filter->getId()),
+            $this->preservedUrl()->with('stripFilter', $filter->getId()),
             null,
             array(
                 'title' => t('Strip this filter'),
@@ -334,7 +347,7 @@ class FilterEditor extends AbstractWidget
     {
         return $this->view()->qlink(
             '',
-            $this->url()->without('addFilter'),
+            $this->preservedUrl()->without('addFilter'),
             null,
             array(
                 'title' => t('Cancel this operation'),
@@ -638,7 +651,7 @@ class FilterEditor extends AbstractWidget
     public function renderSearch()
     {
         $html = ' <form method="post" class="inline dontprint" action="'
-              . $this->url()
+              . $this->preservedUrl()
               . '"><input type="text" name="q" style="width: 8em" class="search" value="" placeholder="'
               . t('Search...')
               . '" /></form>';
@@ -653,7 +666,7 @@ class FilterEditor extends AbstractWidget
         }
         return $html
             . '<a href="'
-            . $this->url()->with('modifyFilter', true)
+            . $this->preservedUrl()->with('modifyFilter', true)
             . '" title="'
             . $title
             . '">'
@@ -663,7 +676,7 @@ class FilterEditor extends AbstractWidget
 
     public function render()
     {
-        if (! $this->url()->getParam('modifyFilter')) {
+        if (! $this->preservedUrl()->getParam('modifyFilter')) {
             return $this->renderSearch() . $this->shorten($this->filter, 50);
         }
         return  $this->renderSearch()

From a8de3c093afb58b49a6ddf07672245369bd24046 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 17:27:59 +0100
Subject: [PATCH 0504/2920] monitoring/host: Add tooltip for the unhandled
 services link to the link

refs #8110
---
 .../views/scripts/list/hosts.phtml            | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 55242101c..07410ddc7 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -98,21 +98,29 @@ if ($hosts->count() === 0) {
         <?= implode(' ', $icons) ?>
         <a href="<?= $hostLink  ?>"><?= $this->escape($host->host_display_name) ?></a>
         <?php if (isset($host->host_unhandled_services) && $host->host_unhandled_services > 0): ?>
-        <span title="<?php printf(
-          $this->translatePlural('%s Service Problem on Host "%s"', '%s Service Problems on Host "%s"', $host->host_unhandled_services),
-          $host->host_unhandled_services,
-          $host->host_name
-        ); ?>"> (<?= $this->qlink(
-           sprintf(
-               $this->translatePlural('%d unhandled service', '%d unhandled services', $host->host_unhandled_services),
-               $host->host_unhandled_services),
-           'monitoring/show/services',
-           array(
-               'host'               => $host->host_name,
-               'service_problem'    => 1,
-               'service_handled'    => 0
+        <span> (<?= $this->qlink(
+          sprintf(
+            $this->translatePlural('%d unhandled service', '%d unhandled services', $host->host_unhandled_services),
+            $host->host_unhandled_services
+          ),
+          'monitoring/show/services',
+          array(
+            'host'               => $host->host_name,
+            'service_problem'    => 1,
+            'service_handled'    => 0
            ),
-           array('style' => 'font-weight: normal')
+          array(
+            'style' => 'font-weight: normal',
+            'title' => sprintf(
+              $this->translatePlural(
+                'List %s service problem on host %s',
+                'List %s service problems on host %s',
+                $host->host_unhandled_services
+              ),
+              $host->host_unhandled_services,
+              $host->host_name
+            )
+          )
         ) ?>)</span>
         <?php endif ?>
         <p class="pluginoutput"><?= $this->escape($this->ellipsis($host->host_output, 10000)) ?></p>

From 61fde8b35961f9c064fecde8e644e87c9efb8c64 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 2 Feb 2015 17:29:30 +0100
Subject: [PATCH 0505/2920] monitoring: Prefix tooltips in the service groups
 overview with "List ..."

refs #8110
---
 .../views/scripts/list/servicegroups.phtml    | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index 71195ba61..04e6975e1 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -98,8 +98,8 @@
               )
             ); ?>" title="<?php printf(
               $this->translatePlural(
-                '%s Service OK in servicegroup `%s\'',
-                '%s Services OK in servicegroup `%s\'',
+                'List %s service with status ok in service group %s',
+                'List %s Services with status ok in service group %s',
                 $s->services_ok
               ),
               $s->services_ok,
@@ -123,8 +123,8 @@
               )
             ); ?>" title="<?php printf(
               $this->translatePlural(
-                '%s Service CRITICAL Unhandled in servicegroup `%s\'',
-                '%s Services CRITICAL Unhandled in servicegroup `%s\'',
+                'List %s service with status critical unhandled in service group %s',
+                'List %s Services with status critical unhandled in service group %s',
                 $s->services_critical_unhandled
               ),
               $s->services_critical_unhandled,
@@ -145,8 +145,8 @@
                 )
               ); ?>" title="<?php printf(
                 $this->translatePlural(
-                  '%s Service CRITICAL Handled in servicegroup `%s\'',
-                  '%s Services CRITICAL Handled in servicegroup `%s\'',
+                  'List %s service with status critical handled in service group %s',
+                  'List %s services with status critical handled in service group %s',
                   $s->services_critical_handled
                 ),
                 $s->services_critical_handled,
@@ -173,8 +173,8 @@
               )
             ); ?>" title="<?php printf(
               $this->translatePlural(
-                '%s Service UNKNOWN Unhandled in servicegroup `%s\'',
-                '%s Services UNKNOWN Unhandled in servicegroup `%s\'',
+                'List %s service with status unknown unhandled in service group %s',
+                'List %s services with status unknown unhandled in service group %s',
                 $s->services_unknown_unhandled
               ),
               $s->services_unknown_unhandled,
@@ -195,8 +195,8 @@
                 )
               ); ?>" title="<?php printf(
                 $this->translatePlural(
-                  '%s Service UNKNOWN Handled in servicegroup `%s\'',
-                  '%s Services UNKNOWN Handled in servicegroup `%s\'',
+                  'List %s service with status unknown handled in service group %s',
+                  'List %s services with status unknown handled in service group %s',
                   $s->services_unknown_handled
                 ),
                 $s->services_unknown_handled,
@@ -223,8 +223,8 @@
               )
             ); ?>" title="<?php printf(
               $this->translatePlural(
-                '%s Service WARNING Unhandled in servicegroup `%s\'',
-                '%s Services WARNING Unhandled in servicegroup `%s\'',
+                'List %s service with status warning unhandled in service group %s',
+                'List %s services with status warning unhandled in service group %s',
                 $s->services_warning_unhandled
               ),
               $s->services_warning_unhandled,
@@ -245,8 +245,8 @@
                 )
               ); ?>" title="<?php printf(
                 $this->translatePlural(
-                  '%s Service WARNING Handled in servicegroup `%s\'',
-                  '%s Services WARNING Handled in servicegroup `%s\'',
+                  'List %s service with status warning handled in service group %s',
+                  'List %s services with status warning handled in service group %s',
                   $s->services_warning_handled
                 ),
                 $s->services_warning_handled,
@@ -270,8 +270,8 @@
               )
             ); ?>" title="<?php printf(
               $this->translatePlural(
-                '%s Service PENDING in servicegroup `%s\'',
-                '%s Services PENDING in servicegroup `%s\'',
+                'List %s service with status pending in service group %s',
+                'List %s services with status pending in service group %s',
                 $s->services_pending
               ),
               $s->services_pending,

From f8c5bf68193136d4d49dc275ec94b0f1bca601e0 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 14 Jan 2015 10:58:36 +0100
Subject: [PATCH 0506/2920] Web\Hook: support hook base classes in modules

refs #8207
---
 library/Icinga/Web/Hook.php | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Web/Hook.php b/library/Icinga/Web/Hook.php
index 01d1e0e2c..7ace738d7 100644
--- a/library/Icinga/Web/Hook.php
+++ b/library/Icinga/Web/Hook.php
@@ -113,6 +113,18 @@ class Hook
         return $instance;
     }
 
+    protected static function splitHookName($name)
+    {
+        $sep = '\\';
+        if (false === $module = strpos($name, $sep)) {
+            return array(null, $name);
+        }
+        return array(
+            substr($name, 0, $module),
+            substr($name, $module + 1)
+        );
+    }
+
     /**
      * Test for a valid class name
      *
@@ -123,10 +135,24 @@ class Hook
      */
     private static function assertValidHook($instance, $name)
     {
-        $base_class = self::$BASE_NS . ucfirst($name) . 'Hook';
+        $suffix = self::$classSuffix; // 'Hook'
+        $base = self::$BASE_NS;       // 'Icinga\\Web\\Hook\\'
 
-        if (strpos($base_class, self::$classSuffix) === false) {
-            $base_class .= self::$classSuffix;
+        list($module, $name) = self::splitHookName($name);
+
+        if ($module === null) {
+            $base_class = $base . ucfirst($name) . 'Hook';
+
+            // I'm unsure whether this makes sense. Unused and Wrong.
+            if (strpos($base_class, $suffix) === false) {
+                $base_class .= $suffix;
+            }
+        } else {
+            $base_class = 'Icinga\\Module\\'
+                        . ucfirst($module)
+                        . '\\Web\\Hook\\'
+                        . ucfirst($name)
+                        . $suffix;
         }
 
         if (!$instance instanceof $base_class) {

From 45bf071db603912154cadde32e67cc9f367ac5fb Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 14 Jan 2015 11:00:26 +0100
Subject: [PATCH 0507/2920] HostActionsHook: initial very simple implementation

refs #8208
---
 .../library/Monitoring/Web/Hook/HostActionsHook.php    | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php

diff --git a/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php b/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
new file mode 100644
index 000000000..c1ccdfbca
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Icinga\Module\Monitoring\Web\Hook;
+
+use Icinga\Module\Monitoring\Object\Host;
+
+abstract class HostActionsHook
+{
+    abstract public function getActionsForHost(Host $host);
+}

From 67e935557e775ff0eac6ea95e6da0e2226b344f7 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 14 Jan 2015 11:01:39 +0100
Subject: [PATCH 0508/2920] HostController: use host actions hook

refs #8208
---
 .../controllers/HostController.php            | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index 4eccb8899..150f9ae1a 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -9,6 +9,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostCheckCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostDowntimeCommandForm;
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Web\Controller\MonitoredObjectController;
+use Icinga\Web\Hook;
 
 class Monitoring_HostController extends MonitoredObjectController
 {
@@ -37,6 +38,28 @@ class Monitoring_HostController extends MonitoredObjectController
         $this->getTabs()->activate('host');
     }
 
+    protected function getHostActions()
+    {
+        $urls = array();
+
+        foreach (Hook::all('Monitoring\\HostActions') as $hook) {
+            foreach ($hook->getActionsForHost($this->object) as $id => $url) {
+                $urls[$id] = $url;
+            }
+        }
+
+        return $urls;
+    }
+
+    /**
+     * Show a host
+     */
+    public function showAction()
+    {
+        $this->view->hostActions = $this->getHostActions();
+        parent::showAction();
+    }
+
     /**
      * Acknowledge a host problem
      */

From 6c8808875adafbd39ebafe04f118ee0ca326e70b Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 14 Jan 2015 11:02:06 +0100
Subject: [PATCH 0509/2920] host/show: show action urls above perfdata

---
 modules/monitoring/application/views/scripts/host/show.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/host/show.phtml b/modules/monitoring/application/views/scripts/host/show.phtml
index 00d579a29..867692301 100644
--- a/modules/monitoring/application/views/scripts/host/show.phtml
+++ b/modules/monitoring/application/views/scripts/host/show.phtml
@@ -13,9 +13,9 @@
         <?= $this->render('show/components/notifications.phtml') ?>
         <?= $this->render('show/components/downtime.phtml') ?>
         <?= $this->render('show/components/flapping.phtml') ?>
+        <?= $this->render('show/components/actions.phtml') ?>
         <?= $this->render('show/components/perfdata.phtml') ?>
         <?= $this->render('show/components/checksource.phtml') ?>
-        <?= $this->render('show/components/actions.phtml') ?>
         <?= $this->render('show/components/command.phtml') ?>
         <?= $this->render('show/components/hostgroups.phtml') ?>
         <?= $this->render('show/components/contacts.phtml') ?>

From 3038de5ad0ba125fd3c94739b226abe75f355197 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 14 Jan 2015 11:02:43 +0100
Subject: [PATCH 0510/2920] components/actions: show host action urls if given

---
 .../views/scripts/show/components/actions.phtml            | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/show/components/actions.phtml b/modules/monitoring/application/views/scripts/show/components/actions.phtml
index 9f3211bd3..c34141084 100644
--- a/modules/monitoring/application/views/scripts/show/components/actions.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/actions.phtml
@@ -6,6 +6,7 @@ if (! $object->action_url && ! $object->notes_url) {
 
 $links = array();
 $linkText = '<a href="%s" target="_blank">%s</a>';
+$localLinkText = '<a href="%s">%s</a>';
 
 if ($object->notes_url) {
     if (strpos($object->notes_url, "' ") === false) {
@@ -32,6 +33,12 @@ if ($object->action_url) {
     }
 }
 
+if (isset($this->hostActions)) {
+    foreach ($this->hostActions as $id => $action) {
+        $links[] = sprintf($localLinkText, $action, $id);
+    }
+}
+
 ?>
 <tr>
   <th>Foreign URLs</th>

From b4c47c51e7a354b69f7b85d6feb8e23ba693ac58 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 14 Jan 2015 11:50:03 +0100
Subject: [PATCH 0511/2920] components/actions: show links if available

Now we show links regardless of whether we have host actions, there
might be hook-provided links only. Renamed "Foreign URLs" to "Actions"
and made it translatable.
---
 .../views/scripts/show/components/actions.phtml        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/actions.phtml b/modules/monitoring/application/views/scripts/show/components/actions.phtml
index c34141084..1d926b33a 100644
--- a/modules/monitoring/application/views/scripts/show/components/actions.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/actions.phtml
@@ -1,9 +1,5 @@
 <?php
 
-if (! $object->action_url && ! $object->notes_url) {
-    return;
-}
-
 $links = array();
 $linkText = '<a href="%s" target="_blank">%s</a>';
 $localLinkText = '<a href="%s">%s</a>';
@@ -39,8 +35,12 @@ if (isset($this->hostActions)) {
     }
 }
 
+if (empty($links)) {
+    return;
+}
+
 ?>
 <tr>
-  <th>Foreign URLs</th>
+  <th><?= $this->translate('Actions') ?></th>
   <td><?= implode("\n ", $links) . "\n" ?></td>
 </tr>

From b54a12c2d5d7c15d18cc8046ac42b27852b76123 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 2 Feb 2015 18:17:30 +0100
Subject: [PATCH 0512/2920] HostActionsHook: document the new hook

---
 .../Monitoring/Web/Hook/HostActionsHook.php   | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php b/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
index c1ccdfbca..5025c414c 100644
--- a/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
+++ b/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
@@ -4,7 +4,42 @@ namespace Icinga\Module\Monitoring\Web\Hook;
 
 use Icinga\Module\Monitoring\Object\Host;
 
+/**
+ * Base class for host action hooks
+ */
 abstract class HostActionsHook
 {
+    /**
+     * Implementors of this method should return an array containing
+     * additional action links for a specific host. You get a full Host
+     * object, which allows you to return specific links only for nodes
+     * with specific properties.
+     *
+     * The result array should be in the form title => url, where title will
+     * be used as link caption. Url should be an Icinga\Web\Url object when
+     * the link should point to an Icinga Web url - otherwise a string would
+     * be fine.
+     *
+     * Mixed example:
+     * <code>
+     * return array(
+     *     'Wiki' => 'http://my.wiki/host=' . rawurlencode($host->host_name),
+     *     'Logstash' => Url::fromPath(
+     *         'logstash/search/syslog',
+     *         array('host' => $host->host_name)
+     *     )
+     * );
+     * </code>
+     *
+     * One might also provide ssh:// or rdp:// urls if equipped with fitting
+     * (safe) URL handlers for his browser(s).
+     *
+     * TODO: I'd love to see some kind of a Link/LinkSet object implemented
+     *       for this and similar hooks.
+     *
+     * @param   Host   $host Monitoring host object
+     *
+     * @return  array  An array containing a list of host action links
+     */
     abstract public function getActionsForHost(Host $host);
 }

From a705e03affe33d5c42ff9fb9b389227812aea57d Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 2 Feb 2015 18:21:01 +0100
Subject: [PATCH 0513/2920] HostController: fix merge BS

---
 .../application/controllers/HostController.php      | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index e2f7f8475..150f9ae1a 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -51,19 +51,6 @@ class Monitoring_HostController extends MonitoredObjectController
         return $urls;
     }
 
-    protected function getHostActions()
-    {
-        $urls = array();
-
-        foreach (Hook::all('Monitoring\\HostActions') as $hook) {
-            foreach ($hook->getActionsForHost($this->object) as $id => $url) {
-                $urls[$id] = $url;
-            }
-        }
-
-        return $urls;
-    }
-
     /**
      * Show a host
      */

From f6fc592b911b60e303d49026613429dd128ad937 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 2 Feb 2015 21:56:14 +0100
Subject: [PATCH 0514/2920] events.js: reduce logging noise

Form submission by pressing return is not an error, and debug level
should suffice for the other button-related notices too.
---
 public/js/icinga/events.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index e7ac3e3f1..0a77db60e 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -204,16 +204,16 @@
                 if (typeof event.originalEvent !== 'undefined'
                     && typeof event.originalEvent.explicitOriginalTarget === 'object') { // Firefox
                     $el = $(event.originalEvent.explicitOriginalTarget);
-                    icinga.logger.info('events/submitForm: Button is event.originalEvent.explicitOriginalTarget');
+                    icinga.logger.debug('events/submitForm: Button is event.originalEvent.explicitOriginalTarget');
                 } else {
                     $el = $(event.currentTarget);
-                    icinga.logger.info('events/submitForm: Button is event.currentTarget');
+                    icinga.logger.debug('events/submitForm: Button is event.currentTarget');
                 }
 
                 if ($el && ($el.is('input[type=submit]') || $el.is('button[type=submit]'))) {
                     $button = $el;
                 } else {
-                    icinga.logger.error(
+                    icinga.logger.debug(
                         'events/submitForm: Can not determine submit button, using the first one in form'
                     );
                 }

From 7989b48248e001010b9bfb93f5fed9c4e5c3ef47 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 3 Feb 2015 10:15:54 +0100
Subject: [PATCH 0515/2920] Fix ldap auth when the userNameAttribute holds
 multiple values

fixes #8246
---
 doc/authentication.md                            |  4 ++++
 .../Authentication/Backend/LdapUserBackend.php   | 16 ++++++++++++++--
 library/Icinga/Protocol/Ldap/Connection.php      |  6 +++---
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/doc/authentication.md b/doc/authentication.md
index 542eb9934..175403061 100644
--- a/doc/authentication.md
+++ b/doc/authentication.md
@@ -54,6 +54,10 @@ user_class          = inetOrgPerson
 user_name_attribute = uid
 ```
 
+Note that in case the set *user_name_attribute* holds multiple values it is required that all of its
+values are unique. Additionally, a user will be logged in using the exact user id used to authenticate
+with Icinga Web 2 (e.g. an alias) no matter what the primary user id might actually be.
+
 #### <a id="authentication-configuration-ad-authentication"></a> Active Directory
 
 Directive               | Description
diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/Backend/LdapUserBackend.php
index 69fe795fc..666ed69ae 100644
--- a/library/Icinga/Authentication/Backend/LdapUserBackend.php
+++ b/library/Icinga/Authentication/Backend/LdapUserBackend.php
@@ -150,7 +150,13 @@ class LdapUserBackend extends UserBackend
     public function hasUser(User $user)
     {
         $username = $user->getUsername();
-        return strtolower($this->conn->fetchOne($this->selectUser($username))) === strtolower($username);
+        $entry = $this->conn->fetchOne($this->selectUser($username));
+
+        if (is_array($entry)) {
+            return in_array(strtolower($username), array_map('strtolower', $entry));
+        }
+
+        return strtolower($entry) === strtolower($username);
     }
 
     /**
@@ -225,7 +231,13 @@ class LdapUserBackend extends UserBackend
     {
         $users = array();
         foreach ($this->selectUsers()->fetchAll() as $row) {
-            $users[] = $row->{$this->userNameAttribute};
+            if (is_array($row->{$this->userNameAttribute})) {
+                foreach ($row->{$this->userNameAttribute} as $col) {
+                    $users[] = $col;
+                }
+            } else {
+                $users[] = $row->{$this->userNameAttribute};
+            }
         }
         return $users;
     }
diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 1f58f34da..a576ab790 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -214,20 +214,20 @@ class Connection
     /**
      * Fetch the distinguished name of the first result of the given query
      *
-     * @param       $query   The query returning the result set
+     * @param Query $query   The query returning the result set
      * @param array $fields  The fields to fetch
      *
      * @return string        Returns the distinguished name, or false when the given query yields no results
      * @throws LdapException When the query result is empty and contains no DN to fetch
      */
-    public function fetchDN($query, $fields = array())
+    public function fetchDN(Query $query, $fields = array())
     {
         $rows = $this->fetchAll($query, $fields);
         if (count($rows) !== 1) {
             throw new LdapException(
                 sprintf(
                     'Cannot fetch single DN for %s',
-                    $query
+                    $query->create()
                 )
             );
         }

From cb08b25e17051012eafbc3976c2b1e3abf5ea86d Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus@lazyfrosch.de>
Date: Tue, 3 Feb 2015 10:42:54 +0100
Subject: [PATCH 0516/2920] Remove executable flags from some PHP libraries

Note: dompdf.php is actually a CLI script, but has no shebang and is not used
in Icingaweb2.

Fixes #8345
---
 library/Icinga/Web/Session/PhpSession.php                         | 0
 library/vendor/HTMLPurifier/DefinitionCache/Serializer/README     | 0
 library/vendor/Zend/Amf/Adobe/Auth.php                            | 0
 library/vendor/Zend/Amf/Adobe/DbInspector.php                     | 0
 library/vendor/Zend/Amf/Adobe/Introspector.php                    | 0
 library/vendor/Zend/Amf/Auth/Abstract.php                         | 0
 library/vendor/Zend/Amf/Parse/Resource/MysqlResult.php            | 0
 library/vendor/Zend/Amf/Parse/Resource/Stream.php                 | 0
 library/vendor/Zend/Amf/Value/Messaging/ArrayCollection.php       | 0
 library/vendor/Zend/Cache/Backend/ZendServer.php                  | 0
 library/vendor/Zend/Cache/Backend/ZendServer/Disk.php             | 0
 library/vendor/Zend/Cache/Backend/ZendServer/ShMem.php            | 0
 library/vendor/Zend/Cloud/AbstractFactory.php                     | 0
 .../vendor/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php    | 0
 .../Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php     | 0
 library/vendor/Zend/Cloud/QueueService/Adapter/WindowsAzure.php   | 0
 library/vendor/Zend/Cloud/QueueService/Adapter/ZendQueue.php      | 0
 library/vendor/Zend/Cloud/QueueService/Message.php                | 0
 library/vendor/Zend/Config/Json.php                               | 0
 library/vendor/Zend/Config/Writer/Json.php                        | 0
 library/vendor/Zend/Config/Writer/Yaml.php                        | 0
 library/vendor/Zend/Config/Yaml.php                               | 0
 library/vendor/Zend/Http/Client/Adapter/Stream.php                | 0
 library/vendor/Zend/Http/Response/Stream.php                      | 0
 library/vendor/dompdf/dompdf.php                                  | 0
 25 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 library/Icinga/Web/Session/PhpSession.php
 mode change 100755 => 100644 library/vendor/HTMLPurifier/DefinitionCache/Serializer/README
 mode change 100755 => 100644 library/vendor/Zend/Amf/Adobe/Auth.php
 mode change 100755 => 100644 library/vendor/Zend/Amf/Adobe/DbInspector.php
 mode change 100755 => 100644 library/vendor/Zend/Amf/Adobe/Introspector.php
 mode change 100755 => 100644 library/vendor/Zend/Amf/Auth/Abstract.php
 mode change 100755 => 100644 library/vendor/Zend/Amf/Parse/Resource/MysqlResult.php
 mode change 100755 => 100644 library/vendor/Zend/Amf/Parse/Resource/Stream.php
 mode change 100755 => 100644 library/vendor/Zend/Amf/Value/Messaging/ArrayCollection.php
 mode change 100755 => 100644 library/vendor/Zend/Cache/Backend/ZendServer.php
 mode change 100755 => 100644 library/vendor/Zend/Cache/Backend/ZendServer/Disk.php
 mode change 100755 => 100644 library/vendor/Zend/Cache/Backend/ZendServer/ShMem.php
 mode change 100755 => 100644 library/vendor/Zend/Cloud/AbstractFactory.php
 mode change 100755 => 100644 library/vendor/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php
 mode change 100755 => 100644 library/vendor/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php
 mode change 100755 => 100644 library/vendor/Zend/Cloud/QueueService/Adapter/WindowsAzure.php
 mode change 100755 => 100644 library/vendor/Zend/Cloud/QueueService/Adapter/ZendQueue.php
 mode change 100755 => 100644 library/vendor/Zend/Cloud/QueueService/Message.php
 mode change 100755 => 100644 library/vendor/Zend/Config/Json.php
 mode change 100755 => 100644 library/vendor/Zend/Config/Writer/Json.php
 mode change 100755 => 100644 library/vendor/Zend/Config/Writer/Yaml.php
 mode change 100755 => 100644 library/vendor/Zend/Config/Yaml.php
 mode change 100755 => 100644 library/vendor/Zend/Http/Client/Adapter/Stream.php
 mode change 100755 => 100644 library/vendor/Zend/Http/Response/Stream.php
 mode change 100755 => 100644 library/vendor/dompdf/dompdf.php

diff --git a/library/Icinga/Web/Session/PhpSession.php b/library/Icinga/Web/Session/PhpSession.php
old mode 100755
new mode 100644
diff --git a/library/vendor/HTMLPurifier/DefinitionCache/Serializer/README b/library/vendor/HTMLPurifier/DefinitionCache/Serializer/README
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Amf/Adobe/Auth.php b/library/vendor/Zend/Amf/Adobe/Auth.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Amf/Adobe/DbInspector.php b/library/vendor/Zend/Amf/Adobe/DbInspector.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Amf/Adobe/Introspector.php b/library/vendor/Zend/Amf/Adobe/Introspector.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Amf/Auth/Abstract.php b/library/vendor/Zend/Amf/Auth/Abstract.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Amf/Parse/Resource/MysqlResult.php b/library/vendor/Zend/Amf/Parse/Resource/MysqlResult.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Amf/Parse/Resource/Stream.php b/library/vendor/Zend/Amf/Parse/Resource/Stream.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Amf/Value/Messaging/ArrayCollection.php b/library/vendor/Zend/Amf/Value/Messaging/ArrayCollection.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Cache/Backend/ZendServer.php b/library/vendor/Zend/Cache/Backend/ZendServer.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Cache/Backend/ZendServer/Disk.php b/library/vendor/Zend/Cache/Backend/ZendServer/Disk.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Cache/Backend/ZendServer/ShMem.php b/library/vendor/Zend/Cache/Backend/ZendServer/ShMem.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Cloud/AbstractFactory.php b/library/vendor/Zend/Cloud/AbstractFactory.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php b/library/vendor/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php b/library/vendor/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Cloud/QueueService/Adapter/WindowsAzure.php b/library/vendor/Zend/Cloud/QueueService/Adapter/WindowsAzure.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Cloud/QueueService/Adapter/ZendQueue.php b/library/vendor/Zend/Cloud/QueueService/Adapter/ZendQueue.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Cloud/QueueService/Message.php b/library/vendor/Zend/Cloud/QueueService/Message.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Config/Json.php b/library/vendor/Zend/Config/Json.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Config/Writer/Json.php b/library/vendor/Zend/Config/Writer/Json.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Config/Writer/Yaml.php b/library/vendor/Zend/Config/Writer/Yaml.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Config/Yaml.php b/library/vendor/Zend/Config/Yaml.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Http/Client/Adapter/Stream.php b/library/vendor/Zend/Http/Client/Adapter/Stream.php
old mode 100755
new mode 100644
diff --git a/library/vendor/Zend/Http/Response/Stream.php b/library/vendor/Zend/Http/Response/Stream.php
old mode 100755
new mode 100644
diff --git a/library/vendor/dompdf/dompdf.php b/library/vendor/dompdf/dompdf.php
old mode 100755
new mode 100644

From a6cea24934f493d0131fb4813176c21da5315603 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Tue, 3 Feb 2015 12:16:25 +0100
Subject: [PATCH 0517/2920] Platform::zendClassExists(): don't fail if a Zend
 class file doesn't exist

---
 library/Icinga/Application/Platform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Application/Platform.php b/library/Icinga/Application/Platform.php
index 6e5953887..d4d130220 100644
--- a/library/Icinga/Application/Platform.php
+++ b/library/Icinga/Application/Platform.php
@@ -191,7 +191,7 @@ class Platform
      */
     public static function zendClassExists($name)
     {
-        if (class_exists($name)) {
+        if (@class_exists($name)) {
             return true;
         }
 

From 31728fd024c0fc567e5de6969c43fd8047cc0ff8 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 12:34:22 +0100
Subject: [PATCH 0518/2920] monitoring: Improve tooltips for hosts command
 links

refs #8110
---
 .../controllers/HostsController.php           |  2 +-
 .../views/scripts/hosts/show.phtml            | 64 +++++++++++++------
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 869be92d8..27b9d28f4 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -121,7 +121,7 @@ class Monitoring_HostsController extends Controller
         $this->view->objectsInDowntime = $objectsInDowntime;
         $this->view->inDowntimeLink = Url::fromPath('monitoring/list/downtimes')
             ->setQueryString(Filter::matchAny($downtimeFilterExpressions)->toQueryString());
-        $this->view->havingCommentsLink = Url::fromRequest()
+        $this->view->commentsLink = Url::fromRequest()
             ->setPath('monitoring/list/comments');
         $this->view->hostStatesPieChart = $this->createPieChart(
             $hostStates,
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index a5d36deb1..109d6723b 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -76,17 +76,43 @@
             ) ?>
         </h3>
         <div>
-            <a href="<?= $downtimeUnhandledLink ?>"
-               title="<?= $this->translate('Schedule downtimes for unhandled problem hosts') ?>">
+            <a href="<?= $downtimeUnhandledLink ?>" title="<?= sprintf(
+                $this->translatePlural(
+                    'Schedule downtime for %u unhandled host problem',
+                    'Schedule downtimes for %u unhandled host problems',
+                    $unhandledCount
+                ),
+                $unhandledCount
+            ) ?>">
                 <?= $this->icon('plug') ?>
-                <?= $this->translate('Schedule downtimes for unhandled problem hosts') ?>
+                <?= sprintf(
+                    $this->translatePlural(
+                        'Schedule downtime for unhandled host problem',
+                        'Schedule downtimes for unhandled host problems',
+                        $unhandledCount
+                    ),
+                    $unhandledCount
+                ) ?>
             </a>
         </div>
         <div>
-            <a href="<?= $acknowledgeUnhandledLink ?>"
-               title="<?= $this->translate('Acknowledge unhandled problem hosts') ?>">
+            <a href="<?= $acknowledgeUnhandledLink ?>" title="<?= sprintf(
+                $this->translatePlural(
+                    'Acknowledge %u unhandled host problem',
+                    'Acknowledge %u unhandled host problems',
+                    $unhandledCount
+                ),
+                $unhandledCount
+            ) ?>">
                 <?= $this->icon('ok') ?>
-                <?= $this->translate('Acknowledge unhandled problem hosts') ?>
+                <?= sprintf(
+                    $this->translatePlural(
+                        'Acknowledge unhandled host problem',
+                        'Acknowledge unhandled host problems',
+                        $unhandledCount
+                    ),
+                    $unhandledCount
+                ) ?>
             </a>
         </div>
         <?php endif ?>
@@ -123,8 +149,8 @@
                     <?= $this->icon('plug') ?>
                     <?= sprintf(
                         $this->translatePlural(
-                            '%u host is in downtime',
-                            '%u hosts are in downtime',
+                            'List %u host currently in downtime',
+                            'List %u hosts currently downtime',
                             $inDowntimeCount
                         ),
                         $inDowntimeCount
@@ -133,26 +159,26 @@
             </h2>
         <?php endif ?>
 
-        <?php $havingCommentsCount = count($objects->getComments()) ?>
-        <?php if ($havingCommentsCount): ?>
+        <?php $commentCount = count($objects->getComments()) ?>
+        <?php if ($commentCount): ?>
             <h2>
-                <a href="<?= $havingCommentsLink ?>"
+                <a href="<?= $commentsLink ?>"
                    title="<?= sprintf(
                        $this->translatePlural(
-                           'List %u host having comments',
-                           'List %u hosts having comments',
-                           $havingCommentsLink
+                           'List %u host comment',
+                           'List %u host comments',
+                           $commentCount
                        ),
-                       $havingCommentsLink
+                       $commentCount
                    ) ?>">
                     <?= $this->icon('comment') ?>
                     <?= sprintf(
                         $this->translatePlural(
-                            '%u comment',
-                            '%u comments',
-                            $havingCommentsCount
+                            'List %u host comment',
+                            'List %u host comments',
+                            $commentCount
                         ),
-                        $havingCommentsCount
+                        $commentCount
                     ) ?>
                 </a>
             </h2>

From dd0638c5d03ded339c53b1cffd3943da6bdac308 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 12:35:06 +0100
Subject: [PATCH 0519/2920] monitoring: Improve tooltips for services command
 links

refs #8110
---
 .../controllers/ServicesController.php        |  2 +-
 .../views/scripts/services/show.phtml         | 75 ++++++++++++++-----
 2 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index dc7feb2da..48ff64723 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -144,7 +144,7 @@ class Monitoring_ServicesController extends Controller
         $this->view->objectsInDowntime = $objectsInDowntime;
         $this->view->inDowntimeLink = Url::fromPath('monitoring/list/downtimes')
             ->setQueryString(Filter::matchAny($downtimeFilterExpressions)->toQueryString());
-        $this->view->havingCommentsLink = Url::fromRequest()
+        $this->view->commentsLink = Url::fromRequest()
             ->setPath('monitoring/list/comments');
         $this->view->serviceStatesPieChart = $this->createPieChart(
             $serviceStates,
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 522d32ce7..1cc895dd3 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -37,7 +37,7 @@
         </div>
 
         <div>
-            <a href="<?= $listAllLink ?>" title="<?= $this->translate('List all') ?>">
+            <a href="<?= $listAllLink ?>" title="<?= sprintf($this->translate('List all %u services'), $serviceCount) ?>">
                 <?= $this->translate('List all') ?>
             </a>
         </div>
@@ -81,17 +81,43 @@
             ) ?>
         </h3>
         <div>
-            <a href="<?= $downtimeUnhandledLink ?>"
-               title="<?= $this->translate('Schedule downtimes for unhandled problem services') ?>">
+            <a href="<?= $downtimeUnhandledLink ?>" title="<?= sprintf(
+                $this->translatePlural(
+                    'Schedule downtime for %u unhandled service problem',
+                    'Schedule downtimes for %u unhandled service problems',
+                    $unhandledCount
+                ),
+                $unhandledCount
+            ) ?>">
                 <?= $this->icon('plug') ?>
-                <?= $this->translate('Schedule downtimes for unhandled problem services') ?>
+                <?= sprintf(
+                    $this->translatePlural(
+                        'Schedule downtime for unhandled service problem',
+                        'Schedule downtimes for unhandled service problems',
+                        $unhandledCount
+                    ),
+                    $unhandledCount
+                ) ?>
             </a>
         </div>
         <div>
-            <a href="<?= $acknowledgeUnhandledLink ?>"
-               title="<?= $this->translate('Acknowledge unhandled problem services') ?>">
+            <a href="<?= $acknowledgeUnhandledLink ?>" title="<?= sprintf(
+                $this->translatePlural(
+                    'Acknowledge %u unhandled service problem',
+                    'Acknowledge %u unhandled service problems',
+                    $unhandledCount
+                ),
+                $unhandledCount
+            ) ?>">
                 <?= $this->icon('ok') ?>
-                <?= $this->translate('Acknowledge unhandled problem services') ?>
+                <?= sprintf(
+                    $this->translatePlural(
+                        'Acknowledge unhandled service problem',
+                        'Acknowledge unhandled service problems',
+                        $unhandledCount
+                    ),
+                    $unhandledCount
+                ) ?>
             </a>
         </div>
         <?php endif ?>
@@ -116,13 +142,18 @@
         <?php if (! empty($objectsInDowntime)): ?>
             <h2>
                 <?php $inDowntimeCount = count($objectsInDowntime) ?>
-                <a href="<?= $inDowntimeLink ?>"
-                   title="<?= $this->translate('Services in downtime') ?>">
+                <a href="<?= $inDowntimeLink ?>" title="<?= sprintf(
+                    $this->translatePlural(
+                        'List %u service currently in downtime',
+                        'List %u services currently in downtime',
+                        $inDowntimeCount
+                    ),
+                $inDowntimeCount) ?>">
                     <?= $this->icon('plug') ?>
                     <?= sprintf(
                         $this->translatePlural(
-                            '%u service is in downtime',
-                            '%u services are in downtime',
+                            'List %u service currently in downtime',
+                            'List %u services currently in downtime',
                             $inDowntimeCount
                         ),
                         $inDowntimeCount
@@ -131,19 +162,25 @@
             </h2>
         <?php endif ?>
 
-        <?php $havingCommentsCount = count($objects->getComments()) ?>
-        <?php if ($havingCommentsCount): ?>
+        <?php $commentCount = count($objects->getComments()) ?>
+        <?php if ($commentCount): ?>
             <h2>
-                <a href="<?= $havingCommentsLink ?>"
-                   title="<?= $this->translate('Comments') ?>">
+                <a href="<?= $commentsLink ?>" title="<?= sprintf(
+                    $this->translatePlural(
+                        'List %u service comment',
+                        'List %u service comments',
+                        $commentCount
+                    ),
+                    $commentCount
+                ) ?>">
                     <?= $this->icon('comment') ?>
                     <?= sprintf(
                         $this->translatePlural(
-                            '%u comment',
-                            '%u comments',
-                            $havingCommentsCount
+                            'List %u service comment',
+                            'List %u service comments',
+                            $commentCount
                         ),
-                        $havingCommentsCount
+                        $commentCount
                     ) ?>
                 </a>
             </h2>

From 08fd000496e3d030d57a2254be761dd84044ba55 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 12:42:02 +0100
Subject: [PATCH 0520/2920] Remove any topbar related stuff

It's not used anywhere.
---
 application/controllers/LayoutController.php  | 20 ---------
 .../layouts/scripts/parts/topbar.phtml        | 42 -------------------
 library/Icinga/Web/Hook/TopBarHook.php        | 23 ----------
 3 files changed, 85 deletions(-)
 delete mode 100644 application/layouts/scripts/parts/topbar.phtml
 delete mode 100644 library/Icinga/Web/Hook/TopBarHook.php

diff --git a/application/controllers/LayoutController.php b/application/controllers/LayoutController.php
index b2a260884..2d84faf3c 100644
--- a/application/controllers/LayoutController.php
+++ b/application/controllers/LayoutController.php
@@ -25,24 +25,4 @@ class LayoutController extends ActionController
         $menu = new MenuRenderer(Menu::load(), $url->getRelativeUrl());
         $this->view->menuRenderer = $menu->useCustomRenderer();
     }
-
-    /**
-     * Render the top bar
-     */
-    public function topbarAction()
-    {
-        $topbarHtmlParts = array();
-
-        /** @var Hook\TopBarHook $hook */
-        $hook = null;
-
-        foreach (Hook::all('TopBar') as $hook) {
-            $topbarHtmlParts[] = $hook->getHtml($this->getRequest());
-        }
-
-        $this->view->topbarHtmlParts = $topbarHtmlParts;
-
-
-        $this->renderScript('parts/topbar.phtml');
-    }
 }
diff --git a/application/layouts/scripts/parts/topbar.phtml b/application/layouts/scripts/parts/topbar.phtml
deleted file mode 100644
index 68f919951..000000000
--- a/application/layouts/scripts/parts/topbar.phtml
+++ /dev/null
@@ -1,42 +0,0 @@
-<nav class="navbar-fixed-top" id="icingatopbar" role="navigation">
-    <div class="navbar-header">
-        <a href="<?= $this->baseUrl('/') ?>" class="navbar-brand icinga-logo">Icinga</a>
-    </div>
-
-    <?php if (count($this->topbarHtmlParts)): ?>
-        <ul class="nav navbar-nav">
-        <?php foreach ($this->topbarHtmlParts as $part): ?>
-            <li><?= $part; ?></li>
-        <?php endforeach; ?>
-        </ul>
-    <?php endif; ?>
-
-  <?php if ($this->auth()->isAuthenticated()): ?>
-  <ul class="nav navbar-nav pull-right" >
-<!--        Remove component as of #4583 since it's not working-->
-<!--        <li>-->
-<!--          <form class="navbar-search" style="padding-top:0.2em">-->
-<!--            <input type="text" class="search-query" placeholder="Search" style="padding-top:0.3em">-->
-<!--          </form>-->
-<!--        </li>-->
-    <li class="dropdown">
-      <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="icinga_app_nav_useraction">
-        <span id="icinga_app_nav_username">
-          <?= $this->escape($this->auth()->getUser()->getUsername()); ?>
-        </span>
-        <i class="icinga-icon-user"></i>
-        <b class="caret"></b>
-      </a>
-      <ul class="dropdown-menu">
-        <li id="icinga_app_nav_preferences">
-          <a href="<?= $this->href('/preference'); ?>"><?= $this->translate('Preferences'); ?> </a>
-        </li>
-        <li id="icinga_app_nav_logout">
-          <a href="<?= $this->href('/authentication/logout'); ?>" title="<?= $this->translate('Logout from Icinga Web 2') ?>"><?= $this->translate('Logout'); ?></a>
-        </li>
-      </ul>
-    </li>
-  </ul>
-  <?php endif ?>
-
-</nav>
diff --git a/library/Icinga/Web/Hook/TopBarHook.php b/library/Icinga/Web/Hook/TopBarHook.php
deleted file mode 100644
index 183a0ca07..000000000
--- a/library/Icinga/Web/Hook/TopBarHook.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Web\Hook;
-
-use Icinga\Web\Request;
-use Zend_View;
-
-/**
- * Hook to extend topbar items
- */
-abstract class TopBarHook extends WebBaseHook
-{
-    /**
-     * Function to generate top bar content
-     *
-     * @param   Request     $request
-     *
-     * @return  string
-     */
-    abstract public function getHtml($request);
-}

From d1dd907582b1c59bbdd331ac722b11ad8fcc7e3f Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar@beutner.name>
Date: Tue, 3 Feb 2015 15:05:36 +0100
Subject: [PATCH 0521/2920] Add .mailmap and AUTHORS files

---
 .mailmap | 12 ++++++++++++
 AUTHORS  | 22 ++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 .mailmap
 create mode 100644 AUTHORS

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..0ce0c9686
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,12 @@
+<alexander.klimov@netways.de> <Alexander.Klimov@netways.de>
+<carloscesario@gmail.com> <ccesario@tecnomega.com.br>
+<christopher.ruell@netways.de> <Christopher.Ruell@netways.de>
+<gunnar.beutner@netways.de> <gunnar@beutner.name>
+Jannis Moßhammer <jannis.mosshammer@netways.de>
+<matthias.jentsch@netways.de> <mjentsch@localhost.int.netways.de>
+<michael.friedrich@netways.de> <Michael.Friedrich@netways.de>
+<michael.friedrich@netways.de> <michael.friedrich@gmail.com>
+<thomas.gelf@netways.de> <thomas@gelf.net>
+Thomas Gelf <thomas.gelf@netways.de> <root@squeeze-devel1.osmc.lab>
+Thomas Gelf <thomas.gelf@netways.de> <tgelf@tgelf-web2dep.(none)>
+Sylph Lin <sylph.lin@gmail.com>
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 000000000..c225db6f6
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,22 @@
+Alexander Fuhr <alexander.fuhr@netways.de>
+Alexander Klimov <alexander.klimov@netways.de>
+Bernd Erk <bernd.erk@icinga.org>
+Boden Garman <boden.garman@spintel.net.au>
+Carlos Cesario <carloscesario@gmail.com>
+Chris Rüll <christopher.ruell@netways.de>
+Eric Lippmann <eric.lippmann@netways.de>
+Goran Rakic <grakic@devbase.net>
+Gunnar Beutner <gunnar.beutner@netways.de>
+Jannis Moßhammer <jannis.mosshammer@netways.de>
+Johannes Meyer <johannes.meyer@netways.de>
+Marius Hein <marius.hein@netways.de>
+Markus Frosch <markus@lazyfrosch.de>
+Matthias Jentsch <matthias.jentsch@netways.de>
+Michael Friedrich <michael.friedrich@netways.de>
+Rene Moser <rene.moser@swisstxt.ch>
+Susanne Vestner-Ludwig <susanne.vestner-ludwig@inserteffect.com>
+Sylph Lin <sylph.lin@gmail.com>
+Thomas Gelf <thomas.gelf@netways.de>
+Tom Ford <exptom@users.noreply.github.com>
+Ulf Lange <mopp@gmx.net>
+ayoubabid <ayoubabid@users.noreply.github.com>

From a23752de63fede23710ae602983e385c48733e23 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 15:10:18 +0100
Subject: [PATCH 0522/2920] security: Don't list permissions and restrictions
 in the roles overview

fixes #8335
---
 application/views/scripts/roles/index.phtml | 48 ++++++++++-----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml
index 758376c53..c08a0b6a4 100644
--- a/application/views/scripts/roles/index.phtml
+++ b/application/views/scripts/roles/index.phtml
@@ -11,8 +11,8 @@
                 <thead>
                 <tr>
                     <th><?= $this->translate('Name') ?></th>
-                    <th><?= $this->translate('Permissions') ?></th>
-                    <th><?= $this->translate('Restrictions') ?></th>
+<!--                    <th>--><?//= $this->translate('Permissions') ?><!--</th>-->
+<!--                    <th>--><?//= $this->translate('Restrictions') ?><!--</th>-->
                     <th><?= $this->translate('Users') ?></th>
                     <th><?= $this->translate('Groups') ?></th>
                 </tr>
@@ -26,28 +26,28 @@
                                 <a href="<?= $this->url('roles/update', array('role' => $name)) ?>"></a>
                             </div>
                         </td>
-                        <td><?= $this->escape($role->permissions, 0, 50) ?></td>
-                        <td>
-                            <?php
-                            // TODO(el): $role->without(...) or $role->shift(...) would be nice!
-                            $restrictions = clone $role;
-                            unset($restrictions['users']);
-                            unset($restrictions['groups']);
-                            unset($restrictions['permissions']);
-                            ?>
-                            <?php if (! empty($restrictions)): ?>
-                            <table>
-                                <tbody>
-                                <?php foreach ($restrictions as $restrictionName => $restriction): ?>
-                                    <tr>
-                                        <th><?= $this->escape($restrictionName) ?></th>
-                                        <td><?= $this->escape($restriction) ?></td>
-                                    </tr>
-                                <?php endforeach ?>
-                                </tbody>
-                            </table>
-                            <?php endif ?>
-                        </td>
+<!--                        <td>--><?//= $this->escape($role->permissions, 0, 50) ?><!--</td>-->
+<!--                        <td>-->
+<!--                            --><?php
+//                            // TODO(el): $role->without(...) or $role->shift(...) would be nice!
+//                            $restrictions = clone $role;
+//                            unset($restrictions['users']);
+//                            unset($restrictions['groups']);
+//                            unset($restrictions['permissions']);
+//                            ?>
+<!--                            --><?php //if (! empty($restrictions)): ?>
+<!--                            <table>-->
+<!--                                <tbody>-->
+<!--                                --><?php //foreach ($restrictions as $restrictionName => $restriction): ?>
+<!--                                    <tr>-->
+<!--                                        <th>--><?//= $this->escape($restrictionName) ?><!--</th>-->
+<!--                                        <td>--><?//= $this->escape($restriction) ?><!--</td>-->
+<!--                                    </tr>-->
+<!--                                --><?php //endforeach ?>
+<!--                                </tbody>-->
+<!--                            </table>-->
+<!--                            --><?php //endif ?>
+<!--                        </td>-->
                         <td><?= $this->escape($role->users) ?></td>
                         <td><?= $this->escape($role->groups) ?></td>
                         <td>

From d9966995d825032698e22fb88b32343d3b5dd3b2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 15:14:03 +0100
Subject: [PATCH 0523/2920] git: Exclude Vagrant and Puppet related files when
 generating an archive

---
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 40b06093e..a05c2f5cd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,8 @@
 # Exclude files related to git when generating an archive
 .git* export-ignore
+# Exclude Vagrant and Puppet related files when generating an archive
+.puppet* export-ignore
+Vagrantfile export-ignore
 
 # Normalize puppet manifests' line endings to LF on checkin and prevent conversion to CRLF when the files are checked out
 .puppet* eol=lf

From 338d067aba41dd6e9178cebec5433eecd614196e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 15:49:34 +0100
Subject: [PATCH 0524/2920] Add license header

fixes #7788
---
 Vagrantfile                                   |  2 ++
 .../clicommands/AutocompleteCommand.php       |  3 +--
 application/clicommands/HelpCommand.php       |  3 +--
 application/clicommands/ModuleCommand.php     |  3 +--
 application/clicommands/WebCommand.php        |  3 +--
 .../controllers/AuthenticationController.php  |  3 +--
 application/controllers/ConfigController.php  |  1 +
 .../controllers/DashboardController.php       |  3 +--
 application/controllers/ErrorController.php   |  1 +
 application/controllers/FilterController.php  |  3 +--
 application/controllers/IndexController.php   |  3 +--
 application/controllers/LayoutController.php  |  3 +--
 application/controllers/ListController.php    |  3 +--
 .../controllers/PreferenceController.php      |  3 +--
 application/controllers/RolesController.php   |  1 +
 application/controllers/SearchController.php  |  3 +--
 application/controllers/StaticController.php  |  3 +--
 .../forms/Authentication/LoginForm.php        |  3 +--
 .../Config/Authentication/DbBackendForm.php   |  3 +--
 .../Authentication/ExternalBackendForm.php    |  3 +--
 .../Config/Authentication/LdapBackendForm.php |  3 +--
 .../AuthenticationBackendConfigForm.php       |  3 +--
 .../AuthenticationBackendReorderForm.php      |  3 +--
 .../Config/General/ApplicationConfigForm.php  |  3 +--
 .../Config/General/LoggingConfigForm.php      |  3 +--
 .../forms/Config/GeneralConfigForm.php        |  3 +--
 .../forms/Config/Resource/DbResourceForm.php  |  3 +--
 .../Config/Resource/FileResourceForm.php      |  3 +--
 .../Config/Resource/LdapResourceForm.php      |  3 +--
 .../Resource/LivestatusResourceForm.php       |  3 +--
 .../forms/Config/ResourceConfigForm.php       |  3 +--
 application/forms/ConfigForm.php              |  3 +--
 application/forms/ConfirmRemovalForm.php      |  3 +--
 application/forms/Dashboard/DashletForm.php   |  3 +--
 application/forms/LdapDiscoveryForm.php       |  3 +--
 application/forms/PreferenceForm.php          |  3 +--
 application/forms/Security/RoleForm.php       |  3 +--
 application/views/helpers/DateFormat.php      |  3 +--
 application/views/helpers/FormDateTime.php    |  3 +--
 application/views/helpers/FormNumber.php      |  3 +--
 .../views/helpers/FormTriStateCheckbox.php    |  3 +--
 application/views/helpers/Util.php            |  3 +--
 bin/icingacli                                 |  3 +--
 bin/license_writer.py                         |  3 +--
 etc/bash_completion.d/icingacli               |  3 ---
 etc/schema/mysql.schema.sql                   |  2 ++
 etc/schema/pgsql.schema.sql                   | 19 +++------------
 icingaweb2.spec                               |  2 ++
 .../Application/ApplicationBootstrap.php      |  3 +--
 library/Icinga/Application/Benchmark.php      |  3 +--
 library/Icinga/Application/Cli.php            |  3 +--
 library/Icinga/Application/Config.php         |  3 +--
 library/Icinga/Application/EmbeddedWeb.php    |  3 +--
 library/Icinga/Application/Icinga.php         |  3 +--
 library/Icinga/Application/LegacyWeb.php      |  3 +--
 library/Icinga/Application/Loader.php         |  3 +--
 library/Icinga/Application/Logger.php         |  3 +--
 .../Icinga/Application/Logger/LogWriter.php   |  3 +--
 .../Application/Logger/Writer/FileWriter.php  |  3 +--
 .../Logger/Writer/StdoutWriter.php            |  2 +-
 .../Logger/Writer/SyslogWriter.php            |  3 +--
 .../Icinga/Application/Modules/Manager.php    |  3 +--
 library/Icinga/Application/Modules/Module.php |  3 +--
 library/Icinga/Application/Platform.php       |  3 +--
 library/Icinga/Application/Web.php            |  3 +--
 library/Icinga/Application/functions.php      |  3 +--
 library/Icinga/Application/webrouter.php      |  3 +--
 .../Icinga/Authentication/AdmissionLoader.php |  3 +--
 library/Icinga/Authentication/AuthChain.php   |  3 +--
 .../Authentication/Backend/DbUserBackend.php  |  3 +--
 .../Backend/DbUserGroupBackend.php            |  3 +--
 .../Backend/ExternalBackend.php               |  3 +--
 .../Backend/IniUserGroupBackend.php           |  3 +--
 .../Backend/LdapUserBackend.php               |  3 +--
 library/Icinga/Authentication/Manager.php     |  3 +--
 library/Icinga/Authentication/UserBackend.php |  3 +--
 .../Authentication/UserGroupBackend.php       |  3 +--
 library/Icinga/Chart/Axis.php                 |  3 +--
 library/Icinga/Chart/Chart.php                |  3 +--
 library/Icinga/Chart/Format.php               |  3 +--
 library/Icinga/Chart/Graph/BarGraph.php       |  3 +--
 library/Icinga/Chart/Graph/LineGraph.php      |  3 +--
 library/Icinga/Chart/Graph/StackedGraph.php   |  3 +--
 library/Icinga/Chart/Graph/Tooltip.php        |  5 ++--
 library/Icinga/Chart/GridChart.php            |  3 +--
 library/Icinga/Chart/Inline/Inline.php        |  3 +--
 library/Icinga/Chart/Inline/PieChart.php      |  3 +--
 library/Icinga/Chart/Legend.php               |  3 +--
 library/Icinga/Chart/Palette.php              |  3 +--
 library/Icinga/Chart/PieChart.php             |  3 +--
 library/Icinga/Chart/Primitive/Animatable.php |  3 +--
 library/Icinga/Chart/Primitive/Animation.php  |  3 +--
 library/Icinga/Chart/Primitive/Canvas.php     |  3 +--
 library/Icinga/Chart/Primitive/Circle.php     |  3 +--
 library/Icinga/Chart/Primitive/Drawable.php   |  3 +--
 library/Icinga/Chart/Primitive/Line.php       |  3 +--
 library/Icinga/Chart/Primitive/Path.php       |  3 +--
 library/Icinga/Chart/Primitive/PieSlice.php   |  3 +--
 library/Icinga/Chart/Primitive/RawElement.php |  3 +--
 library/Icinga/Chart/Primitive/Rect.php       |  3 +--
 library/Icinga/Chart/Primitive/Styleable.php  |  3 +--
 library/Icinga/Chart/Primitive/Text.php       |  3 +--
 library/Icinga/Chart/Render/LayoutBox.php     |  3 +--
 library/Icinga/Chart/Render/RenderContext.php |  3 +--
 library/Icinga/Chart/Render/Rotator.php       |  7 ++----
 library/Icinga/Chart/SVGRenderer.php          |  3 +--
 library/Icinga/Chart/Unit/AxisUnit.php        |  3 +--
 library/Icinga/Chart/Unit/CalendarUnit.php    |  3 +--
 library/Icinga/Chart/Unit/LinearUnit.php      |  3 +--
 library/Icinga/Chart/Unit/LogarithmicUnit.php |  3 +--
 library/Icinga/Chart/Unit/StaticAxis.php      |  3 +--
 library/Icinga/Cli/AnsiScreen.php             |  3 +--
 library/Icinga/Cli/Command.php                |  3 +--
 library/Icinga/Cli/Documentation.php          |  3 +--
 .../Cli/Documentation/CommentParser.php       |  3 +--
 library/Icinga/Cli/Loader.php                 |  3 +--
 library/Icinga/Cli/Params.php                 |  3 +--
 library/Icinga/Cli/Screen.php                 |  3 +--
 library/Icinga/Data/Browsable.php             |  3 +--
 library/Icinga/Data/ConfigObject.php          |  3 +--
 library/Icinga/Data/ConnectionInterface.php   |  3 +--
 .../Icinga/Data/DataArray/ArrayDatasource.php |  5 ++--
 library/Icinga/Data/Db/DbConnection.php       |  3 +--
 library/Icinga/Data/Db/DbQuery.php            |  3 +--
 library/Icinga/Data/Fetchable.php             |  3 +--
 library/Icinga/Data/Filter/Filter.php         |  3 +--
 library/Icinga/Data/Filter/FilterAnd.php      |  5 ++--
 library/Icinga/Data/Filter/FilterChain.php    |  7 +++---
 library/Icinga/Data/Filter/FilterEqual.php    |  3 +--
 .../Data/Filter/FilterEqualOrGreaterThan.php  |  3 +--
 .../Data/Filter/FilterEqualOrLessThan.php     |  3 +--
 .../Icinga/Data/Filter/FilterException.php    |  3 +--
 .../Icinga/Data/Filter/FilterExpression.php   |  3 +--
 .../Icinga/Data/Filter/FilterGreaterThan.php  |  3 +--
 library/Icinga/Data/Filter/FilterLessThan.php |  3 +--
 library/Icinga/Data/Filter/FilterMatch.php    |  3 +--
 library/Icinga/Data/Filter/FilterMatchNot.php |  3 +--
 library/Icinga/Data/Filter/FilterNot.php      |  3 +--
 library/Icinga/Data/Filter/FilterNotEqual.php |  3 +--
 library/Icinga/Data/Filter/FilterOr.php       |  3 +--
 .../Data/Filter/FilterParseException.php      |  3 +--
 .../Icinga/Data/Filter/FilterQueryString.php  |  3 +--
 library/Icinga/Data/Filterable.php            |  3 +--
 library/Icinga/Data/Identifiable.php          |  3 +--
 library/Icinga/Data/Limitable.php             |  3 +--
 library/Icinga/Data/PivotTable.php            |  3 +--
 library/Icinga/Data/QueryInterface.php        |  3 +--
 library/Icinga/Data/Queryable.php             |  3 +--
 library/Icinga/Data/ResourceFactory.php       |  3 +--
 library/Icinga/Data/Selectable.php            |  3 +--
 library/Icinga/Data/SimpleQuery.php           |  3 +--
 library/Icinga/Data/Sortable.php              |  3 +--
 library/Icinga/Data/Tree/Node.php             |  3 +--
 library/Icinga/Data/Tree/NodeInterface.php    |  3 +--
 .../Exception/AuthenticationException.php     |  3 +--
 .../Icinga/Exception/ConfigurationError.php   |  3 +--
 library/Icinga/Exception/IcingaException.php  |  3 +--
 .../Exception/InvalidPropertyException.php    |  3 +--
 .../Exception/MissingParameterException.php   |  3 +--
 library/Icinga/Exception/NotFoundError.php    |  3 +--
 .../Icinga/Exception/NotImplementedError.php  |  3 +--
 library/Icinga/Exception/NotReadableError.php |  3 +--
 library/Icinga/Exception/NotWritableError.php |  3 +--
 library/Icinga/Exception/ProgrammingError.php |  3 +--
 library/Icinga/Exception/QueryException.php   |  3 +--
 .../Exception/SystemPermissionException.php   |  3 +--
 library/Icinga/File/Csv.php                   |  3 +--
 .../File/FileExtensionFilterIterator.php      |  3 +--
 library/Icinga/File/Ini/IniEditor.php         |  3 +--
 library/Icinga/File/Ini/IniWriter.php         |  3 +--
 library/Icinga/File/NonEmptyFileIterator.php  |  3 +--
 library/Icinga/File/Pdf.php                   |  3 +--
 library/Icinga/Protocol/Dns.php               |  3 +--
 .../File/Exception/FileReaderException.php    |  2 +-
 library/Icinga/Protocol/File/FileIterator.php |  3 +--
 library/Icinga/Protocol/File/FileQuery.php    |  3 +--
 library/Icinga/Protocol/File/FileReader.php   |  3 +--
 library/Icinga/Protocol/Ldap/Connection.php   |  3 +--
 library/Icinga/Protocol/Ldap/Discovery.php    |  5 ++--
 library/Icinga/Protocol/Ldap/Exception.php    |  3 +--
 library/Icinga/Protocol/Ldap/LdapUtils.php    |  3 +--
 library/Icinga/Protocol/Ldap/Node.php         |  3 +--
 library/Icinga/Protocol/Ldap/Query.php        |  3 +--
 library/Icinga/Protocol/Ldap/Root.php         |  3 +--
 .../Icinga/Protocol/Livestatus/Connection.php |  5 ++--
 library/Icinga/Protocol/Livestatus/Query.php  |  9 ++++----
 .../Protocol/Livestatus/ResponseRow.php       |  1 +
 library/Icinga/Protocol/Nrpe/Connection.php   |  3 +--
 library/Icinga/Protocol/Nrpe/Packet.php       |  3 +--
 library/Icinga/Security/SecurityException.php |  1 +
 library/Icinga/Test/BaseTestCase.php          |  3 +--
 library/Icinga/Test/DbTest.php                |  3 +--
 library/Icinga/User.php                       |  3 +--
 library/Icinga/User/Preferences.php           |  3 +--
 .../User/Preferences/PreferencesStore.php     |  3 +--
 .../Icinga/User/Preferences/Store/DbStore.php |  3 +--
 .../User/Preferences/Store/IniStore.php       |  3 +--
 library/Icinga/Util/Color.php                 |  3 +--
 library/Icinga/Util/ConfigAwareFactory.php    |  3 +--
 library/Icinga/Util/DateTimeFactory.php       |  3 +--
 library/Icinga/Util/Dimension.php             |  3 +--
 .../Icinga/Util/EnumeratingFilterIterator.php |  3 +--
 library/Icinga/Util/File.php                  |  3 +--
 library/Icinga/Util/Format.php                |  3 +--
 library/Icinga/Util/String.php                |  3 +--
 library/Icinga/Util/TimezoneDetect.php        |  3 +--
 library/Icinga/Util/Translator.php            |  3 +--
 library/Icinga/Web/Controller.php             |  1 +
 .../Web/Controller/ActionController.php       |  1 +
 .../Controller/BasePreferenceController.php   |  3 +--
 .../Web/Controller/ControllerTabCollector.php |  3 +--
 .../Web/Controller/ModuleActionController.php |  3 +--
 library/Icinga/Web/FileCache.php              |  2 +-
 library/Icinga/Web/Form.php                   |  1 +
 .../Web/Form/Decorator/ConditionalHidden.php  |  3 +--
 .../Web/Form/Decorator/ElementDoubler.php     |  3 +--
 .../Web/Form/Decorator/NoScriptApply.php      |  3 +--
 library/Icinga/Web/Form/Element/Button.php    |  3 +--
 .../Web/Form/Element/CsrfCounterMeasure.php   |  3 +--
 .../Web/Form/Element/DateTimePicker.php       |  3 +--
 library/Icinga/Web/Form/Element/Note.php      |  3 +--
 library/Icinga/Web/Form/Element/Number.php    |  3 +--
 .../Web/Form/Element/TriStateCheckbox.php     |  3 +--
 library/Icinga/Web/Form/FormElement.php       |  3 +--
 .../Web/Form/InvalidCSRFTokenException.php    |  3 +--
 .../Form/Validator/DateFormatValidator.php    |  3 +--
 .../Web/Form/Validator/DateTimeValidator.php  |  3 +--
 .../Form/Validator/ReadablePathValidator.php  |  3 +--
 .../Form/Validator/TimeFormatValidator.php    |  3 +--
 .../Web/Form/Validator/TriStateValidator.php  |  3 +--
 .../Form/Validator/WritablePathValidator.php  |  3 +--
 library/Icinga/Web/Hook.php                   |  3 +--
 library/Icinga/Web/Hook/GrapherHook.php       |  3 +--
 library/Icinga/Web/Hook/TicketHook.php        |  3 +--
 library/Icinga/Web/Hook/WebBaseHook.php       |  5 ++--
 library/Icinga/Web/JavaScript.php             |  3 +--
 library/Icinga/Web/LessCompiler.php           |  3 +--
 library/Icinga/Web/Menu.php                   |  3 +--
 .../Web/Menu/ForeignMenuItemRenderer.php      |  3 +--
 library/Icinga/Web/Menu/MenuItemRenderer.php  |  3 +--
 .../Web/Menu/MonitoringMenuItemRenderer.php   |  3 +--
 .../Web/Menu/ProblemMenuItemRenderer.php      |  1 +
 .../Menu/UnhandledHostMenuItemRenderer.php    |  1 +
 .../Menu/UnhandledServiceMenuItemRenderer.php |  1 +
 library/Icinga/Web/MenuRenderer.php           |  3 +--
 library/Icinga/Web/Notification.php           |  3 +--
 .../Web/Paginator/Adapter/QueryAdapter.php    |  3 +--
 .../ScrollingStyle/SlidingWithBorder.php      |  5 ++--
 library/Icinga/Web/Request.php                |  3 +--
 library/Icinga/Web/Response.php               |  3 +--
 library/Icinga/Web/Session.php                |  3 +--
 library/Icinga/Web/Session/PhpSession.php     |  3 +--
 library/Icinga/Web/Session/Session.php        |  3 +--
 .../Icinga/Web/Session/SessionNamespace.php   |  3 +--
 library/Icinga/Web/StyleSheet.php             |  3 +--
 library/Icinga/Web/Url.php                    |  3 +--
 library/Icinga/Web/UrlParams.php              |  5 ++--
 library/Icinga/Web/View.php                   |  3 +--
 library/Icinga/Web/View/DateTimeRenderer.php  |  3 +--
 library/Icinga/Web/View/helpers/format.php    |  3 +--
 library/Icinga/Web/View/helpers/generic.php   |  3 +--
 library/Icinga/Web/View/helpers/url.php       |  5 ++--
 library/Icinga/Web/ViewStream.php             |  3 +--
 library/Icinga/Web/Widget.php                 |  3 +--
 library/Icinga/Web/Widget/AbstractWidget.php  |  3 +--
 .../Web/Widget/Chart/HistoryColorGrid.php     |  3 +--
 library/Icinga/Web/Widget/Chart/InlinePie.php |  3 +--
 library/Icinga/Web/Widget/Dashboard.php       |  3 +--
 .../Icinga/Web/Widget/Dashboard/Dashlet.php   |  3 +--
 library/Icinga/Web/Widget/Dashboard/Pane.php  |  3 +--
 .../Web/Widget/Dashboard/UserWidget.php       |  3 +--
 library/Icinga/Web/Widget/FilterEditor.php    |  9 ++++----
 library/Icinga/Web/Widget/FilterWidget.php    |  5 ++--
 library/Icinga/Web/Widget/Limiter.php         |  3 +--
 library/Icinga/Web/Widget/SearchDashboard.php |  3 +--
 library/Icinga/Web/Widget/SortBox.php         |  3 +--
 library/Icinga/Web/Widget/Tab.php             |  3 +--
 .../Web/Widget/Tabextension/BasketAction.php  |  3 +--
 .../Widget/Tabextension/DashboardAction.php   |  3 +--
 .../Widget/Tabextension/DashboardSettings.php |  5 ++--
 .../Web/Widget/Tabextension/OutputFormat.php  |  3 +--
 .../Web/Widget/Tabextension/Tabextension.php  |  3 +--
 library/Icinga/Web/Widget/Tabs.php            |  3 +--
 library/Icinga/Web/Widget/Widget.php          |  3 +--
 library/Icinga/Web/Window.php                 |  3 +--
 library/Icinga/Web/Wizard.php                 |  3 +--
 .../controllers/IcingawebController.php       |  3 +--
 .../controllers/IndexController.php           |  3 +--
 .../controllers/ModuleController.php          |  3 +--
 .../controllers/StyleController.php           |  1 +
 modules/doc/configuration.php                 |  3 +--
 modules/doc/library/Doc/DocController.php     |  3 +--
 modules/doc/library/Doc/DocIterator.php       |  3 +--
 modules/doc/library/Doc/DocParser.php         |  3 +--
 modules/doc/library/Doc/DocTree.php           |  3 +--
 .../Exception/ChapterNotFoundException.php    |  3 +--
 .../Doc/Exception/DocEmptyException.php       |  3 +--
 .../library/Doc/Exception/DocException.php    |  3 +--
 modules/doc/library/Doc/Renderer.php          |  3 +--
 modules/doc/library/Doc/Section.php           |  3 +--
 .../doc/library/Doc/SectionFilterIterator.php |  3 +--
 modules/doc/library/Doc/SectionRenderer.php   |  3 +--
 modules/doc/library/Doc/TocRenderer.php       |  3 +--
 modules/doc/public/css/module.less            |  2 ++
 modules/doc/run.php                           |  1 +
 .../clicommands/ConferenceCommand.php         |  3 +--
 .../application/clicommands/ListCommand.php   |  3 +--
 .../application/clicommands/NrpeCommand.php   |  3 +--
 .../controllers/AlertsummaryController.php    |  3 +--
 .../controllers/ChartController.php           |  3 +--
 .../controllers/ConfigController.php          |  3 +--
 .../controllers/HostController.php            |  3 +--
 .../controllers/HostsController.php           |  3 +--
 .../controllers/ListController.php            |  1 +
 .../controllers/ProcessController.php         |  3 +--
 .../controllers/ServiceController.php         |  3 +--
 .../controllers/ServicesController.php        |  3 +--
 .../controllers/ShowController.php            |  3 +--
 .../controllers/TacticalController.php        |  3 +--
 .../controllers/TimelineController.php        |  3 +--
 .../application/forms/Command/CommandForm.php |  3 +--
 .../DisableNotificationsExpireCommandForm.php |  3 +--
 .../ToggleInstanceFeaturesCommandForm.php     |  3 +--
 .../Object/AcknowledgeProblemCommandForm.php  |  3 +--
 .../Command/Object/AddCommentCommandForm.php  |  3 +--
 .../Command/Object/CheckNowCommandForm.php    |  3 +--
 .../Object/DeleteCommentCommandForm.php       |  3 +--
 .../Object/DeleteDowntimeCommandForm.php      |  3 +--
 .../Command/Object/ObjectsCommandForm.php     |  3 +--
 .../Object/ProcessCheckResultCommandForm.php  |  3 +--
 .../RemoveAcknowledgementCommandForm.php      |  3 +--
 .../Object/ScheduleHostCheckCommandForm.php   |  3 +--
 .../ScheduleHostDowntimeCommandForm.php       |  3 +--
 .../ScheduleServiceCheckCommandForm.php       |  3 +--
 .../ScheduleServiceDowntimeCommandForm.php    |  3 +--
 .../ToggleObjectFeaturesCommandForm.php       |  3 +--
 .../forms/Config/BackendConfigForm.php        |  3 +--
 .../Config/Instance/LocalInstanceForm.php     |  3 +--
 .../Config/Instance/RemoteInstanceForm.php    |  3 +--
 .../forms/Config/InstanceConfigForm.php       |  3 +--
 .../forms/Config/SecurityConfigForm.php       |  3 +--
 .../application/forms/EventOverviewForm.php   |  3 +--
 .../application/forms/Setup/BackendPage.php   |  3 +--
 .../forms/Setup/IdoResourcePage.php           |  3 +--
 .../application/forms/Setup/InstancePage.php  |  3 +--
 .../forms/Setup/LivestatusResourcePage.php    |  3 +--
 .../application/forms/Setup/SecurityPage.php  |  3 +--
 .../application/forms/Setup/WelcomePage.php   |  3 +--
 .../application/forms/StatehistoryForm.php    |  3 +--
 .../views/helpers/CheckPerformance.php        |  3 +--
 .../views/helpers/ContactFlags.php            |  3 +--
 .../application/views/helpers/Customvar.php   |  1 +
 .../application/views/helpers/Link.php        |  1 +
 .../views/helpers/MonitoringFlags.php         |  3 +--
 .../application/views/helpers/Perfdata.php    |  3 +--
 .../views/helpers/PluginOutput.php            |  3 +--
 .../views/helpers/ResolveMacros.php           |  3 +--
 .../views/helpers/RuntimeVariables.php        |  3 +--
 .../views/helpers/SelectionToolbar.php        |  3 +--
 modules/monitoring/configuration.php          |  1 +
 .../monitoring/library/Monitoring/Backend.php |  1 +
 .../Monitoring/Backend/Ido/IdoBackend.php     |  1 +
 .../Backend/Ido/Query/AllcontactsQuery.php    |  3 +--
 .../Backend/Ido/Query/CommandQuery.php        |  5 ++--
 .../Backend/Ido/Query/CommentQuery.php        |  3 +--
 .../Ido/Query/CommentdeletionhistoryQuery.php |  3 +--
 .../Backend/Ido/Query/CommenthistoryQuery.php |  3 +--
 .../Backend/Ido/Query/ContactQuery.php        |  3 +--
 .../Backend/Ido/Query/ContactgroupQuery.php   |  3 +--
 .../Backend/Ido/Query/CustomvarQuery.php      |  3 +--
 .../Backend/Ido/Query/DowntimeQuery.php       |  1 +
 .../Ido/Query/DowntimeendhistoryQuery.php     |  3 +--
 .../Ido/Query/DowntimestarthistoryQuery.php   |  3 +--
 .../Backend/Ido/Query/EventHistoryQuery.php   |  1 +
 .../Backend/Ido/Query/EventgridQuery.php      |  3 +--
 .../Backend/Ido/Query/GroupsummaryQuery.php   |  3 +--
 .../Backend/Ido/Query/HostgroupQuery.php      |  3 +--
 .../Backend/Ido/Query/HoststatusQuery.php     |  3 +--
 .../Monitoring/Backend/Ido/Query/IdoQuery.php |  3 +--
 .../Backend/Ido/Query/NotificationQuery.php   |  1 +
 .../Ido/Query/NotificationhistoryQuery.php    |  3 +--
 .../Backend/Ido/Query/ProgramstatusQuery.php  |  3 +--
 .../Backend/Ido/Query/RuntimesummaryQuery.php |  3 +--
 .../Ido/Query/RuntimevariablesQuery.php       |  3 +--
 .../Backend/Ido/Query/ServicegroupQuery.php   |  3 +--
 .../Backend/Ido/Query/StatehistoryQuery.php   |  1 +
 .../Backend/Ido/Query/StatusQuery.php         |  3 +--
 .../Backend/Ido/Query/StatusSummaryQuery.php  |  3 +--
 .../Backend/Livestatus/LivestatusBackend.php  |  1 +
 .../Livestatus/Query/DowntimeQuery.php        |  3 +--
 .../Livestatus/Query/HostgroupQuery.php       |  3 +--
 .../Livestatus/Query/ServicegroupQuery.php    |  3 +--
 .../Backend/Livestatus/Query/StatusQuery.php  |  3 +--
 .../Livestatus/Query/StatusSummaryQuery.php   |  7 +++---
 .../Monitoring/Backend/MonitoringBackend.php  |  1 +
 .../library/Monitoring/BackendStep.php        |  3 +--
 .../library/Monitoring/Cli/CliUtils.php       |  3 +--
 .../Command/Exception/TransportException.php  |  3 +--
 .../Monitoring/Command/IcingaCommand.php      |  3 +--
 .../DisableNotificationsExpireCommand.php     |  3 +--
 .../Instance/ToggleInstanceFeatureCommand.php |  3 +--
 .../Object/AcknowledgeProblemCommand.php      |  3 +--
 .../Command/Object/AddCommentCommand.php      |  3 +--
 .../Command/Object/DeleteCommentCommand.php   |  3 +--
 .../Command/Object/DeleteDowntimeCommand.php  |  3 +--
 .../Command/Object/ObjectCommand.php          |  3 +--
 .../Object/ProcessCheckResultCommand.php      |  3 +--
 .../Object/PropagateHostDowntimeCommand.php   |  3 +--
 .../Object/RemoveAcknowledgementCommand.php   |  3 +--
 .../Object/ScheduleHostCheckCommand.php       |  3 +--
 .../Object/ScheduleHostDowntimeCommand.php    |  3 +--
 .../Object/ScheduleServiceCheckCommand.php    |  3 +--
 .../Object/ScheduleServiceDowntimeCommand.php |  3 +--
 .../Object/ToggleObjectFeatureCommand.php     |  3 +--
 .../Command/Object/WithCommentCommand.php     |  3 +--
 .../IcingaCommandFileCommandRenderer.php      |  1 +
 .../IcingaCommandRendererInterface.php        |  1 +
 .../Command/Transport/CommandTransport.php    |  3 +--
 .../Transport/CommandTransportInterface.php   |  3 +--
 .../Command/Transport/LocalCommandFile.php    |  3 +--
 .../Command/Transport/RemoteCommandFile.php   |  3 +--
 .../library/Monitoring/Controller.php         |  3 +--
 .../library/Monitoring/DataView/Command.php   |  5 ++--
 .../library/Monitoring/DataView/Comment.php   |  3 +--
 .../library/Monitoring/DataView/Contact.php   |  3 +--
 .../Monitoring/DataView/Contactgroup.php      |  3 +--
 .../library/Monitoring/DataView/Customvar.php |  3 +--
 .../library/Monitoring/DataView/DataView.php  |  3 +--
 .../library/Monitoring/DataView/Downtime.php  |  3 +--
 .../Monitoring/DataView/EventHistory.php      |  1 +
 .../library/Monitoring/DataView/Eventgrid.php |  3 +--
 .../Monitoring/DataView/Groupsummary.php      |  3 +--
 .../Monitoring/DataView/HostStatus.php        |  3 +--
 .../library/Monitoring/DataView/Hostgroup.php |  3 +--
 .../Monitoring/DataView/Notification.php      |  3 +--
 .../Monitoring/DataView/Programstatus.php     |  3 +--
 .../Monitoring/DataView/Runtimesummary.php    |  3 +--
 .../Monitoring/DataView/Runtimevariables.php  |  3 +--
 .../Monitoring/DataView/ServiceStatus.php     |  3 +--
 .../Monitoring/DataView/Servicegroup.php      |  3 +--
 .../Monitoring/DataView/StatusSummary.php     |  3 +--
 .../library/Monitoring/Environment.php        |  3 +--
 .../Exception/UnsupportedBackendException.php |  3 +--
 .../library/Monitoring/InstanceStep.php       |  3 +--
 .../library/Monitoring/MonitoringWizard.php   |  3 +--
 .../library/Monitoring/Object/Host.php        |  3 +--
 .../library/Monitoring/Object/HostList.php    |  1 +
 .../Monitoring/Object/MonitoredObject.php     |  3 +--
 .../library/Monitoring/Object/ObjectList.php  |  1 +
 .../library/Monitoring/Object/Service.php     |  3 +--
 .../library/Monitoring/Object/ServiceList.php |  1 +
 .../monitoring/library/Monitoring/Plugin.php  |  3 +--
 .../library/Monitoring/Plugin/Perfdata.php    |  3 +--
 .../library/Monitoring/Plugin/PerfdataSet.php |  3 +--
 .../library/Monitoring/SecurityStep.php       |  5 ++--
 .../library/Monitoring/Timeline/TimeEntry.php |  3 +--
 .../library/Monitoring/Timeline/TimeLine.php  |  3 +--
 .../library/Monitoring/Timeline/TimeRange.php |  3 +--
 .../Controller/MonitoredObjectController.php  |  1 +
 .../Monitoring/Web/Hook/HostActionsHook.php   |  1 +
 .../Web/Hook/TimelineProviderHook.php         |  3 +--
 .../Monitoring/Web/Widget/SelectBox.php       |  5 ++--
 modules/monitoring/public/css/module.less     |  7 +++---
 modules/monitoring/public/js/module.js        |  3 +--
 .../views/helpers/MonitoringFlagsTest.php     |  3 +--
 .../views/helpers/ResolveMacrosTest.php       |  3 +--
 .../Monitoring/Plugin/PerfdataSetTest.php     |  3 +--
 .../Monitoring/Plugin/PerfdataTest.php        |  3 +--
 .../test/php/regression/Bug6088Test.php       |  3 +--
 .../test/php/regression/Bug7043Test.php       |  3 ++-
 .../application/clicommands/ConfigCommand.php |  3 +--
 .../application/clicommands/TokenCommand.php  |  3 +--
 .../controllers/IndexController.php           |  3 +--
 .../application/forms/AdminAccountPage.php    |  3 +--
 .../application/forms/AuthBackendPage.php     |  3 +--
 .../application/forms/AuthenticationPage.php  |  3 +--
 .../forms/DatabaseCreationPage.php            |  3 +--
 .../application/forms/DbResourcePage.php      |  3 +--
 .../application/forms/GeneralConfigPage.php   |  3 +--
 .../forms/LdapDiscoveryConfirmPage.php        |  3 +--
 .../application/forms/LdapDiscoveryPage.php   |  3 +--
 .../application/forms/LdapResourcePage.php    |  3 +--
 .../setup/application/forms/ModulePage.php    |  3 +--
 .../application/forms/PreferencesPage.php     |  3 +--
 .../application/forms/RequirementsPage.php    |  3 +--
 .../setup/application/forms/SummaryPage.php   |  3 +--
 .../setup/application/forms/WelcomePage.php   |  3 +--
 .../Setup/Exception/SetupException.php        |  5 ++--
 modules/setup/library/Setup/Requirements.php  |  3 +--
 modules/setup/library/Setup/Setup.php         |  3 +--
 modules/setup/library/Setup/SetupWizard.php   |  3 +--
 modules/setup/library/Setup/Step.php          |  3 +--
 .../Setup/Steps/AuthenticationStep.php        |  3 +--
 .../library/Setup/Steps/DatabaseStep.php      |  3 +--
 .../library/Setup/Steps/GeneralConfigStep.php |  3 +--
 .../library/Setup/Steps/ResourceStep.php      |  3 +--
 modules/setup/library/Setup/Utils/DbTool.php  |  3 +--
 .../library/Setup/Utils/EnableModuleStep.php  |  3 +--
 .../setup/library/Setup/Utils/MakeDirStep.php |  3 +--
 .../Web/Form/Validator/TokenValidator.php     |  3 +--
 modules/setup/library/Setup/WebWizard.php     |  3 +--
 modules/setup/library/Setup/Webserver.php     |  3 +--
 .../setup/library/Setup/Webserver/Apache.php  |  3 +--
 .../setup/library/Setup/Webserver/Nginx.php   |  3 +--
 .../application/clicommands/PhpCommand.php    |  3 +--
 .../clicommands/CompileCommand.php            |  3 +--
 .../clicommands/RefreshCommand.php            |  3 +--
 .../Translation/Cli/TranslationCommand.php    |  3 +--
 .../Util/GettextTranslationHelper.php         |  3 +--
 packages/files/bin/icingacli                  |  1 +
 packages/files/public/index.php               |  1 +
 public/css/icinga/defaults.less               |  3 +--
 public/css/icinga/forms.less                  |  3 +--
 public/css/icinga/header-elements.less        |  3 +--
 public/css/icinga/layout-colors.less          |  3 +--
 public/css/icinga/layout-structure.less       |  3 +--
 public/css/icinga/login.less                  |  5 ++--
 public/css/icinga/main-content.less           |  5 ++--
 public/css/icinga/menu.less                   |  3 +--
 public/css/icinga/monitoring-colors.less      | 17 +++++++-------
 public/css/icinga/pagination.less             |  3 +--
 public/css/icinga/selection-toolbar.less      |  3 +--
 public/css/icinga/setup.less                  |  4 +++-
 public/css/icinga/tabs.less                   |  3 +--
 public/css/icinga/widgets.less                |  5 ++--
 public/css/pdf/pdfprint.less                  |  3 +--
 public/index.php                              |  3 +--
 public/js/helpers.js                          |  3 +--
 public/js/icinga.js                           |  3 +--
 public/js/icinga/behavior/form.js             |  3 +--
 public/js/icinga/behavior/navigation.js       |  5 ++--
 public/js/icinga/behavior/sparkline.js        |  3 +--
 public/js/icinga/behavior/tooltip.js          |  3 +--
 public/js/icinga/behavior/tristate.js         |  5 ++--
 public/js/icinga/eventlistener.js             |  3 +--
 public/js/icinga/events.js                    |  3 +--
 public/js/icinga/history.js                   |  3 +--
 public/js/icinga/loader.js                    |  3 +--
 public/js/icinga/logger.js                    |  3 +--
 public/js/icinga/module.js                    |  3 +--
 public/js/icinga/timer.js                     |  3 +--
 public/js/icinga/timezone.js                  |  4 +++-
 public/js/icinga/ui.js                        | 23 +++++++++----------
 public/js/icinga/utils.js                     |  3 +--
 .../Authentication/DbBackendFormTest.php      |  3 +--
 .../Authentication/LdapBackendFormTest.php    |  3 +--
 .../AuthenticationBackendReorderFormTest.php  |  3 +--
 .../Config/Resource/DbResourceFormTest.php    |  3 +--
 .../Config/Resource/LdapResourceFormTest.php  |  3 +--
 .../Resource/LivestatusResourceFormTest.php   |  3 +--
 .../views/helpers/DateFormatTestBroken.php    |  3 +--
 test/php/bootstrap.php                        |  3 +--
 .../library/Icinga/Application/ConfigTest.php |  3 +--
 .../library/Icinga/Application/LoaderTest.php |  3 +--
 .../library/Icinga/Chart/GraphChartTest.php   |  3 +--
 .../php/library/Icinga/Chart/PieChartTest.php |  5 ++--
 .../library/Icinga/Data/ConfigObjectTest.php  |  3 +--
 .../Data/DataArray/ArrayDatasourceTest.php    |  3 +--
 .../library/Icinga/Data/Filter/FilterTest.php |  3 +--
 test/php/library/Icinga/File/CsvTest.php      |  3 +--
 .../library/Icinga/File/Ini/IniWriterTest.php |  3 +--
 .../Icinga/Logger/Writer/StreamWriterTest.php |  3 +--
 .../Icinga/Protocol/Ldap/QueryTest.php        |  3 +--
 .../library/Icinga/Test/BaseTestCaseTest.php  |  3 +--
 .../library/Icinga/User/PreferencesTest.php   |  3 +--
 .../library/Icinga/User/Store/DbStoreTest.php |  3 +--
 .../Icinga/User/Store/IniStoreTest.php        |  3 +--
 test/php/library/Icinga/UserTest.php          |  3 +--
 .../Icinga/Util/DateTimeFactoryTest.php       |  3 +--
 .../php/library/Icinga/Util/DimensionTest.php |  3 +--
 test/php/library/Icinga/Util/FileTest.php     |  3 +--
 test/php/library/Icinga/Util/StringTest.php   |  3 +--
 .../library/Icinga/Util/TranslatorTest.php    |  3 +--
 .../Web/Form/Element/DateTimePickerTest.php   |  3 +--
 .../Validator/DateFormatValidatorTest.php     |  3 +--
 .../Validator/TimeFormatValidatorTest.php     |  3 +--
 .../Validator/WritablePathValidatorTest.php   |  3 +--
 test/php/library/Icinga/Web/FormTest.php      |  3 +--
 test/php/library/Icinga/Web/HookTest.php      |  3 +--
 test/php/library/Icinga/Web/MenuTest.php      |  3 +--
 .../ScrollingStyle/SlidingWithBorderTest.php  |  3 +--
 .../Icinga/Web/Session/PhpSessionTest.php     |  3 +--
 .../Web/Session/SessionNamespaceTest.php      |  3 +--
 test/php/library/Icinga/Web/UrlTest.php       |  3 +--
 .../Icinga/Web/View/DateTimeRendererTest.php  |  3 +--
 .../Icinga/Web/Widget/DashboardTest.php       |  3 +--
 .../Icinga/Web/Widget/SearchDashboardTest.php |  3 +--
 test/php/regression/Bug4102Test.php           |  3 +--
 test/php/regression/Bug6284Test.php           |  3 +--
 test/php/regression/Bug6432Test.php           |  3 +--
 590 files changed, 652 insertions(+), 1165 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 1e5e3a073..9090b23aa 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,6 +1,8 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt
+
 VAGRANTFILE_API_VERSION = "2"
 VAGRANT_REQUIRED_VERSION = "1.5.0"
 
diff --git a/application/clicommands/AutocompleteCommand.php b/application/clicommands/AutocompleteCommand.php
index 5a5a0e0c0..045ee8cdc 100644
--- a/application/clicommands/AutocompleteCommand.php
+++ b/application/clicommands/AutocompleteCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Clicommands;
 
diff --git a/application/clicommands/HelpCommand.php b/application/clicommands/HelpCommand.php
index 7c1977f59..4cc197f3e 100644
--- a/application/clicommands/HelpCommand.php
+++ b/application/clicommands/HelpCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Clicommands;
 
diff --git a/application/clicommands/ModuleCommand.php b/application/clicommands/ModuleCommand.php
index e38d134c3..5d5c30518 100644
--- a/application/clicommands/ModuleCommand.php
+++ b/application/clicommands/ModuleCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Clicommands;
 
diff --git a/application/clicommands/WebCommand.php b/application/clicommands/WebCommand.php
index 12ed9e1a4..46b4e8a3d 100644
--- a/application/clicommands/WebCommand.php
+++ b/application/clicommands/WebCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Clicommands;
 
diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index 4e70894a1..e7a4c82e4 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 # namespace Icinga\Application\Controllers;
 
diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 078503346..a1bf52514 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Application\Config;
 use Icinga\Application\Icinga;
diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 12a5180c8..009c715c3 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use \Exception;
 use Icinga\Exception\ProgrammingError;
diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index 0548b5c9c..84d6c0998 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php
index 09e8f0368..78c4c1068 100644
--- a/application/controllers/FilterController.php
+++ b/application/controllers/FilterController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Web\Controller\ActionController;
 use Icinga\Filter\Filter;
diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php
index 05e66504b..6537a0b61 100644
--- a/application/controllers/IndexController.php
+++ b/application/controllers/IndexController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 # namespace Icinga\Application\Controllers;
 
diff --git a/application/controllers/LayoutController.php b/application/controllers/LayoutController.php
index 2d84faf3c..ae9df3734 100644
--- a/application/controllers/LayoutController.php
+++ b/application/controllers/LayoutController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Web\MenuRenderer;
 use Icinga\Web\Controller\ActionController;
diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index f8b0ed1d6..1051aeae1 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Web\Url;
diff --git a/application/controllers/PreferenceController.php b/application/controllers/PreferenceController.php
index 832f57644..7034b953d 100644
--- a/application/controllers/PreferenceController.php
+++ b/application/controllers/PreferenceController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Web\Controller\BasePreferenceController;
 use Icinga\Web\Url;
diff --git a/application/controllers/RolesController.php b/application/controllers/RolesController.php
index f4c6aeed2..edf2a3689 100644
--- a/application/controllers/RolesController.php
+++ b/application/controllers/RolesController.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Application\Config;
 use Icinga\Forms\ConfirmRemovalForm;
diff --git a/application/controllers/SearchController.php b/application/controllers/SearchController.php
index 68fd5dd3d..a9bab30d7 100644
--- a/application/controllers/SearchController.php
+++ b/application/controllers/SearchController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Web\Controller\ActionController;
 use Icinga\Web\Widget;
diff --git a/application/controllers/StaticController.php b/application/controllers/StaticController.php
index fc5f1354f..549a32419 100644
--- a/application/controllers/StaticController.php
+++ b/application/controllers/StaticController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Web\Controller\ActionController;
 use Icinga\Application\Icinga;
diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index 8be455dcc..0b3abaeb2 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Authentication;
 
diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index d3a5af51d..2bdb08949 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config\Authentication;
 
diff --git a/application/forms/Config/Authentication/ExternalBackendForm.php b/application/forms/Config/Authentication/ExternalBackendForm.php
index 51000b2d2..30791cb04 100644
--- a/application/forms/Config/Authentication/ExternalBackendForm.php
+++ b/application/forms/Config/Authentication/ExternalBackendForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config\Authentication;
 
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 1b8fc3f11..d84bb5bd3 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config\Authentication;
 
diff --git a/application/forms/Config/AuthenticationBackendConfigForm.php b/application/forms/Config/AuthenticationBackendConfigForm.php
index de3093ada..391533ad7 100644
--- a/application/forms/Config/AuthenticationBackendConfigForm.php
+++ b/application/forms/Config/AuthenticationBackendConfigForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config;
 
diff --git a/application/forms/Config/AuthenticationBackendReorderForm.php b/application/forms/Config/AuthenticationBackendReorderForm.php
index a41224248..a207572c7 100644
--- a/application/forms/Config/AuthenticationBackendReorderForm.php
+++ b/application/forms/Config/AuthenticationBackendReorderForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config;
 
diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php
index 29b7b512e..0e1ac1f46 100644
--- a/application/forms/Config/General/ApplicationConfigForm.php
+++ b/application/forms/Config/General/ApplicationConfigForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config\General;
 
diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php
index 997bd558a..12e9ae593 100644
--- a/application/forms/Config/General/LoggingConfigForm.php
+++ b/application/forms/Config/General/LoggingConfigForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config\General;
 
diff --git a/application/forms/Config/GeneralConfigForm.php b/application/forms/Config/GeneralConfigForm.php
index 7e3357d7b..22e83ff30 100644
--- a/application/forms/Config/GeneralConfigForm.php
+++ b/application/forms/Config/GeneralConfigForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config;
 
diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
index 97dd951d1..56edbf178 100644
--- a/application/forms/Config/Resource/DbResourceForm.php
+++ b/application/forms/Config/Resource/DbResourceForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config\Resource;
 
diff --git a/application/forms/Config/Resource/FileResourceForm.php b/application/forms/Config/Resource/FileResourceForm.php
index 960926114..7d46cc6fb 100644
--- a/application/forms/Config/Resource/FileResourceForm.php
+++ b/application/forms/Config/Resource/FileResourceForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config\Resource;
 
diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 3293546c5..6e8052579 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config\Resource;
 
diff --git a/application/forms/Config/Resource/LivestatusResourceForm.php b/application/forms/Config/Resource/LivestatusResourceForm.php
index e893a4657..d7bf7d883 100644
--- a/application/forms/Config/Resource/LivestatusResourceForm.php
+++ b/application/forms/Config/Resource/LivestatusResourceForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config\Resource;
 
diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php
index 67912142a..1b860c193 100644
--- a/application/forms/Config/ResourceConfigForm.php
+++ b/application/forms/Config/ResourceConfigForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config;
 
diff --git a/application/forms/ConfigForm.php b/application/forms/ConfigForm.php
index 224633f1f..18410ef2d 100644
--- a/application/forms/ConfigForm.php
+++ b/application/forms/ConfigForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms;
 
diff --git a/application/forms/ConfirmRemovalForm.php b/application/forms/ConfirmRemovalForm.php
index 6840db37d..6ef9258ec 100644
--- a/application/forms/ConfirmRemovalForm.php
+++ b/application/forms/ConfirmRemovalForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms;
 
diff --git a/application/forms/Dashboard/DashletForm.php b/application/forms/Dashboard/DashletForm.php
index e58ca8aba..c1e29c063 100644
--- a/application/forms/Dashboard/DashletForm.php
+++ b/application/forms/Dashboard/DashletForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Dashboard;
 
diff --git a/application/forms/LdapDiscoveryForm.php b/application/forms/LdapDiscoveryForm.php
index 6a14c2ecd..7da98a277 100644
--- a/application/forms/LdapDiscoveryForm.php
+++ b/application/forms/LdapDiscoveryForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms;
 
diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
index ed20c58cd..74a9683e3 100644
--- a/application/forms/PreferenceForm.php
+++ b/application/forms/PreferenceForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms;
 
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index cc5f4037e..0e3c97c0a 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Security;
 
diff --git a/application/views/helpers/DateFormat.php b/application/views/helpers/DateFormat.php
index d3515d184..727c9c8f9 100644
--- a/application/views/helpers/DateFormat.php
+++ b/application/views/helpers/DateFormat.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Application\Icinga;
 use Icinga\Util\DateTimeFactory;
diff --git a/application/views/helpers/FormDateTime.php b/application/views/helpers/FormDateTime.php
index b75dfec62..29bec0c16 100644
--- a/application/views/helpers/FormDateTime.php
+++ b/application/views/helpers/FormDateTime.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Render date-and-time input controls
diff --git a/application/views/helpers/FormNumber.php b/application/views/helpers/FormNumber.php
index c3ccdcfd6..1f8efd83b 100644
--- a/application/views/helpers/FormNumber.php
+++ b/application/views/helpers/FormNumber.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use \Zend_View_Helper_FormElement;
 
diff --git a/application/views/helpers/FormTriStateCheckbox.php b/application/views/helpers/FormTriStateCheckbox.php
index 695c9af56..107abee4d 100644
--- a/application/views/helpers/FormTriStateCheckbox.php
+++ b/application/views/helpers/FormTriStateCheckbox.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use \Zend_View_Helper_FormElement;
 
diff --git a/application/views/helpers/Util.php b/application/views/helpers/Util.php
index f3e41244f..25e506b25 100644
--- a/application/views/helpers/Util.php
+++ b/application/views/helpers/Util.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Class Zend_View_Helper_Util
diff --git a/bin/icingacli b/bin/icingacli
index c85777c9c..5a2d4c957 100755
--- a/bin/icingacli
+++ b/bin/icingacli
@@ -1,7 +1,6 @@
 #!/usr/bin/php
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 require_once dirname(__DIR__) . '/library/Icinga/Application/Cli.php';
 
diff --git a/bin/license_writer.py b/bin/license_writer.py
index 532839e2e..b904dd34e 100755
--- a/bin/license_writer.py
+++ b/bin/license_writer.py
@@ -1,7 +1,6 @@
 #!/usr/bin/python
 
-# {{{ICINGA_LICENSE_HEADER}}}
-# {{{ICINGA_LICENSE_HEADER}}}
+# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt
 
 import sys
 import logging
diff --git a/etc/bash_completion.d/icingacli b/etc/bash_completion.d/icingacli
index 74e779218..f9be7bcf9 100644
--- a/etc/bash_completion.d/icingacli
+++ b/etc/bash_completion.d/icingacli
@@ -1,4 +1,3 @@
-
 _icingacli_completion()
 {
   local cur opts
@@ -9,5 +8,3 @@ _icingacli_completion()
 }
 
 complete -F _icingacli_completion icingacli
-
-
diff --git a/etc/schema/mysql.schema.sql b/etc/schema/mysql.schema.sql
index 74d2665d4..c1ffcf91f 100644
--- a/etc/schema/mysql.schema.sql
+++ b/etc/schema/mysql.schema.sql
@@ -1,3 +1,5 @@
+# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt
+
 CREATE TABLE `icingaweb_group`(
   `name`   varchar(64) COLLATE utf8_unicode_ci NOT NULL,
   `parent` varchar(64) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
diff --git a/etc/schema/pgsql.schema.sql b/etc/schema/pgsql.schema.sql
index 77971222b..bbaba8253 100644
--- a/etc/schema/pgsql.schema.sql
+++ b/etc/schema/pgsql.schema.sql
@@ -1,6 +1,5 @@
-/**
- * Table "icingaweb_group"
- */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+
 CREATE TABLE "icingaweb_group" (
   "name"   character varying(64) NOT NULL,
   "parent" character varying(64) NULL DEFAULT NULL,
@@ -20,10 +19,6 @@ CREATE UNIQUE INDEX idx_icingaweb_group
     lower((name)::text)
 );
 
-
-/**
- * Table "icingaweb_group_membership"
- */
 CREATE TABLE "icingaweb_group_membership" (
   "group_name" character varying(64) NOT NULL,
   "username"   character varying(64) NOT NULL,
@@ -45,10 +40,6 @@ CREATE UNIQUE INDEX idx_icingaweb_group_membership
     lower((username)::text)
 );
 
-
-/**
- * Table "icingaweb_user"
- */
 CREATE TABLE "icingaweb_user" (
   "name"          character varying(64) NOT NULL,
   "active"        smallint NOT NULL,
@@ -69,10 +60,6 @@ CREATE UNIQUE INDEX idx_icingaweb_user
     lower((name)::text)
 );
 
-
-/**
- * Table "icingaweb_user_preference"
- */
 CREATE TABLE "icingaweb_user_preference" (
   "username" character varying(64) NOT NULL,
   "name"     character varying(64) NOT NULL,
@@ -96,4 +83,4 @@ CREATE UNIQUE INDEX idx_icingaweb_user_preference
     lower((username)::text),
     lower((section)::text),
     lower((name)::text)
-);
\ No newline at end of file
+);
diff --git a/icingaweb2.spec b/icingaweb2.spec
index a012751ea..9dfe5d0df 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -1,3 +1,5 @@
+# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt
+
 %define revision 1.beta2
 
 Name:           icingaweb2
diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 89bca7b97..4154124af 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Benchmark.php b/library/Icinga/Application/Benchmark.php
index fd69dd510..c33f718c0 100644
--- a/library/Icinga/Application/Benchmark.php
+++ b/library/Icinga/Application/Benchmark.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Icinga\Application\Benchmark class
diff --git a/library/Icinga/Application/Cli.php b/library/Icinga/Application/Cli.php
index 6341d561e..20ad3b8a0 100644
--- a/library/Icinga/Application/Cli.php
+++ b/library/Icinga/Application/Cli.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Config.php b/library/Icinga/Application/Config.php
index 484cff6df..4feed4d25 100644
--- a/library/Icinga/Application/Config.php
+++ b/library/Icinga/Application/Config.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/EmbeddedWeb.php b/library/Icinga/Application/EmbeddedWeb.php
index b9ed067a2..a6f166f1b 100644
--- a/library/Icinga/Application/EmbeddedWeb.php
+++ b/library/Icinga/Application/EmbeddedWeb.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Icinga.php b/library/Icinga/Application/Icinga.php
index 1ab9c36f0..2c0b6868d 100644
--- a/library/Icinga/Application/Icinga.php
+++ b/library/Icinga/Application/Icinga.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/LegacyWeb.php b/library/Icinga/Application/LegacyWeb.php
index a5b5beed9..495bcf204 100644
--- a/library/Icinga/Application/LegacyWeb.php
+++ b/library/Icinga/Application/LegacyWeb.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Loader.php b/library/Icinga/Application/Loader.php
index 15c3a9316..19f62cbcc 100644
--- a/library/Icinga/Application/Loader.php
+++ b/library/Icinga/Application/Loader.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Logger.php b/library/Icinga/Application/Logger.php
index 70eaa774b..e4e706891 100644
--- a/library/Icinga/Application/Logger.php
+++ b/library/Icinga/Application/Logger.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Logger/LogWriter.php b/library/Icinga/Application/Logger/LogWriter.php
index b89fec62f..196be16e8 100644
--- a/library/Icinga/Application/Logger/LogWriter.php
+++ b/library/Icinga/Application/Logger/LogWriter.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application\Logger;
 
diff --git a/library/Icinga/Application/Logger/Writer/FileWriter.php b/library/Icinga/Application/Logger/Writer/FileWriter.php
index 2f5a292ec..6f2e31872 100644
--- a/library/Icinga/Application/Logger/Writer/FileWriter.php
+++ b/library/Icinga/Application/Logger/Writer/FileWriter.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application\Logger\Writer;
 
diff --git a/library/Icinga/Application/Logger/Writer/StdoutWriter.php b/library/Icinga/Application/Logger/Writer/StdoutWriter.php
index 52608ca12..106c6960a 100644
--- a/library/Icinga/Application/Logger/Writer/StdoutWriter.php
+++ b/library/Icinga/Application/Logger/Writer/StdoutWriter.php
@@ -1,5 +1,5 @@
 <?php
-
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 namespace Icinga\Application\Logger\Writer;
 
 use Icinga\Cli\Screen;
diff --git a/library/Icinga/Application/Logger/Writer/SyslogWriter.php b/library/Icinga/Application/Logger/Writer/SyslogWriter.php
index 7a69e4cba..9f819fcb5 100644
--- a/library/Icinga/Application/Logger/Writer/SyslogWriter.php
+++ b/library/Icinga/Application/Logger/Writer/SyslogWriter.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application\Logger\Writer;
 
diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php
index 0a1b23f78..a6a77e0d2 100644
--- a/library/Icinga/Application/Modules/Manager.php
+++ b/library/Icinga/Application/Modules/Manager.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application\Modules;
 
diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index 96bbae7be..0146f6bb5 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application\Modules;
 
diff --git a/library/Icinga/Application/Platform.php b/library/Icinga/Application/Platform.php
index d4d130220..45c540617 100644
--- a/library/Icinga/Application/Platform.php
+++ b/library/Icinga/Application/Platform.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 5b18f1be8..3f5577203 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/functions.php b/library/Icinga/Application/functions.php
index 304c75093..ab2d525fc 100644
--- a/library/Icinga/Application/functions.php
+++ b/library/Icinga/Application/functions.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Util\Translator;
 
diff --git a/library/Icinga/Application/webrouter.php b/library/Icinga/Application/webrouter.php
index b00034871..f29db8644 100644
--- a/library/Icinga/Application/webrouter.php
+++ b/library/Icinga/Application/webrouter.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Authentication/AdmissionLoader.php b/library/Icinga/Authentication/AdmissionLoader.php
index d97fc534e..88c4f78c6 100644
--- a/library/Icinga/Authentication/AdmissionLoader.php
+++ b/library/Icinga/Authentication/AdmissionLoader.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */}
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Authentication/AuthChain.php b/library/Icinga/Authentication/AuthChain.php
index 24c12c9de..b668c3125 100644
--- a/library/Icinga/Authentication/AuthChain.php
+++ b/library/Icinga/Authentication/AuthChain.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Authentication/Backend/DbUserBackend.php b/library/Icinga/Authentication/Backend/DbUserBackend.php
index 7865aa905..8888327ef 100644
--- a/library/Icinga/Authentication/Backend/DbUserBackend.php
+++ b/library/Icinga/Authentication/Backend/DbUserBackend.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Backend/DbUserGroupBackend.php b/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
index 15a77d77d..080899393 100644
--- a/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Backend/ExternalBackend.php b/library/Icinga/Authentication/Backend/ExternalBackend.php
index d5eb491e5..9fbe3282b 100644
--- a/library/Icinga/Authentication/Backend/ExternalBackend.php
+++ b/library/Icinga/Authentication/Backend/ExternalBackend.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Backend/IniUserGroupBackend.php b/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
index 45d36e833..23781916d 100644
--- a/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
+++ b/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/Backend/LdapUserBackend.php
index 666ed69ae..13c03af58 100644
--- a/library/Icinga/Authentication/Backend/LdapUserBackend.php
+++ b/library/Icinga/Authentication/Backend/LdapUserBackend.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 8aee93c0e..64d20d9dd 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Authentication/UserBackend.php b/library/Icinga/Authentication/UserBackend.php
index 7215f4d41..2117c2f29 100644
--- a/library/Icinga/Authentication/UserBackend.php
+++ b/library/Icinga/Authentication/UserBackend.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */}
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Authentication/UserGroupBackend.php b/library/Icinga/Authentication/UserGroupBackend.php
index f1a41adcb..49c6e4575 100644
--- a/library/Icinga/Authentication/UserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroupBackend.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */}
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Chart/Axis.php b/library/Icinga/Chart/Axis.php
index c12d9a904..d52a97b6e 100644
--- a/library/Icinga/Chart/Axis.php
+++ b/library/Icinga/Chart/Axis.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Chart.php b/library/Icinga/Chart/Chart.php
index 5b545d4de..42bc28ca8 100644
--- a/library/Icinga/Chart/Chart.php
+++ b/library/Icinga/Chart/Chart.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Format.php b/library/Icinga/Chart/Format.php
index 80b48ecb5..c9699e05c 100644
--- a/library/Icinga/Chart/Format.php
+++ b/library/Icinga/Chart/Format.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Graph/BarGraph.php b/library/Icinga/Chart/Graph/BarGraph.php
index febad8d09..90582769d 100644
--- a/library/Icinga/Chart/Graph/BarGraph.php
+++ b/library/Icinga/Chart/Graph/BarGraph.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Graph;
 
diff --git a/library/Icinga/Chart/Graph/LineGraph.php b/library/Icinga/Chart/Graph/LineGraph.php
index 3644f1492..cbb9235a9 100644
--- a/library/Icinga/Chart/Graph/LineGraph.php
+++ b/library/Icinga/Chart/Graph/LineGraph.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Chart\Graph;
diff --git a/library/Icinga/Chart/Graph/StackedGraph.php b/library/Icinga/Chart/Graph/StackedGraph.php
index 4339b8c8d..36ea73721 100644
--- a/library/Icinga/Chart/Graph/StackedGraph.php
+++ b/library/Icinga/Chart/Graph/StackedGraph.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Graph;
 
diff --git a/library/Icinga/Chart/Graph/Tooltip.php b/library/Icinga/Chart/Graph/Tooltip.php
index 4457e04e2..c4ebbffb9 100644
--- a/library/Icinga/Chart/Graph/Tooltip.php
+++ b/library/Icinga/Chart/Graph/Tooltip.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Graph;
 
@@ -141,4 +140,4 @@ class Tooltip
     {
         return strip_tags($this->render($order, $data, $format));
     }
-}
\ No newline at end of file
+}
diff --git a/library/Icinga/Chart/GridChart.php b/library/Icinga/Chart/GridChart.php
index 190e09bf9..b95fa1fc4 100644
--- a/library/Icinga/Chart/GridChart.php
+++ b/library/Icinga/Chart/GridChart.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Inline/Inline.php b/library/Icinga/Chart/Inline/Inline.php
index 8faa388bf..ef22bc02e 100644
--- a/library/Icinga/Chart/Inline/Inline.php
+++ b/library/Icinga/Chart/Inline/Inline.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Inline;
 
diff --git a/library/Icinga/Chart/Inline/PieChart.php b/library/Icinga/Chart/Inline/PieChart.php
index fdffd9acd..c9099f5ef 100644
--- a/library/Icinga/Chart/Inline/PieChart.php
+++ b/library/Icinga/Chart/Inline/PieChart.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Inline;
 
diff --git a/library/Icinga/Chart/Legend.php b/library/Icinga/Chart/Legend.php
index df334089f..eb004a9a1 100644
--- a/library/Icinga/Chart/Legend.php
+++ b/library/Icinga/Chart/Legend.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Palette.php b/library/Icinga/Chart/Palette.php
index ef413e73e..09cd1ade4 100644
--- a/library/Icinga/Chart/Palette.php
+++ b/library/Icinga/Chart/Palette.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/PieChart.php b/library/Icinga/Chart/PieChart.php
index cc51f85b3..e5d098c15 100644
--- a/library/Icinga/Chart/PieChart.php
+++ b/library/Icinga/Chart/PieChart.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Primitive/Animatable.php b/library/Icinga/Chart/Primitive/Animatable.php
index 3d4d24f00..bc7c18235 100644
--- a/library/Icinga/Chart/Primitive/Animatable.php
+++ b/library/Icinga/Chart/Primitive/Animatable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Animation.php b/library/Icinga/Chart/Primitive/Animation.php
index dbcdb1a2c..c2d0afc45 100644
--- a/library/Icinga/Chart/Primitive/Animation.php
+++ b/library/Icinga/Chart/Primitive/Animation.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Canvas.php b/library/Icinga/Chart/Primitive/Canvas.php
index 55159d975..47abd7f09 100644
--- a/library/Icinga/Chart/Primitive/Canvas.php
+++ b/library/Icinga/Chart/Primitive/Canvas.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/Circle.php b/library/Icinga/Chart/Primitive/Circle.php
index da5f1785e..ab7664d10 100644
--- a/library/Icinga/Chart/Primitive/Circle.php
+++ b/library/Icinga/Chart/Primitive/Circle.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/Drawable.php b/library/Icinga/Chart/Primitive/Drawable.php
index ea5dca077..1ed78c9fb 100644
--- a/library/Icinga/Chart/Primitive/Drawable.php
+++ b/library/Icinga/Chart/Primitive/Drawable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Line.php b/library/Icinga/Chart/Primitive/Line.php
index 150013f82..d2ad670e7 100644
--- a/library/Icinga/Chart/Primitive/Line.php
+++ b/library/Icinga/Chart/Primitive/Line.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Path.php b/library/Icinga/Chart/Primitive/Path.php
index 0969e9674..3eac8b954 100644
--- a/library/Icinga/Chart/Primitive/Path.php
+++ b/library/Icinga/Chart/Primitive/Path.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/PieSlice.php b/library/Icinga/Chart/Primitive/PieSlice.php
index 33f3cbee7..c3b4a8b90 100644
--- a/library/Icinga/Chart/Primitive/PieSlice.php
+++ b/library/Icinga/Chart/Primitive/PieSlice.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/RawElement.php b/library/Icinga/Chart/Primitive/RawElement.php
index 459a2d1ce..47336da0b 100644
--- a/library/Icinga/Chart/Primitive/RawElement.php
+++ b/library/Icinga/Chart/Primitive/RawElement.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Rect.php b/library/Icinga/Chart/Primitive/Rect.php
index fc389e204..9bd7bb3ff 100644
--- a/library/Icinga/Chart/Primitive/Rect.php
+++ b/library/Icinga/Chart/Primitive/Rect.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Styleable.php b/library/Icinga/Chart/Primitive/Styleable.php
index 248a560d3..0dcf47e34 100644
--- a/library/Icinga/Chart/Primitive/Styleable.php
+++ b/library/Icinga/Chart/Primitive/Styleable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/Text.php b/library/Icinga/Chart/Primitive/Text.php
index 72bed552b..d2467ffcc 100644
--- a/library/Icinga/Chart/Primitive/Text.php
+++ b/library/Icinga/Chart/Primitive/Text.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Chart\Primitive;
diff --git a/library/Icinga/Chart/Render/LayoutBox.php b/library/Icinga/Chart/Render/LayoutBox.php
index 00e75f3c4..a3fb1a64f 100644
--- a/library/Icinga/Chart/Render/LayoutBox.php
+++ b/library/Icinga/Chart/Render/LayoutBox.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Render;
 
diff --git a/library/Icinga/Chart/Render/RenderContext.php b/library/Icinga/Chart/Render/RenderContext.php
index a5d308c6e..e97d213dd 100644
--- a/library/Icinga/Chart/Render/RenderContext.php
+++ b/library/Icinga/Chart/Render/RenderContext.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Chart\Render;
diff --git a/library/Icinga/Chart/Render/Rotator.php b/library/Icinga/Chart/Render/Rotator.php
index 56c1a4685..9d4f4aa2b 100644
--- a/library/Icinga/Chart/Render/Rotator.php
+++ b/library/Icinga/Chart/Render/Rotator.php
@@ -1,11 +1,8 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Render;
 
-
 use Icinga\Chart\Render\RenderContext;
 use Icinga\Chart\Primitive\Drawable;
 use DOMElement;
@@ -80,4 +77,4 @@ class Rotator implements Drawable
         $el = $this->element->toSvg($ctx);
         return $this->rotate($ctx, $el, $this->degrees);
     }
-} 
\ No newline at end of file
+}
diff --git a/library/Icinga/Chart/SVGRenderer.php b/library/Icinga/Chart/SVGRenderer.php
index da6015ceb..7de8463bb 100644
--- a/library/Icinga/Chart/SVGRenderer.php
+++ b/library/Icinga/Chart/SVGRenderer.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Unit/AxisUnit.php b/library/Icinga/Chart/Unit/AxisUnit.php
index fba521778..9a989c410 100644
--- a/library/Icinga/Chart/Unit/AxisUnit.php
+++ b/library/Icinga/Chart/Unit/AxisUnit.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Unit;
 
diff --git a/library/Icinga/Chart/Unit/CalendarUnit.php b/library/Icinga/Chart/Unit/CalendarUnit.php
index 2845303c4..a1864b5b3 100644
--- a/library/Icinga/Chart/Unit/CalendarUnit.php
+++ b/library/Icinga/Chart/Unit/CalendarUnit.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Chart\Unit;
diff --git a/library/Icinga/Chart/Unit/LinearUnit.php b/library/Icinga/Chart/Unit/LinearUnit.php
index fe80971d4..15eed57fe 100644
--- a/library/Icinga/Chart/Unit/LinearUnit.php
+++ b/library/Icinga/Chart/Unit/LinearUnit.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Unit;
 
diff --git a/library/Icinga/Chart/Unit/LogarithmicUnit.php b/library/Icinga/Chart/Unit/LogarithmicUnit.php
index 6d07f3d45..61f962f90 100644
--- a/library/Icinga/Chart/Unit/LogarithmicUnit.php
+++ b/library/Icinga/Chart/Unit/LogarithmicUnit.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Unit;
 
diff --git a/library/Icinga/Chart/Unit/StaticAxis.php b/library/Icinga/Chart/Unit/StaticAxis.php
index c7e9c2be5..47ca0706c 100644
--- a/library/Icinga/Chart/Unit/StaticAxis.php
+++ b/library/Icinga/Chart/Unit/StaticAxis.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Chart\Unit;
diff --git a/library/Icinga/Cli/AnsiScreen.php b/library/Icinga/Cli/AnsiScreen.php
index f3b2b6654..01ee51514 100644
--- a/library/Icinga/Cli/AnsiScreen.php
+++ b/library/Icinga/Cli/AnsiScreen.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Command.php b/library/Icinga/Cli/Command.php
index c410cfc0e..2ef4154d0 100644
--- a/library/Icinga/Cli/Command.php
+++ b/library/Icinga/Cli/Command.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Documentation.php b/library/Icinga/Cli/Documentation.php
index 76b821df4..179d387c7 100644
--- a/library/Icinga/Cli/Documentation.php
+++ b/library/Icinga/Cli/Documentation.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Documentation/CommentParser.php b/library/Icinga/Cli/Documentation/CommentParser.php
index f8b6135e9..10462c7f3 100644
--- a/library/Icinga/Cli/Documentation/CommentParser.php
+++ b/library/Icinga/Cli/Documentation/CommentParser.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Cli\Documentation;
 
diff --git a/library/Icinga/Cli/Loader.php b/library/Icinga/Cli/Loader.php
index 655ef7c18..406a1c31f 100644
--- a/library/Icinga/Cli/Loader.php
+++ b/library/Icinga/Cli/Loader.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Params.php b/library/Icinga/Cli/Params.php
index 5c6cbfe8b..34110cd8e 100644
--- a/library/Icinga/Cli/Params.php
+++ b/library/Icinga/Cli/Params.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Screen.php b/library/Icinga/Cli/Screen.php
index 5b687f3ab..ca9aa2f26 100644
--- a/library/Icinga/Cli/Screen.php
+++ b/library/Icinga/Cli/Screen.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Data/Browsable.php b/library/Icinga/Data/Browsable.php
index 4d8d2136f..11f1956e3 100644
--- a/library/Icinga/Data/Browsable.php
+++ b/library/Icinga/Data/Browsable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/ConfigObject.php b/library/Icinga/Data/ConfigObject.php
index 23b2e1651..0700179fd 100644
--- a/library/Icinga/Data/ConfigObject.php
+++ b/library/Icinga/Data/ConfigObject.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/ConnectionInterface.php b/library/Icinga/Data/ConnectionInterface.php
index dfdb4a6f2..081ac5612 100644
--- a/library/Icinga/Data/ConnectionInterface.php
+++ b/library/Icinga/Data/ConnectionInterface.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/DataArray/ArrayDatasource.php b/library/Icinga/Data/DataArray/ArrayDatasource.php
index ecb428e59..c80df68df 100644
--- a/library/Icinga/Data/DataArray/ArrayDatasource.php
+++ b/library/Icinga/Data/DataArray/ArrayDatasource.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\DataArray;
 
@@ -10,7 +9,7 @@ use Icinga\Data\SimpleQuery;
 class ArrayDatasource implements Selectable
 {
     protected $data;
-    
+
     protected $result;
 
     /**
diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php
index 38153a1cf..7909ab194 100644
--- a/library/Icinga/Data/Db/DbConnection.php
+++ b/library/Icinga/Data/Db/DbConnection.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Db;
 
diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index bad1261aa..38d2352b0 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Db;
 
diff --git a/library/Icinga/Data/Fetchable.php b/library/Icinga/Data/Fetchable.php
index 249a522e3..2c3c8ce11 100644
--- a/library/Icinga/Data/Fetchable.php
+++ b/library/Icinga/Data/Fetchable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Filter/Filter.php b/library/Icinga/Data/Filter/Filter.php
index 5793a4749..6508a27c9 100644
--- a/library/Icinga/Data/Filter/Filter.php
+++ b/library/Icinga/Data/Filter/Filter.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterAnd.php b/library/Icinga/Data/Filter/FilterAnd.php
index 8fd2f2411..c3ff9b75c 100644
--- a/library/Icinga/Data/Filter/FilterAnd.php
+++ b/library/Icinga/Data/Filter/FilterAnd.php
@@ -1,11 +1,10 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
 /**
- * Filter list AND 
+ * Filter list AND
  *
  * Binary AND, all contained filters must succeed
  */
diff --git a/library/Icinga/Data/Filter/FilterChain.php b/library/Icinga/Data/Filter/FilterChain.php
index cdb3a1123..2567de41b 100644
--- a/library/Icinga/Data/Filter/FilterChain.php
+++ b/library/Icinga/Data/Filter/FilterChain.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
@@ -154,7 +153,7 @@ abstract class FilterChain extends Filter
      *
      * Useful for debugging only
      *
-     * @return string 
+     * @return string
      */
     public function __toString()
     {
@@ -217,5 +216,5 @@ abstract class FilterChain extends Filter
         foreach ($this->filters as & $filter) {
             $filter = clone $filter;
         }
-    } 
+    }
 }
diff --git a/library/Icinga/Data/Filter/FilterEqual.php b/library/Icinga/Data/Filter/FilterEqual.php
index 66e4c06ad..1e567dbf1 100644
--- a/library/Icinga/Data/Filter/FilterEqual.php
+++ b/library/Icinga/Data/Filter/FilterEqual.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php b/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php
index 29c0bfad0..92568178c 100644
--- a/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php
+++ b/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterEqualOrLessThan.php b/library/Icinga/Data/Filter/FilterEqualOrLessThan.php
index 2f8b62265..88e56de1d 100644
--- a/library/Icinga/Data/Filter/FilterEqualOrLessThan.php
+++ b/library/Icinga/Data/Filter/FilterEqualOrLessThan.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterException.php b/library/Icinga/Data/Filter/FilterException.php
index 8f770810f..da28ddbe6 100644
--- a/library/Icinga/Data/Filter/FilterException.php
+++ b/library/Icinga/Data/Filter/FilterException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterExpression.php b/library/Icinga/Data/Filter/FilterExpression.php
index 0782bcd89..379c70045 100644
--- a/library/Icinga/Data/Filter/FilterExpression.php
+++ b/library/Icinga/Data/Filter/FilterExpression.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterGreaterThan.php b/library/Icinga/Data/Filter/FilterGreaterThan.php
index 62ba16fca..386a260c9 100644
--- a/library/Icinga/Data/Filter/FilterGreaterThan.php
+++ b/library/Icinga/Data/Filter/FilterGreaterThan.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterLessThan.php b/library/Icinga/Data/Filter/FilterLessThan.php
index 2ae99098f..478cc47b4 100644
--- a/library/Icinga/Data/Filter/FilterLessThan.php
+++ b/library/Icinga/Data/Filter/FilterLessThan.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterMatch.php b/library/Icinga/Data/Filter/FilterMatch.php
index 159feb04e..2f072742b 100644
--- a/library/Icinga/Data/Filter/FilterMatch.php
+++ b/library/Icinga/Data/Filter/FilterMatch.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterMatchNot.php b/library/Icinga/Data/Filter/FilterMatchNot.php
index 2ce5c2336..f7478cf75 100644
--- a/library/Icinga/Data/Filter/FilterMatchNot.php
+++ b/library/Icinga/Data/Filter/FilterMatchNot.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterNot.php b/library/Icinga/Data/Filter/FilterNot.php
index 5e63691f1..5d1dc8998 100644
--- a/library/Icinga/Data/Filter/FilterNot.php
+++ b/library/Icinga/Data/Filter/FilterNot.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterNotEqual.php b/library/Icinga/Data/Filter/FilterNotEqual.php
index d1a5e9b64..3faf209d2 100644
--- a/library/Icinga/Data/Filter/FilterNotEqual.php
+++ b/library/Icinga/Data/Filter/FilterNotEqual.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterOr.php b/library/Icinga/Data/Filter/FilterOr.php
index 8291d32dc..1c08b9456 100644
--- a/library/Icinga/Data/Filter/FilterOr.php
+++ b/library/Icinga/Data/Filter/FilterOr.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterParseException.php b/library/Icinga/Data/Filter/FilterParseException.php
index 5633b5adf..4210b6561 100644
--- a/library/Icinga/Data/Filter/FilterParseException.php
+++ b/library/Icinga/Data/Filter/FilterParseException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterQueryString.php b/library/Icinga/Data/Filter/FilterQueryString.php
index 3dbcce473..07da8f4f4 100644
--- a/library/Icinga/Data/Filter/FilterQueryString.php
+++ b/library/Icinga/Data/Filter/FilterQueryString.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filterable.php b/library/Icinga/Data/Filterable.php
index 25d1fc9f5..f70c5b9f2 100644
--- a/library/Icinga/Data/Filterable.php
+++ b/library/Icinga/Data/Filterable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Identifiable.php b/library/Icinga/Data/Identifiable.php
index cfa727a1d..520b4f939 100644
--- a/library/Icinga/Data/Identifiable.php
+++ b/library/Icinga/Data/Identifiable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Limitable.php b/library/Icinga/Data/Limitable.php
index 380eae9f9..8ebc37263 100644
--- a/library/Icinga/Data/Limitable.php
+++ b/library/Icinga/Data/Limitable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/PivotTable.php b/library/Icinga/Data/PivotTable.php
index 0a1f009fe..280219b41 100644
--- a/library/Icinga/Data/PivotTable.php
+++ b/library/Icinga/Data/PivotTable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/QueryInterface.php b/library/Icinga/Data/QueryInterface.php
index ef8c7c741..5032e1786 100644
--- a/library/Icinga/Data/QueryInterface.php
+++ b/library/Icinga/Data/QueryInterface.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Queryable.php b/library/Icinga/Data/Queryable.php
index 47f438c4e..7501cd34f 100644
--- a/library/Icinga/Data/Queryable.php
+++ b/library/Icinga/Data/Queryable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/ResourceFactory.php b/library/Icinga/Data/ResourceFactory.php
index 754360740..49adaab46 100644
--- a/library/Icinga/Data/ResourceFactory.php
+++ b/library/Icinga/Data/ResourceFactory.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Selectable.php b/library/Icinga/Data/Selectable.php
index 06aa4f93c..ba7f4aa7f 100644
--- a/library/Icinga/Data/Selectable.php
+++ b/library/Icinga/Data/Selectable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index e865d86fa..3b0279583 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Sortable.php b/library/Icinga/Data/Sortable.php
index f3b8d1c9b..634b1cc4d 100644
--- a/library/Icinga/Data/Sortable.php
+++ b/library/Icinga/Data/Sortable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Tree/Node.php b/library/Icinga/Data/Tree/Node.php
index b57b0fad4..a4b1ce156 100644
--- a/library/Icinga/Data/Tree/Node.php
+++ b/library/Icinga/Data/Tree/Node.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Tree;
 
diff --git a/library/Icinga/Data/Tree/NodeInterface.php b/library/Icinga/Data/Tree/NodeInterface.php
index 6953214dc..bba6aa84c 100644
--- a/library/Icinga/Data/Tree/NodeInterface.php
+++ b/library/Icinga/Data/Tree/NodeInterface.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Tree;
 
diff --git a/library/Icinga/Exception/AuthenticationException.php b/library/Icinga/Exception/AuthenticationException.php
index ebed296e4..312425003 100644
--- a/library/Icinga/Exception/AuthenticationException.php
+++ b/library/Icinga/Exception/AuthenticationException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/ConfigurationError.php b/library/Icinga/Exception/ConfigurationError.php
index aee601a62..283cb2fab 100644
--- a/library/Icinga/Exception/ConfigurationError.php
+++ b/library/Icinga/Exception/ConfigurationError.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/IcingaException.php b/library/Icinga/Exception/IcingaException.php
index 8443f9c7c..85e639b20 100644
--- a/library/Icinga/Exception/IcingaException.php
+++ b/library/Icinga/Exception/IcingaException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/InvalidPropertyException.php b/library/Icinga/Exception/InvalidPropertyException.php
index f79055f0b..ac8346c2f 100644
--- a/library/Icinga/Exception/InvalidPropertyException.php
+++ b/library/Icinga/Exception/InvalidPropertyException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/MissingParameterException.php b/library/Icinga/Exception/MissingParameterException.php
index b86ff7d8a..cd7f41433 100644
--- a/library/Icinga/Exception/MissingParameterException.php
+++ b/library/Icinga/Exception/MissingParameterException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/NotFoundError.php b/library/Icinga/Exception/NotFoundError.php
index c90b0322b..e3790ca0a 100644
--- a/library/Icinga/Exception/NotFoundError.php
+++ b/library/Icinga/Exception/NotFoundError.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/NotImplementedError.php b/library/Icinga/Exception/NotImplementedError.php
index 1d22236df..61e9249e1 100644
--- a/library/Icinga/Exception/NotImplementedError.php
+++ b/library/Icinga/Exception/NotImplementedError.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/NotReadableError.php b/library/Icinga/Exception/NotReadableError.php
index 41a7ec8fd..cb39beaee 100644
--- a/library/Icinga/Exception/NotReadableError.php
+++ b/library/Icinga/Exception/NotReadableError.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/NotWritableError.php b/library/Icinga/Exception/NotWritableError.php
index cf09d4592..14f3bd81a 100644
--- a/library/Icinga/Exception/NotWritableError.php
+++ b/library/Icinga/Exception/NotWritableError.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/ProgrammingError.php b/library/Icinga/Exception/ProgrammingError.php
index 430d1510f..3a3f0fbf0 100644
--- a/library/Icinga/Exception/ProgrammingError.php
+++ b/library/Icinga/Exception/ProgrammingError.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/QueryException.php b/library/Icinga/Exception/QueryException.php
index beab3fe53..6d6aa038d 100644
--- a/library/Icinga/Exception/QueryException.php
+++ b/library/Icinga/Exception/QueryException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/SystemPermissionException.php b/library/Icinga/Exception/SystemPermissionException.php
index 33dfe596c..8c0e772af 100644
--- a/library/Icinga/Exception/SystemPermissionException.php
+++ b/library/Icinga/Exception/SystemPermissionException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/File/Csv.php b/library/Icinga/File/Csv.php
index fb26d4c11..aead05bc2 100644
--- a/library/Icinga/File/Csv.php
+++ b/library/Icinga/File/Csv.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\File;
 
diff --git a/library/Icinga/File/FileExtensionFilterIterator.php b/library/Icinga/File/FileExtensionFilterIterator.php
index 909156749..7089d0206 100644
--- a/library/Icinga/File/FileExtensionFilterIterator.php
+++ b/library/Icinga/File/FileExtensionFilterIterator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\File;
 
diff --git a/library/Icinga/File/Ini/IniEditor.php b/library/Icinga/File/Ini/IniEditor.php
index 85d71b697..ecf4b8db9 100644
--- a/library/Icinga/File/Ini/IniEditor.php
+++ b/library/Icinga/File/Ini/IniEditor.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\File\Ini;
 
diff --git a/library/Icinga/File/Ini/IniWriter.php b/library/Icinga/File/Ini/IniWriter.php
index 21402ab74..05be71e00 100644
--- a/library/Icinga/File/Ini/IniWriter.php
+++ b/library/Icinga/File/Ini/IniWriter.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\File\Ini;
 
diff --git a/library/Icinga/File/NonEmptyFileIterator.php b/library/Icinga/File/NonEmptyFileIterator.php
index c5c7fda45..961353712 100644
--- a/library/Icinga/File/NonEmptyFileIterator.php
+++ b/library/Icinga/File/NonEmptyFileIterator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\File;
 
diff --git a/library/Icinga/File/Pdf.php b/library/Icinga/File/Pdf.php
index a372cbfdf..4fe53e139 100644
--- a/library/Icinga/File/Pdf.php
+++ b/library/Icinga/File/Pdf.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\File;
 
diff --git a/library/Icinga/Protocol/Dns.php b/library/Icinga/Protocol/Dns.php
index 950c22f44..c64c47616 100644
--- a/library/Icinga/Protocol/Dns.php
+++ b/library/Icinga/Protocol/Dns.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol;
 
diff --git a/library/Icinga/Protocol/File/Exception/FileReaderException.php b/library/Icinga/Protocol/File/Exception/FileReaderException.php
index a7db5d701..b093ecbfb 100644
--- a/library/Icinga/Protocol/File/Exception/FileReaderException.php
+++ b/library/Icinga/Protocol/File/Exception/FileReaderException.php
@@ -1,5 +1,5 @@
 <?php
-
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 namespace Icinga\Protocol\File;
 
 use Icinga\Exception\IcingaException;
diff --git a/library/Icinga/Protocol/File/FileIterator.php b/library/Icinga/Protocol/File/FileIterator.php
index 72c4e0a39..5c4ff0610 100644
--- a/library/Icinga/Protocol/File/FileIterator.php
+++ b/library/Icinga/Protocol/File/FileIterator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\File;
 
diff --git a/library/Icinga/Protocol/File/FileQuery.php b/library/Icinga/Protocol/File/FileQuery.php
index e1b5e65cf..0c70972ff 100644
--- a/library/Icinga/Protocol/File/FileQuery.php
+++ b/library/Icinga/Protocol/File/FileQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\File;
 
diff --git a/library/Icinga/Protocol/File/FileReader.php b/library/Icinga/Protocol/File/FileReader.php
index 363f8e173..ee41eef32 100644
--- a/library/Icinga/Protocol/File/FileReader.php
+++ b/library/Icinga/Protocol/File/FileReader.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\File;
 
diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index a576ab790..6d23854d0 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/Discovery.php b/library/Icinga/Protocol/Ldap/Discovery.php
index b876a5d6f..c8b28f25a 100644
--- a/library/Icinga/Protocol/Ldap/Discovery.php
+++ b/library/Icinga/Protocol/Ldap/Discovery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Ldap;
 
@@ -155,4 +154,4 @@ class Discovery {
         )));
         return new Discovery($conn);
     }
-} 
\ No newline at end of file
+}
diff --git a/library/Icinga/Protocol/Ldap/Exception.php b/library/Icinga/Protocol/Ldap/Exception.php
index 41a5b782b..f238a83c5 100644
--- a/library/Icinga/Protocol/Ldap/Exception.php
+++ b/library/Icinga/Protocol/Ldap/Exception.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/LdapUtils.php b/library/Icinga/Protocol/Ldap/LdapUtils.php
index 8232ebf67..f26c94922 100644
--- a/library/Icinga/Protocol/Ldap/LdapUtils.php
+++ b/library/Icinga/Protocol/Ldap/LdapUtils.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/Node.php b/library/Icinga/Protocol/Ldap/Node.php
index 8e9570d25..37d4d241c 100644
--- a/library/Icinga/Protocol/Ldap/Node.php
+++ b/library/Icinga/Protocol/Ldap/Node.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/Query.php b/library/Icinga/Protocol/Ldap/Query.php
index c6f0d6fa1..41882f682 100644
--- a/library/Icinga/Protocol/Ldap/Query.php
+++ b/library/Icinga/Protocol/Ldap/Query.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/Root.php b/library/Icinga/Protocol/Ldap/Root.php
index 56abb4175..2ae2329ae 100644
--- a/library/Icinga/Protocol/Ldap/Root.php
+++ b/library/Icinga/Protocol/Ldap/Root.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Livestatus/Connection.php b/library/Icinga/Protocol/Livestatus/Connection.php
index b2340eeec..3754afb39 100644
--- a/library/Icinga/Protocol/Livestatus/Connection.php
+++ b/library/Icinga/Protocol/Livestatus/Connection.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Livestatus;
 
@@ -201,7 +200,7 @@ class Connection
             if ($filter !== null && ! $filter->matches($res)) continue;
             $result[] = $res;
         }
-        
+
         if ($query->hasOrder()) {
             usort($result, array($query, 'compare'));
         }
diff --git a/library/Icinga/Protocol/Livestatus/Query.php b/library/Icinga/Protocol/Livestatus/Query.php
index a421c7e71..94380dfa6 100644
--- a/library/Icinga/Protocol/Livestatus/Query.php
+++ b/library/Icinga/Protocol/Livestatus/Query.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Livestatus;
 
@@ -76,7 +75,7 @@ class Query extends SimpleQuery
     {
         // $row -> raw SplArray
         // $res -> object
-        // $cv  -> 
+        // $cv  ->
         // $result -> object to be returned
         $result = (object) array();
         $res = $this->withHeaders($row);
@@ -142,7 +141,7 @@ class Query extends SimpleQuery
             }
         }
 
-     
+
         return $result;
     }
 
@@ -313,7 +312,7 @@ class Query extends SimpleQuery
            } elseif (is_array($col)) {
                foreach ($col as $k) {
                    $columns[$k] = true;
-               }    
+               }
            } else {
                $columns[$col] = true;
            }
diff --git a/library/Icinga/Protocol/Livestatus/ResponseRow.php b/library/Icinga/Protocol/Livestatus/ResponseRow.php
index d4b0fd7cb..9cb67ccf3 100644
--- a/library/Icinga/Protocol/Livestatus/ResponseRow.php
+++ b/library/Icinga/Protocol/Livestatus/ResponseRow.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Livestatus;
 
diff --git a/library/Icinga/Protocol/Nrpe/Connection.php b/library/Icinga/Protocol/Nrpe/Connection.php
index 84a754e91..167d710e6 100644
--- a/library/Icinga/Protocol/Nrpe/Connection.php
+++ b/library/Icinga/Protocol/Nrpe/Connection.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Nrpe;
 
diff --git a/library/Icinga/Protocol/Nrpe/Packet.php b/library/Icinga/Protocol/Nrpe/Packet.php
index 0e722dbff..c7f1e8532 100644
--- a/library/Icinga/Protocol/Nrpe/Packet.php
+++ b/library/Icinga/Protocol/Nrpe/Packet.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Nrpe;
 
diff --git a/library/Icinga/Security/SecurityException.php b/library/Icinga/Security/SecurityException.php
index 168d4a9be..db9afea14 100644
--- a/library/Icinga/Security/SecurityException.php
+++ b/library/Icinga/Security/SecurityException.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Security;
 
diff --git a/library/Icinga/Test/BaseTestCase.php b/library/Icinga/Test/BaseTestCase.php
index c70bc5cd9..94018826f 100644
--- a/library/Icinga/Test/BaseTestCase.php
+++ b/library/Icinga/Test/BaseTestCase.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace {
 
diff --git a/library/Icinga/Test/DbTest.php b/library/Icinga/Test/DbTest.php
index cf6887285..f51cdb2f4 100644
--- a/library/Icinga/Test/DbTest.php
+++ b/library/Icinga/Test/DbTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Test;
 
diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index 54b3e7632..a56bd017c 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga;
 
diff --git a/library/Icinga/User/Preferences.php b/library/Icinga/User/Preferences.php
index 364112a9e..49732fea0 100644
--- a/library/Icinga/User/Preferences.php
+++ b/library/Icinga/User/Preferences.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\User;
 
diff --git a/library/Icinga/User/Preferences/PreferencesStore.php b/library/Icinga/User/Preferences/PreferencesStore.php
index 11454a2f8..4fc77003b 100644
--- a/library/Icinga/User/Preferences/PreferencesStore.php
+++ b/library/Icinga/User/Preferences/PreferencesStore.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\User\Preferences;
 
diff --git a/library/Icinga/User/Preferences/Store/DbStore.php b/library/Icinga/User/Preferences/Store/DbStore.php
index 4d7b10584..e5af3f5ba 100644
--- a/library/Icinga/User/Preferences/Store/DbStore.php
+++ b/library/Icinga/User/Preferences/Store/DbStore.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\User\Preferences\Store;
 
diff --git a/library/Icinga/User/Preferences/Store/IniStore.php b/library/Icinga/User/Preferences/Store/IniStore.php
index 1a096ea7b..b65ce3cd5 100644
--- a/library/Icinga/User/Preferences/Store/IniStore.php
+++ b/library/Icinga/User/Preferences/Store/IniStore.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\User\Preferences\Store;
 
diff --git a/library/Icinga/Util/Color.php b/library/Icinga/Util/Color.php
index 8058f0152..a403fe11a 100644
--- a/library/Icinga/Util/Color.php
+++ b/library/Icinga/Util/Color.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/ConfigAwareFactory.php b/library/Icinga/Util/ConfigAwareFactory.php
index 4a40c4200..01512904a 100644
--- a/library/Icinga/Util/ConfigAwareFactory.php
+++ b/library/Icinga/Util/ConfigAwareFactory.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/DateTimeFactory.php b/library/Icinga/Util/DateTimeFactory.php
index 4a482dc0a..2f63fd0f4 100644
--- a/library/Icinga/Util/DateTimeFactory.php
+++ b/library/Icinga/Util/DateTimeFactory.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/Dimension.php b/library/Icinga/Util/Dimension.php
index 2f367483b..44d1a58a4 100644
--- a/library/Icinga/Util/Dimension.php
+++ b/library/Icinga/Util/Dimension.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/EnumeratingFilterIterator.php b/library/Icinga/Util/EnumeratingFilterIterator.php
index 44ef9b0c8..377af1905 100644
--- a/library/Icinga/Util/EnumeratingFilterIterator.php
+++ b/library/Icinga/Util/EnumeratingFilterIterator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/File.php b/library/Icinga/Util/File.php
index 99421b33d..6e4e5d363 100644
--- a/library/Icinga/Util/File.php
+++ b/library/Icinga/Util/File.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/Format.php b/library/Icinga/Util/Format.php
index 0c69fbde4..8cc9c42d7 100644
--- a/library/Icinga/Util/Format.php
+++ b/library/Icinga/Util/Format.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/String.php b/library/Icinga/Util/String.php
index 69fb26927..b47622331 100644
--- a/library/Icinga/Util/String.php
+++ b/library/Icinga/Util/String.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/TimezoneDetect.php b/library/Icinga/Util/TimezoneDetect.php
index 084c3f8e7..b327d6e95 100644
--- a/library/Icinga/Util/TimezoneDetect.php
+++ b/library/Icinga/Util/TimezoneDetect.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/Translator.php b/library/Icinga/Util/Translator.php
index 87d9e4c88..1b11ca005 100644
--- a/library/Icinga/Util/Translator.php
+++ b/library/Icinga/Util/Translator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index 111ee244c..289dd94a9 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 87d293be6..6503e2ff7 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Controller;
 
diff --git a/library/Icinga/Web/Controller/BasePreferenceController.php b/library/Icinga/Web/Controller/BasePreferenceController.php
index f7d45aa5f..19ad8acb8 100644
--- a/library/Icinga/Web/Controller/BasePreferenceController.php
+++ b/library/Icinga/Web/Controller/BasePreferenceController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Controller;
 
diff --git a/library/Icinga/Web/Controller/ControllerTabCollector.php b/library/Icinga/Web/Controller/ControllerTabCollector.php
index 2078d80b2..c1922dcf3 100644
--- a/library/Icinga/Web/Controller/ControllerTabCollector.php
+++ b/library/Icinga/Web/Controller/ControllerTabCollector.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Controller;
 
diff --git a/library/Icinga/Web/Controller/ModuleActionController.php b/library/Icinga/Web/Controller/ModuleActionController.php
index 0f540c2a0..15fd32a07 100644
--- a/library/Icinga/Web/Controller/ModuleActionController.php
+++ b/library/Icinga/Web/Controller/ModuleActionController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Controller;
 
diff --git a/library/Icinga/Web/FileCache.php b/library/Icinga/Web/FileCache.php
index 16c89a2a4..a3b8381c4 100644
--- a/library/Icinga/Web/FileCache.php
+++ b/library/Icinga/Web/FileCache.php
@@ -1,5 +1,5 @@
 <?php
-
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 namespace Icinga\Web;
 
 class FileCache
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index daa6dcf40..88e578fd5 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Form/Decorator/ConditionalHidden.php b/library/Icinga/Web/Form/Decorator/ConditionalHidden.php
index c24f637ba..8911c39b4 100644
--- a/library/Icinga/Web/Form/Decorator/ConditionalHidden.php
+++ b/library/Icinga/Web/Form/Decorator/ConditionalHidden.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Decorator;
 
diff --git a/library/Icinga/Web/Form/Decorator/ElementDoubler.php b/library/Icinga/Web/Form/Decorator/ElementDoubler.php
index 8bedf9492..200880e6d 100644
--- a/library/Icinga/Web/Form/Decorator/ElementDoubler.php
+++ b/library/Icinga/Web/Form/Decorator/ElementDoubler.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Decorator;
 
diff --git a/library/Icinga/Web/Form/Decorator/NoScriptApply.php b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
index 509c3531e..49f6afa6b 100644
--- a/library/Icinga/Web/Form/Decorator/NoScriptApply.php
+++ b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Decorator;
 
diff --git a/library/Icinga/Web/Form/Element/Button.php b/library/Icinga/Web/Form/Element/Button.php
index 1c5499373..d29b1f529 100644
--- a/library/Icinga/Web/Form/Element/Button.php
+++ b/library/Icinga/Web/Form/Element/Button.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php b/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php
index e9bc37edd..0b79a8cb5 100644
--- a/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php
+++ b/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/DateTimePicker.php b/library/Icinga/Web/Form/Element/DateTimePicker.php
index 728262827..2f1eb3da4 100644
--- a/library/Icinga/Web/Form/Element/DateTimePicker.php
+++ b/library/Icinga/Web/Form/Element/DateTimePicker.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/Note.php b/library/Icinga/Web/Form/Element/Note.php
index 37bc127e9..8a96d9602 100644
--- a/library/Icinga/Web/Form/Element/Note.php
+++ b/library/Icinga/Web/Form/Element/Note.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/Number.php b/library/Icinga/Web/Form/Element/Number.php
index 02f0aaad3..b98c3736a 100644
--- a/library/Icinga/Web/Form/Element/Number.php
+++ b/library/Icinga/Web/Form/Element/Number.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/TriStateCheckbox.php b/library/Icinga/Web/Form/Element/TriStateCheckbox.php
index 45763880d..61a29c172 100644
--- a/library/Icinga/Web/Form/Element/TriStateCheckbox.php
+++ b/library/Icinga/Web/Form/Element/TriStateCheckbox.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/FormElement.php b/library/Icinga/Web/Form/FormElement.php
index 690be1acf..06b08bb02 100644
--- a/library/Icinga/Web/Form/FormElement.php
+++ b/library/Icinga/Web/Form/FormElement.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form;
 
diff --git a/library/Icinga/Web/Form/InvalidCSRFTokenException.php b/library/Icinga/Web/Form/InvalidCSRFTokenException.php
index 4e1ae8ba7..ac18db77e 100644
--- a/library/Icinga/Web/Form/InvalidCSRFTokenException.php
+++ b/library/Icinga/Web/Form/InvalidCSRFTokenException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form;
 
diff --git a/library/Icinga/Web/Form/Validator/DateFormatValidator.php b/library/Icinga/Web/Form/Validator/DateFormatValidator.php
index b11629cbf..65715b88b 100644
--- a/library/Icinga/Web/Form/Validator/DateFormatValidator.php
+++ b/library/Icinga/Web/Form/Validator/DateFormatValidator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/DateTimeValidator.php b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
index 6b59d5263..e85544c06 100644
--- a/library/Icinga/Web/Form/Validator/DateTimeValidator.php
+++ b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/ReadablePathValidator.php b/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
index 4060f6ecd..a0fe0c437 100644
--- a/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
+++ b/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/TimeFormatValidator.php b/library/Icinga/Web/Form/Validator/TimeFormatValidator.php
index a02581cfa..f43a42922 100644
--- a/library/Icinga/Web/Form/Validator/TimeFormatValidator.php
+++ b/library/Icinga/Web/Form/Validator/TimeFormatValidator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/TriStateValidator.php b/library/Icinga/Web/Form/Validator/TriStateValidator.php
index e51e00e21..27f754033 100644
--- a/library/Icinga/Web/Form/Validator/TriStateValidator.php
+++ b/library/Icinga/Web/Form/Validator/TriStateValidator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/WritablePathValidator.php b/library/Icinga/Web/Form/Validator/WritablePathValidator.php
index 239ab77c8..c7b7ab0b5 100644
--- a/library/Icinga/Web/Form/Validator/WritablePathValidator.php
+++ b/library/Icinga/Web/Form/Validator/WritablePathValidator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Hook.php b/library/Icinga/Web/Hook.php
index 7ace738d7..b339ce063 100644
--- a/library/Icinga/Web/Hook.php
+++ b/library/Icinga/Web/Hook.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Hook/GrapherHook.php b/library/Icinga/Web/Hook/GrapherHook.php
index a48c50ed6..e1490d5bb 100644
--- a/library/Icinga/Web/Hook/GrapherHook.php
+++ b/library/Icinga/Web/Hook/GrapherHook.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Hook;
 
diff --git a/library/Icinga/Web/Hook/TicketHook.php b/library/Icinga/Web/Hook/TicketHook.php
index bb9a129b4..4481f2c8e 100644
--- a/library/Icinga/Web/Hook/TicketHook.php
+++ b/library/Icinga/Web/Hook/TicketHook.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Hook;
 
diff --git a/library/Icinga/Web/Hook/WebBaseHook.php b/library/Icinga/Web/Hook/WebBaseHook.php
index a901787bb..f151d9c9c 100644
--- a/library/Icinga/Web/Hook/WebBaseHook.php
+++ b/library/Icinga/Web/Hook/WebBaseHook.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Hook;
 
@@ -48,4 +47,4 @@ class WebBaseHook
 
         return $this->view;
     }
-} 
\ No newline at end of file
+}
diff --git a/library/Icinga/Web/JavaScript.php b/library/Icinga/Web/JavaScript.php
index 9fa687042..a8913d3e7 100644
--- a/library/Icinga/Web/JavaScript.php
+++ b/library/Icinga/Web/JavaScript.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/LessCompiler.php b/library/Icinga/Web/LessCompiler.php
index 261790579..347ad8d6f 100644
--- a/library/Icinga/Web/LessCompiler.php
+++ b/library/Icinga/Web/LessCompiler.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index f0279ea9c..38cbba967 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php b/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
index 659709868..0a0f707c2 100644
--- a/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/MenuItemRenderer.php b/library/Icinga/Web/Menu/MenuItemRenderer.php
index da09d7808..6f13f991e 100644
--- a/library/Icinga/Web/Menu/MenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/MenuItemRenderer.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php b/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php
index 3bccb9327..2d89029b0 100644
--- a/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php b/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php
index 58689547f..3022f2c64 100644
--- a/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php b/library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php
index 10a75c00f..dfb43af08 100644
--- a/library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php b/library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php
index 8a59e9baa..9d180ec70 100644
--- a/library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/MenuRenderer.php b/library/Icinga/Web/MenuRenderer.php
index 8502e5215..224a5c525 100644
--- a/library/Icinga/Web/MenuRenderer.php
+++ b/library/Icinga/Web/MenuRenderer.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Notification.php b/library/Icinga/Web/Notification.php
index b046476b3..b34137651 100644
--- a/library/Icinga/Web/Notification.php
+++ b/library/Icinga/Web/Notification.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php b/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
index 03f8f1cc5..5a3edef0a 100644
--- a/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
+++ b/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Paginator\Adapter;
 
diff --git a/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php b/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
index d861dbe29..f0581c42c 100644
--- a/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
+++ b/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * @see Zend_Paginator_ScrollingStyle_Interface
@@ -41,7 +40,7 @@ class Icinga_Web_Paginator_ScrollingStyle_SlidingWithBorder implements Zend_Pagi
                 $range[$i] = $i;
             }
             if ($pageNumber < 6 ) {
-                // We are on page 1-5 from  
+                // We are on page 1-5 from
                 for ($i = 1; $i <= 7; $i++) {
                     $range[$i] = $i;
                 }
diff --git a/library/Icinga/Web/Request.php b/library/Icinga/Web/Request.php
index ae957f6a9..dbc3dcb34 100644
--- a/library/Icinga/Web/Request.php
+++ b/library/Icinga/Web/Request.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Response.php b/library/Icinga/Web/Response.php
index d0d8912e6..6e48b4a6b 100644
--- a/library/Icinga/Web/Response.php
+++ b/library/Icinga/Web/Response.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Session.php b/library/Icinga/Web/Session.php
index 4723903e9..63606bbef 100644
--- a/library/Icinga/Web/Session.php
+++ b/library/Icinga/Web/Session.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Session/PhpSession.php b/library/Icinga/Web/Session/PhpSession.php
index fa545fd8d..32feced21 100644
--- a/library/Icinga/Web/Session/PhpSession.php
+++ b/library/Icinga/Web/Session/PhpSession.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Session;
 
diff --git a/library/Icinga/Web/Session/Session.php b/library/Icinga/Web/Session/Session.php
index ab73dcac7..a89677963 100644
--- a/library/Icinga/Web/Session/Session.php
+++ b/library/Icinga/Web/Session/Session.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Session;
 
diff --git a/library/Icinga/Web/Session/SessionNamespace.php b/library/Icinga/Web/Session/SessionNamespace.php
index c72d69c36..83bc4d61f 100644
--- a/library/Icinga/Web/Session/SessionNamespace.php
+++ b/library/Icinga/Web/Session/SessionNamespace.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Session;
 
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index 9e6bd0bed..1fa450e42 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Url.php b/library/Icinga/Web/Url.php
index a3af4a338..219a081fe 100644
--- a/library/Icinga/Web/Url.php
+++ b/library/Icinga/Web/Url.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/UrlParams.php b/library/Icinga/Web/UrlParams.php
index 1c839960d..3cfd3c1dd 100644
--- a/library/Icinga/Web/UrlParams.php
+++ b/library/Icinga/Web/UrlParams.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
@@ -243,7 +242,7 @@ class UrlParams
         );
         $this->reIndexAll();
 
-        return $this;        
+        return $this;
     }
 
     public function remove($param)
diff --git a/library/Icinga/Web/View.php b/library/Icinga/Web/View.php
index 2122662ac..fe232af86 100644
--- a/library/Icinga/Web/View.php
+++ b/library/Icinga/Web/View.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/View/DateTimeRenderer.php b/library/Icinga/Web/View/DateTimeRenderer.php
index 639befb7f..4c982fa8a 100644
--- a/library/Icinga/Web/View/DateTimeRenderer.php
+++ b/library/Icinga/Web/View/DateTimeRenderer.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\View;
 
diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php
index a203f2fb3..9cd680f4e 100644
--- a/library/Icinga/Web/View/helpers/format.php
+++ b/library/Icinga/Web/View/helpers/format.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\View;
 
diff --git a/library/Icinga/Web/View/helpers/generic.php b/library/Icinga/Web/View/helpers/generic.php
index 8ab934e0e..caae5e34a 100644
--- a/library/Icinga/Web/View/helpers/generic.php
+++ b/library/Icinga/Web/View/helpers/generic.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\View;
 
diff --git a/library/Icinga/Web/View/helpers/url.php b/library/Icinga/Web/View/helpers/url.php
index 901e68803..fd8282889 100644
--- a/library/Icinga/Web/View/helpers/url.php
+++ b/library/Icinga/Web/View/helpers/url.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\View;
 
@@ -63,7 +62,7 @@ $this->addHelperFunction('icon', function ($img, $title = null, array $propertie
         $properties['alt'] = $title;
         $properties['title'] = $title;
     }
- 
+
     if ($class !== null) {
         if (isset($props['class'])) {
             $properties['class'] .= ' ' . $class;
diff --git a/library/Icinga/Web/ViewStream.php b/library/Icinga/Web/ViewStream.php
index e5dacd879..6abf49ac3 100644
--- a/library/Icinga/Web/ViewStream.php
+++ b/library/Icinga/Web/ViewStream.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Widget.php b/library/Icinga/Web/Widget.php
index b181a49ea..facde79e8 100644
--- a/library/Icinga/Web/Widget.php
+++ b/library/Icinga/Web/Widget.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Widget/AbstractWidget.php b/library/Icinga/Web/Widget/AbstractWidget.php
index 5b9d8876b..1984e28e1 100644
--- a/library/Icinga/Web/Widget/AbstractWidget.php
+++ b/library/Icinga/Web/Widget/AbstractWidget.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
index 56de318e8..4f6f17ea8 100644
--- a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
+++ b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Chart;
 
diff --git a/library/Icinga/Web/Widget/Chart/InlinePie.php b/library/Icinga/Web/Widget/Chart/InlinePie.php
index 04e3e7318..310a88b3c 100644
--- a/library/Icinga/Web/Widget/Chart/InlinePie.php
+++ b/library/Icinga/Web/Widget/Chart/InlinePie.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Chart;
 
diff --git a/library/Icinga/Web/Widget/Dashboard.php b/library/Icinga/Web/Widget/Dashboard.php
index bb62cc8f9..b19ccb374 100644
--- a/library/Icinga/Web/Widget/Dashboard.php
+++ b/library/Icinga/Web/Widget/Dashboard.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Dashboard/Dashlet.php b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
index 1b7a7ef95..6317532e8 100644
--- a/library/Icinga/Web/Widget/Dashboard/Dashlet.php
+++ b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Dashboard;
 
diff --git a/library/Icinga/Web/Widget/Dashboard/Pane.php b/library/Icinga/Web/Widget/Dashboard/Pane.php
index 52d9fa524..302306a9b 100644
--- a/library/Icinga/Web/Widget/Dashboard/Pane.php
+++ b/library/Icinga/Web/Widget/Dashboard/Pane.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Dashboard;
 
diff --git a/library/Icinga/Web/Widget/Dashboard/UserWidget.php b/library/Icinga/Web/Widget/Dashboard/UserWidget.php
index 0b171964e..4362d0f12 100644
--- a/library/Icinga/Web/Widget/Dashboard/UserWidget.php
+++ b/library/Icinga/Web/Widget/Dashboard/UserWidget.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Dashboard;
 
diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index e694a32f2..c7a240da8 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
@@ -69,7 +68,7 @@ class FilterEditor extends AbstractWidget
     public function getFilter()
     {
         if ($this->filter === null) {
-            $this->filter = Filter::fromQueryString((string) $this->url()->getParams()); 
+            $this->filter = Filter::fromQueryString((string) $this->url()->getParams());
         }
         return $this->filter;
     }
@@ -404,7 +403,7 @@ class FilterEditor extends AbstractWidget
     protected function renderFilterExpression(FilterExpression $filter)
     {
         if ($this->addTo && $this->addTo === $filter->getId()) {
-            return 
+            return
                    preg_replace(
             '/ class="autosubmit"/',
             ' class="autofocus"',
@@ -544,7 +543,7 @@ class FilterEditor extends AbstractWidget
             $cols[$active] = str_replace('_', ' ', ucfirst(ltrim($active, '_')));
         }
 
-        return $this->select($this->elementId('column', $filter), $cols, $active); 
+        return $this->select($this->elementId('column', $filter), $cols, $active);
     }
 
     protected function applyChanges($changes)
diff --git a/library/Icinga/Web/Widget/FilterWidget.php b/library/Icinga/Web/Widget/FilterWidget.php
index cf47ef581..bd79c25e0 100644
--- a/library/Icinga/Web/Widget/FilterWidget.php
+++ b/library/Icinga/Web/Widget/FilterWidget.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
@@ -83,7 +82,7 @@ class FilterWidget extends AbstractWidget
 
 
         // $html .= $this->renderFilter($this->filter);
-        
+
         $editorUrl = clone $url;
         $editorUrl->setParam('modifyFilter', true);
         if  ($this->filter->isEmpty()) {
diff --git a/library/Icinga/Web/Widget/Limiter.php b/library/Icinga/Web/Widget/Limiter.php
index 5afa7e4b8..acc66c885 100644
--- a/library/Icinga/Web/Widget/Limiter.php
+++ b/library/Icinga/Web/Widget/Limiter.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/SearchDashboard.php b/library/Icinga/Web/Widget/SearchDashboard.php
index 9e02f3373..8893b6db1 100644
--- a/library/Icinga/Web/Widget/SearchDashboard.php
+++ b/library/Icinga/Web/Widget/SearchDashboard.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 42e7110cc..6414d37c2 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index 7eb5abeb1..914d91887 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Tabextension/BasketAction.php b/library/Icinga/Web/Widget/Tabextension/BasketAction.php
index 34514f834..1e745edda 100644
--- a/library/Icinga/Web/Widget/Tabextension/BasketAction.php
+++ b/library/Icinga/Web/Widget/Tabextension/BasketAction.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Tabextension;
 
diff --git a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
index 280a9b142..6c5031d42 100644
--- a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
+++ b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Tabextension;
 
diff --git a/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php b/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
index 496fe3495..39343efe9 100644
--- a/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
+++ b/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Tabextension;
 
@@ -37,4 +36,4 @@ class DashboardSettings implements Tabextension
             )
         );
     }
-}
\ No newline at end of file
+}
diff --git a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
index 0b533fd82..d4205ccf2 100644
--- a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
+++ b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Tabextension;
 
diff --git a/library/Icinga/Web/Widget/Tabextension/Tabextension.php b/library/Icinga/Web/Widget/Tabextension/Tabextension.php
index 881668d2e..ed88f772c 100644
--- a/library/Icinga/Web/Widget/Tabextension/Tabextension.php
+++ b/library/Icinga/Web/Widget/Tabextension/Tabextension.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Tabextension;
 
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index c6a4bd31b..939782ded 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Widget.php b/library/Icinga/Web/Widget/Widget.php
index 3eda668ce..99c122756 100644
--- a/library/Icinga/Web/Widget/Widget.php
+++ b/library/Icinga/Web/Widget/Widget.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Window.php b/library/Icinga/Web/Window.php
index 3a541d3bb..f5658850c 100644
--- a/library/Icinga/Web/Window.php
+++ b/library/Icinga/Web/Window.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Wizard.php b/library/Icinga/Web/Wizard.php
index 42dea5c1c..026b49541 100644
--- a/library/Icinga/Web/Wizard.php
+++ b/library/Icinga/Web/Wizard.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/modules/doc/application/controllers/IcingawebController.php b/modules/doc/application/controllers/IcingawebController.php
index 60c5da5ee..a12d8cd8b 100644
--- a/modules/doc/application/controllers/IcingawebController.php
+++ b/modules/doc/application/controllers/IcingawebController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use \Zend_Controller_Action_Exception;
 use Icinga\Application\Icinga;
diff --git a/modules/doc/application/controllers/IndexController.php b/modules/doc/application/controllers/IndexController.php
index 63b5e8cdf..f675d6067 100644
--- a/modules/doc/application/controllers/IndexController.php
+++ b/modules/doc/application/controllers/IndexController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Module\Doc\DocController;
 
diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php
index a4d14cf61..8a7b96fed 100644
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use \Zend_Controller_Action_Exception;
 use Icinga\Application\Icinga;
diff --git a/modules/doc/application/controllers/StyleController.php b/modules/doc/application/controllers/StyleController.php
index d5440c95a..e06835420 100644
--- a/modules/doc/application/controllers/StyleController.php
+++ b/modules/doc/application/controllers/StyleController.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Application\Icinga;
 use Icinga\Web\Controller;
diff --git a/modules/doc/configuration.php b/modules/doc/configuration.php
index 6e924e964..c377eb3c4 100644
--- a/modules/doc/configuration.php
+++ b/modules/doc/configuration.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /** @type $this \Icinga\Application\Modules\Module */
 
diff --git a/modules/doc/library/Doc/DocController.php b/modules/doc/library/Doc/DocController.php
index 0d12f58df..613c3ce56 100644
--- a/modules/doc/library/Doc/DocController.php
+++ b/modules/doc/library/Doc/DocController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/DocIterator.php b/modules/doc/library/Doc/DocIterator.php
index 3045b6309..0268e2054 100644
--- a/modules/doc/library/Doc/DocIterator.php
+++ b/modules/doc/library/Doc/DocIterator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/DocParser.php b/modules/doc/library/Doc/DocParser.php
index 6cfeca418..d9b35c087 100644
--- a/modules/doc/library/Doc/DocParser.php
+++ b/modules/doc/library/Doc/DocParser.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/DocTree.php b/modules/doc/library/Doc/DocTree.php
index 1b112649c..5153c8807 100644
--- a/modules/doc/library/Doc/DocTree.php
+++ b/modules/doc/library/Doc/DocTree.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/Exception/ChapterNotFoundException.php b/modules/doc/library/Doc/Exception/ChapterNotFoundException.php
index cd048a162..e754a2f82 100644
--- a/modules/doc/library/Doc/Exception/ChapterNotFoundException.php
+++ b/modules/doc/library/Doc/Exception/ChapterNotFoundException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc\Exception;
 
diff --git a/modules/doc/library/Doc/Exception/DocEmptyException.php b/modules/doc/library/Doc/Exception/DocEmptyException.php
index 2869e2678..ce5093b25 100644
--- a/modules/doc/library/Doc/Exception/DocEmptyException.php
+++ b/modules/doc/library/Doc/Exception/DocEmptyException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc\Exception;
 
diff --git a/modules/doc/library/Doc/Exception/DocException.php b/modules/doc/library/Doc/Exception/DocException.php
index 374ea3e01..542f3b7a3 100644
--- a/modules/doc/library/Doc/Exception/DocException.php
+++ b/modules/doc/library/Doc/Exception/DocException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc\Exception;
 
diff --git a/modules/doc/library/Doc/Renderer.php b/modules/doc/library/Doc/Renderer.php
index 0aebb89b9..5bb33298e 100644
--- a/modules/doc/library/Doc/Renderer.php
+++ b/modules/doc/library/Doc/Renderer.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/Section.php b/modules/doc/library/Doc/Section.php
index 5cf3d61e2..77f7a94a8 100644
--- a/modules/doc/library/Doc/Section.php
+++ b/modules/doc/library/Doc/Section.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/SectionFilterIterator.php b/modules/doc/library/Doc/SectionFilterIterator.php
index e20d80359..a12aa56ea 100644
--- a/modules/doc/library/Doc/SectionFilterIterator.php
+++ b/modules/doc/library/Doc/SectionFilterIterator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/SectionRenderer.php b/modules/doc/library/Doc/SectionRenderer.php
index f923783f6..70a53dd9c 100644
--- a/modules/doc/library/Doc/SectionRenderer.php
+++ b/modules/doc/library/Doc/SectionRenderer.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/TocRenderer.php b/modules/doc/library/Doc/TocRenderer.php
index 4061e80e3..d5f022229 100644
--- a/modules/doc/library/Doc/TocRenderer.php
+++ b/modules/doc/library/Doc/TocRenderer.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/public/css/module.less b/modules/doc/public/css/module.less
index a029517de..876328ff9 100644
--- a/modules/doc/public/css/module.less
+++ b/modules/doc/public/css/module.less
@@ -1,3 +1,5 @@
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+
 div.chapter {
   padding-left: 5px;
 }
diff --git a/modules/doc/run.php b/modules/doc/run.php
index 31aff8ff0..9854e0afc 100644
--- a/modules/doc/run.php
+++ b/modules/doc/run.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use \Zend_Controller_Router_Route;
 use Icinga\Application\Icinga;
diff --git a/modules/monitoring/application/clicommands/ConferenceCommand.php b/modules/monitoring/application/clicommands/ConferenceCommand.php
index 7c659e8fb..6db032a17 100644
--- a/modules/monitoring/application/clicommands/ConferenceCommand.php
+++ b/modules/monitoring/application/clicommands/ConferenceCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Clicommands;
 
diff --git a/modules/monitoring/application/clicommands/ListCommand.php b/modules/monitoring/application/clicommands/ListCommand.php
index a4f1d05f1..c962ceb34 100644
--- a/modules/monitoring/application/clicommands/ListCommand.php
+++ b/modules/monitoring/application/clicommands/ListCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Clicommands;
 
diff --git a/modules/monitoring/application/clicommands/NrpeCommand.php b/modules/monitoring/application/clicommands/NrpeCommand.php
index 69ee50d9b..677fd68d0 100644
--- a/modules/monitoring/application/clicommands/NrpeCommand.php
+++ b/modules/monitoring/application/clicommands/NrpeCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Clicommands;
 
diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index d9cc798a7..4d711ade9 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Chart\GridChart;
 use Icinga\Chart\Unit\LinearUnit;
diff --git a/modules/monitoring/application/controllers/ChartController.php b/modules/monitoring/application/controllers/ChartController.php
index 757329bfe..005424209 100644
--- a/modules/monitoring/application/controllers/ChartController.php
+++ b/modules/monitoring/application/controllers/ChartController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Chart\GridChart;
diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index ed5d57570..5bd74cd45 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Web\Notification;
 use Icinga\Data\ResourceFactory;
diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index 150f9ae1a..deee63d49 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 3235a7012..862ba529f 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Data\Filter\Filter;
 use Icinga\Module\Monitoring\Controller;
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index faaea713a..3cc2c3549 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Backend;
diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php
index 5530f9c52..ab45cad96 100644
--- a/modules/monitoring/application/controllers/ProcessController.php
+++ b/modules/monitoring/application/controllers/ProcessController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Forms\Command\Instance\DisableNotificationsExpireCommandForm;
diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index 4e4e67402..2d5728104 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 467f04bec..600979eb6 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Data\Filter\Filter;
 use Icinga\Module\Monitoring\Controller;
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 0b7a2f897..173dd4e75 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Application\Benchmark;
 use Icinga\Module\Monitoring\Object\MonitoredObject;
diff --git a/modules/monitoring/application/controllers/TacticalController.php b/modules/monitoring/application/controllers/TacticalController.php
index a48e053ca..1318ada9f 100644
--- a/modules/monitoring/application/controllers/TacticalController.php
+++ b/modules/monitoring/application/controllers/TacticalController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Module\Monitoring\Controller as MonitoringController;
 use Icinga\Web\Url;
diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php
index e21c580ad..012a59c09 100644
--- a/modules/monitoring/application/controllers/TimelineController.php
+++ b/modules/monitoring/application/controllers/TimelineController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use \DateTime;
 use \DateInterval;
diff --git a/modules/monitoring/application/forms/Command/CommandForm.php b/modules/monitoring/application/forms/Command/CommandForm.php
index fd67e140d..05318c0e4 100644
--- a/modules/monitoring/application/forms/Command/CommandForm.php
+++ b/modules/monitoring/application/forms/Command/CommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command;
 
diff --git a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
index 21d926b58..c6e3e5225 100644
--- a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Instance;
 
diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index 60486307e..65b958f8b 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Instance;
 
diff --git a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
index df3731837..b5adac042 100644
--- a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
index e7f7e91f9..6491077d1 100644
--- a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
index 1054aae05..2b873b092 100644
--- a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
index 0f7858ad9..88f28e676 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
index 43ca52b05..348acc8f4 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php b/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php
index 1dbf07840..331ec8931 100644
--- a/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
index 44e248956..5b1f3236b 100644
--- a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php b/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php
index 189261c94..47fe6d1fd 100644
--- a/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
index 949ec33e1..324e79536 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
index f84069a9a..6b304b5ff 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
index 4921f54ff..c17fe588a 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
index 4f66898f6..d01268988 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
index d3cc63ecf..d4f7a1735 100644
--- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index ca45c068b..969049642 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Config;
 
diff --git a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
index 405bac144..51e94b3fc 100644
--- a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Config\Instance;
 
diff --git a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
index 47b2a0316..367093101 100644
--- a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Config\Instance;
 
diff --git a/modules/monitoring/application/forms/Config/InstanceConfigForm.php b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
index 5618f27ee..d08a451ee 100644
--- a/modules/monitoring/application/forms/Config/InstanceConfigForm.php
+++ b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Config;
 
diff --git a/modules/monitoring/application/forms/Config/SecurityConfigForm.php b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
index b202f5938..4613d84f1 100644
--- a/modules/monitoring/application/forms/Config/SecurityConfigForm.php
+++ b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Config;
 
diff --git a/modules/monitoring/application/forms/EventOverviewForm.php b/modules/monitoring/application/forms/EventOverviewForm.php
index dc697b940..a1e95d3c0 100644
--- a/modules/monitoring/application/forms/EventOverviewForm.php
+++ b/modules/monitoring/application/forms/EventOverviewForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms;
 
diff --git a/modules/monitoring/application/forms/Setup/BackendPage.php b/modules/monitoring/application/forms/Setup/BackendPage.php
index b5ab2ffd6..ee160f978 100644
--- a/modules/monitoring/application/forms/Setup/BackendPage.php
+++ b/modules/monitoring/application/forms/Setup/BackendPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/IdoResourcePage.php b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
index c28b52e6b..cced78378 100644
--- a/modules/monitoring/application/forms/Setup/IdoResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/InstancePage.php b/modules/monitoring/application/forms/Setup/InstancePage.php
index 8f151554d..9d7b24f07 100644
--- a/modules/monitoring/application/forms/Setup/InstancePage.php
+++ b/modules/monitoring/application/forms/Setup/InstancePage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
index 245d2abcc..d010fa36f 100644
--- a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/SecurityPage.php b/modules/monitoring/application/forms/Setup/SecurityPage.php
index ba8083e50..935419250 100644
--- a/modules/monitoring/application/forms/Setup/SecurityPage.php
+++ b/modules/monitoring/application/forms/Setup/SecurityPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/WelcomePage.php b/modules/monitoring/application/forms/Setup/WelcomePage.php
index f79eb6c62..5a5a3665f 100644
--- a/modules/monitoring/application/forms/Setup/WelcomePage.php
+++ b/modules/monitoring/application/forms/Setup/WelcomePage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/StatehistoryForm.php b/modules/monitoring/application/forms/StatehistoryForm.php
index d859f5815..bfb4b608a 100644
--- a/modules/monitoring/application/forms/StatehistoryForm.php
+++ b/modules/monitoring/application/forms/StatehistoryForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms;
 
diff --git a/modules/monitoring/application/views/helpers/CheckPerformance.php b/modules/monitoring/application/views/helpers/CheckPerformance.php
index 19912d3d6..9d56e400a 100644
--- a/modules/monitoring/application/views/helpers/CheckPerformance.php
+++ b/modules/monitoring/application/views/helpers/CheckPerformance.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Convert check summary data into a simple usable stdClass
diff --git a/modules/monitoring/application/views/helpers/ContactFlags.php b/modules/monitoring/application/views/helpers/ContactFlags.php
index da2b2823a..76828ee24 100644
--- a/modules/monitoring/application/views/helpers/ContactFlags.php
+++ b/modules/monitoring/application/views/helpers/ContactFlags.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 class Zend_View_Helper_ContactFlags extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/application/views/helpers/Customvar.php b/modules/monitoring/application/views/helpers/Customvar.php
index 699c6a727..2ab663fa2 100644
--- a/modules/monitoring/application/views/helpers/Customvar.php
+++ b/modules/monitoring/application/views/helpers/Customvar.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 class Zend_View_Helper_Customvar extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/application/views/helpers/Link.php b/modules/monitoring/application/views/helpers/Link.php
index 0d8c35861..40cca5925 100644
--- a/modules/monitoring/application/views/helpers/Link.php
+++ b/modules/monitoring/application/views/helpers/Link.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Helper for generating frequently used jump links
diff --git a/modules/monitoring/application/views/helpers/MonitoringFlags.php b/modules/monitoring/application/views/helpers/MonitoringFlags.php
index db4b8dedc..c64ac48fa 100644
--- a/modules/monitoring/application/views/helpers/MonitoringFlags.php
+++ b/modules/monitoring/application/views/helpers/MonitoringFlags.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /* use Icinga\Module\Monitoring\Object\MonitoredObject; */
 
diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 4c2bee89a..e3b92510f 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Util\Format;
 use Icinga\Web\Widget\Chart\InlinePie;
diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
index e3d88b26f..90f565978 100644
--- a/modules/monitoring/application/views/helpers/PluginOutput.php
+++ b/modules/monitoring/application/views/helpers/PluginOutput.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/application/views/helpers/ResolveMacros.php b/modules/monitoring/application/views/helpers/ResolveMacros.php
index 385962a85..d95245d18 100644
--- a/modules/monitoring/application/views/helpers/ResolveMacros.php
+++ b/modules/monitoring/application/views/helpers/ResolveMacros.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use \Zend_View_Helper_Abstract;
 use Icinga\Module\Monitoring\Object\MonitoredObject;
diff --git a/modules/monitoring/application/views/helpers/RuntimeVariables.php b/modules/monitoring/application/views/helpers/RuntimeVariables.php
index 556bd43ad..21f2c7c6f 100644
--- a/modules/monitoring/application/views/helpers/RuntimeVariables.php
+++ b/modules/monitoring/application/views/helpers/RuntimeVariables.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Convert runtime summary data into a simple usable stdClass
diff --git a/modules/monitoring/application/views/helpers/SelectionToolbar.php b/modules/monitoring/application/views/helpers/SelectionToolbar.php
index 0b4254522..2905469b9 100644
--- a/modules/monitoring/application/views/helpers/SelectionToolbar.php
+++ b/modules/monitoring/application/views/helpers/SelectionToolbar.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 class Zend_View_Helper_SelectionToolbar extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index f34b4b0f5..09be0920a 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /** @type $this \Icinga\Application\Modules\Module */
 
diff --git a/modules/monitoring/library/Monitoring/Backend.php b/modules/monitoring/library/Monitoring/Backend.php
index e3672dcd5..7bea95896 100644
--- a/modules/monitoring/library/Monitoring/Backend.php
+++ b/modules/monitoring/library/Monitoring/Backend.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 // TODO: obsolete, remove once MonitoringBackend is in use everywhere
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/IdoBackend.php b/modules/monitoring/library/Monitoring/Backend/Ido/IdoBackend.php
index 17bfb9f6a..2b7fa89fa 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/IdoBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/IdoBackend.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php
index 811eb7f28..a2070f453 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommandQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommandQuery.php
index c730c078e..62e031dda 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommandQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommandQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
@@ -59,4 +58,4 @@ class CommandQuery extends IdoQuery
             array()
         );
     }
-}
\ No newline at end of file
+}
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
index a522d702e..0f78eef9e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
index 4ee17de6a..ba21e11a8 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
index e3231d932..e851fddcd 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
index 467e40fc0..3f2902e9d 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
index 346f2458a..7fb6d2dd6 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
index 04e17ddcd..63151d06c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index efc10f6a5..985f091ab 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
index f9ec831a7..cb69d3a80 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
index 01c56cd4d..775f9da86 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index 2896f9536..0b17df375 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
index 88a120db2..b853f86d9 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
index 53c1d7ed7..a59e873ed 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
index eedb2f1e9..10e5b1f7c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index 7cca01d31..b6e08b731 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index cf6968ea3..f7f612ce4 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index 3181eebbf..958840a49 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
index 4bf712f4c..1a203d232 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
index 989c2b698..c53e766ab 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php
index cf3b6ea6d..bb00883f7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php
index 479142547..5878d16be 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
index 84ad94b86..6443eab00 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
index dfa81b1ef..e22543411 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index cd7d0aef7..fc0616227 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
index 29337e65f..a941b32ed 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/LivestatusBackend.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/LivestatusBackend.php
index 12de5a9ee..cabe3dcc1 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/LivestatusBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/LivestatusBackend.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/DowntimeQuery.php
index 59f0bb24a..6394e3696 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/DowntimeQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/HostgroupQuery.php
index 0ffc821bb..79aeb7051 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/HostgroupQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/ServicegroupQuery.php
index 0587f7cea..4a65c05f1 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/ServicegroupQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
index 5a638c9ca..613ab2276 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusSummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusSummaryQuery.php
index f431a566e..7aab807b1 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusSummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusSummaryQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
@@ -13,7 +12,7 @@ class StatusSummaryQuery extends Query
 
     protected $available_columns = array(
     'service_host_name' => 'host_name',
-    
+
             'services_total'                            => 'state != 9999',
             'services_problem'                          => 'state > 0',
             'services_problem_handled'                  => 'state > 0 & (scheduled_downtime_depth > 0 | acknowledged = 1 | host_state > 0)',
@@ -50,7 +49,7 @@ if (! array_key_exists($col, $this->available_columns)) {
   throw new ProgrammingError('No such column: %s', $col);
 }
               $filter = $this->filterStringToFilter($this->available_columns[$col]);
-              
+
               //Filter::fromQueryString(str_replace(' ', '',  $this->available_columns[$col]));
               $parts[] = $this->renderFilter( $filter, 'Stats', 0, false);
           }
diff --git a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
index d165f1252..0a1baad7d 100644
--- a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend;
 
diff --git a/modules/monitoring/library/Monitoring/BackendStep.php b/modules/monitoring/library/Monitoring/BackendStep.php
index 7f9fc11cf..4df52ca3f 100644
--- a/modules/monitoring/library/Monitoring/BackendStep.php
+++ b/modules/monitoring/library/Monitoring/BackendStep.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Cli/CliUtils.php b/modules/monitoring/library/Monitoring/Cli/CliUtils.php
index 5b443c714..e1ef52691 100644
--- a/modules/monitoring/library/Monitoring/Cli/CliUtils.php
+++ b/modules/monitoring/library/Monitoring/Cli/CliUtils.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Cli;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php b/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
index 440f21770..b65ede3cd 100644
--- a/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
+++ b/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Exception;
 
diff --git a/modules/monitoring/library/Monitoring/Command/IcingaCommand.php b/modules/monitoring/library/Monitoring/Command/IcingaCommand.php
index 3b569de8e..cc1ff7614 100644
--- a/modules/monitoring/library/Monitoring/Command/IcingaCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/IcingaCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php b/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php
index 309cb9e2f..97936dfc7 100644
--- a/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Instance;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php
index 01b26a009..1aa50be1b 100644
--- a/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Instance;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php b/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php
index 4dff07c4a..7eea6d08c 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php
index a7540f4f8..e986dd4a5 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
index 850566ff9..074b134e7 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
index 67e271dbb..0387c1d63 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php
index 1c8910066..2de2bde02 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php
index 8e3155de5..eaa0184c7 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntimeCommand.php
index 89591c8fc..78753e684 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntimeCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php b/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php
index 6f9f99432..2451f4dfb 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php
index ead8f7a30..4c210ee01 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php
index ea7e31dc6..132847363 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
index fc2037146..7e041e09d 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php
index 24be3512b..78a5add50 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php
index c6cbeaa50..7d12849e4 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php
index 695c53cc6..ce912955d 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
index 651383255..d8e643fb2 100644
--- a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Renderer;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php
index f901e3850..ec40c0b16 100644
--- a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Renderer;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
index 8ed7d45eb..ea2d0d026 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
index 21b532d49..ca8de3c0e 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
index 73a2e5288..96b788021 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
index 0e447a4f3..46a9e9a55 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php
index f294e9a2e..5cce6c8d6 100644
--- a/modules/monitoring/library/Monitoring/Controller.php
+++ b/modules/monitoring/library/Monitoring/Controller.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Command.php b/modules/monitoring/library/Monitoring/DataView/Command.php
index a21c48ee0..429353ec4 100644
--- a/modules/monitoring/library/Monitoring/DataView/Command.php
+++ b/modules/monitoring/library/Monitoring/DataView/Command.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
@@ -25,4 +24,4 @@ class Command extends DataView
         );
     }
 
-} 
\ No newline at end of file
+}
diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index 4cd11e1a1..785dd802f 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Contact.php b/modules/monitoring/library/Monitoring/DataView/Contact.php
index 27639b0c6..90542db6a 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contact.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contact.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
index 7dd7a1cd4..abd94b88d 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Customvar.php b/modules/monitoring/library/Monitoring/DataView/Customvar.php
index 0a8887fde..273944bc7 100644
--- a/modules/monitoring/library/Monitoring/DataView/Customvar.php
+++ b/modules/monitoring/library/Monitoring/DataView/Customvar.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index da48f31c3..09a6cd5b8 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index 681608b17..0d4873e95 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/EventHistory.php b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
index f13815aae..f1bb18476 100644
--- a/modules/monitoring/library/Monitoring/DataView/EventHistory.php
+++ b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
index 726f1ae60..e89d2c46d 100644
--- a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
+++ b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
index a4736e47c..44c476e80 100644
--- a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index 86bff52bf..79afffaec 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroup.php b/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
index 94fc7ac56..03c1bb508 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php
index 7f6fd238f..ef6895a10 100644
--- a/modules/monitoring/library/Monitoring/DataView/Notification.php
+++ b/modules/monitoring/library/Monitoring/DataView/Notification.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Programstatus.php b/modules/monitoring/library/Monitoring/DataView/Programstatus.php
index f42858bf8..0c01122eb 100644
--- a/modules/monitoring/library/Monitoring/DataView/Programstatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/Programstatus.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php b/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php
index d9d15a517..8d5bc7cdb 100644
--- a/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php b/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php
index dbdd338c0..5fbf7ea17 100644
--- a/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php
+++ b/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index e7e2accb2..e6a2835a0 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroup.php b/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
index 00a6f7d5f..f88075d33 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/StatusSummary.php b/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
index 74574bc72..209ec8d08 100644
--- a/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/Environment.php b/modules/monitoring/library/Monitoring/Environment.php
index f9ad28654..0fb92a09b 100644
--- a/modules/monitoring/library/Monitoring/Environment.php
+++ b/modules/monitoring/library/Monitoring/Environment.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php b/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php
index 169fa2cfd..4368d8634 100644
--- a/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php
+++ b/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Module\Monitoring\Exception;
diff --git a/modules/monitoring/library/Monitoring/InstanceStep.php b/modules/monitoring/library/Monitoring/InstanceStep.php
index ab54b6548..f1c09c899 100644
--- a/modules/monitoring/library/Monitoring/InstanceStep.php
+++ b/modules/monitoring/library/Monitoring/InstanceStep.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index 68d686e21..fd7d7d42b 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 8f7df07cb..c38e68d60 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/HostList.php b/modules/monitoring/library/Monitoring/Object/HostList.php
index 2d3f57495..2bbcb985f 100644
--- a/modules/monitoring/library/Monitoring/Object/HostList.php
+++ b/modules/monitoring/library/Monitoring/Object/HostList.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 213cf47b8..68930efca 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/ObjectList.php b/modules/monitoring/library/Monitoring/Object/ObjectList.php
index 6eb1e4db3..cf45eeade 100644
--- a/modules/monitoring/library/Monitoring/Object/ObjectList.php
+++ b/modules/monitoring/library/Monitoring/Object/ObjectList.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 870ff78ba..5216fdb9c 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/ServiceList.php b/modules/monitoring/library/Monitoring/Object/ServiceList.php
index 858d04b5b..bc324d2be 100644
--- a/modules/monitoring/library/Monitoring/Object/ServiceList.php
+++ b/modules/monitoring/library/Monitoring/Object/ServiceList.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Plugin.php b/modules/monitoring/library/Monitoring/Plugin.php
index ad53f7756..3aa466341 100644
--- a/modules/monitoring/library/Monitoring/Plugin.php
+++ b/modules/monitoring/library/Monitoring/Plugin.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
index f51801192..a58457490 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Plugin;
 
diff --git a/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php b/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
index c62904bb3..ffd9ddb55 100644
--- a/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
+++ b/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Plugin;
 
diff --git a/modules/monitoring/library/Monitoring/SecurityStep.php b/modules/monitoring/library/Monitoring/SecurityStep.php
index b3eda02c4..c187eb8e7 100644
--- a/modules/monitoring/library/Monitoring/SecurityStep.php
+++ b/modules/monitoring/library/Monitoring/SecurityStep.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring;
 
@@ -75,4 +74,4 @@ class SecurityStep extends Step
                 . '</p><p>' . $this->error->getMessage() . '</p>';
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php b/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php
index bd83a42cd..112bd1e8b 100644
--- a/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php
+++ b/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Timeline;
 
diff --git a/modules/monitoring/library/Monitoring/Timeline/TimeLine.php b/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
index 93dc5a0ef..c61dc4283 100644
--- a/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
+++ b/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Timeline;
 
diff --git a/modules/monitoring/library/Monitoring/Timeline/TimeRange.php b/modules/monitoring/library/Monitoring/Timeline/TimeRange.php
index 7ea4787b8..2e32fbca3 100644
--- a/modules/monitoring/library/Monitoring/Timeline/TimeRange.php
+++ b/modules/monitoring/library/Monitoring/Timeline/TimeRange.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Timeline;
 
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 1c3db0799..0407fac1c 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Web\Controller;
 
diff --git a/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php b/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
index 5025c414c..8f54a1d7c 100644
--- a/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
+++ b/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Web\Hook;
 
diff --git a/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php b/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php
index e265086ab..2d5e4a8ac 100644
--- a/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php
+++ b/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Web\Hook;
 
diff --git a/modules/monitoring/library/Monitoring/Web/Widget/SelectBox.php b/modules/monitoring/library/Monitoring/Web/Widget/SelectBox.php
index c58540faf..97066e1ac 100644
--- a/modules/monitoring/library/Monitoring/Web/Widget/SelectBox.php
+++ b/modules/monitoring/library/Monitoring/Web/Widget/SelectBox.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Web\Widget;
 
@@ -76,7 +75,7 @@ class SelectBox extends AbstractWidget
      *
      * @param   Request     $request    The request to fetch the value from
      *
-     * @return  string|null     
+     * @return  string|null
      */
     public function getInterval(Request $request = null)
     {
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 82ee0b629..5348f87a3 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 h1 {
     font-size: 1em;
@@ -34,7 +33,7 @@ p.pluginoutput {
 
 div.pluginoutput {
   border-right: solid 5px @colorPetrol;
-  overflow: auto; 
+  overflow: auto;
   color: black;
   margin-bottom: 1em;
   padding: 0.2em;
@@ -198,4 +197,4 @@ h1.command-title {
 hr.command-separator {
   border: none;
   border-bottom: 2px solid @colorPetrol;
-}
\ No newline at end of file
+}
diff --git a/modules/monitoring/public/js/module.js b/modules/monitoring/public/js/module.js
index b3ba863ff..0edfda766 100644
--- a/modules/monitoring/public/js/module.js
+++ b/modules/monitoring/public/js/module.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 (function(Icinga) {
 
diff --git a/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php b/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php
index f50b07893..ee6f8e759 100644
--- a/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php
+++ b/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Module\Monitoring\Application\Views\Helpers;
 
diff --git a/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php b/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
index a14f64ae7..0a46e8226 100644
--- a/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
+++ b/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Modules\Monitoring\Application\Views\Helpers;
 
diff --git a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php
index 3edd20857..b3e3c302e 100644
--- a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php
+++ b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Module\Monitoring\Plugin;
 
diff --git a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php
index 9cc132eb2..e7beed43e 100644
--- a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php
+++ b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Module\Monitoring\Plugin;
 
diff --git a/modules/monitoring/test/php/regression/Bug6088Test.php b/modules/monitoring/test/php/regression/Bug6088Test.php
index 0a4f60a58..e26474720 100644
--- a/modules/monitoring/test/php/regression/Bug6088Test.php
+++ b/modules/monitoring/test/php/regression/Bug6088Test.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Regression;
 
diff --git a/modules/monitoring/test/php/regression/Bug7043Test.php b/modules/monitoring/test/php/regression/Bug7043Test.php
index 94a60a5b6..f6b7ded74 100644
--- a/modules/monitoring/test/php/regression/Bug7043Test.php
+++ b/modules/monitoring/test/php/regression/Bug7043Test.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Module\Monitoring\Regression;
 
@@ -57,4 +58,4 @@ class Bug7043Test extends BaseTestCase
 
         $this->assertEquals('backendName', $defaultBackend->getName(), 'Default backend has name set');
     }
-}
\ No newline at end of file
+}
diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index e63e770b8..f9a73aba4 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Clicommands;
 
diff --git a/modules/setup/application/clicommands/TokenCommand.php b/modules/setup/application/clicommands/TokenCommand.php
index 6f6e2b08e..e9f6007b7 100644
--- a/modules/setup/application/clicommands/TokenCommand.php
+++ b/modules/setup/application/clicommands/TokenCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Clicommands;
 
diff --git a/modules/setup/application/controllers/IndexController.php b/modules/setup/application/controllers/IndexController.php
index 113886c88..2dcb6ea5a 100644
--- a/modules/setup/application/controllers/IndexController.php
+++ b/modules/setup/application/controllers/IndexController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Module\Setup\WebWizard;
diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 3b2e6ec9f..667a1c758 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index b123b5906..333eda18f 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
index f51ef946a..fdbca1683 100644
--- a/modules/setup/application/forms/AuthenticationPage.php
+++ b/modules/setup/application/forms/AuthenticationPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php
index 3b9ae649b..ac41f4a1e 100644
--- a/modules/setup/application/forms/DatabaseCreationPage.php
+++ b/modules/setup/application/forms/DatabaseCreationPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php
index 1901d8ca9..f512e0288 100644
--- a/modules/setup/application/forms/DbResourcePage.php
+++ b/modules/setup/application/forms/DbResourcePage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/GeneralConfigPage.php b/modules/setup/application/forms/GeneralConfigPage.php
index e0a9d0fab..cd66db496 100644
--- a/modules/setup/application/forms/GeneralConfigPage.php
+++ b/modules/setup/application/forms/GeneralConfigPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
index 66fd39001..54fb86401 100644
--- a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/LdapDiscoveryPage.php b/modules/setup/application/forms/LdapDiscoveryPage.php
index 26b43803b..3306e0395 100644
--- a/modules/setup/application/forms/LdapDiscoveryPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/LdapResourcePage.php b/modules/setup/application/forms/LdapResourcePage.php
index f003a7370..c0898c8b5 100644
--- a/modules/setup/application/forms/LdapResourcePage.php
+++ b/modules/setup/application/forms/LdapResourcePage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/ModulePage.php b/modules/setup/application/forms/ModulePage.php
index ef765c0e7..d41007553 100644
--- a/modules/setup/application/forms/ModulePage.php
+++ b/modules/setup/application/forms/ModulePage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
index 01b3296f4..b07ca6406 100644
--- a/modules/setup/application/forms/PreferencesPage.php
+++ b/modules/setup/application/forms/PreferencesPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/RequirementsPage.php b/modules/setup/application/forms/RequirementsPage.php
index ec4405459..5f063a86c 100644
--- a/modules/setup/application/forms/RequirementsPage.php
+++ b/modules/setup/application/forms/RequirementsPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/SummaryPage.php b/modules/setup/application/forms/SummaryPage.php
index 9b42ec9d8..83673b573 100644
--- a/modules/setup/application/forms/SummaryPage.php
+++ b/modules/setup/application/forms/SummaryPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/WelcomePage.php b/modules/setup/application/forms/WelcomePage.php
index 66340ff25..455dabc80 100644
--- a/modules/setup/application/forms/WelcomePage.php
+++ b/modules/setup/application/forms/WelcomePage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/library/Setup/Exception/SetupException.php b/modules/setup/library/Setup/Exception/SetupException.php
index da5eed17c..46d4d5d70 100644
--- a/modules/setup/library/Setup/Exception/SetupException.php
+++ b/modules/setup/library/Setup/Exception/SetupException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Exception;
 
@@ -13,4 +12,4 @@ use Icinga\Exception\IcingaException;
  */
 class SetupException extends IcingaException
 {
-}
\ No newline at end of file
+}
diff --git a/modules/setup/library/Setup/Requirements.php b/modules/setup/library/Setup/Requirements.php
index ab9e693e5..13d42ce6e 100644
--- a/modules/setup/library/Setup/Requirements.php
+++ b/modules/setup/library/Setup/Requirements.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Setup.php b/modules/setup/library/Setup/Setup.php
index ec5117c9a..da19d0a82 100644
--- a/modules/setup/library/Setup/Setup.php
+++ b/modules/setup/library/Setup/Setup.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/SetupWizard.php b/modules/setup/library/Setup/SetupWizard.php
index 754207276..e4676f26f 100644
--- a/modules/setup/library/Setup/SetupWizard.php
+++ b/modules/setup/library/Setup/SetupWizard.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Step.php b/modules/setup/library/Setup/Step.php
index 720597fd1..afd50a982 100644
--- a/modules/setup/library/Setup/Step.php
+++ b/modules/setup/library/Setup/Step.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
index c06b4e294..407ef4182 100644
--- a/modules/setup/library/Setup/Steps/AuthenticationStep.php
+++ b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Steps;
 
diff --git a/modules/setup/library/Setup/Steps/DatabaseStep.php b/modules/setup/library/Setup/Steps/DatabaseStep.php
index 006b6c9ed..aed3b3e36 100644
--- a/modules/setup/library/Setup/Steps/DatabaseStep.php
+++ b/modules/setup/library/Setup/Steps/DatabaseStep.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Steps;
 
diff --git a/modules/setup/library/Setup/Steps/GeneralConfigStep.php b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
index bf3d8cb89..ca5b755c4 100644
--- a/modules/setup/library/Setup/Steps/GeneralConfigStep.php
+++ b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Steps;
 
diff --git a/modules/setup/library/Setup/Steps/ResourceStep.php b/modules/setup/library/Setup/Steps/ResourceStep.php
index aae1c3aca..0107f4576 100644
--- a/modules/setup/library/Setup/Steps/ResourceStep.php
+++ b/modules/setup/library/Setup/Steps/ResourceStep.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Steps;
 
diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index 63184acd0..55aea73b8 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Utils;
 
diff --git a/modules/setup/library/Setup/Utils/EnableModuleStep.php b/modules/setup/library/Setup/Utils/EnableModuleStep.php
index a23e532f2..c33a92774 100644
--- a/modules/setup/library/Setup/Utils/EnableModuleStep.php
+++ b/modules/setup/library/Setup/Utils/EnableModuleStep.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Utils;
 
diff --git a/modules/setup/library/Setup/Utils/MakeDirStep.php b/modules/setup/library/Setup/Utils/MakeDirStep.php
index b758ccd79..730f8b63f 100644
--- a/modules/setup/library/Setup/Utils/MakeDirStep.php
+++ b/modules/setup/library/Setup/Utils/MakeDirStep.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Utils;
 
diff --git a/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php b/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php
index fa858f531..95bc9aaaa 100644
--- a/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php
+++ b/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Web\Form\Validator;
 
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index b580101ed..a9c302eb4 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Webserver.php b/modules/setup/library/Setup/Webserver.php
index dbc55b6a2..03d8dd040 100644
--- a/modules/setup/library/Setup/Webserver.php
+++ b/modules/setup/library/Setup/Webserver.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Webserver/Apache.php b/modules/setup/library/Setup/Webserver/Apache.php
index 79d81eb71..595f5a2cc 100644
--- a/modules/setup/library/Setup/Webserver/Apache.php
+++ b/modules/setup/library/Setup/Webserver/Apache.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Webserver;
 
diff --git a/modules/setup/library/Setup/Webserver/Nginx.php b/modules/setup/library/Setup/Webserver/Nginx.php
index fd5e92d72..21b29679c 100644
--- a/modules/setup/library/Setup/Webserver/Nginx.php
+++ b/modules/setup/library/Setup/Webserver/Nginx.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Webserver;
 
diff --git a/modules/test/application/clicommands/PhpCommand.php b/modules/test/application/clicommands/PhpCommand.php
index dbcb58f05..1040e1255 100644
--- a/modules/test/application/clicommands/PhpCommand.php
+++ b/modules/test/application/clicommands/PhpCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Test\Clicommands;
 
diff --git a/modules/translation/application/clicommands/CompileCommand.php b/modules/translation/application/clicommands/CompileCommand.php
index 77116d74a..b2b1880f7 100644
--- a/modules/translation/application/clicommands/CompileCommand.php
+++ b/modules/translation/application/clicommands/CompileCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Translation\Clicommands;
 
diff --git a/modules/translation/application/clicommands/RefreshCommand.php b/modules/translation/application/clicommands/RefreshCommand.php
index 78b58f55c..25f4ee3aa 100644
--- a/modules/translation/application/clicommands/RefreshCommand.php
+++ b/modules/translation/application/clicommands/RefreshCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Translation\Clicommands;
 
diff --git a/modules/translation/library/Translation/Cli/TranslationCommand.php b/modules/translation/library/Translation/Cli/TranslationCommand.php
index bae20cc5e..b2bc654a8 100644
--- a/modules/translation/library/Translation/Cli/TranslationCommand.php
+++ b/modules/translation/library/Translation/Cli/TranslationCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Translation\Cli;
 
diff --git a/modules/translation/library/Translation/Util/GettextTranslationHelper.php b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
index 5702def85..2b47b57aa 100644
--- a/modules/translation/library/Translation/Util/GettextTranslationHelper.php
+++ b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Translation\Util;
 
diff --git a/packages/files/bin/icingacli b/packages/files/bin/icingacli
index 5b41e4e8c..0f20fcd76 100755
--- a/packages/files/bin/icingacli
+++ b/packages/files/bin/icingacli
@@ -1,5 +1,6 @@
 #!/usr/bin/php
 <?php
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 require_once '/usr/share/php/Icinga/Application/Cli.php';
 
diff --git a/packages/files/public/index.php b/packages/files/public/index.php
index ebd223c03..a4760a9fb 100644
--- a/packages/files/public/index.php
+++ b/packages/files/public/index.php
@@ -1,3 +1,4 @@
 <?php
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 require_once '/usr/share/php/Icinga/Application/webrouter.php';
diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index ff54bd38d..fd98315ac 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /*** Base rules ***/
 * {
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 813ae28f7..172536856 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 div.config-form-buttons {
   margin-top: 5px;
diff --git a/public/css/icinga/header-elements.less b/public/css/icinga/header-elements.less
index e1f3a7bce..bef161fa5 100644
--- a/public/css/icinga/header-elements.less
+++ b/public/css/icinga/header-elements.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 #header div.user {
   font-size: 1.1em;
diff --git a/public/css/icinga/layout-colors.less b/public/css/icinga/layout-colors.less
index c57cd1a26..a422b8e3e 100644
--- a/public/css/icinga/layout-colors.less
+++ b/public/css/icinga/layout-colors.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /* Layout colors */
 
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 5c6d67dae..b0d29862b 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /** Default layout **/
 html {
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index 6b03b476a..c5e2230cf 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 #login {
   width: 100%;
@@ -109,7 +108,7 @@
   .footer {
     margin-top: 7em;
     font-size: 0.9em;
-    text-align: center; 
+    text-align: center;
     margin-left: 5em;
   }
 
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index e3e31b397..a7ed358df 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 code {
   background-color: #eee;
@@ -181,7 +180,7 @@ table.benchmark {
 
 .dashboard h3 {
   font-size: 1em;
-} 
+}
 
 .dashboard table.benchmark {
   font-size: 0.9em;
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 0f3f2691e..2aca175ea 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 #menu {
   max-height: 100%;
diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index 1e657101f..c7a24ed5f 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /* Special tables and states */
 
@@ -346,7 +345,7 @@ a.critical {
   font-size: 0.8em;
   padding: 0.4em 0 0.4em;
   border: 1px solid #d9d9d9;
-  
+
   font-weight: bold;
   letter-spacing: 0.1em;
 }
@@ -357,7 +356,7 @@ a.critical {
   margin: 0.2em;
   font-size: 0.9em;
   white-space: nowrap;
-  
+
   color: @colorTextDefault;
 }
 
@@ -540,12 +539,12 @@ div.box.contactgroup div.box.entry img {
   width: 80px;
   height: 80px;
   float: left;
-  
+
 }
 
 div.box.contactgroup div.box.entry a {
   margin-top: 0.4em;
-  
+
   font-weight: bold;
 }
 
@@ -558,7 +557,7 @@ div.circular {
   margin-left: 2em;
   margin-right: 1em;
   width: 80px;
-  height: 80px; 
+  height: 80px;
   float: left;
   background-size: 100% 100%;
 }
@@ -766,7 +765,7 @@ div.timeline {
         &:hover {
           color: @colorTextDefault;
           text-decoration: underline;
-         
+
         }
       }
     }
@@ -872,7 +871,7 @@ table.groupview {
         span.timesince {
           font-size: 0.8em;
         }
-        
+
         &.ok {
           border-color: @colorOk;
         }
diff --git a/public/css/icinga/pagination.less b/public/css/icinga/pagination.less
index e52b28403..8fe84b3b6 100644
--- a/public/css/icinga/pagination.less
+++ b/public/css/icinga/pagination.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 ul.pagination {
   font-size: 0.68em;
diff --git a/public/css/icinga/selection-toolbar.less b/public/css/icinga/selection-toolbar.less
index ca177ebbb..662a7db53 100644
--- a/public/css/icinga/selection-toolbar.less
+++ b/public/css/icinga/selection-toolbar.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 div.selection-toolbar {
   float: right;
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index 9dff6fecf..cd2f81d0f 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -1,3 +1,5 @@
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+
 #layout {
   overflow: auto; // TODO: Shouldn't be necessary, here, IMHO
 }
@@ -445,4 +447,4 @@
     padding-top: 1em;
     clear: both;
   }
-}
\ No newline at end of file
+}
diff --git a/public/css/icinga/tabs.less b/public/css/icinga/tabs.less
index 84f58e2a3..a93e96bcc 100644
--- a/public/css/icinga/tabs.less
+++ b/public/css/icinga/tabs.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 ul.tabs {
   padding: 1em 0 0 0;
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index e2e37d7ab..87818bbaa 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 table.historycolorgrid {
   font-size: 1.5em;
@@ -291,4 +290,4 @@ li li .badge {
   height: 12px;
   position: relative;
   top: 4px;
-}
\ No newline at end of file
+}
diff --git a/public/css/pdf/pdfprint.less b/public/css/pdf/pdfprint.less
index 117bef546..fc9fda0da 100644
--- a/public/css/pdf/pdfprint.less
+++ b/public/css/pdf/pdfprint.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 .controls form, .controls .pagination, .controls .widgetLimiter, .controls > .tabs, .dontprint {
   display: none !important;
diff --git a/public/index.php b/public/index.php
index 48a500666..0062bf94f 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,5 +1,4 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 require_once dirname(__DIR__) . '/library/Icinga/Application/webrouter.php';
diff --git a/public/js/helpers.js b/public/js/helpers.js
index 416bf1185..6dc1f765a 100644
--- a/public/js/helpers.js
+++ b/public/js/helpers.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 (function (Object) {
 
diff --git a/public/js/icinga.js b/public/js/icinga.js
index c883a6bba..ce8c9bb0c 100644
--- a/public/js/icinga.js
+++ b/public/js/icinga.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Icinga starts here.
diff --git a/public/js/icinga/behavior/form.js b/public/js/icinga/behavior/form.js
index d289183d6..b5514313b 100644
--- a/public/js/icinga/behavior/form.js
+++ b/public/js/icinga/behavior/form.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Controls behavior of form elements, depending reload and
diff --git a/public/js/icinga/behavior/navigation.js b/public/js/icinga/behavior/navigation.js
index b8a12064d..ebe74b422 100644
--- a/public/js/icinga/behavior/navigation.js
+++ b/public/js/icinga/behavior/navigation.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 (function(Icinga, $) {
 
@@ -36,7 +35,7 @@
             /*
               Recreate the html content of the menu item to force the browser to update the layout, or else
               the link would only be visible as active after another click or page reload in Gecko and WebKit.
-              
+
               fixes #7897
             */
             $selectedMenu.html($selectedMenu.html());
diff --git a/public/js/icinga/behavior/sparkline.js b/public/js/icinga/behavior/sparkline.js
index e0d0fb0c7..43fa2a4c9 100644
--- a/public/js/icinga/behavior/sparkline.js
+++ b/public/js/icinga/behavior/sparkline.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 (function(Icinga, $) {
 
diff --git a/public/js/icinga/behavior/tooltip.js b/public/js/icinga/behavior/tooltip.js
index de5b66d05..7889aec4e 100644
--- a/public/js/icinga/behavior/tooltip.js
+++ b/public/js/icinga/behavior/tooltip.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 (function(Icinga, $) {
 
diff --git a/public/js/icinga/behavior/tristate.js b/public/js/icinga/behavior/tristate.js
index 036c25cea..8519b8567 100644
--- a/public/js/icinga/behavior/tristate.js
+++ b/public/js/icinga/behavior/tristate.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 (function(Icinga, $) {
 
@@ -43,7 +42,7 @@
         } else {
             $tristate.parent().find('b.tristate-changed').css('visibility', 'hidden');
         }
-        self.icinga.ui.setTriState(value.toString(), $tristate);    
+        self.icinga.ui.setTriState(value.toString(), $tristate);
     };
 
     Icinga.Behaviors.Tristate = Tristate;
diff --git a/public/js/icinga/eventlistener.js b/public/js/icinga/eventlistener.js
index e1946c6ae..24818963c 100644
--- a/public/js/icinga/eventlistener.js
+++ b/public/js/icinga/eventlistener.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * EventListener contains event handlers and can bind / and unbind them from
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 0a77db60e..d537cde30 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Icinga.Events
diff --git a/public/js/icinga/history.js b/public/js/icinga/history.js
index 9f05def2d..ef05f518e 100644
--- a/public/js/icinga/history.js
+++ b/public/js/icinga/history.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Icinga.History
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 417c47c1c..155591026 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Icinga.Loader
diff --git a/public/js/icinga/logger.js b/public/js/icinga/logger.js
index 07135e007..54ec7b182 100644
--- a/public/js/icinga/logger.js
+++ b/public/js/icinga/logger.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Icinga.Logger
diff --git a/public/js/icinga/module.js b/public/js/icinga/module.js
index 047911434..5d05c82a5 100644
--- a/public/js/icinga/module.js
+++ b/public/js/icinga/module.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * This is how we bootstrap JS code in our modules
diff --git a/public/js/icinga/timer.js b/public/js/icinga/timer.js
index 8d90f7c5c..06b38a4e6 100644
--- a/public/js/icinga/timer.js
+++ b/public/js/icinga/timer.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Icinga.Timer
diff --git a/public/js/icinga/timezone.js b/public/js/icinga/timezone.js
index 15205e9cb..69bae9a9a 100644
--- a/public/js/icinga/timezone.js
+++ b/public/js/icinga/timezone.js
@@ -1,3 +1,5 @@
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+
 (function(Icinga, $) {
 
     'use strict';
@@ -114,4 +116,4 @@
         }
     };
 
-})(Icinga, jQuery);
\ No newline at end of file
+})(Icinga, jQuery);
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index 3c03bdcf5..c63d5e7a6 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Icinga.UI
@@ -618,25 +617,25 @@
                     var sec = 0;
 
                     if (nm < 0) {
-                        signed = '-';    
+                        signed = '-';
                         nm = nm * -1;
                         sec = nm * 60 + ns;
                         sec++;
                     } else if (nm == 0 && ns == 0) {
-                        signed = '-';    
+                        signed = '-';
                         sec = 1;
                     } else if (nm == 0 && m[2][0] == '-') {
-                        signed = '-';    
+                        signed = '-';
                         sec = ns;
                         sec++;
                     } else if (nm == 0 && m[2][0] != '-') {
                         sec = ns;
                         sec--;
                     } else {
-                        signed = '';    
+                        signed = '';
                         sec = nm * 60 + ns;
                         sec--;
-                    }    
+                    }
 
                     nm = Math.floor(sec/60);
                     ns = sec - nm * 60;
@@ -671,24 +670,24 @@
                 // hide input boxess and remove text nodes
                 $target.find("input").hide();
                 $target.contents().filter(function() { return this.nodeType === 3; }).remove();
-                
+
                 // has three states?
                 var triState = $target.find('input[value="unchanged"]').size() > 0 ? 1 : 0;
-                
+
                 // fetch current value from radiobuttons
                 var value  = $target.find('input:checked').first().val();
-        
+
                 $target.append(
                   '<input class="tristate-dummy" ' +
                         ' data-icinga-old="' + value + '" data-icinga-tristate="' + triState + '" type="checkbox" ' +
                         (value === '1' ? 'checked ' : ( value === 'unchanged' ? 'indeterminate="true" ' : ' ' )) +
                   '/> <b style="visibility: hidden;" class="tristate-changed"> (changed) </b>'
-                ); 
+                );
                 if (triState) {
                   // TODO: find a better way to activate indeterminate checkboxes after load.
                   $target.append(
                     '<script type="text/javascript"> ' +
-                      ' $(\'input.tristate-dummy[indeterminate="true"]\').each(function(i, el){ el.indeterminate = true; }); ' + 
+                      ' $(\'input.tristate-dummy[indeterminate="true"]\').each(function(i, el){ el.indeterminate = true; }); ' +
                     '</script>'
                   );
                 }
diff --git a/public/js/icinga/utils.js b/public/js/icinga/utils.js
index ba4d7a040..8539d29ca 100644
--- a/public/js/icinga/utils.js
+++ b/public/js/icinga/utils.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Icinga utility functions
diff --git a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
index 6af628b06..8067b6259 100644
--- a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
+++ b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Forms\Config\Authentication;
 
diff --git a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
index 046730f57..66a743d73 100644
--- a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
+++ b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Forms\Config\Authentication;
 
diff --git a/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php b/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php
index 88de869a1..00cb32464 100644
--- a/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php
+++ b/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Forms\Config;
 
diff --git a/test/php/application/forms/Config/Resource/DbResourceFormTest.php b/test/php/application/forms/Config/Resource/DbResourceFormTest.php
index 53dd6bf56..a14f64949 100644
--- a/test/php/application/forms/Config/Resource/DbResourceFormTest.php
+++ b/test/php/application/forms/Config/Resource/DbResourceFormTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Forms\Config\Resource;
 
diff --git a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
index 9ef8880e7..94c171981 100644
--- a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
+++ b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Forms\Config\Resource;
 
diff --git a/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php b/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php
index 3f5de5844..6c3899e01 100644
--- a/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php
+++ b/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Forms\Config\Resource;
 
diff --git a/test/php/application/views/helpers/DateFormatTestBroken.php b/test/php/application/views/helpers/DateFormatTestBroken.php
index 4f3cfc184..1a4daf8fe 100644
--- a/test/php/application/views/helpers/DateFormatTestBroken.php
+++ b/test/php/application/views/helpers/DateFormatTestBroken.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Views\Helper;
 
diff --git a/test/php/bootstrap.php b/test/php/bootstrap.php
index a7fa6c2aa..af34344c5 100644
--- a/test/php/bootstrap.php
+++ b/test/php/bootstrap.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 $applicationPath = realpath(dirname(__FILE__) . '/../../application/');
 $modulePath = realpath(dirname(__FILE__) . '/../../modules/');
diff --git a/test/php/library/Icinga/Application/ConfigTest.php b/test/php/library/Icinga/Application/ConfigTest.php
index 1e64da808..8b3d0cd0f 100644
--- a/test/php/library/Icinga/Application/ConfigTest.php
+++ b/test/php/library/Icinga/Application/ConfigTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Application;
 
diff --git a/test/php/library/Icinga/Application/LoaderTest.php b/test/php/library/Icinga/Application/LoaderTest.php
index 1a0276945..4b3f5b5af 100644
--- a/test/php/library/Icinga/Application/LoaderTest.php
+++ b/test/php/library/Icinga/Application/LoaderTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Application;
 
diff --git a/test/php/library/Icinga/Chart/GraphChartTest.php b/test/php/library/Icinga/Chart/GraphChartTest.php
index 9ffdcb66c..49c81a5de 100644
--- a/test/php/library/Icinga/Chart/GraphChartTest.php
+++ b/test/php/library/Icinga/Chart/GraphChartTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Chart;
 
diff --git a/test/php/library/Icinga/Chart/PieChartTest.php b/test/php/library/Icinga/Chart/PieChartTest.php
index 756fdf6e6..21b9fa49a 100644
--- a/test/php/library/Icinga/Chart/PieChartTest.php
+++ b/test/php/library/Icinga/Chart/PieChartTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Chart;
 
@@ -29,4 +28,4 @@ class PieChartTest extends BaseTestCase
         $path = $xpath->query('//x:path[@data-icinga-graph-type="pieslice"]');
         $this->assertEquals(3, $path->length, 'Assert the correct number of datapoints being drawn as SVG bars');
     }
-}
\ No newline at end of file
+}
diff --git a/test/php/library/Icinga/Data/ConfigObjectTest.php b/test/php/library/Icinga/Data/ConfigObjectTest.php
index c4b825e58..40b095267 100644
--- a/test/php/library/Icinga/Data/ConfigObjectTest.php
+++ b/test/php/library/Icinga/Data/ConfigObjectTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Data;
 
diff --git a/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php b/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php
index bdb719f8c..5e86d3f64 100644
--- a/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php
+++ b/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Data;
 
diff --git a/test/php/library/Icinga/Data/Filter/FilterTest.php b/test/php/library/Icinga/Data/Filter/FilterTest.php
index 7d6349213..4a048818f 100644
--- a/test/php/library/Icinga/Data/Filter/FilterTest.php
+++ b/test/php/library/Icinga/Data/Filter/FilterTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Data;
 
diff --git a/test/php/library/Icinga/File/CsvTest.php b/test/php/library/Icinga/File/CsvTest.php
index f4ae27c63..0d81fcb6d 100644
--- a/test/php/library/Icinga/File/CsvTest.php
+++ b/test/php/library/Icinga/File/CsvTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\File;
 
diff --git a/test/php/library/Icinga/File/Ini/IniWriterTest.php b/test/php/library/Icinga/File/Ini/IniWriterTest.php
index 63cb0e517..5603954ac 100644
--- a/test/php/library/Icinga/File/Ini/IniWriterTest.php
+++ b/test/php/library/Icinga/File/Ini/IniWriterTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Config;
 
diff --git a/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php b/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php
index 0c0d55498..36d1d4f2b 100644
--- a/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php
+++ b/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Logger\Writer;
 
diff --git a/test/php/library/Icinga/Protocol/Ldap/QueryTest.php b/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
index f6387709f..e87064251 100644
--- a/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
+++ b/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Protocol\Ldap;
 
diff --git a/test/php/library/Icinga/Test/BaseTestCaseTest.php b/test/php/library/Icinga/Test/BaseTestCaseTest.php
index 2f8e12f0c..36c251c4c 100644
--- a/test/php/library/Icinga/Test/BaseTestCaseTest.php
+++ b/test/php/library/Icinga/Test/BaseTestCaseTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Test;
 
diff --git a/test/php/library/Icinga/User/PreferencesTest.php b/test/php/library/Icinga/User/PreferencesTest.php
index 540ea1b14..75a6723b6 100644
--- a/test/php/library/Icinga/User/PreferencesTest.php
+++ b/test/php/library/Icinga/User/PreferencesTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\User;
 
diff --git a/test/php/library/Icinga/User/Store/DbStoreTest.php b/test/php/library/Icinga/User/Store/DbStoreTest.php
index dfb70c66b..bcadadbe4 100644
--- a/test/php/library/Icinga/User/Store/DbStoreTest.php
+++ b/test/php/library/Icinga/User/Store/DbStoreTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\User\Preferences\Store;
 
diff --git a/test/php/library/Icinga/User/Store/IniStoreTest.php b/test/php/library/Icinga/User/Store/IniStoreTest.php
index 51de87840..912c09320 100644
--- a/test/php/library/Icinga/User/Store/IniStoreTest.php
+++ b/test/php/library/Icinga/User/Store/IniStoreTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\User\Preferences\Store;
 
diff --git a/test/php/library/Icinga/UserTest.php b/test/php/library/Icinga/UserTest.php
index d12666b04..b14a91a57 100644
--- a/test/php/library/Icinga/UserTest.php
+++ b/test/php/library/Icinga/UserTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga;
 
diff --git a/test/php/library/Icinga/Util/DateTimeFactoryTest.php b/test/php/library/Icinga/Util/DateTimeFactoryTest.php
index 1b7778587..ad7441f93 100644
--- a/test/php/library/Icinga/Util/DateTimeFactoryTest.php
+++ b/test/php/library/Icinga/Util/DateTimeFactoryTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Util/DimensionTest.php b/test/php/library/Icinga/Util/DimensionTest.php
index d6678258f..db2e579b2 100644
--- a/test/php/library/Icinga/Util/DimensionTest.php
+++ b/test/php/library/Icinga/Util/DimensionTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Util/FileTest.php b/test/php/library/Icinga/Util/FileTest.php
index e0f2e86b8..96ca21ac9 100644
--- a/test/php/library/Icinga/Util/FileTest.php
+++ b/test/php/library/Icinga/Util/FileTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Util/StringTest.php b/test/php/library/Icinga/Util/StringTest.php
index 8ecf61edc..46acee3d0 100644
--- a/test/php/library/Icinga/Util/StringTest.php
+++ b/test/php/library/Icinga/Util/StringTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Util/TranslatorTest.php b/test/php/library/Icinga/Util/TranslatorTest.php
index 4d74cc8dc..ccf632657 100644
--- a/test/php/library/Icinga/Util/TranslatorTest.php
+++ b/test/php/library/Icinga/Util/TranslatorTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php b/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php
index 802d610ab..79296e4a1 100644
--- a/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php
+++ b/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web\Form\Element;
 
diff --git a/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php b/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php
index 0153412e5..1d9514663 100644
--- a/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php
+++ b/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web\Form\Validator;
 
diff --git a/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php b/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php
index b0ad8c9ae..124484de3 100644
--- a/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php
+++ b/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web\Form\Validator;
 
diff --git a/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php b/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php
index b9e8c2ae7..9f7996975 100644
--- a/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php
+++ b/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web\Form\Validator;
 
diff --git a/test/php/library/Icinga/Web/FormTest.php b/test/php/library/Icinga/Web/FormTest.php
index de880f070..01ef3de27 100644
--- a/test/php/library/Icinga/Web/FormTest.php
+++ b/test/php/library/Icinga/Web/FormTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/HookTest.php b/test/php/library/Icinga/Web/HookTest.php
index 16300f5ca..3d678fe7a 100644
--- a/test/php/library/Icinga/Web/HookTest.php
+++ b/test/php/library/Icinga/Web/HookTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Hook;
 
diff --git a/test/php/library/Icinga/Web/MenuTest.php b/test/php/library/Icinga/Web/MenuTest.php
index b7370d65b..31c8538bc 100644
--- a/test/php/library/Icinga/Web/MenuTest.php
+++ b/test/php/library/Icinga/Web/MenuTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
index a77dcb553..6d26ad847 100644
--- a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
+++ b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web\Paginator\ScrollingStyle;
 
diff --git a/test/php/library/Icinga/Web/Session/PhpSessionTest.php b/test/php/library/Icinga/Web/Session/PhpSessionTest.php
index 49641c60d..90d593848 100644
--- a/test/php/library/Icinga/Web/Session/PhpSessionTest.php
+++ b/test/php/library/Icinga/Web/Session/PhpSessionTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web\Session;
 
diff --git a/test/php/library/Icinga/Web/Session/SessionNamespaceTest.php b/test/php/library/Icinga/Web/Session/SessionNamespaceTest.php
index bf984dca0..63b12bd90 100644
--- a/test/php/library/Icinga/Web/Session/SessionNamespaceTest.php
+++ b/test/php/library/Icinga/Web/Session/SessionNamespaceTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web\Session;
 
diff --git a/test/php/library/Icinga/Web/UrlTest.php b/test/php/library/Icinga/Web/UrlTest.php
index 68206beee..331ae4b11 100644
--- a/test/php/library/Icinga/Web/UrlTest.php
+++ b/test/php/library/Icinga/Web/UrlTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/View/DateTimeRendererTest.php b/test/php/library/Icinga/Web/View/DateTimeRendererTest.php
index e45d3fdfe..639e10563 100644
--- a/test/php/library/Icinga/Web/View/DateTimeRendererTest.php
+++ b/test/php/library/Icinga/Web/View/DateTimeRendererTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/Widget/DashboardTest.php b/test/php/library/Icinga/Web/Widget/DashboardTest.php
index 2aa2bdcf4..dc9ec23bf 100644
--- a/test/php/library/Icinga/Web/Widget/DashboardTest.php
+++ b/test/php/library/Icinga/Web/Widget/DashboardTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php b/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
index 5e6e1cc69..c7354e341 100644
--- a/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
+++ b/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/regression/Bug4102Test.php b/test/php/regression/Bug4102Test.php
index ce5ea2290..77f356d51 100644
--- a/test/php/regression/Bug4102Test.php
+++ b/test/php/regression/Bug4102Test.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Regression;
 
diff --git a/test/php/regression/Bug6284Test.php b/test/php/regression/Bug6284Test.php
index be584c149..1863a15e4 100644
--- a/test/php/regression/Bug6284Test.php
+++ b/test/php/regression/Bug6284Test.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Regression;
 
diff --git a/test/php/regression/Bug6432Test.php b/test/php/regression/Bug6432Test.php
index 4194d9d41..50719db46 100644
--- a/test/php/regression/Bug6432Test.php
+++ b/test/php/regression/Bug6432Test.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Regression;
 

From 6517f8e2bec04a3794014f148c4d2beefe1b84b2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 16:08:35 +0100
Subject: [PATCH 0525/2920] security: Activate permissions

---
 library/Icinga/Authentication/Manager.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 64d20d9dd..0982d8fe9 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -164,7 +164,6 @@ class Manager
      */
     public function hasPermission($permission)
     {
-        return true;
         if (! $this->isAuthenticated()) {
             return false;
         }

From d701f9a354f408fbff728682fc33c32d9389f220 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 16:11:29 +0100
Subject: [PATCH 0526/2920] monitoring/security: Guard delete downtime action

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

diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 0407fac1c..d12bc7712 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -151,6 +151,7 @@ abstract class MonitoredObjectController extends Controller
     public function deleteDowntimeAction()
     {
         $this->assertHttpMethod('POST');
+        $this->assertPermission('monitoring/command/downtime/delete');
         $this->handleCommandForm(new DeleteDowntimeCommandForm());
     }
 

From 4ef5f0c813767fb18dd415e67aa9f36673de0315 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 16:11:56 +0100
Subject: [PATCH 0527/2920] monitoring/security: Guard delete comment action

---
 library/Icinga/Web/Widget/FilterEditor.php    | 69 +++++++++++++------
 .../Controller/MonitoredObjectController.php  |  1 +
 2 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index c7a240da8..c515ee79d 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -123,26 +123,55 @@ class FilterEditor extends AbstractWidget
     {
         $found = false;
         if ($filter->isChain() && $filter->getOperatorName() === 'AND') {
-            foreach ($filter->filters() as $f) {
-                if ($f->isExpression()
-                    && $f->getColumn() === $column
-                    && $f->getSign() === $sign
-                ) {
-                    $f->setExpression($expression);
-                    $found = true;
-                    break;
+            if (is_array($column)) {
+                foreach ($filter->filters() as $f) {
+                    if ($f->isChain() && $f->getOperatorName() === 'OR') {
+
+                    }
+                }
+            } else {
+                foreach ($filter->filters() as $f) {
+                    if ($f->isExpression()
+                        && $f->getColumn() === $column
+                        && $f->getSign() === $sign
+                    ) {
+                        $f->setExpression($expression);
+                        $found = true;
+                        break;
+                    }
                 }
             }
-        } elseif ($filter->isExpression()) {
-            if ($filter->getColumn() === $column && $filter->getSign() === $sign) {
+        } elseif ($filter->isExpression() && $filter->getSign() === $sign) {
+            if (is_array($column)) {
+                if (in_array($filter->getColumn(), $column)) {
+                    $or = Filter::matchAny();
+                    foreach ($column as $col) {
+                        $or->addFilter(
+                            Filter::expression($col, $sign, $expression)
+                        );
+                    }
+                    $filter = $filter->andFilter($or);
+                    $found = true;
+                }
+            } elseif ($filter->getColumn() === $column) {
                 $filter->setExpression($expression);
                 $found = true;
             }
         }
         if (! $found) {
-            $filter = $filter->andFilter(
-                Filter::expression($column, $sign, $expression)
-            );
+            if (is_array($column)) {
+                $or = Filter::matchAny();
+                foreach ($column as $col) {
+                    $or->addFilter(
+                        Filter::expression($col, $sign, $expression)
+                    );
+                }
+                $filter = $filter->andFilter($or);
+            } else {
+                $filter = $filter->andFilter(
+                    Filter::expression($column, $sign, $expression)
+                );
+            }
         }
         return $filter;
     }
@@ -183,25 +212,25 @@ class FilterEditor extends AbstractWidget
                 // TODO: Ask the view for (multiple) search columns
                 switch($request->getActionName()) {
                     case 'services':
-                        $searchCol = 'service_description';
+                        $searchCols = array('service_description', 'service_display_name');
                         break;
                     case 'hosts':
-                        $searchCol = 'host_name';
+                        $searchCols = array('host_name', 'host_display_name');
                         break;
                     case 'hostgroups':
-                        $searchCol = 'hostgroup';
+                        $searchCols = array('hostgroup', 'hostgroup_alias');
                         break;
                     case 'servicegroups':
-                        $searchCol = 'servicegroup';
+                        $searchCols = array('servicegroup', 'servicegroup_alias');
                         break;
                     default:
-                        $searchCol = null;
+                        $searchCols = null;
                 }
 
-                if ($searchCol === null) {
+                if ($searchCols === null) {
                     throw new Exception('Cannot search here');
                 }
-                $filter = $this->mergeRootExpression($filter, $searchCol, '=', "*$search*");
+                $filter = $this->mergeRootExpression($filter, $searchCols, '=', "*$search*");
 
             } else {
                 list($k, $v) = preg_split('/=/', $search);
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index d12bc7712..cd2ed175f 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -142,6 +142,7 @@ abstract class MonitoredObjectController extends Controller
     public function deleteCommentAction()
     {
         $this->assertHttpMethod('POST');
+        $this->assertPermission('monitoring/command/comment/delete');
         $this->handleCommandForm(new DeleteCommentCommandForm());
     }
 

From 9fa1fd626c27a49b2acf5e8cbf37d767d3217ecb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 16:13:22 +0100
Subject: [PATCH 0528/2920] Fix typo in UserBackend

---
 library/Icinga/Authentication/UserBackend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/UserBackend.php b/library/Icinga/Authentication/UserBackend.php
index 2117c2f29..beb5df5b9 100644
--- a/library/Icinga/Authentication/UserBackend.php
+++ b/library/Icinga/Authentication/UserBackend.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication;
 

From e8c4f45d6811777da286647ec3263af195d5c69f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 16:14:13 +0100
Subject: [PATCH 0529/2920] Fix typo in UserGroupBackend

---
 library/Icinga/Authentication/UserGroupBackend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/UserGroupBackend.php b/library/Icinga/Authentication/UserGroupBackend.php
index 49c6e4575..2fc0a5ada 100644
--- a/library/Icinga/Authentication/UserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroupBackend.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication;
 

From 04edf0d075a7c0a3c120732e18021139e404dc96 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 3 Feb 2015 16:15:50 +0100
Subject: [PATCH 0530/2920] Fix that the search is case-sensitive in case of a
 PostgreSQL backend

fixes #8083
---
 .../Monitoring/Backend/Ido/Query/IdoQuery.php | 46 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index f7f612ce4..391048ceb 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -172,6 +172,16 @@ abstract class IdoQuery extends DbQuery
      */
     protected static $idoVersion;
 
+    /**
+     * List of columns where the COLLATE SQL-instruction has been removed
+     *
+     * This list is being populated in case of a PostgreSQL backend only,
+     * to ensure case-insensitive string comparison in WHERE clauses.
+     *
+     * @var array
+     */
+    protected $columnsWithoutCollation = array();
+
     /**
      * Return true when the column is an aggregate column
      *
@@ -267,6 +277,37 @@ abstract class IdoQuery extends DbQuery
         parent::addFilter($filter);
     }
 
+    /**
+     * Recurse the given filter and ensure that any string conversion is case-insensitive
+     *
+     * @param Filter $filter
+     */
+    protected function lowerColumnsWithoutCollation(Filter $filter)
+    {
+        if ($filter instanceof FilterExpression) {
+            if (
+                in_array($filter->getColumn(), $this->columnsWithoutCollation)
+                && strpos($filter->getColumn(), 'LOWER') !== 0
+            ) {
+                $filter->setColumn('LOWER(' . $filter->getColumn() . ')');
+                $filter->setExpression(strtolower($filter->getExpression()));
+            }
+        } else {
+            foreach ($filter->filters() as $chainedFilter) {
+                $this->lowerColumnsWithoutCollation($chainedFilter);
+            }
+        }
+    }
+
+    protected function applyFilterSql($select)
+    {
+        if (! empty($this->columnsWithoutCollation)) {
+            $this->lowerColumnsWithoutCollation($this->filter);
+        }
+
+        parent::applyFilterSql($select);
+    }
+
     public function where($condition, $value = null)
     {
         $this->requireColumn($condition);
@@ -320,7 +361,10 @@ abstract class IdoQuery extends DbQuery
     {
         foreach ($this->columnMap as $table => & $columns) {
             foreach ($columns as $key => & $value) {
-                $value = preg_replace('/ COLLATE .+$/', '', $value);
+                $value = preg_replace('/ COLLATE .+$/', '', $value, -1, $count);
+                if ($count > 0) {
+                    $this->columnsWithoutCollation[] = $this->getMappedField($key);
+                }
                 $value = preg_replace('/inet_aton\(([[:word:].]+)\)/i', '$1::inet - \'0.0.0.0\'', $value);
                 $value = preg_replace(
                     '/UNIX_TIMESTAMP(\((?>[^()]|(?-1))*\))/i',

From 160b3a96cad666215e98ac26a67d14d0aec7ea57 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 16:15:50 +0100
Subject: [PATCH 0531/2920] Revert "Fix typo in UserGroupBackend"

This reverts commit e8c4f45d6811777da286647ec3263af195d5c69f.
---
 library/Icinga/Authentication/UserGroupBackend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/UserGroupBackend.php b/library/Icinga/Authentication/UserGroupBackend.php
index 2fc0a5ada..49c6e4575 100644
--- a/library/Icinga/Authentication/UserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroupBackend.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */}
 
 namespace Icinga\Authentication;
 

From 4c7d120523062e288f1b51a276a39eb17e6ea947 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 16:15:57 +0100
Subject: [PATCH 0532/2920] Revert "Fix typo in UserBackend"

This reverts commit 9fa1fd626c27a49b2acf5e8cbf37d767d3217ecb.
---
 library/Icinga/Authentication/UserBackend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/UserBackend.php b/library/Icinga/Authentication/UserBackend.php
index beb5df5b9..2117c2f29 100644
--- a/library/Icinga/Authentication/UserBackend.php
+++ b/library/Icinga/Authentication/UserBackend.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */}
 
 namespace Icinga\Authentication;
 

From 5fa2e3cfdc361660ed5f0f39c17c3393491d1e6f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 16:16:10 +0100
Subject: [PATCH 0533/2920] Revert "Add license header"

This reverts commit 338d067aba41dd6e9178cebec5433eecd614196e.
---
 Vagrantfile                                   |  2 --
 .../clicommands/AutocompleteCommand.php       |  3 ++-
 application/clicommands/HelpCommand.php       |  3 ++-
 application/clicommands/ModuleCommand.php     |  3 ++-
 application/clicommands/WebCommand.php        |  3 ++-
 .../controllers/AuthenticationController.php  |  3 ++-
 application/controllers/ConfigController.php  |  1 -
 .../controllers/DashboardController.php       |  3 ++-
 application/controllers/ErrorController.php   |  1 -
 application/controllers/FilterController.php  |  3 ++-
 application/controllers/IndexController.php   |  3 ++-
 application/controllers/LayoutController.php  |  3 ++-
 application/controllers/ListController.php    |  3 ++-
 .../controllers/PreferenceController.php      |  3 ++-
 application/controllers/RolesController.php   |  1 -
 application/controllers/SearchController.php  |  3 ++-
 application/controllers/StaticController.php  |  3 ++-
 .../forms/Authentication/LoginForm.php        |  3 ++-
 .../Config/Authentication/DbBackendForm.php   |  3 ++-
 .../Authentication/ExternalBackendForm.php    |  3 ++-
 .../Config/Authentication/LdapBackendForm.php |  3 ++-
 .../AuthenticationBackendConfigForm.php       |  3 ++-
 .../AuthenticationBackendReorderForm.php      |  3 ++-
 .../Config/General/ApplicationConfigForm.php  |  3 ++-
 .../Config/General/LoggingConfigForm.php      |  3 ++-
 .../forms/Config/GeneralConfigForm.php        |  3 ++-
 .../forms/Config/Resource/DbResourceForm.php  |  3 ++-
 .../Config/Resource/FileResourceForm.php      |  3 ++-
 .../Config/Resource/LdapResourceForm.php      |  3 ++-
 .../Resource/LivestatusResourceForm.php       |  3 ++-
 .../forms/Config/ResourceConfigForm.php       |  3 ++-
 application/forms/ConfigForm.php              |  3 ++-
 application/forms/ConfirmRemovalForm.php      |  3 ++-
 application/forms/Dashboard/DashletForm.php   |  3 ++-
 application/forms/LdapDiscoveryForm.php       |  3 ++-
 application/forms/PreferenceForm.php          |  3 ++-
 application/forms/Security/RoleForm.php       |  3 ++-
 application/views/helpers/DateFormat.php      |  3 ++-
 application/views/helpers/FormDateTime.php    |  3 ++-
 application/views/helpers/FormNumber.php      |  3 ++-
 .../views/helpers/FormTriStateCheckbox.php    |  3 ++-
 application/views/helpers/Util.php            |  3 ++-
 bin/icingacli                                 |  3 ++-
 bin/license_writer.py                         |  3 ++-
 etc/bash_completion.d/icingacli               |  3 +++
 etc/schema/mysql.schema.sql                   |  2 --
 etc/schema/pgsql.schema.sql                   | 19 ++++++++++++---
 icingaweb2.spec                               |  2 --
 .../Application/ApplicationBootstrap.php      |  3 ++-
 library/Icinga/Application/Benchmark.php      |  3 ++-
 library/Icinga/Application/Cli.php            |  3 ++-
 library/Icinga/Application/Config.php         |  3 ++-
 library/Icinga/Application/EmbeddedWeb.php    |  3 ++-
 library/Icinga/Application/Icinga.php         |  3 ++-
 library/Icinga/Application/LegacyWeb.php      |  3 ++-
 library/Icinga/Application/Loader.php         |  3 ++-
 library/Icinga/Application/Logger.php         |  3 ++-
 .../Icinga/Application/Logger/LogWriter.php   |  3 ++-
 .../Application/Logger/Writer/FileWriter.php  |  3 ++-
 .../Logger/Writer/StdoutWriter.php            |  2 +-
 .../Logger/Writer/SyslogWriter.php            |  3 ++-
 .../Icinga/Application/Modules/Manager.php    |  3 ++-
 library/Icinga/Application/Modules/Module.php |  3 ++-
 library/Icinga/Application/Platform.php       |  3 ++-
 library/Icinga/Application/Web.php            |  3 ++-
 library/Icinga/Application/functions.php      |  3 ++-
 library/Icinga/Application/webrouter.php      |  3 ++-
 .../Icinga/Authentication/AdmissionLoader.php |  3 ++-
 library/Icinga/Authentication/AuthChain.php   |  3 ++-
 .../Authentication/Backend/DbUserBackend.php  |  3 ++-
 .../Backend/DbUserGroupBackend.php            |  3 ++-
 .../Backend/ExternalBackend.php               |  3 ++-
 .../Backend/IniUserGroupBackend.php           |  3 ++-
 .../Backend/LdapUserBackend.php               |  3 ++-
 library/Icinga/Authentication/Manager.php     |  3 ++-
 library/Icinga/Authentication/UserBackend.php |  3 ++-
 .../Authentication/UserGroupBackend.php       |  3 ++-
 library/Icinga/Chart/Axis.php                 |  3 ++-
 library/Icinga/Chart/Chart.php                |  3 ++-
 library/Icinga/Chart/Format.php               |  3 ++-
 library/Icinga/Chart/Graph/BarGraph.php       |  3 ++-
 library/Icinga/Chart/Graph/LineGraph.php      |  3 ++-
 library/Icinga/Chart/Graph/StackedGraph.php   |  3 ++-
 library/Icinga/Chart/Graph/Tooltip.php        |  5 ++--
 library/Icinga/Chart/GridChart.php            |  3 ++-
 library/Icinga/Chart/Inline/Inline.php        |  3 ++-
 library/Icinga/Chart/Inline/PieChart.php      |  3 ++-
 library/Icinga/Chart/Legend.php               |  3 ++-
 library/Icinga/Chart/Palette.php              |  3 ++-
 library/Icinga/Chart/PieChart.php             |  3 ++-
 library/Icinga/Chart/Primitive/Animatable.php |  3 ++-
 library/Icinga/Chart/Primitive/Animation.php  |  3 ++-
 library/Icinga/Chart/Primitive/Canvas.php     |  3 ++-
 library/Icinga/Chart/Primitive/Circle.php     |  3 ++-
 library/Icinga/Chart/Primitive/Drawable.php   |  3 ++-
 library/Icinga/Chart/Primitive/Line.php       |  3 ++-
 library/Icinga/Chart/Primitive/Path.php       |  3 ++-
 library/Icinga/Chart/Primitive/PieSlice.php   |  3 ++-
 library/Icinga/Chart/Primitive/RawElement.php |  3 ++-
 library/Icinga/Chart/Primitive/Rect.php       |  3 ++-
 library/Icinga/Chart/Primitive/Styleable.php  |  3 ++-
 library/Icinga/Chart/Primitive/Text.php       |  3 ++-
 library/Icinga/Chart/Render/LayoutBox.php     |  3 ++-
 library/Icinga/Chart/Render/RenderContext.php |  3 ++-
 library/Icinga/Chart/Render/Rotator.php       |  7 ++++--
 library/Icinga/Chart/SVGRenderer.php          |  3 ++-
 library/Icinga/Chart/Unit/AxisUnit.php        |  3 ++-
 library/Icinga/Chart/Unit/CalendarUnit.php    |  3 ++-
 library/Icinga/Chart/Unit/LinearUnit.php      |  3 ++-
 library/Icinga/Chart/Unit/LogarithmicUnit.php |  3 ++-
 library/Icinga/Chart/Unit/StaticAxis.php      |  3 ++-
 library/Icinga/Cli/AnsiScreen.php             |  3 ++-
 library/Icinga/Cli/Command.php                |  3 ++-
 library/Icinga/Cli/Documentation.php          |  3 ++-
 .../Cli/Documentation/CommentParser.php       |  3 ++-
 library/Icinga/Cli/Loader.php                 |  3 ++-
 library/Icinga/Cli/Params.php                 |  3 ++-
 library/Icinga/Cli/Screen.php                 |  3 ++-
 library/Icinga/Data/Browsable.php             |  3 ++-
 library/Icinga/Data/ConfigObject.php          |  3 ++-
 library/Icinga/Data/ConnectionInterface.php   |  3 ++-
 .../Icinga/Data/DataArray/ArrayDatasource.php |  5 ++--
 library/Icinga/Data/Db/DbConnection.php       |  3 ++-
 library/Icinga/Data/Db/DbQuery.php            |  3 ++-
 library/Icinga/Data/Fetchable.php             |  3 ++-
 library/Icinga/Data/Filter/Filter.php         |  3 ++-
 library/Icinga/Data/Filter/FilterAnd.php      |  5 ++--
 library/Icinga/Data/Filter/FilterChain.php    |  7 +++---
 library/Icinga/Data/Filter/FilterEqual.php    |  3 ++-
 .../Data/Filter/FilterEqualOrGreaterThan.php  |  3 ++-
 .../Data/Filter/FilterEqualOrLessThan.php     |  3 ++-
 .../Icinga/Data/Filter/FilterException.php    |  3 ++-
 .../Icinga/Data/Filter/FilterExpression.php   |  3 ++-
 .../Icinga/Data/Filter/FilterGreaterThan.php  |  3 ++-
 library/Icinga/Data/Filter/FilterLessThan.php |  3 ++-
 library/Icinga/Data/Filter/FilterMatch.php    |  3 ++-
 library/Icinga/Data/Filter/FilterMatchNot.php |  3 ++-
 library/Icinga/Data/Filter/FilterNot.php      |  3 ++-
 library/Icinga/Data/Filter/FilterNotEqual.php |  3 ++-
 library/Icinga/Data/Filter/FilterOr.php       |  3 ++-
 .../Data/Filter/FilterParseException.php      |  3 ++-
 .../Icinga/Data/Filter/FilterQueryString.php  |  3 ++-
 library/Icinga/Data/Filterable.php            |  3 ++-
 library/Icinga/Data/Identifiable.php          |  3 ++-
 library/Icinga/Data/Limitable.php             |  3 ++-
 library/Icinga/Data/PivotTable.php            |  3 ++-
 library/Icinga/Data/QueryInterface.php        |  3 ++-
 library/Icinga/Data/Queryable.php             |  3 ++-
 library/Icinga/Data/ResourceFactory.php       |  3 ++-
 library/Icinga/Data/Selectable.php            |  3 ++-
 library/Icinga/Data/SimpleQuery.php           |  3 ++-
 library/Icinga/Data/Sortable.php              |  3 ++-
 library/Icinga/Data/Tree/Node.php             |  3 ++-
 library/Icinga/Data/Tree/NodeInterface.php    |  3 ++-
 .../Exception/AuthenticationException.php     |  3 ++-
 .../Icinga/Exception/ConfigurationError.php   |  3 ++-
 library/Icinga/Exception/IcingaException.php  |  3 ++-
 .../Exception/InvalidPropertyException.php    |  3 ++-
 .../Exception/MissingParameterException.php   |  3 ++-
 library/Icinga/Exception/NotFoundError.php    |  3 ++-
 .../Icinga/Exception/NotImplementedError.php  |  3 ++-
 library/Icinga/Exception/NotReadableError.php |  3 ++-
 library/Icinga/Exception/NotWritableError.php |  3 ++-
 library/Icinga/Exception/ProgrammingError.php |  3 ++-
 library/Icinga/Exception/QueryException.php   |  3 ++-
 .../Exception/SystemPermissionException.php   |  3 ++-
 library/Icinga/File/Csv.php                   |  3 ++-
 .../File/FileExtensionFilterIterator.php      |  3 ++-
 library/Icinga/File/Ini/IniEditor.php         |  3 ++-
 library/Icinga/File/Ini/IniWriter.php         |  3 ++-
 library/Icinga/File/NonEmptyFileIterator.php  |  3 ++-
 library/Icinga/File/Pdf.php                   |  3 ++-
 library/Icinga/Protocol/Dns.php               |  3 ++-
 .../File/Exception/FileReaderException.php    |  2 +-
 library/Icinga/Protocol/File/FileIterator.php |  3 ++-
 library/Icinga/Protocol/File/FileQuery.php    |  3 ++-
 library/Icinga/Protocol/File/FileReader.php   |  3 ++-
 library/Icinga/Protocol/Ldap/Connection.php   |  3 ++-
 library/Icinga/Protocol/Ldap/Discovery.php    |  5 ++--
 library/Icinga/Protocol/Ldap/Exception.php    |  3 ++-
 library/Icinga/Protocol/Ldap/LdapUtils.php    |  3 ++-
 library/Icinga/Protocol/Ldap/Node.php         |  3 ++-
 library/Icinga/Protocol/Ldap/Query.php        |  3 ++-
 library/Icinga/Protocol/Ldap/Root.php         |  3 ++-
 .../Icinga/Protocol/Livestatus/Connection.php |  5 ++--
 library/Icinga/Protocol/Livestatus/Query.php  |  9 ++++----
 .../Protocol/Livestatus/ResponseRow.php       |  1 -
 library/Icinga/Protocol/Nrpe/Connection.php   |  3 ++-
 library/Icinga/Protocol/Nrpe/Packet.php       |  3 ++-
 library/Icinga/Security/SecurityException.php |  1 -
 library/Icinga/Test/BaseTestCase.php          |  3 ++-
 library/Icinga/Test/DbTest.php                |  3 ++-
 library/Icinga/User.php                       |  3 ++-
 library/Icinga/User/Preferences.php           |  3 ++-
 .../User/Preferences/PreferencesStore.php     |  3 ++-
 .../Icinga/User/Preferences/Store/DbStore.php |  3 ++-
 .../User/Preferences/Store/IniStore.php       |  3 ++-
 library/Icinga/Util/Color.php                 |  3 ++-
 library/Icinga/Util/ConfigAwareFactory.php    |  3 ++-
 library/Icinga/Util/DateTimeFactory.php       |  3 ++-
 library/Icinga/Util/Dimension.php             |  3 ++-
 .../Icinga/Util/EnumeratingFilterIterator.php |  3 ++-
 library/Icinga/Util/File.php                  |  3 ++-
 library/Icinga/Util/Format.php                |  3 ++-
 library/Icinga/Util/String.php                |  3 ++-
 library/Icinga/Util/TimezoneDetect.php        |  3 ++-
 library/Icinga/Util/Translator.php            |  3 ++-
 library/Icinga/Web/Controller.php             |  1 -
 .../Web/Controller/ActionController.php       |  1 -
 .../Controller/BasePreferenceController.php   |  3 ++-
 .../Web/Controller/ControllerTabCollector.php |  3 ++-
 .../Web/Controller/ModuleActionController.php |  3 ++-
 library/Icinga/Web/FileCache.php              |  2 +-
 library/Icinga/Web/Form.php                   |  1 -
 .../Web/Form/Decorator/ConditionalHidden.php  |  3 ++-
 .../Web/Form/Decorator/ElementDoubler.php     |  3 ++-
 .../Web/Form/Decorator/NoScriptApply.php      |  3 ++-
 library/Icinga/Web/Form/Element/Button.php    |  3 ++-
 .../Web/Form/Element/CsrfCounterMeasure.php   |  3 ++-
 .../Web/Form/Element/DateTimePicker.php       |  3 ++-
 library/Icinga/Web/Form/Element/Note.php      |  3 ++-
 library/Icinga/Web/Form/Element/Number.php    |  3 ++-
 .../Web/Form/Element/TriStateCheckbox.php     |  3 ++-
 library/Icinga/Web/Form/FormElement.php       |  3 ++-
 .../Web/Form/InvalidCSRFTokenException.php    |  3 ++-
 .../Form/Validator/DateFormatValidator.php    |  3 ++-
 .../Web/Form/Validator/DateTimeValidator.php  |  3 ++-
 .../Form/Validator/ReadablePathValidator.php  |  3 ++-
 .../Form/Validator/TimeFormatValidator.php    |  3 ++-
 .../Web/Form/Validator/TriStateValidator.php  |  3 ++-
 .../Form/Validator/WritablePathValidator.php  |  3 ++-
 library/Icinga/Web/Hook.php                   |  3 ++-
 library/Icinga/Web/Hook/GrapherHook.php       |  3 ++-
 library/Icinga/Web/Hook/TicketHook.php        |  3 ++-
 library/Icinga/Web/Hook/WebBaseHook.php       |  5 ++--
 library/Icinga/Web/JavaScript.php             |  3 ++-
 library/Icinga/Web/LessCompiler.php           |  3 ++-
 library/Icinga/Web/Menu.php                   |  3 ++-
 .../Web/Menu/ForeignMenuItemRenderer.php      |  3 ++-
 library/Icinga/Web/Menu/MenuItemRenderer.php  |  3 ++-
 .../Web/Menu/MonitoringMenuItemRenderer.php   |  3 ++-
 .../Web/Menu/ProblemMenuItemRenderer.php      |  1 -
 .../Menu/UnhandledHostMenuItemRenderer.php    |  1 -
 .../Menu/UnhandledServiceMenuItemRenderer.php |  1 -
 library/Icinga/Web/MenuRenderer.php           |  3 ++-
 library/Icinga/Web/Notification.php           |  3 ++-
 .../Web/Paginator/Adapter/QueryAdapter.php    |  3 ++-
 .../ScrollingStyle/SlidingWithBorder.php      |  5 ++--
 library/Icinga/Web/Request.php                |  3 ++-
 library/Icinga/Web/Response.php               |  3 ++-
 library/Icinga/Web/Session.php                |  3 ++-
 library/Icinga/Web/Session/PhpSession.php     |  3 ++-
 library/Icinga/Web/Session/Session.php        |  3 ++-
 .../Icinga/Web/Session/SessionNamespace.php   |  3 ++-
 library/Icinga/Web/StyleSheet.php             |  3 ++-
 library/Icinga/Web/Url.php                    |  3 ++-
 library/Icinga/Web/UrlParams.php              |  5 ++--
 library/Icinga/Web/View.php                   |  3 ++-
 library/Icinga/Web/View/DateTimeRenderer.php  |  3 ++-
 library/Icinga/Web/View/helpers/format.php    |  3 ++-
 library/Icinga/Web/View/helpers/generic.php   |  3 ++-
 library/Icinga/Web/View/helpers/url.php       |  5 ++--
 library/Icinga/Web/ViewStream.php             |  3 ++-
 library/Icinga/Web/Widget.php                 |  3 ++-
 library/Icinga/Web/Widget/AbstractWidget.php  |  3 ++-
 .../Web/Widget/Chart/HistoryColorGrid.php     |  3 ++-
 library/Icinga/Web/Widget/Chart/InlinePie.php |  3 ++-
 library/Icinga/Web/Widget/Dashboard.php       |  3 ++-
 .../Icinga/Web/Widget/Dashboard/Dashlet.php   |  3 ++-
 library/Icinga/Web/Widget/Dashboard/Pane.php  |  3 ++-
 .../Web/Widget/Dashboard/UserWidget.php       |  3 ++-
 library/Icinga/Web/Widget/FilterEditor.php    |  9 ++++----
 library/Icinga/Web/Widget/FilterWidget.php    |  5 ++--
 library/Icinga/Web/Widget/Limiter.php         |  3 ++-
 library/Icinga/Web/Widget/SearchDashboard.php |  3 ++-
 library/Icinga/Web/Widget/SortBox.php         |  3 ++-
 library/Icinga/Web/Widget/Tab.php             |  3 ++-
 .../Web/Widget/Tabextension/BasketAction.php  |  3 ++-
 .../Widget/Tabextension/DashboardAction.php   |  3 ++-
 .../Widget/Tabextension/DashboardSettings.php |  5 ++--
 .../Web/Widget/Tabextension/OutputFormat.php  |  3 ++-
 .../Web/Widget/Tabextension/Tabextension.php  |  3 ++-
 library/Icinga/Web/Widget/Tabs.php            |  3 ++-
 library/Icinga/Web/Widget/Widget.php          |  3 ++-
 library/Icinga/Web/Window.php                 |  3 ++-
 library/Icinga/Web/Wizard.php                 |  3 ++-
 .../controllers/IcingawebController.php       |  3 ++-
 .../controllers/IndexController.php           |  3 ++-
 .../controllers/ModuleController.php          |  3 ++-
 .../controllers/StyleController.php           |  1 -
 modules/doc/configuration.php                 |  3 ++-
 modules/doc/library/Doc/DocController.php     |  3 ++-
 modules/doc/library/Doc/DocIterator.php       |  3 ++-
 modules/doc/library/Doc/DocParser.php         |  3 ++-
 modules/doc/library/Doc/DocTree.php           |  3 ++-
 .../Exception/ChapterNotFoundException.php    |  3 ++-
 .../Doc/Exception/DocEmptyException.php       |  3 ++-
 .../library/Doc/Exception/DocException.php    |  3 ++-
 modules/doc/library/Doc/Renderer.php          |  3 ++-
 modules/doc/library/Doc/Section.php           |  3 ++-
 .../doc/library/Doc/SectionFilterIterator.php |  3 ++-
 modules/doc/library/Doc/SectionRenderer.php   |  3 ++-
 modules/doc/library/Doc/TocRenderer.php       |  3 ++-
 modules/doc/public/css/module.less            |  2 --
 modules/doc/run.php                           |  1 -
 .../clicommands/ConferenceCommand.php         |  3 ++-
 .../application/clicommands/ListCommand.php   |  3 ++-
 .../application/clicommands/NrpeCommand.php   |  3 ++-
 .../controllers/AlertsummaryController.php    |  3 ++-
 .../controllers/ChartController.php           |  3 ++-
 .../controllers/ConfigController.php          |  3 ++-
 .../controllers/HostController.php            |  3 ++-
 .../controllers/HostsController.php           |  3 ++-
 .../controllers/ListController.php            |  1 -
 .../controllers/ProcessController.php         |  3 ++-
 .../controllers/ServiceController.php         |  3 ++-
 .../controllers/ServicesController.php        |  3 ++-
 .../controllers/ShowController.php            |  3 ++-
 .../controllers/TacticalController.php        |  3 ++-
 .../controllers/TimelineController.php        |  3 ++-
 .../application/forms/Command/CommandForm.php |  3 ++-
 .../DisableNotificationsExpireCommandForm.php |  3 ++-
 .../ToggleInstanceFeaturesCommandForm.php     |  3 ++-
 .../Object/AcknowledgeProblemCommandForm.php  |  3 ++-
 .../Command/Object/AddCommentCommandForm.php  |  3 ++-
 .../Command/Object/CheckNowCommandForm.php    |  3 ++-
 .../Object/DeleteCommentCommandForm.php       |  3 ++-
 .../Object/DeleteDowntimeCommandForm.php      |  3 ++-
 .../Command/Object/ObjectsCommandForm.php     |  3 ++-
 .../Object/ProcessCheckResultCommandForm.php  |  3 ++-
 .../RemoveAcknowledgementCommandForm.php      |  3 ++-
 .../Object/ScheduleHostCheckCommandForm.php   |  3 ++-
 .../ScheduleHostDowntimeCommandForm.php       |  3 ++-
 .../ScheduleServiceCheckCommandForm.php       |  3 ++-
 .../ScheduleServiceDowntimeCommandForm.php    |  3 ++-
 .../ToggleObjectFeaturesCommandForm.php       |  3 ++-
 .../forms/Config/BackendConfigForm.php        |  3 ++-
 .../Config/Instance/LocalInstanceForm.php     |  3 ++-
 .../Config/Instance/RemoteInstanceForm.php    |  3 ++-
 .../forms/Config/InstanceConfigForm.php       |  3 ++-
 .../forms/Config/SecurityConfigForm.php       |  3 ++-
 .../application/forms/EventOverviewForm.php   |  3 ++-
 .../application/forms/Setup/BackendPage.php   |  3 ++-
 .../forms/Setup/IdoResourcePage.php           |  3 ++-
 .../application/forms/Setup/InstancePage.php  |  3 ++-
 .../forms/Setup/LivestatusResourcePage.php    |  3 ++-
 .../application/forms/Setup/SecurityPage.php  |  3 ++-
 .../application/forms/Setup/WelcomePage.php   |  3 ++-
 .../application/forms/StatehistoryForm.php    |  3 ++-
 .../views/helpers/CheckPerformance.php        |  3 ++-
 .../views/helpers/ContactFlags.php            |  3 ++-
 .../application/views/helpers/Customvar.php   |  1 -
 .../application/views/helpers/Link.php        |  1 -
 .../views/helpers/MonitoringFlags.php         |  3 ++-
 .../application/views/helpers/Perfdata.php    |  3 ++-
 .../views/helpers/PluginOutput.php            |  3 ++-
 .../views/helpers/ResolveMacros.php           |  3 ++-
 .../views/helpers/RuntimeVariables.php        |  3 ++-
 .../views/helpers/SelectionToolbar.php        |  3 ++-
 modules/monitoring/configuration.php          |  1 -
 .../monitoring/library/Monitoring/Backend.php |  1 -
 .../Monitoring/Backend/Ido/IdoBackend.php     |  1 -
 .../Backend/Ido/Query/AllcontactsQuery.php    |  3 ++-
 .../Backend/Ido/Query/CommandQuery.php        |  5 ++--
 .../Backend/Ido/Query/CommentQuery.php        |  3 ++-
 .../Ido/Query/CommentdeletionhistoryQuery.php |  3 ++-
 .../Backend/Ido/Query/CommenthistoryQuery.php |  3 ++-
 .../Backend/Ido/Query/ContactQuery.php        |  3 ++-
 .../Backend/Ido/Query/ContactgroupQuery.php   |  3 ++-
 .../Backend/Ido/Query/CustomvarQuery.php      |  3 ++-
 .../Backend/Ido/Query/DowntimeQuery.php       |  1 -
 .../Ido/Query/DowntimeendhistoryQuery.php     |  3 ++-
 .../Ido/Query/DowntimestarthistoryQuery.php   |  3 ++-
 .../Backend/Ido/Query/EventHistoryQuery.php   |  1 -
 .../Backend/Ido/Query/EventgridQuery.php      |  3 ++-
 .../Backend/Ido/Query/GroupsummaryQuery.php   |  3 ++-
 .../Backend/Ido/Query/HostgroupQuery.php      |  3 ++-
 .../Backend/Ido/Query/HoststatusQuery.php     |  3 ++-
 .../Monitoring/Backend/Ido/Query/IdoQuery.php |  3 ++-
 .../Backend/Ido/Query/NotificationQuery.php   |  1 -
 .../Ido/Query/NotificationhistoryQuery.php    |  3 ++-
 .../Backend/Ido/Query/ProgramstatusQuery.php  |  3 ++-
 .../Backend/Ido/Query/RuntimesummaryQuery.php |  3 ++-
 .../Ido/Query/RuntimevariablesQuery.php       |  3 ++-
 .../Backend/Ido/Query/ServicegroupQuery.php   |  3 ++-
 .../Backend/Ido/Query/StatehistoryQuery.php   |  1 -
 .../Backend/Ido/Query/StatusQuery.php         |  3 ++-
 .../Backend/Ido/Query/StatusSummaryQuery.php  |  3 ++-
 .../Backend/Livestatus/LivestatusBackend.php  |  1 -
 .../Livestatus/Query/DowntimeQuery.php        |  3 ++-
 .../Livestatus/Query/HostgroupQuery.php       |  3 ++-
 .../Livestatus/Query/ServicegroupQuery.php    |  3 ++-
 .../Backend/Livestatus/Query/StatusQuery.php  |  3 ++-
 .../Livestatus/Query/StatusSummaryQuery.php   |  7 +++---
 .../Monitoring/Backend/MonitoringBackend.php  |  1 -
 .../library/Monitoring/BackendStep.php        |  3 ++-
 .../library/Monitoring/Cli/CliUtils.php       |  3 ++-
 .../Command/Exception/TransportException.php  |  3 ++-
 .../Monitoring/Command/IcingaCommand.php      |  3 ++-
 .../DisableNotificationsExpireCommand.php     |  3 ++-
 .../Instance/ToggleInstanceFeatureCommand.php |  3 ++-
 .../Object/AcknowledgeProblemCommand.php      |  3 ++-
 .../Command/Object/AddCommentCommand.php      |  3 ++-
 .../Command/Object/DeleteCommentCommand.php   |  3 ++-
 .../Command/Object/DeleteDowntimeCommand.php  |  3 ++-
 .../Command/Object/ObjectCommand.php          |  3 ++-
 .../Object/ProcessCheckResultCommand.php      |  3 ++-
 .../Object/PropagateHostDowntimeCommand.php   |  3 ++-
 .../Object/RemoveAcknowledgementCommand.php   |  3 ++-
 .../Object/ScheduleHostCheckCommand.php       |  3 ++-
 .../Object/ScheduleHostDowntimeCommand.php    |  3 ++-
 .../Object/ScheduleServiceCheckCommand.php    |  3 ++-
 .../Object/ScheduleServiceDowntimeCommand.php |  3 ++-
 .../Object/ToggleObjectFeatureCommand.php     |  3 ++-
 .../Command/Object/WithCommentCommand.php     |  3 ++-
 .../IcingaCommandFileCommandRenderer.php      |  1 -
 .../IcingaCommandRendererInterface.php        |  1 -
 .../Command/Transport/CommandTransport.php    |  3 ++-
 .../Transport/CommandTransportInterface.php   |  3 ++-
 .../Command/Transport/LocalCommandFile.php    |  3 ++-
 .../Command/Transport/RemoteCommandFile.php   |  3 ++-
 .../library/Monitoring/Controller.php         |  3 ++-
 .../library/Monitoring/DataView/Command.php   |  5 ++--
 .../library/Monitoring/DataView/Comment.php   |  3 ++-
 .../library/Monitoring/DataView/Contact.php   |  3 ++-
 .../Monitoring/DataView/Contactgroup.php      |  3 ++-
 .../library/Monitoring/DataView/Customvar.php |  3 ++-
 .../library/Monitoring/DataView/DataView.php  |  3 ++-
 .../library/Monitoring/DataView/Downtime.php  |  3 ++-
 .../Monitoring/DataView/EventHistory.php      |  1 -
 .../library/Monitoring/DataView/Eventgrid.php |  3 ++-
 .../Monitoring/DataView/Groupsummary.php      |  3 ++-
 .../Monitoring/DataView/HostStatus.php        |  3 ++-
 .../library/Monitoring/DataView/Hostgroup.php |  3 ++-
 .../Monitoring/DataView/Notification.php      |  3 ++-
 .../Monitoring/DataView/Programstatus.php     |  3 ++-
 .../Monitoring/DataView/Runtimesummary.php    |  3 ++-
 .../Monitoring/DataView/Runtimevariables.php  |  3 ++-
 .../Monitoring/DataView/ServiceStatus.php     |  3 ++-
 .../Monitoring/DataView/Servicegroup.php      |  3 ++-
 .../Monitoring/DataView/StatusSummary.php     |  3 ++-
 .../library/Monitoring/Environment.php        |  3 ++-
 .../Exception/UnsupportedBackendException.php |  3 ++-
 .../library/Monitoring/InstanceStep.php       |  3 ++-
 .../library/Monitoring/MonitoringWizard.php   |  3 ++-
 .../library/Monitoring/Object/Host.php        |  3 ++-
 .../library/Monitoring/Object/HostList.php    |  1 -
 .../Monitoring/Object/MonitoredObject.php     |  3 ++-
 .../library/Monitoring/Object/ObjectList.php  |  1 -
 .../library/Monitoring/Object/Service.php     |  3 ++-
 .../library/Monitoring/Object/ServiceList.php |  1 -
 .../monitoring/library/Monitoring/Plugin.php  |  3 ++-
 .../library/Monitoring/Plugin/Perfdata.php    |  3 ++-
 .../library/Monitoring/Plugin/PerfdataSet.php |  3 ++-
 .../library/Monitoring/SecurityStep.php       |  5 ++--
 .../library/Monitoring/Timeline/TimeEntry.php |  3 ++-
 .../library/Monitoring/Timeline/TimeLine.php  |  3 ++-
 .../library/Monitoring/Timeline/TimeRange.php |  3 ++-
 .../Controller/MonitoredObjectController.php  |  1 -
 .../Monitoring/Web/Hook/HostActionsHook.php   |  1 -
 .../Web/Hook/TimelineProviderHook.php         |  3 ++-
 .../Monitoring/Web/Widget/SelectBox.php       |  5 ++--
 modules/monitoring/public/css/module.less     |  7 +++---
 modules/monitoring/public/js/module.js        |  3 ++-
 .../views/helpers/MonitoringFlagsTest.php     |  3 ++-
 .../views/helpers/ResolveMacrosTest.php       |  3 ++-
 .../Monitoring/Plugin/PerfdataSetTest.php     |  3 ++-
 .../Monitoring/Plugin/PerfdataTest.php        |  3 ++-
 .../test/php/regression/Bug6088Test.php       |  3 ++-
 .../test/php/regression/Bug7043Test.php       |  3 +--
 .../application/clicommands/ConfigCommand.php |  3 ++-
 .../application/clicommands/TokenCommand.php  |  3 ++-
 .../controllers/IndexController.php           |  3 ++-
 .../application/forms/AdminAccountPage.php    |  3 ++-
 .../application/forms/AuthBackendPage.php     |  3 ++-
 .../application/forms/AuthenticationPage.php  |  3 ++-
 .../forms/DatabaseCreationPage.php            |  3 ++-
 .../application/forms/DbResourcePage.php      |  3 ++-
 .../application/forms/GeneralConfigPage.php   |  3 ++-
 .../forms/LdapDiscoveryConfirmPage.php        |  3 ++-
 .../application/forms/LdapDiscoveryPage.php   |  3 ++-
 .../application/forms/LdapResourcePage.php    |  3 ++-
 .../setup/application/forms/ModulePage.php    |  3 ++-
 .../application/forms/PreferencesPage.php     |  3 ++-
 .../application/forms/RequirementsPage.php    |  3 ++-
 .../setup/application/forms/SummaryPage.php   |  3 ++-
 .../setup/application/forms/WelcomePage.php   |  3 ++-
 .../Setup/Exception/SetupException.php        |  5 ++--
 modules/setup/library/Setup/Requirements.php  |  3 ++-
 modules/setup/library/Setup/Setup.php         |  3 ++-
 modules/setup/library/Setup/SetupWizard.php   |  3 ++-
 modules/setup/library/Setup/Step.php          |  3 ++-
 .../Setup/Steps/AuthenticationStep.php        |  3 ++-
 .../library/Setup/Steps/DatabaseStep.php      |  3 ++-
 .../library/Setup/Steps/GeneralConfigStep.php |  3 ++-
 .../library/Setup/Steps/ResourceStep.php      |  3 ++-
 modules/setup/library/Setup/Utils/DbTool.php  |  3 ++-
 .../library/Setup/Utils/EnableModuleStep.php  |  3 ++-
 .../setup/library/Setup/Utils/MakeDirStep.php |  3 ++-
 .../Web/Form/Validator/TokenValidator.php     |  3 ++-
 modules/setup/library/Setup/WebWizard.php     |  3 ++-
 modules/setup/library/Setup/Webserver.php     |  3 ++-
 .../setup/library/Setup/Webserver/Apache.php  |  3 ++-
 .../setup/library/Setup/Webserver/Nginx.php   |  3 ++-
 .../application/clicommands/PhpCommand.php    |  3 ++-
 .../clicommands/CompileCommand.php            |  3 ++-
 .../clicommands/RefreshCommand.php            |  3 ++-
 .../Translation/Cli/TranslationCommand.php    |  3 ++-
 .../Util/GettextTranslationHelper.php         |  3 ++-
 packages/files/bin/icingacli                  |  1 -
 packages/files/public/index.php               |  1 -
 public/css/icinga/defaults.less               |  3 ++-
 public/css/icinga/forms.less                  |  3 ++-
 public/css/icinga/header-elements.less        |  3 ++-
 public/css/icinga/layout-colors.less          |  3 ++-
 public/css/icinga/layout-structure.less       |  3 ++-
 public/css/icinga/login.less                  |  5 ++--
 public/css/icinga/main-content.less           |  5 ++--
 public/css/icinga/menu.less                   |  3 ++-
 public/css/icinga/monitoring-colors.less      | 17 +++++++-------
 public/css/icinga/pagination.less             |  3 ++-
 public/css/icinga/selection-toolbar.less      |  3 ++-
 public/css/icinga/setup.less                  |  4 +---
 public/css/icinga/tabs.less                   |  3 ++-
 public/css/icinga/widgets.less                |  5 ++--
 public/css/pdf/pdfprint.less                  |  3 ++-
 public/index.php                              |  3 ++-
 public/js/helpers.js                          |  3 ++-
 public/js/icinga.js                           |  3 ++-
 public/js/icinga/behavior/form.js             |  3 ++-
 public/js/icinga/behavior/navigation.js       |  5 ++--
 public/js/icinga/behavior/sparkline.js        |  3 ++-
 public/js/icinga/behavior/tooltip.js          |  3 ++-
 public/js/icinga/behavior/tristate.js         |  5 ++--
 public/js/icinga/eventlistener.js             |  3 ++-
 public/js/icinga/events.js                    |  3 ++-
 public/js/icinga/history.js                   |  3 ++-
 public/js/icinga/loader.js                    |  3 ++-
 public/js/icinga/logger.js                    |  3 ++-
 public/js/icinga/module.js                    |  3 ++-
 public/js/icinga/timer.js                     |  3 ++-
 public/js/icinga/timezone.js                  |  4 +---
 public/js/icinga/ui.js                        | 23 ++++++++++---------
 public/js/icinga/utils.js                     |  3 ++-
 .../Authentication/DbBackendFormTest.php      |  3 ++-
 .../Authentication/LdapBackendFormTest.php    |  3 ++-
 .../AuthenticationBackendReorderFormTest.php  |  3 ++-
 .../Config/Resource/DbResourceFormTest.php    |  3 ++-
 .../Config/Resource/LdapResourceFormTest.php  |  3 ++-
 .../Resource/LivestatusResourceFormTest.php   |  3 ++-
 .../views/helpers/DateFormatTestBroken.php    |  3 ++-
 test/php/bootstrap.php                        |  3 ++-
 .../library/Icinga/Application/ConfigTest.php |  3 ++-
 .../library/Icinga/Application/LoaderTest.php |  3 ++-
 .../library/Icinga/Chart/GraphChartTest.php   |  3 ++-
 .../php/library/Icinga/Chart/PieChartTest.php |  5 ++--
 .../library/Icinga/Data/ConfigObjectTest.php  |  3 ++-
 .../Data/DataArray/ArrayDatasourceTest.php    |  3 ++-
 .../library/Icinga/Data/Filter/FilterTest.php |  3 ++-
 test/php/library/Icinga/File/CsvTest.php      |  3 ++-
 .../library/Icinga/File/Ini/IniWriterTest.php |  3 ++-
 .../Icinga/Logger/Writer/StreamWriterTest.php |  3 ++-
 .../Icinga/Protocol/Ldap/QueryTest.php        |  3 ++-
 .../library/Icinga/Test/BaseTestCaseTest.php  |  3 ++-
 .../library/Icinga/User/PreferencesTest.php   |  3 ++-
 .../library/Icinga/User/Store/DbStoreTest.php |  3 ++-
 .../Icinga/User/Store/IniStoreTest.php        |  3 ++-
 test/php/library/Icinga/UserTest.php          |  3 ++-
 .../Icinga/Util/DateTimeFactoryTest.php       |  3 ++-
 .../php/library/Icinga/Util/DimensionTest.php |  3 ++-
 test/php/library/Icinga/Util/FileTest.php     |  3 ++-
 test/php/library/Icinga/Util/StringTest.php   |  3 ++-
 .../library/Icinga/Util/TranslatorTest.php    |  3 ++-
 .../Web/Form/Element/DateTimePickerTest.php   |  3 ++-
 .../Validator/DateFormatValidatorTest.php     |  3 ++-
 .../Validator/TimeFormatValidatorTest.php     |  3 ++-
 .../Validator/WritablePathValidatorTest.php   |  3 ++-
 test/php/library/Icinga/Web/FormTest.php      |  3 ++-
 test/php/library/Icinga/Web/HookTest.php      |  3 ++-
 test/php/library/Icinga/Web/MenuTest.php      |  3 ++-
 .../ScrollingStyle/SlidingWithBorderTest.php  |  3 ++-
 .../Icinga/Web/Session/PhpSessionTest.php     |  3 ++-
 .../Web/Session/SessionNamespaceTest.php      |  3 ++-
 test/php/library/Icinga/Web/UrlTest.php       |  3 ++-
 .../Icinga/Web/View/DateTimeRendererTest.php  |  3 ++-
 .../Icinga/Web/Widget/DashboardTest.php       |  3 ++-
 .../Icinga/Web/Widget/SearchDashboardTest.php |  3 ++-
 test/php/regression/Bug4102Test.php           |  3 ++-
 test/php/regression/Bug6284Test.php           |  3 ++-
 test/php/regression/Bug6432Test.php           |  3 ++-
 590 files changed, 1165 insertions(+), 652 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 9090b23aa..1e5e3a073 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,8 +1,6 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt
-
 VAGRANTFILE_API_VERSION = "2"
 VAGRANT_REQUIRED_VERSION = "1.5.0"
 
diff --git a/application/clicommands/AutocompleteCommand.php b/application/clicommands/AutocompleteCommand.php
index 045ee8cdc..5a5a0e0c0 100644
--- a/application/clicommands/AutocompleteCommand.php
+++ b/application/clicommands/AutocompleteCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Clicommands;
 
diff --git a/application/clicommands/HelpCommand.php b/application/clicommands/HelpCommand.php
index 4cc197f3e..7c1977f59 100644
--- a/application/clicommands/HelpCommand.php
+++ b/application/clicommands/HelpCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Clicommands;
 
diff --git a/application/clicommands/ModuleCommand.php b/application/clicommands/ModuleCommand.php
index 5d5c30518..e38d134c3 100644
--- a/application/clicommands/ModuleCommand.php
+++ b/application/clicommands/ModuleCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Clicommands;
 
diff --git a/application/clicommands/WebCommand.php b/application/clicommands/WebCommand.php
index 46b4e8a3d..12ed9e1a4 100644
--- a/application/clicommands/WebCommand.php
+++ b/application/clicommands/WebCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Clicommands;
 
diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index e7a4c82e4..4e70894a1 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 # namespace Icinga\Application\Controllers;
 
diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index a1bf52514..078503346 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Application\Config;
 use Icinga\Application\Icinga;
diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 009c715c3..12a5180c8 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use \Exception;
 use Icinga\Exception\ProgrammingError;
diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index 84d6c0998..0548b5c9c 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php
index 78c4c1068..09e8f0368 100644
--- a/application/controllers/FilterController.php
+++ b/application/controllers/FilterController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Web\Controller\ActionController;
 use Icinga\Filter\Filter;
diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php
index 6537a0b61..05e66504b 100644
--- a/application/controllers/IndexController.php
+++ b/application/controllers/IndexController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 # namespace Icinga\Application\Controllers;
 
diff --git a/application/controllers/LayoutController.php b/application/controllers/LayoutController.php
index ae9df3734..2d84faf3c 100644
--- a/application/controllers/LayoutController.php
+++ b/application/controllers/LayoutController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Web\MenuRenderer;
 use Icinga\Web\Controller\ActionController;
diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index 1051aeae1..f8b0ed1d6 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Web\Url;
diff --git a/application/controllers/PreferenceController.php b/application/controllers/PreferenceController.php
index 7034b953d..832f57644 100644
--- a/application/controllers/PreferenceController.php
+++ b/application/controllers/PreferenceController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Web\Controller\BasePreferenceController;
 use Icinga\Web\Url;
diff --git a/application/controllers/RolesController.php b/application/controllers/RolesController.php
index edf2a3689..f4c6aeed2 100644
--- a/application/controllers/RolesController.php
+++ b/application/controllers/RolesController.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Application\Config;
 use Icinga\Forms\ConfirmRemovalForm;
diff --git a/application/controllers/SearchController.php b/application/controllers/SearchController.php
index a9bab30d7..68fd5dd3d 100644
--- a/application/controllers/SearchController.php
+++ b/application/controllers/SearchController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Web\Controller\ActionController;
 use Icinga\Web\Widget;
diff --git a/application/controllers/StaticController.php b/application/controllers/StaticController.php
index 549a32419..fc5f1354f 100644
--- a/application/controllers/StaticController.php
+++ b/application/controllers/StaticController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Web\Controller\ActionController;
 use Icinga\Application\Icinga;
diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index 0b3abaeb2..8be455dcc 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms\Authentication;
 
diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index 2bdb08949..d3a5af51d 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms\Config\Authentication;
 
diff --git a/application/forms/Config/Authentication/ExternalBackendForm.php b/application/forms/Config/Authentication/ExternalBackendForm.php
index 30791cb04..51000b2d2 100644
--- a/application/forms/Config/Authentication/ExternalBackendForm.php
+++ b/application/forms/Config/Authentication/ExternalBackendForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms\Config\Authentication;
 
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index d84bb5bd3..1b8fc3f11 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms\Config\Authentication;
 
diff --git a/application/forms/Config/AuthenticationBackendConfigForm.php b/application/forms/Config/AuthenticationBackendConfigForm.php
index 391533ad7..de3093ada 100644
--- a/application/forms/Config/AuthenticationBackendConfigForm.php
+++ b/application/forms/Config/AuthenticationBackendConfigForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms\Config;
 
diff --git a/application/forms/Config/AuthenticationBackendReorderForm.php b/application/forms/Config/AuthenticationBackendReorderForm.php
index a207572c7..a41224248 100644
--- a/application/forms/Config/AuthenticationBackendReorderForm.php
+++ b/application/forms/Config/AuthenticationBackendReorderForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms\Config;
 
diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php
index 0e1ac1f46..29b7b512e 100644
--- a/application/forms/Config/General/ApplicationConfigForm.php
+++ b/application/forms/Config/General/ApplicationConfigForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms\Config\General;
 
diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php
index 12e9ae593..997bd558a 100644
--- a/application/forms/Config/General/LoggingConfigForm.php
+++ b/application/forms/Config/General/LoggingConfigForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms\Config\General;
 
diff --git a/application/forms/Config/GeneralConfigForm.php b/application/forms/Config/GeneralConfigForm.php
index 22e83ff30..7e3357d7b 100644
--- a/application/forms/Config/GeneralConfigForm.php
+++ b/application/forms/Config/GeneralConfigForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms\Config;
 
diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
index 56edbf178..97dd951d1 100644
--- a/application/forms/Config/Resource/DbResourceForm.php
+++ b/application/forms/Config/Resource/DbResourceForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms\Config\Resource;
 
diff --git a/application/forms/Config/Resource/FileResourceForm.php b/application/forms/Config/Resource/FileResourceForm.php
index 7d46cc6fb..960926114 100644
--- a/application/forms/Config/Resource/FileResourceForm.php
+++ b/application/forms/Config/Resource/FileResourceForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms\Config\Resource;
 
diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 6e8052579..3293546c5 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms\Config\Resource;
 
diff --git a/application/forms/Config/Resource/LivestatusResourceForm.php b/application/forms/Config/Resource/LivestatusResourceForm.php
index d7bf7d883..e893a4657 100644
--- a/application/forms/Config/Resource/LivestatusResourceForm.php
+++ b/application/forms/Config/Resource/LivestatusResourceForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms\Config\Resource;
 
diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php
index 1b860c193..67912142a 100644
--- a/application/forms/Config/ResourceConfigForm.php
+++ b/application/forms/Config/ResourceConfigForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms\Config;
 
diff --git a/application/forms/ConfigForm.php b/application/forms/ConfigForm.php
index 18410ef2d..224633f1f 100644
--- a/application/forms/ConfigForm.php
+++ b/application/forms/ConfigForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms;
 
diff --git a/application/forms/ConfirmRemovalForm.php b/application/forms/ConfirmRemovalForm.php
index 6ef9258ec..6840db37d 100644
--- a/application/forms/ConfirmRemovalForm.php
+++ b/application/forms/ConfirmRemovalForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms;
 
diff --git a/application/forms/Dashboard/DashletForm.php b/application/forms/Dashboard/DashletForm.php
index c1e29c063..e58ca8aba 100644
--- a/application/forms/Dashboard/DashletForm.php
+++ b/application/forms/Dashboard/DashletForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms\Dashboard;
 
diff --git a/application/forms/LdapDiscoveryForm.php b/application/forms/LdapDiscoveryForm.php
index 7da98a277..6a14c2ecd 100644
--- a/application/forms/LdapDiscoveryForm.php
+++ b/application/forms/LdapDiscoveryForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms;
 
diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
index 74a9683e3..ed20c58cd 100644
--- a/application/forms/PreferenceForm.php
+++ b/application/forms/PreferenceForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms;
 
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 0e3c97c0a..cc5f4037e 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Forms\Security;
 
diff --git a/application/views/helpers/DateFormat.php b/application/views/helpers/DateFormat.php
index 727c9c8f9..d3515d184 100644
--- a/application/views/helpers/DateFormat.php
+++ b/application/views/helpers/DateFormat.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Application\Icinga;
 use Icinga\Util\DateTimeFactory;
diff --git a/application/views/helpers/FormDateTime.php b/application/views/helpers/FormDateTime.php
index 29bec0c16..b75dfec62 100644
--- a/application/views/helpers/FormDateTime.php
+++ b/application/views/helpers/FormDateTime.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /**
  * Render date-and-time input controls
diff --git a/application/views/helpers/FormNumber.php b/application/views/helpers/FormNumber.php
index 1f8efd83b..c3ccdcfd6 100644
--- a/application/views/helpers/FormNumber.php
+++ b/application/views/helpers/FormNumber.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use \Zend_View_Helper_FormElement;
 
diff --git a/application/views/helpers/FormTriStateCheckbox.php b/application/views/helpers/FormTriStateCheckbox.php
index 107abee4d..695c9af56 100644
--- a/application/views/helpers/FormTriStateCheckbox.php
+++ b/application/views/helpers/FormTriStateCheckbox.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use \Zend_View_Helper_FormElement;
 
diff --git a/application/views/helpers/Util.php b/application/views/helpers/Util.php
index 25e506b25..f3e41244f 100644
--- a/application/views/helpers/Util.php
+++ b/application/views/helpers/Util.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /**
  * Class Zend_View_Helper_Util
diff --git a/bin/icingacli b/bin/icingacli
index 5a2d4c957..c85777c9c 100755
--- a/bin/icingacli
+++ b/bin/icingacli
@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 require_once dirname(__DIR__) . '/library/Icinga/Application/Cli.php';
 
diff --git a/bin/license_writer.py b/bin/license_writer.py
index b904dd34e..532839e2e 100755
--- a/bin/license_writer.py
+++ b/bin/license_writer.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
-# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt
+# {{{ICINGA_LICENSE_HEADER}}}
+# {{{ICINGA_LICENSE_HEADER}}}
 
 import sys
 import logging
diff --git a/etc/bash_completion.d/icingacli b/etc/bash_completion.d/icingacli
index f9be7bcf9..74e779218 100644
--- a/etc/bash_completion.d/icingacli
+++ b/etc/bash_completion.d/icingacli
@@ -1,3 +1,4 @@
+
 _icingacli_completion()
 {
   local cur opts
@@ -8,3 +9,5 @@ _icingacli_completion()
 }
 
 complete -F _icingacli_completion icingacli
+
+
diff --git a/etc/schema/mysql.schema.sql b/etc/schema/mysql.schema.sql
index c1ffcf91f..74d2665d4 100644
--- a/etc/schema/mysql.schema.sql
+++ b/etc/schema/mysql.schema.sql
@@ -1,5 +1,3 @@
-# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt
-
 CREATE TABLE `icingaweb_group`(
   `name`   varchar(64) COLLATE utf8_unicode_ci NOT NULL,
   `parent` varchar(64) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
diff --git a/etc/schema/pgsql.schema.sql b/etc/schema/pgsql.schema.sql
index bbaba8253..77971222b 100644
--- a/etc/schema/pgsql.schema.sql
+++ b/etc/schema/pgsql.schema.sql
@@ -1,5 +1,6 @@
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
-
+/**
+ * Table "icingaweb_group"
+ */
 CREATE TABLE "icingaweb_group" (
   "name"   character varying(64) NOT NULL,
   "parent" character varying(64) NULL DEFAULT NULL,
@@ -19,6 +20,10 @@ CREATE UNIQUE INDEX idx_icingaweb_group
     lower((name)::text)
 );
 
+
+/**
+ * Table "icingaweb_group_membership"
+ */
 CREATE TABLE "icingaweb_group_membership" (
   "group_name" character varying(64) NOT NULL,
   "username"   character varying(64) NOT NULL,
@@ -40,6 +45,10 @@ CREATE UNIQUE INDEX idx_icingaweb_group_membership
     lower((username)::text)
 );
 
+
+/**
+ * Table "icingaweb_user"
+ */
 CREATE TABLE "icingaweb_user" (
   "name"          character varying(64) NOT NULL,
   "active"        smallint NOT NULL,
@@ -60,6 +69,10 @@ CREATE UNIQUE INDEX idx_icingaweb_user
     lower((name)::text)
 );
 
+
+/**
+ * Table "icingaweb_user_preference"
+ */
 CREATE TABLE "icingaweb_user_preference" (
   "username" character varying(64) NOT NULL,
   "name"     character varying(64) NOT NULL,
@@ -83,4 +96,4 @@ CREATE UNIQUE INDEX idx_icingaweb_user_preference
     lower((username)::text),
     lower((section)::text),
     lower((name)::text)
-);
+);
\ No newline at end of file
diff --git a/icingaweb2.spec b/icingaweb2.spec
index 9dfe5d0df..a012751ea 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -1,5 +1,3 @@
-# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt
-
 %define revision 1.beta2
 
 Name:           icingaweb2
diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 4154124af..89bca7b97 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Benchmark.php b/library/Icinga/Application/Benchmark.php
index c33f718c0..fd69dd510 100644
--- a/library/Icinga/Application/Benchmark.php
+++ b/library/Icinga/Application/Benchmark.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /**
  * Icinga\Application\Benchmark class
diff --git a/library/Icinga/Application/Cli.php b/library/Icinga/Application/Cli.php
index 20ad3b8a0..6341d561e 100644
--- a/library/Icinga/Application/Cli.php
+++ b/library/Icinga/Application/Cli.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Config.php b/library/Icinga/Application/Config.php
index 4feed4d25..484cff6df 100644
--- a/library/Icinga/Application/Config.php
+++ b/library/Icinga/Application/Config.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/EmbeddedWeb.php b/library/Icinga/Application/EmbeddedWeb.php
index a6f166f1b..b9ed067a2 100644
--- a/library/Icinga/Application/EmbeddedWeb.php
+++ b/library/Icinga/Application/EmbeddedWeb.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Icinga.php b/library/Icinga/Application/Icinga.php
index 2c0b6868d..1ab9c36f0 100644
--- a/library/Icinga/Application/Icinga.php
+++ b/library/Icinga/Application/Icinga.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/LegacyWeb.php b/library/Icinga/Application/LegacyWeb.php
index 495bcf204..a5b5beed9 100644
--- a/library/Icinga/Application/LegacyWeb.php
+++ b/library/Icinga/Application/LegacyWeb.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Loader.php b/library/Icinga/Application/Loader.php
index 19f62cbcc..15c3a9316 100644
--- a/library/Icinga/Application/Loader.php
+++ b/library/Icinga/Application/Loader.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Logger.php b/library/Icinga/Application/Logger.php
index e4e706891..70eaa774b 100644
--- a/library/Icinga/Application/Logger.php
+++ b/library/Icinga/Application/Logger.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Logger/LogWriter.php b/library/Icinga/Application/Logger/LogWriter.php
index 196be16e8..b89fec62f 100644
--- a/library/Icinga/Application/Logger/LogWriter.php
+++ b/library/Icinga/Application/Logger/LogWriter.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Application\Logger;
 
diff --git a/library/Icinga/Application/Logger/Writer/FileWriter.php b/library/Icinga/Application/Logger/Writer/FileWriter.php
index 6f2e31872..2f5a292ec 100644
--- a/library/Icinga/Application/Logger/Writer/FileWriter.php
+++ b/library/Icinga/Application/Logger/Writer/FileWriter.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Application\Logger\Writer;
 
diff --git a/library/Icinga/Application/Logger/Writer/StdoutWriter.php b/library/Icinga/Application/Logger/Writer/StdoutWriter.php
index 106c6960a..52608ca12 100644
--- a/library/Icinga/Application/Logger/Writer/StdoutWriter.php
+++ b/library/Icinga/Application/Logger/Writer/StdoutWriter.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+
 namespace Icinga\Application\Logger\Writer;
 
 use Icinga\Cli\Screen;
diff --git a/library/Icinga/Application/Logger/Writer/SyslogWriter.php b/library/Icinga/Application/Logger/Writer/SyslogWriter.php
index 9f819fcb5..7a69e4cba 100644
--- a/library/Icinga/Application/Logger/Writer/SyslogWriter.php
+++ b/library/Icinga/Application/Logger/Writer/SyslogWriter.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Application\Logger\Writer;
 
diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php
index a6a77e0d2..0a1b23f78 100644
--- a/library/Icinga/Application/Modules/Manager.php
+++ b/library/Icinga/Application/Modules/Manager.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Application\Modules;
 
diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index 0146f6bb5..96bbae7be 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Application\Modules;
 
diff --git a/library/Icinga/Application/Platform.php b/library/Icinga/Application/Platform.php
index 45c540617..d4d130220 100644
--- a/library/Icinga/Application/Platform.php
+++ b/library/Icinga/Application/Platform.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 3f5577203..5b18f1be8 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/functions.php b/library/Icinga/Application/functions.php
index ab2d525fc..304c75093 100644
--- a/library/Icinga/Application/functions.php
+++ b/library/Icinga/Application/functions.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Util\Translator;
 
diff --git a/library/Icinga/Application/webrouter.php b/library/Icinga/Application/webrouter.php
index f29db8644..b00034871 100644
--- a/library/Icinga/Application/webrouter.php
+++ b/library/Icinga/Application/webrouter.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Authentication/AdmissionLoader.php b/library/Icinga/Authentication/AdmissionLoader.php
index 88c4f78c6..d97fc534e 100644
--- a/library/Icinga/Authentication/AdmissionLoader.php
+++ b/library/Icinga/Authentication/AdmissionLoader.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */}
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}}
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Authentication/AuthChain.php b/library/Icinga/Authentication/AuthChain.php
index b668c3125..24c12c9de 100644
--- a/library/Icinga/Authentication/AuthChain.php
+++ b/library/Icinga/Authentication/AuthChain.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Authentication/Backend/DbUserBackend.php b/library/Icinga/Authentication/Backend/DbUserBackend.php
index 8888327ef..7865aa905 100644
--- a/library/Icinga/Authentication/Backend/DbUserBackend.php
+++ b/library/Icinga/Authentication/Backend/DbUserBackend.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Backend/DbUserGroupBackend.php b/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
index 080899393..15a77d77d 100644
--- a/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Backend/ExternalBackend.php b/library/Icinga/Authentication/Backend/ExternalBackend.php
index 9fbe3282b..d5eb491e5 100644
--- a/library/Icinga/Authentication/Backend/ExternalBackend.php
+++ b/library/Icinga/Authentication/Backend/ExternalBackend.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Backend/IniUserGroupBackend.php b/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
index 23781916d..45d36e833 100644
--- a/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
+++ b/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/Backend/LdapUserBackend.php
index 13c03af58..666ed69ae 100644
--- a/library/Icinga/Authentication/Backend/LdapUserBackend.php
+++ b/library/Icinga/Authentication/Backend/LdapUserBackend.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 0982d8fe9..03c3e2a41 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Authentication/UserBackend.php b/library/Icinga/Authentication/UserBackend.php
index 2117c2f29..7215f4d41 100644
--- a/library/Icinga/Authentication/UserBackend.php
+++ b/library/Icinga/Authentication/UserBackend.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */}
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}}
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Authentication/UserGroupBackend.php b/library/Icinga/Authentication/UserGroupBackend.php
index 49c6e4575..f1a41adcb 100644
--- a/library/Icinga/Authentication/UserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroupBackend.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */}
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}}
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Chart/Axis.php b/library/Icinga/Chart/Axis.php
index d52a97b6e..c12d9a904 100644
--- a/library/Icinga/Chart/Axis.php
+++ b/library/Icinga/Chart/Axis.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Chart.php b/library/Icinga/Chart/Chart.php
index 42bc28ca8..5b545d4de 100644
--- a/library/Icinga/Chart/Chart.php
+++ b/library/Icinga/Chart/Chart.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Format.php b/library/Icinga/Chart/Format.php
index c9699e05c..80b48ecb5 100644
--- a/library/Icinga/Chart/Format.php
+++ b/library/Icinga/Chart/Format.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Graph/BarGraph.php b/library/Icinga/Chart/Graph/BarGraph.php
index 90582769d..febad8d09 100644
--- a/library/Icinga/Chart/Graph/BarGraph.php
+++ b/library/Icinga/Chart/Graph/BarGraph.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart\Graph;
 
diff --git a/library/Icinga/Chart/Graph/LineGraph.php b/library/Icinga/Chart/Graph/LineGraph.php
index cbb9235a9..3644f1492 100644
--- a/library/Icinga/Chart/Graph/LineGraph.php
+++ b/library/Icinga/Chart/Graph/LineGraph.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 
 namespace Icinga\Chart\Graph;
diff --git a/library/Icinga/Chart/Graph/StackedGraph.php b/library/Icinga/Chart/Graph/StackedGraph.php
index 36ea73721..4339b8c8d 100644
--- a/library/Icinga/Chart/Graph/StackedGraph.php
+++ b/library/Icinga/Chart/Graph/StackedGraph.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart\Graph;
 
diff --git a/library/Icinga/Chart/Graph/Tooltip.php b/library/Icinga/Chart/Graph/Tooltip.php
index c4ebbffb9..4457e04e2 100644
--- a/library/Icinga/Chart/Graph/Tooltip.php
+++ b/library/Icinga/Chart/Graph/Tooltip.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart\Graph;
 
@@ -140,4 +141,4 @@ class Tooltip
     {
         return strip_tags($this->render($order, $data, $format));
     }
-}
+}
\ No newline at end of file
diff --git a/library/Icinga/Chart/GridChart.php b/library/Icinga/Chart/GridChart.php
index b95fa1fc4..190e09bf9 100644
--- a/library/Icinga/Chart/GridChart.php
+++ b/library/Icinga/Chart/GridChart.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Inline/Inline.php b/library/Icinga/Chart/Inline/Inline.php
index ef22bc02e..8faa388bf 100644
--- a/library/Icinga/Chart/Inline/Inline.php
+++ b/library/Icinga/Chart/Inline/Inline.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart\Inline;
 
diff --git a/library/Icinga/Chart/Inline/PieChart.php b/library/Icinga/Chart/Inline/PieChart.php
index c9099f5ef..fdffd9acd 100644
--- a/library/Icinga/Chart/Inline/PieChart.php
+++ b/library/Icinga/Chart/Inline/PieChart.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart\Inline;
 
diff --git a/library/Icinga/Chart/Legend.php b/library/Icinga/Chart/Legend.php
index eb004a9a1..df334089f 100644
--- a/library/Icinga/Chart/Legend.php
+++ b/library/Icinga/Chart/Legend.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Palette.php b/library/Icinga/Chart/Palette.php
index 09cd1ade4..ef413e73e 100644
--- a/library/Icinga/Chart/Palette.php
+++ b/library/Icinga/Chart/Palette.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/PieChart.php b/library/Icinga/Chart/PieChart.php
index e5d098c15..cc51f85b3 100644
--- a/library/Icinga/Chart/PieChart.php
+++ b/library/Icinga/Chart/PieChart.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Primitive/Animatable.php b/library/Icinga/Chart/Primitive/Animatable.php
index bc7c18235..3d4d24f00 100644
--- a/library/Icinga/Chart/Primitive/Animatable.php
+++ b/library/Icinga/Chart/Primitive/Animatable.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Animation.php b/library/Icinga/Chart/Primitive/Animation.php
index c2d0afc45..dbcdb1a2c 100644
--- a/library/Icinga/Chart/Primitive/Animation.php
+++ b/library/Icinga/Chart/Primitive/Animation.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Canvas.php b/library/Icinga/Chart/Primitive/Canvas.php
index 47abd7f09..55159d975 100644
--- a/library/Icinga/Chart/Primitive/Canvas.php
+++ b/library/Icinga/Chart/Primitive/Canvas.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 
 namespace Icinga\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/Circle.php b/library/Icinga/Chart/Primitive/Circle.php
index ab7664d10..da5f1785e 100644
--- a/library/Icinga/Chart/Primitive/Circle.php
+++ b/library/Icinga/Chart/Primitive/Circle.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 
 namespace Icinga\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/Drawable.php b/library/Icinga/Chart/Primitive/Drawable.php
index 1ed78c9fb..ea5dca077 100644
--- a/library/Icinga/Chart/Primitive/Drawable.php
+++ b/library/Icinga/Chart/Primitive/Drawable.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Line.php b/library/Icinga/Chart/Primitive/Line.php
index d2ad670e7..150013f82 100644
--- a/library/Icinga/Chart/Primitive/Line.php
+++ b/library/Icinga/Chart/Primitive/Line.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Path.php b/library/Icinga/Chart/Primitive/Path.php
index 3eac8b954..0969e9674 100644
--- a/library/Icinga/Chart/Primitive/Path.php
+++ b/library/Icinga/Chart/Primitive/Path.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/PieSlice.php b/library/Icinga/Chart/Primitive/PieSlice.php
index c3b4a8b90..33f3cbee7 100644
--- a/library/Icinga/Chart/Primitive/PieSlice.php
+++ b/library/Icinga/Chart/Primitive/PieSlice.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/RawElement.php b/library/Icinga/Chart/Primitive/RawElement.php
index 47336da0b..459a2d1ce 100644
--- a/library/Icinga/Chart/Primitive/RawElement.php
+++ b/library/Icinga/Chart/Primitive/RawElement.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Rect.php b/library/Icinga/Chart/Primitive/Rect.php
index 9bd7bb3ff..fc389e204 100644
--- a/library/Icinga/Chart/Primitive/Rect.php
+++ b/library/Icinga/Chart/Primitive/Rect.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Styleable.php b/library/Icinga/Chart/Primitive/Styleable.php
index 0dcf47e34..248a560d3 100644
--- a/library/Icinga/Chart/Primitive/Styleable.php
+++ b/library/Icinga/Chart/Primitive/Styleable.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 
 namespace Icinga\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/Text.php b/library/Icinga/Chart/Primitive/Text.php
index d2467ffcc..72bed552b 100644
--- a/library/Icinga/Chart/Primitive/Text.php
+++ b/library/Icinga/Chart/Primitive/Text.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 
 namespace Icinga\Chart\Primitive;
diff --git a/library/Icinga/Chart/Render/LayoutBox.php b/library/Icinga/Chart/Render/LayoutBox.php
index a3fb1a64f..00e75f3c4 100644
--- a/library/Icinga/Chart/Render/LayoutBox.php
+++ b/library/Icinga/Chart/Render/LayoutBox.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart\Render;
 
diff --git a/library/Icinga/Chart/Render/RenderContext.php b/library/Icinga/Chart/Render/RenderContext.php
index e97d213dd..a5d308c6e 100644
--- a/library/Icinga/Chart/Render/RenderContext.php
+++ b/library/Icinga/Chart/Render/RenderContext.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 
 namespace Icinga\Chart\Render;
diff --git a/library/Icinga/Chart/Render/Rotator.php b/library/Icinga/Chart/Render/Rotator.php
index 9d4f4aa2b..56c1a4685 100644
--- a/library/Icinga/Chart/Render/Rotator.php
+++ b/library/Icinga/Chart/Render/Rotator.php
@@ -1,8 +1,11 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
 
 namespace Icinga\Chart\Render;
 
+
 use Icinga\Chart\Render\RenderContext;
 use Icinga\Chart\Primitive\Drawable;
 use DOMElement;
@@ -77,4 +80,4 @@ class Rotator implements Drawable
         $el = $this->element->toSvg($ctx);
         return $this->rotate($ctx, $el, $this->degrees);
     }
-}
+} 
\ No newline at end of file
diff --git a/library/Icinga/Chart/SVGRenderer.php b/library/Icinga/Chart/SVGRenderer.php
index 7de8463bb..da6015ceb 100644
--- a/library/Icinga/Chart/SVGRenderer.php
+++ b/library/Icinga/Chart/SVGRenderer.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Unit/AxisUnit.php b/library/Icinga/Chart/Unit/AxisUnit.php
index 9a989c410..fba521778 100644
--- a/library/Icinga/Chart/Unit/AxisUnit.php
+++ b/library/Icinga/Chart/Unit/AxisUnit.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart\Unit;
 
diff --git a/library/Icinga/Chart/Unit/CalendarUnit.php b/library/Icinga/Chart/Unit/CalendarUnit.php
index a1864b5b3..2845303c4 100644
--- a/library/Icinga/Chart/Unit/CalendarUnit.php
+++ b/library/Icinga/Chart/Unit/CalendarUnit.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 
 namespace Icinga\Chart\Unit;
diff --git a/library/Icinga/Chart/Unit/LinearUnit.php b/library/Icinga/Chart/Unit/LinearUnit.php
index 15eed57fe..fe80971d4 100644
--- a/library/Icinga/Chart/Unit/LinearUnit.php
+++ b/library/Icinga/Chart/Unit/LinearUnit.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart\Unit;
 
diff --git a/library/Icinga/Chart/Unit/LogarithmicUnit.php b/library/Icinga/Chart/Unit/LogarithmicUnit.php
index 61f962f90..6d07f3d45 100644
--- a/library/Icinga/Chart/Unit/LogarithmicUnit.php
+++ b/library/Icinga/Chart/Unit/LogarithmicUnit.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Chart\Unit;
 
diff --git a/library/Icinga/Chart/Unit/StaticAxis.php b/library/Icinga/Chart/Unit/StaticAxis.php
index 47ca0706c..c7e9c2be5 100644
--- a/library/Icinga/Chart/Unit/StaticAxis.php
+++ b/library/Icinga/Chart/Unit/StaticAxis.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 
 namespace Icinga\Chart\Unit;
diff --git a/library/Icinga/Cli/AnsiScreen.php b/library/Icinga/Cli/AnsiScreen.php
index 01ee51514..f3b2b6654 100644
--- a/library/Icinga/Cli/AnsiScreen.php
+++ b/library/Icinga/Cli/AnsiScreen.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Command.php b/library/Icinga/Cli/Command.php
index 2ef4154d0..c410cfc0e 100644
--- a/library/Icinga/Cli/Command.php
+++ b/library/Icinga/Cli/Command.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Documentation.php b/library/Icinga/Cli/Documentation.php
index 179d387c7..76b821df4 100644
--- a/library/Icinga/Cli/Documentation.php
+++ b/library/Icinga/Cli/Documentation.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Documentation/CommentParser.php b/library/Icinga/Cli/Documentation/CommentParser.php
index 10462c7f3..f8b6135e9 100644
--- a/library/Icinga/Cli/Documentation/CommentParser.php
+++ b/library/Icinga/Cli/Documentation/CommentParser.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Cli\Documentation;
 
diff --git a/library/Icinga/Cli/Loader.php b/library/Icinga/Cli/Loader.php
index 406a1c31f..655ef7c18 100644
--- a/library/Icinga/Cli/Loader.php
+++ b/library/Icinga/Cli/Loader.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Params.php b/library/Icinga/Cli/Params.php
index 34110cd8e..5c6cbfe8b 100644
--- a/library/Icinga/Cli/Params.php
+++ b/library/Icinga/Cli/Params.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Screen.php b/library/Icinga/Cli/Screen.php
index ca9aa2f26..5b687f3ab 100644
--- a/library/Icinga/Cli/Screen.php
+++ b/library/Icinga/Cli/Screen.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Data/Browsable.php b/library/Icinga/Data/Browsable.php
index 11f1956e3..4d8d2136f 100644
--- a/library/Icinga/Data/Browsable.php
+++ b/library/Icinga/Data/Browsable.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/ConfigObject.php b/library/Icinga/Data/ConfigObject.php
index 0700179fd..23b2e1651 100644
--- a/library/Icinga/Data/ConfigObject.php
+++ b/library/Icinga/Data/ConfigObject.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/ConnectionInterface.php b/library/Icinga/Data/ConnectionInterface.php
index 081ac5612..dfdb4a6f2 100644
--- a/library/Icinga/Data/ConnectionInterface.php
+++ b/library/Icinga/Data/ConnectionInterface.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/DataArray/ArrayDatasource.php b/library/Icinga/Data/DataArray/ArrayDatasource.php
index c80df68df..ecb428e59 100644
--- a/library/Icinga/Data/DataArray/ArrayDatasource.php
+++ b/library/Icinga/Data/DataArray/ArrayDatasource.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\DataArray;
 
@@ -9,7 +10,7 @@ use Icinga\Data\SimpleQuery;
 class ArrayDatasource implements Selectable
 {
     protected $data;
-
+    
     protected $result;
 
     /**
diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php
index 7909ab194..38153a1cf 100644
--- a/library/Icinga/Data/Db/DbConnection.php
+++ b/library/Icinga/Data/Db/DbConnection.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Db;
 
diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index 38d2352b0..bad1261aa 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Db;
 
diff --git a/library/Icinga/Data/Fetchable.php b/library/Icinga/Data/Fetchable.php
index 2c3c8ce11..249a522e3 100644
--- a/library/Icinga/Data/Fetchable.php
+++ b/library/Icinga/Data/Fetchable.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Filter/Filter.php b/library/Icinga/Data/Filter/Filter.php
index 6508a27c9..5793a4749 100644
--- a/library/Icinga/Data/Filter/Filter.php
+++ b/library/Icinga/Data/Filter/Filter.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterAnd.php b/library/Icinga/Data/Filter/FilterAnd.php
index c3ff9b75c..8fd2f2411 100644
--- a/library/Icinga/Data/Filter/FilterAnd.php
+++ b/library/Icinga/Data/Filter/FilterAnd.php
@@ -1,10 +1,11 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
 /**
- * Filter list AND
+ * Filter list AND 
  *
  * Binary AND, all contained filters must succeed
  */
diff --git a/library/Icinga/Data/Filter/FilterChain.php b/library/Icinga/Data/Filter/FilterChain.php
index 2567de41b..cdb3a1123 100644
--- a/library/Icinga/Data/Filter/FilterChain.php
+++ b/library/Icinga/Data/Filter/FilterChain.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
@@ -153,7 +154,7 @@ abstract class FilterChain extends Filter
      *
      * Useful for debugging only
      *
-     * @return string
+     * @return string 
      */
     public function __toString()
     {
@@ -216,5 +217,5 @@ abstract class FilterChain extends Filter
         foreach ($this->filters as & $filter) {
             $filter = clone $filter;
         }
-    }
+    } 
 }
diff --git a/library/Icinga/Data/Filter/FilterEqual.php b/library/Icinga/Data/Filter/FilterEqual.php
index 1e567dbf1..66e4c06ad 100644
--- a/library/Icinga/Data/Filter/FilterEqual.php
+++ b/library/Icinga/Data/Filter/FilterEqual.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php b/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php
index 92568178c..29c0bfad0 100644
--- a/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php
+++ b/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterEqualOrLessThan.php b/library/Icinga/Data/Filter/FilterEqualOrLessThan.php
index 88e56de1d..2f8b62265 100644
--- a/library/Icinga/Data/Filter/FilterEqualOrLessThan.php
+++ b/library/Icinga/Data/Filter/FilterEqualOrLessThan.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterException.php b/library/Icinga/Data/Filter/FilterException.php
index da28ddbe6..8f770810f 100644
--- a/library/Icinga/Data/Filter/FilterException.php
+++ b/library/Icinga/Data/Filter/FilterException.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterExpression.php b/library/Icinga/Data/Filter/FilterExpression.php
index 379c70045..0782bcd89 100644
--- a/library/Icinga/Data/Filter/FilterExpression.php
+++ b/library/Icinga/Data/Filter/FilterExpression.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterGreaterThan.php b/library/Icinga/Data/Filter/FilterGreaterThan.php
index 386a260c9..62ba16fca 100644
--- a/library/Icinga/Data/Filter/FilterGreaterThan.php
+++ b/library/Icinga/Data/Filter/FilterGreaterThan.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterLessThan.php b/library/Icinga/Data/Filter/FilterLessThan.php
index 478cc47b4..2ae99098f 100644
--- a/library/Icinga/Data/Filter/FilterLessThan.php
+++ b/library/Icinga/Data/Filter/FilterLessThan.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterMatch.php b/library/Icinga/Data/Filter/FilterMatch.php
index 2f072742b..159feb04e 100644
--- a/library/Icinga/Data/Filter/FilterMatch.php
+++ b/library/Icinga/Data/Filter/FilterMatch.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterMatchNot.php b/library/Icinga/Data/Filter/FilterMatchNot.php
index f7478cf75..2ce5c2336 100644
--- a/library/Icinga/Data/Filter/FilterMatchNot.php
+++ b/library/Icinga/Data/Filter/FilterMatchNot.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterNot.php b/library/Icinga/Data/Filter/FilterNot.php
index 5d1dc8998..5e63691f1 100644
--- a/library/Icinga/Data/Filter/FilterNot.php
+++ b/library/Icinga/Data/Filter/FilterNot.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterNotEqual.php b/library/Icinga/Data/Filter/FilterNotEqual.php
index 3faf209d2..d1a5e9b64 100644
--- a/library/Icinga/Data/Filter/FilterNotEqual.php
+++ b/library/Icinga/Data/Filter/FilterNotEqual.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterOr.php b/library/Icinga/Data/Filter/FilterOr.php
index 1c08b9456..8291d32dc 100644
--- a/library/Icinga/Data/Filter/FilterOr.php
+++ b/library/Icinga/Data/Filter/FilterOr.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterParseException.php b/library/Icinga/Data/Filter/FilterParseException.php
index 4210b6561..5633b5adf 100644
--- a/library/Icinga/Data/Filter/FilterParseException.php
+++ b/library/Icinga/Data/Filter/FilterParseException.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterQueryString.php b/library/Icinga/Data/Filter/FilterQueryString.php
index 07da8f4f4..3dbcce473 100644
--- a/library/Icinga/Data/Filter/FilterQueryString.php
+++ b/library/Icinga/Data/Filter/FilterQueryString.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filterable.php b/library/Icinga/Data/Filterable.php
index f70c5b9f2..25d1fc9f5 100644
--- a/library/Icinga/Data/Filterable.php
+++ b/library/Icinga/Data/Filterable.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Identifiable.php b/library/Icinga/Data/Identifiable.php
index 520b4f939..cfa727a1d 100644
--- a/library/Icinga/Data/Identifiable.php
+++ b/library/Icinga/Data/Identifiable.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Limitable.php b/library/Icinga/Data/Limitable.php
index 8ebc37263..380eae9f9 100644
--- a/library/Icinga/Data/Limitable.php
+++ b/library/Icinga/Data/Limitable.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/PivotTable.php b/library/Icinga/Data/PivotTable.php
index 280219b41..0a1f009fe 100644
--- a/library/Icinga/Data/PivotTable.php
+++ b/library/Icinga/Data/PivotTable.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/QueryInterface.php b/library/Icinga/Data/QueryInterface.php
index 5032e1786..ef8c7c741 100644
--- a/library/Icinga/Data/QueryInterface.php
+++ b/library/Icinga/Data/QueryInterface.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Queryable.php b/library/Icinga/Data/Queryable.php
index 7501cd34f..47f438c4e 100644
--- a/library/Icinga/Data/Queryable.php
+++ b/library/Icinga/Data/Queryable.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/ResourceFactory.php b/library/Icinga/Data/ResourceFactory.php
index 49adaab46..754360740 100644
--- a/library/Icinga/Data/ResourceFactory.php
+++ b/library/Icinga/Data/ResourceFactory.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Selectable.php b/library/Icinga/Data/Selectable.php
index ba7f4aa7f..06aa4f93c 100644
--- a/library/Icinga/Data/Selectable.php
+++ b/library/Icinga/Data/Selectable.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 3b0279583..e865d86fa 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Sortable.php b/library/Icinga/Data/Sortable.php
index 634b1cc4d..f3b8d1c9b 100644
--- a/library/Icinga/Data/Sortable.php
+++ b/library/Icinga/Data/Sortable.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Tree/Node.php b/library/Icinga/Data/Tree/Node.php
index a4b1ce156..b57b0fad4 100644
--- a/library/Icinga/Data/Tree/Node.php
+++ b/library/Icinga/Data/Tree/Node.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Tree;
 
diff --git a/library/Icinga/Data/Tree/NodeInterface.php b/library/Icinga/Data/Tree/NodeInterface.php
index bba6aa84c..6953214dc 100644
--- a/library/Icinga/Data/Tree/NodeInterface.php
+++ b/library/Icinga/Data/Tree/NodeInterface.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Data\Tree;
 
diff --git a/library/Icinga/Exception/AuthenticationException.php b/library/Icinga/Exception/AuthenticationException.php
index 312425003..ebed296e4 100644
--- a/library/Icinga/Exception/AuthenticationException.php
+++ b/library/Icinga/Exception/AuthenticationException.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/ConfigurationError.php b/library/Icinga/Exception/ConfigurationError.php
index 283cb2fab..aee601a62 100644
--- a/library/Icinga/Exception/ConfigurationError.php
+++ b/library/Icinga/Exception/ConfigurationError.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/IcingaException.php b/library/Icinga/Exception/IcingaException.php
index 85e639b20..8443f9c7c 100644
--- a/library/Icinga/Exception/IcingaException.php
+++ b/library/Icinga/Exception/IcingaException.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/InvalidPropertyException.php b/library/Icinga/Exception/InvalidPropertyException.php
index ac8346c2f..f79055f0b 100644
--- a/library/Icinga/Exception/InvalidPropertyException.php
+++ b/library/Icinga/Exception/InvalidPropertyException.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/MissingParameterException.php b/library/Icinga/Exception/MissingParameterException.php
index cd7f41433..b86ff7d8a 100644
--- a/library/Icinga/Exception/MissingParameterException.php
+++ b/library/Icinga/Exception/MissingParameterException.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/NotFoundError.php b/library/Icinga/Exception/NotFoundError.php
index e3790ca0a..c90b0322b 100644
--- a/library/Icinga/Exception/NotFoundError.php
+++ b/library/Icinga/Exception/NotFoundError.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/NotImplementedError.php b/library/Icinga/Exception/NotImplementedError.php
index 61e9249e1..1d22236df 100644
--- a/library/Icinga/Exception/NotImplementedError.php
+++ b/library/Icinga/Exception/NotImplementedError.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/NotReadableError.php b/library/Icinga/Exception/NotReadableError.php
index cb39beaee..41a7ec8fd 100644
--- a/library/Icinga/Exception/NotReadableError.php
+++ b/library/Icinga/Exception/NotReadableError.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/NotWritableError.php b/library/Icinga/Exception/NotWritableError.php
index 14f3bd81a..cf09d4592 100644
--- a/library/Icinga/Exception/NotWritableError.php
+++ b/library/Icinga/Exception/NotWritableError.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/ProgrammingError.php b/library/Icinga/Exception/ProgrammingError.php
index 3a3f0fbf0..430d1510f 100644
--- a/library/Icinga/Exception/ProgrammingError.php
+++ b/library/Icinga/Exception/ProgrammingError.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/QueryException.php b/library/Icinga/Exception/QueryException.php
index 6d6aa038d..beab3fe53 100644
--- a/library/Icinga/Exception/QueryException.php
+++ b/library/Icinga/Exception/QueryException.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/SystemPermissionException.php b/library/Icinga/Exception/SystemPermissionException.php
index 8c0e772af..33dfe596c 100644
--- a/library/Icinga/Exception/SystemPermissionException.php
+++ b/library/Icinga/Exception/SystemPermissionException.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/File/Csv.php b/library/Icinga/File/Csv.php
index aead05bc2..fb26d4c11 100644
--- a/library/Icinga/File/Csv.php
+++ b/library/Icinga/File/Csv.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\File;
 
diff --git a/library/Icinga/File/FileExtensionFilterIterator.php b/library/Icinga/File/FileExtensionFilterIterator.php
index 7089d0206..909156749 100644
--- a/library/Icinga/File/FileExtensionFilterIterator.php
+++ b/library/Icinga/File/FileExtensionFilterIterator.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\File;
 
diff --git a/library/Icinga/File/Ini/IniEditor.php b/library/Icinga/File/Ini/IniEditor.php
index ecf4b8db9..85d71b697 100644
--- a/library/Icinga/File/Ini/IniEditor.php
+++ b/library/Icinga/File/Ini/IniEditor.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\File\Ini;
 
diff --git a/library/Icinga/File/Ini/IniWriter.php b/library/Icinga/File/Ini/IniWriter.php
index 05be71e00..21402ab74 100644
--- a/library/Icinga/File/Ini/IniWriter.php
+++ b/library/Icinga/File/Ini/IniWriter.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\File\Ini;
 
diff --git a/library/Icinga/File/NonEmptyFileIterator.php b/library/Icinga/File/NonEmptyFileIterator.php
index 961353712..c5c7fda45 100644
--- a/library/Icinga/File/NonEmptyFileIterator.php
+++ b/library/Icinga/File/NonEmptyFileIterator.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}
 
 namespace Icinga\File;
 
diff --git a/library/Icinga/File/Pdf.php b/library/Icinga/File/Pdf.php
index 4fe53e139..a372cbfdf 100644
--- a/library/Icinga/File/Pdf.php
+++ b/library/Icinga/File/Pdf.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\File;
 
diff --git a/library/Icinga/Protocol/Dns.php b/library/Icinga/Protocol/Dns.php
index c64c47616..950c22f44 100644
--- a/library/Icinga/Protocol/Dns.php
+++ b/library/Icinga/Protocol/Dns.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol;
 
diff --git a/library/Icinga/Protocol/File/Exception/FileReaderException.php b/library/Icinga/Protocol/File/Exception/FileReaderException.php
index b093ecbfb..a7db5d701 100644
--- a/library/Icinga/Protocol/File/Exception/FileReaderException.php
+++ b/library/Icinga/Protocol/File/Exception/FileReaderException.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+
 namespace Icinga\Protocol\File;
 
 use Icinga\Exception\IcingaException;
diff --git a/library/Icinga/Protocol/File/FileIterator.php b/library/Icinga/Protocol/File/FileIterator.php
index 5c4ff0610..72c4e0a39 100644
--- a/library/Icinga/Protocol/File/FileIterator.php
+++ b/library/Icinga/Protocol/File/FileIterator.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\File;
 
diff --git a/library/Icinga/Protocol/File/FileQuery.php b/library/Icinga/Protocol/File/FileQuery.php
index 0c70972ff..e1b5e65cf 100644
--- a/library/Icinga/Protocol/File/FileQuery.php
+++ b/library/Icinga/Protocol/File/FileQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\File;
 
diff --git a/library/Icinga/Protocol/File/FileReader.php b/library/Icinga/Protocol/File/FileReader.php
index ee41eef32..363f8e173 100644
--- a/library/Icinga/Protocol/File/FileReader.php
+++ b/library/Icinga/Protocol/File/FileReader.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\File;
 
diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 6d23854d0..a576ab790 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/Discovery.php b/library/Icinga/Protocol/Ldap/Discovery.php
index c8b28f25a..b876a5d6f 100644
--- a/library/Icinga/Protocol/Ldap/Discovery.php
+++ b/library/Icinga/Protocol/Ldap/Discovery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\Ldap;
 
@@ -154,4 +155,4 @@ class Discovery {
         )));
         return new Discovery($conn);
     }
-}
+} 
\ No newline at end of file
diff --git a/library/Icinga/Protocol/Ldap/Exception.php b/library/Icinga/Protocol/Ldap/Exception.php
index f238a83c5..41a5b782b 100644
--- a/library/Icinga/Protocol/Ldap/Exception.php
+++ b/library/Icinga/Protocol/Ldap/Exception.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/LdapUtils.php b/library/Icinga/Protocol/Ldap/LdapUtils.php
index f26c94922..8232ebf67 100644
--- a/library/Icinga/Protocol/Ldap/LdapUtils.php
+++ b/library/Icinga/Protocol/Ldap/LdapUtils.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/Node.php b/library/Icinga/Protocol/Ldap/Node.php
index 37d4d241c..8e9570d25 100644
--- a/library/Icinga/Protocol/Ldap/Node.php
+++ b/library/Icinga/Protocol/Ldap/Node.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/Query.php b/library/Icinga/Protocol/Ldap/Query.php
index 41882f682..c6f0d6fa1 100644
--- a/library/Icinga/Protocol/Ldap/Query.php
+++ b/library/Icinga/Protocol/Ldap/Query.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/Root.php b/library/Icinga/Protocol/Ldap/Root.php
index 2ae2329ae..56abb4175 100644
--- a/library/Icinga/Protocol/Ldap/Root.php
+++ b/library/Icinga/Protocol/Ldap/Root.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Livestatus/Connection.php b/library/Icinga/Protocol/Livestatus/Connection.php
index 3754afb39..b2340eeec 100644
--- a/library/Icinga/Protocol/Livestatus/Connection.php
+++ b/library/Icinga/Protocol/Livestatus/Connection.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\Livestatus;
 
@@ -200,7 +201,7 @@ class Connection
             if ($filter !== null && ! $filter->matches($res)) continue;
             $result[] = $res;
         }
-
+        
         if ($query->hasOrder()) {
             usort($result, array($query, 'compare'));
         }
diff --git a/library/Icinga/Protocol/Livestatus/Query.php b/library/Icinga/Protocol/Livestatus/Query.php
index 94380dfa6..a421c7e71 100644
--- a/library/Icinga/Protocol/Livestatus/Query.php
+++ b/library/Icinga/Protocol/Livestatus/Query.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\Livestatus;
 
@@ -75,7 +76,7 @@ class Query extends SimpleQuery
     {
         // $row -> raw SplArray
         // $res -> object
-        // $cv  ->
+        // $cv  -> 
         // $result -> object to be returned
         $result = (object) array();
         $res = $this->withHeaders($row);
@@ -141,7 +142,7 @@ class Query extends SimpleQuery
             }
         }
 
-
+     
         return $result;
     }
 
@@ -312,7 +313,7 @@ class Query extends SimpleQuery
            } elseif (is_array($col)) {
                foreach ($col as $k) {
                    $columns[$k] = true;
-               }
+               }    
            } else {
                $columns[$col] = true;
            }
diff --git a/library/Icinga/Protocol/Livestatus/ResponseRow.php b/library/Icinga/Protocol/Livestatus/ResponseRow.php
index 9cb67ccf3..d4b0fd7cb 100644
--- a/library/Icinga/Protocol/Livestatus/ResponseRow.php
+++ b/library/Icinga/Protocol/Livestatus/ResponseRow.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Livestatus;
 
diff --git a/library/Icinga/Protocol/Nrpe/Connection.php b/library/Icinga/Protocol/Nrpe/Connection.php
index 167d710e6..84a754e91 100644
--- a/library/Icinga/Protocol/Nrpe/Connection.php
+++ b/library/Icinga/Protocol/Nrpe/Connection.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\Nrpe;
 
diff --git a/library/Icinga/Protocol/Nrpe/Packet.php b/library/Icinga/Protocol/Nrpe/Packet.php
index c7f1e8532..0e722dbff 100644
--- a/library/Icinga/Protocol/Nrpe/Packet.php
+++ b/library/Icinga/Protocol/Nrpe/Packet.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Protocol\Nrpe;
 
diff --git a/library/Icinga/Security/SecurityException.php b/library/Icinga/Security/SecurityException.php
index db9afea14..168d4a9be 100644
--- a/library/Icinga/Security/SecurityException.php
+++ b/library/Icinga/Security/SecurityException.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Security;
 
diff --git a/library/Icinga/Test/BaseTestCase.php b/library/Icinga/Test/BaseTestCase.php
index 94018826f..c70bc5cd9 100644
--- a/library/Icinga/Test/BaseTestCase.php
+++ b/library/Icinga/Test/BaseTestCase.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace {
 
diff --git a/library/Icinga/Test/DbTest.php b/library/Icinga/Test/DbTest.php
index f51cdb2f4..cf6887285 100644
--- a/library/Icinga/Test/DbTest.php
+++ b/library/Icinga/Test/DbTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Test;
 
diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index a56bd017c..54b3e7632 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga;
 
diff --git a/library/Icinga/User/Preferences.php b/library/Icinga/User/Preferences.php
index 49732fea0..364112a9e 100644
--- a/library/Icinga/User/Preferences.php
+++ b/library/Icinga/User/Preferences.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\User;
 
diff --git a/library/Icinga/User/Preferences/PreferencesStore.php b/library/Icinga/User/Preferences/PreferencesStore.php
index 4fc77003b..11454a2f8 100644
--- a/library/Icinga/User/Preferences/PreferencesStore.php
+++ b/library/Icinga/User/Preferences/PreferencesStore.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\User\Preferences;
 
diff --git a/library/Icinga/User/Preferences/Store/DbStore.php b/library/Icinga/User/Preferences/Store/DbStore.php
index e5af3f5ba..4d7b10584 100644
--- a/library/Icinga/User/Preferences/Store/DbStore.php
+++ b/library/Icinga/User/Preferences/Store/DbStore.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\User\Preferences\Store;
 
diff --git a/library/Icinga/User/Preferences/Store/IniStore.php b/library/Icinga/User/Preferences/Store/IniStore.php
index b65ce3cd5..1a096ea7b 100644
--- a/library/Icinga/User/Preferences/Store/IniStore.php
+++ b/library/Icinga/User/Preferences/Store/IniStore.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\User\Preferences\Store;
 
diff --git a/library/Icinga/Util/Color.php b/library/Icinga/Util/Color.php
index a403fe11a..8058f0152 100644
--- a/library/Icinga/Util/Color.php
+++ b/library/Icinga/Util/Color.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/ConfigAwareFactory.php b/library/Icinga/Util/ConfigAwareFactory.php
index 01512904a..4a40c4200 100644
--- a/library/Icinga/Util/ConfigAwareFactory.php
+++ b/library/Icinga/Util/ConfigAwareFactory.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/DateTimeFactory.php b/library/Icinga/Util/DateTimeFactory.php
index 2f63fd0f4..4a482dc0a 100644
--- a/library/Icinga/Util/DateTimeFactory.php
+++ b/library/Icinga/Util/DateTimeFactory.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/Dimension.php b/library/Icinga/Util/Dimension.php
index 44d1a58a4..2f367483b 100644
--- a/library/Icinga/Util/Dimension.php
+++ b/library/Icinga/Util/Dimension.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/EnumeratingFilterIterator.php b/library/Icinga/Util/EnumeratingFilterIterator.php
index 377af1905..44ef9b0c8 100644
--- a/library/Icinga/Util/EnumeratingFilterIterator.php
+++ b/library/Icinga/Util/EnumeratingFilterIterator.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/File.php b/library/Icinga/Util/File.php
index 6e4e5d363..99421b33d 100644
--- a/library/Icinga/Util/File.php
+++ b/library/Icinga/Util/File.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/Format.php b/library/Icinga/Util/Format.php
index 8cc9c42d7..0c69fbde4 100644
--- a/library/Icinga/Util/Format.php
+++ b/library/Icinga/Util/Format.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/String.php b/library/Icinga/Util/String.php
index b47622331..69fb26927 100644
--- a/library/Icinga/Util/String.php
+++ b/library/Icinga/Util/String.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/TimezoneDetect.php b/library/Icinga/Util/TimezoneDetect.php
index b327d6e95..084c3f8e7 100644
--- a/library/Icinga/Util/TimezoneDetect.php
+++ b/library/Icinga/Util/TimezoneDetect.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/Translator.php b/library/Icinga/Util/Translator.php
index 1b11ca005..87d9e4c88 100644
--- a/library/Icinga/Util/Translator.php
+++ b/library/Icinga/Util/Translator.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index 289dd94a9..111ee244c 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 6503e2ff7..87d293be6 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Controller;
 
diff --git a/library/Icinga/Web/Controller/BasePreferenceController.php b/library/Icinga/Web/Controller/BasePreferenceController.php
index 19ad8acb8..f7d45aa5f 100644
--- a/library/Icinga/Web/Controller/BasePreferenceController.php
+++ b/library/Icinga/Web/Controller/BasePreferenceController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Controller;
 
diff --git a/library/Icinga/Web/Controller/ControllerTabCollector.php b/library/Icinga/Web/Controller/ControllerTabCollector.php
index c1922dcf3..2078d80b2 100644
--- a/library/Icinga/Web/Controller/ControllerTabCollector.php
+++ b/library/Icinga/Web/Controller/ControllerTabCollector.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Controller;
 
diff --git a/library/Icinga/Web/Controller/ModuleActionController.php b/library/Icinga/Web/Controller/ModuleActionController.php
index 15fd32a07..0f540c2a0 100644
--- a/library/Icinga/Web/Controller/ModuleActionController.php
+++ b/library/Icinga/Web/Controller/ModuleActionController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Controller;
 
diff --git a/library/Icinga/Web/FileCache.php b/library/Icinga/Web/FileCache.php
index a3b8381c4..16c89a2a4 100644
--- a/library/Icinga/Web/FileCache.php
+++ b/library/Icinga/Web/FileCache.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+
 namespace Icinga\Web;
 
 class FileCache
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 88e578fd5..daa6dcf40 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Form/Decorator/ConditionalHidden.php b/library/Icinga/Web/Form/Decorator/ConditionalHidden.php
index 8911c39b4..c24f637ba 100644
--- a/library/Icinga/Web/Form/Decorator/ConditionalHidden.php
+++ b/library/Icinga/Web/Form/Decorator/ConditionalHidden.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Form\Decorator;
 
diff --git a/library/Icinga/Web/Form/Decorator/ElementDoubler.php b/library/Icinga/Web/Form/Decorator/ElementDoubler.php
index 200880e6d..8bedf9492 100644
--- a/library/Icinga/Web/Form/Decorator/ElementDoubler.php
+++ b/library/Icinga/Web/Form/Decorator/ElementDoubler.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Form\Decorator;
 
diff --git a/library/Icinga/Web/Form/Decorator/NoScriptApply.php b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
index 49f6afa6b..509c3531e 100644
--- a/library/Icinga/Web/Form/Decorator/NoScriptApply.php
+++ b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Form\Decorator;
 
diff --git a/library/Icinga/Web/Form/Element/Button.php b/library/Icinga/Web/Form/Element/Button.php
index d29b1f529..1c5499373 100644
--- a/library/Icinga/Web/Form/Element/Button.php
+++ b/library/Icinga/Web/Form/Element/Button.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php b/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php
index 0b79a8cb5..e9bc37edd 100644
--- a/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php
+++ b/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/DateTimePicker.php b/library/Icinga/Web/Form/Element/DateTimePicker.php
index 2f1eb3da4..728262827 100644
--- a/library/Icinga/Web/Form/Element/DateTimePicker.php
+++ b/library/Icinga/Web/Form/Element/DateTimePicker.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/Note.php b/library/Icinga/Web/Form/Element/Note.php
index 8a96d9602..37bc127e9 100644
--- a/library/Icinga/Web/Form/Element/Note.php
+++ b/library/Icinga/Web/Form/Element/Note.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/Number.php b/library/Icinga/Web/Form/Element/Number.php
index b98c3736a..02f0aaad3 100644
--- a/library/Icinga/Web/Form/Element/Number.php
+++ b/library/Icinga/Web/Form/Element/Number.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/TriStateCheckbox.php b/library/Icinga/Web/Form/Element/TriStateCheckbox.php
index 61a29c172..45763880d 100644
--- a/library/Icinga/Web/Form/Element/TriStateCheckbox.php
+++ b/library/Icinga/Web/Form/Element/TriStateCheckbox.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/FormElement.php b/library/Icinga/Web/Form/FormElement.php
index 06b08bb02..690be1acf 100644
--- a/library/Icinga/Web/Form/FormElement.php
+++ b/library/Icinga/Web/Form/FormElement.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Form;
 
diff --git a/library/Icinga/Web/Form/InvalidCSRFTokenException.php b/library/Icinga/Web/Form/InvalidCSRFTokenException.php
index ac18db77e..4e1ae8ba7 100644
--- a/library/Icinga/Web/Form/InvalidCSRFTokenException.php
+++ b/library/Icinga/Web/Form/InvalidCSRFTokenException.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Form;
 
diff --git a/library/Icinga/Web/Form/Validator/DateFormatValidator.php b/library/Icinga/Web/Form/Validator/DateFormatValidator.php
index 65715b88b..b11629cbf 100644
--- a/library/Icinga/Web/Form/Validator/DateFormatValidator.php
+++ b/library/Icinga/Web/Form/Validator/DateFormatValidator.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/DateTimeValidator.php b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
index e85544c06..6b59d5263 100644
--- a/library/Icinga/Web/Form/Validator/DateTimeValidator.php
+++ b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/ReadablePathValidator.php b/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
index a0fe0c437..4060f6ecd 100644
--- a/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
+++ b/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/TimeFormatValidator.php b/library/Icinga/Web/Form/Validator/TimeFormatValidator.php
index f43a42922..a02581cfa 100644
--- a/library/Icinga/Web/Form/Validator/TimeFormatValidator.php
+++ b/library/Icinga/Web/Form/Validator/TimeFormatValidator.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/TriStateValidator.php b/library/Icinga/Web/Form/Validator/TriStateValidator.php
index 27f754033..e51e00e21 100644
--- a/library/Icinga/Web/Form/Validator/TriStateValidator.php
+++ b/library/Icinga/Web/Form/Validator/TriStateValidator.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/WritablePathValidator.php b/library/Icinga/Web/Form/Validator/WritablePathValidator.php
index c7b7ab0b5..239ab77c8 100644
--- a/library/Icinga/Web/Form/Validator/WritablePathValidator.php
+++ b/library/Icinga/Web/Form/Validator/WritablePathValidator.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Hook.php b/library/Icinga/Web/Hook.php
index b339ce063..7ace738d7 100644
--- a/library/Icinga/Web/Hook.php
+++ b/library/Icinga/Web/Hook.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Hook/GrapherHook.php b/library/Icinga/Web/Hook/GrapherHook.php
index e1490d5bb..a48c50ed6 100644
--- a/library/Icinga/Web/Hook/GrapherHook.php
+++ b/library/Icinga/Web/Hook/GrapherHook.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Hook;
 
diff --git a/library/Icinga/Web/Hook/TicketHook.php b/library/Icinga/Web/Hook/TicketHook.php
index 4481f2c8e..bb9a129b4 100644
--- a/library/Icinga/Web/Hook/TicketHook.php
+++ b/library/Icinga/Web/Hook/TicketHook.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Hook;
 
diff --git a/library/Icinga/Web/Hook/WebBaseHook.php b/library/Icinga/Web/Hook/WebBaseHook.php
index f151d9c9c..a901787bb 100644
--- a/library/Icinga/Web/Hook/WebBaseHook.php
+++ b/library/Icinga/Web/Hook/WebBaseHook.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Hook;
 
@@ -47,4 +48,4 @@ class WebBaseHook
 
         return $this->view;
     }
-}
+} 
\ No newline at end of file
diff --git a/library/Icinga/Web/JavaScript.php b/library/Icinga/Web/JavaScript.php
index a8913d3e7..9fa687042 100644
--- a/library/Icinga/Web/JavaScript.php
+++ b/library/Icinga/Web/JavaScript.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/LessCompiler.php b/library/Icinga/Web/LessCompiler.php
index 347ad8d6f..261790579 100644
--- a/library/Icinga/Web/LessCompiler.php
+++ b/library/Icinga/Web/LessCompiler.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 38cbba967..f0279ea9c 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php b/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
index 0a0f707c2..659709868 100644
--- a/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/MenuItemRenderer.php b/library/Icinga/Web/Menu/MenuItemRenderer.php
index 6f13f991e..da09d7808 100644
--- a/library/Icinga/Web/Menu/MenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/MenuItemRenderer.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php b/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php
index 2d89029b0..3bccb9327 100644
--- a/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php b/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php
index 3022f2c64..58689547f 100644
--- a/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php b/library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php
index dfb43af08..10a75c00f 100644
--- a/library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php b/library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php
index 9d180ec70..8a59e9baa 100644
--- a/library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/MenuRenderer.php b/library/Icinga/Web/MenuRenderer.php
index 224a5c525..8502e5215 100644
--- a/library/Icinga/Web/MenuRenderer.php
+++ b/library/Icinga/Web/MenuRenderer.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Notification.php b/library/Icinga/Web/Notification.php
index b34137651..b046476b3 100644
--- a/library/Icinga/Web/Notification.php
+++ b/library/Icinga/Web/Notification.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php b/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
index 5a3edef0a..03f8f1cc5 100644
--- a/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
+++ b/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Paginator\Adapter;
 
diff --git a/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php b/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
index f0581c42c..d861dbe29 100644
--- a/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
+++ b/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /**
  * @see Zend_Paginator_ScrollingStyle_Interface
@@ -40,7 +41,7 @@ class Icinga_Web_Paginator_ScrollingStyle_SlidingWithBorder implements Zend_Pagi
                 $range[$i] = $i;
             }
             if ($pageNumber < 6 ) {
-                // We are on page 1-5 from
+                // We are on page 1-5 from  
                 for ($i = 1; $i <= 7; $i++) {
                     $range[$i] = $i;
                 }
diff --git a/library/Icinga/Web/Request.php b/library/Icinga/Web/Request.php
index dbc3dcb34..ae957f6a9 100644
--- a/library/Icinga/Web/Request.php
+++ b/library/Icinga/Web/Request.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Response.php b/library/Icinga/Web/Response.php
index 6e48b4a6b..d0d8912e6 100644
--- a/library/Icinga/Web/Response.php
+++ b/library/Icinga/Web/Response.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Session.php b/library/Icinga/Web/Session.php
index 63606bbef..4723903e9 100644
--- a/library/Icinga/Web/Session.php
+++ b/library/Icinga/Web/Session.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Session/PhpSession.php b/library/Icinga/Web/Session/PhpSession.php
index 32feced21..fa545fd8d 100644
--- a/library/Icinga/Web/Session/PhpSession.php
+++ b/library/Icinga/Web/Session/PhpSession.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Session;
 
diff --git a/library/Icinga/Web/Session/Session.php b/library/Icinga/Web/Session/Session.php
index a89677963..ab73dcac7 100644
--- a/library/Icinga/Web/Session/Session.php
+++ b/library/Icinga/Web/Session/Session.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Session;
 
diff --git a/library/Icinga/Web/Session/SessionNamespace.php b/library/Icinga/Web/Session/SessionNamespace.php
index 83bc4d61f..c72d69c36 100644
--- a/library/Icinga/Web/Session/SessionNamespace.php
+++ b/library/Icinga/Web/Session/SessionNamespace.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Session;
 
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index 1fa450e42..9e6bd0bed 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Url.php b/library/Icinga/Web/Url.php
index 219a081fe..a3af4a338 100644
--- a/library/Icinga/Web/Url.php
+++ b/library/Icinga/Web/Url.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/UrlParams.php b/library/Icinga/Web/UrlParams.php
index 3cfd3c1dd..1c839960d 100644
--- a/library/Icinga/Web/UrlParams.php
+++ b/library/Icinga/Web/UrlParams.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
@@ -242,7 +243,7 @@ class UrlParams
         );
         $this->reIndexAll();
 
-        return $this;
+        return $this;        
     }
 
     public function remove($param)
diff --git a/library/Icinga/Web/View.php b/library/Icinga/Web/View.php
index fe232af86..2122662ac 100644
--- a/library/Icinga/Web/View.php
+++ b/library/Icinga/Web/View.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/View/DateTimeRenderer.php b/library/Icinga/Web/View/DateTimeRenderer.php
index 4c982fa8a..639befb7f 100644
--- a/library/Icinga/Web/View/DateTimeRenderer.php
+++ b/library/Icinga/Web/View/DateTimeRenderer.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\View;
 
diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php
index 9cd680f4e..a203f2fb3 100644
--- a/library/Icinga/Web/View/helpers/format.php
+++ b/library/Icinga/Web/View/helpers/format.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\View;
 
diff --git a/library/Icinga/Web/View/helpers/generic.php b/library/Icinga/Web/View/helpers/generic.php
index caae5e34a..8ab934e0e 100644
--- a/library/Icinga/Web/View/helpers/generic.php
+++ b/library/Icinga/Web/View/helpers/generic.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\View;
 
diff --git a/library/Icinga/Web/View/helpers/url.php b/library/Icinga/Web/View/helpers/url.php
index fd8282889..901e68803 100644
--- a/library/Icinga/Web/View/helpers/url.php
+++ b/library/Icinga/Web/View/helpers/url.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\View;
 
@@ -62,7 +63,7 @@ $this->addHelperFunction('icon', function ($img, $title = null, array $propertie
         $properties['alt'] = $title;
         $properties['title'] = $title;
     }
-
+ 
     if ($class !== null) {
         if (isset($props['class'])) {
             $properties['class'] .= ' ' . $class;
diff --git a/library/Icinga/Web/ViewStream.php b/library/Icinga/Web/ViewStream.php
index 6abf49ac3..e5dacd879 100644
--- a/library/Icinga/Web/ViewStream.php
+++ b/library/Icinga/Web/ViewStream.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Widget.php b/library/Icinga/Web/Widget.php
index facde79e8..b181a49ea 100644
--- a/library/Icinga/Web/Widget.php
+++ b/library/Icinga/Web/Widget.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Widget/AbstractWidget.php b/library/Icinga/Web/Widget/AbstractWidget.php
index 1984e28e1..5b9d8876b 100644
--- a/library/Icinga/Web/Widget/AbstractWidget.php
+++ b/library/Icinga/Web/Widget/AbstractWidget.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
index 4f6f17ea8..56de318e8 100644
--- a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
+++ b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget\Chart;
 
diff --git a/library/Icinga/Web/Widget/Chart/InlinePie.php b/library/Icinga/Web/Widget/Chart/InlinePie.php
index 310a88b3c..04e3e7318 100644
--- a/library/Icinga/Web/Widget/Chart/InlinePie.php
+++ b/library/Icinga/Web/Widget/Chart/InlinePie.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget\Chart;
 
diff --git a/library/Icinga/Web/Widget/Dashboard.php b/library/Icinga/Web/Widget/Dashboard.php
index b19ccb374..bb62cc8f9 100644
--- a/library/Icinga/Web/Widget/Dashboard.php
+++ b/library/Icinga/Web/Widget/Dashboard.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Dashboard/Dashlet.php b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
index 6317532e8..1b7a7ef95 100644
--- a/library/Icinga/Web/Widget/Dashboard/Dashlet.php
+++ b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget\Dashboard;
 
diff --git a/library/Icinga/Web/Widget/Dashboard/Pane.php b/library/Icinga/Web/Widget/Dashboard/Pane.php
index 302306a9b..52d9fa524 100644
--- a/library/Icinga/Web/Widget/Dashboard/Pane.php
+++ b/library/Icinga/Web/Widget/Dashboard/Pane.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget\Dashboard;
 
diff --git a/library/Icinga/Web/Widget/Dashboard/UserWidget.php b/library/Icinga/Web/Widget/Dashboard/UserWidget.php
index 4362d0f12..0b171964e 100644
--- a/library/Icinga/Web/Widget/Dashboard/UserWidget.php
+++ b/library/Icinga/Web/Widget/Dashboard/UserWidget.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget\Dashboard;
 
diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index c515ee79d..4a2fc8d11 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget;
 
@@ -68,7 +69,7 @@ class FilterEditor extends AbstractWidget
     public function getFilter()
     {
         if ($this->filter === null) {
-            $this->filter = Filter::fromQueryString((string) $this->url()->getParams());
+            $this->filter = Filter::fromQueryString((string) $this->url()->getParams()); 
         }
         return $this->filter;
     }
@@ -432,7 +433,7 @@ class FilterEditor extends AbstractWidget
     protected function renderFilterExpression(FilterExpression $filter)
     {
         if ($this->addTo && $this->addTo === $filter->getId()) {
-            return
+            return 
                    preg_replace(
             '/ class="autosubmit"/',
             ' class="autofocus"',
@@ -572,7 +573,7 @@ class FilterEditor extends AbstractWidget
             $cols[$active] = str_replace('_', ' ', ucfirst(ltrim($active, '_')));
         }
 
-        return $this->select($this->elementId('column', $filter), $cols, $active);
+        return $this->select($this->elementId('column', $filter), $cols, $active); 
     }
 
     protected function applyChanges($changes)
diff --git a/library/Icinga/Web/Widget/FilterWidget.php b/library/Icinga/Web/Widget/FilterWidget.php
index bd79c25e0..cf47ef581 100644
--- a/library/Icinga/Web/Widget/FilterWidget.php
+++ b/library/Icinga/Web/Widget/FilterWidget.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget;
 
@@ -82,7 +83,7 @@ class FilterWidget extends AbstractWidget
 
 
         // $html .= $this->renderFilter($this->filter);
-
+        
         $editorUrl = clone $url;
         $editorUrl->setParam('modifyFilter', true);
         if  ($this->filter->isEmpty()) {
diff --git a/library/Icinga/Web/Widget/Limiter.php b/library/Icinga/Web/Widget/Limiter.php
index acc66c885..5afa7e4b8 100644
--- a/library/Icinga/Web/Widget/Limiter.php
+++ b/library/Icinga/Web/Widget/Limiter.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/SearchDashboard.php b/library/Icinga/Web/Widget/SearchDashboard.php
index 8893b6db1..9e02f3373 100644
--- a/library/Icinga/Web/Widget/SearchDashboard.php
+++ b/library/Icinga/Web/Widget/SearchDashboard.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 6414d37c2..42e7110cc 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index 914d91887..7eb5abeb1 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Tabextension/BasketAction.php b/library/Icinga/Web/Widget/Tabextension/BasketAction.php
index 1e745edda..34514f834 100644
--- a/library/Icinga/Web/Widget/Tabextension/BasketAction.php
+++ b/library/Icinga/Web/Widget/Tabextension/BasketAction.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget\Tabextension;
 
diff --git a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
index 6c5031d42..280a9b142 100644
--- a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
+++ b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget\Tabextension;
 
diff --git a/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php b/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
index 39343efe9..496fe3495 100644
--- a/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
+++ b/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget\Tabextension;
 
@@ -36,4 +37,4 @@ class DashboardSettings implements Tabextension
             )
         );
     }
-}
+}
\ No newline at end of file
diff --git a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
index d4205ccf2..0b533fd82 100644
--- a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
+++ b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget\Tabextension;
 
diff --git a/library/Icinga/Web/Widget/Tabextension/Tabextension.php b/library/Icinga/Web/Widget/Tabextension/Tabextension.php
index ed88f772c..881668d2e 100644
--- a/library/Icinga/Web/Widget/Tabextension/Tabextension.php
+++ b/library/Icinga/Web/Widget/Tabextension/Tabextension.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget\Tabextension;
 
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index 939782ded..c6a4bd31b 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Widget.php b/library/Icinga/Web/Widget/Widget.php
index 99c122756..3eda668ce 100644
--- a/library/Icinga/Web/Widget/Widget.php
+++ b/library/Icinga/Web/Widget/Widget.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Window.php b/library/Icinga/Web/Window.php
index f5658850c..3a541d3bb 100644
--- a/library/Icinga/Web/Window.php
+++ b/library/Icinga/Web/Window.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Wizard.php b/library/Icinga/Web/Wizard.php
index 026b49541..42dea5c1c 100644
--- a/library/Icinga/Web/Wizard.php
+++ b/library/Icinga/Web/Wizard.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
diff --git a/modules/doc/application/controllers/IcingawebController.php b/modules/doc/application/controllers/IcingawebController.php
index a12d8cd8b..60c5da5ee 100644
--- a/modules/doc/application/controllers/IcingawebController.php
+++ b/modules/doc/application/controllers/IcingawebController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use \Zend_Controller_Action_Exception;
 use Icinga\Application\Icinga;
diff --git a/modules/doc/application/controllers/IndexController.php b/modules/doc/application/controllers/IndexController.php
index f675d6067..63b5e8cdf 100644
--- a/modules/doc/application/controllers/IndexController.php
+++ b/modules/doc/application/controllers/IndexController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Module\Doc\DocController;
 
diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php
index 8a7b96fed..a4d14cf61 100644
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use \Zend_Controller_Action_Exception;
 use Icinga\Application\Icinga;
diff --git a/modules/doc/application/controllers/StyleController.php b/modules/doc/application/controllers/StyleController.php
index e06835420..d5440c95a 100644
--- a/modules/doc/application/controllers/StyleController.php
+++ b/modules/doc/application/controllers/StyleController.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Application\Icinga;
 use Icinga\Web\Controller;
diff --git a/modules/doc/configuration.php b/modules/doc/configuration.php
index c377eb3c4..6e924e964 100644
--- a/modules/doc/configuration.php
+++ b/modules/doc/configuration.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /** @type $this \Icinga\Application\Modules\Module */
 
diff --git a/modules/doc/library/Doc/DocController.php b/modules/doc/library/Doc/DocController.php
index 613c3ce56..0d12f58df 100644
--- a/modules/doc/library/Doc/DocController.php
+++ b/modules/doc/library/Doc/DocController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/DocIterator.php b/modules/doc/library/Doc/DocIterator.php
index 0268e2054..3045b6309 100644
--- a/modules/doc/library/Doc/DocIterator.php
+++ b/modules/doc/library/Doc/DocIterator.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/DocParser.php b/modules/doc/library/Doc/DocParser.php
index d9b35c087..6cfeca418 100644
--- a/modules/doc/library/Doc/DocParser.php
+++ b/modules/doc/library/Doc/DocParser.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/DocTree.php b/modules/doc/library/Doc/DocTree.php
index 5153c8807..1b112649c 100644
--- a/modules/doc/library/Doc/DocTree.php
+++ b/modules/doc/library/Doc/DocTree.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/Exception/ChapterNotFoundException.php b/modules/doc/library/Doc/Exception/ChapterNotFoundException.php
index e754a2f82..cd048a162 100644
--- a/modules/doc/library/Doc/Exception/ChapterNotFoundException.php
+++ b/modules/doc/library/Doc/Exception/ChapterNotFoundException.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Doc\Exception;
 
diff --git a/modules/doc/library/Doc/Exception/DocEmptyException.php b/modules/doc/library/Doc/Exception/DocEmptyException.php
index ce5093b25..2869e2678 100644
--- a/modules/doc/library/Doc/Exception/DocEmptyException.php
+++ b/modules/doc/library/Doc/Exception/DocEmptyException.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Doc\Exception;
 
diff --git a/modules/doc/library/Doc/Exception/DocException.php b/modules/doc/library/Doc/Exception/DocException.php
index 542f3b7a3..374ea3e01 100644
--- a/modules/doc/library/Doc/Exception/DocException.php
+++ b/modules/doc/library/Doc/Exception/DocException.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Doc\Exception;
 
diff --git a/modules/doc/library/Doc/Renderer.php b/modules/doc/library/Doc/Renderer.php
index 5bb33298e..0aebb89b9 100644
--- a/modules/doc/library/Doc/Renderer.php
+++ b/modules/doc/library/Doc/Renderer.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/Section.php b/modules/doc/library/Doc/Section.php
index 77f7a94a8..5cf3d61e2 100644
--- a/modules/doc/library/Doc/Section.php
+++ b/modules/doc/library/Doc/Section.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/SectionFilterIterator.php b/modules/doc/library/Doc/SectionFilterIterator.php
index a12aa56ea..e20d80359 100644
--- a/modules/doc/library/Doc/SectionFilterIterator.php
+++ b/modules/doc/library/Doc/SectionFilterIterator.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/SectionRenderer.php b/modules/doc/library/Doc/SectionRenderer.php
index 70a53dd9c..f923783f6 100644
--- a/modules/doc/library/Doc/SectionRenderer.php
+++ b/modules/doc/library/Doc/SectionRenderer.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/TocRenderer.php b/modules/doc/library/Doc/TocRenderer.php
index d5f022229..4061e80e3 100644
--- a/modules/doc/library/Doc/TocRenderer.php
+++ b/modules/doc/library/Doc/TocRenderer.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/public/css/module.less b/modules/doc/public/css/module.less
index 876328ff9..a029517de 100644
--- a/modules/doc/public/css/module.less
+++ b/modules/doc/public/css/module.less
@@ -1,5 +1,3 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
-
 div.chapter {
   padding-left: 5px;
 }
diff --git a/modules/doc/run.php b/modules/doc/run.php
index 9854e0afc..31aff8ff0 100644
--- a/modules/doc/run.php
+++ b/modules/doc/run.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use \Zend_Controller_Router_Route;
 use Icinga\Application\Icinga;
diff --git a/modules/monitoring/application/clicommands/ConferenceCommand.php b/modules/monitoring/application/clicommands/ConferenceCommand.php
index 6db032a17..7c659e8fb 100644
--- a/modules/monitoring/application/clicommands/ConferenceCommand.php
+++ b/modules/monitoring/application/clicommands/ConferenceCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Clicommands;
 
diff --git a/modules/monitoring/application/clicommands/ListCommand.php b/modules/monitoring/application/clicommands/ListCommand.php
index c962ceb34..a4f1d05f1 100644
--- a/modules/monitoring/application/clicommands/ListCommand.php
+++ b/modules/monitoring/application/clicommands/ListCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Clicommands;
 
diff --git a/modules/monitoring/application/clicommands/NrpeCommand.php b/modules/monitoring/application/clicommands/NrpeCommand.php
index 677fd68d0..69ee50d9b 100644
--- a/modules/monitoring/application/clicommands/NrpeCommand.php
+++ b/modules/monitoring/application/clicommands/NrpeCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Clicommands;
 
diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 4d711ade9..d9cc798a7 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Chart\GridChart;
 use Icinga\Chart\Unit\LinearUnit;
diff --git a/modules/monitoring/application/controllers/ChartController.php b/modules/monitoring/application/controllers/ChartController.php
index 005424209..757329bfe 100644
--- a/modules/monitoring/application/controllers/ChartController.php
+++ b/modules/monitoring/application/controllers/ChartController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Chart\GridChart;
diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index 5bd74cd45..ed5d57570 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Web\Notification;
 use Icinga\Data\ResourceFactory;
diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index deee63d49..150f9ae1a 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 862ba529f..3235a7012 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Data\Filter\Filter;
 use Icinga\Module\Monitoring\Controller;
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 3cc2c3549..faaea713a 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Backend;
diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php
index ab45cad96..5530f9c52 100644
--- a/modules/monitoring/application/controllers/ProcessController.php
+++ b/modules/monitoring/application/controllers/ProcessController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Forms\Command\Instance\DisableNotificationsExpireCommandForm;
diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index 2d5728104..4e4e67402 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 600979eb6..467f04bec 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Data\Filter\Filter;
 use Icinga\Module\Monitoring\Controller;
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 173dd4e75..0b7a2f897 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Application\Benchmark;
 use Icinga\Module\Monitoring\Object\MonitoredObject;
diff --git a/modules/monitoring/application/controllers/TacticalController.php b/modules/monitoring/application/controllers/TacticalController.php
index 1318ada9f..a48e053ca 100644
--- a/modules/monitoring/application/controllers/TacticalController.php
+++ b/modules/monitoring/application/controllers/TacticalController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Module\Monitoring\Controller as MonitoringController;
 use Icinga\Web\Url;
diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php
index 012a59c09..e21c580ad 100644
--- a/modules/monitoring/application/controllers/TimelineController.php
+++ b/modules/monitoring/application/controllers/TimelineController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use \DateTime;
 use \DateInterval;
diff --git a/modules/monitoring/application/forms/Command/CommandForm.php b/modules/monitoring/application/forms/Command/CommandForm.php
index 05318c0e4..fd67e140d 100644
--- a/modules/monitoring/application/forms/Command/CommandForm.php
+++ b/modules/monitoring/application/forms/Command/CommandForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Command;
 
diff --git a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
index c6e3e5225..21d926b58 100644
--- a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Command\Instance;
 
diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index 65b958f8b..60486307e 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Command\Instance;
 
diff --git a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
index b5adac042..df3731837 100644
--- a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
index 6491077d1..e7f7e91f9 100644
--- a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
index 2b873b092..1054aae05 100644
--- a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
index 88f28e676..0f7858ad9 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
index 348acc8f4..43ca52b05 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php b/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php
index 331ec8931..1dbf07840 100644
--- a/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
index 5b1f3236b..44e248956 100644
--- a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php b/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php
index 47fe6d1fd..189261c94 100644
--- a/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
index 324e79536..949ec33e1 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
index 6b304b5ff..f84069a9a 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
index c17fe588a..4921f54ff 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
index d01268988..4f66898f6 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
index d4f7a1735..d3cc63ecf 100644
--- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index 969049642..ca45c068b 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Config;
 
diff --git a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
index 51e94b3fc..405bac144 100644
--- a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Config\Instance;
 
diff --git a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
index 367093101..47b2a0316 100644
--- a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Config\Instance;
 
diff --git a/modules/monitoring/application/forms/Config/InstanceConfigForm.php b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
index d08a451ee..5618f27ee 100644
--- a/modules/monitoring/application/forms/Config/InstanceConfigForm.php
+++ b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Config;
 
diff --git a/modules/monitoring/application/forms/Config/SecurityConfigForm.php b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
index 4613d84f1..b202f5938 100644
--- a/modules/monitoring/application/forms/Config/SecurityConfigForm.php
+++ b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Config;
 
diff --git a/modules/monitoring/application/forms/EventOverviewForm.php b/modules/monitoring/application/forms/EventOverviewForm.php
index a1e95d3c0..dc697b940 100644
--- a/modules/monitoring/application/forms/EventOverviewForm.php
+++ b/modules/monitoring/application/forms/EventOverviewForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms;
 
diff --git a/modules/monitoring/application/forms/Setup/BackendPage.php b/modules/monitoring/application/forms/Setup/BackendPage.php
index ee160f978..b5ab2ffd6 100644
--- a/modules/monitoring/application/forms/Setup/BackendPage.php
+++ b/modules/monitoring/application/forms/Setup/BackendPage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/IdoResourcePage.php b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
index cced78378..c28b52e6b 100644
--- a/modules/monitoring/application/forms/Setup/IdoResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/InstancePage.php b/modules/monitoring/application/forms/Setup/InstancePage.php
index 9d7b24f07..8f151554d 100644
--- a/modules/monitoring/application/forms/Setup/InstancePage.php
+++ b/modules/monitoring/application/forms/Setup/InstancePage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
index d010fa36f..245d2abcc 100644
--- a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/SecurityPage.php b/modules/monitoring/application/forms/Setup/SecurityPage.php
index 935419250..ba8083e50 100644
--- a/modules/monitoring/application/forms/Setup/SecurityPage.php
+++ b/modules/monitoring/application/forms/Setup/SecurityPage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/WelcomePage.php b/modules/monitoring/application/forms/Setup/WelcomePage.php
index 5a5a3665f..f79eb6c62 100644
--- a/modules/monitoring/application/forms/Setup/WelcomePage.php
+++ b/modules/monitoring/application/forms/Setup/WelcomePage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/StatehistoryForm.php b/modules/monitoring/application/forms/StatehistoryForm.php
index bfb4b608a..d859f5815 100644
--- a/modules/monitoring/application/forms/StatehistoryForm.php
+++ b/modules/monitoring/application/forms/StatehistoryForm.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Forms;
 
diff --git a/modules/monitoring/application/views/helpers/CheckPerformance.php b/modules/monitoring/application/views/helpers/CheckPerformance.php
index 9d56e400a..19912d3d6 100644
--- a/modules/monitoring/application/views/helpers/CheckPerformance.php
+++ b/modules/monitoring/application/views/helpers/CheckPerformance.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /**
  * Convert check summary data into a simple usable stdClass
diff --git a/modules/monitoring/application/views/helpers/ContactFlags.php b/modules/monitoring/application/views/helpers/ContactFlags.php
index 76828ee24..da2b2823a 100644
--- a/modules/monitoring/application/views/helpers/ContactFlags.php
+++ b/modules/monitoring/application/views/helpers/ContactFlags.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 class Zend_View_Helper_ContactFlags extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/application/views/helpers/Customvar.php b/modules/monitoring/application/views/helpers/Customvar.php
index 2ab663fa2..699c6a727 100644
--- a/modules/monitoring/application/views/helpers/Customvar.php
+++ b/modules/monitoring/application/views/helpers/Customvar.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 class Zend_View_Helper_Customvar extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/application/views/helpers/Link.php b/modules/monitoring/application/views/helpers/Link.php
index 40cca5925..0d8c35861 100644
--- a/modules/monitoring/application/views/helpers/Link.php
+++ b/modules/monitoring/application/views/helpers/Link.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Helper for generating frequently used jump links
diff --git a/modules/monitoring/application/views/helpers/MonitoringFlags.php b/modules/monitoring/application/views/helpers/MonitoringFlags.php
index c64ac48fa..db4b8dedc 100644
--- a/modules/monitoring/application/views/helpers/MonitoringFlags.php
+++ b/modules/monitoring/application/views/helpers/MonitoringFlags.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /* use Icinga\Module\Monitoring\Object\MonitoredObject; */
 
diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index e3b92510f..4c2bee89a 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Util\Format;
 use Icinga\Web\Widget\Chart\InlinePie;
diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
index 90f565978..e3d88b26f 100644
--- a/modules/monitoring/application/views/helpers/PluginOutput.php
+++ b/modules/monitoring/application/views/helpers/PluginOutput.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/application/views/helpers/ResolveMacros.php b/modules/monitoring/application/views/helpers/ResolveMacros.php
index d95245d18..385962a85 100644
--- a/modules/monitoring/application/views/helpers/ResolveMacros.php
+++ b/modules/monitoring/application/views/helpers/ResolveMacros.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use \Zend_View_Helper_Abstract;
 use Icinga\Module\Monitoring\Object\MonitoredObject;
diff --git a/modules/monitoring/application/views/helpers/RuntimeVariables.php b/modules/monitoring/application/views/helpers/RuntimeVariables.php
index 21f2c7c6f..556bd43ad 100644
--- a/modules/monitoring/application/views/helpers/RuntimeVariables.php
+++ b/modules/monitoring/application/views/helpers/RuntimeVariables.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /**
  * Convert runtime summary data into a simple usable stdClass
diff --git a/modules/monitoring/application/views/helpers/SelectionToolbar.php b/modules/monitoring/application/views/helpers/SelectionToolbar.php
index 2905469b9..0b4254522 100644
--- a/modules/monitoring/application/views/helpers/SelectionToolbar.php
+++ b/modules/monitoring/application/views/helpers/SelectionToolbar.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 class Zend_View_Helper_SelectionToolbar extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index 09be0920a..f34b4b0f5 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /** @type $this \Icinga\Application\Modules\Module */
 
diff --git a/modules/monitoring/library/Monitoring/Backend.php b/modules/monitoring/library/Monitoring/Backend.php
index 7bea95896..e3672dcd5 100644
--- a/modules/monitoring/library/Monitoring/Backend.php
+++ b/modules/monitoring/library/Monitoring/Backend.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 // TODO: obsolete, remove once MonitoringBackend is in use everywhere
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/IdoBackend.php b/modules/monitoring/library/Monitoring/Backend/Ido/IdoBackend.php
index 2b7fa89fa..17bfb9f6a 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/IdoBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/IdoBackend.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php
index a2070f453..811eb7f28 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommandQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommandQuery.php
index 62e031dda..c730c078e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommandQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommandQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
@@ -58,4 +59,4 @@ class CommandQuery extends IdoQuery
             array()
         );
     }
-}
+}
\ No newline at end of file
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
index 0f78eef9e..a522d702e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
index ba21e11a8..4ee17de6a 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
index e851fddcd..e3231d932 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
index 3f2902e9d..467e40fc0 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
index 7fb6d2dd6..346f2458a 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
index 63151d06c..04e17ddcd 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index 985f091ab..efc10f6a5 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
index cb69d3a80..f9ec831a7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
index 775f9da86..01c56cd4d 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index 0b17df375..2896f9536 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
index b853f86d9..88a120db2 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
index a59e873ed..53c1d7ed7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
index 10e5b1f7c..eedb2f1e9 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index b6e08b731..7cca01d31 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index 391048ceb..dfc2b885a 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index 958840a49..3181eebbf 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
index 1a203d232..4bf712f4c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
index c53e766ab..989c2b698 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php
index bb00883f7..cf3b6ea6d 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php
index 5878d16be..479142547 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
index 6443eab00..84ad94b86 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
index e22543411..dfa81b1ef 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index fc0616227..cd7d0aef7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
index a941b32ed..29337e65f 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/LivestatusBackend.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/LivestatusBackend.php
index cabe3dcc1..12de5a9ee 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/LivestatusBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/LivestatusBackend.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/DowntimeQuery.php
index 6394e3696..59f0bb24a 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/DowntimeQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/HostgroupQuery.php
index 79aeb7051..0ffc821bb 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/HostgroupQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/ServicegroupQuery.php
index 4a65c05f1..0587f7cea 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/ServicegroupQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
index 613ab2276..5a638c9ca 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusSummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusSummaryQuery.php
index 7aab807b1..f431a566e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusSummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusSummaryQuery.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
@@ -12,7 +13,7 @@ class StatusSummaryQuery extends Query
 
     protected $available_columns = array(
     'service_host_name' => 'host_name',
-
+    
             'services_total'                            => 'state != 9999',
             'services_problem'                          => 'state > 0',
             'services_problem_handled'                  => 'state > 0 & (scheduled_downtime_depth > 0 | acknowledged = 1 | host_state > 0)',
@@ -49,7 +50,7 @@ if (! array_key_exists($col, $this->available_columns)) {
   throw new ProgrammingError('No such column: %s', $col);
 }
               $filter = $this->filterStringToFilter($this->available_columns[$col]);
-
+              
               //Filter::fromQueryString(str_replace(' ', '',  $this->available_columns[$col]));
               $parts[] = $this->renderFilter( $filter, 'Stats', 0, false);
           }
diff --git a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
index 0a1baad7d..d165f1252 100644
--- a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend;
 
diff --git a/modules/monitoring/library/Monitoring/BackendStep.php b/modules/monitoring/library/Monitoring/BackendStep.php
index 4df52ca3f..7f9fc11cf 100644
--- a/modules/monitoring/library/Monitoring/BackendStep.php
+++ b/modules/monitoring/library/Monitoring/BackendStep.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Cli/CliUtils.php b/modules/monitoring/library/Monitoring/Cli/CliUtils.php
index e1ef52691..5b443c714 100644
--- a/modules/monitoring/library/Monitoring/Cli/CliUtils.php
+++ b/modules/monitoring/library/Monitoring/Cli/CliUtils.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Cli;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php b/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
index b65ede3cd..440f21770 100644
--- a/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
+++ b/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Exception;
 
diff --git a/modules/monitoring/library/Monitoring/Command/IcingaCommand.php b/modules/monitoring/library/Monitoring/Command/IcingaCommand.php
index cc1ff7614..3b569de8e 100644
--- a/modules/monitoring/library/Monitoring/Command/IcingaCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/IcingaCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php b/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php
index 97936dfc7..309cb9e2f 100644
--- a/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Instance;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php
index 1aa50be1b..01b26a009 100644
--- a/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Instance;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php b/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php
index 7eea6d08c..4dff07c4a 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php
index e986dd4a5..a7540f4f8 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
index 074b134e7..850566ff9 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
index 0387c1d63..67e271dbb 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php
index 2de2bde02..1c8910066 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php
index eaa0184c7..8e3155de5 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntimeCommand.php
index 78753e684..89591c8fc 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntimeCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php b/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php
index 2451f4dfb..6f9f99432 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php
index 4c210ee01..ead8f7a30 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php
index 132847363..ea7e31dc6 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
index 7e041e09d..fc2037146 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php
index 78a5add50..24be3512b 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php
index 7d12849e4..c6cbeaa50 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php
index ce912955d..695c53cc6 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
index d8e643fb2..651383255 100644
--- a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Renderer;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php
index ec40c0b16..f901e3850 100644
--- a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Renderer;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
index ea2d0d026..8ed7d45eb 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
index ca8de3c0e..21b532d49 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
index 96b788021..73a2e5288 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
index 46a9e9a55..0e447a4f3 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php
index 5cce6c8d6..f294e9a2e 100644
--- a/modules/monitoring/library/Monitoring/Controller.php
+++ b/modules/monitoring/library/Monitoring/Controller.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Command.php b/modules/monitoring/library/Monitoring/DataView/Command.php
index 429353ec4..a21c48ee0 100644
--- a/modules/monitoring/library/Monitoring/DataView/Command.php
+++ b/modules/monitoring/library/Monitoring/DataView/Command.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
@@ -24,4 +25,4 @@ class Command extends DataView
         );
     }
 
-}
+} 
\ No newline at end of file
diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index 785dd802f..4cd11e1a1 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Contact.php b/modules/monitoring/library/Monitoring/DataView/Contact.php
index 90542db6a..27639b0c6 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contact.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contact.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
index abd94b88d..7dd7a1cd4 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Customvar.php b/modules/monitoring/library/Monitoring/DataView/Customvar.php
index 273944bc7..0a8887fde 100644
--- a/modules/monitoring/library/Monitoring/DataView/Customvar.php
+++ b/modules/monitoring/library/Monitoring/DataView/Customvar.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 09a6cd5b8..da48f31c3 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index 0d4873e95..681608b17 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/EventHistory.php b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
index f1bb18476..f13815aae 100644
--- a/modules/monitoring/library/Monitoring/DataView/EventHistory.php
+++ b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
index e89d2c46d..726f1ae60 100644
--- a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
+++ b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
index 44c476e80..a4736e47c 100644
--- a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index 79afffaec..86bff52bf 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroup.php b/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
index 03c1bb508..94fc7ac56 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 
 namespace Icinga\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php
index ef6895a10..7f6fd238f 100644
--- a/modules/monitoring/library/Monitoring/DataView/Notification.php
+++ b/modules/monitoring/library/Monitoring/DataView/Notification.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Programstatus.php b/modules/monitoring/library/Monitoring/DataView/Programstatus.php
index 0c01122eb..f42858bf8 100644
--- a/modules/monitoring/library/Monitoring/DataView/Programstatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/Programstatus.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php b/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php
index 8d5bc7cdb..d9d15a517 100644
--- a/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php b/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php
index 5fbf7ea17..dbdd338c0 100644
--- a/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php
+++ b/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index e6a2835a0..e7e2accb2 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroup.php b/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
index f88075d33..00a6f7d5f 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 
 namespace Icinga\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/StatusSummary.php b/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
index 209ec8d08..74574bc72 100644
--- a/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/Environment.php b/modules/monitoring/library/Monitoring/Environment.php
index 0fb92a09b..f9ad28654 100644
--- a/modules/monitoring/library/Monitoring/Environment.php
+++ b/modules/monitoring/library/Monitoring/Environment.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php b/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php
index 4368d8634..169fa2cfd 100644
--- a/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php
+++ b/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 
 namespace Icinga\Module\Monitoring\Exception;
diff --git a/modules/monitoring/library/Monitoring/InstanceStep.php b/modules/monitoring/library/Monitoring/InstanceStep.php
index f1c09c899..ab54b6548 100644
--- a/modules/monitoring/library/Monitoring/InstanceStep.php
+++ b/modules/monitoring/library/Monitoring/InstanceStep.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index fd7d7d42b..68d686e21 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index c38e68d60..8f7df07cb 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/HostList.php b/modules/monitoring/library/Monitoring/Object/HostList.php
index 2bbcb985f..2d3f57495 100644
--- a/modules/monitoring/library/Monitoring/Object/HostList.php
+++ b/modules/monitoring/library/Monitoring/Object/HostList.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 68930efca..213cf47b8 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/ObjectList.php b/modules/monitoring/library/Monitoring/Object/ObjectList.php
index cf45eeade..6eb1e4db3 100644
--- a/modules/monitoring/library/Monitoring/Object/ObjectList.php
+++ b/modules/monitoring/library/Monitoring/Object/ObjectList.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 5216fdb9c..870ff78ba 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/ServiceList.php b/modules/monitoring/library/Monitoring/Object/ServiceList.php
index bc324d2be..858d04b5b 100644
--- a/modules/monitoring/library/Monitoring/Object/ServiceList.php
+++ b/modules/monitoring/library/Monitoring/Object/ServiceList.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Plugin.php b/modules/monitoring/library/Monitoring/Plugin.php
index 3aa466341..ad53f7756 100644
--- a/modules/monitoring/library/Monitoring/Plugin.php
+++ b/modules/monitoring/library/Monitoring/Plugin.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
index a58457490..f51801192 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Plugin;
 
diff --git a/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php b/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
index ffd9ddb55..c62904bb3 100644
--- a/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
+++ b/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Plugin;
 
diff --git a/modules/monitoring/library/Monitoring/SecurityStep.php b/modules/monitoring/library/Monitoring/SecurityStep.php
index c187eb8e7..b3eda02c4 100644
--- a/modules/monitoring/library/Monitoring/SecurityStep.php
+++ b/modules/monitoring/library/Monitoring/SecurityStep.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring;
 
@@ -74,4 +75,4 @@ class SecurityStep extends Step
                 . '</p><p>' . $this->error->getMessage() . '</p>';
         }
     }
-}
+}
\ No newline at end of file
diff --git a/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php b/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php
index 112bd1e8b..bd83a42cd 100644
--- a/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php
+++ b/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Timeline;
 
diff --git a/modules/monitoring/library/Monitoring/Timeline/TimeLine.php b/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
index c61dc4283..93dc5a0ef 100644
--- a/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
+++ b/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Timeline;
 
diff --git a/modules/monitoring/library/Monitoring/Timeline/TimeRange.php b/modules/monitoring/library/Monitoring/Timeline/TimeRange.php
index 2e32fbca3..7ea4787b8 100644
--- a/modules/monitoring/library/Monitoring/Timeline/TimeRange.php
+++ b/modules/monitoring/library/Monitoring/Timeline/TimeRange.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Timeline;
 
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index cd2ed175f..a71273506 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Web\Controller;
 
diff --git a/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php b/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
index 8f54a1d7c..5025c414c 100644
--- a/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
+++ b/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Web\Hook;
 
diff --git a/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php b/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php
index 2d5e4a8ac..e265086ab 100644
--- a/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php
+++ b/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Web\Hook;
 
diff --git a/modules/monitoring/library/Monitoring/Web/Widget/SelectBox.php b/modules/monitoring/library/Monitoring/Web/Widget/SelectBox.php
index 97066e1ac..c58540faf 100644
--- a/modules/monitoring/library/Monitoring/Web/Widget/SelectBox.php
+++ b/modules/monitoring/library/Monitoring/Web/Widget/SelectBox.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Monitoring\Web\Widget;
 
@@ -75,7 +76,7 @@ class SelectBox extends AbstractWidget
      *
      * @param   Request     $request    The request to fetch the value from
      *
-     * @return  string|null
+     * @return  string|null     
      */
     public function getInterval(Request $request = null)
     {
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 5348f87a3..82ee0b629 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 h1 {
     font-size: 1em;
@@ -33,7 +34,7 @@ p.pluginoutput {
 
 div.pluginoutput {
   border-right: solid 5px @colorPetrol;
-  overflow: auto;
+  overflow: auto; 
   color: black;
   margin-bottom: 1em;
   padding: 0.2em;
@@ -197,4 +198,4 @@ h1.command-title {
 hr.command-separator {
   border: none;
   border-bottom: 2px solid @colorPetrol;
-}
+}
\ No newline at end of file
diff --git a/modules/monitoring/public/js/module.js b/modules/monitoring/public/js/module.js
index 0edfda766..b3ba863ff 100644
--- a/modules/monitoring/public/js/module.js
+++ b/modules/monitoring/public/js/module.js
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 (function(Icinga) {
 
diff --git a/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php b/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php
index ee6f8e759..f50b07893 100644
--- a/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php
+++ b/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Module\Monitoring\Application\Views\Helpers;
 
diff --git a/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php b/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
index 0a46e8226..a14f64ae7 100644
--- a/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
+++ b/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Modules\Monitoring\Application\Views\Helpers;
 
diff --git a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php
index b3e3c302e..3edd20857 100644
--- a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php
+++ b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Module\Monitoring\Plugin;
 
diff --git a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php
index e7beed43e..9cc132eb2 100644
--- a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php
+++ b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Module\Monitoring\Plugin;
 
diff --git a/modules/monitoring/test/php/regression/Bug6088Test.php b/modules/monitoring/test/php/regression/Bug6088Test.php
index e26474720..0a4f60a58 100644
--- a/modules/monitoring/test/php/regression/Bug6088Test.php
+++ b/modules/monitoring/test/php/regression/Bug6088Test.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Regression;
 
diff --git a/modules/monitoring/test/php/regression/Bug7043Test.php b/modules/monitoring/test/php/regression/Bug7043Test.php
index f6b7ded74..94a60a5b6 100644
--- a/modules/monitoring/test/php/regression/Bug7043Test.php
+++ b/modules/monitoring/test/php/regression/Bug7043Test.php
@@ -1,5 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Module\Monitoring\Regression;
 
@@ -58,4 +57,4 @@ class Bug7043Test extends BaseTestCase
 
         $this->assertEquals('backendName', $defaultBackend->getName(), 'Default backend has name set');
     }
-}
+}
\ No newline at end of file
diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index f9a73aba4..e63e770b8 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Clicommands;
 
diff --git a/modules/setup/application/clicommands/TokenCommand.php b/modules/setup/application/clicommands/TokenCommand.php
index e9f6007b7..6f6e2b08e 100644
--- a/modules/setup/application/clicommands/TokenCommand.php
+++ b/modules/setup/application/clicommands/TokenCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Clicommands;
 
diff --git a/modules/setup/application/controllers/IndexController.php b/modules/setup/application/controllers/IndexController.php
index 2dcb6ea5a..113886c88 100644
--- a/modules/setup/application/controllers/IndexController.php
+++ b/modules/setup/application/controllers/IndexController.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Module\Setup\WebWizard;
diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 667a1c758..3b2e6ec9f 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index 333eda18f..b123b5906 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
index fdbca1683..f51ef946a 100644
--- a/modules/setup/application/forms/AuthenticationPage.php
+++ b/modules/setup/application/forms/AuthenticationPage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php
index ac41f4a1e..3b9ae649b 100644
--- a/modules/setup/application/forms/DatabaseCreationPage.php
+++ b/modules/setup/application/forms/DatabaseCreationPage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php
index f512e0288..1901d8ca9 100644
--- a/modules/setup/application/forms/DbResourcePage.php
+++ b/modules/setup/application/forms/DbResourcePage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/GeneralConfigPage.php b/modules/setup/application/forms/GeneralConfigPage.php
index cd66db496..e0a9d0fab 100644
--- a/modules/setup/application/forms/GeneralConfigPage.php
+++ b/modules/setup/application/forms/GeneralConfigPage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
index 54fb86401..66fd39001 100644
--- a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/LdapDiscoveryPage.php b/modules/setup/application/forms/LdapDiscoveryPage.php
index 3306e0395..26b43803b 100644
--- a/modules/setup/application/forms/LdapDiscoveryPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryPage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/LdapResourcePage.php b/modules/setup/application/forms/LdapResourcePage.php
index c0898c8b5..f003a7370 100644
--- a/modules/setup/application/forms/LdapResourcePage.php
+++ b/modules/setup/application/forms/LdapResourcePage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/ModulePage.php b/modules/setup/application/forms/ModulePage.php
index d41007553..ef765c0e7 100644
--- a/modules/setup/application/forms/ModulePage.php
+++ b/modules/setup/application/forms/ModulePage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
index b07ca6406..01b3296f4 100644
--- a/modules/setup/application/forms/PreferencesPage.php
+++ b/modules/setup/application/forms/PreferencesPage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/RequirementsPage.php b/modules/setup/application/forms/RequirementsPage.php
index 5f063a86c..ec4405459 100644
--- a/modules/setup/application/forms/RequirementsPage.php
+++ b/modules/setup/application/forms/RequirementsPage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/SummaryPage.php b/modules/setup/application/forms/SummaryPage.php
index 83673b573..9b42ec9d8 100644
--- a/modules/setup/application/forms/SummaryPage.php
+++ b/modules/setup/application/forms/SummaryPage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/WelcomePage.php b/modules/setup/application/forms/WelcomePage.php
index 455dabc80..66340ff25 100644
--- a/modules/setup/application/forms/WelcomePage.php
+++ b/modules/setup/application/forms/WelcomePage.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/library/Setup/Exception/SetupException.php b/modules/setup/library/Setup/Exception/SetupException.php
index 46d4d5d70..da5eed17c 100644
--- a/modules/setup/library/Setup/Exception/SetupException.php
+++ b/modules/setup/library/Setup/Exception/SetupException.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Exception;
 
@@ -12,4 +13,4 @@ use Icinga\Exception\IcingaException;
  */
 class SetupException extends IcingaException
 {
-}
+}
\ No newline at end of file
diff --git a/modules/setup/library/Setup/Requirements.php b/modules/setup/library/Setup/Requirements.php
index 13d42ce6e..ab9e693e5 100644
--- a/modules/setup/library/Setup/Requirements.php
+++ b/modules/setup/library/Setup/Requirements.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Setup.php b/modules/setup/library/Setup/Setup.php
index da19d0a82..ec5117c9a 100644
--- a/modules/setup/library/Setup/Setup.php
+++ b/modules/setup/library/Setup/Setup.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/SetupWizard.php b/modules/setup/library/Setup/SetupWizard.php
index e4676f26f..754207276 100644
--- a/modules/setup/library/Setup/SetupWizard.php
+++ b/modules/setup/library/Setup/SetupWizard.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Step.php b/modules/setup/library/Setup/Step.php
index afd50a982..720597fd1 100644
--- a/modules/setup/library/Setup/Step.php
+++ b/modules/setup/library/Setup/Step.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
index 407ef4182..c06b4e294 100644
--- a/modules/setup/library/Setup/Steps/AuthenticationStep.php
+++ b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Steps;
 
diff --git a/modules/setup/library/Setup/Steps/DatabaseStep.php b/modules/setup/library/Setup/Steps/DatabaseStep.php
index aed3b3e36..006b6c9ed 100644
--- a/modules/setup/library/Setup/Steps/DatabaseStep.php
+++ b/modules/setup/library/Setup/Steps/DatabaseStep.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Steps;
 
diff --git a/modules/setup/library/Setup/Steps/GeneralConfigStep.php b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
index ca5b755c4..bf3d8cb89 100644
--- a/modules/setup/library/Setup/Steps/GeneralConfigStep.php
+++ b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Steps;
 
diff --git a/modules/setup/library/Setup/Steps/ResourceStep.php b/modules/setup/library/Setup/Steps/ResourceStep.php
index 0107f4576..aae1c3aca 100644
--- a/modules/setup/library/Setup/Steps/ResourceStep.php
+++ b/modules/setup/library/Setup/Steps/ResourceStep.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Steps;
 
diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index 55aea73b8..63184acd0 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Utils;
 
diff --git a/modules/setup/library/Setup/Utils/EnableModuleStep.php b/modules/setup/library/Setup/Utils/EnableModuleStep.php
index c33a92774..a23e532f2 100644
--- a/modules/setup/library/Setup/Utils/EnableModuleStep.php
+++ b/modules/setup/library/Setup/Utils/EnableModuleStep.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Utils;
 
diff --git a/modules/setup/library/Setup/Utils/MakeDirStep.php b/modules/setup/library/Setup/Utils/MakeDirStep.php
index 730f8b63f..b758ccd79 100644
--- a/modules/setup/library/Setup/Utils/MakeDirStep.php
+++ b/modules/setup/library/Setup/Utils/MakeDirStep.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Utils;
 
diff --git a/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php b/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php
index 95bc9aaaa..fa858f531 100644
--- a/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php
+++ b/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Web\Form\Validator;
 
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index a9c302eb4..b580101ed 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Webserver.php b/modules/setup/library/Setup/Webserver.php
index 03d8dd040..dbc55b6a2 100644
--- a/modules/setup/library/Setup/Webserver.php
+++ b/modules/setup/library/Setup/Webserver.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Webserver/Apache.php b/modules/setup/library/Setup/Webserver/Apache.php
index 595f5a2cc..79d81eb71 100644
--- a/modules/setup/library/Setup/Webserver/Apache.php
+++ b/modules/setup/library/Setup/Webserver/Apache.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Webserver;
 
diff --git a/modules/setup/library/Setup/Webserver/Nginx.php b/modules/setup/library/Setup/Webserver/Nginx.php
index 21b29679c..fd5e92d72 100644
--- a/modules/setup/library/Setup/Webserver/Nginx.php
+++ b/modules/setup/library/Setup/Webserver/Nginx.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Setup\Webserver;
 
diff --git a/modules/test/application/clicommands/PhpCommand.php b/modules/test/application/clicommands/PhpCommand.php
index 1040e1255..dbcb58f05 100644
--- a/modules/test/application/clicommands/PhpCommand.php
+++ b/modules/test/application/clicommands/PhpCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Test\Clicommands;
 
diff --git a/modules/translation/application/clicommands/CompileCommand.php b/modules/translation/application/clicommands/CompileCommand.php
index b2b1880f7..77116d74a 100644
--- a/modules/translation/application/clicommands/CompileCommand.php
+++ b/modules/translation/application/clicommands/CompileCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Translation\Clicommands;
 
diff --git a/modules/translation/application/clicommands/RefreshCommand.php b/modules/translation/application/clicommands/RefreshCommand.php
index 25f4ee3aa..78b58f55c 100644
--- a/modules/translation/application/clicommands/RefreshCommand.php
+++ b/modules/translation/application/clicommands/RefreshCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Translation\Clicommands;
 
diff --git a/modules/translation/library/Translation/Cli/TranslationCommand.php b/modules/translation/library/Translation/Cli/TranslationCommand.php
index b2bc654a8..bae20cc5e 100644
--- a/modules/translation/library/Translation/Cli/TranslationCommand.php
+++ b/modules/translation/library/Translation/Cli/TranslationCommand.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Translation\Cli;
 
diff --git a/modules/translation/library/Translation/Util/GettextTranslationHelper.php b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
index 2b47b57aa..5702def85 100644
--- a/modules/translation/library/Translation/Util/GettextTranslationHelper.php
+++ b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Module\Translation\Util;
 
diff --git a/packages/files/bin/icingacli b/packages/files/bin/icingacli
index 0f20fcd76..5b41e4e8c 100755
--- a/packages/files/bin/icingacli
+++ b/packages/files/bin/icingacli
@@ -1,6 +1,5 @@
 #!/usr/bin/php
 <?php
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 require_once '/usr/share/php/Icinga/Application/Cli.php';
 
diff --git a/packages/files/public/index.php b/packages/files/public/index.php
index a4760a9fb..ebd223c03 100644
--- a/packages/files/public/index.php
+++ b/packages/files/public/index.php
@@ -1,4 +1,3 @@
 <?php
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 require_once '/usr/share/php/Icinga/Application/webrouter.php';
diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index fd98315ac..ff54bd38d 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /*** Base rules ***/
 * {
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 172536856..813ae28f7 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 div.config-form-buttons {
   margin-top: 5px;
diff --git a/public/css/icinga/header-elements.less b/public/css/icinga/header-elements.less
index bef161fa5..e1f3a7bce 100644
--- a/public/css/icinga/header-elements.less
+++ b/public/css/icinga/header-elements.less
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 #header div.user {
   font-size: 1.1em;
diff --git a/public/css/icinga/layout-colors.less b/public/css/icinga/layout-colors.less
index a422b8e3e..c57cd1a26 100644
--- a/public/css/icinga/layout-colors.less
+++ b/public/css/icinga/layout-colors.less
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /* Layout colors */
 
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index b0d29862b..5c6d67dae 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /** Default layout **/
 html {
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index c5e2230cf..6b03b476a 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 #login {
   width: 100%;
@@ -108,7 +109,7 @@
   .footer {
     margin-top: 7em;
     font-size: 0.9em;
-    text-align: center;
+    text-align: center; 
     margin-left: 5em;
   }
 
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index a7ed358df..e3e31b397 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 code {
   background-color: #eee;
@@ -180,7 +181,7 @@ table.benchmark {
 
 .dashboard h3 {
   font-size: 1em;
-}
+} 
 
 .dashboard table.benchmark {
   font-size: 0.9em;
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 2aca175ea..0f3f2691e 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 #menu {
   max-height: 100%;
diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index c7a24ed5f..1e657101f 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /* Special tables and states */
 
@@ -345,7 +346,7 @@ a.critical {
   font-size: 0.8em;
   padding: 0.4em 0 0.4em;
   border: 1px solid #d9d9d9;
-
+  
   font-weight: bold;
   letter-spacing: 0.1em;
 }
@@ -356,7 +357,7 @@ a.critical {
   margin: 0.2em;
   font-size: 0.9em;
   white-space: nowrap;
-
+  
   color: @colorTextDefault;
 }
 
@@ -539,12 +540,12 @@ div.box.contactgroup div.box.entry img {
   width: 80px;
   height: 80px;
   float: left;
-
+  
 }
 
 div.box.contactgroup div.box.entry a {
   margin-top: 0.4em;
-
+  
   font-weight: bold;
 }
 
@@ -557,7 +558,7 @@ div.circular {
   margin-left: 2em;
   margin-right: 1em;
   width: 80px;
-  height: 80px;
+  height: 80px; 
   float: left;
   background-size: 100% 100%;
 }
@@ -765,7 +766,7 @@ div.timeline {
         &:hover {
           color: @colorTextDefault;
           text-decoration: underline;
-
+         
         }
       }
     }
@@ -871,7 +872,7 @@ table.groupview {
         span.timesince {
           font-size: 0.8em;
         }
-
+        
         &.ok {
           border-color: @colorOk;
         }
diff --git a/public/css/icinga/pagination.less b/public/css/icinga/pagination.less
index 8fe84b3b6..e52b28403 100644
--- a/public/css/icinga/pagination.less
+++ b/public/css/icinga/pagination.less
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 ul.pagination {
   font-size: 0.68em;
diff --git a/public/css/icinga/selection-toolbar.less b/public/css/icinga/selection-toolbar.less
index 662a7db53..ca177ebbb 100644
--- a/public/css/icinga/selection-toolbar.less
+++ b/public/css/icinga/selection-toolbar.less
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 div.selection-toolbar {
   float: right;
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index cd2f81d0f..9dff6fecf 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -1,5 +1,3 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
-
 #layout {
   overflow: auto; // TODO: Shouldn't be necessary, here, IMHO
 }
@@ -447,4 +445,4 @@
     padding-top: 1em;
     clear: both;
   }
-}
+}
\ No newline at end of file
diff --git a/public/css/icinga/tabs.less b/public/css/icinga/tabs.less
index a93e96bcc..84f58e2a3 100644
--- a/public/css/icinga/tabs.less
+++ b/public/css/icinga/tabs.less
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 ul.tabs {
   padding: 1em 0 0 0;
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index 87818bbaa..e2e37d7ab 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 table.historycolorgrid {
   font-size: 1.5em;
@@ -290,4 +291,4 @@ li li .badge {
   height: 12px;
   position: relative;
   top: 4px;
-}
+}
\ No newline at end of file
diff --git a/public/css/pdf/pdfprint.less b/public/css/pdf/pdfprint.less
index fc9fda0da..117bef546 100644
--- a/public/css/pdf/pdfprint.less
+++ b/public/css/pdf/pdfprint.less
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 .controls form, .controls .pagination, .controls .widgetLimiter, .controls > .tabs, .dontprint {
   display: none !important;
diff --git a/public/index.php b/public/index.php
index 0062bf94f..48a500666 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,4 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 require_once dirname(__DIR__) . '/library/Icinga/Application/webrouter.php';
diff --git a/public/js/helpers.js b/public/js/helpers.js
index 6dc1f765a..416bf1185 100644
--- a/public/js/helpers.js
+++ b/public/js/helpers.js
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 (function (Object) {
 
diff --git a/public/js/icinga.js b/public/js/icinga.js
index ce8c9bb0c..c883a6bba 100644
--- a/public/js/icinga.js
+++ b/public/js/icinga.js
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /**
  * Icinga starts here.
diff --git a/public/js/icinga/behavior/form.js b/public/js/icinga/behavior/form.js
index b5514313b..d289183d6 100644
--- a/public/js/icinga/behavior/form.js
+++ b/public/js/icinga/behavior/form.js
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /**
  * Controls behavior of form elements, depending reload and
diff --git a/public/js/icinga/behavior/navigation.js b/public/js/icinga/behavior/navigation.js
index ebe74b422..b8a12064d 100644
--- a/public/js/icinga/behavior/navigation.js
+++ b/public/js/icinga/behavior/navigation.js
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 (function(Icinga, $) {
 
@@ -35,7 +36,7 @@
             /*
               Recreate the html content of the menu item to force the browser to update the layout, or else
               the link would only be visible as active after another click or page reload in Gecko and WebKit.
-
+              
               fixes #7897
             */
             $selectedMenu.html($selectedMenu.html());
diff --git a/public/js/icinga/behavior/sparkline.js b/public/js/icinga/behavior/sparkline.js
index 43fa2a4c9..e0d0fb0c7 100644
--- a/public/js/icinga/behavior/sparkline.js
+++ b/public/js/icinga/behavior/sparkline.js
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 (function(Icinga, $) {
 
diff --git a/public/js/icinga/behavior/tooltip.js b/public/js/icinga/behavior/tooltip.js
index 7889aec4e..de5b66d05 100644
--- a/public/js/icinga/behavior/tooltip.js
+++ b/public/js/icinga/behavior/tooltip.js
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 (function(Icinga, $) {
 
diff --git a/public/js/icinga/behavior/tristate.js b/public/js/icinga/behavior/tristate.js
index 8519b8567..036c25cea 100644
--- a/public/js/icinga/behavior/tristate.js
+++ b/public/js/icinga/behavior/tristate.js
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 (function(Icinga, $) {
 
@@ -42,7 +43,7 @@
         } else {
             $tristate.parent().find('b.tristate-changed').css('visibility', 'hidden');
         }
-        self.icinga.ui.setTriState(value.toString(), $tristate);
+        self.icinga.ui.setTriState(value.toString(), $tristate);    
     };
 
     Icinga.Behaviors.Tristate = Tristate;
diff --git a/public/js/icinga/eventlistener.js b/public/js/icinga/eventlistener.js
index 24818963c..e1946c6ae 100644
--- a/public/js/icinga/eventlistener.js
+++ b/public/js/icinga/eventlistener.js
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /**
  * EventListener contains event handlers and can bind / and unbind them from
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index d537cde30..0a77db60e 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /**
  * Icinga.Events
diff --git a/public/js/icinga/history.js b/public/js/icinga/history.js
index ef05f518e..9f05def2d 100644
--- a/public/js/icinga/history.js
+++ b/public/js/icinga/history.js
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /**
  * Icinga.History
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 155591026..417c47c1c 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /**
  * Icinga.Loader
diff --git a/public/js/icinga/logger.js b/public/js/icinga/logger.js
index 54ec7b182..07135e007 100644
--- a/public/js/icinga/logger.js
+++ b/public/js/icinga/logger.js
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /**
  * Icinga.Logger
diff --git a/public/js/icinga/module.js b/public/js/icinga/module.js
index 5d05c82a5..047911434 100644
--- a/public/js/icinga/module.js
+++ b/public/js/icinga/module.js
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /**
  * This is how we bootstrap JS code in our modules
diff --git a/public/js/icinga/timer.js b/public/js/icinga/timer.js
index 06b38a4e6..8d90f7c5c 100644
--- a/public/js/icinga/timer.js
+++ b/public/js/icinga/timer.js
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /**
  * Icinga.Timer
diff --git a/public/js/icinga/timezone.js b/public/js/icinga/timezone.js
index 69bae9a9a..15205e9cb 100644
--- a/public/js/icinga/timezone.js
+++ b/public/js/icinga/timezone.js
@@ -1,5 +1,3 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
-
 (function(Icinga, $) {
 
     'use strict';
@@ -116,4 +114,4 @@
         }
     };
 
-})(Icinga, jQuery);
+})(Icinga, jQuery);
\ No newline at end of file
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index c63d5e7a6..3c03bdcf5 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /**
  * Icinga.UI
@@ -617,25 +618,25 @@
                     var sec = 0;
 
                     if (nm < 0) {
-                        signed = '-';
+                        signed = '-';    
                         nm = nm * -1;
                         sec = nm * 60 + ns;
                         sec++;
                     } else if (nm == 0 && ns == 0) {
-                        signed = '-';
+                        signed = '-';    
                         sec = 1;
                     } else if (nm == 0 && m[2][0] == '-') {
-                        signed = '-';
+                        signed = '-';    
                         sec = ns;
                         sec++;
                     } else if (nm == 0 && m[2][0] != '-') {
                         sec = ns;
                         sec--;
                     } else {
-                        signed = '';
+                        signed = '';    
                         sec = nm * 60 + ns;
                         sec--;
-                    }
+                    }    
 
                     nm = Math.floor(sec/60);
                     ns = sec - nm * 60;
@@ -670,24 +671,24 @@
                 // hide input boxess and remove text nodes
                 $target.find("input").hide();
                 $target.contents().filter(function() { return this.nodeType === 3; }).remove();
-
+                
                 // has three states?
                 var triState = $target.find('input[value="unchanged"]').size() > 0 ? 1 : 0;
-
+                
                 // fetch current value from radiobuttons
                 var value  = $target.find('input:checked').first().val();
-
+        
                 $target.append(
                   '<input class="tristate-dummy" ' +
                         ' data-icinga-old="' + value + '" data-icinga-tristate="' + triState + '" type="checkbox" ' +
                         (value === '1' ? 'checked ' : ( value === 'unchanged' ? 'indeterminate="true" ' : ' ' )) +
                   '/> <b style="visibility: hidden;" class="tristate-changed"> (changed) </b>'
-                );
+                ); 
                 if (triState) {
                   // TODO: find a better way to activate indeterminate checkboxes after load.
                   $target.append(
                     '<script type="text/javascript"> ' +
-                      ' $(\'input.tristate-dummy[indeterminate="true"]\').each(function(i, el){ el.indeterminate = true; }); ' +
+                      ' $(\'input.tristate-dummy[indeterminate="true"]\').each(function(i, el){ el.indeterminate = true; }); ' + 
                     '</script>'
                   );
                 }
diff --git a/public/js/icinga/utils.js b/public/js/icinga/utils.js
index 8539d29ca..ba4d7a040 100644
--- a/public/js/icinga/utils.js
+++ b/public/js/icinga/utils.js
@@ -1,4 +1,5 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 /**
  * Icinga utility functions
diff --git a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
index 8067b6259..6af628b06 100644
--- a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
+++ b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Forms\Config\Authentication;
 
diff --git a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
index 66a743d73..046730f57 100644
--- a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
+++ b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Forms\Config\Authentication;
 
diff --git a/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php b/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php
index 00cb32464..88de869a1 100644
--- a/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php
+++ b/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Forms\Config;
 
diff --git a/test/php/application/forms/Config/Resource/DbResourceFormTest.php b/test/php/application/forms/Config/Resource/DbResourceFormTest.php
index a14f64949..53dd6bf56 100644
--- a/test/php/application/forms/Config/Resource/DbResourceFormTest.php
+++ b/test/php/application/forms/Config/Resource/DbResourceFormTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Forms\Config\Resource;
 
diff --git a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
index 94c171981..9ef8880e7 100644
--- a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
+++ b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Forms\Config\Resource;
 
diff --git a/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php b/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php
index 6c3899e01..3f5de5844 100644
--- a/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php
+++ b/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Forms\Config\Resource;
 
diff --git a/test/php/application/views/helpers/DateFormatTestBroken.php b/test/php/application/views/helpers/DateFormatTestBroken.php
index 1a4daf8fe..4f3cfc184 100644
--- a/test/php/application/views/helpers/DateFormatTestBroken.php
+++ b/test/php/application/views/helpers/DateFormatTestBroken.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Views\Helper;
 
diff --git a/test/php/bootstrap.php b/test/php/bootstrap.php
index af34344c5..a7fa6c2aa 100644
--- a/test/php/bootstrap.php
+++ b/test/php/bootstrap.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 $applicationPath = realpath(dirname(__FILE__) . '/../../application/');
 $modulePath = realpath(dirname(__FILE__) . '/../../modules/');
diff --git a/test/php/library/Icinga/Application/ConfigTest.php b/test/php/library/Icinga/Application/ConfigTest.php
index 8b3d0cd0f..1e64da808 100644
--- a/test/php/library/Icinga/Application/ConfigTest.php
+++ b/test/php/library/Icinga/Application/ConfigTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Application;
 
diff --git a/test/php/library/Icinga/Application/LoaderTest.php b/test/php/library/Icinga/Application/LoaderTest.php
index 4b3f5b5af..1a0276945 100644
--- a/test/php/library/Icinga/Application/LoaderTest.php
+++ b/test/php/library/Icinga/Application/LoaderTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Application;
 
diff --git a/test/php/library/Icinga/Chart/GraphChartTest.php b/test/php/library/Icinga/Chart/GraphChartTest.php
index 49c81a5de..9ffdcb66c 100644
--- a/test/php/library/Icinga/Chart/GraphChartTest.php
+++ b/test/php/library/Icinga/Chart/GraphChartTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Chart;
 
diff --git a/test/php/library/Icinga/Chart/PieChartTest.php b/test/php/library/Icinga/Chart/PieChartTest.php
index 21b9fa49a..756fdf6e6 100644
--- a/test/php/library/Icinga/Chart/PieChartTest.php
+++ b/test/php/library/Icinga/Chart/PieChartTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Chart;
 
@@ -28,4 +29,4 @@ class PieChartTest extends BaseTestCase
         $path = $xpath->query('//x:path[@data-icinga-graph-type="pieslice"]');
         $this->assertEquals(3, $path->length, 'Assert the correct number of datapoints being drawn as SVG bars');
     }
-}
+}
\ No newline at end of file
diff --git a/test/php/library/Icinga/Data/ConfigObjectTest.php b/test/php/library/Icinga/Data/ConfigObjectTest.php
index 40b095267..c4b825e58 100644
--- a/test/php/library/Icinga/Data/ConfigObjectTest.php
+++ b/test/php/library/Icinga/Data/ConfigObjectTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Data;
 
diff --git a/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php b/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php
index 5e86d3f64..bdb719f8c 100644
--- a/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php
+++ b/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Data;
 
diff --git a/test/php/library/Icinga/Data/Filter/FilterTest.php b/test/php/library/Icinga/Data/Filter/FilterTest.php
index 4a048818f..7d6349213 100644
--- a/test/php/library/Icinga/Data/Filter/FilterTest.php
+++ b/test/php/library/Icinga/Data/Filter/FilterTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Data;
 
diff --git a/test/php/library/Icinga/File/CsvTest.php b/test/php/library/Icinga/File/CsvTest.php
index 0d81fcb6d..f4ae27c63 100644
--- a/test/php/library/Icinga/File/CsvTest.php
+++ b/test/php/library/Icinga/File/CsvTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\File;
 
diff --git a/test/php/library/Icinga/File/Ini/IniWriterTest.php b/test/php/library/Icinga/File/Ini/IniWriterTest.php
index 5603954ac..63cb0e517 100644
--- a/test/php/library/Icinga/File/Ini/IniWriterTest.php
+++ b/test/php/library/Icinga/File/Ini/IniWriterTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Config;
 
diff --git a/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php b/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php
index 36d1d4f2b..0c0d55498 100644
--- a/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php
+++ b/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Logger\Writer;
 
diff --git a/test/php/library/Icinga/Protocol/Ldap/QueryTest.php b/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
index e87064251..f6387709f 100644
--- a/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
+++ b/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Protocol\Ldap;
 
diff --git a/test/php/library/Icinga/Test/BaseTestCaseTest.php b/test/php/library/Icinga/Test/BaseTestCaseTest.php
index 36c251c4c..2f8e12f0c 100644
--- a/test/php/library/Icinga/Test/BaseTestCaseTest.php
+++ b/test/php/library/Icinga/Test/BaseTestCaseTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Test;
 
diff --git a/test/php/library/Icinga/User/PreferencesTest.php b/test/php/library/Icinga/User/PreferencesTest.php
index 75a6723b6..540ea1b14 100644
--- a/test/php/library/Icinga/User/PreferencesTest.php
+++ b/test/php/library/Icinga/User/PreferencesTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\User;
 
diff --git a/test/php/library/Icinga/User/Store/DbStoreTest.php b/test/php/library/Icinga/User/Store/DbStoreTest.php
index bcadadbe4..dfb70c66b 100644
--- a/test/php/library/Icinga/User/Store/DbStoreTest.php
+++ b/test/php/library/Icinga/User/Store/DbStoreTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\User\Preferences\Store;
 
diff --git a/test/php/library/Icinga/User/Store/IniStoreTest.php b/test/php/library/Icinga/User/Store/IniStoreTest.php
index 912c09320..51de87840 100644
--- a/test/php/library/Icinga/User/Store/IniStoreTest.php
+++ b/test/php/library/Icinga/User/Store/IniStoreTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\User\Preferences\Store;
 
diff --git a/test/php/library/Icinga/UserTest.php b/test/php/library/Icinga/UserTest.php
index b14a91a57..d12666b04 100644
--- a/test/php/library/Icinga/UserTest.php
+++ b/test/php/library/Icinga/UserTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga;
 
diff --git a/test/php/library/Icinga/Util/DateTimeFactoryTest.php b/test/php/library/Icinga/Util/DateTimeFactoryTest.php
index ad7441f93..1b7778587 100644
--- a/test/php/library/Icinga/Util/DateTimeFactoryTest.php
+++ b/test/php/library/Icinga/Util/DateTimeFactoryTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Util/DimensionTest.php b/test/php/library/Icinga/Util/DimensionTest.php
index db2e579b2..d6678258f 100644
--- a/test/php/library/Icinga/Util/DimensionTest.php
+++ b/test/php/library/Icinga/Util/DimensionTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Util/FileTest.php b/test/php/library/Icinga/Util/FileTest.php
index 96ca21ac9..e0f2e86b8 100644
--- a/test/php/library/Icinga/Util/FileTest.php
+++ b/test/php/library/Icinga/Util/FileTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Util/StringTest.php b/test/php/library/Icinga/Util/StringTest.php
index 46acee3d0..8ecf61edc 100644
--- a/test/php/library/Icinga/Util/StringTest.php
+++ b/test/php/library/Icinga/Util/StringTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Util/TranslatorTest.php b/test/php/library/Icinga/Util/TranslatorTest.php
index ccf632657..4d74cc8dc 100644
--- a/test/php/library/Icinga/Util/TranslatorTest.php
+++ b/test/php/library/Icinga/Util/TranslatorTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php b/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php
index 79296e4a1..802d610ab 100644
--- a/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php
+++ b/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Web\Form\Element;
 
diff --git a/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php b/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php
index 1d9514663..0153412e5 100644
--- a/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php
+++ b/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Web\Form\Validator;
 
diff --git a/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php b/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php
index 124484de3..b0ad8c9ae 100644
--- a/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php
+++ b/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Web\Form\Validator;
 
diff --git a/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php b/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php
index 9f7996975..b9e8c2ae7 100644
--- a/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php
+++ b/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Web\Form\Validator;
 
diff --git a/test/php/library/Icinga/Web/FormTest.php b/test/php/library/Icinga/Web/FormTest.php
index 01ef3de27..de880f070 100644
--- a/test/php/library/Icinga/Web/FormTest.php
+++ b/test/php/library/Icinga/Web/FormTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/HookTest.php b/test/php/library/Icinga/Web/HookTest.php
index 3d678fe7a..16300f5ca 100644
--- a/test/php/library/Icinga/Web/HookTest.php
+++ b/test/php/library/Icinga/Web/HookTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Hook;
 
diff --git a/test/php/library/Icinga/Web/MenuTest.php b/test/php/library/Icinga/Web/MenuTest.php
index 31c8538bc..b7370d65b 100644
--- a/test/php/library/Icinga/Web/MenuTest.php
+++ b/test/php/library/Icinga/Web/MenuTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
index 6d26ad847..a77dcb553 100644
--- a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
+++ b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Web\Paginator\ScrollingStyle;
 
diff --git a/test/php/library/Icinga/Web/Session/PhpSessionTest.php b/test/php/library/Icinga/Web/Session/PhpSessionTest.php
index 90d593848..49641c60d 100644
--- a/test/php/library/Icinga/Web/Session/PhpSessionTest.php
+++ b/test/php/library/Icinga/Web/Session/PhpSessionTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Web\Session;
 
diff --git a/test/php/library/Icinga/Web/Session/SessionNamespaceTest.php b/test/php/library/Icinga/Web/Session/SessionNamespaceTest.php
index 63b12bd90..bf984dca0 100644
--- a/test/php/library/Icinga/Web/Session/SessionNamespaceTest.php
+++ b/test/php/library/Icinga/Web/Session/SessionNamespaceTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Web\Session;
 
diff --git a/test/php/library/Icinga/Web/UrlTest.php b/test/php/library/Icinga/Web/UrlTest.php
index 331ae4b11..68206beee 100644
--- a/test/php/library/Icinga/Web/UrlTest.php
+++ b/test/php/library/Icinga/Web/UrlTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/View/DateTimeRendererTest.php b/test/php/library/Icinga/Web/View/DateTimeRendererTest.php
index 639e10563..e45d3fdfe 100644
--- a/test/php/library/Icinga/Web/View/DateTimeRendererTest.php
+++ b/test/php/library/Icinga/Web/View/DateTimeRendererTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/Widget/DashboardTest.php b/test/php/library/Icinga/Web/Widget/DashboardTest.php
index dc9ec23bf..2aa2bdcf4 100644
--- a/test/php/library/Icinga/Web/Widget/DashboardTest.php
+++ b/test/php/library/Icinga/Web/Widget/DashboardTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php b/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
index c7354e341..5e6e1cc69 100644
--- a/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
+++ b/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/regression/Bug4102Test.php b/test/php/regression/Bug4102Test.php
index 77f356d51..ce5ea2290 100644
--- a/test/php/regression/Bug4102Test.php
+++ b/test/php/regression/Bug4102Test.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Regression;
 
diff --git a/test/php/regression/Bug6284Test.php b/test/php/regression/Bug6284Test.php
index 1863a15e4..be584c149 100644
--- a/test/php/regression/Bug6284Test.php
+++ b/test/php/regression/Bug6284Test.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Regression;
 
diff --git a/test/php/regression/Bug6432Test.php b/test/php/regression/Bug6432Test.php
index 50719db46..4194d9d41 100644
--- a/test/php/regression/Bug6432Test.php
+++ b/test/php/regression/Bug6432Test.php
@@ -1,5 +1,6 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Tests\Icinga\Regression;
 

From 5b4fab0750d6febb33219318badb01b9f78a68ed Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 16:27:59 +0100
Subject: [PATCH 0534/2920] Add license header

This time without syntax errors hopefully :)
---
 Vagrantfile                                   |  2 ++
 .../clicommands/AutocompleteCommand.php       |  3 +--
 application/clicommands/HelpCommand.php       |  3 +--
 application/clicommands/ModuleCommand.php     |  3 +--
 application/clicommands/WebCommand.php        |  3 +--
 .../controllers/AuthenticationController.php  |  3 +--
 application/controllers/ConfigController.php  |  1 +
 .../controllers/DashboardController.php       |  3 +--
 application/controllers/ErrorController.php   |  1 +
 application/controllers/FilterController.php  |  3 +--
 application/controllers/IndexController.php   |  3 +--
 application/controllers/LayoutController.php  |  3 +--
 application/controllers/ListController.php    |  3 +--
 .../controllers/PreferenceController.php      |  3 +--
 application/controllers/RolesController.php   |  1 +
 application/controllers/SearchController.php  |  3 +--
 application/controllers/StaticController.php  |  3 +--
 .../forms/Authentication/LoginForm.php        |  3 +--
 .../Config/Authentication/DbBackendForm.php   |  3 +--
 .../Authentication/ExternalBackendForm.php    |  3 +--
 .../Config/Authentication/LdapBackendForm.php |  3 +--
 .../AuthenticationBackendConfigForm.php       |  3 +--
 .../AuthenticationBackendReorderForm.php      |  3 +--
 .../Config/General/ApplicationConfigForm.php  |  3 +--
 .../Config/General/LoggingConfigForm.php      |  3 +--
 .../forms/Config/GeneralConfigForm.php        |  3 +--
 .../forms/Config/Resource/DbResourceForm.php  |  3 +--
 .../Config/Resource/FileResourceForm.php      |  3 +--
 .../Config/Resource/LdapResourceForm.php      |  3 +--
 .../Resource/LivestatusResourceForm.php       |  3 +--
 .../forms/Config/ResourceConfigForm.php       |  3 +--
 application/forms/ConfigForm.php              |  3 +--
 application/forms/ConfirmRemovalForm.php      |  3 +--
 application/forms/Dashboard/DashletForm.php   |  3 +--
 application/forms/LdapDiscoveryForm.php       |  3 +--
 application/forms/PreferenceForm.php          |  3 +--
 application/forms/Security/RoleForm.php       |  3 +--
 application/views/helpers/DateFormat.php      |  3 +--
 application/views/helpers/FormDateTime.php    |  3 +--
 application/views/helpers/FormNumber.php      |  3 +--
 .../views/helpers/FormTriStateCheckbox.php    |  3 +--
 application/views/helpers/Util.php            |  3 +--
 bin/icingacli                                 |  3 +--
 bin/license_writer.py                         |  3 +--
 etc/bash_completion.d/icingacli               |  3 ---
 etc/schema/mysql.schema.sql                   |  2 ++
 etc/schema/pgsql.schema.sql                   | 19 +++------------
 icingaweb2.spec                               |  2 ++
 .../Application/ApplicationBootstrap.php      |  3 +--
 library/Icinga/Application/Benchmark.php      |  3 +--
 library/Icinga/Application/Cli.php            |  3 +--
 library/Icinga/Application/Config.php         |  3 +--
 library/Icinga/Application/EmbeddedWeb.php    |  3 +--
 library/Icinga/Application/Icinga.php         |  3 +--
 library/Icinga/Application/LegacyWeb.php      |  3 +--
 library/Icinga/Application/Loader.php         |  3 +--
 library/Icinga/Application/Logger.php         |  3 +--
 .../Icinga/Application/Logger/LogWriter.php   |  3 +--
 .../Application/Logger/Writer/FileWriter.php  |  3 +--
 .../Logger/Writer/StdoutWriter.php            |  2 +-
 .../Logger/Writer/SyslogWriter.php            |  3 +--
 .../Icinga/Application/Modules/Manager.php    |  3 +--
 library/Icinga/Application/Modules/Module.php |  3 +--
 library/Icinga/Application/Platform.php       |  3 +--
 library/Icinga/Application/Web.php            |  3 +--
 library/Icinga/Application/functions.php      |  3 +--
 library/Icinga/Application/webrouter.php      |  3 +--
 .../Icinga/Authentication/AdmissionLoader.php |  3 +--
 library/Icinga/Authentication/AuthChain.php   |  3 +--
 .../Authentication/Backend/DbUserBackend.php  |  3 +--
 .../Backend/DbUserGroupBackend.php            |  3 +--
 .../Backend/ExternalBackend.php               |  3 +--
 .../Backend/IniUserGroupBackend.php           |  3 +--
 .../Backend/LdapUserBackend.php               |  3 +--
 library/Icinga/Authentication/Manager.php     |  3 +--
 library/Icinga/Authentication/UserBackend.php |  3 +--
 .../Authentication/UserGroupBackend.php       |  3 +--
 library/Icinga/Chart/Axis.php                 |  3 +--
 library/Icinga/Chart/Chart.php                |  3 +--
 library/Icinga/Chart/Format.php               |  3 +--
 library/Icinga/Chart/Graph/BarGraph.php       |  3 +--
 library/Icinga/Chart/Graph/LineGraph.php      |  3 +--
 library/Icinga/Chart/Graph/StackedGraph.php   |  3 +--
 library/Icinga/Chart/Graph/Tooltip.php        |  5 ++--
 library/Icinga/Chart/GridChart.php            |  3 +--
 library/Icinga/Chart/Inline/Inline.php        |  3 +--
 library/Icinga/Chart/Inline/PieChart.php      |  3 +--
 library/Icinga/Chart/Legend.php               |  3 +--
 library/Icinga/Chart/Palette.php              |  3 +--
 library/Icinga/Chart/PieChart.php             |  3 +--
 library/Icinga/Chart/Primitive/Animatable.php |  3 +--
 library/Icinga/Chart/Primitive/Animation.php  |  3 +--
 library/Icinga/Chart/Primitive/Canvas.php     |  3 +--
 library/Icinga/Chart/Primitive/Circle.php     |  3 +--
 library/Icinga/Chart/Primitive/Drawable.php   |  3 +--
 library/Icinga/Chart/Primitive/Line.php       |  3 +--
 library/Icinga/Chart/Primitive/Path.php       |  3 +--
 library/Icinga/Chart/Primitive/PieSlice.php   |  3 +--
 library/Icinga/Chart/Primitive/RawElement.php |  3 +--
 library/Icinga/Chart/Primitive/Rect.php       |  3 +--
 library/Icinga/Chart/Primitive/Styleable.php  |  3 +--
 library/Icinga/Chart/Primitive/Text.php       |  3 +--
 library/Icinga/Chart/Render/LayoutBox.php     |  3 +--
 library/Icinga/Chart/Render/RenderContext.php |  3 +--
 library/Icinga/Chart/Render/Rotator.php       |  7 ++----
 library/Icinga/Chart/SVGRenderer.php          |  3 +--
 library/Icinga/Chart/Unit/AxisUnit.php        |  3 +--
 library/Icinga/Chart/Unit/CalendarUnit.php    |  3 +--
 library/Icinga/Chart/Unit/LinearUnit.php      |  3 +--
 library/Icinga/Chart/Unit/LogarithmicUnit.php |  3 +--
 library/Icinga/Chart/Unit/StaticAxis.php      |  3 +--
 library/Icinga/Cli/AnsiScreen.php             |  3 +--
 library/Icinga/Cli/Command.php                |  3 +--
 library/Icinga/Cli/Documentation.php          |  3 +--
 .../Cli/Documentation/CommentParser.php       |  3 +--
 library/Icinga/Cli/Loader.php                 |  3 +--
 library/Icinga/Cli/Params.php                 |  3 +--
 library/Icinga/Cli/Screen.php                 |  3 +--
 library/Icinga/Data/Browsable.php             |  3 +--
 library/Icinga/Data/ConfigObject.php          |  3 +--
 library/Icinga/Data/ConnectionInterface.php   |  3 +--
 .../Icinga/Data/DataArray/ArrayDatasource.php |  5 ++--
 library/Icinga/Data/Db/DbConnection.php       |  3 +--
 library/Icinga/Data/Db/DbQuery.php            |  3 +--
 library/Icinga/Data/Fetchable.php             |  3 +--
 library/Icinga/Data/Filter/Filter.php         |  3 +--
 library/Icinga/Data/Filter/FilterAnd.php      |  5 ++--
 library/Icinga/Data/Filter/FilterChain.php    |  7 +++---
 library/Icinga/Data/Filter/FilterEqual.php    |  3 +--
 .../Data/Filter/FilterEqualOrGreaterThan.php  |  3 +--
 .../Data/Filter/FilterEqualOrLessThan.php     |  3 +--
 .../Icinga/Data/Filter/FilterException.php    |  3 +--
 .../Icinga/Data/Filter/FilterExpression.php   |  3 +--
 .../Icinga/Data/Filter/FilterGreaterThan.php  |  3 +--
 library/Icinga/Data/Filter/FilterLessThan.php |  3 +--
 library/Icinga/Data/Filter/FilterMatch.php    |  3 +--
 library/Icinga/Data/Filter/FilterMatchNot.php |  3 +--
 library/Icinga/Data/Filter/FilterNot.php      |  3 +--
 library/Icinga/Data/Filter/FilterNotEqual.php |  3 +--
 library/Icinga/Data/Filter/FilterOr.php       |  3 +--
 .../Data/Filter/FilterParseException.php      |  3 +--
 .../Icinga/Data/Filter/FilterQueryString.php  |  3 +--
 library/Icinga/Data/Filterable.php            |  3 +--
 library/Icinga/Data/Identifiable.php          |  3 +--
 library/Icinga/Data/Limitable.php             |  3 +--
 library/Icinga/Data/PivotTable.php            |  3 +--
 library/Icinga/Data/QueryInterface.php        |  3 +--
 library/Icinga/Data/Queryable.php             |  3 +--
 library/Icinga/Data/ResourceFactory.php       |  3 +--
 library/Icinga/Data/Selectable.php            |  3 +--
 library/Icinga/Data/SimpleQuery.php           |  3 +--
 library/Icinga/Data/Sortable.php              |  3 +--
 library/Icinga/Data/Tree/Node.php             |  3 +--
 library/Icinga/Data/Tree/NodeInterface.php    |  3 +--
 .../Exception/AuthenticationException.php     |  3 +--
 .../Icinga/Exception/ConfigurationError.php   |  3 +--
 library/Icinga/Exception/IcingaException.php  |  3 +--
 .../Exception/InvalidPropertyException.php    |  3 +--
 .../Exception/MissingParameterException.php   |  3 +--
 library/Icinga/Exception/NotFoundError.php    |  3 +--
 .../Icinga/Exception/NotImplementedError.php  |  3 +--
 library/Icinga/Exception/NotReadableError.php |  3 +--
 library/Icinga/Exception/NotWritableError.php |  3 +--
 library/Icinga/Exception/ProgrammingError.php |  3 +--
 library/Icinga/Exception/QueryException.php   |  3 +--
 .../Exception/SystemPermissionException.php   |  3 +--
 library/Icinga/File/Csv.php                   |  3 +--
 .../File/FileExtensionFilterIterator.php      |  3 +--
 library/Icinga/File/Ini/IniEditor.php         |  3 +--
 library/Icinga/File/Ini/IniWriter.php         |  3 +--
 library/Icinga/File/NonEmptyFileIterator.php  |  3 +--
 library/Icinga/File/Pdf.php                   |  3 +--
 library/Icinga/Protocol/Dns.php               |  3 +--
 .../File/Exception/FileReaderException.php    |  2 +-
 library/Icinga/Protocol/File/FileIterator.php |  3 +--
 library/Icinga/Protocol/File/FileQuery.php    |  3 +--
 library/Icinga/Protocol/File/FileReader.php   |  3 +--
 library/Icinga/Protocol/Ldap/Connection.php   |  3 +--
 library/Icinga/Protocol/Ldap/Discovery.php    |  5 ++--
 library/Icinga/Protocol/Ldap/Exception.php    |  3 +--
 library/Icinga/Protocol/Ldap/LdapUtils.php    |  3 +--
 library/Icinga/Protocol/Ldap/Node.php         |  3 +--
 library/Icinga/Protocol/Ldap/Query.php        |  3 +--
 library/Icinga/Protocol/Ldap/Root.php         |  3 +--
 .../Icinga/Protocol/Livestatus/Connection.php |  5 ++--
 library/Icinga/Protocol/Livestatus/Query.php  |  9 ++++----
 .../Protocol/Livestatus/ResponseRow.php       |  1 +
 library/Icinga/Protocol/Nrpe/Connection.php   |  3 +--
 library/Icinga/Protocol/Nrpe/Packet.php       |  3 +--
 library/Icinga/Security/SecurityException.php |  1 +
 library/Icinga/Test/BaseTestCase.php          |  3 +--
 library/Icinga/Test/DbTest.php                |  3 +--
 library/Icinga/User.php                       |  3 +--
 library/Icinga/User/Preferences.php           |  3 +--
 .../User/Preferences/PreferencesStore.php     |  3 +--
 .../Icinga/User/Preferences/Store/DbStore.php |  3 +--
 .../User/Preferences/Store/IniStore.php       |  3 +--
 library/Icinga/Util/Color.php                 |  3 +--
 library/Icinga/Util/ConfigAwareFactory.php    |  3 +--
 library/Icinga/Util/DateTimeFactory.php       |  3 +--
 library/Icinga/Util/Dimension.php             |  3 +--
 .../Icinga/Util/EnumeratingFilterIterator.php |  3 +--
 library/Icinga/Util/File.php                  |  3 +--
 library/Icinga/Util/Format.php                |  3 +--
 library/Icinga/Util/String.php                |  3 +--
 library/Icinga/Util/TimezoneDetect.php        |  3 +--
 library/Icinga/Util/Translator.php            |  3 +--
 library/Icinga/Web/Controller.php             |  1 +
 .../Web/Controller/ActionController.php       |  1 +
 .../Controller/BasePreferenceController.php   |  3 +--
 .../Web/Controller/ControllerTabCollector.php |  3 +--
 .../Web/Controller/ModuleActionController.php |  3 +--
 library/Icinga/Web/FileCache.php              |  2 +-
 library/Icinga/Web/Form.php                   |  1 +
 .../Web/Form/Decorator/ConditionalHidden.php  |  3 +--
 .../Web/Form/Decorator/ElementDoubler.php     |  3 +--
 .../Web/Form/Decorator/NoScriptApply.php      |  3 +--
 library/Icinga/Web/Form/Element/Button.php    |  3 +--
 .../Web/Form/Element/CsrfCounterMeasure.php   |  3 +--
 .../Web/Form/Element/DateTimePicker.php       |  3 +--
 library/Icinga/Web/Form/Element/Note.php      |  3 +--
 library/Icinga/Web/Form/Element/Number.php    |  3 +--
 .../Web/Form/Element/TriStateCheckbox.php     |  3 +--
 library/Icinga/Web/Form/FormElement.php       |  3 +--
 .../Web/Form/InvalidCSRFTokenException.php    |  3 +--
 .../Form/Validator/DateFormatValidator.php    |  3 +--
 .../Web/Form/Validator/DateTimeValidator.php  |  3 +--
 .../Form/Validator/ReadablePathValidator.php  |  3 +--
 .../Form/Validator/TimeFormatValidator.php    |  3 +--
 .../Web/Form/Validator/TriStateValidator.php  |  3 +--
 .../Form/Validator/WritablePathValidator.php  |  3 +--
 library/Icinga/Web/Hook.php                   |  3 +--
 library/Icinga/Web/Hook/GrapherHook.php       |  3 +--
 library/Icinga/Web/Hook/TicketHook.php        |  3 +--
 library/Icinga/Web/Hook/WebBaseHook.php       |  5 ++--
 library/Icinga/Web/JavaScript.php             |  3 +--
 library/Icinga/Web/LessCompiler.php           |  3 +--
 library/Icinga/Web/Menu.php                   |  3 +--
 .../Web/Menu/ForeignMenuItemRenderer.php      |  3 +--
 library/Icinga/Web/Menu/MenuItemRenderer.php  |  3 +--
 .../Web/Menu/MonitoringMenuItemRenderer.php   |  3 +--
 .../Web/Menu/ProblemMenuItemRenderer.php      |  1 +
 .../Menu/UnhandledHostMenuItemRenderer.php    |  1 +
 .../Menu/UnhandledServiceMenuItemRenderer.php |  1 +
 library/Icinga/Web/MenuRenderer.php           |  3 +--
 library/Icinga/Web/Notification.php           |  3 +--
 .../Web/Paginator/Adapter/QueryAdapter.php    |  3 +--
 .../ScrollingStyle/SlidingWithBorder.php      |  5 ++--
 library/Icinga/Web/Request.php                |  3 +--
 library/Icinga/Web/Response.php               |  3 +--
 library/Icinga/Web/Session.php                |  3 +--
 library/Icinga/Web/Session/PhpSession.php     |  3 +--
 library/Icinga/Web/Session/Session.php        |  3 +--
 .../Icinga/Web/Session/SessionNamespace.php   |  3 +--
 library/Icinga/Web/StyleSheet.php             |  3 +--
 library/Icinga/Web/Url.php                    |  3 +--
 library/Icinga/Web/UrlParams.php              |  5 ++--
 library/Icinga/Web/View.php                   |  3 +--
 library/Icinga/Web/View/DateTimeRenderer.php  |  3 +--
 library/Icinga/Web/View/helpers/format.php    |  3 +--
 library/Icinga/Web/View/helpers/generic.php   |  3 +--
 library/Icinga/Web/View/helpers/url.php       |  5 ++--
 library/Icinga/Web/ViewStream.php             |  3 +--
 library/Icinga/Web/Widget.php                 |  3 +--
 library/Icinga/Web/Widget/AbstractWidget.php  |  3 +--
 .../Web/Widget/Chart/HistoryColorGrid.php     |  3 +--
 library/Icinga/Web/Widget/Chart/InlinePie.php |  3 +--
 library/Icinga/Web/Widget/Dashboard.php       |  3 +--
 .../Icinga/Web/Widget/Dashboard/Dashlet.php   |  3 +--
 library/Icinga/Web/Widget/Dashboard/Pane.php  |  3 +--
 .../Web/Widget/Dashboard/UserWidget.php       |  3 +--
 library/Icinga/Web/Widget/FilterEditor.php    |  9 ++++----
 library/Icinga/Web/Widget/FilterWidget.php    |  5 ++--
 library/Icinga/Web/Widget/Limiter.php         |  3 +--
 library/Icinga/Web/Widget/SearchDashboard.php |  3 +--
 library/Icinga/Web/Widget/SortBox.php         |  3 +--
 library/Icinga/Web/Widget/Tab.php             |  3 +--
 .../Web/Widget/Tabextension/BasketAction.php  |  3 +--
 .../Widget/Tabextension/DashboardAction.php   |  3 +--
 .../Widget/Tabextension/DashboardSettings.php |  5 ++--
 .../Web/Widget/Tabextension/OutputFormat.php  |  3 +--
 .../Web/Widget/Tabextension/Tabextension.php  |  3 +--
 library/Icinga/Web/Widget/Tabs.php            |  3 +--
 library/Icinga/Web/Widget/Widget.php          |  3 +--
 library/Icinga/Web/Window.php                 |  3 +--
 library/Icinga/Web/Wizard.php                 |  3 +--
 .../controllers/IcingawebController.php       |  3 +--
 .../controllers/IndexController.php           |  3 +--
 .../controllers/ModuleController.php          |  3 +--
 .../controllers/StyleController.php           |  1 +
 modules/doc/configuration.php                 |  3 +--
 modules/doc/library/Doc/DocController.php     |  3 +--
 modules/doc/library/Doc/DocIterator.php       |  3 +--
 modules/doc/library/Doc/DocParser.php         |  3 +--
 modules/doc/library/Doc/DocTree.php           |  3 +--
 .../Exception/ChapterNotFoundException.php    |  3 +--
 .../Doc/Exception/DocEmptyException.php       |  3 +--
 .../library/Doc/Exception/DocException.php    |  3 +--
 modules/doc/library/Doc/Renderer.php          |  3 +--
 modules/doc/library/Doc/Section.php           |  3 +--
 .../doc/library/Doc/SectionFilterIterator.php |  3 +--
 modules/doc/library/Doc/SectionRenderer.php   |  3 +--
 modules/doc/library/Doc/TocRenderer.php       |  3 +--
 modules/doc/public/css/module.less            |  2 ++
 modules/doc/run.php                           |  1 +
 .../clicommands/ConferenceCommand.php         |  3 +--
 .../application/clicommands/ListCommand.php   |  3 +--
 .../application/clicommands/NrpeCommand.php   |  3 +--
 .../controllers/AlertsummaryController.php    |  3 +--
 .../controllers/ChartController.php           |  3 +--
 .../controllers/ConfigController.php          |  3 +--
 .../controllers/HostController.php            |  3 +--
 .../controllers/HostsController.php           |  3 +--
 .../controllers/ListController.php            |  1 +
 .../controllers/ProcessController.php         |  3 +--
 .../controllers/ServiceController.php         |  3 +--
 .../controllers/ServicesController.php        |  3 +--
 .../controllers/ShowController.php            |  3 +--
 .../controllers/TacticalController.php        |  3 +--
 .../controllers/TimelineController.php        |  3 +--
 .../application/forms/Command/CommandForm.php |  3 +--
 .../DisableNotificationsExpireCommandForm.php |  3 +--
 .../ToggleInstanceFeaturesCommandForm.php     |  3 +--
 .../Object/AcknowledgeProblemCommandForm.php  |  3 +--
 .../Command/Object/AddCommentCommandForm.php  |  3 +--
 .../Command/Object/CheckNowCommandForm.php    |  3 +--
 .../Object/DeleteCommentCommandForm.php       |  3 +--
 .../Object/DeleteDowntimeCommandForm.php      |  3 +--
 .../Command/Object/ObjectsCommandForm.php     |  3 +--
 .../Object/ProcessCheckResultCommandForm.php  |  3 +--
 .../RemoveAcknowledgementCommandForm.php      |  3 +--
 .../Object/ScheduleHostCheckCommandForm.php   |  3 +--
 .../ScheduleHostDowntimeCommandForm.php       |  3 +--
 .../ScheduleServiceCheckCommandForm.php       |  3 +--
 .../ScheduleServiceDowntimeCommandForm.php    |  3 +--
 .../ToggleObjectFeaturesCommandForm.php       |  3 +--
 .../forms/Config/BackendConfigForm.php        |  3 +--
 .../Config/Instance/LocalInstanceForm.php     |  3 +--
 .../Config/Instance/RemoteInstanceForm.php    |  3 +--
 .../forms/Config/InstanceConfigForm.php       |  3 +--
 .../forms/Config/SecurityConfigForm.php       |  3 +--
 .../application/forms/EventOverviewForm.php   |  3 +--
 .../application/forms/Setup/BackendPage.php   |  3 +--
 .../forms/Setup/IdoResourcePage.php           |  3 +--
 .../application/forms/Setup/InstancePage.php  |  3 +--
 .../forms/Setup/LivestatusResourcePage.php    |  3 +--
 .../application/forms/Setup/SecurityPage.php  |  3 +--
 .../application/forms/Setup/WelcomePage.php   |  3 +--
 .../application/forms/StatehistoryForm.php    |  3 +--
 .../views/helpers/CheckPerformance.php        |  3 +--
 .../views/helpers/ContactFlags.php            |  3 +--
 .../application/views/helpers/Customvar.php   |  1 +
 .../application/views/helpers/Link.php        |  1 +
 .../views/helpers/MonitoringFlags.php         |  3 +--
 .../application/views/helpers/Perfdata.php    |  3 +--
 .../views/helpers/PluginOutput.php            |  3 +--
 .../views/helpers/ResolveMacros.php           |  3 +--
 .../views/helpers/RuntimeVariables.php        |  3 +--
 .../views/helpers/SelectionToolbar.php        |  3 +--
 modules/monitoring/configuration.php          |  1 +
 .../monitoring/library/Monitoring/Backend.php |  1 +
 .../Monitoring/Backend/Ido/IdoBackend.php     |  1 +
 .../Backend/Ido/Query/AllcontactsQuery.php    |  3 +--
 .../Backend/Ido/Query/CommandQuery.php        |  5 ++--
 .../Backend/Ido/Query/CommentQuery.php        |  3 +--
 .../Ido/Query/CommentdeletionhistoryQuery.php |  3 +--
 .../Backend/Ido/Query/CommenthistoryQuery.php |  3 +--
 .../Backend/Ido/Query/ContactQuery.php        |  3 +--
 .../Backend/Ido/Query/ContactgroupQuery.php   |  3 +--
 .../Backend/Ido/Query/CustomvarQuery.php      |  3 +--
 .../Backend/Ido/Query/DowntimeQuery.php       |  1 +
 .../Ido/Query/DowntimeendhistoryQuery.php     |  3 +--
 .../Ido/Query/DowntimestarthistoryQuery.php   |  3 +--
 .../Backend/Ido/Query/EventHistoryQuery.php   |  1 +
 .../Backend/Ido/Query/EventgridQuery.php      |  3 +--
 .../Backend/Ido/Query/GroupsummaryQuery.php   |  3 +--
 .../Backend/Ido/Query/HostgroupQuery.php      |  3 +--
 .../Backend/Ido/Query/HoststatusQuery.php     |  3 +--
 .../Monitoring/Backend/Ido/Query/IdoQuery.php |  3 +--
 .../Backend/Ido/Query/NotificationQuery.php   |  1 +
 .../Ido/Query/NotificationhistoryQuery.php    |  3 +--
 .../Backend/Ido/Query/ProgramstatusQuery.php  |  3 +--
 .../Backend/Ido/Query/RuntimesummaryQuery.php |  3 +--
 .../Ido/Query/RuntimevariablesQuery.php       |  3 +--
 .../Backend/Ido/Query/ServicegroupQuery.php   |  3 +--
 .../Backend/Ido/Query/StatehistoryQuery.php   |  1 +
 .../Backend/Ido/Query/StatusQuery.php         |  3 +--
 .../Backend/Ido/Query/StatusSummaryQuery.php  |  3 +--
 .../Backend/Livestatus/LivestatusBackend.php  |  1 +
 .../Livestatus/Query/DowntimeQuery.php        |  3 +--
 .../Livestatus/Query/HostgroupQuery.php       |  3 +--
 .../Livestatus/Query/ServicegroupQuery.php    |  3 +--
 .../Backend/Livestatus/Query/StatusQuery.php  |  3 +--
 .../Livestatus/Query/StatusSummaryQuery.php   |  7 +++---
 .../Monitoring/Backend/MonitoringBackend.php  |  1 +
 .../library/Monitoring/BackendStep.php        |  3 +--
 .../library/Monitoring/Cli/CliUtils.php       |  3 +--
 .../Command/Exception/TransportException.php  |  3 +--
 .../Monitoring/Command/IcingaCommand.php      |  3 +--
 .../DisableNotificationsExpireCommand.php     |  3 +--
 .../Instance/ToggleInstanceFeatureCommand.php |  3 +--
 .../Object/AcknowledgeProblemCommand.php      |  3 +--
 .../Command/Object/AddCommentCommand.php      |  3 +--
 .../Command/Object/DeleteCommentCommand.php   |  3 +--
 .../Command/Object/DeleteDowntimeCommand.php  |  3 +--
 .../Command/Object/ObjectCommand.php          |  3 +--
 .../Object/ProcessCheckResultCommand.php      |  3 +--
 .../Object/PropagateHostDowntimeCommand.php   |  3 +--
 .../Object/RemoveAcknowledgementCommand.php   |  3 +--
 .../Object/ScheduleHostCheckCommand.php       |  3 +--
 .../Object/ScheduleHostDowntimeCommand.php    |  3 +--
 .../Object/ScheduleServiceCheckCommand.php    |  3 +--
 .../Object/ScheduleServiceDowntimeCommand.php |  3 +--
 .../Object/ToggleObjectFeatureCommand.php     |  3 +--
 .../Command/Object/WithCommentCommand.php     |  3 +--
 .../IcingaCommandFileCommandRenderer.php      |  1 +
 .../IcingaCommandRendererInterface.php        |  1 +
 .../Command/Transport/CommandTransport.php    |  3 +--
 .../Transport/CommandTransportInterface.php   |  3 +--
 .../Command/Transport/LocalCommandFile.php    |  3 +--
 .../Command/Transport/RemoteCommandFile.php   |  3 +--
 .../library/Monitoring/Controller.php         |  3 +--
 .../library/Monitoring/DataView/Command.php   |  5 ++--
 .../library/Monitoring/DataView/Comment.php   |  3 +--
 .../library/Monitoring/DataView/Contact.php   |  3 +--
 .../Monitoring/DataView/Contactgroup.php      |  3 +--
 .../library/Monitoring/DataView/Customvar.php |  3 +--
 .../library/Monitoring/DataView/DataView.php  |  3 +--
 .../library/Monitoring/DataView/Downtime.php  |  3 +--
 .../Monitoring/DataView/EventHistory.php      |  1 +
 .../library/Monitoring/DataView/Eventgrid.php |  3 +--
 .../Monitoring/DataView/Groupsummary.php      |  3 +--
 .../Monitoring/DataView/HostStatus.php        |  3 +--
 .../library/Monitoring/DataView/Hostgroup.php |  3 +--
 .../Monitoring/DataView/Notification.php      |  3 +--
 .../Monitoring/DataView/Programstatus.php     |  3 +--
 .../Monitoring/DataView/Runtimesummary.php    |  3 +--
 .../Monitoring/DataView/Runtimevariables.php  |  3 +--
 .../Monitoring/DataView/ServiceStatus.php     |  3 +--
 .../Monitoring/DataView/Servicegroup.php      |  3 +--
 .../Monitoring/DataView/StatusSummary.php     |  3 +--
 .../library/Monitoring/Environment.php        |  3 +--
 .../Exception/UnsupportedBackendException.php |  3 +--
 .../library/Monitoring/InstanceStep.php       |  3 +--
 .../library/Monitoring/MonitoringWizard.php   |  3 +--
 .../library/Monitoring/Object/Host.php        |  3 +--
 .../library/Monitoring/Object/HostList.php    |  1 +
 .../Monitoring/Object/MonitoredObject.php     |  3 +--
 .../library/Monitoring/Object/ObjectList.php  |  1 +
 .../library/Monitoring/Object/Service.php     |  3 +--
 .../library/Monitoring/Object/ServiceList.php |  1 +
 .../monitoring/library/Monitoring/Plugin.php  |  3 +--
 .../library/Monitoring/Plugin/Perfdata.php    |  3 +--
 .../library/Monitoring/Plugin/PerfdataSet.php |  3 +--
 .../library/Monitoring/SecurityStep.php       |  5 ++--
 .../library/Monitoring/Timeline/TimeEntry.php |  3 +--
 .../library/Monitoring/Timeline/TimeLine.php  |  3 +--
 .../library/Monitoring/Timeline/TimeRange.php |  3 +--
 .../Controller/MonitoredObjectController.php  |  1 +
 .../Monitoring/Web/Hook/HostActionsHook.php   |  1 +
 .../Web/Hook/TimelineProviderHook.php         |  3 +--
 .../Monitoring/Web/Widget/SelectBox.php       |  5 ++--
 modules/monitoring/public/css/module.less     |  7 +++---
 modules/monitoring/public/js/module.js        |  3 +--
 .../views/helpers/MonitoringFlagsTest.php     |  3 +--
 .../views/helpers/ResolveMacrosTest.php       |  3 +--
 .../Monitoring/Plugin/PerfdataSetTest.php     |  3 +--
 .../Monitoring/Plugin/PerfdataTest.php        |  3 +--
 .../test/php/regression/Bug6088Test.php       |  3 +--
 .../test/php/regression/Bug7043Test.php       |  3 ++-
 .../application/clicommands/ConfigCommand.php |  3 +--
 .../application/clicommands/TokenCommand.php  |  3 +--
 .../controllers/IndexController.php           |  3 +--
 .../application/forms/AdminAccountPage.php    |  3 +--
 .../application/forms/AuthBackendPage.php     |  3 +--
 .../application/forms/AuthenticationPage.php  |  3 +--
 .../forms/DatabaseCreationPage.php            |  3 +--
 .../application/forms/DbResourcePage.php      |  3 +--
 .../application/forms/GeneralConfigPage.php   |  3 +--
 .../forms/LdapDiscoveryConfirmPage.php        |  3 +--
 .../application/forms/LdapDiscoveryPage.php   |  3 +--
 .../application/forms/LdapResourcePage.php    |  3 +--
 .../setup/application/forms/ModulePage.php    |  3 +--
 .../application/forms/PreferencesPage.php     |  3 +--
 .../application/forms/RequirementsPage.php    |  3 +--
 .../setup/application/forms/SummaryPage.php   |  3 +--
 .../setup/application/forms/WelcomePage.php   |  3 +--
 .../Setup/Exception/SetupException.php        |  5 ++--
 modules/setup/library/Setup/Requirements.php  |  3 +--
 modules/setup/library/Setup/Setup.php         |  3 +--
 modules/setup/library/Setup/SetupWizard.php   |  3 +--
 modules/setup/library/Setup/Step.php          |  3 +--
 .../Setup/Steps/AuthenticationStep.php        |  3 +--
 .../library/Setup/Steps/DatabaseStep.php      |  3 +--
 .../library/Setup/Steps/GeneralConfigStep.php |  3 +--
 .../library/Setup/Steps/ResourceStep.php      |  3 +--
 modules/setup/library/Setup/Utils/DbTool.php  |  3 +--
 .../library/Setup/Utils/EnableModuleStep.php  |  3 +--
 .../setup/library/Setup/Utils/MakeDirStep.php |  3 +--
 .../Web/Form/Validator/TokenValidator.php     |  3 +--
 modules/setup/library/Setup/WebWizard.php     |  3 +--
 modules/setup/library/Setup/Webserver.php     |  3 +--
 .../setup/library/Setup/Webserver/Apache.php  |  3 +--
 .../setup/library/Setup/Webserver/Nginx.php   |  3 +--
 .../application/clicommands/PhpCommand.php    |  3 +--
 .../clicommands/CompileCommand.php            |  3 +--
 .../clicommands/RefreshCommand.php            |  3 +--
 .../Translation/Cli/TranslationCommand.php    |  3 +--
 .../Util/GettextTranslationHelper.php         |  3 +--
 packages/files/bin/icingacli                  |  1 +
 packages/files/public/index.php               |  1 +
 public/css/icinga/defaults.less               |  3 +--
 public/css/icinga/forms.less                  |  3 +--
 public/css/icinga/header-elements.less        |  3 +--
 public/css/icinga/layout-colors.less          |  3 +--
 public/css/icinga/layout-structure.less       |  3 +--
 public/css/icinga/login.less                  |  5 ++--
 public/css/icinga/main-content.less           |  5 ++--
 public/css/icinga/menu.less                   |  3 +--
 public/css/icinga/monitoring-colors.less      | 17 +++++++-------
 public/css/icinga/pagination.less             |  3 +--
 public/css/icinga/selection-toolbar.less      |  3 +--
 public/css/icinga/setup.less                  |  4 +++-
 public/css/icinga/tabs.less                   |  3 +--
 public/css/icinga/widgets.less                |  5 ++--
 public/css/pdf/pdfprint.less                  |  3 +--
 public/index.php                              |  3 +--
 public/js/helpers.js                          |  3 +--
 public/js/icinga.js                           |  3 +--
 public/js/icinga/behavior/form.js             |  3 +--
 public/js/icinga/behavior/navigation.js       |  5 ++--
 public/js/icinga/behavior/sparkline.js        |  3 +--
 public/js/icinga/behavior/tooltip.js          |  3 +--
 public/js/icinga/behavior/tristate.js         |  5 ++--
 public/js/icinga/eventlistener.js             |  3 +--
 public/js/icinga/events.js                    |  3 +--
 public/js/icinga/history.js                   |  3 +--
 public/js/icinga/loader.js                    |  3 +--
 public/js/icinga/logger.js                    |  3 +--
 public/js/icinga/module.js                    |  3 +--
 public/js/icinga/timer.js                     |  3 +--
 public/js/icinga/timezone.js                  |  4 +++-
 public/js/icinga/ui.js                        | 23 +++++++++----------
 public/js/icinga/utils.js                     |  3 +--
 .../Authentication/DbBackendFormTest.php      |  3 +--
 .../Authentication/LdapBackendFormTest.php    |  3 +--
 .../AuthenticationBackendReorderFormTest.php  |  3 +--
 .../Config/Resource/DbResourceFormTest.php    |  3 +--
 .../Config/Resource/LdapResourceFormTest.php  |  3 +--
 .../Resource/LivestatusResourceFormTest.php   |  3 +--
 .../views/helpers/DateFormatTestBroken.php    |  3 +--
 test/php/bootstrap.php                        |  3 +--
 .../library/Icinga/Application/ConfigTest.php |  3 +--
 .../library/Icinga/Application/LoaderTest.php |  3 +--
 .../library/Icinga/Chart/GraphChartTest.php   |  3 +--
 .../php/library/Icinga/Chart/PieChartTest.php |  5 ++--
 .../library/Icinga/Data/ConfigObjectTest.php  |  3 +--
 .../Data/DataArray/ArrayDatasourceTest.php    |  3 +--
 .../library/Icinga/Data/Filter/FilterTest.php |  3 +--
 test/php/library/Icinga/File/CsvTest.php      |  3 +--
 .../library/Icinga/File/Ini/IniWriterTest.php |  3 +--
 .../Icinga/Logger/Writer/StreamWriterTest.php |  3 +--
 .../Icinga/Protocol/Ldap/QueryTest.php        |  3 +--
 .../library/Icinga/Test/BaseTestCaseTest.php  |  3 +--
 .../library/Icinga/User/PreferencesTest.php   |  3 +--
 .../library/Icinga/User/Store/DbStoreTest.php |  3 +--
 .../Icinga/User/Store/IniStoreTest.php        |  3 +--
 test/php/library/Icinga/UserTest.php          |  3 +--
 .../Icinga/Util/DateTimeFactoryTest.php       |  3 +--
 .../php/library/Icinga/Util/DimensionTest.php |  3 +--
 test/php/library/Icinga/Util/FileTest.php     |  3 +--
 test/php/library/Icinga/Util/StringTest.php   |  3 +--
 .../library/Icinga/Util/TranslatorTest.php    |  3 +--
 .../Web/Form/Element/DateTimePickerTest.php   |  3 +--
 .../Validator/DateFormatValidatorTest.php     |  3 +--
 .../Validator/TimeFormatValidatorTest.php     |  3 +--
 .../Validator/WritablePathValidatorTest.php   |  3 +--
 test/php/library/Icinga/Web/FormTest.php      |  3 +--
 test/php/library/Icinga/Web/HookTest.php      |  3 +--
 test/php/library/Icinga/Web/MenuTest.php      |  3 +--
 .../ScrollingStyle/SlidingWithBorderTest.php  |  3 +--
 .../Icinga/Web/Session/PhpSessionTest.php     |  3 +--
 .../Web/Session/SessionNamespaceTest.php      |  3 +--
 test/php/library/Icinga/Web/UrlTest.php       |  3 +--
 .../Icinga/Web/View/DateTimeRendererTest.php  |  3 +--
 .../Icinga/Web/Widget/DashboardTest.php       |  3 +--
 .../Icinga/Web/Widget/SearchDashboardTest.php |  3 +--
 test/php/regression/Bug4102Test.php           |  3 +--
 test/php/regression/Bug6284Test.php           |  3 +--
 test/php/regression/Bug6432Test.php           |  3 +--
 590 files changed, 652 insertions(+), 1165 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 1e5e3a073..9090b23aa 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,6 +1,8 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt
+
 VAGRANTFILE_API_VERSION = "2"
 VAGRANT_REQUIRED_VERSION = "1.5.0"
 
diff --git a/application/clicommands/AutocompleteCommand.php b/application/clicommands/AutocompleteCommand.php
index 5a5a0e0c0..045ee8cdc 100644
--- a/application/clicommands/AutocompleteCommand.php
+++ b/application/clicommands/AutocompleteCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Clicommands;
 
diff --git a/application/clicommands/HelpCommand.php b/application/clicommands/HelpCommand.php
index 7c1977f59..4cc197f3e 100644
--- a/application/clicommands/HelpCommand.php
+++ b/application/clicommands/HelpCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Clicommands;
 
diff --git a/application/clicommands/ModuleCommand.php b/application/clicommands/ModuleCommand.php
index e38d134c3..5d5c30518 100644
--- a/application/clicommands/ModuleCommand.php
+++ b/application/clicommands/ModuleCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Clicommands;
 
diff --git a/application/clicommands/WebCommand.php b/application/clicommands/WebCommand.php
index 12ed9e1a4..46b4e8a3d 100644
--- a/application/clicommands/WebCommand.php
+++ b/application/clicommands/WebCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Clicommands;
 
diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index 4e70894a1..e7a4c82e4 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 # namespace Icinga\Application\Controllers;
 
diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 078503346..a1bf52514 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Application\Config;
 use Icinga\Application\Icinga;
diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 12a5180c8..009c715c3 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use \Exception;
 use Icinga\Exception\ProgrammingError;
diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index 0548b5c9c..84d6c0998 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php
index 09e8f0368..78c4c1068 100644
--- a/application/controllers/FilterController.php
+++ b/application/controllers/FilterController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Web\Controller\ActionController;
 use Icinga\Filter\Filter;
diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php
index 05e66504b..6537a0b61 100644
--- a/application/controllers/IndexController.php
+++ b/application/controllers/IndexController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 # namespace Icinga\Application\Controllers;
 
diff --git a/application/controllers/LayoutController.php b/application/controllers/LayoutController.php
index 2d84faf3c..ae9df3734 100644
--- a/application/controllers/LayoutController.php
+++ b/application/controllers/LayoutController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Web\MenuRenderer;
 use Icinga\Web\Controller\ActionController;
diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index f8b0ed1d6..1051aeae1 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Web\Url;
diff --git a/application/controllers/PreferenceController.php b/application/controllers/PreferenceController.php
index 832f57644..7034b953d 100644
--- a/application/controllers/PreferenceController.php
+++ b/application/controllers/PreferenceController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Web\Controller\BasePreferenceController;
 use Icinga\Web\Url;
diff --git a/application/controllers/RolesController.php b/application/controllers/RolesController.php
index f4c6aeed2..edf2a3689 100644
--- a/application/controllers/RolesController.php
+++ b/application/controllers/RolesController.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Application\Config;
 use Icinga\Forms\ConfirmRemovalForm;
diff --git a/application/controllers/SearchController.php b/application/controllers/SearchController.php
index 68fd5dd3d..a9bab30d7 100644
--- a/application/controllers/SearchController.php
+++ b/application/controllers/SearchController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Web\Controller\ActionController;
 use Icinga\Web\Widget;
diff --git a/application/controllers/StaticController.php b/application/controllers/StaticController.php
index fc5f1354f..549a32419 100644
--- a/application/controllers/StaticController.php
+++ b/application/controllers/StaticController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Web\Controller\ActionController;
 use Icinga\Application\Icinga;
diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index 8be455dcc..0b3abaeb2 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Authentication;
 
diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index d3a5af51d..2bdb08949 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config\Authentication;
 
diff --git a/application/forms/Config/Authentication/ExternalBackendForm.php b/application/forms/Config/Authentication/ExternalBackendForm.php
index 51000b2d2..30791cb04 100644
--- a/application/forms/Config/Authentication/ExternalBackendForm.php
+++ b/application/forms/Config/Authentication/ExternalBackendForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config\Authentication;
 
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 1b8fc3f11..d84bb5bd3 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config\Authentication;
 
diff --git a/application/forms/Config/AuthenticationBackendConfigForm.php b/application/forms/Config/AuthenticationBackendConfigForm.php
index de3093ada..391533ad7 100644
--- a/application/forms/Config/AuthenticationBackendConfigForm.php
+++ b/application/forms/Config/AuthenticationBackendConfigForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config;
 
diff --git a/application/forms/Config/AuthenticationBackendReorderForm.php b/application/forms/Config/AuthenticationBackendReorderForm.php
index a41224248..a207572c7 100644
--- a/application/forms/Config/AuthenticationBackendReorderForm.php
+++ b/application/forms/Config/AuthenticationBackendReorderForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config;
 
diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php
index 29b7b512e..0e1ac1f46 100644
--- a/application/forms/Config/General/ApplicationConfigForm.php
+++ b/application/forms/Config/General/ApplicationConfigForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config\General;
 
diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php
index 997bd558a..12e9ae593 100644
--- a/application/forms/Config/General/LoggingConfigForm.php
+++ b/application/forms/Config/General/LoggingConfigForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config\General;
 
diff --git a/application/forms/Config/GeneralConfigForm.php b/application/forms/Config/GeneralConfigForm.php
index 7e3357d7b..22e83ff30 100644
--- a/application/forms/Config/GeneralConfigForm.php
+++ b/application/forms/Config/GeneralConfigForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config;
 
diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
index 97dd951d1..56edbf178 100644
--- a/application/forms/Config/Resource/DbResourceForm.php
+++ b/application/forms/Config/Resource/DbResourceForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config\Resource;
 
diff --git a/application/forms/Config/Resource/FileResourceForm.php b/application/forms/Config/Resource/FileResourceForm.php
index 960926114..7d46cc6fb 100644
--- a/application/forms/Config/Resource/FileResourceForm.php
+++ b/application/forms/Config/Resource/FileResourceForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config\Resource;
 
diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 3293546c5..6e8052579 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config\Resource;
 
diff --git a/application/forms/Config/Resource/LivestatusResourceForm.php b/application/forms/Config/Resource/LivestatusResourceForm.php
index e893a4657..d7bf7d883 100644
--- a/application/forms/Config/Resource/LivestatusResourceForm.php
+++ b/application/forms/Config/Resource/LivestatusResourceForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config\Resource;
 
diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php
index 67912142a..1b860c193 100644
--- a/application/forms/Config/ResourceConfigForm.php
+++ b/application/forms/Config/ResourceConfigForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Config;
 
diff --git a/application/forms/ConfigForm.php b/application/forms/ConfigForm.php
index 224633f1f..18410ef2d 100644
--- a/application/forms/ConfigForm.php
+++ b/application/forms/ConfigForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms;
 
diff --git a/application/forms/ConfirmRemovalForm.php b/application/forms/ConfirmRemovalForm.php
index 6840db37d..6ef9258ec 100644
--- a/application/forms/ConfirmRemovalForm.php
+++ b/application/forms/ConfirmRemovalForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms;
 
diff --git a/application/forms/Dashboard/DashletForm.php b/application/forms/Dashboard/DashletForm.php
index e58ca8aba..c1e29c063 100644
--- a/application/forms/Dashboard/DashletForm.php
+++ b/application/forms/Dashboard/DashletForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Dashboard;
 
diff --git a/application/forms/LdapDiscoveryForm.php b/application/forms/LdapDiscoveryForm.php
index 6a14c2ecd..7da98a277 100644
--- a/application/forms/LdapDiscoveryForm.php
+++ b/application/forms/LdapDiscoveryForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms;
 
diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
index ed20c58cd..74a9683e3 100644
--- a/application/forms/PreferenceForm.php
+++ b/application/forms/PreferenceForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms;
 
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index cc5f4037e..0e3c97c0a 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Forms\Security;
 
diff --git a/application/views/helpers/DateFormat.php b/application/views/helpers/DateFormat.php
index d3515d184..727c9c8f9 100644
--- a/application/views/helpers/DateFormat.php
+++ b/application/views/helpers/DateFormat.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Application\Icinga;
 use Icinga\Util\DateTimeFactory;
diff --git a/application/views/helpers/FormDateTime.php b/application/views/helpers/FormDateTime.php
index b75dfec62..29bec0c16 100644
--- a/application/views/helpers/FormDateTime.php
+++ b/application/views/helpers/FormDateTime.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Render date-and-time input controls
diff --git a/application/views/helpers/FormNumber.php b/application/views/helpers/FormNumber.php
index c3ccdcfd6..1f8efd83b 100644
--- a/application/views/helpers/FormNumber.php
+++ b/application/views/helpers/FormNumber.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use \Zend_View_Helper_FormElement;
 
diff --git a/application/views/helpers/FormTriStateCheckbox.php b/application/views/helpers/FormTriStateCheckbox.php
index 695c9af56..107abee4d 100644
--- a/application/views/helpers/FormTriStateCheckbox.php
+++ b/application/views/helpers/FormTriStateCheckbox.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use \Zend_View_Helper_FormElement;
 
diff --git a/application/views/helpers/Util.php b/application/views/helpers/Util.php
index f3e41244f..25e506b25 100644
--- a/application/views/helpers/Util.php
+++ b/application/views/helpers/Util.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Class Zend_View_Helper_Util
diff --git a/bin/icingacli b/bin/icingacli
index c85777c9c..5a2d4c957 100755
--- a/bin/icingacli
+++ b/bin/icingacli
@@ -1,7 +1,6 @@
 #!/usr/bin/php
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 require_once dirname(__DIR__) . '/library/Icinga/Application/Cli.php';
 
diff --git a/bin/license_writer.py b/bin/license_writer.py
index 532839e2e..b904dd34e 100755
--- a/bin/license_writer.py
+++ b/bin/license_writer.py
@@ -1,7 +1,6 @@
 #!/usr/bin/python
 
-# {{{ICINGA_LICENSE_HEADER}}}
-# {{{ICINGA_LICENSE_HEADER}}}
+# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt
 
 import sys
 import logging
diff --git a/etc/bash_completion.d/icingacli b/etc/bash_completion.d/icingacli
index 74e779218..f9be7bcf9 100644
--- a/etc/bash_completion.d/icingacli
+++ b/etc/bash_completion.d/icingacli
@@ -1,4 +1,3 @@
-
 _icingacli_completion()
 {
   local cur opts
@@ -9,5 +8,3 @@ _icingacli_completion()
 }
 
 complete -F _icingacli_completion icingacli
-
-
diff --git a/etc/schema/mysql.schema.sql b/etc/schema/mysql.schema.sql
index 74d2665d4..c1ffcf91f 100644
--- a/etc/schema/mysql.schema.sql
+++ b/etc/schema/mysql.schema.sql
@@ -1,3 +1,5 @@
+# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt
+
 CREATE TABLE `icingaweb_group`(
   `name`   varchar(64) COLLATE utf8_unicode_ci NOT NULL,
   `parent` varchar(64) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
diff --git a/etc/schema/pgsql.schema.sql b/etc/schema/pgsql.schema.sql
index 77971222b..bbaba8253 100644
--- a/etc/schema/pgsql.schema.sql
+++ b/etc/schema/pgsql.schema.sql
@@ -1,6 +1,5 @@
-/**
- * Table "icingaweb_group"
- */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+
 CREATE TABLE "icingaweb_group" (
   "name"   character varying(64) NOT NULL,
   "parent" character varying(64) NULL DEFAULT NULL,
@@ -20,10 +19,6 @@ CREATE UNIQUE INDEX idx_icingaweb_group
     lower((name)::text)
 );
 
-
-/**
- * Table "icingaweb_group_membership"
- */
 CREATE TABLE "icingaweb_group_membership" (
   "group_name" character varying(64) NOT NULL,
   "username"   character varying(64) NOT NULL,
@@ -45,10 +40,6 @@ CREATE UNIQUE INDEX idx_icingaweb_group_membership
     lower((username)::text)
 );
 
-
-/**
- * Table "icingaweb_user"
- */
 CREATE TABLE "icingaweb_user" (
   "name"          character varying(64) NOT NULL,
   "active"        smallint NOT NULL,
@@ -69,10 +60,6 @@ CREATE UNIQUE INDEX idx_icingaweb_user
     lower((name)::text)
 );
 
-
-/**
- * Table "icingaweb_user_preference"
- */
 CREATE TABLE "icingaweb_user_preference" (
   "username" character varying(64) NOT NULL,
   "name"     character varying(64) NOT NULL,
@@ -96,4 +83,4 @@ CREATE UNIQUE INDEX idx_icingaweb_user_preference
     lower((username)::text),
     lower((section)::text),
     lower((name)::text)
-);
\ No newline at end of file
+);
diff --git a/icingaweb2.spec b/icingaweb2.spec
index a012751ea..9dfe5d0df 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -1,3 +1,5 @@
+# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt
+
 %define revision 1.beta2
 
 Name:           icingaweb2
diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 89bca7b97..4154124af 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Benchmark.php b/library/Icinga/Application/Benchmark.php
index fd69dd510..c33f718c0 100644
--- a/library/Icinga/Application/Benchmark.php
+++ b/library/Icinga/Application/Benchmark.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Icinga\Application\Benchmark class
diff --git a/library/Icinga/Application/Cli.php b/library/Icinga/Application/Cli.php
index 6341d561e..20ad3b8a0 100644
--- a/library/Icinga/Application/Cli.php
+++ b/library/Icinga/Application/Cli.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Config.php b/library/Icinga/Application/Config.php
index 484cff6df..4feed4d25 100644
--- a/library/Icinga/Application/Config.php
+++ b/library/Icinga/Application/Config.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/EmbeddedWeb.php b/library/Icinga/Application/EmbeddedWeb.php
index b9ed067a2..a6f166f1b 100644
--- a/library/Icinga/Application/EmbeddedWeb.php
+++ b/library/Icinga/Application/EmbeddedWeb.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Icinga.php b/library/Icinga/Application/Icinga.php
index 1ab9c36f0..2c0b6868d 100644
--- a/library/Icinga/Application/Icinga.php
+++ b/library/Icinga/Application/Icinga.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/LegacyWeb.php b/library/Icinga/Application/LegacyWeb.php
index a5b5beed9..495bcf204 100644
--- a/library/Icinga/Application/LegacyWeb.php
+++ b/library/Icinga/Application/LegacyWeb.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Loader.php b/library/Icinga/Application/Loader.php
index 15c3a9316..19f62cbcc 100644
--- a/library/Icinga/Application/Loader.php
+++ b/library/Icinga/Application/Loader.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Logger.php b/library/Icinga/Application/Logger.php
index 70eaa774b..e4e706891 100644
--- a/library/Icinga/Application/Logger.php
+++ b/library/Icinga/Application/Logger.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Logger/LogWriter.php b/library/Icinga/Application/Logger/LogWriter.php
index b89fec62f..196be16e8 100644
--- a/library/Icinga/Application/Logger/LogWriter.php
+++ b/library/Icinga/Application/Logger/LogWriter.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application\Logger;
 
diff --git a/library/Icinga/Application/Logger/Writer/FileWriter.php b/library/Icinga/Application/Logger/Writer/FileWriter.php
index 2f5a292ec..6f2e31872 100644
--- a/library/Icinga/Application/Logger/Writer/FileWriter.php
+++ b/library/Icinga/Application/Logger/Writer/FileWriter.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application\Logger\Writer;
 
diff --git a/library/Icinga/Application/Logger/Writer/StdoutWriter.php b/library/Icinga/Application/Logger/Writer/StdoutWriter.php
index 52608ca12..106c6960a 100644
--- a/library/Icinga/Application/Logger/Writer/StdoutWriter.php
+++ b/library/Icinga/Application/Logger/Writer/StdoutWriter.php
@@ -1,5 +1,5 @@
 <?php
-
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 namespace Icinga\Application\Logger\Writer;
 
 use Icinga\Cli\Screen;
diff --git a/library/Icinga/Application/Logger/Writer/SyslogWriter.php b/library/Icinga/Application/Logger/Writer/SyslogWriter.php
index 7a69e4cba..9f819fcb5 100644
--- a/library/Icinga/Application/Logger/Writer/SyslogWriter.php
+++ b/library/Icinga/Application/Logger/Writer/SyslogWriter.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application\Logger\Writer;
 
diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php
index 0a1b23f78..a6a77e0d2 100644
--- a/library/Icinga/Application/Modules/Manager.php
+++ b/library/Icinga/Application/Modules/Manager.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application\Modules;
 
diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index 96bbae7be..0146f6bb5 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application\Modules;
 
diff --git a/library/Icinga/Application/Platform.php b/library/Icinga/Application/Platform.php
index d4d130220..45c540617 100644
--- a/library/Icinga/Application/Platform.php
+++ b/library/Icinga/Application/Platform.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 5b18f1be8..3f5577203 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/functions.php b/library/Icinga/Application/functions.php
index 304c75093..ab2d525fc 100644
--- a/library/Icinga/Application/functions.php
+++ b/library/Icinga/Application/functions.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Util\Translator;
 
diff --git a/library/Icinga/Application/webrouter.php b/library/Icinga/Application/webrouter.php
index b00034871..f29db8644 100644
--- a/library/Icinga/Application/webrouter.php
+++ b/library/Icinga/Application/webrouter.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Authentication/AdmissionLoader.php b/library/Icinga/Authentication/AdmissionLoader.php
index d97fc534e..ea828df53 100644
--- a/library/Icinga/Authentication/AdmissionLoader.php
+++ b/library/Icinga/Authentication/AdmissionLoader.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Authentication/AuthChain.php b/library/Icinga/Authentication/AuthChain.php
index 24c12c9de..b668c3125 100644
--- a/library/Icinga/Authentication/AuthChain.php
+++ b/library/Icinga/Authentication/AuthChain.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Authentication/Backend/DbUserBackend.php b/library/Icinga/Authentication/Backend/DbUserBackend.php
index 7865aa905..8888327ef 100644
--- a/library/Icinga/Authentication/Backend/DbUserBackend.php
+++ b/library/Icinga/Authentication/Backend/DbUserBackend.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Backend/DbUserGroupBackend.php b/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
index 15a77d77d..080899393 100644
--- a/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Backend/ExternalBackend.php b/library/Icinga/Authentication/Backend/ExternalBackend.php
index d5eb491e5..9fbe3282b 100644
--- a/library/Icinga/Authentication/Backend/ExternalBackend.php
+++ b/library/Icinga/Authentication/Backend/ExternalBackend.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Backend/IniUserGroupBackend.php b/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
index 45d36e833..23781916d 100644
--- a/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
+++ b/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/Backend/LdapUserBackend.php
index 666ed69ae..13c03af58 100644
--- a/library/Icinga/Authentication/Backend/LdapUserBackend.php
+++ b/library/Icinga/Authentication/Backend/LdapUserBackend.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 03c3e2a41..0982d8fe9 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Authentication/UserBackend.php b/library/Icinga/Authentication/UserBackend.php
index 7215f4d41..beb5df5b9 100644
--- a/library/Icinga/Authentication/UserBackend.php
+++ b/library/Icinga/Authentication/UserBackend.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Authentication/UserGroupBackend.php b/library/Icinga/Authentication/UserGroupBackend.php
index f1a41adcb..2fc0a5ada 100644
--- a/library/Icinga/Authentication/UserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroupBackend.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Chart/Axis.php b/library/Icinga/Chart/Axis.php
index c12d9a904..d52a97b6e 100644
--- a/library/Icinga/Chart/Axis.php
+++ b/library/Icinga/Chart/Axis.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Chart.php b/library/Icinga/Chart/Chart.php
index 5b545d4de..42bc28ca8 100644
--- a/library/Icinga/Chart/Chart.php
+++ b/library/Icinga/Chart/Chart.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Format.php b/library/Icinga/Chart/Format.php
index 80b48ecb5..c9699e05c 100644
--- a/library/Icinga/Chart/Format.php
+++ b/library/Icinga/Chart/Format.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Graph/BarGraph.php b/library/Icinga/Chart/Graph/BarGraph.php
index febad8d09..90582769d 100644
--- a/library/Icinga/Chart/Graph/BarGraph.php
+++ b/library/Icinga/Chart/Graph/BarGraph.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Graph;
 
diff --git a/library/Icinga/Chart/Graph/LineGraph.php b/library/Icinga/Chart/Graph/LineGraph.php
index 3644f1492..cbb9235a9 100644
--- a/library/Icinga/Chart/Graph/LineGraph.php
+++ b/library/Icinga/Chart/Graph/LineGraph.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Chart\Graph;
diff --git a/library/Icinga/Chart/Graph/StackedGraph.php b/library/Icinga/Chart/Graph/StackedGraph.php
index 4339b8c8d..36ea73721 100644
--- a/library/Icinga/Chart/Graph/StackedGraph.php
+++ b/library/Icinga/Chart/Graph/StackedGraph.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Graph;
 
diff --git a/library/Icinga/Chart/Graph/Tooltip.php b/library/Icinga/Chart/Graph/Tooltip.php
index 4457e04e2..c4ebbffb9 100644
--- a/library/Icinga/Chart/Graph/Tooltip.php
+++ b/library/Icinga/Chart/Graph/Tooltip.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Graph;
 
@@ -141,4 +140,4 @@ class Tooltip
     {
         return strip_tags($this->render($order, $data, $format));
     }
-}
\ No newline at end of file
+}
diff --git a/library/Icinga/Chart/GridChart.php b/library/Icinga/Chart/GridChart.php
index 190e09bf9..b95fa1fc4 100644
--- a/library/Icinga/Chart/GridChart.php
+++ b/library/Icinga/Chart/GridChart.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Inline/Inline.php b/library/Icinga/Chart/Inline/Inline.php
index 8faa388bf..ef22bc02e 100644
--- a/library/Icinga/Chart/Inline/Inline.php
+++ b/library/Icinga/Chart/Inline/Inline.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Inline;
 
diff --git a/library/Icinga/Chart/Inline/PieChart.php b/library/Icinga/Chart/Inline/PieChart.php
index fdffd9acd..c9099f5ef 100644
--- a/library/Icinga/Chart/Inline/PieChart.php
+++ b/library/Icinga/Chart/Inline/PieChart.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Inline;
 
diff --git a/library/Icinga/Chart/Legend.php b/library/Icinga/Chart/Legend.php
index df334089f..eb004a9a1 100644
--- a/library/Icinga/Chart/Legend.php
+++ b/library/Icinga/Chart/Legend.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Palette.php b/library/Icinga/Chart/Palette.php
index ef413e73e..09cd1ade4 100644
--- a/library/Icinga/Chart/Palette.php
+++ b/library/Icinga/Chart/Palette.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/PieChart.php b/library/Icinga/Chart/PieChart.php
index cc51f85b3..e5d098c15 100644
--- a/library/Icinga/Chart/PieChart.php
+++ b/library/Icinga/Chart/PieChart.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Primitive/Animatable.php b/library/Icinga/Chart/Primitive/Animatable.php
index 3d4d24f00..bc7c18235 100644
--- a/library/Icinga/Chart/Primitive/Animatable.php
+++ b/library/Icinga/Chart/Primitive/Animatable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Animation.php b/library/Icinga/Chart/Primitive/Animation.php
index dbcdb1a2c..c2d0afc45 100644
--- a/library/Icinga/Chart/Primitive/Animation.php
+++ b/library/Icinga/Chart/Primitive/Animation.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Canvas.php b/library/Icinga/Chart/Primitive/Canvas.php
index 55159d975..47abd7f09 100644
--- a/library/Icinga/Chart/Primitive/Canvas.php
+++ b/library/Icinga/Chart/Primitive/Canvas.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/Circle.php b/library/Icinga/Chart/Primitive/Circle.php
index da5f1785e..ab7664d10 100644
--- a/library/Icinga/Chart/Primitive/Circle.php
+++ b/library/Icinga/Chart/Primitive/Circle.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/Drawable.php b/library/Icinga/Chart/Primitive/Drawable.php
index ea5dca077..1ed78c9fb 100644
--- a/library/Icinga/Chart/Primitive/Drawable.php
+++ b/library/Icinga/Chart/Primitive/Drawable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Line.php b/library/Icinga/Chart/Primitive/Line.php
index 150013f82..d2ad670e7 100644
--- a/library/Icinga/Chart/Primitive/Line.php
+++ b/library/Icinga/Chart/Primitive/Line.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Path.php b/library/Icinga/Chart/Primitive/Path.php
index 0969e9674..3eac8b954 100644
--- a/library/Icinga/Chart/Primitive/Path.php
+++ b/library/Icinga/Chart/Primitive/Path.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/PieSlice.php b/library/Icinga/Chart/Primitive/PieSlice.php
index 33f3cbee7..c3b4a8b90 100644
--- a/library/Icinga/Chart/Primitive/PieSlice.php
+++ b/library/Icinga/Chart/Primitive/PieSlice.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/RawElement.php b/library/Icinga/Chart/Primitive/RawElement.php
index 459a2d1ce..47336da0b 100644
--- a/library/Icinga/Chart/Primitive/RawElement.php
+++ b/library/Icinga/Chart/Primitive/RawElement.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Rect.php b/library/Icinga/Chart/Primitive/Rect.php
index fc389e204..9bd7bb3ff 100644
--- a/library/Icinga/Chart/Primitive/Rect.php
+++ b/library/Icinga/Chart/Primitive/Rect.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Styleable.php b/library/Icinga/Chart/Primitive/Styleable.php
index 248a560d3..0dcf47e34 100644
--- a/library/Icinga/Chart/Primitive/Styleable.php
+++ b/library/Icinga/Chart/Primitive/Styleable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/Text.php b/library/Icinga/Chart/Primitive/Text.php
index 72bed552b..d2467ffcc 100644
--- a/library/Icinga/Chart/Primitive/Text.php
+++ b/library/Icinga/Chart/Primitive/Text.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Chart\Primitive;
diff --git a/library/Icinga/Chart/Render/LayoutBox.php b/library/Icinga/Chart/Render/LayoutBox.php
index 00e75f3c4..a3fb1a64f 100644
--- a/library/Icinga/Chart/Render/LayoutBox.php
+++ b/library/Icinga/Chart/Render/LayoutBox.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Render;
 
diff --git a/library/Icinga/Chart/Render/RenderContext.php b/library/Icinga/Chart/Render/RenderContext.php
index a5d308c6e..e97d213dd 100644
--- a/library/Icinga/Chart/Render/RenderContext.php
+++ b/library/Icinga/Chart/Render/RenderContext.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Chart\Render;
diff --git a/library/Icinga/Chart/Render/Rotator.php b/library/Icinga/Chart/Render/Rotator.php
index 56c1a4685..9d4f4aa2b 100644
--- a/library/Icinga/Chart/Render/Rotator.php
+++ b/library/Icinga/Chart/Render/Rotator.php
@@ -1,11 +1,8 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Render;
 
-
 use Icinga\Chart\Render\RenderContext;
 use Icinga\Chart\Primitive\Drawable;
 use DOMElement;
@@ -80,4 +77,4 @@ class Rotator implements Drawable
         $el = $this->element->toSvg($ctx);
         return $this->rotate($ctx, $el, $this->degrees);
     }
-} 
\ No newline at end of file
+}
diff --git a/library/Icinga/Chart/SVGRenderer.php b/library/Icinga/Chart/SVGRenderer.php
index da6015ceb..7de8463bb 100644
--- a/library/Icinga/Chart/SVGRenderer.php
+++ b/library/Icinga/Chart/SVGRenderer.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Unit/AxisUnit.php b/library/Icinga/Chart/Unit/AxisUnit.php
index fba521778..9a989c410 100644
--- a/library/Icinga/Chart/Unit/AxisUnit.php
+++ b/library/Icinga/Chart/Unit/AxisUnit.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Unit;
 
diff --git a/library/Icinga/Chart/Unit/CalendarUnit.php b/library/Icinga/Chart/Unit/CalendarUnit.php
index 2845303c4..a1864b5b3 100644
--- a/library/Icinga/Chart/Unit/CalendarUnit.php
+++ b/library/Icinga/Chart/Unit/CalendarUnit.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Chart\Unit;
diff --git a/library/Icinga/Chart/Unit/LinearUnit.php b/library/Icinga/Chart/Unit/LinearUnit.php
index fe80971d4..15eed57fe 100644
--- a/library/Icinga/Chart/Unit/LinearUnit.php
+++ b/library/Icinga/Chart/Unit/LinearUnit.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Unit;
 
diff --git a/library/Icinga/Chart/Unit/LogarithmicUnit.php b/library/Icinga/Chart/Unit/LogarithmicUnit.php
index 6d07f3d45..61f962f90 100644
--- a/library/Icinga/Chart/Unit/LogarithmicUnit.php
+++ b/library/Icinga/Chart/Unit/LogarithmicUnit.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Chart\Unit;
 
diff --git a/library/Icinga/Chart/Unit/StaticAxis.php b/library/Icinga/Chart/Unit/StaticAxis.php
index c7e9c2be5..47ca0706c 100644
--- a/library/Icinga/Chart/Unit/StaticAxis.php
+++ b/library/Icinga/Chart/Unit/StaticAxis.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Chart\Unit;
diff --git a/library/Icinga/Cli/AnsiScreen.php b/library/Icinga/Cli/AnsiScreen.php
index f3b2b6654..01ee51514 100644
--- a/library/Icinga/Cli/AnsiScreen.php
+++ b/library/Icinga/Cli/AnsiScreen.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Command.php b/library/Icinga/Cli/Command.php
index c410cfc0e..2ef4154d0 100644
--- a/library/Icinga/Cli/Command.php
+++ b/library/Icinga/Cli/Command.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Documentation.php b/library/Icinga/Cli/Documentation.php
index 76b821df4..179d387c7 100644
--- a/library/Icinga/Cli/Documentation.php
+++ b/library/Icinga/Cli/Documentation.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Documentation/CommentParser.php b/library/Icinga/Cli/Documentation/CommentParser.php
index f8b6135e9..10462c7f3 100644
--- a/library/Icinga/Cli/Documentation/CommentParser.php
+++ b/library/Icinga/Cli/Documentation/CommentParser.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Cli\Documentation;
 
diff --git a/library/Icinga/Cli/Loader.php b/library/Icinga/Cli/Loader.php
index 655ef7c18..406a1c31f 100644
--- a/library/Icinga/Cli/Loader.php
+++ b/library/Icinga/Cli/Loader.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Params.php b/library/Icinga/Cli/Params.php
index 5c6cbfe8b..34110cd8e 100644
--- a/library/Icinga/Cli/Params.php
+++ b/library/Icinga/Cli/Params.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Screen.php b/library/Icinga/Cli/Screen.php
index 5b687f3ab..ca9aa2f26 100644
--- a/library/Icinga/Cli/Screen.php
+++ b/library/Icinga/Cli/Screen.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Data/Browsable.php b/library/Icinga/Data/Browsable.php
index 4d8d2136f..11f1956e3 100644
--- a/library/Icinga/Data/Browsable.php
+++ b/library/Icinga/Data/Browsable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/ConfigObject.php b/library/Icinga/Data/ConfigObject.php
index 23b2e1651..0700179fd 100644
--- a/library/Icinga/Data/ConfigObject.php
+++ b/library/Icinga/Data/ConfigObject.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/ConnectionInterface.php b/library/Icinga/Data/ConnectionInterface.php
index dfdb4a6f2..081ac5612 100644
--- a/library/Icinga/Data/ConnectionInterface.php
+++ b/library/Icinga/Data/ConnectionInterface.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/DataArray/ArrayDatasource.php b/library/Icinga/Data/DataArray/ArrayDatasource.php
index ecb428e59..c80df68df 100644
--- a/library/Icinga/Data/DataArray/ArrayDatasource.php
+++ b/library/Icinga/Data/DataArray/ArrayDatasource.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\DataArray;
 
@@ -10,7 +9,7 @@ use Icinga\Data\SimpleQuery;
 class ArrayDatasource implements Selectable
 {
     protected $data;
-    
+
     protected $result;
 
     /**
diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php
index 38153a1cf..7909ab194 100644
--- a/library/Icinga/Data/Db/DbConnection.php
+++ b/library/Icinga/Data/Db/DbConnection.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Db;
 
diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index bad1261aa..38d2352b0 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Db;
 
diff --git a/library/Icinga/Data/Fetchable.php b/library/Icinga/Data/Fetchable.php
index 249a522e3..2c3c8ce11 100644
--- a/library/Icinga/Data/Fetchable.php
+++ b/library/Icinga/Data/Fetchable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Filter/Filter.php b/library/Icinga/Data/Filter/Filter.php
index 5793a4749..6508a27c9 100644
--- a/library/Icinga/Data/Filter/Filter.php
+++ b/library/Icinga/Data/Filter/Filter.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterAnd.php b/library/Icinga/Data/Filter/FilterAnd.php
index 8fd2f2411..c3ff9b75c 100644
--- a/library/Icinga/Data/Filter/FilterAnd.php
+++ b/library/Icinga/Data/Filter/FilterAnd.php
@@ -1,11 +1,10 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
 /**
- * Filter list AND 
+ * Filter list AND
  *
  * Binary AND, all contained filters must succeed
  */
diff --git a/library/Icinga/Data/Filter/FilterChain.php b/library/Icinga/Data/Filter/FilterChain.php
index cdb3a1123..2567de41b 100644
--- a/library/Icinga/Data/Filter/FilterChain.php
+++ b/library/Icinga/Data/Filter/FilterChain.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
@@ -154,7 +153,7 @@ abstract class FilterChain extends Filter
      *
      * Useful for debugging only
      *
-     * @return string 
+     * @return string
      */
     public function __toString()
     {
@@ -217,5 +216,5 @@ abstract class FilterChain extends Filter
         foreach ($this->filters as & $filter) {
             $filter = clone $filter;
         }
-    } 
+    }
 }
diff --git a/library/Icinga/Data/Filter/FilterEqual.php b/library/Icinga/Data/Filter/FilterEqual.php
index 66e4c06ad..1e567dbf1 100644
--- a/library/Icinga/Data/Filter/FilterEqual.php
+++ b/library/Icinga/Data/Filter/FilterEqual.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php b/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php
index 29c0bfad0..92568178c 100644
--- a/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php
+++ b/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterEqualOrLessThan.php b/library/Icinga/Data/Filter/FilterEqualOrLessThan.php
index 2f8b62265..88e56de1d 100644
--- a/library/Icinga/Data/Filter/FilterEqualOrLessThan.php
+++ b/library/Icinga/Data/Filter/FilterEqualOrLessThan.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterException.php b/library/Icinga/Data/Filter/FilterException.php
index 8f770810f..da28ddbe6 100644
--- a/library/Icinga/Data/Filter/FilterException.php
+++ b/library/Icinga/Data/Filter/FilterException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterExpression.php b/library/Icinga/Data/Filter/FilterExpression.php
index 0782bcd89..379c70045 100644
--- a/library/Icinga/Data/Filter/FilterExpression.php
+++ b/library/Icinga/Data/Filter/FilterExpression.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterGreaterThan.php b/library/Icinga/Data/Filter/FilterGreaterThan.php
index 62ba16fca..386a260c9 100644
--- a/library/Icinga/Data/Filter/FilterGreaterThan.php
+++ b/library/Icinga/Data/Filter/FilterGreaterThan.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterLessThan.php b/library/Icinga/Data/Filter/FilterLessThan.php
index 2ae99098f..478cc47b4 100644
--- a/library/Icinga/Data/Filter/FilterLessThan.php
+++ b/library/Icinga/Data/Filter/FilterLessThan.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterMatch.php b/library/Icinga/Data/Filter/FilterMatch.php
index 159feb04e..2f072742b 100644
--- a/library/Icinga/Data/Filter/FilterMatch.php
+++ b/library/Icinga/Data/Filter/FilterMatch.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterMatchNot.php b/library/Icinga/Data/Filter/FilterMatchNot.php
index 2ce5c2336..f7478cf75 100644
--- a/library/Icinga/Data/Filter/FilterMatchNot.php
+++ b/library/Icinga/Data/Filter/FilterMatchNot.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterNot.php b/library/Icinga/Data/Filter/FilterNot.php
index 5e63691f1..5d1dc8998 100644
--- a/library/Icinga/Data/Filter/FilterNot.php
+++ b/library/Icinga/Data/Filter/FilterNot.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterNotEqual.php b/library/Icinga/Data/Filter/FilterNotEqual.php
index d1a5e9b64..3faf209d2 100644
--- a/library/Icinga/Data/Filter/FilterNotEqual.php
+++ b/library/Icinga/Data/Filter/FilterNotEqual.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterOr.php b/library/Icinga/Data/Filter/FilterOr.php
index 8291d32dc..1c08b9456 100644
--- a/library/Icinga/Data/Filter/FilterOr.php
+++ b/library/Icinga/Data/Filter/FilterOr.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterParseException.php b/library/Icinga/Data/Filter/FilterParseException.php
index 5633b5adf..4210b6561 100644
--- a/library/Icinga/Data/Filter/FilterParseException.php
+++ b/library/Icinga/Data/Filter/FilterParseException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterQueryString.php b/library/Icinga/Data/Filter/FilterQueryString.php
index 3dbcce473..07da8f4f4 100644
--- a/library/Icinga/Data/Filter/FilterQueryString.php
+++ b/library/Icinga/Data/Filter/FilterQueryString.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filterable.php b/library/Icinga/Data/Filterable.php
index 25d1fc9f5..f70c5b9f2 100644
--- a/library/Icinga/Data/Filterable.php
+++ b/library/Icinga/Data/Filterable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Identifiable.php b/library/Icinga/Data/Identifiable.php
index cfa727a1d..520b4f939 100644
--- a/library/Icinga/Data/Identifiable.php
+++ b/library/Icinga/Data/Identifiable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Limitable.php b/library/Icinga/Data/Limitable.php
index 380eae9f9..8ebc37263 100644
--- a/library/Icinga/Data/Limitable.php
+++ b/library/Icinga/Data/Limitable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/PivotTable.php b/library/Icinga/Data/PivotTable.php
index 0a1f009fe..280219b41 100644
--- a/library/Icinga/Data/PivotTable.php
+++ b/library/Icinga/Data/PivotTable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/QueryInterface.php b/library/Icinga/Data/QueryInterface.php
index ef8c7c741..5032e1786 100644
--- a/library/Icinga/Data/QueryInterface.php
+++ b/library/Icinga/Data/QueryInterface.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Queryable.php b/library/Icinga/Data/Queryable.php
index 47f438c4e..7501cd34f 100644
--- a/library/Icinga/Data/Queryable.php
+++ b/library/Icinga/Data/Queryable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/ResourceFactory.php b/library/Icinga/Data/ResourceFactory.php
index 754360740..49adaab46 100644
--- a/library/Icinga/Data/ResourceFactory.php
+++ b/library/Icinga/Data/ResourceFactory.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Selectable.php b/library/Icinga/Data/Selectable.php
index 06aa4f93c..ba7f4aa7f 100644
--- a/library/Icinga/Data/Selectable.php
+++ b/library/Icinga/Data/Selectable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index e865d86fa..3b0279583 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Sortable.php b/library/Icinga/Data/Sortable.php
index f3b8d1c9b..634b1cc4d 100644
--- a/library/Icinga/Data/Sortable.php
+++ b/library/Icinga/Data/Sortable.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Tree/Node.php b/library/Icinga/Data/Tree/Node.php
index b57b0fad4..a4b1ce156 100644
--- a/library/Icinga/Data/Tree/Node.php
+++ b/library/Icinga/Data/Tree/Node.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Tree;
 
diff --git a/library/Icinga/Data/Tree/NodeInterface.php b/library/Icinga/Data/Tree/NodeInterface.php
index 6953214dc..bba6aa84c 100644
--- a/library/Icinga/Data/Tree/NodeInterface.php
+++ b/library/Icinga/Data/Tree/NodeInterface.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Data\Tree;
 
diff --git a/library/Icinga/Exception/AuthenticationException.php b/library/Icinga/Exception/AuthenticationException.php
index ebed296e4..312425003 100644
--- a/library/Icinga/Exception/AuthenticationException.php
+++ b/library/Icinga/Exception/AuthenticationException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/ConfigurationError.php b/library/Icinga/Exception/ConfigurationError.php
index aee601a62..283cb2fab 100644
--- a/library/Icinga/Exception/ConfigurationError.php
+++ b/library/Icinga/Exception/ConfigurationError.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/IcingaException.php b/library/Icinga/Exception/IcingaException.php
index 8443f9c7c..85e639b20 100644
--- a/library/Icinga/Exception/IcingaException.php
+++ b/library/Icinga/Exception/IcingaException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/InvalidPropertyException.php b/library/Icinga/Exception/InvalidPropertyException.php
index f79055f0b..ac8346c2f 100644
--- a/library/Icinga/Exception/InvalidPropertyException.php
+++ b/library/Icinga/Exception/InvalidPropertyException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/MissingParameterException.php b/library/Icinga/Exception/MissingParameterException.php
index b86ff7d8a..cd7f41433 100644
--- a/library/Icinga/Exception/MissingParameterException.php
+++ b/library/Icinga/Exception/MissingParameterException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/NotFoundError.php b/library/Icinga/Exception/NotFoundError.php
index c90b0322b..e3790ca0a 100644
--- a/library/Icinga/Exception/NotFoundError.php
+++ b/library/Icinga/Exception/NotFoundError.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/NotImplementedError.php b/library/Icinga/Exception/NotImplementedError.php
index 1d22236df..61e9249e1 100644
--- a/library/Icinga/Exception/NotImplementedError.php
+++ b/library/Icinga/Exception/NotImplementedError.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/NotReadableError.php b/library/Icinga/Exception/NotReadableError.php
index 41a7ec8fd..cb39beaee 100644
--- a/library/Icinga/Exception/NotReadableError.php
+++ b/library/Icinga/Exception/NotReadableError.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/NotWritableError.php b/library/Icinga/Exception/NotWritableError.php
index cf09d4592..14f3bd81a 100644
--- a/library/Icinga/Exception/NotWritableError.php
+++ b/library/Icinga/Exception/NotWritableError.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/ProgrammingError.php b/library/Icinga/Exception/ProgrammingError.php
index 430d1510f..3a3f0fbf0 100644
--- a/library/Icinga/Exception/ProgrammingError.php
+++ b/library/Icinga/Exception/ProgrammingError.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/QueryException.php b/library/Icinga/Exception/QueryException.php
index beab3fe53..6d6aa038d 100644
--- a/library/Icinga/Exception/QueryException.php
+++ b/library/Icinga/Exception/QueryException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/SystemPermissionException.php b/library/Icinga/Exception/SystemPermissionException.php
index 33dfe596c..8c0e772af 100644
--- a/library/Icinga/Exception/SystemPermissionException.php
+++ b/library/Icinga/Exception/SystemPermissionException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/File/Csv.php b/library/Icinga/File/Csv.php
index fb26d4c11..aead05bc2 100644
--- a/library/Icinga/File/Csv.php
+++ b/library/Icinga/File/Csv.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\File;
 
diff --git a/library/Icinga/File/FileExtensionFilterIterator.php b/library/Icinga/File/FileExtensionFilterIterator.php
index 909156749..7089d0206 100644
--- a/library/Icinga/File/FileExtensionFilterIterator.php
+++ b/library/Icinga/File/FileExtensionFilterIterator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\File;
 
diff --git a/library/Icinga/File/Ini/IniEditor.php b/library/Icinga/File/Ini/IniEditor.php
index 85d71b697..ecf4b8db9 100644
--- a/library/Icinga/File/Ini/IniEditor.php
+++ b/library/Icinga/File/Ini/IniEditor.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\File\Ini;
 
diff --git a/library/Icinga/File/Ini/IniWriter.php b/library/Icinga/File/Ini/IniWriter.php
index 21402ab74..05be71e00 100644
--- a/library/Icinga/File/Ini/IniWriter.php
+++ b/library/Icinga/File/Ini/IniWriter.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\File\Ini;
 
diff --git a/library/Icinga/File/NonEmptyFileIterator.php b/library/Icinga/File/NonEmptyFileIterator.php
index c5c7fda45..961353712 100644
--- a/library/Icinga/File/NonEmptyFileIterator.php
+++ b/library/Icinga/File/NonEmptyFileIterator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\File;
 
diff --git a/library/Icinga/File/Pdf.php b/library/Icinga/File/Pdf.php
index a372cbfdf..4fe53e139 100644
--- a/library/Icinga/File/Pdf.php
+++ b/library/Icinga/File/Pdf.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\File;
 
diff --git a/library/Icinga/Protocol/Dns.php b/library/Icinga/Protocol/Dns.php
index 950c22f44..c64c47616 100644
--- a/library/Icinga/Protocol/Dns.php
+++ b/library/Icinga/Protocol/Dns.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol;
 
diff --git a/library/Icinga/Protocol/File/Exception/FileReaderException.php b/library/Icinga/Protocol/File/Exception/FileReaderException.php
index a7db5d701..b093ecbfb 100644
--- a/library/Icinga/Protocol/File/Exception/FileReaderException.php
+++ b/library/Icinga/Protocol/File/Exception/FileReaderException.php
@@ -1,5 +1,5 @@
 <?php
-
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 namespace Icinga\Protocol\File;
 
 use Icinga\Exception\IcingaException;
diff --git a/library/Icinga/Protocol/File/FileIterator.php b/library/Icinga/Protocol/File/FileIterator.php
index 72c4e0a39..5c4ff0610 100644
--- a/library/Icinga/Protocol/File/FileIterator.php
+++ b/library/Icinga/Protocol/File/FileIterator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\File;
 
diff --git a/library/Icinga/Protocol/File/FileQuery.php b/library/Icinga/Protocol/File/FileQuery.php
index e1b5e65cf..0c70972ff 100644
--- a/library/Icinga/Protocol/File/FileQuery.php
+++ b/library/Icinga/Protocol/File/FileQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\File;
 
diff --git a/library/Icinga/Protocol/File/FileReader.php b/library/Icinga/Protocol/File/FileReader.php
index 363f8e173..ee41eef32 100644
--- a/library/Icinga/Protocol/File/FileReader.php
+++ b/library/Icinga/Protocol/File/FileReader.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\File;
 
diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index a576ab790..6d23854d0 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/Discovery.php b/library/Icinga/Protocol/Ldap/Discovery.php
index b876a5d6f..c8b28f25a 100644
--- a/library/Icinga/Protocol/Ldap/Discovery.php
+++ b/library/Icinga/Protocol/Ldap/Discovery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Ldap;
 
@@ -155,4 +154,4 @@ class Discovery {
         )));
         return new Discovery($conn);
     }
-} 
\ No newline at end of file
+}
diff --git a/library/Icinga/Protocol/Ldap/Exception.php b/library/Icinga/Protocol/Ldap/Exception.php
index 41a5b782b..f238a83c5 100644
--- a/library/Icinga/Protocol/Ldap/Exception.php
+++ b/library/Icinga/Protocol/Ldap/Exception.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/LdapUtils.php b/library/Icinga/Protocol/Ldap/LdapUtils.php
index 8232ebf67..f26c94922 100644
--- a/library/Icinga/Protocol/Ldap/LdapUtils.php
+++ b/library/Icinga/Protocol/Ldap/LdapUtils.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/Node.php b/library/Icinga/Protocol/Ldap/Node.php
index 8e9570d25..37d4d241c 100644
--- a/library/Icinga/Protocol/Ldap/Node.php
+++ b/library/Icinga/Protocol/Ldap/Node.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/Query.php b/library/Icinga/Protocol/Ldap/Query.php
index c6f0d6fa1..41882f682 100644
--- a/library/Icinga/Protocol/Ldap/Query.php
+++ b/library/Icinga/Protocol/Ldap/Query.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/Root.php b/library/Icinga/Protocol/Ldap/Root.php
index 56abb4175..2ae2329ae 100644
--- a/library/Icinga/Protocol/Ldap/Root.php
+++ b/library/Icinga/Protocol/Ldap/Root.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Livestatus/Connection.php b/library/Icinga/Protocol/Livestatus/Connection.php
index b2340eeec..3754afb39 100644
--- a/library/Icinga/Protocol/Livestatus/Connection.php
+++ b/library/Icinga/Protocol/Livestatus/Connection.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Livestatus;
 
@@ -201,7 +200,7 @@ class Connection
             if ($filter !== null && ! $filter->matches($res)) continue;
             $result[] = $res;
         }
-        
+
         if ($query->hasOrder()) {
             usort($result, array($query, 'compare'));
         }
diff --git a/library/Icinga/Protocol/Livestatus/Query.php b/library/Icinga/Protocol/Livestatus/Query.php
index a421c7e71..94380dfa6 100644
--- a/library/Icinga/Protocol/Livestatus/Query.php
+++ b/library/Icinga/Protocol/Livestatus/Query.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Livestatus;
 
@@ -76,7 +75,7 @@ class Query extends SimpleQuery
     {
         // $row -> raw SplArray
         // $res -> object
-        // $cv  -> 
+        // $cv  ->
         // $result -> object to be returned
         $result = (object) array();
         $res = $this->withHeaders($row);
@@ -142,7 +141,7 @@ class Query extends SimpleQuery
             }
         }
 
-     
+
         return $result;
     }
 
@@ -313,7 +312,7 @@ class Query extends SimpleQuery
            } elseif (is_array($col)) {
                foreach ($col as $k) {
                    $columns[$k] = true;
-               }    
+               }
            } else {
                $columns[$col] = true;
            }
diff --git a/library/Icinga/Protocol/Livestatus/ResponseRow.php b/library/Icinga/Protocol/Livestatus/ResponseRow.php
index d4b0fd7cb..9cb67ccf3 100644
--- a/library/Icinga/Protocol/Livestatus/ResponseRow.php
+++ b/library/Icinga/Protocol/Livestatus/ResponseRow.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Livestatus;
 
diff --git a/library/Icinga/Protocol/Nrpe/Connection.php b/library/Icinga/Protocol/Nrpe/Connection.php
index 84a754e91..167d710e6 100644
--- a/library/Icinga/Protocol/Nrpe/Connection.php
+++ b/library/Icinga/Protocol/Nrpe/Connection.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Nrpe;
 
diff --git a/library/Icinga/Protocol/Nrpe/Packet.php b/library/Icinga/Protocol/Nrpe/Packet.php
index 0e722dbff..c7f1e8532 100644
--- a/library/Icinga/Protocol/Nrpe/Packet.php
+++ b/library/Icinga/Protocol/Nrpe/Packet.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Protocol\Nrpe;
 
diff --git a/library/Icinga/Security/SecurityException.php b/library/Icinga/Security/SecurityException.php
index 168d4a9be..db9afea14 100644
--- a/library/Icinga/Security/SecurityException.php
+++ b/library/Icinga/Security/SecurityException.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Security;
 
diff --git a/library/Icinga/Test/BaseTestCase.php b/library/Icinga/Test/BaseTestCase.php
index c70bc5cd9..94018826f 100644
--- a/library/Icinga/Test/BaseTestCase.php
+++ b/library/Icinga/Test/BaseTestCase.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace {
 
diff --git a/library/Icinga/Test/DbTest.php b/library/Icinga/Test/DbTest.php
index cf6887285..f51cdb2f4 100644
--- a/library/Icinga/Test/DbTest.php
+++ b/library/Icinga/Test/DbTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Test;
 
diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index 54b3e7632..a56bd017c 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga;
 
diff --git a/library/Icinga/User/Preferences.php b/library/Icinga/User/Preferences.php
index 364112a9e..49732fea0 100644
--- a/library/Icinga/User/Preferences.php
+++ b/library/Icinga/User/Preferences.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\User;
 
diff --git a/library/Icinga/User/Preferences/PreferencesStore.php b/library/Icinga/User/Preferences/PreferencesStore.php
index 11454a2f8..4fc77003b 100644
--- a/library/Icinga/User/Preferences/PreferencesStore.php
+++ b/library/Icinga/User/Preferences/PreferencesStore.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\User\Preferences;
 
diff --git a/library/Icinga/User/Preferences/Store/DbStore.php b/library/Icinga/User/Preferences/Store/DbStore.php
index 4d7b10584..e5af3f5ba 100644
--- a/library/Icinga/User/Preferences/Store/DbStore.php
+++ b/library/Icinga/User/Preferences/Store/DbStore.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\User\Preferences\Store;
 
diff --git a/library/Icinga/User/Preferences/Store/IniStore.php b/library/Icinga/User/Preferences/Store/IniStore.php
index 1a096ea7b..b65ce3cd5 100644
--- a/library/Icinga/User/Preferences/Store/IniStore.php
+++ b/library/Icinga/User/Preferences/Store/IniStore.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\User\Preferences\Store;
 
diff --git a/library/Icinga/Util/Color.php b/library/Icinga/Util/Color.php
index 8058f0152..a403fe11a 100644
--- a/library/Icinga/Util/Color.php
+++ b/library/Icinga/Util/Color.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/ConfigAwareFactory.php b/library/Icinga/Util/ConfigAwareFactory.php
index 4a40c4200..01512904a 100644
--- a/library/Icinga/Util/ConfigAwareFactory.php
+++ b/library/Icinga/Util/ConfigAwareFactory.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/DateTimeFactory.php b/library/Icinga/Util/DateTimeFactory.php
index 4a482dc0a..2f63fd0f4 100644
--- a/library/Icinga/Util/DateTimeFactory.php
+++ b/library/Icinga/Util/DateTimeFactory.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/Dimension.php b/library/Icinga/Util/Dimension.php
index 2f367483b..44d1a58a4 100644
--- a/library/Icinga/Util/Dimension.php
+++ b/library/Icinga/Util/Dimension.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/EnumeratingFilterIterator.php b/library/Icinga/Util/EnumeratingFilterIterator.php
index 44ef9b0c8..377af1905 100644
--- a/library/Icinga/Util/EnumeratingFilterIterator.php
+++ b/library/Icinga/Util/EnumeratingFilterIterator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/File.php b/library/Icinga/Util/File.php
index 99421b33d..6e4e5d363 100644
--- a/library/Icinga/Util/File.php
+++ b/library/Icinga/Util/File.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/Format.php b/library/Icinga/Util/Format.php
index 0c69fbde4..8cc9c42d7 100644
--- a/library/Icinga/Util/Format.php
+++ b/library/Icinga/Util/Format.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/String.php b/library/Icinga/Util/String.php
index 69fb26927..b47622331 100644
--- a/library/Icinga/Util/String.php
+++ b/library/Icinga/Util/String.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/TimezoneDetect.php b/library/Icinga/Util/TimezoneDetect.php
index 084c3f8e7..b327d6e95 100644
--- a/library/Icinga/Util/TimezoneDetect.php
+++ b/library/Icinga/Util/TimezoneDetect.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/Translator.php b/library/Icinga/Util/Translator.php
index 87d9e4c88..1b11ca005 100644
--- a/library/Icinga/Util/Translator.php
+++ b/library/Icinga/Util/Translator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index 111ee244c..289dd94a9 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 87d293be6..6503e2ff7 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Controller;
 
diff --git a/library/Icinga/Web/Controller/BasePreferenceController.php b/library/Icinga/Web/Controller/BasePreferenceController.php
index f7d45aa5f..19ad8acb8 100644
--- a/library/Icinga/Web/Controller/BasePreferenceController.php
+++ b/library/Icinga/Web/Controller/BasePreferenceController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Controller;
 
diff --git a/library/Icinga/Web/Controller/ControllerTabCollector.php b/library/Icinga/Web/Controller/ControllerTabCollector.php
index 2078d80b2..c1922dcf3 100644
--- a/library/Icinga/Web/Controller/ControllerTabCollector.php
+++ b/library/Icinga/Web/Controller/ControllerTabCollector.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Controller;
 
diff --git a/library/Icinga/Web/Controller/ModuleActionController.php b/library/Icinga/Web/Controller/ModuleActionController.php
index 0f540c2a0..15fd32a07 100644
--- a/library/Icinga/Web/Controller/ModuleActionController.php
+++ b/library/Icinga/Web/Controller/ModuleActionController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Controller;
 
diff --git a/library/Icinga/Web/FileCache.php b/library/Icinga/Web/FileCache.php
index 16c89a2a4..a3b8381c4 100644
--- a/library/Icinga/Web/FileCache.php
+++ b/library/Icinga/Web/FileCache.php
@@ -1,5 +1,5 @@
 <?php
-
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 namespace Icinga\Web;
 
 class FileCache
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index daa6dcf40..88e578fd5 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Form/Decorator/ConditionalHidden.php b/library/Icinga/Web/Form/Decorator/ConditionalHidden.php
index c24f637ba..8911c39b4 100644
--- a/library/Icinga/Web/Form/Decorator/ConditionalHidden.php
+++ b/library/Icinga/Web/Form/Decorator/ConditionalHidden.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Decorator;
 
diff --git a/library/Icinga/Web/Form/Decorator/ElementDoubler.php b/library/Icinga/Web/Form/Decorator/ElementDoubler.php
index 8bedf9492..200880e6d 100644
--- a/library/Icinga/Web/Form/Decorator/ElementDoubler.php
+++ b/library/Icinga/Web/Form/Decorator/ElementDoubler.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Decorator;
 
diff --git a/library/Icinga/Web/Form/Decorator/NoScriptApply.php b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
index 509c3531e..49f6afa6b 100644
--- a/library/Icinga/Web/Form/Decorator/NoScriptApply.php
+++ b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Decorator;
 
diff --git a/library/Icinga/Web/Form/Element/Button.php b/library/Icinga/Web/Form/Element/Button.php
index 1c5499373..d29b1f529 100644
--- a/library/Icinga/Web/Form/Element/Button.php
+++ b/library/Icinga/Web/Form/Element/Button.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php b/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php
index e9bc37edd..0b79a8cb5 100644
--- a/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php
+++ b/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/DateTimePicker.php b/library/Icinga/Web/Form/Element/DateTimePicker.php
index 728262827..2f1eb3da4 100644
--- a/library/Icinga/Web/Form/Element/DateTimePicker.php
+++ b/library/Icinga/Web/Form/Element/DateTimePicker.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/Note.php b/library/Icinga/Web/Form/Element/Note.php
index 37bc127e9..8a96d9602 100644
--- a/library/Icinga/Web/Form/Element/Note.php
+++ b/library/Icinga/Web/Form/Element/Note.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/Number.php b/library/Icinga/Web/Form/Element/Number.php
index 02f0aaad3..b98c3736a 100644
--- a/library/Icinga/Web/Form/Element/Number.php
+++ b/library/Icinga/Web/Form/Element/Number.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/TriStateCheckbox.php b/library/Icinga/Web/Form/Element/TriStateCheckbox.php
index 45763880d..61a29c172 100644
--- a/library/Icinga/Web/Form/Element/TriStateCheckbox.php
+++ b/library/Icinga/Web/Form/Element/TriStateCheckbox.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/FormElement.php b/library/Icinga/Web/Form/FormElement.php
index 690be1acf..06b08bb02 100644
--- a/library/Icinga/Web/Form/FormElement.php
+++ b/library/Icinga/Web/Form/FormElement.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form;
 
diff --git a/library/Icinga/Web/Form/InvalidCSRFTokenException.php b/library/Icinga/Web/Form/InvalidCSRFTokenException.php
index 4e1ae8ba7..ac18db77e 100644
--- a/library/Icinga/Web/Form/InvalidCSRFTokenException.php
+++ b/library/Icinga/Web/Form/InvalidCSRFTokenException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form;
 
diff --git a/library/Icinga/Web/Form/Validator/DateFormatValidator.php b/library/Icinga/Web/Form/Validator/DateFormatValidator.php
index b11629cbf..65715b88b 100644
--- a/library/Icinga/Web/Form/Validator/DateFormatValidator.php
+++ b/library/Icinga/Web/Form/Validator/DateFormatValidator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/DateTimeValidator.php b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
index 6b59d5263..e85544c06 100644
--- a/library/Icinga/Web/Form/Validator/DateTimeValidator.php
+++ b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/ReadablePathValidator.php b/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
index 4060f6ecd..a0fe0c437 100644
--- a/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
+++ b/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/TimeFormatValidator.php b/library/Icinga/Web/Form/Validator/TimeFormatValidator.php
index a02581cfa..f43a42922 100644
--- a/library/Icinga/Web/Form/Validator/TimeFormatValidator.php
+++ b/library/Icinga/Web/Form/Validator/TimeFormatValidator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/TriStateValidator.php b/library/Icinga/Web/Form/Validator/TriStateValidator.php
index e51e00e21..27f754033 100644
--- a/library/Icinga/Web/Form/Validator/TriStateValidator.php
+++ b/library/Icinga/Web/Form/Validator/TriStateValidator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/WritablePathValidator.php b/library/Icinga/Web/Form/Validator/WritablePathValidator.php
index 239ab77c8..c7b7ab0b5 100644
--- a/library/Icinga/Web/Form/Validator/WritablePathValidator.php
+++ b/library/Icinga/Web/Form/Validator/WritablePathValidator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Hook.php b/library/Icinga/Web/Hook.php
index 7ace738d7..b339ce063 100644
--- a/library/Icinga/Web/Hook.php
+++ b/library/Icinga/Web/Hook.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Hook/GrapherHook.php b/library/Icinga/Web/Hook/GrapherHook.php
index a48c50ed6..e1490d5bb 100644
--- a/library/Icinga/Web/Hook/GrapherHook.php
+++ b/library/Icinga/Web/Hook/GrapherHook.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Hook;
 
diff --git a/library/Icinga/Web/Hook/TicketHook.php b/library/Icinga/Web/Hook/TicketHook.php
index bb9a129b4..4481f2c8e 100644
--- a/library/Icinga/Web/Hook/TicketHook.php
+++ b/library/Icinga/Web/Hook/TicketHook.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Hook;
 
diff --git a/library/Icinga/Web/Hook/WebBaseHook.php b/library/Icinga/Web/Hook/WebBaseHook.php
index a901787bb..f151d9c9c 100644
--- a/library/Icinga/Web/Hook/WebBaseHook.php
+++ b/library/Icinga/Web/Hook/WebBaseHook.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Hook;
 
@@ -48,4 +47,4 @@ class WebBaseHook
 
         return $this->view;
     }
-} 
\ No newline at end of file
+}
diff --git a/library/Icinga/Web/JavaScript.php b/library/Icinga/Web/JavaScript.php
index 9fa687042..a8913d3e7 100644
--- a/library/Icinga/Web/JavaScript.php
+++ b/library/Icinga/Web/JavaScript.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/LessCompiler.php b/library/Icinga/Web/LessCompiler.php
index 261790579..347ad8d6f 100644
--- a/library/Icinga/Web/LessCompiler.php
+++ b/library/Icinga/Web/LessCompiler.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index f0279ea9c..38cbba967 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php b/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
index 659709868..0a0f707c2 100644
--- a/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/MenuItemRenderer.php b/library/Icinga/Web/Menu/MenuItemRenderer.php
index da09d7808..6f13f991e 100644
--- a/library/Icinga/Web/Menu/MenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/MenuItemRenderer.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php b/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php
index 3bccb9327..2d89029b0 100644
--- a/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php b/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php
index 58689547f..3022f2c64 100644
--- a/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php b/library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php
index 10a75c00f..dfb43af08 100644
--- a/library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php b/library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php
index 8a59e9baa..9d180ec70 100644
--- a/library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/MenuRenderer.php b/library/Icinga/Web/MenuRenderer.php
index 8502e5215..224a5c525 100644
--- a/library/Icinga/Web/MenuRenderer.php
+++ b/library/Icinga/Web/MenuRenderer.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Notification.php b/library/Icinga/Web/Notification.php
index b046476b3..b34137651 100644
--- a/library/Icinga/Web/Notification.php
+++ b/library/Icinga/Web/Notification.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php b/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
index 03f8f1cc5..5a3edef0a 100644
--- a/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
+++ b/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Paginator\Adapter;
 
diff --git a/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php b/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
index d861dbe29..f0581c42c 100644
--- a/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
+++ b/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * @see Zend_Paginator_ScrollingStyle_Interface
@@ -41,7 +40,7 @@ class Icinga_Web_Paginator_ScrollingStyle_SlidingWithBorder implements Zend_Pagi
                 $range[$i] = $i;
             }
             if ($pageNumber < 6 ) {
-                // We are on page 1-5 from  
+                // We are on page 1-5 from
                 for ($i = 1; $i <= 7; $i++) {
                     $range[$i] = $i;
                 }
diff --git a/library/Icinga/Web/Request.php b/library/Icinga/Web/Request.php
index ae957f6a9..dbc3dcb34 100644
--- a/library/Icinga/Web/Request.php
+++ b/library/Icinga/Web/Request.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Response.php b/library/Icinga/Web/Response.php
index d0d8912e6..6e48b4a6b 100644
--- a/library/Icinga/Web/Response.php
+++ b/library/Icinga/Web/Response.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Session.php b/library/Icinga/Web/Session.php
index 4723903e9..63606bbef 100644
--- a/library/Icinga/Web/Session.php
+++ b/library/Icinga/Web/Session.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Session/PhpSession.php b/library/Icinga/Web/Session/PhpSession.php
index fa545fd8d..32feced21 100644
--- a/library/Icinga/Web/Session/PhpSession.php
+++ b/library/Icinga/Web/Session/PhpSession.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Session;
 
diff --git a/library/Icinga/Web/Session/Session.php b/library/Icinga/Web/Session/Session.php
index ab73dcac7..a89677963 100644
--- a/library/Icinga/Web/Session/Session.php
+++ b/library/Icinga/Web/Session/Session.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Session;
 
diff --git a/library/Icinga/Web/Session/SessionNamespace.php b/library/Icinga/Web/Session/SessionNamespace.php
index c72d69c36..83bc4d61f 100644
--- a/library/Icinga/Web/Session/SessionNamespace.php
+++ b/library/Icinga/Web/Session/SessionNamespace.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Session;
 
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index 9e6bd0bed..1fa450e42 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Url.php b/library/Icinga/Web/Url.php
index a3af4a338..219a081fe 100644
--- a/library/Icinga/Web/Url.php
+++ b/library/Icinga/Web/Url.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/UrlParams.php b/library/Icinga/Web/UrlParams.php
index 1c839960d..3cfd3c1dd 100644
--- a/library/Icinga/Web/UrlParams.php
+++ b/library/Icinga/Web/UrlParams.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
@@ -243,7 +242,7 @@ class UrlParams
         );
         $this->reIndexAll();
 
-        return $this;        
+        return $this;
     }
 
     public function remove($param)
diff --git a/library/Icinga/Web/View.php b/library/Icinga/Web/View.php
index 2122662ac..fe232af86 100644
--- a/library/Icinga/Web/View.php
+++ b/library/Icinga/Web/View.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/View/DateTimeRenderer.php b/library/Icinga/Web/View/DateTimeRenderer.php
index 639befb7f..4c982fa8a 100644
--- a/library/Icinga/Web/View/DateTimeRenderer.php
+++ b/library/Icinga/Web/View/DateTimeRenderer.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\View;
 
diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php
index a203f2fb3..9cd680f4e 100644
--- a/library/Icinga/Web/View/helpers/format.php
+++ b/library/Icinga/Web/View/helpers/format.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\View;
 
diff --git a/library/Icinga/Web/View/helpers/generic.php b/library/Icinga/Web/View/helpers/generic.php
index 8ab934e0e..caae5e34a 100644
--- a/library/Icinga/Web/View/helpers/generic.php
+++ b/library/Icinga/Web/View/helpers/generic.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\View;
 
diff --git a/library/Icinga/Web/View/helpers/url.php b/library/Icinga/Web/View/helpers/url.php
index 901e68803..fd8282889 100644
--- a/library/Icinga/Web/View/helpers/url.php
+++ b/library/Icinga/Web/View/helpers/url.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\View;
 
@@ -63,7 +62,7 @@ $this->addHelperFunction('icon', function ($img, $title = null, array $propertie
         $properties['alt'] = $title;
         $properties['title'] = $title;
     }
- 
+
     if ($class !== null) {
         if (isset($props['class'])) {
             $properties['class'] .= ' ' . $class;
diff --git a/library/Icinga/Web/ViewStream.php b/library/Icinga/Web/ViewStream.php
index e5dacd879..6abf49ac3 100644
--- a/library/Icinga/Web/ViewStream.php
+++ b/library/Icinga/Web/ViewStream.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Widget.php b/library/Icinga/Web/Widget.php
index b181a49ea..facde79e8 100644
--- a/library/Icinga/Web/Widget.php
+++ b/library/Icinga/Web/Widget.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Widget/AbstractWidget.php b/library/Icinga/Web/Widget/AbstractWidget.php
index 5b9d8876b..1984e28e1 100644
--- a/library/Icinga/Web/Widget/AbstractWidget.php
+++ b/library/Icinga/Web/Widget/AbstractWidget.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
index 56de318e8..4f6f17ea8 100644
--- a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
+++ b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Chart;
 
diff --git a/library/Icinga/Web/Widget/Chart/InlinePie.php b/library/Icinga/Web/Widget/Chart/InlinePie.php
index 04e3e7318..310a88b3c 100644
--- a/library/Icinga/Web/Widget/Chart/InlinePie.php
+++ b/library/Icinga/Web/Widget/Chart/InlinePie.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Chart;
 
diff --git a/library/Icinga/Web/Widget/Dashboard.php b/library/Icinga/Web/Widget/Dashboard.php
index bb62cc8f9..b19ccb374 100644
--- a/library/Icinga/Web/Widget/Dashboard.php
+++ b/library/Icinga/Web/Widget/Dashboard.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Dashboard/Dashlet.php b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
index 1b7a7ef95..6317532e8 100644
--- a/library/Icinga/Web/Widget/Dashboard/Dashlet.php
+++ b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Dashboard;
 
diff --git a/library/Icinga/Web/Widget/Dashboard/Pane.php b/library/Icinga/Web/Widget/Dashboard/Pane.php
index 52d9fa524..302306a9b 100644
--- a/library/Icinga/Web/Widget/Dashboard/Pane.php
+++ b/library/Icinga/Web/Widget/Dashboard/Pane.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Dashboard;
 
diff --git a/library/Icinga/Web/Widget/Dashboard/UserWidget.php b/library/Icinga/Web/Widget/Dashboard/UserWidget.php
index 0b171964e..4362d0f12 100644
--- a/library/Icinga/Web/Widget/Dashboard/UserWidget.php
+++ b/library/Icinga/Web/Widget/Dashboard/UserWidget.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Dashboard;
 
diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 4a2fc8d11..c515ee79d 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
@@ -69,7 +68,7 @@ class FilterEditor extends AbstractWidget
     public function getFilter()
     {
         if ($this->filter === null) {
-            $this->filter = Filter::fromQueryString((string) $this->url()->getParams()); 
+            $this->filter = Filter::fromQueryString((string) $this->url()->getParams());
         }
         return $this->filter;
     }
@@ -433,7 +432,7 @@ class FilterEditor extends AbstractWidget
     protected function renderFilterExpression(FilterExpression $filter)
     {
         if ($this->addTo && $this->addTo === $filter->getId()) {
-            return 
+            return
                    preg_replace(
             '/ class="autosubmit"/',
             ' class="autofocus"',
@@ -573,7 +572,7 @@ class FilterEditor extends AbstractWidget
             $cols[$active] = str_replace('_', ' ', ucfirst(ltrim($active, '_')));
         }
 
-        return $this->select($this->elementId('column', $filter), $cols, $active); 
+        return $this->select($this->elementId('column', $filter), $cols, $active);
     }
 
     protected function applyChanges($changes)
diff --git a/library/Icinga/Web/Widget/FilterWidget.php b/library/Icinga/Web/Widget/FilterWidget.php
index cf47ef581..bd79c25e0 100644
--- a/library/Icinga/Web/Widget/FilterWidget.php
+++ b/library/Icinga/Web/Widget/FilterWidget.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
@@ -83,7 +82,7 @@ class FilterWidget extends AbstractWidget
 
 
         // $html .= $this->renderFilter($this->filter);
-        
+
         $editorUrl = clone $url;
         $editorUrl->setParam('modifyFilter', true);
         if  ($this->filter->isEmpty()) {
diff --git a/library/Icinga/Web/Widget/Limiter.php b/library/Icinga/Web/Widget/Limiter.php
index 5afa7e4b8..acc66c885 100644
--- a/library/Icinga/Web/Widget/Limiter.php
+++ b/library/Icinga/Web/Widget/Limiter.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/SearchDashboard.php b/library/Icinga/Web/Widget/SearchDashboard.php
index 9e02f3373..8893b6db1 100644
--- a/library/Icinga/Web/Widget/SearchDashboard.php
+++ b/library/Icinga/Web/Widget/SearchDashboard.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 42e7110cc..6414d37c2 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index 7eb5abeb1..914d91887 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Tabextension/BasketAction.php b/library/Icinga/Web/Widget/Tabextension/BasketAction.php
index 34514f834..1e745edda 100644
--- a/library/Icinga/Web/Widget/Tabextension/BasketAction.php
+++ b/library/Icinga/Web/Widget/Tabextension/BasketAction.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Tabextension;
 
diff --git a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
index 280a9b142..6c5031d42 100644
--- a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
+++ b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Tabextension;
 
diff --git a/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php b/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
index 496fe3495..39343efe9 100644
--- a/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
+++ b/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Tabextension;
 
@@ -37,4 +36,4 @@ class DashboardSettings implements Tabextension
             )
         );
     }
-}
\ No newline at end of file
+}
diff --git a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
index 0b533fd82..d4205ccf2 100644
--- a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
+++ b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Tabextension;
 
diff --git a/library/Icinga/Web/Widget/Tabextension/Tabextension.php b/library/Icinga/Web/Widget/Tabextension/Tabextension.php
index 881668d2e..ed88f772c 100644
--- a/library/Icinga/Web/Widget/Tabextension/Tabextension.php
+++ b/library/Icinga/Web/Widget/Tabextension/Tabextension.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget\Tabextension;
 
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index c6a4bd31b..939782ded 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Widget.php b/library/Icinga/Web/Widget/Widget.php
index 3eda668ce..99c122756 100644
--- a/library/Icinga/Web/Widget/Widget.php
+++ b/library/Icinga/Web/Widget/Widget.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Window.php b/library/Icinga/Web/Window.php
index 3a541d3bb..f5658850c 100644
--- a/library/Icinga/Web/Window.php
+++ b/library/Icinga/Web/Window.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Wizard.php b/library/Icinga/Web/Wizard.php
index 42dea5c1c..026b49541 100644
--- a/library/Icinga/Web/Wizard.php
+++ b/library/Icinga/Web/Wizard.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web;
 
diff --git a/modules/doc/application/controllers/IcingawebController.php b/modules/doc/application/controllers/IcingawebController.php
index 60c5da5ee..a12d8cd8b 100644
--- a/modules/doc/application/controllers/IcingawebController.php
+++ b/modules/doc/application/controllers/IcingawebController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use \Zend_Controller_Action_Exception;
 use Icinga\Application\Icinga;
diff --git a/modules/doc/application/controllers/IndexController.php b/modules/doc/application/controllers/IndexController.php
index 63b5e8cdf..f675d6067 100644
--- a/modules/doc/application/controllers/IndexController.php
+++ b/modules/doc/application/controllers/IndexController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Module\Doc\DocController;
 
diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php
index a4d14cf61..8a7b96fed 100644
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use \Zend_Controller_Action_Exception;
 use Icinga\Application\Icinga;
diff --git a/modules/doc/application/controllers/StyleController.php b/modules/doc/application/controllers/StyleController.php
index d5440c95a..e06835420 100644
--- a/modules/doc/application/controllers/StyleController.php
+++ b/modules/doc/application/controllers/StyleController.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Application\Icinga;
 use Icinga\Web\Controller;
diff --git a/modules/doc/configuration.php b/modules/doc/configuration.php
index 6e924e964..c377eb3c4 100644
--- a/modules/doc/configuration.php
+++ b/modules/doc/configuration.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /** @type $this \Icinga\Application\Modules\Module */
 
diff --git a/modules/doc/library/Doc/DocController.php b/modules/doc/library/Doc/DocController.php
index 0d12f58df..613c3ce56 100644
--- a/modules/doc/library/Doc/DocController.php
+++ b/modules/doc/library/Doc/DocController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/DocIterator.php b/modules/doc/library/Doc/DocIterator.php
index 3045b6309..0268e2054 100644
--- a/modules/doc/library/Doc/DocIterator.php
+++ b/modules/doc/library/Doc/DocIterator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/DocParser.php b/modules/doc/library/Doc/DocParser.php
index 6cfeca418..d9b35c087 100644
--- a/modules/doc/library/Doc/DocParser.php
+++ b/modules/doc/library/Doc/DocParser.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/DocTree.php b/modules/doc/library/Doc/DocTree.php
index 1b112649c..5153c8807 100644
--- a/modules/doc/library/Doc/DocTree.php
+++ b/modules/doc/library/Doc/DocTree.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/Exception/ChapterNotFoundException.php b/modules/doc/library/Doc/Exception/ChapterNotFoundException.php
index cd048a162..e754a2f82 100644
--- a/modules/doc/library/Doc/Exception/ChapterNotFoundException.php
+++ b/modules/doc/library/Doc/Exception/ChapterNotFoundException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc\Exception;
 
diff --git a/modules/doc/library/Doc/Exception/DocEmptyException.php b/modules/doc/library/Doc/Exception/DocEmptyException.php
index 2869e2678..ce5093b25 100644
--- a/modules/doc/library/Doc/Exception/DocEmptyException.php
+++ b/modules/doc/library/Doc/Exception/DocEmptyException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc\Exception;
 
diff --git a/modules/doc/library/Doc/Exception/DocException.php b/modules/doc/library/Doc/Exception/DocException.php
index 374ea3e01..542f3b7a3 100644
--- a/modules/doc/library/Doc/Exception/DocException.php
+++ b/modules/doc/library/Doc/Exception/DocException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc\Exception;
 
diff --git a/modules/doc/library/Doc/Renderer.php b/modules/doc/library/Doc/Renderer.php
index 0aebb89b9..5bb33298e 100644
--- a/modules/doc/library/Doc/Renderer.php
+++ b/modules/doc/library/Doc/Renderer.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/Section.php b/modules/doc/library/Doc/Section.php
index 5cf3d61e2..77f7a94a8 100644
--- a/modules/doc/library/Doc/Section.php
+++ b/modules/doc/library/Doc/Section.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/SectionFilterIterator.php b/modules/doc/library/Doc/SectionFilterIterator.php
index e20d80359..a12aa56ea 100644
--- a/modules/doc/library/Doc/SectionFilterIterator.php
+++ b/modules/doc/library/Doc/SectionFilterIterator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/SectionRenderer.php b/modules/doc/library/Doc/SectionRenderer.php
index f923783f6..70a53dd9c 100644
--- a/modules/doc/library/Doc/SectionRenderer.php
+++ b/modules/doc/library/Doc/SectionRenderer.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/TocRenderer.php b/modules/doc/library/Doc/TocRenderer.php
index 4061e80e3..d5f022229 100644
--- a/modules/doc/library/Doc/TocRenderer.php
+++ b/modules/doc/library/Doc/TocRenderer.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/public/css/module.less b/modules/doc/public/css/module.less
index a029517de..876328ff9 100644
--- a/modules/doc/public/css/module.less
+++ b/modules/doc/public/css/module.less
@@ -1,3 +1,5 @@
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+
 div.chapter {
   padding-left: 5px;
 }
diff --git a/modules/doc/run.php b/modules/doc/run.php
index 31aff8ff0..9854e0afc 100644
--- a/modules/doc/run.php
+++ b/modules/doc/run.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use \Zend_Controller_Router_Route;
 use Icinga\Application\Icinga;
diff --git a/modules/monitoring/application/clicommands/ConferenceCommand.php b/modules/monitoring/application/clicommands/ConferenceCommand.php
index 7c659e8fb..6db032a17 100644
--- a/modules/monitoring/application/clicommands/ConferenceCommand.php
+++ b/modules/monitoring/application/clicommands/ConferenceCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Clicommands;
 
diff --git a/modules/monitoring/application/clicommands/ListCommand.php b/modules/monitoring/application/clicommands/ListCommand.php
index a4f1d05f1..c962ceb34 100644
--- a/modules/monitoring/application/clicommands/ListCommand.php
+++ b/modules/monitoring/application/clicommands/ListCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Clicommands;
 
diff --git a/modules/monitoring/application/clicommands/NrpeCommand.php b/modules/monitoring/application/clicommands/NrpeCommand.php
index 69ee50d9b..677fd68d0 100644
--- a/modules/monitoring/application/clicommands/NrpeCommand.php
+++ b/modules/monitoring/application/clicommands/NrpeCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Clicommands;
 
diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index d9cc798a7..4d711ade9 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Chart\GridChart;
 use Icinga\Chart\Unit\LinearUnit;
diff --git a/modules/monitoring/application/controllers/ChartController.php b/modules/monitoring/application/controllers/ChartController.php
index 757329bfe..005424209 100644
--- a/modules/monitoring/application/controllers/ChartController.php
+++ b/modules/monitoring/application/controllers/ChartController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Chart\GridChart;
diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index ed5d57570..5bd74cd45 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Web\Notification;
 use Icinga\Data\ResourceFactory;
diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index 150f9ae1a..deee63d49 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 3235a7012..862ba529f 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Data\Filter\Filter;
 use Icinga\Module\Monitoring\Controller;
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index faaea713a..3cc2c3549 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Backend;
diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php
index 5530f9c52..ab45cad96 100644
--- a/modules/monitoring/application/controllers/ProcessController.php
+++ b/modules/monitoring/application/controllers/ProcessController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Forms\Command\Instance\DisableNotificationsExpireCommandForm;
diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index 4e4e67402..2d5728104 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 467f04bec..600979eb6 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Data\Filter\Filter;
 use Icinga\Module\Monitoring\Controller;
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 0b7a2f897..173dd4e75 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Application\Benchmark;
 use Icinga\Module\Monitoring\Object\MonitoredObject;
diff --git a/modules/monitoring/application/controllers/TacticalController.php b/modules/monitoring/application/controllers/TacticalController.php
index a48e053ca..1318ada9f 100644
--- a/modules/monitoring/application/controllers/TacticalController.php
+++ b/modules/monitoring/application/controllers/TacticalController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Module\Monitoring\Controller as MonitoringController;
 use Icinga\Web\Url;
diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php
index e21c580ad..012a59c09 100644
--- a/modules/monitoring/application/controllers/TimelineController.php
+++ b/modules/monitoring/application/controllers/TimelineController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use \DateTime;
 use \DateInterval;
diff --git a/modules/monitoring/application/forms/Command/CommandForm.php b/modules/monitoring/application/forms/Command/CommandForm.php
index fd67e140d..05318c0e4 100644
--- a/modules/monitoring/application/forms/Command/CommandForm.php
+++ b/modules/monitoring/application/forms/Command/CommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command;
 
diff --git a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
index 21d926b58..c6e3e5225 100644
--- a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Instance;
 
diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index 60486307e..65b958f8b 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Instance;
 
diff --git a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
index df3731837..b5adac042 100644
--- a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
index e7f7e91f9..6491077d1 100644
--- a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
index 1054aae05..2b873b092 100644
--- a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
index 0f7858ad9..88f28e676 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
index 43ca52b05..348acc8f4 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php b/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php
index 1dbf07840..331ec8931 100644
--- a/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
index 44e248956..5b1f3236b 100644
--- a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php b/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php
index 189261c94..47fe6d1fd 100644
--- a/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
index 949ec33e1..324e79536 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
index f84069a9a..6b304b5ff 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
index 4921f54ff..c17fe588a 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
index 4f66898f6..d01268988 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
index d3cc63ecf..d4f7a1735 100644
--- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index ca45c068b..969049642 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Config;
 
diff --git a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
index 405bac144..51e94b3fc 100644
--- a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Config\Instance;
 
diff --git a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
index 47b2a0316..367093101 100644
--- a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Config\Instance;
 
diff --git a/modules/monitoring/application/forms/Config/InstanceConfigForm.php b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
index 5618f27ee..d08a451ee 100644
--- a/modules/monitoring/application/forms/Config/InstanceConfigForm.php
+++ b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Config;
 
diff --git a/modules/monitoring/application/forms/Config/SecurityConfigForm.php b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
index b202f5938..4613d84f1 100644
--- a/modules/monitoring/application/forms/Config/SecurityConfigForm.php
+++ b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Config;
 
diff --git a/modules/monitoring/application/forms/EventOverviewForm.php b/modules/monitoring/application/forms/EventOverviewForm.php
index dc697b940..a1e95d3c0 100644
--- a/modules/monitoring/application/forms/EventOverviewForm.php
+++ b/modules/monitoring/application/forms/EventOverviewForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms;
 
diff --git a/modules/monitoring/application/forms/Setup/BackendPage.php b/modules/monitoring/application/forms/Setup/BackendPage.php
index b5ab2ffd6..ee160f978 100644
--- a/modules/monitoring/application/forms/Setup/BackendPage.php
+++ b/modules/monitoring/application/forms/Setup/BackendPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/IdoResourcePage.php b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
index c28b52e6b..cced78378 100644
--- a/modules/monitoring/application/forms/Setup/IdoResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/InstancePage.php b/modules/monitoring/application/forms/Setup/InstancePage.php
index 8f151554d..9d7b24f07 100644
--- a/modules/monitoring/application/forms/Setup/InstancePage.php
+++ b/modules/monitoring/application/forms/Setup/InstancePage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
index 245d2abcc..d010fa36f 100644
--- a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/SecurityPage.php b/modules/monitoring/application/forms/Setup/SecurityPage.php
index ba8083e50..935419250 100644
--- a/modules/monitoring/application/forms/Setup/SecurityPage.php
+++ b/modules/monitoring/application/forms/Setup/SecurityPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/WelcomePage.php b/modules/monitoring/application/forms/Setup/WelcomePage.php
index f79eb6c62..5a5a3665f 100644
--- a/modules/monitoring/application/forms/Setup/WelcomePage.php
+++ b/modules/monitoring/application/forms/Setup/WelcomePage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/StatehistoryForm.php b/modules/monitoring/application/forms/StatehistoryForm.php
index d859f5815..bfb4b608a 100644
--- a/modules/monitoring/application/forms/StatehistoryForm.php
+++ b/modules/monitoring/application/forms/StatehistoryForm.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Forms;
 
diff --git a/modules/monitoring/application/views/helpers/CheckPerformance.php b/modules/monitoring/application/views/helpers/CheckPerformance.php
index 19912d3d6..9d56e400a 100644
--- a/modules/monitoring/application/views/helpers/CheckPerformance.php
+++ b/modules/monitoring/application/views/helpers/CheckPerformance.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Convert check summary data into a simple usable stdClass
diff --git a/modules/monitoring/application/views/helpers/ContactFlags.php b/modules/monitoring/application/views/helpers/ContactFlags.php
index da2b2823a..76828ee24 100644
--- a/modules/monitoring/application/views/helpers/ContactFlags.php
+++ b/modules/monitoring/application/views/helpers/ContactFlags.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 class Zend_View_Helper_ContactFlags extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/application/views/helpers/Customvar.php b/modules/monitoring/application/views/helpers/Customvar.php
index 699c6a727..2ab663fa2 100644
--- a/modules/monitoring/application/views/helpers/Customvar.php
+++ b/modules/monitoring/application/views/helpers/Customvar.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 class Zend_View_Helper_Customvar extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/application/views/helpers/Link.php b/modules/monitoring/application/views/helpers/Link.php
index 0d8c35861..40cca5925 100644
--- a/modules/monitoring/application/views/helpers/Link.php
+++ b/modules/monitoring/application/views/helpers/Link.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Helper for generating frequently used jump links
diff --git a/modules/monitoring/application/views/helpers/MonitoringFlags.php b/modules/monitoring/application/views/helpers/MonitoringFlags.php
index db4b8dedc..c64ac48fa 100644
--- a/modules/monitoring/application/views/helpers/MonitoringFlags.php
+++ b/modules/monitoring/application/views/helpers/MonitoringFlags.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /* use Icinga\Module\Monitoring\Object\MonitoredObject; */
 
diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 4c2bee89a..e3b92510f 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Util\Format;
 use Icinga\Web\Widget\Chart\InlinePie;
diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
index e3d88b26f..90f565978 100644
--- a/modules/monitoring/application/views/helpers/PluginOutput.php
+++ b/modules/monitoring/application/views/helpers/PluginOutput.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/application/views/helpers/ResolveMacros.php b/modules/monitoring/application/views/helpers/ResolveMacros.php
index 385962a85..d95245d18 100644
--- a/modules/monitoring/application/views/helpers/ResolveMacros.php
+++ b/modules/monitoring/application/views/helpers/ResolveMacros.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use \Zend_View_Helper_Abstract;
 use Icinga\Module\Monitoring\Object\MonitoredObject;
diff --git a/modules/monitoring/application/views/helpers/RuntimeVariables.php b/modules/monitoring/application/views/helpers/RuntimeVariables.php
index 556bd43ad..21f2c7c6f 100644
--- a/modules/monitoring/application/views/helpers/RuntimeVariables.php
+++ b/modules/monitoring/application/views/helpers/RuntimeVariables.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Convert runtime summary data into a simple usable stdClass
diff --git a/modules/monitoring/application/views/helpers/SelectionToolbar.php b/modules/monitoring/application/views/helpers/SelectionToolbar.php
index 0b4254522..2905469b9 100644
--- a/modules/monitoring/application/views/helpers/SelectionToolbar.php
+++ b/modules/monitoring/application/views/helpers/SelectionToolbar.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 class Zend_View_Helper_SelectionToolbar extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index f34b4b0f5..09be0920a 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /** @type $this \Icinga\Application\Modules\Module */
 
diff --git a/modules/monitoring/library/Monitoring/Backend.php b/modules/monitoring/library/Monitoring/Backend.php
index e3672dcd5..7bea95896 100644
--- a/modules/monitoring/library/Monitoring/Backend.php
+++ b/modules/monitoring/library/Monitoring/Backend.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 // TODO: obsolete, remove once MonitoringBackend is in use everywhere
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/IdoBackend.php b/modules/monitoring/library/Monitoring/Backend/Ido/IdoBackend.php
index 17bfb9f6a..2b7fa89fa 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/IdoBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/IdoBackend.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php
index 811eb7f28..a2070f453 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommandQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommandQuery.php
index c730c078e..62e031dda 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommandQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommandQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
@@ -59,4 +58,4 @@ class CommandQuery extends IdoQuery
             array()
         );
     }
-}
\ No newline at end of file
+}
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
index a522d702e..0f78eef9e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
index 4ee17de6a..ba21e11a8 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
index e3231d932..e851fddcd 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
index 467e40fc0..3f2902e9d 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
index 346f2458a..7fb6d2dd6 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
index 04e17ddcd..63151d06c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index efc10f6a5..985f091ab 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
index f9ec831a7..cb69d3a80 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
index 01c56cd4d..775f9da86 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index 2896f9536..0b17df375 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
index 88a120db2..b853f86d9 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
index 53c1d7ed7..a59e873ed 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
index eedb2f1e9..10e5b1f7c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index 7cca01d31..b6e08b731 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index dfc2b885a..391048ceb 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index 3181eebbf..958840a49 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
index 4bf712f4c..1a203d232 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
index 989c2b698..c53e766ab 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php
index cf3b6ea6d..bb00883f7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php
index 479142547..5878d16be 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
index 84ad94b86..6443eab00 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
index dfa81b1ef..e22543411 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index cd7d0aef7..fc0616227 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
index 29337e65f..a941b32ed 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/LivestatusBackend.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/LivestatusBackend.php
index 12de5a9ee..cabe3dcc1 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/LivestatusBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/LivestatusBackend.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/DowntimeQuery.php
index 59f0bb24a..6394e3696 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/DowntimeQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/HostgroupQuery.php
index 0ffc821bb..79aeb7051 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/HostgroupQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/ServicegroupQuery.php
index 0587f7cea..4a65c05f1 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/ServicegroupQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
index 5a638c9ca..613ab2276 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusSummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusSummaryQuery.php
index f431a566e..7aab807b1 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusSummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusSummaryQuery.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
@@ -13,7 +12,7 @@ class StatusSummaryQuery extends Query
 
     protected $available_columns = array(
     'service_host_name' => 'host_name',
-    
+
             'services_total'                            => 'state != 9999',
             'services_problem'                          => 'state > 0',
             'services_problem_handled'                  => 'state > 0 & (scheduled_downtime_depth > 0 | acknowledged = 1 | host_state > 0)',
@@ -50,7 +49,7 @@ if (! array_key_exists($col, $this->available_columns)) {
   throw new ProgrammingError('No such column: %s', $col);
 }
               $filter = $this->filterStringToFilter($this->available_columns[$col]);
-              
+
               //Filter::fromQueryString(str_replace(' ', '',  $this->available_columns[$col]));
               $parts[] = $this->renderFilter( $filter, 'Stats', 0, false);
           }
diff --git a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
index d165f1252..0a1baad7d 100644
--- a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Backend;
 
diff --git a/modules/monitoring/library/Monitoring/BackendStep.php b/modules/monitoring/library/Monitoring/BackendStep.php
index 7f9fc11cf..4df52ca3f 100644
--- a/modules/monitoring/library/Monitoring/BackendStep.php
+++ b/modules/monitoring/library/Monitoring/BackendStep.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Cli/CliUtils.php b/modules/monitoring/library/Monitoring/Cli/CliUtils.php
index 5b443c714..e1ef52691 100644
--- a/modules/monitoring/library/Monitoring/Cli/CliUtils.php
+++ b/modules/monitoring/library/Monitoring/Cli/CliUtils.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Cli;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php b/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
index 440f21770..b65ede3cd 100644
--- a/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
+++ b/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Exception;
 
diff --git a/modules/monitoring/library/Monitoring/Command/IcingaCommand.php b/modules/monitoring/library/Monitoring/Command/IcingaCommand.php
index 3b569de8e..cc1ff7614 100644
--- a/modules/monitoring/library/Monitoring/Command/IcingaCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/IcingaCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php b/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php
index 309cb9e2f..97936dfc7 100644
--- a/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Instance;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php
index 01b26a009..1aa50be1b 100644
--- a/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Instance;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php b/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php
index 4dff07c4a..7eea6d08c 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php
index a7540f4f8..e986dd4a5 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
index 850566ff9..074b134e7 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
index 67e271dbb..0387c1d63 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php
index 1c8910066..2de2bde02 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php
index 8e3155de5..eaa0184c7 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntimeCommand.php
index 89591c8fc..78753e684 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntimeCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php b/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php
index 6f9f99432..2451f4dfb 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php
index ead8f7a30..4c210ee01 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php
index ea7e31dc6..132847363 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
index fc2037146..7e041e09d 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php
index 24be3512b..78a5add50 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php
index c6cbeaa50..7d12849e4 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php
index 695c53cc6..ce912955d 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
index 651383255..d8e643fb2 100644
--- a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Renderer;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php
index f901e3850..ec40c0b16 100644
--- a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Renderer;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
index 8ed7d45eb..ea2d0d026 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
index 21b532d49..ca8de3c0e 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
index 73a2e5288..96b788021 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
index 0e447a4f3..46a9e9a55 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php
index f294e9a2e..5cce6c8d6 100644
--- a/modules/monitoring/library/Monitoring/Controller.php
+++ b/modules/monitoring/library/Monitoring/Controller.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Command.php b/modules/monitoring/library/Monitoring/DataView/Command.php
index a21c48ee0..429353ec4 100644
--- a/modules/monitoring/library/Monitoring/DataView/Command.php
+++ b/modules/monitoring/library/Monitoring/DataView/Command.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
@@ -25,4 +24,4 @@ class Command extends DataView
         );
     }
 
-} 
\ No newline at end of file
+}
diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index 4cd11e1a1..785dd802f 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Contact.php b/modules/monitoring/library/Monitoring/DataView/Contact.php
index 27639b0c6..90542db6a 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contact.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contact.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
index 7dd7a1cd4..abd94b88d 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Customvar.php b/modules/monitoring/library/Monitoring/DataView/Customvar.php
index 0a8887fde..273944bc7 100644
--- a/modules/monitoring/library/Monitoring/DataView/Customvar.php
+++ b/modules/monitoring/library/Monitoring/DataView/Customvar.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index da48f31c3..09a6cd5b8 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index 681608b17..0d4873e95 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/EventHistory.php b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
index f13815aae..f1bb18476 100644
--- a/modules/monitoring/library/Monitoring/DataView/EventHistory.php
+++ b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
index 726f1ae60..e89d2c46d 100644
--- a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
+++ b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
index a4736e47c..44c476e80 100644
--- a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index 86bff52bf..79afffaec 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroup.php b/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
index 94fc7ac56..03c1bb508 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php
index 7f6fd238f..ef6895a10 100644
--- a/modules/monitoring/library/Monitoring/DataView/Notification.php
+++ b/modules/monitoring/library/Monitoring/DataView/Notification.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Programstatus.php b/modules/monitoring/library/Monitoring/DataView/Programstatus.php
index f42858bf8..0c01122eb 100644
--- a/modules/monitoring/library/Monitoring/DataView/Programstatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/Programstatus.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php b/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php
index d9d15a517..8d5bc7cdb 100644
--- a/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php b/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php
index dbdd338c0..5fbf7ea17 100644
--- a/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php
+++ b/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index e7e2accb2..e6a2835a0 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroup.php b/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
index 00a6f7d5f..f88075d33 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/StatusSummary.php b/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
index 74574bc72..209ec8d08 100644
--- a/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/Environment.php b/modules/monitoring/library/Monitoring/Environment.php
index f9ad28654..0fb92a09b 100644
--- a/modules/monitoring/library/Monitoring/Environment.php
+++ b/modules/monitoring/library/Monitoring/Environment.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php b/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php
index 169fa2cfd..4368d8634 100644
--- a/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php
+++ b/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 
 namespace Icinga\Module\Monitoring\Exception;
diff --git a/modules/monitoring/library/Monitoring/InstanceStep.php b/modules/monitoring/library/Monitoring/InstanceStep.php
index ab54b6548..f1c09c899 100644
--- a/modules/monitoring/library/Monitoring/InstanceStep.php
+++ b/modules/monitoring/library/Monitoring/InstanceStep.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index 68d686e21..fd7d7d42b 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 8f7df07cb..c38e68d60 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/HostList.php b/modules/monitoring/library/Monitoring/Object/HostList.php
index 2d3f57495..2bbcb985f 100644
--- a/modules/monitoring/library/Monitoring/Object/HostList.php
+++ b/modules/monitoring/library/Monitoring/Object/HostList.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 213cf47b8..68930efca 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/ObjectList.php b/modules/monitoring/library/Monitoring/Object/ObjectList.php
index 6eb1e4db3..cf45eeade 100644
--- a/modules/monitoring/library/Monitoring/Object/ObjectList.php
+++ b/modules/monitoring/library/Monitoring/Object/ObjectList.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 870ff78ba..5216fdb9c 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/ServiceList.php b/modules/monitoring/library/Monitoring/Object/ServiceList.php
index 858d04b5b..bc324d2be 100644
--- a/modules/monitoring/library/Monitoring/Object/ServiceList.php
+++ b/modules/monitoring/library/Monitoring/Object/ServiceList.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Plugin.php b/modules/monitoring/library/Monitoring/Plugin.php
index ad53f7756..3aa466341 100644
--- a/modules/monitoring/library/Monitoring/Plugin.php
+++ b/modules/monitoring/library/Monitoring/Plugin.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
index f51801192..a58457490 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Plugin;
 
diff --git a/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php b/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
index c62904bb3..ffd9ddb55 100644
--- a/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
+++ b/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Plugin;
 
diff --git a/modules/monitoring/library/Monitoring/SecurityStep.php b/modules/monitoring/library/Monitoring/SecurityStep.php
index b3eda02c4..c187eb8e7 100644
--- a/modules/monitoring/library/Monitoring/SecurityStep.php
+++ b/modules/monitoring/library/Monitoring/SecurityStep.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring;
 
@@ -75,4 +74,4 @@ class SecurityStep extends Step
                 . '</p><p>' . $this->error->getMessage() . '</p>';
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php b/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php
index bd83a42cd..112bd1e8b 100644
--- a/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php
+++ b/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Timeline;
 
diff --git a/modules/monitoring/library/Monitoring/Timeline/TimeLine.php b/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
index 93dc5a0ef..c61dc4283 100644
--- a/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
+++ b/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Timeline;
 
diff --git a/modules/monitoring/library/Monitoring/Timeline/TimeRange.php b/modules/monitoring/library/Monitoring/Timeline/TimeRange.php
index 7ea4787b8..2e32fbca3 100644
--- a/modules/monitoring/library/Monitoring/Timeline/TimeRange.php
+++ b/modules/monitoring/library/Monitoring/Timeline/TimeRange.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Timeline;
 
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index a71273506..cd2ed175f 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Web\Controller;
 
diff --git a/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php b/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
index 5025c414c..8f54a1d7c 100644
--- a/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
+++ b/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Web\Hook;
 
diff --git a/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php b/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php
index e265086ab..2d5e4a8ac 100644
--- a/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php
+++ b/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Web\Hook;
 
diff --git a/modules/monitoring/library/Monitoring/Web/Widget/SelectBox.php b/modules/monitoring/library/Monitoring/Web/Widget/SelectBox.php
index c58540faf..97066e1ac 100644
--- a/modules/monitoring/library/Monitoring/Web/Widget/SelectBox.php
+++ b/modules/monitoring/library/Monitoring/Web/Widget/SelectBox.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Monitoring\Web\Widget;
 
@@ -76,7 +75,7 @@ class SelectBox extends AbstractWidget
      *
      * @param   Request     $request    The request to fetch the value from
      *
-     * @return  string|null     
+     * @return  string|null
      */
     public function getInterval(Request $request = null)
     {
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 82ee0b629..5348f87a3 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 h1 {
     font-size: 1em;
@@ -34,7 +33,7 @@ p.pluginoutput {
 
 div.pluginoutput {
   border-right: solid 5px @colorPetrol;
-  overflow: auto; 
+  overflow: auto;
   color: black;
   margin-bottom: 1em;
   padding: 0.2em;
@@ -198,4 +197,4 @@ h1.command-title {
 hr.command-separator {
   border: none;
   border-bottom: 2px solid @colorPetrol;
-}
\ No newline at end of file
+}
diff --git a/modules/monitoring/public/js/module.js b/modules/monitoring/public/js/module.js
index b3ba863ff..0edfda766 100644
--- a/modules/monitoring/public/js/module.js
+++ b/modules/monitoring/public/js/module.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 (function(Icinga) {
 
diff --git a/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php b/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php
index f50b07893..ee6f8e759 100644
--- a/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php
+++ b/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Module\Monitoring\Application\Views\Helpers;
 
diff --git a/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php b/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
index a14f64ae7..0a46e8226 100644
--- a/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
+++ b/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Modules\Monitoring\Application\Views\Helpers;
 
diff --git a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php
index 3edd20857..b3e3c302e 100644
--- a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php
+++ b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Module\Monitoring\Plugin;
 
diff --git a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php
index 9cc132eb2..e7beed43e 100644
--- a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php
+++ b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Module\Monitoring\Plugin;
 
diff --git a/modules/monitoring/test/php/regression/Bug6088Test.php b/modules/monitoring/test/php/regression/Bug6088Test.php
index 0a4f60a58..e26474720 100644
--- a/modules/monitoring/test/php/regression/Bug6088Test.php
+++ b/modules/monitoring/test/php/regression/Bug6088Test.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Regression;
 
diff --git a/modules/monitoring/test/php/regression/Bug7043Test.php b/modules/monitoring/test/php/regression/Bug7043Test.php
index 94a60a5b6..f6b7ded74 100644
--- a/modules/monitoring/test/php/regression/Bug7043Test.php
+++ b/modules/monitoring/test/php/regression/Bug7043Test.php
@@ -1,4 +1,5 @@
 <?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Module\Monitoring\Regression;
 
@@ -57,4 +58,4 @@ class Bug7043Test extends BaseTestCase
 
         $this->assertEquals('backendName', $defaultBackend->getName(), 'Default backend has name set');
     }
-}
\ No newline at end of file
+}
diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index e63e770b8..f9a73aba4 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Clicommands;
 
diff --git a/modules/setup/application/clicommands/TokenCommand.php b/modules/setup/application/clicommands/TokenCommand.php
index 6f6e2b08e..e9f6007b7 100644
--- a/modules/setup/application/clicommands/TokenCommand.php
+++ b/modules/setup/application/clicommands/TokenCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Clicommands;
 
diff --git a/modules/setup/application/controllers/IndexController.php b/modules/setup/application/controllers/IndexController.php
index 113886c88..2dcb6ea5a 100644
--- a/modules/setup/application/controllers/IndexController.php
+++ b/modules/setup/application/controllers/IndexController.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Module\Setup\WebWizard;
diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 3b2e6ec9f..667a1c758 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index b123b5906..333eda18f 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
index f51ef946a..fdbca1683 100644
--- a/modules/setup/application/forms/AuthenticationPage.php
+++ b/modules/setup/application/forms/AuthenticationPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php
index 3b9ae649b..ac41f4a1e 100644
--- a/modules/setup/application/forms/DatabaseCreationPage.php
+++ b/modules/setup/application/forms/DatabaseCreationPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php
index 1901d8ca9..f512e0288 100644
--- a/modules/setup/application/forms/DbResourcePage.php
+++ b/modules/setup/application/forms/DbResourcePage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/GeneralConfigPage.php b/modules/setup/application/forms/GeneralConfigPage.php
index e0a9d0fab..cd66db496 100644
--- a/modules/setup/application/forms/GeneralConfigPage.php
+++ b/modules/setup/application/forms/GeneralConfigPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
index 66fd39001..54fb86401 100644
--- a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/LdapDiscoveryPage.php b/modules/setup/application/forms/LdapDiscoveryPage.php
index 26b43803b..3306e0395 100644
--- a/modules/setup/application/forms/LdapDiscoveryPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/LdapResourcePage.php b/modules/setup/application/forms/LdapResourcePage.php
index f003a7370..c0898c8b5 100644
--- a/modules/setup/application/forms/LdapResourcePage.php
+++ b/modules/setup/application/forms/LdapResourcePage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/ModulePage.php b/modules/setup/application/forms/ModulePage.php
index ef765c0e7..d41007553 100644
--- a/modules/setup/application/forms/ModulePage.php
+++ b/modules/setup/application/forms/ModulePage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
index 01b3296f4..b07ca6406 100644
--- a/modules/setup/application/forms/PreferencesPage.php
+++ b/modules/setup/application/forms/PreferencesPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/RequirementsPage.php b/modules/setup/application/forms/RequirementsPage.php
index ec4405459..5f063a86c 100644
--- a/modules/setup/application/forms/RequirementsPage.php
+++ b/modules/setup/application/forms/RequirementsPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/SummaryPage.php b/modules/setup/application/forms/SummaryPage.php
index 9b42ec9d8..83673b573 100644
--- a/modules/setup/application/forms/SummaryPage.php
+++ b/modules/setup/application/forms/SummaryPage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/WelcomePage.php b/modules/setup/application/forms/WelcomePage.php
index 66340ff25..455dabc80 100644
--- a/modules/setup/application/forms/WelcomePage.php
+++ b/modules/setup/application/forms/WelcomePage.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/library/Setup/Exception/SetupException.php b/modules/setup/library/Setup/Exception/SetupException.php
index da5eed17c..46d4d5d70 100644
--- a/modules/setup/library/Setup/Exception/SetupException.php
+++ b/modules/setup/library/Setup/Exception/SetupException.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Exception;
 
@@ -13,4 +12,4 @@ use Icinga\Exception\IcingaException;
  */
 class SetupException extends IcingaException
 {
-}
\ No newline at end of file
+}
diff --git a/modules/setup/library/Setup/Requirements.php b/modules/setup/library/Setup/Requirements.php
index ab9e693e5..13d42ce6e 100644
--- a/modules/setup/library/Setup/Requirements.php
+++ b/modules/setup/library/Setup/Requirements.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Setup.php b/modules/setup/library/Setup/Setup.php
index ec5117c9a..da19d0a82 100644
--- a/modules/setup/library/Setup/Setup.php
+++ b/modules/setup/library/Setup/Setup.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/SetupWizard.php b/modules/setup/library/Setup/SetupWizard.php
index 754207276..e4676f26f 100644
--- a/modules/setup/library/Setup/SetupWizard.php
+++ b/modules/setup/library/Setup/SetupWizard.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Step.php b/modules/setup/library/Setup/Step.php
index 720597fd1..afd50a982 100644
--- a/modules/setup/library/Setup/Step.php
+++ b/modules/setup/library/Setup/Step.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
index c06b4e294..407ef4182 100644
--- a/modules/setup/library/Setup/Steps/AuthenticationStep.php
+++ b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Steps;
 
diff --git a/modules/setup/library/Setup/Steps/DatabaseStep.php b/modules/setup/library/Setup/Steps/DatabaseStep.php
index 006b6c9ed..aed3b3e36 100644
--- a/modules/setup/library/Setup/Steps/DatabaseStep.php
+++ b/modules/setup/library/Setup/Steps/DatabaseStep.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Steps;
 
diff --git a/modules/setup/library/Setup/Steps/GeneralConfigStep.php b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
index bf3d8cb89..ca5b755c4 100644
--- a/modules/setup/library/Setup/Steps/GeneralConfigStep.php
+++ b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Steps;
 
diff --git a/modules/setup/library/Setup/Steps/ResourceStep.php b/modules/setup/library/Setup/Steps/ResourceStep.php
index aae1c3aca..0107f4576 100644
--- a/modules/setup/library/Setup/Steps/ResourceStep.php
+++ b/modules/setup/library/Setup/Steps/ResourceStep.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Steps;
 
diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index 63184acd0..55aea73b8 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Utils;
 
diff --git a/modules/setup/library/Setup/Utils/EnableModuleStep.php b/modules/setup/library/Setup/Utils/EnableModuleStep.php
index a23e532f2..c33a92774 100644
--- a/modules/setup/library/Setup/Utils/EnableModuleStep.php
+++ b/modules/setup/library/Setup/Utils/EnableModuleStep.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Utils;
 
diff --git a/modules/setup/library/Setup/Utils/MakeDirStep.php b/modules/setup/library/Setup/Utils/MakeDirStep.php
index b758ccd79..730f8b63f 100644
--- a/modules/setup/library/Setup/Utils/MakeDirStep.php
+++ b/modules/setup/library/Setup/Utils/MakeDirStep.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Utils;
 
diff --git a/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php b/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php
index fa858f531..95bc9aaaa 100644
--- a/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php
+++ b/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Web\Form\Validator;
 
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index b580101ed..a9c302eb4 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Webserver.php b/modules/setup/library/Setup/Webserver.php
index dbc55b6a2..03d8dd040 100644
--- a/modules/setup/library/Setup/Webserver.php
+++ b/modules/setup/library/Setup/Webserver.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Webserver/Apache.php b/modules/setup/library/Setup/Webserver/Apache.php
index 79d81eb71..595f5a2cc 100644
--- a/modules/setup/library/Setup/Webserver/Apache.php
+++ b/modules/setup/library/Setup/Webserver/Apache.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Webserver;
 
diff --git a/modules/setup/library/Setup/Webserver/Nginx.php b/modules/setup/library/Setup/Webserver/Nginx.php
index fd5e92d72..21b29679c 100644
--- a/modules/setup/library/Setup/Webserver/Nginx.php
+++ b/modules/setup/library/Setup/Webserver/Nginx.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Setup\Webserver;
 
diff --git a/modules/test/application/clicommands/PhpCommand.php b/modules/test/application/clicommands/PhpCommand.php
index dbcb58f05..1040e1255 100644
--- a/modules/test/application/clicommands/PhpCommand.php
+++ b/modules/test/application/clicommands/PhpCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Test\Clicommands;
 
diff --git a/modules/translation/application/clicommands/CompileCommand.php b/modules/translation/application/clicommands/CompileCommand.php
index 77116d74a..b2b1880f7 100644
--- a/modules/translation/application/clicommands/CompileCommand.php
+++ b/modules/translation/application/clicommands/CompileCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Translation\Clicommands;
 
diff --git a/modules/translation/application/clicommands/RefreshCommand.php b/modules/translation/application/clicommands/RefreshCommand.php
index 78b58f55c..25f4ee3aa 100644
--- a/modules/translation/application/clicommands/RefreshCommand.php
+++ b/modules/translation/application/clicommands/RefreshCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Translation\Clicommands;
 
diff --git a/modules/translation/library/Translation/Cli/TranslationCommand.php b/modules/translation/library/Translation/Cli/TranslationCommand.php
index bae20cc5e..b2bc654a8 100644
--- a/modules/translation/library/Translation/Cli/TranslationCommand.php
+++ b/modules/translation/library/Translation/Cli/TranslationCommand.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Translation\Cli;
 
diff --git a/modules/translation/library/Translation/Util/GettextTranslationHelper.php b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
index 5702def85..2b47b57aa 100644
--- a/modules/translation/library/Translation/Util/GettextTranslationHelper.php
+++ b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Module\Translation\Util;
 
diff --git a/packages/files/bin/icingacli b/packages/files/bin/icingacli
index 5b41e4e8c..0f20fcd76 100755
--- a/packages/files/bin/icingacli
+++ b/packages/files/bin/icingacli
@@ -1,5 +1,6 @@
 #!/usr/bin/php
 <?php
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 require_once '/usr/share/php/Icinga/Application/Cli.php';
 
diff --git a/packages/files/public/index.php b/packages/files/public/index.php
index ebd223c03..a4760a9fb 100644
--- a/packages/files/public/index.php
+++ b/packages/files/public/index.php
@@ -1,3 +1,4 @@
 <?php
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 require_once '/usr/share/php/Icinga/Application/webrouter.php';
diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index ff54bd38d..fd98315ac 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /*** Base rules ***/
 * {
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 813ae28f7..172536856 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 div.config-form-buttons {
   margin-top: 5px;
diff --git a/public/css/icinga/header-elements.less b/public/css/icinga/header-elements.less
index e1f3a7bce..bef161fa5 100644
--- a/public/css/icinga/header-elements.less
+++ b/public/css/icinga/header-elements.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 #header div.user {
   font-size: 1.1em;
diff --git a/public/css/icinga/layout-colors.less b/public/css/icinga/layout-colors.less
index c57cd1a26..a422b8e3e 100644
--- a/public/css/icinga/layout-colors.less
+++ b/public/css/icinga/layout-colors.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /* Layout colors */
 
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 5c6d67dae..b0d29862b 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /** Default layout **/
 html {
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index 6b03b476a..c5e2230cf 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 #login {
   width: 100%;
@@ -109,7 +108,7 @@
   .footer {
     margin-top: 7em;
     font-size: 0.9em;
-    text-align: center; 
+    text-align: center;
     margin-left: 5em;
   }
 
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index e3e31b397..a7ed358df 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 code {
   background-color: #eee;
@@ -181,7 +180,7 @@ table.benchmark {
 
 .dashboard h3 {
   font-size: 1em;
-} 
+}
 
 .dashboard table.benchmark {
   font-size: 0.9em;
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 0f3f2691e..2aca175ea 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 #menu {
   max-height: 100%;
diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index 1e657101f..c7a24ed5f 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /* Special tables and states */
 
@@ -346,7 +345,7 @@ a.critical {
   font-size: 0.8em;
   padding: 0.4em 0 0.4em;
   border: 1px solid #d9d9d9;
-  
+
   font-weight: bold;
   letter-spacing: 0.1em;
 }
@@ -357,7 +356,7 @@ a.critical {
   margin: 0.2em;
   font-size: 0.9em;
   white-space: nowrap;
-  
+
   color: @colorTextDefault;
 }
 
@@ -540,12 +539,12 @@ div.box.contactgroup div.box.entry img {
   width: 80px;
   height: 80px;
   float: left;
-  
+
 }
 
 div.box.contactgroup div.box.entry a {
   margin-top: 0.4em;
-  
+
   font-weight: bold;
 }
 
@@ -558,7 +557,7 @@ div.circular {
   margin-left: 2em;
   margin-right: 1em;
   width: 80px;
-  height: 80px; 
+  height: 80px;
   float: left;
   background-size: 100% 100%;
 }
@@ -766,7 +765,7 @@ div.timeline {
         &:hover {
           color: @colorTextDefault;
           text-decoration: underline;
-         
+
         }
       }
     }
@@ -872,7 +871,7 @@ table.groupview {
         span.timesince {
           font-size: 0.8em;
         }
-        
+
         &.ok {
           border-color: @colorOk;
         }
diff --git a/public/css/icinga/pagination.less b/public/css/icinga/pagination.less
index e52b28403..8fe84b3b6 100644
--- a/public/css/icinga/pagination.less
+++ b/public/css/icinga/pagination.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 ul.pagination {
   font-size: 0.68em;
diff --git a/public/css/icinga/selection-toolbar.less b/public/css/icinga/selection-toolbar.less
index ca177ebbb..662a7db53 100644
--- a/public/css/icinga/selection-toolbar.less
+++ b/public/css/icinga/selection-toolbar.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 div.selection-toolbar {
   float: right;
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index 9dff6fecf..cd2f81d0f 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -1,3 +1,5 @@
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+
 #layout {
   overflow: auto; // TODO: Shouldn't be necessary, here, IMHO
 }
@@ -445,4 +447,4 @@
     padding-top: 1em;
     clear: both;
   }
-}
\ No newline at end of file
+}
diff --git a/public/css/icinga/tabs.less b/public/css/icinga/tabs.less
index 84f58e2a3..a93e96bcc 100644
--- a/public/css/icinga/tabs.less
+++ b/public/css/icinga/tabs.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 ul.tabs {
   padding: 1em 0 0 0;
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index e2e37d7ab..87818bbaa 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 table.historycolorgrid {
   font-size: 1.5em;
@@ -291,4 +290,4 @@ li li .badge {
   height: 12px;
   position: relative;
   top: 4px;
-}
\ No newline at end of file
+}
diff --git a/public/css/pdf/pdfprint.less b/public/css/pdf/pdfprint.less
index 117bef546..fc9fda0da 100644
--- a/public/css/pdf/pdfprint.less
+++ b/public/css/pdf/pdfprint.less
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 .controls form, .controls .pagination, .controls .widgetLimiter, .controls > .tabs, .dontprint {
   display: none !important;
diff --git a/public/index.php b/public/index.php
index 48a500666..0062bf94f 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,5 +1,4 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 require_once dirname(__DIR__) . '/library/Icinga/Application/webrouter.php';
diff --git a/public/js/helpers.js b/public/js/helpers.js
index 416bf1185..6dc1f765a 100644
--- a/public/js/helpers.js
+++ b/public/js/helpers.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 (function (Object) {
 
diff --git a/public/js/icinga.js b/public/js/icinga.js
index c883a6bba..ce8c9bb0c 100644
--- a/public/js/icinga.js
+++ b/public/js/icinga.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Icinga starts here.
diff --git a/public/js/icinga/behavior/form.js b/public/js/icinga/behavior/form.js
index d289183d6..b5514313b 100644
--- a/public/js/icinga/behavior/form.js
+++ b/public/js/icinga/behavior/form.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Controls behavior of form elements, depending reload and
diff --git a/public/js/icinga/behavior/navigation.js b/public/js/icinga/behavior/navigation.js
index b8a12064d..ebe74b422 100644
--- a/public/js/icinga/behavior/navigation.js
+++ b/public/js/icinga/behavior/navigation.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 (function(Icinga, $) {
 
@@ -36,7 +35,7 @@
             /*
               Recreate the html content of the menu item to force the browser to update the layout, or else
               the link would only be visible as active after another click or page reload in Gecko and WebKit.
-              
+
               fixes #7897
             */
             $selectedMenu.html($selectedMenu.html());
diff --git a/public/js/icinga/behavior/sparkline.js b/public/js/icinga/behavior/sparkline.js
index e0d0fb0c7..43fa2a4c9 100644
--- a/public/js/icinga/behavior/sparkline.js
+++ b/public/js/icinga/behavior/sparkline.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 (function(Icinga, $) {
 
diff --git a/public/js/icinga/behavior/tooltip.js b/public/js/icinga/behavior/tooltip.js
index de5b66d05..7889aec4e 100644
--- a/public/js/icinga/behavior/tooltip.js
+++ b/public/js/icinga/behavior/tooltip.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 (function(Icinga, $) {
 
diff --git a/public/js/icinga/behavior/tristate.js b/public/js/icinga/behavior/tristate.js
index 036c25cea..8519b8567 100644
--- a/public/js/icinga/behavior/tristate.js
+++ b/public/js/icinga/behavior/tristate.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 (function(Icinga, $) {
 
@@ -43,7 +42,7 @@
         } else {
             $tristate.parent().find('b.tristate-changed').css('visibility', 'hidden');
         }
-        self.icinga.ui.setTriState(value.toString(), $tristate);    
+        self.icinga.ui.setTriState(value.toString(), $tristate);
     };
 
     Icinga.Behaviors.Tristate = Tristate;
diff --git a/public/js/icinga/eventlistener.js b/public/js/icinga/eventlistener.js
index e1946c6ae..24818963c 100644
--- a/public/js/icinga/eventlistener.js
+++ b/public/js/icinga/eventlistener.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * EventListener contains event handlers and can bind / and unbind them from
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 0a77db60e..d537cde30 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Icinga.Events
diff --git a/public/js/icinga/history.js b/public/js/icinga/history.js
index 9f05def2d..ef05f518e 100644
--- a/public/js/icinga/history.js
+++ b/public/js/icinga/history.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Icinga.History
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 417c47c1c..155591026 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Icinga.Loader
diff --git a/public/js/icinga/logger.js b/public/js/icinga/logger.js
index 07135e007..54ec7b182 100644
--- a/public/js/icinga/logger.js
+++ b/public/js/icinga/logger.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Icinga.Logger
diff --git a/public/js/icinga/module.js b/public/js/icinga/module.js
index 047911434..5d05c82a5 100644
--- a/public/js/icinga/module.js
+++ b/public/js/icinga/module.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * This is how we bootstrap JS code in our modules
diff --git a/public/js/icinga/timer.js b/public/js/icinga/timer.js
index 8d90f7c5c..06b38a4e6 100644
--- a/public/js/icinga/timer.js
+++ b/public/js/icinga/timer.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Icinga.Timer
diff --git a/public/js/icinga/timezone.js b/public/js/icinga/timezone.js
index 15205e9cb..69bae9a9a 100644
--- a/public/js/icinga/timezone.js
+++ b/public/js/icinga/timezone.js
@@ -1,3 +1,5 @@
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+
 (function(Icinga, $) {
 
     'use strict';
@@ -114,4 +116,4 @@
         }
     };
 
-})(Icinga, jQuery);
\ No newline at end of file
+})(Icinga, jQuery);
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index 3c03bdcf5..c63d5e7a6 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Icinga.UI
@@ -618,25 +617,25 @@
                     var sec = 0;
 
                     if (nm < 0) {
-                        signed = '-';    
+                        signed = '-';
                         nm = nm * -1;
                         sec = nm * 60 + ns;
                         sec++;
                     } else if (nm == 0 && ns == 0) {
-                        signed = '-';    
+                        signed = '-';
                         sec = 1;
                     } else if (nm == 0 && m[2][0] == '-') {
-                        signed = '-';    
+                        signed = '-';
                         sec = ns;
                         sec++;
                     } else if (nm == 0 && m[2][0] != '-') {
                         sec = ns;
                         sec--;
                     } else {
-                        signed = '';    
+                        signed = '';
                         sec = nm * 60 + ns;
                         sec--;
-                    }    
+                    }
 
                     nm = Math.floor(sec/60);
                     ns = sec - nm * 60;
@@ -671,24 +670,24 @@
                 // hide input boxess and remove text nodes
                 $target.find("input").hide();
                 $target.contents().filter(function() { return this.nodeType === 3; }).remove();
-                
+
                 // has three states?
                 var triState = $target.find('input[value="unchanged"]').size() > 0 ? 1 : 0;
-                
+
                 // fetch current value from radiobuttons
                 var value  = $target.find('input:checked').first().val();
-        
+
                 $target.append(
                   '<input class="tristate-dummy" ' +
                         ' data-icinga-old="' + value + '" data-icinga-tristate="' + triState + '" type="checkbox" ' +
                         (value === '1' ? 'checked ' : ( value === 'unchanged' ? 'indeterminate="true" ' : ' ' )) +
                   '/> <b style="visibility: hidden;" class="tristate-changed"> (changed) </b>'
-                ); 
+                );
                 if (triState) {
                   // TODO: find a better way to activate indeterminate checkboxes after load.
                   $target.append(
                     '<script type="text/javascript"> ' +
-                      ' $(\'input.tristate-dummy[indeterminate="true"]\').each(function(i, el){ el.indeterminate = true; }); ' + 
+                      ' $(\'input.tristate-dummy[indeterminate="true"]\').each(function(i, el){ el.indeterminate = true; }); ' +
                     '</script>'
                   );
                 }
diff --git a/public/js/icinga/utils.js b/public/js/icinga/utils.js
index ba4d7a040..8539d29ca 100644
--- a/public/js/icinga/utils.js
+++ b/public/js/icinga/utils.js
@@ -1,5 +1,4 @@
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 /**
  * Icinga utility functions
diff --git a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
index 6af628b06..8067b6259 100644
--- a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
+++ b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Forms\Config\Authentication;
 
diff --git a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
index 046730f57..66a743d73 100644
--- a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
+++ b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Forms\Config\Authentication;
 
diff --git a/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php b/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php
index 88de869a1..00cb32464 100644
--- a/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php
+++ b/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Forms\Config;
 
diff --git a/test/php/application/forms/Config/Resource/DbResourceFormTest.php b/test/php/application/forms/Config/Resource/DbResourceFormTest.php
index 53dd6bf56..a14f64949 100644
--- a/test/php/application/forms/Config/Resource/DbResourceFormTest.php
+++ b/test/php/application/forms/Config/Resource/DbResourceFormTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Forms\Config\Resource;
 
diff --git a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
index 9ef8880e7..94c171981 100644
--- a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
+++ b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Forms\Config\Resource;
 
diff --git a/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php b/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php
index 3f5de5844..6c3899e01 100644
--- a/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php
+++ b/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Forms\Config\Resource;
 
diff --git a/test/php/application/views/helpers/DateFormatTestBroken.php b/test/php/application/views/helpers/DateFormatTestBroken.php
index 4f3cfc184..1a4daf8fe 100644
--- a/test/php/application/views/helpers/DateFormatTestBroken.php
+++ b/test/php/application/views/helpers/DateFormatTestBroken.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Views\Helper;
 
diff --git a/test/php/bootstrap.php b/test/php/bootstrap.php
index a7fa6c2aa..af34344c5 100644
--- a/test/php/bootstrap.php
+++ b/test/php/bootstrap.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 $applicationPath = realpath(dirname(__FILE__) . '/../../application/');
 $modulePath = realpath(dirname(__FILE__) . '/../../modules/');
diff --git a/test/php/library/Icinga/Application/ConfigTest.php b/test/php/library/Icinga/Application/ConfigTest.php
index 1e64da808..8b3d0cd0f 100644
--- a/test/php/library/Icinga/Application/ConfigTest.php
+++ b/test/php/library/Icinga/Application/ConfigTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Application;
 
diff --git a/test/php/library/Icinga/Application/LoaderTest.php b/test/php/library/Icinga/Application/LoaderTest.php
index 1a0276945..4b3f5b5af 100644
--- a/test/php/library/Icinga/Application/LoaderTest.php
+++ b/test/php/library/Icinga/Application/LoaderTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Application;
 
diff --git a/test/php/library/Icinga/Chart/GraphChartTest.php b/test/php/library/Icinga/Chart/GraphChartTest.php
index 9ffdcb66c..49c81a5de 100644
--- a/test/php/library/Icinga/Chart/GraphChartTest.php
+++ b/test/php/library/Icinga/Chart/GraphChartTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Chart;
 
diff --git a/test/php/library/Icinga/Chart/PieChartTest.php b/test/php/library/Icinga/Chart/PieChartTest.php
index 756fdf6e6..21b9fa49a 100644
--- a/test/php/library/Icinga/Chart/PieChartTest.php
+++ b/test/php/library/Icinga/Chart/PieChartTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Chart;
 
@@ -29,4 +28,4 @@ class PieChartTest extends BaseTestCase
         $path = $xpath->query('//x:path[@data-icinga-graph-type="pieslice"]');
         $this->assertEquals(3, $path->length, 'Assert the correct number of datapoints being drawn as SVG bars');
     }
-}
\ No newline at end of file
+}
diff --git a/test/php/library/Icinga/Data/ConfigObjectTest.php b/test/php/library/Icinga/Data/ConfigObjectTest.php
index c4b825e58..40b095267 100644
--- a/test/php/library/Icinga/Data/ConfigObjectTest.php
+++ b/test/php/library/Icinga/Data/ConfigObjectTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Data;
 
diff --git a/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php b/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php
index bdb719f8c..5e86d3f64 100644
--- a/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php
+++ b/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Data;
 
diff --git a/test/php/library/Icinga/Data/Filter/FilterTest.php b/test/php/library/Icinga/Data/Filter/FilterTest.php
index 7d6349213..4a048818f 100644
--- a/test/php/library/Icinga/Data/Filter/FilterTest.php
+++ b/test/php/library/Icinga/Data/Filter/FilterTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Data;
 
diff --git a/test/php/library/Icinga/File/CsvTest.php b/test/php/library/Icinga/File/CsvTest.php
index f4ae27c63..0d81fcb6d 100644
--- a/test/php/library/Icinga/File/CsvTest.php
+++ b/test/php/library/Icinga/File/CsvTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\File;
 
diff --git a/test/php/library/Icinga/File/Ini/IniWriterTest.php b/test/php/library/Icinga/File/Ini/IniWriterTest.php
index 63cb0e517..5603954ac 100644
--- a/test/php/library/Icinga/File/Ini/IniWriterTest.php
+++ b/test/php/library/Icinga/File/Ini/IniWriterTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Config;
 
diff --git a/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php b/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php
index 0c0d55498..36d1d4f2b 100644
--- a/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php
+++ b/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Logger\Writer;
 
diff --git a/test/php/library/Icinga/Protocol/Ldap/QueryTest.php b/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
index f6387709f..e87064251 100644
--- a/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
+++ b/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Protocol\Ldap;
 
diff --git a/test/php/library/Icinga/Test/BaseTestCaseTest.php b/test/php/library/Icinga/Test/BaseTestCaseTest.php
index 2f8e12f0c..36c251c4c 100644
--- a/test/php/library/Icinga/Test/BaseTestCaseTest.php
+++ b/test/php/library/Icinga/Test/BaseTestCaseTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Test;
 
diff --git a/test/php/library/Icinga/User/PreferencesTest.php b/test/php/library/Icinga/User/PreferencesTest.php
index 540ea1b14..75a6723b6 100644
--- a/test/php/library/Icinga/User/PreferencesTest.php
+++ b/test/php/library/Icinga/User/PreferencesTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\User;
 
diff --git a/test/php/library/Icinga/User/Store/DbStoreTest.php b/test/php/library/Icinga/User/Store/DbStoreTest.php
index dfb70c66b..bcadadbe4 100644
--- a/test/php/library/Icinga/User/Store/DbStoreTest.php
+++ b/test/php/library/Icinga/User/Store/DbStoreTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\User\Preferences\Store;
 
diff --git a/test/php/library/Icinga/User/Store/IniStoreTest.php b/test/php/library/Icinga/User/Store/IniStoreTest.php
index 51de87840..912c09320 100644
--- a/test/php/library/Icinga/User/Store/IniStoreTest.php
+++ b/test/php/library/Icinga/User/Store/IniStoreTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\User\Preferences\Store;
 
diff --git a/test/php/library/Icinga/UserTest.php b/test/php/library/Icinga/UserTest.php
index d12666b04..b14a91a57 100644
--- a/test/php/library/Icinga/UserTest.php
+++ b/test/php/library/Icinga/UserTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga;
 
diff --git a/test/php/library/Icinga/Util/DateTimeFactoryTest.php b/test/php/library/Icinga/Util/DateTimeFactoryTest.php
index 1b7778587..ad7441f93 100644
--- a/test/php/library/Icinga/Util/DateTimeFactoryTest.php
+++ b/test/php/library/Icinga/Util/DateTimeFactoryTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Util/DimensionTest.php b/test/php/library/Icinga/Util/DimensionTest.php
index d6678258f..db2e579b2 100644
--- a/test/php/library/Icinga/Util/DimensionTest.php
+++ b/test/php/library/Icinga/Util/DimensionTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Util/FileTest.php b/test/php/library/Icinga/Util/FileTest.php
index e0f2e86b8..96ca21ac9 100644
--- a/test/php/library/Icinga/Util/FileTest.php
+++ b/test/php/library/Icinga/Util/FileTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Util/StringTest.php b/test/php/library/Icinga/Util/StringTest.php
index 8ecf61edc..46acee3d0 100644
--- a/test/php/library/Icinga/Util/StringTest.php
+++ b/test/php/library/Icinga/Util/StringTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Util/TranslatorTest.php b/test/php/library/Icinga/Util/TranslatorTest.php
index 4d74cc8dc..ccf632657 100644
--- a/test/php/library/Icinga/Util/TranslatorTest.php
+++ b/test/php/library/Icinga/Util/TranslatorTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php b/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php
index 802d610ab..79296e4a1 100644
--- a/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php
+++ b/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web\Form\Element;
 
diff --git a/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php b/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php
index 0153412e5..1d9514663 100644
--- a/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php
+++ b/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web\Form\Validator;
 
diff --git a/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php b/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php
index b0ad8c9ae..124484de3 100644
--- a/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php
+++ b/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web\Form\Validator;
 
diff --git a/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php b/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php
index b9e8c2ae7..9f7996975 100644
--- a/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php
+++ b/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web\Form\Validator;
 
diff --git a/test/php/library/Icinga/Web/FormTest.php b/test/php/library/Icinga/Web/FormTest.php
index de880f070..01ef3de27 100644
--- a/test/php/library/Icinga/Web/FormTest.php
+++ b/test/php/library/Icinga/Web/FormTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/HookTest.php b/test/php/library/Icinga/Web/HookTest.php
index 16300f5ca..3d678fe7a 100644
--- a/test/php/library/Icinga/Web/HookTest.php
+++ b/test/php/library/Icinga/Web/HookTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Icinga\Web\Hook;
 
diff --git a/test/php/library/Icinga/Web/MenuTest.php b/test/php/library/Icinga/Web/MenuTest.php
index b7370d65b..31c8538bc 100644
--- a/test/php/library/Icinga/Web/MenuTest.php
+++ b/test/php/library/Icinga/Web/MenuTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
index a77dcb553..6d26ad847 100644
--- a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
+++ b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web\Paginator\ScrollingStyle;
 
diff --git a/test/php/library/Icinga/Web/Session/PhpSessionTest.php b/test/php/library/Icinga/Web/Session/PhpSessionTest.php
index 49641c60d..90d593848 100644
--- a/test/php/library/Icinga/Web/Session/PhpSessionTest.php
+++ b/test/php/library/Icinga/Web/Session/PhpSessionTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web\Session;
 
diff --git a/test/php/library/Icinga/Web/Session/SessionNamespaceTest.php b/test/php/library/Icinga/Web/Session/SessionNamespaceTest.php
index bf984dca0..63b12bd90 100644
--- a/test/php/library/Icinga/Web/Session/SessionNamespaceTest.php
+++ b/test/php/library/Icinga/Web/Session/SessionNamespaceTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web\Session;
 
diff --git a/test/php/library/Icinga/Web/UrlTest.php b/test/php/library/Icinga/Web/UrlTest.php
index 68206beee..331ae4b11 100644
--- a/test/php/library/Icinga/Web/UrlTest.php
+++ b/test/php/library/Icinga/Web/UrlTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/View/DateTimeRendererTest.php b/test/php/library/Icinga/Web/View/DateTimeRendererTest.php
index e45d3fdfe..639e10563 100644
--- a/test/php/library/Icinga/Web/View/DateTimeRendererTest.php
+++ b/test/php/library/Icinga/Web/View/DateTimeRendererTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/Widget/DashboardTest.php b/test/php/library/Icinga/Web/Widget/DashboardTest.php
index 2aa2bdcf4..dc9ec23bf 100644
--- a/test/php/library/Icinga/Web/Widget/DashboardTest.php
+++ b/test/php/library/Icinga/Web/Widget/DashboardTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php b/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
index 5e6e1cc69..c7354e341 100644
--- a/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
+++ b/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/regression/Bug4102Test.php b/test/php/regression/Bug4102Test.php
index ce5ea2290..77f356d51 100644
--- a/test/php/regression/Bug4102Test.php
+++ b/test/php/regression/Bug4102Test.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Regression;
 
diff --git a/test/php/regression/Bug6284Test.php b/test/php/regression/Bug6284Test.php
index be584c149..1863a15e4 100644
--- a/test/php/regression/Bug6284Test.php
+++ b/test/php/regression/Bug6284Test.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Regression;
 
diff --git a/test/php/regression/Bug6432Test.php b/test/php/regression/Bug6432Test.php
index 4194d9d41..50719db46 100644
--- a/test/php/regression/Bug6432Test.php
+++ b/test/php/regression/Bug6432Test.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
 
 namespace Tests\Icinga\Regression;
 

From b712d9453b69732f507728f79c4130c254983c3d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 3 Feb 2015 16:38:32 +0100
Subject: [PATCH 0535/2920] It's not the "permissions.ini" but the "roles.ini"
 that holds the role settings

---
 modules/setup/library/Setup/Steps/AuthenticationStep.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
index 407ef4182..9c40679c2 100644
--- a/modules/setup/library/Setup/Steps/AuthenticationStep.php
+++ b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -65,12 +65,12 @@ class AuthenticationStep extends Step
         $config = array();
         $config['admins'] = array(
             'users'         => $this->data['adminAccountData']['username'],
-            'permission'    => '*'
+            'permissions'   => '*'
         );
 
         try {
             Config::fromArray($config)
-                ->setConfigFile(Config::resolvePath('permissions.ini'))
+                ->setConfigFile(Config::resolvePath('roles.ini'))
                 ->saveIni();
         } catch (Exception $e) {
             $this->permIniError = $e;

From e8466ec7bed7a16533b64945eb64796493c5b764 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 3 Feb 2015 16:45:01 +0100
Subject: [PATCH 0536/2920] Fix inlinePie borders and SVG sizes

Add white border to inline piecharts in the list, to make them more visible on mouse hovering. Set a default image size for the loaded svg charts.
---
 library/Icinga/Web/Widget/Chart/InlinePie.php       |  7 +++----
 .../application/views/helpers/Perfdata.php          | 13 +++++++++----
 .../application/views/scripts/list/services.phtml   |  2 +-
 public/css/icinga/widgets.less                      |  9 +++++++++
 public/js/icinga/behavior/navigation.js             |  3 +--
 public/js/icinga/behavior/sparkline.js              |  8 +++++---
 6 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/library/Icinga/Web/Widget/Chart/InlinePie.php b/library/Icinga/Web/Widget/Chart/InlinePie.php
index 310a88b3c..bd86acde1 100644
--- a/library/Icinga/Web/Widget/Chart/InlinePie.php
+++ b/library/Icinga/Web/Widget/Chart/InlinePie.php
@@ -33,14 +33,14 @@ class InlinePie extends AbstractWidget
      * @var string
      */
     private $template =<<<'EOD'
-<span sparkType="pie" class="sparkline {class}" {title} {size} sparkSliceColors="[{colors}]" values="{data}">
+<span sparkType="pie" class="sparkline {class}" {title} sparkWidth={size} sparkHeight={size} sparkSliceColors="[{colors}]" values="{data}">
 </span>
 {noscript}
 EOD;
 
     private $noscript =<<<'EOD'
 <noscript>
-  <img class="inlinepie {class}" {title} src="{url}" data-icinga-colors="{colors}" data-icinga-values="{data}"/>
+  <img width={size} height={size} class="inlinepie {class}" {title} src="{url}" data-icinga-colors="{colors}" data-icinga-values="{data}"/>
 </noscript>
 EOD;
 
@@ -216,8 +216,7 @@ EOD;
         $template = str_replace('{class}', $this->class, $template);
 
         // style
-        $template = str_replace('{size}',
-            isset($this->size) ? 'sparkWidth="' . $this->size . '" sparkHeight="' . $this->size . '" ' : '', $template);
+        $template = str_replace('{size}', isset($this->size) ? $this->size : 16, $template);
         $template = str_replace('{title}', $this->title, $template);
 
         $template = str_replace('{colors}', implode(',', $this->colors), $template);
diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index e3b92510f..8e79fceeb 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -18,11 +18,11 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
      *
      * @return string
      */
-    public function perfdata($perfdataStr, $compact = false, $color = Perfdata::PERFDATA_OK)
+    public function perfdata($perfdataStr, $compact = false, $limit = 0, $color = Perfdata::PERFDATA_OK)
     {
         $pieChartData = PerfdataSet::fromString($perfdataStr)->asArray();
 
-        $result = '';
+        $results = array();
         $table = array(
             '<td><b>' . implode(
                 '</b></td><td><b>',
@@ -32,7 +32,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
         foreach ($pieChartData as $perfdata) {
 
             if ($compact && $perfdata->isVisualizable()) {
-                $result .= $perfdata->asInlinePie($color)->render();
+                $results[] = $perfdata->asInlinePie($color)->render();
             } else {
                 $row = '<tr>';
 
@@ -56,8 +56,13 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
             }
         }
 
+        if ($limit > 0) {
+            $table = array_slice ($table, 0, $limit);
+            $results = array_slice ($results, 0, $limit);
+        }
+
         if ($compact) {
-            return $result;
+            return join('', $results);
         } else {
             $pieCharts = empty($table) ? '' : '<table class="perfdata">' . implode("\n", $table) . '</table>';
             return $pieCharts;
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 45d59adf5..f7bbffe57 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -65,7 +65,7 @@ foreach ($services as $service):
       </td>
 
       <td>
-        <?= $this->perfdata($service->service_perfdata, true) ?>
+        <div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 8) ?></div>
 
         <?php if (!$service->service_handled && $service->service_state > 0): ?>
         <?= $this->icon('attention-alt', $this->translate('Unhandled')) ?>
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index 87818bbaa..6263a6f0b 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -285,6 +285,15 @@ li li .badge {
     background-color: #eee;
 }
 
+.sparkline-box {
+  position: relative;
+  top: -9px;
+}
+
+.dashboard .sparkline-box {
+  top: -3px;
+}
+
 .sparkline {
   width: 12px;
   height: 12px;
diff --git a/public/js/icinga/behavior/navigation.js b/public/js/icinga/behavior/navigation.js
index ebe74b422..d9f2060a6 100644
--- a/public/js/icinga/behavior/navigation.js
+++ b/public/js/icinga/behavior/navigation.js
@@ -85,8 +85,7 @@
         $menu.data('icinga-url', menuDataUrl);
     };
 
-    Navigation.prototype.setActiveByUrl = function(url)
-    {
+    Navigation.prototype.setActiveByUrl = function(url) {
         this.resetActive();
         this.setActive($('#menu [href="' + url + '"]'));
     }
diff --git a/public/js/icinga/behavior/sparkline.js b/public/js/icinga/behavior/sparkline.js
index 43fa2a4c9..4a5cbefd5 100644
--- a/public/js/icinga/behavior/sparkline.js
+++ b/public/js/icinga/behavior/sparkline.js
@@ -28,10 +28,12 @@
             if ($spark.hasClass('sparkline-perfdata')) {
                 options = {
                     enableTagOptions: true,
-                    width: 12,
-                    height: 12,
+                    width: 16,
+                    height: 16,
                     title: title,
-                    disableTooltips: true
+                    disableTooltips: true,
+                    borderWidth: 1.4,
+                    borderColor: '#FFF'
                 };
                 $spark.sparkline('html', options);
             } else if ($spark.hasClass('sparkline-multi')) {

From 49e96b72009e6d2c7363e096335cb0e478713ab5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 16:49:39 +0100
Subject: [PATCH 0537/2920] Revert "monitoring/security: Guard delete comment
 action"

This reverts commit 4ef5f0c813767fb18dd415e67aa9f36673de0315.
---
 library/Icinga/Web/Widget/FilterEditor.php    | 69 ++++++-------------
 .../Controller/MonitoredObjectController.php  |  1 -
 2 files changed, 20 insertions(+), 50 deletions(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index c515ee79d..c7a240da8 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -123,55 +123,26 @@ class FilterEditor extends AbstractWidget
     {
         $found = false;
         if ($filter->isChain() && $filter->getOperatorName() === 'AND') {
-            if (is_array($column)) {
-                foreach ($filter->filters() as $f) {
-                    if ($f->isChain() && $f->getOperatorName() === 'OR') {
-
-                    }
-                }
-            } else {
-                foreach ($filter->filters() as $f) {
-                    if ($f->isExpression()
-                        && $f->getColumn() === $column
-                        && $f->getSign() === $sign
-                    ) {
-                        $f->setExpression($expression);
-                        $found = true;
-                        break;
-                    }
+            foreach ($filter->filters() as $f) {
+                if ($f->isExpression()
+                    && $f->getColumn() === $column
+                    && $f->getSign() === $sign
+                ) {
+                    $f->setExpression($expression);
+                    $found = true;
+                    break;
                 }
             }
-        } elseif ($filter->isExpression() && $filter->getSign() === $sign) {
-            if (is_array($column)) {
-                if (in_array($filter->getColumn(), $column)) {
-                    $or = Filter::matchAny();
-                    foreach ($column as $col) {
-                        $or->addFilter(
-                            Filter::expression($col, $sign, $expression)
-                        );
-                    }
-                    $filter = $filter->andFilter($or);
-                    $found = true;
-                }
-            } elseif ($filter->getColumn() === $column) {
+        } elseif ($filter->isExpression()) {
+            if ($filter->getColumn() === $column && $filter->getSign() === $sign) {
                 $filter->setExpression($expression);
                 $found = true;
             }
         }
         if (! $found) {
-            if (is_array($column)) {
-                $or = Filter::matchAny();
-                foreach ($column as $col) {
-                    $or->addFilter(
-                        Filter::expression($col, $sign, $expression)
-                    );
-                }
-                $filter = $filter->andFilter($or);
-            } else {
-                $filter = $filter->andFilter(
-                    Filter::expression($column, $sign, $expression)
-                );
-            }
+            $filter = $filter->andFilter(
+                Filter::expression($column, $sign, $expression)
+            );
         }
         return $filter;
     }
@@ -212,25 +183,25 @@ class FilterEditor extends AbstractWidget
                 // TODO: Ask the view for (multiple) search columns
                 switch($request->getActionName()) {
                     case 'services':
-                        $searchCols = array('service_description', 'service_display_name');
+                        $searchCol = 'service_description';
                         break;
                     case 'hosts':
-                        $searchCols = array('host_name', 'host_display_name');
+                        $searchCol = 'host_name';
                         break;
                     case 'hostgroups':
-                        $searchCols = array('hostgroup', 'hostgroup_alias');
+                        $searchCol = 'hostgroup';
                         break;
                     case 'servicegroups':
-                        $searchCols = array('servicegroup', 'servicegroup_alias');
+                        $searchCol = 'servicegroup';
                         break;
                     default:
-                        $searchCols = null;
+                        $searchCol = null;
                 }
 
-                if ($searchCols === null) {
+                if ($searchCol === null) {
                     throw new Exception('Cannot search here');
                 }
-                $filter = $this->mergeRootExpression($filter, $searchCols, '=', "*$search*");
+                $filter = $this->mergeRootExpression($filter, $searchCol, '=', "*$search*");
 
             } else {
                 list($k, $v) = preg_split('/=/', $search);
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index cd2ed175f..d12bc7712 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -142,7 +142,6 @@ abstract class MonitoredObjectController extends Controller
     public function deleteCommentAction()
     {
         $this->assertHttpMethod('POST');
-        $this->assertPermission('monitoring/command/comment/delete');
         $this->handleCommandForm(new DeleteCommentCommandForm());
     }
 

From 2fe3f4c6c24c8fb9f369177897c2923bb253b487 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 16:52:36 +0100
Subject: [PATCH 0538/2920] doc: Add "Upgrading to Icinga Web 2 Beta 2"

---
 doc/installation.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/installation.md b/doc/installation.md
index 170199832..e506b921b 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -108,3 +108,16 @@ In case you do not remember the token you can show it using the `icingacli`:
 **Step 5: Web Setup**
 
 Visit Icinga Web 2 in your browser and complete installation using the web setup: /icingaweb2/setup
+
+## Upgrading to Icinga Web 2 Beta 2
+
+Icinga Web 2 Beta 2 introduces access control based on roles for secured actions. If you've already set up Icinga Web 2,
+you are required to create the file **roles.ini** beneath Icinga Web 2's configuration directory with the following
+content:
+````
+[administrators]
+users = "your_user_name, another_user_name"
+permissions = "*"
+````
+
+After please log out from Icinga Web 2 and log in again for having all permissions granted.

From ed411ec9b6cc9dc9b3f8ece62c7ff56b187444fd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 16:58:53 +0100
Subject: [PATCH 0539/2920] Increase size of the permissions set input

fixes #7762
---
 application/forms/Security/RoleForm.php | 3 ++-
 public/css/icinga/forms.less            | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 0e3c97c0a..caf3fb872 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -108,7 +108,8 @@ class RoleForm extends ConfigForm
                     'description'   => $this->translate(
                         'The permissions to grant. You may select more than one permission'
                     ),
-                    'multiOptions'  => $this->providedPermissions
+                    'multiOptions'  => $this->providedPermissions,
+                    'class'         => 'grant-permissions'
                 )
             )
         ));
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 172536856..874ecfecc 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -220,3 +220,8 @@ form label.has-feedback:after {
   /* Uncomment for 3D effect */
   /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
 }
+
+select.grant-permissions {
+  height: 20em;
+  width: auto;
+}

From 38ad802bd522f9445825dc4bddcc2d49e5a4c27d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 17:01:04 +0100
Subject: [PATCH 0540/2920] Bump version to v2.0.0-beta2

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 71282c063..2f8540190 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.0.0-beta1
+v2.0.0-beta2

From 2f254851e3fe4fbddd3047740f525955183a8617 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 3 Feb 2015 17:33:30 +0100
Subject: [PATCH 0541/2920] Fix pieChart layout and add indicator for truncated
 piecharts

---
 .../monitoring/application/views/helpers/Perfdata.php    | 5 +++++
 .../application/views/scripts/list/services.phtml        | 2 +-
 public/css/icinga/monitoring-colors.less                 | 9 ---------
 public/css/icinga/widgets.less                           | 5 ++++-
 public/js/icinga/behavior/sparkline.js                   | 2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 8e79fceeb..930a4e61e 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -57,8 +57,13 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
         }
 
         if ($limit > 0) {
+            $count = max (count($table), count ($results));
             $table = array_slice ($table, 0, $limit);
             $results = array_slice ($results, 0, $limit);
+            if ($count > $limit) {
+                $mess = sprintf(t('%d more ...'), $count - $limit);
+                $results[] = '<span title="' . $mess . '">...</span>';
+            }
         }
 
         if ($compact) {
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index f7bbffe57..4cb073fc3 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -65,7 +65,7 @@ foreach ($services as $service):
       </td>
 
       <td>
-        <div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 8) ?></div>
+        <div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 8) ?> </div>
 
         <?php if (!$service->service_handled && $service->service_state > 0): ?>
         <?= $this->icon('attention-alt', $this->translate('Unhandled')) ?>
diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index c7a24ed5f..0b365e503 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -64,15 +64,6 @@ table.action td a:hover {
   text-decoration: underline;
 }
 
-table.action span.sparkline, table.action img.inlinepie {
-  margin: 0.5em 0.25em 0.5em 0.25em;
-  float:right;
-}
-
-.dashboard table.action span.sparkline, .dashboard table.action img.inlinepie {
-  margin: 0em 0.25em 0em 0.25em;
-}
-
 /* END of Action table */
 
 
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index 6263a6f0b..cfe5bb6e1 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -287,7 +287,8 @@ li li .badge {
 
 .sparkline-box {
   position: relative;
-  top: -9px;
+  top: -3px;
+  float: right;
 }
 
 .dashboard .sparkline-box {
@@ -299,4 +300,6 @@ li li .badge {
   height: 12px;
   position: relative;
   top: 4px;
+
+  margin: 0em 0em 0em 0.1em;
 }
diff --git a/public/js/icinga/behavior/sparkline.js b/public/js/icinga/behavior/sparkline.js
index 4a5cbefd5..44bac4fb9 100644
--- a/public/js/icinga/behavior/sparkline.js
+++ b/public/js/icinga/behavior/sparkline.js
@@ -15,7 +15,7 @@
     Sparkline.prototype.onRendered = function(evt) {
         var el = evt.target;
 
-        $('span.sparkline', el).each(function(i, element) {
+        $('.sparkline', el).each(function(i, element) {
             // read custom options
             var $spark = $(element);
             var title  = $spark.attr('title');

From 5b5ad0acb93b5dbb48f5832a21a56dc77de6b3d1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 3 Feb 2015 17:36:16 +0100
Subject: [PATCH 0542/2920] monitoring/security: Add missing permission checks
 of command actions

---
 .../application/controllers/HostsController.php           | 8 ++++++++
 .../application/controllers/ServicesController.php        | 8 ++++++++
 .../Web/Controller/MonitoredObjectController.php          | 1 +
 3 files changed, 17 insertions(+)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 862ba529f..79db43ea6 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -169,6 +169,8 @@ class Monitoring_HostsController extends Controller
      */
     public function acknowledgeProblemAction()
     {
+        $this->assertPermission('monitoring/command/acknowledge-problem');
+
         $this->view->title = $this->translate('Acknowledge Host Problems');
         $this->handleCommandForm(new AcknowledgeProblemCommandForm());
     }
@@ -178,6 +180,8 @@ class Monitoring_HostsController extends Controller
      */
     public function rescheduleCheckAction()
     {
+        $this->assertPermission('monitoring/command/schedule-check');
+
         $this->view->title = $this->translate('Reschedule Host Checks');
         $this->handleCommandForm(new ScheduleHostCheckCommandForm());
     }
@@ -187,6 +191,8 @@ class Monitoring_HostsController extends Controller
      */
     public function scheduleDowntimeAction()
     {
+        $this->assertPermission('monitoring/command/downtime/schedule');
+
         $this->view->title = $this->translate('Schedule Host Downtimes');
         $this->handleCommandForm(new ScheduleHostDowntimeCommandForm());
     }
@@ -196,6 +202,8 @@ class Monitoring_HostsController extends Controller
      */
     public function processCheckResultAction()
     {
+        $this->assertPermission('monitoring/command/process-check-result');
+
         $this->view->title = $this->translate('Submit Passive Host Check Results');
         $this->handleCommandForm(new ProcessCheckResultCommandForm());
     }
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 600979eb6..a50c849fe 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -218,6 +218,8 @@ class Monitoring_ServicesController extends Controller
      */
     public function acknowledgeProblemAction()
     {
+        $this->assertPermission('monitoring/command/acknowledge-problem');
+
         $this->view->title = $this->translate('Acknowledge Service Problems');
         $this->handleCommandForm(new AcknowledgeProblemCommandForm());
     }
@@ -227,6 +229,8 @@ class Monitoring_ServicesController extends Controller
      */
     public function rescheduleCheckAction()
     {
+        $this->assertPermission('monitoring/command/schedule-check');
+
         $this->view->title = $this->translate('Reschedule Service Checks');
         $this->handleCommandForm(new ScheduleServiceCheckCommandForm());
     }
@@ -236,6 +240,8 @@ class Monitoring_ServicesController extends Controller
      */
     public function scheduleDowntimeAction()
     {
+        $this->assertPermission('monitoring/command/downtime/schedule');
+
         $this->view->title = $this->translate('Schedule Service Downtimes');
         $this->handleCommandForm(new ScheduleServiceDowntimeCommandForm());
     }
@@ -245,6 +251,8 @@ class Monitoring_ServicesController extends Controller
      */
     public function processCheckResultAction()
     {
+        $this->assertPermission('monitoring/command/process-check-result');
+
         $this->view->title = $this->translate('Submit Passive Service Check Results');
         $this->handleCommandForm(new ProcessCheckResultCommandForm());
     }
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index d12bc7712..cd2ed175f 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -142,6 +142,7 @@ abstract class MonitoredObjectController extends Controller
     public function deleteCommentAction()
     {
         $this->assertHttpMethod('POST');
+        $this->assertPermission('monitoring/command/comment/delete');
         $this->handleCommandForm(new DeleteCommentCommandForm());
     }
 

From 3b30821ee9f66431798d0ec59ff8befb3277b2cb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 4 Feb 2015 09:22:27 +0100
Subject: [PATCH 0543/2920] doc: Note that external replaced autologin and not
 storing preferences means none

---
 doc/installation.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/installation.md b/doc/installation.md
index e506b921b..aa6968e26 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -121,3 +121,7 @@ permissions = "*"
 ````
 
 After please log out from Icinga Web 2 and log in again for having all permissions granted.
+
+If you delegated authentication to your web server using the `autologin` backend, you have to switch to the `external`
+authentication backend to be able to log in again. The new name better reflects what’s going on. A similar change
+affects environments that opted for not storing preferences, your new backend is `none`.

From ef754140666be828436fd0d7ef3afbefa940ff45 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 4 Feb 2015 09:41:36 +0100
Subject: [PATCH 0544/2920] rpm: Bump revision to 2.rc1

---
 icingaweb2.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index 9dfe5d0df..c69cbca6c 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -1,6 +1,6 @@
 # Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt
 
-%define revision 1.beta2
+%define revision 2.rc1
 
 Name:           icingaweb2
 Version:        2.0.0

From 5f624e42fd6ffe9df9a1da8e2510cec9a66c091c Mon Sep 17 00:00:00 2001
From: Marcus Cobden <marcus@marcuscobden.co.uk>
Date: Tue, 3 Feb 2015 13:47:56 +0000
Subject: [PATCH 0545/2920] Fix minor mistakes in Ldap/Connection

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
---
 library/Icinga/Protocol/Ldap/Connection.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 6d23854d0..f10cd670e 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -375,7 +375,7 @@ class Connection
             throw new LdapException(
                 sprintf(
                     'LDAP query "%s" (root %s) failed: %s',
-                    $query,
+                    $query->create(),
                     $this->root_dn,
                     ldap_error($this->ds)
                 )
@@ -478,7 +478,7 @@ class Connection
                 throw new LdapException(
                     sprintf(
                         'TLS is required but not announced by %s',
-                        $this->host_name
+                        $this->hostname
                     )
                 );
             } else {

From 75f65593e6f854d4b4759093cfe4252b8e70cf0f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 4 Feb 2015 09:45:40 +0100
Subject: [PATCH 0546/2920] Add Marcus Cobden <marcus@marcuscobden.co.uk> to
 the AUTHORS file

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index c225db6f6..7a6d660d6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,6 +10,7 @@ Gunnar Beutner <gunnar.beutner@netways.de>
 Jannis Moßhammer <jannis.mosshammer@netways.de>
 Johannes Meyer <johannes.meyer@netways.de>
 Marius Hein <marius.hein@netways.de>
+Marcus Cobden <marcus@marcuscobden.co.uk>
 Markus Frosch <markus@lazyfrosch.de>
 Matthias Jentsch <matthias.jentsch@netways.de>
 Michael Friedrich <michael.friedrich@netways.de>

From 8f9e970360a9efce5e231ab3827406d08c8ec901 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 4 Feb 2015 09:53:20 +0100
Subject: [PATCH 0547/2920] Ignore negative values in reaction time

Negative values for reaction time make no sense in the reaction time chart. When the notification was acknowledged before it startet we assume a reaction time of 0.

fixes #8198
---
 .../application/controllers/AlertsummaryController.php   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 4d711ade9..2ff909cb8 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -400,6 +400,15 @@ class Monitoring_AlertsummaryController extends Controller
                 $recover = 0;
                 if ($item->acknowledgement_entry_time) {
                     $recover = $item->acknowledgement_entry_time - $item->notification_start_time;
+
+                    /*
+                     * Acknowledgements may happen before the actual notification starts, since notifications
+                     * can be configured to start a certain time after the problem. In that case we assume
+                     * a reaction time of 0s.
+                     */
+                    if ($recover < 0) {
+                        $recover = 0;
+                    }
                 }
                 $rData[$item->notification_object_id] = array(
                     'id'        => $id,

From 12497749fcb983618f93cf1610950b20bbe9f00c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 4 Feb 2015 10:50:17 +0100
Subject: [PATCH 0548/2920] Do not log when using a limited query for a paged
 search operation

---
 library/Icinga/Protocol/Ldap/Connection.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index f10cd670e..0f3bde998 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -30,7 +30,8 @@ use Icinga\Data\ConfigObject;
  */
 class Connection
 {
-    const LDAP_NO_SUCH_OBJECT = 0x20;
+    const LDAP_NO_SUCH_OBJECT = 32;
+    const LDAP_SIZELIMIT_EXCEEDED = 4;
 
     protected $ds;
     protected $hostname;
@@ -329,10 +330,12 @@ class Connection
                     ldap_control_paged_result_response($this->ds, $this->lastResult, $this->pageCookie);
                 } catch (Exception $e) {
                     $this->pageCookie = '';
-                    Logger::debug(
-                        'Unable to request paged LDAP results. Does the server allow paged search requests? (%s)',
-                        $e->getMessage()
-                    );
+                    if (! $query->hasLimit() || ldap_errno($this->ds) !== static::LDAP_SIZELIMIT_EXCEEDED) {
+                        Logger::error(
+                            'Unable to request paged LDAP results. Does the server allow paged search requests? (%s)',
+                            $e->getMessage()
+                        );
+                    }
                 }
 
                 ldap_free_result($this->lastResult);

From 6bae2e0a5346d7533a497bb090500f4b44461722 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 4 Feb 2015 10:46:36 +0100
Subject: [PATCH 0549/2920] Note that our license is GPL v2 or any later
 version in our license header instead of pointing to the license's URL

---
 Vagrantfile                                                     | 2 +-
 application/clicommands/AutocompleteCommand.php                 | 2 +-
 application/clicommands/HelpCommand.php                         | 2 +-
 application/clicommands/ModuleCommand.php                       | 2 +-
 application/clicommands/WebCommand.php                          | 2 +-
 application/controllers/AuthenticationController.php            | 2 +-
 application/controllers/ConfigController.php                    | 2 +-
 application/controllers/DashboardController.php                 | 2 +-
 application/controllers/ErrorController.php                     | 2 +-
 application/controllers/FilterController.php                    | 2 +-
 application/controllers/IndexController.php                     | 2 +-
 application/controllers/LayoutController.php                    | 2 +-
 application/controllers/ListController.php                      | 2 +-
 application/controllers/PreferenceController.php                | 2 +-
 application/controllers/RolesController.php                     | 2 +-
 application/controllers/SearchController.php                    | 2 +-
 application/controllers/StaticController.php                    | 2 +-
 application/forms/Authentication/LoginForm.php                  | 2 +-
 application/forms/Config/Authentication/DbBackendForm.php       | 2 +-
 application/forms/Config/Authentication/ExternalBackendForm.php | 2 +-
 application/forms/Config/Authentication/LdapBackendForm.php     | 2 +-
 application/forms/Config/AuthenticationBackendConfigForm.php    | 2 +-
 application/forms/Config/AuthenticationBackendReorderForm.php   | 2 +-
 application/forms/Config/General/ApplicationConfigForm.php      | 2 +-
 application/forms/Config/General/LoggingConfigForm.php          | 2 +-
 application/forms/Config/GeneralConfigForm.php                  | 2 +-
 application/forms/Config/Resource/DbResourceForm.php            | 2 +-
 application/forms/Config/Resource/FileResourceForm.php          | 2 +-
 application/forms/Config/Resource/LdapResourceForm.php          | 2 +-
 application/forms/Config/Resource/LivestatusResourceForm.php    | 2 +-
 application/forms/Config/ResourceConfigForm.php                 | 2 +-
 application/forms/ConfigForm.php                                | 2 +-
 application/forms/ConfirmRemovalForm.php                        | 2 +-
 application/forms/Dashboard/DashletForm.php                     | 2 +-
 application/forms/LdapDiscoveryForm.php                         | 2 +-
 application/forms/PreferenceForm.php                            | 2 +-
 application/forms/Security/RoleForm.php                         | 2 +-
 application/views/helpers/DateFormat.php                        | 2 +-
 application/views/helpers/FormDateTime.php                      | 2 +-
 application/views/helpers/FormNumber.php                        | 2 +-
 application/views/helpers/FormTriStateCheckbox.php              | 2 +-
 application/views/helpers/Util.php                              | 2 +-
 bin/icingacli                                                   | 2 +-
 bin/license_writer.py                                           | 2 +-
 etc/schema/mysql.schema.sql                                     | 2 +-
 etc/schema/pgsql.schema.sql                                     | 2 +-
 icingaweb2.spec                                                 | 2 +-
 library/Icinga/Application/ApplicationBootstrap.php             | 2 +-
 library/Icinga/Application/Benchmark.php                        | 2 +-
 library/Icinga/Application/Cli.php                              | 2 +-
 library/Icinga/Application/Config.php                           | 2 +-
 library/Icinga/Application/EmbeddedWeb.php                      | 2 +-
 library/Icinga/Application/Icinga.php                           | 2 +-
 library/Icinga/Application/LegacyWeb.php                        | 2 +-
 library/Icinga/Application/Loader.php                           | 2 +-
 library/Icinga/Application/Logger.php                           | 2 +-
 library/Icinga/Application/Logger/LogWriter.php                 | 2 +-
 library/Icinga/Application/Logger/Writer/FileWriter.php         | 2 +-
 library/Icinga/Application/Logger/Writer/StdoutWriter.php       | 2 +-
 library/Icinga/Application/Logger/Writer/SyslogWriter.php       | 2 +-
 library/Icinga/Application/Modules/Manager.php                  | 2 +-
 library/Icinga/Application/Modules/Module.php                   | 2 +-
 library/Icinga/Application/Platform.php                         | 2 +-
 library/Icinga/Application/Web.php                              | 2 +-
 library/Icinga/Application/functions.php                        | 2 +-
 library/Icinga/Application/webrouter.php                        | 2 +-
 library/Icinga/Authentication/AdmissionLoader.php               | 2 +-
 library/Icinga/Authentication/AuthChain.php                     | 2 +-
 library/Icinga/Authentication/Backend/DbUserBackend.php         | 2 +-
 library/Icinga/Authentication/Backend/DbUserGroupBackend.php    | 2 +-
 library/Icinga/Authentication/Backend/ExternalBackend.php       | 2 +-
 library/Icinga/Authentication/Backend/IniUserGroupBackend.php   | 2 +-
 library/Icinga/Authentication/Backend/LdapUserBackend.php       | 2 +-
 library/Icinga/Authentication/Manager.php                       | 2 +-
 library/Icinga/Authentication/UserBackend.php                   | 2 +-
 library/Icinga/Authentication/UserGroupBackend.php              | 2 +-
 library/Icinga/Chart/Axis.php                                   | 2 +-
 library/Icinga/Chart/Chart.php                                  | 2 +-
 library/Icinga/Chart/Format.php                                 | 2 +-
 library/Icinga/Chart/Graph/BarGraph.php                         | 2 +-
 library/Icinga/Chart/Graph/LineGraph.php                        | 2 +-
 library/Icinga/Chart/Graph/StackedGraph.php                     | 2 +-
 library/Icinga/Chart/Graph/Tooltip.php                          | 2 +-
 library/Icinga/Chart/GridChart.php                              | 2 +-
 library/Icinga/Chart/Inline/Inline.php                          | 2 +-
 library/Icinga/Chart/Inline/PieChart.php                        | 2 +-
 library/Icinga/Chart/Legend.php                                 | 2 +-
 library/Icinga/Chart/Palette.php                                | 2 +-
 library/Icinga/Chart/PieChart.php                               | 2 +-
 library/Icinga/Chart/Primitive/Animatable.php                   | 2 +-
 library/Icinga/Chart/Primitive/Animation.php                    | 2 +-
 library/Icinga/Chart/Primitive/Canvas.php                       | 2 +-
 library/Icinga/Chart/Primitive/Circle.php                       | 2 +-
 library/Icinga/Chart/Primitive/Drawable.php                     | 2 +-
 library/Icinga/Chart/Primitive/Line.php                         | 2 +-
 library/Icinga/Chart/Primitive/Path.php                         | 2 +-
 library/Icinga/Chart/Primitive/PieSlice.php                     | 2 +-
 library/Icinga/Chart/Primitive/RawElement.php                   | 2 +-
 library/Icinga/Chart/Primitive/Rect.php                         | 2 +-
 library/Icinga/Chart/Primitive/Styleable.php                    | 2 +-
 library/Icinga/Chart/Primitive/Text.php                         | 2 +-
 library/Icinga/Chart/Render/LayoutBox.php                       | 2 +-
 library/Icinga/Chart/Render/RenderContext.php                   | 2 +-
 library/Icinga/Chart/Render/Rotator.php                         | 2 +-
 library/Icinga/Chart/SVGRenderer.php                            | 2 +-
 library/Icinga/Chart/Unit/AxisUnit.php                          | 2 +-
 library/Icinga/Chart/Unit/CalendarUnit.php                      | 2 +-
 library/Icinga/Chart/Unit/LinearUnit.php                        | 2 +-
 library/Icinga/Chart/Unit/LogarithmicUnit.php                   | 2 +-
 library/Icinga/Chart/Unit/StaticAxis.php                        | 2 +-
 library/Icinga/Cli/AnsiScreen.php                               | 2 +-
 library/Icinga/Cli/Command.php                                  | 2 +-
 library/Icinga/Cli/Documentation.php                            | 2 +-
 library/Icinga/Cli/Documentation/CommentParser.php              | 2 +-
 library/Icinga/Cli/Loader.php                                   | 2 +-
 library/Icinga/Cli/Params.php                                   | 2 +-
 library/Icinga/Cli/Screen.php                                   | 2 +-
 library/Icinga/Data/Browsable.php                               | 2 +-
 library/Icinga/Data/ConfigObject.php                            | 2 +-
 library/Icinga/Data/ConnectionInterface.php                     | 2 +-
 library/Icinga/Data/DataArray/ArrayDatasource.php               | 2 +-
 library/Icinga/Data/Db/DbConnection.php                         | 2 +-
 library/Icinga/Data/Db/DbQuery.php                              | 2 +-
 library/Icinga/Data/Fetchable.php                               | 2 +-
 library/Icinga/Data/Filter/Filter.php                           | 2 +-
 library/Icinga/Data/Filter/FilterAnd.php                        | 2 +-
 library/Icinga/Data/Filter/FilterChain.php                      | 2 +-
 library/Icinga/Data/Filter/FilterEqual.php                      | 2 +-
 library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php         | 2 +-
 library/Icinga/Data/Filter/FilterEqualOrLessThan.php            | 2 +-
 library/Icinga/Data/Filter/FilterException.php                  | 2 +-
 library/Icinga/Data/Filter/FilterExpression.php                 | 2 +-
 library/Icinga/Data/Filter/FilterGreaterThan.php                | 2 +-
 library/Icinga/Data/Filter/FilterLessThan.php                   | 2 +-
 library/Icinga/Data/Filter/FilterMatch.php                      | 2 +-
 library/Icinga/Data/Filter/FilterMatchNot.php                   | 2 +-
 library/Icinga/Data/Filter/FilterNot.php                        | 2 +-
 library/Icinga/Data/Filter/FilterNotEqual.php                   | 2 +-
 library/Icinga/Data/Filter/FilterOr.php                         | 2 +-
 library/Icinga/Data/Filter/FilterParseException.php             | 2 +-
 library/Icinga/Data/Filter/FilterQueryString.php                | 2 +-
 library/Icinga/Data/Filterable.php                              | 2 +-
 library/Icinga/Data/Identifiable.php                            | 2 +-
 library/Icinga/Data/Limitable.php                               | 2 +-
 library/Icinga/Data/PivotTable.php                              | 2 +-
 library/Icinga/Data/QueryInterface.php                          | 2 +-
 library/Icinga/Data/Queryable.php                               | 2 +-
 library/Icinga/Data/ResourceFactory.php                         | 2 +-
 library/Icinga/Data/Selectable.php                              | 2 +-
 library/Icinga/Data/SimpleQuery.php                             | 2 +-
 library/Icinga/Data/Sortable.php                                | 2 +-
 library/Icinga/Data/Tree/Node.php                               | 2 +-
 library/Icinga/Data/Tree/NodeInterface.php                      | 2 +-
 library/Icinga/Exception/AuthenticationException.php            | 2 +-
 library/Icinga/Exception/ConfigurationError.php                 | 2 +-
 library/Icinga/Exception/IcingaException.php                    | 2 +-
 library/Icinga/Exception/InvalidPropertyException.php           | 2 +-
 library/Icinga/Exception/MissingParameterException.php          | 2 +-
 library/Icinga/Exception/NotFoundError.php                      | 2 +-
 library/Icinga/Exception/NotImplementedError.php                | 2 +-
 library/Icinga/Exception/NotReadableError.php                   | 2 +-
 library/Icinga/Exception/NotWritableError.php                   | 2 +-
 library/Icinga/Exception/ProgrammingError.php                   | 2 +-
 library/Icinga/Exception/QueryException.php                     | 2 +-
 library/Icinga/Exception/SystemPermissionException.php          | 2 +-
 library/Icinga/File/Csv.php                                     | 2 +-
 library/Icinga/File/FileExtensionFilterIterator.php             | 2 +-
 library/Icinga/File/Ini/IniEditor.php                           | 2 +-
 library/Icinga/File/Ini/IniWriter.php                           | 2 +-
 library/Icinga/File/NonEmptyFileIterator.php                    | 2 +-
 library/Icinga/File/Pdf.php                                     | 2 +-
 library/Icinga/Protocol/Dns.php                                 | 2 +-
 library/Icinga/Protocol/File/Exception/FileReaderException.php  | 2 +-
 library/Icinga/Protocol/File/FileIterator.php                   | 2 +-
 library/Icinga/Protocol/File/FileQuery.php                      | 2 +-
 library/Icinga/Protocol/File/FileReader.php                     | 2 +-
 library/Icinga/Protocol/Ldap/Connection.php                     | 2 +-
 library/Icinga/Protocol/Ldap/Discovery.php                      | 2 +-
 library/Icinga/Protocol/Ldap/Exception.php                      | 2 +-
 library/Icinga/Protocol/Ldap/LdapUtils.php                      | 2 +-
 library/Icinga/Protocol/Ldap/Node.php                           | 2 +-
 library/Icinga/Protocol/Ldap/Query.php                          | 2 +-
 library/Icinga/Protocol/Ldap/Root.php                           | 2 +-
 library/Icinga/Protocol/Livestatus/Connection.php               | 2 +-
 library/Icinga/Protocol/Livestatus/Query.php                    | 2 +-
 library/Icinga/Protocol/Livestatus/ResponseRow.php              | 2 +-
 library/Icinga/Protocol/Nrpe/Connection.php                     | 2 +-
 library/Icinga/Protocol/Nrpe/Packet.php                         | 2 +-
 library/Icinga/Security/SecurityException.php                   | 2 +-
 library/Icinga/Test/BaseTestCase.php                            | 2 +-
 library/Icinga/Test/DbTest.php                                  | 2 +-
 library/Icinga/User.php                                         | 2 +-
 library/Icinga/User/Preferences.php                             | 2 +-
 library/Icinga/User/Preferences/PreferencesStore.php            | 2 +-
 library/Icinga/User/Preferences/Store/DbStore.php               | 2 +-
 library/Icinga/User/Preferences/Store/IniStore.php              | 2 +-
 library/Icinga/Util/Color.php                                   | 2 +-
 library/Icinga/Util/ConfigAwareFactory.php                      | 2 +-
 library/Icinga/Util/DateTimeFactory.php                         | 2 +-
 library/Icinga/Util/Dimension.php                               | 2 +-
 library/Icinga/Util/EnumeratingFilterIterator.php               | 2 +-
 library/Icinga/Util/File.php                                    | 2 +-
 library/Icinga/Util/Format.php                                  | 2 +-
 library/Icinga/Util/String.php                                  | 2 +-
 library/Icinga/Util/TimezoneDetect.php                          | 2 +-
 library/Icinga/Util/Translator.php                              | 2 +-
 library/Icinga/Web/Controller.php                               | 2 +-
 library/Icinga/Web/Controller/ActionController.php              | 2 +-
 library/Icinga/Web/Controller/BasePreferenceController.php      | 2 +-
 library/Icinga/Web/Controller/ControllerTabCollector.php        | 2 +-
 library/Icinga/Web/Controller/ModuleActionController.php        | 2 +-
 library/Icinga/Web/FileCache.php                                | 2 +-
 library/Icinga/Web/Form.php                                     | 2 +-
 library/Icinga/Web/Form/Decorator/ConditionalHidden.php         | 2 +-
 library/Icinga/Web/Form/Decorator/ElementDoubler.php            | 2 +-
 library/Icinga/Web/Form/Decorator/NoScriptApply.php             | 2 +-
 library/Icinga/Web/Form/Element/Button.php                      | 2 +-
 library/Icinga/Web/Form/Element/CsrfCounterMeasure.php          | 2 +-
 library/Icinga/Web/Form/Element/DateTimePicker.php              | 2 +-
 library/Icinga/Web/Form/Element/Note.php                        | 2 +-
 library/Icinga/Web/Form/Element/Number.php                      | 2 +-
 library/Icinga/Web/Form/Element/TriStateCheckbox.php            | 2 +-
 library/Icinga/Web/Form/FormElement.php                         | 2 +-
 library/Icinga/Web/Form/InvalidCSRFTokenException.php           | 2 +-
 library/Icinga/Web/Form/Validator/DateFormatValidator.php       | 2 +-
 library/Icinga/Web/Form/Validator/DateTimeValidator.php         | 2 +-
 library/Icinga/Web/Form/Validator/ReadablePathValidator.php     | 2 +-
 library/Icinga/Web/Form/Validator/TimeFormatValidator.php       | 2 +-
 library/Icinga/Web/Form/Validator/TriStateValidator.php         | 2 +-
 library/Icinga/Web/Form/Validator/WritablePathValidator.php     | 2 +-
 library/Icinga/Web/Hook.php                                     | 2 +-
 library/Icinga/Web/Hook/GrapherHook.php                         | 2 +-
 library/Icinga/Web/Hook/TicketHook.php                          | 2 +-
 library/Icinga/Web/Hook/WebBaseHook.php                         | 2 +-
 library/Icinga/Web/JavaScript.php                               | 2 +-
 library/Icinga/Web/LessCompiler.php                             | 2 +-
 library/Icinga/Web/Menu.php                                     | 2 +-
 library/Icinga/Web/Menu/ForeignMenuItemRenderer.php             | 2 +-
 library/Icinga/Web/Menu/MenuItemRenderer.php                    | 2 +-
 library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php          | 2 +-
 library/Icinga/Web/Menu/ProblemMenuItemRenderer.php             | 2 +-
 library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php       | 2 +-
 library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php    | 2 +-
 library/Icinga/Web/MenuRenderer.php                             | 2 +-
 library/Icinga/Web/Notification.php                             | 2 +-
 library/Icinga/Web/Paginator/Adapter/QueryAdapter.php           | 2 +-
 .../Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php   | 2 +-
 library/Icinga/Web/Request.php                                  | 2 +-
 library/Icinga/Web/Response.php                                 | 2 +-
 library/Icinga/Web/Session.php                                  | 2 +-
 library/Icinga/Web/Session/PhpSession.php                       | 2 +-
 library/Icinga/Web/Session/Session.php                          | 2 +-
 library/Icinga/Web/Session/SessionNamespace.php                 | 2 +-
 library/Icinga/Web/StyleSheet.php                               | 2 +-
 library/Icinga/Web/Url.php                                      | 2 +-
 library/Icinga/Web/UrlParams.php                                | 2 +-
 library/Icinga/Web/View.php                                     | 2 +-
 library/Icinga/Web/View/DateTimeRenderer.php                    | 2 +-
 library/Icinga/Web/View/helpers/format.php                      | 2 +-
 library/Icinga/Web/View/helpers/generic.php                     | 2 +-
 library/Icinga/Web/View/helpers/url.php                         | 2 +-
 library/Icinga/Web/ViewStream.php                               | 2 +-
 library/Icinga/Web/Widget.php                                   | 2 +-
 library/Icinga/Web/Widget/AbstractWidget.php                    | 2 +-
 library/Icinga/Web/Widget/Chart/HistoryColorGrid.php            | 2 +-
 library/Icinga/Web/Widget/Chart/InlinePie.php                   | 2 +-
 library/Icinga/Web/Widget/Dashboard.php                         | 2 +-
 library/Icinga/Web/Widget/Dashboard/Dashlet.php                 | 2 +-
 library/Icinga/Web/Widget/Dashboard/Pane.php                    | 2 +-
 library/Icinga/Web/Widget/Dashboard/UserWidget.php              | 2 +-
 library/Icinga/Web/Widget/FilterEditor.php                      | 2 +-
 library/Icinga/Web/Widget/FilterWidget.php                      | 2 +-
 library/Icinga/Web/Widget/Limiter.php                           | 2 +-
 library/Icinga/Web/Widget/SearchDashboard.php                   | 2 +-
 library/Icinga/Web/Widget/SortBox.php                           | 2 +-
 library/Icinga/Web/Widget/Tab.php                               | 2 +-
 library/Icinga/Web/Widget/Tabextension/BasketAction.php         | 2 +-
 library/Icinga/Web/Widget/Tabextension/DashboardAction.php      | 2 +-
 library/Icinga/Web/Widget/Tabextension/DashboardSettings.php    | 2 +-
 library/Icinga/Web/Widget/Tabextension/OutputFormat.php         | 2 +-
 library/Icinga/Web/Widget/Tabextension/Tabextension.php         | 2 +-
 library/Icinga/Web/Widget/Tabs.php                              | 2 +-
 library/Icinga/Web/Widget/Widget.php                            | 2 +-
 library/Icinga/Web/Window.php                                   | 2 +-
 library/Icinga/Web/Wizard.php                                   | 2 +-
 modules/doc/application/controllers/IcingawebController.php     | 2 +-
 modules/doc/application/controllers/IndexController.php         | 2 +-
 modules/doc/application/controllers/ModuleController.php        | 2 +-
 modules/doc/application/controllers/StyleController.php         | 2 +-
 modules/doc/configuration.php                                   | 2 +-
 modules/doc/library/Doc/DocController.php                       | 2 +-
 modules/doc/library/Doc/DocIterator.php                         | 2 +-
 modules/doc/library/Doc/DocParser.php                           | 2 +-
 modules/doc/library/Doc/DocTree.php                             | 2 +-
 modules/doc/library/Doc/Exception/ChapterNotFoundException.php  | 2 +-
 modules/doc/library/Doc/Exception/DocEmptyException.php         | 2 +-
 modules/doc/library/Doc/Exception/DocException.php              | 2 +-
 modules/doc/library/Doc/Renderer.php                            | 2 +-
 modules/doc/library/Doc/Section.php                             | 2 +-
 modules/doc/library/Doc/SectionFilterIterator.php               | 2 +-
 modules/doc/library/Doc/SectionRenderer.php                     | 2 +-
 modules/doc/library/Doc/TocRenderer.php                         | 2 +-
 modules/doc/public/css/module.less                              | 2 +-
 modules/doc/run.php                                             | 2 +-
 .../monitoring/application/clicommands/ConferenceCommand.php    | 2 +-
 modules/monitoring/application/clicommands/ListCommand.php      | 2 +-
 modules/monitoring/application/clicommands/NrpeCommand.php      | 2 +-
 .../application/controllers/AlertsummaryController.php          | 2 +-
 modules/monitoring/application/controllers/ChartController.php  | 2 +-
 modules/monitoring/application/controllers/ConfigController.php | 2 +-
 modules/monitoring/application/controllers/HostController.php   | 2 +-
 modules/monitoring/application/controllers/HostsController.php  | 2 +-
 modules/monitoring/application/controllers/ListController.php   | 2 +-
 .../monitoring/application/controllers/ProcessController.php    | 2 +-
 .../monitoring/application/controllers/ServiceController.php    | 2 +-
 .../monitoring/application/controllers/ServicesController.php   | 2 +-
 modules/monitoring/application/controllers/ShowController.php   | 2 +-
 .../monitoring/application/controllers/TacticalController.php   | 2 +-
 .../monitoring/application/controllers/TimelineController.php   | 2 +-
 modules/monitoring/application/forms/Command/CommandForm.php    | 2 +-
 .../Command/Instance/DisableNotificationsExpireCommandForm.php  | 2 +-
 .../Command/Instance/ToggleInstanceFeaturesCommandForm.php      | 2 +-
 .../forms/Command/Object/AcknowledgeProblemCommandForm.php      | 2 +-
 .../application/forms/Command/Object/AddCommentCommandForm.php  | 2 +-
 .../application/forms/Command/Object/CheckNowCommandForm.php    | 2 +-
 .../forms/Command/Object/DeleteCommentCommandForm.php           | 2 +-
 .../forms/Command/Object/DeleteDowntimeCommandForm.php          | 2 +-
 .../application/forms/Command/Object/ObjectsCommandForm.php     | 2 +-
 .../forms/Command/Object/ProcessCheckResultCommandForm.php      | 2 +-
 .../forms/Command/Object/RemoveAcknowledgementCommandForm.php   | 2 +-
 .../forms/Command/Object/ScheduleHostCheckCommandForm.php       | 2 +-
 .../forms/Command/Object/ScheduleHostDowntimeCommandForm.php    | 2 +-
 .../forms/Command/Object/ScheduleServiceCheckCommandForm.php    | 2 +-
 .../forms/Command/Object/ScheduleServiceDowntimeCommandForm.php | 2 +-
 .../forms/Command/Object/ToggleObjectFeaturesCommandForm.php    | 2 +-
 .../monitoring/application/forms/Config/BackendConfigForm.php   | 2 +-
 .../application/forms/Config/Instance/LocalInstanceForm.php     | 2 +-
 .../application/forms/Config/Instance/RemoteInstanceForm.php    | 2 +-
 .../monitoring/application/forms/Config/InstanceConfigForm.php  | 2 +-
 .../monitoring/application/forms/Config/SecurityConfigForm.php  | 2 +-
 modules/monitoring/application/forms/EventOverviewForm.php      | 2 +-
 modules/monitoring/application/forms/Setup/BackendPage.php      | 2 +-
 modules/monitoring/application/forms/Setup/IdoResourcePage.php  | 2 +-
 modules/monitoring/application/forms/Setup/InstancePage.php     | 2 +-
 .../application/forms/Setup/LivestatusResourcePage.php          | 2 +-
 modules/monitoring/application/forms/Setup/SecurityPage.php     | 2 +-
 modules/monitoring/application/forms/Setup/WelcomePage.php      | 2 +-
 modules/monitoring/application/forms/StatehistoryForm.php       | 2 +-
 .../monitoring/application/views/helpers/CheckPerformance.php   | 2 +-
 modules/monitoring/application/views/helpers/ContactFlags.php   | 2 +-
 modules/monitoring/application/views/helpers/Customvar.php      | 2 +-
 modules/monitoring/application/views/helpers/Link.php           | 2 +-
 .../monitoring/application/views/helpers/MonitoringFlags.php    | 2 +-
 modules/monitoring/application/views/helpers/Perfdata.php       | 2 +-
 modules/monitoring/application/views/helpers/PluginOutput.php   | 2 +-
 modules/monitoring/application/views/helpers/ResolveMacros.php  | 2 +-
 .../monitoring/application/views/helpers/RuntimeVariables.php   | 2 +-
 .../monitoring/application/views/helpers/SelectionToolbar.php   | 2 +-
 modules/monitoring/configuration.php                            | 2 +-
 modules/monitoring/library/Monitoring/Backend.php               | 2 +-
 .../monitoring/library/Monitoring/Backend/Ido/IdoBackend.php    | 2 +-
 .../library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php   | 2 +-
 .../library/Monitoring/Backend/Ido/Query/CommandQuery.php       | 2 +-
 .../library/Monitoring/Backend/Ido/Query/CommentQuery.php       | 2 +-
 .../Backend/Ido/Query/CommentdeletionhistoryQuery.php           | 2 +-
 .../Monitoring/Backend/Ido/Query/CommenthistoryQuery.php        | 2 +-
 .../library/Monitoring/Backend/Ido/Query/ContactQuery.php       | 2 +-
 .../library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php  | 2 +-
 .../library/Monitoring/Backend/Ido/Query/CustomvarQuery.php     | 2 +-
 .../library/Monitoring/Backend/Ido/Query/DowntimeQuery.php      | 2 +-
 .../Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php    | 2 +-
 .../Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php  | 2 +-
 .../library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php  | 2 +-
 .../library/Monitoring/Backend/Ido/Query/EventgridQuery.php     | 2 +-
 .../library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php  | 2 +-
 .../library/Monitoring/Backend/Ido/Query/HostgroupQuery.php     | 2 +-
 .../library/Monitoring/Backend/Ido/Query/HoststatusQuery.php    | 2 +-
 .../library/Monitoring/Backend/Ido/Query/IdoQuery.php           | 2 +-
 .../library/Monitoring/Backend/Ido/Query/NotificationQuery.php  | 2 +-
 .../Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php   | 2 +-
 .../library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php | 2 +-
 .../Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php        | 2 +-
 .../Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php      | 2 +-
 .../library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php  | 2 +-
 .../library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php  | 2 +-
 .../library/Monitoring/Backend/Ido/Query/StatusQuery.php        | 2 +-
 .../library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php | 2 +-
 .../library/Monitoring/Backend/Livestatus/LivestatusBackend.php | 2 +-
 .../Monitoring/Backend/Livestatus/Query/DowntimeQuery.php       | 2 +-
 .../Monitoring/Backend/Livestatus/Query/HostgroupQuery.php      | 2 +-
 .../Monitoring/Backend/Livestatus/Query/ServicegroupQuery.php   | 2 +-
 .../library/Monitoring/Backend/Livestatus/Query/StatusQuery.php | 2 +-
 .../Monitoring/Backend/Livestatus/Query/StatusSummaryQuery.php  | 2 +-
 .../monitoring/library/Monitoring/Backend/MonitoringBackend.php | 2 +-
 modules/monitoring/library/Monitoring/BackendStep.php           | 2 +-
 modules/monitoring/library/Monitoring/Cli/CliUtils.php          | 2 +-
 .../library/Monitoring/Command/Exception/TransportException.php | 2 +-
 modules/monitoring/library/Monitoring/Command/IcingaCommand.php | 2 +-
 .../Command/Instance/DisableNotificationsExpireCommand.php      | 2 +-
 .../Command/Instance/ToggleInstanceFeatureCommand.php           | 2 +-
 .../Monitoring/Command/Object/AcknowledgeProblemCommand.php     | 2 +-
 .../library/Monitoring/Command/Object/AddCommentCommand.php     | 2 +-
 .../library/Monitoring/Command/Object/DeleteCommentCommand.php  | 2 +-
 .../library/Monitoring/Command/Object/DeleteDowntimeCommand.php | 2 +-
 .../library/Monitoring/Command/Object/ObjectCommand.php         | 2 +-
 .../Monitoring/Command/Object/ProcessCheckResultCommand.php     | 2 +-
 .../Monitoring/Command/Object/PropagateHostDowntimeCommand.php  | 2 +-
 .../Monitoring/Command/Object/RemoveAcknowledgementCommand.php  | 2 +-
 .../Monitoring/Command/Object/ScheduleHostCheckCommand.php      | 2 +-
 .../Monitoring/Command/Object/ScheduleHostDowntimeCommand.php   | 2 +-
 .../Monitoring/Command/Object/ScheduleServiceCheckCommand.php   | 2 +-
 .../Command/Object/ScheduleServiceDowntimeCommand.php           | 2 +-
 .../Monitoring/Command/Object/ToggleObjectFeatureCommand.php    | 2 +-
 .../library/Monitoring/Command/Object/WithCommentCommand.php    | 2 +-
 .../Command/Renderer/IcingaCommandFileCommandRenderer.php       | 2 +-
 .../Command/Renderer/IcingaCommandRendererInterface.php         | 2 +-
 .../library/Monitoring/Command/Transport/CommandTransport.php   | 2 +-
 .../Monitoring/Command/Transport/CommandTransportInterface.php  | 2 +-
 .../library/Monitoring/Command/Transport/LocalCommandFile.php   | 2 +-
 .../library/Monitoring/Command/Transport/RemoteCommandFile.php  | 2 +-
 modules/monitoring/library/Monitoring/Controller.php            | 2 +-
 modules/monitoring/library/Monitoring/DataView/Command.php      | 2 +-
 modules/monitoring/library/Monitoring/DataView/Comment.php      | 2 +-
 modules/monitoring/library/Monitoring/DataView/Contact.php      | 2 +-
 modules/monitoring/library/Monitoring/DataView/Contactgroup.php | 2 +-
 modules/monitoring/library/Monitoring/DataView/Customvar.php    | 2 +-
 modules/monitoring/library/Monitoring/DataView/DataView.php     | 2 +-
 modules/monitoring/library/Monitoring/DataView/Downtime.php     | 2 +-
 modules/monitoring/library/Monitoring/DataView/EventHistory.php | 2 +-
 modules/monitoring/library/Monitoring/DataView/Eventgrid.php    | 2 +-
 modules/monitoring/library/Monitoring/DataView/Groupsummary.php | 2 +-
 modules/monitoring/library/Monitoring/DataView/HostStatus.php   | 2 +-
 modules/monitoring/library/Monitoring/DataView/Hostgroup.php    | 2 +-
 modules/monitoring/library/Monitoring/DataView/Notification.php | 2 +-
 .../monitoring/library/Monitoring/DataView/Programstatus.php    | 2 +-
 .../monitoring/library/Monitoring/DataView/Runtimesummary.php   | 2 +-
 .../monitoring/library/Monitoring/DataView/Runtimevariables.php | 2 +-
 .../monitoring/library/Monitoring/DataView/ServiceStatus.php    | 2 +-
 modules/monitoring/library/Monitoring/DataView/Servicegroup.php | 2 +-
 .../monitoring/library/Monitoring/DataView/StatusSummary.php    | 2 +-
 modules/monitoring/library/Monitoring/Environment.php           | 2 +-
 .../Monitoring/Exception/UnsupportedBackendException.php        | 2 +-
 modules/monitoring/library/Monitoring/InstanceStep.php          | 2 +-
 modules/monitoring/library/Monitoring/MonitoringWizard.php      | 2 +-
 modules/monitoring/library/Monitoring/Object/Host.php           | 2 +-
 modules/monitoring/library/Monitoring/Object/HostList.php       | 2 +-
 .../monitoring/library/Monitoring/Object/MonitoredObject.php    | 2 +-
 modules/monitoring/library/Monitoring/Object/ObjectList.php     | 2 +-
 modules/monitoring/library/Monitoring/Object/Service.php        | 2 +-
 modules/monitoring/library/Monitoring/Object/ServiceList.php    | 2 +-
 modules/monitoring/library/Monitoring/Plugin.php                | 2 +-
 modules/monitoring/library/Monitoring/Plugin/Perfdata.php       | 2 +-
 modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php    | 2 +-
 modules/monitoring/library/Monitoring/SecurityStep.php          | 2 +-
 modules/monitoring/library/Monitoring/Timeline/TimeEntry.php    | 2 +-
 modules/monitoring/library/Monitoring/Timeline/TimeLine.php     | 2 +-
 modules/monitoring/library/Monitoring/Timeline/TimeRange.php    | 2 +-
 .../Monitoring/Web/Controller/MonitoredObjectController.php     | 2 +-
 .../monitoring/library/Monitoring/Web/Hook/HostActionsHook.php  | 2 +-
 .../library/Monitoring/Web/Hook/TimelineProviderHook.php        | 2 +-
 modules/monitoring/library/Monitoring/Web/Widget/SelectBox.php  | 2 +-
 modules/monitoring/public/css/module.less                       | 2 +-
 modules/monitoring/public/js/module.js                          | 2 +-
 .../test/php/application/views/helpers/MonitoringFlagsTest.php  | 2 +-
 .../test/php/application/views/helpers/ResolveMacrosTest.php    | 2 +-
 .../test/php/library/Monitoring/Plugin/PerfdataSetTest.php      | 2 +-
 .../test/php/library/Monitoring/Plugin/PerfdataTest.php         | 2 +-
 modules/monitoring/test/php/regression/Bug6088Test.php          | 2 +-
 modules/monitoring/test/php/regression/Bug7043Test.php          | 2 +-
 modules/setup/application/clicommands/ConfigCommand.php         | 2 +-
 modules/setup/application/clicommands/TokenCommand.php          | 2 +-
 modules/setup/application/controllers/IndexController.php       | 2 +-
 modules/setup/application/forms/AdminAccountPage.php            | 2 +-
 modules/setup/application/forms/AuthBackendPage.php             | 2 +-
 modules/setup/application/forms/AuthenticationPage.php          | 2 +-
 modules/setup/application/forms/DatabaseCreationPage.php        | 2 +-
 modules/setup/application/forms/DbResourcePage.php              | 2 +-
 modules/setup/application/forms/GeneralConfigPage.php           | 2 +-
 modules/setup/application/forms/LdapDiscoveryConfirmPage.php    | 2 +-
 modules/setup/application/forms/LdapDiscoveryPage.php           | 2 +-
 modules/setup/application/forms/LdapResourcePage.php            | 2 +-
 modules/setup/application/forms/ModulePage.php                  | 2 +-
 modules/setup/application/forms/PreferencesPage.php             | 2 +-
 modules/setup/application/forms/RequirementsPage.php            | 2 +-
 modules/setup/application/forms/SummaryPage.php                 | 2 +-
 modules/setup/application/forms/WelcomePage.php                 | 2 +-
 modules/setup/library/Setup/Exception/SetupException.php        | 2 +-
 modules/setup/library/Setup/Requirements.php                    | 2 +-
 modules/setup/library/Setup/Setup.php                           | 2 +-
 modules/setup/library/Setup/SetupWizard.php                     | 2 +-
 modules/setup/library/Setup/Step.php                            | 2 +-
 modules/setup/library/Setup/Steps/AuthenticationStep.php        | 2 +-
 modules/setup/library/Setup/Steps/DatabaseStep.php              | 2 +-
 modules/setup/library/Setup/Steps/GeneralConfigStep.php         | 2 +-
 modules/setup/library/Setup/Steps/ResourceStep.php              | 2 +-
 modules/setup/library/Setup/Utils/DbTool.php                    | 2 +-
 modules/setup/library/Setup/Utils/EnableModuleStep.php          | 2 +-
 modules/setup/library/Setup/Utils/MakeDirStep.php               | 2 +-
 .../setup/library/Setup/Web/Form/Validator/TokenValidator.php   | 2 +-
 modules/setup/library/Setup/WebWizard.php                       | 2 +-
 modules/setup/library/Setup/Webserver.php                       | 2 +-
 modules/setup/library/Setup/Webserver/Apache.php                | 2 +-
 modules/setup/library/Setup/Webserver/Nginx.php                 | 2 +-
 modules/test/application/clicommands/PhpCommand.php             | 2 +-
 modules/translation/application/clicommands/CompileCommand.php  | 2 +-
 modules/translation/application/clicommands/RefreshCommand.php  | 2 +-
 .../translation/library/Translation/Cli/TranslationCommand.php  | 2 +-
 .../library/Translation/Util/GettextTranslationHelper.php       | 2 +-
 packages/files/bin/icingacli                                    | 2 +-
 packages/files/public/index.php                                 | 2 +-
 public/css/icinga/defaults.less                                 | 2 +-
 public/css/icinga/forms.less                                    | 2 +-
 public/css/icinga/header-elements.less                          | 2 +-
 public/css/icinga/layout-colors.less                            | 2 +-
 public/css/icinga/layout-structure.less                         | 2 +-
 public/css/icinga/login.less                                    | 2 +-
 public/css/icinga/main-content.less                             | 2 +-
 public/css/icinga/menu.less                                     | 2 +-
 public/css/icinga/monitoring-colors.less                        | 2 +-
 public/css/icinga/pagination.less                               | 2 +-
 public/css/icinga/selection-toolbar.less                        | 2 +-
 public/css/icinga/setup.less                                    | 2 +-
 public/css/icinga/tabs.less                                     | 2 +-
 public/css/icinga/widgets.less                                  | 2 +-
 public/css/pdf/pdfprint.less                                    | 2 +-
 public/index.php                                                | 2 +-
 public/js/helpers.js                                            | 2 +-
 public/js/icinga.js                                             | 2 +-
 public/js/icinga/behavior/form.js                               | 2 +-
 public/js/icinga/behavior/navigation.js                         | 2 +-
 public/js/icinga/behavior/sparkline.js                          | 2 +-
 public/js/icinga/behavior/tooltip.js                            | 2 +-
 public/js/icinga/behavior/tristate.js                           | 2 +-
 public/js/icinga/eventlistener.js                               | 2 +-
 public/js/icinga/events.js                                      | 2 +-
 public/js/icinga/history.js                                     | 2 +-
 public/js/icinga/loader.js                                      | 2 +-
 public/js/icinga/logger.js                                      | 2 +-
 public/js/icinga/module.js                                      | 2 +-
 public/js/icinga/timer.js                                       | 2 +-
 public/js/icinga/timezone.js                                    | 2 +-
 public/js/icinga/ui.js                                          | 2 +-
 public/js/icinga/utils.js                                       | 2 +-
 .../forms/Config/Authentication/DbBackendFormTest.php           | 2 +-
 .../forms/Config/Authentication/LdapBackendFormTest.php         | 2 +-
 .../forms/Config/AuthenticationBackendReorderFormTest.php       | 2 +-
 .../application/forms/Config/Resource/DbResourceFormTest.php    | 2 +-
 .../application/forms/Config/Resource/LdapResourceFormTest.php  | 2 +-
 .../forms/Config/Resource/LivestatusResourceFormTest.php        | 2 +-
 test/php/application/views/helpers/DateFormatTestBroken.php     | 2 +-
 test/php/bootstrap.php                                          | 2 +-
 test/php/library/Icinga/Application/ConfigTest.php              | 2 +-
 test/php/library/Icinga/Application/LoaderTest.php              | 2 +-
 test/php/library/Icinga/Chart/GraphChartTest.php                | 2 +-
 test/php/library/Icinga/Chart/PieChartTest.php                  | 2 +-
 test/php/library/Icinga/Data/ConfigObjectTest.php               | 2 +-
 test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php  | 2 +-
 test/php/library/Icinga/Data/Filter/FilterTest.php              | 2 +-
 test/php/library/Icinga/File/CsvTest.php                        | 2 +-
 test/php/library/Icinga/File/Ini/IniWriterTest.php              | 2 +-
 test/php/library/Icinga/Logger/Writer/StreamWriterTest.php      | 2 +-
 test/php/library/Icinga/Protocol/Ldap/QueryTest.php             | 2 +-
 test/php/library/Icinga/Test/BaseTestCaseTest.php               | 2 +-
 test/php/library/Icinga/User/PreferencesTest.php                | 2 +-
 test/php/library/Icinga/User/Store/DbStoreTest.php              | 2 +-
 test/php/library/Icinga/User/Store/IniStoreTest.php             | 2 +-
 test/php/library/Icinga/UserTest.php                            | 2 +-
 test/php/library/Icinga/Util/DateTimeFactoryTest.php            | 2 +-
 test/php/library/Icinga/Util/DimensionTest.php                  | 2 +-
 test/php/library/Icinga/Util/FileTest.php                       | 2 +-
 test/php/library/Icinga/Util/StringTest.php                     | 2 +-
 test/php/library/Icinga/Util/TranslatorTest.php                 | 2 +-
 test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php | 2 +-
 .../Icinga/Web/Form/Validator/DateFormatValidatorTest.php       | 2 +-
 .../Icinga/Web/Form/Validator/TimeFormatValidatorTest.php       | 2 +-
 .../Icinga/Web/Form/Validator/WritablePathValidatorTest.php     | 2 +-
 test/php/library/Icinga/Web/FormTest.php                        | 2 +-
 test/php/library/Icinga/Web/HookTest.php                        | 2 +-
 test/php/library/Icinga/Web/MenuTest.php                        | 2 +-
 .../Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php      | 2 +-
 test/php/library/Icinga/Web/Session/PhpSessionTest.php          | 2 +-
 test/php/library/Icinga/Web/Session/SessionNamespaceTest.php    | 2 +-
 test/php/library/Icinga/Web/UrlTest.php                         | 2 +-
 test/php/library/Icinga/Web/View/DateTimeRendererTest.php       | 2 +-
 test/php/library/Icinga/Web/Widget/DashboardTest.php            | 2 +-
 test/php/library/Icinga/Web/Widget/SearchDashboardTest.php      | 2 +-
 test/php/regression/Bug4102Test.php                             | 2 +-
 test/php/regression/Bug6284Test.php                             | 2 +-
 test/php/regression/Bug6432Test.php                             | 2 +-
 589 files changed, 589 insertions(+), 589 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 9090b23aa..86de14bb1 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,7 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt
+# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+
 
 VAGRANTFILE_API_VERSION = "2"
 VAGRANT_REQUIRED_VERSION = "1.5.0"
diff --git a/application/clicommands/AutocompleteCommand.php b/application/clicommands/AutocompleteCommand.php
index 045ee8cdc..045110af7 100644
--- a/application/clicommands/AutocompleteCommand.php
+++ b/application/clicommands/AutocompleteCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Clicommands;
 
diff --git a/application/clicommands/HelpCommand.php b/application/clicommands/HelpCommand.php
index 4cc197f3e..a9df177e1 100644
--- a/application/clicommands/HelpCommand.php
+++ b/application/clicommands/HelpCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Clicommands;
 
diff --git a/application/clicommands/ModuleCommand.php b/application/clicommands/ModuleCommand.php
index 5d5c30518..a0c6dba7d 100644
--- a/application/clicommands/ModuleCommand.php
+++ b/application/clicommands/ModuleCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Clicommands;
 
diff --git a/application/clicommands/WebCommand.php b/application/clicommands/WebCommand.php
index 46b4e8a3d..4c283bedd 100644
--- a/application/clicommands/WebCommand.php
+++ b/application/clicommands/WebCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Clicommands;
 
diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index e7a4c82e4..118a953a9 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 # namespace Icinga\Application\Controllers;
 
diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index a1bf52514..bc82b6015 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Application\Config;
 use Icinga\Application\Icinga;
diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 009c715c3..9e7b482a8 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use \Exception;
 use Icinga\Exception\ProgrammingError;
diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index 84d6c0998..6b75c6488 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php
index 78c4c1068..461977c7a 100644
--- a/application/controllers/FilterController.php
+++ b/application/controllers/FilterController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Web\Controller\ActionController;
 use Icinga\Filter\Filter;
diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php
index 6537a0b61..5ffd1970a 100644
--- a/application/controllers/IndexController.php
+++ b/application/controllers/IndexController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 # namespace Icinga\Application\Controllers;
 
diff --git a/application/controllers/LayoutController.php b/application/controllers/LayoutController.php
index ae9df3734..8e391da35 100644
--- a/application/controllers/LayoutController.php
+++ b/application/controllers/LayoutController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Web\MenuRenderer;
 use Icinga\Web\Controller\ActionController;
diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index 1051aeae1..4736720ce 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Web\Url;
diff --git a/application/controllers/PreferenceController.php b/application/controllers/PreferenceController.php
index 7034b953d..e1fd00f46 100644
--- a/application/controllers/PreferenceController.php
+++ b/application/controllers/PreferenceController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Web\Controller\BasePreferenceController;
 use Icinga\Web\Url;
diff --git a/application/controllers/RolesController.php b/application/controllers/RolesController.php
index edf2a3689..7b66b1fa8 100644
--- a/application/controllers/RolesController.php
+++ b/application/controllers/RolesController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Application\Config;
 use Icinga\Forms\ConfirmRemovalForm;
diff --git a/application/controllers/SearchController.php b/application/controllers/SearchController.php
index a9bab30d7..3816eb3e8 100644
--- a/application/controllers/SearchController.php
+++ b/application/controllers/SearchController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Web\Controller\ActionController;
 use Icinga\Web\Widget;
diff --git a/application/controllers/StaticController.php b/application/controllers/StaticController.php
index 549a32419..9f461838c 100644
--- a/application/controllers/StaticController.php
+++ b/application/controllers/StaticController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Web\Controller\ActionController;
 use Icinga\Application\Icinga;
diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index 0b3abaeb2..43fd8823f 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms\Authentication;
 
diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index 2bdb08949..619c7dd5d 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms\Config\Authentication;
 
diff --git a/application/forms/Config/Authentication/ExternalBackendForm.php b/application/forms/Config/Authentication/ExternalBackendForm.php
index 30791cb04..db643b5ff 100644
--- a/application/forms/Config/Authentication/ExternalBackendForm.php
+++ b/application/forms/Config/Authentication/ExternalBackendForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms\Config\Authentication;
 
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index d84bb5bd3..4c7a027a7 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms\Config\Authentication;
 
diff --git a/application/forms/Config/AuthenticationBackendConfigForm.php b/application/forms/Config/AuthenticationBackendConfigForm.php
index 391533ad7..276d73b94 100644
--- a/application/forms/Config/AuthenticationBackendConfigForm.php
+++ b/application/forms/Config/AuthenticationBackendConfigForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms\Config;
 
diff --git a/application/forms/Config/AuthenticationBackendReorderForm.php b/application/forms/Config/AuthenticationBackendReorderForm.php
index a207572c7..e4ac90c12 100644
--- a/application/forms/Config/AuthenticationBackendReorderForm.php
+++ b/application/forms/Config/AuthenticationBackendReorderForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms\Config;
 
diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php
index 0e1ac1f46..64f8855c8 100644
--- a/application/forms/Config/General/ApplicationConfigForm.php
+++ b/application/forms/Config/General/ApplicationConfigForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms\Config\General;
 
diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php
index 12e9ae593..de757eb6e 100644
--- a/application/forms/Config/General/LoggingConfigForm.php
+++ b/application/forms/Config/General/LoggingConfigForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms\Config\General;
 
diff --git a/application/forms/Config/GeneralConfigForm.php b/application/forms/Config/GeneralConfigForm.php
index 22e83ff30..b11b91208 100644
--- a/application/forms/Config/GeneralConfigForm.php
+++ b/application/forms/Config/GeneralConfigForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms\Config;
 
diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
index 56edbf178..7bf0cb8ff 100644
--- a/application/forms/Config/Resource/DbResourceForm.php
+++ b/application/forms/Config/Resource/DbResourceForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms\Config\Resource;
 
diff --git a/application/forms/Config/Resource/FileResourceForm.php b/application/forms/Config/Resource/FileResourceForm.php
index 7d46cc6fb..c1ccd137c 100644
--- a/application/forms/Config/Resource/FileResourceForm.php
+++ b/application/forms/Config/Resource/FileResourceForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms\Config\Resource;
 
diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 6e8052579..499d39941 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms\Config\Resource;
 
diff --git a/application/forms/Config/Resource/LivestatusResourceForm.php b/application/forms/Config/Resource/LivestatusResourceForm.php
index d7bf7d883..5ec3f104b 100644
--- a/application/forms/Config/Resource/LivestatusResourceForm.php
+++ b/application/forms/Config/Resource/LivestatusResourceForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms\Config\Resource;
 
diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php
index 1b860c193..ce99d1e4c 100644
--- a/application/forms/Config/ResourceConfigForm.php
+++ b/application/forms/Config/ResourceConfigForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms\Config;
 
diff --git a/application/forms/ConfigForm.php b/application/forms/ConfigForm.php
index 18410ef2d..e3602966a 100644
--- a/application/forms/ConfigForm.php
+++ b/application/forms/ConfigForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms;
 
diff --git a/application/forms/ConfirmRemovalForm.php b/application/forms/ConfirmRemovalForm.php
index 6ef9258ec..985413907 100644
--- a/application/forms/ConfirmRemovalForm.php
+++ b/application/forms/ConfirmRemovalForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms;
 
diff --git a/application/forms/Dashboard/DashletForm.php b/application/forms/Dashboard/DashletForm.php
index c1e29c063..6a33a439b 100644
--- a/application/forms/Dashboard/DashletForm.php
+++ b/application/forms/Dashboard/DashletForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms\Dashboard;
 
diff --git a/application/forms/LdapDiscoveryForm.php b/application/forms/LdapDiscoveryForm.php
index 7da98a277..e05be6eaa 100644
--- a/application/forms/LdapDiscoveryForm.php
+++ b/application/forms/LdapDiscoveryForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms;
 
diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
index 74a9683e3..424f76578 100644
--- a/application/forms/PreferenceForm.php
+++ b/application/forms/PreferenceForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms;
 
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index caf3fb872..85691de24 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Forms\Security;
 
diff --git a/application/views/helpers/DateFormat.php b/application/views/helpers/DateFormat.php
index 727c9c8f9..3fd323340 100644
--- a/application/views/helpers/DateFormat.php
+++ b/application/views/helpers/DateFormat.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Application\Icinga;
 use Icinga\Util\DateTimeFactory;
diff --git a/application/views/helpers/FormDateTime.php b/application/views/helpers/FormDateTime.php
index 29bec0c16..1196b54b5 100644
--- a/application/views/helpers/FormDateTime.php
+++ b/application/views/helpers/FormDateTime.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
  * Render date-and-time input controls
diff --git a/application/views/helpers/FormNumber.php b/application/views/helpers/FormNumber.php
index 1f8efd83b..8f18a14a0 100644
--- a/application/views/helpers/FormNumber.php
+++ b/application/views/helpers/FormNumber.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use \Zend_View_Helper_FormElement;
 
diff --git a/application/views/helpers/FormTriStateCheckbox.php b/application/views/helpers/FormTriStateCheckbox.php
index 107abee4d..61089cc51 100644
--- a/application/views/helpers/FormTriStateCheckbox.php
+++ b/application/views/helpers/FormTriStateCheckbox.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use \Zend_View_Helper_FormElement;
 
diff --git a/application/views/helpers/Util.php b/application/views/helpers/Util.php
index 25e506b25..58486c0c7 100644
--- a/application/views/helpers/Util.php
+++ b/application/views/helpers/Util.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
  * Class Zend_View_Helper_Util
diff --git a/bin/icingacli b/bin/icingacli
index 5a2d4c957..19d786af7 100755
--- a/bin/icingacli
+++ b/bin/icingacli
@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 require_once dirname(__DIR__) . '/library/Icinga/Application/Cli.php';
 
diff --git a/bin/license_writer.py b/bin/license_writer.py
index b904dd34e..afe2f33b5 100755
--- a/bin/license_writer.py
+++ b/bin/license_writer.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt
+# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+
 
 import sys
 import logging
diff --git a/etc/schema/mysql.schema.sql b/etc/schema/mysql.schema.sql
index c1ffcf91f..16ba9f4ff 100644
--- a/etc/schema/mysql.schema.sql
+++ b/etc/schema/mysql.schema.sql
@@ -1,4 +1,4 @@
-# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt
+# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+
 
 CREATE TABLE `icingaweb_group`(
   `name`   varchar(64) COLLATE utf8_unicode_ci NOT NULL,
diff --git a/etc/schema/pgsql.schema.sql b/etc/schema/pgsql.schema.sql
index bbaba8253..034d8288a 100644
--- a/etc/schema/pgsql.schema.sql
+++ b/etc/schema/pgsql.schema.sql
@@ -1,4 +1,4 @@
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 CREATE TABLE "icingaweb_group" (
   "name"   character varying(64) NOT NULL,
diff --git a/icingaweb2.spec b/icingaweb2.spec
index c69cbca6c..9a40e59e6 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -1,4 +1,4 @@
-# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt
+# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+
 
 %define revision 2.rc1
 
diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 4154124af..41df56d85 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Benchmark.php b/library/Icinga/Application/Benchmark.php
index c33f718c0..bad2db268 100644
--- a/library/Icinga/Application/Benchmark.php
+++ b/library/Icinga/Application/Benchmark.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
  * Icinga\Application\Benchmark class
diff --git a/library/Icinga/Application/Cli.php b/library/Icinga/Application/Cli.php
index 20ad3b8a0..4f83c7537 100644
--- a/library/Icinga/Application/Cli.php
+++ b/library/Icinga/Application/Cli.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Config.php b/library/Icinga/Application/Config.php
index 4feed4d25..230a83e05 100644
--- a/library/Icinga/Application/Config.php
+++ b/library/Icinga/Application/Config.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/EmbeddedWeb.php b/library/Icinga/Application/EmbeddedWeb.php
index a6f166f1b..446b77b57 100644
--- a/library/Icinga/Application/EmbeddedWeb.php
+++ b/library/Icinga/Application/EmbeddedWeb.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Icinga.php b/library/Icinga/Application/Icinga.php
index 2c0b6868d..3a1e07bbc 100644
--- a/library/Icinga/Application/Icinga.php
+++ b/library/Icinga/Application/Icinga.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/LegacyWeb.php b/library/Icinga/Application/LegacyWeb.php
index 495bcf204..3e3de9343 100644
--- a/library/Icinga/Application/LegacyWeb.php
+++ b/library/Icinga/Application/LegacyWeb.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Loader.php b/library/Icinga/Application/Loader.php
index 19f62cbcc..8c1c0b9e7 100644
--- a/library/Icinga/Application/Loader.php
+++ b/library/Icinga/Application/Loader.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Logger.php b/library/Icinga/Application/Logger.php
index e4e706891..514cab7fc 100644
--- a/library/Icinga/Application/Logger.php
+++ b/library/Icinga/Application/Logger.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Logger/LogWriter.php b/library/Icinga/Application/Logger/LogWriter.php
index 196be16e8..72bbbb976 100644
--- a/library/Icinga/Application/Logger/LogWriter.php
+++ b/library/Icinga/Application/Logger/LogWriter.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Application\Logger;
 
diff --git a/library/Icinga/Application/Logger/Writer/FileWriter.php b/library/Icinga/Application/Logger/Writer/FileWriter.php
index 6f2e31872..40ff3b6e9 100644
--- a/library/Icinga/Application/Logger/Writer/FileWriter.php
+++ b/library/Icinga/Application/Logger/Writer/FileWriter.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Application\Logger\Writer;
 
diff --git a/library/Icinga/Application/Logger/Writer/StdoutWriter.php b/library/Icinga/Application/Logger/Writer/StdoutWriter.php
index 106c6960a..e0128e867 100644
--- a/library/Icinga/Application/Logger/Writer/StdoutWriter.php
+++ b/library/Icinga/Application/Logger/Writer/StdoutWriter.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 namespace Icinga\Application\Logger\Writer;
 
 use Icinga\Cli\Screen;
diff --git a/library/Icinga/Application/Logger/Writer/SyslogWriter.php b/library/Icinga/Application/Logger/Writer/SyslogWriter.php
index 9f819fcb5..c0717d550 100644
--- a/library/Icinga/Application/Logger/Writer/SyslogWriter.php
+++ b/library/Icinga/Application/Logger/Writer/SyslogWriter.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Application\Logger\Writer;
 
diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php
index a6a77e0d2..ec2193af9 100644
--- a/library/Icinga/Application/Modules/Manager.php
+++ b/library/Icinga/Application/Modules/Manager.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Application\Modules;
 
diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index 0146f6bb5..602811b56 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Application\Modules;
 
diff --git a/library/Icinga/Application/Platform.php b/library/Icinga/Application/Platform.php
index 45c540617..a2ef0a3ef 100644
--- a/library/Icinga/Application/Platform.php
+++ b/library/Icinga/Application/Platform.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 3f5577203..72e91ca92 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Application/functions.php b/library/Icinga/Application/functions.php
index ab2d525fc..3ae0c7ba9 100644
--- a/library/Icinga/Application/functions.php
+++ b/library/Icinga/Application/functions.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Util\Translator;
 
diff --git a/library/Icinga/Application/webrouter.php b/library/Icinga/Application/webrouter.php
index f29db8644..905fa7dca 100644
--- a/library/Icinga/Application/webrouter.php
+++ b/library/Icinga/Application/webrouter.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Application;
 
diff --git a/library/Icinga/Authentication/AdmissionLoader.php b/library/Icinga/Authentication/AdmissionLoader.php
index ea828df53..81b5cafb2 100644
--- a/library/Icinga/Authentication/AdmissionLoader.php
+++ b/library/Icinga/Authentication/AdmissionLoader.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Authentication/AuthChain.php b/library/Icinga/Authentication/AuthChain.php
index b668c3125..9b9f873c5 100644
--- a/library/Icinga/Authentication/AuthChain.php
+++ b/library/Icinga/Authentication/AuthChain.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Authentication/Backend/DbUserBackend.php b/library/Icinga/Authentication/Backend/DbUserBackend.php
index 8888327ef..42322a575 100644
--- a/library/Icinga/Authentication/Backend/DbUserBackend.php
+++ b/library/Icinga/Authentication/Backend/DbUserBackend.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Backend/DbUserGroupBackend.php b/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
index 080899393..d2230bf04 100644
--- a/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Backend/ExternalBackend.php b/library/Icinga/Authentication/Backend/ExternalBackend.php
index 9fbe3282b..fb73c55e8 100644
--- a/library/Icinga/Authentication/Backend/ExternalBackend.php
+++ b/library/Icinga/Authentication/Backend/ExternalBackend.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Backend/IniUserGroupBackend.php b/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
index 23781916d..b7f366511 100644
--- a/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
+++ b/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/Backend/LdapUserBackend.php
index 13c03af58..fd7e39f54 100644
--- a/library/Icinga/Authentication/Backend/LdapUserBackend.php
+++ b/library/Icinga/Authentication/Backend/LdapUserBackend.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Authentication\Backend;
 
diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 0982d8fe9..81221176e 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Authentication/UserBackend.php b/library/Icinga/Authentication/UserBackend.php
index beb5df5b9..b8bde164d 100644
--- a/library/Icinga/Authentication/UserBackend.php
+++ b/library/Icinga/Authentication/UserBackend.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Authentication/UserGroupBackend.php b/library/Icinga/Authentication/UserGroupBackend.php
index 2fc0a5ada..f1289220d 100644
--- a/library/Icinga/Authentication/UserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroupBackend.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Authentication;
 
diff --git a/library/Icinga/Chart/Axis.php b/library/Icinga/Chart/Axis.php
index d52a97b6e..8a0ad5532 100644
--- a/library/Icinga/Chart/Axis.php
+++ b/library/Icinga/Chart/Axis.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Chart.php b/library/Icinga/Chart/Chart.php
index 42bc28ca8..13b0114e6 100644
--- a/library/Icinga/Chart/Chart.php
+++ b/library/Icinga/Chart/Chart.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Format.php b/library/Icinga/Chart/Format.php
index c9699e05c..6eb8c5f52 100644
--- a/library/Icinga/Chart/Format.php
+++ b/library/Icinga/Chart/Format.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Graph/BarGraph.php b/library/Icinga/Chart/Graph/BarGraph.php
index 90582769d..2d20f8f22 100644
--- a/library/Icinga/Chart/Graph/BarGraph.php
+++ b/library/Icinga/Chart/Graph/BarGraph.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart\Graph;
 
diff --git a/library/Icinga/Chart/Graph/LineGraph.php b/library/Icinga/Chart/Graph/LineGraph.php
index cbb9235a9..630223968 100644
--- a/library/Icinga/Chart/Graph/LineGraph.php
+++ b/library/Icinga/Chart/Graph/LineGraph.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 
 namespace Icinga\Chart\Graph;
diff --git a/library/Icinga/Chart/Graph/StackedGraph.php b/library/Icinga/Chart/Graph/StackedGraph.php
index 36ea73721..8fd20ae1d 100644
--- a/library/Icinga/Chart/Graph/StackedGraph.php
+++ b/library/Icinga/Chart/Graph/StackedGraph.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart\Graph;
 
diff --git a/library/Icinga/Chart/Graph/Tooltip.php b/library/Icinga/Chart/Graph/Tooltip.php
index c4ebbffb9..5fa5c3608 100644
--- a/library/Icinga/Chart/Graph/Tooltip.php
+++ b/library/Icinga/Chart/Graph/Tooltip.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart\Graph;
 
diff --git a/library/Icinga/Chart/GridChart.php b/library/Icinga/Chart/GridChart.php
index b95fa1fc4..7f2794282 100644
--- a/library/Icinga/Chart/GridChart.php
+++ b/library/Icinga/Chart/GridChart.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Inline/Inline.php b/library/Icinga/Chart/Inline/Inline.php
index ef22bc02e..71f460593 100644
--- a/library/Icinga/Chart/Inline/Inline.php
+++ b/library/Icinga/Chart/Inline/Inline.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart\Inline;
 
diff --git a/library/Icinga/Chart/Inline/PieChart.php b/library/Icinga/Chart/Inline/PieChart.php
index c9099f5ef..7d8290b25 100644
--- a/library/Icinga/Chart/Inline/PieChart.php
+++ b/library/Icinga/Chart/Inline/PieChart.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart\Inline;
 
diff --git a/library/Icinga/Chart/Legend.php b/library/Icinga/Chart/Legend.php
index eb004a9a1..f545b2f14 100644
--- a/library/Icinga/Chart/Legend.php
+++ b/library/Icinga/Chart/Legend.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Palette.php b/library/Icinga/Chart/Palette.php
index 09cd1ade4..2753e4c85 100644
--- a/library/Icinga/Chart/Palette.php
+++ b/library/Icinga/Chart/Palette.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/PieChart.php b/library/Icinga/Chart/PieChart.php
index e5d098c15..33ce32927 100644
--- a/library/Icinga/Chart/PieChart.php
+++ b/library/Icinga/Chart/PieChart.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Primitive/Animatable.php b/library/Icinga/Chart/Primitive/Animatable.php
index bc7c18235..c976a7e64 100644
--- a/library/Icinga/Chart/Primitive/Animatable.php
+++ b/library/Icinga/Chart/Primitive/Animatable.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Animation.php b/library/Icinga/Chart/Primitive/Animation.php
index c2d0afc45..2dc3fa925 100644
--- a/library/Icinga/Chart/Primitive/Animation.php
+++ b/library/Icinga/Chart/Primitive/Animation.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Canvas.php b/library/Icinga/Chart/Primitive/Canvas.php
index 47abd7f09..c5617fa35 100644
--- a/library/Icinga/Chart/Primitive/Canvas.php
+++ b/library/Icinga/Chart/Primitive/Canvas.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 
 namespace Icinga\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/Circle.php b/library/Icinga/Chart/Primitive/Circle.php
index ab7664d10..be18a4c43 100644
--- a/library/Icinga/Chart/Primitive/Circle.php
+++ b/library/Icinga/Chart/Primitive/Circle.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 
 namespace Icinga\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/Drawable.php b/library/Icinga/Chart/Primitive/Drawable.php
index 1ed78c9fb..256bd7e8c 100644
--- a/library/Icinga/Chart/Primitive/Drawable.php
+++ b/library/Icinga/Chart/Primitive/Drawable.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Line.php b/library/Icinga/Chart/Primitive/Line.php
index d2ad670e7..097753873 100644
--- a/library/Icinga/Chart/Primitive/Line.php
+++ b/library/Icinga/Chart/Primitive/Line.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Path.php b/library/Icinga/Chart/Primitive/Path.php
index 3eac8b954..86c2c729d 100644
--- a/library/Icinga/Chart/Primitive/Path.php
+++ b/library/Icinga/Chart/Primitive/Path.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/PieSlice.php b/library/Icinga/Chart/Primitive/PieSlice.php
index c3b4a8b90..c4bece29c 100644
--- a/library/Icinga/Chart/Primitive/PieSlice.php
+++ b/library/Icinga/Chart/Primitive/PieSlice.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/RawElement.php b/library/Icinga/Chart/Primitive/RawElement.php
index 47336da0b..1f8ed3f0c 100644
--- a/library/Icinga/Chart/Primitive/RawElement.php
+++ b/library/Icinga/Chart/Primitive/RawElement.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Rect.php b/library/Icinga/Chart/Primitive/Rect.php
index 9bd7bb3ff..4747ca1e9 100644
--- a/library/Icinga/Chart/Primitive/Rect.php
+++ b/library/Icinga/Chart/Primitive/Rect.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart\Primitive;
 
diff --git a/library/Icinga/Chart/Primitive/Styleable.php b/library/Icinga/Chart/Primitive/Styleable.php
index 0dcf47e34..e36d60707 100644
--- a/library/Icinga/Chart/Primitive/Styleable.php
+++ b/library/Icinga/Chart/Primitive/Styleable.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 
 namespace Icinga\Chart\Primitive;
diff --git a/library/Icinga/Chart/Primitive/Text.php b/library/Icinga/Chart/Primitive/Text.php
index d2467ffcc..3125d1d12 100644
--- a/library/Icinga/Chart/Primitive/Text.php
+++ b/library/Icinga/Chart/Primitive/Text.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 
 namespace Icinga\Chart\Primitive;
diff --git a/library/Icinga/Chart/Render/LayoutBox.php b/library/Icinga/Chart/Render/LayoutBox.php
index a3fb1a64f..08cd6c6a1 100644
--- a/library/Icinga/Chart/Render/LayoutBox.php
+++ b/library/Icinga/Chart/Render/LayoutBox.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart\Render;
 
diff --git a/library/Icinga/Chart/Render/RenderContext.php b/library/Icinga/Chart/Render/RenderContext.php
index e97d213dd..e7e1d4b5e 100644
--- a/library/Icinga/Chart/Render/RenderContext.php
+++ b/library/Icinga/Chart/Render/RenderContext.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 
 namespace Icinga\Chart\Render;
diff --git a/library/Icinga/Chart/Render/Rotator.php b/library/Icinga/Chart/Render/Rotator.php
index 9d4f4aa2b..074291ab9 100644
--- a/library/Icinga/Chart/Render/Rotator.php
+++ b/library/Icinga/Chart/Render/Rotator.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart\Render;
 
diff --git a/library/Icinga/Chart/SVGRenderer.php b/library/Icinga/Chart/SVGRenderer.php
index 7de8463bb..5cc223388 100644
--- a/library/Icinga/Chart/SVGRenderer.php
+++ b/library/Icinga/Chart/SVGRenderer.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart;
 
diff --git a/library/Icinga/Chart/Unit/AxisUnit.php b/library/Icinga/Chart/Unit/AxisUnit.php
index 9a989c410..79af2fe9d 100644
--- a/library/Icinga/Chart/Unit/AxisUnit.php
+++ b/library/Icinga/Chart/Unit/AxisUnit.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart\Unit;
 
diff --git a/library/Icinga/Chart/Unit/CalendarUnit.php b/library/Icinga/Chart/Unit/CalendarUnit.php
index a1864b5b3..da732c025 100644
--- a/library/Icinga/Chart/Unit/CalendarUnit.php
+++ b/library/Icinga/Chart/Unit/CalendarUnit.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 
 namespace Icinga\Chart\Unit;
diff --git a/library/Icinga/Chart/Unit/LinearUnit.php b/library/Icinga/Chart/Unit/LinearUnit.php
index 15eed57fe..ab16b2941 100644
--- a/library/Icinga/Chart/Unit/LinearUnit.php
+++ b/library/Icinga/Chart/Unit/LinearUnit.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart\Unit;
 
diff --git a/library/Icinga/Chart/Unit/LogarithmicUnit.php b/library/Icinga/Chart/Unit/LogarithmicUnit.php
index 61f962f90..8f90a9f03 100644
--- a/library/Icinga/Chart/Unit/LogarithmicUnit.php
+++ b/library/Icinga/Chart/Unit/LogarithmicUnit.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Chart\Unit;
 
diff --git a/library/Icinga/Chart/Unit/StaticAxis.php b/library/Icinga/Chart/Unit/StaticAxis.php
index 47ca0706c..2ea1db136 100644
--- a/library/Icinga/Chart/Unit/StaticAxis.php
+++ b/library/Icinga/Chart/Unit/StaticAxis.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 
 namespace Icinga\Chart\Unit;
diff --git a/library/Icinga/Cli/AnsiScreen.php b/library/Icinga/Cli/AnsiScreen.php
index 01ee51514..eeb5c4c7b 100644
--- a/library/Icinga/Cli/AnsiScreen.php
+++ b/library/Icinga/Cli/AnsiScreen.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Command.php b/library/Icinga/Cli/Command.php
index 2ef4154d0..73f0f8752 100644
--- a/library/Icinga/Cli/Command.php
+++ b/library/Icinga/Cli/Command.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Documentation.php b/library/Icinga/Cli/Documentation.php
index 179d387c7..0ab8df2b9 100644
--- a/library/Icinga/Cli/Documentation.php
+++ b/library/Icinga/Cli/Documentation.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Documentation/CommentParser.php b/library/Icinga/Cli/Documentation/CommentParser.php
index 10462c7f3..017855b78 100644
--- a/library/Icinga/Cli/Documentation/CommentParser.php
+++ b/library/Icinga/Cli/Documentation/CommentParser.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Cli\Documentation;
 
diff --git a/library/Icinga/Cli/Loader.php b/library/Icinga/Cli/Loader.php
index 406a1c31f..e6dcd9151 100644
--- a/library/Icinga/Cli/Loader.php
+++ b/library/Icinga/Cli/Loader.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Params.php b/library/Icinga/Cli/Params.php
index 34110cd8e..27a1df9a1 100644
--- a/library/Icinga/Cli/Params.php
+++ b/library/Icinga/Cli/Params.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Cli/Screen.php b/library/Icinga/Cli/Screen.php
index ca9aa2f26..2737583c4 100644
--- a/library/Icinga/Cli/Screen.php
+++ b/library/Icinga/Cli/Screen.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Cli;
 
diff --git a/library/Icinga/Data/Browsable.php b/library/Icinga/Data/Browsable.php
index 11f1956e3..a734a2680 100644
--- a/library/Icinga/Data/Browsable.php
+++ b/library/Icinga/Data/Browsable.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/ConfigObject.php b/library/Icinga/Data/ConfigObject.php
index 0700179fd..fffbeb6a9 100644
--- a/library/Icinga/Data/ConfigObject.php
+++ b/library/Icinga/Data/ConfigObject.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/ConnectionInterface.php b/library/Icinga/Data/ConnectionInterface.php
index 081ac5612..1906a85f8 100644
--- a/library/Icinga/Data/ConnectionInterface.php
+++ b/library/Icinga/Data/ConnectionInterface.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/DataArray/ArrayDatasource.php b/library/Icinga/Data/DataArray/ArrayDatasource.php
index c80df68df..72ccc4b4c 100644
--- a/library/Icinga/Data/DataArray/ArrayDatasource.php
+++ b/library/Icinga/Data/DataArray/ArrayDatasource.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\DataArray;
 
diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php
index 7909ab194..e5afa37f9 100644
--- a/library/Icinga/Data/Db/DbConnection.php
+++ b/library/Icinga/Data/Db/DbConnection.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Db;
 
diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index 38d2352b0..45a586b9a 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Db;
 
diff --git a/library/Icinga/Data/Fetchable.php b/library/Icinga/Data/Fetchable.php
index 2c3c8ce11..0992be933 100644
--- a/library/Icinga/Data/Fetchable.php
+++ b/library/Icinga/Data/Fetchable.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Filter/Filter.php b/library/Icinga/Data/Filter/Filter.php
index 6508a27c9..2ae475ead 100644
--- a/library/Icinga/Data/Filter/Filter.php
+++ b/library/Icinga/Data/Filter/Filter.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterAnd.php b/library/Icinga/Data/Filter/FilterAnd.php
index c3ff9b75c..1d903cda7 100644
--- a/library/Icinga/Data/Filter/FilterAnd.php
+++ b/library/Icinga/Data/Filter/FilterAnd.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterChain.php b/library/Icinga/Data/Filter/FilterChain.php
index 2567de41b..19a170c19 100644
--- a/library/Icinga/Data/Filter/FilterChain.php
+++ b/library/Icinga/Data/Filter/FilterChain.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterEqual.php b/library/Icinga/Data/Filter/FilterEqual.php
index 1e567dbf1..4c090b3ce 100644
--- a/library/Icinga/Data/Filter/FilterEqual.php
+++ b/library/Icinga/Data/Filter/FilterEqual.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php b/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php
index 92568178c..f79cb5093 100644
--- a/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php
+++ b/library/Icinga/Data/Filter/FilterEqualOrGreaterThan.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterEqualOrLessThan.php b/library/Icinga/Data/Filter/FilterEqualOrLessThan.php
index 88e56de1d..b1def463b 100644
--- a/library/Icinga/Data/Filter/FilterEqualOrLessThan.php
+++ b/library/Icinga/Data/Filter/FilterEqualOrLessThan.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterException.php b/library/Icinga/Data/Filter/FilterException.php
index da28ddbe6..a705118c8 100644
--- a/library/Icinga/Data/Filter/FilterException.php
+++ b/library/Icinga/Data/Filter/FilterException.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterExpression.php b/library/Icinga/Data/Filter/FilterExpression.php
index 379c70045..5b580fa38 100644
--- a/library/Icinga/Data/Filter/FilterExpression.php
+++ b/library/Icinga/Data/Filter/FilterExpression.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterGreaterThan.php b/library/Icinga/Data/Filter/FilterGreaterThan.php
index 386a260c9..14566bc22 100644
--- a/library/Icinga/Data/Filter/FilterGreaterThan.php
+++ b/library/Icinga/Data/Filter/FilterGreaterThan.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterLessThan.php b/library/Icinga/Data/Filter/FilterLessThan.php
index 478cc47b4..b672c5d75 100644
--- a/library/Icinga/Data/Filter/FilterLessThan.php
+++ b/library/Icinga/Data/Filter/FilterLessThan.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterMatch.php b/library/Icinga/Data/Filter/FilterMatch.php
index 2f072742b..a5c058b91 100644
--- a/library/Icinga/Data/Filter/FilterMatch.php
+++ b/library/Icinga/Data/Filter/FilterMatch.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterMatchNot.php b/library/Icinga/Data/Filter/FilterMatchNot.php
index f7478cf75..fe9fbb96a 100644
--- a/library/Icinga/Data/Filter/FilterMatchNot.php
+++ b/library/Icinga/Data/Filter/FilterMatchNot.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterNot.php b/library/Icinga/Data/Filter/FilterNot.php
index 5d1dc8998..92dc78f49 100644
--- a/library/Icinga/Data/Filter/FilterNot.php
+++ b/library/Icinga/Data/Filter/FilterNot.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterNotEqual.php b/library/Icinga/Data/Filter/FilterNotEqual.php
index 3faf209d2..98c096917 100644
--- a/library/Icinga/Data/Filter/FilterNotEqual.php
+++ b/library/Icinga/Data/Filter/FilterNotEqual.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterOr.php b/library/Icinga/Data/Filter/FilterOr.php
index 1c08b9456..7123fcecd 100644
--- a/library/Icinga/Data/Filter/FilterOr.php
+++ b/library/Icinga/Data/Filter/FilterOr.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterParseException.php b/library/Icinga/Data/Filter/FilterParseException.php
index 4210b6561..268358ebb 100644
--- a/library/Icinga/Data/Filter/FilterParseException.php
+++ b/library/Icinga/Data/Filter/FilterParseException.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filter/FilterQueryString.php b/library/Icinga/Data/Filter/FilterQueryString.php
index 07da8f4f4..abbd34253 100644
--- a/library/Icinga/Data/Filter/FilterQueryString.php
+++ b/library/Icinga/Data/Filter/FilterQueryString.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Filter;
 
diff --git a/library/Icinga/Data/Filterable.php b/library/Icinga/Data/Filterable.php
index f70c5b9f2..df04d0a92 100644
--- a/library/Icinga/Data/Filterable.php
+++ b/library/Icinga/Data/Filterable.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Identifiable.php b/library/Icinga/Data/Identifiable.php
index 520b4f939..8a5797eed 100644
--- a/library/Icinga/Data/Identifiable.php
+++ b/library/Icinga/Data/Identifiable.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Limitable.php b/library/Icinga/Data/Limitable.php
index 8ebc37263..96c5046a7 100644
--- a/library/Icinga/Data/Limitable.php
+++ b/library/Icinga/Data/Limitable.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/PivotTable.php b/library/Icinga/Data/PivotTable.php
index 280219b41..5d0bf9ef6 100644
--- a/library/Icinga/Data/PivotTable.php
+++ b/library/Icinga/Data/PivotTable.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/QueryInterface.php b/library/Icinga/Data/QueryInterface.php
index 5032e1786..4d43d1059 100644
--- a/library/Icinga/Data/QueryInterface.php
+++ b/library/Icinga/Data/QueryInterface.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Queryable.php b/library/Icinga/Data/Queryable.php
index 7501cd34f..52b7685bd 100644
--- a/library/Icinga/Data/Queryable.php
+++ b/library/Icinga/Data/Queryable.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/ResourceFactory.php b/library/Icinga/Data/ResourceFactory.php
index 49adaab46..249a70958 100644
--- a/library/Icinga/Data/ResourceFactory.php
+++ b/library/Icinga/Data/ResourceFactory.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Selectable.php b/library/Icinga/Data/Selectable.php
index ba7f4aa7f..c22e6fb7d 100644
--- a/library/Icinga/Data/Selectable.php
+++ b/library/Icinga/Data/Selectable.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 3b0279583..886030395 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Sortable.php b/library/Icinga/Data/Sortable.php
index 634b1cc4d..9c837e3d3 100644
--- a/library/Icinga/Data/Sortable.php
+++ b/library/Icinga/Data/Sortable.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data;
 
diff --git a/library/Icinga/Data/Tree/Node.php b/library/Icinga/Data/Tree/Node.php
index a4b1ce156..9402f6265 100644
--- a/library/Icinga/Data/Tree/Node.php
+++ b/library/Icinga/Data/Tree/Node.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Tree;
 
diff --git a/library/Icinga/Data/Tree/NodeInterface.php b/library/Icinga/Data/Tree/NodeInterface.php
index bba6aa84c..faec9e764 100644
--- a/library/Icinga/Data/Tree/NodeInterface.php
+++ b/library/Icinga/Data/Tree/NodeInterface.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data\Tree;
 
diff --git a/library/Icinga/Exception/AuthenticationException.php b/library/Icinga/Exception/AuthenticationException.php
index 312425003..5cce7a113 100644
--- a/library/Icinga/Exception/AuthenticationException.php
+++ b/library/Icinga/Exception/AuthenticationException.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/ConfigurationError.php b/library/Icinga/Exception/ConfigurationError.php
index 283cb2fab..c1c4b3b8a 100644
--- a/library/Icinga/Exception/ConfigurationError.php
+++ b/library/Icinga/Exception/ConfigurationError.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/IcingaException.php b/library/Icinga/Exception/IcingaException.php
index 85e639b20..ab6591b01 100644
--- a/library/Icinga/Exception/IcingaException.php
+++ b/library/Icinga/Exception/IcingaException.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/InvalidPropertyException.php b/library/Icinga/Exception/InvalidPropertyException.php
index ac8346c2f..59179183e 100644
--- a/library/Icinga/Exception/InvalidPropertyException.php
+++ b/library/Icinga/Exception/InvalidPropertyException.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/MissingParameterException.php b/library/Icinga/Exception/MissingParameterException.php
index cd7f41433..2673cc2d6 100644
--- a/library/Icinga/Exception/MissingParameterException.php
+++ b/library/Icinga/Exception/MissingParameterException.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/NotFoundError.php b/library/Icinga/Exception/NotFoundError.php
index e3790ca0a..69e884c3f 100644
--- a/library/Icinga/Exception/NotFoundError.php
+++ b/library/Icinga/Exception/NotFoundError.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/NotImplementedError.php b/library/Icinga/Exception/NotImplementedError.php
index 61e9249e1..cfb4c232f 100644
--- a/library/Icinga/Exception/NotImplementedError.php
+++ b/library/Icinga/Exception/NotImplementedError.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/NotReadableError.php b/library/Icinga/Exception/NotReadableError.php
index cb39beaee..e91960880 100644
--- a/library/Icinga/Exception/NotReadableError.php
+++ b/library/Icinga/Exception/NotReadableError.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/NotWritableError.php b/library/Icinga/Exception/NotWritableError.php
index 14f3bd81a..695054042 100644
--- a/library/Icinga/Exception/NotWritableError.php
+++ b/library/Icinga/Exception/NotWritableError.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/ProgrammingError.php b/library/Icinga/Exception/ProgrammingError.php
index 3a3f0fbf0..e665289ce 100644
--- a/library/Icinga/Exception/ProgrammingError.php
+++ b/library/Icinga/Exception/ProgrammingError.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/QueryException.php b/library/Icinga/Exception/QueryException.php
index 6d6aa038d..bfe98855a 100644
--- a/library/Icinga/Exception/QueryException.php
+++ b/library/Icinga/Exception/QueryException.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/Exception/SystemPermissionException.php b/library/Icinga/Exception/SystemPermissionException.php
index 8c0e772af..dfefb980a 100644
--- a/library/Icinga/Exception/SystemPermissionException.php
+++ b/library/Icinga/Exception/SystemPermissionException.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Exception;
 
diff --git a/library/Icinga/File/Csv.php b/library/Icinga/File/Csv.php
index aead05bc2..ee88262c3 100644
--- a/library/Icinga/File/Csv.php
+++ b/library/Icinga/File/Csv.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\File;
 
diff --git a/library/Icinga/File/FileExtensionFilterIterator.php b/library/Icinga/File/FileExtensionFilterIterator.php
index 7089d0206..cb26bb214 100644
--- a/library/Icinga/File/FileExtensionFilterIterator.php
+++ b/library/Icinga/File/FileExtensionFilterIterator.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\File;
 
diff --git a/library/Icinga/File/Ini/IniEditor.php b/library/Icinga/File/Ini/IniEditor.php
index ecf4b8db9..a772a8f41 100644
--- a/library/Icinga/File/Ini/IniEditor.php
+++ b/library/Icinga/File/Ini/IniEditor.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\File\Ini;
 
diff --git a/library/Icinga/File/Ini/IniWriter.php b/library/Icinga/File/Ini/IniWriter.php
index 05be71e00..e43c226aa 100644
--- a/library/Icinga/File/Ini/IniWriter.php
+++ b/library/Icinga/File/Ini/IniWriter.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\File\Ini;
 
diff --git a/library/Icinga/File/NonEmptyFileIterator.php b/library/Icinga/File/NonEmptyFileIterator.php
index 961353712..a57de3e23 100644
--- a/library/Icinga/File/NonEmptyFileIterator.php
+++ b/library/Icinga/File/NonEmptyFileIterator.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\File;
 
diff --git a/library/Icinga/File/Pdf.php b/library/Icinga/File/Pdf.php
index 4fe53e139..5ab6e7d4c 100644
--- a/library/Icinga/File/Pdf.php
+++ b/library/Icinga/File/Pdf.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\File;
 
diff --git a/library/Icinga/Protocol/Dns.php b/library/Icinga/Protocol/Dns.php
index c64c47616..70fe575e8 100644
--- a/library/Icinga/Protocol/Dns.php
+++ b/library/Icinga/Protocol/Dns.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Protocol;
 
diff --git a/library/Icinga/Protocol/File/Exception/FileReaderException.php b/library/Icinga/Protocol/File/Exception/FileReaderException.php
index b093ecbfb..ec16eae46 100644
--- a/library/Icinga/Protocol/File/Exception/FileReaderException.php
+++ b/library/Icinga/Protocol/File/Exception/FileReaderException.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 namespace Icinga\Protocol\File;
 
 use Icinga\Exception\IcingaException;
diff --git a/library/Icinga/Protocol/File/FileIterator.php b/library/Icinga/Protocol/File/FileIterator.php
index 5c4ff0610..33cc5a602 100644
--- a/library/Icinga/Protocol/File/FileIterator.php
+++ b/library/Icinga/Protocol/File/FileIterator.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Protocol\File;
 
diff --git a/library/Icinga/Protocol/File/FileQuery.php b/library/Icinga/Protocol/File/FileQuery.php
index 0c70972ff..807c0f92c 100644
--- a/library/Icinga/Protocol/File/FileQuery.php
+++ b/library/Icinga/Protocol/File/FileQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Protocol\File;
 
diff --git a/library/Icinga/Protocol/File/FileReader.php b/library/Icinga/Protocol/File/FileReader.php
index ee41eef32..aaef31840 100644
--- a/library/Icinga/Protocol/File/FileReader.php
+++ b/library/Icinga/Protocol/File/FileReader.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Protocol\File;
 
diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 0f3bde998..db55858e9 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/Discovery.php b/library/Icinga/Protocol/Ldap/Discovery.php
index c8b28f25a..18ef40307 100644
--- a/library/Icinga/Protocol/Ldap/Discovery.php
+++ b/library/Icinga/Protocol/Ldap/Discovery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/Exception.php b/library/Icinga/Protocol/Ldap/Exception.php
index f238a83c5..784b84a9d 100644
--- a/library/Icinga/Protocol/Ldap/Exception.php
+++ b/library/Icinga/Protocol/Ldap/Exception.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/LdapUtils.php b/library/Icinga/Protocol/Ldap/LdapUtils.php
index f26c94922..c151ebc0d 100644
--- a/library/Icinga/Protocol/Ldap/LdapUtils.php
+++ b/library/Icinga/Protocol/Ldap/LdapUtils.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/Node.php b/library/Icinga/Protocol/Ldap/Node.php
index 37d4d241c..d2ad2553d 100644
--- a/library/Icinga/Protocol/Ldap/Node.php
+++ b/library/Icinga/Protocol/Ldap/Node.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/Query.php b/library/Icinga/Protocol/Ldap/Query.php
index 41882f682..8b71fc918 100644
--- a/library/Icinga/Protocol/Ldap/Query.php
+++ b/library/Icinga/Protocol/Ldap/Query.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Ldap/Root.php b/library/Icinga/Protocol/Ldap/Root.php
index 2ae2329ae..769437a31 100644
--- a/library/Icinga/Protocol/Ldap/Root.php
+++ b/library/Icinga/Protocol/Ldap/Root.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Protocol\Ldap;
 
diff --git a/library/Icinga/Protocol/Livestatus/Connection.php b/library/Icinga/Protocol/Livestatus/Connection.php
index 3754afb39..bda091d85 100644
--- a/library/Icinga/Protocol/Livestatus/Connection.php
+++ b/library/Icinga/Protocol/Livestatus/Connection.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Protocol\Livestatus;
 
diff --git a/library/Icinga/Protocol/Livestatus/Query.php b/library/Icinga/Protocol/Livestatus/Query.php
index 94380dfa6..cb13cd818 100644
--- a/library/Icinga/Protocol/Livestatus/Query.php
+++ b/library/Icinga/Protocol/Livestatus/Query.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Protocol\Livestatus;
 
diff --git a/library/Icinga/Protocol/Livestatus/ResponseRow.php b/library/Icinga/Protocol/Livestatus/ResponseRow.php
index 9cb67ccf3..f3cf055a0 100644
--- a/library/Icinga/Protocol/Livestatus/ResponseRow.php
+++ b/library/Icinga/Protocol/Livestatus/ResponseRow.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Protocol\Livestatus;
 
diff --git a/library/Icinga/Protocol/Nrpe/Connection.php b/library/Icinga/Protocol/Nrpe/Connection.php
index 167d710e6..d7fee9e1f 100644
--- a/library/Icinga/Protocol/Nrpe/Connection.php
+++ b/library/Icinga/Protocol/Nrpe/Connection.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Protocol\Nrpe;
 
diff --git a/library/Icinga/Protocol/Nrpe/Packet.php b/library/Icinga/Protocol/Nrpe/Packet.php
index c7f1e8532..1de01169c 100644
--- a/library/Icinga/Protocol/Nrpe/Packet.php
+++ b/library/Icinga/Protocol/Nrpe/Packet.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Protocol\Nrpe;
 
diff --git a/library/Icinga/Security/SecurityException.php b/library/Icinga/Security/SecurityException.php
index db9afea14..e935d12f6 100644
--- a/library/Icinga/Security/SecurityException.php
+++ b/library/Icinga/Security/SecurityException.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Security;
 
diff --git a/library/Icinga/Test/BaseTestCase.php b/library/Icinga/Test/BaseTestCase.php
index 94018826f..542c493f1 100644
--- a/library/Icinga/Test/BaseTestCase.php
+++ b/library/Icinga/Test/BaseTestCase.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace {
 
diff --git a/library/Icinga/Test/DbTest.php b/library/Icinga/Test/DbTest.php
index f51cdb2f4..c394ae0ae 100644
--- a/library/Icinga/Test/DbTest.php
+++ b/library/Icinga/Test/DbTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Test;
 
diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index a56bd017c..3bf0d0aa2 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga;
 
diff --git a/library/Icinga/User/Preferences.php b/library/Icinga/User/Preferences.php
index 49732fea0..b64af221a 100644
--- a/library/Icinga/User/Preferences.php
+++ b/library/Icinga/User/Preferences.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\User;
 
diff --git a/library/Icinga/User/Preferences/PreferencesStore.php b/library/Icinga/User/Preferences/PreferencesStore.php
index 4fc77003b..db7519341 100644
--- a/library/Icinga/User/Preferences/PreferencesStore.php
+++ b/library/Icinga/User/Preferences/PreferencesStore.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\User\Preferences;
 
diff --git a/library/Icinga/User/Preferences/Store/DbStore.php b/library/Icinga/User/Preferences/Store/DbStore.php
index e5af3f5ba..9e012fd01 100644
--- a/library/Icinga/User/Preferences/Store/DbStore.php
+++ b/library/Icinga/User/Preferences/Store/DbStore.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\User\Preferences\Store;
 
diff --git a/library/Icinga/User/Preferences/Store/IniStore.php b/library/Icinga/User/Preferences/Store/IniStore.php
index b65ce3cd5..88fa7edec 100644
--- a/library/Icinga/User/Preferences/Store/IniStore.php
+++ b/library/Icinga/User/Preferences/Store/IniStore.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\User\Preferences\Store;
 
diff --git a/library/Icinga/Util/Color.php b/library/Icinga/Util/Color.php
index a403fe11a..5bc2f2815 100644
--- a/library/Icinga/Util/Color.php
+++ b/library/Icinga/Util/Color.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/ConfigAwareFactory.php b/library/Icinga/Util/ConfigAwareFactory.php
index 01512904a..5345c7eaf 100644
--- a/library/Icinga/Util/ConfigAwareFactory.php
+++ b/library/Icinga/Util/ConfigAwareFactory.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/DateTimeFactory.php b/library/Icinga/Util/DateTimeFactory.php
index 2f63fd0f4..3a532552b 100644
--- a/library/Icinga/Util/DateTimeFactory.php
+++ b/library/Icinga/Util/DateTimeFactory.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/Dimension.php b/library/Icinga/Util/Dimension.php
index 44d1a58a4..cab81c145 100644
--- a/library/Icinga/Util/Dimension.php
+++ b/library/Icinga/Util/Dimension.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/EnumeratingFilterIterator.php b/library/Icinga/Util/EnumeratingFilterIterator.php
index 377af1905..51874fe2c 100644
--- a/library/Icinga/Util/EnumeratingFilterIterator.php
+++ b/library/Icinga/Util/EnumeratingFilterIterator.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/File.php b/library/Icinga/Util/File.php
index 6e4e5d363..8dd436137 100644
--- a/library/Icinga/Util/File.php
+++ b/library/Icinga/Util/File.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/Format.php b/library/Icinga/Util/Format.php
index 8cc9c42d7..b999626b9 100644
--- a/library/Icinga/Util/Format.php
+++ b/library/Icinga/Util/Format.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/String.php b/library/Icinga/Util/String.php
index b47622331..4df25c83a 100644
--- a/library/Icinga/Util/String.php
+++ b/library/Icinga/Util/String.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/TimezoneDetect.php b/library/Icinga/Util/TimezoneDetect.php
index b327d6e95..5c89bd7ec 100644
--- a/library/Icinga/Util/TimezoneDetect.php
+++ b/library/Icinga/Util/TimezoneDetect.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Util/Translator.php b/library/Icinga/Util/Translator.php
index 1b11ca005..67825b63b 100644
--- a/library/Icinga/Util/Translator.php
+++ b/library/Icinga/Util/Translator.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Util;
 
diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index 289dd94a9..8b6f8ca01 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 6503e2ff7..39ad397c7 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Controller;
 
diff --git a/library/Icinga/Web/Controller/BasePreferenceController.php b/library/Icinga/Web/Controller/BasePreferenceController.php
index 19ad8acb8..af8229262 100644
--- a/library/Icinga/Web/Controller/BasePreferenceController.php
+++ b/library/Icinga/Web/Controller/BasePreferenceController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Controller;
 
diff --git a/library/Icinga/Web/Controller/ControllerTabCollector.php b/library/Icinga/Web/Controller/ControllerTabCollector.php
index c1922dcf3..6bcef868a 100644
--- a/library/Icinga/Web/Controller/ControllerTabCollector.php
+++ b/library/Icinga/Web/Controller/ControllerTabCollector.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Controller;
 
diff --git a/library/Icinga/Web/Controller/ModuleActionController.php b/library/Icinga/Web/Controller/ModuleActionController.php
index 15fd32a07..9286ff679 100644
--- a/library/Icinga/Web/Controller/ModuleActionController.php
+++ b/library/Icinga/Web/Controller/ModuleActionController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Controller;
 
diff --git a/library/Icinga/Web/FileCache.php b/library/Icinga/Web/FileCache.php
index a3b8381c4..57c0c0964 100644
--- a/library/Icinga/Web/FileCache.php
+++ b/library/Icinga/Web/FileCache.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 namespace Icinga\Web;
 
 class FileCache
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 88e578fd5..1a75cb852 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Form/Decorator/ConditionalHidden.php b/library/Icinga/Web/Form/Decorator/ConditionalHidden.php
index 8911c39b4..a49c21603 100644
--- a/library/Icinga/Web/Form/Decorator/ConditionalHidden.php
+++ b/library/Icinga/Web/Form/Decorator/ConditionalHidden.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Form\Decorator;
 
diff --git a/library/Icinga/Web/Form/Decorator/ElementDoubler.php b/library/Icinga/Web/Form/Decorator/ElementDoubler.php
index 200880e6d..535e3edaf 100644
--- a/library/Icinga/Web/Form/Decorator/ElementDoubler.php
+++ b/library/Icinga/Web/Form/Decorator/ElementDoubler.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Form\Decorator;
 
diff --git a/library/Icinga/Web/Form/Decorator/NoScriptApply.php b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
index 49f6afa6b..fbc96756b 100644
--- a/library/Icinga/Web/Form/Decorator/NoScriptApply.php
+++ b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Form\Decorator;
 
diff --git a/library/Icinga/Web/Form/Element/Button.php b/library/Icinga/Web/Form/Element/Button.php
index d29b1f529..dda6479fb 100644
--- a/library/Icinga/Web/Form/Element/Button.php
+++ b/library/Icinga/Web/Form/Element/Button.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php b/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php
index 0b79a8cb5..13e4e737c 100644
--- a/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php
+++ b/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/DateTimePicker.php b/library/Icinga/Web/Form/Element/DateTimePicker.php
index 2f1eb3da4..1350e7f9a 100644
--- a/library/Icinga/Web/Form/Element/DateTimePicker.php
+++ b/library/Icinga/Web/Form/Element/DateTimePicker.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/Note.php b/library/Icinga/Web/Form/Element/Note.php
index 8a96d9602..eb8cfbbda 100644
--- a/library/Icinga/Web/Form/Element/Note.php
+++ b/library/Icinga/Web/Form/Element/Note.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/Number.php b/library/Icinga/Web/Form/Element/Number.php
index b98c3736a..8a1217363 100644
--- a/library/Icinga/Web/Form/Element/Number.php
+++ b/library/Icinga/Web/Form/Element/Number.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/Element/TriStateCheckbox.php b/library/Icinga/Web/Form/Element/TriStateCheckbox.php
index 61a29c172..d81a6b152 100644
--- a/library/Icinga/Web/Form/Element/TriStateCheckbox.php
+++ b/library/Icinga/Web/Form/Element/TriStateCheckbox.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Form\Element;
 
diff --git a/library/Icinga/Web/Form/FormElement.php b/library/Icinga/Web/Form/FormElement.php
index 06b08bb02..14e36cb12 100644
--- a/library/Icinga/Web/Form/FormElement.php
+++ b/library/Icinga/Web/Form/FormElement.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Form;
 
diff --git a/library/Icinga/Web/Form/InvalidCSRFTokenException.php b/library/Icinga/Web/Form/InvalidCSRFTokenException.php
index ac18db77e..745c4f7aa 100644
--- a/library/Icinga/Web/Form/InvalidCSRFTokenException.php
+++ b/library/Icinga/Web/Form/InvalidCSRFTokenException.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Form;
 
diff --git a/library/Icinga/Web/Form/Validator/DateFormatValidator.php b/library/Icinga/Web/Form/Validator/DateFormatValidator.php
index 65715b88b..43b5dac8d 100644
--- a/library/Icinga/Web/Form/Validator/DateFormatValidator.php
+++ b/library/Icinga/Web/Form/Validator/DateFormatValidator.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/DateTimeValidator.php b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
index e85544c06..c508cef44 100644
--- a/library/Icinga/Web/Form/Validator/DateTimeValidator.php
+++ b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/ReadablePathValidator.php b/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
index a0fe0c437..6c32e1595 100644
--- a/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
+++ b/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/TimeFormatValidator.php b/library/Icinga/Web/Form/Validator/TimeFormatValidator.php
index f43a42922..acebcd919 100644
--- a/library/Icinga/Web/Form/Validator/TimeFormatValidator.php
+++ b/library/Icinga/Web/Form/Validator/TimeFormatValidator.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/TriStateValidator.php b/library/Icinga/Web/Form/Validator/TriStateValidator.php
index 27f754033..12d011b37 100644
--- a/library/Icinga/Web/Form/Validator/TriStateValidator.php
+++ b/library/Icinga/Web/Form/Validator/TriStateValidator.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Form/Validator/WritablePathValidator.php b/library/Icinga/Web/Form/Validator/WritablePathValidator.php
index c7b7ab0b5..9620b5d7c 100644
--- a/library/Icinga/Web/Form/Validator/WritablePathValidator.php
+++ b/library/Icinga/Web/Form/Validator/WritablePathValidator.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Form\Validator;
 
diff --git a/library/Icinga/Web/Hook.php b/library/Icinga/Web/Hook.php
index b339ce063..3b9700f27 100644
--- a/library/Icinga/Web/Hook.php
+++ b/library/Icinga/Web/Hook.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Hook/GrapherHook.php b/library/Icinga/Web/Hook/GrapherHook.php
index e1490d5bb..39edf86e4 100644
--- a/library/Icinga/Web/Hook/GrapherHook.php
+++ b/library/Icinga/Web/Hook/GrapherHook.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Hook;
 
diff --git a/library/Icinga/Web/Hook/TicketHook.php b/library/Icinga/Web/Hook/TicketHook.php
index 4481f2c8e..1e1171165 100644
--- a/library/Icinga/Web/Hook/TicketHook.php
+++ b/library/Icinga/Web/Hook/TicketHook.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Hook;
 
diff --git a/library/Icinga/Web/Hook/WebBaseHook.php b/library/Icinga/Web/Hook/WebBaseHook.php
index f151d9c9c..544d2afa3 100644
--- a/library/Icinga/Web/Hook/WebBaseHook.php
+++ b/library/Icinga/Web/Hook/WebBaseHook.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Hook;
 
diff --git a/library/Icinga/Web/JavaScript.php b/library/Icinga/Web/JavaScript.php
index a8913d3e7..6a378559f 100644
--- a/library/Icinga/Web/JavaScript.php
+++ b/library/Icinga/Web/JavaScript.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/LessCompiler.php b/library/Icinga/Web/LessCompiler.php
index 347ad8d6f..33c0f8e83 100644
--- a/library/Icinga/Web/LessCompiler.php
+++ b/library/Icinga/Web/LessCompiler.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 38cbba967..8d62563be 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php b/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
index 0a0f707c2..91b31d23d 100644
--- a/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/MenuItemRenderer.php b/library/Icinga/Web/Menu/MenuItemRenderer.php
index 6f13f991e..15e6b2930 100644
--- a/library/Icinga/Web/Menu/MenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/MenuItemRenderer.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php b/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php
index 2d89029b0..cf1673b7a 100644
--- a/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php b/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php
index 3022f2c64..c72d7718e 100644
--- a/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php b/library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php
index dfb43af08..8f8fe64e5 100644
--- a/library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php b/library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php
index 9d180ec70..fdddf529c 100644
--- a/library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Menu;
 
diff --git a/library/Icinga/Web/MenuRenderer.php b/library/Icinga/Web/MenuRenderer.php
index 224a5c525..0d07a448e 100644
--- a/library/Icinga/Web/MenuRenderer.php
+++ b/library/Icinga/Web/MenuRenderer.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Notification.php b/library/Icinga/Web/Notification.php
index b34137651..1e719c4e7 100644
--- a/library/Icinga/Web/Notification.php
+++ b/library/Icinga/Web/Notification.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php b/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
index 5a3edef0a..5d85a4428 100644
--- a/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
+++ b/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Paginator\Adapter;
 
diff --git a/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php b/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
index f0581c42c..ff05d9d6c 100644
--- a/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
+++ b/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
  * @see Zend_Paginator_ScrollingStyle_Interface
diff --git a/library/Icinga/Web/Request.php b/library/Icinga/Web/Request.php
index dbc3dcb34..4dd57df91 100644
--- a/library/Icinga/Web/Request.php
+++ b/library/Icinga/Web/Request.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Response.php b/library/Icinga/Web/Response.php
index 6e48b4a6b..b2ad0de47 100644
--- a/library/Icinga/Web/Response.php
+++ b/library/Icinga/Web/Response.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Session.php b/library/Icinga/Web/Session.php
index 63606bbef..fec14aaf4 100644
--- a/library/Icinga/Web/Session.php
+++ b/library/Icinga/Web/Session.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Session/PhpSession.php b/library/Icinga/Web/Session/PhpSession.php
index 32feced21..f4aa72fa3 100644
--- a/library/Icinga/Web/Session/PhpSession.php
+++ b/library/Icinga/Web/Session/PhpSession.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Session;
 
diff --git a/library/Icinga/Web/Session/Session.php b/library/Icinga/Web/Session/Session.php
index a89677963..266a06d84 100644
--- a/library/Icinga/Web/Session/Session.php
+++ b/library/Icinga/Web/Session/Session.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Session;
 
diff --git a/library/Icinga/Web/Session/SessionNamespace.php b/library/Icinga/Web/Session/SessionNamespace.php
index 83bc4d61f..5ed617cb3 100644
--- a/library/Icinga/Web/Session/SessionNamespace.php
+++ b/library/Icinga/Web/Session/SessionNamespace.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Session;
 
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index 1fa450e42..bff60b68a 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Url.php b/library/Icinga/Web/Url.php
index 219a081fe..080a916fb 100644
--- a/library/Icinga/Web/Url.php
+++ b/library/Icinga/Web/Url.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/UrlParams.php b/library/Icinga/Web/UrlParams.php
index 3cfd3c1dd..5c2a79d05 100644
--- a/library/Icinga/Web/UrlParams.php
+++ b/library/Icinga/Web/UrlParams.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/View.php b/library/Icinga/Web/View.php
index fe232af86..5201e9550 100644
--- a/library/Icinga/Web/View.php
+++ b/library/Icinga/Web/View.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/View/DateTimeRenderer.php b/library/Icinga/Web/View/DateTimeRenderer.php
index 4c982fa8a..058f07ad8 100644
--- a/library/Icinga/Web/View/DateTimeRenderer.php
+++ b/library/Icinga/Web/View/DateTimeRenderer.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\View;
 
diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php
index 9cd680f4e..e9d8e23bc 100644
--- a/library/Icinga/Web/View/helpers/format.php
+++ b/library/Icinga/Web/View/helpers/format.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\View;
 
diff --git a/library/Icinga/Web/View/helpers/generic.php b/library/Icinga/Web/View/helpers/generic.php
index caae5e34a..08d1e2130 100644
--- a/library/Icinga/Web/View/helpers/generic.php
+++ b/library/Icinga/Web/View/helpers/generic.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\View;
 
diff --git a/library/Icinga/Web/View/helpers/url.php b/library/Icinga/Web/View/helpers/url.php
index fd8282889..1f1450b5e 100644
--- a/library/Icinga/Web/View/helpers/url.php
+++ b/library/Icinga/Web/View/helpers/url.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\View;
 
diff --git a/library/Icinga/Web/ViewStream.php b/library/Icinga/Web/ViewStream.php
index 6abf49ac3..f481f2844 100644
--- a/library/Icinga/Web/ViewStream.php
+++ b/library/Icinga/Web/ViewStream.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Widget.php b/library/Icinga/Web/Widget.php
index facde79e8..c417a2aef 100644
--- a/library/Icinga/Web/Widget.php
+++ b/library/Icinga/Web/Widget.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Widget/AbstractWidget.php b/library/Icinga/Web/Widget/AbstractWidget.php
index 1984e28e1..a1c1a244e 100644
--- a/library/Icinga/Web/Widget/AbstractWidget.php
+++ b/library/Icinga/Web/Widget/AbstractWidget.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
index 4f6f17ea8..4e07d06b3 100644
--- a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
+++ b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget\Chart;
 
diff --git a/library/Icinga/Web/Widget/Chart/InlinePie.php b/library/Icinga/Web/Widget/Chart/InlinePie.php
index bd86acde1..341322714 100644
--- a/library/Icinga/Web/Widget/Chart/InlinePie.php
+++ b/library/Icinga/Web/Widget/Chart/InlinePie.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget\Chart;
 
diff --git a/library/Icinga/Web/Widget/Dashboard.php b/library/Icinga/Web/Widget/Dashboard.php
index b19ccb374..8354f6fbb 100644
--- a/library/Icinga/Web/Widget/Dashboard.php
+++ b/library/Icinga/Web/Widget/Dashboard.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Dashboard/Dashlet.php b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
index 6317532e8..ae7bb5558 100644
--- a/library/Icinga/Web/Widget/Dashboard/Dashlet.php
+++ b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget\Dashboard;
 
diff --git a/library/Icinga/Web/Widget/Dashboard/Pane.php b/library/Icinga/Web/Widget/Dashboard/Pane.php
index 302306a9b..b8edd0b52 100644
--- a/library/Icinga/Web/Widget/Dashboard/Pane.php
+++ b/library/Icinga/Web/Widget/Dashboard/Pane.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget\Dashboard;
 
diff --git a/library/Icinga/Web/Widget/Dashboard/UserWidget.php b/library/Icinga/Web/Widget/Dashboard/UserWidget.php
index 4362d0f12..658dfbea6 100644
--- a/library/Icinga/Web/Widget/Dashboard/UserWidget.php
+++ b/library/Icinga/Web/Widget/Dashboard/UserWidget.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget\Dashboard;
 
diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index c7a240da8..38eecb722 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/FilterWidget.php b/library/Icinga/Web/Widget/FilterWidget.php
index bd79c25e0..bf3652c5e 100644
--- a/library/Icinga/Web/Widget/FilterWidget.php
+++ b/library/Icinga/Web/Widget/FilterWidget.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Limiter.php b/library/Icinga/Web/Widget/Limiter.php
index acc66c885..1dc306982 100644
--- a/library/Icinga/Web/Widget/Limiter.php
+++ b/library/Icinga/Web/Widget/Limiter.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/SearchDashboard.php b/library/Icinga/Web/Widget/SearchDashboard.php
index 8893b6db1..16c2b66d6 100644
--- a/library/Icinga/Web/Widget/SearchDashboard.php
+++ b/library/Icinga/Web/Widget/SearchDashboard.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 6414d37c2..18ed95b86 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index 914d91887..5da6a811c 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Tabextension/BasketAction.php b/library/Icinga/Web/Widget/Tabextension/BasketAction.php
index 1e745edda..b372af6e1 100644
--- a/library/Icinga/Web/Widget/Tabextension/BasketAction.php
+++ b/library/Icinga/Web/Widget/Tabextension/BasketAction.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget\Tabextension;
 
diff --git a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
index 6c5031d42..0745a0759 100644
--- a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
+++ b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget\Tabextension;
 
diff --git a/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php b/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
index 39343efe9..6d079981c 100644
--- a/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
+++ b/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget\Tabextension;
 
diff --git a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
index d4205ccf2..212ddb518 100644
--- a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
+++ b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget\Tabextension;
 
diff --git a/library/Icinga/Web/Widget/Tabextension/Tabextension.php b/library/Icinga/Web/Widget/Tabextension/Tabextension.php
index ed88f772c..b799818eb 100644
--- a/library/Icinga/Web/Widget/Tabextension/Tabextension.php
+++ b/library/Icinga/Web/Widget/Tabextension/Tabextension.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget\Tabextension;
 
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index 939782ded..9df556f65 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Widget/Widget.php b/library/Icinga/Web/Widget/Widget.php
index 99c122756..8e7a38dd2 100644
--- a/library/Icinga/Web/Widget/Widget.php
+++ b/library/Icinga/Web/Widget/Widget.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Widget;
 
diff --git a/library/Icinga/Web/Window.php b/library/Icinga/Web/Window.php
index f5658850c..cc6e58cc3 100644
--- a/library/Icinga/Web/Window.php
+++ b/library/Icinga/Web/Window.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/library/Icinga/Web/Wizard.php b/library/Icinga/Web/Wizard.php
index 026b49541..0ef9b8212 100644
--- a/library/Icinga/Web/Wizard.php
+++ b/library/Icinga/Web/Wizard.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 
diff --git a/modules/doc/application/controllers/IcingawebController.php b/modules/doc/application/controllers/IcingawebController.php
index a12d8cd8b..89afc0e59 100644
--- a/modules/doc/application/controllers/IcingawebController.php
+++ b/modules/doc/application/controllers/IcingawebController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use \Zend_Controller_Action_Exception;
 use Icinga\Application\Icinga;
diff --git a/modules/doc/application/controllers/IndexController.php b/modules/doc/application/controllers/IndexController.php
index f675d6067..67d1aad64 100644
--- a/modules/doc/application/controllers/IndexController.php
+++ b/modules/doc/application/controllers/IndexController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Module\Doc\DocController;
 
diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php
index 8a7b96fed..d0c760444 100644
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use \Zend_Controller_Action_Exception;
 use Icinga\Application\Icinga;
diff --git a/modules/doc/application/controllers/StyleController.php b/modules/doc/application/controllers/StyleController.php
index e06835420..8e21a6275 100644
--- a/modules/doc/application/controllers/StyleController.php
+++ b/modules/doc/application/controllers/StyleController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Application\Icinga;
 use Icinga\Web\Controller;
diff --git a/modules/doc/configuration.php b/modules/doc/configuration.php
index c377eb3c4..f9bed3887 100644
--- a/modules/doc/configuration.php
+++ b/modules/doc/configuration.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /** @type $this \Icinga\Application\Modules\Module */
 
diff --git a/modules/doc/library/Doc/DocController.php b/modules/doc/library/Doc/DocController.php
index 613c3ce56..9e29d99c7 100644
--- a/modules/doc/library/Doc/DocController.php
+++ b/modules/doc/library/Doc/DocController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/DocIterator.php b/modules/doc/library/Doc/DocIterator.php
index 0268e2054..c8be8e808 100644
--- a/modules/doc/library/Doc/DocIterator.php
+++ b/modules/doc/library/Doc/DocIterator.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/DocParser.php b/modules/doc/library/Doc/DocParser.php
index d9b35c087..4b6ec7de9 100644
--- a/modules/doc/library/Doc/DocParser.php
+++ b/modules/doc/library/Doc/DocParser.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/DocTree.php b/modules/doc/library/Doc/DocTree.php
index 5153c8807..66b36f1a4 100644
--- a/modules/doc/library/Doc/DocTree.php
+++ b/modules/doc/library/Doc/DocTree.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/Exception/ChapterNotFoundException.php b/modules/doc/library/Doc/Exception/ChapterNotFoundException.php
index e754a2f82..a1de9b496 100644
--- a/modules/doc/library/Doc/Exception/ChapterNotFoundException.php
+++ b/modules/doc/library/Doc/Exception/ChapterNotFoundException.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Doc\Exception;
 
diff --git a/modules/doc/library/Doc/Exception/DocEmptyException.php b/modules/doc/library/Doc/Exception/DocEmptyException.php
index ce5093b25..b4050e3e3 100644
--- a/modules/doc/library/Doc/Exception/DocEmptyException.php
+++ b/modules/doc/library/Doc/Exception/DocEmptyException.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Doc\Exception;
 
diff --git a/modules/doc/library/Doc/Exception/DocException.php b/modules/doc/library/Doc/Exception/DocException.php
index 542f3b7a3..672359591 100644
--- a/modules/doc/library/Doc/Exception/DocException.php
+++ b/modules/doc/library/Doc/Exception/DocException.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Doc\Exception;
 
diff --git a/modules/doc/library/Doc/Renderer.php b/modules/doc/library/Doc/Renderer.php
index 5bb33298e..fee74048d 100644
--- a/modules/doc/library/Doc/Renderer.php
+++ b/modules/doc/library/Doc/Renderer.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/Section.php b/modules/doc/library/Doc/Section.php
index 77f7a94a8..32f836c33 100644
--- a/modules/doc/library/Doc/Section.php
+++ b/modules/doc/library/Doc/Section.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/SectionFilterIterator.php b/modules/doc/library/Doc/SectionFilterIterator.php
index a12aa56ea..0db620120 100644
--- a/modules/doc/library/Doc/SectionFilterIterator.php
+++ b/modules/doc/library/Doc/SectionFilterIterator.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/SectionRenderer.php b/modules/doc/library/Doc/SectionRenderer.php
index 70a53dd9c..b4d19f9fb 100644
--- a/modules/doc/library/Doc/SectionRenderer.php
+++ b/modules/doc/library/Doc/SectionRenderer.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/library/Doc/TocRenderer.php b/modules/doc/library/Doc/TocRenderer.php
index d5f022229..69ab7ac02 100644
--- a/modules/doc/library/Doc/TocRenderer.php
+++ b/modules/doc/library/Doc/TocRenderer.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Doc;
 
diff --git a/modules/doc/public/css/module.less b/modules/doc/public/css/module.less
index 876328ff9..1705129d5 100644
--- a/modules/doc/public/css/module.less
+++ b/modules/doc/public/css/module.less
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 div.chapter {
   padding-left: 5px;
diff --git a/modules/doc/run.php b/modules/doc/run.php
index 9854e0afc..cdeb95195 100644
--- a/modules/doc/run.php
+++ b/modules/doc/run.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use \Zend_Controller_Router_Route;
 use Icinga\Application\Icinga;
diff --git a/modules/monitoring/application/clicommands/ConferenceCommand.php b/modules/monitoring/application/clicommands/ConferenceCommand.php
index 6db032a17..c7c7f1292 100644
--- a/modules/monitoring/application/clicommands/ConferenceCommand.php
+++ b/modules/monitoring/application/clicommands/ConferenceCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Clicommands;
 
diff --git a/modules/monitoring/application/clicommands/ListCommand.php b/modules/monitoring/application/clicommands/ListCommand.php
index c962ceb34..57a1afecf 100644
--- a/modules/monitoring/application/clicommands/ListCommand.php
+++ b/modules/monitoring/application/clicommands/ListCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Clicommands;
 
diff --git a/modules/monitoring/application/clicommands/NrpeCommand.php b/modules/monitoring/application/clicommands/NrpeCommand.php
index 677fd68d0..190cdbe85 100644
--- a/modules/monitoring/application/clicommands/NrpeCommand.php
+++ b/modules/monitoring/application/clicommands/NrpeCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Clicommands;
 
diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 2ff909cb8..1b3db8093 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Chart\GridChart;
 use Icinga\Chart\Unit\LinearUnit;
diff --git a/modules/monitoring/application/controllers/ChartController.php b/modules/monitoring/application/controllers/ChartController.php
index 005424209..b01702c04 100644
--- a/modules/monitoring/application/controllers/ChartController.php
+++ b/modules/monitoring/application/controllers/ChartController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Chart\GridChart;
diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index 5bd74cd45..7d4c07de0 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Web\Notification;
 use Icinga\Data\ResourceFactory;
diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index deee63d49..9cf3b26ab 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 79db43ea6..c2661d01f 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Data\Filter\Filter;
 use Icinga\Module\Monitoring\Controller;
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 3cc2c3549..d7fbe177f 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Backend;
diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php
index ab45cad96..875f4094c 100644
--- a/modules/monitoring/application/controllers/ProcessController.php
+++ b/modules/monitoring/application/controllers/ProcessController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Forms\Command\Instance\DisableNotificationsExpireCommandForm;
diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index 2d5728104..19906f5d2 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index a50c849fe..7d052e067 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Data\Filter\Filter;
 use Icinga\Module\Monitoring\Controller;
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 173dd4e75..033b11b1d 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Application\Benchmark;
 use Icinga\Module\Monitoring\Object\MonitoredObject;
diff --git a/modules/monitoring/application/controllers/TacticalController.php b/modules/monitoring/application/controllers/TacticalController.php
index 1318ada9f..8a3da2b9c 100644
--- a/modules/monitoring/application/controllers/TacticalController.php
+++ b/modules/monitoring/application/controllers/TacticalController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Module\Monitoring\Controller as MonitoringController;
 use Icinga\Web\Url;
diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php
index 012a59c09..a13973e1d 100644
--- a/modules/monitoring/application/controllers/TimelineController.php
+++ b/modules/monitoring/application/controllers/TimelineController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use \DateTime;
 use \DateInterval;
diff --git a/modules/monitoring/application/forms/Command/CommandForm.php b/modules/monitoring/application/forms/Command/CommandForm.php
index 05318c0e4..dae5df963 100644
--- a/modules/monitoring/application/forms/Command/CommandForm.php
+++ b/modules/monitoring/application/forms/Command/CommandForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Command;
 
diff --git a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
index c6e3e5225..96f7f80d3 100644
--- a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Instance;
 
diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index 65b958f8b..5c685dc85 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Instance;
 
diff --git a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
index b5adac042..6f1235363 100644
--- a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
index 6491077d1..eee671397 100644
--- a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
index 2b873b092..1e6e4d64d 100644
--- a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
index 88f28e676..e5bef88d8 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
index 348acc8f4..3ef242b2f 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php b/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php
index 331ec8931..74dd60ea1 100644
--- a/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
index 5b1f3236b..1a357bdce 100644
--- a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php b/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php
index 47fe6d1fd..c30adf9d0 100644
--- a/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
index 324e79536..7789460e3 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
index 6b304b5ff..6c7823dca 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
index c17fe588a..e6686a9b8 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
index d01268988..00487e115 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
index d4f7a1735..5caacb5f8 100644
--- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index 969049642..e0f8e3e0d 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Config;
 
diff --git a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
index 51e94b3fc..15e1ed055 100644
--- a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Config\Instance;
 
diff --git a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
index 367093101..8a1a34b40 100644
--- a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Config\Instance;
 
diff --git a/modules/monitoring/application/forms/Config/InstanceConfigForm.php b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
index d08a451ee..c05dc41a9 100644
--- a/modules/monitoring/application/forms/Config/InstanceConfigForm.php
+++ b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Config;
 
diff --git a/modules/monitoring/application/forms/Config/SecurityConfigForm.php b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
index 4613d84f1..c865bf295 100644
--- a/modules/monitoring/application/forms/Config/SecurityConfigForm.php
+++ b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Config;
 
diff --git a/modules/monitoring/application/forms/EventOverviewForm.php b/modules/monitoring/application/forms/EventOverviewForm.php
index a1e95d3c0..bb230232f 100644
--- a/modules/monitoring/application/forms/EventOverviewForm.php
+++ b/modules/monitoring/application/forms/EventOverviewForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms;
 
diff --git a/modules/monitoring/application/forms/Setup/BackendPage.php b/modules/monitoring/application/forms/Setup/BackendPage.php
index ee160f978..d8d4c7fd0 100644
--- a/modules/monitoring/application/forms/Setup/BackendPage.php
+++ b/modules/monitoring/application/forms/Setup/BackendPage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/IdoResourcePage.php b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
index cced78378..dac7d041f 100644
--- a/modules/monitoring/application/forms/Setup/IdoResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/InstancePage.php b/modules/monitoring/application/forms/Setup/InstancePage.php
index 9d7b24f07..54e4bbba6 100644
--- a/modules/monitoring/application/forms/Setup/InstancePage.php
+++ b/modules/monitoring/application/forms/Setup/InstancePage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
index d010fa36f..ca50980d6 100644
--- a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/SecurityPage.php b/modules/monitoring/application/forms/Setup/SecurityPage.php
index 935419250..1921c58f4 100644
--- a/modules/monitoring/application/forms/Setup/SecurityPage.php
+++ b/modules/monitoring/application/forms/Setup/SecurityPage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/Setup/WelcomePage.php b/modules/monitoring/application/forms/Setup/WelcomePage.php
index 5a5a3665f..2fa817c73 100644
--- a/modules/monitoring/application/forms/Setup/WelcomePage.php
+++ b/modules/monitoring/application/forms/Setup/WelcomePage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
diff --git a/modules/monitoring/application/forms/StatehistoryForm.php b/modules/monitoring/application/forms/StatehistoryForm.php
index bfb4b608a..730e3f43b 100644
--- a/modules/monitoring/application/forms/StatehistoryForm.php
+++ b/modules/monitoring/application/forms/StatehistoryForm.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Forms;
 
diff --git a/modules/monitoring/application/views/helpers/CheckPerformance.php b/modules/monitoring/application/views/helpers/CheckPerformance.php
index 9d56e400a..355be8c20 100644
--- a/modules/monitoring/application/views/helpers/CheckPerformance.php
+++ b/modules/monitoring/application/views/helpers/CheckPerformance.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
  * Convert check summary data into a simple usable stdClass
diff --git a/modules/monitoring/application/views/helpers/ContactFlags.php b/modules/monitoring/application/views/helpers/ContactFlags.php
index 76828ee24..076d99501 100644
--- a/modules/monitoring/application/views/helpers/ContactFlags.php
+++ b/modules/monitoring/application/views/helpers/ContactFlags.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 class Zend_View_Helper_ContactFlags extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/application/views/helpers/Customvar.php b/modules/monitoring/application/views/helpers/Customvar.php
index 2ab663fa2..42fcd5b02 100644
--- a/modules/monitoring/application/views/helpers/Customvar.php
+++ b/modules/monitoring/application/views/helpers/Customvar.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 class Zend_View_Helper_Customvar extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/application/views/helpers/Link.php b/modules/monitoring/application/views/helpers/Link.php
index 40cca5925..96972bd55 100644
--- a/modules/monitoring/application/views/helpers/Link.php
+++ b/modules/monitoring/application/views/helpers/Link.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
  * Helper for generating frequently used jump links
diff --git a/modules/monitoring/application/views/helpers/MonitoringFlags.php b/modules/monitoring/application/views/helpers/MonitoringFlags.php
index c64ac48fa..6eb188074 100644
--- a/modules/monitoring/application/views/helpers/MonitoringFlags.php
+++ b/modules/monitoring/application/views/helpers/MonitoringFlags.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /* use Icinga\Module\Monitoring\Object\MonitoredObject; */
 
diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 930a4e61e..41d903a2f 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Util\Format;
 use Icinga\Web\Widget\Chart\InlinePie;
diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
index 90f565978..e6c8b2d5a 100644
--- a/modules/monitoring/application/views/helpers/PluginOutput.php
+++ b/modules/monitoring/application/views/helpers/PluginOutput.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/application/views/helpers/ResolveMacros.php b/modules/monitoring/application/views/helpers/ResolveMacros.php
index d95245d18..7d555f8fd 100644
--- a/modules/monitoring/application/views/helpers/ResolveMacros.php
+++ b/modules/monitoring/application/views/helpers/ResolveMacros.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use \Zend_View_Helper_Abstract;
 use Icinga\Module\Monitoring\Object\MonitoredObject;
diff --git a/modules/monitoring/application/views/helpers/RuntimeVariables.php b/modules/monitoring/application/views/helpers/RuntimeVariables.php
index 21f2c7c6f..dfb590f45 100644
--- a/modules/monitoring/application/views/helpers/RuntimeVariables.php
+++ b/modules/monitoring/application/views/helpers/RuntimeVariables.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
  * Convert runtime summary data into a simple usable stdClass
diff --git a/modules/monitoring/application/views/helpers/SelectionToolbar.php b/modules/monitoring/application/views/helpers/SelectionToolbar.php
index 2905469b9..7332b5c01 100644
--- a/modules/monitoring/application/views/helpers/SelectionToolbar.php
+++ b/modules/monitoring/application/views/helpers/SelectionToolbar.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 class Zend_View_Helper_SelectionToolbar extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index 09be0920a..0087af190 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /** @type $this \Icinga\Application\Modules\Module */
 
diff --git a/modules/monitoring/library/Monitoring/Backend.php b/modules/monitoring/library/Monitoring/Backend.php
index 7bea95896..f7d9e6d46 100644
--- a/modules/monitoring/library/Monitoring/Backend.php
+++ b/modules/monitoring/library/Monitoring/Backend.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 // TODO: obsolete, remove once MonitoringBackend is in use everywhere
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/IdoBackend.php b/modules/monitoring/library/Monitoring/Backend/Ido/IdoBackend.php
index 2b7fa89fa..265742532 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/IdoBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/IdoBackend.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php
index a2070f453..b92f0b364 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommandQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommandQuery.php
index 62e031dda..1c559ee53 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommandQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommandQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
index 0f78eef9e..ce72de5a2 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
index ba21e11a8..ec8fbd147 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
index e851fddcd..460d4be88 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
index 3f2902e9d..b7dd449b2 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
index 7fb6d2dd6..d975da05e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
index 63151d06c..d40a7133d 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index 985f091ab..96b0dd5d7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
index cb69d3a80..12f1f94e9 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
index 775f9da86..99b1257ab 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index 0b17df375..12395abca 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
index b853f86d9..c7764d516 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
index a59e873ed..867da7e78 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
index 10e5b1f7c..71e1bbc19 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index b6e08b731..d9b4f2892 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index 391048ceb..a2c757800 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index 958840a49..4eebc640f 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
index 1a203d232..37a7f48b5 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
index c53e766ab..d63db8173 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php
index bb00883f7..fe1a6f263 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimesummaryQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php
index 5878d16be..d0ab19458 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/RuntimevariablesQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
index 6443eab00..490cc152f 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
index e22543411..5456c0b2b 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index fc0616227..c67b13dbd 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
index a941b32ed..af67f832a 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/LivestatusBackend.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/LivestatusBackend.php
index cabe3dcc1..c7ed2740d 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/LivestatusBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/LivestatusBackend.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/DowntimeQuery.php
index 6394e3696..82852966a 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/DowntimeQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/HostgroupQuery.php
index 79aeb7051..d883fa194 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/HostgroupQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/ServicegroupQuery.php
index 4a65c05f1..1998cbc52 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/ServicegroupQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
index 613ab2276..66b1d3390 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusSummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusSummaryQuery.php
index 7aab807b1..a7aae4e81 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusSummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusSummaryQuery.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
index 0a1baad7d..e34035ee0 100644
--- a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend;
 
diff --git a/modules/monitoring/library/Monitoring/BackendStep.php b/modules/monitoring/library/Monitoring/BackendStep.php
index 4df52ca3f..47264c231 100644
--- a/modules/monitoring/library/Monitoring/BackendStep.php
+++ b/modules/monitoring/library/Monitoring/BackendStep.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Cli/CliUtils.php b/modules/monitoring/library/Monitoring/Cli/CliUtils.php
index e1ef52691..955941a70 100644
--- a/modules/monitoring/library/Monitoring/Cli/CliUtils.php
+++ b/modules/monitoring/library/Monitoring/Cli/CliUtils.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Cli;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php b/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
index b65ede3cd..2b4e63bb5 100644
--- a/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
+++ b/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Exception;
 
diff --git a/modules/monitoring/library/Monitoring/Command/IcingaCommand.php b/modules/monitoring/library/Monitoring/Command/IcingaCommand.php
index cc1ff7614..e4d9cd353 100644
--- a/modules/monitoring/library/Monitoring/Command/IcingaCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/IcingaCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php b/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php
index 97936dfc7..4cf977a58 100644
--- a/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Instance/DisableNotificationsExpireCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Instance;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php b/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php
index 1aa50be1b..b48ef0ebd 100644
--- a/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Instance/ToggleInstanceFeatureCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Instance;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php b/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php
index 7eea6d08c..34296fa56 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/AcknowledgeProblemCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php
index e986dd4a5..1e87fea33 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/AddCommentCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
index 074b134e7..00ba63a78 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
index 0387c1d63..52ad99e1b 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php
index 2de2bde02..0fc07e0d3 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ObjectCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php
index eaa0184c7..d81ab7b38 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ProcessCheckResultCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntimeCommand.php
index 78753e684..5c4f851a0 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/PropagateHostDowntimeCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php b/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php
index 2451f4dfb..ea95820a3 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/RemoveAcknowledgementCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php
index 4c210ee01..8ee12cf9d 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostCheckCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php
index 132847363..7b94bfd04 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleHostDowntimeCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
index 7e041e09d..ac5e4be61 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php
index 78a5add50..51f45bd26 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceDowntimeCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php
index 7d12849e4..e6b29303e 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ToggleObjectFeatureCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php
index ce912955d..13091f19d 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/WithCommentCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
index d8e643fb2..cf88d7d2e 100644
--- a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Renderer;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php
index ec40c0b16..552b49a63 100644
--- a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandRendererInterface.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Renderer;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
index ea2d0d026..93af4e955 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
index ca8de3c0e..fd332204e 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
index 96b788021..6af054734 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
index 46a9e9a55..9b69a8cc4 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php
index 5cce6c8d6..3aa893502 100644
--- a/modules/monitoring/library/Monitoring/Controller.php
+++ b/modules/monitoring/library/Monitoring/Controller.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Command.php b/modules/monitoring/library/Monitoring/DataView/Command.php
index 429353ec4..06e233b75 100644
--- a/modules/monitoring/library/Monitoring/DataView/Command.php
+++ b/modules/monitoring/library/Monitoring/DataView/Command.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index 785dd802f..f2d98895c 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Contact.php b/modules/monitoring/library/Monitoring/DataView/Contact.php
index 90542db6a..793765fed 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contact.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contact.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
index abd94b88d..b55b6914a 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Customvar.php b/modules/monitoring/library/Monitoring/DataView/Customvar.php
index 273944bc7..0517542c7 100644
--- a/modules/monitoring/library/Monitoring/DataView/Customvar.php
+++ b/modules/monitoring/library/Monitoring/DataView/Customvar.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 09a6cd5b8..9683c468f 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index 0d4873e95..54a47e6b4 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/EventHistory.php b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
index f1bb18476..8fcc4f35a 100644
--- a/modules/monitoring/library/Monitoring/DataView/EventHistory.php
+++ b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
index e89d2c46d..022c98d9c 100644
--- a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
+++ b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
index 44c476e80..bd74aebf2 100644
--- a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index 79afffaec..904dd41f8 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroup.php b/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
index 03c1bb508..84beb4bf0 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 
 namespace Icinga\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php
index ef6895a10..b4632b57c 100644
--- a/modules/monitoring/library/Monitoring/DataView/Notification.php
+++ b/modules/monitoring/library/Monitoring/DataView/Notification.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Programstatus.php b/modules/monitoring/library/Monitoring/DataView/Programstatus.php
index 0c01122eb..88bf0800b 100644
--- a/modules/monitoring/library/Monitoring/DataView/Programstatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/Programstatus.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php b/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php
index 8d5bc7cdb..336670376 100644
--- a/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Runtimesummary.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php b/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php
index 5fbf7ea17..f7d183309 100644
--- a/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php
+++ b/modules/monitoring/library/Monitoring/DataView/Runtimevariables.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index e6a2835a0..5c37e45ee 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroup.php b/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
index f88075d33..411b550fc 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 
 namespace Icinga\Module\Monitoring\DataView;
diff --git a/modules/monitoring/library/Monitoring/DataView/StatusSummary.php b/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
index 209ec8d08..6136ac05c 100644
--- a/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\DataView;
 
diff --git a/modules/monitoring/library/Monitoring/Environment.php b/modules/monitoring/library/Monitoring/Environment.php
index 0fb92a09b..3d9b7553d 100644
--- a/modules/monitoring/library/Monitoring/Environment.php
+++ b/modules/monitoring/library/Monitoring/Environment.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php b/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php
index 4368d8634..f10d869e2 100644
--- a/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php
+++ b/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 
 namespace Icinga\Module\Monitoring\Exception;
diff --git a/modules/monitoring/library/Monitoring/InstanceStep.php b/modules/monitoring/library/Monitoring/InstanceStep.php
index f1c09c899..cb85d695d 100644
--- a/modules/monitoring/library/Monitoring/InstanceStep.php
+++ b/modules/monitoring/library/Monitoring/InstanceStep.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index fd7d7d42b..4e342aa75 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index c38e68d60..273c65eae 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/HostList.php b/modules/monitoring/library/Monitoring/Object/HostList.php
index 2bbcb985f..f0adced24 100644
--- a/modules/monitoring/library/Monitoring/Object/HostList.php
+++ b/modules/monitoring/library/Monitoring/Object/HostList.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 68930efca..4baa7aa9b 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/ObjectList.php b/modules/monitoring/library/Monitoring/Object/ObjectList.php
index cf45eeade..146499805 100644
--- a/modules/monitoring/library/Monitoring/Object/ObjectList.php
+++ b/modules/monitoring/library/Monitoring/Object/ObjectList.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 5216fdb9c..774511ae3 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Object/ServiceList.php b/modules/monitoring/library/Monitoring/Object/ServiceList.php
index bc324d2be..d9ffa0d8e 100644
--- a/modules/monitoring/library/Monitoring/Object/ServiceList.php
+++ b/modules/monitoring/library/Monitoring/Object/ServiceList.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Object;
 
diff --git a/modules/monitoring/library/Monitoring/Plugin.php b/modules/monitoring/library/Monitoring/Plugin.php
index 3aa466341..78b709d2c 100644
--- a/modules/monitoring/library/Monitoring/Plugin.php
+++ b/modules/monitoring/library/Monitoring/Plugin.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
index a58457490..cbf86ab19 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Plugin;
 
diff --git a/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php b/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
index ffd9ddb55..269107c82 100644
--- a/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
+++ b/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Plugin;
 
diff --git a/modules/monitoring/library/Monitoring/SecurityStep.php b/modules/monitoring/library/Monitoring/SecurityStep.php
index c187eb8e7..b4ba5e19a 100644
--- a/modules/monitoring/library/Monitoring/SecurityStep.php
+++ b/modules/monitoring/library/Monitoring/SecurityStep.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring;
 
diff --git a/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php b/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php
index 112bd1e8b..4e942cda2 100644
--- a/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php
+++ b/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Timeline;
 
diff --git a/modules/monitoring/library/Monitoring/Timeline/TimeLine.php b/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
index c61dc4283..5f901edd1 100644
--- a/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
+++ b/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Timeline;
 
diff --git a/modules/monitoring/library/Monitoring/Timeline/TimeRange.php b/modules/monitoring/library/Monitoring/Timeline/TimeRange.php
index 2e32fbca3..bf8833538 100644
--- a/modules/monitoring/library/Monitoring/Timeline/TimeRange.php
+++ b/modules/monitoring/library/Monitoring/Timeline/TimeRange.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Timeline;
 
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index cd2ed175f..566c569a3 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Web\Controller;
 
diff --git a/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php b/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
index 8f54a1d7c..18c00563e 100644
--- a/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
+++ b/modules/monitoring/library/Monitoring/Web/Hook/HostActionsHook.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Web\Hook;
 
diff --git a/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php b/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php
index 2d5e4a8ac..0af65d303 100644
--- a/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php
+++ b/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Web\Hook;
 
diff --git a/modules/monitoring/library/Monitoring/Web/Widget/SelectBox.php b/modules/monitoring/library/Monitoring/Web/Widget/SelectBox.php
index 97066e1ac..aa3bc6143 100644
--- a/modules/monitoring/library/Monitoring/Web/Widget/SelectBox.php
+++ b/modules/monitoring/library/Monitoring/Web/Widget/SelectBox.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Web\Widget;
 
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 5348f87a3..b0793ee8d 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 h1 {
     font-size: 1em;
diff --git a/modules/monitoring/public/js/module.js b/modules/monitoring/public/js/module.js
index 0edfda766..03cfc1c3d 100644
--- a/modules/monitoring/public/js/module.js
+++ b/modules/monitoring/public/js/module.js
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 (function(Icinga) {
 
diff --git a/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php b/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php
index ee6f8e759..3e8476db3 100644
--- a/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php
+++ b/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Module\Monitoring\Application\Views\Helpers;
 
diff --git a/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php b/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
index 0a46e8226..31bf839a3 100644
--- a/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
+++ b/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Modules\Monitoring\Application\Views\Helpers;
 
diff --git a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php
index b3e3c302e..27c1f8673 100644
--- a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php
+++ b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Module\Monitoring\Plugin;
 
diff --git a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php
index e7beed43e..2f0f0a0fa 100644
--- a/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php
+++ b/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Module\Monitoring\Plugin;
 
diff --git a/modules/monitoring/test/php/regression/Bug6088Test.php b/modules/monitoring/test/php/regression/Bug6088Test.php
index e26474720..f334e2d29 100644
--- a/modules/monitoring/test/php/regression/Bug6088Test.php
+++ b/modules/monitoring/test/php/regression/Bug6088Test.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Regression;
 
diff --git a/modules/monitoring/test/php/regression/Bug7043Test.php b/modules/monitoring/test/php/regression/Bug7043Test.php
index f6b7ded74..a63c1b314 100644
--- a/modules/monitoring/test/php/regression/Bug7043Test.php
+++ b/modules/monitoring/test/php/regression/Bug7043Test.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Module\Monitoring\Regression;
 
diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index f9a73aba4..eb5aaca83 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Clicommands;
 
diff --git a/modules/setup/application/clicommands/TokenCommand.php b/modules/setup/application/clicommands/TokenCommand.php
index e9f6007b7..83aa494e8 100644
--- a/modules/setup/application/clicommands/TokenCommand.php
+++ b/modules/setup/application/clicommands/TokenCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Clicommands;
 
diff --git a/modules/setup/application/controllers/IndexController.php b/modules/setup/application/controllers/IndexController.php
index 2dcb6ea5a..b83c9f94e 100644
--- a/modules/setup/application/controllers/IndexController.php
+++ b/modules/setup/application/controllers/IndexController.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Module\Setup\WebWizard;
diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 667a1c758..e9334c650 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index 333eda18f..0f07d31be 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
index fdbca1683..b55dcff10 100644
--- a/modules/setup/application/forms/AuthenticationPage.php
+++ b/modules/setup/application/forms/AuthenticationPage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php
index ac41f4a1e..81e9dcc62 100644
--- a/modules/setup/application/forms/DatabaseCreationPage.php
+++ b/modules/setup/application/forms/DatabaseCreationPage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php
index f512e0288..df5fd9c9a 100644
--- a/modules/setup/application/forms/DbResourcePage.php
+++ b/modules/setup/application/forms/DbResourcePage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/GeneralConfigPage.php b/modules/setup/application/forms/GeneralConfigPage.php
index cd66db496..3dc4eecf1 100644
--- a/modules/setup/application/forms/GeneralConfigPage.php
+++ b/modules/setup/application/forms/GeneralConfigPage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
index 54fb86401..6a09d9fee 100644
--- a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/LdapDiscoveryPage.php b/modules/setup/application/forms/LdapDiscoveryPage.php
index 3306e0395..addc40545 100644
--- a/modules/setup/application/forms/LdapDiscoveryPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryPage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/LdapResourcePage.php b/modules/setup/application/forms/LdapResourcePage.php
index c0898c8b5..8374c8efa 100644
--- a/modules/setup/application/forms/LdapResourcePage.php
+++ b/modules/setup/application/forms/LdapResourcePage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/ModulePage.php b/modules/setup/application/forms/ModulePage.php
index d41007553..83990193f 100644
--- a/modules/setup/application/forms/ModulePage.php
+++ b/modules/setup/application/forms/ModulePage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
index b07ca6406..3e91fc428 100644
--- a/modules/setup/application/forms/PreferencesPage.php
+++ b/modules/setup/application/forms/PreferencesPage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/RequirementsPage.php b/modules/setup/application/forms/RequirementsPage.php
index 5f063a86c..f4b8ee648 100644
--- a/modules/setup/application/forms/RequirementsPage.php
+++ b/modules/setup/application/forms/RequirementsPage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/SummaryPage.php b/modules/setup/application/forms/SummaryPage.php
index 83673b573..18ffcebc8 100644
--- a/modules/setup/application/forms/SummaryPage.php
+++ b/modules/setup/application/forms/SummaryPage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/application/forms/WelcomePage.php b/modules/setup/application/forms/WelcomePage.php
index 455dabc80..7f2e00ef2 100644
--- a/modules/setup/application/forms/WelcomePage.php
+++ b/modules/setup/application/forms/WelcomePage.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Forms;
 
diff --git a/modules/setup/library/Setup/Exception/SetupException.php b/modules/setup/library/Setup/Exception/SetupException.php
index 46d4d5d70..b8c860f39 100644
--- a/modules/setup/library/Setup/Exception/SetupException.php
+++ b/modules/setup/library/Setup/Exception/SetupException.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Exception;
 
diff --git a/modules/setup/library/Setup/Requirements.php b/modules/setup/library/Setup/Requirements.php
index 13d42ce6e..bede70aa0 100644
--- a/modules/setup/library/Setup/Requirements.php
+++ b/modules/setup/library/Setup/Requirements.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Setup.php b/modules/setup/library/Setup/Setup.php
index da19d0a82..02da366e8 100644
--- a/modules/setup/library/Setup/Setup.php
+++ b/modules/setup/library/Setup/Setup.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/SetupWizard.php b/modules/setup/library/Setup/SetupWizard.php
index e4676f26f..9e7b45174 100644
--- a/modules/setup/library/Setup/SetupWizard.php
+++ b/modules/setup/library/Setup/SetupWizard.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Step.php b/modules/setup/library/Setup/Step.php
index afd50a982..82abce751 100644
--- a/modules/setup/library/Setup/Step.php
+++ b/modules/setup/library/Setup/Step.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
index 9c40679c2..495a42469 100644
--- a/modules/setup/library/Setup/Steps/AuthenticationStep.php
+++ b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Steps;
 
diff --git a/modules/setup/library/Setup/Steps/DatabaseStep.php b/modules/setup/library/Setup/Steps/DatabaseStep.php
index aed3b3e36..fdbdc41f1 100644
--- a/modules/setup/library/Setup/Steps/DatabaseStep.php
+++ b/modules/setup/library/Setup/Steps/DatabaseStep.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Steps;
 
diff --git a/modules/setup/library/Setup/Steps/GeneralConfigStep.php b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
index ca5b755c4..84ac446c1 100644
--- a/modules/setup/library/Setup/Steps/GeneralConfigStep.php
+++ b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Steps;
 
diff --git a/modules/setup/library/Setup/Steps/ResourceStep.php b/modules/setup/library/Setup/Steps/ResourceStep.php
index 0107f4576..36f898f5c 100644
--- a/modules/setup/library/Setup/Steps/ResourceStep.php
+++ b/modules/setup/library/Setup/Steps/ResourceStep.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Steps;
 
diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index 55aea73b8..f6d3939a7 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Utils;
 
diff --git a/modules/setup/library/Setup/Utils/EnableModuleStep.php b/modules/setup/library/Setup/Utils/EnableModuleStep.php
index c33a92774..2cb88e2b1 100644
--- a/modules/setup/library/Setup/Utils/EnableModuleStep.php
+++ b/modules/setup/library/Setup/Utils/EnableModuleStep.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Utils;
 
diff --git a/modules/setup/library/Setup/Utils/MakeDirStep.php b/modules/setup/library/Setup/Utils/MakeDirStep.php
index 730f8b63f..51397ad3d 100644
--- a/modules/setup/library/Setup/Utils/MakeDirStep.php
+++ b/modules/setup/library/Setup/Utils/MakeDirStep.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Utils;
 
diff --git a/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php b/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php
index 95bc9aaaa..199b4215d 100644
--- a/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php
+++ b/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Web\Form\Validator;
 
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index a9c302eb4..7576adbb8 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Webserver.php b/modules/setup/library/Setup/Webserver.php
index 03d8dd040..3647e162e 100644
--- a/modules/setup/library/Setup/Webserver.php
+++ b/modules/setup/library/Setup/Webserver.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup;
 
diff --git a/modules/setup/library/Setup/Webserver/Apache.php b/modules/setup/library/Setup/Webserver/Apache.php
index 595f5a2cc..acdae0c61 100644
--- a/modules/setup/library/Setup/Webserver/Apache.php
+++ b/modules/setup/library/Setup/Webserver/Apache.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Webserver;
 
diff --git a/modules/setup/library/Setup/Webserver/Nginx.php b/modules/setup/library/Setup/Webserver/Nginx.php
index 21b29679c..780a3184e 100644
--- a/modules/setup/library/Setup/Webserver/Nginx.php
+++ b/modules/setup/library/Setup/Webserver/Nginx.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Setup\Webserver;
 
diff --git a/modules/test/application/clicommands/PhpCommand.php b/modules/test/application/clicommands/PhpCommand.php
index 1040e1255..c84000f70 100644
--- a/modules/test/application/clicommands/PhpCommand.php
+++ b/modules/test/application/clicommands/PhpCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Test\Clicommands;
 
diff --git a/modules/translation/application/clicommands/CompileCommand.php b/modules/translation/application/clicommands/CompileCommand.php
index b2b1880f7..4f08b2844 100644
--- a/modules/translation/application/clicommands/CompileCommand.php
+++ b/modules/translation/application/clicommands/CompileCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Translation\Clicommands;
 
diff --git a/modules/translation/application/clicommands/RefreshCommand.php b/modules/translation/application/clicommands/RefreshCommand.php
index 25f4ee3aa..67cbf0296 100644
--- a/modules/translation/application/clicommands/RefreshCommand.php
+++ b/modules/translation/application/clicommands/RefreshCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Translation\Clicommands;
 
diff --git a/modules/translation/library/Translation/Cli/TranslationCommand.php b/modules/translation/library/Translation/Cli/TranslationCommand.php
index b2bc654a8..e11d03d29 100644
--- a/modules/translation/library/Translation/Cli/TranslationCommand.php
+++ b/modules/translation/library/Translation/Cli/TranslationCommand.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Translation\Cli;
 
diff --git a/modules/translation/library/Translation/Util/GettextTranslationHelper.php b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
index 2b47b57aa..cbeaa2d6b 100644
--- a/modules/translation/library/Translation/Util/GettextTranslationHelper.php
+++ b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Translation\Util;
 
diff --git a/packages/files/bin/icingacli b/packages/files/bin/icingacli
index 0f20fcd76..4b51e3384 100755
--- a/packages/files/bin/icingacli
+++ b/packages/files/bin/icingacli
@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 require_once '/usr/share/php/Icinga/Application/Cli.php';
 
diff --git a/packages/files/public/index.php b/packages/files/public/index.php
index a4760a9fb..9a8772a97 100644
--- a/packages/files/public/index.php
+++ b/packages/files/public/index.php
@@ -1,4 +1,4 @@
 <?php
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 require_once '/usr/share/php/Icinga/Application/webrouter.php';
diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index fd98315ac..d5ba0d975 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /*** Base rules ***/
 * {
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 874ecfecc..b0468234a 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 div.config-form-buttons {
   margin-top: 5px;
diff --git a/public/css/icinga/header-elements.less b/public/css/icinga/header-elements.less
index bef161fa5..560fada6f 100644
--- a/public/css/icinga/header-elements.less
+++ b/public/css/icinga/header-elements.less
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 #header div.user {
   font-size: 1.1em;
diff --git a/public/css/icinga/layout-colors.less b/public/css/icinga/layout-colors.less
index a422b8e3e..b4de5070c 100644
--- a/public/css/icinga/layout-colors.less
+++ b/public/css/icinga/layout-colors.less
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /* Layout colors */
 
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index b0d29862b..df6fe4dc6 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /** Default layout **/
 html {
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index c5e2230cf..d09a9f6e0 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 #login {
   width: 100%;
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index a7ed358df..74f9e1a6d 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 code {
   background-color: #eee;
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 2aca175ea..8bc16a547 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 #menu {
   max-height: 100%;
diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index 0b365e503..5c19bfe35 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /* Special tables and states */
 
diff --git a/public/css/icinga/pagination.less b/public/css/icinga/pagination.less
index 8fe84b3b6..97acd31bc 100644
--- a/public/css/icinga/pagination.less
+++ b/public/css/icinga/pagination.less
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 ul.pagination {
   font-size: 0.68em;
diff --git a/public/css/icinga/selection-toolbar.less b/public/css/icinga/selection-toolbar.less
index 662a7db53..05de1392f 100644
--- a/public/css/icinga/selection-toolbar.less
+++ b/public/css/icinga/selection-toolbar.less
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 div.selection-toolbar {
   float: right;
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index cd2f81d0f..d7217e1af 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 #layout {
   overflow: auto; // TODO: Shouldn't be necessary, here, IMHO
diff --git a/public/css/icinga/tabs.less b/public/css/icinga/tabs.less
index a93e96bcc..e776469e0 100644
--- a/public/css/icinga/tabs.less
+++ b/public/css/icinga/tabs.less
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 ul.tabs {
   padding: 1em 0 0 0;
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index cfe5bb6e1..85477db66 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 table.historycolorgrid {
   font-size: 1.5em;
diff --git a/public/css/pdf/pdfprint.less b/public/css/pdf/pdfprint.less
index fc9fda0da..7b7855eaf 100644
--- a/public/css/pdf/pdfprint.less
+++ b/public/css/pdf/pdfprint.less
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 .controls form, .controls .pagination, .controls .widgetLimiter, .controls > .tabs, .dontprint {
   display: none !important;
diff --git a/public/index.php b/public/index.php
index 0062bf94f..3040f0589 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,4 +1,4 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 require_once dirname(__DIR__) . '/library/Icinga/Application/webrouter.php';
diff --git a/public/js/helpers.js b/public/js/helpers.js
index 6dc1f765a..868ae9b39 100644
--- a/public/js/helpers.js
+++ b/public/js/helpers.js
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 (function (Object) {
 
diff --git a/public/js/icinga.js b/public/js/icinga.js
index ce8c9bb0c..e1f1f8fdd 100644
--- a/public/js/icinga.js
+++ b/public/js/icinga.js
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
  * Icinga starts here.
diff --git a/public/js/icinga/behavior/form.js b/public/js/icinga/behavior/form.js
index b5514313b..f2a7ed8cd 100644
--- a/public/js/icinga/behavior/form.js
+++ b/public/js/icinga/behavior/form.js
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
  * Controls behavior of form elements, depending reload and
diff --git a/public/js/icinga/behavior/navigation.js b/public/js/icinga/behavior/navigation.js
index d9f2060a6..7a5cf8788 100644
--- a/public/js/icinga/behavior/navigation.js
+++ b/public/js/icinga/behavior/navigation.js
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 (function(Icinga, $) {
 
diff --git a/public/js/icinga/behavior/sparkline.js b/public/js/icinga/behavior/sparkline.js
index 44bac4fb9..ee352002a 100644
--- a/public/js/icinga/behavior/sparkline.js
+++ b/public/js/icinga/behavior/sparkline.js
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 (function(Icinga, $) {
 
diff --git a/public/js/icinga/behavior/tooltip.js b/public/js/icinga/behavior/tooltip.js
index 7889aec4e..b08b1f3c1 100644
--- a/public/js/icinga/behavior/tooltip.js
+++ b/public/js/icinga/behavior/tooltip.js
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 (function(Icinga, $) {
 
diff --git a/public/js/icinga/behavior/tristate.js b/public/js/icinga/behavior/tristate.js
index 8519b8567..7170feb06 100644
--- a/public/js/icinga/behavior/tristate.js
+++ b/public/js/icinga/behavior/tristate.js
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 (function(Icinga, $) {
 
diff --git a/public/js/icinga/eventlistener.js b/public/js/icinga/eventlistener.js
index 24818963c..ce1e3715e 100644
--- a/public/js/icinga/eventlistener.js
+++ b/public/js/icinga/eventlistener.js
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
  * EventListener contains event handlers and can bind / and unbind them from
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index d537cde30..9ae61148b 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
  * Icinga.Events
diff --git a/public/js/icinga/history.js b/public/js/icinga/history.js
index ef05f518e..3357b41a3 100644
--- a/public/js/icinga/history.js
+++ b/public/js/icinga/history.js
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
  * Icinga.History
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 155591026..d71c1d19f 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
  * Icinga.Loader
diff --git a/public/js/icinga/logger.js b/public/js/icinga/logger.js
index 54ec7b182..1898bf2a4 100644
--- a/public/js/icinga/logger.js
+++ b/public/js/icinga/logger.js
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
  * Icinga.Logger
diff --git a/public/js/icinga/module.js b/public/js/icinga/module.js
index 5d05c82a5..650f8c4cc 100644
--- a/public/js/icinga/module.js
+++ b/public/js/icinga/module.js
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
  * This is how we bootstrap JS code in our modules
diff --git a/public/js/icinga/timer.js b/public/js/icinga/timer.js
index 06b38a4e6..baa8a7e7b 100644
--- a/public/js/icinga/timer.js
+++ b/public/js/icinga/timer.js
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
  * Icinga.Timer
diff --git a/public/js/icinga/timezone.js b/public/js/icinga/timezone.js
index 69bae9a9a..349867eb6 100644
--- a/public/js/icinga/timezone.js
+++ b/public/js/icinga/timezone.js
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 (function(Icinga, $) {
 
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index c63d5e7a6..93c539cd6 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
  * Icinga.UI
diff --git a/public/js/icinga/utils.js b/public/js/icinga/utils.js
index 8539d29ca..bdde78ada 100644
--- a/public/js/icinga/utils.js
+++ b/public/js/icinga/utils.js
@@ -1,4 +1,4 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
  * Icinga utility functions
diff --git a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
index 8067b6259..2dc7fb5a0 100644
--- a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
+++ b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Forms\Config\Authentication;
 
diff --git a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
index 66a743d73..561d61b1c 100644
--- a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
+++ b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Forms\Config\Authentication;
 
diff --git a/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php b/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php
index 00cb32464..23563f31b 100644
--- a/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php
+++ b/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Forms\Config;
 
diff --git a/test/php/application/forms/Config/Resource/DbResourceFormTest.php b/test/php/application/forms/Config/Resource/DbResourceFormTest.php
index a14f64949..3cf23a70a 100644
--- a/test/php/application/forms/Config/Resource/DbResourceFormTest.php
+++ b/test/php/application/forms/Config/Resource/DbResourceFormTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Forms\Config\Resource;
 
diff --git a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
index 94c171981..f6d823046 100644
--- a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
+++ b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Forms\Config\Resource;
 
diff --git a/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php b/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php
index 6c3899e01..a634752de 100644
--- a/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php
+++ b/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Forms\Config\Resource;
 
diff --git a/test/php/application/views/helpers/DateFormatTestBroken.php b/test/php/application/views/helpers/DateFormatTestBroken.php
index 1a4daf8fe..75ee10286 100644
--- a/test/php/application/views/helpers/DateFormatTestBroken.php
+++ b/test/php/application/views/helpers/DateFormatTestBroken.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Views\Helper;
 
diff --git a/test/php/bootstrap.php b/test/php/bootstrap.php
index af34344c5..6a41e7eab 100644
--- a/test/php/bootstrap.php
+++ b/test/php/bootstrap.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 $applicationPath = realpath(dirname(__FILE__) . '/../../application/');
 $modulePath = realpath(dirname(__FILE__) . '/../../modules/');
diff --git a/test/php/library/Icinga/Application/ConfigTest.php b/test/php/library/Icinga/Application/ConfigTest.php
index 8b3d0cd0f..06249bb1a 100644
--- a/test/php/library/Icinga/Application/ConfigTest.php
+++ b/test/php/library/Icinga/Application/ConfigTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Application;
 
diff --git a/test/php/library/Icinga/Application/LoaderTest.php b/test/php/library/Icinga/Application/LoaderTest.php
index 4b3f5b5af..3ae94f8d3 100644
--- a/test/php/library/Icinga/Application/LoaderTest.php
+++ b/test/php/library/Icinga/Application/LoaderTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Application;
 
diff --git a/test/php/library/Icinga/Chart/GraphChartTest.php b/test/php/library/Icinga/Chart/GraphChartTest.php
index 49c81a5de..a13187ce8 100644
--- a/test/php/library/Icinga/Chart/GraphChartTest.php
+++ b/test/php/library/Icinga/Chart/GraphChartTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Chart;
 
diff --git a/test/php/library/Icinga/Chart/PieChartTest.php b/test/php/library/Icinga/Chart/PieChartTest.php
index 21b9fa49a..214ab418b 100644
--- a/test/php/library/Icinga/Chart/PieChartTest.php
+++ b/test/php/library/Icinga/Chart/PieChartTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Chart;
 
diff --git a/test/php/library/Icinga/Data/ConfigObjectTest.php b/test/php/library/Icinga/Data/ConfigObjectTest.php
index 40b095267..eabdf80cf 100644
--- a/test/php/library/Icinga/Data/ConfigObjectTest.php
+++ b/test/php/library/Icinga/Data/ConfigObjectTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Data;
 
diff --git a/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php b/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php
index 5e86d3f64..e44df672c 100644
--- a/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php
+++ b/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Data;
 
diff --git a/test/php/library/Icinga/Data/Filter/FilterTest.php b/test/php/library/Icinga/Data/Filter/FilterTest.php
index 4a048818f..e14decb20 100644
--- a/test/php/library/Icinga/Data/Filter/FilterTest.php
+++ b/test/php/library/Icinga/Data/Filter/FilterTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Data;
 
diff --git a/test/php/library/Icinga/File/CsvTest.php b/test/php/library/Icinga/File/CsvTest.php
index 0d81fcb6d..3ee64b2b5 100644
--- a/test/php/library/Icinga/File/CsvTest.php
+++ b/test/php/library/Icinga/File/CsvTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\File;
 
diff --git a/test/php/library/Icinga/File/Ini/IniWriterTest.php b/test/php/library/Icinga/File/Ini/IniWriterTest.php
index 5603954ac..56f7fbf3f 100644
--- a/test/php/library/Icinga/File/Ini/IniWriterTest.php
+++ b/test/php/library/Icinga/File/Ini/IniWriterTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Config;
 
diff --git a/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php b/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php
index 36d1d4f2b..c67e5433e 100644
--- a/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php
+++ b/test/php/library/Icinga/Logger/Writer/StreamWriterTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Logger\Writer;
 
diff --git a/test/php/library/Icinga/Protocol/Ldap/QueryTest.php b/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
index e87064251..589dc8f36 100644
--- a/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
+++ b/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Protocol\Ldap;
 
diff --git a/test/php/library/Icinga/Test/BaseTestCaseTest.php b/test/php/library/Icinga/Test/BaseTestCaseTest.php
index 36c251c4c..a0d6cbce9 100644
--- a/test/php/library/Icinga/Test/BaseTestCaseTest.php
+++ b/test/php/library/Icinga/Test/BaseTestCaseTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Test;
 
diff --git a/test/php/library/Icinga/User/PreferencesTest.php b/test/php/library/Icinga/User/PreferencesTest.php
index 75a6723b6..700c3605a 100644
--- a/test/php/library/Icinga/User/PreferencesTest.php
+++ b/test/php/library/Icinga/User/PreferencesTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\User;
 
diff --git a/test/php/library/Icinga/User/Store/DbStoreTest.php b/test/php/library/Icinga/User/Store/DbStoreTest.php
index bcadadbe4..fdd856e1f 100644
--- a/test/php/library/Icinga/User/Store/DbStoreTest.php
+++ b/test/php/library/Icinga/User/Store/DbStoreTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\User\Preferences\Store;
 
diff --git a/test/php/library/Icinga/User/Store/IniStoreTest.php b/test/php/library/Icinga/User/Store/IniStoreTest.php
index 912c09320..dc38c8f9f 100644
--- a/test/php/library/Icinga/User/Store/IniStoreTest.php
+++ b/test/php/library/Icinga/User/Store/IniStoreTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\User\Preferences\Store;
 
diff --git a/test/php/library/Icinga/UserTest.php b/test/php/library/Icinga/UserTest.php
index b14a91a57..9c14a93d3 100644
--- a/test/php/library/Icinga/UserTest.php
+++ b/test/php/library/Icinga/UserTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga;
 
diff --git a/test/php/library/Icinga/Util/DateTimeFactoryTest.php b/test/php/library/Icinga/Util/DateTimeFactoryTest.php
index ad7441f93..2e8e097eb 100644
--- a/test/php/library/Icinga/Util/DateTimeFactoryTest.php
+++ b/test/php/library/Icinga/Util/DateTimeFactoryTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Util/DimensionTest.php b/test/php/library/Icinga/Util/DimensionTest.php
index db2e579b2..9144778df 100644
--- a/test/php/library/Icinga/Util/DimensionTest.php
+++ b/test/php/library/Icinga/Util/DimensionTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Util/FileTest.php b/test/php/library/Icinga/Util/FileTest.php
index 96ca21ac9..03bd0bfeb 100644
--- a/test/php/library/Icinga/Util/FileTest.php
+++ b/test/php/library/Icinga/Util/FileTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Util/StringTest.php b/test/php/library/Icinga/Util/StringTest.php
index 46acee3d0..f7ef83977 100644
--- a/test/php/library/Icinga/Util/StringTest.php
+++ b/test/php/library/Icinga/Util/StringTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Util/TranslatorTest.php b/test/php/library/Icinga/Util/TranslatorTest.php
index ccf632657..dbc214a0e 100644
--- a/test/php/library/Icinga/Util/TranslatorTest.php
+++ b/test/php/library/Icinga/Util/TranslatorTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Util;
 
diff --git a/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php b/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php
index 79296e4a1..cc0081164 100644
--- a/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php
+++ b/test/php/library/Icinga/Web/Form/Element/DateTimePickerTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Web\Form\Element;
 
diff --git a/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php b/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php
index 1d9514663..9173bfabb 100644
--- a/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php
+++ b/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Web\Form\Validator;
 
diff --git a/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php b/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php
index 124484de3..79673b4d2 100644
--- a/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php
+++ b/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Web\Form\Validator;
 
diff --git a/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php b/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php
index 9f7996975..8fa26dd74 100644
--- a/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php
+++ b/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Web\Form\Validator;
 
diff --git a/test/php/library/Icinga/Web/FormTest.php b/test/php/library/Icinga/Web/FormTest.php
index 01ef3de27..0fff50a3f 100644
--- a/test/php/library/Icinga/Web/FormTest.php
+++ b/test/php/library/Icinga/Web/FormTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/HookTest.php b/test/php/library/Icinga/Web/HookTest.php
index 3d678fe7a..97c628e5b 100644
--- a/test/php/library/Icinga/Web/HookTest.php
+++ b/test/php/library/Icinga/Web/HookTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web\Hook;
 
diff --git a/test/php/library/Icinga/Web/MenuTest.php b/test/php/library/Icinga/Web/MenuTest.php
index 31c8538bc..7c407b835 100644
--- a/test/php/library/Icinga/Web/MenuTest.php
+++ b/test/php/library/Icinga/Web/MenuTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
index 6d26ad847..e983db693 100644
--- a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
+++ b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Web\Paginator\ScrollingStyle;
 
diff --git a/test/php/library/Icinga/Web/Session/PhpSessionTest.php b/test/php/library/Icinga/Web/Session/PhpSessionTest.php
index 90d593848..026ddc1c3 100644
--- a/test/php/library/Icinga/Web/Session/PhpSessionTest.php
+++ b/test/php/library/Icinga/Web/Session/PhpSessionTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Web\Session;
 
diff --git a/test/php/library/Icinga/Web/Session/SessionNamespaceTest.php b/test/php/library/Icinga/Web/Session/SessionNamespaceTest.php
index 63b12bd90..1326538f1 100644
--- a/test/php/library/Icinga/Web/Session/SessionNamespaceTest.php
+++ b/test/php/library/Icinga/Web/Session/SessionNamespaceTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Web\Session;
 
diff --git a/test/php/library/Icinga/Web/UrlTest.php b/test/php/library/Icinga/Web/UrlTest.php
index 331ae4b11..ad989ded5 100644
--- a/test/php/library/Icinga/Web/UrlTest.php
+++ b/test/php/library/Icinga/Web/UrlTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/View/DateTimeRendererTest.php b/test/php/library/Icinga/Web/View/DateTimeRendererTest.php
index 639e10563..279c18ba1 100644
--- a/test/php/library/Icinga/Web/View/DateTimeRendererTest.php
+++ b/test/php/library/Icinga/Web/View/DateTimeRendererTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/Widget/DashboardTest.php b/test/php/library/Icinga/Web/Widget/DashboardTest.php
index dc9ec23bf..09b25adc4 100644
--- a/test/php/library/Icinga/Web/Widget/DashboardTest.php
+++ b/test/php/library/Icinga/Web/Widget/DashboardTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php b/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
index c7354e341..2db7be54f 100644
--- a/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
+++ b/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Web;
 
diff --git a/test/php/regression/Bug4102Test.php b/test/php/regression/Bug4102Test.php
index 77f356d51..b5586926e 100644
--- a/test/php/regression/Bug4102Test.php
+++ b/test/php/regression/Bug4102Test.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Regression;
 
diff --git a/test/php/regression/Bug6284Test.php b/test/php/regression/Bug6284Test.php
index 1863a15e4..072423a10 100644
--- a/test/php/regression/Bug6284Test.php
+++ b/test/php/regression/Bug6284Test.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Regression;
 
diff --git a/test/php/regression/Bug6432Test.php b/test/php/regression/Bug6432Test.php
index 50719db46..9a23851bc 100644
--- a/test/php/regression/Bug6432Test.php
+++ b/test/php/regression/Bug6432Test.php
@@ -1,5 +1,5 @@
 <?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | http://www.gnu.org/licenses/gpl-2.0.txt */
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Tests\Icinga\Regression;
 

From a8e0b7effc13c2b5abea0172906fc16665a12e82 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 4 Feb 2015 13:20:41 +0100
Subject: [PATCH 0550/2920] Fix usage of the PostgreSQL system function
 has_database/table_privilege

On PostgreSQL < 8.4 the system functions has_database_privilege() and
has_table_privilege() do no support comma separated privilege types.

fixes #8354
---
 modules/setup/library/Setup/Utils/DbTool.php | 40 +++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index f6d3939a7..f9628484c 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -727,28 +727,32 @@ EOD;
             }
 
             if (false === empty($dbPrivileges)) {
-                $query = $this->query(
-                    'SELECT has_database_privilege(:user, :dbname, :privileges) AS db_privileges_granted',
-                    array(
-                        ':user'         => $username !== null ? $username : $this->config['username'],
-                        ':dbname'       => $this->config['dbname'],
-                        ':privileges'   => join(',', $dbPrivileges) . ($requireGrants ? ' WITH GRANT OPTION' : '')
-                    )
-                );
-                $privilegesGranted &= $query->fetchObject()->db_privileges_granted;
+                foreach ($dbPrivileges as $dbPrivilege) {
+                    $query = $this->query(
+                        'SELECT has_database_privilege(:user, :dbname, :privilege) AS db_privilege_granted',
+                        array(
+                            ':user'         => $username !== null ? $username : $this->config['username'],
+                            ':dbname'       => $this->config['dbname'],
+                            ':privilege'    => $dbPrivilege . ($requireGrants ? ' WITH GRANT OPTION' : '')
+                        )
+                    );
+                    $privilegesGranted &= $query->fetchObject()->db_privilege_granted;
+                }
             }
 
             if (false === empty($tablePrivileges)) {
                 foreach (array_intersect($context, $this->listTables()) as $table) {
-                    $query = $this->query(
-                        'SELECT has_table_privilege(:user, :table, :privileges) AS table_privileges_granted',
-                        array(
-                            ':user'         => $username !== null ? $username : $this->config['username'],
-                            ':table'        => $table,
-                            ':privileges'   => join(',', $tablePrivileges) . ($requireGrants ? ' WITH GRANT OPTION' : '')
-                        )
-                    );
-                    $privilegesGranted &= $query->fetchObject()->table_privileges_granted;
+                    foreach ($tablePrivileges as $tablePrivilege) {
+                        $query = $this->query(
+                            'SELECT has_table_privilege(:user, :table, :privilege) AS table_privilege_granted',
+                            array(
+                                ':user'         => $username !== null ? $username : $this->config['username'],
+                                ':table'        => $table,
+                                ':privilege'    => $tablePrivilege . ($requireGrants ? ' WITH GRANT OPTION' : '')
+                            )
+                        );
+                        $privilegesGranted &= $query->fetchObject()->table_privilege_granted;
+                    }
                 }
             }
         } else {

From cef9a5c1a2e51f85d2b79c7ffe4a8cdc095cabd3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 4 Feb 2015 16:15:14 +0100
Subject: [PATCH 0551/2920] WCAG/1.1.1: Add example for accessible icon fonts

refs #8358
---
 doc/accessibility/ifont.html | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 doc/accessibility/ifont.html

diff --git a/doc/accessibility/ifont.html b/doc/accessibility/ifont.html
new file mode 100644
index 000000000..481cbff71
--- /dev/null
+++ b/doc/accessibility/ifont.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<html class="no-js" lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>Accessibility: Icon Fonts</title>
+    <meta name="description" content="Accessible icon fonts">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style type="text/css">
+        .icon-star:before {
+            content: "★";
+        }
+        .sr-only {
+            border: 0;
+            clip: rect(0 0 0 0);
+            height: 1px;
+            margin: -1px;
+            overflow: hidden;
+            padding: 0;
+            position: absolute;
+            width: 1px;
+        }
+    </style>
+</head>
+<body>
+<span tabindex="0">
+    <i class="icon-star" aria-hidden="true"></i>
+    <span class="sr-only">Top rated article</span>
+</span>
+</body>
+</html>

From 04357d21b6c2b857387756ac833128978a3474d1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 4 Feb 2015 16:40:33 +0100
Subject: [PATCH 0552/2920] WCAG/1.1.1: Add example for screen reader muted
 icon

refs #8360
---
 doc/accessibility/ifont-mute.html | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 doc/accessibility/ifont-mute.html

diff --git a/doc/accessibility/ifont-mute.html b/doc/accessibility/ifont-mute.html
new file mode 100644
index 000000000..f8252e36a
--- /dev/null
+++ b/doc/accessibility/ifont-mute.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<html class="no-js" lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>Accessibility: Muted Icon Fonts</title>
+    <meta name="description" content="Accessible icon fonts">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style type="text/css">
+        .icon-star:before {
+            content: "★";
+        }
+    </style>
+</head>
+<body>
+<a href="#">
+    <i aria-hidden="true" class="icon-star"></i>
+    Visit top rated article
+</a>
+</body>
+</html>

From 5014b5dc46dc48d4b29ced2516abc842ec23c483 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 4 Feb 2015 17:23:07 +0100
Subject: [PATCH 0553/2920] Fix usermod for SUSE and SLES

fixes #8359
---
 doc/installation.md | 2 +-
 icingaweb2.spec     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/installation.md b/doc/installation.md
index aa6968e26..d9483faef 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -81,7 +81,7 @@ usermod -a -G icingaweb2 apache
 
 SLES and OpenSUSE:
 ````
-usermod -G icingaweb2 wwwrun
+usermod -A icingaweb2 wwwrun
 ````
 
 Debian and Ubuntu:
diff --git a/icingaweb2.spec b/icingaweb2.spec
index 9a40e59e6..1d97819d9 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -202,7 +202,7 @@ cp -prv packages/files/config/modules/setup %{buildroot}/%{configdir}/modules/
 %pre
 getent group icingacmd >/dev/null || groupadd -r icingacmd
 %if 0%{?suse_version}
-usermod -G icingacmd,%{icingawebgroup} %{wwwuser}
+usermod -A icingacmd,%{icingawebgroup} %{wwwuser}
 %else
 usermod -a -G icingacmd,%{icingawebgroup} %{wwwuser}
 %endif

From b56eb7b66952169c6d68a1d1d780a3e67e5c0f2a Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 4 Feb 2015 17:57:31 +0100
Subject: [PATCH 0554/2920] Fix keyboard navigation

Store current focus position before reload and apply it after rendering.

fixes #8350
---
 public/js/icinga/events.js |  3 --
 public/js/icinga/loader.js |  9 ++++--
 public/js/icinga/utils.js  | 62 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 9ae61148b..7bcbc8e3b 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -74,9 +74,6 @@
                 }
             });
 
-            if (document.activeElement === document.body) {
-                $('input.autofocus', el).focus();
-            }
             var searchField = $('#menu input.search', el);
             // Remember initial search field value if any
             if (searchField.length && searchField.val().length) {
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index d71c1d19f..6a82a6ee5 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -672,7 +672,7 @@
             // Container update happens here
             var scrollPos = false;
             var self = this;
-            var origFocus = document.activeElement;
+            var origFocus = self.icinga.utils.getDomPath(document.activeElement);
             var containerId = $container.attr('id');
             if (typeof containerId !== 'undefined') {
                 if (autorefresh) {
@@ -737,8 +737,11 @@
             }
             this.icinga.ui.assignUniqueContainerIds();
 
-            if (origFocus) {
-                $(origFocus).focus();
+            console.log(origFocus);
+            if (origFocus.length == origFocus[0] !== '') {
+                setTimeout(function() {
+                    $(self.icinga.utils.getElementByDomPath(origFocus)).focus();
+                }, 0);
             }
 
             // TODO: this.icinga.events.refreshContainer(container);
diff --git a/public/js/icinga/utils.js b/public/js/icinga/utils.js
index bdde78ada..bd64e586e 100644
--- a/public/js/icinga/utils.js
+++ b/public/js/icinga/utils.js
@@ -233,6 +233,68 @@
             return !(at > (bt + bh) || bt > (at + ah)) && !(bl  > (al + aw) || al > (bl + bw));
         },
 
+        /**
+         * Create a selector that can be used to fetch the element the same position in the DOM-Tree
+         *
+         * Create the path to the given element in the DOM-Tree, comparable to an X-Path. Climb the
+         * DOM tree upwards until an element with an unique ID is found, this id is used as the anchor,
+         * all other elements will be addressed by their position in the parent.
+         *
+         * @param   {HTMLElement} el    The element to extract the path for.
+         *
+         * @returns {Array}             The path of the element, that can be passed to getElementByPath
+         */
+        getDomPath: function (el) {
+            if (! el) {
+                return [];
+            }
+            if (el.id !== '') {
+                return ['#' + el.id];
+            }
+            if (el === document.body) {
+                return ['body'];
+            }
+
+            var siblings = el.parentNode.childNodes;
+            var index = 0;
+            for (var i = 0; i < siblings.length; i ++) {
+                if (siblings[i].nodeType === 1) {
+                    index ++;
+                }
+
+                if (siblings[i] === el) {
+                    var p = this.getDomPath(el.parentNode);
+                    p.push(':nth-child(' + (index) + ')');
+                    return p;
+                }
+            }
+        },
+
+        /**
+         * Climbs up the given dom path and returns the element
+         *
+         * This is the counterpart
+         *
+         * @param   path    {Array}         The selector
+         * @returns         {HTMLElement}   The corresponding element
+         */
+        getElementByDomPath: function (path) {
+            var $element;
+            $.each(path, function (i, selector) {
+                if (! $element) {
+                    $element = $(selector);
+                } else {
+                    console.log(selector);
+                    $element = $element.children(selector).first();
+                    if (! $element[0]) {
+                        console.log("element not existing stopping...");
+                        return false;
+                    }
+                }
+            });
+            return $element[0];
+        },
+
         /**
          * Cleanup
          */

From e315d8c35847520d56c447d545edc3dec9b66e3f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 5 Feb 2015 09:15:25 +0100
Subject: [PATCH 0555/2920] Clarify external authentication documentation

It's necessary to enable the HTTPDigestAuthentication module
and to restart the webserver..
---
 doc/external_authentication.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/external_authentication.md b/doc/external_authentication.md
index 15df1e1cf..05225fb82 100644
--- a/doc/external_authentication.md
+++ b/doc/external_authentication.md
@@ -65,6 +65,9 @@ The webserver should require authentication for all public Icinga Web 2 files.
 </Directory>
 ````
 
+To get these changes to work, make sure to enable the module for
+HTTPDigestAuthentication and restart the webserver.
+
 ### Preparing Icinga Web 2
 
 Once external authentication is set up correctly you need to configure Icinga

From d8c40d40a0f3f7edbd1dec61211a4f565945d03a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 5 Feb 2015 10:16:50 +0100
Subject: [PATCH 0556/2920] WCAG/1.1.1: Add example for accessible SVGs

refs #8364
---
 doc/accessibility/svg.html | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 doc/accessibility/svg.html

diff --git a/doc/accessibility/svg.html b/doc/accessibility/svg.html
new file mode 100644
index 000000000..8ee548f38
--- /dev/null
+++ b/doc/accessibility/svg.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<html class="no-js" lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>Accessibility: SVGs</title>
+    <meta name="description" content="Accessible icon fonts">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+<body>
+<svg version="1.2" role="img" aria-labelledby="title desc" tabindex="0">
+    <title id="title">A Circle</title>
+    <desc id="desc">A red circle with a black border.</desc>
+    <circle cy="50" cx="50" r="50" stroke="black" stroke-width="1" fill="red" />
+</svg>
+</body>
+</html>
+
+

From 707d977cfcf42dff5287ebd93cbf7aa5f027dc2b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 5 Feb 2015 13:14:29 +0100
Subject: [PATCH 0557/2920] WCAG/3.3.3: Add example for required form elements

refs #8349
---
 doc/accessibility/required-form-elements.html | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 doc/accessibility/required-form-elements.html

diff --git a/doc/accessibility/required-form-elements.html b/doc/accessibility/required-form-elements.html
new file mode 100644
index 000000000..86fc9374e
--- /dev/null
+++ b/doc/accessibility/required-form-elements.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<html class="no-js" lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>Accessibility: Required form elements</title>
+    <meta name="description" content="Required form elements">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+<body>
+    <form>
+        <label>
+            Enter some text:&nbsp;
+            <input type="text" name="some_text" value="" aria-required="true" required>
+        </label>
+        <input type="submit" name="btn_submit" value="Submit">
+    </form>
+</body>
+</html>
\ No newline at end of file

From c5b6d7ee41cb0edf272847a5d63d55e6c3452116 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 5 Feb 2015 13:15:18 +0100
Subject: [PATCH 0558/2920] Ensure that all required form elements are marked
 as such in HTML markup

refs #8349
---
 library/Icinga/Web/Form.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 1a75cb852..606a74f98 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -6,6 +6,7 @@ namespace Icinga\Web;
 use LogicException;
 use Zend_Config;
 use Zend_Form;
+use Zend_Form_Element;
 use Zend_View_Interface;
 use Icinga\Application\Icinga;
 use Icinga\Authentication\Manager;
@@ -550,7 +551,24 @@ class Form extends Zend_Form
             unset($el->autosubmit);
         }
 
-        return $el;
+        return $this->ensureElementAccessibility($el);
+    }
+
+    /**
+     * Add accessibility related attributes
+     *
+     * @param   Zend_Form_Element   $element
+     *
+     * @return  Zend_Form_Element
+     */
+    public function ensureElementAccessibility(Zend_Form_Element $element)
+    {
+        if ($element->isRequired() && strpos(strtolower($element->getType()), 'checkbox') === false) {
+            $element->setAttrib('aria-required', 'true'); // ARIA
+            $element->setAttrib('required', ''); // HTML5
+        }
+
+        return $element;
     }
 
     /**

From 437050430f8f3f806516b7e8cfa349dadb821f71 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 5 Feb 2015 13:18:21 +0100
Subject: [PATCH 0559/2920] Make sure that the admin wizard-step provides the
 required-HTML markup

refs #8349
---
 .../application/forms/AdminAccountPage.php    | 44 ++++++++++++++++++-
 .../scripts/form/setup-admin-account.phtml    |  6 +--
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index e9334c650..de8650439 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -78,7 +78,7 @@ class AdminAccountPage extends Form
                 'text',
                 'by_name',
                 array(
-                    'required'      => isset($formData['user_type']) && $formData['user_type'] === 'by_name',
+                    'required'      => !isset($formData['user_type']) || $formData['user_type'] === 'by_name',
                     'value'         => $this->getUsername(),
                     'label'         => $this->translate('Username'),
                     'description'   => $this->translate(
@@ -87,6 +87,12 @@ class AdminAccountPage extends Form
                     )
                 )
             );
+            if (! $this->request->isXmlHttpRequest()) {
+                // In case JS is disabled we must not provide client side validation as
+                // the user is required to input data even he has changed his mind
+                $this->getElement('by_name')->setAttrib('required', null);
+                $this->getElement('by_name')->setAttrib('aria-required', null);
+            }
         }
 
         if ($this->backendConfig['backend'] === 'db' || $this->backendConfig['backend'] === 'ldap') {
@@ -111,6 +117,12 @@ class AdminAccountPage extends Form
                         'multiOptions'  => array_combine($users, $users)
                     )
                 );
+                if (! $this->request->isXmlHttpRequest()) {
+                    // In case JS is disabled we must not provide client side validation as
+                    // the user is required to input data even he has changed his mind
+                    $this->getElement('existing_user')->setAttrib('required', null);
+                    $this->getElement('existing_user')->setAttrib('aria-required', null);
+                }
             }
         }
 
@@ -149,6 +161,14 @@ class AdminAccountPage extends Form
                     )
                 )
             );
+            if (! $this->request->isXmlHttpRequest()) {
+                // In case JS is disabled we must not provide client side validation as
+                // the user is required to input data even he has changed his mind
+                foreach (array('new_user', 'new_user_password', 'new_user_2ndpass') as $elementName) {
+                    $this->getElement($elementName)->setAttrib('aria-required', null);
+                    $this->getElement($elementName)->setAttrib('required', null);
+                }
+            }
         }
 
         if (count($choices) > 1) {
@@ -157,6 +177,8 @@ class AdminAccountPage extends Form
                 'user_type',
                 array(
                     'required'      => true,
+                    'autosubmit'    => true,
+                    'value'         => key($choices),
                     'multiOptions'  => $choices
                 )
             );
@@ -218,6 +240,26 @@ class AdminAccountPage extends Form
         return true;
     }
 
+    /**
+     * Return whether the given values (possibly incomplete) are valid
+     *
+     * Unsets all empty text-inputs so that they are not being validated when auto-submitting the form.
+     *
+     * @param   array   $formData
+     *
+     * @return type
+     */
+    public function isValidPartial(array $formData)
+    {
+        foreach (array('by_name', 'new_user', 'new_user_password', 'new_user_2ndpass') as $elementName) {
+            if (isset($formData[$elementName]) && $formData[$elementName] === '') {
+                unset($formData[$elementName]);
+            }
+        }
+
+        return parent::isValidPartial($formData);
+    }
+
     /**
      * Return the name of the externally authenticated user
      *
diff --git a/modules/setup/application/views/scripts/form/setup-admin-account.phtml b/modules/setup/application/views/scripts/form/setup-admin-account.phtml
index ac060526a..b069bb371 100644
--- a/modules/setup/application/views/scripts/form/setup-admin-account.phtml
+++ b/modules/setup/application/views/scripts/form/setup-admin-account.phtml
@@ -17,7 +17,7 @@ $showRadioBoxes = strpos(strtolower(get_class($radioElem)), 'radio') !== false;
 <?php if ($showRadioBoxes): ?>
     <div class="radiobox">
       <label>
-        <input type="radio" name="user_type" value="by_name"<?= $radioElem->getValue() === 'by_name' ? ' checked' : ''; ?>>
+        <input type="radio" name="user_type" value="by_name"<?= $radioElem->getValue() === 'by_name' ? ' checked' : ''; ?> class="autosubmit" aria-required="true" required>
         <?= $radioElem->getMultiOption('by_name'); ?>
       </label>
     </div>
@@ -32,7 +32,7 @@ $showRadioBoxes = strpos(strtolower(get_class($radioElem)), 'radio') !== false;
 <?php if ($showRadioBoxes): ?>
     <div class="radiobox">
       <label>
-        <input type="radio" name="user_type" value="existing_user"<?= $radioElem->getValue() === 'existing_user' ? ' checked' : ''; ?>>
+        <input type="radio" name="user_type" value="existing_user"<?= $radioElem->getValue() === 'existing_user' ? ' checked' : ''; ?> class="autosubmit" aria-required="true" required>
         <?= $radioElem->getMultiOption('existing_user'); ?>
       </label>
     </div>
@@ -49,7 +49,7 @@ $showRadioBoxes = strpos(strtolower(get_class($radioElem)), 'radio') !== false;
 <?php if ($showRadioBoxes): ?>
     <div class="radiobox">
       <label>
-        <input type="radio" name="user_type" value="new_user"<?= $radioElem->getValue() === 'new_user' ? ' checked' : ''; ?>>
+        <input type="radio" name="user_type" value="new_user"<?= $radioElem->getValue() === 'new_user' ? ' checked' : ''; ?> class="autosubmit" aria-required="true" required>
         <?= $radioElem->getMultiOption('new_user'); ?>
       </label>
     </div>

From 423025b3fe2776df7c6d314c567ad8544b50d987 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 5 Feb 2015 13:21:03 +0100
Subject: [PATCH 0560/2920] javascript: Do not bind the button click event

Catching form submit events is sufficient as catching the button click
event is not an option due to circumventing the browser's native form
validation logic otherwise.

refs #8349
---
 public/js/icinga/events.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 7bcbc8e3b..16b6fb0f5 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -118,8 +118,6 @@
             // Select a table row
             $(document).on('click', 'table.multiselect tr[href]', { self: this }, this.rowSelected);
 
-            $(document).on('click', 'button', { self: this }, this.submitForm);
-
             // We catch all form submit events
             $(document).on('submit', 'form', { self: this }, this.submitForm);
 

From c49f723f05739cf106c232a00fcedca7ca632793 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 6 Feb 2015 16:31:03 +0100
Subject: [PATCH 0561/2920] Let Icinga\Protocol\Ldap\Exception inherit from
 IcingaException

---
 library/Icinga/Protocol/Ldap/Connection.php | 72 ++++++++-------------
 library/Icinga/Protocol/Ldap/Exception.php  |  4 +-
 2 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index db55858e9..2d425d12b 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -171,11 +171,9 @@ class Connection
                 return false;
             }
             throw new LdapException(
-                sprintf(
-                    'LDAP list for "%s" failed: %s',
-                    $dn,
-                    ldap_error($this->ds)
-                )
+                'LDAP list for "%s" failed: %s',
+                $dn,
+                ldap_error($this->ds)
             );
         }
         $children = ldap_get_entries($this->ds, $result);
@@ -183,7 +181,7 @@ class Connection
             $result = $this->deleteRecursively($children[$i]['dn']);
             if (!$result) {
                 //return result code, if delete fails
-                throw new LdapException(sprintf('Recursively deleting "%s" failed', $dn));
+                throw new LdapException('Recursively deleting "%s" failed', $dn);
             }
         }
         return $this->deleteDN($dn);
@@ -200,11 +198,9 @@ class Connection
                 return false;
             }
             throw new LdapException(
-                sprintf(
-                    'LDAP delete for "%s" failed: %s',
-                    $dn,
-                    ldap_error($this->ds)
-                )
+                'LDAP delete for "%s" failed: %s',
+                $dn,
+                ldap_error($this->ds)
             );
         }
 
@@ -225,10 +221,8 @@ class Connection
         $rows = $this->fetchAll($query, $fields);
         if (count($rows) !== 1) {
             throw new LdapException(
-                sprintf(
-                    'Cannot fetch single DN for %s',
-                    $query->create()
-                )
+                'Cannot fetch single DN for %s',
+                $query->create()
             );
         }
         return key($rows);
@@ -471,18 +465,14 @@ class Connection
                 } else {
                     Logger::debug('LDAP STARTTLS failed: %s', ldap_error($ds));
                     throw new LdapException(
-                        sprintf(
-                            'LDAP STARTTLS failed: %s',
-                            ldap_error($ds)
-                        )
+                        'LDAP STARTTLS failed: %s',
+                        ldap_error($ds)
                     );
                 }
             } elseif ($force_tls) {
                 throw new LdapException(
-                    sprintf(
-                        'TLS is required but not announced by %s',
-                        $this->hostname
-                    )
+                    'TLS is required but not announced by %s',
+                    $this->hostname
                 );
             } else {
                 // TODO: Log noticy -> TLS enabled but not announced
@@ -708,24 +698,20 @@ class Connection
 
         if (! $result) {
             throw new LdapException(
-                sprintf(
-                    'Capability query failed (%s:%d): %s. Check if hostname and port of the ldap resource are correct '
-                        . ' and if anonymous access is permitted.',
-                    $this->hostname,
-                    $this->port,
-                    ldap_error($ds)
-                )
+                'Capability query failed (%s:%d): %s. Check if hostname and port of the'
+                . ' ldap resource are correct and if anonymous access is permitted.',
+                $this->hostname,
+                $this->port,
+                ldap_error($ds)
             );
         }
         $entry = ldap_first_entry($ds, $result);
         if ($entry === false) {
             throw new LdapException(
-                sprintf(
-                    'Capabilities not available (%s:%d): %s. Discovery of root DSE probably not permitted.',
-                    $this->hostname,
-                    $this->port,
-                    ldap_error($ds)
-                )
+                'Capabilities not available (%s:%d): %s. Discovery of root DSE probably not permitted.',
+                $this->hostname,
+                $this->port,
+                ldap_error($ds)
             );
         }
 
@@ -771,14 +757,12 @@ class Connection
         $r = @ldap_bind($this->ds, $this->bind_dn, $this->bind_pw);
         if (! $r) {
             throw new LdapException(
-                sprintf(
-                    'LDAP connection to %s:%s (%s / %s) failed: %s',
-                    $this->hostname,
-                    $this->port,
-                    $this->bind_dn,
-                    '***' /* $this->bind_pw */,
-                    ldap_error($this->ds)
-                )
+                'LDAP connection to %s:%s (%s / %s) failed: %s',
+                $this->hostname,
+                $this->port,
+                $this->bind_dn,
+                '***' /* $this->bind_pw */,
+                ldap_error($this->ds)
             );
         }
         $this->bound = true;
diff --git a/library/Icinga/Protocol/Ldap/Exception.php b/library/Icinga/Protocol/Ldap/Exception.php
index 784b84a9d..de7a10651 100644
--- a/library/Icinga/Protocol/Ldap/Exception.php
+++ b/library/Icinga/Protocol/Ldap/Exception.php
@@ -3,10 +3,12 @@
 
 namespace Icinga\Protocol\Ldap;
 
+use Icinga\Exception\IcingaException;
+
 /**
  * Class Exception
  * @package Icinga\Protocol\Ldap
  */
-class Exception extends \Exception
+class Exception extends IcingaException
 {
 }

From 8b94e4c7019a0f7e01d204487bacd079b0815899 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 6 Feb 2015 16:32:26 +0100
Subject: [PATCH 0562/2920] Fix documentation and code style in the
 LdapUserBackend

---
 .../Backend/LdapUserBackend.php               | 57 ++++++++++---------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/Backend/LdapUserBackend.php
index fd7e39f54..7fde1f61b 100644
--- a/library/Icinga/Authentication/Backend/LdapUserBackend.php
+++ b/library/Icinga/Authentication/Backend/LdapUserBackend.php
@@ -5,6 +5,7 @@ namespace Icinga\Authentication\Backend;
 
 use Icinga\User;
 use Icinga\Authentication\UserBackend;
+use Icinga\Protocol\Ldap\Query;
 use Icinga\Protocol\Ldap\Connection;
 use Icinga\Exception\AuthenticationException;
 use Icinga\Protocol\Ldap\Exception as LdapException;
@@ -15,7 +16,7 @@ class LdapUserBackend extends UserBackend
      * Connection to the LDAP server
      *
      * @var Connection
-     **/
+     */
     protected $conn;
 
     protected $baseDn;
@@ -36,7 +37,9 @@ class LdapUserBackend extends UserBackend
     }
 
     /**
-     * @return \Icinga\Protocol\Ldap\Query
+     * Create a query to select all usernames
+     *
+     * @return  Query
      */
     protected function selectUsers()
     {
@@ -49,18 +52,18 @@ class LdapUserBackend extends UserBackend
     }
 
     /**
-     * Create query
+     * Create a query filtered by the given username
      *
-     * @param   string $username
+     * @param   string  $username
      *
-     * @return  \Icinga\Protocol\Ldap\Query
-     **/
+     * @return  Query
+     */
     protected function selectUser($username)
     {
-        return $this->selectUsers()->where(
-                $this->userNameAttribute,
-                str_replace('*', '', $username)
-            );
+        return $this->selectUsers()->setUsePagedResults(false)->where(
+            $this->userNameAttribute,
+            str_replace('*', '', $username)
+        );
     }
 
     /**
@@ -68,23 +71,22 @@ class LdapUserBackend extends UserBackend
      *
      * Try to bind to the backend and query all available users to check if:
      * <ul>
-     *  <li>User connection credentials are correct and the bind is possible</li>
+     *  <li>Connection credentials are correct and the bind is possible</li>
      *  <li>At least one user exists</li>
      *  <li>The specified userClass has the property specified by userNameAttribute</li>
      * </ul>
      *
-     * @throws AuthenticationException  When authentication is not possible
+     * @throws  AuthenticationException     When authentication is not possible
      */
     public function assertAuthenticationPossible()
     {
         try {
-            $q = $this->conn->select()->setBase($this->baseDn)->from($this->userClass);
-            $result = $q->fetchRow();
+            $result = $this->selectUsers()->fetchRow();
         } catch (LdapException $e) {
             throw new AuthenticationException('Connection not possible.', $e);
         }
 
-        if (! isset($result)) {
+        if ($result === null) {
             throw new AuthenticationException(
                 'No objects with objectClass="%s" in DN="%s" found.',
                 $this->userClass,
@@ -139,17 +141,16 @@ class LdapUserBackend extends UserBackend
     }
 
     /**
-     * Test whether the given user exists
+     * Return whether the given user exists
      *
-     * @param   User $user
+     * @param   User    $user
      *
      * @return  bool
-     * @throws  AuthenticationException
      */
     public function hasUser(User $user)
     {
         $username = $user->getUsername();
-        $entry = $this->conn->fetchOne($this->selectUser($username));
+        $entry = $this->selectUser($username)->fetchOne();
 
         if (is_array($entry)) {
             return in_array(strtolower($username), array_map('strtolower', $entry));
@@ -159,16 +160,15 @@ class LdapUserBackend extends UserBackend
     }
 
     /**
-     * Authenticate the given user and return true on success, false on failure and null on error
+     * Return whether the given user credentials are valid
      *
      * @param   User    $user
      * @param   string  $password
-     * @param   boolean $healthCheck        Perform additional health checks to generate more useful exceptions in case
-     *                                      of a configuration or backend error
+     * @param   boolean $healthCheck        Assert that authentication is possible at all
      *
-     * @return  bool                        True when the authentication was successful, false when the username
-     *                                      or password was invalid
-     * @throws  AuthenticationException     When an error occurred during authentication and authentication is not possible
+     * @return  bool
+     *
+     * @throws  AuthenticationException     In case an error occured or the health check has failed
      */
     public function authenticate(User $user, $password, $healthCheck = true)
     {
@@ -176,7 +176,6 @@ class LdapUserBackend extends UserBackend
             try {
                 $this->assertAuthenticationPossible();
             } catch (AuthenticationException $e) {
-                // Authentication not possible
                 throw new AuthenticationException(
                     'Authentication against backend "%s" not possible.',
                     $this->getName(),
@@ -184,24 +183,27 @@ class LdapUserBackend extends UserBackend
                 );
             }
         }
+
         if (! $this->hasUser($user)) {
             return false;
         }
+
         try {
             $userDn = $this->conn->fetchDN($this->selectUser($user->getUsername()));
             $authenticated = $this->conn->testCredentials(
                 $userDn,
                 $password
             );
+
             if ($authenticated) {
                 $groups = $this->getGroups($userDn);
                 if ($groups !== null) {
                     $user->setGroups($groups);
                 }
             }
+
             return $authenticated;
         } catch (LdapException $e) {
-            // Error during authentication of this specific user
             throw new AuthenticationException(
                 'Failed to authenticate user "%s" against backend "%s". An exception was thrown:',
                 $user->getUsername(),
@@ -238,6 +240,7 @@ class LdapUserBackend extends UserBackend
                 $users[] = $row->{$this->userNameAttribute};
             }
         }
+
         return $users;
     }
 }

From 3852feb069f8e91b60dd0976d4d6187d8d3beb2d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 6 Feb 2015 16:32:59 +0100
Subject: [PATCH 0563/2920] Add defaults for limit and offset in
 Icinga\Protocol\Ldap\Query

---
 library/Icinga/Protocol/Ldap/Query.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Query.php b/library/Icinga/Protocol/Ldap/Query.php
index 8b71fc918..897f12f4e 100644
--- a/library/Icinga/Protocol/Ldap/Query.php
+++ b/library/Icinga/Protocol/Ldap/Query.php
@@ -27,8 +27,8 @@ class Query
     protected $connection;
     protected $filters = array();
     protected $fields = array();
-    protected $limit_count;
-    protected $limit_offset;
+    protected $limit_count = 0;
+    protected $limit_offset = 0;
     protected $sort_columns = array();
     protected $count;
     protected $base;
@@ -111,7 +111,7 @@ class Query
      */
     public function hasLimit()
     {
-        return $this->limit_count !== null;
+        return $this->limit_count > 0;
     }
 
     /**

From b828f8b13adfdbc7084da6ef3eb93bac7e024ce8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 6 Feb 2015 16:37:35 +0100
Subject: [PATCH 0564/2920] Fix ldap authentication when authenticating against
 ActiveDirectory

Unlike OpenLDAP, ActiveDirectory does not seem to react on the size limit
passed to ldap_search() in global manner causing it to not to respond with
LDAP_SIZELIMIT_EXCEEDED (4) in case a requested page contains more
entries than the requested maximum.

fixes #7993
---
 library/Icinga/Protocol/Ldap/Connection.php | 218 ++++++++++++--------
 1 file changed, 127 insertions(+), 91 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 2d425d12b..6db88365a 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -32,6 +32,8 @@ class Connection
 {
     const LDAP_NO_SUCH_OBJECT = 32;
     const LDAP_SIZELIMIT_EXCEEDED = 4;
+    const LDAP_ADMINLIMIT_EXCEEDED = 11;
+    const PAGE_SIZE = 1000;
 
     protected $ds;
     protected $hostname;
@@ -98,9 +100,6 @@ class Connection
     protected $namingContexts;
     protected $discoverySuccess = false;
 
-    protected $lastResult;
-    protected $pageCookie;
-
     /**
      * Constructor
      *
@@ -238,6 +237,7 @@ class Connection
     {
         $query = clone $query;
         $query->limit(1);
+        $query->setUsePagedResults(false);
         $results = $this->fetchAll($query, $fields);
         return array_shift($results);
     }
@@ -267,35 +267,144 @@ class Connection
         $this->connect();
         $this->bind();
 
-        $offset = $limit = null;
-        if ($query->hasLimit()) {
-            $offset = $query->getOffset();
-            $limit = $query->getLimit();
+        if ($query->getUsePagedResults() && version_compare(PHP_VERSION, '5.4.0') >= 0) {
+            return $this->runPagedQuery($query, $fields);
+        } else {
+            return $this->runQuery($query, $fields);
+        }
+    }
+
+    protected function runQuery(Query $query, $fields = array())
+    {
+        $limit = $query->getLimit();
+        $offset = $query->hasOffset() ? $query->getOffset() - 1 : 0;
+
+        $results = @ldap_search(
+            $this->ds,
+            $query->hasBase() ? $query->getBase() : $this->root_dn,
+            $query->create(),
+            empty($fields) ? $query->listFields() : $fields,
+            0, // Attributes and values
+            $limit ? $offset + $limit : 0
+        );
+        if ($results === false) {
+            if (ldap_errno($this->ds) === self::LDAP_NO_SUCH_OBJECT) {
+                return array();
+            }
+
+            throw new LdapException(
+                'LDAP query "%s" (base %s) failed. Error: %s',
+                $query->create(),
+                $query->hasBase() ? $query->getBase() : $this->root_dn,
+                ldap_error($this->ds)
+            );
+        } elseif (ldap_count_entries($this->ds, $results) === 0) {
+            return array();
+        }
+
+        foreach ($query->getSortColumns() as $col) {
+            ldap_sort($this->ds, $results, $col[0]);
         }
 
         $count = 0;
         $entries = array();
-        $results = $this->runQuery($query, $fields);
-        while (! empty($results)) {
+        $entry = ldap_first_entry($this->ds, $results);
+        do {
+            $count += 1;
+            if ($offset === 0 || $offset < $count) {
+                $entries[ldap_get_dn($this->ds, $entry)] = $this->cleanupAttributes(
+                    ldap_get_attributes($this->ds, $entry)
+                );
+            }
+        } while (($limit === 0 || $limit !== count($entries)) && ($entry = ldap_next_entry($this->ds, $entry)));
+
+        ldap_free_result($results);
+        return $entries;
+    }
+
+    protected function runPagedQuery(Query $query, $fields = array())
+    {
+        $limit = $query->getLimit();
+        $offset = $query->hasOffset() ? $query->getOffset() - 1 : 0;
+        $queryString = $query->create();
+        $base = $query->hasBase() ? $query->getBase() : $this->root_dn;
+
+        if (empty($fields)) {
+            $fields = $query->listFields();
+        }
+
+        $count = 0;
+        $cookie = '';
+        $entries = array();
+        do {
+            ldap_control_paged_result($this->ds, static::PAGE_SIZE, true, $cookie);
+            $results = @ldap_search($this->ds, $base, $queryString, $fields, 0, $limit ? $offset + $limit : 0);
+            if ($results === false) {
+                if (ldap_errno($this->ds) === self::LDAP_NO_SUCH_OBJECT) {
+                    break;
+                }
+
+                throw new LdapException(
+                    'LDAP query "%s" (base %s) failed. Error: %s',
+                    $queryString,
+                    $base,
+                    ldap_error($this->ds)
+                );
+            } elseif (ldap_count_entries($this->ds, $results) === 0) {
+                if (in_array(
+                    ldap_errno($this->ds),
+                    array(static::LDAP_SIZELIMIT_EXCEEDED, static::LDAP_ADMINLIMIT_EXCEEDED)
+                )) {
+                    Logger::warning(
+                        'Unable to request more than %u results. Does the server allow paged search requests? (%s)',
+                        $count,
+                        ldap_error($this->ds)
+                    );
+                }
+
+                break;
+            }
+
             $entry = ldap_first_entry($this->ds, $results);
-            while ($entry) {
-                $count++;
-                if (
-                    ($offset === null || $offset <= $count)
-                    && ($limit === null || $limit > count($entries))
-                ) {
+            do {
+                $count += 1;
+                if ($offset === 0 || $offset < $count) {
                     $entries[ldap_get_dn($this->ds, $entry)] = $this->cleanupAttributes(
                         ldap_get_attributes($this->ds, $entry)
                     );
                 }
+            } while (($limit === 0 || $limit !== count($entries)) && ($entry = ldap_next_entry($this->ds, $entry)));
 
-                $entry = ldap_next_entry($this->ds, $entry);
+            try {
+                ldap_control_paged_result_response($this->ds, $results, $cookie);
+            } catch (Exception $e) {
+                // If the page size is greater than or equal to the sizeLimit value, the server should ignore the
+                // control as the request can be satisfied in a single page: https://www.ietf.org/rfc/rfc2696.txt
+                // This applies no matter whether paged search requests are permitted or not. You're done once you
+                // got everything you were out for.
+                if (count($entries) !== $limit) {
+                    Logger::warning(
+                        'Unable to request paged LDAP results. Does the server allow paged search requests? (%s)',
+                        $e->getMessage()
+                    );
+                }
             }
 
-            $results = $this->runQuery($query, $fields);
+            ldap_free_result($results);
+        } while ($cookie && ($limit === 0 || count($entries) < $limit));
+
+        if ($cookie) {
+            // A sequence of paged search requests is abandoned by the client sending a search request containing a
+            // pagedResultsControl with the size set to zero (0) and the cookie set to the last cookie returned by
+            // the server: https://www.ietf.org/rfc/rfc2696.txt
+            ldap_control_paged_result($this->ds, 0, false, $cookie);
+            ldap_search($this->ds, $base, $queryString, $fields); // Returns no entries, due to the page size
+        } else {
+            // Reset the paged search request so that subsequent requests succeed
+            ldap_control_paged_result($this->ds, 0);
         }
 
-        return $entries;
+        return $entries; // TODO(7693): Sort entries post-processed
     }
 
     protected function cleanupAttributes($attrs)
@@ -314,79 +423,6 @@ class Connection
         return $clean;
     }
 
-    protected function runQuery(Query $query, $fields = array())
-    {
-        if ($query->getUsePagedResults() && version_compare(PHP_VERSION, '5.4.0') >= 0) {
-            if ($this->pageCookie === null) {
-                $this->pageCookie = '';
-            } else {
-                try {
-                    ldap_control_paged_result_response($this->ds, $this->lastResult, $this->pageCookie);
-                } catch (Exception $e) {
-                    $this->pageCookie = '';
-                    if (! $query->hasLimit() || ldap_errno($this->ds) !== static::LDAP_SIZELIMIT_EXCEEDED) {
-                        Logger::error(
-                            'Unable to request paged LDAP results. Does the server allow paged search requests? (%s)',
-                            $e->getMessage()
-                        );
-                    }
-                }
-
-                ldap_free_result($this->lastResult);
-                if (! $this->pageCookie) {
-                    $this->pageCookie = $this->lastResult = null;
-                    // Abandon the paged search request so that subsequent requests succeed
-                    ldap_control_paged_result($this->ds, 0);
-                    return false;
-                }
-            }
-
-            // Does not matter whether we'll use a valid page size here,
-            // as the server applies its hard limit in case its too high
-            ldap_control_paged_result(
-                $this->ds,
-                $query->hasLimit() ? $query->getLimit() : 500,
-                true,
-                $this->pageCookie
-            );
-        } elseif ($this->lastResult !== null) {
-            ldap_free_result($this->lastResult);
-            $this->lastResult = null;
-            return false;
-        }
-
-        $base = $query->hasBase() ? $query->getBase() : $this->root_dn;
-        $results = @ldap_search(
-            $this->ds,
-            $base,
-            $query->create(),
-            empty($fields) ? $query->listFields() : $fields,
-            0, // Attributes and values
-            $query->hasLimit() ? $query->getOffset() + $query->getLimit() : 0 // No limit - at least where possible
-        );
-
-        if ($results === false) {
-            if (ldap_errno($this->ds) === self::LDAP_NO_SUCH_OBJECT) {
-                return false;
-            }
-            throw new LdapException(
-                sprintf(
-                    'LDAP query "%s" (root %s) failed: %s',
-                    $query->create(),
-                    $this->root_dn,
-                    ldap_error($this->ds)
-                )
-            );
-        }
-
-        foreach ($query->getSortColumns() as $col) {
-            ldap_sort($this->ds, $results, $col[0]);
-        }
-
-        $this->lastResult = $results;
-        return $results;
-    }
-
     public function testCredentials($username, $password)
     {
         $this->connect();

From c8da05d0a78e674df51a36d948f181124be62963 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 6 Feb 2015 17:17:41 +0100
Subject: [PATCH 0565/2920] lib: Remove NodeInterface

I'll create an iterator for nodes and drop that every node is a SplDoublyLinkedList.

refs #6630
---
 library/Icinga/Data/Tree/NodeInterface.php | 25 ----------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 library/Icinga/Data/Tree/NodeInterface.php

diff --git a/library/Icinga/Data/Tree/NodeInterface.php b/library/Icinga/Data/Tree/NodeInterface.php
deleted file mode 100644
index faec9e764..000000000
--- a/library/Icinga/Data/Tree/NodeInterface.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\Data\Tree;
-
-use RecursiveIterator;
-
-interface NodeInterface extends RecursiveIterator
-{
-    /**
-     * Create a new node from the given value and insert the node as the last child of this node
-     *
-     * @param   mixed           $value  The node's value
-     *
-     * @return  NodeInterface           The appended node
-     */
-    public function appendChild($value);
-
-    /**
-     * Get the node's value
-     *
-     * @return mixed
-     */
-    public function getValue();
-}

From f331c03f631bb5b00afad1ef3503533a5ad0f2bb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 6 Feb 2015 17:20:23 +0100
Subject: [PATCH 0566/2920] lib/tree: Save child nodes into an array instead of
 using SplDoublyLinkedList

refs #6630
---
 library/Icinga/Data/Tree/Node.php | 91 ++++++++++++++++++++++---------
 1 file changed, 66 insertions(+), 25 deletions(-)

diff --git a/library/Icinga/Data/Tree/Node.php b/library/Icinga/Data/Tree/Node.php
index 9402f6265..ad1db9c36 100644
--- a/library/Icinga/Data/Tree/Node.php
+++ b/library/Icinga/Data/Tree/Node.php
@@ -3,10 +3,18 @@
 
 namespace Icinga\Data\Tree;
 
-use SplDoublyLinkedList;
+use Identifiable;
+use IteratorAggregate;
 
-class Node extends SplDoublyLinkedList implements NodeInterface
+class Node implements Identifiable, IteratorAggregate
 {
+    /**
+     * The node's ID
+     *
+     * @type mixed
+     */
+    protected $id;
+
     /**
      * The node's value
      *
@@ -15,13 +23,45 @@ class Node extends SplDoublyLinkedList implements NodeInterface
     protected $value;
 
     /**
-     * Create a new node
+     * The node's children
      *
-     * @param mixed $value The node's value
+     * @type array
      */
-    public function __construct($value = null)
+    protected $children = array();
+
+    /**
+     * Set the node's ID
+     *
+     * @param   mixed   $id ID of the node
+     *
+     * @return  $this
+     */
+    public function setId($id)
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see Identifiable::getId() For the method documentation.
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Set the node's value
+     *
+     * @param   mixed   $value
+     *
+     * @return  $this
+     */
+    public function setValue($value)
     {
         $this->value = $value;
+        return $this;
     }
 
     /**
@@ -35,44 +75,45 @@ class Node extends SplDoublyLinkedList implements NodeInterface
     }
 
     /**
-     * Create a new node from the given value and insert the node as the last child of this node
+     * Append a child node as the last child of this node
      *
-     * @param   mixed           $value  The node's value
+     * @param   Node    $child  The child to append
      *
-     * @return  NodeInterface           The appended node
+     * @return  $this
      */
-    public function appendChild($value)
+    public function appendChild(Node $child)
     {
-        $child = new static($value);
-        $this->push($child);
-        return $child;
+        $this->children[] = $child;
+        return $this;
     }
 
+
     /**
-     * Whether this node has child nodes
+     * Get whether the node has children
      *
      * @return bool
      */
     public function hasChildren()
     {
-        $current = $this->current();
-        if ($current === null) {
-            $current = $this;
-        }
-        return ! $current->isEmpty();
+        return ! empty($this->children);
     }
 
     /**
-     * Get the node's child nodes
+     * Get the node's children
      *
-     * @return NodeInterface
+     * @return array
      */
     public function getChildren()
     {
-        $current = $this->current();
-        if ($current === null) {
-            $current = $this;
-        }
-        return $current;
+        return $this->children;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see IteratorAggregate::getIterator() For the method documentation.
+     */
+    public function getIterator()
+    {
+        return new TreeNodeIterator($this);
     }
 }

From 828cb8d23a906b6be934f82dac11e64f1b21dfba Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 6 Feb 2015 17:23:07 +0100
Subject: [PATCH 0567/2920] lib: Add iterator over a tree node's children

refs #6630
---
 library/Icinga/Data/Tree/TreeNodeIterator.php | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 library/Icinga/Data/Tree/TreeNodeIterator.php

diff --git a/library/Icinga/Data/Tree/TreeNodeIterator.php b/library/Icinga/Data/Tree/TreeNodeIterator.php
new file mode 100644
index 000000000..cdcefe8ea
--- /dev/null
+++ b/library/Icinga/Data/Tree/TreeNodeIterator.php
@@ -0,0 +1,93 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Data\Tree;
+
+use ArrayIterator;
+use RecursiveIterator;
+
+/**
+ * Iterator over a tree node's children
+ */
+class TreeNodeIterator implements RecursiveIterator
+{
+    /**
+     * The node's children
+     *
+     * @type array
+     */
+    protected $children;
+
+    /**
+     * Create a new iterator over a tree node's children
+     *
+     * @param Node $node
+     */
+    public function __construct(Node $node)
+    {
+        $this->children = new ArrayIterator($node->getChildren());
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \RecursiveIterator::current() For the method documentation.
+     */
+    public function current()
+    {
+        return $this->children->current();
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \RecursiveIterator::key() For the method documentation.
+     */
+    public function key()
+    {
+        return $this->children->key();
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \RecursiveIterator::next() For the method documentation.
+     */
+    public function next()
+    {
+        $this->children->next();
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \RecursiveIterator::rewind() For the method documentation.
+     */
+    public function rewind()
+    {
+        $this->children->rewind();
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \RecursiveIterator::valid() For the method documentation.
+     */
+    public function valid()
+    {
+        return $this->children->valid();
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \RecursiveIterator::hasChildren() For the method documentation.
+     */
+    public function hasChildren()
+    {
+        return $this->current()->hasChildren();
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \RecursiveIterator::getChildren() For the method documentation.
+     */
+    public function getChildren()
+    {
+        return new static($this->current());
+    }
+}

From 95c937e3fd1c93a58bd21fa45e3b991c419bba4e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 6 Feb 2015 17:24:01 +0100
Subject: [PATCH 0568/2920] lib/doc: Fix code style for doc exceptions

---
 .../doc/library/Doc/Exception/ChapterNotFoundException.php    | 4 +++-
 modules/doc/library/Doc/Exception/DocEmptyException.php       | 4 +++-
 modules/doc/library/Doc/Exception/DocException.php            | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/doc/library/Doc/Exception/ChapterNotFoundException.php b/modules/doc/library/Doc/Exception/ChapterNotFoundException.php
index a1de9b496..5a5d41936 100644
--- a/modules/doc/library/Doc/Exception/ChapterNotFoundException.php
+++ b/modules/doc/library/Doc/Exception/ChapterNotFoundException.php
@@ -6,4 +6,6 @@ namespace Icinga\Module\Doc\Exception;
 /**
  * Exception thrown if a chapter was not found
  */
-class ChapterNotFoundException extends DocException {}
+class ChapterNotFoundException extends DocException
+{
+}
diff --git a/modules/doc/library/Doc/Exception/DocEmptyException.php b/modules/doc/library/Doc/Exception/DocEmptyException.php
index b4050e3e3..0ce563cf1 100644
--- a/modules/doc/library/Doc/Exception/DocEmptyException.php
+++ b/modules/doc/library/Doc/Exception/DocEmptyException.php
@@ -6,4 +6,6 @@ namespace Icinga\Module\Doc\Exception;
 /**
  * Exception thrown if a documentation directory is empty
  */
-class DocEmptyException extends DocException {}
+class DocEmptyException extends DocException
+{
+}
diff --git a/modules/doc/library/Doc/Exception/DocException.php b/modules/doc/library/Doc/Exception/DocException.php
index 672359591..f749fb7b3 100644
--- a/modules/doc/library/Doc/Exception/DocException.php
+++ b/modules/doc/library/Doc/Exception/DocException.php
@@ -8,4 +8,6 @@ use RuntimeException;
 /**
  * Exception thrown if an error in the documentation module's library occurs
  */
-class DocException extends RuntimeException {}
+class DocException extends RuntimeException
+{
+}

From 0d63e14baf8184088713c3ce819741d022b45e5b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 6 Feb 2015 17:27:14 +0100
Subject: [PATCH 0569/2920] lib: Rename Node to TreeNode

refs #6630
---
 library/Icinga/Data/Tree/{Node.php => TreeNode.php} | 6 +++---
 library/Icinga/Data/Tree/TreeNodeIterator.php       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename library/Icinga/Data/Tree/{Node.php => TreeNode.php} (91%)

diff --git a/library/Icinga/Data/Tree/Node.php b/library/Icinga/Data/Tree/TreeNode.php
similarity index 91%
rename from library/Icinga/Data/Tree/Node.php
rename to library/Icinga/Data/Tree/TreeNode.php
index ad1db9c36..fcf257e55 100644
--- a/library/Icinga/Data/Tree/Node.php
+++ b/library/Icinga/Data/Tree/TreeNode.php
@@ -6,7 +6,7 @@ namespace Icinga\Data\Tree;
 use Identifiable;
 use IteratorAggregate;
 
-class Node implements Identifiable, IteratorAggregate
+class TreeNode implements Identifiable, IteratorAggregate
 {
     /**
      * The node's ID
@@ -77,11 +77,11 @@ class Node implements Identifiable, IteratorAggregate
     /**
      * Append a child node as the last child of this node
      *
-     * @param   Node    $child  The child to append
+     * @param   TreeNode    $child  The child to append
      *
      * @return  $this
      */
-    public function appendChild(Node $child)
+    public function appendChild(TreeNode $child)
     {
         $this->children[] = $child;
         return $this;
diff --git a/library/Icinga/Data/Tree/TreeNodeIterator.php b/library/Icinga/Data/Tree/TreeNodeIterator.php
index cdcefe8ea..b0b0b0f83 100644
--- a/library/Icinga/Data/Tree/TreeNodeIterator.php
+++ b/library/Icinga/Data/Tree/TreeNodeIterator.php
@@ -21,9 +21,9 @@ class TreeNodeIterator implements RecursiveIterator
     /**
      * Create a new iterator over a tree node's children
      *
-     * @param Node $node
+     * @param TreeNode $node
      */
-    public function __construct(Node $node)
+    public function __construct(TreeNode $node)
     {
         $this->children = new ArrayIterator($node->getChildren());
     }

From ecfda1a6f5077b4b0494fc3af90bdfd894faf8bf Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 6 Feb 2015 17:29:04 +0100
Subject: [PATCH 0570/2920] lib/doc: Rename Section to DocSection and let it
 extend TreeNode

refs #6630
---
 .../Doc/{Section.php => DocSection.php}       | 85 ++++++++-----------
 1 file changed, 36 insertions(+), 49 deletions(-)
 rename modules/doc/library/Doc/{Section.php => DocSection.php} (50%)

diff --git a/modules/doc/library/Doc/Section.php b/modules/doc/library/Doc/DocSection.php
similarity index 50%
rename from modules/doc/library/Doc/Section.php
rename to modules/doc/library/Doc/DocSection.php
index 32f836c33..237b487fc 100644
--- a/modules/doc/library/Doc/Section.php
+++ b/modules/doc/library/Doc/DocSection.php
@@ -3,81 +3,52 @@
 
 namespace Icinga\Module\Doc;
 
-use Icinga\Data\Identifiable;
+use Icinga\Data\Tree\TreeNode;
 
 /**
  * A section of a documentation
  */
-class Section implements Identifiable
+class DocSection extends TreeNode
 {
-    /**
-     * The ID of the section
-     *
-     * @var string
-     */
-    protected $id;
-
     /**
      * The title of the section
      *
-     * @var string
+     * @type string
      */
     protected $title;
 
     /**
      * The header level
      *
-     * @var int
+     * @type int
      */
     protected $level;
 
     /**
      * Whether to instruct search engines to not index the link to the section
      *
-     * @var bool
+     * @type bool
      */
     protected $noFollow;
 
-    /**
-     * The ID of the chapter the section is part of
-     *
-     * @var string
-     */
-    protected $chapterId;
-
     /**
      * The content of the section
      *
-     * @var array
+     * @type array
      */
     protected $content = array();
 
     /**
-     * Create a new section
+     * Set the title of the section
      *
-     * @param string    $id             The ID of the section
-     * @param string    $title          The title of the section
-     * @param int       $level          The header level
-     * @param bool      $noFollow       Whether to instruct search engines to not index the link to the section
-     * @param string    $chapterId      The ID of the chapter the section is part of
-     */
-    public function __construct($id, $title, $level, $noFollow, $chapterId)
-    {
-        $this->id = $id;
-        $this->title = $title;
-        $this->level = $level;
-        $this->noFollow = $noFollow;
-        $this->chapterId= $chapterId;
-    }
-
-    /**
-     * Get the ID of the section
+     * @param   string  $title  Title of the section
      *
-     * @return string
+     * @return  $this
      */
-    public function getId()
+    public function setTitle($title)
     {
-        return $this->id;
+        $this->title = (string) $title;
+        return $this;
     }
 
     /**
@@ -90,6 +61,19 @@ class Section implements Identifiable
         return $this->title;
     }
 
+    /**
+     * Set the header level
+     *
+     * @param   int     $level  Header level
+     *
+     * @return  $this
+     */
+    public function setLevel($level)
+    {
+        $this->level = (int) $level;
+        return $this;
+    }
+
     /**
      * Get the header level
      *
@@ -101,23 +85,26 @@ class Section implements Identifiable
     }
 
     /**
-     * Whether to instruct search engines to not index the link to the section
+     * Set whether to instruct search engines to not index the link to the section
      *
-     * @return bool
+     * @param   bool    $noFollow   Whether to instruct search engines to not index the link to the section
+     *
+     * @return  $this
      */
-    public function isNoFollow()
+    public function setNoFollow($noFollow = true)
     {
-        return $this->noFollow;
+        $this->noFollow = (bool) $noFollow;
+        return $this;
     }
 
     /**
-     * The ID of the chapter the section is part of
+     * Get whether to instruct search engines to not index the link to the section
      *
-     * @return string
+     * @return bool
      */
-    public function getChapterId()
+    public function getNoFollow()
     {
-        return $this->chapterId;
+        return $this->noFollow;
     }
 
     /**

From 3a4c6e45b823f9f8ecee54600c256aa9aad14f73 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 6 Feb 2015 17:32:51 +0100
Subject: [PATCH 0571/2920] Fix Fatal error: Interface 'Identifiable' not found

refs #6630
---
 library/Icinga/Data/Tree/TreeNode.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Data/Tree/TreeNode.php b/library/Icinga/Data/Tree/TreeNode.php
index fcf257e55..61008a66d 100644
--- a/library/Icinga/Data/Tree/TreeNode.php
+++ b/library/Icinga/Data/Tree/TreeNode.php
@@ -3,8 +3,8 @@
 
 namespace Icinga\Data\Tree;
 
-use Identifiable;
 use IteratorAggregate;
+use Icinga\Data\Identifiable;
 
 class TreeNode implements Identifiable, IteratorAggregate
 {

From 58d48d9fa048c673b63903291afdc4b10d70825c Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Fri, 6 Feb 2015 17:48:21 +0100
Subject: [PATCH 0572/2920] Accessibility: Text cue for required form control
 labels: Add prototype

refs #7934
---
 ...-cue-for-required-form-control-labels.html | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 doc/accessibility/text-cue-for-required-form-control-labels.html

diff --git a/doc/accessibility/text-cue-for-required-form-control-labels.html b/doc/accessibility/text-cue-for-required-form-control-labels.html
new file mode 100644
index 000000000..b9e624208
--- /dev/null
+++ b/doc/accessibility/text-cue-for-required-form-control-labels.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<html class="no-js" lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>Accessibility: Text cue for required form control labels</title>
+    <meta name="description" content="Text cue for required form control labels">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style type="text/css">
+        label.required span.required-indicator:after {
+            content: " *";
+        }
+        .sr-only {
+            border: 0;
+            clip: rect(0 0 0 0);
+            height: 1px;
+            margin: -1px;
+            overflow: hidden;
+            padding: 0;
+            position: absolute;
+            width: 1px;
+        }
+    </style>
+</head>
+<body>
+    <form>
+        <label class="required">
+            Enter some text
+            <span class="required-indicator" aria-hidden="true"></span>
+            <span class="sr-only"> (required)</span>
+        </label>
+        <input type="text" name="some_text" value="" aria-required="true" required>
+        <input type="submit" name="btn_submit" value="Submit">
+    </form>
+</body>
+</html>
\ No newline at end of file

From 23ce15668197c5217d79cbc227a349f49608595d Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@gmail.com>
Date: Sat, 7 Feb 2015 21:15:26 +0100
Subject: [PATCH 0573/2920] doc/installation: Add a note where to store the
 webserver's config

---
 doc/installation.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/installation.md b/doc/installation.md
index d9483faef..aa85adb22 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -55,6 +55,14 @@ nginx:
 ./bin/icingacli setup config webserver nginx --document-root /usr/share/icingaweb2/public
 ````
 
+Save the output as new file in your webserver's configuration directory.
+
+Example for Apache on RHEL/CentOS:
+````
+./bin/icingacli setup config webserver apache --document-root /usr/share/icingaweb2/public > /etc/httpd/conf.d/icingaweb2.conf
+````
+
+
 **Step 4: Preparing Web Setup**
 
 Because both web and CLI must have access to configuration and logs, permissions will be managed using a special

From 4c9374cccafc58408c3d8b8b07f251aabbd0359a Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@gmail.com>
Date: Sun, 8 Feb 2015 16:03:08 +0100
Subject: [PATCH 0574/2920] spec: Install doc and translation module

fixes #8392
---
 icingaweb2.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index 1d97819d9..231b2642e 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -189,7 +189,7 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}/{%{basedir}/{modules,library,public},%{bindir},%{configdir}/modules/setup,%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d,%{docsdir}}
 cp -prv application doc %{buildroot}/%{basedir}
 cp -pv etc/bash_completion.d/icingacli %{buildroot}/%{_sysconfdir}/bash_completion.d/icingacli
-cp -prv modules/{monitoring,setup} %{buildroot}/%{basedir}/modules
+cp -prv modules/{monitoring,setup,doc,translation} %{buildroot}/%{basedir}/modules
 cp -prv library/Icinga %{buildroot}/%{phpdir}
 cp -prv library/vendor %{buildroot}/%{basedir}/library
 cp -prv public/{css,img,js,error_norewrite.html} %{buildroot}/%{basedir}/public

From d10beb7604875f39d96a9a7dd85af1e065b3237e Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 9 Feb 2015 15:26:55 +0100
Subject: [PATCH 0575/2920] js: no console.log. please!

---
 public/js/icinga/loader.js | 1 -
 public/js/icinga/utils.js  | 2 --
 2 files changed, 3 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 6a82a6ee5..92aa1e9d8 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -737,7 +737,6 @@
             }
             this.icinga.ui.assignUniqueContainerIds();
 
-            console.log(origFocus);
             if (origFocus.length == origFocus[0] !== '') {
                 setTimeout(function() {
                     $(self.icinga.utils.getElementByDomPath(origFocus)).focus();
diff --git a/public/js/icinga/utils.js b/public/js/icinga/utils.js
index bd64e586e..4b04b3d44 100644
--- a/public/js/icinga/utils.js
+++ b/public/js/icinga/utils.js
@@ -284,10 +284,8 @@
                 if (! $element) {
                     $element = $(selector);
                 } else {
-                    console.log(selector);
                     $element = $element.children(selector).first();
                     if (! $element[0]) {
-                        console.log("element not existing stopping...");
                         return false;
                     }
                 }

From 7b1b5b9b40f54404c1e2d6108e92382120ff4843 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 9 Feb 2015 15:27:50 +0100
Subject: [PATCH 0576/2920] Authentication\Manager: do not override user groups

Needs more care, but this way we are at least able to fetch groups
unless we get out improved implementation.
---
 library/Icinga/Authentication/Manager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 81221176e..993475636 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -84,7 +84,7 @@ class Manager
             $preferences = new Preferences();
         }
         $user->setPreferences($preferences);
-        $groups = array();
+        $groups = $user->getGroups();
         foreach (Config::app('groups') as $name => $config) {
             try {
                 $groupBackend = UserGroupBackend::create($name, $config);

From 81f65a7cd4dadab8e31f4aa41092649551a8f20e Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 9 Feb 2015 15:29:52 +0100
Subject: [PATCH 0577/2920] LdapUserBackend: disable "health check"

I see no point in checking this at every login. It could however be a
nice addition for our config backends and the setup wizard. I'd also
opt for completely removing this parameter - who wants to use this
method should explicitely call it.
---
 library/Icinga/Authentication/Backend/LdapUserBackend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/Backend/LdapUserBackend.php
index 7fde1f61b..016512ab4 100644
--- a/library/Icinga/Authentication/Backend/LdapUserBackend.php
+++ b/library/Icinga/Authentication/Backend/LdapUserBackend.php
@@ -170,7 +170,7 @@ class LdapUserBackend extends UserBackend
      *
      * @throws  AuthenticationException     In case an error occured or the health check has failed
      */
-    public function authenticate(User $user, $password, $healthCheck = true)
+    public function authenticate(User $user, $password, $healthCheck = false)
     {
         if ($healthCheck) {
             try {

From 88315db1ebafc2e9d61711d2a114e44f2fbd7f17 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 9 Feb 2015 15:31:47 +0100
Subject: [PATCH 0578/2920] UserBackend: reasonable defaults for AD groups

I didn't do farther research, but those values seem to work fine.
---
 library/Icinga/Authentication/UserBackend.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Authentication/UserBackend.php b/library/Icinga/Authentication/UserBackend.php
index b8bde164d..cb6eb458b 100644
--- a/library/Icinga/Authentication/UserBackend.php
+++ b/library/Icinga/Authentication/UserBackend.php
@@ -93,10 +93,10 @@ abstract class UserBackend implements Countable
                 break;
             case 'msldap':
                 $groupOptions = array(
-                    'group_base_dn'             => $backendConfig->group_base_dn,
-                    'group_attribute'           => $backendConfig->group_attribute,
-                    'group_member_attribute'    => $backendConfig->group_member_attribute,
-                    'group_class'               => $backendConfig->group_class
+                    'group_base_dn'             => $backendConfig->get('group_base_dn', $resource->getDN()),
+                    'group_attribute'           => $backendConfig->get('group_attribute', 'sAMAccountName'),
+                    'group_member_attribute'    => $backendConfig->get('group_member_attribute', 'member'),
+                    'group_class'               => $backendConfig->get('group_class', 'group')
                 );
                 $backend = new LdapUserBackend(
                     $resource,

From 5bf89da6d7ed8956c180289bae4bb8b173cf9c58 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 9 Feb 2015 15:38:43 +0100
Subject: [PATCH 0579/2920] PluginOutput: simplify code, add tab support

refs #8366
---
 .../views/helpers/PluginOutput.php            | 46 +++++++++++--------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
index e6c8b2d5a..d494a7810 100644
--- a/modules/monitoring/application/views/helpers/PluginOutput.php
+++ b/modules/monitoring/application/views/helpers/PluginOutput.php
@@ -5,34 +5,44 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
 {
     protected static $purifier;
 
+    protected static $txtPatterns = array(
+        '~\\\n~',
+        '~\\\t~',
+         '~\\\n\\\n~',
+        '~(\[|\()OK(\]|\))~',
+        '~(\[|\()WARNING(\]|\))~',
+        '~(\[|\()CRITICAL(\]|\))~',
+        '~(\[|\()UNKNOWN(\]|\))~',
+        '~\@{6,}~'
+    );
+
+    protected static $txtReplacements = array(
+        "\n",
+        "\t",
+        "\n",
+        '<span class="state ok">$1OK$2</span>',
+        '<span class="state warning">$1WARNING$2</span>',
+        '<span class="state critical">$1CRITICAL$2</span>',
+        '<span class="state error">$1UNKNOWN$2</span>',
+        '@@@@@@',
+    );
+
     public function pluginOutput($output)
     {
         if (empty($output)) {
             return '';
         }
         $output = preg_replace('~<br[^>]+>~', "\n", $output);
-        if (preg_match('~<\w+[^>]*>~', $output)) {
+        if (preg_match('~<\w+[^>^\\\]{,60}>~', $output)) {
             // HTML
             $output = preg_replace('~<table~', '<table style="font-size: 0.75em"',
                 $this->getPurifier()->purify($output)
             );
-        } elseif (preg_match('~\\\n~', $output)) {
-            // Plaintext
-            $output = '<pre class="pluginoutput">'
-               . preg_replace(
-              '~\\\n~', "\n", preg_replace(
-                '~\\\n\\\n~', "\n",
-                preg_replace('~\[OK\]~', '<span class="ok">[OK]</span>',
-                 preg_replace('~\[WARNING\]~', '<span class="warning">[WARNING]</span>',
-                  preg_replace('~\[CRITICAL\]~', '<span class="error">[CRITICAL]</span>',
-                   preg_replace('~\@{6,}~', '@@@@@@',
-                     $this->view->escape($output)
-                ))))
-              )
-            ) . '</pre>';
         } else {
-            $output = '<pre class="pluginoutput">'
-               . preg_replace('~\@{6,}~', '@@@@@@',
+            // Plaintext
+            $output = '<pre class="pluginoutput">' . preg_replace(
+                self::$txtPatterns,
+                self::$txtReplacements,
                 $this->view->escape($output)
             ) . '</pre>';
         }
@@ -55,7 +65,7 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
                 parse_str($m[1], $params);
                 if (isset($params['host'])) {
                     $tag->setAttribute('href', $this->view->baseUrl(
-                        '/monitoring/detail/show?host=' . urlencode($params['host']
+                        '/monitoring/host/show?host=' . urlencode($params['host']
                     )));
                 }
             } else {

From b2ace4e209ab400a0dc8ccb2d102f18d5109260f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 16:58:40 +0100
Subject: [PATCH 0580/2920] doc: Remove DocTree class

It will be replaced by a class in our lib

refs #6630
---
 modules/doc/library/Doc/DocTree.php | 79 -----------------------------
 1 file changed, 79 deletions(-)
 delete mode 100644 modules/doc/library/Doc/DocTree.php

diff --git a/modules/doc/library/Doc/DocTree.php b/modules/doc/library/Doc/DocTree.php
deleted file mode 100644
index 66b36f1a4..000000000
--- a/modules/doc/library/Doc/DocTree.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\Module\Doc;
-
-use LogicException;
-use Icinga\Data\Identifiable;
-use Icinga\Data\Tree\Node;
-
-/**
- * Documentation tree
- */
-class DocTree extends Node
-{
-    /**
-     * All nodes of the tree
-     *
-     * @var array
-     */
-    protected $nodes = array();
-
-    /**
-     * Append a root node to the tree
-     *
-     * @param Identifiable $root
-     */
-    public function addRoot(Identifiable $root)
-    {
-        $rootId = $root->getId();
-        if (isset($this->nodes[$rootId])) {
-            $rootId = uniqid($rootId);
-//            throw new LogicException(
-//                sprintf('Can\'t add root node: a root node with the id \'%s\' already exists', $rootId)
-//            );
-        }
-        $this->nodes[$rootId] = $this->appendChild($root);
-    }
-
-    /**
-     * Append a child node to a parent node
-     *
-     * @param   Identifiable $child
-     * @param   Identifiable $parent
-     *
-     * @throws  LogicException If the the tree does not contain the parent node
-     */
-    public function addChild(Identifiable $child, Identifiable $parent)
-    {
-        $childId = $child->getId();
-        $parentId = $parent->getId();
-        if (isset($this->nodes[$childId])) {
-            $childId = uniqid($childId);
-//            throw new LogicException(
-//                sprintf('Can\'t add child node: a child node with the id \'%s\' already exists', $childId)
-//            );
-        }
-        if (! isset($this->nodes[$parentId])) {
-            throw new LogicException(
-                sprintf(mt('doc', 'Can\'t add child node: there\'s no parent node having the id \'%s\''), $parentId)
-            );
-        }
-        $this->nodes[$childId] = $this->nodes[$parentId]->appendChild($child);
-    }
-
-    /**
-     * Get a node
-     *
-     * @param   mixed $id
-     *
-     * @return  Node|null
-     */
-    public function getNode($id)
-    {
-        if (! isset($this->nodes[$id])) {
-            return null;
-        }
-        return $this->nodes[$id];
-    }
-}

From fd38e5b2e12f5b9b8efe7b2a8fed97cd238e68ae Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 16:59:43 +0100
Subject: [PATCH 0581/2920] lib: Use @inheritdoc in the TreeNodeIterator

refs #6630
---
 library/Icinga/Data/Tree/TreeNodeIterator.php | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/library/Icinga/Data/Tree/TreeNodeIterator.php b/library/Icinga/Data/Tree/TreeNodeIterator.php
index b0b0b0f83..753b338f6 100644
--- a/library/Icinga/Data/Tree/TreeNodeIterator.php
+++ b/library/Icinga/Data/Tree/TreeNodeIterator.php
@@ -29,8 +29,7 @@ class TreeNodeIterator implements RecursiveIterator
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \RecursiveIterator::current() For the method documentation.
+     * {@inheritdoc}
      */
     public function current()
     {
@@ -38,8 +37,7 @@ class TreeNodeIterator implements RecursiveIterator
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \RecursiveIterator::key() For the method documentation.
+     * {@inheritdoc}
      */
     public function key()
     {
@@ -47,8 +45,7 @@ class TreeNodeIterator implements RecursiveIterator
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \RecursiveIterator::next() For the method documentation.
+     * {@inheritdoc}
      */
     public function next()
     {
@@ -56,8 +53,7 @@ class TreeNodeIterator implements RecursiveIterator
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \RecursiveIterator::rewind() For the method documentation.
+     * {@inheritdoc}
      */
     public function rewind()
     {
@@ -65,8 +61,7 @@ class TreeNodeIterator implements RecursiveIterator
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \RecursiveIterator::valid() For the method documentation.
+     * {@inheritdoc}
      */
     public function valid()
     {
@@ -74,8 +69,7 @@ class TreeNodeIterator implements RecursiveIterator
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \RecursiveIterator::hasChildren() For the method documentation.
+     * {@inheritdoc}
      */
     public function hasChildren()
     {
@@ -83,8 +77,8 @@ class TreeNodeIterator implements RecursiveIterator
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \RecursiveIterator::getChildren() For the method documentation.
+     * {@inheritdoc}
+     * @return TreeNodeIterator
      */
     public function getChildren()
     {

From b18405e99f5e0ee25cbd58272f7c678b8a40057e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 17:00:47 +0100
Subject: [PATCH 0582/2920] lib: Add SimpleTree

Simple tree implementation for TreeNodes.

refs #6630
---
 library/Icinga/Data/Tree/SimpleTree.php | 90 +++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 library/Icinga/Data/Tree/SimpleTree.php

diff --git a/library/Icinga/Data/Tree/SimpleTree.php b/library/Icinga/Data/Tree/SimpleTree.php
new file mode 100644
index 000000000..46a91135d
--- /dev/null
+++ b/library/Icinga/Data/Tree/SimpleTree.php
@@ -0,0 +1,90 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Data\Tree;
+
+use IteratorAggregate;
+use LogicException;
+
+/**
+ * A simple tree
+ */
+class SimpleTree implements IteratorAggregate
+{
+    /**
+     * Root node
+     *
+     * @type TreeNode
+     */
+    protected $sentinel;
+
+    /**
+     * Nodes
+     *
+     * @type array
+     */
+    protected $nodes = array();
+
+    /**
+     * Create a new simple tree
+     */
+    public function __construct()
+    {
+        $this->sentinel = new TreeNode();
+    }
+
+    /**
+     * Add a child node
+     *
+     * @param   TreeNode $child
+     * @param   TreeNode $parent
+     *
+     * @return $this
+     */
+    public function addChild(TreeNode $child, TreeNode $parent = null)
+    {
+        if ($parent === null) {
+            $parent = $this->sentinel;
+        } elseif (! isset($this->nodes[$parent->getId()])) {
+            throw new LogicException(sprintf(
+                'Can\'t append child node %s to parent node %s: Parent node does not exist',
+                $child->getId(),
+                $parent->getId()
+            ));
+        }
+        if (isset($this->nodes[$child->getId()])) {
+            throw new LogicException(sprintf(
+                'Can\'t append child node %s to parent node %s: Child node does already exist',
+                $child->getId(),
+                $parent->getId()
+            ));
+        }
+        $this->nodes[$child->getId()] = $child;
+        $parent->appendChild($child);
+        return $this;
+    }
+
+    /**
+     * Get a node by its ID
+     *
+     * @param   mixed   $id
+     *
+     * @return  TreeNode|null
+     */
+    public function getNode($id)
+    {
+        if (! isset($this->nodes[$id])) {
+            return null;
+        }
+        return $this->nodes[$id];
+    }
+
+    /**
+     * {@inheritdoc}
+     * @return TreeNodeIterator
+     */
+    public function getIterator()
+    {
+        return new TreeNodeIterator($this->sentinel);
+    }
+}

From 760819f239273c46138a48f486dfb98335ab470a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 17:01:32 +0100
Subject: [PATCH 0583/2920] lib: Remove TreeNode::getIterator()

Its the tree who has the iterator.

refs #6630
---
 library/Icinga/Data/Tree/TreeNode.php | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/library/Icinga/Data/Tree/TreeNode.php b/library/Icinga/Data/Tree/TreeNode.php
index 61008a66d..200b3b9a6 100644
--- a/library/Icinga/Data/Tree/TreeNode.php
+++ b/library/Icinga/Data/Tree/TreeNode.php
@@ -3,10 +3,9 @@
 
 namespace Icinga\Data\Tree;
 
-use IteratorAggregate;
 use Icinga\Data\Identifiable;
 
-class TreeNode implements Identifiable, IteratorAggregate
+class TreeNode implements Identifiable
 {
     /**
      * The node's ID
@@ -107,13 +106,4 @@ class TreeNode implements Identifiable, IteratorAggregate
     {
         return $this->children;
     }
-
-    /**
-     * (non-PHPDoc)
-     * @see IteratorAggregate::getIterator() For the method documentation.
-     */
-    public function getIterator()
-    {
-        return new TreeNodeIterator($this);
-    }
 }

From 8ad7a30cd7fe9b313ce91ced450be3cabc835b35 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 17:02:17 +0100
Subject: [PATCH 0584/2920] doc: Fix link to resources in the authentication
 doc

---
 doc/authentication.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/authentication.md b/doc/authentication.md
index 175403061..604c85a2e 100644
--- a/doc/authentication.md
+++ b/doc/authentication.md
@@ -40,7 +40,7 @@ or LDAP configuration method.
 Directive               | Description
 ------------------------|------------
 **backend**             | `ldap`
-**resource**            | The name of the LDAP resource defined in [resources.ini](resources).
+**resource**            | The name of the LDAP resource defined in [resources.ini](#resources).
 **user_class**          | LDAP user class.
 **user_name_attribute** | LDAP attribute which contains the username.
 
@@ -63,7 +63,7 @@ with Icinga Web 2 (e.g. an alias) no matter what the primary user id might actua
 Directive               | Description
 ------------------------|------------
 **backend**             | `ad`
-**resource**            | The name of the LDAP resource defined in [resources.ini](resources).
+**resource**            | The name of the LDAP resource defined in [resources.ini](#resources).
 
 **Example:**
 
@@ -82,7 +82,7 @@ authentication method.
 Directive               | Description
 ------------------------|------------
 **backend**             | `db`
-**resource**            | The name of the database resource defined in [resources.ini](resources).
+**resource**            | The name of the database resource defined in [resources.ini](#resources).
 
 **Example:**
 

From 322c6b582d2dd81cf89e4aed2cc81f275493257b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 17:02:37 +0100
Subject: [PATCH 0585/2920] lib: Prefer @type over @var in the
 FileExtensionFilterIterator

---
 library/Icinga/File/FileExtensionFilterIterator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/File/FileExtensionFilterIterator.php b/library/Icinga/File/FileExtensionFilterIterator.php
index cb26bb214..fd1d657b4 100644
--- a/library/Icinga/File/FileExtensionFilterIterator.php
+++ b/library/Icinga/File/FileExtensionFilterIterator.php
@@ -58,7 +58,7 @@ class FileExtensionFilterIterator extends FilterIterator
     public function accept()
     {
         $current = $this->current();
-        /* @var $current \SplFileInfo */
+        /** @type $current \SplFileInfo */
         if (! $current->isFile()) {
             return false;
         }

From 07cfbe23ef8d184cb885972d3b672619562a995b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 17:03:15 +0100
Subject: [PATCH 0586/2920] doc/lib: Use @inheritdoc in the DocIterator

---
 modules/doc/library/Doc/DocIterator.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/doc/library/Doc/DocIterator.php b/modules/doc/library/Doc/DocIterator.php
index c8be8e808..34358a89e 100644
--- a/modules/doc/library/Doc/DocIterator.php
+++ b/modules/doc/library/Doc/DocIterator.php
@@ -19,7 +19,7 @@ class DocIterator implements Countable, IteratorAggregate
     /**
      * Ordered files
      *
-     * @var array
+     * @type array
      */
     protected $fileInfo;
 
@@ -46,8 +46,7 @@ class DocIterator implements Countable, IteratorAggregate
     }
 
     /**
-     * (non-PHPDoc)
-     * @see Countable::count()
+     * {@inheritdoc}
      */
     public function count()
     {
@@ -55,8 +54,7 @@ class DocIterator implements Countable, IteratorAggregate
     }
 
     /**
-     * (non-PHPDoc)
-     * @see IteratorAggregate::getIterator()
+     * {@inheritdoc}
      */
     public function getIterator()
     {

From 9f3b95316569aae7c350e7bb1af48b2d62fe5f38 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 17:03:58 +0100
Subject: [PATCH 0587/2920] doc/lib: Support setting the chapter a section
 belongs to

refs #6630
---
 modules/doc/library/Doc/DocSection.php | 76 ++++++++++++++++++--------
 1 file changed, 53 insertions(+), 23 deletions(-)

diff --git a/modules/doc/library/Doc/DocSection.php b/modules/doc/library/Doc/DocSection.php
index 237b487fc..4b97db282 100644
--- a/modules/doc/library/Doc/DocSection.php
+++ b/modules/doc/library/Doc/DocSection.php
@@ -11,14 +11,21 @@ use Icinga\Data\Tree\TreeNode;
 class DocSection extends TreeNode
 {
     /**
-     * The title of the section
+     * Chapter the section belongs to
      *
-     * @type string
+     * @type DocSection
      */
-    protected $title;
+    protected $chapter;
 
     /**
-     * The header level
+     * Content of the section
+     *
+     * @type array
+     */
+    protected $content = array();
+
+    /**
+     * Header level
      *
      * @type int
      */
@@ -32,33 +39,53 @@ class DocSection extends TreeNode
     protected $noFollow;
 
     /**
-     * The content of the section
+     * Title of the section
      *
-     * @type array
+     * @type string
      */
-    protected $content = array();
+    protected $title;
 
     /**
-     * Set the title of the section
+     * Set the chapter the section belongs to
      *
-     * @param   string  $title  Title of the section
+     * @param   DocSection  $section
      *
      * @return  $this
      */
-    public function setTitle($title)
+    public function setChapter(DocSection $section)
     {
-        $this->title = (string) $title;
+        $this->chapter = $section;
         return $this;
     }
 
     /**
-     * Get the title of the section
+     * Get the chapter the section belongs to
      *
-     * @return string
+     * @return DocSection
      */
-    public function getTitle()
+    public function getChapter()
     {
-        return $this->title;
+        return $this->chapter;
+    }
+
+    /**
+     * Append content
+     *
+     * @param string $content
+     */
+    public function appendContent($content)
+    {
+        $this->content[] = $content;
+    }
+
+    /**
+     * Get the content of the section
+     *
+     * @return array
+     */
+    public function getContent()
+    {
+        return $this->content;
     }
 
     /**
@@ -108,22 +135,25 @@ class DocSection extends TreeNode
     }
 
     /**
-     * Append content
+     * Set the title of the section
      *
-     * @param string $content
+     * @param   string  $title  Title of the section
+     *
+     * @return  $this
      */
-    public function appendContent($content)
+    public function setTitle($title)
     {
-        $this->content[] = $content;
+        $this->title = (string) $title;
+        return $this;
     }
 
     /**
-     * Get the content of the section
+     * Get the title of the section
      *
-     * @return array
+     * @return string
      */
-    public function getContent()
+    public function getTitle()
     {
-        return $this->content;
+        return $this->title;
     }
 }

From c95838a33d54a44fa53ce1febc7603207cbb476b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 17:04:27 +0100
Subject: [PATCH 0588/2920] doc/lib: Use SimpleTree in the DocParser

refs #6630
---
 modules/doc/library/Doc/DocParser.php | 31 ++++++++++++++++-----------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/modules/doc/library/Doc/DocParser.php b/modules/doc/library/Doc/DocParser.php
index 4b6ec7de9..b0384a3d4 100644
--- a/modules/doc/library/Doc/DocParser.php
+++ b/modules/doc/library/Doc/DocParser.php
@@ -3,7 +3,8 @@
 
 namespace Icinga\Module\Doc;
 
-use SplDoublyLinkedList;
+use SplStack;
+use Icinga\Data\Tree\SimpleTree;
 use Icinga\Exception\NotReadableError;
 use Icinga\Module\Doc\Exception\DocEmptyException;
 use Icinga\Module\Doc\Exception\DocException;
@@ -121,16 +122,15 @@ class DocParser
     /**
      * Get the documentation tree
      *
-     * @return DocTree
+     * @return SimpleTree
      */
     public function getDocTree()
     {
-        $tree = new DocTree();
-        $stack = new SplDoublyLinkedList();
+        $tree = new SimpleTree();
+        $stack = new SplStack();
         foreach ($this->docIterator as $fileInfo) {
-            /* @var $file \SplFileInfo */
+            /** @type $fileInfo \SplFileInfo */
             $file = $fileInfo->openFile();
-            /* @var $file \SplFileObject */
             $lastLine = null;
             foreach ($file as $line) {
                 $header = $this->extractHeader($line, $lastLine);
@@ -142,7 +142,7 @@ class DocParser
                     if ($id === null) {
                         $path = array();
                         foreach ($stack as $section) {
-                            /* @var $section Section */
+                            /** @type $section DocSection */
                             $path[] = $section->getTitle();
                         }
                         $path[] = $title;
@@ -151,13 +151,20 @@ class DocParser
                     } else {
                         $noFollow = false;
                     }
+                    if ($tree->getNode($id) !== null) {
+                        $id = uniqid($id);
+                    }
+                    $section = new DocSection();
+                    $section
+                        ->setId($id)
+                        ->setTitle($title)
+                        ->setLevel($level)
+                        ->setNoFollow($noFollow);
                     if ($stack->isEmpty()) {
-                        $chapterId = $id;
-                        $section = new Section($id, $title, $level, $noFollow, $chapterId);
-                        $tree->addRoot($section);
+                        $section->setChapter($section);
+                        $tree->addChild($section);
                     } else {
-                        $chapterId = $stack->bottom()->getId();
-                        $section = new Section($id, $title, $level, $noFollow, $chapterId);
+                        $section->setChapter($stack->bottom());
                         $tree->addChild($section, $stack->top());
                     }
                     $stack->push($section);

From 377685d8024c8cd6e563a0eb4c79515b6f0b9053 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 17:04:46 +0100
Subject: [PATCH 0589/2920] doc/lib: Let DocException extend IcingaException

---
 modules/doc/library/Doc/Exception/DocException.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/doc/library/Doc/Exception/DocException.php b/modules/doc/library/Doc/Exception/DocException.php
index f749fb7b3..c7d895261 100644
--- a/modules/doc/library/Doc/Exception/DocException.php
+++ b/modules/doc/library/Doc/Exception/DocException.php
@@ -3,11 +3,11 @@
 
 namespace Icinga\Module\Doc\Exception;
 
-use RuntimeException;
+use Icinga\Exception\IcingaException;
 
 /**
  * Exception thrown if an error in the documentation module's library occurs
  */
-class DocException extends RuntimeException
+class DocException extends IcingaException
 {
 }

From 9093795f646d1b2d34f1b1d2cfb0e5de8ad7e95c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 17:05:24 +0100
Subject: [PATCH 0590/2920] doc/lib: Add common used methods to the abstract
 Renderer

refs #6630
---
 modules/doc/library/Doc/Renderer.php | 118 +++++++++++++++++++++++++--
 1 file changed, 111 insertions(+), 7 deletions(-)

diff --git a/modules/doc/library/Doc/Renderer.php b/modules/doc/library/Doc/Renderer.php
index fee74048d..e2329c4dc 100644
--- a/modules/doc/library/Doc/Renderer.php
+++ b/modules/doc/library/Doc/Renderer.php
@@ -3,8 +3,9 @@
 
 namespace Icinga\Module\Doc;
 
+use Exception;
 use RecursiveIteratorIterator;
-use Zend_View_Helper_Url;
+use Icinga\Application\Icinga;
 use Icinga\Web\View;
 
 /**
@@ -12,6 +13,99 @@ use Icinga\Web\View;
  */
 abstract class Renderer extends RecursiveIteratorIterator
 {
+    /**
+     * URL to replace links with
+     *
+     * @type string
+     */
+    protected $url;
+
+    /**
+     * Additional URL parameters
+     *
+     * @type array
+     */
+    protected $urlParams = array();
+
+    /**
+     * View
+     *
+     * @type View|null
+     */
+    protected $view;
+
+    /**
+     * Set the URL to replace links with
+     *
+     * @param   string  $url
+     *
+     * @return  $this
+     */
+    public function setUrl($url)
+    {
+        $this->url = (string) $url;
+        return $this;
+    }
+
+    /**
+     * Get the URL to replace links with
+     *
+     * @return string
+     */
+    public function getUrl()
+    {
+        return $this->url;
+    }
+
+    /**
+     * Set additional URL parameters
+     *
+     * @param   array   $urlParams
+     *
+     * @return  $this
+     */
+    public function setUrlParams(array $urlParams)
+    {
+        $this->urlParams = array_map(array($this, 'encodeUrlParam'), $urlParams);
+        return $this;
+    }
+
+    /**
+     * Get additional URL parameters
+     *
+     * @return array
+     */
+    public function getUrlParams()
+    {
+        return $this->urlParams;
+    }
+
+    /**
+     * Set the view
+     *
+     * @param   View    $view
+     *
+     * @return  $this
+     */
+    public function setView(View $view)
+    {
+        $this->view = $view;
+        return $this;
+    }
+
+    /**
+     * Get the view
+     *
+     * @return View
+     */
+    public function getView()
+    {
+        if ($this->view === null) {
+            $this->view = Icinga::app()->getViewRenderer()->view;
+        }
+        return $this->view;
+    }
+
     /**
      * Encode an anchor identifier
      *
@@ -63,12 +157,22 @@ abstract class Renderer extends RecursiveIteratorIterator
     /**
      * Render to HTML
      *
-     * Meant to be overwritten by concrete classes.
-     *
-     * @param   View                    $view
-     * @param   Zend_View_Helper_Url    $zendUrlHelper
-     *
      * @return  string
      */
-    abstract public function render(View $view, Zend_View_Helper_Url $zendUrlHelper);
+    abstract public function render();
+
+    /**
+     * Render to HTML
+     *
+     * @return  string
+     * @see     \Icinga\Module\Doc\Renderer::render() For the render method.
+     */
+    public function __toString()
+    {
+        try {
+            return $this->render();
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+    }
 }

From 52de56fb65fae85b5944a9165ecfaccc8e80e677 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 17:06:11 +0100
Subject: [PATCH 0591/2920] doc/lib: Use TreeNodeIterator in the
 SectionFilterIterator

refs #6630
---
 .../doc/library/Doc/SectionFilterIterator.php | 50 ++++++++++++-------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/modules/doc/library/Doc/SectionFilterIterator.php b/modules/doc/library/Doc/SectionFilterIterator.php
index 0db620120..77171a5c8 100644
--- a/modules/doc/library/Doc/SectionFilterIterator.php
+++ b/modules/doc/library/Doc/SectionFilterIterator.php
@@ -5,30 +5,34 @@ namespace Icinga\Module\Doc;
 
 use Countable;
 use RecursiveFilterIterator;
-use Icinga\Data\Tree\NodeInterface;
+use Icinga\Data\Tree\TreeNodeIterator;
 
 /**
- * Recursive iterator over sections that are part of a particular chapter
+ * Recursive filter iterator over sections that are part of a particular chapter
+ *
+ * @method TreeNodeIterator getInnerIterator() {
+ *     {@inheritdoc}
+ * }
  */
 class SectionFilterIterator extends RecursiveFilterIterator implements Countable
 {
     /**
-     * The chapter ID to filter for
+     * Chapter to filter for
      *
-     * @var string
+     * @type string
      */
-    protected $chapterId;
+    protected $chapter;
 
     /**
-     * Create a new SectionFilterIterator
+     * Create a new recursive filter iterator over sections that are part of a particular chapter
      *
-     * @param NodeInterface $node           Node
-     * @param string        $chapterId      The chapter ID to filter for
+     * @param TreeNodeIterator  $iterator
+     * @param string            $chapter      The chapter to filter for
      */
-    public function __construct(NodeInterface $node, $chapterId)
+    public function __construct(TreeNodeIterator $iterator, $chapter)
     {
-        parent::__construct($node);
-        $this->chapterId = $chapterId;
+        parent::__construct($iterator);
+        $this->chapter = $chapter;
     }
 
     /**
@@ -39,29 +43,37 @@ class SectionFilterIterator extends RecursiveFilterIterator implements Countable
      */
     public function accept()
     {
-        $section = $this->getInnerIterator()->current()->getValue();
-        /* @var $section \Icinga\Module\Doc\Section */
-        if ($section->getChapterId() === $this->chapterId) {
+        $section = $this->current();
+        /** @type \Icinga\Module\Doc\DocSection $section */
+        if ($section->getChapter()->getId() === $this->chapter) {
             return true;
         }
         return false;
     }
 
     /**
-     * (non-PHPDoc)
-     * @see RecursiveFilterIterator::getChildren()
+     * {@inheritdoc}
      */
     public function getChildren()
     {
-        return new static($this->getInnerIterator()->getChildren(), $this->chapterId);
+        return new static($this->getInnerIterator()->getChildren(), $this->chapter);
     }
 
     /**
-     * (non-PHPDoc)
-     * @see Countable::count()
+     * {@inheritdoc}
      */
     public function count()
     {
         return iterator_count($this);
     }
+
+    /**
+     * Whether the filter swallowed every section
+     *
+     * @return bool
+     */
+    public function isEmpty()
+    {
+        return $this->count() === 0;
+    }
 }

From 5965638e2322764258d236e27a93dd11a23e045a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 17:07:24 +0100
Subject: [PATCH 0592/2920] doc/lib: Open toc links in the next container

refs #6630
---
 modules/doc/library/Doc/TocRenderer.php | 74 ++++++++++++-------------
 1 file changed, 34 insertions(+), 40 deletions(-)

diff --git a/modules/doc/library/Doc/TocRenderer.php b/modules/doc/library/Doc/TocRenderer.php
index 69ab7ac02..cfa18fad0 100644
--- a/modules/doc/library/Doc/TocRenderer.php
+++ b/modules/doc/library/Doc/TocRenderer.php
@@ -3,88 +3,81 @@
 
 namespace Icinga\Module\Doc;
 
-use RecursiveIteratorIterator;
-use Zend_View_Helper_Url;
 use Icinga\Web\View;
+use Icinga\Data\Tree\TreeNodeIterator;
+use RecursiveIteratorIterator;
 
 /**
  * TOC renderer
+ *
+ * @method TreeNodeIterator getInnerIterator() {
+ *     {@inheritdoc}
+ * }
  */
 class TocRenderer extends Renderer
 {
     /**
-     * The URL to replace links with
+     * Content to render
      *
-     * @var string
-     */
-    protected $url;
-
-    /**
-     * Additional URL parameters
-     *
-     * @var array
-     */
-    protected $urlParams;
-
-    /**
-     * Content
-     *
-     * @var array
+     * @type array
      */
     protected $content = array();
 
     /**
      * Create a new toc renderer
      *
-     * @param DocTree   $docTree    The documentation tree
-     * @param string    $url        The URL to replace links with
-     * @param array     $urlParams  Additional URL parameters
+     * @param TreeNodeIterator $iterator
      */
-    public function __construct(DocTree $docTree, $url, array $urlParams)
+    public function __construct(TreeNodeIterator $iterator)
     {
-        parent::__construct($docTree, RecursiveIteratorIterator::SELF_FIRST);
-        $this->url = $url;
-        $this->urlParams = array_map(array($this, 'encodeUrlParam'), $urlParams);
+        parent::__construct($iterator, RecursiveIteratorIterator::SELF_FIRST);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function beginIteration()
     {
         $this->content[] = '<nav><ul>';
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function endIteration()
     {
         $this->content[] = '</ul></nav>';
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function beginChildren()
     {
         $this->content[] = '<ul>';
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function endChildren()
     {
-        $this->content[] = '</ul></li>';
+        $this->content[] = '</ul>';
     }
 
     /**
-     * Render the toc
-     *
-     * @param   View                    $view
-     * @param   Zend_View_Helper_Url    $zendUrlHelper
-     *
-     * @return  string
+     * {@inheritdoc}
      */
-    public function render(View $view, Zend_View_Helper_Url $zendUrlHelper)
+    public function render()
     {
-        foreach ($this as $node) {
-            $section = $node->getValue();
-            /* @var $section \Icinga\Module\Doc\Section */
+        $view = $this->getView();
+        $zendUrlHelper = $view->getHelper('Url');
+        foreach ($this as $section) {
             $path = $zendUrlHelper->url(
                 array_merge(
                     $this->urlParams,
                     array(
-                        'chapterId' => $this->encodeUrlParam($section->getChapterId())
+                        'chapter' => $this->encodeUrlParam($section->getChapter()->getId())
                     )
                 ),
                 $this->url,
@@ -92,14 +85,15 @@ class TocRenderer extends Renderer
                 false
             );
             $url = $view->url($path);
+            /** @type \Icinga\Web\Url $url */
             $url->setAnchor($this->encodeAnchor($section->getId()));
             $this->content[] = sprintf(
-                '<li><a %shref="%s">%s</a>',
-                $section->isNoFollow() ? 'rel="nofollow" ' : '',
+                '<li><a data-base-target="_next" %shref="%s">%s</a>',
+                $section->getNoFollow() ? 'rel="nofollow" ' : '',
                 $url->getAbsoluteUrl(),
                 $view->escape($section->getTitle())
             );
-            if (! $this->getInnerIterator()->current()->hasChildren()) {
+            if (! $section->hasChildren()) {
                 $this->content[] = '</li>';
             }
         }

From 41355fe0e24b417ecb1953aa63f3564d868d3b14 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 17:08:48 +0100
Subject: [PATCH 0593/2920] doc/lib: Drop navigation added to each section

refs #6630
---
 modules/doc/library/Doc/SectionRenderer.php | 296 ++++++--------------
 1 file changed, 89 insertions(+), 207 deletions(-)

diff --git a/modules/doc/library/Doc/SectionRenderer.php b/modules/doc/library/Doc/SectionRenderer.php
index b4d19f9fb..825754ad7 100644
--- a/modules/doc/library/Doc/SectionRenderer.php
+++ b/modules/doc/library/Doc/SectionRenderer.php
@@ -7,133 +7,54 @@ require_once 'Parsedown/Parsedown.php';
 
 use DOMDocument;
 use DOMXPath;
-use RecursiveIteratorIterator;
 use Parsedown;
-use Zend_View_Helper_Url;
+use RecursiveIteratorIterator;
+use Icinga\Data\Tree\SimpleTree;
 use Icinga\Module\Doc\Exception\ChapterNotFoundException;
 use Icinga\Web\Url;
 use Icinga\Web\View;
 
-/**
- * preg_replace_callback helper to replace links
- */
-class Callback
-{
-    protected $docTree;
-
-    protected $view;
-
-    protected $zendUrlHelper;
-
-    protected $url;
-
-    protected $urlParams;
-
-    public function __construct(
-        DocTree $docTree,
-        View $view,
-        Zend_View_Helper_Url $zendUrlHelper,
-        $url,
-        array $urlParams)
-    {
-        $this->docTree = $docTree;
-        $this->view = $view;
-        $this->zendUrlHelper = $zendUrlHelper;
-        $this->url = $url;
-        $this->urlParams = $urlParams;
-    }
-
-    public function render($match)
-    {
-        $node = $this->docTree->getNode(Renderer::decodeAnchor($match['fragment']));
-        /* @var $node \Icinga\Data\Tree\Node */
-        if ($node === null) {
-            return $match[0];
-        }
-        $section = $node->getValue();
-        /* @var $section \Icinga\Module\Doc\Section */
-        $path = $this->zendUrlHelper->url(
-            array_merge(
-                $this->urlParams,
-                array(
-                    'chapterId' => SectionRenderer::encodeUrlParam($section->getChapterId())
-                )
-            ),
-            $this->url,
-            false,
-            false
-        );
-        $url = $this->view->url($path);
-        $url->setAnchor(SectionRenderer::encodeAnchor($section->getId()));
-        return sprintf(
-            '<a %s%shref="%s"',
-            strlen($match['attribs']) ? trim($match['attribs']) . ' ' : '',
-            $section->isNoFollow() ? 'rel="nofollow" ' : '',
-            $url->getAbsoluteUrl()
-        );
-    }
-}
-
 /**
  * Section renderer
  */
 class SectionRenderer extends Renderer
 {
     /**
-     * The documentation tree
+     * Content to render
      *
-     * @var DocTree
-     */
-    protected $docTree;
-
-    protected $tocUrl;
-
-    /**
-     * The URL to replace links with
-     *
-     * @var string
-     */
-    protected $url;
-
-    /**
-     * Additional URL parameters
-     *
-     * @var array
-     */
-    protected $urlParams;
-
-    /**
-     * Parsedown instance
-     *
-     * @var Parsedown
-     */
-    protected $parsedown;
-
-    /**
-     * Content
-     *
-     * @var array
+     * @type array
      */
     protected $content = array();
 
+    /**
+     * Parsedown instance
+     *
+     * @type Parsedown
+     */
+    protected $parsedown;
+
+    /**
+     * Documentation tree
+     *
+     * @type SimpleTree
+     */
+    protected $tree;
+
     /**
      * Create a new section renderer
      *
-     * @param   DocTree     $docTree        The documentation tree
-     * @param   string|null $chapterId      If not null, the chapter ID to filter for
-     * @param   string      $tocUrl
-     * @param   string      $url            The URL to replace links with
-     * @param   array       $urlParams      Additional URL parameters
+     * @param   SimpleTree  $tree           The documentation tree
+     * @param   string|null $chapter        If not null, the chapter to filter for
      *
      * @throws  ChapterNotFoundException    If the chapter to filter for was not found
      */
-    public function __construct(DocTree $docTree, $chapterId, $tocUrl, $url, array $urlParams)
+    public function __construct(SimpleTree $tree, $chapter = null)
     {
-        if ($chapterId !== null) {
-            $filter = new SectionFilterIterator($docTree, $chapterId);
-            if ($filter->count() === 0) {
+        if ($chapter !== null) {
+            $filter = new SectionFilterIterator($tree->getIterator(), $chapter);
+            if ($filter->isEmpty()) {
                 throw new ChapterNotFoundException(
-                    sprintf(mt('doc', 'Chapter \'%s\' not found'), $chapterId)
+                    mt('doc', 'Chapter %s not found'), $chapter
                 );
             }
             parent::__construct(
@@ -141,19 +62,16 @@ class SectionRenderer extends Renderer
                 RecursiveIteratorIterator::SELF_FIRST
             );
         } else {
-            parent::__construct($docTree, RecursiveIteratorIterator::SELF_FIRST);
+            parent::__construct($tree->getIterator(), RecursiveIteratorIterator::SELF_FIRST);
         }
-        $this->docTree = $docTree;
-        $this->tocUrl = $tocUrl;
-        $this->url = $url;
-        $this->urlParams = array_map(array($this, 'encodeUrlParam'), $urlParams);
+        $this->tree = $tree;
         $this->parsedown = Parsedown::instance();
     }
 
     /**
      * Syntax highlighting for PHP code
      *
-     * @param   $match
+     * @param   array $match
      *
      * @return  string
      */
@@ -162,6 +80,26 @@ class SectionRenderer extends Renderer
         return '<pre>' . highlight_string(htmlspecialchars_decode($match[1]), true) . '</pre>';
     }
 
+    /**
+     * Markup notes
+     *
+     * @param   array $match
+     *
+     * @return  string
+     */
+    protected function markupNotes($match)
+    {
+        $doc = new DOMDocument();
+        $doc->loadHTML($match[0]);
+        $xpath = new DOMXPath($doc);
+        $blockquote = $xpath->query('//blockquote[1]')->item(0);
+        /* @var $blockquote \DOMElement */
+        if (strtolower(substr(trim($blockquote->nodeValue), 0, 5)) === 'note:') {
+            $blockquote->setAttribute('class', 'note');
+        }
+        return $doc->saveXML($blockquote);
+    }
+
     /**
      * Replace img src tags
      *
@@ -180,40 +118,52 @@ class SectionRenderer extends Renderer
         return substr_replace($doc->saveXML($img), '', -2, 1);  // Replace '/>' with '>'
     }
 
-    protected function blubb($match)
-    {
-        $doc = new DOMDocument();
-        $doc->loadHTML($match[0]);
-        $xpath = new DOMXPath($doc);
-        $blockquote = $xpath->query('//blockquote[1]')->item(0);
-        /* @var $blockquote \DOMElement */
-        if (strtolower(substr(trim($blockquote->nodeValue), 0, 5)) === 'note:') {
-            $blockquote->setAttribute('class', 'note');
-        }
-        return $doc->saveXML($blockquote);
-    }
-
     /**
-     * Render the section
+     * Replace link
      *
-     * @param   View                    $view
-     * @param   Zend_View_Helper_Url    $zendUrlHelper
-     * @param   bool                    $renderNavigation
+     * @param   array $match
      *
      * @return  string
      */
-    public function render(View $view, Zend_View_Helper_Url $zendUrlHelper, $renderNavigation = true)
+    protected function replaceLink($match)
     {
-        $callback = new Callback($this->docTree, $view, $zendUrlHelper, $this->url, $this->urlParams);
-        $content = array();
-        foreach ($this as $node) {
-            $section = $node->getValue();
-            /* @var $section \Icinga\Module\Doc\Section */
-            $content[] = sprintf(
+        if (($section = $this->tree->getNode($this->decodeAnchor($match['fragment']))) === null) {
+            return $match[0];
+        }
+        /** @type $section \Icinga\Module\Doc\DocSection */
+        $path = $this->getView()->getHelper('Url')->url(
+            array_merge(
+                $this->urlParams,
+                array(
+                    'chapter' => $this->encodeUrlParam($section->getChapter()->getId())
+                )
+            ),
+            $this->url,
+            false,
+            false
+        );
+        $url = $this->getView()->url($path);
+        /** @type \Icinga\Web\Url $url */
+        $url->setAnchor($this->encodeAnchor($section->getId()));
+        return sprintf(
+            '<a %s%shref="%s"',
+            strlen($match['attribs']) ? trim($match['attribs']) . ' ' : '',
+            $section->getNoFollow() ? 'rel="nofollow" ' : '',
+            $url->getAbsoluteUrl()
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function render()
+    {
+        foreach ($this as $section) {
+            $this->content[] = sprintf(
                 '<a name="%1$s"></a><h%2$d>%3$s</h%2$d>',
                 Renderer::encodeAnchor($section->getId()),
                 $section->getLevel(),
-                $view->escape($section->getTitle())
+                $this->getView()->escape($section->getTitle())
             );
             $html = preg_replace_callback(
                 '#<pre><code class="language-php">(.*?)</code></pre>#s',
@@ -227,83 +177,15 @@ class SectionRenderer extends Renderer
             );
             $html = preg_replace_callback(
                 '#<blockquote>.+</blockquote>#ms',
-                array($this, 'blubb'),
+                array($this, 'markupNotes'),
                 $html
             );
-            $content[] = preg_replace_callback(
+            $this->content[] = preg_replace_callback(
                 '/<a\s+(?P<attribs>[^>]*?\s+)?href="(?:(?!http:\/\/)[^#]*)#(?P<fragment>[^"]+)"/',
-                array($callback, 'render'),
+                array($this, 'replaceLink'),
                 $html
             );
         }
-        if ($renderNavigation) {
-            foreach ($this->docTree as $chapter) {
-                if ($chapter->getValue()->getId() === $section->getChapterId()) {
-                    $navigation = array('<ul class="navigation">');
-                    $this->docTree->prev();
-                    $prev = $this->docTree->current();
-                    if ($prev !== null) {
-                        $prev = $prev->getValue();
-                        $path = $zendUrlHelper->url(
-                            array_merge(
-                                $this->urlParams,
-                                array(
-                                    'chapterId' => $this->encodeUrlParam($prev->getChapterId())
-                                )
-                            ),
-                            $this->url,
-                            false,
-                            false
-                        );
-                        $url = $view->url($path);
-                        $url->setAnchor($this->encodeAnchor($prev->getId()));
-                        $navigation[] = sprintf(
-                            '<li class="prev"><a %shref="%s">%s</a></li>',
-                            $prev->isNoFollow() ? 'rel="nofollow" ' : '',
-                            $url->getAbsoluteUrl(),
-                            $view->escape($prev->getTitle())
-                        );
-                        $this->docTree->next();
-                        $this->docTree->next();
-                    } else {
-                        $this->docTree->rewind();
-                        $this->docTree->next();
-                    }
-                    $url = $view->url($this->tocUrl);
-                    $navigation[] = sprintf(
-                        '<li><a href="%s">%s</a></li>',
-                        $url->getAbsoluteUrl(),
-                        mt('doc', 'Index')
-                    );
-                    $next = $this->docTree->current();
-                    if ($next !== null) {
-                        $next = $next->getValue();
-                        $path = $zendUrlHelper->url(
-                            array_merge(
-                                $this->urlParams,
-                                array(
-                                    'chapterId' => $this->encodeUrlParam($next->getChapterId())
-                                )
-                            ),
-                            $this->url,
-                            false,
-                            false
-                        );
-                        $url = $view->url($path);
-                        $url->setAnchor($this->encodeAnchor($next->getId()));
-                        $navigation[] = sprintf(
-                            '<li class="next"><a %shref="%s">%s</a></li>',
-                            $next->isNoFollow() ? 'rel="nofollow" ' : '',
-                            $url->getAbsoluteUrl(),
-                            $view->escape($next->getTitle())
-                        );
-                    }
-                    $navigation[] = '</ul>';
-                    $content = array_merge($navigation, $content, $navigation);
-                    break;
-                }
-            }
-        }
-        return implode("\n", $content);
+        return implode("\n", $this->content);
     }
 }

From 005ef8c92f0a00b10cdfb70e4589debf582c0533 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 17:09:56 +0100
Subject: [PATCH 0594/2920] doc/lib: Update controllers and views according to
 the recent changes

refs #6630
---
 .../controllers/IcingawebController.php       |  9 ++---
 .../controllers/ModuleController.php          |  9 ++---
 .../application/views/scripts/chapter.phtml   |  2 +-
 .../views/scripts/module/chapter.phtml        |  2 +-
 .../views/scripts/module/toc.phtml            |  4 +-
 .../doc/application/views/scripts/toc.phtml   |  4 +-
 modules/doc/configuration.php                 |  2 +
 modules/doc/library/Doc/DocController.php     | 37 +++++++++----------
 modules/doc/run.php                           |  4 +-
 9 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/modules/doc/application/controllers/IcingawebController.php b/modules/doc/application/controllers/IcingawebController.php
index 89afc0e59..31819239a 100644
--- a/modules/doc/application/controllers/IcingawebController.php
+++ b/modules/doc/application/controllers/IcingawebController.php
@@ -46,17 +46,16 @@ class Doc_IcingawebController extends DocController
      */
     public function chapterAction()
     {
-        $chapterId = $this->getParam('chapterId');
-        if ($chapterId === null) {
+        $chapter = $this->getParam('chapter');
+        if ($chapter === null) {
             throw new Zend_Controller_Action_Exception(
-                sprintf($this->translate('Missing parameter \'%s\''), 'chapterId'),
+                sprintf($this->translate('Missing parameter %s'), 'chapter'),
                 404
             );
         }
         $this->renderChapter(
             $this->getPath(),
-            $chapterId,
-            'doc/icingaweb/toc',
+            $chapter,
             'doc/icingaweb/chapter'
         );
     }
diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php
index d0c760444..3b8e5e201 100644
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@@ -122,10 +122,10 @@ class Doc_ModuleController extends DocController
     {
         $module = $this->getParam('moduleName');
         $this->assertModuleEnabled($module);
-        $chapterId = $this->getParam('chapterId');
-        if ($chapterId === null) {
+        $chapter = $this->getParam('chapter');
+        if ($chapter === null) {
             throw new Zend_Controller_Action_Exception(
-                sprintf($this->translate('Missing parameter \'%s\''), 'chapterId'),
+                sprintf($this->translate('Missing parameter %s'), 'chapter'),
                 404
             );
         }
@@ -133,8 +133,7 @@ class Doc_ModuleController extends DocController
         try {
             $this->renderChapter(
                 $this->getPath($module, Icinga::app()->getModuleManager()->getModuleDir($module, '/doc')),
-                $chapterId,
-                $this->_helper->url->url(array('moduleName' => $module), 'doc/module/toc'),
+                $chapter,
                 'doc/module/chapter',
                 array('moduleName' => $module)
             );
diff --git a/modules/doc/application/views/scripts/chapter.phtml b/modules/doc/application/views/scripts/chapter.phtml
index 7657d69fb..6fe0d8d27 100644
--- a/modules/doc/application/views/scripts/chapter.phtml
+++ b/modules/doc/application/views/scripts/chapter.phtml
@@ -1,3 +1,3 @@
 <div class="chapter">
-    <?= $sectionRenderer->render($this, $this->getHelper('Url')); ?>
+    <?= /** @type \Icinga\Module\Doc\SectionRenderer $section */ $section ?>
 </div>
diff --git a/modules/doc/application/views/scripts/module/chapter.phtml b/modules/doc/application/views/scripts/module/chapter.phtml
index 7657d69fb..6fe0d8d27 100644
--- a/modules/doc/application/views/scripts/module/chapter.phtml
+++ b/modules/doc/application/views/scripts/module/chapter.phtml
@@ -1,3 +1,3 @@
 <div class="chapter">
-    <?= $sectionRenderer->render($this, $this->getHelper('Url')); ?>
+    <?= /** @type \Icinga\Module\Doc\SectionRenderer $section */ $section ?>
 </div>
diff --git a/modules/doc/application/views/scripts/module/toc.phtml b/modules/doc/application/views/scripts/module/toc.phtml
index ca6283d67..ce1b3da29 100644
--- a/modules/doc/application/views/scripts/module/toc.phtml
+++ b/modules/doc/application/views/scripts/module/toc.phtml
@@ -1,6 +1,6 @@
 <div class="controls">
-    <h1><?= $title ?></h1>
+    <h1><?= /** @type string $title */ $title ?></h1>
 </div>
 <div class="content toc">
-    <?= $tocRenderer->render($this, $this->getHelper('Url')); ?>
+    <?= /** @type \Icinga\Module\Doc\TocRenderer $toc */ $toc ?>
 </div>
diff --git a/modules/doc/application/views/scripts/toc.phtml b/modules/doc/application/views/scripts/toc.phtml
index ca6283d67..ce1b3da29 100644
--- a/modules/doc/application/views/scripts/toc.phtml
+++ b/modules/doc/application/views/scripts/toc.phtml
@@ -1,6 +1,6 @@
 <div class="controls">
-    <h1><?= $title ?></h1>
+    <h1><?= /** @type string $title */ $title ?></h1>
 </div>
 <div class="content toc">
-    <?= $tocRenderer->render($this, $this->getHelper('Url')); ?>
+    <?= /** @type \Icinga\Module\Doc\TocRenderer $toc */ $toc ?>
 </div>
diff --git a/modules/doc/configuration.php b/modules/doc/configuration.php
index f9bed3887..fdbada7af 100644
--- a/modules/doc/configuration.php
+++ b/modules/doc/configuration.php
@@ -20,3 +20,5 @@ $section->add($this->translate('Developer - Style'), array(
     'url' => 'doc/style/guide',
     'priority' => 200,
 ));
+
+$this->provideSearchUrl($this->translate('Doc'), 'doc/search');
diff --git a/modules/doc/library/Doc/DocController.php b/modules/doc/library/Doc/DocController.php
index 9e29d99c7..70d2639bf 100644
--- a/modules/doc/library/Doc/DocController.php
+++ b/modules/doc/library/Doc/DocController.php
@@ -10,38 +10,37 @@ class DocController extends ModuleActionController
     /**
      * Render a chapter
      *
-     * @param string    $path           Path to the documentation
-     * @param string    $chapterId      ID of the chapter
-     * @param string    $tocUrl
-     * @param string    $url
-     * @param array     $urlParams
+     * @param string    $path       Path to the documentation
+     * @param string    $chapter    ID of the chapter
+     * @param string    $url        URL to replace links with
+     * @param array     $urlParams  Additional URL parameters
      */
-    protected function renderChapter($path, $chapterId, $tocUrl, $url, array $urlParams = array())
+    protected function renderChapter($path, $chapter, $url, array $urlParams = array())
     {
         $parser = new DocParser($path);
-        $this->view->sectionRenderer = new SectionRenderer(
-            $parser->getDocTree(),
-            SectionRenderer::decodeUrlParam($chapterId),
-            $tocUrl,
-            $url,
-            $urlParams
-        );
-        $this->view->title = $chapterId;
+        $section = new SectionRenderer($parser->getDocTree(), SectionRenderer::decodeUrlParam($chapter));
+        $this->view->section = $section
+            ->setUrl($url)
+            ->setUrlParams($urlParams);
+        $this->view->title = $chapter;
         $this->render('chapter', null, true);
     }
 
     /**
      * Render a toc
      *
-     * @param string    $path           Path to the documentation
-     * @param string    $name           Name of the documentation
-     * @param string    $url
-     * @param array     $urlParams
+     * @param string    $path       Path to the documentation
+     * @param string    $name       Name of the documentation
+     * @param string    $url        URL to replace links with
+     * @param array     $urlParams  Additional URL parameters
      */
     protected function renderToc($path, $name, $url, array $urlParams = array())
     {
         $parser = new DocParser($path);
-        $this->view->tocRenderer = new TocRenderer($parser->getDocTree(), $url, $urlParams);
+        $toc = new TocRenderer($parser->getDocTree()->getIterator());
+        $this->view->toc = $toc
+            ->setUrl($url)
+            ->setUrlParams($urlParams);
         $name = ucfirst($name);
         $this->view->docName = $name;
         $this->view->title = sprintf($this->translate('%s Documentation'), $name);
diff --git a/modules/doc/run.php b/modules/doc/run.php
index cdeb95195..95abbf9df 100644
--- a/modules/doc/run.php
+++ b/modules/doc/run.php
@@ -9,7 +9,7 @@ if (Icinga::app()->isCli()) {
 }
 
 $docModuleChapter = new Zend_Controller_Router_Route(
-    'doc/module/:moduleName/chapter/:chapterId',
+    'doc/module/:moduleName/chapter/:chapter',
     array(
         'controller'    => 'module',
         'action'        => 'chapter',
@@ -18,7 +18,7 @@ $docModuleChapter = new Zend_Controller_Router_Route(
 );
 
 $docIcingaWebChapter = new Zend_Controller_Router_Route(
-    'doc/icingaweb/chapter/:chapterId',
+    'doc/icingaweb/chapter/:chapter',
     array(
         'controller'    => 'icingaweb',
         'action'        => 'chapter',

From 312d18d14aea68c93c4bbff31f67f2d80918b7ba Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 17:11:00 +0100
Subject: [PATCH 0595/2920] doc/lib: Add DocSearch class for creating search
 criteria

refs #6630
---
 modules/doc/library/Doc/Search/DocSearch.php | 91 ++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 modules/doc/library/Doc/Search/DocSearch.php

diff --git a/modules/doc/library/Doc/Search/DocSearch.php b/modules/doc/library/Doc/Search/DocSearch.php
new file mode 100644
index 000000000..ab3a7cf64
--- /dev/null
+++ b/modules/doc/library/Doc/Search/DocSearch.php
@@ -0,0 +1,91 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Doc\Search;
+
+/**
+ * Search documentation for a given search string
+ */
+class DocSearch
+{
+    /**
+     * Search string
+     *
+     * @type string
+     */
+    protected $input;
+
+    /**
+     * Search criteria
+     *
+     * @type array
+     */
+    protected $search;
+
+    /**
+     * Create a new doc search from the given search string
+     *
+     * @param string $search
+     */
+    public function __construct($search)
+    {
+        $this->input = $search = (string) $search;
+        $criteria = array();
+        if (preg_match_all('/"(?P<search>[^"]*)"/', $search, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
+            $unquoted = '';
+            $offset = 0;
+            foreach ($matches as $match) {
+                $fullMatch = $match[0];
+                $searchMatch = $match['search'];
+                $unquoted .= substr($search, $offset, $fullMatch[1] - $offset);
+                $offset += $fullMatch[1] + strlen($fullMatch[0]);
+                if (strlen($searchMatch[0]) > 0) {
+                    $criteria[] = $searchMatch[0];
+                }
+            }
+            $search = $unquoted . substr($search, $offset);
+        }
+        $this->search = array_unique(array_merge($criteria, array_filter(explode(' ', trim($search)))));
+    }
+
+    /**
+     * Get the search criteria
+     *
+     * @return array
+     */
+    public function getCriteria()
+    {
+        return $this->search;
+    }
+
+    /**
+     * Get the search string
+     *
+     * @return string
+     */
+    public function getInput()
+    {
+        return $this->input;
+    }
+
+    /**
+     * Search in the given line
+     *
+     * @param   string  $line
+     *
+     * @return  DocSearchMatch|null
+     */
+    public function search($line)
+    {
+        $match = new DocSearchMatch();
+        $match->setLine($line);
+        foreach ($this->search as $criteria) {
+            $offset = 0;
+            while (($position = stripos($line, $criteria, $offset)) !== false) {
+                $match->appendMatch(substr($line, $position, strlen($criteria)), $position);
+                $offset = $position + 1;
+            }
+        }
+        return $match->isEmpty() ? null : $match;
+    }
+}

From 267c36d8d16d0c7a262b36beb36c85c298ae87af Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 17:11:48 +0100
Subject: [PATCH 0596/2920] doc/lib: Add class DocSearchMatch represeting a
 search match

refs #6630
---
 .../doc/library/Doc/Search/DocSearchMatch.php | 151 ++++++++++++++++++
 1 file changed, 151 insertions(+)
 create mode 100644 modules/doc/library/Doc/Search/DocSearchMatch.php

diff --git a/modules/doc/library/Doc/Search/DocSearchMatch.php b/modules/doc/library/Doc/Search/DocSearchMatch.php
new file mode 100644
index 000000000..c5c7b4b7f
--- /dev/null
+++ b/modules/doc/library/Doc/Search/DocSearchMatch.php
@@ -0,0 +1,151 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Doc\Search;
+
+use UnexpectedValueException;
+
+/**
+ * A doc search match
+ */
+class DocSearchMatch
+{
+    /**
+     * Header match
+     *
+     * @type int
+     */
+    const MATCH_HEADER = 1;
+
+    /**
+     * Content match
+     *
+     * @type int
+     */
+    const MATCH_CONTENT = 2;
+
+    /**
+     * Line
+     *
+     * @type string
+     */
+    protected $line;
+
+    /**
+     * Line number
+     *
+     * @type int
+     */
+    protected $lineno;
+
+    /**
+     * Type of the match
+     *
+     * @type int
+     */
+    protected $matchType;
+
+    /**
+     * Matches
+     *
+     * @type array
+     */
+    protected $matches = array();
+
+    /**
+     * Set the line
+     *
+     * @param   string  $line
+     *
+     * @return  $this
+     */
+    public function setLine($line)
+    {
+        $this->line = (string) $line;
+        return $this;
+    }
+
+    /**
+     * Get the line
+     *
+     * @return string
+     */
+    public function getLine()
+    {
+        return $this->line;
+    }
+
+    /**
+     * Set the line number
+     *
+     * @param   int $lineno
+     *
+     * @return  $this
+     */
+    public function setLineno($lineno)
+    {
+        $this->lineno = (int) $lineno;
+        return $this;
+    }
+
+    /**
+     * Set the match type
+     *
+     * @param   int $matchType
+     *
+     * @return  $this
+     */
+    public function setMatchType($matchType)
+    {
+        $matchType = (int) $matchType;
+        if ($matchType !== static::MATCH_HEADER && $matchType !== static::MATCH_CONTENT) {
+            throw new UnexpectedValueException();
+        }
+        $this->matchType = $matchType;
+        return $this;
+    }
+
+    /**
+     * Get the match type
+     *
+     * @return int
+     */
+    public function getMatchType()
+    {
+        return $this->matchType;
+    }
+
+    /**
+     * Append a match
+     *
+     * @param   string  $match
+     * @param   int     $position
+     *
+     * @return  $this
+     */
+    public function appendMatch($match, $position)
+    {
+        $this->matches[(int) $position] = (string) $match;
+        return $this;
+    }
+
+    /**
+     * Get the matches
+     *
+     * @return array
+     */
+    public function getMatches()
+    {
+        return $this->matches;
+    }
+
+    /**
+     * Whether the match is empty
+     *
+     * @return bool
+     */
+    public function isEmpty()
+    {
+        return empty($this->matches);
+    }
+}

From e7b0f8d30f5548cb6ea3098938419ad697a5b2e4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 17:12:43 +0100
Subject: [PATCH 0597/2920] doc/lib: Add iterator over doc sections that match
 a given search criteria

refs #6630
---
 .../library/Doc/Search/DocSearchIterator.php  | 122 ++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 modules/doc/library/Doc/Search/DocSearchIterator.php

diff --git a/modules/doc/library/Doc/Search/DocSearchIterator.php b/modules/doc/library/Doc/Search/DocSearchIterator.php
new file mode 100644
index 000000000..a3a4d8504
--- /dev/null
+++ b/modules/doc/library/Doc/Search/DocSearchIterator.php
@@ -0,0 +1,122 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Doc\Search;
+
+use Countable;
+use RecursiveFilterIterator;
+use Icinga\Data\Tree\TreeNodeIterator;
+
+/**
+ * Iterator over doc sections that match a given search criteria
+ *
+ * @method TreeNodeIterator getInnerIterator() {
+ *     {@inheritdoc}
+ * }
+ */
+class DocSearchIterator extends RecursiveFilterIterator implements Countable
+{
+    /**
+     * Search criteria
+     *
+     * @type DocSearch
+     */
+    protected $search;
+
+    /**
+     * Search matches
+     *
+     * @type DocSearchMatch[]|null
+     */
+    protected $matches;
+
+    /**
+     * Create a new iterator over doc sections that match the given search criteria
+     *
+     * @param TreeNodeIterator  $iterator
+     * @param DocSearch         $search
+     */
+    public function __construct(TreeNodeIterator $iterator, DocSearch $search)
+    {
+        $this->search = $search;
+        parent::__construct($iterator);
+    }
+
+    /**
+     * Accept sections that match the search
+     *
+     * @return bool Whether the current element of the iterator is acceptable
+     *              through this filter
+     */
+    public function accept()
+    {
+        $section = $this->getInnerIterator()->current();
+        /** @type $section \Icinga\Module\Doc\DocSection */
+        $matches = array();
+        if (($match = $this->search->search($section->getTitle())) !== null) {
+            $matches[] = $match->setMatchType(DocSearchMatch::MATCH_HEADER);
+        }
+        foreach ($section->getContent() as $lineno => $line) {
+            if (($match = $this->search->search($line)) !== null) {
+                $matches[] = $match
+                    ->setMatchType(DocSearchMatch::MATCH_CONTENT)
+                    ->setLineno($lineno);
+            }
+        }
+        if (! empty($matches)) {
+            $this->matches = $matches;
+            return $this;
+        }
+        if ($section->hasChildren()) {
+            $this->matches = null;
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Get the search criteria
+     *
+     * @return DocSearch
+     */
+    public function getSearch()
+    {
+        return $this->search;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getChildren()
+    {
+        return new static($this->getInnerIterator()->getChildren(), $this->search);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function count()
+    {
+        return iterator_count($this);
+    }
+
+    /**
+     * Whether the search did not yield any match
+     *
+     * @return bool
+     */
+    public function isEmpty()
+    {
+        return $this->count() === 0;
+    }
+
+    /**
+     * Get matches
+     *
+     * @return DocSearchMatch[]|null
+     */
+    public function getMatches()
+    {
+        return $this->matches;
+    }
+}

From 3b20e499404d6b451a385522e91341b652197a21 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 17:13:17 +0100
Subject: [PATCH 0598/2920] doc/lib: Add renderer for doc searches

refs #6630
---
 .../library/Doc/Search/DocSearchRenderer.php  | 147 ++++++++++++++++++
 1 file changed, 147 insertions(+)
 create mode 100644 modules/doc/library/Doc/Search/DocSearchRenderer.php

diff --git a/modules/doc/library/Doc/Search/DocSearchRenderer.php b/modules/doc/library/Doc/Search/DocSearchRenderer.php
new file mode 100644
index 000000000..97f830a93
--- /dev/null
+++ b/modules/doc/library/Doc/Search/DocSearchRenderer.php
@@ -0,0 +1,147 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Doc\Search;
+
+use RecursiveIteratorIterator;
+use Icinga\Module\Doc\Renderer;
+
+/**
+ * Renderer for doc searches
+ *
+ * @method DocSearchIterator getInnerIterator() {
+ *     @{inheritdoc}
+ * }
+ */
+class DocSearchRenderer extends Renderer
+{
+    /**
+     * CSS class
+     *
+     * @type string
+     */
+    const HIGHLIGHT_CSS_CLASS = 'search-highlight';
+
+    /**
+     * The content to render
+     *
+     * @type array
+     */
+    protected $content = array();
+
+    /**
+     * Create a new renderer for doc searches
+     *
+     * @param DocSearchIterator $iterator
+     */
+    public function __construct (DocSearchIterator $iterator)
+    {
+        parent::__construct($iterator, RecursiveIteratorIterator::SELF_FIRST);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function beginIteration()
+    {
+        $this->content[] = '<nav><ul>';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function endIteration()
+    {
+        $this->content[] = '</ul></nav>';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function beginChildren()
+    {
+        if ($this->getInnerIterator()->getMatches()) {
+            $this->content[] = '<ul>';
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function endChildren()
+    {
+        if ($this->getInnerIterator()->getMatches()) {
+            $this->content[] = '</ul>';
+        }
+    }
+
+    public function highlight($line, array $matches)
+    {
+        $highlighted = '';
+        $offset = 0;
+        ksort($matches);
+        foreach ($matches as $position => $match) {
+            $highlighted .= $this->getView()->escape(substr($line, $offset, $position - $offset))
+                . '<span class="' . static::HIGHLIGHT_CSS_CLASS .'">'
+                . $this->getView()->escape($match)
+                . '</span>';
+            $offset = $position + strlen($match);
+        }
+        $highlighted .= $this->getView()->escape(substr($line, $offset));
+        return $highlighted;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function render()
+    {
+        foreach ($this as $section) {
+            if (($matches = $this->getInnerIterator()->getMatches()) === null) {
+                continue;
+            }
+            $title = $this->getView()->escape($section->getTitle());
+            $contentMatches = array();
+            foreach ($matches as $match) {
+                if ($match->getMatchType() === DocSearchMatch::MATCH_HEADER) {
+                    $title = $this->highlight($match->getLine(), $match->getMatches());
+                } else {
+                    $contentMatches[] = sprintf(
+                        '<p>%s</p>',
+                        $this->highlight($match->getLine(), $match->getMatches())
+                    );
+                }
+            }
+            $path = $this->getView()->getHelper('Url')->url(
+                array_merge(
+                    $this->urlParams,
+                    array(
+                        'chapter' => $this->encodeUrlParam($section->getChapter()->getId())
+                    )
+                ),
+                $this->url,
+                false,
+                false
+            );
+            $url = $this->getView()->url(
+                $path,
+                array('highlight' => $this->getInnerIterator()->getSearch()->getInput())
+            );
+            /** @type \Icinga\Web\Url $url */
+            $url->setAnchor($this->encodeAnchor($section->getId()));
+            $this->content[] = sprintf(
+                '<li><a data-base-target="_next" %shref="%s">%s</a>',
+                $section->getNoFollow() ? 'rel="nofollow" ' : '',
+                $url->getAbsoluteUrl(),
+                $title
+            );
+            if (! empty($contentMatches)) {
+                $this->content = array_merge($this->content, $contentMatches);
+            }
+            if (! $section->hasChildren()) {
+                $this->content[] = '</li>';
+            }
+        }
+        return implode("\n", $this->content);
+    }
+}

From e2b34023cd4736327a04c74e341e49493e08dacc Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Feb 2015 17:14:16 +0100
Subject: [PATCH 0599/2920] doc/lib: Add SearchController

At the moment only Icinga Web 2's documentation is available for searching.

refs #6630
---
 .../controllers/SearchController.php          | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 modules/doc/application/controllers/SearchController.php

diff --git a/modules/doc/application/controllers/SearchController.php b/modules/doc/application/controllers/SearchController.php
new file mode 100644
index 000000000..5ba223d00
--- /dev/null
+++ b/modules/doc/application/controllers/SearchController.php
@@ -0,0 +1,49 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+use \Zend_Controller_Action_Exception;
+use Icinga\Application\Icinga;
+use Icinga\Module\Doc\DocController;
+use Icinga\Module\Doc\DocParser;
+use Icinga\Module\Doc\Search\DocSearch;
+use Icinga\Module\Doc\Search\DocSearchIterator;
+use Icinga\Module\Doc\Search\DocSearchRenderer;
+
+class Doc_SearchController extends DocController
+{
+    public function indexAction()
+    {
+        $parser = new DocParser($this->getPath());
+        $search = new DocSearchRenderer(
+            new DocSearchIterator(
+                $parser->getDocTree()->getIterator(),
+                new DocSearch($this->params->get('q'))
+            )
+        );
+        $this->view->search = $search->setUrl('doc/icingaweb/chapter');
+    }
+
+    /**
+     * Get the path to Icinga Web 2's documentation
+     *
+     * @return  string
+     *
+     * @throws  Zend_Controller_Action_Exception    If Icinga Web 2's documentation is not available
+     */
+    protected function getPath()
+    {
+        $path = Icinga::app()->getBaseDir('doc');
+        if (is_dir($path)) {
+            return $path;
+        }
+        if (($path = $this->Config()->get('documentation', 'icingaweb2')) !== null) {
+            if (is_dir($path)) {
+                return $path;
+            }
+        }
+        throw new Zend_Controller_Action_Exception(
+            $this->translate('Documentation for Icinga Web 2 is not available'),
+            404
+        );
+    }
+}

From 278591fbd2e7a704ed0530745e5b96d523337f8c Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Wed, 11 Feb 2015 10:35:12 +0100
Subject: [PATCH 0600/2920] Accessibility: Prototype for skip links

---
 doc/accessibility/skip-content.html | 177 ++++++++++++++++++++++++++++
 1 file changed, 177 insertions(+)
 create mode 100644 doc/accessibility/skip-content.html

diff --git a/doc/accessibility/skip-content.html b/doc/accessibility/skip-content.html
new file mode 100644
index 000000000..c785f6c12
--- /dev/null
+++ b/doc/accessibility/skip-content.html
@@ -0,0 +1,177 @@
+<!doctype html>
+<html class="no-js" lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>Accessibility: Skip Links</title>
+    <meta name="description" content="Accessible skip links">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style type="text/css">
+        .sr-only {
+            border: 0;
+            clip: rect(0 0 0 0);
+            height: 1px;
+            margin: -1px;
+            overflow: hidden;
+            padding: 0;
+            position: absolute;
+            width: 1px;
+        }
+        .clearfix {
+            *zoom: 1;
+        }
+        .clearfix:before,
+        .clearfix:after {
+            display: table;
+            content: "";
+            line-height: 0;
+        }
+        .clearfix:after {
+            clear: both;
+        }
+        body {
+            margin: 0;
+            padding: 0;
+        }
+        .head {
+            background-color: #049baf;
+            padding: 5px;
+        }
+        .nav {
+            width: 200px;
+            float: left;
+            margin: 0 20px 20px 0;
+            padding: 0 20px 20px 0;
+        }
+        .container {
+            margin: 10px 0 0 0;
+        }
+        .content {
+            overflow: auto;
+        }
+        .skip-links {
+            position: absolute;
+            opacity: 1;
+        }
+        .skip-links-inline {
+            margin-top: -3.5em;
+        }
+        .skip-links ul {
+            list-style-type: none;
+            margin: 0;
+            padding: 0;
+        }
+        .skip-links ul li {
+            display: inline;
+            margin: 0;
+            padding: 0;
+        }
+        .skip-links ul li a {
+            position: absolute;
+            display: block;
+            left: -999em;
+            width: 200px;
+            padding: 0.6em;
+            background-color: white;
+        }
+        .skip-links ul li a:focus {
+            left: 0;
+        }
+    </style>
+</head>
+<body>
+    <div class="head">
+        <div class="skip-links">
+            <nav>
+                <h1 class="sr-only">Skip Links</h1>
+                <ul>
+                    <li><a href="#content">Skip to Content</a></li>
+                    <li><a href="#searchField">Skip to Search</a></li>
+                    <li><a href="#navigation">Skip to Navigation</a></li>
+                </ul>
+            </nav>
+        </div>
+        <div id="logo">
+            <img width="92" height="32" title="" alt="" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFwAAAAgCAYAAACfDx/iAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAABcSAAAXEgFnn9JSAAAAB3RJTUUH3gkEDx0B5aU5bgAACCxJREFUaN7tmn2slmUdx7+/5+UcPFhAeQR0SSnOEodFWSPZdGxGZsWhiZFZq+myl5WZDWchIW4VODa3cDPNNWfFS9aquWmWyaJss1qDcE1txstKFPCEHA7ynPM8n/7gdx1/XN73cx7o0B9xru3e/dzX+/W9vtfv7Xqk40zAdOAhYAjYClzk+RpPY5iAKlAHnuS1ado4Qu1T5TjaVCVNlnRRyGv5e+E4pGMPOJKGJA1k35L0z3FIx16kmL9XZOJk07gMHz0l8GRmEVSZ2WvyA6BmZgD3SPqXpG1m9iBQM7PhcVjbM1aAAV3AJ4CzIpPbtFsInBO+a+MMHz3VnK4AWyW9RVIX0COpATRz5rvcr0s6VdJOoCqpaWbDRSclKFrzehSdnJNGabromCjpXElNz59tZs2c6WYmM2tJ6pU0aGZDZjayKUUget40STNi3kl7EtLCgZuBg8A6YFkmJq4A7gDuAj4GLE2b4SKpnXL9NHAAeAW4H6j5qRiX5cGx6QZuB3qBfwRLpAU0gQawIGunCD7Q5e9mZs3Mcn1x0gNdcSAqDtwZDlDD3feWP8P+BniXb1AVqGT9ngXM9XrD/gDMcU/15FSaQf62gIabfAI+GxSrZZ5mSg+bWW8A+UJJl3udbZK2SLpJ0hqv8pjnlZqhUcb/PypWK2B8zS2RJyS9s03bpgN7naTTJPVIetzMNsW4i5k1gV5Jp5nZ33IbHzAzo+z0FWyERUsnbky7TYonqmSzO5rHaP3HuRQZErWSTahJOrPjXTNbFQaueB+tZOlI2ivpYKrOkdXFDXmzpI9IOsdDBX+X9EMz2wPUzWwokcHNz14vGwE/OWNer0/SeyRNkPSSpMfM7Amg4ic53/Q0jzdKWixpppNuu6SNZrYb6DKzRhvQU9+zzWxrJyQYYbgrzb/SPg0lOZ4rzUwvzAB2ugV0ZWS/v1cFnZCn5cEaSlbPg172k9iP/54FPO96J6YG8Dvg1NBPJIiALwY9k6fVYT2lJyeEq3/teqo6qq4KE1rbAeDDcdIFHmwFWBwsnPXZItd72aGC/g/6+zuhz4luXvYnWgMTfJw5AdzhAsABdjjo1YwYa9rMY9DfG9t54MBs4OXQx9udvB1bL2c4SIcKGJjY/cGySQTAPxra/SiUf8HzXvH3duAmYGkwRdO4lzjLJzkAgwHwHn8PBIsI4F7gBuBh/z7s780Zsfqy8n3A14FbgGc9L5m2i3xNloVFzM3omJ7MT2C72Er6fX4Ju5vA16Lz0wbwqyLgnt8D/CnkbwziLLH/8VD+K8+b4gQYAdzzbwygtYDzMlCvCeVN4OIw3qNhnN8WzOOhUP7nPG7kprS5c5efqJmFsZQCVzxNdrukr7rCmyepW9IOSY9IqqcFHaMZV5V0uqRZ/r1f0uecqYdCvas9EilJT4fYe1FaIqkhqUvSMjN7GqhLGgZOMbMfAEskXeH1F0j6vaRJrlzlMf1rgQmSDgf5fI2kfa5En8nmYa5IP+mxpWS5Vf33bZI+fpTFknmKlchYYE2bk3C9K9daEcvbMLwKvDWyJsjh/ISdCVwavNbXlzB8R5CdF2R9pfDDl8OY93q7qeHEPucnyArmMR14v5/MWJ5OUH8QSRtCn7t9DSP4VHJmm1ky2T4l6VtAdxAdUUv/TNI6SVeV2a8dplZijAfHYtkeSZsljRZjj+MfTv6F92XpPYo53PJnZB4Bk+fN7BEzG5REKAdY5CfFwsnc5thOlTTfyww44mkC50taJmk6sE/SfZIOmdnetJsOaiTWfEmLJH3IZdszbY58budbG8CiudXwumMRB+i4j2Cvf1fSG7xtXdIvzexul+84Jtf5HOuSVrk9v0HSBd7dCjN7INnxNVcwT2Ue5EJJHygKpQYG/kLSXyQ95TJz7Nzfo1nOiQK2zfgt4FZJn3HWVxyXPuDHkvolVYEZki4LOuAe34y7JN3i7c4G5prZHwDVJK0tUGqStNLvKaPHGNk3aGZzkrg5BrHCaCGG4AFW0mL/S7F1POnZ5EFmc5wkqd893qud2UkkbfL1NdzASBu11sMkVpN0acmA57rmHQgXEzGmQbBSjuUWxzpheHK39epfMP6XEVQzs/XADpf3v3E9MiEwviVpZSBQTdKbMkmB13sHcKGZbalIeqFk3AEfhDJQXMFSdtvThuFRCU52Nli24Cbwc9/Yy04Utg6MObl69OoFuST90cw2B+AkqeHs/lJ2YodcYadn2NvUvf/r03FZHRo0kw0q6admdiBn9xgt8t+Sdvr3TEkLHOBuVy74rdKHvf7qgtDwWKRBFx3mFkWfy+9uSV0O7LUOWpcTK/kGSx2riqRvSrrYpcUl/sxPIHu6EpiS7MnvZZ7khrG42Ciyw0P5feFSIwGcypZn87nZ8yeV2OHbgx0+MwaNgscY7fDvh7ars7FWhrY3ZDdWd4ZwQCuUWZEL717o1lBvcZzQNOB9wOn+Xc+jYccJeIylrA/lU4C9WRyjKOC0E3id95UAH8gA3xWCXeeVAP6V0Pf9WUBsVwfz2OOOUhV4IJTf4XOrlIQ4bg2k2pLszYqZ7TazR83sRf8eOkbZXJZeDL/3BhndL+ndOvL3uC4/ns0g1uru+MwzswNm1jKz/V4+MRtjl8tfuU6qHr1mqsEtl6TngjV0UNJcLy+bxz5J7zWzF1yR10Nf69ySa+UXG97/7UE/nXJC70oDy/qAG0vuUc1ZsD+ImJeBFQWBIgGTgW8DZ2dx8m8A8/KAWjaPJcDnC/IrIQj2kouApgekbovzCKJtOXB5UVy8YJ1vA+4Epv4HBqUeGKwVd68AAAAASUVORK5CYII=" />
+        </div>
+    </div>
+    <div class="container clearfix">
+    <div class="nav">
+        <h1 class="sr-only">Navigation</h1>
+
+        <div id="search">
+            <h2 class="sr-only">Search</h2>
+            <form>
+                <fieldset>
+                    <label for="searchField">Search</label>
+                    <input type="text" name="searchField" id="searchField" />
+                </fieldset>
+            </form>
+        </div>
+        <nav>
+            <h2 id="navigation" tabindex="0" class="sr-only">Site Links</h2>
+            <ul>
+                <li><a href="#">Link1</a></li>
+                <li><a href="#">Link2</a></li>
+                <li><a href="#">Link3</a></li>
+            </ul>
+        </nav>
+    </div>
+    <div class="content">
+        <h1 tabindex="0" id="content">Content</h1>
+        <div class="skip-links skip-links-inline">
+            <nav>
+                <ul>
+                    <li><a href="#content2">Skip content</a></li>
+                </ul>
+            </nav>
+        </div>
+        <p>
+            Organised prehistoric cultures began developing on Bulgarian lands
+            during the Neolithic period. Its ancient history saw the presence
+            of the Thracians and later the Greeks and Romans. The emergence of
+            a unified Bulgarian state dates back to the establishment of the
+            <a href="#">First Bulgarian Empire</a>
+            in 681 CE, which dominated most of the
+            Balkans and functioned as a cultural hub for Slavs during the
+            Middle Ages.
+        </p>
+        <p>
+            With the downfall of the Second Bulgarian Empire in 1396, its
+            <a href="#">territories came under Ottoman</a>
+            rule for nearly five centuries.
+            The Russo-Turkish War (1877–78) led to the formation of the Third
+            Bulgarian State. The following years saw several conflicts with its
+            neighbours, which prompted Bulgaria to align with Germany in both
+            world wars.
+        </p>
+        <p>
+            In 1946 it became a single-party socialist state as part of the
+            Soviet-led Eastern Bloc. In December 1989 the ruling Communist
+            Party allowed multi-party elections, which subsequently led to
+            Bulgaria's transition into a democracy and a market-based economy.
+        </p>
+
+        <h1 tabindex="0" id="content2">Content2</h1>
+        <p>
+            The development of Final Fantasy VIII began in 1997, during the
+            English localization process of Final Fantasy VII. It was produced
+            <a href="#">by Shinji Hashimoto</a>,
+            and directed by Yoshinori Kitase. The music
+            was scored by regular series composer Nobuo Uematsu, and in a
+            series first a vocal piece was written as the game's theme, "Eyes
+            on Me", performed by Faye Wong.
+        </p>
+        <p>
+            The game was positively received by
+            critics,
+            <a href="#">who praised the originality </a>
+            and scope of the game. It was
+            voted the 22nd-best game of all time in 2006 by readers of the
+            Japanese magazine Famitsu. The game was a commercial success;
+            thirteen weeks after its release,
+        </p>
+    </div>
+    </div>
+</body>
+</html>
\ No newline at end of file

From 0b1a9c16596b7b819c34db3014c54812869c1db3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 12:58:31 +0100
Subject: [PATCH 0601/2920] doc/lib: Apply role and css class toc to the toc

refs #6630
---
 modules/doc/library/Doc/TocRenderer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/doc/library/Doc/TocRenderer.php b/modules/doc/library/Doc/TocRenderer.php
index cfa18fad0..019ca2d9f 100644
--- a/modules/doc/library/Doc/TocRenderer.php
+++ b/modules/doc/library/Doc/TocRenderer.php
@@ -38,7 +38,7 @@ class TocRenderer extends Renderer
      */
     public function beginIteration()
     {
-        $this->content[] = '<nav><ul>';
+        $this->content[] = '<nav role="navigation"><ul class="toc">';
     }
 
     /**
@@ -54,7 +54,7 @@ class TocRenderer extends Renderer
      */
     public function beginChildren()
     {
-        $this->content[] = '<ul>';
+        $this->content[] = '<ul class="toc">';
     }
 
     /**

From bd71dbdbdc94f678fb07baebb7f92a31511f5f93 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 13:02:04 +0100
Subject: [PATCH 0602/2920] doc/lib: Rearrange imports in the DocIterator

refs #6630
---
 modules/doc/library/Doc/DocIterator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/doc/library/Doc/DocIterator.php b/modules/doc/library/Doc/DocIterator.php
index 34358a89e..cbea037d6 100644
--- a/modules/doc/library/Doc/DocIterator.php
+++ b/modules/doc/library/Doc/DocIterator.php
@@ -6,8 +6,8 @@ namespace Icinga\Module\Doc;
 use ArrayIterator;
 use Countable;
 use IteratorAggregate;
-use RecursiveIteratorIterator;
 use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
 use Icinga\File\NonEmptyFileIterator;
 use Icinga\File\FileExtensionFilterIterator;
 

From d2520f128641c03789e0ab0527fc43c118411db8 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 13:02:33 +0100
Subject: [PATCH 0603/2920] doc/lib: Prefer @type over @var in the DocParser

refs #6630
---
 modules/doc/library/Doc/DocParser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/doc/library/Doc/DocParser.php b/modules/doc/library/Doc/DocParser.php
index b0384a3d4..08ad5cf56 100644
--- a/modules/doc/library/Doc/DocParser.php
+++ b/modules/doc/library/Doc/DocParser.php
@@ -17,14 +17,14 @@ class DocParser
     /**
      * Path to the documentation
      *
-     * @var string
+     * @type string
      */
     protected $path;
 
     /**
      * Iterator over documentation files
      *
-     * @var DocIterator
+     * @type DocIterator
      */
     protected $docIterator;
 

From 21b65d807973930b202c318b3627f81cb6e09d9f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 13:03:01 +0100
Subject: [PATCH 0604/2920] doc/lib: Show trace in case an exception is thrown
 during rendering

refs #6630
---
 modules/doc/library/Doc/Renderer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/doc/library/Doc/Renderer.php b/modules/doc/library/Doc/Renderer.php
index e2329c4dc..79a223e22 100644
--- a/modules/doc/library/Doc/Renderer.php
+++ b/modules/doc/library/Doc/Renderer.php
@@ -172,7 +172,7 @@ abstract class Renderer extends RecursiveIteratorIterator
         try {
             return $this->render();
         } catch (Exception $e) {
-            return $e->getMessage();
+            return $e->getMessage() . ': ' . $e->getTraceAsString();
         }
     }
 }

From 1053e62e20f607113807d35035b4ce1f98bc3427 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 13:03:46 +0100
Subject: [PATCH 0605/2920] doc/lib: Fix DocSearchIterator::count() counting
 too many

Because DocSearchIterator is a recursive filter iterator and we accept
any hode having children, those children not matching any of the search criteria
were counted too because of iterator_count.

refs #6630
---
 modules/doc/library/Doc/Search/DocSearchIterator.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/doc/library/Doc/Search/DocSearchIterator.php b/modules/doc/library/Doc/Search/DocSearchIterator.php
index a3a4d8504..f0a9a4967 100644
--- a/modules/doc/library/Doc/Search/DocSearchIterator.php
+++ b/modules/doc/library/Doc/Search/DocSearchIterator.php
@@ -50,7 +50,7 @@ class DocSearchIterator extends RecursiveFilterIterator implements Countable
      */
     public function accept()
     {
-        $section = $this->getInnerIterator()->current();
+        $section = $this->current();
         /** @type $section \Icinga\Module\Doc\DocSection */
         $matches = array();
         if (($match = $this->search->search($section->getTitle())) !== null) {
@@ -97,7 +97,13 @@ class DocSearchIterator extends RecursiveFilterIterator implements Countable
      */
     public function count()
     {
-        return iterator_count($this);
+        $count = 0;
+        foreach ($this as $section) {
+            if ($this->getMatches() !== null) {
+                ++$count;
+            }
+        }
+        return $count;
     }
 
     /**

From ab78757483edfebf5e1310725b096913548e0a84 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 13:15:48 +0100
Subject: [PATCH 0606/2920] doc/lib: Add DocSearchMatch::highlight()

refs #6630
---
 .../doc/library/Doc/Search/DocSearchMatch.php | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/modules/doc/library/Doc/Search/DocSearchMatch.php b/modules/doc/library/Doc/Search/DocSearchMatch.php
index c5c7b4b7f..4f067d43b 100644
--- a/modules/doc/library/Doc/Search/DocSearchMatch.php
+++ b/modules/doc/library/Doc/Search/DocSearchMatch.php
@@ -4,12 +4,21 @@
 namespace Icinga\Module\Doc\Search;
 
 use UnexpectedValueException;
+use Icinga\Application\Icinga;
+use Icinga\Web\View;
 
 /**
  * A doc search match
  */
 class DocSearchMatch
 {
+    /**
+     * CSS class for highlighting matches
+     *
+     * @type string
+     */
+    const HIGHLIGHT_CSS_CLASS = 'search-highlight';
+
     /**
      * Header match
      *
@@ -52,6 +61,13 @@ class DocSearchMatch
      */
     protected $matches = array();
 
+    /**
+     * View
+     *
+     * @type View|null
+     */
+    protected $view;
+
     /**
      * Set the line
      *
@@ -139,6 +155,54 @@ class DocSearchMatch
         return $this->matches;
     }
 
+    /**
+     * Set the view
+     *
+     * @param   View    $view
+     *
+     * @return  $this
+     */
+    public function setView(View $view)
+    {
+        $this->view = $view;
+        return $this;
+    }
+
+    /**
+     * Get the view
+     *
+     * @return View
+     */
+    public function getView()
+    {
+        if ($this->view === null) {
+            $this->view = Icinga::app()->getViewRenderer()->view;
+        }
+        return $this->view;
+    }
+
+    /**
+     * Get the line having matches highlighted
+     *
+     * @return string
+     */
+    public function highlight()
+    {
+        $highlighted = '';
+        $offset = 0;
+        $matches = $this->getMatches();
+        ksort($matches);
+        foreach ($matches as $position => $match) {
+            $highlighted .= $this->getView()->escape(substr($this->line, $offset, $position - $offset))
+                . '<span class="' . static::HIGHLIGHT_CSS_CLASS .'">'
+                . $this->getView()->escape($match)
+                . '</span>';
+            $offset = $position + strlen($match);
+        }
+        $highlighted .= $this->getView()->escape(substr($this->line, $offset));
+        return $highlighted;
+    }
+
     /**
      * Whether the match is empty
      *

From 512eb3fe8365a46d05625cd83d75c2e737119fc1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 13:16:14 +0100
Subject: [PATCH 0607/2920] doc/lib: Remove DocSearchRenderer::highlight()

refs #6630
---
 .../library/Doc/Search/DocSearchRenderer.php  | 35 ++++---------------
 1 file changed, 6 insertions(+), 29 deletions(-)

diff --git a/modules/doc/library/Doc/Search/DocSearchRenderer.php b/modules/doc/library/Doc/Search/DocSearchRenderer.php
index 97f830a93..8d04cd928 100644
--- a/modules/doc/library/Doc/Search/DocSearchRenderer.php
+++ b/modules/doc/library/Doc/Search/DocSearchRenderer.php
@@ -15,13 +15,6 @@ use Icinga\Module\Doc\Renderer;
  */
 class DocSearchRenderer extends Renderer
 {
-    /**
-     * CSS class
-     *
-     * @type string
-     */
-    const HIGHLIGHT_CSS_CLASS = 'search-highlight';
-
     /**
      * The content to render
      *
@@ -44,7 +37,7 @@ class DocSearchRenderer extends Renderer
      */
     public function beginIteration()
     {
-        $this->content[] = '<nav><ul>';
+        $this->content[] = '<nav role="navigation"><ul class="toc">';
     }
 
     /**
@@ -61,7 +54,7 @@ class DocSearchRenderer extends Renderer
     public function beginChildren()
     {
         if ($this->getInnerIterator()->getMatches()) {
-            $this->content[] = '<ul>';
+            $this->content[] = '<ul class="toc">';
         }
     }
 
@@ -75,22 +68,6 @@ class DocSearchRenderer extends Renderer
         }
     }
 
-    public function highlight($line, array $matches)
-    {
-        $highlighted = '';
-        $offset = 0;
-        ksort($matches);
-        foreach ($matches as $position => $match) {
-            $highlighted .= $this->getView()->escape(substr($line, $offset, $position - $offset))
-                . '<span class="' . static::HIGHLIGHT_CSS_CLASS .'">'
-                . $this->getView()->escape($match)
-                . '</span>';
-            $offset = $position + strlen($match);
-        }
-        $highlighted .= $this->getView()->escape(substr($line, $offset));
-        return $highlighted;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -104,17 +81,17 @@ class DocSearchRenderer extends Renderer
             $contentMatches = array();
             foreach ($matches as $match) {
                 if ($match->getMatchType() === DocSearchMatch::MATCH_HEADER) {
-                    $title = $this->highlight($match->getLine(), $match->getMatches());
+                    $title = $match->highlight();
                 } else {
                     $contentMatches[] = sprintf(
                         '<p>%s</p>',
-                        $this->highlight($match->getLine(), $match->getMatches())
+                        $match->highlight()
                     );
                 }
             }
             $path = $this->getView()->getHelper('Url')->url(
                 array_merge(
-                    $this->urlParams,
+                    $this->getUrlParams(),
                     array(
                         'chapter' => $this->encodeUrlParam($section->getChapter()->getId())
                     )
@@ -125,7 +102,7 @@ class DocSearchRenderer extends Renderer
             );
             $url = $this->getView()->url(
                 $path,
-                array('highlight' => $this->getInnerIterator()->getSearch()->getInput())
+                array('highlight-search' => $this->getInnerIterator()->getSearch()->getInput())
             );
             /** @type \Icinga\Web\Url $url */
             $url->setAnchor($this->encodeAnchor($section->getId()));

From ec8a89b96e5c5f508c3aa84ec5b3392250f209f4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 13:20:01 +0100
Subject: [PATCH 0608/2920] lib: Add recursive iterator over a DOMNode

---
 library/Icinga/Web/Dom/DomNodeIterator.php | 106 +++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 library/Icinga/Web/Dom/DomNodeIterator.php

diff --git a/library/Icinga/Web/Dom/DomNodeIterator.php b/library/Icinga/Web/Dom/DomNodeIterator.php
new file mode 100644
index 000000000..143c9c506
--- /dev/null
+++ b/library/Icinga/Web/Dom/DomNodeIterator.php
@@ -0,0 +1,106 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Web\Dom;
+
+use DOMNode;
+use IteratorIterator;
+use RecursiveIterator;
+
+/**
+ * Recursive iterator over a DOMNode
+ *
+ * Usage example:
+ * <code>
+ * <?php
+ *
+ * namespace Icinga\Example;
+ *
+ * use DOMDocument;
+ * use RecursiveIteratorIterator;
+ * use Icinga\Web\Dom\DomIterator;
+ *
+ * $doc = new DOMDocument();
+ * $doc->loadHTML(...);
+ * $dom = new RecursiveIteratorIterator(new DomNodeIterator($doc), RecursiveIteratorIterator::SELF_FIRST);
+ * foreach ($dom as $node) {
+ *     ....
+ * }
+ * </code>
+ */
+class DomNodeIterator implements RecursiveIterator
+{
+    /**
+     * The node's children
+     *
+     * @type IteratorIterator
+     */
+    protected $children;
+
+    /**
+     * Create a new iterator over a DOMNode's children
+     *
+     * @param DOMNode $node
+     */
+    public function __construct(DOMNode $node)
+    {
+        $this->children = new IteratorIterator($node->childNodes);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function current()
+    {
+        return $this->children->current();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function key()
+    {
+        return $this->children->key();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function next()
+    {
+        $this->children->next();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rewind()
+    {
+        $this->children->rewind();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function valid()
+    {
+        return $this->children->valid();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function hasChildren()
+    {
+        return $this->current()->hasChildNodes();
+    }
+
+    /**
+     * {@inheritdoc}
+     * @return DomNodeIterator
+     */
+    public function getChildren()
+    {
+        return new static($this->current());
+    }
+}

From 57ca11cb76a5e792d6305c39c386a758fee59775 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 13:20:30 +0100
Subject: [PATCH 0609/2920] doc/lib: Highlight search when displaying a chapter

refs #6630
---
 modules/doc/library/Doc/SectionRenderer.php | 105 ++++++++++++++++++--
 1 file changed, 99 insertions(+), 6 deletions(-)

diff --git a/modules/doc/library/Doc/SectionRenderer.php b/modules/doc/library/Doc/SectionRenderer.php
index 825754ad7..ee37c2a28 100644
--- a/modules/doc/library/Doc/SectionRenderer.php
+++ b/modules/doc/library/Doc/SectionRenderer.php
@@ -11,6 +11,9 @@ use Parsedown;
 use RecursiveIteratorIterator;
 use Icinga\Data\Tree\SimpleTree;
 use Icinga\Module\Doc\Exception\ChapterNotFoundException;
+use Icinga\Module\Doc\Search\DocSearch;
+use Icinga\Module\Doc\Search\DocSearchMatch;
+use Icinga\Web\Dom\DomNodeIterator;
 use Icinga\Web\Url;
 use Icinga\Web\View;
 
@@ -26,6 +29,13 @@ class SectionRenderer extends Renderer
      */
     protected $content = array();
 
+    /**
+     * Search criteria to highlight
+     *
+     * @type string
+     */
+    protected $highlightSearch;
+
     /**
      * Parsedown instance
      *
@@ -68,6 +78,29 @@ class SectionRenderer extends Renderer
         $this->parsedown = Parsedown::instance();
     }
 
+    /**
+     * Set the search criteria to highlight
+     *
+     * @param   string $highlightSearch
+     *
+     * @return  $this
+     */
+    public function setHighlightSearch($highlightSearch)
+    {
+        $this->highlightSearch = $highlightSearch;
+        return $this;
+    }
+
+    /**
+     * Get the search criteria to highlight
+     *
+     * @return string
+     */
+    public function getHighlightSearch()
+    {
+        return $this->highlightSearch;
+    }
+
     /**
      * Syntax highlighting for PHP code
      *
@@ -80,6 +113,48 @@ class SectionRenderer extends Renderer
         return '<pre>' . highlight_string(htmlspecialchars_decode($match[1]), true) . '</pre>';
     }
 
+    /**
+     * Highlight search criteria
+     *
+     * @param   string      $html
+     * @param   DocSearch   $search Search criteria
+     *
+     * @return  string
+     */
+    protected function highlightSearch($html, DocSearch $search)
+    {
+        $doc = new DOMDocument();
+        $fragment = $doc->createDocumentFragment();
+        $fragment->appendXML($html);
+        $doc->appendChild($fragment);
+        $iter = new RecursiveIteratorIterator(new DomNodeIterator($doc), RecursiveIteratorIterator::SELF_FIRST);
+        foreach ($iter as $node) {
+            if ($node->nodeType !== XML_TEXT_NODE
+                || ($node->parentNode->nodeType === XML_ELEMENT_NODE && $node->parentNode->tagName === 'code')
+            ) {
+                continue;
+            }
+            $text = $node->nodeValue;
+            if (($match = $search->search($text)) === null) {
+                continue;
+            }
+            $matches = $match->getMatches();
+            ksort($matches);
+            $offset = 0;
+            $parentNode = $node->parentNode;
+            /** @type \DOMElement $parentNode */
+            $parentNode->removeChild($node);
+            foreach ($matches as $position => $match) {
+                $parentNode->appendChild($doc->createTextNode(substr($text, $offset, $position - $offset)));
+                $parentNode->appendChild($doc->createElement('span', $match))
+                    ->setAttribute('class', DocSearchMatch::HIGHLIGHT_CSS_CLASS);
+                $offset = $position + strlen($match);
+            }
+            $parentNode->appendChild($doc->createTextNode(substr($text, $offset)));
+        }
+        return $doc->saveHTML();
+    }
+
     /**
      * Markup notes
      *
@@ -93,7 +168,7 @@ class SectionRenderer extends Renderer
         $doc->loadHTML($match[0]);
         $xpath = new DOMXPath($doc);
         $blockquote = $xpath->query('//blockquote[1]')->item(0);
-        /* @var $blockquote \DOMElement */
+        /** @type \DOMElement $blockquote */
         if (strtolower(substr(trim($blockquote->nodeValue), 0, 5)) === 'note:') {
             $blockquote->setAttribute('class', 'note');
         }
@@ -113,7 +188,7 @@ class SectionRenderer extends Renderer
         $doc->loadHTML($match[0]);
         $xpath = new DOMXPath($doc);
         $img = $xpath->query('//img[1]')->item(0);
-        /* @var $img \DOMElement */
+        /** @type \DOMElement $img */
         $img->setAttribute('src', Url::fromPath($img->getAttribute('src'))->getAbsoluteUrl());
         return substr_replace($doc->saveXML($img), '', -2, 1);  // Replace '/>' with '>'
     }
@@ -130,7 +205,7 @@ class SectionRenderer extends Renderer
         if (($section = $this->tree->getNode($this->decodeAnchor($match['fragment']))) === null) {
             return $match[0];
         }
-        /** @type $section \Icinga\Module\Doc\DocSection */
+        /** @type \Icinga\Module\Doc\DocSection $section */
         $path = $this->getView()->getHelper('Url')->url(
             array_merge(
                 $this->urlParams,
@@ -158,17 +233,31 @@ class SectionRenderer extends Renderer
      */
     public function render()
     {
+        $search = null;
+        if (($highlightSearch = $this->getHighlightSearch()) !== null) {
+            $search = new DocSearch($highlightSearch);
+        }
         foreach ($this as $section) {
+            $title = $section->getTitle();
+            if ($search !== null && ($match = $search->search($title)) !== null) {
+                $title = $match->highlight();
+            } else {
+                $title = $this->getView()->escape($title);
+            }
             $this->content[] = sprintf(
                 '<a name="%1$s"></a><h%2$d>%3$s</h%2$d>',
                 Renderer::encodeAnchor($section->getId()),
                 $section->getLevel(),
-                $this->getView()->escape($section->getTitle())
+                $title
             );
+            $content = $this->parsedown->text(implode('', $section->getContent()));
+            if (empty($content)) {
+                continue;
+            }
             $html = preg_replace_callback(
                 '#<pre><code class="language-php">(.*?)</code></pre>#s',
                 array($this, 'highlightPhp'),
-                $this->parsedown->text(implode('', $section->getContent()))
+                $content
             );
             $html = preg_replace_callback(
                 '/<img[^>]+>/',
@@ -180,11 +269,15 @@ class SectionRenderer extends Renderer
                 array($this, 'markupNotes'),
                 $html
             );
-            $this->content[] = preg_replace_callback(
+            $html = preg_replace_callback(
                 '/<a\s+(?P<attribs>[^>]*?\s+)?href="(?:(?!http:\/\/)[^#]*)#(?P<fragment>[^"]+)"/',
                 array($this, 'replaceLink'),
                 $html
             );
+            if ($search !== null) {
+                $html = $this->highlightSearch($html, $search);
+            }
+            $this->content[] = $html;
         }
         return implode("\n", $this->content);
     }

From 4931418c039241a0719c1ae1c5b5185396ef6e25 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 13:21:01 +0100
Subject: [PATCH 0610/2920] doc/lib: Pass highlight-search parameter to the
 renderer

refs #6630
---
 modules/doc/library/Doc/DocController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/doc/library/Doc/DocController.php b/modules/doc/library/Doc/DocController.php
index 70d2639bf..0d73ae127 100644
--- a/modules/doc/library/Doc/DocController.php
+++ b/modules/doc/library/Doc/DocController.php
@@ -21,7 +21,8 @@ class DocController extends ModuleActionController
         $section = new SectionRenderer($parser->getDocTree(), SectionRenderer::decodeUrlParam($chapter));
         $this->view->section = $section
             ->setUrl($url)
-            ->setUrlParams($urlParams);
+            ->setUrlParams($urlParams)
+            ->setHighlightSearch($this->params->get('highlight-search'));
         $this->view->title = $chapter;
         $this->render('chapter', null, true);
     }

From fa37f84cac158cfc8834195b3b2b4e5f109f5a05 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 13:22:27 +0100
Subject: [PATCH 0611/2920] doc/lib: Search in module documentations too

refs #6630
---
 .../controllers/SearchController.php          | 54 +++++++++++++++++--
 1 file changed, 51 insertions(+), 3 deletions(-)

diff --git a/modules/doc/application/controllers/SearchController.php b/modules/doc/application/controllers/SearchController.php
index 5ba223d00..2cfb04483 100644
--- a/modules/doc/application/controllers/SearchController.php
+++ b/modules/doc/application/controllers/SearchController.php
@@ -5,22 +5,70 @@ use \Zend_Controller_Action_Exception;
 use Icinga\Application\Icinga;
 use Icinga\Module\Doc\DocController;
 use Icinga\Module\Doc\DocParser;
+use Icinga\Module\Doc\Exception\DocException;
 use Icinga\Module\Doc\Search\DocSearch;
 use Icinga\Module\Doc\Search\DocSearchIterator;
 use Icinga\Module\Doc\Search\DocSearchRenderer;
 
 class Doc_SearchController extends DocController
 {
+    /**
+     * Render search
+     */
     public function indexAction()
     {
-        $parser = new DocParser($this->getPath());
+        $parser = new DocParser($this->getWebPath());
         $search = new DocSearchRenderer(
             new DocSearchIterator(
                 $parser->getDocTree()->getIterator(),
                 new DocSearch($this->params->get('q'))
             )
         );
-        $this->view->search = $search->setUrl('doc/icingaweb/chapter');
+        $search->setUrl('doc/icingaweb/chapter');
+        $searches = array(
+            'Icinga Web 2' => $search
+        );
+        foreach (Icinga::app()->getModuleManager()->listEnabledModules() as $module) {
+            if (($path = $this->getModulePath($module)) !== null) {
+                try {
+                    $parser = new DocParser($path);
+                } catch (DocException $e) {
+                    continue;
+                }
+                $search = new DocSearchRenderer(
+                    new DocSearchIterator(
+                        $parser->getDocTree()->getIterator(),
+                        new DocSearch($this->params->get('q'))
+                    )
+                );
+                $search
+                    ->setUrl('doc/module/chapter')
+                    ->setUrlParams(array('moduleName' => $module));
+                $searches[$module] = $search;
+            }
+        }
+        $this->view->searches = $searches;
+    }
+
+    /**
+     * Get the path to a module's documentation
+     *
+     * @param   string  $module
+     *
+     * @return  string|null
+     */
+    protected function getModulePath($module)
+    {
+        if (is_dir(($path = Icinga::app()->getModuleManager()->getModuleDir($module, '/doc')))) {
+            return $path;
+        }
+        if (($path = $this->Config()->get('documentation', 'modules')) !== null) {
+            $path = str_replace('{module}', $module, $path);
+            if (is_dir($path)) {
+                return $path;
+            }
+        }
+        return null;
     }
 
     /**
@@ -30,7 +78,7 @@ class Doc_SearchController extends DocController
      *
      * @throws  Zend_Controller_Action_Exception    If Icinga Web 2's documentation is not available
      */
-    protected function getPath()
+    protected function getWebPath()
     {
         $path = Icinga::app()->getBaseDir('doc');
         if (is_dir($path)) {

From 6f1fdad9c27e55fe88f71ebce9868910238a1c82 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 13:27:04 +0100
Subject: [PATCH 0612/2920] doc/lib: Add CSS for highlighting search results

refs #6630
---
 modules/doc/public/css/module.less | 34 ++++++------------------------
 1 file changed, 7 insertions(+), 27 deletions(-)

diff --git a/modules/doc/public/css/module.less b/modules/doc/public/css/module.less
index 1705129d5..1221efb96 100644
--- a/modules/doc/public/css/module.less
+++ b/modules/doc/public/css/module.less
@@ -77,7 +77,6 @@ thead {
     .uppercase;
     .bold;
   }
-  position: sticky;
   border-bottom: 0.25rem solid @icinga;
 }
 
@@ -105,31 +104,12 @@ pre > code {
   .box-shadow;
 }
 
-div.chapter > ul.navigation {
+ul.toc {
   margin: 0;
-  padding: 0.4em;
-  text-align: center;
-  background-color: #888;
-
-  li {
-    list-style: none;
-    display: inline;
-    margin: 0.2em;
-    padding: 0;
-
-    a {
-      color: #fff;
-      text-decoration: none;
-    }
-
-    &.prev {
-      padding-right: 0.6em;
-      border-right: 2px solid #fff;
-    }
-
-    &.next {
-      padding-left: 0.6em;
-      border-left: 2px solid #fff;
-    }
-  }
+  padding: 0 0 0 1em;
+}
+
+.search-highlight {
+  color: #FBE012;
+  background: @icinga;
 }

From 195aa581cb75503c74008dfb44ea894665500478 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 13:48:23 +0100
Subject: [PATCH 0613/2920] doc/lib: Fix that highlighting a search messes up
 the text around the match

refs #6630
---
 modules/doc/library/Doc/SectionRenderer.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/doc/library/Doc/SectionRenderer.php b/modules/doc/library/Doc/SectionRenderer.php
index ee37c2a28..4e8678c3a 100644
--- a/modules/doc/library/Doc/SectionRenderer.php
+++ b/modules/doc/library/Doc/SectionRenderer.php
@@ -141,16 +141,15 @@ class SectionRenderer extends Renderer
             $matches = $match->getMatches();
             ksort($matches);
             $offset = 0;
-            $parentNode = $node->parentNode;
-            /** @type \DOMElement $parentNode */
-            $parentNode->removeChild($node);
+            $fragment = $doc->createDocumentFragment();
             foreach ($matches as $position => $match) {
-                $parentNode->appendChild($doc->createTextNode(substr($text, $offset, $position - $offset)));
-                $parentNode->appendChild($doc->createElement('span', $match))
-                    ->setAttribute('class', DocSearchMatch::HIGHLIGHT_CSS_CLASS);
+                    $fragment->appendChild($doc->createTextNode(substr($text, $offset, $position - $offset)));
+                    $fragment->appendChild($doc->createElement('span', $match))
+                        ->setAttribute('class', DocSearchMatch::HIGHLIGHT_CSS_CLASS);
                 $offset = $position + strlen($match);
             }
-            $parentNode->appendChild($doc->createTextNode(substr($text, $offset)));
+            $fragment->appendChild($doc->createTextNode(substr($text, $offset)));
+            $node->parentNode->replaceChild($fragment, $node);
         }
         return $doc->saveHTML();
     }

From f33b6a918cb34266ed6e7cd0fe17ae221f855887 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 13:58:06 +0100
Subject: [PATCH 0614/2920] doc/lib: Remove unused view scripts

---
 modules/doc/application/views/scripts/module/chapter.phtml | 3 ---
 modules/doc/application/views/scripts/module/toc.phtml     | 6 ------
 2 files changed, 9 deletions(-)
 delete mode 100644 modules/doc/application/views/scripts/module/chapter.phtml
 delete mode 100644 modules/doc/application/views/scripts/module/toc.phtml

diff --git a/modules/doc/application/views/scripts/module/chapter.phtml b/modules/doc/application/views/scripts/module/chapter.phtml
deleted file mode 100644
index 6fe0d8d27..000000000
--- a/modules/doc/application/views/scripts/module/chapter.phtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="chapter">
-    <?= /** @type \Icinga\Module\Doc\SectionRenderer $section */ $section ?>
-</div>
diff --git a/modules/doc/application/views/scripts/module/toc.phtml b/modules/doc/application/views/scripts/module/toc.phtml
deleted file mode 100644
index ce1b3da29..000000000
--- a/modules/doc/application/views/scripts/module/toc.phtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="controls">
-    <h1><?= /** @type string $title */ $title ?></h1>
-</div>
-<div class="content toc">
-    <?= /** @type \Icinga\Module\Doc\TocRenderer $toc */ $toc ?>
-</div>

From 27c53a315f487c35a4e6861958a473a0b972fb60 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 13:58:22 +0100
Subject: [PATCH 0615/2920] doc/lib: Add missing search view script

refs #6630
---
 .../doc/application/views/scripts/search/index.phtml  | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 modules/doc/application/views/scripts/search/index.phtml

diff --git a/modules/doc/application/views/scripts/search/index.phtml b/modules/doc/application/views/scripts/search/index.phtml
new file mode 100644
index 000000000..b60146fbb
--- /dev/null
+++ b/modules/doc/application/views/scripts/search/index.phtml
@@ -0,0 +1,11 @@
+<div class="controls">
+    <?= /** @type \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton() ?>
+</div>
+<div class="content">
+    <?php foreach (/** @type \Icinga\Module\Doc\Search\DocSearchRenderer[] $searches */ $searches as $title => $search): ?>
+        <?php if (! $search->isEmpty()): ?>
+            <h2><?= $this->escape($title) ?></h2>
+            <?= $search ?>
+        <?php endif ?>
+    <?php endforeach ?>
+</div>

From e26154e88accf714b52882bdcba4a71e0308f4af Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 13:58:39 +0100
Subject: [PATCH 0616/2920] doc/lib: Remove unused less mixins

---
 modules/doc/public/css/module.less | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/modules/doc/public/css/module.less b/modules/doc/public/css/module.less
index 1221efb96..2bb5a44ff 100644
--- a/modules/doc/public/css/module.less
+++ b/modules/doc/public/css/module.less
@@ -1,9 +1,5 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-div.chapter {
-  padding-left: 5px;
-}
-
 .uppercase {
   text-transform: uppercase;
 }
@@ -22,18 +18,6 @@ div.chapter {
   background: linear-gradient(to bottom, @a 0%, @b 100%);
 }
 
-.box-shadow(@x: 3px; @y: 3px; @blur: 2px; @spread: 0px; @color: rgba(45, 45, 45, 0.75)) {
-  -webkit-box-shadow: @arguments;
-  -moz-box-shadow: @arguments;
-  box-shadow: @arguments;
-}
-
-.round-corners {
-  -moz-border-radius: 0.2em;
-  -webkit-border-radius: 0.2em;
-  border-radius: 0.2em;
-}
-
 table {
   // Reset
   border-collapse: collapse;

From 16d388f4e3286a9c3aa55d9a5c0fec3e81b99390 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 13:58:55 +0100
Subject: [PATCH 0617/2920] doc/lib: Use CSS classes controls and content in
 the view scripts

---
 .../application/views/scripts/chapter.phtml   |  5 +++-
 .../views/scripts/index/index.phtml           | 13 ++++++----
 .../views/scripts/module/index.phtml          | 25 +++++++++++--------
 .../doc/application/views/scripts/toc.phtml   |  3 ++-
 4 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/modules/doc/application/views/scripts/chapter.phtml b/modules/doc/application/views/scripts/chapter.phtml
index 6fe0d8d27..4a5af6a25 100644
--- a/modules/doc/application/views/scripts/chapter.phtml
+++ b/modules/doc/application/views/scripts/chapter.phtml
@@ -1,3 +1,6 @@
-<div class="chapter">
+<div class="controls">
+    <?= /** @type \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton() ?>
+</div>
+<div class="content">
     <?= /** @type \Icinga\Module\Doc\SectionRenderer $section */ $section ?>
 </div>
diff --git a/modules/doc/application/views/scripts/index/index.phtml b/modules/doc/application/views/scripts/index/index.phtml
index e4218bee2..1e8139f10 100644
--- a/modules/doc/application/views/scripts/index/index.phtml
+++ b/modules/doc/application/views/scripts/index/index.phtml
@@ -1,6 +1,9 @@
 <div class="controls"></div>
-<h1><?= $this->translate('Available documentations'); ?></h1>
-<ul>
-    <li><a href="<?= $this->href('doc/icingaweb/toc'); ?>">Icinga Web 2</a></li>
-    <li><a href="<?= $this->href('doc/module/'); ?>"><?= $this->translate('Module documentations'); ?></a></li>
-</ul>
+    <?= /** @type \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton() ?>
+    <h1><?= $this->translate('Available documentations') ?></h1>
+<div class="content">
+    <ul>
+        <li><a href="<?= $this->href('doc/icingaweb/toc') ?>">Icinga Web 2</a></li>
+        <li><a href="<?= $this->href('doc/module/') ?>"><?= $this->translate('Module documentations') ?></a></li>
+    </ul>
+</div>
diff --git a/modules/doc/application/views/scripts/module/index.phtml b/modules/doc/application/views/scripts/module/index.phtml
index cc184016f..0d8350f48 100644
--- a/modules/doc/application/views/scripts/module/index.phtml
+++ b/modules/doc/application/views/scripts/module/index.phtml
@@ -1,10 +1,15 @@
-<h1><?= $this->translate('Module documentations'); ?></h1>
-<ul>
-    <?php foreach ($modules as $module): ?>
-        <li>
-            <a href="<?= $this->getHelper('Url')->url(array('moduleName' => $module), 'doc/module/toc', false, false); ?>">
-                <?= $module ?>
-            </a>
-        </li>
-    <?php endforeach ?>
-</ul>
+<div class="controls">
+    <?= /** @type \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton() ?>
+    <h1><?= $this->translate('Module documentations') ?></h1>
+</div>
+<div class="content">
+    <ul>
+        <?php foreach ($modules as $module): ?>
+            <li>
+                <a href="<?= $this->getHelper('Url')->url(array('moduleName' => $module), 'doc/module/toc', false, false) ?>">
+                    <?= $module ?>
+                </a>
+            </li>
+        <?php endforeach ?>
+    </ul>
+</div>
diff --git a/modules/doc/application/views/scripts/toc.phtml b/modules/doc/application/views/scripts/toc.phtml
index ce1b3da29..175f4d3c3 100644
--- a/modules/doc/application/views/scripts/toc.phtml
+++ b/modules/doc/application/views/scripts/toc.phtml
@@ -1,6 +1,7 @@
 <div class="controls">
+    <?= /** @type \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton() ?>
     <h1><?= /** @type string $title */ $title ?></h1>
 </div>
-<div class="content toc">
+<div class="content">
     <?= /** @type \Icinga\Module\Doc\TocRenderer $toc */ $toc ?>
 </div>

From 96ea02e59ff7dbde92656fb0bd87616767751878 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 14:01:19 +0100
Subject: [PATCH 0618/2920] doc/lib: Rename SectionRenderer to
 DocSectionRenderer

refs #6630
---
 modules/doc/application/views/scripts/chapter.phtml             | 2 +-
 modules/doc/library/Doc/DocController.php                       | 2 +-
 .../library/Doc/{SectionRenderer.php => DocSectionRenderer.php} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename modules/doc/library/Doc/{SectionRenderer.php => DocSectionRenderer.php} (99%)

diff --git a/modules/doc/application/views/scripts/chapter.phtml b/modules/doc/application/views/scripts/chapter.phtml
index 4a5af6a25..4341967ba 100644
--- a/modules/doc/application/views/scripts/chapter.phtml
+++ b/modules/doc/application/views/scripts/chapter.phtml
@@ -2,5 +2,5 @@
     <?= /** @type \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <?= /** @type \Icinga\Module\Doc\SectionRenderer $section */ $section ?>
+    <?= /** @type \Icinga\Module\Doc\DocSectionRenderer $section */ $section ?>
 </div>
diff --git a/modules/doc/library/Doc/DocController.php b/modules/doc/library/Doc/DocController.php
index 0d73ae127..a003b911b 100644
--- a/modules/doc/library/Doc/DocController.php
+++ b/modules/doc/library/Doc/DocController.php
@@ -18,7 +18,7 @@ class DocController extends ModuleActionController
     protected function renderChapter($path, $chapter, $url, array $urlParams = array())
     {
         $parser = new DocParser($path);
-        $section = new SectionRenderer($parser->getDocTree(), SectionRenderer::decodeUrlParam($chapter));
+        $section = new DocSectionRenderer($parser->getDocTree(), DocSectionRenderer::decodeUrlParam($chapter));
         $this->view->section = $section
             ->setUrl($url)
             ->setUrlParams($urlParams)
diff --git a/modules/doc/library/Doc/SectionRenderer.php b/modules/doc/library/Doc/DocSectionRenderer.php
similarity index 99%
rename from modules/doc/library/Doc/SectionRenderer.php
rename to modules/doc/library/Doc/DocSectionRenderer.php
index 4e8678c3a..a4b71df4d 100644
--- a/modules/doc/library/Doc/SectionRenderer.php
+++ b/modules/doc/library/Doc/DocSectionRenderer.php
@@ -20,7 +20,7 @@ use Icinga\Web\View;
 /**
  * Section renderer
  */
-class SectionRenderer extends Renderer
+class DocSectionRenderer extends Renderer
 {
     /**
      * Content to render

From 3aff91d2044c5fc0de2695403f632aeffd865c38 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 14:02:12 +0100
Subject: [PATCH 0619/2920] doc/lib: Rename TocRenderer to DocTocRenderer

refs #6630
---
 modules/doc/application/views/scripts/toc.phtml                 | 2 +-
 modules/doc/library/Doc/DocController.php                       | 2 +-
 modules/doc/library/Doc/{TocRenderer.php => DocTocRenderer.php} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename modules/doc/library/Doc/{TocRenderer.php => DocTocRenderer.php} (98%)

diff --git a/modules/doc/application/views/scripts/toc.phtml b/modules/doc/application/views/scripts/toc.phtml
index 175f4d3c3..09e3adf51 100644
--- a/modules/doc/application/views/scripts/toc.phtml
+++ b/modules/doc/application/views/scripts/toc.phtml
@@ -3,5 +3,5 @@
     <h1><?= /** @type string $title */ $title ?></h1>
 </div>
 <div class="content">
-    <?= /** @type \Icinga\Module\Doc\TocRenderer $toc */ $toc ?>
+    <?= /** @type \Icinga\Module\Doc\DocTocRenderer $toc */ $toc ?>
 </div>
diff --git a/modules/doc/library/Doc/DocController.php b/modules/doc/library/Doc/DocController.php
index a003b911b..5c9ebcfec 100644
--- a/modules/doc/library/Doc/DocController.php
+++ b/modules/doc/library/Doc/DocController.php
@@ -38,7 +38,7 @@ class DocController extends ModuleActionController
     protected function renderToc($path, $name, $url, array $urlParams = array())
     {
         $parser = new DocParser($path);
-        $toc = new TocRenderer($parser->getDocTree()->getIterator());
+        $toc = new DocTocRenderer($parser->getDocTree()->getIterator());
         $this->view->toc = $toc
             ->setUrl($url)
             ->setUrlParams($urlParams);
diff --git a/modules/doc/library/Doc/TocRenderer.php b/modules/doc/library/Doc/DocTocRenderer.php
similarity index 98%
rename from modules/doc/library/Doc/TocRenderer.php
rename to modules/doc/library/Doc/DocTocRenderer.php
index 019ca2d9f..7e4dd636b 100644
--- a/modules/doc/library/Doc/TocRenderer.php
+++ b/modules/doc/library/Doc/DocTocRenderer.php
@@ -14,7 +14,7 @@ use RecursiveIteratorIterator;
  *     {@inheritdoc}
  * }
  */
-class TocRenderer extends Renderer
+class DocTocRenderer extends Renderer
 {
     /**
      * Content to render

From 924e67f2aa20794d0940812936996489b0bf29dd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 14:05:18 +0100
Subject: [PATCH 0620/2920] doc/lib: Rename Renderer to DocRenderer

refs #6630
---
 modules/doc/library/Doc/{Renderer.php => DocRenderer.php} | 2 +-
 modules/doc/library/Doc/DocSectionRenderer.php            | 4 ++--
 modules/doc/library/Doc/DocTocRenderer.php                | 2 +-
 modules/doc/library/Doc/Search/DocSearchRenderer.php      | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename modules/doc/library/Doc/{Renderer.php => DocRenderer.php} (98%)

diff --git a/modules/doc/library/Doc/Renderer.php b/modules/doc/library/Doc/DocRenderer.php
similarity index 98%
rename from modules/doc/library/Doc/Renderer.php
rename to modules/doc/library/Doc/DocRenderer.php
index 79a223e22..bebf06465 100644
--- a/modules/doc/library/Doc/Renderer.php
+++ b/modules/doc/library/Doc/DocRenderer.php
@@ -11,7 +11,7 @@ use Icinga\Web\View;
 /**
  * Base class for toc and section renderer
  */
-abstract class Renderer extends RecursiveIteratorIterator
+abstract class DocRenderer extends RecursiveIteratorIterator
 {
     /**
      * URL to replace links with
diff --git a/modules/doc/library/Doc/DocSectionRenderer.php b/modules/doc/library/Doc/DocSectionRenderer.php
index a4b71df4d..1665468c1 100644
--- a/modules/doc/library/Doc/DocSectionRenderer.php
+++ b/modules/doc/library/Doc/DocSectionRenderer.php
@@ -20,7 +20,7 @@ use Icinga\Web\View;
 /**
  * Section renderer
  */
-class DocSectionRenderer extends Renderer
+class DocSectionRenderer extends DocRenderer
 {
     /**
      * Content to render
@@ -245,7 +245,7 @@ class DocSectionRenderer extends Renderer
             }
             $this->content[] = sprintf(
                 '<a name="%1$s"></a><h%2$d>%3$s</h%2$d>',
-                Renderer::encodeAnchor($section->getId()),
+                static::encodeAnchor($section->getId()),
                 $section->getLevel(),
                 $title
             );
diff --git a/modules/doc/library/Doc/DocTocRenderer.php b/modules/doc/library/Doc/DocTocRenderer.php
index 7e4dd636b..0c4bda6da 100644
--- a/modules/doc/library/Doc/DocTocRenderer.php
+++ b/modules/doc/library/Doc/DocTocRenderer.php
@@ -14,7 +14,7 @@ use RecursiveIteratorIterator;
  *     {@inheritdoc}
  * }
  */
-class DocTocRenderer extends Renderer
+class DocTocRenderer extends DocRenderer
 {
     /**
      * Content to render
diff --git a/modules/doc/library/Doc/Search/DocSearchRenderer.php b/modules/doc/library/Doc/Search/DocSearchRenderer.php
index 8d04cd928..05fc04bfc 100644
--- a/modules/doc/library/Doc/Search/DocSearchRenderer.php
+++ b/modules/doc/library/Doc/Search/DocSearchRenderer.php
@@ -4,7 +4,7 @@
 namespace Icinga\Module\Doc\Search;
 
 use RecursiveIteratorIterator;
-use Icinga\Module\Doc\Renderer;
+use Icinga\Module\Doc\DocRenderer;
 
 /**
  * Renderer for doc searches
@@ -13,7 +13,7 @@ use Icinga\Module\Doc\Renderer;
  *     @{inheritdoc}
  * }
  */
-class DocSearchRenderer extends Renderer
+class DocSearchRenderer extends DocRenderer
 {
     /**
      * The content to render

From 6c6c41a4f2dac01d2b13aecf55df1e621f84740f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 14:05:32 +0100
Subject: [PATCH 0621/2920] doc/lib: Remove controls from the search view
 script

Otherwise the dashboard is broken when searching.

refs #6630
---
 modules/doc/application/views/scripts/search/index.phtml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/doc/application/views/scripts/search/index.phtml b/modules/doc/application/views/scripts/search/index.phtml
index b60146fbb..df488c2b5 100644
--- a/modules/doc/application/views/scripts/search/index.phtml
+++ b/modules/doc/application/views/scripts/search/index.phtml
@@ -1,6 +1,3 @@
-<div class="controls">
-    <?= /** @type \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton() ?>
-</div>
 <div class="content">
     <?php foreach (/** @type \Icinga\Module\Doc\Search\DocSearchRenderer[] $searches */ $searches as $title => $search): ?>
         <?php if (! $search->isEmpty()): ?>

From d1aed4f773f778aa597809b1446bfd90b4770a9b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 14:06:41 +0100
Subject: [PATCH 0622/2920] doc/lib: Rename SectionFilterIterator to
 DocSectionFilterIterator

refs #6630
---
 .../{SectionFilterIterator.php => DocSectionFilterIterator.php} | 2 +-
 modules/doc/library/Doc/DocSectionRenderer.php                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename modules/doc/library/Doc/{SectionFilterIterator.php => DocSectionFilterIterator.php} (95%)

diff --git a/modules/doc/library/Doc/SectionFilterIterator.php b/modules/doc/library/Doc/DocSectionFilterIterator.php
similarity index 95%
rename from modules/doc/library/Doc/SectionFilterIterator.php
rename to modules/doc/library/Doc/DocSectionFilterIterator.php
index 77171a5c8..1087d1584 100644
--- a/modules/doc/library/Doc/SectionFilterIterator.php
+++ b/modules/doc/library/Doc/DocSectionFilterIterator.php
@@ -14,7 +14,7 @@ use Icinga\Data\Tree\TreeNodeIterator;
  *     {@inheritdoc}
  * }
  */
-class SectionFilterIterator extends RecursiveFilterIterator implements Countable
+class DocSectionFilterIterator extends RecursiveFilterIterator implements Countable
 {
     /**
      * Chapter to filter for
diff --git a/modules/doc/library/Doc/DocSectionRenderer.php b/modules/doc/library/Doc/DocSectionRenderer.php
index 1665468c1..f03474b4a 100644
--- a/modules/doc/library/Doc/DocSectionRenderer.php
+++ b/modules/doc/library/Doc/DocSectionRenderer.php
@@ -61,7 +61,7 @@ class DocSectionRenderer extends DocRenderer
     public function __construct(SimpleTree $tree, $chapter = null)
     {
         if ($chapter !== null) {
-            $filter = new SectionFilterIterator($tree->getIterator(), $chapter);
+            $filter = new DocSectionFilterIterator($tree->getIterator(), $chapter);
             if ($filter->isEmpty()) {
                 throw new ChapterNotFoundException(
                     mt('doc', 'Chapter %s not found'), $chapter

From 03100b8c5972539ac680400f837b571b6205bf52 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 14:10:12 +0100
Subject: [PATCH 0623/2920] doc/lib: Move all renderer classes to the renderer
 namespace

refs #6630
---
 modules/doc/application/controllers/SearchController.php     | 2 +-
 modules/doc/library/Doc/DocController.php                    | 2 ++
 modules/doc/library/Doc/{ => Renderer}/DocRenderer.php       | 2 +-
 .../library/Doc/{Search => Renderer}/DocSearchRenderer.php   | 5 +++--
 .../doc/library/Doc/{ => Renderer}/DocSectionRenderer.php    | 3 ++-
 modules/doc/library/Doc/{ => Renderer}/DocTocRenderer.php    | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)
 rename modules/doc/library/Doc/{ => Renderer}/DocRenderer.php (98%)
 rename modules/doc/library/Doc/{Search => Renderer}/DocSearchRenderer.php (96%)
 rename modules/doc/library/Doc/{ => Renderer}/DocSectionRenderer.php (98%)
 rename modules/doc/library/Doc/{ => Renderer}/DocTocRenderer.php (98%)

diff --git a/modules/doc/application/controllers/SearchController.php b/modules/doc/application/controllers/SearchController.php
index 2cfb04483..a2e90cd59 100644
--- a/modules/doc/application/controllers/SearchController.php
+++ b/modules/doc/application/controllers/SearchController.php
@@ -8,7 +8,7 @@ use Icinga\Module\Doc\DocParser;
 use Icinga\Module\Doc\Exception\DocException;
 use Icinga\Module\Doc\Search\DocSearch;
 use Icinga\Module\Doc\Search\DocSearchIterator;
-use Icinga\Module\Doc\Search\DocSearchRenderer;
+use Icinga\Module\Doc\Renderer\DocSearchRenderer;
 
 class Doc_SearchController extends DocController
 {
diff --git a/modules/doc/library/Doc/DocController.php b/modules/doc/library/Doc/DocController.php
index 5c9ebcfec..f555c2442 100644
--- a/modules/doc/library/Doc/DocController.php
+++ b/modules/doc/library/Doc/DocController.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Module\Doc;
 
+use Icinga\Module\Doc\Renderer\DocSectionRenderer;
+use Icinga\Module\Doc\Renderer\DocTocRenderer;
 use Icinga\Web\Controller\ModuleActionController;
 
 class DocController extends ModuleActionController
diff --git a/modules/doc/library/Doc/DocRenderer.php b/modules/doc/library/Doc/Renderer/DocRenderer.php
similarity index 98%
rename from modules/doc/library/Doc/DocRenderer.php
rename to modules/doc/library/Doc/Renderer/DocRenderer.php
index bebf06465..4d7ddd0ed 100644
--- a/modules/doc/library/Doc/DocRenderer.php
+++ b/modules/doc/library/Doc/Renderer/DocRenderer.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Module\Doc;
+namespace Icinga\Module\Doc\Renderer;
 
 use Exception;
 use RecursiveIteratorIterator;
diff --git a/modules/doc/library/Doc/Search/DocSearchRenderer.php b/modules/doc/library/Doc/Renderer/DocSearchRenderer.php
similarity index 96%
rename from modules/doc/library/Doc/Search/DocSearchRenderer.php
rename to modules/doc/library/Doc/Renderer/DocSearchRenderer.php
index 05fc04bfc..aa5a9f892 100644
--- a/modules/doc/library/Doc/Search/DocSearchRenderer.php
+++ b/modules/doc/library/Doc/Renderer/DocSearchRenderer.php
@@ -1,10 +1,11 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Module\Doc\Search;
+namespace Icinga\Module\Doc\Renderer;
 
 use RecursiveIteratorIterator;
-use Icinga\Module\Doc\DocRenderer;
+use Icinga\Module\Doc\Search\DocSearchIterator;
+use Icinga\Module\Doc\Search\DocSearchMatch;
 
 /**
  * Renderer for doc searches
diff --git a/modules/doc/library/Doc/DocSectionRenderer.php b/modules/doc/library/Doc/Renderer/DocSectionRenderer.php
similarity index 98%
rename from modules/doc/library/Doc/DocSectionRenderer.php
rename to modules/doc/library/Doc/Renderer/DocSectionRenderer.php
index f03474b4a..668e2fb56 100644
--- a/modules/doc/library/Doc/DocSectionRenderer.php
+++ b/modules/doc/library/Doc/Renderer/DocSectionRenderer.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Module\Doc;
+namespace Icinga\Module\Doc\Renderer;
 
 require_once 'Parsedown/Parsedown.php';
 
@@ -11,6 +11,7 @@ use Parsedown;
 use RecursiveIteratorIterator;
 use Icinga\Data\Tree\SimpleTree;
 use Icinga\Module\Doc\Exception\ChapterNotFoundException;
+use Icinga\Module\Doc\DocSectionFilterIterator;
 use Icinga\Module\Doc\Search\DocSearch;
 use Icinga\Module\Doc\Search\DocSearchMatch;
 use Icinga\Web\Dom\DomNodeIterator;
diff --git a/modules/doc/library/Doc/DocTocRenderer.php b/modules/doc/library/Doc/Renderer/DocTocRenderer.php
similarity index 98%
rename from modules/doc/library/Doc/DocTocRenderer.php
rename to modules/doc/library/Doc/Renderer/DocTocRenderer.php
index 0c4bda6da..ed65a1e0b 100644
--- a/modules/doc/library/Doc/DocTocRenderer.php
+++ b/modules/doc/library/Doc/Renderer/DocTocRenderer.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Module\Doc;
+namespace Icinga\Module\Doc\Renderer;
 
 use Icinga\Web\View;
 use Icinga\Data\Tree\TreeNodeIterator;

From ded045e32cbf7a2b6a90e8bcbc55037137cbdeef Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 15:14:40 +0100
Subject: [PATCH 0624/2920] lib: Fix PDF rendering when using a custom set view
 script

---
 library/Icinga/File/Pdf.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/File/Pdf.php b/library/Icinga/File/Pdf.php
index 5ab6e7d4c..b71634f68 100644
--- a/library/Icinga/File/Pdf.php
+++ b/library/Icinga/File/Pdf.php
@@ -37,19 +37,22 @@ class Pdf extends DOMPDF
     public function renderControllerAction($controller)
     {
         $this->assertNoHeadersSent();
-
         ini_set('memory_limit', '384M');
         ini_set('max_execution_time', 300);
-
-        $request = $controller->getRequest();
+        $viewRenderer = $controller->getHelper('viewRenderer');
+        $controller->render(
+            $viewRenderer->getScriptAction(),
+            $viewRenderer->getResponseSegment(),
+            $viewRenderer->getNoController()
+        );
         $layout = $controller->getHelper('layout')->setLayout('pdf');
-        $controller->render();
         $layout->content = $controller->getResponse();
         $html = $layout->render();
         $imgDir = Url::fromPath('img');
         $html = preg_replace('~src="' . $imgDir . '/~', 'src="' . Icinga::app()->getBootstrapDirectory() . '/img/', $html);
         $this->load_html($html);
         $this->render();
+        $request = $controller->getRequest();
         $this->stream(
             sprintf(
                 '%s-%s-%d.pdf',

From 97261cd8bd961684365da2abf30cf9f2fd01af8e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 15:15:18 +0100
Subject: [PATCH 0625/2920] lib: Do not setLayout('pdf') twice

---
 library/Icinga/Web/Controller/ActionController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 39ad397c7..f7a21c20e 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -402,7 +402,6 @@ class ActionController extends Zend_Controller_Action
         }
 
         if ($req->getParam('format') === 'pdf') {
-            $layout->setLayout('pdf');
             $this->shutdownSession();
             $this->sendAsPdf();
             exit;

From 57a0b0005ef33be708ffca69e652093990b02fed Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 15:15:37 +0100
Subject: [PATCH 0626/2920] doc/lib: Fix PDF rendering

refs #6630
---
 .../application/views/scripts/chapter.phtml   |  2 +-
 .../doc/application/views/scripts/pdf.phtml   | 10 ++++-----
 .../doc/application/views/scripts/toc.phtml   |  2 +-
 modules/doc/library/Doc/DocController.php     | 22 +++++++++----------
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/modules/doc/application/views/scripts/chapter.phtml b/modules/doc/application/views/scripts/chapter.phtml
index 4341967ba..eefe6f65f 100644
--- a/modules/doc/application/views/scripts/chapter.phtml
+++ b/modules/doc/application/views/scripts/chapter.phtml
@@ -2,5 +2,5 @@
     <?= /** @type \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <?= /** @type \Icinga\Module\Doc\DocSectionRenderer $section */ $section ?>
+    <?= /** @type \Icinga\Module\Doc\Renderer\DocSectionRenderer $section */ $section ?>
 </div>
diff --git a/modules/doc/application/views/scripts/pdf.phtml b/modules/doc/application/views/scripts/pdf.phtml
index 72d77f3c0..e76ded957 100644
--- a/modules/doc/application/views/scripts/pdf.phtml
+++ b/modules/doc/application/views/scripts/pdf.phtml
@@ -1,7 +1,5 @@
-<h1><?= $docName ?> <?= $this->translate('Documentation'); ?></h1>
-<div class="toc">
-    <?= $tocRenderer->render($this, $this->getHelper('Url')); ?>
-</div>
-<div class="chapter">
-    <?= $sectionRenderer->render($this, $this->getHelper('Url')); ?>
+<div class="content">
+    <h1><?= /** @type string $title */ $title ?></h1>
+    <?= /** @type \Icinga\Module\Doc\Renderer\DocTocRenderer $toc */ $toc ?>
+    <?= /** @type \Icinga\Module\Doc\Renderer\DocSectionRenderer $section */ $section ?>
 </div>
diff --git a/modules/doc/application/views/scripts/toc.phtml b/modules/doc/application/views/scripts/toc.phtml
index 09e3adf51..daec9b177 100644
--- a/modules/doc/application/views/scripts/toc.phtml
+++ b/modules/doc/application/views/scripts/toc.phtml
@@ -3,5 +3,5 @@
     <h1><?= /** @type string $title */ $title ?></h1>
 </div>
 <div class="content">
-    <?= /** @type \Icinga\Module\Doc\DocTocRenderer $toc */ $toc ?>
+    <?= /** @type \Icinga\Module\Doc\Renderer\DocTocRenderer $toc */ $toc ?>
 </div>
diff --git a/modules/doc/library/Doc/DocController.php b/modules/doc/library/Doc/DocController.php
index f555c2442..de02a3bae 100644
--- a/modules/doc/library/Doc/DocController.php
+++ b/modules/doc/library/Doc/DocController.php
@@ -45,7 +45,6 @@ class DocController extends ModuleActionController
             ->setUrl($url)
             ->setUrlParams($urlParams);
         $name = ucfirst($name);
-        $this->view->docName = $name;
         $this->view->title = sprintf($this->translate('%s Documentation'), $name);
         $this->render('toc', null, true);
     }
@@ -61,17 +60,16 @@ class DocController extends ModuleActionController
     protected function renderPdf($path, $name, $url, array $urlParams = array())
     {
         $parser = new DocParser($path);
-        $docTree = $parser->getDocTree();
-        $this->view->tocRenderer = new TocRenderer($docTree, $url, $urlParams);
-        $this->view->sectionRenderer = new SectionRenderer(
-            $docTree,
-            null,
-            null,
-            $url,
-            $urlParams
-        );
-        $this->view->docName = $name;
+        $toc = new DocTocRenderer($parser->getDocTree()->getIterator());
+        $this->view->toc = $toc
+            ->setUrl($url)
+            ->setUrlParams($urlParams);
+        $section = new DocSectionRenderer($parser->getDocTree());
+        $this->view->section = $section
+            ->setUrl($url)
+            ->setUrlParams($urlParams);
+        $this->view->title = sprintf($this->translate('%s Documentation'), $name);
         $this->_request->setParam('format', 'pdf');
-        $this->render('pdf', null, true);
+        $this->_helper->viewRenderer->setRender('pdf', null, true);
     }
 }

From 310201eb5b603c08e7debfdb20c612c2fd847394 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 15:51:31 +0100
Subject: [PATCH 0627/2920] doc/lib: Throw LogicException if text is added
 without having a heading

---
 modules/doc/library/Doc/DocParser.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/doc/library/Doc/DocParser.php b/modules/doc/library/Doc/DocParser.php
index 08ad5cf56..9077d3ef9 100644
--- a/modules/doc/library/Doc/DocParser.php
+++ b/modules/doc/library/Doc/DocParser.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Module\Doc;
 
+use LogicException;
 use SplStack;
 use Icinga\Data\Tree\SimpleTree;
 use Icinga\Exception\NotReadableError;
@@ -169,6 +170,9 @@ class DocParser
                     }
                     $stack->push($section);
                 } else {
+                    if ($stack->isEmpty()) {
+                        throw new LogicException('Heading required');
+                    }
                     $stack->top()->appendContent($line);
                 }
                 // Save last line for setext-style headers

From 53af279ec24d4272096d11ef77496fd59208ee2f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 15:52:08 +0100
Subject: [PATCH 0628/2920] doc/lib: Fix search criteria not splitting
 "complex" search strings correctly

refs #6630
---
 modules/doc/library/Doc/Search/DocSearch.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/doc/library/Doc/Search/DocSearch.php b/modules/doc/library/Doc/Search/DocSearch.php
index ab3a7cf64..36f249ed6 100644
--- a/modules/doc/library/Doc/Search/DocSearch.php
+++ b/modules/doc/library/Doc/Search/DocSearch.php
@@ -32,20 +32,24 @@ class DocSearch
         $this->input = $search = (string) $search;
         $criteria = array();
         if (preg_match_all('/"(?P<search>[^"]*)"/', $search, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
-            $unquoted = '';
+            $unquoted = array();
             $offset = 0;
             foreach ($matches as $match) {
                 $fullMatch = $match[0];
                 $searchMatch = $match['search'];
-                $unquoted .= substr($search, $offset, $fullMatch[1] - $offset);
-                $offset += $fullMatch[1] + strlen($fullMatch[0]);
+                $unquoted[] = substr($search, $offset, $fullMatch[1] - $offset);
+                $offset = $fullMatch[1] + strlen($fullMatch[0]);
                 if (strlen($searchMatch[0]) > 0) {
                     $criteria[] = $searchMatch[0];
                 }
             }
-            $search = $unquoted . substr($search, $offset);
+            $unquoted[] = substr($search, $offset);
+            $search = implode(' ', $unquoted);
         }
-        $this->search = array_unique(array_merge($criteria, array_filter(explode(' ', trim($search)))));
+        $this->search = array_map(
+            'strtolower',
+            array_unique(array_merge($criteria, array_filter(explode(' ', trim($search)))))
+        );
     }
 
     /**

From fdec27d8a1b670afed5f6983d41b58118bdb6dbb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 15:53:23 +0100
Subject: [PATCH 0629/2920] doc/lib: Remove DocSearchIterator::count()

refs #6630
---
 .../library/Doc/Search/DocSearchIterator.php  | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/modules/doc/library/Doc/Search/DocSearchIterator.php b/modules/doc/library/Doc/Search/DocSearchIterator.php
index f0a9a4967..66ccc8c37 100644
--- a/modules/doc/library/Doc/Search/DocSearchIterator.php
+++ b/modules/doc/library/Doc/Search/DocSearchIterator.php
@@ -3,8 +3,8 @@
 
 namespace Icinga\Module\Doc\Search;
 
-use Countable;
 use RecursiveFilterIterator;
+use RecursiveIteratorIterator;
 use Icinga\Data\Tree\TreeNodeIterator;
 
 /**
@@ -14,7 +14,7 @@ use Icinga\Data\Tree\TreeNodeIterator;
  *     {@inheritdoc}
  * }
  */
-class DocSearchIterator extends RecursiveFilterIterator implements Countable
+class DocSearchIterator extends RecursiveFilterIterator
 {
     /**
      * Search criteria
@@ -24,7 +24,7 @@ class DocSearchIterator extends RecursiveFilterIterator implements Countable
     protected $search;
 
     /**
-     * Search matches
+     * Current search matches
      *
      * @type DocSearchMatch[]|null
      */
@@ -92,20 +92,6 @@ class DocSearchIterator extends RecursiveFilterIterator implements Countable
         return new static($this->getInnerIterator()->getChildren(), $this->search);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function count()
-    {
-        $count = 0;
-        foreach ($this as $section) {
-            if ($this->getMatches() !== null) {
-                ++$count;
-            }
-        }
-        return $count;
-    }
-
     /**
      * Whether the search did not yield any match
      *
@@ -113,11 +99,17 @@ class DocSearchIterator extends RecursiveFilterIterator implements Countable
      */
     public function isEmpty()
     {
-        return $this->count() === 0;
+        $iter = new RecursiveIteratorIterator($this, RecursiveIteratorIterator::SELF_FIRST);
+        foreach ($iter as $section) {
+            if ($iter->getInnerIterator()->getMatches() !== null) {
+                return false;
+            }
+        }
+        return true;
     }
 
     /**
-     * Get matches
+     * Get current matches
      *
      * @return DocSearchMatch[]|null
      */

From 8e7faa8170513a100e1a1d9a6acf758fa2dcaf25 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Feb 2015 15:53:41 +0100
Subject: [PATCH 0630/2920] doc/lib: Use <h1> for search headings

refs #6630
---
 modules/doc/application/views/scripts/search/index.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/doc/application/views/scripts/search/index.phtml b/modules/doc/application/views/scripts/search/index.phtml
index df488c2b5..272ab3a79 100644
--- a/modules/doc/application/views/scripts/search/index.phtml
+++ b/modules/doc/application/views/scripts/search/index.phtml
@@ -1,7 +1,7 @@
 <div class="content">
-    <?php foreach (/** @type \Icinga\Module\Doc\Search\DocSearchRenderer[] $searches */ $searches as $title => $search): ?>
+    <?php foreach (/** @type \Icinga\Module\Doc\Renderer\DocSearchRenderer[] $searches */ $searches as $title => $search): ?>
         <?php if (! $search->isEmpty()): ?>
-            <h2><?= $this->escape($title) ?></h2>
+            <h1><?= $this->escape($title) ?></h1>
             <?= $search ?>
         <?php endif ?>
     <?php endforeach ?>

From 60ec1157797623acfeb8e1b67d3d1cc0906e867b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 11 Feb 2015 08:46:57 +0100
Subject: [PATCH 0631/2920] WCAG/1.4.1: Fix example for text cues on a form's
 required elements

The input element must be wrapped by <label> either or the <label> tag
needs a "for=id" attribute with the id of the respective input.

refs #7934
---
 .../text-cue-for-required-form-control-labels.html              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/accessibility/text-cue-for-required-form-control-labels.html b/doc/accessibility/text-cue-for-required-form-control-labels.html
index b9e624208..1dd38eb8a 100644
--- a/doc/accessibility/text-cue-for-required-form-control-labels.html
+++ b/doc/accessibility/text-cue-for-required-form-control-labels.html
@@ -28,8 +28,8 @@
             Enter some text
             <span class="required-indicator" aria-hidden="true"></span>
             <span class="sr-only"> (required)</span>
+            <input type="text" name="some_text" value="" aria-required="true" required>
         </label>
-        <input type="text" name="some_text" value="" aria-required="true" required>
         <input type="submit" name="btn_submit" value="Submit">
     </form>
 </body>

From c31cab39cd30f196186beb6aa3eb7435e80ac930 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 11 Feb 2015 08:46:57 +0100
Subject: [PATCH 0632/2920] WCAG/1.4.1: Fix example for text cues on a form's
 required elements

The input element must be wrapped by <label> either or the <label> tag
needs a "for=id" attribute with the id of the respective input.

refs #7934
---
 .../text-cue-for-required-form-control-labels.html              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/accessibility/text-cue-for-required-form-control-labels.html b/doc/accessibility/text-cue-for-required-form-control-labels.html
index b9e624208..1dd38eb8a 100644
--- a/doc/accessibility/text-cue-for-required-form-control-labels.html
+++ b/doc/accessibility/text-cue-for-required-form-control-labels.html
@@ -28,8 +28,8 @@
             Enter some text
             <span class="required-indicator" aria-hidden="true"></span>
             <span class="sr-only"> (required)</span>
+            <input type="text" name="some_text" value="" aria-required="true" required>
         </label>
-        <input type="text" name="some_text" value="" aria-required="true" required>
         <input type="submit" name="btn_submit" value="Submit">
     </form>
 </body>

From eb3063e36dbdbc782e9d450aecdff3a1d719a549 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 11 Feb 2015 09:50:17 +0100
Subject: [PATCH 0633/2920] Form: Add prefix path for custom form validators

refs #8415
---
 library/Icinga/Web/Form.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 606a74f98..dc6afec07 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -521,6 +521,14 @@ class Form extends Zend_Form
 
         $el = parent::createElement($type, $name, $options);
 
+        $el->addPrefixPaths(array(
+            array(
+                'prefix'    => 'Icinga\\Web\\Form\\Validator\\',
+                'path'      => Icinga::app()->getLibraryDir('Icinga/Web/Form/Validator'),
+                'type'      => $el::VALIDATE
+            )
+        ));
+
         if (($description = $el->getDescription()) !== null && ($label = $el->getDecorator('label')) !== false) {
             $label->setOptions(array(
                 'title' => $description,

From 6c70a53309e90938dfd92acdb0d44c8f9cc5310b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 11 Feb 2015 09:51:28 +0100
Subject: [PATCH 0634/2920] Avoid to instantiate  custom form element
 validators directly

refs #8415
---
 application/forms/Config/General/LoggingConfigForm.php | 3 +--
 application/forms/Config/Resource/FileResourceForm.php | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php
index de757eb6e..7039d7b7f 100644
--- a/application/forms/Config/General/LoggingConfigForm.php
+++ b/application/forms/Config/General/LoggingConfigForm.php
@@ -5,7 +5,6 @@ namespace Icinga\Forms\Config\General;
 
 use Icinga\Application\Logger;
 use Icinga\Web\Form;
-use Icinga\Web\Form\Validator\WritablePathValidator;
 
 class LoggingConfigForm extends Form
 {
@@ -107,7 +106,7 @@ class LoggingConfigForm extends Form
                     'label'         => $this->translate('File path'),
                     'description'   => $this->translate('The full path to the log file to write messages to.'),
                     'value'         => '/var/log/icingaweb2/icingaweb2.log',
-                    'validators'    => array(new WritablePathValidator())
+                    'validators'    => array('WritablePathValidator')
                 )
             );
         }
diff --git a/application/forms/Config/Resource/FileResourceForm.php b/application/forms/Config/Resource/FileResourceForm.php
index c1ccd137c..b1bb0c6ae 100644
--- a/application/forms/Config/Resource/FileResourceForm.php
+++ b/application/forms/Config/Resource/FileResourceForm.php
@@ -4,7 +4,6 @@
 namespace Icinga\Forms\Config\Resource;
 
 use Icinga\Web\Form;
-use Icinga\Web\Form\Validator\ReadablePathValidator;
 
 /**
  * Form class for adding/modifying file resources
@@ -40,7 +39,7 @@ class FileResourceForm extends Form
                 'required'      => true,
                 'label'         => $this->translate('Filepath'),
                 'description'   => $this->translate('The filename to fetch information from'),
-                'validators'    => array(new ReadablePathValidator())
+                'validators'    => array('ReadablePathValidator')
             )
         );
         $this->addElement(

From c06f015210220e3866b8c8d551f0d3bf54a2ce2f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 12 Feb 2015 08:54:56 +0100
Subject: [PATCH 0635/2920] Ensure that all utilized form validators can be
 translated

refs #8415
---
 .../Authentication/ExternalBackendForm.php      | 17 +++++++++++------
 .../forms/Config/General/LoggingConfigForm.php  |  4 +++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/application/forms/Config/Authentication/ExternalBackendForm.php b/application/forms/Config/Authentication/ExternalBackendForm.php
index db643b5ff..e25661596 100644
--- a/application/forms/Config/Authentication/ExternalBackendForm.php
+++ b/application/forms/Config/Authentication/ExternalBackendForm.php
@@ -40,13 +40,22 @@ class ExternalBackendForm extends Form
                         array(
                             'pattern'  => '/^[^\\[\\]:]+$/',
                             'messages' => array(
-                                'regexNotMatch' => 'The backend name cannot contain \'[\', \']\' or \':\'.'
+                                'regexNotMatch' => $this->translate(
+                                    'The backend name cannot contain \'[\', \']\' or \':\'.'
+                                )
                             )
                         )
                     )
                 )
             )
         );
+        $callbackValidator = new Zend_Validate_Callback(function ($value) {
+            return @preg_match($value, '') !== false;
+        });
+        $callbackValidator->setMessage(
+            $this->translate('"%value%" is not a valid regular expression'),
+            Zend_Validate_Callback::INVALID_VALUE
+        );
         $this->addElement(
             'text',
             'strip_username_regexp',
@@ -56,11 +65,7 @@ class ExternalBackendForm extends Form
                     'The regular expression to use to strip specific parts off from usernames.'
                     . ' Leave empty if you do not want to strip off anything'
                 ),
-                'validators'    => array(
-                    new Zend_Validate_Callback(function ($value) {
-                        return @preg_match($value, '') !== false;
-                    })
-                )
+                'validators'    => array($callbackValidator)
             )
         );
         $this->addElement(
diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php
index 7039d7b7f..1c4e090c4 100644
--- a/application/forms/Config/General/LoggingConfigForm.php
+++ b/application/forms/Config/General/LoggingConfigForm.php
@@ -74,7 +74,9 @@ class LoggingConfigForm extends Form
                             array(
                                 'pattern'  => '/^[^\W]+$/',
                                 'messages' => array(
-                                    'regexNotMatch' => 'The application prefix cannot contain any whitespaces.'
+                                    'regexNotMatch' => $this->translate(
+                                        'The application prefix must not contain whitespace.'
+                                    )
                                 )
                             )
                         )

From 33c75a833079b026c286da69ef2c75209259229f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 12 Feb 2015 08:56:10 +0100
Subject: [PATCH 0636/2920] Add String::findSimilar()

refs #7973
---
 library/Icinga/Util/String.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/library/Icinga/Util/String.php b/library/Icinga/Util/String.php
index 4df25c83a..9fb3cb223 100644
--- a/library/Icinga/Util/String.php
+++ b/library/Icinga/Util/String.php
@@ -53,4 +53,30 @@ class String
 
         return $string;
     }
+
+    /**
+     * Find and return all similar strings in $possibilites matching $string with the given minimum $similarity
+     *
+     * @param   string  $string
+     * @param   array   $possibilities
+     * @param   float   $similarity
+     *
+     * @return  array
+     */
+    public static function findSimilar($string, array $possibilities, $similarity = 0.33)
+    {
+        if (empty($string)) {
+            return array();
+        }
+
+        $matches = array();
+        foreach ($possibilities as $possibility) {
+            $distance = levenshtein($string, $possibility);
+            if ($distance / strlen($string) <= $similarity) {
+                $matches[] = $possibility;
+            }
+        }
+
+        return $matches;
+    }
 }

From a630db93e867507aeede0066729afe7d3861a9cc Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 12 Feb 2015 08:58:01 +0100
Subject: [PATCH 0637/2920] Show proper examples in case a user doesn't enter a
 permitted/correct val

resolves #7973
---
 library/Icinga/Web/Form/Validator/InArray.php | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 library/Icinga/Web/Form/Validator/InArray.php

diff --git a/library/Icinga/Web/Form/Validator/InArray.php b/library/Icinga/Web/Form/Validator/InArray.php
new file mode 100644
index 000000000..d9cbc481f
--- /dev/null
+++ b/library/Icinga/Web/Form/Validator/InArray.php
@@ -0,0 +1,28 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Web\Form\Validator;
+
+use Zend_Validate_InArray;
+use Icinga\Util\String;
+
+class InArray extends Zend_Validate_InArray
+{
+    protected function _error($messageKey, $value = null)
+    {
+        if ($messageKey === static::NOT_IN_ARRAY) {
+            $matches = String::findSimilar($this->_value, $this->_haystack);
+            if (empty($matches)) {
+                $this->_messages[$messageKey] = sprintf(t('"%s" is not in the list of allowed values.'), $this->_value);
+            } else {
+                $this->_messages[$messageKey] = sprintf(
+                    t('"%s" is not in the list of allowed values. Did you mean one of the following?: %s'),
+                    $this->_value,
+                    implode(', ', $matches)
+                );
+            }
+        } else {
+            parent::_error($messageKey, $value);
+        }
+    }
+}

From a2f3e7d4f721edc83a8b589b10d626664f889bf8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 12 Feb 2015 09:04:50 +0100
Subject: [PATCH 0638/2920] Display an error in case a user inputs an invalid
 formatted datetime string

resolves #7975
---
 .../Web/Form/Validator/DateTimeValidator.php  | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Form/Validator/DateTimeValidator.php b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
index c508cef44..f1e22e250 100644
--- a/library/Icinga/Web/Form/Validator/DateTimeValidator.php
+++ b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
@@ -5,6 +5,7 @@ namespace Icinga\Web\Form\Validator;
 
 use DateTime;
 use Zend_Validate_Abstract;
+use Icinga\Util\DateTimeFactory;
 
 /**
  * Validator for date-and-time input controls
@@ -13,6 +14,21 @@ use Zend_Validate_Abstract;
  */
 class DateTimeValidator extends Zend_Validate_Abstract
 {
+    const INVALID_DATETIME_TYPE = 'invalidDateTimeType';
+    const INVALID_DATETIME_FORMAT = 'invalidDateTimeFormat';
+
+    /**
+     * The messages to write on differen error states
+     *
+     * @var array
+     *
+     * @see Zend_Validate_Abstract::$_messageTemplates‚
+     */
+    protected $_messageTemplates = array(
+        self::INVALID_DATETIME_TYPE     => 'Invalid type given. Instance of DateTime or date/time string expected',
+        self::INVALID_DATETIME_FORMAT   => 'Date/time string not in the expected format: %value%'
+    );
+
     protected $local;
 
     /**
@@ -38,14 +54,14 @@ class DateTimeValidator extends Zend_Validate_Abstract
     public function isValid($value, $context = null)
     {
         if (! $value instanceof DateTime && ! is_string($value)) {
-            $this->_error(t('Invalid type given. Instance of DateTime or date/time string expected'));
+            $this->_error(self::INVALID_DATETIME_TYPE);
             return false;
         }
         if (is_string($value)) {
             $format = $this->local === true ? 'Y-m-d\TH:i:s' : DateTime::RFC3339;
             $dateTime = DateTime::createFromFormat($format, $value);
             if ($dateTime === false || $dateTime->format($format) !== $value) {
-                $this->_error(sprintf(t('Date/time string not in the expected format %s'), $format));
+                $this->_error(self::INVALID_DATETIME_FORMAT, DateTimeFactory::create()->format($format));
                 return false;
             }
         }

From aa473fb8cfcc868cf7bb4c79467e4ca6ce276511 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 12 Feb 2015 09:05:40 +0100
Subject: [PATCH 0639/2920] Standardize path validators according to Zend's
 validators

refs #8415
---
 .../Form/Validator/ReadablePathValidator.php  | 24 ++++++++-----------
 .../Form/Validator/WritablePathValidator.php  | 12 ++++++----
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/library/Icinga/Web/Form/Validator/ReadablePathValidator.php b/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
index 6c32e1595..87b844fde 100644
--- a/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
+++ b/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
@@ -13,6 +13,9 @@ use Zend_Validate_Abstract;
  */
 class ReadablePathValidator extends Zend_Validate_Abstract
 {
+    const NOT_READABLE = 'notReadable';
+    const DOES_NOT_EXIST = 'doesNotExist';
+
     /**
      * The messages to write on different error states
      *
@@ -20,18 +23,10 @@ class ReadablePathValidator extends Zend_Validate_Abstract
      *
      * @see Zend_Validate_Abstract::$_messageTemplates‚
      */
-    protected $_messageTemplates;
-
-    /**
-     * Initialize this validator
-     */
-    public function __construct()
-    {
-        $this->_messageTemplates = array(
-            'NOT_READABLE'      => t('Path is not readable'),
-            'DOES_NOT_EXIST'    => t('Path does not exist')
-        );
-    }
+    protected $_messageTemplates = array(
+        self::NOT_READABLE      => 'Path is not readable',
+        self::DOES_NOT_EXIST    => 'Path does not exist'
+    );
 
     /**
      * Check whether the given value is a readable filepath
@@ -44,12 +39,13 @@ class ReadablePathValidator extends Zend_Validate_Abstract
     public function isValid($value, $context = null)
     {
         if (false === file_exists($value)) {
-            $this->_error('DOES_NOT_EXIST');
+            $this->_error(self::DOES_NOT_EXIST);
             return false;
         }
 
         if (false === is_readable($value)) {
-            $this->_error('NOT_READABLE');
+            $this->_error(self::NOT_READABLE);
+            return false;
         }
 
         return true;
diff --git a/library/Icinga/Web/Form/Validator/WritablePathValidator.php b/library/Icinga/Web/Form/Validator/WritablePathValidator.php
index 9620b5d7c..90b07543c 100644
--- a/library/Icinga/Web/Form/Validator/WritablePathValidator.php
+++ b/library/Icinga/Web/Form/Validator/WritablePathValidator.php
@@ -10,6 +10,9 @@ use Zend_Validate_Abstract;
  */
 class WritablePathValidator extends Zend_Validate_Abstract
 {
+    const NOT_WRITABLE = 'notWritable';
+    const DOES_NOT_EXIST = 'doesNotExist';
+
     /**
      * The messages to write on differen error states
      *
@@ -18,8 +21,8 @@ class WritablePathValidator extends Zend_Validate_Abstract
      * @see Zend_Validate_Abstract::$_messageTemplates‚
      */
     protected $_messageTemplates = array(
-        'NOT_WRITABLE'      =>  'Path is not writable',
-        'DOES_NOT_EXIST'    =>  'Path does not exist'
+        self::NOT_WRITABLE      => 'Path is not writable',
+        self::DOES_NOT_EXIST    => 'Path does not exist'
     );
 
     /**
@@ -53,7 +56,7 @@ class WritablePathValidator extends Zend_Validate_Abstract
 
         $this->_setValue($value);
         if ($this->requireExistence && !file_exists($value)) {
-            $this->_error('DOES_NOT_EXIST');
+            $this->_error(self::DOES_NOT_EXIST);
             return false;
         }
 
@@ -62,7 +65,8 @@ class WritablePathValidator extends Zend_Validate_Abstract
         ) {
             return true;
         }
-        $this->_error('NOT_WRITABLE');
+
+        $this->_error(self::NOT_WRITABLE);
         return false;
     }
 }

From 9e933d835d7cf6fe43d1de9eafc2940f59671df0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 12 Feb 2015 09:06:34 +0100
Subject: [PATCH 0640/2920] Add Icinga\Web\Form\ErrorLabeller

refs #8415
---
 library/Icinga/Web/Form.php               |  2 +
 library/Icinga/Web/Form/ErrorLabeller.php | 65 +++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 library/Icinga/Web/Form/ErrorLabeller.php

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index dc6afec07..ce5759620 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -12,6 +12,7 @@ use Icinga\Application\Icinga;
 use Icinga\Authentication\Manager;
 use Icinga\Security\SecurityException;
 use Icinga\Util\Translator;
+use Icinga\Web\Form\ErrorLabeller;
 use Icinga\Web\Form\Decorator\NoScriptApply;
 use Icinga\Web\Form\Element\CsrfCounterMeasure;
 
@@ -520,6 +521,7 @@ class Form extends Zend_Form
         }
 
         $el = parent::createElement($type, $name, $options);
+        $el->setTranslator(new ErrorLabeller(array('element' => $el)));
 
         $el->addPrefixPaths(array(
             array(
diff --git a/library/Icinga/Web/Form/ErrorLabeller.php b/library/Icinga/Web/Form/ErrorLabeller.php
new file mode 100644
index 000000000..455f5f81e
--- /dev/null
+++ b/library/Icinga/Web/Form/ErrorLabeller.php
@@ -0,0 +1,65 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Web\Form;
+
+use BadMethodCallException;
+use Zend_Translate_Adapter;
+use Zend_Validate_NotEmpty;
+use Icinga\Web\Form\Validator\DateTimeValidator;
+use Icinga\Web\Form\Validator\ReadablePathValidator;
+use Icinga\Web\Form\Validator\WritablePathValidator;
+
+class ErrorLabeller extends Zend_Translate_Adapter
+{
+    protected $messages;
+
+    public function __construct($options = array())
+    {
+        if (! isset($options['element'])) {
+            throw new BadMethodCallException('Option "element" is missing');
+        }
+
+        $this->messages = $this->createMessages($options['element']);
+    }
+
+    public function isTranslated($messageId, $original = false, $locale = null)
+    {
+        return array_key_exists($messageId, $this->messages);
+    }
+
+    public function translate($messageId, $locale = null)
+    {
+        if (array_key_exists($messageId, $this->messages)) {
+            return $this->messages[$messageId];
+        }
+
+        return $messageId;
+    }
+
+    protected function createMessages($element)
+    {
+        $label = $element->getLabel();
+
+        return array(
+            Zend_Validate_NotEmpty::IS_EMPTY    => sprintf(t('%s is required and must not be empty'), $label),
+            WritablePathValidator::NOT_WRITABLE     => sprintf(t('%s is not writable', 'config.path'), $label),
+            WritablePathValidator::DOES_NOT_EXIST   => sprintf(t('%s does not exist', 'config.path'), $label),
+            ReadablePathValidator::NOT_READABLE     => sprintf(t('%s is not readable', 'config.path'), $label),
+            DateTimeValidator::INVALID_DATETIME_FORMAT  => sprintf(
+                t('%s not in the expected format: %%value%%'),
+                $label
+            )
+        );
+    }
+
+    protected function _loadTranslationData($data, $locale, array $options = array())
+    {
+        // nonsense, required as being abstract otherwise...
+    }
+
+    public function toString()
+    {
+        return 'ErrorLabeller'; // nonsense, required as being abstract otherwise...
+    }
+}

From dfc18e0f952af17dc46180bbfb538e70ea856c61 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 12 Feb 2015 09:07:10 +0100
Subject: [PATCH 0641/2920] Display authentication exceptions as form errors

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

diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index 118a953a9..933a97357 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -141,7 +141,7 @@ class AuthenticationController extends ActionController
                 }
             }
         } catch (Exception $e) {
-            $this->view->errorInfo = $e->getMessage();
+            $this->view->form->addError($e->getMessage());
         }
 
         $this->view->requiresExternalAuth = $triedOnlyExternalAuth && !$auth->isAuthenticated();

From f00f598014db90593ebb9e2a647655b86cf602c1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Feb 2015 10:24:55 +0100
Subject: [PATCH 0642/2920] doc/lib: Fix undefined entity &nbsp and too greedy
 regex

---
 .../library/Doc/Renderer/DocSectionRenderer.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/doc/library/Doc/Renderer/DocSectionRenderer.php b/modules/doc/library/Doc/Renderer/DocSectionRenderer.php
index 668e2fb56..e6f0ea186 100644
--- a/modules/doc/library/Doc/Renderer/DocSectionRenderer.php
+++ b/modules/doc/library/Doc/Renderer/DocSectionRenderer.php
@@ -125,9 +125,7 @@ class DocSectionRenderer extends DocRenderer
     protected function highlightSearch($html, DocSearch $search)
     {
         $doc = new DOMDocument();
-        $fragment = $doc->createDocumentFragment();
-        $fragment->appendXML($html);
-        $doc->appendChild($fragment);
+        @$doc->loadHTML($html);
         $iter = new RecursiveIteratorIterator(new DomNodeIterator($doc), RecursiveIteratorIterator::SELF_FIRST);
         foreach ($iter as $node) {
             if ($node->nodeType !== XML_TEXT_NODE
@@ -152,7 +150,10 @@ class DocSectionRenderer extends DocRenderer
             $fragment->appendChild($doc->createTextNode(substr($text, $offset)));
             $node->parentNode->replaceChild($fragment, $node);
         }
-        return $doc->saveHTML();
+        // Remove <!DOCTYPE
+        $doc->removeChild($doc->doctype);
+        // Remove <html><body> and </body></html>
+        return substr($doc->saveHTML(), 12, -15);
     }
 
     /**
@@ -250,14 +251,14 @@ class DocSectionRenderer extends DocRenderer
                 $section->getLevel(),
                 $title
             );
-            $content = $this->parsedown->text(implode('', $section->getContent()));
-            if (empty($content)) {
+            $html = $this->parsedown->text(implode('', $section->getContent()));
+            if (empty($html)) {
                 continue;
             }
             $html = preg_replace_callback(
                 '#<pre><code class="language-php">(.*?)</code></pre>#s',
                 array($this, 'highlightPhp'),
-                $content
+                $html
             );
             $html = preg_replace_callback(
                 '/<img[^>]+>/',
@@ -270,7 +271,7 @@ class DocSectionRenderer extends DocRenderer
                 $html
             );
             $html = preg_replace_callback(
-                '/<a\s+(?P<attribs>[^>]*?\s+)?href="(?:(?!http:\/\/)[^#]*)#(?P<fragment>[^"]+)"/',
+                '/<a\s+(?P<attribs>[^>]*?\s+)?href="(?:(?!http:\/\/)[^"#]*)#(?P<fragment>[^"]+)"/',
                 array($this, 'replaceLink'),
                 $html
             );

From a520abe65d30e50d63cf91184338c556c4bc9729 Mon Sep 17 00:00:00 2001
From: baufrecht <baufrecht@users.noreply.github.com>
Date: Wed, 4 Feb 2015 23:50:58 +0100
Subject: [PATCH 0643/2920] Fix usermod for Ubuntu/Debian

Set correct group for Ubuntu/Debian

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
---
 doc/installation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/installation.md b/doc/installation.md
index aa85adb22..3ab099e3a 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -94,7 +94,7 @@ usermod -A icingaweb2 wwwrun
 
 Debian and Ubuntu:
 ````
-usermod -a -G icingaweb2 wwwrun
+usermod -a -G icingaweb2 www-data
 ````
 
 Use `icingacli` to create the configuration directory which defaults to **/etc/icingaweb2**:

From ac0671f5068df7df356d778b6986a952b0a4482e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Feb 2015 11:19:32 +0100
Subject: [PATCH 0644/2920] Add baufrecht <baufrecht@users.noreply.github.com>
 to the AUTHORS file

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 7a6d660d6..fe6025dca 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,6 @@
 Alexander Fuhr <alexander.fuhr@netways.de>
 Alexander Klimov <alexander.klimov@netways.de>
+baufrecht <baufrecht@users.noreply.github.com>
 Bernd Erk <bernd.erk@icinga.org>
 Boden Garman <boden.garman@spintel.net.au>
 Carlos Cesario <carloscesario@gmail.com>

From d66e70333258acc49b15e3dd4b19e58968b2f45e Mon Sep 17 00:00:00 2001
From: Davide Demuru <davide.demuru@buongiorno.com>
Date: Wed, 4 Feb 2015 17:49:25 +0100
Subject: [PATCH 0645/2920] Added new icinga.po for italian language

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
---
 .../locale/it_IT/LC_MESSAGES/icinga.po        | 616 ++++++++++++++++++
 1 file changed, 616 insertions(+)
 create mode 100644 application/locale/it_IT/LC_MESSAGES/icinga.po

diff --git a/application/locale/it_IT/LC_MESSAGES/icinga.po b/application/locale/it_IT/LC_MESSAGES/icinga.po
new file mode 100644
index 000000000..6f4d3da71
--- /dev/null
+++ b/application/locale/it_IT/LC_MESSAGES/icinga.po
@@ -0,0 +1,616 @@
+# Icinga Web 2 - Head for multiple monitoring backends.
+# Copyright (C) 2014 Icinga Development Team
+# This file is distributed under the same license as Icinga Web 2.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Icinga Web 2 (None)\n"
+"Report-Msgid-Bugs-To: dev@icinga.org\n"
+"POT-Creation-Date: 2014-08-22 17:30+0200\n"
+"PO-Revision-Date: 2015-02-04 17:48+0100\n"
+"Last-Translator: Davide Demuru <davide.demuru@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it_IT\n"
+"X-Generator: Poedit 1.7.3\n"
+
+#: /usr/local/src/bugfix.master/application/views/scripts/pivottablePagination.phtml:9
+#, php-format
+msgid "%s: %d to %d of %d"
+msgstr "%s: %d a %d di %d"
+
+#: /usr/local/src/bugfix.master/application/forms/Authentication/LoginForm.php:36
+msgid "...and your password"
+msgstr "...e password"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterEditor.php:132
+msgid "Add"
+msgstr "Aggiungi"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterWidget.php:81
+msgid "Add filter..."
+msgstr "Aggiungi filtro..."
+
+#: /usr/local/src/bugfix.master/application/controllers/AuthenticationController.php:118
+msgid "All configured authentication methods failed. Please check the system log or Icinga Web 2 log for more information."
+msgstr "Tutti i metodi di autenticazione configurati hanno fallito. Controllare i log di sistema o di Icinga Web 2 per maggiori informazioni."
+
+#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:91
+msgid "Application Prefix"
+msgstr "Prefisso dell'applicazione"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Menu.php:197
+msgid "ApplicationLog"
+msgstr "Log dell'applicazione"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Form/notyet_FormWizard.php:31
+msgid "Back"
+msgstr "Indietro"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:53
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:55
+msgid "Backend Name"
+msgstr "Nome Backend"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:257
+msgid "Bind DN"
+msgstr "Bind DN"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:269
+msgid "Bind Password"
+msgstr "Bind Password"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:333
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/BaseBackendForm.php:114
+msgid "Check this box to enforce changes without connectivity validation"
+msgstr "Selezionare questa casella per forzare le modifiche senza verificare la connettività."
+
+#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:47
+msgid "Check this to enable logging."
+msgstr "Selezionare questa casella per abilitare la scrittura nei log."
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterEditor.php:108
+msgid "Click to add a filter expression to this operator"
+msgstr "Clicca per aggiungere un filtro a questo operatore"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterEditor.php:105
+msgid "Click to add another operator below this one"
+msgstr "Clicca per aggiungere un altro operatore di seguito"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterEditor.php:97
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterWidget.php:69
+msgid "Click to remove this part of your filter"
+msgstr "Clicca per rimuovere questa parte dal filtro"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Menu.php:189
+msgid "Configuration"
+msgstr "Configurazione"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:165
+msgid "Connection Validation Failed: "
+msgstr "Verifica della Connessione Fallita: "
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:452
+msgid "Connectivity validation failed, connection to the given resource not possible."
+msgstr "Verifica della connessione fallita, impossibile connettersi alla risorsa fornita."
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:429
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:445
+msgid "Connectivity validation failed, the provided file does not exist."
+msgstr "Verifica della connessione fallita, il file fornito non esiste."
+
+#: /usr/local/src/bugfix.master/application/controllers/AuthenticationController.php:59
+msgid "Could not read your authentiction.ini, no authentication methods are available."
+msgstr "Impossibile leggere authentication.ini, nessun metodo di autenticazione disponibile."
+
+#: /usr/local/src/bugfix.master/application/layouts/scripts/body.phtml:31
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Menu.php:175
+msgid "Dashboard"
+msgstr "Dashboard"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:65
+msgid "Database Connection"
+msgstr "Connessione Database"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:158
+msgid "Database Name"
+msgstr "Nome Database"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:119
+msgid "Database Type"
+msgstr "Tipo Database"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:63
+msgid "Debug"
+msgstr "Debug"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/GeneralForm.php:101
+msgid "Default Language"
+msgstr "Lingua Predefinita"
+
+#: /usr/local/src/bugfix.master/application/controllers/ErrorController.php:36
+#, php-format
+msgid "Enabling the \"%s\" module might help!"
+msgstr "Abilitare il modulo \"%s\" potrebbe essere utile!"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:60
+msgid "Error"
+msgstr "Errore"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterEditor.php:109
+msgid "Expression"
+msgstr "Espressione"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:113
+msgid "Facility"
+msgstr "Facility"
+
+#: /usr/local/src/bugfix.master/application/controllers/PreferenceController.php:55
+#, php-format
+msgid "Failed to persist preferences. (%s)"
+msgstr "Impossibile salvare le preferenze. (%s)"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:76
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:358
+msgid "File"
+msgstr "File"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:129
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:195
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:206
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:283
+msgid "Filepath"
+msgstr "Percorso file"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterWidget.php:90
+msgid "Filter this list"
+msgstr "Filtrare questa lista"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterWidget.php:94
+msgid "Filtered"
+msgstr "Filtrato"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Form/notyet_FormWizard.php:32
+msgid "Finish"
+msgstr "Fine"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:332
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/BaseBackendForm.php:113
+msgid "Force Changes"
+msgstr "Forzare Modifiche"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Form/notyet_QuickForm.php:147
+msgid "Form has successfully been sent"
+msgstr "Modulo inviato correttamente"
+
+#: /usr/local/src/bugfix.master/application/views/scripts/search/hint.phtml:7
+msgid "Hint"
+msgstr "Suggerimento"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:135
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:235
+msgid "Host"
+msgstr "Host"
+
+#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:33
+#: /usr/local/src/bugfix.master/application/views/scripts/pivottablePagination.phtml:28
+msgid "Hosts"
+msgstr "Hosts"
+
+#: /usr/local/src/bugfix.master/application/views/scripts/search/hint.phtml:6
+msgid "I'm ready to search, waiting for your input"
+msgstr "Pronto per la ricerca, in attesa di un input."
+
+#: /usr/local/src/bugfix.master/application/controllers/AuthenticationController.php:40
+#: /usr/local/src/bugfix.master/application/views/scripts/authentication/login.phtml:8
+msgid "Icingaweb Login"
+msgstr "Icingaweb Login"
+
+#: /usr/local/src/bugfix.master/application/views/scripts/authentication/logout.phtml:14
+msgid "If this message does not disappear, it might be necessary to quit the current session manually by clearing the cache, or by closing the current browser session."
+msgstr "Se questo messaggio non scompare, potrebbe essere necessario chiudere manualmente la sessione corrente ripulendo la cache, oppure chiudere la sessione del browser."
+
+#: /usr/local/src/bugfix.master/application/controllers/AuthenticationController.php:131
+msgid "Incorrect username or password"
+msgstr "Utente o password errati"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:62
+msgid "Information"
+msgstr "Information"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:67
+msgid "LDAP Resource"
+msgstr "Risorsa LDAP"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:90
+msgid "LDAP User Name Attribute"
+msgstr "Attributo per Nome Utente LDAP"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:79
+msgid "LDAP User Object Class"
+msgstr "Object Class Utente LDAP"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:207
+msgid "Location of your icinga objects.cache file"
+msgstr "Posizione del file objects.cache di icinga"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:196
+msgid "Location of your icinga status.dat file"
+msgstr "Posizione del file status.dat di icinga"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:46
+msgid "Logging Enabled"
+msgstr "Scrittura Log Abilitata"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:56
+msgid "Logging Level"
+msgstr "Livello dei Log"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:72
+msgid "Logging Type"
+msgstr "Tipo di Log"
+
+#: /usr/local/src/bugfix.master/application/views/scripts/authentication/logout.phtml:12
+msgid "Logging out..."
+msgstr "Uscita in corso..."
+
+#: /usr/local/src/bugfix.master/application/views/scripts/authentication/logout.phtml:21
+msgid "Login"
+msgstr "Accedi"
+
+#: /usr/local/src/bugfix.master/application/layouts/scripts/parts/topbar.phtml:35
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Menu.php:202
+msgid "Logout"
+msgstr "Esci"
+
+#: /usr/local/src/bugfix.master/application/views/scripts/authentication/logout.phtml:43
+msgid "Logout successful!"
+msgstr "Disconnesso con successo!"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterEditor.php:235
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterWidget.php:95
+msgid "Modify this filter"
+msgstr "Modifica filtro"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Menu.php:193
+msgid "Modules"
+msgstr "Moduli"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/ReorderForm.php:112
+msgid "Move down in authentication order"
+msgstr "Sposta giù nell'ordine di autenticazione"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/ReorderForm.php:86
+msgid "Move up in authentication order"
+msgstr "Sposta su nell'ordine di autenticazione"
+
+#: /usr/local/src/bugfix.master/application/views/scripts/pivottablePagination.phtml:16
+msgid "Navigation"
+msgstr "Navigazione"
+
+#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:86
+#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:89
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Form/notyet_FormWizard.php:30
+msgid "Next"
+msgstr "Prossimo"
+
+#: /usr/local/src/bugfix.master/application/controllers/AuthenticationController.php:110
+msgid "No authentication methods available. Did you create authentication.ini when installing Icinga Web 2?"
+msgstr "Nessun metodo di autenticazione trovato. E' stato creato authentication.ini durante l'installazione di Icinga Web 2?"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:119
+msgid "No users found under the specified database backend"
+msgstr "Non sono stai trovati utenti nel database di backend specificato"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterEditor.php:106
+msgid "Operator"
+msgstr "Operatore"
+
+#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:33
+msgid "Page"
+msgstr "Pagina"
+
+#: /usr/local/src/bugfix.master/application/controllers/ErrorController.php:33
+msgid "Page not found."
+msgstr "Pagina non trovata."
+
+#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:12
+msgid "Pagination"
+msgstr "Paginazione"
+
+#: /usr/local/src/bugfix.master/application/forms/Authentication/LoginForm.php:35
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:181
+msgid "Password"
+msgstr "Password"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:294
+msgid "Pattern"
+msgstr "Pattern"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Form/Element/Number.php:36
+msgid "Please enter a number."
+msgstr "Inserire un numero."
+
+#: /usr/local/src/bugfix.master/application/forms/Authentication/LoginForm.php:25
+msgid "Please enter your username..."
+msgstr "Inserire nome utente..."
+
+#: /usr/local/src/bugfix.master/application/controllers/AuthenticationController.php:126
+msgid "Please note that not all authentication methods where available. Check the system log or Icinga Web 2 log for more information."
+msgstr "Si fa notare che non sono disponibili tutti i metodi di autenticazione. Controllare il log di sistema o di Icinga Web 2 per maggiori dettagli."
+
+#: /usr/local/src/bugfix.master/application/views/scripts/search/hint.phtml:8
+msgid "Please use the asterisk (*) as a placeholder for wildcard searches. For convenience I'll always add a wildcard after the last character you typed."
+msgstr "Si consiglia di usare l'asterisco (*) come carattere jolly durante le ricerche. Per comodità verrà automaticamente aggiunto dopo l'ultimo carattere digitato."
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:146
+msgid "Port"
+msgstr "Porta"
+
+#: /usr/local/src/bugfix.master/application/layouts/scripts/parts/topbar.phtml:32
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Menu.php:185
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: /usr/local/src/bugfix.master/application/controllers/PreferenceController.php:48
+msgid "Preferences updated successfully"
+msgstr "Preferenze aggiornate con successo"
+
+#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:48
+#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:51
+msgid "Prev"
+msgstr "Precedente"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterWidget.php:99
+msgid "Remove this filter"
+msgstr "Rimuovi filtro"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:308
+msgid "Resource Name"
+msgstr "Nome Risorsa"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:350
+msgid "Resource Type"
+msgstr "Tipo di Risorsa"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:246
+msgid "Root DN"
+msgstr "Root DN"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:354
+msgid "SQL Database"
+msgstr "SQL Database"
+
+#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:22
+#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:29
+#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:30
+#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:56
+msgid "Search"
+msgstr "Cerca"
+
+#: /usr/local/src/bugfix.master/application/layouts/scripts/parts/navigation.phtml:15
+msgid "Search..."
+msgstr "Cerca..."
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Form/Validator/notyet_CsrfTokenValidator.php:20
+msgid "Security check failed, please submit your form again"
+msgstr "Controllo di sicurezza fallito, si prega di re-inviare nuovamente il modulo."
+
+#: /usr/local/src/bugfix.master/application/forms/Config/GeneralForm.php:105
+msgid "Select the language to use by default. Can be overwritten by a user in his preferences."
+msgstr "Selezionare la lingua predefinita. Può essere sovrascritta dalle preferenze dell'utente."
+
+#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:41
+#: /usr/local/src/bugfix.master/application/views/scripts/pivottablePagination.phtml:34
+msgid "Services"
+msgstr "Servizi"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/Limiter.php:84
+#, php-format
+msgid "Show %s rows on one page"
+msgstr "Mostra %s righe per pagina"
+
+#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:16
+#, php-format
+msgid "Show rows %d to %d of %d"
+msgstr "Mostra da riga %d a %d di %d"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:220
+msgid "Socket"
+msgstr "Socket"
+
+#: /usr/local/src/bugfix.master/application/views/scripts/config/module.phtml:22
+msgid "State"
+msgstr "Stato"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Menu.php:181
+msgid "System"
+msgstr "Sistema"
+
+#: /usr/local/src/bugfix.master/application/views/scripts/authentication/login.phtml:4
+msgid "The Icinga logo"
+msgstr "Il logo Icinga"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:114
+msgid "The Syslog facility to utilize."
+msgstr "Facility Syslog da utilizzare"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:91
+msgid "The attribute name used for storing the user name on the ldap server"
+msgstr "Il nome dell'attributo usato per memorizzare il nome utente sul server ldap"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:66
+msgid "The database connection to use for authenticating with this provider"
+msgstr "La connessione database da usare per autenticarsi con questo servizio"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:284
+msgid "The filename to fetch information from"
+msgstr "Nome del file dal quale recuperare l'informazione"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:136
+msgid "The hostname of the database."
+msgstr "l'hostname del database"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:236
+msgid "The hostname or address of the LDAP server to use for authentication"
+msgstr "L'hostname o l'indirizzo ip del server LDAP da usare per l'autenticazione"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:130
+msgid "The logfile to write messages to."
+msgstr "File di log dove scrivere i messaggi"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:57
+msgid "The maximum loglevel to emit."
+msgstr "Livello massimo da considerare."
+
+#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:92
+msgid "The name of the application by which to prefix syslog messages."
+msgstr "Nome dell'applicazione da usare come prefisso dei messaggi di syslog."
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:159
+msgid "The name of the database to use"
+msgstr "Nome del database da usare"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:56
+msgid "The name of this authentication backend"
+msgstr "Nome del backend di autenticazione"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:54
+msgid "The name of this authentication provider"
+msgstr "Nome del servizio di autenticazione"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:80
+msgid "The object class used for storing users on the ldap server"
+msgstr "Object class usata per memorizzare gli utenti su server ldap"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:182
+msgid "The password to use for authentication"
+msgstr "Password da usare per l'autenticazione"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:270
+msgid "The password to use for querying the ldap server"
+msgstr "Password da usare per interrogare il server ldap"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:221
+msgid "The path to your livestatus socket used for querying monitoring data"
+msgstr "Percorso del socket di livestatus usato per il recupero dei dati di monitoraggio"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:247
+msgid "The path where users can be found on the ldap server"
+msgstr "Percorso per trovare gli utenti nel server ldap"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:147
+msgid "The port to use."
+msgstr "La porta da usare."
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:295
+msgid "The regular expression by which to identify columns"
+msgstr "L'espressione regolare che consente di identificare le colonne"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:68
+msgid "The resource to use for authenticating with this provider"
+msgstr "La risorsa da usare per autenticarsi con questo servizio"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:120
+msgid "The type of SQL database you want to create."
+msgstr "Tipo di SQL database che si vuole creare."
+
+#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:73
+msgid "The type of logging to utilize."
+msgstr "Tipo di log da utilizzare."
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:351
+msgid "The type of resource"
+msgstr "Tipo di risorsa"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:309
+msgid "The unique name of this resource"
+msgstr "Nome univoco per questa risorsa"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:258
+msgid "The user dn to use for querying the ldap server"
+msgstr "Utente DN da usare per interrogare il server ldap"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:170
+msgid "The user name to use for authentication."
+msgstr "Nome utente da usare per l'autenticazione"
+
+#: /usr/local/src/bugfix.master/application/views/scripts/config/module.phtml:6
+msgid "There is no such module installed."
+msgstr "Il modulo selezionato no risulta installato"
+
+#: /usr/local/src/bugfix.master/application/views/scripts/config/module.phtml:46
+msgid "This module has no dependencies"
+msgstr "Questo modulo non ha dipendenze"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Application/Modules/Module.php:435
+msgid "This module has no description"
+msgstr "Questo modulo non ha descrizione"
+
+#: /usr/local/src/bugfix.master/application/views/scripts/config/devtools.phtml:5
+msgid "UI Debug"
+msgstr "Debug Interfaccia Utente"
+
+#: /usr/local/src/bugfix.master/application/forms/Preference/GeneralForm.php:43
+msgid "Use Default Language"
+msgstr "Usa Lingua Predefinita"
+
+#: /usr/local/src/bugfix.master/application/forms/Preference/GeneralForm.php:52
+msgid "Use the following language to display texts and messages"
+msgstr "Usa la lingua seguente per visualizzare testi e messaggi"
+
+#: /usr/local/src/bugfix.master/application/forms/Authentication/LoginForm.php:24
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:169
+msgid "Username"
+msgstr "Nome utente"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:144
+msgid "Using ldap is not possible, the php extension \"ldap\" is not installed."
+msgstr "Impossibile usare ldap, l'estensione \"ldap\" per php non è installata"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:123
+#, php-format
+msgid "Using the specified backend failed: %s"
+msgstr "Impossibile usare il seguente backend: %s"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:61
+msgid "Warning"
+msgstr "Warning"
+
+#: /usr/local/src/bugfix.master/application/views/scripts/dashboard/index.phtml:13
+msgid "We tried to load a dashboard configuration with no success. Please have look that the configuration does exist:"
+msgstr "Non è stato possibile caricare la configurazione della dashboard. Si prega di controllare che la configurazione esista:"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:410
+msgid "You need to install the php extension \"mysql\" and the Zend_Pdo_Mysql classes to use  MySQL database resources."
+msgstr "E' necessario installare l'estensione \"mysql\" di php e le classi Zend_Pdo_Mysql per poter usare come risorse i database Mysql"
+
+#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:417
+msgid "You need to install the php extension \"pgsql\" and the Zend_Pdo_Pgsql classes to use  PostgreSQL database resources."
+msgstr "E' necessario installare l'estensione \"pgsql\" di php e le classi Zend_Pdo_Pgsql per poter usare come risorse i database PostgreSQL"
+
+#: /usr/local/src/bugfix.master/application/forms/Preference/GeneralForm.php:49
+msgid "Your Current Language"
+msgstr "Lingua Corrente"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/Limiter.php:58
+msgid "all"
+msgstr "tutti"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Util/Format.php:83
+#: /usr/local/src/bugfix.master/library/Icinga/Util/Format.php:89
+msgid "for"
+msgstr "per"
+
+#: /usr/local/src/bugfix.master/library/Icinga/Util/Format.php:87
+#: /usr/local/src/bugfix.master/library/Icinga/Util/Format.php:106
+#: /usr/local/src/bugfix.master/library/Icinga/Util/Format.php:108
+msgid "since"
+msgstr "da"
+
+#: /usr/local/src/bugfix.master/application/views/scripts/config/devtools.phtml:5
+msgid "toggle"
+msgstr "seleziona"

From 7e9efbcb4dad6a0edc90b729a43748fc5447c160 Mon Sep 17 00:00:00 2001
From: Davide Demuru <davide.demuru@buongiorno.com>
Date: Wed, 4 Feb 2015 17:57:14 +0100
Subject: [PATCH 0646/2920] added compiled translation file

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
---
 application/locale/it_IT/LC_MESSAGES/icinga.mo | Bin 0 -> 7672 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 application/locale/it_IT/LC_MESSAGES/icinga.mo

diff --git a/application/locale/it_IT/LC_MESSAGES/icinga.mo b/application/locale/it_IT/LC_MESSAGES/icinga.mo
new file mode 100644
index 0000000000000000000000000000000000000000..99d3afb2bfc2496a5aa8ccb4ff67cbb6f08aaf53
GIT binary patch
literal 7672
zcma)=TWn?5UB*{PFR7uFP6{;iwkFM7LdGYaY0^%enRGn%B;(?7JYzd)OD^nl_VV#+
z_u2c*zSyxV5u{S2f}&QvAVozef`_VossL50P=(atfr5}gAR(kSY6Ub8sI5@@z~zPC
zxAxk{XEF|D%j<k+?RELD^}l|{FCBT!7Yt9I_IBE-+l~1Ic<yz4@Laybn74q-;2XiG
z!3xa4Bj9(z*ML6;e-8Xl@b%zp-_Xu~Be+2SZQx1psrdePz*YL62l+Gq!pEK94?xMe
zZKlOHf%njV2PiogK}48G!CwH^Vm|?O<d1?{e;w5P=OX?#_*(j(0`CJq4ZaEdbMQs*
zZ@_ng+0VA?e-C^s{TIMr0{<kw{}!lw{uB7~;J<>}_s5{*{}(8|Xp-<wQ2ICy9tC^g
zyTCONk!B3)oF50@1O8U*{~4(BeI3-iZ-Kh^KZ4rtJK#IOe*?Atb}o%*a|fvYTR_Rb
z3*^t7iZ~By{bi7)W)0N2p8{ov6qKAC)ctoOeg@RMFN3=8S7ZNcpw9UXa0&d|h(}P)
zar#eydjFf?2f!Pk?teRr=D~M^n)fs~2YwRN{I7x1$Nzxu2k*z&TIWIe<EKCi{vmij
z_!r>a;EzDfJM!k%o@YSa=PGy>{7CG74wT$K0Dlp@0pj}RpCf(;)IGlk>fSGdpSjJL
zAA(%bJcqMNzt4l81YZPy1w78-ByRzfem@9G-%o&A_YC+rI08?Be+i-z^B>?<P=}En
zu7SKVPl8%^J>qkq?)y9_JAWg-|0c+v`8z%&|NEfEe*|)5^Ak|#c^%HI_jiK2-&?_1
z@SPy4HY?yCgHM98zxm~M-CdyK<2b1Imq5*b8kFDVp!Bg1N?*@|lJj}+F7O3V^ZzuC
z-vIBW|JUFN@F$@5c{`iy{3pQ+;Av3%l^`lMd!Xh$4{F{Ep!EAkAX}KPfV$T=LB-8q
zMf?X)dVUF%9)1AoJpT=9{S1fH`y-&%zYEm<$3TtuK-u@bpz`EZQ0K})&2K=>`#2~$
zp8$Ui{4970d<i@a-oqx#;Nzg)zX)pI@AGjEyzOnRUp@@Z(Rbh)`1|0);LG4y@HmIi
zx@SP$V;_{?|1KywUjgp}za8J-L9(#)Pl8<8EQ8vo4@#e31Z9sef!goyLEY<npyJ|X
z@Mpk(2j!nX1PKRok*4RF7Q(0I>5=~uj^WW+uh68k2WXGd?xuB*eDs4f$>hl90!_~~
zn)D@GzK_QB!*e;JZ1f=Q$=E*;aS1#}yPtLsO}ddi7HRSm+}oU|^=W#f3)$@`?IGIJ
zv|}_qNejV0^p#KwI+Pyd<9e>r=4tEd#7FvnfBgPlP;s_NJ5F1m{W@*>k)3~)_5^Ju
z4p>lrqS#xd$tO<H-c7><!FITo>Cw99Bwv&>9*-|R49X`yMEd|uaVlR@Jn4B4?Gf4;
z+DB-5euE}|*r3V&kJ04cdgLEZg>O?Iy<RWLQ@d9*r5z_#wOf>_Sx8g6<+IwA44Z{4
zvx6ev^24TdsZE-C+vT+%B(*PcJ971Qkydsq@tI3|b}e&B<?LYF4L)X>X{)`eb|ae=
zLtB(~dEoP5VxMq*dnUZw;^n9)o%K0iM`2TBj>lOiVXbsq{#kP|8GI~!IL^D8jGVdX
z`L?v$;#zn3#VFZVwqHDJ>%uziJkXhveCR5>>p5~$>r%NJ)PBd;dv+(ud>W*iMMQJ<
z!j^7S>^N@0UgM;!ZL!sAs#T6zj9Q7y4&N?n=F~(SN@H)SX6ScZj+6@RbH2Q&?YO8a
z-_KmnEG5-;zeq60Qc@><DHVC)z(s!WE@)yhV`FdZ%%wc(XQ(;IxcgXjHwsRh%-NA2
zZr66(W#gmf5zG}n#!0=cFIc<1Y38dszHljDa$hkaXmGLBpt<bx+FUM}r;o}kpBQnC
zB;C`^DwmXl?NfF)@wHAN3kU!5`M9Y~>jAqsz)CUnxmn(7#g1H6B|~S^0uxCUsjrgp
zn9WXEU&pie(UKczW*KB%Zy1s)2TfVxl?X?Fa?2!dk}TV^{XILtCCg49g9O(+C07h1
zMKu|SJM_z9w?Y?jr=D5P2L+oCYTNKW$Mdv$5-clA3v2dTw4n*TO|6$<>_T0azTebt
zYT&W{N442vhQ}IofD(pw#qGFk(hFwnhHzDdVXG}Z>8m3Tu9|_AvDIWp&6OhcTPQ`&
z8vT=3n7v{MFHVcyoFIE;{1Wf3Y-cp%R~=tXcKon)^Huk3ZB~n*3?vl|K}ZYUL$r_G
zz;Ai-1i{pLZJ)p;X3ZMb4Ija}VPQ{wpSK%NB6uySamL)lRDxOAJa|xN0O@0`C~KqK
z;4nN|(Dxm4Z7O7=7CPIsNn_FrI=)umXrz$!t1Gq(BC{SGID$m2yK=`%#QJuzYmZe{
zE@JVrB6m0f*9rsS?Xgrbz$dxlSZdY_E?=AVI>86lLn<^I_-o9A8FmbPuG~6`4GzXd
zNx`^TRTmT2)$QA1r4TmB(qxREmOEHbn@&{TWwtieurBO1ow;#2rNP!+#$~bN<p$aW
zt+{XpuCe9n!S-}!wp(Q}3e&a;{4N%fG$o0l5rwj|AqLuGNf(ESCxb~=yFt5(Sf8YP
zLUVW9Bbw#okp5LhP!{DTWQnSG%lgUXTajVBXhUtFP}4bX)~WOv%&0@ZQkPwP|CAdX
zHtl-j%DpbF+`6x{UbOz4Q2;7jqp55a9OdAUlTAiN?xPdvis4?R8#Y-|TK6p4X%pVG
z%CIE`nq)92vSyT5aZM~UuVRu{_lTOJBHN<>kgK#o?K8hmm68>^agGuSS$Nsxo-0gQ
zn6z~B1bK5BYGLOglRF<`5HSSR1?9Z$uAuoG?PcN}$YeOyx$Pv(Ox>8gLvrwh?xEw=
zp!8$W7_+%-mt4OYnoWX5;<t({D|ThY4A#)7GI4Ke(l|@VvLwOEiaB)-sfD39@TIf;
zK{AXvFmi!;a)|k`DA!^vIxA6z;Wmc2H|#NRrbgqG>9w*@$(UVEXCKF9Iq!UzKw2Vo
za+OSU@60tfCMnKdsfIqCz1R$^*^Oe}rf%ng545XSl*5^|$2MjcDb~97EIH53+cR^g
zADo>#GduTyJ^jA<2T$KOcY1D)iL=+-j+eMY=RI(?owt%y_3TEO<W-j7sPiOJWfSx{
zYRbl*OGCGphVF&o2%^{<6r+b{x=YVf-=A6DnDl2iTr!%sD+{ZSZZ14}$(~zTxsZ7s
z{^6M`%U3QPDB*N(ZU$0R<L<M{=kviZ_hTZTKP0|aR<1t3x$(&C*@JmHDMe%U5_LVr
zRP*+1-`6v1SyLw2EJSBi&D(q&y4CqJ583wX`IEUldfuMC_n{d>QBdOV=rUo^<U=3I
zZds^eY&3Q4trt5+25zIWtDqbt`{)zCazGs|qzb>@!t?}sPb{x4@xDYZA2>40D@d6e
zB~~tYv+c)((J0{v6pAiYONOUJDs@&BYh0F{hzT~xht#CrA%;p0O%b<Ni9VcBue;1?
zl@3IR5^{C`9p!{p!g1Gq4T)figOIo30WRN9EQLw^Fv=p)SM&nkzVTu&(Ck6GMd?Qk
z9OYntv2E3}Eb8=tYPZKH48q3YW^w0`2MOGu#{|+iYRNS9tP`!^v5Y6S^i@$-i4ISC
zO{VEK`p?^>iVsH;)2eCG+wkM!U~HjJGOUBSvNi=3Hqh>IQJ1a{XJtEGPFd4M>b>Sl
zXeG8$y$y7`oYJp2coN^%g-AGaqMifMlakGPGaRCb5sp<%({b_zZ-Q~cRR_qDLLh%I
zD{hSsH6nxXarkY>4F`mLJzBYlxed=E@8-55Xt4|A`IYzTC^-`c+rEKG;0l3&>u7jJ
z(y?h-A`o?l1;&umJS{ZbvGVbl-<SuROfSTTZRF-Xv#DUBC{2RUy0RptnQPIm;vlAD
z->oWwr^kh1c$$dY>46o>GT9&J@)o9Tg1OO|zHe3oY%N^|^C{RDAmOPuml!ci9yJC3
zK^Ib5%g~F+&xwW3qXRkjW*sMGzoEbJb$;3qrVw(heQV0-W>(Elnb&glHcs#a!eXQ_
z=PZTFXPtOU;P0R<98x(+`yFsc?%7qVSiktCUqqrFA^1bP38B++_$aVTiXDkx&T)N@
zQFA4lAkax^qVLIszwfKa@xxBU#bHFHgD#)8u@?<Hu|?NEl)*2`;Z69Itab7Ceb29)
zsxFg2;Q1v?1}A$#-}wR34W-Hq{C@)e9zIaU%_P1s>un}B%b9X>5tFgH;f8Ihjci`z
z7v%*(BYv5bem|s2A1Al!z)7-5;{y#fD>rAfwEHE+>DUil>fn=tqMRmI3#nN@zr$r?
zW>?fG!-QOVou9-6o*Oi5pnb9v@xLyu@m5Y8u=+5TdY!nieyl{>oiXtHo6bUUX<aFn
zx7K8>Dq30}1aOFW0a6LKI4Do5lp^*NQB>Y?{oZ7kDd&tEm>9bqvqwX>D0!Go9GsYu
zTF{#4I1bxZ?t}A4p|@P(@M-+(gIrS#r9bR=)4p9!56Wr@J=d9H`3LU6(rAb_&tT+m
z_el3cK{qQWT-7mr8E#kvR-gil#i_9>l2rYc@5e%`u}nEge$>^uiRS-buG1wv96abK
zuzh(h%toaTnQ`ORMv(oTV$k||WC-2(W}B&(R&Q4J|Di=9De!o?awHyv5UGnTn=IsB
zk{CsttaMd$ghHi%bhK4!Th*=Q{Unvc$DMe8>+*s0+hy5wD;W%Y5(@!&K2c%P|Ir$i
zuVE9kE%m{P38Wax)Kd&cy^H=E6%uZ3mZvC48@a(_;$AV$hF=3Kt(?VJ9Zf9)X^>{p
J#7y*H{uj}TRFwb#

literal 0
HcmV?d00001


From c068ab21afac598716d7c73a687d756e88fbef47 Mon Sep 17 00:00:00 2001
From: Davide Demuru <davide.demuru@buongiorno.com>
Date: Sat, 7 Feb 2015 18:54:53 +0100
Subject: [PATCH 0647/2920] Added new monitoring.po for italian language

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
---
 .../locale/it_IT/LC_MESSAGES/monitoring.po    | 3271 +++++++++++++++++
 1 file changed, 3271 insertions(+)
 create mode 100644 modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.po

diff --git a/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.po b/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.po
new file mode 100644
index 000000000..6ad62c770
--- /dev/null
+++ b/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.po
@@ -0,0 +1,3271 @@
+# Icinga Web 2 - Head for multiple monitoring backends.
+# Copyright (C) 2014 Icinga Development Team
+# This file is distributed under the same license as Monitoring Module.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Monitoring Module (2.0.0~alpha4)\n"
+"Report-Msgid-Bugs-To: dev@icinga.org\n"
+"POT-Creation-Date: 2014-12-03 09:10-0200\n"
+"PO-Revision-Date: 2015-02-07 18:41+0100\n"
+"Last-Translator: Davide Demuru <davide.demuru@gmail.com>\n"
+"Language: it_IT\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.7.3\n"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:278
+msgid " Down Hosts (Handled)"
+msgstr "Host Down (Gestiti)"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:279
+msgid " Down Hosts (Unhandled)"
+msgstr "Host Down (Non Gestiti)"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:253
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:300
+msgid " Down Services (Handled)"
+msgstr "Servizi Down (Gestiti)"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:254
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:301
+msgid " Down Services (Unhandled)"
+msgstr "Servizi Down (Non Gestiti)"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:282
+msgid " Pending Hosts"
+msgstr "Host in Attesa"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:257
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:304
+msgid " Pending Services"
+msgstr "Servizi in Attesa"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:280
+msgid " Unreachable Hosts (Handled)"
+msgstr "Host Irraggiungibili (Gestiti)"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:281
+msgid " Unreachable Hosts (Unhandled)"
+msgstr "Host Irraggiungibili (Non Gestiti)"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:255
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:302
+msgid " Unreachable Services (Handled)"
+msgstr "Servizi Irraggiungibili (Gestiti)"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:256
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:303
+msgid " Unreachable Services (Unhandled)"
+msgstr "Servizi Irraggiungibili (Non Gestiti) "
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:277
+msgid " Up Hosts"
+msgstr "Host Up"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:297
+msgid " Up Services"
+msgstr "Servizi Up"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:251
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:298
+msgid " Warning Services (Handled)"
+msgstr "Servizi in Warning (Gestiti)"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:252
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:299
+msgid " Warning Services (Unhandled)"
+msgstr "Servizi in Warning (Non Gestiti)"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:10
+#, php-format
+msgid "%d Hosts DOWN"
+msgstr "%d Host Down"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:22
+#, php-format
+msgid "%d Hosts PENDING"
+msgstr "%d Host in Attesa"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:17
+#, php-format
+msgid "%d Hosts UNREACHABLE"
+msgstr "%d Host Irraggiungibili"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:15
+#, php-format
+msgid "%d Hosts UP"
+msgstr "%d Host Up"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:57
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:127
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:197
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:232
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:267
+#, php-format
+msgid "%d are not checked at all"
+msgstr "%d non sono stati controllati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:32
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:102
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:172
+#, php-format
+msgid "%d are passively checked"
+msgstr "%d sono controllati passivamente"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventgrid.phtml:31
+#, php-format
+msgid "%d critical on %s"
+msgstr "%d critici di %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventgrid.phtml:43
+#, php-format
+msgid "%d down on %s"
+msgstr "%d down di %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:20
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:87
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:138
+#, php-format
+msgid "%d hosts disabled"
+msgstr "%d host disabilitati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:36
+#, php-format
+msgid "%d hosts flapping"
+msgstr "%d host instabili"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:62
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:132
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:202
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:237
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:272
+#, php-format
+msgid "%d is not checked at all"
+msgstr "%d non sono controllati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:37
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:107
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:177
+#, php-format
+msgid "%d is passively checked"
+msgstr "%d è controllato passivamente"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventgrid.phtml:21
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventgrid.phtml:53
+#, php-format
+msgid "%d ok on %s"
+msgstr "%d ok di %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:48
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:107
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:158
+#, php-format
+msgid "%d services disabled"
+msgstr "%d servizi disabilitati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:64
+#, php-format
+msgid "%d services flapping"
+msgstr "%d servizi instabili"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:105
+#, php-format
+msgid "%d unhandled service"
+msgid_plural "%d unhandled services"
+msgstr[0] "%d servizio non gestito"
+msgstr[1] "%d servizi non gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventgrid.phtml:48
+#, php-format
+msgid "%d unknown on %s"
+msgstr "%d unknown di %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventgrid.phtml:26
+#, php-format
+msgid "%d unreachable on %s"
+msgstr "%d irraggiungibili di %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventgrid.phtml:37
+#, php-format
+msgid "%d warning on %s"
+msgstr "%d warning di %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/notifications.phtml:53
+#, php-format
+msgctxt "timespan"
+msgid "%s ago"
+msgstr "%s fa"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml:10
+#, php-format
+msgid "%s configured services:"
+msgstr "%s servizi configurati:"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:58
+#, php-format
+msgid "%s has been up and running with PID %d since %s"
+msgstr "%s è stato attivo e funzionante con il PID %d da %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:10
+#, php-format
+msgid "%s hosts:"
+msgstr "%s host:"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/not-running.phtml:5
+#, php-format
+msgid "%s is currently not up and running"
+msgstr "%s non è attualmente attivo."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:65
+#, php-format
+msgid "%s is not running"
+msgstr "%s non in funzione."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/notifications.phtml:22
+#, php-format
+msgid "%s notications have been sent for this issue"
+msgstr "%s notifiche inviate per questo problema"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:8
+#, php-format
+msgid "%s services:"
+msgstr "%s servizi:"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:81
+#, php-format
+msgid "%u Acknowledged Host Problem"
+msgid_plural "%u Acknowledged Host Problems"
+msgstr[0] "%u Problema dell'Host Confermato"
+msgstr[1] "%u Problemi dell'Host Confermati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:93
+#, php-format
+msgid "%u Acknowledged Service Problem"
+msgid_plural "%u Acknowledged Service Problems"
+msgstr[0] "%u Problema del Servizio Confermato"
+msgstr[1] "%u Problemi del Servizio Confermati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:21
+#, php-format
+msgid "%u Hosts"
+msgstr "%u Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:54
+#, php-format
+msgid "%u Unhandled Host Problem"
+msgid_plural "%u Unhandled Host Problems"
+msgstr[0] "%u Problema dell'Host Non Gestito"
+msgstr[1] "%u Problemi dell'Host Non Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:66
+#, php-format
+msgid "%u Unhandled Service Problem"
+msgid_plural "%u Unhandled Service Problems"
+msgstr[0] "%u Problema del Servizio Non Gestito"
+msgstr[1] "%u Problemi del Servizio Non Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:44
+msgid "(hard state)"
+msgstr "(stato hard)"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:42
+msgid "(soft state)"
+msgstr "(stato soft)"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:74
+msgid "1 Year"
+msgstr "1 Anno"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:75
+msgid "2 Years"
+msgstr "2 Anni"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:71
+msgid "3 Months"
+msgstr "3 Mesi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:100
+msgid "4 Hours"
+msgstr "4 ore"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:72
+msgid "4 Months"
+msgstr "4 Mesi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:73
+msgid "8 Months"
+msgstr "8 Mesi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:202
+msgid "<b>{title}:</b><br> {value} of {sum} hosts are {label}"
+msgstr "<b>{title}:</b><br> {value} di{sum} host sono {label}"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:150
+msgid "<b>{title}:</b><br>{value} of {sum} services are {label}"
+msgstr "<b>{title}:</b><br> {value} di{sum} servizi sono {label}"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/notifications.phtml:17
+#, php-format
+msgid "A notication has been sent for this issue %s ago"
+msgstr "Una notifica è stata inviata per questo problema %s fa"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:64
+msgid "Ack removed"
+msgstr "Conferma rimossa"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:59
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:35
+msgid "Acknowledge"
+msgstr "Conferma"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostController.php:49
+msgid "Acknowledge Host Problem"
+msgstr "Conferma il Problema dell'Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostsController.php:143
+msgid "Acknowledge Host Problems"
+msgstr "Conferma i Problemi dell'Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServiceController.php:49
+msgid "Acknowledge Service Problem"
+msgstr "Conferma il Problema del Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServicesController.php:163
+msgid "Acknowledge Service Problems"
+msgstr "Conferma i Problemi del Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/comments.phtml:14
+msgid "Acknowledge all problems on the selected hosts or services"
+msgstr "Conferma tutti i problemi degli host o servizi selezionati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:24
+msgid "Acknowledge problem"
+msgid_plural "Acknowledge problems"
+msgstr[0] "Reconhecer o problema"
+msgstr[1] "Reconhecer o problemas"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:70
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:72
+msgid "Acknowledge unhandled problem hosts"
+msgstr "Conferma i problemi non gestiti degli Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:82
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:84
+msgid "Acknowledge unhandled problem services"
+msgstr "Conferma i problemi non gestiti dei Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:24
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/statusIcons.phtml:30
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:53
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:75
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:16
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:86
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:156
+msgid "Acknowledged"
+msgstr "Confermato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:44
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:39
+msgid "Acknowledgement"
+msgstr "Conferma"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:949
+msgid "Acknowledgement has been sent"
+msgstr "Conferma inviata"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:971
+msgid "Acknowledgement removal has been requested"
+msgstr "Rimozione della Conferma in corso"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:62
+msgid "Acknowledgements"
+msgstr "Problemi Confermati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:166
+msgid "Acknowledging problem.."
+msgid_plural "Acknowledging problems.."
+msgstr[0] "Reconhecendo problema.."
+msgstr[1] "Reconhecendo problemas.."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:20
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:52
+msgid "Active"
+msgstr "Attivo"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/statusIcons.phtml:45
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:70
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:98
+msgid "Active And Passive Checks Disabled"
+msgstr "Controlli Attivi e Passivi Disabilitati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:36
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:63
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:131
+msgid "Active Checks"
+msgstr "Controlli Attivi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/statusIcons.phtml:43
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:72
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:100
+msgid "Active Checks Disabled"
+msgstr "Controlli Attivi Disabilitati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:81
+msgid "Active Host Checks Being Executed"
+msgstr "Esegui Controlli Attivi sugli Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:89
+msgid "Active Service Checks Being Executed"
+msgstr "Esegui Controlli Attivi sui Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:121
+msgid "Active checks"
+msgstr "Controlli Attivi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostController.php:58
+msgid "Add Host Comment"
+msgstr "Aggiungi commento all'Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/createbackend.phtml:1
+msgid "Add New Backend"
+msgstr "Aggiungi Nuovo Backend"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/createinstance.phtml:1
+msgid "Add New Instance"
+msgstr "Aggiungi Nuova Istanza"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServiceController.php:58
+msgid "Add Service Comment"
+msgstr "Aggiungi Commento al Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/comments.phtml:22
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:22
+msgid "Add comment"
+msgid_plural "Add comments"
+msgstr[0] "Adicionar comentário"
+msgstr[1] "Adicionar comentários"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:93
+msgid "Adding comment.."
+msgid_plural "Adding comments.."
+msgstr[0] "Adicionando comentário.."
+msgstr[1] "Adicionando comentários.."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:145
+msgid "Address"
+msgstr "Indirizzo"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:171
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:67
+msgid "Alert Summary"
+msgstr "Storico Allarmi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:14
+msgid "Alert summary"
+msgstr "Storico Allarmi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:376
+msgid "Alias"
+msgstr "Alias"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:27
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:30
+msgid "All Services"
+msgstr "Tutti i Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:177
+msgid "All backends are disabled"
+msgstr "Tutti i backend sono disabilitati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:28
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:95
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:146
+msgid "All hosts enabled"
+msgstr "Tutti gli host abilitati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:56
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:115
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:166
+msgid "All services enabled"
+msgstr "Tutti i servizi abilitati"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:25
+msgid "Allow acknowledging host and service problems"
+msgstr "Consenti la Conferma dei problemi si Host e Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:9
+msgid "Allow all commands"
+msgstr "Consenti tutti i Comandi"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:13
+msgid "Allow all scheduling checks and downtimes"
+msgstr "Consenti la Schedulazione di Controlli e Manutenzioni"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:29
+msgid "Allow commenting on hosts and services"
+msgstr "Consenti l'aggiunta di Commenti su Host e Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:41
+msgid "Allow removing host and service comments"
+msgstr "Consenti la rimozione di Commenti da Host e Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:45
+msgid "Allow removing host and service downtimes"
+msgstr "Consenti la rimozione di Manutenzioni da Host e Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:37
+msgid "Allow removing problem acknowledgements"
+msgstr "Consenti la rimozione di Conferme"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:33
+msgid ""
+"Allow removing problem acknowledgements, host and service comments and "
+"downtimes"
+msgstr ""
+"Permitir a remoção de reconhecimento de problemas, comentários de hosts e de "
+"serviços e paradas"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:17
+msgid "Allow scheduling host and service checks"
+msgstr "Consenti la schedulazione di Controlli su Host e Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:21
+msgid "Allow scheduling host and service downtimes"
+msgstr "Consenti la schedulazione di Manutenzioni su Host e Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:22
+msgid "Apply"
+msgstr "Applica"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/removeinstance.phtml:2
+msgid "Are you sure you want to remove this instance?"
+msgstr "Sicuro di voler rimuovere l'istanza?"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:308
+msgid "Author"
+msgstr "Autore"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:36
+msgid "Average"
+msgstr "Media"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:109
+msgid "Average services per host"
+msgstr "Media di Servizi per Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:444
+msgid "Avg (min)"
+msgstr "Media (min)"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ConfigController.php:76
+#, php-format
+msgid "Backend \"%s\" successfully removed."
+msgstr "Backend \"%s\" rimosso con successo."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:211
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/BackendPage.php:47
+msgid "Backend Name"
+msgstr "Nome Backend"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:221
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/BackendPage.php:63
+msgid "Backend Type"
+msgstr "Tipo Backend"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:34
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:52
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:34
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:52
+msgid "CRITICAL"
+msgstr "CRITICAL"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:8
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:16
+msgctxt "icinga.state"
+msgid "CRITICAL"
+msgstr "CRITICAL"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checksource.phtml:3
+msgid "Check Source"
+msgstr "Sorgente del Controllo"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:67
+msgid "Check Time"
+msgstr "Ora del Controllo"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:40
+msgid "Check attempts"
+msgstr "Tentativi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:49
+msgid "Check execution time"
+msgstr "Durata"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:55
+msgid "Check latency"
+msgstr "Latenza"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:38
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:39
+msgid "Check now"
+msgstr "Controlla ora"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:95
+msgid ""
+"Check this to not to validate connectivity with the given Livestatus socket"
+msgstr ""
+"Spunta questa casella per non verificare la connettività con il socket "
+"Livestatus fornito"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/IdoResourcePage.php:95
+msgid ""
+"Check this to not to validate connectivity with the given database server"
+msgstr ""
+"Spunta questa casella per non verificare la connettività con il database "
+"fornito"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:41
+msgid "Child Hosts"
+msgstr "Host Figli"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/SecurityConfigForm.php:59
+msgid ""
+"Comma separated case insensitive list of protected custom variables. Use * "
+"as a placeholder for zero or more wildcard characters. Existance of those "
+"custom variables will be shown, but their values will be masked."
+msgstr ""
+"Lista delle variabili riservate (case insensitive) separate da virgola. "
+"Usare * come carattere jolly. Le variabili fornite verranno mostrate ma il "
+"loro contenuto sarà mascherato."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/command.phtml:7
+msgid "Command"
+msgstr "Comando"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:65
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php:31
+msgid "Command File"
+msgstr "File del Comando"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:294
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:725
+msgid "Command has been sent, active checks will be disabled"
+msgstr "Comando inviato, i Controlli Attivi saranno disabilitati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:319
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:745
+msgid "Command has been sent, active checks will be enabled"
+msgstr "Comando inviato, i Controlli Attivi saranno abilitati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:338
+msgid "Command has been sent, check will be rescheduled"
+msgstr "Comando inviato, il Controllo sarà rischedulato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:705
+msgid "Command has been sent, checks will be rescheduled"
+msgstr "Comando inviato, i Controlli saranno rischedulati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:776
+msgid "Command has been sent, event handlers will be disabled"
+msgstr "Comando inviato, il Gestore Eventi sarà disabilitato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:808
+msgid "Command has been sent, event handlers will be enabled"
+msgstr "Comando inviato, il Gestore Eventi sarà abilitato"
+
+# rivedere
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:841
+msgid "Command has been sent, flap detection will be disabled"
+msgstr "Comando inviato, il controllo di instabilità sarà disabilitato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:874
+msgid "Command has been sent, flap detection will be enabled"
+msgstr "Comando inviato, il controllo di instabilità sarà abilitato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1051
+msgid "Command has been sent, monitoring process will restart now"
+msgstr "Comando inviato, il processo di monitoraggio sarà riavviato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:514
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:542
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:665
+msgid "Command has been sent, notifications will be disabled"
+msgstr "Comando inviato, le notifiche saranno disabilitate"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:572
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:686
+msgid "Command has been sent, notifications will be enabled"
+msgstr "Comando inviato, le notifiche saranno abilitate"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:395
+msgid "Command has been sent, obsessing will be disabled"
+msgstr "Comando inviato, la modalità ossessiva sarà disabilitata"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:429
+msgid "Command has been sent, obsessing will be enabled"
+msgstr "Comando inviato, la modalità ossessiva sarà abilitata"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:496
+msgid "Command has been sent, passive check results will be accepted"
+msgstr "Comando inviato, i risultati dei controlli passivi saranno accettati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:463
+msgid "Command has been sent, passive check results will be refused"
+msgstr "Comando inviato, i risultati dei controlli passivi saranno ignorati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1073
+msgid "Command has been sent, performance data processing will be disabled"
+msgstr "Comando inviato, la raccolta dei dati di performance sarà disabilitata"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1095
+msgid "Command has been sent, performance data processing will be enabled"
+msgstr "Comando inviato, la raccolta dei dati di performance sarà abilitata"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1030
+msgid "Command has been sent, process will shut down"
+msgstr "Comando inviato, il processo sarà arrestato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/contact.phtml:45
+msgid "Commands"
+msgstr "Comandi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:49
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:39
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:54
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:50
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:70
+msgid "Comment"
+msgstr "Commento"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:481
+msgid "Comment Timestamp"
+msgstr "Ora Commento"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:483
+msgid "Comment Type"
+msgstr "Tipo di Commento"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:54
+msgid "Comment deleted"
+msgstr "Commento rimosso"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:913
+msgid "Comment removal has been requested"
+msgstr "Richesta di rimozione del commento inviata"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:36
+msgid "Comment was caused by a downtime."
+msgstr "Commento generato da una manutenzione."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:26
+msgid "Comment was caused by a flapping host or service."
+msgstr "Commento generato da un host o servizio instabile."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:40
+msgid "Comment was caused by an acknowledgement."
+msgstr "Commento generato dalla conferma di un problema"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:31
+msgid "Comment was created by an user."
+msgstr "Commento creato da un utente."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:77
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:93
+msgid "Comment: "
+msgstr "Commento: "
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:138
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/comments.phtml:2
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:106
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/comments.phtml:6
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:118
+#: /usr/local/icingaweb/modules/monitoring/application/forms/EventOverviewForm.php:67
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:57
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:462
+msgid "Comments"
+msgstr "Commenti"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:195
+#, php-format
+msgid "Configuration for backend %s is disabled"
+msgstr "La configurazione per il backend %s è disabilitata"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:430
+msgid "Contact Groups"
+msgstr "Gruppi di Contatti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/contact.phtml:4
+msgid "Contact details"
+msgstr "Dettagli del Contatto"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:130
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/contacts.phtml:33
+msgid "Contactgroups"
+msgstr "Gruppi di contatti"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:142
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/contacts.phtml:14
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:350
+msgid "Contacts"
+msgstr "Contatti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:53
+msgid "Could not find any valid monitoring backend resources"
+msgstr ""
+"Não foi possível encontrar nenhum recurso válido de backend de monitoramento"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:41
+msgid "Create New Instance"
+msgstr "Crea una Nuova Istanza"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:9
+msgid "Create New Monitoring Backend"
+msgstr "Crea un Nuovo Backend di Monitoraggio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:119
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:167
+msgid "Critical"
+msgstr "Critical"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:97
+msgid "Current Downtimes"
+msgstr "Manutenzioni in corso"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:237
+msgid "Current Host State"
+msgstr "Stato Corrente degli Host"
+
+# rivedere
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:187
+msgid "Current Incidents"
+msgstr "Problemi Correnti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:233
+msgid "Current Service State"
+msgstr "Stato Corrente dei Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:146
+msgid "Current State"
+msgstr "Stato Corrente"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:588
+msgid "Custom notification has been sent"
+msgstr "Notifica personalizza inviata"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:114
+msgid "Database Name"
+msgstr "Nome Database"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:93
+msgid "Database Resource"
+msgstr "Risorsa Database"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:102
+msgid "Database Type"
+msgstr "Tipo Database"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:489
+msgid "Defects"
+msgstr "Difetti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:50
+msgid "Define what should be done with the child hosts of the hosts."
+msgstr "Definire che azione compiere con gli Host figli"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/comments.phtml:13
+msgid "Delay Notifications"
+msgstr "Posticipa Notifiche"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1001
+msgid "Delete Downtime"
+msgstr "Cancella Manutenzione"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1003
+msgid "Delete a single downtime with the id shown above"
+msgstr "Cancella la manutenzione con ID definito"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:58
+msgid "Delete comment"
+msgstr "Rimuovi Commento"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php:58
+msgid "Delete downtime"
+msgstr "Cancella Manutenzione"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:83
+msgid "Deleting comment.."
+msgstr "Rimozione commento..."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php:83
+msgid "Deleting downtime.."
+msgstr "Cancellazione Manutenzione..."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:282
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:717
+msgid "Disable Active Checks"
+msgstr "Disabilita i Controlli Attivi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:757
+msgid "Disable Event Handler"
+msgstr "Disabilita il Gestore Eventi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:820
+msgid "Disable Flapping Detection"
+msgstr "Disabilita il Controllo Instabilità"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:24
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ProcessController.php:94
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:527
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:656
+msgid "Disable Notifications"
+msgstr "Disabilita le Notifiche"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1064
+msgid "Disable Performance Data"
+msgstr "Disabilita i Dati di Performance"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:203
+msgid "Disable This Backend"
+msgstr "Disabilita Backend"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:718
+msgid "Disable active checks for this host and its services."
+msgstr "Disabilita i controlli attivi per questo host e relativi servizi."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:287
+msgid "Disable active checks for this object."
+msgstr "Disabilita i controlli attivi per questo oggetto."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:285
+msgid "Disable active checks on a program-wide basis."
+msgstr "Disabilita i controlli attivi sull'intero sistema"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:760
+msgid "Disable event handler for the whole system."
+msgstr "Disabilita il Gestore Eventi sull'intero sistema."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:762
+msgid "Disable event handler for this object."
+msgstr "Disabilita il Gestore Eventi per questo oggetto."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:825
+msgid "Disable flapping detection for this object."
+msgstr "Disabilita il Controllo di Instabilità per questo oggetto."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:823
+msgid "Disable flapping detection on a program-wide basis."
+msgstr "Disabilita il Controllo di Instabilità per l'intero sistema."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:64
+msgid "Disable notifications for a specific time on a program-wide basis"
+msgstr "Disabilita le notifiche per un periodo specifico sull'intero sistema"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:530
+msgid "Disable notifications on a program-wide basis."
+msgstr "Disabilita le notifiche sull'intero sistema"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:376
+msgid "Disable obsessing on a program-wide basis."
+msgstr "Disabilita la modalità ossessiva su tutto il sistema."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:444
+msgid "Disable passive checks on a program-wide basis."
+msgstr "Disabilita i controlli passivi sull'intero sistema"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1065
+msgid "Disable processing of performance data on a program-wide basis."
+msgstr "Disabilita la raccolta dei dati di performance sull'intero sistema"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:66
+msgid "Disable temporarily"
+msgstr "Disabilita Temporaneamente"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:40
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:72
+msgid "Disabled"
+msgstr "Disabilitato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:70
+msgid "Disabling host and service notifications.."
+msgstr "Disabilazione Notifiche di Host e Servizi in corso..."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:44
+msgid "Do nothing with child hosts"
+msgstr "Non applicare agli Host figli"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:140
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:217
+msgid "Down"
+msgstr "Down"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:35
+msgid "Downtime"
+msgstr "Manutenzione"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:114
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:89
+msgid "Downtime End"
+msgstr "Fine Manutenzione"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:109
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:84
+msgid "Downtime Start"
+msgstr "Inizio Manutenzione"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1010
+msgid "Downtime removal has been requested"
+msgstr "Cancellazione della Manutenzione in corso"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:644
+msgid "Downtime removal requested"
+msgstr "Richiesta di cancellazione Manutenzione"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:74
+msgid "Downtime removed"
+msgstr "Manutenzione cancellata"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:607
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:625
+msgid "Downtime scheduling requested"
+msgstr "Schedulazione di Manutenzione richiesta"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:134
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/downtime.phtml:2
+#: /usr/local/icingaweb/modules/monitoring/application/forms/EventOverviewForm.php:57
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:279
+msgid "Downtimes"
+msgstr "Manutenzioni"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:313
+msgid "Duration"
+msgstr "Durata"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/editbackend.phtml:1
+msgid "Edit Existing Backend"
+msgstr "Modifica Backend Esistenti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/editinstance.phtml:1
+msgid "Edit Existing Instance"
+msgstr "Modifica Istanze Esistenti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/contact.phtml:22
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/contacts.phtml:28
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:377
+msgid "Email"
+msgstr "Email"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:309
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:737
+msgid "Enable Active Checks"
+msgstr "Abilita Controlli Attivi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:789
+msgid "Enable Event Handler"
+msgstr "Abilita Gestore Eventi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:853
+msgid "Enable Flapping Detection"
+msgstr "Abilita il Controllo Instabilità"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:557
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:677
+msgid "Enable Notifications"
+msgstr "Abilita Notifiche"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1086
+msgid "Enable Performance Data"
+msgstr "Abilita i Dati di Performance"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:738
+msgid "Enable active checks for this host and its services."
+msgstr "Abilita i controlli attivi per questo host e relativi servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:313
+msgid "Enable active checks for this object."
+msgstr "Abilita i controlli attivi per questo oggetto"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:311
+msgid "Enable active checks on a program-wide basis."
+msgstr "Abilita i controlli attivi sull'intero sistema"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:794
+msgid "Enable event handler for this object."
+msgstr "Abilita il gestore eventi per questo oggetto."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:792
+msgid "Enable event handlers on the whole system."
+msgstr "Abilita il gestore eventi sull'intero sistema."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:858
+msgid "Enable flapping detection for this object."
+msgstr "Abilita il controllo di instabilità per questo oggetto."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:856
+msgid "Enable flapping detection on a program-wide basis."
+msgstr "Abilita il controllo di instabilità su tutto il sistema."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:560
+msgid "Enable notifications on a program-wide basis."
+msgstr "Abilita le notifiche sull'intero sistema."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:410
+msgid "Enable obsessing on a program-wide basis."
+msgstr "Abilita la modalità ossessiva su tutto il sistema."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:478
+msgid "Enable passive checks on a program-wide basis."
+msgstr "Abilita i controlli passivi sull'intero sistema."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1087
+msgid "Enable processing of performance data on a program-wide basis."
+msgstr ""
+"Habilitar processamento de dados de performance na base de todo o programa."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:94
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:310
+msgid "End Time"
+msgstr "Ora Fine"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:72
+msgid "Ended downtimes"
+msgstr "Manutenzioni completate"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:167
+msgid ""
+"Enter here the duration of the downtime. The downtime will be automatically "
+"deleted after this time expired."
+msgstr ""
+"Inserire qui la durata della manutenzione. Icinga cancellerà automaticamente "
+"la manutenzione allo scadere del tempo."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:96
+msgid ""
+"Enter the expire date and time for this acknowledgement here. Icinga will "
+"delete the acknowledgement after this time expired."
+msgstr ""
+"Inserire qui la durata della conferma del problema. Icinga cancellerà "
+"automaticamente la conferma allo scadere del tempo."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:307
+msgid "Entry Time"
+msgstr "Ora Inserimento"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:153
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:389
+msgid "Event Grid"
+msgstr "Griglia Eventi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:68
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:65
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:133
+msgid "Event Handler"
+msgstr "Gestore Eventi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:97
+msgid "Event Handlers Enabled"
+msgstr "Gestore Eventi Abilitato"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:158
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:589
+msgid "Event Overview"
+msgstr "Panoramica Eventi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:124
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:126
+msgid "Event handlers"
+msgstr "Gestori Eventi"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:157
+msgid "Events"
+msgstr "Eventi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:128
+msgid "Execution time"
+msgstr "Tempo di Esecuzione"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:484
+msgid "Expiration"
+msgstr "Scadenza"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:52
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:92
+msgid "Expire Time"
+msgstr "Ora Scadenza"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:34
+msgid "Expires"
+msgstr "Scade"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:15
+msgid "Feature Commands"
+msgstr "Controllo Funzionalità"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:114
+msgid "Fixed"
+msgstr "Rigido"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:76
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:66
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:134
+msgid "Flap Detection"
+msgstr "Controllo Instabilità"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:105
+msgid "Flap Detection Enabled"
+msgstr "Controllo Instbilità Attivato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:6
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:8
+msgid "Flap detection"
+msgstr "Controllo Instabilità"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:79
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:57
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:54
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:81
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:25
+#: /usr/local/icingaweb/modules/monitoring/application/forms/EventOverviewForm.php:87
+msgid "Flapping"
+msgstr "Instabile"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:59
+msgid "Flapping Stopped"
+msgstr "Instabilità Terminata"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:84
+msgid "Flapping stopped"
+msgstr "Instabilità Terminata"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:115
+msgid "Flexible"
+msgstr "Flessibile"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:164
+msgid "Flexible Duration"
+msgstr "Durata Flessibile"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:76
+msgid "Force Check"
+msgstr "Forza Controllo"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:68
+msgid "From"
+msgstr "Da"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:48
+msgid "Global Host Event Handler"
+msgstr "Gestore Eventi Host Globale"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:42
+msgid "Global Service Event Handler"
+msgstr "Gestore Eventi Servizi Globale"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:39
+msgid "Handled hosts with state DOWN"
+msgstr "Host Gestiti con stato DOWN"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:64
+msgid "Handled hosts with state UNREACHABLE"
+msgstr "Host Gestiti con stato IRRAGGIUNGIBILE"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml:68
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:64
+#, php-format
+msgid "Handled services with state %s"
+msgstr "Servizi Gestiti con stato %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:147
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:235
+msgid "Hard State"
+msgstr "Stato Hard"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:52
+msgid "Hard state changes"
+msgstr "Cambi di stato Hard"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:150
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:72
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ShowController.php:235
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:219
+msgid "History"
+msgstr "Storico"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/partials/command-form.phtml:9
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:32
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ShowController.php:205
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:106
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:189
+msgid "Host"
+msgstr "Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:306
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:482
+msgid "Host / Service"
+msgstr "Host / Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:239
+msgid "Host Address"
+msgstr "Indirizzo Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:134
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:156
+msgid "Host Checks"
+msgstr "Controlli dell'Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:25
+msgid "Host Group"
+msgstr "Gruppo di Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:574
+msgid "Host Group Name"
+msgstr "Nome del Gruppo di Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:542
+msgid "Host Groups"
+msgstr "Gruppi di Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:238
+msgid "Host Name"
+msgstr "Nome Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:380
+msgid "Host Notification Timeperiod"
+msgstr "Periodo delle Notifiche per l'Host"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:89
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:197
+msgid "Host Problems"
+msgstr "Problemi dell'Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:236
+msgid "Host Severity"
+msgstr "Impatto Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:57
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:125
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostsController.php:123
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServicesController.php:143
+msgid "Host State"
+msgstr "Stato Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/disable-notifications.phtml:8
+msgid "Host and service notifications are already disabled."
+msgstr "Notifiche per Host e Servizi sono già disabilitate"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostController.php:29
+msgid "Host not found"
+msgstr "Host non trovato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/contacts.phtml:47
+msgid "Host notification period"
+msgstr "Periodo di Notifica per l'Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ShowController.php:41
+msgid "Host or service not found"
+msgstr "Host o Servizio non trovato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:2
+msgid "Host- and Servicechecks"
+msgstr "Controlli per Host o Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:68
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:126
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml:13
+msgid "Hostgroups"
+msgstr "Gruppi di Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:144
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:629
+msgid "Hostname"
+msgstr "Nome Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:34
+msgid "Hostname or address of the remote Icinga instance"
+msgstr "Nome Host o Indirizzo dell'istanza remota di Icinga"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:66
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:110
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/contact.phtml:33
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:85
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/objectlist.phtml:37
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/summary.phtml:5
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:7
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:102
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:205
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:110
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostsController.php:49
+msgid "Hosts"
+msgstr "Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:9
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:25
+#, php-format
+msgid "Hosts (%u)"
+msgstr "Host (%u)"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:11
+msgid "Hosts Down Handled"
+msgstr "Host Down Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:8
+msgid "Hosts Down Unhandled"
+msgstr "Host Down Non Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:24
+msgid "Hosts Pending"
+msgstr "Host in Attesa"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:19
+msgid "Hosts Unreachable Handled"
+msgstr "Host Irraggiungibili Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:16
+msgid "Hosts Unreachable Unhandled"
+msgstr "Host Irraggiungibili Non Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:3
+msgid "Hosts Up"
+msgstr "Host Up"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:96
+msgid "Hosts in downtime"
+msgstr "Host in Manutenzione"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:79
+msgid "Hosts with state PENDING"
+msgstr "Host in stato ATTESA"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:18
+msgid "Hosts with state UP"
+msgstr "Host in stato UP"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:144
+msgid "Hours"
+msgstr "Ore"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/SecurityStep.php:48
+msgid ""
+"Icinga Web 2 will protect your monitoring environment against prying eyes "
+"using the configuration specified below:"
+msgstr ""
+"Icinga Web 2 proteggerà il tuo ambiente di monitoraggio da occhi indiscreti "
+"usando la configurazione specificata qui sotto:"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:86
+#, php-format
+msgid ""
+"Icinga Web 2 will retrieve information from your monitoring environment "
+"using a backend called \"%s\" and the specified resource below:"
+msgstr ""
+"Icinga Web 2 recupererà le informazioni dal tuo ambiente di monitoraggio "
+"usando il backend chiamato \"%s\" e le risorse spacificate qui sotto:"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/InstanceStep.php:79
+#, php-format
+msgid ""
+"Icinga Web 2 will use the named pipe located at \"%s\" to send commands to "
+"your monitoring instance."
+msgstr ""
+"Icinga Web 2 utilizzerà la pipe situata in \"%s\" per inviare comandi alla "
+"vostra istanza di monitoraggio."
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/InstanceStep.php:52
+#, php-format
+msgid ""
+"Icinga Web 2 will use the named pipe located on a remote machine at \"%s\" "
+"to send commands to your monitoring instance by using the connection details "
+"listed below:"
+msgstr ""
+"Icinga Web 2 la pipe situata nella macchina remota in \"%s\" per inviare "
+"comandi alla vostra istanza di monitoraggio utilizzando i dettagli per la "
+"connessione descritti qui sotto:"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:80
+msgid "If the acknowledgement should expire, check this option."
+msgstr "Se la Conferma del Problema deve scadere, spuntare questa casella."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:134
+msgid ""
+"If you do not want an acknowledgement notification to be sent out to the "
+"appropriate contacts, uncheck this option."
+msgstr ""
+"In caso non si voglia inviare una Notifica di Conferma ai contatti "
+"configurati, deselezionare questa opzione."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/removeinstance.phtml:3
+msgid ""
+"If you have still any environments or views referring to this instance, you "
+"won't be able to send commands anymore after deletion."
+msgstr ""
+"In caso qualche altro ambiente o vista faccia riferimento a questa istanza, "
+"non sarà più possibile inviare comandi dopo la cancellazione."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:108
+msgid ""
+"If you select the fixed option, the downtime will be in effect between the "
+"start and end times you specify whereas a flexible downtime starts when the "
+"host or service enters a problem state sometime between the start and end "
+"times you specified and lasts as long as the duration time you enter. The "
+"duration fields do not apply for fixed downtimes."
+msgstr ""
+"Con l'opzione Rigido la manutenzione avrà effetto dall'ora di inizio all'ora "
+"di fine specificate. Se si seleziona l'opzione Flessibile la manutenzione "
+"partirà quando il servizio raggiungerà uno stato non OK e finirà in base "
+"alla durata inserita (anche all'esterno dell'ora di inizio e fine "
+"specificata). Il campi della Durata non avranno effetto sulle Manutenzioni "
+"Rigide."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:79
+msgid ""
+"If you select this option, Icinga will force a check regardless of both what "
+"time the scheduled check occurs and whether or not checks are enabled."
+msgstr ""
+"Selezionando questa opzione, Icinga forzerà l'esecuzione del controllo "
+"ignorando se controlli attivi sono disabilitati e gli orari di schedulazione."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:67
+msgid ""
+"If you uncheck this option, the comment will automatically be deleted the "
+"next time Icinga is restarted."
+msgstr ""
+"Slezionando questa opzione il commento verrà automaticamente rimosso al "
+"prossimo riavvio di Icinga."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:121
+msgid ""
+"If you want the acknowledgement to disable notifications until the host or "
+"service recovers, check this option."
+msgstr ""
+"Selezionando questa opzione le notifiche verranno disabilitate fino al "
+"ripristino dell'host o servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:57
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:53
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:73
+msgid ""
+"If you work with other administrators, you may find it useful to share "
+"information about the the host or service that is having problems. Make sure "
+"you enter a brief description of what you are doing."
+msgstr ""
+"Se lavori con altri amministratori potresti trovare utile condividere le "
+"informazioni riguardo l'host e i servizi che stanno avendo problemi. "
+"Assicurati di inserire una breve descrizione delle azioni che stai svolgendo."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:70
+msgid ""
+"If you would like the comment to remain even when the acknowledgement is "
+"removed, check this option."
+msgstr ""
+"Selezionando questa opzione il commento rimarrà anche dopo la fine della "
+"Conferma del Problema."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:69
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/statusIcons.phtml:38
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:65
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:49
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:89
+msgid "In Downtime"
+msgstr "In Manutenzione"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:46
+msgid "Instance"
+msgstr "Istanza"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:161
+#, php-format
+msgid "Instance \"%s\" created successfully."
+msgstr "Istanza \"%s\" creata con successo."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:164
+#, php-format
+msgid "Instance \"%s\" edited successfully."
+msgstr "Istanza \"%s\" modificata con successo."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ConfigController.php:108
+#, php-format
+msgid "Instance \"%s\" successfully removed."
+msgstr "Istanza \"%s\" rimossa con successo."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:192
+msgid "Instance Name"
+msgstr "Nome Istanza"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:201
+msgid "Instance Type"
+msgstr "Tipo Istanza"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:75
+msgid "Instance already exists"
+msgstr "Istanza già esistente"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:116
+#, php-format
+msgid "Instance is not configured: %s"
+msgstr "Istanza non configurata: %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:72
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:120
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:139
+msgid "Instance name missing"
+msgstr "Nome istanza mancante"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:51
+#, php-format
+msgid "Invalid instance type \"%s\" given"
+msgstr "Tipo \"%s\" di Istanza non valido"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:305
+msgid "Is In Effect"
+msgstr "E' in Corso"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/WelcomePage.php:47
+msgid ""
+"It offers various status and reporting views with powerful filter "
+"capabilities that allow you to keep track of the most important events in "
+"your monitoring environment."
+msgstr ""
+"Offre varie viste di reportistica con la capacità di configurare filtri "
+"specifici per permettere di tenere traccia degli eventi più importanti degli "
+"eventi di monitoraggio."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:142
+msgid "Last Check"
+msgstr "Ultimo controllo"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:32
+msgid "Last External Command Check"
+msgstr "Ultimo Comando Esterno"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:240
+msgid "Last Host Check"
+msgstr "Ultimo Controllo dell'Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:36
+msgid "Last Log File Rotation"
+msgstr "Ultima Rotazione del File di Log"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:24
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:24
+msgid "Last Problem"
+msgstr "Ultimo Problema"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:231
+msgid "Last Service Check"
+msgstr "Ultimo Controllo del Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:28
+msgid "Last Status Update"
+msgstr "Ultimo Aggiornamento di Stato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:24
+msgid "Last check"
+msgstr "Ultimo Controllo"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:127
+msgid "Latency"
+msgstr "Latenza"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/timeline/index.phtml:16
+msgid "Legend"
+msgstr "Legenda"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/command/list.phtml:1
+msgid "List Of Supported Commands"
+msgstr "Lista dei Comandi Supportati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:27
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:28
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/objectlist.phtml:49
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:38
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:39
+msgid "List all"
+msgstr "Mostra tutto"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/objectlist.phtml:52
+msgid "List all selected objects"
+msgstr "Mostra tutti gli oggetti selezionati"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:128
+msgid "Livestatus Resource"
+msgstr "Risorsa Livestatus"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:58
+msgid "Local"
+msgstr "Locale"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:203
+msgid "Local Command File"
+msgstr "File dei Comandi Locale"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:453
+msgid "Max (min)"
+msgstr "Max (min)"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:154
+msgid "Minutes"
+msgstr "Minuti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:14
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/BackendPage.php:23
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:82
+msgid "Monitoring Backend"
+msgstr "Backend di Monitoraggio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:3
+msgid "Monitoring Backends"
+msgstr "Backend di Monitoraggio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:2
+msgid "Monitoring Features"
+msgstr "Proprietà del Monitoraggio"
+
+# rivdere
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:179
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ProcessController.php:26
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ProcessController.php:37
+msgid "Monitoring Health"
+msgstr "Configurazioni Globali"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/IdoResourcePage.php:31
+msgid "Monitoring IDO Resource"
+msgstr "Risorsa IDO del Monitoraggio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/InstancePage.php:23
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/InstanceStep.php:46
+msgid "Monitoring Instance"
+msgstr "Istanza di Monitoraggio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:38
+msgid "Monitoring Instances"
+msgstr "Istanze di Monitoraggio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:31
+msgid "Monitoring Livestatus Resource"
+msgstr "Risorsa Livestatus di Monitoraggio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/SecurityPage.php:23
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/SecurityStep.php:45
+msgid "Monitoring Security"
+msgstr "Sicurezza del Monitoraggio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:146
+#, php-format
+msgid "Monitoring backend \"%s\" has been successfully changed"
+msgstr "Backend di monitoraggio \"%s\" modificato con successo"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:143
+#, php-format
+msgid "Monitoring backend \"%s\" has been successfully created"
+msgstr "Backend di monitoraggio \"%s\" creato con successo"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:77
+msgid "Monitoring backend already exists"
+msgstr "Backend di monitoraggio già esistente"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:156
+#, php-format
+msgid ""
+"Monitoring backend configuration could not be written to: %s; An error "
+"occured:"
+msgstr ""
+"Impossibile scrivere la configurazione del backend di monitoraggio in: %s; "
+"Errore:"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:151
+#, php-format
+msgid "Monitoring backend configuration has been successfully written to: %s"
+msgstr ""
+"La configurazione del backend di monitoraggio è stata salvata con successo "
+"in: %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:75
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:122
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:172
+msgid "Monitoring backend name missing"
+msgstr "Nome del backend di monitoraggio mancante"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/InstanceStep.php:97
+#, php-format
+msgid ""
+"Monitoring instance configuration could not be written to: %s; An error "
+"occured:"
+msgstr ""
+"Impossibile scrivere la configurazione dell'istanza di monitoraggio in: %s; "
+"Errore:"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/InstanceStep.php:92
+#, php-format
+msgid "Monitoring instance configuration has been successfully created: %s"
+msgstr ""
+"La configurazione dell'istanza di monitoraggio è stata salvata con successo "
+"in: %s"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/SecurityStep.php:75
+#, php-format
+msgid ""
+"Monitoring security configuration could not be written to: %s; An error "
+"occured:"
+msgstr ""
+"Impossibile scrivere la configurazione di sicurezza del monitoraggio in: %s; "
+"Errore:"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/SecurityStep.php:70
+#, php-format
+msgid "Monitoring security configuration has been successfully created: %s"
+msgstr ""
+"La configurazione di sicurezza del monitoraggio è stata scritta con successo "
+"in: %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:39
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:45
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:51
+msgid "N/A"
+msgstr "N/A"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:375
+msgid "Name"
+msgstr "Nome"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:98
+msgid "New instance name missing"
+msgstr "Nome nuova istanza mancante"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:100
+msgid "New monitoring backend name missing"
+msgstr "Nome del nuovo backend di monitoraggio mancante"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/SecurityConfigForm.php:32
+msgid "New security configuration has successfully been stored"
+msgstr ""
+"La nuova configurazione di sicurezza del monitoraggio è stata salvata con "
+"successo."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:31
+msgid "Next check"
+msgstr "Prossimo Controllo"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegrid.phtml:18
+msgid "No Services matching the filter"
+msgstr "Nessun Servizio soddisfa i criteri di ricerca"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:18
+msgid "No active downtimes"
+msgstr "Nessuna Manutenzione in corso"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:175
+msgid "No backend has been configured"
+msgstr "Nessun backend configurato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:14
+msgid "No comments matching the filter"
+msgstr "Nessun commento soddisfa i criteri di ricerca"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:188
+#, php-format
+msgid "No configuration for backend %s"
+msgstr "Nessuna configurazione per il backend %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/contactgroups.phtml:11
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/contacts.phtml:16
+msgid "No contacts matching the filter"
+msgstr "Nessun contatto soddisfa i criteri di ricerca"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:10
+msgid "No history available for this object"
+msgstr "Storico non disponibile per questo oggetto"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:19
+msgid "No history events matching the filter"
+msgstr "Nessun evento dello storico soddisfa i criteri di ricerca"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:17
+msgid "No host groups matching the filter"
+msgstr "Nessun gruppo di host soddisfa i criteri di ricerca"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:27
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:6
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/host.phtml:13
+msgid "No hosts matching the filter"
+msgstr "Nessun host soddisfa i criteri di ricerca"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:125
+msgid "No instances are configured yet"
+msgstr "Nessuna istanza ancora configurata"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/notifications.phtml:31
+msgid "No notification has been sent for this issue"
+msgstr "Nessuna notifica è stata inviata per questo problema"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/contact.phtml:58
+msgid "No notifications have been sent for this contact"
+msgstr "Nessuna notifica è stata inviata a questo contatto"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/notifications.phtml:29
+msgid "No notifications matching the filter"
+msgstr "Nessuna notifica soddisfa i criteri di ricerca"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:17
+msgid "No service groups matching the filter"
+msgstr "Nessun gruppo di servizi soddisfa i criteri di ricerca"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml:12
+msgid "No services configured on this host"
+msgstr "Nessun servizio configurato per questo host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:38
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/service.phtml:17
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:6
+msgid "No services matching the filter"
+msgstr "Nessun servizio soddisfa i criteri di ricerca"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventgrid.phtml:69
+msgid "No state changes in the selected time period."
+msgstr "Nessun cambio di stato nel periodo di tempo selezionato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/contact.phtml:10
+msgid "No such contact"
+msgstr "Nessun contatto trovato"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/SecurityStep.php:59
+msgid "None"
+msgstr "Niente"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:29
+msgid "Not acknowledged"
+msgstr "Non Confermato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:34
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:34
+msgid "Notification"
+msgstr "Notifica"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:341
+msgid "Notification Start"
+msgstr "Partenza Notifica"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:988
+msgid "Notification delay has been requested"
+msgstr "Posticipo di Notifica richiesta"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/notifications.phtml:10
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:73
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:75
+#: /usr/local/icingaweb/modules/monitoring/application/forms/EventOverviewForm.php:77
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:60
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:345
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:435
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:473
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:480
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:47
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:328
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:64
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:132
+msgid "Notifications"
+msgstr "Notifiche"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/statusIcons.phtml:34
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:61
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:85
+msgid "Notifications Disabled"
+msgstr "Notifiche Disabilitate"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:113
+msgid "Notifications Enabled"
+msgstr "Notifiche Abilitate"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:18
+msgid "Notifications and Problems"
+msgstr "Notifiche e Problemi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:657
+msgid "Notifications for this host and its services will be disabled."
+msgstr "Le notifiche per questo host e relativi servizi saranno disabilitate"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:678
+msgid "Notifications for this host and its services will be enabled."
+msgstr "Le notifiche per questo host e relativi servizi saranno abilitate"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:532
+msgid "Notifications for this object will be disabled."
+msgstr "Le notifiche per questo oggetto saranno disabilitate"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:562
+msgid "Notifications for this object will be enabled."
+msgstr "Le notifiche per questo oggetto saranno abilitate"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/contact.phtml:52
+msgid "Notifications sent to this contact"
+msgstr "Notifiche inviate a questo contatto"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:70
+#, php-format
+msgid "Notifications will be re-enabled in <strong>%s</strong>"
+msgstr "Le notifiche saranno riabilitate in <strong>%s</strong>"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/disable-notifications.phtml:11
+#, php-format
+msgid "Notifications will be re-enabled in <strong>%s</strong>."
+msgstr "Le notifiche saranno riabilitate in <strong>%s</strong>."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:70
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:70
+msgid "OK"
+msgstr "OK"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:217
+msgctxt "icinga.state"
+msgid "OK"
+msgstr "OK"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:73
+msgid "Object summaries"
+msgstr "Riepilogo Oggetti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:98
+msgid "Object type"
+msgstr "Tipo Oggetto"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:52
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:67
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:135
+msgid "Obsessing"
+msgstr "Modalità Ossessiva"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:132
+msgid "Obsessing Over Hosts"
+msgstr "Modalità Ossessiva sugli Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:140
+msgid "Obsessing Over Services"
+msgstr "Modalità Ossessiva sui Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:122
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:153
+msgid "Ok"
+msgstr "Ok"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:96
+msgid "Old instance name missing"
+msgstr "Vecchio nome istanza mancante"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:98
+msgid "Old monitoring backend name missing"
+msgstr "Vecchio backend di monitoraggio mancante"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:533
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:101
+msgid "One day"
+msgstr "Un giorno"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:535
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:103
+msgid "One month"
+msgstr "Un mese"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:534
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:102
+msgid "One week"
+msgstr "Una settimana"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:536
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:104
+msgid "One year"
+msgstr "Un anno"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:102
+msgid "Overview"
+msgstr "Panoramica"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:76
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:76
+msgid "PENDING"
+msgstr "ATTESA"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:252
+msgctxt "icinga.state"
+msgid "PENDING"
+msgstr "ATTESA"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/contact.phtml:28
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/contacts.phtml:33
+msgid "Pager"
+msgstr "Recapito"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:378
+msgid "Pager Address / Number"
+msgstr "Indirizzo o Numero del Recapito"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:30
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:62
+msgid "Passive"
+msgstr "Passivo"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:44
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:62
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:130
+msgid "Passive Checks"
+msgstr "Controlli Passivi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:148
+msgid "Passive Host Checks Being Accepted"
+msgstr "Accetta Controlli Passivi sugli Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:156
+msgid "Passive Service Checks Being Accepted"
+msgstr "Accetta Controlli Passivi sui Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:361
+msgid "Passive check result has been submitted"
+msgstr "Risultato passivo inviato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:151
+msgid "Passive checks"
+msgstr "Controlli passivi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:480
+msgid "Passive checks for this object will be accepted."
+msgstr "I Controlli Passivi per questo oggetto saranno accettati"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:446
+msgid "Passive checks for this object will be omitted."
+msgstr "I Controlli Passivi per questo oggetto saranno scartati"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:122
+msgid "Password"
+msgstr "Password"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:67
+msgid "Path to the Icinga command file on the remote Icinga instance"
+msgstr "Percorso del command file di Icinga nell'istanza remota"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php:33
+msgid "Path to the local Icinga command file"
+msgstr "Percorso del command file locale di Icinga"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:164
+msgid "Performance Data Being Processed"
+msgstr "Accetta i Dati di Performance"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:71
+msgid "Performance Info"
+msgstr "Informazioni sulle Performance"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/perfdata.phtml:3
+msgid "Performance data"
+msgstr "Dati di Performance"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:63
+msgid "Persistent"
+msgstr "Persistente"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:67
+msgid "Persistent Comment"
+msgstr "Commento Persistente"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/BackendPage.php:36
+msgid ""
+"Please configure below how Icinga Web 2 should retrieve monitoring "
+"information."
+msgstr ""
+"Definire di seguito come Icinga Web 2 recupererà le informazioni del "
+"monitoraggio."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/InstancePage.php:36
+msgid "Please define the settings specific to your monitoring instance below."
+msgstr ""
+"Definire di seguito le impostazioni specifiche della vostra istanza di "
+"monitoraggio."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/IdoResourcePage.php:44
+msgid ""
+"Please fill out the connection details below to access the IDO database of "
+"your monitoring environment."
+msgstr ""
+"Compilare di seguito i dettagli della connessione per accedere al database "
+"IDO del vostro ambiente di monitoraggio."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:44
+msgid ""
+"Please fill out the connection details below to access the Livestatus socket "
+"interface for your monitoring environment."
+msgstr ""
+"Compilare di seguito i dettagli della connessione per accedere al socket "
+"Livestatus del vostro ambiente di monitoraggio."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/output.phtml:2
+msgid "Plugin Output"
+msgstr "Output del Plugin"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:43
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:110
+msgid "Port"
+msgstr "Porta"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml:2
+msgctxt "multiselection"
+msgid ""
+"Press and hold the Ctrl key while clicking on rows to select multiple rows "
+"or press and hold the Shift key to select a range of rows."
+msgstr ""
+"Tenere premuto il tasto CTRL durante i Click per selezionare più righe o "
+"tenere premuto SHIFT per selezionare righe contigue."
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:74
+msgid "Problems"
+msgstr "Problemi "
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:20
+msgid "Process Info"
+msgstr "Informazioni sul Processo"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:24
+msgid "Program Start Time"
+msgstr "Ora Avvio del Programma"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/SecurityConfigForm.php:57
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/SecurityStep.php:56
+msgid "Protected Custom Variables"
+msgstr "Variabili Riservate"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:193
+msgid "Recently Recovered Services"
+msgstr "Servizi Ripristinati Recentemente"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:58
+msgid "Remote"
+msgstr "Remoto"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:204
+msgid "Remote Command File"
+msgstr "Command File Remoto"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/InstanceStep.php:62
+msgid "Remote Host"
+msgstr "Host Remoto"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/InstanceStep.php:66
+msgid "Remote SSH Port"
+msgstr "Porta SSH Remota"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/InstanceStep.php:70
+msgid "Remote SSH User"
+msgstr "Utente SSH Remoto"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:15
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:47
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/comments.phtml:10
+msgid "Remove Comments"
+msgstr "Rimuovi Commento"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:637
+msgid "Remove Downtime(s)"
+msgstr "Cancella Manutenzione"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/removebackend.phtml:1
+msgid "Remove Existing Backend"
+msgstr "Rimuovi Backend Esistente"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/removeinstance.phtml:1
+msgid "Remove Existing Instance"
+msgstr "Rimuovi Istanza Esistente"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:964
+msgid "Remove Problem Acknowledgement"
+msgstr "Rimuovi Conferma del Problema"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:907
+msgid "Remove comment"
+msgstr "Rimuovi commento"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:638
+msgid "Remove downtime(s) from this host and its services."
+msgstr "Cancella manutenzione da questo host e relativi servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:31
+msgid "Remove problem acknowledgement"
+msgid_plural "Remove problem acknowledgements"
+msgstr[0] "Remover reconhecimento do problema"
+msgstr[1] "Remover reconhecimento dos problemas"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:965
+msgid "Remove problem acknowledgement for this object."
+msgstr "Rimuovi Conferma del problema da questo oggetto."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:49
+msgid "Removing problem acknowledgement.."
+msgid_plural "Removing problem acknowledgements.."
+msgstr[0] "Rimozione della Conferma del problema in corso..."
+msgstr[1] "Rimozione delle Conferme dei problemi in corso..."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:538
+msgid "Report interval"
+msgstr "Intervallo del Report"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:166
+msgid "Reporting"
+msgstr "Reportistica"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:34
+msgid "Reschedule"
+msgstr "Rischedula"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostController.php:67
+msgid "Reschedule Host Check"
+msgstr "Rischedula il Controllo dell'Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostsController.php:152
+msgid "Reschedule Host Checks"
+msgstr "Rischedula i Controlli dell'Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServiceController.php:67
+msgid "Reschedule Service Check"
+msgstr "Rischedula il Controlli del Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServicesController.php:172
+msgid "Reschedule Service Checks"
+msgstr "Rischedulaz i Controlli del Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:39
+msgid "Reschedule host checks"
+msgstr "Rischedula i Controlli dell'Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:51
+msgid "Reschedule service checks"
+msgstr "Rischedula i Controlli del Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:925
+msgid "Reset Attributes"
+msgstr "Reimposta Attributi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:926
+msgid "Reset modified attributes to its default."
+msgstr "Reimposta gli attributi modificati con i valori predefiniti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:233
+msgid "Resource"
+msgstr "Risorsa"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:98
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:133
+msgid "Resource Name"
+msgstr "Nome Risorsa"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:168
+#, php-format
+msgid "Resource configuration could not be udpated: %s; An error occured:"
+msgstr "Impossibile aggiornare la configurazione della Risorsa: %s; Errore:"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:165
+#, php-format
+msgid "Resource configuration has been successfully updated: %s"
+msgstr "Configurazione della risorsa aggiornata con successo: %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1043
+msgid "Restart monitoring process"
+msgstr "Riavvia processo di monitoraggio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1044
+msgid "Restart the monitoring process."
+msgstr "Riavvia il processo di monitoraggio."
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:50
+msgid "Restrict views to the hosts and services that match the filter"
+msgstr ""
+"Restringe la vista agli Host e Servizi che soddisfano i criteri di ricerca"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:44
+msgid "SSH port to connect to on the remote Icinga instance"
+msgstr "Porta SSH da usare per la connessione all'istanza Icinga remota"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:28
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:31
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/SecurityConfigForm.php:21
+msgid "Save Changes"
+msgstr "Salva Modifiche"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostController.php:76
+msgid "Schedule Host Downtime"
+msgstr "Schedula Manutenzione dell'Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostsController.php:161
+msgid "Schedule Host Downtimes"
+msgstr "Schedula Manutenzioni dell'Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServiceController.php:76
+msgid "Schedule Service Downtime"
+msgstr "Schedula Manutenzione del Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServicesController.php:181
+msgid "Schedule Service Downtimes"
+msgstr "Schedula Manutenzioni del Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:25
+msgid "Schedule check"
+msgid_plural "Schedule checks"
+msgstr[0] "Schedula Controllo"
+msgstr[1] "Schedula Controlli"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:30
+msgid "Schedule check for all services on the hosts and the hosts themselves."
+msgstr ""
+"Schedula Controllo per tutti i servizi negli host e per gli host stessi."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/downtime.phtml:21
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:35
+msgid "Schedule downtime"
+msgid_plural "Schedule downtimes"
+msgstr[0] "Schedula Manutenzione"
+msgstr[1] "Schedula Manuenzioni"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:33
+msgid ""
+"Schedule downtime for all services on the hosts and the hosts themselves."
+msgstr ""
+"Schedula Manutenzione per tutti i servizi negli host e per gli host stessi."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:63
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:65
+msgid "Schedule downtimes for unhandled problem hosts"
+msgstr "Schedula Manutenzione per Host con Problemi Non Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:75
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:77
+msgid "Schedule downtimes for unhandled problem services"
+msgstr "Schedula Manutenzione per Servizi con Problemi Non Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:46
+msgid "Schedule host downtimes"
+msgstr "Schedula Manutenzione Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:46
+msgid "Schedule non-triggered downtime for all child hosts"
+msgstr "Schedula Manutenzione non collegata per tutti gli Host figli"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:58
+msgid "Schedule service downtimes"
+msgstr "Schedula Manutenzione Sevizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:45
+msgid "Schedule triggered downtime for all child hosts"
+msgstr "Schedula Manutenzione dipendente per tutti gli Host figli"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:312
+msgid "Scheduled End"
+msgstr "Fine Schedulazione"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:311
+msgid "Scheduled Start"
+msgstr "Inizio Schedulazione"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:71
+msgid "Scheduling check.."
+msgid_plural "Scheduling checks.."
+msgstr[0] "Schedulazione del Controllo in corso..."
+msgstr[1] "Schedulazione dei Controlli in corso..."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:54
+msgid "Scheduling host check.."
+msgid_plural "Scheduling host checks.."
+msgstr[0] "Schedulazione del Controllo dell'Host in corso..."
+msgstr[1] "Schedulazione dei Controlli dell'Host in corso..."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:91
+msgid "Scheduling host downtime.."
+msgid_plural "Scheduling host downtimes.."
+msgstr[0] "Schedulazione della Manutenzione dell'Host in corso..."
+msgstr[1] "Schedulazione delle Manutenzioni degli Host in corso..."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:116
+msgid "Scheduling service check.."
+msgid_plural "Scheduling service checks.."
+msgstr[0] "Schedulazione del Controllo del Servizio in corso..."
+msgstr[1] "Schedulazione dei Controlli del Servizio in corso..."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:216
+msgid "Scheduling service downtime.."
+msgid_plural "Scheduling service downtimes.."
+msgstr[0] "Schedulazione della Manutenzione del Servizio in corso..."
+msgstr[1] "Schedulazione delle Manutenzioni del Servizio in corso..."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:130
+msgid "Send Notification"
+msgstr "Invia Notifica"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/header.phtml:23
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/partials/command-form.phtml:10
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ShowController.php:215
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:199
+msgid "Service"
+msgstr "Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:142
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:162
+msgid "Service Checks"
+msgstr "Controlli del Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:118
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:618
+msgid "Service Grid"
+msgstr "Griglia dei Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:25
+msgid "Service Group"
+msgstr "Gruppo di Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:527
+msgid "Service Group Name"
+msgstr "Nome del Gruppo di Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:495
+msgid "Service Groups"
+msgstr "Gruppi di Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:234
+msgid "Service Name"
+msgstr "Nome Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:379
+msgid "Service Notification Timeperiod"
+msgstr "Periodo per le Notifiche del Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:93
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:189
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:55
+msgid "Service Problems"
+msgstr "Problemi del Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:103
+msgid "Service Problems on Host"
+msgstr "Problemi dei Servizi nell'Host"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:120
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServicesController.php:138
+msgid "Service State"
+msgstr "Stato Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:27
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:27
+msgid "Service States"
+msgstr "Stati Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:630
+msgid "Service description"
+msgstr "Descrizione Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/service.phtml:4
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/service/show.phtml:3
+msgid "Service detail information"
+msgstr "Dettagli del Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServiceController.php:29
+msgid "Service not found"
+msgstr "Servizio non trovato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/contacts.phtml:41
+msgid "Service notification period"
+msgstr "Periodo per le Notifiche del Servizio"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:69
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:122
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml:14
+msgid "Servicegroups"
+msgstr "Gruppi di Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:67
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:114
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/contact.phtml:38
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:97
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/objectlist.phtml:30
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/summary.phtml:5
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:8
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:22
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:28
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:101
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:146
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ShowController.php:225
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:184
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServicesController.php:49
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:209
+msgid "Services"
+msgstr "Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:11
+#, php-format
+msgid "Services (%u)"
+msgstr "Servizi (%u)"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:531
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:578
+msgid "Services CRITICAL"
+msgstr "Servizi CRITICAL"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:130
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:130
+msgid "Services CRITICAL Handled"
+msgstr "Servizi CRITICAL Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:116
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:116
+msgid "Services CRITICAL Unhandled"
+msgstr "Servizi CRITICAL Non Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:40
+msgid "Services Critical Handled"
+msgstr "Servizi Critical Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:37
+msgid "Services Critical Unhandled"
+msgstr "Servizi Critical Non Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:99
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:99
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:529
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:576
+msgid "Services OK"
+msgstr "Servizi OK"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:32
+msgid "Services Ok"
+msgstr "Servizi Ok"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:215
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:215
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:533
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:580
+msgid "Services PENDING"
+msgstr "Servizi in ATTESA"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:61
+msgid "Services Pending"
+msgstr "Servizi in Attesa"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:530
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:577
+msgid "Services UNKNOWN"
+msgstr "Servizi UNKNOWN"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:164
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:164
+msgid "Services UNKNOWN Handled"
+msgstr "Servizi UNKNOWN Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:150
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:150
+msgid "Services UNKNOWN Unhandled"
+msgstr "Servizi UNKNOWN Non Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:56
+msgid "Services Unknown Handled"
+msgstr "Servizi Unknown Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:53
+msgid "Services Unknown Unhandled"
+msgstr "Servizi Unknown Non Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:532
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:579
+msgid "Services WARNING"
+msgstr "Servizi WARNING"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:198
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:198
+msgid "Services WARNING Handled"
+msgstr "Servizi WARNING Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:184
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:184
+msgid "Services WARNING Unhandled"
+msgstr "Servizi WARNING Non Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:48
+msgid "Services Warning Handled"
+msgstr "Servizi Warning Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:45
+msgid "Services Warning Unhandled"
+msgstr "Servizi Warning Non Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:108
+msgid "Services in downtime"
+msgstr "Servizi in manutenzione"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml:20
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml:84
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:15
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:80
+#, php-format
+msgid "Services with state %s"
+msgstr "Servizi in stato %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:68
+msgid "Set the date and time when the check should be scheduled."
+msgstr "Impostare la data e l'ora dell'esecuzione del controllo."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:95
+msgid "Set the end date and time for the downtime."
+msgstr "Impostare la data e l'ora della fine della manutenzione."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:53
+msgid "Set the expire time."
+msgstr "Impostare la l'ora di scadenza."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:85
+msgid "Set the start date and time for the downtime."
+msgstr "Impostare la date e l'ora d'inizio della manutenzione."
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/MonitoringWizard.php:114
+msgid "Setup the monitoring module for Icinga Web 2"
+msgstr "Installa il modulo di monitoraggio per Icinga Web 2"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:143
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:232
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:526
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:573
+msgid "Severity"
+msgstr "Impatto"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:257
+msgid "Show resource configuration"
+msgstr "Mostra la configurazione della risorsa"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1023
+msgid "Shutdown monitoring process"
+msgstr "Arresta il processo di monitoraggio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:94
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/IdoResourcePage.php:94
+msgid "Skip Validation"
+msgstr "Salta la Verifica"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:137
+msgid "Socket"
+msgstr "Socket"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:12
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/notifications.phtml:5
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:6
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:13
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:5
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegrid.phtml:5
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:7
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:5
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:7
+msgid "Sort by"
+msgstr "Ordina per"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/MonitoringWizard.php:111
+msgctxt "setup.welcome.btn.next"
+msgid "Start"
+msgstr "Inizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:475
+msgid "Start Accepting Passive Checks"
+msgstr "Accetta Risultati Passivi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:84
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:309
+msgid "Start Time"
+msgstr "Ora Inizio"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:407
+msgid "Start obsessing"
+msgstr "Avvia Modalità Ossessiva"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:412
+msgid "Start obsessing over this object."
+msgstr "Abilita la Modalità Ossessiva su questo oggetto."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:67
+msgid "Started downtimes"
+msgstr "Manutenzioni Iniziate"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:34
+msgid "Starts"
+msgstr "Inizi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:116
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:136
+msgid "State"
+msgstr "Stato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/EventOverviewForm.php:47
+msgid "State Changes"
+msgstr "Cambi di Stato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:117
+msgid "Sticky Acknowledgement"
+msgstr "Commento Permanente"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:441
+msgid "Stop Accepting Passive Checks"
+msgstr "Rifiuta Risultati Passivi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1024
+msgid "Stop monitoring instance. You have to start it again from command line."
+msgstr ""
+"Arresta l'istanza di monitoraggio. Sarà necessario ri-avviarla da linea di "
+"comando."
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:373
+msgid "Stop obsessing"
+msgstr "Ferma Modalità Ossessiva"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:378
+msgid "Stop obsessing over this object."
+msgstr "Ferma la Modalità Ossessiva su questo oggetto."
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:178
+msgid "System"
+msgstr "Sistema"
+
+# rivedere
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:106
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/TacticalController.php:15
+msgid "Tactical Overview"
+msgstr "Visuale Tattica"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:222
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/BackendPage.php:64
+msgid "The data source used for retrieving monitoring information"
+msgstr ""
+"La sorgente dei dati usati per recuperare le informazioni di monitoraggio"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/DataView/DataView.php:338
+#, php-format
+msgid "The filter column \"%s\" is not allowed here."
+msgstr "Il filtro della colonna \"%s\" non è ammesso."
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/MonitoringWizard.php:61
+msgid "The given resource name is already in use."
+msgstr "Il Nome Risorsa fornito è già in uso."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:212
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/BackendPage.php:48
+msgid "The identifier of this backend"
+msgstr "L'identificatore per questo backend"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/notifications.phtml:25
+#, php-format
+msgid "The last one occured %s ago"
+msgstr "L'ultimo si è verificato %s fa"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ShowController.php:124
+msgid "The parameter `contact' is required"
+msgstr "Il parametro `contatto' è richiesto"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:234
+msgid "The resource to use"
+msgstr "La risorsa da usare"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/DataView/DataView.php:247
+#, php-format
+msgid "The sort column \"%s\" is not allowed in \"%s\"."
+msgstr "La colonna di ordinamento \"%s\" non è permessa in \"%s\"."
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:90
+#, php-format
+msgid "There is no \"%s\" monitoring backend"
+msgstr "Nessun backend di monitoraggio \"%s\" trovato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:3
+msgid "This Object's Event History"
+msgstr "Storico degli Eventi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:36
+msgid ""
+"This command is used to acknowledge host or service problems. When a problem "
+"is acknowledged, future notifications about problems are temporarily "
+"disabled until the host or service recovers."
+msgstr ""
+"Questo comando serve per confermare i problemi di host o servizi. Quando un "
+"problema è Confermato le notifiche saranno temporaneamente disabilitate fino "
+"al ripristino dell'host o servizio."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:34
+msgid "This command is used to add host or service comments."
+msgstr "Questo comando serve ad aggiungere commenti agli host o ai servizi."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:35
+msgid ""
+"This command is used to disable host and service notifications for a "
+"specific time."
+msgstr ""
+"Questo comando serve a disabilitare le notifiche degli host e servizi per un "
+"periodo di tempo specifico."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:47
+msgid ""
+"This command is used to schedule host and service downtimes. During the "
+"specified downtime, Icinga will not send notifications out about the hosts "
+"and services. When the scheduled downtime expires, Icinga will send out "
+"notifications for the hosts and services as it normally would. Scheduled "
+"downtimes are preserved across program shutdowns and restarts."
+msgstr ""
+"Questo comando serve a schedulare la manutenzione di un host o servizio. "
+"Durante la Manutenzione, Icinga sopprimerà eventuali notifiche. Allo scadere "
+"della Manutenzione Icinga invierà le notifche per host e servizi come "
+"farebbe normalmente. Le Manutenzioni schedulate saranno preservate da "
+"eventuali arresti o riavvii dell'ambiente."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:37
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:57
+msgid ""
+"This command is used to schedule the next check of hosts or services. Icinga "
+"will re-queue the hosts or services to be checked at the time you specify."
+msgstr ""
+"Questo comando serve a schedulare l'esecuzione del prossimo controllo "
+"dell'host o servizio. Icinga sposterà controllo per l'host o servizio "
+"all'orario specificato."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:84
+msgid "This comment does not expire."
+msgstr "Questo commento non scade."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:81
+#, php-format
+msgid "This comment expires on %s at %s."
+msgstr "Questo commento scade il %s alle %s."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:77
+msgid "This comment is not persistent."
+msgstr "Questo Commento non è permanente."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:76
+msgid "This comment is persistent."
+msgstr "Questo Commento è permanente."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:98
+#, php-format
+msgid ""
+"This fixed downtime has been scheduled to start on %s at %s and to end on %s "
+"at %s."
+msgstr ""
+"Questa Manutenzione Rigida è stata schedulata per iniziare il %s alle %s e "
+"finire il %s alle %s."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:90
+#, php-format
+msgid "This fixed downtime was started on %s at %s and expires on %s at %s."
+msgstr ""
+"Questa Manutenzione Rigida è iniziata il %s alle %s e finirà il %s alle %s."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:81
+#, php-format
+msgid ""
+"This flexible downtime has been scheduled to start between %s - %s and to "
+"last for %s."
+msgstr ""
+"Questa Manutenzione Flessibile è stata schedulata per iniziare tra %s -%s e "
+"durare per %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:72
+#, php-format
+msgid ""
+"This flexible downtime was started on %s at %s and lasts for %s until %s at "
+"%s."
+msgstr ""
+"Questa Manutenzione Flessibile è iniziata il %s alle %s e durerà per %s fino "
+"al %s alle %s."
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/WelcomePage.php:37
+msgid "This is the core module for Icinga Web 2."
+msgstr "Questo è il modulo principale per Icinga Web 2."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:25
+msgid "Time to Reaction (Ack, Recover)"
+msgstr "Tempo di Reazione (Conferma, Ripristino)"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:106
+msgid "TimeLine interval"
+msgstr "Intervallo Cronologico"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:161
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:29
+msgid "Timeline"
+msgstr "Cronologia"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:84
+msgid "To"
+msgstr "A"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/SecurityPage.php:36
+msgid ""
+"To protect your monitoring environment against prying eyes please fill out "
+"the settings below."
+msgstr ""
+"Per proteggere il tuo ambiente di monitoraggio da occhi indiscreti si prega "
+"di compilare i dettagli seguenti:"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:87
+msgid "Today"
+msgstr "Oggi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:201
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:123
+msgid "Toggling feature.."
+msgstr "Comando inviato..."
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:59
+msgid "Top 5 Recent Alerts"
+msgstr "Ultimi 5 Allarmi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:26
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:26
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:528
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:575
+msgid "Total Services"
+msgstr "Totale dei Servizi"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:32
+msgid "Trend"
+msgstr "Trend"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:42
+msgid "Trend for the last 24h"
+msgstr "Trend nell ultime 24 ore"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:105
+msgid "Type"
+msgstr "Tipo"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:25
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:57
+#, php-format
+msgid "Type: %s"
+msgstr "Tipo: %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:40
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:58
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:40
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:58
+msgid "UNKNOWN"
+msgstr "UNKNOWN"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:148
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:156
+msgctxt "icinga.state"
+msgid "UNKNOWN"
+msgstr "UNKNOWN"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/statusIcons.phtml:26
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:49
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:71
+msgid "Unhandled"
+msgstr "Non Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:79
+msgid "Unhandled Hosts"
+msgstr "Host Non Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/configuration.php:84
+msgid "Unhandled Services"
+msgstr "Servizi Non Gestiti"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:29
+msgid "Unhandled hosts with state DOWN"
+msgstr "Host Non Gestiti in stato DOWN"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:54
+msgid "Unhandled hosts with state UNREACHABLE"
+msgstr "Host Non Gestiti in stato IRRAGGIUNGIBILE"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml:51
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:47
+#, php-format
+msgid "Unhandled services with state %s"
+msgstr "Servizi Non Gestiti in stato %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:121
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:174
+msgid "Unknown"
+msgstr "Unknown"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:142
+msgid "Unknown instance name given"
+msgstr "Nome Istanza sconosciuto"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:100
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:122
+msgid "Unknown instance name provided"
+msgstr "Nome istanza sconosciuto"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:102
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:124
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:174
+msgid "Unknown monitoring backend provided"
+msgstr "Backend di monitoraggio sconosciuto"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:141
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:224
+msgid "Unreachable"
+msgstr "Irraggiungibile"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:139
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:210
+msgid "Up"
+msgstr "Su"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:79
+msgid "Use Expire Time"
+msgstr "Scadenza"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:53
+msgid "User"
+msgstr "Utente"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:30
+msgid "User Comment"
+msgstr "Commento dell'Utente"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:55
+msgid ""
+"User to log in as on the remote Icinga instance. Please note that key-based "
+"SSH login must be possible for this user"
+msgstr ""
+"Utente per la connessione all'istanza remota di Icinga. Si fa notare che è "
+"l'utente può effettuare una autenticazione con chiave SSH."
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:118
+msgid "Username"
+msgstr "Nome Utente"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:621
+msgid "Value for interval not valid"
+msgstr "Intervallo non valido"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:46
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:64
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:46
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:64
+msgid "WARNING"
+msgstr "WARNING"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:78
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:86
+msgctxt "icinga.state"
+msgid "WARNING"
+msgstr "WARNING"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:120
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:160
+msgid "Warning"
+msgstr "Warning"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/WelcomePage.php:24
+msgid "Welcome to the configuration of the monitoring module for Icinga Web 2!"
+msgstr ""
+"Benvenuto nella configurazione del modulo di monitoraggio per Icinga Web 2!"
+
+#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:892
+msgid "Your new comment has been submitted"
+msgstr "Il nuovo commento è stato inviato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/objectlist.phtml:60
+#, php-format
+msgid "and %d more"
+msgstr "e %d più"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/notifications.phtml:52
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:42
+#, php-format
+msgctxt "time"
+msgid "at %s"
+msgstr "alle %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:98
+msgid "changed"
+msgstr "modificato"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Object/Service.php:222
+msgid "critical"
+msgstr "critical"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Object/Host.php:178
+msgid "down"
+msgstr "down"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:43
+#, php-format
+msgctxt "timespan"
+msgid "in %s"
+msgstr "in %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:40
+msgid "in the last hour"
+msgstr "nell'ultima ora"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:38
+msgid "notifications per hour"
+msgstr "notifche per ora"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml:20
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:15
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Object/Service.php:216
+msgid "ok"
+msgstr "ok"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:135
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:109
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:56
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:60
+msgid "on"
+msgstr "il"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/notifications.phtml:51
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:41
+#, php-format
+msgctxt "datetime"
+msgid "on %s"
+msgstr "il %s"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:78
+msgid "overall"
+msgstr "complessivo"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml:84
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:80
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Object/Host.php:184
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Object/Service.php:228
+msgid "pending"
+msgstr "in attesa"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml:5
+msgctxt "multiselection"
+msgid "row(s) selected"
+msgstr "righe selezionate"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:79
+msgid "scheduled"
+msgstr "schedulato"
+
+#: /usr/local/icingaweb/modules/monitoring/application/views/helpers/MonitoringState.php:101
+msgid "since"
+msgstr "da"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/MonitoringWizard.php:51
+msgid "the monitoring module"
+msgstr "il modulo di monitoraggio"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Object/Service.php:225
+msgid "unknown"
+msgstr "unknown"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Object/Host.php:181
+msgid "unreachable"
+msgstr "irraggiungibile"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Object/Host.php:175
+msgid "up"
+msgstr "up"
+
+#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Object/Service.php:219
+msgid "warning"
+msgstr "warning"

From be27ab487508fbf07e6d76a5b9c588a06b724c4e Mon Sep 17 00:00:00 2001
From: Davide Demuru <davide.demuru@buongiorno.com>
Date: Sat, 7 Feb 2015 19:02:31 +0100
Subject: [PATCH 0648/2920] added compiled translation file

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
---
 .../locale/it_IT/LC_MESSAGES/monitoring.mo      | Bin 0 -> 42808 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.mo

diff --git a/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.mo b/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.mo
new file mode 100644
index 0000000000000000000000000000000000000000..145152f328985d2ca5ebdade958025991291559f
GIT binary patch
literal 42808
zcmb`Q37j28wf|cTTL9TX7NG${637f8>>(hNWRi?zBa?u*LC?&cnI?Dcz1(H82#O0J
zDsCtWsB9u`;KLO~1x0bg1?7o5K5;`)ae4ZG>XZNXcdDwp@12FH?|xGA>)NYMojP^u
zRCVV^d(C)r#P1JJiK2tS_wOD>H*Ob2iw;$26x}m7iuMIR1MUw#1U?=79e5zP(@|0M
zH1G&;PjCUKa+ZRJfC;FgE&&e%Zvb}&KMU>(-VYuGeiwWO_}}0G;NC~Odb&WByA0e7
ze2xzv2GyRIfV+Ti0m&NO4DJDb4crHO*!%wk9)o}Td9MBwz{BxB3sm_7ApfE!e|80L
z1Q&w0gJ*z`g2#hLb-D2Kz#Z^k3+@Qs2<`;F$NN9%{h#o7FL)yH_k$;cPwkGP`QRdO
z7jVqu7EtuP6cioa0g66%f}-n#;2iMxpxSvLonpwM*`WG;5~y-lfa>2Ca5wO6;C|qH
zL5;&_z-NMw`1qa3r2PAVyMwd6|0Hm4{3}4U>-nI{ZGr0dTS1k7gU8#!?eTvSRQo;)
zsvlnm>3Z}ixEHwpu~Bp+coaArJPTC6wtx&(bQ7p@z6R3O=s{5Qe(C~O?@UnT?gfgU
z=7DP0iJ<B|*W)m#acOw}Mc_>QSAb6g-vo+JZU)tlJ3*CqA9yDC4X_V9_&7IC!{C47
zuY>CU3YbFmtp!!j3qXYrgL{G%AAbobx?Ty2{%;5AQgk;s7yLb_d2-MRuKrU&mDdZ3
zE~`PccN3^`E(6uxt3joEC&<6(HvVY59sxC<{sJm~UzktrIRxAbobUZhz<u#=09D>b
zk6V2F<=%e{sD9lFo(6sZRC|5{sy%-PRqn1Qx%v+URqk=%K42f%1HRD5-vDa9ei#&g
zKMc+Q{|2hPnk1s@&Y<eq58MNs1!{aw1eNX#Q1$eI`+?_y;+t_Fe-WtmT?&@LH-i_0
z+nwV0;1Z9o292Je%6TWKdhY_ocVG7Y2SD-9k3r4bUxT8{UqH3*2~hR#f$*?)gDP(p
zsP--bm9E$0**<&()cDjumHRSK^mr|J0C*Ls`F|Uzas4u=`TI*ya(1^<9sTElYR|Jk
z<zEhpjw?ZxdoHN<mq5{_=EE-mRsL&0(cwKFKL#rO=RsIB`Ua?eZNJFLgMC1?uM1SV
z<)Hex4itYs4-`GF1fLFG1&Tl4@5Ao_>-g^jF9lD5xdy<y!JEOuPj~Y2KCprR3GiiL
z<5|d}r$o`8!K?81!(5}_FTg6ec5xJa5xfT+0<T!&`u|%{?fWZu1o+gYPHxNw<$pG)
z{#QI+1n!UjRiOCnCNKu?1Vz{Hg6{@@4yymJ>vjBmEhzea6x8_N2P*v!LCuq2dHi2c
z`Sw`m#_b?b{B{JWb{++aUdMskgUdnXUj=F&oDXWeFYw`YQ0XuAcnv7Ny3PCV1~nhQ
z<^8_|Pr(0oj|-MN`7{cyA^cS!O^m(=N<PIape=X?2nnM%c>jNT|B(pGrxJbvI0LMJ
z;*SO>`d$e##iKhw_4`p!<^Bm&yZ3pv<L5b`!k2p-@pw7-Ou}ykXMy*Fhl76r4+i%|
zXwL%|fb+rgK&5{@sPrEJ)sF9jD*p+v3p{kC8?RNM+Wi7h^K<~*6>NZ_`z4_G<0??&
zdLt;lxDz}O{2HkCJPN9xyRLHlyA<3G|HYuny#(9^d;_>M_;yg^aw{l)`y{CJ4}zlK
zL!jFIdvHf^-_<VPGr*nj&-OUq<0+uhEe6Fm&j!`rwcyjh5m4<M2St}_eE8j<%KI9~
z6pSA7@%zFIG5%9Qwg34Z$H1BRUkr*qSAhJB-o_tTDtZhY0gqeD+67(*?gs9CmZS4w
zpz1pk+!Z_qR5^=4(Q^%W5O@K&19%xIKDiPU{cZ$z2XFKEDNyOY3W|;of|5IrfryT1
z`*p5eOF`v(H7NRD2dW>pfEv&L0Bzoa%Kt-9<M3x6zDK|F&j!{09#H*yHn<pk4#-jy
zT?a~TJ_xFRJFj=;?gy%UU7*VC1=Zj4z(c^Tpy+oEDE|F1$P|gT-{A7C0guB!0xI8i
z;4$DwLAB%Op!)YG@JMjR*={}@4W5Yq`5vzV5xvou!9Bqp&vATn0QfZghk<JMd{E_{
z2JQu(>EmDM<HtbFr>&s)<62PZ-v_FkkAr)IUj)_OAAqXwFQCSE=jXWevp~`FI8gD6
zK#lWiP~|??<3^7cf%_4DC3p(>PVi{(N8mo-%ya$x2It{l1*-h5pz3`&C^}saif=vu
zYTkSl6hC|#R6D-p<G&ATKK%q#|9%Oo{y+Qp-Ja{x?*lF*{76vkNx-APD?yF#ouKM}
z2-Lj(BPjap|2)^uqd|o~2UNO?z)yp31y2Cac|L0%cqKUSlqmWy@Gbb4zR>9hKL8KI
z|5s4sa`1VsoJHVV{LcXu{xVSgy9pFsJ`76kd<rCMbPuTh9(ukT_gSFYc`~SRT?s1w
zd7$W!fRdk^L6vtgD0*H7YM#9o6usXHijUq69tz$Cich}}#^82|%Xb8L5dNdVL%`*r
z=rRn7FJ1+zy;p-O_Zm?3zXufG-VQdwyFj&P{(xI2P65@fvpv2LT#kR(`)>!;zmI|{
z@AKfk;Fm$w^J7r_^|;6F2OWPN2)>E%qd~Rz9#C|77*u_K21SQ|fCqy+4Y_h>f#SDQ
zL6yG@RQ+dz+kqwU?N33+0Y(2EhMgQZ5LEdKzyrZPQ2B;HjcWr`J1zwe2j2-E27UoN
z5_}X?yY?7y^*<d{yN&>3@C;D;X5#%X0W}YA0LA}zfct}YgR18tP~-Avup8WN)TKWb
zd^-Nc-v2!Cc>HB>C-6p4^}H8U|Go&$0e=9hyzNuBf7laTj=vvV0$vC9fe(W_fO9W!
zIN#$*p!oB2?_cWiOi=S^9e6VMO7JA`GobqSKj2Q_%#E&JdxL7<0#Ni@3&vm_lw7$A
zoC)3oD&JQ?_2WTsKKM&;Hh4hUmEQxZymg?)r3M}WUghII25LON2x@#E@%UFz`Su)h
z^&SI?j?V{o2HyaRf3EZRK2ZI?%lkhAs{Idu$ANzYH7>I&PG3I*RD2y2UETzq3Vs#b
z5!|`z)}uW^(fdSD<(~!~04@P{0bc;BUn#gN_!^JbfTGX4K=tbbp!oDYQ0@N?sB(V-
zs=i0T-N4_2h{)&(@GS7THAnCFgCD~GF;M9@Ug+rC0OfxLsQO+5svU3k@i%$=5O^fv
zp92?wzXp#152-skuLd=)Wl-g80!6n=z`ei^gOUqh@ctiyO7}Rp2K*mT{p@QvJ?nf>
z@t1+h_c~B?y9L}6yc^WGKL9=rd<<0o{|4>>?%Z_#13~p~4yg9d2Ni!lsB$m#csVG3
zc{`|idKb7C_$_cL_;XP89o=&CVHv3O7lAXtYeCWNdQk0qKe#veX;9^T)5re`)VTcx
zRC)jKc)+;hkK;l0dm*TNOF)uD&jYuD4}iOaD>u1*Ki}g<Q2e<SRQ*?hs^=C^?RY<^
za_<4v&M$%D$8UrCgFgV3{!ie3;NL*Wsl7HkemfRa_^BS(fg0}=RDDfQ?Yaz<9KIUV
zdUOq_az5hy4}#*O$3e-@{kORG9S>@pR)C`CT2SM<!N(7I|7K9_z1;h+2Q`0g2Q^*~
zfa>2*LACGq;BnyJL5=%-h^Y4TfNJ0QpxS>CsCo5TQ0d<asvY-(`+yIC%Kvllso-D0
zi@?8uSAv^g1TDZF2)qNVfs4VzFUDpGmcUno-vT#31^xBK%rX4md5PP1S1w^qRXq58
zaN$d78@S)g99=hoqR-`^<j(8BS>PSu;ow7{`u$grJHFhF*FNCBgdYt`f9L@vcM|Y+
za12zx4t|A8-vu6se<>J)=Ybm6OF;4a>pk8MD&PH}+Vw+^KLgc{-+&sAzk=ec-7a<G
zwht&e&jS^Hq7OgK;|5UUG6ss@uJGYEc)Sx-`@R7l5B?gQ55|`{zB&tBhkvujuYhy$
zA9A_V16O!_8@QhE$36DG(v9o2;0(gw0jeE0gOVF}gG&E9Q2knZh0~YM0Y#TfLAC2<
zAO2}@4*tiyf8SR*y><zB3gHz{eD-c|F8BlR1aJqKMB$6TZm<TP2wo2!4SpN!0=IjO
zTZiX^nh&Gk4&WuA=FR2cPT<v``1^WrXYdYCbiE7Q8~i3H{{A_51o$`bB=As}`eg7N
za69nzpvt)l+!ee9RQ?ZwnoswE;;)~9O27SU9bI+;MTa9n)xQSZ5j+>%4NSbh3eLp8
z2~<B`2CDs6fGYQmpz8l1_)PF~;4JV_AHMtRT>8U6wf`vaC~yGO_*@C9o$mwH?k|J8
zfIkA&|6hUq;1i(6x&QU(gy6eDL{)U~8(jTw2Dit5E2#e51|9%@4AeM00IK{)LCw?u
z1=XKJ-{``R1Xb@sQ1fRQxF>iHD7vJe%Dd3xtHI^?Zvh9v-+-FWXI<sSVFVQ2nxN`?
z2^fPnf}+!BJ^sRn@A@V;&RwADI}6l!o(nDkhe3_|d%<UckAS;_M<A>;4##=y2M@>J
z@OU+-@%T8n0(=-0{pVcm&IkHI&5!HBMc^kujmuv^&4+#8;^x&Fa3A~w;2LlfsD6I|
ztbj+q)ydgw!3O>r*EoLP42oYa2loSC5AF@#3W~mWfvW$j-v3Kb{P$N-?cV8HN7ruf
zY513V><6tqK7Nz;UkNJTO`yvEA}D%(57fB+1k||v(Z~M-6dm`t&S4Cyee*%ld#T5Z
zLDBi6;ECY3!Q;T)-sZ~h0guGr2dds0X!8YBeOGvV6Syz_>p}7BM?BsIs(+sWRsT0Y
zwfm=_+V>dP2mT$L2QGWN)5ja2<imBK+IKf7{(2ZxIWykj=H1gl$*HxV=ynnKDew)T
z_-oDe&i;HAxcVv71HO~+GjDX`^Ejw-ce%;&*L?60{Qcm3untO|+ze`*?+4ZIM?i{;
zehZF)kApM77vAjnY7o@8jC=p(py+Zf_;m0FQ0YGoijO`GiY{LOHDA9DD*yLE_4hGQ
z?Na0C0*8X4OCP9wDX4NU^!O_92>dsLqVpHP?ZAgX)%QJ6<M;?Dy8Q~g9DD*){g>b3
z#`7vr<-f<{9pIVxKMslx+rP{8YY%V+{{29ee-Nnpo(U@dY>&r)YR^gFi^1if`074T
z{rwK8`X2>V{(plzfYGf^PVES)yu-ll!MPrf0af1#pvL79{*-b5;CTrMTSw0Tcg4}g
z=v44?IPvDoz&GRW#p(Al-1qEh;-7E$G^$&_kKwv~*tH<T6nz3Wj{5~pKc;;28{#ek
z7l04rzJl8q_a`MN{4}QD$Ndj(8SZts3hBOxJ02$*zZR$8v+$pRdxGaL;}B8y8{zLJ
z!uP@HH{YY4ui*KaxR1-j?*$Gf{5^>@%LzTw=RFpDBTjSmLZ3SJ_yxidH_@BGkAgqO
zeTnDq<L2RBhkF%alKUs%7UBOmF8n^t^GV+G(L(rY!dBt`wvYQQcrgCwdH;8LUc&Q#
zdH?6}KkA<!<N5u#Z{oTLy8}0bTa3F5_Ykh1IQ_1`y&CsB+?hU%NBfQ8{|HVto+Al)
z4EHIXPsZsNgOYn+#p&EjzZZFI@w@}ip8>xEUJXi?==V<iHQXzBK3@Ta-_bnpLY(BZ
zemy)tj(ZnwCGL5+hh3EY{Q-XcP6I#a9<#si;puL|-<*Xo*LnU~!5<#a2@l|bxL1+y
zQrsT658!_kyc5(syNu^cK>bW^<Ja%yxF6wOid%?#1L3EGTXAcB8qN2o@%$XzIX>(^
z2wQ>s5&qZX&c?04?Tq`nkU0Gg;`t`rj=0a_@5P;n>%r-F4B`6ih<iQmO589`zm2$`
z5&vEA`M8hZuJh^N#B=!loUkq4^IV=6@%%fm;=?WmU+VK+4KBo8ggXNFKHP)EpNo4N
z&&A(W_-Enn^x-=Y`AXa)g+%|$v*hPtq&XA(ijVtmkG}!;^!XK3#{CEW*WiAEI{^P-
zxb1oF{5{tP{1Lp8_-BAO;f}(cCM0YZP`^8P{v7yfunV`2=NE$ig$uu*^Dq;)l(1XC
z%W<FK`2yTl+;ZGkar%7_JPvmc&mRVN10VEp3D356dH=KVe}d;v;(Bo#aS!42I~DhA
z|NIVcJKR&e{}ga{|9n5`{)QXCf1nThC3pj2;rD=lm<#@pxDWYsf5E>S&%X!12JVl$
zA9pTJzwd#+#kFvI;bs%IAMPhS9}fN+3_q={`rS&{pWS2B<oPWB{7jGM6Lv7q^S%Ei
z;B3Oq1IKU|;F`GGafcJG-%G$>`R6Z#T0iysFm4q8CAe?!d^-3oMeut8&tCw)g!_NE
z1Mt5EH-dW({!?)J{Sx;zT!Zizf<M4*=J_~K`bhCNhwzmIoZ$m+$FJYxxV5-raf5`t
z2HYQai;o}Wx%m4!p7V(NPal6a{$Kk9hj^R?-bVa@_xF1=P+lH>@AJPF+#UZLa4*LF
z0spss9NuUy&kOXx?*l&k2%c}|d5wj-Ki?|k*-X%Q!G9Oe8@&IU#FcRG!ky*Aehj`B
z|5I`LeFryaPwvnA{PQ~sVXq+1ZTRm4kMZI6@cgzynr{Dm0^$0-)#Hg^ihn(BC!VXg
zPx8D0cQ0-T{|&f{afjflg#8rM?^zD)@B97pA3WX&t|#3vu8w;T?ry@a0rk5Icb`4E
zdlye7d=vgYaBtjCdA`x7{i{!RDE>F{TmqktdlAof;XcOmD{=3|{RDplH<Rb%!Ns6{
z>%cF9Yrwt0rMT5Re;#~0?%h1^hx;r}zqjB%jk_NI-@za18FwpAzg4(P?Fn8X%>%d(
z;lJGHSJXkcmwSH#9*z4HVOzi%xD;2zU&lr9((0y4yrSA@HsU!elFCrIG&Hw8bVFsd
zJ-okEA5RBM6Eoxy#XM_Em7%mU;wp*a;0=kRctfRLN(M)hfpTeLOD2gd7G8`FB^Em}
zd3;+5wa~H+wKx<J#pfjTidr2)iiJ*$D-<|uC{F67xKeG#gQKOvjV1ieI4PGSA5%*j
zjdZ+J-V)*!F<4KV>0nZhtCe_GLm@*Nn9P?prYMn!NeirQ%rm#b2*wRJbSi&Bpw-%{
zY^=0Z+$s!C)|yS8I6j~ek0y<Hpj4{Fty&DT#PwFisJAI?j>c>Imc~@rNGpRS>m2FD
za0{bZjhOZiw(9j#r3pbqwDuBw5=Hnj6@nLHHPdQERgafk-3<zfhpY9tIZCN%qtPlU
zvG230YsEc->K{x#QW~;xkJr|#Fy7d-k&vb%t7nTTb9cmB0U47_sCe?2j!Ydzs!4gi
zj>txIY<zAhsYeS88qsm_s%oV<+K7&)@>X5w15OSPiv~`AQ8R6pOBXL(bj-l%iw5ea
z$1fUB%B|AHadkL;QKL0>u^TvJ@E4Vnfl~S6Xp(Fbay5d)(98%KdkVvtGteZ17&C~;
zNHt>Y;(BSUI?ic!VH}Ik?UXGfYKv&JW$7T@baCw&Yo2q8)%dWsgl(-IgGq~3$X`q?
znd1xT?k*%Ogf}dri42K*m}_gDJc*Y`+BD*&X+x4!m0A)P-0qu@NDDwHU~x%x^=>W=
zwwie{fl9uX$rG8tqc=l-ZY`;fx&9Kcy0j@?oFES?G|l__Dvf4>RIq@ohC-&niO*KN
zTIl0Mj3HZKe1MT>XsBLlkhEN?H{<@+*jQ5E;(hS3_oazalrtG`o&ncJSPott%7|Gm
zS2x8(dFi1BNQjxV^XwhQ%?ed&idLHth#|-~QMr+wCIyQngk;9$O5{1AP;tpKjJ2l$
z!G~JqNgET!;z<)~p=qXLB`UAg%20`ZZ>hH8M$12JN|39~s-Jsay84lOR@BpKj#leY
z&v>bxj4+Z8GpQTbN_FcfF(dJuv9vNb@@x<vKC5v!)eNFbG=^Jc763oJyR#&#ld)3f
zS-+)Lik7VFTi>^&XJurZ822O1U?AsNPdEHy(rlK-YD_H`Q!;jD!HCsWA6QPBrOMzI
z?_*^BldT_gSgQ_z3`~be%3xM1CC#d|xh1xxtvOnXN0^9}cqM;f=4OiprwW%h|BbS!
zEEz}|B_m>~PDyFm%_zDfh9aVt)M*lmgVLoH#AX8x0+CQo;Y#E+tka~iO44dHt7CMd
zo=P$_y5kMxIVxt&PU2cQ87z%f%R>y4*3PY^dNl^es*L_7>K#n#6fsJ56jmp5?`CSy
ztW_<HJ!N&)pp0b}<+w2lbIpqfS`c!yl-5PdR;iK2k0lKhq;A(M1cUVsnYJt~Ge}|X
z=s{xBW2|AO31hW9#5ltxi-$_(k|bA1zKM<wCangf7}!FW1H-#&r8IP=7%nHZS~jbo
zhM(b6=BRYe(2kTSxEcvnkB&rXS^UB{v{PeS8BRx946GPcqv3^-RzOsmOd64}$#BHW
z>(y4x@|kz2)J)QH<{xQ`Rd5S75>pSS&^W1VajeZ)SJGy+t`3I^k)AfO$YpIe@tuk5
zLKs>^$m^#yIh-yVEpdvS?J=B$2_d%L^fO%;WuK_8GMEn8Vi-cgg3zAM`Id$$Vge%b
zt@F)}vJjIQOH0E{g+>IX71(+djU3h#IbhPEs=}nHYB~?vWOJg~7`)`<bT_%hS7F@=
z-oQ=HFB%RyK4f9C9104F6y}zccr`lgaL{72(DhPX10h3Fsk>QH;|nA}tu&}WlV@5?
zn9B9)NIe<r+5{aL$VN(sePxn`)j9$I`R>9p?v}b97O=L8)K-&$qe^S^DbR+vO%?lN
z0#!ae#J$Yo%)?mKo4GeAZy}!cd1jA#htj5#EUGLJpglBWzuqy}JfbF(1bSd@4Q0z%
zZv{aWkCqT%8qlFIq5Nougx&Fa#fF9lk(IO%mdrplV=PEsmc+@h%5)2Zx>?#>OY4$c
zt}@l*f?|Ys$<}luN46cwRR>$at$E#X-yq#hoH%q<S(7^xPgi?=i>CsskR(Dn6!qGp
z+s)V8eGLZ4sfRAn8kXzvw6w{kYD7-$%ht(Wb<@NVG3v3e%bpw2GQ^s+1W8)ca+al=
z5xmO~pYc-W3TtJx(&5b-pi~mF7H`tFzgex-e0~dH-SPpY%_&P4N!>%7G0w6o%YST(
ze6*}y9gCKis{`z#O~SMj!p8)$(jMt;A6_RjZf{6F#Y@+mvpSkGcEjp*y**1-^ekT4
zn<etINvj+(#g#IvK{N}g^Rb*(MoI*+l2%bn)mZxzqsp4%YR$J^kxF`|iTc80Y=SS3
z^2v%)#l{NtE3FQ>jBDM7#V74AG4^OOE{>^+Ft+lhlnAC0CuJ6dA!deGjk{eYL<f?o
z#q75-ijqVsVAh6wF?B0Zmc_4D%3YDt7apXHB#tUh;V7Aw$jJD~gYx4x5z68E)<*iZ
zy{nh@tzK>gwnc1MOPKb;zMykT1Mvbk7rpW%Jy@zxw#1bx<7vHGkv77XG*Q)v-7S(?
zr7h?+EsPu^ZW(D?%e}Og3Q%Grv2c<q>!oHrWk^uw5E_y|(gEP;X&d1xOtN)bQj1zl
zv(`9DFy)npRekDKpqp484Z%=cOKT{URZJ~-STn6yG-9+(bV5Jrr6PCIDU3<?Bpscm
z3R}jsN-(-(39AhY^S@H96s@+QFtwf1y@q5;a$zu}$5K<ayK^GiYY0xR&vVu~60$&7
zYZ@IoH*7nlA-7eqeG>XzXE|+i0b)rn76VnK6<1x=H8`$@eon{PWk{QA%)>-Cs6G9p
zb(-0$(UhJoMXtb@G!H!+nciTc443Mr*I7NXiuuVh&l<j|TAAHcd(8Gqn)ZREVA}?`
z<;T{iVz(RULnxsl-LT}oC(AqwnXs;=mAEu4HH`Y2n`A3A-js%5%cWS#ltgQp<5_lD
zTE=aoG8{yIRx;DRj@g<duB=hX$%1@=#%x%eVk8rv7ru?^SjpDrZEr^^_NRU2M0RqT
zQ?4@2L3JV1FRW1QoULN7UIgW1I4zZjP~jb`u=1f?NI7tn3w>&2Je3hQW4C!h;F+dE
zUe>+Db7j3W!s^1_j=>*}2db<)rsP_ajLvWpmIC_WSgJZWh~%?QK|fN|ML7v^izkL<
zz2sDdtWA^fqZ@3m@jBVru0Tn@cKb0SR;9EVj*$ixq_?=#MpD|8pHR-?Fv*mJMg6*?
zwicA)7TRaoYUt#GdT9`gVV&tT^<>&qt#5RzHI#!C$q;r5)@D?ns&Z;j#}Woi`z91s
zL>Tr8P2L6@<93mq4A{J;@uGWYYns}6Fr-XhtrX09aVER!Rmn!gLNK`)2Qj(>ED6I9
zu)+C&$s7%@jjWnv7OE=c<b<<5O*y43)gH!$h9Xs2u3{FLN<L#cB^3?xI{M_)s>DmZ
zx*YX|RX04i#bMCzbc<FUTIUnHG$nL>7;(BJ#kkO<LNTWMWQE!mFY^Wc1VvHmKo+hQ
zEgs`k0D2K>Mx9I?#!U<eu61V4;f0I1uM+o~z>4~0P(hM5%!X2xiN{%bBopc-c2-Rd
zrjxm*^wp}HN_DZwa9Y;JVKAvB18JFkF-n5*0P8d+LX9GWv$0gF#c&(4-fvRIB+F85
z+R$y9Hf%^929O+6X(ZjzO5~H*h3&C-GnH4+hP{GbjFYxh^slUrnAs&>SEX~(+pP$%
zGdfRDotJ1?@<EOg8*1A3xFDNnJUZjr%F+m;JzB|V*eO`SP?qi1SE6E+Bm0{*)l5LE
zlFi;`xGJq+j&4Mg*c&DWwI%bLl(w)HrKH>(EfyB|WU{cfto_)<O>Hhz8>}X#A7y7@
zZA|P`{-I*=+mg#or^#}4@cAUIL6In!lLj;E4<dOJJz#j?y@lA8PURdSMp0k|uyvs{
zv~aQ-+sm80o9zWpR!ZAEEVMceGNQejf4$jL6gYXiz1$Ktij8jg!Io0?e?rSC3ViZL
ztv;qFGO?#~l&ouQ#8k{!zE=tCH6hJ3ZD?azJJ8hzl`Z*dt=n#5udZeXCM=3gY3Xju
z<78b#JnE}V(V14Gu+W^WtAV5{y&9IP##BXy)P7$CtA+v@G0X3?=Be_dwri^$C*#<T
zOx>0C<+S;M3s6f{NJykr5^+04?`%zX+tulkOqsu^xlDWTsU{T@Pkq=8b+l)gm|==8
z1cTr7y~qq1f%ww#rE5!pVfj#XS(>S8l3fALF@uK|FzF>uxurDI1f6-H+e&K<j)n~o
z{z{2IEF1a8OuUloeQln&->i+rcyUIax^Ony9vn<!?V(!S{p#0Qj&0vqw~Z1x?Tb|f
zb7H;J<<)3)ei1q)TZhwUH5MJ?A3K`3&H1{cHD^X^jCE0^bfk%H5dx&n@Z4ZSAay5u
zie>MMwe%~gk9L86Z6|zVv<AcY<T6GvPbOp5uxlSmwnReGvd-#>EguE*utoP0GP`52
z&aCC|upZgpU<8YgiC4GA1}xaF%s6$WK`Q6XRTymMc52<jSz=9RKOu?lmCrd<Didt3
zT($zrt-}DfHTU}zZ|#sm$HA9lV{fSlJDH#n7jw&aQVx5aVj0m|6hzs1bdaXg3g0$3
zPRF6@LLosPHlelvw5>z|82MSpn}tVHpe(4&#@WmXwsPr`j8sle<U)I#!ONRDGW%0u
zcnhYe?r5zmZ^)gYxM|#!;)^<*9Y#!T3UbwF#Xv_cJGpZ~&G=3WjcY7pkl69CiH*Lc
zYh+$`XQL>})9S*$x&KN%1r^nu<uVyiq=z{vwLSZj)Y}?irmtx=Yc0kF1wP88h#y?G
z78*`>T;s%+*=iN!&uo{tGuyMnnQgSLG{~T0G~hw|S%hacW7nC*j3j0_3%dR?ouT?L
z&6M!m-@hWZX8AbzHz39>e%xhY@wQ`LE$xdDztZ59ycpgW_}xd;++MaQt?kry`sju$
zR~1cB0OwFv#575C<zt=g!`w)*x$}N9@#ODGsBhuXgrML5Od6_&Wr^Fw$dnOnS+qcU
zV@fdtgx2NBLX4fWDv3QfyME>iE3Z>~+LYneP>rQ^XetGMiXt-gt4-Bw+4jxKio_4v
zcS->IiK)lwWnRB-;VtpU8vV#q8Jir9Gn2vO!Hp;j4^*C*qcf(E$tk5-8D5mP``wu-
z0>@JyE18qv8YE{03&t9=>5ZYFaGj$&Z(2}gCx#T75)%FU)fw}I;tDlXs+BH|2}W2e
z5da}UR$uXaHlsk`xRAO~+&@{=5NCHo83hnPrf~U+G(C;@%*D<i&CfzuJ~gHapDaUY
z|0H=rR7bYZ^GTZ37Bxk-P-=UHA!mrS%ragVwa2L6U$pfYG?(DDW7^!qEsl`G9rQUV
z(3XH<^P<DHftjbE;MyYMwCOA{ONv<-vj7GSLrutTzP#vyr7=t5&P))jrmmP}DCDkW
zhkk{S%qkns{d}B1;Pbw$&PJTw=n7FWnr-$R6vQlG!|F3v>r6HaIHzabY8~)p0qy6m
z{UvusAp?~eylvBwof;T(6mEkw2rx@IEbDV>blY>gy<@(^Eu?kF<f<bNY}hHsHWb0-
zX9=Q$3N}_XNvaBq$CR|qpWgOMp{s}0qiwy2`ZuPv_-uE5O%}a=cQdVD(tTh{Wb@Z)
z9`;xeDGZODt_Z{~wu{T;JGUb?Zi##HZJ90f{aesQ$D;Mx{Y&f3bo}*nNqQSM<8)b1
z=JO$wSzhOq=qPl#$Z5)o3THOdYPmI5aYkA;pyE9<qEeO)iMk`Db(irna+vLd#KBmG
zVn*dIsoge$S=kVo(UoN0q+liKtcPU+WnV`nR5FWVxP`1*boq`$Byye)!L{?AEu((D
zbYV-kLM%<z2G&mMw6KN<KR9(iXr4@n);=98sF$w81@h#LB;IWRXLGH?-T81<4k{xq
zY&Uo`ikmVWF0f8Kn(*ouXA$S<M9uCK*|8b<i#zan@o>v-eJ}#qTqlX0dxS#lY@%@M
zC>-19y@Mw^sZsZ*Xg>FbZSi0>G=d`KZd<WfPn9d27+Fs3>O<D{4rq#X+^d?p%pfIP
zbBcxL>w+$+h_#z=OnwF*;@gk&#Lag2+TJE@kn#g1bpS%=JqTlEH3Yeps|D`ln)53!
zIn1_TwW!?onu0`|SclFzIrFM$v#Kjmn`B7tj{SOGlo>YYH5i|vAv_tZS2>V`C3Gzf
z5!-62^R5S^G6Ay<Bv$Y2+|Y??CaY^?&IHh**hOqE7q&{R`~=R9#QmtF;Mozp6{c3Y
z)xj189mn{S=R&*KcR|yV6FH8i9kHI!(kdk-n*8lZ0Y7VqS)BcjePaBCIP$3LgSv@3
z#WFxCI!mQT>v)CAu8hn<EYHJhyTrK`zf$)oYzwQ6k#cZl9EpT5t7>?(=bUacJ?T}K
znllHq?XMdpZxFEEJB_Q#4z#{HGGceshuw8C^r`jLT6}^UDcag4{RUx87L9&4t?}|s
z5Rz1XZLJU~OeQZlel)TpKm9R-eb5N9*I}aU$=kYee^!1T<hZGzG}x7|Y2r5&E`8<6
zGX5%*G^;^V?2W2`j021>qmQjk?zGXT>4;-w##y9>vaAyq0gYZr!%-1tRwQ<`p%!hx
z^3z+mv4_8|z<OpLG7pSX=G>2Uhe<x|4zD}*1{K&?6ALEaSlZI1YwBzS*fLTM#f)LM
z(1ns3Gha9M{LsP5t<VDXJ3=X8eoE*BzO?xPe{z2@D0KckyXc%!nYGN=+)aq$S&XgS
z+oCcZ7C9^QP$Wf6^L>WR*GNJsO6?|QH)GQ*&B!#;wotUvHh*Bdw!qMKXpwO&H;wDj
zSgYJjo#7i*Y{psypp%5Ud~a!&H0xy%mGgNS83)T~Sz146WxdL69tO+b3bC@7fG!*&
zO6Yc!)<2pK+ZYw{C2?JLc<DPTvAeTT1kP#9^|iow?Mnm#3du`XWPf5Qh{7T`6fyBz
zweC%BoVo{^m2L^_8K{kzzeI-u>pD>u*#MZRw8us*sm$;ymZHoL5t%`3j@H(zI-}|8
z8|pe+BD7jr7_Z8Yx>h+QdCr3F`Q7thoRn*$$?<b%I*U-(s>Vn<)U~)Z(&$>xapzEJ
z{0u*0)%wWHwQJUQ*>!fx>{`m;FN_z=KlX&K`3t({pA;W^^1>5NIC}oE^XHSWYh7tP
zRo#=OJN{UgPN(Kw>!EX_oN(f_5aX_9DEDE<TJ=`EXvn<XL*_kWgj*TqZn*pOnJXEZ
z7FO_uthVR%t<U^j>r2Vl!gyuR>g5}HmiNYsR<1mwoOaXr(`T;gTh*IW<k;@{Gnb%`
zB2>GaaBMOP$MA|rS~-=?c~WPbPTR14S=Y&VI<=I$4PCvJ!Kz-PS{R=^kTz$oEpv0J
z+_j8Vzp*f`)XdvBZNaI$F`}5$=2YUtPK%G7d+N++g-l&bnMLuO<t*#ma+q5T;~Xc>
z!uuuPx2B!R+k@M3Sm|&=4=2`*gpH3YAP=zweRW<x8cAD~kyIBgI$JU!x~+;(=7dxe
znmr*!v7FfT8u1$nEIiU)FV6~X3+alH#S-<RZUyo+s%!)#n^M$)3TH@Vm@8GR#T3H)
z+rY?J_&^EVo5d*#xaJZ85_h>TE4@&LQr-LRLQQB1cI1+m%In2hfekkzI;*V2Tx*5_
zs@60=QhBhoIJ{z<<xe|?E{oXYUo-Xr4K+$c;7|ZPW4s!(g0w1InUUO)v6GINOJM$W
z<Dta*>rN`|Rb#b-63E+1%0?ewPIrXhQ7psY3uKRIVYb6Tex+ReML5{oZ0MGpC2Q%`
z_9#(8PXc?z7+GcEy7yL|ZOqA}WQvW^a=o?d6EGwb6F{LX0dFdmyh21DS-7Vv#3@Z}
zX(p88Te6y7I;NhgDS3(sW#skbi6#^?S)!EJk$WnYDz760soq8|HB#O|Mzz(O$nx+W
zvS5<eiL<wmhtm8dWXJg7UE*!Y<;SQ!<AzGY$h&=PV6ViFHalQeypGX^sp8=z3WE{X
zQ?6<umO?=GV5~TS6$;Ul@IfIKJ}zX=h+0Sy5*Q!l38eW~xSvJS3p_e$sJ$r`7&GfY
z#-1SrL6c>#aDlbv8-^Y~X}Bz+<TWXkN^JAOBvW;*i4Y{eUL4R}I7zV1bQ1#FllL}C
zBds*<%*6pXI}FqHqp6dmfk+c7iF*9fVKx&aClbcb-8^b_tBS~3>`%k8912e2KIBqm
zYm%qdDV#4TRLdLeLuejID=q}0&sLiE-pGp)lZWy)u1_qI7m`EVDPlzTKEAb4Pq%KZ
zVzT3nzQHQHt8!8wODFhy%6k2IeT(6VbIJt2H!``&Vg{7Li0S%6%4SUCVC;jSN&{P@
zeCWYOf+6?Io9ONGG<|hY2Q!8Zzb|aITfH$7BJDl#D5^DOQB<$FC+UxM(Re~_(QBi=
zGE#UAH7Ta@d^vs56Edz!bpOy6o5`A`SEn(0@?m+5g}S61k5_s3Tup>OFi*zi+1Td9
zBlgO)1m7wy!Y1yoGI(N{(9x>lV<vfJ+Q}R{oeQ^UtKHlqVT%;lbA4LNc{SV4VEE-S
zCd-%>mN1E`(VDtjYVwfvq+)uGr|u2C#NFnEzeAD)(M@k_So0DmBDsp5uswn3lA2mg
zWuVq;i|RbFI^#E4(7g8s`6M9y@p|FFoh_l>w)yvqmcd!OQ*AP>L|ciMr3ebUjA~tG
z3*}ymmdaRXdsZLUDnF<5t!nLwWb_s35-$4IN2=vS?@_CBN7?kG`@~}tF2xt1o^9!l
zR~8F*tssPZmI+HCJ0iPZ&en+arp)#kwt*_}7%w2k6bzNd67ivKq1*eyOqpt=V|_n<
znnP8FB+MlzacnsK48p=AM#!g>C3k|!bCL4909eE7QWsmSixeAJ9(8DnWZoVdG@vSL
zCv1*<pCXGGgl>AVky23*9AYlt61$B_v(=7RZD<xs%iox0AYEbh(zKi7Vm`<j<QJ<o
zDqlf>CDHPFi}wy4O~mD_LcFWkOtgZ8c|mBkkWk}d373S2)%V_9g|m=)tp4}j#^-!^
zTSCcr$rfW}WwbTMae&^j;QImh-iTF$?&z&tyGx-*zavhJ_V$*w5xspm(auyfXj^;K
zbietP&}2x%3)idi5ksg~AT;$O`K2;1soGa|#5>tqSy<{VQmaHq+DtBWL^*N8hS?@r
zv@YdrqmkH6Ce1p>cUkn(bXapALh}lRUL%FAV=t8lt7A0|VVwRRn#Q4zCh9s9pV@*y
zS7kaA4;8w~wT^5dpfDq7w{#Gn)-gsggJN?vBxXXbb~@l_sTjW4ul4Ooy}C#T#B1VT
zd%cl4>u*8v#K$aVn_-J*-Oyr}P$*=*dmFpLzFw>yqC7parf8f^Xk`m&Hm2%;ba1^#
z<Rq-IucdaB({?;6_8Gy!LfID5S79e!Z4WCZK%_ZpbJwg8o-GQPT};4-RVVKC#_g0l
z)IQ27Mi?WrDEIcZ)*Q8{tzZdK%v$hZ2~7rRELP!6P3wofX61x-hiD46f8W}YBxn8-
zl95;ijOCL9-sANPw1b4tUN~uLXI1u!$<(#xa*OGnX~ElAeU^EusznjkX(tl6Bfu0$
z+{s=VY1gKc06XaG^u|42qvl#!!bwds23LfnK8JCgcnS@9uw|2iOBql=daEkWJobPz
zb}D=|UgkI1=<N62z+}UorgbDl(`b|U7TX?dtztNOwD4>D8`9eNX1U_^Xl`i*VUi_K
zVTE8`{FXskSK92=Z<r?!!AP~$lu=Xds(k#RgIaDHx%a<IopC|$3eh%+yx~Vnl{Y!K
z_rPW8ni$u&Ze7pv<$W7gFYjC2$D80;k<J=cC}kFVu4HV$mLI5wT-IyhK{=09Hze>n
zyfr%`w5?8V8}F7TTh}dzseW3!Y;DWK^QF#`t@VP6ltqzea?BT;tq4kE#*3(LjC*Ek
zsM_Y%2VZG0jz|tFDA)MizF{O~3=3<of4^M1AtPn{kTod{BG~DVzHTeE8hd&=3scCN
zcg{y65z&Bs+x!!I;GCS+C$ELGI&)hRd6N418(BuHkd@PoP0#xEz5P8FBhl*ud2M_R
z+Iye-bc4G?i!f-GbSsMvqkS}6Y#<qBr)#I#TCdewS`AkUMzugg8&n<kQmuwmIj<($
zbzQ$0gf&ICCnN|PRfeMD^>OJL41rb7xcci8n&7YuM{3iy#@Ad>nP^%fQ<b}TfbPyQ
zgRSm5#ZK&_BhrJXYE6sdeKw%3H4LU+A?MRXE%g8z+AC6G7_+D$&k*_A3Q8iQS;Iw0
zqA*4T2Q^8gLp&FWPWraeE2bEXabcKOQrI230sc4ZME$h>*!XA)dQDMXpaIB-iX@Y5
zLhUt8Bwdj<{kHi*Du#`6n_-7blYSAJ2XVETf+A*dqG;48XreVq&yM-oTaQ<5SqSu#
zrtVb+<L0cY#Mz3ax2l<rtD5ON`k-SZ@kgPyYRy)JytWH5lA4xQX2Rv%j5@2)!3H)s
z$l}Bf520cU7MCY{%l+`pvt6Lu$<)$&Kkg3&wSNhX4}(8cWtSpy7F9OwIV$X%ebZvM
z@Jw9F$2IHpZn>ls3{MVt2;M=}q*G?f@gZoR;$rvd9Jsg}(IR_AMvy{v`2sVcO16T{
zRJB4R&0A(qBN)NMF@#NkmN(nG!CP~tEY?zhB_=BD2H2h&-+SdIHJu0Q&Vdfnkm(Cc
z2=8#xF$v`Mj#**F{v>m`2*F3^_%xPVEl|ky0=jIRD2wB6=NU*PEwxP}OdW~YYxM^P
zQSbby`eDd!ldz-pvz#^tjY7>7x4D%#PDiASs1SM@f|=`52PDkYuYx%c@@NA<mOAYx
z0Yu>Xo0EmK%5&|+Mrj0s>Tg?Y2;8Xx`u#3MmF~uz9pkO&G#MY4Ob)BSv|X1d%(ee)
zCtv7+jfgmolKGqiM<HS4MzubQ40d|Orc82S921?$LI$qlGRX?Booj2^)Ge9REtUud
zi6SH85Y#ix)us{yF=ix^34<fVx>l0eRv|MjRB2l-X0B`xT-Fv1y$YLl$32jP%_=4z
zH*aXBRBy?afjT!0B{MikG7({%=yz|l9yX;^s=?r;H+_-P({NAQKrtdoU30;4dk_LP
zNyYAM2F6@&nv5#!M_7y1FSJ;XZjmt~f=TFtk*qBRC(-T#+q9`1-*hH1T_e<MMwZ|S
zRhag}k%qmXqZipwN${wl+KV9S*yUJGTNA~CKGuw9x(QK@dbwCwiP^iek6$x9%$Uet
z#a|VxvGT8<!zL*FVkMKJTBoHzlYlTM`pK)Cl<-*)fUp>=7>>J)X1F3b#ujaf^fJ2S
zyE7KR0kZg-5YJvpmxR%5^^xRlU#mB8-+?I>W_>mC0ZVMbud)p>!IlRHp<$BFv@y$(
z*c<5?>$#WIsf`!bLtd}7Cc(cX6F?G2UOmhjAk#fIL1%dpiTb68Psp3uJlz}YY=NC}
zA{%x!3I>ndbm`t-=Nna;q%w%Rj;f*DhSf&5?OpaX^5zA#pv{~!RXDvwrj%@4=~i1F
zdYr3`Y3%kgX*MA`t8koV4AfSPnXgM*;ZPB-EvnF}F?aLAj8AT^WizSWC|&I0#7y4G
z2ZLl2bjl1JlZicvT`&@<C77Ir-6lXz28}{)34{b~O-Q*yqF3L0_1=4F;UuQS>2mv%
zXigZCG8>t8>A;k=duiFWY#^BZI@*wlfo<<kc8nml`R6+{b@pxQ(YCe|8Kd<i<D`GK
zq0{EiTdKPaQ_)`U%Oi4~+^yIl-2~~I4UppVSJXQxn+?-S6e%kSo^9i^ZEWu(yuu5S
zK^e)U7H`}0@$yP0xKNb%!f|7mjgejFU~$&ybG%oobLQkyx0^(@YB=k!FDtNM)^cQ+
zkIEFMZL20L!HHzs%jMH-7Vk>C){_poib_6xvEiIjiyob<AzNhTv8BnMy>ow5x_v0v
z796J#Q@B6ooW2s@q!F3^P1`f=Xq)nEbIO16B0)B6UZYGVUO(^~Dz}D;loRu8Qy21X
zd-d~4hQw1V=&HF2!C-2*{ji8KVN9~L+teU7C<9LGM&qGScJ3;ej|AG_m@O8))vNni
zzfG4gmI^kY)n;O0j!Q?%uE&J!Ft*S-`V6aC7UCbU^Jh=-(tHO}3=SsMVi>m=+~tR~
zkU!iFnmAl5i~9vO!lr!dE6naNUHjlkKMC+J=Ce-%tV>I^l*_o)c#Tb))ajVcQ$>kk
zhitmx8s0KT?H`w7Ga-x>S-PERVUtJa2Sa=?;Ovr&F52ZzrsRg$AcLlquN$~OCe;jO
zjH|@#DnXW5CO<oc3hEs@C0!%RZQPMJ(Qy$asp;G}xAs*zH5=2{thJ73@vw>QP1A56
zg)id|QbBG%&SHu*m@ZLHiM()kUoNGkjfVTA0HRu2ytPIWmtC>+anr%PSxW}2a7)0O
zuk>R76#4Aa0)^~ZN4R3+H*#dQ%^{~a5T>wCbX)&o^ki9x&$cfpv(Cy>49t%67*V^K
z!(66s*~i_SadcYyBx6%l4mg(!M}&nkp^~;82n($_)a5NW>^&J=c05mJH>CAU3YohK
zrD_9{pZjXxR50e%kaKK-O18~rKR<+$XZ9NV2m!6ODhr0O4yKmz>ffz%;_V2r@{?BV
zK0RQJ#w}iM<=a;X_*{e+UGW57kW|xGC)`z#9%mAvDuVUu4yTvyLj<}d!N$kkl3<(f
zZsM*BrVeo(6HQicJ9Ufn-ad0uyd!qEoskcdWFfJ|>uUrYKk*WQ1u)O;$UhI!c1!nY
z@&n<p8wtmXb_T2z*(SOWLoI9&m{ANcH{-myGB<!E*3e0l*y~GnowK1fgzH8VjT5zS
zTQ4YHI-+gQq3<Ny8YQk}Hywtfn4=HcaR)`GlTK{uO?;XsKz(JCPocpqR(O<MB}gC3
z>JL!z#ORJ8ffyf2W5T_dATPpFWcp{Jo~@n5OqQrK%_LQ|x23HR-6LRiMT*ci^AvX-
zw&`T^&Qx|YwoMPWaq-#Ow|63a;hKmO8+CtcAr#uNm#|G-&YZfAVi$fS8#=^=EVW^K
z;iY-q&L5(FDgA7v&D4b6(eG`V@v7o^bUq-H#TN%`vUn4NIT0sI(lMf0lE4#KBtyeO
z5Vt`(gPi^sZt;1g5A{vDg496_xFSyG#l(Y(fkiMBRP1znsJ~m+9w_b2&Q?_F|53G0
zshPAzW+vzT+%lh2g%|QlgD&K+rA(fgSF&XxouUUr9E9<qdgk}k<?2F2916FNBdYBT
zqdl<AXM!S(neJb)j-hBs{&c1*ih$|T<$|CfOSZY>jF+d)p=G<s4Y^Eul58DE7Ws9i
z>GNe0$4OSdcx^kq=v6kurmty|j%{ns34NQQ&OW`4knd_jXQIFc9kV@LCDF3u(-y7}
zgpkY{Vkhg6sUtCk<{_3it9Py6ylKXutmS*FBGqyQq%G8}uc2AY9(IITHQePW96V&z
zwcXdtLc@d2;;=*9ww6u2OW+HOJa&Aff)|*=H!65!D*0_lNF81c4F2#|VDOW}?R;nP
zg<7ZCx&=*YCPLJo^l6oz>THcukZCh=L@Q~c$=H7PsUu@{sAvb#Y?eFXX%Sz74lUwV
zo5`a|i`6|K)rKxIrZ@78g^Jp}NxtG4ez;u17Ss;@$vimCLaoIV`jF~u7*2PK!zV4)
z)OmN!B(_~;a#9nMdv=2r#ZWD$Gft$sn=JWd9OFXfPrl0;OSs2L@_yEJUEn)AZEz&c
z|A3*>OKM)p&NRPI&Eyc@q9Ev?glXV+J*KE=qhHv4b!-(Pj%@8@#tB=IfbWab8#@=0
zT?~sSTDTN+2B*yQ%9W#Vy;*6@NDgbYly2qh@PP|H->-{fYLvI!_>DMe^inE^G#r7G
z9}U=@hgJPsF4U!4&m0f2jXs}|F@xT0rN#I-$_EG0?x91_qk@LyjOnfube2!*F*t7f
zSnLxmQm3+eA>F~6G?k&iGKZNR42Nz3=(QuN=q&ec)}TLQYM@NJo{O!hPQy`9y=k1O
zE!n|rcYKyR(#QOosq}Og!D`vr;KBlxa9dROw9TkvCMzEOl}=eQb1M%Maa+!WyC-jb
z!Z!*yvEt1}cS+Vbl*8go$)ap+zil%%RT+f_NzfF#;OOVIH(!h~i%2lRC>QRyPFYdI
zt9nkJF^RG}<XS!`vz_48Zo8r&wTNk5n6RbnqCtcI1cpOcyHH`aU#4N2j{&FG9hW&f
z3JMoAWv2_5q-+FfsdcoY?=TNXrEtmsFS5JOUf6clZuA#g2+@6CX?$P=|M?3EO=d&h
zTn@VJEI-^iuob#IJKPf6CUSPJ1u&?)#-N$0cS4;2aYz3dOG9BVaxt#!%$0NDJcFcy
zzbugFu!|>l3xlxiwhTfgpI&Y@OE}rOF)_-5wG?m#pH)Hs^J|tU6SH2pNf0<`J2459
zZ<1(2DcY|xa0mZ+SWUuN-6<|Gd}>0Mt;KqLA;aw@=7h;Sj~!;Xr7@RfA=`Q{;Ulfc
z;1S-R;&Q!z=H)I~<0KZ`T|XqrlU%Nw?5ZE479Qb0eWFQlnm0>{9lR|{hBO_wFO0C+
z>J=$SgRR0@nN6*?WAT&^Xu$aPZkK&J!&w!)hSB!<4A~W9lk}x{fqUsv_YNZcu{~~3
zS7b+DE;i+={t9j9iUGdlwy@4bQiYsilV6uDl#xeIbz^qY#Iy3RXxP%%M-{T_H(=vx
zV=(1~naCo-4!jr<EJcvJO%*AoX@9GmCBMbi$={52wy0b)kmfVn2YNe|m=2jkYbx6A
z>MkH0pV<SPAwc8pII}zMPmwQ@U|NnOg<$9MYza!lMy+-42mN(6?((=xINW6tOALAr
zrY5p+cZuC%|B7zcdEcf28&^nXU(~2h_@u^S{=*perjfffNr@fikubSB>DD>J4vUzD
zUTuhMy1Nf*WG|heC<p!uYOoo)jUnB8Wb56f6XwO3UVhTFN>DB0CF|F%w2S|u3!7Jc
z5yPf<b~Xfk>{bdFpCBV&>}@Zpe?{N2^%HWq#B{ldMTpyO&YzWu&eyg)AP6JPRJ(9K
gUX3!TuhRzG@#mtbgIbZ7e35%=nArg@^F53I4+i5kB>(^b

literal 0
HcmV?d00001


From 3dee49a0cd9cfb6af8f6f6a9b5af5c366413393c Mon Sep 17 00:00:00 2001
From: Davide Demuru <davide.demuru@buongiorno.com>
Date: Tue, 10 Feb 2015 18:15:37 +0100
Subject: [PATCH 0649/2920] fixed transaltions

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
---
 .../locale/it_IT/LC_MESSAGES/icinga.mo        |  Bin 7672 -> 25295 bytes
 .../locale/it_IT/LC_MESSAGES/icinga.po        | 1402 +++++--
 .../locale/it_IT/LC_MESSAGES/monitoring.mo    |  Bin 42808 -> 47775 bytes
 .../locale/it_IT/LC_MESSAGES/monitoring.po    | 3332 +++++++++--------
 4 files changed, 2981 insertions(+), 1753 deletions(-)

diff --git a/application/locale/it_IT/LC_MESSAGES/icinga.mo b/application/locale/it_IT/LC_MESSAGES/icinga.mo
index 99d3afb2bfc2496a5aa8ccb4ff67cbb6f08aaf53..9fed8f466f37dc3708c4f21ad3f2e66d53a395e8 100644
GIT binary patch
literal 25295
zcmbW937jNVo#z8+4jZun0Raz!qp5D`O1e1&8xV><pr9|hx<O@7qBEnag3ioHGcv2X
zoADSGk6C4K)$ts`W7Jhgky%tgU0qN|R~==TU3EOz8CP*uky!;9$78?0|9dYoGP_IB
z{P5}*FXF|E_x|sHzt?>C$VG3A_&s^QD0&L`^FyNOdal2GgziSsC!Q2V{1@H9pQnLe
z2ag9I0*?X@JvNH?FN*ndIQUHPFz_<40G|yW3Vs<}0)7KL5_|wW5d07D3E+Om@h*6{
z$ICpv99+u%PlG3e-v^%x9>O3Nfv19cej50A@CuL50}rOY(_;Z@T-Srkz*mFI!P~&o
zz;Amz<jGNVH1)H<)4|KYi@-hL1b7$7f6=e`qkfKqXy=0$gXe)S2KAl0K+X4y;3n{!
z-~-??2CsgPfSBrM0^9;#18ROB2KD`W!4ts;K+$jU2~ji;9s{P}jo{<JpM#?3Z$PFH
z9T7V^tN=BRXM!5XC7|ebm9O_fmO8otd?I)wsP^yjcq>?={%KHj{RyaX{1V&^9>m~a
zf#@Zmp1;}SUxUX`zYRPE{36H{q6a~S7#(&}6m18`L4EIKpvLh!Q0w_tQ2pKvYJMO0
z&p!)_Prd|-&%WvJ|0{S9^`C+2@0Y%Q2*gx>OFSM0ir<a{wcaOyuu^n6D7vM-{t{61
zdMkJf_yO=wz{{D8=J9?|qVWZgPetDZX%hVkTnENWdA?s1O@kWGu2Y?SyaE(mZU%M#
zW1#4E52$&49Xt@cA3O;B0jPET33wJ5jk)^S9xnwYe^-NAzYeJNdAWan6R2^%8$1}i
z9b^fjPk~y8?}3ZJ--3(5MKCj$(GpPWeh#Q{PJ^OT4^;ab!PkSY2OHoRLL|Dp1{B>s
z2%ZVv1**TFf_nc+PmiMY;3`n_+y$z?7lC^3W#D4)_241kJ3!6reW2!f7kDuEHBj^X
z2B`PG4{H5>4vN2*u(+p#<Dlx-fG+~C2c_tK3F^Byt#JLk5!CqK2|fe-45;V70JRRk
z0<}H|j61$N5>&q@gQ%`(0z4FaE~s|X9{Zry@8zKA{U%WJ`Z&lCqR)8zvBzT}`eEE(
z>v1b6Ik*;-KG+354!jY3CirIX@!-Aw{`Y+SM;;&XcmTu@y$=UPzhgkX_cV{EfvBeF
zTu|TJ4oWYzK+XTvpvH9*C_a1#sB!!Q2+5=GfST7KD;*vIiY~`{JQGwu8$iu_3e<RB
z42nN*@Xy}_ieB#kmw+Dy*Mgt*c+e`=l=|i1so-u<e0B?{@!tok{l9^d%V(SsMHhn4
z0Y(3}fa0S&K<S^af~&z(=tTWJALLWfD?s)0ac~d#D{umwXYyx*cYqq-PeC3<zXio#
zXY%k3;BBDR=MtDnboet+-+wE36nH17as53QgG<hF{JIj9yj%-v{I3Exf*%C+-G2ww
z&*|qne%%a;?rl)-&4ZG&o53f5cYxx{zw`C`zyqlN3#j${A;^Ex!~B6&q8fu19j^h^
z?;cR=^fFNNc{M2hxfOg8_zCbB@N1y#-VecdgC|4OqroqD{0^w^{tT3y{leohymSin
zv%wgAE~xKc@A1u`zIQvQ@q7vtAAR26|BA2wBdGqr?eE_YN<JR|HU5LncXIo9Q13q#
zylFqa4IWGV_6r<czY0Eu`h%e8bLg{NKgWTZ?>XR+;AZd!a0e(kdH~dX9|n&H4`p#R
z?o&anLk(o9qYFS-F6x2eoA-gsz<&ZI7mF@(c4Q@}`ECQnkJo_u&W#@52CDz}d%P9Y
zcs~I`+UWD3_+>wsR^L4bgmt1esPVrSTm#+#ZU%o1ZU;AB?EI*AgDa?i5!8E+fGllP
z<0Z{!7F0j;;1%GXgI@u^4WjC!4<J0pf%k#izz4xGaLqdR-cC^U7lDhx_kyngKMHOF
z&t32I%PT?g*XzI|!1se{e<vt<e9q&&;NjH2=kXy>^xN+eCvS^E(dPt@;~**`IuBHT
zEl_f@3w$Z~a!~7d@TIQblR(Y;Oi=eP22pv@HDC<B7Sy~y3{HXH0Hq&ROuBVCA6!Iz
zEvWfSf*Q}Y9^2qS)c+I|AH57b1bhpq_ud6+{_g|T?ha7%|BQeB74Sgn_k!c#H$d_A
zL6<o_egb$B_47cD>v`b2!8Ry*A9=ZJpMd(#9&j1>8jrVwTF>u-kJ~Sb9tHLN{Wm&!
zUIOZSHBkLu0v-xp1&UAVpvFB1YCbOn)!$1&L@;_gD7t(T)cX&C>Q93cJ&prK|I@)I
zg3kiA-djQSTL+he*MVc;8$f;Mlc2`&S@7xLS3t?bqoBTX`esL;3qjHQYVhq~1MGqO
zZE<>U4%9gQ3cLvXTTt@*b5L|$b_F~EUJhzJH+p;{sPVoX)HrSh^_@?GvICz3pA3Er
zJQ#e$KmU!#gSR@pb2uozTLzv8uJQL%@J8w{1aAf(5A%r+J_IfXZv!>HPl1x-`~Cf6
z5lVgUWN-<18h8YF9w@!J5!CwZ1P=pm01pRW@9{n06R6(~YCQLV>hA~ODd2-(3_cO1
zqUUFU;+HEyeXkB`J_UF*cq6Fy-vgowqYr_i*N;KX<55uWA8@4`&*7lP^E6QNJss5h
zXM<{Y0jTd>20jgZF8D-nHz<0%7SwyUf|}pQz;nTSK&{WO!ByZvSGj)A1=a6GpvJus
zl%1Fbwca;?=YX#P)$cu^zW*gq<N6kOB>2yu==LypIk@QAE?(FIo=*KQL4Ei0;A-$u
z@M!SN=eTy0;0e_K!q-0nYCI2v>i6*HIy-U#D7m^EJQaKuxDxyb2+KzIgRcZvUG41v
zcn0-fgBs_`KS9R8HQ<ZEmx6Bw_rJ!`>22Uq)b9h22Y&==zKfpco*xBjoEt&Srv*wr
zZw6O@Uj#1&9|2?V!som8*Mh3Q1UwdeCs+gT1SKaw0yWPAuXT77sC7LVJODfg)cDT>
z&jmMulKWSBybTmzeFxOK{Rq^!9s;%Q$0v^OPX_h<3&6GDmEa!mZJ_3P%nmpIQ$elw
zc^)S~^?L~@e%S<S{jUb4kLtcY3yQBhpxRyU@4pIs9QB)g{jH$p^)68Tz86&czXA6L
z?*!HVr$D{;IdDJl&nU2jRsI|BOkMk5AC!zPr96ppJ4L_$aA1Gc*Z-xQNfCXQs8fCy
zQ~o#Q6O;!j`e{A%`zy+;?Fv2uVX^4{P)?)#SBm&gJQ;qU^A{(9ukhD@?(yF}7T`bm
zYeAdx3(7+jOoaW`^Y=Rxt;3HgJ&M-yKU0pQgx^1h3-IfdA5uO|xsU>T+wTJ&6YxMk
zXWcrCYpp+G8~qLCtCTw^;*pec59O1TWfc8hK>2}Pxj&l$t^cY1-mAd>Lb=q}|0no9
ze=WQGzx?&1p!iiXb_4}A7+p`fjH2J`C}&ZQ^kcn?Yw3}bDf)?b&ZT^x@_EWPD7R4b
zdm&}ou8;%p{glkt-vYjvawz@&1bmvme*pETaQ#`z8z`@(e1X!S9L%#n1@)V!>_`1h
ztHDEDKigm5=W&1T={G~!M)?=Y-%<3NrHoVlhbsKO<-q>Fl)vXt)>Q7vC#h5aBIW6n
z|3|rr@-E6^o=GR%O!+NEzY8eupqxiJk@6<W;gp?}qbLVc!f!Pfk~#g3qpz2N|4R8T
z<!;KqQT{vS2|W8bsNZtR>+Q<@*#t~buCCmBufKjOxPkI*%C9JIr9478mi`U{_3Kh@
zqg+dQC*^F)MU;P_=(m-k-0j=I4^q}r^gEt=ZwEh0c@5=g%0E(a%9D8ZF!*uGI*NWD
zb5Q<0hO47!_YCkOl)t3>l=3CYf1>F3atHQz7k^_)%WCe=<-o0#`p^9Jl^*B7XHkAh
z`D=e~F}Q-Vh;N7Ar?~hq<qFDgC}&WP_Rl}W^-Cxnit=vy9pu3BJtz3<!+G{SuJ5I6
zp-lPvHE@5*K|H@7+)a5r*Y5#Gf2+9hO3E1JGnBulTtfL8<pIj`DEfVc(xhBNxsIaW
zn<+aef2#_=7f~iD-&BR)^C^Epxq<Rz$`Z<#DdBe`7svSd9U@%Xi2Lo?q}^zyjd(UM
zdPUsG=i9^gi?lnJ)zc!bce7qrPnyx#(qb&minyKk;v}9+npq=m_gg#CZd9w)=q}!!
z_q%Z?DT?{L+lVF_jd*QR%r?_rye+rO9eLs(>~&*0YxdGE9Yqt(W?awP)7ebF%K(#p
zZ#Hdf2)!(C$E~zCn>UJhI>{J*E#A^hlOm1lvuS;2Ov|{~UG&mc+{|a<yc<u}v-V69
zUzP5N&#-&b+-&9DG|t*wwyaaW+37U>7pm9shJ0qIzNMQ^XS?jy?r36YWFyshM^fLJ
zLX?x17AM8CNfGZz({^0+>kze=?l+se8FbQ~NuktGM~~^vZkqJ|s5iT5E1z5V&7?`s
zjoop&D}yf<8d*DOrEx1O3Wz(}hNVxtalg~h08flAh79&+h!*WUzSa|HEH2VsPaUbL
zT5Y2Dva)S=M-`TM?WXABjK=}D1V&qvw8vmc*sYs4(^!03i?`}>WHzp0Gf(zz*~npa
zakfo7axERL_Ud(?ZQX<)L)&`Vgin#9ypwi~{q!|`T9o&kA0rN_u?`%bc8%09e<N*Y
ztlb*V>~yjt-xX)mlDv36Y4_q@ZiJ8^G`#HTR@_eK?S_-Ukq&5)N*d~tBe7%=&u55P
zzo+4}(|RwP%X+(=%=;lDF36kvTEggOS#&4E(VFng)6ZtxNxHo_w~-DS=B-vTUZgw|
zv&2n!PHkqodB0OYrG#ZgR9Wb3rcDFBr<rM)qcsb>+(&c${&$^v@pF-~>9*pn5)BmH
zntjjNtDF@jO;`{=pqXqA+3uzV3J@Y{F*`Yf-qB2J>aLe$ZH<XV$-0m;?`F{0<~N_A
z?slNI(xi(LYs6Ae$sF1(;cZk^qu)%66+91A+JWN8n|Zsa#T(sI*Ha^x7#RPe-1Ies
zruw~lg8u1+@9l0iv-VCt=-T=(@%bk5yCUAf;?G-;#cV#0Jco8+ks4W{5jMgQHPL<(
zlfdMsC8tSycS#cTwWc+s=PK=yghFdCmh~K3_GMCGmSy<$TGq~1@U@X%O9Nqy6X?j`
zOk>6q@g^i;MB#eHGu&pYU(Im$_rE8V6Iwfo^D1ty$+u^mtu$V(#oMF~LfgO)=rf3m
z1c+^<7K88%lK~^gdNIF#w~Lv?s?c8MP3o-F0VPBEkF~OyS%lk!J<i+ktTag4b}L%s
zsCPc6FPCq|ON&}0d+rvfyo#rs`Yr|!2j(tV8?}}nV5&V-wq-pC7HV}{phj6QO{VW7
zp6=$Y@~O8k)O*PetV4Mb2kFh*gM0q7u4!y0g%{J)dl?fgdR?rK@vRqybXNx<b+U+u
zz|5nyX@@mP+jRt&N`Y6@kw3yU!rjD8Lbwp)>AcTU`F@gtS0Ue{7B8E0s@jR_Y%&LZ
z%^z@zgf*iX3MN4(IF@g;U~@*8pfg;zG^#V<<<VM`&M6+GvHTKNorNr-b&aeS2bQ*q
zC$W37PL^F0E*X5CmR)zW-sY}2t%HRZm&~Tk&WX{wHtrdQq^CtQhF0r_Ti4nGk7ac_
zNgE~TUhj9M>+~rZ;eqZ6-Nes<3q?ts$X;sWk*5@I-@0K1v#&S%4ZZB_4D7hB+l4F*
zw*=9;T@0~}0$-2uv_J8ba|V}9ZkmjBw^;7(caq+$U4;uxZcEZr2fDASnJsBMe*?q2
zUW>ttW-8Y>QyE=i)+)L*Yxkl{@uuxh5lxP@%%UTZx!3M1u+ccvngPSM1<u-?elMEb
zB41UmxOrCP3$<v-e_fl``z?grnXREm2w}f7epR+d4z_zTkI#$$nzbXi&L-2s^Gs$~
zwczYXhj%(y9;n;%%MBA_@zt_xLw`Y^M_TK;(=f~h%O+1eY4>5&-LVW3Ubsn-HB2yM
zD>Nf}lFLgR>S0GWpT|mvo|t9Zc-oYZmOlsuUuCUR^&@H(X>)o-*$Drstzj$jz`UmT
z7xr}v9m>(Irt^A^ZmjoWsaqp3Lo36S$#&6W8Ze``ro7;So1l?<xS&ohI^BFOgKx_w
zrOE#tZS0YG2({QgCUuK;l?K`-1;l9NEDvd;pn{@FCTL6K{RQZNQFmq*=gdV(!(q;D
z6m5}1nlb0n23JIkh<=e83GSV2bc2va&ee!rae-DDV7XQ(fPFU83gJ04^ZBsWtVplh
z$8*F{af&OAm##XcXjFN4>6xeC2OFRCjY||jE<NLv0^S{$T5rH3V(fWiY&EY%8`e&2
z87MESZ5KC5$;T5tv^l;@>YCYu%{#8s>aS_yM@C2lA~6$hNaxaKSu>Lm9^v;Y4t27_
zU+SvJ9Ug>lCq^5Sofr>dRM^g&X@<>6<`|5)c%I0ahw@ob+G6Bdw9&%XcoR+%ac({j
zFTr-%w9K|^gzC{PygtWs!Ot4H=`D4*hvu3M*Yq;_3b%$|C}@oBQPi)s8Cg>EC|nEY
z_U-ez+0;$RTsGs>k^G~PhCzT#=0dorc7bv2P4gB8gq1?ENLhxh5vjS%gY!C6D`jq^
z+g-hAQyy<<BpsMWiy)^{)>wYJh}+0pN!G5FMyBT!T!FFI0!aOuGU?=~5@{7RNM?A)
zl-YHCo)<f_j_VBr)v;D#GR|K4^$*IirZJ6>C8RJ)*Qyq;MWQ9y&IuZML7r|rPZC7J
zVCI8mscQcV^$~AF3&nrP4Qy8-TW&FvCy0&7Tu)CRh-CH-b~aiNV@e~LV-@_;XfwY3
z$VB$JzG}DcCEDC}-YH{&{Y`C?daBQ6ywT1Z7InH{$mxHDPvzo;E^E<dIlR#p44M5g
z$ITYHrh3+P>{w<8BpU;Z=fZot2S+GYQG6k{mzSOSAH>^5RJoR)8-;9>j~Hcd%ss{F
zSojgje(<zo4thmdma7yO?F>zCF??u`v1et>QwYXOs>y$g;d|wyiO6XjS)jma^NI*6
z>=xpG7W|LNmif;!B1A#qIfKlKo$<1#FQ<Zy=roghI%|<6Gwot-nvFW12@GseE}<(v
zl+*xmb0)Vno*dKgoAb$T<6t@|UqVCS`;*)d%Ouk!MO<gze}^cDZB%uHE7ujp4G$JL
z-i>P0eLS{tn?Et^_UN^_$WjHVhtk=0cQNciT~%%<`dLo|v-i`z9diGg#gmn5#UZ|`
z3`nI~wH;eiJT@gxl`nt+;2+D}2K~D=#I@nVnVB-&8q&leL;0B6`T*{+wC(yVWZBlN
zNm(;<T-HXic;)>e{U7d%L@o^jAHnrV5H5Gfws;55w3}39Rg2d2Cf<YdSt3#2#jAD|
z!c(i1!&jRSis}hpmu@3PId#Pbd3Y{3ol>M1;svWnDyrNy<(%rs9-7NA9Mo}NUdtNq
z@j1h}-g4m4lnIrGc&%BvP^%a|<7oU~%sWok^gtg3b6N8*NyAK~P5DfSGU1z<rUlZA
zYU*|hxG?KfL{rKbEiKUV^L(kze<}T-ukC@|U1}DJzYJt)Bbv%d{q_K9EKPKtb;E(m
zb%}vU&6x_mrCh0KiZDoj3B;X2<}S=0xsWf~hGO!oyQQ1U0j%C?;?7weo$vg`*tiLm
z<}z@Fa&&xLYb4F<9-AkT#?66`VV#t=5`|{jQnkzVp3%Ijlr<kxt8T=e8@twt1v(I|
zuFRJ*c}fbJ4@BO;0^QXnsmsgOHe$Xro%ZUp_;K)*+s|;R5>ddS=T4#zy3{EXcOeyZ
z=b!qZknkd}S=VJ4>N7xLb|Vi-1~eL7*j7s@GMOjt-Jb<!PrgK>Y9+g}R^Rq$%olIU
z7uN{WR@QTau(|n;t7#PC4ETZR(z;`tF*0GARhY-#?}rKK9oEE#Q0>2q;EvqHH>j=}
z>lxOHsp9PO+*pMkao#QU(#zmS#iPno#g-5+tk>LyA9aNv?kx#_U@$S435iHJ%2**t
z^&{Vln>;=D)$9fRw7WZS@ZSA8jxfifN%EQyxYsX;8YPB<L6)7g@^<DWLe#W*8C&6&
zqGa79hEiaAi%N}{OL{PEb=XUQa)k4yV=(-#gVIBBUSHK6h0!dx?pBw4vELFA+p=H4
z)`#=!TM6df^=rF)td`e5<tuLR^6~#*#<j?x!bRP5rr%7uB;DafmldfpD5(Oh51|G5
z`hKhJ*kK><xE_rprp~+<UY7~SL(ZqC9aD))VqDy(Dk=T`Pa`*fHt1=YvW~q=kZ(%W
zCLRdstUi3~(>l0C_*r~Gp}cr;g#UxDulyjpYqH;gyUH%b095)-1f<Pir1xFAPY$-`
zCqY%fN!o!Oj2R`ar4Y&<JS8L`)$cE?H7&WqI?CJzIkzsu1HNcFMm@9lk?kP}*C)gC
z@adtOntynpVT&xzVh<~Zie9ky`|S*o@wUPz-9kUEflNtb$U2lVrjL#as#e@}R~bc>
zGEM^^f((p&KhE21*vU}_#u8gL;ciMcNU60-PCB*pDXfbZZgHhTP*Y!iLnf?n2ytC#
zwN1ganJGed1X|0?f|<N|ks9QJa0&}jK&zQPZ~4TsoJ~gCs3z6-`FxOP-#!_yO?UKX
zqV4USZRIV7sSv`{pr;#UyFmZS6Wg0MM;xy_+U}}y->TPgueW!b(RPUhA<Aqk>F%_e
z7HTlTCL5-GWmQ=r5-)^4$WOWpxmCCltkOPS)aJt;(N3HN@8Y9c(t+E2Sqo37;j{X&
z(){{}dB%DuJz%ZWHmuVid=KL4j!CT6WUkaE8~k!r+N^7Xhw)b3-+kXdF?x;?j<(fc
zi!C>0+((TgYPgc`Vp8(acy|om9H<zJQwO_%I9o37CxzfyM`>&3NB%|(J7{Yu=Tren
zR<yMDS*G9MS_O}RNiiEp0Vx~SsXL#se7=D`j#E|9MP!3C#%}C)&*BY!F^BIeORJTN
z5T^(Ms<}_qyl$zP|FX!j=Yo&Tg<JUT$$|T}aHFe|Zkx5<R|Dy@Me9ZMeT={!Zqf{V
zYA|3Ua*06?jmYs!1WQIvR*Oh(mfu^dalf_bVxPWWwv_D@c(0yD;^l%+VbRj81+NuR
z54Fo!yz4za*%<fiw|a=_;$<4u^2J+Inbz@*#Z1;1zqmhBjBm?VqaWrj%IpA7E$_}O
z-m-byxNYOY3gc@LnAPzaD_5O8zVeLmRV(9F=d3>a+|yRBTDg*j<6G0YOx!-wZsl2O
zcb0Frfy~ADHk^l|sr|Lps05|=Q8cZ7w;!M1uxhPg)r)4x9yVF}*0UA|Hd&3o_x#Ci
zWqo{GnzUBO8zwegvVG!`b@BNdHeA%qH27yN-Z;5&-GB(IYAYA7A*X@j9hXe6Hl1-g
z+9PY9r;S-QJ9-yv-?o1I+(A2yl%*J7$Bu?J!dA!U?#OzJw>10Rq&dExwJBD|?T%H8
z3(h!?JdB=Pu&f=QctN~s`FV?V#>?`YmildDzc}on09g+tb=jV*Jn@B!9z3@kf^OXX
zeol|+;8)ts-HDJ~=f4!;g@a#M+<to|i?3w!j17ZkGpS@fCc@K&?xQ(+-CRNFwmt!6
zoM}s+`J!E=4`iz9$sX1g#WDzoF-07r;fzMJiKkjqq)ab-TDH;r4qn$GgS3^z($vFz
zh$<s2VQ7SXA(YZLvhr-0eNp=Wuw}D3=IyAvD@Dy|C|R`8M-$H8>XcMv<k7|ctP|rH
zJjvOIaef)Hmrd(HTCO>U^i=-)Ub7^{ANEQ&YjIL#;de$TK9k*jOPm@VVP5ji7!oEO
zQedL%U_Q1+WWw<aX-nQ#^P|N`pN{P0ZS!cd-N;hbEt(v3X*<&5yxAnqT5M+ZZ1s&F
z%0pysB%Z3#wycwfAwe@tKsYoOa7$p;N%hD{9W*Doei)a7Mq-&}-0gG9CY&a->ygP<
zUnRTAaxL_tM$fF~Y>Jf+Li|1(F@NZ5fnbm2y@__49duY84tG)$Rma^-XYj&pzOvX_
zol>Zrj5&vY3*i$H4k1R$eor1vb^7c>$2hMNaUDp|M<8^O#d8pAh?u?=8d>T9^}*>F
z=AGd6giNXOP5PclIMS&^6T8FCHvX}lh>~dFgB59e4+l}nJxf&dl#wU{gVx}@+TFL<
zNwhjSEPAlDRm4HGit{KHBOgV)rt@mP)nGyVAQXW)4)={W*d!WhM%3BwbYSM9NN2R^
zK&PH({8=qHl;LIFnY@`q;k}t=Mj#?p@L1nOli4n>Up-Y>j3nNQ<T~|(X*Cj<`tdZd
zXcRZh^kKsOeueEkk>n3L?M(JQ?-q&3Oq`#%Gi&7K9Z5w3t!_hmhL9UGgr=>hT^-4l
zde&~G#Ifk0Fp(tAWmQSgAS4pIWVLvToV2}c;vyR0Sd$V^0K#Dc6g6kkU=fy6-xNRk
z-kGqZsQf%yOQ&Ko7*b=?ISoe0viSCi#-WoEwU|A`q7c)CY3{9poNy*lnYyQ6z6Rr<
zz8G7&PoY7NRgNb618MdxXR^%9j3~PSm2@<a=t%6i327)5mSk{Phq`uZq*b@2`omt`
zD)m*qBH7E!fN5`HNL&VNx+1<pLOytbgCW=eCr@UdFad=8EL4mT>wF4l4@kN!pzh1n
zaO$8!j}`G$MwEtv5efVPn!MT#B+_w2$!2(()gx)9*Me~<S8}kXtiNns;%tREClP1R
zq~%@3{>J8FCXuW7SCC|XBj{d|V7Q=(ojpS&+bp}8yYi-)#<FG>sjO{4Rg#|3$#iC_
z+ox~tItGVF*#m@^u|V>+<pM0_$XVvjpY7qKo1H%Mjt5Isx-Fc8>Lpq@<XcG?Z;q66
z*~>4{Su{Iz<9HMuCSA&4#PXVpIzfD_6TF>P<s6z>3GYfRhnT2|siZmQ^>YYX8R<sv
z#gwMFyy56wRy|Y4>q^IB!ig`d4;@UTbLSa#@?JOHK^Vs%O_`I_Nl(Oapq3SNlq;sz
zEvon!)i5X3uwVnack)2=B2^+EL|r*^!of46o$I6)uN(6Rdr>Y7ZKNf!L8pnCUEwT?
z97&F>K}*)mFO5ZkX|zsTrtRF0pxK}Dq}qB}VUDXU*WNRGHJDr(=8+n$WVsAPcW<ps
z3;MelX^yLL4$hlSPwd&018Xu|(NtfipTG@)tsYz>W|Ihe>fzQ%(d+mfhfzsV7?(g~
zJGoY~qichcYZyFh-i1xWK_BNv45b<%u~Jjsi@&6wH4uRzhdgra2WQx({3LUqQo&O<
z6<vtvkYEK1Gt3#`6dMgWW6<Z&fOZ~qW=&Hz)8>z|DUh(!vt<3U4kvHg<Wk|Bx<AO)
z>FAVC*$Gd|7v=l<<807kAW`P^LPd9y0YsWv#ueh_VRxls+pEJ{9Y@>cCXiYyBdb`p
zmspLZl)(*D<c_Hqq_<4_m?8HfV|G*jTqlpqhR90Q;yc+Y8zzH>wlaeUwb-wW|0gwi
zLPW@NGFeoHn@um*$?UetsA%aP+YvHE6O%1_T-wMu8?lkT(~4uxAz7^-4n)O5xc*p~
zN?+KGp+Jk3n(4dsL|#$4eX*lFGkFa|2hxmB-H9}^Ql#Qgyc|Vqj!A!%%sS(kRqdjn
zwzTsVP57NeCpo75{Q}zK>LIka`d|awFQ^^!U5GBr71H%~6q-x{d?ihwn0P{@$WS2l
z45I+|o9P*j-%gAs(BNd<$ReP~aj?*GgS?ulFnE|V%(zoZmpT36G>x56%bENp7I31k
zU7tOB<nnt3f|ux&k8z=AF|2rSxU6BH30d4WxLc|-d(ZK(jL+UL4&HH$POzb%FDCrD
z!`!{G1$_(Ok{L;tFWgSc6S>1{&XDSc$?_mBA7LbuXnBGgLiAFyyVG!93?QtGA>%cr
zg5EcE6FK*7;FhQ^BI7*;J}N(f3T6RYx%ZV|Vmnl5JFMt^$r?OiN*@yDvdyGCc*~41
zBXGyKEGV*c4-Po_wIntL=bDiq)kw|2`<|4+G5>~k<>X)xxW|ux5eEHP3xl)ljB_J~
zMbA0a3=FI36@-q6jGl+H<82L?)s*rWMztbt=(MWk;G~=B4sX@H7b@m3c^<@*u9=U=
z!a(G!u*a!=5)SSAh`bEP;26|`KlN78r6n<ufh*HGW<Zw5=RJbLrTs$uGWrgB$7x@w
zdzTuSk`Jo;Ndt2W^*IigA!l;taJMaF3TNW*JW7cTJrS{4b|vvA;5?WPc9W-tI~?cO
zy-a_UQYoG5=``>)bW<lJ*ySNSRE}iml$`uTJ0fQnYkXh|!`Ku<bh^NOM4x{F)XB_k
zltq=ER;(Rz0%GxjGiDSw{z~n93gnT)Z0suyr=i-?4gv~R`1d3bN797NKQK=i9B$6Q
zIHy|+=KLd84Kj?8U^cfjx3h7!?SfFskK*xlq$fFk9XMaIDd%YxGsm(Zfi1XzG=>Ge
z3b|0m!~^6yoC70KC9IYPAl=m*^Fi3)1C4A(Au#7UbT$s=@R@vE^TDOb5blCbFCg@T
zTw|q)(`dubec)YsLcxVn*Rs}9m82-pa#_GK4)FJhd_w*w+;LHtv(9@z4T^FQCxrK0
zggaDI*tFmcZ^O2@GjimDp#3bz#Gs}-Ef+-7f0CY@!(>)X3uEb7DftS?h8kHi_IEYt
zx^Q&3i>g5=eSt8D>O+~sTNEx6x<TrpN2OwMFJiNTk-^$4UL(ffEn_YTkL7*jOJG-|
z15su}YB$;nW$**!I{7bIM!~4=0_Hq&6)3KJvad~8M%_}odJHG*`*<7%Gsf79s01h$
zO@;u(pNtdpIUn6WW(orib@zyV6&6V0=pT>!@M1lt0k1P!qd3O>)gd|AOkdl}mP&yQ
zGD_a|RTK-E8+B%isFJwE4-HWyRIH{P%{o~i>d(vV$y`Rsrz>!Wl+J=>VZ<3$M9~*V
z<~Yq99?>C>Xu=s-{lP#C4$fVHRj%j6W;h{ut}?PZU?klT)QfZYdOhk2X<bw~CG{X*
z%;gWgR7~OVvQ45SJU+z?v1`~W)-Cc0)v76GmtQD7VBBY3(HvSF6fp<Vxe?abX>k-y
z=~n32gZwHuuuP;3Ofe}kQ>W^$G_vN|B75F-(He<Ahw^l&EshlNWk#*&OZg&ymW~ZK
zNwU%x-jZ7b6c0TnG)0N^`Jhwd{%oDMoh-e@<u2S8jXgQFCYEhcqO^3cwSVRODvPr1
z<eA<G6CB)?SI0lt#oy+tW8GFgKR94O2yDxcw?%^4#Stx>IAl-^2ssP(Gc^gkH9t{a
zbX!t38#QyCnsGv%gpI7hur)1r$ZpU}Ir_4L@&nH4a#aq*%;j}Qp|C{iZe;8}I0{GP
z<UEfu&mbWw@5htH_$K%=<w%_77^Tm?oAHnK2&(fLt@FUmb^V5Q)?)dSaa!QPak&AT
z^QvbU&DHBr8vAo|rk4h8mF8x?79Xw5OAcsdVjS{Hi1IWtc2vAP>1>-8PIsMmQ|X|h
zp}ckOdaE_?VdV&h6d!BvcP|uLS8`k0TN!+(qqvL7NWHmNbLUVzCJqgIwUTcaganr3
zpID7?Y5)u7Qm15o*(qUSGD+fH=MR!bbLZ&%CXb$Rc#PE6x`kdIydX<QdI*cgS4o`m
zFG%HjNzN;}s5U}r3<6tPKEcF>R&IXX;C20*1s4eh0-IYP<%@z12_|}hL+o1%h6#GF
z7CSdZ1H<ryE<63ZZ(|rvI=Qc%H!rh_ZOhEkUVH#u2fYMhn^2Tuw~+P>d8DA5bgr)S
zLQJ)xF6<bcw&U2L*G4O>;m7>Pf7rBB&=!&ppV15*Z+E${wVQ^e{C9}2>(RY7M1;LG
zC)NRnPAQ9$>yb7E6ntHIbkwqoNwJkau$0nZxx6Z6zY%i>|B_~eOHGrwB!D?2vW}*W
zD{cuAgqwuJ1^1(9(6Cr4ju1;{X!~+?bcNe?@k7&a*Z^+~_5t?&ys|l92a?DVqT#0D
z79tZz#et??kS(!Zj1BEW$Wgk!es{3)EQx}H=XX%bs`tm`CCaG@_vuY%>b$oj(GL#L
zb|eKN>EEIEE771>0lx{EQWgq|lYxdtWO9Q|)r+X#=|1wx8M!VFU>Qs5ZLu=#c{JoC
zYE7yhB)UwR)F?#4zQR3`yEo)nIH5Fy;lox>%IZlw{=YS;{(%!TR4iM~V=VN9jf~1Z
zZBZuZoc}Tst_E#v`2cfY+_^kiY0JtE5~u^2MUD96D|_B;a}-9+aW%&Z8#t!z5;d4&
z<1{Q>E6S2^w=HDaXwMz>Rf};$YysB<XMMfah0QIkOL@~Q7n>qF&*^tW{P{QMVuf>V
t>y>eE5|>AVRAJ>3hVtpcfZTDL-g(3zBNLx28alJaW?nd_R!V&I{{hQ{X*vJ^

delta 3019
zcmZwIe{5A}9mnyf113<g(hk>-vK`vec57GKGFpCg{AkNc=?`yPpn(0sX?seK-rm!l
zdu|6^vg_Pt#+JtE!%UFH5J_CdKU-i~qRXNgYKF$B(L_ufaZ%w9v*E%tQ~&Y(x%aT`
z51;gVU(fU0bDr}&&-XdEzy4Xl$2+puikH4<C=*0EQNP5Pr?Bl#J}CQ^8*>+S<7ynk
zG$yea|BOrV7OujN@pHIrMgIELxQF&Sti{o|{~OqEOxB#H!k_sIA0_xc>Olo7^A=$h
z?e(Y!wIk0kUHAn|#BCQf=dYmde-w3nHuh;;M*9@j;Wx2}=bJaFoTKBHcrPXk^8-AO
zrL@oB7x7};e+9MDKj7!_uc(1<p(gNe)XwN4S%TV;YTSSgcpoNkCC@i=R5a7aaWj4`
zZoiI2w10@q&0ImP{P(B<-^KO#H`M)0ST@f#%TevSP!lLa{!D%BcGUg*Fw4CrK}9nk
zMWtd2^`I1L2Of)k0d?Igs1?5!x8Fcb^eybfU&R))J=L^_QT<QgF1(D|fhF4i?Nlnc
zTNjRDBR+$=;SJP|{1><3CK9e2ebk{mg${lXH{p-50&k+OD_)aNX)|g;1Gp8B#%;SM
zn}6_2bgboz%g760{uui%YNhX?R(=CtC@|&&WRWJziPaV_;xl*-@4;$jrw8sq?eKoo
zmJg%u8^=R9o261u<)_H5m=AFPH5;X35a}`_s2d-R&7xMkh|2X_asS)MpZN_Rn!t6`
z_cxI_n~zWvx|0*F{%i>qt*{gy#Cwt5HobTrM^I<L+?~I%4E2^&qx$!vt{+1kz7%Rl
z7En93h<eazEW<OX>o4WM&zj3r?x*7ySc4y-1}bNCt)LcnV-sq?5ZPsO5_R1o>bf(i
zE&e_-gt>rP*xRVL=bhN!p?3NjuG0JeJ{8UAKd1p#GEHq!F=~MOP!HIM`n~~`;}+B}
z<^XD9Db)2D)OC-e9`qFU;J0xvUc)A=Vvug0Zw^t>7w1p|U+1F@3)bZi=T2;-?O_7H
zgFEpCZpCV5q5H;B3t2#&{^w8+x`1`~r?`JPKN=40TFkO&(@jMKO`x{)EGi{0qXzsf
zYGv=C-i{l12mT#(NIyVc3e!%gjOWRH>N*u2V&2MJ(PaAwb}efjqS8fF5Vwm?>V85G
zWzuFhp)yEx6Ut{R!3N~YzF4Jc3o#P6YhpXGjo3s~5!xN4q(k}FVd0RQhlvS7MZ2Ng
zZ6J0KW5h;6#m$pDBdYR7<=zDCgigB30I{7IQX?)(!M3>Gf_mEy>V|6Tt}S6A`RqP`
z!$hw-C=Q|1p_i_o&`HoQMkT?%=Mu(=G7ZG-QcFd@7Kh@FBdC*bnAk<=1=R`Cd!({i
z|DzwF(o7sx59Ju4Q*eM#*1tsPT&w6*jOJ>ee%O_z_t^f@Q)Nyf^rrn2rrn+VYVN~J
zO*#GUtY=@{eYbscU5~9OuP97S`^Ph(8~H)XUM)|o=ycOF6M-8}*+r+xUfHm5^&@`L
zGy0fwqZxa(qR|#rK5WlcUbGjg*4q=+r`7~h{`5&Fn(@=lw4aQ;(7s;Nw|d?`o*UNm
zdnY3Mqx-kmCmyI@%C{*yQs>xj)t8LTn?Y|jnD;(=FJ0*%6Ha=$xqjL@aB|KwgFz5E
zo&9ELpx5biBX`10duGUU!^xSLhK2@e;k-ZT+0w?g!pM!d;$%AVX6<W@=k1eCmG+-a
zd+liRF<ZO&s$H_B#rC!Awm)cj(3Z3&?DMS^wrOjZ{nyqV%fgg)>)CC!l}DJ7(~${7
zFBLhxZt8f(J?<GdnKaWuXwrU)r<J$OEpL3tX=>fRrRmb?whaY^%*Au&+;sY}!1nHZ
z$rkQfx3)Vq<$F;WnEqhabCes>lFLY6`@w<+`%ZgRiJQ#rBNuf9aenO69fv=Yn-yKn
zc6483aV|FrFPsd*bfB9&`}OWt`;+c2JHG#tb$iO}9ev-m|L9w5XZjD8xXQ@_srF1F
z4AN<THn0~H?e@iirmPz&HKse2_Ci1OoRsF5iCD0wJxv5*<Z_oc?Xd|98o-<Mru4NL
z^k*}{ynlPrxs?t2Y3Agb1O8m#O!?03_W#XbhZh!4x&|iQPZGFbdxrO{8X|##8S--p
zyfu8@{`_!rQE$ymkdBlcCvcKA_P~)H_SGY<?Kyhgc8u(@XGizg4@WC)-`HSXchZ>+
zrZUOENqb38i)TPq=Y)PblZ;%)Po*O=Nv|Cr|FZ2rwyiL?g8bU;&0}>ny}mN;bOgBr
U;F%~BMZTHyLNn!>Plh%B1CfE`xBvhE

diff --git a/application/locale/it_IT/LC_MESSAGES/icinga.po b/application/locale/it_IT/LC_MESSAGES/icinga.po
index 6f4d3da71..151b24ec9 100644
--- a/application/locale/it_IT/LC_MESSAGES/icinga.po
+++ b/application/locale/it_IT/LC_MESSAGES/icinga.po
@@ -1,616 +1,1474 @@
 # Icinga Web 2 - Head for multiple monitoring backends.
-# Copyright (C) 2014 Icinga Development Team
+# Copyright (C) 2015 Icinga Development Team
 # This file is distributed under the same license as Icinga Web 2.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Icinga Web 2 (None)\n"
 "Report-Msgid-Bugs-To: dev@icinga.org\n"
-"POT-Creation-Date: 2014-08-22 17:30+0200\n"
+"POT-Creation-Date: 2015-02-10 17:58+0100\n"
 "PO-Revision-Date: 2015-02-04 17:48+0100\n"
 "Last-Translator: Davide Demuru <davide.demuru@gmail.com>\n"
+"Language: it_IT\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it_IT\n"
-"X-Generator: Poedit 1.7.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: /usr/local/src/bugfix.master/application/views/scripts/pivottablePagination.phtml:9
+#: /usr/share/icingaweb2/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php:40
 #, php-format
-msgid "%s: %d to %d of %d"
+msgid "%d unhandled hosts down"
+msgstr "%d host down non gestiti"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php:41
+#, php-format
+msgid "%d unhandled services critical"
+msgstr "%d servizi critical non gestiti"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/View/DateTimeRenderer.php:185
+msgctxt "timespan"
+msgid "%im %ss"
+msgstr "%im %ss"
+
+#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:9
+#: /usr/share/icingaweb2/application/views/scripts/pivottablePagination.phtml:9
+#, fuzzy, php-format
+msgid "%s: %d to %d of %d (on the %s-axis)"
 msgstr "%s: %d a %d di %d"
 
-#: /usr/local/src/bugfix.master/application/forms/Authentication/LoginForm.php:36
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/Element/Number.php:138
+#, php-format
+msgid "'%s' is not a valid number"
+msgstr "'%s' non è un numero valido"
+
+#: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:44
 msgid "...and your password"
 msgstr "...e password"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterEditor.php:132
-msgid "Add"
-msgstr "Aggiungi"
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/new-dashlet.phtml:5
+msgid "Add Dashlet To Dashboard"
+msgstr "Aggiungi Vista alla Dashboard"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterWidget.php:81
+#: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:28
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php:25
+msgid "Add To Dashboard"
+msgstr "Aggiungi alla Dashboard"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterWidget.php:80
 msgid "Add filter..."
 msgstr "Aggiungi filtro..."
 
-#: /usr/local/src/bugfix.master/application/controllers/AuthenticationController.php:118
-msgid "All configured authentication methods failed. Please check the system log or Icinga Web 2 log for more information."
-msgstr "Tutti i metodi di autenticazione configurati hanno fallito. Controllare i log di sistema o di Icinga Web 2 per maggiori informazioni."
+#: /usr/share/icingaweb2/application/controllers/AuthenticationController.php:111
+msgid ""
+"All configured authentication methods failed. Please check the system log or "
+"Icinga Web 2 log for more information."
+msgstr ""
+"Tutti i metodi di autenticazione configurati hanno fallito. Controllare i "
+"log di sistema o di Icinga Web 2 per maggiori informazioni."
 
-#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:91
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:28
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:42
+msgid "Application"
+msgstr "Applicazione"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:233
+msgid "Application Log"
+msgstr "Log dell'applicazione"
+
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:66
 msgid "Application Prefix"
 msgstr "Prefisso dell'applicazione"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Menu.php:197
-msgid "ApplicationLog"
-msgstr "Log dell'applicazione"
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/Decorator/NoScriptApply.php:28
+msgid "Apply"
+msgstr "Applica"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Form/notyet_FormWizard.php:31
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:34
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:49
+msgid "Authentication"
+msgstr "Autenticazione"
+
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:213
+#, php-format
+msgid "Authentication backend \"%s\" has been successfully changed"
+msgstr "Backend di Autenticazoine \"%s\" modificato con successo"
+
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:210
+#, php-format
+msgid "Authentication backend \"%s\" has been successfully created"
+msgstr "Backend di Autenticazoine \"%s\" creato con successo"
+
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:259
+#, php-format
+msgid "Authentication backend \"%s\" has been successfully removed"
+msgstr "Backend di Autenticazoine \"%s\" rimosso con successo"
+
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:95
+msgid "Authentication backend already exists"
+msgstr "Backend di autenticazione già esistente"
+
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:93
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:146
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:169
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:239
+msgid "Authentication backend name missing"
+msgstr "Nome del Backend di Autenticazione mancante"
+
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendReorderForm.php:54
+msgid "Authentication order updated!"
+msgstr "Ordine di autenticazione aggiornato"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Wizard.php:617
+#: /usr/share/icingaweb2/library/Icinga/Web/Wizard.php:638
 msgid "Back"
 msgstr "Indietro"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:53
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:55
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:244
+#, php-format
+msgid "Backend \"%s\" has no `backend' setting"
+msgstr "Il Backend \"%s\" non ha impostazioni di `backend'"
+
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:56
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/ExternalBackendForm.php:32
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/DbBackendForm.php:55
 msgid "Backend Name"
 msgstr "Nome Backend"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:257
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:322
+msgid "Backend Type"
+msgstr "Tipo Backend"
+
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:109
+msgid "Base DN"
+msgstr "Base DN"
+
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:76
 msgid "Bind DN"
 msgstr "Bind DN"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:269
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:86
 msgid "Bind Password"
 msgstr "Bind Password"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:333
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/BaseBackendForm.php:114
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:144
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:150
+#, php-format
+msgctxt "preferences.form"
+msgid "Browser (%s)"
+msgstr "Browser (%s)"
+
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:187
+#, php-format
+msgid "Can't add role '%s'. Role already exists"
+msgstr "Impossibile aggiugnere il ruolo '%s'. Ruolo già esistente"
+
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:146
+#, php-format
+msgid "Can't load role '%s'. Role does not exist"
+msgstr "Impossibile caricare il ruolo '%s'. Ruolo non trovato"
+
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:213
+#, php-format
+msgid "Can't remove role '%s'. Role does not exist"
+msgstr "Impossibile rimuovere il ruolo '%s'. Ruolo non trovato"
+
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:246
+#, php-format
+msgid "Can't update role '%s'. Role does not exist"
+msgstr "Impossibile aggiornare il ruolo '%s'. Ruolo non trovato"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:352
+msgid "Cancel this operation"
+msgstr "Annulla operazione"
+
+#: /usr/share/icingaweb2/library/Icinga/Application/Config.php:298
+#, php-format
+msgid "Cannot read config file \"%s\". Permission denied"
+msgstr "Impossibile leggere il file di configurazione \"%s\". Permesso negato"
+
+#: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:122
+msgid "Check this box if you want to add the dashlet to a new dashboard"
+msgstr ""
+"Spunta questa casella se si vuole aggiugnere questa vista a una nuova "
+"dashboard"
+
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:200
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:281
 msgid "Check this box to enforce changes without connectivity validation"
-msgstr "Selezionare questa casella per forzare le modifiche senza verificare la connettività."
+msgstr ""
+"Selezionare questa casella per forzare le modifiche senza verificare la "
+"connettività"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:47
-msgid "Check this to enable logging."
-msgstr "Selezionare questa casella per abilitare la scrittura nei log."
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:326
+msgid "Click to add another filter"
+msgstr "Clicca per aggiungere un altro filtro"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterEditor.php:108
-msgid "Click to add a filter expression to this operator"
-msgstr "Clicca per aggiungere un filtro a questo operatore"
-
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterEditor.php:105
-msgid "Click to add another operator below this one"
-msgstr "Clicca per aggiungere un altro operatore di seguito"
-
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterEditor.php:97
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterWidget.php:69
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterWidget.php:68
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:313
 msgid "Click to remove this part of your filter"
-msgstr "Clicca per rimuovere questa parte dal filtro"
+msgstr "Clicca per rimuovere questa parte del filtro"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Menu.php:189
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:100
+msgid "Comma-separated list of groups that are assigned to the role"
+msgstr "Lista dei gruppi assegnati al ruolo separati da virgola"
+
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:92
+msgid "Comma-separated list of users that are assigned to the role"
+msgstr "Lista degli utenti assegnati al ruolo separati da virgola"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:223
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:165
-msgid "Connection Validation Failed: "
-msgstr "Verifica della Connessione Fallita: "
+#: /usr/share/icingaweb2/application/forms/ConfirmRemovalForm.php:19
+msgid "Confirm Removal"
+msgstr "Conferma Rimozione"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:452
-msgid "Connectivity validation failed, connection to the given resource not possible."
-msgstr "Verifica della connessione fallita, impossibile connettersi alla risorsa fornita."
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LivestatusResourceForm.php:79
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:126
+#: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:135
+msgid ""
+"Connectivity validation failed, connection to the given resource not "
+"possible."
+msgstr ""
+"Verifica della connessione fallita, impossibile connettersi alla risorsa "
+"fornita."
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:429
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:445
-msgid "Connectivity validation failed, the provided file does not exist."
-msgstr "Verifica della connessione fallita, il file fornito non esiste."
+#: /usr/share/icingaweb2/application/forms/Config/General/ApplicationConfigForm.php:37
+msgid ""
+"Contains the directories that will be searched for available modules, "
+"separated by colons. Modules that don't exist in these directories can still "
+"be symlinked in the module folder, but won't show up in the list of disabled "
+"modules."
+msgstr ""
+"Contiene la cartella dove verranno cercati i moduli disponibili, separati da "
+"due punti. Saranno caricati anche eventuali link a cartelle dimoduli ma non "
+"verranno mostrati nella lista dei moduli abilitati. "
 
-#: /usr/local/src/bugfix.master/application/controllers/AuthenticationController.php:59
-msgid "Could not read your authentiction.ini, no authentication methods are available."
-msgstr "Impossibile leggere authentication.ini, nessun metodo di autenticazione disponibile."
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:261
+msgid "Could not find any resources for authentication"
+msgstr "Nessuna risorsa di autenticazione trovata"
 
-#: /usr/local/src/bugfix.master/application/layouts/scripts/body.phtml:31
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Menu.php:175
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/error.phtml:2
+msgid "Could not persist dashboard"
+msgstr "Dashboardi non permanente"
+
+#: /usr/share/icingaweb2/application/controllers/AuthenticationController.php:62
+msgid ""
+"Could not read your authentication.ini, no authentication methods are "
+"available."
+msgstr ""
+"Impossibile leggere authentication.ini, nessun metodo di autenticazione "
+"disponibile."
+
+#: /usr/share/icingaweb2/application/views/scripts/config/authentication/reorder.phtml:7
+msgid "Create A New Authentication Backend"
+msgstr "Crea un Nuovo Backend di Autenticazione"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/resource.phtml:7
+#: /usr/share/icingaweb2/application/views/scripts/config/resource/create.phtml:4
+msgid "Create A New Resource"
+msgstr "Crea Nuova Risorsa"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/authentication/create.phtml:4
+msgid "Create New Authentication Backend"
+msgstr "Crea un Nuovo Backend di Autenticazione"
+
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:82
+msgid "Create Role"
+msgstr "Crea Ruolo"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/authentication/create.phtml:7
+msgid ""
+"Create a new backend for authenticating your users. This backend will be "
+"added at the end of your authentication order."
+msgstr ""
+"Crea un nuovo backend di autenticazione per gli utenti, Questo backend sarà "
+"aggiunto come ultimo elemento in ordine di autenticazione"
+
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/index.phtml:13
+#, php-format
+msgid ""
+"Currently there is no dashlet available. This might change once you enabled "
+"some of the available %s."
+msgstr ""
+"Nessuna vista disponibile, Si prega di abilitare una di quelle disponibili %"
+"s."
+
+#: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:108
+#: /usr/share/icingaweb2/application/layouts/scripts/body.phtml:31
+#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:213
 msgid "Dashboard"
 msgstr "Dashboard"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:65
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:7
+msgid "Dashboard Settings"
+msgstr "Impostazioni Dashboard"
+
+#: /usr/share/icingaweb2/application/controllers/DashboardController.php:205
+msgid "Dashboard has been removed"
+msgstr "Dashboard rimossa"
+
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:13
+msgid "Dashlet Name"
+msgstr "Nome Vista"
+
+#: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:79
+msgid "Dashlet Title"
+msgstr "Titolo Vista"
+
+#: /usr/share/icingaweb2/application/controllers/DashboardController.php:66
+msgid "Dashlet created"
+msgstr "Vista Creata"
+
+#: /usr/share/icingaweb2/application/controllers/DashboardController.php:166
+msgid "Dashlet has been removed from"
+msgstr "Vista rimossa da"
+
+#: /usr/share/icingaweb2/application/controllers/DashboardController.php:128
+msgid "Dashlet updated"
+msgstr "Vista aggiornata"
+
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:295
+#: /usr/share/icingaweb2/application/forms/Config/General/ApplicationConfigForm.php:53
+msgid "Database"
+msgstr "Database"
+
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/DbBackendForm.php:66
+#: /usr/share/icingaweb2/application/forms/Config/General/ApplicationConfigForm.php:72
 msgid "Database Connection"
 msgstr "Connessione Database"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:158
+#: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:82
 msgid "Database Name"
 msgstr "Nome Database"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:119
+#: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:52
 msgid "Database Type"
 msgstr "Tipo Database"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:63
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/Validator/DateTimeValidator.php:48
+#, php-format
+msgid "Date/time string not in the expected format %s"
+msgstr "La stringa di Data/Ora non rispetta il formato %s"
+
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:54
+msgctxt "app.config.logging.level"
 msgid "Debug"
 msgstr "Debug"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/GeneralForm.php:101
-msgid "Default Language"
-msgstr "Lingua Predefinita"
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:42
+msgid "Dependencies"
+msgstr "Dipendenze"
 
-#: /usr/local/src/bugfix.master/application/controllers/ErrorController.php:36
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:38
+msgid "Description"
+msgstr "Descrizione"
+
+#: /usr/share/icingaweb2/application/views/scripts/showConfiguration.phtml:19
+msgid ""
+"Details can be found in the application log. (If you don't have access to "
+"this log, call your administrator in this case)"
+msgstr ""
+"Per maggiori dettagli consultare il log dell'applicazione. (In caso di "
+"assenza di permessi contattare l'amministratore di sistema)"
+
+#: /usr/share/icingaweb2/application/forms/Config/General/ApplicationConfigForm.php:54
+msgid "Don't Store Preferences"
+msgstr "None Salvare le Preferenze"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/authentication/modify.phtml:4
+msgid "Edit Backend"
+msgstr "Modifica Backend"
+
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/update-dashlet.phtml:6
+msgid "Edit Dashlet"
+msgstr "Modifica Vista"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/resource/modify.phtml:4
+msgid "Edit Existing Resource"
+msgstr "Modifica Risorsa Esistente"
+
+#: /usr/share/icingaweb2/application/controllers/ErrorController.php:39
 #, php-format
 msgid "Enabling the \"%s\" module might help!"
 msgstr "Abilitare il modulo \"%s\" potrebbe essere utile!"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:60
+#: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:80
+msgid "Enter a title for the dashlet."
+msgstr "Inserisci un titolo per la vista"
+
+#: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:99
+msgid "Enter a title for the new pane."
+msgstr "Inserisci un titolo per il nuovo pannello"
+
+#: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:70
+msgid ""
+"Enter url being loaded in the dashlet. You can paste the full URL, including "
+"filters."
+msgstr ""
+"Inserire la URL dell vista. E' possibilie inserire la URL complera, filtri "
+"inclusi "
+
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:51
+msgctxt "app.config.logging.level"
 msgid "Error"
 msgstr "Errore"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterEditor.php:109
-msgid "Expression"
-msgstr "Espressione"
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/error.phtml:11
+msgid "Error details"
+msgstr "Dettagli Errore"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:113
-msgid "Facility"
-msgstr "Facility"
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:308
+msgid "External"
+msgstr "Esterno"
 
-#: /usr/local/src/bugfix.master/application/controllers/PreferenceController.php:55
-#, php-format
-msgid "Failed to persist preferences. (%s)"
-msgstr "Impossibile salvare le preferenze. (%s)"
-
-#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:76
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:358
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:213
 msgid "File"
 msgstr "File"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:129
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:195
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:206
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:283
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:36
+msgctxt "app.config.logging.type"
+msgid "File"
+msgstr "File"
+
+#: /usr/share/icingaweb2/application/forms/Config/General/ApplicationConfigForm.php:52
+msgid "File System (INI Files)"
+msgstr "File System (File INI)"
+
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:107
+msgid "File path"
+msgstr "Percorso file"
+
+#: /usr/share/icingaweb2/application/forms/Config/Resource/FileResourceForm.php:41
 msgid "Filepath"
 msgstr "Percorso file"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterWidget.php:90
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/ExternalBackendForm.php:54
+msgid "Filter Pattern"
+msgstr "Filtro"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterWidget.php:89
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:659
 msgid "Filter this list"
 msgstr "Filtrare questa lista"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterWidget.php:94
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterWidget.php:93
 msgid "Filtered"
 msgstr "Filtrato"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Form/notyet_FormWizard.php:32
+#: /usr/share/icingaweb2/library/Icinga/Web/Wizard.php:648
 msgid "Finish"
 msgstr "Fine"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:332
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/BaseBackendForm.php:113
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:199
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:280
 msgid "Force Changes"
 msgstr "Forzare Modifiche"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Form/notyet_QuickForm.php:147
-msgid "Form has successfully been sent"
-msgstr "Modulo inviato correttamente"
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:99
+#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:17
+msgid "Groups"
+msgstr "Gruppi"
 
-#: /usr/local/src/bugfix.master/application/views/scripts/search/hint.phtml:7
+#: /usr/share/icingaweb2/application/views/scripts/search/hint.phtml:3
 msgid "Hint"
 msgstr "Suggerimento"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:135
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:235
+#: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:49
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:43
+#: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:62
 msgid "Host"
 msgstr "Host"
 
-#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:33
-#: /usr/local/src/bugfix.master/application/views/scripts/pivottablePagination.phtml:28
+#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:35
+#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:90
+#: /usr/share/icingaweb2/application/views/scripts/pivottablePagination.phtml:28
 msgid "Hosts"
 msgstr "Hosts"
 
-#: /usr/local/src/bugfix.master/application/views/scripts/search/hint.phtml:6
+#: /usr/share/icingaweb2/application/views/scripts/search/hint.phtml:2
 msgid "I'm ready to search, waiting for your input"
 msgstr "Pronto per la ricerca, in attesa di un input."
 
-#: /usr/local/src/bugfix.master/application/controllers/AuthenticationController.php:40
-#: /usr/local/src/bugfix.master/application/views/scripts/authentication/login.phtml:8
+#: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:50
+msgid "IP or hostname to search."
+msgstr "IP o hostname da cercare"
+
+#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:15
+msgid "Icinga Web 2 Documentation"
+msgstr "Documentazione Icinga Web 2"
+
+#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:16
+msgid "Icinga Web 2 Setup-Wizard"
+msgstr "Installazione Guidata Icinga Web 2"
+
+#: /usr/share/icingaweb2/application/controllers/AuthenticationController.php:44
 msgid "Icingaweb Login"
 msgstr "Icingaweb Login"
 
-#: /usr/local/src/bugfix.master/application/views/scripts/authentication/logout.phtml:14
-msgid "If this message does not disappear, it might be necessary to quit the current session manually by clearing the cache, or by closing the current browser session."
-msgstr "Se questo messaggio non scompare, potrebbe essere necessario chiudere manualmente la sessione corrente ripulendo la cache, oppure chiudere la sessione del browser."
+#: /usr/share/icingaweb2/application/views/scripts/authentication/logout.phtml:14
+msgid ""
+"If this message does not disappear, it might be necessary to quit the "
+"current session manually by clearing the cache, or by closing the current "
+"browser session."
+msgstr ""
+"Se questo messaggio non scompare, potrebbe essere necessario chiudere "
+"manualmente la sessione corrente ripulendo la cache, oppure chiudere la "
+"sessione del browser."
 
-#: /usr/local/src/bugfix.master/application/controllers/AuthenticationController.php:131
+#: /usr/share/icingaweb2/application/views/scripts/showConfiguration.phtml:21
+msgid ""
+"In case you can access the file by yourself, you can open it and insert the "
+"config manually:"
+msgstr ""
+"In caso di mancato accesso al file, modificare la configurazione "
+"manualmente: "
+
+#: /usr/share/icingaweb2/application/controllers/AuthenticationController.php:124
 msgid "Incorrect username or password"
 msgstr "Utente o password errati"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:62
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:53
+msgctxt "app.config.logging.level"
 msgid "Information"
-msgstr "Information"
+msgstr "Informazione"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:67
+#: /usr/share/icingaweb2/application/views/scripts/config/modules.phtml:3
+msgid "Installed Modules"
+msgstr "Moduli Installati"
+
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:72
+#, php-format
+msgid "Invalid backend type \"%s\" provided"
+msgstr "Tipo di backend fornito \"%s\" non valido "
+
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:45
+#, php-format
+msgid "Invalid resource type \"%s\" provided"
+msgstr "Tipo di risorsa fornita \"%s\" non valida "
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/Validator/DateTimeValidator.php:41
+msgid "Invalid type given. Instance of DateTime or date/time string expected"
+msgstr "Tipo di data non valida. "
+
+#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:11
+#, php-format
+msgid ""
+"It appears that you did not configure Icinga Web 2 yet so it's not possible "
+"to log in without any defined authentication method. Please define a "
+"authentication method by following the instructions in the %1$sdocumentation%"
+"3$s or by using our %2$sweb-based setup-wizard%3$s."
+msgstr ""
+"Icinga Web 2 non è stato configurato, non essendo stato definito nessun "
+"metodo d iautenticazione non è possibile accedere. Si prega di definire un "
+"metodo di autenticazione seguendo le istruzioni dalla %1$sdocumentazione%3$s "
+"o usando %2$sl'istallazione guidata%3$s"
+
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:67
 msgid "LDAP Resource"
 msgstr "Risorsa LDAP"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:90
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:89
 msgid "LDAP User Name Attribute"
 msgstr "Attributo per Nome Utente LDAP"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:79
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:79
 msgid "LDAP User Object Class"
 msgstr "Object Class Utente LDAP"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:207
-msgid "Location of your icinga objects.cache file"
-msgstr "Posizione del file objects.cache di icinga"
-
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:196
-msgid "Location of your icinga status.dat file"
-msgstr "Posizione del file status.dat di icinga"
-
-#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:46
-msgid "Logging Enabled"
-msgstr "Scrittura Log Abilitata"
-
-#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:56
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:48
 msgid "Logging Level"
 msgstr "Livello dei Log"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:72
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:32
 msgid "Logging Type"
 msgstr "Tipo di Log"
 
-#: /usr/local/src/bugfix.master/application/views/scripts/authentication/logout.phtml:12
+#: /usr/share/icingaweb2/application/views/scripts/authentication/logout.phtml:12
 msgid "Logging out..."
 msgstr "Uscita in corso..."
 
-#: /usr/local/src/bugfix.master/application/views/scripts/authentication/logout.phtml:21
+#: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:20
+#: /usr/share/icingaweb2/application/views/scripts/authentication/logout.phtml:21
 msgid "Login"
 msgstr "Accedi"
 
-#: /usr/local/src/bugfix.master/application/layouts/scripts/parts/topbar.phtml:35
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Menu.php:202
+#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:248
 msgid "Logout"
 msgstr "Esci"
 
-#: /usr/local/src/bugfix.master/application/views/scripts/authentication/logout.phtml:43
+#: /usr/share/icingaweb2/application/views/scripts/authentication/logout.phtml:43
 msgid "Logout successful!"
 msgstr "Disconnesso con successo!"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterEditor.php:235
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterWidget.php:95
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/error.phtml:7
+msgid "Make sure that the webserver can write to this file."
+msgstr "Assicurarsi che il web server possa scrivere su questo file."
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Controller/ActionController.php:197
+msgid "Method Not Allowed"
+msgstr "Metodo Non Autorizzato"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterWidget.php:94
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:661
 msgid "Modify this filter"
 msgstr "Modifica filtro"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Menu.php:193
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:179
+#, php-format
+msgid "Module \"%s\" disabled"
+msgstr "Modulo \"%s\" disabilitato"
+
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:159
+#, php-format
+msgid "Module \"%s\" enabled"
+msgstr "Modulo \"%s\" abilitato"
+
+#: /usr/share/icingaweb2/application/forms/Config/General/ApplicationConfigForm.php:33
+msgid "Module Path"
+msgstr "Percorso Modul"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/modules.phtml:16
+msgid "Module is disabled"
+msgstr "Modulo disabilitato"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/modules.phtml:14
+msgid "Module is enabled"
+msgstr "Modulo abilitato"
+
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:117
+#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:227
 msgid "Modules"
 msgstr "Moduli"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/ReorderForm.php:112
+#: /usr/share/icingaweb2/application/views/scripts/form/reorder-authbackend.phtml:30
 msgid "Move down in authentication order"
 msgstr "Sposta giù nell'ordine di autenticazione"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/ReorderForm.php:86
+#: /usr/share/icingaweb2/application/views/scripts/form/reorder-authbackend.phtml:25
 msgid "Move up in authentication order"
 msgstr "Sposta su nell'ordine di autenticazione"
 
-#: /usr/local/src/bugfix.master/application/views/scripts/pivottablePagination.phtml:16
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:18
+#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:13
+msgid "Name"
+msgstr "Nome"
+
+#: /usr/share/icingaweb2/application/views/scripts/pivottablePagination.phtml:16
 msgid "Navigation"
 msgstr "Navigazione"
 
-#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:86
-#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:89
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Form/notyet_FormWizard.php:30
+#: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:98
+#, fuzzy
+msgid "New Dashboard Title"
+msgstr "Nuova Dashboard"
+
+#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:68
+#: /usr/share/icingaweb2/application/views/scripts/roles/new.phtml:3
+#, fuzzy
+msgid "New Role"
+msgstr "Crea Ruolo"
+
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:118
+msgid "New authentication backend name missing"
+msgstr "Nomedel backend di autenticazione mancante"
+
+#: /usr/share/icingaweb2/application/forms/Config/GeneralConfigForm.php:54
+msgid "New configuration has successfully been stored"
+msgstr "La nuova configurazione è stata salvata correttamente"
+
+#: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:120
+msgid "New dashboard"
+msgstr "Nuova Dashboard"
+
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:89
+msgid "New resource name missing"
+msgstr "Nuovo Nome Risorsa mancante"
+
+#: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:86
+#: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:89
+#: /usr/share/icingaweb2/library/Icinga/Web/Wizard.php:606
+#: /usr/share/icingaweb2/library/Icinga/Web/Wizard.php:627
 msgid "Next"
 msgstr "Prossimo"
 
-#: /usr/local/src/bugfix.master/application/controllers/AuthenticationController.php:110
-msgid "No authentication methods available. Did you create authentication.ini when installing Icinga Web 2?"
-msgstr "Nessun metodo di autenticazione trovato. E' stato creato authentication.ini durante l'installazione di Icinga Web 2?"
+#: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:38
+msgid ""
+"No Ldap servers found on this domain. You can try to specify host and port "
+"and try again, or just skip this step and configure the server manually."
+msgstr ""
+"Nessun server LDAP troato in questo dominio. Provare a specificare host e "
+"porta e riprovare, o saltare questo passaggio e configurare il server "
+"manualmente."
 
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:119
+#: /usr/share/icingaweb2/application/controllers/AuthenticationController.php:104
+msgid ""
+"No authentication methods available. Did you create authentication.ini when "
+"setting up Icinga Web 2?"
+msgstr ""
+"Nessun metodo di autenticazione trovato. E' stato creato authentication.ini "
+"durante l'installazione di Icinga Web 2?"
+
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:37
+msgid "No dashlets added to dashboard"
+msgstr "Nessuna vista aggiunsta alla dashboard"
+
+#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:8
+msgid "No roles found."
+msgstr "Nessun ruolo trovato."
+
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/DbBackendForm.php:111
 msgid "No users found under the specified database backend"
 msgstr "Non sono stai trovati utenti nel database di backend specificato"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterEditor.php:106
-msgid "Operator"
-msgstr "Operatore"
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:37
+msgctxt "app.config.logging.type"
+msgid "None"
+msgstr "Nessuno"
 
-#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:33
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:116
+msgid "Old authentication backend name missing"
+msgstr "Vecchio nome del backend di autenticazione mancante"
+
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:87
+msgid "Old resource name missing"
+msgstr "Vecchio nome della risors mancante"
+
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:67
+msgid "Only the root and its child nodes will be accessible on this resource."
+msgstr "Solo la radice e nodi figli saranno accessibili su questa risorsa."
+
+#: /usr/share/icingaweb2/application/views/scripts/form/reorder-authbackend.phtml:6
+msgid "Order"
+msgstr "Ordina"
+
+#: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:33
 msgid "Page"
 msgstr "Pagina"
 
-#: /usr/local/src/bugfix.master/application/controllers/ErrorController.php:33
+#: /usr/share/icingaweb2/application/controllers/ErrorController.php:36
 msgid "Page not found."
 msgstr "Pagina non trovata."
 
-#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:12
+#: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:12
 msgid "Pagination"
 msgstr "Paginazione"
 
-#: /usr/local/src/bugfix.master/application/forms/Authentication/LoginForm.php:35
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:181
+#: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:101
+#: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:43
 msgid "Password"
 msgstr "Password"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:294
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/Validator/ReadablePathValidator.php:32
+msgid "Path does not exist"
+msgstr "Percorso non trovato"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/Validator/ReadablePathValidator.php:31
+msgid "Path is not readable"
+msgstr "Percorso non attraversabile"
+
+#: /usr/share/icingaweb2/application/forms/Config/Resource/FileResourceForm.php:51
 msgid "Pattern"
 msgstr "Pattern"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Form/Element/Number.php:36
-msgid "Please enter a number."
-msgstr "Inserire un numero."
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:54
+msgid "Permissions"
+msgstr "Permessi"
 
-#: /usr/local/src/bugfix.master/application/forms/Authentication/LoginForm.php:25
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:107
+msgid "Permissions Set"
+msgstr "Permessi"
+
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/remove-dashlet.phtml:9
+msgid "Please confirm the removal"
+msgstr "Confermare la rimozione"
+
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/remove-pane.phtml:9
+msgid "Please confirm the removal of"
+msgstr "Confermare la rimozione di"
+
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/error.phtml:4
+msgid "Please copy the following dashboard snippet to "
+msgstr "Copiare la seguente dashboard in "
+
+#: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:34
 msgid "Please enter your username..."
 msgstr "Inserire nome utente..."
 
-#: /usr/local/src/bugfix.master/application/controllers/AuthenticationController.php:126
-msgid "Please note that not all authentication methods where available. Check the system log or Icinga Web 2 log for more information."
-msgstr "Si fa notare che non sono disponibili tutti i metodi di autenticazione. Controllare il log di sistema o di Icinga Web 2 per maggiori dettagli."
+#: /usr/share/icingaweb2/application/controllers/AuthenticationController.php:118
+msgid ""
+"Please note that not all authentication methods were available. Check the "
+"system log or Icinga Web 2 log for more information."
+msgstr ""
+"Si fa notare che non sono disponibili tutti i metodi di autenticazione. "
+"Controllare il log di sistema o di Icinga Web 2 per maggiori dettagli."
 
-#: /usr/local/src/bugfix.master/application/views/scripts/search/hint.phtml:8
-msgid "Please use the asterisk (*) as a placeholder for wildcard searches. For convenience I'll always add a wildcard after the last character you typed."
-msgstr "Si consiglia di usare l'asterisco (*) come carattere jolly durante le ricerche. Per comodità verrà automaticamente aggiunto dopo l'ultimo carattere digitato."
+#: /usr/share/icingaweb2/application/views/scripts/search/hint.phtml:4
+msgid ""
+"Please use the asterisk (*) as a placeholder for wildcard searches. For "
+"convenience I'll always add a wildcard in front and after your search string."
+msgstr ""
+"Si consiglia di usare l'asterisco (*) come carattere jolly durante le "
+"ricerche. Per comodità verrà automaticamente aggiunto dopo l'ultimo "
+"carattere digitato."
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:146
+#: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:59
+#: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:60
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:55
+#: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:72
 msgid "Port"
 msgstr "Porta"
 
-#: /usr/local/src/bugfix.master/application/layouts/scripts/parts/topbar.phtml:32
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Menu.php:185
+#: /usr/share/icingaweb2/application/controllers/PreferenceController.php:28
+#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:243
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: /usr/local/src/bugfix.master/application/controllers/PreferenceController.php:48
-msgid "Preferences updated successfully"
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:107
+msgid "Preferences successfully saved"
 msgstr "Preferenze aggiornate con successo"
 
-#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:48
-#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:51
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:109
+msgid "Preferences successfully saved for the current session"
+msgstr "Preferenze salvate con successo nella sessione corrente"
+
+#: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:48
+#: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:51
 msgid "Prev"
 msgstr "Precedente"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/FilterWidget.php:99
+#: /usr/share/icingaweb2/application/views/scripts/config/resource.phtml:13
+#: /usr/share/icingaweb2/application/views/scripts/form/reorder-authbackend.phtml:5
+#: /usr/share/icingaweb2/application/views/scripts/form/reorder-authbackend.phtml:19
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/authentication/remove.phtml:4
+msgid "Remove Backend"
+msgstr "Rimuovi Backend"
+
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/remove-pane.phtml:6
+msgid "Remove Dashboard"
+msgstr "Rimuovi Dashboard"
+
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/remove-dashlet.phtml:6
+msgid "Remove Dashlet From Dashboard"
+msgstr "Rimuovi Vista dalla Dashboard"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/resource/remove.phtml:4
+msgid "Remove Existing Resource"
+msgstr "Rimuovi Risorsa Esistente"
+
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:179
+msgid "Remove Role"
+msgstr "Rimuovi Ruolo"
+
+#: /usr/share/icingaweb2/application/views/scripts/roles/remove.phtml:3
+#, php-format
+msgid "Remove Role %s"
+msgstr "Rimuovi Ruolo %s"
+
+#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:56
+#, php-format
+msgid "Remove role %s"
+msgstr "Rimuovi Ruolo %s"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterWidget.php:98
 msgid "Remove this filter"
 msgstr "Rimuovi filtro"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:308
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:99
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:148
+#, php-format
+msgid "Required parameter '%s' missing"
+msgstr "Parametro richiesto '%s' mancante"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/resource.phtml:12
+msgid "Resource"
+msgstr "Risorsa"
+
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:148
+#, php-format
+msgid "Resource \"%s\" has been successfully changed"
+msgstr "Risorsa \"%s\" modificata con successo"
+
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:145
+#, php-format
+msgid "Resource \"%s\" has been successfully created"
+msgstr "Risorsa \"%s\" creata con successo"
+
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:335
+#, php-format
+msgid "Resource \"%s\" has been successfully removed"
+msgstr "Risorsa \"%s\" rimossa con successo"
+
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LivestatusResourceForm.php:35
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:34
+#: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:43
+#: /usr/share/icingaweb2/application/forms/Config/Resource/FileResourceForm.php:32
 msgid "Resource Name"
 msgstr "Nome Risorsa"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:350
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:229
 msgid "Resource Type"
 msgstr "Tipo di Risorsa"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:246
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:66
+msgid "Resource already exists"
+msgstr "Nome Risorsa già presente"
+
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:64
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:113
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:174
+msgid "Resource name missing"
+msgstr "Nome Risorsa mancante"
+
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:40
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:56
+msgid "Resources"
+msgstr "Risorse"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/resource/create.phtml:5
+msgid "Resources are entities that provide data to Icinga Web 2."
+msgstr "Le Risorse sone le entità che forniscono i dati a Icinga Web 2"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:62
+msgid "Restrictions"
+msgstr "Restrizioni"
+
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:82
+msgid "Role Name"
+msgstr "Nome Ruolo"
+
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:75
+msgid "Role created"
+msgstr "Ruolo Creato"
+
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:172
+msgid "Role removed"
+msgstr "Ruolo Rimosso"
+
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:127
+msgid "Role updated"
+msgstr "Ruolo Aggiornato"
+
+#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:3
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:45
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:63
+msgid "Roles"
+msgstr "Ruoli"
+
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:65
 msgid "Root DN"
 msgstr "Root DN"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:354
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:220
 msgid "SQL Database"
 msgstr "SQL Database"
 
-#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:22
-#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:29
-#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:30
-#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:56
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:24
+#: /usr/share/icingaweb2/application/forms/Config/GeneralConfigForm.php:22
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:33
+msgid "Save Changes"
+msgstr "Salva Modifiche"
+
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:208
+msgid "Save for the current Session"
+msgstr "Salva per la Sessione corrente"
+
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:194
+msgid "Save to the Preferences"
+msgstr "Salva le Preferenze"
+
+#: /usr/share/icingaweb2/application/views/scripts/showConfiguration.phtml:2
+msgid "Saving Configuration Failed"
+msgstr "Salvataggio Configurazione Fallito"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/SearchDashboard.php:63
 msgid "Search"
 msgstr "Cerca"
 
-#: /usr/local/src/bugfix.master/application/layouts/scripts/parts/navigation.phtml:15
+#: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:28
+msgid "Search Domain"
+msgstr "Cerca Dominio"
+
+#: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:29
+msgid "Search this domain for records of available servers."
+msgstr "Cerca in questo dominio la lista dei server disponibili."
+
+#: /usr/share/icingaweb2/application/views/scripts/layout/menu.phtml:8
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:655
 msgid "Search..."
 msgstr "Cerca..."
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Form/Validator/notyet_CsrfTokenValidator.php:20
-msgid "Security check failed, please submit your form again"
-msgstr "Controllo di sicurezza fallito, si prega di re-inviare nuovamente il modulo."
+#: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:110
+msgid "Select a pane you want to add the dashlet."
+msgstr "Selezionare un pannello da aggiungere alla vista."
 
-#: /usr/local/src/bugfix.master/application/forms/Config/GeneralForm.php:105
-msgid "Select the language to use by default. Can be overwritten by a user in his preferences."
-msgstr "Selezionare la lingua predefinita. Può essere sovrascritta dalle preferenze dell'utente."
-
-#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:41
-#: /usr/local/src/bugfix.master/application/views/scripts/pivottablePagination.phtml:34
+#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:54
+#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:71
+#: /usr/share/icingaweb2/application/views/scripts/pivottablePagination.phtml:35
 msgid "Services"
 msgstr "Servizi"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/Limiter.php:84
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php:34
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/Limiter.php:83
 #, php-format
 msgid "Show %s rows on one page"
 msgstr "Mostra %s righe per pagina"
 
-#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:16
+#: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:16
 #, php-format
 msgid "Show rows %d to %d of %d"
 msgstr "Mostra da riga %d a %d di %d"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:220
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LivestatusResourceForm.php:44
 msgid "Socket"
 msgstr "Socket"
 
-#: /usr/local/src/bugfix.master/application/views/scripts/config/module.phtml:22
+#: /usr/share/icingaweb2/application/views/scripts/showConfiguration.phtml:14
+msgid "Something went wrong while writing the file"
+msgstr "Qualcosa è andato storto durante la scrittura del file"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:22
 msgid "State"
 msgstr "Stato"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Menu.php:181
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:339
+msgid "Strip this filter"
+msgstr "Modifica filtro"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:219
 msgid "System"
 msgstr "Sistema"
 
-#: /usr/local/src/bugfix.master/application/views/scripts/authentication/login.phtml:4
+#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:34
+msgid "The Icinga Project"
+msgstr "Il Progetto Icinga"
+
+#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:4
 msgid "The Icinga logo"
 msgstr "Il logo Icinga"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:114
-msgid "The Syslog facility to utilize."
-msgstr "Facility Syslog da utilizzare"
-
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:91
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:91
 msgid "The attribute name used for storing the user name on the ldap server"
-msgstr "Il nome dell'attributo usato per memorizzare il nome utente sul server ldap"
+msgstr ""
+"Il nome dell'attributo usato per memorizzare il nome utente sul server ldap"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:66
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/DbBackendForm.php:68
 msgid "The database connection to use for authenticating with this provider"
 msgstr "La connessione database da usare per autenticarsi con questo servizio"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:284
+#: /usr/share/icingaweb2/application/views/scripts/showConfiguration.phtml:5
+#, php-format
+msgid "The file %s couldn't be stored. (Error: \"%s\")"
+msgstr "Impossibile salavare Il file %s. (Errore: \"%s\")"
+
+#: /usr/share/icingaweb2/application/forms/Config/Resource/FileResourceForm.php:42
 msgid "The filename to fetch information from"
 msgstr "Nome del file dal quale recuperare l'informazione"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:136
-msgid "The hostname of the database."
-msgstr "l'hostname del database"
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:108
+msgid "The full path to the log file to write messages to."
+msgstr "Percorso completo del file di log dove scrivere i messaggi"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:236
+#: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:63
+msgid "The hostname of the database"
+msgstr "Hostname del database"
+
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:45
 msgid "The hostname or address of the LDAP server to use for authentication"
-msgstr "L'hostname o l'indirizzo ip del server LDAP da usare per l'autenticazione"
+msgstr "Hostname o indirizzo ip del server LDAP da usare per l'autenticazione"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:130
-msgid "The logfile to write messages to."
-msgstr "File di log dove scrivere i messaggi"
-
-#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:57
-msgid "The maximum loglevel to emit."
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:49
+msgid "The maximum logging level to emit."
 msgstr "Livello massimo da considerare."
 
-#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:92
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:68
 msgid "The name of the application by which to prefix syslog messages."
 msgstr "Nome dell'applicazione da usare come prefisso dei messaggi di syslog."
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:159
+#: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:83
 msgid "The name of the database to use"
 msgstr "Nome del database da usare"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:56
-msgid "The name of this authentication backend"
-msgstr "Nome del backend di autenticazione"
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:83
+msgid "The name of the role"
+msgstr "Nome del ruolo"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:54
-msgid "The name of this authentication provider"
-msgstr "Nome del servizio di autenticazione"
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:58
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/ExternalBackendForm.php:34
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/DbBackendForm.php:57
+msgid ""
+"The name of this authentication provider that is used to differentiate it "
+"from others"
+msgstr "Nome univoco del servizio di autenticazione"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:80
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:80
 msgid "The object class used for storing users on the ldap server"
 msgstr "Object class usata per memorizzare gli utenti su server ldap"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:182
+#: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:102
 msgid "The password to use for authentication"
 msgstr "Password da usare per l'autenticazione"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:270
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:87
 msgid "The password to use for querying the ldap server"
 msgstr "Password da usare per interrogare il server ldap"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:221
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LivestatusResourceForm.php:45
 msgid "The path to your livestatus socket used for querying monitoring data"
-msgstr "Percorso del socket di livestatus usato per il recupero dei dati di monitoraggio"
+msgstr ""
+"Percorso del socket di livestatus usato per il recupero dei dati di "
+"monitoraggio"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:247
-msgid "The path where users can be found on the ldap server"
-msgstr "Percorso per trovare gli utenti nel server ldap"
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:111
+msgid ""
+"The path where users can be found on the ldap server. Leave empty to select "
+"all users available on the specified resource."
+msgstr ""
+"Percorso per trovare gli utenti nel server ldap. Lasciare vuoto per "
+"selezionare tutti gli utenti disponibili nella risorsa specificata."
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:147
-msgid "The port to use."
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:109
+msgid "The permissions to grant. You may select more than one permission"
+msgstr "Permessi da assegnare. E' possibile selezionare più di un permesso"
+
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:56
+msgid "The port of the LDAP server to use for authentication"
+msgstr "Porta del server LDAP da usare per l'autencazione "
+
+#: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:73
+msgid "The port to use"
 msgstr "La porta da usare."
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:295
+#: /usr/share/icingaweb2/application/forms/Config/Resource/FileResourceForm.php:52
 msgid "The regular expression by which to identify columns"
 msgstr "L'espressione regolare che consente di identificare le colonne"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:68
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/ExternalBackendForm.php:56
+msgid ""
+"The regular expression to use to strip specific parts off from usernames. "
+"Leave empty if you do not want to strip off anything"
+msgstr ""
+"Espressione regolare che identifica le parti da escludere dal nome utente."
+"Lasciare vuoto in caso non si voglia escludere niente"
+
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:351
+#, php-format
+msgid ""
+"The resource \"%s\" is currently in use by the authentication backend \"%s"
+"\". Removing the resource can result in noone being able to log in any "
+"longer."
+msgstr ""
+"La risorsa \"%s\" è attualmente in usa dal backend di autenticazione\"%s\". "
+"Rimuovere la risorsa può causare la negazione dell'accesso a tutti gli "
+"utenti."
+
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:68
 msgid "The resource to use for authenticating with this provider"
 msgstr "La risorsa da usare per autenticarsi con questo servizio"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:120
-msgid "The type of SQL database you want to create."
-msgstr "Tipo di SQL database che si vuole creare."
+#: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:53
+msgid "The type of SQL database"
+msgstr "Tipo di database SQL"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:73
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:33
 msgid "The type of logging to utilize."
 msgstr "Tipo di log da utilizzare."
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:351
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:230
 msgid "The type of resource"
 msgstr "Tipo di risorsa"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:309
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:324
+msgid "The type of the resource to use for this authenticaton provider"
+msgstr "La risorsa da usare per autenticarsi con questo servizio"
+
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LivestatusResourceForm.php:36
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:35
+#: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:44
+#: /usr/share/icingaweb2/application/forms/Config/Resource/FileResourceForm.php:33
 msgid "The unique name of this resource"
 msgstr "Nome univoco per questa risorsa"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:258
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:77
 msgid "The user dn to use for querying the ldap server"
 msgstr "Utente DN da usare per interrogare il server ldap"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:170
-msgid "The user name to use for authentication."
+#: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:92
+msgid "The user name to use for authentication"
 msgstr "Nome utente da usare per l'autenticazione"
 
-#: /usr/local/src/bugfix.master/application/views/scripts/config/module.phtml:6
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:7
 msgid "There is no such module installed."
-msgstr "Il modulo selezionato no risulta installato"
+msgstr "Il modulo selezionato non risulta installato"
 
-#: /usr/local/src/bugfix.master/application/views/scripts/config/module.phtml:46
+#: /usr/share/icingaweb2/application/views/scripts/showConfiguration.phtml:15
+msgid ""
+"There's an application error preventing you from persisting the configuration"
+msgstr ""
+"Nessun errore applicativo pregiudica il salvataggio della configurazione"
+
+#: /usr/share/icingaweb2/application/views/scripts/showConfiguration.phtml:10
+msgid "This could have one or more of the following reasons:"
+msgstr "Possono esserci svariati motivi:"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:46
 msgid "This module has no dependencies"
 msgstr "Questo modulo non ha dipendenze"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Application/Modules/Module.php:435
+#: /usr/share/icingaweb2/library/Icinga/Application/Modules/Module.php:500
 msgid "This module has no description"
 msgstr "Questo modulo non ha descrizione"
 
-#: /usr/local/src/bugfix.master/application/views/scripts/config/devtools.phtml:5
+#: /usr/share/icingaweb2/application/views/scripts/config/devtools.phtml:5
 msgid "UI Debug"
 msgstr "Debug Interfaccia Utente"
 
-#: /usr/local/src/bugfix.master/application/forms/Preference/GeneralForm.php:43
-msgid "Use Default Language"
-msgstr "Usa Lingua Predefinita"
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:152
+#, fuzzy, php-format
+msgid "Unable to validate authentication: %s"
+msgstr "Impossibile verificare l'autenticazione: %s"
 
-#: /usr/local/src/bugfix.master/application/forms/Preference/GeneralForm.php:52
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:120
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:148
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:171
+#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:241
+msgid "Unknown authentication backend provided"
+msgstr "Nome del backend di autenticazione sconosciuto"
+
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:91
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:115
+#: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:176
+msgid "Unknown resource provided"
+msgstr "Risorsa fornita sconosciuta"
+
+#: /usr/share/icingaweb2/application/controllers/DashboardController.php:80
+msgid "Update Dashlet"
+msgstr "Aggiorna Vista"
+
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:104
+msgid "Update Role"
+msgstr "Aggiorna Ruolo"
+
+#: /usr/share/icingaweb2/application/views/scripts/roles/update.phtml:3
+#, php-format
+msgid "Update Role %s"
+msgstr "Ruolo %s Aggiornato"
+
+#: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:68
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:16
+msgid "Url"
+msgstr "Url"
+
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:184
+msgid "Use benchmark"
+msgstr "Mostra prestazioni"
+
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:161
 msgid "Use the following language to display texts and messages"
 msgstr "Usa la lingua seguente per visualizzare testi e messaggi"
 
-#: /usr/local/src/bugfix.master/application/forms/Authentication/LoginForm.php:24
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:169
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:173
+msgid "Use the following timezone for dates and times"
+msgstr "Usa il fuso orario seguente per data e ora"
+
+#: /usr/share/icingaweb2/application/forms/Config/General/ApplicationConfigForm.php:50
+msgid "User Preference Storage Type"
+msgstr "Salvataggio delle Preferenze degli Utenti "
+
+#: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:91
+#: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:33
 msgid "Username"
 msgstr "Nome utente"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:144
-msgid "Using ldap is not possible, the php extension \"ldap\" is not installed."
-msgstr "Impossibile usare ldap, l'estensione \"ldap\" per php non è installata"
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:91
+#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:16
+msgid "Users"
+msgstr "Utenti"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:123
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/DbBackendForm.php:115
 #, php-format
 msgid "Using the specified backend failed: %s"
 msgstr "Impossibile usare il seguente backend: %s"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:61
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:35
+msgid "Version"
+msgstr "Versione"
+
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:52
+msgctxt "app.config.logging.level"
 msgid "Warning"
 msgstr "Warning"
 
-#: /usr/local/src/bugfix.master/application/views/scripts/dashboard/index.phtml:13
-msgid "We tried to load a dashboard configuration with no success. Please have look that the configuration does exist:"
-msgstr "Non è stato possibile caricare la configurazione della dashboard. Si prega di controllare che la configurazione esista:"
+#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:25
+msgid "Welcome to Icinga Web 2"
+msgstr "Benvenuto in Icinga Web 2"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:410
-msgid "You need to install the php extension \"mysql\" and the Zend_Pdo_Mysql classes to use  MySQL database resources."
-msgstr "E' necessario installare l'estensione \"mysql\" di php e le classi Zend_Pdo_Mysql per poter usare come risorse i database Mysql"
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/index.phtml:10
+msgid "Welcome to Icinga Web!"
+msgstr "Benvenuto in Icinga Web!"
 
-#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:417
-msgid "You need to install the php extension \"pgsql\" and the Zend_Pdo_Pgsql classes to use  PostgreSQL database resources."
-msgstr "E' necessario installare l'estensione \"pgsql\" di php e le classi Zend_Pdo_Pgsql per poter usare come risorse i database PostgreSQL"
+#: /usr/share/icingaweb2/application/views/scripts/showConfiguration.phtml:13
+msgid "You don't have file-system permissions to write to the file"
+msgstr "Impossibile srivere sul file. Controllare i permessi su file system."
 
-#: /usr/local/src/bugfix.master/application/forms/Preference/GeneralForm.php:49
+#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:21
+msgid ""
+"You're currently not authenticated using any of the web server's "
+"authentication mechanisms. Make sure you'll configure such, otherwise you'll "
+"not be able to login."
+msgstr ""
+"Non è possibile utilizzare nessun meccanimo di autenticazioneSi prega di "
+"configurarne almeno uno per potersi connettere. "
+
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:160
 msgid "Your Current Language"
 msgstr "Lingua Corrente"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Web/Widget/Limiter.php:58
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:172
+msgid "Your Current Timezone"
+msgstr "Fuso Orario Corrente"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/Limiter.php:57
 msgid "all"
 msgstr "tutti"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Util/Format.php:83
-#: /usr/local/src/bugfix.master/library/Icinga/Util/Format.php:89
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:24
+msgid "disable"
+msgstr "disabilita"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/modules.phtml:22
+msgid "disabled"
+msgstr "disabilitato"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:29
+msgid "enable"
+msgstr "abilita"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/modules.phtml:22
+msgid "enabled"
+msgstr "abilitato"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/modules.phtml:22
+msgid "failed"
+msgstr "fallito"
+
+#: /usr/share/icingaweb2/library/Icinga/Util/Format.php:82
+#: /usr/share/icingaweb2/library/Icinga/Util/Format.php:88
 msgid "for"
 msgstr "per"
 
-#: /usr/local/src/bugfix.master/library/Icinga/Util/Format.php:87
-#: /usr/local/src/bugfix.master/library/Icinga/Util/Format.php:106
-#: /usr/local/src/bugfix.master/library/Icinga/Util/Format.php:108
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/index.phtml:14
+msgid "modules"
+msgstr "moduli"
+
+#: /usr/share/icingaweb2/library/Icinga/Util/Format.php:86
+#: /usr/share/icingaweb2/library/Icinga/Util/Format.php:108
+#: /usr/share/icingaweb2/library/Icinga/Util/Format.php:110
 msgid "since"
 msgstr "da"
 
-#: /usr/local/src/bugfix.master/application/views/scripts/config/devtools.phtml:5
+#: /usr/share/icingaweb2/application/views/scripts/config/devtools.phtml:5
 msgid "toggle"
 msgstr "seleziona"
+
+#~ msgid "Add"
+#~ msgstr "Aggiungi"
+
+#~ msgid "Check this to enable logging."
+#~ msgstr "Selezionare questa casella per abilitare la scrittura nei log."
+
+#~ msgid "Click to add a filter expression to this operator"
+#~ msgstr "Clicca per aggiungere un filtro a questo operatore"
+
+#~ msgid "Connection Validation Failed: "
+#~ msgstr "Verifica della Connessione Fallita: "
+
+#~ msgid "Connectivity validation failed, the provided file does not exist."
+#~ msgstr "Verifica della connessione fallita, il file fornito non esiste."
+
+#~ msgid "Default Language"
+#~ msgstr "Lingua Predefinita"
+
+#~ msgid "Expression"
+#~ msgstr "Espressione"
+
+#~ msgid "Facility"
+#~ msgstr "Facility"
+
+#~ msgid "Failed to persist preferences. (%s)"
+#~ msgstr "Impossibile salvare le preferenze. (%s)"
+
+#~ msgid "Location of your icinga objects.cache file"
+#~ msgstr "Posizione del file objects.cache di icinga"
+
+#~ msgid "Location of your icinga status.dat file"
+#~ msgstr "Posizione del file status.dat di icinga"
+
+#~ msgid "Logging Enabled"
+#~ msgstr "Scrittura Log Abilitata"
+
+#~ msgid "Operator"
+#~ msgstr "Operatore"
+
+#~ msgid "Please enter a number."
+#~ msgstr "Inserire un numero."
+
+#~ msgid "Security check failed, please submit your form again"
+#~ msgstr ""
+#~ "Controllo di sicurezza fallito, si prega di re-inviare nuovamente il "
+#~ "modulo."
+
+#~ msgid ""
+#~ "Select the language to use by default. Can be overwritten by a user in "
+#~ "his preferences."
+#~ msgstr ""
+#~ "Selezionare la lingua predefinita. Può essere sovrascritta dalle "
+#~ "preferenze dell'utente."
+
+#~ msgid "The Syslog facility to utilize."
+#~ msgstr "Facility Syslog da utilizzare"
+
+#~ msgid "The path where users can be found on the ldap server"
+#~ msgstr "Percorso per trovare gli utenti nel server ldap"
+
+#~ msgid "The type of SQL database you want to create."
+#~ msgstr "Tipo di SQL database che si vuole creare."
+
+#~ msgid "Use Default Language"
+#~ msgstr "Usa Lingua Predefinita"
+
+#~ msgid ""
+#~ "Using ldap is not possible, the php extension \"ldap\" is not installed."
+#~ msgstr ""
+#~ "Impossibile usare ldap, l'estensione \"ldap\" per php non è installata"
+
+#~ msgid ""
+#~ "We tried to load a dashboard configuration with no success. Please have "
+#~ "look that the configuration does exist:"
+#~ msgstr ""
+#~ "Non è stato possibile caricare la configurazione della dashboard. Si "
+#~ "prega di controllare che la configurazione esista:"
+
+#~ msgid ""
+#~ "You need to install the php extension \"mysql\" and the Zend_Pdo_Mysql "
+#~ "classes to use  MySQL database resources."
+#~ msgstr ""
+#~ "E' necessario installare l'estensione \"mysql\" di php e le classi "
+#~ "Zend_Pdo_Mysql per poter usare come risorse i database Mysql"
+
+#~ msgid ""
+#~ "You need to install the php extension \"pgsql\" and the Zend_Pdo_Pgsql "
+#~ "classes to use  PostgreSQL database resources."
+#~ msgstr ""
+#~ "E' necessario installare l'estensione \"pgsql\" di php e le classi "
+#~ "Zend_Pdo_Pgsql per poter usare come risorse i database PostgreSQL"
diff --git a/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.mo b/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.mo
index 145152f328985d2ca5ebdade958025991291559f..a1c7df9e7597b908de4a3848e2947f256bc468b7 100644
GIT binary patch
delta 15741
zcmb{233yaRqW1BVgs_L5u#;vdED1XpPzYg*KnNs&vUiduY3OvvbO#6stthB~Y>fhn
zBA_BLD$wJC$}%dTg5ZXXI*J=ApyECvD&PO@Q^Dxy{qDWbJ<n8rRdwprsl5+A^W?GU
zjo(KH->XyM4vVWpv}H9#Pi@Qki1;%tm1|kUk}Rt}regz~iVbl#HpZ1$19u>gT2G<s
zIf~8k3?^XZWXo!S?Xe18jnyqHXk`;=LWUEY;e2d_ccWhP7^>o97>Dnh{4Y@rs?^1@
zs$l|lz>Zi8$6-CpH|gt<N37dX4cLn<dB1g-h+c3OJK@hr%dEt%mX(6NZ~$J1J#e?l
z{}d~dZrP1SU?Nt=t|pyg(gTgdu^0EVu@5fAF1+7*o``zzy)ml0-SarqNVG+b&;ZoX
zPQvzBibHTSj=(dhhWDbCH8BlqVHVOSD-YGsJ5aNG4+b@)2Z+SuG1MHL#@1M=r#<AI
zP!*-1Djsgq6R|F74{EAzKvldR^`d7`^*?WX4P!~akG1iWo{Ya*{399lFqZLAj~ioW
z?16O3%E3B#C$`0Hs1bMt6Y&BL$5y@VIrd>Y(i>4jeHc|<iH?wnYRK3=j6Vz1nn;G`
zatW&Ct56MDk6J8YRL}OJ8vMTT3)GzdWYRHLSXNciwXg;@L3OMHY9#uj>Kln_@c1B+
zbRt_&Yv2n!ffrB>InD~y3s0h6^f4;`3)B#PZ|+y>Yfnu*)D*Tx)~7WDH9~Vx+i)|g
z0nei93mzq+p*ewS@vo>kj_YT)xEZQoM`V_)9;i8=f!eMM%>50h20eh9swYhPC9F^S
zU#JoI#%Ns`DIc_I5YY_>#$Xbvhux6>St<Nc!{(qGb_?nSYf%l^j(Wj9)KI^Hsd&cR
z?|7AcF7(GH<j=qgxEL#I|1Tw?Azp)e(I(Vt--#Nkf1pO-2<k;|U_72hEuyIY_Weqz
z2G&9kI&ePTj#?Ad2H3`<I@|(l1c@XQQH5721IMBkW1dORL{%^swMG`9MrakPq3cl%
z*^YXCC#t^vsD{6ZDtF5G6)Hc9VG3%_suEGfO;JPB9vfk2Y>Gp%8RntRg@xE0x1y%v
z5UN3Mp`QN$HKL!O>irhgflH_nsyfilZ#<Ck*9+Q`p&>~#jz&E&6&v6T?12kWJ$wQi
z;vrN+Poc_RK=rIbn!WntP$SbHRemsP%}hZxv^b6NSAp4N6ytncgkNC}&Kktl#J7+w
zZp|NTS$=#R7h;DY9LG_X^)QA=R~=?q1$Zy|uu{5Zy@0bZ4+mUr_xu4|O?p?5NM#~}
zhI4x1NNkDMne-ae$UJF0gc^}IP>b<%bYS!dd&pbiL!`T)I`$T7WKN-0|5?-&R2*rq
zkzhQL>ST0A&1H&lB<jIwsJWeqT9kfNgXf}#@+Q=a)}o%j2V-z2R>8lU^gdKQ&!Wn`
zgghU#-nApv*Qmu9n_*Yn0JWbxn)CqdNjlrO1Y3|kfTQq3WLB(hBoc5AX5u<zHmx%z
z-I+|K7htUR|FcBY;ulbh;wWlSy^5{y9P;~N)f{b)$WYV^#-K)^7_}P~oBRii2aTt(
zHTPr3SXLYCfSTe=Y|8sBKaozj61(7D)B|6l9;lmTH{=S`izj1eoR2ke2dd#uV=X*@
zn$lOX4!(zR_%-TWxP)3e@!5=jV<Mf1s6|6jJ)MDC?VB+g-$7OU9#+HisJXp}^)Pm<
zy(k-_^1Gp)>xUZ2{-}|>7PSWEqslEB%lK<Ctsq0LLoKpRCjAiVfn8V^_n;Qr%c!2b
zjy3Qsssk5LBi3}Boj(v&?`XUdC!p@HLv?81IL6;W<haTB${01?p6fcOA#8@MAFB(p
z)vX&a9}nYfOuoh*;;pEucntO8r%+Sz9BQOq!5(-TRd3_qwf1LpXVm^2h8lr9RF7w(
zhFs+|*Gr9eqsr~T2Dlp=;!DWylJya)p)Dua&$&@UUW(e*H(`AYE+-OC<bG5IPh%r|
z!{mQy(y<fm9wnd_Q+phUy|53KVlUi{{KQ*lP(5us$sU1;sP`108XQF46SUS6X-vj0
z)HXVbYWX?TF6cJd{z4j$)M;%(C;oz}XzCRE8*w(Oo*kHshfodu0X1?JrrO_*^-#O4
zFZR;@_e3I`^Vp9YZ)0t2FwI_kiKs=^6*ZRwP!*3v&EZ7UeJ|?%d`!S4s71Ej_%!Od
zqp0$4W8EN;Gep$#Ur;Y@NcWmx2h;;YP>U%Wb$>EyP54kRm}gvOyazSZkKh$}5If=}
z)FSMdW1k-bFxZI<FA=@qZq$qKM-ABl)FOKYwGB_A7SAbEL(ZD}Kclu~Os?JFDyZig
zpc>K~wMKfP1HIS+SL8DOt%&R*Lvwuso8nIxsUXjOQFGM&F4!K&VhS!m^=uDzz|+_q
zYq{)>B%|sdj&0G0+EsU=I=<b-_^ZH4GSu^nxDOjlw|{KjL{3YqI-5NwieE!qOZvG2
z`^RRY+x{}zgzC|L)ZBl7sxNAW{rTMtl|K|Ua`~tcFAWljCbAHx;3AC0k5P;3EULx7
zpcYN-nf84LYG~VH1-uef;Xu?>4aaJjg{prlR>2(9)Ot|$2d^ihmaRYy(WB_VH&GS+
z8`YCbsG)7*u}3TgtC609dch1-#f7K_&ByAv5CgaZ)xZjcb_e2+sSa9oiReXLjD2t@
z=>aBvE2`%!Q5A2*s(3%@1bY-Uqz6$AIEh;2pJGG&+2q&v+WBozyCwzKX#Wo<qMp5v
z8q!Os2F3gAA#09WBki$0j=<Jfg2{N7Nxy_zyysC3tX^a{umLLF8Eax6tbxO@3h%eZ
z6VVVl@g5dg9%{~`i|rFG9@VfU)HyL2Rlzh=&wZ#4+=wmlKGb4-4mG8xQ5~x8w;NIq
z)zAbCI*9Zm(hMh~((|wuZooKv7<JS>je61RsJZ_Jlkitm`OZwVhWsj2dOWtn0@U2E
zH22pVcLx}M4e1dwRN;4+idKoe1_ojp$t9SM$FL$coMoF}Y>V18olUyCF$H^)pNcww
zW@B&MiE7|yvlxH1>;f6;S@djsBwC<`us=G`iR#Hh9E;nH)*O3C$D!(RVqKhp9dQAw
z!P`;K??S!!E!2pg4HD6uRW7v`Sw~cXQK-3|hVeMhxEl4~Hq@d#jEQ&-wZH4nwHH}}
zF&Q;7{jnhqHu+Pq5$T|ph<bV}cE|0;_fQYinP>k~sw3+DWbBKpO#aK*hx8>>J$<gX
z?@vJG-)YjvQH!wJe0%rQMMfrQ^&t{zA*w}#QEOo;YGh`j4wB`@yHP{^5Nc$0p?1Lw
zs1bM@HRK<oUU&|*h`+@N7`1@!L7aqDwf`R>5+-90>VZP?GzBH7^kTC{mSY{#Yt8-b
z#;36@`A4xEev8T2_6B>Z#-a9q0M+myY9w#PI+V4ZAyOZYD+5oX3jT<rFzQCTr=zhA
z=>pXK<*4V@qDJmv)JPo0#`qTMocInk0x=8ij@3q`TVhZ{)rE*E?2T&q0MrN+p<ZyK
zaV<6@{V+DbBd7*{goE%0)QkJxWN*81sPfBDNB4HrR6dGo=rcDl{&k5QBSRH_XbSv<
zYFMS4?Fwrc6H#kr5URmfqn^vc5}b*wTk8YVQ9EgoJpvx%JmV77;$FXq@mEWBlc5(r
zk802n)C*3bTKpNt;`gW*UPP6zyV#zZ#+X35D{2vrHu)2c#i%uK8|r;)Pz`)ANF<ub
z<JbiEU~@cS(%)fQ(zR}}&+Oi)24<rcX8~5gBGg=$7;iR)Pz~N}(obPa(l4SK68xNq
zdiX1<h1G7gUlfm8rQK0$As^MSIjDxNMO6?+_4pvF{Bcx+Vs5j4ZY!gnZ-z0LWbB3<
z2|=qDk=wZuMmMG|VNc@@9Eg*bvL*38<bPI;Wi%p+pIy9zblv6le_Gjw({+CZ|6s)u
zoQ9)U+C#k??;`yyR>H}vbYL<6E+TEnxCJ#d52Hrp72~_8gXS!1H$<(r=ehw_Cfyq!
z!2wtW&!c*L0rgzfkiCdopo4Tj)Z9<TX4?OSir`YzgWFIoe9HJNszEPd9XyE@@hsNG
zuTkY=*Vy|y4t2kYu_bB^BpOpuQ+O=~)xr{UW0~=O)LM83d*EU0f<L1cV`s*F3}zd*
zVj}6EFbiAXX*&nANgp+~SZg<I7HTcbU(5JwvD`?8TC^CGaWm?{*HArfw~m)$3TmVZ
zPzTLolfMbulRj?JKVk>cZP(lX0ve6oNiRh;bU*gQGwT_D-AG_%Bw-fz!iCro_n=;U
z8hc~iyX~PIjvC@ztbsF7YoQct<3iM0ScCC+FV@A!upYjMt?<1d5mg+$!Tz~SL7fMF
zR7JB;bAKzUf;&*#a2x8tc>y(5pP`=n7BxaYphl$LJ$6H`M6Hpb7>A=wIyjk#UgSbm
zG#k~kg{T+ahU(cpsHu1mRele)#v`cR^Oebuzt=9`9@Vj~sHt$H>RW@&@F8R*g4Q8(
z;~lKVjq~;m>mp{6uC>u#3wh`#y$9!D=lkr2JczNRpF|D$K2!r=zy|m>j>2zDdf+Cz
zArmmN|Gh-i<CW&dT2w=Jptj=^7^x67gl}Ub{LuI_4ksPIne~7<SRW6ertV*;kv)Sg
z@H=#1{1!$qNTjzSI0<#*Mr?(fQ7=4%s^}P|;XBv|6Yl315U(+A!TzMbL>(|m57=wu
zD&rJvN&W)kCJeSA<9Q;(@GNSsx<6?5XbSpBZ#OpHYHzzG*pK`NP;>bqUV-{A&srlX
zs8v1^HS{@{i@VW_@!Ra9e$h7OUvqk%3~i&_?e^j+MpZNqwP=>3reHHR#=o2Nanx%5
z0M(K6s2A7YVL#UaRqs`(=SQOMPen~pU<c!`j3s2Kf{mu&L99gjBx((u!m9X{xqlHg
z#BqPKZH8)SXVlcB8s}mH=`iYCc^$iB)ral+uL=@rOU4jX3k$I#Dqk;LY+QwE@dk{=
z-Nq+TJ=|x~FQXdrI<~@3u{BnE#I_5nqhpQ1c|@9%u?f}V1E`+8fbH;~*b%Kq?SF!G
z!cHV-q3&-%z32$4r{_^Gthv*^-via4NvQLn2vy%h$jAq+H;C*d;|!+Z)?J+Mcn&k7
z*!#Qrw?64DVf+5DzuRkI8R|t_QLFkWsw3yI3)XndJ^}lqj^F~+hz5~rttD8<`>ka}
zDv<FLYSCT7T3F|CJKYL3<h@Y)z8|XmIIN5lQ6ra!HPM67cs*9bAgaElsFB!!YUoZ(
z<o(uhA{x32sEQgrVSk;rFs7h}I1BZH*{B!Xf@;7L)S3xlJ-iEV!ADUI=>4R9KMm`X
zz8dwOX&6+bfXHwxLJiR~s2(3i_4H+v{~GFr@0$EiPz^bUs^?483x6>A(R=LtSX9H~
zZ~-<$E%pt27=I1TBV_2o{ip^U!3OvyHpMSZy4q9rT(?4<^+QlS&&29D9vfjEszD1-
z9a(H#hI(!_s^J@+V*Irj-Xv5e=NRgmXJfs>&8p;oN_r&W9Tny}K=_gH3+a2X?Ak}9
zwrV!l!>0U2lcpcmbL7o5>1Q<md8W|I#8ZjCOVA!YXbR~+Jibdj8^0kW5)PBT3w3>N
zY)`xq@y7{l9xLDE^NA6;?jSvw@CacjIo}fWe(N=Y{=?JtgecSce~~wcP?@}!P*+bI
zD@5KKgysZYAKO^hkv>3}OIT*^?d0D3=6+keji6o7l>662@%}G~%r^zb<Mo6?<W)5l
zTxIU9$Nl8>$25#J_jUUgLLC}@62s(QO-L{uc}oSj+LG6byp{L>=`Hw76#aLR&>}lW
zSVCqzg@&T8`yzk&ub?LFA-&kdml8iu{1rT5%8BWO>eQiA@+0oMaSV<k#1b!mMZW)A
zaN{|0FAxS2J}F;<`27U7vh^9kNzgTba9ojc*R|B6>k7hn;#%niI0;AN5BLQBg53xw
zhzEb<&$A@Tt|B5Sga^rQN4S@Gfw{@a`n#(ky&OrIrwE1SPIu$Y<hckP2@S~`Ve+?O
zBG3Iw{)?J_UF}JfzgCf6M8;r~`I@<Z$+!y-60S1oPWZEl>k$r8YlBI5Mi1dD!cV5Y
z&G-SKO*HSHL!=fhdY=Nip2cY<uJi@sPZJst9w2;2_$ML6z4!12tcEiP6A8M`VZI%;
zt~0)6?gdCsCtiVfM*2U9gqzTojHy@`OK~!x7GWRZb;{Pqu7t0NClERl#*(f>XioeS
zyq$1{_!T&h@H6pVgm~hWsP}o|F~oJ15`t^_Gm9|OWD>RNsbyTZlJ^2Wgv)Rup#k@*
zo3j5Pt^eO(`Ku*~)h45-DOZE^hvf>bC0~#6n_$nsezl6pd>DJ1hZY$1+$IwrXB?$W
zbNxhK67l<SgUQ=Vyd7_7f;SSH5&9A?asMRh`d38W-;u;P!frww4>iUgxVgg=ybnvr
zyAuy#9m3^{yzPXS2^R_bxiJhg3DJZ#1YHdX)u@{v#>h{33*tBFp8D@4==z?F;dV6g
zRjYfw2``$wt;i2o<Qm4`uL!sCOtPJ2tsp+1P~D`(M#7ckMG?Lr=qfQjLOkf8B_9!a
zl~92jQ}8ju$HZ^McL-%yZSsmqY(!l**;w64KSX>6p+E7iScn4%-<vWmiDwf}MqMij
zub1tAWpvOVt}kt@r%~U3-<Wh66^NWC^x@ue!f4`032zg0wI;j~iSemsUiKa7blsz~
z@z|LB=Lz@f{GUVQS~6n@y52Mo<q%(L;>y2+@ORSfsbmTU39-bR6B-i+l5UDk2px#0
z5OihOME<E(lY4u}??T>Ttf@-wBJn9E;tMziZzn7!3@5z+%dTcr(1OIj3EQ}*>l&NL
z=Xe|P`jDQ0KEkVnB7&}Jgj10iI||p4AKcBKH6+g9Y=V~%CVdRcUz<timCqplIbos6
zTg3fFH12DhMW{@E0^W%g36Bx)M)-h`YMyDR`LDr4EeX1o+gSA|G=k8YFq^!$QCAhp
zRkEXzf0%wq{#4Sf@Sm7TxRvl8;a5T&`7u0`OI%kiLK<NR`B}=){`-uCuE~T+Ca&}s
zgm25Gmyqs3y032PqT(8)Z!u-=#^Z#&+^TEx{uU|7?}@P=uIHWuk6;hpZ*4V&R}imA
zr8`ZUWaKmXQIp<5dYv-4#u9SLpNm@vmC8Ls(yC8AW!FErSCMd*48O_z8|frM(8(WN
zPhuAnS2{raB|;UGcM2PkpM?`tfNKb06~Ry5S;7(GtFi2=Ph`7E^dkQT!fC>T<ULAg
zqObXAT6&bsg@km1gK#r9s}imxoDT0zEQsyqDDf6Jy?Gv2o}<9$4>*d7eK{Uip_Q6D
z)9af}cE0NmMMAZb>-R2~=XVv)a_74KKTq1FLN$}UF+Q(9JSRCLDtQ<$^g9N7oxCy6
zO7(agS$19i-zCaQgpPH|teKbR_U1ciu_MpraRow;cCBA2*H>8R@&-cnyAF)KoLkT2
zM(Xm-zFgdKjmJZhe&)LTepRM|ROok1_Z2$=zWjWTa;LkTfs$gE-{JGxBcpeg_0^X%
z!<8E-tJ>71wp7n8aOKW)@LY)}5E|9BZ<X>*b%eHbZ4th^Yg}x!vo!o*uj(=3Em!o4
zu3@_ENYlgq(DA<ChxhlpvQp5I>-4)E?m#;~&G);DnWR90GvIJKvePnYx7SN6+%(Yb
zcjUO#>JmR?a!MWPxul$q@va<4H~Qpo=Bl?mIKn;4<qyy`zr*bfxQeGcb6uUN)#b?Y
z<<4|5ABDcW5|2xRQQMI@EK_wCyRIwI+mpf<($+=A<hVSc<%3VuutqxPINBGwy@}RH
zw>Rt_5)~6W(&r5ngx%?$3YBwn89#5XEA;xv{0=37qLP3$YL+J0HQUM@oG~apW2mJU
zjEuZ6rK|zr^o;1JaLTCI=pm6dmmg6pv)r_m8|kE^zq;d3N(%QKy*@fPhHe+Ta|4md
z^gGlF4UBrOh3~gVw$K^KEr?`JcY7Ef>+)k}>VN;_<;=*m{KvytS;HJfzTyBc3ZKd<
zjcS$Wo9zv_3nQajZVQ#)d7-bf>yC&l#XsMfek+R+iA>R7)K<1gS(e($sxaXX75<@!
zKb$dkdUPchv*QkwhPRK;hz@FrSXlvg?#xn0xx+vk&B`jtDRc)MnNBv)ESJ4(9gGxf
z{=d3MeZPND2f$xE9ki?dj}re;N0vE$B75gA8u4dkE>~1!dQpCz`K?gggl6f#txkvE
z><)H=bC%QX(V3NGWwUzzypY$&HoaUh)MmmDEsH!Q`EIYn7ugC9-*lE4wUvKuIDX>s
zn9$itwL044RMxb}`rvRXo3`@L_``2cc`Pa}W6a>xv|*_OM+~;cW`=K{wks;sCueol
z0%tL&7W>^5dNHSUg+ZgnXM|4WbZ;`YTzPlotVoKKs=&h)a;ruKi=6qcq<}l%aaCYT
zy92&r9WMi&oDtqU%kK)56eaz6ne;)UG!4Fz;#}8%UC_%bIUoM4Q0nDZmOHTiTeW7n
zICfaYp-OqptNMM@1E%|}^9EM-=JH#Y@5&41<&{?M+QreePfC{_;nR7y$5dxxTz(#%
z%W)c7T9DYHd<HY!#_#ZQ&_4GN$EIB}e4=1qbTG~5o$e|wbUNIgvR^=_WilP^vMhI5
z7UeGIMJmkaSaJv4obUYXIJDgVM@6$QzyANQ+R*-)iQPD9b$U4UGZX1yz-OPb%60#i
z>n1lf5OB}(g&TSrMqQns?=JD?yB%rvkFw87{X>r1<OEc8<cFJzsUuSCw@i0ZXnElk
zbu=oG<?qaKd)zE!cj!Q2qgs)jFxTxU%MBeb>=@+=T`cV0%;oSn9mVcKpQh5~$h+JW
z2H6?f>uo@}WN$<M4)b>XZ<Rjb?Gbv}TgiTczZ<-L_&e9zg1^7ri{yq+cn?HZ$>xY>
zZ5I}W*Il<Vy2enquh{F;FO<eEoD`T46Dpm(HOd)w%*luf`Aeq^iJWtcw8Io~Tj_;G
z&Hz79ktLBu$4!*A6)5(37?vVeapbPUXMZ=%b#J*?8WsNc+?ADr87_}L9()eJmX_b0
z=PGvcao{ZGYtHGlKOHz>H9-25P*sFNSAgF<7oQ2g`+mrC>+^vsxa0A(EBkK9b(jB~
z=%l^D4{U*(t~c>%KSaJHXo5L9nF-Fyq|oAp??k1CTsJ*YWiUT41-#Q4YI5_1K3XyQ
zS{mZ!^J9cB*XeQbg+VI|eP#akwNVmq>!U-2y#9uvbBn5lrY)Kq%3Rzi<hwUETzT>8
z=!)GPBk6m1{jG(uRdREE#e9y;b%iP{_m3H6AHsYsIx-{2vX$xd`ih-}?p&vpnw>p3
zE7gj8m-y7?%iku}7+0>dh||!@C@FLm`?R_Oe1}fw(Ac^B-MWKVpUTVR!^+30ps$~0
zD-tRXQYTr;;k_$<ib^a?X|nZ+<FnGevlz@VZvBF4rZXeINxsnfb<IMdwLL<wt~ycc
zw-xR3u)=dg&V}{bT4Vm0U3MVkxoC#H;@siSSN}Vzr~N6z`KJvs%gq9Hs7>}7;`>iO
zq--f>gel`Y+drKl34OIB{(t{u_@gziMg6u=%P(+82CIE&<n#-TzO!l5|JVWl*997e
zAG`B(bm-po#i7Sb>t(siI&59;c=_!&wAjtqIN3bq3P$F}6!-CQq^T-bAnd%$7ae+O
zL*vly<#h;Iq4$?3ht4c-8#<Yv5c+sS!>shb*c94340sX0v>bCT>o3ch-=K13!xuMH
zjcU`*SHkx-jp0|w{>;#pzOIDv^=Y?9j*M{hy+6i;?%7y9<l5LL{L`kLQ5;~~x3sB~
zK4whn(4pyLGlr%QOt-%vj%_&@6+6!9@fC+wJ+P!3i-n5xHDRTVNzYDCOC4e9W5OCW
z+!~uPJVVj)-xOmrLrD)FjB{IlmJ=VV?2E`gZOR(=75h10_)1V~&Buk4)87}`xTsN`
svI4*T?uYg-YFv*k!s7H<?d_K6hdnV=acgp%+da!!?51^ANs;yc01V<!qyPW_

delta 11857
zcmZ|U2V7P4|Htvea!(YT=~cr$P~4+LP{e^K&YTFSH-U>>T%=vIl$@!@y=R&;yXDAo
zG}O#2%d%3lvP{cL%kq~Ef3G*^Yw`d6e*g36!}B}N`R;R|TK7xffir==&q9NjSX@5^
zSXNcsS=zET1X@=6>MFIYqxCE+43A+2JdYLeN34uR>RVPRtc7K<8LFLFtcJ;`rlw&H
zT#rTZH7sFSKI=4zDinNz58y9Y3ClHbI%<S!xC@rVfu?*EYCt|Lj?0iotxZ@4&tQ4H
zZ1T6U3HgwQ&H!3qP5QSUCZP^SBL7%9{3wANur2P!j(8oLWBo=>`EV>mekB&h4Oj%9
zGx--x{$=Cq*pm9w*cyWxTUI3fTkS~{#|-0S)Dq7?t;AZ?3LQW#?K!NAw@?GE%(U1w
zs}5@BtuPY1VojWkC2=)|<95_m97ErOB(9hnitv;g2*=V`$K+dKIr3dm0~>;Bcsy$6
z%TXPyH}1v|@~@x<_!?>=?;?}8u45=xXv+H6CQ-jBondd(%qAn-Wo<+?bOxEMbq=-U
zLCu_wi=i40MIEY!sDZUabv(#83bi#}lb?dc$j@rV`j;ZHm;xP^O{ke1Ks9(AyW@Kp
zk5!|btr~?NlFvr1KvxciI!r`$G!#`n3d>@qsh@^g*?FifSmPtXq^u)Y4{xDfmntos
z0klIk*cr7l38(>2L^U)MHQ=SF`!*y0SiAV4ExUqxtL~uc!#IH&P&EuiU!*CB!7vK?
zp&A@(oNVgzOnwDwW?QiX?m-Rcd(?pbKs8*Vl{0|qsCJ{UJjP=*4s+^#)_M|pZ(l^6
z^2->EzoSO1cSTEE6xC5Umca<r7PUm(*AdlGJci?N)Y+L}>ZhOvI0Msh2~O4fAK1n@
z4AYErFn>u=4Q)nsd<b>;PMQ2!)FJvD_4<B?TA4ej0p3FmpbQ_8{DGs|i$D#yJ(kh?
z-&qOlZz@Kk_9zS0@O0FQ%*RS-qrL;XP<wj{^%`G8eR4~-bGD!%YCsR8o{vMVWDiuk
zgV3iLq><3lWSNR-s1D|$R^mD1e$@SMBIne44>hxp_Re>qJZgZAQ1`{5X4(gJ$OofV
zWFA&TyFKf#Q@Ybs9K~$%$8iR>;e?IEBe)4`KID8lkE56TJ)Dl-hxsT4Sk|v-lTYG=
zjlplwgNdCi>m(k<RGby#tiTU3tiMKhmx5Xt6zhCI>Y(!7P%DsWoPrg|&qf`#jp)Jy
zsHOb`x8YUP3Ov)<In*mrE4&YN29BfdzvLsK*X3K|pQs1RbaD2s3hL0+LJhP&YQ>^3
z1mjT8_e8x7BT#$(s434z-9N*)0(G`_nY`}^3B8ven1XBAg8U!GW^vA!Y7F+Gd^R#h
z>r<?buC6REc0?A@T4?egntW|On?aO6iouwPIwM|Wg?-jM61?ixUewI5qZ+=A8hQC{
z&Z(}8DvvXcHs;}jlyAidJdHK+C#;HLe7_rFGmOOHsQVXSgx>#`NNBGwpgOpRjj(zT
zXU}?~Mm`kvnvTR0=tV94G}IZfQG2@qbv6!QWjuo#&~?;AOZ0ROaV!SXzcrPF8lHy5
zaUmAPHK?uGiaK<!U?84DE#Z08z;9t;3`=mHdjN}&uVaifwn5$333Yb5p-&@DBvA@S
zqeeObwUjGN`4LouXHeh#^QJzG1K}dy4mE)x#tbY*{&Ca_%|iaMR`Y{nW!=Eh7?sHS
zPb9G_(OJTBy`815f$Fd}mcS;chT5Z+v=>&vN3jsjM4gp+s1@9RrE!<>Rn&d&pjPr6
z>H~D6H|x(g#0u%-j4T%Q;2hKztU}FX3u;fF$Ncvf)xagxR{Uzp%OpAZI;aUmV@d3W
zop2!Xd&gRZ`huSGk<bi__H`N#M~$!%s^QM484t&5n2TD%6{u7EIr5@dA^n`^dSMj#
z(WvKEVH4bk8pu`D1aD()^ab~KUW*3Ul7b;d8~F-br?4y*9^f3FN?3|~4b;FRQ4M#%
zQ0#8%hne~e)LWH{IwLDl_wPX3@mU8+l%wDzYQz^&9o|9hanXU!0}-etjY8G8N9}b2
zs^LeBV~tZVobq|t1~+2^{0z%uu|ayx+5hS!8dA^`)j=+*<0nx|wGMT7_Ml#$eW){W
z7&VZ$O#KDaYxN~+hSyL7_|?>xe8joGJhr90Ha5`vpG=}Y&O`0-0n`A_qu%eIQ7cqo
zurtsGsPciR`=;PwT#hYpzz}`|;yfG~U|C<_GV-y*oWB<?Vh!?l(WkwsI^1cfJ=P;X
z5LG@MHN%alm3a~M0eTgA);fxsarF_--bbJY+8T96dZ6kDqgEmr^(CEzYH#WY)?Z6H
zlLEbN^HEE_9CetsVRbx&I;|Jbg@MV=R@A~O<Qrf$j6<!=DAd`QjT-P$RJ$us19%Q~
zcy}lJ`1d^$hbYj9B1byEG}@pB*55b`<H(OP`Q4})?n5>BCWhfDR7anq4%tm(NQ!ev
zE8}9y8=wY!)JH-~a~aj)uc(#y3#($0RHxwx)S+vK>Yxj10R1r#({N1yfAyfYpwKAi
zdr%qGelx6$@u=rgQCsWtlF&$IU`^bNHSh%1#_Onol^N{}pdxBuwa|qfQGbLco4gP8
zI<7~(1$(gq9zpeU9<?>UVq?Akfn%HpnqoyNI+^@nY)(EMi{J)SN83>|Jc)JjBC5d<
zxAQL+WigI?62{;vjK|AZ2<tuS7@05o--?7z=|iR>*4Q2OI`zTU_%yb{W2hPahDEU0
zSZ8MCPy=j+TERqgVK(afVq-BpihAyCEJy#=ITDe04eMZ~bf<%8RD*p`Ta$&g&^Gn^
zQG0q4wZ~VCcTvxk&2Tzyf?CNTSQHnc&d@6KDY1iuR^X7SIEI?RS&YJ;QCm|d)A>8T
zBdR_dwK9vb9lnEwv8c!S<y026<SkL{cfd**gT-;EhyB;g+!U0+xyBW!C3+S$vpuNO
zdK@)_k5LVOiR$n=mc(1g$I`loz44JOXUTV>pZtE*{bR>DE9@P|`m5k63e@3T)IgS)
z8#WsKSex=Uuo-@bO|V+Fv(yQwy-i28GZD3N(=ZfYM13DlnEWNweK&n1dXe}IHPd*n
z^QYGc)D1IH4?crhx-D21kD&JcESAC>s1^7f%V5zQCtn#g!MdmcN22OSpxX6~Gl@LZ
zp;?1^Uk_m@et@xf71d#b@y=V(1$F-v491nHm0O1z;7%-uhf(dlZ|c8AZQUKDJ)iZL
zldvjHa1Kdx)XdwW9*jY5u?Ax<p2gDGW1=(jA;z(&Lz;^kfQ{;C3u+)cQSBZ@4fHJx
zp?~Wm5)~-8h<e~QhU4$3FIMOz=g>7pmA5nYLG8I4)nN{5U^7vl<fW)zPAgFDykzp{
zP-p2TR@M7oVX`yA=BT~uidxb{)ZX?p^{FO52{qt6lV68=i*}>7>?~@AU!ewg3#0H4
z)ZRz3j2cih`ZU53Bs7C5sMl*g>Vf5`ft<$jcox;bRSd#AI0b*lc{u4YRs#!BxEHgq
z6V{x{f84}0oP!_WqyYY?eVp}QLczx@Ln>xY<5#S1zzf*+2?mGZ)19TAh+3gM)CcGp
zjKIBE6VIb&e%Dy|NoUK-V;JQPusTMgK0wJ&((!H*85C${RiAPmXoQu?$D#{|qxN<h
z>eMeV?nXU#8a1#>#;;KW`5v_;cTs1n<P2x)%A;1gp^t<rTAGRu#(t=+$v_>tS*Cow
z@c?Ro?_qQN4kOVu(>Ywdu@Cu4#<#H^`D%I2--ca{zSSi9QgPGR`DtfwS7I>bYf%H)
zg!+ISLEZl&YG$#soPS#$fLfUusDW)V<%h8@`5Pu5Hrx4QHwN42{m&$!!?q3U;YDnL
zg*YiHZ;y>J3tQqkY=9qOBMhAD{92Agy%l4y5KcqAJ$YCJm!b~&IxLENF<kHeArj>%
zcpr7juVO9y9a~{_j&^GtfPuIG)sT%Pa0}}B7f`R&anvFE8g+ljd}n2fpjM(bY5={k
zF#TJDNR-566`%);;Y8F-rlV#s3)S!<)Bs+<2k{Mz!0V>G^fS)=HBb|%kM(gRYK!Kf
z2D$@%8u=*_#ql%L3Ve%6cn`JLNei6++_nw*XjxSkIs;gOA>_BBX0!_{;eOOsoJF;N
z9re2YiJDOLMNWC`MXbL%ZcBk)qb^t$2cTBMjcRb5aSq0j--0RlJ?g#gZ97{r8ntpc
zs1AMT!VRdEdd>KaDKD{@_19iETI_V#8?~o{Fa}4V_I^7)j90KU*5a$Bt%x!vVNLR0
z<5JX?9K^188MOs<mpcDHAqn-Ctn-m*PvT|N-rPZ63oC4y^Lq8d^5jQiFPw;)`3cO#
z2FsmK?n?BM4_@J%`bnrWlZWBB0L$T4)CwO$4Z!z~DY%9@gm+ORFS62E+QwLle5^4E
z^9N+=Cz|{`)N>nA9h^jM;issr{Svh`Kb!i$kd^dVWmY*$>Oze$61C*9#;K^K-iIym
zBaFh5tDO#_u{Qa5RL5DE|JI;7oMl{$VdU4L4(&_%vj2xjXokm719%TL@~=>PeFNk1
z4{V5C);NErdr@a+6>5M-P>1X?s-57q&g)kZ^}$L+t=trR6&GR*{ad}(IsdiV#)JSm
z!p)R--{9=gO;p3hH#&zb604C<!br?UeONZ3_WCqx=2wvBtRFA~Z(=YG+vJ?B6!d9t
zCYXXe)Y7cPint#2z(LeuI*eMG6R6krUDWdzP&2-P8kk0352|Bzj7L4^MzuT6ID0eu
zUyFiG6lkeWU?84Hb@(Z2FR!4M?pw^md#C~AZE^P0Ms@I<aW8f!e-O12A<sG!D}%x0
z!%^*5dDiE2_#g#pppLN#YCx^<ag0M9uH&c~e~cQybyNqxU?H@&Iv=dUsP<}L2-Y(;
zK~1m)YHP0e_?b@pMJ5J0+|~nFf?$$XJA8xC0iBLZh}Q{S(}_>>Q~&+rJ#&vb*R`K$
zY|2(5J7v90_$Kh<8$uVazV$toQ?MCcCf+8(h}*iMz@>e?K>S8@A)X;Jx$h*=oX|4Q
zCv-hbz9Vsu^eKXGRsJ<v@Bc(9$`iUGjY`iV{UC8r8LpuY|MjyK_ry_J+dSJ87ZG}8
z$C<lb#uJqD-LV$qKKz{it+&WrAQ}?S5VNV!?|>FWd-4Z~``2O8txRTLf${{(dXoRh
z)ct@}$qzR9Pe{j*{=($nB!69L`nPV7*-5-lG$Oy3NF_QEGl}y=5_P&}5p#$iiSDM1
zWd4;w{v|^H9jG=XH;7kBw<dJCP+!1z2>stOUB1UmVmz5bq>tgpxD@qK(Y2X;7V#A6
z5h^HfH6UG_I(@QrMU%csJWKQ-1{0T^s{Ef9$?NKXFF5me3iR_i;s_N>{wcD)CH-}Q
z{QcyB`w6T}%;vcnL>Xca`RjN9^}5X@Jq>l`f5OS@dQ$8E8Hp!|w!}gz9>QEA(cGl>
zz7*+!!~j$FJY`*p&&V$z`V(D=qQtwBI$c#rZzKv6uaWOev?QVlT}|}<>ncnvAm$OH
z2wh`|uc`k8hY&9jtIYk2N#DP&Qa0IS9wFVH^pBWn%BJEI=DDTVmY71+B78geagG}X
z5vxfTylnCj!~s)Yh{~slD+O-)le9jiHMplczHRD$F@BF_&GRZsC!Qxim-r@t^{+%h
z4I-q#O=R=0M~pw?JnA37jYNH-gQToD>e@^C4V;6Gh(4r;;TOdH>ne$2L@Z@nFi-n`
zjLf4%E)hq(L+E+|qllxVU&NAl&eSE7&i_qj^4-Y4O!^g~GclGpPv~k#bTjF-7)S(|
zd>ie5X_Gn4jlUBk$yYXI*Kj>$_ph@iQ4cRs=QsD=Azza8Ej)u2h||O%Lf5DG12LWm
zCF)QXPWZkgQ<KDZc>mI`T3uTy`_)NWIi!1=^n=C`lvO1iY4ZA*)uC)SW)P1OImB+F
zCgr*`;crd)l=ff0PIbLVjG<y0@gC`i@B>wF4JCa7-y;4+R3g8O7)=Z$--gh2jW|Pi
zDIbOxiAkiRP=BBlyy{ZkL;K&+l<uZL*G(dkXiB6|HWw=pTTJ~J(gm+~$qc9NLsQ?M
z{CDPtYQ_lMMg2&VPco|i{J#V~gj=S8`B<9#LgI1aC-NVeI<i(h(#@3M+GEOVk={hQ
zSAMDU<AVavOrmH)f&3xT{fPYj-={K-c$VmGZu%UzlMf<veN3d}r<@-<OnPmBvZr`v
z7y0AZ#FQT;y}H0XjZL}*<y<~%xs$M3qMMSwL=n;+;uX^Uh}Vf!^6QDIL^Z-g*;lCR
zVTb&mJ5Bm0;|A=@eWQqM;yL07Wh*d${x%#}nrj;oM8!mm$8yA1q&MW>%)cFx)>WPS
zB22@I#ABon5&KC$O>8H=B=04Pk#3HiP*)#3iM=pX>mN%bka-i=5Zg$H6R#1vmJx@E
zb>#oROG*=430*yj8Tl#B3-_EQ{N(e@^Qx*sJZbXD*noJIva*v&1QTu|i-K%_=f-0~
z?C9nL{TrIc2NX$4%bws)N%Pv3S|-|STDGybw2HFZwl3?h*}7ziKdM8qAb*dJbpq`<
zoxbxw7Sp=0zf1Qe0rnR?-Y?{;o8iu^=RejnAjp3*acr>Np<i0*32H8FqLtV=AvQiC
z&VRaJV1WN}|Jwon2L>$(^w%EpRDgfXupxo|4@blX+OCvvyJBipdwS|E|H`yeLH_OT
z?E(Ijv3mmSiWzh5JsGv^uQDR+W|@E3zj!LxBQnD5hFJ~mky#UqM7DA@ZQZs-3;!2c
z^MWdQbCPpBuH>8?_XLkC%{6L#X0F?lnVgwp=jPO_LHYRP^o+F3oHTP!V=Kbz%JgKq
z+?l%B|3=Q?z=nO&QaqVs(o)j0T^?6fwr6B|T1K+<KTExKze)8X|E|hR{pW$kjsJP1
zV7a$(WB>D$Dh3Qob*E@-*{&3ihV=S|Z2tF1^#3aL{#~qw3fxW~_aFF=8m}Fi+s01K
z4Ye2K)(CLhFXTp5cDr)MvobEXE5?(NoSEw8f6!!l>Dq07_*heJ>NrKWuAS1FpDP|~
z?k_%dZeUQa>}3CX--5tGvF=f6IXV7^rauy7Z=JE+-*IL_KuBs@dU_pue%`RqL}#Jg
zuKc2|9&e8QXI>>c>gjv_mb2y-wudhKG`Mpem)mZ=Xutj2qJP!s;!aQF=D$bd>fuRA
zPEWIXCQovXlwD)-meRE5>gmaJ=XkP{M~`;fz4ur4UtYW{&_8uqdWd~{^|&^P$(ht;
zxKom?=)QeBCq--Ble2ijif5A9?%Z4t8<{XZBQ4vb(YZ{$y?@Omd)wM-q4AlcJlPq^
zIx23LcYJz!n*Yq&y8)H{v)siTc}2V)J9@)MUD7f<oN`yTIW2B&BJKZk0vN~tbBp)y
zW99WHZ@d%W|6%j{0si${zYeqyZYpWd-|n`z?x+@3a7kVHFDOH_lJd{^|H-=luJsSw
z;R&=q*j3&>y1Syk;hv%a{-MwR669a{;`0G^+`b6EZ{HgMcDDmhmy78W-#0!cx`)-P
vyVWnDdqS@P33l+oH^V%ZH)Tv(>iBftBo@%EF5ULR0~PJ5FNXz<&$9jv)%U_}

diff --git a/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.po b/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.po
index 6ad62c770..ec4fce37a 100644
--- a/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.po
+++ b/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.po
@@ -1,13 +1,14 @@
 # Icinga Web 2 - Head for multiple monitoring backends.
-# Copyright (C) 2014 Icinga Development Team
+# Copyright (C) 2015 Icinga Development Team
 # This file is distributed under the same license as Monitoring Module.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Monitoring Module (2.0.0~alpha4)\n"
 "Report-Msgid-Bugs-To: dev@icinga.org\n"
-"POT-Creation-Date: 2014-12-03 09:10-0200\n"
+"POT-Creation-Date: 2015-02-10 18:04+0100\n"
 "PO-Revision-Date: 2015-02-07 18:41+0100\n"
 "Last-Translator: Davide Demuru <davide.demuru@gmail.com>\n"
 "Language: it_IT\n"
@@ -16,624 +17,726 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.7.3\n"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:278
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:376
 msgid " Down Hosts (Handled)"
 msgstr "Host Down (Gestiti)"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:279
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:377
 msgid " Down Hosts (Unhandled)"
 msgstr "Host Down (Non Gestiti)"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:253
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:300
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:344
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:398
 msgid " Down Services (Handled)"
 msgstr "Servizi Down (Gestiti)"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:254
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:301
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:345
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:399
 msgid " Down Services (Unhandled)"
 msgstr "Servizi Down (Non Gestiti)"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:282
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:380
 msgid " Pending Hosts"
 msgstr "Host in Attesa"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:257
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:304
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:348
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:402
 msgid " Pending Services"
 msgstr "Servizi in Attesa"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:280
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:378
 msgid " Unreachable Hosts (Handled)"
 msgstr "Host Irraggiungibili (Gestiti)"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:281
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:379
 msgid " Unreachable Hosts (Unhandled)"
 msgstr "Host Irraggiungibili (Non Gestiti)"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:255
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:302
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:346
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:400
 msgid " Unreachable Services (Handled)"
 msgstr "Servizi Irraggiungibili (Gestiti)"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:256
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:303
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:347
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:401
 msgid " Unreachable Services (Unhandled)"
 msgstr "Servizi Irraggiungibili (Non Gestiti) "
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:277
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:375
 msgid " Up Hosts"
 msgstr "Host Up"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:297
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:395
 msgid " Up Services"
 msgstr "Servizi Up"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:251
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:298
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:342
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:396
 msgid " Warning Services (Handled)"
 msgstr "Servizi in Warning (Gestiti)"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:252
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:299
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:343
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:397
 msgid " Warning Services (Unhandled)"
 msgstr "Servizi in Warning (Non Gestiti)"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:10
-#, php-format
-msgid "%d Hosts DOWN"
-msgstr "%d Host Down"
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:20
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:52
+#, fuzzy, php-format
+msgid "%d Active"
+msgid_plural "%d Active"
+msgstr[0] "Attivo"
+msgstr[1] "Attivi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:22
-#, php-format
-msgid "%d Hosts PENDING"
-msgstr "%d Host in Attesa"
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:8
+#, fuzzy, php-format
+msgctxt "icinga.state"
+msgid "%d CRITICAL"
+msgid_plural "%d CRITICAL"
+msgstr[0] "CRITICAL"
+msgstr[1] "CRITICAL"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:17
-#, php-format
-msgid "%d Hosts UNREACHABLE"
-msgstr "%d Host Irraggiungibili"
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:40
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:72
+#, fuzzy, php-format
+msgid "%d Disabled"
+msgid_plural "%d Disabled"
+msgstr[0] "Disabilitato"
+msgstr[1] "Disabilitati"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:15
-#, php-format
-msgid "%d Hosts UP"
-msgstr "%d Host Up"
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:10
+#, fuzzy, php-format
+msgid "%d Host DOWN"
+msgid_plural "%d Hosts DOWN"
+msgstr[0] "%d Host Down"
+msgstr[1] "%d Host Down"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:57
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:127
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:197
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:232
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:267
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:20
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:87
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:138
+#, fuzzy, php-format
+msgid "%d Host Disabled"
+msgid_plural "%d Hosts Disabled"
+msgstr[0] "%d host disabilitato"
+msgstr[1] "%d host disabilitati"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:36
+#, fuzzy, php-format
+msgid "%d Host Flapping"
+msgid_plural "%d Hosts Flapping"
+msgstr[0] "%d host instabile"
+msgstr[1] "%d host instabili"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:22
+#, fuzzy, php-format
+msgid "%d Host PENDING"
+msgid_plural "%d Hosts PENDING"
+msgstr[0] "%d Host in Attesa"
+msgstr[1] "%d Host in Attesa"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:17
+#, fuzzy, php-format
+msgid "%d Host UNREACHABLE"
+msgid_plural "%d Hosts UNREACHABLE"
+msgstr[0] "%d Host Irraggiungibile"
+msgstr[1] "%d Host Irraggiungibili"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:15
+#, fuzzy, php-format
+msgid "%d Host UP"
+msgid_plural "%d Hosts UP"
+msgstr[0] "%d Host Up"
+msgstr[1] "%d Host Up"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:252
+#, fuzzy, php-format
+msgctxt "icinga.state"
+msgid "%d PENDING"
+msgid_plural "%d PENDING"
+msgstr[0] "ATTESA"
+msgstr[1] "ATTESA"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:30
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:62
+#, fuzzy, php-format
+msgid "%d Passive"
+msgid_plural "%d Passive"
+msgstr[0] "Passivo"
+msgstr[1] "Passivi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:48
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:107
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:158
+#, fuzzy, php-format
+msgid "%d Service Disabled"
+msgid_plural "%d Services Disabled"
+msgstr[0] "%d servizio disabilitato"
+msgstr[1] "%d servizi disabilitati"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:64
+#, fuzzy, php-format
+msgid "%d Service Flapping"
+msgid_plural "%d Services Flapping"
+msgstr[0] "%d servizio instabile"
+msgstr[1] "%d servizi instabili"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:148
+#, fuzzy, php-format
+msgctxt "icinga.state"
+msgid "%d UNKNOWN"
+msgid_plural "%d UNKNOWN"
+msgstr[0] "UNKNOWN"
+msgstr[1] "UNKNOWN"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:57
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:127
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:197
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:232
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:267
 #, php-format
 msgid "%d are not checked at all"
 msgstr "%d non sono stati controllati"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:32
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:102
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:172
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:32
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:102
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:172
 #, php-format
 msgid "%d are passively checked"
 msgstr "%d sono controllati passivamente"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventgrid.phtml:31
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:10
+#, fuzzy, php-format
+msgid "%d configured service:"
+msgid_plural "%d configured services:"
+msgstr[0] "%s servizio configurato:"
+msgstr[1] "%s servizi configurati:"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:31
 #, php-format
 msgid "%d critical on %s"
 msgstr "%d critici di %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventgrid.phtml:43
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:43
 #, php-format
 msgid "%d down on %s"
 msgstr "%d down di %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:20
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:87
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:138
-#, php-format
-msgid "%d hosts disabled"
-msgstr "%d host disabilitati"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:36
-#, php-format
-msgid "%d hosts flapping"
-msgstr "%d host instabili"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:62
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:132
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:202
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:237
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:272
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:62
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:132
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:202
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:237
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:272
 #, php-format
 msgid "%d is not checked at all"
 msgstr "%d non sono controllati"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:37
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:107
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:177
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:37
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:107
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:177
 #, php-format
 msgid "%d is passively checked"
 msgstr "%d è controllato passivamente"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventgrid.phtml:21
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventgrid.phtml:53
+#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:64
+#, fuzzy, php-format
+msgid "%d more ..."
+msgstr "e %d più"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:21
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:53
 #, php-format
 msgid "%d ok on %s"
 msgstr "%d ok di %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:48
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:107
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:158
-#, php-format
-msgid "%d services disabled"
-msgstr "%d servizi disabilitati"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:64
-#, php-format
-msgid "%d services flapping"
-msgstr "%d servizi instabili"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:105
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:103
 #, php-format
 msgid "%d unhandled service"
 msgid_plural "%d unhandled services"
 msgstr[0] "%d servizio non gestito"
 msgstr[1] "%d servizi non gestiti"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventgrid.phtml:48
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:48
 #, php-format
 msgid "%d unknown on %s"
 msgstr "%d unknown di %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventgrid.phtml:26
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:26
 #, php-format
 msgid "%d unreachable on %s"
 msgstr "%d irraggiungibili di %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventgrid.phtml:37
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:37
 #, php-format
 msgid "%d warning on %s"
 msgstr "%d warning di %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/notifications.phtml:53
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Plugin/Perfdata.php:437
+#, php-format
+msgid "%s %s (%s%%)"
+msgstr ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:40
 #, php-format
 msgctxt "timespan"
 msgid "%s ago"
 msgstr "%s fa"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml:10
-#, php-format
-msgid "%s configured services:"
-msgstr "%s servizi configurati:"
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:29
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:33
+#, fuzzy, php-format
+msgid "%s ago"
+msgstr "%s fa"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:58
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:58
 #, php-format
 msgid "%s has been up and running with PID %d since %s"
-msgstr "%s è stato attivo e funzionante con il PID %d da %s"
+msgstr "%s è in esecuzione con il PID %d da %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:10
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:10
 #, php-format
 msgid "%s hosts:"
 msgstr "%s host:"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/not-running.phtml:5
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/not-running.phtml:5
 #, php-format
 msgid "%s is currently not up and running"
-msgstr "%s non è attualmente attivo."
+msgstr "%s non è in esecuzione."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:65
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:65
 #, php-format
 msgid "%s is not running"
-msgstr "%s non in funzione."
+msgstr "%s non è in esecuzione."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/notifications.phtml:22
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:22
 #, php-format
 msgid "%s notications have been sent for this issue"
 msgstr "%s notifiche inviate per questo problema"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:8
+#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Link.php:52
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:137
+#, fuzzy, php-format
+msgctxt "Service running on host"
+msgid "%s on %s"
+msgstr "%s il %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:8
 #, php-format
 msgid "%s services:"
 msgstr "%s servizi:"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:81
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:112
 #, php-format
 msgid "%u Acknowledged Host Problem"
 msgid_plural "%u Acknowledged Host Problems"
 msgstr[0] "%u Problema dell'Host Confermato"
 msgstr[1] "%u Problemi dell'Host Confermati"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:93
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:100
 #, php-format
 msgid "%u Acknowledged Service Problem"
 msgid_plural "%u Acknowledged Service Problems"
 msgstr[0] "%u Problema del Servizio Confermato"
 msgstr[1] "%u Problemi del Servizio Confermati"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:21
-#, php-format
-msgid "%u Hosts"
-msgstr "%u Host"
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:11
+#, fuzzy, php-format
+msgid "%u Host"
+msgid_plural "%u Hosts"
+msgstr[0] "%u Host"
+msgstr[1] "%u Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:54
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:58
 #, php-format
 msgid "%u Unhandled Host Problem"
 msgid_plural "%u Unhandled Host Problems"
 msgstr[0] "%u Problema dell'Host Non Gestito"
 msgstr[1] "%u Problemi dell'Host Non Gestiti"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:66
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:46
 #, php-format
 msgid "%u Unhandled Service Problem"
 msgid_plural "%u Unhandled Service Problems"
 msgstr[0] "%u Problema del Servizio Non Gestito"
 msgstr[1] "%u Problemi del Servizio Non Gestiti"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:44
-msgid "(hard state)"
-msgstr "(stato hard)"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:42
-msgid "(soft state)"
-msgstr "(stato soft)"
-
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:74
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:73
 msgid "1 Year"
 msgstr "1 Anno"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:75
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:74
 msgid "2 Years"
 msgstr "2 Anni"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:71
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:70
 msgid "3 Months"
 msgstr "3 Mesi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:100
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:99
 msgid "4 Hours"
 msgstr "4 ore"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:72
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:71
 msgid "4 Months"
 msgstr "4 Mesi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:73
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:72
 msgid "8 Months"
 msgstr "8 Mesi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:202
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Plugin/Perfdata.php:437
+#, php-format
+msgid "<b>%s %s</b> (%s%%)"
+msgstr ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:293
 msgid "<b>{title}:</b><br> {value} of {sum} hosts are {label}"
 msgstr "<b>{title}:</b><br> {value} di{sum} host sono {label}"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:150
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:244
 msgid "<b>{title}:</b><br>{value} of {sum} services are {label}"
 msgstr "<b>{title}:</b><br> {value} di{sum} servizi sono {label}"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/notifications.phtml:17
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:17
 #, php-format
 msgid "A notication has been sent for this issue %s ago"
 msgstr "Una notifica è stata inviata per questo problema %s fa"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:64
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:73
 msgid "Ack removed"
 msgstr "Conferma rimossa"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:59
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:35
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:68
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:39
 msgid "Acknowledge"
 msgstr "Conferma"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostController.php:49
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:88
+#, fuzzy, php-format
+msgid "Acknowledge %u unhandled host problem"
+msgid_plural "Acknowledge %u unhandled host problems"
+msgstr[0] "Conferma i problemi non gestiti degli Host"
+msgstr[1] "Conferma i problemi non gestiti degli Host"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:76
+#, fuzzy, php-format
+msgid "Acknowledge %u unhandled service problem"
+msgid_plural "Acknowledge %u unhandled service problems"
+msgstr[0] "Conferma i problemi non gestiti degli Host"
+msgstr[1] "Conferma i problemi non gestiti degli Host"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:69
 msgid "Acknowledge Host Problem"
 msgstr "Conferma il Problema dell'Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostsController.php:143
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:174
 msgid "Acknowledge Host Problems"
 msgstr "Conferma i Problemi dell'Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServiceController.php:49
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:46
 msgid "Acknowledge Service Problem"
 msgstr "Conferma il Problema del Servizio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServicesController.php:163
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:223
 msgid "Acknowledge Service Problems"
 msgstr "Conferma i Problemi del Servizio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/comments.phtml:14
-msgid "Acknowledge all problems on the selected hosts or services"
-msgstr "Conferma tutti i problemi degli host o servizi selezionati"
-
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:24
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:23
 msgid "Acknowledge problem"
 msgid_plural "Acknowledge problems"
-msgstr[0] "Reconhecer o problema"
-msgstr[1] "Reconhecer o problemas"
+msgstr[0] "Conferma il problema"
+msgstr[1] "Conferm i problemi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:70
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:72
-msgid "Acknowledge unhandled problem hosts"
-msgstr "Conferma i problemi non gestiti degli Host"
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:97
+msgid "Acknowledge unhandled host problem"
+msgid_plural "Acknowledge unhandled host problems"
+msgstr[0] "Conferma i problemi non gestiti degli Host"
+msgstr[1] "Conferma i problemi non gestiti degli Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:82
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:84
-msgid "Acknowledge unhandled problem services"
-msgstr "Conferma i problemi non gestiti dei Servizi"
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:85
+msgid "Acknowledge unhandled service problem"
+msgid_plural "Acknowledge unhandled service problems"
+msgstr[0] "Conferma i problemi non gestiti degli Host"
+msgstr[1] "Conferma i problemi non gestiti degli Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:24
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/statusIcons.phtml:30
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:53
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:75
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:16
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:86
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:156
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:16
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:86
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:156
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:12
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:9
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:9
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:53
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:75
 msgid "Acknowledged"
 msgstr "Confermato"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:44
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:39
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:39
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:51
 msgid "Acknowledgement"
 msgstr "Conferma"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:949
-msgid "Acknowledgement has been sent"
-msgstr "Conferma inviata"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:971
-msgid "Acknowledgement removal has been requested"
-msgstr "Rimozione della Conferma in corso"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:62
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:61
 msgid "Acknowledgements"
 msgstr "Problemi Confermati"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:166
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:161
 msgid "Acknowledging problem.."
 msgid_plural "Acknowledging problems.."
-msgstr[0] "Reconhecendo problema.."
-msgstr[1] "Reconhecendo problemas.."
+msgstr[0] "Problema confermato.."
+msgstr[1] "Problemi confermati.."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:20
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:52
-msgid "Active"
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/actions.phtml:44
+msgid "Actions"
 msgstr "Attivo"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/statusIcons.phtml:45
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:70
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:98
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:24
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:24
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:70
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:98
 msgid "Active And Passive Checks Disabled"
 msgstr "Controlli Attivi e Passivi Disabilitati"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:36
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:63
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:131
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:36
 msgid "Active Checks"
 msgstr "Controlli Attivi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/statusIcons.phtml:43
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:72
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:100
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:22
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:22
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:72
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:100
 msgid "Active Checks Disabled"
 msgstr "Controlli Attivi Disabilitati"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:81
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:85
 msgid "Active Host Checks Being Executed"
 msgstr "Esegui Controlli Attivi sugli Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:89
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:94
 msgid "Active Service Checks Being Executed"
 msgstr "Esegui Controlli Attivi sui Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:121
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:121
 msgid "Active checks"
 msgstr "Controlli Attivi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostController.php:58
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:80
 msgid "Add Host Comment"
 msgstr "Aggiungi commento all'Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/createbackend.phtml:1
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/createbackend.phtml:4
 msgid "Add New Backend"
 msgstr "Aggiungi Nuovo Backend"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/createinstance.phtml:1
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/createinstance.phtml:4
 msgid "Add New Instance"
 msgstr "Aggiungi Nuova Istanza"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServiceController.php:58
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:57
 msgid "Add Service Comment"
 msgstr "Aggiungi Commento al Servizio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/comments.phtml:22
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:22
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:21
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:20
 msgid "Add comment"
 msgid_plural "Add comments"
-msgstr[0] "Adicionar comentário"
-msgstr[1] "Adicionar comentários"
+msgstr[0] "Aggiungi Commento"
+msgstr[1] "Aggiungi Commenti"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:93
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:89
 msgid "Adding comment.."
 msgid_plural "Adding comments.."
-msgstr[0] "Adicionando comentário.."
-msgstr[1] "Adicionando comentários.."
+msgstr[0] "Aggiunta commento..."
+msgstr[1] "Aggiunta commenti..."
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:145
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:141
 msgid "Address"
 msgstr "Indirizzo"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:171
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:67
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:195
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:66
 msgid "Alert Summary"
 msgstr "Storico Allarmi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:14
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:11
 msgid "Alert summary"
 msgstr "Storico Allarmi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:376
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:379
 msgid "Alias"
 msgstr "Alias"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:27
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:30
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:28
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:95
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:146
+msgid "All Hosts Enabled"
+msgstr "Tutti gli host abilitati"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:26
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:29
 msgid "All Services"
 msgstr "Tutti i Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:177
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:56
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:115
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:166
+msgid "All Services Enabled"
+msgstr "Tutti i servizi abilitati"
+
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:178
 msgid "All backends are disabled"
 msgstr "Tutti i backend sono disabilitati"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:28
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:95
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:146
-msgid "All hosts enabled"
-msgstr "Tutti gli host abilitati"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:56
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:115
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:166
-msgid "All services enabled"
-msgstr "Tutti i servizi abilitati"
-
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:25
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:16
 msgid "Allow acknowledging host and service problems"
-msgstr "Consenti la Conferma dei problemi si Host e Servizi"
+msgstr "Consente la Conferma dei problemi si Host e Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:9
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:24
+msgid "Allow adding and deleting host and service comments"
+msgstr "Consente la rimozione di Commenti da Host e Servizi"
+
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:8
 msgid "Allow all commands"
-msgstr "Consenti tutti i Comandi"
+msgstr "Consente tutti i Comandi"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:13
-msgid "Allow all scheduling checks and downtimes"
-msgstr "Consenti la Schedulazione di Controlli e Manutenzioni"
-
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:29
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:28
 msgid "Allow commenting on hosts and services"
-msgstr "Consenti l'aggiunta di Commenti su Host e Servizi"
+msgstr "Consente l'aggiunta di Commenti su Host e Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:41
-msgid "Allow removing host and service comments"
-msgstr "Consenti la rimozione di Commenti da Host e Servizi"
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:32
+msgid "Allow deleting host and service comments"
+msgstr "Consente la rimozione di Commenti da Host e Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:45
-msgid "Allow removing host and service downtimes"
-msgstr "Consenti la rimozione di Manutenzioni da Host e Servizi"
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:44
+msgid "Allow deleting host and service downtimes"
+msgstr "Consente la schedulazione di Manutenzioni su Host e Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:37
-msgid "Allow removing problem acknowledgements"
-msgstr "Consenti la rimozione di Conferme"
-
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:33
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:52
 msgid ""
-"Allow removing problem acknowledgements, host and service comments and "
-"downtimes"
+"Allow processing commands for toggling features on an instance-wide basis"
 msgstr ""
-"Permitir a remoção de reconhecimento de problemas, comentários de hosts e de "
-"serviços e paradas"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:17
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:56
+msgid ""
+"Allow processing commands for toggling features on host and service objects"
+msgstr "Consente l'aggiunta di Commenti su Host e Servizi"
+
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:48
+msgid "Allow processing host and service check results"
+msgstr "Consente la schedulazione di Controlli su Host e Servizi"
+
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:20
+msgid "Allow removing problem acknowledgements"
+msgstr "Consente la rimozione di Conferme"
+
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:36
+msgid "Allow scheduling and deleting host and service downtimes"
+msgstr "Consente la schedulazione di Manutenzioni su Host e Servizi"
+
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:12
 msgid "Allow scheduling host and service checks"
-msgstr "Consenti la schedulazione di Controlli su Host e Servizi"
+msgstr "Consente la schedulazione di Controlli su Host e Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:21
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:40
 msgid "Allow scheduling host and service downtimes"
-msgstr "Consenti la schedulazione di Manutenzioni su Host e Servizi"
+msgstr "Consente la schedulazione di Manutenzioni su Host e Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:22
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:21
 msgid "Apply"
 msgstr "Applica"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/removeinstance.phtml:2
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/removeinstance.phtml:5
 msgid "Are you sure you want to remove this instance?"
 msgstr "Sicuro di voler rimuovere l'istanza?"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:308
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:306
 msgid "Author"
 msgstr "Autore"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:36
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:33
 msgid "Average"
 msgstr "Media"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:109
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:109
 msgid "Average services per host"
 msgstr "Media di Servizi per Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:444
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:453
 msgid "Avg (min)"
 msgstr "Media (min)"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ConfigController.php:76
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:75
 #, php-format
 msgid "Backend \"%s\" successfully removed."
 msgstr "Backend \"%s\" rimosso con successo."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:211
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/BackendPage.php:47
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:207
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:45
 msgid "Backend Name"
 msgstr "Nome Backend"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:221
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/BackendPage.php:63
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:217
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:61
 msgid "Backend Type"
 msgstr "Tipo Backend"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:34
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:52
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:34
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:52
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:222
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:34
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:52
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:34
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:52
 msgid "CRITICAL"
 msgstr "CRITICAL"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:8
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:16
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:63
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:16
 msgctxt "icinga.state"
 msgid "CRITICAL"
 msgstr "CRITICAL"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checksource.phtml:3
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml:3
 msgid "Check Source"
 msgstr "Sorgente del Controllo"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:67
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:54
 msgid "Check Time"
 msgstr "Ora del Controllo"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:40
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:51
 msgid "Check attempts"
 msgstr "Tentativi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:49
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:60
 msgid "Check execution time"
 msgstr "Durata"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:55
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:66
 msgid "Check latency"
 msgstr "Latenza"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:38
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:39
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:37
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:38
 msgid "Check now"
 msgstr "Controlla ora"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:95
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:94
 msgid ""
 "Check this to not to validate connectivity with the given Livestatus socket"
 msgstr ""
 "Spunta questa casella per non verificare la connettività con il socket "
 "Livestatus fornito"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/IdoResourcePage.php:95
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:94
 msgid ""
 "Check this to not to validate connectivity with the given database server"
 msgstr ""
 "Spunta questa casella per non verificare la connettività con il database "
 "fornito"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:41
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:39
 msgid "Child Hosts"
 msgstr "Host Figli"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/SecurityConfigForm.php:59
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/SecurityConfigForm.php:58
 msgid ""
 "Comma separated case insensitive list of protected custom variables. Use * "
 "as a placeholder for zero or more wildcard characters. Existance of those "
@@ -643,499 +746,265 @@ msgstr ""
 "Usare * come carattere jolly. Le variabili fornite verranno mostrate ma il "
 "loro contenuto sarà mascherato."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/command.phtml:7
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml:9
 msgid "Command"
 msgstr "Comando"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:65
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php:31
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:64
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php:30
 msgid "Command File"
 msgstr "File del Comando"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:294
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:725
-msgid "Command has been sent, active checks will be disabled"
-msgstr "Comando inviato, i Controlli Attivi saranno disabilitati"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:319
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:745
-msgid "Command has been sent, active checks will be enabled"
-msgstr "Comando inviato, i Controlli Attivi saranno abilitati"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:338
-msgid "Command has been sent, check will be rescheduled"
-msgstr "Comando inviato, il Controllo sarà rischedulato"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:705
-msgid "Command has been sent, checks will be rescheduled"
-msgstr "Comando inviato, i Controlli saranno rischedulati"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:776
-msgid "Command has been sent, event handlers will be disabled"
-msgstr "Comando inviato, il Gestore Eventi sarà disabilitato"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:808
-msgid "Command has been sent, event handlers will be enabled"
-msgstr "Comando inviato, il Gestore Eventi sarà abilitato"
-
-# rivedere
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:841
-msgid "Command has been sent, flap detection will be disabled"
-msgstr "Comando inviato, il controllo di instabilità sarà disabilitato"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:874
-msgid "Command has been sent, flap detection will be enabled"
-msgstr "Comando inviato, il controllo di instabilità sarà abilitato"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1051
-msgid "Command has been sent, monitoring process will restart now"
-msgstr "Comando inviato, il processo di monitoraggio sarà riavviato"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:514
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:542
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:665
-msgid "Command has been sent, notifications will be disabled"
-msgstr "Comando inviato, le notifiche saranno disabilitate"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:572
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:686
-msgid "Command has been sent, notifications will be enabled"
-msgstr "Comando inviato, le notifiche saranno abilitate"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:395
-msgid "Command has been sent, obsessing will be disabled"
-msgstr "Comando inviato, la modalità ossessiva sarà disabilitata"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:429
-msgid "Command has been sent, obsessing will be enabled"
-msgstr "Comando inviato, la modalità ossessiva sarà abilitata"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:496
-msgid "Command has been sent, passive check results will be accepted"
-msgstr "Comando inviato, i risultati dei controlli passivi saranno accettati"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:463
-msgid "Command has been sent, passive check results will be refused"
-msgstr "Comando inviato, i risultati dei controlli passivi saranno ignorati"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1073
-msgid "Command has been sent, performance data processing will be disabled"
-msgstr "Comando inviato, la raccolta dei dati di performance sarà disabilitata"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1095
-msgid "Command has been sent, performance data processing will be enabled"
-msgstr "Comando inviato, la raccolta dei dati di performance sarà abilitata"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1030
-msgid "Command has been sent, process will shut down"
-msgstr "Comando inviato, il processo sarà arrestato"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/contact.phtml:45
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:45
 msgid "Commands"
 msgstr "Comandi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:49
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:39
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:54
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:50
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:70
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:68
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:52
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:48
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:58
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:46
 msgid "Comment"
 msgstr "Commento"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:481
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:486
 msgid "Comment Timestamp"
-msgstr "Ora Commento"
+msgstr "Timestamp Commento"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:483
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:489
 msgid "Comment Type"
 msgstr "Tipo di Commento"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:54
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:63
 msgid "Comment deleted"
 msgstr "Commento rimosso"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:913
-msgid "Comment removal has been requested"
-msgstr "Richesta di rimozione del commento inviata"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:36
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:36
 msgid "Comment was caused by a downtime."
 msgstr "Commento generato da una manutenzione."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:26
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:26
 msgid "Comment was caused by a flapping host or service."
 msgstr "Commento generato da un host o servizio instabile."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:40
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:40
 msgid "Comment was caused by an acknowledgement."
 msgstr "Commento generato dalla conferma di un problema"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:31
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:31
 msgid "Comment was created by an user."
 msgstr "Commento creato da un utente."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:77
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:93
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:77
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:93
 msgid "Comment: "
 msgstr "Commento: "
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:138
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/comments.phtml:2
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:106
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/comments.phtml:6
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:118
-#: /usr/local/icingaweb/modules/monitoring/application/forms/EventOverviewForm.php:67
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:57
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:462
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:157
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:66
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:2
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:56
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:465
 msgid "Comments"
 msgstr "Commenti"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:195
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:196
 #, php-format
 msgid "Configuration for backend %s is disabled"
 msgstr "La configurazione per il backend %s è disabilitata"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:430
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:433
 msgid "Contact Groups"
 msgstr "Gruppi di Contatti"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/contact.phtml:4
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:4
 msgid "Contact details"
 msgstr "Dettagli del Contatto"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:130
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/contacts.phtml:33
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:153
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:33
 msgid "Contactgroups"
 msgstr "Gruppi di contatti"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:142
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/contacts.phtml:14
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:350
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:149
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:14
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:353
 msgid "Contacts"
 msgstr "Contatti"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:53
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:52
 msgid "Could not find any valid monitoring backend resources"
 msgstr ""
 "Não foi possível encontrar nenhum recurso válido de backend de monitoramento"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:41
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:41
 msgid "Create New Instance"
 msgstr "Crea una Nuova Istanza"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:9
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:9
 msgid "Create New Monitoring Backend"
 msgstr "Crea un Nuovo Backend di Monitoraggio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:119
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:167
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:118
+#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:261
 msgid "Critical"
 msgstr "Critical"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:97
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:117
 msgid "Current Downtimes"
 msgstr "Manutenzioni in corso"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:237
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:233
 msgid "Current Host State"
 msgstr "Stato Corrente degli Host"
 
 # rivedere
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:187
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:211
 msgid "Current Incidents"
 msgstr "Problemi Correnti"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:233
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:229
 msgid "Current Service State"
 msgstr "Stato Corrente dei Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:146
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:139
 msgid "Current State"
 msgstr "Stato Corrente"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:588
-msgid "Custom notification has been sent"
-msgstr "Notifica personalizza inviata"
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:178
+msgid "DOWN"
+msgstr ""
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:114
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:58
+msgctxt "icinga.state"
+msgid "DOWN"
+msgstr "DOWN"
+
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:104
 msgid "Database Name"
 msgstr "Nome Database"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:93
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:83
 msgid "Database Resource"
 msgstr "Risorsa Database"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:102
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:92
 msgid "Database Type"
 msgstr "Tipo Database"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:489
-msgid "Defects"
-msgstr "Difetti"
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:651
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:654
+msgid "Day"
+msgstr "Giorno"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:50
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:498
+msgid "Defects"
+msgstr "Problemi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:47
 msgid "Define what should be done with the child hosts of the hosts."
 msgstr "Definire che azione compiere con gli Host figli"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/comments.phtml:13
-msgid "Delay Notifications"
-msgstr "Posticipa Notifiche"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1001
-msgid "Delete Downtime"
-msgstr "Cancella Manutenzione"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1003
-msgid "Delete a single downtime with the id shown above"
-msgstr "Cancella la manutenzione con ID definito"
-
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:58
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:57
 msgid "Delete comment"
 msgstr "Rimuovi Commento"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php:58
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php:57
 msgid "Delete downtime"
 msgstr "Cancella Manutenzione"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:83
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:82
 msgid "Deleting comment.."
 msgstr "Rimozione commento..."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php:83
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php:82
 msgid "Deleting downtime.."
 msgstr "Cancellazione Manutenzione..."
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:282
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:717
-msgid "Disable Active Checks"
-msgstr "Disabilita i Controlli Attivi"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:757
-msgid "Disable Event Handler"
-msgstr "Disabilita il Gestore Eventi"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:820
-msgid "Disable Flapping Detection"
-msgstr "Disabilita il Controllo Instabilità"
-
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:24
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ProcessController.php:94
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:527
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:656
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:23
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:95
 msgid "Disable Notifications"
 msgstr "Disabilita le Notifiche"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1064
-msgid "Disable Performance Data"
-msgstr "Disabilita i Dati di Performance"
-
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:203
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:199
 msgid "Disable This Backend"
 msgstr "Disabilita Backend"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:718
-msgid "Disable active checks for this host and its services."
-msgstr "Disabilita i controlli attivi per questo host e relativi servizi."
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:287
-msgid "Disable active checks for this object."
-msgstr "Disabilita i controlli attivi per questo oggetto."
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:285
-msgid "Disable active checks on a program-wide basis."
-msgstr "Disabilita i controlli attivi sull'intero sistema"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:760
-msgid "Disable event handler for the whole system."
-msgstr "Disabilita il Gestore Eventi sull'intero sistema."
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:762
-msgid "Disable event handler for this object."
-msgstr "Disabilita il Gestore Eventi per questo oggetto."
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:825
-msgid "Disable flapping detection for this object."
-msgstr "Disabilita il Controllo di Instabilità per questo oggetto."
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:823
-msgid "Disable flapping detection on a program-wide basis."
-msgstr "Disabilita il Controllo di Instabilità per l'intero sistema."
-
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:64
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:64
 msgid "Disable notifications for a specific time on a program-wide basis"
 msgstr "Disabilita le notifiche per un periodo specifico sull'intero sistema"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:530
-msgid "Disable notifications on a program-wide basis."
-msgstr "Disabilita le notifiche sull'intero sistema"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:376
-msgid "Disable obsessing on a program-wide basis."
-msgstr "Disabilita la modalità ossessiva su tutto il sistema."
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:444
-msgid "Disable passive checks on a program-wide basis."
-msgstr "Disabilita i controlli passivi sull'intero sistema"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1065
-msgid "Disable processing of performance data on a program-wide basis."
-msgstr "Disabilita la raccolta dei dati di performance sull'intero sistema"
-
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:66
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:66
 msgid "Disable temporarily"
 msgstr "Disabilita Temporaneamente"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:40
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:72
-msgid "Disabled"
-msgstr "Disabilitato"
-
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:70
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:68
 msgid "Disabling host and service notifications.."
 msgstr "Disabilazione Notifiche di Host e Servizi in corso..."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:44
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:42
 msgid "Do nothing with child hosts"
 msgstr "Non applicare agli Host figli"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:140
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:217
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:139
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:308
 msgid "Down"
 msgstr "Down"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:35
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:35
 msgid "Downtime"
 msgstr "Manutenzione"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:114
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:89
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:115
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:88
 msgid "Downtime End"
 msgstr "Fine Manutenzione"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:109
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:84
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:110
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:83
 msgid "Downtime Start"
 msgstr "Inizio Manutenzione"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1010
-msgid "Downtime removal has been requested"
-msgstr "Cancellazione della Manutenzione in corso"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:644
-msgid "Downtime removal requested"
-msgstr "Richiesta di cancellazione Manutenzione"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:74
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:83
 msgid "Downtime removed"
 msgstr "Manutenzione cancellata"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:607
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:625
-msgid "Downtime scheduling requested"
-msgstr "Schedulazione di Manutenzione richiesta"
-
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:134
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/downtime.phtml:2
-#: /usr/local/icingaweb/modules/monitoring/application/forms/EventOverviewForm.php:57
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:279
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:161
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:56
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:2
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:275
 msgid "Downtimes"
 msgstr "Manutenzioni"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:313
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:311
 msgid "Duration"
 msgstr "Durata"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/editbackend.phtml:1
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/editbackend.phtml:4
 msgid "Edit Existing Backend"
 msgstr "Modifica Backend Esistenti"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/editinstance.phtml:1
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/editinstance.phtml:4
 msgid "Edit Existing Instance"
 msgstr "Modifica Istanze Esistenti"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/contact.phtml:22
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/contacts.phtml:28
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:377
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:22
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:24
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:380
 msgid "Email"
 msgstr "Email"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:309
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:737
-msgid "Enable Active Checks"
-msgstr "Abilita Controlli Attivi"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:789
-msgid "Enable Event Handler"
-msgstr "Abilita Gestore Eventi"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:853
-msgid "Enable Flapping Detection"
-msgstr "Abilita il Controllo Instabilità"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:557
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:677
-msgid "Enable Notifications"
-msgstr "Abilita Notifiche"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1086
-msgid "Enable Performance Data"
-msgstr "Abilita i Dati di Performance"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:738
-msgid "Enable active checks for this host and its services."
-msgstr "Abilita i controlli attivi per questo host e relativi servizi"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:313
-msgid "Enable active checks for this object."
-msgstr "Abilita i controlli attivi per questo oggetto"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:311
-msgid "Enable active checks on a program-wide basis."
-msgstr "Abilita i controlli attivi sull'intero sistema"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:794
-msgid "Enable event handler for this object."
-msgstr "Abilita il gestore eventi per questo oggetto."
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:792
-msgid "Enable event handlers on the whole system."
-msgstr "Abilita il gestore eventi sull'intero sistema."
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:858
-msgid "Enable flapping detection for this object."
-msgstr "Abilita il controllo di instabilità per questo oggetto."
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:856
-msgid "Enable flapping detection on a program-wide basis."
-msgstr "Abilita il controllo di instabilità su tutto il sistema."
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:560
-msgid "Enable notifications on a program-wide basis."
-msgstr "Abilita le notifiche sull'intero sistema."
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:410
-msgid "Enable obsessing on a program-wide basis."
-msgstr "Abilita la modalità ossessiva su tutto il sistema."
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:478
-msgid "Enable passive checks on a program-wide basis."
-msgstr "Abilita i controlli passivi sull'intero sistema."
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1087
-msgid "Enable processing of performance data on a program-wide basis."
-msgstr ""
-"Habilitar processamento de dados de performance na base de todo o programa."
-
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:94
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:310
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:91
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:308
 msgid "End Time"
 msgstr "Ora Fine"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:72
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:71
 msgid "Ended downtimes"
 msgstr "Manutenzioni completate"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:167
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:162
 msgid ""
 "Enter here the duration of the downtime. The downtime will be automatically "
 "deleted after this time expired."
@@ -1143,7 +1012,7 @@ msgstr ""
 "Inserire qui la durata della manutenzione. Icinga cancellerà automaticamente "
 "la manutenzione allo scadere del tempo."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:96
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:93
 msgid ""
 "Enter the expire date and time for this acknowledgement here. Icinga will "
 "delete the acknowledgement after this time expired."
@@ -1151,304 +1020,262 @@ msgstr ""
 "Inserire qui la durata della conferma del problema. Icinga cancellerà "
 "automaticamente la conferma allo scadere del tempo."
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:307
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:305
 msgid "Entry Time"
 msgstr "Ora Inserimento"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:153
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:389
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:177
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:392
 msgid "Event Grid"
 msgstr "Griglia Eventi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:68
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:65
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:133
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:72
 msgid "Event Handler"
 msgstr "Gestore Eventi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:97
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:124
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:126
+msgid "Event Handlers"
+msgstr "Gestore Eventi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:103
 msgid "Event Handlers Enabled"
 msgstr "Gestore Eventi Abilitato"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:158
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:589
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:182
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:604
 msgid "Event Overview"
 msgstr "Panoramica Eventi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:124
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:126
-msgid "Event handlers"
-msgstr "Gestori Eventi"
-
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:157
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:181
 msgid "Events"
 msgstr "Eventi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:128
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:128
 msgid "Execution time"
 msgstr "Tempo di Esecuzione"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:484
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:490
 msgid "Expiration"
 msgstr "Scadenza"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:52
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:92
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:90
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:50
 msgid "Expire Time"
 msgstr "Ora Scadenza"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:34
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:43
 msgid "Expires"
 msgstr "Scade"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:15
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:15
 msgid "Feature Commands"
 msgstr "Controllo Funzionalità"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:114
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:110
 msgid "Fixed"
 msgstr "Rigido"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:76
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:66
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:134
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:81
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:6
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:8
 msgid "Flap Detection"
 msgstr "Controllo Instabilità"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:105
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:112
 msgid "Flap Detection Enabled"
-msgstr "Controllo Instbilità Attivato"
+msgstr "Controllo Instabilità Attivato"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:6
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:8
-msgid "Flap detection"
-msgstr "Controllo Instabilità"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:79
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:57
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:54
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:81
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:25
-#: /usr/local/icingaweb/modules/monitoring/application/forms/EventOverviewForm.php:87
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:86
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:88
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:25
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:61
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:57
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:81
 msgid "Flapping"
 msgstr "Instabile"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:59
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:66
 msgid "Flapping Stopped"
 msgstr "Instabilità Terminata"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:84
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:93
 msgid "Flapping stopped"
 msgstr "Instabilità Terminata"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:115
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:111
 msgid "Flexible"
 msgstr "Flessibile"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:164
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:160
 msgid "Flexible Duration"
 msgstr "Durata Flessibile"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:76
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:65
 msgid "Force Check"
 msgstr "Forza Controllo"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:68
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:67
 msgid "From"
 msgstr "Da"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:48
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:48
 msgid "Global Host Event Handler"
 msgstr "Gestore Eventi Host Globale"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:42
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:42
 msgid "Global Service Event Handler"
 msgstr "Gestore Eventi Servizi Globale"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:39
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:39
 msgid "Handled hosts with state DOWN"
 msgstr "Host Gestiti con stato DOWN"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:64
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:64
 msgid "Handled hosts with state UNREACHABLE"
 msgstr "Host Gestiti con stato IRRAGGIUNGIBILE"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml:68
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:64
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:68
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:64
 #, php-format
 msgid "Handled services with state %s"
 msgstr "Servizi Gestiti con stato %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:147
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:235
-msgid "Hard State"
-msgstr "Stato Hard"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:52
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:51
 msgid "Hard state changes"
 msgstr "Cambi di stato Hard"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:150
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:72
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ShowController.php:235
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:219
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:174
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:209
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:69
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:235
 msgid "History"
 msgstr "Storico"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/partials/command-form.phtml:9
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:32
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ShowController.php:205
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:106
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:189
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:96
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:179
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:31
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml:12
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:303
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:487
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:205
 msgid "Host"
 msgstr "Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:306
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:482
-msgid "Host / Service"
-msgstr "Host / Servizio"
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml:21
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml:6
+#, fuzzy, php-format
+msgid "Host (%u)"
+msgid_plural "Hosts (%u)"
+msgstr[0] "Host (%u)"
+msgstr[1] "Host (%u)"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:239
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:235
 msgid "Host Address"
 msgstr "Indirizzo Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:134
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:156
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:134
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:156
 msgid "Host Checks"
-msgstr "Controlli dell'Host"
+msgstr "Controlli Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:25
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:25
 msgid "Host Group"
 msgstr "Gruppo di Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:574
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:589
 msgid "Host Group Name"
 msgstr "Nome del Gruppo di Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:542
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:554
 msgid "Host Groups"
 msgstr "Gruppi di Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:238
-msgid "Host Name"
-msgstr "Nome Host"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:380
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:383
 msgid "Host Notification Timeperiod"
 msgstr "Periodo delle Notifiche per l'Host"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:89
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:197
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:105
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:221
 msgid "Host Problems"
-msgstr "Problemi dell'Host"
+msgstr "Host con Problemi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:236
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:232
 msgid "Host Severity"
 msgstr "Impatto Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:57
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:125
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostsController.php:123
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServicesController.php:143
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:63
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:153
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:84
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:202
 msgid "Host State"
 msgstr "Stato Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/disable-notifications.phtml:8
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:2
+msgid "Host and Service Checks"
+msgstr "Controlli per Host o Servizi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/disable-notifications.phtml:8
 msgid "Host and service notifications are already disabled."
 msgstr "Notifiche per Host e Servizi sono già disabilitate"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostController.php:29
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:33
 msgid "Host not found"
 msgstr "Host non trovato"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/contacts.phtml:47
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:43
 msgid "Host notification period"
 msgstr "Periodo di Notifica per l'Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ShowController.php:41
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:40
 msgid "Host or service not found"
 msgstr "Host o Servizio non trovato"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:2
-msgid "Host- and Servicechecks"
-msgstr "Controlli per Host o Servizi"
-
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:68
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:126
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml:13
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:84
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:145
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml:13
 msgid "Hostgroups"
 msgstr "Gruppi di Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:144
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:629
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:140
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:234
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:646
 msgid "Hostname"
 msgstr "Nome Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:34
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:33
 msgid "Hostname or address of the remote Icinga instance"
 msgstr "Nome Host o Indirizzo dell'istanza remota di Icinga"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:66
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:110
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/contact.phtml:33
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:85
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/objectlist.phtml:37
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/summary.phtml:5
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:7
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:102
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:205
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:110
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostsController.php:49
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:82
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:133
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:101
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:7
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:33
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:85
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:296
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:75
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:103
 msgid "Hosts"
 msgstr "Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:9
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:25
-#, php-format
-msgid "Hosts (%u)"
-msgstr "Host (%u)"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:11
-msgid "Hosts Down Handled"
-msgstr "Host Down Gestiti"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:8
-msgid "Hosts Down Unhandled"
-msgstr "Host Down Non Gestiti"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:24
-msgid "Hosts Pending"
-msgstr "Host in Attesa"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:19
-msgid "Hosts Unreachable Handled"
-msgstr "Host Irraggiungibili Gestiti"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:16
-msgid "Hosts Unreachable Unhandled"
-msgstr "Host Irraggiungibili Non Gestiti"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:3
-msgid "Hosts Up"
-msgstr "Host Up"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:96
-msgid "Hosts in downtime"
-msgstr "Host in Manutenzione"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:79
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:79
 msgid "Hosts with state PENDING"
 msgstr "Host in stato ATTESA"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:18
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:18
 msgid "Hosts with state UP"
 msgstr "Host in stato UP"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:144
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:648
+msgid "Hour"
+msgstr "Ore"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:140
 msgid "Hours"
 msgstr "Ore"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/SecurityStep.php:48
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:44
 msgid ""
 "Icinga Web 2 will protect your monitoring environment against prying eyes "
 "using the configuration specified below:"
@@ -1456,7 +1283,7 @@ msgstr ""
 "Icinga Web 2 proteggerà il tuo ambiente di monitoraggio da occhi indiscreti "
 "usando la configurazione specificata qui sotto:"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:86
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:76
 #, php-format
 msgid ""
 "Icinga Web 2 will retrieve information from your monitoring environment "
@@ -1465,7 +1292,7 @@ msgstr ""
 "Icinga Web 2 recupererà le informazioni dal tuo ambiente di monitoraggio "
 "usando il backend chiamato \"%s\" e le risorse spacificate qui sotto:"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/InstanceStep.php:79
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:75
 #, php-format
 msgid ""
 "Icinga Web 2 will use the named pipe located at \"%s\" to send commands to "
@@ -1474,7 +1301,7 @@ msgstr ""
 "Icinga Web 2 utilizzerà la pipe situata in \"%s\" per inviare comandi alla "
 "vostra istanza di monitoraggio."
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/InstanceStep.php:52
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:48
 #, php-format
 msgid ""
 "Icinga Web 2 will use the named pipe located on a remote machine at \"%s\" "
@@ -1485,11 +1312,11 @@ msgstr ""
 "comandi alla vostra istanza di monitoraggio utilizzando i dettagli per la "
 "connessione descritti qui sotto:"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:80
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:77
 msgid "If the acknowledgement should expire, check this option."
 msgstr "Se la Conferma del Problema deve scadere, spuntare questa casella."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:134
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:129
 msgid ""
 "If you do not want an acknowledgement notification to be sent out to the "
 "appropriate contacts, uncheck this option."
@@ -1497,7 +1324,7 @@ msgstr ""
 "In caso non si voglia inviare una Notifica di Conferma ai contatti "
 "configurati, deselezionare questa opzione."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/removeinstance.phtml:3
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/removeinstance.phtml:6
 msgid ""
 "If you have still any environments or views referring to this instance, you "
 "won't be able to send commands anymore after deletion."
@@ -1505,7 +1332,7 @@ msgstr ""
 "In caso qualche altro ambiente o vista faccia riferimento a questa istanza, "
 "non sarà più possibile inviare comandi dopo la cancellazione."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:108
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:104
 msgid ""
 "If you select the fixed option, the downtime will be in effect between the "
 "start and end times you specify whereas a flexible downtime starts when the "
@@ -1520,7 +1347,7 @@ msgstr ""
 "specificata). Il campi della Durata non avranno effetto sulle Manutenzioni "
 "Rigide."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:79
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:67
 msgid ""
 "If you select this option, Icinga will force a check regardless of both what "
 "time the scheduled check occurs and whether or not checks are enabled."
@@ -1528,7 +1355,7 @@ msgstr ""
 "Selezionando questa opzione, Icinga forzerà l'esecuzione del controllo "
 "ignorando se controlli attivi sono disabilitati e gli orari di schedulazione."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:67
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:63
 msgid ""
 "If you uncheck this option, the comment will automatically be deleted the "
 "next time Icinga is restarted."
@@ -1536,7 +1363,7 @@ msgstr ""
 "Slezionando questa opzione il commento verrà automaticamente rimosso al "
 "prossimo riavvio di Icinga."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:121
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:117
 msgid ""
 "If you want the acknowledgement to disable notifications until the host or "
 "service recovers, check this option."
@@ -1544,9 +1371,9 @@ msgstr ""
 "Selezionando questa opzione le notifiche verranno disabilitate fino al "
 "ripristino dell'host o servizio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:57
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:53
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:73
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:70
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:54
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:50
 msgid ""
 "If you work with other administrators, you may find it useful to share "
 "information about the the host or service that is having problems. Make sure "
@@ -1556,7 +1383,7 @@ msgstr ""
 "informazioni riguardo l'host e i servizi che stanno avendo problemi. "
 "Assicurati di inserire una breve descrizione delle azioni che stai svolgendo."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:70
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:66
 msgid ""
 "If you would like the comment to remain even when the acknowledgement is "
 "removed, check this option."
@@ -1564,66 +1391,70 @@ msgstr ""
 "Selezionando questa opzione il commento rimarrà anche dopo la fine della "
 "Conferma del Problema."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:69
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/statusIcons.phtml:38
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:65
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:49
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:89
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:78
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:17
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:17
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:56
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:65
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:89
 msgid "In Downtime"
 msgstr "In Manutenzione"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:46
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:145
+msgid ""
+"In case it's desired that a TCP connection is being used by Icinga Web 2 to "
+"access a Livestatus interface, the Sockets module for PHP is required."
+msgstr ""
+"Nel caso si desidera usare uan connessione TCP per permettere a Icinga Web 2 "
+"diaccedere all'interfaccia Livestatus, è richiesto il modulo sockets di PHP."
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:46
 msgid "Instance"
 msgstr "Istanza"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:161
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:160
 #, php-format
 msgid "Instance \"%s\" created successfully."
 msgstr "Istanza \"%s\" creata con successo."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:164
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:163
 #, php-format
 msgid "Instance \"%s\" edited successfully."
 msgstr "Istanza \"%s\" modificata con successo."
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ConfigController.php:108
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:107
 #, php-format
 msgid "Instance \"%s\" successfully removed."
 msgstr "Istanza \"%s\" rimossa con successo."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:192
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:191
 msgid "Instance Name"
 msgstr "Nome Istanza"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:201
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:200
 msgid "Instance Type"
 msgstr "Tipo Istanza"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:75
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:74
 msgid "Instance already exists"
 msgstr "Istanza già esistente"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:116
-#, php-format
-msgid "Instance is not configured: %s"
-msgstr "Istanza non configurata: %s"
-
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:72
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:120
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:139
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:71
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:119
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:138
 msgid "Instance name missing"
 msgstr "Nome istanza mancante"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:51
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:50
 #, php-format
 msgid "Invalid instance type \"%s\" given"
 msgstr "Tipo \"%s\" di Istanza non valido"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:305
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:302
 msgid "Is In Effect"
-msgstr "E' in Corso"
+msgstr "In Corso"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/WelcomePage.php:47
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/WelcomePage.php:42
 msgid ""
 "It offers various status and reporting views with powerful filter "
 "capabilities that allow you to keep track of the most important events in "
@@ -1633,141 +1464,327 @@ msgstr ""
 "specifici per permettere di tenere traccia degli eventi più importanti degli "
 "eventi di monitoraggio."
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:142
+#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
+msgid "Label"
+msgstr "Etichetta"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:142
 msgid "Last Check"
 msgstr "Ultimo controllo"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:32
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:32
 msgid "Last External Command Check"
 msgstr "Ultimo Comando Esterno"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:240
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:236
 msgid "Last Host Check"
 msgstr "Ultimo Controllo dell'Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:36
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:36
 msgid "Last Log File Rotation"
 msgstr "Ultima Rotazione del File di Log"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:24
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:24
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:24
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:24
 msgid "Last Problem"
 msgstr "Ultimo Problema"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:231
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:231
 msgid "Last Service Check"
 msgstr "Ultimo Controllo del Servizio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:28
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:28
 msgid "Last Status Update"
 msgstr "Ultimo Aggiornamento di Stato"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:24
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:18
 msgid "Last check"
 msgstr "Ultimo Controllo"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:127
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:127
 msgid "Latency"
 msgstr "Latenza"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/timeline/index.phtml:16
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:16
 msgid "Legend"
 msgstr "Legenda"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/command/list.phtml:1
-msgid "List Of Supported Commands"
-msgstr "Lista dei Comandi Supportati"
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:116
+#, fuzzy, php-format
+msgid "List %s service problem on host %s"
+msgid_plural "List %s service problems on host %s"
+msgstr[0] "Problemi dei Servizi dell'Host"
+msgstr[1] "Problemi dei Servizi degli Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:27
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:28
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/objectlist.phtml:49
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:38
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:39
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:148
+#, php-format
+msgid "List %s service with status critical handled in service group %s"
+msgid_plural ""
+"List %s services with status critical handled in service group %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:126
+#, php-format
+msgid "List %s service with status critical unhandled in service group %s"
+msgid_plural ""
+"List %s Services with status critical unhandled in service group %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:101
+#, php-format
+msgid "List %s service with status ok in service group %s"
+msgid_plural "List %s Services with status ok in service group %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:273
+#, php-format
+msgid "List %s service with status pending in service group %s"
+msgid_plural "List %s services with status pending in service group %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:198
+#, php-format
+msgid "List %s service with status unknown handled in service group %s"
+msgid_plural "List %s services with status unknown handled in service group %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:176
+#, php-format
+msgid "List %s service with status unknown unhandled in service group %s"
+msgid_plural ""
+"List %s services with status unknown unhandled in service group %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:248
+#, php-format
+msgid "List %s service with status warning handled in service group %s"
+msgid_plural "List %s services with status warning handled in service group %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:226
+#, php-format
+msgid "List %s service with status warning unhandled in service group %s"
+msgid_plural ""
+"List %s services with status warning unhandled in service group %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:155
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:164
+#, fuzzy, php-format
+msgid "List %u host comment"
+msgid_plural "List %u host comments"
+msgstr[0] "Aggiungi commento all'Host"
+msgstr[1] "Aggiungi commento all'Host"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:139
+#, php-format
+msgid "List %u host currently in downtime"
+msgid_plural "List %u hosts currently downtime"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:130
+#, fuzzy, php-format
+msgid "List %u host which is in downtime"
+msgid_plural "List %u hosts which are in downtime"
+msgstr[0] "Host in Manutenzione"
+msgstr[1] "Host in Manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:140
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:149
+#, fuzzy, php-format
+msgid "List %u service comment"
+msgid_plural "List %u service comments"
+msgstr[0] "Aggiungi Commento al Servizio"
+msgstr[1] "Aggiungi Commento al Servizio"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:117
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:125
+#, fuzzy, php-format
+msgid "List %u service currently in downtime"
+msgid_plural "List %u services currently in downtime"
+msgstr[0] "Servizi in manutenzione"
+msgstr[1] "Servizi in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:148
+#, php-format
+msgid "List %u service with status critical handled in host group %s"
+msgid_plural "List %u services with status critical handled in host group %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:126
+#, php-format
+msgid "List %u service with status critical unhandled in host group %s"
+msgid_plural "List %u services with status critical unhandled in host group %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:101
+#, php-format
+msgid "List %u service with status ok in host group %s"
+msgid_plural "List %u services with status ok in host group %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:273
+#, php-format
+msgid "List %u service with status pending in host group %s"
+msgid_plural "List %u services with status pending in host group %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:198
+#, php-format
+msgid "List %u service with status unknown handled in host group %s"
+msgid_plural "List %u services with status unknown handled in host group %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:176
+#, php-format
+msgid "List %u service with status unknown unhandled in host group %s"
+msgid_plural "List %u services with status unknown unhandled in host group %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:248
+#, php-format
+msgid "List %u service with status warning handled in host group %s"
+msgid_plural "List %u services with status warning handled in host group %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:226
+#, php-format
+msgid "List %u service with status warning unhandled in host group %s"
+msgid_plural "List %u services with status warning unhandled in host group %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:11
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:24
 msgid "List all"
 msgstr "Mostra tutto"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/objectlist.phtml:52
-msgid "List all selected objects"
-msgstr "Mostra tutti gli oggetti selezionati"
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:21
+#, fuzzy, php-format
+msgid "List all %u hosts"
+msgstr "Mostra tutto"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:128
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:10
+#, fuzzy, php-format
+msgid "List all %u services"
+msgstr "Totale dei Servizi"
+
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:118
 msgid "Livestatus Resource"
 msgstr "Risorsa Livestatus"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:58
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:58
 msgid "Local"
 msgstr "Locale"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:203
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:202
 msgid "Local Command File"
-msgstr "File dei Comandi Locale"
+msgstr "Command File Locale"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:453
+#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
+msgid "Max"
+msgstr "Massimo"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:462
 msgid "Max (min)"
-msgstr "Max (min)"
+msgstr "Massimo (min)"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:154
+#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
+msgid "Min"
+msgstr "Minuti"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:150
 msgid "Minutes"
 msgstr "Minuti"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:14
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/BackendPage.php:23
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:82
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:72
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:14
 msgid "Monitoring Backend"
 msgstr "Backend di Monitoraggio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:3
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:22
+msgctxt "setup.page.title"
+msgid "Monitoring Backend"
+msgstr "Backend di Monitoraggio"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:3
 msgid "Monitoring Backends"
 msgstr "Backend di Monitoraggio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:2
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:2
 msgid "Monitoring Features"
 msgstr "Proprietà del Monitoraggio"
 
 # rivdere
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:179
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ProcessController.php:26
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ProcessController.php:37
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:203
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:25
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:36
 msgid "Monitoring Health"
 msgstr "Configurazioni Globali"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/IdoResourcePage.php:31
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:30
+msgctxt "setup.page.title"
 msgid "Monitoring IDO Resource"
 msgstr "Risorsa IDO del Monitoraggio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/InstancePage.php:23
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/InstanceStep.php:46
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:42
 msgid "Monitoring Instance"
 msgstr "Istanza di Monitoraggio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:38
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/InstancePage.php:22
+msgctxt "setup.page.title"
+msgid "Monitoring Instance"
+msgstr "Istanza di Monitoraggio"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:38
 msgid "Monitoring Instances"
 msgstr "Istanze di Monitoraggio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:31
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:30
+msgctxt "setup.page.title"
 msgid "Monitoring Livestatus Resource"
 msgstr "Risorsa Livestatus di Monitoraggio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/SecurityPage.php:23
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/SecurityStep.php:45
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:41
 msgid "Monitoring Security"
-msgstr "Sicurezza del Monitoraggio"
+msgstr "Sicurezza "
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:146
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/SecurityPage.php:22
+msgctxt "setup.page.title"
+msgid "Monitoring Security"
+msgstr "Sicurezza"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:143
 #, php-format
 msgid "Monitoring backend \"%s\" has been successfully changed"
 msgstr "Backend di monitoraggio \"%s\" modificato con successo"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:143
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:140
 #, php-format
 msgid "Monitoring backend \"%s\" has been successfully created"
 msgstr "Backend di monitoraggio \"%s\" creato con successo"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:77
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:76
 msgid "Monitoring backend already exists"
 msgstr "Backend di monitoraggio già esistente"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:156
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:146
 #, php-format
 msgid ""
 "Monitoring backend configuration could not be written to: %s; An error "
@@ -1776,20 +1793,20 @@ msgstr ""
 "Impossibile scrivere la configurazione del backend di monitoraggio in: %s; "
 "Errore:"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:151
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:141
 #, php-format
 msgid "Monitoring backend configuration has been successfully written to: %s"
 msgstr ""
 "La configurazione del backend di monitoraggio è stata salvata con successo "
 "in: %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:75
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:122
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:172
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:74
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:121
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:167
 msgid "Monitoring backend name missing"
 msgstr "Nome del backend di monitoraggio mancante"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/InstanceStep.php:97
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:93
 #, php-format
 msgid ""
 "Monitoring instance configuration could not be written to: %s; An error "
@@ -1798,14 +1815,14 @@ msgstr ""
 "Impossibile scrivere la configurazione dell'istanza di monitoraggio in: %s; "
 "Errore:"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/InstanceStep.php:92
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:88
 #, php-format
 msgid "Monitoring instance configuration has been successfully created: %s"
 msgstr ""
 "La configurazione dell'istanza di monitoraggio è stata salvata con successo "
 "in: %s"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/SecurityStep.php:75
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:71
 #, php-format
 msgid ""
 "Monitoring security configuration could not be written to: %s; An error "
@@ -1814,360 +1831,336 @@ msgstr ""
 "Impossibile scrivere la configurazione di sicurezza del monitoraggio in: %s; "
 "Errore:"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/SecurityStep.php:70
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:66
 #, php-format
 msgid "Monitoring security configuration has been successfully created: %s"
 msgstr ""
 "La configurazione di sicurezza del monitoraggio è stata scritta con successo "
 "in: %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:39
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:45
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:51
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:657
+msgid "Month"
+msgstr "3 Mesi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:39
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:45
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:51
 msgid "N/A"
 msgstr "N/A"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:375
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:378
 msgid "Name"
 msgstr "Nome"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:98
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:97
 msgid "New instance name missing"
 msgstr "Nome nuova istanza mancante"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:100
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:99
 msgid "New monitoring backend name missing"
 msgstr "Nome del nuovo backend di monitoraggio mancante"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/SecurityConfigForm.php:32
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/SecurityConfigForm.php:31
 msgid "New security configuration has successfully been stored"
 msgstr ""
 "La nuova configurazione di sicurezza del monitoraggio è stata salvata con "
 "successo."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:31
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:27
 msgid "Next check"
 msgstr "Prossimo Controllo"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegrid.phtml:18
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:23
 msgid "No Services matching the filter"
 msgstr "Nessun Servizio soddisfa i criteri di ricerca"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:18
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:25
 msgid "No active downtimes"
 msgstr "Nessuna Manutenzione in corso"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:175
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:176
 msgid "No backend has been configured"
 msgstr "Nessun backend configurato"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:14
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:14
 msgid "No comments matching the filter"
 msgstr "Nessun commento soddisfa i criteri di ricerca"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:188
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:189
 #, php-format
 msgid "No configuration for backend %s"
 msgstr "Nessuna configurazione per il backend %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/contactgroups.phtml:11
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/contacts.phtml:16
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:12
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contactgroups.phtml:11
 msgid "No contacts matching the filter"
 msgstr "Nessun contatto soddisfa i criteri di ricerca"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:10
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:24
 msgid "No history available for this object"
 msgstr "Storico non disponibile per questo oggetto"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:19
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:26
 msgid "No history events matching the filter"
 msgstr "Nessun evento dello storico soddisfa i criteri di ricerca"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:17
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:17
 msgid "No host groups matching the filter"
 msgstr "Nessun gruppo di host soddisfa i criteri di ricerca"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:27
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:6
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/host.phtml:13
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:6
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:27
 msgid "No hosts matching the filter"
 msgstr "Nessun host soddisfa i criteri di ricerca"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:125
-msgid "No instances are configured yet"
-msgstr "Nessuna istanza ancora configurata"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/notifications.phtml:31
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:31
 msgid "No notification has been sent for this issue"
 msgstr "Nessuna notifica è stata inviata per questo problema"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/contact.phtml:58
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:58
 msgid "No notifications have been sent for this contact"
 msgstr "Nessuna notifica è stata inviata a questo contatto"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/notifications.phtml:29
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:21
 msgid "No notifications matching the filter"
 msgstr "Nessuna notifica soddisfa i criteri di ricerca"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:17
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:17
 msgid "No service groups matching the filter"
 msgstr "Nessun gruppo di servizi soddisfa i criteri di ricerca"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml:12
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:12
 msgid "No services configured on this host"
 msgstr "Nessun servizio configurato per questo host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:38
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/service.phtml:17
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:6
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:6
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:39
 msgid "No services matching the filter"
 msgstr "Nessun servizio soddisfa i criteri di ricerca"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventgrid.phtml:69
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:69
 msgid "No state changes in the selected time period."
 msgstr "Nessun cambio di stato nel periodo di tempo selezionato"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/contact.phtml:10
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:10
 msgid "No such contact"
 msgstr "Nessun contatto trovato"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/SecurityStep.php:59
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:55
 msgid "None"
 msgstr "Niente"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:29
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:23
 msgid "Not acknowledged"
 msgstr "Non Confermato"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:34
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:34
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:47
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:41
 msgid "Notification"
 msgstr "Notifica"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:341
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:344
 msgid "Notification Start"
 msgstr "Partenza Notifica"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:988
-msgid "Notification delay has been requested"
-msgstr "Posticipo di Notifica richiesta"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/notifications.phtml:10
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:73
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:75
-#: /usr/local/icingaweb/modules/monitoring/application/forms/EventOverviewForm.php:77
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:60
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:345
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:435
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:473
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:480
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:47
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:328
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:64
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:132
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:165
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:76
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:63
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:73
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:75
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:10
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:46
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:329
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:346
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:444
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:482
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:489
 msgid "Notifications"
 msgstr "Notifiche"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/statusIcons.phtml:34
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:61
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:85
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:13
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:13
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:61
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:85
 msgid "Notifications Disabled"
 msgstr "Notifiche Disabilitate"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:113
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:121
 msgid "Notifications Enabled"
 msgstr "Notifiche Abilitate"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:18
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:15
 msgid "Notifications and Problems"
 msgstr "Notifiche e Problemi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:657
-msgid "Notifications for this host and its services will be disabled."
-msgstr "Le notifiche per questo host e relativi servizi saranno disabilitate"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:678
-msgid "Notifications for this host and its services will be enabled."
-msgstr "Le notifiche per questo host e relativi servizi saranno abilitate"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:532
-msgid "Notifications for this object will be disabled."
-msgstr "Le notifiche per questo oggetto saranno disabilitate"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:562
-msgid "Notifications for this object will be enabled."
-msgstr "Le notifiche per questo oggetto saranno abilitate"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/contact.phtml:52
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:52
 msgid "Notifications sent to this contact"
 msgstr "Notifiche inviate a questo contatto"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:70
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:73
 #, php-format
 msgid "Notifications will be re-enabled in <strong>%s</strong>"
 msgstr "Le notifiche saranno riabilitate in <strong>%s</strong>"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/disable-notifications.phtml:11
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/disable-notifications.phtml:11
 #, php-format
 msgid "Notifications will be re-enabled in <strong>%s</strong>."
 msgstr "Le notifiche saranno riabilitate in <strong>%s</strong>."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:70
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:70
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:216
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:20
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:70
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:70
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:15
 msgid "OK"
 msgstr "OK"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:217
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:61
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:217
 msgctxt "icinga.state"
 msgid "OK"
 msgstr "OK"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:73
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:73
 msgid "Object summaries"
 msgstr "Riepilogo Oggetti"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:98
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:97
 msgid "Object type"
 msgstr "Tipo Oggetto"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:52
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:67
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:135
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:54
 msgid "Obsessing"
 msgstr "Modalità Ossessiva"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:132
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:141
 msgid "Obsessing Over Hosts"
 msgstr "Modalità Ossessiva sugli Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:140
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:150
 msgid "Obsessing Over Services"
 msgstr "Modalità Ossessiva sui Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:122
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:153
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:625
+msgid "Occurence"
+msgstr "Occorrenze"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:121
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:247
 msgid "Ok"
 msgstr "Ok"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:96
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:95
 msgid "Old instance name missing"
 msgstr "Vecchio nome istanza mancante"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:98
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:97
 msgid "Old monitoring backend name missing"
 msgstr "Vecchio backend di monitoraggio mancante"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:533
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:101
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:100
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:544
 msgid "One day"
 msgstr "Un giorno"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:535
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:103
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:102
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:546
 msgid "One month"
 msgstr "Un mese"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:534
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:102
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:101
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:545
 msgid "One week"
 msgstr "Una settimana"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:536
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:104
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:103
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:547
 msgid "One year"
 msgstr "Un anno"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:102
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:73
+msgid "Output"
+msgstr "Output del Plugin"
+
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:125
 msgid "Overview"
 msgstr "Panoramica"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:76
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:76
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:228
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:184
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:84
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:76
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:76
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:80
 msgid "PENDING"
 msgstr "ATTESA"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:252
-msgctxt "icinga.state"
-msgid "PENDING"
-msgstr "ATTESA"
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:142
+msgid "PHP Module: Sockets"
+msgstr "Modulo PHP: Sockets"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/contact.phtml:28
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/contacts.phtml:33
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:28
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:29
 msgid "Pager"
 msgstr "Recapito"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:378
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:381
 msgid "Pager Address / Number"
-msgstr "Indirizzo o Numero del Recapito"
+msgstr "Numero di telefono"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:30
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:62
-msgid "Passive"
-msgstr "Passivo"
-
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:44
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:62
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:130
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:45
 msgid "Passive Checks"
 msgstr "Controlli Passivi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:148
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:159
 msgid "Passive Host Checks Being Accepted"
 msgstr "Accetta Controlli Passivi sugli Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:156
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:168
 msgid "Passive Service Checks Being Accepted"
 msgstr "Accetta Controlli Passivi sui Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:361
-msgid "Passive check result has been submitted"
-msgstr "Risultato passivo inviato"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:151
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:151
 msgid "Passive checks"
 msgstr "Controlli passivi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:480
-msgid "Passive checks for this object will be accepted."
-msgstr "I Controlli Passivi per questo oggetto saranno accettati"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:446
-msgid "Passive checks for this object will be omitted."
-msgstr "I Controlli Passivi per questo oggetto saranno scartati"
-
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:122
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:112
 msgid "Password"
 msgstr "Password"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:67
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:66
 msgid "Path to the Icinga command file on the remote Icinga instance"
 msgstr "Percorso del command file di Icinga nell'istanza remota"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php:33
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php:32
 msgid "Path to the local Icinga command file"
 msgstr "Percorso del command file locale di Icinga"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:164
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:82
+msgid "Performance Data"
+msgstr "Dati di Performance"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:177
 msgid "Performance Data Being Processed"
 msgstr "Accetta i Dati di Performance"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:71
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:71
 msgid "Performance Info"
-msgstr "Informazioni sulle Performance"
+msgstr "Dettagli Performance"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/perfdata.phtml:3
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/perfdata.phtml:3
 msgid "Performance data"
 msgstr "Dati di Performance"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:63
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:60
 msgid "Persistent"
 msgstr "Persistente"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:67
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:64
 msgid "Persistent Comment"
 msgstr "Commento Persistente"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/BackendPage.php:36
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:34
 msgid ""
 "Please configure below how Icinga Web 2 should retrieve monitoring "
 "information."
@@ -2175,13 +2168,13 @@ msgstr ""
 "Definire di seguito come Icinga Web 2 recupererà le informazioni del "
 "monitoraggio."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/InstancePage.php:36
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/InstancePage.php:34
 msgid "Please define the settings specific to your monitoring instance below."
 msgstr ""
 "Definire di seguito le impostazioni specifiche della vostra istanza di "
 "monitoraggio."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/IdoResourcePage.php:44
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:42
 msgid ""
 "Please fill out the connection details below to access the IDO database of "
 "your monitoring environment."
@@ -2189,7 +2182,7 @@ msgstr ""
 "Compilare di seguito i dettagli della connessione per accedere al database "
 "IDO del vostro ambiente di monitoraggio."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:44
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:42
 msgid ""
 "Please fill out the connection details below to access the Livestatus socket "
 "interface for your monitoring environment."
@@ -2197,16 +2190,16 @@ msgstr ""
 "Compilare di seguito i dettagli della connessione per accedere al socket "
 "Livestatus del vostro ambiente di monitoraggio."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/output.phtml:2
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/output.phtml:2
 msgid "Plugin Output"
 msgstr "Output del Plugin"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:43
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:110
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:100
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:42
 msgid "Port"
 msgstr "Porta"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml:2
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml:2
 msgctxt "multiselection"
 msgid ""
 "Press and hold the Ctrl key while clicking on rows to select multiple rows "
@@ -2215,671 +2208,616 @@ msgstr ""
 "Tenere premuto il tasto CTRL durante i Click per selezionare più righe o "
 "tenere premuto SHIFT per selezionare righe contigue."
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:74
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:90
 msgid "Problems"
 msgstr "Problemi "
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:20
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:20
 msgid "Process Info"
-msgstr "Informazioni sul Processo"
+msgstr "Dettagli Processo"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:24
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml:26
+msgid "Process check result"
+msgstr "Invia Risultato Passivo"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:113
+msgid "Processing check result.."
+msgid_plural "Processing check results.."
+msgstr[0] "Schedulazione del Controllo in corso..."
+msgstr[1] "Schedulazione dei Controlli in corso..."
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:24
 msgid "Program Start Time"
 msgstr "Ora Avvio del Programma"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/SecurityConfigForm.php:57
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/SecurityStep.php:56
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:52
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/SecurityConfigForm.php:56
 msgid "Protected Custom Variables"
 msgstr "Variabili Riservate"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:193
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:217
 msgid "Recently Recovered Services"
 msgstr "Servizi Ripristinati Recentemente"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:58
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:58
 msgid "Remote"
 msgstr "Remoto"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:204
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:203
 msgid "Remote Command File"
 msgstr "Command File Remoto"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/InstanceStep.php:62
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:58
 msgid "Remote Host"
 msgstr "Host Remoto"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/InstanceStep.php:66
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:62
 msgid "Remote SSH Port"
 msgstr "Porta SSH Remota"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/InstanceStep.php:70
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:66
 msgid "Remote SSH User"
 msgstr "Utente SSH Remoto"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:15
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:47
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:15
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:47
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/comments.phtml:10
-msgid "Remove Comments"
-msgstr "Rimuovi Commento"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:637
-msgid "Remove Downtime(s)"
-msgstr "Cancella Manutenzione"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/removebackend.phtml:1
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/removebackend.phtml:4
 msgid "Remove Existing Backend"
 msgstr "Rimuovi Backend Esistente"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/removeinstance.phtml:1
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/removeinstance.phtml:4
 msgid "Remove Existing Instance"
 msgstr "Rimuovi Istanza Esistente"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:964
-msgid "Remove Problem Acknowledgement"
-msgstr "Rimuovi Conferma del Problema"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:907
-msgid "Remove comment"
-msgstr "Rimuovi commento"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:638
-msgid "Remove downtime(s) from this host and its services."
-msgstr "Cancella manutenzione da questo host e relativi servizi"
-
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:31
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:30
 msgid "Remove problem acknowledgement"
 msgid_plural "Remove problem acknowledgements"
-msgstr[0] "Remover reconhecimento do problema"
-msgstr[1] "Remover reconhecimento dos problemas"
+msgstr[0] "Rimozione della conferma del Problema"
+msgstr[1] "Rimozione della conferma dei Problemi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:965
-msgid "Remove problem acknowledgement for this object."
-msgstr "Rimuovi Conferma del problema da questo oggetto."
-
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:49
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:48
 msgid "Removing problem acknowledgement.."
 msgid_plural "Removing problem acknowledgements.."
 msgstr[0] "Rimozione della Conferma del problema in corso..."
 msgstr[1] "Rimozione delle Conferme dei problemi in corso..."
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:538
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:549
 msgid "Report interval"
 msgstr "Intervallo del Report"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:166
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:190
 msgid "Reporting"
 msgstr "Reportistica"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:34
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:44
 msgid "Reschedule"
 msgstr "Rischedula"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostController.php:67
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:91
 msgid "Reschedule Host Check"
 msgstr "Rischedula il Controllo dell'Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostsController.php:152
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:185
 msgid "Reschedule Host Checks"
 msgstr "Rischedula i Controlli dell'Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServiceController.php:67
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:68
 msgid "Reschedule Service Check"
 msgstr "Rischedula il Controlli del Servizio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServicesController.php:172
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:234
 msgid "Reschedule Service Checks"
 msgstr "Rischedulaz i Controlli del Servizio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:39
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:35
 msgid "Reschedule host checks"
 msgstr "Rischedula i Controlli dell'Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:51
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:23
 msgid "Reschedule service checks"
 msgstr "Rischedula i Controlli del Servizio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:925
-msgid "Reset Attributes"
-msgstr "Reimposta Attributi"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:926
-msgid "Reset modified attributes to its default."
-msgstr "Reimposta gli attributi modificati con i valori predefiniti"
-
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:233
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:229
 msgid "Resource"
 msgstr "Risorsa"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:98
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:133
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:88
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:123
 msgid "Resource Name"
 msgstr "Nome Risorsa"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:168
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:158
 #, php-format
 msgid "Resource configuration could not be udpated: %s; An error occured:"
 msgstr "Impossibile aggiornare la configurazione della Risorsa: %s; Errore:"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:165
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:155
 #, php-format
 msgid "Resource configuration has been successfully updated: %s"
 msgstr "Configurazione della risorsa aggiornata con successo: %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1043
-msgid "Restart monitoring process"
-msgstr "Riavvia processo di monitoraggio"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1044
-msgid "Restart the monitoring process."
-msgstr "Riavvia il processo di monitoraggio."
-
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:50
-msgid "Restrict views to the hosts and services that match the filter"
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:61
+msgid "Restrict hosts view to the hosts that match the filter"
 msgstr ""
 "Restringe la vista agli Host e Servizi che soddisfano i criteri di ricerca"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:44
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:66
+msgid "Restrict services view to the services that match the filter"
+msgstr ""
+"Restringe la vista agli Host e Servizi che soddisfano i criteri di ricerca"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:43
 msgid "SSH port to connect to on the remote Icinga instance"
 msgstr "Porta SSH da usare per la connessione all'istanza Icinga remota"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:28
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:31
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/SecurityConfigForm.php:21
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:30
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:27
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/SecurityConfigForm.php:20
 msgid "Save Changes"
 msgstr "Salva Modifiche"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostController.php:76
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:102
 msgid "Schedule Host Downtime"
 msgstr "Schedula Manutenzione dell'Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/HostsController.php:161
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:196
 msgid "Schedule Host Downtimes"
 msgstr "Schedula Manutenzioni dell'Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServiceController.php:76
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:79
 msgid "Schedule Service Downtime"
 msgstr "Schedula Manutenzione del Servizio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServicesController.php:181
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:245
 msgid "Schedule Service Downtimes"
 msgstr "Schedula Manutenzioni del Servizio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:25
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:24
 msgid "Schedule check"
 msgid_plural "Schedule checks"
 msgstr[0] "Schedula Controllo"
 msgstr[1] "Schedula Controlli"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:30
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:28
 msgid "Schedule check for all services on the hosts and the hosts themselves."
 msgstr ""
 "Schedula Controllo per tutti i servizi negli host e per gli host stessi."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/downtime.phtml:21
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:35
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:34
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:20
 msgid "Schedule downtime"
 msgid_plural "Schedule downtimes"
 msgstr[0] "Schedula Manutenzione"
 msgstr[1] "Schedula Manuenzioni"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:33
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:68
+#, fuzzy, php-format
+msgid "Schedule downtime for %u unhandled host problem"
+msgid_plural "Schedule downtimes for %u unhandled host problems"
+msgstr[0] "Schedula Manutenzione per Host con Problemi Non Gestiti"
+msgstr[1] "Schedula Manutenzione per Host con Problemi Non Gestiti"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:56
+#, fuzzy, php-format
+msgid "Schedule downtime for %u unhandled service problem"
+msgid_plural "Schedule downtimes for %u unhandled service problems"
+msgstr[0] "Schedula Manutenzione per Host con Problemi Non Gestiti"
+msgstr[1] "Schedula Manutenzione per Host con Problemi Non Gestiti"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:31
 msgid ""
 "Schedule downtime for all services on the hosts and the hosts themselves."
 msgstr ""
 "Schedula Manutenzione per tutti i servizi negli host e per gli host stessi."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:63
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:65
-msgid "Schedule downtimes for unhandled problem hosts"
-msgstr "Schedula Manutenzione per Host con Problemi Non Gestiti"
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:77
+msgid "Schedule downtime for unhandled host problem"
+msgid_plural "Schedule downtimes for unhandled host problems"
+msgstr[0] "Schedula Manutenzione per Host con Problemi Non Gestiti"
+msgstr[1] "Schedula Manutenzione per Host con Problemi Non Gestiti"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:75
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:77
-msgid "Schedule downtimes for unhandled problem services"
-msgstr "Schedula Manutenzione per Servizi con Problemi Non Gestiti"
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:65
+msgid "Schedule downtime for unhandled service problem"
+msgid_plural "Schedule downtimes for unhandled service problems"
+msgstr[0] "Schedula Manutenzione per Host con Problemi Non Gestiti"
+msgstr[1] "Schedula Manutenzione per Host con Problemi Non Gestiti"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/hosts/show.phtml:46
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:42
 msgid "Schedule host downtimes"
 msgstr "Schedula Manutenzione Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:46
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:44
 msgid "Schedule non-triggered downtime for all child hosts"
 msgstr "Schedula Manutenzione non collegata per tutti gli Host figli"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:58
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:30
 msgid "Schedule service downtimes"
 msgstr "Schedula Manutenzione Sevizio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:45
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:43
 msgid "Schedule triggered downtime for all child hosts"
 msgstr "Schedula Manutenzione dipendente per tutti gli Host figli"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:312
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:310
 msgid "Scheduled End"
 msgstr "Fine Schedulazione"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:311
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:309
 msgid "Scheduled Start"
 msgstr "Inizio Schedulazione"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:71
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:70
 msgid "Scheduling check.."
 msgid_plural "Scheduling checks.."
 msgstr[0] "Schedulazione del Controllo in corso..."
 msgstr[1] "Schedulazione dei Controlli in corso..."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:54
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:52
 msgid "Scheduling host check.."
 msgid_plural "Scheduling host checks.."
 msgstr[0] "Schedulazione del Controllo dell'Host in corso..."
 msgstr[1] "Schedulazione dei Controlli dell'Host in corso..."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:91
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:88
 msgid "Scheduling host downtime.."
 msgid_plural "Scheduling host downtimes.."
 msgstr[0] "Schedulazione della Manutenzione dell'Host in corso..."
 msgstr[1] "Schedulazione delle Manutenzioni degli Host in corso..."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:116
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:104
 msgid "Scheduling service check.."
 msgid_plural "Scheduling service checks.."
 msgstr[0] "Schedulazione del Controllo del Servizio in corso..."
 msgstr[1] "Schedulazione dei Controlli del Servizio in corso..."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:216
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:211
 msgid "Scheduling service downtime.."
 msgid_plural "Scheduling service downtimes.."
 msgstr[0] "Schedulazione della Manutenzione del Servizio in corso..."
 msgstr[1] "Schedulazione delle Manutenzioni del Servizio in corso..."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:130
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:126
 msgid "Send Notification"
 msgstr "Invia Notifica"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/header.phtml:23
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/partials/command-form.phtml:10
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ShowController.php:215
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:199
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:62
+#, php-format
+msgid "Sent to %s"
+msgstr ""
+
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:189
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml:13
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/object-header.phtml:34
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:304
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:488
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:215
 msgid "Service"
 msgstr "Servizio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:142
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:162
-msgid "Service Checks"
-msgstr "Controlli del Servizio"
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml:7
+#, fuzzy, php-format
+msgid "Service (%u)"
+msgid_plural "Services (%u)"
+msgstr[0] "Servizi (%u)"
+msgstr[1] "Servizi (%u)"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:118
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:618
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:142
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:162
+msgid "Service Checks"
+msgstr "Controlli Servizio"
+
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:113
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:635
 msgid "Service Grid"
 msgstr "Griglia dei Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:25
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:25
 msgid "Service Group"
 msgstr "Gruppo di Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:527
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:539
 msgid "Service Group Name"
 msgstr "Nome del Gruppo di Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:495
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:504
 msgid "Service Groups"
 msgstr "Gruppi di Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:234
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:230
 msgid "Service Name"
 msgstr "Nome Servizio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:379
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:382
 msgid "Service Notification Timeperiod"
-msgstr "Periodo per le Notifiche del Servizio"
+msgstr "Periodo delle Notifiche per i Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:93
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:189
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:55
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:109
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:213
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:55
 msgid "Service Problems"
-msgstr "Problemi del Servizio"
+msgstr "Servizi con Problemi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:103
-msgid "Service Problems on Host"
-msgstr "Problemi dei Servizi nell'Host"
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:228
+msgid "Service Severity"
+msgstr "Griglia dei Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/MultiController.php:120
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServicesController.php:138
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:79
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:197
 msgid "Service State"
 msgstr "Stato Servizio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:27
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:27
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:27
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:27
 msgid "Service States"
-msgstr "Stati Servizio"
+msgstr "Stato dei Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:630
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:647
 msgid "Service description"
 msgstr "Descrizione Servizio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/service.phtml:4
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/service/show.phtml:3
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/service/show.phtml:3
 msgid "Service detail information"
 msgstr "Dettagli del Servizio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServiceController.php:29
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:32
 msgid "Service not found"
 msgstr "Servizio non trovato"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/contacts.phtml:41
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:37
 msgid "Service notification period"
 msgstr "Periodo per le Notifiche del Servizio"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:69
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:122
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml:14
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:85
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:141
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml:14
 msgid "Servicegroups"
 msgstr "Gruppi di Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:67
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:114
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/contact.phtml:38
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:97
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/objectlist.phtml:30
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/summary.phtml:5
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:8
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:22
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:28
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:101
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:146
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ShowController.php:225
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:184
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ServicesController.php:49
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:209
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:83
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:137
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:199
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:100
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:28
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:8
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:22
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:38
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:97
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:240
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:177
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:225
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:96
 msgid "Services"
 msgstr "Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:11
-#, php-format
-msgid "Services (%u)"
-msgstr "Servizi (%u)"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:531
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:578
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:543
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:593
 msgid "Services CRITICAL"
 msgstr "Servizi CRITICAL"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:130
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:130
-msgid "Services CRITICAL Handled"
-msgstr "Servizi CRITICAL Gestiti"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:116
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:116
-msgid "Services CRITICAL Unhandled"
-msgstr "Servizi CRITICAL Non Gestiti"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:40
-msgid "Services Critical Handled"
-msgstr "Servizi Critical Gestiti"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:37
-msgid "Services Critical Unhandled"
-msgstr "Servizi Critical Non Gestiti"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:99
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:99
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:529
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:576
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:541
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:591
 msgid "Services OK"
 msgstr "Servizi OK"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:32
-msgid "Services Ok"
-msgstr "Servizi Ok"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:215
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:215
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:533
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:580
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:545
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:595
 msgid "Services PENDING"
 msgstr "Servizi in ATTESA"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:61
-msgid "Services Pending"
-msgstr "Servizi in Attesa"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:530
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:577
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:542
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:592
 msgid "Services UNKNOWN"
 msgstr "Servizi UNKNOWN"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:164
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:164
-msgid "Services UNKNOWN Handled"
-msgstr "Servizi UNKNOWN Gestiti"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:150
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:150
-msgid "Services UNKNOWN Unhandled"
-msgstr "Servizi UNKNOWN Non Gestiti"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:56
-msgid "Services Unknown Handled"
-msgstr "Servizi Unknown Gestiti"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:53
-msgid "Services Unknown Unhandled"
-msgstr "Servizi Unknown Non Gestiti"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:532
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:579
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:544
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:594
 msgid "Services WARNING"
 msgstr "Servizi WARNING"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:198
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:198
-msgid "Services WARNING Handled"
-msgstr "Servizi WARNING Gestiti"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:184
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:184
-msgid "Services WARNING Unhandled"
-msgstr "Servizi WARNING Non Gestiti"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:48
-msgid "Services Warning Handled"
-msgstr "Servizi Warning Gestiti"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/layout/topbar.phtml:45
-msgid "Services Warning Unhandled"
-msgstr "Servizi Warning Non Gestiti"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/services/show.phtml:108
-msgid "Services in downtime"
-msgstr "Servizi in manutenzione"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml:20
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml:84
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:15
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:80
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:20
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:84
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:15
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:80
 #, php-format
 msgid "Services with state %s"
 msgstr "Servizi in stato %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:68
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:56
 msgid "Set the date and time when the check should be scheduled."
 msgstr "Impostare la data e l'ora dell'esecuzione del controllo."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:95
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:92
 msgid "Set the end date and time for the downtime."
 msgstr "Impostare la data e l'ora della fine della manutenzione."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:53
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:51
 msgid "Set the expire time."
 msgstr "Impostare la l'ora di scadenza."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:85
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:82
 msgid "Set the start date and time for the downtime."
 msgstr "Impostare la date e l'ora d'inizio della manutenzione."
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/MonitoringWizard.php:114
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:96
 msgid "Setup the monitoring module for Icinga Web 2"
 msgstr "Installa il modulo di monitoraggio per Icinga Web 2"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:143
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:232
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:526
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:573
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:138
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:538
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:588
 msgid "Severity"
 msgstr "Impatto"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:257
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:253
 msgid "Show resource configuration"
 msgstr "Mostra la configurazione della risorsa"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1023
-msgid "Shutdown monitoring process"
-msgstr "Arresta il processo di monitoraggio"
-
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:94
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/IdoResourcePage.php:94
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:92
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:92
 msgid "Skip Validation"
 msgstr "Salta la Verifica"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:137
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:127
 msgid "Socket"
 msgstr "Socket"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:12
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/notifications.phtml:5
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:6
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:13
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:5
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegrid.phtml:5
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:7
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:5
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:7
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:10
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:5
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:12
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:13
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:12
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:7
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:7
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:12
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:14
 msgid "Sort by"
 msgstr "Ordina per"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/MonitoringWizard.php:111
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:93
 msgctxt "setup.welcome.btn.next"
 msgid "Start"
 msgstr "Inizio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:475
-msgid "Start Accepting Passive Checks"
-msgstr "Accetta Risultati Passivi"
-
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:84
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:309
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:81
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:307
 msgid "Start Time"
 msgstr "Ora Inizio"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:407
-msgid "Start obsessing"
-msgstr "Avvia Modalità Ossessiva"
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:412
-msgid "Start obsessing over this object."
-msgstr "Abilita la Modalità Ossessiva su questo oggetto."
-
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:67
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:66
 msgid "Started downtimes"
 msgstr "Manutenzioni Iniziate"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:34
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:43
 msgid "Starts"
 msgstr "Inizi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:116
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:136
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:115
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:135
 msgid "State"
 msgstr "Stato"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/EventOverviewForm.php:47
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:46
 msgid "State Changes"
 msgstr "Cambi di Stato"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:117
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:54
+msgid "Status"
+msgstr "Stato"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:114
 msgid "Sticky Acknowledgement"
 msgstr "Commento Permanente"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:441
-msgid "Stop Accepting Passive Checks"
-msgstr "Rifiuta Risultati Passivi"
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:21
+msgid "Submit Passive Check Result"
+msgid_plural "Submit Passive Check Results"
+msgstr[0] "Controlli Passivi"
+msgstr[1] "Controlli Passivi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1024
-msgid "Stop monitoring instance. You have to start it again from command line."
-msgstr ""
-"Arresta l'istanza di monitoraggio. Sarà necessario ri-avviarla da linea di "
-"comando."
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:113
+msgid "Submit Passive Host Check Result"
+msgstr "Accetta Controlli Passivi sugli Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:373
-msgid "Stop obsessing"
-msgstr "Ferma Modalità Ossessiva"
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:207
+msgid "Submit Passive Host Check Results"
+msgstr "Accetta Controlli Passivi sugli Host"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:378
-msgid "Stop obsessing over this object."
-msgstr "Ferma la Modalità Ossessiva su questo oggetto."
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:90
+msgid "Submit Passive Service Check Result"
+msgstr "Accetta Controlli Passivi sui Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:178
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:256
+msgid "Submit Passive Service Check Results"
+msgstr "Accetta Controlli Passivi sui Servizi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:37
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:49
+msgid "Submit passive check results"
+msgstr "%d è controllato passivamente"
+
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:202
 msgid "System"
 msgstr "Sistema"
 
 # rivedere
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:106
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/TacticalController.php:15
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:129
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TacticalController.php:14
 msgid "Tactical Overview"
 msgstr "Visuale Tattica"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:222
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/BackendPage.php:64
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:149
+msgid "The PHP Module sockets is available."
+msgstr "Il modulo sockets di PHP è disponibile"
+
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:150
+msgid "The PHP Module sockets is not available."
+msgstr "Il modulo sockets di PHP non è disponibile"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:218
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:63
 msgid "The data source used for retrieving monitoring information"
 msgstr ""
 "La sorgente dei dati usati per recuperare le informazioni di monitoraggio"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/DataView/DataView.php:338
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/DataView.php:338
 #, php-format
 msgid "The filter column \"%s\" is not allowed here."
 msgstr "Il filtro della colonna \"%s\" non è ammesso."
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/MonitoringWizard.php:61
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:59
 msgid "The given resource name is already in use."
 msgstr "Il Nome Risorsa fornito è già in uso."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:212
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/BackendPage.php:48
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:208
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:46
 msgid "The identifier of this backend"
 msgstr "L'identificatore per questo backend"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/notifications.phtml:25
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:25
 #, php-format
 msgid "The last one occured %s ago"
 msgstr "L'ultimo si è verificato %s fa"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ShowController.php:124
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:122
 msgid "The parameter `contact' is required"
 msgstr "Il parametro `contatto' è richiesto"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:234
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:84
+msgid ""
+"The performance data of this check result. Leave empty if this check result "
+"has no performance data"
+msgstr ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:74
+msgid "The plugin output of this check result"
+msgstr "L'ouput del plugin per questo controllo"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:230
 msgid "The resource to use"
 msgstr "La risorsa da usare"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/DataView/DataView.php:247
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/DataView.php:247
 #, php-format
 msgid "The sort column \"%s\" is not allowed in \"%s\"."
 msgstr "La colonna di ordinamento \"%s\" non è permessa in \"%s\"."
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:90
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:55
+msgid "The state this check result should report"
+msgstr ""
+
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:91
 #, php-format
 msgid "There is no \"%s\" monitoring backend"
 msgstr "Nessun backend di monitoraggio \"%s\" trovato"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:3
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:17
 msgid "This Object's Event History"
 msgstr "Storico degli Eventi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:36
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:34
 msgid ""
 "This command is used to acknowledge host or service problems. When a problem "
 "is acknowledged, future notifications about problems are temporarily "
@@ -2889,11 +2827,11 @@ msgstr ""
 "problema è Confermato le notifiche saranno temporaneamente disabilitate fino "
 "al ripristino dell'host o servizio."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:34
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:32
 msgid "This command is used to add host or service comments."
 msgstr "Questo comando serve ad aggiungere commenti agli host o ai servizi."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:35
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:33
 msgid ""
 "This command is used to disable host and service notifications for a "
 "specific time."
@@ -2901,7 +2839,7 @@ msgstr ""
 "Questo comando serve a disabilitare le notifiche degli host e servizi per un "
 "periodo di tempo specifico."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:47
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:45
 msgid ""
 "This command is used to schedule host and service downtimes. During the "
 "specified downtime, Icinga will not send notifications out about the hosts "
@@ -2915,8 +2853,7 @@ msgstr ""
 "farebbe normalmente. Le Manutenzioni schedulate saranno preservate da "
 "eventuali arresti o riavvii dell'ambiente."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:37
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:57
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:35
 msgid ""
 "This command is used to schedule the next check of hosts or services. Icinga "
 "will re-queue the hosts or services to be checked at the time you specify."
@@ -2925,78 +2862,117 @@ msgstr ""
 "dell'host o servizio. Icinga sposterà controllo per l'host o servizio "
 "all'orario specificato."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:84
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:32
+msgid "This command is used to submit passive host or service check results."
+msgstr "Questo comando serve ad aggiungere commenti agli host o ai servizi."
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:76
 msgid "This comment does not expire."
 msgstr "Questo commento non scade."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:81
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:73
 #, php-format
 msgid "This comment expires on %s at %s."
 msgstr "Questo commento scade il %s alle %s."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:77
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:69
 msgid "This comment is not persistent."
 msgstr "Questo Commento non è permanente."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:76
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:68
 msgid "This comment is persistent."
 msgstr "Questo Commento è permanente."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:98
-#, php-format
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:107
+#, fuzzy, php-format
 msgid ""
-"This fixed downtime has been scheduled to start on %s at %s and to end on %s "
-"at %s."
+"This fixed host downtime has been scheduled to start on %s at %s and to end "
+"on %s at %s."
 msgstr ""
 "Questa Manutenzione Rigida è stata schedulata per iniziare il %s alle %s e "
 "finire il %s alle %s."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:90
-#, php-format
-msgid "This fixed downtime was started on %s at %s and expires on %s at %s."
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:97
+#, fuzzy, php-format
+msgid ""
+"This fixed host downtime was started on %s at %s and expires on %s at %s."
 msgstr ""
 "Questa Manutenzione Rigida è iniziata il %s alle %s e finirà il %s alle %s."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:81
-#, php-format
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:106
+#, fuzzy, php-format
 msgid ""
-"This flexible downtime has been scheduled to start between %s - %s and to "
-"last for %s."
+"This fixed service downtime has been scheduled to start on %s at %s and to "
+"end on %s at %s."
+msgstr ""
+"Questa Manutenzione Rigida è stata schedulata per iniziare il %s alle %s e "
+"finire il %s alle %s."
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:96
+#, fuzzy, php-format
+msgid ""
+"This fixed service downtime was started on %s at %s and expires on %s at %s."
+msgstr ""
+"Questa Manutenzione Rigida è iniziata il %s alle %s e finirà il %s alle %s."
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:86
+#, fuzzy, php-format
+msgid ""
+"This flexible host downtime has been scheduled to start between %s - %s and "
+"to last for %s."
 msgstr ""
 "Questa Manutenzione Flessibile è stata schedulata per iniziare tra %s -%s e "
 "durare per %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:72
-#, php-format
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:75
+#, fuzzy, php-format
 msgid ""
-"This flexible downtime was started on %s at %s and lasts for %s until %s at "
-"%s."
+"This flexible host downtime was started on %s at %s and lasts for %s until %"
+"s at %s."
 msgstr ""
 "Questa Manutenzione Flessibile è iniziata il %s alle %s e durerà per %s fino "
 "al %s alle %s."
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/WelcomePage.php:37
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:85
+#, fuzzy, php-format
+msgid ""
+"This flexible service downtime has been scheduled to start between %s - %s "
+"and to last for %s."
+msgstr ""
+"Questa Manutenzione Flessibile è stata schedulata per iniziare tra %s -%s e "
+"durare per %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:74
+#, fuzzy, php-format
+msgid ""
+"This flexible service downtime was started on %s at %s and lasts for %s "
+"until %s at %s."
+msgstr ""
+"Questa Manutenzione Flessibile è iniziata il %s alle %s e durerà per %s fino "
+"al %s alle %s."
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/WelcomePage.php:33
 msgid "This is the core module for Icinga Web 2."
 msgstr "Questo è il modulo principale per Icinga Web 2."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:25
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:22
 msgid "Time to Reaction (Ack, Recover)"
 msgstr "Tempo di Reazione (Conferma, Ripristino)"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:106
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:105
 msgid "TimeLine interval"
 msgstr "Intervallo Cronologico"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:161
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:29
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:185
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:28
 msgid "Timeline"
 msgstr "Cronologia"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:84
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:83
 msgid "To"
 msgstr "A"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/SecurityPage.php:36
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/SecurityPage.php:34
 msgid ""
 "To protect your monitoring environment against prying eyes please fill out "
 "the settings below."
@@ -3004,128 +2980,148 @@ msgstr ""
 "Per proteggere il tuo ambiente di monitoraggio da occhi indiscreti si prega "
 "di compilare i dettagli seguenti:"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:87
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:86
 msgid "Today"
 msgstr "Oggi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:201
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:123
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:130
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:216
 msgid "Toggling feature.."
 msgstr "Comando inviato..."
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:59
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:56
 msgid "Top 5 Recent Alerts"
 msgstr "Ultimi 5 Allarmi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:26
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:26
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:528
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ListController.php:575
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:26
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:26
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:540
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:590
 msgid "Total Services"
 msgstr "Totale dei Servizi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:32
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:29
 msgid "Trend"
 msgstr "Trend"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:42
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:39
 msgid "Trend for the last 24h"
-msgstr "Trend nell ultime 24 ore"
+msgstr "Trend nelle ultime 24 ore"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:105
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:102
 msgid "Type"
 msgstr "Tipo"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:25
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/config/index.phtml:57
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:25
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:57
 #, php-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:40
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:58
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:40
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:58
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:225
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:40
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:58
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:40
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:58
 msgid "UNKNOWN"
 msgstr "UNKNOWN"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:148
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:156
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:64
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:156
 msgctxt "icinga.state"
 msgid "UNKNOWN"
 msgstr "UNKNOWN"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/statusIcons.phtml:26
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:49
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:71
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:181
+msgid "UNREACHABLE"
+msgstr "IRRAGGIUNGIBILE"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:59
+msgctxt "icinga.state"
+msgid "UNREACHABLE"
+msgstr "UNREACHABLE"
+
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:175
+msgid "UP"
+msgstr "UP"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:57
+msgctxt "icinga.state"
+msgid "UP"
+msgstr "UP"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:5
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:5
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:49
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:71
 msgid "Unhandled"
 msgstr "Non Gestiti"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:79
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:95
 msgid "Unhandled Hosts"
 msgstr "Host Non Gestiti"
 
-#: /usr/local/icingaweb/modules/monitoring/configuration.php:84
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:100
 msgid "Unhandled Services"
 msgstr "Servizi Non Gestiti"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:29
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:29
 msgid "Unhandled hosts with state DOWN"
 msgstr "Host Non Gestiti in stato DOWN"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:54
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:54
 msgid "Unhandled hosts with state UNREACHABLE"
 msgstr "Host Non Gestiti in stato IRRAGGIUNGIBILE"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml:51
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:47
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:51
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:47
 #, php-format
 msgid "Unhandled services with state %s"
 msgstr "Servizi Non Gestiti in stato %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:121
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:174
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:120
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:268
 msgid "Unknown"
 msgstr "Unknown"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:142
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:141
 msgid "Unknown instance name given"
 msgstr "Nome Istanza sconosciuto"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:100
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/InstanceConfigForm.php:122
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:99
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:121
 msgid "Unknown instance name provided"
 msgstr "Nome istanza sconosciuto"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:102
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:124
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/BackendConfigForm.php:174
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:101
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:123
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:169
 msgid "Unknown monitoring backend provided"
 msgstr "Backend di monitoraggio sconosciuto"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:141
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:224
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:140
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:315
 msgid "Unreachable"
 msgstr "Irraggiungibile"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:139
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:210
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:138
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:301
 msgid "Up"
 msgstr "Su"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:79
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:75
 msgid "Use Expire Time"
 msgstr "Scadenza"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:53
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:52
 msgid "User"
 msgstr "Utente"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:30
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:30
 msgid "User Comment"
 msgstr "Commento dell'Utente"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:55
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:54
 msgid ""
 "User to log in as on the remote Icinga instance. Please note that key-based "
 "SSH login must be possible for this user"
@@ -3133,139 +3129,513 @@ msgstr ""
 "Utente per la connessione all'istanza remota di Icinga. Si fa notare che è "
 "l'utente può effettuare una autenticazione con chiave SSH."
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/BackendStep.php:118
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:108
 msgid "Username"
 msgstr "Nome Utente"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/AlertsummaryController.php:621
+#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
+msgid "Value"
+msgstr "Valore"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:632
 msgid "Value for interval not valid"
 msgstr "Intervallo non valido"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:46
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:64
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:46
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:64
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:219
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:46
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:64
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:46
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:64
 msgid "WARNING"
 msgstr "WARNING"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:78
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:86
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:62
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:78
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:86
 msgctxt "icinga.state"
 msgid "WARNING"
 msgstr "WARNING"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/StatehistoryForm.php:120
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/ChartController.php:160
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:119
+#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:254
 msgid "Warning"
 msgstr "Warning"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Setup/WelcomePage.php:24
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/WelcomePage.php:21
 msgid "Welcome to the configuration of the monitoring module for Icinga Web 2!"
 msgstr ""
 "Benvenuto nella configurazione del modulo di monitoraggio per Icinga Web 2!"
 
-#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:892
-msgid "Your new comment has been submitted"
-msgstr "Il nuovo commento è stato inviato"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/multi/components/objectlist.phtml:60
-#, php-format
-msgid "and %d more"
-msgstr "e %d più"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/notifications.phtml:52
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:42
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:51
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:39
 #, php-format
 msgctxt "time"
 msgid "at %s"
 msgstr "alle %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:98
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:104
 msgid "changed"
 msgstr "modificato"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Object/Service.php:222
-msgid "critical"
-msgstr "critical"
-
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Object/Host.php:178
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:199
 msgid "down"
 msgstr "down"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:43
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:55
+msgid "hard state"
+msgstr "stato hard"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:52
 #, php-format
 msgctxt "timespan"
 msgid "in %s"
 msgstr "in %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:40
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:37
 msgid "in the last hour"
 msgstr "nell'ultima ora"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/alertsummary/index.phtml:38
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:35
 msgid "notifications per hour"
 msgstr "notifche per ora"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml:20
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:15
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Object/Service.php:216
-msgid "ok"
-msgstr "ok"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:135
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:109
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:56
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/comments.phtml:60
-msgid "on"
-msgstr "il"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/notifications.phtml:51
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/downtimes.phtml:41
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:50
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:38
 #, php-format
 msgctxt "datetime"
 msgid "on %s"
 msgstr "il %s"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:78
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:78
 msgid "overall"
-msgstr "complessivo"
+msgstr "complessivi"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostservicesummary.phtml:84
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:80
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Object/Host.php:184
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Object/Service.php:228
-msgid "pending"
-msgstr "in attesa"
-
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml:5
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml:5
 msgctxt "multiselection"
 msgid "row(s) selected"
 msgstr "righe selezionate"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/process/info.phtml:79
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:79
 msgid "scheduled"
-msgstr "schedulato"
+msgstr "schedulati"
 
-#: /usr/local/icingaweb/modules/monitoring/application/views/helpers/MonitoringState.php:101
-msgid "since"
-msgstr "da"
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:53
+msgid "soft state"
+msgstr "(stato soft)"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/MonitoringWizard.php:51
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:49
 msgid "the monitoring module"
 msgstr "il modulo di monitoraggio"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Object/Service.php:225
-msgid "unknown"
-msgstr "unknown"
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:197
+msgid "unchanged"
+msgstr "iivariato"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Object/Host.php:181
-msgid "unreachable"
-msgstr "irraggiungibile"
-
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Object/Host.php:175
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:201
 msgid "up"
 msgstr "up"
 
-#: /usr/local/icingaweb/modules/monitoring/library/Monitoring/Object/Service.php:219
-msgid "warning"
-msgstr "warning"
+#~ msgid "Acknowledge all problems on the selected hosts or services"
+#~ msgstr "Conferma tutti i problemi degli host o servizi selezionati"
+
+#~ msgid "Acknowledge unhandled problem services"
+#~ msgstr "Conferma i problemi non gestiti dei Servizi"
+
+#~ msgid "Acknowledgement has been sent"
+#~ msgstr "Conferma inviata"
+
+#~ msgid "Acknowledgement removal has been requested"
+#~ msgstr "Rimozione della Conferma in corso"
+
+#~ msgid "Allow all scheduling checks and downtimes"
+#~ msgstr "Consenti la Schedulazione di Controlli e Manutenzioni"
+
+#~ msgid "Allow removing host and service downtimes"
+#~ msgstr "Consenti la rimozione di Manutenzioni da Host e Servizi"
+
+#~ msgid ""
+#~ "Allow removing problem acknowledgements, host and service comments and "
+#~ "downtimes"
+#~ msgstr ""
+#~ "Permitir a remoção de reconhecimento de problemas, comentários de hosts e "
+#~ "de serviços e paradas"
+
+#~ msgid "Command has been sent, active checks will be disabled"
+#~ msgstr "Comando inviato, i Controlli Attivi saranno disabilitati"
+
+#~ msgid "Command has been sent, active checks will be enabled"
+#~ msgstr "Comando inviato, i Controlli Attivi saranno abilitati"
+
+#~ msgid "Command has been sent, check will be rescheduled"
+#~ msgstr "Comando inviato, il Controllo sarà rischedulato"
+
+#~ msgid "Command has been sent, checks will be rescheduled"
+#~ msgstr "Comando inviato, i Controlli saranno rischedulati"
+
+#~ msgid "Command has been sent, event handlers will be disabled"
+#~ msgstr "Comando inviato, il Gestore Eventi sarà disabilitato"
+
+#~ msgid "Command has been sent, event handlers will be enabled"
+#~ msgstr "Comando inviato, il Gestore Eventi sarà abilitato"
+
+# rivedere
+#~ msgid "Command has been sent, flap detection will be disabled"
+#~ msgstr "Comando inviato, il controllo di instabilità sarà disabilitato"
+
+#~ msgid "Command has been sent, flap detection will be enabled"
+#~ msgstr "Comando inviato, il controllo di instabilità sarà abilitato"
+
+#~ msgid "Command has been sent, monitoring process will restart now"
+#~ msgstr "Comando inviato, il processo di monitoraggio sarà riavviato"
+
+#~ msgid "Command has been sent, notifications will be disabled"
+#~ msgstr "Comando inviato, le notifiche saranno disabilitate"
+
+#~ msgid "Command has been sent, notifications will be enabled"
+#~ msgstr "Comando inviato, le notifiche saranno abilitate"
+
+#~ msgid "Command has been sent, obsessing will be disabled"
+#~ msgstr "Comando inviato, la modalità ossessiva sarà disabilitata"
+
+#~ msgid "Command has been sent, obsessing will be enabled"
+#~ msgstr "Comando inviato, la modalità ossessiva sarà abilitata"
+
+#~ msgid "Command has been sent, passive check results will be accepted"
+#~ msgstr ""
+#~ "Comando inviato, i risultati dei controlli passivi saranno accettati"
+
+#~ msgid "Command has been sent, passive check results will be refused"
+#~ msgstr "Comando inviato, i risultati dei controlli passivi saranno ignorati"
+
+#~ msgid "Command has been sent, performance data processing will be disabled"
+#~ msgstr ""
+#~ "Comando inviato, la raccolta dei dati di performance sarà disabilitata"
+
+#~ msgid "Command has been sent, performance data processing will be enabled"
+#~ msgstr "Comando inviato, la raccolta dei dati di performance sarà abilitata"
+
+#~ msgid "Command has been sent, process will shut down"
+#~ msgstr "Comando inviato, il processo sarà arrestato"
+
+#~ msgid "Comment removal has been requested"
+#~ msgstr "Richesta di rimozione del commento inviata"
+
+#~ msgid "Custom notification has been sent"
+#~ msgstr "Notifica personalizza inviata"
+
+#~ msgid "Delay Notifications"
+#~ msgstr "Posticipa Notifiche"
+
+#~ msgid "Delete Downtime"
+#~ msgstr "Cancella Manutenzione"
+
+#~ msgid "Delete a single downtime with the id shown above"
+#~ msgstr "Cancella la manutenzione con ID definito"
+
+#~ msgid "Disable Active Checks"
+#~ msgstr "Disabilita i Controlli Attivi"
+
+#~ msgid "Disable Event Handler"
+#~ msgstr "Disabilita il Gestore Eventi"
+
+#~ msgid "Disable Flapping Detection"
+#~ msgstr "Disabilita il Controllo Instabilità"
+
+#~ msgid "Disable Performance Data"
+#~ msgstr "Disabilita i Dati di Performance"
+
+#~ msgid "Disable active checks for this host and its services."
+#~ msgstr "Disabilita i controlli attivi per questo host e relativi servizi."
+
+#~ msgid "Disable active checks for this object."
+#~ msgstr "Disabilita i controlli attivi per questo oggetto."
+
+#~ msgid "Disable active checks on a program-wide basis."
+#~ msgstr "Disabilita i controlli attivi sull'intero sistema"
+
+#~ msgid "Disable event handler for the whole system."
+#~ msgstr "Disabilita il Gestore Eventi sull'intero sistema."
+
+#~ msgid "Disable event handler for this object."
+#~ msgstr "Disabilita il Gestore Eventi per questo oggetto."
+
+#~ msgid "Disable flapping detection for this object."
+#~ msgstr "Disabilita il Controllo di Instabilità per questo oggetto."
+
+#~ msgid "Disable flapping detection on a program-wide basis."
+#~ msgstr "Disabilita il Controllo di Instabilità per l'intero sistema."
+
+#~ msgid "Disable notifications on a program-wide basis."
+#~ msgstr "Disabilita le notifiche sull'intero sistema"
+
+#~ msgid "Disable obsessing on a program-wide basis."
+#~ msgstr "Disabilita la modalità ossessiva su tutto il sistema."
+
+#~ msgid "Disable passive checks on a program-wide basis."
+#~ msgstr "Disabilita i controlli passivi sull'intero sistema"
+
+#~ msgid "Disable processing of performance data on a program-wide basis."
+#~ msgstr "Disabilita la raccolta dei dati di performance sull'intero sistema"
+
+#~ msgid "Downtime removal has been requested"
+#~ msgstr "Cancellazione della Manutenzione in corso"
+
+#~ msgid "Downtime removal requested"
+#~ msgstr "Richiesta di cancellazione Manutenzione"
+
+#~ msgid "Downtime scheduling requested"
+#~ msgstr "Schedulazione di Manutenzione richiesta"
+
+#~ msgid "Enable Active Checks"
+#~ msgstr "Abilita Controlli Attivi"
+
+#~ msgid "Enable Event Handler"
+#~ msgstr "Abilita Gestore Eventi"
+
+#~ msgid "Enable Flapping Detection"
+#~ msgstr "Abilita il Controllo Instabilità"
+
+#~ msgid "Enable Notifications"
+#~ msgstr "Abilita Notifiche"
+
+#~ msgid "Enable Performance Data"
+#~ msgstr "Abilita i Dati di Performance"
+
+#~ msgid "Enable active checks for this host and its services."
+#~ msgstr "Abilita i controlli attivi per questo host e relativi servizi"
+
+#~ msgid "Enable active checks for this object."
+#~ msgstr "Abilita i controlli attivi per questo oggetto"
+
+#~ msgid "Enable active checks on a program-wide basis."
+#~ msgstr "Abilita i controlli attivi sull'intero sistema"
+
+#~ msgid "Enable event handler for this object."
+#~ msgstr "Abilita il gestore eventi per questo oggetto."
+
+#~ msgid "Enable event handlers on the whole system."
+#~ msgstr "Abilita il gestore eventi sull'intero sistema."
+
+#~ msgid "Enable flapping detection for this object."
+#~ msgstr "Abilita il controllo di instabilità per questo oggetto."
+
+#~ msgid "Enable flapping detection on a program-wide basis."
+#~ msgstr "Abilita il controllo di instabilità su tutto il sistema."
+
+#~ msgid "Enable notifications on a program-wide basis."
+#~ msgstr "Abilita le notifiche sull'intero sistema."
+
+#~ msgid "Enable obsessing on a program-wide basis."
+#~ msgstr "Abilita la modalità ossessiva su tutto il sistema."
+
+#~ msgid "Enable passive checks on a program-wide basis."
+#~ msgstr "Abilita i controlli passivi sull'intero sistema."
+
+#~ msgid "Enable processing of performance data on a program-wide basis."
+#~ msgstr ""
+#~ "Habilitar processamento de dados de performance na base de todo o "
+#~ "programa."
+
+#~ msgid "Event handlers"
+#~ msgstr "Gestori Eventi"
+
+#~ msgid "Flap detection"
+#~ msgstr "Controllo Instabilità"
+
+#~ msgid "Hard State"
+#~ msgstr "Stato Hard"
+
+#~ msgid "Host / Service"
+#~ msgstr "Host / Servizio"
+
+#~ msgid "Host Name"
+#~ msgstr "Nome Host"
+
+#~ msgid "Hosts Down Handled"
+#~ msgstr "Host Down Gestiti"
+
+#~ msgid "Hosts Down Unhandled"
+#~ msgstr "Host Down Non Gestiti"
+
+#~ msgid "Hosts Pending"
+#~ msgstr "Host in Attesa"
+
+#~ msgid "Hosts Unreachable Handled"
+#~ msgstr "Host Irraggiungibili Gestiti"
+
+#~ msgid "Hosts Unreachable Unhandled"
+#~ msgstr "Host Irraggiungibili Non Gestiti"
+
+#~ msgid "Hosts Up"
+#~ msgstr "Host Up"
+
+#~ msgid "Instance is not configured: %s"
+#~ msgstr "Istanza non configurata: %s"
+
+#~ msgid "List Of Supported Commands"
+#~ msgstr "Lista dei Comandi Supportati"
+
+#~ msgid "List all selected objects"
+#~ msgstr "Mostra tutti gli oggetti selezionati"
+
+#~ msgid "No instances are configured yet"
+#~ msgstr "Nessuna istanza ancora configurata"
+
+#~ msgid "Notification delay has been requested"
+#~ msgstr "Posticipo di Notifica richiesta"
+
+#~ msgid "Notifications for this host and its services will be disabled."
+#~ msgstr ""
+#~ "Le notifiche per questo host e relativi servizi saranno disabilitate"
+
+#~ msgid "Notifications for this host and its services will be enabled."
+#~ msgstr "Le notifiche per questo host e relativi servizi saranno abilitate"
+
+#~ msgid "Notifications for this object will be disabled."
+#~ msgstr "Le notifiche per questo oggetto saranno disabilitate"
+
+#~ msgid "Notifications for this object will be enabled."
+#~ msgstr "Le notifiche per questo oggetto saranno abilitate"
+
+#~ msgctxt "icinga.state"
+#~ msgid "PENDING"
+#~ msgstr "ATTESA"
+
+#~ msgid "Passive check result has been submitted"
+#~ msgstr "Risultato passivo inviato"
+
+#~ msgid "Passive checks for this object will be accepted."
+#~ msgstr "I Controlli Passivi per questo oggetto saranno accettati"
+
+#~ msgid "Passive checks for this object will be omitted."
+#~ msgstr "I Controlli Passivi per questo oggetto saranno scartati"
+
+#~ msgid "Remove Comments"
+#~ msgstr "Rimuovi Commento"
+
+#~ msgid "Remove Downtime(s)"
+#~ msgstr "Cancella Manutenzione"
+
+#~ msgid "Remove Problem Acknowledgement"
+#~ msgstr "Rimuovi Conferma del Problema"
+
+#~ msgid "Remove comment"
+#~ msgstr "Rimuovi commento"
+
+#~ msgid "Remove downtime(s) from this host and its services."
+#~ msgstr "Cancella manutenzione da questo host e relativi servizi"
+
+#~ msgid "Remove problem acknowledgement for this object."
+#~ msgstr "Rimuovi Conferma del problema da questo oggetto."
+
+#~ msgid "Reset Attributes"
+#~ msgstr "Reimposta Attributi"
+
+#~ msgid "Reset modified attributes to its default."
+#~ msgstr "Reimposta gli attributi modificati con i valori predefiniti"
+
+#~ msgid "Restart monitoring process"
+#~ msgstr "Riavvia processo di monitoraggio"
+
+#~ msgid "Restart the monitoring process."
+#~ msgstr "Riavvia il processo di monitoraggio."
+
+#~ msgid "Schedule downtimes for unhandled problem services"
+#~ msgstr "Schedula Manutenzione per Servizi con Problemi Non Gestiti"
+
+#~ msgid "Services CRITICAL Handled"
+#~ msgstr "Servizi CRITICAL Gestiti"
+
+#~ msgid "Services CRITICAL Unhandled"
+#~ msgstr "Servizi CRITICAL Non Gestiti"
+
+#~ msgid "Services Critical Handled"
+#~ msgstr "Servizi Critical Gestiti"
+
+#~ msgid "Services Critical Unhandled"
+#~ msgstr "Servizi Critical Non Gestiti"
+
+#~ msgid "Services Ok"
+#~ msgstr "Servizi Ok"
+
+#~ msgid "Services Pending"
+#~ msgstr "Servizi in Attesa"
+
+#~ msgid "Services UNKNOWN Handled"
+#~ msgstr "Servizi UNKNOWN Gestiti"
+
+#~ msgid "Services UNKNOWN Unhandled"
+#~ msgstr "Servizi UNKNOWN Non Gestiti"
+
+#~ msgid "Services Unknown Handled"
+#~ msgstr "Servizi Unknown Gestiti"
+
+#~ msgid "Services Unknown Unhandled"
+#~ msgstr "Servizi Unknown Non Gestiti"
+
+#~ msgid "Services WARNING Handled"
+#~ msgstr "Servizi WARNING Gestiti"
+
+#~ msgid "Services WARNING Unhandled"
+#~ msgstr "Servizi WARNING Non Gestiti"
+
+#~ msgid "Services Warning Handled"
+#~ msgstr "Servizi Warning Gestiti"
+
+#~ msgid "Services Warning Unhandled"
+#~ msgstr "Servizi Warning Non Gestiti"
+
+#~ msgid "Shutdown monitoring process"
+#~ msgstr "Arresta il processo di monitoraggio"
+
+#~ msgid "Start Accepting Passive Checks"
+#~ msgstr "Accetta Risultati Passivi"
+
+#~ msgid "Start obsessing"
+#~ msgstr "Avvia Modalità Ossessiva"
+
+#~ msgid "Start obsessing over this object."
+#~ msgstr "Abilita la Modalità Ossessiva su questo oggetto."
+
+#~ msgid "Stop Accepting Passive Checks"
+#~ msgstr "Rifiuta Risultati Passivi"
+
+#~ msgid ""
+#~ "Stop monitoring instance. You have to start it again from command line."
+#~ msgstr ""
+#~ "Arresta l'istanza di monitoraggio. Sarà necessario ri-avviarla da linea "
+#~ "di comando."
+
+#~ msgid "Stop obsessing"
+#~ msgstr "Ferma Modalità Ossessiva"
+
+#~ msgid "Stop obsessing over this object."
+#~ msgstr "Ferma la Modalità Ossessiva su questo oggetto."
+
+#~ msgid "Your new comment has been submitted"
+#~ msgstr "Il nuovo commento è stato inviato"
+
+#~ msgid "critical"
+#~ msgstr "critical"
+
+#~ msgid "ok"
+#~ msgstr "ok"
+
+#~ msgid "on"
+#~ msgstr "il"
+
+#~ msgid "pending"
+#~ msgstr "in attesa"
+
+#~ msgid "since"
+#~ msgstr "da"
+
+#~ msgid "unknown"
+#~ msgstr "unknown"
+
+#~ msgid "unreachable"
+#~ msgstr "irraggiungibile"
+
+#~ msgid "warning"
+#~ msgstr "warning"

From 3801d19f729ef9f4059c6d5ce4e86befde19764a Mon Sep 17 00:00:00 2001
From: Davide Demuru <davide.demuru@buongiorno.com>
Date: Wed, 11 Feb 2015 15:54:02 +0100
Subject: [PATCH 0650/2920] translation updated

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
---
 .../locale/it_IT/LC_MESSAGES/icinga.mo        | Bin 25295 -> 24613 bytes
 .../locale/it_IT/LC_MESSAGES/icinga.po        | 397 +++++++-----------
 2 files changed, 154 insertions(+), 243 deletions(-)

diff --git a/application/locale/it_IT/LC_MESSAGES/icinga.mo b/application/locale/it_IT/LC_MESSAGES/icinga.mo
index 9fed8f466f37dc3708c4f21ad3f2e66d53a395e8..8ee94bb0b4a87638951a1eddf71d9a400a6a0533 100644
GIT binary patch
delta 9522
zcmZXY349gRy~j^51R?DE&H#x)AYl<jDFT5631lM+7(j4x?<7pQxfAXZl!snhwYBw0
ztK))pvF^4Ot)`n#sZ~m?OR1GAYFqozTHDfUTdh+2YWw}o%mwt#hyVSab7tn8|M_oc
z!p{yA-1WnP+^fS2Z!lcL3XGWu?>yBQkM`_g8a3wkqm3C4{{TnA!ZF5-h2!8*I3Esz
zD_|O~g~jjy90Gq1hr=VVFMJmch9AIljLDh)%tphkfTi#fI33;rC&4FSA$%jc|3^5G
z{?KtDC&7O7XGWY4rO+Zc1FnLn!|iYu{8Gdx;V9NO@6edTjs9$N89WD8!kused=zS;
zm*8Spz~Cp~5~ziCLhbY_SP%EW-@`Yd=6w#c(hPRf2qv;CZLkZDVtsQhjj8Y+DAPR!
zcfc2*1M4QE9PEWM<vxfm<~b-!9EDQk7?dJKQ$ov)hUzbXc-2(F5wH&Gc^l@`@Mu)P
zOQ0tFCX^x%!;9eoh`Y>EE4;rxVjL0{W;-l_S3z_zdm*owXJIS+6Vy7(*`*X|gmP)y
zRP3*bH#49e_Cya{1{EZqg9@@e(fHS45&egtCVV*RKM6JA!H9>Tg6$<JpT7$6vKcTf
zv|I^Pf9bSbXreX-HZkBr?cm2y3GfEwpLw4j`D{Et)o=+^##{lV$c=2DxHNY{S!5s7
z_%EO=`Wn=R-iA`_L#T}u=1N1K7Q+P$Opf}^5j&vL?qVq4?S^vA?a}@Fp%i@_Dhm!l
zHfw$f<$`~~LOAI(b`PgP%~KBLid-d)G8(I)Vju;j`E5`pdH`yIr=SlH!Z>W_C0Xi8
zs37|tJOjQ5`DbR%2;XmlE9oa-U)T#Z-@}mia^?p#q}f4uDtsAA!`Gm8{vPZHi%DYb
zd<4{jQ=qb74kS^`YB&dOjrx1wrS!iGRpHK@87}+`)I86@$;$s<(Kw5Ne?||?Ct`}|
zFNE^h5~v`ogIZ`al&^QeVt518bGJqO7F3!(2IYe1p*Hq6$UpPXh-I^}H0zsYHJ}ZZ
z4IUf?KMVWAufTKQJ#ZjA5{<tV^^ZmDTOQsY4rS^oP?jr=#>*ovf-3dr!JHP1(@=%l
z1-0`%a1gu|Dk%3tDe@Y`NajyaI~qg4=y?ljXJt?eH$w$wTXcULltofduDcRe!5b>D
zzZ$PFz?^0Z4m=IkK?PF=O4ECxo;v`QjsxbByRaO}#9dIaat&0$xg9Qo$DrmrW1cZI
z%?7A>u7*3|bMvr&C5<)n2@rS<90K=4DR2lXi2BjF9)1SO6%#OvVxSdDfg~IWcS9+5
z2ejbp5S>jSlPfD0Ky6?Xtb@564gQ&*@}r4PArh5V)1gef9FoFj4b%kNq0;hZI2iWA
zV)#VVKL}5u|7$o19)V}Ww;@J0GZuyxT@N*XE<-~;y9CNqmqP{3H{clf5F8DkhM#~(
z;2m%hvyOs~M?4Ir_@5&V#7rghXF&@#Lb-B##NCi}a^^l7(xewEm>vypnEg@znW+DK
z)PDtjx&TF>CXAz%cKRu(^!x&p;(Ot6cmQ4rUxLb>&5Ofy-Ui1j|98>Qj&Fi8>8%iJ
znfoE`H*dfhaO}BZzY=O^87ReXhO*r4PzyX2@kOY4UypbcO3`;9x|o6`ti$@|Ts2?@
zVqJ3|l;*EPMeTdA6_ycM>)<6&G4TsX>YERs-YZ)c2Im&2job`1&%JOhd;}hYgNS&|
zTeKYekE5}WMhjdE%i!HmK0g@s-+%+?4_aYNCmai<$YoG<;V{(mN8m7c4C?s-<eDrp
zD&jOal>VHE%c`)yOt_YTk#GZ)iM)uHK<(^ms0sH&Mf*W`HGBnX10B`j#Fs(s{9359
z;cHOo_XwN{kHVR7&`M)!;Mps4;liJ0Acz52$c<Z}c629{LXSjz3Kr2n4E6l0P#gFi
z)O&A3S>Rn*1dGlKEiee`{`iPfU^)Gg91ZQD2~L0sI1OF}Rfz6`P4E#o77kt&?z9X}
zp?`M7^C8AC7eR~c*av0$SJ~!dcogdW0jtA#r$bpXcLojla4D3=HBg#1Lb;?B%2c0(
z%J*+WS>|b|36DhMA3!NQbWM1CTTs4U05xwlJRR1;GS~xICuhD&qnLp^peBAG>i-y0
zrp@zkCM>KC7nlP}=r4t*!Z>^YcEMe6QeC*vEl>*o2rh%KK$Y|f^`Qa{uul2EgN8Ib
z5b;?!g8m^m2)+rm(BGjf@*$L~Ml^&mFbC@X!idYD3Q!GH5ZbUD?uy300e91X0^Z8{
zW^H3wg8vE!(0?Dww|z+3v*9$T@r|$_?0`dH5)Olx!b$LpP_cABl;S^ua>0uc--Ltd
zAA_=BKLRVK31`#LzyfH&HaHOOgj(pcP^P>o;$Eot_QR#{8CVR9n?ps%K)pW=N|8BG
ziku7k!g{FpTbi-I9^Ax$7ILAY^<t<O_CRIB*P%@OEF1=3fHLWu(fBB;*IfFOq2_CV
za_J_h`VoU#_)Aa<-3Fz=11;EpIF0WyAk#bzi8u2yq*j<x>h65F4bFpKg&YUwIXDUq
zS{G)=bSMjULA`e!l<!}HQurN+uBPw$@clM;8vPq{G^F`H*a+W(H^HUn^A|BZ49|iS
z+QNyNAjg4;!%N{E@GdxQLl`SRfg|Y`Yz!3`4Yk2}a2c$EimfZ5Hk7-IhVt?-oCOOu
zk)yC2D)@Fnz0eCScnFS#??Ndy=z{Pts)8fve-g@)mqxq>$^u`8r@;H61s{UUpEHMO
zD8C184)b#%R4{FW^5G6B1uun)fqS7$`yiAe&%#pp2D}m$ZwX`RS}0502K&PAMtl@%
z{wH8R<^Mq%g$%q1wcszI((N^<VEQvuuzUdf!#)>={ee)=kAxbZ01M!|h!njC`S^7?
z1D7F8Wv)g3n&am!<Om`^K8xs*sdOn?w;{h(hwBp|%pg{pNV`we|2w<{xexh1@=fF`
zNd8hbEsQ$9%n!ocZhpRvXr~L1&mg+6rg;VVEb>Vti|G0l@<7nyO9wuJd?)HJf&WAl
z>4&4S0})?`g(&@9_!!cQxblA)jgMbHiw2&C7b8DG`ttI>;UeToq?o?0-y`D?rK#MY
zOMX{yDo$QSbln!>`0r`7E|vfDm(uQ0q%=PO6$kxUr~sKo`_ITPka}c2qH6{6B9cP>
zg{YAI8hHu%JTenez~!$GqsBpak=DN<8rTk1)n-TiAHe0v;HbX`PC&YmAt>|(ct4`(
z*42-(y097icJX`lNqseMjQR@r_mE)!*VC{NAJJ8d+>Y!+&P6sN?Z^wrG~^CM*GeRg
z{5R4M8H?PBOht65uswsEieeALrAYqzFB;Ej{lCyS9r;sqrxCUwr|^=lTac>|6%k!i
zkQvDD)Zuyv`AyKG2Ea3sFGc<75&JM#Mb!QrJRj*m9PR%f(T$hkU>+QZtf5_ld@;H=
zfUz@ZKOXh3gNu>>L6XQH5MA#en~+1umB=5FPb0e0$ZN<5q!URX-(vma*OzJaAoGy-
zk#msA$Y>;g6`@E|)cG6yIx-0<LY_eW4>^WhgN#B>zP?81r^tiR-~}*PznaGPkPXOC
z7RX;$(AbY0MH-NAARh8OaxbE*1i27di|9IeLqDhgBV;&YBmax&+8e@T^!Tk&XDj?5
zYPZ5R<V{5X&GvRQz7F1vRI1PTDsVHh1NkbFzs{qv3#meuA!j3FkU5C1A0t0RVzTXO
z8lOUR?F?ah-yZYLg5DR#z1Y9Ew&clE##Y(st?izjid!viCgGTRXNT3~C7j;DGe#8k
z)>Z5)D9U8qWM{f}&D@Gp%kB1rV`V(6$4<C$JL6b(HnY`9X55&aalPast2Av|liQNs
zj-+M#!^Vy7z47eLef(pKep}S##j^>=pRhQ!d7d@z%tZ?p&YC-K?%V;54dqQvkDKQ8
z@+ziWWVKaSHkH>klvh<+s~Q&7)y&$^P+vWu)=p>2TT*s1ov<@rYLT_FwYJu(udJ)K
z7FX9**3>Smtg33NZf^GfvG~#6x6UmtD5&)Ry`;u}x_XGee(8*WyO)*({QJ`B;*g}5
zw9?&9%<a$)Jb%uzlCr6$CK-2~Ov*FM?btRa8MmgDrl(nHC%MzM>`W%*wr6?v@?|Z3
zlAZp`%gPEWuB)6i&`mmNH=V&6PKAF~<?P~<2K=td@{jcIs+?P;Su3o{Sj<VMJuB&S
zqJe3463$L+VW%8xd)7&3Y|HD`fP(^7+O@2nEdH_V&Q3SW@~17|RZ!vIzWnnAj$gjw
z9DX}j<OVoa%uZ#T1P1@hisd=0!m6<X2e_8D+?{gRO~$p{WVpzQ=dErJZIYgaQVu$V
z>+onMWp}xFJmDs{S#}~}=a;apxRVHH_hwsNcCdoo-EF5_yv0n(9E#YysLjM3H?K+D
zP225m!p#sn6+~V-olV+S%1wKzG!MGzZZGNbfMaz#DJxM%tc9T#n8Tb1-C#>jDsO#L
z)1^&>uO^(%PXEKII{)G7DaB?*%CRl2lJvJ%kJ6ZbSM{`<=083=o9;}wR=8M&wN_5>
ztoA4rdYn{h|JU+n@j^><;A&YRzsnQ5A+WXS6MLz!s>|@Te2#%UT;X=jAgn?|u(k%I
zqZgQ}G=0*`u7Bmq@`5J6cjfi7g2l)edrm_tH2MB}nKxl|c&RP|NrCDRR!rb0&KsMn
zlOw&9%dDA<tqlfVKA{<r!P^P1)53R&AfbD_3Tp--60?~o?ppRoLY1vs9r8}hOX9+e
zBGyfyzsD9>zpKklvip>>)$u<#Z)hJY?GIWtxuD&jy{e2rZCTYu=<Z!Lb3+9wN3^-j
zkSKG>zLdLjrwkyA1|}qclQEBO^hm~G*R4&pv!wzVNhHS-*)(xfmEWJ<F7wZ<sqfb)
zTcncyo|+~8;hOVUbn@y(fB2e`3L8~JwS%45aps8>!BWH}@tn-siLNlKFI+P<=dxM!
z$hfA(?e@abfNk>ep;!#6qxaGK`LI6e{>sQxCx+N1;i59bj4FmLZkJ<u7FMJN+Zq}Y
zI-Cp+?c%?`=Ct{iYK80;<Q{==BK}W=HMJuuVZ^XMw|1OgT0PWH*RH`8kJXmU#neep
z{<2Evm!z>nu+OmcbY@lV<qO-|;k1{YQIf9k3+lGER#a3NRj{~gs?#yowDLpn5fWB9
z8-~kNvw{Fg$$3_6YY-!t7#%bdf#1%Yu2Q^<oCq5JV|7y}%PLG0)G6v>ofi*^bXc!E
z|5#mhf#;uF|HV@|xV!{a#-H0TYH$<9(KGcPX2bvf_p7J+Z`b!9S)cWKSlvr@xSiRQ
z9c;=U+c0B#^q}@0JaV#|(78v4!iENGx*Er;C6VbVxJi#@6i!jOahQKg!^DY1e~)5R
zu3$n6qOI^${J8!T4Hp%WA%xm>)g%4d#w7zVsU7afzqT<pB(JyC<HTZHU4LKoM5&+4
zk1HF3J15Gd%oLS#$27|j%5AT+lQeJxdk3YM%Gs%^9<6rb{gfSdV;n4YSgXSnSLt+3
zLn=;PGmZAdPB&>oA&9WhGB#=3)$KpH_U__tFBJv~W?0v>cwQ!})yW<wgWrPM@sZ;F
z|B6rV{-(YK{?X=<{%@KGo<cDAkF6d(GHoX?d{AMIhm$|1B|hT#No$(iF6``DDSvlM
z!wgv?avOJogCx%|Q^P8l^!v2V_t&*f@-J##KF_l#VscQ1!X76~vaVGV3leTU5jx*W
zIk7A%DNI!pD*U6ZyZrsDhZUJ-Dd>M{UD@~!iUNUXRye7ct*i(ds;T}X>!$i|t}8p!
zp{iTm9ElVrc|z-i$7`ofS~*vzMPOADF^E#vzheE$qAIt?#j?+@KQJ|_xs>(5^V$6m
z<xlF+Sf2l#^X;mjj>o+o92-ly<Qi#*GdOcN1uD!crcc^oj%Z7EyPbASZQ0iRI3_9c
zTiWV}9)CT_xy|9=?`?|})+ETbVH-yHvo}nh8^l<2DrVD46HJB2J33f3xzn{%Y&IU8
zI6*4-t2g{*LZI5mzBEF=xqkJ=wt~2S>&DH6wYJsmf4K2<|FO*jhN<JFbeM8F60VNF
zd{Zk`DeMG`rX4;ylzo8k%YWEWbK<s2V^?&lI~5jRlQC3t^fiUbd|Jtzl%MeHif^T$
z+VDWq4QqeF1*L`Bi2wMOiSxrxw=ni1-{mVux0gvd?d{=&ZdW&@ky&j2vW+9hvjYwy
z%fU98OjgTN4zQ}5^l!dk+a&B7oGD~XG@D^4qhki|f8~OOe%<ElbGnyJV2FH)ChA&~
z7T+bDvnL<k92-0&4fuxD6a;cI9;y4$S}5}!|9pzRc#dzx4&p~&P59OwyZ_<fU?#Mj
z&aBeLN>LfSq<_JdEoUVyP9N4)7##lw<NdrfKmHXL{Kc@`|6%nw|JPea`v2H6b7p1m
zp~7lGEf4;pNF_`q1%(oBC;7_*H|cP9{K^aKHb+`GR!5ev6c7LFt4blL1B=r$Wt%#c
zp}+!Rk_1&C+6Bckj8vT%CqDebGo;mj{ld0_ss3Vnd_(wws;QMo;Tk8UN0^wrMi`MR
z$Io3XfvqV7`n)9vV=<f0qAt&WuxX_KvR%%53WSql0vm-VXN9Sy3T16;g_pv08ON+V
zX^*k|V3pIJ?KIW$Ki^T|_aFW+>+MvM_svQ^(oB62#=h5n#<1`Y0h7-ErD6U9h5eaZ

delta 10075
zcmZ9Q349gRy~odm5O&!D1W+<8At=cuY_cx_0)!=ygjEEc+&d&wZtkRa2?Ew@-SsJ@
z9j#WaTK8vdOW|3??del&X=_`p?UUAp?$}qCzN)oWYrnslNd)J^|9;OhbC&;hPPpf(
z*iVnd3a<?=y20>_iWze{e7Bb|dnx~TkXns-WVkW>Gl%&Z4PSsG;XAMd_ANDrf5zfx
zAe;^R!<8@#H^aX0$8Z3A84iXgU=L#o=ART!qaikekKw?GD<fV8%V~cSj)T94XTV;p
zq6kia>YoJr!G?(2VNdEiBW9r%wiix>SHm-z-yEbciH27q_8Mi(Q0mj+WVjM8f_q>M
zd<^o>e9Vsq8iCs8!NqVcEI>{47}SoB!g_cNo`4fsy~Z7cI!7_TsiCkAZiCw4x1kpB
zA{+xxK&h}#nK8TIFzCR2us3`cN~QmT?7<AOLQPacEo3&-LY6~mZc|jx!vf|ums1!5
z_d$JdXT$?APW?$J)xHU}kPqQ*Sj_5h19LG{|4k9^fy1aDgyZ2+$R5mFkTshAV~yDW
ztHz>#O?W8{TF957Y<e@)z_&x~@ZqTcX((U$A(XQni`xGTi>dz&YP=7ldN0(e@diXJ
zfjFHR0cG;CaRn+AR?#5UIZ*YBp;UG=yaPS}&xNblj&^cCRDgURGM709dBuDLYoS$6
zf6SO2Pz$<XLKr1iKxyW7sP^v_C`fhBLhbAY*aIGi#qf_%wtW*$ho&N|&xp7JDh#(m
znXnzoM3+VV`=J(k7wicif>^;k0cDE9>lBJ8d;<HxB3zoH831MbnNTa;0i~H7)cgCO
z4}F+~6=#N;xfV)u--OfPV^HJ04fXx-vy52=r$9DZFc(nJfEPi1cq!}yeb@`$2DP*M
zpmzEg><NDcwbPfOzWY6t3EzeC@&OolGOU8CZ-W=Xy-*qNLs+Ev-(MLHbOV%azX8vN
zPeCp0?@*@r2+Bm=t3u}+3^njLNDebKurE9Z>b)Hi^H3(d3`*rULT&6}IEneqQ!2o}
zL@Y(`{i!dF*a#I3=R@U%3t(@!56*@+!G7??sQvY*{zk<2BX&m}@~weT8XN`-`fxM_
zaS|j+nORU1Zh*>kZBQDx8fsztp`7tHsD=C-qIL5s)XsWUha3c@nUN8vL5;H-YQs&{
z=wB-;&>%0pJbK|qD3#p?2f**brSR#9#Z#~=^;K{J+zsVycR+36C8+oR3KgDbPc>#C
z+yZ5SuR;0J;i>3fndm1p%z@(>MFXA(naf-OHPFLw5Bvz$z+G&A20RS4z_%e?<`XC<
zn?~pL@F0|lmg7*;#229!a5F4{j}|CsWj}=$956HV+G?n<IUi~VSHU&#n@|(~18Shj
zvqGm`3#Ixr)OWj}!tHi=8axc;oIi-_FTw8A3%{cvoBj#%&%DPE{$k=RTdLd!HSiuN
zQ(X$Bp{t>s=l~oJAA!T*&!A4hKf$};IMg~6em~-?P!s<R5^V+Z_po4w@zr=bW<U#`
z1GRv?5pRN;@FA!LJptuR&qeLeNA+JoP4G(8ejF-HPe5&;cwQL3{a~@;{|pNIV@wW9
zdEue?p=y5uPpAGCl!p2)2nQMgwd0v^FkA~Shs{t?bOLI}@4=C<FZR{KCqS7Z4zaeG
z59NO*M?ubWADjq(4HX_mi^4;t8fwSup`3CX)I|Ft-U2nj{Sgm9E%*_La?Nv4J`=-p
zHStV{`<OH=Xb1OFSOO2jweVxO0j^mbUajtemDG<yefU1aye7^^+EFXiIJ;m2yaqlG
zUxB23^8g_<0=@*-!?$1sTvChv_2JIiu;C)uhx)zn3iw@E4`(e46U~)SPWELu2;L9%
z{-aPDITG<jIFS155#NE*U~G99c732URJObj7OH3<SD3j_1GYhh%LVWfco~!}d#(rv
z9t*YeX;AHpA<55dgBH9FYUkgEP4H!?JW*K}nra>_qQ101K|890TG9Ct)3BKOg;36P
zDeMKm2KC{cP#U-o>b=8I8h9$|e;)Rr{vxb`FGD$Z@yalzm%*{r3v(%GW!vFhFb$>h
z!K=a#Y^aI$z=`nMhz~*8^flN!X3Pgr3+T2cOh^NuCX7RkzZ~|3o1jddfGoUVIw)vI
zUw|6$5=bPPTcI>_3~GRPpa#_Hq>&L&CYTI|zy(k?Z-mlF0-gy!2P@$9Q1d(vwUDRb
zS&IMXDJU#HfSPFX+E7Icp;W#V-U^d22V?8P4A=p+kgvl<@DNlOzYC?>i4FJ#Tm`kD
zeGzYfTJWu~FY}uN6g1J}P=~@1I12s>_Jr?8{r`&CvoTCS1EHL6A{+ykMC}gTNBs-%
zcGwROlrKC8`@n-x3w#0=6wk+_j#7eC6OMxe;3PN*&V@>$YoJWD6ZVIf!-3F`csD$a
z`a@6)dKPNDKf>|wEoi|ZBp3Bh-+=z*G#hEqgbAn}W#Le`4{CtB;X?Qzl<ockwUZB^
zzVE&<T+l$M1&xN<@nop)XF$C-A8MYJa5Ow;Bl;ggVK)s@$#qa49)Q~6_uwq}ER=~p
zhErhirf}d{Py;W5TKF2MGouyC=9j~n@LH&GpM_e$51|(Js{)0=6n+b(y7wTFWQsP2
ze@Lu@lc|3dYU1bM9QXko3a4!e->ZXV)V~zfzXP?P_n^idcushxltD$;DmVcauA)#)
z;X4q=HOJwVaLU%`On_6Ve+;$I>T?M-xCEj+a|yf&cH0(e>K0f+{UtaOz5%u4qU~XS
z3DiQ@KsHn`Z4?xzx5G+!6s~~pLkliEFZ|$qsQSgQ6n+E7;iFK|@&?pSdz>G#1j@AI
zV0SnZY6ElOELabN_`fnJ5Ef9*^(vI@-hf)zJ5aVCX@}lF4r&4O;ZnE}?t!;J?Q~dk
zsDTMkHlG`@25Q{pP(D)+dlo2crJ&4|Py=j*^6qx17xzZ(SHa%Y_eb@cp>}pB)WG*b
zz5gxP4L%Ar-V;#Y9f2|UMFh79Duw@svsH<nJXEZfBg2u05Iz445&UYf|3juBQt<$d
z%Ci{x4e|)`7NSQc(eriW>Y#)#LEOyzLH3_S;lB_$p**wmIT97d!YiWkH4*<2F$;ek
zm4!6&cjO&}<05#L@%t(wQ~U+VAu{JzkP(3kQ_%C<5W(*Y{Qe1f5?P4g<iYbmL>u;q
zcCDuVl;s0NulW}86XY-=KXH&}k;jpVh@Q_Qe^f#C*RvLp4@^*n=PKkskrk@&{1Uk@
zD22!L|3>8xpqy5rHV7dhn!U(MM9-Iz>B!({v5!$!J{gDTDae6lA-_kSLtaMiK=gb8
z*%6e826#W>M)j{jExs=UzX?Z2?cJ%LPWfr%dgMCf`$!V$N#BJ~&n_euV~9tCDvm_w
z=BWHq#BQ|dX+hQ_ze9e2=xIf&kRPeS^Q#cS?<M@sM3$V?rb|kK`cdR8<o}WV+QOX_
z`p~K5a69q|qGvvG8!{IegWQM=M0O%2NKd5mnL|OLr)LCXT?+q<yoNl3{1y2h<TU!;
zg?i3Je5tVWsi#nbZ0&4-_eSM2;A-R*<Rj!}<b9-+0sBKe8RQ^xKJpD@2C@kGIijZ#
z(SP&a0>6nYMS}T9(s(PC?;_VCLy=z~9x|N1_u#`wEu!apA-aBtQ7YlRv*CA;uOe?F
zKScfm(Q{dd;P(Q4Eu`&J{|`^S13`EA^S7wHF=7W?fP9GD6Seh$l}HhjcRo*0_%_mj
z{0o_i42}99q<k^bj_AMVg87R@o*R&|poE?2e4X-($U3AcYLCNiNHP7#;clcK<-6f$
zpD8q4iBup@AwNZyBR@k<Als2Z|Ifn|vJLqhqUR>089Ag1&qYWba!eJT^N=qgmm{N)
z0mzS$&SxKmVZjc`c4B$b%BNfHbTZ{6tyV9a%UVfqSGw%fj;xdEa1&0}N@U!eo3K-d
zP7Hf6=3AwsdSsk7uftzdI`Yu<rN8W5*kR>b-K^E-WV3dQ!&rQj_HtIz&D!nlj-9Er
z+?>_swzTG~X2(i9jGDDGyRDpOeLhcDuGO&;`Ao)1=d3J!u9vpj>~!8vrFL7*yRAfu
zLELmp_@bR?bt)|{6ZUvntE(p(qB-O3V)dOv#SgWPJ=*<H{e;ts{i4cf^@r9~9*xz6
zJ2XvBF2^8Q)70wivdXiT2C!I!mv*dn_7rvmttgLW^Xu*4_fT0p-s@2I?7iK(rBZ(T
z?2@m{esSRrFJs!gWIp9&O?$@K;jl5b9H+glXmPZ-iRIZdP1dEu<XlwOZl{aN-8N?T
zU!I-mS#3?3IcLT!zhO@4nyJ-OW>i&At*V}`#_6*rRZpp|?z7s?=Bn0b>~uC|=e*1u
zYpLDgCLL?3)0WTVt$E3y8czn*MJ;W%n~EpAHvj%PkI!QHvU^~5OqI4;oNNv&%L4+t
z?{T}#escez#N2+d;-r&GRoH&}yt;lh`5Z>WJN9_4e`MaIQyV^-S26PBH_+zT^6XeE
z<F<L(tlxY7>R65c=BnYbwf^>1!~JXL_pLT{>7?uAGM=eRS&Qw&PA8oVKhiQ=ZOd(I
zXXW-De8k1W{3qwH@7|Jj{Iv^8{i+40`424U@7FCD-B+(OOb5F0vkNLusXwrw>XiC#
z7gRSS*|C@2;kM*6!QkOi<JLMSBggh|+ZM($P3`$~&c<)im~AEOEXuG^nw52}j=Yz0
zEW4$}&9|iejSDaIf4=aVnC)+0G@IX>78UyFi%d?R_+x4oua8?zHWo~KYDSAW*Rs>N
zx8-!8R{Y<!Qf_*u)%6+Ch3;@ImjDSY)8S;o5m0F^!wCNIn$l5rvzu~r)Z&(@XZiWG
zjn=bXCTsf*^M{-fYQ{E8?QCnaXJ^>G6xPmW?X<soar2t`yw~A%S%Cge4T<U<vn1o#
zmR_>0#&F=UDW48nPyN*YWbtJG@x_CdYX+-@)rWplX*EcXp4A*#nzZoD9iax(G~=(1
zl}`~Mp5>&RHk9HK?v}r8)d>IMB_pO+T1~D+jJ4P(#)@{G;T!f#16E355fV{5?joHi
zzJ9T!DwgrPFTK9t5;Qq`^4d(OOElC@D!|E7mVy;~^S)W?w&R6PdXHn4I$6@8oX;_M
z21dZxUItIpciI?Elx4*>i(r(L*Fu-VrM*3+FwvKBYhqnmt~0?4R-Mf<cCcRQU-?g?
zV7*|JRE58)c64{gYVvp1j*cz%uc@tw)%pi(xA^^*owc2SA!1#o!wokyt`4TNI$XRn
zZq-&;L`yc<IqUh%n`pN^<z(ziYloZ4u?ezKD$nd}Gun;6e_8#|W$M+2BBxJjaQ_d>
z7R0jtxaG_Joy*rXG)28$bPS-Cz@xI7gl{WZNG{_vlmFQu8L{ga;Kf9%n@_4OO!_jj
z<5xEfo0oCh$)f3`r_Cjz#NXbY=hd!ng6Ip*3=Hk0tSI}({YRIVpGB;=JJ35HXoOP(
z{G{3DSbqN%V+!ap$Du>qnDuUZV4Y6S#2?Zw{tzTE#YzX!$-=r`jKWKf!;AK3UbH`b
zF^S8Cp{o(FlBr8@`q<Vc|Hz6nHdF?EQj+$~dYCln>~MqG(?Kkw<D5rl(sJ#t1T4=A
zK7Ho?E~Ar-5(x*@`t#~mlY*|U8$Y^y>iBG`LMCLRfj?R;dDfA$%cqUc`mfftZd8aR
z$Q52Z9yc`_!8Ntngi9n~&$Jey*i2j5Je^d=m>Mj=5pHMXyd*Guf0xr7943T`oY3}f
zUOA?;p0CIxgv_2jN~dcg1Np~R*7{|u_V=tO<T0aveAResHF^p%%x4V84y6~{FI_#c
z5acO+)tQInMF|@hGV3yO{x&a4ft{;ay|iYX&IW0god#ZwGQBo*?2++xYTz(r^>!!G
z={~`E$!);PU_FOq+8(~vovVod+Ug7Z?Q7QcWK|Yw^&eT27`V|%;G>EHmKN=3!DkzB
z%Fu5<U38O|3fw(oC%JwxRT>o$p(GdoKz+$bl-?PLk;}!+S`v8L_J34=dTgEl=lXm7
zTi4DVob@<YPELI}|JdBJL%r7Zi1iH9R@xubaJt{Wp`?gtO!-q9O8j#gl0#~<c!y%p
zG`el5*R>k`7aG=<cj>h;O85~&SC2x?U(q<#-_qE>I6CBaHdgistmEI<xOfU-$d<S<
z<Vf@KlOS5;RG7lT2}$BsXE@+LQ~f?o7mjSg#{&1pDRoKYK4zylcv6o4^`?p;%TPI?
zX_h#dgdP6+uQiS7i*kchh4%eVnkou1D#sHyEq05NlNd{9b-G2lN8u3VO)iAo4EMOE
z?xf2GuBrnzxE^wq#TDe(b_<H{>|(%-OCWQL3VyI#dD1j_++uR3!B4KA->b{t?^}Ol
zv_=n-Gq(pjWd~lzwTEo%=$yK4gYCb);q<X)1v97Z(2b-dyP0dpr>&mlPu*DG7bRx7
z04h`a`!^;=1zJ}|%y2Cs27<FR?RIzx&+omd%-_7}oxa*ba2Md4#O5urwEx8B?f6jH
zmNQ31r<G+0!_e*7U!D`%iTjBy8$K6=Imcoy2oV{UM2`V^i&HWcX7r?;3L_xMQ%;;)
zYr>TwxGRO>$2k}s6<nY^y!_<P)2__zk2$Bj2M46Bv@mkBQgEDTmv72)T|vY;^UoaQ
zpa@o}c3s-S9ETz}g~N1(b#i&G{3qQ+;_T9|-#XKeZLJ>Mnfs&o3cG$(NGn!#w(BGf
z&xx+o!Y#~`6NSfo4lM`Q63#VFA7w)f%w05yJ7ojbc4|^H>+l7I0ltnOyH*x=a1{`3
z9>ckFjDP6dbBnuj$tZvOwvyuTu<_fsRgP|ymF1l^!IdPf?7AV7ihR?5Zrhp-JMyU7
z!$C+(S*Im0-3D$P97&G4!pJ&loeudh{1ax6(wMF|8-hDO7t6q-{LgRS;vd*vS{M_C
zOQ%C;+`u>}EO6+!wS+rO#$)H`iA!7ORflvIIDB?DNvAE&sA=nzBP^fe-o|OcXI;l%
zf&{Nip)P&V30NE&+Fx;A)qwB@mF5<Mf5a_+|9Qifa>>)amvp9(zyrAHH0N7PZD2jF
zQs}cS9LH?3Imgp2hTD%59Uz|noAahsvGVZGJJ+1@$6V4j;U92W!yg5X+|D-t266Zs
AegFUf

diff --git a/application/locale/it_IT/LC_MESSAGES/icinga.po b/application/locale/it_IT/LC_MESSAGES/icinga.po
index 151b24ec9..991124c18 100644
--- a/application/locale/it_IT/LC_MESSAGES/icinga.po
+++ b/application/locale/it_IT/LC_MESSAGES/icinga.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Icinga Web 2 (None)\n"
 "Report-Msgid-Bugs-To: dev@icinga.org\n"
-"POT-Creation-Date: 2015-02-10 17:58+0100\n"
-"PO-Revision-Date: 2015-02-04 17:48+0100\n"
-"Last-Translator: Davide Demuru <davide.demuru@gmail.com>\n"
+"POT-Creation-Date: 2015-02-11 15:47+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: it_IT\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,23 +21,23 @@ msgstr ""
 #: /usr/share/icingaweb2/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php:40
 #, php-format
 msgid "%d unhandled hosts down"
-msgstr "%d host down non gestiti"
+msgstr ""
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php:41
 #, php-format
 msgid "%d unhandled services critical"
-msgstr "%d servizi critical non gestiti"
+msgstr ""
 
 #: /usr/share/icingaweb2/library/Icinga/Web/View/DateTimeRenderer.php:185
 msgctxt "timespan"
 msgid "%im %ss"
-msgstr "%im %ss"
+msgstr ""
 
 #: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:9
 #: /usr/share/icingaweb2/application/views/scripts/pivottablePagination.phtml:9
-#, fuzzy, php-format
+#, php-format
 msgid "%s: %d to %d of %d (on the %s-axis)"
-msgstr "%s: %d a %d di %d"
+msgstr ""
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Form/Element/Number.php:138
 #, php-format
@@ -76,7 +76,7 @@ msgstr "Applicazione"
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:233
 msgid "Application Log"
-msgstr "Log dell'applicazione"
+msgstr "Log Applicazione"
 
 #: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:66
 msgid "Application Prefix"
@@ -94,17 +94,17 @@ msgstr "Autenticazione"
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:213
 #, php-format
 msgid "Authentication backend \"%s\" has been successfully changed"
-msgstr "Backend di Autenticazoine \"%s\" modificato con successo"
+msgstr "Backend di autenticazione \"%s\" modificato con successo"
 
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:210
 #, php-format
 msgid "Authentication backend \"%s\" has been successfully created"
-msgstr "Backend di Autenticazoine \"%s\" creato con successo"
+msgstr "Backend di autenticazione \"%s\" creato con successo"
 
 #: /usr/share/icingaweb2/application/controllers/ConfigController.php:259
-#, php-format
+#, fuzzy, php-format
 msgid "Authentication backend \"%s\" has been successfully removed"
-msgstr "Backend di Autenticazoine \"%s\" rimosso con successo"
+msgstr "Backend di autenticazione \"%s\" creato con successo"
 
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:95
 msgid "Authentication backend already exists"
@@ -115,11 +115,11 @@ msgstr "Backend di autenticazione già esistente"
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:169
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:239
 msgid "Authentication backend name missing"
-msgstr "Nome del Backend di Autenticazione mancante"
+msgstr "Nome del Backend di autenticazione non specificato"
 
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendReorderForm.php:54
 msgid "Authentication order updated!"
-msgstr "Ordine di autenticazione aggiornato"
+msgstr "Ordine di autenticazione aggiornato!"
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Wizard.php:617
 #: /usr/share/icingaweb2/library/Icinga/Web/Wizard.php:638
@@ -129,7 +129,7 @@ msgstr "Indietro"
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:244
 #, php-format
 msgid "Backend \"%s\" has no `backend' setting"
-msgstr "Il Backend \"%s\" non ha impostazioni di `backend'"
+msgstr "Backend \"%s\" senza attributo `backend'"
 
 #: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:56
 #: /usr/share/icingaweb2/application/forms/Config/Authentication/ExternalBackendForm.php:32
@@ -155,7 +155,7 @@ msgstr "Bind Password"
 
 #: /usr/share/icingaweb2/application/forms/PreferenceForm.php:144
 #: /usr/share/icingaweb2/application/forms/PreferenceForm.php:150
-#, php-format
+#, fuzzy, php-format
 msgctxt "preferences.form"
 msgid "Browser (%s)"
 msgstr "Browser (%s)"
@@ -163,22 +163,22 @@ msgstr "Browser (%s)"
 #: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:187
 #, php-format
 msgid "Can't add role '%s'. Role already exists"
-msgstr "Impossibile aggiugnere il ruolo '%s'. Ruolo già esistente"
+msgstr "Impossibile aggiungere il ruolo '%s'. Ruolo già esistente."
 
 #: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:146
 #, php-format
 msgid "Can't load role '%s'. Role does not exist"
-msgstr "Impossibile caricare il ruolo '%s'. Ruolo non trovato"
+msgstr "Impossibile caricare il ruolo '%s'. Ruolo inesistente."
 
 #: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:213
 #, php-format
 msgid "Can't remove role '%s'. Role does not exist"
-msgstr "Impossibile rimuovere il ruolo '%s'. Ruolo non trovato"
+msgstr "Impossibile rimuovere il ruolo '%s'. Ruolo inesistente"
 
 #: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:246
 #, php-format
 msgid "Can't update role '%s'. Role does not exist"
-msgstr "Impossibile aggiornare il ruolo '%s'. Ruolo non trovato"
+msgstr "Impossibile aggiornare il ruolo '%s'. Ruolo inesistente"
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:352
 msgid "Cancel this operation"
@@ -187,12 +187,12 @@ msgstr "Annulla operazione"
 #: /usr/share/icingaweb2/library/Icinga/Application/Config.php:298
 #, php-format
 msgid "Cannot read config file \"%s\". Permission denied"
-msgstr "Impossibile leggere il file di configurazione \"%s\". Permesso negato"
+msgstr "Impossibile leggere il file \"%s\". Accesso negato"
 
 #: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:122
 msgid "Check this box if you want to add the dashlet to a new dashboard"
 msgstr ""
-"Spunta questa casella se si vuole aggiugnere questa vista a una nuova "
+"Selezionare questa opzione se si  vuole aggiungere questa vista a una nuova "
 "dashboard"
 
 #: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:200
@@ -200,7 +200,7 @@ msgstr ""
 msgid "Check this box to enforce changes without connectivity validation"
 msgstr ""
 "Selezionare questa casella per forzare le modifiche senza verificare la "
-"connettività"
+"connettività."
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:326
 msgid "Click to add another filter"
@@ -213,11 +213,11 @@ msgstr "Clicca per rimuovere questa parte del filtro"
 
 #: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:100
 msgid "Comma-separated list of groups that are assigned to the role"
-msgstr "Lista dei gruppi assegnati al ruolo separati da virgola"
+msgstr "Lista dei gruppi assegnati al ruolo separati da virgole"
 
 #: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:92
 msgid "Comma-separated list of users that are assigned to the role"
-msgstr "Lista degli utenti assegnati al ruolo separati da virgola"
+msgstr "Lista degli utenti assegnati al ruolo separati da virgole"
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:223
 msgid "Configuration"
@@ -244,17 +244,18 @@ msgid ""
 "be symlinked in the module folder, but won't show up in the list of disabled "
 "modules."
 msgstr ""
-"Contiene la cartella dove verranno cercati i moduli disponibili, separati da "
-"due punti. Saranno caricati anche eventuali link a cartelle dimoduli ma non "
-"verranno mostrati nella lista dei moduli abilitati. "
+"Contiene le cartelle dove verranno cercati i moduli disponibili, separati da "
+"due punti . I moduli non presenti in queste cartelle possono essere aggiunti "
+"tramite link alla cartella del modulo, ma non appariranno nella lista dei "
+"moduli disabilitati."
 
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:261
 msgid "Could not find any resources for authentication"
-msgstr "Nessuna risorsa di autenticazione trovata"
+msgstr "Nessuna risorsa disponibile per l'autenticazione"
 
 #: /usr/share/icingaweb2/application/views/scripts/dashboard/error.phtml:2
 msgid "Could not persist dashboard"
-msgstr "Dashboardi non permanente"
+msgstr "Dashboard non persistente"
 
 #: /usr/share/icingaweb2/application/controllers/AuthenticationController.php:62
 msgid ""
@@ -266,16 +267,16 @@ msgstr ""
 
 #: /usr/share/icingaweb2/application/views/scripts/config/authentication/reorder.phtml:7
 msgid "Create A New Authentication Backend"
-msgstr "Crea un Nuovo Backend di Autenticazione"
+msgstr "Crea un nuovo backend di autenticazione"
 
 #: /usr/share/icingaweb2/application/views/scripts/config/resource.phtml:7
 #: /usr/share/icingaweb2/application/views/scripts/config/resource/create.phtml:4
 msgid "Create A New Resource"
-msgstr "Crea Nuova Risorsa"
+msgstr "Crea una nuova Risorsa"
 
 #: /usr/share/icingaweb2/application/views/scripts/config/authentication/create.phtml:4
 msgid "Create New Authentication Backend"
-msgstr "Crea un Nuovo Backend di Autenticazione"
+msgstr "Crea un nuovo backend di autenticazione"
 
 #: /usr/share/icingaweb2/application/controllers/RolesController.php:82
 msgid "Create Role"
@@ -286,8 +287,8 @@ msgid ""
 "Create a new backend for authenticating your users. This backend will be "
 "added at the end of your authentication order."
 msgstr ""
-"Crea un nuovo backend di autenticazione per gli utenti, Questo backend sarà "
-"aggiunto come ultimo elemento in ordine di autenticazione"
+"Crea un nuovo backend per autenticare gli utenti. Questo backend verrà "
+"aggiunto alla fine della lista."
 
 #: /usr/share/icingaweb2/application/views/scripts/dashboard/index.phtml:13
 #, php-format
@@ -295,8 +296,8 @@ msgid ""
 "Currently there is no dashlet available. This might change once you enabled "
 "some of the available %s."
 msgstr ""
-"Nessuna vista disponibile, Si prega di abilitare una di quelle disponibili %"
-"s."
+"Nessuna vista disponibile. E' necessario prima abilitare prima uno dei %s "
+"disponibili."
 
 #: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:108
 #: /usr/share/icingaweb2/application/layouts/scripts/body.phtml:31
@@ -310,7 +311,7 @@ msgstr "Impostazioni Dashboard"
 
 #: /usr/share/icingaweb2/application/controllers/DashboardController.php:205
 msgid "Dashboard has been removed"
-msgstr "Dashboard rimossa"
+msgstr "Dashboard Rimossa"
 
 #: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:13
 msgid "Dashlet Name"
@@ -353,7 +354,7 @@ msgstr "Tipo Database"
 #: /usr/share/icingaweb2/library/Icinga/Web/Form/Validator/DateTimeValidator.php:48
 #, php-format
 msgid "Date/time string not in the expected format %s"
-msgstr "La stringa di Data/Ora non rispetta il formato %s"
+msgstr "La stringa della Data/Ora non è nel formato atteso %s "
 
 #: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:54
 msgctxt "app.config.logging.level"
@@ -373,16 +374,16 @@ msgid ""
 "Details can be found in the application log. (If you don't have access to "
 "this log, call your administrator in this case)"
 msgstr ""
-"Per maggiori dettagli consultare il log dell'applicazione. (In caso di "
-"assenza di permessi contattare l'amministratore di sistema)"
+"Maggiori dettagli sono disponibili nel log applicativo. (in caso di accesso "
+"negato al file contattare il proprio amministratore di sistema)"
 
 #: /usr/share/icingaweb2/application/forms/Config/General/ApplicationConfigForm.php:54
 msgid "Don't Store Preferences"
-msgstr "None Salvare le Preferenze"
+msgstr "Non salvare le Preferenze"
 
 #: /usr/share/icingaweb2/application/views/scripts/config/authentication/modify.phtml:4
 msgid "Edit Backend"
-msgstr "Modifica Backend"
+msgstr "Modifica backend"
 
 #: /usr/share/icingaweb2/application/views/scripts/dashboard/update-dashlet.phtml:6
 msgid "Edit Dashlet"
@@ -390,7 +391,7 @@ msgstr "Modifica Vista"
 
 #: /usr/share/icingaweb2/application/views/scripts/config/resource/modify.phtml:4
 msgid "Edit Existing Resource"
-msgstr "Modifica Risorsa Esistente"
+msgstr "Modifica Risorsa esistente"
 
 #: /usr/share/icingaweb2/application/controllers/ErrorController.php:39
 #, php-format
@@ -399,28 +400,27 @@ msgstr "Abilitare il modulo \"%s\" potrebbe essere utile!"
 
 #: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:80
 msgid "Enter a title for the dashlet."
-msgstr "Inserisci un titolo per la vista"
+msgstr "Inserisci un titolo per la vista."
 
 #: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:99
 msgid "Enter a title for the new pane."
-msgstr "Inserisci un titolo per il nuovo pannello"
+msgstr "Inserisci un titolo per il nuovo pannello."
 
 #: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:70
 msgid ""
 "Enter url being loaded in the dashlet. You can paste the full URL, including "
 "filters."
 msgstr ""
-"Inserire la URL dell vista. E' possibilie inserire la URL complera, filtri "
-"inclusi "
+"Inserire l'indirizzo della vista. Incollare l'intera URL, filtri inclusi."
 
 #: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:51
 msgctxt "app.config.logging.level"
 msgid "Error"
-msgstr "Errore"
+msgstr "Error"
 
 #: /usr/share/icingaweb2/application/views/scripts/dashboard/error.phtml:11
 msgid "Error details"
-msgstr "Dettagli Errore"
+msgstr "Dettagli dell'Errore"
 
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:308
 msgid "External"
@@ -454,7 +454,7 @@ msgstr "Filtro"
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterWidget.php:89
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:659
 msgid "Filter this list"
-msgstr "Filtrare questa lista"
+msgstr "Pattern"
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterWidget.php:93
 msgid "Filtered"
@@ -488,7 +488,7 @@ msgstr "Host"
 #: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:90
 #: /usr/share/icingaweb2/application/views/scripts/pivottablePagination.phtml:28
 msgid "Hosts"
-msgstr "Hosts"
+msgstr "Host"
 
 #: /usr/share/icingaweb2/application/views/scripts/search/hint.phtml:2
 msgid "I'm ready to search, waiting for your input"
@@ -496,7 +496,7 @@ msgstr "Pronto per la ricerca, in attesa di un input."
 
 #: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:50
 msgid "IP or hostname to search."
-msgstr "IP o hostname da cercare"
+msgstr "IP o hostname da cercare."
 
 #: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:15
 msgid "Icinga Web 2 Documentation"
@@ -516,17 +516,14 @@ msgid ""
 "current session manually by clearing the cache, or by closing the current "
 "browser session."
 msgstr ""
-"Se questo messaggio non scompare, potrebbe essere necessario chiudere "
-"manualmente la sessione corrente ripulendo la cache, oppure chiudere la "
-"sessione del browser."
 
 #: /usr/share/icingaweb2/application/views/scripts/showConfiguration.phtml:21
 msgid ""
 "In case you can access the file by yourself, you can open it and insert the "
 "config manually:"
 msgstr ""
-"In caso di mancato accesso al file, modificare la configurazione "
-"manualmente: "
+"In caso di mancato accesso al file, aprire il file ad inserire i dati "
+"manualmente."
 
 #: /usr/share/icingaweb2/application/controllers/AuthenticationController.php:124
 msgid "Incorrect username or password"
@@ -535,25 +532,25 @@ msgstr "Utente o password errati"
 #: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:53
 msgctxt "app.config.logging.level"
 msgid "Information"
-msgstr "Informazione"
+msgstr "Information"
 
 #: /usr/share/icingaweb2/application/views/scripts/config/modules.phtml:3
 msgid "Installed Modules"
-msgstr "Moduli Installati"
+msgstr "Moduli intallati"
 
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:72
 #, php-format
 msgid "Invalid backend type \"%s\" provided"
-msgstr "Tipo di backend fornito \"%s\" non valido "
+msgstr "Tipo \"%s\" di backend non valido"
 
 #: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:45
 #, php-format
 msgid "Invalid resource type \"%s\" provided"
-msgstr "Tipo di risorsa fornita \"%s\" non valida "
+msgstr "Tipo \"%s\" di risorsa non valido"
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Form/Validator/DateTimeValidator.php:41
 msgid "Invalid type given. Instance of DateTime or date/time string expected"
-msgstr "Tipo di data non valida. "
+msgstr "Formato non valido. Istanza di DateTime o stringa Data/Ora prevista."
 
 #: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:11
 #, php-format
@@ -563,10 +560,10 @@ msgid ""
 "authentication method by following the instructions in the %1$sdocumentation%"
 "3$s or by using our %2$sweb-based setup-wizard%3$s."
 msgstr ""
-"Icinga Web 2 non è stato configurato, non essendo stato definito nessun "
-"metodo d iautenticazione non è possibile accedere. Si prega di definire un "
-"metodo di autenticazione seguendo le istruzioni dalla %1$sdocumentazione%3$s "
-"o usando %2$sl'istallazione guidata%3$s"
+"Icinga Web 2 non è stato configurato e quindi non è possibile autenticarsi "
+"senza aver definito nessun metodo di autenticazione. Si prega di definire un "
+"metodo di autenticazione seguendo le istruzioni della %1$sdocumentazione%3$s "
+"o usando la nostra %2$sinstallazione guidata via web%3$s."
 
 #: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:67
 msgid "LDAP Resource"
@@ -590,7 +587,7 @@ msgstr "Tipo di Log"
 
 #: /usr/share/icingaweb2/application/views/scripts/authentication/logout.phtml:12
 msgid "Logging out..."
-msgstr "Uscita in corso..."
+msgstr "Uscita..."
 
 #: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:20
 #: /usr/share/icingaweb2/application/views/scripts/authentication/logout.phtml:21
@@ -603,20 +600,21 @@ msgstr "Esci"
 
 #: /usr/share/icingaweb2/application/views/scripts/authentication/logout.phtml:43
 msgid "Logout successful!"
-msgstr "Disconnesso con successo!"
+msgstr "Uscito con successo!"
 
 #: /usr/share/icingaweb2/application/views/scripts/dashboard/error.phtml:7
 msgid "Make sure that the webserver can write to this file."
-msgstr "Assicurarsi che il web server possa scrivere su questo file."
+msgstr ""
+"Controlla che il server web abbia i permessi per scrivere su questo file."
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Controller/ActionController.php:197
 msgid "Method Not Allowed"
-msgstr "Metodo Non Autorizzato"
+msgstr "Metodo non consentito"
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterWidget.php:94
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:661
 msgid "Modify this filter"
-msgstr "Modifica filtro"
+msgstr "Modifica questo filtro"
 
 #: /usr/share/icingaweb2/application/controllers/ConfigController.php:179
 #, php-format
@@ -630,7 +628,7 @@ msgstr "Modulo \"%s\" abilitato"
 
 #: /usr/share/icingaweb2/application/forms/Config/General/ApplicationConfigForm.php:33
 msgid "Module Path"
-msgstr "Percorso Modul"
+msgstr "Percorso Modulo"
 
 #: /usr/share/icingaweb2/application/views/scripts/config/modules.phtml:16
 msgid "Module is disabled"
@@ -663,23 +661,21 @@ msgid "Navigation"
 msgstr "Navigazione"
 
 #: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:98
-#, fuzzy
 msgid "New Dashboard Title"
-msgstr "Nuova Dashboard"
+msgstr "Titolo nuova Dashboard"
 
 #: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:68
 #: /usr/share/icingaweb2/application/views/scripts/roles/new.phtml:3
-#, fuzzy
 msgid "New Role"
-msgstr "Crea Ruolo"
+msgstr "Nuovo Ruolo"
 
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:118
 msgid "New authentication backend name missing"
-msgstr "Nomedel backend di autenticazione mancante"
+msgstr "Nome del nuovo backend di autenticazione mancante"
 
 #: /usr/share/icingaweb2/application/forms/Config/GeneralConfigForm.php:54
 msgid "New configuration has successfully been stored"
-msgstr "La nuova configurazione è stata salvata correttamente"
+msgstr "Nuova configurazione salvata correttamente"
 
 #: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:120
 msgid "New dashboard"
@@ -687,7 +683,7 @@ msgstr "Nuova Dashboard"
 
 #: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:89
 msgid "New resource name missing"
-msgstr "Nuovo Nome Risorsa mancante"
+msgstr "Nome della nuova risorsa non trovato"
 
 #: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:86
 #: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:89
@@ -701,21 +697,21 @@ msgid ""
 "No Ldap servers found on this domain. You can try to specify host and port "
 "and try again, or just skip this step and configure the server manually."
 msgstr ""
-"Nessun server LDAP troato in questo dominio. Provare a specificare host e "
-"porta e riprovare, o saltare questo passaggio e configurare il server "
-"manualmente."
+"Nessun server LDAP trovato in questo dominio. Si prega di specificare host e "
+"porta e provare di nuovo, altrimenti saltare questo passaggio e configurare "
+"il server manualmente."
 
 #: /usr/share/icingaweb2/application/controllers/AuthenticationController.php:104
 msgid ""
 "No authentication methods available. Did you create authentication.ini when "
 "setting up Icinga Web 2?"
 msgstr ""
-"Nessun metodo di autenticazione trovato. E' stato creato authentication.ini "
-"durante l'installazione di Icinga Web 2?"
+"Nessun metodo di autenticazione trovato. E' stato creato il file "
+"authentication.ini durante l'installazione di Icinga Web 2?"
 
 #: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:37
 msgid "No dashlets added to dashboard"
-msgstr "Nessuna vista aggiunsta alla dashboard"
+msgstr "Nessuna vista aggiunta a questa dashboard"
 
 #: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:8
 msgid "No roles found."
@@ -728,23 +724,24 @@ msgstr "Non sono stai trovati utenti nel database di backend specificato"
 #: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:37
 msgctxt "app.config.logging.type"
 msgid "None"
-msgstr "Nessuno"
+msgstr "Niente"
 
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:116
 msgid "Old authentication backend name missing"
-msgstr "Vecchio nome del backend di autenticazione mancante"
+msgstr "Nome del vecchio backend di autenticazione mancante"
 
 #: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:87
 msgid "Old resource name missing"
-msgstr "Vecchio nome della risors mancante"
+msgstr "Nome della vecchia risorsa non presente"
 
 #: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:67
 msgid "Only the root and its child nodes will be accessible on this resource."
-msgstr "Solo la radice e nodi figli saranno accessibili su questa risorsa."
+msgstr ""
+"Solo gli oggetti che appartengono a questa risorsa radice saranno accessibili"
 
 #: /usr/share/icingaweb2/application/views/scripts/form/reorder-authbackend.phtml:6
 msgid "Order"
-msgstr "Ordina"
+msgstr "Ordine"
 
 #: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:33
 msgid "Page"
@@ -756,7 +753,7 @@ msgstr "Pagina non trovata."
 
 #: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:12
 msgid "Pagination"
-msgstr "Paginazione"
+msgstr "Impaginazione"
 
 #: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:101
 #: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:43
@@ -793,7 +790,7 @@ msgstr "Confermare la rimozione di"
 
 #: /usr/share/icingaweb2/application/views/scripts/dashboard/error.phtml:4
 msgid "Please copy the following dashboard snippet to "
-msgstr "Copiare la seguente dashboard in "
+msgstr "Copiare la seguente porzione di dashboard in "
 
 #: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:34
 msgid "Please enter your username..."
@@ -804,7 +801,7 @@ msgid ""
 "Please note that not all authentication methods were available. Check the "
 "system log or Icinga Web 2 log for more information."
 msgstr ""
-"Si fa notare che non sono disponibili tutti i metodi di autenticazione. "
+"Si fa notare che non tutti i metodi di autenticazione sono disponibili. "
 "Controllare il log di sistema o di Icinga Web 2 per maggiori dettagli."
 
 #: /usr/share/icingaweb2/application/views/scripts/search/hint.phtml:4
@@ -830,11 +827,11 @@ msgstr "Preferenze"
 
 #: /usr/share/icingaweb2/application/forms/PreferenceForm.php:107
 msgid "Preferences successfully saved"
-msgstr "Preferenze aggiornate con successo"
+msgstr "Preferenze salvate con successo"
 
 #: /usr/share/icingaweb2/application/forms/PreferenceForm.php:109
 msgid "Preferences successfully saved for the current session"
-msgstr "Preferenze salvate con successo nella sessione corrente"
+msgstr "Preferenze per la sessione corrente salvate con successo"
 
 #: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:48
 #: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:51
@@ -861,11 +858,11 @@ msgstr "Rimuovi Vista dalla Dashboard"
 
 #: /usr/share/icingaweb2/application/views/scripts/config/resource/remove.phtml:4
 msgid "Remove Existing Resource"
-msgstr "Rimuovi Risorsa Esistente"
+msgstr "Rimuovi Risorsa esistente"
 
 #: /usr/share/icingaweb2/application/controllers/RolesController.php:179
 msgid "Remove Role"
-msgstr "Rimuovi Ruolo"
+msgstr "Rimuovi ruolo"
 
 #: /usr/share/icingaweb2/application/views/scripts/roles/remove.phtml:3
 #, php-format
@@ -885,7 +882,7 @@ msgstr "Rimuovi filtro"
 #: /usr/share/icingaweb2/application/controllers/RolesController.php:148
 #, php-format
 msgid "Required parameter '%s' missing"
-msgstr "Parametro richiesto '%s' mancante"
+msgstr "Parametro richiesto '%s' non trovato"
 
 #: /usr/share/icingaweb2/application/views/scripts/config/resource.phtml:12
 msgid "Resource"
@@ -894,7 +891,7 @@ msgstr "Risorsa"
 #: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:148
 #, php-format
 msgid "Resource \"%s\" has been successfully changed"
-msgstr "Risorsa \"%s\" modificata con successo"
+msgstr "Risorsa \"%s\" aggiornata con successo"
 
 #: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:145
 #, php-format
@@ -902,7 +899,7 @@ msgid "Resource \"%s\" has been successfully created"
 msgstr "Risorsa \"%s\" creata con successo"
 
 #: /usr/share/icingaweb2/application/controllers/ConfigController.php:335
-#, php-format
+#, fuzzy, php-format
 msgid "Resource \"%s\" has been successfully removed"
 msgstr "Risorsa \"%s\" rimossa con successo"
 
@@ -919,7 +916,7 @@ msgstr "Tipo di Risorsa"
 
 #: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:66
 msgid "Resource already exists"
-msgstr "Nome Risorsa già presente"
+msgstr "Risorsa già presente"
 
 #: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:64
 #: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:113
@@ -934,7 +931,7 @@ msgstr "Risorse"
 
 #: /usr/share/icingaweb2/application/views/scripts/config/resource/create.phtml:5
 msgid "Resources are entities that provide data to Icinga Web 2."
-msgstr "Le Risorse sone le entità che forniscono i dati a Icinga Web 2"
+msgstr "Le Risorse sono le entità da cui Icinga Web 2 recupera i dati."
 
 #: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:62
 msgid "Restrictions"
@@ -978,27 +975,27 @@ msgstr "Salva Modifiche"
 
 #: /usr/share/icingaweb2/application/forms/PreferenceForm.php:208
 msgid "Save for the current Session"
-msgstr "Salva per la Sessione corrente"
+msgstr "Salva per la sessione corrente"
 
 #: /usr/share/icingaweb2/application/forms/PreferenceForm.php:194
 msgid "Save to the Preferences"
-msgstr "Salva le Preferenze"
+msgstr "Salva Preferenze"
 
 #: /usr/share/icingaweb2/application/views/scripts/showConfiguration.phtml:2
 msgid "Saving Configuration Failed"
-msgstr "Salvataggio Configurazione Fallito"
+msgstr "Salvataggio Configurazione fallito"
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/SearchDashboard.php:63
 msgid "Search"
-msgstr "Cerca"
+msgstr "Cerca..."
 
 #: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:28
 msgid "Search Domain"
-msgstr "Cerca Dominio"
+msgstr "Cerca nel Dominio"
 
 #: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:29
 msgid "Search this domain for records of available servers."
-msgstr "Cerca in questo dominio la lista dei server disponibili."
+msgstr "Cerca in questo dominio i server disponibili."
 
 #: /usr/share/icingaweb2/application/views/scripts/layout/menu.phtml:8
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:655
@@ -1007,13 +1004,13 @@ msgstr "Cerca..."
 
 #: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:110
 msgid "Select a pane you want to add the dashlet."
-msgstr "Selezionare un pannello da aggiungere alla vista."
+msgstr "Selezione un pannello a cui aggiungere la vista."
 
 #: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:54
 #: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:71
 #: /usr/share/icingaweb2/application/views/scripts/pivottablePagination.phtml:35
 msgid "Services"
-msgstr "Servizi"
+msgstr ""
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php:34
 msgid "Settings"
@@ -1022,12 +1019,12 @@ msgstr "Impostazioni"
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/Limiter.php:83
 #, php-format
 msgid "Show %s rows on one page"
-msgstr "Mostra %s righe per pagina"
+msgstr ""
 
 #: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:16
 #, php-format
 msgid "Show rows %d to %d of %d"
-msgstr "Mostra da riga %d a %d di %d"
+msgstr ""
 
 #: /usr/share/icingaweb2/application/forms/Config/Resource/LivestatusResourceForm.php:44
 msgid "Socket"
@@ -1043,7 +1040,7 @@ msgstr "Stato"
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:339
 msgid "Strip this filter"
-msgstr "Modifica filtro"
+msgstr "Dividi filtro"
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:219
 msgid "System"
@@ -1069,7 +1066,7 @@ msgstr "La connessione database da usare per autenticarsi con questo servizio"
 #: /usr/share/icingaweb2/application/views/scripts/showConfiguration.phtml:5
 #, php-format
 msgid "The file %s couldn't be stored. (Error: \"%s\")"
-msgstr "Impossibile salavare Il file %s. (Errore: \"%s\")"
+msgstr "Il file %s non può essere salvato. (Errore: \"%s\")"
 
 #: /usr/share/icingaweb2/application/forms/Config/Resource/FileResourceForm.php:42
 msgid "The filename to fetch information from"
@@ -1077,7 +1074,7 @@ msgstr "Nome del file dal quale recuperare l'informazione"
 
 #: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:108
 msgid "The full path to the log file to write messages to."
-msgstr "Percorso completo del file di log dove scrivere i messaggi"
+msgstr "Percorso completo del file di  log dove scrivere i messaggi."
 
 #: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:63
 msgid "The hostname of the database"
@@ -1085,11 +1082,12 @@ msgstr "Hostname del database"
 
 #: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:45
 msgid "The hostname or address of the LDAP server to use for authentication"
-msgstr "Hostname o indirizzo ip del server LDAP da usare per l'autenticazione"
+msgstr ""
+"L'hostname o l'indirizzo ip del server LDAP da usare per l'autenticazione"
 
 #: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:49
 msgid "The maximum logging level to emit."
-msgstr "Livello massimo da considerare."
+msgstr "Livello massimo da scrivere nei log."
 
 #: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:68
 msgid "The name of the application by which to prefix syslog messages."
@@ -1101,7 +1099,7 @@ msgstr "Nome del database da usare"
 
 #: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:83
 msgid "The name of the role"
-msgstr "Nome del ruolo"
+msgstr "Il nome del ruolo"
 
 #: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:58
 #: /usr/share/icingaweb2/application/forms/Config/Authentication/ExternalBackendForm.php:34
@@ -1109,7 +1107,9 @@ msgstr "Nome del ruolo"
 msgid ""
 "The name of this authentication provider that is used to differentiate it "
 "from others"
-msgstr "Nome univoco del servizio di autenticazione"
+msgstr ""
+"Nome del servizio di autenticazione che verrà usato per differenziarlo dagli "
+"altri"
 
 #: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:80
 msgid "The object class used for storing users on the ldap server"
@@ -1134,8 +1134,8 @@ msgid ""
 "The path where users can be found on the ldap server. Leave empty to select "
 "all users available on the specified resource."
 msgstr ""
-"Percorso per trovare gli utenti nel server ldap. Lasciare vuoto per "
-"selezionare tutti gli utenti disponibili nella risorsa specificata."
+"Percorso dove possono essere trovati gli utenti nel server ldap. Lasciare "
+"vuoto per selezionare tutti gli utenti disponibili della risorsa specificata."
 
 #: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:109
 msgid "The permissions to grant. You may select more than one permission"
@@ -1143,11 +1143,11 @@ msgstr "Permessi da assegnare. E' possibile selezionare più di un permesso"
 
 #: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:56
 msgid "The port of the LDAP server to use for authentication"
-msgstr "Porta del server LDAP da usare per l'autencazione "
+msgstr "La porta del server LDAP da usare per l'autenticazione"
 
 #: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:73
 msgid "The port to use"
-msgstr "La porta da usare."
+msgstr "La porta da usare"
 
 #: /usr/share/icingaweb2/application/forms/Config/Resource/FileResourceForm.php:52
 msgid "The regular expression by which to identify columns"
@@ -1158,8 +1158,8 @@ msgid ""
 "The regular expression to use to strip specific parts off from usernames. "
 "Leave empty if you do not want to strip off anything"
 msgstr ""
-"Espressione regolare che identifica le parti da escludere dal nome utente."
-"Lasciare vuoto in caso non si voglia escludere niente"
+"Espressione regolare da usare per separare parti specifiche dai nomi utente. "
+"Lasciare vuoto se non si vuole modificare niente."
 
 #: /usr/share/icingaweb2/application/controllers/ConfigController.php:351
 #, php-format
@@ -1168,9 +1168,9 @@ msgid ""
 "\". Removing the resource can result in noone being able to log in any "
 "longer."
 msgstr ""
-"La risorsa \"%s\" è attualmente in usa dal backend di autenticazione\"%s\". "
-"Rimuovere la risorsa può causare la negazione dell'accesso a tutti gli "
-"utenti."
+"La risorsa \"%s\" è attualmente in uso dal backend di autenticazione \"%s\". "
+"Rimuovere la risorsa potrebbe non impedire a tutti gli utenti di poter "
+"effettuare il login."
 
 #: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:68
 msgid "The resource to use for authenticating with this provider"
@@ -1186,11 +1186,11 @@ msgstr "Tipo di log da utilizzare."
 
 #: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:230
 msgid "The type of resource"
-msgstr "Tipo di risorsa"
+msgstr "Il Tipo di risorsa"
 
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:324
 msgid "The type of the resource to use for this authenticaton provider"
-msgstr "La risorsa da usare per autenticarsi con questo servizio"
+msgstr "Il tipo di risorsa da usare per autenticarsi con questo servizio"
 
 #: /usr/share/icingaweb2/application/forms/Config/Resource/LivestatusResourceForm.php:36
 #: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:35
@@ -1209,17 +1209,17 @@ msgstr "Nome utente da usare per l'autenticazione"
 
 #: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:7
 msgid "There is no such module installed."
-msgstr "Il modulo selezionato non risulta installato"
+msgstr "Il modulo selezionato no risulta installato"
 
 #: /usr/share/icingaweb2/application/views/scripts/showConfiguration.phtml:15
 msgid ""
 "There's an application error preventing you from persisting the configuration"
 msgstr ""
-"Nessun errore applicativo pregiudica il salvataggio della configurazione"
+"Un errore applicativo sta impedendo di rendere la configurazione persistente"
 
 #: /usr/share/icingaweb2/application/views/scripts/showConfiguration.phtml:10
 msgid "This could have one or more of the following reasons:"
-msgstr "Possono esserci svariati motivi:"
+msgstr "Questo potrebbe avere una o più delle seguenti ragioni:"
 
 #: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:46
 msgid "This module has no dependencies"
@@ -1234,22 +1234,22 @@ msgid "UI Debug"
 msgstr "Debug Interfaccia Utente"
 
 #: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:152
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to validate authentication: %s"
-msgstr "Impossibile verificare l'autenticazione: %s"
+msgstr "Non è stato possibile verificare l'autenticazione: %s"
 
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:120
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:148
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:171
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:241
 msgid "Unknown authentication backend provided"
-msgstr "Nome del backend di autenticazione sconosciuto"
+msgstr "Backend di autenticazione sconosciuto"
 
 #: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:91
 #: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:115
 #: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:176
 msgid "Unknown resource provided"
-msgstr "Risorsa fornita sconosciuta"
+msgstr "Risorsa sconosciuta"
 
 #: /usr/share/icingaweb2/application/controllers/DashboardController.php:80
 msgid "Update Dashlet"
@@ -1262,7 +1262,7 @@ msgstr "Aggiorna Ruolo"
 #: /usr/share/icingaweb2/application/views/scripts/roles/update.phtml:3
 #, php-format
 msgid "Update Role %s"
-msgstr "Ruolo %s Aggiornato"
+msgstr "Aggiorna Ruolo %s"
 
 #: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:68
 #: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:16
@@ -1271,7 +1271,7 @@ msgstr "Url"
 
 #: /usr/share/icingaweb2/application/forms/PreferenceForm.php:184
 msgid "Use benchmark"
-msgstr "Mostra prestazioni"
+msgstr "Attiva analisi delle prestazioni"
 
 #: /usr/share/icingaweb2/application/forms/PreferenceForm.php:161
 msgid "Use the following language to display texts and messages"
@@ -1279,16 +1279,16 @@ msgstr "Usa la lingua seguente per visualizzare testi e messaggi"
 
 #: /usr/share/icingaweb2/application/forms/PreferenceForm.php:173
 msgid "Use the following timezone for dates and times"
-msgstr "Usa il fuso orario seguente per data e ora"
+msgstr "Usa il seguente fuso orario per data e ora"
 
 #: /usr/share/icingaweb2/application/forms/Config/General/ApplicationConfigForm.php:50
 msgid "User Preference Storage Type"
-msgstr "Salvataggio delle Preferenze degli Utenti "
+msgstr "Metodo di salvataggio delle preferenze degli utenti"
 
 #: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:91
 #: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:33
 msgid "Username"
-msgstr "Nome utente"
+msgstr "Nome Utente"
 
 #: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:91
 #: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:16
@@ -1311,7 +1311,7 @@ msgstr "Warning"
 
 #: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:25
 msgid "Welcome to Icinga Web 2"
-msgstr "Benvenuto in Icinga Web 2"
+msgstr "Benvenuto in Icinga Web 2!"
 
 #: /usr/share/icingaweb2/application/views/scripts/dashboard/index.phtml:10
 msgid "Welcome to Icinga Web!"
@@ -1319,7 +1319,7 @@ msgstr "Benvenuto in Icinga Web!"
 
 #: /usr/share/icingaweb2/application/views/scripts/showConfiguration.phtml:13
 msgid "You don't have file-system permissions to write to the file"
-msgstr "Impossibile srivere sul file. Controllare i permessi su file system."
+msgstr "Nessun permesso per scrivere nel file"
 
 #: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:21
 msgid ""
@@ -1327,8 +1327,8 @@ msgid ""
 "authentication mechanisms. Make sure you'll configure such, otherwise you'll "
 "not be able to login."
 msgstr ""
-"Non è possibile utilizzare nessun meccanimo di autenticazioneSi prega di "
-"configurarne almeno uno per potersi connettere. "
+"Non sei autenticato con nessun meccanismo di autenticazione. Si prega di "
+"configurarne almeno uno per poter fare effettuare l'accesso."
 
 #: /usr/share/icingaweb2/application/forms/PreferenceForm.php:160
 msgid "Your Current Language"
@@ -1336,11 +1336,11 @@ msgstr "Lingua Corrente"
 
 #: /usr/share/icingaweb2/application/forms/PreferenceForm.php:172
 msgid "Your Current Timezone"
-msgstr "Fuso Orario Corrente"
+msgstr "Fuso orario corrente"
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/Limiter.php:57
 msgid "all"
-msgstr "tutti"
+msgstr ""
 
 #: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:24
 msgid "disable"
@@ -1365,7 +1365,7 @@ msgstr "fallito"
 #: /usr/share/icingaweb2/library/Icinga/Util/Format.php:82
 #: /usr/share/icingaweb2/library/Icinga/Util/Format.php:88
 msgid "for"
-msgstr "per"
+msgstr ""
 
 #: /usr/share/icingaweb2/application/views/scripts/dashboard/index.phtml:14
 msgid "modules"
@@ -1375,100 +1375,11 @@ msgstr "moduli"
 #: /usr/share/icingaweb2/library/Icinga/Util/Format.php:108
 #: /usr/share/icingaweb2/library/Icinga/Util/Format.php:110
 msgid "since"
-msgstr "da"
+msgstr ""
 
 #: /usr/share/icingaweb2/application/views/scripts/config/devtools.phtml:5
 msgid "toggle"
 msgstr "seleziona"
 
-#~ msgid "Add"
-#~ msgstr "Aggiungi"
-
-#~ msgid "Check this to enable logging."
-#~ msgstr "Selezionare questa casella per abilitare la scrittura nei log."
-
-#~ msgid "Click to add a filter expression to this operator"
-#~ msgstr "Clicca per aggiungere un filtro a questo operatore"
-
-#~ msgid "Connection Validation Failed: "
-#~ msgstr "Verifica della Connessione Fallita: "
-
-#~ msgid "Connectivity validation failed, the provided file does not exist."
-#~ msgstr "Verifica della connessione fallita, il file fornito non esiste."
-
-#~ msgid "Default Language"
-#~ msgstr "Lingua Predefinita"
-
-#~ msgid "Expression"
-#~ msgstr "Espressione"
-
-#~ msgid "Facility"
-#~ msgstr "Facility"
-
-#~ msgid "Failed to persist preferences. (%s)"
-#~ msgstr "Impossibile salvare le preferenze. (%s)"
-
-#~ msgid "Location of your icinga objects.cache file"
-#~ msgstr "Posizione del file objects.cache di icinga"
-
-#~ msgid "Location of your icinga status.dat file"
-#~ msgstr "Posizione del file status.dat di icinga"
-
-#~ msgid "Logging Enabled"
-#~ msgstr "Scrittura Log Abilitata"
-
-#~ msgid "Operator"
-#~ msgstr "Operatore"
-
-#~ msgid "Please enter a number."
-#~ msgstr "Inserire un numero."
-
-#~ msgid "Security check failed, please submit your form again"
-#~ msgstr ""
-#~ "Controllo di sicurezza fallito, si prega di re-inviare nuovamente il "
-#~ "modulo."
-
-#~ msgid ""
-#~ "Select the language to use by default. Can be overwritten by a user in "
-#~ "his preferences."
-#~ msgstr ""
-#~ "Selezionare la lingua predefinita. Può essere sovrascritta dalle "
-#~ "preferenze dell'utente."
-
-#~ msgid "The Syslog facility to utilize."
-#~ msgstr "Facility Syslog da utilizzare"
-
-#~ msgid "The path where users can be found on the ldap server"
-#~ msgstr "Percorso per trovare gli utenti nel server ldap"
-
-#~ msgid "The type of SQL database you want to create."
-#~ msgstr "Tipo di SQL database che si vuole creare."
-
-#~ msgid "Use Default Language"
-#~ msgstr "Usa Lingua Predefinita"
-
-#~ msgid ""
-#~ "Using ldap is not possible, the php extension \"ldap\" is not installed."
-#~ msgstr ""
-#~ "Impossibile usare ldap, l'estensione \"ldap\" per php non è installata"
-
-#~ msgid ""
-#~ "We tried to load a dashboard configuration with no success. Please have "
-#~ "look that the configuration does exist:"
-#~ msgstr ""
-#~ "Non è stato possibile caricare la configurazione della dashboard. Si "
-#~ "prega di controllare che la configurazione esista:"
-
-#~ msgid ""
-#~ "You need to install the php extension \"mysql\" and the Zend_Pdo_Mysql "
-#~ "classes to use  MySQL database resources."
-#~ msgstr ""
-#~ "E' necessario installare l'estensione \"mysql\" di php e le classi "
-#~ "Zend_Pdo_Mysql per poter usare come risorse i database Mysql"
-
-#~ msgid ""
-#~ "You need to install the php extension \"pgsql\" and the Zend_Pdo_Pgsql "
-#~ "classes to use  PostgreSQL database resources."
-#~ msgstr ""
-#~ "E' necessario installare l'estensione \"pgsql\" di php e le classi "
-#~ "Zend_Pdo_Pgsql per poter usare come risorse i database PostgreSQL"
+#~ msgid "Lorem ipsum dolor sit amet"
+#~ msgstr "Lorem ipsum dolor sit amet"

From 235c4271a8547ebbab65ad61245a71aa18882cc9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Feb 2015 11:29:39 +0100
Subject: [PATCH 0651/2920] Add Davide Demuru to the AUTHORS file

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index fe6025dca..30365cbd0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,6 +5,7 @@ Bernd Erk <bernd.erk@icinga.org>
 Boden Garman <boden.garman@spintel.net.au>
 Carlos Cesario <carloscesario@gmail.com>
 Chris Rüll <christopher.ruell@netways.de>
+Davide Demuru <davide.demuru@buongiorno.com>
 Eric Lippmann <eric.lippmann@netways.de>
 Goran Rakic <grakic@devbase.net>
 Gunnar Beutner <gunnar.beutner@netways.de>

From 63ed23643490a97ec9a8ef4fa0e9ec47897b2e2f Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 12 Feb 2015 11:34:12 +0100
Subject: [PATCH 0652/2920] Add tabindex to skip links

Opera needs a tabindex also for anchor elements

refs #7933
---
 doc/accessibility/skip-content.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/doc/accessibility/skip-content.html b/doc/accessibility/skip-content.html
index c785f6c12..3c1b2b492 100644
--- a/doc/accessibility/skip-content.html
+++ b/doc/accessibility/skip-content.html
@@ -85,14 +85,16 @@
             <nav>
                 <h1 class="sr-only">Skip Links</h1>
                 <ul>
-                    <li><a href="#content">Skip to Content</a></li>
-                    <li><a href="#searchField">Skip to Search</a></li>
-                    <li><a href="#navigation">Skip to Navigation</a></li>
+                    <li><a tabindex="0" href="#content">Skip to Content</a></li>
+                    <li><a tabindex="0" href="#searchField">Skip to Search</a></li>
+                    <li><a tabindex="0" href="#navigation">Skip to Navigation</a></li>
                 </ul>
             </nav>
         </div>
         <div id="logo">
-            <img width="92" height="32" title="" alt="" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFwAAAAgCAYAAACfDx/iAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAABcSAAAXEgFnn9JSAAAAB3RJTUUH3gkEDx0B5aU5bgAACCxJREFUaN7tmn2slmUdx7+/5+UcPFhAeQR0SSnOEodFWSPZdGxGZsWhiZFZq+myl5WZDWchIW4VODa3cDPNNWfFS9aquWmWyaJss1qDcE1txstKFPCEHA7ynPM8n/7gdx1/XN73cx7o0B9xru3e/dzX+/W9vtfv7Xqk40zAdOAhYAjYClzk+RpPY5iAKlAHnuS1ado4Qu1T5TjaVCVNlnRRyGv5e+E4pGMPOJKGJA1k35L0z3FIx16kmL9XZOJk07gMHz0l8GRmEVSZ2WvyA6BmZgD3SPqXpG1m9iBQM7PhcVjbM1aAAV3AJ4CzIpPbtFsInBO+a+MMHz3VnK4AWyW9RVIX0COpATRz5rvcr0s6VdJOoCqpaWbDRSclKFrzehSdnJNGabromCjpXElNz59tZs2c6WYmM2tJ6pU0aGZDZjayKUUget40STNi3kl7EtLCgZuBg8A6YFkmJq4A7gDuAj4GLE2b4SKpnXL9NHAAeAW4H6j5qRiX5cGx6QZuB3qBfwRLpAU0gQawIGunCD7Q5e9mZs3Mcn1x0gNdcSAqDtwZDlDD3feWP8P+BniXb1AVqGT9ngXM9XrD/gDMcU/15FSaQf62gIabfAI+GxSrZZ5mSg+bWW8A+UJJl3udbZK2SLpJ0hqv8pjnlZqhUcb/PypWK2B8zS2RJyS9s03bpgN7naTTJPVIetzMNsW4i5k1gV5Jp5nZ33IbHzAzo+z0FWyERUsnbky7TYonqmSzO5rHaP3HuRQZErWSTahJOrPjXTNbFQaueB+tZOlI2ivpYKrOkdXFDXmzpI9IOsdDBX+X9EMz2wPUzWwokcHNz14vGwE/OWNer0/SeyRNkPSSpMfM7Amg4ic53/Q0jzdKWixpppNuu6SNZrYb6DKzRhvQU9+zzWxrJyQYYbgrzb/SPg0lOZ4rzUwvzAB2ugV0ZWS/v1cFnZCn5cEaSlbPg172k9iP/54FPO96J6YG8Dvg1NBPJIiALwY9k6fVYT2lJyeEq3/teqo6qq4KE1rbAeDDcdIFHmwFWBwsnPXZItd72aGC/g/6+zuhz4luXvYnWgMTfJw5AdzhAsABdjjo1YwYa9rMY9DfG9t54MBs4OXQx9udvB1bL2c4SIcKGJjY/cGySQTAPxra/SiUf8HzXvH3duAmYGkwRdO4lzjLJzkAgwHwHn8PBIsI4F7gBuBh/z7s780Zsfqy8n3A14FbgGc9L5m2i3xNloVFzM3omJ7MT2C72Er6fX4Ju5vA16Lz0wbwqyLgnt8D/CnkbwziLLH/8VD+K8+b4gQYAdzzbwygtYDzMlCvCeVN4OIw3qNhnN8WzOOhUP7nPG7kprS5c5efqJmFsZQCVzxNdrukr7rCmyepW9IOSY9IqqcFHaMZV5V0uqRZ/r1f0uecqYdCvas9EilJT4fYe1FaIqkhqUvSMjN7GqhLGgZOMbMfAEskXeH1F0j6vaRJrlzlMf1rgQmSDgf5fI2kfa5En8nmYa5IP+mxpWS5Vf33bZI+fpTFknmKlchYYE2bk3C9K9daEcvbMLwKvDWyJsjh/ISdCVwavNbXlzB8R5CdF2R9pfDDl8OY93q7qeHEPucnyArmMR14v5/MWJ5OUH8QSRtCn7t9DSP4VHJmm1ky2T4l6VtAdxAdUUv/TNI6SVeV2a8dplZijAfHYtkeSZsljRZjj+MfTv6F92XpPYo53PJnZB4Bk+fN7BEzG5REKAdY5CfFwsnc5thOlTTfyww44mkC50taJmk6sE/SfZIOmdnetJsOaiTWfEmLJH3IZdszbY58budbG8CiudXwumMRB+i4j2Cvf1fSG7xtXdIvzexul+84Jtf5HOuSVrk9v0HSBd7dCjN7INnxNVcwT2Ue5EJJHygKpQYG/kLSXyQ95TJz7Nzfo1nOiQK2zfgt4FZJn3HWVxyXPuDHkvolVYEZki4LOuAe34y7JN3i7c4G5prZHwDVJK0tUGqStNLvKaPHGNk3aGZzkrg5BrHCaCGG4AFW0mL/S7F1POnZ5EFmc5wkqd893qud2UkkbfL1NdzASBu11sMkVpN0acmA57rmHQgXEzGmQbBSjuUWxzpheHK39epfMP6XEVQzs/XADpf3v3E9MiEwviVpZSBQTdKbMkmB13sHcKGZbalIeqFk3AEfhDJQXMFSdtvThuFRCU52Nli24Cbwc9/Yy04Utg6MObl69OoFuST90cw2B+AkqeHs/lJ2YodcYadn2NvUvf/r03FZHRo0kw0q6admdiBn9xgt8t+Sdvr3TEkLHOBuVy74rdKHvf7qgtDwWKRBFx3mFkWfy+9uSV0O7LUOWpcTK/kGSx2riqRvSrrYpcUl/sxPIHu6EpiS7MnvZZ7khrG42Ciyw0P5feFSIwGcypZn87nZ8yeV2OHbgx0+MwaNgscY7fDvh7ars7FWhrY3ZDdWd4ZwQCuUWZEL717o1lBvcZzQNOB9wOn+Xc+jYccJeIylrA/lU4C9WRyjKOC0E3id95UAH8gA3xWCXeeVAP6V0Pf9WUBsVwfz2OOOUhV4IJTf4XOrlIQ4bg2k2pLszYqZ7TazR83sRf8eOkbZXJZeDL/3BhndL+ndOvL3uC4/ns0g1uru+MwzswNm1jKz/V4+MRtjl8tfuU6qHr1mqsEtl6TngjV0UNJcLy+bxz5J7zWzF1yR10Nf69ySa+UXG97/7UE/nXJC70oDy/qAG0vuUc1ZsD+ImJeBFQWBIgGTgW8DZ2dx8m8A8/KAWjaPJcDnC/IrIQj2kouApgekbovzCKJtOXB5UVy8YJ1vA+4Epv4HBqUeGKwVd68AAAAASUVORK5CYII=" />
+            <a href="skip-content.html">
+                <img width="92" height="32" title="" alt="" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFwAAAAgCAYAAACfDx/iAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAABcSAAAXEgFnn9JSAAAAB3RJTUUH3gkEDx0B5aU5bgAACCxJREFUaN7tmn2slmUdx7+/5+UcPFhAeQR0SSnOEodFWSPZdGxGZsWhiZFZq+myl5WZDWchIW4VODa3cDPNNWfFS9aquWmWyaJss1qDcE1txstKFPCEHA7ynPM8n/7gdx1/XN73cx7o0B9xru3e/dzX+/W9vtfv7Xqk40zAdOAhYAjYClzk+RpPY5iAKlAHnuS1ado4Qu1T5TjaVCVNlnRRyGv5e+E4pGMPOJKGJA1k35L0z3FIx16kmL9XZOJk07gMHz0l8GRmEVSZ2WvyA6BmZgD3SPqXpG1m9iBQM7PhcVjbM1aAAV3AJ4CzIpPbtFsInBO+a+MMHz3VnK4AWyW9RVIX0COpATRz5rvcr0s6VdJOoCqpaWbDRSclKFrzehSdnJNGabromCjpXElNz59tZs2c6WYmM2tJ6pU0aGZDZjayKUUget40STNi3kl7EtLCgZuBg8A6YFkmJq4A7gDuAj4GLE2b4SKpnXL9NHAAeAW4H6j5qRiX5cGx6QZuB3qBfwRLpAU0gQawIGunCD7Q5e9mZs3Mcn1x0gNdcSAqDtwZDlDD3feWP8P+BniXb1AVqGT9ngXM9XrD/gDMcU/15FSaQf62gIabfAI+GxSrZZ5mSg+bWW8A+UJJl3udbZK2SLpJ0hqv8pjnlZqhUcb/PypWK2B8zS2RJyS9s03bpgN7naTTJPVIetzMNsW4i5k1gV5Jp5nZ33IbHzAzo+z0FWyERUsnbky7TYonqmSzO5rHaP3HuRQZErWSTahJOrPjXTNbFQaueB+tZOlI2ivpYKrOkdXFDXmzpI9IOsdDBX+X9EMz2wPUzWwokcHNz14vGwE/OWNer0/SeyRNkPSSpMfM7Amg4ic53/Q0jzdKWixpppNuu6SNZrYb6DKzRhvQU9+zzWxrJyQYYbgrzb/SPg0lOZ4rzUwvzAB2ugV0ZWS/v1cFnZCn5cEaSlbPg172k9iP/54FPO96J6YG8Dvg1NBPJIiALwY9k6fVYT2lJyeEq3/teqo6qq4KE1rbAeDDcdIFHmwFWBwsnPXZItd72aGC/g/6+zuhz4luXvYnWgMTfJw5AdzhAsABdjjo1YwYa9rMY9DfG9t54MBs4OXQx9udvB1bL2c4SIcKGJjY/cGySQTAPxra/SiUf8HzXvH3duAmYGkwRdO4lzjLJzkAgwHwHn8PBIsI4F7gBuBh/z7s780Zsfqy8n3A14FbgGc9L5m2i3xNloVFzM3omJ7MT2C72Er6fX4Ju5vA16Lz0wbwqyLgnt8D/CnkbwziLLH/8VD+K8+b4gQYAdzzbwygtYDzMlCvCeVN4OIw3qNhnN8WzOOhUP7nPG7kprS5c5efqJmFsZQCVzxNdrukr7rCmyepW9IOSY9IqqcFHaMZV5V0uqRZ/r1f0uecqYdCvas9EilJT4fYe1FaIqkhqUvSMjN7GqhLGgZOMbMfAEskXeH1F0j6vaRJrlzlMf1rgQmSDgf5fI2kfa5En8nmYa5IP+mxpWS5Vf33bZI+fpTFknmKlchYYE2bk3C9K9daEcvbMLwKvDWyJsjh/ISdCVwavNbXlzB8R5CdF2R9pfDDl8OY93q7qeHEPucnyArmMR14v5/MWJ5OUH8QSRtCn7t9DSP4VHJmm1ky2T4l6VtAdxAdUUv/TNI6SVeV2a8dplZijAfHYtkeSZsljRZjj+MfTv6F92XpPYo53PJnZB4Bk+fN7BEzG5REKAdY5CfFwsnc5thOlTTfyww44mkC50taJmk6sE/SfZIOmdnetJsOaiTWfEmLJH3IZdszbY58budbG8CiudXwumMRB+i4j2Cvf1fSG7xtXdIvzexul+84Jtf5HOuSVrk9v0HSBd7dCjN7INnxNVcwT2Ue5EJJHygKpQYG/kLSXyQ95TJz7Nzfo1nOiQK2zfgt4FZJn3HWVxyXPuDHkvolVYEZki4LOuAe34y7JN3i7c4G5prZHwDVJK0tUGqStNLvKaPHGNk3aGZzkrg5BrHCaCGG4AFW0mL/S7F1POnZ5EFmc5wkqd893qud2UkkbfL1NdzASBu11sMkVpN0acmA57rmHQgXEzGmQbBSjuUWxzpheHK39epfMP6XEVQzs/XADpf3v3E9MiEwviVpZSBQTdKbMkmB13sHcKGZbalIeqFk3AEfhDJQXMFSdtvThuFRCU52Nli24Cbwc9/Yy04Utg6MObl69OoFuST90cw2B+AkqeHs/lJ2YodcYadn2NvUvf/r03FZHRo0kw0q6admdiBn9xgt8t+Sdvr3TEkLHOBuVy74rdKHvf7qgtDwWKRBFx3mFkWfy+9uSV0O7LUOWpcTK/kGSx2riqRvSrrYpcUl/sxPIHu6EpiS7MnvZZ7khrG42Ciyw0P5feFSIwGcypZn87nZ8yeV2OHbgx0+MwaNgscY7fDvh7ars7FWhrY3ZDdWd4ZwQCuUWZEL717o1lBvcZzQNOB9wOn+Xc+jYccJeIylrA/lU4C9WRyjKOC0E3id95UAH8gA3xWCXeeVAP6V0Pf9WUBsVwfz2OOOUhV4IJTf4XOrlIQ4bg2k2pLszYqZ7TazR83sRf8eOkbZXJZeDL/3BhndL+ndOvL3uC4/ns0g1uru+MwzswNm1jKz/V4+MRtjl8tfuU6qHr1mqsEtl6TngjV0UNJcLy+bxz5J7zWzF1yR10Nf69ySa+UXG97/7UE/nXJC70oDy/qAG0vuUc1ZsD+ImJeBFQWBIgGTgW8DZ2dx8m8A8/KAWjaPJcDnC/IrIQj2kouApgekbovzCKJtOXB5UVy8YJ1vA+4Epv4HBqUeGKwVd68AAAAASUVORK5CYII=" />
+            </a>
         </div>
     </div>
     <div class="container clearfix">
@@ -122,7 +124,7 @@
         <div class="skip-links skip-links-inline">
             <nav>
                 <ul>
-                    <li><a href="#content2">Skip content</a></li>
+                    <li><a tabindex="0" href="#content2">Skip content</a></li>
                 </ul>
             </nav>
         </div>

From c1af7415e77bf02a5d3abe1f8a62db333f8a7d1e Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Thu, 12 Feb 2015 10:59:43 +0100
Subject: [PATCH 0653/2920] Puppet: make icinga2::feature disableable

---
 .puppet/modules/icinga2/manifests/feature.pp | 31 ++++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/.puppet/modules/icinga2/manifests/feature.pp b/.puppet/modules/icinga2/manifests/feature.pp
index cfba05a9f..12c2e6d98 100644
--- a/.puppet/modules/icinga2/manifests/feature.pp
+++ b/.puppet/modules/icinga2/manifests/feature.pp
@@ -10,29 +10,22 @@
 #
 #   icinga2::feature { 'example-feature'; }
 #
-define icinga2::feature ($source = undef) {
+define icinga2::feature ($ensure = 'present') {
   include icinga2
 
-  $target = "features-available/${name}"
-  $cfgpath = '/etc/icinga2'
-  $path = "${cfgpath}/features-enabled/${name}.conf"
-
-  if $source != undef {
-    icinga2::config { $target:
-      source => $source,
-    }
+  $action = $ensure ? {
+    /(present)/ => 'enable',
+    /(absent)/  => 'disable',
+  }
+  $test = $ensure ? {
+    /(present)/ => '-e',
+    /(absent)/  => '! -e',
   }
 
-  parent_dirs { $path:
-    user    => 'icinga',
-    require => [
-      User['icinga'],
-      File['icinga2cfgDir']
-    ],
-  }
-  -> file { $path:
-    ensure  => link,
-    target  => "${cfgpath}/${target}.conf",
+  exec { "icinga2-feature-${action}-${name}":
+    unless  => "/usr/bin/test ${test} /etc/icinga2/features-enabled/${name}.conf",
+    command => "/usr/sbin/icinga2 feature ${action} ${name}",
+    require => Package['icinga2'],
     notify  => Service['icinga2'],
   }
 }

From be1f1955ecb35d14ca264438e9b9adad0057b1e1 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Thu, 12 Feb 2015 11:11:32 +0100
Subject: [PATCH 0654/2920] Puppet: icinga2_dev: disable Icinga 2 feature
 `ido-pgsql'

---
 .puppet/profiles/icinga2_dev/manifests/init.pp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.puppet/profiles/icinga2_dev/manifests/init.pp b/.puppet/profiles/icinga2_dev/manifests/init.pp
index 484042b64..a6ee98683 100644
--- a/.puppet/profiles/icinga2_dev/manifests/init.pp
+++ b/.puppet/profiles/icinga2_dev/manifests/init.pp
@@ -6,6 +6,7 @@
 #
 #   icinga2_mysql
 #   icinga2::config
+#   icinga2::feature
 #
 # Sample Usage:
 #
@@ -21,4 +22,9 @@ class icinga2_dev {
     'conf.d/test-config', 'conf.d/commands', 'constants' ]:
     source => 'puppet:///modules/icinga2_dev',
   }
+
+  icinga2::feature { 'ido-pgsql':
+    ensure  => absent,
+    require => Class['icinga2_pgsql'],
+  }
 }

From cfaad099cb0b42f7edf699e8c0cf8ffccbaed041 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Thu, 12 Feb 2015 11:52:55 +0100
Subject: [PATCH 0655/2920] Puppet: icinga2_mysql: instantiate icinga2::config
 manually as icinga2::feature doesn't have the parameter $source anymore

---
 .puppet/modules/icinga2_mysql/manifests/init.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.puppet/modules/icinga2_mysql/manifests/init.pp b/.puppet/modules/icinga2_mysql/manifests/init.pp
index acef7a5c1..e076af873 100644
--- a/.puppet/modules/icinga2_mysql/manifests/init.pp
+++ b/.puppet/modules/icinga2_mysql/manifests/init.pp
@@ -28,7 +28,8 @@ class icinga2_mysql {
     privileges => 'SELECT,INSERT,UPDATE,DELETE',
     schemafile => '/usr/share/icinga2-ido-mysql/schema/mysql.sql',
   }
-  -> icinga2::feature { 'ido-mysql':
+  -> icinga2::config { 'features-available/ido-mysql':
     source => 'puppet:///modules/icinga2_mysql',
   }
+  -> icinga2::feature { 'ido-mysql': }
 }

From ca4477de5ba0a2e1877127d73e0edef50e91d920 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 12 Feb 2015 12:45:06 +0100
Subject: [PATCH 0656/2920] Skip Links: Add to body and create style

refs #7933
---
 application/layouts/scripts/body.phtml      | 16 ++++++++++
 application/views/scripts/layout/menu.phtml |  3 +-
 public/css/icinga/defaults.less             | 26 ++++++++++++++++
 public/css/icinga/layout-colors.less        | 23 --------------
 public/css/icinga/layout-structure.less     | 15 ++++++++++
 public/css/icinga/menu.less                 | 33 +++++++++++++++++++++
 6 files changed, 92 insertions(+), 24 deletions(-)

diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index a40715458..e5e6ed9da 100644
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -7,6 +7,22 @@ use Icinga\Authentication\Manager as Auth;
 
 if (Auth::getInstance()->isAuthenticated()): ?>
  <div id="header">
+   <div class="skip-links">
+     <nav>
+       <h1 class="sr-only"><?= t('Accessibility Skip Links'); ?></h1>
+       <ul>
+         <li>
+           <a tabindex="0" href="#main"><?= t('Skip to Content'); ?></a>
+         </li>
+         <li>
+           <a tabindex="0" href="#search"><?= t('Skip to Search'); ?></a>
+         </li>
+         <li>
+           <a tabindex="0" href="#navigation"><?= t('Skip to Navigation'); ?></a>
+         </li>
+       </ul>
+     </nav>
+   </div>
    <ul id="notifications"><?php
 
 $moduleName = $this->layout()->moduleName;
diff --git a/application/views/scripts/layout/menu.phtml b/application/views/scripts/layout/menu.phtml
index a1e13b060..d169ec8fc 100644
--- a/application/views/scripts/layout/menu.phtml
+++ b/application/views/scripts/layout/menu.phtml
@@ -5,9 +5,10 @@ use Icinga\Web\Widget\SearchDashboard;
 <? if (SearchDashboard::search('dummy')->getPane('search')->hasDashlets()): ?>
     <form action="<?= $this->href('search') ?>" method="get" role="search">
         <input
-            type="text" name="q" class="search" placeholder="<?= $this->translate('Search...') ?>"
+            type="text" name="q" id="search" class="search" placeholder="<?= $this->translate('Search...') ?>"
             autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
         />
     </form>
 <? endif; ?>
 <?= $menuRenderer; ?>
+
diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index d5ba0d975..d3c718db2 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -1,5 +1,31 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
+/* Color definitions */
+@colorGray: #f9f9f9;
+@colorLinkDefault: #049baf;
+@colorTextDefault: #666;
+@colorTextDarkDefault: #555;
+@colorPetrol: #049baf;
+@colorOk: #44bb77;
+@colorWarning: #ffaa44;
+@colorWarningHandled: #ffcc66;
+@colorCritical: #ff5566;
+@colorCriticalHandled: #ff99aa;
+/*
+@colorUnknown: #dd66ff;
+@colorUnknownHandled: #ee99ff;
+@colorUnreachable: #dd66ff;
+@colorUnreachableHandled: #ee99ff;
+*/
+@colorUnknown: #aa44ff;
+@colorUnknownHandled: #cc77ff;
+@colorUnreachable: #aa44ff;
+@colorUnreachableHandled: #cc77ff;
+@colorPending: #77aaff;
+@colorInvalid: #999;
+
+
+
 /*** Base rules ***/
 * {
   font-size: 100%;
diff --git a/public/css/icinga/layout-colors.less b/public/css/icinga/layout-colors.less
index b4de5070c..74ce55bb0 100644
--- a/public/css/icinga/layout-colors.less
+++ b/public/css/icinga/layout-colors.less
@@ -39,26 +39,3 @@
   }
 }
 
-@colorLinkDefault: #049baf;
-@colorTextDefault: #666;
-@colorTextDarkDefault: #555;
-@colorPetrol: #049baf;
-@colorOk: #44bb77;
-@colorWarning: #ffaa44;
-@colorWarningHandled: #ffcc66;
-@colorCritical: #ff5566;
-@colorCriticalHandled: #ff99aa;
-/*
-@colorUnknown: #dd66ff;
-@colorUnknownHandled: #ee99ff;
-@colorUnreachable: #dd66ff;
-@colorUnreachableHandled: #ee99ff;
-*/
-@colorUnknown: #aa44ff;
-@colorUnknownHandled: #cc77ff;
-@colorUnreachable: #aa44ff;
-@colorUnreachableHandled: #cc77ff;
-
-@colorPending: #77aaff;
-@colorInvalid: #999;
-
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index df6fe4dc6..a8f135712 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -355,3 +355,18 @@ html {
   vertical-align: top;
   width: 2em;
 }
+
+/*
+ * Class to hide content from users but available for screen reader
+ * @todo(mh): Replace .audible class
+ */
+.sr-only {
+  border: 0;
+  clip: rect(0 0 0 0);
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  padding: 0;
+  position: absolute;
+  width: 1px;
+}
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 8bc16a547..e32ef1ad9 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -267,3 +267,36 @@ a:focus {
   color: #21b5ad;
   outline: none;
 }
+
+/* Accessibility Skip Links */
+.skip-links {
+  position: absolute;
+  opacity: 1;
+  ul {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    li {
+      display: inline;
+      margin: 0;
+      padding: 0;
+      a {
+        position: absolute;
+        display: block;
+        left: -999em;
+        width: 10.4em;
+        top: 0.4em;
+        padding: 0.8em;
+        background-color: white;
+        z-index: 4;
+        border: 1px @colorGray solid;
+        &:focus {
+          left: 0;
+        }
+      }
+    }
+  }
+}
+.skip-links-inline {
+  margin-top: -3.5em;
+}

From 53818f50c6da773d006074b1de92b9f525ab61cf Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 12 Feb 2015 13:08:08 +0100
Subject: [PATCH 0657/2920] Skip Links: Add anchor handlint to events

refs #7933
---
 application/views/scripts/layout/menu.phtml |  1 +
 public/js/icinga/events.js                  | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/application/views/scripts/layout/menu.phtml b/application/views/scripts/layout/menu.phtml
index d169ec8fc..e4e89bf25 100644
--- a/application/views/scripts/layout/menu.phtml
+++ b/application/views/scripts/layout/menu.phtml
@@ -10,5 +10,6 @@ use Icinga\Web\Widget\SearchDashboard;
         />
     </form>
 <? endif; ?>
+<h1 id="navigation" class="sr-only"><?= t('Navigation'); ?></h1>
 <?= $menuRenderer; ?>
 
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 16b6fb0f5..cae835351 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -334,6 +334,17 @@
             return false;
         },
 
+        handleAnchor: function(query) {
+            var element = $(query);
+            if (element.length > 0) {
+                // If we want to focus an element which has no tabindex
+                // add one that we can focus is
+                if (element.prop('tabindex') < 0) {
+                    element.prop('tabindex', 0);
+                }
+                element.focus();
+            }
+        },
 
         /**
          * Someone clicked a link or tr[href]
@@ -383,7 +394,6 @@
                 return;
             }
 
-
             // ignore multiselect table row clicks
             if ($a.is('tr') && $a.closest('table.multiselect').length > 0) {
                 return;
@@ -393,6 +403,12 @@
             event.stopPropagation();
             event.preventDefault();
 
+            // This is an anchor only
+            if (href.substr(0, 1) === '#' && href.substr(1, 1) !== '!') {
+                self.handleAnchor(href);
+                return;
+            }
+
             // If link has hash tag...
             if (href.match(/#/)) {
                 if (href === '#') {

From b6daf2237d4ff79431cebb14e73901ed135fc715 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 12 Feb 2015 13:13:00 +0100
Subject: [PATCH 0658/2920] Menu: Add html5 nav element to menu

refs #7933
---
 application/views/scripts/layout/menu.phtml |  7 +++---
 library/Icinga/Web/MenuRenderer.php         |  2 +-
 public/css/icinga/menu.less                 | 28 ++++++++++-----------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/application/views/scripts/layout/menu.phtml b/application/views/scripts/layout/menu.phtml
index e4e89bf25..920677d7f 100644
--- a/application/views/scripts/layout/menu.phtml
+++ b/application/views/scripts/layout/menu.phtml
@@ -10,6 +10,7 @@ use Icinga\Web\Widget\SearchDashboard;
         />
     </form>
 <? endif; ?>
-<h1 id="navigation" class="sr-only"><?= t('Navigation'); ?></h1>
-<?= $menuRenderer; ?>
-
+<nav>
+    <h1 id="navigation" class="sr-only"><?= t('Navigation'); ?></h1>
+    <?= $menuRenderer; ?>
+</nav>
\ No newline at end of file
diff --git a/library/Icinga/Web/MenuRenderer.php b/library/Icinga/Web/MenuRenderer.php
index 0d07a448e..b201c265a 100644
--- a/library/Icinga/Web/MenuRenderer.php
+++ b/library/Icinga/Web/MenuRenderer.php
@@ -61,7 +61,7 @@ class MenuRenderer extends RecursiveIteratorIterator
      */
     public function beginIteration()
     {
-        $this->tags[] = '<ul role="navigation">';
+        $this->tags[] = '<ul>';
     }
 
     /**
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index e32ef1ad9..873e6abb0 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -27,55 +27,55 @@
   margin-left: 0.0em;
 }
 
-#menu > ul > li > ul {
+#menu > nav > ul > li > ul {
   display: none;
   padding-left: 6px;
 }
 
-.no-js #menu > ul > li > ul {
+.no-js #menu > nav > ul > li > ul {
   display: block;
 }
 
-#menu > ul > li.active > ul {
+#menu > nav > ul > li.active > ul {
   display: block;
 }
 
-#menu > ul > li.active {
+#menu > nav > ul > li.active {
   background-color: white;
   padding-left: 0.0em;
   margin-left: 0;
   margin-right: 0;
 }
 
-#menu > ul > li > a {
+#menu > nav > ul > li > a {
   font-size: 0.9em;
   text-shadow: none;
 }
 
-#menu > ul > li.active > a {
+#menu > nav > ul > li.active > a {
   color: @colorTextDefault;
   text-shadow: none;
 }
 
-#menu > ul > li.active li.active a {
+#menu > nav > ul > li.active li.active a {
   color: @colorPetrol;
 }
 
-#menu > ul > li.active li a:hover {
+#menu > nav > ul > li.active li a:hover {
   text-decoration: underline;
 }
 
-#menu > ul > li {
+#menu > nav > ul > li {
   border-bottom: 1px solid #d9d9d9;
 }
 
-#menu > ul > li li {
+#menu > nav > ul > li li {
   font-size: 0.8em;
   padding-left: 1.6em;
 }
 
 /* Collapsed menu item color */
-#menu > ul > li > a {
+#menu > nav > ul > li > a {
   color: @colorTextDefault;
 }
 
@@ -110,11 +110,11 @@
   padding-bottom: 1em;
 }
 
-#menu > ul > li {
+#menu > nav > ul > li {
   margin-left: 5px;
 }
 
-#menu > ul > li.active {
+#menu > nav > ul > li.active {
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
@@ -262,7 +262,7 @@ a:focus {
 /* Displaying the outline in the navigation is not possible because of the messed up link borders,
    color those links instead. */
 #menu a:focus,
-#menu > ul > li > a:focus,
+#menu > nav > ul > li > a:focus,
 #menu .active ul li a:focus {
   color: #21b5ad;
   outline: none;

From 3d0fbc833de4470a58617c4759dc1efc8d824f80 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 12 Feb 2015 13:44:01 +0100
Subject: [PATCH 0659/2920] Hide the Icinga logo from screen readers

refs #8360
---
 application/layouts/scripts/body.phtml               | 2 +-
 application/views/scripts/authentication/login.phtml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index e5e6ed9da..9f0b78ce9 100644
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -44,7 +44,7 @@ if ($notifications->hasMessages()) {
     }
 }
    ?></ul>
-   <div id="logo" data-base-target="_main"><a href="<?= $this->href('/dashboard') ?>"><img src="<?= $this->href('img/logo_icinga-inv.png') ?>" class="logo" alt="<?= t('Dashboard') ?>" /></a>
+   <div id="logo" data-base-target="_main"><a href="<?= $this->href('/dashboard') ?>"><img aria-hidden="true" src="<?= $this->href('img/logo_icinga-inv.png') ?>" class="logo" alt="<?= t('Dashboard') ?>" /></a>
  </div>
  </div>
 
diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index 805196b96..db0038bf2 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -1,7 +1,7 @@
  <div id="login">
   <div class="logo">
    <div class="image">
-    <img class="fade-in one" src="<?= $this->baseUrl('img/logo_icinga_big.png'); ?>" alt="<?= $this->translate('The Icinga logo'); ?>" >
+    <img aria-hidden="true" class="fade-in one" src="<?= $this->baseUrl('img/logo_icinga_big.png'); ?>" alt="<?= $this->translate('The Icinga logo'); ?>" >
    </div>
   </div>
   <div class="form" data-base-target="layout">

From 9232c5cf22a9fb4dd6a17dc3ab710902509fd9f7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 12 Feb 2015 13:47:00 +0100
Subject: [PATCH 0660/2920] Add aria-hidden="true" to all icons that exist only
 for design reasons

refs #8360
---
 .../views/scripts/authentication/login.phtml       |  4 ++--
 .../scripts/config/authentication/reorder.phtml    |  2 +-
 application/views/scripts/config/resource.phtml    |  2 +-
 .../Icinga/Web/Form/Decorator/NoScriptApply.php    |  2 +-
 .../Icinga/Web/Menu/ForeignMenuItemRenderer.php    |  2 +-
 .../Icinga/Web/Menu/MonitoringMenuItemRenderer.php |  4 ++--
 library/Icinga/Web/MenuRenderer.php                |  6 ++++--
 library/Icinga/Web/Widget/Tab.php                  |  8 ++------
 .../forms/Command/Object/CheckNowCommandForm.php   |  3 ++-
 .../views/scripts/alertsummary/index.phtml         |  6 +++---
 .../application/views/scripts/config/index.phtml   |  4 ++--
 .../application/views/scripts/hosts/show.phtml     | 14 +++++++-------
 .../application/views/scripts/list/comments.phtml  |  2 +-
 .../views/scripts/list/contactgroups.phtml         |  2 +-
 .../application/views/scripts/list/contacts.phtml  |  2 +-
 .../partials/command/objects-command-form.phtml    |  4 ++--
 .../application/views/scripts/services/show.phtml  | 14 +++++++-------
 .../scripts/show/components/acknowledgement.phtml  |  2 +-
 .../scripts/show/components/checkstatistics.phtml  |  2 +-
 .../views/scripts/show/components/command.phtml    |  2 +-
 .../views/scripts/show/components/comments.phtml   |  2 +-
 .../views/scripts/show/components/contacts.phtml   |  4 ++--
 .../views/scripts/show/components/downtime.phtml   |  2 +-
 .../views/scripts/show/components/hostgroups.phtml |  2 +-
 .../scripts/show/components/servicegroups.phtml    |  2 +-
 public/css/icinga/login.less                       |  2 +-
 26 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index db0038bf2..ebfa1ba2b 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -6,7 +6,7 @@
   </div>
   <div class="form" data-base-target="layout">
     <?php if ($requiresSetup): ?>
-    <p class="config-note"><?= sprintf(
+    <p tabindex="0" class="config-note"><?= sprintf(
       $this->translate(
         'It appears that you did not configure Icinga Web 2 yet so it\'s not possible to log in without any defined '
         . 'authentication method. Please define a authentication method by following the instructions in the'
@@ -17,7 +17,7 @@
       '</a>'
     ); ?></p>
     <?php elseif ($requiresExternalAuth): ?>
-    <p class="info-box"><span class="icon-info"></span><?= $this->translate(
+    <p tabindex="0" class="info-box"><i aria-hidden="true" class="icon-info"></i><?= $this->translate(
       'You\'re currently not authenticated using any of the web server\'s authentication mechanisms.'
       . ' Make sure you\'ll configure such, otherwise you\'ll not be able to login.'
     ); ?></p>
diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/authentication/reorder.phtml
index 807f80efe..83f285285 100644
--- a/application/views/scripts/config/authentication/reorder.phtml
+++ b/application/views/scripts/config/authentication/reorder.phtml
@@ -4,7 +4,7 @@
 <div class="content" data-base-target="_next">
   <p>
     <a href="<?= $this->href('/config/createAuthenticationBackend'); ?>">
-      <?= $this->icon('plus'); ?><?= $this->translate('Create A New Authentication Backend'); ?>
+      <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?><?= $this->translate('Create A New Authentication Backend'); ?>
     </a>
   </p>
   <?= $form; ?>
diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index f93b2af82..384993f52 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -4,7 +4,7 @@
 <div class="content" data-base-target="_next">
   <p>
     <a href="<?= $this->href('/config/createresource'); ?>">
-      <?= $this->icon('plus'); ?> <?= $this->translate('Create A New Resource'); ?>
+      <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create A New Resource'); ?>
     </a>
   </p>
   <table class="action">
diff --git a/library/Icinga/Web/Form/Decorator/NoScriptApply.php b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
index fbc96756b..2ea810e16 100644
--- a/library/Icinga/Web/Form/Decorator/NoScriptApply.php
+++ b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
@@ -25,7 +25,7 @@ class NoScriptApply extends Zend_Form_Decorator_Abstract
     {
         if ($content) {
             $content .= '<noscript><button name="noscript_apply" style="margin-left: 0.5em;" type="submit" value="1">'
-                . Icinga::app()->getViewRenderer()->view->icon('refresh.png') . '&nbsp;' . t('Apply')
+                . Icinga::app()->getViewRenderer()->view->icon('refresh.png', null, array('aria-hidden' => 'true')) . '&nbsp;' . t('Apply')
                 . '</button></noscript>';
         }
 
diff --git a/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php b/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
index 91b31d23d..2ed418bf3 100644
--- a/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
@@ -16,7 +16,7 @@ class ForeignMenuItemRenderer implements MenuItemRenderer {
         return sprintf(
             '<a href="%s" target="_self">%s%s<span></span></a>',
             $menu->getUrl() ?: '#',
-            $menu->getIcon() ? '<img src="' . Url::fromPath($menu->getIcon()) . '" class="icon" /> ' : '',
+            $menu->getIcon() ? '<img aria-hidden="true" src="' . Url::fromPath($menu->getIcon()) . '" class="icon" /> ' : '',
             htmlspecialchars($menu->getTitle())
         );
     }
diff --git a/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php b/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php
index cf1673b7a..33e1c6a60 100644
--- a/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php
@@ -80,7 +80,7 @@ class MonitoringMenuItemRenderer implements MenuItemRenderer {
         }
         if ($menu->getIcon() && strpos($menu->getIcon(), '.') === false) {
             return sprintf(
-                '%s <a href="%s" class="icon-%s">%s</a>',
+                '%s <a href="%s"><i aria-hidden="true" class="icon-%s"></i>%s</a>',
                 $badge,
                 $menu->getUrl() ?: '#',
                 $menu->getIcon(),
@@ -92,7 +92,7 @@ class MonitoringMenuItemRenderer implements MenuItemRenderer {
             '%s<a href="%s">%s%s<span></span></a>',
             $badge,
             $menu->getUrl() ?: '#',
-            $menu->getIcon() ? '<img src="' . Url::fromPath($menu->getIcon()) . '" class="icon" /> ' : '',
+            $menu->getIcon() ? '<img aria-hidden="true" src="' . Url::fromPath($menu->getIcon()) . '" class="icon" /> ' : '',
             htmlspecialchars($menu->getTitle())
         );
     }
diff --git a/library/Icinga/Web/MenuRenderer.php b/library/Icinga/Web/MenuRenderer.php
index b201c265a..78e910f61 100644
--- a/library/Icinga/Web/MenuRenderer.php
+++ b/library/Icinga/Web/MenuRenderer.php
@@ -115,7 +115,7 @@ class MenuRenderer extends RecursiveIteratorIterator
         }
         if ($child->getIcon() && strpos($child->getIcon(), '.') === false) {
             return sprintf(
-                '<a href="%s" class="icon-%s">%s</a>',
+                '<a href="%s"><i aria-hidden="true" class="icon-%s"></i>%s</a>',
                 $child->getUrl() ?: '#',
                 $child->getIcon(),
                 htmlspecialchars($child->getTitle())
@@ -124,7 +124,9 @@ class MenuRenderer extends RecursiveIteratorIterator
         return sprintf(
             '<a href="%s">%s%s</a>',
             $child->getUrl() ?: '#',
-            $child->getIcon() ? '<img src="' . Url::fromPath($child->getIcon()) . '" class="icon" /> ' : '',
+            $child->getIcon()
+                ? '<img aria-hidden="true" src="' . Url::fromPath($child->getIcon()) . '" class="icon" /> '
+                : '',
             htmlspecialchars($child->getTitle())
         );
     }
diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index 5da6a811c..2d24d5f40 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -215,13 +215,9 @@ class Tab extends AbstractWidget
 
         if ($this->icon !== null) {
             if (strpos($this->icon, '.') === false) {
-                if ($tagParams && array_key_exists('class', $tagParams)) {
-                    $tagParams['class'] .= ' icon-' . $this->icon;
-                } else {
-                    $tagParams['class'] = 'icon-' . $this->icon;
-                }
+                $caption = $view->icon($this->icon, null, array('aria-hidden' => 'true')) . $caption;
             } else {
-                $caption = $view->img($this->icon, array('class' => 'icon')) . $caption;
+                $caption = $view->img($this->icon, array('aria-hidden' => 'true', 'class' => 'icon')) . $caption;
             }
         }
         if ($this->url !== null) {
diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
index 1e6e4d64d..1a39574f6 100644
--- a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
@@ -35,7 +35,8 @@ class CheckNowCommandForm extends ObjectsCommandForm
                     'ignore'        => true,
                     'type'          => 'submit',
                     'value'         => $this->translate('Check now'),
-                    'label'         => '<i class="icon-reschedule"></i> ' . $this->translate('Check now'),
+                    'label'         => '<i aria-hidden="true" class="icon-reschedule"></i> '
+                        . $this->translate('Check now'),
                     'decorators'    => array('ViewHelper'),
                     'escape'        => false,
                     'class'         => 'link-like'
diff --git a/modules/monitoring/application/views/scripts/alertsummary/index.phtml b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
index dbfff6433..b71456ab6 100644
--- a/modules/monitoring/application/views/scripts/alertsummary/index.phtml
+++ b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
@@ -42,11 +42,11 @@
 
             <span>
                 <?php if ($this->trend->trend === 'up'): ?>
-                    <?= $this->icon('up-open'); ?>
+                    <?= $this->icon('up-open', null, array('aria-hidden' => 'true')); ?>
                 <?php elseif ($this->trend->trend === 'unchanged'): ?>
-                    <?= $this->icon('right-open'); ?>
+                    <?= $this->icon('right-open', null, array('aria-hidden' => 'true')); ?>
                 <?php else: ?>
-                    <?= $this->icon('down-open'); ?>
+                    <?= $this->icon('down-open', null, array('aria-hidden' => 'true')); ?>
                 <?php endif; ?>
             </span>
         </div>
diff --git a/modules/monitoring/application/views/scripts/config/index.phtml b/modules/monitoring/application/views/scripts/config/index.phtml
index b1729f9b1..a0f922ba4 100644
--- a/modules/monitoring/application/views/scripts/config/index.phtml
+++ b/modules/monitoring/application/views/scripts/config/index.phtml
@@ -6,7 +6,7 @@
 <div class="content" data-base-target="_next">
   <p>
     <a href="<?= $this->href('/monitoring/config/createbackend'); ?>">
-      <?= $this->icon('plus'); ?> <?= $this->translate('Create New Monitoring Backend'); ?>
+      <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create New Monitoring Backend'); ?>
     </a>
   </p>
   <table class="action">
@@ -38,7 +38,7 @@
   <h1><?= $this->translate('Monitoring Instances') ?></h1>
   <p>
     <a href="<?= $this->href('/monitoring/config/createinstance'); ?>">
-      <?= $this->icon('plus'); ?> <?= $this->translate('Create New Instance'); ?>
+      <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create New Instance'); ?>
     </a>
   </p>
   <table class="action">
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 5e4674523..0da62ad77 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -31,21 +31,21 @@
 
         <div>
             <a href="<?= $rescheduleAllLink ?>">
-                <?= $this->icon('reschedule') ?>
+                <?= $this->icon('reschedule', null, array('aria-hidden' => 'true')) ?>
                 <?= $this->translate('Reschedule host checks') ?>
             </a>
         </div>
 
         <div>
             <a href="<?= $downtimeAllLink ?>">
-                <?= $this->icon('plug') ?>
+                <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
                 <?= $this->translate('Schedule host downtimes') ?>
             </a>
         </div>
 
         <div>
             <a href="<?= $processCheckResultAllLink; ?>">
-                <?= $this->icon('reply'); ?>
+                <?= $this->icon('reply', null, array('aria-hidden' => 'true')); ?>
                 <?= $this->translate('Submit passive check results'); ?>
             </a>
         </div>
@@ -71,7 +71,7 @@
                 ),
                 $unhandledCount
             ) ?>">
-                <?= $this->icon('plug') ?>
+                <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
                 <?= sprintf(
                     $this->translatePlural(
                         'Schedule downtime for unhandled host problem',
@@ -91,7 +91,7 @@
                 ),
                 $unhandledCount
             ) ?>">
-                <?= $this->icon('ok') ?>
+                <?= $this->icon('ok', null, array('aria-hidden' => 'true')) ?>
                 <?= sprintf(
                     $this->translatePlural(
                         'Acknowledge unhandled host problem',
@@ -133,7 +133,7 @@
                        ),
                        $inDowntimeCount
                    ) ?>">
-                    <?= $this->icon('plug') ?>
+                    <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
                     <?= sprintf(
                         $this->translatePlural(
                             'List %u host currently in downtime',
@@ -158,7 +158,7 @@
                        ),
                        $commentCount
                    ) ?>">
-                    <?= $this->icon('comment') ?>
+                    <?= $this->icon('comment', null, array('aria-hidden' => 'true')) ?>
                     <?= sprintf(
                         $this->translatePlural(
                             'List %u host comment',
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 857017b4d..7d8fe4646 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -59,7 +59,7 @@
           <?= $this->link()->host($comment->host, $comment->host_display_name) ?>
         <?php endif ?>
           <br>
-          <?= $this->icon('comment'); ?> <?= isset($comment->author)
+          <?= $this->icon('comment', null, array('aria-hidden' => 'true')); ?> <?= isset($comment->author)
             ? '[' . $comment->author . '] '
             : '';
           ?><?= $this->escape($comment->comment); ?>
diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index f25548c52..99d070c31 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -20,7 +20,7 @@ foreach ($groupData as $groupName => $groupInfo): ?>
             <div class="box contents">
 <?php foreach ($groupInfo['contacts'] as $c): ?>
                 <div class="box entry">
-                    <img src="<?= $this->href('/static/gravatar', array('email' => $c->contact_email )) ?>" />
+                    <img aria-hidden="true" src="<?= $this->href('/static/gravatar', array('email' => $c->contact_email )) ?>" />
                     <a href="<?= $this->href(
                         'monitoring/show/contact',
                         array('contact' => $c->contact_name)
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index d8d2a2e72..292617493 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -14,7 +14,7 @@
     }
     foreach ($contacts as $contact): ?>
         <div class="contact">
-            <img src="<?= $this->href('/static/gravatar', array('email' => $contact->contact_email )) ?>" />
+            <img aria-hidden="true" src="<?= $this->href('/static/gravatar', array('email' => $contact->contact_email )) ?>" />
             <a href="<?= $this->href(
                 'monitoring/show/contact',
                 array('contact' => $contact->contact_name)
diff --git a/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml b/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
index da58fc9cb..a92302775 100644
--- a/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
+++ b/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
@@ -9,8 +9,8 @@
     <table class="objectlist">
         <thead>
             <tr>
-                <th><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
-                <th><?= $this->icon('conf'); ?> <?= $this->translate('Service'); ?></th>
+                <th><?= $this->icon('host', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Host'); ?></th>
+                <th><?= $this->icon('conf', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Service'); ?></th>
             </tr>
         </thead>
         <tbody>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 229d63f0d..44951735a 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -19,21 +19,21 @@
 
         <div>
             <a href="<?= $rescheduleAllLink ?>">
-                <?= $this->icon('reschedule') ?>
+                <?= $this->icon('reschedule', null, array('aria-hidden' => 'true')) ?>
                 <?= $this->translate('Reschedule service checks') ?>
             </a>
         </div>
 
         <div>
             <a href="<?= $downtimeAllLink ?>">
-                <?= $this->icon('plug') ?>
+                <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
                 <?= $this->translate('Schedule service downtimes') ?>
             </a>
         </div>
 
         <div>
             <a href="<?= $processCheckResultAllLink; ?>">
-                <?= $this->icon('reply'); ?>
+                <?= $this->icon('reply', null, array('aria-hidden' => 'true')); ?>
                 <?= $this->translate('Submit passive check results'); ?>
             </a>
         </div>
@@ -59,7 +59,7 @@
                 ),
                 $unhandledCount
             ) ?>">
-                <?= $this->icon('plug') ?>
+                <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
                 <?= sprintf(
                     $this->translatePlural(
                         'Schedule downtime for unhandled service problem',
@@ -79,7 +79,7 @@
                 ),
                 $unhandledCount
             ) ?>">
-                <?= $this->icon('ok') ?>
+                <?= $this->icon('ok', null, array('aria-hidden' => 'true')) ?>
                 <?= sprintf(
                     $this->translatePlural(
                         'Acknowledge unhandled service problem',
@@ -119,7 +119,7 @@
                         $inDowntimeCount
                     ),
                 $inDowntimeCount) ?>">
-                    <?= $this->icon('plug') ?>
+                    <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
                     <?= sprintf(
                         $this->translatePlural(
                             'List %u service currently in downtime',
@@ -143,7 +143,7 @@
                     ),
                     $commentCount
                 ) ?>">
-                    <?= $this->icon('comment') ?>
+                    <?= $this->icon('comment', null, array('aria-hidden' => 'true')) ?>
                     <?= sprintf(
                         $this->translatePlural(
                             'List %u service comment',
diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index 8da35590f..c5c2a5667 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -36,7 +36,7 @@ if ($object->acknowledged): ?>
                 }
             ?>
             <a href="<?= $ackLink ?>" data-base-target="_self">
-                <?= $this->icon('ok') ?> <?= $this->translate('Acknowledge') ?>
+                <?= $this->icon('ok', null, array('aria-hidden' => 'true')) ?> <?= $this->translate('Acknowledge') ?>
             </a>
             <?php } else {
                 echo '&#45;';
diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index ec0c2792a..5545790ab 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -40,7 +40,7 @@ if ($object->getType() === $object::TYPE_HOST) {
           }
       ?>
       <a href="<?= $reschedule ?>" data-base-target="_self">
-          <?= $this->icon('reschedule') ?>
+          <?= $this->icon('reschedule', null, array('aria-hidden' => 'true')) ?>
           <?= $this->translate('Reschedule') ?>
       </a>
       <?php } // endif ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/command.phtml b/modules/monitoring/application/views/scripts/show/components/command.phtml
index a74b5b884..1041b7ff6 100644
--- a/modules/monitoring/application/views/scripts/show/components/command.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/command.phtml
@@ -22,7 +22,7 @@ $command = array_shift($parts);
                 );
             } ?>
             <a href="<?= $processCheckResult ?>" data-base-target="_self">
-                <?= $this->icon('reply') ?>
+                <?= $this->icon('reply', null, array('aria-hidden' => 'true')) ?>
                 <?= $this->translate('Process check result') ?>
             </a>
         <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index a6503a70b..9973ff037 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -16,7 +16,7 @@
             }
         ?>
         <a href="<?= $addCommentLink ?>" data-base-target="_self">
-            <?= $this->icon('comment') ?>
+            <?= $this->icon('comment', null, array('aria-hidden' => 'true')) ?>
             <?= $this->translate('Add comment') ?>
         </a>
         <?php } else {
diff --git a/modules/monitoring/application/views/scripts/show/components/contacts.phtml b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
index d220968e5..68e6423ff 100644
--- a/modules/monitoring/application/views/scripts/show/components/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
@@ -12,7 +12,7 @@ if (! empty($object->contacts)) {
     printf(
         "<tr><th>%s</th><td>%s %s</td></tr>\n",
         $this->translate('Contacts'),
-	$this->icon('user'),
+        $this->icon('user', null, array('aria-hidden' => 'true')),
         implode(', ', $list)
     );
 
@@ -31,7 +31,7 @@ if (! empty($object->contactgroups)) {
     printf(
         "<tr><th>%s</th><td>%s %s</td></tr>\n",
         $this->translate('Contactgroups'),
-	$this->icon('users'),
+        $this->icon('users', null, array('aria-hidden' => 'true')),
         implode(', ', $list)
     );
 
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 4aa1e21c1..f838b3d61 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -16,7 +16,7 @@
             }
         ?>
         <a href="<?= $scheduleDowntimeLink ?>" data-base-target="_self">
-            <?= $this->icon('plug') ?>
+            <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
             <?= $this->translate('Schedule downtime') ?>
         </a>
         <?php } else {
diff --git a/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml b/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
index 165df627a..3a41f0cd8 100644
--- a/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
@@ -11,7 +11,7 @@ foreach ($object->hostgroups as $name => $alias) {
 printf(
     "<tr><th>%s</th><td>%s %s</td></tr>\n",
     $this->translate('Hostgroups'),
-    $this->icon('host'),
+    $this->icon('host', null, array('aria-hidden' => 'true')),
     implode(', ', $list)
 );
 
diff --git a/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml b/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
index 50b71d839..01de6d71c 100644
--- a/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
@@ -12,7 +12,7 @@ foreach ($object->servicegroups as $name => $alias) {
 printf(
     "<tr><th>%s</th><td>%s %s</td></tr>\n",
     $this->translate('Servicegroups'),
-    $this->icon('services'),
+    $this->icon('services', null, array('aria-hidden' => 'true')),
     implode(', ', $list)
 );
 
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index d09a9f6e0..f6144bd68 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -131,7 +131,7 @@
     height: 2.2em;
     margin: 0 auto 2.5em;
 
-    span.icon-info {
+    i.icon-info {
       float: left;
       height: 100%;
     }

From 1d6c65f7fcf7ab6ec76149618f0a7800477eb86e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 12 Feb 2015 13:47:50 +0100
Subject: [PATCH 0661/2920] Move the login form's heading above the
 authentication warnings

---
 .../views/scripts/authentication/login.phtml        | 13 +++----------
 public/css/icinga/login.less                        |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index ebfa1ba2b..f40f5c4e0 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -5,6 +5,7 @@
    </div>
   </div>
   <div class="form" data-base-target="layout">
+    <h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1>
     <?php if ($requiresSetup): ?>
     <p tabindex="0" class="config-note"><?= sprintf(
       $this->translate(
@@ -22,15 +23,7 @@
       . ' Make sure you\'ll configure such, otherwise you\'ll not be able to login.'
     ); ?></p>
     <?php endif ?>
-    <h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1>
-   <?php
-   /* TODO: remove this as soon as notifications and forms are ready */
-   if (isset($this->errorInfo)): ?>
-    <div class="error">
-    <?= $this->errorInfo ?>
-    </div>
-   <?php endif ?>
-   <?= $this->form ?>
-   <div class="footer">Icinga Web 2 &copy; 2013-2015<br><a href="https://www.icinga.org"><?= $this->translate('The Icinga Project'); ?></a></div>
+    <?= $this->form ?>
+    <div class="footer">Icinga Web 2 &copy; 2013-2015<br><a href="https://www.icinga.org"><?= $this->translate('The Icinga Project'); ?></a></div>
   </div>
  </div>
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index f6144bd68..0211fdc35 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -129,7 +129,7 @@
   p.info-box {
     width: 50%;
     height: 2.2em;
-    margin: 0 auto 2.5em;
+    margin: 2em auto 2.5em;
 
     i.icon-info {
       float: left;

From d37129dfed21b5ce788cba6e485142f95c9a552c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 12 Feb 2015 13:48:20 +0100
Subject: [PATCH 0662/2920] Remove the old and redundant
 config/show-configuration view script

---
 .../scripts/config/show-configuration.phtml   | 28 -------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 modules/monitoring/application/views/scripts/config/show-configuration.phtml

diff --git a/modules/monitoring/application/views/scripts/config/show-configuration.phtml b/modules/monitoring/application/views/scripts/config/show-configuration.phtml
deleted file mode 100644
index 4cd01441c..000000000
--- a/modules/monitoring/application/views/scripts/config/show-configuration.phtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="alert alert-error">
-    <h4><i><i class="icinga-icon-error"></i> </i> Saving &quot;<?= $this->escape($this->file); ?>&quot; failed</h4>
-    <br/>
-    <p>
-        Your <?= $this->escape($this->file); ?> configuration couldn't be stored (error: "<?= $this->exceptionMessage; ?>").<br/>
-        This could have one or more of the following reasons:
-    </p>
-    <ul>
-        <li>You don't have file-system permissions to write to the <?= $this->escape($this->file); ?> file</li>
-        <li>Something went wrong while writing the file</li>
-        <li>There's an application error preventing you from persisting the configuration</li>
-    </ul>
-</div>
-
-<p>
-    Details can be seen in your application log (if you don't have access to this file, call your administrator in this case).
-    <br/>
-    In case you can access the configuration file (config/<?= $this->escape($this->file); ?>) by yourself, you can open it and
-    insert the config manually:
-
-</p>
-<p>
-<pre>
-        <code>
-<?= $this->escape($this->iniConfigurationString); ?>
-        </code>
-    </pre>
-</p>
\ No newline at end of file

From ca0914644c31f99d82d870ccd3ed895e33ae6199 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 12 Feb 2015 14:01:59 +0100
Subject: [PATCH 0663/2920] Use "icingaweb2" instead of "icingaweb" as default
 syslog prefix

---
 library/Icinga/Application/Logger/Writer/SyslogWriter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Application/Logger/Writer/SyslogWriter.php b/library/Icinga/Application/Logger/Writer/SyslogWriter.php
index c0717d550..e18c5eeec 100644
--- a/library/Icinga/Application/Logger/Writer/SyslogWriter.php
+++ b/library/Icinga/Application/Logger/Writer/SyslogWriter.php
@@ -54,7 +54,7 @@ class SyslogWriter extends LogWriter
      */
     public function __construct(ConfigObject $config)
     {
-        $this->ident = $config->get('application', 'icingaweb');
+        $this->ident = $config->get('application', 'icingaweb2');
         $this->facility = static::$facilities['user'];
     }
 

From fdcad4928ef62c5569ef7b746c8862d1f0b93eb3 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 12 Feb 2015 15:06:37 +0100
Subject: [PATCH 0664/2920] Tinystatesummary: Adjust styles for summaries and
 headers

refs #7976
---
 .../list/components/hostssummary.phtml        |  6 +--
 .../list/components/servicesummary.phtml      | 10 ++--
 .../partials/host/servicesummary.phtml        | 10 ++--
 modules/monitoring/public/css/module.less     | 14 +++---
 public/css/icinga/defaults.less               | 48 +++++++++++--------
 5 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
index 2e19ff352..64bd63165 100644
--- a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
@@ -4,9 +4,7 @@ use Icinga\Web\Url;
 
 $selfUrl = 'monitoring/list/hosts';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
-
-?>
-<h1 class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
+?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
     <?= $this->qlink(sprintf($this->translate('%s hosts:'), $this->stats->hosts_total), $selfUrl); ?>
   <span class="badges">
     <?php if($this->stats->hosts_up): ?>
@@ -81,4 +79,4 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
     </span>
     <?php endif; ?>
   </span>
-</h1>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
index c870b09b0..11d7b5d07 100644
--- a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
@@ -1,10 +1,10 @@
 <?php
 
 use Icinga\Web\Url;
+
 $selfUrl = 'monitoring/list/services';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
-
-?><h1 class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
+?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
 <?= $this->qlink(sprintf($this->translate('%s services:'), $this->stats->services_total), $selfUrl) ?>
 <span class="badges">
 <?php if ($this->stats->services_ok): ?>
@@ -15,9 +15,7 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
     array('title' => sprintf($this->translate('Services with state %s'), $this->translate('OK')))
 )  ?></span>
 <?php endif ?>
-
 <?php
-
 foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $state) {
     $pre = 'services_' . $state;
     if ($this->stats->$pre) {
@@ -70,7 +68,6 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
         echo "</span>\n";
     }
 }
-
 ?>
 <?php if ($this->stats->services_pending): ?>
  <span class="state pending<?= $currentUrl === Url::fromPath($selfUrl, array('service_state' => 99))->getRelativeUrl() ? ' active' : '' ?>"><?= $this->qlink(
@@ -81,5 +78,4 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
 )  ?></span>
 <?php endif ?>
 </span>
-</h1>
-
+</div>
diff --git a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
index 641dd026a..d45415c72 100644
--- a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
@@ -1,11 +1,10 @@
 <?php
 
 use Icinga\Web\Url;
+
 $selfUrl = Url::fromPath('monitoring/show/services', array('host' => $this->object->host_name));
 $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
-
-?>
-<h1 class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
+?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
 <?php if ($object->stats->services_total > 0): ?>
 <?= $this->qlink(sprintf($this->translatePlural('%d configured service:', '%d configured services:', $object->stats->services_total), $object->stats->services_total), $selfUrl) ?>
 <?php else: ?>
@@ -21,7 +20,6 @@ $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
 )  ?></span>
 <?php endif ?>
 <?php
-
 foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $state) {
     $pre = 'services_' . $state;
     if ($object->stats->$pre) {
@@ -74,7 +72,6 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
         echo "</span>\n";
     }
 }
-
 ?>
 <?php if ($object->stats->services_pending): ?>
  <span class="state pending<?= $currentUrl === $selfUrl->with('service_state', 99)->getRelativeUrl() ? ' active' : '' ?>"><?= $this->qlink(
@@ -85,5 +82,4 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
 )  ?></span>
 <?php endif ?>
 </span>
-</h1>
-
+</div>
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index b0793ee8d..387df892b 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -91,19 +91,19 @@ div.contacts div.notification-periods {
   margin-top: 0.5em;
 }
 
-h1.tinystatesummary .badges {
+div.tinystatesummary {
+  .page-header();
+  font-size: 1em;
+  .badges {
     display: inline-block;
     margin-bottom: 4px;
     margin-left: 1em;
-}
-
-h1.tinystatesummary .state > a {
+  }
+  .state > a {
     color: white;
     font-size: 0.8em;
     padding: 2px 5px;
-}
-
-h1.tinystatesummary .state.handled a {
+  }
 }
 
 /* State badges */
diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index d3c718db2..3dc277300 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -24,7 +24,20 @@
 @colorPending: #77aaff;
 @colorInvalid: #999;
 
+/* Mixins */
 
+.page-header(@borderSize: 2px; @fontSize: 2em; @textColor: @colorTextDarkDefault) {
+  font-size: @fontSize;
+  color: @textColor;
+  border-bottom: @borderSize solid @colorPetrol;
+  a {
+    text-decoration: none;
+    color: inherit;
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+}
 
 /*** Base rules ***/
 * {
@@ -76,9 +89,7 @@ a:hover {
 
 /* W3C Recommendation <http://www.w3.org/TR/CSS21/sample.html> (except h4) */
 h1 {
-    font-size:    2em;
-    color: @colorTextDefault;
-    border-bottom: 2px solid @colorPetrol;
+    .page-header();
 }
 
 h2 {
@@ -87,19 +98,16 @@ h2 {
 }
 
 h3 {
-    font-size: 1.17em;
-    color: @colorTextDefault;
-    border-bottom: 1px solid @colorPetrol;
+  .page-header(1px, 1.17em);
 }
 
 h4 {
-    font-size:    1em;
-    color: @colorPetrol;
+  font-size:    1em;
+  color: @colorPetrol;
 }
 
 h5 {
-    font-size:  .83em;
-    border-bottom: 1px solid @colorPetrol;
+  .page-header(1px, .83em);
 }
 
 h6 {
@@ -107,17 +115,19 @@ h6 {
     color: @colorPetrol;
 }
 
-h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
-  text-decoration: none;
-  color: inherit;
-}
+h1, h2, h3, h4, h5, h6 {
+  a {
+    text-decoration: none;
+    color: inherit;
 
-h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover {
-  text-decoration: underline;
+    &:hover {
+      text-decoration: underline;
+    }
+  }
 }
 
 button {
-    font-family: inherit;
+  font-family: inherit;
 }
 
 #fontsize-calc {
@@ -128,6 +138,4 @@ button {
   position: absolute;
   top: -2em;
 }
-/*** END of Base rules */
-
-
+/*** END of Base rules */
\ No newline at end of file

From b9c9f564ec5bbb5b357226ffdc36c30c2df70ce3 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 12 Feb 2015 15:12:10 +0100
Subject: [PATCH 0665/2920] Add editable auto_refresh parameter to the user
 preferences

refs #7945
---
 application/forms/PreferenceForm.php               | 11 +++++++++++
 library/Icinga/Web/Controller/ActionController.php |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
index 424f76578..3ee1ebb38 100644
--- a/application/forms/PreferenceForm.php
+++ b/application/forms/PreferenceForm.php
@@ -185,6 +185,17 @@ class PreferenceForm extends Form
             )
         );
 
+        $this->addElement(
+            'checkbox',
+            'auto_refresh',
+            array(
+                'required'      => false,
+                'label'         => $this->translate('Enable auto refresh'),
+                'description'   => $this->translate('This option allows you to enable or to disable the global page content auto refresh'),
+                'value'         => 1
+            )
+        );
+
         if ($this->store) {
             $this->addElement(
                 'submit',
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index f7a21c20e..8764e49ee 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -399,6 +399,10 @@ class ActionController extends Zend_Controller_Action
                     $layout->benchmark = $this->renderBenchmark();
                 }
             }
+
+            if ((bool) $user->getPreferences()->getValue('icingaweb', 'auto_refresh', true) === false) {
+                $this->disableAutoRefresh();
+            }
         }
 
         if ($req->getParam('format') === 'pdf') {

From f586714f022e62a73129b9689841ff34ba7b5df9 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 12 Feb 2015 16:14:07 +0100
Subject: [PATCH 0666/2920] Skip Links: Select a more useful object

Skip links can select a container and find a usable element inside. Adapt
project jquery variable style.

refs #7976
---
 public/css/icinga/menu.less |  5 ++++-
 public/js/icinga/events.js  | 21 ++++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 873e6abb0..6653a250a 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -298,5 +298,8 @@ a:focus {
   }
 }
 .skip-links-inline {
-  margin-top: -3.5em;
+  margin-top: -4em;
+  ul > li > a {
+    width: 16em;
+  }
 }
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index cae835351..57c365649 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -335,14 +335,25 @@
         },
 
         handleAnchor: function(query) {
-            var element = $(query);
-            if (element.length > 0) {
+            var $element = $(query);
+            if ($element.length > 0) {
+                // Try to find the first header. It is more pleasant to users
+                // to select the header instead a container
+                var $header = $element.find(':header:first');
+                if ($header.length > 0) {
+                    $element = $header;
+                } else {
+                    var $input = $element.find(':header:first');
+                    if ($input.length > 0) {
+                        $element = $input
+                    }
+                }
                 // If we want to focus an element which has no tabindex
                 // add one that we can focus is
-                if (element.prop('tabindex') < 0) {
-                    element.prop('tabindex', 0);
+                if ($element.prop('tabindex') < 0) {
+                    $element.prop('tabindex', 0);
                 }
-                element.focus();
+                $element.focus();
             }
         },
 

From 513de11f20f993d4e434a73375ae015685980e3e Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 12 Feb 2015 16:43:08 +0100
Subject: [PATCH 0667/2920] Header: Application config and authentication

refs #7976
---
 .../views/scripts/config/application.phtml    | 14 ++++++-----
 .../config/authentication/create.phtml        | 20 ++++++++++------
 .../config/authentication/modify.phtml        | 10 ++++++--
 .../config/authentication/remove.phtml        | 10 ++++++--
 .../config/authentication/reorder.phtml       | 24 ++++++++++++++++++-
 5 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/application/views/scripts/config/application.phtml b/application/views/scripts/config/application.phtml
index 1ffd120b4..c34aa8349 100644
--- a/application/views/scripts/config/application.phtml
+++ b/application/views/scripts/config/application.phtml
@@ -1,11 +1,13 @@
 <div class="controls" data-base-target="_main">
-<?= $this->tabs->render($this); ?>
+  <?= $this->tabs->render($this); ?>
 </div>
 
 <div class="content">
-<?php if (isset($this->messageBox)): ?>
-  <?= $this->messageBox->render() ?>
-<?php endif ?>
-
-<?= $this->form ?>
+  <h1 tabindex="0" id="application-configuration">
+    <?= t('Generic Configuration'); ?>
+  </h1>
+  <?php if (isset($this->messageBox)): ?>
+    <?= $this->messageBox->render() ?>
+  <?php endif ?>
+  <?= $this->form ?>
 </div>
diff --git a/application/views/scripts/config/authentication/create.phtml b/application/views/scripts/config/authentication/create.phtml
index 427758292..5f840aea0 100644
--- a/application/views/scripts/config/authentication/create.phtml
+++ b/application/views/scripts/config/authentication/create.phtml
@@ -1,10 +1,16 @@
 <div class="controls">
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
-<h4><?= $this->translate('Create New Authentication Backend'); ?></h4>
-<p>
-  <?= $this->translate(
-    'Create a new backend for authenticating your users. This backend will be added at the end of your authentication order.'
-  ); ?>
-</p>
-<?= $form; ?>
\ No newline at end of file
+<div class="content">
+    <h1 tabindex="0" id="authentication-create">
+        <?= $this->translate('Create New Authentication Backend'); ?>
+    </h1>
+    <p>
+        <?= $this->translate(
+            'Create a new backend for authenticating your users. This backend will be added at the end of your authentication order.'
+        ); ?>
+    </p>
+    <div>
+        <?= $form; ?>
+    </div>
+</div>
diff --git a/application/views/scripts/config/authentication/modify.phtml b/application/views/scripts/config/authentication/modify.phtml
index b01d7095a..5aeee7d12 100644
--- a/application/views/scripts/config/authentication/modify.phtml
+++ b/application/views/scripts/config/authentication/modify.phtml
@@ -1,5 +1,11 @@
 <div class="controls">
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
-<h4><?= $this->translate('Edit Backend'); ?></h4>
-<?= $form; ?>
\ No newline at end of file
+<div class="content">
+    <h1 tabindex="0" id="authentication-modify">
+        <?= $this->translate('Edit Backend'); ?>
+    </h1>
+    <div>
+        <?= $form; ?>
+    </div>
+</div>
diff --git a/application/views/scripts/config/authentication/remove.phtml b/application/views/scripts/config/authentication/remove.phtml
index 424aff9a0..cdd615ac7 100644
--- a/application/views/scripts/config/authentication/remove.phtml
+++ b/application/views/scripts/config/authentication/remove.phtml
@@ -1,5 +1,11 @@
 <div class="controls">
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
-<h4><?= $this->translate('Remove Backend'); ?></h4>
-<?= $form; ?>
\ No newline at end of file
+<div class="content">
+    <h1 tabindex="0" id="authentication-remove">
+        <?= $this->translate('Remove Backend'); ?>
+    </h1>
+    <div>
+        <?= $form; ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/authentication/reorder.phtml
index 83f285285..a31062025 100644
--- a/application/views/scripts/config/authentication/reorder.phtml
+++ b/application/views/scripts/config/authentication/reorder.phtml
@@ -2,10 +2,32 @@
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">
+  <h1 tabindex="0" id="authentication-reorder">
+    <?= t('Authentication Configuration'); ?>
+  </h1>
+  <div class="skip-links skip-links-inline">
+    <nav>
+      <ul>
+        <li>
+          <a tabindex="0" href="#authentication-reorder-form">
+            <?= t('Skip To Authentication Reorder Form'); ?>
+          </a>
+        </li>
+      </ul>
+    </nav>
+  </div>
+  <h2 tabindex="0" id="authentication-new-backend" class="sr-only">
+    <?= t('New Authentication Backend'); ?>
+  </h2>
   <p>
     <a href="<?= $this->href('/config/createAuthenticationBackend'); ?>">
       <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?><?= $this->translate('Create A New Authentication Backend'); ?>
     </a>
   </p>
-  <?= $form; ?>
+  <h2 tabindex="0" id="authentication-reorder" class="sr-only">
+    <?= t('Reorder Authentication Backends'); ?>
+  </h2>
+  <div id="authentication-reorder-form">
+    <?= $form; ?>
+  </div>
 </div>

From 069e86c2fd1ea692a3af513ad454c097a49e428e Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 12 Feb 2015 17:10:38 +0100
Subject: [PATCH 0668/2920] Header: Add header and skip links to resource
 configuration

refs #7976
---
 .../views/scripts/config/resource.phtml       | 26 ++++++++++++++++---
 .../scripts/config/resource/create.phtml      | 12 ++++++---
 .../scripts/config/resource/modify.phtml      | 10 +++++--
 .../scripts/config/resource/remove.phtml      | 10 +++++--
 4 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index 384993f52..013dfed19 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -2,18 +2,38 @@
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">
+  <h1 tabindex="0" id="resource-index">
+    <?= t('Resource Configuration'); ?>
+  </h1>
+  <div class="skip-links skip-links-inline">
+    <nav>
+      <ul>
+        <li>
+          <a tabindex="0" href="#resource-edit-table">
+            <?= t('Skip To Existing Resources'); ?>
+          </a>
+        </li>
+      </ul>
+    </nav>
+  </div>
+  <h2 tabindex="0" id="resource-new-resource" class="sr-only">
+    <?= t('Create New Resource'); ?>
+  </h2>
   <p>
     <a href="<?= $this->href('/config/createresource'); ?>">
       <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create A New Resource'); ?>
     </a>
   </p>
-  <table class="action">
+  <h2 tabindex="0" id="resource-edit-resource" class="sr-only">
+    <?= t('Edit Existing Resources'); ?>
+  </h2>
+  <table class="action" id="resource-edit-table">
     <thead>
       <th><?= $this->translate('Resource'); ?></th>
       <th style="width: 5em"><?= $this->translate('Remove'); ?></th>
     </thead>
     <tbody>
-<?php foreach ($this->resources as $name): ?>
+    <?php foreach ($this->resources as $name): ?>
       <tr>
         <td>
           <a href="<?= $this->href('config/editresource', array('resource' => $name)); ?>">
@@ -26,7 +46,7 @@
           </a>
         </td>
       </tr>
-<?php endforeach; ?>
+    <?php endforeach; ?>
     </tbody>
   </table>
 </div>
diff --git a/application/views/scripts/config/resource/create.phtml b/application/views/scripts/config/resource/create.phtml
index 0750a5aa9..c70bd4779 100644
--- a/application/views/scripts/config/resource/create.phtml
+++ b/application/views/scripts/config/resource/create.phtml
@@ -1,6 +1,12 @@
 <div class="controls">
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
-<h4><?= $this->translate('Create A New Resource'); ?></h4>
-<p><?= $this->translate('Resources are entities that provide data to Icinga Web 2.'); ?></p>
-<?= $form; ?>
\ No newline at end of file
+<div class="content">
+    <h1 tabindex="0" id="resource-create">
+        <?= $this->translate('Create A New Resource'); ?>
+    </h1>
+    <p><?= $this->translate('Resources are entities that provide data to Icinga Web 2.'); ?></p>
+    <div>
+        <?= $form; ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/application/views/scripts/config/resource/modify.phtml b/application/views/scripts/config/resource/modify.phtml
index d355aeb4c..48255261b 100644
--- a/application/views/scripts/config/resource/modify.phtml
+++ b/application/views/scripts/config/resource/modify.phtml
@@ -1,5 +1,11 @@
 <div class="controls">
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
-<h4><?= $this->translate('Edit Existing Resource'); ?></h4>
-<?= $form; ?>
\ No newline at end of file
+<div class="content">
+    <h1 tabindex="0" id="resource-edit">
+        <?= $this->translate('Edit Existing Resource'); ?>
+    </h1>
+    <div>
+        <?= $form; ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/application/views/scripts/config/resource/remove.phtml b/application/views/scripts/config/resource/remove.phtml
index 14829ab40..ad5ed59cb 100644
--- a/application/views/scripts/config/resource/remove.phtml
+++ b/application/views/scripts/config/resource/remove.phtml
@@ -1,5 +1,11 @@
 <div class="controls">
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
-<h4><?= $this->translate('Remove Existing Resource'); ?></h4>
-<?= $form; ?>
\ No newline at end of file
+<div class="content">
+    <h1 tabindex="0" id="resource-remove">
+        <?= $this->translate('Remove Existing Resource'); ?>
+    </h1>
+    <div>
+        <?= $form; ?>
+    </div>
+</div>
\ No newline at end of file

From 7839d500997675faa09fd45eae83323c43635b0f Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 13 Feb 2015 09:40:24 +0100
Subject: [PATCH 0669/2920] Header: Add header to preferences

refs #7976
---
 application/views/scripts/preference/index.phtml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/views/scripts/preference/index.phtml b/application/views/scripts/preference/index.phtml
index 163381531..9da6d2db3 100644
--- a/application/views/scripts/preference/index.phtml
+++ b/application/views/scripts/preference/index.phtml
@@ -3,5 +3,6 @@
 </div>
 
 <div class="content">
+    <h1 tabindex="0" id="preferences"><?= t('Preferences'); ?></h1>
     <?= $form; ?>
 </div>
\ No newline at end of file

From 9bf8488f68aacbe8ad5937b002fff97ec79c33b5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Feb 2015 09:59:34 +0100
Subject: [PATCH 0670/2920] js: Remove out-commented function hrefIsHashtag
 from events.js

---
 public/js/icinga/events.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 57c365649..528899dcb 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -517,14 +517,6 @@
             return $target;
         },
 
-    /*
-        hrefIsHashtag: function(href) {
-            // WARNING: IE gives full URL :(
-            // Also it doesn't support negativ indexes in substr
-            return href.substr(href.length - 1, 1) == '#';
-        },
-    */
-
         unbindGlobalHandlers: function () {
             $.each(self.icinga.behaviors, function (name, behavior) {
                 behavior.unbind($(document));

From ce3a564de7dc3170fda0eb219109d3a69263f6c7 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 13 Feb 2015 11:26:09 +0100
Subject: [PATCH 0671/2920] Header: Add header to tabs extension

refs #7976
---
 application/controllers/ConfigController.php |  1 +
 library/Icinga/Web/Widget/Tabs.php           | 61 ++++++++++++++++++--
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index bc82b6015..9318520e8 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -66,6 +66,7 @@ class ConfigController extends ActionController
             $allowedActions[] = 'roles';
         }
         $this->firstAllowedAction = array_shift($allowedActions);
+        $this->getTabs()->setTitle($this->translate('Config Navigation'));
     }
 
     public function devtoolsAction()
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index 9df556f65..54274eda4 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -19,6 +19,7 @@ class Tabs extends AbstractWidget implements Countable
      * @var string
      */
     private $baseTpl = <<< 'EOT'
+{HEADER}
 <ul class="tabs">
   {TABS}
   {DROPDOWN}
@@ -26,6 +27,13 @@ class Tabs extends AbstractWidget implements Countable
 </ul>
 EOT;
 
+    /**
+     * Template used for the header
+     *
+     * @type string
+     */
+    private $headerTpl = '<h2 class="sr-only">{TITLE}</h2>';
+
     /**
      * Template used for the tabs dropdown
      *
@@ -87,6 +95,13 @@ EOT;
      */
     private $closeTab = true;
 
+    /**
+     * Title of the tab navigation
+     *
+     * @type string
+     */
+    private $title;
+
     /**
      * Set whether the current tab is closable
      */
@@ -309,11 +324,21 @@ EOT;
         }
         $close = $this->closeTab ? $this->renderCloseTab() : '';
 
-        $html = $this->baseTpl;
-        $html = str_replace('{TABS}', $tabs, $html);
-        $html = str_replace('{DROPDOWN}', $drop, $html);
-        $html = str_replace('{CLOSE}', $close, $html);
-        return $html;
+        return str_replace(
+            array(
+                '{TABS}',
+                '{DROPDOWN}',
+                '{CLOSE}',
+                '{HEADER}'
+            ),
+            array(
+                $tabs,
+                $drop,
+                $close,
+                $this->renderHeader()
+            ),
+            $this->baseTpl
+        );
     }
 
     public function __toString()
@@ -372,4 +397,30 @@ EOT;
         $tabextension->apply($this);
         return $this;
     }
+
+    /**
+     * Set the title of the tab navigation
+     *
+     * @param   string  $title
+     * @return  self
+     */
+    public function setTitle($title)
+    {
+        $this->title = $title;
+        return $this;
+    }
+
+    /**
+     * Render the title into the header template
+     *
+     * @return string
+     */
+    public function renderHeader()
+    {
+        if (! $this->title) {
+            return '';
+        }
+
+        return str_replace('{TITLE}', $this->title, $this->headerTpl);
+    }
 }

From bcc03f8160c2c849a7cd399070dc0396ab5eeaa6 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 13 Feb 2015 11:39:28 +0100
Subject: [PATCH 0672/2920] Focus: Set the focus to the next usable element

Fix copy and paste error and find h1 first.

refs #7976
---
 public/js/icinga/events.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 57c365649..49c23437d 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -337,21 +337,19 @@
         handleAnchor: function(query) {
             var $element = $(query);
             if ($element.length > 0) {
-                // Try to find the first header. It is more pleasant to users
-                // to select the header instead a container
-                var $header = $element.find(':header:first');
-                if ($header.length > 0) {
-                    $element = $header;
-                } else {
-                    var $input = $element.find(':header:first');
-                    if ($input.length > 0) {
-                        $element = $input
+                var focusQueries = ['h1:first', ':header:first', ':input:first'];
+                $.each(focusQueries, function(index,q) {
+                    var $item = $element.find(q);
+                    if ($item.length > 0) {
+                        $element = $item;
+                        return false;
                     }
-                }
+                });
+
                 // If we want to focus an element which has no tabindex
                 // add one that we can focus is
                 if ($element.prop('tabindex') < 0) {
-                    $element.prop('tabindex', 0);
+                    $element.prop('tabindex', '-1');
                 }
                 $element.focus();
             }

From 7ca2e1d282a8f7a2ee5ecd8bc86507ee3aefe1fa Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 13 Feb 2015 11:45:20 +0100
Subject: [PATCH 0673/2920] Fix close button: Test the anchor if it belongs to
 us

---
 public/js/icinga/events.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 49c23437d..1ec7c82be 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -413,7 +413,8 @@
             event.preventDefault();
 
             // This is an anchor only
-            if (href.substr(0, 1) === '#' && href.substr(1, 1) !== '!') {
+            if (href.substr(0, 1) === '#' && href.length > 1
+                && href.substr(1, 1) !== '!') {
                 self.handleAnchor(href);
                 return;
             }

From cd11cf3469f4317e6b18948b414c0c9b9bb23637 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 13 Feb 2015 11:45:20 +0100
Subject: [PATCH 0674/2920] Fix close button: Test the anchor if it belongs to
 us

---
 public/js/icinga/events.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 528899dcb..3fbb9cf79 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -415,7 +415,8 @@
             event.preventDefault();
 
             // This is an anchor only
-            if (href.substr(0, 1) === '#' && href.substr(1, 1) !== '!') {
+            if (href.substr(0, 1) === '#' && href.length > 1
+                && href.substr(1, 1) !== '!') {
                 self.handleAnchor(href);
                 return;
             }

From 2112676594f67ddfdee81c6a9615b8a350659321 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Fri, 13 Feb 2015 14:34:29 +0100
Subject: [PATCH 0675/2920] Implement hidden accessible control for auto
 refresh on the page

refs #7945
---
 application/forms/AutoRefreshForm.php         | 79 +++++++++++++++++++
 application/layouts/scripts/body.phtml        |  5 ++
 .../Web/Controller/ActionController.php       | 11 +++
 public/css/icinga/menu.less                   | 19 +++++
 4 files changed, 114 insertions(+)
 create mode 100644 application/forms/AutoRefreshForm.php

diff --git a/application/forms/AutoRefreshForm.php b/application/forms/AutoRefreshForm.php
new file mode 100644
index 000000000..85992af27
--- /dev/null
+++ b/application/forms/AutoRefreshForm.php
@@ -0,0 +1,79 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Forms;
+
+use Icinga\Application\Logger;
+use Icinga\User\Preferences;
+use Icinga\Web\Form;
+use Icinga\Web\Notification;
+use Icinga\Web\Session;
+
+/**
+ * Form class to adjust user auto refresh preferences
+ */
+class AutoRefreshForm extends Form
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_auto_refresh');
+    }
+
+    /**
+     * Adjust preferences and persist them
+     *
+     * @see Form::onSuccess()
+     */
+    public function onSuccess()
+    {
+        /** @var Preferences $preferences */
+        $preferences = $this->getRequest()->getUser()->getPreferences();
+        $icingaweb = $preferences->get('icingaweb');
+
+        if ((bool) $preferences->getValue('icingaweb', 'auto_refresh', true) === false) {
+            $icingaweb['auto_refresh'] = '1';
+            $notification = $this->translate('Auto refresh successfully enabled');
+        } else {
+            $icingaweb['auto_refresh'] = '0';
+            $notification = $this->translate('Auto refresh successfully disabled');
+        }
+        $preferences->icingaweb = $icingaweb;
+
+        Session::getSession()->user->setPreferences($preferences);
+        Notification::success($notification);
+
+        $this->getResponse()->setHeader('X-Icinga-Rerender-Layout', 'yes');
+    }
+
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        $preferences = $this->getRequest()->getUser()->getPreferences();
+
+        if ((bool) $preferences->getValue('icingaweb', 'auto_refresh', true) === false) {
+            $value = $this->translate('Enable auto refresh');
+        } else {
+            $value = $this->translate('Disable auto refresh');
+        }
+
+        $this->addElements(array(
+            array(
+                'button',
+                'btn_submit',
+                array(
+                    'ignore'        => true,
+                    'type'          => 'submit',
+                    'value'         => $value,
+                    'decorators'    => array('ViewHelper'),
+                    'escape'        => false,
+                    'class'         => 'link-like'
+                )
+            )
+        ));
+    }
+}
diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index 9f0b78ce9..abf823750 100644
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -23,6 +23,11 @@ if (Auth::getInstance()->isAuthenticated()): ?>
        </ul>
      </nav>
    </div>
+
+   <div class="auto-refresh-trigger">
+       <?= $this->layout()->autoRefreshForm ?>
+   </div>
+
    <ul id="notifications"><?php
 
 $moduleName = $this->layout()->moduleName;
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 8764e49ee..0a1fe8ae4 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -10,6 +10,7 @@ use Icinga\Authentication\Manager;
 use Icinga\Exception\IcingaException;
 use Icinga\Exception\ProgrammingError;
 use Icinga\File\Pdf;
+use Icinga\Forms\AutoRefreshForm;
 use Icinga\Security\SecurityException;
 use Icinga\Util\Translator;
 use Icinga\Web\Notification;
@@ -379,6 +380,16 @@ class ActionController extends Zend_Controller_Action
         }
     }
 
+    /**
+     * @see Zend_Controller_Action::preDispatch()
+     */
+    public function preDispatch()
+    {
+        $form = new AutoRefreshForm();
+        $form->handleRequest();
+        $this->_helper->layout()->autoRefreshForm = $form;
+    }
+
     /**
      * Detect whether the current request requires changes in the layout and apply them before rendering
      *
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 873e6abb0..53150f498 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -300,3 +300,22 @@ a:focus {
 .skip-links-inline {
   margin-top: -3.5em;
 }
+
+.auto-refresh-trigger {
+  position: absolute;
+  form {
+    button[type="submit"] {
+      position: absolute;
+      display: block;
+      left: -999em;
+      width: 12em !important;
+      top: 0.4em;
+      padding: 0.8em 0.8em !important;
+      background-color: white !important;
+      text-align: left !important;
+      &:focus {
+        left: 0;
+      }
+    }
+  }
+}
\ No newline at end of file

From a0e4e4d1faae3a2b677cdb8d58b24e01152a83c5 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 13 Feb 2015 14:48:28 +0100
Subject: [PATCH 0676/2920] Skip Links: Remove nav element

---
 application/layouts/scripts/body.phtml | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index 9f0b78ce9..49b097c6c 100644
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -8,20 +8,18 @@ use Icinga\Authentication\Manager as Auth;
 if (Auth::getInstance()->isAuthenticated()): ?>
  <div id="header">
    <div class="skip-links">
-     <nav>
-       <h1 class="sr-only"><?= t('Accessibility Skip Links'); ?></h1>
-       <ul>
-         <li>
-           <a tabindex="0" href="#main"><?= t('Skip to Content'); ?></a>
-         </li>
-         <li>
-           <a tabindex="0" href="#search"><?= t('Skip to Search'); ?></a>
-         </li>
-         <li>
-           <a tabindex="0" href="#navigation"><?= t('Skip to Navigation'); ?></a>
-         </li>
-       </ul>
-     </nav>
+     <h2 class="sr-only"><?= t('Accessibility Skip Links'); ?></h2>
+     <ul>
+       <li>
+         <a tabindex="0" href="#main"><?= t('Skip to Content'); ?></a>
+       </li>
+       <li>
+         <a tabindex="0" href="#search"><?= t('Skip to Search'); ?></a>
+       </li>
+       <li>
+         <a tabindex="0" href="#navigation"><?= t('Skip to Navigation'); ?></a>
+       </li>
+     </ul>
    </div>
    <ul id="notifications"><?php
 

From d21833fbf2bf3117c3528efb111300a93e2b4526 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 13 Feb 2015 15:33:29 +0100
Subject: [PATCH 0677/2920] Header: Adapt authentication config dialog

---
 .../config/authentication/create.phtml        |  2 +-
 .../config/authentication/modify.phtml        |  2 +-
 .../config/authentication/remove.phtml        |  2 +-
 .../config/authentication/reorder.phtml       | 25 +++++++++----------
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/application/views/scripts/config/authentication/create.phtml b/application/views/scripts/config/authentication/create.phtml
index 5f840aea0..48d1f00ed 100644
--- a/application/views/scripts/config/authentication/create.phtml
+++ b/application/views/scripts/config/authentication/create.phtml
@@ -2,7 +2,7 @@
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1 tabindex="0" id="authentication-create">
+    <h1 tabindex="-1" id="authentication-create">
         <?= $this->translate('Create New Authentication Backend'); ?>
     </h1>
     <p>
diff --git a/application/views/scripts/config/authentication/modify.phtml b/application/views/scripts/config/authentication/modify.phtml
index 5aeee7d12..ebc1937a7 100644
--- a/application/views/scripts/config/authentication/modify.phtml
+++ b/application/views/scripts/config/authentication/modify.phtml
@@ -2,7 +2,7 @@
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1 tabindex="0" id="authentication-modify">
+    <h1 tabindex="-1" id="authentication-modify">
         <?= $this->translate('Edit Backend'); ?>
     </h1>
     <div>
diff --git a/application/views/scripts/config/authentication/remove.phtml b/application/views/scripts/config/authentication/remove.phtml
index cdd615ac7..0a53af30c 100644
--- a/application/views/scripts/config/authentication/remove.phtml
+++ b/application/views/scripts/config/authentication/remove.phtml
@@ -2,7 +2,7 @@
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1 tabindex="0" id="authentication-remove">
+    <h1 tabindex="-1" id="authentication-remove">
         <?= $this->translate('Remove Backend'); ?>
     </h1>
     <div>
diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/authentication/reorder.phtml
index a31062025..e2491c1fc 100644
--- a/application/views/scripts/config/authentication/reorder.phtml
+++ b/application/views/scripts/config/authentication/reorder.phtml
@@ -2,21 +2,20 @@
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">
-  <h1 tabindex="0" id="authentication-reorder">
-    <?= t('Authentication Configuration'); ?>
+  <h1 tabindex="-1" id="authentication-reorder">
+    <?= $this->translate('Authentication Configuration'); ?>
   </h1>
   <div class="skip-links skip-links-inline">
-    <nav>
-      <ul>
-        <li>
-          <a tabindex="0" href="#authentication-reorder-form">
-            <?= t('Skip To Authentication Reorder Form'); ?>
-          </a>
-        </li>
-      </ul>
-    </nav>
+    <h3 class="sr-only"><?= $this->translate('Skip Links'); ?></h3>
+    <ul>
+      <li>
+        <a tabindex="0" href="#authentication-reorder-form">
+          <?= t('Skip To Authentication Reorder Form'); ?>
+        </a>
+      </li>
+    </ul>
   </div>
-  <h2 tabindex="0" id="authentication-new-backend" class="sr-only">
+  <h2 tabindex="-1" id="authentication-new-backend" class="sr-only">
     <?= t('New Authentication Backend'); ?>
   </h2>
   <p>
@@ -24,7 +23,7 @@
       <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?><?= $this->translate('Create A New Authentication Backend'); ?>
     </a>
   </p>
-  <h2 tabindex="0" id="authentication-reorder" class="sr-only">
+  <h2 tabindex="-1" id="authentication-reorder" class="sr-only">
     <?= t('Reorder Authentication Backends'); ?>
   </h2>
   <div id="authentication-reorder-form">

From 73a03ada83ea5f75a531a8b61827e7abc332b845 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Fri, 13 Feb 2015 15:33:39 +0100
Subject: [PATCH 0678/2920] Move autoRefreshForm to skip-links

refs #7945
---
 application/layouts/scripts/body.phtml |  7 +++----
 public/css/icinga/menu.less            | 24 +++---------------------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index abf823750..71f83ebd1 100644
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -20,14 +20,13 @@ if (Auth::getInstance()->isAuthenticated()): ?>
          <li>
            <a tabindex="0" href="#navigation"><?= t('Skip to Navigation'); ?></a>
          </li>
+         <li>
+           <?= $this->layout()->autoRefreshForm ?>
+         </li>
        </ul>
      </nav>
    </div>
 
-   <div class="auto-refresh-trigger">
-       <?= $this->layout()->autoRefreshForm ?>
-   </div>
-
    <ul id="notifications"><?php
 
 $moduleName = $this->layout()->moduleName;
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 53150f498..cc5156ebd 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -280,11 +280,12 @@ a:focus {
       display: inline;
       margin: 0;
       padding: 0;
-      a {
+      a, button[type="submit"] {
         position: absolute;
         display: block;
         left: -999em;
-        width: 10.4em;
+        width: 10.8em !important;
+        text-align: left !important;
         top: 0.4em;
         padding: 0.8em;
         background-color: white;
@@ -300,22 +301,3 @@ a:focus {
 .skip-links-inline {
   margin-top: -3.5em;
 }
-
-.auto-refresh-trigger {
-  position: absolute;
-  form {
-    button[type="submit"] {
-      position: absolute;
-      display: block;
-      left: -999em;
-      width: 12em !important;
-      top: 0.4em;
-      padding: 0.8em 0.8em !important;
-      background-color: white !important;
-      text-align: left !important;
-      &:focus {
-        left: 0;
-      }
-    }
-  }
-}
\ No newline at end of file

From ef7fcb10232d20de522775b3cf2143d593d7a15b Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 13 Feb 2015 15:35:24 +0100
Subject: [PATCH 0679/2920] Header: Adapt application configuration dialog

---
 application/views/scripts/config/application.phtml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/application/views/scripts/config/application.phtml b/application/views/scripts/config/application.phtml
index c34aa8349..edb15d31a 100644
--- a/application/views/scripts/config/application.phtml
+++ b/application/views/scripts/config/application.phtml
@@ -1,10 +1,9 @@
 <div class="controls" data-base-target="_main">
   <?= $this->tabs->render($this); ?>
 </div>
-
 <div class="content">
-  <h1 tabindex="0" id="application-configuration">
-    <?= t('Generic Configuration'); ?>
+  <h1 tabindex="-1" id="application-configuration">
+    <?= $this->translate('Generic Configuration'); ?>
   </h1>
   <?php if (isset($this->messageBox)): ?>
     <?= $this->messageBox->render() ?>

From 04fde79a9ff8324b80bdfb5d7cbcb9b7aa7ac69c Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 13 Feb 2015 16:10:51 +0100
Subject: [PATCH 0680/2920] Header: Adapt resource configuration

---
 .../config/authentication/reorder.phtml       |  2 +-
 .../views/scripts/config/resource.phtml       | 23 +++++++++----------
 .../scripts/config/resource/create.phtml      |  2 +-
 .../scripts/config/resource/modify.phtml      |  2 +-
 .../scripts/config/resource/remove.phtml      |  2 +-
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/authentication/reorder.phtml
index e2491c1fc..daa8a959f 100644
--- a/application/views/scripts/config/authentication/reorder.phtml
+++ b/application/views/scripts/config/authentication/reorder.phtml
@@ -6,7 +6,7 @@
     <?= $this->translate('Authentication Configuration'); ?>
   </h1>
   <div class="skip-links skip-links-inline">
-    <h3 class="sr-only"><?= $this->translate('Skip Links'); ?></h3>
+    <h2 class="sr-only"><?= $this->translate('Skip Links'); ?></h2>
     <ul>
       <li>
         <a tabindex="0" href="#authentication-reorder-form">
diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index 013dfed19..4cfbcc4d2 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -2,21 +2,20 @@
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">
-  <h1 tabindex="0" id="resource-index">
+  <h1 tabindex="-1" id="resource-index">
     <?= t('Resource Configuration'); ?>
   </h1>
   <div class="skip-links skip-links-inline">
-    <nav>
-      <ul>
-        <li>
-          <a tabindex="0" href="#resource-edit-table">
-            <?= t('Skip To Existing Resources'); ?>
-          </a>
-        </li>
-      </ul>
-    </nav>
+    <h2 class="sr-only"><?= $this->translate('Skip Links'); ?></h2>
+    <ul>
+      <li>
+        <a tabindex="0" href="#resource-edit-table">
+          <?= t('Skip To Existing Resources'); ?>
+        </a>
+      </li>
+    </ul>
   </div>
-  <h2 tabindex="0" id="resource-new-resource" class="sr-only">
+  <h2 tabindex="-1" id="resource-new-resource" class="sr-only">
     <?= t('Create New Resource'); ?>
   </h2>
   <p>
@@ -24,7 +23,7 @@
       <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create A New Resource'); ?>
     </a>
   </p>
-  <h2 tabindex="0" id="resource-edit-resource" class="sr-only">
+  <h2 tabindex="-1" id="resource-edit-resource" class="sr-only">
     <?= t('Edit Existing Resources'); ?>
   </h2>
   <table class="action" id="resource-edit-table">
diff --git a/application/views/scripts/config/resource/create.phtml b/application/views/scripts/config/resource/create.phtml
index c70bd4779..71d8c946e 100644
--- a/application/views/scripts/config/resource/create.phtml
+++ b/application/views/scripts/config/resource/create.phtml
@@ -2,7 +2,7 @@
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1 tabindex="0" id="resource-create">
+    <h1 tabindex="-1" id="resource-create">
         <?= $this->translate('Create A New Resource'); ?>
     </h1>
     <p><?= $this->translate('Resources are entities that provide data to Icinga Web 2.'); ?></p>
diff --git a/application/views/scripts/config/resource/modify.phtml b/application/views/scripts/config/resource/modify.phtml
index 48255261b..b7bd0a2f7 100644
--- a/application/views/scripts/config/resource/modify.phtml
+++ b/application/views/scripts/config/resource/modify.phtml
@@ -2,7 +2,7 @@
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1 tabindex="0" id="resource-edit">
+    <h1 tabindex="-1" id="resource-edit">
         <?= $this->translate('Edit Existing Resource'); ?>
     </h1>
     <div>
diff --git a/application/views/scripts/config/resource/remove.phtml b/application/views/scripts/config/resource/remove.phtml
index ad5ed59cb..010f2d5d2 100644
--- a/application/views/scripts/config/resource/remove.phtml
+++ b/application/views/scripts/config/resource/remove.phtml
@@ -2,7 +2,7 @@
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1 tabindex="0" id="resource-remove">
+    <h1 tabindex="-1" id="resource-remove">
         <?= $this->translate('Remove Existing Resource'); ?>
     </h1>
     <div>

From 586fa3120b5e760f1da70885de887ddfc0120425 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 13 Feb 2015 16:12:34 +0100
Subject: [PATCH 0681/2920] Header: Adapt preference dialog

refs #7976
---
 application/views/scripts/preference/index.phtml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/views/scripts/preference/index.phtml b/application/views/scripts/preference/index.phtml
index 9da6d2db3..fc19a1e10 100644
--- a/application/views/scripts/preference/index.phtml
+++ b/application/views/scripts/preference/index.phtml
@@ -1,8 +1,7 @@
 <div class="controls">
     <?= $tabs; ?>
 </div>
-
 <div class="content">
-    <h1 tabindex="0" id="preferences"><?= t('Preferences'); ?></h1>
+    <h1 tabindex="-1" id="preferences"><?= $this->translate('Preferences'); ?></h1>
     <?= $form; ?>
 </div>
\ No newline at end of file

From 7644888f25f0301945862d15f29d401aaacb96a5 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 13 Feb 2015 16:19:28 +0100
Subject: [PATCH 0682/2920] Header: Add header semantic to roles configuration

refs #7976
---
 application/controllers/RolesController.php  |  1 +
 application/views/scripts/roles/index.phtml  | 17 ++++++++++++++++-
 application/views/scripts/roles/new.phtml    |  4 +++-
 application/views/scripts/roles/remove.phtml |  4 +++-
 application/views/scripts/roles/update.phtml |  4 +++-
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/application/controllers/RolesController.php b/application/controllers/RolesController.php
index 7b66b1fa8..097c79e29 100644
--- a/application/controllers/RolesController.php
+++ b/application/controllers/RolesController.php
@@ -45,6 +45,7 @@ class RolesController extends ActionController
             'title' => $this->translate('Roles'),
             'url'   => 'roles'
         ));
+        $this->getTabs()->setTitle($this->translate('Role Configuration'));
     }
 
     /**
diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml
index c08a0b6a4..4ff2da81e 100644
--- a/application/views/scripts/roles/index.phtml
+++ b/application/views/scripts/roles/index.phtml
@@ -1,8 +1,20 @@
 <div class="controls" data-base-target="_main">
     <?= $tabs ?>
-    <h1><?= $this->translate('Roles') ?></h1>
 </div>
 <div class="content">
+    <h1 tabindex="-1" id="roles-index">
+        <?= $this->translate('Roles') ?>
+    </h1>
+    <div class="skip-links skip-links-inline">
+        <h2 class="sr-only"><?= $this->translate('Skip Links'); ?></h2>
+        <ul>
+            <li>
+                <a tabindex="0" href="#roles-index-new">
+                    <?= t('Skip To Create New Role'); ?>
+                </a>
+            </li>
+        </ul>
+    </div>
     <div>
         <?php /** @var \Icinga\Application\Config $roles */ if ($roles->isEmpty()): ?>
             <?= $this->translate('No roles found.') ?>
@@ -64,6 +76,9 @@
                 </tbody>
             </table>
         <?php endif ?>
+        <h2 tabindex="-1" id="roles-index-new" class="sr-only">
+            <?= $this->translate('Create New Role'); ?>
+        </h2>
         <a data-base-target="_next" href="<?= $this->href('roles/new') ?>">
             <?= $this->translate('New Role') ?>
         </a>
diff --git a/application/views/scripts/roles/new.phtml b/application/views/scripts/roles/new.phtml
index 4c21c6f6b..d18ada1a5 100644
--- a/application/views/scripts/roles/new.phtml
+++ b/application/views/scripts/roles/new.phtml
@@ -1,7 +1,9 @@
 <div class="controls">
     <?= $tabs->showOnlyCloseButton() ?>
-    <h1><?= $this->translate('New Role') ?></h1>
 </div>
 <div class="content">
+    <h1 tabindex="-1" id="roles-new">
+        <?= $this->translate('New Role') ?>
+    </h1>
     <?= $form ?>
 </div>
diff --git a/application/views/scripts/roles/remove.phtml b/application/views/scripts/roles/remove.phtml
index 4abff566a..432c3602d 100644
--- a/application/views/scripts/roles/remove.phtml
+++ b/application/views/scripts/roles/remove.phtml
@@ -1,7 +1,9 @@
 <div class="controls">
     <?= $tabs->showOnlyCloseButton() ?>
-    <h1><?= sprintf($this->translate('Remove Role %s'), $name) ?></h1>
 </div>
 <div class="content">
+    <h1 tabindex="-1" id="roles-remove">
+        <?= sprintf($this->translate('Remove Role %s'), $name) ?>
+    </h1>
     <?= $form ?>
 </div>
diff --git a/application/views/scripts/roles/update.phtml b/application/views/scripts/roles/update.phtml
index f48f1ca69..32ab7d018 100644
--- a/application/views/scripts/roles/update.phtml
+++ b/application/views/scripts/roles/update.phtml
@@ -1,7 +1,9 @@
 <div class="controls">
     <?= $tabs->showOnlyCloseButton() ?>
-    <h1><?= sprintf($this->translate('Update Role %s'), $name) ?></h1>
 </div>
 <div class="content">
+    <h1 tabindex="-1" id="roles-update">
+        <?= sprintf($this->translate('Update Role %s'), $name) ?>
+    </h1>
     <?= $form ?>
 </div>

From b375a4f6ccd5e5388eae0184505568cee36c102b Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Fri, 13 Feb 2015 16:21:19 +0100
Subject: [PATCH 0683/2920] Fix multiple renderLayout parameters in the url

refs #7945
---
 application/forms/AutoRefreshForm.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/forms/AutoRefreshForm.php b/application/forms/AutoRefreshForm.php
index 85992af27..e1e436d34 100644
--- a/application/forms/AutoRefreshForm.php
+++ b/application/forms/AutoRefreshForm.php
@@ -8,6 +8,7 @@ use Icinga\User\Preferences;
 use Icinga\Web\Form;
 use Icinga\Web\Notification;
 use Icinga\Web\Session;
+use Icinga\Web\Url;
 
 /**
  * Form class to adjust user auto refresh preferences
@@ -46,6 +47,7 @@ class AutoRefreshForm extends Form
         Notification::success($notification);
 
         $this->getResponse()->setHeader('X-Icinga-Rerender-Layout', 'yes');
+        $this->setRedirectUrl(Url::fromRequest()->without('renderLayout'));
     }
 
     /**

From 97f5018247027fd0c3894b7114d3f9e251774200 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 16 Feb 2015 10:23:54 +0100
Subject: [PATCH 0684/2920] WCAG/1.1.1: Fix example for accessible icon fonts
 to work with NVDA too

refs #8358
---
 doc/accessibility/ifont.html | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/doc/accessibility/ifont.html b/doc/accessibility/ifont.html
index 481cbff71..32f122127 100644
--- a/doc/accessibility/ifont.html
+++ b/doc/accessibility/ifont.html
@@ -10,22 +10,9 @@
         .icon-star:before {
             content: "★";
         }
-        .sr-only {
-            border: 0;
-            clip: rect(0 0 0 0);
-            height: 1px;
-            margin: -1px;
-            overflow: hidden;
-            padding: 0;
-            position: absolute;
-            width: 1px;
-        }
     </style>
 </head>
 <body>
-<span tabindex="0">
-    <i class="icon-star" aria-hidden="true"></i>
-    <span class="sr-only">Top rated article</span>
-</span>
+    <i role="img" class="icon-star" aria-label="Top rated article" title="Top rated article"></i>
 </body>
-</html>
+</html>
\ No newline at end of file

From 243bc6ec0cdcddc6363533a28d2d62055e32740f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 16 Feb 2015 10:26:03 +0100
Subject: [PATCH 0685/2920] Make the view helpers qlink, img and icon handle
 aria-tags automatically

refs #8358
refs #8360
---
 library/Icinga/Web/View/helpers/url.php | 63 +++++++++++++++----------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/library/Icinga/Web/View/helpers/url.php b/library/Icinga/Web/View/helpers/url.php
index 1f1450b5e..9fa5d4a69 100644
--- a/library/Icinga/Web/View/helpers/url.php
+++ b/library/Icinga/Web/View/helpers/url.php
@@ -27,55 +27,68 @@ $this->addHelperFunction('url', function ($path = null, $params = null) {
     return $url;
 });
 
+$this->addHelperFunction('qlink', function ($title, $url, $params = null, $properties = array(), $escape = true) use ($view) {
+    if (array_key_exists('title', $properties) && !array_key_exists('aria-label', $properties)) {
+        $properties['aria-label'] = $properties['title'];
+    }
 
-$this->addHelperFunction('qlink', function ($title, $url, $params = null, $properties = array()) use ($view) {
     return sprintf(
         '<a href="%s"%s>%s</a>',
         $view->url($url, $params),
         $view->propertiesToString($properties),
-        $view->escape($title)
+        $escape ? $view->escape($title) : $title
     );
 });
 
-$this->addHelperFunction('img', function ($url, array $properties = array()) use ($view) {
+$this->addHelperFunction('img', function ($url, $params = null, array $properties = array()) use ($view) {
     if (! array_key_exists('alt', $properties)) {
         $properties['alt'] = '';
     }
 
+    if (array_key_exists('title', $properties)) {
+        if (! array_key_exists('aria-label', $properties)) {
+            $properties['aria-label'] = $properties['title'];
+        }
+    } elseif (! array_key_exists('aria-hidden', $properties)) {
+        $properties['aria-hidden'] = 'true';
+    }
+
     return sprintf(
         '<img src="%s"%s />',
-        $view->url($url),
+        $view->url($url, $params),
         $view->propertiesToString($properties)
     );
 });
 
 $this->addHelperFunction('icon', function ($img, $title = null, array $properties = array()) use ($view) {
-    $isClass = strpos($img, '.') === false;
-    $class = null;
-
-    if ($isClass) {
-        $class = 'icon-' . $img;
-    } else {
-        $class = 'icon';
-    }
-    if ($title !== null) {
-        $properties['alt'] = $title;
-        $properties['title'] = $title;
-    }
-
-    if ($class !== null) {
-        if (isset($props['class'])) {
-            $properties['class'] .= ' ' . $class;
+    if (strpos($img, '.') !== false) {
+        if (array_key_exists('class', $properties)) {
+            $properties['class'] .= ' icon';
         } else {
-            $properties['class'] = $class;
+            $properties['class'] = 'icon';
         }
-    }
-    if ($isClass) {
-        return sprintf('<i %s ></i>', $view->propertiesToString($properties));
 
-    } else {
         return $view->img('img/icons/' . $img, $properties);
     }
+
+    if ($title !== null) {
+        $properties['role'] = 'img';
+        $properties['title'] = $title;
+
+        if (! array_key_exists('aria-label', $properties)) {
+            $properties['aria-label'] = $title;
+        }
+    } elseif (! array_key_exists('aria-hidden', $properties)) {
+        $properties['aria-hidden'] = 'true';
+    }
+
+    if (isset($properties['class'])) {
+        $properties['class'] .= ' icon-' . $img;
+    } else {
+        $properties['class'] = 'icon-' . $img;
+    }
+
+    return sprintf('<i %s></i>', $view->propertiesToString($properties));
 });
 
 $this->addHelperFunction('propertiesToString', function ($properties) use ($view) {

From 5321c2f9e5bd7ae23a5b5ea5d8d1492f99662c63 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 16 Feb 2015 10:52:42 +0100
Subject: [PATCH 0686/2920] Mute icons properly using the new automatic
 mechanisms of our view helpers

refs #8360
---
 application/layouts/scripts/pdf.phtml              |  2 +-
 .../views/scripts/authentication/login.phtml       |  4 ++--
 .../scripts/config/authentication/reorder.phtml    |  2 +-
 application/views/scripts/config/resource.phtml    |  2 +-
 .../Icinga/Web/Form/Decorator/NoScriptApply.php    |  2 +-
 library/Icinga/Web/Widget/FilterEditor.php         |  2 +-
 library/Icinga/Web/Widget/Tab.php                  |  4 ++--
 library/Icinga/Web/Widget/Tabs.php                 |  2 +-
 .../views/scripts/alertsummary/index.phtml         |  6 +++---
 .../application/views/scripts/config/index.phtml   |  4 ++--
 .../application/views/scripts/hosts/show.phtml     | 14 +++++++-------
 .../views/scripts/list/contactgroups.phtml         |  2 +-
 .../application/views/scripts/list/contacts.phtml  |  2 +-
 .../partials/command/objects-command-form.phtml    |  4 ++--
 .../application/views/scripts/services/show.phtml  | 14 +++++++-------
 .../scripts/show/components/acknowledgement.phtml  |  2 +-
 .../scripts/show/components/checkstatistics.phtml  |  2 +-
 .../views/scripts/show/components/command.phtml    |  2 +-
 .../views/scripts/show/components/comments.phtml   |  2 +-
 .../views/scripts/show/components/contacts.phtml   |  4 ++--
 .../views/scripts/show/components/downtime.phtml   |  2 +-
 .../views/scripts/show/components/hostgroups.phtml |  2 +-
 .../scripts/show/components/servicegroups.phtml    |  2 +-
 .../setup/application/forms/AuthenticationPage.php |  4 ++--
 24 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/application/layouts/scripts/pdf.phtml b/application/layouts/scripts/pdf.phtml
index 38c9bdc2c..c5b28ecbf 100644
--- a/application/layouts/scripts/pdf.phtml
+++ b/application/layouts/scripts/pdf.phtml
@@ -31,7 +31,7 @@ if ( isset($pdf) )
 }
 
 </script>
-<?= $this->img('img/logo_icinga_big_dark.png', array('align' => 'right', 'width' => '75')) ?>
+<?= $this->img('img/logo_icinga_big_dark.png', null, array('align' => 'right', 'width' => '75')) ?>
 <!--<div id="page-header">
   <table>
     <tr>
diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index f40f5c4e0..4b1de3961 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -7,7 +7,7 @@
   <div class="form" data-base-target="layout">
     <h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1>
     <?php if ($requiresSetup): ?>
-    <p tabindex="0" class="config-note"><?= sprintf(
+    <p class="config-note"><?= sprintf(
       $this->translate(
         'It appears that you did not configure Icinga Web 2 yet so it\'s not possible to log in without any defined '
         . 'authentication method. Please define a authentication method by following the instructions in the'
@@ -18,7 +18,7 @@
       '</a>'
     ); ?></p>
     <?php elseif ($requiresExternalAuth): ?>
-    <p tabindex="0" class="info-box"><i aria-hidden="true" class="icon-info"></i><?= $this->translate(
+    <p class="info-box"><?= $this->icon('icon-info'); ?><?= $this->translate(
       'You\'re currently not authenticated using any of the web server\'s authentication mechanisms.'
       . ' Make sure you\'ll configure such, otherwise you\'ll not be able to login.'
     ); ?></p>
diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/authentication/reorder.phtml
index a31062025..ad0d0ebc5 100644
--- a/application/views/scripts/config/authentication/reorder.phtml
+++ b/application/views/scripts/config/authentication/reorder.phtml
@@ -21,7 +21,7 @@
   </h2>
   <p>
     <a href="<?= $this->href('/config/createAuthenticationBackend'); ?>">
-      <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?><?= $this->translate('Create A New Authentication Backend'); ?>
+      <?= $this->icon('plus'); ?><?= $this->translate('Create A New Authentication Backend'); ?>
     </a>
   </p>
   <h2 tabindex="0" id="authentication-reorder" class="sr-only">
diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index 013dfed19..12c9cf6ce 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -21,7 +21,7 @@
   </h2>
   <p>
     <a href="<?= $this->href('/config/createresource'); ?>">
-      <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create A New Resource'); ?>
+      <?= $this->icon('plus'); ?> <?= $this->translate('Create A New Resource'); ?>
     </a>
   </p>
   <h2 tabindex="0" id="resource-edit-resource" class="sr-only">
diff --git a/library/Icinga/Web/Form/Decorator/NoScriptApply.php b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
index 2ea810e16..fbc96756b 100644
--- a/library/Icinga/Web/Form/Decorator/NoScriptApply.php
+++ b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
@@ -25,7 +25,7 @@ class NoScriptApply extends Zend_Form_Decorator_Abstract
     {
         if ($content) {
             $content .= '<noscript><button name="noscript_apply" style="margin-left: 0.5em;" type="submit" value="1">'
-                . Icinga::app()->getViewRenderer()->view->icon('refresh.png', null, array('aria-hidden' => 'true')) . '&nbsp;' . t('Apply')
+                . Icinga::app()->getViewRenderer()->view->icon('refresh.png') . '&nbsp;' . t('Apply')
                 . '</button></noscript>';
         }
 
diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 38eecb722..999a825ac 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -669,7 +669,7 @@ class FilterEditor extends AbstractWidget
             . '" title="'
             . $title
             . '">'
-            . '<i class="icon-filter"></i>'
+            . '<i aria-hidden="true" class="icon-filter"></i>'
             . '</a>';
     }
 
diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index 2d24d5f40..143c3e552 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -215,9 +215,9 @@ class Tab extends AbstractWidget
 
         if ($this->icon !== null) {
             if (strpos($this->icon, '.') === false) {
-                $caption = $view->icon($this->icon, null, array('aria-hidden' => 'true')) . $caption;
+                $caption = $view->icon($this->icon) . $caption;
             } else {
-                $caption = $view->img($this->icon, array('aria-hidden' => 'true', 'class' => 'icon')) . $caption;
+                $caption = $view->img($this->icon, null, array('class' => 'icon')) . $caption;
             }
         }
         if ($this->url !== null) {
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index 9df556f65..56bd3404c 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -33,7 +33,7 @@ EOT;
      */
     private $dropdownTpl = <<< 'EOT'
 <li class="dropdown">
-  <a href="#" class="dropdown-toggle"><i class="icon-down-open"></i></a>
+  <a href="#" class="dropdown-toggle"><i aria-hidden="true" class="icon-down-open"></i></a>
   <ul class="dropdown-menu">
     {TABS}
   </ul>
diff --git a/modules/monitoring/application/views/scripts/alertsummary/index.phtml b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
index b71456ab6..dbfff6433 100644
--- a/modules/monitoring/application/views/scripts/alertsummary/index.phtml
+++ b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
@@ -42,11 +42,11 @@
 
             <span>
                 <?php if ($this->trend->trend === 'up'): ?>
-                    <?= $this->icon('up-open', null, array('aria-hidden' => 'true')); ?>
+                    <?= $this->icon('up-open'); ?>
                 <?php elseif ($this->trend->trend === 'unchanged'): ?>
-                    <?= $this->icon('right-open', null, array('aria-hidden' => 'true')); ?>
+                    <?= $this->icon('right-open'); ?>
                 <?php else: ?>
-                    <?= $this->icon('down-open', null, array('aria-hidden' => 'true')); ?>
+                    <?= $this->icon('down-open'); ?>
                 <?php endif; ?>
             </span>
         </div>
diff --git a/modules/monitoring/application/views/scripts/config/index.phtml b/modules/monitoring/application/views/scripts/config/index.phtml
index a0f922ba4..b1729f9b1 100644
--- a/modules/monitoring/application/views/scripts/config/index.phtml
+++ b/modules/monitoring/application/views/scripts/config/index.phtml
@@ -6,7 +6,7 @@
 <div class="content" data-base-target="_next">
   <p>
     <a href="<?= $this->href('/monitoring/config/createbackend'); ?>">
-      <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create New Monitoring Backend'); ?>
+      <?= $this->icon('plus'); ?> <?= $this->translate('Create New Monitoring Backend'); ?>
     </a>
   </p>
   <table class="action">
@@ -38,7 +38,7 @@
   <h1><?= $this->translate('Monitoring Instances') ?></h1>
   <p>
     <a href="<?= $this->href('/monitoring/config/createinstance'); ?>">
-      <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create New Instance'); ?>
+      <?= $this->icon('plus'); ?> <?= $this->translate('Create New Instance'); ?>
     </a>
   </p>
   <table class="action">
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 0da62ad77..9a7c850f2 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -31,21 +31,21 @@
 
         <div>
             <a href="<?= $rescheduleAllLink ?>">
-                <?= $this->icon('reschedule', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('reschedule'); ?>
                 <?= $this->translate('Reschedule host checks') ?>
             </a>
         </div>
 
         <div>
             <a href="<?= $downtimeAllLink ?>">
-                <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('plug'); ?>
                 <?= $this->translate('Schedule host downtimes') ?>
             </a>
         </div>
 
         <div>
             <a href="<?= $processCheckResultAllLink; ?>">
-                <?= $this->icon('reply', null, array('aria-hidden' => 'true')); ?>
+                <?= $this->icon('reply'); ?>
                 <?= $this->translate('Submit passive check results'); ?>
             </a>
         </div>
@@ -71,7 +71,7 @@
                 ),
                 $unhandledCount
             ) ?>">
-                <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('plug'); ?>
                 <?= sprintf(
                     $this->translatePlural(
                         'Schedule downtime for unhandled host problem',
@@ -91,7 +91,7 @@
                 ),
                 $unhandledCount
             ) ?>">
-                <?= $this->icon('ok', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('ok'); ?>
                 <?= sprintf(
                     $this->translatePlural(
                         'Acknowledge unhandled host problem',
@@ -133,7 +133,7 @@
                        ),
                        $inDowntimeCount
                    ) ?>">
-                    <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+                    <?= $this->icon('plug'); ?>
                     <?= sprintf(
                         $this->translatePlural(
                             'List %u host currently in downtime',
@@ -158,7 +158,7 @@
                        ),
                        $commentCount
                    ) ?>">
-                    <?= $this->icon('comment', null, array('aria-hidden' => 'true')) ?>
+                    <?= $this->icon('comment'); ?>
                     <?= sprintf(
                         $this->translatePlural(
                             'List %u host comment',
diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index 99d070c31..f32a22815 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -20,7 +20,7 @@ foreach ($groupData as $groupName => $groupInfo): ?>
             <div class="box contents">
 <?php foreach ($groupInfo['contacts'] as $c): ?>
                 <div class="box entry">
-                    <img aria-hidden="true" src="<?= $this->href('/static/gravatar', array('email' => $c->contact_email )) ?>" />
+                    <?= $this->img('/static/gravatar', array('email' => $c->contact_email)); ?>
                     <a href="<?= $this->href(
                         'monitoring/show/contact',
                         array('contact' => $c->contact_name)
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 292617493..4623a5027 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -14,7 +14,7 @@
     }
     foreach ($contacts as $contact): ?>
         <div class="contact">
-            <img aria-hidden="true" src="<?= $this->href('/static/gravatar', array('email' => $contact->contact_email )) ?>" />
+            <?= $this->img('/static/gravatar', array('email' => $contact->contact_email)); ?>
             <a href="<?= $this->href(
                 'monitoring/show/contact',
                 array('contact' => $contact->contact_name)
diff --git a/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml b/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
index a92302775..da58fc9cb 100644
--- a/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
+++ b/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
@@ -9,8 +9,8 @@
     <table class="objectlist">
         <thead>
             <tr>
-                <th><?= $this->icon('host', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Host'); ?></th>
-                <th><?= $this->icon('conf', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Service'); ?></th>
+                <th><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
+                <th><?= $this->icon('conf'); ?> <?= $this->translate('Service'); ?></th>
             </tr>
         </thead>
         <tbody>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 44951735a..8f818627a 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -19,21 +19,21 @@
 
         <div>
             <a href="<?= $rescheduleAllLink ?>">
-                <?= $this->icon('reschedule', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('reschedule'); ?>
                 <?= $this->translate('Reschedule service checks') ?>
             </a>
         </div>
 
         <div>
             <a href="<?= $downtimeAllLink ?>">
-                <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('plug'); ?>
                 <?= $this->translate('Schedule service downtimes') ?>
             </a>
         </div>
 
         <div>
             <a href="<?= $processCheckResultAllLink; ?>">
-                <?= $this->icon('reply', null, array('aria-hidden' => 'true')); ?>
+                <?= $this->icon('reply'); ?>
                 <?= $this->translate('Submit passive check results'); ?>
             </a>
         </div>
@@ -59,7 +59,7 @@
                 ),
                 $unhandledCount
             ) ?>">
-                <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('plug'); ?>
                 <?= sprintf(
                     $this->translatePlural(
                         'Schedule downtime for unhandled service problem',
@@ -79,7 +79,7 @@
                 ),
                 $unhandledCount
             ) ?>">
-                <?= $this->icon('ok', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('ok'); ?>
                 <?= sprintf(
                     $this->translatePlural(
                         'Acknowledge unhandled service problem',
@@ -119,7 +119,7 @@
                         $inDowntimeCount
                     ),
                 $inDowntimeCount) ?>">
-                    <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+                    <?= $this->icon('plug'); ?>
                     <?= sprintf(
                         $this->translatePlural(
                             'List %u service currently in downtime',
@@ -143,7 +143,7 @@
                     ),
                     $commentCount
                 ) ?>">
-                    <?= $this->icon('comment', null, array('aria-hidden' => 'true')) ?>
+                    <?= $this->icon('comment'); ?>
                     <?= sprintf(
                         $this->translatePlural(
                             'List %u service comment',
diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index c5c2a5667..8da35590f 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -36,7 +36,7 @@ if ($object->acknowledged): ?>
                 }
             ?>
             <a href="<?= $ackLink ?>" data-base-target="_self">
-                <?= $this->icon('ok', null, array('aria-hidden' => 'true')) ?> <?= $this->translate('Acknowledge') ?>
+                <?= $this->icon('ok') ?> <?= $this->translate('Acknowledge') ?>
             </a>
             <?php } else {
                 echo '&#45;';
diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index 5545790ab..ec0c2792a 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -40,7 +40,7 @@ if ($object->getType() === $object::TYPE_HOST) {
           }
       ?>
       <a href="<?= $reschedule ?>" data-base-target="_self">
-          <?= $this->icon('reschedule', null, array('aria-hidden' => 'true')) ?>
+          <?= $this->icon('reschedule') ?>
           <?= $this->translate('Reschedule') ?>
       </a>
       <?php } // endif ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/command.phtml b/modules/monitoring/application/views/scripts/show/components/command.phtml
index 1041b7ff6..a74b5b884 100644
--- a/modules/monitoring/application/views/scripts/show/components/command.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/command.phtml
@@ -22,7 +22,7 @@ $command = array_shift($parts);
                 );
             } ?>
             <a href="<?= $processCheckResult ?>" data-base-target="_self">
-                <?= $this->icon('reply', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('reply') ?>
                 <?= $this->translate('Process check result') ?>
             </a>
         <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index 9973ff037..a6503a70b 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -16,7 +16,7 @@
             }
         ?>
         <a href="<?= $addCommentLink ?>" data-base-target="_self">
-            <?= $this->icon('comment', null, array('aria-hidden' => 'true')) ?>
+            <?= $this->icon('comment') ?>
             <?= $this->translate('Add comment') ?>
         </a>
         <?php } else {
diff --git a/modules/monitoring/application/views/scripts/show/components/contacts.phtml b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
index 68e6423ff..50b173381 100644
--- a/modules/monitoring/application/views/scripts/show/components/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
@@ -12,7 +12,7 @@ if (! empty($object->contacts)) {
     printf(
         "<tr><th>%s</th><td>%s %s</td></tr>\n",
         $this->translate('Contacts'),
-        $this->icon('user', null, array('aria-hidden' => 'true')),
+        $this->icon('user'),
         implode(', ', $list)
     );
 
@@ -31,7 +31,7 @@ if (! empty($object->contactgroups)) {
     printf(
         "<tr><th>%s</th><td>%s %s</td></tr>\n",
         $this->translate('Contactgroups'),
-        $this->icon('users', null, array('aria-hidden' => 'true')),
+        $this->icon('users'),
         implode(', ', $list)
     );
 
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index f838b3d61..4aa1e21c1 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -16,7 +16,7 @@
             }
         ?>
         <a href="<?= $scheduleDowntimeLink ?>" data-base-target="_self">
-            <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+            <?= $this->icon('plug') ?>
             <?= $this->translate('Schedule downtime') ?>
         </a>
         <?php } else {
diff --git a/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml b/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
index 3a41f0cd8..165df627a 100644
--- a/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
@@ -11,7 +11,7 @@ foreach ($object->hostgroups as $name => $alias) {
 printf(
     "<tr><th>%s</th><td>%s %s</td></tr>\n",
     $this->translate('Hostgroups'),
-    $this->icon('host', null, array('aria-hidden' => 'true')),
+    $this->icon('host'),
     implode(', ', $list)
 );
 
diff --git a/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml b/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
index 01de6d71c..50b71d839 100644
--- a/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
@@ -12,7 +12,7 @@ foreach ($object->servicegroups as $name => $alias) {
 printf(
     "<tr><th>%s</th><td>%s %s</td></tr>\n",
     $this->translate('Servicegroups'),
-    $this->icon('services', null, array('aria-hidden' => 'true')),
+    $this->icon('services'),
     implode(', ', $list)
 );
 
diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
index b55dcff10..d7c26d460 100644
--- a/modules/setup/application/forms/AuthenticationPage.php
+++ b/modules/setup/application/forms/AuthenticationPage.php
@@ -41,7 +41,7 @@ class AuthenticationPage extends Form
                 'note',
                 'external_note',
                 array(
-                    'value'         => $this->translate(
+                    'value'         => '<i aria-hidden="true" class="icon-info"></i>' . $this->translate(
                         'You\'re currently not authenticated using any of the web server\'s authentication '
                         . 'mechanisms. Make sure you\'ll configure such, otherwise you\'ll not be able to '
                         . 'log into Icinga Web 2.'
@@ -50,7 +50,7 @@ class AuthenticationPage extends Form
                         'ViewHelper',
                         array(
                             'HtmlTag',
-                            array('tag' => 'p', 'class' => 'icon-info info-box')
+                            array('tag' => 'p', 'class' => 'info-box')
                         )
                     )
                 )

From 27cb5e24db8f2837ffd1883b741fc72c2fd5ac42 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 16 Feb 2015 10:53:48 +0100
Subject: [PATCH 0687/2920] Ensure that all standalone icons have proper labels

refs #8358
---
 .../application/views/scripts/list/comments.phtml           | 6 +++---
 .../application/views/scripts/list/downtimes.phtml          | 6 +++---
 .../monitoring/application/views/scripts/list/hosts.phtml   | 2 +-
 .../application/views/scripts/list/notifications.phtml      | 4 ++--
 .../application/views/scripts/list/services.phtml           | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 7d8fe4646..6f49bf4a8 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -50,16 +50,16 @@
         </td>
         <td>
         <?php if ($comment->objecttype === 'service'): ?>
-          <?= $this->icon('service') ?>
+          <?= $this->icon('service', $this->translate('Service')); ?>
           <?= $this->link()->service(
               $comment->service, $comment->service_display_name, $comment->host, $comment->host_display_name
           ) ?>
         <?php else: ?>
-          <?= $this->icon('host') ?>
+          <?= $this->icon('host', $this->translate('Host')); ?>
           <?= $this->link()->host($comment->host, $comment->host_display_name) ?>
         <?php endif ?>
           <br>
-          <?= $this->icon('comment', null, array('aria-hidden' => 'true')); ?> <?= isset($comment->author)
+          <?= $this->icon('comment', $this->translate('Comment')); ?> <?= isset($comment->author)
             ? '[' . $comment->author . '] '
             : '';
           ?><?= $this->escape($comment->comment); ?>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index eaf4b7f8e..1fbaa713f 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -55,16 +55,16 @@ use Icinga\Module\Monitoring\Object\Service;
         </td>
         <td>
         <?php if ($isService): ?>
-          <?= $this->icon('service') ?>
+          <?= $this->icon('service', $this->translate('Service')); ?>
           <?= $this->link()->service(
               $downtime->service, $downtime->service_display_name, $downtime->host, $downtime->host_display_name
           ) ?>
         <?php else: ?>
-          <?= $this->icon('host') ?>
+          <?= $this->icon('host', $this->translate('Host')); ?>
           <?= $this->link()->host($downtime->host, $downtime->host_display_name) ?>
         <?php endif ?>
           <br>
-          <?= $this->icon('comment') ?> [<?= $this->escape($downtime->author) ?>] <?= $this->escape($downtime->comment) ?>
+          <?= $this->icon('comment', $this->translate('Comment')); ?> [<?= $this->escape($downtime->author) ?>] <?= $this->escape($downtime->comment) ?>
           <br>
           <small>
         <?php if ($downtime->is_flexible): ?>
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 07410ddc7..b9fa25975 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -74,7 +74,7 @@ if ($hosts->count() === 0) {
     }
 
     if (isset($host->host_last_comment) && $host->host_last_comment !== null) {
-        $icons[] = $this->icon('comment', $this->translate('Comment: ') . $host->host_last_comment);
+        $icons[] = $this->icon('comment', $this->translate('Last Comment: ') . $host->host_last_comment);
     }
     ?>
     <tr class="state <?= $hostStateName ?><?= $host->host_handled ? ' handled' : '' ?>">
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 44f33851f..9cc5f724b 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -42,7 +42,7 @@ use Icinga\Module\Monitoring\Object\Service;
             </td>
             <td style="font-size: 0.8em">
                 <?php if ($isService): ?>
-                    <?= $this->icon('service') ?>
+                    <?= $this->icon('service', $this->translate('Service')); ?>
                     <?= $this->link()->service(
                         $notification->service,
                         $notification->service_display_name,
@@ -50,7 +50,7 @@ use Icinga\Module\Monitoring\Object\Service;
                         $notification->host_display_name
                     ) ?>
                 <?php else: ?>
-                    <?= $this->icon('host') ?>
+                    <?= $this->icon('host', $this->translate('Host')); ?>
                     <?= $this->link()->host($notification->host, $notification->host_display_name) ?>
                 <?php endif ?>
                 <br>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 4cb073fc3..e8d39c7c3 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -90,7 +90,7 @@ foreach ($services as $service):
         <?php endif ?>
 
         <?php if (isset($service->service_last_comment) && $service->service_last_comment !== null): ?>
-        <?= $this->icon('comment', $this->translate('Comment: ') . $service->service_last_comment) ?>
+        <?= $this->icon('comment', $this->translate('Last Comment: ') . $service->service_last_comment) ?>
         <?php endif ?>
 
         <?php if (!$service->service_active_checks_enabled): ?>

From 936bfd43b022b785cee82e1c6f0ea7633bfb2899 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 16 Feb 2015 10:57:31 +0100
Subject: [PATCH 0688/2920] Skip Links: Remove logo focus and move links into
 the menu

---
 application/layouts/scripts/body.phtml        | 21 +++----------------
 .../layouts/scripts/parts/navigation.phtml    |  8 +++++++
 public/css/icinga/menu.less                   |  2 +-
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index 9f0b78ce9..03c0f5905 100644
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -7,22 +7,6 @@ use Icinga\Authentication\Manager as Auth;
 
 if (Auth::getInstance()->isAuthenticated()): ?>
  <div id="header">
-   <div class="skip-links">
-     <nav>
-       <h1 class="sr-only"><?= t('Accessibility Skip Links'); ?></h1>
-       <ul>
-         <li>
-           <a tabindex="0" href="#main"><?= t('Skip to Content'); ?></a>
-         </li>
-         <li>
-           <a tabindex="0" href="#search"><?= t('Skip to Search'); ?></a>
-         </li>
-         <li>
-           <a tabindex="0" href="#navigation"><?= t('Skip to Navigation'); ?></a>
-         </li>
-       </ul>
-     </nav>
-   </div>
    <ul id="notifications"><?php
 
 $moduleName = $this->layout()->moduleName;
@@ -44,8 +28,9 @@ if ($notifications->hasMessages()) {
     }
 }
    ?></ul>
-   <div id="logo" data-base-target="_main"><a href="<?= $this->href('/dashboard') ?>"><img aria-hidden="true" src="<?= $this->href('img/logo_icinga-inv.png') ?>" class="logo" alt="<?= t('Dashboard') ?>" /></a>
- </div>
+   <div id="logo" data-base-target="_main">
+           <img aria-hidden="true" src="<?= $this->href('img/logo_icinga-inv.png') ?>" class="logo" alt="<?= t('Dashboard') ?>" />
+   </div>
  </div>
 
 <?php if (!$this->layout()->isIframe): ?>
diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml
index dc56b9199..1a3c6dff9 100644
--- a/application/layouts/scripts/parts/navigation.phtml
+++ b/application/layouts/scripts/parts/navigation.phtml
@@ -10,6 +10,14 @@ if (! $this->auth()->isAuthenticated()) {
 }
 
 ?>
+<div class="skip-links">
+    <h1 class="sr-only"><?= t('Accessibility Skip Links'); ?></h1>
+    <ul>
+        <li>
+            <a tabindex="0" href="#main"><?= t('Skip to Content'); ?></a>
+        </li>
+    </ul>
+</div>
 <div  id="menu" data-last-update="<?= (time() - 14) ?>000" data-base-target="_main" class="container"
       data-icinga-url="<?= $this->href('layout/menu') ?>"  data-icinga-refresh="15">
     <?= $this->partial(
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 6653a250a..dd8dbe07b 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -285,7 +285,7 @@ a:focus {
         display: block;
         left: -999em;
         width: 10.4em;
-        top: 0.4em;
+        top: 0em;
         padding: 0.8em;
         background-color: white;
         z-index: 4;

From 2dea398f3b666a94b430c433e4cf1190949e8644 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 16 Feb 2015 11:02:09 +0100
Subject: [PATCH 0689/2920] Mute all icons that are part of an anchor and add
 simple labels to such anchors

The labels I've added are probably just of temporary nature as it's not
defined yet how to handle link labels properly for screen readers. What
is sure is that all icons that are part of a link are not important for the
meaning of it as this is expressed by the link itself.

refs #8360
refs #8358
---
 .../views/scripts/config/modules.phtml        | 29 +++++++-----
 .../views/scripts/config/resource.phtml       | 24 +++++++---
 .../views/scripts/dashboard/settings.phtml    | 22 +++++----
 .../scripts/form/reorder-authbackend.phtml    | 46 +++++++++++++++----
 application/views/scripts/roles/index.phtml   | 14 +++---
 .../views/scripts/config/index.phtml          | 40 +++++++++++-----
 6 files changed, 120 insertions(+), 55 deletions(-)

diff --git a/application/views/scripts/config/modules.phtml b/application/views/scripts/config/modules.phtml
index ed5a2426c..01fc1c48d 100644
--- a/application/views/scripts/config/modules.phtml
+++ b/application/views/scripts/config/modules.phtml
@@ -10,17 +10,24 @@
   <?php foreach ($modules as $module): ?>
     <tr>
       <td>
-      <?php if ($module->enabled): ?>
-      <?= $this->icon('thumbs-up', $this->translate('Module is enabled')) ?>
-      <?php else: ?>
-      <?= $this->icon('thumbs-down', $this->translate('Module is disabled')) ?>
-      <?php endif ?>
-        <a href="<?= $this->url(
-            'config/module/',
-            array('name' => $module->name)
-        ) ?>"><?= $this->escape($module->name); ?></a> (<?=
-            $module->enabled ? ($module->loaded ? $this->translate('enabled') : $this->translate('failed')) : $this->translate('disabled')
-        ?>)
+        <?php if ($module->enabled && $module->loaded) {
+          $icon = $this->icon('thumbs-up');
+          $title = sprintf($this->translate('Module %s is enabled'), $module->name);
+        } elseif (! $module->enabled) {
+          $icon = $this->icon('thumbs-down');
+          $title = sprintf($this->translate('Module %s is disabled'), $module->name);
+        } else { // ! $module->loaded
+          $icon = $this->icon('thumbs-down');
+          $title = sprintf($this->translate('Module %s has failed to load'), $module->name);
+        }
+
+        echo $this->qlink(
+          $icon . $this->escape($module->name),
+          'config/module/',
+          array('name' => $module->name),
+          array('title' => $title),
+          false
+        ); ?>
       </td>
     </tr>
   <?php endforeach ?>
diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index 12c9cf6ce..8b58ea15a 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -36,14 +36,24 @@
     <?php foreach ($this->resources as $name): ?>
       <tr>
         <td>
-          <a href="<?= $this->href('config/editresource', array('resource' => $name)); ?>">
-            <?= $this->icon('edit'); ?> <?= $this->escape($name); ?>
-          </a>
+          <?= $this->qlink(
+            $this->icon('edit') . ' ' . $this->escape($name),
+            'config/editresource',
+            array('resource' => $name),
+            array('title' => sprintf($this->translate('Edit resource %s'), $name)),
+            false
+          ); ?>
         </td>
-        <td style="text-align: center">
-          <a href="<?= $this->href('config/removeresource', array('resource' => $name)); ?>">
-            <?= $this->icon('cancel'); ?>
-          </a>
+        <td>
+          <center>
+            <?= $this->qlink(
+              $this->icon('cancel'),
+              'config/removeresource',
+              array('resource' => $name),
+              array('title' => sprintf($this->translate('Remove resource %s'), $name)),
+              false
+            ); ?>
+          </center>
         </td>
       </tr>
     <?php endforeach; ?>
diff --git a/application/views/scripts/dashboard/settings.phtml b/application/views/scripts/dashboard/settings.phtml
index 19a846ace..2ac9a1dfa 100644
--- a/application/views/scripts/dashboard/settings.phtml
+++ b/application/views/scripts/dashboard/settings.phtml
@@ -1,5 +1,3 @@
-<?php
-?>
 <div class="controls">
     <?= $this->tabs ?>
 </div>
@@ -25,9 +23,13 @@
                         <?= $pane->getName(); ?>
                     </th>
                     <th>
-                        <a href="<?= $this->href('dashboard/remove-pane', array('pane' => $pane->getName()));  ?>">
-                            <?= $this->icon('cancel'); ?>
-                        </a>
+                        <?= $this->qlink(
+                            $this->icon('cancel'),
+                            'dashboard/remove-pane',
+                            array('pane' => $pane->getName()),
+                            array('title' => sprintf($this->translate('Remove pane %s'), $pane->getName())),
+                            false
+                        ); ?>
                     </th>
                 </tr>
                 <?php $dashlets = $pane->getDashlets(); ?>
@@ -50,9 +52,13 @@
                                 <a href="<?= $this->href($dashlet->getUrl()); ?>"><?= $dashlet->getUrl(); ?></a>
                             </td>
                             <td>
-                                <a href="<?= $this->href('dashboard/remove-dashlet', array('pane' => $pane->getName(), 'dashlet' => $dashlet->getTitle()));  ?>">
-                                <?= $this->icon('cancel'); ?>
-                                </a>
+                                <?= $this->qlink(
+                                    $this->icon('cancel'),
+                                    'dashboard/remove-dashlet',
+                                    array('pane' => $pane->getName(), 'dashlet' => $dashlet->getTitle()),
+                                    array('title' => sprintf($this->translate('Remove dashlet %s from pane %s'), $dashlet->getTitle(), $pane->getName())),
+                                    false
+                                ); ?>
                             </td>
                         </tr>
                     <?php endforeach; ?>
diff --git a/application/views/scripts/form/reorder-authbackend.phtml b/application/views/scripts/form/reorder-authbackend.phtml
index 90319e0ad..8cfe62cc4 100644
--- a/application/views/scripts/form/reorder-authbackend.phtml
+++ b/application/views/scripts/form/reorder-authbackend.phtml
@@ -10,24 +10,50 @@
 <?php for ($i = 0; $i < count($backendNames); $i++): ?>
       <tr>
         <td class="action">
-          <a href="<?= $this->href('config/editAuthenticationBackend', array('auth_backend' => $backendNames[$i])); ?>">
-            <?= $this->icon('edit'); ?> <?= $this->escape($backendNames[$i]); ?>
-          </a>
+          <?= $this->qlink(
+            $this->icon('edit') . ' ' . $this->escape($backendNames[$i]),
+            'config/editAuthenticationBackend',
+            array('auth_backend' => $backendNames[$i]),
+            array('title' => sprintf($this->translate('Edit authentication backend %s'), $backendNames[$i])),
+            false
+          ); ?>
         </td>
         <td>
-          <a href="<?= $this->href('config/removeAuthenticationBackend', array('auth_backend' => $backendNames[$i])); ?>">
-            <?= $this->icon('cancel', $this->translate('Remove')); ?>
-          </a>
+          <?= $this->qlink(
+            $this->icon('cancel'),
+            'config/removeAuthenticationBackend',
+            array('auth_backend' => $backendNames[$i]),
+            array('title' => sprintf($this->translate('Remove authentication backend %s'), $backendNames[$i])),
+            false
+          ); ?>
         </td>
         <td>
 <?php if ($i > 0): ?>
-          <button type="submit" name="backend_newpos" value="<?= sprintf('%s|%s', $backendNames[$i], $i - 1); ?>">
-            <?= $this->icon('up-big', $this->translate('Move up in authentication order')); ?>
+          <button type="submit" name="backend_newpos" value="<?= sprintf(
+            '%s|%s',
+            $backendNames[$i],
+            $i - 1
+          ); ?>" title="<?= $this->translate(
+            'Move up in authentication order'
+          ); ?>" aria-label="<?= sprintf(
+            $this->translate('Move authentication backend %s upwards'),
+            $backendNames[$i]
+          ); ?>">
+            <?= $this->icon('up-big'); ?>
           </button>
 <?php endif; ?>
 <?php if ($i + 1 < count($backendNames)): ?>
-          <button type="submit" name="backend_newpos" value="<?= sprintf('%s|%s', $backendNames[$i], $i + 1); ?>">
-            <?= $this->icon('down-big', $this->translate('Move down in authentication order')); ?>
+          <button type="submit" name="backend_newpos" value="<?= sprintf(
+            '%s|%s',
+            $backendNames[$i],
+            $i + 1
+          ); ?>" title="<?= $this->translate(
+            'Move down in authentication order'
+          ); ?>" aria-label="<?= sprintf(
+            $this->translate('Move authentication backend %s downwards'),
+            $backendNames[$i]
+          ); ?>">
+            <?= $this->icon('down-big'); ?>
           </button>
 <?php endif; ?>
         </td>
diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml
index c08a0b6a4..ea70bbe3f 100644
--- a/application/views/scripts/roles/index.phtml
+++ b/application/views/scripts/roles/index.phtml
@@ -51,13 +51,13 @@
                         <td><?= $this->escape($role->users) ?></td>
                         <td><?= $this->escape($role->groups) ?></td>
                         <td>
-                            <a href="<?= $this->url('roles/remove', array('role' => $name)) ?>"
-                               title="<?= sprintf(
-                                   $this->translate('Remove role %s'),
-                                   $name
-                               ) ?>">
-                                <?= $this->icon('cancel') ?>
-                            </a>
+                            <?= $this->qlink(
+                                $this->icon('cancel'),
+                                'roles/remove',
+                                array('role' => $name),
+                                array('title' => sprintf($this->translate('Remove role %s'), $name)),
+                                false
+                            ); ?>
                         </td>
                     </tr>
                 <?php endforeach ?>
diff --git a/modules/monitoring/application/views/scripts/config/index.phtml b/modules/monitoring/application/views/scripts/config/index.phtml
index b1729f9b1..0fdb5f8c3 100644
--- a/modules/monitoring/application/views/scripts/config/index.phtml
+++ b/modules/monitoring/application/views/scripts/config/index.phtml
@@ -18,18 +18,26 @@
     <?php foreach ($this->backendsConfig as $backendName => $config): ?>
       <tr>
         <td>
-          <a href="<?= $this->href('/monitoring/config/editbackend', array('backend' => $backendName)); ?>">
-            <?= $this->icon('edit'); ?> <?= $this->escape($backendName); ?>
-          </a>
+          <?= $this->qlink(
+            $this->icon('edit') . ' ' . $this->escape($backendName),
+            '/monitoring/config/editbackend',
+            array('backend' => $backendName),
+            array('title' => sprintf($this->translate('Edit monitoring backend %s'), $backendName)),
+            false
+          ); ?>
           <small>(<?= sprintf(
             $this->translate('Type: %s'),
             $this->escape($config->type === 'ido' ? 'IDO' : ucfirst($config->type))
           ); ?>)</small>
         </td>
         <td>
-          <a href="<?= $this->href('/monitoring/config/removebackend', array('backend' => $backendName)); ?>">
-            <?= $this->icon('cancel'); ?>
-          </a>
+          <?= $this->qlink(
+            $this->icon('cancel'),
+            '/monitoring/config/removebackend',
+            array('backend' => $backendName),
+            array('title' => sprintf($this->translate('Remove monitoring backend %s'), $backendName)),
+            false
+          ); ?>
         </td>
       </tr>
     <?php endforeach; ?>
@@ -50,18 +58,26 @@
     <?php foreach ($this->instancesConfig as $instanceName => $config): ?>
       <tr>
         <td>
-          <a href="<?= $this->href('/monitoring/config/editinstance', array('instance' => $instanceName)); ?>">
-            <?= $this->icon('edit'); ?> <?= $this->escape($instanceName); ?>
-          </a>
+          <?= $this->qlink(
+            $this->icon('edit') . ' ' . $this->escape($instanceName),
+            '/monitoring/config/editinstance',
+            array('instance' => $instanceName),
+            array('title' => sprintf($this->translate('Edit monitoring instance %s'), $instanceName)),
+            false
+          ); ?>
           <small>(<?= sprintf(
             $this->translate('Type: %s'),
             $config->host !== null ? $this->translate('Remote') : $this->translate('Local')
           ); ?>)</small>
         </td>
         <td>
-          <a href="<?= $this->href('/monitoring/config/removeinstance', array('instance' => $instanceName)); ?>">
-            <?= $this->icon('cancel'); ?>
-          </a>
+          <?= $this->qlink(
+            $this->icon('cancel'),
+            '/monitoring/config/removeinstance',
+            array('instance' => $instanceName),
+            array('title' => sprintf($this->translate('Remove monitoring instance %s'), $instanceName)),
+            false
+          ); ?>
         </td>
       </tr>
     <?php endforeach; ?>

From 28a8af19334983c6941207ba9a35c7a310b5fe74 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 16 Feb 2015 12:04:54 +0100
Subject: [PATCH 0690/2920] Add auto refresh form to the navigation part

refs #7945
---
 application/layouts/scripts/parts/navigation.phtml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml
index 1a3c6dff9..2136c0fd5 100644
--- a/application/layouts/scripts/parts/navigation.phtml
+++ b/application/layouts/scripts/parts/navigation.phtml
@@ -16,6 +16,9 @@ if (! $this->auth()->isAuthenticated()) {
         <li>
             <a tabindex="0" href="#main"><?= t('Skip to Content'); ?></a>
         </li>
+        <li>
+            <?= $this->layout()->autoRefreshForm ?>
+        </li>
     </ul>
 </div>
 <div  id="menu" data-last-update="<?= (time() - 14) ?>000" data-base-target="_main" class="container"

From 240c55fcafb6226caa075d51483685b7a0359a86 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 16 Feb 2015 12:05:26 +0100
Subject: [PATCH 0691/2920] Adjust on focus css style for the auto refresh
 trigger button

refs #7945
---
 public/css/icinga/menu.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 9c8945396..c33c6670c 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -284,6 +284,7 @@ a:focus {
         position: absolute;
         display: block;
         left: -999em;
+        box-sizing: content-box;
         width: 10.4em !important;
         top: 0em;
         text-align: left !important;
@@ -293,6 +294,7 @@ a:focus {
         border: 1px @colorGray solid;
         &:focus {
           left: 0;
+          outline: 1px dotted black !important;
         }
       }
     }

From e588ea2714db6c4e6e307590bbbf5ca6e306f8ef Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 16 Feb 2015 13:05:24 +0100
Subject: [PATCH 0692/2920] Fix filter expression handling when lowering to
 achieve case-insensitivity

fixes #8435
---
 .../library/Monitoring/Backend/Ido/Query/IdoQuery.php      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index a2c757800..c87025fdd 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -290,7 +290,12 @@ abstract class IdoQuery extends DbQuery
                 && strpos($filter->getColumn(), 'LOWER') !== 0
             ) {
                 $filter->setColumn('LOWER(' . $filter->getColumn() . ')');
-                $filter->setExpression(strtolower($filter->getExpression()));
+                $expression = $filter->getExpression();
+                if (is_array($expression)) {
+                    $filter->setExpression(array_map('strtolower', $expression));
+                } else {
+                    $filter->setExpression(strtolower($expression));
+                }
             }
         } else {
             foreach ($filter->filters() as $chainedFilter) {

From ae68e8aec42703c988ca2d5f2620e8a23ac4e4b1 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 16 Feb 2015 11:35:44 +0100
Subject: [PATCH 0693/2920] Ajax onFailure: Write component URL to container

This is needed that history can push the correct detail url
---
 public/js/icinga/loader.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 92aa1e9d8..481a149ec 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -420,8 +420,6 @@
                     var $el = $(el);
                     if ($el.hasClass('dashboard')) {
                         return;
-                    } else {
-
                     }
                     var url = $el.data('icingaUrl');
                     targets[i].data('icingaUrl', url);
@@ -564,7 +562,7 @@
                 } else {
                     // Request wasn't for a container, so it's usually the body
                     // or the full layout. Push request URL to history:
-                    this.icinga.history.pushUrl(req.url);
+                    this.icinga.history.pushCurrentState();
                 }
             }
 
@@ -594,6 +592,8 @@
 
             req.failure = true;
 
+            req.$target.data('icingaUrl', req.url);
+
             /*
              * Test if a manual actions comes in and autorefresh is active: Stop refreshing
              */

From 2aca4dc6d5c88636bc93eeea0b22e58653f7f1c2 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 16 Feb 2015 14:08:07 +0100
Subject: [PATCH 0694/2920] History: Do not push same url twice

---
 public/js/icinga/history.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/public/js/icinga/history.js b/public/js/icinga/history.js
index 3357b41a3..1f438074a 100644
--- a/public/js/icinga/history.js
+++ b/public/js/icinga/history.js
@@ -92,7 +92,7 @@
             // TODO: update navigation
             // Did we find any URL? Then push it!
             if (url !== '') {
-                window.history.pushState({icinga: true}, null, this.cleanupUrl(url));
+                this.push(url);
             }
         },
 
@@ -101,15 +101,19 @@
             if (!this.enabled) {
                 return;
             }
-            window.history.pushState({icinga: true}, null, this.cleanupUrl(url));
+            this.push(url);
         },
 
-        cleanupUrl: function(url) {
+        push: function (url) {
             url = url.replace(/_render=[a-z0-9]+&/, '').replace(/&_render=[a-z0-9]+/, '').replace(/\?_render=[a-z0-9]+$/, '');
             url = url.replace(/_reload=[a-z0-9]+&/, '').replace(/&_reload=[a-z0-9]+/, '').replace(/\?_reload=[a-z0-9]+$/, '');
-            return url;
+            if (this.lastPushUrl === url) {
+                return;
+            }
+            this.lastPushUrl = url;
+            window.history.pushState({icinga: true}, null, url);
         },
-
+        
         /**
          * Event handler for pop events
          *

From 43691f66124ba4a9e708f19f901df8eb87d7fb5b Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Mon, 16 Feb 2015 14:36:39 +0100
Subject: [PATCH 0695/2920] Drop BasketAction as it's not used anywhere

---
 .../Web/Widget/Tabextension/BasketAction.php  | 34 -------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 library/Icinga/Web/Widget/Tabextension/BasketAction.php

diff --git a/library/Icinga/Web/Widget/Tabextension/BasketAction.php b/library/Icinga/Web/Widget/Tabextension/BasketAction.php
deleted file mode 100644
index b372af6e1..000000000
--- a/library/Icinga/Web/Widget/Tabextension/BasketAction.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\Web\Widget\Tabextension;
-
-use Icinga\Web\Widget\Tabs;
-use Icinga\Web\Url;
-
-/**
- * Tabextension that adds the basket command
- *
- * @TODO: Baskets are not supported in the codebase yet (Feature #4537)
- */
-class BasketAction implements Tabextension
-{
-    /**
-     * Applies the dashboard actions to the provided tabset
-     *
-     * @param   Tabs $tabs The tabs object to extend with
-     */
-    public function apply(Tabs $tabs)
-    {
-        $tabs->addAsDropdown(
-            'basket',
-            array(
-                'title'     => 'URL Basket',
-                'url'       => Url::fromPath('basket/add'),
-                'urlParams' => array(
-                    'url' => Url::fromRequest()->getRelativeUrl()
-                )
-            )
-        );
-    }
-}

From 0c0478688e482926b44f75d5382d3d91821237f0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 16 Feb 2015 15:07:31 +0100
Subject: [PATCH 0696/2920] js: Fix that buttons with any DOM descendants are
 not ignored by linkClicked

fixes #8380
---
 public/js/icinga/events.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 3fbb9cf79..098aaa88f 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -364,6 +364,7 @@
             var self   = event.data.self;
             var icinga = self.icinga;
             var $a = $(this);
+            var $eventTarget = $(event.target);
             var href = $a.attr('href');
             var linkTarget = $a.attr('target');
             var $target;
@@ -400,9 +401,17 @@
                 return false;
             }
 
-            // Ignore form elements in action rows
-            if ($(event.target).is('input') || $(event.target).is('button')) {
-                return;
+            if (! $eventTarget.is($a)) {
+                if ($eventTarget.is('input') || $eventTarget.is('button')) {
+                    // Ignore form elements in action rows
+                    return;
+                } else {
+                    var $button = $('input[type=submit]:focus').add('button[type=submit]:focus');
+                    if ($button.length > 0 && $.contains($button[0], $eventTarget[0])) {
+                        // Ignore any descendant of form elements
+                        return;
+                    }
+                }
             }
 
             // ignore multiselect table row clicks

From c135d3243a5c70c25dcf31b93fca6d966649700b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 16 Feb 2015 15:08:27 +0100
Subject: [PATCH 0697/2920] Fix that the authentication reorder form does not
 have an action

---
 application/views/scripts/form/reorder-authbackend.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/scripts/form/reorder-authbackend.phtml b/application/views/scripts/form/reorder-authbackend.phtml
index 8cfe62cc4..23a6a67f5 100644
--- a/application/views/scripts/form/reorder-authbackend.phtml
+++ b/application/views/scripts/form/reorder-authbackend.phtml
@@ -1,4 +1,4 @@
-<form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>">
+<form data-base-target="_self" id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
   <table class="action">
     <thead>
       <th>Backend</th>

From 6cc428d0e19eba30c0c290311d7cc3987abf9013 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 16 Feb 2015 15:38:16 +0100
Subject: [PATCH 0698/2920] History: Combined cleanup regular expression

---
 public/js/icinga/history.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/icinga/history.js b/public/js/icinga/history.js
index 1f438074a..db08c95cb 100644
--- a/public/js/icinga/history.js
+++ b/public/js/icinga/history.js
@@ -105,8 +105,8 @@
         },
 
         push: function (url) {
-            url = url.replace(/_render=[a-z0-9]+&/, '').replace(/&_render=[a-z0-9]+/, '').replace(/\?_render=[a-z0-9]+$/, '');
-            url = url.replace(/_reload=[a-z0-9]+&/, '').replace(/&_reload=[a-z0-9]+/, '').replace(/\?_reload=[a-z0-9]+$/, '');
+            url = url.replace(/[\?&]?_(render|reload)=[a-z0-9]+/g, '');
+            console.log("URL:", url);
             if (this.lastPushUrl === url) {
                 return;
             }

From ea57e7a786a0962bc89bcd564b1d55a3f5deb9ab Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 16 Feb 2015 15:56:50 +0100
Subject: [PATCH 0699/2920] History: Do not write abort requests to browser
 history

Remove req.historyTriggered and introduce req.addToHistory.
---
 public/js/icinga/history.js | 5 ++---
 public/js/icinga/loader.js  | 9 ++++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/public/js/icinga/history.js b/public/js/icinga/history.js
index db08c95cb..96711f709 100644
--- a/public/js/icinga/history.js
+++ b/public/js/icinga/history.js
@@ -106,7 +106,6 @@
 
         push: function (url) {
             url = url.replace(/[\?&]?_(render|reload)=[a-z0-9]+/g, '');
-            console.log("URL:", url);
             if (this.lastPushUrl === url) {
                 return;
             }
@@ -159,7 +158,7 @@
                 icinga.loader.loadUrl(
                     main,
                     $('#col1')
-                ).historyTriggered = true;
+                ).addToHistory = false;
             }
 
             if (document.location.hash && document.location.hash.match(/^#!/)) {
@@ -176,7 +175,7 @@
                         icinga.loader.loadUrl(
                             parts[1],
                             $('#col2')
-                        ).historyTriggered = true;
+                        ).addToHistory = false;
                     }
                 }
 
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 481a149ec..811b8ad00 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -114,10 +114,10 @@
             req.done(this.onResponse);
             req.fail(this.onFailure);
             req.complete(this.onComplete);
-            req.historyTriggered = false;
             req.autorefresh = autorefresh;
             req.action = action;
             req.failure = false;
+            req.addToHistory = true;
 
             if (id) {
                 this.requests[id] = req;
@@ -553,7 +553,7 @@
 
             // Update history when necessary. Don't do so for requests triggered
             // by history or autorefresh events
-            if (! req.historyTriggered && ! req.autorefresh) {
+            if (! req.autorefresh && req.addToHistory) {
                 if (req.$target.hasClass('container') && ! req.failure) {
                     // We only want to care about top-level containers
                     if (req.$target.parent().closest('.container').length === 0) {
@@ -597,7 +597,7 @@
             /*
              * Test if a manual actions comes in and autorefresh is active: Stop refreshing
              */
-            if (! req.historyTriggered && ! req.autorefresh && req.$target.data('icingaRefresh') > 0
+            if (req.addToHistory && ! req.autorefresh && req.$target.data('icingaRefresh') > 0
             && req.$target.data('icingaUrl') !== url) {
                 req.$target.data('icingaRefresh', 0);
                 req.$target.data('icingaUrl', url);
@@ -621,6 +621,9 @@
                         'Request to ' + url + ' has been aborted for ',
                         req.$target
                     );
+
+                    // Aborted requests should not be added to browser history
+                    req.addToHistory = false;
                 } else {
                     if (this.failureNotice === null) {
                         this.failureNotice = this.createNotice(

From 3dce0e434aac67208979283ea6ef22f75a0ca0f2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 17 Feb 2015 09:24:29 +0100
Subject: [PATCH 0700/2920] Add more sophisticated fix for keeping the focus
 after an autorefresh

fixes #8350
---
 public/js/icinga/loader.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 811b8ad00..6f5df4ea1 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -675,7 +675,6 @@
             // Container update happens here
             var scrollPos = false;
             var self = this;
-            var origFocus = self.icinga.utils.getDomPath(document.activeElement);
             var containerId = $container.attr('id');
             if (typeof containerId !== 'undefined') {
                 if (autorefresh) {
@@ -684,6 +683,9 @@
                     scrollPos = 0;
                 }
             }
+            if (autorefresh && $.contains($container[0], document.activeElement)) {
+                var origFocus = self.icinga.utils.getDomPath(document.activeElement);
+            }
 
             $container.trigger('beforerender');
 
@@ -740,7 +742,7 @@
             }
             this.icinga.ui.assignUniqueContainerIds();
 
-            if (origFocus.length == origFocus[0] !== '') {
+            if (origFocus && origFocus.length > 0 && origFocus[0] !== '') {
                 setTimeout(function() {
                     $(self.icinga.utils.getElementByDomPath(origFocus)).focus();
                 }, 0);

From 9c5d44caf0e3c48f5330eee56a4e6e3d3f1f2ec2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 17 Feb 2015 12:50:11 +0100
Subject: [PATCH 0701/2920] Fix that webkit submits datetime values not
 according to RFC 3339

That's actually more of a workaround instead of a fix as the bug itself
is part of webkit, not Icinga Web 2.

fixes #8457
---
 library/Icinga/Web/Form/Element/DateTimePicker.php | 10 ++++++++--
 .../Web/Form/Validator/DateTimeValidator.php       | 14 +++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Web/Form/Element/DateTimePicker.php b/library/Icinga/Web/Form/Element/DateTimePicker.php
index 1350e7f9a..529175af4 100644
--- a/library/Icinga/Web/Form/Element/DateTimePicker.php
+++ b/library/Icinga/Web/Form/Element/DateTimePicker.php
@@ -4,7 +4,6 @@
 namespace Icinga\Web\Form\Element;
 
 use DateTime;
-use Icinga\Web\Form;
 use Icinga\Web\Form\FormElement;
 use Icinga\Web\Form\Validator\DateTimeValidator;
 
@@ -126,10 +125,17 @@ class DateTimePicker extends FormElement
         if (! parent::isValid($value, $context)) {
             return false;
         }
+
         if (! $value instanceof DateTime) {
             $format = $this->local === true ? 'Y-m-d\TH:i:s' : DateTime::RFC3339;
-            $this->setValue(DateTime::createFromFormat($format, $value));
+            $dateTime = DateTime::createFromFormat($format, $value);
+            if ($dateTime === false) {
+                $dateTime = DateTime::createFromFormat(substr($format, 0, strrpos($format, ':')), $value);
+            }
+
+            $this->setValue($dateTime);
         }
+
         return true;
     }
 }
diff --git a/library/Icinga/Web/Form/Validator/DateTimeValidator.php b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
index f1e22e250..576ed36f8 100644
--- a/library/Icinga/Web/Form/Validator/DateTimeValidator.php
+++ b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
@@ -57,14 +57,22 @@ class DateTimeValidator extends Zend_Validate_Abstract
             $this->_error(self::INVALID_DATETIME_TYPE);
             return false;
         }
-        if (is_string($value)) {
-            $format = $this->local === true ? 'Y-m-d\TH:i:s' : DateTime::RFC3339;
+
+        if (! $value instanceof DateTime) {
+            $format = $baseFormat = $this->local === true ? 'Y-m-d\TH:i:s' : DateTime::RFC3339;
             $dateTime = DateTime::createFromFormat($format, $value);
+
+            if ($dateTime === false) {
+                $format = substr($format, 0, strrpos($format, ':'));
+                $dateTime = DateTime::createFromFormat($format, $value);
+            }
+
             if ($dateTime === false || $dateTime->format($format) !== $value) {
-                $this->_error(self::INVALID_DATETIME_FORMAT, DateTimeFactory::create()->format($format));
+                $this->_error(self::INVALID_DATETIME_FORMAT, DateTimeFactory::create()->format($baseFormat));
                 return false;
             }
         }
+
         return true;
     }
 }

From a9d767867d577bc1a61811b2bba9e11e15fe16c5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 17 Feb 2015 14:02:35 +0100
Subject: [PATCH 0702/2920] WCAG/2.4.4: Add example for link contexts

refs #8458
---
 doc/accessibility/link-labels.html | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 doc/accessibility/link-labels.html

diff --git a/doc/accessibility/link-labels.html b/doc/accessibility/link-labels.html
new file mode 100644
index 000000000..439adb85e
--- /dev/null
+++ b/doc/accessibility/link-labels.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<html class="no-js" lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>Accessibility: Link Labels</title>
+    <meta name="description" content="Accessible links">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+<body>
+    <a href="/monitoring/host/show?host=localhost"
+       title="Show detailed information about the host localhost"
+       aria-label="Show detailed information about the host localhost">localhost</a>
+</body>
+</html>
\ No newline at end of file

From 32226418af767cb4caf98badb934083cdea1c87c Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Tue, 17 Feb 2015 16:12:41 +0100
Subject: [PATCH 0703/2920] Header: Add header to process/info

refs #7976
---
 .../controllers/ProcessController.php         |  2 +-
 .../views/scripts/process/info.phtml          | 67 +++++++++++++++++--
 public/css/icinga/menu.less                   |  5 +-
 3 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php
index 875f4094c..2209a8e0b 100644
--- a/modules/monitoring/application/controllers/ProcessController.php
+++ b/modules/monitoring/application/controllers/ProcessController.php
@@ -25,7 +25,7 @@ class Monitoring_ProcessController extends Controller
                     'title' => $this->translate('Monitoring Health'),
                     'url'   =>'monitoring/process/info'
                 )
-            );
+            )->setTitle($this->translate('Process Information'));
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml
index 92bb6cb63..12cb01fbc 100644
--- a/modules/monitoring/application/views/scripts/process/info.phtml
+++ b/modules/monitoring/application/views/scripts/process/info.phtml
@@ -9,15 +9,42 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
 </div>
 
 <div class="content processinfo">
+    <h1 tabindex="-1">
+        <?= $this->translate('Monitoring Health'); ?>
+    </h1>
+    <div class="skip-links skip-links-inline">
+        <h2 class="sr-only"><?= $this->translate('Skip Links'); ?></h2>
+        <ul>
+            <li>
+                <a tabindex="0" href="#process-feature-command">
+                    <?= t('Skip To Feature Commands'); ?>
+                </a>
+            </li>
+            <li>
+                <a tabindex="0" href="#process-process-info">
+                    <?= t('Skip To Process Information'); ?>
+                </a>
+            </li>
+            <li>
+                <a tabindex="0" href="#process-performance-info">
+                    <?= t('Skip To Performance Information'); ?>
+                </a>
+            </li>
+        </ul>
+    </div>
     <div class="boxview">
 
         <div class="box left">
-            <h2><?= $this->translate('Feature Commands') ?></h2>
+            <h2 tabindex="-1" id="process-feature-command">
+                <?= $this->translate('Feature Commands') ?>
+            </h2>
             <?= $this->toggleFeaturesForm ?>
         </div>
 
         <div class="box left">
-            <h2><?= $this->translate('Process Info') ?></h2>
+            <h2 tabindex="-1" id="process-process-info">
+                <?= $this->translate('Process Info') ?>
+            </h2>
             <table class="avp">
                 <tbody>
                 <tr>
@@ -68,9 +95,33 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
         </div>
 
         <div class="box left">
-            <h2><?= $this->translate('Performance Info') ?></h2>
+            <h2 tabindex="-1" id="process-performance-info">
+                <?= $this->translate('Performance Info') ?>
+            </h2>
+            <div class="skip-links skip-links-inline">
+                <h2 class="sr-only"><?= $this->translate('Skip Links'); ?></h2>
+                <ul>
+                    <li>
+                        <a tabindex="0" href="#process-object-summaries">
+                            <?= t('Skip To Object Summaries'); ?>
+                        </a>
+                    </li>
+                    <li>
+                        <a tabindex="0" href="#process-active-checks">
+                            <?= t('Skip To Active Checks'); ?>
+                        </a>
+                    </li>
+                    <li>
+                        <a tabindex="0" href="#process-passive-checks">
+                            <?= t('Skip To Passive Checks'); ?>
+                        </a>
+                    </li>
+                </ul>
+            </div>
 
-            <h3><?= $this->translate('Object summaries') ?></h3>
+            <h3 tabindex="-1" id="process-object-summaries">
+                <?= $this->translate('Object summaries') ?>
+            </h3>
             <table class="avp">
                 <thead>
                 <tr>
@@ -118,7 +169,9 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
                 </tbody>
             </table>
 
-            <h3><?= $this->translate('Active checks') ?></h3>
+            <h3 tabindex="-1" id="process-active-checks">
+                <?= $this->translate('Active checks') ?>
+            </h3>
             <table class="avp">
                 <thead>
                 <tr>
@@ -148,7 +201,9 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
                 </tbody>
             </table>
 
-            <h3><?= $this->translate('Passive checks') ?></h3>
+            <h3 tabindex="-1" id="process-passive-checks">
+                <?= $this->translate('Passive checks') ?>
+            </h3>
             <table class="avp">
                 <tbody>
                 <tr>
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index c33c6670c..6e31e8d8f 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -301,5 +301,8 @@ a:focus {
   }
 }
 .skip-links-inline {
-  margin-top: -3.5em;
+  margin-top: -2em;
+  ul > li > a {
+    width: 14em !important;
+  }
 }

From fe0bcdbbafbd7aa619023bf47152a94371905034 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Tue, 17 Feb 2015 16:19:03 +0100
Subject: [PATCH 0704/2920] Header: Add header to module configuration

refs #7976
---
 application/views/scripts/config/module.phtml | 136 +++++++++---------
 .../views/scripts/config/modules.phtml        |  56 ++++----
 2 files changed, 98 insertions(+), 94 deletions(-)

diff --git a/application/views/scripts/config/module.phtml b/application/views/scripts/config/module.phtml
index cd6ad5af8..c41fdbf3a 100644
--- a/application/views/scripts/config/module.phtml
+++ b/application/views/scripts/config/module.phtml
@@ -1,70 +1,74 @@
 <div class="controls">
-<?= $this->tabs ?>
-<h1><?= $this->escape($module->getTitle()) ?></h1>
+  <?= $this->tabs ?>
 </div>
 <div class="content">
-<?php if (! $module): ?>
-<?= $this->translate('There is no such module installed.') ?>
-<?php return; endif ?>
-<?php
-$dependencies = $module->getDependencies();
-$restrictions = $module->getProvidedRestrictions();
-$permissions = $module->getProvidedPermissions();
-$state = $moduleData->enabled ? ($moduleData->loaded ? 'enabled' : 'failed') : 'disabled'
-
-?>
-<table class="avp">
-<tr>
-  <th><?= $this->escape($this->translate('Name')) ?></th>
-  <td><?= $this->escape($module->getName()) ?></td>
-</tr>
-<tr>
-  <th><?= $this->translate('State') ?></th>
-  <td><?= $state ?><?php if ($state === 'enabled'): ?>
-  <?= $this->qlink($this->translate('disable'), 'config/moduledisable', array(
-      'name' => $module->getName()
-  )) ?>
-  <?php endif ?>
-  <?php if ($state === 'disabled'): ?>
-  <?= $this->qlink($this->translate('enable'), 'config/moduleenable', array(
-      'name' => $module->getName()
-  )) ?>
-  <?php endif ?>
-  </td>
-<tr>
-  <th><?= $this->escape($this->translate('Version')) ?></th>
-  <td><?= $this->escape($module->getVersion()) ?></td></tr>
-<tr>
-  <th><?= $this->escape($this->translate('Description')) ?></th>
-  <td><?= nl2br($this->escape($module->getDescription())) ?></td>
-</tr>
-<tr>
-  <th><?= $this->escape($this->translate('Dependencies')) ?></th>
-  <td><?php
-  
-if (empty($dependencies)):
-    echo $this->translate('This module has no dependencies');
-
-else: foreach ($dependencies as $name => $versionString): ?>
-<strong><?= $this->escape($name) ?></strong><?php if ($versionString !== true): ?>: <?= $this->escape($versionString) ?><?php endif ?><br />
-<?php endforeach; endif ?></td>
-</tr>
-<?php if (! empty($permissions)): ?>
-<tr>
-  <th><?= $this->escape($this->translate('Permissions')) ?></th>
-  <td><?php foreach ($permissions as $permission): ?>
-<strong><?= $this->escape($permission->name) ?></strong>: <?= $this->escape($permission->description) ?><br />
-<?php endforeach ?></td>
-</tr>
-<?php endif ?>
-<?php if (! empty($restrictions)): ?>
-<tr>
-  <th><?= $this->escape($this->translate('Restrictions')) ?></th>
-  <td><?php foreach ($restrictions as $restriction): ?>
-<strong><?= $this->escape($restriction->name) ?></strong>: <?= $this->escape($restriction->description) ?><br />
-<?php endforeach ?></td>
-</tr>
-<?php endif ?>
-</table>
-
+  <h1 tabindex="-1">
+    <?= $this->escape($module->getTitle()) ?>
+  </h1>
+  <?php if (! $module): ?>
+    <?= $this->translate('There is no such module installed.') ?>
+  <?php return; endif ?>
+  <?php
+    $dependencies = $module->getDependencies();
+    $restrictions = $module->getProvidedRestrictions();
+    $permissions = $module->getProvidedPermissions();
+    $state = $moduleData->enabled ? ($moduleData->loaded ? 'enabled' : 'failed') : 'disabled'
+  ?>
+  <table class="avp">
+    <tr>
+      <th><?= $this->escape($this->translate('Name')) ?></th>
+      <td><?= $this->escape($module->getName()) ?></td>
+    </tr>
+    <tr>
+      <th><?= $this->translate('State') ?></th>
+      <td><?= $state ?><?php if ($state === 'enabled'): ?>
+      <?= $this->qlink($this->translate('disable'), 'config/moduledisable', array(
+          'name' => $module->getName()
+      )) ?>
+      <?php endif ?>
+      <?php if ($state === 'disabled'): ?>
+      <?= $this->qlink($this->translate('enable'), 'config/moduleenable', array(
+          'name' => $module->getName()
+      )) ?>
+      <?php endif ?>
+      </td>
+    <tr>
+      <th><?= $this->escape($this->translate('Version')) ?></th>
+      <td><?= $this->escape($module->getVersion()) ?></td></tr>
+    <tr>
+      <th><?= $this->escape($this->translate('Description')) ?></th>
+      <td><?= nl2br($this->escape($module->getDescription())) ?></td>
+    </tr>
+    <tr>
+      <th><?= $this->escape($this->translate('Dependencies')) ?></th>
+      <td>
+        <?php
+          if (empty($dependencies)):
+            echo $this->translate('This module has no dependencies');
+          else: foreach ($dependencies as $name => $versionString): ?>
+            <strong><?= $this->escape($name) ?></strong><?php if ($versionString !== true): ?>: <?= $this->escape($versionString) ?><?php endif ?><br />
+        <?php endforeach; endif ?>
+      </td>
+    </tr>
+    <?php if (! empty($permissions)): ?>
+      <tr>
+        <th><?= $this->escape($this->translate('Permissions')) ?></th>
+        <td>
+          <?php foreach ($permissions as $permission): ?>
+            <strong><?= $this->escape($permission->name) ?></strong>: <?= $this->escape($permission->description) ?><br />
+          <?php endforeach ?>
+        </td>
+      </tr>
+    <?php endif ?>
+    <?php if (! empty($restrictions)): ?>
+      <tr>
+        <th><?= $this->escape($this->translate('Restrictions')) ?></th>
+        <td>
+          <?php foreach ($restrictions as $restriction): ?>
+            <strong><?= $this->escape($restriction->name) ?></strong>: <?= $this->escape($restriction->description) ?><br />
+          <?php endforeach ?>
+        </td>
+      </tr>
+    <?php endif ?>
+  </table>
 </div>
diff --git a/application/views/scripts/config/modules.phtml b/application/views/scripts/config/modules.phtml
index 01fc1c48d..25b57533d 100644
--- a/application/views/scripts/config/modules.phtml
+++ b/application/views/scripts/config/modules.phtml
@@ -1,36 +1,36 @@
 <div class="controls">
 <?= $this->tabs ?>
-<h1><?= $this->translate('Installed Modules') ?></h1>
 <?= $this->paginationControl($modules) ?>
 </div>
 
 <div class="content">
-<table class="action" data-base-target="_next">
-  <tbody>
-  <?php foreach ($modules as $module): ?>
-    <tr>
-      <td>
-        <?php if ($module->enabled && $module->loaded) {
-          $icon = $this->icon('thumbs-up');
-          $title = sprintf($this->translate('Module %s is enabled'), $module->name);
-        } elseif (! $module->enabled) {
-          $icon = $this->icon('thumbs-down');
-          $title = sprintf($this->translate('Module %s is disabled'), $module->name);
-        } else { // ! $module->loaded
-          $icon = $this->icon('thumbs-down');
-          $title = sprintf($this->translate('Module %s has failed to load'), $module->name);
-        }
+  <h1 tabindex="-1"><?= $this->translate('Installed Modules') ?></h1>
+  <table class="action" data-base-target="_next">
+    <tbody>
+    <?php foreach ($modules as $module): ?>
+      <tr>
+        <td>
+          <?php if ($module->enabled && $module->loaded) {
+            $icon = $this->icon('thumbs-up');
+            $title = sprintf($this->translate('Module %s is enabled'), $module->name);
+          } elseif (! $module->enabled) {
+            $icon = $this->icon('thumbs-down');
+            $title = sprintf($this->translate('Module %s is disabled'), $module->name);
+          } else { // ! $module->loaded
+            $icon = $this->icon('thumbs-down');
+            $title = sprintf($this->translate('Module %s has failed to load'), $module->name);
+          }
 
-        echo $this->qlink(
-          $icon . $this->escape($module->name),
-          'config/module/',
-          array('name' => $module->name),
-          array('title' => $title),
-          false
-        ); ?>
-      </td>
-    </tr>
-  <?php endforeach ?>
-  </tbody>
-</table>
+          echo $this->qlink(
+            $icon . $this->escape($module->name),
+            'config/module/',
+            array('name' => $module->name),
+            array('title' => $title),
+            false
+          ); ?>
+        </td>
+      </tr>
+    <?php endforeach ?>
+    </tbody>
+  </table>
 </div>

From 28dfbe7e55e246c77bc8bdfdeda42fa4fbb4e4c9 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 17 Feb 2015 16:34:36 +0100
Subject: [PATCH 0705/2920] Support aria markup in SVG charts

Add "aria-labelled-by", "title" and "desc" to describe the svg charts in screen readers.
---
 library/Icinga/Chart/Chart.php                | 22 ++++-
 library/Icinga/Chart/GridChart.php            |  7 ++
 library/Icinga/Chart/PieChart.php             |  7 ++
 library/Icinga/Chart/Primitive/Canvas.php     | 24 +++++
 library/Icinga/Chart/SVGRenderer.php          | 95 +++++++++++++++++++
 .../controllers/AlertsummaryController.php    |  4 +
 .../controllers/ChartController.php           |  6 ++
 7 files changed, 163 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Chart/Chart.php b/library/Icinga/Chart/Chart.php
index 13b0114e6..842bb56e8 100644
--- a/library/Icinga/Chart/Chart.php
+++ b/library/Icinga/Chart/Chart.php
@@ -38,11 +38,25 @@ abstract class Chart implements Drawable
      */
     protected $palette;
 
+    /**
+     * The title of this chart, used for providing accessibility features
+     *
+     * @var string
+     */
+    public $title;
+
+    /**
+     * The description for this chart, mandatory for providing accessibility features
+     *
+     * @var string
+     */
+    public $description;
+
     /**
      * Create a new chart object and create internal objects
      *
      * If you want to extend this class use the init() method as an extension point,
-     * as this will be called at the end o fthe construct call
+     * as this will be called at the end of the construct call
      */
     public function __construct()
     {
@@ -86,7 +100,6 @@ abstract class Chart implements Drawable
     }
 
     /**
-     *
      * Render this graph and return the created SVG
      *
      * @return  string              The SVG created by the SvgRenderer
@@ -105,6 +118,11 @@ abstract class Chart implements Drawable
             $this->renderer->setXAspectRatioAlignment(SVGRenderer::X_ASPECT_RATIO_MIN);
             $this->renderer->setYAspectRatioAlignment(SVGRenderer::Y_ASPECT_RATIO_MIN);
         }
+
+        $this->renderer->setAriaDescription($this->description);
+        $this->renderer->setAriaTitle($this->title);
+        $this->renderer->getCanvas()->setAriaRole('presentation');
+
         $this->renderer->getCanvas()->addElement($this);
         return $this->renderer->render();
     }
diff --git a/library/Icinga/Chart/GridChart.php b/library/Icinga/Chart/GridChart.php
index 7f2794282..20ebb969e 100644
--- a/library/Icinga/Chart/GridChart.php
+++ b/library/Icinga/Chart/GridChart.php
@@ -84,6 +84,13 @@ class GridChart extends Chart
      */
     private $tooltips = array();
 
+    public function __construct()
+    {
+        $this->title = t('Grid Chart');
+        $this->description = t('Contains data in a bar or line chart.');
+        parent::__construct();
+    }
+
     /**
      * Check if the current dataset has the proper structure for this chart.
      *
diff --git a/library/Icinga/Chart/PieChart.php b/library/Icinga/Chart/PieChart.php
index 33ce32927..6b19969c8 100644
--- a/library/Icinga/Chart/PieChart.php
+++ b/library/Icinga/Chart/PieChart.php
@@ -50,6 +50,13 @@ class PieChart extends Chart
      */
     private $noCaption = false;
 
+    public function __construct()
+    {
+        $this->title = t('Pie Chart');
+        $this->description = t('Contains data in a pie chart.');
+        parent::__construct();
+    }
+
     /**
      * Test if the given pies have the correct format
      *
diff --git a/library/Icinga/Chart/Primitive/Canvas.php b/library/Icinga/Chart/Primitive/Canvas.php
index c5617fa35..88e247f02 100644
--- a/library/Icinga/Chart/Primitive/Canvas.php
+++ b/library/Icinga/Chart/Primitive/Canvas.php
@@ -43,6 +43,13 @@ class Canvas implements Drawable
      */
     private $rect;
 
+    /**
+     * The aria role used to describe this canvas' purpose in the accessibility tree
+     *
+     * @var string
+     */
+    private $ariaRole;
+
     /**
      * Create this canvas
      *
@@ -111,6 +118,23 @@ class Canvas implements Drawable
             $innerContainer->appendChild($child->toSvg($ctx));
         }
 
+        if (isset($this->ariaRole)) {
+            $outer->setAttribute('role', $this->ariaRole);
+        }
         return $outer;
     }
+
+    /**
+     * Set the aria role used to determine the meaning of this canvas in the accessibility tree
+     *
+     * The role 'presentation' will indicate that the purpose of this canvas is entirely decorative, while the role
+     * 'img' will indicate that the canvas contains an image, with a possible title or a description. For other
+     * possible roles, see http://www.w3.org/TR/wai-aria/roles
+     *
+     * @param $role string  The aria role to set
+     */
+    public function setAriaRole($role)
+    {
+        $this->ariaRole = $role;
+    }
 }
diff --git a/library/Icinga/Chart/SVGRenderer.php b/library/Icinga/Chart/SVGRenderer.php
index 5cc223388..98eaa86d6 100644
--- a/library/Icinga/Chart/SVGRenderer.php
+++ b/library/Icinga/Chart/SVGRenderer.php
@@ -48,6 +48,27 @@ class SVGRenderer
      */
     private $svg;
 
+    /**
+     * The description of this SVG, useful for screen readers
+     *
+     * @var string
+     */
+    private $ariaDescription;
+
+    /**
+     * The title of this SVG, useful for screen readers
+     *
+     * @var string
+     */
+    private $ariaTitle;
+
+    /**
+     * The aria role used by this svg element
+     *
+     * @var string
+     */
+    private $ariaRole = 'img';
+
     /**
      * The root layer for all elements
      *
@@ -126,6 +147,7 @@ class SVGRenderer
         $svg = $this->document->createElement('svg');
         $svg->setAttribute('xmlns', 'http://www.w3.org/2000/svg');
         $svg->setAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
+        $svg->setAttribute('role', $this->ariaRole);
         $svg->setAttribute('width', '100%');
         $svg->setAttribute('height', '100%');
         $svg->setAttribute(
@@ -150,6 +172,42 @@ class SVGRenderer
         return $svg;
     }
 
+    /**
+     * Add aria title and description
+     *
+     * Adds an aria title and desc element to the given SVG node, which are used to describe this SVG by accessibility
+     * tools such as screen readers.
+     *
+     * @param DOMNode $svg          The SVG DOMNode to which the aria attributes should be attached
+     * @param         $title        The title text
+     * @param         $description  The description text
+     */
+    private function addAriaDescription (DOMNode $svg, $titleText, $descriptionText)
+    {
+        $doc = $svg->ownerDocument;
+
+        $titleId = $descId = '';
+        if (isset ($this->ariaTitle)) {
+            $titleId = 'aria-title-' . $this->stripNonAlphanumeric($titleText);
+            $title = $doc->createElement('title');
+            $title->setAttribute('id', $titleId);
+
+            $title->appendChild($doc->createTextNode($titleText));
+            $svg->appendChild($title);
+        }
+
+        if (isset ($this->ariaDescription)) {
+            $descId = 'aria-desc-' . $this->stripNonAlphanumeric($descriptionText);
+            $desc = $doc->createElement('desc');
+            $desc->setAttribute('id', $descId);
+
+            $desc->appendChild($doc->createTextNode($descriptionText));
+            $svg->appendChild($desc);
+        }
+
+        $svg->setAttribute('aria-labelledby', join(' ', array($titleId, $descId)));
+    }
+
     /**
      * Initialises the XML-document, SVG-element and this figure's root canvas
      *
@@ -172,6 +230,7 @@ class SVGRenderer
     {
         $this->createRootDocument();
         $ctx = $this->createRenderContext();
+        $this->addAriaDescription($this->svg, $this->ariaTitle, $this->ariaDescription);
         $this->svg->appendChild($this->rootCanvas->toSvg($ctx));
         $this->document->formatOutput = true;
         return $this->document->saveXML();
@@ -232,4 +291,40 @@ class SVGRenderer
     {
         $this->yAspectRatio = $alignment;
     }
+
+    /**
+     * Set the aria description, that is used as a title for this SVG in screen readers
+     *
+     * @param $text
+     */
+    public function setAriaTitle($text)
+    {
+        $this->ariaTitle = $text;
+    }
+
+    /**
+     * Set the aria description, that is used to describe this SVG in screen readers
+     *
+     * @param $text
+     */
+    public function setAriaDescription($text)
+    {
+        $this->ariaDescription = $text;
+    }
+
+    /**
+     * Set the aria role, that is used to describe the purpose of this SVG in screen readers
+     *
+     * @param $text
+     */
+    public function setAriaRole($text)
+    {
+        $this->ariaRole = $text;
+    }
+
+
+    private function stripNonAlphanumeric($str)
+    {
+        return preg_replace('/[^A-Za-z]+/', '', $str);
+    }
 }
diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 1b3db8093..252a67091 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -341,6 +341,8 @@ class Monitoring_AlertsummaryController extends Controller
     public function createHealingChart()
     {
         $gridChart = new GridChart();
+        $gridChart->title = t('Healing Chart');
+        $gridChart->description = t('Notifications and average reaction time per hour.');
 
         $gridChart->alignTopLeft();
         $gridChart->setAxisLabel($this->createPeriodDescription(), mt('monitoring', 'Notifications'))
@@ -477,6 +479,8 @@ class Monitoring_AlertsummaryController extends Controller
     public function createDefectImage()
     {
         $gridChart = new GridChart();
+        $gridChart->title = t('Defect Chart');
+        $gridChart->description = t('Notifications and defects per hour');
 
         $gridChart->alignTopLeft();
         $gridChart->setAxisLabel($this->createPeriodDescription(), mt('monitoring', 'Notifications'))
diff --git a/modules/monitoring/application/controllers/ChartController.php b/modules/monitoring/application/controllers/ChartController.php
index b01702c04..f19d3f458 100644
--- a/modules/monitoring/application/controllers/ChartController.php
+++ b/modules/monitoring/application/controllers/ChartController.php
@@ -236,6 +236,9 @@ class Monitoring_ChartController extends Controller
             $unknownBars[] = array($servicegroup->servicegroup, $servicegroup->services_unknown_unhandled);
         }
         $this->view->chart = new GridChart();
+        $this->view->chart->title = t('Service Group Chart');
+        $this->view->chart->description = t('Contains service states for each service group.');
+
         $this->view->chart->alignTopLeft();
         $this->view->chart->setAxisLabel('', mt('monitoring', 'Services'))
             ->setXAxis(new StaticAxis())
@@ -292,6 +295,9 @@ class Monitoring_ChartController extends Controller
         }
         $tooltip = mt('monitoring', '<b>{title}:</b><br> {value} of {sum} hosts are {label}');
         $this->view->chart = new GridChart();
+        $this->view->chart->title = t('Host Group Chart');
+        $this->view->chart->description = t('Contains host states of each service group.');
+
         $this->view->chart->alignTopLeft();
         $this->view->chart->setAxisLabel('', mt('monitoring', 'Hosts'))
             ->setXAxis(new StaticAxis())

From a61e3094025bb8bf68b7cf2e102e7715c523d1d3 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Wed, 18 Feb 2015 10:56:21 +0100
Subject: [PATCH 0706/2920] Header: Scrolling Position fix for skiplinks

refs #7976
---
 public/css/icinga/menu.less | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 6e31e8d8f..3c733db6e 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -270,7 +270,7 @@ a:focus {
 
 /* Accessibility Skip Links */
 .skip-links {
-  position: absolute;
+  position: relative;
   opacity: 1;
   ul {
     list-style-type: none;
@@ -286,7 +286,6 @@ a:focus {
         left: -999em;
         box-sizing: content-box;
         width: 10.4em !important;
-        top: 0em;
         text-align: left !important;
         padding: 0.8em;
         background-color: white;
@@ -301,8 +300,8 @@ a:focus {
   }
 }
 .skip-links-inline {
-  margin-top: -2em;
   ul > li > a {
     width: 14em !important;
+    top: -3em;
   }
 }

From 02777c58acd0770d06f0267f8702fffb672165e1 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Wed, 18 Feb 2015 12:45:08 +0100
Subject: [PATCH 0707/2920] Header: Add one to Alertsummary report

refs #7976
---
 .../controllers/AlertsummaryController.php    |  2 +
 .../views/scripts/alertsummary/index.phtml    | 54 ++++++++++++++++---
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 1b3db8093..b36f7ac3e 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -39,6 +39,8 @@ class Monitoring_AlertsummaryController extends Controller
 
         $this->notificationData = $this->createNotificationData();
         $this->problemData = $this->createProblemData();
+
+        $tabs->setTitle($this->translate('Alertsummary Navigation'));
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/alertsummary/index.phtml b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
index dbfff6433..7db60791a 100644
--- a/modules/monitoring/application/views/scripts/alertsummary/index.phtml
+++ b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
@@ -8,25 +8,63 @@
 </div>
 
 <div class="content alertsummary">
-    <!-- <h1><?= $this->translate('Alert summary'); ?></h1> -->
+    <h1 tabindex="-1">
+        <?= $this->translate('Alert summary'); ?>
+    </h1>
+    <div class="skip-links skip-links-inline">
+        <h2 class="sr-only"><?= $this->translate('Skip Links'); ?></h2>
+        <ul>
+            <li>
+                <a tabindex="0" href="#alertsummary-notifications">
+                    <?= t('Skip To Notification Chart'); ?>
+                </a>
+            </li>
+            <li>
+                <a tabindex="0" href="#alertsummary-reaction-time">
+                    <?= t('Skip To Reaction Time Chart'); ?>
+                </a>
+            </li>
+            <li>
+                <a tabindex="0" href="#alertsummary-trend">
+                    <?= t('Skip To Trend'); ?>
+                </a>
+            </li>
+            <li>
+                <a tabindex="0" href="#alertsummary-top5">
+                    <?= t('Sktip To Top 5 Alerts'); ?>
+                </a>
+            </li>
+            <li>
+                <a tabindex="0" href="#alertsummary-history">
+                    <?= t('Skip To Alert History'); ?>
+                </a>
+            </li>
+        </ul>
+    </div>
 
     <div class="hbox">
         <div class="hbox-item">
-            <h2><?= $this->translate('Notifications and Problems'); ?></h2>
+            <h2 tabindex="-1" id="alertsummary-notifications">
+                <?= $this->translate('Notifications and Problems'); ?>
+            </h2>
             <div style="width: 400px; height: 400px;">
                 <?= $defectChart->render(); ?>
             </div>
         </div>
 
         <div class="hbox-item">
-            <h2><?= $this->translate('Time to Reaction (Ack, Recover)'); ?></h2>
+            <h2 tabindex="-1" id="alertsummary-reaction-time">
+                <?= $this->translate('Time to Reaction (Ack, Recover)'); ?>
+            </h2>
             <div style="width: 400px; height: 400px;">
                 <?= $healingChart->render(); ?>
             </div>
         </div>
     </div>
 
-    <h2><?= $this->translate('Trend'); ?></h2>
+    <h2 tabindex="-1" id="alertsummary-trend">
+        <?= $this->translate('Trend'); ?>
+    </h2>
 
     <div class="alertsummary-flex-container">
         <div class="alertsummary-flex">
@@ -53,7 +91,9 @@
     </div>
 
     <?php if ($this->recentAlerts): ?>
-        <h1><?= $this->translate('Top 5 Recent Alerts'); ?></h1>
+        <h2 tabindex="-1" id="alertsummary-top5">
+            <?= $this->translate('Top 5 Recent Alerts'); ?>
+        </h2>
 
         <div class="alertsummary-flex-container">
             <div class="alertsummary-flex">
@@ -66,7 +106,9 @@
         </div>
     <?php endif; ?>
 
-    <h1><?= $this->translate('History'); ?></h1>
+    <h2 tabindex="-1" id="alertsummary-history">
+        <?= $this->translate('History'); ?>
+    </h2>
     <div class="alertsummary-flex-container">
         <div class="alertsummary-flex">
             <?= $this->partial('list/notifications.phtml', array(

From 2992bf3445a817f8ddf2b2f61b3e64fa614a4764 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 18 Feb 2015 12:55:33 +0100
Subject: [PATCH 0708/2920] Always display tooltips in all charts

Make information about data types available to colorblind, when hovering
over the displayed data set

fixes #8364
---
 library/Icinga/Chart/Graph/BarGraph.php       |  6 ++
 library/Icinga/Chart/Graph/LineGraph.php      | 62 ++++++++++++++++---
 library/Icinga/Chart/Graph/Tooltip.php        |  2 +-
 library/Icinga/Chart/GridChart.php            |  7 ++-
 library/Icinga/Web/Widget/Chart/InlinePie.php |  1 -
 .../controllers/AlertsummaryController.php    | 15 +++--
 public/js/icinga/behavior/tooltip.js          |  2 +-
 7 files changed, 78 insertions(+), 17 deletions(-)

diff --git a/library/Icinga/Chart/Graph/BarGraph.php b/library/Icinga/Chart/Graph/BarGraph.php
index 2d20f8f22..dacc12878 100644
--- a/library/Icinga/Chart/Graph/BarGraph.php
+++ b/library/Icinga/Chart/Graph/BarGraph.php
@@ -65,7 +65,13 @@ class BarGraph extends Styleable implements Drawable
     ) {
         $this->order = $order;
         $this->dataSet = $dataSet;
+
         $this->tooltips = $tooltips;
+        foreach ($this->tooltips as $value) {
+            $ts[] = $value;
+        }
+        $this->tooltips = $ts;
+
         $this->graphs = $graphs;
     }
 
diff --git a/library/Icinga/Chart/Graph/LineGraph.php b/library/Icinga/Chart/Graph/LineGraph.php
index 630223968..7b831d625 100644
--- a/library/Icinga/Chart/Graph/LineGraph.php
+++ b/library/Icinga/Chart/Graph/LineGraph.php
@@ -38,6 +38,13 @@ class LineGraph extends Styleable implements Drawable
      */
     private $isDiscrete = false;
 
+    /**
+     * The tooltips
+     *
+     * @var
+     */
+    private $tooltips;
+
     /**
      * The default stroke width
      * @var int
@@ -56,10 +63,22 @@ class LineGraph extends Styleable implements Drawable
      *
      * @param array $dataset An array of [x, y] arrays to display
      */
-    public function __construct(array $dataset)
-    {
+    public function __construct(
+        array $dataset,
+        array &$graphs,
+        $order,
+        array $tooltips = null
+    ) {
         usort($dataset, array($this, 'sortByX'));
         $this->dataset = $dataset;
+        $this->graphs = $graphs;
+
+        $this->tooltips = $tooltips;
+        foreach ($this->tooltips as $value) {
+            $ts[] = $value;
+        }
+        $this->tooltips = $ts;
+        $this->order = $order;
     }
 
     /**
@@ -142,14 +161,41 @@ class LineGraph extends Styleable implements Drawable
         $path->setAdditionalStyle('clip-path: url(#clip);');
         $path->setId($this->id);
         $group = $path->toSvg($ctx);
-        if ($this->showDataPoints === true) {
-            foreach ($this->dataset as $point) {
-                $dot = new Circle($point[0], $point[1], $this->dotWith);
-                $dot->setFill($this->strokeColor);
 
-                $group->appendChild($dot->toSvg($ctx));
+            foreach ($this->dataset as $x => $point) {
+
+                if ($this->showDataPoints === true) {
+                    $dot = new Circle($point[0], $point[1], $this->dotWith);
+                    $dot->setFill($this->strokeColor);
+                    $group->appendChild($dot->toSvg($ctx));
+                }
+
+                // Draw invisible circle for tooltip hovering
+                $invisible = new Circle($point[0], $point[1], 20);
+                $invisible->setFill($this->strokeColor);
+                $invisible->setAdditionalStyle('opacity: 0.0;');
+                $invisible->setAttribute('class', 'chart-data');
+                if (isset($this->tooltips[$x])) {
+                    $data = array(
+                        'label' => isset($this->graphs[$this->order]['label']) ?
+                                strtolower($this->graphs[$this->order]['label']) : '',
+                        'color' => isset($this->graphs[$this->order]['color']) ?
+                                strtolower($this->graphs[$this->order]['color']) : '#fff'
+                    );
+                    $format = isset($this->graphs[$this->order]['tooltip'])
+                        ? $this->graphs[$this->order]['tooltip'] : null;
+                    $invisible->setAttribute(
+                        'title',
+                        $this->tooltips[$x]->renderNoHtml($this->order, $data, $format)
+                    );
+                    $invisible->setAttribute(
+                        'data-title-rich',
+                        $this->tooltips[$x]->render($this->order, $data, $format)
+                    );
+                }
+                $group->appendChild($invisible->toSvg($ctx));
             }
-        }
+
         return $group;
     }
 }
diff --git a/library/Icinga/Chart/Graph/Tooltip.php b/library/Icinga/Chart/Graph/Tooltip.php
index 5fa5c3608..8b2efa613 100644
--- a/library/Icinga/Chart/Graph/Tooltip.php
+++ b/library/Icinga/Chart/Graph/Tooltip.php
@@ -66,7 +66,7 @@ class Tooltip
      */
     public function __construct (
         $data = array(),
-        $format = '<b>{title}</b></b><br/> {value} of {sum} {label}'
+        $format = '<b>{title}</b>: {value} {label}'
     ) {
         $this->data = array_merge($this->data, $data);
         $this->defaultFormat = $format;
diff --git a/library/Icinga/Chart/GridChart.php b/library/Icinga/Chart/GridChart.php
index 20ebb969e..9f867ac66 100644
--- a/library/Icinga/Chart/GridChart.php
+++ b/library/Icinga/Chart/GridChart.php
@@ -402,7 +402,12 @@ class GridChart extends Chart
                         );
                         break;
                     case self::TYPE_LINE:
-                        $graphObj = new LineGraph($axis->transform($graph['data']));
+                        $graphObj = new LineGraph(
+                            $axis->transform($graph['data']),
+                            $graphs,
+                            $dataset,
+                            $this->tooltips
+                        );
                         break;
                     default:
                         continue;
diff --git a/library/Icinga/Web/Widget/Chart/InlinePie.php b/library/Icinga/Web/Widget/Chart/InlinePie.php
index 341322714..0bddc906d 100644
--- a/library/Icinga/Web/Widget/Chart/InlinePie.php
+++ b/library/Icinga/Web/Widget/Chart/InlinePie.php
@@ -44,7 +44,6 @@ EOD;
 </noscript>
 EOD;
 
-
     /**
      * @var Url
      */
diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 252a67091..cd2626472 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -446,7 +446,8 @@ class Monitoring_AlertsummaryController extends Controller
                 'label' => $this->translate('Notifications'),
                 'color' => '#07C0D9',
                 'data'  =>  $notifications,
-                'showPoints' => true
+                'showPoints' => true,
+                'tooltip' => '<b>{title}:</b> {value} {label}'
             )
         );
 
@@ -455,7 +456,8 @@ class Monitoring_AlertsummaryController extends Controller
                 'label' => $this->translate('Avg (min)'),
                 'color' => '#ffaa44',
                 'data'  =>  $dAvg,
-                'showPoints' => true
+                'showPoints' => true,
+                'tooltip' => t('<b>{title}:</b> {value}m min. reaction time')
             )
         );
 
@@ -464,7 +466,8 @@ class Monitoring_AlertsummaryController extends Controller
                 'label' => $this->translate('Max (min)'),
                 'color' => '#ff5566',
                 'data'  =>  $dMax,
-                'showPoints' => true
+                'showPoints' => true,
+                'tooltip' => t('<b>{title}:</b> {value}m max. reaction time')
             )
         );
 
@@ -493,7 +496,8 @@ class Monitoring_AlertsummaryController extends Controller
                 'label' => $this->translate('Notifications'),
                 'color' => '#07C0D9',
                 'data'  =>  $this->notificationData,
-                'showPoints' => true
+                'showPoints' => true,
+                'tooltip' => '<b>{title}:</b> {value} {label}'
             )
         );
 
@@ -502,7 +506,8 @@ class Monitoring_AlertsummaryController extends Controller
                 'label' => $this->translate('Defects'),
                 'color' => '#ff5566',
                 'data'  =>  $this->problemData,
-                'showPoints' => true
+                'showPoints' => true,
+                'tooltip' => '<b>{title}:</b> {value} {label}'
             )
         );
 
diff --git a/public/js/icinga/behavior/tooltip.js b/public/js/icinga/behavior/tooltip.js
index b08b1f3c1..c9a64257f 100644
--- a/public/js/icinga/behavior/tooltip.js
+++ b/public/js/icinga/behavior/tooltip.js
@@ -27,7 +27,7 @@
             var $el = $(this);
             $el.attr('title', $el.data('title-rich') || $el.attr('title'));
         });
-        $('svg rect.chart-data[title]', el).tipsy({ gravity: 'se', html: true });
+        $('svg .chart-data', el).tipsy({ gravity: 'se', html: true });
         $('.historycolorgrid a[title]', el).tipsy({ gravity: 's', offset: 2 });
         $('img.icon[title]', el).tipsy({ gravity: $.fn.tipsy.autoNS, offset: 2 });
         $('[title]', el).tipsy({ gravity: $.fn.tipsy.autoNS, delayIn: 500 });

From e72de8dfe1456cbb50852d8b7910e0013cab3aaa Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 20 Feb 2015 11:23:31 +0100
Subject: [PATCH 0709/2920] Disable Livestatus as backend

Livestatus is not feature complete yet. This commit has to be reverted once we've fully implemented Livestatus support.

refs #8254
---
 .../forms/Config/BackendConfigForm.php        | 19 ++++++++++++++-----
 .../application/forms/Setup/BackendPage.php   |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index e0f8e3e0d..265ab33bc 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -43,8 +43,11 @@ class BackendConfigForm extends ConfigForm
     {
         $resources = array();
         foreach ($resourceConfig as $name => $resource) {
-            if ($resource->type === 'db' || $resource->type === 'livestatus') {
-                $resources[$resource->type === 'db' ? 'ido' : 'livestatus'][$name] = $name;
+//            if ($resource->type === 'db' || $resource->type === 'livestatus') {
+//                $resources[$resource->type === 'db' ? 'ido' : 'livestatus'][$name] = $name;
+//            }
+            if ($resource->type === 'db') {
+                $resources['ido'][$name] = $name;
             }
         }
 
@@ -183,13 +186,19 @@ class BackendConfigForm extends ConfigForm
     {
         $resourceType = isset($formData['type']) ? $formData['type'] : key($this->resources);
 
+        if ($resourceType === 'livestatus') {
+            throw new ConfigurationError(
+                'We\'ve disabled livestatus support for now because it\'s not feature complete yet'
+            );
+        }
+
         $resourceTypes = array();
         if ($resourceType === 'ido' || array_key_exists('ido', $this->resources)) {
             $resourceTypes['ido'] = 'IDO Backend';
         }
-        if ($resourceType === 'livestatus' || array_key_exists('livestatus', $this->resources)) {
-            $resourceTypes['livestatus'] = 'Livestatus';
-        }
+//        if ($resourceType === 'livestatus' || array_key_exists('livestatus', $this->resources)) {
+//            $resourceTypes['livestatus'] = 'Livestatus';
+//        }
 
         $this->addElement(
             'checkbox',
diff --git a/modules/monitoring/application/forms/Setup/BackendPage.php b/modules/monitoring/application/forms/Setup/BackendPage.php
index d8d4c7fd0..f2df42a1f 100644
--- a/modules/monitoring/application/forms/Setup/BackendPage.php
+++ b/modules/monitoring/application/forms/Setup/BackendPage.php
@@ -51,7 +51,7 @@ class BackendPage extends Form
         if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {
             $resourceTypes['ido'] = 'IDO';
         }
-        $resourceTypes['livestatus'] = 'Livestatus';
+        // $resourceTypes['livestatus'] = 'Livestatus';
 
         $this->addElement(
             'select',

From b6124d7371baec960776356bf8ee2cd7d8b00801 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 11:18:58 +0100
Subject: [PATCH 0710/2920] Header: Remove skiplinks

Skiplinks are to much and confusing for other users. Better is to use
header navigation in screen readers.

refs #7076
---
 .../config/authentication/reorder.phtml       | 10 -----
 .../views/scripts/config/resource.phtml       | 10 -----
 application/views/scripts/roles/index.phtml   | 10 -----
 .../views/scripts/alertsummary/index.phtml    | 30 --------------
 .../views/scripts/process/info.phtml          | 41 +------------------
 5 files changed, 1 insertion(+), 100 deletions(-)

diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/authentication/reorder.phtml
index f26eba82e..4583a23b3 100644
--- a/application/views/scripts/config/authentication/reorder.phtml
+++ b/application/views/scripts/config/authentication/reorder.phtml
@@ -5,16 +5,6 @@
   <h1 tabindex="-1" id="authentication-reorder">
     <?= $this->translate('Authentication Configuration'); ?>
   </h1>
-  <div class="skip-links skip-links-inline">
-    <h2 class="sr-only"><?= $this->translate('Skip Links'); ?></h2>
-    <ul>
-      <li>
-        <a tabindex="0" href="#authentication-reorder-form">
-          <?= t('Skip To Authentication Reorder Form'); ?>
-        </a>
-      </li>
-    </ul>
-  </div>
   <h2 tabindex="-1" id="authentication-new-backend" class="sr-only">
     <?= t('New Authentication Backend'); ?>
   </h2>
diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index 6964c48cc..c4eb9360f 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -5,16 +5,6 @@
   <h1 tabindex="-1" id="resource-index">
     <?= t('Resource Configuration'); ?>
   </h1>
-  <div class="skip-links skip-links-inline">
-    <h2 class="sr-only"><?= $this->translate('Skip Links'); ?></h2>
-    <ul>
-      <li>
-        <a tabindex="0" href="#resource-edit-table">
-          <?= t('Skip To Existing Resources'); ?>
-        </a>
-      </li>
-    </ul>
-  </div>
   <h2 tabindex="-1" id="resource-new-resource" class="sr-only">
     <?= t('Create New Resource'); ?>
   </h2>
diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml
index 61cbe3310..d4f5ad2aa 100644
--- a/application/views/scripts/roles/index.phtml
+++ b/application/views/scripts/roles/index.phtml
@@ -5,16 +5,6 @@
     <h1 tabindex="-1" id="roles-index">
         <?= $this->translate('Roles') ?>
     </h1>
-    <div class="skip-links skip-links-inline">
-        <h2 class="sr-only"><?= $this->translate('Skip Links'); ?></h2>
-        <ul>
-            <li>
-                <a tabindex="0" href="#roles-index-new">
-                    <?= t('Skip To Create New Role'); ?>
-                </a>
-            </li>
-        </ul>
-    </div>
     <div>
         <?php /** @var \Icinga\Application\Config $roles */ if ($roles->isEmpty()): ?>
             <?= $this->translate('No roles found.') ?>
diff --git a/modules/monitoring/application/views/scripts/alertsummary/index.phtml b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
index 7db60791a..d3e7028c0 100644
--- a/modules/monitoring/application/views/scripts/alertsummary/index.phtml
+++ b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
@@ -11,36 +11,6 @@
     <h1 tabindex="-1">
         <?= $this->translate('Alert summary'); ?>
     </h1>
-    <div class="skip-links skip-links-inline">
-        <h2 class="sr-only"><?= $this->translate('Skip Links'); ?></h2>
-        <ul>
-            <li>
-                <a tabindex="0" href="#alertsummary-notifications">
-                    <?= t('Skip To Notification Chart'); ?>
-                </a>
-            </li>
-            <li>
-                <a tabindex="0" href="#alertsummary-reaction-time">
-                    <?= t('Skip To Reaction Time Chart'); ?>
-                </a>
-            </li>
-            <li>
-                <a tabindex="0" href="#alertsummary-trend">
-                    <?= t('Skip To Trend'); ?>
-                </a>
-            </li>
-            <li>
-                <a tabindex="0" href="#alertsummary-top5">
-                    <?= t('Sktip To Top 5 Alerts'); ?>
-                </a>
-            </li>
-            <li>
-                <a tabindex="0" href="#alertsummary-history">
-                    <?= t('Skip To Alert History'); ?>
-                </a>
-            </li>
-        </ul>
-    </div>
 
     <div class="hbox">
         <div class="hbox-item">
diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml
index 12cb01fbc..639b5ebc0 100644
--- a/modules/monitoring/application/views/scripts/process/info.phtml
+++ b/modules/monitoring/application/views/scripts/process/info.phtml
@@ -12,26 +12,7 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
     <h1 tabindex="-1">
         <?= $this->translate('Monitoring Health'); ?>
     </h1>
-    <div class="skip-links skip-links-inline">
-        <h2 class="sr-only"><?= $this->translate('Skip Links'); ?></h2>
-        <ul>
-            <li>
-                <a tabindex="0" href="#process-feature-command">
-                    <?= t('Skip To Feature Commands'); ?>
-                </a>
-            </li>
-            <li>
-                <a tabindex="0" href="#process-process-info">
-                    <?= t('Skip To Process Information'); ?>
-                </a>
-            </li>
-            <li>
-                <a tabindex="0" href="#process-performance-info">
-                    <?= t('Skip To Performance Information'); ?>
-                </a>
-            </li>
-        </ul>
-    </div>
+
     <div class="boxview">
 
         <div class="box left">
@@ -98,26 +79,6 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
             <h2 tabindex="-1" id="process-performance-info">
                 <?= $this->translate('Performance Info') ?>
             </h2>
-            <div class="skip-links skip-links-inline">
-                <h2 class="sr-only"><?= $this->translate('Skip Links'); ?></h2>
-                <ul>
-                    <li>
-                        <a tabindex="0" href="#process-object-summaries">
-                            <?= t('Skip To Object Summaries'); ?>
-                        </a>
-                    </li>
-                    <li>
-                        <a tabindex="0" href="#process-active-checks">
-                            <?= t('Skip To Active Checks'); ?>
-                        </a>
-                    </li>
-                    <li>
-                        <a tabindex="0" href="#process-passive-checks">
-                            <?= t('Skip To Passive Checks'); ?>
-                        </a>
-                    </li>
-                </ul>
-            </div>
 
             <h3 tabindex="-1" id="process-object-summaries">
                 <?= $this->translate('Object summaries') ?>

From 84d1e6b3a322bb33f25fcfc2f953792865723076 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 12:20:45 +0100
Subject: [PATCH 0711/2920] Header: Add to alert summary

refs #7076
---
 .../application/views/scripts/alertsummary/index.phtml         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/alertsummary/index.phtml b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
index d3e7028c0..3281f3ec8 100644
--- a/modules/monitoring/application/views/scripts/alertsummary/index.phtml
+++ b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
@@ -1,6 +1,9 @@
 <div class="controls">
     <?= $this->tabs ?>
     <div style="margin: 1em;" class="dontprint">
+        <h2 tabindex="-1" class="sr-only">
+            <?= $this->translate('Filters'); ?>
+        </h2>
         <?= $intervalBox; ?>
     </div>
     <?= $this->widget('limiter') ?>

From 6f2d42825450a2592f4ee54f454fd68638a3c71b Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 12:24:24 +0100
Subject: [PATCH 0712/2920] Event Grid: Add header

refs #7976
---
 .../monitoring/application/controllers/ListController.php   | 1 +
 .../application/views/scripts/list/eventgrid.phtml          | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index d7fbe177f..9504917a3 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -717,6 +717,7 @@ class Monitoring_ListController extends Controller
     private function createTabs()
     {
         $tabs = $this->getTabs();
+        $tabs->setTitle($this->translate('Monitoring Navigation'));
         if (in_array($this->_request->getActionName(), array(
             'hosts',
             'services',
diff --git a/modules/monitoring/application/views/scripts/list/eventgrid.phtml b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
index 53056daac..efabac28b 100644
--- a/modules/monitoring/application/views/scripts/list/eventgrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
@@ -2,18 +2,20 @@
 use Icinga\Data\Filter\Filter;
 use Icinga\Web\Widget\Chart\HistoryColorGrid;
 ?>
-
-
 <? if (! $compact): ?>
     <div class="controls">
         <?= $this->tabs->render($this); ?>
         <div class="fake-controls">
+            <h2 tabindex="-1" class="sr-only">
+                <?= $this->translate('Filters'); ?>
+            </h2>
             <?= $form ?>
         </div>
     </div>
 <? endif; ?>
 
 <div class="content" data-base-target="_next">
+    <h1 tabindex="-1"><?= $this->translate('Event Grid') ?></h1>
 <?php
 
 $settings = array(

From 03160ef81a094c422de78e7bebab546c402ed054 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 14:23:56 +0100
Subject: [PATCH 0713/2920] Header: Add header to event history

Add header to the following widgets:

- FilterEditor
- SortBox

refs #7976
---
 library/Icinga/Web/Widget/FilterEditor.php    | 34 ++++++++++++-------
 library/Icinga/Web/Widget/SortBox.php         |  9 ++++-
 .../views/scripts/list/eventhistory.phtml     |  9 ++---
 modules/monitoring/public/css/module.less     |  4 +++
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 999a825ac..eefc2d739 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -676,20 +676,28 @@ class FilterEditor extends AbstractWidget
     public function render()
     {
         if (! $this->preservedUrl()->getParam('modifyFilter')) {
-            return $this->renderSearch() . $this->shorten($this->filter, 50);
+            $filterEditor = $this->renderSearch() . $this->shorten($this->filter, 50);
+        } else {
+            $filterEditor = $this->renderSearch()
+                . '<form action="'
+                . Url::fromRequest()
+                . '" class="filterEditor" method="POST">'
+                . '<ul class="tree widgetFilter"><li>'
+                . $this->renderFilter($this->filter)
+                . '</li></ul>'
+                . '<div style="float: right">'
+                . '<input type="submit" name="submit" value="Apply" />'
+                . '<input type="submit" name="cancel" value="Cancel" />'
+                . '</div>'
+                . '</form>';
         }
-        return  $this->renderSearch()
-              . '<form action="'
-              . Url::fromRequest()
-              . '" class="filterEditor" method="POST">'
-              . '<ul class="tree widgetFilter"><li>'
-              . $this->renderFilter($this->filter)
-              . '</li></ul>'
-              . '<div style="float: right">'
-              . '<input type="submit" name="submit" value="Apply" />'
-              . '<input type="submit" name="cancel" value="Cancel" />'
-              . '</div>'
-              . '</form>';
+
+        return sprintf(
+            '<div class="filter-editor dontprint">'
+            . '<h2 tabindex="-1" class="sr-only">%s</h2>%s</div>',
+            t('Filters'),
+            $filterEditor
+        );
     }
 
     protected function shorten($string, $length)
diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 18ed95b86..a1728db4f 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -133,6 +133,13 @@ class SortBox extends AbstractWidget
         if ($this->request) {
             $form->populate($this->request->getParams());
         }
-        return $form;
+
+        return sprintf(
+            '<div class="sort-box dontprint">'
+            . '<h2 tabindex="-1" class="sr-only">%s</h2>%s%s</div>',
+            t('Sort Criteria'),
+            t('Sort by'),
+            (string) $form
+        );
     }
 }
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 0b6b9bcec..8a75a74cf 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -4,16 +4,10 @@ use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
 ?>
-
 <?php if (false === $this->compact): ?>
 <div class="controls">
   <?= $this->tabs ?>
-  <div style="margin: 1em" class="dontprint">
-    <div style="float: right">
-      <?= $this->translate('Sort by') ?> <?= $this->sortControl ?>
-    </div>
-  </div>
-
+  <?= $this->sortControl ?>
   <?= $this->widget('limiter', array('url' => $this->url, 'max' => $this->history->count())); ?>
   <?= $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
 
@@ -22,6 +16,7 @@ use Icinga\Module\Monitoring\Object\Service;
 
 <div class="content">
 <?= $this->filterEditor ?>
+<h1 tabindex="-1"><?= $this->translate('Event History') ?></h1>
 <?php if (empty($history)): ?>
   <?= $this->translate('No history events matching the filter') ?>
 </div>
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 387df892b..58014dae8 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -198,3 +198,7 @@ hr.command-separator {
   border: none;
   border-bottom: 2px solid @colorPetrol;
 }
+
+.sort-box {
+  float: right;
+}

From 4d4c8b08366f9c602cc14d189fe7b0fdf8e3e693 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 14:28:22 +0100
Subject: [PATCH 0714/2920] Header: Add header to timeline

refs #7976
---
 .../monitoring/application/controllers/TimelineController.php | 3 ++-
 .../monitoring/application/views/scripts/timeline/index.phtml | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php
index a13973e1d..b4b4eafbb 100644
--- a/modules/monitoring/application/controllers/TimelineController.php
+++ b/modules/monitoring/application/controllers/TimelineController.php
@@ -19,7 +19,8 @@ class Monitoring_TimelineController extends Controller
         $this->getTabs()->add($action, array(
             'title' => $title,
             'url' => Url::fromRequest()
-        ))->activate($action);
+        ))->activate($action)
+            ->setTitle($this->translate('Timeline Navigation'));
         $this->view->title = $title;
     }
 
diff --git a/modules/monitoring/application/views/scripts/timeline/index.phtml b/modules/monitoring/application/views/scripts/timeline/index.phtml
index a6e32ac08..11a228566 100644
--- a/modules/monitoring/application/views/scripts/timeline/index.phtml
+++ b/modules/monitoring/application/views/scripts/timeline/index.phtml
@@ -10,6 +10,9 @@ $firstRow = !$beingExtended;
 <div class="controls">
     <?= $this->tabs ?>
     <div style="margin: 1em;" class="dontprint">
+        <h2 tabindex="-1" class="sr-only">
+            <?= $this->translate('Filters') ?>
+        </h2>
         <?= $intervalBox; ?>
     </div>
     <div style="margin: 1em;" class="timeline-legend">
@@ -22,6 +25,7 @@ $firstRow = !$beingExtended;
     </div>
 </div>
 <div class="content" data-base-target="_next">
+    <h1 tabindex="-1"><?= $this->translate('Timeline'); ?></h1>
     <div class="timeline">
 <?php endif ?>
 <?php if ($switchedContext): ?>

From 918ac21d6d9d1310e2385e16dc8d2cd78d548a42 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 14:30:09 +0100
Subject: [PATCH 0715/2920] Header: Add h1 to notifications

refs #7976
---
 .../application/views/scripts/list/notifications.phtml      | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 9cc5f724b..bd2af8184 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -4,19 +4,17 @@ use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
 ?>
-
 <?php if (! $this->compact): ?>
 <div class="controls">
     <?= $this->tabs ?>
-    <div class="dontprint" style="margin: 1em;">
-        <?= $this->translate('Sort by') ?> <?= $this->sortControl->render($this) ?>
-    </div>
+    <?= $this->sortControl->render($this) ?>
     <?= $this->widget('limiter') ?>
     <?= $this->paginationControl($notifications, null, null, array('preserve' => $this->preserve)) ?>
 </div>
 <?php endif ?>
 
 <div class="content">
+    <h1 tabindex="-1"><?= $this->translate('Notifications'); ?></h1>
     <?php if (count($notifications) === 0): ?>
     <?= $this->translate('No notifications matching the filter') ?>
     <?php return; endif ?>

From b45897de221477b44419822ae00c1d405d4adc1b Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 14:35:29 +0100
Subject: [PATCH 0716/2920] Header: Add h1 to downtimes

refs #7976
---
 .../views/scripts/list/downtimes.phtml        | 20 +++++++------------
 .../views/scripts/list/eventhistory.phtml     |  1 -
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 1fbaa713f..5ad554f99 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -4,23 +4,17 @@ use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
 ?>
-
 <?php if (false === $this->compact): ?>
-<div class="controls">
-  <?= $this->tabs->render($this); ?>
-  <div style="margin: 1em" class="dontprint">
-    <?= $this->translate('Sort by'); ?> <?= $this->sortControl->render($this); ?>
-    <?php if (! $this->filterEditor): ?>
-        <?= $this->filterPreview ?>
-    <?php endif; ?>
-  </div>
-  <?= $this->widget('limiter', array('url' => $this->url, 'max' => $downtimes->count())); ?>
-  <?= $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
-</div>
+    <div class="controls">
+        <?= $this->tabs ?>
+        <?= $this->sortControl ?>
+        <?= $this->widget('limiter', array('url' => $this->url, 'max' => $downtimes->count())); ?>
+        <?= $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
+    </div>
 <?php endif ?>
-
 <div class="content">
 <?= $this->filterEditor ?>
+<h1 tabindex="-1"><?= $this->translate('Downtimes'); ?></h1>
 <?php if (count($downtimes) === 0): ?>
   <?= $this->translate('No active downtimes'); ?>
 </div>
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 8a75a74cf..84baabb86 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -10,7 +10,6 @@ use Icinga\Module\Monitoring\Object\Service;
   <?= $this->sortControl ?>
   <?= $this->widget('limiter', array('url' => $this->url, 'max' => $this->history->count())); ?>
   <?= $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
-
 </div>
 <?php endif ?>
 

From cef20022b9aea7360ee3a67cf1dbbeb09b97492b Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 14:39:26 +0100
Subject: [PATCH 0717/2920] Commends: Add h1 to comments

refs #7976
---
 .../application/views/scripts/list/comments.phtml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 6f49bf4a8..d41399984 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -1,15 +1,14 @@
 <?php if (false === $this->compact): ?>
-<div class="controls">
-  <?= $this->tabs->render($this); ?>
-  <div style="margin: 1em" class="dontprint">
-    <?= $this->translate('Sort by'); ?> <?= $this->sortControl->render($this); ?>
-  </div>
-  <?= $this->widget('limiter', array('url' => $this->url, 'max' => $comments->count())); ?>
-  <?= $this->paginationControl($comments, null, null, array('preserve' => $this->preserve)); ?>
-</div>
+    <div class="controls">
+        <?= $this->tabs ?>
+        <?= $this->sortControl ?>
+        <?= $this->widget('limiter', array('url' => $this->url, 'max' => $comments->count())); ?>
+        <?= $this->paginationControl($comments, null, null, array('preserve' => $this->preserve)); ?>
+    </div>
 <?php endif ?>
 
 <div class="content">
+<h1 tabindex="-1"><?= $this->translate('Comments') ?></h1>
 <?php if (count($comments) === 0): ?>
   <?= $this->translate('No comments matching the filter'); ?>
 </div>

From 37568a78321413510bc33d8eb8897666a9cb66ab Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 14:41:51 +0100
Subject: [PATCH 0718/2920] Header: Add h1 to contacts

refs #7976
---
 .../application/views/scripts/list/contacts.phtml  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 4623a5027..e9f47efce 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -1,12 +1,14 @@
-<div class="controls">
-    <?= $this->tabs ?>
-    <div style="margin: 1em">
-        <?= $this->sortControl->render($this); ?>
+<?php if (false === $this->compact): ?>
+    <div class="controls">
+        <?= $this->tabs ?>
+        <?= $this->sortControl ?>
+        <?= $this->widget('limiter', array('url' => $this->url, 'max' => $contacts->count())); ?>
+        <?= $this->paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?>
     </div>
-    <?= $this->paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?>
-</div>
+<?php endif ?>
 
 <div data-base-target="_next" class="content contacts">
+    <h1 tabindex="-1"><?= $this->translate('Contacts') ?></h1>
     <?php
     if (count($contacts) === 0) {
         echo mt('monitoring', 'No contacts matching the filter');

From 7962c115ae9631d9890514a0d4ef9bafac7de101 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 14:42:55 +0100
Subject: [PATCH 0719/2920] Header: Add h1 to contact groups

refs #7076
---
 .../application/views/scripts/list/contactgroups.phtml         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index f32a22815..797e0b299 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -4,6 +4,9 @@
 </div>
 <?php endif ?>
 <div class="content">
+    <h1 tabindex="-1">
+        <?= $this->translate('Contact Groups'); ?>
+    </h1>
     <div class="boxview" data-base-target="_next">
 
 <?php

From b6c05beaba9399ab5d69f2454eb71621def76e18 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 14:54:02 +0100
Subject: [PATCH 0720/2920] Header: Add h1 to service groups

refs #7976
---
 .../application/views/scripts/list/servicegroups.phtml       | 5 ++---
 modules/monitoring/public/css/module.less                    | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index 04e6975e1..3c35d8cce 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -3,15 +3,14 @@
 <?php else: ?>
 <div class="controls">
   <?= $this->tabs ?>
-  <div style="margin: 1em;" class="dontprint">
-    <?= $this->translate('Sort by'); ?> <?= $this->sortControl->render($this); ?>
-  </div>
+  <?= $this->sortControl->render($this); ?>
   <?= $this->widget('limiter')->setMaxLimit(count($servicegroups)); ?>
   <?= $this->paginationControl($servicegroups, null, null, array('preserve' => $this->preserve)); ?>
 </div>
 <div class="content">
   <?= $this->filterEditor; ?>
 <?php endif ?>
+  <h1 tabindex="-1"><?= $this->translate('Service Groups') ?></h1>
   <?php
     if (count($servicegroups) === 0) {
       echo $this->translate('No service groups matching the filter');
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 58014dae8..26cd5bc38 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -201,4 +201,5 @@ hr.command-separator {
 
 .sort-box {
   float: right;
-}
+  margin-right: 1em;
+}
\ No newline at end of file

From b8dbf9c8098ec0c29fb8b2b0beffc1015183ae84 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 14:57:26 +0100
Subject: [PATCH 0721/2920] Header: Add h1 to hostgroups

refs #7976
---
 .../application/views/scripts/list/hostgroups.phtml          | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index 0c5989bff..ee5973a77 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -3,15 +3,14 @@
 <?php else: ?>
 <div class="controls">
   <?= $this->tabs ?>
-  <div style="margin: 1em;" class="dontprint">
-    <?= $this->translate('Sort by'); ?> <?= $this->sortControl->render($this); ?>
-  </div>
+  <?= $this->sortControl->render($this); ?>
   <?= $this->widget('limiter')->setMaxLimit(count($hostgroups)); ?>
   <?= $this->paginationControl($hostgroups, null, null, array('preserve' => $this->preserve)); ?>
 </div>
 <div class="content">
   <?= $this->filterEditor; ?>
 <?php endif ?>
+  <h1 tabindex="-1"><?= $this->translate('Host Groups') ?></h1>
   <?php
     if (count($hostgroups) === 0) {
       echo $this->translate('No host groups matching the filter');

From 3cc33417980b575049646992e12b7bf449fc254b Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 15:00:28 +0100
Subject: [PATCH 0722/2920] Header: Add h1 to service list

refs #7976
---
 .../monitoring/application/views/scripts/list/services.phtml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index e8d39c7c3..5b8edcaa3 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -10,10 +10,8 @@ if (!$this->compact): ?>
 <div style="margin: 1em;" class="dontprint">
 <?= $this->render('list/components/selectioninfo.phtml') ?>
 <?= $this->render('list/components/servicesummary.phtml') ?>
-<div style="float: right">
-<?= $this->translate('Sort by') ?> <?= $this->sortControl ?>
-</div>
 </div>
+<?= $this->sortControl ?>
 <?php if ($this->limit === 0): ?>
 <?= $this->widget('limiter') ?>
 <?php else: ?>
@@ -28,6 +26,7 @@ if (!$this->compact): ?>
 
 <div class="content">
 <?php endif ?>
+<h1 tabindex="-1"><?= $this->translate('Services') ?></h1>
 <table data-base-target="_next"
     class="action multiselect <?php if ($this->compact): ?> compact<?php endif ?>" style="table-layout: auto;"
     data-icinga-multiselect-url="<?= $this->href("monitoring/services/show") ?>"

From 26ec8bb9ba12a97f3fcb1e8772736c85dd2db85a Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 15:01:42 +0100
Subject: [PATCH 0723/2920] Header: Add h1 to host list

refs #7976
---
 .../monitoring/application/views/scripts/list/hosts.phtml    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index b9fa25975..509cf5797 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -9,9 +9,8 @@ if ($this->compact): ?>
   <div style="margin: 1em;" class="dontprint">
     <?= $this->render('list/components/selectioninfo.phtml') ?>
     <?= $this->render('list/components/hostssummary.phtml') ?>
-    <?= $this->translate('Sort by') ?> <?= $this->sortControl->render($this) ?>
   </div>
-
+<?= $this->sortControl->render($this) ?>
 <?= $this->widget('limiter')->setMaxLimit($this->hosts->count()) ?>
 <?= $this->paginationControl($hosts, null, null, array('preserve' => $this->preserve)) ?>
 <?= $this->selectionToolbar('multi', $this->href('monitoring/hosts/show?' . $this->filter->toQueryString())) ?>
@@ -31,7 +30,7 @@ if ($hosts->count() === 0) {
     return;
 }
 ?>
-
+<h1 tabindex="-1"><?= $this->translate('Hosts') ?></h1>
 <table
     data-base-target="_next"
     class="action multiselect"

From 70e5ccca3730349ac95cf7c6f881085e04a10c23 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 15:03:11 +0100
Subject: [PATCH 0724/2920] Header: Add h1 to tactical overview

refs #7976
---
 .../monitoring/application/views/scripts/tactical/index.phtml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/views/scripts/tactical/index.phtml b/modules/monitoring/application/views/scripts/tactical/index.phtml
index 3882b27b3..897ef9776 100644
--- a/modules/monitoring/application/views/scripts/tactical/index.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/index.phtml
@@ -4,6 +4,7 @@
 </div>
 <?php endif ?>
 <div class="content tactical">
+    <h1 tabindex="-1"><?= $this->translate('Tactical Overview') ?></h1>
     <div class="boxview" data-base-target="_next">
 <?php if ($this->statusSummary->hosts_down || $this->statusSummary->hosts_unreachable): ?>
         <?= $this->render('tactical/components/problem_hosts.phtml'); ?>

From a037e5c4db33f3d5215a9482b7585bb8c64e3e93 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 15:12:19 +0100
Subject: [PATCH 0725/2920] Header: Add h1 to objects header

refs #7076
---
 .../views/scripts/partials/host/objects-header.phtml          | 4 +++-
 .../views/scripts/partials/service/objects-header.phtml       | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index f5edd0213..f892df6f4 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -3,7 +3,9 @@
 <?php endif ?>
 <?php if (($hostCount = count($objects)) > 0): ?>
 <div class="hbox-item">
-    <strong><?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', $hostCount), $hostCount); ?></strong>
+    <h1 tabindex="-1">
+        <?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', $hostCount), $hostCount); ?>
+    </h1>
 </div>
 <div class="hbox-item">
     &nbsp;<?= $hostStatesPieChart; ?>
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index 1ac27b934..6389d992f 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -4,7 +4,9 @@
 <?php if (($serviceCount = count($objects)) > 0): ?>
 <div class="hbox">
     <div class="hbox-item" style="width: 6em;">
-        <strong><?= sprintf($this->translatePlural('Service (%u)', 'Services (%u)', $serviceCount), $serviceCount); ?></strong>
+        <h1 tabindex="-1">
+            <?= sprintf($this->translatePlural('Service (%u)', 'Services (%u)', $serviceCount), $serviceCount); ?>
+        </h1>
     </div>
     <div class="hbox-item">
         &nbsp;<?= $serviceStatesPieChart; ?>

From 060d1093e31b4b00ec6a83f12cb4ad0377a8caba Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 15:13:18 +0100
Subject: [PATCH 0726/2920] Header: Add h1 to host/show component

refs #7976
---
 modules/monitoring/application/views/scripts/host/show.phtml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/views/scripts/host/show.phtml b/modules/monitoring/application/views/scripts/host/show.phtml
index 867692301..f490c25f9 100644
--- a/modules/monitoring/application/views/scripts/host/show.phtml
+++ b/modules/monitoring/application/views/scripts/host/show.phtml
@@ -3,6 +3,7 @@
     <?= $this->render('partials/host/servicesummary.phtml') ?>
 </div>
 <div class="content" data-base-target="_next">
+    <h1 tabindex="-1"><?= $this->translate('Host Detail Information') ?></h1>
     <?= $this->render('show/components/output.phtml') ?>
     <?= $this->render('show/components/grapher.phtml') ?>
 

From 62866e5fb165d955484e7b3724262fe7f530a405 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 15:13:47 +0100
Subject: [PATCH 0727/2920] Header: Add h1 to service grid

refs #7976
---
 .../application/views/scripts/list/servicegrid.phtml         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
index dd9be0394..8af02c3a9 100644
--- a/modules/monitoring/application/views/scripts/list/servicegrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
@@ -6,12 +6,11 @@ use Icinga\Module\Monitoring\Object\Service;
 <?php if (!$this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
-  <div style="margin: 1em;" class="dontprint">
-    <?= $this->translate('Sort by'); ?> <?= $this->sortControl; ?>
-  </div>
+  <?= $this->sortControl; ?>
 </div>
 <?php endif ?>
 <div class="content" data-base-target="_next">
+  <h1 tabindex="-1"><?= $this->translate('Service Grid') ?></h1>
   <table class="pivot servicestates">
 <?php
 $hasHeader = false;

From 316582c0d36202e9b7c3490e106062c480dff78d Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 15:35:56 +0100
Subject: [PATCH 0728/2920] Header: Change position because of dashboard
 rendering

refs #7976
---
 .../application/views/scripts/list/eventgrid.phtml    | 11 ++++++-----
 .../application/views/scripts/list/eventhistory.phtml | 11 +++++++----
 .../application/views/scripts/list/hostgroups.phtml   |  2 +-
 .../application/views/scripts/list/hosts.phtml        |  2 +-
 .../views/scripts/list/notifications.phtml            |  5 +++--
 .../views/scripts/list/servicegroups.phtml            |  2 +-
 .../application/views/scripts/list/services.phtml     |  2 +-
 7 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/eventgrid.phtml b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
index efabac28b..168bac9d1 100644
--- a/modules/monitoring/application/views/scripts/list/eventgrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
@@ -2,7 +2,7 @@
 use Icinga\Data\Filter\Filter;
 use Icinga\Web\Widget\Chart\HistoryColorGrid;
 ?>
-<? if (! $compact): ?>
+<?php if (! $compact): ?>
     <div class="controls">
         <?= $this->tabs->render($this); ?>
         <div class="fake-controls">
@@ -12,10 +12,11 @@ use Icinga\Web\Widget\Chart\HistoryColorGrid;
             <?= $form ?>
         </div>
     </div>
-<? endif; ?>
-
-<div class="content" data-base-target="_next">
-    <h1 tabindex="-1"><?= $this->translate('Event Grid') ?></h1>
+    <div class="content" data-base-target="_next">
+        <h1 tabindex="-1"><?= $this->translate('Event Grid'); ?></h1>
+<?php else: ?>
+    <div class="content" data-base-target="_next">
+<?php endif; ?>
 <?php
 
 $settings = array(
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 84baabb86..035be6c9a 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -11,11 +11,14 @@ use Icinga\Module\Monitoring\Object\Service;
   <?= $this->widget('limiter', array('url' => $this->url, 'max' => $this->history->count())); ?>
   <?= $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
 </div>
-<?php endif ?>
-
 <div class="content">
-<?= $this->filterEditor ?>
-<h1 tabindex="-1"><?= $this->translate('Event History') ?></h1>
+    <?= $this->filterEditor ?>
+    <h1 tabindex="-1"><?= $this->translate('Event History') ?></h1>
+<?php else: ?>
+    <div class="content">
+<?php endif; ?>
+
+
 <?php if (empty($history)): ?>
   <?= $this->translate('No history events matching the filter') ?>
 </div>
diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index ee5973a77..671ccb467 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -9,8 +9,8 @@
 </div>
 <div class="content">
   <?= $this->filterEditor; ?>
-<?php endif ?>
   <h1 tabindex="-1"><?= $this->translate('Host Groups') ?></h1>
+<?php endif ?>
   <?php
     if (count($hostgroups) === 0) {
       echo $this->translate('No host groups matching the filter');
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 509cf5797..0af16c296 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -18,6 +18,7 @@ if ($this->compact): ?>
 
 <div class="content">
 <?= $this->filterEditor ?>
+<h1 tabindex="-1"><?= $this->translate('Hosts') ?></h1>
 <?php
 
 endif;
@@ -30,7 +31,6 @@ if ($hosts->count() === 0) {
     return;
 }
 ?>
-<h1 tabindex="-1"><?= $this->translate('Hosts') ?></h1>
 <table
     data-base-target="_next"
     class="action multiselect"
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index bd2af8184..b8dc479c6 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -11,10 +11,11 @@ use Icinga\Module\Monitoring\Object\Service;
     <?= $this->widget('limiter') ?>
     <?= $this->paginationControl($notifications, null, null, array('preserve' => $this->preserve)) ?>
 </div>
-<?php endif ?>
-
 <div class="content">
     <h1 tabindex="-1"><?= $this->translate('Notifications'); ?></h1>
+<?php else: ?>
+    <div class="content">
+<?php endif ?>
     <?php if (count($notifications) === 0): ?>
     <?= $this->translate('No notifications matching the filter') ?>
     <?php return; endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index 3c35d8cce..87baf3278 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -9,8 +9,8 @@
 </div>
 <div class="content">
   <?= $this->filterEditor; ?>
-<?php endif ?>
   <h1 tabindex="-1"><?= $this->translate('Service Groups') ?></h1>
+<?php endif ?>
   <?php
     if (count($servicegroups) === 0) {
       echo $this->translate('No service groups matching the filter');
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 5b8edcaa3..0f4933f82 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -22,11 +22,11 @@ if (!$this->compact): ?>
 
 <div class="content">
 <?= $this->filterEditor ?>
+<h1 tabindex="-1"><?= $this->translate('Services') ?></h1>
 <?php else: ?>
 
 <div class="content">
 <?php endif ?>
-<h1 tabindex="-1"><?= $this->translate('Services') ?></h1>
 <table data-base-target="_next"
     class="action multiselect <?php if ($this->compact): ?> compact<?php endif ?>" style="table-layout: auto;"
     data-icinga-multiselect-url="<?= $this->href("monitoring/services/show") ?>"

From 44019f4e67e720df3eb2ea717a1af3499aab835e Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 16:06:21 +0100
Subject: [PATCH 0729/2920] Events: Quick fix for access the focusable element

refs #7976
---
 public/js/icinga/events.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 649557011..39a2a3de4 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -337,6 +337,15 @@
         handleAnchor: function(query) {
             var $element = $(query);
             if ($element.length > 0) {
+                // TODO(mh): Some elements are missing to place the right focus
+                // This is a fixed workarround until all header took place
+
+                var $item = $element.find(':header:first').nextUntil(':header:first').next();
+                if ($item.length > 0) {
+                    $element = $item;
+                }
+
+                /*
                 var focusQueries = ['h1:first', ':header:first', ':input:first'];
                 $.each(focusQueries, function(index,q) {
                     var $item = $element.find(q);
@@ -345,6 +354,7 @@
                         return false;
                     }
                 });
+                */
 
                 // If we want to focus an element which has no tabindex
                 // add one that we can focus is

From 4cdc1313cfd27638600733f6a234465e4c5a1c94 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 23 Feb 2015 16:20:08 +0100
Subject: [PATCH 0730/2920] Dashlet: Add titles to iframe title attribute

resolves #8459
---
 library/Icinga/Web/Widget/Dashboard/Dashlet.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Web/Widget/Dashboard/Dashlet.php b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
index ae7bb5558..0a3443771 100644
--- a/library/Icinga/Web/Widget/Dashboard/Dashlet.php
+++ b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
@@ -6,7 +6,6 @@ namespace Icinga\Web\Widget\Dashboard;
 use Zend_Form_Element_Button;
 use Icinga\Web\Form;
 use Icinga\Web\Url;
-use Icinga\Web\Widget\AbstractWidget;
 use Icinga\Data\ConfigObject;
 use Icinga\Exception\IcingaException;
 
@@ -54,7 +53,12 @@ class Dashlet extends UserWidget
     <div class="container" data-icinga-url="{URL}">
         <h1><a href="{FULL_URL}" data-base-target="col1">{TITLE}</a></h1>
         <noscript>
-            <iframe src="{IFRAME_URL}" style="height:100%; width:99%" frameborder="no"></iframe>
+            <iframe
+                src="{IFRAME_URL}"
+                style="height:100%; width:99%"
+                frameborder="no"
+                title="{TITLE_PREFIX}{TITLE}">
+            </iframe>
         </noscript>
     </div>
 EOD;
@@ -184,7 +188,8 @@ EOD;
             '{IFRAME_URL}',
             '{FULL_URL}',
             '{TITLE}',
-            '{REMOVE}'
+            '{REMOVE}',
+            '{TITLE_PREFIX}'
         );
 
         $replaceTokens = array(
@@ -192,7 +197,9 @@ EOD;
             $iframeUrl,
             $url->getUrlWithout(array('view', 'limit')),
             $view->escape($this->getTitle()),
-            $this->getRemoveLink()
+            $this->getRemoveLink(),
+            t('Dashlet') . ': '
+
         );
 
         return str_replace($searchTokens, $replaceTokens, $this->template);

From 04d2c789830ec1d93da95e6811d25d4cdf054d10 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 16:28:12 +0100
Subject: [PATCH 0731/2920] Allow to move content not wrapped by <div> to
 another container

---
 public/js/icinga/ui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index 93c539cd6..043693171 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -140,7 +140,7 @@
 
         cutContainer: function ($col) {
             var props = {
-              'elements': $('#' + $col.attr('id') + ' > div').detach(),
+              'elements': $('#' + $col.attr('id') + ' > *').detach(),
               'data': {
                 'data-icinga-url': $col.data('icingaUrl'),
                 'data-icinga-refresh': $col.data('icingaRefresh'),

From f6ea02fec59292b5035cbd4fb70439e073aa53e6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 16:29:07 +0100
Subject: [PATCH 0732/2920] qlink: Allow passing null as default for
 $properties

---
 library/Icinga/Web/View/helpers/url.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/View/helpers/url.php b/library/Icinga/Web/View/helpers/url.php
index 9fa5d4a69..d4518d2aa 100644
--- a/library/Icinga/Web/View/helpers/url.php
+++ b/library/Icinga/Web/View/helpers/url.php
@@ -27,8 +27,8 @@ $this->addHelperFunction('url', function ($path = null, $params = null) {
     return $url;
 });
 
-$this->addHelperFunction('qlink', function ($title, $url, $params = null, $properties = array(), $escape = true) use ($view) {
-    if (array_key_exists('title', $properties) && !array_key_exists('aria-label', $properties)) {
+$this->addHelperFunction('qlink', function ($title, $url, $params = null, $properties = null, $escape = true) use ($view) {
+    if ($properties && array_key_exists('title', $properties) && !array_key_exists('aria-label', $properties)) {
         $properties['aria-label'] = $properties['title'];
     }
 

From 48286e0d594acedbaaf0fbacc49a106a6c1fd84f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 16:42:25 +0100
Subject: [PATCH 0733/2920] Use View::translate() instead of mt() and t() ...

---
 .../views/scripts/config/application.phtml       |  2 +-
 .../views/scripts/list/contacts.phtml            |  8 ++++----
 .../views/scripts/list/eventgrid.phtml           | 16 ++++++++--------
 .../application/views/scripts/show/contact.phtml |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/application/views/scripts/config/application.phtml b/application/views/scripts/config/application.phtml
index c34aa8349..9a168a904 100644
--- a/application/views/scripts/config/application.phtml
+++ b/application/views/scripts/config/application.phtml
@@ -4,7 +4,7 @@
 
 <div class="content">
   <h1 tabindex="0" id="application-configuration">
-    <?= t('Generic Configuration'); ?>
+    <?= $this->translate('General Configuration'); ?>
   </h1>
   <?php if (isset($this->messageBox)): ?>
     <?= $this->messageBox->render() ?>
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 4623a5027..c17d997f1 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -9,7 +9,7 @@
 <div data-base-target="_next" class="content contacts">
     <?php
     if (count($contacts) === 0) {
-        echo mt('monitoring', 'No contacts matching the filter');
+        echo $this->translate('No contacts matching the filter');
         return;
     }
     foreach ($contacts as $contact): ?>
@@ -26,7 +26,7 @@
             ) ?></div>
             <?php if ($contact->contact_pager): ?>
             <div>
-                <?= mt('monitoring', 'Pager') ?>:
+                <?= $this->translate('Pager') ?>:
                 <?= $this->escape($contact->contact_pager) ?>
             </div>
             <?php endif; ?>
@@ -34,13 +34,13 @@
             <div class="notification-periods">
                 <?php if ($contact->contact_notify_service_timeperiod): ?>
                 <div>
-                    <?= mt('monitoring', 'Service notification period') ?>:
+                    <?= $this->translate('Service notification period') ?>:
                     <?= $this->escape($contact->contact_notify_service_timeperiod) ?>
                 </div>
                 <?php endif; ?>
                 <?php if ($contact->contact_notify_host_timeperiod): ?>
                 <div>
-                    <?= mt('monitoring', 'Host notification period') ?>:
+                    <?= $this->translate('Host notification period') ?>:
                     <?= $this->escape($contact->contact_notify_host_timeperiod) ?>
                 </div>
                 <?php endif; ?>
diff --git a/modules/monitoring/application/views/scripts/list/eventgrid.phtml b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
index 53056daac..1af75caf9 100644
--- a/modules/monitoring/application/views/scripts/list/eventgrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
@@ -18,39 +18,39 @@ use Icinga\Web\Widget\Chart\HistoryColorGrid;
 
 $settings = array(
     'cnt_up' => array(
-        'tooltip' => mt('monitoring', '%d ok on %s'),
+        'tooltip' => $this->translate('%d hosts ok on %s'),
         'color' => '#49DF96',
         'opacity' => '0.55'
     ),
     'cnt_unreachable_hard' => array(
-        'tooltip' => mt('monitoring', '%d unreachable on %s'),
+        'tooltip' => $this->translate('%d hosts unreachable on %s'),
         'color' => '#77AAFF',
         'opacity' => '0.55'
     ),
     'cnt_critical_hard' => array(
-        'tooltip' => mt('monitoring', '%d critical on %s'),
+        'tooltip' => $this->translate('%d services critical on %s'),
         'color' => '#ff5566',
         'opacity' => '0.9'
     ),
 
     'cnt_warning_hard' => array(
-        'tooltip' => mt('monitoring', '%d warning on %s'),
+        'tooltip' => $this->translate('%d services warning on %s'),
         'color' => '#ffaa44',
         'opacity' => '1.0'
     ),
 
     'cnt_down_hard' => array(
-        'tooltip' => mt('monitoring', '%d down on %s'),
+        'tooltip' => $this->translate('%d hosts down on %s'),
         'color' => '#ff5566',
         'opacity' => '0.9'
     ),
     'cnt_unknown_hard' => array(
-        'tooltip' => mt('monitoring', '%d unknown on %s'),
+        'tooltip' => $this->translate('%d services unknown on %s'),
         'color' => '#cc77ff',
         'opacity' => '0.7'
     ),
     'cnt_ok' => array(
-        'tooltip' => mt('monitoring', '%d ok on %s'),
+        'tooltip' => $this->translate('%d services ok on %s'),
         'color' => '#49DF96',
         'opacity' => '0.55'
     )
@@ -66,7 +66,7 @@ if ($to - $from > 315360000) {
 $data = array();
 
 if (count($summary) === 0) {
-    echo mt('monitoring', 'No state changes in the selected time period.');
+    echo $this->translate('No state changes in the selected time period.');
 }
 foreach ($summary as $entry) {
     $day = $entry->day;
diff --git a/modules/monitoring/application/views/scripts/show/contact.phtml b/modules/monitoring/application/views/scripts/show/contact.phtml
index 92b84dc73..0ccd0f5ec 100644
--- a/modules/monitoring/application/views/scripts/show/contact.phtml
+++ b/modules/monitoring/application/views/scripts/show/contact.phtml
@@ -19,23 +19,23 @@
       </tr>
 <?php if ($contact->contact_email): ?>
       <tr>
-        <th><?= mt('monitoring', 'Email') ?></th>
         <td><?= sprintf('<a href="mailto:%1$s">%1$s</a>', $this->escape($contact->contact_email)) ?></td>
+        <th><?= $this->translate('Email') ?></th>
       </tr>
 <?php endif ?>
 <?php if ($contact->contact_pager): ?>
       <tr>
-        <th><?= mt('monitoring', 'Pager') ?></th>
+        <th><?= $this->translate('Pager') ?></th>
         <td><?= $this->escape($contact->contact_pager) ?></td>
       </tr>
 <?php endif ?>
       <tr>
-        <th><?= mt('monitoring', 'Hosts') ?></th>
+        <th><?= $this->translate('Hosts') ?></th>
         <td><?= $this->escape($contactHelper->contactFlags($contact, 'host')) ?><br />
         <?= $this->escape($contact->contact_notify_host_timeperiod) ?></td>
       </tr>
       <tr>
-        <th><?= mt('monitoring', 'Services') ?></th>
+        <th><?= $this->translate('Services') ?></th>
         <td><?= $this->escape($contactHelper->contactFlags($contact, 'service')) ?><br />
         <?= $this->escape($contact->contact_notify_service_timeperiod) ?></td>
       </tr>

From 9fb3dcabea57bffe5cb6a9d76f7e5b4777c55d2d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 16:48:02 +0100
Subject: [PATCH 0734/2920] Introduce Icinga\Web\Widget\Tab::$label as
 alternative for $title

---
 library/Icinga/Web/Widget/Tab.php | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index 143c3e552..94e2bc678 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -42,6 +42,8 @@ class Tab extends AbstractWidget
      */
     private $title = '';
 
+    private $label = '';
+
     /**
      * The Url this tab points to
      *
@@ -116,6 +118,11 @@ class Tab extends AbstractWidget
         return $this->name;
     }
 
+    public function setLabel($label)
+    {
+        $this->label = $label;
+    }
+
     /**
      * @param mixed $title
      */
@@ -210,9 +217,22 @@ class Tab extends AbstractWidget
         if ($this->active) {
             $classes[] = 'active';
         }
-        $caption = $view->escape($this->title);
+
+        $caption = $view->escape($this->label);
         $tagParams = $this->tagParams;
 
+        if ($this->title) {
+            if ($tagParams !== null) {
+                $tagParams['title'] = $this->title;
+                $tagParams['aria-label'] = $this->title;
+            } else {
+                $tagParams = array(
+                    'title'         => $this->title,
+                    'aria-label'    => $this->title
+                );
+            }
+        }
+
         if ($this->icon !== null) {
             if (strpos($this->icon, '.') === false) {
                 $caption = $view->icon($this->icon) . $caption;
@@ -220,13 +240,16 @@ class Tab extends AbstractWidget
                 $caption = $view->img($this->icon, null, array('class' => 'icon')) . $caption;
             }
         }
+
         if ($this->url !== null) {
             $this->url->overwriteParams($this->urlParams);
+
             if ($tagParams !== null) {
                 $params = $view->propertiesToString($tagParams);
             } else {
                 $params = '';
             }
+
             $tab = sprintf(
                 '<a href="%s"%s>%s</a>',
                 $this->url,
@@ -236,6 +259,7 @@ class Tab extends AbstractWidget
         } else {
             $tab = $caption;
         }
+
         $class = empty($classes) ? '' : sprintf(' class="%s"', implode(' ', $classes));
         return '<li ' . $class . '>' . $tab . "</li>\n";
     }

From 64a4dc67bc758359855750335676a4005c2bb762 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 16:50:31 +0100
Subject: [PATCH 0735/2920] Add proper titles to all config tabs

refs #8458
---
 application/controllers/ConfigController.php     | 14 ++++++++++----
 application/controllers/PreferenceController.php |  5 +++--
 application/controllers/RolesController.php      | 14 ++++++++++----
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index bc82b6015..6c3d2d04b 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -39,28 +39,34 @@ class ConfigController extends ActionController
         $allowedActions = array();
         if ($auth->hasPermission('system/config/application')) {
             $tabs->add('application', array(
-                'title' => $this->translate('Application'),
+                'title' => $this->translate('Adjust the general configuration of Icinga Web 2'),
+                'label' => $this->translate('Application'),
                 'url'   => 'config/application'
             ));
             $allowedActions[] = 'application';
         }
         if ($auth->hasPermission('system/config/authentication')) {
             $tabs->add('authentication', array(
-                'title' => $this->translate('Authentication'),
+                'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'),
+                'label' => $this->translate('Authentication'),
                 'url'   => 'config/authentication'
             ));
             $allowedActions[] = 'authentication';
         }
         if ($auth->hasPermission('system/config/resources')) {
             $tabs->add('resource', array(
-                'title' => $this->translate('Resources'),
+                'title' => $this->translate('Configure which resources are being utilized by Icinga Web 2'),
+                'label' => $this->translate('Resources'),
                 'url'   => 'config/resource'
             ));
             $allowedActions[] = 'resource';
         }
         if ($auth->hasPermission('system/config/roles')) {
             $tabs->add('roles', array(
-                'title' => $this->translate('Roles'),
+                'title' => $this->translate(
+                    'Configure roles to permit or restrict users and groups accessing Icinga Web 2'
+                ),
+                'label' => $this->translate('Roles'),
                 'url'   => 'roles'
             ));
             $allowedActions[] = 'roles';
diff --git a/application/controllers/PreferenceController.php b/application/controllers/PreferenceController.php
index e1fd00f46..ac67f495b 100644
--- a/application/controllers/PreferenceController.php
+++ b/application/controllers/PreferenceController.php
@@ -25,8 +25,9 @@ class PreferenceController extends BasePreferenceController
         return array(
             'preferences' => new Tab(
                 array(
-                    'title'     => t('Preferences'),
-                    'url'       => Url::fromPath('/preference')
+                    'title' => t('Adjust the preferences of Icinga Web 2 according to your needs'),
+                    'label' => t('Preferences'),
+                    'url'   => Url::fromPath('/preference')
                 )
             )
         );
diff --git a/application/controllers/RolesController.php b/application/controllers/RolesController.php
index 7b66b1fa8..25b3651d9 100644
--- a/application/controllers/RolesController.php
+++ b/application/controllers/RolesController.php
@@ -25,24 +25,30 @@ class RolesController extends ActionController
         $auth = $this->Auth();
         if ($auth->hasPermission('system/config/application')) {
             $tabs->add('application', array(
-                'title' => $this->translate('Application'),
+                'title' => $this->translate('Adjust the general configuration of Icinga Web 2'),
+                'label' => $this->translate('Application'),
                 'url'   => 'config'
             ));
         }
         if ($auth->hasPermission('system/config/authentication')) {
             $tabs->add('authentication', array(
-                'title' => $this->translate('Authentication'),
+                'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'),
+                'label' => $this->translate('Authentication'),
                 'url'   => 'config/authentication'
             ));
         }
         if ($auth->hasPermission('system/config/resources')) {
             $tabs->add('resource', array(
-                'title' => $this->translate('Resources'),
+                'title' => $this->translate('Configure which resources are being utilized by Icinga Web 2'),
+                'label' => $this->translate('Resources'),
                 'url'   => 'config/resource'
             ));
         }
         $tabs->add('roles', array(
-            'title' => $this->translate('Roles'),
+            'title' => $this->translate(
+                'Configure roles to permit or restrict users and groups accessing Icinga Web 2'
+            ),
+            'label' => $this->translate('Roles'),
             'url'   => 'roles'
         ));
     }

From f6cbc17ff7c35d7ffb5f36ed709717830c6e207d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 16:56:49 +0100
Subject: [PATCH 0736/2920] Add proper titles to all host/service tabs

refs #8458
---
 .../controllers/ShowController.php            | 33 ++++++++++++++++---
 .../Controller/MonitoredObjectController.php  | 33 ++++++++++++++++---
 2 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 033b11b1d..4550b20ae 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -189,10 +189,12 @@ class Monitoring_ShowController extends Controller
             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()
@@ -202,17 +204,26 @@ class Monitoring_ShowController extends Controller
         $tabs->add(
             'host',
             array(
-                'title'     => $this->translate('Host'),
+                '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 (isset($params['service'])) {
+        if ($isService) {
             $tabs->add(
                 'service',
                 array(
-                    'title'     => $this->translate('Service'),
+                    '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,
@@ -222,7 +233,11 @@ class Monitoring_ShowController extends Controller
         $tabs->add(
             'services',
             array(
-                'title'     => $this->translate('Services'),
+                '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,
@@ -232,7 +247,15 @@ class Monitoring_ShowController extends Controller
             $tabs->add(
                 'history',
                 array(
-                    'title'     => $this->translate('History'),
+                    '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,
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 566c569a3..f553c12f3 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -164,10 +164,12 @@ abstract class MonitoredObjectController extends Controller
         $tabs = $this->getTabs();
         $object = $this->object;
         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()
@@ -176,17 +178,26 @@ abstract class MonitoredObjectController extends Controller
         $tabs->add(
             'host',
             array(
-                'title'     => $this->translate('Host'),
+                'title'     => sprintf(
+                    $this->translate('Show detailed information for host %s'),
+                    $isService ? $object->getHost()->getName() : $object->getName()
+                ),
+                'label'     => $this->translate('Host'),
                 'icon'      => 'host',
                 'url'       => 'monitoring/host/show',
                 'urlParams' => $params
             )
         );
-        if (isset($params['service'])) {
+        if ($isService) {
             $tabs->add(
                 'service',
                 array(
-                    'title'     => $this->translate('Service'),
+                    '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/service/show',
                     'urlParams' => $params
@@ -196,7 +207,11 @@ abstract class MonitoredObjectController extends Controller
         $tabs->add(
             'services',
             array(
-                'title'     => $this->translate('Services'),
+                '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
@@ -206,7 +221,15 @@ abstract class MonitoredObjectController extends Controller
             $tabs->add(
                 'history',
                 array(
-                    'title'     => $this->translate('History'),
+                    '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

From ebf8d183a7f44948bccf7774649486ae87480c5e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 16:57:06 +0100
Subject: [PATCH 0737/2920] Add proper title to the alert summary's tab

refs #8458
---
 .../controllers/AlertsummaryController.php    | 45 ++++++-------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 1b3db8093..3490da9b4 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -10,11 +10,6 @@ use Icinga\Web\Url;
 
 class Monitoring_AlertsummaryController extends Controller
 {
-    /**
-     * @var string
-     */
-    protected $url;
-
     /**
      * @var array
      */
@@ -30,40 +25,28 @@ class Monitoring_AlertsummaryController extends Controller
      */
     public function init()
     {
-        $tabs = $this->getTabs();
-        if (in_array($this->_request->getActionName(), array('alertsummary'))) {
-            $tabs->extend(new OutputFormat())->extend(new DashboardAction());
-        }
-
-        $this->url = Url::fromRequest();
-
         $this->notificationData = $this->createNotificationData();
         $this->problemData = $this->createProblemData();
     }
 
     /**
-     * @param string $action
-     * @param bool $title
-     */
-    protected function addTitleTab($action, $title = false)
-    {
-        $title = $title ?: ucfirst($action);
-        $this->getTabs()->add(
-            $action,
-            array(
-                'title' => $title,
-                'url'   => $this->url
-            )
-        )->activate($action);
-        $this->view->title = $title;
-    }
-
-    /**
-     * Creat full report
+     * Create full report
      */
     public function indexAction()
     {
-        $this->addTitleTab('alertsummary', $this->translate('Alert Summary'));
+        $this->getTabs()->add(
+            'alertsummary',
+            array(
+                'title' => $this->translate(
+                    'Show recent alerts and visualize notifications and problems'
+                    . ' based on their amount and chronological distribution'
+                ),
+                'label' => $this->translate('Alert Summary'),
+                'url'   => Url::fromRequest()
+            )
+        )->activate('alertsummary');
+        $this->view->title = $this->translate('Alert Summary');
+
         $this->view->intervalBox = $this->createIntervalBox();
         $this->view->recentAlerts = $this->createRecentAlerts();
         $this->view->interval = $this->getInterval();

From 77b60588bc12f66b24df1e550946a474cc134d69 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 16:57:32 +0100
Subject: [PATCH 0738/2920] Add proper titles to the multi selection controller
 tabs

refs #8458
---
 .../application/controllers/HostsController.php           | 8 ++++++--
 .../application/controllers/ServicesController.php        | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index c2661d01f..de1f063ac 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -72,8 +72,12 @@ class Monitoring_HostsController extends Controller
         $this->getTabs()->add(
             'show',
             array(
-                'title' => mt('monitoring', 'Hosts'),
-                'url' => Url::fromRequest()
+                'title' => sprintf(
+                    $this->translate('Show summarized information for %u hosts'),
+                    count($this->hostList)
+                ),
+                'label' => $this->translate('Hosts'),
+                'url'   => Url::fromRequest()
             )
         )->activate('show');
         $this->setAutorefreshInterval(15);
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 7d052e067..a74b61074 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -93,8 +93,12 @@ class Monitoring_ServicesController extends Controller
         $this->getTabs()->add(
             'show',
             array(
-                'title' => mt('monitoring', 'Services'),
-                'url' => Url::fromRequest()
+                'title' => sprintf(
+                    $this->translate('Show summarized information for %u services'),
+                    count($this->serviceList)
+                ),
+                'label' => $this->translate('Services'),
+                'url'   => Url::fromRequest()
             )
         )->activate('show');
         $this->setAutorefreshInterval(15);

From 7aacfcf907aaa4e7b411ef1e3f26cd2b72388a9e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 16:58:48 +0100
Subject: [PATCH 0739/2920] Add proper title to the tactical overview's tab

refs #8458
---
 .../application/controllers/TacticalController.php          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/TacticalController.php b/modules/monitoring/application/controllers/TacticalController.php
index 8a3da2b9c..33681528c 100644
--- a/modules/monitoring/application/controllers/TacticalController.php
+++ b/modules/monitoring/application/controllers/TacticalController.php
@@ -11,7 +11,11 @@ class Monitoring_TacticalController extends MonitoringController
         $this->getTabs()->add(
             'tactical_overview',
             array(
-                'title' => $this->translate('Tactical Overview'),
+                'title' => $this->translate(
+                    'Show an overview of all hosts and services, their current'
+                    . ' states and monitoring feature utilisation'
+                ),
+                'label' => $this->translate('Tactical Overview'),
                 'url'   => Url::fromRequest()
             )
         )->activate('tactical_overview');

From 1ef03a76f751019d06f740501247cacde09ac380 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 16:59:13 +0100
Subject: [PATCH 0740/2920] Add proper title to the monitoring health's tab

refs #8458
---
 .../application/controllers/ProcessController.php           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php
index 875f4094c..b20bd7576 100644
--- a/modules/monitoring/application/controllers/ProcessController.php
+++ b/modules/monitoring/application/controllers/ProcessController.php
@@ -22,7 +22,11 @@ class Monitoring_ProcessController extends Controller
             ->add(
                 'info',
                 array(
-                    'title' => $this->translate('Monitoring Health'),
+                    'title' => $this->translate(
+                        'Show information about the current monitoring instance\'s process'
+                        . ' and it\'s performance as well as available features'
+                    ),
+                    'label' => $this->translate('Monitoring Health'),
                     'url'   =>'monitoring/process/info'
                 )
             );

From f48dbf16405e330560bb878b813060af12c0ad0c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 16:59:47 +0100
Subject: [PATCH 0741/2920] Add proper title to the timeline's tab

refs #8458
---
 .../controllers/TimelineController.php        | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php
index a13973e1d..dcd7a10aa 100644
--- a/modules/monitoring/application/controllers/TimelineController.php
+++ b/modules/monitoring/application/controllers/TimelineController.php
@@ -13,19 +13,17 @@ use Icinga\Module\Monitoring\Web\Widget\SelectBox;
 
 class Monitoring_TimelineController extends Controller
 {
-    protected function addTitleTab($action, $title = false)
-    {
-        $title = $title ? : ucfirst($action);
-        $this->getTabs()->add($action, array(
-            'title' => $title,
-            'url' => Url::fromRequest()
-        ))->activate($action);
-        $this->view->title = $title;
-    }
-
     public function indexAction()
     {
-        $this->addTitleTab('index', t('Timeline'));
+        $this->getTabs()->add(
+            'timeline',
+            array(
+                'title' => $this->translate('Show the number of historical event records grouped by time and type'),
+                'label' => $this->translate('Timeline'),
+                'url'   => Url::fromRequest()
+            )
+        )->activate('timeline');
+        $this->view->title = $this->translate('Timeline');
 
         // TODO: filter for hard_states (precedence adjustments necessary!)
         $this->setupIntervalBox();

From 6eb638f6b32ee37adde3ffb5e4164e44d701ccb8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:00:30 +0100
Subject: [PATCH 0742/2920] Add proper titles to the list view's tabs

refs #8458
---
 application/controllers/ListController.php    |  2 +-
 .../controllers/ListController.php            | 57 +++++++++++--------
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index 4736720ce..d55381987 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -23,7 +23,7 @@ class ListController extends Controller
     protected function addTitleTab($action)
     {
         $this->getTabs()->add($action, array(
-            'title' => ucfirst($action),
+            'label' => ucfirst($action),
             'url' => Url::fromPath(
                     'list/'
                     . str_replace(' ', '', $action)
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index d7fbe177f..e43d64f1d 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -6,7 +6,6 @@ use Icinga\Module\Monitoring\Backend;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
 use Icinga\Web\Url;
-use Icinga\Web\Hook;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 use Icinga\Web\Widget\Tabextension\OutputFormat;
 use Icinga\Web\Widget\Tabs;
@@ -17,11 +16,7 @@ use Icinga\Module\Monitoring\Forms\StatehistoryForm;
 
 class Monitoring_ListController extends Controller
 {
-    protected $url;
-
     /**
-     * Retrieve backend and hooks for this controller
-     *
      * @see ActionController::init
      */
     public function init()
@@ -32,7 +27,6 @@ class Monitoring_ListController extends Controller
             $this->view->compact = true;
             $this->view->inline = true;
         }
-        $this->url = Url::fromRequest();
     }
 
     /**
@@ -56,7 +50,7 @@ class Monitoring_ListController extends Controller
     protected function hasBetterUrl()
     {
         $request = $this->getRequest();
-        $url = clone($this->url);
+        $url = Url::fromRequest();
 
         if ($this->getRequest()->isPost()) {
             if ($request->getPost('sort')) {
@@ -100,7 +94,7 @@ class Monitoring_ListController extends Controller
             $stateChangeColumn = 'host_last_state_change';
         }
 
-        $this->addTitleTab('hosts', $this->translate('Hosts'));
+        $this->addTitleTab('hosts', $this->translate('Hosts'), $this->translate('List hosts'));
         $this->setAutorefreshInterval(10);
         $query = $this->backend->select()->from('hostStatus', array_merge(array(
             'host_icon_image',
@@ -174,7 +168,7 @@ class Monitoring_ListController extends Controller
             $stateChangeColumn = 'service_last_state_change';
         }
 
-        $this->addTitleTab('services', $this->translate('Services'));
+        $this->addTitleTab('services', $this->translate('Services'), $this->translate('List services'));
         $this->view->showHost = true;
         if ($host = $this->_getParam('host')) {
             if (strpos($host, '*') === false) {
@@ -272,7 +266,7 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
-        $this->addTitleTab('downtimes', $this->translate('Downtimes'));
+        $this->addTitleTab('downtimes', $this->translate('Downtimes'), $this->translate('List downtimes'));
         $this->setAutorefreshInterval(12);
         $query = $this->backend->select()->from('downtime', array(
             'id'              => 'downtime_internal_id',
@@ -326,7 +320,11 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
-        $this->addTitleTab('notifications', $this->translate('Notifications'));
+        $this->addTitleTab(
+            'notifications',
+            $this->translate('Notifications'),
+            $this->translate('List notifications')
+        );
         $this->setAutorefreshInterval(15);
         $query = $this->backend->select()->from('notification', array(
             'host',
@@ -350,7 +348,7 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
-        $this->addTitleTab('contacts', $this->translate('Contacts'));
+        $this->addTitleTab('contacts', $this->translate('Contacts'), $this->translate('List contacts'));
         $query = $this->backend->select()->from('contact', array(
             'contact_name',
             'contact_id',
@@ -389,7 +387,7 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
-        $this->addTitleTab('eventgrid', $this->translate('Event Grid'));
+        $this->addTitleTab('eventgrid', $this->translate('Event Grid'), $this->translate('Show the Event Grid'));
 
         $form = new StatehistoryForm();
         $form->setEnctype(Zend_Form::ENCTYPE_URLENCODED);
@@ -430,7 +428,11 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
-        $this->addTitleTab('contactgroups', $this->translate('Contact Groups'));
+        $this->addTitleTab(
+            'contactgroups',
+            $this->translate('Contact Groups'),
+            $this->translate('List contact groups')
+        );
         $query = $this->backend->select()->from('contactgroup', array(
             'contactgroup_name',
             'contactgroup_alias',
@@ -462,7 +464,7 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
-        $this->addTitleTab('comments', $this->translate('Comments'));
+        $this->addTitleTab('comments', $this->translate('Comments'), $this->translate('List comments'));
         $this->setAutorefreshInterval(12);
         $query = $this->backend->select()->from('comment', array(
             'id'         => 'comment_internal_id',
@@ -501,7 +503,11 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
-        $this->addTitleTab('servicegroups', $this->translate('Service Groups'));
+        $this->addTitleTab(
+            'servicegroups',
+            $this->translate('Service Groups'),
+            $this->translate('List service groups')
+        );
         $this->setAutorefreshInterval(12);
         $query = $this->backend->select()->from('groupsummary', array(
             'servicegroup',
@@ -551,7 +557,7 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
-        $this->addTitleTab('hostgroups', $this->translate('Host Groups'));
+        $this->addTitleTab('hostgroups', $this->translate('Host Groups'), $this->translate('List host groups'));
         $this->setAutorefreshInterval(12);
         $query = $this->backend->select()->from('groupsummary', array(
             'hostgroup',
@@ -601,7 +607,11 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
-        $this->addTitleTab('eventhistory', $this->translate('Event Overview'));
+        $this->addTitleTab(
+            'eventhistory',
+            $this->translate('Event Overview'),
+            $this->translate('List event records')
+        );
 
         $query = $this->backend->select()->from('eventHistory', array(
             'host_name',
@@ -632,7 +642,7 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
-        $this->addTitleTab('servicegrid', $this->translate('Service Grid'));
+        $this->addTitleTab('servicegrid', $this->translate('Service Grid'), $this->translate('Show the Service Grid'));
         $this->setAutorefreshInterval(15);
         $query = $this->backend->select()->from('serviceStatus', array(
             'host_name',
@@ -698,13 +708,12 @@ class Monitoring_ListController extends Controller
         $this->view->sortControl->applyRequest($this->getRequest());
     }
 
-    protected function addTitleTab($action, $title = false)
+    protected function addTitleTab($action, $title, $tip)
     {
-        $title = $title ?: ucfirst($action);
         $this->getTabs()->add($action, array(
-            'title' => $title,
-            // 'url' => Url::fromPath('monitoring/list/' . $action)
-            'url' => $this->url
+            'title' => $tip,
+            'label' => $title,
+            'url'   => Url::fromRequest()
         ))->activate($action);
         $this->view->title = $title;
     }

From ac26807ab788e6fdc100dddcedbce231ac3b2347 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 23 Feb 2015 17:01:38 +0100
Subject: [PATCH 0743/2920] Add new spin an cw icon for refresh control

refs #7968
---
 application/fonts/fontello-ifont/LICENSE.txt  |   9 +++++++++
 application/fonts/fontello-ifont/config.json  |   6 ++++++
 .../fonts/fontello-ifont/css/animation.css    |   2 +-
 .../fonts/fontello-ifont/css/ifont-codes.css  |   3 ++-
 .../fontello-ifont/css/ifont-embedded.css     |  13 +++++++------
 .../fontello-ifont/css/ifont-ie7-codes.css    |   3 ++-
 .../fonts/fontello-ifont/css/ifont-ie7.css    |   3 ++-
 .../fonts/fontello-ifont/css/ifont.css        |  15 ++++++++-------
 application/fonts/fontello-ifont/demo.html    |   3 +++
 public/font/ifont.eot                         | Bin 29792 -> 29952 bytes
 public/font/ifont.svg                         |   3 ++-
 public/font/ifont.ttf                         | Bin 29636 -> 29796 bytes
 public/font/ifont.woff                        | Bin 18080 -> 18220 bytes
 13 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/application/fonts/fontello-ifont/LICENSE.txt b/application/fonts/fontello-ifont/LICENSE.txt
index 29b99c574..152fb787d 100644
--- a/application/fonts/fontello-ifont/LICENSE.txt
+++ b/application/fonts/fontello-ifont/LICENSE.txt
@@ -37,3 +37,12 @@ Font license info
    Homepage:  http://www.entypo.com
 
 
+## Fontelico
+
+   Copyright (C) 2012 by Fontello project
+
+   Author:    Crowdsourced, for Fontello project
+   License:   SIL (http://scripts.sil.org/OFL)
+   Homepage:  http://fontello.com
+
+
diff --git a/application/fonts/fontello-ifont/config.json b/application/fonts/fontello-ifont/config.json
index 6e2d2af3b..e9a58cc1a 100644
--- a/application/fonts/fontello-ifont/config.json
+++ b/application/fonts/fontello-ifont/config.json
@@ -6,6 +6,12 @@
   "units_per_em": 1000,
   "ascent": 850,
   "glyphs": [
+    {
+      "uid": "9bc2902722abb366a213a052ade360bc",
+      "css": "spin6",
+      "code": 59508,
+      "src": "fontelico"
+    },
     {
       "uid": "9dd9e835aebe1060ba7190ad2b2ed951",
       "css": "search",
diff --git a/application/fonts/fontello-ifont/css/animation.css b/application/fonts/fontello-ifont/css/animation.css
index ac5a9562f..578d766f5 100644
--- a/application/fonts/fontello-ifont/css/animation.css
+++ b/application/fonts/fontello-ifont/css/animation.css
@@ -6,7 +6,7 @@
   -o-animation: spin 2s infinite linear;
   -webkit-animation: spin 2s infinite linear;
   animation: spin 2s infinite linear;
-  display: inline-block;
+  /*display: inline-block;*/
 }
 @-moz-keyframes spin {
   0% {
diff --git a/application/fonts/fontello-ifont/css/ifont-codes.css b/application/fonts/fontello-ifont/css/ifont-codes.css
index 7bd25fd38..ed241ebe9 100644
--- a/application/fonts/fontello-ifont/css/ifont-codes.css
+++ b/application/fonts/fontello-ifont/css/ifont-codes.css
@@ -114,4 +114,5 @@
 .icon-chart-area:before { content: '\e870'; } /* '' */
 .icon-chart-bar:before { content: '\e871'; } /* '' */
 .icon-beaker:before { content: '\e872'; } /* '' */
-.icon-magic:before { content: '\e873'; } /* '' */
\ No newline at end of file
+.icon-magic:before { content: '\e873'; } /* '' */
+.icon-spin6:before { content: '\e874'; } /* '' */
\ No newline at end of file
diff --git a/application/fonts/fontello-ifont/css/ifont-embedded.css b/application/fonts/fontello-ifont/css/ifont-embedded.css
index 92bcfdff9..e35b001b2 100644
--- a/application/fonts/fontello-ifont/css/ifont-embedded.css
+++ b/application/fonts/fontello-ifont/css/ifont-embedded.css
@@ -1,15 +1,15 @@
 @font-face {
   font-family: 'ifont';
-  src: url('../font/ifont.eot?75097146');
-  src: url('../font/ifont.eot?75097146#iefix') format('embedded-opentype'),
-       url('../font/ifont.svg?75097146#ifont') format('svg');
+  src: url('../font/ifont.eot?57837527');
+  src: url('../font/ifont.eot?57837527#iefix') format('embedded-opentype'),
+       url('../font/ifont.svg?57837527#ifont') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 @font-face {
   font-family: 'ifont';
-  src: url('data:application/octet-stream;base64,d09GRgABAAAAAEagAA4AAAAAc8QAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABRAAAAEQAAABWPilJemNtYXAAAAGIAAAAOgAAAUrQhBm3Y3Z0IAAAAcQAAAAKAAAACgAAAABmcGdtAAAB0AAABZQAAAtwiJCQWWdhc3AAAAdkAAAACAAAAAgAAAAQZ2x5ZgAAB2wAADhaAABagEgGgRJoZWFkAAA/yAAAADUAAAA2BPb+QWhoZWEAAEAAAAAAIAAAACQIbgTVaG10eAAAQCAAAACaAAAB1JWdAABsb2NhAABAvAAAAOwAAADsNUFNFG1heHAAAEGoAAAAIAAAACABLA16bmFtZQAAQcgAAAF5AAACqcQUffhwb3N0AABDRAAAAvQAAATM5WyF4HByZXAAAEY4AAAAZQAAAHvdawOFeJxjYGQuZ5zAwMrAwVTFtIeBgaEHQjM+YDBkZGJgYGJgZWbACgLSXFMYHF4wvChmDvqfxRDFHMwwHSjMCJIDAPDADCF4nGNgYGBmgGAZBkYGEHAB8hjBfBYGDSDNBqQZGZgYGF4U//8PUvCCAURLMELVAwEjG8OIBwDjzgchAAAAAAAAAAAAAAAAAAB4nK1WaXMTRxCd1WHLNj6CDxI2gVnGcox2VpjLCBDG7EoW4BzylexCjl1Ldu6LT/wG/ZpekVSRb/y0vB4d2GAnVVQoSv2m9+1M9+ueXpPQksReWI+k3HwpprY2aWTnSUg3bFqO4kPZ2QspU0z+LoiCaLXUvu04JCISgap1hSWC2PfI0iTjQ48yWrYlvWpSbulJd9kaD+qt+vbT0FGO3QklNZuhQ+uRLanCqBJFMu2RkjYtw9VfSVrh5yvMfNUMJYLoJJLGm2EMj+Rn44xWGa3GdhxFkU2WG0WKRDM8iCKPslpin1wxQUD5oBlSXvk0onyEH5EVe5TTCnHJdprf9yU/6R3OvyTieouyJQf+QHZkB3unK/ki0toK46adbEehivB0fSfEI5uT6p/sUV7TaOB2RaYnzQiWyleQWPkJZfYPyWrhfMqXPBrVkoOcCFovc2Jf8g60HkdMiWsmyILujk6IoO6XnKHYY/q4+OO9XSwXIQTIOJb1jkq4EEYpYbOaJG0EOYiSskWV1HpHTJzyOi3iLWG/Tu3oS2e0Sag7MZ6th46tnKjkeDSp00ymTu2k5tGUBlFKOhM85tcBlB/RJK+2sZrEyqNpbDNjJJFQoIVzaSqIZSeWNAXRPJrRm7thmmvXokWaPFDPPXpPb26Fmzs9p+3AP2v8Z3UqpoO9MJ2eDshKfJp2uUnRun56hn8m8UPWAiqRLTbDlMVDtn4H5eVjS47CawNs957zK+h99kTIpIH4G/AeL9UpBUyFmFVQC9201rUsy9RqVotUZOq7IU0rX9ZpAk05Dn1jX8Y4/q+ZGUtMCd/vxOnZEZeeufYlyDSH3GZdj+Z1arFdgM5sz+k0y/Z9nebYfqDTPNvzOh1ha+t0lO2HOi2w/UinY2wvaEGT7jsEchGBXMAGEoGwdRAI20sIhK1CIGwXEQjbIgJhu4RA2H6MQNguIxC2l7Wsmn4qaRw7E8sARYgDoznuyGVuKldTyaUSrotGpzbkKXKrpKJ4Vv0rA/3ikTesgbVAukTW/IpJrnxUleOPrmh508S5Ao5Vf3tzXJ8TD2W/WPhT8L/amqqkV6x5ZHIVeSPQk+NE1yYVj67p8rmqR9f/i4oOa4F+A6UQC0VZlg2+mZDwUafTUA1c5RAzGzMP1/W6Zc3P4fybGCEL6H78NxQaC9yDTllJWe1gr9XXj2W5twflsCdYkmK+zOtb4YuMzEr7RWYpez7yecAVMCqVYasNXK3gzXsS85DpTfJMELcVZYOkjceZILGBYx4wb76TICRMXbWB2imcsIG8YMwp2O+EQ1RvlOVwe6F9Ho2Uf2tX7MgZFU0Q+G32Rtjrs1DyW6yBhCe/1NdAVSFNxbipgEsj5YZq8GFcrdtGMk6gr6jYDcuyig8fR9x3So5lIPlIEatHRz+tvUKd1Ln9yihu3zv9CIJBaWL+9r6Z4qCUd7WSZVZtA1O3GpVT15rDxasO3c2j7nvH2Sdy1jTddE/c9L6mVbeDg7lZEO3bHJSlTC6o68MOG6jLzaXQ6mVckt52DzAsMKDfoRUb/1f3cfg8V6oKo+NIvZ2oH6PPYgzyDzh/R/UF6OcxTLmGlOd7lxOfbtzD2TJdxV2sn+LfwKy15mbpGnBD0w2Yh6xaHbrKDXynBjo90tyO9BDwse4K8QBgE8Bi8InuWsbzKYDxfMYcH+Bz5jBoMofBFnMYbDNnDWCHOQx2mcNgjzkMvmDOOsCXzGEQModBxBwGT5gTADxlDoOvmMPga+Yw+IY59wG+ZQ6DmDkMEuYw2Nd0ayhzixd0F6htUBXowPQTFvewONRUGbK/44Vhf28Qs38wiKk/aro9pP7EC0P92SCm/mIQU3/VdGdI/Y0Xhvq7QUz9wyCmPtMvxnKZwV9GvkuFA8ouNp/z98T7B8IaQLYAAQAB//8AD3iclbwLYBzFlSjap/rfM9Pz6+keSaPR/DQjj+SRGM1HSPJYlmVLyEbItuz4hzFgG2EbhziO8RKbEJvLhVxiES8JXiCAEkPYLCRgm5DwsmHvxsvuslmW5e7ayd5snJDPNeSFkA3JS3xR805V98gyhEDsUXdX1++cU1XnV6eaUznu7d/z53gP5+dauE5uIXcFdxX3Ye4T3BRnDRj/49D+j+64dsPE8sV93e2ZWNgjqPPbWyOGJKdT2Vy5VLG6i2YQ0zk3XcU0vCOfptvBSfeBk/5D5RfAHy9P82n5sJtP0yw/njCPW3HAq5mY8whbZxNW3H7gvXJg24WKc0pdnDGn8ft2mpiM7MRm4iDtoDdrBy1h//OcHJLZQcvTi/2dP7UQKLPvOY4jOEZP8WHeiyPUxilPZ1M6ITgMhpROprLlUk20inFSrJHuYlzkDSmVrSFkfGjlYju6eKXgDcWzvUkx27F8dLQrJad62mKGJp285clbhX1f3zu4eGxscbxnsNKTaiTReBR/ZrbUW+uH02tvwTJkPye9/fbb24VOfiUX5IpcHzfErcE5EhzQr1w3Mby4dmk5YchEmt8ObBSrJQQDqsWqFDHAATGHIOJLUoOFUKkW44IFFMpSBcfOkApQI6ZIhzibq5RLObO7WAOrmJstsmx977L5A7BEyA8ms608OUQRGxoHwRtIIGZSpjAyvrRhXkBO92QTAR1mnp/YO4E/uJPBf/JmWFwrLLt0/Xy+tTU51CYsGXbzN/FDHR1/ZzaCLxIYszcMjo0NIiV6SlkzGmskZqBRI0iLnsEYmeqjFSbsX667hdz8tX3Sbf+rvQBD/KKxQMQXjYKbjWMFOFa/5afI85zISScEDua3i1C1wILN9vEHn4S7H9Lg8oe/Ap952Cl7hm8hP+U8WFYGLNsq5+RcNVe1qpbMtzzw2s8feO21B37+2gOv7fn8z3/++ddeY1fO7echfopvZnVVHutCJBlMB5PlZLA7yE/ZT521n4IrzsKLZ+0nYfwsXGE/5dTjOH4KXuR4rAcUvmo5GQnxB3559izNmtNukItw2jPhkM+rCTy2nwy6My6YFCPYTxmCySC8BM8NFmauLQzCt+zj5PM23meuJU/MXNs5ONjJ+248e+OHZ65lvQuM10zjPFKw7RzyGt+A1tPRbPq9Ei8g8qUCSHGoQRUfdDDxgXKGpMMJupOWWVwIyaLJm36QUp2QreLyd3mIHOkukheMuElCqcBnjESImLHo0oT51j+xtQv8suSa5HLgzcTXtNB5La6dD6qaNWXqU7oJU9EtfoNEG6PE8Ncf7jrBlukJM7E8gT9os4LnNaxlRc77DTD18xzD5ynEp8DwmccNUHz6L2mO+D0SYfhkdVyIxUoVH4iJ94i7HhhjjEMfzUPgeWRnszwTL7hKii1g/hF8XvdW0lOpiu91xEeNThn+KQRqygoHGWqhZh3rJQwj4N4/fYKyE7xAS1tbSxxWmi4SHQ5SHCchLtv5v8WxkVAS9HHD3A5uD13jH921aXSwv5rxaQJIFKd0yugu8qVsLhXBh3BEkk0Ku44YxEXLSKcKpFyqlrP0UoAcYlq0iuF0pRws5bqlSNBojUhYiF8A3YhrLiWXu8sspzuSylI6dBcpU0BmYcLyjWs3TyRTiSVLBj9nRNWVS0yzMVss5E3yT9mhWmZbNt1Wgu1jlULlN/sJ2c/DyrZL08VYQACPzHsjFeET/FVKQunsStn/0THQAR2DebHno/DDdAesWAZwoyxFraVbfKJhBU1dM8yuli/rif55G5O82bXAz/s2zR+bhEa7s+ESmCiHw932ly+5dpcZjfd2ZE4R4Lfn44a1ZDv5zmUknShC12AXFHENyZSWwnNISx6fqWQNcxY3yIUHAtW4aYQCuldTJIFwMjKHapkueBnce66eRpq6szzl3JGWOG0WArvQ+RGHZsDJIMPW06czr7zyI34R3n/0o1eiePvtb3/LrzbC5/WMfp4nPN5958MGRI3/iobP++K+80b0v4woLNjx5MaFm6++2v6C+7B442c3Lrx++3Z776tGSj2gKAcA6FVNGa9GMsrkWTOl7ZCkHWomcnZSTVlsDWznNyCuOtfMdXAL6Booz88mzZBC1zSwWa8TCn0cwk4KUk6y+o5MRGY2t1QDeOK2nw3u/oefvLCLH/zZf3uv5z2n9hInsecUPNLVeVV2MEvytbarOrvsCUzmBrPZwRymTl+URw7h22Enk97ccXuKP0e+zdZzGrEpczVunI7b8sEFPaXO9myLGfDIBMcNl3RKipNKGO90kVesagW5lx/5low8rFKtZFvrWTBbZvbBkCkjyFHhTVAwns73dpC2WvYG/BMKla6fX8oHGmN8T7KieDrWjvrURliT728jHT0F+6hb5rfu/atXaMZb/2VoV4zf9s1/+OZt4/8Sz7OiYLoPb/y73ih5A//OdyTbl0cL7cmB1nqRT7oPV7j3H3xmfzD48SPbvn7H2NgdX6/LmaeYfrga5cUglTOtc9QvqxuFB3Iwa47KVn/XDBe9w0uynL6g1VlMq4skHd5t8udcDats/7g8q4E5yQs6WDmPs/6ibGhu7gB8c98si9uxI269RwKLXpTOx3fEOXcOP4RzWONSOOJjdA4vHyhmGvwiR+dwN67CchqXoQyGuygRhaCDRySI0FN5GKaLM01ZeRoJwONciDABFcZ0dy4td9N7uDtM/uKaNokQAiDY/yEdF3X5uKL4dmjKDkXDH7xsP/uiLEqKpB1cDAteFBRJET3/42PT+cY7GvMP525d/0my6+ZGlXg0TZpZKsnHRfGEGuE5RdOUGU4bPViEnCaJQAZuLdrfFTRULMgg/Ka/f3y8vx8+Yk/Rcb0Y5yJq/YjzUKmrjnPrBZzF98T5Yrz4Og1kKTdLhToR3gdpIsxBz+MQQODBJYGXUaDbQVqVP/EunD/T1zc+3tcHu+3D5ODBbsRfFLErhwTf80v4OIh6NOqxj7O5XOBKqEd3dbZbhLIoE+UXlWHZHGodFq5QgpdsriBUqlShZcpHsRWnLB/EgiY/3ZzPN3fEXv1+IisYHsEbjRvBjZsbhEZNFxRlKIMrvhW8vwZozsPI9196GX6BqwtOY+pvQ1qpZoQzsZQZTMT0qG8kNVgYiJdad7SWznTEZr5HjMesey1H5/826mEFbhHKYuXpJYNFjcJK14whWwgxjois82lU+VDi4jMK1WxpIR005J+oVpRzVHtugWQVdWg6GalllaQKNY9qz4HWPZoR9+xSxGyqt2G4uScf15RtnoDPVD6SOECVIN+Bqz1mzHM1nNnsiUUF5Wp8a//Gvn/ynu3Qi0rT5sGPeWKmZ5csREM6vGl79aihKHu84bjnEwvXG3EDjl2txQ3t6quxI+3qYyaURicn6dyTZm1ORz42ce2ocaCuUe1qa7ECjmykugbqmDn8a0VFAeZoglbSsQFzbrrqpi9oikWT9ME2+77TpH/mFGw9cwbipv7WZqbz8A+z23umBkZOD58Znjl3mL057EcTBZiW6ChZJgTYjb4ykT++/Xvkj1GUGQbyx6BM9XBThiBl8HTNlIO4bhAg3q8G7V+YsuzXpjT7F6FwlLxgkSesgP0L+xpL4z1Tmh/8EA7Mp/N0Bttch2uzjc3TYodPYGOvExzqKiJcMS3TVbmo3YfCKIdWFNUGsGc0m6pBNs7rhnY//PgXdo3y61dE+wMhJVrp7xjftm/LRJbvr0SVdL+1Yr19P8oeoPNz04ce3DM0tOfBD207XsOyVn9w3r7FvduXFwrLt/cO7c2HeruU0IKTMGLfR+c/bMMrxzP8/xLHcgV3NfcRtBd2br1ydVXiGR14lIZ0UKhGi0CWkTugUl/J1u9V56GEButCZh3WiBVh4+dWlSwTU5VquJIzRcnEkafKTxZHnmpHs2laUub/3PTepw20zsy0j/t1H65+AYSQLyoSQZA1r8mDQIjm0xp5gSBzVUVJ8oioI0dk+Mt5Hd6jRlvJbvJ7RX0x4QNx4TEBIjPPEkmBVYpOvESR7SdknfTyigyrcOV5ePpG8QpkONFmy5ku6O9oTfl9sqgLktQY6Y9Ipkf1GTVDjGL/Pn0wIhiqV/YENUMLUZYH4kCbLQ1mIejPhXSS9YWVoKyBV8qw6wn32Qua4vLrc8x2iuKK6aH8en6iqcHwyZRfi2j7UVaVRm7FyIPi1cSFUQl358RgfW3QS9BZMMjHqAoZgSfgzVdRFp4+rMn2TawzuFPWpr70JepWmXkV55T9r0zUkquwmFf5ScC8ArbFrXPTmQsA2p/50uv2nazYukSEvM6enpGxcCnKyW+fxznyGtOrRrm13Dbuo9yt3O1Urzr0yVtvumFyy5VrruhpEqg+jMxYhwKpWKLJ9N9cKy4kU9YZf8tlq3TadBctHPVcNkdfoa6YrbB3cbBMuQVaHd1YFnGaZNMpGWeJiQZLDVhKB5oKW2VklTmZdpFuAciJEbmFIEHEKvYnkyizm0JC4wloCojBYTks25+oCbxChErn6Pjyrm5ZqBRGVxSyojI0hDy0sGK0UBF4s6Hz8vHRQg+Ps6UGn8Rqw0ExMHN9Y2x+qZqP4K27Z17D/FijOa+nG2+RfPXeSkjp8IOgAuyrwH3D9qp1ooAM0A+vDNs/uBYk2GTGGDSpH3jalIwgfLeVxBrbx5s7OzqX5PEWUsS2eaIc7Gwezyf7zY7O5rGOpia+9buikFFz3sujo7GkER2JJ+2PxUYtI0kvcFNSRsnVqBPs+GAIFmXeGCiLvCyC/3j6J5cTwtwELh/ycF74f+D/40LPwQ/gm2jiHKUsHJk3Ha44MI0dVy9VfYs1KNMhsrI1shCkbNmQS1mpXBCoHYP8KpuipeVKLitX0OgrEBw/yUBbF3Vm2VnSVLThAw4eFqJ/xSzSMk3Xec6sMtvH7DZLuSIrIFm0MLaOhmQlm8aGaRqNbpwLKSklmTJOELMT8BlnT8nKSXIRmyijvm5hbdmU6QzCWSLHiVE1ZayHNXNZyeymDbUgRFWphUeNQKINlrEUApFDG7cbpxlaAGjGy8W40MJT5wTly9UUW1c4GytlbAUvCF0pi2ZwBdFFvAwpkq7g9KvgexlnJE+ZN03nKHLUJ5DtBLOCLSHEZjVOkDyVqmlRz0i2nCtT6c5swFwRS6QQmhp0m+xWNSvIStEUSdM0LoBKsYwk4SvVLAoj2i79+QFRiyDF8FmiVM9WspT2FSmCQ1SAKltJmGMZkglP7Hl+9+7nz/3DLunmb0IIFB75Kh+MhHHtC14eR00QNFTWQMGpKggCESSQiKKKgijyoHhBjMmo9ik4O4is8gLyZIK1kP2JKNUMPYz6LRAgokogrGJtUdJ4RZBFnkgqtiWqgsjzRBRAlz1+IcBjo4JCwVCwNx55uRASea8XsJC3oYnnFTEs8h7B58GOJEERVGFFURCJhNBENYRBFBAIAZh6qMlySJBVXNgC0TFNcD0Q4kfLFY1mEQRNA2xB9MqEV3hVNiVJVJSAYGA72Div8wJoohLUCNVsUc6ARngvLn4gCB9PZA/2QxSDR62eULxRKcU7vhOivMojBLyP6JQeAmZJCAShWMmKKHuRkoQg+gwSGa8hKr5EL1FRiClILSytqT71+t0rwAs+bCEC2AhPAfEiAiJogD0g+BqOEaHixksxFDx+ICrmefaceu3UHnax/xMUIuHwKbzoAS8WQpaOOCNtgUheUeI1wBEGiiWSGSi5JIK0R04lC5KiyYIoiV46MzDTqyJdRESCDxJelyV8z6tE1ngJdEHDFkVETBNkWQZVVGQF6cRTcuKM0HheJyJ2JAoyQUnkRyISRF7HArzM41QDmH8FzjUcQ8mv4fjiNNNVw0NAaiRgITy8aPB8AAktKKIigMfSRYqQ4FV0QQfNY8gKiEh2HIgQrwkCqgGE1yiRvSSghhEpASHRUFDQ8USSB0S/SHA2epDiAh05XdVFFXBqEjqCAo8LRSR+jY4rUgDnn4X6BY6An2gaWmG84FFFOkFwELAknbQ4sbA6YohpnEKAo0xsX2Q1ji927ge6HnBuECQHbZSgbqNLhJZiMwtpIsaUoKqrXiIEZNRB337790IXTzVp6YTObHRH4lNdMUs1YrRd6CViyHEQOvevn5m+7h4YH4DH9q49nMpV+iaskU3/sm4/HJkcvTnuV/c+tmUsPdGXTwf3UB/A2/bb2+F32H4C2zcEV8eV0si3qmFXMIdrwCxDQ+apNIbXNcl+WQ4oqkZ2vUJEDcf/RqIrz3h0svk/RaSm6fHN3KwDH1Dg2z0gKz74Z0XTkTC2XSGcOOt3uLAv5R/wLqP7UOmmsIcX57dX37EP9K500EmXg384HX5HeopZo+xyeu6jvFPW2OXMHyxQqD9oAyfoE738d/tb9BEG8frizDn6TKJ4BfOtF2iCr+CVq/vjST/8gtORthqjbd3erlsy2nlPzHPeg4rRm2iG/KOOz/iLUfODjj3W74N/dOoTZ+xRASxA3YvcZ/htL1p0XuYb1v6KmjJxD/X7etz+4Tqyn/NhfQ/bRwgaTvdM1MJWI6GywrEoWYtWnulxwXHrLiIHWN+eC7BTitYA+4ZFGgMUy2uwSXeRcGBxfEv/h/8amcdsJwa7SlU+t2tLdRAw+L+yr0HQ7Ws8no2euAZt0OaJeTd6YMq+1uOBz+O7jR6P/V18jQVirN2/IXv4xaxdf71dilJVrTeO7ZLt2CRtyANt9nfdxh/U4Hr7ak27EpGEebQnz5Ua7Tvm7p18jSy90C5qi6ncbONuu/xf0Zbs72KbTusP0rYe9OzYiBNgnn1G09yenGZdeI/W4aU2pEpMRsmc2ywlA/n0LIoeSgtsgCJOvow9ncFHBBMe0pyGr9Tidd/dIfJ/uDi22+iZM7eCzm5DOShfBDp/KJKP9EWOtbUMx/PHjH4jH4nADqMfLxEoxUxMHrNvas5ANgZ3HouwwpgVsT9rur7CO/gy+YXTnzMfZKhPpqTrMkzmZoeALxtYtTeSN80v0nYzzXDnF03sptfEbqE3btj3GAhEf+SL+TiCBMciDCb7s8Zsf+uwv2bsL8zwYzss1ruJ52cbR+syzfZNLty0ZdiJPVGk4E5EapOLdLubQTGjoBxrc/r6F/4Q8iOKW/gCbvXZ2kJ9Y3QzJxKssi6Rlgw3+7ORyDy8H0MMmvPHsOd8BA5SzJC2O40+c57Tfx46Yi5ws37X9djfYuyvQ6X9yajY1b2q1KTOyVRNq7tYW6Cac3hxnf/5URPMZdmjHGEOiRz5zvPPjwfmG4HzlqoFV2CCboPRzaCO4DimPLosm6Z+3grT5IpgGPNMZPay7iEZzA+Fo+d104rQqiuCEQuLRsMhVpNXadb8AM0JzKcZKkJPZvGIcl2c8vT8pKEQZx5STd8NE6DMwqEa0A0A6s1yJw11YrEYgUfEb4xrhp/tW8U849+QdGlAhJPInNxn8dkVLN8EURG/sUKLsw0uymuwgLRQgv89J6FLbgnO3V//Br+S5zmLwdjREmYw4lzKvgMUFm7gwk4JT32D5izsTyBkK74hBsSFkvSNceR1SBB45MKjEddWUGARmF5ME3XFs6I4gOWxBHJJuF6WnCd9Tq4zFxzbfwjnQnfwAp9dAGnq1rsgMPqgnI7MZd/NbJetPkUZ1BHqi2cz9JznsCdunBlBnj6FjGMKwRw5g7LhsGdOBnKbORmUi3+QcnNbnpVz/DkSnKND1HFIvgPi5MXwzZwyKGwURIP0XwzFRT3Xe2P0gk8hvWhfMS+4ftMgDUyYQyrqMXH30ky409SHh+kEYZTAmUSbI6rTOHkIR4/CUcfMhQN/zE5+G8dnmvexPaMlnPbMgs58rlHhnTmUS7vxK9UL2x+zeyBUM6tvewMjA90cJTUBLU7q50XpLx9wnCwHmLvlgKZQvwsmRu75zueEw/92F6Ty/cZzWz4+fmRygPTvPHzsrht7+CXPReAepxZ16Ti1DlDV44DWcN0R8rkXjkp3UUde5Lklte13f+Hwrl5hcNvnLv/4lucinIvTk2j7BziVCyFe2jMJy6uhqYI4lXJAYzRQUc+m0aiXjVa6h8dTmMn3u+wNy9fXbhwvzrwMjyzbuOqucSDfZ37IG5eSwT0PPvnA3gHYvH7U3lgsju++Hh4pjt89vmHD2od3Y/beB07et68mje58lLuIrn7kHpcgDPOaTFT96nSd4+59Xxra32LUg8EPSjdGsPcnFY2XeJLUeC8X4HLcBoRxbS0R8TI6MU9sKUuXX4VOPQSSpHQiGy3EtLorzJdVNWR8Q9Vm909K6wRNc6xINXf2VyBso5CPE7jf69VJfzMdx1ilY222tnz58loWssHgiPwJZVgypezwpQ2pBN+o6w1KpsFTKHapjRmQG3S9kaQSDb3F8cnJybEKCdI2GmJaQAvlm9uGCtFoYajt0o5QePWKFaulRrHj0g8tbOqoNftbDL8/0hzw+RpjDTGSsGKNPl+gOeL3Gy3+2EA+tvBD1c21DGnr3XLBZ3QV8nuDS3IFpEd7a0s0UB+zC+p5fQXQUA+ehgZV634kpBS8qSnHnckqZxTt3MpPPXrXOJm448u3r/l43Rfx5rO3kNR5qpljiVNY+DurPjVBxg9/4TCW/NSqj7m27Z5TzHf6r/w0+TkXRktiOXcD9Z1Orhgu5aNBtkcdZIx+NiKNbpiEUTZJLJqpxtPtFWpKWczHOJtRpSNYYn4qZmJdlEkd3jW6Z59lHsp6ASYinj3CNhCOPIsM7UxXTlSRuXjNQEBQonJQEwy/Kua6pjZfrkgozCIJz7xCYZ4nETH8sjK26e7De2WZyuSGBmPJGBkdNhqEEG8aAVnee5gcnnmYcq1nTf009vGsZtj/Mz/q542AN+D1xjIxr6QrXqzN+0fzq48keBNZZkCNr59cH1cDyENNPnn3mlu/W8QMw+fV9e6jXz7areu8xPsMzOw+7cpLvBwiTzF6Kk9TMpI/kYwfnBB/Ck51e+YJBpt0Ili3Z94J17u6f3cvTizUU7zGr+KoFrYM5/LIkto8GXAuh2U6jWtA1TFge4epnIxMsVKlygzb22a72jrQeB9qGpezuTm6NhXFOaoxWkXz3p4o9fDufWFytCVeqfZfdwSMRAiO/dlhv0lCQft+6owOTC1dcFgMCAVJIk+iClEQv2c/sv2ySzfC4kt7a8Nsw244Dp0vDI9OgqcSOzLpvtv/Nd+oSU0wc1TOHpawYkAgT7H7EvtRaB7dTrdG2d7oU+QQ4prjunFML+lo1FwdiCISBxqvUKDuyTIa/QxJRNssVpj2ZuaCBt0xRYTiQA4du3mKdW7fz25Tf/Yo6mwmIN8leJ+a/Nw2oLuI/zgXON/X9rsQTx5xgf9H+8ejk2TnCAWSbHP0tN+jvn8KpcEAwtgfM5x9MdnVheojTJUytC7q9n6VKss1sOjwBHHBplOlLHW+ui9N8lmP/a8o1N2YKJTs0Ok5tWnxcRQD1EsIinK8tQSVzElJI6T+ZvEmqoXYL6GqMO1Mmmk6gfDF0/a+xZs0xaNKPlnBanAH1haIIrhvNnF1XHaQbyO9GS4dusxiOk0WQpK+4JVAJZu+QqglOWig4CiiHJiDshMV66IMW0kdOoRf0d4BPpEIkSiyMRM1TMQVVwHiWiAhUVcF2LQY7rgIcnufAzl0/GFM63EE0zhveFxxaW6Y8tZSrsXyy4TuS1nJYJJuSeE4SLhWTOrebn1HujobV+gKBqvbUVydJ6YkDfOht14/g0KZSgW8wOOakqbPeDnTEXvrdbolOVJqzbSWTlcyaQQbja0rSP+OaVro4kvHTJmWJv/UnK+wvfqKe8tzqGlcwOdC7FYT14K4dXNVro95oj7KpQcSm1ctG6r19/ZUSp1tqUQ81hidG9vlR9xR9aZ/uTl3eMedL7MJSeMPTLRzKjCnfNXNo3Sqdn9AOk1P/93x439Xv8L9J06cPn4cHp+ePn3ixKn61iK93s9enZ6eDn0QSk5PT2eOHz+emZ45NX2eXjLHoWuaNTbNNgCzmDc9vWPOqz9GZsZb9/IPo56goKZA9YSWhpBHonpTtR422TrrV4lDK+pJkKOaVLVoMvs+Yjl7QafdIEnYbh9CY70Prer95gQc9TYdvIKyksTSBlX94k6SX5b0a/XAyPP2IcNYgMY37K9O/KfZumwTHHnpbmIEpJC86UA/aZhvaJzK+D/lN/zsLKCeyMU4y60BY8nQooFatZBtjjVEI4YmAKdSn2S63Hoh9okuzoVAA2PwPb3zzBZ3zQEcN8c2vxAuT4Nqwlju1Cm4k65QGmWgn7PjBw7w6+ytB2g0QoDFJASYM9CNSdBh0YEDdnxgeHjErUJfnx4ehvjIyMyp4WFyqF6NXu1X6vVoXMOwU8yJy9gtdPKX4ZiEENuPc89wv6ZxGT/820duv7a7IRLAAaJx3jT2jfJ+kY6URZ94Fg6HYyY7cYsyHSMcMRoDIdGtJOZnzTEZSLUhqvtmaUyjQ6BKFZUo+pJuqlVQsWKcD4WkhcLaQq2YNUn31YA6MpiuzOIrsDXklk6TWeb5qDKPNzZJV0SVzhHWAAUoOLduNsfqvmfVSvGiuvCmGzP+REdPB9CQCff+XUVcI3nDLYLgG/RI4kDElGTBNylpvrA1KPikcUHMKD55tahgQdlDC3qHNEkaCEclmacFwRc2B0WfuEKIBhWfhCVh6ypJi5EhECPNHq9H7uBhiG/W5FWrZK2ZLwVAyCvBYMwSyGISU/G1WzqvsNLCuwp7Ne+F0rDJiVb/cXMHaWvBJUrW4aUvn//n6xAYPWw1tUpeITgoFD1Sf5NPkVZL3qIgLPOLotLhjZo+UOR3ltSU/kZW0nOJUzIe8TWFvUSx/2VMVfz6Qp2QtqZWAE8J2gjBtF9Rx1Q14KM5cbWEkrbNghzN8gVU0o15Tq0czfKWck4lFSspFypho7OVlFlfk4bzdxJl6oqERM9JOOGXOElbL56buT84N5156ExOJ+D2fSYnY0ZsbpK+lftWkjV71kBMkSc1T7hNEv3jPlm+vKFRlYXAfsUbaLKukALSUlMQlTbNr2xDMauJk4putTpllcujjarCB/cjB/XHzHHRL48YgtCnq9uQs7ojt4/mBuKRpiJqgpFxEPt9yvJYQJOvU739ojQQF3UcMn+syQ9emZVtaEzMl72yMe4U9SsKKyoujmHRy1lBztlH4kPIk8dRd05I7j4S0+ALQPfYqSlDCcMUeWb/dFMKoJ0dJzSQF01bpEMZDSFGoCqNTULdkdIK//Mhr+S5tNQdiGWUvkr7yNGOprCmKILMQ3NLTO/yK4JmSIYhk4CSyMaBF0DP71oOIdEjyVo8nvDKgShZFPbmePKgv0uPJWKCxkeMpo6jI+2VmBUIJXR/qdTjldD+btPa4n4SDSieVGNKERUPb8Llu/JeIvIQb4uDEiCtHimsoQKjMJlP463CXCPK+fXcVdwu7s+4W7nIQOjAx/d+eNc1V24YqyabmAmGEyoOkXpIjRtNY6GSTLfWw0HGyJNBYBtulikbaZfbOAyr5MawIF+hUwl1aTqb2HY7jaTH+aVDWLIqjLypBZAr5Xh8oMSn+4zZNBoZVb47YMatmZBztOFNs+IffVmUvyo9f45G66yCx0PNycTKoKoA8Jmm5amPb15dVGS04ohYKSgiUjtr+BRFCnp9siaijii32L+Kdza3nVFlSnXUceWly1eBpLbH/IkAbNYH8k0KIbcEStGZW1iv/H68mYHsywH5q/JbT5L+uPXqW4/CMj0oNPkCQCJmyJc8QjdJJd3qaUSeBp0Lly8trImZireRB3Mot8H+lW+ZWYRfWUXBICZPNWuvYn867heV1gVdtRZZD8CFWNUL47OC6pi5jDMewgcbj3CEhqgiycvd1E7HZ1SwIt00+oFuY+b4NO88Y63u8vsQuC+3ce2IAHR/nZCRdRtyX8IxcZMrFq4g7k55tfgBKPZmnz0Ffo+uijoYgv0r+Ehf3288uteLOjl02S/5FMHr1T2/6XsPOixo/ZPoUI1QxbJG5G6DBpakaTJXdWihwywBMGnJ70OFxz6f7+VxhNFAEEh/+xezO3ZmH5h3KVoLSApe6st/Ibv9hvenwKG+vvWCRieKIPDr+/qOPtjXtw7XNYiSvI4m3bMpF/DuRg1sFdVLRod6S4Wsg7/0AeeB4y9sdk+mlcULz1QV6X5n+n1oMEWj5ajybN+ENsn99ae5bzXlA8yCH7t+LE1Zd8HGmbrwyGjwFOPNzn54H9LgOkqDq5YP9FcucfbEJcfZMXdP23qfdDiYDBpxQJrUALpR/KUlWWSOOtfYyAXTdZcdZVzdlLHT/Zj4H4TzsIsFGhgjtldRCLxEFMW+83yTID4lCfBzTamUWu0utCrKtNzjObXDPG52KLknkH7P2M8x2i1itPvDz/YWEpz5pdfQNINsXYTMS1yFPc78sjA0WCBhBsSVkRjEjSu1+t7Odnamw+IWoE7Qm/JwVCdgfmtEBfkuiniL+bMLQGPZ0inKaR2FPFtJofynYakLqTpQqkGCOid3P78Hxi/r8vsaVy+JtuRSmCb7/hZuvf1nd+Tyu/68KcMrqKAIhPcKPkM2ArJ/7Ra4/WcQ+NntZP/Ybctru+fFKsX56f4IL47ddvS2MfuVq49tFq7OyqJXBaKJflE3lVgsnC8emcCczcfYnsb1DI8syuaUs5c7C6zEYM1eDCs9Dgr8uVmgNBpFczFM47d9c8sdP7sdNjndKwJ4NSCKwM8F4LLbNvcgBA4tn2QwtHLLkJaXVVJOTPpcopXRRCsvJBUZmUzVoVnRcYwyPaCFZ6pX1o3eZC6zGpVy9MDq9pM7uopLV0eaiOSlgVI8D6if6MKSMdh+8vTJ7afHh0Sv0qQKosAjmZSmyOqlxa57b0wE1x8bXLIcfCMT8Mjlty1XL7FEeu5BEICXsJG4GA0F2vYsRtIvv+37i/fmdFNLenhRoshqIIjWJeooX+ws3T7ans/t41z71ME1gmttM9qnGy9LmyrHz5079ZkDJUS0GCdUp/wjdID3o4AhwZ2rP7cG+suVcNjfEG/Pr75n7dp7Vm//2iTZeXzne9OGVN6PLuNkf++WS+eviScKHi0kKb1bbtzWM7L8tgcOjsEfIdfMnj9Oqv++16XVdv4Uv4rzIn8eRFpVkoZPozHgYok5f1PUu1FsTWaDzhZIJCBSFkM3SOieWLkmuJFKNXBilCwjzsOMmuyCUG+bat9FTn+2sbRy58pSI3k033weleDzzflYoSsTIrddLyY6EuL2g2AmSvnNSldSVef1wl8+BvNi/T2pVE9/zD7zWHMeVee+fHO0OLHp9ismjgQ0D+qsqYhHCxyZGLtj45quOq9w8KBx921hTSLvxOFPgRv+/gPC+kGgc32G0OXKAOVpZPnU/1k/jl8/Ph/mmbcwm+Oz7vH4Cz6BoN81+v1g+E/o5n0HmBvgAHUlkJq9irkU4Al2tIETqE+Yn2bnNLy4DtjZvq54OIDdOr69Mv3Puk7CRWd207MnXeuOju6gI3lZbDb1VJ2mZ0bgzXVmwr6fHKqfcPVKBxLmzDkzzjYuB9oziQjcZFX8q/1RSM+vyVOnTyfMdfZNzjFdIRA8h2bROnqga51XOtcxANBlJqL66kDFnKohDiLzs/4EcaDnWi/latwIjSNbPNDfGwt7FcKJSMBqDiGK0MBYyUQeGo5c8LOhEmGxTeNcNp10PbDJYmUBC9g1eQvSZZBzzv6/AW8MrB4oQ0RVT6kh/MtsWmx3UU8svJSOq7zcpGg+LxN+lQy81FoSM0q0Om3fOU0+3D3dHegIrA789aLVi1oqcKTehP2t7U4Dg5tAF8JSDJmzK0ArmaUytqDA1MP2nQ9DoYRNBCYCHbNn9jq5DpQVbdHZWBW2A62jeLcMNEzQ2nV2FquVZN1/zJ/z2D+mkV4HqmvW1HpSBo1wDUqCIvHD8fVw+ICRUKHZA7/wa/YrHpxKUijeNbC+pyUrIFPxaqJu8A9d+eFlP5piHuJXPHPPEBa4doQnLTO70k+QUdJPA1CdvFQQ2VbDbMgOPROYQIvx3LAkI/MJKcjyeCPVU1uzpkphQCA9CAcFFA6vj//oyod8QbQevYpo8NmWnvUDXfGQhDB4UE+Ja3gx/FM/Wjb7LYVzfJkzuF5cQ90xn7uGWHyM0z2qgLJkWCJatPSAAA1vrFAj4aJCFpaijqGt7FCPA1Cw4z89Hn5zqDGmeAUPjwIhuiqzd0NEkRi9EJqAFfnZ9Zt+m6NHflzYgmEr9wNPzPPrxMTSpQETmaz/7Ma2DvmuuWU01fpz/86rGa/9PcqlA1yQS6EmrD3TlWtCYlK5lM3R/WP6RYgqlbYJevBUTkkR1O8qbAOyIiICQiJD3RmVDhCQwNOrb00deelI6tbVy34Iwg/tbwQ8S7cEzMBQlycA3/OM2b+z/8P+3ZjHMwYKZEEZ80DvbYt6F1PP6uLeRbftvuMOuAyLblni1UlI6xoKfCcc/uR9930ynDVuvY88eIvh0Pyv+cuZr7cZaW75ZOqXCTM/L6nU46gcZyDVMHEinndPxJLVhv262WfYH4nE882vNo9EYMoga+N5kh3ISF329+IR+/UIvoyMNJ9rzgMmPxJxZdJfCxm3zxLSaX6K9su/T78WfUmZJ1RKNCv9AcA5gyCYzUZjAKQI7X6k+QDLiLwfnM3sZSCI9fpoVtyBnq6X37O9uDSNNWNnyhzNvW7asOO0yEfdKD7qfLUi5HJmYbAjOwkzSHfbDH9GN6nXEh6JW/a32BcNYNBMwInr7iF3X894P5U8J5w+kdd7UbeTTmQsN5bOlStIMMazL4IhycQeP23q2MnKfSuhPLd/uIk61IOum7lvgowv2HkxDDtpbMWsXCM0tk5mci3qFaiOHsYOqH9ZfCfi7onhE9DMUHvpYpypqfbITtbh9EXdbbvnnm07425/v+P/nPwdF+CK2F+6Ua/vX+fSaPrS4Q+qYFaZJkfDO9PUhqw4G7du4AI7e8+HTP30FN0Rg0X4f39KlIks2rfYt2BVMS0QET4T6grfwcKDbxYJtNm/8Ztw+rQRQJmi2L+DzDwReBi0v4Vl54kBAcb8/t03UGvnx9tEvS7zt7G4wwLda0+bszI/ObvfOedjOhY9msvPUQmYCrDVCNg/ZkORTrMbhTntN+dsF2wZZhn0etq5mbr9nEk+toM97nB0AkY7cinqxX7GP8sxD+/Ck5urgxg6z84nzoLBYiVSsusGK7BjXHECd+rK7aquq7cr+pOBaLYxYsVpwjuaT8ZKS6NGm6zJ8gaFCOu+PH/9SOGzWBhtFHaFJfFSKhHSfF0+LQCGp7GwMuxPdWUCelEVlkoB5Z5U7xrO3dt24ogULokwN3gkNt5/NGbo0GyUUEfvH4wSOvi+UVSUB72MDb6G/Xax+IFF1aQmUBtiAdrQVdOS0nyZkiFCN0JZDCfl4CgacThlqex8SyObbq28KzedwmkqZ38ai7YsHr7ipz9dtGdNcWX/RsP7Gj1F8povhBbC6oG9E8UJrDq08h0ZjQ2J1BPaxIIsvPBEcWLvQO9EKeBV7xZVHgXtlOr1VwAAMxb2TdzRWvFjlqQIEiF3K15/GbTVjkx/nH+c/BDtavc7NzjPAlQ8VqlJE0CWJHfLue4aEOPLr7/+5cO7lk5cc8vJk+dPksNf//p+8gb54Rv242+sHe0/CdzJr+z/zncefa0un4WbcL6Ljo4bRIsGdfAI/aoNnU+dwHYF5RxbjODGtwo3/d87h/lzhjZkPyTp0sFzO2ApvQO/WFV8v8ZJNMKvf+t18vX/8moqLSMdfHUnFnFKmJpjwwgfZrEeFrcQx6rUbIUVZu+hUHCV/pxVLMmU4VJjABU+lBVZJ3DxYlvAYrYAPabLb039t44YGgEr4bCqJrpCvWStIP3fn+NS7xSkSQ+1Cww4uF2IF+IgLNne/BplAjf9/Y3MJOi9OgSOjcAfwPdv3SQSsSwFhHWh8LtNBW2k9ALmu35ChosXcck5Z/uXFLLxIBplgmvQlF2DRqXOAhaVNmuS5apJ/DPD1gdAkAwxpNBG+3d41do22r2m2AjkSy7Kq+DRjela6unO90N51hSCEDx2yQBQq+3MeYcGI9ffW/178heVD0iAufGyNC7c0Nh5FRq0S+1uOV2u0qhPunlDFXt65/9XJHJ21boNb02+sPWFJY0b1k2cjfS3EfPsobNmL4r8/sjZiXUbGpdg7nX2+nWrzkbyveYPD56NOPbFt1Efe4pT0fatcUPch6h9sWrZ4sFKKuyVHPsC2R3Vycx3KWRVIyLVdUwa6Qf1nSaL8ke6hyKzGKowpTg98Z1mm1M5dkQPKu1dPYCq2ybYPkdte6Hvtb6YqMlDasP47UWPZ81b9xaLLaLG656MB9TI2ss+L5z3mLmJ7++fd9M/LFl0Zbp8TcJz/RXp7QuoRnc3XHeRPvcxAa63119fVHOSJucz+y4P5kOHjmoVVZIMCUR7ZuzWGDQ0XhkOZ+Zv3j6q3Xb9loGFmS2lMPJd++1TfIX8jn0bRnna9KtU71sIwdZqNlStVC2KEYiySRC3HHODyM/usf/ftXuEvVvuEraMrBXgC2DQ5Oa7yTWYXLP7rj329wNrbobxfVsC2wIja8/DeUzaT+67xpikyY172PifQt70O8abQi5vsig3KgDduUbea1ElL1CBo4+9Ltz89a/fLSBjOnnL5NjSXYcfe+MN8rtzj7744v7HT9on+5evfQMm3uBce/j3QieTfS1cHnUHega7vTURC0vUHq46JiOLR6XeU1Qo2BHsctA5kg3drtSulsViqR1SRve51lKplVzFrLmZKa9ErmJftJiWNfL2ulLrW4cyFcAlpq5T1TtKrXAnLW7fhMVfmXNWG7wzb1aYolOphEL1uLX17Kx4jduFvGzLsvlhiWexFfS8LVrpNHAxXark8IZrn363hjhRRjRIGg0DZKrlUg5lNv0kW5YeLZ2NUJXdz7pkL/iR6VZWjTCRTjfoceZOOWFd5FBH7FQFUlVdNyxf3OfRo5rpNbRQSDb1mDdG9l62eAcJGFqzpoaiw01iBJKbx0Yqk0sWedlXNv7CuDQR83nNqBnrHG1ruqZ3zeynumAc9ejE7kS1BP7B0agvG9QDCTWsecG+n0iSIpF5V/oDar4tFMv5MgoUI8V5IaM96/X2tI+tb7SsfDNsjed9l+Xj+uByM5IZW9TdMzHrz1rHbIeF7JsG115WbmD0C8+hX5p57Sol9tU6SgxcxyicHRKKzrZokVEYF3q5mypIZsTxlRZ45v+7EOXlutabYTYSeJaA0ZDihWbNCJDKJcOX7Q345HkhTQmFVBP/BQw+7rMMXa9koASnYh3DE33XNOWWF2Jm2JR0rSl5qfEXlI7T3kUj23sXjm1OQkRsImvrRLRfDJe0lC8XC7Xl1YC/szBPEolXIGDfpxmhRCAOWV90dNBfqSClO5ouXYOcbPDyTCRU6Sr4Yu2X+fJx2NqcNxuisH4Z397j82TbjdA8TmG+ow3ut9EaZ7+mNEz3VJcu6u/p7sznUs1Rg8aUKGyjuUBQs0dRm6KfsjDB+Y4h+0Jg/Y2OsqpCY4Hom0o9Cx9y9Q+GRboGC6Q40PWr+teS/qoyUiHF5UWyNFNJkWyxzS70ruwh/WM4hANra2RwYgjmoyAiqXxqb2M2SmKp+JZkFxSGCoVP1z+TdBkuu9FSyf5RYyZTypA2+P482kQ/6RmcX6utr9XsXWYi0ZFI/CQUI9E2U0oxHnSS9/MKV6Hf53PP5TnOA+eUGHN2pCRqXVJBgNZmNp1iZ+Gd0xBOyDAaWP61i5b12GML9z85ACvFVECyv9KxZyXk4al0IVOAjP1NPRww9Z9KGb/40/TA/EtSsKR6+aK1VTg+8NX9C+2viIGUCKvaJz7Wbl9Bq6RhSDdT/p9I+P6nqUsKA9hEhXNi3yh/2890oDTbZRrmVnFXcTu4m7hD3BT3EPdF7gSNffvql6YffuDIXbffevOeXZPXbFwzPjpU6yl2ZBONhq4QPzubiSsCFX86uec85+Y8I6tIJ+kz/brOe5SxPsB76+I2369MmabpvhfMiaejTPu0WlbxN6IeUPE34qRIv2rHVRVeUe371YqKPzfjtEJTyrCbcm5nnCL2K859qn7DFmv4MPzWVfy5fPNbV9ElyU/H255ntW53rk7V773r1dF3PTtXiLBX7u8UK6Taqxy/qu1lH2l5E+dwfT/j9/x6csrdP9Seac80hb30u44X2ZJJx3isn62w3PTcT+/w64zAW790vpcTZDFl75maY1OaEBhh3mV2Bb2egwl3jx8v9NyAxiXQslxJZeuyvu5ko4fJVucrokDdltUUleJ+KoJQVyImDdHCl7kCyCmdZ6ptlX4A9cL7jBOEjsUrGa/znvR5xmFpxwisvAvyIyNLTVObAKnj4MGD88WJw5K0/ODqzs1LexJEnZAue/n0y6MSvpW3nH6b+7etsqRi2UlIQAekrhMnVnpCyDcCnpX3xmIxXZ/QZKm9i5TmSbI2cVTs7YFoKhPFt+LoSjK2XMS394pr15KNa0RadHI32bWdFmX60lN8BWkQYufQkhE/PYfWysJvUIGk205xQj+aR4UI/RIQlbns4ygG++JqxYoD+Zt4y7bHt0HvjYehd9PtI+N3P1L+t/0fevjGETKw676JhnCoq4hIrxxcYAUV4ePilq9s3bEx+a2bLrttUz8ZuuEjd9AvAK1+YPdSHgrB9j0Dqz41gdInqJj0bAeF7xTqFR4uwJn026DBgPNtUJUGLbPTG93hJNVXk0F6jOMJ6Op78EMfe/5GYd+3/mwSvjq4YKNNT2bA1fZLCwbB+fjAqrUP9sE+eGL38++w/1D+Pq3Jc+0/bDYMjq23/vBbm8/DIteu68MpPwiL7Oc41+fvtEFjeH3sO6aok4dDft2jigJQnRyC6SD7cxrGp1aa2joFWw+TF7AD8k9TNLXJfgWnUnzmFOmfOcD6wqW1Cp44PXOAHJr1J3+UpxwzjvDGGpgvqdV0FD2grpka3V6PAz1654ckX05H+ImWbN/Mgb62BDRkWHg/xFnwe+a+e+HTXxzOF5fCyCXw7FlHCTjb+gbAr39d/3bW37BvqPKcwcW4DMrVEo0DKHV1tGUSsWhAYd/OoodBW2cP37pHDlotP3TCQmgB5w7WxXdy9Fj/MShrM91aXPuwppEX8b5Lm0HpHwxWq8F/u+GGVPKGG5JkHiaC+NJ+nObgH9G/2H9s0q/NFDWsGKc18b4hQGsFqp9htVI32HdgooovoeDm/P8+lD6gAAB4nGNgZGBgAOKWaQEt8fw2Xxm4mV8ARRgu9H/KgNAnLP7//J/Jsp85GMjlYGACiQIAfu4OIQAAAHicY2BkYGAO+p/FEMXKysDw/wPLfgagCAooBQB3kwVMeJxjfsHAwAzCggwMLPpAegEQG0JpdAxUx8oKpCOhel6gysFpQaiaBUjqIiHmM36B8JmsIZgxFYLBYqeQ6AVQMyLR2Eh2M65BklsAMQ/OboLKC0LYcHOQMdRNYDlBNDtgYi+wY7CbF+CQh5oLtncBggbpAbsRyGaRA9JA97GUITBcvwlUTh/JLdlIcRQJVQ8NC7h+qL8AZ8pA9AAAAAAAAADSARIBqAG+AdwB+AIIAjYCngMEA6oEIASGBRAFggX8BnYGzAc6B6AHygggCNQJMgoODOINEg1MDcAN4A4ADh4OPg5qDpYOwg7uDyYPXg+UD8wQMBCCENIRNBFqEaISDBJOEqATKBNyFBoUaBSOFQQVVhW8FiAWiBc8F44YBhlmGgYaghtSG9YcUhzUHXAd1B4WHowfIh+GH9YgDiBwIOohMiF4IdgiMiJsIsojBCNCI3oj0CQYJHIkriUcJUglhCXqJmomoCcuJ2onlifqKIopLCmsKgYq9CtEK8YsFixILGosoCzYLUAAAQAAAHUB+AAPAAAAAAACAAAAEABzAAAANAtwAAAAAHicdZLLTsJAGIXPcDNCdKGJGzez0UBMyiW4YYUhwsKFCQs2rgqUtqR0yHQg4QV8Bx/A1/JZPJ2OggvbzPQ757/MP0kBXOELAsXzyFWwQJWq4BLOMHBcpv/kuEIeO66igRfHNaqZ4zoe8Oa4gWu8s4OonFOt8eFYoC7Kjku4FBeOy/RvHVfId46ruBFtxzX6z47rmIlXxw3ci8+R2h50HEZGNkct2et0+3J+kIpWnPqJ9HcmUjqTQ7lSqQmSRHkLtYlzMQ3CXeJry3abBTqLVSq7XsfqSZAG2jfBMu+Y7cOeMSu50mojx66X3Gq1DhbGi4zZDtrt0zMwgsIWB2jECBHBQKJJt8VvDx100SfNmSGZWWTFSOEjoeNjx4rIRjLqIdeKKqUbMCMhe1hw37DqJzJlLGRlwnp94h9pxoy8Y2y15BQeZznGJ4ynNse3Jy1/Z8ywZ+8eXcPsfBptT5f8Qf7OJXnvPLams6Dv2dsbugO0+f5zj298FHkBAAAAeJxtU2WX5DYQnNoxzsLlwsycOMzMzMyJLLdtZQSOYOd2f30kjzfJh/g9S9X9mqu1Oljtv83q/7+wWuEAa2TIUaBEhRobHOIIxzjBJVyFy7ga1+BaXIfrcQNuxE24GbfgVtyG23EH7sRduBv34F7ch/vxAB7EQ3gYj+BRNHgMj+MJPImn8DSewbN4Ds/jBbyIl/AyXsGreA2v4w28ibfwNt7Bu3gP7+MDfIiP8DE+waf4DJ/jC3yJr/A1vsG3+A7f4wf8iJ/wM37Br/gNv+MPMLTg6EDoMWCEwJ/YQkJBw2DCX7Bw8Ah1x9zYGma7LDiyeTrcgdkWnGlOMptkcLkSOrij3siObENq8mdVZ3ZaGtYVYUrXehA+56ElV3XMs5Y5ygcWBiqd8KTYdOSM9Y1mipownfwrpDi1ooFNo9G0bsOQe+a2ruiF9GTXpu+z1phtPjHnqXJcuOjs8kGalnIuTejyXsYeqpZZPjLr59KaTthYWroqSb1PoLZiGPdoNjET6c1el2AZzdNdz/YJpQCtGBa/iPahEpgDRHDJkhPn1PRByoZJf/gf+WjBTjEpM2VO6fKiGY0V50Z7Ji/8T8l6wZksz41RjdB5Kw3fVrNkgq9lKqENsk0t8219amSYR3m4oFTQZsFpZip4WivBS9KdF4pq5+NsEjqJaaKSXTB5IRY7S5qPpZMi0uyquAingpMrF5DPDFWRF2qmrq9nsDO228yIrsR1iXPhjacrPvc2cnLMjVKk/T5TuUhZpMlv0rHXZy1JWaUjTfCYeR+NhNFJyicrogd1wpe9sbu4p7mlSZ7V8xlN5JrOaO3ZkMXfHafpzOQl7/ofKUsoG42iTOjeZCPJqXCUVqaK6zNNQg+FpZ3Q3WbeokaK2OxcVBznyQVYKo6vYihj3qTaRAr5SF2QdMB3MYfztR+Dal2iZ0GJntLFLJpsETtkMe+WzvYPLw4lZDvRi7gkRtf7/JOgpRJmiS3KuONFS2wbH6pig+Cr1d/5qHSseJxj8N7BcCIoYiMjY1/kBsadHAwcDMkFGxlYnTYyMGhBaA4UeicDAwMnMouZwWWjCmNHYMQGh46IjcwpLhvVQLxdHA0MjCwOHckhESAlkUCwkYFHawfj/9YNLL0bmRhcAAfTIrgAAAA=') format('woff'),
-       url('data:application/octet-stream;base64,AAEAAAAOAIAAAwBgT1MvMj4pSXoAAADsAAAAVmNtYXDQhBm3AAABRAAAAUpjdnQgAAAAAAAAZ8wAAAAKZnBnbYiQkFkAAGfYAAALcGdhc3AAAAAQAABnxAAAAAhnbHlmSAaBEgAAApAAAFqAaGVhZAT2/kEAAF0QAAAANmhoZWEIbgTVAABdSAAAACRobXR4lZ0AAAAAXWwAAAHUbG9jYTVBTRQAAF9AAAAA7G1heHABLA16AABgLAAAACBuYW1lxBR9+AAAYEwAAAKpcG9zdOVsheAAAGL4AAAEzHByZXDdawOFAABzSAAAAHsAAQN3AZAABQAIAnoCvAAAAIwCegK8AAAB4AAxAQIAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABA6ADocwNS/2oAWgNTAJcAAAABAAAAAAAAAAAAAwAAAAMAAAAcAAEAAAAAAEQAAwABAAAAHAAEACgAAAAGAAQAAQACAADoc///AAAAAOgA//8AABgBAAEAAAAAAAAAAAEGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAA//kD6AMLAA8AHwAvAD8ATwBfAG8AfwCPABdAFIuDfHNrY1tUTEM7MyskHBMLBAktKyUVFAYHIyImJzU0NhczMhYRFRQGJyMiJic1NDY3MzIWARUUBgcjIiYnNTQ2FzMyFgEVFAYrASImJzU0NjsBMhYBFRQGJyMiJic1NDY3MzIWARUUBgcjIiY9ATQ2FzMyFgEVFAYrASImJzU0NjsBMhYBFRQGJyMiJj0BNDY3MzIWExUUBisBIiY9ATQ2OwEyFgEeIBayFx4BIBayFiAgFrIXHgEgFrIWIAFlIBayFx4BIBayFx7+nCAWshceASAWshYgAWUgFrIXHgEgFrIXHgFmIBayFiAgFrIXHv6cIBayFx4BIBayFx4BZiAWshYgIBayFx4BIBayFiAgFrIXHppsFh4BIBVsFiABHgEGaxYgAR4XaxceASD+zWwWHgEgFWwWIAEeAiRrFiAgFmsWICD+zGsWIAEeF2sXHgEg/s1sFh4BIBVsFiABHgIkaxYgIBZrFiAg/sxrFiABHhdrFx4BIAEIaxYgIBZrFiAgAAAAAgAA/7EDEwMMAB8AKAAItSYiDgICLSslFAYjISImNTQ+BRcyHgIyPgIzMh4FAxQGIiY+AR4BAxJSQ/4YQ1IEDBIeJjohBSYsTEpKMCIHIjgoHBQKBrR+sIAEeLh2QkNOTkMeOEI2OCIaAhgeGBgeGBYmNDo+PAHWWH5+sIACfAAG////agQvA1IAEQAyADsARABWAF8AEUAOXVlUR0M+OTUgFAcCBi0rAQYHIyImNzQzMh4BNzI3BhUUARQGIyEiJic0PgUzMh4CPgE/ATY3Mh4EFwEUBiImNDYyFgEUBi4BPgIWBRQGJyMmJzY1NCcWMzI+ARcyJxQGIiY0NjIWAUtaOkstQAFFBCpCISYlAwKDUkP+GERQAQQMECAmOiEGJC5IUEYZKRAHIzgmIBAOAf3GVHZUVHZUAYl+sIACfLR6AUM+Lks5Wi0DJSUhRCgERUdUdlRUdlQBXgNELCzFFhoBDRUQTv5bQk5OQh44Qjg0JhYYHBoCFhAaCgIWJjQ4QhwCjztUVHZUVP7vWX4CerZ4BoTTKy4BRANBThAVDRgYAY87VFR2VFQAAAABAAD/9gOPAsYABQAGswQAAS0rBQE3FwEXAWD+sp6wAZCfCgFNoK4BkaAAAAEAAP/XAx8C5QALAAazBwEBLSslBycHJzcnNxc3FwcDH5zq65zq6pzr6pzqdJ3r653q6p3r653qAAAAAAEAAP+fA48DHQALAAazCQMBLSsBFSERIxEhNSERMxEDj/6x3/6xAU/fAc7f/rABUN8BT/6xAAAAAQAAAAADjwHOAAMABrMBAAEtKzc1IRUSA33v398AAAADAAD/nwOPAx0ACwARABUACrcTEg0MCgQDLSsBIREUBiMhIiY1ESEFFSE1ITUBESERAdABv0Iu/WMuQgG+/rICnf5CAb79YwKt/WMvQkIvAw1w33Bv/WMBT/6xAAQAAP/5A6EDUgAIABEAJwA/AA1ACjgsHRYPDAYDBC0rJTQuAQYeAT4BNzQuAQ4BFj4BNxUUBgchIiYnNTQ2MyEXFjI/ASEyFgMWDwEGIi8BJjc2OwE1NDY3MzIWBxUzMgLKFB4WAhIiEJEUIBICFhwYRiAW/MsXHgEgFgEDSyFWIUwBAxYgtgoS+goeCvoRCQoXjxYOjw4WAY8YZA8UAhgaGAIUDw8UAhgaGAIUjLMWHgEgFbMWIEwgIEwgASgXEfoKCvoRFxX6DxQBFg76AAAEAAD/sQOhAy4ACAARACkAQAANQAo8MR0VDwsGAgQtKyU0Jg4BHgEyNjc0Jg4CFjI2NxUUBiMhIiYnNTQ2FzMeATsBMjY3MzIWAwYrARUUBgcjIiYnNSMiJj8BNjIfARYCyhQeFgISIhCRFCASAhYcGEYgFvzLFx4BIBbuDDYjjyI2De4WILYJGI8UD48PFAGPFxMR+goeCvoSHQ4WAhIgFBQQDhYCEiAUFI2zFiAgFrMWIAEfKCgfHgFSFvoPFAEWDvosEfoKCvoRAAAGAAD/agPCA1IABgAPADsARwBrAHQAEUAOc25eSkI8NyQNCgQBBi0rJTQjIhQzMgM0JiciFRQzMhMVBgcWFRQGBw4BFRQeBRcUIyIuAjU0NzUmNTQ3NS4BJzQ2FzIXMhMjNjURNCczBhURFCUVBiMiLgM9ATM1IyInIgc1MzU0JzMGFTMVIiYrARUUMzIBFAYuAj4BFgFMXFhgVCEiIEVFQpYUGAlSRRYWGiYyLioWAssmRD4kZiYjKDQBak42Ljb1fAICfAMBUig5IzIcEAQBCwcDDBU2BH8DXwggCC8wIv7aLEAsASxCKgU4cwHgIywBUUsBAXAHBhgXRmQNBRQXERYOChQWMB+qDiA8KVwhAxYwPQ8DDV4tTmgBGv4vGTEBVDUTEzP+qjFjbhYYHjosJMQCAQNqKh4UF0VqAsxJAiMgMgEwQjABMgAAAAcAAP9qBL8DUgADAAcACwAPABMAFwBCABNAEDceFhQSEA4MCggGBAIABy0rBTc1Byc3JwcBNzUHJzcnByc3NQcnNycHARUUBg8BBiIvASYiDwEGIi8BLgEnNTQ2PwE1NDY/ATYyHwEeAR0BFx4BBwFl1tYk4uLhA0HW1iTh4eIY1tYk9vb2A1UUE/oOJA76AwID+g4kDfoTFAEYFPIYE/oNHg36FBjyFBgBPWuwXD9gYWH+omuwXD9gYWFDXJVcP2lqav526RQiCX0ICH0BAX0ICH0JIhTpFSQIaN8WIgprBgZrCSQV32gJIhcABAAA/2oDWwNSAA4AHQAsAD0ADUAKNS0mIRYSCAMELSsBMjY3FRQOAi4BJzUeARMyNjcVFA4BIi4BJzUeATcyNjcVFA4CLgEnNR4BEzIeAQcVFA4BIi4BJzU0PgEBrYTmQnLI5MpuA0LmhYTmQnLI5MpuA0LmhYTmQnLI5MpuA0LmhXTEdgJyyOTKbgN0xAGlMC9fJkImAio+KF8vMP5UMC9fJ0ImJkInXy8w1jAvXyZCJgIqPihfLzACgyZCJ0cnQiYmQidHJ0ImAAAABwAA/7ED6ALDAAgAEQAjACwANQA+AFAAE0AQTEI9ODQvKyYfFhALBwIHLSs3NCYiBh4CNhM0JiIOAR4BNhc3Ni4BBg8BDgEHBh4BNjc2JiU0JiIOAR4BNgE0JiIOAR4BNhc0JiIOAR4BNhcUBwYjISInJjU0PgIyHgLWKjosAig+Jm0oPiYELjYw6zkDEBocAzghNggLLFhKDQkaAVYqPCgCLDgu/pgoPiYELjYw9ig+JgQuNjCvTwoU/PIUCk9QhLzIvIRQzx4qKjwoAiwBFh4qKjwoAizw1Q4aBgwQ1QMsIStMGC4rIUAlHioqPCgCLAGBHioqPCgCLE8eKio8KAIs3pF8ERF7kma4iE5OiLgAAAAAAQAA/7ED6AMLAFUABrNCAwEtKyUVFAYrASImPQE0NhczNSEVMzIWFxUUBisBIiYnNTQ2FzM1IRUzMhYdARQGKwEiJic1NDYXMzU0NhchNSMiJic1NDY7ATIWFxUUBicjFSEyFgcVMzIWA+ggFrIWICAWNf7jNRceASAWshceASAWNf7jNRYgIBayFx4BIBY1Kh4BHTUXHgEgFrIXHgEgFjUBHR0sATUXHpqzFiAgFrMWIAFrax4XsxYgIBazFiABa2seF7MWICAWsxYgAWsdLAFrHhezFiAgFrMWIAFrKh5rHgAABAAA/2oDnwNSAAoAIgA+AE4ADUAKTEAyJBkPBQAELSsBMy8BJjUjDwEGBwEUDwEGIi8BJjY7ARE0NjsBMhYVETMyFgUVITUTNj8BNSMGKwEVIzUhFQMGDwEVNzY7ATUTFSM1MycjBzMVIzUzEzMTApliKAYCAgIBAQT+2gayBQ4HsggIDWsKCGsICmsICgHS/rrOBwUGCAYKgkMBPc4ECAYIBQuLdaEqGogaKqAngFqBAm56GgkCCwoKBv1GBgeyBQWzCRUDAAgKCgj9AApKgjIBJwoGBQECQIAy/tgECgcBAQJCAfU8PFBQPDwBcf6PAAAAAAQAAP9qA58DUgAKACIAMgBPAA1ACkQ0MCQZDwUABC0rJTMvASY1Iw8BBgcFFA8BBiIvASY2OwERNDY7ATIWFREzMhYFFSM1MycjBzMVIzUzEzMTAxUhNRM2PwE1BwYnBisBFSM1IRUDDwEVNzY7ATUCmWIoBgICAgEBBP7aBrIFDgeyCAgNawoIawgKawgKAgShKhqIGiqgJ4BagQv+us4HBQYEAwEGCoJDAT3ODAYIBQuLM3oaCQILCgkHfwYHsgUFswkVAwAICgoI/QAKkTs7UFA7OwFy/o4CgoIzAScKBQUCAQEBAkCAMv7ZDwYBAQFCAAAC////rAPoAwsALgA0AAi1MC8rFwItKwEyFhQGBxUUBgcmJw4BFhcOAR4CFw4BJicuBDY3IyImNzU0NjMhMiUyFhcDEQYHFRYDoR0qKh0sHOncICYEFAsEDBgeFBFcYBkEGgoOBAgIRCQ2ATQlAQzzAQEdKgFI3NDSAe0qPCgB1h0qAcISCjQ+FBMkHCIWESAcDhgNSCJCLkAeNCVrJTTXLBz92QIUqBeXFwAAAgAA/8MDjwMuAEEARwAItUVCMgoCLSsBFAYnIxQHFxYUBiIvAQcOAyMRIxEiLgIvAQcGIyImND8BJjUjIi4BNjczNScmNDYyHwEhNzYyFgYPARUzMhYBITQ2MhYDjxYOfSV0ChQeC24IBSYiOhlHHTgqHgoIZgsQDRYIcSB9DxQCGA19YQsWHAthAddgCxwYBAhhfQ8U/vX+m2iUagE6DhYBYEJ1CxwWC24HBBgSDgH0/gwOGBQICHQMEx4Lfz9aFB4UAaRhCh4UCmFhChQeCmGkFgE0SmhoAAAAAAYAAP/5A+gDCwADAAcACwAbACsAOwARQA43MCgfFxAKCAYEAgAGLSslITUhJyE1ISUzNSMBFRQGByEiJic1NDYXITIWExUUBichIiYnNTQ2NyEyFhMVFAYHISImJzU0NjMhMhYCOwFm/prWAjz9xAFl19cBHhYO/GAPFAEWDgOgDxQBFg78YA8UARYOA6APFAEWDvxgDxQBFg4DoA8UQEjWR9dH/eiODxQBFg6ODxYBFAEOjw4WARQPjw8UARYBEI8PFAEWDo8OFhYAAAH/+f+xAxgCwwAUAAazEQcBLSsBFgcBERQHBiMiLwEmNREBJjYzITIDDwkR/u0WBwcPCo8K/u0SExgCyhcCrRcQ/u3+YhcKAwuPCg8BDwETEC0AAAL//f+xA1kDUgAoADQACLUyLA0EAi0rARQOAiIuAjc0Njc2FhcWBgcOARUUHgIyPgI3NCYnLgE+ARceAQERFAYiJjcRNDYyFgNZRHKgrKJuSgNaURg8EBIIGDY8LFBmeGRUJgM8NhgIIzwXUVr+myo6LAEqPCgBXleedEREdJ5XZrI+EggYFzwRKXhDOmpMLi5MajpEdioSOjAIEj20AUj+mh0qKh0BZh0qKgAD//n/sQOpAwsAUQBhAHEACrdsZV1VNwYDLSsBFgcDDgEHISImJyY/ATY3NCY1Nj8BPgE3NiY2PwE+ATc2Jjc2PwE+ATc0Jj4BPwI+AT8BPgIXFTYzITIWBwMOAQchIgYXFjMhMjY3EzYnFgUGFhchMjY/ATYmJyEiBg8BBhYXITI2PwE2JgchIgYHA5MWDJoKQCX9/StQDw4NAQECBAEEEg0YBQIEBAcKDBYDAQQCAgoNChoDBAIIBgoJBQYGCwUUFBAVBwGpKSwMmBQoNP4bDwwFDkMCAxAeBKgEARX9ugIGCAFTCA4CDAIIB/6tBw4COgMIBwFTBw4DCwMIB/6tCAwEAkcgKP4HJDABPCwlIg8NBwUOBAYGGhU8FQYWCwkNFD4UBRgEBwoNDkIVBBQJDAcLEQoUChIICgIEAQVAKP4GQiYBEQ8nEg4CJg0TCBEHCgEMBiQHCgEMBrMHCgEMBiQHDAEKCAAEAAD/agPoA1IACAAYABsAOAANQAotIBsZFA0HAAQtKwUhESMiJjc1Izc1NCYnISIGFxUUFjchMjYTMycFERQGByEiJic1ISImJxE0NjchMhYHFRYfAR4BFQGtAfTpFiAB1o4KB/53BwwBCggBiQcKj6enAR4gFv3pFx4B/tEXHgEgFgJfFiABDAjkEBZPAWYeF+ihJAcKAQwGJAcMAQr+kafu/okXHgEgFlkgFQLuFx4BIBa3BwjkEDQYAAf/+v+xA+oCwwAIAEoAWABmAHMAgACGABNAEIOBgHdtaGRdVk84GwQABy0rATIWDgEuAjYXBRYGDwEGIiclBwYjFgcOAQcGIyInJjc+ATc2MzIXNj8BJyYnBiMiJy4BJyY2NzYzMhceARcWBx8BJTYyHwEeAQcFNiYnJiMiBwYWFxYzMgM+AScmIyIHDgEXFjMyExc1ND8BJwcGDwEGIx8BAScFFQcfAhYfAQU3JQcGBwIYDhYCEiASBBqzARsQBRFHBxMH/n8+BAMIAgQ2L0pQTDAzBwQ2LkpRLiYFCERECAUmLlFKLjYEAxYZL01QSi44AwIIBz4BgQcTB0cRBRD9aRocLTQ3KhUaHC0zOCkZLRwaFik4My0cGhUqN5c2EggsDwEECQEBeDYBmkf+U1kFBAYEAg8B4kf+3mMBBgFeFhwWAhIgEiLeCygIJAQE2CUCHBorUB0vLC9FKlAdLxIIBSgpBQcRLx1QKiE8FiwvHU4sGxsDJdgFBCQJJwxNGEocIRQYSB4h/nUcShcUIRxKFxQBdyEHFAsEGg4CBAkBghIBQSTwQDUFAwcFAQ+yI+RNAgIAAAAAA//9/7EDWQMLAAwBuwH3ABK/Ad4BvAEyAJgABgAAAAMALSsBMh4BFA4BIi4CPgEBDgEHMj4BNT4BNzYXJj4CPwEGJjUUBzQmBjUuBC8BJiIOARUmIhQOASIHNicmBzY0JzMuAicuAQYUHwEWBh4BBwYPAQYWFxYUBiIPAQYmJyYnJgcmJyYHMiYHPgEjNj8BNicWNzY/ATYyFjMWNCcyJyYnJgcGFyIPAQYvASYnIgc2JiM2JyYiDwEGHgEyFxYHIgYiBhYHLgEnFi8BIgYiJyY3NBcnBgcyPwE2NTYXNxcmBwYHFgcnLgEnIgcGBx4CFDcWBzIXFhcWBycmBhYzIg8BBh8BBhY3Bh8DHgIXBhYHIgY1HgIUFjc2Jy4CNTMyHwEGHgIzHgEHMh4EHwMWMj8BNhYXFjciHwEeARUeARc2NQYWMzY1Bi8BJjQmNhcyNi4CJwYmJxQGFSM2ND8BNi8BJgciBw4DJicuATQ/ATYnNj8BNjsBMjYmLwEWNhcWNycmNxY3HgIfARY2NxYXHgE+ASY1JzUuATY3NDY/ATYnMjcnJiI3Nic+ATMWNzYnPgE3FjYmPgEXNzYjFjc2JzYmJzYyNTYnJgM2NyYiLwE2Ji8BJi8BJg8BIg8BFSYnIi8BJgYHBg8BJjYmBg8BBjYGFQ4BFS4BNx4BFxYHBgcGFxQGFgGtdMZycsboyG4GerwBEgEIAwECBAMRFRMKAQwEDAMBBwYEBAoFBgQBCAEGAQQEBAIEBgEGAggJBQQFBQMBCAwBBRwHAgIBCAEOAQIHCQMEBAEEAgMBBwoCBAUNBAIUDhMECAYBAgECBQkCARMJAgQGBQYKAwgEBwUDAgYJBAYBBQkEBQMDAgUEAQ4HCw8EEAMDAQgECAEIAwEIBAQEAwMEAgQSBQMMDAEDAwIMGRsDAwgFEwUDCwQNCwEEAgYECAQJBFEyBAUCBgUDARgKAQIHBQQDBAQEAQIBAQECCgcHEgQHCQQDCAQCDgEBAgIOAgQCAg8IAwQDAgMFAQQKCgEECAQFDAcCAwgDCQcWBgYFCAgQBBQKAQIEAgYDDgMEAQoFCBEKAgICAgEFAgQBCgIDDAMCCAECCAMBAwIHCwQBAgIIFAMICgECAQQCAwUCAQIBBAECAgQYAwkDAQEBAw0CDgQCAwEEAwUCBggEAgIBCAQEBwgFBwwEBAICAgYBBQQDAgMFBwQDAhIBBAICBQwCCQICCggFCQIIBAIKCQ0JaXJRAQwBDQEEAxUBAwUCAwICAQUMCAMEBQEKAQMBAQQIBAoBBwYCCgIEAQwBAQICBAsPAQIJCgEDC3TE6sR0dMTqxHT+3QEIAgYGAQQIAwULAQwCAgQMAQoHAgMEAgQBAgYMBQYDCgEGBAEBAgICAQMDAgEDCAQCBgIDAwQFBAYHBAYICgcEBQYFDAMBAgQCAQMMCQ4DBAUHCAUDEQIDDgcGDAMBAwkCBwoDBgEOBAoEAQIFAgIGCgQHBwcBCQUIBwgDAgcDAgQCBgIEBQoDAw4CBQEBAgUEBwIBCggPAQMCAgcEAw4DAgQDBwMGBAQBAS1PBAEIBAMEBg8KAgYEBQQFDgkUCwIBBhoCARcFBAYDBRQDAxAFAgEECAUIBAELFw4FDAICBAQMCA4EDgEKCxQHCAEFAw0CAQIBEgMKBAQJBQYCAwoDAgMFDAIQCRMDAwQEBgIECgcOAQUCBAEEAgIQBQ8FAgUDAgsCCAQEAgIEGA4JDgUJAQQGAQIDAQEBBAMGBwYFAg8KAQQBAgMBAgMIBRcEAggIAwQPAgoKBQECAwQLCQUCAgICBgIKBwYFBAQEAwEECgQGAQcCAQcGBQMEAQEBBQQC/g0VVQICBQQGAg8BAQIBAgEBAwIKAwMEAQIDAgYHAw4GAgEFBAIIAQIIAwMCAgUcCBEJDgkMAgQQBwAB////+QQwAwsAGwAGsw4DAS0rJRQGByEiJjc0NjcmNTQ2MzIWFzYzMhYVFAceAQQvfFr9oWeUAVBAAah2WI4iJzY7VBdIXs9ZfAGSaEp6Hg8JdqhkTiNUOyojEXQAAAAB//7/agH4AwsAIAAGsxQEAS0rARYHAQYjJy4BNxMHBiMiJyY3Ez4BOwEyFhUUBwM3NjMyAe4KBv7SBxAICQoCbuICBQoHCgNwAg4ItwsOAmDdBQILAhYLDf16DgEDEAgBwzgBBwgNAc0ICg4KBAb+/jYCAAUAAP+xA+gDCwAPAB8ALwA/AE8AD0AMS0M7MysjGxMLAwUtKzcVFAYrASImPQE0NjsBMhY3FRQGKwEiJj0BNDY7ATIWNxEUBisBIiY1ETQ2OwEyFjcRFAYrASImNRE0NjsBMhYTERQGKwEiJjURNDY7ATIWjwoIawgKCghrCArWCghrCAoKCGsICtYKB2wHCgoHbAcK1woIawgKCghrCArWCghrCAoKCGsICi5rCAoKCGsICgpAswgKCgizCAoKh/6+CAoKCAFCCAoKzv3oCAoKCAIYCAoKARb8yggKCggDNggKCgAAAAABAAAAAAI8Ae0ADgAGswoEAS0rARQPAQYiLwEmNDYzITIWAjsK+gscC/oLFg4B9A4WAckOC/oLC/oLHBYWAAAAAf//AAACOwHJAA4ABrMKAgEtKyUUBichIi4BPwE2Mh8BFgI7FA/+DA8UAgz6Ch4K+gqrDhYBFB4L+goK+gsAAAEAAAAAAWcCfAANAAazCwMBLSsBERQGIi8BJjQ/ATYyFgFlFCAJ+goK+gscGAJY/gwOFgv6CxwL+gsWAAEAAAAAAUECfQAOAAazCwQBLSsBFA8BBiImNRE0PgEfARYBQQr6CxwWFhwL+goBXg4L+gsWDgH0DxQCDPoKAAABAAD/5wO2AikAFAAGswoCAS0rCQEGIicBJjQ/ATYyFwkBNjIfARYUA6v+YgoeCv5iCwtcCx4KASgBKAscDFwLAY/+YwsLAZ0LHgpcCwv+2AEoCwtcCxwAAQAA/8ACdANDABQABrMPAgEtKwkBBiIvASY0NwkBJjQ/ATYyFwEWFAJq/mILHAxcCwsBKP7YCwtcCx4KAZ4KAWn+YQoKXQscCwEpASgLHAtdCgr+YgscAAEAAAAAA7YCRgAUAAazDwIBLSslBwYiJwkBBiIvASY0NwE2MhcBFhQDq1wLHgr+2P7YCxwMXAsLAZ4LHAsBngtrXAoKASn+1woKXAseCgGeCgr+YgscAAABAAD/wAKYA0MAFAAGsw8HAS0rCQIWFA8BBiInASY0NwE2Mh8BFhQCjf7YASgLC1wLHAv+YgsLAZ4KHgpcCwKq/tj+1woeCl0KCgGfCh4KAZ4KCl0KHgAAAQAA/7EDgwLnAB4ABrMaCwEtKwEUDwEGIi8BERQGByMiJjURBwYiLwEmNDcBNjIXARYDgxUqFTsVpCgfRx4qpBQ8FCoVFQFrFDwVAWsVATQcFioVFaT+dx0kASYcAYmkFRUqFTsVAWsVFf6VFgAAAAEAAP+IAzUC7QAeAAazGgQBLSsBFAcBBiIvASY0PwEhIiY9ATQ2FyEnJjQ/ATYyFwEWAzUU/pUWOhUqFhaj/ncdJCQdAYmjFhYqFToWAWsUAToeFP6UFBQqFTwVoyoeRx4qAaQVPBQqFRX+lRQAAAABAAD/iANZAu0AHQAGsxMLAS0rARUUBiMhFxYUDwEGIicBJjQ3ATYyHwEWFA8BITIWA1kkHf53pBUVKhU7Ff6UFBQBbBU6FioVFaQBiR0kAV5HHiqkFDwUKxQUAWwVOhYBaxUVKhU6FqQoAAABAAD/zwODAwsAHgAGsxMEAS0rARQHAQYiJwEmND8BNjIfARE0NjczMhYVETc2Mh8BFgODFf6VFjoV/pUVFSkWOhWkKh5HHSqkFTsVKhUBgh4U/pQVFQFsFDsWKRUVpAGJHSoBLBz+d6QVFSoVAAAAAQAA/7EDWgMLAEMABrMsCQEtKwEHFzc2Fh0BFAYrASInJj8BJwcXFgcGKwEiJic1NDYfATcnBwYjIicmPQE0NjsBMhYPARc3JyY2OwEyFgcVFAcGIyInAszGxlAQLRQQ+hcJChFRxsZQEQkKF/oPFAEsEVDGxlALDgcHFhYO+hcTEVDGxlERExf6DxYBFgcHDgsCJMbGUBITGPoOFhcVEVHGxlERFRcWDvoYExJQxsZQCwMJGPoOFi0QUcbGURAtFg76GAkDCwACAAD/sQNaAwsAGAAwAAi1LSEUCAItKwEUDwEXFhQGByMiJic1ND4BHwE3NjIfARYBFRQOAS8BBwYiLwEmND8BJyY0NjczMhYBpQW5UAoUD/oPFAEWHAtQuQYOBkAFAbQUIAlQuQYOBkAFBbpRChQP+g8WAQUIBblRCh4UARYO+g8UAgxQuQYGPwYB2/oPFAIMULkGBj8GDga5UQoeFAEWAAAAAAIAAP+5A1IDAwAXADAACLUsHxMIAi0rARUUBiYvAQcGIi8BJjQ/AScmNDY7ATIWARQPARcWFAYrASImNzU0NhYfATc2Mh8BFgGtFhwLUbkFEAU/Bga5UAsWDvoOFgGlBrlQCxYO+g4WARQeClG5Bg4GPwYBOvoOFgIJUboFBUAFEAW5UAscFhYBaQcGuVALHBYWDvoOFgIJUboFBUAFAAABAAD/agPoA1IARAAGszMRAS0rARQPAQYiJj0BIxUzMhYUDwEGIi8BJjQ2OwE1IxUUBiIvASY0PwE2MhYdATM1IyImND8BNjIfARYUBisBFTM1NDYyHwEWA+gLjgseFNdIDhYLjwoeCo8LFg5I1xQeC44LC44LHhTXSA4WC48LHAuPCxYOSNcUHguOCwFeDguPCxYOSNcUHguOCwuOCx4U10gOFguPCxwLjwsWDkjXFB4LjgsLjgseFNdIDhYLjwoAAAAAAQAAAAAD6AIRACAABrMUBAEtKwEUDwEGIiY9ASEVFAYiLwEmND8BNjIWHQEhNTQ2Mh8BFgPoC44LHhT9xBQeCo8LC48KHhQCPBQeC44LAV4OC48LFg5ISA4WC48LHAuPCxYOSEgOFguPCgAAAQAA/2oBigNSACAABrMcDAEtKwEUBicjETMyHgEPAQYiLwEmNDY7AREjIiY2PwE2Mh8BFgGJFg5HRw8UAgyPCh4KjwoUD0hIDhYCCY8LHAuPCwKfDhYB/cQUHguOCwuOCx4UAjwUHguOCwuOCwAAAAP///9qA6EDDQAjACwARQAKtz0vKicaCAMtKwEVFAYnIxUUBicjIiY3NSMiJic1NDY7ATU0NjsBMhYXFTMyFhc0LgEGHgE+AQEUBiIvAQYjIi4CPgQeAhcUBxcWAjsKB30MBiQHDAF9BwoBDAZ9CggkBwoBfQcKSJTMlgSO1IwBIio8FL9ke1CSaEACPGyOpIxwOANFvxUBlCQHDAF9BwwBCgh9CggkBwp9CAoKCH0KGWeSApbKmAaM/podKhW/RT5qkKKObjoEQmaWTXtkvxUAAAAAA////7ADWQMQAAkAEgAjAAq3IBcMCgQCAy0rATQnARYzMj4CBQEmIyIOAQcUJRQOAi4DPgQeAgLcMP5bTFo+cFAy/dIBpUtcU4xQAQLcRHKgrKJwRgJCdJ6wnHZAAWBaSv5cMjJQcmkBpTJQkFBbW1igckYCQnactJp4PgZKbKYAAAAAA////2oDoQMNAA8AGAAxAAq3KRsWEwsDAy0rARUUBichIiYnNTQ2MyEyFhc0LgEGHgE+AQEUBiIvAQYjIi4CPgQeAhcUBxcWAjsKB/6+BwoBDAYBQgcKSJTMlgSO1IwBIio8FL9ke1CSaEACPGyOpIxwOANFvxUBlCQHDAEKCCQHCgoZZ5IClsqYBoz+mh0qFb9FPmqQoo5uOgRCZpZNe2S/FQADAAD/sAI+AwwAEAAnAFsACrdYPiAVDAIDLSsBFAYiJjc0JiMiJjQ2MzIeARc0LgIiDgIHFB8CFhczNjc+ATc2NxQHDgIHFhUUBxYVFAcWFRQGIw4CJiciJjc0NyY1NDcmNTQ3LgInJjU0PgMeAgGbDAwOAjwdCAoKCBw2LFgmPkxMTD4mASYREUgHfwhHBhYGJkc5GSIgAxoODhkIJBkLLjIwCRokAQcZDg4aAiIgGToyUGhoaE42AhEICgoIGRwKEAoSKh0oRC4YGC5EKDksEhNVUVFVBhoFLDlXPxssPh0PHxQPDxUdEA0NGhwZHAIgFxwaDQ0QHRUPDxQfDxxAKhw/VzdgPiQCKDpkAAAAAAP//f+xA18DCwAUACEALgAKtyslHxgQAwMtKwEVFAYrASImPQE0NjsBNTQ2OwEyFhc0LgEOAx4CPgE3FA4BIi4CPgEyHgEB9AoIsggKCgh9CgckCAroUoqmjFACVIiqhlZ7csboyG4Gerz0un4CIvoHCgoHJAgKxAgKCsxTilQCUI6ijlACVIpTdcR0dMTqxHR0xAAEAAD/0QOhAusAEwAvAEwAbQANQApoUUc0KhgRAwQtKwERFAYmLwEjIiYnNTQ2NzM3NjIWExQGBwYjIiY3ND4DLgIvASY3NDYXMhceARcUBgcGIyImNzQ3Njc+ATQmJyYnJjU0NjMyFx4BFxQGBwYjIiY3ND8BNjc+AS4BJyYnLgEnJjU0NjMyFx4BAa0WHAu6kg8UARYOkroKHhTXMCcFCQ4WAQwWEBAECBgHEQoEFA8JBScwj2BNCAYPFgEVIAspLi4pCyAVFA8HCE5ekI52BwcPFgEWGRkURU4CSkcUGQQSAxYUEAcHdo4Cjv2gDhYCCboWDtYPFAG6ChT+wSpKDwMUEAwQDAwcJBwMBg4IDA8WAQMPSipVkiADFg4WCxAJHlpoWh4JEAsWDhYDIZBWgNgyAxYOFA0MDg4zmKqYMw4OAwYDDRQOFgMz1gAAAAACAAAAAAKDArEAEwAvAAi1KhgRAwItKwERFAYmLwEjIiYnNTQ2NzM3NjIWExQGBwYjIiY3ND4DLgIvASY3NDYXMhceAQGtFhwLupIPFAEWDpK6Ch4U1zAnBQkOFgEMFhAQBAgYBxEKBBQPCQUnMAKO/aAOFgIJuhYO1g8UAboKFP7BKkoPAxQQDBAMDBwkHAwGDggMDxYBAw9KAAABAAAAAAGtArEAEwAGsxEDAS0rAREUBiYvASMiJic1NDY3Mzc2MhYBrRYcC7qSDxQBFg6SugoeFAKO/aAOFgIJuhYO1g8UAboKFAAAAwAA/7EDCgNTAAsAQwBLAAq3SEU+KQcBAy0rEwcmPQE0PgEWHQEUAQcVFAYHIicHFjMyNjc1ND4BFhcVFAYHFTMyFg4BIyEiJj4BOwE1JicHBiIvASY0NwE2Mh8BFhQnARE0NhcyFpc4GBYcFgJ2ymhKHx42NzxnkgEUIBIBpHmODxYCEhH+mw4WAhIQj0Y9jgUQBC4GBgKwBg4GLgXZ/qVqSTlcAUM5Oj5HDxQCGA1HHgEvykdKaAELNhySaEcPFAIYDUd8tg1KFhwWFhwWSgcmjgYGLgUQBAKxBgYuBRBF/qYBHUpqAUIAAAAC////sQKDA1MAJwAzAAi1MSwaCgItKwEVFAYHFTMyHgEGIyEiLgE2OwE1LgE3NTQ+ARYHFRQWMjYnNTQ+ARYnERQOASYnETQ2HgECg6R6jw8UAhgN/psPFAIYDY95pgEWHBYBlMyWAhYcFo9olmYBaJRqAclHfLYNShYcFhYcFkoNtnxHDxQCGA1HaJKSaEcPFAIYyf7jSmgCbEgBHUpqAmYAAAIAAP/5A1kCxAAYAEAACLU8HBQEAi0rARQHAQYiJj0BIyImJzU0NjczNTQ2FhcBFjcRFAYrASImNycmPwE+ARczMjY3ETQmJyMiNCY2LwEmPwE+ARczMhYClQv+0QseFPoPFAEWDvoUHgsBLwvEXkOyBwwBAQEBAgEICLIlNAE2JLQGCgICAQEBAgEICLJDXgFeDgv+0AoUD6EWDtYPFAGhDhYCCf7QCrX+eENeCggLCQYNBwgBNiQBiCU0AQQCCAQLCQYNBwgBXgAAAAIAAP/5A2sCwwAnAEAACLU8LA4HAi0rJRQWDwEOAQcjIiY1ETQ2OwEyFhUXFg8BDgEnIyIGBxEUFhczMh4CARQHAQYiJj0BIyImPQE0NjczNTQ2FhcBFgFlAgECAQgIskNeXkOyCAoBAQECAQgIsiU0ATYktAYCBgICBgv+0QscFvoOFhYO+hYcCwEvCy4CEgUOCQQBXkMBiENeCggLCQYNBwgBNiT+eCU0AQQCCAEsDgv+0AoUD6EWDtYPFAGhDhYCCf7QCgAABAAA/2oDoQNTAAMAEwAjAEcADUAKNCcfFw8HAgAELSsXIREhNzU0JisBIgYdARQWOwEyNiU1NCYrASIGHQEUFjsBMjY3ERQGIyEiJjURNDY7ATU0NhczMhYdATM1NDYXMzIWFxUzMhZHAxL87tcKCCQICgoIJAgKAawKCCMICgoIIwgK1ywc/O4dKiodSDQlJCU01jYkIyU0AUcdKk8CPGuhCAoKCKEICgoIoQgKCgihCAoKLP01HSoqHQLLHSo2JDYBNCU2NiQ2ATQlNioAAA8AAP9qA6EDUwADAAcACwAPABMAFwAbAB8AIwAzADcAOwA/AE8AcwAjQCBgU0tEPjw6ODY0LygiIB4cGhgWFBIQDgwKCAYEAgAPLSsXMzUjFzM1IyczNSMXMzUjJzM1IwEzNSMnMzUjATM1IyczNSMDNTQmJyMiBgcVFBY3MzI2ATM1IyczNSMXMzUjNzU0JicjIgYdARQWNzMyNjcRFAYjISImNRE0NjsBNTQ2FzMyFh0BMzU0NhczMhYXFTMyFkehocWyssWhocWyssWhoQGbs7PWsrIBrKGh1rOzxAwGJAcKAQwGJAcKAZuhodazs9ahoRIKCCMICgoIIwgK1ywc/O4dKiodSDQlJCU01jYkIyU0AUcdKk+hoaEksrKyJKH9xKH6of3EoSSyATChBwoBDAahBwwBCv4msiShoaFroQcKAQwGoQcMAQos/TUdKiodAssdKjYkNgE0JTY2JDYBNCU2KgAAAAMAAP92A6ADCwAIABQALgAKtx8ZEgsGAgMtKzc0Jg4BHgEyNiUBBiIvASY0NwEeASUUBw4BJyImNDY3MhYXFhQPARUXNj8BNjIW1hQeFgISIhABav6DFToWOxUVAXwWVAGYDBuCT2iSkmggRhkJCaNsAipLIQ8KHQ4WAhIgFBT6/oMUFD0UOxYBfDdU3RYlS14BktCQAhQQBhIHXn08AhktFAoACQAA/7EDWQLEAAMAEwAXABsAHwAvAD8AQwBHABdAFEVEQUA+Ny4mHRwZGBUUCgQBAAktKzcVIzUlMhYdARQGKwEiJj0BNDY/ARUhNRMVIzUBFSE1AzIWBxUUBicjIiY3NTQ2FwEyFgcVFAYHIyImJzU0NhcFFSM1ExUhNcTEAYkOFhYOjw4WFg7o/h59fQNZ/mV9DxYBFBCODxYBFBAB9A4WARQPjw8UARYOAUF9ff4eQEdHSBYOjw4WFg6PDxQB1kdHAR5ISP3ER0cCgxQQjg8WARQQjg8WAf7iFA+PDxQBFg6PDhYBR0dHAR5ISAAABgAA/3IELwNJAAgAEgAbAHsAtwDzABFADuDCpYZjMxkVEAsGAgYtKwE0JiIGFBYyNgU0Jg4BFxQWMjYDNCYiBh4BMjYHFRQGDwEGBxYXFhQHDgEjIi8BBgcGBwYrASImNScmJwcGIicmNTQ3PgE3Ji8BLgE9ATQ2PwE2NyYnJjQ3PgEzMh8BNjc2NzY7ATIWHwEWFzc2MhcWFRQPAQYHFh8BHgEBFRQHBgcWFRQHBiMiLwEGIicOAQciJyY1NDcmJyY9ATQ3NjcmNTQ/ATYzMhYXNxc2PwEyFxYVFAcWFxYRFRQHBgcWFRQHBiMiJicGIicOASInJjU0NyYnJj0BNDc2NyY1ND8BNjMyFhc2Mhc2PwEyFxYVFAcWFxYB9FR2VFR2VAGtLDgsASo6LAEsOCwBKjos2AgFVgYMEx8EBA1CCwYFQBUWBgcEDWgGCg0TF0IEDQZQBAUkCA0HVQUICAVWBwsTHwQEDEQKBgZAExgGBwMNaAYKAQ0TFkIFDQVRBBgRCA0GVQUIAWVTBgocAkQBBRUdCwwLBywDAUQDHQoHU1MHCh0DNBABBCoIEREcFwQCQwIcCQdTUwYKHAJEAQUqCAsMCwcsBEQDHQoHU1MHCh0DNBABBCoIDAoMHBcEAkMCHAkHUwFeO1RUdlRU4x0sAigfHSoqAlkdKio7KirNZwYKAQ4TFxslBgwEEUIEMgsGPBsNCAZVBgwyBARLDwUFCCwMGBYNAQgHZwYKAQ4TFxslBgwEEUIEMgoIPBoNCAZVBgsxBARLDwUFHhUNGxMMAgj+z04JCA8OPw4CAigbJQEBCzQBKAICDj8ODwgJTgkJEA0/DgICHgk0DAEBKBcBJwICDj8NEAkCM04JCQ8OPw4CAic0DAEBDDQnAgIOPw4PCQlOCQgQDT8OAgIeCTQMAgIoFwEnAgIOPw0QCAACAAD/sQNaAwoACABoAAi1USAGAgItKwE0JiIOARYyNiUVFAYPAQYHFhcWFAcOASciLwEGBwYHBisBIiY1JyYnBwYiJyYnJjQ3PgE3Ji8BLgEnNTQ2PwE2NyYnJjQ3PgEzMh8BNjc2NzY7ATIWHwEWFzc2MhcWFxYUDwEWHwEeAQI7UnhSAlZ0VgEcCAdoCgsTKAYFD1ANBwdNGRoJBwQQfAgMEBsXTwYQBkYWBAUIKAoPCGYHCAEKBWgIDhclBgUPUA0HCE0YGgkIAxF8BwwBDxwWUAUPB0gUBAQ7DglmBwoBXjtUVHZUVHh8BwwBEB4VGzIGDgYVUAEFPA0ITBwQCgdnCQw8BQZAHgUOBgwyDxwbDwEMB3wHDAEQGRogLQcMBxRQBTwNCEwcDwgIZwkMPAUFQxwFDgZNHBsPAQwAAAH////5AxIDCwBQAAazIAYBLSslFAYHBgcGIyIuAS8BJicuAScmLwEuAS8BJjc0NzY3PgEzMhcWFx4CFx4CFRQOAgcUHwEeATUeARcyFh8BFjcyPgI3Mh4BHwEWFxYXFgMSDAYLOTQzEBwkCDs2K0iYLBsTCggIBAcDAR0fHA4wDwgEChQGFBQHAhAIICYeAQMEAQ4qbkwBEgULBgcKHh4gDAcQGAJBEwwnAwKeDzAOHCAcBAoDFRQbLJhIKzYcFxASIA4PNDQ4DAYMAgMoCigeDwIYEAgLIhoiCAUICwMWAU1uKgwCBQMBHigeAQgQAiULBhMKBAAACAAA/2oDWQNSABMAGgAjAFoAXwBuAHkAgAAVQBJ9e3ZvbmJdW043IRsVFA8HCC0rAR4BFREUBgchIiYnETQ2NyEyFhcHFTMmLwEmExEjIiYnNSERARYXNjMyFxYHFCMHBiMiJicGBwYjIi8BNCcmNz4BNzYXFhU2NzY3LgE3NjsBMhcWBwYHFQYHFgE2Nw4BEwYXNjc0NzY3Ij0BJzQnAzY3Ii8BJicGBwYFJiMWMzI3AzMQFh4X/RIXHgEgFgH0FjYPStIFB68GxugXHgH+UwGsEh0hIFIRCQgBAQMkG0wie2BVMggHDgMGAgU2LggFAR0fJhQNCAgGEQwNBwoFAQEBBx/+8R4vHSjXCQcBAwQBAgEBB0ZMUwEGCSscDyAQAWAOQCobCAICfhA0GP1+Fx4BIBYDfBceARYQJtIQB68H/LACPB4X6fymAUsOEQQbDRABAhUWEg0hkgQGAQIGDhc4GgUIAQEvP0xGLlYcFggMGgMBFkQnW/7xDUsWMgHxFzIEFAIWAwIBAQEMCP6NHg8FCCU9MD4fBw4QAQAAAAAEAAD/agNZA1IAEwAaACMAUQANQAonJCEbFRQPBwQtKwEeARURFAYHISImJxE0NjchMhYXBxUzJi8BJhMRIyImJzUhERMVMxMzEzY3NjUzFx4BFxMzEzM1IxUzBwYPASMnLgEnAyMDBwYPASMnJi8BMzUDMxAWHhf9EhceASAWAfQWNg9K0gUHrwbG6BceAf5TOydcWEgEAQEDAQECAkhZWyenMjcDAQEDAQECAlE/UQIBAQICAgEDNzICfhA0GP1+Fx4BIBYDfBceARYQJtIQB68H/LACPB4X6fymAfQ7/o8BDwsOCQUOARQE/vEBcTs79QsODAwCEgUBMP7QDQgEDAwOC/U7AAAEAAD/agNZA1IAEwAaACMAUQANQAo9JSEbFRQPBwQtKwEeARURFAYHISImJxE0NjchMhYXBxUzJi8BJhMRIyImJzUhETcVMzUjNz4CBzMUHgIfASMVMzUjJzczNSMVMwcOAQ8BIycmLwEzNSMVMxcHAzMQFh4X/RIXHgEgFgH0FjYPStIFB68GxugXHgH+U6idKjoDBAYBAQQCBAI8K6Mma2wmnCk5AggBAQEDAwY7KqImam0CfhA0GP1+Fx4BIBYDfBceARYQJtIQB68H/LACPB4X6fymgzs7WgQKBgECBgQEA1o7O5ieOztZBAoDAQUGB1k7O5ieAAYAAP9qA1kDUgATABoAIwAzAEMAUwARQA5KRDo0LiYhGxUUDwcGLSsBHgEVERQGByEiJicRNDY3ITIWFwcVMyYvASYTESMiJic1IRETNDYzITIWHQEUBiMhIiY1BTIWHQEUBiMhIiY9ATQ2MwUyFh0BFAYjISImPQE0NjMDMxAWHhf9EhceASAWAfQWNg9K0gUHrwbG6BceAf5TjwoIAYkICgoI/ncICgGbCAoKCP53CAoKCAGJCAoKCP53CAoKCAJ+EDQY/X4XHgEgFgN8Fx4BFhAm0hAHrwf8sAI8Hhfp/KYB4wcKCgckCAoKCFkKCCQICgoIJAgKjwoIJAgKCggkCAoABgAA/7EDEgMLAA8AHwAvADsAQwBnABFADl9MQDw2MSsjGxMLAwYtKwERFAYrASImNRE0NjsBMhYXERQGKwEiJjURNDY7ATIWFxEUBisBIiY1ETQ2OwEyFhMRIREUHgEzITI+AQEzJyYnIwYHBRUUBisBERQGIyEiJicRIyImPQE0NjsBNz4BNzMyFh8BMzIWAR4KCCQICgoIJAgKjwoIJAgKCggkCAqOCgckCAoKCCQHCkj+DAgIAgHQAggI/on6GwQFsQYEAesKCDY0Jf4wJTQBNQgKCgisJwksFrIWLAgnrQgKAbf+vwgKCggBQQgKCgj+vwgKCggBQQgKCgj+vwgKCggBQQgKCv5kAhH97wwUCgoUAmVBBQEBBVMkCAr97y5EQi4CEwoIJAgKXRUcAR4UXQoAAAAAAgAA/2oD6ALDABcAPQAItToiCwACLSsBIg4BBxQWHwEHBgc2PwEXFjMyPgIuAQEUDgEjIicGBwYHIyImJzUmNiI/ATY/AT4CPwEuASc0PgEgHgEB9HLGdAFQSTAPDRpVRRgfJyJyxnQCeMIBgIbmiCcqbpMbJAMIDgICBAIDDAQNFAcUEAcPWGQBhuYBEOaGAnxOhEw+cikcNjItIzwVAwVOhJiETv7iYaRgBGEmBwUMCQECCgUPBQ4WCBwcEyoyklRhpGBgpAABAAD/aQPoAsMAJgAGsyILAS0rARQOASMiJwYHBgcGJic1JjYmPwE2PwE+Aj8BLgEnND4CMzIeAQPohuaIJypukxskCg4DAgQCAwwEDRQHFBAHD1hkAVCEvGSI5oYBXmGkYARhJggEAQwKAQIIBAMPBQ4WCBwcEyoyklRJhGA4YKQAAAACAAD/sAPoAsMAJQBLAAi1STYiCgItKwEUDgEjIicGBwYHIyImNSY0NjU/AjYHNz4CNy4BJzQ+ATIeARcUBgceAR8BFh8DFAcOAScmJyYnBiMiJxYzMjY3PgEnNCceAQMSarRrMDJGVRUbAgYMAQIBBAMDARwFDg4ERU4BarTWtGrWUEQFDAgbCQQFBAMBAgoIGxVVRjIwl3AgEVqkQkVMAQ1IVAGlTYRMCTEXBQQKBwEEBAEDBgMDAR4FGBIQKHRDToRMTITcQ3YnDhYKIQsDBQYKAQIICgEEBRcxCUoDMi80hkorKid4AAAAAAMAAP+wA+gCwwAVADsAYAAKt1xJIxYJAAMtKwEiDgEHFBYfAQc2PwEXFjMyPgE0LgEnMh4CDgEnIicGBwYHIyImNSY0NjU/AjYHNz4CNy4BJzQ+AQEeAR8BFh8DFAcOAScmJyYnBiMiJxYzMjY3PgEnNCceARQGAYlVllYBPDU2ExMPGR4rKlWUWFiUVWq2aAJssmwwMkZVFRsCBgwBAgEEAwMBHAUODgRFTgFqtAI2BQwIGwkEBQQDAQIKCBsVVUYyMJdwIBFapEJFTAENSFRQAnw6ZDktVh4gLgsKEgYIOmRwZjhITIScgk4BCTEXBQQKBwEEBAEDBgMDAR4FGBIQKHRDToRM/XQOFgohCwMFBgoBAggKAQQFFzEJSgMyLzSGSisqJ3iHdgAAAAMAAP9qA8QDUwAMABoAQgAKtzYhFA0KBgMtKwU0IyImNzQiFRQWNzIlISYRNC4CIg4CFRAFFAYrARQGIiY1IyImNT4ENzQ2NyY1ND4BFhUUBx4BFxQeAwH9CSEwARI6KAn+jALWlRo0UmxSNBoCpiod+lR2VPodKhwuMCQSAoRpBSAsIAVqggEWIDQqYAgwIQkJKToBqagBKRw8OCIiODwc/teoHSo7VFQ7Kh0YMlRehk9UkhAKCxceAiIVCwoQklROiFxWMAAAAgAA/2oDxANTAAwANAAItSgTCgYCLSsFNCMiJjc0IhUUFjcyJRQGKwEUBiImNSMiJjU+BDc0NjcmNTQ+ARYVFAceARcUHgMB/QkhMAESOigJAccqHfpUdlT6HSocLjAkEgKEaQUgLCAFaoIBFiA0KmAIMCEJCSk6AakdKjtUVDsqHRgyVF6GT1SSEAoLFx4CIhULChCSVE6IXFYwAAAAAAIAAP/5ATADCwAPAB8ACLUbEwsEAi0rJRUUBgcjIiY9ATQ2FzMyFhMDDgEnIyImJwMmNjsBMhYBHhYOjw4WFg6PDxQRDwEWDo8OFgEPARQPsw4Wmn0PFAEWDn0OFgEUAj7+Uw4WARQPAa0OFhYAAAAE////sQOhAwsAAwAMABUAPQANQAowHhMQCwQCAAQtKxchNSE1ITUjIiY9ASEBNC4BDgEWPgE3FRQGByMVFAYjISImJzUjIiY3NTQ2FzMRNDYzITIWHwEeAQcVMzIW1gH0/gwB9FkWIP6bAoMUIBICFhwYRgwGfSAW/egWHgF9BwwBQCskIBUBdxc2D1UPGAEjLT4Hj9bWIBZZ/ncPFAIYGhgEEBHoBwoBWRYgIBZZDAboLEABATAWIBgOVRA2Fo8+AAAABQAA//kD5AMLAAYADwA5AD4ASAAPQAxDQDw6HBMMCAIABS0rJTcnBxUzFQEmDwEGFj8BNhMVFAYjISImNRE0NjchMhceAQ8BBicmIyEiBgcRFBYXITI2PQE0PwE2FgMXASM1AQcnNzYyHwEWFAHwQFVANQEVCQnECRIJxAkkXkP+MENeXkMB0CMeCQMHGwgKDQz+MCU0ATYkAdAlNAUkCBg3of6JoQJvM6EzECwQVRC9QVVBHzYBkgkJxAkSCcQJ/r5qQ15eQwHQQl4BDgQTBhwIBAM0Jf4wJTQBNiRGBwUkCAgBj6D+iaABLjShMxAQVBAsAAEAAP+xA+gDLwAsAAazKBgBLSsBFAcBBiImNzUjIg4FFRQXFBYHFAYiJy4CJyY1NDc2ITM1NDYWFwEWA+gL/uMLHBgCfTdWVj44IhQDBAEKEQYECAYDRx5aAY59FCAJAR0LAe0PCv7iCxYOjwYSHjBAWjgfJgQSBggMCgUOFAOfXW9L4Y8OFgIJ/uILAAAAAAEAAP+xA+gDLgArAAazIwcBLSslFA8CBgcGIiYnNDY3NjU0LgUrARUUBiInASY0NwE2MhYHFTMgFxYD6EcGBwMFBhIIAQIBAxQiOD5WVjd9FCAJ/uMLCwEdCxwYAn0Bjloe4V2fDREIBAoMCAUUAyYfOFpAMB4SBo8OFgsBHgoeCgEeChQPj+FLAAAAAgAA/7ED6AM1ABQAOgAItTMcDQQCLSslFRQHBiMiJwEmNDcBNhYdAQcGFBcFFA4CDwEGIyInJjc2Jy4BJxUUBwYjIicBJjQ3ATYXFh0BFhcWAWUWBwcPCv7jCwsBHREs3QsLA2ASGhwIDAQLAwIOARhTJHZbFQgGDwr+4gsLAR4QFxXmaV72JxcKAwsBHgoeCgEeERMXJ94LHAvzIFRGRhAWCgEED99cKCwHjBcKAwsBHgoeCgEeEQoJF5MPbGEAAwAA//kD6AJ9ABEAIgAzAAq3MCcbFA8CAy0rASYnFhUUBiImNTQ3BgceASA2ATQmByIGFRQeATY1NDYzMjYFFAcGBCAkJyY0NzYsAQQXFgOhVYAiktCSIoBVS+ABBOD+uRALRmQQFhBEMAsQAdkLTv74/tr++E4LC04BCAEmAQhOCwE6hEE6Q2iSkmhDOkGEcoiIAUkLEAFkRQwOAhIKMEQQzBMTgZqagRMmFICaAp5+FAAAAgAA/70DTQMLAAgAHQAItRcNBwICLSsTNCYOAR4CNgEUBwEGIicBLgE9ATQ2NzMyFhcBFvoqOiwCKD4mAlUU/u4WOxT+cRUeKh3pHUgVAY8UAlgeKgImQCQGMP7ZHhX+7hUVAY8VSB3oHSoBHhX+cRUAAAADAAD/vQQkAwsACAAdADQACrctIhcNBwIDLSsTNCYOAR4CNgEUBwEGIicBLgE9ATQ2NzMyFhcBFhcUBwEGIyImJwE2NCcBLgEjMzIWFwEW+io6LAIoPiYCVRT+7hY7FP5xFR4qHekdSBUBjxTXFf7uFh0UGhABBhUV/nEVSB19HUgVAY8VAlgeKgImQCQGMP7ZHhX+7hUVAY8VSB3oHSoBHhX+cRUdHhX+7hUQEQEGFTsVAY8VHh4V/nEVAAEAAP/5AoMDUwAjAAazEwcBLSsBMhYXERQGByEiJicRNDYXMzU0Nh4BBxQGByMiJjU0JiIGFxUCTRceASAW/ekXHgEgFhGUzJYCFA8kDhZUdlQBAaUeF/6+Fh4BIBUBQhYgAbNnlAKQaQ8UARYOO1RUO7MAAQAA//kDoQMMACUABrMkFwEtKwEVFAYHIyImPQE0Jg4BBxUzMhYXERQGByEiJicRNDYXITU0PgEWA6EWDiQOFlJ4UgE1Fx4BIBb96RceASAWAXeS0JACEY8PFAEWDo87VAJQPWweF/6+Fh4BIBUBQhYgAWxnkgKWAAAAAAIAAP/5AoMDCwAHAB8ACLUYDAQAAi0rEyE1NCYOARcFERQGByEiJicRNDYXMzU0NjIWBxUzMhazAR1UdlQBAdAgFv3pFx4BIBYRlMyWAhIXHgGlbDtUAlA9of6+Fh4BIBUBQhYgAWxmlJRmbB4AAAACAAD/+AOTAsUAEAAyAAi1IxoOAwItKwERFAYnIzUjFSMiJicRCQEWNwcGByMiJwkBBiMmLwEmNjcBNjIfATU0NjsBMhYdARceAQMSFg7Wj9YPFAEBQQFBAXwiBQcCBwX+fv5+BwYHBSMEAgUBkRIwE4gKCGsICnoFAgEo/vUPFgHW1hQQAQ8BCP74ASQpBQEDAUL+vgQCBSkFEAQBTg8Pcm0ICgoI42YFDgAAAgAA//kBZgMLAB4ALgAItSojFgQCLSslFRQGByEiJic1NDY3MzUjIiYnNTQ2NzMyFhcRMzIWAxUUBgcjIiY9ATQ2OwEyFgFlFBD+4w8UARYOIyMPFAEWDtYPFAEjDxZIFg6PDhYWDo8PFGRHDxQBFg5HDxQB1hYORw8UARYO/r8WAnVrDxQBFg5rDhYWAAAAAgAA//gCOQLDAA8AOgAItTUcCwMCLSslFRQGJyMiJj0BNDYXMzIWExQOAwcOARUUBgcjIiY9ATQ2Nz4BNCYiBwYHBiMiLwEuATc2MzIeAgGJDgiGCQ4OCYYIDrAQGCYaFRceDgmGCAxKKiEcNEYYFCgHCgcHWwgCBFmqLVpILpWGCQ4BDAqGCQ4BDAFFHjQiIBIKDTANChABFAsaLlITDyIwJBAOMgkERgYQCJQiOlYAAAAAAv///2oDoQMNAAgAIQAItRkLBgMCLSsBNC4BBh4BPgEBFAYiLwEGIyIuAj4EHgIXFAcXFgKDlMyWBI7UjAEiLDoUv2R7UJJoQAI8bI6kjHA4A0W/FQGCZ5IClsqYBoz+mh0qFb9FPmqQoo5uOgRCZpZNe2S/FQAAAwAA/9IEHgLqAAgAMABLAAq3QTchCgQAAy0rPQEzMjcWFwYjAzUzMh4CFRQWOwE1NDYfARYVFAYPAgYmJzUHBjUjIi4CNTQmIyU2OwE1NDYfARYVFAYPAgYmJzUjIhUjIgcm5RwYH0NHT+XlQXRWMlI8XBQM6ggEAgLqDRIBBANVQHZUMlQ7ATVEUlwUDOoIBAIC6g0SAQQDVRoZICKtClQ9JgHKrTJUdkA6VDQQDAmQBQkDCAECjwkMDzYBAQEyVHY/O1SIJTYPDAmQBggEBgICkAgMDzUBClUAAAEAAP+sA6wC4AAXAAazBAABLSsBMhYQBiMiJzcWMzI2ECYiBgczByczPgECFKru7qqObkZUYn60tPq0Ao64uHwC8ALg8P6s8FhKPLQBALSufMzMpuoAAAACAAD/sQR3AwsABQAfAAi1GxEDAQItKwUVIREzEQEVFAYvAQEGIi8BBycBNjIfAQEnJjY7ATIWBHf7iUcD6BQKRP6fBg4GguhrAUYGDgaCAQNDCQgN8wcKB0gDWvzuArjyDAoJRP6fBgaC6WwBRgYGggEDQwkWCgADAAD/agRvA1MACwAXAD8ACrc0HRcTCAADLSsBFhcUBisBFAYiJicXMjQHIiY1NCIVFBYBFhQHAQYmLwEmND8BJjU+BDc0NjcmNTQ+ARYXFAceARc3NhYXA2UihSwc+lR2UgGOCQkgMBI6AlgEBvvrBRAELwQGaAscLjAkFAGCagQeLh4BBEVqHeoFEAQBd8dwHSo7VFQ6YRIBMCEJCSk6A30FEAT8dwUCBTUGEARZEhMYMlRehk9UkhAKCxceAiIVCwoKSDTKBQIFAAAEAAD/agRvA1MADAAXACcATwANQApFLiYeEQ0KBgQtKwU0IyImNTQiFRQWNzIJAS4BJyIOAgcUBRQGKwEUBiImJzchJic3FhMXFhQHAQYmLwEmND8BJjU+BDc0NjcmNTQ+ARYXFAceARc3NhYCRAkgMBI6KAn+1QHpF2ZKM1YyGgECpywc+lR2UgFTAaZcIz4itS8EBvvrBRAELwQGaAscLjAkFAGCagQeLh4BBEVqHeoFEGAIMCEJCSk6AQESAagxQAEiODwc1/odKjtUVDpIaZc3xwKZNgUQBPx3BQIFNQYQBFkSExgyVF6GT1SSEAoLFx4CIhULCgpINMoFAgAAAQAA/2oD6ANSAB0ABrMUCgEtKwEWFA8BFwcOAScHIzU3JjY/ARc3NjIeAQ8BFzc2MgPTFRXfU1lb/GjKZcpFGltZVN8VPCgCFt+D3xY6AlUUPBXfVFlbGkXKZcpn/lpZU98VKjoW4ILfFQAABQAA/8MD6AKxAAkAGgA+AEQAVwAPQAxTS0NCNiITDAYABS0rJTcuATc0NwYHFgE0JgciBhUUHgE2NTQ2MzI2NxQVBgIPAQYjIicmNTQ3LgEnJjQ3PgEzMhc3NjMyFh8BFgcWExQGBxMWFxQHBgcOASM3PgE3Jic3HgEXFgE2KzA4ASKAVV4BahALRmQQFhBEMAsQyjvqOxwFCgdECRlQhjILC1b8lzIyHwUKAw4LJAsBCRVYSZ0E+gsWJ1TcfCl3yEVBXSM1YiALaU8jaj1DOkGEkAFnCxABZEUMDgISCjBEEHUEAWn+WmkyCScGCgcqJHhNESoSg5gKNgkGBhQGAQX+/U6AHAEZGl0TEyQtYGpKCoRpZEA/JGQ0EwAC//7/xAM2AvgADgAdAAi1Fg8JAgItKz8BESU3JhI3NjcXBgcOAQEFBxYCBwYHJzY3PgEnB7p0/uxYdAR2ZIwEZEhYBAGiARRYdAR2YJACYkhYBFZyjHT+3BBWegFQeGQQZhBIWPoB+hBWev6weGIUaBBIWPpcdAABAAD/xAOsAvgAFwAGsxIAAS0rATIWFzMHJzMuASIGFBYzMjcXBiMiJhA2AZio7gR6uLiQBLT6tLR+aE5Gbo6o8PAC+Oimzs58rLT+tDxMWPABVPAAAAAABP////kELwLDAA8AHwAqADIADUAKLSslIBwTBgAELSs3IiY1ETQ2MyEyFhcRFAYjAREUFjchMjY1ETQmJyEiBgEzFRQGByEiJjc1BTI0KwEiFDPoJTQ0JQJfJTQBNiT9jwwGAl8ICgoI/aEHCgL/WTQl/IMkNgECRAkJWQkJiDQlAYklNDQl/nclNAHi/ncHDAEKCAGJBwoBDP30NhYeASAVNjYSEgAAAwAA/7EDWgNSAAgAPgBuAAq3ZEstEwYDAy0rNzQuAQYUFj4BATQmJyM0Nic0JicOAgcGDwEOAg8BDgEnIxEzMh4EFxY7ATI1NCc+ATQnNjU0Jic+ATcUBxYVFAcWFRQHFAYrASImJyYrASImNRE0NjsBNjc2Nz4CNzYzMh4BFRQHMzIWjxYcFhYcFgKDLBzENgEiNw4OFBcNHg0LDhgKFgwUChISBxYOHAwcAnZJQ2sCEBQKHQoJEhhHGwUVASFgTkg2aEVBDKEdKiodmRQ5IBwNDBYYFhwvSigbYjpWZA8UAhgaGAIUAVAdKgEgciA3NAEPQkoYDSYRDhAgCRMKDAH+mwIGBggGAildDxAJKigSHCcNJAgBMhUyKRIUKyYMDDgrTloaFxcqHQFlHioNSSoeDkJMFhUkTkEzOFQAAAADAAD/agNZAwsACAA/AHEACrdjSTUZBgMDLSsTNC4BBhQWPgEBNCYjPgEnNCc2NCYnNjU0JisBIg8BBg8CBicjETMyHgUXFhceAhcyNic0JiczMjY1MxQGJyMWFRQOASMiJy4DJyYnJicjIiY1ETQ2OwEyNz4BNzMyFh0BFhUUBxYVFAcWjxYcFhYcFgKDGBIIDAEdChQQAjYxR0l2EA0HKRIKCBISCRYWFhYQFAMeDRcUDg42JAE0AcQcLEdUO2IbJ0wuHBYTFgYOChshORSZHSoqHaEMQUhqOj9OYCEBFQUbAlgPFAIYGhgCFP7OEzQKIg0nHBIoKgkQDy8uKQYFAgwEAgH+mgoUEiAQHgEmDRhKQg82NiByICwbOVYBNzRCTSQVEjYwLg0cK0kNKh4BZR0qFhkYAVpLAys4DQsmKxQSKQAI////sQNbAy4ACAARABoAIwAsADUAPgBHABVAEkZBPDgzLyonIh0YFBALBgIILSslFAYuAjYyFhcUBiIuAT4BFgEUBiImPgEyFgEUBiIuAT4BFgEUDgEuATYeASUUBiIuATYyFgEUBiIuATYyFicUBi4CPgEWARUwQi4CMkAw8So8KAIsOC7+qzZINgIyTDICRiQ2IgImMij+LjpSOAI8Tj4BAUBYPgJCVEQBLR4uHgIiKiJ2GiYYAhwiHmQhMAEuRC4ujR4qKjwoAiwBSSU0NEo0NP7hGiQkNCQCKAHcKTgCPE48AjhCLT4+Wj4+/m4WICAsICDkEhwCGCgWBiIAAQAA/7QDDwMIADYABrMJAgEtKyUUBiMiJwEmNDYyFwEWFAYiJwEmIgYWFwEWMzI2NzQnASYjIgYUHwEWFAYiLwEmNTQ2MzIXARYDD1hBSzj+Tj98sEABUgUiEAb+rix0UgEqAbEjLiQuAST+vA4TEBYO5QYkDwXlI0AtMSIBRTdNQVg3AbJAr3w//q4FECIFAVMrVHUr/k8jLiQuIwFEDhYiD+QGECIF5SIxLkAk/rw2AAAADwAA//kELwJ8AAsAFwAjAC8AOwBHAFMAXwBrAHcAgwCPAJ8AowCzACNAIK+noaCckoyGgHp0bmhiXFZQSkQ+ODIsJiAaFA4IAg8tKzcVFCsBIj0BNDsBMjcVFCsBIj0BNDsBMicVFCsBIj0BNDsBMgEVFCMhIj0BNDMhMiUVFCsBIj0BNDsBMicVFCsBIj0BNDsBMhcVFCsBIj0BNDsBMicVFCsBIj0BNDsBMhcVFCsBIj0BNDsBMhcVFCsBIj0BNDsBMgEVFCsBIj0BNDsBMhcVFCsBIj0BNDsBMhcVFCsBIj0BNDsBNTQ7ATITESERAREUBiMhIiY1ETQ2MyEyFtYJNQkJNQlICX0JCX0JSAk1CQk1CQI8Cf4eCQkB4gn+mwk2CQk2CUgJNQkJNQnWCDYJCTYIRwk1CQk1CdYJNQkJNQnXCTYJCTYJ/uIJNgkJNgmPCTYJCTYJjwl9CQk+CTYJR/xfA+gqHfxfHSoqHQOhHijGNQkJNQmGNQkJNQmGNgkJNgn+2TUJCTUJhjUJCTUJhjYJCTYJmDUJCTUJhjYJCTYJmDUJCTUJmDUJCTUJARU2CQk2CQk2CQk2CQnECQk1CYYJ/lMB9P4MAfT+DB0qKh0B9B4qKgAAAAADAAD/+QNaAsQADwAfAC8ACrcrJBsTDAQDLSslFRQGByEiJic1NDY3ITIWAxUUBichIiYnNTQ2FyEyFgMVFAYHISImJzU0NhchMhYDWRQQ/O8PFAEWDgMRDxYBFBD87w8UARYOAxEPFgEUEPzvDxQBFg4DEQ8WZEcPFAEWDkcPFAEWARBIDhYBFA9IDhYBFAEORw8UARYORw8WARQAAAAABAAAAAAEXwMLAAoAIAA6AFIADUAKSzszIRoLBgAELSshIiYnND4BFgcUBjciLgEiBg8BIiYnNDc+AhYXFhUUBjciJy4BByIOAyMiJjU0Nz4BHgEXFhUUBjciJy4BJAYHBiMiJic0NzYkDAEXFhUUBgI7C1ABRixIAVKMASpISEYWFgpUAQYsgoKCLQVUjgYGTIJVL2BGOCACCVQGSdLW0koGVI4GB2TW/wDUZQcGCVQBBmgBIAEsASJnBVRSCxIYAhwQC1KXHBwcDg5UCgcGKzACNCkGBwpUmAU6OAEYIiQYVAoHBUpSAk5MBQcKVJcFWFgCXFYFVAoHBmhyAm5qBgcKVAAC//7/sQM2AwsAEgAwAAi1IRUPCAItKyUGIyIuATc0Nw4BBxQeAjcyNjcOASMiLgI3ND4CNzYWBw4BBxQeATcyNzYXHgECwB4fZqxmATpwjgE6XoZIUJClNdR8V6BwSAJAbppUGRMSMDIBUoxSQj0XEQgEewVkrmVrXCG+d0mEXjwCRG1xiER0nldVnHJGAwEuESt0QFOKVAEdChEIFgAAA//+/7EDxANSAAsAEAAWAAq3ExEQDAoEAy0rCQEOAQciLgI+ATMTIRQGBxMhETIeAQGtATA7nld1xnAEeL55aAGvQj1c/lN1xHQBYf7QPUIBdMTqxHT+U1ieOwF4Aa1yxgAAAAIAAP+xBHcDCwAFAAsACLUKBwMBAi0rBRUhETMRARMhERMBBHf7iUcDWo78YPoBQQdIA1r87gI7/gwBQgFB/r8AAAAABQAA/7EEdwMLAAMABwANABEAFQAPQAwTEg8OCwkFBAEABS0rAREjEQERIxEBFSERMxEBESMRJREjEQFljwFljgLK+4lHAsuPAWWPAV7+4gEeAR79xAI8/X1IA1r87gH0/lMBrdb9fQKDAAAAAgAA/7EDcwMLABcAHgAItRwZDgMCLSslFgYHISImNwE1IyImPgEzITIeAQYrARUPASEDNSMVA1QfJjv9fTsoIAEZJA4WAhIQAR4PFAIYDSSalwGNo0cqMkYBSDEBut8WHBYWHBbfJfABAfPzAAAAAAYAAP/AA6EDUgADABQAHAAkACwANAARQA40MCwoJCAcGBAIAgAGLSsBNycHJRQHAQYiLwEmNDcBNjIfARYlFw8BLwE/AR8BDwEvAT8BARcPAS8BPwEBFw8BLwE/AQKYpDykATUK/TMKHgpvCgoCzgoeCm4K/Q82NhERNzcR1G1tIiFtbSECKTc3ERE2NhH+rDY2ERE2NhECDqM8pGgPCv0yCgpvCh4KAs4KCm8KWxARNzcREDeRIiFtbSEibf6IERA3NxARNwEuEBE3NxEQNwABAAAAAQAAhJZQhF8PPPUACwPoAAAAANCP8mgAAAAA0I/IOP/5/2kEvwNTAAAACAACAAAAAAAAAAEAAANS/2oAWgUFAAD/8AS/AAEAAAAAAAAAAAAAAAAAAAB1A+gAAAPoAAADEQAABC8AAAOgAAADMQAAA6AAAAOgAAADoAAAA6AAAAOgAAAD6AAABQUAAANZAAAD6AAAA+gAAAOgAAADoAAAA+gAAAOgAAAD6AAAAxEAAANZAAADoAAAA+gAAAPoAAADWQAABC8AAAH0AAAD6AAAAjsAAAI7AAABZQAAAWUAAAPoAAACygAAA+gAAALKAAADoAAAA1kAAANZAAADoAAAA1kAAANZAAADWQAAA+gAAAPoAAABrAAAA6AAAANZAAADoAAAAjsAAANZAAADoAAAAoIAAAGsAAADEQAAAoIAAANZAAADoAAAA6AAAAOgAAADoAAAA1kAAAQvAAADWQAAAxEAAANZAAADWQAAA1kAAANZAAADEQAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAAWUAAAOgAAAD6AAAA+gAAAPoAAAD6AAAA+gAAANZAAAELwAAAoIAAAOgAAACggAAA6AAAAFlAAACOwAAA6AAAAQeAAADrAAABHYAAAR2AAAEdgAAA+gAAAPoAAADNAAAA6wAAAQvAAADWQAAA1kAAANrAAADEQAABC8AAANZAAAEdgAAA1kAAAPoAAAEdgAABHYAAAOgAAADoAAAAAAAAADSARIBqAG+AdwB+AIIAjYCngMEA6oEIASGBRAFggX8BnYGzAc6B6AHygggCNQJMgoODOINEg1MDcAN4A4ADh4OPg5qDpYOwg7uDyYPXg+UD8wQMBCCENIRNBFqEaISDBJOEqATKBNyFBoUaBSOFQQVVhW8FiAWiBc8F44YBhlmGgYaghtSG9YcUhzUHXAd1B4WHowfIh+GH9YgDiBwIOohMiF4IdgiMiJsIsojBCNCI3oj0CQYJHIkriUcJUglhCXqJmomoCcuJ2onlifqKIopLCmsKgYq9CtEK8YsFixILGosoCzYLUAAAQAAAHUB+AAPAAAAAAACAAAAEABzAAAANAtwAAAAAAAAABIA3gABAAAAAAAAADUAAAABAAAAAAABAAUANQABAAAAAAACAAcAOgABAAAAAAADAAUAQQABAAAAAAAEAAUARgABAAAAAAAFAAsASwABAAAAAAAGAAUAVgABAAAAAAAKACsAWwABAAAAAAALABMAhgADAAEECQAAAGoAmQADAAEECQABAAoBAwADAAEECQACAA4BDQADAAEECQADAAoBGwADAAEECQAEAAoBJQADAAEECQAFABYBLwADAAEECQAGAAoBRQADAAEECQAKAFYBTwADAAEECQALACYBpUNvcHlyaWdodCAoQykgMjAxNCBieSBvcmlnaW5hbCBhdXRob3JzIEAgZm9udGVsbG8uY29taWZvbnRSZWd1bGFyaWZvbnRpZm9udFZlcnNpb24gMS4waWZvbnRHZW5lcmF0ZWQgYnkgc3ZnMnR0ZiBmcm9tIEZvbnRlbGxvIHByb2plY3QuaHR0cDovL2ZvbnRlbGxvLmNvbQBDAG8AcAB5AHIAaQBnAGgAdAAgACgAQwApACAAMgAwADEANAAgAGIAeQAgAG8AcgBpAGcAaQBuAGEAbAAgAGEAdQB0AGgAbwByAHMAIABAACAAZgBvAG4AdABlAGwAbABvAC4AYwBvAG0AaQBmAG8AbgB0AFIAZQBnAHUAbABhAHIAaQBmAG8AbgB0AGkAZgBvAG4AdABWAGUAcgBzAGkAbwBuACAAMQAuADAAaQBmAG8AbgB0AEcAZQBuAGUAcgBhAHQAZQBkACAAYgB5ACAAcwB2AGcAMgB0AHQAZgAgAGYAcgBvAG0AIABGAG8AbgB0AGUAbABsAG8AIABwAHIAbwBqAGUAYwB0AC4AaAB0AHQAcAA6AC8ALwBmAG8AbgB0AGUAbABsAG8ALgBjAG8AbQAAAAACAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHUAAAECAQMBBAEFAQYBBwEIAQkBCgELAQwBDQEOAQ8BEAERARIBEwEUARUBFgEXARgBGQEaARsBHAEdAR4BHwEgASEBIgEjASQBJQEmAScBKAEpASoBKwEsAS0BLgEvATABMQEyATMBNAE1ATYBNwE4ATkBOgE7ATwBPQE+AT8BQAFBAUIBQwFEAUUBRgFHAUgBSQFKAUsBTAFNAU4BTwFQAVEBUgFTAVQBVQFWAVcBWAFZAVoBWwFcAV0BXgFfAWABYQFiAWMBZAFlAWYBZwFoAWkBagFrAWwBbQFuAW8BcAFxAXIBcwF0AXUJZGFzaGJvYXJkBHVzZXIFdXNlcnMCb2sGY2FuY2VsBHBsdXMFbWludXMMZm9sZGVyLWVtcHR5CGRvd25sb2FkBnVwbG9hZANnaXQFY3ViZXMIZGF0YWJhc2UFZ2F1Z2UHc2l0ZW1hcAxzb3J0LW5hbWUtdXAOc29ydC1uYW1lLWRvd24JbWVnYXBob25lA2J1ZwV0YXNrcwZmaWx0ZXIDb2ZmBGJvb2sFcGFzdGUIc2Npc3NvcnMFZ2xvYmUFY2xvdWQFZmxhc2gIYmFyY2hhcnQIZG93bi1kaXIGdXAtZGlyCGxlZnQtZGlyCXJpZ2h0LWRpcglkb3duLW9wZW4KcmlnaHQtb3Blbgd1cC1vcGVuCWxlZnQtb3BlbgZ1cC1iaWcJcmlnaHQtYmlnCGxlZnQtYmlnCGRvd24tYmlnD3Jlc2l6ZS1mdWxsLWFsdAtyZXNpemUtZnVsbAxyZXNpemUtc21hbGwEbW92ZRFyZXNpemUtaG9yaXpvbnRhbA9yZXNpemUtdmVydGljYWwHem9vbS1pbgVibG9jawh6b29tLW91dAlsaWdodGJ1bGIFY2xvY2sJdm9sdW1lLXVwC3ZvbHVtZS1kb3duCnZvbHVtZS1vZmYEbXV0ZQNtaWMHZW5kdGltZQlzdGFydHRpbWUOY2FsZW5kYXItZW1wdHkIY2FsZW5kYXIGd3JlbmNoB3NsaWRlcnMIc2VydmljZXMHc2VydmljZQVwaG9uZQhmaWxlLXBkZglmaWxlLXdvcmQKZmlsZS1leGNlbAhkb2MtdGV4dAV0cmFzaA1jb21tZW50LWVtcHR5B2NvbW1lbnQEY2hhdApjaGF0LWVtcHR5BGJlbGwIYmVsbC1hbHQNYXR0ZW50aW9uLWFsdAVwcmludARlZGl0B2ZvcndhcmQFcmVwbHkJcmVwbHktYWxsA2V5ZQN0YWcEdGFncw1sb2NrLW9wZW4tYWx0CWxvY2stb3BlbgRsb2NrBGhvbWUEaW5mbwRoZWxwBnNlYXJjaAhmbGFwcGluZwZyZXdpbmQKY2hhcnQtbGluZQhiZWxsLW9mZg5iZWxsLW9mZi1lbXB0eQRwbHVnB2V5ZS1vZmYKcmVzY2hlZHVsZQJjdwRob3N0CXRodW1icy11cAt0aHVtYnMtZG93bgdzcGlubmVyBmF0dGFjaAhrZXlib2FyZARtZW51BHdpZmkEbW9vbgljaGFydC1waWUKY2hhcnQtYXJlYQljaGFydC1iYXIGYmVha2VyBW1hZ2ljAAAAAQAB//8ADwAAAAAAAAAAAAAAALAALCCwAFVYRVkgIEu4AA5RS7AGU1pYsDQbsChZYGYgilVYsAIlYbkIAAgAY2MjYhshIbAAWbAAQyNEsgABAENgQi2wASywIGBmLbACLCBkILDAULAEJlqyKAEKQ0VjRVJbWCEjIRuKWCCwUFBYIbBAWRsgsDhQWCGwOFlZILEBCkNFY0VhZLAoUFghsQEKQ0VjRSCwMFBYIbAwWRsgsMBQWCBmIIqKYSCwClBYYBsgsCBQWCGwCmAbILA2UFghsDZgG2BZWVkbsAErWVkjsABQWGVZWS2wAywgRSCwBCVhZCCwBUNQWLAFI0KwBiNCGyEhWbABYC2wBCwjISMhIGSxBWJCILAGI0KxAQpDRWOxAQpDsABgRWOwAyohILAGQyCKIIqwASuxMAUlsAQmUVhgUBthUllYI1khILBAU1iwASsbIbBAWSOwAFBYZVktsAUssAdDK7IAAgBDYEItsAYssAcjQiMgsAAjQmGwAmJmsAFjsAFgsAUqLbAHLCAgRSCwC0NjuAQAYiCwAFBYsEBgWWawAWNgRLABYC2wCCyyBwsAQ0VCKiGyAAEAQ2BCLbAJLLAAQyNEsgABAENgQi2wCiwgIEUgsAErI7AAQ7AEJWAgRYojYSBkILAgUFghsAAbsDBQWLAgG7BAWVkjsABQWGVZsAMlI2FERLABYC2wCywgIEUgsAErI7AAQ7AEJWAgRYojYSBksCRQWLAAG7BAWSOwAFBYZVmwAyUjYUREsAFgLbAMLCCwACNCsgsKA0VYIRsjIVkqIS2wDSyxAgJFsGRhRC2wDiywAWAgILAMQ0qwAFBYILAMI0JZsA1DSrAAUlggsA0jQlktsA8sILAQYmawAWMguAQAY4ojYbAOQ2AgimAgsA4jQiMtsBAsS1RYsQRkRFkksA1lI3gtsBEsS1FYS1NYsQRkRFkbIVkksBNlI3gtsBIssQAPQ1VYsQ8PQ7ABYUKwDytZsABDsAIlQrEMAiVCsQ0CJUKwARYjILADJVBYsQEAQ2CwBCVCioogiiNhsA4qISOwAWEgiiNhsA4qIRuxAQBDYLACJUKwAiVhsA4qIVmwDENHsA1DR2CwAmIgsABQWLBAYFlmsAFjILALQ2O4BABiILAAUFiwQGBZZrABY2CxAAATI0SwAUOwAD6yAQEBQ2BCLbATLACxAAJFVFiwDyNCIEWwCyNCsAojsABgQiBgsAFhtRAQAQAOAEJCimCxEgYrsHIrGyJZLbAULLEAEystsBUssQETKy2wFiyxAhMrLbAXLLEDEystsBgssQQTKy2wGSyxBRMrLbAaLLEGEystsBsssQcTKy2wHCyxCBMrLbAdLLEJEystsB4sALANK7EAAkVUWLAPI0IgRbALI0KwCiOwAGBCIGCwAWG1EBABAA4AQkKKYLESBiuwcisbIlktsB8ssQAeKy2wICyxAR4rLbAhLLECHistsCIssQMeKy2wIyyxBB4rLbAkLLEFHistsCUssQYeKy2wJiyxBx4rLbAnLLEIHistsCgssQkeKy2wKSwgPLABYC2wKiwgYLAQYCBDI7ABYEOwAiVhsAFgsCkqIS2wKyywKiuwKiotsCwsICBHICCwC0NjuAQAYiCwAFBYsEBgWWawAWNgI2E4IyCKVVggRyAgsAtDY7gEAGIgsABQWLBAYFlmsAFjYCNhOBshWS2wLSwAsQACRVRYsAEWsCwqsAEVMBsiWS2wLiwAsA0rsQACRVRYsAEWsCwqsAEVMBsiWS2wLywgNbABYC2wMCwAsAFFY7gEAGIgsABQWLBAYFlmsAFjsAErsAtDY7gEAGIgsABQWLBAYFlmsAFjsAErsAAWtAAAAAAARD4jOLEvARUqLbAxLCA8IEcgsAtDY7gEAGIgsABQWLBAYFlmsAFjYLAAQ2E4LbAyLC4XPC2wMywgPCBHILALQ2O4BABiILAAUFiwQGBZZrABY2CwAENhsAFDYzgtsDQssQIAFiUgLiBHsAAjQrACJUmKikcjRyNhIFhiGyFZsAEjQrIzAQEVFCotsDUssAAWsAQlsAQlRyNHI2GwCUMrZYouIyAgPIo4LbA2LLAAFrAEJbAEJSAuRyNHI2EgsAQjQrAJQysgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjILAIQyCKI0cjRyNhI0ZgsARDsAJiILAAUFiwQGBZZrABY2AgsAErIIqKYSCwAkNgZCOwA0NhZFBYsAJDYRuwA0NgWbADJbACYiCwAFBYsEBgWWawAWNhIyAgsAQmI0ZhOBsjsAhDRrACJbAIQ0cjRyNhYCCwBEOwAmIgsABQWLBAYFlmsAFjYCMgsAErI7AEQ2CwASuwBSVhsAUlsAJiILAAUFiwQGBZZrABY7AEJmEgsAQlYGQjsAMlYGRQWCEbIyFZIyAgsAQmI0ZhOFktsDcssAAWICAgsAUmIC5HI0cjYSM8OC2wOCywABYgsAgjQiAgIEYjR7ABKyNhOC2wOSywABawAyWwAiVHI0cjYbAAVFguIDwjIRuwAiWwAiVHI0cjYSCwBSWwBCVHI0cjYbAGJbAFJUmwAiVhuQgACABjYyMgWGIbIVljuAQAYiCwAFBYsEBgWWawAWNgIy4jICA8ijgjIVktsDossAAWILAIQyAuRyNHI2EgYLAgYGawAmIgsABQWLBAYFlmsAFjIyAgPIo4LbA7LCMgLkawAiVGUlggPFkusSsBFCstsDwsIyAuRrACJUZQWCA8WS6xKwEUKy2wPSwjIC5GsAIlRlJYIDxZIyAuRrACJUZQWCA8WS6xKwEUKy2wPiywNSsjIC5GsAIlRlJYIDxZLrErARQrLbA/LLA2K4ogIDywBCNCijgjIC5GsAIlRlJYIDxZLrErARQrsARDLrArKy2wQCywABawBCWwBCYgLkcjRyNhsAlDKyMgPCAuIzixKwEUKy2wQSyxCAQlQrAAFrAEJbAEJSAuRyNHI2EgsAQjQrAJQysgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjIEewBEOwAmIgsABQWLBAYFlmsAFjYCCwASsgiophILACQ2BkI7ADQ2FkUFiwAkNhG7ADQ2BZsAMlsAJiILAAUFiwQGBZZrABY2GwAiVGYTgjIDwjOBshICBGI0ewASsjYTghWbErARQrLbBCLLA1Ky6xKwEUKy2wQyywNishIyAgPLAEI0IjOLErARQrsARDLrArKy2wRCywABUgR7AAI0KyAAEBFRQTLrAxKi2wRSywABUgR7AAI0KyAAEBFRQTLrAxKi2wRiyxAAEUE7AyKi2wRyywNCotsEgssAAWRSMgLiBGiiNhOLErARQrLbBJLLAII0KwSCstsEossgAAQSstsEsssgABQSstsEwssgEAQSstsE0ssgEBQSstsE4ssgAAQistsE8ssgABQistsFAssgEAQistsFEssgEBQistsFIssgAAPistsFMssgABPistsFQssgEAPistsFUssgEBPistsFYssgAAQCstsFcssgABQCstsFgssgEAQCstsFkssgEBQCstsFossgAAQystsFsssgABQystsFwssgEAQystsF0ssgEBQystsF4ssgAAPystsF8ssgABPystsGAssgEAPystsGEssgEBPystsGIssDcrLrErARQrLbBjLLA3K7A7Ky2wZCywNyuwPCstsGUssAAWsDcrsD0rLbBmLLA4Ky6xKwEUKy2wZyywOCuwOystsGgssDgrsDwrLbBpLLA4K7A9Ky2waiywOSsusSsBFCstsGsssDkrsDsrLbBsLLA5K7A8Ky2wbSywOSuwPSstsG4ssDorLrErARQrLbBvLLA6K7A7Ky2wcCywOiuwPCstsHEssDorsD0rLbByLLMJBAIDRVghGyMhWUIrsAhlsAMkUHiwARUwLQBLuADIUlixAQGOWbABuQgACABjcLEABUKxAAAqsQAFQrEACCqxAAVCsQAIKrEABUK5AAAACSqxAAVCuQAAAAkqsQMARLEkAYhRWLBAiFixA2REsSYBiFFYugiAAAEEQIhjVFixAwBEWVlZWbEADCq4Af+FsASNsQIARAA=') format('truetype');
+  src: url('data:application/octet-stream;base64,d09GRgABAAAAAEcsAA4AAAAAdGQAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABRAAAAEQAAABWPilJgWNtYXAAAAGIAAAAOgAAAUrQhRm3Y3Z0IAAAAcQAAAAKAAAACgAAAABmcGdtAAAB0AAABZQAAAtwiJCQWWdhc3AAAAdkAAAACAAAAAgAAAAQZ2x5ZgAAB2wAADjXAABbDomYRs1oZWFkAABARAAAADUAAAA2BelT4GhoZWEAAEB8AAAAIAAAACQIbgTPaG10eAAAQJwAAACbAAAB2JmFAABsb2NhAABBOAAAAO4AAADuYshNFG1heHAAAEIoAAAAIAAAACABLQ16bmFtZQAAQkgAAAF5AAACqcQUfvlwb3N0AABDxAAAAwAAAATU+6FVOnByZXAAAEbEAAAAZQAAAHvdawOFeJxjYGSuYJzAwMrAwVTFtIeBgaEHQjM+YDBkZGJgYGJgZWbACgLSXFMYHF4wvChhDvqfxRDFHMEwHSjMCJIDAPFdDCh4nGNgYGBmgGAZBkYGEHAB8hjBfBYGDSDNBqQZGZgYGF6U/P8PUvCCAURLMELVAwEjG8OIBwDk6wciAAAAAAAAAAAAAAAAAAB4nK1WaXMTRxCd1WHLNj6CDxI2gVnGcox2VpjLCBDG7EoW4BzylexCjl1Ldu6LT/wG/ZpekVSRb/y0vB4d2GAnVVQoSv2m9+1M9+ueXpPQksReWI+k3HwpprY2aWTnSUg3bFqO4kPZ2QspU0z+LoiCaLXUvu04JCISgap1hSWC2PfI0iTjQ48yWrYlvWpSbulJd9kaD+qt+vbT0FGO3QklNZuhQ+uRLanCqBJFMu2RkjYtw9VfSVrh5yvMfNUMJYLoJJLGm2EMj+Rn44xWGa3GdhxFkU2WG0WKRDM8iCKPslpin1wxQUD5oBlSXvk0onyEH5EVe5TTCnHJdprf9yU/6R3OvyTieouyJQf+QHZkB3unK/ki0toK46adbEehivB0fSfEI5uT6p/sUV7TaOB2RaYnzQiWyleQWPkJZfYPyWrhfMqXPBrVkoOcCFovc2Jf8g60HkdMiWsmyILujk6IoO6XnKHYY/q4+OO9XSwXIQTIOJb1jkq4EEYpYbOaJG0EOYiSskWV1HpHTJzyOi3iLWG/Tu3oS2e0Sag7MZ6th46tnKjkeDSp00ymTu2k5tGUBlFKOhM85tcBlB/RJK+2sZrEyqNpbDNjJJFQoIVzaSqIZSeWNAXRPJrRm7thmmvXokWaPFDPPXpPb26Fmzs9p+3AP2v8Z3UqpoO9MJ2eDshKfJp2uUnRun56hn8m8UPWAiqRLTbDlMVDtn4H5eVjS47CawNs957zK+h99kTIpIH4G/AeL9UpBUyFmFVQC9201rUsy9RqVotUZOq7IU0rX9ZpAk05Dn1jX8Y4/q+ZGUtMCd/vxOnZEZeeufYlyDSH3GZdj+Z1arFdgM5sz+k0y/Z9nebYfqDTPNvzOh1ha+t0lO2HOi2w/UinY2wvaEGT7jsEchGBXMAGEoGwdRAI20sIhK1CIGwXEQjbIgJhu4RA2H6MQNguIxC2l7Wsmn4qaRw7E8sARYgDoznuyGVuKldTyaUSrotGpzbkKXKrpKJ4Vv0rA/3ikTesgbVAukTW/IpJrnxUleOPrmh508S5Ao5Vf3tzXJ8TD2W/WPhT8L/amqqkV6x5ZHIVeSPQk+NE1yYVj67p8rmqR9f/i4oOa4F+A6UQC0VZlg2+mZDwUafTUA1c5RAzGzMP1/W6Zc3P4fybGCEL6H78NxQaC9yDTllJWe1gr9XXj2W5twflsCdYkmK+zOtb4YuMzEr7RWYpez7yecAVMCqVYasNXK3gzXsS85DpTfJMELcVZYOkjceZILGBYx4wb76TICRMXbWB2imcsIG8YMwp2O+EQ1RvlOVwe6F9Ho2Uf2tX7MgZFU0Q+G32Rtjrs1DyW6yBhCe/1NdAVSFNxbipgEsj5YZq8GFcrdtGMk6gr6jYDcuyig8fR9x3So5lIPlIEatHRz+tvUKd1Ln9yihu3zv9CIJBaWL+9r6Z4qCUd7WSZVZtA1O3GpVT15rDxasO3c2j7nvH2Sdy1jTddE/c9L6mVbeDg7lZEO3bHJSlTC6o68MOG6jLzaXQ6mVckt52DzAsMKDfoRUb/1f3cfg8V6oKo+NIvZ2oH6PPYgzyDzh/R/UF6OcxTLmGlOd7lxOfbtzD2TJdxV2sn+LfwKy15mbpGnBD0w2Yh6xaHbrKDXynBjo90tyO9BDwse4K8QBgE8Bi8InuWsbzKYDxfMYcH+Bz5jBoMofBFnMYbDNnDWCHOQx2mcNgjzkMvmDOOsCXzGEQModBxBwGT5gTADxlDoOvmMPga+Yw+IY59wG+ZQ6DmDkMEuYw2Nd0ayhzixd0F6htUBXowPQTFvewONRUGbK/44Vhf28Qs38wiKk/aro9pP7EC0P92SCm/mIQU3/VdGdI/Y0Xhvq7QUz9wyCmPtMvxnKZwV9GvkuFA8ouNp/z98T7B8IaQLYAAQAB//8AD3iclbwNYFTVmTB8n3P/78zc+btz7ySZTOYvM2ESJnEyPzEJQwiBxIAxQKCAiKiACEgtpcAqWAu8vtrXEsva6qpV06J1u9oqYG39unXfLevuul3X9d2Fdt9uae3Pi/artVvbz/KS6/ecc++EoLVamNx7zz1/z/Occ56/85zLqRz3zu/5s7yH83MtXCc3n7uCu5r7KPdJbpKzBoz/cXDfx7ddd+XE0oV93e2ZWNgjqHPbWyOGJKdT2Vy5VLG6i2YQ0zk3XcU0vCufptvBSfeBk/5D5efBHy9P82n5sJtP0yw/njCPWXHAq5mY9QibZhJW3H7w/XJg84WKs0pdnDGr8fu3m5iMbMdm4iBtozdrGy1h//OsHJLZRsvTi/3dP7UQKDPvOY4jOEZP82HeiyPUxinPZFM6ITgMhpROprLlUk20inFSrJHuYlzkDSmVrSFkfGj5Qju6cLngDcWzvUkx27F0dLQrJad62mKGJp249anbhL3f2D24cGxsYbxnsNKTaiTReBR/ZrbUW+uHU6tvxTJkHye98847W4VOfjkX5IpcHzfErcI5EhzQr1ozMbywdmk5YchEmtsObBSrJQQDqsWqFDHAATGHIOJLUoP5UKkW44IFFMpSBcfOkApQI6ZIhzibq5RLObO7WAOrmJspsmRt75K5A7BIyA8ms608OUgRGxoHwRtIIGZSpjAyvrhhTkBO92QTAR2mX5jYPYE/uJPBf+JmWFgrLLl07Vy+tTU51CYsGnbz1/NDHR1/ZzaCLxIYs68cHBsbREr0lLJmNNZIzECjRpAWPYMxMtlHK0zYv1pzK7n563ulQ/+rvQBD/IKxQMQXjYKbjWMFOFa/4yfJC5zISccFDua2i1C1wIIN9rGHnoK7H9bg8ke+Cp99xCl7mm8hP+M8WFYGLNsq5+RcNVe1qpbMtzz4+i8efP31B3/x+oOv7/rCL37xhddfZ1fO7edhfpJvZnVVHutCJBlMB5PlZLA7yE/aT5+xn4YrzsBLZ+ynYPwMXGE/7dTjOH4SXuJ4rAcUvmo5GQnx+3915gzNmtVukItw2rPhkM+rCTy2nwy6My6YFCPYTxmCySC8DM8PFqavKwzCt+1j5As23qevI09OX9c5ONjJ+246c9NHp69jvQuM10zhPFKw7RzyGt+A1tPRbPq9Ei8g8qUCSHGoQRUfdDDxgXKGpMMJupOWWZwPyaLJm36QUp2QreLyd3mIHOkukheNuElCqcBnjUSImLHo4oR5/p/Y2gV+SXJVcinwZuLrWuicFtfOBVXNmjT1Sd2EyehGv0GijVFi+OsPdx1ny/S4mViawB+0WcFzGtayIuf8Bpj6OY7h8zTiU2D4zOEGKD79lzRH/B6JMHyyOi7EYqWKD8TEe8RdD4wxxqGP5iHwPLKzGZ6JF1wlxRYw/wg+b3gr6clUxfcG4qNGJw3/JAI1aYWDDLVQs471EoYRcO+fOU7ZCV6gpa2tJQ7LTReJDgcpjpMQl6383+LYSCgJ+rhhbhu3i67xj+9YPzrYX834NAEkilM6ZXQX+VI2l4rgQzgiySaFXUcM4qJlpFMFUi5Vy1l6KUAOMS1axXC6Ug6Wct1SJGi0RiQsxM+DbsQ1l5LL3WWW0x1JZSkduouUKSCzMGHputUbJpKpxKJFg583ouryRabZmC0W8ib5p+xQLbM5m24rwdaxSqHy232E7ONhedul6WIsIIBH5r2RivBJ/moloXR2pez/6BjogI7BvNjzcfhRugOWLQG4SZai1uKNPtGwgqauGWZXy1f0RP+cdUne7Jrn533r545tgUa7s+ESmCiHw932Vy65bocZjfd2ZE4S4Lfm44a1aCv57mUknShC12AXFHENyZSWwvNISx6fqWQNcxY3yIUHAtW4aYQCuldTJIFwMjKHapkueBnce66eRpq6szzl3JGWOG3mA7vQ+RGHZsDJIMOmU6cyr776Y34B3n/841ejePvd737HrzTC5/SMfo4nPN5958IGRI3/iobP+eK+c0b0v4wozNv21Lr5G665xv6i+7Bw3efWzb9h61Z792tGSt2vKPsB6FVNGa9FMsqWM2ZK2yZJ29RM5MwWNWWxNbCVvxJx1blmroObR9dAeW42aYYUuqaBzXqdUOjjEHZSkHKS1XdlIjIzuaUawJOHfj648x9++uIOfvDn/+39nned3E2cxK6T8GhX59XZwSzJ19qu7uyyJzCZG8xmB3OYOnVRHjmIb4edTHpzx+1p/iz5DlvPacSmzNW4cTpuSwfn9ZQ627MtZsAjExw3XNIpKU4qYbzTRV6xqhXkXn7kWzLysEq1km2tZ8FMmZkHQ6aMIEeFN0HBeCrf20Haatkb8U8oVLp+cSkfaIzxPcmK4ulYPepTG2FVvr+NdPQU7PvcMr9z71+7QjPO/5ehXTF+6Fv/8K1D4/8Sz7OiYLoPb/673ih5A//OdyTbl0YL7cmB1nqRT7kPV7j3H352XzB4y5HN37hjbOyOb9TlzNNMP1yJ8mKQypnWWeqX1Y3CAzmYNUtlq79rhove4SVZTl/Q6iym1UWSDu82+bOuhlW2f1Ke0cCc5AUdrJzHWX9RNjQ3dwC+uX+GxW3bFrfeJ4FFL0rn49vinDuHH8Y5rHEpHPExOoeXDhQzDX6Ro3O4G1dhOY3LUAbDXZSIQtDBIxJE6Kk8DNPFmaasPI0E4HEuRJiACmO6O5eWu+k93B0mf3Ftm0QIARDs/5COibp8TFF82zRlm6LhD16xn3tJFiVF0g4shHkvCYqkiJ7/8YmpfOMdjflHcret/RTZcXOjSjyaJk0vluRjonhcjfCcomnKNKeNHihCTpNEIAO3Fe3vCRoqFmQQftvfPz7e3w8fsyfpuF6McxG1fsR5qNRVx7n1As7i++J8MV58nQaylJuhQp0IH4A0EWah53EIIPDgksDLKNDtIK3Kn3wPzp/t6xsf7+uDnfZhcuBAN+IvitiVQ4Lv+yV8HEQ9GvXYJ9hcLnAl1KO7OtstQlmUifKLyrBsDrUOC1cowUs2VxAqVarQMuWj2IpTlg9iQZOfas7nmztir/0gkRUMj+CNxo3gug0NQqOmC4oylMEV3wre3wA052HkBy+/Ar/E1QWnMPW3Ia1UM8KZWMoMJmJ61DeSGiwMxEut21pLpzti098nxuPWvZaj838H9bACtwBlsfLMosGiRmGla8aQLYQYR0TW+TSqfChx8RmFarY0nw4a8k9UK8o5qj23QLKKOjSdjNSySlKFmke1Z3/rLs2Ie3YoYjbV2zDc3JOPa8pmT8BnKh9L7KdKkG//NR4z5rkGTm/wxKKCcg2+tX9rP7Dlnq3Qi0rThsFPeGKmZ4csREM6vGV79aihKLu84bjnk/PXGnEDjl6jxQ3tmmuwI+2aoyaURrdsoXNPmrE5HfnYxLWjxoG6RrWrrcUKOLKR6hqoY+bwrxUVBZilCVpJxwbMuemqm76gKRZN0geb7ftPkf7pk7Dp9GmIm/r5DUzn4R9ht/dNDYycGj49PH32MHtz2I8mCjAt0VGyTAiwG31lIn985/fIH6MoMwzkj0GZ6uGmDEHK4OmaKQdx3SBAvF8N2r80ZdmvTWr2L0PhKHnRIk9aAfuX9rWWxnsmNT/4IRyYS+fpNLa5BtdmG5unxQ6fwMZeJzjUVUS4Ylqmq3JRuw+FUQ6tKKoNYM9oNlWDbJzXDO185Ikv7hjl1y6L9gdCSrTS3zG+ee/GiSzfX4kq6X5r2Vr7AZQ9QOfn+o88tGtoaNdDH9l8rIZlrf7gnL0Le7cuLRSWbu0d2p0P9XYpoXknYMS+n85/2IxXjmf4/yWO5TLuGu5jaC9s33TVyqrEMzrwKA3poFCNFoEsI3dApb6Srd+rzkMJDdb5zDqsESvCxs+tKlkmpirVcCVnipKJI0+VnyyOPNWOZtK0pMz/uem9XxtonZ5uH/frPlz9AgghX1QkgiBrXpMHgRDNpzXyAkHmqoqS5BFRR47I8JdzOrz3GW0lu8nvFfWFhA/EhccFiEw/RyQFVig68RJFtp+UddLLKzKswJXn4ekbxSuQ4USbLWe6oL+jNeX3yaIuSFJjpD8imR7VZ9QMMYr9+/TBiGCoXtkT1AwtRFkeiANttjSYhaA/F9JJ1hdWgrIGXinDrsfdZy9oisuvzzLbKYorpofy67mJpgbDJ1N+LaLtR1lVGrkVIw+KVxMXRiXcnROD9bVBL0FnwSAfoypkBJ6Et15DWXjqsCbbe1hncKesTX75y9StMv0azin7X5moJVdjMa/y04B5BWyOW2enMhcAtD/75TfsO1mxNYkIeYM9PStj4VKUk985h3PkdaZXjXKruc3cx7nbuNupXnXwU7ftuXHLxqtWXdHTJFB9GJmxDgVSsUST6b+5VlxIpqwz/pbLVum06S5aOOq5bI6+Ql0xW2Hv4mCZcgu0OrqxLOI0yaZTMs4SEw2WGrCUDjQVtsrIKnMy7SLdApATI3ILQYKIVexPJlFmN4WExuPQFBCDw3JYtj9ZE3iFCJXO0fGlXd2yUCmMLitkRWVoCHloYdlooSLwZkPn5eOjhR4eZ0sNPoXVhoNiYPqGxtjcUjUfwVt3z5yGubFGc05PN94i+eq9lZDS4QdBBdhbgfuH7RVrRAEZoB9eHbZ/eB1IsN6MMWhSP/S0KRlB+F4riTW2jzd3dnQuyuMtpIhtc0Q52Nk8nk/2mx2dzWMdTU186/dEIaPmvJdHR2NJIzoST9qfiI1aRpJeYE9SRsnVqBPs+EAIFmTeHCiLvCyC/1j6p5cTwtwELh/ycF74f+D/40LPww/hW2ji3EdZODJvOlxxYBo7rl6q+hZrUKZDZGVrZD5I2bIhl7JSuSBQOwb5VTZFS8uVXFauoNFXIDh+koG2LurMsrOkqWjDBxw8LET/ilmkZZqu85xZZbaP2W2WckVWQLJoYWwdDclKNo0N0zQa3TgXUlJKMmWcIGYn4DPOnpKVk+QiNlFGfd3C2rIp0xmEs0SOE6NqylgPa+ayktlNG2pBiKpSC48agUQbLGMpBCKHNm43TjO0ANCMl4txoYWnzgnKl6sptq5wNlbK2ApeELpSFs3gCqKLeBlSJF3B6VfB9zLOSJ4yb5rOUeSoTyDbCWYFW0KIzWqcIHkqVdOinpFsOVem0p3ZgLkilkghNDXoNtmtalaQlaIpkqZpXACVYhlJwleqWRRGtF368wOiFkGK4bNEqZ6tZCntK1IEh6gAVbaSMMcyJBOe3PXCzp0vnP2HHdLN34IQKDzyVT4YCePaF7w8jpogaKisgYJTVRAEIkggEUUVBVHkQfGCGJNR7VNwdhBZ5QXkyQRrIfsTUaoZehj1WyBARJVAWMXaoqTxiiCLPJFUbEtUBZHniSiALnv8QoDHRgWFgqFgbzzyciEk8l4vYCFvQxPPK2JY5D2Cz4MdSYIiqMKyoiASCaGJagiDKCAQAjD1UJPlkCCruLAFomOa4HogxI+WKxrNIgiaBtiC6JUJr/CqbEqSqCgBwcB2sHFe5wXQRCWoEarZopwBjfBeXPxAED6eyB7shygGj1o9oXijUop3fCdEeZVHCHgf0Sk9BMySEAhCsZIVUfYiJQlB9BkkMl5DVHyJXqKiEFOQWlhaU33qDTuXgRd82EIEsBGeAuJFBETQAHtA8DUcI0LFjZdiKHj8QFTM8+w6+frJXexi/ycoRMLhU3jRA14shCwdcUbaApG8osRrgCMMFEskM1BySQRpj5xKFiRFkwVREr10ZmCmV0W6iIgEHyS8Lkv4nleJrPES6IKGLYqImCbIsgyqqMgK0omn5MQZofG8TkTsSBRkgpLIj0QkiLyOBXiZx6kGMPcKnGs4hpJfw/HFaaarhoeA1EjAQnh40eD5ABJaUERFAI+lixQhwavogg6ax5AVEJHsOBAhXhMEVAMIr1Eie0lADSNSAkKioaCg44kkD4h+keBs9CDFBTpyuqqLKuDUJHQEBR4Xikj8Gh1XpADOPwv1CxwBP9E0tMJ4waOKdILgIGBJOmlxYmF1xBDTOIUAR5nYvshKHF/s3A90PeDcIEgO2ihB3UaXCC3FZhbSRIwpQVVXvUQIyKiDvvPO74UunmrS0nGd2eiOxKe6YpZqxGi70EvEkOMgdO5bOz11/T0wPgCP7159OJWr9E1YI+v/Zc0+OLJl9Oa4X939+Max9ERfPh3cRX0A79jvbIW3sf0Etm8Iro4rpZFvVcOuYA7XgFmGhsxTaQxvaJL9ihxQVI3seJWIGo7/TURXnvXoZMN/ikhN0+ObvlkHPqDAd3pAVnzwz4qmI2Fsu0I4ccbvcGFfyj/gXUL3odJNYQ8vzm2vvmsf6D3poJMuB/9wOvyu9CSzRtnl1OxHebusscvpP1igUH/QBo7TJ3r57/a36SMM4vWl6bP0mUTxCub5F2mCr+CVq/vjST/8ktORthqjbd3erlsy2jlPzHPOg4rRW2iG/KOOz/iLUfODjj3W74N/dOoTZ+xRASxA3YvcZ/htL1p0XuYb1v6KmjJxD/X7etz+4Xqyj/NhfQ/bRwgaTvdM1MImI6GywrEoWY1WnulxwXHrLiD7Wd+eC7BTitYA+4YFGgMUy2uwXneRcGBxfEv/h/86mcNsJwa7SlU+t2tLdRAw+L+yr0XQ7Ws9nnWeuAZt0OaJedd5YNK+zuOBL+C7dR6P/T18jQVirN2/Ibv4haxdf71dilJVrTeO7ZKt2CRtyANt9vfcxh/S4Ab7Gk27CpGEObQnz1Ua7Tvm7p18nSy+0C5qi6ncTONuu/xf0Zbs72GbTusP0bYe8mxbhxNgjn1a09yenGZdeO+rw0ttSJWYjJI5t1lKBvKZGRQ9lBbYAEWcfAV7Oo2PCCY8rDkNX6XF6767g+T/cHFst9Eza24Fnd2GclC+CHT+YCQf6YscbWsZjuePGv1GPhKBbUY/XiJQipmYPGrvac5ANgZ3Ho2wwpgVsT9nur7CO/gy+aXTnzMfZKhPpqTrMkzmZoaALxtYtTeSN80v0XYzzXDnl0zsptfEbqE3btj3GAhEf+RL+TiCBEcjDCb7c8ZMf2uwv2bsL8zwYzss1nuJ52cbR2syzfYeF27aMmzHnihScCcitd5Fut3NoJhRUI62OX39C38Q+RHFLXwBt/psbaG+MbqZEwlWWZdIS4ab/blIZA7ejyIGzfmj2HM+AgcoZkjb7UafOcfpPw8dMRe4Gb/rWuxvIfbXodL+ZFTs6l5ValLnZKqm1V2sLVDNOby4zv/8qAnmsuxRjjCHRI5894UXxgNzjcA5S9WCyzBBt8HoZlBHcBxTHl2WTVM/Z4VpclkwjHkmMntZ95AM5ofC0XO6aUVo1WXBiIVFo+EQq8mrNGtugOYE5tIMFaEnM3hEuS5OeWZu0lCIMw+ppu+GCVBm4VAN6AYA9Wa5k4Y6sViMwKPiN8c1w8/2rWKe8W9KujQgwglkTu6z+Nwylm+CqIjfXKbF2QYX5TVYQJovwf+eldAltwTn7q9/k1/O85zFYOxoCTMYcS5l3wUKCzdwYaeEp75Bcwb2JxGyZd8UA+J8SfrmOPI6JAg8euHRiGvLKLAITC+mibrsOVEcwPJYArkk3CBLzpM+K9eZC47tP4RzoTt4gc/OgzR1610QGH1QTkdms+9mtstWn6IM6gj1xbMZetZz2BM3To8gT59ExjGJYI6cRtlw2DMrA7nNrAzKxT9Mudktz8g5/iwJztIh6jgk3wVx8mL4pk8aFDYKokH6L4biop7rvTF6waeRXrSvmBdcv2mQBibMIhX1mLh7aSbcaerDw3SCMErgTKLNEdVpnDyMo0fhqGPmwoE/Zie/g+MzxfvYntEiTnt2Xmc+16jwzhzKpd34leqF7Y+ZPRCqmdW3vYGRgW6OkpqAFif186L0l/c7Tpb9zN2yX1Oo3wUTI/d89/PC4X+7C1L5fuP5jbeMH9kyQPq3Hz561009/KLnI3CPU4u6dJxa+6nqsV9ruP4I+fyL90l3UUde5PlFta13f/Hwjl5hcPPnL79l4/MRzsXpKbT9A5zKhRAv7dmE5dXQVEGcSjmgMRqoqGfTaNTLRivdw+MpzOQHXfaVS9fWbhovTr8Cjy5Zt+KucSA/YH7ImxaTwV0PPfXg7gHYsHbUXlcsju+8AR4tjt89fuWVqx/Zidm7Hzxx/96aNLr9Me4iuvqRe1yCMMxpMlH1q9N1lrv3A2lof5tRDwY/LN0YwT6YVDRe4ilS471cgMtxVyKMq2uJiJfRiXliS1m6/Cp06iGQJKUT2WghptVdYb6sqiHjG6o2u39SWidommNFqrmzvwJhG4V8nMADXq9O+pvpOMYqHauztaVLl9aykA0GR+RPKsOSKWWHL21IJfhGXW9QMg2eQrFLbcyA3KDrjSSVaOgtjm/ZsmWsQoK0jYaYFtBC+ea2oUI0Whhqu7QjFF65bNlKqVHsuPQj85s6as3+FsPvjzQHfL7GWEOMJKxYo88XaI74/UaLPzaQj83/SHVDLUPaejde8Bldjfze4JJcAenR3toSDdTH7IJ6Xl8BNNSDp6FB1bofCSkFb2nKMWeyyhlFO7v804/dNU4m7vjK7atuqfsi3nruVpI6RzVzLHESC393xacnyPjhLx7Gkp9e8QnXtt11kvlO/5WfIr/gwmhJLOVupL7TLcuGS/lokO1RBxmjn4lIoxsmYZRNEotmqvF0e4WaUhbzMc5kVOkIlpifiplYF2VSh3eN7tlnmYeyXoCJiOeOsA2EI88hQzvdlRNVZC5eMxAQlKgc1ATDr4q5rskNlysSCrNIwjOnUJjjSUQMv6yMrb/78G5ZpjK5ocFYNEZGh40GIcSbRkCWdx8mh6cfoVzrOVM/hX08pxn2/8yP+nkj4A14vbFMzCvpihdr8/7R/MojCd5ElhlQ42u3rI2rAeShJp+8e9Vt3ytihuHz6nr3fV+5r1vXeYn3GZjZfcqVl3g5SJ5m9FSeoWQkfyIZPzwh/hSc6vbMkww26Xiwbs+8G673dP/eXpxYqKd5jV/BUS1sCc7lkUW1OTLgXA7LdBrXgKpjwPYOUzkZmWKlSpUZtrfNdrV1oPE+1DQuZ3OzdG0qinNUY7SK5r09Uerh3f3iltGWeKXaf/0RMBIhOPpnh/0mCQXtB6gzOjC5eN5hMSAUJIk8hSpEQfy+/ejWyy5dBwsv7a0Nsw274Th0vjg8ugU8ldiRLe67fV/3jZrUBDNH5exhCSsGBPI0uy+yH4Pm0a10a5TtjT5NDiKuOa4bx/SSjkbN1YEoInGg8QoF6p4so9HPkES0zWKFaW9mLmjQHVNEKA7k4NGbJ1nn9gPsNvlnj6HOZgLyXYL3yS2f3wx0F/EfZwPn+/o+F+ItR1zg/9H+yegWsn2EAkk2O3ra71HfP4nSYABh7I8Zzr6Y7OpC9RGmShlaF3V7v0qV5RpYdHiCuGDTqVKWOl/dlyb5nMf+VxTqbkwUSnbo9Jxcv/AYigHqJQRFOdZagkrmhKQRUn+zcD3VQuyXUVWYcibNFJ1A+OIZe+/C9ZriUSWfrGA1uANrC0QR3DfruTou28h3kN4Mlw5dZjGdJgshSV/wSqCSTV8h1JIcNFBwFFEOzELZiYp1UYZNpA4dwq9o7wKfSIRIFNmYiRom4oqrAHEtkJCoqwKsXwh3XAS5vdeBHDr+MKb1OIIpnDc8rrg0N0x5aynXYvllQvelrGQwSbekcBwkXCsmdW+3vitdnYkrdAWD1e0ors4TU5KG+dD5N06jUKZSAS/whKak6TNeTnfEzr9BtyRHSq2Z1tKpSiaNYKOxdQXp3zZFC1186Zgu09Lkn5rzFbZXX3FveQ41jQv4XIjdauJaELdursr1MU/Ux7n0QGLDiiVDtf7enkqpsy2ViMcao7Nju/yIO6re9C836w7vuvNlNiFp/IGJdk4FZpWvunmUTtXuD0mnqam/O3bs7+pXeOD48VPHjsETU1Onjh8/Wd9apNcH2KtTU1OhD0PJqampzLFjxzJT0yenztFL5hh0TbHGptgGYBbzpqa2zXr1x8jMeOtu/hHUExTUFKie0NIQ8khUb6rWwyZbZ/wqcWhFPQlyVJOqFk1m30csZy/olBskCVvtg2is96FVvc+cgPu8TQeuoKwksbhBVb+0neSXJP1aPTDynH3QMOah8Q37qhP/abYuWQ9HXr6bGAEpJK/f308a5hoapzL+T/kNPzMLqCdyIc5ya8BYNLRgoFYtZJtjDdGIoQnAqdQnmS63Xoh9ootzPtDAGHxP7zyzxV1zAMfNsc0vhMvToJowljt5Eu6kK5RGGehn7fj+/fwae9N+Go0QYDEJAeYMdGMSdFiwf78dHxgeHnGr0NenhochPjIyfXJ4mBysV6NX+9V6PRrXMOwUc+Iydgqd/GU4JiHE9hbuWe43NC7jR3/76O3XdTdEAjhANM6bxr5R3i/SkbLoE8/C4XDMZCduUaZjhCNGYyAkupXE/Kw5JgOpNkR13yyNaXQIVKmiEkVf0k21CipWjPOhkLRQWFuoFbMm6b4aUEcG05VZfAW2htzSaTLLPB9V5vHGJumKqNI5whqgAAVn183mWN33rVopXlQX3nJjxp/s6OkAGjLh3r+niKskb7hFEHyDHkkciJiSLPi2SJovbA0KPmlcEDOKT14pKlhQ9tCC3iFNkgbCUUnmaUHwhc1B0ScuE6JBxSdhSdi0QtJiZAjESLPH65E7eBjimzV5xQpZa+ZLARDySjAYswSykMRUfO2WziustPCewl7Ne6E0rHei1X/S3EHaWnCJkjV46cvn//l6BEYPW02tklcIDgpFj9Tf5FOklZK3KAhL/KKodHijpg8U+d0lNaW/kZX0XOKUjEd8TWEvUex/GVMVvz5fJ6StqRXAU4I2QjDtV9QxVQ34aE5cLaGkbbMgR7N8AZV0Y55TK0ezvKWcU0nFSsqFStjoTCVlxtek4fzdgjJ1WUKi5ySc8EucpK0Xz83cH5ybzjx0JqcTcPsBk5MxIzY3Sd/yvcvJql2rIKbIWzRPuE0S/eM+Wb68oVGVhcA+xRtosq6QAtJiUxCVNs2vbEYxq4lbFN1qdcoql0cbVYUP7kMO6o+Z46JfHjEEoU9XNyNndUduL80NxCNNRdQEI+Mg9vuUpbGAJl+vevtFaSAu6jhk/liTH7wyK9vQmJgre2Vj3CnqVxRWVFwYw6KXs4Kcs4/Eh5Anj6PunJDcfSSmwReA7rFTU4YShinyzP7pphRAOztOaCAvmrZIhzIaQoxAVRqbhLojpRX+50NeyXNpqTsQyyh9lfaR+zqawpqiCDIPzS0xvcuvCJohGYZMAkoiGwdeAD2/YymERI8ka/F4wisHomRB2JvjyUP+Lj2WiAkaHzGaOu4baa/ErEAooftLpR6vhPZ3m9YW95NoQPGkGlOKqHh4Ey7fkfcSkYd4WxyUAGn1SGENFRiFyXwabxXmGlHOr+Wu5nZwf8bdxkUGQvtv2f3RHddedeVYNdnETDCcUHGI1ENq3GgaC5VkurUeDjJGngwC23CzTNlIu9zGYVglN4YF+QqdSqhL09nEtttpJD3OLx3CklVh5E3Ng1wpx+MDJT7dZ8ym0cio8t0BM25Nh5yjDW+ZFf/oK6L8NemFszRaZwU8EWpOJpYHVQWAzzQtTd2yYWVRkdGKI2KloIhI7azhUxQp6PXJmog6otxi/zre2dx2WpUp1VHHlRcvXQGS2h7zJwKwQR/INymE3BooRadvZb3y+/BmBrKvBOSvyeefIv1x67Xzj8ESPSg0+QJAImbIlzxCN0kl3eppRJ4GnfOXLi6sipmKt5EHcyh3pf1r3xKzCL+2ioJBTJ5q1l7F/kzcLyqt87pqLbIegAuxqhfGZxnVMXMZZzyEDzce4QgNUUWSl7upnY7PqGBFumn0A93GzPFp3nnGWt3lDyBwX27d6hEB6P46ISNrrsx9GcfETS6bv4y4O+XV4oeg2Ft99iT4Pboq6mAI9q/hY319v/XoXi/q5NBlv+xTBK9X9/y2733oMK/1T6JDNUIVyxqRuw0aWJKmyVzVoYUOMwTApCV/ABUe/0K+l8cRRgNBIP3tX8pu2559cM6laC0gKXipL//F7NYbP5gCB/v61goanSiCwK/t67vvob6+NbiuQZTkNTTpnk25gHc3amArqF4yOtRbKmQd/KUPOQ8cf2GzezKtLF54pqpI97vTH0CDSRotR5Vnew/aJA/Un2a/1ZQPMQt+4vqxNGXNBRtn8sIjo8HTjDc7++F9SIPrKQ2uXjrQX7nE2ROXHGfH7D1t6wPS4WAyaMQBaVID6Ebxl5ZkkTnqXGMjF0zXXXaUcXVTxk73Y+J/EM7DLhZoYIzYXkUh8DJRFPvOc02C+LQkwC80pVJqtbvQqijTck/k1A7zmNmh5J5E+j1rP89ot4DR7g8/2xtJcPpXXkPTDLJpATIvcQX2OP2rwtBggYQZEFdFYhA3rtLqeztb2ZkOi5uHOkFvysNRnYD5rREV5Lso4i3mzy4AjWVLpyindRTybCWF8p+Gpc6n6kCpBgnqnNz5wi4Yv6zL72tcuSjakkthmuz9W7jt9p/fkcvv+POmDK+ggiIQ3iv4DNkIyP7VG+H2n0Pg57eTfWOHltZ2zolVinPT/RFeHDt036Ex+9Vrjm4QrsnKolcFool+UTeVWCycLx6ZwJwNR9mexg0MjyzK5pSzlzsDrMRgzV4MKz0OCvzZGaA0GkVzMUzjh7618Y6f3w7rne4VAbwaEEXgZwNw2aENPQiBQ8unGAyt3BKk5WWVlBOTPptoZTTRyvNJRUYmU3VoVnQco0wPaOGZ6pV1ozeZy6xGpRw9sLr1xLau4uKVkSYieWmgFM8D6ie6sGgMtp44dWLrqfEh0as0qYIo8EgmpSmycnGx696bEsG1RwcXLQXfyAQ8evmhpeollkjPPQgC8BI2EhejoUDbroVI+qWHfrBwd043taSHFyWKrAaCaF2ijvLFztLto+353F7OtU8dXCO41jagfbrusrSpcvzsuVOfOVBCRItxQnXKP0IH+CAKGBLcufLzq6C/XAmH/Q3x9vzKe1avvmfl1q9vIduPbX9/2pDKB9FlnOzr3Xjp3FXxRMGjhSSld+NNm3tGlh568MAY/BFyTe/646T677tdWm3lT/IrOC/y50GkVSVp+DQaAy6WmPM3Rb0bxdZkNuhsgUQCImUxdIOE7omVa4IbqVQDJ0bJMuI8TKvJLgj1tqn2XeTU5xpLy7cvLzWSx/LN51AJPtecjxW6MiFy6AYx0ZEQtx4AM1HKb1C6kqo6pxf+8nGYE+vvSaV6+mP26ceb86g69+Wbo8WJ9bdfMXEkoHlQZ01FPFrgyMTYHetWddV5hYMHjbtvC2sSeTcOfwrc8PcfEtYPA53rM4QuVwYozyDLp/7P+nH8+vH5MM+8hdkcn3WPx1/wCQT9rtHvB8N/XDfv38/cAPupK4HU7BXMpQBPsqMNnEB9wvwUO6fhxXXAzvZ1xcMB7Nbx7ZXpf9Z1Ei46s5ueOelad3R0Bx3Jy2KzqafqFD0zAm+tMRP2A+Rg/YSrV9qfMKfPmnG2cTnQnklEYI9V8a/0RyE9tyZPnjqVMNfYe5xjukIgeBbNojX0QNcar3S2YwCgy0xE9ZWBijlZQxxE5mf9KeJAz7VeytW4ERpHtnCgvzcW9iqEE5GA1RxCFKGBsZKJPDQcueBnQyXCYpvGuWw66Xpgk8XKPBawa/IWpMsg55z9fwPeHFg5UIaIqp5UQ/iXWb/Q7qKeWHg5HVd5uUnRfF4m/CoZeLm1JGaUaHXKvnOKfLR7qjvQEVgZ+OsFKxe0VOBIvQn721udBgbXgy6EpRgyZ1eAVjKLZWxBgclH7DsfgUIJmwhMBDpmzux1ch0oK9qiM7EqbAdaR/FuGWiYoLXr7CxWK8m6/5g/67F/QiO99ldXrar1pAwa4RqUBEXih+Nr4fB+I6FCswd+6dfsVz04laRQvGtgbU9LVkCm4tVE3eAfvuqjS348yTzEr3pmnyEscO0IT1pmdqWfIKOknwagOnmpILKthpmQHXomMIEW49lhSUbmE1KQ5fFGqqe2alWVwoBAehAOCigcXhv/8VUP+4JoPXoV0eCzLT1rB7riIQlh8KCeEtfwYvgnf7xk5lsKZ/kyZ3C9uIa6Yz53DbH4GKd7VAFlybBEtGjpAQEa3lihRsJFhSwsRR1Dm9ihHgegYMd/ejz8hlBjTPEKHh4FQnRFZveVEUVi9EJoAlbk5zes/12OHvlxYQuGrdwPPTHPbxITixcHTGSy/jPr2jrku2aX0VTrz/3br2G89vcol/ZzQS6FmrD2bFeuCYlJ5VI2R/eP6RchqlTaJujBUzklRVC/q7ANyIqICAiJDHVnVDpAQAJPrbwtdeTlI6nbVi75EQg/sr8Z8CzeGDADQ12eAHzfM2a/bf+H/faYxzMGCmRBGfNA76EFvQupZ3Vh74JDO++4Ay7DohsXeXUS0rqGAt8Nhz91//2fCmeN2+4nD91qODT/a/5y5uttRppbPpn6ZcLMz0sq9TgqxxlINUyciOfcE7FkpWG/YfYZ9sci8Xzza80jEZg0yOp4nmQHMlKX/f14xH4jgi8jI81nm/OAyY9FXJn010LG7bOEdJqbov3yH9CvRV9S5gmVEs1KfwhwTiMIZrPRGAApQrsfad7PMiIfBGczexkIYr0+mhV3oKfr5fdsLy5NY83YmTJHc6+bNuw4LfJRN4qPOl+tCLmcWRjsyE7CDNLdNsOf0U3qtYRH45b9bfZFAxg0E3D8+nvI3Tcw3k8lz3GnT+T1XtTtpOMZy42lc+UKEozx7ItgSDKxx0+ZOnayfO9yKM/uH/ZQh3rQdTP3TZDxedsvhmE7ja2YkWuExtbJTK5FvQLV0cPYAfUvi+9G3D0xfByaGWovX4wzNdUe3c46nLqou8333LN5e9zt723+z8nfcQGuiP2lG/X6/nUujaYvHf6gCmaVaXI0vDNNbciKs3HrBi6ws/d8yNRPTdIdMViA//elRJnIon2rfStWFdMCEeGzoa7wHSw8+GaRQJv9W78Jp04ZAZQpiv02ZOaIwMOg/W0sO0cMCDDm9++8kVo7P9ks6nWZv5nFHRboXnvanJH5yZn9zlkf07Ho0Vx+lkrAVIBNRsD+CRuKdJrdKMxpvzlru2DjMMug11POzdTt503yiW3scZujEzDakUtRL/Yz/lmOeXgXntxsHcTQeXY+cQYMFiuRkl03WIEd44oTuFNXbld1Xb1d0Z8KRLONEStOE97RfDJWWhw12mRNlq9UiLDmK3PXjhQ+h4XRRmFXWBQvpRIhzdfl0wJgeBoLy8P+VFcmoBdVYbEUUO5J9a7i3L1tJ45I4ZIIc4NHYuP9R2OGDs5ECXX0/sEooQMfGEVFedAr2ODr2G8Xix9YUE1qArUh5qENXTUtKc2XKRkidCOUxXBSDo6iEYdTlsrOtzSy6dbKe3LTKZymcvZnsWjLwuErfvazBbtWFZf3rzO8r9NTJK/7QmghrBzYPVGcwKpDy9+V0diQSD2pTczLwotPFid2D/ROlAJe9W5R5VHQTqpefwUAMGN+38QdrRU/ZkmKIBFyt+L1l0Fb6cj0J/gnyI/Qrna/c4PzLEDFY5WaNAFkSXK3nOuuATG+8sYbXzm8Y/HEtbeeOHHuBDn8jW/sI2+SH71pP/Hm6tH+E8Cd+Oq+7373sdfr8lnYg/NddHTcIFo0qINH6Fdt6HzqBLYrKOfYYgQ3vlXY83/vHObPGtqQ/bCkSwfOboPF9A78QlXx/QYn0Qi/9vwb5Bv/5dVUWkY68Np2LOKUMDXHhhE+ymI9LG4+jlWp2QorzN5DoeAq/TmrWJIpw6XGACp8KCuyTuDixbaAxWwBekyX35T6bx0xNAKWw2FVTXSFeslqQfq/v8Cl3ilIWzzULjDgwFYhXoiDsGhr8+uUCez5+5uYSdB7TQgcG4Hfj+/P7xGJWJYCwppQ+L2mgjZSehHzXT8hw8WLuOScs/2LCtl4EI0ywTVoyq5Bo1JnAYtKmzHJctUk/plh60MgSIYYUmij/Tu8Zm0e7V5VbATyZRflFfDYunQt9UznB6E8YwpBCB6/ZACo1Xb6nEODkRvurf49+YvKhyTA7HhZGhduaOy8Cg3apXa3nC5XadQn3byhij298/8rEjmzYs2V57e8uOnFRY1Xrpk4E+lvI+aZg2fMXhT5/ZEzE2uubFyEudfba9esOBPJ95o/OnAm4tgX30F97GlORdu3xg1xH6H2xYolCwcrqbBXcuwLZHdUJzPfo5BVjYhU1zFppB/Ud5osyh/pHorMYqjClOL0xHeabU7l2BE9qLR39QCqbuth6yy17cW+1/tioiYPqQ3jtxc9nlXn7y0WW0SN1z0ZD6iR1Zd9QTjnMXMTP9g3Z88/LFpwVbp8bcJzwxXprfOoRnc3XH+RPvcJAW6w195QVHOSJuczey8P5kMH79MqqiQZEoj29NhtMWhovCoczszdsHVUO3TDxoH5mY2lMPJd+52TfIW8zb4Nozxj+lWq982HYGs1G6pWqhbFCETZJIhbjrlB5Od22f/v6l3C7o13CRtHVgvwRTBocsPd5FpMrtp51y77B4FVN8P43o2BzYGR1efgHCbtp/Zea2yhyXW72PifRN70NuNNIZc3WZQbFYDuXCPvtaiSF6jAfY+/Idz8jW/cLSBjOnHrlrHFOw4//uab5O2zj7300r4nTtgn+peufhMm3uRce/j3QieTfS1cHnUHega7vTURC0vUHq46JiOLR6XeU1Qo2BHsctA5kg3drtSulsViqR1SRvfZ1lKplVzNrLnpSa9ErmZftJiSNfLOmlLr+YOZCuASU9eo6h2lVriTFrf3YPFXZ53VBu/0WxWm6FQqoVA9bm0tOyte43YgL9u4ZG5Y4llsBT1vi1Y6DVxMlyo5vOHap9+tIU6UEQ2SRsMAmWq5lEOZTT/JlqVHS2ciVGX3sy7ZC35kupVVI0yk0w16nLmTTlgXOdgRO1mBVFXXDcsX93n0qGZ6DS0Ukk095o2R3Zct3EYChtasqaHocJMYgeSGsZHKlkULvOwrG39hXJqI+bxm1Ix1jrY1Xdu7auZTXTCOenRiZ6JaAv/gaNSXDeqBhBrWvGA/QCRJkcicq/wBNd8WiuV8GQWKkeKckNGe9Xp72sfWNlpWvhk2xfO+y/JxfXCpGcmMLejumZjxZ61htsN89k2D6y4rNzD6hWfRL828dpUS+2odJQauYxTODglFZ1u0yCiMC73cTRUkM+L4Sgs88/9diPJyXevNMBMJPEPAaEjxQrNmBEjlkuHLdgd88pyQpoRCqon/AgYf91mGrlcyUIKTsY7hib5rm3JLCzEzbEq61pS81PgLSscp74KRrb3zxzYkISI2kdV1ItovhUtaypeLhdryasDfWZgjicQrELDv14xQIhCHrC86OuivVJDSHU2XrkJONnh5JhKqdBV8sfbLfPk4bGrOmw1RWLuEb+/xebLtRmgOpzDf0ZXut9EaZ76mNEz3VBcv6O/p7sznUs1Rg8aUKGyjuUBQs0dRm6KfsjDB+Y4h+0Jg/Y2OsqpCY4Hom0o9Cx9y9Q+GRboGC6Q40PXr+teS/qoyUiHFpUWyOFNJkWyxzS70Lu8h/WM4hAOra2RwYgjmoiAiqXxqd2M2SmKp+MZkFxSGCoXP1D+TdBkuu9FSyf5xYyZTypA2+MEc2kQ/6RmcW6utrdXsHWYi0ZFI/DQUI9E2U0oxHnSC9/MKV6Hf53PP5TnOA+eUGHN2pCRqXVJBgNZmNp1iZ+Gd0xBOyDAaWP7VC5b02GPz9z01AMvFVECyv9qxaznk4el0IVOAjP0tPRww9Z9JGb/4s/TA3EtSsKh6+YLVVTg28LV98+2vioGUCCvaJz7Rbl9Bq6RhSDdT/p9K+P5nqUsKA9hEhXNi3yh/28d0oDTbZRrmVnBXc9u4PdxBbpJ7mPsSd5zGvn3ty1OPPHjkrttvu3nXji3Xrls1PjpU6yl2ZBONhq4QPzubiSsCFX86uWc952Y9I6tIJ+kz/brO+5SxPsR76+I2P6hMmabpvhfMiqejTPuUWlbxN6LuV/E34qRIv2rHVRVeVe0H1IqKPzfjlEJTyrCbcm6nnSL2q859sn7DFmv4MHz+av5svvn81XRJ8lPxthdYrdudq1P1++95dd97np0rRNgr93eSFVLtFY5f1fayj7S8hXO4vp/xe34tOenuH2rPtmeawl76XceLbMmkYzzWz1ZYbnr2p3f4NUbg/K+c7+UEWUzZ+6Zm2ZQmBEaYd5ldQa/nYMLd48cLPTegcQm0LJdT2bqkrzvZ6GGy1fmKKFC3ZTVFpbifiiDUlYhJQ7TwZa4AckrnmWpbpR9AvfA+4wShY/FKxuu8J32ecVjcMQLL74L8yMhi09QmQOo4cODAXHHisCQtPbCyc8PingRRJ6TLXjn1yqiEb+WNp97h/m2TLKlYdgskoANS14sTyz0h5BsBz/J7Y7GYrk9ostTeRUpzJFmbuE/s7YFoKhPFt+LocjK2VMS394qrV5N1q0RadMtOsmMrLcr0paf5CtIgxM6hJSN+eg6tlYXfoAJJt53ihH40jwoR+iUgKnPZx1EM9sXVihUH8jfxls1PbIbemw5D7/rbR8bvfrT8b/s+8shNI2Rgx/0TDeFQVxGRXj44zwoqwi3ixq9u2rYu+e09lx1a30+GbvzYHfQLQCsf3LmYh0KwfdfAik9PoPQJKiY920HhO4l6hYcLcCb9Nmgw4HwbVKVBy+z0Rnc4SfXVZJAe43gSuvoe+sgnXrhJ2PvtP9sCXxuct86mJzPgGvvleYPgfHxgxeqH+mAvPLnzhXfZfyh/n9Hk2fYfNhsGx9Zbe/j8hnOwwLXr+nDKD8IC+3nO9fk7bdAYXh/7jinq5OGQX/eoogBUJ4dgOsj+nIbxqZWmNk3CpsPkReyA/NMkTa23X8WpFJ8+Sfqn97O+cGmtgCdPTe8nB2f8yR/nKceMI7yxBuZLajUdRQ+oa6ZGt9fjQI/e+SHJl9MRfqIl2ze9v68tAQ0ZFt4PcRb8nrn/XvjMl4bzxcUwcgk8d8ZRAs60vgnwm9/Uv531N+wbqjxncDEug3K1ROMASl0dbZlELBpQ2Lez6GHQ1pnDt+6Rg1bLD50wH1rAuYN18Z3cd7T/KJS16W4trn1U08hLeN+hTaP0Dwar1eC/3XhjKnnjjUkyBxNBfGk/QXPwj+hf6j+6xa9NFzWsGKc18X5lgNYKVD/LaqVutO/ARBVfQsHNYd/PuoV/m1/N/I4t7Bu4UiaXJSxKin70hLqMiGVmqHWQzcjlCmqnqLHyH7nX3nrPpP4pJajFBhpMRZe0G6Trb4ae7eNzuxbaP334WRgeK81ZEVA/o9/1OTj0kBaSgrIV7Y95td32D7d/rHn3+l/t/vzNRej79JOftM9vNbn/H+0cY9cAeJxjYGRgYADiAqfiC/H8Nl8ZuJlfAEUYLnLKmoJpjs+s/3/+z2TZzxwB5HIwMIFEAUhqDBIAAAB4nGNgZGBgDvqfxRDFysrA8P8ly34GoAgKKAMAdwEFRnicY37BwMAMwoIMDCz6QHoBEBtCaXQMVMfKCqQjoXpeoMrBaUGomgVI6iIh5jN+gfCZrCGYMRWCwWKnkOgFUDMi0dhIdjOuQZJbADEPzm6CygtC2HBzkDHUTWA5QTQ7YGIvsGOwmxfgkIeaC7Z3AYIG6QG7EchmkQPSQPexlCEwXL8JVE4fyS3ZSHEUCVUPDQu4fqS4AABubUHfAAAAAAAA0gESAagBvgHcAfgCCAI2Ap4DBAOqBCAEhgUQBYIF/AZ2BswHOgegB8oIIAjUCTIKDgziDRINTA3ADeAOAA4eDj4Oag6WDsIO7g8mD14PlA/MEDAQghDSETQRahGiEgwSThKgEygTchQaFGgUjhUEFVYVvBYgFogXPBeOGAYZZhoGGoIbUhvWHFIc1B1wHdQeFh6MHyIfhh/WIA4gcCDqITIheCHYIjIibCLKIwQjQiN6I9AkGCRyJK4lHCVIJYQl6iZqJqAnLidqJ5Yn6iiKKSwprCoGKvQrRCvGLBYsSCxqLKAs2C1ALYcAAAABAAAAdgH4AA8AAAAAAAIAAAAQAHMAAAA0C3AAAAAAeJx1kjlOw0AYhd9kQySCAiQamr8BBSE5i0STChQRCgokijRUjvEWOZ5oPEHKBbgDB+BanIXnybAV2PL4e+9f5h/LAI7wAYXddcVnxwptqh03sIeJ5yb9G88t8sxzGz3ce+5QzT13cYknzz0c45UdVGufaok3zwpd1fTcwKE68Nykf+q5RT7z3MaJGnju0L/13MVcPXju4Vy9T/V6a/I0s9KfXsh4OLqSxVY0rbwMCwk3NtOmkmtJdGnjotBBpFd5LR7jdFOExrFb5rGpcl3KKBg6fReXsQlt/Fx3rF7SsbWJJEavZOZ7ydroZRzZILN2PRkMfu+BKTTW2MIgR4oMFoI+3Qu+xxhixI8vWDBDmLnLylEiREEnxIYVmYtU1Nd8EqqSbsyMghwg4rpi1VfkkbGUlQXrzS//h+bMqDvmTgunCDjLT/yO8dLlhG6n5+8ZK7yw95iuZXY9jXG7C3+Qv3MJz13HlnQi+oE7vaU7wYD3P+f4BH7deQMAAAB4nG1TZ7fcNBDd+9Z1XwmhdxJ6M53QCaQACSWh9yLLY1usLBmV3bz365G8fsAHfI6lO3Om39Fib7H7Vov//zaLBfawRIIUGXIUKLHCPg5wiCOcwW04i9txB+7EXbgb9+Be3If78QAexEN4GI/gHM7jUTyGx/EEnsRTeBrP4Fk8h+dR4QW8iJfwMl7Bq3gNr+MC3sCbeAtv4x28i/fwPi7iA3yIS7iMK7iKj/AxPsE1XMen+Ayf4wvcwE18ia/wNb7Bt/gO3+MH/Iif8DN+wa/4Db/jDzDU4GhAaNGhh8CfWENigILGiL9gYOHgsSkbZvtaM9Mk3pJJ42H39DrjTHGSySi9TQehvD1otWzIVDSM7rho9FZJzZrMj/FadsKl3Ndki4Y5VjNLacd8R7kVjgY2HlhtXKXYQJUfj/4VYpxyoI6NvVa0rH2XOmbXNmuFdGSWum2TWut1OjLrqLBc2OBs007qmlIutW/SVoYeipoZ3jPjptKqRphQWrwKSa2LoDSi63doMtEjqdVOF2EezONdTvYRxQC16Ga/gHahIpgCBHDGkBUnVLVeyopJt/8f+WDGdmBSJoPe0NlZ02sjTrRyTJ76b8g4wZnMT7QeKqHSWmq+LiZJe1fKWELtZR1b5utyo6WfRrk/o1jQasZxZoN3tBwEz0k1TgxUWhdmE9FRSBOU7JTJUzHbGlK8z60UgWZbhEXYCE42n0E6MVQEXqgam7acwFabZjUhuhXWJcyFV45uudSZwMkh18NAyu0y5bOUBJrcKh47fVKTlEU84gQPmXPBSGgVpXQ0InhQI1zearMNe5oaGuVxOZ3BRC7pmJaOdUn47WGczkRe9C7/kZKIkl4PlAjV6qQnOWaW4soUYX3GUaguM7QVqllNW1RJEZqdigrjPDoFc8XhVXR5yBtVq0Ah76nxkvb4NuSwrnS9H2ob6ZlRpCe3IYsik4UOWci7puPdwwtD8clWtCIsiVblLv8oaK6EGWKzMux4VhNbh4c6sE7wNIa8sFj8Db5cdxl4nGPw3sFwIihiIyNjX+QGxp0cDBwMyQUbGVidNjIwaEFoDhR6JwMDAycyi5nBZaMKY0dgxAaHjoiNzCkuG9VAvF0cDQyMLA4dySERICWRQLCRgUdrB+P/1g0svRuZGFwAB9MiuAAAAA==') format('woff'),
+       url('data:application/octet-stream;base64,AAEAAAAOAIAAAwBgT1MvMj4pSYEAAADsAAAAVmNtYXDQhRm3AAABRAAAAUpjdnQgAAAAAAAAaGwAAAAKZnBnbYiQkFkAAGh4AAALcGdhc3AAAAAQAABoZAAAAAhnbHlmiZhGzQAAApAAAFsOaGVhZAXpU+AAAF2gAAAANmhoZWEIbgTPAABd2AAAACRobXR4mYUAAAAAXfwAAAHYbG9jYWLITRQAAF/UAAAA7m1heHABLQ16AABgxAAAACBuYW1lxBR++QAAYOQAAAKpcG9zdPuhVToAAGOQAAAE1HByZXDdawOFAABz6AAAAHsAAQN4AZAABQAIAnoCvAAAAIwCegK8AAAB4AAxAQIAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABA6ADodANS/2oAWgNYAJcAAAABAAAAAAAAAAAAAwAAAAMAAAAcAAEAAAAAAEQAAwABAAAAHAAEACgAAAAGAAQAAQACAADodP//AAAAAOgA//8AABgBAAEAAAAAAAAAAAEGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAA//kD6AMLAA8AHwAvAD8ATwBfAG8AfwCPABdAFIuDfHNrY1tUTEM7MyskHBMLBAktKyUVFAYHIyImJzU0NhczMhYRFRQGJyMiJic1NDY3MzIWARUUBgcjIiYnNTQ2FzMyFgEVFAYrASImJzU0NjsBMhYBFRQGJyMiJic1NDY3MzIWARUUBgcjIiY9ATQ2FzMyFgEVFAYrASImJzU0NjsBMhYBFRQGJyMiJj0BNDY3MzIWExUUBisBIiY9ATQ2OwEyFgEeIBayFx4BIBayFiAgFrIXHgEgFrIWIAFlIBayFx4BIBayFx7+nCAWshceASAWshYgAWUgFrIXHgEgFrIXHgFmIBayFiAgFrIXHv6cIBayFx4BIBayFx4BZiAWshYgIBayFx4BIBayFiAgFrIXHppsFh4BIBVsFiABHgEGaxYgAR4XaxceASD+zWwWHgEgFWwWIAEeAiRrFiAgFmsWICD+zGsWIAEeF2sXHgEg/s1sFh4BIBVsFiABHgIkaxYgIBZrFiAg/sxrFiABHhdrFx4BIAEIaxYgIBZrFiAgAAAAAgAA/7EDEwMMAB8AKAAItSYiDgICLSslFAYjISImNTQ+BRcyHgIyPgIzMh4FAxQGIiY+AR4BAxJSQ/4YQ1IEDBIeJjohBSYsTEpKMCIHIjgoHBQKBrR+sIAEeLh2QkNOTkMeOEI2OCIaAhgeGBgeGBYmNDo+PAHWWH5+sIACfAAG////agQvA1IAEQAyADsARABWAF8AEUAOXVlUR0M+OTUgFAcCBi0rAQYHIyImNzQzMh4BNzI3BhUUARQGIyEiJic0PgUzMh4CPgE/ATY3Mh4EFwEUBiImNDYyFgEUBi4BPgIWBRQGJyMmJzY1NCcWMzI+ARcyJxQGIiY0NjIWAUtaOkstQAFFBCpCISYlAwKDUkP+GERQAQQMECAmOiEGJC5IUEYZKRAHIzgmIBAOAf3GVHZUVHZUAYl+sIACfLR6AUM+Lks5Wi0DJSUhRCgERUdUdlRUdlQBXgNELCzFFhoBDRUQTv5bQk5OQh44Qjg0JhYYHBoCFhAaCgIWJjQ4QhwCjztUVHZUVP7vWX4CerZ4BoTTKy4BRANBThAVDRgYAY87VFR2VFQAAAABAAD/9gOPAsYABQAGswQAAS0rBQE3FwEXAWD+sp6wAZCfCgFNoK4BkaAAAAEAAP/XAx8C5QALAAazBwEBLSslBycHJzcnNxc3FwcDH5zq65zq6pzr6pzqdJ3r653q6p3r653qAAAAAAEAAP+fA48DHQALAAazCQMBLSsBFSERIxEhNSERMxEDj/6x3/6xAU/fAc7f/rABUN8BT/6xAAAAAQAAAAADjwHOAAMABrMBAAEtKzc1IRUSA33v398AAAADAAD/nwOPAx0ACwARABUACrcTEg0MCgQDLSsBIREUBiMhIiY1ESEFFSE1ITUBESERAdABv0Iu/WMuQgG+/rICnf5CAb79YwKt/WMvQkIvAw1w33Bv/WMBT/6xAAQAAP/5A6EDUgAIABEAJwA/AA1ACjgsHRYPDAYDBC0rJTQuAQYeAT4BNzQuAQ4BFj4BNxUUBgchIiYnNTQ2MyEXFjI/ASEyFgMWDwEGIi8BJjc2OwE1NDY3MzIWBxUzMgLKFB4WAhIiEJEUIBICFhwYRiAW/MsXHgEgFgEDSyFWIUwBAxYgtgoS+goeCvoRCQoXjxYOjw4WAY8YZA8UAhgaGAIUDw8UAhgaGAIUjLMWHgEgFbMWIEwgIEwgASgXEfoKCvoRFxX6DxQBFg76AAAEAAD/sQOhAy4ACAARACkAQAANQAo8MR0VDwsGAgQtKyU0Jg4BHgEyNjc0Jg4CFjI2NxUUBiMhIiYnNTQ2FzMeATsBMjY3MzIWAwYrARUUBgcjIiYnNSMiJj8BNjIfARYCyhQeFgISIhCRFCASAhYcGEYgFvzLFx4BIBbuDDYjjyI2De4WILYJGI8UD48PFAGPFxMR+goeCvoSHQ4WAhIgFBQQDhYCEiAUFI2zFiAgFrMWIAEfKCgfHgFSFvoPFAEWDvosEfoKCvoRAAAGAAD/agPCA1IABgAPADsARwBrAHQAEUAOc25eSkI8NyQNCgQBBi0rJTQjIhQzMgM0JiciFRQzMhMVBgcWFRQGBw4BFRQeBRcUIyIuAjU0NzUmNTQ3NS4BJzQ2FzIXMhMjNjURNCczBhURFCUVBiMiLgM9ATM1IyInIgc1MzU0JzMGFTMVIiYrARUUMzIBFAYuAj4BFgFMXFhgVCEiIEVFQpYUGAlSRRYWGiYyLioWAssmRD4kZiYjKDQBak42Ljb1fAICfAMBUig5IzIcEAQBCwcDDBU2BH8DXwggCC8wIv7aLEAsASxCKgU4cwHgIywBUUsBAXAHBhgXRmQNBRQXERYOChQWMB+qDiA8KVwhAxYwPQ8DDV4tTmgBGv4vGTEBVDUTEzP+qjFjbhYYHjosJMQCAQNqKh4UF0VqAsxJAiMgMgEwQjABMgAAAAcAAP9qBL8DUgADAAcACwAPABMAFwBCABNAEDceFhQSEA4MCggGBAIABy0rBTc1Byc3JwcBNzUHJzcnByc3NQcnNycHARUUBg8BBiIvASYiDwEGIi8BLgEnNTQ2PwE1NDY/ATYyHwEeAR0BFx4BBwFl1tYk4uLhA0HW1iTh4eIY1tYk9vb2A1UUE/oOJA76AwID+g4kDfoTFAEYFPIYE/oNHg36FBjyFBgBPWuwXD9gYWH+omuwXD9gYWFDXJVcP2lqav526RQiCX0ICH0BAX0ICH0JIhTpFSQIaN8WIgprBgZrCSQV32gJIhcABAAA/2oDWwNSAA4AHQAsAD0ADUAKNS0mIRYSCAMELSsBMjY3FRQOAi4BJzUeARMyNjcVFA4BIi4BJzUeATcyNjcVFA4CLgEnNR4BEzIeAQcVFA4BIi4BJzU0PgEBrYTmQnLI5MpuA0LmhYTmQnLI5MpuA0LmhYTmQnLI5MpuA0LmhXTEdgJyyOTKbgN0xAGlMC9fJkImAio+KF8vMP5UMC9fJ0ImJkInXy8w1jAvXyZCJgIqPihfLzACgyZCJ0cnQiYmQidHJ0ImAAAABwAA/7ED6ALDAAgAEQAjACwANQA+AFAAE0AQTEI9ODQvKyYfFhALBwIHLSs3NCYiBh4CNhM0JiIOAR4BNhc3Ni4BBg8BDgEHBh4BNjc2JiU0JiIOAR4BNgE0JiIOAR4BNhc0JiIOAR4BNhcUBwYjISInJjU0PgIyHgLWKjosAig+Jm0oPiYELjYw6zkDEBocAzghNggLLFhKDQkaAVYqPCgCLDgu/pgoPiYELjYw9ig+JgQuNjCvTwoU/PIUCk9QhLzIvIRQzx4qKjwoAiwBFh4qKjwoAizw1Q4aBgwQ1QMsIStMGC4rIUAlHioqPCgCLAGBHioqPCgCLE8eKio8KAIs3pF8ERF7kma4iE5OiLgAAAAAAQAA/7ED6AMLAFUABrNCAwEtKyUVFAYrASImPQE0NhczNSEVMzIWFxUUBisBIiYnNTQ2FzM1IRUzMhYdARQGKwEiJic1NDYXMzU0NhchNSMiJic1NDY7ATIWFxUUBicjFSEyFgcVMzIWA+ggFrIWICAWNf7jNRceASAWshceASAWNf7jNRYgIBayFx4BIBY1Kh4BHTUXHgEgFrIXHgEgFjUBHR0sATUXHpqzFiAgFrMWIAFrax4XsxYgIBazFiABa2seF7MWICAWsxYgAWsdLAFrHhezFiAgFrMWIAFrKh5rHgAABAAA/2oDnwNSAAoAIgA+AE4ADUAKTEAyJBkPBQAELSsBMy8BJjUjDwEGBwEUDwEGIi8BJjY7ARE0NjsBMhYVETMyFgUVITUTNj8BNSMGKwEVIzUhFQMGDwEVNzY7ATUTFSM1MycjBzMVIzUzEzMTApliKAYCAgIBAQT+2gayBQ4HsggIDWsKCGsICmsICgHS/rrOBwUGCAYKgkMBPc4ECAYIBQuLdaEqGogaKqAngFqBAm56GgkCCwoKBv1GBgeyBQWzCRUDAAgKCgj9AApKgjIBJwoGBQECQIAy/tgECgcBAQJCAfU8PFBQPDwBcf6PAAAAAAQAAP9qA58DUgAKACIAMgBPAA1ACkQ0MCQZDwUABC0rJTMvASY1Iw8BBgcFFA8BBiIvASY2OwERNDY7ATIWFREzMhYFFSM1MycjBzMVIzUzEzMTAxUhNRM2PwE1BwYnBisBFSM1IRUDDwEVNzY7ATUCmWIoBgICAgEBBP7aBrIFDgeyCAgNawoIawgKawgKAgShKhqIGiqgJ4BagQv+us4HBQYEAwEGCoJDAT3ODAYIBQuLM3oaCQILCgkHfwYHsgUFswkVAwAICgoI/QAKkTs7UFA7OwFy/o4CgoIzAScKBQUCAQEBAkCAMv7ZDwYBAQFCAAAC////rAPoAwsALgA0AAi1MC8rFwItKwEyFhQGBxUUBgcmJw4BFhcOAR4CFw4BJicuBDY3IyImNzU0NjMhMiUyFhcDEQYHFRYDoR0qKh0sHOncICYEFAsEDBgeFBFcYBkEGgoOBAgIRCQ2ATQlAQzzAQEdKgFI3NDSAe0qPCgB1h0qAcISCjQ+FBMkHCIWESAcDhgNSCJCLkAeNCVrJTTXLBz92QIUqBeXFwAAAgAA/8MDjwMuAEEARwAItUVCMgoCLSsBFAYnIxQHFxYUBiIvAQcOAyMRIxEiLgIvAQcGIyImND8BJjUjIi4BNjczNScmNDYyHwEhNzYyFgYPARUzMhYBITQ2MhYDjxYOfSV0ChQeC24IBSYiOhlHHTgqHgoIZgsQDRYIcSB9DxQCGA19YQsWHAthAddgCxwYBAhhfQ8U/vX+m2iUagE6DhYBYEJ1CxwWC24HBBgSDgH0/gwOGBQICHQMEx4Lfz9aFB4UAaRhCh4UCmFhChQeCmGkFgE0SmhoAAAAAAYAAP/5A+gDCwADAAcACwAbACsAOwARQA43MCgfFxAKCAYEAgAGLSslITUhJyE1ISUzNSMBFRQGByEiJic1NDYXITIWExUUBichIiYnNTQ2NyEyFhMVFAYHISImJzU0NjMhMhYCOwFm/prWAjz9xAFl19cBHhYO/GAPFAEWDgOgDxQBFg78YA8UARYOA6APFAEWDvxgDxQBFg4DoA8UQEjWR9dH/eiODxQBFg6ODxYBFAEOjw4WARQPjw8UARYBEI8PFAEWDo8OFhYAAAH/+f+xAxgCwwAUAAazEQcBLSsBFgcBERQHBiMiLwEmNREBJjYzITIDDwkR/u0WBwcPCo8K/u0SExgCyhcCrRcQ/u3+YhcKAwuPCg8BDwETEC0AAAL//f+xA1kDUgAoADQACLUyLA0EAi0rARQOAiIuAjc0Njc2FhcWBgcOARUUHgIyPgI3NCYnLgE+ARceAQERFAYiJjcRNDYyFgNZRHKgrKJuSgNaURg8EBIIGDY8LFBmeGRUJgM8NhgIIzwXUVr+myo6LAEqPCgBXleedEREdJ5XZrI+EggYFzwRKXhDOmpMLi5MajpEdioSOjAIEj20AUj+mh0qKh0BZh0qKgAD//n/sQOpAwsAUQBhAHEACrdsZV1VNwYDLSsBFgcDDgEHISImJyY/ATY3NCY1Nj8BPgE3NiY2PwE+ATc2Jjc2PwE+ATc0Jj4BPwI+AT8BPgIXFTYzITIWBwMOAQchIgYXFjMhMjY3EzYnFgUGFhchMjY/ATYmJyEiBg8BBhYXITI2PwE2JgchIgYHA5MWDJoKQCX9/StQDw4NAQECBAEEEg0YBQIEBAcKDBYDAQQCAgoNChoDBAIIBgoJBQYGCwUUFBAVBwGpKSwMmBQoNP4bDwwFDkMCAxAeBKgEARX9ugIGCAFTCA4CDAIIB/6tBw4COgMIBwFTBw4DCwMIB/6tCAwEAkcgKP4HJDABPCwlIg8NBwUOBAYGGhU8FQYWCwkNFD4UBRgEBwoNDkIVBBQJDAcLEQoUChIICgIEAQVAKP4GQiYBEQ8nEg4CJg0TCBEHCgEMBiQHCgEMBrMHCgEMBiQHDAEKCAAEAAD/agPoA1IACAAYABsAOAANQAotIBsZFA0HAAQtKwUhESMiJjc1Izc1NCYnISIGFxUUFjchMjYTMycFERQGByEiJic1ISImJxE0NjchMhYHFRYfAR4BFQGtAfTpFiAB1o4KB/53BwwBCggBiQcKj6enAR4gFv3pFx4B/tEXHgEgFgJfFiABDAjkEBZPAWYeF+ihJAcKAQwGJAcMAQr+kafu/okXHgEgFlkgFQLuFx4BIBa3BwjkEDQYAAf/+v+xA+oCwwAIAEoAWABmAHMAgACGABNAEIOBgHdtaGRdVk84GwQABy0rATIWDgEuAjYXBRYGDwEGIiclBwYjFgcOAQcGIyInJjc+ATc2MzIXNj8BJyYnBiMiJy4BJyY2NzYzMhceARcWBx8BJTYyHwEeAQcFNiYnJiMiBwYWFxYzMgM+AScmIyIHDgEXFjMyExc1ND8BJwcGDwEGIx8BAScFFQcfAhYfAQU3JQcGBwIYDhYCEiASBBqzARsQBRFHBxMH/n8+BAMIAgQ2L0pQTDAzBwQ2LkpRLiYFCERECAUmLlFKLjYEAxYZL01QSi44AwIIBz4BgQcTB0cRBRD9aRocLTQ3KhUaHC0zOCkZLRwaFik4My0cGhUqN5c2EggsDwEECQEBeDYBmkf+U1kFBAYEAg8B4kf+3mMBBgFeFhwWAhIgEiLeCygIJAQE2CUCHBorUB0vLC9FKlAdLxIIBSgpBQcRLx1QKiE8FiwvHU4sGxsDJdgFBCQJJwxNGEocIRQYSB4h/nUcShcUIRxKFxQBdyEHFAsEGg4CBAkBghIBQSTwQDUFAwcFAQ+yI+RNAgIAAAAAA//9/7EDWQMLAAwBuwH3ABK/Ad4BvAEyAJgABgAAAAMALSsBMh4BFA4BIi4CPgEBDgEHMj4BNT4BNzYXJj4CPwEGJjUUBzQmBjUuBC8BJiIOARUmIhQOASIHNicmBzY0JzMuAicuAQYUHwEWBh4BBwYPAQYWFxYUBiIPAQYmJyYnJgcmJyYHMiYHPgEjNj8BNicWNzY/ATYyFjMWNCcyJyYnJgcGFyIPAQYvASYnIgc2JiM2JyYiDwEGHgEyFxYHIgYiBhYHLgEnFi8BIgYiJyY3NBcnBgcyPwE2NTYXNxcmBwYHFgcnLgEnIgcGBx4CFDcWBzIXFhcWBycmBhYzIg8BBh8BBhY3Bh8DHgIXBhYHIgY1HgIUFjc2Jy4CNTMyHwEGHgIzHgEHMh4EHwMWMj8BNhYXFjciHwEeARUeARc2NQYWMzY1Bi8BJjQmNhcyNi4CJwYmJxQGFSM2ND8BNi8BJgciBw4DJicuATQ/ATYnNj8BNjsBMjYmLwEWNhcWNycmNxY3HgIfARY2NxYXHgE+ASY1JzUuATY3NDY/ATYnMjcnJiI3Nic+ATMWNzYnPgE3FjYmPgEXNzYjFjc2JzYmJzYyNTYnJgM2NyYiLwE2Ji8BJi8BJg8BIg8BFSYnIi8BJgYHBg8BJjYmBg8BBjYGFQ4BFS4BNx4BFxYHBgcGFxQGFgGtdMZycsboyG4GerwBEgEIAwECBAMRFRMKAQwEDAMBBwYEBAoFBgQBCAEGAQQEBAIEBgEGAggJBQQFBQMBCAwBBRwHAgIBCAEOAQIHCQMEBAEEAgMBBwoCBAUNBAIUDhMECAYBAgECBQkCARMJAgQGBQYKAwgEBwUDAgYJBAYBBQkEBQMDAgUEAQ4HCw8EEAMDAQgECAEIAwEIBAQEAwMEAgQSBQMMDAEDAwIMGRsDAwgFEwUDCwQNCwEEAgYECAQJBFEyBAUCBgUDARgKAQIHBQQDBAQEAQIBAQECCgcHEgQHCQQDCAQCDgEBAgIOAgQCAg8IAwQDAgMFAQQKCgEECAQFDAcCAwgDCQcWBgYFCAgQBBQKAQIEAgYDDgMEAQoFCBEKAgICAgEFAgQBCgIDDAMCCAECCAMBAwIHCwQBAgIIFAMICgECAQQCAwUCAQIBBAECAgQYAwkDAQEBAw0CDgQCAwEEAwUCBggEAgIBCAQEBwgFBwwEBAICAgYBBQQDAgMFBwQDAhIBBAICBQwCCQICCggFCQIIBAIKCQ0JaXJRAQwBDQEEAxUBAwUCAwICAQUMCAMEBQEKAQMBAQQIBAoBBwYCCgIEAQwBAQICBAsPAQIJCgEDC3TE6sR0dMTqxHT+3QEIAgYGAQQIAwULAQwCAgQMAQoHAgMEAgQBAgYMBQYDCgEGBAEBAgICAQMDAgEDCAQCBgIDAwQFBAYHBAYICgcEBQYFDAMBAgQCAQMMCQ4DBAUHCAUDEQIDDgcGDAMBAwkCBwoDBgEOBAoEAQIFAgIGCgQHBwcBCQUIBwgDAgcDAgQCBgIEBQoDAw4CBQEBAgUEBwIBCggPAQMCAgcEAw4DAgQDBwMGBAQBAS1PBAEIBAMEBg8KAgYEBQQFDgkUCwIBBhoCARcFBAYDBRQDAxAFAgEECAUIBAELFw4FDAICBAQMCA4EDgEKCxQHCAEFAw0CAQIBEgMKBAQJBQYCAwoDAgMFDAIQCRMDAwQEBgIECgcOAQUCBAEEAgIQBQ8FAgUDAgsCCAQEAgIEGA4JDgUJAQQGAQIDAQEBBAMGBwYFAg8KAQQBAgMBAgMIBRcEAggIAwQPAgoKBQECAwQLCQUCAgICBgIKBwYFBAQEAwEECgQGAQcCAQcGBQMEAQEBBQQC/g0VVQICBQQGAg8BAQIBAgEBAwIKAwMEAQIDAgYHAw4GAgEFBAIIAQIIAwMCAgUcCBEJDgkMAgQQBwAB////+QQwAwsAGwAGsw4DAS0rJRQGByEiJjc0NjcmNTQ2MzIWFzYzMhYVFAceAQQvfFr9oWeUAVBAAah2WI4iJzY7VBdIXs9ZfAGSaEp6Hg8JdqhkTiNUOyojEXQAAAAB//7/agH4AwsAIAAGsxQEAS0rARYHAQYjJy4BNxMHBiMiJyY3Ez4BOwEyFhUUBwM3NjMyAe4KBv7SBxAICQoCbuICBQoHCgNwAg4ItwsOAmDdBQILAhYLDf16DgEDEAgBwzgBBwgNAc0ICg4KBAb+/jYCAAUAAP+xA+gDCwAPAB8ALwA/AE8AD0AMS0M7MysjGxMLAwUtKzcVFAYrASImPQE0NjsBMhY3FRQGKwEiJj0BNDY7ATIWNxEUBisBIiY1ETQ2OwEyFjcRFAYrASImNRE0NjsBMhYTERQGKwEiJjURNDY7ATIWjwoIawgKCghrCArWCghrCAoKCGsICtYKB2wHCgoHbAcK1woIawgKCghrCArWCghrCAoKCGsICi5rCAoKCGsICgpAswgKCgizCAoKh/6+CAoKCAFCCAoKzv3oCAoKCAIYCAoKARb8yggKCggDNggKCgAAAAABAAAAAAI8Ae0ADgAGswoEAS0rARQPAQYiLwEmNDYzITIWAjsK+gscC/oLFg4B9A4WAckOC/oLC/oLHBYWAAAAAf//AAACOwHJAA4ABrMKAgEtKyUUBichIi4BPwE2Mh8BFgI7FA/+DA8UAgz6Ch4K+gqrDhYBFB4L+goK+gsAAAEAAAAAAWcCfAANAAazCwMBLSsBERQGIi8BJjQ/ATYyFgFlFCAJ+goK+gscGAJY/gwOFgv6CxwL+gsWAAEAAAAAAUECfQAOAAazCwQBLSsBFA8BBiImNRE0PgEfARYBQQr6CxwWFhwL+goBXg4L+gsWDgH0DxQCDPoKAAABAAD/5wO2AikAFAAGswoCAS0rCQEGIicBJjQ/ATYyFwkBNjIfARYUA6v+YgoeCv5iCwtcCx4KASgBKAscDFwLAY/+YwsLAZ0LHgpcCwv+2AEoCwtcCxwAAQAA/8ACdANDABQABrMPAgEtKwkBBiIvASY0NwkBJjQ/ATYyFwEWFAJq/mILHAxcCwsBKP7YCwtcCx4KAZ4KAWn+YQoKXQscCwEpASgLHAtdCgr+YgscAAEAAAAAA7YCRgAUAAazDwIBLSslBwYiJwkBBiIvASY0NwE2MhcBFhQDq1wLHgr+2P7YCxwMXAsLAZ4LHAsBngtrXAoKASn+1woKXAseCgGeCgr+YgscAAABAAD/wAKYA0MAFAAGsw8HAS0rCQIWFA8BBiInASY0NwE2Mh8BFhQCjf7YASgLC1wLHAv+YgsLAZ4KHgpcCwKq/tj+1woeCl0KCgGfCh4KAZ4KCl0KHgAAAQAA/7EDgwLnAB4ABrMaCwEtKwEUDwEGIi8BERQGByMiJjURBwYiLwEmNDcBNjIXARYDgxUqFTsVpCgfRx4qpBQ8FCoVFQFrFDwVAWsVATQcFioVFaT+dx0kASYcAYmkFRUqFTsVAWsVFf6VFgAAAAEAAP+IAzUC7QAeAAazGgQBLSsBFAcBBiIvASY0PwEhIiY9ATQ2FyEnJjQ/ATYyFwEWAzUU/pUWOhUqFhaj/ncdJCQdAYmjFhYqFToWAWsUAToeFP6UFBQqFTwVoyoeRx4qAaQVPBQqFRX+lRQAAAABAAD/iANZAu0AHQAGsxMLAS0rARUUBiMhFxYUDwEGIicBJjQ3ATYyHwEWFA8BITIWA1kkHf53pBUVKhU7Ff6UFBQBbBU6FioVFaQBiR0kAV5HHiqkFDwUKxQUAWwVOhYBaxUVKhU6FqQoAAABAAD/zwODAwsAHgAGsxMEAS0rARQHAQYiJwEmND8BNjIfARE0NjczMhYVETc2Mh8BFgODFf6VFjoV/pUVFSkWOhWkKh5HHSqkFTsVKhUBgh4U/pQVFQFsFDsWKRUVpAGJHSoBLBz+d6QVFSoVAAAAAQAA/7EDWgMLAEMABrMsCQEtKwEHFzc2Fh0BFAYrASInJj8BJwcXFgcGKwEiJic1NDYfATcnBwYjIicmPQE0NjsBMhYPARc3JyY2OwEyFgcVFAcGIyInAszGxlAQLRQQ+hcJChFRxsZQEQkKF/oPFAEsEVDGxlALDgcHFhYO+hcTEVDGxlERExf6DxYBFgcHDgsCJMbGUBITGPoOFhcVEVHGxlERFRcWDvoYExJQxsZQCwMJGPoOFi0QUcbGURAtFg76GAkDCwACAAD/sQNaAwsAGAAwAAi1LSEUCAItKwEUDwEXFhQGByMiJic1ND4BHwE3NjIfARYBFRQOAS8BBwYiLwEmND8BJyY0NjczMhYBpQW5UAoUD/oPFAEWHAtQuQYOBkAFAbQUIAlQuQYOBkAFBbpRChQP+g8WAQUIBblRCh4UARYO+g8UAgxQuQYGPwYB2/oPFAIMULkGBj8GDga5UQoeFAEWAAAAAAIAAP+5A1IDAwAXADAACLUsHxMIAi0rARUUBiYvAQcGIi8BJjQ/AScmNDY7ATIWARQPARcWFAYrASImNzU0NhYfATc2Mh8BFgGtFhwLUbkFEAU/Bga5UAsWDvoOFgGlBrlQCxYO+g4WARQeClG5Bg4GPwYBOvoOFgIJUboFBUAFEAW5UAscFhYBaQcGuVALHBYWDvoOFgIJUboFBUAFAAABAAD/agPoA1IARAAGszMRAS0rARQPAQYiJj0BIxUzMhYUDwEGIi8BJjQ2OwE1IxUUBiIvASY0PwE2MhYdATM1IyImND8BNjIfARYUBisBFTM1NDYyHwEWA+gLjgseFNdIDhYLjwoeCo8LFg5I1xQeC44LC44LHhTXSA4WC48LHAuPCxYOSNcUHguOCwFeDguPCxYOSNcUHguOCwuOCx4U10gOFguPCxwLjwsWDkjXFB4LjgsLjgseFNdIDhYLjwoAAAAAAQAAAAAD6AIRACAABrMUBAEtKwEUDwEGIiY9ASEVFAYiLwEmND8BNjIWHQEhNTQ2Mh8BFgPoC44LHhT9xBQeCo8LC48KHhQCPBQeC44LAV4OC48LFg5ISA4WC48LHAuPCxYOSEgOFguPCgAAAQAA/2oBigNSACAABrMcDAEtKwEUBicjETMyHgEPAQYiLwEmNDY7AREjIiY2PwE2Mh8BFgGJFg5HRw8UAgyPCh4KjwoUD0hIDhYCCY8LHAuPCwKfDhYB/cQUHguOCwuOCx4UAjwUHguOCwuOCwAAAAP///9qA6EDDQAjACwARQAKtz0vKicaCAMtKwEVFAYnIxUUBicjIiY3NSMiJic1NDY7ATU0NjsBMhYXFTMyFhc0LgEGHgE+AQEUBiIvAQYjIi4CPgQeAhcUBxcWAjsKB30MBiQHDAF9BwoBDAZ9CggkBwoBfQcKSJTMlgSO1IwBIio8FL9ke1CSaEACPGyOpIxwOANFvxUBlCQHDAF9BwwBCgh9CggkBwp9CAoKCH0KGWeSApbKmAaM/podKhW/RT5qkKKObjoEQmaWTXtkvxUAAAAAA////7ADWQMQAAkAEgAjAAq3IBcMCgQCAy0rATQnARYzMj4CBQEmIyIOAQcUJRQOAi4DPgQeAgLcMP5bTFo+cFAy/dIBpUtcU4xQAQLcRHKgrKJwRgJCdJ6wnHZAAWBaSv5cMjJQcmkBpTJQkFBbW1igckYCQnactJp4PgZKbKYAAAAAA////2oDoQMNAA8AGAAxAAq3KRsWEwsDAy0rARUUBichIiYnNTQ2MyEyFhc0LgEGHgE+AQEUBiIvAQYjIi4CPgQeAhcUBxcWAjsKB/6+BwoBDAYBQgcKSJTMlgSO1IwBIio8FL9ke1CSaEACPGyOpIxwOANFvxUBlCQHDAEKCCQHCgoZZ5IClsqYBoz+mh0qFb9FPmqQoo5uOgRCZpZNe2S/FQADAAD/sAI+AwwAEAAnAFsACrdYPiAVDAIDLSsBFAYiJjc0JiMiJjQ2MzIeARc0LgIiDgIHFB8CFhczNjc+ATc2NxQHDgIHFhUUBxYVFAcWFRQGIw4CJiciJjc0NyY1NDcmNTQ3LgInJjU0PgMeAgGbDAwOAjwdCAoKCBw2LFgmPkxMTD4mASYREUgHfwhHBhYGJkc5GSIgAxoODhkIJBkLLjIwCRokAQcZDg4aAiIgGToyUGhoaE42AhEICgoIGRwKEAoSKh0oRC4YGC5EKDksEhNVUVFVBhoFLDlXPxssPh0PHxQPDxUdEA0NGhwZHAIgFxwaDQ0QHRUPDxQfDxxAKhw/VzdgPiQCKDpkAAAAAAP//f+xA18DCwAUACEALgAKtyslHxgQAwMtKwEVFAYrASImPQE0NjsBNTQ2OwEyFhc0LgEOAx4CPgE3FA4BIi4CPgEyHgEB9AoIsggKCgh9CgckCAroUoqmjFACVIiqhlZ7csboyG4Gerz0un4CIvoHCgoHJAgKxAgKCsxTilQCUI6ijlACVIpTdcR0dMTqxHR0xAAEAAD/0QOhAusAEwAvAEwAbQANQApoUUc0KhgRAwQtKwERFAYmLwEjIiYnNTQ2NzM3NjIWExQGBwYjIiY3ND4DLgIvASY3NDYXMhceARcUBgcGIyImNzQ3Njc+ATQmJyYnJjU0NjMyFx4BFxQGBwYjIiY3ND8BNjc+AS4BJyYnLgEnJjU0NjMyFx4BAa0WHAu6kg8UARYOkroKHhTXMCcFCQ4WAQwWEBAECBgHEQoEFA8JBScwj2BNCAYPFgEVIAspLi4pCyAVFA8HCE5ekI52BwcPFgEWGRkURU4CSkcUGQQSAxYUEAcHdo4Cjv2gDhYCCboWDtYPFAG6ChT+wSpKDwMUEAwQDAwcJBwMBg4IDA8WAQMPSipVkiADFg4WCxAJHlpoWh4JEAsWDhYDIZBWgNgyAxYOFA0MDg4zmKqYMw4OAwYDDRQOFgMz1gAAAAACAAAAAAKDArEAEwAvAAi1KhgRAwItKwERFAYmLwEjIiYnNTQ2NzM3NjIWExQGBwYjIiY3ND4DLgIvASY3NDYXMhceAQGtFhwLupIPFAEWDpK6Ch4U1zAnBQkOFgEMFhAQBAgYBxEKBBQPCQUnMAKO/aAOFgIJuhYO1g8UAboKFP7BKkoPAxQQDBAMDBwkHAwGDggMDxYBAw9KAAABAAAAAAGtArEAEwAGsxEDAS0rAREUBiYvASMiJic1NDY3Mzc2MhYBrRYcC7qSDxQBFg6SugoeFAKO/aAOFgIJuhYO1g8UAboKFAAAAwAA/7EDCgNTAAsAQwBLAAq3SEU+KQcBAy0rEwcmPQE0PgEWHQEUAQcVFAYHIicHFjMyNjc1ND4BFhcVFAYHFTMyFg4BIyEiJj4BOwE1JicHBiIvASY0NwE2Mh8BFhQnARE0NhcyFpc4GBYcFgJ2ymhKHx42NzxnkgEUIBIBpHmODxYCEhH+mw4WAhIQj0Y9jgUQBC4GBgKwBg4GLgXZ/qVqSTlcAUM5Oj5HDxQCGA1HHgEvykdKaAELNhySaEcPFAIYDUd8tg1KFhwWFhwWSgcmjgYGLgUQBAKxBgYuBRBF/qYBHUpqAUIAAAAC////sQKDA1MAJwAzAAi1MSwaCgItKwEVFAYHFTMyHgEGIyEiLgE2OwE1LgE3NTQ+ARYHFRQWMjYnNTQ+ARYnERQOASYnETQ2HgECg6R6jw8UAhgN/psPFAIYDY95pgEWHBYBlMyWAhYcFo9olmYBaJRqAclHfLYNShYcFhYcFkoNtnxHDxQCGA1HaJKSaEcPFAIYyf7jSmgCbEgBHUpqAmYAAAIAAP/5A1kCxAAYAEAACLU8HBQEAi0rARQHAQYiJj0BIyImJzU0NjczNTQ2FhcBFjcRFAYrASImNycmPwE+ARczMjY3ETQmJyMiNCY2LwEmPwE+ARczMhYClQv+0QseFPoPFAEWDvoUHgsBLwvEXkOyBwwBAQEBAgEICLIlNAE2JLQGCgICAQEBAgEICLJDXgFeDgv+0AoUD6EWDtYPFAGhDhYCCf7QCrX+eENeCggLCQYNBwgBNiQBiCU0AQQCCAQLCQYNBwgBXgAAAAIAAP/5A2sCwwAnAEAACLU8LA4HAi0rJRQWDwEOAQcjIiY1ETQ2OwEyFhUXFg8BDgEnIyIGBxEUFhczMh4CARQHAQYiJj0BIyImPQE0NjczNTQ2FhcBFgFlAgECAQgIskNeXkOyCAoBAQECAQgIsiU0ATYktAYCBgICBgv+0QscFvoOFhYO+hYcCwEvCy4CEgUOCQQBXkMBiENeCggLCQYNBwgBNiT+eCU0AQQCCAEsDgv+0AoUD6EWDtYPFAGhDhYCCf7QCgAABAAA/2oDoQNTAAMAEwAjAEcADUAKNCcfFw8HAgAELSsXIREhNzU0JisBIgYdARQWOwEyNiU1NCYrASIGHQEUFjsBMjY3ERQGIyEiJjURNDY7ATU0NhczMhYdATM1NDYXMzIWFxUzMhZHAxL87tcKCCQICgoIJAgKAawKCCMICgoIIwgK1ywc/O4dKiodSDQlJCU01jYkIyU0AUcdKk8CPGuhCAoKCKEICgoIoQgKCgihCAoKLP01HSoqHQLLHSo2JDYBNCU2NiQ2ATQlNioAAA8AAP9qA6EDUwADAAcACwAPABMAFwAbAB8AIwAzADcAOwA/AE8AcwAjQCBgU0tEPjw6ODY0LygiIB4cGhgWFBIQDgwKCAYEAgAPLSsXMzUjFzM1IyczNSMXMzUjJzM1IwEzNSMnMzUjATM1IyczNSMDNTQmJyMiBgcVFBY3MzI2ATM1IyczNSMXMzUjNzU0JicjIgYdARQWNzMyNjcRFAYjISImNRE0NjsBNTQ2FzMyFh0BMzU0NhczMhYXFTMyFkehocWyssWhocWyssWhoQGbs7PWsrIBrKGh1rOzxAwGJAcKAQwGJAcKAZuhodazs9ahoRIKCCMICgoIIwgK1ywc/O4dKiodSDQlJCU01jYkIyU0AUcdKk+hoaEksrKyJKH9xKH6of3EoSSyATChBwoBDAahBwwBCv4msiShoaFroQcKAQwGoQcMAQos/TUdKiodAssdKjYkNgE0JTY2JDYBNCU2KgAAAAMAAP92A6ADCwAIABQALgAKtx8ZEgsGAgMtKzc0Jg4BHgEyNiUBBiIvASY0NwEeASUUBw4BJyImNDY3MhYXFhQPARUXNj8BNjIW1hQeFgISIhABav6DFToWOxUVAXwWVAGYDBuCT2iSkmggRhkJCaNsAipLIQ8KHQ4WAhIgFBT6/oMUFD0UOxYBfDdU3RYlS14BktCQAhQQBhIHXn08AhktFAoACQAA/7EDWQLEAAMAEwAXABsAHwAvAD8AQwBHABdAFEVEQUA+Ny4mHRwZGBUUCgQBAAktKzcVIzUlMhYdARQGKwEiJj0BNDY/ARUhNRMVIzUBFSE1AzIWBxUUBicjIiY3NTQ2FwEyFgcVFAYHIyImJzU0NhcFFSM1ExUhNcTEAYkOFhYOjw4WFg7o/h59fQNZ/mV9DxYBFBCODxYBFBAB9A4WARQPjw8UARYOAUF9ff4eQEdHSBYOjw4WFg6PDxQB1kdHAR5ISP3ER0cCgxQQjg8WARQQjg8WAf7iFA+PDxQBFg6PDhYBR0dHAR5ISAAABgAA/3IELwNJAAgAEgAbAHsAtwDzABFADuDCpYZjMxkVEAsGAgYtKwE0JiIGFBYyNgU0Jg4BFxQWMjYDNCYiBh4BMjYHFRQGDwEGBxYXFhQHDgEjIi8BBgcGBwYrASImNScmJwcGIicmNTQ3PgE3Ji8BLgE9ATQ2PwE2NyYnJjQ3PgEzMh8BNjc2NzY7ATIWHwEWFzc2MhcWFRQPAQYHFh8BHgEBFRQHBgcWFRQHBiMiLwEGIicOAQciJyY1NDcmJyY9ATQ3NjcmNTQ/ATYzMhYXNxc2PwEyFxYVFAcWFxYRFRQHBgcWFRQHBiMiJicGIicOASInJjU0NyYnJj0BNDc2NyY1ND8BNjMyFhc2Mhc2PwEyFxYVFAcWFxYB9FR2VFR2VAGtLDgsASo6LAEsOCwBKjos2AgFVgYMEx8EBA1CCwYFQBUWBgcEDWgGCg0TF0IEDQZQBAUkCA0HVQUICAVWBwsTHwQEDEQKBgZAExgGBwMNaAYKAQ0TFkIFDQVRBBgRCA0GVQUIAWVTBgocAkQBBRUdCwwLBywDAUQDHQoHU1MHCh0DNBABBCoIEREcFwQCQwIcCQdTUwYKHAJEAQUqCAsMCwcsBEQDHQoHU1MHCh0DNBABBCoIDAoMHBcEAkMCHAkHUwFeO1RUdlRU4x0sAigfHSoqAlkdKio7KirNZwYKAQ4TFxslBgwEEUIEMgsGPBsNCAZVBgwyBARLDwUFCCwMGBYNAQgHZwYKAQ4TFxslBgwEEUIEMgoIPBoNCAZVBgsxBARLDwUFHhUNGxMMAgj+z04JCA8OPw4CAigbJQEBCzQBKAICDj8ODwgJTgkJEA0/DgICHgk0DAEBKBcBJwICDj8NEAkCM04JCQ8OPw4CAic0DAEBDDQnAgIOPw4PCQlOCQgQDT8OAgIeCTQMAgIoFwEnAgIOPw0QCAACAAD/sQNaAwoACABoAAi1USAGAgItKwE0JiIOARYyNiUVFAYPAQYHFhcWFAcOASciLwEGBwYHBisBIiY1JyYnBwYiJyYnJjQ3PgE3Ji8BLgEnNTQ2PwE2NyYnJjQ3PgEzMh8BNjc2NzY7ATIWHwEWFzc2MhcWFxYUDwEWHwEeAQI7UnhSAlZ0VgEcCAdoCgsTKAYFD1ANBwdNGRoJBwQQfAgMEBsXTwYQBkYWBAUIKAoPCGYHCAEKBWgIDhclBgUPUA0HCE0YGgkIAxF8BwwBDxwWUAUPB0gUBAQ7DglmBwoBXjtUVHZUVHh8BwwBEB4VGzIGDgYVUAEFPA0ITBwQCgdnCQw8BQZAHgUOBgwyDxwbDwEMB3wHDAEQGRogLQcMBxRQBTwNCEwcDwgIZwkMPAUFQxwFDgZNHBsPAQwAAAH////5AxIDCwBQAAazIAYBLSslFAYHBgcGIyIuAS8BJicuAScmLwEuAS8BJjc0NzY3PgEzMhcWFx4CFx4CFRQOAgcUHwEeATUeARcyFh8BFjcyPgI3Mh4BHwEWFxYXFgMSDAYLOTQzEBwkCDs2K0iYLBsTCggIBAcDAR0fHA4wDwgEChQGFBQHAhAIICYeAQMEAQ4qbkwBEgULBgcKHh4gDAcQGAJBEwwnAwKeDzAOHCAcBAoDFRQbLJhIKzYcFxASIA4PNDQ4DAYMAgMoCigeDwIYEAgLIhoiCAUICwMWAU1uKgwCBQMBHigeAQgQAiULBhMKBAAACAAA/2oDWQNSABMAGgAjAFoAXwBuAHkAgAAVQBJ9e3ZvbmJdW043IRsVFA8HCC0rAR4BFREUBgchIiYnETQ2NyEyFhcHFTMmLwEmExEjIiYnNSERARYXNjMyFxYHFCMHBiMiJicGBwYjIi8BNCcmNz4BNzYXFhU2NzY3LgE3NjsBMhcWBwYHFQYHFgE2Nw4BEwYXNjc0NzY3Ij0BJzQnAzY3Ii8BJicGBwYFJiMWMzI3AzMQFh4X/RIXHgEgFgH0FjYPStIFB68GxugXHgH+UwGsEh0hIFIRCQgBAQMkG0wie2BVMggHDgMGAgU2LggFAR0fJhQNCAgGEQwNBwoFAQEBBx/+8R4vHSjXCQcBAwQBAgEBB0ZMUwEGCSscDyAQAWAOQCobCAICfhA0GP1+Fx4BIBYDfBceARYQJtIQB68H/LACPB4X6fymAUsOEQQbDRABAhUWEg0hkgQGAQIGDhc4GgUIAQEvP0xGLlYcFggMGgMBFkQnW/7xDUsWMgHxFzIEFAIWAwIBAQEMCP6NHg8FCCU9MD4fBw4QAQAAAAAEAAD/agNZA1IAEwAaACMAUQANQAonJCEbFRQPBwQtKwEeARURFAYHISImJxE0NjchMhYXBxUzJi8BJhMRIyImJzUhERMVMxMzEzY3NjUzFx4BFxMzEzM1IxUzBwYPASMnLgEnAyMDBwYPASMnJi8BMzUDMxAWHhf9EhceASAWAfQWNg9K0gUHrwbG6BceAf5TOydcWEgEAQEDAQECAkhZWyenMjcDAQEDAQECAlE/UQIBAQICAgEDNzICfhA0GP1+Fx4BIBYDfBceARYQJtIQB68H/LACPB4X6fymAfQ7/o8BDwsOCQUOARQE/vEBcTs79QsODAwCEgUBMP7QDQgEDAwOC/U7AAAEAAD/agNZA1IAEwAaACMAUQANQAo9JSEbFRQPBwQtKwEeARURFAYHISImJxE0NjchMhYXBxUzJi8BJhMRIyImJzUhETcVMzUjNz4CBzMUHgIfASMVMzUjJzczNSMVMwcOAQ8BIycmLwEzNSMVMxcHAzMQFh4X/RIXHgEgFgH0FjYPStIFB68GxugXHgH+U6idKjoDBAYBAQQCBAI8K6Mma2wmnCk5AggBAQEDAwY7KqImam0CfhA0GP1+Fx4BIBYDfBceARYQJtIQB68H/LACPB4X6fymgzs7WgQKBgECBgQEA1o7O5ieOztZBAoDAQUGB1k7O5ieAAYAAP9qA1kDUgATABoAIwAzAEMAUwARQA5KRDo0LiYhGxUUDwcGLSsBHgEVERQGByEiJicRNDY3ITIWFwcVMyYvASYTESMiJic1IRETNDYzITIWHQEUBiMhIiY1BTIWHQEUBiMhIiY9ATQ2MwUyFh0BFAYjISImPQE0NjMDMxAWHhf9EhceASAWAfQWNg9K0gUHrwbG6BceAf5TjwoIAYkICgoI/ncICgGbCAoKCP53CAoKCAGJCAoKCP53CAoKCAJ+EDQY/X4XHgEgFgN8Fx4BFhAm0hAHrwf8sAI8Hhfp/KYB4wcKCgckCAoKCFkKCCQICgoIJAgKjwoIJAgKCggkCAoABgAA/7EDEgMLAA8AHwAvADsAQwBnABFADl9MQDw2MSsjGxMLAwYtKwERFAYrASImNRE0NjsBMhYXERQGKwEiJjURNDY7ATIWFxEUBisBIiY1ETQ2OwEyFhMRIREUHgEzITI+AQEzJyYnIwYHBRUUBisBERQGIyEiJicRIyImPQE0NjsBNz4BNzMyFh8BMzIWAR4KCCQICgoIJAgKjwoIJAgKCggkCAqOCgckCAoKCCQHCkj+DAgIAgHQAggI/on6GwQFsQYEAesKCDY0Jf4wJTQBNQgKCgisJwksFrIWLAgnrQgKAbf+vwgKCggBQQgKCgj+vwgKCggBQQgKCgj+vwgKCggBQQgKCv5kAhH97wwUCgoUAmVBBQEBBVMkCAr97y5EQi4CEwoIJAgKXRUcAR4UXQoAAAAAAgAA/2oD6ALDABcAPQAItToiCwACLSsBIg4BBxQWHwEHBgc2PwEXFjMyPgIuAQEUDgEjIicGBwYHIyImJzUmNiI/ATY/AT4CPwEuASc0PgEgHgEB9HLGdAFQSTAPDRpVRRgfJyJyxnQCeMIBgIbmiCcqbpMbJAMIDgICBAIDDAQNFAcUEAcPWGQBhuYBEOaGAnxOhEw+cikcNjItIzwVAwVOhJiETv7iYaRgBGEmBwUMCQECCgUPBQ4WCBwcEyoyklRhpGBgpAABAAD/aQPoAsMAJgAGsyILAS0rARQOASMiJwYHBgcGJic1JjYmPwE2PwE+Aj8BLgEnND4CMzIeAQPohuaIJypukxskCg4DAgQCAwwEDRQHFBAHD1hkAVCEvGSI5oYBXmGkYARhJggEAQwKAQIIBAMPBQ4WCBwcEyoyklRJhGA4YKQAAAACAAD/sAPoAsMAJQBLAAi1STYiCgItKwEUDgEjIicGBwYHIyImNSY0NjU/AjYHNz4CNy4BJzQ+ATIeARcUBgceAR8BFh8DFAcOAScmJyYnBiMiJxYzMjY3PgEnNCceAQMSarRrMDJGVRUbAgYMAQIBBAMDARwFDg4ERU4BarTWtGrWUEQFDAgbCQQFBAMBAgoIGxVVRjIwl3AgEVqkQkVMAQ1IVAGlTYRMCTEXBQQKBwEEBAEDBgMDAR4FGBIQKHRDToRMTITcQ3YnDhYKIQsDBQYKAQIICgEEBRcxCUoDMi80hkorKid4AAAAAAMAAP+wA+gCwwAVADsAYAAKt1xJIxYJAAMtKwEiDgEHFBYfAQc2PwEXFjMyPgE0LgEnMh4CDgEnIicGBwYHIyImNSY0NjU/AjYHNz4CNy4BJzQ+AQEeAR8BFh8DFAcOAScmJyYnBiMiJxYzMjY3PgEnNCceARQGAYlVllYBPDU2ExMPGR4rKlWUWFiUVWq2aAJssmwwMkZVFRsCBgwBAgEEAwMBHAUODgRFTgFqtAI2BQwIGwkEBQQDAQIKCBsVVUYyMJdwIBFapEJFTAENSFRQAnw6ZDktVh4gLgsKEgYIOmRwZjhITIScgk4BCTEXBQQKBwEEBAEDBgMDAR4FGBIQKHRDToRM/XQOFgohCwMFBgoBAggKAQQFFzEJSgMyLzSGSisqJ3iHdgAAAAMAAP9qA8QDUwAMABoAQgAKtzYhFA0KBgMtKwU0IyImNzQiFRQWNzIlISYRNC4CIg4CFRAFFAYrARQGIiY1IyImNT4ENzQ2NyY1ND4BFhUUBx4BFxQeAwH9CSEwARI6KAn+jALWlRo0UmxSNBoCpiod+lR2VPodKhwuMCQSAoRpBSAsIAVqggEWIDQqYAgwIQkJKToBqagBKRw8OCIiODwc/teoHSo7VFQ7Kh0YMlRehk9UkhAKCxceAiIVCwoQklROiFxWMAAAAgAA/2oDxANTAAwANAAItSgTCgYCLSsFNCMiJjc0IhUUFjcyJRQGKwEUBiImNSMiJjU+BDc0NjcmNTQ+ARYVFAceARcUHgMB/QkhMAESOigJAccqHfpUdlT6HSocLjAkEgKEaQUgLCAFaoIBFiA0KmAIMCEJCSk6AakdKjtUVDsqHRgyVF6GT1SSEAoLFx4CIhULChCSVE6IXFYwAAAAAAIAAP/5ATADCwAPAB8ACLUbEwsEAi0rJRUUBgcjIiY9ATQ2FzMyFhMDDgEnIyImJwMmNjsBMhYBHhYOjw4WFg6PDxQRDwEWDo8OFgEPARQPsw4Wmn0PFAEWDn0OFgEUAj7+Uw4WARQPAa0OFhYAAAAE////sQOhAwsAAwAMABUAPQANQAowHhMQCwQCAAQtKxchNSE1ITUjIiY9ASEBNC4BDgEWPgE3FRQGByMVFAYjISImJzUjIiY3NTQ2FzMRNDYzITIWHwEeAQcVMzIW1gH0/gwB9FkWIP6bAoMUIBICFhwYRgwGfSAW/egWHgF9BwwBQCskIBUBdxc2D1UPGAEjLT4Hj9bWIBZZ/ncPFAIYGhgEEBHoBwoBWRYgIBZZDAboLEABATAWIBgOVRA2Fo8+AAAABQAA//kD5AMLAAYADwA5AD4ASAAPQAxDQDw6HBMMCAIABS0rJTcnBxUzFQEmDwEGFj8BNhMVFAYjISImNRE0NjchMhceAQ8BBicmIyEiBgcRFBYXITI2PQE0PwE2FgMXASM1AQcnNzYyHwEWFAHwQFVANQEVCQnECRIJxAkkXkP+MENeXkMB0CMeCQMHGwgKDQz+MCU0ATYkAdAlNAUkCBg3of6JoQJvM6EzECwQVRC9QVVBHzYBkgkJxAkSCcQJ/r5qQ15eQwHQQl4BDgQTBhwIBAM0Jf4wJTQBNiRGBwUkCAgBj6D+iaABLjShMxAQVBAsAAEAAP+xA+gDLwAsAAazKBgBLSsBFAcBBiImNzUjIg4FFRQXFBYHFAYiJy4CJyY1NDc2ITM1NDYWFwEWA+gL/uMLHBgCfTdWVj44IhQDBAEKEQYECAYDRx5aAY59FCAJAR0LAe0PCv7iCxYOjwYSHjBAWjgfJgQSBggMCgUOFAOfXW9L4Y8OFgIJ/uILAAAAAAEAAP+xA+gDLgArAAazIwcBLSslFA8CBgcGIiYnNDY3NjU0LgUrARUUBiInASY0NwE2MhYHFTMgFxYD6EcGBwMFBhIIAQIBAxQiOD5WVjd9FCAJ/uMLCwEdCxwYAn0Bjloe4V2fDREIBAoMCAUUAyYfOFpAMB4SBo8OFgsBHgoeCgEeChQPj+FLAAAAAgAA/7ED6AM1ABQAOgAItTMcDQQCLSslFRQHBiMiJwEmNDcBNhYdAQcGFBcFFA4CDwEGIyInJjc2Jy4BJxUUBwYjIicBJjQ3ATYXFh0BFhcWAWUWBwcPCv7jCwsBHREs3QsLA2ASGhwIDAQLAwIOARhTJHZbFQgGDwr+4gsLAR4QFxXmaV72JxcKAwsBHgoeCgEeERMXJ94LHAvzIFRGRhAWCgEED99cKCwHjBcKAwsBHgoeCgEeEQoJF5MPbGEAAwAA//kD6AJ9ABEAIgAzAAq3MCcbFA8CAy0rASYnFhUUBiImNTQ3BgceASA2ATQmByIGFRQeATY1NDYzMjYFFAcGBCAkJyY0NzYsAQQXFgOhVYAiktCSIoBVS+ABBOD+uRALRmQQFhBEMAsQAdkLTv74/tr++E4LC04BCAEmAQhOCwE6hEE6Q2iSkmhDOkGEcoiIAUkLEAFkRQwOAhIKMEQQzBMTgZqagRMmFICaAp5+FAAAAgAA/70DTQMLAAgAHQAItRcNBwICLSsTNCYOAR4CNgEUBwEGIicBLgE9ATQ2NzMyFhcBFvoqOiwCKD4mAlUU/u4WOxT+cRUeKh3pHUgVAY8UAlgeKgImQCQGMP7ZHhX+7hUVAY8VSB3oHSoBHhX+cRUAAAADAAD/vQQkAwsACAAdADQACrctIhcNBwIDLSsTNCYOAR4CNgEUBwEGIicBLgE9ATQ2NzMyFhcBFhcUBwEGIyImJwE2NCcBLgEjMzIWFwEW+io6LAIoPiYCVRT+7hY7FP5xFR4qHekdSBUBjxTXFf7uFh0UGhABBhUV/nEVSB19HUgVAY8VAlgeKgImQCQGMP7ZHhX+7hUVAY8VSB3oHSoBHhX+cRUdHhX+7hUQEQEGFTsVAY8VHh4V/nEVAAEAAP/5AoMDUwAjAAazEwcBLSsBMhYXERQGByEiJicRNDYXMzU0Nh4BBxQGByMiJjU0JiIGFxUCTRceASAW/ekXHgEgFhGUzJYCFA8kDhZUdlQBAaUeF/6+Fh4BIBUBQhYgAbNnlAKQaQ8UARYOO1RUO7MAAQAA//kDoQMMACUABrMkFwEtKwEVFAYHIyImPQE0Jg4BBxUzMhYXERQGByEiJicRNDYXITU0PgEWA6EWDiQOFlJ4UgE1Fx4BIBb96RceASAWAXeS0JACEY8PFAEWDo87VAJQPWweF/6+Fh4BIBUBQhYgAWxnkgKWAAAAAAIAAP/5AoMDCwAHAB8ACLUYDAQAAi0rEyE1NCYOARcFERQGByEiJicRNDYXMzU0NjIWBxUzMhazAR1UdlQBAdAgFv3pFx4BIBYRlMyWAhIXHgGlbDtUAlA9of6+Fh4BIBUBQhYgAWxmlJRmbB4AAAACAAD/+AOTAsUAEAAyAAi1IxoOAwItKwERFAYnIzUjFSMiJicRCQEWNwcGByMiJwkBBiMmLwEmNjcBNjIfATU0NjsBMhYdARceAQMSFg7Wj9YPFAEBQQFBAXwiBQcCBwX+fv5+BwYHBSMEAgUBkRIwE4gKCGsICnoFAgEo/vUPFgHW1hQQAQ8BCP74ASQpBQEDAUL+vgQCBSkFEAQBTg8Pcm0ICgoI42YFDgAAAgAA//kBZgMLAB4ALgAItSojFgQCLSslFRQGByEiJic1NDY3MzUjIiYnNTQ2NzMyFhcRMzIWAxUUBgcjIiY9ATQ2OwEyFgFlFBD+4w8UARYOIyMPFAEWDtYPFAEjDxZIFg6PDhYWDo8PFGRHDxQBFg5HDxQB1hYORw8UARYO/r8WAnVrDxQBFg5rDhYWAAAAAgAA//gCOQLDAA8AOgAItTUcCwMCLSslFRQGJyMiJj0BNDYXMzIWExQOAwcOARUUBgcjIiY9ATQ2Nz4BNCYiBwYHBiMiLwEuATc2MzIeAgGJDgiGCQ4OCYYIDrAQGCYaFRceDgmGCAxKKiEcNEYYFCgHCgcHWwgCBFmqLVpILpWGCQ4BDAqGCQ4BDAFFHjQiIBIKDTANChABFAsaLlITDyIwJBAOMgkERgYQCJQiOlYAAAAAAv///2oDoQMNAAgAIQAItRkLBgMCLSsBNC4BBh4BPgEBFAYiLwEGIyIuAj4EHgIXFAcXFgKDlMyWBI7UjAEiLDoUv2R7UJJoQAI8bI6kjHA4A0W/FQGCZ5IClsqYBoz+mh0qFb9FPmqQoo5uOgRCZpZNe2S/FQAAAwAA/9IEHgLqAAgAMABLAAq3QTchCgQAAy0rPQEzMjcWFwYjAzUzMh4CFRQWOwE1NDYfARYVFAYPAgYmJzUHBjUjIi4CNTQmIyU2OwE1NDYfARYVFAYPAgYmJzUjIhUjIgcm5RwYH0NHT+XlQXRWMlI8XBQM6ggEAgLqDRIBBANVQHZUMlQ7ATVEUlwUDOoIBAIC6g0SAQQDVRoZICKtClQ9JgHKrTJUdkA6VDQQDAmQBQkDCAECjwkMDzYBAQEyVHY/O1SIJTYPDAmQBggEBgICkAgMDzUBClUAAAEAAP+sA6wC4AAXAAazBAABLSsBMhYQBiMiJzcWMzI2ECYiBgczByczPgECFKru7qqObkZUYn60tPq0Ao64uHwC8ALg8P6s8FhKPLQBALSufMzMpuoAAAACAAD/sQR3AwsABQAfAAi1GxEDAQItKwUVIREzEQEVFAYvAQEGIi8BBycBNjIfAQEnJjY7ATIWBHf7iUcD6BQKRP6fBg4GguhrAUYGDgaCAQNDCQgN8wcKB0gDWvzuArjyDAoJRP6fBgaC6WwBRgYGggEDQwkWCgADAAD/agRvA1MACwAXAD8ACrc0HRcTCAADLSsBFhcUBisBFAYiJicXMjQHIiY1NCIVFBYBFhQHAQYmLwEmND8BJjU+BDc0NjcmNTQ+ARYXFAceARc3NhYXA2UihSwc+lR2UgGOCQkgMBI6AlgEBvvrBRAELwQGaAscLjAkFAGCagQeLh4BBEVqHeoFEAQBd8dwHSo7VFQ6YRIBMCEJCSk6A30FEAT8dwUCBTUGEARZEhMYMlRehk9UkhAKCxceAiIVCwoKSDTKBQIFAAAEAAD/agRvA1MADAAXACcATwANQApFLiYeEQ0KBgQtKwU0IyImNTQiFRQWNzIJAS4BJyIOAgcUBRQGKwEUBiImJzchJic3FhMXFhQHAQYmLwEmND8BJjU+BDc0NjcmNTQ+ARYXFAceARc3NhYCRAkgMBI6KAn+1QHpF2ZKM1YyGgECpywc+lR2UgFTAaZcIz4itS8EBvvrBRAELwQGaAscLjAkFAGCagQeLh4BBEVqHeoFEGAIMCEJCSk6AQESAagxQAEiODwc1/odKjtUVDpIaZc3xwKZNgUQBPx3BQIFNQYQBFkSExgyVF6GT1SSEAoLFx4CIhULCgpINMoFAgAAAQAA/2oD6ANSAB0ABrMUCgEtKwEWFA8BFwcOAScHIzU3JjY/ARc3NjIeAQ8BFzc2MgPTFRXfU1lb/GjKZcpFGltZVN8VPCgCFt+D3xY6AlUUPBXfVFlbGkXKZcpn/lpZU98VKjoW4ILfFQAABQAA/8MD6AKxAAkAGgA+AEQAVwAPQAxTS0NCNiITDAYABS0rJTcuATc0NwYHFgE0JgciBhUUHgE2NTQ2MzI2NxQVBgIPAQYjIicmNTQ3LgEnJjQ3PgEzMhc3NjMyFh8BFgcWExQGBxMWFxQHBgcOASM3PgE3Jic3HgEXFgE2KzA4ASKAVV4BahALRmQQFhBEMAsQyjvqOxwFCgdECRlQhjILC1b8lzIyHwUKAw4LJAsBCRVYSZ0E+gsWJ1TcfCl3yEVBXSM1YiALaU8jaj1DOkGEkAFnCxABZEUMDgISCjBEEHUEAWn+WmkyCScGCgcqJHhNESoSg5gKNgkGBhQGAQX+/U6AHAEZGl0TEyQtYGpKCoRpZEA/JGQ0EwAC//7/xAM2AvgADgAdAAi1Fg8JAgItKz8BESU3JhI3NjcXBgcOAQEFBxYCBwYHJzY3PgEnB7p0/uxYdAR2ZIwEZEhYBAGiARRYdAR2YJACYkhYBFZyjHT+3BBWegFQeGQQZhBIWPoB+hBWev6weGIUaBBIWPpcdAABAAD/xAOsAvgAFwAGsxIAAS0rATIWFzMHJzMuASIGFBYzMjcXBiMiJhA2AZio7gR6uLiQBLT6tLR+aE5Gbo6o8PAC+Oimzs58rLT+tDxMWPABVPAAAAAABP////kELwLDAA8AHwAqADIADUAKLSslIBwTBgAELSs3IiY1ETQ2MyEyFhcRFAYjAREUFjchMjY1ETQmJyEiBgEzFRQGByEiJjc1BTI0KwEiFDPoJTQ0JQJfJTQBNiT9jwwGAl8ICgoI/aEHCgL/WTQl/IMkNgECRAkJWQkJiDQlAYklNDQl/nclNAHi/ncHDAEKCAGJBwoBDP30NhYeASAVNjYSEgAAAwAA/7EDWgNSAAgAPgBuAAq3ZEstEwYDAy0rNzQuAQYUFj4BATQmJyM0Nic0JicOAgcGDwEOAg8BDgEnIxEzMh4EFxY7ATI1NCc+ATQnNjU0Jic+ATcUBxYVFAcWFRQHFAYrASImJyYrASImNRE0NjsBNjc2Nz4CNzYzMh4BFRQHMzIWjxYcFhYcFgKDLBzENgEiNw4OFBcNHg0LDhgKFgwUChISBxYOHAwcAnZJQ2sCEBQKHQoJEhhHGwUVASFgTkg2aEVBDKEdKiodmRQ5IBwNDBYYFhwvSigbYjpWZA8UAhgaGAIUAVAdKgEgciA3NAEPQkoYDSYRDhAgCRMKDAH+mwIGBggGAildDxAJKigSHCcNJAgBMhUyKRIUKyYMDDgrTloaFxcqHQFlHioNSSoeDkJMFhUkTkEzOFQAAAADAAD/agNZAwsACAA/AHEACrdjSTUZBgMDLSsTNC4BBhQWPgEBNCYjPgEnNCc2NCYnNjU0JisBIg8BBg8CBicjETMyHgUXFhceAhcyNic0JiczMjY1MxQGJyMWFRQOASMiJy4DJyYnJicjIiY1ETQ2OwEyNz4BNzMyFh0BFhUUBxYVFAcWjxYcFhYcFgKDGBIIDAEdChQQAjYxR0l2EA0HKRIKCBISCRYWFhYQFAMeDRcUDg42JAE0AcQcLEdUO2IbJ0wuHBYTFgYOChshORSZHSoqHaEMQUhqOj9OYCEBFQUbAlgPFAIYGhgCFP7OEzQKIg0nHBIoKgkQDy8uKQYFAgwEAgH+mgoUEiAQHgEmDRhKQg82NiByICwbOVYBNzRCTSQVEjYwLg0cK0kNKh4BZR0qFhkYAVpLAys4DQsmKxQSKQAI////sQNbAy4ACAARABoAIwAsADUAPgBHABVAEkZBPDgzLyonIh0YFBALBgIILSslFAYuAjYyFhcUBiIuAT4BFgEUBiImPgEyFgEUBiIuAT4BFgEUDgEuATYeASUUBiIuATYyFgEUBiIuATYyFicUBi4CPgEWARUwQi4CMkAw8So8KAIsOC7+qzZINgIyTDICRiQ2IgImMij+LjpSOAI8Tj4BAUBYPgJCVEQBLR4uHgIiKiJ2GiYYAhwiHmQhMAEuRC4ujR4qKjwoAiwBSSU0NEo0NP7hGiQkNCQCKAHcKTgCPE48AjhCLT4+Wj4+/m4WICAsICDkEhwCGCgWBiIAAQAA/7QDDwMIADYABrMJAgEtKyUUBiMiJwEmNDYyFwEWFAYiJwEmIgYWFwEWMzI2NzQnASYjIgYUHwEWFAYiLwEmNTQ2MzIXARYDD1hBSzj+Tj98sEABUgUiEAb+rix0UgEqAbEjLiQuAST+vA4TEBYO5QYkDwXlI0AtMSIBRTdNQVg3AbJAr3w//q4FECIFAVMrVHUr/k8jLiQuIwFEDhYiD+QGECIF5SIxLkAk/rw2AAAADwAA//kELwJ8AAsAFwAjAC8AOwBHAFMAXwBrAHcAgwCPAJ8AowCzACNAIK+noaCckoyGgHp0bmhiXFZQSkQ+ODIsJiAaFA4IAg8tKzcVFCsBIj0BNDsBMjcVFCsBIj0BNDsBMicVFCsBIj0BNDsBMgEVFCMhIj0BNDMhMiUVFCsBIj0BNDsBMicVFCsBIj0BNDsBMhcVFCsBIj0BNDsBMicVFCsBIj0BNDsBMhcVFCsBIj0BNDsBMhcVFCsBIj0BNDsBMgEVFCsBIj0BNDsBMhcVFCsBIj0BNDsBMhcVFCsBIj0BNDsBNTQ7ATITESERAREUBiMhIiY1ETQ2MyEyFtYJNQkJNQlICX0JCX0JSAk1CQk1CQI8Cf4eCQkB4gn+mwk2CQk2CUgJNQkJNQnWCDYJCTYIRwk1CQk1CdYJNQkJNQnXCTYJCTYJ/uIJNgkJNgmPCTYJCTYJjwl9CQk+CTYJR/xfA+gqHfxfHSoqHQOhHijGNQkJNQmGNQkJNQmGNgkJNgn+2TUJCTUJhjUJCTUJhjYJCTYJmDUJCTUJhjYJCTYJmDUJCTUJmDUJCTUJARU2CQk2CQk2CQk2CQnECQk1CYYJ/lMB9P4MAfT+DB0qKh0B9B4qKgAAAAADAAD/+QNaAsQADwAfAC8ACrcrJBsTDAQDLSslFRQGByEiJic1NDY3ITIWAxUUBichIiYnNTQ2FyEyFgMVFAYHISImJzU0NhchMhYDWRQQ/O8PFAEWDgMRDxYBFBD87w8UARYOAxEPFgEUEPzvDxQBFg4DEQ8WZEcPFAEWDkcPFAEWARBIDhYBFA9IDhYBFAEORw8UARYORw8WARQAAAAABAAAAAAEXwMLAAoAIAA6AFIADUAKSzszIRoLBgAELSshIiYnND4BFgcUBjciLgEiBg8BIiYnNDc+AhYXFhUUBjciJy4BByIOAyMiJjU0Nz4BHgEXFhUUBjciJy4BJAYHBiMiJic0NzYkDAEXFhUUBgI7C1ABRixIAVKMASpISEYWFgpUAQYsgoKCLQVUjgYGTIJVL2BGOCACCVQGSdLW0koGVI4GB2TW/wDUZQcGCVQBBmgBIAEsASJnBVRSCxIYAhwQC1KXHBwcDg5UCgcGKzACNCkGBwpUmAU6OAEYIiQYVAoHBUpSAk5MBQcKVJcFWFgCXFYFVAoHBmhyAm5qBgcKVAAC//7/sQM2AwsAEgAwAAi1IRUPCAItKyUGIyIuATc0Nw4BBxQeAjcyNjcOASMiLgI3ND4CNzYWBw4BBxQeATcyNzYXHgECwB4fZqxmATpwjgE6XoZIUJClNdR8V6BwSAJAbppUGRMSMDIBUoxSQj0XEQgEewVkrmVrXCG+d0mEXjwCRG1xiER0nldVnHJGAwEuESt0QFOKVAEdChEIFgAAA//+/7EDxANSAAsAEAAWAAq3ExEQDAoEAy0rCQEOAQciLgI+ATMTIRQGBxMhETIeAQGtATA7nld1xnAEeL55aAGvQj1c/lN1xHQBYf7QPUIBdMTqxHT+U1ieOwF4Aa1yxgAAAAIAAP+xBHcDCwAFAAsACLUKBwMBAi0rBRUhETMRARMhERMBBHf7iUcDWo78YPoBQQdIA1r87gI7/gwBQgFB/r8AAAAABQAA/7EEdwMLAAMABwANABEAFQAPQAwTEg8OCwkFBAEABS0rAREjEQERIxEBFSERMxEBESMRJREjEQFljwFljgLK+4lHAsuPAWWPAV7+4gEeAR79xAI8/X1IA1r87gH0/lMBrdb9fQKDAAAAAgAA/7EDcwMLABcAHgAItRwZDgMCLSslFgYHISImNwE1IyImPgEzITIeAQYrARUPASEDNSMVA1QfJjv9fTsoIAEZJA4WAhIQAR4PFAIYDSSalwGNo0cqMkYBSDEBut8WHBYWHBbfJfABAfPzAAAAAAYAAP/AA6EDUgADABQAHAAkACwANAARQA40MCwoJCAcGBAIAgAGLSsBNycHJRQHAQYiLwEmNDcBNjIfARYlFw8BLwE/AR8BDwEvAT8BARcPAS8BPwEBFw8BLwE/AQKYpDykATUK/TMKHgpvCgoCzgoeCm4K/Q82NhERNzcR1G1tIiFtbSECKTc3ERE2NhH+rDY2ERE2NhECDqM8pGgPCv0yCgpvCh4KAs4KCm8KWxARNzcREDeRIiFtbSEibf6IERA3NxARNwEuEBE3NxEQNwAB//n/ewP4A1gAJQAGsx8BAS0rJQYkJyYCNz4BNzYWFx4BBwYHBgIXFiQ3PgEnJiQHNTYEFxYCBwYDV5f+apSPDoEIEQocQBkWCA4GCmkGZ3oBOGxQLTBD/uSftwFHTjQpUxAJjQ6MlQGEngoSBhEHFxg8HAwKdv7ebHEddl7vdpZ6MgE7iq1//vxqFgAAAAABAAAAAQAAcEJz0F8PPPUACwPoAAAAANEJHTUAAAAA0QjzBf/5/2kEvwNYAAAACAACAAAAAAAAAAEAAANS/2oAWgUFAAD/6QS/AAEAAAAAAAAAAAAAAAAAAAB2A+gAAAPoAAADEQAABC8AAAOgAAADMQAAA6AAAAOgAAADoAAAA6AAAAOgAAAD6AAABQUAAANZAAAD6AAAA+gAAAOgAAADoAAAA+gAAAOgAAAD6AAAAxEAAANZAAADoAAAA+gAAAPoAAADWQAABC8AAAH0AAAD6AAAAjsAAAI7AAABZQAAAWUAAAPoAAACygAAA+gAAALKAAADoAAAA1kAAANZAAADoAAAA1kAAANZAAADWQAAA+gAAAPoAAABrAAAA6AAAANZAAADoAAAAjsAAANZAAADoAAAAoIAAAGsAAADEQAAAoIAAANZAAADoAAAA6AAAAOgAAADoAAAA1kAAAQvAAADWQAAAxEAAANZAAADWQAAA1kAAANZAAADEQAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAAWUAAAOgAAAD6AAAA+gAAAPoAAAD6AAAA+gAAANZAAAELwAAAoIAAAOgAAACggAAA6AAAAFlAAACOwAAA6AAAAQeAAADrAAABHYAAAR2AAAEdgAAA+gAAAPoAAADNAAAA6wAAAQvAAADWQAAA1kAAANrAAADEQAABC8AAANZAAAEdgAAA1kAAAPoAAAEdgAABHYAAAOgAAADoAAAA+gAAAAAAAAA0gESAagBvgHcAfgCCAI2Ap4DBAOqBCAEhgUQBYIF/AZ2BswHOgegB8oIIAjUCTIKDgziDRINTA3ADeAOAA4eDj4Oag6WDsIO7g8mD14PlA/MEDAQghDSETQRahGiEgwSThKgEygTchQaFGgUjhUEFVYVvBYgFogXPBeOGAYZZhoGGoIbUhvWHFIc1B1wHdQeFh6MHyIfhh/WIA4gcCDqITIheCHYIjIibCLKIwQjQiN6I9AkGCRyJK4lHCVIJYQl6iZqJqAnLidqJ5Yn6iiKKSwprCoGKvQrRCvGLBYsSCxqLKAs2C1ALYcAAAABAAAAdgH4AA8AAAAAAAIAAAAQAHMAAAA0C3AAAAAAAAAAEgDeAAEAAAAAAAAANQAAAAEAAAAAAAEABQA1AAEAAAAAAAIABwA6AAEAAAAAAAMABQBBAAEAAAAAAAQABQBGAAEAAAAAAAUACwBLAAEAAAAAAAYABQBWAAEAAAAAAAoAKwBbAAEAAAAAAAsAEwCGAAMAAQQJAAAAagCZAAMAAQQJAAEACgEDAAMAAQQJAAIADgENAAMAAQQJAAMACgEbAAMAAQQJAAQACgElAAMAAQQJAAUAFgEvAAMAAQQJAAYACgFFAAMAAQQJAAoAVgFPAAMAAQQJAAsAJgGlQ29weXJpZ2h0IChDKSAyMDE1IGJ5IG9yaWdpbmFsIGF1dGhvcnMgQCBmb250ZWxsby5jb21pZm9udFJlZ3VsYXJpZm9udGlmb250VmVyc2lvbiAxLjBpZm9udEdlbmVyYXRlZCBieSBzdmcydHRmIGZyb20gRm9udGVsbG8gcHJvamVjdC5odHRwOi8vZm9udGVsbG8uY29tAEMAbwBwAHkAcgBpAGcAaAB0ACAAKABDACkAIAAyADAAMQA1ACAAYgB5ACAAbwByAGkAZwBpAG4AYQBsACAAYQB1AHQAaABvAHIAcwAgAEAAIABmAG8AbgB0AGUAbABsAG8ALgBjAG8AbQBpAGYAbwBuAHQAUgBlAGcAdQBsAGEAcgBpAGYAbwBuAHQAaQBmAG8AbgB0AFYAZQByAHMAaQBvAG4AIAAxAC4AMABpAGYAbwBuAHQARwBlAG4AZQByAGEAdABlAGQAIABiAHkAIABzAHYAZwAyAHQAdABmACAAZgByAG8AbQAgAEYAbwBuAHQAZQBsAGwAbwAgAHAAcgBvAGoAZQBjAHQALgBoAHQAdABwADoALwAvAGYAbwBuAHQAZQBsAGwAbwAuAGMAbwBtAAAAAAIAAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAQIBAwEEAQUBBgEHAQgBCQEKAQsBDAENAQ4BDwEQAREBEgETARQBFQEWARcBGAEZARoBGwEcAR0BHgEfASABIQEiASMBJAElASYBJwEoASkBKgErASwBLQEuAS8BMAExATIBMwE0ATUBNgE3ATgBOQE6ATsBPAE9AT4BPwFAAUEBQgFDAUQBRQFGAUcBSAFJAUoBSwFMAU0BTgFPAVABUQFSAVMBVAFVAVYBVwFYAVkBWgFbAVwBXQFeAV8BYAFhAWIBYwFkAWUBZgFnAWgBaQFqAWsBbAFtAW4BbwFwAXEBcgFzAXQBdQF2CWRhc2hib2FyZAR1c2VyBXVzZXJzAm9rBmNhbmNlbARwbHVzBW1pbnVzDGZvbGRlci1lbXB0eQhkb3dubG9hZAZ1cGxvYWQDZ2l0BWN1YmVzCGRhdGFiYXNlBWdhdWdlB3NpdGVtYXAMc29ydC1uYW1lLXVwDnNvcnQtbmFtZS1kb3duCW1lZ2FwaG9uZQNidWcFdGFza3MGZmlsdGVyA29mZgRib29rBXBhc3RlCHNjaXNzb3JzBWdsb2JlBWNsb3VkBWZsYXNoCGJhcmNoYXJ0CGRvd24tZGlyBnVwLWRpcghsZWZ0LWRpcglyaWdodC1kaXIJZG93bi1vcGVuCnJpZ2h0LW9wZW4HdXAtb3BlbglsZWZ0LW9wZW4GdXAtYmlnCXJpZ2h0LWJpZwhsZWZ0LWJpZwhkb3duLWJpZw9yZXNpemUtZnVsbC1hbHQLcmVzaXplLWZ1bGwMcmVzaXplLXNtYWxsBG1vdmURcmVzaXplLWhvcml6b250YWwPcmVzaXplLXZlcnRpY2FsB3pvb20taW4FYmxvY2sIem9vbS1vdXQJbGlnaHRidWxiBWNsb2NrCXZvbHVtZS11cAt2b2x1bWUtZG93bgp2b2x1bWUtb2ZmBG11dGUDbWljB2VuZHRpbWUJc3RhcnR0aW1lDmNhbGVuZGFyLWVtcHR5CGNhbGVuZGFyBndyZW5jaAdzbGlkZXJzCHNlcnZpY2VzB3NlcnZpY2UFcGhvbmUIZmlsZS1wZGYJZmlsZS13b3JkCmZpbGUtZXhjZWwIZG9jLXRleHQFdHJhc2gNY29tbWVudC1lbXB0eQdjb21tZW50BGNoYXQKY2hhdC1lbXB0eQRiZWxsCGJlbGwtYWx0DWF0dGVudGlvbi1hbHQFcHJpbnQEZWRpdAdmb3J3YXJkBXJlcGx5CXJlcGx5LWFsbANleWUDdGFnBHRhZ3MNbG9jay1vcGVuLWFsdAlsb2NrLW9wZW4EbG9jawRob21lBGluZm8EaGVscAZzZWFyY2gIZmxhcHBpbmcGcmV3aW5kCmNoYXJ0LWxpbmUIYmVsbC1vZmYOYmVsbC1vZmYtZW1wdHkEcGx1ZwdleWUtb2ZmCnJlc2NoZWR1bGUCY3cEaG9zdAl0aHVtYnMtdXALdGh1bWJzLWRvd24Hc3Bpbm5lcgZhdHRhY2gIa2V5Ym9hcmQEbWVudQR3aWZpBG1vb24JY2hhcnQtcGllCmNoYXJ0LWFyZWEJY2hhcnQtYmFyBmJlYWtlcgVtYWdpYwVzcGluNgAAAAEAAf//AA8AAAAAAAAAAAAAAACwACwgsABVWEVZICBLuAAOUUuwBlNaWLA0G7AoWWBmIIpVWLACJWG5CAAIAGNjI2IbISGwAFmwAEMjRLIAAQBDYEItsAEssCBgZi2wAiwgZCCwwFCwBCZasigBCkNFY0VSW1ghIyEbilggsFBQWCGwQFkbILA4UFghsDhZWSCxAQpDRWNFYWSwKFBYIbEBCkNFY0UgsDBQWCGwMFkbILDAUFggZiCKimEgsApQWGAbILAgUFghsApgGyCwNlBYIbA2YBtgWVlZG7ABK1lZI7AAUFhlWVktsAMsIEUgsAQlYWQgsAVDUFiwBSNCsAYjQhshIVmwAWAtsAQsIyEjISBksQViQiCwBiNCsQEKQ0VjsQEKQ7AAYEVjsAMqISCwBkMgiiCKsAErsTAFJbAEJlFYYFAbYVJZWCNZISCwQFNYsAErGyGwQFkjsABQWGVZLbAFLLAHQyuyAAIAQ2BCLbAGLLAHI0IjILAAI0JhsAJiZrABY7ABYLAFKi2wBywgIEUgsAtDY7gEAGIgsABQWLBAYFlmsAFjYESwAWAtsAgssgcLAENFQiohsgABAENgQi2wCSywAEMjRLIAAQBDYEItsAosICBFILABKyOwAEOwBCVgIEWKI2EgZCCwIFBYIbAAG7AwUFiwIBuwQFlZI7AAUFhlWbADJSNhRESwAWAtsAssICBFILABKyOwAEOwBCVgIEWKI2EgZLAkUFiwABuwQFkjsABQWGVZsAMlI2FERLABYC2wDCwgsAAjQrILCgNFWCEbIyFZKiEtsA0ssQICRbBkYUQtsA4ssAFgICCwDENKsABQWCCwDCNCWbANQ0qwAFJYILANI0JZLbAPLCCwEGJmsAFjILgEAGOKI2GwDkNgIIpgILAOI0IjLbAQLEtUWLEEZERZJLANZSN4LbARLEtRWEtTWLEEZERZGyFZJLATZSN4LbASLLEAD0NVWLEPD0OwAWFCsA8rWbAAQ7ACJUKxDAIlQrENAiVCsAEWIyCwAyVQWLEBAENgsAQlQoqKIIojYbAOKiEjsAFhIIojYbAOKiEbsQEAQ2CwAiVCsAIlYbAOKiFZsAxDR7ANQ0dgsAJiILAAUFiwQGBZZrABYyCwC0NjuAQAYiCwAFBYsEBgWWawAWNgsQAAEyNEsAFDsAA+sgEBAUNgQi2wEywAsQACRVRYsA8jQiBFsAsjQrAKI7AAYEIgYLABYbUQEAEADgBCQopgsRIGK7ByKxsiWS2wFCyxABMrLbAVLLEBEystsBYssQITKy2wFyyxAxMrLbAYLLEEEystsBkssQUTKy2wGiyxBhMrLbAbLLEHEystsBwssQgTKy2wHSyxCRMrLbAeLACwDSuxAAJFVFiwDyNCIEWwCyNCsAojsABgQiBgsAFhtRAQAQAOAEJCimCxEgYrsHIrGyJZLbAfLLEAHistsCAssQEeKy2wISyxAh4rLbAiLLEDHistsCMssQQeKy2wJCyxBR4rLbAlLLEGHistsCYssQceKy2wJyyxCB4rLbAoLLEJHistsCksIDywAWAtsCosIGCwEGAgQyOwAWBDsAIlYbABYLApKiEtsCsssCorsCoqLbAsLCAgRyAgsAtDY7gEAGIgsABQWLBAYFlmsAFjYCNhOCMgilVYIEcgILALQ2O4BABiILAAUFiwQGBZZrABY2AjYTgbIVktsC0sALEAAkVUWLABFrAsKrABFTAbIlktsC4sALANK7EAAkVUWLABFrAsKrABFTAbIlktsC8sIDWwAWAtsDAsALABRWO4BABiILAAUFiwQGBZZrABY7ABK7ALQ2O4BABiILAAUFiwQGBZZrABY7ABK7AAFrQAAAAAAEQ+IzixLwEVKi2wMSwgPCBHILALQ2O4BABiILAAUFiwQGBZZrABY2CwAENhOC2wMiwuFzwtsDMsIDwgRyCwC0NjuAQAYiCwAFBYsEBgWWawAWNgsABDYbABQ2M4LbA0LLECABYlIC4gR7AAI0KwAiVJiopHI0cjYSBYYhshWbABI0KyMwEBFRQqLbA1LLAAFrAEJbAEJUcjRyNhsAlDK2WKLiMgIDyKOC2wNiywABawBCWwBCUgLkcjRyNhILAEI0KwCUMrILBgUFggsEBRWLMCIAMgG7MCJgMaWUJCIyCwCEMgiiNHI0cjYSNGYLAEQ7ACYiCwAFBYsEBgWWawAWNgILABKyCKimEgsAJDYGQjsANDYWRQWLACQ2EbsANDYFmwAyWwAmIgsABQWLBAYFlmsAFjYSMgILAEJiNGYTgbI7AIQ0awAiWwCENHI0cjYWAgsARDsAJiILAAUFiwQGBZZrABY2AjILABKyOwBENgsAErsAUlYbAFJbACYiCwAFBYsEBgWWawAWOwBCZhILAEJWBkI7ADJWBkUFghGyMhWSMgILAEJiNGYThZLbA3LLAAFiAgILAFJiAuRyNHI2EjPDgtsDgssAAWILAII0IgICBGI0ewASsjYTgtsDkssAAWsAMlsAIlRyNHI2GwAFRYLiA8IyEbsAIlsAIlRyNHI2EgsAUlsAQlRyNHI2GwBiWwBSVJsAIlYbkIAAgAY2MjIFhiGyFZY7gEAGIgsABQWLBAYFlmsAFjYCMuIyAgPIo4IyFZLbA6LLAAFiCwCEMgLkcjRyNhIGCwIGBmsAJiILAAUFiwQGBZZrABYyMgIDyKOC2wOywjIC5GsAIlRlJYIDxZLrErARQrLbA8LCMgLkawAiVGUFggPFkusSsBFCstsD0sIyAuRrACJUZSWCA8WSMgLkawAiVGUFggPFkusSsBFCstsD4ssDUrIyAuRrACJUZSWCA8WS6xKwEUKy2wPyywNiuKICA8sAQjQoo4IyAuRrACJUZSWCA8WS6xKwEUK7AEQy6wKystsEAssAAWsAQlsAQmIC5HI0cjYbAJQysjIDwgLiM4sSsBFCstsEEssQgEJUKwABawBCWwBCUgLkcjRyNhILAEI0KwCUMrILBgUFggsEBRWLMCIAMgG7MCJgMaWUJCIyBHsARDsAJiILAAUFiwQGBZZrABY2AgsAErIIqKYSCwAkNgZCOwA0NhZFBYsAJDYRuwA0NgWbADJbACYiCwAFBYsEBgWWawAWNhsAIlRmE4IyA8IzgbISAgRiNHsAErI2E4IVmxKwEUKy2wQiywNSsusSsBFCstsEMssDYrISMgIDywBCNCIzixKwEUK7AEQy6wKystsEQssAAVIEewACNCsgABARUUEy6wMSotsEUssAAVIEewACNCsgABARUUEy6wMSotsEYssQABFBOwMiotsEcssDQqLbBILLAAFkUjIC4gRoojYTixKwEUKy2wSSywCCNCsEgrLbBKLLIAAEErLbBLLLIAAUErLbBMLLIBAEErLbBNLLIBAUErLbBOLLIAAEIrLbBPLLIAAUIrLbBQLLIBAEIrLbBRLLIBAUIrLbBSLLIAAD4rLbBTLLIAAT4rLbBULLIBAD4rLbBVLLIBAT4rLbBWLLIAAEArLbBXLLIAAUArLbBYLLIBAEArLbBZLLIBAUArLbBaLLIAAEMrLbBbLLIAAUMrLbBcLLIBAEMrLbBdLLIBAUMrLbBeLLIAAD8rLbBfLLIAAT8rLbBgLLIBAD8rLbBhLLIBAT8rLbBiLLA3Ky6xKwEUKy2wYyywNyuwOystsGQssDcrsDwrLbBlLLAAFrA3K7A9Ky2wZiywOCsusSsBFCstsGcssDgrsDsrLbBoLLA4K7A8Ky2waSywOCuwPSstsGossDkrLrErARQrLbBrLLA5K7A7Ky2wbCywOSuwPCstsG0ssDkrsD0rLbBuLLA6Ky6xKwEUKy2wbyywOiuwOystsHAssDorsDwrLbBxLLA6K7A9Ky2wciyzCQQCA0VYIRsjIVlCK7AIZbADJFB4sAEVMC0AS7gAyFJYsQEBjlmwAbkIAAgAY3CxAAVCsQAAKrEABUKxAAgqsQAFQrEACCqxAAVCuQAAAAkqsQAFQrkAAAAJKrEDAESxJAGIUViwQIhYsQNkRLEmAYhRWLoIgAABBECIY1RYsQMARFlZWVmxAAwquAH/hbAEjbECAEQA') format('truetype');
 }
 /* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
 /* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
@@ -17,7 +17,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'ifont';
-    src: url('../font/ifont.svg?75097146#ifont') format('svg');
+    src: url('../font/ifont.svg?57837527#ifont') format('svg');
   }
 }
 */
@@ -168,3 +168,4 @@
 .icon-chart-bar:before { content: '\e871'; } /* '' */
 .icon-beaker:before { content: '\e872'; } /* '' */
 .icon-magic:before { content: '\e873'; } /* '' */
+.icon-spin6:before { content: '\e874'; } /* '' */
\ No newline at end of file
diff --git a/application/fonts/fontello-ifont/css/ifont-ie7-codes.css b/application/fonts/fontello-ifont/css/ifont-ie7-codes.css
index 130f0e414..1f3c43354 100644
--- a/application/fonts/fontello-ifont/css/ifont-ie7-codes.css
+++ b/application/fonts/fontello-ifont/css/ifont-ie7-codes.css
@@ -114,4 +114,5 @@
 .icon-chart-area { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe870;&nbsp;'); }
 .icon-chart-bar { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe871;&nbsp;'); }
 .icon-beaker { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe872;&nbsp;'); }
-.icon-magic { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe873;&nbsp;'); }
\ No newline at end of file
+.icon-magic { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe873;&nbsp;'); }
+.icon-spin6 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe874;&nbsp;'); }
\ No newline at end of file
diff --git a/application/fonts/fontello-ifont/css/ifont-ie7.css b/application/fonts/fontello-ifont/css/ifont-ie7.css
index 4e6ee83dd..18b372d2b 100644
--- a/application/fonts/fontello-ifont/css/ifont-ie7.css
+++ b/application/fonts/fontello-ifont/css/ifont-ie7.css
@@ -125,4 +125,5 @@
 .icon-chart-area { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe870;&nbsp;'); }
 .icon-chart-bar { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe871;&nbsp;'); }
 .icon-beaker { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe872;&nbsp;'); }
-.icon-magic { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe873;&nbsp;'); }
\ No newline at end of file
+.icon-magic { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe873;&nbsp;'); }
+.icon-spin6 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe874;&nbsp;'); }
\ No newline at end of file
diff --git a/application/fonts/fontello-ifont/css/ifont.css b/application/fonts/fontello-ifont/css/ifont.css
index 546dffff1..80f91f8b2 100644
--- a/application/fonts/fontello-ifont/css/ifont.css
+++ b/application/fonts/fontello-ifont/css/ifont.css
@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'ifont';
-  src: url('../font/ifont.eot?81587324');
-  src: url('../font/ifont.eot?81587324#iefix') format('embedded-opentype'),
-       url('../font/ifont.woff?81587324') format('woff'),
-       url('../font/ifont.ttf?81587324') format('truetype'),
-       url('../font/ifont.svg?81587324#ifont') format('svg');
+  src: url('../font/ifont.eot?6491776');
+  src: url('../font/ifont.eot?6491776#iefix') format('embedded-opentype'),
+       url('../font/ifont.woff?6491776') format('woff'),
+       url('../font/ifont.ttf?6491776') format('truetype'),
+       url('../font/ifont.svg?6491776#ifont') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -14,7 +14,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'ifont';
-    src: url('../font/ifont.svg?81587324#ifont') format('svg');
+    src: url('../font/ifont.svg?6491776#ifont') format('svg');
   }
 }
 */
@@ -165,4 +165,5 @@
 .icon-chart-area:before { content: '\e870'; } /* '' */
 .icon-chart-bar:before { content: '\e871'; } /* '' */
 .icon-beaker:before { content: '\e872'; } /* '' */
-.icon-magic:before { content: '\e873'; } /* '' */
\ No newline at end of file
+.icon-magic:before { content: '\e873'; } /* '' */
+.icon-spin6:before { content: '\e874'; } /* '' */
\ No newline at end of file
diff --git a/application/fonts/fontello-ifont/demo.html b/application/fonts/fontello-ifont/demo.html
index c9a06c6dc..dff2d3250 100644
--- a/application/fonts/fontello-ifont/demo.html
+++ b/application/fonts/fontello-ifont/demo.html
@@ -428,6 +428,9 @@ body {
         <div title="Code: 0xe872" class="the-icons span3"><i class="icon-beaker"></i> <span class="i-name">icon-beaker</span><span class="i-code">0xe872</span></div>
         <div title="Code: 0xe873" class="the-icons span3"><i class="icon-magic"></i> <span class="i-name">icon-magic</span><span class="i-code">0xe873</span></div>
       </div>
+      <div class="row">
+        <div title="Code: 0xe874" class="the-icons span3"><i class="icon-spin6 animate-spin"></i> <span class="i-name">icon-spin6</span><span class="i-code">0xe874</span></div>
+      </div>
     </div>
     <div class="container footer">Generated by <a href="http://fontello.com">fontello.com</a></div>
   </body>
diff --git a/public/font/ifont.eot b/public/font/ifont.eot
index 22e4b3011f8ff281f33728b734dd0af553b9fb70..d249dc858a0a8ca823f797e153d4462539005cfb 100644
GIT binary patch
delta 595
zcmX9)NoW&c6n<}J@+X<r*hon%q}oH;A`+BhQkSAFih`hsMXi=5ohE4(v;3NIh$$G0
z1{W%(#Py=_Si#ePy;%=EcyWUqf}rHkLt3OBM6g&AUy=uJ`M&r6Z>v=C<{C1%1`tr^
znMbNDjPUv4WOfz+ev+Q|#})o1*R=?M$4F25HMNI$l5mWSJk3M#yZQV@!fAju9#T@A
z_zuDW@}^Mi`t-eL$3FrHd4O?CIH&{+tD_Zwi6Z4aVIoWk=`-OnVP`n5rl04$6vD(N
zH7v)Her4*zsZIc2iOBW1lIG~zk^z`pCft)y;=$$48ykdIsL29PrqqA0&K(5sQ$wl5
zuLk+|%VG{7Ri*bcfMU8Zheyn+c(xveOX66ega=U7EkbcTTi>Y9h=0W~=mn<lM0D-$
zWzPOSVel{xdTjO`Xk<nv*lkWC`um(lw@0$u1S1nKJgr3^J+#c4tg>Uc%Vx4LIl@92
z+#fsR+IzIN@^TSRoZh!<w8Q+sGWQs7zmT^vtI@uF$k8rqwI8u7-J188mVJ^Lz(e=n
zWNVvI8%+z?Qa-X!@ogRY18rhs3HWO6b~nB0w}D2ENJ}&_T^oc3OG5uz>lq9H^;K!9
zS*ew4S*=m2sa87E9*T<qy2JY(1+iNA=3AFtcUpx&(?3m`5#5Ed@*3Uxt*HS-t?<^r
VCZMJl1Mfs;NbyL*qkF?b`+p(Mpt}G7

delta 413
zcmZp8#rWU_BU?fV1H+NxiEL&pB^^^+COYKTS1~X!yaD2{<lMx93oVk{85kH{fY>X!
ztV97Q4g~3EfCN`sL3(b-gb9&A{tX5O?t=8h;sT(!0FZwKNOPp;RHk{bH3~5>Fil`!
zh-%14O-y0=_Ro=lAr`2H!7KwPz>&vt70CAh@>Mc&ODd+$jRP_nVsn5NUdhQ%PBeA&
z6=7hAcK`~$$xW;%VASCSIxs;8$XCcq%uPKaQu_nQ_W@e6vLL^><Y`Xp0|tg9pcu=U
zf}+%dyV=aG3=G8}3#u6ynad~lFxqn#GY9?8Vu)f6o_vMTlCgL*AJc;9D4+^P28NcY
z9VPMnHeVUInO^`!7%udG%7D-(EdKxepUJYHIT*<2U|<4?0s&AD#57h`28RD1SoVWN
zP(bPC8F5z_Cl@5VVFSyRZca<&WMnj%T#&Si(PXo9vJoR=>14l@SDUR;_c3q&m%+pX
E0B0+4%>V!Z

diff --git a/public/font/ifont.svg b/public/font/ifont.svg
index ae7e08c46..e712cc6d6 100644
--- a/public/font/ifont.svg
+++ b/public/font/ifont.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Copyright (C) 2014 by original authors @ fontello.com</metadata>
+<metadata>Copyright (C) 2015 by original authors @ fontello.com</metadata>
 <defs>
 <font id="ifont" horiz-adv-x="1000" >
 <font-face font-family="ifont" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
@@ -122,6 +122,7 @@
 <glyph glyph-name="chart-bar" unicode="&#xe871;" d="m357 350v-286h-143v286h143z m214 286v-572h-142v572h142z m572-643v-72h-1143v858h71v-786h1072z m-357 500v-429h-143v429h143z m214 214v-643h-143v643h143z" horiz-adv-x="1142.9" />
 <glyph glyph-name="beaker" unicode="&#xe872;" d="m852 42q31-50 12-85t-78-36h-643q-59 0-79 36t12 85l281 442v223h-36q-14 0-25 11t-10 25 10 25 25 11h286q15 0 25-11t11-25-11-25-25-11h-36v-223z m-435 405l-151-240h397l-152 240-11 17v243h-71v-243z" horiz-adv-x="928.6" />
 <glyph glyph-name="magic" unicode="&#xe873;" d="m664 526l164 163-60 60-164-164z m249 163q0-15-10-25l-717-718q-10-10-25-10t-25 10l-111 111q-10 10-10 25t10 25l718 718q10 10 25 10t25-10l110-111q10-10 10-25z m-753 106l54-16-54-17-17-55-17 55-55 17 55 16 17 55z m195-90l109-34-109-33-34-109-33 109-109 33 109 34 33 109z m519-267l55-17-55-16-17-55-17 55-54 16 54 17 17 55z m-357 357l54-16-54-17-17-55-17 55-54 17 54 16 17 55z" horiz-adv-x="928.6" />
+<glyph glyph-name="spin6" unicode="&#xe874;" d="m855 9c-189-190-520-172-705 13-190 190-200 494-28 695 11 13 21 26 35 34 36 23 85 18 117-13 30-31 35-76 16-112-5-9-9-15-16-22-140-151-145-379-8-516 153-153 407-121 542 34 106 122 142 297 77 451-83 198-305 291-510 222l0 1c236 82 492-24 588-252 71-167 37-355-72-493-11-15-23-29-36-42z" horiz-adv-x="1000" />
 </font>
 </defs>
 </svg>
\ No newline at end of file
diff --git a/public/font/ifont.ttf b/public/font/ifont.ttf
index 931b3d1571a5a3be9ad3d740e661fd4703c98a4f..e222d9669d61df8958676d197d075499686c9cc5 100644
GIT binary patch
delta 567
zcmX@|obkyE#(D-u1_lN`h6V;^h6Mj$eIq+f&qkog8z2r#&P^=1&?>o|fq~Hlh`o}_
zN)&+NK#-9GB)HNF(sMf|Oo#;XD;OBK3(^yd3xMJRKz<64=19+}OzWKCc9wyGX#xX7
zG+#z)VhZca;0Fv0u?v9mW*Hf&^@$vLEa!m&H-G{v8M!4DGh2ZyhS)zq3vcA)CnqMI
z@D*WTh`$09e3zS8QNXCnTgAYTa0JL#$V<#kJt9)~6Ucu8v}9#LesRg~g`rjq49P$X
zS*{cmr54=HW(JyA`~s-Hnt_qIf^h-^D+32p71JJ|NYBK7hMXnLLI1NDqL?ElTQFKO
zmTWF!To7IV|L6Z|<{!)v45|!lo8=i9b+uL5RMgd&%<UM>&BVmz7}?p_*_gz|RDc5N
zYAWoeW-Q`jOzdpT;nV+RP3h-r<PhYNagY?_;A7*;WJ|ANw8#n2HE{m-Wd3$WcRv%&
zU;)lvzMiR!E%Ug9*aX?dC2VAPxXS+B%PEvCi+f*YJ*~=!(YkAG{l7n1VnBz2qX`&Q
z1&%8p#Pi#HW#DE8`H0~nr>rTM=J?DCbaE!kexNsOVx>i2vg`-z0ZGC@+2)+sD~wFc
zFDBc?zvI$v2a1DYzihKn0w*J*>13P4Rg9*apC=kIGL}u2N`A$}ShkrZWgjyeYjHtl
Lp4sL@=}bHTo|l>Z

delta 405
zcmaFzg7L_6#(D-u1_lN`h6V;^h6Mj$eIq+f&nlqE8z2r#&P^=1&?32=fq~Hlh`o}_
zN)&+NK#+b0NN}YUq~~@_m=Fo%-(X<iE=W%-E&z%P0QpCNG)H<)Wts<DqYwiF(*y>F
zsD_Nx#1xiq{~Q?@Vu5NH%rY`k>k~QhSgryEJb(f!8M!4DQ|AI%46!*t3$NtlCnuUZ
z`id|x#5({5-{dA%6fo-W0v(v31LP~@CFZ6c5vlzF<of_ESy_-@T=F!h^#KDz5>Slg
zOhHj<!QE`;RtAP*konaNjLhYX6Bt+-IGC!K_5ekCCjK+zEM^Y+pT!Wx96Z^A(UP%v
za}nc$Xf2>5Fl1V$c9g{P+k9o<W_|$_VYtx$DFZ^Eu=xM;e<sU*psq8q(xM+&_Jczb
zBnbnhoBzaKVVry={tX*gu5|OM1WraqlgU>SS23Dwu1_*zWGtP$Df!jrc`5stHz#E<
G@c;mU`f=6(

diff --git a/public/font/ifont.woff b/public/font/ifont.woff
index 36c96a9676149aa4036de7f60237521c1020b9db..9cde04cd0c4ad5818e00b56444605fd9d1738fc5 100644
GIT binary patch
delta 15932
zcmV-CKEuJFjRCBV0Tg#nMn(Vu00000M=Ssi00000bYzhfD-(fZZDDW#00D>q0024w
z00BzSg^^N8f7bv2TMmhsM$KqtVPpURKtuol05t#r05%2bQ{ZT5WnlmSKzslI03ZMW
z03--*1kY$~ba(&&K%4*o0Gj{+0oa*^003-nV_^UQK{x;a0PX+)0PbSQO%!cmcyIs!
zLMQ+L03ZMW03ZP^4SH^2ZDjxeLP!7r0eJub0;$9lF@E`QZ*z1207Jw800RI300h+g
zp;bC?a%FG;07k?B003nG004X4YXgONoMT{Qu3(c(0Vow=4*H+P5XBt9FdZn&2$BN;
z@m&lklZXK!8I=704^r@g0YpnMLe&ESBOAkr2LR;j2O_h=0j>pq4PaE&nJ|2xbN}zm
z-1)n6?<AQ_<}Wj05+-pnKQReI2!X_aF+iYzh^T-FNG+wnDp(7=zS`Fk%i8LyRnww%
zyV@#XZT-4+-!1Fzx?R`x-Gz4FZfWh$i}tIvTieg_lI!=JbMJ(pwOW|md(S<8&-0vf
zp1<>)%c&gq&hPnuv%H7%b1hsaH=nzLyPEqb_epM&vj&X+ad6+qw_SJT#L|U*-R+rJ
z*dwTO+gl@sB&So^T)9-Sx{GEI(>XU?#WcJtpQhWvN%w)1{zK*G!5=SA^J)38n@`g$
zKb|m;S#iLtnV9tmn`RPL+<x%=a$xg?inB^xoH48M`?s4gn2c=4X5t`iqc>|CEn)xj
ztQ?ZrM$6NS{oOyc5GXV6IgTSZMo;r$-issD#wpKalb#44fB8Z?x^TJR4aKv)Nio~8
zbab>UC8v7YVumK2xb>;qguUO`J-BdeY+<}-u+o!iB++;je`dDSTkD5Yt8c|JWFIHJ
z^Ugb4g-(7s7vzduA2-CU!Z{Kg(63rEF}$#LX*prYM4H<UY!s^{1OuwYsuVH60WpUl
z;!9G4`B14AlROC>e<`wLZSRt~1F%TQ4<@s%JUK`a8yW|}8%Q8#Ql>C6zPMpdKu-5$
z69FBjUzpfEfj_vD!GGdrSXe78xpeJZzO^+u)Fvz%cJtTsLmeG|XEuT_5*V|u92^@P
zL`w9OvSu{aNX$T^MvxXggE2DMM=MO&zglxEx%umRr9=O#f4u-h{DQGS#21Z%n~h@y
zI99*oC&>$($VtZq4(7ItP_@8<4fe5zo`Sm{*5L9-z6zgx#3_54Zy`V9JXlr+EZZvQ
z<XkmZwW^lPw><dzFCKjT^#_0P`h&0U`ob@M@rBo4XIIYc=V5-5Z)SB>9_vCR8B7P0
z<z%os$WPi&f1k0RhAYm%OK0q-VEhbRVL$EE<2Zg2UgCJH2Nb?)IT;D@`+s%j49%L=
zZjg&`+Oy%1&#MVMwx0~TGcK4EBiK(Fg2^Df49^c1rmrgu!nf^X<O??5r>`SVPG8qK
zIM~ViZaQ<*N2jl2y$g)jOyN9Iu<ac38sC7{)6s1Dlhz6vf1D4=qRE?nkW!tHt>W@`
zd59e8E|M3GxJg2(z-Ns_h?ueH;)HqrpV-<3eo1mwaw+g;;_F)IoEF#41y#+OH1$c{
zgvsbezd@pnQDXS(4|g4B%k;RJSen2ev{}J(8rHHR=llkk`Z<o_^EBd9VED}81}HxL
zmo!KG9*Hn~f3i9*#A2n255&ZK#9a@JF~*^f<{|Jrva=bUi5FZY#TGFC2tIFkE9uEp
z#rFo{qedqU|0Du6X@!FfwNSH;^%8~=aPOZvPT2`wprx&?B@W9?7l{rBDUOp6m#zHY
z;@C(i3HrEUZX36YuJMoWSU)=0U(NV50VIl3I%RYhfB8~2mx|y+I3md=g<VGs;-Y1w
zQw35kRm)j=DL@V}En3BJx>637a@|rSXtYKoEX2=)Zp1a0lFQv?meU<cWhouHi<BuK
zvoK-ly44#dlBvX^MT4I=qU!QRrrDS+7V;+fr|eKIvpJh?E5X*WN}=-GeT3}eVR_r7
z>0&G(e}G5ky^)IWN&adjp>%eo?EmN(=zxyFyx8+`_))q8mMsCeNtUA4;*CDhu!5$p
z8D>|@SM)^xoOMaw?3(B2ee36rZGlF+v*8k$D2Kz{_E#>sZig9-_jY7X65zMy<A$|p
zEBWqaB%LTi*I*YEaSh3omcsK$OCF!8WDRo`lk5y9f93<b(D@OEX28iH!=_WGGOxb+
zV}1eNfBfTDqj>w>?|#RxG{WcfjDC(MJl=ih!UjZ*|B8ms`QpBFM)bdoD9qdT)Vlc_
zuDQnkqWiFL-RIWLzhUcEd-rQbO5Lw0`vK@xO&PC6GRl@SW=h*8N!!#+<jfW|WwAA|
zmA?{kf7Q8Wu7jIL*Fbr0Hfe?wx~756dYw?{;}CXIkaCjMcV!|nGr6T2z>|l5KDhHA
ze){4Le(>l2?fss2o!m{F#IBR@XjkXe*}*Ky*V?Y`?6M~?nH$Vz2XmM@bx|HUh;N6T
zOnP(2?P>lj`3_spX~d??)wppwZc7K}^^`i>f3q!Sz#|hJH(b&wDNZV3ywgQqv8om1
zUVh|TGV-uWwUTYEXTeOFnFm9rj37saH$lO8D&N~d+G^Pw@lPmJx_)sfA83s6J;{pV
z=~zALQyXDbzQ2uh^c3v-+%ms&?_aw@GtU2)p<OY4=v)8rtwZDg63?@uV7d=){=42N
ze|ZD{&UYl+mqrWi$${2-kx#h~SGe~des*6lc*~K^-?(FJ?2d2L<;>GeKU|6OVvx$2
z)>-P8)s4afIhZv|WvjnyhKt_eC0R~i(CRFv)kTsH?>70fu7*{%e^Q>&z?|d-9ju(k
zS$|PBG&gquzPW#f#ckUbx85g#MK4O{f8*QYoI8gf#yPBUDID=JI)|4I6f+Hek)w0C
z8&_dDjmuC5!(Eh!LeRk@5=7{!JPgytnWn5fjRfFvE<~7s3S+uEmzKNfJ=`58e{pS_
zL<j*8?EjFCiMo7DQGDApWt*bm4_>jKdr1~0MbZu|gn2Isilm61|M7{beB&LBfB8pp
zx2^pY*>Q8DN<5k-O)r+@W1@ImjqseJY05OGjUFgMPLo6+1Gg3J?+F?z7Gw~9+uuJv
z-ro-&vnT1eUW{`QwSL5TsMJ-*x%C3h;``!!F<yL~2C|f!p+cPqAAmFwW})YC2q5s_
zlEBL-(Cr|t%Ab4>&Y$h;8z1lMe}kR&VRGO=H{vgf*p)+q@B1Zu97H`D_1GuaTrO}W
z)T6sP+bu#_l!@|-%CKw>wGIncD8WlMR}d;ys?aj!qu7d5mJeb<lb>qN=bJlXul*pA
z6%3EyjmC}Ox(y9NqoxarGL*p;-wNK}05s=e<OeUm0>8x71*b6ew;`=me>1|FSjr40
zVtUj!k{T=w#7nK)T1%%pV$<Iz#^ct#mZS532lcQ5w*Y0a^30;aqDEn*YsQc*gcwIe
z*7-E5d?<188HH-LG@lL{@=sJN$~me%w?MLrIy9Y()Urxag_=jTXMgK1&4_z;C}K9%
z+c4bRlaFi4W>3IpDj!Sif2T^2Z~rwOGv>JlPH*tUqJnY_zO{dAKd|MVt<Z}~(}uxM
zcw(k!hb%-xI=p3j^{AmJyS(AJ=aci-8gT=TUZceg?V4+_Bkh`_CX`0EY@u^cnz1<@
z`Pjs@qsD={MzyQ0#R@pGk?I<#W9IO$6%_@Tr3qR|#|F%~>8hK)f1oKAP0|OO?fXxW
z{^^sj>GWxcoBH_;Oy}VrVYl~94UC)`K0Q2r_Aq;M*pDU(FfGwhvP=lD8+~OWe|+cn
z$RDF9GYsU9L7D2|rVK&K;OUwv2XWmXK)hcK+P^eq*{@A%_Af)>D0$H$Pg(){m-e-m
z#(O3;KlmXWm`msBe>Aqa2G?dAo2SJNpTNdmCpgqqM7UyFrmJ#MyAOp?4y`Dv4Peh`
zHdTXcoYxHPeB_BQ?il6QE{paDLQ1sK-!Z;<@5YHN-(QI;>3(b3TKfT%JwWH@`j0%c
zYiMZKLm%0EtcGQ+{@|Rw3wyUNEfkh+?H$^k5A}8_p?N1@f5g6@&VSg9SB_`+|0Ry)
zGVU7gV`wjI-*nZ=s>Cxo@F)%Gpiqq#fh;3;K&8Htt>3H8LkSJm`OG@35i7#R&#fw1
zCZ;OYa3yDol8GZvm7gq*Jk^e7(zK+^|GDYCUmIwho^Bua>pool0tg{rR3w5RYhIHF
zfe_87HSz*Mf99%+lH?IlM~=wwmvcJ2_Ze*^yUFhr^@W5F#D&KNh)h36Bn4I|I`I-k
zwx5)B(#tC{tiYA$;prR2E0Eztn=NO$pueLv<@d>=E=W>iq(35=9@S^m3^9uR`}Dzx
zV5nZ%6VwbXL|Gn)18uf6n1!G}7t%@A7gmC@23{${f3C;fXD?`q%dgKe+bN1Grib$D
zxrwF*!zWXIEu!s5SydXj6(bLdR}&XTCET48gY~sRFF|L)ARnVDWCWgsw_Zb8c<Qhw
z+k04NaHp(Ie)-GPtup-@&MEs}nW!aKV==Gt(|~yeY>r!Jr!p4+v_JdhH|#rEu{DVZ
zd4oMYe=B3*Qk0Y5IfrxPb*5L1a;v$`+{d}wxZ9~-b?{TS?YVKw#;aCc(bFVQeHfXs
z4h2%NM3d>ixmH|ArmQpmmdjS@wCOHdIO@4<j=n-&F<W8p;$WF_3$!}Au`J>=$)-~>
z&Jq(1mKv~>4m1_E%E&5nGVLPW0+16UatlF%e~4A=PbN`jH-&`8<IofkgTr!Iwm(@D
zc!da+&e8FuUEQ)!DU2>FWJP6Y2zh8>*=V66@Mc5j<>RA;9v){)4L*g{hJ#{Y`i92X
z+)_0k!CQCFoQAovMsrS2H{K%o>b;ea(%}a|1=w4G`-klnYeWGVpdVfxwtsjXNU+|F
ze=%rMKlHRI8A147D~UC>k2iOAbS}!{Eu@HTb3{4V**u<4_M07@&0`%+O?>P3L?NT*
zyq8BuV@V@A5>MKnh>coCl3rj>Qbx(us1xk?KnNCO-W({4yexwMSo)`z6T;jCE+6u6
zUig3D|Kmc>!w=zGXyV*QSvWFpI$UvJe;PZkUaI;QYfz>`WMyk)K1kWJA(ygJxgbzG
z2KiMsMN7+-Tvo22(N`ciev*N<F6zv(v!tnL!v`EZEJXi`S)^r}uJfE(WwwvmZI*IH
zRzR|7VQd`@$x1ej4bwCl-8dIgQc5yqoFHZ=;4{vil9iL>A~sP*eci&^vMJLUe}uC{
zjuWG5%2*F;=CYF6O&e-Kh^kTxj~anQ8!Tff1R{qvZZ}Rdv;feImy2<sg{RI5%9pDt
zwytnCR?654UJ$xc7R}%aqKkMLQY2l$=~uz`GR{bzGH;sBQRJvkAlnIM1zSRh&1#$=
zc`8-YqMng#Iaj9Ao!Nl7B9=%Ye>64dHrcIeR*;pVDUzmXTmY3~8A-xds#z39v|al1
z1ELl|is7?Fsh+K5DeWs#1c#^qRko5a$1)@np4|1q&Ydru{f8aW&EJ9$C_M62J{Sq(
z+84Y$j+!87sH}m4Q&kWIB1j++MHK~6<U#R*7?V-$Q*d?=S>*-f$pmX5fBO?rsu_A1
z^;;l7M3q2T#oD5z@rodeJdspvOH>7s=ZPqQE_?h!fX7A!g@U1AZ#?pHAtdr%FJK{W
zLle&{Vp!xog3p5;NrED%!m^?u5(%M+Y6ycUAP@pD^-z=LkRYqLumz%Hn&5gM#E+IM
z8qFdIng-Z{=#>et@TzP|f0C#u0l~m_uyJ1J1<*t#s1d5!qMQMZ@LpW}KoCBj$R6y6
zC<c#OJ)wA`Qi^wcCq#LbM+kTy(J4Iy%#siYLa~w+QT8Gw2|@H3Br;w@RD6kEqM{H}
zkXl$;Q+?_UJC}hMeAq$+uo0dD;za~R&;WZt@HHGGLdA`jVkmh0e?U~s^XxkL`pI4F
zV*e*7M8e@yc+mr1EQBl_aYot#k-VbBYk(sR6iXyCP;yBGX^)&r79>TJ1yK^cbY@_t
zS4Fyrhy))bye>=lo>z&i@e=5QhAoPSm?p@w463Ne3et(E<ir`F@w`q%>_`-3f|AIO
zL?np3js<v`$EgM|fA<QUYdD6IU&HamX{M`&hk(>bz(RO<(ct+25?WA1MF5YbixeTj
ztLTCbn#Yh85RvRS5FuU@1XKeEuTdg<Nk9!FQUXGvp`f7Si6jq*ev#m8^dQ9rI&!+I
ziz?vMBy<D?9v6y8{2CosqyWx83-t>e0YA|+w8D77ql$Ebf8ZcsNjhn9VqtZ}5Ysq?
z07seFzQ{@(U+mlubUonQAV?0{C_&vumk2GzW){*!j444?SG`0C$f$$9^Um*uE}m-A
z(s7;H=#Ipvx?+}U#Av(FOT>`lAaw3qJ3V#%Jup51kMCZ6IF+mPO;{uA|7FcSII?B*
z=D1(o{rJYQfAmCOJ{{aeeE{#+?`(y)vHb+LZwRiAE2WWdRl}}e4%dKLhK9^jX$)^@
zlKqMtP*jcVc$J76j{i+WSDy9gWW#@oNKMn@o4#2GKA^yNdO%iu@Xv~-BVla2LO5~8
z?{HyX%0J*;LieH4O<@l&&TX&0Yai%6>7bJ?2mf$7QT(p-B(p}@<<#s)dAqE!%jrK@
zpiqC%29DDwdin46x9KAc;`OEJv-Fun@e1bo7iog8;FYWU<4HgKlGBm48l!F9-mY6R
z+Br|mbIyZ`(OZ*B8Z&=-vXAp&eGl752pUfJOw__ABcZawu_#%MR-Wl`!Ex&@Ap2S0
zo(r&3iq-)8h6Ne}6w7O{UU!jjU~zm)|A+rNnZs-+2D?gCKDTR2br3N4zp}4I(CuqI
zo^_tM25r#hiFwy~VA8(M<AE>WyLBFq{XKk*1!An-zahK$g{*&Ff4yCbQdO-tj_s1I
z*d%Sp18w&A+{Pc$;0F5|O}h$_ggLY)&s7@jJLc}4e4Q-5&@O6=soYHCZoB+n(U$D*
zVVh3t57D+B@@!j&6JU;gTGQN~oMv5k@2kU0ZAg`vjFLIGSxN@-nHdy4lor?kMVx#E
zdpeDe2qrwNISqebrN!&MyMyHaaB*z6(KBmq1)bf7a!|eqbpBu@AL)x6ZEG2h=Z_lw
zMm`dOZAL#{B2bE%m^^ClY0f}426rBfu)>%Xu|H?JzQQ~BGWn&`pEDn1s86P(>oQE{
zW`=+-8(6hBk~hsS(RMS<aOamy?55YmZlO1B*!LI+M1OzeOZhm01V<wbCi`>7On+;z
zzh>+&%<yA7EY^F8=Vu#7YckFD9v5!fGHl15C{l1IBDLN{y4}s7m{CxUwmE(M3x5##
z5ydTh0k`^WZK1v~x|tIRR#}%wONN{MxkzLV-j5;%&H1C)b3OtGC}v38?M9zD$LT*0
z9WfWU8NYw)TI_Ej_Sd1({$y0_>Rwf9Qs-o<rqx}nEl|xlytvN){HO`$vg}cgFo#5r
zeD{SH#shPWz&T6Rg3B;Lx54OUP)BeaQyyKGO;bN-g=unGFpPO7GJ9F~kPPOB!qIcO
zX+>z&Wx<GrMWf*mtI4Z0Yi@w%1m@BV6`?0Hctn4>E>3x7ZqiVQGY_ez?}iCbX5ml`
z=mr4wX1SAwI<Z)cz@y?f$2G&x_N`)`@o!4HG$6tWWKQn0_}ns<Z-S_Z-(04}*#;No
zHCRBJFTwwwmCz-(1n2Irf0JL%^PI(C>}Uxy7;!FT-vtT_H*jI6gr~kia|ZS&5wd09
z6a#<ad`bG|IPy9q2t0b>(THoyD6j}jFQ$pQ>^V^!!17oExg^{mOU{!%E7zF|j_p5$
zbD=wUfzQr^G<EA;5Ey+>PDf_5?`F2kR-d8_>In74vl)8UbJ!C%PLCi@pG3wniC~VL
zM%i%KGb;nR&8!T{#Xn5B*)7k=IsPmO&eDG&>Nq6d1#$9X_@+-96gCQ?LHaL-;-a4G
zy)k;hr;%Q?ub3BHziE&LCd?ug^_aMOX(rrh>chiyf-p+pOrp&Z)oGkOjH5^4sAJ~B
zfj?#^zk}m5#rxQv(IQTJc3x*b*QoH$9LlBL_?7B~?T?u~5UQEgx4nUpfo_hHnt*>6
zC-w89^q2QLPL}=5-LhX(sNV$>Blmpw^TOeOy9-kJe&hL#w~QazGC=ybA3l25O+Eag
z=Ob{BQ;WKEoLc*->akyIxc&(F{EPQVcTq=P<oQLlt#^O%@Qz+#aP#Lczh&d|5zfWw
zDYX3qoXUj|FYVcc<<-zsL7YlCpfP_MsHkVtXw=I_E8WB6Da_;tUG|kr*Vb+tFHXM#
zk1koa;;wNZKVW{yn--J7T@O9=;O+s~uy)j5S1gY2ya669j^90g<&~=+*@@Y^A3SmY
z-kLPJ{W0z$y84lOT!JvnX);mutJ8IsyY~ZWXn&hg4+cLh-59|>m{c@g;wgVp<Goyf
z%W+pCjH_#jh?micd16ahy8J41>LHLMr4!j`A*R(`VZN-YA>$jWHoJdPS|@0lV@0aD
zv%dmi8-;wFzyn^dPWqeaIL0a+tFyJGOPAKNkPQY$<WDNYk|||}FKtLA_(olCP%;gk
zLa|G2%z)gW>y0FpXy`4DZ`pscWvoJiw2g+C7SKZZ=C+|iG+G#HyR;(|Ub$@9N~uxo
zxb!3Qn>uRE{uaaUk2D8-zQ$NXj3lgBqt6#;j`;mXi$6AykInx`bwe#f+Ilx$@EKi=
z{NCV_Tmk9P-r5ok)W__CdR|`vG}MEqp+VKU9|<W1Z)wUgXR^u}MLU1H{L_!!HBKh(
z_{#08ZmIhs-g@p<k~&8<b1ZQZ3x9XTrzgnx;V&M>lAm7j3D>sWb&~l`|COI2zu>}X
zNi5}Vq`uQF%Z5w&Xprqu2N|QEiAbXxCSjCK5{qW4@pOBIno<_?G0tRE=?IpXpNg4S
z7iCh1ca84ZXPJkxUVwjzi06*54TK}lAwxUel@nEDE?zSb5R|AK)C9w?in*@I4VNnt
z3bRPUGpA6P<4HsezpRX{zx(iRS*9|%p}|-*Mn;E?1|h_oMnIN#A0~&VAE8|9Ia5D{
zeLSZb_W#U}`gtSZ4S2n=Ow23kiWh71{?Yu(BMII_mKjjvYqx)_jjI9Vp(dZad(~~<
zD`JM>^Xhu{eP6k+Ti1Ds_ZgVkeae-WcsWR(X7p5^p=2a~A{jqCA^sGc>h{c&3^wU_
zux`)18?N_s|K47lSg5CYjbFi0Eo=$S<&j0TIWpi}4$E{J*MO>H!1fMPIT@K^rAn0<
zwzti8wRNEJKGc6SE@yMIbZsh%b5vurisrpNQR?B{{o<C<mUyMwfBg|K5+OMHXNUbJ
z2?gy3s53e+xp>}TF(4Eqi9CfWL_z$%{pi-qE?ox;FYT=jvkkl9ICQ=^Jh}xumDrIj
z?z??o_l=s=1T#nF>|qHj1_bgnyDzdIgXYn#bZeCDjXr-(4kE5Ot{cbnl8#2r)qyA?
zaiH-E1?rwGqtVZhM6}Ifg=ueQE@;plQ$#2Z<lxbpCt2tA1MD{WXOE%IW&-kEg7?WS
zpWh607x5ow1LyntJ{RIGM_l0l(f-Nk7P5VW0!cPIdfM+%-#>}cU;tt4j~ULsnC$98
z^%15@8CriAb$h=`mE{^(ba;ZeVAH8mmO5YEmnQj~$NpCo>TXOFN_Ob<oLs-~7>WVv
zB?Lt|)>?u}=7gjXQh&2>J=H?&mr+%iawg3boj~~F8GG--^_t>QC7-NdHMj$73q%pz
zH|x1NF5Ad=klqZJ4qaw3ohAz*Nnh|vpps2rA=H1895hgH6j2V$LfMImby0>*qz)az
zuW0WApGbsA6xo=G8Ybe3s{nB=kdUaW0<2#McU%Oyz1M*pI{q-G^*DkloHsnKxHLCR
zd21=xV)<o4_ob|4FiE$ha2zCDD<*Ysx4tV~orx=S1%uV?D6Y;EQ<8@H(D^q`qfn+&
z0WW{>gr=nFGhR-2#LmA#w<JeOt(n%+sY)h|V56~h1?k^5MGIYg>6k9l(&V3-^A)yN
zUvY1F4mFJn_*{tHYT{ZDw{EV=^)XM>$GP-CV#A6hL$&_io=T~+EtQDJ8l$sgyZned
zs^0W3H|q}Xy7Of=A!+=9iFQr}W|gnHd6a)n)$R{Tr>UvGJ9g~v>Q{K+`0-Q6j=>XC
zQ>Ts}KUv>eq}K=7t5Z``p$|jJsi~>Vv17+FQ`0A>&e2Qe7<5gs#-`W?U>5VHrnb#`
z^~cD}c<XNd5!4eD)D)<m(9#g{NK|jC*25-SXZ$L0Xhl5<a#WM57ENZ~M=WPA=#+mO
zBneyXgJ`Vxp;f)loPhhhO$V-^tR%6xK~=xBo#dA!{aQUR@|=CpFy^804g0DS|7o@^
zSr12EzMB{UDI~Ao-%lFm8XBiE{!jT0KQjxcCvqXqa%;d?G_+u#RxM<kV-3-Wp$WjL
z)F+uPw_b>SqKk7r(7+gcPwzal#a(}M0LRU-%`b$@)1aC#mOFV8?xZV}Mj7a5?fCxv
z{2F`Hej1GsU@-{+<_vUW5_DLwf4?0c7#<#RtI*e{hKC_OGBSN~c$gflSEE<^)p|V|
z*D&l9bK){~3Z49AI3^*)_7?70?l&|p<41q{=<U~aH$(zBKs3&q#=cSBFVcUJvgi}f
z!r^etWG8M>relO7Mq?l(x|PKItT`qFsWwD)-z<%3bO=<bq7p@4(oMArDprj1p^&st
zSX-zSvnJ`j8c;_D)0J6#1-6FV(rGfwJReo&@x~_Uim1{#!Wy6e1!vdI=2+eLty(Ew
zR2SZIW5%EC=;;6&GU498r-*;6ByYGy5PX9kNgRlnk}UYPNSZHf4GKPKTo5ygPhKf1
zSWx!Rg5Dubk_N(2N#<!m@P*Am(I+kwqCv$cVM*AuLegSn2*gOU$Lo<hco^cFHF?Df
zS!?D?0TA*^Fc`B0vXI17eC?LbE3CBep2A+ud!aO}ccRsQ(%eDXT5x}fk~Mhg%jf_3
zdIUxfTTQK!R|pOYMUT|q<Wr=TlD8-bOZ=j!ba<nt4;1;`B{ikLk(KmZ;*^X>d`)35
zQS5&iQx(5HUniuksTIIef;K`h?N`(>RSo!PPFyXaq;0bxN3(nZm2_jCQ!7WayrrB|
zNySRag-Y1yOeJN;*Q9^p{M~{wby-59=Omo)OPr*w7thVyADo-cJai_f6L9+hlanzc
zHaAJ%^1aK+s$HufrpQ|~Pq<AI{o_7azPzDPm4(1Q#T#g{u8;!KVp9;6HqEbWMlq|2
zTNK@Db;>H2M;ldz5AH(_>W`V@qF){{1ffq?HzQ|tM{Y084a9#VO-0lMBjX_U`;?`z
zfF@tBdizCbATH`SWd2x_AG|Uv+t8SpD|=;Q+$ri;6joGR7{j8Mvx1znkHm+NCy%4<
zoRHjoB&NX^fbOwVQ-%_TDe}zz>82DwJ3CHjATOG>NQW{SLX1FF8k>Z=Bc&Do=R;n}
zb7`qN5X&fimG*y;`#PG!nxY6Y56vwxz00o%njsm6Oae+G8wXwhJ-=fqghY=dYw>u(
zD+i)vLD-w)$wU4wJ(h?G8Xqy5I_?{3uf(iCD53jHr5>+@_II1s7Wb2AK=Gs+Q;Mi~
zcoQz)k@pgjhj?2YlmKb<NMQ{X7=_7v8gCWm8d1)#<*t9`c5r{j-Nr=*Li=yo{m~uQ
zUUlVIHQB^WFq}|vh}1)B+-MpLm1MfL9u6`_o(uxpaI;L=NW0v|VOS+Mh6VWwol2-n
z)7iwf+i4^{&MzIpl2u{kP0fQ`DaYdjB|hC}%%;)EsPf$bGj2_XoTCkInHB%&E28{0
z>4md2T4#R+JP~S6CYA?P1%S^qElu6BVP#Q~(TXEtrJ#sN?X2Nb6e;NS$(o2dqTFKt
zI^Nmbc3PDw)ltWl7cX4_lG+~gCjziRAILW;gxne^MW=6Nz4H6;W(Kma1mv&D=bs||
zaqG47kHHc>C^Y#3Kq6+ympno@NhRItX+)j|o%4T}E-tK!nTofO2XiQQrTuH)60-=u
zwu*v5OrC1iUd8@Q+%GDv^SWv+vL1j7v8orwXBpKoa~Wqmgbz0!;Rp>;MUt1hshy6`
zs9;69Y4ii##?0|)-g(Aa-Q^D;a9?iS>Jb6x{yHHeYp%?F8OOv;E}OrMxI5+5;)kHv
zTYZ1_B=|kLD(YYe_OIb%eSN?6=w2`C<j`fm>{A4<SNHt3?|tYnuk}x&Lp4Gb%Nmip
z4H{UIrpa8@p@j}J1i+*ve*hI8|3bc(#}P&YK_LC@U&?OVo_%o6rD!c6DR`+b|HbUq
z8$Xx=2mAWg3L2d#g21os>$~rvzP>fMu0em4<TW(uo=v%ccQ<NaE2v&FI@DV#WF7pa
z4>=DUe_^wGGOa9Lc&4gI_q)>{K!ZsdEk~7Sdk@+q57eJ#ztxlvF$;d;`mr=+%>^50
z^1>sd!PAU4JNw~%NQ3Js4X$1~&|kU4*%Ox>XUFV4ZR-Ql;b1ao!~tni1L#KamzIBI
zkvZyIV<Q(#*Ijm$adlJ1PWNNte-O^YE*5BDjM!d9A@DL$6#LF|O@jEeB)~5;rBZ6O
zyU?mA({fMb)DH8Q*`ef~MEX5zKhJ2lfYI&`KieBgaQatXL(>ehX#p}XaRv4`{j0*z
zV1a}g5LZQF5I3&U>U%p|*_jTDn}>foL2t^#QJsMKtq~REyC~u<=Fctwjb%%xD5rH4
z@@yrA@}GvK&Zp`?sRjw^oZR`sE*QV8%kOJkxhUF_OJSPq{ad*0_MhL8%kTK}rVOv3
zf+7&!EBFlA2+01`8{zh!L*VDPlYL`{mezL8iB*bo)BO=%96NO1p)vc_YmR?z5U$C}
zqE`i?iGEQxl~^pCFCLk|oDE0Wp2iIfk1WdOl(UyR1FXbg&0Y*EJq`-|*%_cT8bxz4
zOyh^XwegOh-wx}Y?iB&N8W2U`X9IBAp$$C<fkVru7!0l45~Ss2m6Q{cKAUJ|G||fQ
zNkv8`Q*~%obR45h4`|_;>Xm<Wqc@q$tVX3AJ+Qj<#I~;D;+2smB6(?`6wd?dC%Uj`
z47Q#)bz<wO@gdQxG^v6p@JJ@5DY9~LvFqNO62Y}c2Nx{`-^c_!dikNH>Lr#)&pikN
z@Der>7o(v-+pdL3`lW|{uyA)yH?^dP7bS|U27+i^qK@*#&eH9p?fHM)Ue2{o9b6;0
z);6Ghy6&>HsdD`6xl^AxP(nnDaYA*<KSBriAPN`~+`01etDwJJ35Wd+@%H@6dseT$
zXXVzfZz0={ZGV5-kje+qWt{Bm-FWHTRq;f@qlF};cjHZ)dq$QXdhoy){1I|Z@A~7U
z`tQ44T5aV|@+&wm^5=g+q*Wzp_%s>=E|!?{H$}Z0#nxmt=xl*R0wQHGbc2NMiIr=D
z8>v(SCq~IK;yg^N$u0=>wyE}A<kaUHOUt(}FEx_K^3CT^2|m}Hj}^KyA#&&jG0~9_
zw;lj9QOa*nx{|6orx*V6ahMb9?@6V4`eXL#$D8x0I``$9qs4!T^|xO!aU`I5P-jg=
zJX+w$#Mm9{R&~{Rg@Xr;yKf6?5_vZce+u02_a7404+EX+GlVWz1}M)U%cuU&`f>dF
z@%b>%yoK2upLLJNU+@V8{jSmP2g83{H}Bui+yMKjD}mJP70jgoPqL#8oIriT{1iK<
z;l*{p&h~Z1!vTNn*75C?>3`OB5-vKko1Qu8T6c7G2OY`FVza5I>J&XQ0&lG`6ZQk-
zVEu%vSK6O2r_Y*kwsASoo=HStk5%!n^hY5*w<b@XI+ZZj*n6B~x<Vj$7R{nH^g!1d
zuXMI!0HDiEMD>+{iaA+B97N`4{VC!=&$V94)wmHFN49@(puaa3_9}!Ek$}}4LKLBa
zv66{AG#t6$XG0~zVw=XfY&z+BV3WnlJQlEP@)o4aAm^O@e*@keSUFIJh^n4cL-?0j
zztHZYo>+J}9anj|Nzr^>Cj2THc)7JCW|U}k%D!`oe6)M2JJ1nW8Tji3D;Km>;7Gj*
z``cTc1_poEgD!-n7&2#9fL1b#Wo$u#$w%xvAAv#%n+Qw<I%dx7b#fgjE83znu_|l_
zT1WA28EBZGwd?FGRx8Q6|Cm4Pv427%z4ljEt*Z5;3>x7YlmtcMhvRGE@O~qqLbC^c
z>DTO6Jvf!5P`qnkZBI*9K&Il=MBU&YzUre(emsB4JjAbhW}hJ}aP0_BT4r{opCF^8
zp9Y{hd8r_>t%jM99eO4(ffnQ0VM#{j6H<`n@kXkrwrW+C!hk?}5Dp3`99|p$@l_A|
zf@nQ@717|cEj?=oy5b=TVep`y64&rz_$Pn7Wae86XZbQ`aJ{&Ox??_f4YBwbr+ZWZ
zWyycAM6_t>0RbA`SfNJ3MTIOZMIA$%*r6T=pkT*;dOZAwP-9H-3LYK>LUcuD_mvSv
zV)R020#@YbH?03%jvo1OVGD+>+z&l5&u<bFix&q>WU~G<>)JZxyJnZsRO`?E+pl4~
z_V*~4_H#ilg_^MTY*(%ciAm*BHb?i5=@)+?s#Mx0=)qGtB}GubtFR5oiiijZi41jT
zR60OF0#B{HEp_DOBdOa~F8L7%KeE3W@GRaKFatwfo&bE`GiJYS|A+ndn8z~)3S>bU
z^FZ&R1-%QYXLVukf<rs+xC1W3q8k@^brRCLh63LWhd*`y{htbFjoa=g58Y}wH2;5V
z{&ME)ZAO|~KAHMu!pzT0D)l%j#~Da9Oq_`4+!L{6rD4Be_8IoaBJq6lYt17Om^8@h
zc%EbjGE$fQ{dmNFBZ4m@Bh6=<^MJ{ZMO>Nm*FwhavxIb-o1*>lAJDHwUsC1?l@iTL
ze+Y0+BM4@*(HH<JLc1Sn-p?{39|V7AGkX~bV!b|^6?dSg>*e=sFD^}E&DfbTM{}>6
zHtaYp@=-U6k2+ti2)UeD80^SS!VJ>gHp8FMP3pCTN8^_LZT3Y27&H@b{Q7&y-8V4a
zPbJTBr%&YdUexWR;~C41rE}#95{&Wei(p7HvByuDI(D*r?{X;5?jQD0hkAd|bu;%(
zknwrjFNR?|jjfoGYlOzu$xN<Ay#m$I!`K1!FN^O++&wXT9GV$wFJFu^HPs&7&N`gB
zsJqSg+_QOm-0kme{?EzZaRIJ~{iPfA`u=q;jixUh{-6qGm1%M`yfaO0$cnRZ>jo~c
zv-f<+)K5*)9Whvd|M#UtnaF>leXD&dRu$6%5#h6;uJ9c!JosjjK%4zrzX_*K83B|j
ziv2cZ=7_+<p#5zuJ4Xx%Fy{B~ypdWvKiMqmb(z1J#T^#tUVGY{k@?A){mxk*)3NB$
zTz-~Hz*K-uM!^0F8;W$A-6+gyzd38WVB;{$px0B*&D8DZP4bCt>~VjaqZ2UNkxNl8
z_A~xjj(K<&p4@C5#L#(mK5+&N7AujGT{l>P9pj1<xKmedS9M*zUD2NkM6-<%D^3&M
z(R?yiS{yanWKEW@REV(VD|6S56h4QA(MDlcSQIa%5+Tjk<<kOScp3}K!~RrPCZHEp
zVX+iY?n(8o;@rJ$Cyswe;gSe*gGXZH{YPVl4$edgb@cwhD4_!%7)3>S&@0&B>)3A>
ziyv4}O=<$QA?BeCT{SH!&6g<|B6K5^#c)y%j-nBVQ<lokw=}Zp*2;Tw(<z*$a`tDj
zXv@OkD}MH~1-n)im-nwTysy(!B(M8IXd$c|*ga94z^X&b-<5yS*pNs)sZGqw!i!H9
zCw33?PLu*(^=?t+QP57RUVjAuFk^n-#2u{_KW0gaAQ5u6;`Nt7Tj|L3C-^7GkI=4m
zzjK50EI`F$m6|jGWJz+joa?RuF~0J~8(%rRWAVhbx1Kn0?gTmfjc@EDZ;~IqX+QDi
z>e2oaz@7N&zVCm2_p#UO@>$q}^Iddw+#p&ssDnr7S8eEg>IAkcDCgK>1UJ4_*z<qy
z9Olm&+K~OQq)P|RZiB`24*Wt@@%;uT(Fnix{2SyO|K-(GT1GnX+IB4BlrS~Nh7mr>
zVm&NwK8{tX*$OMn-b10_D*ZXDSduBjrN#g%d?+ijPT+sy#kPROYyo;qm*157Zyhl-
z0+z#JRZVn-ddX@*`oF)xrQRt>TRhY*FyO#eAzp}suxM-Z>y!!X`TLugNzi*u2pk)M
z-;eLl?-7YumIA_>Q24#3f;Lim5%XO?A;ZOsxa6F({fi3Oco2;;!8K^gu0f+xX90^!
zn=#39)g*uZnPKZgAV`K7QfQ<7JG^FX9_?OLYy|RU7v&Z3*t&Er^-Sjnp*&*>K?okd
zWB{nucKVz{gOMBVt^Pgvi^_*2!0dQg8W(P8?7RvM+NE~4oGw>s)F<7%p^81d^ZzRn
zIkRHTmFKs-xaq}3jaROjI1}k_Bj%ZdXUtv{`Tc*9GZSmBY+Qu7*V}8?tT+?N_nJRC
za3<o|7vDjB>}gI#+qcFIaUY@f#fl{h2P>(tS90tNWOr02GvA|-RgH*L*D-0NAJli6
zEXp709*WFjsKS)u^u%|XZBFIb5k081cl7|OZtG#|EVb>$zSsL=q9zZi4db^LJ)TwP
z?=628TSSf5JsA(Ek=2)dK{)3za}z(<H)qd3ELw0?x_oWIbHf$st@EfxcQ;&rkv{hc
z0dBC@-cVF?k|yUfdoK^>LkI8EDyk$I5{UNn*ljUrXuK*M&dlAgbyPca!^VO6nT@3|
z@?HC#lYE7|&AttzJY)J*s`t%@U~4rSs#brh7R3le*(8Wtj=4eP=XTlu@9JH`?u~Z|
z8%I_P@I^3aa>L!^T1>9mdDkxc2Z2>L!}#8ffz5%D)#u<GChe#8UTbWj$#uKf_@6}H
z^fu#7A(uB<lp7U*?p!19wWyL8sK9-XzaiZGjc?p7AY(dl>z1*_I}Sho=9}d0vyTwH
z^wPd3PS_{<m#%&jCf?+eQ8+e#+1662m0ZoNx#>x-M6PCEw3w1L^3Ix4>-mG33g8k`
z*Qn|prB=9;7Pt3c@mFV^)duhMTNS40R4SoRJ#K9+J1bt}b|5d?xMXfv;#q73J#ULv
zIt^S*mnu2D;o7I)tszd75e<??!vL9Txs*ehO+U$&rAJF=B2;Dfvo6_x3w~s}l~p55
zq|*(0oVk-uSQk0i5j$CdR8`jv%NO@~^r&Wf4J{OsO+Ds~k=>Uq+(rV1)~u<a=x~!5
zf#im<k;;}u3%u+r8-HP3nuz(lX4H&zj<z*j+q-J!Q(Z8QdURrEqFMs~;AqsB4eEh}
z8rHmEKR_f&k;t5@`~fw8-xiAHd>I9bk>Z??(Vq2sd)mj=Hd<D`88*f9zRU7)eQ>E6
z$&4-N?wOeJXRTqj!+iElgX=CUH!%8zXVEXsymplm`)VB}2Cici&JGDhXIr$$D2xle
z+)WiEGvfG43q14xU5N5>UF*#-6A3&+z-UPELbGNBNad2@%XSBUeDa)-ri4POiT?ry
zANN^?u2(Wpf|Ie1;fcO$n{rDFF*9sRy4IAu)c6ZZ$0_fEk*&S+$2KG(A~uoLbt2j?
zg-cq>my3nk@@l}}S(qb<#48Z6@7Ih_A`pkHFFHEtuT+rI9Zi?6LQXb#c_tF7bQOHD
z_RD<vIBaUpn+;JPSi6L8@9}xE?M7%0r!e2qmF~CE8fU(yG)(tY7cc0OqB=T%>-yJ{
z{;D!kA;qOdvN%&ok!-QeF7z(%A^l@GgafN<WN=~#=As}XseEd8V>U`+srbfZ7ZipH
zh0oMKlXMv_yU|j~{&8a_Q_7Gw_`w|7L_g^noLj4{t<~%uW+Ks%Nc=PuBhfZfN--XE
zg7@<ZSE1kMbI;{D&I9L^7;|=$TRRtj)eDyN*kkkeJv9K!#Z*ADzuK{DIppE#bRkoK
zjQuS=95D5tNg2QRv-H5+OH#0?dijFYRX8^AwSDvLuZn?`2rJqrKGAMpL93);NH<gd
zpGx@tXQ@jH1K31`b7J2pf7{1&pfuZM8s=7TS99CAJ={TVl6#o@5_g=&zJ2X~%Ttd$
zc;v3zZ@YQdjxE=&TQxp9RO=~rWD|{st`I*vn~5s|6@NOpXFca;JtM0~C+Rc&y3YHQ
zu|C9m>*6*)s7#rr>An}til?JY`;=N%@i(IGSMfLEq)5MN$5j<xRqY4Vii$rs<CH>E
z%CMVqZl|3h_N&f)vVOxBYxppKeEw?wY`*#Y)pSYnQ}MPJSgqTgt5fy+?|F6Kd!C&u
zMA$3$cajxS?G=t+)%LQFw7i9LxW1q9dwwlB>FytD&$efp!e07a$BS&qq+>kR&sJD&
zdiJMx_%%l0{I8tv<pfzw+54tu*_0*(MwoY*T|uwsV8Y$w#|u3-pm7O*v@DlX*}9~!
zJK5-Aveo&DC{VX$HASVkpNb&Vm5510wD4uF0CGy_nQB|5A3(kEKH~(TWARGH>%1p@
zo^e>*F#^l)g8azHV$;+nK<YSf;J{pQ;;<wwJ+QKK!{VL<Q75F!UODy3sDy9jji=t>
z{%w;isaSRkB%lLQ*NYQ>%RM3F8v)Pqdt<Sfu1{#P)ZRr(b0k@txKHfufoLid#kb<<
zax%75#JBf~t5=hCt3+CK%TBUmD=o_OrKkA{(jdgnp(P`JdJe6Xh2Nk8Nw=Nignl%S
z3K9AxAS!d&$59OS#np-x2l6-Zmd#IWhTfYFL+|?AN5=1dwES;>`#$o>O(SGr$Ndux
z;ZRo*kzPJH&k8ESE#k(nZrZjk`RzTI9a`T{hHm`W9rO!8D<9msn1@2Jeb>N>Pfwuq
z2`VN%+d<(wiF$>H3ved=HfS*5d>d4yLCfs)Mt3+#_0?pM9^-fty80ga$R}R7N!a`C
zKidLd8=SY!rYAFh;2Qhod4u45d|<`uhx%YIJh}6QciDd^f1lCh+4dhc8wSVLTYLEY
zhI6pMwd?wD$`8T<`+3gw`8#dU7+xRyjw$No;gDbVsG<N=Cx>7<$o`y$@u`)jHci5&
z!{kNmfc(=WO|7?I#i<mZK1uqg_p`omX{~@KPfhP92WR|$$sgw_$BZMqu?FT#YBe22
z52$OVMz`1FK#$(}A<3815q_d2+c&+xuPp%$85Z6TaTffZx&L1H%$J7q#l<jk2|Rbk
zQ3B4iz6tP~-_*aI^*8Jrsyt_KF)o90wM63pN?jdonM5oaP}sM#=wZ;-nZvj4k%Lyt
z51lX{TEMw~gLUzp+;_D9D3rD7ZY{2TRMW^yc;BH-qx263tJUDY-FRavdE<>qG6xeu
zd}%*HbMTMoU+O=)#ji~lHLMt?HSvCBfYu6BKg(*RZnW>fL=|5`!Odac&$@+wn_tcR
zjxFpPxKbvUB`ivce)NR8jEH4ssCAId$mI%Zr>L=i@*la^-g?iZ{wXD>#ReKoMVGW2
zr0Z{np6%mvyB69%efU`z9xKgR5l}y)-}N~-^pF;kg0dCuk9oD-_7Aszta<nPU+w<<
z%|+<@^pl^o&u=xk{~zrfW7hz9oMT{QU|;~^0;l2&@%%Pl8Mv8W07V!sa>|;5X^zjV
z|9}28&t%!p90BBVFff5c0Z3{L5&!@Ic${NkWME(p`k%!R#mdUS@c$*teg>cj3Mc~r
zcL4=PlORBo2&A|G0B&tT-;=vQ?Fuc2000010001XldeG?e>qOWKp2JJWJ4r^0wfxm
zzX1gyIg3P-3KS6v3M7g&RF3f$Ii6@dLCOWV0|($*oQ3Dfuoc+y_<QeP<{!%dj_?76
z-F3xh#|mw#9XGItiRUK$8_zBB%ySz(+<Wd&%{_N<i6_rJ9OIQ8RBNAVi8s#*UDfp5
zz@a+u+@yc%f4N0I^W4UX8hGx|zxCY3Ts?U1;at5>^?GaaG_%s5UdVVjx{}3KG_AZ0
z3kf$i)25PZNpxxBqR>I4S9vWS<8)Jm#<5%Gv8i%h$|x8*eHWLp32ppbcdTC0v9*aL
zMz3V%d&%19WgOWcvvxfh41Vu{DKysD!XQVA3>Jbuf87hd#~5P7k1tp-LzubC%26Uj
zK_|q96`6}v)Yp6xs*-NZjDj2>;<{qhSLBhgl$8bR%`g9l=FF%&=1vQz2sq16{EqR`
z<%Djh=kFOSys-C}u4Q&Tjd8mRe~`a(3C~@}mUJTefjhmWJHdeWKj-)ae%*Nk0001Z
zoNZHQf4AH;5Z(LMbzcdgcM^ItozMxS00||b_ae(<TdXV@mEFAe>yf;Ezz2Mer8{$`
z-_c@kvHMnw|Nl0N1@^E+f)p8Y6ezL6J`Qk*Bb>o)IE&kH2kyjOxEuH2UfhTK@c<sg
zLwFdE;2h55Q9Opn@dTd4Q+OKB;8{F}=TYGWHoS<J@G@S(t9T8s;{x8mn|KRv;~l(<
z_wYV0;sbn$OSp_HxQdVPF+RaHT*s&Q44>l*+`vtf`9m9j)Zl19XwjjEz@Jz{Vt|6i
zh`(T9;oz|;8)o}jGt(sAl1bxX_w+jBOmULQD7{Swp}ak4wQR^#G>q=JX!KS|&6>=Q
z@mhAmrQFwKi-tK?GfQd5d`Gzzjs`X!SZ!RT*g%yZkNy>6oN}O!jlEX1tbLa{X4f`r
zg>+<=x^0txTI+Q>GV7?YT-e}j(@yG|QZBV`(pH8ZikcbTGvlVxsz#VlTD%HLt&5;E
zqU(2PGSMTc)lL^-9?auiPWBPS0JZ35zkqh3BA5aMaK?}oCsegw%8E(1{~!5a#&%#*
zCWGG4*;&(TBTlq(OrH90$T-27%ulo)DxuO^YQ8RiCP{l&%2-0}WgT1Q>vE%|pGLVq
zqgc>t#&KqYceES?&q*~-3{+YdW)sm-NE4Lol*v;u+Zs~5&#e@JW?O_s*a%KGpFuh?
zR0LkA8k@G9z*d`PH6gkc)+Nk^SB`GE)S1A^A=kq|%Iz}cvy=py+$tVBeNvN@MLgmJ
z51Dg+!ANKorF1kRcu*r;-fFWAdzu;=<#9Qk!9*_Un3j%pN%-wyoX$jE^e+FAl8BOC
z50nVi>ZB(*W|rd06k&bFQK&96v=ypZO<Pn+5t^Nf3gbLF1#`vWRdjjC8&#`7A@8a2
zlJ@vE<gl)Ey&q~D>6uZaC$}MsB9ny<S;)IDrsLhi3q$eAR<t54iB{z<|0rm#gc)M9
eGVFL(6I+LeI<QXgG={veSo{sXTz46hI7Vo1X8l<J

delta 15791
zcmXYYV{o8N6K!nUwr$(y#^%P{;Mrtj+fFvNZQC|Cwsqg{-aA!YJ$+`*bk+Ro>7K5P
z0nLjB#qd;?k^%t*`EN+&fgt@)yAH-<(4+q{`)T3?0s<QLAHw&amYWTVSCa*PfPnn?
zEdv#RW^G|&4gw-P`rk6=f5HXv^d)Nj9|!^>@}CJp@}E$^I6y2}|8(>E5Br~;@!v6v
z$=M(v_Ks%%+t>LYcJV*q6jj9dY2x*tJJHhrY?A*8C<Edz2a}%`|6%|60QCj|0V^BC
zVD)=(a&&bA0TGw@4|o6pftWn958ichvG|WH#q%HWKLUu)mK}JoSC*NvIg?eQJSYvO
zCDL2&5Xun2Bnu(UBuoN0$W1Q-X<`^CDK5tMH?rDIAgF{qi`Wu4C^`N>7&OSiG&E^L
zKWH^10B=k%luWZ;^0vdiaDRSEBwIN5!9gB-7>_e0Epw-nVj({&HQIdf63S|fZ-O7n
z6LX7}iIO=HtZ$0S3~Na88%=zbfx<X5?xx=4dU)chUN`0FYJF_mJ}Yj9^DsCLaZKJ<
z^<GKyd6X?k<U-X`d*wPyUGqe{BtxC|>T>5EIPpS0Ir-75<Ur~P>52Jla)rK$VTFkE
zeK7kKd)4YOFnBlQw{@AWvr1lizoADSLQ$f=rr)Mf*B)t!vcSu2FvQVGo?E=pC;J?b
z_$7XX-Al}@d~fqwo2k6OAe_SztLNNXk)C!Bqi2P#wdudx<zl=M9N{Wwki}YZ`|gp!
zk`{F_Xt_^vna6Dh&1mv{pGA<cCOWYY`I#-;ghJDB%^O3`Bc*(6vK>jjI83W-m6!uV
z3>=yAw|o8FMI37Al4aef^L1;ar!4ukZW=<B-FY;o7wl)W!{6#<Z|~e`RXd+(OEKq#
z0a!LK>Yax!*g5vGnF~{QeLih$1S|PdVjo866LSw%_3@$+%+~00vv#(6*zlT+N@VOH
z*<(~tLV%YKm1D5>g0hB^?8~eD305h?N)&)41Q_e>{jTd@!D}T(k*ON01b8J-@$sPh
z@MTCW)rwizx*JUlMU<Y+(Lo6<b8=Vt1B6=>`+z%39esL+4!2L=?j}y&MJfhdk9+Q0
zaY91CiYt&A4X1${AtoA;jPjS9E<2tbg=L;9xlCkEA5QvNAtu#@QFTY~=0}s?{Lk+S
zpbJF&qo7V?5IZ_BGujN2N2}+kWb{63RF)b7>9{3QrKvY?>gg6bH>iVne)lf42Q1fn
zmDVT3kyQ9dKt~ITVT11EP@hw~sXS$}Mc`(AhS=+}3EKZ_9lYl9^<xJ3dR;Lz)1JOO
zA@z@Nv~<@bIv1nBRe(-BGOy(yRbEpDvYT=P>8JZ6tuCoeJ{a^(gpU>vc>LiE54|d(
zF}iJeaba(v{k@+UrZN^B;v${a+4tgRDqsbga}nCvnbI)GSCw%C$4ELMW)QI~s~Hjc
zTP_X`@42?EswtHx^*4BVR>$5Q1bhxct*R}$;G<R)4g}O{FA47Oc787}%-O#sF2msg
z`Y>Y!W10SOYT0pB`*)t+VFag43D{AsvSMYuR#6gRX?6eRgI<?~>zd#{>JKvxU3RAi
zR~l!%8LP9A%QHAF&eYps)#n)f|485$4&JN~U-9*&oWio#2?PjRHw2z=R$53-zaz3d
z-V+R*&<>XL-lUHps`$P!+r+#GqM5t^=I;7oLvonJVd2kV9Yi>0QR2i?;=A7FRt*B^
z%&l?}jK*K6zJ||Q^Xg?0*Y1PT(Mq^qv=FxAaL~B6`Idy|lnCUz+roZ<_2``<@_Ksm
z1X>wPXoN^=1k|KV8?QY>b@3`_56%OdNDjyb2gF-VHg2^&8MiiIG8iRp<Nug|yTA5K
zn0=v65($cM9WgkAk`po|a7Fs%DGd*5zX?o#G)C;X{Uu;HYX2)UYaK146J`Xm6=ugo
znc6YIP{N-uuEytvO{*?qY0`feZO5%lp&m{t4<&3Rv6L*Y(7>w4aHx2vyq5pNQjcp(
zEAY}RS?q}W9d>PIV7ys=VMs>=0EwOSA;;W9|Im~ZJH3!w`<`Q+1tt9BU3XG=GvEeY
zsRQLy$RJtuSI@V=1X9s}eX=@*`8@o~8$Ypgt*LkBook9XGf1kVVGk{hCUjuyDV4d+
zBNaFL*~453b+_f@Af(Bh|8?4eBAZ5R#TXmI8F4HrrQcOXo+!7>9MKgk@dAMwzyj--
zeMJqm>>VQ+SY9Y$uj#xa_eb3Z9tyP!yxuPzfr%Qf{*%Wj{~T(8ZNHNND2eFrh>)50
z{qB3Ihn^@JhSl4{;o!`g?)9(0_gb$5D{iJv|920c>k273!8{shkbjzrxHVF2<A=KJ
ze=p;T2yLlcJk%6*?Gf!yxJjx3zLiOLC-{GOG&3_)Q*mM|9JRVN=x}}n{Yr3ZO7(9s
z3KEuFEgIln`^~wCS6`vIowbp~A8UY5&52;i6B>2h35LM@lDDP@i~L<va|K_=1+2m`
zRKr>yL9voik~GrZh6#1z_NKE>gs^n?)UqpH9jz;;LsrbjT_2?2-{~j7J`(q46k-H1
z)lDuUQ4Z(YEnd6Q7P2js_%$U;pi-^MT<=_$MbGl7FOHUcRCP~Lg(YYD*(0v`#}m{C
zI$UyfuF*I&o|&(5eSsI>a?IPJluqKcBRQcU<a?>!am&?bg|_vu-nWIdcGS+(6!3EV
z^WYn8rlG*N9og}tW19x>2LGP+q}WK6hQAyOSpF5S+>Wf>`b_L=39!7}l5ceTkF2f|
z8r4jsm!$c(;vEf<B(qn!E;3i(2SdBC*u{)%0V@dDT?6v<S>1U{x(XGM6olJ9?@sg)
zE9}2p1u6n~$Kd&Ncw-yB3hb>Nu0VWUcNii!>c}0sq`@K$lcs?Y&p}>KB;g=eodY$V
zeKR*CW?~vkybm(z6DRKKeiyvde1wn=8r0ytKhhLov+CYB#gXiay54xOy$AYXETEXf
zZk|kxo(n#${0d+D8C>BgU?i*Gq=eY+udM|y9@gVXk^{t@_QLN43~~`gg!%~Zh8P&K
zsDj@IW(%*w{CL1U@`;1Nw`~3Su~f1bhhl~<-PnlaZ4llbujE1!t`feWPEZzAxCoR3
z<N6LJhX%ta$wzSy;M>_lEM%%Y=iG&JLT39JcCS)a5#xFenKkr0_-fku!iQ*1%Pk+w
zhq?`ILpCWobATeU+eaCYs+zYU`XgERmMKekVTD_0dj){*xEwg#?Q<A3!l<JUh1j{5
zf8h!H#c@^_+t8-JD_1J*>E5gtR8NC`gq>`%Mqo>bRjm@3YF|yFQLd41F)m$)S;9a(
z7)T|&l{LfdIcWIlPezYJ)Q2C9-xr;UA0(xSjbTCahrS!Lvj@t0dSLX~=ohYkKn1*#
z*_osGk21hAh`lZeS7Gp>)RBTy2PZ7`hi7BTwA-L%w{+A<r4OU@$v4-T38Vw+xarX;
z<sZrDez}z>Qau>fn6S!w8;w_${e5=0C3_oELXN}SQmrIc4IhU9b4+(@KHM^k<RUoE
zSlgL^Wx)*8=L@w#`|=i();4P5m873Jzh^Xr5_kZSWRjhL3PH<BSI(@pi*QNEBU@j)
z@8NFXF6VMKQf}e6FV@?%*eaDlLY%MD#^<p#pT?(iuk{2Seg)qdJjS4E2=Vf)qK^FX
z%#12YikkX#Gtu&=lC%()^JS@XUbX6_tz8{hjD1l%)L9zuhn=J(=&^O6)_fhPt3&%)
zF*9HtA({Bl$MxR5Py`%f*bBNs?H7M7TNdBnAUACI6hlcVA?M=e@Oq|o@m@%yL#Czt
zqtT^;SdH#xix=+x^f`=GO~Qq`8_836bW#r?vAA)YO8V34fI_le19fSXR)4Wl%<+z$
z@08SO98X>O`xE{hPyRqqJ%jiI1!=P6-VK1-&=0k1h@M(74OKQat3f9?qa)L2Wn9o~
zE8Pn1rwP@<Sc0mx;>au)<(fVZ@euxa!S;y0JJ*(Y2PdWcae9rj)9g4Qk#b!lk?hvf
zWZLB?JWiB%@4665w8_rVc+!XblizTlUJG#A?jGveNX3SmXn97uoC^Kbku)2a$O4$|
zNS_GX573XWe|)2jxIlVxKBG2bdpLBtxNGj?5_%<txT%y%MT(@v^XI7<jV)hmp5zBX
zor_r#E{9>79Gqw+GoY&{+qNdKOO6f3my9c8N$1!~H`x48JO18$*e*eAoStlqeRn6W
z_6H4$W2QqBjpM8t`y&!|ynyE&KmxdGO3L1am6A)Fzf5=&ZWl`FjXB);NcyqvfjjT9
zf|9Y%pveYkMksYk#9vaIXFuFUAXGRVd3(J{-NKpk%vnyPGyS`^R($oVFNIH7#5s+X
zDVBc3<rI%H{TA|LA;T%xeuCf>hgVI3-WSPaM6@LRHxulZ@EDw&R~eu^UJIPVKCi)N
z?BAWcPI^S_N1Wz={PHg->$@3CGK#c*SJg_Eau^!@v%fSLtP1OSGHC4gb5?#<mt}OM
z6b?6ldUr}&6)Q)ma_mX5lD$=Zxw!j*@=Pn;8}lUTvqoVtp`tcT`&G8L6Rdft%5@<f
z9%McDb^iP*yK=Q%BB*mZCkKeHbD|v|bIcv#y~A6mkZNn%<hm-{tlGTPsNs7U({pS$
zahXWAtNv$$Rw@)VsS^rTrc*HXu%l1UM4`Tn3rtv4xUIWkGZH-Nb4eTJSEp6gdOFuC
zv_bwL+|t2v&M;q~#kC3#hmuFsk%P{F)3Y#7=1upAcK{s?M{Nrx5d{Y6o~RRP8ZyPi
z4q&a}!um{j88&iDVLQcw<WBy*+*Ld1mSRY0W7HS0aRdo8)|xh|pn5gr-{0NNi6O@}
z{DsOLv>gy-WpVX0v-dB{h~2H~ureI@&?)4tDZzJ)_kG-!lR3TllLvND(d#$xRPJ8z
z8(|i?24O?E6^mlkd>FvtC?ob-Pl_V(ZAl))+Zf5@=jTg3yv0%*Z1yf7xUeUhp?;r=
znLe(IDW>Xv>?nv+b={sQEUYU+B@Cy&j2)6<B$s7&Qdg52TPj7rcrk{-ve?F<iR@$u
z{PudIPDStEgkU1Rb25AZcE1nAX8MqKGp+Xt{xT4xa}!qcumI77+RU1Mk(@LOr1kZj
z^(aO5YjN_rW%?+kgnvHhG7J75$uZGu&;FxFArKxD(ZhDPT+^M`XxsxwBEl*Fh8X7A
z6j!{bE7>+iF1X~|$mmIQ8(ErTLd+>MheK@eq8+l}X=y3b*_2Qk&~I?9l*h(pT~IS=
z3cLS%x~?UiA^`omWFz6KoEDX#oUXcK7sZH8Bodls!P3zp1&Aqi7+~?@_$~M)xIaLw
zhbM+wXZzJpAdV)MF!Z!}@aZk=A(>$eXd^A1Am=1I5oi;tcONQteQ>QPl+(EtPiR~g
zspBpo8Uh(f2Q4|3;slb*ZB%DunzQKDPp9pB^-<-EP=E|Px6BJIPWn-~ISkna4yNC7
zbx{<1^h*qI<m*hIub`@tBttj41sXG2^+`{dw1MIpzv=X3)68%aV3jYt{hzN+W<Cd)
zPLCbMU@(YY>4>9(oG;-GiKG=#I5d_;`pW2Fz)&gT!U`e+Y3}m8M5D$^pJ;jb!z%B<
z?#u(5;(*U^nk59ms5eFwk^(uBO4FaJ^Inp1k~uPT&6MSVqxTXRBB_G@q`hW^fnt3s
zwcJGBZ768oHQ2RrE&1Umn5+zUM13cHF%+Vx8YYseDB(e~5}ZMz7$`8HX}?OxTx8-j
z^;f~>SQVWFQTC-LFrzI|Ar!&wMIXk4w7oRBC;?fGq~FHI{Hr`Q_h8lqXp1mQ_Nvpr
zrM#G#{7GPlmCcc##4-LzSLLX5s?rYeccT|{j*~-l#{Nqp0<)Bbfymbxi=gp|PY5D;
zLqNl=A*Jh<U{+NPqm^M~s45eBeA}Y$g%`3X1zUwt2E8Q%BeVW3Nb-UggPOlTEYFG|
z;17_{9eY1z{kmKv@~Hbp#~|Cgq3!$!%8VtJ62n9OGeE{rb)T~r6)J)<0hgwYBCt_f
zi4s1cU@VX(+>no*Wub!1KtduA8O<=2(s!mpV%ZDUO>_WDQbGaUTo+1H!yNK-P~Bxe
zYSzn;n#_X&j!jhdP?`))!f*tvbMim~JPiOKr#T74$7=Ro_Bj?b2gF5eDU3-4I<0Sf
zL0}na3dnws%u7bZ?P|J-LQk2E!iC9r5QL%Bz=D;72CdM<cTwbppwfbp&Z(%(-by4u
zOZ3P%as7(h2P5P)SdzqavPI(y1dD~2r0|c9p;rSr$qjykjQO2wjrYT(b5~W8PZV%M
zsinwn<f*IWGYzxJ68l}KU~gp38N=*x1>H{M<bXl}{WB@gp-?_3#grZ1hHN+~ue`#L
z48nX-bjSbwSqxj5)8;g2+TKliU)_LJp3}6^;2)*ws51)Rb4_k~_Z1Ni@$ZqRYQd~=
z%{Qvbc*XB}2VsJAf-c@G?PsB83kE=NE>#)&S%tWF<G+l;p69AR*akO*_DJ&lXiK??
zHcO~oFN3)FaT!O*3g?)=E)q?-lt-7C1meiIQ~~{rms|a-uw+s3>Fv~JB{;Fl?uH-<
zz0ix5<U%}4vjJ%q&$(x7E%Ooa4O8K}%4u<JDE3K<_D&u0L$%wiZ0a9?hfvjD`d5T*
z;f2eutHMt8<<+A}Vg{8`VQX;ef9PEwp6_}Os8F|W`;)wH3I$$}_f^=|fi=6y74HYK
z!XJSP@y&RJKex84_1M<El_y=d|3u7XCd%Ql1AO(l_a=VG8`3a%O3w<5{aWPt_5F1;
zx{+Err_O!O=S*bKIy*V=wdxVeAnzfPc;FZlcD1se@lM9hzVhFp-+1XG_S8@va+*Rd
zcJl5hEH6FvHKMbZb^<xkIjvAXXOF|ZxqlgtcP}3V%p7z?6UBZS_(nsTR&Mo>`n(KP
z0tP^rL4=xS6?e>K!sRN(&r$H7Po7)D#EZMX-fa~-(Bgx<8>wfK@h<s~ud;ok8M<bf
zY$MAy?GGF}K8)s4F0M^8mCljpn~5GSR>RPZbNr+hHgmEp4ZLEP_x^Gf$tg&UWo<A}
zg1<g6L=efr+y5q0>W&i3?vsW<Cz{U+0csZa-FLP~?|@dG=8b>p>@9)Q4&uBtMi6`e
zO+xI0WK2^N!pQwdls`FfcrQ{RF*7R7kb(kHgQM-V2p5zmQDkj@8fKlaU3+&w{|nn|
z@Io#-v3aR-anU)O!m(xOZ)SX*Chi38Ddu?(_9>?mY{iS>l|hGmZim%p92f}zIE;Md
z34|CSL!f$Z7`6w_YkMp&m?v+{_!*Wv!cVO5rO(->o)noj8!cAD1yzf7l_YEvBi%YO
zMOh2;2<%+n-mt$=?#LtbUcek4*Ve`S%-q<i(JJei;!_Z~-y7mb1v-hv5i;&aYEOJ2
zkklsQn)#!JTyquxB0f_lrv`su<#Bb#^rA-m@8?+Q>QYzvV$t-NhGIpBj$U4dtCw^3
z_p2)Uq{UhxfeBJL!Rz$>Of2*<e!zW7Ii$96pu?ZJsl1q7o??M^hRkCBZMcQQ2xFXk
z1@ou+D^lD^<lw>+_l1bra{542_(-V%QmsU7o8=FXDcH#pTskpj%iA!(#UShM;iD)Y
z#fnHxaR(7SZ?ZohZx#{cY|4ci(cQETCqR18G0H9^_fl_2;9w`t%|;|BaWrew>UIs2
zVFyALwWm%jvH_84+^+U_qe|enAa%aH1MKvc(Kl32!U=C=-|8HiCCk44csDo(mcwqp
z60EY{pJRp#WfF7xZc-><FgW2M+WF932F2^JzYujrOT`#9%}@c|eW;;;=l4+^go|ve
zVM-RYpHekDHo*n}b0X$>1D0z5Vsp0KLBjHumlZQ<u`^|#S|ucjyNG%gX~q7Kby7?1
zkcBInBNQBE2G>Wx`=@@d)=CM=C6gC7DH4ctan;L7cKzT*%PIuK7oBCg!S@e`Zl<!>
zXzVd0{yZ2V3`q*E_?SHeDwB3u8?iFC`Y(_mDx`_iov}JU&nvVpEQW@jLYO4=rb}d!
zmoM;m!$`;WtBy<tg9DRF{`ezS8P9csg_K!OlY!H|)v9~hyh-vMxAaT!8^jGhBpU1$
zjy~Yz;9CTgoS*=s(%FgRDKoKC76Wuz$I<U%l^%F1sjJuNlc0fb5A345&tX?RAt8Tr
zm){T90=^g3_&zU`Gm^VRC0OpKJWWU{O9#J~owiW#+OT8fJXNI)58Ei4E<J(0n`%Q7
zr;QV)@0XMlvaHC3MC*5Go@97Z!*zDpiHiKPK%Qh55i@{8MRlflt~51Tt37l?J#Fl{
z;{tJFWyOJjdAbuJmSLmytlF7m$I5>cKQ*CG5LxK8cN=uI(|>VWhau*=n}~=uW=F8w
zWMDni)9h&*T4}qbhAR5XH>o46+W(L!l?35FLqX&7%q{!i%FhUIeaCe1Pam=zw^Z#j
zHD+|GR|2r;#f-h{vI!OB{F4#&mW_{9*`8KD)hJj=5F(+-jSQc0u(6$fGF6k)+*f?b
z@>yB#9755xQijv>Nt?vJFfJCob?1CZ7GNhF(fMokv$@&#_3j5&ecx`_2dsq-+uw_u
zzldcJJEiA{a>ae>G#+KqxN-PyUGYU|h+RXsV`IQr9USaD7oO=45%{CbjS#pwYm?H;
z`4|<i#|X@dzfyGv^T>?$XQiC)dI&wj^8`1qcxH&K3ALutLPmMK`_K4{U#lWQ%{Ssp
zQ%wjq=UXm)R&JPgK7Zt0Ad94Z?BqFAh#TO~y!{|&RgiN+pfu0@DT**U%V<Zk$LOpu
zE;oU3Wx-!7Jn5|m6D>8bUR&6=#|<rUi{9nwX5s2OFZ>lkoT9_Xz#dD=$6|SGTk~a(
z`lRPu%?HOTFSeAtDX%B^W42N?4%1PgXtOk-d6YjFS+ql1kSdofLq^%~!X>7yobKcZ
zPp0Z$avf8DI!jZ7Bw503&UUL@3!?E~pi}@^j$l6*N{m1x!li<?l16-+*OZ8eN`Z?C
zIzkWKaeFbBQMC-sBpK{Xr<h3&H7e^zJzMkX)qsyh`uJf8l-U>#E+H3Q5Q-xnsP48;
z8bOYCnoE_H;wQ(`ZKdVvH@ooJN%U{--N#`z)|w)E!^)|5>HCUU3NLhBOOfcBTz!C8
z8+=q;QONr_L$60~5MkhC>G7)2NNBz4ymRm!Ve&%ga$LTXfJ~Y77oD;?TY_+W6mb>`
z0H@^ca|{cW=|-m0Vzmvs($NlhGAl7Gs&@|8?3ZFSBb?lgCaeqKIx&S>@I~8+EU_B<
zgqCGRDb%U`9Y@&Mu<TgpoAn~L#RF0s+IZW!Fo$@{S$|00Z|BfF-dy>axHM84mOUAH
zLPSZx#C)!q^vH^dzWbj=At^8#IO!n3K+2LS7r?2a^jHbkf7Z)$_wUR5*bUeZIPf54
zGb6+*1(u-kvz>Ntd~@!U$||zBYD^QQ)S8NrDA&ECy{lRiZ7H=#t!@8PKLk+rGY;CF
z6_`)07xf9l$k3qiYE<&B#@O&a5o9Gc7_`!!ERO@Bwpb;D_C=5gJG>*@9d>3M)PX0O
zGkYqM9ZIj<jE_yOypFJM9&DbSm8T9AWg_Q*Z|V1u!bI~E7{~;B*N4WP!fpWWZy!ki
zDlvPOAM4su@EN&6GFv0l8SvzvOgF(<`|k$AxvyCLFN1q`JG0`QZtQ0b&Ei%XP142e
zDQ}a_tuqGrqC8B5OJ@^A@}#URdC`~UEme8&Dsz50%cVkw4PU^`(85#qP$tJvp`4Iz
zpRE)0GFBK_t0R}QyS_)9BY77t6Jh(LDW4*iSVH%1vIu2nw^%79FJPUwOH)9Q_NN{l
z^Sl5-PnM7`$Y^dGR45)Mo~E7^ol{{DQyX;u2MMXFHsop}&Q&Xni%%{%uiJ--!nrfV
z0*|AYzO#)(+TF5R_0Zi!(3QOIm~n!G>>iIytCqsqwu7H^J0HIGKRBq04ORVY>S7AS
z`}`I|;Xh*Oa*&<92S7$b@r)Pm0;<osdpjksn(b6$ijp>)4FrC46}`-NjLnaK`|=|S
z=_yp-i&-_bU2hRS6RxE;`n@M&7h32mfvxVYn$@x11w!M0q0ut68S%>>pPw}3vVWFI
z2rT1d<8K^EZ>l~P18uyXUL)De4Y0BY$O?_FbSx#lOH+kz<$wnu!l$VGy>)v4X!rDg
zQY&Q%`4bT3<_P)i50<?xlXY#+7-r|>Ao-!lDJd&k#SjbUr04K*`sEn1jpW;9aB@v?
zfi$FX3wD`JR|rd44(mPNAs6Q4<rRxO2Bn0=Nf-Q5ZzAGa<2%<57pFgyjVsL1XtHK|
z7c%Ab5iQvw0c2Mlh{ephkgLu<k0A&ixd=N0>k|g&p)^1Dl@g3n9_$`_NAI6V2XuZ9
zb6?abeUz-V+oKbBpE{UA6vcI(iU`}JIa+6pzX%_3e_Sx+<%|yTOjLoIjm;JW{Ah~%
z8N(?-9zq3DqLypkzWIyvDV%9KSOnbcMzHIC63cT66d>Rp;p#zQQvPGxuXD9X+nQLd
zf@hJJ+i(DlbaQ@D1#QhC_Iro|B8`1ET6WfCE&$xa*VxNzuu9A*mxw6jWps41Y|q4{
z)G*rcQv2-DT7RHceKLGvmC@}kbuTRlWh2&g#;K>+8CUpYL)xLIxq}p~7qq~6o8u|^
z&ObgT36RY7!a@o)qvCgtWFsUeV8sI`ovWfawwhwam1!a^f48(zC=}0=!%U`mOK>RH
zRH-w~LJlqp?q3(HO5>D$Ui!_)mR3EvPhZP<n4*-Zd;D6;7R${gt1Xc{jk*j1NyF3P
zz%_E#ZM7tKThM+}jL-fhA*~EO8wdORWgw|f4tNhR2JYfN$n1*@CYkqf)7o^`a?-pM
zIg3ux2zfV^8jG%p!~Y89ki~<Mrc5t^?8D}QmdtGx3xmSU4WcwTr<0A0Cq*HjBC3(T
z+BFGtTt3vSFt18yh7=j4?=zl68#P5!ziravtErvu?|}2+ybhkP9Shg`c6NofvFoFh
z1OAKBnRCBS&QWj#?Kzv|3`u!tFa*_rMCEub`RxJ{hWp5Z`Mu~2A(cbVl*ObkDXn?e
zaCJ7KTh8DviMnqK1<j8)vFy0!Vl5D5*man`MkCb`4bI&{UgxHugyyM0f~h-5jrnMA
zrK<mCDK1KsnDn&RbS8xj$w|6Ki6QrZCz{1sM3BUcEYDslkE|YZPG*}h4|lfrKLsV~
z-6uaPYBMQ&hlK9rcdZ0YpJfq+cxq1NRz<YW10mh+&V1G6;9mbBeCzt^IIwv&b(CbT
zsTzB6){5}N2!|#<i{y#I=<<H(XL9JrkxAz{=2)D-*^-KlxQ2G}me^yc{rF;l%r-FI
z8Rgw?{7y$Cu|~b?vw#By+ns<7s2oE!Oi%u4tuUF|RnK~b@kkFxPsbEvGB=?sI=v>n
zFFu+$qUxz6b0vhfunRBpyjn&p4m*J1ZTan{4wsirNX-$4t*BQdj*Cbtl}8t?D7F<p
z5BGgfT65UexJVdgk<=~sJ~{`)6xSBh1Wt;($}3#o(Fa<}gpelwP8b~yz!sUg{((d~
zM?UsLAm?U0fJPVN>DcQouSY(X(ll^bI;uFPko+<^4HJga4JcbYNS^(2SXkfpM?<8^
z(J+%k#YA@OKkB$MB)da#jQoQ}Qbj~tnGaUTlCFGE)vr%J{`$D7xyb}v&9v&Zjf(v1
z9eMWmTH(}oz^S0hOoI(Ur$dVWB@>OWXqKO#(6T%rIy{;vYK-rYLW^&cy1|1`aX4H{
zVwA5A>u$rBx$40mT{QCgS6ru_E~>K(GLHVp%QtVZ<UMMQ0}ofTo8Nf2Dm~7%aZj;f
zpV&_~sfSJwh><$43>*Q(r^W`y^U6VP(u<GEVjT?)G|U_K!*pnA$kh1lUN9u#e)-i?
z6~xfAtoB5Ba<ycuTFALCIv@R=&<-eS9{C6dv0sM1Q-mXJfsmU^*VC!_@b63yxR?Na
zt+>-uPWWnlJkyKqXA`91cm)$7vm8wo5aX7m+&Z(7$brg+Ph|!eE5p+xTH>KyX<GWe
zk{#1^gN$?~`$(viIqhmp0lq8j<Yh>MCM;d#-e8?2_=ASPv$VD-cA|c0{8*=;kW#X-
ziLFJY5i5;avMr9c00*<<7mjNIv#P7Rca&D<7U#<_5H}z@F5VsA#i*avIguW#n&e8!
zyXgg#=E*Ww5EAf@t&ZTs3H+pgkulnF6lh<G<l}W)V}8ZxJ6{s)IrTy2W3c{A{HGGF
zGE^^h=<o+BrO1X&+ub^UfB}@nX6#x#ctj}o`p7wGP6R~;c*kzw_pl^R^Q8R&F9T<I
zHUW@!e1<%i^yYVWKL$!sN08i{zrV!@t**2nt#F1VbOJF{TMe|>H&;@K_LxiZQlY=(
zgDd~^Jb<1A95CB^C>JLW!Ov)5p88w8`B}3_79N$}+3y5#jeS0rv^jDfflme!cla|X
z>U#DKr?=mXTHjzCOilZH{r3}sPwr1e3i5+Clk?Lc<;WVVr}D<HTsNLH1UzSvj75-k
z)sMfFy5>L(-^%JJ<br!Dp@sfdQr*I5+6!^eeQhKp9u9f4wkk}g1jbPJy>B9k5GCx5
zt72Kwk4vUTy79)%1Ky?q0S6D7HtIP4nbjHAbw<<1_ko!wEVQiGzbmsGf9wr{Cgt^m
z1*bpiSvYh^OrQpn<8cO~>6_lRr#(E12llb@lxBg<J0}flV}Cmd$XBKaugKR1coDO;
zdD?Ls!e9YC+5C?ZlQQ@+K9zFOKt5_u;U4H==JUIEJZ<Li=0mkKs`oD}hpta6&%?Wp
zuTI(l`qDg@pl3KCaW1fW;1a9#(+cHf?b7^v_2-0L$H@@g(Cg_J40Ftu$3rvgdvZnW
zPb{E%db~gzvLM`Fl{;C7A&Z$Py*F!WWHo2_@xRyC_;FH0DnESXpz)L;0=*y-+((;k
z9tWPJE33jmi=XQRp>PKw7w;B5m=`BWMDGmbZv6(=GYJF|W3D+%qsv5GN~)%slERyQ
zLGqjgJu?L+Zo0x!zV4iJ6q{gPuvNMCax}1Q&eVXH?DEii_LRuq9wDzSoe_5UH$Y7Q
zxit4*e*){O|J}pbWywgWM9q8=TtP2+dQ$P|+25gRA4dg<6=Hn-dIDc^^qbM67DjF6
zI*DIbqA0&pYvWsS5Fyu}7^LQzdoJH2pO4+t<$rmp7L3}Gge_B^(HLDYYzeLB%v=Ho
z`tOT<oPl;f+1E?(ndLL-MrN}4AJf4pB^q(4HA+6n-F`n8{wD3qt`Kg4dYedgTHQf$
zoT=%yx?K0sa{OMWSo8Kh@mUDb*p6j7FbA$v<WFkCso{tiDQLU&95$EP>pz;Ikz)FY
zNmnLwgq6y_yI1}$d3<5?MBI}BL=wOc&4du;Le^c=a9%)tu|w5f(elqUmJ9`n8kRV>
z%)cC+HmcTmIZh|jBnI;7fvAj&Ko!SK+Z{<Ipt-Km<z!rq+?!*^mneDne(F^xpB|m8
z#ekWL4{iVHk1>_p>y(_fn&!!4zmX8sz3Hc5nT9ejDRi&nN~C$x?d$qqG8H&|qNj?1
z;6OgBEDMu{CrHQXFgwVo=BshK$#Z`GX`)DWJ-DYFfdBOc-v1_==js<Sdo&JmWMlri
z_^m4(V<ap@e4O6Gl6lZ@b^8J@6p**W`Sxl2qWtgJ4>}Eh7sQ=1E~6`=4PzJ9qcH%z
zR5>lz@`R(a6=`*?yV{HA_ZGm{-Np7f)2`GnY2~rdKy7dy6LXbE?yYOj^{A0uY$dfj
z<!;&Eol8)j>+~oGjdncA%RbG;1ij844zp>l`BCwyDl=0vre2~<J?Z|WIL&H6iXsqd
zImh=a&n{b=Z-o_P)`F_w?M!4StDF>x?7ra(!a48c2lJ8bCQLNBo&YergAeb6*&i;`
zYl}o0G25#%CP9Q3qkq$ok7iP*c%aXf?Iu_|W@-Tnzsl(iKW`D|I{noH>WENDL?bSt
zsa!_-F=7A1-cwbXp))C_qI0vzT8J6lKN+EO@dp~aTqEDl9bQGDO~Ea~e=wCuACCn~
zkw561infD3t1gwm|6~Fp*!^k<=?(NE^yz=un)7-W2cEK##q)y{A*jFz8?2uA+K`ek
zf6lGxU^atS6?(NGa45{KyL(_&B%5ymlezb+!o~51(B*c^i@(&MqMZ=s0?BR%ZXcaq
ze#fiiuYvd6*geq`Wyz`0Y;)Fjmr&A^sNdQaINTr`yzW^DXP5#+``QAoGbmWC9zoQM
z>>cyUajNsm;40aj8YpX81NNgxg6L@?k+++*6y*1?w4--k<V)&$4aIUMA|!$^(2y8N
zHL>6S#zTEY8;QCitZ&v*avs4AZsUSjyi}CK?Yvk&)P;X=y)y>8`lhqD8tRL0vF3J!
z==er02$uh@H`f8kel$M(20?VJR3YCh5W`9-h{><IP>BUssXY)DB=UDHWi9rCM2-a`
zZKrGS6qks{=|ai)jrqFvnCYKcDDAJm8fZfQ46ZzRe?B-k{}&WJz4H5FxEblSy3K-P
z>CN?fx&pW6Q*it*xPF{`K2@dQLb9Ehsajjo)ZC}pn`9V3m)s2d>qbLK7IpEO&K|s;
zj0{YSOneJB83`q>ccH>jk<j~8=4^Rs!XKs|`O*<WK)wZHvR5UQ8f51_YOSZ?d*Ev;
zZG;^P&Ri7tUgY{`<S%UXnX~<E$(GCR1Ef}jNC(~hC0UtsJUCx!g0DlrXFs+qPKT~o
z0k6ot*^e6Fbt1i{1=q&m)%+|KmR*?nzeuW-z=~vv#hEO}Q+Y69Dde+#&1#i6eDHp%
zhAURWc$~!Uz&n9(RL0=xc^~!t5vDsTiX+!<8k|ZP&Dmn!2p+d(25sKPKjLYkN4W>f
zPd1%eLym*~6SSB24@ugTlo?17%%y+PE67AxCvg@qbzwmg_V{M4wHc68ox0P|)yfgg
zX=XJ}FxBO-UVG3uD!oM`bmrSccIaYhQcKPc%P!-&fdEKxm#v@?h3h@FtYRY?&nonW
zpI?!B8qIhKCks$#3B|AYsJ0|3nKN*wOefRJunada2a=8r5()o2TOAwsqt6#;0b0ZP
z7XJX%nQe}NQOv8}tO)!z_CuBW<Q&aPmM)BEn58j9!$_rot}pfeRrntI?4*j%scBYO
z+0&@f^4^2w*3XWUoS*y$4nWVrch(0X_HM+gQM+o*wb9AE_1pX&a=EcqI+gSQ|H5KO
zB@cd!!!8)V&rGPo=L5zT>L1A$0FX-xX8_h)R$GiUSs77Kh0xF7cKZ7NIAXyzuJznz
zI=wZbili5;_WYR?K=s0D><P9w2?qro{`lJBR<S!7*^uaBx^Jm#9RS<1Q_gH)6XxyM
z;XN_q!xGGxm{EmIgR5PFSrxVvk5_8I59Yn(KC#EP$F;<L__f}a-u{^-E7bf)@CtBp
z1C!!+p*<V&9~PcqMZWG&%&ho>!#6WcJssF*N~u<V4n<#Urtb{qc{YAoUR}{b|CShF
z-OOq_WYf=|p*$=nUnrGXId%sX40GNs0DQ{qHR#~{#PA5Fyj7z^o%b~mVgv~(sjFqX
zP<FQf`=yGRA_sbuqj8Nly|v-79|mABg|l#bQE+Vo9G3rP?UPibuZg43_+GkIHIksa
zq7b`7K0WGQ0wkA;s8sMxLDy$B7ZT=u(-TO=xW#l4sE>AO@SJ%p$}W86$uk|QI_bHy
z`)%l~0KCX%2BPl$5@CZzD@A9EZ>fQIJVD934CWxL{<DBC^dZ<vzQ#L3Tp$`Td=Y(p
zFp#11M#9<jTI5=Sc31NnOOpulGU@D58w7+M>q&8Q?#HcJN)ZeisVBW5fZMnfqX1+9
zSsy5uw$J?BJTqV#0$OFV=prc;o)c|Xcqj)GH9cQP105+!`mPgWi6_bl14iF({&!HX
zd-zWWj+KO$!myiTH5cF0fG3e(6;p0-rc-xhObot6B$WFN%x5`bwsLl_2jmffUexYz
z3mo_74u9yYYY3OQFvaP7pDVvHZ5Mctj;3$Vuq;P^4RG#$_xOEhOUFn~=<806<t&$$
zVKx9mY*|Ny)q*lozGxqeX?dNm;*|WArO7asw5MhUf+>`QsY~qy+?wk3nl^(77Ed@T
zezwHm;DOTb)s|DWi*=b-k$mpt9;jVo6v-kt!6Wdr8iZl*lQ67pf8bewaesbBPg4Br
z;)95Z?j`PhcHE*st7Cu+a?ii%P=x$h^Z<6;;V%{viS0bbYxSOrQGZK<XAx*On`H1u
z>hCldRx+1e!cn;_@WDQ?3@s9ez*;mb_3r7lw9d8ORlEvwD9<!ru{#%i`s3_$`dQq2
z86yxyz+((VrQ&kZI~0n1Wk>JR=MFm=S>|`!Z9NCm=Ip9BCSIfbr30@)^?a#vySF%|
z&##kjZ3-8UrFKL|#qQe2V9IFxWyP%MhZfZPi~I&l=7^6kV010q9Um{%_{#n1&Ann;
z>aOb;8967K=V_=#mDndjeeS8sS$s3J)UVEVZNE>B?jo7s9c+zoX>8Jy)?AaEY{^{#
z?-cqmn=0~7x;>Pv0jHehFOT4Dwq>R|uZILO-KBxx@A3_*RUzr0KKa*8-D#y`;<f`X
zmy)qoQ+m%>KqO<q@Oe%Y^y29Hgb;Jqb6Q*Y^>wc2f-r-wn?<{?V!!Jr=IJGTsgx(T
zzGuA9Gb?Cy%ZibahHC=V3Hv(}^09bmj4h^S0s^drkLATO4hM%JE|S%;<F-)wmd9sG
zKyW(aUzR(A_e*u(;ExzTd@1kshYF2rJ(#{_TP}?%K!Y&?HLPA1rG>!t&*;om-S<wD
zPf(ZM6<TvtCFU-?@$BJo#~5dte#3jU;L|g>okPg2pB~r-7`ffdfVaZB@>R!hTG3dv
z&+1FA*!BbeaHbfOV?7Nw9mrOj)V7@}C9_IEVQd%E=Eq~r4kL*fpZCP!>byZHvCjeG
zU59HdO83kD*NE~u^?PcKA2`+aZlWp=7tpq>R+g+kRN0nJTO(0zYSfsP!g=@9u6C{$
z%7)oXSzN8Y#4lInM9t{16EtL$?y7~~$?m9?R-j%MB=*?a^mtL}6}=JMX+Kf_Y7%Z$
zhxyRS_~VqriPfO|@Fv7A*S{r%M^%bL1`iS3y!=QF$%5;XLNA4gF*{l%d26QK9AJKl
zKh@HTW{Fqg{^xwG#A{-3s3Lu#0jZ{Gz|CN^c`{d+amv}KBE$8V#x3<^*z5%ji}RzQ
zIHX`e(G(&fb3}?RQ69^CO`Gehzm)^^-g~MP_nhFTU3;<T)I~|VF~Q@%!7GU-h_Al6
zQfB-`a9GYt@4oI_nFO+UZ|yg5TcDc}W8#$!4ugEio3v2y{PC$Vw#u=w(wE&n`ou5w
z=-_SFg*^dRZ*hyA^?c^Xh<#}AMJCjWp_YU31N=<BQHJ*=9p%#!pB#ez2u&6tTEuj-
zb-XGL_OG@~IvLBs+hi=S<L?fXqoelaOcO3Nuaw_&ar?oRQ!sJklmn@kh``ICH>o0Q
zum<`!B!bXY1A;+~c^*WGDd7OR-wMZ33bv``YLZ(Ot#{cic2dm3wj}w64|dE?B{2zm
zGP`q$Mk9pO#w2EJ_@<+!-#ra1%4p%*B*r@>xcL$!NV-ODZnH*ZB!Brcm<;}8+27nL
zP-vXey_jC6zTP>nu4i%M7ZBI_<L+!9+?#Ji&k87+bQdCCwanpJ^%Qd`JZq#foh26V
z@c|WYD+yoaY-*%KN0Rj%>ay|nbyG|a)fc3nW;{XQc6R1YrZC5aBxGg2wvJ|8a;9Z3
zDdyN1A#lOUE5eCxxJ(^$YGYrjW>o6qaa=E70_zgOr?^>06;(A$7Y3GObMZ1C6d2@l
zT<UVHL~aSs_i)<zJ14F)N4(SECrLQ29*KJV*g#Wc%HygT{If7G2>p<TNPW+IofYNb
zUYQ%I`tPVuML`0V$6Ptwo|lD(-Vb@T+M-{t1x=bfLN`mF@Rv1V0ZA|w>(oNa4o0FC
zMJ6)b>R-7sFJC2P@^Ij*62Y#fJ2b$?j9VVZh6UcSmb11qe`{u|_$J0P%CqDZM6}=g
z8IW2`?7ur|(6aOEKF1(&#a^FXh)?63*25e<I;0v!m_IX|9t;!UYdaA*ITj$VkfA<h
z|7@T3Nvad-^*P_?+Nn`UFFx(Yo(wN3RCsUvp>@k$K%{cZy<a5LV>_aWX{dVnz7!E5
z%ze-(raoSq>Ed9OMfOBL?N{zUfMxf>0(>lMezf`C>uJwXjwz39<XAO1cvdSdU3Z-?
z&3Ov)YlqcpUtMF+7p+$i^psy(5Zid8pE&smA3T5jav9$eUd*wX;Rx<}=!n5yOOPG$
zs?4pb-F(<ozP>q+>ecIU>rO>CXSKLa&oEQZK*2HDw(x-L%J~E98B5Iku=#tK5}2*m
zm$f*r@4hlG3?0)tp)U~GN?F24-uI^qRM94*LY(VQZ37#n&9*B4nd}ep*#91d9uzY~
zk6Uw}^WZ&fVlx6$*$IC~PA;#go(WQRu-o_Nekgn(q48t)Y<f!G2TdY7j>+fsVWJSN
zJGmvxKl8n%s=ml{O;$z(x~LkR8qoSBHp&f_ll(kv%4(21YhKnBnRF~$&*iLfaT#Du
zhd$J@|4)vsS%0wQIl^uwA=*yjhnoxcT2nTb#oN5PFQg5M>B(#Ys<2?_@_4_aN<h(u
zlCzj_hIBB@CmKp}+r<G5)cd~ePz3mErq@LCNQ>xobZEZk!X^2Er?A>r3-C$&>tz^~
zt@gY-JjAKAB21=+K;IY=bMIh3rN(}%j`g)Fld0pUx-f409=Yc%Gf0)c@v|BcT;G!*
z_<x1ffO+cDv<G|W;A@OCOd_V<^oNbSzTfvhRg$3?8y4`l_9&LL6GeYT9l-uO^SKcx
z_W6=B*=hN*N9*QmH7-<Cwgh^Yp5)=7`d(jp%bSp&`h>hppYN}0zg513s>WO|h3&Zz
zVyarcZuBx|2FO;b&j)CQVInV1cveoX8%52${4V&5OA|xI{kIAuz*Mpc0#8ZaUGauX
zv@+KDAoY+Fv1`Hal+`(!#{3~m)O?RIPIGyC-}?VH!R7D>y8b4}cm$|{q!I%5n44j|
zH0H7;Hw?kN>U6v<!&q>^UnijyMoQ8z;VJezlL6h$5FF+@Uc!UAH$KPRK6?vB1k>25
z{iBpO7rN50JR5INy)}Trx5x5Mtz+q3R^L!7!uS$eG&qgBd!q$fowbO`&U8VjsGb$_
zPP;VH4@P0Pelcs%698#>$kXLP=bM$rj(zKg{(Eh4Joat3e5U9rF@jb_AJDNEqH!03
zpI}Zz75FmmpLM)TJlC@d*w5EYVQ^OBlyKg5lZx0umgkx@sd2A*8W%(`=kFeWd<!KB
z<$-|w-?l$vW03t68&JmE4=y9z)^sBfNgSpJVEp$iHNzM8_ebtneJ(G~=#jB8SU4Dn
z{}mGHe@%n`pZNbe1;@vGZ@$4N{Gsw-;AkL0JQE=m60<}SVM=>Itj0wiKoYq{FQGs{
z|D(AlGKmoZ6H5IeIKeYc>|$>D;rQGQb0P}kl&vPgr2YNDu<%^fa7oQYZli7_dyu}+
z#Jwwbx&qlTf$$rX5Bw)Rlftr~`g`zTL-(VawIa#oyJ*uaPWr{)hpl2n{M7{k*dv_f
z=?8p7H^;33cAX7>O0(3fZufNZn8st|TQRU>CLSCCLhVt{n2J`^pCg=aGco6B;o2jJ
zn~^i|>qKq@Qc_&fjBDp^?=Jpv5n5Sq;SZivYJ7>}ZE9t(2@>A$P2sMri2Vlpb`u_%
zkbIGvbRC8x|JD4U*17xGuG20Da#-ox=55JGs#7;@n~<=EBcs-k)-M;>Spxg9psfdC
zQ2RuH0@;=!M`S{`IqIo&(sW((A(=h$`~$O*h*2rFGt!j^y1)1=<fJ}2PCK<{)NB?E
z<`(_G{Pu}$hNC*o?3)fTh^%;rsiR7`Mp~#D0jtSct7{^IfeT-}pUSBpqF>XL-q!-n
z#SMAaYa96O;Ek_euCb237~cQ8f3K{c>J~uiAs0&4I_q@*QU7EX&*Xn2oT25X1w@ST
zi3i|E5z9Rm`XVU5^qEo7#HVxFGj;aeQ~P5N#Lj$FHBTZK51(KkW`w7YQa^a26>nwt
zhkod}Gq}T`Vk>UTuGVJAhBNflpg}AC^RD4$==&`Q(V(~&PVBBKhZjQZ0jxlH3F{3<
zPG5r;(#!#5XISbDn_*vt7h=r;VrO{E4cB&GhZpko0l05i><z0>U&#wX?g4zFzXU$e
zxcg7!AFFXtZ|<s?nCO6UzfrBz4UGH9<|>|L2Ln&NH{WK!8djE#5?iLZQyUszYvJ~2
zjJ>$+ot37Q#}B+^OcS}4UnoK+`IOr3lMN}n<Iq@8blEpWt8Rx;kI|M987$c!^hG>P
z1p$hMbBzuIaX!b*)&GJY%vXx98<x|6pF*rBWiI-y|1R!CGg4fb6#v~B4ilB9=nAo&
zpUh_{t?K+}r<3hc&TBTsdA8<aML(S~Of|-xS}>S-g8d6pg@e@-_LPs71}@<=mVkb;
z_#iqSA`83_zgqVxvC^_zD4pIF;6`JfNcm7Pe<+Xr>Pu&siB^rC^`=MM(P}UU0&6Vj
z@)7G58Sj7k*_x+Gd$;Ck%v$!@Skig@pzo8P&&H0hJvp#P;|sSbNHAdWCdJ~H&xrk-
zNH%{_-U?F^m`INuH-n%Vk8N9AU1L?t-n=mxRz2t*?z$IULND~p<>E3Ktyc6Yq~0c@
zTQuf4U$<h#D69LIT=6E&n>acMn3El+rZ0eY?@#Tj>u4=$`zxEXbdRfem@#dAxfVCH
zLs)V;c}RKvMocSDgCAX>@Ne6ke5}kVNvk;GoLx~2Irwk(?3U$rfmFomg}w&C$rz*#
zT}+KBjoEh5x&+*-j6s}RuP1BheG~B?TY~~C(eRx4A%+ZlRDN^T>y+sy8f0c9N^}0X
q$W{uemG_UtyuWCc;f&+02a@vk_{8O=e|9UDc3w-}Dia5#tp5)`Zmi`1


From aa5c52dfdded32dc9f4248d06395794cf9e716b7 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 23 Feb 2015 17:02:44 +0100
Subject: [PATCH 0744/2920] Implement content refresh control next to dropdown
 tab

refs #7968
---
 library/Icinga/Web/StyleSheet.php  |  1 +
 library/Icinga/Web/Widget/Tabs.php | 30 ++++++++++++++++++++++++++++++
 public/js/icinga/events.js         |  7 +++++++
 3 files changed, 38 insertions(+)

diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index bff60b68a..c4b61f17f 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -10,6 +10,7 @@ use Icinga\Web\LessCompiler;
 class StyleSheet
 {
     protected static $lessFiles = array(
+        '../application/fonts/fontello-ifont/css/animation.css',
         '../application/fonts/fontello-ifont/css/ifont-embedded.css',
         'css/vendor/tipsy.css',
         'css/icinga/defaults.less',
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index 202771237..64b898e50 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -4,6 +4,7 @@
 namespace Icinga\Web\Widget;
 
 use Icinga\Exception\ProgrammingError;
+use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\Tabextension;
 use Icinga\Application\Icinga;
 use Countable;
@@ -23,6 +24,7 @@ class Tabs extends AbstractWidget implements Countable
 <ul class="tabs">
   {TABS}
   {DROPDOWN}
+  {REFRESH}
   {CLOSE}
 </ul>
 EOT;
@@ -59,6 +61,16 @@ EOT;
 </li>
 EOT;
 
+    /**
+     * Template used for the refresh icon
+     *
+     * @var string
+     */
+    private $refreshTpl = <<< 'EOT'
+<li>
+  <a class="refresh" href="{URL}"><i aria-hidden="true" class="icon-cw" data-load-class="icon-spin6 animate-spin"></i></a>
+</li>
+EOT;
 
     /**
      * This is where single tabs added to this container will be stored
@@ -102,6 +114,13 @@ EOT;
      */
     private $title;
 
+    /**
+     * Whether the tabs should contain a refresh icon
+     *
+     * @var bool
+     */
+    private $refreshTab = true;
+
     /**
      * Set whether the current tab is closable
      */
@@ -308,6 +327,14 @@ EOT;
         return $this->closeTpl;
     }
 
+    private function renderRefreshTab()
+    {
+        $url = Url::fromRequest()->without('renderLayout');
+        $tpl = str_replace('{URL}', $url, $this->refreshTpl);
+
+        return $tpl;
+    }
+
     /**
      * Render to HTML
      *
@@ -323,11 +350,13 @@ EOT;
             $drop = $this->renderDropdownTabs();
         }
         $close = $this->closeTab ? $this->renderCloseTab() : '';
+        $refresh = $this->refreshTab ? $this->renderRefreshTab() : '';
 
         return str_replace(
             array(
                 '{TABS}',
                 '{DROPDOWN}',
+                '{REFRESH}',
                 '{CLOSE}',
                 '{HEADER}'
             ),
@@ -335,6 +364,7 @@ EOT;
                 $tabs,
                 $drop,
                 $close,
+                $refresh,
                 $this->renderHeader()
             ),
             $this->baseTpl
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 39a2a3de4..814750a71 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -115,6 +115,8 @@
             $(document).on('click', 'a', { self: this }, this.linkClicked);
             $(document).on('click', 'tr[href]', { self: this }, this.linkClicked);
 
+            $(document).on('click', '.refresh', { self: this }, this.refreshContent);
+
             // Select a table row
             $(document).on('click', 'table.multiselect tr[href]', { self: this }, this.rowSelected);
 
@@ -481,6 +483,11 @@
             return false;
         },
 
+        refreshContent: function () {
+            var $icon = $(this).children('i');
+            $icon.addClass($icon.data('load-class'));
+        },
+
         /**
          * Detect the link/form target for a given element (link, form, whatever)
          */

From a5514392db55339559d39fb7c4a77cffcb89f09a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:03:11 +0100
Subject: [PATCH 0745/2920] Adjust dashboard, output-format and module tabs

---
 library/Icinga/Application/Modules/Module.php             | 2 +-
 .../Icinga/Web/Widget/Tabextension/DashboardAction.php    | 2 +-
 .../Icinga/Web/Widget/Tabextension/DashboardSettings.php  | 8 ++++----
 library/Icinga/Web/Widget/Tabextension/OutputFormat.php   | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index 602811b56..b59154020 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -641,7 +641,7 @@ class Module
         $tabs->add('info', array(
             'url'       => 'config/module',
             'urlParams' => array('name' => $this->getName()),
-            'title'     => 'Module: ' . $this->getName()
+            'label'     => 'Module: ' . $this->getName()
         ));
         foreach ($this->configTabs as $name => $config) {
             $tabs->add($name, $config);
diff --git a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
index 0745a0759..ca9bc99be 100644
--- a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
+++ b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
@@ -24,7 +24,7 @@ class DashboardAction implements Tabextension
             'dashboard',
             array(
                 'icon'      => 'dashboard',
-                'title'     => 'Add To Dashboard',
+                'label'     => 'Add To Dashboard',
                 'url'       => Url::fromPath('dashboard/new-dashlet'),
                 'urlParams' => array(
                     'url' => rawurlencode(Url::fromRequest()->getRelativeUrl())
diff --git a/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php b/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
index 6d079981c..f05786a0c 100644
--- a/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
+++ b/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
@@ -22,7 +22,7 @@ class DashboardSettings implements Tabextension
             'dashboard_add',
             array(
                 'icon'      => 'img/icons/dashboard.png',
-                'title'     => t('Add To Dashboard'),
+                'label'     => t('Add To Dashboard'),
                 'url'       => Url::fromPath('dashboard/new-dashlet')
             )
         );
@@ -30,9 +30,9 @@ class DashboardSettings implements Tabextension
         $tabs->addAsDropdown(
             'dashboard_settings',
             array(
-            'icon'      => 'img/icons/dashboard.png',
-            'title'     => t('Settings'),
-            'url'       => Url::fromPath('dashboard/settings')
+                'icon'      => 'img/icons/dashboard.png',
+                'label'     => t('Settings'),
+                'url'       => Url::fromPath('dashboard/settings')
             )
         );
     }
diff --git a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
index 212ddb518..0ef7eea69 100644
--- a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
+++ b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
@@ -85,7 +85,7 @@ class OutputFormat implements Tabextension
         if (Platform::extensionLoaded('gd')) {
             $supportedTypes[self::TYPE_PDF] = array(
                 'name'      => 'pdf',
-                'title'     => 'PDF',
+                'label'     => 'PDF',
                 'icon'      => 'file-pdf',
                 'urlParams' => array('format' => 'pdf'),
             );
@@ -93,7 +93,7 @@ class OutputFormat implements Tabextension
 
         $supportedTypes[self::TYPE_CSV] = array(
             'name'      => 'csv',
-            'title'     => 'CSV',
+            'label'     => 'CSV',
             'icon'      => 'file-excel',
             'urlParams' => array('format' => 'csv')
         );
@@ -101,7 +101,7 @@ class OutputFormat implements Tabextension
         if (Platform::extensionLoaded('json')) {
             $supportedTypes[self::TYPE_JSON] = array(
                 'name'      => 'json',
-                'title'     => 'JSON',
+                'label'     => 'JSON',
                 'icon'      => 'img/icons/json.png',
                 'urlParams' => array('format' => 'json')
             );

From c6b61617eec4702b1bebf96dfa8095082e278255 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:04:40 +0100
Subject: [PATCH 0746/2920] Add proper titles to the monitoring module's config
 tabs

refs #8458
---
 modules/monitoring/configuration.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index 0087af190..fa7732e10 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -67,11 +67,13 @@ $this->provideRestriction(
 );
 
 $this->provideConfigTab('backends', array(
-    'title' => 'Backends',
+    'title' => $this->translate('Configure how to retrieve monitoring information'),
+    'label' => $this->translate('Backends'),
     'url' => 'config'
 ));
 $this->provideConfigTab('security', array(
-    'title' => 'Security',
+    'title' => $this->translate('Configure how to protect your monitoring environment against prying eyes'),
+    'label' => $this->translate('Security'),
     'url' => 'config/security'
 ));
 $this->provideSetupWizard('Icinga\Module\Monitoring\MonitoringWizard');

From 66305bd79a188cec81375db50d7d84920d10e787 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:05:02 +0100
Subject: [PATCH 0747/2920] Add proper titles to dashboards and dashlets

refs #8458
---
 library/Icinga/Web/Widget/Dashboard.php       |  6 ++++-
 .../Icinga/Web/Widget/Dashboard/Dashlet.php   | 27 ++++---------------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/library/Icinga/Web/Widget/Dashboard.php b/library/Icinga/Web/Widget/Dashboard.php
index 8354f6fbb..00d39cd71 100644
--- a/library/Icinga/Web/Widget/Dashboard.php
+++ b/library/Icinga/Web/Widget/Dashboard.php
@@ -211,7 +211,11 @@ class Dashboard extends AbstractWidget
                 $this->tabs->add(
                     $key,
                     array(
-                        'title'     => $pane->getTitle(),
+                        'title'       => sprintf(
+                            t('Show %s', 'dashboard.pane.tooltip'),
+                            $pane->getTitle()
+                        ),
+                        'label'     => $pane->getTitle(),
                         'url'       => clone($url),
                         'urlParams' => array($this->tabParam => $key)
                     )
diff --git a/library/Icinga/Web/Widget/Dashboard/Dashlet.php b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
index ae7bb5558..cbb4bec33 100644
--- a/library/Icinga/Web/Widget/Dashboard/Dashlet.php
+++ b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
@@ -52,7 +52,7 @@ class Dashlet extends UserWidget
     private $template =<<<'EOD'
 
     <div class="container" data-icinga-url="{URL}">
-        <h1><a href="{FULL_URL}" data-base-target="col1">{TITLE}</a></h1>
+        <h1><a href="{FULL_URL}" aria-label="{TOOLTIP}" title="{TOOLTIP}" data-base-target="col1">{TITLE}</a></h1>
         <noscript>
             <iframe src="{IFRAME_URL}" style="height:100%; width:99%" frameborder="no"></iframe>
         </noscript>
@@ -183,38 +183,21 @@ EOD;
             '{URL}',
             '{IFRAME_URL}',
             '{FULL_URL}',
-            '{TITLE}',
-            '{REMOVE}'
+            '{TOOLTIP}',
+            '{TITLE}'
         );
 
         $replaceTokens = array(
             $url,
             $iframeUrl,
             $url->getUrlWithout(array('view', 'limit')),
-            $view->escape($this->getTitle()),
-            $this->getRemoveLink()
+            sprintf($view->translate('Show %s', 'dashboard.dashlet.tooltip'), $view->escape($this->getTitle())),
+            $view->escape($this->getTitle())
         );
 
         return str_replace($searchTokens, $replaceTokens, $this->template);
     }
 
-    /**
-     * Render the form for removing a dashboard elemetn
-     *
-     * @return string                       The html representation of the form
-     */
-    protected function getRemoveLink()
-    {
-        return sprintf(
-            '<a data-base-target="main" href="%s">%s</a>',
-            Url::fromPath('dashboard/remove-dashlet', array(
-                'dashlet' => $this->getTitle(),
-                'pane'      => $this->pane->getTitle()
-            )),
-            t('Remove')
-        );
-    }
-
     /**
      * Create a @see Dashlet instance from the given Zend config, using the provided title
      *

From b2f817925b760b8d9ae9033c11fb7c5165b810d8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:05:39 +0100
Subject: [PATCH 0748/2920] Add proper titles to the FilterEditor

refs #8458
---
 library/Icinga/Web/Widget/FilterEditor.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 999a825ac..16136a62a 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -310,7 +310,7 @@ class FilterEditor extends AbstractWidget
             $this->preservedUrl()->with('removeFilter', $filter->getId()),
             null,
             array(
-                'title' => t('Click to remove this part of your filter'),
+                'title' => t('Remove this part of your filter'),
                 'class' => 'icon-cancel'
             )
         );
@@ -323,7 +323,7 @@ class FilterEditor extends AbstractWidget
             $this->preservedUrl()->with('addFilter', $filter->getId()),
             null,
             array(
-                'title' => t('Click to add another filter'),
+                'title' => t('Add another filter'),
                 'class' => 'icon-plus'
             )
         );
@@ -666,6 +666,8 @@ class FilterEditor extends AbstractWidget
         return $html
             . '<a href="'
             . $this->preservedUrl()->with('modifyFilter', true)
+            . '" aria-label="'
+            . $title
             . '" title="'
             . $title
             . '">'

From fb7640db0a7b6fcb5cc60f9e3f2c567c4da9eca9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:06:01 +0100
Subject: [PATCH 0749/2920] Add proper titles to the Limiter control

refs #8458
---
 library/Icinga/Web/Widget/Limiter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/Limiter.php b/library/Icinga/Web/Widget/Limiter.php
index 1dc306982..9febf6f63 100644
--- a/library/Icinga/Web/Widget/Limiter.php
+++ b/library/Icinga/Web/Widget/Limiter.php
@@ -80,7 +80,7 @@ class Limiter extends AbstractWidget
                     $this->url->setParam('limit', $limit),
                     null,
                     array(
-                        'title' => sprintf(t('Show %s rows on one page'), $caption)
+                        'title' => sprintf($view->translate('Limit each page to a maximum of %u rows'), $caption)
                     )
                 );
             }

From bd9d06574d83f7a519b43681237b42b6eaddd725 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:07:21 +0100
Subject: [PATCH 0750/2920] Ensure that the link() view helper adds proper
 titles

refs #8458
---
 .../monitoring/application/views/helpers/Link.php    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Link.php b/modules/monitoring/application/views/helpers/Link.php
index 96972bd55..8faf6e5fb 100644
--- a/modules/monitoring/application/views/helpers/Link.php
+++ b/modules/monitoring/application/views/helpers/Link.php
@@ -32,7 +32,9 @@ class Zend_View_Helper_Link extends Zend_View_Helper_Abstract
     {
         return $this->view->qlink(
             $linkText,
-            $this->view->href('monitoring/host/show', array('host' => $host))
+            'monitoring/host/show',
+            array('host' => $host),
+            array('title' => sprintf($this->view->translate('Show detailed information for host %s'), $host))
         );
     }
 
@@ -52,7 +54,13 @@ class Zend_View_Helper_Link extends Zend_View_Helper_Abstract
             $this->view->translate('%s on %s', 'Service running on host'),
             $this->view->qlink(
                 $serviceLinkText,
-                $this->view->href('monitoring/service/show', array('host' => $host, 'service' => $service))
+                'monitoring/service/show',
+                array('host' => $host, 'service' => $service),
+                array('title' => sprintf(
+                    $this->view->translate('Show detailed information for service %s on host %s'),
+                    $service,
+                    $host
+                ))
             ),
             $this->host($host, $hostLinkText)
         );

From 5fd447394c2d7000dc3511ca8a6ed94660cb3e2f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:09:37 +0100
Subject: [PATCH 0751/2920] Add proper title to the BackendConfigForms's jump
 link...

...and move it to the right of the respective form control

refs #8458
---
 .../forms/Config/BackendConfigForm.php        | 53 ++++++++++---------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index e0f8e3e0d..3014974a3 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -221,7 +221,9 @@ class BackendConfigForm extends ConfigForm
             )
         );
 
-        $resourceElement = $this->createElement(
+        $decorators = static::$defaultElementDecorators;
+        array_pop($decorators); // Removes the HtmlTag decorator
+        $this->addElement(
             'select',
             'resource',
             array(
@@ -229,32 +231,35 @@ class BackendConfigForm extends ConfigForm
                 'label'         => $this->translate('Resource'),
                 'description'   => $this->translate('The resource to use'),
                 'multiOptions'  => $this->resources[$resourceType],
+                'value'         => current($this->resources[$resourceType]),
+                'decorators'    => $decorators,
                 'autosubmit'    => true
             )
         );
-
-        if (empty($formData)) {
-            $options = $resourceElement->options;
-            $resourceName = array_shift($options);
-        } else {
-            $resourceName = (isset($formData['resource'])) ? $formData['resource'] : $this->getValue('resource');
-        }
-
-        $this->addElement($resourceElement);
-
-        if ($resourceElement) {
-            $this->addElement(
-                'note',
-                'resource_note',
-                array(
-                    'value' => sprintf(
-                        '<a href="%s" data-base-target="_main">%s</a>',
-                        $this->getView()->url('config/editresource', array('resource' => $resourceName)),
-                        $this->translate('Show resource configuration')
-                    ),
-                    'escape' => false
+        $resourceName = isset($formData['resource']) ? $formData['resource'] : $this->getValue('resource');
+        $this->addElement(
+            'note',
+            'resource_note',
+            array(
+                'escape'        => false,
+                'decorators'    => $decorators,
+                'value'         => sprintf(
+                    '<a href="%1$s" data-base-target="_next" title="%2$s" aria-label="%2$s">%3$s</a>',
+                    $this->getView()->url('config/editresource', array('resource' => $resourceName)),
+                    sprintf($this->translate('Show the configuration of the %s resource'), $resourceName),
+                    $this->translate('Show resource configuration')
                 )
-            );
-        }
+            )
+        );
+        $this->addDisplayGroup(
+            array('resource', 'resource_note'),
+            'resource-group',
+            array(
+                'decorators'    => array(
+                    'FormElements',
+                    array('HtmlTag', array('tag' => 'div', 'class' => 'element'))
+                )
+            )
+        );
     }
 }

From 77fa2f7c2b5634c0e72ea89b847448a1294d6014 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:10:52 +0100
Subject: [PATCH 0752/2920] Add aria-label to the monitoring health's link to
 disable notifications

refs #8458
---
 .../Command/Instance/ToggleInstanceFeaturesCommandForm.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index 5c685dc85..692ed6094 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -60,7 +60,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
         if ((bool) $this->status->notifications_enabled) {
             if ($this->hasPermission('monitoring/command/feature/instance')) {
                 $notificationDescription = sprintf(
-                    '<a title="%s" href="%s" data-base-target="_next">%s</a>',
+                    '<a aria-label="%1$s" title="%1$s" href="%2$s" data-base-target="_next">%3$s</a>',
                     $this->translate('Disable notifications for a specific time on a program-wide basis'),
                     $this->getView()->href('monitoring/process/disable-notifications'),
                     $this->translate('Disable temporarily')

From 676f10bb87d2b1f1c1088332e0dcecd707e986fb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:11:23 +0100
Subject: [PATCH 0753/2920] Fix week-label of the timeline

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

diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php
index dcd7a10aa..f1ef32592 100644
--- a/modules/monitoring/application/controllers/TimelineController.php
+++ b/modules/monitoring/application/controllers/TimelineController.php
@@ -141,7 +141,7 @@ class Monitoring_TimelineController extends Controller
             case '1d':
                 return $this->getDateFormat();
             case '1w':
-                return '\W\e\ek #W\<b\r\>\of Y';
+                return '\W\e\ek W\<b\r\>\of Y';
             case '1m':
                 return 'F Y';
             case '1y':

From a1e7cd8906d4186132d68a238cb734a009731ce7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:12:34 +0100
Subject: [PATCH 0754/2920] Add proper titles to the documentation tocs and
 search results

refs #8458
---
 .../Doc/Renderer/DocSearchRenderer.php        | 27 ++++++++++++++++---
 .../library/Doc/Renderer/DocTocRenderer.php   | 22 ++++++++++++---
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/modules/doc/library/Doc/Renderer/DocSearchRenderer.php b/modules/doc/library/Doc/Renderer/DocSearchRenderer.php
index aa5a9f892..31445dfc8 100644
--- a/modules/doc/library/Doc/Renderer/DocSearchRenderer.php
+++ b/modules/doc/library/Doc/Renderer/DocSearchRenderer.php
@@ -107,11 +107,30 @@ class DocSearchRenderer extends DocRenderer
             );
             /** @type \Icinga\Web\Url $url */
             $url->setAnchor($this->encodeAnchor($section->getId()));
-            $this->content[] = sprintf(
-                '<li><a data-base-target="_next" %shref="%s">%s</a>',
-                $section->getNoFollow() ? 'rel="nofollow" ' : '',
+            $urlAttributes = array(
+                'data-base-target'  => '_next',
+                'title'             => sprintf(
+                    $this->getView()->translate(
+                        'Show all matches of "%s" in %sthe chapter "%s"',
+                        'search.render.section.link'
+                    ),
+                    $this->getInnerIterator()->getSearch()->getInput(),
+                    $section->getId() !== $section->getChapter()->getId() ? sprintf(
+                        $this->getView()->translate('the section "%s" of ', 'search.render.section.link'),
+                        $section->getTitle()
+                    ) : '',
+                    $section->getChapter()->getTitle()
+                )
+            );
+            if ($section->getNoFollow()) {
+                $urlAttributes['rel'] = 'nofollow';
+            }
+            $this->content[] = '<li>' . $this->getView()->qlink(
+                $title,
                 $url->getAbsoluteUrl(),
-                $title
+                null,
+                $urlAttributes,
+                false
             );
             if (! empty($contentMatches)) {
                 $this->content = array_merge($this->content, $contentMatches);
diff --git a/modules/doc/library/Doc/Renderer/DocTocRenderer.php b/modules/doc/library/Doc/Renderer/DocTocRenderer.php
index ed65a1e0b..a216a190b 100644
--- a/modules/doc/library/Doc/Renderer/DocTocRenderer.php
+++ b/modules/doc/library/Doc/Renderer/DocTocRenderer.php
@@ -87,11 +87,25 @@ class DocTocRenderer extends DocRenderer
             $url = $view->url($path);
             /** @type \Icinga\Web\Url $url */
             $url->setAnchor($this->encodeAnchor($section->getId()));
-            $this->content[] = sprintf(
-                '<li><a data-base-target="_next" %shref="%s">%s</a>',
-                $section->getNoFollow() ? 'rel="nofollow" ' : '',
+            $urlAttributes = array(
+                'data-base-target'  => '_next',
+                'title'             => sprintf(
+                    $this->getView()->translate('Show the %schapter "%s"', 'toc.render.section.link'),
+                    $section->getId() !== $section->getChapter()->getId() ? sprintf(
+                        $this->getView()->translate('section "%s" of the ', 'toc.render.section.link'),
+                        $section->getTitle()
+                    ) : '',
+                    $section->getChapter()->getTitle()
+                )
+            );
+            if ($section->getNoFollow()) {
+                $urlAttributes['rel'] = 'nofollow';
+            }
+            $this->content[] = '<li>' . $this->getView()->qlink(
+                $section->getTitle(),
                 $url->getAbsoluteUrl(),
-                $view->escape($section->getTitle())
+                null,
+                $urlAttributes
             );
             if (! $section->hasChildren()) {
                 $this->content[] = '</li>';

From 49e7964355da07f84877ab63458972c7723686f1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:13:55 +0100
Subject: [PATCH 0755/2920] Use an already existing variable instead of calling
 a function twice..

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

diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php
index 3b8e5e201..22c5e569c 100644
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@@ -49,7 +49,7 @@ class Doc_ModuleController extends DocController
     {
         $moduleManager = Icinga::app()->getModuleManager();
         $modules = array();
-        foreach (Icinga::app()->getModuleManager()->listEnabledModules() as $module) {
+        foreach ($moduleManager->listEnabledModules() as $module) {
             $path = $this->getPath($module, $moduleManager->getModuleDir($module, '/doc'), true);
             if ($path !== null) {
                 $modules[] = $module;

From b626a96e162308e367040aa137b7126450ec19d3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:14:40 +0100
Subject: [PATCH 0756/2920] Add aria-label to each box of the event grid

refs #8458
---
 .../Web/Widget/Chart/HistoryColorGrid.php       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
index 4e07d06b3..96b012db5 100644
--- a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
+++ b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
@@ -122,17 +122,18 @@ class HistoryColorGrid extends AbstractWidget {
     {
         if (array_key_exists($day, $this->data) && $this->data[$day]['value'] > 0) {
             $entry = $this->data[$day];
-            return'<a ' .
-                'style="background-color:' . $this->calculateColor($entry['value']) . '; '
-                    . ' opacity: ' . $this->opacity . ';"' .
+            return '<a ' .
+                'style="background-color: ' . $this->calculateColor($entry['value']) . ';'
+                    . ' opacity: ' . $this->opacity . ';" ' .
+                'aria-label="' . $entry['caption'] . '" ' .
                 'title="' . $entry['caption'] . '" ' .
                 'href="'  . $entry['url'] . '"' .
-            '>&nbsp;</a>';
-        } else {
-            return '<a ' .
-                'style="background-color:' . $this->calculateColor(0) . '; ' . ' opacity: ' . $this->opacity . ';" ' .
-                'title="No entries for ' . $day . '" ' .
             '></a>';
+        } else {
+            return '<span ' .
+                'style="background-color: ' . $this->calculateColor(0) . '; opacity: ' . $this->opacity . ';" ' .
+                'title="No entries for ' . $day . '" ' .
+            '></span>';
         }
     }
 

From de744fdc83f435e6f72d26ece2af4b1747ebe7b2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:17:48 +0100
Subject: [PATCH 0757/2920] Add proper title to each module documentation link

refs #8458
---
 .../controllers/ModuleController.php          |  2 +-
 .../views/scripts/module/index.phtml          | 24 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php
index 22c5e569c..eb9f4dcf1 100644
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@@ -52,7 +52,7 @@ class Doc_ModuleController extends DocController
         foreach ($moduleManager->listEnabledModules() as $module) {
             $path = $this->getPath($module, $moduleManager->getModuleDir($module, '/doc'), true);
             if ($path !== null) {
-                $modules[] = $module;
+                $modules[] = $moduleManager->getModule($module);
             }
         }
         $this->view->modules = $modules;
diff --git a/modules/doc/application/views/scripts/module/index.phtml b/modules/doc/application/views/scripts/module/index.phtml
index 0d8350f48..e0c57ae79 100644
--- a/modules/doc/application/views/scripts/module/index.phtml
+++ b/modules/doc/application/views/scripts/module/index.phtml
@@ -1,15 +1,19 @@
 <div class="controls">
-    <?= /** @type \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton() ?>
-    <h1><?= $this->translate('Module documentations') ?></h1>
+    <?= /** @type \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton(); ?>
+    <h1><?= $this->translate('Module documentations'); ?></h1>
 </div>
 <div class="content">
     <ul>
-        <?php foreach ($modules as $module): ?>
-            <li>
-                <a href="<?= $this->getHelper('Url')->url(array('moduleName' => $module), 'doc/module/toc', false, false) ?>">
-                    <?= $module ?>
-                </a>
-            </li>
-        <?php endforeach ?>
+    <?php foreach ($modules as $module): ?>
+        <li><?= $this->qlink(
+            $module->getTitle(),
+            'doc/module/toc',
+            array('moduleName' => $module->getName()),
+            array('title' => sprintf(
+                $this->translate('Show the documentation\'s table of contents for the %s'),
+                $module->getTitle()
+            ))
+        ); ?></li>
+    <?php endforeach ?>
     </ul>
-</div>
+</div>
\ No newline at end of file

From fb28da8f239deabbb9404e969f23545b907d8bf4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:18:32 +0100
Subject: [PATCH 0758/2920] Add proper titles to the documentation module's
 overview

refs #8458
---
 .../views/scripts/index/index.phtml           | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/modules/doc/application/views/scripts/index/index.phtml b/modules/doc/application/views/scripts/index/index.phtml
index 1e8139f10..65fa0b9d2 100644
--- a/modules/doc/application/views/scripts/index/index.phtml
+++ b/modules/doc/application/views/scripts/index/index.phtml
@@ -1,9 +1,19 @@
 <div class="controls"></div>
-    <?= /** @type \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton() ?>
-    <h1><?= $this->translate('Available documentations') ?></h1>
+    <?= /** @type \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton(); ?>
+    <h1><?= $this->translate('Available documentations'); ?></h1>
 <div class="content">
     <ul>
-        <li><a href="<?= $this->href('doc/icingaweb/toc') ?>">Icinga Web 2</a></li>
-        <li><a href="<?= $this->href('doc/module/') ?>"><?= $this->translate('Module documentations') ?></a></li>
+        <li><?= $this->qlink(
+            'Icinga Web 2',
+            'doc/icingaweb/toc',
+            null,
+            array('title' => $this->translate('Show the documentation\'s table of contents for Icinga Web 2'))
+        ); ?></li>
+        <li><?= $this->qlink(
+            $this->translate('Module documentations'),
+            'doc/module/',
+            null,
+            array('title' => $this->translate('List all modifications for which documentation is available'))
+        ); ?></li>
     </ul>
-</div>
+</div>
\ No newline at end of file

From 3605880fd1ba3dbd99ee6cb0ad728688caf596c1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:19:06 +0100
Subject: [PATCH 0759/2920] Add proper titles to the module overview

refs #8458
---
 application/views/scripts/config/modules.phtml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/application/views/scripts/config/modules.phtml b/application/views/scripts/config/modules.phtml
index 01fc1c48d..2c79fcee0 100644
--- a/application/views/scripts/config/modules.phtml
+++ b/application/views/scripts/config/modules.phtml
@@ -11,22 +11,18 @@
     <tr>
       <td>
         <?php if ($module->enabled && $module->loaded) {
-          $icon = $this->icon('thumbs-up');
-          $title = sprintf($this->translate('Module %s is enabled'), $module->name);
+          echo $this->icon('thumbs-up', sprintf($this->translate('Module %s is enabled'), $module->name));
         } elseif (! $module->enabled) {
-          $icon = $this->icon('thumbs-down');
-          $title = sprintf($this->translate('Module %s is disabled'), $module->name);
+          echo $this->icon('thumbs-down', sprintf($this->translate('Module %s is disabled'), $module->name));
         } else { // ! $module->loaded
-          $icon = $this->icon('thumbs-down');
-          $title = sprintf($this->translate('Module %s has failed to load'), $module->name);
+          echo $this->icon('thumbs-down', sprintf($this->translate('Module %s has failed to load'), $module->name));
         }
 
         echo $this->qlink(
-          $icon . $this->escape($module->name),
+          $module->name,
           'config/module/',
           array('name' => $module->name),
-          array('title' => $title),
-          false
+          array('title' => sprintf($this->translate('Show the overview of the %s module'), $module->name))
         ); ?>
       </td>
     </tr>

From baf47fef7f7acb869e2e2169726ce76cf14e5411 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:19:37 +0100
Subject: [PATCH 0760/2920] Add proper titles for the links to dis-/enable
 modules

refs #8458
---
 application/views/scripts/config/module.phtml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/application/views/scripts/config/module.phtml b/application/views/scripts/config/module.phtml
index cd6ad5af8..617740c5a 100644
--- a/application/views/scripts/config/module.phtml
+++ b/application/views/scripts/config/module.phtml
@@ -21,14 +21,20 @@ $state = $moduleData->enabled ? ($moduleData->loaded ? 'enabled' : 'failed') : '
 <tr>
   <th><?= $this->translate('State') ?></th>
   <td><?= $state ?><?php if ($state === 'enabled'): ?>
-  <?= $this->qlink($this->translate('disable'), 'config/moduledisable', array(
-      'name' => $module->getName()
-  )) ?>
+  <?= $this->qlink(
+    $this->translate('disable'),
+    'config/moduledisable',
+    array('name' => $module->getName()),
+    array('title' => sprintf($this->translate('Disable the %s module'), $module->getName()))
+  ); ?>
   <?php endif ?>
   <?php if ($state === 'disabled'): ?>
-  <?= $this->qlink($this->translate('enable'), 'config/moduleenable', array(
-      'name' => $module->getName()
-  )) ?>
+  <?= $this->qlink(
+    $this->translate('enable'),
+    'config/moduleenable',
+    array('name' => $module->getName()),
+    array('title' => sprintf($this->translate('Enable the %s module'), $module->getName()))
+  ); ?>
   <?php endif ?>
   </td>
 <tr>

From 508322cfdc790bfdab185a1fe1715673a7687f68 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:20:26 +0100
Subject: [PATCH 0761/2920] Add proper titles to the dashboard configuration's
 links

refs #8458
---
 .../views/scripts/dashboard/settings.phtml       | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/application/views/scripts/dashboard/settings.phtml b/application/views/scripts/dashboard/settings.phtml
index 2ac9a1dfa..10ad613de 100644
--- a/application/views/scripts/dashboard/settings.phtml
+++ b/application/views/scripts/dashboard/settings.phtml
@@ -44,12 +44,20 @@
                     <?php if ($dashlet->getDisabled() === true) continue; ?>
                         <tr>
                             <td>
-                                <a href="<?= $this->href('dashboard/update-dashlet', array('pane' => $pane->getName(), 'dashlet' => $dashlet->getTitle()));  ?>">
-                                    <?= $dashlet->getTitle(); ?>
-                                </a>
+                                <?= $this->qlink(
+                                    $dashlet->getTitle(),
+                                    'dashboard/update-dashlet',
+                                    array('pane' => $pane->getName(), 'dashlet' => $dashlet->getTitle()),
+                                    array('title' => sprintf($this->translate('Edit dashlet %s'), $dashlet->getTitle()))
+                                ); ?>
                             </td>
                             <td style="table-layout: fixed; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
-                                <a href="<?= $this->href($dashlet->getUrl()); ?>"><?= $dashlet->getUrl(); ?></a>
+                                <?= $this->qlink(
+                                    $dashlet->getUrl(),
+                                    $dashlet->getUrl(),
+                                    null,
+                                    array('title' => sprintf($this->translate('Show dashlet %s'), $dashlet->getTitle()))
+                                ); ?>
                             </td>
                             <td>
                                 <?= $this->qlink(

From 261abbd65e4c974a3f7e122baab570c961df4984 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:20:48 +0100
Subject: [PATCH 0762/2920] Add proper titles to the role configuration

refs #8458
---
 application/views/scripts/roles/index.phtml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml
index ea70bbe3f..0dcd75691 100644
--- a/application/views/scripts/roles/index.phtml
+++ b/application/views/scripts/roles/index.phtml
@@ -21,10 +21,12 @@
                 <?php foreach ($roles as $name => $role): /** @var object $role */ ?>
                     <tr>
                         <td>
-                            <?= $this->escape($name) ?>
-                            <div class="hidden">
-                                <a href="<?= $this->url('roles/update', array('role' => $name)) ?>"></a>
-                            </div>
+                            <?= $this->qlink(
+                                $name,
+                                'roles/update',
+                                array('role' => $name),
+                                array('title' => sprintf($this->translate('Edit role %s'), $name))
+                            ); ?>
                         </td>
 <!--                        <td>--><?//= $this->escape($role->permissions, 0, 50) ?><!--</td>-->
 <!--                        <td>-->
@@ -65,7 +67,7 @@
             </table>
         <?php endif ?>
         <a data-base-target="_next" href="<?= $this->href('roles/new') ?>">
-            <?= $this->translate('New Role') ?>
+            <?= $this->translate('Create a New Role') ?>
         </a>
     </div>
 </div>

From a966f543f6fe755197ea3fa45c266b4e2494e844 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:21:12 +0100
Subject: [PATCH 0763/2920] Add proper titles to the joystick navigation

refs #8458
---
 .../views/scripts/joystickPagination.phtml    | 118 ++++++++++++------
 1 file changed, 77 insertions(+), 41 deletions(-)

diff --git a/application/views/scripts/joystickPagination.phtml b/application/views/scripts/joystickPagination.phtml
index a89d2601d..ef0acdb60 100644
--- a/application/views/scripts/joystickPagination.phtml
+++ b/application/views/scripts/joystickPagination.phtml
@@ -6,7 +6,7 @@ if ($xAxisPaginator->count() <= 1 && $yAxisPaginator->count() <= 1) {
     return; // Display this pagination only if there are multiple pages
 }
 
-$fromTo = t('%s: %d to %d of %d (on the %s-axis)');
+$showText = $this->translate('%s: Show %s %u to %u out of %u', 'pagination.joystick');
 $xAxisPages = $xAxisPaginator->getPages('all');
 $yAxisPages = $yAxisPaginator->getPages('all');
 
@@ -28,16 +28,25 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
       <td>&nbsp;</td>
       <td>
       <?php if ($prevYAxisPage): ?>
-        <a target="_self" href="<?= Url::fromRequest()->overwriteParams(array(
-          'page' => $currentXAxisPage . ',' . $prevYAxisPage
-        ))->getAbsoluteUrl(); ?>" title="<?= sprintf(
-          $fromTo,
-          t('Hosts'),
-          ($prevYAxisPage - 1) * $yAxisPages->itemCountPerPage + 1,
-          $prevYAxisPage * $yAxisPages->itemCountPerPage,
-          $yAxisPages->totalItemCount,
-          'y'
-        ); ?>"><?= $this->icon('up-open'); ?></a>
+        <?= $this->qlink(
+          $this->icon('up-open'),
+          Url::fromRequest(),
+          array(
+            'page' => $currentXAxisPage . ',' . $prevYAxisPage
+          ),
+          array(
+            'data-base-target'  => '_self',
+            'title'             => sprintf(
+              $showText,
+              $this->translate('Y-Axis', 'pagination.joystick'),
+              $this->translate('hosts', 'pagination.joystick'),
+              ($prevYAxisPage - 1) * $yAxisPages->itemCountPerPage + 1,
+              $prevYAxisPage * $yAxisPages->itemCountPerPage,
+              $yAxisPages->totalItemCount
+            )
+          ),
+          false
+        ); ?>
       <?php else: ?>
         <?= $this->icon('up-open'); ?>
       <?php endif ?>
@@ -47,16 +56,25 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
     <tr>
       <td>
       <?php if ($prevXAxisPage): ?>
-        <a target="_self" href="<?= Url::fromRequest()->overwriteParams(array(
-          'page' => $prevXAxisPage . ',' . $currentYAxisPage
-        ))->getAbsoluteUrl(); ?>" title="<?= sprintf(
-          $fromTo,
-          t('Services'),
-          ($prevXAxisPage - 1) * $xAxisPages->itemCountPerPage + 1,
-          $prevXAxisPage * $xAxisPages->itemCountPerPage,
-          $xAxisPages->totalItemCount,
-          'x'
-        ); ?>"><?= $this->icon('left-open'); ?></a>
+        <?= $this->qlink(
+          $this->icon('left-open'),
+          Url::fromRequest(),
+          array(
+            'page' => $prevXAxisPage . ',' . $currentYAxisPage
+          ),
+          array(
+            'data-base-target'  => '_self',
+            'title'             => sprintf(
+              $showText,
+              $this->translate('X-Axis', 'pagination.joystick'),
+              $this->translate('services', 'pagination.joystick'),
+              ($prevXAxisPage - 1) * $xAxisPages->itemCountPerPage + 1,
+              $prevXAxisPage * $xAxisPages->itemCountPerPage,
+              $xAxisPages->totalItemCount
+            )
+          ),
+          false
+        ); ?>
       <?php else: ?>
         <?= $this->icon('left-open'); ?>
       <?php endif ?>
@@ -64,16 +82,25 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
       <td>&nbsp;</td>
       <td>
       <?php if ($nextXAxisPage): ?>
-        <a target="_self" href="<?= Url::fromRequest()->overwriteParams(array(
-          'page' => $nextXAxisPage . ',' . $currentYAxisPage
-        ))->getAbsoluteUrl(); ?>" title="<?= sprintf(
-          $fromTo,
-          t('Services'),
-          $currentXAxisPage * $xAxisPages->itemCountPerPage + 1,
-          $nextXAxisPage === $xAxisPages->last ? $xAxisPages->totalItemCount : $nextXAxisPage * $xAxisPages->itemCountPerPage,
-          $xAxisPages->totalItemCount,
-          'x'
-        ); ?>"><?= $this->icon('right-open'); ?></a>
+        <?= $this->qlink(
+          $this->icon('right-open'),
+          Url::fromRequest(),
+          array(
+            'page' => $nextXAxisPage . ',' . $currentYAxisPage
+          ),
+          array(
+            'data-base-target'  => '_self',
+            'title'             => sprintf(
+              $showText,
+              $this->translate('X-Axis', 'pagination.joystick'),
+              $this->translate('services', 'pagination.joystick'),
+              $currentXAxisPage * $xAxisPages->itemCountPerPage + 1,
+              $nextXAxisPage === $xAxisPages->last ? $xAxisPages->totalItemCount : $nextXAxisPage * $xAxisPages->itemCountPerPage,
+              $xAxisPages->totalItemCount
+            )
+          ),
+          false
+        ); ?>
       <?php else: ?>
         <?= $this->icon('right-open'); ?>
       <?php endif ?>
@@ -83,16 +110,25 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
       <td>&nbsp;</td>
       <td>
       <?php if ($nextYAxisPage): ?>
-        <a target="_self" href="<?= Url::fromRequest()->overwriteParams(array(
-          'page' => $currentXAxisPage . ',' . $nextYAxisPage
-        ))->getAbsoluteUrl(); ?>" title="<?= sprintf(
-          $fromTo,
-          t('Hosts'),
-          $currentYAxisPage * $yAxisPages->itemCountPerPage + 1,
-          $nextYAxisPage === $yAxisPages->last ? $yAxisPages->totalItemCount : $nextYAxisPage * $yAxisPages->itemCountPerPage,
-          $yAxisPages->totalItemCount,
-          'y'
-        ); ?>"><?= $this->icon('down-open'); ?></a>
+        <?= $this->qlink(
+          $this->icon('down-open'),
+          Url::fromRequest(),
+          array(
+            'page' => $currentXAxisPage . ',' . $nextYAxisPage
+          ),
+          array(
+            'data-base-target'  => '_self',
+            'title'             => sprintf(
+              $showText,
+              $this->translate('Y-Axis', 'pagination.joystick'),
+              $this->translate('hosts', 'pagination.joystick'),
+              $currentYAxisPage * $yAxisPages->itemCountPerPage + 1,
+              $nextYAxisPage === $yAxisPages->last ? $yAxisPages->totalItemCount : $nextYAxisPage * $yAxisPages->itemCountPerPage,
+              $yAxisPages->totalItemCount
+            )
+          ),
+          false
+        ); ?>
       <?php else: ?>
         <?= $this->icon('down-open'); ?>
       <?php endif ?>

From 371f8951889467e8bbb40b10ff7d5b4ff5774ea2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:21:31 +0100
Subject: [PATCH 0764/2920] Add proper titles to the mixed pagination

refs #8458
---
 application/views/scripts/mixedPagination.phtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/views/scripts/mixedPagination.phtml b/application/views/scripts/mixedPagination.phtml
index bac2b202b..4704d8f51 100644
--- a/application/views/scripts/mixedPagination.phtml
+++ b/application/views/scripts/mixedPagination.phtml
@@ -13,7 +13,7 @@ if ($this->pageCount <= 1) return;
 <ul class="pagination" aria-labelledby="paginationlabel" role="navigation"
 <?php
 
-$fromto = t('Show rows %d to %d of %d');
+$fromto = t('Show rows %u to %u out of %u');
 $total = $this->totalItemCount;
 $limit = $this->itemCountPerPage;
 $title_prev = sprintf(
@@ -29,9 +29,9 @@ $title_next = sprintf(
     ($this->current + 1) * $limit,
     $total
 );
-$li = '  ><li%s><span class="audible">'
+$li = '  ><li%1$s><span class="audible">'
     . t('Page')
-    . ' </span><a href="%s" title="%s">%s</a></li
+    . ' </span><a href="%2$s" aria-label="%3$s" title="%3$s">%4$s</a></li
 ';
 
 ?>

From 96c7b22c16c0319abf9144482356f5ac73d61df9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:22:07 +0100
Subject: [PATCH 0765/2920] Add proper titles to the host multi selection view

refs #8458
---
 .../views/scripts/hosts/show.phtml            | 251 +++++++-----------
 1 file changed, 103 insertions(+), 148 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 9a7c850f2..5e2417335 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -1,174 +1,129 @@
 <div class="controls">
-    <?= $this->render('partials/host/objects-header.phtml') ?>
+    <?= $this->render('partials/host/objects-header.phtml'); ?>
 </div>
 <div class="content">
     <?php if (($hostCount = count($objects)) === 0): ?>
-        <?= $this->translate('No hosts matching the filter') ?>
+        <?= $this->translate('No hosts matching the filter'); ?>
     <?php else: ?>
-        <h3>
-            <?= sprintf(
-                $this->translatePlural(
-                    '%u Host',
-                    '%u Hosts',
-                     $hostCount
-                ),
+        <h3><?= sprintf($this->translatePlural('%u Host', '%u Hosts', $hostCount), $hostCount); ?></h3>
+        <div><?= $this->qlink(
+            sprintf($this->translate('List all %u hosts'), $hostCount),
+            $listAllLink
+        ); ?></div>
+        <div>
+            <?= $checkNowForm; ?>
+        </div>
+        <div><?= $this->qlink(
+            $this->icon('reschedule') . ' ' . sprintf(
+                $this->translate('Reschedule the next check for all %u hosts'),
                 $hostCount
-            ) ?>
-        </h3>
-
-        <div>
-            <a href="<?= $listAllLink ?>" title="<?= sprintf(
-                $this->translate('List all %u hosts'),
+            ),
+            $rescheduleAllLink,
+            null,
+            null,
+            false
+        ); ?></div>
+        <div><?= $this->qlink(
+            $this->icon('plug') . ' ' . sprintf($this->translate('Schedule a downtime for all %u hosts'), $hostCount),
+            $downtimeAllLink,
+            null,
+            null,
+            false
+        ); ?></div>
+        <div><?= $this->qlink(
+            $this->icon('reply') . ' ' . sprintf(
+                $this->translate('Submit a passive check result for all %u hosts'),
                 $hostCount
-            ); ?>">
-                <?= $this->translate('List all') ?>
-            </a>
-        </div>
-
+            ),
+            $processCheckResultAllLink,
+            null,
+            null,
+            false
+        ); ?></div>
+      <?php if (($unhandledCount = count($unhandledObjects)) > 0): ?>
         <div>
-            <?= $checkNowForm ?>
-        </div>
-
-        <div>
-            <a href="<?= $rescheduleAllLink ?>">
-                <?= $this->icon('reschedule'); ?>
-                <?= $this->translate('Reschedule host checks') ?>
-            </a>
-        </div>
-
-        <div>
-            <a href="<?= $downtimeAllLink ?>">
-                <?= $this->icon('plug'); ?>
-                <?= $this->translate('Schedule host downtimes') ?>
-            </a>
-        </div>
-
-        <div>
-            <a href="<?= $processCheckResultAllLink; ?>">
-                <?= $this->icon('reply'); ?>
-                <?= $this->translate('Submit passive check results'); ?>
-            </a>
-        </div>
-
-        <?php if (! empty($unhandledObjects)): ?>
-        <h3>
-            <?php $unhandledCount = count($unhandledObjects) ?>
-            <?= sprintf(
+            <h3><?= sprintf(
                 $this->translatePlural(
                     '%u Unhandled Host Problem',
                     '%u Unhandled Host Problems',
                     $unhandledCount
                 ),
                 $unhandledCount
-            ) ?>
-        </h3>
-        <div>
-            <a href="<?= $downtimeUnhandledLink ?>" title="<?= sprintf(
-                $this->translatePlural(
-                    'Schedule downtime for %u unhandled host problem',
-                    'Schedule downtimes for %u unhandled host problems',
-                    $unhandledCount
-                ),
-                $unhandledCount
-            ) ?>">
-                <?= $this->icon('plug'); ?>
-                <?= sprintf(
+            ); ?></h3>
+            <div><?= $this->qlink(
+                $this->icon('plug') . ' ' . sprintf(
                     $this->translatePlural(
-                        'Schedule downtime for unhandled host problem',
-                        'Schedule downtimes for unhandled host problems',
+                        'Schedule a downtime for %u unhandled host problem',
+                        'Schedule a downtime for %u unhandled host problems',
                         $unhandledCount
                     ),
                     $unhandledCount
-                ) ?>
-            </a>
-        </div>
-        <div>
-            <a href="<?= $acknowledgeUnhandledLink ?>" title="<?= sprintf(
-                $this->translatePlural(
-                    'Acknowledge %u unhandled host problem',
-                    'Acknowledge %u unhandled host problems',
-                    $unhandledCount
                 ),
-                $unhandledCount
-            ) ?>">
-                <?= $this->icon('ok'); ?>
-                <?= sprintf(
+                $downtimeUnhandledLink,
+                null,
+                null,
+                false
+            ); ?></div>
+            <div><?= $this->qlink(
+                $this->icon('ok') . ' ' . sprintf(
                     $this->translatePlural(
-                        'Acknowledge unhandled host problem',
-                        'Acknowledge unhandled host problems',
+                        'Acknowledge %u unhandled host problem',
+                        'Acknowledge %u unhandled host problems',
                         $unhandledCount
                     ),
                     $unhandledCount
-                ) ?>
-            </a>
+                ),
+                $acknowledgeUnhandledLink,
+                null,
+                null,
+                false
+            ); ?></div>
         </div>
-        <?php endif ?>
-
-        <?php if (! empty($acknowledgedObjects)): ?>
-            <h2>
-                <?php $acknowledgedCount = count($acknowledgedObjects) ?>
-                <?= sprintf(
-                    $this->translatePlural(
-                        '%u Acknowledged Host Problem',
-                        '%u Acknowledged Host Problems',
-                        $acknowledgedCount
-                    ),
+      <?php endif ?>
+      <?php if (($acknowledgedCount = count($acknowledgedObjects)) > 0): ?>
+        <div>
+            <h2><?= sprintf(
+                $this->translatePlural(
+                    '%u Acknowledged Host Problem',
+                    '%u Acknowledged Host Problems',
                     $acknowledgedCount
-                ) ?>
-            </h2>
-            <div>
-                <?= $removeAckForm ?>
-            </div>
-        <?php endif ?>
-
-        <?php if (! empty($objectsInDowntime)): ?>
-            <h2>
-                <?php $inDowntimeCount = count($objectsInDowntime) ?>
-                <a href="<?= $inDowntimeLink ?>"
-                   title="<?= sprintf(
-                       $this->translatePlural(
-                           'List %u host which is in downtime',
-                           'List %u hosts which are in downtime',
-                           $inDowntimeCount
-                       ),
-                       $inDowntimeCount
-                   ) ?>">
-                    <?= $this->icon('plug'); ?>
-                    <?= sprintf(
-                        $this->translatePlural(
-                            'List %u host currently in downtime',
-                            'List %u hosts currently downtime',
-                            $inDowntimeCount
-                        ),
-                        $inDowntimeCount
-                    ) ?>
-                </a>
-            </h2>
-        <?php endif ?>
-
-        <?php $commentCount = count($objects->getComments()) ?>
-        <?php if ($commentCount): ?>
-            <h2>
-                <a href="<?= $commentsLink ?>"
-                   title="<?= sprintf(
-                       $this->translatePlural(
-                           'List %u host comment',
-                           'List %u host comments',
-                           $commentCount
-                       ),
-                       $commentCount
-                   ) ?>">
-                    <?= $this->icon('comment'); ?>
-                    <?= sprintf(
-                        $this->translatePlural(
-                            'List %u host comment',
-                            'List %u host comments',
-                            $commentCount
-                        ),
-                        $commentCount
-                    ) ?>
-                </a>
-            </h2>
-        <?php endif ?>
+                ),
+                $acknowledgedCount
+            ); ?></h2>
+            <?= $removeAckForm ?>
+        </div>
+      <?php endif ?>
+      <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0): ?>
+        <h2><?= $this->qlink(
+            $this->icon('plug') . ' ' . sprintf(
+                $this->translatePlural(
+                    'List %u host currently in downtime',
+                    'List %u hosts currently in downtime',
+                    $inDowntimeCount
+                ),
+                $inDowntimeCount
+            ),
+            $inDowntimeLink,
+            null,
+            null,
+            false
+        ); ?></h2>
+      <?php endif ?>
+      <?php if (($commentCount = count($objects->getComments())) > 0): ?>
+        <h2><?= $this->qlink(
+            $this->icon('comment') . ' ' . sprintf(
+                $this->translatePlural(
+                    'List %u host comment',
+                    'List %u host comments',
+                    $commentCount
+                ),
+                $commentCount
+            ),
+            $commentsLink,
+            null,
+            null,
+            false
+        ); ?></h2>
+      <?php endif ?>
     <?php endif ?>
-</div>
+</div>
\ No newline at end of file

From abcac2917cfc158d23a8d8c81e03b114cf5a08cd Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:22:52 +0100
Subject: [PATCH 0766/2920] Add proper titles to the hostsummary component view

refs #8458
---
 .../list/components/hostssummary.phtml        | 132 ++++++++++++------
 1 file changed, 93 insertions(+), 39 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
index 64bd63165..fc7d30867 100644
--- a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
@@ -4,79 +4,133 @@ use Icinga\Web\Url;
 
 $selfUrl = 'monitoring/list/hosts';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
-?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
-    <?= $this->qlink(sprintf($this->translate('%s hosts:'), $this->stats->hosts_total), $selfUrl); ?>
+?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
+  <?= sprintf($this->translate('%s hosts:'), $this->stats->hosts_total); ?>
   <span class="badges">
-    <?php if($this->stats->hosts_up): ?>
-    <span class="state ok<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 0))->getRelativeUrl() ? ' active' : '' ?>">
+    <?php if ($this->stats->hosts_up): ?>
+    <span class="state ok<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 0))->getRelativeUrl() ? ' active' : ''; ?>">
         <?= $this->qlink(
             $this->stats->hosts_up,
             $selfUrl,
             array('host_state' => 0),
-            array('title' => $this->translate('Hosts with state UP'))
-        ) ?>
+            array('title' => sprintf(
+                $this->translatePlural(
+                    'List %u host that is currently in state UP',
+                    'List %u hosts which are currently in state UP',
+                    $this->stats->hosts_up
+                ),
+                $this->stats->hosts_up
+            ))
+        ); ?>
     </span>
     <?php endif; ?>
 
-    <?php if($this->stats->hosts_down_unhandled): ?>
-    <span class="state critical<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 1, 'host_unhandled' => 1))->getRelativeUrl() ? ' active' : '' ?>">
+    <?php if ($this->stats->hosts_down_unhandled): ?>
+    <span class="state critical<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 1, 'host_unhandled' => 1))->getRelativeUrl() ? ' active' : ''; ?>">
         <?= $this->qlink(
             $this->stats->hosts_down_unhandled,
             $selfUrl,
-            array('host_state' => 1, 'host_unhandled' => 1),
-            array('title' => $this->translate('Unhandled hosts with state DOWN'))
-        ) ?>
+            array(
+                'host_state'        => 1,
+                'host_unhandled'    => 1
+            ),
+            array('title' => sprintf(
+                $this->translatePlural(
+                    'List %u host that is currently in state DOWN',
+                    'List %u hosts which are currently in state DOWN',
+                    $this->stats->hosts_down_unhandled
+                ),
+                $this->stats->hosts_down_unhandled
+            ))
+        ); ?>
     <?php endif; ?>
 
-        <?php if($this->stats->hosts_down_handled > 0): ?>
-        <span class="state handled critical<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 1, 'host_unhandled' =>0))->getRelativeUrl() ? ' active' : '' ?>">
-            <?= $this->qlink(
-                $this->stats->hosts_down_handled,
-                $selfUrl,
-                array('host_state' => 1, 'host_unhandled' => 0),
-                array('title' => $this->translate('Handled hosts with state DOWN'))
-            ) ?>
-        </span>
-        <?php endif; ?>
+    <?php if ($this->stats->hosts_down_handled): ?>
+    <span class="state handled critical<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 1, 'host_unhandled' =>0))->getRelativeUrl() ? ' active' : ''; ?>">
+        <?= $this->qlink(
+            $this->stats->hosts_down_handled,
+            $selfUrl,
+            array(
+                'host_state'        => 1,
+                'host_unhandled'    => 0
+            ),
+            array('title' => sprintf(
+                $this->translatePlural(
+                    'List %u host that is currently in state DOWN (Acknowledged)',
+                    'List %u hosts which are currently in state DOWN (Acknowledged)',
+                    $this->stats->hosts_down_handled
+                ),
+                $this->stats->hosts_down_handled
+            ))
+        ); ?>
+    </span>
+    <?php endif; ?>
 
     <?php if($this->stats->hosts_down): ?>
     </span>
     <?php endif; ?>
 
     <?php if($this->stats->hosts_unreachable_unhandled): ?>
-    <span class="state unknown<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 2, 'host_unhandled' => 1))->getRelativeUrl() ? ' active' : '' ?>">
+    <span class="state unknown<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 2, 'host_unhandled' => 1))->getRelativeUrl() ? ' active' : ''; ?>">
         <?= $this->qlink(
             $this->stats->hosts_unreachable_unhandled,
             $selfUrl,
-            array('host_state' => 2, 'host_unhandled' => 1),
-            array('title' => $this->translate('Unhandled hosts with state UNREACHABLE'))
-        ) ?>
+            array(
+                'host_state'        => 2,
+                'host_unhandled'    => 1
+            ),
+            array('title' => sprintf(
+                $this->translatePlural(
+                    'List %u host that is currently in state UNREACHABLE',
+                    'List %u hosts which are currently in state UNREACHABLE',
+                    $this->stats->hosts_unreachable_unhandled
+                ),
+                $this->stats->hosts_unreachable_unhandled
+            ))
+        ); ?>
     <?php endif; ?>
 
-        <?php if($this->stats->hosts_unreachable_handled > 0): ?>
-        <span class="state handled unknown<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 2, 'host_unhandled' => 0))->getRelativeUrl() ? ' active' : '' ?>">
-            <?= $this->qlink(
-                $this->stats->hosts_unreachable_handled,
-                $selfUrl,
-                array('host_state' => 2, 'host_unhandled' => 0),
-                array('title' => $this->translate('Handled hosts with state UNREACHABLE'))
-            ) ?>
-        </span>
-        <?php endif; ?>
+    <?php if($this->stats->hosts_unreachable_handled > 0): ?>
+    <span class="state handled unknown<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 2, 'host_unhandled' => 0))->getRelativeUrl() ? ' active' : '' ?>">
+        <?= $this->qlink(
+            $this->stats->hosts_unreachable_handled,
+            $selfUrl,
+            array(
+                'host_state'        => 2,
+                'host_unhandled'    => 0
+            ),
+            array('title' => sprintf(
+                $this->translatePlural(
+                    'List %u host that is currently in state UNREACHABLE (Acknowledged)',
+                    'List %u hosts which are currently in state UNREACHABLE (Acknowledged)',
+                    $this->stats->hosts_unreachable_handled
+                ),
+                $this->stats->hosts_unreachable_handled
+            ))
+        ); ?>
+    </span>
+    <?php endif; ?>
 
     <?php if($this->stats->hosts_unreachable): ?>
     </span>
     <?php endif; ?>
 
     <?php if($this->stats->hosts_pending): ?>
-    <span class="state pending<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 99))->getRelativeUrl() ? ' active' : '' ?>">
+    <span class="state pending<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 99))->getRelativeUrl() ? ' active' : ''; ?>">
         <?= $this->qlink(
             $this->stats->hosts_pending,
             $selfUrl,
             array('host_state' => 99),
-            array('title' => $this->translate('Hosts with state PENDING'))
-        ) ?>
+            array('title' => sprintf(
+                $this->translatePlural(
+                    'List %u host that is currently in state PENDING',
+                    'List %u hosts which are currently in state PENDING',
+                    $this->stats->hosts_pending
+                ),
+                $this->stats->hosts_pending
+            ))
+        ); ?>
     </span>
     <?php endif; ?>
   </span>
-</div>
+</div>
\ No newline at end of file

From 1bcac557783ac2cad380e41ed58e604bb277a55d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:23:09 +0100
Subject: [PATCH 0767/2920] Add proper titles to the servicesummary component
 view

refs #8458
---
 .../list/components/servicesummary.phtml      | 67 ++++++++++++++-----
 1 file changed, 51 insertions(+), 16 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
index 11d7b5d07..0554fcfd4 100644
--- a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
@@ -1,19 +1,29 @@
 <?php
 
 use Icinga\Web\Url;
+use Icinga\Module\Monitoring\Object\Service;
 
 $selfUrl = 'monitoring/list/services';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
-?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
-<?= $this->qlink(sprintf($this->translate('%s services:'), $this->stats->services_total), $selfUrl) ?>
+?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
+<?= sprintf($this->translate('%s services:'), $this->stats->services_total); ?>
 <span class="badges">
 <?php if ($this->stats->services_ok): ?>
- <span class="state ok<?= $currentUrl === Url::fromPath($selfUrl, array('service_state' => 0))->getRelativeUrl() ? ' active' : '' ?>"><?= $this->qlink(
-    $this->stats->services_ok,
-    $selfUrl,
-    array('service_state' => 0),
-    array('title' => sprintf($this->translate('Services with state %s'), $this->translate('OK')))
-)  ?></span>
+<span class="state ok<?= $currentUrl === Url::fromPath($selfUrl, array('service_state' => 0))->getRelativeUrl() ? ' active' : ''; ?>">
+    <?= $this->qlink(
+        $this->stats->services_ok,
+        $selfUrl,
+        array('service_state' => 0),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state OK',
+                'List %u services which are currently in state OK',
+                $this->stats->services_ok
+            ),
+            $this->stats->services_ok
+        ))
+    ); ?>
+</span>
 <?php endif ?>
 <?php
 foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $state) {
@@ -42,7 +52,15 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
                 $this->stats->$unhandled,
                 $selfUrl,
                 $paramsUnhandled,
-                array('title' => sprintf($this->translate('Unhandled services with state %s'), $this->translate(strtoupper($state))))
+                array('title' => sprintf(
+                    $this->translatePlural(
+                        'List %u service that is currently in state %s',
+                        'List %u services which are currently in state %s',
+                        $this->stats->$unhandled
+                    ),
+                    $this->stats->$unhandled,
+                    Service::getStateText($stateId, true)
+                ))
             );
         }
         if ($this->stats->$handled) {
@@ -59,7 +77,15 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
                 $this->stats->$handled,
                 $selfUrl,
                 $paramsHandled,
-                array('title' => sprintf($this->translate('Handled services with state %s'), $this->translate(strtoupper($state))))
+                array('title' => sprintf(
+                    $this->translatePlural(
+                        'List %u service that is currently in state %s (Acknowledged)',
+                        'List %u services which are currently in state %s (Acknowledged)',
+                        $this->stats->$handled
+                    ),
+                    $this->stats->$handled,
+                    Service::getStateText($stateId, true)
+                ))
             );
             if ($this->stats->$unhandled) {
                 echo "</span>\n";
@@ -70,12 +96,21 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
 }
 ?>
 <?php if ($this->stats->services_pending): ?>
- <span class="state pending<?= $currentUrl === Url::fromPath($selfUrl, array('service_state' => 99))->getRelativeUrl() ? ' active' : '' ?>"><?= $this->qlink(
-    $this->stats->services_pending,
-    $selfUrl,
-    array('service_state' => 99),
-    array('title' => sprintf($this->translate('Services with state %s'), $this->translate('PENDING')))
-)  ?></span>
+<span class="state pending<?= $currentUrl === Url::fromPath($selfUrl, array('service_state' => 99))->getRelativeUrl() ? ' active' : ''; ?>">
+    <?= $this->qlink(
+        $this->stats->services_pending,
+        $selfUrl,
+        array('service_state' => 99),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state PENDING',
+                'List %u services which are currently in state PENDING',
+                $this->stats->services_pending
+            ),
+            $this->stats->services_pending
+        ))
+    ); ?>
+</span>
 <?php endif ?>
 </span>
 </div>

From 3aa1f7e58eed1dd5e3f9a8ebb81648bdb45ef7e9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:23:26 +0100
Subject: [PATCH 0768/2920] Add proper titles to the contactgroups view

refs #8458
---
 .../views/scripts/list/contactgroups.phtml        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index f32a22815..a44b388b7 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -21,18 +21,21 @@ foreach ($groupData as $groupName => $groupInfo): ?>
 <?php foreach ($groupInfo['contacts'] as $c): ?>
                 <div class="box entry">
                     <?= $this->img('/static/gravatar', array('email' => $c->contact_email)); ?>
-                    <a href="<?= $this->href(
+                    <?= $this->qlink(
+                        $c->contact_alias,
                         'monitoring/show/contact',
-                        array('contact' => $c->contact_name)
-                    ); ?>">
-                        <?= $this->escape($c->contact_alias) ?>
-                    </a>
+                        array('contact' => $c->contact_name),
+                        array('title' => sprintf(
+                            $this->translate('Show detailed information about %s'),
+                            $c->contact_alias
+                        ))
+                    ); ?>
                     <p>
 <?php if ($c->contact_email): ?>
                         <?= $c->contact_email; ?>
 <?php endif;
 if ($c->contact_pager): ?>
-                        <br />
+                        <br>
                         <?= $c->contact_pager; ?>
 <?php endif ?>
                     </p>

From e0164e8bcb95c42a079c8cc4a4021a11fa5f551c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:23:39 +0100
Subject: [PATCH 0769/2920] Add proper titles to the contacts view

refs #8458
---
 .../views/scripts/list/contacts.phtml         | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index c17d997f1..369ac545f 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -15,15 +15,21 @@
     foreach ($contacts as $contact): ?>
         <div class="contact">
             <?= $this->img('/static/gravatar', array('email' => $contact->contact_email)); ?>
-            <a href="<?= $this->href(
+            <?= $this->qlink(
+                '<strong>' . $this->escape($contact->contact_name) . '</strong>',
                 'monitoring/show/contact',
-                array('contact' => $contact->contact_name)
-            ) ?>"><strong><?= $contact->contact_name ?></strong></a> (<?= $contact->contact_alias ?>)
-            <div><?= sprintf(
-                '%1$s: <a href="mailto:%2$s">%2$s</a>',
-                mt('monitoring', 'Email'),
-                $this->escape($contact->contact_email)
-            ) ?></div>
+                array('contact' => $contact->contact_name),
+                array('title' => sprintf(
+                    $this->translate('Show detailed information about %s'),
+                    $contact->contact_alias
+                )),
+                false
+            ); ?> (<?= $contact->contact_alias; ?>)
+            <div>
+                <?= $this->translate('Email'); ?>: <a href="mailto:<?= $contact->contact_email; ?>" title="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias); ?>" aria-label="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias); ?>">
+                    <?= $this->escape($contact->contact_email); ?>
+                </a>
+            </div>
             <?php if ($contact->contact_pager): ?>
             <div>
                 <?= $this->translate('Pager') ?>:

From 45e1406e2a71a1b58854d7bd111533693fe35c69 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:23:57 +0100
Subject: [PATCH 0770/2920] Add proper titles to the hostgroups view

refs #8458
---
 .../views/scripts/list/hostgroups.phtml       | 235 ++++++++++--------
 1 file changed, 131 insertions(+), 104 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index 0c5989bff..c702197b2 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -79,39 +79,53 @@
         </td>
        <?php endif ?>
         <td class="groupname">
-          <a href="<?= $this->href('monitoring/list/hosts', array('hostgroup' => $h->hostgroup)); ?>">
-            <?= $this->escape($h->hostgroup_alias) ?>
-          </a>
+          <?= $this->qlink(
+            $h->hostgroup_alias,
+            'monitoring/list/hosts',
+            array('hostgroup' => $h->hostgroup),
+            array('title' => sprintf($this->translate('List all hosts in the group "%s"'), $h->hostgroup_alias))
+          ); ?>
         </td>
         <td class="total">
-            <?= $this->qlink($h->services_total, 'monitoring/list/services', array('hostgroup' => $h->hostgroup)) ?>
+          <?= $this->qlink(
+            $h->services_total,
+            'monitoring/list/services',
+            array('hostgroup' => $h->hostgroup),
+            array('title' => sprintf(
+                $this->translate('List all services of all hosts in host group "%s"'),
+                $h->hostgroup_alias
+            ))
+          ); ?>
         </td>
         <td class="state">
         <?php if ($h->services_ok): ?>
           <span class="state ok">
-            <a href="<?= $this->href(
+            <?= $this->qlink(
+              $h->services_ok,
               'monitoring/list/services',
               array(
                 'service_state' => 0,
                 'hostgroup'     => $h->hostgroup,
                 'sort'          => 'service_severity'
-              )
-            ); ?>" title="<?= printf(
-              $this->translatePlural(
-                'List %u service with status ok in host group %s',
-                'List %u services with status ok in host group %s',
-                $h->services_ok
               ),
-              $h->services_ok,
-              $h->hostgroup
-            ); ?>">
-              <?= $h->services_ok; ?>
-            </a>
+              array(
+                'title' => sprintf(
+                  $this->translatePlural(
+                    'List %u service that is currently in state OK on hosts in the host group "%s"',
+                    'List %u services which are currently in state OK on hosts in the host group "%s"',
+                    $h->services_ok
+                  ),
+                  $h->services_ok,
+                  $h->hostgroup_alias
+                )
+              )
+            ); ?>
           </span>
         <?php endif ?>
         <?php if ($h->services_critical_unhandled): ?>
           <span class="state critical">
-            <a href="<?= $this->href(
+            <?= $this->qlink(
+              $h->services_critical_unhandled,
               'monitoring/list/services',
               array(
                 'service_state'         => 2,
@@ -120,40 +134,43 @@
                 'host_problem'          => 0,
                 'hostgroup'             => $h->hostgroup,
                 'sort'                  => 'service_severity'
-              )
-            ); ?>" title="<?php printf(
-              $this->translatePlural(
-                'List %u service with status critical unhandled in host group %s',
-                'List %u services with status critical unhandled in host group %s',
-                $h->services_critical_unhandled
               ),
-              $h->services_critical_unhandled,
-              $h->hostgroup
-            ); ?>">
-              <?= $h->services_critical_unhandled; ?>
-            </a>
+              array(
+                'title' => sprintf(
+                  $this->translatePlural(
+                    'List %u service that is currently in state CRITICAL on hosts in the host group "%s"',
+                    'List %u services which are currently in state CRITICAL on hosts in the host group "%s"',
+                    $h->services_critical_unhandled
+                  ),
+                  $h->services_critical_unhandled,
+                  $h->hostgroup_alias
+                )
+              )
+            ); ?>
         <?php endif ?>
           <?php if ($h->services_critical_handled): ?>
             <span class="state critical handled">
-              <a href="<?= $this->href(
+              <?= $this->qlink(
+                $h->services_critical_handled,
                 'monitoring/list/services',
                 array(
                   'service_state'     => 2,
                   'service_handled'   => 1,
                   'hostgroup'         => $h->hostgroup,
                   'sort'              => 'service_severity'
-                )
-              ); ?>" title="<?php printf(
-                $this->translatePlural(
-                  'List %u service with status critical handled in host group %s',
-                  'List %u services with status critical handled in host group %s',
-                  $h->services_critical_handled
                 ),
-                $h->services_critical_handled,
-                $h->hostgroup
-              ); ?>">
-                <?= $h->services_critical_handled; ?>
-              </a>
+                array(
+                  'title' => sprintf(
+                    $this->translatePlural(
+                      'List %u service that is currently in state CRITICAL (Acknowledged) on hosts in the host group "%s"',
+                      'List %u services which are currently in state CRITICAL (Acknowledged) on hosts in the host group "%s"',
+                      $h->services_critical_handled
+                    ),
+                    $h->services_critical_handled,
+                    $h->hostgroup_alias
+                  )
+                )
+              ); ?>
             </span>
           <?php endif ?>
         <?php if ($h->services_critical_unhandled): ?>
@@ -161,7 +178,8 @@
         <?php endif ?>
         <?php if ($h->services_unknown_unhandled): ?>
           <span class="state unknown">
-            <a href="<?= $this->href(
+            <?= $this->qlink(
+              $h->services_unknown_unhandled,
               'monitoring/list/services',
               array(
                 'service_state'         => 3,
@@ -170,40 +188,43 @@
                 'host_problem'          => 0,
                 'hostgroup'             => $h->hostgroup,
                 'sort'                  => 'service_severity'
-              )
-            ); ?>" title="<?php printf(
-              $this->translatePlural(
-                'List %u service with status unknown unhandled in host group %s',
-                'List %u services with status unknown unhandled in host group %s',
-                $h->services_unknown_unhandled
               ),
-              $h->services_unknown_unhandled,
-              $h->hostgroup
-            ); ?>">
-              <?= $h->services_unknown_unhandled; ?>
-            </a>
+              array(
+                'title' => sprintf(
+                  $this->translatePlural(
+                    'List %u service that is currently in state UNKNOWN on hosts in the host group "%s"',
+                    'List %u services which are currently in state UNKNOWN on hosts in the host group "%s"',
+                    $h->services_unknown_unhandled
+                  ),
+                  $h->services_unknown_unhandled,
+                  $h->hostgroup_alias
+                )
+              )
+            ); ?>
         <?php endif ?>
           <?php if ($h->services_unknown_handled): ?>
             <span class="state unknown handled">
-              <a href="<?= $this->href(
+              <?= $this->qlink(
+                $h->services_unknown_handled,
                 'monitoring/list/services',
                 array(
                   'service_state'     => 3,
                   'service_handled'   => 1,
                   'hostgroup'         => $h->hostgroup,
                   'sort'              => 'service_severity'
-                )
-              ); ?>" title="<?php printf(
-                $this->translatePlural(
-                  'List %u service with status unknown handled in host group %s',
-                  'List %u services with status unknown handled in host group %s',
-                  $h->services_unknown_handled
                 ),
-                $h->services_unknown_handled,
-                $h->hostgroup
-              ); ?>">
-                <?= $h->services_unknown_handled; ?>
-              </a>
+                array(
+                  'title' => sprintf(
+                    $this->translatePlural(
+                      'List %u service that is currently in state UNKNOWN (Acknowledged) on hosts in the host group "%s"',
+                      'List %u services which are currently in state UNKNOWN (Acknowledged) on hosts in the host group "%s"',
+                      $h->services_unknown_handled
+                    ),
+                    $h->services_unknown_handled,
+                    $h->hostgroup_alias
+                  )
+                )
+              ); ?>
             </span>
           <?php endif ?>
         <?php if ($h->services_unknown_unhandled): ?>
@@ -211,7 +232,8 @@
         <?php endif ?>
         <?php if ($h->services_warning_unhandled): ?>
           <span class="state warning">
-            <a href="<?= $this->href(
+            <?= $this->qlink(
+              $h->services_warning_unhandled,
               'monitoring/list/services',
               array(
                 'service_state'         => 1,
@@ -220,40 +242,43 @@
                 'host_problem'          => 0,
                 'hostgroup'             => $h->hostgroup,
                 'sort'                  => 'service_severity'
-              )
-            ); ?>" title="<?php printf(
-              $this->translatePlural(
-                'List %u service with status warning unhandled in host group %s',
-                'List %u services with status warning unhandled in host group %s',
-                $h->services_warning_unhandled
               ),
-              $h->services_warning_unhandled,
-              $h->hostgroup
-            ); ?>">
-              <?= $h->services_warning_unhandled; ?>
-            </a>
+              array(
+                'title' => sprintf(
+                  $this->translatePlural(
+                    'List %u service that is currently in state WARNING on hosts in the host group "%s"',
+                    'List %u services which are currently in state WARNING on hosts in the host group "%s"',
+                    $h->services_warning_unhandled
+                  ),
+                  $h->services_warning_unhandled,
+                  $h->hostgroup_alias
+                )
+              )
+            ); ?>
         <?php endif ?>
           <?php if ($h->services_warning_handled): ?>
             <span class="state warning handled">
-              <a href="<?= $this->href(
+              <?= $this->qlink(
+                $h->services_warning_handled,
                 'monitoring/list/services',
                 array(
-                    'service_state'     => 1,
-                    'service_handled'   => 1,
-                    'hostgroup'         => $h->hostgroup,
-                    'sort'              => 'service_severity'
-                )
-              ); ?>" title="<?php printf(
-                $this->translatePlural(
-                  'List %u service with status warning handled in host group %s',
-                  'List %u services with status warning handled in host group %s',
-                  $h->services_warning_handled
+                  'service_state'     => 1,
+                  'service_handled'   => 1,
+                  'hostgroup'         => $h->hostgroup,
+                  'sort'              => 'service_severity'
                 ),
-                $h->services_warning_handled,
-                $h->hostgroup
-              ); ?>">
-                <?= $h->services_warning_handled; ?>
-              </a>
+                array(
+                  'title' => sprintf(
+                    $this->translatePlural(
+                      'List %u service that is currently in state WARNING (Acknowledged) on hosts in the host group "%s"',
+                      'List %u services which are currently in state WARNING (Acknowledged) on hosts in the host group "%s"',
+                      $h->services_warning_handled
+                    ),
+                    $h->services_warning_handled,
+                    $h->hostgroup_alias
+                  )
+                )
+              ); ?>
             </span>
           <?php endif ?>
         <?php if ($h->services_warning_unhandled): ?>
@@ -261,24 +286,26 @@
         <?php endif ?>
         <?php if ($h->services_pending): ?>
           <span class="state pending">
-            <a href="<?= $this->href(
+            <?= $this->qlink(
+              $h->services_pending,
               'monitoring/list/services',
               array(
                 'service_state' => 99,
                 'hostgroup'     => $h->hostgroup,
                 'sort'          => 'service_severity'
-              )
-            ); ?>" title="<?php printf(
-              $this->translatePlural(
-                'List %u service with status pending in host group %s',
-                'List %u services with status pending in host group %s',
-                $h->services_pending
               ),
-              $h->services_pending,
-              $h->hostgroup
-            ); ?>">
-              <?= $h->services_pending; ?>
-            </a>
+              array(
+                'title' => sprintf(
+                  $this->translatePlural(
+                    'List %u service that is currently in state PENDING on hosts in the host group "%s"',
+                    'List %u services which are currently in state PENDING on hosts in the host group "%s"',
+                    $h->services_pending
+                  ),
+                  $h->services_pending,
+                  $h->hostgroup_alias
+                )
+              )
+            ); ?>
           </span>
         <?php endif ?>
         </td>

From a64f546a7132d845d6dd8d0bd348770c579fbd08 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:24:22 +0100
Subject: [PATCH 0771/2920] Add proper titles to the host list view

refs #8458
---
 .../application/views/scripts/list/hosts.phtml    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index b9fa25975..f5689c927 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -96,11 +96,18 @@ if ($hosts->count() === 0) {
         <?= $this->icon($this->resolveMacros($host->host_icon_image, $host)) ?>
         <?php endif ?>
         <?= implode(' ', $icons) ?>
-        <a href="<?= $hostLink  ?>"><?= $this->escape($host->host_display_name) ?></a>
+        <?= $this->qlink(
+          $host->host_display_name,
+          $hostLink,
+          null,
+          array(
+            'title' => sprintf($this->translate('Show detailed information for host %s'), $host->host_display_name)
+          )
+        ); ?>
         <?php if (isset($host->host_unhandled_services) && $host->host_unhandled_services > 0): ?>
         <span> (<?= $this->qlink(
           sprintf(
-            $this->translatePlural('%d unhandled service', '%d unhandled services', $host->host_unhandled_services),
+            $this->translatePlural('%u unhandled service', '%u unhandled services', $host->host_unhandled_services),
             $host->host_unhandled_services
           ),
           'monitoring/show/services',
@@ -113,8 +120,8 @@ if ($hosts->count() === 0) {
             'style' => 'font-weight: normal',
             'title' => sprintf(
               $this->translatePlural(
-                'List %s service problem on host %s',
-                'List %s service problems on host %s',
+                'List %s unhandled service problem on host %s',
+                'List %s unhandled service problems on host %s',
                 $host->host_unhandled_services
               ),
               $host->host_unhandled_services,

From c4aa02c3f00658a2521ad6cc25871723086fc5a9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:24:46 +0100
Subject: [PATCH 0772/2920] Add proper titles to the service grid

refs #8458
---
 .../views/scripts/list/servicegrid.phtml      | 57 ++++++++++++++-----
 1 file changed, 42 insertions(+), 15 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
index dd9be0394..a102c36eb 100644
--- a/modules/monitoring/application/views/scripts/list/servicegrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
@@ -37,18 +37,23 @@ $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . '
         ); ?></th>
         <th colspan="<?= count($serviceStates); ?>">
           <div>
-<?php foreach (array_keys($serviceStates) as $service_description): ?>
+<?php
+$serviceDescriptions = array_keys($serviceStates);
+$serviceFilter = '(service_description=' . implode('|service_description=', $serviceDescriptions) . ')';
+
+foreach ($serviceDescriptions as $service_description): ?>
             <span>
-              <a href="<?= $this->href(
-                'monitoring/list/services',
+              <?= $this->qlink(
+                '<abbr>' . (strlen($service_description) > 18 ? substr($service_description, 0, 18) . '...' : $service_description) . '</abbr>',
+                'monitoring/list/services?' . $hostFilter,
                 array(
                   'service_description' => $service_description
-                )
-              ) . '&' . $hostFilter; ?>">
-                <abbr title="<?= $service_description; ?>">
-                  <?= strlen($service_description) > 18 ? substr($service_description, 0, 18) . '...' : $service_description; ?>
-                </abbr>
-              </a>
+                ),
+                array(
+                  'title' => sprintf($this->translate('List all services with the name "%s" on all reported hosts'), $service_description)
+                ),
+                false
+              ); ?>
             </span>
 <?php endforeach ?>
           </div>
@@ -60,18 +65,40 @@ $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . '
 <?php endif ?>
       <tr>
         <th>
-          <a href="<?= $this->href('monitoring/show/services', array('host' => $host_name)); ?>"><?= $host_name; ?></a>
+          <?= $this->qlink(
+            $host_name,
+            'monitoring/show/services?' . $serviceFilter,
+            array('host' => $host_name),
+            array('title' => sprintf($this->translate('List all reported services on host %s'), $host_name))
+          ); ?>
         </th>
 <?php foreach (array_values($serviceStates) as $service): ?>
 <?php if ($service !== null): ?>
         <td>
-          <a href="<?= $this->href('monitoring/show/service', array(
-            'host'      => $service->host_name,
-            'service'   => $service->service_description
-          )); ?>" title="<?= $this->escape($service->service_output); ?>" class="state_<?= Service::getStateText($service->service_state); ?> <?= $service->service_handled ? 'handled' : ''; ?>"></a>
+          <span class="sr-only" id="<?= $service->host_name . '_' . $service->service_description . '_desc'; ?>">
+            <?= $this->escape($service->service_output); ?>
+          </span>
+          <?= $this->qlink(
+            '',
+            'monitoring/show/service',
+            array(
+              'host'      => $service->host_name,
+              'service'   => $service->service_description
+            ),
+            array(
+              'aria-describedby'    => $service->host_name . '_' . $service->service_description . '_desc',
+              'class'               => 'state_' . Service::getStateText($service->service_state). ($service->service_handled ? ' handled' : ''),
+              'title'               => $this->escape($service->service_output),
+              'aria-label'          => sprintf(
+                $this->translate('Show detailed information for service %s on host %s'),
+                $service->service_description,
+                $service->host_name
+              )
+            )
+          ); ?>
         </td>
 <?php else: ?>
-        <td>&middot;</td>
+        <td><span aria-hidden="true">&middot;</span></td>
 <?php endif ?>
 <?php endforeach ?>
       </tr>

From ebdf68550b86e53d21268226c2077ec7daac1c8f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:25:02 +0100
Subject: [PATCH 0773/2920] Add proper titles to the servicegroups view

refs #8458
---
 .../views/scripts/list/servicegroups.phtml    | 217 ++++++++++--------
 1 file changed, 118 insertions(+), 99 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index 04e6975e1..0e958a3f7 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -79,9 +79,12 @@
         </td>
        <?php endif ?>
         <td class="groupname">
-          <a href="<?= $this->href('monitoring/list/services', array('servicegroup' => $s->servicegroup)); ?>">
-            <?= $this->translate($s->servicegroup_alias) ?>
-          </a>
+          <?= $this->qlink(
+            $s->servicegroup_alias,
+            'monitoring/list/services',
+            array('servicegroup' => $s->servicegroup),
+            array('title' => sprintf($this->translate('List all services in the group "%s"'), $s->servicegroup_alias))
+          ); ?>
         </td>
         <td class="total">
           <?= $s->services_total; ?>
@@ -89,29 +92,32 @@
         <td class="state">
         <?php if ($s->services_ok): ?>
           <span class="state ok">
-            <a href="<?= $this->href(
+            <?= $this->qlink(
+              $s->services_ok,
               'monitoring/list/services',
               array(
                 'service_state' => 0,
                 'servicegroup'  => $s->servicegroup,
                 'sort'          => 'service_severity'
-              )
-            ); ?>" title="<?php printf(
-              $this->translatePlural(
-                'List %s service with status ok in service group %s',
-                'List %s Services with status ok in service group %s',
-                $s->services_ok
               ),
-              $s->services_ok,
-              $s->servicegroup
-            ); ?>">
-              <?= $s->services_ok; ?>
-            </a>
+              array(
+                'title' => sprintf(
+                  $this->translatePlural(
+                    'List %s service that is currently in state OK in service group "%s"',
+                    'List %s services which are currently in state OK in service group "%s"',
+                    $s->services_ok
+                  ),
+                  $s->services_ok,
+                  $s->servicegroup_alias
+                )
+              )
+            ); ?>
           </span>
         <?php endif ?>
         <?php if ($s->services_critical_unhandled): ?>
           <span class="state critical">
-            <a href="<?= $this->href(
+            <?= $this->qlink(
+              $s->services_critical_unhandled,
               'monitoring/list/services',
               array(
                 'service_state'         => 2,
@@ -120,40 +126,43 @@
                 'host_problem'          => 0,
                 'servicegroup'          => $s->servicegroup,
                 'sort'                  => 'service_severity'
-              )
-            ); ?>" title="<?php printf(
-              $this->translatePlural(
-                'List %s service with status critical unhandled in service group %s',
-                'List %s Services with status critical unhandled in service group %s',
-                $s->services_critical_unhandled
               ),
-              $s->services_critical_unhandled,
-              $s->servicegroup
-            ); ?>">
-              <?= $s->services_critical_unhandled; ?>
-            </a>
+              array(
+                  'title' => sprintf(
+                  $this->translatePlural(
+                    'List %s service that is currently in state CRITICAL in service group "%s"',
+                    'List %s services which are currently in state CRITICAL in service group "%s"',
+                    $s->services_critical_unhandled
+                  ),
+                  $s->services_critical_unhandled,
+                  $s->servicegroup_alias
+                )
+              )
+            ); ?>
         <?php endif ?>
           <?php if ($s->services_critical_handled): ?>
             <span class="state critical handled">
-              <a href="<?= $this->href(
+              <?= $this->qlink(
+                $s->services_critical_handled,
                 'monitoring/list/services',
                 array(
                   'service_state'     => 2,
                   'service_handled'   => 1,
                   'servicegroup'      => $s->servicegroup,
                   'sort'              => 'service_severity'
-                )
-              ); ?>" title="<?php printf(
-                $this->translatePlural(
-                  'List %s service with status critical handled in service group %s',
-                  'List %s services with status critical handled in service group %s',
-                  $s->services_critical_handled
                 ),
-                $s->services_critical_handled,
-                $s->servicegroup
-              ); ?>">
-                <?= $s->services_critical_handled; ?>
-              </a>
+                array(
+                  'title' => sprintf(
+                    $this->translatePlural(
+                      'List %s service that is currently in state CRITICAL (Acknowledged) in service group "%s"',
+                      'List %s services which are currently in state CRITICAL (Acknowledged) in service group "%s"',
+                      $s->services_critical_handled
+                    ),
+                    $s->services_critical_handled,
+                    $s->servicegroup_alias
+                  )
+                )
+              ); ?>
             </span>
           <?php endif ?>
         <?php if ($s->services_critical_unhandled): ?>
@@ -161,7 +170,8 @@
         <?php endif ?>
         <?php if ($s->services_unknown_unhandled): ?>
           <span class="state unknown">
-            <a href="<?= $this->href(
+            <?= $this->qlink(
+              $s->services_unknown_unhandled,
               'monitoring/list/services',
               array(
                 'service_state'         => 3,
@@ -170,40 +180,43 @@
                 'host_problem'          => 0,
                 'servicegroup'          => $s->servicegroup,
                 'sort'                  => 'service_severity'
-              )
-            ); ?>" title="<?php printf(
-              $this->translatePlural(
-                'List %s service with status unknown unhandled in service group %s',
-                'List %s services with status unknown unhandled in service group %s',
-                $s->services_unknown_unhandled
               ),
-              $s->services_unknown_unhandled,
-              $s->servicegroup
-            ); ?>">
-              <?= $s->services_unknown_unhandled; ?>
-            </a>
+              array(
+                'title' => sprintf(
+                  $this->translatePlural(
+                    'List %s service that is currently in state UNKNOWN in service group "%s"',
+                    'List %s services which are currently in state UNKNOWN in service group "%s"',
+                    $s->services_unknown_unhandled
+                  ),
+                  $s->services_unknown_unhandled,
+                  $s->servicegroup_alias
+                )
+              )
+            ); ?>
         <?php endif ?>
           <?php if ($s->services_unknown_handled): ?>
             <span class="state unknown handled">
-              <a href="<?= $this->href(
+              <?= $this->qlink(
+                $s->services_unknown_handled,
                 'monitoring/list/services',
                 array(
                   'service_state'     => 3,
                   'service_handled'   => 1,
                   'servicegroup'      => $s->servicegroup,
                   'sort'              => 'service_severity'
-                )
-              ); ?>" title="<?php printf(
-                $this->translatePlural(
-                  'List %s service with status unknown handled in service group %s',
-                  'List %s services with status unknown handled in service group %s',
-                  $s->services_unknown_handled
                 ),
-                $s->services_unknown_handled,
-                $s->servicegroup
-              ); ?>">
-                <?= $s->services_unknown_handled; ?>
-              </a>
+                array(
+                  'title' => sprintf(
+                    $this->translatePlural(
+                      'List %s service that is currently in state UNKNOWN (Acknowledged) in service group "%s"',
+                      'List %s services which are currently in state UNKNOWN (Acknowledged) in service group "%s"',
+                      $s->services_unknown_handled
+                    ),
+                    $s->services_unknown_handled,
+                    $s->servicegroup_alias
+                  )
+                )
+              ); ?>
             </span>
           <?php endif ?>
         <?php if ($s->services_unknown_unhandled): ?>
@@ -211,7 +224,8 @@
         <?php endif ?>
         <?php if ($s->services_warning_unhandled): ?>
           <span class="state warning">
-            <a href="<?= $this->href(
+            <?= $this->qlink(
+              $s->services_warning_unhandled,
               'monitoring/list/services',
               array(
                 'service_state'         => 1,
@@ -220,40 +234,43 @@
                 'host_problem'          => 0,
                 'servicegroup'          => $s->servicegroup,
                 'sort'                  => 'service_severity'
-              )
-            ); ?>" title="<?php printf(
-              $this->translatePlural(
-                'List %s service with status warning unhandled in service group %s',
-                'List %s services with status warning unhandled in service group %s',
-                $s->services_warning_unhandled
               ),
-              $s->services_warning_unhandled,
-              $s->servicegroup
-            ); ?>">
-              <?= $s->services_warning_unhandled; ?>
-            </a>
+              array(
+                'title' => sprintf(
+                  $this->translatePlural(
+                    'List %s service that is currently in state WARNING in service group "%s"',
+                    'List %s services which are currently in state WARNING in service group "%s"',
+                    $s->services_warning_unhandled
+                  ),
+                  $s->services_warning_unhandled,
+                  $s->servicegroup_alias
+                )
+              )
+            ); ?>
         <?php endif ?>
           <?php if ($s->services_warning_handled): ?>
             <span class="state warning handled">
-              <a href="<?= $this->href(
+              <?= $this->qlink(
+                $s->services_warning_handled,
                 'monitoring/list/services',
                 array(
                     'service_state'     => 1,
                     'service_handled'   => 1,
                     'servicegroup'      => $s->servicegroup,
                     'sort'              => 'service_severity'
-                )
-              ); ?>" title="<?php printf(
-                $this->translatePlural(
-                  'List %s service with status warning handled in service group %s',
-                  'List %s services with status warning handled in service group %s',
-                  $s->services_warning_handled
                 ),
-                $s->services_warning_handled,
-                $s->servicegroup
-              ); ?>">
-                <?= $s->services_warning_handled; ?>
-              </a>
+                array(
+                  'title' => sprintf(
+                    $this->translatePlural(
+                      'List %s service that is currently in state WARNING (Acknowledged) in service group "%s"',
+                      'List %s services which are currently in state WARNING (Acknowledged) in service group "%s"',
+                      $s->services_warning_handled
+                    ),
+                    $s->services_warning_handled,
+                    $s->servicegroup_alias
+                  )
+                )
+              ); ?>
             </span>
           <?php endif ?>
         <?php if ($s->services_warning_unhandled): ?>
@@ -261,24 +278,26 @@
         <?php endif ?>
         <?php if ($s->services_pending): ?>
           <span class="state pending">
-            <a href="<?= $this->href(
+            <?= $this->qlink(
+              $s->services_pending,
               'monitoring/list/services',
               array(
                 'service_state' => 99,
                 'servicegroup'  => $s->servicegroup,
                 'sort'          => 'service_severity'
-              )
-            ); ?>" title="<?php printf(
-              $this->translatePlural(
-                'List %s service with status pending in service group %s',
-                'List %s services with status pending in service group %s',
-                $s->services_pending
               ),
-              $s->services_pending,
-              $s->servicegroup
-            ); ?>">
-              <?= $s->services_pending; ?>
-            </a>
+              array(
+                'title' => sprintf(
+                  $this->translatePlural(
+                    'List %s service that is currenlty in state PENDING in service group "%s"',
+                    'List %s services which are currently in state PENDING in service group "%s"',
+                    $s->services_pending
+                  ),
+                  $s->services_pending,
+                  $s->servicegroup_alias
+                )
+              )
+            ); ?>
           </span>
         <?php endif ?>
         </td>

From f11ad1183a7260a477bd3135153dd9bac9e97658 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:25:23 +0100
Subject: [PATCH 0774/2920] Add proper titles to the service list view

refs #8458
---
 .../views/scripts/list/services.phtml         | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index e8d39c7c3..3b17e1b63 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -102,13 +102,23 @@ foreach ($services as $service):
         <?php endif ?>
 
       <?php if ($service->service_icon_image && ! preg_match('/[\'"]/', $service->service_icon_image)): ?>
-      <?= $this->icon($this->resolveMacros($service->service_icon_image, $service)) ?>
+        <?= $this->icon($this->resolveMacros($service->service_icon_image, $service)) ?>
       <?php endif ?>
-<a href="<?= $serviceLink ?>"><?= $this->escape($service->service_display_name) ?></a><?php if ($this->showHost): ?> on <a href="<?= $hostLink ?>"><?= $this->escape($service->host_display_name) ?>
-<?php if ($service->host_state != 0): ?>
-  (<?= Host::getStateText($service->host_state, true); ?>)
-<?php endif ?>
-</a><?php endif ?><br />
+        <?= $this->qlink(
+          $service->service_display_name,
+          $serviceLink,
+          null,
+          array('title' => sprintf(
+            $this->translate('Show detailed information for service %s on host %s'),
+            $service->service_display_name,
+            $service->host_display_name
+          ))
+        ); ?><?php if ($this->showHost): ?> on <?= $this->qlink(
+          $service->host_display_name . ($service->host_state != 0 ? ' (' . Host::getStateText($service->host_state, true) . ')' : ''),
+          $hostLink,
+          null,
+          array('title' => sprintf($this->translate('Show detailed information for host %s'), $service->host_display_name))
+        ); ?><?php endif ?><br>
         <p class="pluginoutput"><?= $this->escape($this->ellipsis($service->service_output, 10000)); ?></p>
       </td>
 <?php foreach($this->extraColumns as $col): ?>

From 598294d2a2041e22cdaaedac7e8069b240127be2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:25:55 +0100
Subject: [PATCH 0775/2920] Add proper titles to the servicesummary partial

refs #8458
---
 .../partials/host/servicesummary.phtml        | 99 +++++++++++++++----
 1 file changed, 79 insertions(+), 20 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
index d45415c72..c0acdead4 100644
--- a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
@@ -1,23 +1,54 @@
 <?php
 
 use Icinga\Web\Url;
+use Icinga\Module\Monitoring\Object\Service;
 
-$selfUrl = Url::fromPath('monitoring/show/services', array('host' => $this->object->host_name));
+$selfUrl = Url::fromPath('monitoring/show/services', array('host' => $object->host_name));
 $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
-?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : '' ?>>
-<?php if ($object->stats->services_total > 0): ?>
-<?= $this->qlink(sprintf($this->translatePlural('%d configured service:', '%d configured services:', $object->stats->services_total), $object->stats->services_total), $selfUrl) ?>
+?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
+<?php if ($object->stats->services_total): ?>
+<?= $this->qlink(
+    sprintf(
+        $this->translatePlural(
+            '%u configured service:',
+            '%u configured services:',
+            $object->stats->services_total
+        ),
+        $object->stats->services_total
+    ),
+    $selfUrl,
+    null,
+    array('title' => sprintf(
+        $this->translatePlural(
+            'List all %u service on host %s',
+            'List all %u services on host %s',
+            $object->stats->services_total
+        ),
+        $object->stats->services_total,
+        $object->host_name
+    ))
+); ?>
 <?php else: ?>
 <?= $this->translate('No services configured on this host'); ?>
 <?php endif; ?>
 <span class="badges">
-<?php if ($object->stats->services_ok > 0): ?>
- <span class="state ok<?= $currentUrl === $selfUrl->with('service_state', 0)->getRelativeUrl() ? ' active' : '' ?>"><?= $this->qlink(
-    $object->stats->services_ok,
-    $selfUrl,
-    array('service_state' => 0),
-    array('title' => sprintf($this->translate('Services with state %s'), $this->translate('OK')))
-)  ?></span>
+<?php if ($object->stats->services_ok): ?>
+<span class="state ok<?= $currentUrl === $selfUrl->with('service_state', 0)->getRelativeUrl() ? ' active' : ''; ?>">
+    <?= $this->qlink(
+        $object->stats->services_ok,
+        $selfUrl,
+        array('service_state' => 0),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state OK on host %s',
+                'List %u services which are currently in state OK on host %s',
+                $object->stats->services_ok
+            ),
+            $object->stats->services_ok,
+            $object->host_name
+        ))
+    ); ?>
+</span>
 <?php endif ?>
 <?php
 foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $state) {
@@ -46,7 +77,16 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
                 $object->stats->$unhandled,
                 $selfUrl,
                 $paramsUnhandled,
-                array('title' => sprintf($this->translate('Unhandled services with state %s'), $this->translate(strtoupper($state))))
+                array('title' => sprintf(
+                    $this->translatePlural(
+                        'List %u service that is currently in state %s on host %s',
+                        'List %u services which are currently in state %s on host %s',
+                        $object->stats->$unhandled
+                    ),
+                    $object->stats->$unhandled,
+                    Service::getStateText($stateId, true),
+                    $object->host_name
+                ))
             );
         }
         if ($object->stats->$handled) {
@@ -63,7 +103,16 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
                 $object->stats->$handled,
                 $selfUrl,
                 $paramsHandled,
-                array('title' => sprintf($this->translate('Handled services with state %s'), $this->translate(strtoupper($state))))
+                array('title' => sprintf(
+                    $this->translatePlural(
+                        'List %u service that is currently in state %s (Acknowledged) on host %s',
+                        'List %u services which are currently in state %s (Acknowledged) on host %s',
+                        $object->stats->$handled
+                    ),
+                    $object->stats->$handled,
+                    Service::getStateText($stateId, true),
+                    $object->host_name
+                ))
             );
             if ($object->stats->$unhandled) {
                 echo "</span>\n";
@@ -74,12 +123,22 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
 }
 ?>
 <?php if ($object->stats->services_pending): ?>
- <span class="state pending<?= $currentUrl === $selfUrl->with('service_state', 99)->getRelativeUrl() ? ' active' : '' ?>"><?= $this->qlink(
-    $object->stats->services_pending,
-    $selfUrl,
-    array('service_state' => 99),
-    array('title' => sprintf($this->translate('Services with state %s'), $this->translate('PENDING')))
-)  ?></span>
+<span class="state pending<?= $currentUrl === $selfUrl->with('service_state', 99)->getRelativeUrl() ? ' active' : ''; ?>">
+    <?= $this->qlink(
+        $object->stats->services_pending,
+        $selfUrl,
+        array('service_state' => 99),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state PENDING on host %s',
+                'List %u services which are currently in state PENDING on host %s',
+                $object->stats->services_pending
+            ),
+            $object->stats->services_pending,
+            $object->host_name
+        ))
+    ) ?>
+</span>
 <?php endif ?>
 </span>
-</div>
+</div>
\ No newline at end of file

From 74360ee8e616a7dbcb4a8b3877294396205e5a39 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:26:21 +0100
Subject: [PATCH 0776/2920] Add proper titles to the acknowledgements component
 view

refs #8458
---
 .../scripts/show/components/acknowledgement.phtml    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index 8da35590f..e5f85c021 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -35,9 +35,15 @@ if ($object->acknowledged): ?>
                     );
                 }
             ?>
-            <a href="<?= $ackLink ?>" data-base-target="_self">
-                <?= $this->icon('ok') ?> <?= $this->translate('Acknowledge') ?>
-            </a>
+            <?= $this->qlink(
+                $this->icon('ok') . ' ' . $this->translate('Acknowledge'),
+                $ackLink,
+                null,
+                array('title' => $this->translate(
+                    'Acknowledge this problem, suppress all future notifications for it and tag it as being handled'
+                )),
+                false
+            ); ?>
             <?php } else {
                 echo '&#45;';
             } // endif ?>

From 25e2baa566d413e46d2d3aee6fad64d1af631f1e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:26:42 +0100
Subject: [PATCH 0777/2920] Add proper titles to the checkstatistics component
 view

refs #8458
---
 .../show/components/checkstatistics.phtml     | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index ec0c2792a..7feab9339 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -28,23 +28,33 @@ if ($object->getType() === $object::TYPE_HOST) {
   <td>
       <?php if ($this->hasPermission('monitoring/command/schedule-check')) {
           if ($isService) {
-              $reschedule = $this->href(
+              echo $this->qlink(
+                  $this->icon('reschedule') . ' ' . $this->translate('Reschedule'),
                   'monitoring/service/reschedule-check',
-                  array('host' => $object->getHost()->getName(), 'service' => $object->getName())
+                  array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
+                  array(
+                      'data-base-target'    => '_self',
+                      'title'               => $this->translate(
+                          'Schedule the next active check at a different time than the current one'
+                      )
+                  ),
+                  false
               );
           } else {
-              $reschedule = $this->href(
+              echo $this->qlink(
+                  $this->icon('reschedule') . ' ' . $this->translate('Reschedule'),
                   'monitoring/host/reschedule-check',
-                  array('host' => $object->getName())
+                  array('host' => $object->getName()),
+                  array(
+                      'data-base-target'    => '_self',
+                      'title'               => $this->translate(
+                          'Schedule the next active check at a different time than the current one'
+                      )
+                  ),
+                  false
               );
           }
-      ?>
-      <a href="<?= $reschedule ?>" data-base-target="_self">
-          <?= $this->icon('reschedule') ?>
-          <?= $this->translate('Reschedule') ?>
-      </a>
-      <?php } // endif ?>
-      <?= $this->timeUntil($object->next_check) ?>
+      } ?> <?= $this->timeUntil($object->next_check) ?>
   </td>
 </tr>
 <tr>

From 89ed498069e8b53bcdf4a23979d41b49d58384e4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:26:56 +0100
Subject: [PATCH 0778/2920] Add proper titles to the command component view

refs #8458
---
 .../scripts/show/components/command.phtml     | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/command.phtml b/modules/monitoring/application/views/scripts/show/components/command.phtml
index a74b5b884..771e0812c 100644
--- a/modules/monitoring/application/views/scripts/show/components/command.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/command.phtml
@@ -6,26 +6,29 @@ $command = array_shift($parts);
 ?>
 
 <tr class="newsection">
-    <th><?= $this->translate('Command') ?></th>
+    <th><?= $this->translate('Command'); ?></th>
     <td>
-        <?= $this->escape($command) ?>
-        <?php if ($this->hasPermission('monitoring/command/schedule-check') && $object->passive_checks_enabled): ?>
-            <?php if ($object->getType() === $object::TYPE_HOST) {
-                $processCheckResult = $this->href(
+        <?= $this->escape($command); ?>
+        <?php if ($this->hasPermission('monitoring/command/schedule-check') && $object->passive_checks_enabled) {
+            $title = sprintf($this->translate('Submit a one time or so called passive result for the %s check'), $command);
+            if ($object->getType() === $object::TYPE_HOST) {
+                echo $this->qlink(
+                    $this->icon('reply') . ' ' . $this->translate('Process check result'),
                     'monitoring/host/process-check-result',
-                    array('host' => $object->getName())
+                    array('host' => $object->getName()),
+                    array('data-base-target' => '_self', 'title' => $title),
+                    false
                 );
             } else {
-                $processCheckResult = $this->href(
+                echo $this->qlink(
+                    $this->icon('reply') . ' ' . $this->translate('Process check result'),
                     'monitoring/service/process-check-result',
-                    array('host' => $object->getHost()->getName(), 'service' => $object->getName())
+                    array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
+                    array('data-base-target' => '_self', 'title' => $title),
+                    false
                 );
-            } ?>
-            <a href="<?= $processCheckResult ?>" data-base-target="_self">
-                <?= $this->icon('reply') ?>
-                <?= $this->translate('Process check result') ?>
-            </a>
-        <?php endif ?>
+            }
+        } ?>
     </td>
 </tr>
 

From 9793bd52c7033995d635eefb2617330bcef12348 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:27:13 +0100
Subject: [PATCH 0779/2920] Add proper titles to the comments component view

refs #8458
---
 .../scripts/show/components/comments.phtml    | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index a6503a70b..74da7d054 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -1,27 +1,34 @@
 <tr>
-    <th><?= $this->translate('Comments') ?></th>
+    <th><?= $this->translate('Comments'); ?></th>
     <td>
         <?php if ($this->hasPermission('monitoring/command/comment/add')) {
             /** @type \Icinga\Module\Monitoring\Object\MonitoredObject $object */
             if ($object->getType() === $object::TYPE_HOST) {
-                $addCommentLink = $this->href(
+                echo $this->qlink(
+                    $this->icon('comment') . ' ' . $this->translate('Add comment'),
                     'monitoring/host/add-comment',
-                    array('host' => $object->getName())
+                    array('host' => $object->getName()),
+                    array(
+                        'data-base-target'  => '_self',
+                        'title'             => $this->translate('Add a new comment to this host')
+                    ),
+                    false
                 );
             } else {
-                $addCommentLink = $this->href(
+                echo $this->qlink(
+                    $this->icon('comment') . ' ' . $this->translate('Add comment'),
                     'monitoring/service/add-comment',
-                    array('host' => $object->getHost()->getName(), 'service' => $object->getName())
+                    array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
+                    array(
+                        'data-base-target'  => '_self',
+                        'title'             => $this->translate('Add a new comment to this service')
+                    ),
+                    false
                 );
             }
-        ?>
-        <a href="<?= $addCommentLink ?>" data-base-target="_self">
-            <?= $this->icon('comment') ?>
-            <?= $this->translate('Add comment') ?>
-        </a>
-        <?php } else {
+        } else {
             echo '&#45;';
-        } // endif ?>
+        } ?>
     </td>
 </tr>
 

From 3a74ec3d09ed746039baf6c4e912d56c16bad017 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:27:27 +0100
Subject: [PATCH 0780/2920] Add proper titles to the contacts component view

refs #8458
---
 .../views/scripts/show/components/contacts.phtml     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/contacts.phtml b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
index 50b173381..c00714e9c 100644
--- a/modules/monitoring/application/views/scripts/show/components/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
@@ -4,9 +4,12 @@ if (! empty($object->contacts)) {
 
     $list = array();
     foreach ($object->contacts as $contact) {
-        $list[] = $this->qlink($contact->contact_alias, 'monitoring/show/contact', array(
-            'contact' => $contact->contact_name
-        ));
+        $list[] = $this->qlink(
+            $contact->contact_alias,
+            'monitoring/show/contact',
+            array('contact' => $contact->contact_name),
+            array('title' => sprintf($this->translate('Show detailed information about %s'), $contact->contact_alias))
+        );
     }
 
     printf(
@@ -24,7 +27,8 @@ if (! empty($object->contactgroups)) {
         $list[] = $this->qlink(
             $contactgroup->contactgroup_alias,
             'monitoring/list/contactgroups',
-            array('contactgroup' => $contactgroup->contactgroup_name)
+            array('contactgroup' => $contactgroup->contactgroup_name),
+            array('title' => sprintf($this->translate('List contacts in contact-group "%s"'), $contactgroup->contactgroup_alias))
         );
     }
 

From 0d8bf462f5142fbc69ec59ef13aea99adc8bc44b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:27:45 +0100
Subject: [PATCH 0781/2920] Add proper titles to the downtime component view

refs #8458
---
 .../scripts/show/components/downtime.phtml    | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 4aa1e21c1..16f12f6ba 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -1,27 +1,38 @@
 <tr>
-    <th><?= $this->translate('Downtimes') ?></th>
+    <th><?= $this->translate('Downtimes'); ?></th>
     <td>
         <?php if ($this->hasPermission('monitoring/command/downtime/schedule')) {
             /** @type \Icinga\Module\Monitoring\Object\MonitoredObject $object */
             if ($object->getType() === $object::TYPE_HOST) {
-                $scheduleDowntimeLink = $this->href(
+                echo $this->qlink(
+                    $this->icon('plug') . ' ' . $this->translate('Schedule downtime'),
                     'monitoring/host/schedule-downtime',
-                    array('host' => $object->getName())
+                    array('host' => $object->getName()),
+                    array(
+                        'data-base-target'  => '_self',
+                        'title'             => $this->translate(
+                            'Schedule a downtime to suppress all problem notifications within a specific period of time'
+                        )
+                    ),
+                    false
                 );
             } else {
-                $scheduleDowntimeLink = $this->href(
+                echo $this->qlink(
+                    $this->icon('plug') . ' ' . $this->translate('Schedule downtime'),
                     'monitoring/service/schedule-downtime',
-                    array('host' => $object->getHost()->getName(), 'service' => $object->getName())
+                    array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
+                    array(
+                        'data-base-target'  => '_self',
+                        'title'             => $this->translate(
+                            'Schedule a downtime to suppress all problem notifications within a specific period of time'
+                        )
+                    ),
+                    false
                 );
             }
-        ?>
-        <a href="<?= $scheduleDowntimeLink ?>" data-base-target="_self">
-            <?= $this->icon('plug') ?>
-            <?= $this->translate('Schedule downtime') ?>
-        </a>
-        <?php } else {
+        } else {
             echo '&#45;';
-        } // endif ?>
+        } ?>
     </td>
 </tr>
 

From 7247ea5191ad34231468c7726918a5588c9697e9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:28:02 +0100
Subject: [PATCH 0782/2920] Add proper titles to the hostgroups component view

refs #8458
---
 .../views/scripts/show/components/hostgroups.phtml       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml b/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
index 165df627a..eed1ea328 100644
--- a/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
@@ -4,9 +4,12 @@ if (empty($object->hostgroups)) return;
 
 $list = array();
 foreach ($object->hostgroups as $name => $alias) {
-    $list[] = $this->qlink($alias, 'monitoring/list/hosts', array(
-        'hostgroup' => $name
-    ));
+    $list[] = $this->qlink(
+        $alias,
+        'monitoring/list/hosts',
+        array('hostgroup' => $name),
+        array('title' => sprintf($this->translate('List all hosts in the group "%s"'), $alias))
+    );
 }
 printf(
     "<tr><th>%s</th><td>%s %s</td></tr>\n",

From 18f6ff8702755ac0eaad9de5bf0dd8b3a08aaf41 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:28:20 +0100
Subject: [PATCH 0783/2920] Add proper titles to the servicegroups component
 view

refs #8458
---
 .../views/scripts/show/components/servicegroups.phtml    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml b/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
index 50b71d839..093e03286 100644
--- a/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
@@ -4,9 +4,12 @@ if (empty($object->servicegroups)) return;
 
 $list = array();
 foreach ($object->servicegroups as $name => $alias) {
-    $list[] = $this->qlink($alias, 'monitoring/list/services', array(
-        'servicegroup' => $name
-    ));
+    $list[] = $this->qlink(
+        $alias,
+        'monitoring/list/services',
+        array('servicegroup' => $name),
+        array('title' => sprintf($this->translate('List all services in the group "%s"'), $alias))
+    );
 }
 
 printf(

From 8991b7ed83d779cff61d890d2e9d887161d1986c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:29:22 +0100
Subject: [PATCH 0784/2920] Add proper titles to the tactical overview

refs #8458
---
 .../components/hostservicechecks.phtml        | 144 ++++--
 .../components/monitoringfeatures.phtml       | 274 +++++++---
 .../tactical/components/ok_hosts.phtml        |  42 +-
 .../servicestatesummarybyhoststate.phtml      | 480 +++++++++++-------
 .../tactical/components/problem_hosts.phtml   |  46 +-
 5 files changed, 654 insertions(+), 332 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml b/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml
index 64265304d..b85199962 100644
--- a/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml
@@ -12,66 +12,114 @@
                 <tr>
                     <td>
 <?php if ($this->statusSummary->hosts_active): ?>
-                        <div class="box entry">
-                            <a href="<?= $this->href(
-                                'monitoring/list/hosts',
-                                array('host_active_checks_enabled' => 1)
-                            ); ?>">
-                                <?= sprintf($this->translatePlural('%d Active', '%d Active', $this->statusSummary->hosts_active), $this->statusSummary->hosts_active); ?>
-                            </a>
-                        </div>
+                        <div class="box entry"><?= $this->qlink(
+                            sprintf(
+                                $this->translatePlural('%u Active', '%u Active', $this->statusSummary->hosts_active),
+                                $this->statusSummary->hosts_active
+                            ),
+                            'monitoring/list/hosts',
+                            array('host_active_checks_enabled' => 1),
+                            array('title' => sprintf(
+                                $this->translatePlural(
+                                    'List %u actively checked host',
+                                    'List %u actively checked hosts',
+                                    $this->statusSummary->hosts_active
+                                ),
+                                $this->statusSummary->hosts_active
+                            ))
+                        ); ?></div>
 <?php endif ?>
 <?php if ($this->statusSummary->hosts_passive): ?>
-                        <div class="box entry">
-                            <a href="<?= $this->href(
-                                'monitoring/list/hosts',
-                                array('host_active_checks_enabled' => 0, 'host_passive_checks_enabled' => 1)
-                            ); ?>">
-                                <?= sprintf($this->translatePlural('%d Passive', '%d Passive', $this->statusSummary->hosts_passive), $this->statusSummary->hosts_passive); ?>
-                            </a>
-                        </div>
+                        <div class="box entry"><?= $this->qlink(
+                            sprintf(
+                                $this->translatePlural('%d Passive', '%d Passive', $this->statusSummary->hosts_passive),
+                                $this->statusSummary->hosts_passive
+                            ),
+                            'monitoring/list/hosts',
+                            array('host_active_checks_enabled' => 0, 'host_passive_checks_enabled' => 1),
+                            array('title' => sprintf(
+                                $this->translatePlural(
+                                    'List %u passively checked host',
+                                    'List %u passively checked hosts',
+                                    $this->statusSummary->hosts_passive
+                                ),
+                                $this->statusSummary->hosts_passive
+                            ))
+                        ); ?></div>
 <?php endif ?>
 <?php if ($this->statusSummary->hosts_not_checked): ?>
-                        <div class="box entry">
-                            <a href="<?= $this->href(
-                                'monitoring/list/hosts',
-                                array('host_active_checks_enabled' => 0, 'host_passive_checks_enabled' => 0)
-                            ); ?>" style="color: red;">
-                                <?= sprintf($this->translatePlural('%d Disabled', '%d Disabled', $this->statusSummary->hosts_not_checked), $this->statusSummary->hosts_not_checked); ?>
-                            </a>
-                        </div>
+                        <div class="box entry"><?= $this->qlink(
+                            sprintf(
+                                $this->translatePlural('%d Disabled', '%d Disabled', $this->statusSummary->hosts_not_checked),
+                                $this->statusSummary->hosts_not_checked
+                            ),
+                            'monitoring/list/hosts',
+                            array('host_active_checks_enabled' => 0, 'host_passive_checks_enabled' => 0),
+                            array('title' => sprintf(
+                                $this->translatePlural(
+                                    'List %u host that is not being checked at all',
+                                    'List %u hosts which are not being checked at all',
+                                    $this->statusSummary->hosts_not_checked
+                                ),
+                                $this->statusSummary->hosts_not_checked
+                            ))
+                        ); ?></div>
 <?php endif ?>
                     </td>
                     <td>
 <?php if ($this->statusSummary->services_active): ?>
-                        <div class="box entry">
-                            <a href="<?= $this->href(
-                                'monitoring/list/services',
-                                array('service_active_checks_enabled' => 1)
-                            ); ?>">
-                                <?= sprintf($this->translatePlural('%d Active', '%d Active', $this->statusSummary->services_active), $this->statusSummary->services_active); ?>
-                            </a>
-                        </div>
+                        <div class="box entry"><?= $this->qlink(
+                            sprintf(
+                                $this->translatePlural('%d Active', '%d Active', $this->statusSummary->services_active),
+                                $this->statusSummary->services_active
+                            ),
+                            'monitoring/list/services',
+                            array('service_active_checks_enabled' => 1),
+                            array('title' => sprintf(
+                                $this->translatePlural(
+                                    'List %u actively checked service',
+                                    'List %u actively checked services',
+                                    $this->statusSummary->services_active
+                                ),
+                                $this->statusSummary->services_active
+                            ))
+                        ); ?></div>
 <?php endif ?>
 <?php if ($this->statusSummary->services_passive): ?>
-                        <div class="box entry">
-                            <a href="<?= $this->href(
-                                'monitoring/list/services',
-                                array('service_active_checks_enabled' => 0, 'service_passive_checks_enabled' => 1)
-                            ); ?>">
-                                <?=  sprintf($this->translatePlural('%d Passive', '%d Passive', $this->statusSummary->services_passive), $this->statusSummary->services_passive); ?>
-                            </a>
-                        </div>
+                        <div class="box entry"><?= $this->qlink(
+                            sprintf(
+                                $this->translatePlural('%d Passive', '%d Passive', $this->statusSummary->services_passive),
+                                $this->statusSummary->services_passive
+                            ),
+                            'monitoring/list/services',
+                            array('service_active_checks_enabled' => 0, 'service_passive_checks_enabled' => 1),
+                            array('title' => sprintf(
+                                $this->translatePlural(
+                                    'List %u passively checked service',
+                                    'List %u passively checked services',
+                                    $this->statusSummary->services_passive
+                                ),
+                                $this->statusSummary->services_passive
+                            ))
+                        ); ?></div>
 <?php endif ?>
 <?php if ($this->statusSummary->services_not_checked): ?>
-                        <div class="box entry">
-                            <a href="<?= $this->href(
-                                'monitoring/list/services',
-                                array('service_active_checks_enabled' => 0, 'service_passive_checks_enabled' => 0)
-                            ); ?>" style="color: red;">
-                                <?= sprintf($this->translatePlural('%d Disabled', '%d Disabled', $this->statusSummary->services_not_checked), $this->statusSummary->services_not_checked); ?>
-                            </a>
-                        </div>
+                        <div class="box entry"><?= $this->qlink(
+                            sprintf(
+                                $this->translatePlural('%d Disabled', '%d Disabled', $this->statusSummary->services_not_checked),
+                                $this->statusSummary->services_not_checked
+                            ),
+                            'monitoring/list/services',
+                            array('service_active_checks_enabled' => 0, 'service_passive_checks_enabled' => 0),
+                            array('title' => sprintf(
+                                $this->translatePlural(
+                                    'List %u service that is not being checked at all',
+                                    'List %u services which are not being checked at all',
+                                    $this->statusSummary->services_not_checked
+                                ),
+                                $this->statusSummary->services_not_checked
+                            ))
+                        ); ?></div>
 <?php endif ?>
                     </td>
                 </tr>
diff --git a/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml b/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml
index 36b88b050..a67e9057c 100644
--- a/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml
@@ -11,58 +11,112 @@
             <tbody>
                 <tr>
                     <td>
+                        <div class="box entry">
 <?php if ($this->statusSummary->hosts_without_flap_detection): ?>
-                        <div class="box entry">
-                            <a href="<?= $this->href(
+                            <?= $this->qlink(
+                                sprintf(
+                                    $this->translatePlural('%u Host Disabled', '%u Hosts Disabled', $this->statusSummary->hosts_without_flap_detection),
+                                    $this->statusSummary->hosts_without_flap_detection
+                                ),
                                 'monitoring/list/hosts',
-                                array('host_flap_detection_enabled' => 0)
-                            ); ?>" class="feature-highlight">
-                                <?= sprintf($this->translatePlural('%d Host Disabled', '%d Hosts Disabled', $this->statusSummary->hosts_without_flap_detection), $this->statusSummary->hosts_without_flap_detection); ?>
-                            </a>
+                                array('host_flap_detection_enabled' => 0),
+                                array(
+                                    'class' => 'feature-highlight',
+                                    'title' => sprintf(
+                                        $this->translatePlural(
+                                            'List %u host for which flap detection has been disabled',
+                                            'List %u hosts for which flap detection has been disabled',
+                                            $this->statusSummary->hosts_without_flap_detection
+                                        ),
+                                        $this->statusSummary->hosts_without_flap_detection
+                                    )
+                                )
+                            ); ?>
 <?php else: ?>
-                        <div class="box entry">
-                            <a href="<?= $this->href(
+                            <?= $this->qlink(
+                                $this->translate('All Hosts Enabled'),
                                 'monitoring/list/hosts',
-                                array('host_flap_detection_enabled' => 1)
-                            ); ?>">
-                                <?= $this->translate('All Hosts Enabled'); ?>
-                            </a>
+                                array('host_flap_detection_enabled' => 1),
+                                array('title' => $this->translate(
+                                    'List all hosts, for which flap detection is enabled entirely'
+                                ))
+                            ); ?>
 <?php endif ?>
 <?php if ($this->statusSummary->hosts_flapping): ?>
-                            <a href="<?= $this->href(
+                            <?= $this->qlink(
+                                sprintf(
+                                    $this->translatePlural('%u Host Flapping', '%u Hosts Flapping', $this->statusSummary->hosts_flapping),
+                                    $this->statusSummary->hosts_flapping
+                                ),
                                 'monitoring/list/hosts',
-                                array('host_is_flapping' => 1)
-                            ); ?>" class="feature-highlight">
-                                <?= sprintf($this->translatePlural('%d Host Flapping', '%d Hosts Flapping', $this->statusSummary->hosts_flapping), $this->statusSummary->hosts_flapping); ?>
-                            </a>
+                                array('host_is_flapping' => 1),
+                                array(
+                                    'class' => 'feature-highlight',
+                                    'title' => sprintf(
+                                        $this->translatePlural(
+                                            'List %u host that is currently flapping',
+                                            'List %u hosts which are currently flapping',
+                                            $this->statusSummary->hosts_flapping
+                                        ),
+                                        $this->statusSummary->hosts_flapping
+                                    )
+                                )
+                            ); ?>
 <?php endif ?>
                         </div>
                     </td>
                     <td>
+                        <div class="box entry">
 <?php if ($this->statusSummary->services_without_flap_detection): ?>
-                        <div class="box entry">
-                            <a href="<?= $this->href(
+                            <?= $this->qlink(
+                                sprintf(
+                                    $this->translatePlural('%u Service Disabled', '%u Services Disabled', $this->statusSummary->services_without_flap_detection),
+                                    $this->statusSummary->services_without_flap_detection
+                                ),
                                 'monitoring/list/services',
-                                array('service_flap_detection_enabled' => 0)
-                            ); ?>" class="feature-highlight">
-                                <?= sprintf($this->translatePlural('%d Service Disabled', '%d Services Disabled', $this->statusSummary->services_without_flap_detection), $this->statusSummary->services_without_flap_detection); ?>
-                            </a>
+                                array('service_flap_detection_enabled' => 0),
+                                array(
+                                    'class' => 'feature-highlight',
+                                    'title' => sprintf(
+                                        $this->translatePlural(
+                                            'List %u service for which flap detection has been disabled',
+                                            'List %u services for which flap detection has been disabled',
+                                            $this->statusSummary->services_without_flap_detection
+                                        ),
+                                        $this->statusSummary->services_without_flap_detection
+                                    )
+                                )
+                            ); ?>
 <?php else: ?>
-                        <div class="box entry">
-                            <a href="<?= $this->href(
+                            <?= $this->qlink(
+                                $this->translate('All Services Enabled'),
                                 'monitoring/list/services',
-                                array('service_flap_detection_enabled' => 1)
-                            ); ?>">
-                                <?= $this->translate('All Services Enabled'); ?>
-                            </a>
+                                array('service_flap_detection_enabled' => 1),
+                                array('title' => $this->translate(
+                                    'List all services, for which flap detection is enabled entirely'
+                                ))
+                            ); ?>
 <?php endif ?>
 <?php if ($this->statusSummary->services_flapping): ?>
-                            <a href="<?= $this->href(
+                            <?= $this->qlink(
+                                sprintf(
+                                    $this->translatePlural('%u Service Flapping', '%u Services Flapping', $this->statusSummary->services_flapping),
+                                    $this->statusSummary->services_flapping
+                                ),
                                 'monitoring/list/services',
-                                array('service_is_flapping' => 1)
-                            ); ?>" class="feature-highlight">
-                                <?= sprintf($this->translatePlural('%d Service Flapping', '%d Services Flapping', $this->statusSummary->services_flapping), $this->statusSummary->services_flapping); ?>
-                            </a>
+                                array('service_is_flapping' => 1),
+                                array(
+                                    'class' => 'feature-highlight',
+                                    'title' => sprintf(
+                                        $this->translatePlural(
+                                            'List %u service that is currently flapping',
+                                            'List %u services which are currently flapping',
+                                            $this->statusSummary->services_flapping
+                                        ),
+                                        $this->statusSummary->services_flapping
+                                    )
+                                )
+                            ); ?>
 <?php endif ?>
                         </div>
                     </td>
@@ -78,42 +132,70 @@
             <tbody>
                 <tr>
                     <td>
+                        <div class="box entry">
 <?php if ($this->statusSummary->hosts_not_triggering_notifications): ?>
-                        <div class="box entry ">
-                            <a href="<?= $this->href(
+                            <?= $this->qlink(
+                                sprintf(
+                                    $this->translatePlural('%u Host Disabled', '%u Hosts Disabled', $this->statusSummary->hosts_not_triggering_notifications),
+                                    $this->statusSummary->hosts_not_triggering_notifications
+                                ),
                                 'monitoring/list/hosts',
-                                array('host_notifications_enabled' => 0)
-                            ); ?>" class="feature-highlight">
-                                <?= sprintf($this->translatePlural('%d Host Disabled', '%d Hosts Disabled', $this->statusSummary->hosts_not_triggering_notifications), $this->statusSummary->hosts_not_triggering_notifications); ?>
-                            </a>
+                                array('host_notifications_enabled' => 0),
+                                array(
+                                    'class' => 'feature-highlight',
+                                    'title' => sprintf(
+                                        $this->translatePlural(
+                                            'List %u host for which notifications are suppressed',
+                                            'List %u hosts for which notifications are suppressed',
+                                            $this->statusSummary->hosts_not_triggering_notifications
+                                        ),
+                                        $this->statusSummary->hosts_not_triggering_notifications
+                                    )
+                                )
+                            ); ?>
 <?php else: ?>
-                        <div class="box entry ">
-                            <a href="<?= $this->href(
+                            <?= $this->qlink(
+                                $this->translate('All Hosts Enabled'),
                                 'monitoring/list/hosts',
-                                array('host_notifications_enabled' => 1)
-                            ); ?>">
-                                <?= $this->translate('All Hosts Enabled'); ?>
-                            </a>
+                                array('host_notifications_enabled' => 1),
+                                array('title' => $this->translate(
+                                    'List all hosts, for which notifications are enabled entirely'
+                                ))
+                            ); ?>
 <?php endif ?>
                         </div>
                     </td>
                     <td>
+                        <div class="box entry">
 <?php if ($this->statusSummary->services_not_triggering_notifications): ?>
-                        <div class="box entry">
-                            <a href="<?= $this->href(
+                            <?= $this->qlink(
+                                sprintf(
+                                    $this->translatePlural('%u Service Disabled', '%u Services Disabled', $this->statusSummary->services_not_triggering_notifications),
+                                    $this->statusSummary->services_not_triggering_notifications
+                                ),
                                 'monitoring/list/services',
-                                array('service_notifications_enabled' => 0)
-                            ); ?>" class="feature-highlight">
-                                <?= sprintf($this->translatePlural('%d Service Disabled', '%d Services Disabled', $this->statusSummary->services_not_triggering_notifications), $this->statusSummary->services_not_triggering_notifications); ?>
-                            </a>
+                                array('service_notifications_enabled' => 0),
+                                array(
+                                    'class' => 'feature-highlight',
+                                    'title' => sprintf(
+                                        $this->translatePlural(
+                                            'List %u service for which notifications are suppressed',
+                                            'List %u services for which notifications are suppressed',
+                                            $this->statusSummary->services_not_triggering_notifications
+                                        ),
+                                        $this->statusSummary->services_not_triggering_notifications
+                                    )
+                                )
+                            ); ?>
 <?php else: ?>
-                        <div class="box entry">
-                            <a href="<?= $this->href(
+                            <?= $this->qlink(
+                                $this->translate('All Services Enabled'),
                                 'monitoring/list/services',
-                                array('service_notifications_enabled' => 1)
-                            ); ?>">
-                                <?= $this->translate('All Services Enabled'); ?>
-                            </a>
+                                array('service_notifications_enabled' => 1),
+                                array('title' => $this->translate(
+                                    'List all services, for which notifications are enabled entirely'
+                                ))
+                            ); ?>
 <?php endif ?>
                         </div>
                     </td>
@@ -129,42 +211,70 @@
             <tbody>
                 <tr>
                     <td>
+                        <div class="box entry">
 <?php if ($this->statusSummary->hosts_not_processing_event_handlers): ?>
-                        <div class="box entry">
-                            <a href="<?= $this->href(
+                            <?= $this->qlink(
+                                sprintf(
+                                    $this->translatePlural('%u Host Disabled', '%u Hosts Disabled', $this->statusSummary->hosts_not_processing_event_handlers),
+                                    $this->statusSummary->hosts_not_processing_event_handlers
+                                ),
                                 'monitoring/list/hosts',
-                                array('host_event_handler_enabled' => 0)
-                            ); ?>" class="feature-highlight">
-                                <?= sprintf($this->translatePlural('%d Host Disabled', '%d Hosts Disabled', $this->statusSummary->hosts_not_processing_event_handlers), $this->statusSummary->hosts_not_processing_event_handlers); ?>
-                            </a>
+                                array('host_event_handler_enabled' => 0),
+                                array(
+                                    'class' => 'feature-highlight',
+                                    'title' => sprintf(
+                                        $this->translatePlural(
+                                            'List %u host that is not processing any event handlers',
+                                            'List %u hosts which are not processing any event handlers',
+                                            $this->statusSummary->hosts_not_processing_event_handlers
+                                        ),
+                                        $this->statusSummary->hosts_not_processing_event_handlers
+                                    )
+                                )
+                            ); ?>
 <?php else: ?>
-                        <div class="box entry">
-                            <a href="<?= $this->href(
+                            <?= $this->qlink(
+                                $this->translate('All Hosts Enabled'),
                                 'monitoring/list/hosts',
-                                array('host_event_handler_enabled' => 1)
-                            ); ?>">
-                                <?= $this->translate('All Hosts Enabled'); ?>
-                            </a>
+                                array('host_event_handler_enabled' => 1),
+                                array('title' => $this->translate(
+                                    'List all hosts, which are processing event handlers entirely'
+                                ))
+                            ); ?>
 <?php endif ?>
                         </div>
                     </td>
                     <td>
+                        <div class="box entry">
 <?php if ($this->statusSummary->services_not_processing_event_handlers): ?>
-                        <div class="box entry">
-                            <a href="<?= $this->href(
+                            <?= $this->qlink(
+                                sprintf(
+                                    $this->translatePlural('%u Service Disabled', '%u Services Disabled', $this->statusSummary->services_not_processing_event_handlers),
+                                    $this->statusSummary->services_not_processing_event_handlers
+                                ),
                                 'monitoring/list/services',
-                                array('service_event_handler_enabled' => 0)
-                            ); ?>" class="feature-highlight">
-                                <?= sprintf($this->translatePlural('%d Service Disabled', '%d Services Disabled', $this->statusSummary->services_not_processing_event_handlers), $this->statusSummary->services_not_processing_event_handlers); ?>
-                            </a>
+                                array('service_event_handler_enabled' => 0),
+                                array(
+                                    'class' => 'feature-highlight',
+                                    'title' => sprintf(
+                                        $this->translatePlural(
+                                            'List %u service that is not processing any event handlers',
+                                            'List %u services which are not processing any event handlers',
+                                            $this->statusSummary->services_not_processing_event_handlers
+                                        ),
+                                        $this->statusSummary->services_not_processing_event_handlers
+                                    )
+                                )
+                            ); ?>
 <?php else: ?>
-                        <div class="box entry">
-                            <a href="<?= $this->href(
+                            <?= $this->qlink(
+                                $this->translate('All Services Enabled'),
                                 'monitoring/list/services',
-                                array('service_event_handler_enabled' => 1)
-                            ); ?>">
-                                <?= $this->translate('All Services Enabled'); ?>
-                            </a>
+                                array('service_event_handler_enabled' => 1),
+                                array('title' => $this->translate(
+                                    'List all services, which are processing event handlers entirely'
+                                ))
+                            ); ?>
 <?php endif ?>
                         </div>
                     </td>
diff --git a/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml b/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml
index cc9328262..8deebf19e 100644
--- a/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml
@@ -10,18 +10,40 @@ $service_problems = (
 ?>
 <div class="box ok_hosts state_<?= $this->statusSummary->hosts_up ? 'up' : 'pending'; ?>">
 <?php if ($this->statusSummary->hosts_up): ?>
-    <h2>
-        <a href="<?= $this->href('monitoring/list/hosts', array('host_state' => 0)); ?>">
-            <?= sprintf($this->translatePlural('%d Host UP', '%d Hosts UP', $this->statusSummary->hosts_up), $this->statusSummary->hosts_up); ?>
-        </a>
-    </h2>
+    <h2><?= $this->qlink(
+        sprintf(
+            $this->translatePlural('%u Host UP', '%u Hosts UP', $this->statusSummary->hosts_up),
+            $this->statusSummary->hosts_up
+        ),
+        'monitoring/list/hosts',
+        array('host_state' => 0),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u host that is currently in state UP',
+                'List %u hosts which are currently in state UP',
+                $this->statusSummary->hosts_up
+            ),
+            $this->statusSummary->hosts_up
+        ))
+    ); ?></h2>
 <?php endif ?>
 <?php if ($this->statusSummary->hosts_pending): ?>
-    <h2>
-        <a href="<?= $this->href('monitoring/list/hosts', array('host_state' => 99)); ?>">
-            <?= sprintf($this->translatePlural('%d Host PENDING', '%d Hosts PENDING', $this->statusSummary->hosts_pending), $this->statusSummary->hosts_pending); ?>
-        </a>
-    </h2>
+    <h2><?= $this->qlink(
+        sprintf(
+            $this->translatePlural('%u Host PENDING', '%u Hosts PENDING', $this->statusSummary->hosts_pending),
+            $this->statusSummary->hosts_pending
+        ),
+        'monitoring/list/hosts',
+        array('host_state' => 99),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u host that is currently in state PENDING',
+                'List %u hosts which are currently in state PENDING',
+                $this->statusSummary->hosts_pending
+            ),
+            $this->statusSummary->hosts_pending
+        ))
+    ); ?></h2>
 <?php endif ?>
 <?php if ($service_problems || $this->statusSummary->hosts_down || $this->statusSummary->hosts_unreachable): ?>
     <div class="box contents">
diff --git a/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml b/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml
index a5f3749e8..af88ae441 100644
--- a/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml
@@ -1,280 +1,396 @@
+<?php
+
+use Icinga\Module\Monitoring\Object\Service;
+
+?>
 <?php if ($services_critical_handled || $services_critical_unhandled): ?>
-<div class="box entry state_critical <?= $services_critical_unhandled ? '' : 'handled'; ?>">
+<div class="box entry state_<?= Service::getStateText(2); ?> <?= $services_critical_unhandled ? '' : 'handled'; ?>">
 <?php if ($services_critical_unhandled): ?>
-    <a href="<?= $this->href(
+    <?= $this->qlink(
+        $services_critical_unhandled . ' ' . Service::getStateText(2, true),
         'monitoring/list/services',
-        array('host_problem' => $host_problem, 'service_state' => 2, 'service_acknowledged' => 0, 'service_in_downtime' => 0)
-    ); ?>">
-        <?= sprintf($this->translatePlural('%d CRITICAL', '%d CRITICAL', $services_critical_unhandled, 'icinga.state'), $services_critical_unhandled); ?>
-    </a>
+        array(
+            'host_problem'          => $host_problem,
+            'service_state'         => 2,
+            'service_acknowledged'  => 0,
+            'service_in_downtime'   => 0
+        ),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state CRITICAL',
+                'List %u services which are currently in state CRITICAL',
+                $services_critical_unhandled
+            ),
+            $services_critical_unhandled
+        ))
+    ); ?>
 <?php endif ?>
 <?php if ($services_critical_handled): ?>
-    <a href="<?= $this->href(
+    <?= $this->qlink(
+        $services_critical_handled . ' ' . (
+            $services_critical_unhandled ? $this->translate('Acknowledged') : Service::getStateText(2, true)
+        ),
         'monitoring/list/services',
-        array('host_problem' => $host_problem, 'service_state' => 2, 'service_handled' => 1)
-    ); ?>">
-        <?= $services_critical_handled . ' ' . ($services_critical_unhandled ? $this->translate('Acknowledged') : $this->translate('CRITICAL', 'icinga.state')); ?>
-    </a>
+        array(
+            'host_problem'      => $host_problem,
+            'service_state'     => 2,
+            'service_handled'   => 1
+        ),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state CRITICAL (Acknowledged)',
+                'List %u services which are currently in state CRITICAL (Acknowledged)',
+                $services_critical_handled
+            ),
+            $services_critical_handled
+        ))
+    ); ?>
 <?php endif ?>
 <?php if ($services_critical_passive): ?>
-    <a href="<?= $this->href(
+    <?= $this->qlink(
+        sprintf(
+            $this->translatePlural(
+                '%u is passively checked',
+                '%u are passively checked',
+                $services_critical_passive
+            ),
+            $services_critical_passive
+        ),
         'monitoring/list/services',
         array(
             'service_state'                     => 2,
             'host_problem'                      => $host_problem,
             'service_active_checks_enabled'     => 0,
             'service_passive_checks_enabled'    => 1
-        )
-    ); ?>">
-        <?php
-            if ($services_critical_passive > 1) {
-                printf(
-                    $this->translate('%d are passively checked'),
-                    $services_critical_passive
-                );
-            } else {
-                printf(
-                    $this->translate('%d is passively checked'),
-                    $services_critical_passive
-                );
-            }
-        ?>
-    </a>
+        ),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state CRITICAL and passively checked',
+                'List %u services which are currently in state CRITICAL and passively checked',
+                $services_critical_passive
+            ),
+            $services_critical_passive
+        ))
+    ); ?>
 <?php endif ?>
 <?php if ($services_critical_not_checked): ?>
-    <a href="<?= $this->href(
+    <?= $this->qlink(
+        sprintf(
+            $this->translatePlural(
+                '%u is not checked at all',
+                '%u are not checked at all',
+                $services_critical_not_checked
+            ),
+            $services_critical_not_checked
+        ),
         'monitoring/list/services',
         array(
             'service_state'                     => 2,
             'host_problem'                      => $host_problem,
             'service_active_checks_enabled'     => 0,
             'service_passive_checks_enabled'    => 0
-        )
-    ); ?>">
-        <?php
-            if ($services_critical_not_checked > 1) {
-                printf(
-                    $this->translate('%d are not checked at all'),
-                    $services_critical_not_checked
-                );
-            } else {
-                printf(
-                    $this->translate('%d is not checked at all'),
-                    $services_critical_not_checked
-                );
-            }
-        ?>
-    </a>
+        ),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state CRITICAL and not checked at all',
+                'List %u services which are currently in state CRITICAL and not checked at all',
+                $services_critical_not_checked
+            ),
+            $services_critical_not_checked
+        ))
+    ); ?>
 <?php endif ?>
 </div>
 <?php endif ?>
 <?php if ($services_warning_handled || $services_warning_unhandled): ?>
-<div class="box entry state_warning <?= $services_warning_unhandled ? '' : 'handled'; ?>">
+<div class="box entry state_<?= Service::getStateText(1); ?> <?= $services_warning_unhandled ? '' : 'handled'; ?>">
 <?php if ($services_warning_unhandled): ?>
-    <a href="<?= $this->href(
+    <?= $this->qlink(
+        $services_warning_unhandled . ' ' . Service::getStateText(1, true),
         'monitoring/list/services',
-        array('host_problem' => $host_problem, 'service_state' => 1, 'service_acknowledged' => 0, 'service_in_downtime' => 0)
-    ); ?>">
-        <?= $services_warning_unhandled; ?> <?= $this->translate('WARNING', 'icinga.state') ?>
-    </a>
+        array(
+            'host_problem'          => $host_problem,
+            'service_state'         => 1,
+            'service_acknowledged'  => 0,
+            'service_in_downtime'   => 0
+        ),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state WARNING',
+                'List %u services which are currently in state WARNING',
+                $services_warning_unhandled
+            ),
+            $services_warning_unhandled
+        ))
+    ); ?>
 <?php endif ?>
 <?php if ($services_warning_handled): ?>
-    <a href="<?= $this->href(
+    <?= $this->qlink(
+        $services_warning_handled . ' ' . (
+            $services_warning_unhandled ? $this->translate('Acknowledged') : Service::getStateText(1, true)
+        ),
         'monitoring/list/services',
-        array('host_problem' => $host_problem, 'service_state' => 1, 'service_handled' => 1)
-    ); ?>">
-        <?= $services_warning_handled . ' ' . ($services_warning_unhandled ? $this->translate('Acknowledged') : $this->translate('WARNING', 'icinga.state')); ?>
-    </a>
+        array(
+            'host_problem'      => $host_problem,
+            'service_state'     => 1,
+            'service_handled'   => 1
+        ),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state WARNING (Acknowledged)',
+                'List %u services which are currently in state WARNING (Acknowledged)',
+                $services_warning_handled
+            ),
+            $services_warning_handled
+        ))
+    ); ?>
 <?php endif ?>
 <?php if ($services_warning_passive): ?>
-    <a href="<?= $this->href(
+    <?= $this->qlink(
+        sprintf(
+            $this->translatePlural(
+                '%u is passively checked',
+                '%u are passively checked',
+                $services_warning_passive
+            ),
+            $services_warning_passive
+        ),
         'monitoring/list/services',
         array(
             'service_state'                     => 1,
             'host_problem'                      => $host_problem,
             'service_active_checks_enabled'     => 0,
             'service_passive_checks_enabled'    => 1
-        )
-    ); ?>">
-        <?php
-            if ($services_warning_passive > 1) {
-                printf(
-                    $this->translate('%d are passively checked'),
-                    $services_warning_passive
-                );
-            } else {
-                printf(
-                    $this->translate('%d is passively checked'),
-                    $services_warning_passive
-                );
-            }
-        ?>
-    </a>
+        ),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state WARNING and passively checked',
+                'List %u services which are currently in state WARNING and passively checked',
+                $services_warning_passive
+            ),
+            $services_warning_passive
+        ))
+    ); ?>
 <?php endif ?>
 <?php if ($services_warning_not_checked): ?>
-    <a href="<?= $this->href(
+    <?= $this->qlink(
+        sprintf(
+            $this->translatePlural(
+                '%u is not checked at all',
+                '%u are not checked at all',
+                $services_warning_not_checked
+            ),
+            $services_warning_not_checked
+        ),
         'monitoring/list/services',
         array(
             'service_state'                     => 1,
             'host_problem'                      => $host_problem,
             'service_active_checks_enabled'     => 0,
             'service_passive_checks_enabled'    => 0
-        )
-    ); ?>">
-        <?php
-            if ($services_warning_not_checked > 1) {
-                printf(
-                    $this->translate('%d are not checked at all'),
-                    $services_warning_not_checked
-                );
-            } else {
-                printf(
-                    $this->translate('%d is not checked at all'),
-                    $services_warning_not_checked
-                );
-            }
-        ?>
-    </a>
+        ),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state WARNING and not checked at all',
+                'List %u services which are currently in state WARNING and not checked at all',
+                $services_warning_not_checked
+            ),
+            $services_warning_not_checked
+        ))
+    ); ?>
 <?php endif ?>
 </div>
 <?php endif ?>
 <?php if ($services_unknown_handled || $services_unknown_unhandled): ?>
-<div class="box entry state_unknown <?= $services_unknown_unhandled ? '' : 'handled'; ?>">
+<div class="box entry state_<?= Service::getStateText(3); ?> <?= $services_unknown_unhandled ? '' : 'handled'; ?>">
 <?php if ($services_unknown_unhandled): ?>
-    <a href="<?= $this->href(
+    <?= $this->qlink(
+        $services_unknown_unhandled . ' ' . Service::getStateText(3, true),
         'monitoring/list/services',
-        array('host_problem' => $host_problem, 'service_state' => 3, 'service_acknowledged' => 0, 'service_in_downtime' => 0)
-    ); ?>">
-        <?= sprintf($this->translatePlural('%d UNKNOWN', '%d UNKNOWN', $services_unknown_unhandled, 'icinga.state'), $services_unknown_unhandled) ?>
-    </a>
+        array(
+            'host_problem'          => $host_problem,
+            'service_state'         => 3,
+            'service_acknowledged'  => 0,
+            'service_in_downtime'   => 0
+        ),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state UNKNOWN',
+                'List %u services which are currently in state UNKNOWN',
+                $services_unknown_unhandled
+            ),
+            $services_unknown_unhandled
+        ))
+    ); ?>
 <?php endif ?>
 <?php if ($services_unknown_handled): ?>
-    <a href="<?= $this->href(
+    <?= $this->qlink(
+        $services_unknown_handled . ' ' . (
+            $services_unknown_unhandled ? $this->translate('Acknowledged') : Service::getStateText(3, true)
+        ),
         'monitoring/list/services',
-        array('host_problem' => $host_problem, 'service_state' => 3, 'service_handled' => 1)
-    ); ?>">
-        <?= $services_unknown_handled . ' ' . ($services_unknown_unhandled ? $this->translate('Acknowledged') : $this->translate('UNKNOWN', 'icinga.state')); ?>
-    </a>
+        array(
+            'host_problem'      => $host_problem,
+            'service_state'     => 3,
+            'service_handled'   => 1
+        ),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state UNKNOWN (Acknowledged)',
+                'List %u services which are currently in state UNKNOWN (Acknowledged)',
+                $services_unknown_handled
+            ),
+            $services_unknown_handled
+        ))
+    ); ?>
 <?php endif ?>
 <?php if ($services_unknown_passive): ?>
-    <a href="<?= $this->href(
+    <?= $this->qlink(
+        sprintf(
+            $this->translatePlural(
+                '%u is passively checked',
+                '%u are passively checked',
+                $services_unknown_passive
+            ),
+            $services_unknown_passive
+        ),
         'monitoring/list/services',
         array(
             'service_state'                     => 3,
             'host_problem'                      => $host_problem,
             'service_active_checks_enabled'     => 0,
             'service_passive_checks_enabled'    => 1
-        )
-    ); ?>">
-        <?php
-            if ($services_unknown_passive > 1) {
-                printf(
-                    $this->translate('%d are passively checked'),
-                    $services_unknown_passive
-                );
-            } else {
-                printf(
-                    $this->translate('%d is passively checked'),
-                    $services_unknown_passive
-                );
-            }
-        ?>
-    </a>
+        ),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state UNKNOWN and passively checked',
+                'List %u services which are currently in state UNKNOWN and passively checked',
+                $services_unknown_passive
+            ),
+            $services_unknown_passive
+        ))
+    ); ?>
 <?php endif ?>
 <?php if ($services_unknown_not_checked): ?>
-    <a href="<?= $this->href(
+    <?= $this->qlink(
+        sprintf(
+            $this->translatePlural(
+                '%u is not checked at all',
+                '%u are not checked at all',
+                $services_unknown_not_checked
+            ),
+            $services_unknown_not_checked
+        ),
         'monitoring/list/services',
         array(
             'service_state'                     => 3,
             'host_problem'                      => $host_problem,
             'service_active_checks_enabled'     => 0,
             'service_passive_checks_enabled'    => 0
-        )
-    ); ?>">
-        <?php
-            if ($services_unknown_not_checked > 1) {
-                printf(
-                    $this->translate('%d are not checked at all'),
-                    $services_unknown_not_checked
-                );
-            } else {
-                printf(
-                    $this->translate('%d is not checked at all'),
-                    $services_unknown_not_checked
-                );
-            }
-        ?>
-    </a>
+        ),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state UNKNOWN and not checked at all',
+                'List %u services which are currently in state UNKNOWN and not checked at all',
+                $services_unknown_not_checked
+            ),
+            $services_unknown_not_checked
+        ))
+    ); ?>
 <?php endif ?>
 </div>
 <?php endif ?>
 <?php if ($services_ok): ?>
-<div class="box entry state_ok">
-    <a href="<?= $this->href(
+<div class="box entry state_<?= Service::getStateText(0); ?>">
+    <?= $this->qlink(
+        $services_ok . ' ' . Service::getStateText(0, true),
         'monitoring/list/services',
-        array('host_problem' => $host_problem, 'service_state' => 0)
-    ); ?>">
-        <?= $services_ok; ?> <?= $this->translate('OK', 'icinga.state') ?>
-    </a>
+        array(
+            'host_problem'      => $host_problem,
+            'service_state'     => 0
+        ),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state OK',
+                'List %u services which are currently in state OK',
+                $services_ok
+            ),
+            $services_ok
+        ))
+    ); ?>
 <?php if ($services_ok_not_checked): ?>
-    <a href="<?= $this->href(
+    <?= $this->qlink(
+        sprintf(
+            $this->translatePlural(
+                '%u is not checked at all',
+                '%u are not checked at all',
+                $services_ok_not_checked
+            ),
+            $services_ok_not_checked
+        ),
         'monitoring/list/services',
         array(
             'service_state'                     => 0,
             'host_problem'                      => $host_problem,
             'service_active_checks_enabled'     => 0,
             'service_passive_checks_enabled'    => 0
-        )
-    ); ?>">
-        <?php
-            if ($services_ok_not_checked > 1) {
-                printf(
-                    $this->translate('%d are not checked at all'),
-                    $services_ok_not_checked
-                );
-            } else {
-                printf(
-                    $this->translate('%d is not checked at all'),
-                    $services_ok_not_checked
-                );
-            }
-        ?>
-    </a>
+        ),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state OK and not checked at all',
+                'List %u services which are currently in state OK and not checked at all',
+                $services_ok_not_checked
+            ),
+            $services_ok_not_checked
+        ))
+    ); ?>
 <?php endif ?>
 </div>
 <?php endif ?>
 <?php if ($services_pending): ?>
-<div class="box entry state_pending">
-    <a href="<?= $this->href(
+<div class="box entry state_<?= Service::getStateText(99); ?>">
+    <?= $this->qlink(
+        $services_pending . ' ' . Service::getStateText(99, true),
         'monitoring/list/services',
-        array('host_problem' => $host_problem, 'service_state' => 99)
-    ); ?>">
-        <?= sprintf($this->translatePlural('%d PENDING', '%d PENDING', $services_pending, 'icinga.state'), $services_pending); ?>
-    </a>
+        array(
+            'host_problem'      => $host_problem,
+            'service_state'     => 99
+        ),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state PENDING',
+                'List %u services which are currently in state PENDING',
+                $services_pending
+            ),
+            $services_pending
+        ))
+    ); ?>
 <?php if ($services_pending_not_checked): ?>
-    <a href="<?= $this->href(
+    <?= $this->qlink(
+        sprintf(
+            $this->translatePlural(
+                '%u is not checked at all',
+                '%u are not checked at all',
+                $services_pending_not_checked
+            ),
+            $services_pending_not_checked
+        ),
         'monitoring/list/services',
         array(
             'service_state'                     => 99,
             'host_problem'                      => $host_problem,
             'service_active_checks_enabled'     => 0,
             'service_passive_checks_enabled'    => 0
-        )
-    ); ?>">
-        <?php
-            if ($services_pending_not_checked > 1) {
-                printf(
-                    $this->translate('%d are not checked at all'),
-                    $services_pending_not_checked
-                );
-            } else {
-                printf(
-                    $this->translate('%d is not checked at all'),
-                    $services_pending_not_checked
-                );
-            }
-        ?>
-    </a>
+        ),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u service that is currently in state PENDING and not checked at all',
+                'List %u services which are currently in state PENDING and not checked at all',
+                $services_pending_not_checked
+            ),
+            $services_pending_not_checked
+        ))
+    ); ?>
 <?php endif ?>
 </div>
-<?php endif ?>
+<?php endif ?>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml b/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml
index 44199df55..bab0cfc8e 100644
--- a/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml
@@ -5,18 +5,44 @@
     }
 ?>">
 <?php if ($this->statusSummary->hosts_down): ?>
-    <h2>
-        <a href="<?= $this->href('monitoring/list/hosts', array('host_state' => 1)); ?>">
-            <?= sprintf($this->translatePlural('%d Host DOWN', '%d Hosts DOWN', $this->statusSummary->hosts_down), $this->statusSummary->hosts_down); ?>
-        </a>
-    </h2>
+    <h2><?= $this->qlink(
+        sprintf(
+            $this->translatePlural('%u Host DOWN', '%u Hosts DOWN', $this->statusSummary->hosts_down),
+            $this->statusSummary->hosts_down
+        ),
+        'monitoring/list/hosts',
+        array('host_state' => 1),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u host that is currently in state DOWN',
+                'List %u hosts which are currently in state DOWN',
+                $this->statusSummary->hosts_down
+            ),
+            $this->statusSummary->hosts_down
+        ))
+    ); ?></h2>
 <?php endif ?>
 <?php if ($this->statusSummary->hosts_unreachable): ?>
-    <h2>
-        <a href="<?= $this->href('monitoring/list/hosts', array('host_state' => 2)); ?>">
-            <?= sprintf($this->translatePlural('%d Host UNREACHABLE', '%d Hosts UNREACHABLE', $this->statusSummary->hosts_unreachable), $this->statusSummary->hosts_unreachable); ?>
-        </a>
-    </h2>
+    <h2><?= $this->qlink(
+        sprintf(
+            $this->translatePlural(
+                '%u Host UNREACHABLE',
+                '%u Hosts UNREACHABLE',
+                $this->statusSummary->hosts_unreachable
+            ),
+            $this->statusSummary->hosts_unreachable
+        ),
+        'monitoring/list/hosts',
+        array('host_state' => 2),
+        array('title' => sprintf(
+            $this->translatePlural(
+                'List %u host that is currently in state UNREACHABLE',
+                'List %u hosts which are currently in state UNREACHABLE',
+                $this->statusSummary->hosts_unreachable
+            ),
+            $this->statusSummary->hosts_unreachable
+        ))
+    ); ?></h2>
 <?php endif ?>
     <div class="box contents">
         <strong><?= $this->translate('Services'); ?></strong>

From 32e048693aa42a4b055b2cee798cfb34b2e047d8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:29:50 +0100
Subject: [PATCH 0785/2920] Add proper titles to service multi selection view

refs #8458
---
 .../views/scripts/services/show.phtml         | 234 ++++++++----------
 1 file changed, 102 insertions(+), 132 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 8f818627a..cc88b09e3 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -1,159 +1,129 @@
 <div class="controls">
-    <?= $this->render('partials/service/objects-header.phtml') ?>
+    <?= $this->render('partials/service/objects-header.phtml'); ?>
 </div>
 <div class="content">
     <?php if (($serviceCount = count($objects)) === 0): ?>
-        <?= $this->translate('No services matching the filter') ?>
+        <?= $this->translate('No services matching the filter'); ?>
     <?php else: ?>
-
+        <h3><?= sprintf($this->translatePlural('%u Service', '%u Services', $serviceCount), $serviceCount); ?></h3>
+        <div><?= $this->qlink(
+            sprintf($this->translate('List all %u services'), $serviceCount),
+            $listAllLink
+        ); ?></div>
         <div>
-            <a href="<?= $listAllLink ?>" title="<?= sprintf($this->translate('List all %u services'), $serviceCount) ?>">
-                <?= $this->translate('List all') ?>
-            </a>
+            <?= $checkNowForm; ?>
         </div>
-
-
+        <div><?= $this->qlink(
+            $this->icon('reschedule') . ' ' . sprintf(
+                $this->translate('Reschedule the next check for all %u services'),
+                $serviceCount
+            ),
+            $rescheduleAllLink,
+            null,
+            null,
+            false
+        ); ?></div>
+        <div><?= $this->qlink(
+            $this->icon('plug') . ' ' . sprintf($this->translate('Schedule a downtime for all %u services'), $serviceCount),
+            $downtimeAllLink,
+            null,
+            null,
+            false
+        ); ?></div>
+        <div><?= $this->qlink(
+            $this->icon('reply') . ' ' . sprintf(
+                $this->translate('Submit a passive check result for all %u services'),
+                $serviceCount
+            ),
+            $processCheckResultAllLink,
+            null,
+            null,
+            false
+        ); ?></div>
+      <?php if (($unhandledCount = count($unhandledObjects)) > 0): ?>
         <div>
-            <?= $checkNowForm ?>
-        </div>
-
-        <div>
-            <a href="<?= $rescheduleAllLink ?>">
-                <?= $this->icon('reschedule'); ?>
-                <?= $this->translate('Reschedule service checks') ?>
-            </a>
-        </div>
-
-        <div>
-            <a href="<?= $downtimeAllLink ?>">
-                <?= $this->icon('plug'); ?>
-                <?= $this->translate('Schedule service downtimes') ?>
-            </a>
-        </div>
-
-        <div>
-            <a href="<?= $processCheckResultAllLink; ?>">
-                <?= $this->icon('reply'); ?>
-                <?= $this->translate('Submit passive check results'); ?>
-            </a>
-        </div>
-
-        <?php if (! empty($unhandledObjects)): ?>
-        <h3>
-            <?php $unhandledCount = count($unhandledObjects) ?>
-            <?= sprintf(
+            <h3><?= sprintf(
                 $this->translatePlural(
                     '%u Unhandled Service Problem',
                     '%u Unhandled Service Problems',
                     $unhandledCount
                 ),
                 $unhandledCount
-            ) ?>
-        </h3>
-        <div>
-            <a href="<?= $downtimeUnhandledLink ?>" title="<?= sprintf(
-                $this->translatePlural(
-                    'Schedule downtime for %u unhandled service problem',
-                    'Schedule downtimes for %u unhandled service problems',
-                    $unhandledCount
-                ),
-                $unhandledCount
-            ) ?>">
-                <?= $this->icon('plug'); ?>
-                <?= sprintf(
+            ); ?></h3>
+            <div><?= $this->qlink(
+                $this->icon('plug') . ' ' . sprintf(
                     $this->translatePlural(
-                        'Schedule downtime for unhandled service problem',
-                        'Schedule downtimes for unhandled service problems',
+                        'Schedule a downtime for %u unhandled service problem',
+                        'Schedule a downtime for %u unhandled service problems',
                         $unhandledCount
                     ),
                     $unhandledCount
-                ) ?>
-            </a>
-        </div>
-        <div>
-            <a href="<?= $acknowledgeUnhandledLink ?>" title="<?= sprintf(
-                $this->translatePlural(
-                    'Acknowledge %u unhandled service problem',
-                    'Acknowledge %u unhandled service problems',
-                    $unhandledCount
                 ),
-                $unhandledCount
-            ) ?>">
-                <?= $this->icon('ok'); ?>
-                <?= sprintf(
+                $downtimeUnhandledLink,
+                null,
+                null,
+                false
+            ); ?></div>
+            <div><?= $this->qlink(
+                $this->icon('ok') . ' ' . sprintf(
                     $this->translatePlural(
-                        'Acknowledge unhandled service problem',
-                        'Acknowledge unhandled service problems',
+                        'Acknowledge %u unhandled service problem',
+                        'Acknowledge %u unhandled service problems',
                         $unhandledCount
                     ),
                     $unhandledCount
-                ) ?>
-            </a>
+                ),
+                $acknowledgeUnhandledLink,
+                null,
+                null,
+                false
+            ); ?></div>
         </div>
-        <?php endif ?>
-
-        <?php if (! empty($acknowledgedObjects)): ?>
-            <h2>
-                <?php $acknowledgedCount = count($acknowledgedObjects) ?>
-                <?= sprintf(
-                    $this->translatePlural(
-                        '%u Acknowledged Service Problem',
-                        '%u Acknowledged Service Problems',
-                        $acknowledgedCount
-                    ),
+      <?php endif ?>
+      <?php if (($acknowledgedCount = count($acknowledgedObjects)) > 0): ?>
+        <div>
+            <h2><?= sprintf(
+                $this->translatePlural(
+                    '%u Acknowledged Service Problem',
+                    '%u Acknowledged Service Problems',
                     $acknowledgedCount
-                ) ?>
-            </h2>
-            <div>
-                <?= $removeAckForm ?>
-            </div>
-        <?php endif ?>
-
-        <?php if (! empty($objectsInDowntime)): ?>
-            <h2>
-                <?php $inDowntimeCount = count($objectsInDowntime) ?>
-                <a href="<?= $inDowntimeLink ?>" title="<?= sprintf(
-                    $this->translatePlural(
-                        'List %u service currently in downtime',
-                        'List %u services currently in downtime',
-                        $inDowntimeCount
-                    ),
-                $inDowntimeCount) ?>">
-                    <?= $this->icon('plug'); ?>
-                    <?= sprintf(
-                        $this->translatePlural(
-                            'List %u service currently in downtime',
-                            'List %u services currently in downtime',
-                            $inDowntimeCount
-                        ),
-                        $inDowntimeCount
-                    ) ?>
-                </a>
-            </h2>
-        <?php endif ?>
-
-        <?php $commentCount = count($objects->getComments()) ?>
-        <?php if ($commentCount): ?>
-            <h2>
-                <a href="<?= $commentsLink ?>" title="<?= sprintf(
-                    $this->translatePlural(
-                        'List %u service comment',
-                        'List %u service comments',
-                        $commentCount
-                    ),
+                ),
+                $acknowledgedCount
+            ); ?></h2>
+            <?= $removeAckForm ?>
+        </div>
+      <?php endif ?>
+      <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0): ?>
+        <h2><?= $this->qlink(
+            $this->icon('plug') . ' ' . sprintf(
+                $this->translatePlural(
+                    'List %u service currently in downtime',
+                    'List %u services currently in downtime',
+                    $inDowntimeCount
+                ),
+                $inDowntimeCount
+            ),
+            $inDowntimeLink,
+            null,
+            null,
+            false
+        ); ?></h2>
+      <?php endif ?>
+      <?php if (($commentCount = count($objects->getComments())) > 0): ?>
+        <h2><?= $this->qlink(
+            $this->icon('comment') . ' ' . sprintf(
+                $this->translatePlural(
+                    'List %u service comment',
+                    'List %u service comments',
                     $commentCount
-                ) ?>">
-                    <?= $this->icon('comment'); ?>
-                    <?= sprintf(
-                        $this->translatePlural(
-                            'List %u service comment',
-                            'List %u service comments',
-                            $commentCount
-                        ),
-                        $commentCount
-                    ) ?>
-                </a>
-            </h2>
-        <?php endif ?>
+                ),
+                $commentCount
+            ),
+            $commentsLink,
+            null,
+            null,
+            false
+        ); ?></h2>
+      <?php endif ?>
     <?php endif ?>
-</div>
+</div>
\ No newline at end of file

From bb5799434c909235fc26ec211f78e543e815f723 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:30:37 +0100
Subject: [PATCH 0786/2920] Add proper titles to the contact view

refs #8458
---
 .../monitoring/application/views/scripts/show/contact.phtml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/show/contact.phtml b/modules/monitoring/application/views/scripts/show/contact.phtml
index 0ccd0f5ec..c4142707a 100644
--- a/modules/monitoring/application/views/scripts/show/contact.phtml
+++ b/modules/monitoring/application/views/scripts/show/contact.phtml
@@ -19,8 +19,12 @@
       </tr>
 <?php if ($contact->contact_email): ?>
       <tr>
-        <td><?= sprintf('<a href="mailto:%1$s">%1$s</a>', $this->escape($contact->contact_email)) ?></td>
         <th><?= $this->translate('Email') ?></th>
+        <td>
+            <a href="mailto:<?= $contact->contact_email; ?>" title="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias); ?>" aria-label="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias); ?>">
+                <?= $this->escape($contact->contact_email); ?>
+            </a>
+        </td>
       </tr>
 <?php endif ?>
 <?php if ($contact->contact_pager): ?>

From 52c17805c9415cd2401e2305b6acc3fa73c023e4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:30:51 +0100
Subject: [PATCH 0787/2920] Add proper titles to the history view

refs #8458
---
 .../application/views/scripts/show/history.phtml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index 5c20e800b..d55258d90 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -29,7 +29,12 @@ $hostContext = $object->getType() === 'host';
 function contactsLink($match, $view) {
     $links = array();
     foreach (preg_split('/,\s/', $match[1]) as $contact) {
-        $links[] = $view->qlink($contact, 'monitoring/show/contact', array('contact' => $contact));
+        $links[] = $view->qlink(
+            $contact,
+            'monitoring/show/contact',
+            array('contact' => $contact),
+            array('title' => sprintf($view->translate('Show detailed information about %s'), $contact))
+        );
     }
     return '[' . implode(', ', $links) . ']';
 }
@@ -141,7 +146,12 @@ $output = $this->tickets ? preg_replace_callback(
                   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
           ) ?>
@@ -150,7 +160,7 @@ $output = $this->tickets ? preg_replace_callback(
         <?php endif ?>
           <br>
           <div>
-            <?= $this->icon($icon, $title); ?> <?= empty($msg) ? '' : $this->escape($msg) ?>
+            <?= $this->icon($icon, $title); ?> <?= empty($msg) ? '' : $msg; ?>
           </div>
         </td>
       </tr>

From be293f5e49e55015baeabacbdce1238262a872ea Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:31:24 +0100
Subject: [PATCH 0788/2920] Add proper titles to the timeline

refs #8458
---
 .../views/scripts/timeline/index.phtml        | 91 ++++++++++++++-----
 1 file changed, 69 insertions(+), 22 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/timeline/index.phtml b/modules/monitoring/application/views/scripts/timeline/index.phtml
index a6e32ac08..58c51fb05 100644
--- a/modules/monitoring/application/views/scripts/timeline/index.phtml
+++ b/modules/monitoring/application/views/scripts/timeline/index.phtml
@@ -27,19 +27,54 @@ $firstRow = !$beingExtended;
 <?php if ($switchedContext): ?>
         <hr>
 <?php endif ?>
-<?php foreach ($timeline as $timeInfo): ?>
+<?php foreach ($timeline as $timeInfo):
+    switch ($intervalBox->getInterval()) {
+        case '1d':
+            $titleTime = sprintf(
+                $this->translate('on %s', 'timeline.link.title.time'),
+                $timeInfo[0]->end->format('d/m/Y')
+            );
+            break;
+        case '1w':
+            $titleTime = sprintf(
+                $this->translate('in week %s of %s', 'timeline.link.title.week.and.year'),
+                $timeInfo[0]->end->format('W'),
+                $timeInfo[0]->end->format('Y')
+            );
+            break;
+        case '1m':
+            $titleTime = sprintf(
+                $this->translate('in %s', 'timeline.link.title.month.and.year'),
+                $timeInfo[0]->end->format('F Y')
+            );
+            break;
+        case '1y':
+            $titleTime = sprintf(
+                $this->translate('in %s', 'timeline.link.title.year'),
+                $timeInfo[0]->end->format('Y')
+            );
+            break;
+        default:
+            $titleTime = sprintf(
+                $this->translate('between %s and %s', 'timeline.link.title.datetime.twice'),
+                $timeInfo[0]->end->format('d/m/Y g:i A'),
+                $timeInfo[0]->start->format('d/m/Y g:i A')
+            );
+    } ?>
         <div class="timeframe">
-            <span>
-                <a href="<?= $this->href(
-                    '/monitoring/list/eventhistory',
-                    array(
-                        'timestamp<' => $timeInfo[0]->start->getTimestamp(),
-                        'timestamp>' => $timeInfo[0]->end->getTimestamp()
-                    )
-                ); ?>">
-                    <?= $timeInfo[0]->end->format($intervalFormat); ?>
-                </a>
-            </span>
+            <span><?= $this->qlink(
+                $timeInfo[0]->end->format($intervalFormat),
+                '/monitoring/list/eventhistory',
+                array(
+                    'timestamp<' => $timeInfo[0]->start->getTimestamp(),
+                    'timestamp>' => $timeInfo[0]->end->getTimestamp()
+                ),
+                array('title' => sprintf(
+                    $this->translate('List all event records registered %s', 'timeline.link.title'),
+                    $titleTime
+                )),
+                false
+            ); ?></span>
 <?php foreach ($groupInfo as $groupName => $labelAndColor): ?>
 <?php if (array_key_exists($groupName, $timeInfo[1])): ?>
 <?php
@@ -63,18 +98,30 @@ $extrapolatedCircleWidth = $timeline->getExtrapolatedCircleWidth($timeInfo[1][$g
                     $circleWidth
                 ); ?>">
 <?php endif ?>
-                    <a class="inner-circle" style="<?= sprintf(
-                        'width: %3$s; height: %3$s; background-color: %2$s; margin-top: -%1$Fem; margin-left: -%1$Fem;',
-                        (float) substr($circleWidth, 0, -2) / 2,
-                        $timeInfo[1][$groupName]->getColor(),
-                        (string) $circleWidth
-                    ); ?>" href="<?= $timeInfo[1][$groupName]->getDetailUrl()->overwriteParams(
+                    <?= $this->qlink(
+                        '',
+                        $timeInfo[1][$groupName]->getDetailUrl(),
                         array(
-                            'timestamp<' => $timeInfo[0]->start->getTimestamp(),
-                            'timestamp>'   => $timeInfo[0]->end->getTimestamp(),
-                            'type'  => $groupName
+                            'type'          => $groupName,
+                            'timestamp<'    => $timeInfo[0]->start->getTimestamp(),
+                            'timestamp>'    => $timeInfo[0]->end->getTimestamp()
+                        ),
+                        array(
+                            'title' => sprintf(
+                                $this->translate('List %u %s registered %s', 'timeline.link.title'),
+                                $timeInfo[1][$groupName]->getValue(),
+                                strtolower($labelAndColor['label']),
+                                $titleTime
+                            ),
+                            'class' => 'inner-circle',
+                            'style' => sprintf(
+                                'width: %3$s; height: %3$s; background-color: %2$s; margin-top: -%1$Fem; margin-left: -%1$Fem;',
+                                (float) substr($circleWidth, 0, -2) / 2,
+                                $timeInfo[1][$groupName]->getColor(),
+                                (string) $circleWidth
+                            )
                         )
-                    ); ?>" title="<?= $timeInfo[1][$groupName]->getValue(); ?> <?= $labelAndColor['label']; ?>"></a>
+                    ); ?>
                 </div>
             </div>
 <?php endif ?>

From cebaa47aa955327b0d3cdfacbbbf6fc98e3b07e5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:32:29 +0100
Subject: [PATCH 0789/2920] Hide the css-hidden link to extend the timeline
 from screen readers as well

---
 .../monitoring/application/views/scripts/timeline/index.phtml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/timeline/index.phtml b/modules/monitoring/application/views/scripts/timeline/index.phtml
index 58c51fb05..6557b4a28 100644
--- a/modules/monitoring/application/views/scripts/timeline/index.phtml
+++ b/modules/monitoring/application/views/scripts/timeline/index.phtml
@@ -129,7 +129,7 @@ $extrapolatedCircleWidth = $timeline->getExtrapolatedCircleWidth($timeInfo[1][$g
         </div>
         <?php $firstRow = false; ?>
 <?php endforeach ?>
-        <a id="end" href="<?= Url::fromRequest()->remove(
+        <a aria-hidden="true" id="end" href="<?= Url::fromRequest()->remove(
             array(
                 'raw_timestamp<',
                 'raw_timestamp>'

From 60a9d1f224b9a5ae46a4be7df4c13452206ab340 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:32:55 +0100
Subject: [PATCH 0790/2920] Wizard: Add proper title to the refresh button of
 the requirements page

refs #8458
---
 .../views/scripts/form/setup-requirements.phtml      | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/setup/application/views/scripts/form/setup-requirements.phtml b/modules/setup/application/views/scripts/form/setup-requirements.phtml
index 47842efde..b3cf30101 100644
--- a/modules/setup/application/views/scripts/form/setup-requirements.phtml
+++ b/modules/setup/application/views/scripts/form/setup-requirements.phtml
@@ -32,7 +32,17 @@ $requirements = $form->getRequirements();
       <td></td>
       <td class="btn-update">
         <div class="buttons">
-          <a title="<?= $this->translate('You may also need to restart the web-server for the changes to take effect!'); ?>" href="<?= $this->href(); ?>" class="button-like"><?= $this->translate('Refresh'); ?></a>
+          <?php $title = $this->translate('You may also need to restart the web-server for the changes to take effect!'); ?>
+          <?= $this->qlink(
+            $this->translate('Refresh'),
+            null,
+            null,
+            array(
+              'class'       => 'button-like',
+              'title'       => $title,
+              'aria-label'  => sprintf($this->translate('Refresh the page; %s'), $title)
+            )
+          ); ?>
         </div>
       </td>
     </tr>

From e6957967f9afacadedab033d401ad5e4424e9528 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:33:23 +0100
Subject: [PATCH 0791/2920] Wizard: Add proper titles to the button-like links
 on the last page

refs #8458
---
 .../views/scripts/index/parts/finish.phtml    | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/modules/setup/application/views/scripts/index/parts/finish.phtml b/modules/setup/application/views/scripts/index/parts/finish.phtml
index e695d72ce..0018d0d43 100644
--- a/modules/setup/application/views/scripts/index/parts/finish.phtml
+++ b/modules/setup/application/views/scripts/index/parts/finish.phtml
@@ -18,9 +18,25 @@
   </div>
   <div class="buttons">
   <?php if ($success): ?>
-    <a href="<?= $this->href('authentication/login'); ?>" class="button-like login"><?= $this->translate('Login to Icinga Web 2'); ?></a>
+    <?= $this->qlink(
+        $this->translate('Login to Icinga Web 2'),
+        'authentication/login',
+        null,
+        array(
+            'class' => 'button-like login',
+            'title' => $this->translate('Show the login page of Icinga Web 2')
+        )
+    ); ?>
   <?php else: ?>
-    <a href="<?= $this->href(); ?>" class="button-like"><?= $this->translate('Back'); ?></a>
+    <?= $this->qlink(
+        $this->translate('Back'),
+        null,
+        null,
+        array(
+            'class' => 'button-like',
+            'title' => $this->translate('Show previous wizard-page')
+        )
+    ); ?>
   <?php endif ?>
   </div>
 </div>
\ No newline at end of file

From 61dc4c09f0f5945e70edfe01f3aa4766170f64c9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:33:44 +0100
Subject: [PATCH 0792/2920] Fix css of the event grid

---
 public/css/icinga/widgets.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index 85477db66..1da6b7bfb 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -29,7 +29,7 @@ table.historycolorgrid td.weekday {
   opacity: 1.0;
 }
 
-table.historycolorgrid a {
+table.historycolorgrid a, table.historycolorgrid span {
   margin: 0;
   text-decoration: none;
   display: block;

From 907134cee2fb05fe02843b1941c172ab0b52ff1a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 24 Feb 2015 09:03:47 +0100
Subject: [PATCH 0793/2920] Ensure that all link-like form buttons got proper
 titles

refs #8458
---
 .../application/forms/Command/Object/CheckNowCommandForm.php   | 3 ++-
 .../forms/Command/Object/DeleteCommentCommandForm.php          | 2 +-
 .../forms/Command/Object/DeleteDowntimeCommandForm.php         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
index 1a39574f6..c272b4c30 100644
--- a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
@@ -39,7 +39,8 @@ class CheckNowCommandForm extends ObjectsCommandForm
                         . $this->translate('Check now'),
                     'decorators'    => array('ViewHelper'),
                     'escape'        => false,
-                    'class'         => 'link-like'
+                    'class'         => 'link-like',
+                    'title'         => $this->translate('Schedule the next active check to run immediately')
                 )
             )
         ));
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
index e5bef88d8..6147ed5ff 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
@@ -54,7 +54,7 @@ class DeleteCommentCommandForm extends ObjectsCommandForm
             array(
                 'ignore'        => true,
                 'label'         => 'X',
-                'title'         => $this->translate('Delete comment'),
+                'title'         => $this->translate('Delete this comment'),
                 'decorators'    => array('ViewHelper')
             )
         );
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
index 3ef242b2f..2bbd22a4a 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -54,7 +54,7 @@ class DeleteDowntimeCommandForm extends ObjectsCommandForm
             array(
                 'ignore'        => true,
                 'label'         => 'X',
-                'title'         => $this->translate('Delete downtime'),
+                'title'         => $this->translate('Delete this downtime'),
                 'decorators'    => array('ViewHelper')
             )
         );

From 8e8bab0795e066bfc0e4f7a4ef9dc4fee55c03e6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 24 Feb 2015 11:35:25 +0100
Subject: [PATCH 0794/2920] Do only escape a qlink's label manually if
 necessary

---
 .../views/scripts/config/resource.phtml       | 16 +++++---
 .../views/scripts/dashboard/settings.phtml    | 16 +++++---
 .../scripts/form/reorder-authbackend.phtml    | 16 +++++---
 .../views/scripts/joystickPagination.phtml    | 21 +++++-----
 application/views/scripts/roles/index.phtml   |  8 ++--
 library/Icinga/Web/View/helpers/url.php       | 14 +++++--
 library/Icinga/Web/Widget/FilterEditor.php    | 16 ++++----
 .../views/scripts/config/index.phtml          | 32 +++++++++------
 .../views/scripts/hosts/show.phtml            | 41 +++++++------------
 .../views/scripts/list/contacts.phtml         |  9 ++--
 .../views/scripts/services/show.phtml         | 41 +++++++------------
 .../show/components/acknowledgement.phtml     | 12 +++---
 .../show/components/checkstatistics.phtml     | 12 +++---
 .../scripts/show/components/command.phtml     | 18 +++++---
 .../scripts/show/components/comments.phtml    | 12 +++---
 .../scripts/show/components/downtime.phtml    | 12 +++---
 .../views/scripts/show/history.phtml          |  2 +-
 17 files changed, 155 insertions(+), 143 deletions(-)

diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index c4eb9360f..342320ab9 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -26,21 +26,25 @@
       <tr>
         <td>
           <?= $this->qlink(
-            $this->icon('edit') . ' ' . $this->escape($name),
+            $name,
             'config/editresource',
             array('resource' => $name),
-            array('title' => sprintf($this->translate('Edit resource %s'), $name)),
-            false
+            array(
+                'icon'  => 'edit',
+                'title' => sprintf($this->translate('Edit resource %s'), $name)
+            )
           ); ?>
         </td>
         <td>
           <center>
             <?= $this->qlink(
-              $this->icon('cancel'),
+              '',
               'config/removeresource',
               array('resource' => $name),
-              array('title' => sprintf($this->translate('Remove resource %s'), $name)),
-              false
+              array(
+                  'icon'    => 'cancel',
+                  'title'   => sprintf($this->translate('Remove resource %s'), $name)
+              )
             ); ?>
           </center>
         </td>
diff --git a/application/views/scripts/dashboard/settings.phtml b/application/views/scripts/dashboard/settings.phtml
index 10ad613de..d1ed998d1 100644
--- a/application/views/scripts/dashboard/settings.phtml
+++ b/application/views/scripts/dashboard/settings.phtml
@@ -24,11 +24,13 @@
                     </th>
                     <th>
                         <?= $this->qlink(
-                            $this->icon('cancel'),
+                            '',
                             'dashboard/remove-pane',
                             array('pane' => $pane->getName()),
-                            array('title' => sprintf($this->translate('Remove pane %s'), $pane->getName())),
-                            false
+                            array(
+                                'icon'  => 'cancel',
+                                'title' => sprintf($this->translate('Remove pane %s'), $pane->getName())
+                            )
                         ); ?>
                     </th>
                 </tr>
@@ -61,11 +63,13 @@
                             </td>
                             <td>
                                 <?= $this->qlink(
-                                    $this->icon('cancel'),
+                                    '',
                                     'dashboard/remove-dashlet',
                                     array('pane' => $pane->getName(), 'dashlet' => $dashlet->getTitle()),
-                                    array('title' => sprintf($this->translate('Remove dashlet %s from pane %s'), $dashlet->getTitle(), $pane->getName())),
-                                    false
+                                    array(
+                                        'icon'  => 'cancel',
+                                        'title' => sprintf($this->translate('Remove dashlet %s from pane %s'), $dashlet->getTitle(), $pane->getName())
+                                    )
                                 ); ?>
                             </td>
                         </tr>
diff --git a/application/views/scripts/form/reorder-authbackend.phtml b/application/views/scripts/form/reorder-authbackend.phtml
index 23a6a67f5..02f62572d 100644
--- a/application/views/scripts/form/reorder-authbackend.phtml
+++ b/application/views/scripts/form/reorder-authbackend.phtml
@@ -11,20 +11,24 @@
       <tr>
         <td class="action">
           <?= $this->qlink(
-            $this->icon('edit') . ' ' . $this->escape($backendNames[$i]),
+            $backendNames[$i],
             'config/editAuthenticationBackend',
             array('auth_backend' => $backendNames[$i]),
-            array('title' => sprintf($this->translate('Edit authentication backend %s'), $backendNames[$i])),
-            false
+            array(
+                'icon'  => 'edit',
+                'title' => sprintf($this->translate('Edit authentication backend %s'), $backendNames[$i])
+            )
           ); ?>
         </td>
         <td>
           <?= $this->qlink(
-            $this->icon('cancel'),
+            '',
             'config/removeAuthenticationBackend',
             array('auth_backend' => $backendNames[$i]),
-            array('title' => sprintf($this->translate('Remove authentication backend %s'), $backendNames[$i])),
-            false
+            array(
+                'icon'  => 'cancel',
+                'title' => sprintf($this->translate('Remove authentication backend %s'), $backendNames[$i])
+            )
           ); ?>
         </td>
         <td>
diff --git a/application/views/scripts/joystickPagination.phtml b/application/views/scripts/joystickPagination.phtml
index ef0acdb60..9549fc2b0 100644
--- a/application/views/scripts/joystickPagination.phtml
+++ b/application/views/scripts/joystickPagination.phtml
@@ -29,12 +29,13 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
       <td>
       <?php if ($prevYAxisPage): ?>
         <?= $this->qlink(
-          $this->icon('up-open'),
+          '',
           Url::fromRequest(),
           array(
             'page' => $currentXAxisPage . ',' . $prevYAxisPage
           ),
           array(
+            'icon'              => 'up-open',
             'data-base-target'  => '_self',
             'title'             => sprintf(
               $showText,
@@ -44,8 +45,7 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
               $prevYAxisPage * $yAxisPages->itemCountPerPage,
               $yAxisPages->totalItemCount
             )
-          ),
-          false
+          )
         ); ?>
       <?php else: ?>
         <?= $this->icon('up-open'); ?>
@@ -57,12 +57,13 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
       <td>
       <?php if ($prevXAxisPage): ?>
         <?= $this->qlink(
-          $this->icon('left-open'),
+          '',
           Url::fromRequest(),
           array(
             'page' => $prevXAxisPage . ',' . $currentYAxisPage
           ),
           array(
+            'icon'              => 'left-open',
             'data-base-target'  => '_self',
             'title'             => sprintf(
               $showText,
@@ -72,8 +73,7 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
               $prevXAxisPage * $xAxisPages->itemCountPerPage,
               $xAxisPages->totalItemCount
             )
-          ),
-          false
+          )
         ); ?>
       <?php else: ?>
         <?= $this->icon('left-open'); ?>
@@ -83,12 +83,13 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
       <td>
       <?php if ($nextXAxisPage): ?>
         <?= $this->qlink(
-          $this->icon('right-open'),
+          '',
           Url::fromRequest(),
           array(
             'page' => $nextXAxisPage . ',' . $currentYAxisPage
           ),
           array(
+            'icon'              => 'right-open',
             'data-base-target'  => '_self',
             'title'             => sprintf(
               $showText,
@@ -111,12 +112,13 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
       <td>
       <?php if ($nextYAxisPage): ?>
         <?= $this->qlink(
-          $this->icon('down-open'),
+          '',
           Url::fromRequest(),
           array(
             'page' => $currentXAxisPage . ',' . $nextYAxisPage
           ),
           array(
+            'icon'              => 'down-open',
             'data-base-target'  => '_self',
             'title'             => sprintf(
               $showText,
@@ -126,8 +128,7 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
               $nextYAxisPage === $yAxisPages->last ? $yAxisPages->totalItemCount : $nextYAxisPage * $yAxisPages->itemCountPerPage,
               $yAxisPages->totalItemCount
             )
-          ),
-          false
+          )
         ); ?>
       <?php else: ?>
         <?= $this->icon('down-open'); ?>
diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml
index fa1297396..350fb3343 100644
--- a/application/views/scripts/roles/index.phtml
+++ b/application/views/scripts/roles/index.phtml
@@ -56,11 +56,13 @@
                         <td><?= $this->escape($role->groups) ?></td>
                         <td>
                             <?= $this->qlink(
-                                $this->icon('cancel'),
+                                '',
                                 'roles/remove',
                                 array('role' => $name),
-                                array('title' => sprintf($this->translate('Remove role %s'), $name)),
-                                false
+                                array(
+                                    'icon'  => 'cancel',
+                                    'title' => sprintf($this->translate('Remove role %s'), $name)
+                                )
                             ); ?>
                         </td>
                     </tr>
diff --git a/library/Icinga/Web/View/helpers/url.php b/library/Icinga/Web/View/helpers/url.php
index d4518d2aa..925a225f9 100644
--- a/library/Icinga/Web/View/helpers/url.php
+++ b/library/Icinga/Web/View/helpers/url.php
@@ -28,15 +28,23 @@ $this->addHelperFunction('url', function ($path = null, $params = null) {
 });
 
 $this->addHelperFunction('qlink', function ($title, $url, $params = null, $properties = null, $escape = true) use ($view) {
-    if ($properties && array_key_exists('title', $properties) && !array_key_exists('aria-label', $properties)) {
-        $properties['aria-label'] = $properties['title'];
+    $icon = '';
+    if ($properties) {
+        if (array_key_exists('title', $properties) && !array_key_exists('aria-label', $properties)) {
+            $properties['aria-label'] = $properties['title'];
+        }
+
+        if (array_key_exists('icon', $properties)) {
+            $icon = $view->icon($properties['icon']);
+            unset($properties['icon']);
+        }
     }
 
     return sprintf(
         '<a href="%s"%s>%s</a>',
         $view->url($url, $params),
         $view->propertiesToString($properties),
-        $escape ? $view->escape($title) : $title
+        $icon . ($escape ? $view->escape($title) : $title)
     );
 });
 
diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 21dd0f04a..0a8de5586 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -310,8 +310,8 @@ class FilterEditor extends AbstractWidget
             $this->preservedUrl()->with('removeFilter', $filter->getId()),
             null,
             array(
-                'title' => t('Remove this part of your filter'),
-                'class' => 'icon-cancel'
+                'icon'  => 'icon-cancel',
+                'title' => t('Remove this part of your filter')
             )
         );
     }
@@ -323,8 +323,8 @@ class FilterEditor extends AbstractWidget
             $this->preservedUrl()->with('addFilter', $filter->getId()),
             null,
             array(
-                'title' => t('Add another filter'),
-                'class' => 'icon-plus'
+                'icon'  => 'icon-plus',
+                'title' => t('Add another filter')
             )
         );
     }
@@ -336,8 +336,8 @@ class FilterEditor extends AbstractWidget
             $this->preservedUrl()->with('stripFilter', $filter->getId()),
             null,
             array(
-                'title' => t('Strip this filter'),
-                'class' => 'icon-minus'
+                'icon'  => 'icon-minus',
+                'title' => t('Strip this filter')
             )
         );
     }
@@ -349,8 +349,8 @@ class FilterEditor extends AbstractWidget
             $this->preservedUrl()->without('addFilter'),
             null,
             array(
-                'title' => t('Cancel this operation'),
-                'class' => 'icon-cancel'
+                'icon'  => 'icon-cancel',
+                'title' => t('Cancel this operation')
             )
         );
     }
diff --git a/modules/monitoring/application/views/scripts/config/index.phtml b/modules/monitoring/application/views/scripts/config/index.phtml
index 0fdb5f8c3..634da957c 100644
--- a/modules/monitoring/application/views/scripts/config/index.phtml
+++ b/modules/monitoring/application/views/scripts/config/index.phtml
@@ -19,11 +19,13 @@
       <tr>
         <td>
           <?= $this->qlink(
-            $this->icon('edit') . ' ' . $this->escape($backendName),
+            $backendName,
             '/monitoring/config/editbackend',
             array('backend' => $backendName),
-            array('title' => sprintf($this->translate('Edit monitoring backend %s'), $backendName)),
-            false
+            array(
+                'icon'  => 'edit',
+                'title' => sprintf($this->translate('Edit monitoring backend %s'), $backendName)
+            )
           ); ?>
           <small>(<?= sprintf(
             $this->translate('Type: %s'),
@@ -32,11 +34,13 @@
         </td>
         <td>
           <?= $this->qlink(
-            $this->icon('cancel'),
+            '',
             '/monitoring/config/removebackend',
             array('backend' => $backendName),
-            array('title' => sprintf($this->translate('Remove monitoring backend %s'), $backendName)),
-            false
+            array(
+                'icon'  => 'cancel',
+                'title' => sprintf($this->translate('Remove monitoring backend %s'), $backendName)
+            )
           ); ?>
         </td>
       </tr>
@@ -59,11 +63,13 @@
       <tr>
         <td>
           <?= $this->qlink(
-            $this->icon('edit') . ' ' . $this->escape($instanceName),
+            $instanceName,
             '/monitoring/config/editinstance',
             array('instance' => $instanceName),
-            array('title' => sprintf($this->translate('Edit monitoring instance %s'), $instanceName)),
-            false
+            array(
+                'icon'  => 'edit',
+                'title' => sprintf($this->translate('Edit monitoring instance %s'), $instanceName)
+            )
           ); ?>
           <small>(<?= sprintf(
             $this->translate('Type: %s'),
@@ -72,11 +78,13 @@
         </td>
         <td>
           <?= $this->qlink(
-            $this->icon('cancel'),
+            '',
             '/monitoring/config/removeinstance',
             array('instance' => $instanceName),
-            array('title' => sprintf($this->translate('Remove monitoring instance %s'), $instanceName)),
-            false
+            array(
+                'icon'  => 'cancel',
+                'title' => sprintf($this->translate('Remove monitoring instance %s'), $instanceName)
+            )
           ); ?>
         </td>
       </tr>
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 5e2417335..8655a31b1 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -14,31 +14,22 @@
             <?= $checkNowForm; ?>
         </div>
         <div><?= $this->qlink(
-            $this->icon('reschedule') . ' ' . sprintf(
-                $this->translate('Reschedule the next check for all %u hosts'),
-                $hostCount
-            ),
+            sprintf($this->translate('Reschedule the next check for all %u hosts'), $hostCount),
             $rescheduleAllLink,
             null,
-            null,
-            false
+            array('icon' => 'reschedule')
         ); ?></div>
         <div><?= $this->qlink(
-            $this->icon('plug') . ' ' . sprintf($this->translate('Schedule a downtime for all %u hosts'), $hostCount),
+            sprintf($this->translate('Schedule a downtime for all %u hosts'), $hostCount),
             $downtimeAllLink,
             null,
-            null,
-            false
+            array('icon' => 'plug')
         ); ?></div>
         <div><?= $this->qlink(
-            $this->icon('reply') . ' ' . sprintf(
-                $this->translate('Submit a passive check result for all %u hosts'),
-                $hostCount
-            ),
+            sprintf($this->translate('Submit a passive check result for all %u hosts'), $hostCount),
             $processCheckResultAllLink,
             null,
-            null,
-            false
+            array('icon' => 'reply')
         ); ?></div>
       <?php if (($unhandledCount = count($unhandledObjects)) > 0): ?>
         <div>
@@ -51,7 +42,7 @@
                 $unhandledCount
             ); ?></h3>
             <div><?= $this->qlink(
-                $this->icon('plug') . ' ' . sprintf(
+                sprintf(
                     $this->translatePlural(
                         'Schedule a downtime for %u unhandled host problem',
                         'Schedule a downtime for %u unhandled host problems',
@@ -61,11 +52,10 @@
                 ),
                 $downtimeUnhandledLink,
                 null,
-                null,
-                false
+                array('icon' => 'plug')
             ); ?></div>
             <div><?= $this->qlink(
-                $this->icon('ok') . ' ' . sprintf(
+                sprintf(
                     $this->translatePlural(
                         'Acknowledge %u unhandled host problem',
                         'Acknowledge %u unhandled host problems',
@@ -75,8 +65,7 @@
                 ),
                 $acknowledgeUnhandledLink,
                 null,
-                null,
-                false
+                array('icon' => 'ok')
             ); ?></div>
         </div>
       <?php endif ?>
@@ -95,7 +84,7 @@
       <?php endif ?>
       <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0): ?>
         <h2><?= $this->qlink(
-            $this->icon('plug') . ' ' . sprintf(
+            sprintf(
                 $this->translatePlural(
                     'List %u host currently in downtime',
                     'List %u hosts currently in downtime',
@@ -105,13 +94,12 @@
             ),
             $inDowntimeLink,
             null,
-            null,
-            false
+            array('icon' => 'plug')
         ); ?></h2>
       <?php endif ?>
       <?php if (($commentCount = count($objects->getComments())) > 0): ?>
         <h2><?= $this->qlink(
-            $this->icon('comment') . ' ' . sprintf(
+            sprintf(
                 $this->translatePlural(
                     'List %u host comment',
                     'List %u host comments',
@@ -121,8 +109,7 @@
             ),
             $commentsLink,
             null,
-            null,
-            false
+            array('icon' => 'comment')
         ); ?></h2>
       <?php endif ?>
     <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 78435fa3e..878b394c7 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -17,16 +17,15 @@
     foreach ($contacts as $contact): ?>
         <div class="contact">
             <?= $this->img('/static/gravatar', array('email' => $contact->contact_email)); ?>
-            <?= $this->qlink(
-                '<strong>' . $this->escape($contact->contact_name) . '</strong>',
+            <strong><?= $this->qlink(
+                $contact->contact_name,
                 'monitoring/show/contact',
                 array('contact' => $contact->contact_name),
                 array('title' => sprintf(
                     $this->translate('Show detailed information about %s'),
                     $contact->contact_alias
-                )),
-                false
-            ); ?> (<?= $contact->contact_alias; ?>)
+                ))
+            ); ?></strong> (<?= $contact->contact_alias; ?>)
             <div>
                 <?= $this->translate('Email'); ?>: <a href="mailto:<?= $contact->contact_email; ?>" title="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias); ?>" aria-label="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias); ?>">
                     <?= $this->escape($contact->contact_email); ?>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index cc88b09e3..015fecb95 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -14,31 +14,22 @@
             <?= $checkNowForm; ?>
         </div>
         <div><?= $this->qlink(
-            $this->icon('reschedule') . ' ' . sprintf(
-                $this->translate('Reschedule the next check for all %u services'),
-                $serviceCount
-            ),
+            sprintf($this->translate('Reschedule the next check for all %u services'), $serviceCount),
             $rescheduleAllLink,
             null,
-            null,
-            false
+            array('icon' => 'reschedule')
         ); ?></div>
         <div><?= $this->qlink(
-            $this->icon('plug') . ' ' . sprintf($this->translate('Schedule a downtime for all %u services'), $serviceCount),
+            sprintf($this->translate('Schedule a downtime for all %u services'), $serviceCount),
             $downtimeAllLink,
             null,
-            null,
-            false
+            array('icon' => 'plug')
         ); ?></div>
         <div><?= $this->qlink(
-            $this->icon('reply') . ' ' . sprintf(
-                $this->translate('Submit a passive check result for all %u services'),
-                $serviceCount
-            ),
+            sprintf($this->translate('Submit a passive check result for all %u services'), $serviceCount),
             $processCheckResultAllLink,
             null,
-            null,
-            false
+            array('icon' => 'reply')
         ); ?></div>
       <?php if (($unhandledCount = count($unhandledObjects)) > 0): ?>
         <div>
@@ -51,7 +42,7 @@
                 $unhandledCount
             ); ?></h3>
             <div><?= $this->qlink(
-                $this->icon('plug') . ' ' . sprintf(
+                sprintf(
                     $this->translatePlural(
                         'Schedule a downtime for %u unhandled service problem',
                         'Schedule a downtime for %u unhandled service problems',
@@ -61,11 +52,10 @@
                 ),
                 $downtimeUnhandledLink,
                 null,
-                null,
-                false
+                array('icon' => 'plug')
             ); ?></div>
             <div><?= $this->qlink(
-                $this->icon('ok') . ' ' . sprintf(
+                sprintf(
                     $this->translatePlural(
                         'Acknowledge %u unhandled service problem',
                         'Acknowledge %u unhandled service problems',
@@ -75,8 +65,7 @@
                 ),
                 $acknowledgeUnhandledLink,
                 null,
-                null,
-                false
+                array('icon' => 'ok')
             ); ?></div>
         </div>
       <?php endif ?>
@@ -95,7 +84,7 @@
       <?php endif ?>
       <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0): ?>
         <h2><?= $this->qlink(
-            $this->icon('plug') . ' ' . sprintf(
+            sprintf(
                 $this->translatePlural(
                     'List %u service currently in downtime',
                     'List %u services currently in downtime',
@@ -105,13 +94,12 @@
             ),
             $inDowntimeLink,
             null,
-            null,
-            false
+            array('icon' => 'plug')
         ); ?></h2>
       <?php endif ?>
       <?php if (($commentCount = count($objects->getComments())) > 0): ?>
         <h2><?= $this->qlink(
-            $this->icon('comment') . ' ' . sprintf(
+            sprintf(
                 $this->translatePlural(
                     'List %u service comment',
                     'List %u service comments',
@@ -121,8 +109,7 @@
             ),
             $commentsLink,
             null,
-            null,
-            false
+            array('icon' => 'comment')
         ); ?></h2>
       <?php endif ?>
     <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index e5f85c021..22a372151 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -36,13 +36,15 @@ if ($object->acknowledged): ?>
                 }
             ?>
             <?= $this->qlink(
-                $this->icon('ok') . ' ' . $this->translate('Acknowledge'),
+                $this->translate('Acknowledge'),
                 $ackLink,
                 null,
-                array('title' => $this->translate(
-                    'Acknowledge this problem, suppress all future notifications for it and tag it as being handled'
-                )),
-                false
+                array(
+                    'icon'  => 'ok',
+                    'title' => $this->translate(
+                        'Acknowledge this problem, suppress all future notifications for it and tag it as being handled'
+                    )
+                )
             ); ?>
             <?php } else {
                 echo '&#45;';
diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index 7feab9339..639437a03 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -29,29 +29,29 @@ if ($object->getType() === $object::TYPE_HOST) {
       <?php if ($this->hasPermission('monitoring/command/schedule-check')) {
           if ($isService) {
               echo $this->qlink(
-                  $this->icon('reschedule') . ' ' . $this->translate('Reschedule'),
+                  $this->translate('Reschedule'),
                   'monitoring/service/reschedule-check',
                   array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
                   array(
+                      'icon'                => 'reschedule',
                       'data-base-target'    => '_self',
                       'title'               => $this->translate(
                           'Schedule the next active check at a different time than the current one'
                       )
-                  ),
-                  false
+                  )
               );
           } else {
               echo $this->qlink(
-                  $this->icon('reschedule') . ' ' . $this->translate('Reschedule'),
+                  $this->translate('Reschedule'),
                   'monitoring/host/reschedule-check',
                   array('host' => $object->getName()),
                   array(
+                      'icon'                => 'reschedule',
                       'data-base-target'    => '_self',
                       'title'               => $this->translate(
                           'Schedule the next active check at a different time than the current one'
                       )
-                  ),
-                  false
+                  )
               );
           }
       } ?> <?= $this->timeUntil($object->next_check) ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/command.phtml b/modules/monitoring/application/views/scripts/show/components/command.phtml
index 771e0812c..d7fca7cfa 100644
--- a/modules/monitoring/application/views/scripts/show/components/command.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/command.phtml
@@ -13,19 +13,25 @@ $command = array_shift($parts);
             $title = sprintf($this->translate('Submit a one time or so called passive result for the %s check'), $command);
             if ($object->getType() === $object::TYPE_HOST) {
                 echo $this->qlink(
-                    $this->icon('reply') . ' ' . $this->translate('Process check result'),
+                    $this->translate('Process check result'),
                     'monitoring/host/process-check-result',
                     array('host' => $object->getName()),
-                    array('data-base-target' => '_self', 'title' => $title),
-                    false
+                    array(
+                        'icon'              => 'reply',
+                        'data-base-target'  => '_self',
+                        'title'             => $title
+                    )
                 );
             } else {
                 echo $this->qlink(
-                    $this->icon('reply') . ' ' . $this->translate('Process check result'),
+                    $this->translate('Process check result'),
                     'monitoring/service/process-check-result',
                     array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
-                    array('data-base-target' => '_self', 'title' => $title),
-                    false
+                    array(
+                        'icon'              => 'reply',
+                        'data-base-target'  => '_self',
+                        'title'             => $title
+                    )
                 );
             }
         } ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index 74da7d054..fa7d4606a 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -5,25 +5,25 @@
             /** @type \Icinga\Module\Monitoring\Object\MonitoredObject $object */
             if ($object->getType() === $object::TYPE_HOST) {
                 echo $this->qlink(
-                    $this->icon('comment') . ' ' . $this->translate('Add comment'),
+                    $this->translate('Add comment'),
                     'monitoring/host/add-comment',
                     array('host' => $object->getName()),
                     array(
+                        'icon'              => 'comment',
                         'data-base-target'  => '_self',
                         'title'             => $this->translate('Add a new comment to this host')
-                    ),
-                    false
+                    )
                 );
             } else {
                 echo $this->qlink(
-                    $this->icon('comment') . ' ' . $this->translate('Add comment'),
+                    $this->translate('Add comment'),
                     'monitoring/service/add-comment',
                     array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
                     array(
+                        'icon'              => 'comment',
                         'data-base-target'  => '_self',
                         'title'             => $this->translate('Add a new comment to this service')
-                    ),
-                    false
+                    )
                 );
             }
         } else {
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 16f12f6ba..76a4be005 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -5,29 +5,29 @@
             /** @type \Icinga\Module\Monitoring\Object\MonitoredObject $object */
             if ($object->getType() === $object::TYPE_HOST) {
                 echo $this->qlink(
-                    $this->icon('plug') . ' ' . $this->translate('Schedule downtime'),
+                    $this->translate('Schedule downtime'),
                     'monitoring/host/schedule-downtime',
                     array('host' => $object->getName()),
                     array(
+                        'icon'              => 'plug',
                         'data-base-target'  => '_self',
                         'title'             => $this->translate(
                             'Schedule a downtime to suppress all problem notifications within a specific period of time'
                         )
-                    ),
-                    false
+                    )
                 );
             } else {
                 echo $this->qlink(
-                    $this->icon('plug') . ' ' . $this->translate('Schedule downtime'),
+                    $this->translate('Schedule downtime'),
                     'monitoring/service/schedule-downtime',
                     array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
                     array(
+                        'icon'              => 'plug',
                         'data-base-target'  => '_self',
                         'title'             => $this->translate(
                             'Schedule a downtime to suppress all problem notifications within a specific period of time'
                         )
-                    ),
-                    false
+                    )
                 );
             }
         } else {
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index d55258d90..0542294d6 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -141,7 +141,7 @@ $output = $this->tickets ? preg_replace_callback(
           <?= sprintf(
               $this->translate('%s on %s', 'Service running on host'),
               $hostContext ? $this->qlink(
-                  $this->escape($event->service_display_name),
+                  $event->service_display_name,
                   'monitoring/show/service',
                   array(
                       'host' => $event->host_name,

From b70cda77d450a226382f5965ada170ae0c61d785 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 24 Feb 2015 12:22:29 +0100
Subject: [PATCH 0795/2920] Fail gracefully if the page control is not
 available

Execute the runPagedQuery without pagination instead of throwing an exception.

fixes #8490
---
 library/Icinga/Protocol/Ldap/Connection.php | 58 +++++++++++++++++----
 1 file changed, 48 insertions(+), 10 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 6db88365a..3d9ae90ab 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -4,6 +4,7 @@
 namespace Icinga\Protocol\Ldap;
 
 use Exception;
+use Icinga\Exception\ProgrammingError;
 use Icinga\Protocol\Ldap\Exception as LdapException;
 use Icinga\Application\Platform;
 use Icinga\Application\Config;
@@ -267,13 +268,22 @@ class Connection
         $this->connect();
         $this->bind();
 
-        if ($query->getUsePagedResults() && version_compare(PHP_VERSION, '5.4.0') >= 0) {
+        if ($this->pageControlAvailable($query)) {
             return $this->runPagedQuery($query, $fields);
         } else {
             return $this->runQuery($query, $fields);
         }
     }
 
+    /**
+     * Execute the given LDAP query and return the resulting entries
+     *
+     * @param Query $query      The query to execute
+     * @param array $fields     The fields that will be fetched from the matches
+     *
+     * @return array            The matched entries
+     * @throws LdapException
+     */
     protected function runQuery(Query $query, $fields = array())
     {
         $limit = $query->getLimit();
@@ -322,8 +332,35 @@ class Connection
         return $entries;
     }
 
-    protected function runPagedQuery(Query $query, $fields = array())
+    /**
+     * Returns whether requesting the page control is available
+     */
+    protected function pageControlAvailable(Query $query)
     {
+        return $query->getUsePagedResults() && version_compare(PHP_VERSION, '5.4.0') >= 0;
+    }
+
+    /**
+     * Execute the given LDAP query while requesting pagination control to separate
+     * big responses into smaller chunks
+     *
+     * @param Query $query      The query to execute
+     * @param array $fields     The fields that will be fetched from the matches
+     * @param int   $page_size  The maximum page size, defaults to Connection::PAGE_SIZE
+     *
+     * @return array            The matched entries
+     * @throws LdapException
+     * @throws ProgrammingError When executed without available page controls (check with pageControlAvailable() )
+     */
+    protected function runPagedQuery(Query $query, $fields = array(), $pageSize = null)
+    {
+        if (! $this->pageControlAvailable($query)) {
+            throw new ProgrammingError('LDAP: Page control not available.');
+        }
+        if (! isset($pageSize)) {
+            $pageSize = static::PAGE_SIZE;
+        }
+
         $limit = $query->getLimit();
         $offset = $query->hasOffset() ? $query->getOffset() - 1 : 0;
         $queryString = $query->create();
@@ -337,7 +374,10 @@ class Connection
         $cookie = '';
         $entries = array();
         do {
-            ldap_control_paged_result($this->ds, static::PAGE_SIZE, true, $cookie);
+            // do not set controlPageResult as a critical extension, since we still want the
+            // server to return an answer in case the pagination extension is missing.
+            ldap_control_paged_result($this->ds, $pageSize, false, $cookie);
+
             $results = @ldap_search($this->ds, $base, $queryString, $fields, 0, $limit ? $offset + $limit : 0);
             if ($results === false) {
                 if (ldap_errno($this->ds) === self::LDAP_NO_SUCH_OBJECT) {
@@ -375,18 +415,16 @@ class Connection
                 }
             } while (($limit === 0 || $limit !== count($entries)) && ($entry = ldap_next_entry($this->ds, $entry)));
 
-            try {
-                ldap_control_paged_result_response($this->ds, $results, $cookie);
-            } catch (Exception $e) {
+            if (false === ldap_control_paged_result_response($this->ds, $results, $cookie)) {
                 // If the page size is greater than or equal to the sizeLimit value, the server should ignore the
                 // control as the request can be satisfied in a single page: https://www.ietf.org/rfc/rfc2696.txt
                 // This applies no matter whether paged search requests are permitted or not. You're done once you
                 // got everything you were out for.
                 if (count($entries) !== $limit) {
-                    Logger::warning(
-                        'Unable to request paged LDAP results. Does the server allow paged search requests? (%s)',
-                        $e->getMessage()
-                    );
+
+                    // The server does not support pagination, but still returned a response by ignoring the
+                    // pagedResultsControl. We output a warning to indicate that the pagination control was ignored.
+                    Logger::warning('Unable to request paged LDAP results. Does the server allow paged search requests?');
                 }
             }
 

From d4dc0177c0880ca3324b6854b219cef2d2ce9300 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 24 Feb 2015 12:50:57 +0100
Subject: [PATCH 0796/2920] Sort LDAP user list

fixes #7693
---
 library/Icinga/Protocol/Ldap/Connection.php          | 2 +-
 modules/setup/application/forms/AdminAccountPage.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 3d9ae90ab..1cd979a74 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -442,7 +442,7 @@ class Connection
             ldap_control_paged_result($this->ds, 0);
         }
 
-        return $entries; // TODO(7693): Sort entries post-processed
+        return $entries;
     }
 
     protected function cleanupAttributes($attrs)
diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index de8650439..485baa64f 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -309,7 +309,9 @@ class AdminAccountPage extends Form
         }
 
         try {
-            return $backend->listUsers();
+            $users = $backend->listUsers();
+            natsort ($users);
+            return $users;
         } catch (Exception $e) {
             // No need to handle anything special here. Error means no users found.
             return array();

From d68c636359c65089a10ead606342d7024a715c96 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 24 Feb 2015 13:15:59 +0100
Subject: [PATCH 0797/2920] Wizard: Disable the browser's form validation when
 navigating back

formnovalidate... The fukin awesomeness of HTML5 is sometimes
even impressing a god-damned h4x0r like me.

fixes #8507
---
 library/Icinga/Web/Wizard.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/library/Icinga/Web/Wizard.php b/library/Icinga/Web/Wizard.php
index 0ef9b8212..d25cd56e5 100644
--- a/library/Icinga/Web/Wizard.php
+++ b/library/Icinga/Web/Wizard.php
@@ -612,10 +612,11 @@ class Wizard
                 'button',
                 static::BTN_PREV,
                 array(
-                    'type'          => 'submit',
-                    'value'         => $pages[$index - 1]->getName(),
-                    'label'         => t('Back'),
-                    'decorators'    => array('ViewHelper')
+                    'type'              => 'submit',
+                    'value'             => $pages[$index - 1]->getName(),
+                    'label'             => t('Back'),
+                    'decorators'        => array('ViewHelper'),
+                    'formnovalidate'    => 'formnovalidate'
                 )
             );
             $page->addElement(
@@ -633,10 +634,11 @@ class Wizard
                 'button',
                 static::BTN_PREV,
                 array(
-                    'type'          => 'submit',
-                    'value'         => $pages[$index - 1]->getName(),
-                    'label'         => t('Back'),
-                    'decorators'    => array('ViewHelper')
+                    'type'              => 'submit',
+                    'value'             => $pages[$index - 1]->getName(),
+                    'label'             => t('Back'),
+                    'decorators'        => array('ViewHelper'),
+                    'formnovalidate'    => 'formnovalidate'
                 )
             );
             $page->addElement(

From 3b2e3dcd36728c8ddc1b3b4f872ca70fa9bcc4e6 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 25 Feb 2015 12:07:59 +0100
Subject: [PATCH 0798/2920] Revert the animate-spin css to the original

refs #7968
---
 application/fonts/fontello-ifont/css/animation.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/fonts/fontello-ifont/css/animation.css b/application/fonts/fontello-ifont/css/animation.css
index 578d766f5..ac5a9562f 100644
--- a/application/fonts/fontello-ifont/css/animation.css
+++ b/application/fonts/fontello-ifont/css/animation.css
@@ -6,7 +6,7 @@
   -o-animation: spin 2s infinite linear;
   -webkit-animation: spin 2s infinite linear;
   animation: spin 2s infinite linear;
-  /*display: inline-block;*/
+  display: inline-block;
 }
 @-moz-keyframes spin {
   0% {

From 4505718ecc22241d967cbe85298d2ee7aa161421 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 25 Feb 2015 12:10:08 +0100
Subject: [PATCH 0799/2920] Move spinner indicator functionality to linkClicked
 method

refs #7968
---
 public/js/icinga/events.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 814750a71..a3ee35dfa 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -115,8 +115,6 @@
             $(document).on('click', 'a', { self: this }, this.linkClicked);
             $(document).on('click', 'tr[href]', { self: this }, this.linkClicked);
 
-            $(document).on('click', '.refresh', { self: this }, this.refreshContent);
-
             // Select a table row
             $(document).on('click', 'table.multiselect tr[href]', { self: this }, this.rowSelected);
 
@@ -440,6 +438,11 @@
                 return;
             }
 
+            // activate spinner indicator
+            if ($a.hasClass('spinner')) {
+                $a.addClass('active');
+            }
+
             // If link has hash tag...
             if (href.match(/#/)) {
                 if (href === '#') {
@@ -483,11 +486,6 @@
             return false;
         },
 
-        refreshContent: function () {
-            var $icon = $(this).children('i');
-            $icon.addClass($icon.data('load-class'));
-        },
-
         /**
          * Detect the link/form target for a given element (link, form, whatever)
          */

From c583a351bb5406ef9e3204e3d2eda74b9ca4c65a Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 25 Feb 2015 12:11:58 +0100
Subject: [PATCH 0800/2920] Add .spinner css definition

refs #7968
---
 public/css/icinga/tabs.less | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/public/css/icinga/tabs.less b/public/css/icinga/tabs.less
index e776469e0..86191860d 100644
--- a/public/css/icinga/tabs.less
+++ b/public/css/icinga/tabs.less
@@ -136,3 +136,14 @@ ul.tabs img.icon {
 a.close-tab {
   display: none;
 }
+
+.spinner > i {
+  line-height: 1;
+}
+
+.spinner.active > i  {
+  .animate-spin();
+  &:before {
+    content: '\e874';
+  }
+}

From 481c58ec039917ae7d1368a60f93bbd3bdb223c6 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 25 Feb 2015 12:14:26 +0100
Subject: [PATCH 0801/2920] Add accessibility to renderRefreshTab

refs #7968
---
 library/Icinga/Web/Widget/Tab.php  |  5 +++++
 library/Icinga/Web/Widget/Tabs.php | 31 ++++++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index 94e2bc678..a54f29db6 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -123,6 +123,11 @@ class Tab extends AbstractWidget
         $this->label = $label;
     }
 
+    public function getLabel()
+    {
+        return $this->label;
+    }
+
     /**
      * @param mixed $title
      */
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index 64b898e50..afe5673b9 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -68,7 +68,9 @@ EOT;
      */
     private $refreshTpl = <<< 'EOT'
 <li>
-  <a class="refresh" href="{URL}"><i aria-hidden="true" class="icon-cw" data-load-class="icon-spin6 animate-spin"></i></a>
+  <a class="spinner" href="{URL}" title="{TITLE}" aria-label="{LABEL}">
+    <i aria-hidden="true" class="icon-cw"></i>
+  </a>
 </li>
 EOT;
 
@@ -330,7 +332,32 @@ EOT;
     private function renderRefreshTab()
     {
         $url = Url::fromRequest()->without('renderLayout');
-        $tpl = str_replace('{URL}', $url, $this->refreshTpl);
+        $tab = $this->get($this->getActiveName());
+
+        if ($tab !== null) {
+            $caption = Icinga::app()->getViewRenderer()->view->escape(
+                $tab->getLabel()
+            );
+        } else {
+            $caption = t('Content');
+        }
+
+        $label = t(sprintf('Refresh the %s', $caption));
+        $title = $label;
+
+        $tpl = str_replace(
+            array(
+                '{URL}',
+                '{TITLE}',
+                '{LABEL}'
+            ),
+            array(
+                $url,
+                $title,
+                $label
+            ),
+            $this->refreshTpl
+        );
 
         return $tpl;
     }

From e219bb1664f925668c8a7eb71b78cb4a5577f6c7 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 25 Feb 2015 13:13:22 +0100
Subject: [PATCH 0802/2920] Add doc for the label

refs #7968
---
 library/Icinga/Web/Widget/Tab.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index a54f29db6..c7fb30ff8 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -42,6 +42,11 @@ class Tab extends AbstractWidget
      */
     private $title = '';
 
+    /**
+     * The label displayed for this tab
+     *
+     * @var string
+     */
     private $label = '';
 
     /**
@@ -118,11 +123,21 @@ class Tab extends AbstractWidget
         return $this->name;
     }
 
+    /**
+     * Set the tab label
+     *
+     * @param string $label
+     */
     public function setLabel($label)
     {
         $this->label = $label;
     }
 
+    /**
+     * Get the tab label
+     *
+     * @return string
+     */
     public function getLabel()
     {
         return $this->label;

From 8669dcb078952ed6f3192ba861f5c1e0a9ffbac6 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 25 Feb 2015 13:23:12 +0100
Subject: [PATCH 0803/2920] Add font-family to the active spinner icon

refs #7968
---
 public/css/icinga/tabs.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/css/icinga/tabs.less b/public/css/icinga/tabs.less
index 86191860d..aaef3c7d4 100644
--- a/public/css/icinga/tabs.less
+++ b/public/css/icinga/tabs.less
@@ -144,6 +144,7 @@ a.close-tab {
 .spinner.active > i  {
   .animate-spin();
   &:before {
+    font-family: "ifont";
     content: '\e874';
   }
 }

From 3a2b69a63ceedeb5e48c354e36eb74e5db11026b Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 25 Feb 2015 13:24:11 +0100
Subject: [PATCH 0804/2920] Remove refreshTab property from Tabs

refs #7968
---
 library/Icinga/Web/Widget/Tabs.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index afe5673b9..b9a9a539d 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -116,13 +116,6 @@ EOT;
      */
     private $title;
 
-    /**
-     * Whether the tabs should contain a refresh icon
-     *
-     * @var bool
-     */
-    private $refreshTab = true;
-
     /**
      * Set whether the current tab is closable
      */
@@ -335,7 +328,7 @@ EOT;
         $tab = $this->get($this->getActiveName());
 
         if ($tab !== null) {
-            $caption = Icinga::app()->getViewRenderer()->view->escape(
+            $caption = $this->view()->escape(
                 $tab->getLabel()
             );
         } else {
@@ -377,7 +370,7 @@ EOT;
             $drop = $this->renderDropdownTabs();
         }
         $close = $this->closeTab ? $this->renderCloseTab() : '';
-        $refresh = $this->refreshTab ? $this->renderRefreshTab() : '';
+        $refresh = $this->renderRefreshTab();
 
         return str_replace(
             array(

From 85e6fce86770b374a21e672b422a3a5cf7ae3655 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 25 Feb 2015 13:33:42 +0100
Subject: [PATCH 0805/2920] Rename Platform::zendClassExists() to
 Platform::classExists()

---
 library/Icinga/Application/Platform.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Application/Platform.php b/library/Icinga/Application/Platform.php
index a2ef0a3ef..355311b97 100644
--- a/library/Icinga/Application/Platform.php
+++ b/library/Icinga/Application/Platform.php
@@ -182,19 +182,24 @@ class Platform
     }
 
     /**
-     * Return whether the given Zend framework class exists
+     * Return whether the given class exists
      *
      * @param   string  $name   The name of the class to check
      *
      * @return  bool
      */
-    public static function zendClassExists($name)
+    public static function classExists($name)
     {
         if (@class_exists($name)) {
             return true;
         }
 
-        return (@include str_replace('_', '/', $name) . '.php') !== false;
+        if (strpos($name, '_') !== false) {
+            // Assume it's a Zend-Framework class
+            return (@include str_replace('_', '/', $name) . '.php') !== false;
+        }
+
+        return false;
     }
 
     /**
@@ -206,7 +211,7 @@ class Platform
      */
     public static function hasMysqlSupport()
     {
-        return static::extensionLoaded('mysql') && static::zendClassExists('Zend_Db_Adapter_Pdo_Mysql');
+        return static::extensionLoaded('mysql') && static::classExists('Zend_Db_Adapter_Pdo_Mysql');
     }
 
     /**
@@ -218,6 +223,6 @@ class Platform
      */
     public static function hasPostgresqlSupport()
     {
-        return static::extensionLoaded('pgsql') && static::zendClassExists('Zend_Db_Adapter_Pdo_Pgsql');
+        return static::extensionLoaded('pgsql') && static::classExists('Zend_Db_Adapter_Pdo_Pgsql');
     }
 }

From ef79d6bc12ba85f27cd39cf37acc2eb2cf0bce38 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 25 Feb 2015 13:34:58 +0100
Subject: [PATCH 0806/2920] Replace spinner.active font-family css definition
 with a note

refs #7968
---
 public/css/icinga/tabs.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/icinga/tabs.less b/public/css/icinga/tabs.less
index aaef3c7d4..4d7f43146 100644
--- a/public/css/icinga/tabs.less
+++ b/public/css/icinga/tabs.less
@@ -144,7 +144,7 @@ a.close-tab {
 .spinner.active > i  {
   .animate-spin();
   &:before {
-    font-family: "ifont";
+    // icon-spin6
     content: '\e874';
   }
 }

From 24d0999fa45800e96b02032e05f5ad6a50dfa7cb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 25 Feb 2015 13:38:38 +0100
Subject: [PATCH 0807/2920] Register requirements as objects

This neutralizes the need for a unique name per requirement as
requirements are now compared based on their type and condition.
It also allows to implement a solution to add simple conditional
requirements.

refs #8508
---
 .../scripts/form/setup-requirements.phtml     |  18 +-
 modules/setup/library/Setup/Requirement.php   | 279 ++++++++++++++++++
 modules/setup/library/Setup/Requirements.php  | 149 ++--------
 3 files changed, 316 insertions(+), 130 deletions(-)
 create mode 100644 modules/setup/library/Setup/Requirement.php

diff --git a/modules/setup/application/views/scripts/form/setup-requirements.phtml b/modules/setup/application/views/scripts/form/setup-requirements.phtml
index b3cf30101..09ca98d7f 100644
--- a/modules/setup/application/views/scripts/form/setup-requirements.phtml
+++ b/modules/setup/application/views/scripts/form/setup-requirements.phtml
@@ -1,7 +1,6 @@
 <?php
 
 use Icinga\Web\Wizard;
-use Icinga\Module\Setup\Requirements;
 
 $requirements = $form->getRequirements();
 
@@ -10,21 +9,22 @@ $requirements = $form->getRequirements();
   <tbody>
 <?php foreach ($requirements as $requirement): ?>
     <tr>
-      <td><h2><?= $requirement->title; ?></h2></td>
+      <td><h2><?= $requirement->getTitle(); ?></h2></td>
       <td style="width: 50%">
-      <?php if (is_array($requirement->description)): ?>
+      <?php $descriptions = $requirement->getDescriptions(); ?>
+      <?php if (count($descriptions) > 1): ?>
         <ul>
-        <?php foreach ($requirement->description as $desc): ?>
+        <?php foreach ($descriptions as $desc): ?>
           <li><?= $desc; ?></li>
         <?php endforeach ?>
         </ul>
-      <?php else: ?>
-        <?= $requirement->description; ?>
+      <?php elseif (! empty($descriptions)): ?>
+        <?= $descriptions[0]; ?>
       <?php endif ?>
       </td>
-      <td class="state <?= $requirement->state === Requirements::STATE_OK ? 'fulfilled' : (
-        $requirement->state === Requirements::STATE_OPTIONAL ? 'not-available' : 'missing'
-      ); ?>"><?= $requirement->message; ?></td>
+      <td class="state <?= $requirement->getState() ? 'fulfilled' : (
+        $requirement->isOptional() ? 'not-available' : 'missing'
+      ); ?>"><?= $requirement->getStateText(); ?></td>
     </tr>
 <?php endforeach ?>
     <tr>
diff --git a/modules/setup/library/Setup/Requirement.php b/modules/setup/library/Setup/Requirement.php
new file mode 100644
index 000000000..37bb5663e
--- /dev/null
+++ b/modules/setup/library/Setup/Requirement.php
@@ -0,0 +1,279 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Setup;
+
+use LogicException;
+
+abstract class Requirement
+{
+    /**
+     * The state of this requirement
+     *
+     * @var bool
+     */
+    protected $state;
+
+    /**
+     * A descriptive text representing the current state of this requirement
+     *
+     * @var string
+     */
+    protected $stateText;
+
+    /**
+     * The descriptions of this requirement
+     *
+     * @var array
+     */
+    protected $descriptions;
+
+    /**
+     * The title of this requirement
+     *
+     * @var string
+     */
+    protected $title;
+
+    /**
+     * The condition of this requirement
+     *
+     * @var mixed
+     */
+    protected $condition;
+
+    /**
+     * Whether this requirement is optional
+     *
+     * @var bool
+     */
+    protected $optional;
+
+    /**
+     * The alias to display the condition with in a human readable way
+     *
+     * @var string
+     */
+    protected $alias;
+
+    /**
+     * Create a new requirement
+     *
+     * @param   array   $options
+     *
+     * @throws  LogicException  In case there exists no setter for an option's key
+     */
+    public function __construct(array $options = array())
+    {
+        $this->optional = false;
+        $this->descriptions = array();
+
+        foreach ($options as $key => $value) {
+            $setMethod = 'set' . ucfirst($key);
+            $addMethod = 'add' . ucfirst($key);
+            if (method_exists($this, $setMethod)) {
+                $this->$setMethod($value);
+            } elseif (method_exists($this, $addMethod)) {
+                $this->$addMethod($value);
+            } else {
+                throw LogicException('No setter found for option key: ' . $key);
+            }
+        }
+    }
+
+    /**
+     * Set the state of this requirement
+     *
+     * @param   bool    $state
+     *
+     * @return  Requirement
+     */
+    public function setState($state)
+    {
+        $this->state = (bool) $state;
+        return $this;
+    }
+
+    /**
+     * Return the state of this requirement
+     *
+     * Evaluates the requirement in case there is no state set yet.
+     *
+     * @return  int
+     */
+    public function getState()
+    {
+        if ($this->state === null) {
+            $this->state = $this->evaluate();
+        }
+
+        return $this->state;
+    }
+
+    /**
+     * Set a descriptive text for this requirement's current state
+     *
+     * @param   string  $text
+     *
+     * @return  Requirement
+     */
+    public function setStateText($text)
+    {
+        $this->stateText = $text;
+        return $this;
+    }
+
+    /**
+     * Return a descriptive text for this requirement's current state
+     *
+     * @return  string
+     */
+    public function getStateText()
+    {
+        return $this->stateText;
+    }
+
+    /**
+     * Add a description for this requirement
+     *
+     * @param   string  $description
+     *
+     * @return  Requirement
+     */
+    public function addDescription($description)
+    {
+        $this->descriptions[] = $description;
+        return $this;
+    }
+
+    /**
+     * Return the descriptions of this wizard
+     *
+     * @return  array
+     */
+    public function getDescriptions()
+    {
+        return $this->descriptions;
+    }
+
+    /**
+     * Set the title for this requirement
+     *
+     * @param   string  $title
+     *
+     * @return  Requirement
+     */
+    public function setTitle($title)
+    {
+        $this->title = $title;
+        return $this;
+    }
+
+    /**
+     * Return the title of this requirement
+     *
+     * In case there is no title set the alias is returned instead.
+     *
+     * @return  string
+     */
+    public function getTitle()
+    {
+        if ($this->title === null) {
+            return $this->getAlias();
+        }
+
+        return $this->title;
+    }
+
+    /**
+     * Set the condition for this requirement
+     *
+     * @param   mixed   $condition
+     *
+     * @return  Requirement
+     */
+    public function setCondition($condition)
+    {
+        $this->condition = $condition;
+        return $this;
+    }
+
+    /**
+     * Return the condition of this requirement
+     *
+     * @return  mixed
+     */
+    public function getCondition()
+    {
+        return $this->condition;
+    }
+
+    /**
+     * Set whether this requirement is optional
+     *
+     * @param   bool    $state
+     *
+     * @return  Requirement
+     */
+    public function setOptional($state = true)
+    {
+        $this->optional = (bool) $state;
+        return $this;
+    }
+
+    /**
+     * Return whether this requirement is optional
+     *
+     * @return  bool
+     */
+    public function isOptional()
+    {
+        return $this->optional;
+    }
+
+    /**
+     * Set the alias to display the condition with in a human readable way
+     *
+     * @param   string  $alias
+     *
+     * @return  Requirement
+     */
+    public function setAlias($alias)
+    {
+        $this->alias = $alias;
+        return $this;
+    }
+
+    /**
+     * Return the alias to display the condition with in a human readable way
+     *
+     * @return  string
+     */
+    public function getAlias()
+    {
+        return $this->alias;
+    }
+
+    /**
+     * Evaluate this requirement and return whether it is fulfilled
+     *
+     * @return  bool
+     */
+    abstract protected function evaluate();
+
+    /**
+     * Return whether the given requirement equals this one
+     *
+     * @param   Requirement     $requirement
+     *
+     * @return  bool
+     */
+    public function equals(Requirement $requirement)
+    {
+        if ($requirement instanceof static) {
+            return $this->getCondition() === $requirement->getCondition();
+        }
+
+        return false;
+    }
+}
diff --git a/modules/setup/library/Setup/Requirements.php b/modules/setup/library/Setup/Requirements.php
index bede70aa0..e96a0f7ac 100644
--- a/modules/setup/library/Setup/Requirements.php
+++ b/modules/setup/library/Setup/Requirements.php
@@ -8,27 +8,9 @@ use IteratorAggregate;
 
 /**
  * Container to store and handle requirements
- *
- * TODO: Requirements should be registered as objects with a specific purpose (PhpModRequirement, PhpIniRequirement, ..)
- *       so that it's not necessary to define unique identifiers which may differ between different modules.
  */
 class Requirements implements IteratorAggregate
 {
-    /**
-     * Identifier representing the state OK
-     */
-    const STATE_OK = 2;
-
-    /**
-     * Identifier representing the state OPTIONAL
-     */
-    const STATE_OPTIONAL = 1;
-
-    /**
-     * Identifier representing the state MANDATORY
-     */
-    const STATE_MANDATORY = 0;
-
     /**
      * The registered requirements
      *
@@ -39,44 +21,35 @@ class Requirements implements IteratorAggregate
     /**
      * Register a requirement
      *
-     * @param   object  $requirement    The requirement to add
+     * @param   Requirement     $requirement    The requirement to add
      *
-     * @return  self
+     * @return  Requirements
      */
-    public function add($name, $requirement)
+    public function add(Requirement $requirement)
     {
-        $this->requirements[$name] = array_key_exists($name, $this->requirements)
-            ? $this->combine($this->requirements[$name], $requirement)
-            : $requirement;
+        $merged = false;
+        foreach ($this as $knownRequirement) {
+            if ($requirement->equals($knownRequirement)) {
+                if ($knownRequirement->isOptional() && !$requirement->isOptional()) {
+                    $knownRequirement->setOptional(false);
+                }
+
+                foreach ($requirement->getDescriptions() as $description) {
+                    $knownRequirement->addDescription($description);
+                }
+
+                $merged = true;
+                break;
+            }
+        }
+
+        if (! $merged) {
+            $this->requirements[] = $requirement;
+        }
+
         return $this;
     }
 
-    /**
-     * Combine the two given requirements
-     *
-     * Returns the most important requirement with the description from the other one being added.
-     *
-     * @param   object  $oldRequirement
-     * @param   object  $newRequirement
-     *
-     * @return  object
-     */
-    protected function combine($oldRequirement, $newRequirement)
-    {
-        if ($newRequirement->state === static::STATE_MANDATORY && $oldRequirement->state === static::STATE_OPTIONAL) {
-            $tempRequirement = $oldRequirement;
-            $oldRequirement = $newRequirement;
-            $newRequirement = $tempRequirement;
-        }
-
-        if (! is_array($oldRequirement->description)) {
-            $oldRequirement->description = array($oldRequirement->description);
-        }
-
-        $oldRequirement->description[] = $newRequirement->description;
-        return $oldRequirement;
-    }
-
     /**
      * Return all registered requirements
      *
@@ -97,83 +70,17 @@ class Requirements implements IteratorAggregate
         return new ArrayIterator($this->getAll());
     }
 
-    /**
-     * Register an optional requirement
-     *
-     * @param   string      $name
-     * @param   string      $title
-     * @param   string      $description
-     * @param   bool        $state
-     * @param   string      $message
-     *
-     * @return  self
-     */
-    public function addOptional($name, $title, $description, $state, $message)
-    {
-        $this->add(
-            $name,
-            (object) array(
-                'title'         => $title,
-                'message'       => $message,
-                'description'   => $description,
-                'state'         => (bool) $state ? static::STATE_OK : static::STATE_OPTIONAL
-            )
-        );
-        return $this;
-    }
-
-    /**
-     * Register a mandatory requirement
-     *
-     * @param   string      $name
-     * @param   string      $title
-     * @param   string      $description
-     * @param   bool        $state
-     * @param   string      $message
-     *
-     * @return  self
-     */
-    public function addMandatory($name, $title, $description, $state, $message)
-    {
-        $this->add(
-            $name,
-            (object) array(
-                'title'         => $title,
-                'message'       => $message,
-                'description'   => $description,
-                'state'         => (bool) $state ? static::STATE_OK : static::STATE_MANDATORY
-            )
-        );
-        return $this;
-    }
-
     /**
      * Register the given requirements
      *
      * @param   Requirements    $requirements   The requirements to register
      *
-     * @return  self
+     * @return  Requirements
      */
     public function merge(Requirements $requirements)
     {
-        foreach ($requirements->getAll() as $name => $requirement) {
-            $this->add($name, $requirement);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Make all registered requirements being optional
-     *
-     * @return  self
-     */
-    public function allOptional()
-    {
-        foreach ($this->getAll() as $requirement) {
-            if ($requirement->state === static::STATE_MANDATORY) {
-                $requirement->state = static::STATE_OPTIONAL;
-            }
+        foreach ($requirements as $requirement) {
+            $this->add($requirement);
         }
 
         return $this;
@@ -186,8 +93,8 @@ class Requirements implements IteratorAggregate
      */
     public function fulfilled()
     {
-        foreach ($this->getAll() as $requirement) {
-            if ($requirement->state === static::STATE_MANDATORY) {
+        foreach ($this as $requirement) {
+            if (! $requirement->getState() && !$requirement->isOptional()) {
                 return false;
             }
         }

From 04630a20beb53e500b5daf4fbd43f90b7325328c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 25 Feb 2015 13:39:59 +0100
Subject: [PATCH 0808/2920] Implement all known requirements as object

refs #8508
---
 .../library/Monitoring/MonitoringWizard.php   |  16 +-
 .../Setup/Requirement/ClassRequirement.php    |  28 ++
 .../ConfigDirectoryRequirement.php            |  42 +++
 .../Setup/Requirement/OSRequirement.php       |  27 ++
 .../Requirement/PhpConfigRequirement.php      |  22 ++
 .../Requirement/PhpModuleRequirement.php      |  42 +++
 .../Requirement/PhpVersionRequirement.php     |  28 ++
 modules/setup/library/Setup/WebWizard.php     | 245 ++++++++----------
 8 files changed, 296 insertions(+), 154 deletions(-)
 create mode 100644 modules/setup/library/Setup/Requirement/ClassRequirement.php
 create mode 100644 modules/setup/library/Setup/Requirement/ConfigDirectoryRequirement.php
 create mode 100644 modules/setup/library/Setup/Requirement/OSRequirement.php
 create mode 100644 modules/setup/library/Setup/Requirement/PhpConfigRequirement.php
 create mode 100644 modules/setup/library/Setup/Requirement/PhpModuleRequirement.php
 create mode 100644 modules/setup/library/Setup/Requirement/PhpVersionRequirement.php

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index 4e342aa75..3c7dee886 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -3,7 +3,6 @@
 
 namespace Icinga\Module\Monitoring;
 
-use Icinga\Application\Platform;
 use Icinga\Web\Form;
 use Icinga\Web\Wizard;
 use Icinga\Web\Request;
@@ -17,6 +16,7 @@ use Icinga\Module\Monitoring\Forms\Setup\InstancePage;
 use Icinga\Module\Monitoring\Forms\Setup\SecurityPage;
 use Icinga\Module\Monitoring\Forms\Setup\IdoResourcePage;
 use Icinga\Module\Monitoring\Forms\Setup\LivestatusResourcePage;
+use Icinga\Module\Setup\Requirement\PhpModuleRequirement;
 
 /**
  * Monitoring Module Setup Wizard
@@ -137,19 +137,15 @@ class MonitoringWizard extends Wizard implements SetupWizard
     {
         $requirements = new Requirements();
 
-        $requirements->addOptional(
-            'existing_php_mod_sockets',
-            mt('monitoring', 'PHP Module: Sockets'),
-            mt(
+        $requirements->add(new PhpModuleRequirement(array(
+            'optional'      => true,
+            'condition'     => 'Sockets',
+            'description'   => mt(
                 'monitoring',
                 'In case it\'s desired that a TCP connection is being used by Icinga Web 2 to'
                 . ' access a Livestatus interface, the Sockets module for PHP is required.'
-            ),
-            Platform::extensionLoaded('sockets'),
-            Platform::extensionLoaded('sockets') ? mt('monitoring', 'The PHP Module sockets is available.') : (
-                mt('monitoring', 'The PHP Module sockets is not available.')
             )
-        );
+        )));
 
         return $requirements;
     }
diff --git a/modules/setup/library/Setup/Requirement/ClassRequirement.php b/modules/setup/library/Setup/Requirement/ClassRequirement.php
new file mode 100644
index 000000000..e0f25cf4e
--- /dev/null
+++ b/modules/setup/library/Setup/Requirement/ClassRequirement.php
@@ -0,0 +1,28 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Setup\Requirement;
+
+use Icinga\Application\Platform;
+use Icinga\Module\Setup\Requirement;
+
+class ClassRequirement extends Requirement
+{
+    protected function evaluate()
+    {
+        $classNameOrPath = $this->getCondition();
+        if (Platform::classExists($classNameOrPath)) {
+            $this->setStateText(sprintf(
+                mt('setup', 'The %s is available.', 'setup.requirement.class'),
+                $this->getAlias() ?: $classNameOrPath . ' ' . mt('setup', 'class', 'setup.requirement.class')
+            ));
+            return true;
+        } else {
+            $this->setStateText(sprintf(
+                mt('setup', 'The %s is missing.', 'setup.requirement.class'),
+                $this->getAlias() ?: $classNameOrPath . ' ' . mt('setup', 'class', 'setup.requirement.class')
+            ));
+            return false;
+        }
+    }
+}
diff --git a/modules/setup/library/Setup/Requirement/ConfigDirectoryRequirement.php b/modules/setup/library/Setup/Requirement/ConfigDirectoryRequirement.php
new file mode 100644
index 000000000..3404717db
--- /dev/null
+++ b/modules/setup/library/Setup/Requirement/ConfigDirectoryRequirement.php
@@ -0,0 +1,42 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Setup\Requirement;
+
+use Icinga\Module\Setup\Requirement;
+
+class ConfigDirectoryRequirement extends Requirement
+{
+    public function getTitle()
+    {
+        $title = parent::getTitle();
+        if ($title === null) {
+            return mt('setup', 'Read- and writable configuration directory');
+        }
+
+        return $title;
+    }
+
+    protected function evaluate()
+    {
+        $path = $this->getCondition();
+        if (file_exists($path)) {
+            $readable = is_readable($path);
+            if ($readable && is_writable($path)) {
+                $this->setStateText(sprintf(mt('setup', 'The directory %s is read- and writable.'), $path));
+                return true;
+            } else {
+                $this->setStateText(sprintf(
+                    $readable
+                        ? mt('setup', 'The directory %s is not writable.')
+                        : mt('setup', 'The directory %s is not readable.'),
+                    $path
+                ));
+                return false;
+            }
+        } else {
+            $this->setStateText(sprintf(mt('setup', 'The directory %s does not exist.'), $path));
+            return false;
+        }
+    }
+}
diff --git a/modules/setup/library/Setup/Requirement/OSRequirement.php b/modules/setup/library/Setup/Requirement/OSRequirement.php
new file mode 100644
index 000000000..ff185bb3c
--- /dev/null
+++ b/modules/setup/library/Setup/Requirement/OSRequirement.php
@@ -0,0 +1,27 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Setup\Requirement;
+
+use Icinga\Application\Platform;
+use Icinga\Module\Setup\Requirement;
+
+class OSRequirement extends Requirement
+{
+    public function getTitle()
+    {
+        $title = parent::getTitle();
+        if ($title === null) {
+            return sprintf(mt('setup', '%s Platform'), ucfirst($this->getCondition()));
+        }
+
+        return $title;
+    }
+
+    protected function evaluate()
+    {
+        $phpOS = Platform::getOperatingSystemName();
+        $this->setStateText(sprintf(mt('setup', 'You are running PHP on a %s system.'), ucfirst($phpOS)));
+        return strtolower($phpOS) === strtolower($this->getCondition());
+    }
+}
diff --git a/modules/setup/library/Setup/Requirement/PhpConfigRequirement.php b/modules/setup/library/Setup/Requirement/PhpConfigRequirement.php
new file mode 100644
index 000000000..670c988e4
--- /dev/null
+++ b/modules/setup/library/Setup/Requirement/PhpConfigRequirement.php
@@ -0,0 +1,22 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Setup\Requirement;
+
+use Icinga\Application\Platform;
+use Icinga\Module\Setup\Requirement;
+
+class PhpConfigRequirement extends Requirement
+{
+    protected function evaluate()
+    {
+        list($configDirective, $value) = $this->getCondition();
+        $configValue = Platform::getPhpConfig($configDirective);
+        $this->setStateText(
+            $configValue
+                ? sprintf(mt('setup', 'The PHP config `%s\' is set to "%s".'), $configDirective, $configValue)
+                : sprintf(mt('setup', 'The PHP config `%s\' is not defined.'), $configDirective)
+        );
+        return is_bool($value) ? $configValue == $value : $configValue === $value;
+    }
+}
diff --git a/modules/setup/library/Setup/Requirement/PhpModuleRequirement.php b/modules/setup/library/Setup/Requirement/PhpModuleRequirement.php
new file mode 100644
index 000000000..6581797ce
--- /dev/null
+++ b/modules/setup/library/Setup/Requirement/PhpModuleRequirement.php
@@ -0,0 +1,42 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Setup\Requirement;
+
+use Icinga\Application\Platform;
+use Icinga\Module\Setup\Requirement;
+
+class PhpModuleRequirement extends Requirement
+{
+    public function getTitle()
+    {
+        $title = parent::getTitle();
+        if ($title === $this->getAlias()) {
+            if ($title === null) {
+                $title = $this->getCondition();
+            }
+
+            return sprintf(mt('setup', 'PHP Module: %s'), $title);
+        }
+
+        return $title;
+    }
+
+    protected function evaluate()
+    {
+        $moduleName = $this->getCondition();
+        if (Platform::extensionLoaded($moduleName)) {
+            $this->setStateText(sprintf(
+                mt('setup', 'The PHP module %s is available.'),
+                $this->getAlias() ?: $moduleName
+            ));
+            return true;
+        } else {
+            $this->setStateText(sprintf(
+                mt('setup', 'The PHP module %s is missing.'),
+                $this->getAlias() ?: $moduleName
+            ));
+            return false;
+        }
+    }
+}
diff --git a/modules/setup/library/Setup/Requirement/PhpVersionRequirement.php b/modules/setup/library/Setup/Requirement/PhpVersionRequirement.php
new file mode 100644
index 000000000..d6ca5f189
--- /dev/null
+++ b/modules/setup/library/Setup/Requirement/PhpVersionRequirement.php
@@ -0,0 +1,28 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Setup\Requirement;
+
+use Icinga\Application\Platform;
+use Icinga\Module\Setup\Requirement;
+
+class PhpVersionRequirement extends Requirement
+{
+    public function getTitle()
+    {
+        $title = parent::getTitle();
+        if ($title === null) {
+            return mt('setup', 'PHP Version');
+        }
+
+        return $title;
+    }
+
+    protected function evaluate()
+    {
+        $phpVersion = Platform::getPhpVersion();
+        $this->setStateText(sprintf(mt('setup', 'You are running PHP version %s.'), $phpVersion));
+        list($operator, $requiredVersion) = $this->getCondition();
+        return version_compare($phpVersion, $requiredVersion, $operator);
+    }
+}
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 7576adbb8..667237243 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -9,7 +9,6 @@ use Icinga\Web\Wizard;
 use Icinga\Web\Request;
 use Icinga\Application\Config;
 use Icinga\Application\Icinga;
-use Icinga\Application\Platform;
 use Icinga\Module\Setup\Forms\ModulePage;
 use Icinga\Module\Setup\Forms\WelcomePage;
 use Icinga\Module\Setup\Forms\SummaryPage;
@@ -29,8 +28,13 @@ use Icinga\Module\Setup\Steps\GeneralConfigStep;
 use Icinga\Module\Setup\Steps\ResourceStep;
 use Icinga\Module\Setup\Steps\AuthenticationStep;
 use Icinga\Module\Setup\Utils\EnableModuleStep;
-use Icinga\Module\Setup\Utils\MakeDirStep;
 use Icinga\Module\Setup\Utils\DbTool;
+use Icinga\Module\Setup\Requirement\OSRequirement;
+use Icinga\Module\Setup\Requirement\ClassRequirement;
+use Icinga\Module\Setup\Requirement\PhpConfigRequirement;
+use Icinga\Module\Setup\Requirement\PhpModuleRequirement;
+use Icinga\Module\Setup\Requirement\PhpVersionRequirement;
+use Icinga\Module\Setup\Requirement\ConfigDirectoryRequirement;
 
 /**
  * Icinga Web 2 Setup Wizard
@@ -351,194 +355,147 @@ class WebWizard extends Wizard implements SetupWizard
     {
         $requirements = new Requirements();
 
-        $phpVersion = Platform::getPhpVersion();
-        $requirements->addMandatory(
-            'php_version_>=_5_3_2',
-            mt('setup', 'PHP Version'),
-            mt(
+        $requirements->add(new PhpVersionRequirement(array(
+            'condition'     => array('>=', '5.3.2'),
+            'description'   => mt(
                 'setup',
                 'Running Icinga Web 2 requires PHP version 5.3.2. Advanced features'
                 . ' like the built-in web server require PHP version 5.4.'
-            ),
-            version_compare($phpVersion, '5.3.2', '>='),
-            sprintf(mt('setup', 'You are running PHP version %s.'), $phpVersion)
-        );
+            )
+        )));
 
-        $defaultTimezone = Platform::getPhpConfig('date.timezone');
-        $requirements->addMandatory(
-            'existing_default_timezone',
-            mt('setup', 'Default Timezone'),
-            sprintf(
+        $requirements->add(new PhpConfigRequirement(array(
+            'condition'     => array('date.timezone', true),
+            'title'         => mt('setup', 'Default Timezone'),
+            'description'   => sprintf(
                 mt('setup', 'It is required that a default timezone has been set using date.timezone in %s.'),
                 php_ini_loaded_file() ?: 'php.ini'
             ),
-            $defaultTimezone,
-            $defaultTimezone ? sprintf(mt('setup', 'Your default timezone is: %s'), $defaultTimezone) : (
-                mt('setup', 'You did not define a default timezone.')
-            )
-        );
+        )));
 
-        $requirements->addOptional(
-            'platform=linux',
-            mt('setup', 'Linux Platform'),
-            mt(
+        $requirements->add(new OSRequirement(array(
+            'optional'      => true,
+            'condition'     => 'linux',
+            'description'   => mt(
                 'setup',
                 'Icinga Web 2 is developed for and tested on Linux. While we cannot'
                 . ' guarantee they will, other platforms may also perform as well.'
-            ),
-            Platform::isLinux(),
-            sprintf(mt('setup', 'You are running PHP on a %s system.'), Platform::getOperatingSystemName())
-        );
-
-        $requirements->addMandatory(
-            'existing_php_mod_openssl',
-            mt('setup', 'PHP Module: OpenSSL'),
-            mt('setup', 'The PHP module for OpenSSL is required to generate cryptographically safe password salts.'),
-            Platform::extensionLoaded('openssl'),
-            Platform::extensionLoaded('openssl') ? mt('setup', 'The PHP module for OpenSSL is available.') : (
-                mt('setup', 'The PHP module for OpenSSL is missing.')
             )
-        );
+        )));
 
-        $requirements->addOptional(
-            'existing_php_mod_json',
-            mt('setup', 'PHP Module: JSON'),
-            mt('setup', 'The JSON module for PHP is required for various export functionalities as well as APIs.'),
-            Platform::extensionLoaded('json'),
-            Platform::extensionLoaded('json') ? mt('setup', 'The PHP module JSON is available.') : (
-                mt('setup', 'The PHP module JSON is missing.')
+        $requirements->add(new PhpModuleRequirement(array(
+            'condition'     => 'OpenSSL',
+            'description'   => mt(
+                'setup',
+                'The PHP module for OpenSSL is required to generate cryptographically safe password salts.'
             )
-        );
+        )));
 
-        $requirements->addOptional(
-            'existing_php_mod_ldap',
-            mt('setup', 'PHP Module: LDAP'),
-            mt('setup', 'If you\'d like to authenticate users using LDAP the corresponding PHP module is required'),
-            Platform::extensionLoaded('ldap'),
-            Platform::extensionLoaded('ldap') ? mt('setup', 'The PHP module LDAP is available') : (
-                mt('setup', 'The PHP module LDAP is missing')
+        $requirements->add(new PhpModuleRequirement(array(
+            'optional'      => true,
+            'condition'     => 'JSON',
+            'description'   => mt(
+                'setup',
+                'The JSON module for PHP is required for various export functionalities as well as APIs.'
             )
-        );
+        )));
 
-        $requirements->addOptional(
-            'existing_php_mod_intl',
-            mt('setup', 'PHP Module: INTL'),
-            mt(
+        $requirements->add(new PhpModuleRequirement(array(
+            'optional'      => true,
+            'condition'     => 'LDAP',
+            'description'   => mt(
+                'setup',
+                'If you\'d like to authenticate users using LDAP the corresponding PHP module is required.'
+            )
+        )));
+
+        $requirements->add(new PhpModuleRequirement(array(
+            'optional'      => true,
+            'condition'     => 'INTL',
+            'description'   => mt(
                 'setup',
                 'If you want your users to benefit from language, timezone and date/time'
                 . ' format negotiation, the INTL module for PHP is required.'
-            ),
-            Platform::extensionLoaded('intl'),
-            Platform::extensionLoaded('intl') ? mt('setup', 'The PHP module INTL is available') : (
-                mt('setup', 'The PHP module INTL is missing')
             )
-        );
+        )));
 
         // TODO(6172): Remove this requirement once we do not ship dompdf with Icinga Web 2 anymore
-        $requirements->addOptional(
-            'existing_php_mod_dom',
-            mt('setup', 'PHP Module: DOM'),
-            mt('setup', 'To be able to export views and reports to PDF, the DOM module for PHP is required.'),
-            Platform::extensionLoaded('dom'),
-            Platform::extensionLoaded('dom') ? mt('setup', 'The PHP module DOM is available') : (
-                mt('setup', 'The PHP module DOM is missing')
-            )
-        );
-
-        $requirements->addOptional(
-            'existing_php_mod_gd',
-            mt('setup', 'PHP Module: GD'),
-            mt(
+        $requirements->add(new PhpModuleRequirement(array(
+            'optional'      => true,
+            'condition'     => 'DOM',
+            'description'   => mt(
                 'setup',
-                'In case you want views being exported to PDF,'
-                . ' you\'ll need the GD extension for PHP.'
-            ),
-            Platform::extensionLoaded('gd'),
-            Platform::extensionLoaded('gd') ? mt('setup', 'The PHP module GD is available') : (
-                mt('setup', 'The PHP module GD is missing')
+                'To be able to export views and reports to PDF, the DOM module for PHP is required.'
             )
-        );
+        )));
 
-        $requirements->addOptional(
-            'existing_php_mod_imagick',
-            mt('setup', 'PHP Module: Imagick'),
-            mt(
+        $requirements->add(new PhpModuleRequirement(array(
+            'optional'      => true,
+            'condition'     => 'GD',
+            'description'   => mt(
                 'setup',
-                'In case you want graphs being exported to PDF as well'
-                . ', you\'ll need the ImageMagick extension for PHP.'
-            ),
-            Platform::extensionLoaded('imagick'),
-            Platform::extensionLoaded('imagick') ? mt('setup', 'The PHP module Imagick is available') : (
-                mt('setup', 'The PHP module Imagick is missing')
+                'In case you want views being exported to PDF, you\'ll need the GD extension for PHP.'
             )
-        );
+        )));
 
-        $requirements->addOptional(
-            'existing_php_mod_pdo_mysql',
-            mt('setup', 'PHP Module: PDO-MySQL'),
-            mt(
+        $requirements->add(new PhpModuleRequirement(array(
+            'optional'      => true,
+            'condition'     => 'Imagick',
+            'description'   => mt(
+                'setup',
+                'In case you want graphs being exported to PDF as well, you\'ll need the ImageMagick extension for PHP.'
+            )
+        )));
+
+        $requirements->add(new PhpModuleRequirement(array(
+            'optional'      => true,
+            'condition'     => 'mysql',
+            'alias'         => 'PDO-MySQL',
+            'description'   => mt(
                 'setup',
                 'Is Icinga Web 2 supposed to access a MySQL database the PDO-MySQL module for PHP is required.'
-            ),
-            Platform::extensionLoaded('mysql'),
-            Platform::extensionLoaded('mysql') ? mt('setup', 'The PHP module PDO-MySQL is available.') : (
-                mt('setup', 'The PHP module PDO-MySQL is missing.')
             )
-        );
+        )));
 
-        $requirements->addOptional(
-            'existing_php_mod_pdo_pgsql',
-            mt('setup', 'PHP Module: PDO-PostgreSQL'),
-            mt(
+        $requirements->add(new PhpModuleRequirement(array(
+            'optional'      => true,
+            'condition'     => 'pgsql',
+            'alias'         => 'PDO-PostgreSQL',
+            'description'   => mt(
                 'setup',
                 'Is Icinga Web 2 supposed to access a PostgreSQL database'
                 . ' the PDO-PostgreSQL module for PHP is required.'
-            ),
-            Platform::extensionLoaded('pgsql'),
-            Platform::extensionLoaded('pgsql') ? mt('setup', 'The PHP module PDO-PostgreSQL is available.') : (
-                mt('setup', 'The PHP module PDO-PostgreSQL is missing.')
             )
-        );
+        )));
 
-        $mysqlAdapterFound = Platform::zendClassExists('Zend_Db_Adapter_Pdo_Mysql');
-        $requirements->addOptional(
-            'existing_class_Zend_Db_Adapter_Pdo_Mysql',
-            mt('setup', 'Zend Database Adapter For MySQL'),
-            mt('setup', 'The Zend database adapter for MySQL is required to access a MySQL database.'),
-            $mysqlAdapterFound,
-            $mysqlAdapterFound ? mt('setup', 'The Zend database adapter for MySQL is available.') : (
-                mt('setup', 'The Zend database adapter for MySQL is missing.')
+        $requirements->add(new ClassRequirement(array(
+            'optional'      => true,
+            'condition'     => 'Zend_Db_Adapter_Pdo_Mysql',
+            'alias'         => mt('setup', 'Zend database adapter for MySQL'),
+            'description'   => mt(
+                'setup',
+                'The Zend database adapter for MySQL is required to access a MySQL database.'
             )
-        );
+        )));
 
-        $pgsqlAdapterFound = Platform::zendClassExists('Zend_Db_Adapter_Pdo_Pgsql');
-        $requirements->addOptional(
-            'existing_class_Zend_Db_Adapter_Pdo_Pgsql',
-            mt('setup', 'Zend Database Adapter For PostgreSQL'),
-            mt('setup', 'The Zend database adapter for PostgreSQL is required to access a PostgreSQL database.'),
-            $pgsqlAdapterFound,
-            $pgsqlAdapterFound ? mt('setup', 'The Zend database adapter for PostgreSQL is available.') : (
-                mt('setup', 'The Zend database adapter for PostgreSQL is missing.')
+        $requirements->add(new ClassRequirement(array(
+            'optional'      => true,
+            'condition'     => 'Zend_Db_Adapter_Pdo_Pgsql',
+            'alias'         => mt('setup', 'Zend database adapter for PostgreSQL'),
+            'description'   => mt(
+                'setup',
+                'The Zend database adapter for PostgreSQL is required to access a PostgreSQL database.'
             )
-        );
+        )));
 
-        $configDir = Icinga::app()->getConfigDir();
-        $requirements->addMandatory(
-            'writable_directory_' . $configDir,
-            mt('setup', 'Writable Config Directory'),
-            mt(
+        $requirements->add(new ConfigDirectoryRequirement(array(
+            'condition'     => Icinga::app()->getConfigDir(),
+            'description'   => mt(
                 'setup',
                 'The Icinga Web 2 configuration directory defaults to "/etc/icingaweb2", if' .
                 ' not explicitly set in the environment variable "ICINGAWEB_CONFIGDIR".'
-            ),
-            is_writable($configDir),
-            sprintf(
-                is_writable($configDir) ? mt('setup', 'The current configuration directory is writable: %s') : (
-                    mt('setup', 'The current configuration directory is not writable: %s')
-                ),
-                $configDir
             )
-        );
+        )));
 
         foreach ($this->getWizards() as $wizard) {
             $requirements->merge($wizard->getRequirements());

From 7f883a47701dd4834258359ddeafff26b71846e9 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 25 Feb 2015 13:51:26 +0100
Subject: [PATCH 0809/2920] Add own animation.less to provide own parameterized
 animate function

refs #7968
---
 library/Icinga/Web/StyleSheet.php |  1 +
 public/css/icinga/animation.less  | 82 +++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 public/css/icinga/animation.less

diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index c4b61f17f..b1bbba231 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -14,6 +14,7 @@ class StyleSheet
         '../application/fonts/fontello-ifont/css/ifont-embedded.css',
         'css/vendor/tipsy.css',
         'css/icinga/defaults.less',
+        'css/icinga/animation.less',
         'css/icinga/layout-colors.less',
         'css/icinga/layout-structure.less',
         'css/icinga/menu.less',
diff --git a/public/css/icinga/animation.less b/public/css/icinga/animation.less
new file mode 100644
index 000000000..928cdf526
--- /dev/null
+++ b/public/css/icinga/animation.less
@@ -0,0 +1,82 @@
+.animate(@animate) {
+  -moz-animation: @animate;
+  -o-animation: @animate;
+  -webkit-animation: @animate;
+  animation: @animate;
+}
+
+@-moz-keyframes spin {
+  0% {
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+
+  100% {
+    -moz-transform: rotate(359deg);
+    -o-transform: rotate(359deg);
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+@-webkit-keyframes spin {
+  0% {
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+
+  100% {
+    -moz-transform: rotate(359deg);
+    -o-transform: rotate(359deg);
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+@-o-keyframes spin {
+  0% {
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+
+  100% {
+    -moz-transform: rotate(359deg);
+    -o-transform: rotate(359deg);
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+@-ms-keyframes spin {
+  0% {
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+
+  100% {
+    -moz-transform: rotate(359deg);
+    -o-transform: rotate(359deg);
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+@keyframes spin {
+  0% {
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+
+  100% {
+    -moz-transform: rotate(359deg);
+    -o-transform: rotate(359deg);
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
\ No newline at end of file

From c029ec1af92abc86d03bac0f93ed00aef8e06fb4 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 25 Feb 2015 13:53:00 +0100
Subject: [PATCH 0810/2920] Replace animate-spin with own animate
 implementation in spinner

refs #7968
---
 public/css/icinga/tabs.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/icinga/tabs.less b/public/css/icinga/tabs.less
index 4d7f43146..d9161f672 100644
--- a/public/css/icinga/tabs.less
+++ b/public/css/icinga/tabs.less
@@ -142,7 +142,7 @@ a.close-tab {
 }
 
 .spinner.active > i  {
-  .animate-spin();
+  .animate(spin 2s infinite linear);
   &:before {
     // icon-spin6
     content: '\e874';

From 08ace05ac750ce54810648ea202dd8c5f7d97904 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 25 Feb 2015 13:56:32 +0100
Subject: [PATCH 0811/2920] Remove animations.css from StyleSheet loading
 lessFiles

refs #7968
---
 library/Icinga/Web/StyleSheet.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index b1bbba231..3f1e2b2a7 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -10,7 +10,6 @@ use Icinga\Web\LessCompiler;
 class StyleSheet
 {
     protected static $lessFiles = array(
-        '../application/fonts/fontello-ifont/css/animation.css',
         '../application/fonts/fontello-ifont/css/ifont-embedded.css',
         'css/vendor/tipsy.css',
         'css/icinga/defaults.less',

From 16200417ebb449869057c41cfd8520ea2e64c1e7 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 25 Feb 2015 14:15:32 +0100
Subject: [PATCH 0812/2920] Add spinner active indicator for form submit
 buttons

refs #7968
---
 public/js/icinga/events.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index a3ee35dfa..021b25f47 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -226,6 +226,11 @@
             event.stopPropagation();
             event.preventDefault();
 
+            // activate spinner indicator
+            if ($button.hasClass('spinner')) {
+                $button.addClass('active');
+            }
+
             icinga.logger.debug('Submitting form: ' + method + ' ' + url, method);
 
             $target = self.getLinkTargetFor($form);

From 797d37735d3ddfe775bb9d390234e529685ac873 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 25 Feb 2015 14:16:35 +0100
Subject: [PATCH 0813/2920] Add .spinner class to CheckNowCommandForm submit
 button

refs #7968
---
 .../application/forms/Command/Object/CheckNowCommandForm.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
index c272b4c30..e5cf6b9e4 100644
--- a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
@@ -39,7 +39,7 @@ class CheckNowCommandForm extends ObjectsCommandForm
                         . $this->translate('Check now'),
                     'decorators'    => array('ViewHelper'),
                     'escape'        => false,
-                    'class'         => 'link-like',
+                    'class'         => 'link-like spinner',
                     'title'         => $this->translate('Schedule the next active check to run immediately')
                 )
             )

From cc403806f764c1527afc78cc451b4745a945d475 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 25 Feb 2015 15:28:09 +0100
Subject: [PATCH 0814/2920] Fix refresh accessibility lable if it is empty

refs #7968
---
 library/Icinga/Web/Widget/Tabs.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index b9a9a539d..e83d10783 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -328,9 +328,13 @@ EOT;
         $tab = $this->get($this->getActiveName());
 
         if ($tab !== null) {
-            $caption = $this->view()->escape(
+            $label = $this->view()->escape(
                 $tab->getLabel()
             );
+        }
+
+        if (! empty($label)) {
+            $caption = $label;
         } else {
             $caption = t('Content');
         }

From 89451f30864c01ceedb2fae97355a4835486b4db Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 25 Feb 2015 18:00:28 +0100
Subject: [PATCH 0815/2920] Ensure that form ids are unique

Add an unique prefix to each Form- or FormElement id, unless id protection is disabled explicitly, to prevent id collisions between different containers.

fixes #8460
---
 application/views/helpers/ProtectId.php       | 12 +++++
 .../config/authentication/reorder.phtml       |  2 +-
 .../views/scripts/mixedPagination.phtml       |  4 +-
 library/Icinga/Web/Form.php                   | 54 +++++++++++++++++++
 library/Icinga/Web/Request.php                | 20 +++++++
 .../controllers/ListController.php            |  2 +-
 6 files changed, 90 insertions(+), 4 deletions(-)
 create mode 100644 application/views/helpers/ProtectId.php

diff --git a/application/views/helpers/ProtectId.php b/application/views/helpers/ProtectId.php
new file mode 100644
index 000000000..8795a3933
--- /dev/null
+++ b/application/views/helpers/ProtectId.php
@@ -0,0 +1,12 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+/**
+ * Class Zend_View_Helper_Util
+ */
+class Zend_View_Helper_ProtectId extends Zend_View_Helper_Abstract
+{
+    public function protectId($id) {
+        return Zend_Controller_Front::getInstance()->getRequest()->protectId($id);
+    }
+}
diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/authentication/reorder.phtml
index 4583a23b3..0386cdd5e 100644
--- a/application/views/scripts/config/authentication/reorder.phtml
+++ b/application/views/scripts/config/authentication/reorder.phtml
@@ -2,7 +2,7 @@
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">
-  <h1 tabindex="-1" id="authentication-reorder">
+  <h1 tabindex="-1" id="authentication-configuration">
     <?= $this->translate('Authentication Configuration'); ?>
   </h1>
   <h2 tabindex="-1" id="authentication-new-backend" class="sr-only">
diff --git a/application/views/scripts/mixedPagination.phtml b/application/views/scripts/mixedPagination.phtml
index 4704d8f51..160657b12 100644
--- a/application/views/scripts/mixedPagination.phtml
+++ b/application/views/scripts/mixedPagination.phtml
@@ -9,8 +9,8 @@ use Icinga\Web\Url;
 
 if ($this->pageCount <= 1) return;
 
-?><p id="paginationlabel" class="audible"><?= t('Pagination') ?></p>
-<ul class="pagination" aria-labelledby="paginationlabel" role="navigation"
+?><p id="<?= $this->protectId('paginationlabel'); ?>" class="audible"><?= t('Pagination') ?></p>
+<ul class="pagination" aria-labelledby="<?= $this->protectId('paginationlabel'); ?>" role="navigation"
 <?php
 
 $fromto = t('Show rows %u to %u out of %u');
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index ce5759620..014855849 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -112,6 +112,13 @@ class Form extends Zend_Form
      */
     protected $validatePartial = false;
 
+    /**
+     * Whether element ids will be protected against collisions by appending a request-specific unique identifier
+     *
+     * @var bool
+     */
+    protected $protectIds = true;
+
     /**
      * Authentication manager
      *
@@ -903,6 +910,28 @@ class Form extends Zend_Form
     public function render(Zend_View_Interface $view = null)
     {
         $this->create();
+        if ($this->protectIds) {
+            if (null !== $this->getAttrib('id')) {
+                $this->setAttrib('id', $this->getRequest()->protectId($this->getAttrib('id')));
+            } else {
+                $this->setAttrib('id', $this->getRequest()->protectId($this->name));
+            }
+
+            /** @var Zend_Form_Element $element */
+            foreach ($this->getElements() as $element) {
+                if (null !== $element->getAttrib('id')) {
+                    $element->setAttrib(
+                        'id',
+                        $this->getRequest()->protectId($this->getName() . '-' . $element->getAttrib('id'))
+                    );
+                } else {
+                    $element->setAttrib(
+                        'id',
+                        $this->getRequest()->protectId($this->getName() . '-' . $element->getName())
+                    );
+                }
+            }
+        }
         return parent::render($view);
     }
 
@@ -944,4 +973,29 @@ class Form extends Zend_Form
             throw new SecurityException('No permission for %s', $permission);
         }
     }
+
+    /**
+     * Enable or disable whether ids should be altered to guard them against duplications
+     *
+     * @param $value    boolean Whether or not protect ids against collisions through other requests
+     */
+    public function setProtectIds($value)
+    {
+        $this->protectIds = $value;
+    }
+
+    /**
+     * Get the id that is written into the output html when rendering this form
+     *
+     * This will return the protected id, in case $protectIds is enabled.
+     *
+     * @return string   The id
+     */
+    public function getId()
+    {
+        if ($this->protectIds) {
+            return $this->getRequest()->protectId($this->getName());
+        }
+        return $this->getName();
+    }
 }
diff --git a/library/Icinga/Web/Request.php b/library/Icinga/Web/Request.php
index 4dd57df91..90551b33c 100644
--- a/library/Icinga/Web/Request.php
+++ b/library/Icinga/Web/Request.php
@@ -18,6 +18,11 @@ class Request extends Zend_Controller_Request_Http
      */
     private $user;
 
+    /**
+     * @var string
+     */
+    private $uniqueId;
+
     private $url;
 
     public function getUrl()
@@ -47,4 +52,19 @@ class Request extends Zend_Controller_Request_Http
     {
         return $this->user;
     }
+
+    /**
+     * Makes an ID unique to this request, to prevent id collisions in different containers
+     *
+     * Call this whenever an ID might show up multiple times in different containers. This function is useful
+     * for ensuring unique ids on sites, even if we combine the HTML of different requests into one site,
+     * while still being able to reference elements uniquely in the same request.
+     */
+    public function protectId($id)
+    {
+        if (! isset($this->uniqueId)) {
+            $this->uniqueId = Window::generateId();
+        }
+        return $id . '-' . $this->uniqueId;
+    }
 }
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 3fb782856..60c669f93 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -702,7 +702,7 @@ class Monitoring_ListController extends Controller
     private function setupSortControl(array $columns)
     {
         $this->view->sortControl = new SortBox(
-            $this->getRequest()->getActionName(),
+            'sortbox-' . $this->getRequest()->getActionName(),
             $columns
         );
         $this->view->sortControl->applyRequest($this->getRequest());

From bc950a855d0d303825e76b65a47a012550805e3e Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 25 Feb 2015 18:39:03 +0100
Subject: [PATCH 0816/2920] Surpress warnings when ldap page control is not
 available

---
 library/Icinga/Protocol/Ldap/Connection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 1cd979a74..65eafffe0 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -415,7 +415,7 @@ class Connection
                 }
             } while (($limit === 0 || $limit !== count($entries)) && ($entry = ldap_next_entry($this->ds, $entry)));
 
-            if (false === ldap_control_paged_result_response($this->ds, $results, $cookie)) {
+            if (false === @ldap_control_paged_result_response($this->ds, $results, $cookie)) {
                 // If the page size is greater than or equal to the sizeLimit value, the server should ignore the
                 // control as the request can be satisfied in a single page: https://www.ietf.org/rfc/rfc2696.txt
                 // This applies no matter whether paged search requests are permitted or not. You're done once you

From 8ed4a943f72803de1a0f4cf7ce91d517a496c0ea Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 26 Feb 2015 10:49:03 +0100
Subject: [PATCH 0817/2920] Add support for nested requirement sets

This allows now to link requirements by an OR condition as well and to nest
such grouped requirements in other sets of type AND, and vice versa.

refs #8508
---
 modules/setup/library/Setup/Requirements.php | 135 +++++++++++++++++--
 1 file changed, 126 insertions(+), 9 deletions(-)

diff --git a/modules/setup/library/Setup/Requirements.php b/modules/setup/library/Setup/Requirements.php
index e96a0f7ac..aba96c4bc 100644
--- a/modules/setup/library/Setup/Requirements.php
+++ b/modules/setup/library/Setup/Requirements.php
@@ -4,6 +4,7 @@
 namespace Icinga\Module\Setup;
 
 use ArrayIterator;
+use LogicException;
 use IteratorAggregate;
 
 /**
@@ -11,12 +12,77 @@ use IteratorAggregate;
  */
 class Requirements implements IteratorAggregate
 {
+    /**
+     * Mode AND (all requirements must met)
+     */
+    const MODE_AND = 0;
+
+    /**
+     * Mode OR (at least one requirement must met)
+     */
+    const MODE_OR = 1;
+
+    /**
+     * The mode by with the requirements are evaluated
+     *
+     * @var string
+     */
+    protected $mode;
+
     /**
      * The registered requirements
      *
      * @var array
      */
-    protected $requirements = array();
+    protected $requirements;
+
+    /**
+     * Whether there is any mandatory requirement part of this set
+     *
+     * @var bool
+     */
+    protected $containsMandatoryRequirements;
+
+    /**
+     * Create a new set of requirements
+     *
+     * @param   int     $mode   The mode by with to evaluate the requirements
+     */
+    public function __construct($mode = null)
+    {
+        $this->requirements = array();
+        $this->containsMandatoryRequirements = false;
+        $this->setMode($mode ?: static::MODE_AND);
+    }
+
+    /**
+     * Set the mode by with to evaluate the requirements
+     *
+     * @param   int     $mode
+     *
+     * @return  Requirements
+     *
+     * @throws  LogicException      In case the given mode is invalid
+     */
+    public function setMode($mode)
+    {
+        if ($mode !== static::MODE_AND && $mode !== static::MODE_OR) {
+            throw new LogicException(sprintf('Invalid mode %u given.'), $mode);
+        }
+
+        $this->mode = $mode;
+        return $this;
+    }
+
+    /**
+     * Return the mode by with the requirements are evaluated
+     *
+     * @return  int
+     */
+    public function getMode()
+    {
+        return $this->mode;
+    }
 
     /**
      * Register a requirement
@@ -29,8 +95,8 @@ class Requirements implements IteratorAggregate
     {
         $merged = false;
         foreach ($this as $knownRequirement) {
-            if ($requirement->equals($knownRequirement)) {
-                if ($knownRequirement->isOptional() && !$requirement->isOptional()) {
+            if ($knownRequirement instanceof Requirement && $requirement->equals($knownRequirement)) {
+                if ($this->getMode() === static::MODE_AND && !$requirement->isOptional()) {
                     $knownRequirement->setOptional(false);
                 }
 
@@ -44,6 +110,12 @@ class Requirements implements IteratorAggregate
         }
 
         if (! $merged) {
+            if ($this->getMode() === static::MODE_OR) {
+                $requirement->setOptional();
+            } elseif (! $requirement->isOptional()) {
+                $this->containsMandatoryRequirements = true;
+            }
+
             $this->requirements[] = $requirement;
         }
 
@@ -60,6 +132,16 @@ class Requirements implements IteratorAggregate
         return $this->requirements;
     }
 
+    /**
+     * Return whether there is any mandatory requirement part of this set
+     *
+     * @return  bool
+     */
+    public function hasAnyMandatoryRequirement()
+    {
+        return $this->containsMandatoryRequirements || $this->getMode() === static::MODE_OR;
+    }
+
     /**
      * Return an iterator of all registered requirements
      *
@@ -79,26 +161,61 @@ class Requirements implements IteratorAggregate
      */
     public function merge(Requirements $requirements)
     {
-        foreach ($requirements as $requirement) {
-            $this->add($requirement);
+        if ($this->getMode() === static::MODE_OR && $requirements->getMode() === static::MODE_OR) {
+            foreach ($requirements as $requirement) {
+                if ($requirement instanceof static) {
+                    $this->merge($requirement);
+                } else {
+                    $this->add($requirement);
+                }
+            }
+        } else {
+            if ($requirements->getMode() === static::MODE_OR) {
+                $this->containsMandatoryRequirements = true;
+            }
+
+            $this->requirements[] = $requirements;
         }
 
         return $this;
     }
 
     /**
-     * Return whether all mandatory requirements are fulfilled
+     * Return whether all requirements can successfully be evaluated based on the current mode
      *
      * @return  bool
      */
     public function fulfilled()
     {
+        $state = false;
         foreach ($this as $requirement) {
-            if (! $requirement->getState() && !$requirement->isOptional()) {
-                return false;
+            if ($requirement instanceof static) {
+                if ($requirement->fulfilled()) {
+                    if ($this->getMode() === static::MODE_OR) {
+                        return true;
+                    }
+
+                    $state = true;
+                } elseif ($this->getMode() === static::MODE_AND && $requirement->hasAnyMandatoryRequirement()) {
+                    return false;
+                }
+            } else {
+                if ($requirement->getState()) {
+                    if ($this->getMode() === static::MODE_OR) {
+                        return true;
+                    }
+
+                    $state = true;
+                } elseif ($this->getMode() === static::MODE_AND) {
+                    if (! $requirement->isOptional()) {
+                        return false;
+                    }
+
+                    $state = true; // There may only be optional requirements...
+                }
             }
         }
 
-        return true;
+        return $state;
     }
 }

From 87fe9bd2ff850e15a02b44405e82c9bb8f27ae17 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 26 Feb 2015 10:50:05 +0100
Subject: [PATCH 0818/2920] Adjust the web wizard so that all database
 dependencies are grouped

refs #8508
---
 modules/setup/library/Setup/WebWizard.php | 33 ++++++++++++-----------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 667237243..6158d9bd0 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -447,28 +447,17 @@ class WebWizard extends Wizard implements SetupWizard
             )
         )));
 
-        $requirements->add(new PhpModuleRequirement(array(
+        $mysqlRequirements = new Requirements();
+        $mysqlRequirements->add(new PhpModuleRequirement(array(
             'optional'      => true,
             'condition'     => 'mysql',
             'alias'         => 'PDO-MySQL',
             'description'   => mt(
                 'setup',
-                'Is Icinga Web 2 supposed to access a MySQL database the PDO-MySQL module for PHP is required.'
+                'To store users or preferences in a MySQL database the PDO-MySQL module for PHP is required.'
             )
         )));
-
-        $requirements->add(new PhpModuleRequirement(array(
-            'optional'      => true,
-            'condition'     => 'pgsql',
-            'alias'         => 'PDO-PostgreSQL',
-            'description'   => mt(
-                'setup',
-                'Is Icinga Web 2 supposed to access a PostgreSQL database'
-                . ' the PDO-PostgreSQL module for PHP is required.'
-            )
-        )));
-
-        $requirements->add(new ClassRequirement(array(
+        $mysqlRequirements->add(new ClassRequirement(array(
             'optional'      => true,
             'condition'     => 'Zend_Db_Adapter_Pdo_Mysql',
             'alias'         => mt('setup', 'Zend database adapter for MySQL'),
@@ -477,8 +466,19 @@ class WebWizard extends Wizard implements SetupWizard
                 'The Zend database adapter for MySQL is required to access a MySQL database.'
             )
         )));
+        $requirements->merge($mysqlRequirements);
 
-        $requirements->add(new ClassRequirement(array(
+        $pgsqlRequirements = new Requirements();
+        $pgsqlRequirements->add(new PhpModuleRequirement(array(
+            'optional'      => true,
+            'condition'     => 'pgsql',
+            'alias'         => 'PDO-PostgreSQL',
+            'description'   => mt(
+                'setup',
+                'To store users or preferences in a PostgreSQL database the PDO-PostgreSQL module for PHP is required.'
+            )
+        )));
+        $pgsqlRequirements->add(new ClassRequirement(array(
             'optional'      => true,
             'condition'     => 'Zend_Db_Adapter_Pdo_Pgsql',
             'alias'         => mt('setup', 'Zend database adapter for PostgreSQL'),
@@ -487,6 +487,7 @@ class WebWizard extends Wizard implements SetupWizard
                 'The Zend database adapter for PostgreSQL is required to access a PostgreSQL database.'
             )
         )));
+        $requirements->merge($pgsqlRequirements);
 
         $requirements->add(new ConfigDirectoryRequirement(array(
             'condition'     => Icinga::app()->getConfigDir(),

From 551207b5b8cd1e81d3a6ec3e36a2a1eb18414e98 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 26 Feb 2015 10:50:45 +0100
Subject: [PATCH 0819/2920] Add grouped database dependencies to the monitoring
 wizard

refs #8508
---
 .../library/Monitoring/MonitoringWizard.php   | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index 3c7dee886..82ee90e62 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -16,6 +16,7 @@ use Icinga\Module\Monitoring\Forms\Setup\InstancePage;
 use Icinga\Module\Monitoring\Forms\Setup\SecurityPage;
 use Icinga\Module\Monitoring\Forms\Setup\IdoResourcePage;
 use Icinga\Module\Monitoring\Forms\Setup\LivestatusResourcePage;
+use Icinga\Module\Setup\Requirement\ClassRequirement;
 use Icinga\Module\Setup\Requirement\PhpModuleRequirement;
 
 /**
@@ -147,6 +148,45 @@ class MonitoringWizard extends Wizard implements SetupWizard
             )
         )));
 
+        $idoRequirements = new Requirements(Requirements::MODE_OR);
+        $mysqlRequirements = new Requirements();
+        $mysqlRequirements->add(new PhpModuleRequirement(array(
+            'condition'     => 'mysql',
+            'alias'         => 'PDO-MySQL',
+            'description'   => mt(
+                'monitoring',
+                'To access the IDO stored in a MySQL database the PDO-MySQL module for PHP is required.'
+            )
+        )));
+        $mysqlRequirements->add(new ClassRequirement(array(
+            'condition'     => 'Zend_Db_Adapter_Pdo_Mysql',
+            'alias'         => mt('monitoring', 'Zend database adapter for MySQL'),
+            'description'   => mt(
+                'monitoring',
+                'The Zend database adapter for MySQL is required to access a MySQL database.'
+            )
+        )));
+        $idoRequirements->merge($mysqlRequirements);
+        $pgsqlRequirements = new Requirements();
+        $pgsqlRequirements->add(new PhpModuleRequirement(array(
+            'condition'     => 'pgsql',
+            'alias'         => 'PDO-PostgreSQL',
+            'description'   => mt(
+                'monitoring',
+                'To access the IDO stored in a PostgreSQL database the PDO-PostgreSQL module for PHP is required.'
+            )
+        )));
+        $pgsqlRequirements->add(new ClassRequirement(array(
+            'condition'     => 'Zend_Db_Adapter_Pdo_Pgsql',
+            'alias'         => mt('monitoring', 'Zend database adapter for PostgreSQL'),
+            'description'   => mt(
+                'monitoring',
+                'The Zend database adapter for PostgreSQL is required to access a PostgreSQL database.'
+            )
+        )));
+        $idoRequirements->merge($pgsqlRequirements);
+        $requirements->merge($idoRequirements);
+
         return $requirements;
     }
 }

From d0a8dd8973c385d804e7f6a5368702b3923bb446 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 26 Feb 2015 10:52:39 +0100
Subject: [PATCH 0820/2920] Requirements: Do not implement ArrayIterator but
 RecursiveIterator

refs #8508
---
 .../scripts/form/setup-requirements.phtml     |  4 +-
 modules/setup/library/Setup/Requirements.php  | 88 +++++++++++++++----
 2 files changed, 75 insertions(+), 17 deletions(-)

diff --git a/modules/setup/application/views/scripts/form/setup-requirements.phtml b/modules/setup/application/views/scripts/form/setup-requirements.phtml
index 09ca98d7f..9918df008 100644
--- a/modules/setup/application/views/scripts/form/setup-requirements.phtml
+++ b/modules/setup/application/views/scripts/form/setup-requirements.phtml
@@ -1,13 +1,15 @@
 <?php
 
+use \RecursiveIteratorIterator;
 use Icinga\Web\Wizard;
 
 $requirements = $form->getRequirements();
+$iterator = new RecursiveIteratorIterator($requirements);
 
 ?>
 <table class="requirements">
   <tbody>
-<?php foreach ($requirements as $requirement): ?>
+<?php foreach ($iterator as $requirement): ?>
     <tr>
       <td><h2><?= $requirement->getTitle(); ?></h2></td>
       <td style="width: 50%">
diff --git a/modules/setup/library/Setup/Requirements.php b/modules/setup/library/Setup/Requirements.php
index aba96c4bc..69892f236 100644
--- a/modules/setup/library/Setup/Requirements.php
+++ b/modules/setup/library/Setup/Requirements.php
@@ -3,14 +3,13 @@
 
 namespace Icinga\Module\Setup;
 
-use ArrayIterator;
 use LogicException;
-use IteratorAggregate;
+use RecursiveIterator;
 
 /**
  * Container to store and handle requirements
  */
-class Requirements implements IteratorAggregate
+class Requirements implements RecursiveIterator
 {
     /**
      * Mode AND (all requirements must met)
@@ -94,7 +93,7 @@ class Requirements implements IteratorAggregate
     public function add(Requirement $requirement)
     {
         $merged = false;
-        foreach ($this as $knownRequirement) {
+        foreach ($this->requirements as $knownRequirement) {
             if ($knownRequirement instanceof Requirement && $requirement->equals($knownRequirement)) {
                 if ($this->getMode() === static::MODE_AND && !$requirement->isOptional()) {
                     $knownRequirement->setOptional(false);
@@ -142,16 +141,6 @@ class Requirements implements IteratorAggregate
         return $this->containsMandatoryRequirements || $this->getMode() === static::MODE_OR;
     }
 
-    /**
-     * Return an iterator of all registered requirements
-     *
-     * @return  ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->getAll());
-    }
-
     /**
      * Register the given requirements
      *
@@ -162,7 +151,7 @@ class Requirements implements IteratorAggregate
     public function merge(Requirements $requirements)
     {
         if ($this->getMode() === static::MODE_OR && $requirements->getMode() === static::MODE_OR) {
-            foreach ($requirements as $requirement) {
+            foreach ($requirements->getAll() as $requirement) {
                 if ($requirement instanceof static) {
                     $this->merge($requirement);
                 } else {
@@ -188,7 +177,7 @@ class Requirements implements IteratorAggregate
     public function fulfilled()
     {
         $state = false;
-        foreach ($this as $requirement) {
+        foreach ($this->requirements as $requirement) {
             if ($requirement instanceof static) {
                 if ($requirement->fulfilled()) {
                     if ($this->getMode() === static::MODE_OR) {
@@ -218,4 +207,71 @@ class Requirements implements IteratorAggregate
 
         return $state;
     }
+
+    /**
+     * Return whether the current element represents a nested set of requirements
+     *
+     * @return  bool
+     */
+    public function hasChildren()
+    {
+        $current = $this->current();
+        return $current instanceof static;
+    }
+
+    /**
+     * Return a iterator for the current nested set of requirements
+     *
+     * @return  RecursiveIterator
+     */
+    public function getChildren()
+    {
+        return $this->current();
+    }
+
+    /**
+     * Rewind the iterator to its first element
+     */
+    public function rewind()
+    {
+        reset($this->requirements);
+    }
+
+    /**
+     * Return whether the current iterator position is valid
+     *
+     * @return  bool
+     */
+    public function valid()
+    {
+        return $this->key() !== null;
+    }
+
+    /**
+     * Return the current element in the iteration
+     *
+     * @return  Requirement|Requirements
+     */
+    public function current()
+    {
+        return current($this->requirements);
+    }
+
+    /**
+     * Return the position of the current element in the iteration
+     *
+     * @return  int
+     */
+    public function key()
+    {
+        return key($this->requirements);
+    }
+
+    /**
+     * Advance the iterator to the next element
+     */
+    public function next()
+    {
+        next($this->requirements);
+    }
 }

From 435160324318552e9cfa3333b457d2f471de8338 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 26 Feb 2015 14:48:37 +0100
Subject: [PATCH 0821/2920] Fix that editing an auth backend does not open the
 next column

---
 application/views/scripts/form/reorder-authbackend.phtml | 4 ++--
 public/js/icinga/events.js                               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/views/scripts/form/reorder-authbackend.phtml b/application/views/scripts/form/reorder-authbackend.phtml
index 02f62572d..c31443eb6 100644
--- a/application/views/scripts/form/reorder-authbackend.phtml
+++ b/application/views/scripts/form/reorder-authbackend.phtml
@@ -1,4 +1,4 @@
-<form data-base-target="_self" id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
+<form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
   <table class="action">
     <thead>
       <th>Backend</th>
@@ -31,7 +31,7 @@
             )
           ); ?>
         </td>
-        <td>
+        <td data-base-target="_self">
 <?php if ($i > 0): ?>
           <button type="submit" name="backend_newpos" value="<?= sprintf(
             '%s|%s',
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 021b25f47..e4c1e54a0 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -233,7 +233,7 @@
 
             icinga.logger.debug('Submitting form: ' + method + ' ' + url, method);
 
-            $target = self.getLinkTargetFor($form);
+            $target = self.getLinkTargetFor($button);
 
             if (method === 'GET') {
                 var dataObj = $form.serializeObject();
@@ -558,8 +558,8 @@
             $(document).off('click', 'table.action tr[href]', this.rowSelected);
             $(document).off('click', 'table.action tr a', this.rowSelected);
             $(document).off('submit', 'form', this.submitForm);
-            $(document).off('click', 'button', this.submitForm);
             $(document).off('change', 'form select.autosubmit', this.submitForm);
+            $(document).off('change', 'form input.autosubmit', this.submitForm);
         },
 
         destroy: function() {

From 0111fdf78ea9783d5ce2506001473c2ec7db6ad5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 26 Feb 2015 16:05:13 +0100
Subject: [PATCH 0822/2920] Add an asterisk suffix to a form element's label if
 its required

The screen reader part "(required)" is not being considered with this
commit as most screen readers do not need this due to the ARIA and
HTML5 property.

resolves #7934
---
 library/Icinga/Web/Form.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 014855849..fdc513c41 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -583,6 +583,11 @@ class Form extends Zend_Form
         if ($element->isRequired() && strpos(strtolower($element->getType()), 'checkbox') === false) {
             $element->setAttrib('aria-required', 'true'); // ARIA
             $element->setAttrib('required', ''); // HTML5
+            if (($label = $element->getDecorator('label')) !== false) {
+                $element->setLabel($this->getView()->escape($element->getLabel()));
+                $label->setOption('escape', false);
+                $label->setOption('requiredSuffix', ' <span aria-hidden="true">*</span>');
+            }
         }
 
         return $element;

From 6d81a194ab913485bb0f5c12a3f30b07faffb3f5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 27 Feb 2015 08:10:25 +0100
Subject: [PATCH 0823/2920] Make form element descriptions accessible

Re-added the Help decorator to make sure an element's description
is being added in an accessible way.
---
 library/Icinga/Web/Form.php                | 12 ++-
 library/Icinga/Web/Form/Decorator/Help.php | 93 ++++++++++++++++++++++
 public/css/icinga/forms.less               | 35 +-------
 public/css/icinga/login.less               |  5 +-
 4 files changed, 105 insertions(+), 40 deletions(-)
 create mode 100644 library/Icinga/Web/Form/Decorator/Help.php

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index fdc513c41..5f0395634 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -134,6 +134,7 @@ class Form extends Zend_Form
     public static $defaultElementDecorators = array(
         array('ViewHelper', array('separator' => '')),
         array('Errors', array('separator' => '')),
+        array('Help'),
         array('Label', array('separator' => '')),
         array('HtmlTag', array('tag' => 'div', 'class' => 'element'))
     );
@@ -538,13 +539,6 @@ class Form extends Zend_Form
             )
         ));
 
-        if (($description = $el->getDescription()) !== null && ($label = $el->getDecorator('label')) !== false) {
-            $label->setOptions(array(
-                'title' => $description,
-                'class' => 'has-feedback'
-            ));
-        }
-
         if ($el->getAttrib('autosubmit')) {
             $noScript = new NoScriptApply(); // Non-JS environments
             $decorators = $el->getDecorators();
@@ -590,6 +584,10 @@ class Form extends Zend_Form
             }
         }
 
+        if ($element->getDescription() !== null && ($help = $element->getDecorator('help')) !== false) {
+            $element->setAttrib('aria-describedby', $help->setAccessible()->getDescriptionId($element));
+        }
+
         return $element;
     }
 
diff --git a/library/Icinga/Web/Form/Decorator/Help.php b/library/Icinga/Web/Form/Decorator/Help.php
new file mode 100644
index 000000000..444f1c664
--- /dev/null
+++ b/library/Icinga/Web/Form/Decorator/Help.php
@@ -0,0 +1,93 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Web\Form\Decorator;
+
+use Zend_Form_Element;
+use Zend_Form_Decorator_Abstract;
+use Icinga\Application\Icinga;
+use Icinga\Web\View;
+
+/**
+ * Decorator to add helptext to a form element
+ */
+class Help extends Zend_Form_Decorator_Abstract
+{
+    /**
+     * Whether a hidden <span> should be created to describe the decorated form element
+     *
+     * @var bool
+     */
+    protected $accessible = false;
+
+    /**
+     * The id used to identify the description associated with the decorated form element
+     *
+     * @var string
+     */
+    protected $descriptionId;
+
+    /**
+     * Set whether a hidden <span> should be created to describe the decorated form element
+     *
+     * @param   bool    $state
+     *
+     * @return  Feedback
+     */
+    public function setAccessible($state = true)
+    {
+        $this->accessible = (bool) $state;
+        return $this;
+    }
+
+    /**
+     * Return the id used to identify the description associated with the decorated element
+     *
+     * @param   Zend_Form_Element   $element    The element for which to generate a id
+     *
+     * @return  string
+     */
+    public function getDescriptionId(Zend_Form_Element $element = null)
+    {
+        if ($this->descriptionId === null) {
+            $element = $element ?: $this->getElement();
+            $this->descriptionId = $this->getView()->protectId($element->getId() . '_desc');
+        }
+
+        return $this->descriptionId;
+    }
+
+    /**
+     * Return the current view
+     *
+     * @return  View
+     */
+    protected function getView()
+    {
+        return Icinga::app()->getViewRenderer()->view;
+    }
+
+    /**
+     * Add a help icon to the left of an element
+     *
+     * @param   string      $content    The html rendered so far
+     *
+     * @return  string                  The updated html
+     */
+    public function render($content = '')
+    {
+        if ($content && ($description = $this->getElement()->getDescription()) !== null) {
+            if ($this->accessible) {
+                $content = '<span id="'
+                    . $this->getDescriptionId()
+                    . '" class="sr-only">'
+                    . $description
+                    . '</span>' . $content;
+            }
+
+            $content = $this->getView()->icon('help', $description) . $content;
+        }
+
+        return $content;
+    }
+}
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index b0468234a..d455bf654 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -190,38 +190,11 @@ form .description {
   display: block;
 }
 
-form label.has-feedback:after {
-  content: '\e85b';
-  font-family: "ifont";
-  font-style: normal;
-  font-weight: normal;
-  speak: none;
-
-  text-decoration: inherit;
-  width: 1em;
-  margin-right: .2em;
-  text-align: center;
-  /* opacity: .8; */
-
-  /* For safety - reset parent styles, that can break glyph codes*/
-  font-variant: normal;
-  text-transform: none;
-
-  /* fix buttons height, for twitter bootstrap */
-  line-height: 1em;
-
-  /* Animation center compensation - margins should be symmetric */
-  /* remove if not needed */
-  margin-left: .2em;
-
-  /* you can be more comfortable with increased icons size */
-  /* font-size: 120%; */
-
-  /* Uncomment for 3D effect */
-  /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
-}
-
 select.grant-permissions {
   height: 20em;
   width: auto;
 }
+
+label + input, label + select, label + input + input {
+  margin-left: 1.6em;
+}
\ No newline at end of file
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index 0211fdc35..5bc21d940 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -79,9 +79,10 @@
   form input {
     width: 18em;
     padding: 0.5em;
-	background: #ddd;
-	color: #333;
+    background: #ddd;
+    color: #333;
     border: 1px solid #ddd;
+    margin-left: 0;
   }
 
   form input:focus {

From 48c3199a2ddc46b27468150874d1bb800c91d5d4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 27 Feb 2015 09:01:46 +0100
Subject: [PATCH 0824/2920] Form: Fix id protection

Altering element ids upon rendering makes it impossible to reference
them elsewhere. Zend_Form::getId() should be preferred over getName()
as it falls automatically back to getName() in case there is no id attribute
set. Setter are required to return their instance. Overwriting methods
without calling the parent (getId) without any valid (or at least
documented) reason is very bad practice.

refs #8460
---
 library/Icinga/Web/Form.php | 89 +++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 47 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 5f0395634..b05bd8c55 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -383,6 +383,29 @@ class Form extends Zend_Form
         return $this->validatePartial;
     }
 
+    /**
+     * Set whether each element's id should be altered to avoid duplicates
+     *
+     * @param   bool    $value
+     *
+     * @return  Form
+     */
+    public function setProtectIds($value = true)
+    {
+        $this->protectIds = (bool) $value;
+        return $this;
+    }
+
+    /**
+     * Return whether each element's id is being altered to avoid duplicates
+     *
+     * @return  bool
+     */
+    public function getProtectIds()
+    {
+        return $this->protectIds;
+    }
+
     /**
      * Create this form
      *
@@ -562,6 +585,10 @@ class Form extends Zend_Form
             unset($el->autosubmit);
         }
 
+        if ($this->protectIds) {
+            $el->setAttrib('id', $this->getRequest()->protectId($this->getId(false) . '_' . $el->getId()));
+        }
+
         return $this->ensureElementAccessibility($el);
     }
 
@@ -795,6 +822,21 @@ class Form extends Zend_Form
         return $this;
     }
 
+    /**
+     * Get element id
+     *
+     * Returns the protected id, in case id protection is enabled.
+     *
+     * @param   bool    $protect
+     *
+     * @return  string
+     */
+    public function getId($protect = true)
+    {
+        $id = parent::getId();
+        return $protect && $this->protectIds ? $this->getRequest()->protectId($id) : $id;
+    }
+
     /**
      * Return the name of this form
      *
@@ -913,28 +955,6 @@ class Form extends Zend_Form
     public function render(Zend_View_Interface $view = null)
     {
         $this->create();
-        if ($this->protectIds) {
-            if (null !== $this->getAttrib('id')) {
-                $this->setAttrib('id', $this->getRequest()->protectId($this->getAttrib('id')));
-            } else {
-                $this->setAttrib('id', $this->getRequest()->protectId($this->name));
-            }
-
-            /** @var Zend_Form_Element $element */
-            foreach ($this->getElements() as $element) {
-                if (null !== $element->getAttrib('id')) {
-                    $element->setAttrib(
-                        'id',
-                        $this->getRequest()->protectId($this->getName() . '-' . $element->getAttrib('id'))
-                    );
-                } else {
-                    $element->setAttrib(
-                        'id',
-                        $this->getRequest()->protectId($this->getName() . '-' . $element->getName())
-                    );
-                }
-            }
-        }
         return parent::render($view);
     }
 
@@ -976,29 +996,4 @@ class Form extends Zend_Form
             throw new SecurityException('No permission for %s', $permission);
         }
     }
-
-    /**
-     * Enable or disable whether ids should be altered to guard them against duplications
-     *
-     * @param $value    boolean Whether or not protect ids against collisions through other requests
-     */
-    public function setProtectIds($value)
-    {
-        $this->protectIds = $value;
-    }
-
-    /**
-     * Get the id that is written into the output html when rendering this form
-     *
-     * This will return the protected id, in case $protectIds is enabled.
-     *
-     * @return string   The id
-     */
-    public function getId()
-    {
-        if ($this->protectIds) {
-            return $this->getRequest()->protectId($this->getName());
-        }
-        return $this->getName();
-    }
 }

From c00e336ea8ce308a2e2077ee4ae3e750c7c6ec9f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 27 Feb 2015 09:08:05 +0100
Subject: [PATCH 0825/2920] Make the cue that is being appended to required
 form elements configurable

refs #7934
---
 library/Icinga/Web/Form.php | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index b05bd8c55..37aa44e23 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -119,6 +119,13 @@ class Form extends Zend_Form
      */
     protected $protectIds = true;
 
+    /**
+     * The cue that is appended to each element's label if it's required
+     *
+     * @var string
+     */
+    protected $requiredCue = '*';
+
     /**
      * Authentication manager
      *
@@ -406,6 +413,29 @@ class Form extends Zend_Form
         return $this->protectIds;
     }
 
+    /**
+     * Set the cue to append to each element's label if it's required
+     *
+     * @param   string  $cue
+     *
+     * @return  Form
+     */
+    public function setRequiredCue($cue)
+    {
+        $this->requiredCue = $cue;
+        return $this;
+    }
+
+    /**
+     * Return the cue being appended to each element's label if it's required
+     *
+     * @return  string
+     */
+    public function getRequiredCue()
+    {
+        return $this->requiredCue;
+    }
+
     /**
      * Create this form
      *
@@ -604,10 +634,10 @@ class Form extends Zend_Form
         if ($element->isRequired() && strpos(strtolower($element->getType()), 'checkbox') === false) {
             $element->setAttrib('aria-required', 'true'); // ARIA
             $element->setAttrib('required', ''); // HTML5
-            if (($label = $element->getDecorator('label')) !== false) {
+            if (($cue = $this->getRequiredCue()) !== null && ($label = $element->getDecorator('label')) !== false) {
                 $element->setLabel($this->getView()->escape($element->getLabel()));
                 $label->setOption('escape', false);
-                $label->setOption('requiredSuffix', ' <span aria-hidden="true">*</span>');
+                $label->setOption('requiredSuffix', sprintf(' <span aria-hidden="true">%s</span>', $cue));
             }
         }
 

From ea4de8254586a222a1f4282f826219bc8ffd100f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 27 Feb 2015 09:09:25 +0100
Subject: [PATCH 0826/2920] Login: Disable the required cue

It should be obvious that it is necessary to input a name and a password
to login in case you're looking at a "login" form...

refs #7934
---
 application/forms/Authentication/LoginForm.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index 43fd8823f..d4f0e8745 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -16,6 +16,7 @@ class LoginForm extends Form
      */
     public function init()
     {
+        $this->setRequiredCue(null);
         $this->setName('form_login');
         $this->setSubmitLabel($this->translate('Login'));
     }

From 82017da85f4caa280a5bb280d9c0e2d420c4cf92 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 27 Feb 2015 09:20:15 +0100
Subject: [PATCH 0827/2920] Help: Do not protect form element ids twice

---
 library/Icinga/Web/Form/Decorator/Help.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form/Decorator/Help.php b/library/Icinga/Web/Form/Decorator/Help.php
index 444f1c664..460d04555 100644
--- a/library/Icinga/Web/Form/Decorator/Help.php
+++ b/library/Icinga/Web/Form/Decorator/Help.php
@@ -51,7 +51,7 @@ class Help extends Zend_Form_Decorator_Abstract
     {
         if ($this->descriptionId === null) {
             $element = $element ?: $this->getElement();
-            $this->descriptionId = $this->getView()->protectId($element->getId() . '_desc');
+            $this->descriptionId = 'desc_' . $element->getId();
         }
 
         return $this->descriptionId;

From f2259557c81d14b75998bb9b46a3562f26cd7978 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 27 Feb 2015 09:32:44 +0100
Subject: [PATCH 0828/2920] Fix missing tab labels

fixes #8518
---
 application/controllers/ConfigController.php            | 3 ++-
 application/controllers/DashboardController.php         | 5 +++--
 modules/doc/application/controllers/StyleController.php | 9 +++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 9602396ed..e240777dd 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -121,7 +121,8 @@ class ConfigController extends ActionController
         // @TODO(el): This seems not natural to me. Module configuration should have its own controller.
         $this->view->tabs = Widget::create('tabs')
             ->add('modules', array(
-                'title' => $this->translate('Modules'),
+                'label' => $this->translate('Modules'),
+                'title' => $this->translate('List intalled modules'),
                 'url'   => 'config/modules'
             ))
             ->activate('modules');
diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 9e7b482a8..6df92e892 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -249,8 +249,9 @@ class DashboardController extends ActionController
                 $this->view->tabs->add(
                     'Add',
                     array(
-                        'title' => '+',
-                        'url' => Url::fromPath('dashboard/new-dashlet')
+                        'label' => '+',
+                        'title' => 'Add a dashlet to an existing or new dashboard',
+                        'url'   => Url::fromPath('dashboard/new-dashlet')
                     )
                 );
                 $this->view->dashboard = $this->dashboard;
diff --git a/modules/doc/application/controllers/StyleController.php b/modules/doc/application/controllers/StyleController.php
index 8e21a6275..8661d024a 100644
--- a/modules/doc/application/controllers/StyleController.php
+++ b/modules/doc/application/controllers/StyleController.php
@@ -24,14 +24,15 @@ class Doc_StyleController extends Controller
         return Widget::create('tabs')->add(
             'guide',
             array(
-                'title' => $this->translate('Style Guide'),
-                'url' => 'doc/style/guide'
+                'label' => $this->translate('Style Guide'),
+                'url'   => 'doc/style/guide'
             )
         )->add(
             'font',
             array(
-                'title' => $this->translate('Icons'),
-                'url' => 'doc/style/font'
+                'label' => $this->translate('Icons'),
+                'title' => $this->translate('List all available icons'),
+                'url'   => 'doc/style/font'
             )
         );
     }

From 4f0bddd7daa4d609c036e094f169bae1764f6b2c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 27 Feb 2015 12:12:24 +0100
Subject: [PATCH 0829/2920] Do not add aria-label to icons and images with
 titles if aria-hidden is set

---
 library/Icinga/Web/Form/Decorator/Help.php | 4 ++--
 library/Icinga/Web/View/helpers/url.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Web/Form/Decorator/Help.php b/library/Icinga/Web/Form/Decorator/Help.php
index 460d04555..a02443994 100644
--- a/library/Icinga/Web/Form/Decorator/Help.php
+++ b/library/Icinga/Web/Form/Decorator/Help.php
@@ -32,7 +32,7 @@ class Help extends Zend_Form_Decorator_Abstract
      *
      * @param   bool    $state
      *
-     * @return  Feedback
+     * @return  Help
      */
     public function setAccessible($state = true)
     {
@@ -85,7 +85,7 @@ class Help extends Zend_Form_Decorator_Abstract
                     . '</span>' . $content;
             }
 
-            $content = $this->getView()->icon('help', $description) . $content;
+            $content = $this->getView()->icon('help', $description, array('aria-hidden' => 'true')) . $content;
         }
 
         return $content;
diff --git a/library/Icinga/Web/View/helpers/url.php b/library/Icinga/Web/View/helpers/url.php
index 925a225f9..f58afef35 100644
--- a/library/Icinga/Web/View/helpers/url.php
+++ b/library/Icinga/Web/View/helpers/url.php
@@ -54,7 +54,7 @@ $this->addHelperFunction('img', function ($url, $params = null, array $propertie
     }
 
     if (array_key_exists('title', $properties)) {
-        if (! array_key_exists('aria-label', $properties)) {
+        if (! array_key_exists('aria-label', $properties) && !array_key_exists('aria-hidden', $properties)) {
             $properties['aria-label'] = $properties['title'];
         }
     } elseif (! array_key_exists('aria-hidden', $properties)) {
@@ -83,7 +83,7 @@ $this->addHelperFunction('icon', function ($img, $title = null, array $propertie
         $properties['role'] = 'img';
         $properties['title'] = $title;
 
-        if (! array_key_exists('aria-label', $properties)) {
+        if (! array_key_exists('aria-label', $properties) && !array_key_exists('aria-hidden', $properties)) {
             $properties['aria-label'] = $title;
         }
     } elseif (! array_key_exists('aria-hidden', $properties)) {

From 96c132908d256df77f308a95852bd6f5be8351c0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 27 Feb 2015 13:09:13 +0100
Subject: [PATCH 0830/2920] Provide a warning on autosubmit form elements and a
 title for the apply btn

resolves #7935
---
 library/Icinga/Web/Form.php                   |  35 ++++--
 .../Icinga/Web/Form/Decorator/Autosubmit.php  | 108 ++++++++++++++++++
 .../Web/Form/Decorator/NoScriptApply.php      |  34 ------
 public/css/icinga/forms.less                  |  14 ++-
 4 files changed, 147 insertions(+), 44 deletions(-)
 create mode 100644 library/Icinga/Web/Form/Decorator/Autosubmit.php
 delete mode 100644 library/Icinga/Web/Form/Decorator/NoScriptApply.php

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 37aa44e23..0dc607412 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -13,7 +13,7 @@ use Icinga\Authentication\Manager;
 use Icinga\Security\SecurityException;
 use Icinga\Util\Translator;
 use Icinga\Web\Form\ErrorLabeller;
-use Icinga\Web\Form\Decorator\NoScriptApply;
+use Icinga\Web\Form\Decorator\Autosubmit;
 use Icinga\Web\Form\Element\CsrfCounterMeasure;
 
 /**
@@ -592,16 +592,27 @@ class Form extends Zend_Form
             )
         ));
 
+        if ($this->protectIds) {
+            $el->setAttrib('id', $this->getRequest()->protectId($this->getId(false) . '_' . $el->getId()));
+        }
+
         if ($el->getAttrib('autosubmit')) {
-            $noScript = new NoScriptApply(); // Non-JS environments
+            $autosubmitDecorator = new Autosubmit();
+            $autosubmitDecorator->setAccessible();
             $decorators = $el->getDecorators();
             $pos = array_search('Zend_Form_Decorator_ViewHelper', array_keys($decorators)) + 1;
             $el->setDecorators(
                 array_slice($decorators, 0, $pos, true)
-                + array(get_class($noScript) => $noScript)
+                + array(get_class($autosubmitDecorator) => $autosubmitDecorator)
                 + array_slice($decorators, $pos, count($decorators) - $pos, true)
             );
 
+            if (($describedBy = $el->getAttrib('aria-describedby')) !== null) {
+                $el->setAttrib('aria-describedby', $describedBy . ' ' . $autosubmitDecorator->getWarningId($el));
+            } else {
+                $el->setAttrib('aria-describedby', $autosubmitDecorator->getWarningId($el));
+            }
+
             $class = $el->getAttrib('class');
             if (is_array($class)) {
                 $class[] = 'autosubmit';
@@ -610,15 +621,11 @@ class Form extends Zend_Form
             } else {
                 $class .= ' autosubmit';
             }
-            $el->setAttrib('class', $class); // JS environments
+            $el->setAttrib('class', $class);
 
             unset($el->autosubmit);
         }
 
-        if ($this->protectIds) {
-            $el->setAttrib('id', $this->getRequest()->protectId($this->getId(false) . '_' . $el->getId()));
-        }
-
         return $this->ensureElementAccessibility($el);
     }
 
@@ -642,7 +649,17 @@ class Form extends Zend_Form
         }
 
         if ($element->getDescription() !== null && ($help = $element->getDecorator('help')) !== false) {
-            $element->setAttrib('aria-describedby', $help->setAccessible()->getDescriptionId($element));
+            if (($describedBy = $element->getAttrib('aria-describedby')) !== null) {
+                // Assume that it's because of the element being of type autosubmit or
+                // that one who did set the property manually removes the help decorator
+                // in case it has already an aria-requiredby property set
+                $element->setAttrib(
+                    'aria-describedby',
+                    $help->setAccessible()->getDescriptionId($element) . ' ' . $describedBy
+                );
+            } else {
+                $element->setAttrib('aria-describedby', $help->setAccessible()->getDescriptionId($element));
+            }
         }
 
         return $element;
diff --git a/library/Icinga/Web/Form/Decorator/Autosubmit.php b/library/Icinga/Web/Form/Decorator/Autosubmit.php
new file mode 100644
index 000000000..928325919
--- /dev/null
+++ b/library/Icinga/Web/Form/Decorator/Autosubmit.php
@@ -0,0 +1,108 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Web\Form\Decorator;
+
+use Zend_Form_Element;
+use Zend_Form_Decorator_Abstract;
+use Icinga\Application\Icinga;
+use Icinga\Web\View;
+
+/**
+ * Decorator to add an icon and a submit button encapsulated in noscript-tags
+ *
+ * The icon is shown in JS environments to indicate that a specific form control does automatically request an update
+ * of its form upon it has changed. The button allows users in non-JS environments to trigger the update manually.
+ */
+class Autosubmit extends Zend_Form_Decorator_Abstract
+{
+    /**
+     * Whether a hidden <span> should be created with the same warning as in the icon label
+     *
+     * @var bool
+     */
+    protected $accessible = false;
+
+    /**
+     * The id used to identify the auto-submit warning associated with the decorated form element
+     *
+     * @var string
+     */
+    protected $warningId;
+
+    /**
+     * Set whether a hidden <span> should be created with the same warning as in the icon label
+     *
+     * @param   bool    $state
+     *
+     * @return  Autosubmit
+     */
+    public function setAccessible($state = true)
+    {
+        $this->accessible = (bool) $state;
+        return $this;
+    }
+
+    /**
+     * Return the id used to identify the auto-submit warning associated with the decorated element
+     *
+     * @param   Zend_Form_Element   $element    The element for which to generate a id
+     *
+     * @return  string
+     */
+    public function getWarningId(Zend_Form_Element $element = null)
+    {
+        if ($this->warningId === null) {
+            $element = $element ?: $this->getElement();
+            $this->warningId = 'autosubmit_warning_' . $element->getId();
+        }
+
+        return $this->warningId;
+    }
+
+    /**
+     * Return the current view
+     *
+     * @return  View
+     */
+    protected function getView()
+    {
+        return Icinga::app()->getViewRenderer()->view;
+    }
+
+    /**
+     * Add a auto-submit icon and submit button encapsulated in noscript-tags to the element
+     *
+     * @param   string      $content    The html rendered so far
+     *
+     * @return  string                  The updated html
+     */
+    public function render($content = '')
+    {
+        if ($content) {
+            $warning = t('Upon its value has changed, this control issues an automatic update of this page.');
+            $content .= $this->getView()->icon('cw', $warning, array(
+                'aria-hidden'   => 'true',
+                'class'         => 'autosubmit-warning'
+            ));
+            if ($this->accessible) {
+                $content = '<span id="' . $this->getWarningId() . '" class="sr-only">' . $warning . '</span>' . $content;
+            }
+
+            $content .= sprintf(
+                '<noscript><button'
+                . ' name="noscript_apply"'
+                . ' class="noscript-apply"'
+                . ' type="submit"'
+                . ' value="1"'
+                . ($this->accessible ? ' aria-label="%1$s"' : '')
+                . ' title="%1$s"'
+                . '>%2$s</button></noscript>',
+                t('Push this button to update the form to reflect the change that was made in the control on the left'),
+                $this->getView()->icon('cw') . t('Apply')
+            );
+        }
+
+        return $content;
+    }
+}
diff --git a/library/Icinga/Web/Form/Decorator/NoScriptApply.php b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
deleted file mode 100644
index fbc96756b..000000000
--- a/library/Icinga/Web/Form/Decorator/NoScriptApply.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\Web\Form\Decorator;
-
-use Zend_Form_Decorator_Abstract;
-use Icinga\Application\Icinga;
-
-/**
- * Decorator to add a submit button encapsulated in noscript-tags
- *
- * This enables users in non-JS environments to update the contents
- * of a form without the use of the main submit button.
- */
-class NoScriptApply extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * Add a submit button encapsulated in noscript-tags to the element
-     *
-     * @param   string      $content    The html rendered so far
-     *
-     * @return  string                  The updated html
-     */
-    public function render($content = '')
-    {
-        if ($content) {
-            $content .= '<noscript><button name="noscript_apply" style="margin-left: 0.5em;" type="submit" value="1">'
-                . Icinga::app()->getViewRenderer()->view->icon('refresh.png') . '&nbsp;' . t('Apply')
-                . '</button></noscript>';
-        }
-
-        return $content;
-    }
-}
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index d455bf654..ae7ebf720 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -195,6 +195,18 @@ select.grant-permissions {
   width: auto;
 }
 
-label + input, label + select, label + input + input {
+label ~ input, label ~ select {
   margin-left: 1.6em;
+}
+
+label + i ~ input, label + i ~ select {
+  margin-left: 0;
+}
+
+button.noscript-apply {
+  margin-left: 0.5em;
+}
+
+html.no-js i.autosubmit-warning {
+  .sr-only;
 }
\ No newline at end of file

From 74dfa6e72af0d8b9f99a439fe75e481f34a3a82a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 27 Feb 2015 14:45:47 +0100
Subject: [PATCH 0831/2920] Fix invalid icon names passed to the icon view
 helper

---
 application/views/scripts/authentication/login.phtml | 2 +-
 library/Icinga/Web/Widget/FilterEditor.php           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index 4b1de3961..1bd7dc562 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -18,7 +18,7 @@
       '</a>'
     ); ?></p>
     <?php elseif ($requiresExternalAuth): ?>
-    <p class="info-box"><?= $this->icon('icon-info'); ?><?= $this->translate(
+    <p class="info-box"><?= $this->icon('info'); ?><?= $this->translate(
       'You\'re currently not authenticated using any of the web server\'s authentication mechanisms.'
       . ' Make sure you\'ll configure such, otherwise you\'ll not be able to login.'
     ); ?></p>
diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 0a8de5586..568b02498 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -323,7 +323,7 @@ class FilterEditor extends AbstractWidget
             $this->preservedUrl()->with('addFilter', $filter->getId()),
             null,
             array(
-                'icon'  => 'icon-plus',
+                'icon'  => 'plus',
                 'title' => t('Add another filter')
             )
         );
@@ -336,7 +336,7 @@ class FilterEditor extends AbstractWidget
             $this->preservedUrl()->with('stripFilter', $filter->getId()),
             null,
             array(
-                'icon'  => 'icon-minus',
+                'icon'  => 'minus',
                 'title' => t('Strip this filter')
             )
         );
@@ -349,7 +349,7 @@ class FilterEditor extends AbstractWidget
             $this->preservedUrl()->without('addFilter'),
             null,
             array(
-                'icon'  => 'icon-cancel',
+                'icon'  => 'cancel',
                 'title' => t('Cancel this operation')
             )
         );

From 7bb78330a903f6e7693df0ff8de98e874de8725c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 27 Feb 2015 14:47:46 +0100
Subject: [PATCH 0832/2920] Replace cancel icon with the trash icon...

...where the link's purpose is to remove something
---
 application/views/scripts/config/resource.phtml               | 2 +-
 application/views/scripts/dashboard/settings.phtml            | 4 ++--
 application/views/scripts/form/reorder-authbackend.phtml      | 2 +-
 application/views/scripts/roles/index.phtml                   | 2 +-
 library/Icinga/Web/Widget/FilterEditor.php                    | 2 +-
 .../monitoring/application/views/scripts/config/index.phtml   | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index 342320ab9..a8275912b 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -42,7 +42,7 @@
               'config/removeresource',
               array('resource' => $name),
               array(
-                  'icon'    => 'cancel',
+                  'icon'    => 'trash',
                   'title'   => sprintf($this->translate('Remove resource %s'), $name)
               )
             ); ?>
diff --git a/application/views/scripts/dashboard/settings.phtml b/application/views/scripts/dashboard/settings.phtml
index d1ed998d1..2c638c318 100644
--- a/application/views/scripts/dashboard/settings.phtml
+++ b/application/views/scripts/dashboard/settings.phtml
@@ -28,7 +28,7 @@
                             'dashboard/remove-pane',
                             array('pane' => $pane->getName()),
                             array(
-                                'icon'  => 'cancel',
+                                'icon'  => 'trash',
                                 'title' => sprintf($this->translate('Remove pane %s'), $pane->getName())
                             )
                         ); ?>
@@ -67,7 +67,7 @@
                                     'dashboard/remove-dashlet',
                                     array('pane' => $pane->getName(), 'dashlet' => $dashlet->getTitle()),
                                     array(
-                                        'icon'  => 'cancel',
+                                        'icon'  => 'trash',
                                         'title' => sprintf($this->translate('Remove dashlet %s from pane %s'), $dashlet->getTitle(), $pane->getName())
                                     )
                                 ); ?>
diff --git a/application/views/scripts/form/reorder-authbackend.phtml b/application/views/scripts/form/reorder-authbackend.phtml
index c31443eb6..f6b432940 100644
--- a/application/views/scripts/form/reorder-authbackend.phtml
+++ b/application/views/scripts/form/reorder-authbackend.phtml
@@ -26,7 +26,7 @@
             'config/removeAuthenticationBackend',
             array('auth_backend' => $backendNames[$i]),
             array(
-                'icon'  => 'cancel',
+                'icon'  => 'trash',
                 'title' => sprintf($this->translate('Remove authentication backend %s'), $backendNames[$i])
             )
           ); ?>
diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml
index 350fb3343..25d3d1cdd 100644
--- a/application/views/scripts/roles/index.phtml
+++ b/application/views/scripts/roles/index.phtml
@@ -60,7 +60,7 @@
                                 'roles/remove',
                                 array('role' => $name),
                                 array(
-                                    'icon'  => 'cancel',
+                                    'icon'  => 'trash',
                                     'title' => sprintf($this->translate('Remove role %s'), $name)
                                 )
                             ); ?>
diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 568b02498..8bcb9aa60 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -310,7 +310,7 @@ class FilterEditor extends AbstractWidget
             $this->preservedUrl()->with('removeFilter', $filter->getId()),
             null,
             array(
-                'icon'  => 'icon-cancel',
+                'icon'  => 'trash',
                 'title' => t('Remove this part of your filter')
             )
         );
diff --git a/modules/monitoring/application/views/scripts/config/index.phtml b/modules/monitoring/application/views/scripts/config/index.phtml
index 634da957c..201a09dae 100644
--- a/modules/monitoring/application/views/scripts/config/index.phtml
+++ b/modules/monitoring/application/views/scripts/config/index.phtml
@@ -38,7 +38,7 @@
             '/monitoring/config/removebackend',
             array('backend' => $backendName),
             array(
-                'icon'  => 'cancel',
+                'icon'  => 'trash',
                 'title' => sprintf($this->translate('Remove monitoring backend %s'), $backendName)
             )
           ); ?>
@@ -82,7 +82,7 @@
             '/monitoring/config/removeinstance',
             array('instance' => $instanceName),
             array(
-                'icon'  => 'cancel',
+                'icon'  => 'trash',
                 'title' => sprintf($this->translate('Remove monitoring instance %s'), $instanceName)
             )
           ); ?>

From e93a5f16d9ce3d82dbf1628376bb16cb332d5a5f Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 27 Feb 2015 09:51:44 +0100
Subject: [PATCH 0833/2920] Move capability-related code of the ldap connection
 into a separate class

Achieve a better separation between the different concerns, more readable code and get rid of unused dead code.
---
 library/Icinga/Protocol/Ldap/Capability.php | 218 +++++++++++++++++++
 library/Icinga/Protocol/Ldap/Connection.php | 223 ++------------------
 library/Icinga/Protocol/Ldap/Discovery.php  |  11 +-
 3 files changed, 245 insertions(+), 207 deletions(-)
 create mode 100644 library/Icinga/Protocol/Ldap/Capability.php

diff --git a/library/Icinga/Protocol/Ldap/Capability.php b/library/Icinga/Protocol/Ldap/Capability.php
new file mode 100644
index 000000000..a1da67ce2
--- /dev/null
+++ b/library/Icinga/Protocol/Ldap/Capability.php
@@ -0,0 +1,218 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Protocol\Ldap;
+
+/**
+ * The properties and capabilities of an LDAP server
+ *
+ * Provides information about the available encryption mechanisms (StartTLS), the supported
+ * LDAP protocol (v2/v3), vendor-specific extensions or protocols controls and extensions.
+ */
+class Capability {
+
+    const LDAP_SERVER_START_TLS_OID = '1.3.6.1.4.1.1466.20037';
+
+    const LDAP_PAGED_RESULT_OID_STRING = '1.2.840.113556.1.4.319';
+
+    const LDAP_SERVER_SHOW_DELETED_OID = '1.2.840.113556.1.4.417';
+
+    const LDAP_SERVER_SORT_OID = '1.2.840.113556.1.4.473';
+
+    const LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID = '1.2.840.113556.1.4.521';
+
+    const LDAP_SERVER_NOTIFICATION_OID = '1.2.840.113556.1.4.528';
+
+    const LDAP_SERVER_EXTENDED_DN_OID = '1.2.840.113556.1.4.529';
+
+    const LDAP_SERVER_LAZY_COMMIT_OID = '1.2.840.113556.1.4.619';
+
+    const LDAP_SERVER_SD_FLAGS_OID = '1.2.840.113556.1.4.801';
+
+    const LDAP_SERVER_TREE_DELETE_OID = '1.2.840.113556.1.4.805';
+
+    const LDAP_SERVER_DIRSYNC_OID = '1.2.840.113556.1.4.841';
+
+    const LDAP_SERVER_VERIFY_NAME_OID = '1.2.840.113556.1.4.1338';
+
+    const LDAP_SERVER_DOMAIN_SCOPE_OID = '1.2.840.113556.1.4.1339';
+
+    const LDAP_SERVER_SEARCH_OPTIONS_OID = '1.2.840.113556.1.4.1340';
+
+    const LDAP_SERVER_PERMISSIVE_MODIFY_OID = '1.2.840.113556.1.4.1413';
+
+    const LDAP_SERVER_ASQ_OID = '1.2.840.113556.1.4.1504';
+
+    const LDAP_SERVER_FAST_BIND_OID = '1.2.840.113556.1.4.1781';
+
+    const LDAP_CONTROL_VLVREQUEST = '2.16.840.1.113730.3.4.9';
+
+
+    // MS Capabilities, Source: http://msdn.microsoft.com/en-us/library/cc223359.aspx
+
+    // Running Active Directory as AD DS
+    const LDAP_CAP_ACTIVE_DIRECTORY_OID = '1.2.840.113556.1.4.800';
+
+    // Capable of signing and sealing on an NTLM authenticated connection
+    // and of performing subsequent binds on a signed or sealed connection
+    const LDAP_CAP_ACTIVE_DIRECTORY_LDAP_INTEG_OID = '1.2.840.113556.1.4.1791';
+
+    // If AD DS: running at least W2K3, if AD LDS running at least W2K8
+    const LDAP_CAP_ACTIVE_DIRECTORY_V51_OID = '1.2.840.113556.1.4.1670';
+
+    // If AD LDS: accepts DIGEST-MD5 binds for AD LDSsecurity principals
+    const LDAP_CAP_ACTIVE_DIRECTORY_ADAM_DIGEST  = '1.2.840.113556.1.4.1880';
+
+    // Running Active Directory as AD LDS
+    const LDAP_CAP_ACTIVE_DIRECTORY_ADAM_OID = '1.2.840.113556.1.4.1851';
+
+    // If AD DS: it's a Read Only DC (RODC)
+    const LDAP_CAP_ACTIVE_DIRECTORY_PARTIAL_SECRETS_OID = '1.2.840.113556.1.4.1920';
+
+    // Running at least W2K8
+    const LDAP_CAP_ACTIVE_DIRECTORY_V60_OID = '1.2.840.113556.1.4.1935';
+
+    // Running at least W2K8r2
+    const LDAP_CAP_ACTIVE_DIRECTORY_V61_R2_OID = '1.2.840.113556.1.4.2080';
+
+    // Running at least W2K12
+    const LDAP_CAP_ACTIVE_DIRECTORY_W8_OID = '1.2.840.113556.1.4.2237';
+
+    /**
+     * Attributes of the LDAP Server returned by the discovery query
+     *
+     * @var StdClass
+     */
+    private $attributes;
+
+    /**
+     * Map of supported available OIDS
+     *
+     * @var array
+     */
+    private $oids = array();
+
+    /**
+     * Construct a new capability
+     *
+     * @param $attributes   StdClass    The attributes returned, may be null for guessing default capabilities
+     */
+    public function __construct($attributes = null)
+    {
+        $this->attributes = $attributes;
+
+        if (isset($attributes->supportedControl)) {
+            foreach ($attributes->supportedControl as $oid) {
+                $this->oids[$oid] = true;
+            }
+        }
+        if (isset($attributes->supportedExtension)) {
+            foreach ($attributes->supportedExtension as $oid) {
+                $this->oids[$oid] = true;
+            }
+        }
+        if (isset($attributes->supportedFeatures)) {
+            foreach ($attributes->supportedFeatures as $oid) {
+                $this->oids[$oid] = true;
+            }
+        }
+        if (isset($attributes->supportedCapabilities)) {
+            foreach ($attributes->supportedCapabilities as $oid) {
+                $this->oids[$oid] = true;
+            }
+        }
+    }
+
+    /**
+     * Return if the capability object contains support for StartTLS
+     *
+     * @return      bool    Whether StartTLS is supported
+     */
+    public function hasStartTLS()
+    {
+        return isset($this->oids[self::LDAP_SERVER_START_TLS_OID]);
+    }
+
+    /**
+     * Return if the capability object contains support for StartTLS
+     *
+     * @return      bool Whether StartTLS is supported
+     */
+    public function hasPagedResult()
+    {
+        return isset($this->oids[self::LDAP_PAGED_RESULT_OID_STRING]);
+    }
+
+    /**
+     * Whether the ldap server is an ActiveDirectory server
+     *
+     * @return      boolean
+     */
+    public function hasAdOid()
+    {
+        return isset($this->oids[self::LDAP_CAP_ACTIVE_DIRECTORY_OID]);
+    }
+
+    /**
+     * Return if the capability objects contains support for LdapV3, defaults to true if discovery failed
+     *
+     * @return bool
+     */
+    public function hasLdapV3()
+    {
+        if (!isset($this->attributes)) {
+            // Default to true, if unknown
+            return true;
+        }
+
+        return (is_string($this->attributes->supportedLDAPVersion)
+            && (int) $this->attributes->supportedLDAPVersion === 3)
+        || (is_array($this->attributes->supportedLDAPVersion)
+            && in_array(3, $this->attributes->supportedLDAPVersion));
+    }
+
+    /**
+     * Whether the capability with the given OID is supported
+     *
+     * @param $oid  string  The OID of the capability
+     *
+     * @return      bool
+     */
+    public function hasOid($oid)
+    {
+        return isset($this->oids[$oid]);
+    }
+
+    /**
+     * Get the default naming context
+     *
+     * @return string|null the default naming context, or null when no contexts are available
+     */
+    public function getDefaultNamingContext()
+    {
+        // defaultNamingContext entry has higher priority
+        if (isset($this->attributes->defaultNamingContext)) {
+            return $this->attributes->defaultNamingContext;
+        }
+
+        // if its missing use namingContext
+        $namingContexts = $this->namingContexts();
+        return empty($namingContexts) ? null : $namingContexts[0];
+    }
+
+    /**
+     * Fetch the namingContexts
+     *
+     * @return array    the available naming contexts
+     */
+    public function namingContexts()
+    {
+        if (!isset($this->attributes->namingContexts)) {
+            return array();
+        }
+        if (!is_array($this->attributes->namingContexts)) {
+            return array($this->attributes->namingContexts);
+        }
+        return$this->attributes->namingContexts;
+    }
+}
diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 65eafffe0..39e447486 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -44,47 +44,6 @@ class Connection
     protected $root_dn;
     protected $count;
 
-    protected $ldap_extension = array(
-        '1.3.6.1.4.1.1466.20037' => 'STARTTLS',
-        // '1.3.6.1.4.1.4203.1.11.1' => '11.1', // PASSWORD_MODIFY
-        // '1.3.6.1.4.1.4203.1.11.3' => '11.3', // Whoami
-        // '1.3.6.1.1.8' => '8', // Cancel Extended Request
-    );
-
-    protected $ms_capability = array(
-        // Prefix LDAP_CAP_
-        // Source: http://msdn.microsoft.com/en-us/library/cc223359.aspx
-
-        // Running Active Directory as AD DS:
-        '1.2.840.113556.1.4.800'  => 'ACTIVE_DIRECTORY_OID',
-
-        // Capable of signing and sealing on an NTLM authenticated connection
-        // and of performing subsequent binds on a signed or sealed connection.
-        '1.2.840.113556.1.4.1791' => 'ACTIVE_DIRECTORY_LDAP_INTEG_OID',
-
-        // If AD DS: running at least W2K3, if AD LDS running at least W2K8
-        '1.2.840.113556.1.4.1670' => 'ACTIVE_DIRECTORY_V51_OID',
-
-        // If AD LDS: accepts DIGEST-MD5 binds for AD LDSsecurity principals
-        '1.2.840.113556.1.4.1880' => 'ACTIVE_DIRECTORY_ADAM_DIGEST',
-
-        // Running Active Directory as AD LDS
-        '1.2.840.113556.1.4.1851' => 'ACTIVE_DIRECTORY_ADAM_OID',
-
-        // If AD DS: it's a Read Only DC (RODC)
-        '1.2.840.113556.1.4.1920' => 'ACTIVE_DIRECTORY_PARTIAL_SECRETS_OID',
-
-        // Running at least W2K8
-        '1.2.840.113556.1.4.1935' => 'ACTIVE_DIRECTORY_V60_OID',
-
-        // Running at least W2K8r2
-        '1.2.840.113556.1.4.2080' => 'ACTIVE_DIRECTORY_V61_R2_OID',
-
-        // Running at least W2K12
-        '1.2.840.113556.1.4.2237' => 'ACTIVE_DIRECTORY_W8_OID',
-
-    );
-
     /**
      * Whether the bind on this connection was already performed
      *
@@ -94,11 +53,14 @@ class Connection
 
     protected $root;
 
-    protected $supports_v3  = false;
-    protected $supports_tls = false;
-
+    /**
+     * @var Capability
+     */
     protected $capabilities;
-    protected $namingContexts;
+
+    /**
+     * @var bool
+     */
     protected $discoverySuccess = false;
 
     /**
@@ -374,8 +336,8 @@ class Connection
         $cookie = '';
         $entries = array();
         do {
-            // do not set controlPageResult as a critical extension, since we still want the
-            // server to return an answer in case the pagination extension is missing.
+            // do not set controlPageResult as a critical extension, since there is still the possibillity that the
+            // server returns an answer in case the pagination extension is missing.
             ldap_control_paged_result($this->ds, $pageSize, false, $cookie);
 
             $results = @ldap_search($this->ds, $base, $queryString, $fields, 0, $limit ? $offset + $limit : 0);
@@ -516,24 +478,18 @@ class Connection
 
         $ds = ldap_connect($this->hostname, $this->port);
         try {
-            $capabilities = $this->discoverCapabilities($ds);
-            list($cap, $namingContexts) = $capabilities;
+            $this->capabilities = $this->discoverCapabilities($ds);
             $this->discoverySuccess = true;
+
         } catch (LdapException $e) {
 
-            // discovery failed, guess defaults
-            $cap = (object) array(
-                'supports_ldapv3'   => true,
-                'supports_starttls' => false,
-                'msCapabilities'    => array()
-            );
-            $namingContexts = null;
+            // create empty default capabilities
+            Logger::warning('LADP discovery failed, assuming default LDAP settings.');
+            $this->capabilities = new Capability();
         }
-        $this->capabilities = $cap;
-        $this->namingContexts = $namingContexts;
 
         if ($use_tls) {
-            if ($cap->supports_starttls) {
+            if ($this->capabilities->hasStartTLS()) {
                 if (@ldap_start_tls($ds)) {
                     Logger::debug('LDAP STARTTLS succeeded');
                 } else {
@@ -549,11 +505,11 @@ class Connection
                     $this->hostname
                 );
             } else {
-                // TODO: Log noticy -> TLS enabled but not announced
+                Logger::warning('LDAP TLS enabled but not announced');
             }
         }
         // ldap_rename requires LDAPv3:
-        if ($cap->supports_ldapv3) {
+        if ($this->capabilities->hasLdapV3()) {
             if (! ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3)) {
                 throw new LdapException('LDAPv3 is required');
             }
@@ -591,141 +547,15 @@ class Connection
     }
 
     /**
-     * Return if the capability object contains support for StartTLS
+     * Get the capabilities of the connected server
      *
-     * @param $cap  The object containing the capabilities
-     *
-     * @return bool Whether StartTLS is supported
-     */
-    protected function hasCapabilityStartTLS($cap)
-    {
-        $cap = $this->getExtensionCapabilities($cap);
-        return isset($cap['1.3.6.1.4.1.1466.20037']);
-    }
-
-    /**
-     * Return if the capability objects contains support for LdapV3
-     *
-     * @param $cap
-     *
-     * @return bool
-     */
-    protected function hasCapabilityLdapV3($cap)
-    {
-        if ((is_string($cap->supportedLDAPVersion)
-                && (int) $cap->supportedLDAPVersion === 3)
-            || (is_array($cap->supportedLDAPVersion)
-                && in_array(3, $cap->supportedLDAPVersion)
-            )) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Extract an array of all extension capabilities from the given ldap response
-     *
-     * @param $cap      object  The response returned by a ldap_search discovery query
-     *
-     * @return object           The extracted capabilities.
-     */
-    protected function getExtensionCapabilities($cap)
-    {
-        $extensions = array();
-        if (isset($cap->supportedExtension)) {
-            foreach ($cap->supportedExtension as $oid) {
-                if (array_key_exists($oid, $this->ldap_extension)) {
-                    if ($this->ldap_extension[$oid] === 'STARTTLS') {
-                        $extensions['1.3.6.1.4.1.1466.20037'] = $this->ldap_extension['1.3.6.1.4.1.1466.20037'];
-                    }
-                }
-            }
-        }
-        return $extensions;
-    }
-
-    /**
-     * Extract an array of all MSAD capabilities from the given ldap response
-     *
-     * @param $cap      object  The response returned by a ldap_search discovery query
-     *
-     * @return object           The extracted capabilities.
-     */
-    protected function getMsCapabilities($cap)
-    {
-        $ms = array();
-        foreach ($this->ms_capability as $name) {
-            $ms[$this->convName($name)] = false;
-        }
-
-        if (isset($cap->supportedCapabilities)) {
-            foreach ($cap->supportedCapabilities as $oid) {
-                if (array_key_exists($oid, $this->ms_capability)) {
-                    $ms[$this->convName($this->ms_capability[$oid])] = true;
-                }
-            }
-        }
-        return (object)$ms;
-    }
-
-    /**
-     * Convert a single capability name entry into camel-case
-     *
-     * @param   $name   string  The name to convert
-     *
-     * @return          string  The name in camel-case
-     */
-    private function convName($name)
-    {
-        $parts = explode('_', $name);
-        foreach ($parts as $i => $part) {
-            $parts[$i] = ucfirst(strtolower($part));
-        }
-        return implode('', $parts);
-    }
-
-    /**
-     * Get the capabilities of this ldap server
-     *
-     * @return stdClass     An object, providing the flags 'ldapv3' and 'starttls' to indicate LdapV3 and StartTLS
-     * support and an additional property 'msCapabilities', containing all supported active directory capabilities.
+     * @return Capability   The capability object
      */
     public function getCapabilities()
     {
         return $this->capabilities;
     }
 
-    /**
-     * Get the default naming context of this ldap connection
-     *
-     * @return string|null the default naming context, or null when no contexts are available
-     */
-    public function getDefaultNamingContext()
-    {
-        $cap = $this->capabilities;
-        if (isset($cap->defaultNamingContext)) {
-            return $cap->defaultNamingContext;
-        }
-        $namingContexts = $this->namingContexts($cap);
-        return empty($namingContexts) ? null : $namingContexts[0];
-    }
-
-    /**
-     * Fetch the namingContexts for this Ldap-Connection
-     *
-     * @return array    the available naming contexts
-     */
-    public function namingContexts()
-    {
-        if (!isset($this->namingContexts)) {
-            return array();
-        }
-        if (!is_array($this->namingContexts)) {
-            return array($this->namingContexts);
-        }
-        return $this->namingContexts;
-    }
-
     /**
      * Whether service discovery was successful
      *
@@ -742,7 +572,7 @@ class Connection
      *
      * @param  resource     $ds     The link identifier of the current ldap connection
      *
-     * @return array                The capabilities and naming-contexts
+     * @return Capability           The capabilities
      * @throws LdapException        When the capability query fails
      */
     protected function discoverCapabilities($ds)
@@ -759,6 +589,7 @@ class Connection
                 'schemaNamingContext',
                 'supportedLDAPVersion', // => array(3, 2)
                 'supportedCapabilities',
+                'supportedControl',
                 'supportedExtension',
                 '+'
             )
@@ -789,19 +620,9 @@ class Connection
             );
         }
 
-        $cap = (object) array(
-            'supports_ldapv3'   => false,
-            'supports_starttls' => false,
-            'msCapabilities' => array()
-        );
-
         $ldapAttributes = ldap_get_attributes($ds, $entry);
         $result = $this->cleanupAttributes($ldapAttributes);
-        $cap->supports_ldapv3 = $this->hasCapabilityLdapV3($result);
-        $cap->supports_starttls = $this->hasCapabilityStartTLS($result);
-        $cap->msCapabilities = $this->getMsCapabilities($result);
-
-        return array($cap,  $result->namingContexts);
+        return new Capability($result);
     }
 
     /**
diff --git a/library/Icinga/Protocol/Ldap/Discovery.php b/library/Icinga/Protocol/Ldap/Discovery.php
index 18ef40307..1d7acbab9 100644
--- a/library/Icinga/Protocol/Ldap/Discovery.php
+++ b/library/Icinga/Protocol/Ldap/Discovery.php
@@ -54,7 +54,7 @@ class Discovery {
         return array(
             'hostname' => $this->connection->getHostname(),
             'port' => $this->connection->getPort(),
-            'root_dn' => $this->connection->getDefaultNamingContext()
+            'root_dn' => $this->connection->getCapabilities()->getDefaultNamingContext()
         );
     }
 
@@ -69,14 +69,14 @@ class Discovery {
         $this->execDiscovery();
         if ($this->isAd()) {
             return array(
-                'base_dn' => $this->connection->getDefaultNamingContext(),
+                'base_dn' => $this->connection->getCapabilities()->getDefaultNamingContext(),
                 'user_class' => 'user',
                 'user_name_attribute' => 'sAMAccountName'
             );
         } else {
             return array(
-                'base_dn' => $this->connection->getDefaultNamingContext(),
-                'user_class' => 'getDefaultNamingContext',
+                'base_dn' => $this->connection->getCapabilities()->getDefaultNamingContext(),
+                'user_class' => 'inetOrgPerson',
                 'user_name_attribute' => 'uid'
             );
         }
@@ -90,8 +90,7 @@ class Discovery {
     public function isAd()
     {
         $this->execDiscovery();
-        $caps = $this->connection->getCapabilities();
-        return isset($caps->msCapabilities->ActiveDirectoryOid) && $caps->msCapabilities->ActiveDirectoryOid;
+        return $this->connection->getCapabilities()->hasAdOid();
     }
 
     /**

From 65821863faf1f4c9e0f5f370133c16014f6087c8 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 27 Feb 2015 16:59:50 +0100
Subject: [PATCH 0834/2920] Don't crash on single ldap capability entries

refs #8490
---
 library/Icinga/Protocol/Ldap/Capability.php | 30 ++++++++-------------
 library/Icinga/Protocol/Ldap/Connection.php |  1 -
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Capability.php b/library/Icinga/Protocol/Ldap/Capability.php
index a1da67ce2..76d1f11a0 100644
--- a/library/Icinga/Protocol/Ldap/Capability.php
+++ b/library/Icinga/Protocol/Ldap/Capability.php
@@ -101,24 +101,16 @@ class Capability {
     {
         $this->attributes = $attributes;
 
-        if (isset($attributes->supportedControl)) {
-            foreach ($attributes->supportedControl as $oid) {
-                $this->oids[$oid] = true;
-            }
-        }
-        if (isset($attributes->supportedExtension)) {
-            foreach ($attributes->supportedExtension as $oid) {
-                $this->oids[$oid] = true;
-            }
-        }
-        if (isset($attributes->supportedFeatures)) {
-            foreach ($attributes->supportedFeatures as $oid) {
-                $this->oids[$oid] = true;
-            }
-        }
-        if (isset($attributes->supportedCapabilities)) {
-            foreach ($attributes->supportedCapabilities as $oid) {
-                $this->oids[$oid] = true;
+        $keys = array('supportedControl', 'supportedExtension', 'supportedFeatures', 'supportedCapabilities');
+        foreach ($keys as $key) {
+            if (isset($attributes->$key)) {
+                if (is_array($attributes->$key)) {
+                    foreach ($attributes->$key as $oid) {
+                        $this->oids[$oid] = true;
+                    }
+                } else {
+                    $this->oids[$attributes->$key] = true;
+                }
             }
         }
     }
@@ -160,7 +152,7 @@ class Capability {
      */
     public function hasLdapV3()
     {
-        if (!isset($this->attributes)) {
+        if (! isset($this->attributes) || ! isset($this->attributes->supportedLDAPVersion)) {
             // Default to true, if unknown
             return true;
         }
diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 39e447486..57b1617a5 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -469,7 +469,6 @@ class Connection
     protected function prepareNewConnection()
     {
         $use_tls = false;
-        $force_tls = true;
         $force_tls = false;
 
         if ($use_tls) {

From 36d2d31035239be0702f527914078f4cef968dc0 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 27 Feb 2015 17:08:11 +0100
Subject: [PATCH 0835/2920] Do not use page control unless explicitly announced

refs #8490
---
 library/Icinga/Protocol/Ldap/Connection.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 57b1617a5..053c6c908 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -299,7 +299,9 @@ class Connection
      */
     protected function pageControlAvailable(Query $query)
     {
-        return $query->getUsePagedResults() && version_compare(PHP_VERSION, '5.4.0') >= 0;
+        return $this->capabilities->hasPagedResult() &&
+               $query->getUsePagedResults() &&
+               version_compare(PHP_VERSION, '5.4.0') >= 0;
     }
 
     /**
@@ -336,8 +338,8 @@ class Connection
         $cookie = '';
         $entries = array();
         do {
-            // do not set controlPageResult as a critical extension, since there is still the possibillity that the
-            // server returns an answer in case the pagination extension is missing.
+            // do not set controlPageResult as a critical extension, since we still want the
+            // possibillity  server to return an answer in case the pagination extension is missing.
             ldap_control_paged_result($this->ds, $pageSize, false, $cookie);
 
             $results = @ldap_search($this->ds, $base, $queryString, $fields, 0, $limit ? $offset + $limit : 0);

From e4f71eacd6f3aa6775ac233c868ba7022422dd19 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 27 Feb 2015 17:11:12 +0100
Subject: [PATCH 0836/2920] Add unit tests for ldap connection behavior

It is important that we test handling of protocol extensions properly, to prohibit errors that are difficult to reproduce like this in the future.

fixes #7993
---
 .../Icinga/Protocol/Ldap/ConnectionTest.php   | 258 ++++++++++++++++++
 1 file changed, 258 insertions(+)
 create mode 100644 test/php/library/Icinga/Protocol/Ldap/ConnectionTest.php

diff --git a/test/php/library/Icinga/Protocol/Ldap/ConnectionTest.php b/test/php/library/Icinga/Protocol/Ldap/ConnectionTest.php
new file mode 100644
index 000000000..182004703
--- /dev/null
+++ b/test/php/library/Icinga/Protocol/Ldap/ConnectionTest.php
@@ -0,0 +1,258 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+// We need to overwrite the library functions in the regular namespace to mock library functions. We run
+// this test in a separate process to not alter different test cases.
+namespace Icinga\Protocol\Ldap;
+
+use Icinga\Test\BaseTestCase;
+use Icinga\Data\ConfigObject;
+use Mockery;
+
+/**
+ *  @runTestsInSeparateProcesses
+ */
+class ConnectionTest extends BaseTestCase
+{
+    private $connection;
+
+    public $pagedResultsCalled;
+    public $startTlsCalled;
+    public $activatedOptions;
+
+    private function mockLdapFunctions () {
+
+        global $self;
+        $self = $this;
+
+        function ldap_connect()
+        {
+            return true;
+        }
+
+        function ldap_bind()
+        {
+            return true;
+        }
+
+        function ldap_search ()
+        {
+            return true;
+        }
+
+        function ldap_get_entries()
+        {
+            return 1;
+        }
+
+        function ldap_count_entries()
+        {
+            return 1;
+        }
+
+        function ldap_read()
+        {
+            return true;
+        }
+
+        function ldap_first_entry($ds, $result)
+        {
+            return $result;
+        }
+
+        function ldap_get_attributes()
+        {
+            global $self;
+            return $self->getAttributesMock;
+        }
+
+        function ldap_start_tls()
+        {
+            global $self;
+            $self->startTlsCalled = true;
+        }
+
+        function ldap_set_option($ds, $option, $value)
+        {
+            global $self;
+            $self->activatedOptions[$option] = $value;
+            return true;
+        }
+
+        function ldap_set($ds, $option)
+        {
+            global $self;
+            $self->activatedOptions[] = $option;
+        }
+
+        function ldap_control_paged_result()
+        {
+            global $self;
+            $self->pagedResultsCalled = true;
+            return true;
+        }
+
+        function ldap_control_paged_result_response()
+        {
+            return true;
+        }
+
+        function ldap_get_dn()
+        {
+            return NULL;
+        }
+
+        function ldap_free_result()
+        {
+            return NULL;
+        }
+    }
+
+    private function node(&$element, $name)
+    {
+        $element['count']++;
+        $element[$name] = array('count' => 0);
+        $element[] = $name;
+    }
+
+    private function addEntry(&$element, $name, $entry)
+    {
+        $element[$name]['count']++;
+        $element[$name][] = $entry;
+    }
+
+    private function mockQuery()
+    {
+        return Mockery::mock('overload:Icinga\Protocol\Ldap\Query')
+                ->shouldReceive(array(
+                    'from' => Mockery::self(),
+                    'create' => array('count' => 1),
+                    'listFields' => array('count' => 1),
+                    'getLimit' => 1,
+                    'hasOffset' => false,
+                    'hasBase' => false,
+                    'getSortColumns' => array(),
+                    'getUsePagedResults' => true
+                ));
+    }
+
+    private function connectionFetchAll()
+    {
+        $this->mockQuery();
+        $this->connection->connect();
+        $this->connection->fetchAll(Mockery::self());
+    }
+
+    public function setUp()
+    {
+        $this->pagedResultsCalled = false;
+        $this->startTlsCalled = false;
+        $this->activatedOptions = array();
+
+        $this->mockLdapFunctions();
+
+        $config = new ConfigObject(
+            array(
+                'hostname' => 'localhost',
+                'root_dn'  => 'dc=example,dc=com',
+                'bind_dn'  => 'cn=user,ou=users,dc=example,dc=com',
+                'bind_pw'  => '***'
+            )
+        );
+        $this->connection = new Connection($config);
+
+        $caps = array('count' => 0);
+        $this->node($caps, 'defaultNamingContext');
+        $this->node($caps, 'namingContexts');
+        $this->node($caps, 'supportedCapabilities');
+        $this->node($caps, 'supportedControl');
+        $this->node($caps, 'supportedLDAPVersion');
+        $this->node($caps, 'supportedExtension');
+        $this->getAttributesMock = $caps;
+    }
+
+    public function testUsePageControlWhenAnnounced()
+    {
+        if (version_compare(PHP_VERSION, '5.4.0') < 0) {
+            $this->markTestSkipped('Page control needs at least PHP_VERSION 5.4.0');
+        }
+
+        $this->addEntry($this->getAttributesMock, 'supportedControl', Capability::LDAP_PAGED_RESULT_OID_STRING);
+        $this->connectionFetchAll();
+
+        // see ticket #7993
+        $this->assertEquals(true, $this->pagedResultsCalled, "Use paged result when capability is present.");
+    }
+
+    public function testDontUsePagecontrolWhenNotAnnounced()
+    {
+        if (version_compare(PHP_VERSION, '5.4.0') < 0) {
+            $this->markTestSkipped('Page control needs at least PHP_VERSION 5.4.0');
+        }
+        $this->connectionFetchAll();
+
+        // see ticket #8490
+        $this->assertEquals(false, $this->pagedResultsCalled, "Don't use paged result when capability is not announced.");
+    }
+
+    public function testUseLdapV2WhenAnnounced()
+    {
+         // TODO: Test turned off, see other TODO in Ldap/Connection.
+         $this->markTestSkipped('LdapV2 currently turned off.');
+
+         $this->addEntry($this->getAttributesMock, 'supportedLDAPVersion', 2);
+         $this->connectionFetchAll();
+
+         $this->assertArrayHasKey(LDAP_OPT_PROTOCOL_VERSION, $this->activatedOptions, "LDAP version must be set");
+         $this->assertEquals($this->activatedOptions[LDAP_OPT_PROTOCOL_VERSION], 2);
+    }
+
+    public function testUseLdapV3WhenAnnounced()
+    {
+        $this->addEntry($this->getAttributesMock, 'supportedLDAPVersion', 3);
+        $this->connectionFetchAll();
+
+        $this->assertArrayHasKey(LDAP_OPT_PROTOCOL_VERSION, $this->activatedOptions, "LDAP version must be set");
+        $this->assertEquals($this->activatedOptions[LDAP_OPT_PROTOCOL_VERSION], 3, "LDAPv3 must be active");
+    }
+
+    public function testDefaultSettings()
+    {
+        $this->connectionFetchAll();
+
+        $this->assertArrayHasKey(LDAP_OPT_PROTOCOL_VERSION, $this->activatedOptions, "LDAP version must be set");
+        $this->assertEquals($this->activatedOptions[LDAP_OPT_PROTOCOL_VERSION], 3, "LDAPv3 must be active");
+
+        $this->assertArrayHasKey(LDAP_OPT_REFERRALS, $this->activatedOptions, "Following referrals must be turned off");
+        $this->assertEquals($this->activatedOptions[LDAP_OPT_REFERRALS], 0, "Following referrals must be turned off");
+    }
+
+
+    public function testActiveDirectoryDiscovery()
+    {
+        $this->addEntry($this->getAttributesMock, 'supportedCapabilities', Capability::LDAP_CAP_ACTIVE_DIRECTORY_OID);
+        $this->connectionFetchAll();
+
+        $this->assertEquals(true, $this->connection->getCapabilities()->hasAdOid(),
+            "Server with LDAP_CAP_ACTIVE_DIRECTORY_OID must be recognized as Active Directory.");
+    }
+
+    public function testDefaultNamingContext()
+    {
+        $this->addEntry($this->getAttributesMock, 'defaultNamingContext', 'dn=default,dn=contex');
+        $this->connectionFetchAll();
+
+        $this->assertEquals('dn=default,dn=contex', $this->connection->getCapabilities()->getDefaultNamingContext(),
+            'Default naming context must be correctly recognized.');
+    }
+
+    public function testDefaultNamingContextFallback()
+    {
+        $this->addEntry($this->getAttributesMock, 'namingContexts', 'dn=some,dn=other,dn=context');
+        $this->addEntry($this->getAttributesMock, 'namingContexts', 'dn=default,dn=context');
+        $this->connectionFetchAll();
+
+        $this->assertEquals('dn=some,dn=other,dn=context', $this->connection->getCapabilities()->getDefaultNamingContext(),
+            'If defaultNamingContext is missing, the connection must fallback to first namingContext.');
+    }
+}

From 0f3c27f8122836ca9fb61597156ff5b622116b33 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 2 Mar 2015 12:27:27 +0100
Subject: [PATCH 0837/2920] Fix event grid for dashboard

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

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 60c669f93..b1b96b477 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -397,6 +397,7 @@ class Monitoring_ListController extends Controller
         $form->render();
         $this->view->form = $form;
 
+        $this->params->remove('view');
         $orientation = $this->params->shift('vertical', 0) ? 'vertical' : 'horizontal';
 /*
         $orientationBox = new SelectBox(

From 1a334f8d642c1628597411961c4a69e7bdc25543 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Mar 2015 13:45:24 +0100
Subject: [PATCH 0838/2920] Add decorator FormDescriptions

This decorator displays a list of messages at the top of a form.

refs #7947
---
 library/Icinga/Web/Form.php                   | 51 +++++++++++++++++
 .../Web/Form/Decorator/FormDescriptions.php   | 55 +++++++++++++++++++
 public/css/icinga/forms.less                  | 24 +++++++-
 public/css/icinga/main-content.less           |  2 +-
 4 files changed, 128 insertions(+), 4 deletions(-)
 create mode 100644 library/Icinga/Web/Form/Decorator/FormDescriptions.php

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 0dc607412..e97190d66 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -126,6 +126,13 @@ class Form extends Zend_Form
      */
     protected $requiredCue = '*';
 
+    /**
+     * The descriptions of this form
+     *
+     * @var array
+     */
+    protected $descriptions;
+
     /**
      * Authentication manager
      *
@@ -436,6 +443,49 @@ class Form extends Zend_Form
         return $this->requiredCue;
     }
 
+    /**
+     * Set the descriptions for this form
+     *
+     * @param   array   $descriptions
+     *
+     * @return  Form
+     */
+    public function setDescriptions(array $descriptions)
+    {
+        $this->descriptions = $descriptions;
+        return $this;
+    }
+
+    /**
+     * Add a description for this form
+     *
+     * If $description is an array the second value should be
+     * an array as well containing additional HTML properties.
+     *
+     * @param   string|array    $description
+     *
+     * @return  Form
+     */
+    public function addDescription($description)
+    {
+        $this->descriptions[] = $description;
+        return $this;
+    }
+
+    /**
+     * Return the descriptions of this form
+     *
+     * @return  array
+     */
+    public function getDescriptions()
+    {
+        if ($this->descriptions === null) {
+            return array();
+        }
+
+        return $this->descriptions;
+    }
+
     /**
      * Create this form
      *
@@ -860,6 +910,7 @@ class Form extends Zend_Form
                 ));
             } else {
                 $this->addDecorator('FormErrors', array('onlyCustomFormErrors' => true))
+                    ->addDecorator('FormDescriptions')
                     ->addDecorator('FormElements')
                     //->addDecorator('HtmlTag', array('tag' => 'dl', 'class' => 'zend_form'))
                     ->addDecorator('Form');
diff --git a/library/Icinga/Web/Form/Decorator/FormDescriptions.php b/library/Icinga/Web/Form/Decorator/FormDescriptions.php
new file mode 100644
index 000000000..936708e62
--- /dev/null
+++ b/library/Icinga/Web/Form/Decorator/FormDescriptions.php
@@ -0,0 +1,55 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Web\Form\Decorator;
+
+use Zend_Form_Decorator_Abstract;
+use Icinga\Web\Form;
+
+/**
+ * Decorator to add a list of descriptions at the top of a form
+ */
+class FormDescriptions extends Zend_Form_Decorator_Abstract
+{
+    /**
+     * Render form descriptions
+     *
+     * @param   string      $content    The html rendered so far
+     *
+     * @return  string                  The updated html
+     */
+    public function render($content = '')
+    {
+        $form = $this->getElement();
+        if (! $form instanceof Form) {
+            return $content;
+        }
+
+        $view = $form->getView();
+        if ($view === null) {
+            return $content;
+        }
+
+        $descriptions = $form->getDescriptions();
+        if (empty($descriptions)) {
+            return $content;
+        }
+
+        $html = '<ul class="descriptions">';
+        foreach ($descriptions as $description) {
+            if (is_array($description)) {
+                list($description, $properties) = $description;
+                $html .= '<li' . $view->propertiesToString($properties) . '>' . $view->escape($description) . '</li>';
+            } else {
+                $html .= '<li>' . $view->escape($description) . '</li>';
+            }
+        }
+
+        switch ($this->getPlacement()) {
+            case self::APPEND:
+                return $content . $html . '</ul>';
+            case self::PREPEND:
+                return $html . '</ul>' . $content;
+        }
+    }
+}
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index ae7ebf720..d503ba037 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -126,10 +126,10 @@ input.link-like:hover, button.link-like:focus {
 .non-list-like-list {
   list-style-type: none;
   margin: 0;
-  padding: 0;
+  padding: 0.5em 0.5em 0;
 
   li {
-    margin: 0.5em;
+    padding-bottom: 0.5em;
   }
 }
 
@@ -146,12 +146,16 @@ form div.element ul.errors {
 
 form ul.form-errors {
   .non-list-like-list;
-  display: inline-block;
   margin-bottom: 1em;
   background-color: @colorCritical;
 
   ul.errors {
     .non-list-like-list;
+    padding: 0;
+
+    li:last-child {
+      padding-bottom: 0;
+    }
   }
 
   li {
@@ -209,4 +213,18 @@ button.noscript-apply {
 
 html.no-js i.autosubmit-warning {
   .sr-only;
+}
+
+form ul.descriptions {
+  .info-box;
+  padding: 0.5em 0.5em 0 1.8em;
+
+  li {
+    padding-bottom: 0.5em;
+
+    &:only-child {
+      margin-left: -1.3em;
+      list-style-type: none;
+    }
+  }
 }
\ No newline at end of file
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 74f9e1a6d..32054e242 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -206,5 +206,5 @@ table.benchmark {
 .info-box {
   padding: 0.5em;
   border: 1px solid lightgrey;
-  background-color: infobackground;
+  background-color: #fbfcc5;
 }

From 1eacaa4c48daad665b1a1e3b44c19cb7d865d2df Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Mar 2015 13:48:35 +0100
Subject: [PATCH 0839/2920] Improve the display of the text cue on required
 form elements

Shows just a message at the top of the form if all elements are required
and a explaining message what the cue is standing for otherwise.

refs #7934
---
 .../Web/Form/Decorator/FormDescriptions.php   | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/library/Icinga/Web/Form/Decorator/FormDescriptions.php b/library/Icinga/Web/Form/Decorator/FormDescriptions.php
index 936708e62..ecf16d578 100644
--- a/library/Icinga/Web/Form/Decorator/FormDescriptions.php
+++ b/library/Icinga/Web/Form/Decorator/FormDescriptions.php
@@ -8,6 +8,8 @@ use Icinga\Web\Form;
 
 /**
  * Decorator to add a list of descriptions at the top of a form
+ *
+ * The description for required form elements is automatically being handled.
  */
 class FormDescriptions extends Zend_Form_Decorator_Abstract
 {
@@ -31,6 +33,10 @@ class FormDescriptions extends Zend_Form_Decorator_Abstract
         }
 
         $descriptions = $form->getDescriptions();
+        if (($requiredDesc = $this->getRequiredDescription($form)) !== null) {
+            $descriptions[] = $requiredDesc;
+        }
+
         if (empty($descriptions)) {
             return $content;
         }
@@ -52,4 +58,53 @@ class FormDescriptions extends Zend_Form_Decorator_Abstract
                 return $html . '</ul>' . $content;
         }
     }
+
+    /**
+     * Return the description for the given form's required elements
+     *
+     * @param   Form    $form
+     *
+     * @return  string|null
+     */
+    protected function getRequiredDescription(Form $form)
+    {
+        if (($cue = $form->getRequiredCue()) === null) {
+            return;
+        }
+
+        $requiredLabels = array();
+        $entirelyRequired = true;
+        $partiallyRequired = false;
+        $blacklist = array(
+            'Zend_Form_Element_Hidden',
+            'Zend_Form_Element_Submit',
+            'Zend_Form_Element_Button',
+            'Icinga\Web\Form\Element\CsrfCounterMeasure'
+        );
+        foreach ($form->getElements() as $element) {
+            if (! in_array($element->getType(), $blacklist)) {
+                if (! $element->isRequired()) {
+                    $entirelyRequired = false;
+                } else {
+                    $partiallyRequired = true;
+                    if (($label = $element->getDecorator('label')) !== false) {
+                        $requiredLabels[] = $label;
+                    }
+                }
+            }
+        }
+
+        if ($entirelyRequired && $partiallyRequired) {
+            foreach ($requiredLabels as $label) {
+                $label->setRequiredSuffix('');
+            }
+
+            return $form->getView()->translate('All fields are required and must be filled in to complete the form.');
+        } elseif ($partiallyRequired) {
+            return $form->getView()->translate(sprintf(
+                'Required fields are marked with %s and must be filled in to complete the form.',
+                $cue
+            ));
+        }
+    }
 }

From 92a15a6ee43aa24abfbe1a71d94b179a97fa7ce0 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 2 Mar 2015 18:16:46 +0100
Subject: [PATCH 0840/2920] Fix badge css

Nav element added for accesssibility destroyed the badge CSS. Make badge CSS more robust against inserted elements.
---
 public/css/icinga/widgets.less | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index 1da6b7bfb..45701a697 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -230,29 +230,29 @@ li li .badge-container {
   background-color: @colorInvalid;
 }
 
-#menu > ul > li.active > .badge-container {
+#menu nav > ul > li.active > .badge-container {
   display: none;
 }
 
-#menu > ul > li.hover > .badge-container {
+#menu nav > ul > li.hover > .badge-container {
   display: none;
 }
 
-#menu > ul > li.active > ul > li .badge-container {
+#menu nav > ul > li.active > ul > li .badge-container {
   position: relative;
   top: -0.5em;
 }
 
-#menu > ul > li.hover > ul > li > a {
+#menu nav > ul > li.hover > ul > li > a {
   width: 12.5em;
 }
 
-#menu > ul > li.hover > ul > li .badge-container {
+#menu nav > ul > li.hover > ul > li .badge-container {
   position: relative;
   top: -0.5em;
 }
 
-#menu > ul > li.hover > ul > li  {
+#menu nav > ul > li.hover > ul > li  {
   // prevent floating badges from resizing list items in webkit
   //max-height: 2em;
 }

From 65eafc0e8fadc389fd020d348026d3dcc26f980e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Mar 2015 18:15:13 +0100
Subject: [PATCH 0841/2920] LdapDiscoveryForm: Remove waste

---
 application/forms/LdapDiscoveryForm.php | 39 -------------------------
 1 file changed, 39 deletions(-)

diff --git a/application/forms/LdapDiscoveryForm.php b/application/forms/LdapDiscoveryForm.php
index e05be6eaa..fc1625385 100644
--- a/application/forms/LdapDiscoveryForm.php
+++ b/application/forms/LdapDiscoveryForm.php
@@ -30,45 +30,6 @@ class LdapDiscoveryForm extends Form
             )
         );
 
-        if (false) {
-            $this->addElement(
-                'note',
-                'additional_description',
-                array(
-                    'value' => $this->translate('No Ldap servers found on this domain.'
-                        . ' You can try to specify host and port and try again, or just skip this step and '
-                        . 'configure the server manually.'
-                    )
-                )
-            );
-            $this->addElement(
-                'text',
-                'hostname',
-                array(
-                    'required'      => false,
-                    'label'         => $this->translate('Host'),
-                    'description'   => $this->translate('IP or hostname to search.'),
-                )
-            );
-
-            $this->addElement(
-                'text',
-                'port',
-                array(
-                    'required'      => false,
-                    'label'         => $this->translate('Port'),
-                    'description'   => $this->translate('Port', 389),
-                )
-            );
-        }
         return $this;
     }
-
-    public function isValid($data)
-    {
-        if (false === parent::isValid($data)) {
-            return false;
-        }
-        return true;
-    }
 }

From e9bae08a6eecaea26e446cc23f393e7408e0924b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Mar 2015 18:19:41 +0100
Subject: [PATCH 0842/2920] Fix that one can't advance the wizard when skipping
 the ldap discovery

fixes #8506
---
 application/forms/LdapDiscoveryForm.php       |  1 -
 .../application/forms/LdapDiscoveryPage.php   | 21 +++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/application/forms/LdapDiscoveryForm.php b/application/forms/LdapDiscoveryForm.php
index fc1625385..3e129934d 100644
--- a/application/forms/LdapDiscoveryForm.php
+++ b/application/forms/LdapDiscoveryForm.php
@@ -24,7 +24,6 @@ class LdapDiscoveryForm extends Form
             'text',
             'domain',
             array(
-                'required'      => true,
                 'label'         => $this->translate('Search Domain'),
                 'description'   => $this->translate('Search this domain for records of available servers.'),
             )
diff --git a/modules/setup/application/forms/LdapDiscoveryPage.php b/modules/setup/application/forms/LdapDiscoveryPage.php
index addc40545..6dbec66da 100644
--- a/modules/setup/application/forms/LdapDiscoveryPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryPage.php
@@ -3,7 +3,9 @@
 
 namespace Icinga\Module\Setup\Forms;
 
+use Zend_Validate_NotEmpty;
 use Icinga\Web\Form;
+use Icinga\Web\Form\ErrorLabeller;
 use Icinga\Forms\LdapDiscoveryForm;
 use Icinga\Protocol\Ldap\Discovery;
 use Icinga\Module\Setup\Forms\LdapDiscoveryConfirmPage;
@@ -55,15 +57,11 @@ class LdapDiscoveryPage extends Form
 
         $discoveryForm = new LdapDiscoveryForm();
         $this->addElements($discoveryForm->createElements($formData)->getElements());
-        $this->getElement('domain')->setRequired(
-            isset($formData['skip_validation']) === false || ! $formData['skip_validation']
-        );
 
         $this->addElement(
             'checkbox',
             'skip_validation',
             array(
-                'required'      => true,
                 'label'         => $this->translate('Skip'),
                 'description'   => $this->translate('Do not discover LDAP servers and enter all settings manually.')
             )
@@ -82,19 +80,24 @@ class LdapDiscoveryPage extends Form
         if (false === parent::isValid($data)) {
             return false;
         }
-        if ($data['skip_validation']) {
+        if (isset($data['skip_validation']) && $data['skip_validation']) {
             return true;
         }
 
-        if (isset($data['domain'])) {
+        if (isset($data['domain']) && $data['domain']) {
             $this->discovery = Discovery::discoverDomain($data['domain']);
             if ($this->discovery->isSuccess()) {
                 return true;
             }
+
+            $this->addError(
+                sprintf($this->translate('Could not find any LDAP servers on the domain "%s".'), $data['domain'])
+            );
+        } else {
+            $labeller = new ErrorLabeller(array('element' => $this->getElement('domain')));
+            $this->getElement('domain')->addError($labeller->translate(Zend_Validate_NotEmpty::IS_EMPTY));
         }
-        $this->addError(
-            sprintf($this->translate('Could not find any LDAP servers on the domain "%s".'), $data['domain'])
-        );
+
         return false;
     }
 

From cbd061aa4156b1631f5a08ae0f561247ff1c4aca Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Mar 2015 18:20:29 +0100
Subject: [PATCH 0843/2920] Fix that the FormDescriptions decorator does not
 ignore Notes and Buttons

---
 library/Icinga/Web/Form/Decorator/FormDescriptions.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/library/Icinga/Web/Form/Decorator/FormDescriptions.php b/library/Icinga/Web/Form/Decorator/FormDescriptions.php
index ecf16d578..012c934a1 100644
--- a/library/Icinga/Web/Form/Decorator/FormDescriptions.php
+++ b/library/Icinga/Web/Form/Decorator/FormDescriptions.php
@@ -79,6 +79,8 @@ class FormDescriptions extends Zend_Form_Decorator_Abstract
             'Zend_Form_Element_Hidden',
             'Zend_Form_Element_Submit',
             'Zend_Form_Element_Button',
+            'Icinga\Web\Form\Element\Note',
+            'Icinga\Web\Form\Element\Button',
             'Icinga\Web\Form\Element\CsrfCounterMeasure'
         );
         foreach ($form->getElements() as $element) {

From ad288c08ca5bc64b4c8ff7d1684c6f0a10c7b464 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Mar 2015 18:24:02 +0100
Subject: [PATCH 0844/2920] Form: Add the Description decorator by default for
 native title support

---
 library/Icinga/Web/Form.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index e97190d66..0ec502aa9 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -913,7 +913,12 @@ class Form extends Zend_Form
                     ->addDecorator('FormDescriptions')
                     ->addDecorator('FormElements')
                     //->addDecorator('HtmlTag', array('tag' => 'dl', 'class' => 'zend_form'))
-                    ->addDecorator('Form');
+                    ->addDecorator('Form')
+                    ->addDecorator('Description', array(
+                        'placement' => 'prepend',
+                        'class' => 'form-title',
+                        'tag' => 'h1'
+                    ));
             }
         }
 

From b1d0c12df3988a7b2a85f8d2d8b36aac2f04f0ae Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Mar 2015 18:24:41 +0100
Subject: [PATCH 0845/2920] Form: Introduce setTitle() as alias for
 Zend_Form::setDescription()

---
 library/Icinga/Web/Form.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 0ec502aa9..2cce16f76 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -956,6 +956,20 @@ class Form extends Zend_Form
         return $name;
     }
 
+    /**
+     * Set form description
+     *
+     * Alias for Zend_Form::setDescription().
+     *
+     * @param   string  $value
+     *
+     * @return  Form
+     */
+    public function setTitle($value)
+    {
+        return $this->setDescription($value);
+    }
+
     /**
      * Return the request associated with this form
      *

From 4d2bd75a38374232c75484bb40a9dc76f8cd8a9e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Mar 2015 18:25:17 +0100
Subject: [PATCH 0846/2920] Installation: Fix ugly checkbox positioning when
 selecting modules

---
 public/css/icinga/setup.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index d7217e1af..cf859be96 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -440,6 +440,7 @@
     input[type=checkbox] {
       height: 10em;
       float: right;
+      margin: 0;
     }
   }
 

From d714c4323c41ea8d799b8d15642e9e58d04750d1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Mar 2015 18:26:46 +0100
Subject: [PATCH 0847/2920] Installation: Remove required cue from the token
 input

refs #7934
---
 modules/setup/application/forms/WelcomePage.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/setup/application/forms/WelcomePage.php b/modules/setup/application/forms/WelcomePage.php
index 7f2e00ef2..bc4c40b9f 100644
--- a/modules/setup/application/forms/WelcomePage.php
+++ b/modules/setup/application/forms/WelcomePage.php
@@ -17,6 +17,7 @@ class WelcomePage extends Form
      */
     public function init()
     {
+        $this->setRequiredCue(null);
         $this->setName('setup_welcome');
         $this->setViewScript('form/setup-welcome.phtml');
     }

From ea7b77eb72264503f822cb41938e8410d2d13f08 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Mar 2015 18:28:20 +0100
Subject: [PATCH 0848/2920] Remove the required cue when disabling
 notifications globally

refs #7934
---
 .../Command/Instance/DisableNotificationsExpireCommandForm.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
index 96f7f80d3..31e3b37aa 100644
--- a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
@@ -20,6 +20,7 @@ class DisableNotificationsExpireCommandForm extends CommandForm
      */
     public function init()
     {
+        $this->setRequiredCue(null);
         $this->setSubmitLabel($this->translate('Disable Notifications'));
     }
 

From d3f9bd633cd5666f1272e136291c9583221acdbd Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Mar 2015 18:30:52 +0100
Subject: [PATCH 0849/2920] Installation: Hide the required cue when choosing
 the preference backend

refs #7934
---
 modules/setup/application/forms/PreferencesPage.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
index 3e91fc428..9763db3b3 100644
--- a/modules/setup/application/forms/PreferencesPage.php
+++ b/modules/setup/application/forms/PreferencesPage.php
@@ -16,6 +16,7 @@ class PreferencesPage extends Form
      */
     public function init()
     {
+        $this->setRequiredCue(null);
         $this->setName('setup_preferences_type');
     }
 

From 2af83e7d7262bbb796a23e01912e572d3d0ded30 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Mar 2015 18:36:04 +0100
Subject: [PATCH 0850/2920] Installation: Use native form title and description
 support where appropriate

refs #7947
refs #7976
---
 .../application/forms/Setup/BackendPage.php   | 25 ++-------
 .../forms/Setup/IdoResourcePage.php           | 25 ++-------
 .../application/forms/Setup/InstancePage.php  | 25 ++-------
 .../forms/Setup/LivestatusResourcePage.php    | 26 ++--------
 .../application/forms/Setup/SecurityPage.php  | 25 ++-------
 .../application/forms/AdminAccountPage.php    | 25 ---------
 .../application/forms/AuthBackendPage.php     | 52 ++++++-------------
 .../application/forms/AuthenticationPage.php  | 52 ++++---------------
 .../forms/DatabaseCreationPage.php            | 33 +++---------
 .../application/forms/DbResourcePage.php      | 26 ++--------
 .../application/forms/GeneralConfigPage.php   | 25 ++-------
 .../forms/LdapDiscoveryConfirmPage.php        | 26 ++--------
 .../application/forms/LdapDiscoveryPage.php   | 27 ++--------
 .../application/forms/LdapResourcePage.php    | 26 ++--------
 .../application/forms/PreferencesPage.php     | 38 +-------------
 .../scripts/form/setup-admin-account.phtml    |  8 +++
 modules/setup/library/Setup/WebWizard.php     |  6 ++-
 public/css/icinga/setup.less                  |  4 --
 18 files changed, 95 insertions(+), 379 deletions(-)

diff --git a/modules/monitoring/application/forms/Setup/BackendPage.php b/modules/monitoring/application/forms/Setup/BackendPage.php
index f2df42a1f..077ca3594 100644
--- a/modules/monitoring/application/forms/Setup/BackendPage.php
+++ b/modules/monitoring/application/forms/Setup/BackendPage.php
@@ -11,31 +11,14 @@ class BackendPage extends Form
     public function init()
     {
         $this->setName('setup_monitoring_backend');
+        $this->setTitle($this->translate('Monitoring Backend', 'setup.page.title'));
+        $this->addDescription($this->translate(
+            'Please configure below how Icinga Web 2 should retrieve monitoring information.'
+        ));
     }
 
     public function createElements(array $formData)
     {
-        $this->addElement(
-            'note',
-            'title',
-            array(
-                'value'         => $this->translate('Monitoring Backend', 'setup.page.title'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'h2'))
-                )
-            )
-        );
-        $this->addElement(
-            'note',
-            'description',
-            array(
-                'value' => $this->translate(
-                    'Please configure below how Icinga Web 2 should retrieve monitoring information.'
-                )
-            )
-        );
-
         $this->addElement(
             'text',
             'name',
diff --git a/modules/monitoring/application/forms/Setup/IdoResourcePage.php b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
index dac7d041f..f52601359 100644
--- a/modules/monitoring/application/forms/Setup/IdoResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
@@ -11,6 +11,10 @@ class IdoResourcePage extends Form
     public function init()
     {
         $this->setName('setup_monitoring_ido');
+        $this->setTitle($this->translate('Monitoring IDO Resource', 'setup.page.title'));
+        $this->addDescription($this->translate(
+            'Please fill out the connection details below to access the IDO database of your monitoring environment.'
+        ));
     }
 
     public function createElements(array $formData)
@@ -23,27 +27,6 @@ class IdoResourcePage extends Form
                 'value'     => 'db'
             )
         );
-        $this->addElement(
-            'note',
-            'title',
-            array(
-                'value'         => $this->translate('Monitoring IDO Resource', 'setup.page.title'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'h2'))
-                )
-            )
-        );
-        $this->addElement(
-            'note',
-            'description',
-            array(
-                'value' => $this->translate(
-                    'Please fill out the connection details below to access'
-                    . ' the IDO database of your monitoring environment.'
-                )
-            )
-        );
 
         if (isset($formData['skip_validation']) && $formData['skip_validation']) {
             $this->addSkipValidationCheckbox();
diff --git a/modules/monitoring/application/forms/Setup/InstancePage.php b/modules/monitoring/application/forms/Setup/InstancePage.php
index 54e4bbba6..25525ffaf 100644
--- a/modules/monitoring/application/forms/Setup/InstancePage.php
+++ b/modules/monitoring/application/forms/Setup/InstancePage.php
@@ -11,31 +11,14 @@ class InstancePage extends Form
     public function init()
     {
         $this->setName('setup_monitoring_instance');
+        $this->setTitle($this->translate('Monitoring Instance', 'setup.page.title'));
+        $this->addDescription($this->translate(
+            'Please define the settings specific to your monitoring instance below.'
+        ));
     }
 
     public function createElements(array $formData)
     {
-        $this->addElement(
-            'note',
-            'title',
-            array(
-                'value'         => $this->translate('Monitoring Instance', 'setup.page.title'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'h2'))
-                )
-            )
-        );
-        $this->addElement(
-            'note',
-            'description',
-            array(
-                'value' => $this->translate(
-                    'Please define the settings specific to your monitoring instance below.'
-                )
-            )
-        );
-
         if (isset($formData['host'])) {
             $formData['type'] = 'remote'; // This is necessary as the type element gets ignored by Form::getValues()
         }
diff --git a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
index ca50980d6..48b688218 100644
--- a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
@@ -11,6 +11,11 @@ class LivestatusResourcePage extends Form
     public function init()
     {
         $this->setName('setup_monitoring_livestatus');
+        $this->setTitle($this->translate('Monitoring Livestatus Resource', 'setup.page.title'));
+        $this->addDescription($this->translate(
+            'Please fill out the connection details below to access the Livestatus'
+            . ' socket interface for your monitoring environment.'
+        ));
     }
 
     public function createElements(array $formData)
@@ -23,27 +28,6 @@ class LivestatusResourcePage extends Form
                 'value'     => 'livestatus'
             )
         );
-        $this->addElement(
-            'note',
-            'title',
-            array(
-                'value'         => $this->translate('Monitoring Livestatus Resource', 'setup.page.title'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'h2'))
-                )
-            )
-        );
-        $this->addElement(
-            'note',
-            'description',
-            array(
-                'value' => $this->translate(
-                    'Please fill out the connection details below to access the Livestatus'
-                    . ' socket interface for your monitoring environment.'
-                )
-            )
-        );
 
         if (isset($formData['skip_validation']) && $formData['skip_validation']) {
             $this->addSkipValidationCheckbox();
diff --git a/modules/monitoring/application/forms/Setup/SecurityPage.php b/modules/monitoring/application/forms/Setup/SecurityPage.php
index 1921c58f4..30eac67ab 100644
--- a/modules/monitoring/application/forms/Setup/SecurityPage.php
+++ b/modules/monitoring/application/forms/Setup/SecurityPage.php
@@ -11,31 +11,14 @@ class SecurityPage extends Form
     public function init()
     {
         $this->setName('setup_monitoring_security');
+        $this->setTitle($this->translate('Monitoring Security', 'setup.page.title'));
+        $this->addDescription($this->translate(
+            'To protect your monitoring environment against prying eyes please fill out the settings below.'
+        ));
     }
 
     public function createElements(array $formData)
     {
-        $this->addElement(
-            'note',
-            'title',
-            array(
-                'value'         => $this->translate('Monitoring Security', 'setup.page.title'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'h2'))
-                )
-            )
-        );
-        $this->addElement(
-            'note',
-            'description',
-            array(
-                'value' => $this->translate(
-                    'To protect your monitoring environment against prying eyes please fill out the settings below.'
-                )
-            )
-        );
-
         $securityConfigForm = new SecurityConfigForm();
         $securityConfigForm->createElements($formData);
         $this->addElements($securityConfigForm->getElements());
diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 485baa64f..da9e90a14 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -192,31 +192,6 @@ class AdminAccountPage extends Form
                 )
             );
         }
-
-        $this->addElement(
-            'note',
-            'title',
-            array(
-                'value'         => $this->translate('Administration', 'setup.page.title'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'h2'))
-                )
-            )
-        );
-        $this->addElement(
-            'note',
-            'description',
-            array(
-                'value' => tp(
-                    'Now it\'s time to configure your first administrative account for Icinga Web 2.'
-                    . ' Please follow the instructions below:',
-                    'Now it\'s time to configure your first administrative account for Icinga Web 2.'
-                    . ' Below are several options you can choose from. Select one and follow its instructions:',
-                    count($choices)
-                )
-            )
-        );
     }
 
     /**
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index 0f07d31be..0ec1de30f 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -27,6 +27,7 @@ class AuthBackendPage extends Form
     public function init()
     {
         $this->setName('setup_authentication_backend');
+        $this->setTitle($this->translate('Authentication Backend', 'setup.page.title'));
     }
 
     /**
@@ -57,54 +58,33 @@ class AuthBackendPage extends Form
      */
     public function createElements(array $formData)
     {
-        $this->addElement(
-            'note',
-            'title',
-            array(
-                'value'         => $this->translate('Authentication Backend', 'setup.page.title'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'h2'))
-                )
-            )
-        );
-
-        if ($this->config['type'] === 'db') {
-            $note = $this->translate(
-                'As you\'ve chosen to use a database for authentication all you need '
-                . 'to do now is defining a name for your first authentication backend.'
-            );
-        } elseif ($this->config['type'] === 'ldap') {
-            $note = $this->translate(
-                'Before you are able to authenticate using the LDAP connection defined earlier you need to'
-                . ' provide some more information so that Icinga Web 2 is able to locate account details.'
-            );
-        } else { // if ($this->config['type'] === 'external'
-            $note = $this->translate(
-                'You\'ve chosen to authenticate using a web server\'s mechanism so it may be necessary'
-                . ' to adjust usernames before any permissions, restrictions, etc. are being applied.'
-            );
-        }
-
-        $this->addElement(
-            'note',
-            'description',
-            array('value' => $note)
-        );
-
         if (isset($formData['skip_validation']) && $formData['skip_validation']) {
             $this->addSkipValidationCheckbox();
         }
 
         if ($this->config['type'] === 'db') {
+            $this->setRequiredCue(null);
             $backendForm = new DbBackendForm();
+            $backendForm->setRequiredCue(null);
             $backendForm->createElements($formData)->removeElement('resource');
+            $this->addDescription($this->translate(
+                'As you\'ve chosen to use a database for authentication all you need '
+                . 'to do now is defining a name for your first authentication backend.'
+            ));
         } elseif ($this->config['type'] === 'ldap') {
             $backendForm = new LdapBackendForm();
             $backendForm->createElements($formData)->removeElement('resource');
+            $this->addDescription($this->translate(
+                'Before you are able to authenticate using the LDAP connection defined earlier you need to'
+                . ' provide some more information so that Icinga Web 2 is able to locate account details.'
+            ));
         } else { // $this->config['type'] === 'external'
             $backendForm = new ExternalBackendForm();
             $backendForm->createElements($formData);
+            $this->addDescription($this->translate(
+                'You\'ve chosen to authenticate using a web server\'s mechanism so it may be necessary'
+                . ' to adjust usernames before any permissions, restrictions, etc. are being applied.'
+            ));
         }
 
         $this->addElements($backendForm->getElements());
@@ -143,7 +123,7 @@ class AuthBackendPage extends Form
             'checkbox',
             'skip_validation',
             array(
-                'order'         => 2,
+                'order'         => 0,
                 'ignore'        => true,
                 'required'      => true,
                 'label'         => $this->translate('Skip Validation'),
diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
index d7c26d460..4f455de1e 100644
--- a/modules/setup/application/forms/AuthenticationPage.php
+++ b/modules/setup/application/forms/AuthenticationPage.php
@@ -16,7 +16,13 @@ class AuthenticationPage extends Form
      */
     public function init()
     {
+        $this->setRequiredCue(null);
         $this->setName('setup_authentication_type');
+        $this->setTitle($this->translate('Authentication', 'setup.page.title'));
+        $this->addDescription($this->translate(
+            'Please choose how you want to authenticate when accessing Icinga Web 2.'
+            . ' Configuring backend specific details follows in a later step.'
+        ));
     }
 
     /**
@@ -24,50 +30,14 @@ class AuthenticationPage extends Form
      */
     public function createElements(array $formData)
     {
-        $this->addElement(
-            'note',
-            'title',
-            array(
-                'value'         => $this->translate('Authentication', 'setup.page.title'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'h2'))
-                )
-            )
-        );
-
         if (isset($formData['type']) && $formData['type'] === 'external' && !isset($_SERVER['REMOTE_USER'])) {
-            $this->addElement(
-                'note',
-                'external_note',
-                array(
-                    'value'         => '<i aria-hidden="true" class="icon-info"></i>' . $this->translate(
-                        'You\'re currently not authenticated using any of the web server\'s authentication '
-                        . 'mechanisms. Make sure you\'ll configure such, otherwise you\'ll not be able to '
-                        . 'log into Icinga Web 2.'
-                    ),
-                    'decorators'    => array(
-                        'ViewHelper',
-                        array(
-                            'HtmlTag',
-                            array('tag' => 'p', 'class' => 'info-box')
-                        )
-                    )
-                )
-            );
+            $this->addDescription($this->translate(
+                'You\'re currently not authenticated using any of the web server\'s authentication '
+                . 'mechanisms. Make sure you\'ll configure such, otherwise you\'ll not be able to '
+                . 'log into Icinga Web 2.'
+            ));
         }
 
-        $this->addElement(
-            'note',
-            'description',
-            array(
-                'value' => $this->translate(
-                    'Please choose how you want to authenticate when accessing Icinga Web 2.'
-                    . ' Configuring backend specific details follows in a later step.'
-                )
-            )
-        );
-
         $backendTypes = array();
         if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {
             $backendTypes['db'] = $this->translate('Database');
diff --git a/modules/setup/application/forms/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php
index 81e9dcc62..9f4ed35a1 100644
--- a/modules/setup/application/forms/DatabaseCreationPage.php
+++ b/modules/setup/application/forms/DatabaseCreationPage.php
@@ -39,6 +39,13 @@ class DatabaseCreationPage extends Form
     public function init()
     {
         $this->setName('setup_database_creation');
+        $this->setTitle($this->translate('Database Setup', 'setup.page.title'));
+        $this->addDescription($this->translate(
+            'It seems that either the database you defined earlier does not yet exist and cannot be created'
+            . ' using the provided access credentials, the database does not have the required schema to be'
+            . ' operated by Icinga Web 2 or the provided access credentials do not have the sufficient '
+            . 'permissions to access the database. Please provide appropriate access credentials to solve this.'
+        ));
     }
 
     /**
@@ -85,30 +92,6 @@ class DatabaseCreationPage extends Form
      */
     public function createElements(array $formData)
     {
-        $this->addElement(
-            'note',
-            'title',
-            array(
-                'value'         => $this->translate('Database Setup', 'setup.page.title'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'h2'))
-                )
-            )
-        );
-        $this->addElement(
-            'note',
-            'description',
-            array(
-                'value' => $this->translate(
-                    'It seems that either the database you defined earlier does not yet exist and cannot be created'
-                    . ' using the provided access credentials, the database does not have the required schema to be'
-                    . ' operated by Icinga Web 2 or the provided access credentials do not have the sufficient '
-                    . 'permissions to access the database. Please provide appropriate access credentials to solve this.'
-                )
-            )
-        );
-
         $skipValidation = isset($formData['skip_validation']) && $formData['skip_validation'];
         $this->addElement(
             'text',
@@ -213,7 +196,7 @@ class DatabaseCreationPage extends Form
             'checkbox',
             'skip_validation',
             array(
-                'order'         => 2,
+                'order'         => 0,
                 'required'      => true,
                 'label'         => $this->translate('Skip Validation'),
                 'description'   => $this->translate(
diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php
index df5fd9c9a..8844ced4c 100644
--- a/modules/setup/application/forms/DbResourcePage.php
+++ b/modules/setup/application/forms/DbResourcePage.php
@@ -19,6 +19,11 @@ class DbResourcePage extends Form
     public function init()
     {
         $this->setName('setup_db_resource');
+        $this->setTitle($this->translate('Database Resource', 'setup.page.title'));
+        $this->addDescription($this->translate(
+            'Now please configure your database resource. Note that the database itself does not need to'
+            . ' exist at this time as it is going to be created once the wizard is about to be finished.'
+        ));
     }
 
     /**
@@ -34,27 +39,6 @@ class DbResourcePage extends Form
                 'value'     => 'db'
             )
         );
-        $this->addElement(
-            'note',
-            'title',
-            array(
-                'value'         => $this->translate('Database Resource', 'setup.page.title'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'h2'))
-                )
-            )
-        );
-        $this->addElement(
-            'note',
-            'description',
-            array(
-                'value' => $this->translate(
-                    'Now please configure your database resource. Note that the database itself does not need to'
-                    . ' exist at this time as it is going to be created once the wizard is about to be finished.'
-                )
-            )
-        );
 
         if (isset($formData['skip_validation']) && $formData['skip_validation']) {
             $this->addSkipValidationCheckbox();
diff --git a/modules/setup/application/forms/GeneralConfigPage.php b/modules/setup/application/forms/GeneralConfigPage.php
index 3dc4eecf1..c50d77293 100644
--- a/modules/setup/application/forms/GeneralConfigPage.php
+++ b/modules/setup/application/forms/GeneralConfigPage.php
@@ -17,6 +17,10 @@ class GeneralConfigPage extends Form
     public function init()
     {
         $this->setName('setup_general_config');
+        $this->setTitle($this->translate('Application Configuration', 'setup.page.title'));
+        $this->addDescription($this->translate(
+            'Now please adjust all application and logging related configuration options to fit your needs.'
+        ));
     }
 
     /**
@@ -24,27 +28,6 @@ class GeneralConfigPage extends Form
      */
     public function createElements(array $formData)
     {
-        $this->addElement(
-            'note',
-            'title',
-            array(
-                'value'         => $this->translate('Application Configuration', 'setup.page.title'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'h2'))
-                )
-            )
-        );
-        $this->addElement(
-            'note',
-            'description',
-            array(
-                'value' => $this->translate(
-                    'Now please adjust all application and logging related configuration options to fit your needs.'
-                )
-            )
-        );
-
         $loggingForm = new LoggingConfigForm();
         $this->addElements($loggingForm->createElements($formData)->getElements());
     }
diff --git a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
index 6a09d9fee..3635fc358 100644
--- a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
@@ -37,6 +37,7 @@ EOT;
     public function init()
     {
         $this->setName('setup_ldap_discovery_confirm');
+        $this->setTitle($this->translate('LDAP Discovery Results', 'setup.page.title'));
     }
 
     /**
@@ -77,27 +78,10 @@ EOT;
         $html = str_replace('{user_attribute}', $backend['user_name_attribute'], $html);
         $html = str_replace('{user_class}', $backend['user_class'], $html);
 
-        $this->addElement(
-            'note',
-            'title',
-            array(
-                'value'         => $this->translate('LDAP Discovery Results', 'setup.page.title'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'h2'))
-                )
-            )
-        );
-        $this->addElement(
-            'note',
-            'description',
-            array(
-                'value' => sprintf(
-                    $this->translate('The following directory service has been found on domain "%s":'),
-                    $this->config['domain']
-                )
-            )
-        );
+        $this->addDescription(sprintf(
+            $this->translate('The following directory service has been found on domain "%s".'),
+            $this->config['domain']
+        ));
 
         $this->addElement(
             'note',
diff --git a/modules/setup/application/forms/LdapDiscoveryPage.php b/modules/setup/application/forms/LdapDiscoveryPage.php
index 6dbec66da..1b8a85c77 100644
--- a/modules/setup/application/forms/LdapDiscoveryPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryPage.php
@@ -26,6 +26,11 @@ class LdapDiscoveryPage extends Form
     public function init()
     {
         $this->setName('setup_ldap_discovery');
+        $this->setTitle($this->translate('LDAP Discovery', 'setup.page.title'));
+        $this->addDescription($this->translate(
+            'You can use this page to discover LDAP or ActiveDirectory servers ' .
+            ' for authentication. If you don\' want to execute a discovery, just skip this step.'
+        ));
     }
 
     /**
@@ -33,28 +38,6 @@ class LdapDiscoveryPage extends Form
      */
     public function createElements(array $formData)
     {
-        $this->addElement(
-            'note',
-            'title',
-            array(
-                'value'         => $this->translate('LDAP Discovery', 'setup.page.title'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'h2'))
-                )
-            )
-        );
-        $this->addElement(
-            'note',
-            'description',
-            array(
-                'value' => $this->translate(
-                    'You can use this page to discover LDAP or ActiveDirectory servers ' .
-                    ' for authentication. If you don\' want to execute a discovery, just skip this step.'
-                )
-            )
-        );
-
         $discoveryForm = new LdapDiscoveryForm();
         $this->addElements($discoveryForm->createElements($formData)->getElements());
 
diff --git a/modules/setup/application/forms/LdapResourcePage.php b/modules/setup/application/forms/LdapResourcePage.php
index 8374c8efa..e7342185e 100644
--- a/modules/setup/application/forms/LdapResourcePage.php
+++ b/modules/setup/application/forms/LdapResourcePage.php
@@ -17,6 +17,11 @@ class LdapResourcePage extends Form
     public function init()
     {
         $this->setName('setup_ldap_resource');
+        $this->setTitle($this->translate('LDAP Resource', 'setup.page.title'));
+        $this->addDescription($this->translate(
+            'Now please configure your AD/LDAP resource. This will later '
+            . 'be used to authenticate users logging in to Icinga Web 2.'
+        ));
     }
 
     /**
@@ -32,27 +37,6 @@ class LdapResourcePage extends Form
                 'value'     => 'ldap'
             )
         );
-        $this->addElement(
-            'note',
-            'title',
-            array(
-                'value'         => $this->translate('LDAP Resource', 'setup.page.title'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'h2'))
-                )
-            )
-        );
-        $this->addElement(
-            'note',
-            'description',
-            array(
-                'value' => $this->translate(
-                    'Now please configure your AD/LDAP resource. This will later '
-                    . 'be used to authenticate users logging in to Icinga Web 2.'
-                )
-            )
-        );
 
         if (isset($formData['skip_validation']) && $formData['skip_validation']) {
             $this->addSkipValidationCheckbox();
diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
index 9763db3b3..fdd5844cf 100644
--- a/modules/setup/application/forms/PreferencesPage.php
+++ b/modules/setup/application/forms/PreferencesPage.php
@@ -18,23 +18,8 @@ class PreferencesPage extends Form
     {
         $this->setRequiredCue(null);
         $this->setName('setup_preferences_type');
-    }
-
-    /**
-     * Pre-select "db" as preference backend and add a hint to the select element
-     *
-     * @return  self
-     */
-    public function showDatabaseNote()
-    {
-        $this->getElement('store')
-            ->setValue('db')
-            ->setDescription(
-                $this->translate(
-                    'Note that choosing "Database" causes Icinga Web 2 to use the same database as for authentication.'
-                )
-            );
-        return $this;
+        $this->setTitle($this->translate('Preferences', 'setup.page.title'));
+        $this->addDescription($this->translate('Please choose how Icinga Web 2 should store user preferences.'));
     }
 
     /**
@@ -42,25 +27,6 @@ class PreferencesPage extends Form
      */
     public function createElements(array $formData)
     {
-        $this->addElement(
-            'note',
-            'title',
-            array(
-                'value'         => $this->translate('Preferences', 'setup.page.title'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'h2'))
-                )
-            )
-        );
-        $this->addElement(
-            'note',
-            'description',
-            array(
-                'value' => $this->translate('Please choose how Icinga Web 2 should store user preferences.')
-            )
-        );
-
         $storageTypes = array();
         $storageTypes['ini'] = $this->translate('File System (INI Files)');
         if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {
diff --git a/modules/setup/application/views/scripts/form/setup-admin-account.phtml b/modules/setup/application/views/scripts/form/setup-admin-account.phtml
index b069bb371..83d01d43b 100644
--- a/modules/setup/application/views/scripts/form/setup-admin-account.phtml
+++ b/modules/setup/application/views/scripts/form/setup-admin-account.phtml
@@ -6,7 +6,15 @@ $radioElem = $form->getElement('user_type');
 $showRadioBoxes = strpos(strtolower(get_class($radioElem)), 'radio') !== false;
 
 ?>
+<h1 class="form-title"><?= $this->translate('Administration', 'setup.page.title'); ?></h1>
 <form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
+  <ul class="descriptions">
+    <li><?= $this->translatePlural(
+      'Now it\'s time to configure your first administrative account for Icinga Web 2. Please follow the instructions below:',
+      'Now it\'s time to configure your first administrative account for Icinga Web 2. Below are several options you can choose from. Select one and follow its instructions:',
+      $showRadioBoxes ? count($radioElem->getMultiOptions()) : 1
+    ); ?></li>
+  </ul>
   <?= $form->getElement('title'); ?>
   <?= $form->getElement('description'); ?>
 <?php if (($byNameElem = $form->getElement('by_name')) !== null): ?>
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 7576adbb8..0bf575033 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -115,7 +115,11 @@ class WebWizard extends Wizard implements SetupWizard
         } elseif ($page->getName() === 'setup_preferences_type') {
             $authData = $this->getPageData('setup_authentication_type');
             if ($authData['type'] === 'db') {
-                $page->create()->showDatabaseNote();
+                $page->create()->getElement('store')->setValue('db');
+                $page->addDescription(mt(
+                    'setup',
+                    'Note that choosing "Database" causes Icinga Web 2 to use the same database as for authentication.'
+                ));
             }
         } elseif ($page->getName() === 'setup_authentication_backend') {
             $authData = $this->getPageData('setup_authentication_type');
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index cf859be96..66b08417e 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -222,10 +222,6 @@
   }
 }
 
-#setup_authentication_type p.info-box em {
-  text-decoration: underline;
-}
-
 #setup_ldap_discovery_confirm table {
   margin: 1em 0;
   border-collapse: separate;

From 4ba281e7e8767109cd6f90b5d6734960a0a56341 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Mar 2015 18:37:54 +0100
Subject: [PATCH 0851/2920] Config: Use native form title and description
 support where appropriate

refs #7947
refs #7976
---
 application/controllers/ConfigController.php  | 13 +++++++-
 .../controllers/DashboardController.php       |  4 +++
 application/controllers/RolesController.php   |  5 +--
 .../forms/Config/GeneralConfigForm.php        |  1 +
 application/forms/PreferenceForm.php          |  1 +
 .../views/scripts/config/application.phtml    |  3 --
 .../config/authentication/create.phtml        | 14 ++-------
 .../config/authentication/modify.phtml        |  7 +----
 .../config/authentication/remove.phtml        |  7 +----
 .../scripts/config/resource/create.phtml      |  8 +----
 .../scripts/config/resource/modify.phtml      |  7 +----
 .../scripts/config/resource/remove.phtml      |  7 +----
 .../views/scripts/dashboard/new-dashlet.phtml |  1 -
 .../scripts/dashboard/remove-dashlet.phtml    |  8 -----
 .../views/scripts/dashboard/remove-pane.phtml |  8 -----
 .../scripts/dashboard/update-dashlet.phtml    |  2 --
 .../views/scripts/preference/index.phtml      |  1 -
 application/views/scripts/roles/new.phtml     |  5 +--
 application/views/scripts/roles/remove.phtml  |  5 +--
 application/views/scripts/roles/update.phtml  |  5 +--
 .../controllers/ConfigController.php          | 31 +++++++++++++++++--
 .../views/scripts/config/createbackend.phtml  |  5 +--
 .../views/scripts/config/createinstance.phtml |  5 +--
 .../views/scripts/config/editbackend.phtml    |  5 +--
 .../views/scripts/config/editinstance.phtml   |  5 +--
 .../views/scripts/config/removebackend.phtml  |  5 +--
 .../views/scripts/config/removeinstance.phtml |  7 ++---
 27 files changed, 78 insertions(+), 97 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index e240777dd..5ad822e12 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -216,6 +216,11 @@ class ConfigController extends ActionController
     {
         $this->assertPermission('system/config/authentication');
         $form = new AuthenticationBackendConfigForm();
+        $form->setTitle($this->translate('Create New Authentication Backend'));
+        $form->addDescription($this->translate(
+            'Create a new backend for authenticating your users. This backend'
+            . ' will be added at the end of your authentication order.'
+        ));
         $form->setIniConfig(Config::app('authentication'));
         $form->setResourceConfig(ResourceFactory::getResourceConfigs());
         $form->setRedirectUrl('config/authentication');
@@ -233,6 +238,7 @@ class ConfigController extends ActionController
     {
         $this->assertPermission('system/config/authentication');
         $form = new AuthenticationBackendConfigForm();
+        $form->setTitle($this->translate('Edit Backend'));
         $form->setIniConfig(Config::app('authentication'));
         $form->setResourceConfig(ResourceFactory::getResourceConfigs());
         $form->setRedirectUrl('config/authentication');
@@ -272,6 +278,7 @@ class ConfigController extends ActionController
                 }
             }
         ));
+        $form->setTitle($this->translate('Remove Backend'));
         $form->setRedirectUrl('config/authentication');
         $form->handleRequest();
 
@@ -297,6 +304,8 @@ class ConfigController extends ActionController
     {
         $this->assertPermission('system/config/resources');
         $form = new ResourceConfigForm();
+        $form->setTitle($this->translate('Create A New Resource'));
+        $form->addDescription($this->translate('Resources are entities that provide data to Icinga Web 2.'));
         $form->setIniConfig(Config::app('resources'));
         $form->setRedirectUrl('config/resource');
         $form->handleRequest();
@@ -312,6 +321,7 @@ class ConfigController extends ActionController
     {
         $this->assertPermission('system/config/resources');
         $form = new ResourceConfigForm();
+        $form->setTitle($this->translate('Edit Existing Resource'));
         $form->setIniConfig(Config::app('resources'));
         $form->setRedirectUrl('config/resource');
         $form->handleRequest();
@@ -346,6 +356,7 @@ class ConfigController extends ActionController
                 }
             }
         ));
+        $form->setTitle($this->translate('Remove Existing Resource'));
         $form->setRedirectUrl('config/resource');
         $form->handleRequest();
 
@@ -354,7 +365,7 @@ class ConfigController extends ActionController
         $authConfig = Config::app('authentication');
         foreach ($authConfig as $backendName => $config) {
             if ($config->get('resource') === $resource) {
-                $form->addError(sprintf(
+                $form->addDescription(sprintf(
                     $this->translate(
                         'The resource "%s" is currently in use by the authentication backend "%s". ' .
                         'Removing the resource can result in noone being able to log in any longer.'
diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 6df92e892..325556be0 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -66,6 +66,7 @@ class DashboardController extends ActionController
             Notification::success(t('Dashlet created'));
             return true;
         });
+        $form->setTitle($this->translate('Add Dashlet To Dashboard'));
         $form->setRedirectUrl('dashboard');
         $form->handleRequest();
         $this->view->form = $form;
@@ -128,6 +129,7 @@ class DashboardController extends ActionController
             Notification::success(t('Dashlet updated'));
             return true;
         });
+        $form->setTitle($this->translate('Edit Dashlet'));
         $form->setRedirectUrl('dashboard/settings');
         $form->handleRequest();
         $pane = $dashboard->getPane($this->getParam('pane'));
@@ -176,6 +178,7 @@ class DashboardController extends ActionController
             }
             return false;
         });
+        $form->setTitle($this->translate('Remove Dashlet From Dashboard'));
         $form->setRedirectUrl('dashboard/settings');
         $form->handleRequest();
         $this->view->pane = $pane;
@@ -215,6 +218,7 @@ class DashboardController extends ActionController
             }
             return false;
         });
+        $form->setTitle($this->translate('Remove Dashboard'));
         $form->setRedirectUrl('dashboard/settings');
         $form->handleRequest();
         $this->view->pane = $pane;
diff --git a/application/controllers/RolesController.php b/application/controllers/RolesController.php
index 6cbb4f703..2b7b520c5 100644
--- a/application/controllers/RolesController.php
+++ b/application/controllers/RolesController.php
@@ -86,6 +86,7 @@ class RolesController extends ActionController
             }
         ));
         $role
+            ->setTitle($this->translate('New Role'))
             ->setSubmitLabel($this->translate('Create Role'))
             ->setIniConfig(Config::app('roles', true))
             ->setRedirectUrl('roles')
@@ -108,6 +109,7 @@ class RolesController extends ActionController
             );
         }
         $role = new RoleForm();
+        $role->setTitle(sprintf($this->translate('Update Role %s'), $name));
         $role->setSubmitLabel($this->translate('Update Role'));
         try {
             $role
@@ -138,7 +140,6 @@ class RolesController extends ActionController
             })
             ->setRedirectUrl('roles')
             ->handleRequest();
-        $this->view->name = $name;
         $this->view->form = $role;
     }
 
@@ -183,10 +184,10 @@ class RolesController extends ActionController
             }
         ));
         $confirmation
+            ->setTitle(sprintf($this->translate('Remove Role %s'), $name))
             ->setSubmitLabel($this->translate('Remove Role'))
             ->setRedirectUrl('roles')
             ->handleRequest();
-        $this->view->name = $name;
         $this->view->form = $confirmation;
     }
 }
diff --git a/application/forms/Config/GeneralConfigForm.php b/application/forms/Config/GeneralConfigForm.php
index b11b91208..c3c771f97 100644
--- a/application/forms/Config/GeneralConfigForm.php
+++ b/application/forms/Config/GeneralConfigForm.php
@@ -20,6 +20,7 @@ class GeneralConfigForm extends ConfigForm
     {
         $this->setName('form_config_general');
         $this->setSubmitLabel($this->translate('Save Changes'));
+        $this->setTitle($this->translate('General Configuration'));
     }
 
     /**
diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
index 3ee1ebb38..09aa6b652 100644
--- a/application/forms/PreferenceForm.php
+++ b/application/forms/PreferenceForm.php
@@ -40,6 +40,7 @@ class PreferenceForm extends Form
     public function init()
     {
         $this->setName('form_config_preferences');
+        $this->setTitle($this->translate('Preferences'));
     }
 
     /**
diff --git a/application/views/scripts/config/application.phtml b/application/views/scripts/config/application.phtml
index 4255befc4..e9aa039f9 100644
--- a/application/views/scripts/config/application.phtml
+++ b/application/views/scripts/config/application.phtml
@@ -2,9 +2,6 @@
   <?= $this->tabs->render($this); ?>
 </div>
 <div class="content">
-  <h1 tabindex="-1" id="application-configuration">
-    <?= $this->translate('General Configuration'); ?>
-  </h1>
   <?php if (isset($this->messageBox)): ?>
     <?= $this->messageBox->render() ?>
   <?php endif ?>
diff --git a/application/views/scripts/config/authentication/create.phtml b/application/views/scripts/config/authentication/create.phtml
index 48d1f00ed..a53f51721 100644
--- a/application/views/scripts/config/authentication/create.phtml
+++ b/application/views/scripts/config/authentication/create.phtml
@@ -2,15 +2,5 @@
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1 tabindex="-1" id="authentication-create">
-        <?= $this->translate('Create New Authentication Backend'); ?>
-    </h1>
-    <p>
-        <?= $this->translate(
-            'Create a new backend for authenticating your users. This backend will be added at the end of your authentication order.'
-        ); ?>
-    </p>
-    <div>
-        <?= $form; ?>
-    </div>
-</div>
+    <?= $form; ?>
+</div>
\ No newline at end of file
diff --git a/application/views/scripts/config/authentication/modify.phtml b/application/views/scripts/config/authentication/modify.phtml
index ebc1937a7..338d6807e 100644
--- a/application/views/scripts/config/authentication/modify.phtml
+++ b/application/views/scripts/config/authentication/modify.phtml
@@ -2,10 +2,5 @@
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1 tabindex="-1" id="authentication-modify">
-        <?= $this->translate('Edit Backend'); ?>
-    </h1>
-    <div>
-        <?= $form; ?>
-    </div>
+    <?= $form; ?>
 </div>
diff --git a/application/views/scripts/config/authentication/remove.phtml b/application/views/scripts/config/authentication/remove.phtml
index 0a53af30c..a53f51721 100644
--- a/application/views/scripts/config/authentication/remove.phtml
+++ b/application/views/scripts/config/authentication/remove.phtml
@@ -2,10 +2,5 @@
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1 tabindex="-1" id="authentication-remove">
-        <?= $this->translate('Remove Backend'); ?>
-    </h1>
-    <div>
-        <?= $form; ?>
-    </div>
+    <?= $form; ?>
 </div>
\ No newline at end of file
diff --git a/application/views/scripts/config/resource/create.phtml b/application/views/scripts/config/resource/create.phtml
index 71d8c946e..a53f51721 100644
--- a/application/views/scripts/config/resource/create.phtml
+++ b/application/views/scripts/config/resource/create.phtml
@@ -2,11 +2,5 @@
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1 tabindex="-1" id="resource-create">
-        <?= $this->translate('Create A New Resource'); ?>
-    </h1>
-    <p><?= $this->translate('Resources are entities that provide data to Icinga Web 2.'); ?></p>
-    <div>
-        <?= $form; ?>
-    </div>
+    <?= $form; ?>
 </div>
\ No newline at end of file
diff --git a/application/views/scripts/config/resource/modify.phtml b/application/views/scripts/config/resource/modify.phtml
index b7bd0a2f7..a53f51721 100644
--- a/application/views/scripts/config/resource/modify.phtml
+++ b/application/views/scripts/config/resource/modify.phtml
@@ -2,10 +2,5 @@
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1 tabindex="-1" id="resource-edit">
-        <?= $this->translate('Edit Existing Resource'); ?>
-    </h1>
-    <div>
-        <?= $form; ?>
-    </div>
+    <?= $form; ?>
 </div>
\ No newline at end of file
diff --git a/application/views/scripts/config/resource/remove.phtml b/application/views/scripts/config/resource/remove.phtml
index 010f2d5d2..a53f51721 100644
--- a/application/views/scripts/config/resource/remove.phtml
+++ b/application/views/scripts/config/resource/remove.phtml
@@ -2,10 +2,5 @@
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1 tabindex="-1" id="resource-remove">
-        <?= $this->translate('Remove Existing Resource'); ?>
-    </h1>
-    <div>
-        <?= $form; ?>
-    </div>
+    <?= $form; ?>
 </div>
\ No newline at end of file
diff --git a/application/views/scripts/dashboard/new-dashlet.phtml b/application/views/scripts/dashboard/new-dashlet.phtml
index 98b055414..b265a253a 100644
--- a/application/views/scripts/dashboard/new-dashlet.phtml
+++ b/application/views/scripts/dashboard/new-dashlet.phtml
@@ -2,6 +2,5 @@
     <?= $this->tabs ?>
 </div>
 <div class="content">
-    <h1><?= t('Add Dashlet To Dashboard'); ?></h1>
     <?= $this->form; ?>
 </div>
\ No newline at end of file
diff --git a/application/views/scripts/dashboard/remove-dashlet.phtml b/application/views/scripts/dashboard/remove-dashlet.phtml
index 4c842cf29..b265a253a 100644
--- a/application/views/scripts/dashboard/remove-dashlet.phtml
+++ b/application/views/scripts/dashboard/remove-dashlet.phtml
@@ -1,14 +1,6 @@
 <div class="controls">
     <?= $this->tabs ?>
 </div>
-
 <div class="content">
-    <h1><?= t('Remove Dashlet From Dashboard'); ?></h1>
-
-    <p>
-        <?= $this->translate('Please confirm the removal'); ?>:
-        <?= $this->pane; ?>/<?= $this->dashlet; ?>
-    </p>
-
     <?= $this->form; ?>
 </div>
\ No newline at end of file
diff --git a/application/views/scripts/dashboard/remove-pane.phtml b/application/views/scripts/dashboard/remove-pane.phtml
index 45455d37d..b265a253a 100644
--- a/application/views/scripts/dashboard/remove-pane.phtml
+++ b/application/views/scripts/dashboard/remove-pane.phtml
@@ -1,14 +1,6 @@
 <div class="controls">
     <?= $this->tabs ?>
 </div>
-
 <div class="content">
-    <h1><?= t('Remove Dashboard'); ?></h1>
-
-    <p>
-        <?= $this->translate('Please confirm the removal of'); ?>:
-        <?= $this->pane; ?>
-    </p>
-
     <?= $this->form; ?>
 </div>
\ No newline at end of file
diff --git a/application/views/scripts/dashboard/update-dashlet.phtml b/application/views/scripts/dashboard/update-dashlet.phtml
index e83c8b6c3..b265a253a 100644
--- a/application/views/scripts/dashboard/update-dashlet.phtml
+++ b/application/views/scripts/dashboard/update-dashlet.phtml
@@ -1,8 +1,6 @@
 <div class="controls">
     <?= $this->tabs ?>
 </div>
-
 <div class="content">
-    <h1><?= t('Edit Dashlet'); ?></h1>
     <?= $this->form; ?>
 </div>
\ No newline at end of file
diff --git a/application/views/scripts/preference/index.phtml b/application/views/scripts/preference/index.phtml
index fc19a1e10..4ca5e6821 100644
--- a/application/views/scripts/preference/index.phtml
+++ b/application/views/scripts/preference/index.phtml
@@ -2,6 +2,5 @@
     <?= $tabs; ?>
 </div>
 <div class="content">
-    <h1 tabindex="-1" id="preferences"><?= $this->translate('Preferences'); ?></h1>
     <?= $form; ?>
 </div>
\ No newline at end of file
diff --git a/application/views/scripts/roles/new.phtml b/application/views/scripts/roles/new.phtml
index d18ada1a5..ca1e1559e 100644
--- a/application/views/scripts/roles/new.phtml
+++ b/application/views/scripts/roles/new.phtml
@@ -2,8 +2,5 @@
     <?= $tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1 tabindex="-1" id="roles-new">
-        <?= $this->translate('New Role') ?>
-    </h1>
     <?= $form ?>
-</div>
+</div>
\ No newline at end of file
diff --git a/application/views/scripts/roles/remove.phtml b/application/views/scripts/roles/remove.phtml
index 432c3602d..ca1e1559e 100644
--- a/application/views/scripts/roles/remove.phtml
+++ b/application/views/scripts/roles/remove.phtml
@@ -2,8 +2,5 @@
     <?= $tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1 tabindex="-1" id="roles-remove">
-        <?= sprintf($this->translate('Remove Role %s'), $name) ?>
-    </h1>
     <?= $form ?>
-</div>
+</div>
\ No newline at end of file
diff --git a/application/views/scripts/roles/update.phtml b/application/views/scripts/roles/update.phtml
index 32ab7d018..ca1e1559e 100644
--- a/application/views/scripts/roles/update.phtml
+++ b/application/views/scripts/roles/update.phtml
@@ -2,8 +2,5 @@
     <?= $tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1 tabindex="-1" id="roles-update">
-        <?= sprintf($this->translate('Update Role %s'), $name) ?>
-    </h1>
     <?= $form ?>
-</div>
+</div>
\ No newline at end of file
diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index 7d4c07de0..2571b071e 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -30,6 +30,7 @@ class Monitoring_ConfigController extends ModuleActionController
     public function editbackendAction()
     {
         $form = new BackendConfigForm();
+        $form->setTitle($this->translate('Edit Existing Backend'));
         $form->setIniConfig($this->Config('backends'));
         $form->setResourceConfig(ResourceFactory::getResourceConfigs());
         $form->setRedirectUrl('monitoring/config');
@@ -44,6 +45,7 @@ class Monitoring_ConfigController extends ModuleActionController
     public function createbackendAction()
     {
         $form = new BackendConfigForm();
+        $form->setTitle($this->translate('Add New Backend'));
         $form->setIniConfig($this->Config('backends'));
         $form->setResourceConfig(ResourceFactory::getResourceConfigs());
         $form->setRedirectUrl('monitoring/config');
@@ -72,12 +74,16 @@ class Monitoring_ConfigController extends ModuleActionController
                 }
 
                 if ($configForm->save()) {
-                    Notification::success(sprintf(mt('monitoring', 'Backend "%s" successfully removed.'), $backendName));
+                    Notification::success(sprintf(
+                        $this->translate('Backend "%s" successfully removed.'),
+                        $backendName
+                    ));
                 } else {
                     return false;
                 }
             }
         ));
+        $form->setTitle($this->translate('Remove Existing Backend'));
         $form->setRedirectUrl('monitoring/config');
         $form->handleRequest();
 
@@ -104,12 +110,31 @@ class Monitoring_ConfigController extends ModuleActionController
                 }
 
                 if ($configForm->save()) {
-                    Notification::success(sprintf(mt('monitoring', 'Instance "%s" successfully removed.'), $instanceName));
+                    Notification::success(sprintf(
+                        $this->translate('Instance "%s" successfully removed.'),
+                        $instanceName
+                    ));
                 } else {
                     return false;
                 }
             }
         ));
+        $form->setTitle($this->translate('Remove Existing Instance'));
+        $form->addDescription($this->translate(
+            'If you have still any environments or views referring to this instance, '
+            . 'you won\'t be able to send commands anymore after deletion.'
+        ));
+        $form->addElement(
+            'note',
+            'question',
+            array(
+                'value'         => $this->translate('Are you sure you want to remove this instance?'),
+                'decorators'    => array(
+                    'ViewHelper',
+                    array('HtmlTag', array('tag' => 'p'))
+                )
+            )
+        );
         $form->setRedirectUrl('monitoring/config');
         $form->handleRequest();
 
@@ -122,6 +147,7 @@ class Monitoring_ConfigController extends ModuleActionController
     public function editinstanceAction()
     {
         $form = new InstanceConfigForm();
+        $form->setTitle($this->translate('Edit Existing Instance'));
         $form->setIniConfig($this->Config('instances'));
         $form->setRedirectUrl('monitoring/config');
         $form->handleRequest();
@@ -135,6 +161,7 @@ class Monitoring_ConfigController extends ModuleActionController
     public function createinstanceAction()
     {
         $form = new InstanceConfigForm();
+        $form->setTitle($this->translate('Add New Instance'));
         $form->setIniConfig($this->Config('instances'));
         $form->setRedirectUrl('monitoring/config');
         $form->handleRequest();
diff --git a/modules/monitoring/application/views/scripts/config/createbackend.phtml b/modules/monitoring/application/views/scripts/config/createbackend.phtml
index 10ee02541..d2c7b6bdd 100644
--- a/modules/monitoring/application/views/scripts/config/createbackend.phtml
+++ b/modules/monitoring/application/views/scripts/config/createbackend.phtml
@@ -1,5 +1,6 @@
 <div class="controls">
     <?= $tabs->showOnlyCloseButton() ?>
 </div>
-<h4><?= $this->translate('Add New Backend'); ?></h4>
-<?= $form; ?>
+<div class="content">
+    <?= $form; ?>
+</div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/config/createinstance.phtml b/modules/monitoring/application/views/scripts/config/createinstance.phtml
index 3515514df..d2c7b6bdd 100644
--- a/modules/monitoring/application/views/scripts/config/createinstance.phtml
+++ b/modules/monitoring/application/views/scripts/config/createinstance.phtml
@@ -1,5 +1,6 @@
 <div class="controls">
     <?= $tabs->showOnlyCloseButton() ?>
 </div>
-<h4><?= $this->translate('Add New Instance') ?></h4>
-<?= $form; ?>
+<div class="content">
+    <?= $form; ?>
+</div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/config/editbackend.phtml b/modules/monitoring/application/views/scripts/config/editbackend.phtml
index 630cb83f2..d2c7b6bdd 100644
--- a/modules/monitoring/application/views/scripts/config/editbackend.phtml
+++ b/modules/monitoring/application/views/scripts/config/editbackend.phtml
@@ -1,5 +1,6 @@
 <div class="controls">
     <?= $tabs->showOnlyCloseButton() ?>
 </div>
-<h4><?= $this->translate('Edit Existing Backend') ?></h4>
-<?= $form; ?>
+<div class="content">
+    <?= $form; ?>
+</div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/config/editinstance.phtml b/modules/monitoring/application/views/scripts/config/editinstance.phtml
index 2c91ee656..d2c7b6bdd 100644
--- a/modules/monitoring/application/views/scripts/config/editinstance.phtml
+++ b/modules/monitoring/application/views/scripts/config/editinstance.phtml
@@ -1,5 +1,6 @@
 <div class="controls">
     <?= $tabs->showOnlyCloseButton() ?>
 </div>
-<h4><?= $this->translate('Edit Existing Instance'); ?></h4>
-<?= $form; ?>
+<div class="content">
+    <?= $form; ?>
+</div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/config/removebackend.phtml b/modules/monitoring/application/views/scripts/config/removebackend.phtml
index d297f615b..d2c7b6bdd 100644
--- a/modules/monitoring/application/views/scripts/config/removebackend.phtml
+++ b/modules/monitoring/application/views/scripts/config/removebackend.phtml
@@ -1,5 +1,6 @@
 <div class="controls">
     <?= $tabs->showOnlyCloseButton() ?>
 </div>
-<h4><?= $this->translate('Remove Existing Backend') ?></h4>
-<?= $form; ?>
+<div class="content">
+    <?= $form; ?>
+</div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/config/removeinstance.phtml b/modules/monitoring/application/views/scripts/config/removeinstance.phtml
index eee29fb02..d2c7b6bdd 100644
--- a/modules/monitoring/application/views/scripts/config/removeinstance.phtml
+++ b/modules/monitoring/application/views/scripts/config/removeinstance.phtml
@@ -1,7 +1,6 @@
 <div class="controls">
     <?= $tabs->showOnlyCloseButton() ?>
 </div>
-<h4><?= $this->translate('Remove Existing Instance'); ?></h4>
-<p><?= $this->translate('Are you sure you want to remove this instance?'); ?></p>
-<p><?= $this->translate('If you have still any environments or views referring to this instance, you won\'t be able to send commands anymore after deletion.'); ?></p>
-<?= $form; ?>
+<div class="content">
+    <?= $form; ?>
+</div>
\ No newline at end of file

From a2f88dc60f231260f64345f9c8c52d0d6101e437 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Mar 2015 18:39:10 +0100
Subject: [PATCH 0852/2920] Commands: Use native form title and description
 support where appropriate

refs #7947
refs #7976
---
 .../controllers/HostController.php            | 25 +++++++++------
 .../controllers/HostsController.php           | 20 +++++++-----
 .../controllers/ServiceController.php         | 25 +++++++++------
 .../controllers/ServicesController.php        | 20 +++++++-----
 .../DisableNotificationsExpireCommandForm.php | 12 ++-----
 .../Object/AcknowledgeProblemCommandForm.php  | 32 ++++++++-----------
 .../Command/Object/AddCommentCommandForm.php  | 26 ++++++---------
 .../Object/ProcessCheckResultCommandForm.php  | 28 ++++++++--------
 .../Object/ScheduleHostCheckCommandForm.php   |  3 +-
 .../ScheduleHostDowntimeCommandForm.php       |  4 +--
 .../ScheduleServiceCheckCommandForm.php       | 30 ++++++++---------
 .../ScheduleServiceDowntimeCommandForm.php    | 32 ++++++++-----------
 .../command/object-command-form.phtml         |  5 ++-
 .../command/objects-command-form.phtml        |  5 ++-
 .../process/disable-notifications.phtml       |  4 +--
 modules/monitoring/public/css/module.less     |  2 +-
 16 files changed, 129 insertions(+), 144 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index 9cf3b26ab..4a29750e3 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -66,8 +66,9 @@ class Monitoring_HostController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/acknowledge-problem');
 
-        $this->view->title = $this->translate('Acknowledge Host Problem');
-        $this->handleCommandForm(new AcknowledgeProblemCommandForm());
+        $form = new AcknowledgeProblemCommandForm();
+        $form->setTitle($this->translate('Acknowledge Host Problem'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -77,8 +78,9 @@ class Monitoring_HostController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/comment/add');
 
-        $this->view->title = $this->translate('Add Host Comment');
-        $this->handleCommandForm(new AddCommentCommandForm());
+        $form = new AddCommentCommandForm();
+        $form->setTitle($this->translate('Add Host Comment'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -88,8 +90,9 @@ class Monitoring_HostController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/schedule-check');
 
-        $this->view->title = $this->translate('Reschedule Host Check');
-        $this->handleCommandForm(new ScheduleHostCheckCommandForm());
+        $form = new ScheduleHostCheckCommandForm();
+        $form->setTitle($this->translate('Reschedule Host Check'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -99,8 +102,9 @@ class Monitoring_HostController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/downtime/schedule');
 
-        $this->view->title = $this->translate('Schedule Host Downtime');
-        $this->handleCommandForm(new ScheduleHostDowntimeCommandForm());
+        $form = new ScheduleHostDowntimeCommandForm();
+        $form->setTitle($this->translate('Schedule Host Downtime'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -110,7 +114,8 @@ class Monitoring_HostController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/process-check-result');
 
-        $this->view->title = $this->translate('Submit Passive Host Check Result');
-        $this->handleCommandForm(new ProcessCheckResultCommandForm());
+        $form = new ProcessCheckResultCommandForm();
+        $form->setTitle($this->translate('Submit Passive Host Check Result'));
+        $this->handleCommandForm($form);
     }
 }
diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index de1f063ac..5dc72eeb0 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -175,8 +175,9 @@ class Monitoring_HostsController extends Controller
     {
         $this->assertPermission('monitoring/command/acknowledge-problem');
 
-        $this->view->title = $this->translate('Acknowledge Host Problems');
-        $this->handleCommandForm(new AcknowledgeProblemCommandForm());
+        $form = new AcknowledgeProblemCommandForm();
+        $form->setTitle($this->translate('Acknowledge Host Problems'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -186,8 +187,9 @@ class Monitoring_HostsController extends Controller
     {
         $this->assertPermission('monitoring/command/schedule-check');
 
-        $this->view->title = $this->translate('Reschedule Host Checks');
-        $this->handleCommandForm(new ScheduleHostCheckCommandForm());
+        $form = new ScheduleHostCheckCommandForm();
+        $form->setTitle($this->translate('Reschedule Host Checks'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -197,8 +199,9 @@ class Monitoring_HostsController extends Controller
     {
         $this->assertPermission('monitoring/command/downtime/schedule');
 
-        $this->view->title = $this->translate('Schedule Host Downtimes');
-        $this->handleCommandForm(new ScheduleHostDowntimeCommandForm());
+        $form = new ScheduleHostDowntimeCommandForm();
+        $form->setTitle($this->translate('Schedule Host Downtimes'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -208,7 +211,8 @@ class Monitoring_HostsController extends Controller
     {
         $this->assertPermission('monitoring/command/process-check-result');
 
-        $this->view->title = $this->translate('Submit Passive Host Check Results');
-        $this->handleCommandForm(new ProcessCheckResultCommandForm());
+        $form = new ProcessCheckResultCommandForm();
+        $form->setTitle($this->translate('Submit Passive Host Check Results'));
+        $this->handleCommandForm($form);
     }
 }
diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index 19906f5d2..d717a8e1c 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -43,8 +43,9 @@ class Monitoring_ServiceController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/acknowledge-problem');
 
-        $this->view->title = $this->translate('Acknowledge Service Problem');
-        $this->handleCommandForm(new AcknowledgeProblemCommandForm());
+        $form = new AcknowledgeProblemCommandForm();
+        $form->setTitle($this->translate('Acknowledge Service Problem'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -54,8 +55,9 @@ class Monitoring_ServiceController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/comment/add');
 
-        $this->view->title = $this->translate('Add Service Comment');
-        $this->handleCommandForm(new AddCommentCommandForm());
+        $form = new AddCommentCommandForm();
+        $form->setTitle($this->translate('Add Service Comment'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -65,8 +67,9 @@ class Monitoring_ServiceController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/schedule-check');
 
-        $this->view->title = $this->translate('Reschedule Service Check');
-        $this->handleCommandForm(new ScheduleServiceCheckCommandForm());
+        $form = new ScheduleServiceCheckCommandForm();
+        $form->setTitle($this->translate('Reschedule Service Check'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -76,8 +79,9 @@ class Monitoring_ServiceController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/downtime/schedule');
 
-        $this->view->title = $this->translate('Schedule Service Downtime');
-        $this->handleCommandForm(new ScheduleServiceDowntimeCommandForm());
+        $form = new ScheduleServiceDowntimeCommandForm();
+        $form->setTitle($this->translate('Schedule Service Downtime'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -87,7 +91,8 @@ class Monitoring_ServiceController extends MonitoredObjectController
     {
         $this->assertPermission('monitoring/command/process-check-result');
 
-        $this->view->title = $this->translate('Submit Passive Service Check Result');
-        $this->handleCommandForm(new ProcessCheckResultCommandForm());
+        $form = new ProcessCheckResultCommandForm();
+        $form->setTitle($this->translate('Submit Passive Service Check Result'));
+        $this->handleCommandForm($form);
     }
 }
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index a74b61074..1e907aab9 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -224,8 +224,9 @@ class Monitoring_ServicesController extends Controller
     {
         $this->assertPermission('monitoring/command/acknowledge-problem');
 
-        $this->view->title = $this->translate('Acknowledge Service Problems');
-        $this->handleCommandForm(new AcknowledgeProblemCommandForm());
+        $form = new AcknowledgeProblemCommandForm();
+        $form->setTitle($this->translate('Acknowledge Service Problems'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -235,8 +236,9 @@ class Monitoring_ServicesController extends Controller
     {
         $this->assertPermission('monitoring/command/schedule-check');
 
-        $this->view->title = $this->translate('Reschedule Service Checks');
-        $this->handleCommandForm(new ScheduleServiceCheckCommandForm());
+        $form = new ScheduleServiceCheckCommandForm();
+        $form->setTitle($this->translate('Reschedule Service Checks'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -246,8 +248,9 @@ class Monitoring_ServicesController extends Controller
     {
         $this->assertPermission('monitoring/command/downtime/schedule');
 
-        $this->view->title = $this->translate('Schedule Service Downtimes');
-        $this->handleCommandForm(new ScheduleServiceDowntimeCommandForm());
+        $form = new ScheduleServiceDowntimeCommandForm();
+        $form->setTitle($this->translate('Schedule Service Downtimes'));
+        $this->handleCommandForm($form);
     }
 
     /**
@@ -257,7 +260,8 @@ class Monitoring_ServicesController extends Controller
     {
         $this->assertPermission('monitoring/command/process-check-result');
 
-        $this->view->title = $this->translate('Submit Passive Service Check Results');
-        $this->handleCommandForm(new ProcessCheckResultCommandForm());
+        $form = new ProcessCheckResultCommandForm();
+        $form->setTitle($this->translate('Submit Passive Service Check Results'));
+        $this->handleCommandForm($form);
     }
 }
diff --git a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
index 31e3b37aa..e69b9ea11 100644
--- a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php
@@ -22,17 +22,9 @@ class DisableNotificationsExpireCommandForm extends CommandForm
     {
         $this->setRequiredCue(null);
         $this->setSubmitLabel($this->translate('Disable Notifications'));
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Forms\Command\CommandForm::getHelp() For the method documentation.
-     */
-    public function getHelp()
-    {
-        return $this->translate(
+        $this->addDescription($this->translate(
             'This command is used to disable host and service notifications for a specific time.'
-        );
+        ));
     }
 
     /**
diff --git a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
index 6f1235363..ef6d626b3 100644
--- a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
@@ -13,28 +13,25 @@ use Icinga\Web\Notification;
  */
 class AcknowledgeProblemCommandForm extends ObjectsCommandForm
 {
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->addDescription($this->translate(
+            'This command is used to acknowledge host or service problems. When a problem is acknowledged,'
+            . ' future notifications about problems are temporarily disabled until the host or service'
+            . ' recovers.'
+        ));
+    }
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
      */
     public function getSubmitLabel()
     {
-        return mtp(
-            'monitoring', 'Acknowledge problem', 'Acknowledge problems', count($this->objects)
-        );
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Forms\Command\CommandForm::getHelp() For the method documentation.
-     */
-    public function getHelp()
-    {
-        return $this->translate(
-            'This command is used to acknowledge host or service problems. When a problem is acknowledged,'
-            . ' future notifications about problems are temporarily disabled until the host or service'
-            . ' recovers.'
-        );
+        return $this->translatePlural('Acknowledge problem', 'Acknowledge problems', count($this->objects));
     }
 
     /**
@@ -156,8 +153,7 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
             }
             $this->getTransport($this->request)->send($ack);
         }
-        Notification::success(mtp(
-            'monitoring',
+        Notification::success($this->translatePlural(
             'Acknowledging problem..',
             'Acknowledging problems..',
             count($this->objects)
diff --git a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
index eee671397..d167061f9 100644
--- a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php
@@ -11,26 +11,21 @@ use Icinga\Web\Notification;
  */
 class AddCommentCommandForm extends ObjectsCommandForm
 {
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->addDescription($this->translate('This command is used to add host or service comments.'));
+    }
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
      */
     public function getSubmitLabel()
     {
-        return mtp(
-            'monitoring', 'Add comment', 'Add comments', count($this->objects)
-        );
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Forms\Command\CommandForm::getHelp() For the method documentation.
-     */
-    public function getHelp()
-    {
-        return $this->translate(
-            'This command is used to add host or service comments.'
-        );
+        return $this->translatePlural('Add comment', 'Add comments', count($this->objects));
     }
 
     /**
@@ -84,8 +79,7 @@ class AddCommentCommandForm extends ObjectsCommandForm
             $comment->setPersistent($this->getElement('persistent')->isChecked());
             $this->getTransport($this->request)->send($comment);
         }
-        Notification::success(mtp(
-            'monitoring',
+        Notification::success($this->translatePlural(
             'Adding comment..',
             'Adding comments..',
             count($this->objects)
diff --git a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
index 1a357bdce..ec80a539f 100644
--- a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
@@ -11,25 +11,24 @@ use Icinga\Module\Monitoring\Command\Object\ProcessCheckResultCommand;
  */
 class ProcessCheckResultCommandForm extends ObjectsCommandForm
 {
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->addDescription($this->translate(
+            'This command is used to submit passive host or service check results.'
+        ));
+    }
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
      */
     public function getSubmitLabel()
     {
-        return mtp(
-            'monitoring', 'Submit Passive Check Result', 'Submit Passive Check Results', count($this->objects)
-        );
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Forms\Command\CommandForm::getHelp() For the method documentation.
-     */
-    public function getHelp()
-    {
-        return $this->translate(
-            'This command is used to submit passive host or service check results.'
+        return $this->translatePlural(
+            'Submit Passive Check Result', 'Submit Passive Check Results', count($this->objects)
         );
     }
 
@@ -108,8 +107,7 @@ class ProcessCheckResultCommandForm extends ObjectsCommandForm
             $this->getTransport($this->request)->send($command);
         }
 
-        Notification::success(mtp(
-            'monitoring',
+        Notification::success($this->translatePlural(
             'Processing check result..',
             'Processing check results..',
             count($this->objects)
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
index 7789460e3..0fa748fc4 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php
@@ -47,8 +47,7 @@ class ScheduleHostCheckCommandForm extends ScheduleServiceCheckCommandForm
                 ->setOfAllServices($this->getElement('all_services')->isChecked());
             $this->scheduleCheck($check, $this->request);
         }
-        Notification::success(mtp(
-            'monitoring',
+        Notification::success($this->translatePlural(
             'Scheduling host check..',
             'Scheduling host checks..',
             count($this->objects)
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
index 6c7823dca..c35cb5413 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
@@ -7,7 +7,6 @@ use Icinga\Module\Monitoring\Command\Object\PropagateHostDowntimeCommand;
 use Icinga\Module\Monitoring\Command\Object\ScheduleHostDowntimeCommand;
 use Icinga\Module\Monitoring\Command\Object\ScheduleServiceDowntimeCommand;
 use Icinga\Web\Notification;
-use Icinga\Web\Request;
 
 /**
  * Form for scheduling host downtimes
@@ -83,8 +82,7 @@ class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
             $hostDowntime->setObject($object);
             $this->scheduleDowntime($hostDowntime, $this->request);
         }
-        Notification::success(mtp(
-            'monitoring',
+        Notification::success($this->translatePlural(
             'Scheduling host downtime..',
             'Scheduling host downtimes..',
             count($this->objects)
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
index e6686a9b8..f0f15559e 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php
@@ -14,27 +14,24 @@ use Icinga\Web\Request;
  */
 class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
 {
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->addDescription($this->translate(
+            'This command is used to schedule the next check of hosts or services. Icinga will re-queue the'
+            . ' hosts or services to be checked at the time you specify.'
+        ));
+    }
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
      */
     public function getSubmitLabel()
     {
-        return mtp(
-            'monitoring', 'Schedule check', 'Schedule checks', count($this->objects)
-        );
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Forms\Command\CommandForm::getHelp() For the method documentation.
-     */
-    public function getHelp()
-    {
-        return $this->translate(
-            'This command is used to schedule the next check of hosts or services. Icinga will re-queue the'
-            . ' hosts or services to be checked at the time you specify.'
-        );
+        return $this->translatePlural('Schedule check', 'Schedule checks', count($this->objects));
     }
 
     /**
@@ -99,8 +96,7 @@ class ScheduleServiceCheckCommandForm extends ObjectsCommandForm
             $check->setObject($object);
             $this->scheduleCheck($check, $this->request);
         }
-        Notification::success(mtp(
-            'monitoring',
+        Notification::success($this->translatePlural(
             'Scheduling service check..',
             'Scheduling service checks..',
             count($this->objects)
diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
index 00487e115..627138a88 100644
--- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php
@@ -25,29 +25,26 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
     const FLEXIBLE = 'flexible';
 
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
+     * Initialize this form
      */
-    public function getSubmitLabel()
+    public function init()
     {
-        return mtp(
-            'monitoring', 'Schedule downtime', 'Schedule downtimes', count($this->objects)
-        );
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Forms\Command\CommandForm::getHelp() For the method documentation.
-     */
-    public function getHelp()
-    {
-        return $this->translate(
+        $this->addDescription($this->translate(
             'This command is used to schedule host and service downtimes. During the specified downtime,'
             . ' Icinga will not send notifications out about the hosts and services. When the scheduled'
             . ' downtime expires, Icinga will send out notifications for the hosts and services as it'
             . ' normally would. Scheduled downtimes are preserved across program shutdowns and'
             . ' restarts.'
-        );
+        ));
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
+     */
+    public function getSubmitLabel()
+    {
+        return $this->translatePlural('Schedule downtime', 'Schedule downtimes', count($this->objects));
     }
 
     /**
@@ -206,8 +203,7 @@ class ScheduleServiceDowntimeCommandForm extends ObjectsCommandForm
             $downtime->setObject($object);
             $this->scheduleDowntime($downtime, $this->request);
         }
-        Notification::success(mtp(
-            'monitoring',
+        Notification::success($this->translatePlural(
             'Scheduling service downtime..',
             'Scheduling service downtimes..',
             count($this->objects)
diff --git a/modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml b/modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml
index 7f4314cbf..dbcf0bc03 100644
--- a/modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml
+++ b/modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml
@@ -7,7 +7,6 @@
     <hr class="command-separator">
   <?php endif ?>
 </div>
-<div class="content">
-    <h1 class="command-title"><?= $title; ?> <?= /** @var \Icinga\Module\Monitoring\Forms\Command\CommandForm $form */ $this->icon('help', $form->getHelp()); ?></h1>
-    <?= $form ?>
+<div class="content object-command">
+    <?= $form; ?>
 </div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml b/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
index da58fc9cb..d387202c2 100644
--- a/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
+++ b/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
@@ -5,7 +5,7 @@
     <?= $this->render('partials/host/objects-header.phtml'); ?>
   <?php endif ?>
 </div>
-<div class="content">
+<div class="content objects-command">
     <table class="objectlist">
         <thead>
             <tr>
@@ -27,6 +27,5 @@
         </tbody>
     </table>
     <hr class="command-separator">
-    <h1 class="command-title"><?= $title ?> <?= /** @var \Icinga\Module\Monitoring\Forms\Command\CommandForm $form */ $this->icon('help', $form->getHelp()) ?></h1>
-    <?= $form ?>
+    <?= $form; ?>
 </div>
diff --git a/modules/monitoring/application/views/scripts/process/disable-notifications.phtml b/modules/monitoring/application/views/scripts/process/disable-notifications.phtml
index 2fb3c6c6e..9b9a2b133 100644
--- a/modules/monitoring/application/views/scripts/process/disable-notifications.phtml
+++ b/modules/monitoring/application/views/scripts/process/disable-notifications.phtml
@@ -2,7 +2,7 @@
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1><?= $title ?> <?= $this->icon('help', $form->getHelp()) ?></h1>
+    <h1><?= $title; ?></h1>
     <?php if ((bool) $programStatus->notifications_enabled === false): ?>
     <div>
         <?= $this->translate('Host and service notifications are already disabled.') ?>
@@ -13,6 +13,6 @@
         <?php endif; ?>
     </div>
     <?php else: ?>
-    <?= $form ?>
+    <?= $form; ?>
     <?php endif ?>
 </div>
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 26cd5bc38..02ef9be6c 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -190,7 +190,7 @@ div.selection-info {
   vertical-align: middle;
 }
 
-h1.command-title {
+.object-command h1.form-title, .objects-command h1.form-title {
   border: none;
 }
 

From b9ac42b54d5dcc152c57fdb7abd248a375b24b7e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Mar 2015 18:39:40 +0100
Subject: [PATCH 0853/2920] Drop CommandForm::getHelp() as being obsolete

---
 .../application/forms/Command/CommandForm.php          | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/CommandForm.php b/modules/monitoring/application/forms/Command/CommandForm.php
index dae5df963..41a46f110 100644
--- a/modules/monitoring/application/forms/Command/CommandForm.php
+++ b/modules/monitoring/application/forms/Command/CommandForm.php
@@ -43,16 +43,6 @@ abstract class CommandForm extends Form
         return $this->backend;
     }
 
-    /**
-     * Get the command help description
-     *
-     * @return string|null
-     */
-    public function getHelp()
-    {
-        return null;
-    }
-
     /**
      * Get the transport used to send commands
      *

From 53e73161d8ca1b45bf26e6900b355f0dde2a2227 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 2 Mar 2015 18:45:38 +0100
Subject: [PATCH 0854/2920] Fix that the AcknowledgeCommandForm is opened in a
 new column

---
 .../views/scripts/show/components/acknowledgement.phtml      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index 22a372151..7c50a4882 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -40,8 +40,9 @@ if ($object->acknowledged): ?>
                 $ackLink,
                 null,
                 array(
-                    'icon'  => 'ok',
-                    'title' => $this->translate(
+                    'icon'              => 'ok',
+                    'data-base-target'  => '_self',
+                    'title'             => $this->translate(
                         'Acknowledge this problem, suppress all future notifications for it and tag it as being handled'
                     )
                 )

From f7785ee04aede15e9c3bb7681fa74a53f0675385 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 3 Mar 2015 08:24:23 +0100
Subject: [PATCH 0855/2920] Fix that the DashletForm handles the autosubmit
 manually

---
 application/forms/Dashboard/DashletForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/forms/Dashboard/DashletForm.php b/application/forms/Dashboard/DashletForm.php
index 6a33a439b..59ae41582 100644
--- a/application/forms/Dashboard/DashletForm.php
+++ b/application/forms/Dashboard/DashletForm.php
@@ -116,9 +116,9 @@ class DashletForm extends Form
             'checkbox',
             'create_new_pane',
             array(
+                'autosubmit'    => true,
                 'required'      => false,
                 'label'         => $this->translate('New dashboard'),
-                'class'         => 'autosubmit',
                 'description'   => $this->translate('Check this box if you want to add the dashlet to a new dashboard')
             )
         );

From 642fa44fce3f38b0398c708d3dd23efdad4ea548 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 3 Mar 2015 09:53:25 +0100
Subject: [PATCH 0856/2920] Move a form's title into the markup of its form

---
 library/Icinga/Web/Form.php                            | 10 +++-------
 modules/monitoring/public/css/module.less              |  2 +-
 .../views/scripts/form/setup-admin-account.phtml       |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 2cce16f76..f70ab7351 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -909,16 +909,12 @@ class Form extends Zend_Form
                     'form'          => $this
                 ));
             } else {
-                $this->addDecorator('FormErrors', array('onlyCustomFormErrors' => true))
+                $this->addDecorator('Description', array('tag' => 'h1'))
+                    ->addDecorator('FormErrors', array('onlyCustomFormErrors' => true))
                     ->addDecorator('FormDescriptions')
                     ->addDecorator('FormElements')
                     //->addDecorator('HtmlTag', array('tag' => 'dl', 'class' => 'zend_form'))
-                    ->addDecorator('Form')
-                    ->addDecorator('Description', array(
-                        'placement' => 'prepend',
-                        'class' => 'form-title',
-                        'tag' => 'h1'
-                    ));
+                    ->addDecorator('Form');
             }
         }
 
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 02ef9be6c..cc820f7a1 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -190,7 +190,7 @@ div.selection-info {
   vertical-align: middle;
 }
 
-.object-command h1.form-title, .objects-command h1.form-title {
+.object-command form h1, .objects-command form h1 {
   border: none;
 }
 
diff --git a/modules/setup/application/views/scripts/form/setup-admin-account.phtml b/modules/setup/application/views/scripts/form/setup-admin-account.phtml
index 83d01d43b..55767e96f 100644
--- a/modules/setup/application/views/scripts/form/setup-admin-account.phtml
+++ b/modules/setup/application/views/scripts/form/setup-admin-account.phtml
@@ -6,8 +6,8 @@ $radioElem = $form->getElement('user_type');
 $showRadioBoxes = strpos(strtolower(get_class($radioElem)), 'radio') !== false;
 
 ?>
-<h1 class="form-title"><?= $this->translate('Administration', 'setup.page.title'); ?></h1>
 <form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
+  <h1><?= $this->translate('Administration', 'setup.page.title'); ?></h1>
   <ul class="descriptions">
     <li><?= $this->translatePlural(
       'Now it\'s time to configure your first administrative account for Icinga Web 2. Please follow the instructions below:',

From dcf38cbf737d1c02658b9528494cc7686dd1e041 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 3 Mar 2015 09:54:12 +0100
Subject: [PATCH 0857/2920] Fix form id of the authentication configuration

---
 application/views/scripts/form/reorder-authbackend.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/scripts/form/reorder-authbackend.phtml b/application/views/scripts/form/reorder-authbackend.phtml
index f6b432940..cd8001436 100644
--- a/application/views/scripts/form/reorder-authbackend.phtml
+++ b/application/views/scripts/form/reorder-authbackend.phtml
@@ -1,4 +1,4 @@
-<form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
+<form id="<?= $form->getId(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
   <table class="action">
     <thead>
       <th>Backend</th>

From 747e51553e2599215c9969a1b56a1f498331050a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 3 Mar 2015 13:33:26 +0100
Subject: [PATCH 0858/2920] Allow the Autosubmit decorator being used on forms
 as well

refs #7935
---
 library/Icinga/Web/Form.php                   | 70 ++++++++++++++++---
 .../Icinga/Web/Form/Decorator/Autosubmit.php  | 42 ++++++++---
 public/css/icinga/forms.less                  |  6 ++
 3 files changed, 100 insertions(+), 18 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index f70ab7351..fad1a9d5e 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -133,6 +133,15 @@ class Form extends Zend_Form
      */
     protected $descriptions;
 
+    /**
+     * Whether the Autosubmit decorator should be applied to this form
+     *
+     * If this is true, the Autosubmit decorator is being applied to this form instead of to each of its elements.
+     *
+     * @var bool
+     */
+    protected $useFormAutosubmit = false;
+
     /**
      * Authentication manager
      *
@@ -486,6 +495,31 @@ class Form extends Zend_Form
         return $this->descriptions;
     }
 
+    /**
+     * Set whether the Autosubmit decorator should be applied to this form
+     *
+     * If true, the Autosubmit decorator is being applied to this form instead of to each of its elements.
+     *
+     * @param   bool    $state
+     *
+     * @return  Form
+     */
+    public function setUseFormAutosubmit($state = true)
+    {
+        $this->useFormAutosubmit = (bool) $state;
+        return $this;
+    }
+
+    /**
+     * Return whether the Autosubmit decorator is being applied to this form
+     *
+     * @return  bool
+     */
+    public function getUseFormAutosubmit()
+    {
+        return $this->useFormAutosubmit;
+    }
+
     /**
      * Create this form
      *
@@ -647,20 +681,35 @@ class Form extends Zend_Form
         }
 
         if ($el->getAttrib('autosubmit')) {
-            $autosubmitDecorator = new Autosubmit();
-            $autosubmitDecorator->setAccessible();
+            if ($this->getUseFormAutosubmit()) {
+                $warningId = 'autosubmit_warning_' . $el->getId();
+                $warningText = $this->getView()->escape($this->translate(
+                    'Upon its value has changed, this control issues an automatic update of this page.'
+                ));
+                $autosubmitDecorator = $this->_getDecorator('Callback', array(
+                    'placement' => 'PREPEND',
+                    'callback'  => function ($content) use ($warningId, $warningText) {
+                        return '<span class="sr-only" id="' . $warningId . '">' . $warningText . '</span>';
+                    }
+                ));
+            } else {
+                $autosubmitDecorator = new Autosubmit();
+                $autosubmitDecorator->setAccessible();
+                $warningId = $autosubmitDecorator->getWarningId($el);
+            }
+
             $decorators = $el->getDecorators();
             $pos = array_search('Zend_Form_Decorator_ViewHelper', array_keys($decorators)) + 1;
             $el->setDecorators(
                 array_slice($decorators, 0, $pos, true)
-                + array(get_class($autosubmitDecorator) => $autosubmitDecorator)
+                + array('autosubmit' => $autosubmitDecorator)
                 + array_slice($decorators, $pos, count($decorators) - $pos, true)
             );
 
             if (($describedBy = $el->getAttrib('aria-describedby')) !== null) {
-                $el->setAttrib('aria-describedby', $describedBy . ' ' . $autosubmitDecorator->getWarningId($el));
+                $el->setAttrib('aria-describedby', $describedBy . ' ' . $warningId);
             } else {
-                $el->setAttrib('aria-describedby', $autosubmitDecorator->getWarningId($el));
+                $el->setAttrib('aria-describedby', $warningId);
             }
 
             $class = $el->getAttrib('class');
@@ -702,7 +751,7 @@ class Form extends Zend_Form
             if (($describedBy = $element->getAttrib('aria-describedby')) !== null) {
                 // Assume that it's because of the element being of type autosubmit or
                 // that one who did set the property manually removes the help decorator
-                // in case it has already an aria-requiredby property set
+                // in case it has already an aria-describedby property set
                 $element->setAttrib(
                     'aria-describedby',
                     $help->setAccessible()->getDescriptionId($element) . ' ' . $describedBy
@@ -909,8 +958,13 @@ class Form extends Zend_Form
                     'form'          => $this
                 ));
             } else {
-                $this->addDecorator('Description', array('tag' => 'h1'))
-                    ->addDecorator('FormErrors', array('onlyCustomFormErrors' => true))
+                $this->addDecorator('Description', array('tag' => 'h1'));
+                if ($this->getUseFormAutosubmit()) {
+                    $this->addDecorator('Autosubmit', array('accessible' => true))
+                        ->addDecorator('HtmlTag', array('tag' => 'div', 'class' => 'header'));
+                }
+
+                $this->addDecorator('FormErrors', array('onlyCustomFormErrors' => true))
                     ->addDecorator('FormDescriptions')
                     ->addDecorator('FormElements')
                     //->addDecorator('HtmlTag', array('tag' => 'dl', 'class' => 'zend_form'))
diff --git a/library/Icinga/Web/Form/Decorator/Autosubmit.php b/library/Icinga/Web/Form/Decorator/Autosubmit.php
index 928325919..53fcaa5a0 100644
--- a/library/Icinga/Web/Form/Decorator/Autosubmit.php
+++ b/library/Icinga/Web/Form/Decorator/Autosubmit.php
@@ -3,15 +3,15 @@
 
 namespace Icinga\Web\Form\Decorator;
 
-use Zend_Form_Element;
 use Zend_Form_Decorator_Abstract;
 use Icinga\Application\Icinga;
 use Icinga\Web\View;
+use Icinga\Web\Form;
 
 /**
  * Decorator to add an icon and a submit button encapsulated in noscript-tags
  *
- * The icon is shown in JS environments to indicate that a specific form control does automatically request an update
+ * The icon is shown in JS environments to indicate that a specific form field does automatically request an update
  * of its form upon it has changed. The button allows users in non-JS environments to trigger the update manually.
  */
 class Autosubmit extends Zend_Form_Decorator_Abstract
@@ -21,7 +21,7 @@ class Autosubmit extends Zend_Form_Decorator_Abstract
      *
      * @var bool
      */
-    protected $accessible = false;
+    protected $accessible;
 
     /**
      * The id used to identify the auto-submit warning associated with the decorated form element
@@ -43,14 +43,28 @@ class Autosubmit extends Zend_Form_Decorator_Abstract
         return $this;
     }
 
+    /**
+     * Return whether a hidden <span> is being created with the same warning as in the icon label
+     *
+     * @return  bool
+     */
+    public function getAccessible()
+    {
+        if ($this->accessible === null) {
+            $this->accessible = $this->getOption('accessible') ?: false;
+        }
+
+        return $this->accessible;
+    }
+
     /**
      * Return the id used to identify the auto-submit warning associated with the decorated element
      *
-     * @param   Zend_Form_Element   $element    The element for which to generate a id
+     * @param   mixed   $element    The element for which to generate a id
      *
      * @return  string
      */
-    public function getWarningId(Zend_Form_Element $element = null)
+    public function getWarningId($element = null)
     {
         if ($this->warningId === null) {
             $element = $element ?: $this->getElement();
@@ -80,13 +94,18 @@ class Autosubmit extends Zend_Form_Decorator_Abstract
     public function render($content = '')
     {
         if ($content) {
-            $warning = t('Upon its value has changed, this control issues an automatic update of this page.');
+            $isForm = $this->getElement() instanceof Form;
+            $warning = $isForm
+                ? t('Upon any of this form\'s fields were changed, this page is being updated automatically.')
+                : t('Upon its value has changed, this field issues an automatic update of this page.');
             $content .= $this->getView()->icon('cw', $warning, array(
                 'aria-hidden'   => 'true',
                 'class'         => 'autosubmit-warning'
             ));
-            if ($this->accessible) {
-                $content = '<span id="' . $this->getWarningId() . '" class="sr-only">' . $warning . '</span>' . $content;
+            if ($this->getAccessible()) {
+                $content = $isForm
+                    ? $content . '<span id="' . $this->getWarningId() . '" class="sr-only">' . $warning . '</span>'
+                    : '<span id="' . $this->getWarningId() . '" class="sr-only">' . $warning . '</span>' . $content;
             }
 
             $content .= sprintf(
@@ -95,10 +114,13 @@ class Autosubmit extends Zend_Form_Decorator_Abstract
                 . ' class="noscript-apply"'
                 . ' type="submit"'
                 . ' value="1"'
-                . ($this->accessible ? ' aria-label="%1$s"' : '')
+                . ($this->getAccessible() ? ' aria-label="%1$s"' : '')
                 . ' title="%1$s"'
                 . '>%2$s</button></noscript>',
-                t('Push this button to update the form to reflect the change that was made in the control on the left'),
+                $isForm
+                    ? t('Push this button to update the form to reflect the changes that were made below')
+                    : t('Push this button to update the form to reflect the change'
+                        . ' that was made in the field on the left'),
                 $this->getView()->icon('cw') . t('Apply')
             );
         }
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index d503ba037..0f9c67170 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -227,4 +227,10 @@ form ul.descriptions {
       list-style-type: none;
     }
   }
+}
+
+form > div.header {
+  h1 {
+    display: inline-block;
+  }
 }
\ No newline at end of file

From d9fdcf036b5d28fcba7fc8c80a05d1c773a4b7b2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 3 Mar 2015 14:34:08 +0100
Subject: [PATCH 0859/2920] Show a form based autosubmit warning when toggling
 instance features

refs #7935
---
 .../Instance/ToggleInstanceFeaturesCommandForm.php   |  3 +++
 .../application/views/scripts/process/info.phtml     |  5 +----
 modules/monitoring/public/css/module.less            | 12 +++++++++++-
 public/css/icinga/forms.less                         |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index 692ed6094..ec58bb4b6 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -25,7 +25,10 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
      */
     public function init()
     {
+        $this->setUseFormAutosubmit();
+        $this->setTitle($this->translate('Feature Commands'));
         $this->setAttrib('class', 'inline instance-features');
+        $this->loadDefaultDecorators()->getDecorator('description')->setTag('h2');
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml
index 639b5ebc0..b881641e6 100644
--- a/modules/monitoring/application/views/scripts/process/info.phtml
+++ b/modules/monitoring/application/views/scripts/process/info.phtml
@@ -16,10 +16,7 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
     <div class="boxview">
 
         <div class="box left">
-            <h2 tabindex="-1" id="process-feature-command">
-                <?= $this->translate('Feature Commands') ?>
-            </h2>
-            <?= $this->toggleFeaturesForm ?>
+            <?= $this->toggleFeaturesForm; ?>
         </div>
 
         <div class="box left">
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index cc820f7a1..936c6c5de 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -160,6 +160,16 @@ form.instance-features span.description, form.object-features span.description {
   display: inline;
 }
 
+.boxview div.box form.instance-features div.header {
+  border-bottom: 1px solid #d9d9d9;
+  margin-bottom: 0.5em;
+
+  h2 {
+    border: 0;
+    padding-bottom: 0;
+  }
+}
+
 table.avp .customvar ul {
     list-style-type: none;
     margin: 0;
@@ -202,4 +212,4 @@ hr.command-separator {
 .sort-box {
   float: right;
   margin-right: 1em;
-}
\ No newline at end of file
+}
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 0f9c67170..41525a4c7 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -230,7 +230,7 @@ form ul.descriptions {
 }
 
 form > div.header {
-  h1 {
+  h1, h2, h3, h4, h5, h6 {
     display: inline-block;
   }
 }
\ No newline at end of file

From c2339d156bc591b09bb9dad7e42c6d664c53f207 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 3 Mar 2015 14:35:41 +0100
Subject: [PATCH 0860/2920] Improve aria-hidden handling in the icon and img
 view helper

---
 library/Icinga/Web/View/helpers/url.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Web/View/helpers/url.php b/library/Icinga/Web/View/helpers/url.php
index f58afef35..39e8de951 100644
--- a/library/Icinga/Web/View/helpers/url.php
+++ b/library/Icinga/Web/View/helpers/url.php
@@ -53,11 +53,12 @@ $this->addHelperFunction('img', function ($url, $params = null, array $propertie
         $properties['alt'] = '';
     }
 
+    $ariaHidden = array_key_exists('aria-hidden', $properties) ? $properties['aria-hidden'] : null;
     if (array_key_exists('title', $properties)) {
-        if (! array_key_exists('aria-label', $properties) && !array_key_exists('aria-hidden', $properties)) {
+        if (! array_key_exists('aria-label', $properties) && $ariaHidden !== 'true') {
             $properties['aria-label'] = $properties['title'];
         }
-    } elseif (! array_key_exists('aria-hidden', $properties)) {
+    } elseif ($ariaHidden === null) {
         $properties['aria-hidden'] = 'true';
     }
 
@@ -79,14 +80,15 @@ $this->addHelperFunction('icon', function ($img, $title = null, array $propertie
         return $view->img('img/icons/' . $img, $properties);
     }
 
+    $ariaHidden = array_key_exists('aria-hidden', $properties) ? $properties['aria-hidden'] : null;
     if ($title !== null) {
         $properties['role'] = 'img';
         $properties['title'] = $title;
 
-        if (! array_key_exists('aria-label', $properties) && !array_key_exists('aria-hidden', $properties)) {
+        if (! array_key_exists('aria-label', $properties) && $ariaHidden !== 'true') {
             $properties['aria-label'] = $title;
         }
-    } elseif (! array_key_exists('aria-hidden', $properties)) {
+    } elseif ($ariaHidden === null) {
         $properties['aria-hidden'] = 'true';
     }
 

From 8510835fba2a7adb8241a4fea42f757660e2ce47 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 3 Mar 2015 14:35:46 +0100
Subject: [PATCH 0861/2920] Fix accessibility of the Autosubmit decorator when
 applied to a form

refs #7935
---
 library/Icinga/Web/Form/Decorator/Autosubmit.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Web/Form/Decorator/Autosubmit.php b/library/Icinga/Web/Form/Decorator/Autosubmit.php
index 53fcaa5a0..6893c161e 100644
--- a/library/Icinga/Web/Form/Decorator/Autosubmit.php
+++ b/library/Icinga/Web/Form/Decorator/Autosubmit.php
@@ -99,13 +99,11 @@ class Autosubmit extends Zend_Form_Decorator_Abstract
                 ? t('Upon any of this form\'s fields were changed, this page is being updated automatically.')
                 : t('Upon its value has changed, this field issues an automatic update of this page.');
             $content .= $this->getView()->icon('cw', $warning, array(
-                'aria-hidden'   => 'true',
+                'aria-hidden'   => $isForm ? 'false' : 'true',
                 'class'         => 'autosubmit-warning'
             ));
-            if ($this->getAccessible()) {
-                $content = $isForm
-                    ? $content . '<span id="' . $this->getWarningId() . '" class="sr-only">' . $warning . '</span>'
-                    : '<span id="' . $this->getWarningId() . '" class="sr-only">' . $warning . '</span>' . $content;
+            if (! $isForm && $this->getAccessible()) {
+                $content = '<span id="' . $this->getWarningId() . '" class="sr-only">' . $warning . '</span>' . $content;
             }
 
             $content .= sprintf(

From 507e5b43cc2f639d17e19dd21e009828400ded2a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 3 Mar 2015 14:52:45 +0100
Subject: [PATCH 0862/2920] Show a form based autosubmit warning when toggling
 object features

refs #7935
---
 .../forms/Command/Object/ToggleObjectFeaturesCommandForm.php  | 3 +++
 modules/monitoring/public/css/module.less                     | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
index 5caacb5f8..a6c20f630 100644
--- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
@@ -18,7 +18,10 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
      */
     public function init()
     {
+        $this->setUseFormAutosubmit();
+        $this->setTitle('Feature Commands');
         $this->setAttrib('class', 'inline object-features');
+        $this->loadDefaultDecorators()->getDecorator('description')->setTag('h4');
     }
 
     /**
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 936c6c5de..6c205cd04 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -170,6 +170,10 @@ form.instance-features span.description, form.object-features span.description {
   }
 }
 
+table.avp form.object-features div.header h4 {
+  margin: 0;
+}
+
 table.avp .customvar ul {
     list-style-type: none;
     margin: 0;

From e2887df03e78e1ebffb3b7aecaae6051f37c3ccd Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 3 Mar 2015 15:01:09 +0100
Subject: [PATCH 0863/2920] Form: It's a field, not a control

---
 library/Icinga/Web/Form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index fad1a9d5e..c229f8311 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -684,7 +684,7 @@ class Form extends Zend_Form
             if ($this->getUseFormAutosubmit()) {
                 $warningId = 'autosubmit_warning_' . $el->getId();
                 $warningText = $this->getView()->escape($this->translate(
-                    'Upon its value has changed, this control issues an automatic update of this page.'
+                    'Upon its value has changed, this field issues an automatic update of this page.'
                 ));
                 $autosubmitDecorator = $this->_getDecorator('Callback', array(
                     'placement' => 'PREPEND',

From 6e61980dd2c0f5344c9469669c83b5f1af42c7e0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 4 Mar 2015 08:28:30 +0100
Subject: [PATCH 0864/2920] Fix operator precedence when detecting the default
 locale

fixes #8370
---
 library/Icinga/Application/Web.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 72e91ca92..45dbc7e87 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -314,12 +314,12 @@ class Web extends ApplicationBootstrap
     protected function detectLocale()
     {
         $auth = Manager::getInstance();
-        if (! $auth->isAuthenticated()
+        if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !$auth->isAuthenticated()
             || ($locale = $auth->getUser()->getPreferences()->getValue('icingaweb', 'language')) === null
-            && isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])
         ) {
             $locale = Translator::getPreferredLocaleCode($_SERVER['HTTP_ACCEPT_LANGUAGE']);
         }
+
         return $locale;
     }
 

From ff263946c87f0a0f35e54e538e0f2264d8460261 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 4 Mar 2015 09:38:00 +0100
Subject: [PATCH 0865/2920] Form: Fix translation domain detection while
 running unit tests

---
 library/Icinga/Web/Form.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index c229f8311..3ebfdaf04 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -1071,10 +1071,11 @@ class Form extends Zend_Form
     protected function getTranslationDomain()
     {
         $parts = explode('\\', get_called_class());
-        if ($parts[1] === 'Module') {
+        if (count($parts) > 1 && $parts[1] === 'Module') {
             // Assume format Icinga\Module\ModuleName\Forms\...
             return strtolower($parts[2]);
         }
+
         return 'icinga';
     }
 

From 5c371a6d0b3a2bfcf6d0e0d0971afb2503d18297 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 4 Mar 2015 09:43:37 +0100
Subject: [PATCH 0866/2920] Fix form tests

---
 .../forms/Config/Authentication/DbBackendFormTest.php  | 10 ++++++++--
 .../Config/Authentication/LdapBackendFormTest.php      | 10 ++++++++--
 .../forms/Config/Resource/LdapResourceFormTest.php     | 10 ++++++++--
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
index 2dc7fb5a0..b7d1ea3c1 100644
--- a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
+++ b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
@@ -31,7 +31,10 @@ class DbBackendFormTest extends BaseTestCase
             ->shouldReceive('count')
             ->andReturn(2);
 
-        $form = new DbBackendForm();
+        $form = Mockery::mock('Icinga\Forms\Config\Authentication\DbBackendForm[getView]');
+        $form->shouldReceive('getView->escape')
+            ->with(Mockery::type('string'))
+            ->andReturnUsing(function ($s) { return $s; });
         $form->setTokenDisabled();
         $form->setResources(array('test_db_backend'));
         $form->populate(array('resource' => 'test_db_backend'));
@@ -53,7 +56,10 @@ class DbBackendFormTest extends BaseTestCase
             ->shouldReceive('count')
             ->andReturn(0);
 
-        $form = new DbBackendForm();
+        $form = Mockery::mock('Icinga\Forms\Config\Authentication\DbBackendForm[getView]');
+        $form->shouldReceive('getView->escape')
+            ->with(Mockery::type('string'))
+            ->andReturnUsing(function ($s) { return $s; });
         $form->setTokenDisabled();
         $form->setResources(array('test_db_backend'));
         $form->populate(array('resource' => 'test_db_backend'));
diff --git a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
index 561d61b1c..d31033ba9 100644
--- a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
+++ b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
@@ -31,7 +31,10 @@ class LdapBackendFormTest extends BaseTestCase
         Mockery::mock('overload:Icinga\Authentication\Backend\LdapUserBackend')
             ->shouldReceive('assertAuthenticationPossible')->andReturnNull();
 
-        $form = new LdapBackendForm();
+        $form = Mockery::mock('Icinga\Forms\Config\Authentication\LdapBackendForm[getView]');
+        $form->shouldReceive('getView->escape')
+            ->with(Mockery::type('string'))
+            ->andReturnUsing(function ($s) { return $s; });
         $form->setTokenDisabled();
         $form->setResources(array('test_ldap_backend'));
         $form->populate(array('resource' => 'test_ldap_backend'));
@@ -52,7 +55,10 @@ class LdapBackendFormTest extends BaseTestCase
         Mockery::mock('overload:Icinga\Authentication\Backend\LdapUserBackend')
             ->shouldReceive('assertAuthenticationPossible')->andThrow(new AuthenticationException);
 
-        $form = new LdapBackendForm();
+        $form = Mockery::mock('Icinga\Forms\Config\Authentication\LdapBackendForm[getView]');
+        $form->shouldReceive('getView->escape')
+            ->with(Mockery::type('string'))
+            ->andReturnUsing(function ($s) { return $s; });
         $form->setTokenDisabled();
         $form->setResources(array('test_ldap_backend'));
         $form->populate(array('resource' => 'test_ldap_backend'));
diff --git a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
index f6d823046..d074f1b3b 100644
--- a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
+++ b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
@@ -29,7 +29,10 @@ class LdapResourceFormTest extends BaseTestCase
             Mockery::mock()->shouldReceive('testCredentials')->once()->andReturn(true)->getMock()
         );
 
-        $form = new LdapResourceForm();
+        $form = Mockery::mock('Icinga\Forms\Config\Resource\LdapResourceForm[getView]');
+        $form->shouldReceive('getView->escape')
+            ->with(Mockery::type('string'))
+            ->andReturnUsing(function ($s) { return $s; });
         $form->setTokenDisabled();
 
         $this->assertTrue(
@@ -48,7 +51,10 @@ class LdapResourceFormTest extends BaseTestCase
             Mockery::mock()->shouldReceive('testCredentials')->once()->andThrow('\Exception')->getMock()
         );
 
-        $form = new LdapResourceForm();
+        $form = Mockery::mock('Icinga\Forms\Config\Resource\LdapResourceForm[getView]');
+        $form->shouldReceive('getView->escape')
+            ->with(Mockery::type('string'))
+            ->andReturnUsing(function ($s) { return $s; });
         $form->setTokenDisabled();
 
         $this->assertFalse(

From 31560c9249dddd5863839aa448a700b01b5ca8bc Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 5 Mar 2015 10:30:06 +0100
Subject: [PATCH 0867/2920] Wizard: Explain that the webserver user must be in
 the group "icingaweb2"

resolves #8491
---
 .../views/scripts/form/setup-welcome.phtml       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/modules/setup/application/views/scripts/form/setup-welcome.phtml b/modules/setup/application/views/scripts/form/setup-welcome.phtml
index d4bc1c3d7..1b37f60f0 100644
--- a/modules/setup/application/views/scripts/form/setup-welcome.phtml
+++ b/modules/setup/application/views/scripts/form/setup-welcome.phtml
@@ -5,6 +5,7 @@ use Icinga\Application\Config;
 use Icinga\Application\Platform;
 use Icinga\Web\Wizard;
 
+$phpUser = Platform::getPhpUser();
 $configDir = Icinga::app()->getConfigDir();
 $setupTokenPath = rtrim($configDir, '/') . '/setup.token';
 $cliPath = realpath(Icinga::app()->getApplicationDir() . '/../bin/icingacli');
@@ -41,10 +42,15 @@ $cliPath = realpath(Icinga::app()->getApplicationDir() . '/../bin/icingacli');
           'To run this wizard a user needs to authenticate using a token which is usually'
           . ' provided to him by an administrator who\'d followed the instructions below.'
       ); ?></p>
-      <p><?= $this->translate('In any case, make sure that a group called "icingaweb2" exists:'); ?></p>
-      <div class="code">
-        <span>groupadd icingaweb2;</span>
-      </div>
+      <p><?= $this->translate('In any case, make sure that all of the following applies to your environment:'); ?></p>
+      <ul>
+        <li><?= $this->translate('A system group called "icingaweb2" exists'); ?></li>
+        <?php if ($phpUser): ?>
+        <li><?= sprintf($this->translate('The user "%s" is a member of the system group "icingaweb2"'), $phpUser); ?></li>
+        <?php else: ?>
+        <li><?= $this->translate('Your webserver\'s user is a member of the system group "icingaweb2"'); ?></li>
+        <?php endif ?>
+      </ul>
       <p><?= $this->translate('If you\'ve got the IcingaCLI installed you can do the following:'); ?></p>
       <div class="code">
         <span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup config directory --group icingaweb2<?= $configDir !== '/etc/icingaweb2' ? ' --config ' . $configDir : ''; ?>;</span>
@@ -52,7 +58,7 @@ $cliPath = realpath(Icinga::app()->getApplicationDir() . '/../bin/icingacli');
       </div>
       <p><?= $this->translate('In case the IcingaCLI is missing you can create the token manually:'); ?></p>
       <div class="code">
-        <span>su <?= ($user = Platform::getPhpUser()) !== null ? $user : 'your_webserver_user'; ?> -c "mkdir -m 2770 <?= dirname($setupTokenPath); ?>; chgrp icingaweb2 <?= dirname($setupTokenPath); ?>; head -c 12 /dev/urandom | base64 | tee <?= $setupTokenPath; ?>; chmod 0660 <?= $setupTokenPath; ?>;";</span>
+        <span>su <?= $phpUser ?: $this->translate('<your-webserver-user>'); ?> -c "mkdir -m 2770 <?= dirname($setupTokenPath); ?>; chgrp icingaweb2 <?= dirname($setupTokenPath); ?>; head -c 12 /dev/urandom | base64 | tee <?= $setupTokenPath; ?>; chmod 0660 <?= $setupTokenPath; ?>;";</span>
       </div>
       <p><?= sprintf(
         $this->translate('Please see the %s for an extensive description on how to access and use this wizard.'),

From 764f125778c409c045e6ce63d2be6d82ed688142 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 5 Mar 2015 15:08:30 +0100
Subject: [PATCH 0868/2920] Make the FormDescriptions decorator able to handle
 sub forms

refs #7947
---
 .../Web/Form/Decorator/FormDescriptions.php   | 108 ++++++++++++------
 1 file changed, 71 insertions(+), 37 deletions(-)

diff --git a/library/Icinga/Web/Form/Decorator/FormDescriptions.php b/library/Icinga/Web/Form/Decorator/FormDescriptions.php
index 012c934a1..c8ba16ead 100644
--- a/library/Icinga/Web/Form/Decorator/FormDescriptions.php
+++ b/library/Icinga/Web/Form/Decorator/FormDescriptions.php
@@ -13,6 +13,29 @@ use Icinga\Web\Form;
  */
 class FormDescriptions extends Zend_Form_Decorator_Abstract
 {
+    /**
+     * A list of element class names to be ignored when detecting which message to use to describe required elements
+     *
+     * @var array
+     */
+    protected $blacklist;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct($options = null)
+    {
+        parent::__construct($options);
+        $this->blacklist = array(
+            'Zend_Form_Element_Hidden',
+            'Zend_Form_Element_Submit',
+            'Zend_Form_Element_Button',
+            'Icinga\Web\Form\Element\Note',
+            'Icinga\Web\Form\Element\Button',
+            'Icinga\Web\Form\Element\CsrfCounterMeasure'
+        );
+    }
+
     /**
      * Render form descriptions
      *
@@ -32,9 +55,16 @@ class FormDescriptions extends Zend_Form_Decorator_Abstract
             return $content;
         }
 
-        $descriptions = $form->getDescriptions();
-        if (($requiredDesc = $this->getRequiredDescription($form)) !== null) {
-            $descriptions[] = $requiredDesc;
+        $descriptions = $this->recurseForm($form, $entirelyRequired);
+        if ($entirelyRequired) {
+            $descriptions[] = $form->getView()->translate(
+                'All fields are required and must be filled in to complete the form.'
+            );
+        } elseif ($entirelyRequired === false) {
+            $descriptions[] = $form->getView()->translate(sprintf(
+                'Required fields are marked with %s and must be filled in to complete the form.',
+                $form->getRequiredCue()
+            ));
         }
 
         if (empty($descriptions)) {
@@ -60,53 +90,57 @@ class FormDescriptions extends Zend_Form_Decorator_Abstract
     }
 
     /**
-     * Return the description for the given form's required elements
+     * Recurse the given form and return the descriptions for it and all of its subforms
      *
-     * @param   Form    $form
+     * @param   Form    $form               The form to recurse
+     * @param   mixed   $entirelyRequired   Set by reference, true means all elements in the hierarchy are
+     *                                       required, false only a partial subset and null none at all
+     * @param   bool    $elementsPassed     Whether there were any elements passed during the recursion until now
      *
-     * @return  string|null
+     * @return  array
      */
-    protected function getRequiredDescription(Form $form)
+    protected function recurseForm(Form $form, & $entirelyRequired = null, $elementsPassed = false)
     {
-        if (($cue = $form->getRequiredCue()) === null) {
-            return;
-        }
-
         $requiredLabels = array();
-        $entirelyRequired = true;
-        $partiallyRequired = false;
-        $blacklist = array(
-            'Zend_Form_Element_Hidden',
-            'Zend_Form_Element_Submit',
-            'Zend_Form_Element_Button',
-            'Icinga\Web\Form\Element\Note',
-            'Icinga\Web\Form\Element\Button',
-            'Icinga\Web\Form\Element\CsrfCounterMeasure'
-        );
-        foreach ($form->getElements() as $element) {
-            if (! in_array($element->getType(), $blacklist)) {
-                if (! $element->isRequired()) {
-                    $entirelyRequired = false;
-                } else {
-                    $partiallyRequired = true;
-                    if (($label = $element->getDecorator('label')) !== false) {
-                        $requiredLabels[] = $label;
+        if ($form->getRequiredCue() !== null) {
+            $partiallyRequired = $partiallyOptional = false;
+            foreach ($form->getElements() as $element) {
+                if (! in_array($element->getType(), $this->blacklist)) {
+                    if (! $element->isRequired()) {
+                        $partiallyOptional = true;
+                        if ($entirelyRequired) {
+                            $entirelyRequired = false;
+                        }
+                    } else {
+                        $partiallyRequired = true;
+                        if (($label = $element->getDecorator('label')) !== false) {
+                            $requiredLabels[] = $label;
+                        }
                     }
                 }
             }
+
+            if (! $elementsPassed) {
+                $elementsPassed = $partiallyRequired || $partiallyOptional;
+                if ($entirelyRequired === null && $partiallyRequired) {
+                    $entirelyRequired = ! $partiallyOptional;
+                }
+            } elseif ($entirelyRequired === null && $partiallyRequired) {
+                $entirelyRequired = false;
+            }
         }
 
-        if ($entirelyRequired && $partiallyRequired) {
+        $descriptions = array($form->getDescriptions());
+        foreach ($form->getSubForms() as $subForm) {
+            $descriptions[] = $this->recurseForm($subForm, $entirelyRequired, $elementsPassed);
+        }
+
+        if ($entirelyRequired) {
             foreach ($requiredLabels as $label) {
                 $label->setRequiredSuffix('');
             }
-
-            return $form->getView()->translate('All fields are required and must be filled in to complete the form.');
-        } elseif ($partiallyRequired) {
-            return $form->getView()->translate(sprintf(
-                'Required fields are marked with %s and must be filled in to complete the form.',
-                $cue
-            ));
         }
+
+        return call_user_func_array('array_merge', $descriptions);
     }
 }

From b8eedc21bbebb660ecdb32cfbb0abbbfb9ce428b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 5 Mar 2015 15:12:02 +0100
Subject: [PATCH 0869/2920] Form: Explicitly set subform decorators

refs #7947
---
 library/Icinga/Web/Form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 3ebfdaf04..795fac1e9 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -622,7 +622,7 @@ class Form extends Zend_Form
     public function addSubForm(Zend_Form $form, $name = null, $order = null)
     {
         if ($form instanceof self) {
-            $form->removeDecorator('Form');
+            $form->setDecorators(array('FormElements')); // TODO: Makes it difficult to customise subform decorators..
             $form->setSubmitLabel('');
             $form->setTokenDisabled();
             $form->setUidDisabled();

From b9811f8590ad7bc8cce91a3bc881e73667fed01e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 5 Mar 2015 15:13:38 +0100
Subject: [PATCH 0870/2920] Form: Do not set the requiredSuffix as option but
 use its virtual setter

This removes the invalid attribute on each <label> tag once the
FormDescriptions decorator removes the suffix.

refs #7947
---
 library/Icinga/Web/Form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 795fac1e9..c7e613e7b 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -743,7 +743,7 @@ class Form extends Zend_Form
             if (($cue = $this->getRequiredCue()) !== null && ($label = $element->getDecorator('label')) !== false) {
                 $element->setLabel($this->getView()->escape($element->getLabel()));
                 $label->setOption('escape', false);
-                $label->setOption('requiredSuffix', sprintf(' <span aria-hidden="true">%s</span>', $cue));
+                $label->setRequiredSuffix(sprintf(' <span aria-hidden="true">%s</span>', $cue));
             }
         }
 

From 2df7c60a19f7d2498110fbedbf782dab5930c677 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 5 Mar 2015 14:13:23 +0100
Subject: [PATCH 0871/2920] puppet: Provision the roles.ini

fixes #8617
---
 .puppet/profiles/icingaweb2_dev/manifests/init.pp       | 2 +-
 .puppet/profiles/icingaweb2_dev/templates/roles.ini.erb | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 .puppet/profiles/icingaweb2_dev/templates/roles.ini.erb

diff --git a/.puppet/profiles/icingaweb2_dev/manifests/init.pp b/.puppet/profiles/icingaweb2_dev/manifests/init.pp
index b8bea040f..33f29df3b 100644
--- a/.puppet/profiles/icingaweb2_dev/manifests/init.pp
+++ b/.puppet/profiles/icingaweb2_dev/manifests/init.pp
@@ -90,7 +90,7 @@ class icingaweb2_dev (
     source => $name,
   }
 
-  icingaweb2::config::general { [ 'config', 'resources' ]:
+  icingaweb2::config::general { [ 'config', 'resources', 'roles' ]:
     source  => $name,
     replace => false,
   }
diff --git a/.puppet/profiles/icingaweb2_dev/templates/roles.ini.erb b/.puppet/profiles/icingaweb2_dev/templates/roles.ini.erb
new file mode 100644
index 000000000..98a885fd0
--- /dev/null
+++ b/.puppet/profiles/icingaweb2_dev/templates/roles.ini.erb
@@ -0,0 +1,3 @@
+[admins]
+users = icingaadmin
+permissions = *

From dc223128bbc243ea31b1efdc117e0eb38529791b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 5 Mar 2015 17:18:52 +0100
Subject: [PATCH 0872/2920] Remove host_- and service_object_id from
 ContactQuery's columnMap

We do not use these columns.

refs #8614
---
 .../library/Monitoring/Backend/Ido/Query/ContactQuery.php       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
index b7dd449b2..ac549e00a 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
@@ -33,12 +33,10 @@ class ContactQuery extends IdoQuery
             'contact_notify_service_timeperiod' => 'st.alias COLLATE latin1_general_ci'
         ),
         'hosts' => array(
-            'host_object_id' => 'ho.object_id',
             'host_name'      => 'ho.name1 COLLATE latin1_general_ci',
             'host'           => 'ho.name1 COLLATE latin1_general_ci',
         ),
         'services' => array(
-            'service_object_id'   => 'so.object_id',
             'service_host_name'   => 'so.name1 COLLATE latin1_general_ci',
             'service'             => 'so.name1 COLLATE latin1_general_ci',
             'service_description' => 'so.name2 COLLATE latin1_general_ci',

From 860cc59155abbcb1b1c47ed33d0147e37e76e5a4 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 5 Mar 2015 18:32:38 +0100
Subject: [PATCH 0873/2920] Implement new layout for service multi-view

refs #8565
---
 .../controllers/HostsController.php           |   3 +-
 .../controllers/ServicesController.php        |  89 +++++---
 .../command/objects-command-form.phtml        |  28 +--
 .../partials/host/objects-header.phtml        |   3 +-
 .../partials/host/servicesummary.phtml        |   1 +
 .../partials/service/objects-header.phtml     | 117 +++++++---
 .../service/objects-tinysummary.phtml         |  42 ++++
 .../views/scripts/services/show.phtml         | 216 ++++++++++++------
 modules/monitoring/public/css/module.less     |   7 +-
 public/css/icinga/monitoring-colors.less      |  47 ++++
 public/css/icinga/widgets.less                |  42 ++--
 public/js/icinga/behavior/tooltip.js          |   2 +-
 12 files changed, 425 insertions(+), 172 deletions(-)
 create mode 100644 modules/monitoring/application/views/scripts/partials/service/objects-tinysummary.phtml

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 5dc72eeb0..1586ad723 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -77,7 +77,8 @@ class Monitoring_HostsController extends Controller
                     count($this->hostList)
                 ),
                 'label' => $this->translate('Hosts'),
-                'url'   => Url::fromRequest()
+                'url'   => Url::fromRequest(),
+                'icon'  => 'host'
             )
         )->activate('show');
         $this->setAutorefreshInterval(15);
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 1e907aab9..ceabd643e 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -10,6 +10,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\ProcessCheckResultCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceCheckCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceDowntimeCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Module\Monitoring\Object\ServiceList;
@@ -28,6 +29,19 @@ class Monitoring_ServicesController extends Controller
         $serviceList = new ServiceList($this->backend);
         $serviceList->setFilter(Filter::fromQueryString((string) $this->params->without('service_problem', 'service_handled')));
         $this->serviceList = $serviceList;
+        $this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/services');
+        $this->getTabs()->add(
+            'show',
+            array(
+                'title' => sprintf(
+                    $this->translate('Show summarized information for %u services'),
+                    count($this->serviceList)
+                ),
+                'label' => $this->translate('Services'),
+                'url'   => Url::fromRequest(),
+                'icon' => 'services'
+            )
+        )->activate('show');
     }
 
     protected function handleCommandForm(ObjectsCommandForm $form)
@@ -40,7 +54,11 @@ class Monitoring_ServicesController extends Controller
             'service_problem',
             'service_handled',
             'service_acknowledged',
-            'service_in_downtime'
+            'service_in_downtime',
+            'service_is_flapping',
+            'service_notifications_enabled',
+            'service_output',
+            'service_last_ack'
         ));
 
         $form
@@ -90,17 +108,6 @@ class Monitoring_ServicesController extends Controller
 
     public function showAction()
     {
-        $this->getTabs()->add(
-            'show',
-            array(
-                'title' => sprintf(
-                    $this->translate('Show summarized information for %u services'),
-                    count($this->serviceList)
-                ),
-                'label' => $this->translate('Services'),
-                'url'   => Url::fromRequest()
-            )
-        )->activate('show');
         $this->setAutorefreshInterval(15);
         $checkNowForm = new CheckNowCommandForm();
         $checkNowForm
@@ -109,15 +116,21 @@ class Monitoring_ServicesController extends Controller
         $this->view->checkNowForm = $checkNowForm;
         $this->serviceList->setColumns(array(
             'host_name',
+            'host_output',
             'host_state',
+            'service_output',
             'service_description',
             'service_state',
             'service_problem',
             'service_handled',
             'service_acknowledged',
-            'service_in_downtime'/*,
-            'service_passive_checks_enabled',
+            'service_in_downtime',
+            'service_is_flapping',
             'service_notifications_enabled',
+            'service_last_comment',
+            'service_last_ack'
+            /*,
+            'service_passive_checks_enabled',
             'service_event_handler_enabled',
             'service_flap_detection_enabled',
             'service_active_checks_enabled',
@@ -129,22 +142,34 @@ class Monitoring_ServicesController extends Controller
         $objectsInDowntime = array();
         $downtimeFilterExpressions = array();
         $serviceStates = array(
-            Service::getStateText(Service::STATE_OK) => 0,
-            Service::getStateText(Service::STATE_WARNING) => 0,
-            Service::getStateText(Service::STATE_CRITICAL) => 0,
-            Service::getStateText(Service::STATE_UNKNOWN) => 0,
-            Service::getStateText(Service::STATE_PENDING) => 0
+            'services_' . Service::getStateText(Service::STATE_OK) => 0,
+            'services_' . Service::getStateText(Service::STATE_OK) . '_unhandled' => 0,
+            'services_' . Service::getStateText(Service::STATE_WARNING) => 0,
+            'services_' . Service::getStateText(Service::STATE_WARNING) . '_unhandled' => 0,
+            'services_' . Service::getStateText(Service::STATE_CRITICAL) => 0,
+            'services_' . Service::getStateText(Service::STATE_CRITICAL) . '_unhandled' => 0,
+            'services_' .  Service::getStateText(Service::STATE_UNKNOWN) => 0,
+            'services_' .  Service::getStateText(Service::STATE_UNKNOWN) . '_unhandled' => 0,
+            'services_' .  Service::getStateText(Service::STATE_PENDING) => 0,
+            'services_' .  Service::getStateText(Service::STATE_PENDING) . '_unhandled' => 0
         );
         $knownHostStates = array();
         $hostStates = array(
-            Host::getStateText(Host::STATE_UP) => 0,
-            Host::getStateText(Host::STATE_DOWN) => 0,
-            Host::getStateText(Host::STATE_UNREACHABLE) => 0,
-            Host::getStateText(Host::STATE_PENDING) => 0,
+            'hosts_' . Host::getStateText(Host::STATE_UP) => 0,
+            'hosts_' . Host::getStateText(Host::STATE_UP) . '_unhandled' => 0,
+            'hosts_' . Host::getStateText(Host::STATE_DOWN) => 0,
+            'hosts_' . Host::getStateText(Host::STATE_DOWN) . '_unhandled' => 0,
+            'hosts_' . Host::getStateText(Host::STATE_UNREACHABLE) => 0,
+            'hosts_' . Host::getStateText(Host::STATE_UNREACHABLE) . '_unhandled' => 0,
+            'hosts_' . Host::getStateText(Host::STATE_PENDING) => 0,
+            'hosts_' . Host::getStateText(Host::STATE_PENDING) . '_unhandled' => 0
         );
         foreach ($this->serviceList as $service) {
+            $unhandled = false;
+
             /** @var Service $service */
             if ((bool) $service->problem === true && (bool) $service->handled === false) {
+                $unhandled = true;
                 $unhandledObjects[] = $service;
                 $unhandledFilterExpressions[] = Filter::matchAll(
                     Filter::where('host', $service->getHost()->getName()),
@@ -161,10 +186,11 @@ class Monitoring_ServicesController extends Controller
                     Filter::where('downtime_service', $service->getName())
                 );
             }
-            ++$serviceStates[$service::getStateText($service->state)];
+
+            ++$serviceStates['services_' . $service::getStateText($service->state) . ($unhandled ? '_unhandled' : '')];
             if (! isset($knownHostStates[$service->getHost()->getName()])) {
                 $knownHostStates[$service->getHost()->getName()] = true;
-                ++$hostStates[$service->getHost()->getStateText($service->host_state)];
+                ++$hostStates['hosts_' . $service->getHost()->getStateText($service->host_state)];
             }
         }
         if (! empty($acknowledgedObjects)) {
@@ -174,15 +200,20 @@ class Monitoring_ServicesController extends Controller
                 ->handleRequest();
             $this->view->removeAckForm = $removeAckForm;
         }
+        if (! empty($objectsInDowntime)) {
+            $removeDowntimeForm = new DeleteDowntimeCommandForm();
+            $removeDowntimeForm->setObjects($objectsInDowntime)
+                ->handleRequest();
+            $this->view->removeDowntimeForm = $removeDowntimeForm;
+        }
         $this->setAutorefreshInterval(15);
-        $this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/services');
         $this->view->rescheduleAllLink = Url::fromRequest()->setPath('monitoring/services/reschedule-check');
         $this->view->downtimeAllLink = Url::fromRequest()->setPath('monitoring/services/schedule-downtime');
         $this->view->processCheckResultAllLink = Url::fromRequest()->setPath(
             'monitoring/services/process-check-result'
         );
-        $this->view->hostStates = $hostStates;
-        $this->view->serviceStates = $serviceStates;
+        $this->view->hostStates = (object)$hostStates;
+        $this->view->serviceStates = (object)$serviceStates;
         $this->view->objects = $this->serviceList;
         $this->view->unhandledObjects = $unhandledObjects;
         $unhandledFilterQueryString = Filter::matchAny($unhandledFilterExpressions)->toQueryString();
@@ -196,6 +227,7 @@ class Monitoring_ServicesController extends Controller
             ->setQueryString(Filter::matchAny($downtimeFilterExpressions)->toQueryString());
         $this->view->commentsLink = Url::fromRequest()
             ->setPath('monitoring/list/comments');
+        /*
         $this->view->serviceStatesPieChart = $this->createPieChart(
             $serviceStates,
             $this->translate('Service State'),
@@ -206,6 +238,7 @@ class Monitoring_ServicesController extends Controller
             $this->translate('Host State'),
             array('#44bb77', '#FF5566', '#E066FF', '#77AAFF')
         );
+        */
     }
 
     protected function createPieChart(array $states, $title, array $colors)
diff --git a/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml b/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
index d387202c2..ece0aea34 100644
--- a/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
+++ b/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
@@ -1,31 +1,19 @@
 <div class="controls">
+
+   <?php if (! $this->compact): ?>
+       <?= $tabs; ?>
+   <?php endif ?>
+
   <?php if (isset($serviceStates)): ?>
+    <h1><?= sprintf($this->translate('%d Services Selected'), count($objects)) ?></h1>
     <?= $this->render('partials/service/objects-header.phtml'); ?>
   <?php else: ?>
+    <h1><?= sprintf($this->translate('%d Hosts Selected'), count($objects)) ?></h1>
     <?= $this->render('partials/host/objects-header.phtml'); ?>
   <?php endif ?>
 </div>
+
 <div class="content objects-command">
-    <table class="objectlist">
-        <thead>
-            <tr>
-                <th><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
-                <th><?= $this->icon('conf'); ?> <?= $this->translate('Service'); ?></th>
-            </tr>
-        </thead>
-        <tbody>
-          <?php foreach ($form->getObjects() as $object): /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */ ?>
-            <tr>
-              <?php if ($object->getType() === $object::TYPE_HOST): ?>
-                <td colspan="2"><?= $this->escape($object->getName()); ?></td>
-              <?php else: ?>
-                <td><?= $this->escape($object->getHost()->getName()); ?></td>
-                <td><?= $this->escape($object->getName()); ?></td>
-              <?php endif ?>
-            </tr>
-          <?php endforeach ?>
-        </tbody>
-    </table>
     <hr class="command-separator">
     <?= $form; ?>
 </div>
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index f892df6f4..448be4c02 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -1,6 +1,7 @@
 <?php if (! $this->compact): ?>
     <?= $tabs; ?>
 <?php endif ?>
+
 <?php if (($hostCount = count($objects)) > 0): ?>
 <div class="hbox-item">
     <h1 tabindex="-1">
@@ -15,4 +16,4 @@
     <?= sprintf('%s: %u', $this->translate(strtoupper($text)), $count); ?><br>
   <?php endforeach ?>
 </div>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
index c0acdead4..bdd4d9af7 100644
--- a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
@@ -31,6 +31,7 @@ $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
 <?php else: ?>
 <?= $this->translate('No services configured on this host'); ?>
 <?php endif; ?>
+
 <span class="badges">
 <?php if ($object->stats->services_ok): ?>
 <span class="state ok<?= $currentUrl === $selfUrl->with('service_state', 0)->getRelativeUrl() ? ' active' : ''; ?>">
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index 6389d992f..113e7c0a0 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -1,34 +1,85 @@
-<?php if (! $this->compact): ?>
-    <?= $tabs; ?>
-<?php endif ?>
+<?php
+use Icinga\Module\Monitoring\Object\Service;
+use Icinga\Web\Url;
+?>
+
+<?php
+    $i = 0;
+    $hidden = array();
+    $hiddenRich = array();
+?>
 <?php if (($serviceCount = count($objects)) > 0): ?>
-<div class="hbox">
-    <div class="hbox-item" style="width: 6em;">
-        <h1 tabindex="-1">
-            <?= sprintf($this->translatePlural('Service (%u)', 'Services (%u)', $serviceCount), $serviceCount); ?>
-        </h1>
-    </div>
-    <div class="hbox-item">
-        &nbsp;<?= $serviceStatesPieChart; ?>
-    </div>
-    <div class="hbox-item" style="font-size: 14px">
-      <?php foreach (array_filter($serviceStates) as $text => $count): ?>
-        <?= sprintf('%s: %u', $this->translate(strtoupper($text)), $count); ?><br>
-      <?php endforeach ?>
-    </div>
-</div>
-<div class="hbox">
-    <div class="hbox-item" style="width: 6em;">
-        <?php $hostCount = array_sum(array_values($hostStates)); ?>
-        <strong><?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', $hostCount), $hostCount); ?></strong>
-    </div>
-    <div class="hbox-item">
-        &nbsp;<?= $hostStatesPieChart; ?>
-    </div>
-    <div class="hbox-item" style="font-size: 14px">
-      <?php foreach (array_filter($hostStates) as $text => $count): ?>
-        <?= sprintf('%s: %u', $this->translate(strtoupper($text)), $count); ?><br>
-      <?php endforeach ?>
-    </div>
-</div>
-<?php endif ?>
\ No newline at end of file
+    <p>
+    <table class="state statesummary">
+    <thead>
+    <tr>
+        <th></th>
+        <th></th>
+        <th><?= $this->icon('service'); ?> <?= $this->translate('Service'); ?></th>
+        <th><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
+        <th class="collapse"><?= $this->translate('Output'); ?></th>
+    </tr>
+    </thead>
+
+    <tbody>
+    <?php foreach ($objects as $service): /** @var Service $service */ ?>
+        <?php
+        $i++;
+        if ($i > 5) {
+            $desc = $service->getHost()->getName() . ' on ' . $service->getName();
+            $hidden[] = $desc;
+            $hiddenRich[] = sprintf("<div class='color-box badge-%s'></div>%s", $service->getStateText($service->service_state) ,$desc);
+            continue;
+        }
+        ?>
+
+        <tr class="state <?= Service::getStateText($service->service_state); ?><?= $service->service_handled ? ' handled' : '' ?>">
+            <td class="state"><?= Service::getStateText($service->service_state, true); ?><br /></td>
+            <td>
+                <?php if (!$service->service_handled && $service->service_state > 0): ?>
+                    <?= $this->icon('attention-alt', $this->translate('Unhandled')) ?>
+                <?php endif ?>
+
+                <?php if ($service->service_acknowledged && !$service->service_in_downtime): ?>
+                    <?= $this->icon('ok', $this->translate('Acknowledged') . (
+                        $service->service_last_ack ? ': ' . $service->service_last_ack : ''
+                        )) ?>
+                <?php endif ?>
+
+                <?php if ($service->service_is_flapping): ?>
+                    <?= $this->icon('flapping', $this->translate('Flapping')) ?>
+                <?php endif ?>
+
+                <?php if (!$service->service_notifications_enabled): ?>
+                    <?= $this->icon('bell-off-empty', $this->translate('Notifications Disabled')) ?>
+                <?php endif ?>
+
+                <?php if ($service->service_in_downtime): ?>
+                    <?= $this->icon('plug', $this->translate('In Downtime')) ?>
+                <?php endif ?>
+
+                <?php if (isset($service->service_last_comment) && $service->service_last_comment !== null): ?>
+                    <?= $this->icon('comment', $this->translate('Last Comment: ') . $service->service_last_comment) ?>
+                <?php endif ?>
+            </td>
+            <td><?= $this->escape($service->getName()); ?></td>
+            <td><?= $this->escape($service->getHost()->getName()); ?></b></td>
+            <td><p class="pluginoutput collapse"><?= $this->escape($service->service_output) ?></p></td>
+        </tr>
+    <?php endforeach ?>
+
+    <?php if (count($hidden)): ?>
+        <tr>
+        <td>
+        <div class="selection-info" data-title-rich="<span align='left'><?= join('<br>', $hiddenRich) ?></span>"
+              title="<?= join(', ', $hidden) ?>">
+              <?= sprintf(t('%d more ...'), count($hidden)) ?>
+        </div>
+        </td>
+        </tr>
+    <?php endif ?>
+
+    </tbody>
+    </table>
+    </p>
+<?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-tinysummary.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-tinysummary.phtml
new file mode 100644
index 000000000..7707651d2
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-tinysummary.phtml
@@ -0,0 +1,42 @@
+<?php
+use Icinga\Web\Url;
+?>
+
+<h1 class="tinystatesummary">
+    <?= $this->qlink(
+        sprintf($this->translate('%d Services Selected:'), count($objects)),
+        $listAllLink
+    ); ?>
+
+    <span class="badges">
+    <?php if ($serviceStates->services_ok): ?>
+        <?php $selfUrl = Url::fromPath('monitoring/list/services'); ?>
+        <span class="state ok"><b>
+                <?= $serviceStates->services_ok ?>
+            </b></span>
+    <?php endif ?>
+
+        <?php
+        foreach (
+            array(
+                2 => 'critical',
+                3 => 'unknown',
+                1 => 'warning',
+                4 => 'pending'
+            ) as $stateId => $state) {
+
+            $stateName = 'services_' . $state;
+            $unhandledStateName = $stateName . '_unhandled';
+            if ($serviceStates->$unhandledStateName) {
+                echo '<span class="state ' . $state . '"><b>' . $serviceStates->$unhandledStateName . '</b>';
+            }
+            if ($serviceStates->$stateName) {
+                echo '<span class="state ' . $state . ' handled"><b>' . $serviceStates->$stateName . '</b></span>';
+            }
+            if ($serviceStates->$unhandledStateName) {
+                echo '</span>';
+            }
+            $stateName .= '_unhandled';
+        }?>
+    </span>
+</h1>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 015fecb95..9dc865010 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -1,47 +1,66 @@
+<?php
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
+use Icinga\Web\Url;
+?>
+
 <div class="controls">
+
+    <?php if (! $this->compact): ?>
+        <?= $tabs; ?>
+    <?php endif ?>
+
+    <?= $this->render('partials/service/objects-tinysummary.phtml') ?>
     <?= $this->render('partials/service/objects-header.phtml'); ?>
+
 </div>
 <div class="content">
     <?php if (($serviceCount = count($objects)) === 0): ?>
-        <?= $this->translate('No services matching the filter'); ?>
+    <?= $this->translate('No services matching the filter'); ?>
     <?php else: ?>
-        <h3><?= sprintf($this->translatePlural('%u Service', '%u Services', $serviceCount), $serviceCount); ?></h3>
-        <div><?= $this->qlink(
-            sprintf($this->translate('List all %u services'), $serviceCount),
-            $listAllLink
-        ); ?></div>
+        <?= sprintf(t('Issue commands on all %d selected services'), count($objects)) ?>
+
+    <p>
         <div>
             <?= $checkNowForm; ?>
         </div>
         <div><?= $this->qlink(
-            sprintf($this->translate('Reschedule the next check for all %u services'), $serviceCount),
-            $rescheduleAllLink,
-            null,
-            array('icon' => 'reschedule')
-        ); ?></div>
+                $this->translate('Reschedule the next check'),
+                $rescheduleAllLink,
+                null,
+                array('icon' => 'reschedule')
+            ); ?></div>
         <div><?= $this->qlink(
-            sprintf($this->translate('Schedule a downtime for all %u services'), $serviceCount),
-            $downtimeAllLink,
-            null,
-            array('icon' => 'plug')
-        ); ?></div>
+                $this->translate('Schedule a downtime'),
+                $downtimeAllLink,
+                null,
+                array('icon' => 'plug')
+            ); ?></div>
         <div><?= $this->qlink(
-            sprintf($this->translate('Submit a passive check result for all %u services'), $serviceCount),
-            $processCheckResultAllLink,
-            null,
-            array('icon' => 'reply')
-        ); ?></div>
-      <?php if (($unhandledCount = count($unhandledObjects)) > 0): ?>
-        <div>
-            <h3><?= sprintf(
-                $this->translatePlural(
-                    '%u Unhandled Service Problem',
-                    '%u Unhandled Service Problems',
-                    $unhandledCount
-                ),
-                $unhandledCount
-            ); ?></h3>
-            <div><?= $this->qlink(
+                $this->translate('Submit a passive check result'),
+                $processCheckResultAllLink,
+                null,
+                array('icon' => 'reply')
+            ); ?></div>
+    </p>
+
+    <?php if (($unhandledCount = count($unhandledObjects)) > 0): ?>
+    <div>
+        <h3>
+            <?= $this->icon('attention-alt') ?>
+                <?= $this->translatePlural(
+                        'Unhandled Problem',
+                        'Unhandled Problems',
+                        $unhandledCount
+                ) ?>
+        </h3>
+
+        <p><?= sprintf(t('There are %s unhandled problems. ' .
+                'Issue commands to the problematic services.'),
+                '<span class="badge badge-critical">' . $unhandledCount . '</span>') ?>
+
+
+            <div>
+            <?= $this->qlink(
                 sprintf(
                     $this->translatePlural(
                         'Schedule a downtime for %u unhandled service problem',
@@ -53,7 +72,9 @@
                 $downtimeUnhandledLink,
                 null,
                 array('icon' => 'plug')
-            ); ?></div>
+            ); ?>
+            </div>
+
             <div><?= $this->qlink(
                 sprintf(
                     $this->translatePlural(
@@ -67,50 +88,101 @@
                 null,
                 array('icon' => 'ok')
             ); ?></div>
-        </div>
-      <?php endif ?>
-      <?php if (($acknowledgedCount = count($acknowledgedObjects)) > 0): ?>
-        <div>
-            <h2><?= sprintf(
-                $this->translatePlural(
-                    '%u Acknowledged Service Problem',
-                    '%u Acknowledged Service Problems',
-                    $acknowledgedCount
-                ),
+        </p>
+
+
+    </div>
+
+    <?php endif ?>
+    <?php if (($acknowledgedCount = count($acknowledgedObjects)) > 0): ?>
+
+    <h3> <?= $this->icon('ok', $this->translate('Acknowledgements')) ?> <?= $this->translate('Acknowledgements') ?> </h3>
+    <p>
+        <?= sprintf(
+            $this->translatePlural(
+                '%u Acknowledged Service Problem',
+                '%u Acknowledged Service Problems',
                 $acknowledgedCount
-            ); ?></h2>
-            <?= $removeAckForm ?>
-        </div>
-      <?php endif ?>
-      <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0): ?>
-        <h2><?= $this->qlink(
-            sprintf(
-                $this->translatePlural(
-                    'List %u service currently in downtime',
-                    'List %u services currently in downtime',
-                    $inDowntimeCount
-                ),
-                $inDowntimeCount
             ),
+            $acknowledgedCount
+        ); ?> <?= $removeAckForm ?>
+    </p>
+    <?php endif ?>
+
+
+    <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0): ?>
+
+    <h3>  <?= $this->icon('plug', $this->translate('Downtimes')) ?> <?= $this->translate('Downtimes') ?>  </h3>
+    <p> <?= sprintf($this->translatePlural(
+            '%u service currently in downtime',
+            '%u services currently in downtime',
+            $inDowntimeCount
+        ), $inDowntimeCount) ?>
+
+        <div>
+        <?= $this->qlink(
+            $this->translate('List all'),
             $inDowntimeLink,
             null,
             array('icon' => 'plug')
-        ); ?></h2>
-      <?php endif ?>
-      <?php if (($commentCount = count($objects->getComments())) > 0): ?>
-        <h2><?= $this->qlink(
-            sprintf(
-                $this->translatePlural(
-                    'List %u service comment',
-                    'List %u service comments',
-                    $commentCount
-                ),
+        );?>
+        </div>
+
+        <div>
+            <?= $removeDowntimeForm ?> Delete All
+        </div>
+    </p>
+    <?php endif ?>
+
+
+<?php $commentCount = count($objects->getComments()) ?>
+<?php if ($commentCount > 0): ?>
+    <h3> <?= $this->icon('comment') ?> <?= t('Comments') ?> </h3>
+    <p><?= sprintf(
+            $this->translatePlural(
+                'There are no comments.',
+                'There are %d comments',
                 $commentCount
-            ),
-            $commentsLink,
-            null,
-            array('icon' => 'comment')
-        ); ?></h2>
-      <?php endif ?>
+            ), $commentCount);
+    ?>
+    <?= $this->qlink(
+        $this->translate('List all'),
+        $commentsLink,
+        null,
+        array('icon' => 'comment')
+    ); ?></p>
+
+        <table>
+        <?php foreach ($objects as $service): ?>
+            <?php $service->fetchComments(); ?>
+
+                <?php foreach ($service->comments as $comment): ?>
+                <tr >
+                <td style="vertical-align: top;" data-base-target="_self">
+                    <?php
+                    $delCommentForm = new DeleteCommentCommandForm();
+                    $delCommentForm->populate(
+                        array('comment_id' => $comment->id, 'redirect' => html_entity_decode($this->url))
+                    );
+                    $delCommentForm->setAction(
+                        $this->url(
+                            'monitoring/service/delete-comment',
+                            array('host' => $service->getHost()->getName(), 'service' => $service->getName())
+                        )
+                    );
+                    echo $delCommentForm;
+                    ?>
+                    (<?= ucfirst($comment->type) ?>):
+                </td>
+                <td style="padding-left: .5em;">
+                    <?= nl2br($comment->comment) ?>
+                </td>
+                </tr>
+                <?php endforeach ?>
+
+            <?php endforeach ?>
+            </table>
+        <?php endif ?>
+
     <?php endif ?>
 </div>
\ No newline at end of file
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 6c205cd04..eb598bb5d 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -91,15 +91,16 @@ div.contacts div.notification-periods {
   margin-top: 0.5em;
 }
 
-div.tinystatesummary {
+.tinystatesummary {
   .page-header();
   font-size: 1em;
   .badges {
     display: inline-block;
     margin-bottom: 4px;
     margin-left: 1em;
+    height: auto;
   }
-  .state > a {
+  .state > * {
     color: white;
     font-size: 0.8em;
     padding: 2px 5px;
@@ -196,7 +197,7 @@ div.selection-info {
 .optionbox label {
   max-width: 6.5em;
   text-align: left;
-  vertical-align: middle;
+  vertgical-align: middle;
   margin-right: 0em;
 }
 
diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index 5c19bfe35..62d5a68cd 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -922,3 +922,50 @@ table.groupview {
 }
 
 /* End of monitoring groupsummary styles */
+
+/* compact table */
+table.statesummary {
+  text-align: left;
+  width: auto;
+  border-collapse: separate;
+
+  tbody {
+    white-space: nowrap;
+  }
+
+  td {
+    padding: 0em 0.4em 0em 0.4em;
+    line-height: 1.2em;
+  }
+
+  tr.state td.state {
+    width: auto;
+    font-weight: bold;
+  }
+
+  td .pluginoutput {
+    font-size: 0.8em;
+    line-height: 1.2em;
+    padding-left: 0;
+    margin: 0;
+  }
+
+  td.state {
+    min-width: 70px;
+    font-size: 0.7em;
+    text-align: center;
+  }
+
+  td a {
+    color: inherit;
+    text-decoration: none;
+  }
+}
+
+/* Up to 576px for 1em=16px, should fit 320px devices */
+@media screen and (max-width: 97em) {
+
+  table.statesummary .collapse {
+    display: none;
+  }
+}
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index 45701a697..de33d6685 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -203,23 +203,13 @@ li li .badge-container {
   margin-right: 0.75em;
 }
 
-/*
-#layout.hoveredmenu .active > .badge-container {
-  display: none;
-}
-
-#layout.hoveredmenu .hover > .badge-container {
-  //margin-right: 14.15em;
-  display: none;
-}
-*/
-
 .badge {
   position: relative;
-  top: 0.3em;
+  top: -0.15em;
   display: inline-block;
   min-width: 1em;
   padding: 3px 7px;
+  margin: 0 0.2em 0 0.2em;
   font-size: 0.8em;
   font-weight: 700;
   line-height: 1.1em;
@@ -230,6 +220,11 @@ li li .badge-container {
   background-color: @colorInvalid;
 }
 
+#menu nav ul .badge {
+  margin-right: 0em;
+  top: 0.3em;
+}
+
 #menu nav > ul > li.active > .badge-container {
   display: none;
 }
@@ -277,7 +272,7 @@ li li .badge {
   background-color: @colorPending;
 }
 
-.badge-pending {
+.badge-unknown {
   background-color: @colorUnknown;
 }
 
@@ -303,3 +298,24 @@ li li .badge {
 
   margin: 0em 0em 0em 0.1em;
 }
+
+.tipsy .tipsy-inner {
+  // overwrite tooltip max width, we need them to grow bigger
+  max-width: 300px;
+  text-align: left;
+}
+
+.color-box {
+  position: relative;
+  top: 2px;
+  margin: 0px 3px 0px 3px;
+  display: inline-block;
+  width: 12px;
+  height: 12px;
+}
+
+.oneline {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
diff --git a/public/js/icinga/behavior/tooltip.js b/public/js/icinga/behavior/tooltip.js
index c9a64257f..c0abcbd45 100644
--- a/public/js/icinga/behavior/tooltip.js
+++ b/public/js/icinga/behavior/tooltip.js
@@ -30,7 +30,7 @@
         $('svg .chart-data', el).tipsy({ gravity: 'se', html: true });
         $('.historycolorgrid a[title]', el).tipsy({ gravity: 's', offset: 2 });
         $('img.icon[title]', el).tipsy({ gravity: $.fn.tipsy.autoNS, offset: 2 });
-        $('[title]', el).tipsy({ gravity: $.fn.tipsy.autoNS, delayIn: 500 });
+        $('[title]', el).tipsy({ gravity: $.fn.tipsy.autoNS, delayIn: 500, html: true });
 
         // migrate or remove all orphaned tooltips
         $('.tipsy').each(function () {

From 6cfa958bb848a34e04d943700d18c84f8ffd40ec Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 6 Mar 2015 08:53:34 +0100
Subject: [PATCH 0874/2920] Allow setting `requirement' on form elements

It's supposed to be used as description what
kind of value an element will accept.

refs #7947
---
 library/Icinga/Web/Form.php                |  2 +-
 library/Icinga/Web/Form/Decorator/Help.php | 27 ++++++++++++++++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index c7e613e7b..265da8420 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -157,7 +157,7 @@ class Form extends Zend_Form
     public static $defaultElementDecorators = array(
         array('ViewHelper', array('separator' => '')),
         array('Errors', array('separator' => '')),
-        array('Help'),
+        array('Help', array('placement' => 'PREPEND')),
         array('Label', array('separator' => '')),
         array('HtmlTag', array('tag' => 'div', 'class' => 'element'))
     );
diff --git a/library/Icinga/Web/Form/Decorator/Help.php b/library/Icinga/Web/Form/Decorator/Help.php
index a02443994..152d548af 100644
--- a/library/Icinga/Web/Form/Decorator/Help.php
+++ b/library/Icinga/Web/Form/Decorator/Help.php
@@ -76,18 +76,35 @@ class Help extends Zend_Form_Decorator_Abstract
      */
     public function render($content = '')
     {
-        if ($content && ($description = $this->getElement()->getDescription()) !== null) {
+        $element = $this->getElement();
+        $description = $element->getDescription();
+        $requirement = $element->getAttrib('requirement');
+        unset($element->requirement);
+
+        $helpContent = '';
+        if ($description || $requirement) {
             if ($this->accessible) {
-                $content = '<span id="'
+                $helpContent = '<span id="'
                     . $this->getDescriptionId()
                     . '" class="sr-only">'
                     . $description
-                    . '</span>' . $content;
+                    . ($description && $requirement ? ' ' : '')
+                    . $requirement
+                    . '</span>';
             }
 
-            $content = $this->getView()->icon('help', $description, array('aria-hidden' => 'true')) . $content;
+            $helpContent = $this->getView()->icon(
+                'help',
+                $description . ($description && $requirement ? ' ' : '') . $requirement,
+                array('aria-hidden' => $this->accessible ? 'true' : 'false')
+            ) . $helpContent;
         }
 
-        return $content;
+        switch ($this->getPlacement()) {
+            case self::APPEND:
+                return $content . $helpContent;
+            case self::PREPEND:
+                return $helpContent . $content;
+        }
     }
 }

From ef16ba5f48543447ca81b5a7afc2a445eae9c52b Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 6 Mar 2015 09:23:11 +0100
Subject: [PATCH 0875/2920] Add commands for adding comments to services

refs #8348
---
 .../controllers/ServicesController.php        | 40 +++++++-
 .../views/scripts/services/show.phtml         | 95 ++++++++++++-------
 2 files changed, 96 insertions(+), 39 deletions(-)

diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index ceabd643e..a20572d0d 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -10,7 +10,8 @@ use Icinga\Module\Monitoring\Forms\Command\Object\ProcessCheckResultCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceCheckCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceDowntimeCommandForm;
-use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Module\Monitoring\Object\ServiceList;
@@ -58,7 +59,8 @@ class Monitoring_ServicesController extends Controller
             'service_is_flapping',
             'service_notifications_enabled',
             'service_output',
-            'service_last_ack'
+            'service_last_ack',
+            'service_last_comment'
         ));
 
         $form
@@ -200,18 +202,23 @@ class Monitoring_ServicesController extends Controller
                 ->handleRequest();
             $this->view->removeAckForm = $removeAckForm;
         }
+        /*
         if (! empty($objectsInDowntime)) {
             $removeDowntimeForm = new DeleteDowntimeCommandForm();
-            $removeDowntimeForm->setObjects($objectsInDowntime)
+            $removeDowntimeForm
+                ->setObjects($objectsInDowntime)
                 ->handleRequest();
             $this->view->removeDowntimeForm = $removeDowntimeForm;
         }
+        */
         $this->setAutorefreshInterval(15);
         $this->view->rescheduleAllLink = Url::fromRequest()->setPath('monitoring/services/reschedule-check');
         $this->view->downtimeAllLink = Url::fromRequest()->setPath('monitoring/services/schedule-downtime');
         $this->view->processCheckResultAllLink = Url::fromRequest()->setPath(
             'monitoring/services/process-check-result'
         );
+        $this->view->addCommentLink = Url::fromRequest()->setPath('monitoring/services/add-comment');
+        $this->view->deleteCommentLink = Url::fromRequest()->setPath('monitoring/services/delete-comment');
         $this->view->hostStates = (object)$hostStates;
         $this->view->serviceStates = (object)$serviceStates;
         $this->view->objects = $this->serviceList;
@@ -250,6 +257,33 @@ class Monitoring_ServicesController extends Controller
             ->setSparklineClass('sparkline-multi');
     }
 
+
+    /**
+     * Add a service comment
+     */
+    public function addCommentAction()
+    {
+        $this->assertPermission('monitoring/command/comment/add');
+
+        $form = new AddCommentCommandForm();
+        $form->setTitle($this->translate('Add Service Comments'));
+        $this->handleCommandForm($form);
+    }
+
+
+    /**
+     * Delete a comment
+     */
+    public function deleteCommentAction()
+    {
+        $this->assertPermission('monitoring/command/comment/delete');
+
+        $form = new DeleteCommentCommandForm();
+        $form->setTitle($this->translate('Delete Service Comments'));
+        $this->handleCommandForm($form);
+    }
+
+
     /**
      * Acknowledge service problems
      */
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 9dc865010..cd941df4d 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -14,6 +14,11 @@ use Icinga\Web\Url;
 
 </div>
 <div class="content">
+    <h3>
+        <?= $this->icon('reschedule') ?>
+        <?= $this->translate('Commands') ?>
+    </h3>
+
     <?php if (($serviceCount = count($objects)) === 0): ?>
     <?= $this->translate('No services matching the filter'); ?>
     <?php else: ?>
@@ -41,6 +46,12 @@ use Icinga\Web\Url;
                 null,
                 array('icon' => 'reply')
             ); ?></div>
+        <div><?= $this->qlink(
+                $this->translate('Add a comment'),
+                $addCommentLink,
+                null,
+                array('icon' => 'comment')
+            ); ?></div>
     </p>
 
     <?php if (($unhandledCount = count($unhandledObjects)) > 0): ?>
@@ -127,10 +138,6 @@ use Icinga\Web\Url;
             array('icon' => 'plug')
         );?>
         </div>
-
-        <div>
-            <?= $removeDowntimeForm ?> Delete All
-        </div>
     </p>
     <?php endif ?>
 
@@ -145,44 +152,60 @@ use Icinga\Web\Url;
                 $commentCount
             ), $commentCount);
     ?>
+    <p>
+    <table>
+    <?php foreach ($objects as $service): ?>
+        <?php $service->fetchComments(); ?>
+        <?php foreach ($service->comments as $comment): ?>
+        <tr>
+        <td style="vertical-align: top;" data-base-target="_self">
+            <?php
+            $delCommentForm = new DeleteCommentCommandForm();
+            $delCommentForm->populate(
+                array('comment_id' => $comment->id, 'redirect' => html_entity_decode($this->url))
+            );
+            $delCommentForm->setAction(
+                $this->url(
+                    'monitoring/service/delete-comment',
+                    array('host' => $service->getHost()->getName(), 'service' => $service->getName())
+                )
+            );
+            echo $delCommentForm;
+            ?>
+            (<?= ucfirst($comment->type) ?>):
+        </td>
+        <td style="padding-left: .5em;">
+            <?= nl2br($comment->comment) ?>
+        </td>
+        </tr>
+        <?php endforeach ?>
+    <?php endforeach ?>
+    </table>
+    </p>
+
+    <div>
     <?= $this->qlink(
         $this->translate('List all'),
         $commentsLink,
         null,
         array('icon' => 'comment')
-    ); ?></p>
+    ); ?>
+    </div>
 
-        <table>
-        <?php foreach ($objects as $service): ?>
-            <?php $service->fetchComments(); ?>
+<!--
+    TODO: implement backend functionality.
+    
+    <div><?= $this->qlink(
+            $this->translate('Remove all'),
+            $deleteCommentLink,
+            null,
+            array('icon' => 'trash')
+    ); ?></div>
+    </p>
+-->
 
-                <?php foreach ($service->comments as $comment): ?>
-                <tr >
-                <td style="vertical-align: top;" data-base-target="_self">
-                    <?php
-                    $delCommentForm = new DeleteCommentCommandForm();
-                    $delCommentForm->populate(
-                        array('comment_id' => $comment->id, 'redirect' => html_entity_decode($this->url))
-                    );
-                    $delCommentForm->setAction(
-                        $this->url(
-                            'monitoring/service/delete-comment',
-                            array('host' => $service->getHost()->getName(), 'service' => $service->getName())
-                        )
-                    );
-                    echo $delCommentForm;
-                    ?>
-                    (<?= ucfirst($comment->type) ?>):
-                </td>
-                <td style="padding-left: .5em;">
-                    <?= nl2br($comment->comment) ?>
-                </td>
-                </tr>
-                <?php endforeach ?>
-
-            <?php endforeach ?>
-            </table>
-        <?php endif ?>
 
     <?php endif ?>
-</div>
\ No newline at end of file
+
+    <?php endif ?>
+</div>

From cb0ca6d6acb20c3c6040c79a148cd80487813dc5 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 6 Mar 2015 09:24:11 +0100
Subject: [PATCH 0876/2920] Remove unused piechart code

---
 .../Backend/LdapUserBackend.php               |  1 -
 .../controllers/HostsController.php           | 20 -----------
 .../controllers/ServicesController.php        | 33 -------------------
 .../partials/host/objects-header.phtml        |  3 --
 .../views/scripts/services/show.phtml         |  1 -
 5 files changed, 58 deletions(-)

diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/Backend/LdapUserBackend.php
index 016512ab4..62834211d 100644
--- a/library/Icinga/Authentication/Backend/LdapUserBackend.php
+++ b/library/Icinga/Authentication/Backend/LdapUserBackend.php
@@ -240,7 +240,6 @@ class LdapUserBackend extends UserBackend
                 $users[] = $row->{$this->userNameAttribute};
             }
         }
-
         return $users;
     }
 }
diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 1586ad723..19b501a88 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -13,7 +13,6 @@ use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostDowntimeCommandFor
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\HostList;
 use Icinga\Web\Url;
-use Icinga\Web\Widget\Chart\InlinePie;
 
 class Monitoring_HostsController extends Controller
 {
@@ -58,11 +57,6 @@ class Monitoring_HostsController extends Controller
         $this->view->form = $form;
         $this->view->objects = $this->hostList;
         $this->view->hostStates = $hostStates;
-        $this->view->hostStatesPieChart = $this->createPieChart(
-            $hostStates,
-            $this->translate('Host State'),
-            array('#44bb77', '#FF5566', '#E066FF', '#77AAFF')
-        );
         $this->_helper->viewRenderer('partials/command/objects-command-form', null, true);
         return $form;
     }
@@ -153,20 +147,6 @@ class Monitoring_HostsController extends Controller
             ->setQueryString(Filter::matchAny($downtimeFilterExpressions)->toQueryString());
         $this->view->commentsLink = Url::fromRequest()
             ->setPath('monitoring/list/comments');
-        $this->view->hostStatesPieChart = $this->createPieChart(
-            $hostStates,
-            $this->translate('Host State'),
-            array('#44bb77', '#FF5566', '#E066FF', '#77AAFF')
-        );
-    }
-
-    protected function createPieChart(array $states, $title, array $colors)
-    {
-        $chart = new InlinePie(array_values($states), $title, $colors);
-        return $chart
-            ->setSize(75)
-            ->setTitle('')
-            ->setSparklineClass('sparkline-multi');
     }
 
     /**
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index a20572d0d..1514a0ea0 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -16,7 +16,6 @@ use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Module\Monitoring\Object\ServiceList;
 use Icinga\Web\Url;
-use Icinga\Web\Widget\Chart\InlinePie;
 
 class Monitoring_ServicesController extends Controller
 {
@@ -94,16 +93,6 @@ class Monitoring_ServicesController extends Controller
         $this->view->objects = $this->serviceList;
         $this->view->serviceStates = $serviceStates;
         $this->view->hostStates = $hostStates;
-        $this->view->serviceStatesPieChart = $this->createPieChart(
-            $serviceStates,
-            $this->translate('Service State'),
-            array('#44bb77', '#FFCC66', '#FF5566', '#E066FF', '#77AAFF')
-        );
-        $this->view->hostStatesPieChart = $this->createPieChart(
-            $hostStates,
-            $this->translate('Host State'),
-            array('#44bb77', '#FF5566', '#E066FF', '#77AAFF')
-        );
         $this->_helper->viewRenderer('partials/command/objects-command-form', null, true);
         return $form;
     }
@@ -234,30 +223,8 @@ class Monitoring_ServicesController extends Controller
             ->setQueryString(Filter::matchAny($downtimeFilterExpressions)->toQueryString());
         $this->view->commentsLink = Url::fromRequest()
             ->setPath('monitoring/list/comments');
-        /*
-        $this->view->serviceStatesPieChart = $this->createPieChart(
-            $serviceStates,
-            $this->translate('Service State'),
-            array('#44bb77', '#FFCC66', '#FF5566', '#E066FF', '#77AAFF')
-        );
-        $this->view->hostStatesPieChart = $this->createPieChart(
-            $hostStates,
-            $this->translate('Host State'),
-            array('#44bb77', '#FF5566', '#E066FF', '#77AAFF')
-        );
-        */
     }
 
-    protected function createPieChart(array $states, $title, array $colors)
-    {
-        $chart = new InlinePie(array_values($states), $title, $colors);
-        return $chart
-            ->setSize(75)
-            ->setTitle('')
-            ->setSparklineClass('sparkline-multi');
-    }
-
-
     /**
      * Add a service comment
      */
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index 448be4c02..cd79bce5b 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -8,9 +8,6 @@
         <?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', $hostCount), $hostCount); ?>
     </h1>
 </div>
-<div class="hbox-item">
-    &nbsp;<?= $hostStatesPieChart; ?>
-</div>
 <div class="hbox-item" style="font-size: 14px">
   <?php foreach (array_filter($hostStates) as $text => $count): ?>
     <?= sprintf('%s: %u', $this->translate(strtoupper($text)), $count); ?><br>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index cd941df4d..5cd3af1b6 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -69,7 +69,6 @@ use Icinga\Web\Url;
                 'Issue commands to the problematic services.'),
                 '<span class="badge badge-critical">' . $unhandledCount . '</span>') ?>
 
-
             <div>
             <?= $this->qlink(
                 sprintf(

From fc403e693b8f43394ca01b56374a5ed99aa15abc Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 6 Mar 2015 09:46:47 +0100
Subject: [PATCH 0877/2920] Fix array indentation in the ContactQuery

refs #8614
---
 .../Backend/Ido/Query/ContactQuery.php        | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
index ac549e00a..a55f582ee 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
@@ -7,39 +7,39 @@ class ContactQuery extends IdoQuery
 {
     protected $columnMap = array(
         'contacts' => array(
-            'contact_id'     => 'c.contact_id',
-            'contact_name'   => 'co.name1 COLLATE latin1_general_ci',
-            'contact_alias'  => 'c.alias COLLATE latin1_general_ci',
-            'contact_email'  => 'c.email_address COLLATE latin1_general_ci',
-            'contact_pager'  => 'c.pager_address',
-            'contact_object_id'                => 'c.contact_object_id',
-            'contact_has_host_notfications'    => 'c.host_notifications_enabled',
-            'contact_has_service_notfications' => 'c.service_notifications_enabled',
-            'contact_can_submit_commands'      => 'c.can_submit_commands',
-            'contact_notify_service_recovery'  => 'c.notify_service_recovery',
-            'contact_notify_service_warning'   => 'c.notify_service_warning',
-            'contact_notify_service_critical'  => 'c.notify_service_critical',
-            'contact_notify_service_unknown'   => 'c.notify_service_unknown',
-            'contact_notify_service_flapping'  => 'c.notify_service_flapping',
-            'contact_notify_service_downtime'  => 'c.notify_service_recovery',
-            'contact_notify_host_recovery'     => 'c.notify_host_recovery',
-            'contact_notify_host_down'         => 'c.notify_host_down',
-            'contact_notify_host_unreachable'  => 'c.notify_host_unreachable',
-            'contact_notify_host_flapping'     => 'c.notify_host_flapping',
-            'contact_notify_host_downtime'     => 'c.notify_host_downtime',
+            'contact_id'                        => 'c.contact_id',
+            'contact_name'                      => 'co.name1 COLLATE latin1_general_ci',
+            'contact_alias'                     => 'c.alias COLLATE latin1_general_ci',
+            'contact_email'                     => 'c.email_address COLLATE latin1_general_ci',
+            'contact_pager'                     => 'c.pager_address',
+            'contact_object_id'                 => 'c.contact_object_id',
+            'contact_has_host_notfications'     => 'c.host_notifications_enabled',
+            'contact_has_service_notfications'  => 'c.service_notifications_enabled',
+            'contact_can_submit_commands'       => 'c.can_submit_commands',
+            'contact_notify_service_recovery'   => 'c.notify_service_recovery',
+            'contact_notify_service_warning'    => 'c.notify_service_warning',
+            'contact_notify_service_critical'   => 'c.notify_service_critical',
+            'contact_notify_service_unknown'    => 'c.notify_service_unknown',
+            'contact_notify_service_flapping'   => 'c.notify_service_flapping',
+            'contact_notify_service_downtime'   => 'c.notify_service_recovery',
+            'contact_notify_host_recovery'      => 'c.notify_host_recovery',
+            'contact_notify_host_down'          => 'c.notify_host_down',
+            'contact_notify_host_unreachable'   => 'c.notify_host_unreachable',
+            'contact_notify_host_flapping'      => 'c.notify_host_flapping',
+            'contact_notify_host_downtime'      => 'c.notify_host_downtime'
         ),
         'timeperiods' => array(
-            'contact_notify_host_timeperiod' => 'ht.alias COLLATE latin1_general_ci',
+            'contact_notify_host_timeperiod'    => 'ht.alias COLLATE latin1_general_ci',
             'contact_notify_service_timeperiod' => 'st.alias COLLATE latin1_general_ci'
         ),
         'hosts' => array(
-            'host_name'      => 'ho.name1 COLLATE latin1_general_ci',
-            'host'           => 'ho.name1 COLLATE latin1_general_ci',
+            'host'      => 'ho.name1 COLLATE latin1_general_ci',
+            'host_name' => 'ho.name1 COLLATE latin1_general_ci',
         ),
         'services' => array(
-            'service_host_name'   => 'so.name1 COLLATE latin1_general_ci',
-            'service'             => 'so.name1 COLLATE latin1_general_ci',
-            'service_description' => 'so.name2 COLLATE latin1_general_ci',
+            'service'               => 'so.name1 COLLATE latin1_general_ci',
+            'service_description'   => 'so.name2 COLLATE latin1_general_ci',
+            'service_host_name'     => 'so.name1 COLLATE latin1_general_ci',
         )
     );
 

From f4257043050c64c5d28e4286131fd275a75e61ca Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 6 Mar 2015 09:48:42 +0100
Subject: [PATCH 0878/2920] Fix service tooltip title

refs #8565
---
 .../views/scripts/partials/service/objects-header.phtml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index 113e7c0a0..11127ddf3 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -26,7 +26,7 @@ use Icinga\Web\Url;
         <?php
         $i++;
         if ($i > 5) {
-            $desc = $service->getHost()->getName() . ' on ' . $service->getName();
+            $desc = $service->getName() . ' on ' . $service->getHost()->getName();
             $hidden[] = $desc;
             $hiddenRich[] = sprintf("<div class='color-box badge-%s'></div>%s", $service->getStateText($service->service_state) ,$desc);
             continue;

From 886cc863f00a8b33699b0007ecbb62f7ef93654e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 6 Mar 2015 09:49:15 +0100
Subject: [PATCH 0879/2920] Add form element value expectation descriptions
 where required

I did not adjust the DateTimePicker element as the sent format is
controlled by the useragent due to either the datetime-local input
type or a javascript datetimepicker. (which does not exist yet, though)
Mentioning the RFC 3339 format such a picker expects is very likely
going to lead to confusion on an end user's side otherwise.

refs #7947
---
 .../Config/Authentication/ExternalBackendForm.php    |  7 ++++---
 .../forms/Config/General/LoggingConfigForm.php       |  1 +
 .../forms/Config/Resource/FileResourceForm.php       | 12 +++++++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/application/forms/Config/Authentication/ExternalBackendForm.php b/application/forms/Config/Authentication/ExternalBackendForm.php
index e25661596..86087eb66 100644
--- a/application/forms/Config/Authentication/ExternalBackendForm.php
+++ b/application/forms/Config/Authentication/ExternalBackendForm.php
@@ -53,7 +53,7 @@ class ExternalBackendForm extends Form
             return @preg_match($value, '') !== false;
         });
         $callbackValidator->setMessage(
-            $this->translate('"%value%" is not a valid regular expression'),
+            $this->translate('"%value%" is not a valid regular expression.'),
             Zend_Validate_Callback::INVALID_VALUE
         );
         $this->addElement(
@@ -62,9 +62,10 @@ class ExternalBackendForm extends Form
             array(
                 'label'         => $this->translate('Filter Pattern'),
                 'description'   => $this->translate(
-                    'The regular expression to use to strip specific parts off from usernames.'
-                    . ' Leave empty if you do not want to strip off anything'
+                    'The filter to use to strip specific parts off from usernames.'
+                    . ' Leave empty if you do not want to strip off anything.'
                 ),
+                'requirement'   => $this->translate('The filter pattern must be a valid regular expression.'),
                 'validators'    => array($callbackValidator)
             )
         );
diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php
index 1c4e090c4..bd62f4490 100644
--- a/application/forms/Config/General/LoggingConfigForm.php
+++ b/application/forms/Config/General/LoggingConfigForm.php
@@ -66,6 +66,7 @@ class LoggingConfigForm extends Form
                     'description'   => $this->translate(
                         'The name of the application by which to prefix syslog messages.'
                     ),
+                    'requirement'   => $this->translate('The application prefix must not contain whitespace.'),
                     'value'         => 'icingaweb2',
                     'validators'    => array(
                         array(
diff --git a/application/forms/Config/Resource/FileResourceForm.php b/application/forms/Config/Resource/FileResourceForm.php
index b1bb0c6ae..184a5c18a 100644
--- a/application/forms/Config/Resource/FileResourceForm.php
+++ b/application/forms/Config/Resource/FileResourceForm.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Forms\Config\Resource;
 
+use Zend_Validate_Callback;
 use Icinga\Web\Form;
 
 /**
@@ -42,13 +43,22 @@ class FileResourceForm extends Form
                 'validators'    => array('ReadablePathValidator')
             )
         );
+        $callbackValidator = new Zend_Validate_Callback(function ($value) {
+            return @preg_match($value, '') !== false;
+        });
+        $callbackValidator->setMessage(
+            $this->translate('"%value%" is not a valid regular expression.'),
+            Zend_Validate_Callback::INVALID_VALUE
+        );
         $this->addElement(
             'text',
             'fields',
             array(
                 'required'      => true,
                 'label'         => $this->translate('Pattern'),
-                'description'   => $this->translate('The regular expression by which to identify columns')
+                'description'   => $this->translate('The pattern by which to identify columns.'),
+                'requirement'   => $this->translate('The column pattern must be a valid regular expression.'),
+                'validators'    => array($callbackValidator)
             )
         );
 

From 2b91ec7f2c90c12ae7b8e5f52c2cca6904694f79 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 6 Mar 2015 09:54:12 +0100
Subject: [PATCH 0880/2920] Comment out unused query in the ContactgroupQuery

refs #8614
---
 .../Monitoring/Backend/Ido/Query/ContactgroupQuery.php    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
index d975da05e..c19670e8d 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
@@ -95,10 +95,10 @@ class ContactgroupQuery extends IdoQuery
 
     protected function joinServices()
     {
-        $scgSub = $this->db->select()->distinct()->from(
-            $this->prefix . 'service_contactgroups',
-            array('contactgroup_object_id', 'service_id')
-        );
+//        $scgSub = $this->db->select()->distinct()->from(
+//            $this->prefix . 'service_contactgroups',
+//            array('contactgroup_object_id', 'service_id')
+//        );
 
             /*
             This subselect is a workaround for a fucking stupid bug. Other tables

From 64d1d12c7347a7027f8547079325f9ba107289d8 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 6 Mar 2015 10:02:20 +0100
Subject: [PATCH 0881/2920] Do not join icinga_hosts when fetching a service's
 contact groups

refs #8614
---
 .../library/Monitoring/Object/MonitoredObject.php           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 4baa7aa9b..bf417c4f4 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -426,10 +426,12 @@ abstract class MonitoredObject implements Filterable
         $contactsGroups = $this->backend->select()->from('contactgroup', array(
                 'contactgroup_name',
                 'contactgroup_alias'
-        ))
-            ->where('host_name', $this->host_name);
+        ));
         if ($this->type === self::TYPE_SERVICE) {
+            $contactsGroups->where('service_host_name', $this->host_name);
             $contactsGroups->where('service_description', $this->service_description);
+        } else {
+            $contactsGroups->where('host_name', $this->host_name);
         }
         $this->contactgroups = $contactsGroups->getQuery()->fetchAll();
         return $this;

From f3fa74302222a142165450a12fd69595960464de Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 6 Mar 2015 11:03:45 +0100
Subject: [PATCH 0882/2920] Fix login when using a PostgreSQL database as
 authentication backend

fixes #8524
---
 library/Icinga/Authentication/Backend/DbUserBackend.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/Backend/DbUserBackend.php b/library/Icinga/Authentication/Backend/DbUserBackend.php
index 42322a575..12fa0392f 100644
--- a/library/Icinga/Authentication/Backend/DbUserBackend.php
+++ b/library/Icinga/Authentication/Backend/DbUserBackend.php
@@ -96,10 +96,15 @@ class DbUserBackend extends UserBackend
                 'SELECT password_hash FROM icingaweb_user WHERE name = :name AND active = 1'
             );
         }
+
         $stmt->execute(array(':name' => $username));
         $stmt->bindColumn(1, $lob, PDO::PARAM_LOB);
         $stmt->fetch(PDO::FETCH_BOUND);
-        return is_resource($lob) ? stream_get_contents($lob) : $lob;
+        if (is_resource($lob)) {
+            $lob = stream_get_contents($lob);
+        }
+
+        return $this->conn->getDbType() === 'pgsql' ? pg_unescape_bytea($lob) : $lob;
     }
 
     /**

From 71534369efd3b2a1f0794536d597d58494f9c65c Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 6 Mar 2015 12:31:34 +0100
Subject: [PATCH 0883/2920] Implement new layout for host multi-view

refs #8543
---
 .../controllers/HostsController.php           |  30 +-
 .../views/scripts/hosts/show.phtml            | 256 +++++++++++++-----
 .../partials/host/objects-header.phtml        | 101 ++++++-
 3 files changed, 297 insertions(+), 90 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 19b501a88..2c9ebc20e 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -10,6 +10,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\ProcessCheckResultCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostCheckCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostDowntimeCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\HostList;
 use Icinga\Web\Url;
@@ -36,7 +37,12 @@ class Monitoring_HostsController extends Controller
             'host_problem',
             'host_handled',
             'host_acknowledged',
-            'host_in_downtime'
+            'host_in_downtime',
+            'host_last_ack',
+            'host_is_flapping',
+            'host_last_comment',
+            'host_output',
+            'host_notifications_enabled'
         ));
 
         $form
@@ -87,9 +93,13 @@ class Monitoring_HostsController extends Controller
             'host_problem',
             'host_handled',
             'host_acknowledged',
-            'host_in_downtime'/*,
+            'host_in_downtime',
+            'host_last_ack',
+            'host_is_flapping',
+            'host_last_comment',
+            'host_output',
+            'host_notifications_enabled',/*,
             'host_passive_checks_enabled',
-            'host_notifications_enabled',
             'host_event_handler_enabled',
             'host_flap_detection_enabled',
             'host_active_checks_enabled',
@@ -133,6 +143,8 @@ class Monitoring_HostsController extends Controller
         $this->view->rescheduleAllLink = Url::fromRequest()->setPath('monitoring/hosts/reschedule-check');
         $this->view->downtimeAllLink = Url::fromRequest()->setPath('monitoring/hosts/schedule-downtime');
         $this->view->processCheckResultAllLink = Url::fromRequest()->setPath('monitoring/hosts/process-check-result');
+        $this->view->addCommentLink = Url::fromRequest()->setPath('monitoring/hosts/add-comment');
+        $this->view->deleteCommentLink = Url::fromRequest()->setPath('monitoring/hosts/delete-comment');
         $this->view->hostStates = $hostStates;
         $this->view->objects = $this->hostList;
         $this->view->unhandledObjects = $unhandledObjects;
@@ -149,6 +161,18 @@ class Monitoring_HostsController extends Controller
             ->setPath('monitoring/list/comments');
     }
 
+    /**
+     * Add a host comments
+     */
+    public function addCommentAction()
+    {
+        $this->assertPermission('monitoring/command/comment/add');
+
+        $form = new AddCommentCommandForm();
+        $form->setTitle($this->translate('Add Host Comments'));
+        $this->handleCommandForm($form);
+    }
+
     /**
      * Acknowledge host problems
      */
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 8655a31b1..b6cb454bf 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -1,116 +1,224 @@
+<?php
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
+?>
+
 <div class="controls">
+
+    <?php if (! $this->compact): ?>
+        <?= $tabs; ?>
+    <?php endif ?>
+
+    <h1>
+      <?= $this->qlink(
+         sprintf($this->translate('%d Hosts Selected'), count($objects)),
+         $listAllLink
+      ); ?>
+    </h1>
+
     <?= $this->render('partials/host/objects-header.phtml'); ?>
 </div>
+
 <div class="content">
+    <h3>
+        <?= $this->icon('reschedule') ?>
+        <?= $this->translate('Commands') ?>
+    </h3>
+    <?= sprintf(t('Issue commands on all %d selected services:'), count($objects)) ?>
+
     <?php if (($hostCount = count($objects)) === 0): ?>
         <?= $this->translate('No hosts matching the filter'); ?>
     <?php else: ?>
-        <h3><?= sprintf($this->translatePlural('%u Host', '%u Hosts', $hostCount), $hostCount); ?></h3>
-        <div><?= $this->qlink(
-            sprintf($this->translate('List all %u hosts'), $hostCount),
-            $listAllLink
-        ); ?></div>
+
+      <p>
         <div>
             <?= $checkNowForm; ?>
         </div>
-        <div><?= $this->qlink(
-            sprintf($this->translate('Reschedule the next check for all %u hosts'), $hostCount),
-            $rescheduleAllLink,
-            null,
-            array('icon' => 'reschedule')
-        ); ?></div>
-        <div><?= $this->qlink(
-            sprintf($this->translate('Schedule a downtime for all %u hosts'), $hostCount),
-            $downtimeAllLink,
-            null,
-            array('icon' => 'plug')
-        ); ?></div>
-        <div><?= $this->qlink(
-            sprintf($this->translate('Submit a passive check result for all %u hosts'), $hostCount),
-            $processCheckResultAllLink,
-            null,
-            array('icon' => 'reply')
-        ); ?></div>
-      <?php if (($unhandledCount = count($unhandledObjects)) > 0): ?>
+
         <div>
-            <h3><?= sprintf(
-                $this->translatePlural(
-                    '%u Unhandled Host Problem',
-                    '%u Unhandled Host Problems',
-                    $unhandledCount
-                ),
-                $unhandledCount
-            ); ?></h3>
-            <div><?= $this->qlink(
-                sprintf(
-                    $this->translatePlural(
-                        'Schedule a downtime for %u unhandled host problem',
-                        'Schedule a downtime for %u unhandled host problems',
-                        $unhandledCount
-                    ),
-                    $unhandledCount
-                ),
-                $downtimeUnhandledLink,
+            <?= $this->qlink(
+                $this->translate('Reschedule the next check'),
+                $rescheduleAllLink,
+                null,
+                array('icon' => 'reschedule')
+            ); ?>
+        </div>
+
+        <div>
+            <?= $this->qlink(
+                $this->translate('Schedule a downtime'),
+                $downtimeAllLink,
                 null,
                 array('icon' => 'plug')
-            ); ?></div>
-            <div><?= $this->qlink(
-                sprintf(
-                    $this->translatePlural(
-                        'Acknowledge %u unhandled host problem',
-                        'Acknowledge %u unhandled host problems',
+            ); ?>
+        </div>
+
+        <div>
+            <?= $this->qlink(
+                $this->translate('Submit a passive check result'),
+                $processCheckResultAllLink,
+                null,
+                array('icon' => 'reply')
+            ); ?>
+        </div>
+
+        <div>
+            <?= $this->qlink(
+                $this->translate('Add a comment'),
+                $addCommentLink,
+                null,
+                array('icon' => 'comment')
+            ); ?>
+        </div>
+      </p>
+
+      <?php if (($unhandledCount = count($unhandledObjects)) > 0): ?>
+        <div>
+            <h3>
+                <?= $this->icon('attention-alt') ?>
+                <?= $this->translatePlural(
+                    'Unhandled Problem',
+                    'Unhandled Problems',
+                    $unhandledCount
+                ) ?>
+            </h3>
+
+
+            <p>
+              <?= sprintf(
+                  t('There are %s unhandled problems. Issue commands to the problematic hosts.'),
+                  '<span class="badge badge-critical">' . $unhandledCount . '</span>'
+              ) ?>
+
+              <div><?= $this->qlink(
+                  sprintf(
+                      $this->translatePlural(
+                          'Schedule a downtime for %u host',
+                          'Schedule a downtime for %u hosts',
+                          $unhandledCount
+                      ),
+                      $unhandledCount
+                  ),
+                  $downtimeUnhandledLink,
+                  null,
+                  array('icon' => 'plug')
+              ); ?></div>
+
+
+              <div><?= $this->qlink(
+                    sprintf(
+                        $this->translatePlural(
+                            'Acknowledge %u unhandled host',
+                            'Acknowledge %u unhandled hosts',
+                            $unhandledCount
+                        ),
                         $unhandledCount
                     ),
-                    $unhandledCount
-                ),
-                $acknowledgeUnhandledLink,
-                null,
-                array('icon' => 'ok')
-            ); ?></div>
+                    $acknowledgeUnhandledLink,
+                    null,
+                    array('icon' => 'ok')
+              ); ?></div>
+
+            </p>
+
         </div>
       <?php endif ?>
+
       <?php if (($acknowledgedCount = count($acknowledgedObjects)) > 0): ?>
         <div>
-            <h2><?= sprintf(
+            <h3><?= $this->icon('ok', $this->translate('Acknowledgements')) ?> <?= $this->translate('Acknowledgements') ?></h3>
+
+            <p><?= sprintf(
                 $this->translatePlural(
                     '%u Acknowledged Host Problem',
                     '%u Acknowledged Host Problems',
                     $acknowledgedCount
                 ),
                 $acknowledgedCount
-            ); ?></h2>
+            ); ?></p>
+
             <?= $removeAckForm ?>
         </div>
       <?php endif ?>
+
       <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0): ?>
-        <h2><?= $this->qlink(
-            sprintf(
+
+        <h3><?= $this->translate('Downtimes') ?></h3>
+        <p><?= sprintf(
                 $this->translatePlural(
-                    'List %u host currently in downtime',
-                    'List %u hosts currently in downtime',
+                    '%u Host currently in downtime.',
+                    '%u Hosts currently in downtime.',
                     $inDowntimeCount
                 ),
                 $inDowntimeCount
-            ),
-            $inDowntimeLink,
-            null,
-            array('icon' => 'plug')
-        ); ?></h2>
+        ) ?>   <?= $this->qlink(
+                $this->translate('Alle anzeigen'),
+                $inDowntimeLink,
+                null
+            ); ?>
+
+        </p>
       <?php endif ?>
+
       <?php if (($commentCount = count($objects->getComments())) > 0): ?>
-        <h2><?= $this->qlink(
-            sprintf(
+        <h3> <?= $this->translate('Comments') ?></h3>
+        <p>
+            <?= sprintf(
                 $this->translatePlural(
-                    'List %u host comment',
-                    'List %u host comments',
+                    'There is %u host comment.',
+                    'There are %u host comments.',
                     $commentCount
                 ),
                 $commentCount
-            ),
-            $commentsLink,
-            null,
-            array('icon' => 'comment')
-        ); ?></h2>
+            ) ?>
+
+            <?= $this->qlink(
+                $this->translate('List all'),
+                $commentsLink,
+                null
+            ); ?>
+
+        </p>
+
+        <table>
+        <?php foreach ($objects as $service): ?>
+            <?php $service->fetchComments(); ?>
+            <?php foreach ($service->comments as $comment): ?>
+                <tr>
+                    <td style="vertical-align: top;" data-base-target="_self">
+                        <?php
+                        $delCommentForm = new DeleteCommentCommandForm();
+                        $delCommentForm->populate(
+                            array('comment_id' => $comment->id, 'redirect' => html_entity_decode($this->url))
+                        );
+                        $delCommentForm->setAction(
+                            $this->url(
+                                'monitoring/service/delete-comment',
+                                array('host' => $service->getName())
+                            )
+                        );
+                        echo $delCommentForm;
+                        ?>
+                        (<?= ucfirst($comment->type) ?>):
+                    </td>
+                    <td style="padding-left: .5em;">
+                        <?= nl2br($comment->comment) ?>
+                    </td>
+                </tr>
+            <?php endforeach ?>
+        <?php endforeach ?>
+        </table>
+
+        <!--
+        <p>
+        <div><?= $this->qlink(
+                $this->translate('Remove all'),
+                $deleteCommentLink,
+                null,
+                array('icon' => 'trash')
+            ); ?></div>
+        </p>
+        -->
       <?php endif ?>
+
     <?php endif ?>
 </div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index cd79bce5b..6c910d46a 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -1,16 +1,91 @@
-<?php if (! $this->compact): ?>
-    <?= $tabs; ?>
-<?php endif ?>
+<?php
+use Icinga\Module\Monitoring\Object\Host;
+?>
+
+
+<?php
+$i = 0;
+$hidden = array();
+$hiddenRich = array();
+?>
+
 
 <?php if (($hostCount = count($objects)) > 0): ?>
-<div class="hbox-item">
-    <h1 tabindex="-1">
-        <?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', $hostCount), $hostCount); ?>
-    </h1>
-</div>
-<div class="hbox-item" style="font-size: 14px">
-  <?php foreach (array_filter($hostStates) as $text => $count): ?>
-    <?= sprintf('%s: %u', $this->translate(strtoupper($text)), $count); ?><br>
-  <?php endforeach ?>
-</div>
+
+    <p>
+    <table class="state statesummary">
+        <thead>
+        <tr>
+            <th></th>
+            <th></th>
+            <th><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
+            <th class="collapse"><?= $this->translate('Output'); ?></th>
+        </tr>
+        </thead>
+
+        <tbody>
+        <?php foreach ($objects as $host): /** @var Host $host */ ?>
+            <?php
+            $i++;
+            if ($i > 5) {
+                $desc = $host->getName();
+                $hidden[] = $desc;
+                $hiddenRich[] = sprintf("<div class='color-box badge-%s'></div>%s", $host->getStateText($host->host_state) ,$desc);
+                continue;
+            }
+            ?>
+
+            <tr class="state <?= Host::getStateText($host->host_state); ?><?= $host->host_handled ? ' handled' : '' ?>">
+                <td class="state"><?= Host::getStateText($host->host_state, true); ?><br /></td>
+                <td>
+                    <?php if (!$host->host_handled && $host->host_state > 0): ?>
+                        <?= $this->icon('attention-alt', $this->translate('Unhandled')) ?>
+                    <?php endif ?>
+
+                    <?php if ($host->host_acknowledged && !$host->host_in_downtime): ?>
+                        <?= $this->icon('ok', $this->translate('Acknowledged') . (
+                            $host->host_last_ack ? ': ' . $host->host_last_ack : ''
+                            )) ?>
+                    <?php endif ?>
+
+                    <?php if ($host->host_is_flapping): ?>
+                        <?= $this->icon('flapping', $this->translate('Flapping')) ?>
+                    <?php endif ?>
+
+                    <?php if (!$host->host_notifications_enabled): ?>
+                        <?= $this->icon('bell-off-empty', $this->translate('Notifications Disabled')) ?>
+                    <?php endif ?>
+
+                    <?php if ($host->host_in_downtime): ?>
+                        <?= $this->icon('plug', $this->translate('In Downtime')) ?>
+                    <?php endif ?>
+
+                    <?php if (isset($host->host_last_comment) && $host->host_last_comment !== null): ?>
+                        <?= $this->icon('comment', $this->translate('Last Comment: ') . $host->host_last_comment) ?>
+                    <?php endif ?>
+                </td>
+                <td><?= $this->escape($host->getName()); ?></td>
+                <td><p class="pluginoutput"><?= $this->escape($host->host_output) ?></p></td>
+            </tr>
+        <?php endforeach ?>
+
+        <?php if (count($hidden)): ?>
+            <tr>
+                <td>
+                    <div class="selection-info" data-title-rich="<span align='left'><?= join('<br>', $hiddenRich) ?></span>"
+                         title="<?= join(', ', $hidden) ?>">
+                        <?= sprintf(t('%d more ...'), count($hidden)) ?>
+                    </div>
+                </td>
+            </tr>
+        <?php endif ?>
+
+        </tbody>
+    </table>
+    </p>
+
+
 <?php endif ?>
+
+
+

From 9fc80ec34fb9a4d57ef4d390375e2a82f89d7d0d Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 6 Mar 2015 12:45:29 +0100
Subject: [PATCH 0884/2920] Use more readable coding style in service
 multi-view

refs #8565
---
 .../views/scripts/services/show.phtml         | 218 +++++++++---------
 1 file changed, 109 insertions(+), 109 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 5cd3af1b6..d9aed1581 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -20,124 +20,130 @@ use Icinga\Web\Url;
     </h3>
 
     <?php if (($serviceCount = count($objects)) === 0): ?>
-    <?= $this->translate('No services matching the filter'); ?>
+        <?= $this->translate('No services matching the filter'); ?>
     <?php else: ?>
-        <?= sprintf(t('Issue commands on all %d selected services'), count($objects)) ?>
+        <?= sprintf(t('Issue commands on all %d selected services:'), count($objects)) ?>
 
-    <p>
+        <p>
         <div>
             <?= $checkNowForm; ?>
         </div>
-        <div><?= $this->qlink(
+
+        <div>
+            <?= $this->qlink(
                 $this->translate('Reschedule the next check'),
                 $rescheduleAllLink,
                 null,
                 array('icon' => 'reschedule')
-            ); ?></div>
-        <div><?= $this->qlink(
+            ); ?>
+        </div>
+
+        <div>
+            <?= $this->qlink(
                 $this->translate('Schedule a downtime'),
                 $downtimeAllLink,
                 null,
                 array('icon' => 'plug')
-            ); ?></div>
-        <div><?= $this->qlink(
+            ); ?>
+        </div>
+
+        <div>
+            <?= $this->qlink(
                 $this->translate('Submit a passive check result'),
                 $processCheckResultAllLink,
                 null,
                 array('icon' => 'reply')
-            ); ?></div>
-        <div><?= $this->qlink(
+            ); ?>
+        </div>
+
+        <div>
+            <?= $this->qlink(
                 $this->translate('Add a comment'),
                 $addCommentLink,
                 null,
                 array('icon' => 'comment')
-            ); ?></div>
-    </p>
-
-    <?php if (($unhandledCount = count($unhandledObjects)) > 0): ?>
-    <div>
-        <h3>
-            <?= $this->icon('attention-alt') ?>
-                <?= $this->translatePlural(
-                        'Unhandled Problem',
-                        'Unhandled Problems',
-                        $unhandledCount
-                ) ?>
-        </h3>
-
-        <p><?= sprintf(t('There are %s unhandled problems. ' .
-                'Issue commands to the problematic services.'),
-                '<span class="badge badge-critical">' . $unhandledCount . '</span>') ?>
-
-            <div>
-            <?= $this->qlink(
-                sprintf(
-                    $this->translatePlural(
-                        'Schedule a downtime for %u unhandled service problem',
-                        'Schedule a downtime for %u unhandled service problems',
-                        $unhandledCount
-                    ),
-                    $unhandledCount
-                ),
-                $downtimeUnhandledLink,
-                null,
-                array('icon' => 'plug')
             ); ?>
-            </div>
-
-            <div><?= $this->qlink(
-                sprintf(
-                    $this->translatePlural(
-                        'Acknowledge %u unhandled service problem',
-                        'Acknowledge %u unhandled service problems',
-                        $unhandledCount
-                    ),
-                    $unhandledCount
-                ),
-                $acknowledgeUnhandledLink,
-                null,
-                array('icon' => 'ok')
-            ); ?></div>
+        </div>
         </p>
 
-
-    </div>
-
-    <?php endif ?>
-    <?php if (($acknowledgedCount = count($acknowledgedObjects)) > 0): ?>
-
-    <h3> <?= $this->icon('ok', $this->translate('Acknowledgements')) ?> <?= $this->translate('Acknowledgements') ?> </h3>
-    <p>
-        <?= sprintf(
-            $this->translatePlural(
-                '%u Acknowledged Service Problem',
-                '%u Acknowledged Service Problems',
-                $acknowledgedCount
-            ),
-            $acknowledgedCount
-        ); ?> <?= $removeAckForm ?>
-    </p>
-    <?php endif ?>
-
-
-    <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0): ?>
-
-    <h3>  <?= $this->icon('plug', $this->translate('Downtimes')) ?> <?= $this->translate('Downtimes') ?>  </h3>
-    <p> <?= sprintf($this->translatePlural(
-            '%u service currently in downtime',
-            '%u services currently in downtime',
-            $inDowntimeCount
-        ), $inDowntimeCount) ?>
-
+        <?php if (($unhandledCount = count($unhandledObjects)) > 0): ?>
         <div>
-        <?= $this->qlink(
-            $this->translate('List all'),
-            $inDowntimeLink,
-            null,
-            array('icon' => 'plug')
-        );?>
+            <h3>
+                <?= $this->icon('attention-alt') ?>
+                    <?= $this->translatePlural(
+                            'Unhandled Problem',
+                            'Unhandled Problems',
+                            $unhandledCount
+                    ) ?>
+            </h3>
+
+            <p><?= sprintf(t('There are %s unhandled problems. ' .
+                    'Issue commands to the problematic services.'),
+                    '<span class="badge badge-critical">' . $unhandledCount . '</span>') ?>
+
+                <div>
+                <?= $this->qlink(
+                    sprintf(
+                        $this->translatePlural(
+                            'Schedule a downtime for %u unhandled service problem',
+                            'Schedule a downtime for %u unhandled service problems',
+                            $unhandledCount
+                        ),
+                        $unhandledCount
+                    ),
+                    $downtimeUnhandledLink,
+                    null,
+                    array('icon' => 'plug')
+                ); ?>
+                </div>
+
+                <div><?= $this->qlink(
+                    sprintf(
+                        $this->translatePlural(
+                            'Acknowledge %u unhandled service problem',
+                            'Acknowledge %u unhandled service problems',
+                            $unhandledCount
+                        ),
+                        $unhandledCount
+                    ),
+                    $acknowledgeUnhandledLink,
+                    null,
+                    array('icon' => 'ok')
+                ); ?></div>
+            </p>
+
         </div>
-    </p>
+    <?php endif ?>
+
+    <?php if (($acknowledgedCount = count($acknowledgedObjects)) > 0): ?>
+        <h3><?= $this->icon('ok', $this->translate('Acknowledgements')) ?> <?= $this->translate('Acknowledgements') ?></h3>
+        <p>
+            <?= sprintf(
+                $this->translatePlural(
+                    '%u Acknowledged Service Problem.',
+                    '%u Acknowledged Service Problems.',
+                    $acknowledgedCount
+                ),
+                $acknowledgedCount
+            ); ?> <?= $removeAckForm ?>
+        </p>
+    <?php endif ?>
+
+
+    <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0 /*&& $auth->hasPermission('monitoring/command/comment/delete')*/): ?>
+        <h3>  <?= $this->icon('plug', $this->translate('Downtimes')) ?> <?= $this->translate('Downtimes') ?>  </h3>
+        <p> <?= sprintf($this->translatePlural(
+                '%u service currently in downtime.',
+                '%u services currently in downtime.',
+                $inDowntimeCount
+            ), $inDowntimeCount) ?>
+
+            <?= $this->qlink(
+                $this->translate('List all'),
+                $inDowntimeLink,
+                null
+            );?>
+        </p>
     <?php endif ?>
 
 
@@ -146,12 +152,18 @@ use Icinga\Web\Url;
     <h3> <?= $this->icon('comment') ?> <?= t('Comments') ?> </h3>
     <p><?= sprintf(
             $this->translatePlural(
-                'There are no comments.',
-                'There are %d comments',
+                'There is %d comment.',
+                'There are %d comments.',
                 $commentCount
             ), $commentCount);
     ?>
+    <?= $this->qlink(
+        $this->translate('List all'),
+        $commentsLink,
+        null
+    ); ?>
     <p>
+
     <table>
     <?php foreach ($objects as $service): ?>
         <?php $service->fetchComments(); ?>
@@ -180,20 +192,9 @@ use Icinga\Web\Url;
         <?php endforeach ?>
     <?php endforeach ?>
     </table>
+
+    <!--
     </p>
-
-    <div>
-    <?= $this->qlink(
-        $this->translate('List all'),
-        $commentsLink,
-        null,
-        array('icon' => 'comment')
-    ); ?>
-    </div>
-
-<!--
-    TODO: implement backend functionality.
-    
     <div><?= $this->qlink(
             $this->translate('Remove all'),
             $deleteCommentLink,
@@ -201,8 +202,7 @@ use Icinga\Web\Url;
             array('icon' => 'trash')
     ); ?></div>
     </p>
--->
-
+    -->
 
     <?php endif ?>
 

From 0623404963818b033d857a655de59bbb45b5567c Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 6 Mar 2015 12:46:49 +0100
Subject: [PATCH 0885/2920] Add missing layout color for "down" badge

refs #8565
---
 public/css/icinga/monitoring-colors.less | 2 +-
 public/css/icinga/widgets.less           | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index 62d5a68cd..609b3451c 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -951,7 +951,7 @@ table.statesummary {
   }
 
   td.state {
-    min-width: 70px;
+    min-width: 75px;
     font-size: 0.7em;
     text-align: center;
   }
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index de33d6685..b6a41c234 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -260,6 +260,10 @@ li li .badge {
   background-color: @colorCritical;
 }
 
+.badge-down {
+  background-color: @colorCritical;
+}
+
 .badge-warning {
   background-color: @colorWarning;
 }

From a077472226fe5a2c6472ac70243ebb76b0afd19d Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 6 Mar 2015 12:53:58 +0100
Subject: [PATCH 0886/2920] Make tabs available in all host controller actions

refs #8565
---
 .../controllers/HostsController.php           | 24 +++++++++----------
 .../views/scripts/services/show.phtml         |  1 -
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 2c9ebc20e..aa119c161 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -27,6 +27,18 @@ class Monitoring_HostsController extends Controller
         $hostList = new HostList($this->backend);
         $hostList->setFilter(Filter::fromQueryString((string) $this->params));
         $this->hostList = $hostList;
+        $this->getTabs()->add(
+            'show',
+            array(
+                'title' => sprintf(
+                    $this->translate('Show summarized information for %u hosts'),
+                    count($this->hostList)
+                ),
+                'label' => $this->translate('Hosts'),
+                'url'   => Url::fromRequest(),
+                'icon'  => 'host'
+            )
+        )->activate('show');
     }
 
     protected function handleCommandForm(ObjectsCommandForm $form)
@@ -69,18 +81,6 @@ class Monitoring_HostsController extends Controller
 
     public function showAction()
     {
-        $this->getTabs()->add(
-            'show',
-            array(
-                'title' => sprintf(
-                    $this->translate('Show summarized information for %u hosts'),
-                    count($this->hostList)
-                ),
-                'label' => $this->translate('Hosts'),
-                'url'   => Url::fromRequest(),
-                'icon'  => 'host'
-            )
-        )->activate('show');
         $this->setAutorefreshInterval(15);
         $checkNowForm = new CheckNowCommandForm();
         $checkNowForm
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index d9aed1581..2933e6623 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -1,6 +1,5 @@
 <?php
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
-use Icinga\Web\Url;
 ?>
 
 <div class="controls">

From 6d436737540132b34099f2c5b2c7402aa14614b5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 6 Mar 2015 13:13:02 +0100
Subject: [PATCH 0887/2920] Do not always join host and service status in the
 DowntimeQuery

Now the hoststatus and servicestatus tables are only joined if necessary.

refs #8614
---
 .../Backend/Ido/Query/DowntimeQuery.php       | 44 +++++++++++++------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index 96b0dd5d7..db4305c0d 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -21,19 +21,26 @@ class DowntimeQuery extends IdoQuery
             'downtime_duration'         => 'sd.duration',
             'downtime_is_in_effect'     => 'sd.is_in_effect',
             'downtime_internal_id'      => 'sd.internal_downtime_id',
+            'downtime_objecttype'       => "CASE WHEN ho.object_id IS NULL THEN 'service' ELSE 'host' END",
             'downtime_host'             => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END COLLATE latin1_general_ci', // #7278, #7279
             'host'                      => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END COLLATE latin1_general_ci',
+            'host_name'                 => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END',
             'downtime_service'          => 'so.name2 COLLATE latin1_general_ci',
             'service'                   => 'so.name2 COLLATE latin1_general_ci', // #7278, #7279
-            'downtime_objecttype'       => "CASE WHEN ho.object_id IS NOT NULL THEN 'host' ELSE CASE WHEN so.object_id IS NOT NULL THEN 'service' ELSE NULL END END",
-            'downtime_host_state'       => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END',
-            'downtime_service_state'    => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END'
+            'service_description'       => 'so.name2',
+            'service_host_name'         => 'so.name1'
         ),
         'hosts' => array(
-            'host_display_name'         => 'CASE WHEN sh.display_name IS NOT NULL THEN sh.display_name ELSE h.display_name END'
+            'host_display_name'         => 'CASE WHEN h.display_name IS NULL THEN sh.display_name ELSE h.display_name END'
+        ),
+        'hoststatus' => array(
+            'downtime_host_state'       => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END'
         ),
         'services' => array(
             'service_display_name'      => 's.display_name'
+        ),
+        'servicestatus' => array(
+            'downtime_service_state'    => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END'
         )
     );
 
@@ -53,16 +60,6 @@ class DowntimeQuery extends IdoQuery
             'sd.object_id = so.object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
         );
-        $this->select->joinLeft(
-            array('hs' => $this->prefix . 'hoststatus'),
-            'ho.object_id = hs.host_object_id',
-            array()
-        );
-        $this->select->joinLeft(
-            array('ss' => $this->prefix . 'servicestatus'),
-            'so.object_id = ss.service_object_id',
-            array()
-        );
         $this->joinedVirtualTables = array('downtime' => true);
     }
 
@@ -76,6 +73,15 @@ class DowntimeQuery extends IdoQuery
         return $this;
     }
 
+    protected function joinHoststatus()
+    {
+        $this->select->joinLeft(
+            array('hs' => $this->prefix . 'hoststatus'),
+            'ho.object_id = hs.host_object_id',
+            array()
+        );
+    }
+
     protected function joinServices()
     {
         $this->select->joinLeft(
@@ -90,4 +96,14 @@ class DowntimeQuery extends IdoQuery
         );
         return $this;
     }
+
+    protected function joinServicestatus()
+    {
+        $this->select->joinLeft(
+            array('ss' => $this->prefix . 'servicestatus'),
+            'so.object_id = ss.service_object_id',
+            array()
+        );
+        return $this;
+    }
 }

From db99c323cc85357efa3bcaabe7ad34a99f20bde1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 6 Mar 2015 13:13:48 +0100
Subject: [PATCH 0888/2920] Add host and service name columns to the Downtime
 data view

refs #8614
---
 modules/monitoring/library/Monitoring/DataView/Downtime.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index 54a47e6b4..07123dd4f 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -33,7 +33,10 @@ class Downtime extends DataView
             'downtime_host_state',
             'downtime_service_state',
             'host_display_name',
-            'service_display_name'
+            'service_display_name',
+            'host_name',
+            'service_host_name',
+            'service_description'
         );
     }
 

From 7317aa7158198716399a2cd923278b73d0fd63fe Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 6 Mar 2015 13:14:20 +0100
Subject: [PATCH 0889/2920] Do not join hosts when fetching a service's
 downtimes

refs #8614
---
 .../library/Monitoring/Object/MonitoredObject.php    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index bf417c4f4..0f382f214 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -281,16 +281,18 @@ abstract class MonitoredObject implements Filterable
             'is_flexible'       => 'downtime_is_flexible',
             'is_fixed'          => 'downtime_is_fixed',
             'is_in_effect'      => 'downtime_is_in_effect',
-            'entry_time'        => 'downtime_entry_time',
-            'host'              => 'downtime_host',
-            'service'           => 'downtime_service'
+            'entry_time'        => 'downtime_entry_time'
         ))
             ->where('downtime_objecttype', $this->type)
-            ->where('downtime_host', $this->host_name)
             ->order('downtime_is_in_effect', 'DESC')
             ->order('downtime_scheduled_start', 'ASC');
         if ($this->type === self::TYPE_SERVICE) {
-            $downtimes->where('downtime_service', $this->service_description);
+            $downtimes
+                ->where('service_host_name', $this->host_name)
+                ->where('service_description', $this->service_description);
+        } else {
+            $downtimes
+                ->where('host_name', $this->host_name);
         }
         $this->downtimes = $downtimes->getQuery()->fetchAll();
         return $this;

From cbf39a2d99bb3b55d3757267c1c2b41816aca72c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 6 Mar 2015 13:14:56 +0100
Subject: [PATCH 0890/2920] Use host_name and service_description columns in
 the downtime overview

refs #8614
---
 modules/monitoring/application/controllers/ListController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index b1b96b477..6ac7e16ed 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -282,8 +282,8 @@ class Monitoring_ListController extends Controller
             'is_fixed'        => 'downtime_is_fixed',
             'is_in_effect'    => 'downtime_is_in_effect',
             'entry_time'      => 'downtime_entry_time',
-            'host'            => 'downtime_host',
-            'service'         => 'downtime_service',
+            'host'            => 'host_name',
+            'service'         => 'service_description',
             'host_state'      => 'downtime_host_state',
             'service_state'   => 'downtime_service_state',
             'host_display_name',

From 4324385010e1d58dd6fc0182cc9e527f8e7f3138 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 6 Mar 2015 13:22:51 +0100
Subject: [PATCH 0891/2920] Do not load a module twice while enabling it

---
 application/controllers/ConfigController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 5ad822e12..33e845f8c 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -163,7 +163,6 @@ class ConfigController extends ActionController
         $manager = Icinga::app()->getModuleManager();
         try {
             $manager->enableModule($module);
-            $manager->loadModule($module);
             Notification::success(sprintf($this->translate('Module "%s" enabled'), $module));
             $this->rerenderLayout()->reloadCss()->redirectNow('config/modules');
         } catch (Exception $e) {

From d7dcbb48a2a9f2d4cb0536fd0040ef7268982008 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 6 Mar 2015 13:23:22 +0100
Subject: [PATCH 0892/2920] Do not try to access a module's title if there is
 none

---
 application/views/scripts/config/module.phtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/views/scripts/config/module.phtml b/application/views/scripts/config/module.phtml
index 28fbeb39e..9130bcc90 100644
--- a/application/views/scripts/config/module.phtml
+++ b/application/views/scripts/config/module.phtml
@@ -2,9 +2,6 @@
   <?= $this->tabs ?>
 </div>
 <div class="content">
-  <h1 tabindex="-1">
-    <?= $this->escape($module->getTitle()) ?>
-  </h1>
   <?php if (! $module): ?>
     <?= $this->translate('There is no such module installed.') ?>
   <?php return; endif ?>
@@ -14,6 +11,9 @@
     $permissions = $module->getProvidedPermissions();
     $state = $moduleData->enabled ? ($moduleData->loaded ? 'enabled' : 'failed') : 'disabled'
   ?>
+  <h1 tabindex="-1">
+    <?= $this->escape($module->getTitle()) ?>
+  </h1>
   <table class="avp">
     <tr>
       <th><?= $this->escape($this->translate('Name')) ?></th>

From f45f00b022a611c94365fbd0dfe6fdac58377ac5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 6 Mar 2015 13:25:04 +0100
Subject: [PATCH 0893/2920] Run a module's configuration script only in case it
 has been registered

fixes #8601
---
 application/controllers/ConfigController.php  | 19 +++++++-------
 library/Icinga/Application/Modules/Module.php | 25 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 33e845f8c..f7543cc03 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -135,22 +135,23 @@ class ConfigController extends ActionController
 
     public function moduleAction()
     {
-        $name = $this->getParam('name');
         $app = Icinga::app();
         $manager = $app->getModuleManager();
+        $name = $this->getParam('name');
         if ($manager->hasInstalled($name)) {
-            $this->view->moduleData = Icinga::app()
-                ->getModuleManager()
-                ->select()
-                ->from('modules')
-                ->where('name', $name)
-                ->fetchRow();
-            $module = new Module($app, $name, $manager->getModuleDir($name));
+            $this->view->moduleData = $manager->select()->from('modules')->where('name', $name)->fetchRow();
+            if ($manager->hasLoaded($name)) {
+                $module = $manager->getModule($name);
+            } else {
+                $module = new Module($app, $name, $manager->getModuleDir($name));
+            }
+
             $this->view->module = $module;
+            $this->view->tabs = $module->getConfigTabs()->activate('info');
         } else {
             $this->view->module = false;
+            $this->view->tabs = null;
         }
-        $this->view->tabs = $module->getConfigTabs()->activate('info');
     }
 
     /**
diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index b59154020..8c0bc2266 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -113,6 +113,13 @@ class Module
      */
     private $triedToLaunchConfigScript = false;
 
+    /**
+     * Whether this module has been registered
+     *
+     * @var bool
+     */
+    private $registered = false;
+
     /**
      * Provided permissions
      *
@@ -279,6 +286,10 @@ class Module
      */
     public function register()
     {
+        if ($this->registered) {
+            return true;
+        }
+
         $this->registerAutoloader();
         try {
             $this->launchRunScript();
@@ -291,10 +302,22 @@ class Module
             );
             return false;
         }
+
         $this->registerWebIntegration();
+        $this->registered = true;
         return true;
     }
 
+    /**
+     * Return whether this module has been registered
+     *
+     * @return  bool
+     */
+    public function isRegistered()
+    {
+        return $this->registered;
+    }
+
     /**
      * Test for an enabled module by name
      *
@@ -913,7 +936,7 @@ class Module
      */
     protected function launchConfigScript()
     {
-        if ($this->triedToLaunchConfigScript) {
+        if ($this->triedToLaunchConfigScript || !$this->registered) {
             return;
         }
         $this->triedToLaunchConfigScript = true;

From f91ce0cfa1af1e7d5525c34938ae8777764b006f Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 6 Mar 2015 13:27:48 +0100
Subject: [PATCH 0894/2920] Fix delete comment command in host multi-view

refs #8565
---
 .../application/controllers/HostsController.php      | 12 ++++++++++++
 .../application/views/scripts/hosts/show.phtml       |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index aa119c161..eaa3d03a4 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -173,6 +173,18 @@ class Monitoring_HostsController extends Controller
         $this->handleCommandForm($form);
     }
 
+    /**
+     * Delete a comment
+     */
+    public function deleteCommentAction()
+    {
+        $this->assertPermission('monitoring/command/comment/delete');
+
+        $form = new DeleteCommentCommandForm();
+        $form->setTitle($this->translate('Delete Host Comments'));
+        $this->handleCommandForm($form);
+    }
+
     /**
      * Acknowledge host problems
      */
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index b6cb454bf..ffba365b1 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -14,8 +14,8 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
          $listAllLink
       ); ?>
     </h1>
-
     <?= $this->render('partials/host/objects-header.phtml'); ?>
+
 </div>
 
 <div class="content">
@@ -23,7 +23,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
         <?= $this->icon('reschedule') ?>
         <?= $this->translate('Commands') ?>
     </h3>
-    <?= sprintf(t('Issue commands on all %d selected services:'), count($objects)) ?>
+    <?= sprintf(t('Issue commands on all %d selected hosts:'), count($objects)) ?>
 
     <?php if (($hostCount = count($objects)) === 0): ?>
         <?= $this->translate('No hosts matching the filter'); ?>
@@ -192,7 +192,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
                         );
                         $delCommentForm->setAction(
                             $this->url(
-                                'monitoring/service/delete-comment',
+                                'monitoring/host/delete-comment',
                                 array('host' => $service->getName())
                             )
                         );

From c0deeefe00b71ac6f4e51c507c7fdc89ad1226bd Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 6 Mar 2015 13:44:14 +0100
Subject: [PATCH 0895/2920] Re-add dashboard link to the upper left logo

fixes #8592
---
 application/layouts/scripts/body.phtml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index 03c0f5905..78bb4f91d 100644
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -29,7 +29,16 @@ if ($notifications->hasMessages()) {
 }
    ?></ul>
    <div id="logo" data-base-target="_main">
-           <img aria-hidden="true" src="<?= $this->href('img/logo_icinga-inv.png') ?>" class="logo" alt="<?= t('Dashboard') ?>" />
+       <?= $this->qlink(
+           '',
+           '/dashboard',
+           null,
+           array(
+               'icon'           => '../logo_icinga-inv.png',
+               'aria-hidden'    => 'true',
+               'tabindex'       => -1
+           )
+       ); ?>
    </div>
  </div>
 

From 4724eb907fc53d072c8675e33443eb3c56899df4 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 6 Mar 2015 14:49:33 +0100
Subject: [PATCH 0896/2920] Fix site layout of multi-views

Fix responsiveness and add icons for plugin output section.

refs 8565
---
 .../views/scripts/hosts/show.phtml            |  2 +-
 .../partials/host/objects-header.phtml        |  8 +++----
 .../partials/service/objects-header.phtml     | 17 +++++++------
 .../views/scripts/services/show.phtml         |  2 +-
 public/css/icinga/layout-structure.less       |  4 ++++
 public/css/icinga/monitoring-colors.less      | 24 +++++++------------
 public/css/icinga/widgets.less                |  5 ++++
 7 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index ffba365b1..20338b08e 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -18,7 +18,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 
 </div>
 
-<div class="content">
+<div class="content no-padding-top">
     <h3>
         <?= $this->icon('reschedule') ?>
         <?= $this->translate('Commands') ?>
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index 6c910d46a..39445e277 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -18,8 +18,8 @@ $hiddenRich = array();
         <tr>
             <th></th>
             <th></th>
-            <th><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
-            <th class="collapse"><?= $this->translate('Output'); ?></th>
+            <th class="oneline"><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
+            <th class="oneline"><?= $this->icon('paste'); ?> <?= $this->translate('Plugin Output'); ?></th>
         </tr>
         </thead>
 
@@ -64,8 +64,8 @@ $hiddenRich = array();
                         <?= $this->icon('comment', $this->translate('Last Comment: ') . $host->host_last_comment) ?>
                     <?php endif ?>
                 </td>
-                <td><?= $this->escape($host->getName()); ?></td>
-                <td><p class="pluginoutput"><?= $this->escape($host->host_output) ?></p></td>
+                <td class="name oneline"><?= $this->escape($host->getName()); ?></td>
+                <td><?= $this->escape($host->host_output) ?></td>
             </tr>
         <?php endforeach ?>
 
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index 11127ddf3..fe23cde2c 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -15,12 +15,11 @@ use Icinga\Web\Url;
     <tr>
         <th></th>
         <th></th>
-        <th><?= $this->icon('service'); ?> <?= $this->translate('Service'); ?></th>
-        <th><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
-        <th class="collapse"><?= $this->translate('Output'); ?></th>
+        <th class="oneline"><?= $this->icon('service'); ?> <?= $this->translate('Service'); ?></th>
+        <th class="oneline"><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
+        <th class="oneline"><?= $this->icon('paste'); ?> <?= $this->translate('Plugin Output'); ?></th>
     </tr>
     </thead>
-
     <tbody>
     <?php foreach ($objects as $service): /** @var Service $service */ ?>
         <?php
@@ -62,16 +61,16 @@ use Icinga\Web\Url;
                     <?= $this->icon('comment', $this->translate('Last Comment: ') . $service->service_last_comment) ?>
                 <?php endif ?>
             </td>
-            <td><?= $this->escape($service->getName()); ?></td>
-            <td><?= $this->escape($service->getHost()->getName()); ?></b></td>
-            <td><p class="pluginoutput collapse"><?= $this->escape($service->service_output) ?></p></td>
+            <td class="name oneline"><?= $this->escape($service->getName()); ?></td>
+            <td class="name oneline"><?= $this->escape($service->getHost()->getName()); ?></b></td>
+            <td><?= $this->escape($service->service_output) ?></td>
         </tr>
     <?php endforeach ?>
 
     <?php if (count($hidden)): ?>
         <tr>
-        <td>
-        <div class="selection-info" data-title-rich="<span align='left'><?= join('<br>', $hiddenRich) ?></span>"
+        <td class="state">
+        <div data-title-rich="<span align='left'><?= join('<br>', $hiddenRich) ?></span>"
               title="<?= join(', ', $hidden) ?>">
               <?= sprintf(t('%d more ...'), count($hidden)) ?>
         </div>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 2933e6623..8ee61859a 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -12,7 +12,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
     <?= $this->render('partials/service/objects-header.phtml'); ?>
 
 </div>
-<div class="content">
+<div class="content no-padding-top">
     <h3>
         <?= $this->icon('reschedule') ?>
         <?= $this->translate('Commands') ?>
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index a8f135712..3aa7da077 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -370,3 +370,7 @@ html {
   position: absolute;
   width: 1px;
 }
+
+.no-padding-top {
+  padding-top: 0em;
+}
diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index 609b3451c..ad80fbb45 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -929,10 +929,6 @@ table.statesummary {
   width: auto;
   border-collapse: separate;
 
-  tbody {
-    white-space: nowrap;
-  }
-
   td {
     padding: 0em 0.4em 0em 0.4em;
     line-height: 1.2em;
@@ -943,29 +939,27 @@ table.statesummary {
     font-weight: bold;
   }
 
-  td .pluginoutput {
-    font-size: 0.8em;
+  td {
+    font-size: 0.85em;
     line-height: 1.2em;
-    padding-left: 0;
+    padding-left: 0.2em;
     margin: 0;
   }
 
   td.state {
+    padding: 0.2em;
     min-width: 75px;
-    font-size: 0.7em;
+    font-size: 0.75em;
     text-align: center;
   }
 
+  td.name {
+    font-weight: bold;
+  }
+
   td a {
     color: inherit;
     text-decoration: none;
   }
 }
 
-/* Up to 576px for 1em=16px, should fit 320px devices */
-@media screen and (max-width: 97em) {
-
-  table.statesummary .collapse {
-    display: none;
-  }
-}
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index b6a41c234..7aaf8385e 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -272,6 +272,10 @@ li li .badge {
   background-color: @colorOk;
 }
 
+.badge-up {
+  background-color: @colorOk;
+}
+
 .badge-pending {
   background-color: @colorPending;
 }
@@ -323,3 +327,4 @@ li li .badge {
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+

From c2c9e49df4a853afa7783439810ebb464a91281b Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 6 Mar 2015 15:01:52 +0100
Subject: [PATCH 0897/2920] Fix inconsistencies in text messages

refs #8565
---
 modules/monitoring/application/views/scripts/hosts/show.phtml | 4 ++--
 .../monitoring/application/views/scripts/services/show.phtml  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 20338b08e..e5b3cd181 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -23,7 +23,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
         <?= $this->icon('reschedule') ?>
         <?= $this->translate('Commands') ?>
     </h3>
-    <?= sprintf(t('Issue commands on all %d selected hosts:'), count($objects)) ?>
+    <?= sprintf(t('Issue commands to all %d selected hosts:'), count($objects)) ?>
 
     <?php if (($hostCount = count($objects)) === 0): ?>
         <?= $this->translate('No hosts matching the filter'); ?>
@@ -85,7 +85,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 
             <p>
               <?= sprintf(
-                  t('There are %s unhandled problems. Issue commands to the problematic hosts.'),
+                  t('There are %s unhandled problems. Issue commands to the problematic hosts:'),
                   '<span class="badge badge-critical">' . $unhandledCount . '</span>'
               ) ?>
 
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 8ee61859a..bbd22df1a 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -21,7 +21,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
     <?php if (($serviceCount = count($objects)) === 0): ?>
         <?= $this->translate('No services matching the filter'); ?>
     <?php else: ?>
-        <?= sprintf(t('Issue commands on all %d selected services:'), count($objects)) ?>
+        <?= sprintf(t('Issue commands to all %d selected services:'), count($objects)) ?>
 
         <p>
         <div>
@@ -77,7 +77,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
             </h3>
 
             <p><?= sprintf(t('There are %s unhandled problems. ' .
-                    'Issue commands to the problematic services.'),
+                    'Issue commands to the problematic services:'),
                     '<span class="badge badge-critical">' . $unhandledCount . '</span>') ?>
 
                 <div>

From 5c71f5a8ef0c16611042f4de96a7d3ae8c037ade Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 6 Mar 2015 15:13:08 +0100
Subject: [PATCH 0898/2920] Open list all links to the next container

refs #8565
---
 .../monitoring/application/views/scripts/hosts/show.phtml | 8 +++++---
 .../application/views/scripts/services/show.phtml         | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index e5b3cd181..4c1d70ff6 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -151,9 +151,10 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
                 ),
                 $inDowntimeCount
         ) ?>   <?= $this->qlink(
-                $this->translate('Alle anzeigen'),
+                $this->translate('List all'),
                 $inDowntimeLink,
-                null
+                null,
+                array('data-base-target' => '_next')
             ); ?>
 
         </p>
@@ -174,7 +175,8 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
             <?= $this->qlink(
                 $this->translate('List all'),
                 $commentsLink,
-                null
+                null,
+                array('data-base-target' => '_next')
             ); ?>
 
         </p>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index bbd22df1a..d35125254 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -140,7 +140,8 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
             <?= $this->qlink(
                 $this->translate('List all'),
                 $inDowntimeLink,
-                null
+                null,
+                array('data-base-target' => '_next')
             );?>
         </p>
     <?php endif ?>
@@ -159,7 +160,8 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
     <?= $this->qlink(
         $this->translate('List all'),
         $commentsLink,
-        null
+        null,
+        array('data-base-target' => '_next')
     ); ?>
     <p>
 

From 2591f055d80df93fdc31a1888cc1ec09fdb60c7e Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 6 Mar 2015 15:22:14 +0100
Subject: [PATCH 0899/2920] Fix translation

Remove calls to deprecated translation function. Always use plural forms for commands in multi-view to indicate that this will cause multiple commands to be issued.

refs #8565
---
 .../application/views/scripts/hosts/show.phtml   | 16 ++++++++--------
 .../scripts/partials/host/objects-header.phtml   |  2 +-
 .../partials/service/objects-header.phtml        |  5 ++++-
 .../views/scripts/services/show.phtml            | 14 +++++++-------
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 4c1d70ff6..c8a4f9484 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -23,7 +23,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
         <?= $this->icon('reschedule') ?>
         <?= $this->translate('Commands') ?>
     </h3>
-    <?= sprintf(t('Issue commands to all %d selected hosts:'), count($objects)) ?>
+    <?= sprintf($this->translate('Issue commands to all %d selected hosts:'), count($objects)) ?>
 
     <?php if (($hostCount = count($objects)) === 0): ?>
         <?= $this->translate('No hosts matching the filter'); ?>
@@ -36,7 +36,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 
         <div>
             <?= $this->qlink(
-                $this->translate('Reschedule the next check'),
+                $this->translate('Reschedule next checks'),
                 $rescheduleAllLink,
                 null,
                 array('icon' => 'reschedule')
@@ -45,7 +45,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 
         <div>
             <?= $this->qlink(
-                $this->translate('Schedule a downtime'),
+                $this->translate('Schedule downtimes'),
                 $downtimeAllLink,
                 null,
                 array('icon' => 'plug')
@@ -54,7 +54,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 
         <div>
             <?= $this->qlink(
-                $this->translate('Submit a passive check result'),
+                $this->translate('Submit passive check results'),
                 $processCheckResultAllLink,
                 null,
                 array('icon' => 'reply')
@@ -63,7 +63,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 
         <div>
             <?= $this->qlink(
-                $this->translate('Add a comment'),
+                $this->translate('Add comments'),
                 $addCommentLink,
                 null,
                 array('icon' => 'comment')
@@ -85,7 +85,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 
             <p>
               <?= sprintf(
-                  t('There are %s unhandled problems. Issue commands to the problematic hosts:'),
+                  $this->translate('There are %s unhandled problems. Issue commands to the problematic hosts:'),
                   '<span class="badge badge-critical">' . $unhandledCount . '</span>'
               ) ?>
 
@@ -142,7 +142,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 
       <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0): ?>
 
-        <h3><?= $this->translate('Downtimes') ?></h3>
+        <h3><?= $this->icon('plug', $this->translate('Downtimes'))?> <?=$this->translate('Downtimes')?></h3>
         <p><?= sprintf(
                 $this->translatePlural(
                     '%u Host currently in downtime.',
@@ -161,7 +161,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
       <?php endif ?>
 
       <?php if (($commentCount = count($objects->getComments())) > 0): ?>
-        <h3> <?= $this->translate('Comments') ?></h3>
+        <h3> <?= $this->icon('comment', $this->translate('Comments'))?> <?=$this->translate('Comments') ?></h3>
         <p>
             <?= sprintf(
                 $this->translatePlural(
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index 39445e277..c2f016ceb 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -74,7 +74,7 @@ $hiddenRich = array();
                 <td>
                     <div class="selection-info" data-title-rich="<span align='left'><?= join('<br>', $hiddenRich) ?></span>"
                          title="<?= join(', ', $hidden) ?>">
-                        <?= sprintf(t('%d more ...'), count($hidden)) ?>
+                        <?= sprintf($this->translate('%d more ...'), count($hidden)) ?>
                     </div>
                 </td>
             </tr>
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index fe23cde2c..4501f0e7e 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -34,7 +34,9 @@ use Icinga\Web\Url;
 
         <tr class="state <?= Service::getStateText($service->service_state); ?><?= $service->service_handled ? ' handled' : '' ?>">
             <td class="state"><?= Service::getStateText($service->service_state, true); ?><br /></td>
+
             <td>
+
                 <?php if (!$service->service_handled && $service->service_state > 0): ?>
                     <?= $this->icon('attention-alt', $this->translate('Unhandled')) ?>
                 <?php endif ?>
@@ -60,6 +62,7 @@ use Icinga\Web\Url;
                 <?php if (isset($service->service_last_comment) && $service->service_last_comment !== null): ?>
                     <?= $this->icon('comment', $this->translate('Last Comment: ') . $service->service_last_comment) ?>
                 <?php endif ?>
+
             </td>
             <td class="name oneline"><?= $this->escape($service->getName()); ?></td>
             <td class="name oneline"><?= $this->escape($service->getHost()->getName()); ?></b></td>
@@ -72,7 +75,7 @@ use Icinga\Web\Url;
         <td class="state">
         <div data-title-rich="<span align='left'><?= join('<br>', $hiddenRich) ?></span>"
               title="<?= join(', ', $hidden) ?>">
-              <?= sprintf(t('%d more ...'), count($hidden)) ?>
+              <?= sprintf($this->translate('%d more ...'), count($hidden)) ?>
         </div>
         </td>
         </tr>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index d35125254..08e1737f3 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -21,7 +21,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
     <?php if (($serviceCount = count($objects)) === 0): ?>
         <?= $this->translate('No services matching the filter'); ?>
     <?php else: ?>
-        <?= sprintf(t('Issue commands to all %d selected services:'), count($objects)) ?>
+        <?= sprintf($this->translate('Issue commands to all %d selected services:'), count($objects)) ?>
 
         <p>
         <div>
@@ -30,7 +30,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 
         <div>
             <?= $this->qlink(
-                $this->translate('Reschedule the next check'),
+                $this->translate('Reschedule next checks'),
                 $rescheduleAllLink,
                 null,
                 array('icon' => 'reschedule')
@@ -39,7 +39,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 
         <div>
             <?= $this->qlink(
-                $this->translate('Schedule a downtime'),
+                $this->translate('Schedule downtimes'),
                 $downtimeAllLink,
                 null,
                 array('icon' => 'plug')
@@ -48,7 +48,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 
         <div>
             <?= $this->qlink(
-                $this->translate('Submit a passive check result'),
+                $this->translate('Submit passive check results'),
                 $processCheckResultAllLink,
                 null,
                 array('icon' => 'reply')
@@ -57,7 +57,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 
         <div>
             <?= $this->qlink(
-                $this->translate('Add a comment'),
+                $this->translate('Add comments'),
                 $addCommentLink,
                 null,
                 array('icon' => 'comment')
@@ -76,7 +76,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
                     ) ?>
             </h3>
 
-            <p><?= sprintf(t('There are %s unhandled problems. ' .
+            <p><?= sprintf($this->translate('There are %s unhandled problems. ' .
                     'Issue commands to the problematic services:'),
                     '<span class="badge badge-critical">' . $unhandledCount . '</span>') ?>
 
@@ -149,7 +149,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 
 <?php $commentCount = count($objects->getComments()) ?>
 <?php if ($commentCount > 0): ?>
-    <h3> <?= $this->icon('comment') ?> <?= t('Comments') ?> </h3>
+    <h3> <?= $this->icon('comment') ?> <?= $this->translate('Comments') ?> </h3>
     <p><?= sprintf(
             $this->translatePlural(
                 'There is %d comment.',

From cddcde9494f548d0b1f193017f91e1e657ef1507 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 6 Mar 2015 15:41:25 +0100
Subject: [PATCH 0900/2920] Setup: Automatically check the respective admin
 account type selection

resolves #8603
---
 .../views/scripts/form/setup-admin-account.phtml  | 12 ++++++------
 public/js/icinga/events.js                        | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/modules/setup/application/views/scripts/form/setup-admin-account.phtml b/modules/setup/application/views/scripts/form/setup-admin-account.phtml
index 55767e96f..77220017c 100644
--- a/modules/setup/application/views/scripts/form/setup-admin-account.phtml
+++ b/modules/setup/application/views/scripts/form/setup-admin-account.phtml
@@ -20,12 +20,12 @@ $showRadioBoxes = strpos(strtolower(get_class($radioElem)), 'radio') !== false;
 <?php if (($byNameElem = $form->getElement('by_name')) !== null): ?>
   <div>
     <div class="instructions">
-      <?= $byNameElem; ?>
+      <?= $showRadioBoxes ? $byNameElem->setAttrib('data-related-radiobtn', 'by_name') : $byNameElem; ?>
     </div>
 <?php if ($showRadioBoxes): ?>
     <div class="radiobox">
       <label>
-        <input type="radio" name="user_type" value="by_name"<?= $radioElem->getValue() === 'by_name' ? ' checked' : ''; ?> class="autosubmit" aria-required="true" required>
+        <input type="radio" id="by_name" name="user_type" value="by_name"<?= $radioElem->getValue() === 'by_name' ? ' checked' : ''; ?> class="autosubmit" aria-required="true" required>
         <?= $radioElem->getMultiOption('by_name'); ?>
       </label>
     </div>
@@ -35,12 +35,12 @@ $showRadioBoxes = strpos(strtolower(get_class($radioElem)), 'radio') !== false;
 <?php if (($existingUserElem = $form->getElement('existing_user')) !== null): ?>
   <div>
     <div class="instructions">
-      <?= $existingUserElem; ?>
+      <?= $showRadioBoxes ? $byNameElem->setAttrib('data-related-radiobtn', 'existing_user') : $existingUserElem; ?>
     </div>
 <?php if ($showRadioBoxes): ?>
     <div class="radiobox">
       <label>
-        <input type="radio" name="user_type" value="existing_user"<?= $radioElem->getValue() === 'existing_user' ? ' checked' : ''; ?> class="autosubmit" aria-required="true" required>
+        <input type="radio" id="existing_user" name="user_type" value="existing_user"<?= $radioElem->getValue() === 'existing_user' ? ' checked' : ''; ?> class="autosubmit" aria-required="true" required>
         <?= $radioElem->getMultiOption('existing_user'); ?>
       </label>
     </div>
@@ -50,14 +50,14 @@ $showRadioBoxes = strpos(strtolower(get_class($radioElem)), 'radio') !== false;
 <?php if (($newUserElem = $form->getElement('new_user')) !== null): ?>
   <div>
     <div class="instructions">
-      <?= $newUserElem; ?>
+      <?= $showRadioBoxes ? $newUserElem->setAttrib('data-related-radiobtn', 'new_user') : $newUserElem; ?>
       <?= $form->getElement('new_user_password'); ?>
       <?= $form->getElement('new_user_2ndpass'); ?>
     </div>
 <?php if ($showRadioBoxes): ?>
     <div class="radiobox">
       <label>
-        <input type="radio" name="user_type" value="new_user"<?= $radioElem->getValue() === 'new_user' ? ' checked' : ''; ?> class="autosubmit" aria-required="true" required>
+        <input type="radio" id="new_user" name="user_type" value="new_user"<?= $radioElem->getValue() === 'new_user' ? ' checked' : ''; ?> class="autosubmit" aria-required="true" required>
         <?= $radioElem->getMultiOption('new_user'); ?>
       </label>
     </div>
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index e4c1e54a0..c7674a63d 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -125,6 +125,10 @@
             $(document).on('change', 'form select.autosubmit', { self: this }, this.autoSubmitForm);
             $(document).on('change', 'form input.autosubmit', { self: this }, this.autoSubmitForm);
 
+            // Automatically check a radio button once a specific input is focused
+            $(document).on('focus', 'form select[data-related-radiobtn]', { self: this }, this.autoCheckRadioButton);
+            $(document).on('focus', 'form input[data-related-radiobtn]', { self: this }, this.autoCheckRadioButton);
+
             $(document).on('keyup', '#menu input.search', {self: this}, this.autoSubmitSearch);
 
             $(document).on('click', '.tree .handle', { self: this }, this.treeNodeToggle);
@@ -163,6 +167,15 @@
             icinga.ui.fixControls();
         },
 
+        autoCheckRadioButton: function (event) {
+            var $input = $(event.currentTarget);
+            var $radio = $('#' + $input.attr('data-related-radiobtn'));
+            if ($radio.length) {
+                $radio.prop('checked', true);
+            }
+            return true;
+        },
+
         autoSubmitSearch: function(event) {
             var self = event.data.self;
             if ($('#menu input.search').val() === self.searchValue) {
@@ -560,6 +573,8 @@
             $(document).off('submit', 'form', this.submitForm);
             $(document).off('change', 'form select.autosubmit', this.submitForm);
             $(document).off('change', 'form input.autosubmit', this.submitForm);
+            $(document).off('focus', 'form select[data-related-radiobtn]', this.autoCheckRadioButton);
+            $(document).off('focus', 'form input[data-related-radiobtn]', this.autoCheckRadioButton);
         },
 
         destroy: function() {

From 9c45e99b5731b7b8336f066ce6e0f2b3c64ad4f4 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 6 Mar 2015 16:13:00 +0100
Subject: [PATCH 0901/2920] Add tiny statesummary to service multi-view

refs #8565
---
 .../controllers/HostsController.php           | 19 +++++---
 .../views/scripts/hosts/show.phtml            |  7 +--
 .../partials/host/objects-header.phtml        |  6 +--
 .../partials/host/objects-tinysummary.phtml   | 44 +++++++++++++++++++
 .../partials/service/objects-header.phtml     |  1 -
 modules/monitoring/public/css/module.less     | 12 +++++
 6 files changed, 71 insertions(+), 18 deletions(-)
 create mode 100644 modules/monitoring/application/views/scripts/partials/host/objects-tinysummary.phtml

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index eaa3d03a4..ec4e470a2 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -111,14 +111,19 @@ class Monitoring_HostsController extends Controller
         $objectsInDowntime = array();
         $downtimeFilterExpressions = array();
         $hostStates = array(
-            Host::getStateText(Host::STATE_UP) => 0,
-            Host::getStateText(Host::STATE_DOWN) => 0,
-            Host::getStateText(Host::STATE_UNREACHABLE) => 0,
-            Host::getStateText(Host::STATE_PENDING) => 0,
+            'hosts_' . Host::getStateText(Host::STATE_UP) => 0,
+            'hosts_' . Host::getStateText(Host::STATE_UP) . '_unhandled' => 0,
+            'hosts_' . Host::getStateText(Host::STATE_DOWN) => 0,
+            'hosts_' . Host::getStateText(Host::STATE_DOWN) . '_unhandled' => 0,
+            'hosts_' . Host::getStateText(Host::STATE_UNREACHABLE) => 0,
+            'hosts_' . Host::getStateText(Host::STATE_UNREACHABLE) . '_unhandled' => 0,
+            'hosts_' . Host::getStateText(Host::STATE_PENDING) => 0,
+            'hosts_' . Host::getStateText(Host::STATE_PENDING) . '_unhandled' => 0,
         );
         foreach ($this->hostList as $host) {
             /** @var Host $host */
-            if ((bool) $host->problem === true && (bool) $host->handled === false) {
+            $unhandled = (bool) $host->problem === true && (bool) $host->handled === false;
+            if ($unhandled) {
                 $unhandledObjects[] = $host;
                 $unhandledFilterExpressions[] = Filter::where('host', $host->getName());
             }
@@ -129,7 +134,7 @@ class Monitoring_HostsController extends Controller
                 $objectsInDowntime[] = $host;
                 $downtimeFilterExpressions[] = Filter::where('downtime_host', $host->getName());
             }
-            ++$hostStates[$host::getStateText($host->state)];
+            ++$hostStates['hosts_' . $host::getStateText($host->state) . ($unhandled ? '_unhandled' : '')];
         }
         if (! empty($acknowledgedObjects)) {
             $removeAckForm = new RemoveAcknowledgementCommandForm();
@@ -145,7 +150,7 @@ class Monitoring_HostsController extends Controller
         $this->view->processCheckResultAllLink = Url::fromRequest()->setPath('monitoring/hosts/process-check-result');
         $this->view->addCommentLink = Url::fromRequest()->setPath('monitoring/hosts/add-comment');
         $this->view->deleteCommentLink = Url::fromRequest()->setPath('monitoring/hosts/delete-comment');
-        $this->view->hostStates = $hostStates;
+        $this->view->hostStates = (object)$hostStates;
         $this->view->objects = $this->hostList;
         $this->view->unhandledObjects = $unhandledObjects;
         $unhandledFilterQueryString = Filter::matchAny($unhandledFilterExpressions)->toQueryString();
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index c8a4f9484..f4ac40904 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -8,12 +8,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
         <?= $tabs; ?>
     <?php endif ?>
 
-    <h1>
-      <?= $this->qlink(
-         sprintf($this->translate('%d Hosts Selected'), count($objects)),
-         $listAllLink
-      ); ?>
-    </h1>
+    <?= $this->render('partials/host/objects-tinysummary.phtml') ?>
     <?= $this->render('partials/host/objects-header.phtml'); ?>
 
 </div>
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index c2f016ceb..d535f367e 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -2,14 +2,12 @@
 use Icinga\Module\Monitoring\Object\Host;
 ?>
 
-
 <?php
 $i = 0;
 $hidden = array();
 $hiddenRich = array();
 ?>
 
-
 <?php if (($hostCount = count($objects)) > 0): ?>
 
     <p>
@@ -71,8 +69,8 @@ $hiddenRich = array();
 
         <?php if (count($hidden)): ?>
             <tr>
-                <td>
-                    <div class="selection-info" data-title-rich="<span align='left'><?= join('<br>', $hiddenRich) ?></span>"
+                <td class="state">
+                    <div data-title-rich="<span align='left'><?= join('<br>', $hiddenRich) ?></span>"
                          title="<?= join(', ', $hidden) ?>">
                         <?= sprintf($this->translate('%d more ...'), count($hidden)) ?>
                     </div>
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-tinysummary.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-tinysummary.phtml
new file mode 100644
index 000000000..fa841c633
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-tinysummary.phtml
@@ -0,0 +1,44 @@
+<?php
+use Icinga\Web\Url;
+?>
+
+<h1 class="tinystatesummary">
+    <?= $this->qlink(
+        sprintf($this->translate('%d Hosts Selected:'), count($objects)),
+        $listAllLink
+    ); ?>
+
+    <span class="badges">
+    <?php if ($hostStates->hosts_up): ?>
+
+        <?php $selfUrl = Url::fromPath('monitoring/list/hosts'); ?>
+        <span class="state up"><b>
+                <?= $hostStates->hosts_up ?>
+            </b></span>
+    <?php endif ?>
+
+
+    <?php
+    foreach (
+        array(
+            1 => 'down',
+            2 => 'unreachable',
+            99 => 'pending'
+        ) as $stateId => $state) {
+
+        $stateName = 'hosts_' . $state;
+        $unhandledStateName = $stateName . '_unhandled';
+        if ($hostStates->$unhandledStateName) {
+            echo '<span class="state ' . $state . '"><b>' . $hostStates->$unhandledStateName . '</b>';
+        }
+        if ($hostStates->$stateName) {
+            echo '<span class="state ' . $state . ' handled"><b>' . $hostStates->$stateName . '</b></span>';
+        }
+        if ($hostStates->$unhandledStateName) {
+            echo '</span>';
+        }
+        $stateName .= '_unhandled';
+    }?>
+
+    </span>
+</h1>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index 4501f0e7e..dd206a646 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -1,6 +1,5 @@
 <?php
 use Icinga\Module\Monitoring\Object\Service;
-use Icinga\Web\Url;
 ?>
 
 <?php
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index eb598bb5d..05f1dc338 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -129,14 +129,26 @@ span.state.ok {
     background: @colorOk;
 }
 
+span.state.up {
+  background: @colorOk;
+}
+
 span.state.critical {
     background: @colorCritical;
 }
 
+span.state.down {
+  background: @colorCritical;
+}
+
 span.state.handled.critical {
     background: @colorCriticalHandled;
 }
 
+span.state.handled.down {
+  background: @colorCriticalHandled;
+}
+
 span.state.warning {
     background: @colorWarning;
 }

From 1cfcb934b097846ed7d9be361129b785d44ea406 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 6 Mar 2015 17:30:59 +0100
Subject: [PATCH 0902/2920] Deduplicate state summary

Use existing partials for rendering the state summary instead of a new one.

refs #8565
---
 .../controllers/HostsController.php           | 14 +-----
 .../controllers/ServicesController.php        | 36 +--------------
 .../views/scripts/hosts/show.phtml            |  2 +-
 .../partials/host/objects-tinysummary.phtml   | 44 -------------------
 .../service/objects-tinysummary.phtml         | 42 ------------------
 .../views/scripts/services/show.phtml         |  2 +-
 .../library/Monitoring/Object/HostList.php    | 27 ++++++++++++
 .../library/Monitoring/Object/ObjectList.php  | 11 +++++
 .../library/Monitoring/Object/ServiceList.php | 42 ++++++++++++++++++
 9 files changed, 86 insertions(+), 134 deletions(-)
 delete mode 100644 modules/monitoring/application/views/scripts/partials/host/objects-tinysummary.phtml
 delete mode 100644 modules/monitoring/application/views/scripts/partials/service/objects-tinysummary.phtml

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index ec4e470a2..55f8a6e60 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -110,16 +110,7 @@ class Monitoring_HostsController extends Controller
         $acknowledgedObjects = array();
         $objectsInDowntime = array();
         $downtimeFilterExpressions = array();
-        $hostStates = array(
-            'hosts_' . Host::getStateText(Host::STATE_UP) => 0,
-            'hosts_' . Host::getStateText(Host::STATE_UP) . '_unhandled' => 0,
-            'hosts_' . Host::getStateText(Host::STATE_DOWN) => 0,
-            'hosts_' . Host::getStateText(Host::STATE_DOWN) . '_unhandled' => 0,
-            'hosts_' . Host::getStateText(Host::STATE_UNREACHABLE) => 0,
-            'hosts_' . Host::getStateText(Host::STATE_UNREACHABLE) . '_unhandled' => 0,
-            'hosts_' . Host::getStateText(Host::STATE_PENDING) => 0,
-            'hosts_' . Host::getStateText(Host::STATE_PENDING) . '_unhandled' => 0,
-        );
+
         foreach ($this->hostList as $host) {
             /** @var Host $host */
             $unhandled = (bool) $host->problem === true && (bool) $host->handled === false;
@@ -134,7 +125,6 @@ class Monitoring_HostsController extends Controller
                 $objectsInDowntime[] = $host;
                 $downtimeFilterExpressions[] = Filter::where('downtime_host', $host->getName());
             }
-            ++$hostStates['hosts_' . $host::getStateText($host->state) . ($unhandled ? '_unhandled' : '')];
         }
         if (! empty($acknowledgedObjects)) {
             $removeAckForm = new RemoveAcknowledgementCommandForm();
@@ -150,7 +140,7 @@ class Monitoring_HostsController extends Controller
         $this->view->processCheckResultAllLink = Url::fromRequest()->setPath('monitoring/hosts/process-check-result');
         $this->view->addCommentLink = Url::fromRequest()->setPath('monitoring/hosts/add-comment');
         $this->view->deleteCommentLink = Url::fromRequest()->setPath('monitoring/hosts/delete-comment');
-        $this->view->hostStates = (object)$hostStates;
+        $this->view->stats = (object)$this->hostList->getStateSummary();
         $this->view->objects = $this->hostList;
         $this->view->unhandledObjects = $unhandledObjects;
         $unhandledFilterQueryString = Filter::matchAny($unhandledFilterExpressions)->toQueryString();
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 1514a0ea0..dcd95184c 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -132,35 +132,10 @@ class Monitoring_ServicesController extends Controller
         $acknowledgedObjects = array();
         $objectsInDowntime = array();
         $downtimeFilterExpressions = array();
-        $serviceStates = array(
-            'services_' . Service::getStateText(Service::STATE_OK) => 0,
-            'services_' . Service::getStateText(Service::STATE_OK) . '_unhandled' => 0,
-            'services_' . Service::getStateText(Service::STATE_WARNING) => 0,
-            'services_' . Service::getStateText(Service::STATE_WARNING) . '_unhandled' => 0,
-            'services_' . Service::getStateText(Service::STATE_CRITICAL) => 0,
-            'services_' . Service::getStateText(Service::STATE_CRITICAL) . '_unhandled' => 0,
-            'services_' .  Service::getStateText(Service::STATE_UNKNOWN) => 0,
-            'services_' .  Service::getStateText(Service::STATE_UNKNOWN) . '_unhandled' => 0,
-            'services_' .  Service::getStateText(Service::STATE_PENDING) => 0,
-            'services_' .  Service::getStateText(Service::STATE_PENDING) . '_unhandled' => 0
-        );
-        $knownHostStates = array();
-        $hostStates = array(
-            'hosts_' . Host::getStateText(Host::STATE_UP) => 0,
-            'hosts_' . Host::getStateText(Host::STATE_UP) . '_unhandled' => 0,
-            'hosts_' . Host::getStateText(Host::STATE_DOWN) => 0,
-            'hosts_' . Host::getStateText(Host::STATE_DOWN) . '_unhandled' => 0,
-            'hosts_' . Host::getStateText(Host::STATE_UNREACHABLE) => 0,
-            'hosts_' . Host::getStateText(Host::STATE_UNREACHABLE) . '_unhandled' => 0,
-            'hosts_' . Host::getStateText(Host::STATE_PENDING) => 0,
-            'hosts_' . Host::getStateText(Host::STATE_PENDING) . '_unhandled' => 0
-        );
-        foreach ($this->serviceList as $service) {
-            $unhandled = false;
 
+        foreach ($this->serviceList as $service) {
             /** @var Service $service */
             if ((bool) $service->problem === true && (bool) $service->handled === false) {
-                $unhandled = true;
                 $unhandledObjects[] = $service;
                 $unhandledFilterExpressions[] = Filter::matchAll(
                     Filter::where('host', $service->getHost()->getName()),
@@ -177,12 +152,6 @@ class Monitoring_ServicesController extends Controller
                     Filter::where('downtime_service', $service->getName())
                 );
             }
-
-            ++$serviceStates['services_' . $service::getStateText($service->state) . ($unhandled ? '_unhandled' : '')];
-            if (! isset($knownHostStates[$service->getHost()->getName()])) {
-                $knownHostStates[$service->getHost()->getName()] = true;
-                ++$hostStates['hosts_' . $service->getHost()->getStateText($service->host_state)];
-            }
         }
         if (! empty($acknowledgedObjects)) {
             $removeAckForm = new RemoveAcknowledgementCommandForm();
@@ -208,8 +177,7 @@ class Monitoring_ServicesController extends Controller
         );
         $this->view->addCommentLink = Url::fromRequest()->setPath('monitoring/services/add-comment');
         $this->view->deleteCommentLink = Url::fromRequest()->setPath('monitoring/services/delete-comment');
-        $this->view->hostStates = (object)$hostStates;
-        $this->view->serviceStates = (object)$serviceStates;
+        $this->view->stats = $this->serviceList->getStateSummary();
         $this->view->objects = $this->serviceList;
         $this->view->unhandledObjects = $unhandledObjects;
         $unhandledFilterQueryString = Filter::matchAny($unhandledFilterExpressions)->toQueryString();
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index f4ac40904..d56f92af4 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -8,7 +8,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
         <?= $tabs; ?>
     <?php endif ?>
 
-    <?= $this->render('partials/host/objects-tinysummary.phtml') ?>
+    <?= $this->render('list/components/hostssummary.phtml') ?>
     <?= $this->render('partials/host/objects-header.phtml'); ?>
 
 </div>
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-tinysummary.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-tinysummary.phtml
deleted file mode 100644
index fa841c633..000000000
--- a/modules/monitoring/application/views/scripts/partials/host/objects-tinysummary.phtml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-use Icinga\Web\Url;
-?>
-
-<h1 class="tinystatesummary">
-    <?= $this->qlink(
-        sprintf($this->translate('%d Hosts Selected:'), count($objects)),
-        $listAllLink
-    ); ?>
-
-    <span class="badges">
-    <?php if ($hostStates->hosts_up): ?>
-
-        <?php $selfUrl = Url::fromPath('monitoring/list/hosts'); ?>
-        <span class="state up"><b>
-                <?= $hostStates->hosts_up ?>
-            </b></span>
-    <?php endif ?>
-
-
-    <?php
-    foreach (
-        array(
-            1 => 'down',
-            2 => 'unreachable',
-            99 => 'pending'
-        ) as $stateId => $state) {
-
-        $stateName = 'hosts_' . $state;
-        $unhandledStateName = $stateName . '_unhandled';
-        if ($hostStates->$unhandledStateName) {
-            echo '<span class="state ' . $state . '"><b>' . $hostStates->$unhandledStateName . '</b>';
-        }
-        if ($hostStates->$stateName) {
-            echo '<span class="state ' . $state . ' handled"><b>' . $hostStates->$stateName . '</b></span>';
-        }
-        if ($hostStates->$unhandledStateName) {
-            echo '</span>';
-        }
-        $stateName .= '_unhandled';
-    }?>
-
-    </span>
-</h1>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-tinysummary.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-tinysummary.phtml
deleted file mode 100644
index 7707651d2..000000000
--- a/modules/monitoring/application/views/scripts/partials/service/objects-tinysummary.phtml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-use Icinga\Web\Url;
-?>
-
-<h1 class="tinystatesummary">
-    <?= $this->qlink(
-        sprintf($this->translate('%d Services Selected:'), count($objects)),
-        $listAllLink
-    ); ?>
-
-    <span class="badges">
-    <?php if ($serviceStates->services_ok): ?>
-        <?php $selfUrl = Url::fromPath('monitoring/list/services'); ?>
-        <span class="state ok"><b>
-                <?= $serviceStates->services_ok ?>
-            </b></span>
-    <?php endif ?>
-
-        <?php
-        foreach (
-            array(
-                2 => 'critical',
-                3 => 'unknown',
-                1 => 'warning',
-                4 => 'pending'
-            ) as $stateId => $state) {
-
-            $stateName = 'services_' . $state;
-            $unhandledStateName = $stateName . '_unhandled';
-            if ($serviceStates->$unhandledStateName) {
-                echo '<span class="state ' . $state . '"><b>' . $serviceStates->$unhandledStateName . '</b>';
-            }
-            if ($serviceStates->$stateName) {
-                echo '<span class="state ' . $state . ' handled"><b>' . $serviceStates->$stateName . '</b></span>';
-            }
-            if ($serviceStates->$unhandledStateName) {
-                echo '</span>';
-            }
-            $stateName .= '_unhandled';
-        }?>
-    </span>
-</h1>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 08e1737f3..1daa1a956 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -8,7 +8,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
         <?= $tabs; ?>
     <?php endif ?>
 
-    <?= $this->render('partials/service/objects-tinysummary.phtml') ?>
+    <?= $this->render('list/components/servicesummary.phtml') ?>
     <?= $this->render('partials/service/objects-header.phtml'); ?>
 
 </div>
diff --git a/modules/monitoring/library/Monitoring/Object/HostList.php b/modules/monitoring/library/Monitoring/Object/HostList.php
index f0adced24..94157b6fc 100644
--- a/modules/monitoring/library/Monitoring/Object/HostList.php
+++ b/modules/monitoring/library/Monitoring/Object/HostList.php
@@ -25,4 +25,31 @@ class HostList extends ObjectList
         }
         return $hosts;
     }
+
+    /**
+     * Create a state summary of all hosts that can be consumed by hostssummary.phtml
+     *
+     * @return object   The summary
+     */
+    public function getStateSummary()
+    {
+        $hostStates = $this->prepareStateNames('hosts_', array(
+            Host::getStateText(Host::STATE_UP),
+            Host::getStateText(Host::STATE_DOWN),
+            Host::getStateText(Host::STATE_UNREACHABLE),
+            Host::getStateText(Host::STATE_PENDING)
+        ));
+
+        foreach ($this as $host) {
+            $unhandled = (bool) $host->problem === true && (bool) $host->handled === false;
+
+            $stateName = 'hosts_' . $host::getStateText($host->state);
+            ++$hostStates[$stateName];
+            ++$hostStates[$stateName. ($unhandled ? '_unhandled' : '_handled')];
+        }
+
+        $hostStates['hosts_total'] = count($this);
+
+        return (object)$hostStates;
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/Object/ObjectList.php b/modules/monitoring/library/Monitoring/Object/ObjectList.php
index 146499805..234ccb9bb 100644
--- a/modules/monitoring/library/Monitoring/Object/ObjectList.php
+++ b/modules/monitoring/library/Monitoring/Object/ObjectList.php
@@ -85,4 +85,15 @@ abstract class ObjectList implements Countable, IteratorAggregate
     {
         return $this->backend->select()->from('comment')->applyFilter($this->filter);
     }
+
+    protected  function prepareStateNames($prefix, array $names) {
+        $new = array();
+        foreach ($names as $name) {
+            $new[$prefix . $name] = 0;
+            $new[$prefix . $name . '_handled'] = 0;
+            $new[$prefix . $name . '_unhandled'] = 0;
+        }
+        $new[$prefix . 'total'] = 0;
+        return $new;
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/Object/ServiceList.php b/modules/monitoring/library/Monitoring/Object/ServiceList.php
index d9ffa0d8e..0625ae0f8 100644
--- a/modules/monitoring/library/Monitoring/Object/ServiceList.php
+++ b/modules/monitoring/library/Monitoring/Object/ServiceList.php
@@ -25,4 +25,46 @@ class ServiceList extends ObjectList
         }
         return $services;
     }
+
+    /**
+     * Create a state summary of all services that can be consumed by servicesummary.phtml
+     *
+     * @return object   The summary
+     */
+    public function getStateSummary()
+    {
+        $serviceStates = $this->prepareStateNames('services_', array(
+            Service::getStateText(Service::STATE_OK),
+            Service::getStateText(Service::STATE_WARNING),
+            Service::getStateText(Service::STATE_CRITICAL),
+            Service::getStateText(Service::STATE_UNKNOWN),
+            Service::getStateText(Service::STATE_PENDING),
+        ));
+
+        $hostStates = $this->prepareStateNames('hosts_', array(
+            Host::getStateText(Host::STATE_UP),
+            Host::getStateText(Host::STATE_DOWN),
+            Host::getStateText(Host::STATE_UNREACHABLE),
+            Host::getStateText(Host::STATE_PENDING),
+        ));
+
+        foreach ($this as $service) {
+            $unhandled = false;
+            if ((bool) $service->problem === true && (bool) $service->handled === false) {
+                $unhandled = true;
+            }
+
+            $stateName = 'services_' . $service::getStateText($service->state);
+            ++$serviceStates[$stateName];
+            ++$serviceStates[$stateName . ($unhandled ? '_unhandled' : '_handled')];
+            if (! isset($knownHostStates[$service->getHost()->getName()])) {
+                $knownHostStates[$service->getHost()->getName()] = true;
+                ++$hostStates['hosts_' . $service->getHost()->getStateText($service->host_state)];
+            }
+        }
+
+        $serviceStates['services_total'] = count($this);
+
+        return (object)$serviceStates;
+    }
 }

From 266e781a93d77473a0bc3c02a7cdcafb9df63d4b Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 6 Mar 2015 17:52:06 +0100
Subject: [PATCH 0903/2920] Deduplicate Hosts and Services-Controller

Create functions in abstract class for filtering hosts and services, instead of reimplementing it in the controller.
---
 .../controllers/HostsController.php           | 30 +++++---------
 .../controllers/ServicesController.php        | 41 ++++++++-----------
 .../library/Monitoring/Object/ObjectList.php  | 33 +++++++++++++++
 3 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 55f8a6e60..ecbf6cf71 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -105,27 +105,19 @@ class Monitoring_HostsController extends Controller
             'host_active_checks_enabled',
             'host_obsessing'*/
         ));
-        $unhandledObjects = array();
+        $unhandledObjects = $this->hostList->getUnhandledObjects();
         $unhandledFilterExpressions = array();
-        $acknowledgedObjects = array();
-        $objectsInDowntime = array();
-        $downtimeFilterExpressions = array();
-
-        foreach ($this->hostList as $host) {
-            /** @var Host $host */
-            $unhandled = (bool) $host->problem === true && (bool) $host->handled === false;
-            if ($unhandled) {
-                $unhandledObjects[] = $host;
-                $unhandledFilterExpressions[] = Filter::where('host', $host->getName());
-            }
-            if ((bool) $host->acknowledged === true) {
-                $acknowledgedObjects[] = $host;
-            }
-            if ((bool) $host->in_downtime === true) {
-                $objectsInDowntime[] = $host;
-                $downtimeFilterExpressions[] = Filter::where('downtime_host', $host->getName());
-            }
+        foreach ($unhandledObjects as $object) {
+            $unhandledFilterExpressions[] = Filter::where('host', $object->getName());
         }
+
+        $objectsInDowntime = $this->hostList->getObjectsInDowntime();
+        $downtimeFilterExpressions = array();
+        foreach ($objectsInDowntime as $object) {
+            $downtimeFilterExpressions[] = Filter::where('downtime_host', $object->getName());
+        }
+
+        $acknowledgedObjects = $this->hostList->getAcknowledgedObjects();
         if (! empty($acknowledgedObjects)) {
             $removeAckForm = new RemoveAcknowledgementCommandForm();
             $removeAckForm
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index dcd95184c..691897a57 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -127,32 +127,25 @@ class Monitoring_ServicesController extends Controller
             'service_active_checks_enabled',
             'service_obsessing'*/
         ));
-        $unhandledObjects = array();
+        $unhandledObjects = $this->serviceList->getUnhandledObjects();
         $unhandledFilterExpressions = array();
-        $acknowledgedObjects = array();
-        $objectsInDowntime = array();
-        $downtimeFilterExpressions = array();
-
-        foreach ($this->serviceList as $service) {
-            /** @var Service $service */
-            if ((bool) $service->problem === true && (bool) $service->handled === false) {
-                $unhandledObjects[] = $service;
-                $unhandledFilterExpressions[] = Filter::matchAll(
-                    Filter::where('host', $service->getHost()->getName()),
-                    Filter::where('service', $service->getName())
-                );
-            }
-            if ((bool) $service->acknowledged === true) {
-                $acknowledgedObjects[] = $service;
-            }
-            if ((bool) $service->in_downtime === true) {
-                $objectsInDowntime[] = $service;
-                $downtimeFilterExpressions[] = Filter::matchAll(
-                    Filter::where('downtime_host', $service->getHost()->getName()),
-                    Filter::where('downtime_service', $service->getName())
-                );
-            }
+        foreach ($unhandledObjects as $service) {
+            $unhandledFilterExpressions[] = Filter::matchAll(
+                Filter::where('host', $service->getHost()->getName()),
+                Filter::where('service', $service->getName())
+            );
         }
+
+        $objectsInDowntime = $this->serviceList->getObjectsInDowntime();
+        $downtimeFilterExpressions = array();
+        foreach ($objectsInDowntime as $service) {
+            $downtimeFilterExpressions[] = Filter::matchAll(
+                Filter::where('downtime_host', $service->getHost()->getName()),
+                Filter::where('downtime_service', $service->getName())
+            );
+        }
+
+        $acknowledgedObjects = $this->serviceList->getAcknowledgedObjects();
         if (! empty($acknowledgedObjects)) {
             $removeAckForm = new RemoveAcknowledgementCommandForm();
             $removeAckForm
diff --git a/modules/monitoring/library/Monitoring/Object/ObjectList.php b/modules/monitoring/library/Monitoring/Object/ObjectList.php
index 234ccb9bb..f28dded91 100644
--- a/modules/monitoring/library/Monitoring/Object/ObjectList.php
+++ b/modules/monitoring/library/Monitoring/Object/ObjectList.php
@@ -86,6 +86,39 @@ abstract class ObjectList implements Countable, IteratorAggregate
         return $this->backend->select()->from('comment')->applyFilter($this->filter);
     }
 
+    public function getAcknowledgedObjects()
+    {
+        $acknowledgedObjects = array();
+        foreach ($this as $object) {
+            if ((bool) $object->acknowledged === true) {
+                $acknowledgedObjects[] = $object;
+            }
+        }
+        return $acknowledgedObjects;
+    }
+
+    public function getObjectsInDowntime()
+    {
+        $objectsInDowntime = array();
+        foreach ($this as $object) {
+            if ((bool) $object->in_downtime === true) {
+                $objectsInDowntime[] = $object;
+            }
+        }
+        return $objectsInDowntime;
+    }
+
+    public function getUnhandledObjects()
+    {
+        $unhandledObjects = array();
+        foreach ($this as $object) {
+            if ((bool) $object->problem === true && (bool) $object->handled === false) {
+                $unhandledObjects[] = $object;
+            }
+        }
+        return $unhandledObjects;
+    }
+
     protected  function prepareStateNames($prefix, array $names) {
         $new = array();
         foreach ($names as $name) {

From 95a83a41bd80a1b41aa94cb4b8b200f0eadb38ba Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 6 Mar 2015 18:03:56 +0100
Subject: [PATCH 0904/2920] Provide a link back to all selected objects in
 multi-views

refs #8565
---
 .../monitoring/application/controllers/HostsController.php | 3 ++-
 .../views/scripts/partials/host/objects-header.phtml       | 7 ++++++-
 .../views/scripts/partials/service/objects-header.phtml    | 7 ++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index ecbf6cf71..b8e36e2b0 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -39,6 +39,7 @@ class Monitoring_HostsController extends Controller
                 'icon'  => 'host'
             )
         )->activate('show');
+        $this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/hosts');
     }
 
     protected function handleCommandForm(ObjectsCommandForm $form)
@@ -125,8 +126,8 @@ class Monitoring_HostsController extends Controller
                 ->handleRequest();
             $this->view->removeAckForm = $removeAckForm;
         }
+
         $this->setAutorefreshInterval(15);
-        $this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/hosts');
         $this->view->rescheduleAllLink = Url::fromRequest()->setPath('monitoring/hosts/reschedule-check');
         $this->view->downtimeAllLink = Url::fromRequest()->setPath('monitoring/hosts/schedule-downtime');
         $this->view->processCheckResultAllLink = Url::fromRequest()->setPath('monitoring/hosts/process-check-result');
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index d535f367e..322243be1 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -72,7 +72,12 @@ $hiddenRich = array();
                 <td class="state">
                     <div data-title-rich="<span align='left'><?= join('<br>', $hiddenRich) ?></span>"
                          title="<?= join(', ', $hidden) ?>">
-                        <?= sprintf($this->translate('%d more ...'), count($hidden)) ?>
+
+                        <?= $this->qlink(
+                            sprintf($this->translate('%d more ...'), count($hidden)),
+                            $listAllLink,
+                            null
+                        ) ?>
                     </div>
                 </td>
             </tr>
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index dd206a646..5580446a1 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -74,7 +74,12 @@ use Icinga\Module\Monitoring\Object\Service;
         <td class="state">
         <div data-title-rich="<span align='left'><?= join('<br>', $hiddenRich) ?></span>"
               title="<?= join(', ', $hidden) ?>">
-              <?= sprintf($this->translate('%d more ...'), count($hidden)) ?>
+
+              <?= $this->qlink(
+                  sprintf($this->translate('%d more ...'), count($hidden)),
+                  $listAllLink,
+                  null
+              ) ?>
         </div>
         </td>
         </tr>

From d414d7e3950b9e2983eb12c339f335d1c3c80879 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Sun, 8 Mar 2015 10:19:17 +0100
Subject: [PATCH 0905/2920] Fix that preferences can't be stored in a database

The mtime column is a column to update, not a column for the where condition.

fixes #8629
---
 library/Icinga/User/Preferences/Store/DbStore.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/User/Preferences/Store/DbStore.php b/library/Icinga/User/Preferences/Store/DbStore.php
index 9e012fd01..347fc81df 100644
--- a/library/Icinga/User/Preferences/Store/DbStore.php
+++ b/library/Icinga/User/Preferences/Store/DbStore.php
@@ -203,12 +203,14 @@ class DbStore extends PreferencesStore
             foreach ($preferences as $key => $value) {
                 $db->update(
                     $this->table,
-                    array(self::COLUMN_VALUE => $value),
+                    array(
+                        self::COLUMN_VALUE => $value,
+                        self::COLUMN_MODIFIED_TIME => new Zend_Db_Expr('NOW()')
+                    ),
                     array(
                         self::COLUMN_USERNAME . '=?' => $this->getUser()->getUsername(),
                         $db->quoteIdentifier(self::COLUMN_SECTION) . '=?' => $section,
-                        $db->quoteIdentifier(self::COLUMN_PREFERENCE) . '=?' => $key,
-                        self::COLUMN_MODIFIED_TIME => new Zend_Db_Expr('NOW()')
+                        $db->quoteIdentifier(self::COLUMN_PREFERENCE) . '=?' => $key
                     )
                 );
             }

From 083c1a9e6bc6a60dc14d716e63327a6b6d220782 Mon Sep 17 00:00:00 2001
From: Louis Sautier <sautier.louis@gmail.com>
Date: Sun, 8 Mar 2015 14:39:53 +0100
Subject: [PATCH 0906/2920] Fix some spelling errors in comments and messages

fixes #8633

Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
---
 library/Icinga/Application/Modules/Manager.php              | 2 +-
 library/Icinga/Chart/Axis.php                               | 2 +-
 library/Icinga/Web/Controller/BasePreferenceController.php  | 2 +-
 library/Icinga/Web/Widget/AbstractWidget.php                | 2 +-
 library/Icinga/Web/Widget/Dashboard.php                     | 4 ++--
 library/Icinga/Web/Widget/Tabs.php                          | 6 +++---
 modules/doc/module.info                                     | 2 +-
 modules/test/module.info                                    | 2 +-
 .../translation/application/clicommands/CompileCommand.php  | 2 +-
 modules/translation/doc/translation.md                      | 4 ++--
 modules/translation/module.info                             | 2 +-
 packages/debian/control                                     | 6 +++---
 test/php/library/Icinga/File/Ini/IniWriterTest.php          | 2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php
index ec2193af9..3d50df109 100644
--- a/library/Icinga/Application/Modules/Manager.php
+++ b/library/Icinga/Application/Modules/Manager.php
@@ -252,7 +252,7 @@ class Manager
     }
 
     /**
-     * Disable the given module and remove it's enabled state
+     * Disable the given module and remove its enabled state
      *
      * @param   string $name                The name of the module to disable
      *
diff --git a/library/Icinga/Chart/Axis.php b/library/Icinga/Chart/Axis.php
index 8a0ad5532..a7f8d6d5f 100644
--- a/library/Icinga/Chart/Axis.php
+++ b/library/Icinga/Chart/Axis.php
@@ -16,7 +16,7 @@ use Icinga\Chart\Unit\LinearUnit;
 /**
  * Axis class for the GridChart class.
  *
- * Implements drawing functions for the axis and it's labels but delegates tick and label calculations
+ * Implements drawing functions for the axis and its labels but delegates tick and label calculations
  * to the AxisUnit implementations
  *
  * @see GridChart
diff --git a/library/Icinga/Web/Controller/BasePreferenceController.php b/library/Icinga/Web/Controller/BasePreferenceController.php
index af8229262..84e2b045b 100644
--- a/library/Icinga/Web/Controller/BasePreferenceController.php
+++ b/library/Icinga/Web/Controller/BasePreferenceController.php
@@ -27,7 +27,7 @@ class BasePreferenceController extends ActionController
     }
 
     /**
-     *  Initialize the controller and collect all tabs for it from the application and it's modules
+     *  Initialize the controller and collect all tabs for it from the application and its modules
      *
      *  @see ActionController::init()
      */
diff --git a/library/Icinga/Web/Widget/AbstractWidget.php b/library/Icinga/Web/Widget/AbstractWidget.php
index a1c1a244e..e047d7512 100644
--- a/library/Icinga/Web/Widget/AbstractWidget.php
+++ b/library/Icinga/Web/Widget/AbstractWidget.php
@@ -26,7 +26,7 @@ abstract class AbstractWidget
 {
     /**
      * If you are going to access the current view with the view() function,
-     * it's instance is stored here for performance reasons.
+     * its instance is stored here for performance reasons.
      *
      * @var Zend_View_Abstract
      */
diff --git a/library/Icinga/Web/Widget/Dashboard.php b/library/Icinga/Web/Widget/Dashboard.php
index 00d39cd71..258c9cf2e 100644
--- a/library/Icinga/Web/Widget/Dashboard.php
+++ b/library/Icinga/Web/Widget/Dashboard.php
@@ -18,7 +18,7 @@ use Icinga\Web\Url;
  *
  * The terminology is as follows:
  * - Dashlet:     A single view showing a specific url
- * - Pane:          Aggregates one or more dashlets on one page, displays it's title as a tab
+ * - Pane:          Aggregates one or more dashlets on one page, displays its title as a tab
  * - Dashboard:     Shows all panes
  *
  */
@@ -347,7 +347,7 @@ class Dashboard extends AbstractWidget
     }
 
     /**
-     * Activates the default pane of this dashboard and returns it's name
+     * Activates the default pane of this dashboard and returns its name
      *
      * @return mixed
      */
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index e83d10783..4952d29b1 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -207,7 +207,7 @@ EOT;
      * with tab properties or an instance of an existing Tab
      *
      * @param   string      $name   The new tab name
-     * @param   array|Tab   $tab    The tab itself of it's properties
+     * @param   array|Tab   $tab    The tab itself of its properties
      *
      * @return  self
      *
@@ -232,7 +232,7 @@ EOT;
      * of an existing Tab
      *
      * @param   string      $name   The new tab name
-     * @param   array|Tab   $tab    The tab itself of it's properties
+     * @param   array|Tab   $tab    The tab itself of its properties
      *
      * @return  self
      */
@@ -279,7 +279,7 @@ EOT;
     }
 
     /**
-     * Render the dropdown area with it's tabs and return the resulting HTML
+     * Render the dropdown area with its tabs and return the resulting HTML
      *
      * @return  mixed|string
      */
diff --git a/modules/doc/module.info b/modules/doc/module.info
index 1689fd940..2c6f48ac9 100644
--- a/modules/doc/module.info
+++ b/modules/doc/module.info
@@ -1,4 +1,4 @@
 Module: doc
 Version: 2.0.0
 Description: Documentation module
- Extracts, shows and exports documentation for Icinga Web 2 and it's modules.
+ Extracts, shows and exports documentation for Icinga Web 2 and its modules.
diff --git a/modules/test/module.info b/modules/test/module.info
index 646315156..ed6adc1f2 100644
--- a/modules/test/module.info
+++ b/modules/test/module.info
@@ -2,4 +2,4 @@ Module: test
 Version: 2.0.0~alpha4
 Description: Translation module
  This module allows developers to run (unit) tests against Icinga Web 2 and
- any of it's modules. Usually you do not need to enable this.
+ any of its modules. Usually you do not need to enable this.
diff --git a/modules/translation/application/clicommands/CompileCommand.php b/modules/translation/application/clicommands/CompileCommand.php
index 4f08b2844..036769175 100644
--- a/modules/translation/application/clicommands/CompileCommand.php
+++ b/modules/translation/application/clicommands/CompileCommand.php
@@ -15,7 +15,7 @@ use Icinga\Module\Translation\Util\GettextTranslationHelper;
  * Domains are the global one 'icinga' and all available and enabled modules
  * identified by their name.
  *
- * Once a PO-file is compiled it's content is used by Icinga Web 2 to display
+ * Once a PO-file is compiled its content is used by Icinga Web 2 to display
  * messages in the configured language.
  */
 class CompileCommand extends TranslationCommand
diff --git a/modules/translation/doc/translation.md b/modules/translation/doc/translation.md
index 55dc415ad..308eae6a8 100644
--- a/modules/translation/doc/translation.md
+++ b/modules/translation/doc/translation.md
@@ -109,7 +109,7 @@ When you are done, just save your new settings.
 
 To work with Icinga Web 2 .po files, you can open for e.g. the german icinga.po file which is located under
 `application/locale/de_DE/LC_MESSAGES/icinga.po`, as shown below, you will get then a full list of all available
-translation strings for the core application. Each module names it's translation files `%module_name%.po`. For a
+translation strings for the core application. Each module names its translation files `%module_name%.po`. For a
 module called __yourmodule__ the .po translation file will be named `yourmodule.po`.
 
 
@@ -196,4 +196,4 @@ The last step is to compile the __yourmodule.po__ to the __yourmodule.mo__:
     icingacli translation compile module development ll_CC
 
 At this moment, everywhere in the module where the `Dummy` should be translated, it would returns the translated
-string `Attrappe`.
\ No newline at end of file
+string `Attrappe`.
diff --git a/modules/translation/module.info b/modules/translation/module.info
index 9934ec931..ebe121ebc 100644
--- a/modules/translation/module.info
+++ b/modules/translation/module.info
@@ -2,6 +2,6 @@ Module: translation
 Version: 2.0.0~alpha4
 Description: Translation module
  This module allows developers and translators to translate Icinga Web 2 and
- it's modules for multiple languages. You do not need this module to run an
+ its modules for multiple languages. You do not need this module to run an
  internationalized web frontend. This is only for people who want to contribute
  translations or translate just their own moduls.
diff --git a/packages/debian/control b/packages/debian/control
index 560b2ef65..73d0b57a3 100644
--- a/packages/debian/control
+++ b/packages/debian/control
@@ -24,7 +24,7 @@ Package: icingaweb-module-doc
 Architecture: any
 Depends: icingaweb-common
 Description: Icingaweb documentation module
- This module renders documentation for Icingaweb and it's modules
+ This module renders documentation for Icingaweb and its modules
 
 Package: icingaweb-module-monitoring
 Architecture: any
@@ -42,7 +42,7 @@ Package: icingaweb-module-test
 Architecture: any
 Depends: icingacli
 Description: Icingaweb test module
- Use this module to run unit tests against Icingaweb or any of it's modules
+ Use this module to run unit tests against Icingaweb or any of its modules
 
 Package: icingaweb-module-translation
 Architecture: any
@@ -54,7 +54,7 @@ Package: icingacli
 Architecture: any
 Depends: icingaweb-common, php5-cli (>= 5.3.2)
 Description: Icinga CLI tool
- The Icinga CLI allows one to access it's Icinga monitoring
+ The Icinga CLI allows one to access its Icinga monitoring
  system from a terminal. 
  .
  The CLI is based on the Icinga PHP libraries
diff --git a/test/php/library/Icinga/File/Ini/IniWriterTest.php b/test/php/library/Icinga/File/Ini/IniWriterTest.php
index 56f7fbf3f..4dc94a63a 100644
--- a/test/php/library/Icinga/File/Ini/IniWriterTest.php
+++ b/test/php/library/Icinga/File/Ini/IniWriterTest.php
@@ -726,7 +726,7 @@ EOD;
     }
 
     /**
-     * Write a INI-configuration string to a temporary file and return it's path
+     * Write a INI-configuration string to a temporary file and return its path
      *
      * @param   string      $config     The config string to write
      *

From 003a9be43d7b2e3f93e7adad75a6bde32f42ff92 Mon Sep 17 00:00:00 2001
From: Louis Sautier <sautier.louis@gmail.com>
Date: Sun, 8 Mar 2015 15:22:29 +0100
Subject: [PATCH 0907/2920] Fix external authentication with nginx

fixes #8634

Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
---
 modules/setup/library/Setup/Webserver/Nginx.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/setup/library/Setup/Webserver/Nginx.php b/modules/setup/library/Setup/Webserver/Nginx.php
index 780a3184e..524b90ebf 100644
--- a/modules/setup/library/Setup/Webserver/Nginx.php
+++ b/modules/setup/library/Setup/Webserver/Nginx.php
@@ -25,6 +25,7 @@ location ~ ^{urlPath}/index\.php(.*)$ {
   include fastcgi_params;
   fastcgi_param SCRIPT_FILENAME {documentRoot}/index.php;
   fastcgi_param ICINGAWEB_CONFIGDIR {configDir};
+  fastcgi_param REMOTE_USER $remote_user;
 }
 
 location ~ ^{urlPath}(.+)? {

From 8ef119dd39b5ec51676189dfb15a9554bfc224df Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar@beutner.name>
Date: Sun, 8 Mar 2015 15:31:52 +0100
Subject: [PATCH 0908/2920] Update AUTHORS

---
 AUTHORS | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 30365cbd0..8a0bc91d0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,6 @@
 Alexander Fuhr <alexander.fuhr@netways.de>
 Alexander Klimov <alexander.klimov@netways.de>
+ayoubabid <ayoubabid@users.noreply.github.com>
 baufrecht <baufrecht@users.noreply.github.com>
 Bernd Erk <bernd.erk@icinga.org>
 Boden Garman <boden.garman@spintel.net.au>
@@ -11,8 +12,9 @@ Goran Rakic <grakic@devbase.net>
 Gunnar Beutner <gunnar.beutner@netways.de>
 Jannis Moßhammer <jannis.mosshammer@netways.de>
 Johannes Meyer <johannes.meyer@netways.de>
-Marius Hein <marius.hein@netways.de>
+Louis Sautier <sautier.louis@gmail.com>
 Marcus Cobden <marcus@marcuscobden.co.uk>
+Marius Hein <marius.hein@netways.de>
 Markus Frosch <markus@lazyfrosch.de>
 Matthias Jentsch <matthias.jentsch@netways.de>
 Michael Friedrich <michael.friedrich@netways.de>
@@ -22,4 +24,3 @@ Sylph Lin <sylph.lin@gmail.com>
 Thomas Gelf <thomas.gelf@netways.de>
 Tom Ford <exptom@users.noreply.github.com>
 Ulf Lange <mopp@gmx.net>
-ayoubabid <ayoubabid@users.noreply.github.com>

From e80786d63dc77e9f506c11754829b3d1d3343034 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 9 Mar 2015 09:05:56 +0100
Subject: [PATCH 0909/2920] Rename Requirements to RequirementSet

refs #8508
---
 .../library/Monitoring/MonitoringWizard.php   | 28 ++++++------
 .../application/forms/RequirementsPage.php    | 18 ++++----
 .../{Requirements.php => RequirementSet.php}  | 22 +++++-----
 modules/setup/library/Setup/SetupWizard.php   |  2 +-
 modules/setup/library/Setup/WebWizard.php     | 44 +++++++++----------
 5 files changed, 57 insertions(+), 57 deletions(-)
 rename modules/setup/library/Setup/{Requirements.php => RequirementSet.php} (91%)

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index 82ee90e62..e746db033 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -8,7 +8,7 @@ use Icinga\Web\Wizard;
 use Icinga\Web\Request;
 use Icinga\Module\Setup\Setup;
 use Icinga\Module\Setup\SetupWizard;
-use Icinga\Module\Setup\Requirements;
+use Icinga\Module\Setup\RequirementSet;
 use Icinga\Module\Setup\Forms\SummaryPage;
 use Icinga\Module\Monitoring\Forms\Setup\WelcomePage;
 use Icinga\Module\Monitoring\Forms\Setup\BackendPage;
@@ -136,9 +136,9 @@ class MonitoringWizard extends Wizard implements SetupWizard
      */
     public function getRequirements()
     {
-        $requirements = new Requirements();
+        $set = new RequirementSet();
 
-        $requirements->add(new PhpModuleRequirement(array(
+        $set->add(new PhpModuleRequirement(array(
             'optional'      => true,
             'condition'     => 'Sockets',
             'description'   => mt(
@@ -148,9 +148,9 @@ class MonitoringWizard extends Wizard implements SetupWizard
             )
         )));
 
-        $idoRequirements = new Requirements(Requirements::MODE_OR);
-        $mysqlRequirements = new Requirements();
-        $mysqlRequirements->add(new PhpModuleRequirement(array(
+        $idoSet = new RequirementSet(RequirementSet::MODE_OR);
+        $mysqlSet = new RequirementSet();
+        $mysqlSet->add(new PhpModuleRequirement(array(
             'condition'     => 'mysql',
             'alias'         => 'PDO-MySQL',
             'description'   => mt(
@@ -158,7 +158,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
                 'To access the IDO stored in a MySQL database the PDO-MySQL module for PHP is required.'
             )
         )));
-        $mysqlRequirements->add(new ClassRequirement(array(
+        $mysqlSet->add(new ClassRequirement(array(
             'condition'     => 'Zend_Db_Adapter_Pdo_Mysql',
             'alias'         => mt('monitoring', 'Zend database adapter for MySQL'),
             'description'   => mt(
@@ -166,9 +166,9 @@ class MonitoringWizard extends Wizard implements SetupWizard
                 'The Zend database adapter for MySQL is required to access a MySQL database.'
             )
         )));
-        $idoRequirements->merge($mysqlRequirements);
-        $pgsqlRequirements = new Requirements();
-        $pgsqlRequirements->add(new PhpModuleRequirement(array(
+        $idoSet->merge($mysqlSet);
+        $pgsqlSet = new RequirementSet();
+        $pgsqlSet->add(new PhpModuleRequirement(array(
             'condition'     => 'pgsql',
             'alias'         => 'PDO-PostgreSQL',
             'description'   => mt(
@@ -176,7 +176,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
                 'To access the IDO stored in a PostgreSQL database the PDO-PostgreSQL module for PHP is required.'
             )
         )));
-        $pgsqlRequirements->add(new ClassRequirement(array(
+        $pgsqlSet->add(new ClassRequirement(array(
             'condition'     => 'Zend_Db_Adapter_Pdo_Pgsql',
             'alias'         => mt('monitoring', 'Zend database adapter for PostgreSQL'),
             'description'   => mt(
@@ -184,9 +184,9 @@ class MonitoringWizard extends Wizard implements SetupWizard
                 'The Zend database adapter for PostgreSQL is required to access a PostgreSQL database.'
             )
         )));
-        $idoRequirements->merge($pgsqlRequirements);
-        $requirements->merge($idoRequirements);
+        $idoSet->merge($pgsqlSet);
+        $set->merge($idoSet);
 
-        return $requirements;
+        return $set;
     }
 }
diff --git a/modules/setup/application/forms/RequirementsPage.php b/modules/setup/application/forms/RequirementsPage.php
index f4b8ee648..086e6e7fc 100644
--- a/modules/setup/application/forms/RequirementsPage.php
+++ b/modules/setup/application/forms/RequirementsPage.php
@@ -4,7 +4,7 @@
 namespace Icinga\Module\Setup\Forms;
 
 use Icinga\Web\Form;
-use Icinga\Module\Setup\Requirements;
+use Icinga\Module\Setup\RequirementSet;
 
 /**
  * Wizard page to list setup requirements
@@ -14,9 +14,9 @@ class RequirementsPage extends Form
     /**
      * The requirements to list
      *
-     * @var Requirements
+     * @var RequirementSet
      */
-    protected $requirements;
+    protected $set;
 
     /**
      * Initialize this page
@@ -30,24 +30,24 @@ class RequirementsPage extends Form
     /**
      * Set the requirements to list
      *
-     * @param   Requirements    $requirements
+     * @param   RequirementSet    $set
      *
      * @return  self
      */
-    public function setRequirements(Requirements $requirements)
+    public function setRequirements(RequirementSet $set)
     {
-        $this->requirements = $requirements;
+        $this->set = $set;
         return $this;
     }
 
     /**
      * Return the requirements to list
      *
-     * @return  Requirements
+     * @return  RequirementSet
      */
     public function getRequirements()
     {
-        return $this->requirements;
+        return $this->set;
     }
 
     /**
@@ -63,6 +63,6 @@ class RequirementsPage extends Form
             return false;
         }
 
-        return $this->requirements->fulfilled();
+        return $this->set->fulfilled();
     }
 }
diff --git a/modules/setup/library/Setup/Requirements.php b/modules/setup/library/Setup/RequirementSet.php
similarity index 91%
rename from modules/setup/library/Setup/Requirements.php
rename to modules/setup/library/Setup/RequirementSet.php
index 69892f236..6ffce61fb 100644
--- a/modules/setup/library/Setup/Requirements.php
+++ b/modules/setup/library/Setup/RequirementSet.php
@@ -9,7 +9,7 @@ use RecursiveIterator;
 /**
  * Container to store and handle requirements
  */
-class Requirements implements RecursiveIterator
+class RequirementSet implements RecursiveIterator
 {
     /**
      * Mode AND (all requirements must met)
@@ -59,7 +59,7 @@ class Requirements implements RecursiveIterator
      *
      * @param   int     $mode
      *
-     * @return  Requirements
+     * @return  RequirementSet
      *
      * @throws  LogicException      In case the given mode is invalid
      */
@@ -88,7 +88,7 @@ class Requirements implements RecursiveIterator
      *
      * @param   Requirement     $requirement    The requirement to add
      *
-     * @return  Requirements
+     * @return  RequirementSet
      */
     public function add(Requirement $requirement)
     {
@@ -144,14 +144,14 @@ class Requirements implements RecursiveIterator
     /**
      * Register the given requirements
      *
-     * @param   Requirements    $requirements   The requirements to register
+     * @param   RequirementSet  $set    The requirements to register
      *
-     * @return  Requirements
+     * @return  RequirementSet
      */
-    public function merge(Requirements $requirements)
+    public function merge(RequirementSet $set)
     {
-        if ($this->getMode() === static::MODE_OR && $requirements->getMode() === static::MODE_OR) {
-            foreach ($requirements->getAll() as $requirement) {
+        if ($this->getMode() === static::MODE_OR && $set->getMode() === static::MODE_OR) {
+            foreach ($set->getAll() as $requirement) {
                 if ($requirement instanceof static) {
                     $this->merge($requirement);
                 } else {
@@ -159,11 +159,11 @@ class Requirements implements RecursiveIterator
                 }
             }
         } else {
-            if ($requirements->getMode() === static::MODE_OR) {
+            if ($set->getMode() === static::MODE_OR) {
                 $this->containsMandatoryRequirements = true;
             }
 
-            $this->requirements[] = $requirements;
+            $this->requirements[] = $set;
         }
 
         return $this;
@@ -250,7 +250,7 @@ class Requirements implements RecursiveIterator
     /**
      * Return the current element in the iteration
      *
-     * @return  Requirement|Requirements
+     * @return  Requirement|RequirementSet
      */
     public function current()
     {
diff --git a/modules/setup/library/Setup/SetupWizard.php b/modules/setup/library/Setup/SetupWizard.php
index 9e7b45174..1ce948dc1 100644
--- a/modules/setup/library/Setup/SetupWizard.php
+++ b/modules/setup/library/Setup/SetupWizard.php
@@ -18,7 +18,7 @@ interface SetupWizard
     /**
      * Return the requirements of this wizard
      *
-     * @return  Requirements
+     * @return  RequirementSet
      */
     public function getRequirements();
 }
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 59404efd6..d3bb71bfa 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -357,9 +357,9 @@ class WebWizard extends Wizard implements SetupWizard
      */
     public function getRequirements()
     {
-        $requirements = new Requirements();
+        $set = new RequirementSet();
 
-        $requirements->add(new PhpVersionRequirement(array(
+        $set->add(new PhpVersionRequirement(array(
             'condition'     => array('>=', '5.3.2'),
             'description'   => mt(
                 'setup',
@@ -368,7 +368,7 @@ class WebWizard extends Wizard implements SetupWizard
             )
         )));
 
-        $requirements->add(new PhpConfigRequirement(array(
+        $set->add(new PhpConfigRequirement(array(
             'condition'     => array('date.timezone', true),
             'title'         => mt('setup', 'Default Timezone'),
             'description'   => sprintf(
@@ -377,7 +377,7 @@ class WebWizard extends Wizard implements SetupWizard
             ),
         )));
 
-        $requirements->add(new OSRequirement(array(
+        $set->add(new OSRequirement(array(
             'optional'      => true,
             'condition'     => 'linux',
             'description'   => mt(
@@ -387,7 +387,7 @@ class WebWizard extends Wizard implements SetupWizard
             )
         )));
 
-        $requirements->add(new PhpModuleRequirement(array(
+        $set->add(new PhpModuleRequirement(array(
             'condition'     => 'OpenSSL',
             'description'   => mt(
                 'setup',
@@ -395,7 +395,7 @@ class WebWizard extends Wizard implements SetupWizard
             )
         )));
 
-        $requirements->add(new PhpModuleRequirement(array(
+        $set->add(new PhpModuleRequirement(array(
             'optional'      => true,
             'condition'     => 'JSON',
             'description'   => mt(
@@ -404,7 +404,7 @@ class WebWizard extends Wizard implements SetupWizard
             )
         )));
 
-        $requirements->add(new PhpModuleRequirement(array(
+        $set->add(new PhpModuleRequirement(array(
             'optional'      => true,
             'condition'     => 'LDAP',
             'description'   => mt(
@@ -413,7 +413,7 @@ class WebWizard extends Wizard implements SetupWizard
             )
         )));
 
-        $requirements->add(new PhpModuleRequirement(array(
+        $set->add(new PhpModuleRequirement(array(
             'optional'      => true,
             'condition'     => 'INTL',
             'description'   => mt(
@@ -424,7 +424,7 @@ class WebWizard extends Wizard implements SetupWizard
         )));
 
         // TODO(6172): Remove this requirement once we do not ship dompdf with Icinga Web 2 anymore
-        $requirements->add(new PhpModuleRequirement(array(
+        $set->add(new PhpModuleRequirement(array(
             'optional'      => true,
             'condition'     => 'DOM',
             'description'   => mt(
@@ -433,7 +433,7 @@ class WebWizard extends Wizard implements SetupWizard
             )
         )));
 
-        $requirements->add(new PhpModuleRequirement(array(
+        $set->add(new PhpModuleRequirement(array(
             'optional'      => true,
             'condition'     => 'GD',
             'description'   => mt(
@@ -442,7 +442,7 @@ class WebWizard extends Wizard implements SetupWizard
             )
         )));
 
-        $requirements->add(new PhpModuleRequirement(array(
+        $set->add(new PhpModuleRequirement(array(
             'optional'      => true,
             'condition'     => 'Imagick',
             'description'   => mt(
@@ -451,8 +451,8 @@ class WebWizard extends Wizard implements SetupWizard
             )
         )));
 
-        $mysqlRequirements = new Requirements();
-        $mysqlRequirements->add(new PhpModuleRequirement(array(
+        $mysqlSet = new RequirementSet();
+        $mysqlSet->add(new PhpModuleRequirement(array(
             'optional'      => true,
             'condition'     => 'mysql',
             'alias'         => 'PDO-MySQL',
@@ -461,7 +461,7 @@ class WebWizard extends Wizard implements SetupWizard
                 'To store users or preferences in a MySQL database the PDO-MySQL module for PHP is required.'
             )
         )));
-        $mysqlRequirements->add(new ClassRequirement(array(
+        $mysqlSet->add(new ClassRequirement(array(
             'optional'      => true,
             'condition'     => 'Zend_Db_Adapter_Pdo_Mysql',
             'alias'         => mt('setup', 'Zend database adapter for MySQL'),
@@ -470,10 +470,10 @@ class WebWizard extends Wizard implements SetupWizard
                 'The Zend database adapter for MySQL is required to access a MySQL database.'
             )
         )));
-        $requirements->merge($mysqlRequirements);
+        $set->merge($mysqlSet);
 
-        $pgsqlRequirements = new Requirements();
-        $pgsqlRequirements->add(new PhpModuleRequirement(array(
+        $pgsqlSet = new RequirementSet();
+        $pgsqlSet->add(new PhpModuleRequirement(array(
             'optional'      => true,
             'condition'     => 'pgsql',
             'alias'         => 'PDO-PostgreSQL',
@@ -482,7 +482,7 @@ class WebWizard extends Wizard implements SetupWizard
                 'To store users or preferences in a PostgreSQL database the PDO-PostgreSQL module for PHP is required.'
             )
         )));
-        $pgsqlRequirements->add(new ClassRequirement(array(
+        $pgsqlSet->add(new ClassRequirement(array(
             'optional'      => true,
             'condition'     => 'Zend_Db_Adapter_Pdo_Pgsql',
             'alias'         => mt('setup', 'Zend database adapter for PostgreSQL'),
@@ -491,9 +491,9 @@ class WebWizard extends Wizard implements SetupWizard
                 'The Zend database adapter for PostgreSQL is required to access a PostgreSQL database.'
             )
         )));
-        $requirements->merge($pgsqlRequirements);
+        $set->merge($pgsqlSet);
 
-        $requirements->add(new ConfigDirectoryRequirement(array(
+        $set->add(new ConfigDirectoryRequirement(array(
             'condition'     => Icinga::app()->getConfigDir(),
             'description'   => mt(
                 'setup',
@@ -503,9 +503,9 @@ class WebWizard extends Wizard implements SetupWizard
         )));
 
         foreach ($this->getWizards() as $wizard) {
-            $requirements->merge($wizard->getRequirements());
+            $set->merge($wizard->getRequirements());
         }
 
-        return $requirements;
+        return $set;
     }
 }

From bc450c573db1446e8f4bdd9cd322c8452e766080 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 10 Mar 2015 09:12:06 +0100
Subject: [PATCH 0910/2920] Refactor and fix requirement evaluation

refs #8508
---
 .../library/Monitoring/MonitoringWizard.php   |  10 +-
 .../setup/library/Setup/RequirementSet.php    | 171 +++---
 modules/setup/library/Setup/WebWizard.php     |   4 +-
 .../php/library/Setup/RequirementSetTest.php  | 496 ++++++++++++++++++
 4 files changed, 613 insertions(+), 68 deletions(-)
 create mode 100644 modules/setup/test/php/library/Setup/RequirementSetTest.php

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index e746db033..639986246 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -148,9 +148,10 @@ class MonitoringWizard extends Wizard implements SetupWizard
             )
         )));
 
-        $idoSet = new RequirementSet(RequirementSet::MODE_OR);
-        $mysqlSet = new RequirementSet();
+        $idoSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $mysqlSet = new RequirementSet(true);
         $mysqlSet->add(new PhpModuleRequirement(array(
+            'optional'      => true,
             'condition'     => 'mysql',
             'alias'         => 'PDO-MySQL',
             'description'   => mt(
@@ -159,6 +160,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
             )
         )));
         $mysqlSet->add(new ClassRequirement(array(
+            'optional'      => true,
             'condition'     => 'Zend_Db_Adapter_Pdo_Mysql',
             'alias'         => mt('monitoring', 'Zend database adapter for MySQL'),
             'description'   => mt(
@@ -167,8 +169,9 @@ class MonitoringWizard extends Wizard implements SetupWizard
             )
         )));
         $idoSet->merge($mysqlSet);
-        $pgsqlSet = new RequirementSet();
+        $pgsqlSet = new RequirementSet(true);
         $pgsqlSet->add(new PhpModuleRequirement(array(
+            'optional'      => true,
             'condition'     => 'pgsql',
             'alias'         => 'PDO-PostgreSQL',
             'description'   => mt(
@@ -177,6 +180,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
             )
         )));
         $pgsqlSet->add(new ClassRequirement(array(
+            'optional'      => true,
             'condition'     => 'Zend_Db_Adapter_Pdo_Pgsql',
             'alias'         => mt('monitoring', 'Zend database adapter for PostgreSQL'),
             'description'   => mt(
diff --git a/modules/setup/library/Setup/RequirementSet.php b/modules/setup/library/Setup/RequirementSet.php
index 6ffce61fb..966cf98cc 100644
--- a/modules/setup/library/Setup/RequirementSet.php
+++ b/modules/setup/library/Setup/RequirementSet.php
@@ -12,17 +12,31 @@ use RecursiveIterator;
 class RequirementSet implements RecursiveIterator
 {
     /**
-     * Mode AND (all requirements must met)
+     * Mode AND (all requirements must be met)
      */
     const MODE_AND = 0;
 
     /**
-     * Mode OR (at least one requirement must met)
+     * Mode OR (at least one requirement must be met)
      */
     const MODE_OR = 1;
 
     /**
-     * The mode by with the requirements are evaluated
+     * Whether all requirements meet their condition
+     *
+     * @var bool
+     */
+    protected $state;
+
+    /**
+     * Whether this set is optional
+     *
+     * @var bool
+     */
+    protected $optional;
+
+    /**
+     * The mode by which the requirements are evaluated
      *
      * @var string
      */
@@ -36,26 +50,75 @@ class RequirementSet implements RecursiveIterator
     protected $requirements;
 
     /**
-     * Whether there is any mandatory requirement part of this set
+     * The raw state of this set's requirements
      *
      * @var bool
      */
-    protected $containsMandatoryRequirements;
+    private $forcedState;
 
     /**
-     * Create a new set of requirements
+     * Initialize a new set of requirements
      *
-     * @param   int     $mode   The mode by with to evaluate the requirements
+     * @param   bool    $optional   Whether this set is optional
+     * @param   int     $mode       The mode by which to evaluate this set
      */
-    public function __construct($mode = null)
+    public function __construct($optional = false, $mode = null)
     {
+        $this->optional = $optional;
         $this->requirements = array();
-        $this->containsMandatoryRequirements = false;
         $this->setMode($mode ?: static::MODE_AND);
     }
 
     /**
-     * Set the mode by with to evaluate the requirements
+     * Set the state of this set
+     *
+     * @param   bool    $state
+     *
+     * @return  RequirementSet
+     */
+    public function setState($state)
+    {
+        $this->state = (bool) $state;
+        return $this;
+    }
+
+    /**
+     * Return the state of this set
+     *
+     * Alias for RequirementSet::fulfilled(true).
+     *
+     * @return  bool
+     */
+    public function getState()
+    {
+        return $this->fulfilled(true);
+    }
+
+    /**
+     * Set whether this set of requirements should be optional
+     *
+     * @param   bool    $state
+     *
+     * @return  RequirementSet
+     */
+    public function setOptional($state = true)
+    {
+        $this->optional = (bool) $state;
+        return $this;
+    }
+
+    /**
+     * Return whether this set of requirements is optional
+     *
+     * @return  bool
+     */
+    public function isOptional()
+    {
+        return $this->optional;
+    }
+
+    /**
+     * Set the mode by which to evaluate the requirements
      *
      * @param   int     $mode
      *
@@ -74,7 +137,7 @@ class RequirementSet implements RecursiveIterator
     }
 
     /**
-     * Return the mode by with the requirements are evaluated
+     * Return the mode by which the requirements are evaluated
      *
      * @return  int
      */
@@ -95,10 +158,7 @@ class RequirementSet implements RecursiveIterator
         $merged = false;
         foreach ($this->requirements as $knownRequirement) {
             if ($knownRequirement instanceof Requirement && $requirement->equals($knownRequirement)) {
-                if ($this->getMode() === static::MODE_AND && !$requirement->isOptional()) {
-                    $knownRequirement->setOptional(false);
-                }
-
+                $knownRequirement->setOptional($requirement->isOptional());
                 foreach ($requirement->getDescriptions() as $description) {
                     $knownRequirement->addDescription($description);
                 }
@@ -109,12 +169,6 @@ class RequirementSet implements RecursiveIterator
         }
 
         if (! $merged) {
-            if ($this->getMode() === static::MODE_OR) {
-                $requirement->setOptional();
-            } elseif (! $requirement->isOptional()) {
-                $this->containsMandatoryRequirements = true;
-            }
-
             $this->requirements[] = $requirement;
         }
 
@@ -132,25 +186,15 @@ class RequirementSet implements RecursiveIterator
     }
 
     /**
-     * Return whether there is any mandatory requirement part of this set
+     * Register the given set of requirements
      *
-     * @return  bool
-     */
-    public function hasAnyMandatoryRequirement()
-    {
-        return $this->containsMandatoryRequirements || $this->getMode() === static::MODE_OR;
-    }
-
-    /**
-     * Register the given requirements
-     *
-     * @param   RequirementSet  $set    The requirements to register
+     * @param   RequirementSet  $set    The set to register
      *
      * @return  RequirementSet
      */
     public function merge(RequirementSet $set)
     {
-        if ($this->getMode() === static::MODE_OR && $set->getMode() === static::MODE_OR) {
+        if ($this->getMode() === $set->getMode() && $this->isOptional() === $set->isOptional()) {
             foreach ($set->getAll() as $requirement) {
                 if ($requirement instanceof static) {
                     $this->merge($requirement);
@@ -159,10 +203,6 @@ class RequirementSet implements RecursiveIterator
                 }
             }
         } else {
-            if ($set->getMode() === static::MODE_OR) {
-                $this->containsMandatoryRequirements = true;
-            }
-
             $this->requirements[] = $set;
         }
 
@@ -172,40 +212,45 @@ class RequirementSet implements RecursiveIterator
     /**
      * Return whether all requirements can successfully be evaluated based on the current mode
      *
+     * In case this is a optional set of requirements (and $force is false), true is returned immediately.
+     *
+     * @param   bool    $force      Whether to ignore the optionality of a set or single requirement
+     *
      * @return  bool
      */
-    public function fulfilled()
+    public function fulfilled($force = false)
     {
-        $state = false;
-        foreach ($this->requirements as $requirement) {
-            if ($requirement instanceof static) {
-                if ($requirement->fulfilled()) {
-                    if ($this->getMode() === static::MODE_OR) {
-                        return true;
-                    }
+        $state = $this->isOptional();
+        if (! $force && $state) {
+            return true;
+        }
 
-                    $state = true;
-                } elseif ($this->getMode() === static::MODE_AND && $requirement->hasAnyMandatoryRequirement()) {
-                    return false;
+        if (! $force && $this->state !== null) {
+            return $this->state;
+        } elseif ($force && $this->forcedState !== null) {
+            return $this->forcedState;
+        }
+
+        $self = $this->requirements;
+        foreach ($self as $requirement) {
+            if ($requirement->getState()) {
+                $state = true;
+                if ($this->getMode() === static::MODE_OR) {
+                    break;
                 }
-            } else {
-                if ($requirement->getState()) {
-                    if ($this->getMode() === static::MODE_OR) {
-                        return true;
-                    }
-
-                    $state = true;
-                } elseif ($this->getMode() === static::MODE_AND) {
-                    if (! $requirement->isOptional()) {
-                        return false;
-                    }
-
-                    $state = true; // There may only be optional requirements...
+            } elseif ($force || !$requirement->isOptional()) {
+                $state = false;
+                if ($this->getMode() === static::MODE_AND) {
+                    break;
                 }
             }
         }
 
-        return $state;
+        if ($force) {
+            return $this->forcedState = $state;
+        }
+
+        return $this->state = $state;
     }
 
     /**
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index d3bb71bfa..e3091bd4d 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -451,7 +451,7 @@ class WebWizard extends Wizard implements SetupWizard
             )
         )));
 
-        $mysqlSet = new RequirementSet();
+        $mysqlSet = new RequirementSet(true);
         $mysqlSet->add(new PhpModuleRequirement(array(
             'optional'      => true,
             'condition'     => 'mysql',
@@ -472,7 +472,7 @@ class WebWizard extends Wizard implements SetupWizard
         )));
         $set->merge($mysqlSet);
 
-        $pgsqlSet = new RequirementSet();
+        $pgsqlSet = new RequirementSet(true);
         $pgsqlSet->add(new PhpModuleRequirement(array(
             'optional'      => true,
             'condition'     => 'pgsql',
diff --git a/modules/setup/test/php/library/Setup/RequirementSetTest.php b/modules/setup/test/php/library/Setup/RequirementSetTest.php
new file mode 100644
index 000000000..d2c4d2029
--- /dev/null
+++ b/modules/setup/test/php/library/Setup/RequirementSetTest.php
@@ -0,0 +1,496 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Tests\Icinga\Module\Setup;
+
+use Icinga\Test\BaseTestCase;
+use Icinga\Module\Setup\Requirement;
+use Icinga\Module\Setup\RequirementSet;
+
+class TrueRequirement extends Requirement
+{
+    protected function evaluate()
+    {
+        return true;
+    }
+}
+
+class FalseRequirement extends Requirement
+{
+    protected function evaluate()
+    {
+        return false;
+    }
+}
+
+class RequirementSetTest extends BaseTestCase
+{
+    public function testFlatMandatoryRequirementsOfTypeAnd()
+    {
+        $emptySet = new RequirementSet();
+        $this->assertFalse($emptySet->fulfilled(), 'A empty mandatory set of type and is fulfilled');
+
+        $singleTrueSet = new RequirementSet();
+        $singleTrueSet->add(new TrueRequirement());
+        $this->assertTrue(
+            $singleTrueSet->fulfilled(),
+            'A mandatory set of type and with a single TrueRequirement is not fulfilled'
+        );
+
+        $singleFalseSet = new RequirementSet();
+        $singleFalseSet->add(new FalseRequirement());
+        $this->assertFalse(
+            $singleFalseSet->fulfilled(),
+            'A mandatory set of type and with a single FalseRequirement is fulfilled'
+        );
+
+        $mixedSet = new RequirementSet();
+        $mixedSet->add(new TrueRequirement());
+        $mixedSet->add(new FalseRequirement());
+        $this->assertFalse(
+            $mixedSet->fulfilled(),
+            'A mandatory set of type and with one True- and one FalseRequirement is fulfilled'
+        );
+    }
+
+    public function testFlatOptionalRequirementsOfTypeAnd()
+    {
+        $emptySet = new RequirementSet(true);
+        $this->assertTrue($emptySet->fulfilled(), 'A empty optional set of type and is not fulfilled');
+
+        $singleTrueSet = new RequirementSet(true);
+        $singleTrueSet->add(new TrueRequirement());
+        $this->assertTrue(
+            $singleTrueSet->fulfilled(),
+            'A optional set of type and with a single TrueRequirement is not fulfilled'
+        );
+
+        $singleFalseSet = new RequirementSet(true);
+        $singleFalseSet->add(new FalseRequirement());
+        $this->assertTrue(
+            $singleFalseSet->fulfilled(),
+            'A optional set of type and with a single FalseRequirement is not fulfilled'
+        );
+
+        $mixedSet = new RequirementSet(true);
+        $mixedSet->add(new TrueRequirement());
+        $mixedSet->add(new FalseRequirement());
+        $this->assertTrue(
+            $mixedSet->fulfilled(),
+            'A optional set of type and with one True- and one FalseRequirement is not fulfilled'
+        );
+    }
+
+    public function testFlatMixedRequirementsOfTypeAnd()
+    {
+        $mandatoryOptionalTrueSet = new RequirementSet();
+        $mandatoryOptionalTrueSet->add(new TrueRequirement(array('optional' => true)));
+        $mandatoryOptionalTrueSet->add(new FalseRequirement());
+        $this->assertFalse(
+            $mandatoryOptionalTrueSet->fulfilled(),
+            'A mandatory set of type and with one optional True- and one mandatory FalseRequirement is fulfilled'
+        );
+
+        $mandatoryOptionalFalseSet = new RequirementSet();
+        $mandatoryOptionalFalseSet->add(new TrueRequirement());
+        $mandatoryOptionalFalseSet->add(new FalseRequirement(array('optional' => true)));
+        $this->assertTrue(
+            $mandatoryOptionalFalseSet->fulfilled(),
+            'A mandatory set of type and with one mandatory True- and one optional FalseRequirement is not fulfilled'
+        );
+
+        $optionalOptionalTrueSet = new RequirementSet(true);
+        $optionalOptionalTrueSet->add(new TrueRequirement(array('optional' => true)));
+        $optionalOptionalTrueSet->add(new FalseRequirement());
+        $this->assertTrue(
+            $optionalOptionalTrueSet->fulfilled(),
+            'A optional set of type and with one optional True- and one mandatory FalseRequirement is not fulfilled'
+        );
+
+        $optionalOptionalFalseSet = new RequirementSet(true);
+        $optionalOptionalFalseSet->add(new TrueRequirement());
+        $optionalOptionalFalseSet->add(new FalseRequirement(array('optional' => true)));
+        $this->assertTrue(
+            $optionalOptionalFalseSet->fulfilled(),
+            'A optional set of type and with one mandatory True- and one optional FalseRequirement is not fulfilled'
+        );
+    }
+
+    public function testFlatMandatoryRequirementsOfTypeOr()
+    {
+        $emptySet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $this->assertFalse($emptySet->fulfilled(), 'A empty mandatory set of type or is fulfilled');
+
+        $singleTrueSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $singleTrueSet->add(new TrueRequirement());
+        $this->assertTrue(
+            $singleTrueSet->fulfilled(),
+            'A mandatory set of type or with a single TrueRequirement is not fulfilled'
+        );
+
+        $singleFalseSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $singleFalseSet->add(new FalseRequirement());
+        $this->assertFalse(
+            $singleFalseSet->fulfilled(),
+            'A mandatory set of type or with a single FalseRequirement is fulfilled'
+        );
+
+        $mixedSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $mixedSet->add(new TrueRequirement());
+        $mixedSet->add(new FalseRequirement());
+        $this->assertTrue(
+            $mixedSet->fulfilled(),
+            'A mandatory set of type or with one True- and one FalseRequirement is not fulfilled'
+        );
+    }
+
+    public function testFlatOptionalRequirementsOfTypeOr()
+    {
+        $emptySet = new RequirementSet(true, RequirementSet::MODE_OR);
+        $this->assertTrue($emptySet->fulfilled(), 'A empty optional set of type or is not fulfilled');
+
+        $singleTrueSet = new RequirementSet(true, RequirementSet::MODE_OR);
+        $singleTrueSet->add(new TrueRequirement());
+        $this->assertTrue(
+            $singleTrueSet->fulfilled(),
+            'A optional set of type or with a single TrueRequirement is not fulfilled'
+        );
+
+        $singleFalseSet = new RequirementSet(true, RequirementSet::MODE_OR);
+        $singleFalseSet->add(new FalseRequirement());
+        $this->assertTrue(
+            $singleFalseSet->fulfilled(),
+            'A optional set of type or with a single FalseRequirement is not fulfilled'
+        );
+
+        $mixedSet = new RequirementSet(true, RequirementSet::MODE_OR);
+        $mixedSet->add(new TrueRequirement());
+        $mixedSet->add(new FalseRequirement());
+        $this->assertTrue(
+            $mixedSet->fulfilled(),
+            'A optional set of type or with one True- and one FalseRequirement is not fulfilled'
+        );
+    }
+
+    public function testFlatMixedRequirementsOfTypeOr()
+    {
+        $mandatoryOptionalTrueSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $mandatoryOptionalTrueSet->add(new TrueRequirement(array('optional' => true)));
+        $mandatoryOptionalTrueSet->add(new FalseRequirement());
+        $this->assertTrue(
+            $mandatoryOptionalTrueSet->fulfilled(),
+            'A mandatory set of type or with one optional True- and one mandatory FalseRequirement is not fulfilled'
+        );
+
+        $mandatoryOptionalFalseSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $mandatoryOptionalFalseSet->add(new TrueRequirement());
+        $mandatoryOptionalFalseSet->add(new FalseRequirement(array('optional' => true)));
+        $this->assertTrue(
+            $mandatoryOptionalFalseSet->fulfilled(),
+            'A mandatory set of type or with one mandatory True- and one optional FalseRequirement is not fulfilled'
+        );
+
+        $optionalOptionalTrueSet = new RequirementSet(true, RequirementSet::MODE_OR);
+        $optionalOptionalTrueSet->add(new TrueRequirement(array('optional' => true)));
+        $optionalOptionalTrueSet->add(new FalseRequirement());
+        $this->assertTrue(
+            $optionalOptionalTrueSet->fulfilled(),
+            'A optional set of type or with one optional True- and one mandatory FalseRequirement is not fulfilled'
+        );
+
+        $optionalOptionalFalseSet = new RequirementSet(true, RequirementSet::MODE_OR);
+        $optionalOptionalFalseSet->add(new TrueRequirement());
+        $optionalOptionalFalseSet->add(new FalseRequirement(array('optional' => true)));
+        $this->assertTrue(
+            $optionalOptionalFalseSet->fulfilled(),
+            'A optional set of type or with one mandatory True- and one optional FalseRequirement is not fulfilled'
+        );
+    }
+
+    public function testNestedMandatoryRequirementsOfTypeAnd()
+    {
+        $trueSet = new RequirementSet();
+        $trueSet->add(new TrueRequirement());
+        $falseSet = new RequirementSet();
+        $falseSet->add(new FalseRequirement());
+
+        $nestedTrueSet = new RequirementSet();
+        $nestedTrueSet->merge($trueSet);
+        $this->assertTrue(
+            $nestedTrueSet->fulfilled(),
+            'A nested mandatory set of type and with one mandatory TrueRequirement is not fulfilled'
+        );
+
+        $nestedFalseSet = new RequirementSet();
+        $nestedFalseSet->merge($falseSet);
+        $this->assertFalse(
+            $nestedFalseSet->fulfilled(),
+            'A nested mandatory set of type and with one mandatory FalseRequirement is fulfilled'
+        );
+
+        $nestedMixedSet = new RequirementSet();
+        $nestedMixedSet->merge($trueSet);
+        $nestedMixedSet->merge($falseSet);
+        $this->assertFalse(
+            $nestedMixedSet->fulfilled(),
+            'Two nested mandatory sets of type and with one mandatory True- and'
+            . ' one mandatory FalseRequirement respectively are fulfilled'
+        );
+    }
+
+    public function testNestedOptionalRequirementsOfTypeAnd()
+    {
+        $trueSet = new RequirementSet(true);
+        $trueSet->add(new TrueRequirement());
+        $falseSet = new RequirementSet(true);
+        $falseSet->add(new FalseRequirement());
+
+        $nestedTrueSet = new RequirementSet(true);
+        $nestedTrueSet->merge($trueSet);
+        $this->assertTrue(
+            $nestedTrueSet->fulfilled(),
+            'A nested optional set of type and with one mandatory TrueRequirement is not fulfilled'
+        );
+
+        $nestedFalseSet = new RequirementSet(true);
+        $nestedFalseSet->merge($falseSet);
+        $this->assertTrue(
+            $nestedFalseSet->fulfilled(),
+            'A nested optional set of type and with one mandatory FalseRequirement is not fulfilled'
+        );
+
+        $nestedMixedSet = new RequirementSet(true);
+        $nestedMixedSet->merge($trueSet);
+        $nestedMixedSet->merge($falseSet);
+        $this->assertTrue(
+            $nestedMixedSet->fulfilled(),
+            'Two nested optional sets of type and with one mandatory True- and'
+            . ' one mandatory FalseRequirement respectively are not fulfilled'
+        );
+    }
+
+    public function testNestedMixedRequirementsOfTypeAnd()
+    {
+        $mandatoryMandatoryTrueSet = new RequirementSet();
+        $mandatoryMandatoryTrueSet->add(new TrueRequirement());
+        $mandatoryOptionalTrueSet = new RequirementSet();
+        $mandatoryOptionalTrueSet->add(new TrueRequirement(array('optional' => true)));
+        $mandatoryMandatoryFalseSet = new RequirementSet();
+        $mandatoryMandatoryFalseSet->add(new FalseRequirement());
+        $mandatoryOptionalFalseSet = new RequirementSet();
+        $mandatoryOptionalFalseSet->add(new FalseRequirement(array('optional' => true)));
+        $optionalMandatoryTrueSet = new RequirementSet(true);
+        $optionalMandatoryTrueSet->add(new TrueRequirement());
+        $optionalOptionalTrueSet = new RequirementSet(true);
+        $optionalOptionalTrueSet->add(new TrueRequirement(array('optional' => true)));
+        $optionalMandatoryFalseSet = new RequirementSet(true);
+        $optionalMandatoryFalseSet->add(new FalseRequirement());
+        $optionalOptionalFalseSet = new RequirementSet(true);
+        $optionalOptionalFalseSet->add(new FalseRequirement(array('optional' => true)));
+
+        $mandatoryMandatoryOptionalTrueSet = new RequirementSet();
+        $mandatoryMandatoryOptionalTrueSet->merge($mandatoryOptionalTrueSet);
+        $mandatoryMandatoryOptionalTrueSet->merge($mandatoryMandatoryFalseSet);
+        $this->assertFalse(
+            $mandatoryMandatoryOptionalTrueSet->fulfilled(),
+            'A mandatory set of type and with two nested mandatory sets of type and where one has a optional'
+            . ' TrueRequirement and the other one has a mandatory FalseRequirement is fulfilled'
+        );
+
+        $mandatoryMandatoryOptionalFalseSet = new RequirementSet();
+        $mandatoryMandatoryOptionalFalseSet->merge($mandatoryOptionalFalseSet);
+        $mandatoryMandatoryOptionalFalseSet->merge($mandatoryMandatoryTrueSet);
+        $this->assertTrue(
+            $mandatoryMandatoryOptionalFalseSet->fulfilled(),
+            'A mandatory set of type and with two nested mandatory sets of type and where one has a mandatory'
+            . ' TrueRequirement and the other one has a optional FalseRequirement is not fulfilled'
+        );
+
+        $optionalOptionalOptionalTrueSet = new RequirementSet(true);
+        $optionalOptionalOptionalTrueSet->merge($optionalOptionalTrueSet);
+        $optionalOptionalOptionalTrueSet->merge($optionalMandatoryFalseSet);
+        $this->assertTrue(
+            $optionalOptionalOptionalTrueSet->fulfilled(),
+            'A optional set of type and with two nested optional sets of type and where one has a optional'
+            . ' TrueRequirement and the other one has a mandatory FalseRequirement is not fulfilled'
+        );
+
+        $optionalOptionalOptionalFalseSet = new RequirementSet(true);
+        $optionalOptionalOptionalFalseSet->merge($optionalOptionalFalseSet);
+        $optionalOptionalOptionalFalseSet->merge($optionalMandatoryTrueSet);
+        $this->assertTrue(
+            $optionalOptionalOptionalFalseSet->fulfilled(),
+            'A optional set of type and with two nested optional sets of type and where one has a mandatory'
+            . ' TrueRequirement and the other one has a optional FalseRequirement is not fulfilled'
+        );
+    }
+
+    public function testNestedMandatoryRequirementsOfTypeOr()
+    {
+        $trueSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $trueSet->add(new TrueRequirement());
+        $falseSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $falseSet->add(new FalseRequirement());
+
+        $nestedTrueSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $nestedTrueSet->merge($trueSet);
+        $this->assertTrue(
+            $nestedTrueSet->fulfilled(),
+            'A nested mandatory set of type or with one mandatory TrueRequirement is not fulfilled'
+        );
+
+        $nestedFalseSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $nestedFalseSet->merge($falseSet);
+        $this->assertFalse(
+            $nestedFalseSet->fulfilled(),
+            'A nested mandatory set of type or with one mandatory FalseRequirement is fulfilled'
+        );
+
+        $nestedMixedSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $nestedMixedSet->merge($trueSet);
+        $nestedMixedSet->merge($falseSet);
+        $this->assertTrue(
+            $nestedMixedSet->fulfilled(),
+            'Two nested mandatory sets of type or with one mandatory True- and'
+            . ' one mandatory FalseRequirement respectively are not fulfilled'
+        );
+    }
+
+    public function testNestedOptionalRequirementsOfTypeOr()
+    {
+        $trueSet = new RequirementSet(true, RequirementSet::MODE_OR);
+        $trueSet->add(new TrueRequirement());
+        $falseSet = new RequirementSet(true, RequirementSet::MODE_OR);
+        $falseSet->add(new FalseRequirement());
+
+        $nestedTrueSet = new RequirementSet(true, RequirementSet::MODE_OR);
+        $nestedTrueSet->merge($trueSet);
+        $this->assertTrue(
+            $nestedTrueSet->fulfilled(),
+            'A nested optional set of type or with one mandatory TrueRequirement is not fulfilled'
+        );
+
+        $nestedFalseSet = new RequirementSet(true, RequirementSet::MODE_OR);
+        $nestedFalseSet->merge($falseSet);
+        $this->assertTrue(
+            $nestedFalseSet->fulfilled(),
+            'A nested optional set of type or with one mandatory FalseRequirement is not fulfilled'
+        );
+
+        $nestedMixedSet = new RequirementSet(true, RequirementSet::MODE_OR);
+        $nestedMixedSet->merge($trueSet);
+        $nestedMixedSet->merge($falseSet);
+        $this->assertTrue(
+            $nestedMixedSet->fulfilled(),
+            'Two nested optional sets of type or with one mandatory True- and'
+            . ' one mandatory FalseRequirement respectively are not fulfilled'
+        );
+    }
+
+    public function testNestedMixedRequirementsOfTypeOr()
+    {
+        $mandatoryMandatoryTrueSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $mandatoryMandatoryTrueSet->add(new TrueRequirement());
+        $mandatoryOptionalTrueSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $mandatoryOptionalTrueSet->add(new TrueRequirement(array('optional' => true)));
+        $mandatoryMandatoryFalseSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $mandatoryMandatoryFalseSet->add(new FalseRequirement());
+        $mandatoryOptionalFalseSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $mandatoryOptionalFalseSet->add(new FalseRequirement(array('optional' => true)));
+        $optionalMandatoryTrueSet = new RequirementSet(true, RequirementSet::MODE_OR);
+        $optionalMandatoryTrueSet->add(new TrueRequirement());
+        $optionalOptionalTrueSet = new RequirementSet(true, RequirementSet::MODE_OR);
+        $optionalOptionalTrueSet->add(new TrueRequirement(array('optional' => true)));
+        $optionalMandatoryFalseSet = new RequirementSet(true, RequirementSet::MODE_OR);
+        $optionalMandatoryFalseSet->add(new FalseRequirement());
+        $optionalOptionalFalseSet = new RequirementSet(true, RequirementSet::MODE_OR);
+        $optionalOptionalFalseSet->add(new FalseRequirement(array('optional' => true)));
+
+        $mandatoryMandatoryOptionalTrueSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $mandatoryMandatoryOptionalTrueSet->merge($mandatoryOptionalTrueSet);
+        $mandatoryMandatoryOptionalTrueSet->merge($mandatoryMandatoryFalseSet);
+        $this->assertTrue($mandatoryMandatoryOptionalTrueSet->fulfilled());
+
+        $mandatoryMandatoryOptionalFalseSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $mandatoryMandatoryOptionalFalseSet->merge($mandatoryOptionalFalseSet);
+        $mandatoryMandatoryOptionalFalseSet->merge($mandatoryMandatoryTrueSet);
+        $this->assertTrue($mandatoryMandatoryOptionalFalseSet->fulfilled());
+
+        $optionalOptionalOptionalTrueSet = new RequirementSet(true, RequirementSet::MODE_OR);
+        $optionalOptionalOptionalTrueSet->merge($optionalOptionalTrueSet);
+        $optionalOptionalOptionalTrueSet->merge($optionalMandatoryFalseSet);
+        $this->assertTrue($optionalOptionalOptionalTrueSet->fulfilled());
+
+        $optionalOptionalOptionalFalseSet = new RequirementSet(true, RequirementSet::MODE_OR);
+        $optionalOptionalOptionalFalseSet->merge($optionalOptionalFalseSet);
+        $optionalOptionalOptionalFalseSet->merge($optionalMandatoryTrueSet);
+        $this->assertTrue($optionalOptionalOptionalFalseSet->fulfilled());
+    }
+
+    public function testNestedMandatoryRequirementsOfDifferentTypes()
+    {
+        $true = new TrueRequirement();
+        $false = new FalseRequirement();
+
+        $level1And = new RequirementSet();
+        $level2FirstOr = new RequirementSet(false, RequirementSet::MODE_OR);
+        $level2SecondOr = new RequirementSet(false, RequirementSet::MODE_OR);
+        $level1And->merge($level2FirstOr)->merge($level2SecondOr);
+        $level3FirstAnd = new RequirementSet();
+        $level3SecondAnd = new RequirementSet();
+        $level2FirstOr->merge($level3FirstAnd)->merge($level3SecondAnd);
+        $level2SecondOr->merge($level3FirstAnd)->merge($level3SecondAnd);
+        $level3FirstAnd->add($true)->add($true);
+        $level3SecondAnd->add($false)->add($true);
+        $this->assertTrue($level1And->fulfilled());
+
+        $level1Or = new RequirementSet(false, RequirementSet::MODE_OR);
+        $level2FirstAnd = new RequirementSet();
+        $level2SecondAnd = new RequirementSet();
+        $level1Or->merge($level2FirstAnd)->merge($level2SecondAnd);
+        $level3FirstOr = new RequirementSet(false, RequirementSet::MODE_OR);
+        $level3SecondOr = new RequirementSet(false, RequirementSet::MODE_OR);
+        $level2FirstAnd->merge($level3FirstOr)->merge($level3SecondOr);
+        $level2SecondAnd->merge($level3FirstOr)->merge($level3SecondOr);
+        $level3FirstOr->add($false);
+        $level3SecondOr->add($true);
+        $this->assertFalse($level1Or->fulfilled());
+    }
+
+    public function testNestedOptionalRequirementsOfDifferentTypes()
+    {
+        $true = new TrueRequirement();
+        $false = new FalseRequirement();
+
+        $level1And = new RequirementSet();
+        $level2FirstAnd = new RequirementSet(true);
+        $level2SecondAnd = new RequirementSet(true);
+        $level1And->merge($level2FirstAnd)->merge($level2SecondAnd);
+        $level3FirstOr = new RequirementSet(true, RequirementSet::MODE_OR);
+        $level3SecondOr = new RequirementSet(true, RequirementSet::MODE_OR);
+        $level2FirstAnd->merge($level3FirstOr)->merge($level3SecondOr);
+        $level2SecondAnd->merge($level3FirstOr)->merge($level3SecondOr);
+        $level3FirstOr->add($false);
+        $level3SecondOr->add($false);
+        $this->assertFalse($level1And->fulfilled());
+        $this->assertTrue($level2FirstAnd->fulfilled());
+        $this->assertTrue($level2SecondAnd->fulfilled());
+
+        $level1Or = new RequirementSet(false, RequirementSet::MODE_OR);
+        $level2FirstOr = new RequirementSet(true, RequirementSet::MODE_OR);
+        $level2SecondOr = new RequirementSet(true, RequirementSet::MODE_OR);
+        $level1Or->merge($level2FirstOr)->merge($level2SecondOr);
+        $level3FirstAnd = new RequirementSet(true);
+        $level3SecondAnd = new RequirementSet(true);
+        $level2FirstOr->merge($level3FirstAnd)->merge($level3SecondAnd);
+        $level2SecondOr->merge($level3FirstAnd)->merge($level3SecondAnd);
+        $level3FirstAnd->add($true)->add($true);
+        $level3SecondAnd->add($false)->add($true);
+        $this->assertTrue($level1Or->fulfilled());
+    }
+
+    public function testNestedMixedRequirementsOfDifferentTypes()
+    {
+        $this->markTestIncomplete();
+    }
+}

From c44d5d2a735700e441fe9c9fcb3ade7d57991135 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 10 Mar 2015 09:31:57 +0100
Subject: [PATCH 0911/2920] Use a custom RecursiveIteratorIterator to render a
 RequirementSet

refs #8508
---
 .../scripts/form/setup-requirements.phtml     | 65 ++++-----------
 .../setup/library/Setup/RequirementSet.php    | 11 +++
 .../library/Setup/RequirementsRenderer.php    | 83 +++++++++++++++++++
 public/css/icinga/setup.less                  | 37 ++++++++-
 4 files changed, 144 insertions(+), 52 deletions(-)
 create mode 100644 modules/setup/library/Setup/RequirementsRenderer.php

diff --git a/modules/setup/application/views/scripts/form/setup-requirements.phtml b/modules/setup/application/views/scripts/form/setup-requirements.phtml
index 9918df008..571a661b6 100644
--- a/modules/setup/application/views/scripts/form/setup-requirements.phtml
+++ b/modules/setup/application/views/scripts/form/setup-requirements.phtml
@@ -1,66 +1,35 @@
 <?php
 
-use \RecursiveIteratorIterator;
 use Icinga\Web\Wizard;
 
 $requirements = $form->getRequirements();
-$iterator = new RecursiveIteratorIterator($requirements);
+echo $requirements;
 
 ?>
-<table class="requirements">
-  <tbody>
-<?php foreach ($iterator as $requirement): ?>
-    <tr>
-      <td><h2><?= $requirement->getTitle(); ?></h2></td>
-      <td style="width: 50%">
-      <?php $descriptions = $requirement->getDescriptions(); ?>
-      <?php if (count($descriptions) > 1): ?>
-        <ul>
-        <?php foreach ($descriptions as $desc): ?>
-          <li><?= $desc; ?></li>
-        <?php endforeach ?>
-        </ul>
-      <?php elseif (! empty($descriptions)): ?>
-        <?= $descriptions[0]; ?>
-      <?php endif ?>
-      </td>
-      <td class="state <?= $requirement->getState() ? 'fulfilled' : (
-        $requirement->isOptional() ? 'not-available' : 'missing'
-      ); ?>"><?= $requirement->getStateText(); ?></td>
-    </tr>
-<?php endforeach ?>
-    <tr>
-      <td></td>
-      <td></td>
-      <td class="btn-update">
-        <div class="buttons">
-          <?php $title = $this->translate('You may also need to restart the web-server for the changes to take effect!'); ?>
-          <?= $this->qlink(
-            $this->translate('Refresh'),
-            null,
-            null,
-            array(
-              'class'       => 'button-like',
-              'title'       => $title,
-              'aria-label'  => sprintf($this->translate('Refresh the page; %s'), $title)
-            )
-          ); ?>
-        </div>
-      </td>
-    </tr>
-  </tbody>
-</table>
+<div class="buttons requirements-refresh">
+  <?php $title = $this->translate('You may also need to restart the web-server for the changes to take effect!'); ?>
+  <?= $this->qlink(
+    $this->translate('Refresh'),
+    null,
+    null,
+    array(
+      'class'       => 'button-like',
+      'title'       => $title,
+      'aria-label'  => sprintf($this->translate('Refresh the page; %s'), $title)
+    )
+  ); ?>
+</div>
 <form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
   <?= $form->getElement($form->getTokenElementName()); ?>
   <?= $form->getElement($form->getUidElementName()); ?>
-  <div class="buttons" style="margin: 0 0 1.5em;">
+  <div class="buttons">
     <?= $form->getElement(Wizard::BTN_PREV); ?>
     <?php
       $btn = $form->getElement(Wizard::BTN_NEXT);
-      if (false === $requirements->fulfilled()) {
+      if (! $requirements->fulfilled()) {
           $btn->setAttrib('disabled', 1);
       }
       echo $btn;
     ?>
   </div>
-</form>
+</form>
\ No newline at end of file
diff --git a/modules/setup/library/Setup/RequirementSet.php b/modules/setup/library/Setup/RequirementSet.php
index 966cf98cc..8bb018d7b 100644
--- a/modules/setup/library/Setup/RequirementSet.php
+++ b/modules/setup/library/Setup/RequirementSet.php
@@ -319,4 +319,15 @@ class RequirementSet implements RecursiveIterator
     {
         next($this->requirements);
     }
+
+    /**
+     * Return this set of requirements rendered as HTML
+     *
+     * @return  string
+     */
+    public function __toString()
+    {
+        $renderer = new RequirementsRenderer($this);
+        return (string) $renderer;
+    }
 }
diff --git a/modules/setup/library/Setup/RequirementsRenderer.php b/modules/setup/library/Setup/RequirementsRenderer.php
new file mode 100644
index 000000000..b768a1e86
--- /dev/null
+++ b/modules/setup/library/Setup/RequirementsRenderer.php
@@ -0,0 +1,83 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Setup;
+
+use RecursiveIteratorIterator;
+
+class RequirementsRenderer extends RecursiveIteratorIterator
+{
+    public function beginIteration()
+    {
+        $this->tags[] = '<table class="requirements">';
+        $this->tags[] = '<tbody>';
+    }
+
+    public function endIteration()
+    {
+        $this->tags[] = '</tbody>';
+        $this->tags[] = '</table>';
+    }
+
+    public function beginChildren()
+    {
+        $this->tags[] = '<tr>';
+        $currentSet = $this->getSubIterator();
+        $state = $currentSet->getState() ? 'fulfilled' : (
+            $currentSet->isOptional() ? 'not-available' : 'missing'
+        );
+        $colSpanRequired = $this->hasSingleRequirements($this->getSubIterator($this->getDepth() - 1));
+        $this->tags[] = '<td class="set-state ' . $state . '"' . ($colSpanRequired ? ' colspan=3' : '') . '>';
+        $this->beginIteration();
+    }
+
+    public function endChildren()
+    {
+        $this->endIteration();
+        $this->tags[] = '</td>';
+        $this->tags[] = '</tr>';
+    }
+
+    protected function hasSingleRequirements(RequirementSet $requirements)
+    {
+        $set = $requirements->getAll();
+        foreach ($set as $entry) {
+            if ($entry instanceof Requirement) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function render()
+    {
+        foreach ($this as $requirement) {
+            $this->tags[] = '<tr>';
+            $this->tags[] = '<td class="title"><h2>' . $requirement->getTitle() . '</h2></td>';
+            $this->tags[] = '<td class="desc">';
+            $descriptions = $requirement->getDescriptions();
+            if (count($descriptions) > 1) {
+                $this->tags[] = '<ul>';
+                foreach ($descriptions as $d) {
+                    $this->tags[] = '<li>' . $d . '</li>';
+                }
+                $this->tags[] = '</ul>';
+            } elseif (! empty($descriptions)) {
+                $this->tags[] = $descriptions[0];
+            }
+            $this->tags[] = '</td>';
+            $this->tags[] = '<td class="state ' . ($requirement->getState() ? 'fulfilled' : (
+                $requirement->isOptional() ? 'not-available' : 'missing'
+            )) . '">' . $requirement->getStateText() . '</td>';
+            $this->tags[] = '</tr>';
+        }
+
+        return implode("\n", $this->tags);
+    }
+
+    public function __toString()
+    {
+        return $this->render();
+    }
+}
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index 66b08417e..31ecd205f 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -110,7 +110,8 @@
 }
 
 #setup div.buttons {
-  margin: 1.5em 0;
+  margin-top: 1.5em; // Yes, -top and -bottom, keep it like that...
+  margin-bottom: 1.5em;
 
   .double {
     position: absolute;
@@ -166,25 +167,53 @@
   }
 }
 
-#setup table.requirements {
+form#setup_requirements {
+  padding-top: 0.5em;
+  border-top: 2px solid @colorPetrol;
+}
+
+div.requirements-refresh {
+  width: 25%;
+  margin-left: 75%;
+  text-align: center;
+}
+
+#setup > table.requirements {
   font-size: 0.9em;
-  margin: -1em -1em 2em;
+}
+
+#setup table.requirements {
+  margin: -1em;
   border-spacing: 1em;
   border-collapse: separate;
-  border-bottom: 2px solid @colorPetrol;
 
   td {
+    padding: 0;
+
     h2 {
       margin: 0 1em 0 0;
     }
 
+    table {
+      font-size: 102%; // Just a hack for webkit, remove this in case you can't see any difference or make it work without it
+    }
+
     ul {
       margin: 0;
       padding-left: 1em;
       list-style-type: square;
     }
 
+    &.title {
+      width: 25%;
+    }
+
+    &.desc {
+      width: 50%;
+    }
+
     &.state {
+      width: 25%;
       color: white;
       padding: 0.4em;
 

From 2d3fec9a42f5362b525912aa5f844f56f5dc7344 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 09:57:51 +0100
Subject: [PATCH 0912/2920] Do not select host_state_type in the service detail
 view

The column host_state_type is not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 774511ae3..69717a9ea 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -109,7 +109,6 @@ class Service extends MonitoredObject
             'host_name',
             'host_display_name',
             'host_state',
-            'host_state_type',
             'host_last_state_change',
             'host_address',
             'host_problem',

From 330b575c7cf30c71205814d3de4426c0e12cc37b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 09:58:36 +0100
Subject: [PATCH 0913/2920] Remove duplicate service_last_check column from the
 service detail view select

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 69717a9ea..dff8e7c52 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -132,7 +132,6 @@ class Service extends MonitoredObject
             'service_notifications_enabled_changed',
             'service_action_url',
             'service_notes_url',
-            'service_last_check',
             'service_next_check',
             'service_attempt',
             'service_last_notification',

From af4bce35575b4ffcfb182c2c4eb3c11009ee0157 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 10:00:07 +0100
Subject: [PATCH 0914/2920] Do not select icon_image columns in the service
 detail view

The columns host_icon_image and service_icon_image are not used in the service detail view.

refs #8665
refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index dff8e7c52..4d043d878 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -122,7 +122,6 @@ class Service extends MonitoredObject
             'service_unhandled',
             'service_output',
             'service_last_state_change',
-            'service_icon_image',
             'service_long_output',
             'service_is_flapping',
             'service_state_type',
@@ -138,7 +137,6 @@ class Service extends MonitoredObject
             'service_check_command',
             'service_check_source',
             'service_current_notification_number',
-            'host_icon_image',
             'host_acknowledged',
             'host_output',
             'host_long_output',

From 59f43a0f5eb2007d15843c09fabfce64d1aa06c6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 10 Mar 2015 10:56:05 +0100
Subject: [PATCH 0915/2920] Show module requirements as a separate table

refs #8508
---
 .../application/forms/RequirementsPage.php    | 28 +++++++-------
 .../scripts/form/setup-requirements.phtml     | 37 ++++++++++---------
 modules/setup/library/Setup/WebWizard.php     | 10 +++--
 public/css/icinga/setup.less                  | 33 +++++------------
 4 files changed, 50 insertions(+), 58 deletions(-)

diff --git a/modules/setup/application/forms/RequirementsPage.php b/modules/setup/application/forms/RequirementsPage.php
index 086e6e7fc..3ce50b7f1 100644
--- a/modules/setup/application/forms/RequirementsPage.php
+++ b/modules/setup/application/forms/RequirementsPage.php
@@ -4,7 +4,7 @@
 namespace Icinga\Module\Setup\Forms;
 
 use Icinga\Web\Form;
-use Icinga\Module\Setup\RequirementSet;
+use Icinga\Module\Setup\SetupWizard;
 
 /**
  * Wizard page to list setup requirements
@@ -12,11 +12,11 @@ use Icinga\Module\Setup\RequirementSet;
 class RequirementsPage extends Form
 {
     /**
-     * The requirements to list
+     * The wizard
      *
-     * @var RequirementSet
+     * @var SetupWizard
      */
-    protected $set;
+    protected $wizard;
 
     /**
      * Initialize this page
@@ -28,30 +28,30 @@ class RequirementsPage extends Form
     }
 
     /**
-     * Set the requirements to list
+     * Set the wizard
      *
-     * @param   RequirementSet    $set
+     * @param   SetupWizard    $wizard
      *
      * @return  self
      */
-    public function setRequirements(RequirementSet $set)
+    public function setWizard(SetupWizard $wizard)
     {
-        $this->set = $set;
+        $this->wizard = $wizard;
         return $this;
     }
 
     /**
-     * Return the requirements to list
+     * Return the wizard
      *
-     * @return  RequirementSet
+     * @return  SetupWizard
      */
-    public function getRequirements()
+    public function getWizard()
     {
-        return $this->set;
+        return $this->wizard;
     }
 
     /**
-     * Validate the given form data and check whether the requirements are fulfilled
+     * Validate the given form data and check whether the wizard's requirements are fulfilled
      *
      * @param   array   $data   The data to validate
      *
@@ -63,6 +63,6 @@ class RequirementsPage extends Form
             return false;
         }
 
-        return $this->set->fulfilled();
+        return $this->wizard->getRequirements()->fulfilled();
     }
 }
diff --git a/modules/setup/application/views/scripts/form/setup-requirements.phtml b/modules/setup/application/views/scripts/form/setup-requirements.phtml
index 571a661b6..fbd2c692a 100644
--- a/modules/setup/application/views/scripts/form/setup-requirements.phtml
+++ b/modules/setup/application/views/scripts/form/setup-requirements.phtml
@@ -2,23 +2,13 @@
 
 use Icinga\Web\Wizard;
 
-$requirements = $form->getRequirements();
-echo $requirements;
-
 ?>
-<div class="buttons requirements-refresh">
-  <?php $title = $this->translate('You may also need to restart the web-server for the changes to take effect!'); ?>
-  <?= $this->qlink(
-    $this->translate('Refresh'),
-    null,
-    null,
-    array(
-      'class'       => 'button-like',
-      'title'       => $title,
-      'aria-label'  => sprintf($this->translate('Refresh the page; %s'), $title)
-    )
-  ); ?>
-</div>
+<h1>Icinga Web 2</h1>
+<?= $form->getWizard()->getRequirements(true); ?>
+<?php foreach ($form->getWizard()->getPage('setup_modules')->getModuleWizards() as $moduleName => $wizard): ?>
+<h1><?= ucwords($moduleName) . ' ' . $this->translate('Module'); ?></h1>
+<?= $wizard->getRequirements(); ?>
+<?php endforeach ?>
 <form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
   <?= $form->getElement($form->getTokenElementName()); ?>
   <?= $form->getElement($form->getUidElementName()); ?>
@@ -26,10 +16,23 @@ echo $requirements;
     <?= $form->getElement(Wizard::BTN_PREV); ?>
     <?php
       $btn = $form->getElement(Wizard::BTN_NEXT);
-      if (! $requirements->fulfilled()) {
+      if (! $form->getWizard()->getRequirements()->fulfilled()) {
           $btn->setAttrib('disabled', 1);
       }
       echo $btn;
     ?>
+    <div class="requirements-refresh">
+      <?php $title = $this->translate('You may also need to restart the web-server for the changes to take effect!'); ?>
+      <?= $this->qlink(
+        $this->translate('Refresh'),
+        null,
+        null,
+        array(
+          'class'       => 'button-like',
+          'title'       => $title,
+          'aria-label'  => sprintf($this->translate('Refresh the page; %s'), $title)
+        )
+      ); ?>
+    </div>
   </div>
 </form>
\ No newline at end of file
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index e3091bd4d..d16b614f5 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -115,7 +115,7 @@ class WebWizard extends Wizard implements SetupWizard
     public function setupPage(Form $page, Request $request)
     {
         if ($page->getName() === 'setup_requirements') {
-            $page->setRequirements($this->getRequirements());
+            $page->setWizard($this);
         } elseif ($page->getName() === 'setup_preferences_type') {
             $authData = $this->getPageData('setup_authentication_type');
             if ($authData['type'] === 'db') {
@@ -355,7 +355,7 @@ class WebWizard extends Wizard implements SetupWizard
     /**
      * @see SetupWizard::getRequirements()
      */
-    public function getRequirements()
+    public function getRequirements($skipModules = false)
     {
         $set = new RequirementSet();
 
@@ -502,8 +502,10 @@ class WebWizard extends Wizard implements SetupWizard
             )
         )));
 
-        foreach ($this->getWizards() as $wizard) {
-            $set->merge($wizard->getRequirements());
+        if (! $skipModules) {
+            foreach ($this->getWizards() as $wizard) {
+                $set->merge($wizard->getRequirements());
+            }
         }
 
         return $set;
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index 31ecd205f..26c4b4e64 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -168,14 +168,19 @@
 }
 
 form#setup_requirements {
+  margin-top: 2em;
   padding-top: 0.5em;
   border-top: 2px solid @colorPetrol;
-}
 
-div.requirements-refresh {
-  width: 25%;
-  margin-left: 75%;
-  text-align: center;
+  div.buttons div.requirements-refresh {
+    width: 25%;
+    float: right;
+    text-align: center;
+
+    a.button-like {
+      padding: 0.1em 0.4em;
+    }
+  }
 }
 
 #setup > table.requirements {
@@ -230,24 +235,6 @@ div.requirements-refresh {
         background-color: @colorCritical;
       }
     }
-
-    &.btn-update {
-      padding-top: 0.3em;
-      text-align: center;
-
-      div.buttons {
-        margin: 0;
-
-        a.button-like {
-          padding: 0.2em 0.5em;
-          background-color: @colorPetro;
-
-          &:hover, &:focus {
-            background-color: #666;
-          }
-        }
-      }
-    }
   }
 }
 

From f4446cbaded08c99ab2ba5d6c0bc3c2fcb8817a5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 10 Mar 2015 11:00:51 +0100
Subject: [PATCH 0916/2920] Add todo to the MonitoringWizard related to the
 livestatus backend type

The requirement should be added to the OR-set that has currently both
ido requirement sets so that livestatus may the only choice again.

refs #8254
---
 .../monitoring/library/Monitoring/MonitoringWizard.php   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index 639986246..496809c33 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -138,6 +138,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
     {
         $set = new RequirementSet();
 
+        // TODO(8254): Add this to the $backendSet
         $set->add(new PhpModuleRequirement(array(
             'optional'      => true,
             'condition'     => 'Sockets',
@@ -148,7 +149,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
             )
         )));
 
-        $idoSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $backendSet = new RequirementSet(false, RequirementSet::MODE_OR);
         $mysqlSet = new RequirementSet(true);
         $mysqlSet->add(new PhpModuleRequirement(array(
             'optional'      => true,
@@ -168,7 +169,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
                 'The Zend database adapter for MySQL is required to access a MySQL database.'
             )
         )));
-        $idoSet->merge($mysqlSet);
+        $backendSet->merge($mysqlSet);
         $pgsqlSet = new RequirementSet(true);
         $pgsqlSet->add(new PhpModuleRequirement(array(
             'optional'      => true,
@@ -188,8 +189,8 @@ class MonitoringWizard extends Wizard implements SetupWizard
                 'The Zend database adapter for PostgreSQL is required to access a PostgreSQL database.'
             )
         )));
-        $idoSet->merge($pgsqlSet);
-        $set->merge($idoSet);
+        $backendSet->merge($pgsqlSet);
+        $set->merge($backendSet);
 
         return $set;
     }

From d0383a241e0f2bc4d4cd4d4b02d80c43cd3b9448 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 10 Mar 2015 12:30:22 +0100
Subject: [PATCH 0917/2920] Use date and mktime instead of cal_days_in_month to
 count a month's days

fixes #8637
---
 library/Icinga/Web/Widget/Chart/HistoryColorGrid.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
index 96b012db5..d1c9a677f 100644
--- a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
+++ b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
@@ -268,7 +268,7 @@ class HistoryColorGrid extends AbstractWidget {
                 }
                 $week++;
             }
-            if ($day > cal_days_in_month(CAL_GREGORIAN, $month, $year)) {
+            if ($day > date('t', mktime(0, 0, 0, $month, 1, $year))) {
                 $month++;
                 if ($month > 12) {
                     $year++;

From b2bb5af0a74be5ee1d7720db50a48a9b177094f3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:01:41 +0100
Subject: [PATCH 0918/2920] Don't select host_problem in the service detail
 view

The column host_problem is not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 4d043d878..f182bd065 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -111,7 +111,6 @@ class Service extends MonitoredObject
             'host_state',
             'host_last_state_change',
             'host_address',
-            'host_problem',
             'host_handled',
             'service_description',
             'service_display_name',

From 2ba5e8eb0cab01a61608f8e19f0adc5149930418 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:02:57 +0100
Subject: [PATCH 0919/2920] Don't select service_unhandled column in the
 service detail view

The column service_unhandled is not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index f182bd065..419ef2f12 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -118,7 +118,6 @@ class Service extends MonitoredObject
             'service_in_downtime',
             'service_acknowledged',
             'service_handled',
-            'service_unhandled',
             'service_output',
             'service_last_state_change',
             'service_long_output',

From 6d78ab69ef571a1ac032d40562b564d8069946f3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:03:55 +0100
Subject: [PATCH 0920/2920] Don't select service_severity column in the service
 detail view

The column service_severity is not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 419ef2f12..45278e79e 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -123,7 +123,6 @@ class Service extends MonitoredObject
             'service_long_output',
             'service_is_flapping',
             'service_state_type',
-            'service_severity',
             'service_last_check',
             'service_notifications_enabled',
             'service_notifications_enabled_changed',

From 9dc6e65e5f1643298ba71ffe4cd1f12d5afa58fa Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:05:39 +0100
Subject: [PATCH 0921/2920] Don't select host_output column in the service
 detail view

The column host_output is not used in the service detail view

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 45278e79e..99867a09f 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -135,7 +135,6 @@ class Service extends MonitoredObject
             'service_check_source',
             'service_current_notification_number',
             'host_acknowledged',
-            'host_output',
             'host_long_output',
             'host_in_downtime',
             'host_is_flapping',

From da7f959db5c68644f0bfc7e3438692d5bdf42ffb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:09:59 +0100
Subject: [PATCH 0922/2920] Don't select host_long_output in the service detail
 view

The column host_long_output is not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 99867a09f..25730d448 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -135,7 +135,6 @@ class Service extends MonitoredObject
             'service_check_source',
             'service_current_notification_number',
             'host_acknowledged',
-            'host_long_output',
             'host_in_downtime',
             'host_is_flapping',
             'host_last_check',

From 151d87f38ca730e6f7776d0418caee27f9ad7fab Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:19:37 +0100
Subject: [PATCH 0923/2920] Don't select host_is_flapping in the service detail
 view

The column host_is_flapping is not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 25730d448..82975de85 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -136,7 +136,6 @@ class Service extends MonitoredObject
             'service_current_notification_number',
             'host_acknowledged',
             'host_in_downtime',
-            'host_is_flapping',
             'host_last_check',
             'host_notifications_enabled',
             'host_unhandled_services',

From 4102ee290b338d640bf7a2c92e01b14204593bf1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:22:28 +0100
Subject: [PATCH 0924/2920] Don't select host_last_check in the service detail
 view

The column host_last_check is not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 82975de85..23a89454e 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -136,7 +136,6 @@ class Service extends MonitoredObject
             'service_current_notification_number',
             'host_acknowledged',
             'host_in_downtime',
-            'host_last_check',
             'host_notifications_enabled',
             'host_unhandled_services',
             'host_action_url',

From f87a43b9d3647efaf9fe67c838490f98508a8529 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 10 Mar 2015 13:24:54 +0100
Subject: [PATCH 0925/2920] Catch errors occuring on ldap discoveries

fixes #8656
---
 modules/setup/application/forms/LdapDiscoveryPage.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/setup/application/forms/LdapDiscoveryPage.php b/modules/setup/application/forms/LdapDiscoveryPage.php
index 1b8a85c77..588791e2c 100644
--- a/modules/setup/application/forms/LdapDiscoveryPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryPage.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Module\Setup\Forms;
 
+use Exception;
 use Zend_Validate_NotEmpty;
 use Icinga\Web\Form;
 use Icinga\Web\Form\ErrorLabeller;
@@ -68,9 +69,12 @@ class LdapDiscoveryPage extends Form
         }
 
         if (isset($data['domain']) && $data['domain']) {
-            $this->discovery = Discovery::discoverDomain($data['domain']);
-            if ($this->discovery->isSuccess()) {
-                return true;
+            try {
+                $this->discovery = Discovery::discoverDomain($data['domain']);
+                if ($this->discovery->isSuccess()) {
+                    return true;
+                }
+            } catch (Exception $e) {
             }
 
             $this->addError(

From b9ec2844f5191f445f974249afe5eef456f876a4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:25:25 +0100
Subject: [PATCH 0926/2920] Don't select host_unhandled_services in the service
 detail view

The column host_unhandled_services is not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 23a89454e..8be746d88 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -137,7 +137,6 @@ class Service extends MonitoredObject
             'host_acknowledged',
             'host_in_downtime',
             'host_notifications_enabled',
-            'host_unhandled_services',
             'host_action_url',
             'host_notes_url',
             'host_display_name',

From 0f65f83374481a7d264c84dcddffe81a38c30fe6 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:26:47 +0100
Subject: [PATCH 0927/2920] Don't select host_action_url in the service detail
 view

The column host_action_url is not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 8be746d88..acfddd90f 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -137,7 +137,6 @@ class Service extends MonitoredObject
             'host_acknowledged',
             'host_in_downtime',
             'host_notifications_enabled',
-            'host_action_url',
             'host_notes_url',
             'host_display_name',
             'host_alias',

From 5f57e290c72ef991637ed7c7ba78383aebb7db59 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:27:07 +0100
Subject: [PATCH 0928/2920] Don't select host_notes_url in the service detail
 view

The column host_notes_url is not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index acfddd90f..647ae5ca6 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -137,7 +137,6 @@ class Service extends MonitoredObject
             'host_acknowledged',
             'host_in_downtime',
             'host_notifications_enabled',
-            'host_notes_url',
             'host_display_name',
             'host_alias',
             'host_ipv4',

From 9146a62573207f7cadec00a2829524df63271fa3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:28:44 +0100
Subject: [PATCH 0929/2920] Don't select host_ipv4 in the service detail view

The column host_ipv4 is not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 647ae5ca6..8fa495648 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -139,7 +139,6 @@ class Service extends MonitoredObject
             'host_notifications_enabled',
             'host_display_name',
             'host_alias',
-            'host_ipv4',
             'host_severity',
             'host_perfdata',
             'host_active_checks_enabled',

From e1dbe0b9a75ffebce4e4844f43468fca87998d91 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:29:39 +0100
Subject: [PATCH 0930/2920] Don't select host_severity in the service detail
 view

The column host_severity is not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 8fa495648..8412d8542 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -139,7 +139,6 @@ class Service extends MonitoredObject
             'host_notifications_enabled',
             'host_display_name',
             'host_alias',
-            'host_severity',
             'host_perfdata',
             'host_active_checks_enabled',
             'host_passive_checks_enabled',

From 232b3d3a9f52e6fa5b03b2e11629dce1b7775ae1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:30:03 +0100
Subject: [PATCH 0931/2920] Don't select host_perfdata in the service detail
 view

The column host_perfdata is not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 8412d8542..e2c3fe801 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -139,7 +139,6 @@ class Service extends MonitoredObject
             'host_notifications_enabled',
             'host_display_name',
             'host_alias',
-            'host_perfdata',
             'host_active_checks_enabled',
             'host_passive_checks_enabled',
             'host_last_hard_state',

From 2cbeab55daa51c65a5da1a43145fc43620638eeb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:31:32 +0100
Subject: [PATCH 0932/2920] Don't select host_last_hard_state* in the service
 detail view

The columns host_last_hard_state and host_last_hard_state_change are not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index e2c3fe801..88a62294b 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -141,8 +141,6 @@ class Service extends MonitoredObject
             'host_alias',
             'host_active_checks_enabled',
             'host_passive_checks_enabled',
-            'host_last_hard_state',
-            'host_last_hard_state_change',
             'host_last_time_up',
             'host_last_time_down',
             'host_last_time_unreachable',

From 34ad174f89d4532ce757a3e03ea7a8a93378d392 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:32:28 +0100
Subject: [PATCH 0933/2920] Don't select host_last_time_* in the service detail
 view

The columns host_last_time_ up, down and unreachable are not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 88a62294b..810b326d9 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -141,9 +141,6 @@ class Service extends MonitoredObject
             'host_alias',
             'host_active_checks_enabled',
             'host_passive_checks_enabled',
-            'host_last_time_up',
-            'host_last_time_down',
-            'host_last_time_unreachable',
             'host_modified_host_attributes',
             'host',
             'service',

From d65aa39ebd862673d926ca94f337fa70d8108393 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:33:17 +0100
Subject: [PATCH 0934/2920] Don't select host_modified_host_attributes in the
 service detail view

The column host_modified_host_attributes is not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 810b326d9..16cb64e0c 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -141,7 +141,6 @@ class Service extends MonitoredObject
             'host_alias',
             'host_active_checks_enabled',
             'host_passive_checks_enabled',
-            'host_modified_host_attributes',
             'host',
             'service',
             'service_hard_state',

From 4e308016bfd48fa3b96e6048c3c79ab228f30537 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:37:40 +0100
Subject: [PATCH 0935/2920] Don't select service_hard_state in the service
 detail view

The column service_hard_state is not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 16cb64e0c..526e367d6 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -143,7 +143,6 @@ class Service extends MonitoredObject
             'host_passive_checks_enabled',
             'host',
             'service',
-            'service_hard_state',
             'service_problem',
             'service_perfdata',
             'service_active_checks_enabled',

From 3bbd68dc95f0f9403738a203398bf7e47fca86bc Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:38:12 +0100
Subject: [PATCH 0936/2920] Don't select service_problem in the service detail
 view

The column service_problem is not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 526e367d6..ce60d6c69 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -143,7 +143,6 @@ class Service extends MonitoredObject
             'host_passive_checks_enabled',
             'host',
             'service',
-            'service_problem',
             'service_perfdata',
             'service_active_checks_enabled',
             'service_active_checks_enabled_changed',

From 88dce0c1f4f578779227651ee6278c9d6cc1fc9d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:38:30 +0100
Subject: [PATCH 0937/2920] Don't select host and service columns in the
 service detail view

The columns host and service are not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index ce60d6c69..7e792c3c1 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -141,8 +141,6 @@ class Service extends MonitoredObject
             'host_alias',
             'host_active_checks_enabled',
             'host_passive_checks_enabled',
-            'host',
-            'service',
             'service_perfdata',
             'service_active_checks_enabled',
             'service_active_checks_enabled_changed',

From 70ef6263b2ab3c63197b13e00c7afb1d41df0572 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:45:20 +0100
Subject: [PATCH 0938/2920] Don't select service_last_hard_state* in the
 service detail view

The columns service_last_hard_state and service_last_hard_state_change are not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 7e792c3c1..242870231 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -146,8 +146,6 @@ class Service extends MonitoredObject
             'service_active_checks_enabled_changed',
             'service_passive_checks_enabled',
             'service_passive_checks_enabled_changed',
-            'service_last_hard_state',
-            'service_last_hard_state_change',
             'service_last_time_ok',
             'service_last_time_warning',
             'service_last_time_critical',

From 0cc6b5d0c2851e738316a2efd5e5581346b2716d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:46:09 +0100
Subject: [PATCH 0939/2920] Don't select service_last_time_* in the service
 detail view

The columns service_last_time_ ok, warning, critical and unknown are not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 242870231..6ef118973 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -146,10 +146,6 @@ class Service extends MonitoredObject
             'service_active_checks_enabled_changed',
             'service_passive_checks_enabled',
             'service_passive_checks_enabled_changed',
-            'service_last_time_ok',
-            'service_last_time_warning',
-            'service_last_time_critical',
-            'service_last_time_unknown',
             'service_check_execution_time',
             'service_check_latency',
             'service_current_check_attempt',

From 87e5bdfa4cb0105c8be9f84d8f3d265d370cc083 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 13:47:20 +0100
Subject: [PATCH 0940/2920] Do not select columns for check attempt twice in
 the service detail view

The column service_attempt is used in favor of service_current_check_attempt and service_max_check_attempts.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 6ef118973..ee59ed806 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -148,8 +148,6 @@ class Service extends MonitoredObject
             'service_passive_checks_enabled_changed',
             'service_check_execution_time',
             'service_check_latency',
-            'service_current_check_attempt',
-            'service_max_check_attempts',
             'service_obsessing',
             'service_obsessing_changed',
             'service_event_handler_enabled',

From 62f0f5b6a4d890c8ef9200b34a81ff1096fa500c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 14:00:17 +0100
Subject: [PATCH 0941/2920] Don't select service_modified_service_attributes in
 the service detail view

The column service_modified_service_attributes is not used in the service detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index ee59ed806..93328a48c 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -154,7 +154,6 @@ class Service extends MonitoredObject
             'service_event_handler_enabled_changed',
             'service_flap_detection_enabled',
             'service_flap_detection_enabled_changed',
-            'service_modified_service_attributes',
             'service_process_performance_data',
             'process_perfdata' => 'service_process_performance_data',
             'service_percent_state_change',

From e0acebf474d90e35c6635e86d5a1dd17d579b82b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 14:09:53 +0100
Subject: [PATCH 0942/2920] Don't select service_host_name in the service
 detail view

We already select the host_name.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 93328a48c..2ffc5a74b 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -156,8 +156,7 @@ class Service extends MonitoredObject
             'service_flap_detection_enabled_changed',
             'service_process_performance_data',
             'process_perfdata' => 'service_process_performance_data',
-            'service_percent_state_change',
-            'service_host_name'
+            'service_percent_state_change'
         ))
             ->where('host_name', $this->host->getName())
             ->where('service_description', $this->service);

From fcb94af93c4a55d8dcab661eb9f5c588ec952cce Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 14:11:50 +0100
Subject: [PATCH 0943/2920] Don't select service_process_performance_data twice
 in the service detail view

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 2ffc5a74b..9599a51cb 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -154,8 +154,7 @@ class Service extends MonitoredObject
             'service_event_handler_enabled_changed',
             'service_flap_detection_enabled',
             'service_flap_detection_enabled_changed',
-            'service_process_performance_data',
-            'process_perfdata' => 'service_process_performance_data',
+            'service_process_perfdata' => 'service_process_performance_data',
             'service_percent_state_change'
         ))
             ->where('host_name', $this->host->getName())

From e6949eaab4d56e4b770b30ce67e291426ca68fb8 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 14:17:09 +0100
Subject: [PATCH 0944/2920] Reorder columns to select in the Service object

refs #8614
---
 .../library/Monitoring/Object/Service.php     | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 9599a51cb..fc317fc8d 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -106,56 +106,56 @@ class Service extends MonitoredObject
     protected function getDataView()
     {
         return $this->backend->select()->from('serviceStatus', array(
-            'host_name',
-            'host_display_name',
-            'host_state',
-            '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_last_state_change',
-            'service_long_output',
-            'service_is_flapping',
-            'service_state_type',
-            'service_last_check',
-            'service_notifications_enabled',
-            'service_notifications_enabled_changed',
-            'service_action_url',
-            'service_notes_url',
-            'service_next_check',
-            'service_attempt',
-            'service_last_notification',
-            'service_check_command',
-            'service_check_source',
-            'service_current_notification_number',
             'host_acknowledged',
-            'host_in_downtime',
-            'host_notifications_enabled',
-            'host_display_name',
-            'host_alias',
             'host_active_checks_enabled',
+            'host_address',
+            'host_alias',
+            'host_display_name',
+            'host_display_name',
+            'host_handled',
+            'host_in_downtime',
+            'host_last_state_change',
+            'host_name',
+            'host_notifications_enabled',
             'host_passive_checks_enabled',
-            'service_perfdata',
+            'host_state',
+            'service_acknowledged',
+            'service_action_url',
             'service_active_checks_enabled',
             'service_active_checks_enabled_changed',
-            'service_passive_checks_enabled',
-            'service_passive_checks_enabled_changed',
+            'service_attempt',
+            'service_check_command',
             'service_check_execution_time',
             'service_check_latency',
-            'service_obsessing',
-            'service_obsessing_changed',
+            'service_check_source',
+            'service_current_notification_number',
+            'service_description',
+            'service_display_name',
             'service_event_handler_enabled',
             'service_event_handler_enabled_changed',
             'service_flap_detection_enabled',
             'service_flap_detection_enabled_changed',
+            'service_handled',
+            'service_in_downtime',
+            'service_is_flapping',
+            'service_last_check',
+            'service_last_notification',
+            'service_last_state_change',
+            'service_long_output',
+            'service_next_check',
+            'service_notes_url',
+            'service_notifications_enabled',
+            'service_notifications_enabled_changed',
+            'service_obsessing',
+            'service_obsessing_changed',
+            'service_output',
+            'service_passive_checks_enabled',
+            'service_passive_checks_enabled_changed',
+            'service_percent_state_change',
+            'service_perfdata',
             'service_process_perfdata' => 'service_process_performance_data',
-            'service_percent_state_change'
+            'service_state',
+            'service_state_type'
         ))
             ->where('host_name', $this->host->getName())
             ->where('service_description', $this->service);

From 5ed6838f509e5877b301776c20d40e6a70efe1fa Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 10 Mar 2015 14:18:08 +0100
Subject: [PATCH 0945/2920] Don't select host_display_name twice in the service
 detail view

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index fc317fc8d..4195b0ff4 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -111,7 +111,6 @@ class Service extends MonitoredObject
             'host_address',
             'host_alias',
             'host_display_name',
-            'host_display_name',
             'host_handled',
             'host_in_downtime',
             'host_last_state_change',

From a34d6026b31a112922508e01f8aad46df47fd162 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 10 Mar 2015 15:03:48 +0100
Subject: [PATCH 0946/2920] LdapResourceForm: Validate the host field and do
 not require a port

fixes #7990
---
 .../Config/Resource/LdapResourceForm.php      | 36 +++++++++++++++----
 library/Icinga/Protocol/Ldap/Connection.php   |  3 +-
 library/Icinga/Web/Form/Element/Number.php    | 13 ++++---
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 499d39941..90cc17939 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -32,7 +32,7 @@ class LdapResourceForm extends Form
             array(
                 'required'      => true,
                 'label'         => $this->translate('Resource Name'),
-                'description'   => $this->translate('The unique name of this resource')
+                'description'   => $this->translate('The unique name of this resource.')
             )
         );
         $this->addElement(
@@ -42,18 +42,40 @@ class LdapResourceForm extends Form
                 'required'      => true,
                 'label'         => $this->translate('Host'),
                 'description'   => $this->translate(
-                    'The hostname or address of the LDAP server to use for authentication'
+                    'The hostname, address or URL of the LDAP server.'
                 ),
-                'value'         => 'localhost'
+                'value'         => 'localhost',
+                'validators'    => array(
+                    array(
+                        'Callback',
+                        false,
+                        array(
+                            'callback'  => function ($v) {
+                                return strpos($v, '?') === false;
+                            },
+                            'messages'  => array(
+                                'callbackValue' => $this->translate(
+                                    'The URL pointing to the LDAP server must not contain any filter attributes.'
+                                )
+                            )
+                        )
+                    )
+                ),
+                'requirement'   => $this->translate(
+                    'The LDAP server\'s URL must have the following format: [ldap[s]://]host[:port]'
+                )
             )
         );
         $this->addElement(
             'number',
             'port',
             array(
-                'required'      => true,
+                'allowEmpty'    => true,
                 'label'         => $this->translate('Port'),
-                'description'   => $this->translate('The port of the LDAP server to use for authentication'),
+                'description'   => $this->translate(
+                    'The port of the LDAP server. Leave empty if you\'ll set this as part of the URL above.'
+                    . ' If not set the default port (389) is being used.'
+                ),
                 'value'         => 389
             )
         );
@@ -74,7 +96,7 @@ class LdapResourceForm extends Form
             array(
                 'required'      => true,
                 'label'         => $this->translate('Bind DN'),
-                'description'   => $this->translate('The user dn to use for querying the ldap server')
+                'description'   => $this->translate('The user dn to use for querying the ldap server.')
             )
         );
         $this->addElement(
@@ -84,7 +106,7 @@ class LdapResourceForm extends Form
                 'required'          => true,
                 'renderPassword'    => true,
                 'label'             => $this->translate('Bind Password'),
-                'description'       => $this->translate('The password to use for querying the ldap server')
+                'description'       => $this->translate('The password to use for querying the ldap server.')
             )
         );
 
diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 053c6c908..e705c19b8 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -3,7 +3,6 @@
 
 namespace Icinga\Protocol\Ldap;
 
-use Exception;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Protocol\Ldap\Exception as LdapException;
 use Icinga\Application\Platform;
@@ -76,7 +75,7 @@ class Connection
         $this->bind_dn  = $config->bind_dn;
         $this->bind_pw  = $config->bind_pw;
         $this->root_dn  = $config->root_dn;
-        $this->port = $config->get('port', $this->port);
+        $this->port = $config->get('port') ?: $this->port;
     }
 
     public function getHostname()
diff --git a/library/Icinga/Web/Form/Element/Number.php b/library/Icinga/Web/Form/Element/Number.php
index 8a1217363..95640c5ca 100644
--- a/library/Icinga/Web/Form/Element/Number.php
+++ b/library/Icinga/Web/Form/Element/Number.php
@@ -132,12 +132,15 @@ class Number extends FormElement
      */
     public function isValid($value, $context = null)
     {
-        $this->setValue($value);
-        $value = $this->getValue();
-        if (! is_numeric($value)) {
-            $this->addError(sprintf($this->translate('\'%s\' is not a valid number'), $value));
+        if (! parent::isValid($value, $context)) {
             return false;
         }
-        return parent::isValid($value, $context);
+
+        if ((! empty($value) || !$this->getAllowEmpty()) && !is_numeric($value)) {
+            $this->addError(sprintf(t('\'%s\' is not a valid number'), $value));
+            return false;
+        }
+
+        return true;
     }
 }

From e72e340faa9db5531ddc71131cf113862d22c72c Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus@lazyfrosch.de>
Date: Tue, 10 Mar 2015 18:21:33 +0100
Subject: [PATCH 0947/2920] Remove Debian packaging from GIT

Refs #6402
---
 packages/debian/README.1st                    |  3 -
 packages/debian/changelog                     |  5 --
 packages/debian/compat                        |  1 -
 packages/debian/control                       | 68 -------------------
 packages/debian/icinga-php.install            |  1 -
 packages/debian/icingacli.install             |  3 -
 packages/debian/icingaweb-common.dirs         |  1 -
 packages/debian/icingaweb-common.install      |  2 -
 packages/debian/icingaweb-module-doc.install  |  1 -
 .../icingaweb-module-monitoring.install       |  1 -
 .../debian/icingaweb-module-setup.install     |  1 -
 packages/debian/icingaweb-module-test.install |  1 -
 .../icingaweb-module-translation.install      |  1 -
 .../icingaweb-vendor-htmlpurifier.install     |  1 -
 .../debian/icingaweb-vendor-jshrink.install   |  1 -
 .../debian/icingaweb-vendor-lessphp.install   |  1 -
 .../debian/icingaweb-vendor-parsedown.install |  1 -
 packages/debian/icingaweb-vendor-zend.install |  1 -
 packages/debian/icingaweb.install             | 10 ---
 packages/debian/rules                         | 35 ----------
 packages/debian/source/format                 |  1 -
 packages/debian/substvars                     |  1 -
 22 files changed, 141 deletions(-)
 delete mode 100644 packages/debian/README.1st
 delete mode 100644 packages/debian/changelog
 delete mode 100644 packages/debian/compat
 delete mode 100644 packages/debian/control
 delete mode 100644 packages/debian/icinga-php.install
 delete mode 100644 packages/debian/icingacli.install
 delete mode 100644 packages/debian/icingaweb-common.dirs
 delete mode 100644 packages/debian/icingaweb-common.install
 delete mode 100644 packages/debian/icingaweb-module-doc.install
 delete mode 100644 packages/debian/icingaweb-module-monitoring.install
 delete mode 100644 packages/debian/icingaweb-module-setup.install
 delete mode 100644 packages/debian/icingaweb-module-test.install
 delete mode 100644 packages/debian/icingaweb-module-translation.install
 delete mode 100644 packages/debian/icingaweb-vendor-htmlpurifier.install
 delete mode 100644 packages/debian/icingaweb-vendor-jshrink.install
 delete mode 100644 packages/debian/icingaweb-vendor-lessphp.install
 delete mode 100644 packages/debian/icingaweb-vendor-parsedown.install
 delete mode 100644 packages/debian/icingaweb-vendor-zend.install
 delete mode 100644 packages/debian/icingaweb.install
 delete mode 100755 packages/debian/rules
 delete mode 100644 packages/debian/source/format
 delete mode 100644 packages/debian/substvars

diff --git a/packages/debian/README.1st b/packages/debian/README.1st
deleted file mode 100644
index 66c58c719..000000000
--- a/packages/debian/README.1st
+++ /dev/null
@@ -1,3 +0,0 @@
-PLEASE DO NOT BUILD PACKAGES BASES ON THIS
-
-Packages may still be renamed
diff --git a/packages/debian/changelog b/packages/debian/changelog
deleted file mode 100644
index ed074d733..000000000
--- a/packages/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-icingaweb (2.0.0) stable; urgency=low
-
-  * First stable release (Closes: #0001)
-
- -- Thomas Gelf <thomas@gelf.net>  Fri, 28 Mar 2014 23:37:31 +0100
diff --git a/packages/debian/compat b/packages/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/packages/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/packages/debian/control b/packages/debian/control
deleted file mode 100644
index 73d0b57a3..000000000
--- a/packages/debian/control
+++ /dev/null
@@ -1,68 +0,0 @@
-Source: icingaweb
-Section: admin
-Maintainer: Icinga Development Team <info@icinga.org>
-Priority: optional
-Build-Depends: debhelper (>=9)
-Standards-Version: 3.9.4
-Homepage: https://www.icinga.org
-
-Package: php-icinga
-Architecture: any
-Depends: php5 (>= 5.3.2)
-Recommends: php5-ldap, php5-mysql, php5-json
-Suggests: php5-pgsql
-Description: Icinga PHP libraries
- PHP libraries 
-
-Package: icingaweb-common
-Architecture: any
-Depends: php-icinga
-Description: Icinga PHP common libraries
- PHP common libraries, application and modules
-
-Package: icingaweb-module-doc
-Architecture: any
-Depends: icingaweb-common
-Description: Icingaweb documentation module
- This module renders documentation for Icingaweb and its modules
-
-Package: icingaweb-module-monitoring
-Architecture: any
-Depends: icingaweb-common
-Description: Icingaweb monitoring module
- Use this module to visualize your monitoring environment in Icingaweb
-
-Package: icingaweb-module-setup
-Architecture: any
-Depends: icingaweb-common
-Description: Icingaweb setup module
- This setup wizard does your initial Icingaweb configuration
-
-Package: icingaweb-module-test
-Architecture: any
-Depends: icingacli
-Description: Icingaweb test module
- Use this module to run unit tests against Icingaweb or any of its modules
-
-Package: icingaweb-module-translation
-Architecture: any
-Depends: icingaweb-common
-Description: Icingaweb translation module 
- This module helps translators to get Icingaweb translations done
-
-Package: icingacli
-Architecture: any
-Depends: icingaweb-common, php5-cli (>= 5.3.2)
-Description: Icinga CLI tool
- The Icinga CLI allows one to access its Icinga monitoring
- system from a terminal. 
- .
- The CLI is based on the Icinga PHP libraries
-
-Package: icingaweb
-Architecture: any
-Depends: icingaweb-common, libapache2-mod-php5, zendframework | icingaweb-vendor-zend, icingaweb-vendor-parsedown, icingaweb-vendor-lessphp, icingaweb-vendor-jshrink, icingaweb-vendor-htmlpurifier, icingaweb-module-setup
-Recommends: icingaweb-module-monitoring, icingaweb-module-doc
-Suggests: php5-ldap
-Description: Icingaweb Frontend
- Icingaweb is a modular web frontend
diff --git a/packages/debian/icinga-php.install b/packages/debian/icinga-php.install
deleted file mode 100644
index 6cbd03f13..000000000
--- a/packages/debian/icinga-php.install
+++ /dev/null
@@ -1 +0,0 @@
-library/Icinga        usr/share/php
diff --git a/packages/debian/icingacli.install b/packages/debian/icingacli.install
deleted file mode 100644
index be3db5e1c..000000000
--- a/packages/debian/icingacli.install
+++ /dev/null
@@ -1,3 +0,0 @@
-packages/files/bin/icingacli  usr/bin
-etc/bash_completion.d         etc/bash_completion.d
-application/clicommands       usr/share/icingaweb/application
diff --git a/packages/debian/icingaweb-common.dirs b/packages/debian/icingaweb-common.dirs
deleted file mode 100644
index 00ec00632..000000000
--- a/packages/debian/icingaweb-common.dirs
+++ /dev/null
@@ -1 +0,0 @@
-etc/icingaweb
diff --git a/packages/debian/icingaweb-common.install b/packages/debian/icingaweb-common.install
deleted file mode 100644
index 91a34bcee..000000000
--- a/packages/debian/icingaweb-common.install
+++ /dev/null
@@ -1,2 +0,0 @@
-application/locales   usr/share/icingaweb/application
-modules               usr/share/icingaweb
diff --git a/packages/debian/icingaweb-module-doc.install b/packages/debian/icingaweb-module-doc.install
deleted file mode 100644
index 1482e8c66..000000000
--- a/packages/debian/icingaweb-module-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-modules/doc  usr/share/icingaweb/modules
diff --git a/packages/debian/icingaweb-module-monitoring.install b/packages/debian/icingaweb-module-monitoring.install
deleted file mode 100644
index 1482e8c66..000000000
--- a/packages/debian/icingaweb-module-monitoring.install
+++ /dev/null
@@ -1 +0,0 @@
-modules/doc  usr/share/icingaweb/modules
diff --git a/packages/debian/icingaweb-module-setup.install b/packages/debian/icingaweb-module-setup.install
deleted file mode 100644
index 4fdd070d2..000000000
--- a/packages/debian/icingaweb-module-setup.install
+++ /dev/null
@@ -1 +0,0 @@
-modules/setup  usr/share/icingaweb/modules
diff --git a/packages/debian/icingaweb-module-test.install b/packages/debian/icingaweb-module-test.install
deleted file mode 100644
index e0db79bca..000000000
--- a/packages/debian/icingaweb-module-test.install
+++ /dev/null
@@ -1 +0,0 @@
-modules/test  usr/share/icingaweb/modules
diff --git a/packages/debian/icingaweb-module-translation.install b/packages/debian/icingaweb-module-translation.install
deleted file mode 100644
index 5a89d3d4d..000000000
--- a/packages/debian/icingaweb-module-translation.install
+++ /dev/null
@@ -1 +0,0 @@
-modules/translation  usr/share/icingaweb/modules
diff --git a/packages/debian/icingaweb-vendor-htmlpurifier.install b/packages/debian/icingaweb-vendor-htmlpurifier.install
deleted file mode 100644
index 298284f29..000000000
--- a/packages/debian/icingaweb-vendor-htmlpurifier.install
+++ /dev/null
@@ -1 +0,0 @@
-library/vendor/HTMLPurifier  usr/share/icingaweb/library/vendor
diff --git a/packages/debian/icingaweb-vendor-jshrink.install b/packages/debian/icingaweb-vendor-jshrink.install
deleted file mode 100644
index 0db6b408b..000000000
--- a/packages/debian/icingaweb-vendor-jshrink.install
+++ /dev/null
@@ -1 +0,0 @@
-library/vendor/JShrink  usr/share/icingaweb/library/vendor
diff --git a/packages/debian/icingaweb-vendor-lessphp.install b/packages/debian/icingaweb-vendor-lessphp.install
deleted file mode 100644
index 1ace5481e..000000000
--- a/packages/debian/icingaweb-vendor-lessphp.install
+++ /dev/null
@@ -1 +0,0 @@
-library/vendor/Zend  usr/share/icingaweb/library/vendor
diff --git a/packages/debian/icingaweb-vendor-parsedown.install b/packages/debian/icingaweb-vendor-parsedown.install
deleted file mode 100644
index 13954e16b..000000000
--- a/packages/debian/icingaweb-vendor-parsedown.install
+++ /dev/null
@@ -1 +0,0 @@
-library/vendor/Parsedown  usr/share/icingaweb/library/vendor
diff --git a/packages/debian/icingaweb-vendor-zend.install b/packages/debian/icingaweb-vendor-zend.install
deleted file mode 100644
index 1ace5481e..000000000
--- a/packages/debian/icingaweb-vendor-zend.install
+++ /dev/null
@@ -1 +0,0 @@
-library/vendor/Zend  usr/share/icingaweb/library/vendor
diff --git a/packages/debian/icingaweb.install b/packages/debian/icingaweb.install
deleted file mode 100644
index 0fdee4dc0..000000000
--- a/packages/debian/icingaweb.install
+++ /dev/null
@@ -1,10 +0,0 @@
-public/css  usr/share/icingaweb/public
-public/img  usr/share/icingaweb/public
-public/js	usr/share/icingaweb/public
-public/error_norewrite.html usr/share/icingaweb/public
-application/controllers   usr/share/icingaweb/application
-application/fonts         usr/share/icingaweb/application
-application/layouts       usr/share/icingaweb/application
-application/views         usr/share/icingaweb/application
-packages/files/public/index.php  usr/share/icingaweb/public
-packages/files/apache/icingaweb.conf etc/apache2/conf.d
diff --git a/packages/debian/rules b/packages/debian/rules
deleted file mode 100755
index fbe100736..000000000
--- a/packages/debian/rules
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/make -f
-#export DH_VERBOSE=1
-
-%:
-	dh $@
-
-clean:
-	dh_testdir
-	dh_clean
-
-build:
-	dh_testdir
-
-binary:
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	dh_install
-	dh_installchangelogs
-	dh_installexamples
-	dh_installman
-	dh_installcron
-	dh_installdebconf
-	dh_installinfo
-	dh_installinit
-	dpkg-statoverride --force --add root www-data 2770 /etc/icingaweb
-	dh_compress
-	dh_fixperms
-	dh_strip
-	dh_shlibdeps
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
diff --git a/packages/debian/source/format b/packages/debian/source/format
deleted file mode 100644
index af745b310..000000000
--- a/packages/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (git)
diff --git a/packages/debian/substvars b/packages/debian/substvars
deleted file mode 100644
index abd3ebebc..000000000
--- a/packages/debian/substvars
+++ /dev/null
@@ -1 +0,0 @@
-misc:Depends=

From e4e6c1cb28922320c484767b0112d953484e5caf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 11 Mar 2015 07:58:40 +0100
Subject: [PATCH 0948/2920] Wizard: Fix that the wrong form element is used in
 case a user already exists

fixes #8678
---
 .../application/views/scripts/form/setup-admin-account.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/application/views/scripts/form/setup-admin-account.phtml b/modules/setup/application/views/scripts/form/setup-admin-account.phtml
index 77220017c..99e5692b3 100644
--- a/modules/setup/application/views/scripts/form/setup-admin-account.phtml
+++ b/modules/setup/application/views/scripts/form/setup-admin-account.phtml
@@ -35,7 +35,7 @@ $showRadioBoxes = strpos(strtolower(get_class($radioElem)), 'radio') !== false;
 <?php if (($existingUserElem = $form->getElement('existing_user')) !== null): ?>
   <div>
     <div class="instructions">
-      <?= $showRadioBoxes ? $byNameElem->setAttrib('data-related-radiobtn', 'existing_user') : $existingUserElem; ?>
+      <?= $showRadioBoxes ? $existingUserElem->setAttrib('data-related-radiobtn', 'existing_user') : $existingUserElem; ?>
     </div>
 <?php if ($showRadioBoxes): ?>
     <div class="radiobox">

From 2cf09ebc48159b1b85f46444fd83373dff3ef52a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 11 Mar 2015 08:00:20 +0100
Subject: [PATCH 0949/2920] Revert "LdapResourceForm: Validate the host field
 and do not require a port"

This reverts commit a34d6026b31a112922508e01f8aad46df47fd162.

refs #7990
---
 .../Config/Resource/LdapResourceForm.php      | 36 ++++---------------
 library/Icinga/Protocol/Ldap/Connection.php   |  3 +-
 library/Icinga/Web/Form/Element/Number.php    | 13 +++----
 3 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 90cc17939..499d39941 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -32,7 +32,7 @@ class LdapResourceForm extends Form
             array(
                 'required'      => true,
                 'label'         => $this->translate('Resource Name'),
-                'description'   => $this->translate('The unique name of this resource.')
+                'description'   => $this->translate('The unique name of this resource')
             )
         );
         $this->addElement(
@@ -42,40 +42,18 @@ class LdapResourceForm extends Form
                 'required'      => true,
                 'label'         => $this->translate('Host'),
                 'description'   => $this->translate(
-                    'The hostname, address or URL of the LDAP server.'
+                    'The hostname or address of the LDAP server to use for authentication'
                 ),
-                'value'         => 'localhost',
-                'validators'    => array(
-                    array(
-                        'Callback',
-                        false,
-                        array(
-                            'callback'  => function ($v) {
-                                return strpos($v, '?') === false;
-                            },
-                            'messages'  => array(
-                                'callbackValue' => $this->translate(
-                                    'The URL pointing to the LDAP server must not contain any filter attributes.'
-                                )
-                            )
-                        )
-                    )
-                ),
-                'requirement'   => $this->translate(
-                    'The LDAP server\'s URL must have the following format: [ldap[s]://]host[:port]'
-                )
+                'value'         => 'localhost'
             )
         );
         $this->addElement(
             'number',
             'port',
             array(
-                'allowEmpty'    => true,
+                'required'      => true,
                 'label'         => $this->translate('Port'),
-                'description'   => $this->translate(
-                    'The port of the LDAP server. Leave empty if you\'ll set this as part of the URL above.'
-                    . ' If not set the default port (389) is being used.'
-                ),
+                'description'   => $this->translate('The port of the LDAP server to use for authentication'),
                 'value'         => 389
             )
         );
@@ -96,7 +74,7 @@ class LdapResourceForm extends Form
             array(
                 'required'      => true,
                 'label'         => $this->translate('Bind DN'),
-                'description'   => $this->translate('The user dn to use for querying the ldap server.')
+                'description'   => $this->translate('The user dn to use for querying the ldap server')
             )
         );
         $this->addElement(
@@ -106,7 +84,7 @@ class LdapResourceForm extends Form
                 'required'          => true,
                 'renderPassword'    => true,
                 'label'             => $this->translate('Bind Password'),
-                'description'       => $this->translate('The password to use for querying the ldap server.')
+                'description'       => $this->translate('The password to use for querying the ldap server')
             )
         );
 
diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index e705c19b8..053c6c908 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Protocol\Ldap;
 
+use Exception;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Protocol\Ldap\Exception as LdapException;
 use Icinga\Application\Platform;
@@ -75,7 +76,7 @@ class Connection
         $this->bind_dn  = $config->bind_dn;
         $this->bind_pw  = $config->bind_pw;
         $this->root_dn  = $config->root_dn;
-        $this->port = $config->get('port') ?: $this->port;
+        $this->port = $config->get('port', $this->port);
     }
 
     public function getHostname()
diff --git a/library/Icinga/Web/Form/Element/Number.php b/library/Icinga/Web/Form/Element/Number.php
index 95640c5ca..8a1217363 100644
--- a/library/Icinga/Web/Form/Element/Number.php
+++ b/library/Icinga/Web/Form/Element/Number.php
@@ -132,15 +132,12 @@ class Number extends FormElement
      */
     public function isValid($value, $context = null)
     {
-        if (! parent::isValid($value, $context)) {
+        $this->setValue($value);
+        $value = $this->getValue();
+        if (! is_numeric($value)) {
+            $this->addError(sprintf($this->translate('\'%s\' is not a valid number'), $value));
             return false;
         }
-
-        if ((! empty($value) || !$this->getAllowEmpty()) && !is_numeric($value)) {
-            $this->addError(sprintf(t('\'%s\' is not a valid number'), $value));
-            return false;
-        }
-
-        return true;
+        return parent::isValid($value, $context);
     }
 }

From 0758be4af13e79e9402f032fd67b12730c992b0e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 11 Mar 2015 09:50:41 +0100
Subject: [PATCH 0950/2920] Add support for dynamic ldap filter expressions

"Dynamic" is a more of a overstatement when describing this commit but
the current implementation is just the start. Once our ldap protocol stuff
supports our filter implementation this will be vastly improved.

refs #8365
---
 library/Icinga/Protocol/Ldap/Expression.php | 30 +++++++++++++++++++++
 library/Icinga/Protocol/Ldap/Query.php      | 27 +++++++++++++++----
 2 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 library/Icinga/Protocol/Ldap/Expression.php

diff --git a/library/Icinga/Protocol/Ldap/Expression.php b/library/Icinga/Protocol/Ldap/Expression.php
new file mode 100644
index 000000000..403e1fd04
--- /dev/null
+++ b/library/Icinga/Protocol/Ldap/Expression.php
@@ -0,0 +1,30 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Protocol\Ldap;
+
+class Expression
+{
+    protected $value;
+
+    public function __construct($value)
+    {
+        $this->value = $value;
+    }
+
+    public function setValue($value)
+    {
+        $this->value = $value;
+        return $this;
+    }
+
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    public function __toString()
+    {
+        return (string) $this->getValue();
+    }
+}
diff --git a/library/Icinga/Protocol/Ldap/Query.php b/library/Icinga/Protocol/Ldap/Query.php
index 897f12f4e..4e25fe9d4 100644
--- a/library/Icinga/Protocol/Ldap/Query.php
+++ b/library/Icinga/Protocol/Ldap/Query.php
@@ -306,6 +306,19 @@ class Query
         return $paginator;
     }
 
+    /**
+     * Add a filter expression to this query
+     *
+     * @param   Expression  $expression
+     *
+     * @return  Query
+     */
+    public function addFilter(Expression $expression)
+    {
+        $this->filters[] = $expression;
+        return $this;
+    }
+
     /**
      * Returns the LDAP filter that will be applied
      *
@@ -318,11 +331,15 @@ class Query
             throw new Exception('Object class is mandatory');
         }
         foreach ($this->filters as $key => $value) {
-            $parts[] = sprintf(
-                '%s=%s',
-                LdapUtils::quoteForSearch($key),
-                LdapUtils::quoteForSearch($value, true)
-            );
+            if ($value instanceof Expression) {
+                $parts[] = (string) $value;
+            } else {
+                $parts[] = sprintf(
+                    '%s=%s',
+                    LdapUtils::quoteForSearch($key),
+                    LdapUtils::quoteForSearch($value, true)
+                );
+            }
         }
         if (count($parts) > 1) {
             return '(&(' . implode(')(', $parts) . '))';

From 39a74c4f3d3fb7859ced908316b17b13d6ef56ca Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 11 Mar 2015 09:52:14 +0100
Subject: [PATCH 0951/2920] LDAP-Auth backend config: Add support for custom
 LDAP filter rules

refs #8365
---
 .../Config/Authentication/LdapBackendForm.php | 58 +++++++++++++++----
 .../Backend/LdapUserBackend.php               | 29 ++++++++--
 library/Icinga/Authentication/UserBackend.php |  2 +
 .../application/forms/AdminAccountPage.php    |  3 +-
 .../Setup/Steps/AuthenticationStep.php        |  8 ++-
 5 files changed, 81 insertions(+), 19 deletions(-)

diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 4c7a027a7..838be7776 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -55,7 +55,7 @@ class LdapBackendForm extends Form
                 'required'      => true,
                 'label'         => $this->translate('Backend Name'),
                 'description'   => $this->translate(
-                    'The name of this authentication provider that is used to differentiate it from others'
+                    'The name of this authentication provider that is used to differentiate it from others.'
                 )
             )
         );
@@ -64,8 +64,10 @@ class LdapBackendForm extends Form
             'resource',
             array(
                 'required'      => true,
-                'label'         => $this->translate('LDAP Resource'),
-                'description'   => $this->translate('The resource to use for authenticating with this provider'),
+                'label'         => $this->translate('LDAP Connection'),
+                'description'   => $this->translate(
+                    'The LDAP connection to use for authenticating with this provider.'
+                ),
                 'multiOptions'  => false === empty($this->resources)
                     ? array_combine($this->resources, $this->resources)
                     : array()
@@ -77,10 +79,40 @@ class LdapBackendForm extends Form
             array(
                 'required'      => true,
                 'label'         => $this->translate('LDAP User Object Class'),
-                'description'   => $this->translate('The object class used for storing users on the ldap server'),
+                'description'   => $this->translate('The object class used for storing users on the LDAP server.'),
                 'value'         => 'inetOrgPerson'
             )
         );
+        $this->addElement(
+            'text',
+            'filter',
+            array(
+                'allowEmpty'    => true,
+                'label'         => $this->translate('LDAP Filter'),
+                'description'   => $this->translate(
+                    'An additional filter to use when looking up users using the specified connection. '
+                    . 'Leave empty to not to use any additional filter rules.'
+                ),
+                'requirement'   => $this->translate(
+                    'The filter needs to be expressed as standard LDAP expression, without'
+                    . ' outer parentheses. (e.g. &(foo=bar)(bar=foo) or foo=bar)'
+                ),
+                'validators'    => array(
+                    array(
+                        'Callback',
+                        false,
+                        array(
+                            'callback'  => function ($v) {
+                                return strpos($v, '(') !== 0;
+                            },
+                            'messages'  => array(
+                                'callbackValue' => $this->translate('The filter must not be wrapped in parantheses.')
+                            )
+                        )
+                    )
+                )
+            )
+        );
         $this->addElement(
             'text',
             'user_name_attribute',
@@ -88,7 +120,7 @@ class LdapBackendForm extends Form
                 'required'      => true,
                 'label'         => $this->translate('LDAP User Name Attribute'),
                 'description'   => $this->translate(
-                    'The attribute name used for storing the user name on the ldap server'
+                    'The attribute name used for storing the user name on the LDAP server.'
                 ),
                 'value'         => 'uid'
             )
@@ -106,10 +138,10 @@ class LdapBackendForm extends Form
             'base_dn',
             array(
                 'required'      => false,
-                'label'         => $this->translate('Base DN'),
+                'label'         => $this->translate('LDAP Base DN'),
                 'description'   => $this->translate(
-                    'The path where users can be found on the ldap server. Leave ' .
-                    'empty to select all users available on the specified resource.'
+                    'The path where users can be found on the LDAP server. Leave ' .
+                    'empty to select all users available using the specified connection.'
                 )
             )
         );
@@ -142,11 +174,17 @@ class LdapBackendForm extends Form
                 ResourceFactory::createResource($form->getResourceConfig()),
                 $form->getElement('user_class')->getValue(),
                 $form->getElement('user_name_attribute')->getValue(),
-                $form->getElement('base_dn')->getValue()
+                $form->getElement('base_dn')->getValue(),
+                $form->getElement('filter')->getValue()
             );
             $ldapUserBackend->assertAuthenticationPossible();
         } catch (AuthenticationException $e) {
-            $form->addError($e->getMessage());
+            if (($previous = $e->getPrevious()) !== null) {
+                $form->addError($previous->getMessage());
+            } else {
+                $form->addError($e->getMessage());
+            }
+
             return false;
         } catch (Exception $e) {
             $form->addError(sprintf($form->translate('Unable to validate authentication: %s'), $e->getMessage()));
diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/Backend/LdapUserBackend.php
index 016512ab4..211f05711 100644
--- a/library/Icinga/Authentication/Backend/LdapUserBackend.php
+++ b/library/Icinga/Authentication/Backend/LdapUserBackend.php
@@ -9,6 +9,7 @@ use Icinga\Protocol\Ldap\Query;
 use Icinga\Protocol\Ldap\Connection;
 use Icinga\Exception\AuthenticationException;
 use Icinga\Protocol\Ldap\Exception as LdapException;
+use Icinga\Protocol\Ldap\Expression;
 
 class LdapUserBackend extends UserBackend
 {
@@ -25,14 +26,23 @@ class LdapUserBackend extends UserBackend
 
     protected $userNameAttribute;
 
+    protected $customFilter;
+
     protected $groupOptions;
 
-    public function __construct(Connection $conn, $userClass, $userNameAttribute, $baseDn, $groupOptions = null)
-    {
+    public function __construct(
+        Connection $conn,
+        $userClass,
+        $userNameAttribute,
+        $baseDn,
+        $cutomFilter,
+        $groupOptions = null
+    ) {
         $this->conn = $conn;
-        $this->baseDn = trim($baseDn) !== '' ? $baseDn : $conn->getDN();
+        $this->baseDn = trim($baseDn) ?: $conn->getDN();
         $this->userClass = $userClass;
         $this->userNameAttribute = $userNameAttribute;
+        $this->customFilter = trim($cutomFilter);
         $this->groupOptions = $groupOptions;
     }
 
@@ -43,12 +53,18 @@ class LdapUserBackend extends UserBackend
      */
     protected function selectUsers()
     {
-        return $this->conn->select()->setBase($this->baseDn)->from(
+        $query = $this->conn->select()->setBase($this->baseDn)->from(
             $this->userClass,
             array(
                 $this->userNameAttribute
             )
         );
+
+        if ($this->customFilter) {
+            $query->addFilter(new Expression($this->customFilter));
+        }
+
+        return $query;
     }
 
     /**
@@ -88,9 +104,10 @@ class LdapUserBackend extends UserBackend
 
         if ($result === null) {
             throw new AuthenticationException(
-                'No objects with objectClass="%s" in DN="%s" found.',
+                'No objects with objectClass="%s" in DN="%s" found. (Filter: %s)',
                 $this->userClass,
-                $this->baseDn
+                $this->baseDn,
+                $this->customFilter ?: 'None'
             );
         }
 
diff --git a/library/Icinga/Authentication/UserBackend.php b/library/Icinga/Authentication/UserBackend.php
index cb6eb458b..e5a090bb5 100644
--- a/library/Icinga/Authentication/UserBackend.php
+++ b/library/Icinga/Authentication/UserBackend.php
@@ -103,6 +103,7 @@ abstract class UserBackend implements Countable
                     $backendConfig->get('user_class', 'user'),
                     $backendConfig->get('user_name_attribute', 'sAMAccountName'),
                     $backendConfig->get('base_dn', $resource->getDN()),
+                    $backendConfig->get('filter'),
                     $groupOptions
                 );
                 break;
@@ -130,6 +131,7 @@ abstract class UserBackend implements Countable
                     $backendConfig->user_class,
                     $backendConfig->user_name_attribute,
                     $backendConfig->get('base_dn', $resource->getDN()),
+                    $backendConfig->get('filter'),
                     $groupOptions
                 );
                 break;
diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index da9e90a14..d0766ed3c 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -272,7 +272,8 @@ class AdminAccountPage extends Form
                 ResourceFactory::createResource(new ConfigObject($this->resourceConfig)),
                 $this->backendConfig['user_class'],
                 $this->backendConfig['user_name_attribute'],
-                $this->backendConfig['base_dn']
+                $this->backendConfig['base_dn'],
+                $this->backendConfig['filter']
             );
         } else {
             throw new LogicException(
diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
index 495a42469..9de0c9867 100644
--- a/modules/setup/library/Setup/Steps/AuthenticationStep.php
+++ b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -126,11 +126,15 @@ class AuthenticationStep extends Step
             . '</tr>'
             . ($authType === 'ldap' ? (
                 '<tr>'
-                . '<td><strong>' . t('User Object Class') . '</strong></td>'
+                . '<td><strong>' . mt('setup', 'User Object Class') . '</strong></td>'
                 . '<td>' . $this->data['backendConfig']['user_class'] . '</td>'
                 . '</tr>'
                 . '<tr>'
-                . '<td><strong>' . t('User Name Attribute') . '</strong></td>'
+                . '<td><strong>' . mt('setup', 'Custom Filter') . '</strong></td>'
+                . '<td>' . trim($this->data['backendConfig']['filter']) ?: t('None', 'auth.ldap.filter') . '</td>'
+                . '</tr>'
+                . '<tr>'
+                . '<td><strong>' . mt('setup', 'User Name Attribute') . '</strong></td>'
                 . '<td>' . $this->data['backendConfig']['user_name_attribute'] . '</td>'
                 . '</tr>'
             ) : ($authType === 'external' ? (

From ba0154ab7957897268143bd45fc45738eb2f4415 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 11 Mar 2015 10:21:06 +0100
Subject: [PATCH 0952/2920] Tab: Use the title as caption if there is no label
 set yet

---
 library/Icinga/Web/Widget/Tab.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index c7fb30ff8..a210a206e 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -140,6 +140,10 @@ class Tab extends AbstractWidget
      */
     public function getLabel()
     {
+        if (! $this->label) {
+            return $this->title;
+        }
+
         return $this->label;
     }
 
@@ -238,7 +242,7 @@ class Tab extends AbstractWidget
             $classes[] = 'active';
         }
 
-        $caption = $view->escape($this->label);
+        $caption = $view->escape($this->getLabel());
         $tagParams = $this->tagParams;
 
         if ($this->title) {

From 132ae9e44c645c04a16a5a8cae5d8cb536068697 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 10:43:19 +0100
Subject: [PATCH 0953/2920] Use {@inheritdoc} in the Comment data view ...

... instead of duplicating method documentation.

refs #8614
---
 .../monitoring/library/Monitoring/DataView/Comment.php    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index f2d98895c..5172690bb 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -9,9 +9,7 @@ namespace Icinga\Module\Monitoring\DataView;
 class Comment extends DataView
 {
     /**
-     * Retrieve columns provided by this view
-     *
-     * @return array
+     * {@inheritdoc}
      */
     public function getColumns()
     {
@@ -34,9 +32,7 @@ class Comment extends DataView
     }
 
     /**
-     * Retrieve default sorting rules for particular columns. These involve sort order and potential additional to sort
-     *
-     * @return array
+     * {@inheritdoc}
      */
     public function getSortRules()
     {

From c69a46d005959afae483571fc63d415d55bfedfc Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 11:30:38 +0100
Subject: [PATCH 0954/2920] Add PHPDoc to the Downtime query

refs #8614
---
 .../Backend/Ido/Query/DowntimeQuery.php       | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index db4305c0d..f1981ef7f 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -3,8 +3,14 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
+/**
+ * Query for host and service downtimes
+ */
 class DowntimeQuery extends IdoQuery
 {
+    /**
+     * {@inheritdoc}
+     */
     protected $columnMap = array(
         'downtime' => array(
             'downtime_author'           => 'sd.author_name',
@@ -44,6 +50,9 @@ class DowntimeQuery extends IdoQuery
         )
     );
 
+    /**
+     * {@inheritdoc}
+     */
     protected function joinBaseTables()
     {
         $this->select->from(
@@ -63,6 +72,11 @@ class DowntimeQuery extends IdoQuery
         $this->joinedVirtualTables = array('downtime' => true);
     }
 
+    /**
+     * Join downtimes' hosts
+     *
+     * @return $this
+     */
     protected function joinHosts()
     {
         $this->select->joinLeft(
@@ -73,6 +87,11 @@ class DowntimeQuery extends IdoQuery
         return $this;
     }
 
+    /**
+     * Join downtimes' hosts' status
+     *
+     * @return $this
+     */
     protected function joinHoststatus()
     {
         $this->select->joinLeft(
@@ -80,8 +99,14 @@ class DowntimeQuery extends IdoQuery
             'ho.object_id = hs.host_object_id',
             array()
         );
+        return $this;
     }
 
+    /**
+     * Join downtimes' services
+     *
+     * @return $this
+     */
     protected function joinServices()
     {
         $this->select->joinLeft(
@@ -97,6 +122,11 @@ class DowntimeQuery extends IdoQuery
         return $this;
     }
 
+    /**
+     * Join downtimes' services' status
+     *
+     * @return $this
+     */
     protected function joinServicestatus()
     {
         $this->select->joinLeft(

From ea32d3dfb31cd92cfe89a85165be08e13c6d3851 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 11:54:23 +0100
Subject: [PATCH 0955/2920] Add PHPDoc to the EventHistory query

refs #8614
---
 .../Backend/Ido/Query/EventHistoryQuery.php   | 44 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index 12395abca..370fad9af 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
@@ -6,10 +6,23 @@ namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 use Zend_Db_Select;
 use Icinga\Data\Filter\Filter;
 
+/**
+ * Query for event history
+ */
 class EventHistoryQuery extends IdoQuery
 {
+    /**
+     * Subqueries used for the event history query
+     *
+     * @type    IdoQuery[]
+     *
+     * @see     EventHistoryQuery::joinBaseTables() For the used subqueries.
+     */
     protected $subQueries = array();
 
+    /**
+     * {@inheritdoc}
+     */
     protected $columnMap = array(
         'eventhistory' => array(
             'cnt_notification'      => "SUM(CASE eh.type WHEN 'notify' THEN 1 ELSE 0 END)",
@@ -41,8 +54,14 @@ class EventHistoryQuery extends IdoQuery
         )
     );
 
+    /**
+     * {@inheritdoc}
+     */
     protected $useSubqueryCount = true;
 
+    /**
+     * {@inheritdoc}
+     */
     protected function joinBaseTables()
     {
         $columns = array(
@@ -77,15 +96,20 @@ class EventHistoryQuery extends IdoQuery
         $this->joinedVirtualTables = array('eventhistory' => true);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function order($columnOrAlias, $dir = null)
     {
         foreach ($this->subQueries as $sub) {
             $sub->requireColumn($columnOrAlias);
         }
-
         return parent::order($columnOrAlias, $dir);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function addFilter(Filter $filter)
     {
         foreach ($this->subQueries as $sub) {
@@ -94,6 +118,9 @@ class EventHistoryQuery extends IdoQuery
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function where($condition, $value = null)
     {
         $this->requireColumn($condition);
@@ -103,6 +130,11 @@ class EventHistoryQuery extends IdoQuery
         return $this;
     }
 
+    /**
+     * Join host groups
+     *
+     * @return $this
+     */
     protected function joinHostgroups()
     {
         $this->select->join(
@@ -121,6 +153,11 @@ class EventHistoryQuery extends IdoQuery
         return $this;
     }
 
+    /**
+     * Join hosts
+     *
+     * @return $this
+     */
     protected function joinHosts()
     {
         $this->select->joinLeft(
@@ -131,6 +168,11 @@ class EventHistoryQuery extends IdoQuery
         return $this;
     }
 
+    /**
+     * Join services
+     *
+     * @return $this
+     */
     protected function joinServices()
     {
         $this->select->joinLeft(

From e72670cb753db1f9cb96751a9f42200f93b356e2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 12:03:05 +0100
Subject: [PATCH 0956/2920] Use default sorting for an object's event history

refs #8614
---
 modules/monitoring/library/Monitoring/Object/MonitoredObject.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 0f382f214..38053f5a2 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -459,7 +459,6 @@ abstract class MonitoredObject implements Filterable
                 'output',
                 'type'
         ))
-            ->order('timestamp', 'DESC')
             ->where('host_name', $this->host_name);
         if ($this->type === self::TYPE_SERVICE) {
             $eventHistory->where('service_description', $this->service_description);

From 37d09511c630e6217e9b4ba3e986ac49db401b67 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 13:07:33 +0100
Subject: [PATCH 0957/2920] Don't select host_modified_host_attributes in the
 host detail view

The column host_modified_host_attributes is not used in the host detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Host.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 273c65eae..93db2b815 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -128,7 +128,6 @@ class Host extends MonitoredObject
             'host_is_flapping',
             'host_action_url',
             'host_notes_url',
-            'host_modified_host_attributes',
             'host_problem',
             'host_process_performance_data',
             'process_perfdata' => 'host_process_performance_data'

From 84f56f4e5185feabb77680c41e8e5a356dd913ed Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 13:08:11 +0100
Subject: [PATCH 0958/2920] Don't select host_problem in the host detail view

The column host_problem is not used in the host detail view.

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Host.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 93db2b815..502be01a1 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -128,7 +128,6 @@ class Host extends MonitoredObject
             'host_is_flapping',
             'host_action_url',
             'host_notes_url',
-            'host_problem',
             'host_process_performance_data',
             'process_perfdata' => 'host_process_performance_data'
         );

From ef4970c0c13d11280e12fcdd604d83558ead7b33 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 13:08:53 +0100
Subject: [PATCH 0959/2920] Don't select host_process_performance_data twice in
 the host detail view

refs #8614
---
 modules/monitoring/library/Monitoring/Object/Host.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 502be01a1..7c132c22b 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -128,8 +128,7 @@ class Host extends MonitoredObject
             'host_is_flapping',
             'host_action_url',
             'host_notes_url',
-            'host_process_performance_data',
-            'process_perfdata' => 'host_process_performance_data'
+            'host_process_perfdata' => 'host_process_performance_data'
         );
         if ($this->backend->getType() === 'livestatus') {
             $columns[] = 'host_contacts';

From b501fef62b3000453dd4761b4f51b073a5399165 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 13:10:55 +0100
Subject: [PATCH 0960/2920] Rearrange columns in the Host object

refs #8614
---
 .../library/Monitoring/Object/Host.php        | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 7c132c22b..359065e57 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -89,46 +89,46 @@ class Host extends MonitoredObject
     protected function getDataView()
     {
         $columns = array(
-            'host_name',
-            'host_display_name',
-            'host_alias',
-            'host_address',
-            'host_state',
-            'host_state_type',
-            'host_handled',
-            'host_in_downtime',
             'host_acknowledged',
-            'host_last_state_change',
-            'host_last_notification',
-            'host_last_check',
-            'host_next_check',
+            'host_action_url',
+            'host_active_checks_enabled',
+            'host_active_checks_enabled_changed',
+            'host_address',
+            'host_alias',
+            'host_check_command',
             'host_check_execution_time',
             'host_check_latency',
             'host_check_source',
-            'host_output',
-            'host_long_output',
-            'host_check_command',
-            'host_perfdata',
-            'host_passive_checks_enabled',
-            'host_passive_checks_enabled_changed',
-            'host_obsessing',
-            'host_obsessing_changed',
-            'host_notifications_enabled',
-            'host_notifications_enabled_changed',
+            'host_current_check_attempt',
+            'host_current_notification_number',
+            'host_display_name',
             'host_event_handler_enabled',
             'host_event_handler_enabled_changed',
             'host_flap_detection_enabled',
             'host_flap_detection_enabled_changed',
-            'host_active_checks_enabled',
-            'host_active_checks_enabled_changed',
-            'host_current_check_attempt',
-            'host_max_check_attempts',
-            'host_current_notification_number',
-            'host_percent_state_change',
+            'host_handled',
+            'host_in_downtime',
             'host_is_flapping',
-            'host_action_url',
+            'host_last_check',
+            'host_last_notification',
+            'host_last_state_change',
+            'host_long_output',
+            'host_max_check_attempts',
+            'host_name',
+            'host_next_check',
             'host_notes_url',
-            'host_process_perfdata' => 'host_process_performance_data'
+            'host_notifications_enabled',
+            'host_notifications_enabled_changed',
+            'host_obsessing',
+            'host_obsessing_changed',
+            'host_output',
+            'host_passive_checks_enabled',
+            'host_passive_checks_enabled_changed',
+            'host_percent_state_change',
+            'host_perfdata',
+            'host_process_perfdata' => 'host_process_performance_data',
+            'host_state',
+            'host_state_type'
         );
         if ($this->backend->getType() === 'livestatus') {
             $columns[] = 'host_contacts';

From 0286641369d39c7aa47c6051b38099e178919b66 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 13:32:54 +0100
Subject: [PATCH 0961/2920] Don't fetch comments and downtimes twice in an
 object's detail view

The controller counts comments and downtimes on the object, which will automatically fetch comments and downtimes.
After that came a call to MonitoredObject::populate() which again fetched comments and downtimes.
Now the object is populated before counting comments and dowtimes.

refs #8614
---
 .../Monitoring/Web/Controller/MonitoredObjectController.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index f553c12f3..1b8fd2336 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -73,6 +73,7 @@ abstract class MonitoredObjectController extends Controller
                 }
             }
         }
+        $this->object->populate();
         if (count($this->object->comments) > 0 && $auth->hasPermission('monitoring/command/comment/delete')) {
             $delCommentForm = new DeleteCommentCommandForm();
             $delCommentForm
@@ -93,7 +94,7 @@ abstract class MonitoredObjectController extends Controller
             ->setObjects($this->object)
             ->handleRequest();
         $this->view->toggleFeaturesForm = $toggleFeaturesForm;
-        $this->view->object = $this->object->populate();
+        $this->view->object = $this->object;
     }
 
     /**

From 361afdcf13fe488c0d42cb63fb2883b7becc2710 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 14:08:43 +0100
Subject: [PATCH 0962/2920] Use ! empty in favor of count > 0 in the
 MonitoredObjectController

refs #8614
---
 .../Controller/MonitoredObjectController.php  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 1b8fd2336..04102e9d2 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -74,26 +74,26 @@ abstract class MonitoredObjectController extends Controller
             }
         }
         $this->object->populate();
-        if (count($this->object->comments) > 0 && $auth->hasPermission('monitoring/command/comment/delete')) {
-            $delCommentForm = new DeleteCommentCommandForm();
-            $delCommentForm
-                ->setObjects($this->object)
-                ->handleRequest();
-            $this->view->delCommentForm = $delCommentForm;
-        }
-        if (count($this->object->downtimes > 0) && $auth->hasPermission('monitoring/command/downtime/delete')) {
-            $delDowntimeForm = new DeleteDowntimeCommandForm();
-            $delDowntimeForm
-                ->setObjects($this->object)
-                ->handleRequest();
-            $this->view->delDowntimeForm = $delDowntimeForm;
-        }
         $toggleFeaturesForm = new ToggleObjectFeaturesCommandForm();
         $toggleFeaturesForm
             ->load($this->object)
             ->setObjects($this->object)
             ->handleRequest();
         $this->view->toggleFeaturesForm = $toggleFeaturesForm;
+        if (! empty($this->object->comments) && $auth->hasPermission('monitoring/command/comment/delete')) {
+            $delCommentForm = new DeleteCommentCommandForm();
+            $delCommentForm
+                ->setObjects($this->object)
+                ->handleRequest();
+            $this->view->delCommentForm = $delCommentForm;
+        }
+        if (! empty($this->object->downtimes) && $auth->hasPermission('monitoring/command/downtime/delete')) {
+            $delDowntimeForm = new DeleteDowntimeCommandForm();
+            $delDowntimeForm
+                ->setObjects($this->object)
+                ->handleRequest();
+            $this->view->delDowntimeForm = $delDowntimeForm;
+        }
         $this->view->object = $this->object;
     }
 

From 815dc8a5fa3a0963a2c50133dad0e2e62c77f580 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 14:51:59 +0100
Subject: [PATCH 0963/2920] Replace /** with /* for non PHPDoc in the logout
 script

refs #8626
---
 application/views/scripts/authentication/logout.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/scripts/authentication/logout.phtml b/application/views/scripts/authentication/logout.phtml
index 9b03d190f..8fc8a1c87 100644
--- a/application/views/scripts/authentication/logout.phtml
+++ b/application/views/scripts/authentication/logout.phtml
@@ -22,7 +22,7 @@
     </div>
 </div>
 <script type="text/javascript">
-    /**
+    /*
      * When JavaScript is available, trigger an XmlHTTPRequest with the non-existing user 'logout' and abort it
      * before it is able to finish. This will cause the browser to show a new authentication prompt in the next
      * request.

From 7220d781d8a78a804c37721a43b06acf826dc3d4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 15:00:43 +0100
Subject: [PATCH 0964/2920] Fix implicit declaration of variable msg in the
 logout view script

refs #8626
---
 application/views/scripts/authentication/logout.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/scripts/authentication/logout.phtml b/application/views/scripts/authentication/logout.phtml
index 8fc8a1c87..93f444b07 100644
--- a/application/views/scripts/authentication/logout.phtml
+++ b/application/views/scripts/authentication/logout.phtml
@@ -28,7 +28,7 @@
      * request.
      */
     $(document).ready(function() {
-        msg = $('#logout-status');
+        var msg = $('#logout-status');
         try {
             if (navigator.userAgent.toLowerCase().indexOf('msie') !== -1) {
                 document.execCommand('ClearAuthenticationCache');

From f44d5ec20acbd123cbbb146594b7a1a819fc515e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 15:06:07 +0100
Subject: [PATCH 0965/2920] Use <br> instead of <br /> in the logout view
 script

refs #8626
---
 application/views/scripts/authentication/logout.phtml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/views/scripts/authentication/logout.phtml b/application/views/scripts/authentication/logout.phtml
index 93f444b07..bcbb91ac8 100644
--- a/application/views/scripts/authentication/logout.phtml
+++ b/application/views/scripts/authentication/logout.phtml
@@ -9,7 +9,8 @@
 -->
 <div class="content">
     <div class="alert alert-warning" id="logout-status">
-        <b> <?= t('Logging out...'); ?> </b> <br />
+        <b><?= t('Logging out...'); ?></b>
+        <br>
         <?= t(
             'If this message does not disappear, it might be necessary to quit the ' .
             'current session manually by clearing the cache, or by closing the current ' .
@@ -18,7 +19,7 @@
     </div>
 
     <div class="container" >
-        <a href="<?= $this->href('dashboard/index'); ?>"> <?= t('Login'); ?></a>
+        <a href="<?= $this->href('dashboard/index'); ?>"><?= t('Login'); ?></a>
     </div>
 </div>
 <script type="text/javascript">

From 84348151ce345ae43355a509d3cf8953077b9108 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 15:06:58 +0100
Subject: [PATCH 0966/2920] Strings spanning multiple lines continue on the
 next line ...

... not on the same line

refs #8626
---
 application/views/scripts/authentication/logout.phtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/views/scripts/authentication/logout.phtml b/application/views/scripts/authentication/logout.phtml
index bcbb91ac8..df40f28a6 100644
--- a/application/views/scripts/authentication/logout.phtml
+++ b/application/views/scripts/authentication/logout.phtml
@@ -12,9 +12,9 @@
         <b><?= t('Logging out...'); ?></b>
         <br>
         <?= t(
-            'If this message does not disappear, it might be necessary to quit the ' .
-            'current session manually by clearing the cache, or by closing the current ' .
-            'browser session.'
+            'If this message does not disappear, it might be necessary to quit the'
+            . ' current session manually by clearing the cache, or by closing the current'
+            . ' browser session.'
         ); ?>
     </div>
 

From 8df9520497fa9b20afd9780c1018feaed802d432 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 15:08:10 +0100
Subject: [PATCH 0967/2920] Fix getXMLHttpRequest vs new XMLHttpRequest

I have never ever heard of getXMLHttpRequest.

refs #8626
---
 application/views/scripts/authentication/logout.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/scripts/authentication/logout.phtml b/application/views/scripts/authentication/logout.phtml
index df40f28a6..048335354 100644
--- a/application/views/scripts/authentication/logout.phtml
+++ b/application/views/scripts/authentication/logout.phtml
@@ -34,7 +34,7 @@
             if (navigator.userAgent.toLowerCase().indexOf('msie') !== -1) {
                 document.execCommand('ClearAuthenticationCache');
             } else {
-                var xhttp = getXMLHttpRequest();
+                var xhttp = new XMLHttpRequest();
                 xhttp.open('GET', 'arbitrary url', true, 'logout', 'logout');
                 xhttp.send('');
                 xhttp.abort();

From 0ff8416efb6d2aa8e4eac0f39d243e5977b9ae51 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 15:14:13 +0100
Subject: [PATCH 0968/2920] Use View::translate() instead of t() in the logout
 view script

refs #8626
---
 application/views/scripts/authentication/logout.phtml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/views/scripts/authentication/logout.phtml b/application/views/scripts/authentication/logout.phtml
index 048335354..3962493ea 100644
--- a/application/views/scripts/authentication/logout.phtml
+++ b/application/views/scripts/authentication/logout.phtml
@@ -9,9 +9,9 @@
 -->
 <div class="content">
     <div class="alert alert-warning" id="logout-status">
-        <b><?= t('Logging out...'); ?></b>
+        <b><?= $this->translate('Logging out...'); ?></b>
         <br>
-        <?= t(
+        <?= $this->translate(
             'If this message does not disappear, it might be necessary to quit the'
             . ' current session manually by clearing the cache, or by closing the current'
             . ' browser session.'
@@ -19,7 +19,7 @@
     </div>
 
     <div class="container" >
-        <a href="<?= $this->href('dashboard/index'); ?>"><?= t('Login'); ?></a>
+        <a href="<?= $this->href('dashboard/index'); ?>"><?= $this->translate('Login'); ?></a>
     </div>
 </div>
 <script type="text/javascript">
@@ -41,7 +41,7 @@
             }
         } catch (e) {
         }
-        msg.html('<?= t('Logout successful!'); ?>');
+        msg.html('<?= $this->translate('Logout successful!'); ?>');
         msg.removeClass();
         msg.addClass('alert alert-success');
     });

From 846a22e7a1db585f13399e9d3d7b7d12df1db9f3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 15:35:44 +0100
Subject: [PATCH 0969/2920] Don't use jQuery in the logout view script

jQuery is not available here because JavaScript is loaded after the content.
This was no problem before because the logout action was submitted using XHR and thus having JavaScript.

refs #8626
---
 application/views/scripts/authentication/logout.phtml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/application/views/scripts/authentication/logout.phtml b/application/views/scripts/authentication/logout.phtml
index 3962493ea..6d704794f 100644
--- a/application/views/scripts/authentication/logout.phtml
+++ b/application/views/scripts/authentication/logout.phtml
@@ -18,7 +18,7 @@
         ); ?>
     </div>
 
-    <div class="container" >
+    <div class="container">
         <a href="<?= $this->href('dashboard/index'); ?>"><?= $this->translate('Login'); ?></a>
     </div>
 </div>
@@ -28,8 +28,8 @@
      * before it is able to finish. This will cause the browser to show a new authentication prompt in the next
      * request.
      */
-    $(document).ready(function() {
-        var msg = $('#logout-status');
+    document.addEventListener('DOMContentLoaded', function () {
+        var msg = document.getElementById('logout-status');
         try {
             if (navigator.userAgent.toLowerCase().indexOf('msie') !== -1) {
                 document.execCommand('ClearAuthenticationCache');
@@ -41,8 +41,7 @@
             }
         } catch (e) {
         }
-        msg.html('<?= $this->translate('Logout successful!'); ?>');
-        msg.removeClass();
-        msg.addClass('alert alert-success');
+        msg.innerHTML = '<?= $this->translate('Logout successful!'); ?>';
+        msg.className = 'alert alert-success';
     });
 </script>

From d102a61e2294bb19e156f07ae1612e115254bebc Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 20:50:05 +0100
Subject: [PATCH 0970/2920] Fix Undefined index: HTTP_ACCEPT_LANGUAGE

fixes #8370
---
 library/Icinga/Application/Web.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 45dbc7e87..16f8d5131 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -314,13 +314,15 @@ class Web extends ApplicationBootstrap
     protected function detectLocale()
     {
         $auth = Manager::getInstance();
-        if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !$auth->isAuthenticated()
-            || ($locale = $auth->getUser()->getPreferences()->getValue('icingaweb', 'language')) === null
+        if ($auth->isAuthenticated()
+            && ($locale = $auth->getUser()->getPreferences()->getValue('icingaweb', 'language')) !== null
         ) {
-            $locale = Translator::getPreferredLocaleCode($_SERVER['HTTP_ACCEPT_LANGUAGE']);
+            return $locale;
         }
-
-        return $locale;
+        if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+            return Translator::getPreferredLocaleCode($_SERVER['HTTP_ACCEPT_LANGUAGE']);
+        }
+        return Translator::DEFAULT_LOCALE;
     }
 
     /**

From 031f9ddc84ffabaae40b2ca17603dfb219df094b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 21:24:56 +0100
Subject: [PATCH 0971/2920] Don't always redirect to the current window's URL
 if the redirect URL is __SELF__

Please see code comments for an explanation.

refs #8626
---
 public/js/icinga/loader.js | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 6f5df4ea1..addfe2aa0 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -246,13 +246,31 @@
         },
 
         processRedirectHeader: function(req) {
-            var icinga = this.icinga;
-            var redirect = req.getResponseHeader('X-Icinga-Redirect');
-            if (! redirect) return false;
+            var icinga      = this.icinga,
+                redirect    = req.getResponseHeader('X-Icinga-Redirect');
+
+            if (! redirect) {
+                return false;
+            }
+
             redirect = decodeURIComponent(redirect);
             if (redirect.match(/__SELF__/)) {
-                redirect = redirect.replace(/__SELF__/, encodeURIComponent(document.location.pathname + document.location.search + document.location.hash));
+                if (req.autorefresh) {
+                    // Redirect to the current window's URL in case it's an auto-refresh request. If authenticated
+                    // externally this ensures seamless re-login if the session's expired
+                    redirect = redirect.replace(
+                        /__SELF__/,
+                        encodeURIComponent(
+                            document.location.pathname + document.location.search + document.location.hash
+                        )
+                    );
+                } else {
+                    // Redirect to the URL which required authentication. When clicking a link this ensures that we
+                    // redirect to the link's URL instead of the current window's URL (see above)
+                    redirect = redirect.replace(/__SELF__/, req.url);
+                }
             }
+
             icinga.logger.debug(
                 'Got redirect for ', req.$target, ', URL was ' + redirect
             );

From 7f94858b8df85e07426927b46778b7b334779279 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 21:26:44 +0100
Subject: [PATCH 0972/2920] Add JSDoc to
 Icinga.Loader.prototype.processRedirectHeader()

refs #8626
---
 public/js/icinga/loader.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index addfe2aa0..07ab3cbc1 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -245,6 +245,15 @@
             }
         },
 
+        /**
+         * Process the X-Icinga-Redirect HTTP Response Header
+         *
+         * If the response includes the X-Icinga-Redirect header, redirects to the URL associated with the header.
+         *
+         * @param   {object}    req     Current request
+         *
+         * @returns {boolean}           Whether we're about to redirect
+         */
         processRedirectHeader: function(req) {
             var icinga      = this.icinga,
                 redirect    = req.getResponseHeader('X-Icinga-Redirect');

From 4ebfbf83abfe7875f2537b69863d2b3a5a065117 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 21:40:14 +0100
Subject: [PATCH 0973/2920] Leave note about __SELF__ in our action controller

refs #8626
---
 library/Icinga/Web/Controller/ActionController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 0a1fe8ae4..d1c320bb2 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -307,6 +307,8 @@ class ActionController extends Zend_Controller_Action
                 $afterLogin = Url::fromPath($afterLogin);
             }
             if ($this->isXhr()) {
+                // __SELF__ instructs JavaScript to redirect to the current window's URL in case it's an auto-refreshing
+                // request or to redirect to the URL which required login in case it's not an auto-refreshing one
                 $redir = '__SELF__';
             } else {
                 // TODO: Ignore /?
@@ -319,7 +321,6 @@ class ActionController extends Zend_Controller_Action
         if ($redir) {
             $url->setParam('redirect', $redir);
         }
-
         $this->rerenderLayout()->redirectNow($url);
     }
 

From bc1336b6f99689570406de701384c78db43e1fac Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 21:49:20 +0100
Subject: [PATCH 0974/2920] Fix stupid code in
 ActionController::redirectToLogin()

refs #8626
---
 .../Web/Controller/ActionController.php       | 37 +++++++------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index d1c320bb2..0949dbc81 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -293,35 +293,26 @@ class ActionController extends Zend_Controller_Action
     }
 
     /**
-     * Redirect to the login path
+     * Redirect to login
      *
-     * @param   Url         $afterLogin   The action to call when the login was successful. Defaults to '/index/welcome'
+     * XHR will always redirect to __SELF__. __SELF__ instructs JavaScript to redirect to the current window's URL
+     * if it's an auto-refresh request or to redirect to the URL which required login if it's not an auto-refreshing
+     * one.
      *
-     * @throws  \Exception
+     * @param   Url|string  $redirect   URL to redirect to after successful login
      */
-    protected function redirectToLogin($afterLogin = null)
+    protected function redirectToLogin($redirect = null)
     {
-        $redir = null;
-        if ($afterLogin !== null) {
-            if (! $afterLogin instanceof Url) {
-                $afterLogin = Url::fromPath($afterLogin);
-            }
-            if ($this->isXhr()) {
-                // __SELF__ instructs JavaScript to redirect to the current window's URL in case it's an auto-refreshing
-                // request or to redirect to the URL which required login in case it's not an auto-refreshing one
-                $redir = '__SELF__';
-            } else {
-                // TODO: Ignore /?
-                $redir = $afterLogin->getRelativeUrl();
+        $login = Url::fromPath('authentication/login');
+        if ($this->isXhr()) {
+            $login->setParam('redirect', '__SELF__');
+        } elseif ($redirect !== null) {
+            if (! $redirect instanceof Url) {
+                $redirect = Url::fromPath($redirect);
             }
+            $login->setParam('redirect', $redirect->getRelativeUrl());
         }
-
-        $url = Url::fromPath('authentication/login');
-
-        if ($redir) {
-            $url->setParam('redirect', $redir);
-        }
-        $this->rerenderLayout()->redirectNow($url);
+        $this->rerenderLayout()->redirectNow($login);
     }
 
     protected function rerenderLayout()

From 29d4ad69b9be3bdaabab11b19491cab7fcaad11a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 21:50:41 +0100
Subject: [PATCH 0975/2920] Remove // @codeCoverageIgnoreEnd

This is obsolete.
---
 library/Icinga/Application/Web.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 45dbc7e87..46f677d94 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -337,4 +337,3 @@ class Web extends ApplicationBootstrap
         return $this;
     }
 }
-// @codeCoverageIgnoreEnd

From 7fe4b3d7ab007790252a7ca365605209a44b54ab Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 21:55:04 +0100
Subject: [PATCH 0976/2920] Fix PHPDoc of Web::detectLocale()

---
 library/Icinga/Application/Web.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 16f8d5131..b365252f0 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -307,9 +307,11 @@ class Web extends ApplicationBootstrap
     /**
      * Setup internationalization using gettext
      *
-     * Uses the preferred user language or the configured default and system default, respectively.
+     * Uses the preferred user language or the browser suggested language or our default.
      *
-     * @return  self
+     * @return  string                      Detected locale code
+     *
+     * @see     Translator::DEFAULT_LOCALE  For the the default locale code.
      */
     protected function detectLocale()
     {

From 32ca28bc46da04ed5ff51e9cab8e8c56a13210de Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 21:58:41 +0100
Subject: [PATCH 0977/2920] Use @return $this for documenting fluent interfaces

---
 library/Icinga/Application/Web.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 6145b7ceb..3710ae7a0 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -84,7 +84,7 @@ class Web extends ApplicationBootstrap
     /**
      * Initialize all together
      *
-     * @return self
+     * @return $this
      */
     protected function bootstrap()
     {
@@ -112,7 +112,7 @@ class Web extends ApplicationBootstrap
     /**
      * Prepare routing
      *
-     * @return self
+     * @return $this
      */
     private function setupRoute()
     {
@@ -161,7 +161,7 @@ class Web extends ApplicationBootstrap
     /**
      * Prepare Zend MVC Base
      *
-     * @return self
+     * @return $this
      */
     private function setupZendMvc()
     {
@@ -182,7 +182,7 @@ class Web extends ApplicationBootstrap
     /**
      * Create user object
      *
-     * @return  self
+     * @return $this
      */
     private function setupUser()
     {
@@ -198,7 +198,7 @@ class Web extends ApplicationBootstrap
     /**
      * Initialize a session provider
      *
-     * @return  self
+     * @return $this
      */
     private function setupSession()
     {
@@ -209,7 +209,7 @@ class Web extends ApplicationBootstrap
     /**
      * Inject dependencies into request
      *
-     * @return self
+     * @return $this
      */
     private function setupRequest()
     {
@@ -225,7 +225,7 @@ class Web extends ApplicationBootstrap
     /**
      * Instantiate front controller
      *
-     * @return self
+     * @return $this
      */
     private function setupFrontController()
     {
@@ -247,7 +247,7 @@ class Web extends ApplicationBootstrap
     /**
      * Register helper paths and views for renderer
      *
-     * @return self
+     * @return $this
      */
     private function setupViewRenderer()
     {
@@ -270,7 +270,7 @@ class Web extends ApplicationBootstrap
     /**
      * Configure pagination settings
      *
-     * @return self
+     * @return $this
      */
     private function setupPagination()
     {
@@ -330,7 +330,7 @@ class Web extends ApplicationBootstrap
     /**
      * Setup an autoloader namespace for Icinga\Forms
      *
-     * @return  self
+     * @return $this
      */
     private function setupFormNamespace()
     {

From 9e8137055173e61754f7d68baf39376a26dd2680 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 22:00:09 +0100
Subject: [PATCH 0978/2920] Removed unused use ... in Web.php

---
 library/Icinga/Application/Web.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 3710ae7a0..b572c443a 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -7,8 +7,6 @@ require_once __DIR__ . '/ApplicationBootstrap.php';
 
 use Icinga\Authentication\Manager as AuthenticationManager;
 use Icinga\Authentication\Manager;
-use Icinga\Exception\ConfigurationError;
-use Icinga\Exception\NotReadableError;
 use Icinga\Application\Logger;
 use Icinga\Util\TimezoneDetect;
 use Icinga\Web\Request;
@@ -18,9 +16,6 @@ use Icinga\Web\Session\Session as BaseSession;
 use Icinga\Web\Session;
 use Icinga\User;
 use Icinga\Util\Translator;
-use Icinga\Util\DateTimeFactory;
-use DateTimeZone;
-use Exception;
 use Zend_Layout;
 use Zend_Paginator;
 use Zend_View_Helper_PaginationControl;

From dfa7e20b741956472d571c329d2402b70fef438b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 22:01:41 +0100
Subject: [PATCH 0979/2920] Don't use Icinga\Authentication\Manager twice

---
 library/Icinga/Application/Web.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index b572c443a..bd5e09d0f 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -5,7 +5,6 @@ namespace Icinga\Application;
 
 require_once __DIR__ . '/ApplicationBootstrap.php';
 
-use Icinga\Authentication\Manager as AuthenticationManager;
 use Icinga\Authentication\Manager;
 use Icinga\Application\Logger;
 use Icinga\Util\TimezoneDetect;
@@ -181,12 +180,10 @@ class Web extends ApplicationBootstrap
      */
     private function setupUser()
     {
-        $authenticationManager = AuthenticationManager::getInstance();
-
-        if ($authenticationManager->isAuthenticated() === true) {
-            $this->user = $authenticationManager->getUser();
+        $auth = Manager::getInstance();
+        if ($auth->isAuthenticated() === true) {
+            $this->user = $auth->getUser();
         }
-
         return $this;
     }
 

From c47164601accab061d9c44ca538c46545276c640 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 22:03:49 +0100
Subject: [PATCH 0980/2920] Don't alias Zend_Controller_Action_HelperBroker in
 Web.php

---
 library/Icinga/Application/Web.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index bd5e09d0f..9d6f226b5 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -18,7 +18,7 @@ use Icinga\Util\Translator;
 use Zend_Layout;
 use Zend_Paginator;
 use Zend_View_Helper_PaginationControl;
-use Zend_Controller_Action_HelperBroker as ActionHelperBroker;
+use Zend_Controller_Action_HelperBroker;
 use Zend_Controller_Router_Route;
 use Zend_Controller_Front;
 
@@ -243,19 +243,14 @@ class Web extends ApplicationBootstrap
      */
     private function setupViewRenderer()
     {
+        $view = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
         /** @var \Zend_Controller_Action_Helper_ViewRenderer $view */
-        $view = ActionHelperBroker::getStaticHelper('viewRenderer');
         $view->setView(new View());
-
         $view->view->addHelperPath($this->getApplicationDir('/views/helpers'));
-
         $view->view->setEncoding('UTF-8');
         $view->view->headTitle()->prepend($this->config->get('global', 'project', 'Icinga'));
-
         $view->view->headTitle()->setSeparator(' :: ');
-
         $this->viewRenderer = $view;
-
         return $this;
     }
 

From c54648244e14dec40e20bbb6f6edfb4589e16df7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 22:05:23 +0100
Subject: [PATCH 0981/2920] Remove newlines from Web.php

---
 library/Icinga/Application/Web.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 9d6f226b5..e4e3583c1 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -166,10 +166,8 @@ class Web extends ApplicationBootstrap
                 'layoutPath' => $this->getApplicationDir('/layouts/scripts')
             )
         );
-
         $this->setupFrontController();
         $this->setupViewRenderer();
-
         return $this;
     }
 
@@ -206,11 +204,9 @@ class Web extends ApplicationBootstrap
     private function setupRequest()
     {
         $this->request = new Request();
-
         if ($this->user instanceof User) {
             $this->request->setUser($this->user);
         }
-
         return $this;
     }
 
@@ -222,17 +218,13 @@ class Web extends ApplicationBootstrap
     private function setupFrontController()
     {
         $this->frontController = Zend_Controller_Front::getInstance();
-
         $this->frontController->setRequest($this->request);
-
         $this->frontController->setControllerDirectory($this->getApplicationDir('/controllers'));
-
         $this->frontController->setParams(
             array(
                 'displayExceptions' => true
             )
         );
-
         return $this;
     }
 
@@ -261,17 +253,14 @@ class Web extends ApplicationBootstrap
      */
     private function setupPagination()
     {
-
         Zend_Paginator::addScrollingStylePrefixPath(
             'Icinga_Web_Paginator_ScrollingStyle',
             'Icinga/Web/Paginator/ScrollingStyle'
         );
-
         Zend_Paginator::setDefaultScrollingStyle('SlidingWithBorder');
         Zend_View_Helper_PaginationControl::setDefaultViewPartial(
             array('mixedPagination.phtml', 'default')
         );
-
         return $this;
     }
 

From a835cad31f388c0746578baf0b5bcf537f3825a0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 22:06:23 +0100
Subject: [PATCH 0982/2920] Remove a nonsense TODO from Web.php

TODOs for replacing Zend classes are unnecessary.
---
 library/Icinga/Application/Web.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index e4e3583c1..909839de7 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -159,7 +159,6 @@ class Web extends ApplicationBootstrap
      */
     private function setupZendMvc()
     {
-        // TODO: Replace Zend_Application:
         Zend_Layout::startMvc(
             array(
                 'layout'     => 'layout',

From 64ad54ebd6c461e6b424933b57aa5ec674d853e5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 22:08:28 +0100
Subject: [PATCH 0983/2920] Optimize imports in Web.php

---
 library/Icinga/Application/Web.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 909839de7..c07536e89 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -5,22 +5,22 @@ namespace Icinga\Application;
 
 require_once __DIR__ . '/ApplicationBootstrap.php';
 
-use Icinga\Authentication\Manager;
-use Icinga\Application\Logger;
-use Icinga\Util\TimezoneDetect;
-use Icinga\Web\Request;
-use Icinga\Web\Response;
-use Icinga\Web\View;
-use Icinga\Web\Session\Session as BaseSession;
-use Icinga\Web\Session;
-use Icinga\User;
-use Icinga\Util\Translator;
+use Zend_Controller_Action_HelperBroker;
+use Zend_Controller_Front;
+use Zend_Controller_Router_Route;
 use Zend_Layout;
 use Zend_Paginator;
 use Zend_View_Helper_PaginationControl;
-use Zend_Controller_Action_HelperBroker;
-use Zend_Controller_Router_Route;
-use Zend_Controller_Front;
+use Icinga\Application\Logger;
+use Icinga\Authentication\Manager;
+use Icinga\User;
+use Icinga\Util\TimezoneDetect;
+use Icinga\Util\Translator;
+use Icinga\Web\Request;
+use Icinga\Web\Response;
+use Icinga\Web\Session;
+use Icinga\Web\Session\Session as BaseSession;
+use Icinga\Web\View;
 
 /**
  * Use this if you want to make use of Icinga functionality in other web projects

From 4570151b4b58fe4ff212869135bb1927c05ee0c5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 22:11:10 +0100
Subject: [PATCH 0984/2920] Fix indentation for strings spanning multiple lines
 in our auth controller

---
 application/controllers/AuthenticationController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index 933a97357..affeca2f1 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -102,21 +102,21 @@ class AuthenticationController extends ActionController
                     $this->view->form->addError(
                         $this->translate(
                             'No authentication methods available. Did you create'
-                          . ' authentication.ini when setting up Icinga Web 2?'
+                            . ' authentication.ini when setting up Icinga Web 2?'
                          )
                     );
                 } else if ($backendsTried === $backendsWithError) {
                     $this->view->form->addError(
                         $this->translate(
                             'All configured authentication methods failed.'
-                          . ' Please check the system log or Icinga Web 2 log for more information.'
+                            . ' Please check the system log or Icinga Web 2 log for more information.'
                         )
                     );
                 } elseif ($backendsWithError) {
                     $this->view->form->addError(
                         $this->translate(
                             'Please note that not all authentication methods were available.'
-                          . ' Check the system log or Icinga Web 2 log for more information.'
+                            . ' Check the system log or Icinga Web 2 log for more information.'
                         )
                     );
                 }

From 7288f2e92b41a6868b3e4d91fa2ab69b179d7647 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 22:25:52 +0100
Subject: [PATCH 0985/2920] Use space after the boolean negotiation operator

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

diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index affeca2f1..7d492f8c1 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -144,7 +144,7 @@ class AuthenticationController extends ActionController
             $this->view->form->addError($e->getMessage());
         }
 
-        $this->view->requiresExternalAuth = $triedOnlyExternalAuth && !$auth->isAuthenticated();
+        $this->view->requiresExternalAuth = $triedOnlyExternalAuth && ! $auth->isAuthenticated();
         $this->view->requiresSetup = Icinga::app()->requiresSetup();
     }
 

From 0806ab3ec980916bb565b61a83519735f07ad9e1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 22:26:03 +0100
Subject: [PATCH 0986/2920] Remove strict equality for $auth->isAuthenticated()

---
 library/Icinga/Application/Web.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index c07536e89..0c7ea0ad8 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -178,7 +178,7 @@ class Web extends ApplicationBootstrap
     private function setupUser()
     {
         $auth = Manager::getInstance();
-        if ($auth->isAuthenticated() === true) {
+        if ($auth->isAuthenticated()) {
             $this->user = $auth->getUser();
         }
         return $this;

From 2f752ed1ac9bd1c1fb7763c8583df977233b771b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 11 Mar 2015 22:32:04 +0100
Subject: [PATCH 0987/2920] Respond with HTTP status code 403 when an XHR
 requires authentication

refs #8626
---
 library/Icinga/Web/Controller/ActionController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 0949dbc81..f0db0164f 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -299,6 +299,8 @@ class ActionController extends Zend_Controller_Action
      * if it's an auto-refresh request or to redirect to the URL which required login if it's not an auto-refreshing
      * one.
      *
+     * XHR will respond with HTTP status code 403 Forbidden.
+     *
      * @param   Url|string  $redirect   URL to redirect to after successful login
      */
     protected function redirectToLogin($redirect = null)
@@ -306,6 +308,7 @@ class ActionController extends Zend_Controller_Action
         $login = Url::fromPath('authentication/login');
         if ($this->isXhr()) {
             $login->setParam('redirect', '__SELF__');
+            $this->_response->setHttpResponseCode(403);
         } elseif ($redirect !== null) {
             if (! $redirect instanceof Url) {
                 $redirect = Url::fromPath($redirect);

From 83443a5dc4b48c67fcaae9d3e7fcc3fafc0d00a2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 00:52:19 +0100
Subject: [PATCH 0988/2920] Use -1 for last update of the menu

We must not rely on the server time minus an offset for the last update of the menu
to trigger an immediate update of the menu because the server time may be behind the current time.

fixes #8694
---
 application/layouts/scripts/parts/navigation.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml
index 2136c0fd5..92273e4b4 100644
--- a/application/layouts/scripts/parts/navigation.phtml
+++ b/application/layouts/scripts/parts/navigation.phtml
@@ -21,7 +21,7 @@ if (! $this->auth()->isAuthenticated()) {
         </li>
     </ul>
 </div>
-<div  id="menu" data-last-update="<?= (time() - 14) ?>000" data-base-target="_main" class="container"
+<div  id="menu" data-last-update="-1" data-base-target="_main" class="container"
       data-icinga-url="<?= $this->href('layout/menu') ?>"  data-icinga-refresh="15">
     <?= $this->partial(
         'layout/menu.phtml',

From 749957c3b45069c619a6ddcd4b5d862cb601c828 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 00:57:03 +0100
Subject: [PATCH 0989/2920] Fix too greedy __SELF__ login redirect on XHR

I introduced this bug some commits earlier. We only must redirect to __SELF__ on XHR
if a redirect URL was set.

refs #8626
---
 library/Icinga/Web/Controller/ActionController.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index f0db0164f..2917d3115 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -295,9 +295,9 @@ class ActionController extends Zend_Controller_Action
     /**
      * Redirect to login
      *
-     * XHR will always redirect to __SELF__. __SELF__ instructs JavaScript to redirect to the current window's URL
-     * if it's an auto-refresh request or to redirect to the URL which required login if it's not an auto-refreshing
-     * one.
+     * XHR will always redirect to __SELF__ if an URL to redirect to after successful login is set. __SELF__ instructs
+     * JavaScript to redirect to the current window's URL if it's an auto-refresh request or to redirect to the URL
+     * which required login if it's not an auto-refreshing one.
      *
      * XHR will respond with HTTP status code 403 Forbidden.
      *
@@ -307,7 +307,9 @@ class ActionController extends Zend_Controller_Action
     {
         $login = Url::fromPath('authentication/login');
         if ($this->isXhr()) {
-            $login->setParam('redirect', '__SELF__');
+            if ($redirect !== null) {
+                $login->setParam('redirect', '__SELF__');
+            }
             $this->_response->setHttpResponseCode(403);
         } elseif ($redirect !== null) {
             if (! $redirect instanceof Url) {

From b50129ad2e05c6f74eddc60eac524c79a96c83e1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 01:14:47 +0100
Subject: [PATCH 0990/2920] Add renderLayout to the re-login URL for externally
 authenticated users

refs #8626
---
 application/views/scripts/authentication/logout.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/scripts/authentication/logout.phtml b/application/views/scripts/authentication/logout.phtml
index 6d704794f..f7ad84b8c 100644
--- a/application/views/scripts/authentication/logout.phtml
+++ b/application/views/scripts/authentication/logout.phtml
@@ -19,7 +19,7 @@
     </div>
 
     <div class="container">
-        <a href="<?= $this->href('dashboard/index'); ?>"><?= $this->translate('Login'); ?></a>
+        <a href="<?= $this->href('dashboard/index?renderLayout'); ?>"><?= $this->translate('Login'); ?></a>
     </div>
 </div>
 <script type="text/javascript">

From 792a67c439ad46905e80311473c5ed08d602df30 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 12 Mar 2015 09:34:59 +0100
Subject: [PATCH 0991/2920] Revert "Remove Debian packaging from GIT"

This reverts commit e72e340faa9db5531ddc71131cf113862d22c72c.
---
 packages/debian/README.1st                    |  3 +
 packages/debian/changelog                     |  5 ++
 packages/debian/compat                        |  1 +
 packages/debian/control                       | 68 +++++++++++++++++++
 packages/debian/icinga-php.install            |  1 +
 packages/debian/icingacli.install             |  3 +
 packages/debian/icingaweb-common.dirs         |  1 +
 packages/debian/icingaweb-common.install      |  2 +
 packages/debian/icingaweb-module-doc.install  |  1 +
 .../icingaweb-module-monitoring.install       |  1 +
 .../debian/icingaweb-module-setup.install     |  1 +
 packages/debian/icingaweb-module-test.install |  1 +
 .../icingaweb-module-translation.install      |  1 +
 .../icingaweb-vendor-htmlpurifier.install     |  1 +
 .../debian/icingaweb-vendor-jshrink.install   |  1 +
 .../debian/icingaweb-vendor-lessphp.install   |  1 +
 .../debian/icingaweb-vendor-parsedown.install |  1 +
 packages/debian/icingaweb-vendor-zend.install |  1 +
 packages/debian/icingaweb.install             | 10 +++
 packages/debian/rules                         | 35 ++++++++++
 packages/debian/source/format                 |  1 +
 packages/debian/substvars                     |  1 +
 22 files changed, 141 insertions(+)
 create mode 100644 packages/debian/README.1st
 create mode 100644 packages/debian/changelog
 create mode 100644 packages/debian/compat
 create mode 100644 packages/debian/control
 create mode 100644 packages/debian/icinga-php.install
 create mode 100644 packages/debian/icingacli.install
 create mode 100644 packages/debian/icingaweb-common.dirs
 create mode 100644 packages/debian/icingaweb-common.install
 create mode 100644 packages/debian/icingaweb-module-doc.install
 create mode 100644 packages/debian/icingaweb-module-monitoring.install
 create mode 100644 packages/debian/icingaweb-module-setup.install
 create mode 100644 packages/debian/icingaweb-module-test.install
 create mode 100644 packages/debian/icingaweb-module-translation.install
 create mode 100644 packages/debian/icingaweb-vendor-htmlpurifier.install
 create mode 100644 packages/debian/icingaweb-vendor-jshrink.install
 create mode 100644 packages/debian/icingaweb-vendor-lessphp.install
 create mode 100644 packages/debian/icingaweb-vendor-parsedown.install
 create mode 100644 packages/debian/icingaweb-vendor-zend.install
 create mode 100644 packages/debian/icingaweb.install
 create mode 100755 packages/debian/rules
 create mode 100644 packages/debian/source/format
 create mode 100644 packages/debian/substvars

diff --git a/packages/debian/README.1st b/packages/debian/README.1st
new file mode 100644
index 000000000..66c58c719
--- /dev/null
+++ b/packages/debian/README.1st
@@ -0,0 +1,3 @@
+PLEASE DO NOT BUILD PACKAGES BASES ON THIS
+
+Packages may still be renamed
diff --git a/packages/debian/changelog b/packages/debian/changelog
new file mode 100644
index 000000000..ed074d733
--- /dev/null
+++ b/packages/debian/changelog
@@ -0,0 +1,5 @@
+icingaweb (2.0.0) stable; urgency=low
+
+  * First stable release (Closes: #0001)
+
+ -- Thomas Gelf <thomas@gelf.net>  Fri, 28 Mar 2014 23:37:31 +0100
diff --git a/packages/debian/compat b/packages/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/packages/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/packages/debian/control b/packages/debian/control
new file mode 100644
index 000000000..73d0b57a3
--- /dev/null
+++ b/packages/debian/control
@@ -0,0 +1,68 @@
+Source: icingaweb
+Section: admin
+Maintainer: Icinga Development Team <info@icinga.org>
+Priority: optional
+Build-Depends: debhelper (>=9)
+Standards-Version: 3.9.4
+Homepage: https://www.icinga.org
+
+Package: php-icinga
+Architecture: any
+Depends: php5 (>= 5.3.2)
+Recommends: php5-ldap, php5-mysql, php5-json
+Suggests: php5-pgsql
+Description: Icinga PHP libraries
+ PHP libraries 
+
+Package: icingaweb-common
+Architecture: any
+Depends: php-icinga
+Description: Icinga PHP common libraries
+ PHP common libraries, application and modules
+
+Package: icingaweb-module-doc
+Architecture: any
+Depends: icingaweb-common
+Description: Icingaweb documentation module
+ This module renders documentation for Icingaweb and its modules
+
+Package: icingaweb-module-monitoring
+Architecture: any
+Depends: icingaweb-common
+Description: Icingaweb monitoring module
+ Use this module to visualize your monitoring environment in Icingaweb
+
+Package: icingaweb-module-setup
+Architecture: any
+Depends: icingaweb-common
+Description: Icingaweb setup module
+ This setup wizard does your initial Icingaweb configuration
+
+Package: icingaweb-module-test
+Architecture: any
+Depends: icingacli
+Description: Icingaweb test module
+ Use this module to run unit tests against Icingaweb or any of its modules
+
+Package: icingaweb-module-translation
+Architecture: any
+Depends: icingaweb-common
+Description: Icingaweb translation module 
+ This module helps translators to get Icingaweb translations done
+
+Package: icingacli
+Architecture: any
+Depends: icingaweb-common, php5-cli (>= 5.3.2)
+Description: Icinga CLI tool
+ The Icinga CLI allows one to access its Icinga monitoring
+ system from a terminal. 
+ .
+ The CLI is based on the Icinga PHP libraries
+
+Package: icingaweb
+Architecture: any
+Depends: icingaweb-common, libapache2-mod-php5, zendframework | icingaweb-vendor-zend, icingaweb-vendor-parsedown, icingaweb-vendor-lessphp, icingaweb-vendor-jshrink, icingaweb-vendor-htmlpurifier, icingaweb-module-setup
+Recommends: icingaweb-module-monitoring, icingaweb-module-doc
+Suggests: php5-ldap
+Description: Icingaweb Frontend
+ Icingaweb is a modular web frontend
diff --git a/packages/debian/icinga-php.install b/packages/debian/icinga-php.install
new file mode 100644
index 000000000..6cbd03f13
--- /dev/null
+++ b/packages/debian/icinga-php.install
@@ -0,0 +1 @@
+library/Icinga        usr/share/php
diff --git a/packages/debian/icingacli.install b/packages/debian/icingacli.install
new file mode 100644
index 000000000..be3db5e1c
--- /dev/null
+++ b/packages/debian/icingacli.install
@@ -0,0 +1,3 @@
+packages/files/bin/icingacli  usr/bin
+etc/bash_completion.d         etc/bash_completion.d
+application/clicommands       usr/share/icingaweb/application
diff --git a/packages/debian/icingaweb-common.dirs b/packages/debian/icingaweb-common.dirs
new file mode 100644
index 000000000..00ec00632
--- /dev/null
+++ b/packages/debian/icingaweb-common.dirs
@@ -0,0 +1 @@
+etc/icingaweb
diff --git a/packages/debian/icingaweb-common.install b/packages/debian/icingaweb-common.install
new file mode 100644
index 000000000..91a34bcee
--- /dev/null
+++ b/packages/debian/icingaweb-common.install
@@ -0,0 +1,2 @@
+application/locales   usr/share/icingaweb/application
+modules               usr/share/icingaweb
diff --git a/packages/debian/icingaweb-module-doc.install b/packages/debian/icingaweb-module-doc.install
new file mode 100644
index 000000000..1482e8c66
--- /dev/null
+++ b/packages/debian/icingaweb-module-doc.install
@@ -0,0 +1 @@
+modules/doc  usr/share/icingaweb/modules
diff --git a/packages/debian/icingaweb-module-monitoring.install b/packages/debian/icingaweb-module-monitoring.install
new file mode 100644
index 000000000..1482e8c66
--- /dev/null
+++ b/packages/debian/icingaweb-module-monitoring.install
@@ -0,0 +1 @@
+modules/doc  usr/share/icingaweb/modules
diff --git a/packages/debian/icingaweb-module-setup.install b/packages/debian/icingaweb-module-setup.install
new file mode 100644
index 000000000..4fdd070d2
--- /dev/null
+++ b/packages/debian/icingaweb-module-setup.install
@@ -0,0 +1 @@
+modules/setup  usr/share/icingaweb/modules
diff --git a/packages/debian/icingaweb-module-test.install b/packages/debian/icingaweb-module-test.install
new file mode 100644
index 000000000..e0db79bca
--- /dev/null
+++ b/packages/debian/icingaweb-module-test.install
@@ -0,0 +1 @@
+modules/test  usr/share/icingaweb/modules
diff --git a/packages/debian/icingaweb-module-translation.install b/packages/debian/icingaweb-module-translation.install
new file mode 100644
index 000000000..5a89d3d4d
--- /dev/null
+++ b/packages/debian/icingaweb-module-translation.install
@@ -0,0 +1 @@
+modules/translation  usr/share/icingaweb/modules
diff --git a/packages/debian/icingaweb-vendor-htmlpurifier.install b/packages/debian/icingaweb-vendor-htmlpurifier.install
new file mode 100644
index 000000000..298284f29
--- /dev/null
+++ b/packages/debian/icingaweb-vendor-htmlpurifier.install
@@ -0,0 +1 @@
+library/vendor/HTMLPurifier  usr/share/icingaweb/library/vendor
diff --git a/packages/debian/icingaweb-vendor-jshrink.install b/packages/debian/icingaweb-vendor-jshrink.install
new file mode 100644
index 000000000..0db6b408b
--- /dev/null
+++ b/packages/debian/icingaweb-vendor-jshrink.install
@@ -0,0 +1 @@
+library/vendor/JShrink  usr/share/icingaweb/library/vendor
diff --git a/packages/debian/icingaweb-vendor-lessphp.install b/packages/debian/icingaweb-vendor-lessphp.install
new file mode 100644
index 000000000..1ace5481e
--- /dev/null
+++ b/packages/debian/icingaweb-vendor-lessphp.install
@@ -0,0 +1 @@
+library/vendor/Zend  usr/share/icingaweb/library/vendor
diff --git a/packages/debian/icingaweb-vendor-parsedown.install b/packages/debian/icingaweb-vendor-parsedown.install
new file mode 100644
index 000000000..13954e16b
--- /dev/null
+++ b/packages/debian/icingaweb-vendor-parsedown.install
@@ -0,0 +1 @@
+library/vendor/Parsedown  usr/share/icingaweb/library/vendor
diff --git a/packages/debian/icingaweb-vendor-zend.install b/packages/debian/icingaweb-vendor-zend.install
new file mode 100644
index 000000000..1ace5481e
--- /dev/null
+++ b/packages/debian/icingaweb-vendor-zend.install
@@ -0,0 +1 @@
+library/vendor/Zend  usr/share/icingaweb/library/vendor
diff --git a/packages/debian/icingaweb.install b/packages/debian/icingaweb.install
new file mode 100644
index 000000000..0fdee4dc0
--- /dev/null
+++ b/packages/debian/icingaweb.install
@@ -0,0 +1,10 @@
+public/css  usr/share/icingaweb/public
+public/img  usr/share/icingaweb/public
+public/js	usr/share/icingaweb/public
+public/error_norewrite.html usr/share/icingaweb/public
+application/controllers   usr/share/icingaweb/application
+application/fonts         usr/share/icingaweb/application
+application/layouts       usr/share/icingaweb/application
+application/views         usr/share/icingaweb/application
+packages/files/public/index.php  usr/share/icingaweb/public
+packages/files/apache/icingaweb.conf etc/apache2/conf.d
diff --git a/packages/debian/rules b/packages/debian/rules
new file mode 100755
index 000000000..fbe100736
--- /dev/null
+++ b/packages/debian/rules
@@ -0,0 +1,35 @@
+#!/usr/bin/make -f
+#export DH_VERBOSE=1
+
+%:
+	dh $@
+
+clean:
+	dh_testdir
+	dh_clean
+
+build:
+	dh_testdir
+
+binary:
+	dh_testroot
+	dh_prep
+	dh_installdirs
+	dh_install
+	dh_installchangelogs
+	dh_installexamples
+	dh_installman
+	dh_installcron
+	dh_installdebconf
+	dh_installinfo
+	dh_installinit
+	dpkg-statoverride --force --add root www-data 2770 /etc/icingaweb
+	dh_compress
+	dh_fixperms
+	dh_strip
+	dh_shlibdeps
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
diff --git a/packages/debian/source/format b/packages/debian/source/format
new file mode 100644
index 000000000..af745b310
--- /dev/null
+++ b/packages/debian/source/format
@@ -0,0 +1 @@
+3.0 (git)
diff --git a/packages/debian/substvars b/packages/debian/substvars
new file mode 100644
index 000000000..abd3ebebc
--- /dev/null
+++ b/packages/debian/substvars
@@ -0,0 +1 @@
+misc:Depends=

From 16ca8d065492bf771ac052c45e6320a9f3d15f07 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 12 Mar 2015 09:46:38 +0100
Subject: [PATCH 0992/2920] StatusQuery: fix join on wrong alias

Looks like a copy & paste error, resulted in hosts been shown multiple
times.

fixes #8699
---
 .../library/Monitoring/Backend/Ido/Query/StatusQuery.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index c67b13dbd..4106fa321 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -589,7 +589,7 @@ SQL;
     {
         $this->select->joinLeft(
             array('hlcd' => $this->getLastCommentSubQuery(2, 'last_downtime_data')),
-            'hlcg.object_id = hs.host_object_id',
+            'hlcd.object_id = hs.host_object_id',
             array()
         );
     }
@@ -601,7 +601,7 @@ SQL;
     {
         $this->select->joinLeft(
             array('hlcf' => $this->getLastCommentSubQuery(3, 'last_flapping_data')),
-            'hlcg.object_id = hs.host_object_id',
+            'hlcf.object_id = hs.host_object_id',
             array()
         );
     }

From 3af36015ff9b4e330518d28d459c5931c097acd5 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 12 Mar 2015 10:04:19 +0100
Subject: [PATCH 0993/2920] dashboard: do not fix and hide any controls

It would be better if view scripts would care about this, but as we
failed so many times this might be the better option.

fixes #8697
---
 public/css/icinga/layout-structure.less | 5 +++++
 public/js/icinga/ui.js                  | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index a8f135712..a1bf3682d 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -163,6 +163,11 @@ html {
 
 .dashboard .content {
   padding: 0;
+  overflow: auto;
+}
+
+.dashboard .controls {
+  display: none;
 }
 
 /* Not growing larger than 3840px at 1em=16px right now */
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index 043693171..2c85a2df9 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -718,6 +718,9 @@
         initializeControls: function (parent) {
 
             var self = this;
+            if ($(parent).closest('.dashboard').length) {
+                return;
+            }
 
             $('.controls', parent).each(function (idx, el) {
                 var $el = $(el);
@@ -761,6 +764,10 @@
                 return;
             }
 
+            if ($parent.closest('.dashboard').length) {
+                return;
+            }
+
             // Enable this only in case you want to track down UI problems
             // self.icinga.logger.debug('Fixing controls for ', $parent);
 

From 5270acd645209e021b966f50824fdb91274f03f9 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 12 Mar 2015 11:30:21 +0100
Subject: [PATCH 0994/2920] events.js: correctly detect form target container

This is for forms with no submit button.

fixes #8710
---
 public/js/icinga/events.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index c7674a63d..d29f39aa2 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -239,14 +239,18 @@
             event.stopPropagation();
             event.preventDefault();
 
-            // activate spinner indicator
-            if ($button.hasClass('spinner')) {
-                $button.addClass('active');
-            }
-
             icinga.logger.debug('Submitting form: ' + method + ' ' + url, method);
 
-            $target = self.getLinkTargetFor($button);
+            if ($button.length) {
+                // activate spinner indicator
+                if ($button.hasClass('spinner')) {
+                    $button.addClass('active');
+                }
+
+                $target = self.getLinkTargetFor($button);
+            } else {
+                $target = self.getLinkTargetFor($form);
+            }
 
             if (method === 'GET') {
                 var dataObj = $form.serializeObject();

From 4a982a382e40ea408a09129f33bb1c002483d815 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 12 Mar 2015 14:45:16 +0100
Subject: [PATCH 0995/2920] Show exception message when LDAP connection
 validation fails, if any

---
 .../forms/Config/Resource/LdapResourceForm.php        | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 499d39941..15eea4187 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -119,12 +119,15 @@ class LdapResourceForm extends Form
                 $form->getElement('bind_pw')->getValue()
                 )
             ) {
-                throw new Exception();
+                throw new Exception(); // TODO: Get the exact error message
             }
         } catch (Exception $e) {
-            $form->addError(
-                $form->translate('Connectivity validation failed, connection to the given resource not possible.')
-            );
+            $msg = $form->translate('Connectivity validation failed, connection to the given resource not possible.');
+            if (($error = $e->getMessage())) {
+                $msg .= ' (' . $error . ')';
+            }
+
+            $form->addError($msg);
             return false;
         }
 

From 1b440a4f1b18c5d340ab48404e2e4ee933a0a5ac Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 12 Mar 2015 15:17:19 +0100
Subject: [PATCH 0996/2920] Make SSL/TLS configurable for LDAP resources

refs #7771
---
 .../Config/Resource/LdapResourceForm.php      | 35 +++++++++++++
 library/Icinga/Protocol/Ldap/Connection.php   | 52 +++++++++----------
 2 files changed, 59 insertions(+), 28 deletions(-)

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 15eea4187..058f8462a 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -7,6 +7,7 @@ use Exception;
 use Icinga\Web\Form;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
+use Icinga\Protocol\Ldap\Connection;
 
 /**
  * Form class for adding/modifying ldap resources
@@ -57,6 +58,40 @@ class LdapResourceForm extends Form
                 'value'         => 389
             )
         );
+        $this->addElement(
+            'select',
+            'connection',
+            array(
+                'required'      => true,
+                'autosubmit'    => true,
+                'label'         => $this->translate('Connection'),
+                'description'   => $this->translate(
+                    'The type of connection to use. Unencrypted (Plaintext) or encrypted (SSL, TLS).'
+                ),
+                'multiOptions'  => array(
+                    'plaintext'             => $this->translate('Plaintext'),
+                    Connection::SSL         => 'Secure Sockets Layer (SSL)',
+                    Connection::STARTTLS    => 'Transport Layer Security (TLS)'
+                )
+            )
+        );
+
+        if (isset($formData['connection']) && $formData['connection'] !== 'plaintext') {
+            // TODO(jom): Do not show this checkbox unless the connection is actually failing due to certificate errors
+            $this->addElement(
+                'checkbox',
+                'reqcert',
+                array(
+                    'required'      => true,
+                    'label'         => $this->translate('Require Certificate'),
+                    'description'   => $this->translate(
+                        'When checked, the LDAP server must provide a valid and known (trusted) certificate.'
+                    ),
+                    'value'         => 1
+                )
+            );
+        }
+
         $this->addElement(
             'text',
             'root_dn',
diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 053c6c908..27e39be8c 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -3,7 +3,6 @@
 
 namespace Icinga\Protocol\Ldap;
 
-use Exception;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Protocol\Ldap\Exception as LdapException;
 use Icinga\Application\Platform;
@@ -35,6 +34,8 @@ class Connection
     const LDAP_SIZELIMIT_EXCEEDED = 4;
     const LDAP_ADMINLIMIT_EXCEEDED = 11;
     const PAGE_SIZE = 1000;
+    const STARTTLS = 'tls';
+    const SSL = 'ssl';
 
     protected $ds;
     protected $hostname;
@@ -43,6 +44,8 @@ class Connection
     protected $bind_pw;
     protected $root_dn;
     protected $count;
+    protected $connectionType;
+    protected $reqCert = true;
 
     /**
      * Whether the bind on this connection was already performed
@@ -66,8 +69,6 @@ class Connection
     /**
      * Constructor
      *
-     * TODO: Allow to pass port and SSL options
-     *
      * @param ConfigObject $config
      */
     public function __construct(ConfigObject $config)
@@ -77,6 +78,8 @@ class Connection
         $this->bind_pw  = $config->bind_pw;
         $this->root_dn  = $config->root_dn;
         $this->port = $config->get('port', $this->port);
+        $this->connectionType = $config->connection;
+        $this->reqCert = (bool) $config->get('reqcert', $this->reqCert);
     }
 
     public function getHostname()
@@ -470,59 +473,53 @@ class Connection
      */
     protected function prepareNewConnection()
     {
-        $use_tls = false;
-        $force_tls = false;
-
-        if ($use_tls) {
+        if ($this->connectionType === static::STARTTLS || $this->connectionType === static::SSL) {
             $this->prepareTlsEnvironment();
         }
 
-        $ds = ldap_connect($this->hostname, $this->port);
+        $hostname = $this->hostname;
+        if ($this->connectionType === static::SSL) {
+            $hostname = 'ldaps://' . $hostname;
+        }
+
+        $ds = ldap_connect($hostname, $this->port);
         try {
             $this->capabilities = $this->discoverCapabilities($ds);
             $this->discoverySuccess = true;
-
         } catch (LdapException $e) {
-
             // create empty default capabilities
             Logger::warning('LADP discovery failed, assuming default LDAP settings.');
             $this->capabilities = new Capability();
         }
 
-        if ($use_tls) {
+        if ($this->connectionType === static::STARTTLS) {
+            $force_tls = false;
             if ($this->capabilities->hasStartTLS()) {
                 if (@ldap_start_tls($ds)) {
                     Logger::debug('LDAP STARTTLS succeeded');
                 } else {
-                    Logger::debug('LDAP STARTTLS failed: %s', ldap_error($ds));
-                    throw new LdapException(
-                        'LDAP STARTTLS failed: %s',
-                        ldap_error($ds)
-                    );
+                    Logger::error('LDAP STARTTLS failed: %s', ldap_error($ds));
+                    throw new LdapException('LDAP STARTTLS failed: %s', ldap_error($ds));
                 }
             } elseif ($force_tls) {
-                throw new LdapException(
-                    'TLS is required but not announced by %s',
-                    $this->hostname
-                );
+                throw new LdapException('STARTTLS is required but not announced by %s', $this->hostname);
             } else {
-                Logger::warning('LDAP TLS enabled but not announced');
+                Logger::warning('LDAP STARTTLS enabled but not announced');
             }
         }
+
         // ldap_rename requires LDAPv3:
         if ($this->capabilities->hasLdapV3()) {
             if (! ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3)) {
                 throw new LdapException('LDAPv3 is required');
             }
         } else {
-
             // TODO: remove this -> FORCING v3 for now
             ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
             Logger::warning('No LDAPv3 support detected');
         }
 
-        // Not setting this results in "Operations error" on AD when using the
-        // whole domain as search base:
+        // Not setting this results in "Operations error" on AD when using the whole domain as search base
         ldap_set_option($ds, LDAP_OPT_REFERRALS, 0);
         // ldap_set_option($ds, LDAP_OPT_DEREF, LDAP_DEREF_NEVER);
         return $ds;
@@ -530,17 +527,16 @@ class Connection
 
     protected function prepareTlsEnvironment()
     {
-        $strict_tls   = true;
         // TODO: allow variable known CA location (system VS Icinga)
         if (Platform::isWindows()) {
-            // putenv('LDAP...')
+            putenv('LDAPTLS_REQCERT=never');
         } else {
-            if ($strict_tls) {
+            if ($this->reqCert) {
                 $ldap_conf = $this->getConfigDir('ldap_ca.conf');
             } else {
                 $ldap_conf = $this->getConfigDir('ldap_nocert.conf');
             }
-            putenv('LDAPRC=' . $ldap_conf);
+            putenv('LDAPRC=' . $ldap_conf); // TODO: Does not have any effect
             if (getenv('LDAPRC') !== $ldap_conf) {
                 throw new LdapException('putenv failed');
             }

From 5de5a65df03fb1f2716d458d2a3e9a1b57bed2aa Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 12 Mar 2015 15:18:00 +0100
Subject: [PATCH 0997/2920] Do not suppress errors when a LDAP capability query
 fails

---
 library/Icinga/Protocol/Ldap/Connection.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 27e39be8c..f36de1a5e 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -487,9 +487,9 @@ class Connection
             $this->capabilities = $this->discoverCapabilities($ds);
             $this->discoverySuccess = true;
         } catch (LdapException $e) {
-            // create empty default capabilities
+            Logger::debug($e);
             Logger::warning('LADP discovery failed, assuming default LDAP settings.');
-            $this->capabilities = new Capability();
+            $this->capabilities = new Capability(); // create empty default capabilities
         }
 
         if ($this->connectionType === static::STARTTLS) {

From 8295d6d9b09a28aa0e3aca03133db9c553ff4a56 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 12 Mar 2015 15:36:52 +0100
Subject: [PATCH 0998/2920] Do not require the `connection' directive when
 creating a LDAP resource

---
 library/Icinga/Protocol/Ldap/Connection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index f36de1a5e..3f79a063f 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -78,7 +78,7 @@ class Connection
         $this->bind_pw  = $config->bind_pw;
         $this->root_dn  = $config->root_dn;
         $this->port = $config->get('port', $this->port);
-        $this->connectionType = $config->connection;
+        $this->connectionType = $config->get('connection');
         $this->reqCert = (bool) $config->get('reqcert', $this->reqCert);
     }
 

From 0c30356d52b692c62a4d85a59000440f98f93334 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 13:59:24 +0100
Subject: [PATCH 0999/2920] Add Menu::getPermission() and Menu::setPermission()

Those two functions are required for filtering menu items based on a user's grants.

refs #8720
---
 library/Icinga/Web/Menu.php | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 8d62563be..872fd3249 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -75,6 +75,17 @@ class Menu implements RecursiveIterator
      */
     protected $parent;
 
+    /**
+     * Permission a user is required to have granted to display the menu item
+     *
+     * If a permission is set, authentication is of course required.
+     *
+     * Note that only one required permission can be set yet.
+     *
+     * @var string|null
+     */
+    protected $permission;
+
     /**
      * Create a new menu
      *
@@ -442,15 +453,27 @@ class Menu implements RecursiveIterator
     }
 
     /**
-     * Set required Permissions
+     * Get the permission a user is required to have granted to display the menu item
      *
-     * @param   $permission
+     * @return string|null
+     */
+    public function getPermission()
+    {
+        return $this->permission;
+    }
+
+    /**
+     * Set permission a user is required to have granted to display the menu item
+     *
+     * If a permission is set, authentication is of course required.
+     *
+     * @param   string  $permission
      *
      * @return  $this
      */
-    public function requirePermission($permission)
+    public function setPermission($permission)
     {
-        // Not implemented yet
+        $this->permission = (string) $permission;
         return $this;
     }
 

From 956bc3c07a7d1d428d0d087e121aa3507e959a01 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 14:40:37 +0100
Subject: [PATCH 1000/2920] Security: Rename system/config/application to
 config/application/general

Module config permission and application config permission have to be separeted.
Application config related permissions will be added beneath config/application and module
related config permissions will be added beneath config/modules.

refs #8720
---
 application/controllers/ConfigController.php | 4 ++--
 application/controllers/RolesController.php  | 2 +-
 application/forms/Security/RoleForm.php      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index f7543cc03..307ce3b00 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -37,7 +37,7 @@ class ConfigController extends ActionController
         $tabs = $this->getTabs();
         $auth = $this->Auth();
         $allowedActions = array();
-        if ($auth->hasPermission('system/config/application')) {
+        if ($auth->hasPermission('config/application/general')) {
             $tabs->add('application', array(
                 'title' => $this->translate('Adjust the general configuration of Icinga Web 2'),
                 'label' => $this->translate('Application'),
@@ -103,7 +103,7 @@ class ConfigController extends ActionController
      */
     public function applicationAction()
     {
-        $this->assertPermission('system/config/application');
+        $this->assertPermission('config/application/general');
         $form = new GeneralConfigForm();
         $form->setIniConfig(Config::app());
         $form->handleRequest();
diff --git a/application/controllers/RolesController.php b/application/controllers/RolesController.php
index 2b7b520c5..95440ca96 100644
--- a/application/controllers/RolesController.php
+++ b/application/controllers/RolesController.php
@@ -23,7 +23,7 @@ class RolesController extends ActionController
         $this->assertPermission('system/config/roles');
         $tabs = $this->getTabs();
         $auth = $this->Auth();
-        if ($auth->hasPermission('system/config/application')) {
+        if ($auth->hasPermission('config/application/general')) {
             $tabs->add('application', array(
                 'title' => $this->translate('Adjust the general configuration of Icinga Web 2'),
                 'label' => $this->translate('Application'),
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 85691de24..d77210510 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -23,7 +23,7 @@ class RoleForm extends ConfigForm
     protected $providedPermissions = array(
         '*'                             => '*',
         'system/config/*'               => 'system/config/*',
-        'system/config/application'     => 'system/config/application',
+        'config/application/general'    => 'config/application/general',
         'system/config/authentication'  => 'system/config/authentication',
         'system/config/modules'         => 'system/config/modules',
         'system/config/resources'       => 'system/config/resources',

From a4e81c320a6b0d165b053fcf68cdcbbbfa3da65f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 14:44:45 +0100
Subject: [PATCH 1001/2920] Security: Rename system/config/authentication to
 config/application/authentication

Module config permission and application config permission have to be separeted.
Application config related permissions will be added beneath config/application and module
related config permissions will be added beneath config/modules.

refs #8720
---
 application/controllers/ConfigController.php | 10 +++++-----
 application/controllers/RolesController.php  |  2 +-
 application/forms/Security/RoleForm.php      | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 307ce3b00..21f359226 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -45,7 +45,7 @@ class ConfigController extends ActionController
             ));
             $allowedActions[] = 'application';
         }
-        if ($auth->hasPermission('system/config/authentication')) {
+        if ($auth->hasPermission('config/application/authentication')) {
             $tabs->add('authentication', array(
                 'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'),
                 'label' => $this->translate('Authentication'),
@@ -199,7 +199,7 @@ class ConfigController extends ActionController
      */
     public function authenticationAction()
     {
-        $this->assertPermission('system/config/authentication');
+        $this->assertPermission('config/application/authentication');
         $form = new AuthenticationBackendReorderForm();
         $form->setIniConfig(Config::app('authentication'));
         $form->handleRequest();
@@ -214,7 +214,7 @@ class ConfigController extends ActionController
      */
     public function createauthenticationbackendAction()
     {
-        $this->assertPermission('system/config/authentication');
+        $this->assertPermission('config/application/authentication');
         $form = new AuthenticationBackendConfigForm();
         $form->setTitle($this->translate('Create New Authentication Backend'));
         $form->addDescription($this->translate(
@@ -236,7 +236,7 @@ class ConfigController extends ActionController
      */
     public function editauthenticationbackendAction()
     {
-        $this->assertPermission('system/config/authentication');
+        $this->assertPermission('config/application/authentication');
         $form = new AuthenticationBackendConfigForm();
         $form->setTitle($this->translate('Edit Backend'));
         $form->setIniConfig(Config::app('authentication'));
@@ -254,7 +254,7 @@ class ConfigController extends ActionController
      */
     public function removeauthenticationbackendAction()
     {
-        $this->assertPermission('system/config/authentication');
+        $this->assertPermission('config/application/authentication');
         $form = new ConfirmRemovalForm(array(
             'onSuccess' => function ($form) {
                 $configForm = new AuthenticationBackendConfigForm();
diff --git a/application/controllers/RolesController.php b/application/controllers/RolesController.php
index 95440ca96..57987e60d 100644
--- a/application/controllers/RolesController.php
+++ b/application/controllers/RolesController.php
@@ -30,7 +30,7 @@ class RolesController extends ActionController
                 'url'   => 'config'
             ));
         }
-        if ($auth->hasPermission('system/config/authentication')) {
+        if ($auth->hasPermission('config/application/authentication')) {
             $tabs->add('authentication', array(
                 'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'),
                 'label' => $this->translate('Authentication'),
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index d77210510..f9d306698 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -21,13 +21,13 @@ class RoleForm extends ConfigForm
      * @type array
      */
     protected $providedPermissions = array(
-        '*'                             => '*',
-        'system/config/*'               => 'system/config/*',
-        'config/application/general'    => 'config/application/general',
-        'system/config/authentication'  => 'system/config/authentication',
-        'system/config/modules'         => 'system/config/modules',
-        'system/config/resources'       => 'system/config/resources',
-        'system/config/roles'           => 'system/config/roles'
+        '*'                                 => '*',
+        'system/config/*'                   => 'system/config/*',
+        'config/application/general'        => 'config/application/general',
+        'config/application/authentication' => 'config/application/authentication',
+        'system/config/modules'             => 'system/config/modules',
+        'system/config/resources'           => 'system/config/resources',
+        'system/config/roles'               => 'system/config/roles'
     );
 
     /**

From 08abbda15247975b1ca97da9dfa09f292515d439 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 14:46:56 +0100
Subject: [PATCH 1002/2920] Security: Rename system/config/resources to
 config/application/resources

Module config permission and application config permission have to be separeted.
Application config related permissions will be added beneath config/application and module
related config permissions will be added beneath config/modules.

refs #8720
---
 application/controllers/ConfigController.php | 10 +++++-----
 application/controllers/RolesController.php  |  2 +-
 application/forms/Security/RoleForm.php      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 21f359226..dc7afd887 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -53,7 +53,7 @@ class ConfigController extends ActionController
             ));
             $allowedActions[] = 'authentication';
         }
-        if ($auth->hasPermission('system/config/resources')) {
+        if ($auth->hasPermission('config/application/resources')) {
             $tabs->add('resource', array(
                 'title' => $this->translate('Configure which resources are being utilized by Icinga Web 2'),
                 'label' => $this->translate('Resources'),
@@ -292,7 +292,7 @@ class ConfigController extends ActionController
      */
     public function resourceAction()
     {
-        $this->assertPermission('system/config/resources');
+        $this->assertPermission('config/application/resources');
         $this->view->resources = Config::app('resources', true)->keys();
         $this->view->tabs->activate('resource');
     }
@@ -302,7 +302,7 @@ class ConfigController extends ActionController
      */
     public function createresourceAction()
     {
-        $this->assertPermission('system/config/resources');
+        $this->assertPermission('config/application/resources');
         $form = new ResourceConfigForm();
         $form->setTitle($this->translate('Create A New Resource'));
         $form->addDescription($this->translate('Resources are entities that provide data to Icinga Web 2.'));
@@ -319,7 +319,7 @@ class ConfigController extends ActionController
      */
     public function editresourceAction()
     {
-        $this->assertPermission('system/config/resources');
+        $this->assertPermission('config/application/resources');
         $form = new ResourceConfigForm();
         $form->setTitle($this->translate('Edit Existing Resource'));
         $form->setIniConfig(Config::app('resources'));
@@ -335,7 +335,7 @@ class ConfigController extends ActionController
      */
     public function removeresourceAction()
     {
-        $this->assertPermission('system/config/resources');
+        $this->assertPermission('config/application/resources');
         $form = new ConfirmRemovalForm(array(
             'onSuccess' => function ($form) {
                 $configForm = new ResourceConfigForm();
diff --git a/application/controllers/RolesController.php b/application/controllers/RolesController.php
index 57987e60d..e14426bd7 100644
--- a/application/controllers/RolesController.php
+++ b/application/controllers/RolesController.php
@@ -37,7 +37,7 @@ class RolesController extends ActionController
                 'url'   => 'config/authentication'
             ));
         }
-        if ($auth->hasPermission('system/config/resources')) {
+        if ($auth->hasPermission('config/application/resources')) {
             $tabs->add('resource', array(
                 'title' => $this->translate('Configure which resources are being utilized by Icinga Web 2'),
                 'label' => $this->translate('Resources'),
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index f9d306698..bc93c39d4 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -26,7 +26,7 @@ class RoleForm extends ConfigForm
         'config/application/general'        => 'config/application/general',
         'config/application/authentication' => 'config/application/authentication',
         'system/config/modules'             => 'system/config/modules',
-        'system/config/resources'           => 'system/config/resources',
+        'config/application/resources'      => 'config/application/resources',
         'system/config/roles'               => 'system/config/roles'
     );
 

From f6e95512351e21c6e897e0507534664a63fa5c9d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 14:48:45 +0100
Subject: [PATCH 1003/2920] Security: Rename system/config/roles to
 config/application/roles

Module config permission and application config permission have to be separeted.
Application config related permissions will be added beneath config/application and module
related config permissions will be added beneath config/modules.

refs #8720
---
 application/controllers/ConfigController.php | 2 +-
 application/controllers/RolesController.php  | 2 +-
 application/forms/Security/RoleForm.php      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index dc7afd887..9bc26f726 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -61,7 +61,7 @@ class ConfigController extends ActionController
             ));
             $allowedActions[] = 'resource';
         }
-        if ($auth->hasPermission('system/config/roles')) {
+        if ($auth->hasPermission('config/application/roles')) {
             $tabs->add('roles', array(
                 'title' => $this->translate(
                     'Configure roles to permit or restrict users and groups accessing Icinga Web 2'
diff --git a/application/controllers/RolesController.php b/application/controllers/RolesController.php
index e14426bd7..68d23d84f 100644
--- a/application/controllers/RolesController.php
+++ b/application/controllers/RolesController.php
@@ -20,7 +20,7 @@ class RolesController extends ActionController
      */
     public function init()
     {
-        $this->assertPermission('system/config/roles');
+        $this->assertPermission('config/application/roles');
         $tabs = $this->getTabs();
         $auth = $this->Auth();
         if ($auth->hasPermission('config/application/general')) {
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index bc93c39d4..9f951deb2 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -27,7 +27,7 @@ class RoleForm extends ConfigForm
         'config/application/authentication' => 'config/application/authentication',
         'system/config/modules'             => 'system/config/modules',
         'config/application/resources'      => 'config/application/resources',
-        'system/config/roles'               => 'system/config/roles'
+        'config/application/roles'          => 'config/application/roles'
     );
 
     /**

From 195fe6f04b7935f2afadf12add6c7804662914ba Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 14:53:20 +0100
Subject: [PATCH 1004/2920] Security: Rename system/config/modules to
 config/modules

Module config permission and application config permission have to be separeted.
Application config related permissions were added beneath config/application and module
related config permissions will be config/modules for now.

refs #8720
---
 application/controllers/ConfigController.php | 4 ++--
 application/forms/Security/RoleForm.php      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 9bc26f726..1942826bb 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -159,7 +159,7 @@ class ConfigController extends ActionController
      */
     public function moduleenableAction()
     {
-        $this->assertPermission('system/config/modules');
+        $this->assertPermission('config/modules');
         $module = $this->getParam('name');
         $manager = Icinga::app()->getModuleManager();
         try {
@@ -179,7 +179,7 @@ class ConfigController extends ActionController
      */
     public function moduledisableAction()
     {
-        $this->assertPermission('system/config/modules');
+        $this->assertPermission('config/modules');
         $module = $this->getParam('name');
         $manager = Icinga::app()->getModuleManager();
         try {
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 9f951deb2..671f7738f 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -25,9 +25,9 @@ class RoleForm extends ConfigForm
         'system/config/*'                   => 'system/config/*',
         'config/application/general'        => 'config/application/general',
         'config/application/authentication' => 'config/application/authentication',
-        'system/config/modules'             => 'system/config/modules',
         'config/application/resources'      => 'config/application/resources',
-        'config/application/roles'          => 'config/application/roles'
+        'config/application/roles'          => 'config/application/roles',
+        'config/modules'                    => 'config/modules'
     );
 
     /**

From 517437eb1b57fe6ae1b2ad69e48525f3dcf83cbf Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 14:54:57 +0100
Subject: [PATCH 1005/2920] Security: Add wildcard permissions to the config/
 tree

refs #8720
---
 application/forms/Security/RoleForm.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 671f7738f..39d7ae2c6 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -22,7 +22,8 @@ class RoleForm extends ConfigForm
      */
     protected $providedPermissions = array(
         '*'                                 => '*',
-        'system/config/*'                   => 'system/config/*',
+        'config/*'                          => 'config/*',
+        'config/application/*'              => 'config/application/*',
         'config/application/general'        => 'config/application/general',
         'config/application/authentication' => 'config/application/authentication',
         'config/application/resources'      => 'config/application/resources',

From 33112f6a187a6a9d464b2d97091a27044298ef6e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 14:56:17 +0100
Subject: [PATCH 1006/2920] Use {@inheritdoc} in the RoleForm

refs #8720
---
 application/forms/Security/RoleForm.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 39d7ae2c6..0600e04f2 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -39,8 +39,7 @@ class RoleForm extends ConfigForm
     protected $providedRestrictions = array();
 
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::init() For the method documentation.
+     * {@inheritdoc}
      */
     public function init()
     {
@@ -69,8 +68,7 @@ class RoleForm extends ConfigForm
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     * {@inheritdoc}
      */
     public function createElements(array $formData = array())
     {
@@ -254,8 +252,7 @@ class RoleForm extends ConfigForm
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \Zend_Form::getValues() For the method documentation.
+     * {@inheritdoc}
      */
     public function getValues($suppressArrayNotation = false)
     {

From 7f010102f641e0f46ed013d1d9eff80730444e51 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 15:27:44 +0100
Subject: [PATCH 1007/2920] Add wildcard support to the permission passed to
 User::can()

refs #8720
---
 library/Icinga/User.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index 3bf0d0aa2..18d44af96 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -422,8 +422,16 @@ class User
         if (isset($this->permissions['*']) || isset($this->permissions[$permission])) {
             return true;
         }
+        // If the permission to check contains a wildcard, grant the permission if any permit related to the permission
+        // matches
+        $any = strpos($permission, '*');
         foreach ($this->permissions as $permitted) {
-            $wildcard = strpos($permitted, '*');
+            if ($any !== false) {
+                $wildcard = $any;
+            } else {
+                // If the permit contains a wildcard, grant the permission if it's related to the permit
+                $wildcard = strpos($permitted, '*');
+            }
             if ($wildcard !== false) {
                 if (substr($permission, 0, $wildcard) === substr($permitted, 0, $wildcard)) {
                     return true;

From e6a60e214c29cd73167fd943550a72aad1ab5f2a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 15:28:27 +0100
Subject: [PATCH 1008/2920] lib: Add PermittedMenuItemFilter ...

... for iterating over menu items the user is allowed to display

refs #8720
---
 .../Web/Menu/PermittedMenuItemFilter.php      | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 library/Icinga/Web/Menu/PermittedMenuItemFilter.php

diff --git a/library/Icinga/Web/Menu/PermittedMenuItemFilter.php b/library/Icinga/Web/Menu/PermittedMenuItemFilter.php
new file mode 100644
index 000000000..7224c3589
--- /dev/null
+++ b/library/Icinga/Web/Menu/PermittedMenuItemFilter.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Icinga\Web\Menu;
+
+use RecursiveFilterIterator;
+use Icinga\Authentication\Manager;
+use Icinga\Web\Menu;
+
+class PermittedMenuItemFilter extends RecursiveFilterIterator
+{
+    /**
+     * Accept menu items that are permitted to the user
+     *
+     * @return bool Whether the user has the required permission granted to display the menu item
+     */
+    public function accept()
+    {
+        $item = $this->current();
+        /** @var Menu $item */
+        if (($permission = $item->getPermission()) !== null) {
+            $auth = Manager::getInstance();
+            if (! $auth->isAuthenticated()) {
+                // Don't accept menu item because user is not authenticated and the menu item requires a permission
+                return false;
+            }
+            if (! $auth->getUser()->can($permission)) {
+                return false;
+            }
+        }
+        // Accept menu item if it does not require a permission
+        return true;
+    }
+}

From da16bfcef30790ae08ac3c211d08c3d13c069a5e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 15:30:10 +0100
Subject: [PATCH 1009/2920] Security: Use PermittedMenuItemFilter in the
 MenuRenderer

refs #8720
---
 library/Icinga/Web/MenuRenderer.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/MenuRenderer.php b/library/Icinga/Web/MenuRenderer.php
index 78e910f61..7d2cd5ad3 100644
--- a/library/Icinga/Web/MenuRenderer.php
+++ b/library/Icinga/Web/MenuRenderer.php
@@ -6,6 +6,7 @@ namespace Icinga\Web;
 use Exception;
 use RecursiveIteratorIterator;
 use Icinga\Application\Logger;
+use Icinga\Web\Menu\PermittedMenuItemFilter;
 
 /**
  * A renderer to draw a menu with its sub-menus using an unordered html list
@@ -44,7 +45,7 @@ class MenuRenderer extends RecursiveIteratorIterator
         } else {
             $this->url = Url::fromPath($url);
         }
-        parent::__construct($menu, RecursiveIteratorIterator::CHILD_FIRST);
+        parent::__construct(new PermittedMenuItemFilter($menu), RecursiveIteratorIterator::CHILD_FIRST);
     }
 
     /**

From 093dfd627ea563e61189782f3390dea0b6744290 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 15:37:56 +0100
Subject: [PATCH 1010/2920] Security: Hide config menu items if the user lacks
 the required permission

refs #8720
---
 library/Icinga/Web/Menu.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 872fd3249..3e7882bfc 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -232,12 +232,14 @@ class Menu implements RecursiveIterator
                 'priority' => 200
             ));
             $section->add(t('Configuration'), array(
-                'url'      => 'config',
-                'priority' => 300
+                'url'           => 'config',
+                'permission'    => 'config/application/*',
+                'priority'      => 300
             ));
             $section->add(t('Modules'), array(
-                'url'      => 'config/modules',
-                'priority' => 400
+                'url'           => 'config/modules',
+                'permission'    => 'config/modules',
+                'priority'      => 400
             ));
 
             if (Logger::writesToFile()) {

From ddc8dd5d4ca30098d04d09044a8f113057c538c1 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 12 Mar 2015 16:08:22 +0100
Subject: [PATCH 1011/2920] Add command send custom notification to monitoring
 module

refs #8644
---
 .../controllers/HostController.php            |  13 ++
 .../controllers/HostsController.php           |  17 +++
 .../controllers/ServiceController.php         |  13 ++
 .../controllers/ServicesController.php        |  17 +++
 .../SendCustomNotificationCommandForm.php     | 112 ++++++++++++++++++
 .../views/scripts/hosts/show.phtml            |   6 +
 .../views/scripts/services/show.phtml         |   6 +
 .../show/components/notifications.phtml       |  74 ++++++++----
 .../Object/SendCustomNotificationCommand.php  |  78 ++++++++++++
 9 files changed, 311 insertions(+), 25 deletions(-)
 create mode 100644 modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php
 create mode 100644 modules/monitoring/library/Monitoring/Command/Object/SendCustomNotificationCommand.php

diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index 4a29750e3..11179c1fa 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -6,6 +6,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ProcessCheckResultCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostCheckCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostDowntimeCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\SendCustomNotificationCommandForm;
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Web\Controller\MonitoredObjectController;
 use Icinga\Web\Hook;
@@ -118,4 +119,16 @@ class Monitoring_HostController extends MonitoredObjectController
         $form->setTitle($this->translate('Submit Passive Host Check Result'));
         $this->handleCommandForm($form);
     }
+
+    /**
+     * Send a custom notification for host
+     */
+    public function sendCustomNotificationAction()
+    {
+        $this->assertPermission('monitoring/command/send-custom-notification');
+
+        $form = new SendCustomNotificationCommandForm();
+        $form->setTitle($this->translate('Send Custom Host Notification'));
+        $this->handleCommandForm($form);
+    }
 }
diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 5dc72eeb0..8d0fc1f73 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -10,6 +10,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\ProcessCheckResultCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostCheckCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostDowntimeCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\SendCustomNotificationCommandForm;
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\HostList;
 use Icinga\Web\Url;
@@ -157,6 +158,10 @@ class Monitoring_HostsController extends Controller
             $this->translate('Host State'),
             array('#44bb77', '#FF5566', '#E066FF', '#77AAFF')
         );
+        $this->view->sendCustomNotificationLink =
+            Url::fromRequest()->setPath(
+                'monitoring/hosts/send-custom-notification'
+            );
     }
 
     protected function createPieChart(array $states, $title, array $colors)
@@ -215,4 +220,16 @@ class Monitoring_HostsController extends Controller
         $form->setTitle($this->translate('Submit Passive Host Check Results'));
         $this->handleCommandForm($form);
     }
+
+    /**
+     * Send a custom notification for hosts
+     */
+    public function sendCustomNotificationAction()
+    {
+        $this->assertPermission('monitoring/command/send-custom-notification');
+
+        $form = new SendCustomNotificationCommandForm();
+        $form->setTitle($this->translate('Send Custom Host Notification'));
+        $this->handleCommandForm($form);
+    }
 }
diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index d717a8e1c..3dc98c3b8 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -6,6 +6,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ProcessCheckResultCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceCheckCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceDowntimeCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\SendCustomNotificationCommandForm;
 use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Module\Monitoring\Web\Controller\MonitoredObjectController;
 
@@ -95,4 +96,16 @@ class Monitoring_ServiceController extends MonitoredObjectController
         $form->setTitle($this->translate('Submit Passive Service Check Result'));
         $this->handleCommandForm($form);
     }
+
+    /**
+     * Send a custom notification for a service
+     */
+    public function sendCustomNotificationAction()
+    {
+        $this->assertPermission('monitoring/command/send-custom-notification');
+
+        $form = new SendCustomNotificationCommandForm();
+        $form->setTitle($this->translate('Send Custom Service Notification'));
+        $this->handleCommandForm($form);
+    }
 }
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 1e907aab9..efe89f4c1 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -10,6 +10,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\ProcessCheckResultCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceCheckCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceDowntimeCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\SendCustomNotificationCommandForm;
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Module\Monitoring\Object\ServiceList;
@@ -206,6 +207,10 @@ class Monitoring_ServicesController extends Controller
             $this->translate('Host State'),
             array('#44bb77', '#FF5566', '#E066FF', '#77AAFF')
         );
+        $this->view->sendCustomNotificationLink =
+            Url::fromRequest()->setPath(
+                'monitoring/services/send-custom-notification'
+            );
     }
 
     protected function createPieChart(array $states, $title, array $colors)
@@ -264,4 +269,16 @@ class Monitoring_ServicesController extends Controller
         $form->setTitle($this->translate('Submit Passive Service Check Results'));
         $this->handleCommandForm($form);
     }
+
+    /**
+     * Send a custom notification for services
+     */
+    public function sendCustomNotificationAction()
+    {
+        $this->assertPermission('monitoring/command/send-custom-notification');
+
+        $form = new SendCustomNotificationCommandForm();
+        $form->setTitle($this->translate('Send Custom Service Notification'));
+        $this->handleCommandForm($form);
+    }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php b/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php
new file mode 100644
index 000000000..068f85e1b
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php
@@ -0,0 +1,112 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Forms\Command\Object;
+
+use Icinga\Module\Monitoring\Command\Object\SendCustomNotificationCommand;
+use Icinga\Web\Notification;
+
+/**
+ * Form to send custom notifications
+ */
+class SendCustomNotificationCommandForm extends ObjectsCommandForm
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->addDescription(
+            $this->translate(
+                'This command is used to send custom notifications for hosts or'
+                . ' services.'
+            )
+        );
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
+     */
+    public function getSubmitLabel()
+    {
+        return $this->translatePlural(
+            'Send custom notification',
+            'Send custom notifications',
+            count($this->objects)
+        );
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     */
+    public function createElements(array $formData = array())
+    {
+        $this->addElements(array(
+            array(
+                'textarea',
+                'comment',
+                array(
+                    'required'      => true,
+                    'label'         => $this->translate('Comment'),
+                    'description'   => $this->translate(
+                        'If you work with other administrators, you may find it useful to share information about the'
+                        . ' the host or service that is having problems. Make sure you enter a brief description of'
+                        . ' what you are doing.'
+                    )
+                )
+            ),
+            array(
+                'checkbox',
+                'forced',
+                array(
+                    'label'         => $this->translate('Forced'),
+                    'value'         => false,
+                    'description'   => $this->translate(
+                        'If you check this option, a notification is sent'
+                        . 'regardless of the current time and whether'
+                        . ' notifications are enabled.'
+                    )
+                )
+            ),
+            array(
+                'checkbox',
+                'broadcast',
+                array(
+                    'label'         => $this->translate('Broadcast'),
+                    'value'         => false,
+                    'description'   => $this->translate(
+                        'If you check this option, a notification is sent to'
+                        . ' all normal and escalated contacts.'
+                    )
+                )
+            )
+        ));
+        return $this;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     */
+    public function onSuccess()
+    {
+        foreach ($this->objects as $object) {
+            /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+            $comment = new SendCustomNotificationCommand();
+            $comment->setObject($object);
+            $comment->setComment($this->getElement('comment')->getValue());
+            $comment->setAuthor($this->request->getUser()->getUsername());
+            $comment->setForced($this->getElement('forced')->isChecked());
+            $comment->setBroadcast($this->getElement('broadcast')->isChecked());
+            $this->getTransport($this->request)->send($comment);
+        }
+        Notification::success($this->translatePlural(
+            'Send custom notification..',
+            'Send custom notifications..',
+            count($this->objects)
+        ));
+        return true;
+    }
+}
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 8655a31b1..e79fb00eb 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -31,6 +31,12 @@
             null,
             array('icon' => 'reply')
         ); ?></div>
+        <div><?= $this->qlink(
+                sprintf($this->translate('Send a custom notification for all %u hosts'), $hostCount),
+                $sendCustomNotificationLink,
+                null,
+                array('icon' => 'comment')
+            ); ?></div>
       <?php if (($unhandledCount = count($unhandledObjects)) > 0): ?>
         <div>
             <h3><?= sprintf(
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 015fecb95..f6e98754b 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -31,6 +31,12 @@
             null,
             array('icon' => 'reply')
         ); ?></div>
+        <div><?= $this->qlink(
+                sprintf($this->translate('Send a custom notification for all %u services'), $serviceCount),
+                $sendCustomNotificationLink,
+                null,
+                array('icon' => 'comment')
+            ); ?></div>
       <?php if (($unhandledCount = count($unhandledObjects)) > 0): ?>
         <div>
             <h3><?= sprintf(
diff --git a/modules/monitoring/application/views/scripts/show/components/notifications.phtml b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
index 5c52e872a..1f2ddfe33 100644
--- a/modules/monitoring/application/views/scripts/show/components/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
@@ -1,35 +1,59 @@
-<?php
-
-// We are not interested in notifications for OK or pending objects
-if (in_array((int) $object->state, array(0, 99))) {
-    return;
-}
-
-?>
 <tr>
   <th><?= $this->translate('Notifications') ?></th>
   <td>
+      <?php if ($this->hasPermission('monitoring/command/send-custom-notification')) {
+      if ($object->getType() === $object::TYPE_HOST) {
+          $ackLink = $this->href(
+              'monitoring/host/send-custom-notification',
+              array('host' => $object->getName())
+          );
+      } else {
+          $ackLink = $this->href(
+              'monitoring/service/send-custom-notification',
+              array('host' => $object->getHost()->getName(), 'service' => $object->getName())
+          );
+      }
+      ?>
+      <?= $this->qlink(
+          $this->translate('Send Custom Notification'),
+          $ackLink,
+          null,
+          array(
+              'icon'              => 'comment',
+              'data-base-target'  => '_self',
+              'title'             => $this->translate(
+                  'Send a custom notification, share information about the'
+                  . ' object to contacts.'
+              )
+          )
+      ); ?>
+      <?php } ?>
 <?php
+// We are not interested in notifications for OK or pending objects
+if (! in_array((int) $object->state, array(0, 99))) {
 
-if ($object->current_notification_number > 0) {
-    if ((int) $object->current_notification_number === 1) {
-        $msg = sprintf(
-            $this->translate('A notication has been sent for this issue %s ago'),
-            $this->timeSince($object->last_notification)
-        );
+    if ($object->current_notification_number > 0) {
+        if ((int) $object->current_notification_number === 1) {
+            $msg = sprintf(
+                $this->translate('A notication has been sent for this issue %s ago'),
+                $this->timeSince($object->last_notification)
+            );
+        } else {
+            $msg = sprintf(
+                $this->translate('%s notications have been sent for this issue'),
+                $object->current_notification_number
+            ) . '<br />' . sprintf(
+                $this->translate('The last one occured %s ago'),
+                $this->timeSince($object->last_notification)
+            );
+        }
+        echo '- ' . $msg;
     } else {
-        $msg = sprintf(
-            $this->translate('%s notications have been sent for this issue'),
-            $object->current_notification_number
-        ) . '<br />' . sprintf(
-            $this->translate('The last one occured %s ago'),
-            $this->timeSince($object->last_notification)
-        );
+        echo '('
+            . $this->translate('No notification has been sent for this issue')
+            . ')';
     }
-    echo $msg;
-} else {
-    echo $this->translate('No notification has been sent for this issue');
 }
 ?>
   </td>
-</tr>
+</tr>
\ No newline at end of file
diff --git a/modules/monitoring/library/Monitoring/Command/Object/SendCustomNotificationCommand.php b/modules/monitoring/library/Monitoring/Command/Object/SendCustomNotificationCommand.php
new file mode 100644
index 000000000..88446a5aa
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Command/Object/SendCustomNotificationCommand.php
@@ -0,0 +1,78 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Command\Object;
+
+/**
+ * Send custom notifications for a host or service
+ */
+class SendCustomNotificationCommand extends WithCommentCommand
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Module\Monitoring\Command\Object\ObjectCommand::$allowedObjects For the property documentation.
+     */
+    protected $allowedObjects = array(
+        self::TYPE_HOST,
+        self::TYPE_SERVICE
+    );
+    /**
+     * Whether a notification is forced to send
+     *
+     * Forced notifications are send regardless of time and if notifications
+     * are enabled.
+     *
+     * @type bool
+     */
+    protected $forced;
+
+    /**
+     * Broadcast the notification
+     *
+     * If broadcast is true, the notification is send to all normal and
+     * escalated contacts for the object
+     *
+     * @type bool
+     */
+    protected $broadcast;
+
+    /**
+     * Get notification force flag
+     *
+     * @return bool
+     */
+    public function getForced()
+    {
+        return $this->forced;
+    }
+
+    /**
+     * Set whether notification should be forced
+     *
+     * @param bool $forced
+     */
+    public function setForced($forced = true)
+    {
+        $this->forced = $forced;
+    }
+
+    /**
+     * Get notification broadcast flag
+     *
+     * @return bool
+     */
+    public function getBroadcast()
+    {
+        return $this->broadcast;
+    }
+
+    /**
+     * Set notification to broadcast
+     *
+     * @param bool $broadcast
+     */
+    public function setBroadcast($broadcast = true)
+    {
+        $this->broadcast = $broadcast;
+    }
+}

From 90971f2caff13de2e1ddb06d90dbec89446a225b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 12:12:34 +0100
Subject: [PATCH 1012/2920] Revert "Merge branch
 'feature/organize-headings-7976'"

This reverts commit ea2a17a76c4c4b1a3df13c44016a009694026e00, reversing
changes made to e72de8dfe1456cbb50852d8b7910e0013cab3aaa.

refs #7976
fixes #8647
---
 application/controllers/ConfigController.php  |  1 -
 application/controllers/RolesController.php   |  1 -
 .../config/authentication/reorder.phtml       | 17 ++-----
 application/views/scripts/config/module.phtml |  3 --
 .../views/scripts/config/modules.phtml        |  1 -
 .../views/scripts/config/resource.phtml       | 17 ++-----
 application/views/scripts/roles/index.phtml   |  6 ---
 library/Icinga/Web/Widget/FilterEditor.php    | 34 +++++---------
 library/Icinga/Web/Widget/SortBox.php         |  9 +---
 library/Icinga/Web/Widget/Tabs.php            | 47 +------------------
 .../controllers/AlertsummaryController.php    |  2 +-
 .../controllers/ListController.php            |  1 -
 .../controllers/ProcessController.php         |  2 +-
 .../views/scripts/alertsummary/index.phtml    | 27 +++--------
 .../application/views/scripts/host/show.phtml |  1 -
 .../views/scripts/list/comments.phtml         | 15 +++---
 .../views/scripts/list/contactgroups.phtml    |  3 --
 .../views/scripts/list/contacts.phtml         | 14 +++---
 .../views/scripts/list/downtimes.phtml        | 20 +++++---
 .../views/scripts/list/eventgrid.phtml        | 15 +++---
 .../views/scripts/list/eventhistory.phtml     | 19 ++++----
 .../views/scripts/list/hostgroups.phtml       |  5 +-
 .../views/scripts/list/hosts.phtml            |  5 +-
 .../views/scripts/list/notifications.phtml    | 11 +++--
 .../views/scripts/list/servicegrid.phtml      |  5 +-
 .../views/scripts/list/servicegroups.phtml    |  5 +-
 .../views/scripts/list/services.phtml         |  5 +-
 .../partials/host/objects-header.phtml        |  4 +-
 .../partials/service/objects-header.phtml     |  4 +-
 .../views/scripts/process/info.phtml          | 24 ++--------
 .../views/scripts/tactical/index.phtml        |  1 -
 .../views/scripts/timeline/index.phtml        |  4 --
 public/css/icinga/menu.less                   |  8 ++--
 public/js/icinga/events.js                    | 30 +++++-------
 34 files changed, 116 insertions(+), 250 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index f7543cc03..cdf41c8f7 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -72,7 +72,6 @@ class ConfigController extends ActionController
             $allowedActions[] = 'roles';
         }
         $this->firstAllowedAction = array_shift($allowedActions);
-        $this->getTabs()->setTitle($this->translate('Config Navigation'));
     }
 
     public function devtoolsAction()
diff --git a/application/controllers/RolesController.php b/application/controllers/RolesController.php
index 2b7b520c5..bff5f70a1 100644
--- a/application/controllers/RolesController.php
+++ b/application/controllers/RolesController.php
@@ -51,7 +51,6 @@ class RolesController extends ActionController
             'label' => $this->translate('Roles'),
             'url'   => 'roles'
         ));
-        $this->getTabs()->setTitle($this->translate('Role Configuration'));
     }
 
     /**
diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/authentication/reorder.phtml
index 0386cdd5e..e4b72d7e1 100644
--- a/application/views/scripts/config/authentication/reorder.phtml
+++ b/application/views/scripts/config/authentication/reorder.phtml
@@ -2,20 +2,9 @@
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">
-  <h1 tabindex="-1" id="authentication-configuration">
-    <?= $this->translate('Authentication Configuration'); ?>
-  </h1>
-  <h2 tabindex="-1" id="authentication-new-backend" class="sr-only">
-    <?= t('New Authentication Backend'); ?>
-  </h2>
-  <p>
-    <a href="<?= $this->href('/config/createAuthenticationBackend'); ?>">
-      <?= $this->icon('plus'); ?><?= $this->translate('Create A New Authentication Backend'); ?>
-    </a>
-  </p>
-  <h2 tabindex="-1" id="authentication-reorder" class="sr-only">
-    <?= t('Reorder Authentication Backends'); ?>
-  </h2>
+  <a href="<?= $this->href('/config/createAuthenticationBackend'); ?>">
+    <?= $this->icon('plus'); ?><?= $this->translate('Create A New Authentication Backend'); ?>
+  </a>
   <div id="authentication-reorder-form">
     <?= $form; ?>
   </div>
diff --git a/application/views/scripts/config/module.phtml b/application/views/scripts/config/module.phtml
index 9130bcc90..1d03f5d37 100644
--- a/application/views/scripts/config/module.phtml
+++ b/application/views/scripts/config/module.phtml
@@ -11,9 +11,6 @@
     $permissions = $module->getProvidedPermissions();
     $state = $moduleData->enabled ? ($moduleData->loaded ? 'enabled' : 'failed') : 'disabled'
   ?>
-  <h1 tabindex="-1">
-    <?= $this->escape($module->getTitle()) ?>
-  </h1>
   <table class="avp">
     <tr>
       <th><?= $this->escape($this->translate('Name')) ?></th>
diff --git a/application/views/scripts/config/modules.phtml b/application/views/scripts/config/modules.phtml
index feb7facad..9121de405 100644
--- a/application/views/scripts/config/modules.phtml
+++ b/application/views/scripts/config/modules.phtml
@@ -4,7 +4,6 @@
 </div>
 
 <div class="content">
-  <h1 tabindex="-1"><?= $this->translate('Installed Modules') ?></h1>
   <table class="action" data-base-target="_next">
     <tbody>
     <?php foreach ($modules as $module): ?>
diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index a8275912b..d3d0e4d4f 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -2,20 +2,9 @@
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">
-  <h1 tabindex="-1" id="resource-index">
-    <?= t('Resource Configuration'); ?>
-  </h1>
-  <h2 tabindex="-1" id="resource-new-resource" class="sr-only">
-    <?= t('Create New Resource'); ?>
-  </h2>
-  <p>
-    <a href="<?= $this->href('/config/createresource'); ?>">
-      <?= $this->icon('plus'); ?> <?= $this->translate('Create A New Resource'); ?>
-    </a>
-  </p>
-  <h2 tabindex="-1" id="resource-edit-resource" class="sr-only">
-    <?= t('Edit Existing Resources'); ?>
-  </h2>
+  <a href="<?= $this->href('/config/createresource'); ?>">
+    <?= $this->icon('plus'); ?> <?= $this->translate('Create A New Resource'); ?>
+  </a>
   <table class="action" id="resource-edit-table">
     <thead>
       <th><?= $this->translate('Resource'); ?></th>
diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml
index 25d3d1cdd..17e947249 100644
--- a/application/views/scripts/roles/index.phtml
+++ b/application/views/scripts/roles/index.phtml
@@ -2,9 +2,6 @@
     <?= $tabs ?>
 </div>
 <div class="content">
-    <h1 tabindex="-1" id="roles-index">
-        <?= $this->translate('Roles') ?>
-    </h1>
     <div>
         <?php /** @var \Icinga\Application\Config $roles */ if ($roles->isEmpty()): ?>
             <?= $this->translate('No roles found.') ?>
@@ -70,9 +67,6 @@
                 </tbody>
             </table>
         <?php endif ?>
-        <h2 tabindex="-1" id="roles-index-new" class="sr-only">
-            <?= $this->translate('Create New Role'); ?>
-        </h2>
         <a data-base-target="_next" href="<?= $this->href('roles/new') ?>">
             <?= $this->translate('Create a New Role') ?>
         </a>
diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 8bcb9aa60..2575ce264 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -678,28 +678,20 @@ class FilterEditor extends AbstractWidget
     public function render()
     {
         if (! $this->preservedUrl()->getParam('modifyFilter')) {
-            $filterEditor = $this->renderSearch() . $this->shorten($this->filter, 50);
-        } else {
-            $filterEditor = $this->renderSearch()
-                . '<form action="'
-                . Url::fromRequest()
-                . '" class="filterEditor" method="POST">'
-                . '<ul class="tree widgetFilter"><li>'
-                . $this->renderFilter($this->filter)
-                . '</li></ul>'
-                . '<div style="float: right">'
-                . '<input type="submit" name="submit" value="Apply" />'
-                . '<input type="submit" name="cancel" value="Cancel" />'
-                . '</div>'
-                . '</form>';
+            return $this->renderSearch() . $this->shorten($this->filter, 50);
         }
-
-        return sprintf(
-            '<div class="filter-editor dontprint">'
-            . '<h2 tabindex="-1" class="sr-only">%s</h2>%s</div>',
-            t('Filters'),
-            $filterEditor
-        );
+        return  $this->renderSearch()
+              . '<form action="'
+              . Url::fromRequest()
+              . '" class="filterEditor" method="POST">'
+              . '<ul class="tree widgetFilter"><li>'
+              . $this->renderFilter($this->filter)
+              . '</li></ul>'
+              . '<div style="float: right">'
+              . '<input type="submit" name="submit" value="Apply" />'
+              . '<input type="submit" name="cancel" value="Cancel" />'
+              . '</div>'
+              . '</form>';
     }
 
     protected function shorten($string, $length)
diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index a1728db4f..18ed95b86 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -133,13 +133,6 @@ class SortBox extends AbstractWidget
         if ($this->request) {
             $form->populate($this->request->getParams());
         }
-
-        return sprintf(
-            '<div class="sort-box dontprint">'
-            . '<h2 tabindex="-1" class="sr-only">%s</h2>%s%s</div>',
-            t('Sort Criteria'),
-            t('Sort by'),
-            (string) $form
-        );
+        return $form;
     }
 }
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index 4952d29b1..70f0bd529 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -20,7 +20,6 @@ class Tabs extends AbstractWidget implements Countable
      * @var string
      */
     private $baseTpl = <<< 'EOT'
-{HEADER}
 <ul class="tabs">
   {TABS}
   {DROPDOWN}
@@ -29,13 +28,6 @@ class Tabs extends AbstractWidget implements Countable
 </ul>
 EOT;
 
-    /**
-     * Template used for the header
-     *
-     * @type string
-     */
-    private $headerTpl = '<h2 class="sr-only">{TITLE}</h2>';
-
     /**
      * Template used for the tabs dropdown
      *
@@ -109,13 +101,6 @@ EOT;
      */
     private $closeTab = true;
 
-    /**
-     * Title of the tab navigation
-     *
-     * @type string
-     */
-    private $title;
-
     /**
      * Set whether the current tab is closable
      */
@@ -381,15 +366,13 @@ EOT;
                 '{TABS}',
                 '{DROPDOWN}',
                 '{REFRESH}',
-                '{CLOSE}',
-                '{HEADER}'
+                '{CLOSE}'
             ),
             array(
                 $tabs,
                 $drop,
                 $close,
-                $refresh,
-                $this->renderHeader()
+                $refresh
             ),
             $this->baseTpl
         );
@@ -451,30 +434,4 @@ EOT;
         $tabextension->apply($this);
         return $this;
     }
-
-    /**
-     * Set the title of the tab navigation
-     *
-     * @param   string  $title
-     * @return  self
-     */
-    public function setTitle($title)
-    {
-        $this->title = $title;
-        return $this;
-    }
-
-    /**
-     * Render the title into the header template
-     *
-     * @return string
-     */
-    public function renderHeader()
-    {
-        if (! $this->title) {
-            return '';
-        }
-
-        return str_replace('{TITLE}', $this->title, $this->headerTpl);
-    }
 }
diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index cc1d75193..449967fcb 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -44,7 +44,7 @@ class Monitoring_AlertsummaryController extends Controller
                 'label' => $this->translate('Alert Summary'),
                 'url'   => Url::fromRequest()
             )
-        )->activate('alertsummary')->setTitle($this->translate('Alertsummary Navigation'));
+        )->activate('alertsummary');
         $this->view->title = $this->translate('Alert Summary');
 
         $this->view->intervalBox = $this->createIntervalBox();
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index b1b96b477..5d9abcfd9 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -727,7 +727,6 @@ class Monitoring_ListController extends Controller
     private function createTabs()
     {
         $tabs = $this->getTabs();
-        $tabs->setTitle($this->translate('Monitoring Navigation'));
         if (in_array($this->_request->getActionName(), array(
             'hosts',
             'services',
diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php
index efca3d520..b20bd7576 100644
--- a/modules/monitoring/application/controllers/ProcessController.php
+++ b/modules/monitoring/application/controllers/ProcessController.php
@@ -29,7 +29,7 @@ class Monitoring_ProcessController extends Controller
                     'label' => $this->translate('Monitoring Health'),
                     'url'   =>'monitoring/process/info'
                 )
-            )->setTitle($this->translate('Process Information'));
+            );
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/alertsummary/index.phtml b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
index 3281f3ec8..dbfff6433 100644
--- a/modules/monitoring/application/views/scripts/alertsummary/index.phtml
+++ b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
@@ -1,9 +1,6 @@
 <div class="controls">
     <?= $this->tabs ?>
     <div style="margin: 1em;" class="dontprint">
-        <h2 tabindex="-1" class="sr-only">
-            <?= $this->translate('Filters'); ?>
-        </h2>
         <?= $intervalBox; ?>
     </div>
     <?= $this->widget('limiter') ?>
@@ -11,33 +8,25 @@
 </div>
 
 <div class="content alertsummary">
-    <h1 tabindex="-1">
-        <?= $this->translate('Alert summary'); ?>
-    </h1>
+    <!-- <h1><?= $this->translate('Alert summary'); ?></h1> -->
 
     <div class="hbox">
         <div class="hbox-item">
-            <h2 tabindex="-1" id="alertsummary-notifications">
-                <?= $this->translate('Notifications and Problems'); ?>
-            </h2>
+            <h2><?= $this->translate('Notifications and Problems'); ?></h2>
             <div style="width: 400px; height: 400px;">
                 <?= $defectChart->render(); ?>
             </div>
         </div>
 
         <div class="hbox-item">
-            <h2 tabindex="-1" id="alertsummary-reaction-time">
-                <?= $this->translate('Time to Reaction (Ack, Recover)'); ?>
-            </h2>
+            <h2><?= $this->translate('Time to Reaction (Ack, Recover)'); ?></h2>
             <div style="width: 400px; height: 400px;">
                 <?= $healingChart->render(); ?>
             </div>
         </div>
     </div>
 
-    <h2 tabindex="-1" id="alertsummary-trend">
-        <?= $this->translate('Trend'); ?>
-    </h2>
+    <h2><?= $this->translate('Trend'); ?></h2>
 
     <div class="alertsummary-flex-container">
         <div class="alertsummary-flex">
@@ -64,9 +53,7 @@
     </div>
 
     <?php if ($this->recentAlerts): ?>
-        <h2 tabindex="-1" id="alertsummary-top5">
-            <?= $this->translate('Top 5 Recent Alerts'); ?>
-        </h2>
+        <h1><?= $this->translate('Top 5 Recent Alerts'); ?></h1>
 
         <div class="alertsummary-flex-container">
             <div class="alertsummary-flex">
@@ -79,9 +66,7 @@
         </div>
     <?php endif; ?>
 
-    <h2 tabindex="-1" id="alertsummary-history">
-        <?= $this->translate('History'); ?>
-    </h2>
+    <h1><?= $this->translate('History'); ?></h1>
     <div class="alertsummary-flex-container">
         <div class="alertsummary-flex">
             <?= $this->partial('list/notifications.phtml', array(
diff --git a/modules/monitoring/application/views/scripts/host/show.phtml b/modules/monitoring/application/views/scripts/host/show.phtml
index f490c25f9..867692301 100644
--- a/modules/monitoring/application/views/scripts/host/show.phtml
+++ b/modules/monitoring/application/views/scripts/host/show.phtml
@@ -3,7 +3,6 @@
     <?= $this->render('partials/host/servicesummary.phtml') ?>
 </div>
 <div class="content" data-base-target="_next">
-    <h1 tabindex="-1"><?= $this->translate('Host Detail Information') ?></h1>
     <?= $this->render('show/components/output.phtml') ?>
     <?= $this->render('show/components/grapher.phtml') ?>
 
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index d41399984..6f49bf4a8 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -1,14 +1,15 @@
 <?php if (false === $this->compact): ?>
-    <div class="controls">
-        <?= $this->tabs ?>
-        <?= $this->sortControl ?>
-        <?= $this->widget('limiter', array('url' => $this->url, 'max' => $comments->count())); ?>
-        <?= $this->paginationControl($comments, null, null, array('preserve' => $this->preserve)); ?>
-    </div>
+<div class="controls">
+  <?= $this->tabs->render($this); ?>
+  <div style="margin: 1em" class="dontprint">
+    <?= $this->translate('Sort by'); ?> <?= $this->sortControl->render($this); ?>
+  </div>
+  <?= $this->widget('limiter', array('url' => $this->url, 'max' => $comments->count())); ?>
+  <?= $this->paginationControl($comments, null, null, array('preserve' => $this->preserve)); ?>
+</div>
 <?php endif ?>
 
 <div class="content">
-<h1 tabindex="-1"><?= $this->translate('Comments') ?></h1>
 <?php if (count($comments) === 0): ?>
   <?= $this->translate('No comments matching the filter'); ?>
 </div>
diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index b00e78031..a44b388b7 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -4,9 +4,6 @@
 </div>
 <?php endif ?>
 <div class="content">
-    <h1 tabindex="-1">
-        <?= $this->translate('Contact Groups'); ?>
-    </h1>
     <div class="boxview" data-base-target="_next">
 
 <?php
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 878b394c7..8fba674c0 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -1,14 +1,12 @@
-<?php if (false === $this->compact): ?>
-    <div class="controls">
-        <?= $this->tabs ?>
-        <?= $this->sortControl ?>
-        <?= $this->widget('limiter', array('url' => $this->url, 'max' => $contacts->count())); ?>
-        <?= $this->paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?>
+<div class="controls">
+    <?= $this->tabs ?>
+    <div style="margin: 1em">
+        <?= $this->sortControl->render($this); ?>
     </div>
-<?php endif ?>
+    <?= $this->paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?>
+</div>
 
 <div data-base-target="_next" class="content contacts">
-    <h1 tabindex="-1"><?= $this->translate('Contacts') ?></h1>
     <?php
     if (count($contacts) === 0) {
         echo $this->translate('No contacts matching the filter');
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 5ad554f99..1fbaa713f 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -4,17 +4,23 @@ use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
 ?>
+
 <?php if (false === $this->compact): ?>
-    <div class="controls">
-        <?= $this->tabs ?>
-        <?= $this->sortControl ?>
-        <?= $this->widget('limiter', array('url' => $this->url, 'max' => $downtimes->count())); ?>
-        <?= $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
-    </div>
+<div class="controls">
+  <?= $this->tabs->render($this); ?>
+  <div style="margin: 1em" class="dontprint">
+    <?= $this->translate('Sort by'); ?> <?= $this->sortControl->render($this); ?>
+    <?php if (! $this->filterEditor): ?>
+        <?= $this->filterPreview ?>
+    <?php endif; ?>
+  </div>
+  <?= $this->widget('limiter', array('url' => $this->url, 'max' => $downtimes->count())); ?>
+  <?= $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
+</div>
 <?php endif ?>
+
 <div class="content">
 <?= $this->filterEditor ?>
-<h1 tabindex="-1"><?= $this->translate('Downtimes'); ?></h1>
 <?php if (count($downtimes) === 0): ?>
   <?= $this->translate('No active downtimes'); ?>
 </div>
diff --git a/modules/monitoring/application/views/scripts/list/eventgrid.phtml b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
index 6bf0b800b..1af75caf9 100644
--- a/modules/monitoring/application/views/scripts/list/eventgrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
@@ -2,21 +2,18 @@
 use Icinga\Data\Filter\Filter;
 use Icinga\Web\Widget\Chart\HistoryColorGrid;
 ?>
-<?php if (! $compact): ?>
+
+
+<? if (! $compact): ?>
     <div class="controls">
         <?= $this->tabs->render($this); ?>
         <div class="fake-controls">
-            <h2 tabindex="-1" class="sr-only">
-                <?= $this->translate('Filters'); ?>
-            </h2>
             <?= $form ?>
         </div>
     </div>
-    <div class="content" data-base-target="_next">
-        <h1 tabindex="-1"><?= $this->translate('Event Grid'); ?></h1>
-<?php else: ?>
-    <div class="content" data-base-target="_next">
-<?php endif; ?>
+<? endif; ?>
+
+<div class="content" data-base-target="_next">
 <?php
 
 $settings = array(
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 035be6c9a..0b6b9bcec 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -4,21 +4,24 @@ use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
 ?>
+
 <?php if (false === $this->compact): ?>
 <div class="controls">
   <?= $this->tabs ?>
-  <?= $this->sortControl ?>
+  <div style="margin: 1em" class="dontprint">
+    <div style="float: right">
+      <?= $this->translate('Sort by') ?> <?= $this->sortControl ?>
+    </div>
+  </div>
+
   <?= $this->widget('limiter', array('url' => $this->url, 'max' => $this->history->count())); ?>
   <?= $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
+
 </div>
+<?php endif ?>
+
 <div class="content">
-    <?= $this->filterEditor ?>
-    <h1 tabindex="-1"><?= $this->translate('Event History') ?></h1>
-<?php else: ?>
-    <div class="content">
-<?php endif; ?>
-
-
+<?= $this->filterEditor ?>
 <?php if (empty($history)): ?>
   <?= $this->translate('No history events matching the filter') ?>
 </div>
diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index c8f5b2de2..c702197b2 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -3,13 +3,14 @@
 <?php else: ?>
 <div class="controls">
   <?= $this->tabs ?>
-  <?= $this->sortControl->render($this); ?>
+  <div style="margin: 1em;" class="dontprint">
+    <?= $this->translate('Sort by'); ?> <?= $this->sortControl->render($this); ?>
+  </div>
   <?= $this->widget('limiter')->setMaxLimit(count($hostgroups)); ?>
   <?= $this->paginationControl($hostgroups, null, null, array('preserve' => $this->preserve)); ?>
 </div>
 <div class="content">
   <?= $this->filterEditor; ?>
-  <h1 tabindex="-1"><?= $this->translate('Host Groups') ?></h1>
 <?php endif ?>
   <?php
     if (count($hostgroups) === 0) {
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index dac8d7dde..f5689c927 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -9,8 +9,9 @@ if ($this->compact): ?>
   <div style="margin: 1em;" class="dontprint">
     <?= $this->render('list/components/selectioninfo.phtml') ?>
     <?= $this->render('list/components/hostssummary.phtml') ?>
+    <?= $this->translate('Sort by') ?> <?= $this->sortControl->render($this) ?>
   </div>
-<?= $this->sortControl->render($this) ?>
+
 <?= $this->widget('limiter')->setMaxLimit($this->hosts->count()) ?>
 <?= $this->paginationControl($hosts, null, null, array('preserve' => $this->preserve)) ?>
 <?= $this->selectionToolbar('multi', $this->href('monitoring/hosts/show?' . $this->filter->toQueryString())) ?>
@@ -18,7 +19,6 @@ if ($this->compact): ?>
 
 <div class="content">
 <?= $this->filterEditor ?>
-<h1 tabindex="-1"><?= $this->translate('Hosts') ?></h1>
 <?php
 
 endif;
@@ -31,6 +31,7 @@ if ($hosts->count() === 0) {
     return;
 }
 ?>
+
 <table
     data-base-target="_next"
     class="action multiselect"
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index b8dc479c6..9cc5f724b 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -4,18 +4,19 @@ use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
 ?>
+
 <?php if (! $this->compact): ?>
 <div class="controls">
     <?= $this->tabs ?>
-    <?= $this->sortControl->render($this) ?>
+    <div class="dontprint" style="margin: 1em;">
+        <?= $this->translate('Sort by') ?> <?= $this->sortControl->render($this) ?>
+    </div>
     <?= $this->widget('limiter') ?>
     <?= $this->paginationControl($notifications, null, null, array('preserve' => $this->preserve)) ?>
 </div>
-<div class="content">
-    <h1 tabindex="-1"><?= $this->translate('Notifications'); ?></h1>
-<?php else: ?>
-    <div class="content">
 <?php endif ?>
+
+<div class="content">
     <?php if (count($notifications) === 0): ?>
     <?= $this->translate('No notifications matching the filter') ?>
     <?php return; endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
index d4b5a4074..a102c36eb 100644
--- a/modules/monitoring/application/views/scripts/list/servicegrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
@@ -6,11 +6,12 @@ use Icinga\Module\Monitoring\Object\Service;
 <?php if (!$this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
-  <?= $this->sortControl; ?>
+  <div style="margin: 1em;" class="dontprint">
+    <?= $this->translate('Sort by'); ?> <?= $this->sortControl; ?>
+  </div>
 </div>
 <?php endif ?>
 <div class="content" data-base-target="_next">
-  <h1 tabindex="-1"><?= $this->translate('Service Grid') ?></h1>
   <table class="pivot servicestates">
 <?php
 $hasHeader = false;
diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index e511f4fee..0e958a3f7 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -3,13 +3,14 @@
 <?php else: ?>
 <div class="controls">
   <?= $this->tabs ?>
-  <?= $this->sortControl->render($this); ?>
+  <div style="margin: 1em;" class="dontprint">
+    <?= $this->translate('Sort by'); ?> <?= $this->sortControl->render($this); ?>
+  </div>
   <?= $this->widget('limiter')->setMaxLimit(count($servicegroups)); ?>
   <?= $this->paginationControl($servicegroups, null, null, array('preserve' => $this->preserve)); ?>
 </div>
 <div class="content">
   <?= $this->filterEditor; ?>
-  <h1 tabindex="-1"><?= $this->translate('Service Groups') ?></h1>
 <?php endif ?>
   <?php
     if (count($servicegroups) === 0) {
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 636303b6e..3b17e1b63 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -10,8 +10,10 @@ if (!$this->compact): ?>
 <div style="margin: 1em;" class="dontprint">
 <?= $this->render('list/components/selectioninfo.phtml') ?>
 <?= $this->render('list/components/servicesummary.phtml') ?>
+<div style="float: right">
+<?= $this->translate('Sort by') ?> <?= $this->sortControl ?>
+</div>
 </div>
-<?= $this->sortControl ?>
 <?php if ($this->limit === 0): ?>
 <?= $this->widget('limiter') ?>
 <?php else: ?>
@@ -22,7 +24,6 @@ if (!$this->compact): ?>
 
 <div class="content">
 <?= $this->filterEditor ?>
-<h1 tabindex="-1"><?= $this->translate('Services') ?></h1>
 <?php else: ?>
 
 <div class="content">
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index f892df6f4..f5edd0213 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -3,9 +3,7 @@
 <?php endif ?>
 <?php if (($hostCount = count($objects)) > 0): ?>
 <div class="hbox-item">
-    <h1 tabindex="-1">
-        <?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', $hostCount), $hostCount); ?>
-    </h1>
+    <strong><?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', $hostCount), $hostCount); ?></strong>
 </div>
 <div class="hbox-item">
     &nbsp;<?= $hostStatesPieChart; ?>
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index 6389d992f..1ac27b934 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -4,9 +4,7 @@
 <?php if (($serviceCount = count($objects)) > 0): ?>
 <div class="hbox">
     <div class="hbox-item" style="width: 6em;">
-        <h1 tabindex="-1">
-            <?= sprintf($this->translatePlural('Service (%u)', 'Services (%u)', $serviceCount), $serviceCount); ?>
-        </h1>
+        <strong><?= sprintf($this->translatePlural('Service (%u)', 'Services (%u)', $serviceCount), $serviceCount); ?></strong>
     </div>
     <div class="hbox-item">
         &nbsp;<?= $serviceStatesPieChart; ?>
diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml
index b881641e6..835228814 100644
--- a/modules/monitoring/application/views/scripts/process/info.phtml
+++ b/modules/monitoring/application/views/scripts/process/info.phtml
@@ -9,10 +9,6 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
 </div>
 
 <div class="content processinfo">
-    <h1 tabindex="-1">
-        <?= $this->translate('Monitoring Health'); ?>
-    </h1>
-
     <div class="boxview">
 
         <div class="box left">
@@ -20,9 +16,7 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
         </div>
 
         <div class="box left">
-            <h2 tabindex="-1" id="process-process-info">
-                <?= $this->translate('Process Info') ?>
-            </h2>
+            <h2><?= $this->translate('Process Info') ?></h2>
             <table class="avp">
                 <tbody>
                 <tr>
@@ -73,13 +67,9 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
         </div>
 
         <div class="box left">
-            <h2 tabindex="-1" id="process-performance-info">
-                <?= $this->translate('Performance Info') ?>
-            </h2>
+            <h2><?= $this->translate('Performance Info') ?></h2>
 
-            <h3 tabindex="-1" id="process-object-summaries">
-                <?= $this->translate('Object summaries') ?>
-            </h3>
+            <h3><?= $this->translate('Object summaries') ?></h3>
             <table class="avp">
                 <thead>
                 <tr>
@@ -127,9 +117,7 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
                 </tbody>
             </table>
 
-            <h3 tabindex="-1" id="process-active-checks">
-                <?= $this->translate('Active checks') ?>
-            </h3>
+            <h3><?= $this->translate('Active checks') ?></h3>
             <table class="avp">
                 <thead>
                 <tr>
@@ -159,9 +147,7 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
                 </tbody>
             </table>
 
-            <h3 tabindex="-1" id="process-passive-checks">
-                <?= $this->translate('Passive checks') ?>
-            </h3>
+            <h3><?= $this->translate('Passive checks') ?></h3>
             <table class="avp">
                 <tbody>
                 <tr>
diff --git a/modules/monitoring/application/views/scripts/tactical/index.phtml b/modules/monitoring/application/views/scripts/tactical/index.phtml
index 897ef9776..3882b27b3 100644
--- a/modules/monitoring/application/views/scripts/tactical/index.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/index.phtml
@@ -4,7 +4,6 @@
 </div>
 <?php endif ?>
 <div class="content tactical">
-    <h1 tabindex="-1"><?= $this->translate('Tactical Overview') ?></h1>
     <div class="boxview" data-base-target="_next">
 <?php if ($this->statusSummary->hosts_down || $this->statusSummary->hosts_unreachable): ?>
         <?= $this->render('tactical/components/problem_hosts.phtml'); ?>
diff --git a/modules/monitoring/application/views/scripts/timeline/index.phtml b/modules/monitoring/application/views/scripts/timeline/index.phtml
index a9b5666f6..6557b4a28 100644
--- a/modules/monitoring/application/views/scripts/timeline/index.phtml
+++ b/modules/monitoring/application/views/scripts/timeline/index.phtml
@@ -10,9 +10,6 @@ $firstRow = !$beingExtended;
 <div class="controls">
     <?= $this->tabs ?>
     <div style="margin: 1em;" class="dontprint">
-        <h2 tabindex="-1" class="sr-only">
-            <?= $this->translate('Filters') ?>
-        </h2>
         <?= $intervalBox; ?>
     </div>
     <div style="margin: 1em;" class="timeline-legend">
@@ -25,7 +22,6 @@ $firstRow = !$beingExtended;
     </div>
 </div>
 <div class="content" data-base-target="_next">
-    <h1 tabindex="-1"><?= $this->translate('Timeline'); ?></h1>
     <div class="timeline">
 <?php endif ?>
 <?php if ($switchedContext): ?>
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 3c733db6e..c33c6670c 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -270,7 +270,7 @@ a:focus {
 
 /* Accessibility Skip Links */
 .skip-links {
-  position: relative;
+  position: absolute;
   opacity: 1;
   ul {
     list-style-type: none;
@@ -286,6 +286,7 @@ a:focus {
         left: -999em;
         box-sizing: content-box;
         width: 10.4em !important;
+        top: 0em;
         text-align: left !important;
         padding: 0.8em;
         background-color: white;
@@ -300,8 +301,5 @@ a:focus {
   }
 }
 .skip-links-inline {
-  ul > li > a {
-    width: 14em !important;
-    top: -3em;
-  }
+  margin-top: -3.5em;
 }
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index d29f39aa2..3edd306b9 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -359,29 +359,21 @@
         handleAnchor: function(query) {
             var $element = $(query);
             if ($element.length > 0) {
-                // TODO(mh): Some elements are missing to place the right focus
-                // This is a fixed workarround until all header took place
-
-                var $item = $element.find(':header:first').nextUntil(':header:first').next();
-                if ($item.length > 0) {
-                    $element = $item;
-                }
-
-                /*
-                var focusQueries = ['h1:first', ':header:first', ':input:first'];
-                $.each(focusQueries, function(index,q) {
-                    var $item = $element.find(q);
-                    if ($item.length > 0) {
-                        $element = $item;
-                        return false;
+                // Try to find the first header. It is more pleasant to users
+                // to select the header instead a container
+                var $header = $element.find(':header:first');
+                if ($header.length > 0) {
+                    $element = $header;
+                } else {
+                    var $input = $element.find(':header:first');
+                    if ($input.length > 0) {
+                        $element = $input
                     }
-                });
-                */
-
+                }
                 // If we want to focus an element which has no tabindex
                 // add one that we can focus is
                 if ($element.prop('tabindex') < 0) {
-                    $element.prop('tabindex', '-1');
+                    $element.prop('tabindex', 0);
                 }
                 $element.focus();
             }

From 6dc48fe9d31eecf14f49a0df5aabb885f3c147f1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 12:13:37 +0100
Subject: [PATCH 1013/2920] CSS: Remove .skip-links-inline ...

... because we don't use it.
---
 public/css/icinga/menu.less | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index c33c6670c..c486251b0 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -300,6 +300,3 @@ a:focus {
     }
   }
 }
-.skip-links-inline {
-  margin-top: -3.5em;
-}

From 8563d5ed3fe6ada562d246c1e0717a4ba18f5906 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 13:39:17 +0100
Subject: [PATCH 1014/2920] PHPDoc: Use @var instead of @type

Becasue of too many kittens PSR-5 backed off of deprecating @var.
So that's the way we go too.
---
 application/controllers/ConfigController.php     |  2 +-
 application/forms/Security/RoleForm.php          |  8 ++++----
 .../Icinga/Application/ApplicationBootstrap.php  |  2 +-
 library/Icinga/Cli/Command.php                   |  2 +-
 library/Icinga/Data/Tree/SimpleTree.php          |  4 ++--
 library/Icinga/Data/Tree/TreeNode.php            |  4 ++--
 library/Icinga/Data/Tree/TreeNodeIterator.php    |  2 +-
 .../Icinga/File/FileExtensionFilterIterator.php  |  4 ++--
 library/Icinga/File/NonEmptyFileIterator.php     |  2 +-
 .../Icinga/Web/Controller/ActionController.php   |  2 +-
 library/Icinga/Web/Dom/DomNodeIterator.php       |  2 +-
 library/Icinga/Web/Form.php                      |  2 +-
 library/Icinga/Web/Menu.php                      | 16 ++++++++--------
 library/Icinga/Web/View.php                      |  2 +-
 .../doc/application/views/scripts/chapter.phtml  |  4 ++--
 .../application/views/scripts/index/index.phtml  |  4 ++--
 .../application/views/scripts/module/index.phtml |  4 ++--
 modules/doc/application/views/scripts/pdf.phtml  |  6 +++---
 .../application/views/scripts/search/index.phtml |  2 +-
 modules/doc/application/views/scripts/toc.phtml  |  6 +++---
 modules/doc/configuration.php                    |  2 +-
 modules/doc/library/Doc/DocIterator.php          |  2 +-
 modules/doc/library/Doc/DocParser.php            |  8 ++++----
 modules/doc/library/Doc/DocSection.php           | 10 +++++-----
 .../doc/library/Doc/DocSectionFilterIterator.php |  4 ++--
 modules/doc/library/Doc/Renderer/DocRenderer.php |  6 +++---
 .../library/Doc/Renderer/DocSearchRenderer.php   |  4 ++--
 .../library/Doc/Renderer/DocSectionRenderer.php  | 16 ++++++++--------
 .../doc/library/Doc/Renderer/DocTocRenderer.php  |  4 ++--
 modules/doc/library/Doc/Search/DocSearch.php     |  4 ++--
 .../doc/library/Doc/Search/DocSearchIterator.php |  6 +++---
 .../doc/library/Doc/Search/DocSearchMatch.php    | 16 ++++++++--------
 .../forms/Config/BackendConfigForm.php           |  2 +-
 .../show/components/checkstatistics.phtml        |  2 +-
 .../views/scripts/show/components/comments.phtml |  2 +-
 .../views/scripts/show/components/downtime.phtml |  2 +-
 modules/monitoring/configuration.php             |  2 +-
 .../Monitoring/Object/MonitoredObject.php        |  2 +-
 38 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index cdf41c8f7..148cbaa05 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -23,7 +23,7 @@ class ConfigController extends ActionController
     /**
      * The first allowed config action according to the user's permissions
      *
-     * @type string
+     * @var string
      */
     protected $firstAllowedAction;
 
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 85691de24..4b42cd88c 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -18,7 +18,7 @@ class RoleForm extends ConfigForm
     /**
      * Provided permissions by currently loaded modules
      *
-     * @type array
+     * @var array
      */
     protected $providedPermissions = array(
         '*'                             => '*',
@@ -33,7 +33,7 @@ class RoleForm extends ConfigForm
     /**
      * Provided restrictions by currently loaded modules
      *
-     * @type array
+     * @var array
      */
     protected $providedRestrictions = array();
 
@@ -46,11 +46,11 @@ class RoleForm extends ConfigForm
         $helper = new Zend_Form_Element('bogus');
         foreach (Icinga::app()->getModuleManager()->getLoadedModules() as $module) {
             foreach ($module->getProvidedPermissions() as $permission) {
-                /** @type object $permission */
+                /** @var object $permission */
                 $this->providedPermissions[$permission->name] = $permission->name . ': ' . $permission->description;
             }
             foreach ($module->getProvidedRestrictions() as $restriction) {
-                /** @type object $restriction */
+                /** @var object $restriction */
                 $name = $helper->filterName($restriction->name); // Zend only permits alphanumerics, the underscore,
                                                                  // the circumflex and any ASCII character in range
                                                                  // \x7f to \xff (127 to 255)
diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 41df56d85..76efd4386 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -115,7 +115,7 @@ abstract class ApplicationBootstrap
     /**
      * Whether Icinga Web 2 requires setup
      *
-     * @type bool
+     * @var bool
      */
     protected $requiresSetup = false;
 
diff --git a/library/Icinga/Cli/Command.php b/library/Icinga/Cli/Command.php
index 73f0f8752..340c28945 100644
--- a/library/Icinga/Cli/Command.php
+++ b/library/Icinga/Cli/Command.php
@@ -17,7 +17,7 @@ abstract class Command
     protected $docs;
 
     /**
-     * @type Params
+     * @var Params
      */
     protected $params;
     protected $screen;
diff --git a/library/Icinga/Data/Tree/SimpleTree.php b/library/Icinga/Data/Tree/SimpleTree.php
index 46a91135d..5b11e5200 100644
--- a/library/Icinga/Data/Tree/SimpleTree.php
+++ b/library/Icinga/Data/Tree/SimpleTree.php
@@ -14,14 +14,14 @@ class SimpleTree implements IteratorAggregate
     /**
      * Root node
      *
-     * @type TreeNode
+     * @var TreeNode
      */
     protected $sentinel;
 
     /**
      * Nodes
      *
-     * @type array
+     * @var array
      */
     protected $nodes = array();
 
diff --git a/library/Icinga/Data/Tree/TreeNode.php b/library/Icinga/Data/Tree/TreeNode.php
index 200b3b9a6..975a33e76 100644
--- a/library/Icinga/Data/Tree/TreeNode.php
+++ b/library/Icinga/Data/Tree/TreeNode.php
@@ -10,7 +10,7 @@ class TreeNode implements Identifiable
     /**
      * The node's ID
      *
-     * @type mixed
+     * @var mixed
      */
     protected $id;
 
@@ -24,7 +24,7 @@ class TreeNode implements Identifiable
     /**
      * The node's children
      *
-     * @type array
+     * @var array
      */
     protected $children = array();
 
diff --git a/library/Icinga/Data/Tree/TreeNodeIterator.php b/library/Icinga/Data/Tree/TreeNodeIterator.php
index 753b338f6..76590398b 100644
--- a/library/Icinga/Data/Tree/TreeNodeIterator.php
+++ b/library/Icinga/Data/Tree/TreeNodeIterator.php
@@ -14,7 +14,7 @@ class TreeNodeIterator implements RecursiveIterator
     /**
      * The node's children
      *
-     * @type array
+     * @var array
      */
     protected $children;
 
diff --git a/library/Icinga/File/FileExtensionFilterIterator.php b/library/Icinga/File/FileExtensionFilterIterator.php
index fd1d657b4..41efce0ad 100644
--- a/library/Icinga/File/FileExtensionFilterIterator.php
+++ b/library/Icinga/File/FileExtensionFilterIterator.php
@@ -33,7 +33,7 @@ class FileExtensionFilterIterator extends FilterIterator
     /**
      * The extension to filter for
      *
-     * @type string
+     * @var string
      */
     protected $extension;
 
@@ -58,7 +58,7 @@ class FileExtensionFilterIterator extends FilterIterator
     public function accept()
     {
         $current = $this->current();
-        /** @type $current \SplFileInfo */
+        /** @var $current \SplFileInfo */
         if (! $current->isFile()) {
             return false;
         }
diff --git a/library/Icinga/File/NonEmptyFileIterator.php b/library/Icinga/File/NonEmptyFileIterator.php
index a57de3e23..03756ccd2 100644
--- a/library/Icinga/File/NonEmptyFileIterator.php
+++ b/library/Icinga/File/NonEmptyFileIterator.php
@@ -37,7 +37,7 @@ class NonEmptyFileIterator extends FilterIterator
     public function accept()
     {
         $current = $this->current();
-        /** @type $current \SplFileInfo */
+        /** @var $current \SplFileInfo */
         if (! $current->isFile()
             || $current->getSize() === 0
         ) {
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 0a1fe8ae4..03c5ba1b8 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -51,7 +51,7 @@ class ActionController extends Zend_Controller_Action
     /**
      * Authentication manager
      *
-     * @type Manager|null
+     * @var Manager|null
      */
     private $auth;
 
diff --git a/library/Icinga/Web/Dom/DomNodeIterator.php b/library/Icinga/Web/Dom/DomNodeIterator.php
index 143c9c506..5c1542d5e 100644
--- a/library/Icinga/Web/Dom/DomNodeIterator.php
+++ b/library/Icinga/Web/Dom/DomNodeIterator.php
@@ -33,7 +33,7 @@ class DomNodeIterator implements RecursiveIterator
     /**
      * The node's children
      *
-     * @type IteratorIterator
+     * @var IteratorIterator
      */
     protected $children;
 
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 265da8420..3ff995028 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -145,7 +145,7 @@ class Form extends Zend_Form
     /**
      * Authentication manager
      *
-     * @type Manager|null
+     * @var Manager|null
      */
     private $auth;
 
diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 8d62563be..92ec20607 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -18,7 +18,7 @@ class Menu implements RecursiveIterator
     /**
      * The id of this menu
      *
-     * @type string
+     * @var string
      */
     protected $id;
 
@@ -27,7 +27,7 @@ class Menu implements RecursiveIterator
      *
      * Used for sorting when priority is unset or equal to other items
      *
-     * @type string
+     * @var string
      */
     protected $title;
 
@@ -36,42 +36,42 @@ class Menu implements RecursiveIterator
      *
      * Used for sorting
      *
-     * @type int
+     * @var int
      */
     protected $priority = 100;
 
     /**
      * The url of this menu
      *
-     * @type string
+     * @var string
      */
     protected $url;
 
     /**
      * The path to the icon of this menu
      *
-     * @type string
+     * @var string
      */
     protected $icon;
 
     /**
      * The sub menus of this menu
      *
-     * @type array
+     * @var array
      */
     protected $subMenus = array();
 
     /**
      * A custom item renderer used instead of the default rendering logic
      *
-     * @type MenuItemRenderer
+     * @var MenuItemRenderer
      */
     protected $itemRenderer = null;
 
     /*
      * Parent menu
      *
-     * @type Menu
+     * @var Menu
      */
     protected $parent;
 
diff --git a/library/Icinga/Web/View.php b/library/Icinga/Web/View.php
index 5201e9550..1265c7d21 100644
--- a/library/Icinga/Web/View.php
+++ b/library/Icinga/Web/View.php
@@ -39,7 +39,7 @@ class View extends Zend_View_Abstract
     /**
      * Authentication manager
      *
-     * @type \Icinga\Authentication\Manager|null
+     * @var \Icinga\Authentication\Manager|null
      */
     private $auth;
 
diff --git a/modules/doc/application/views/scripts/chapter.phtml b/modules/doc/application/views/scripts/chapter.phtml
index eefe6f65f..fc5b3073b 100644
--- a/modules/doc/application/views/scripts/chapter.phtml
+++ b/modules/doc/application/views/scripts/chapter.phtml
@@ -1,6 +1,6 @@
 <div class="controls">
-    <?= /** @type \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton() ?>
+    <?= /** @var \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <?= /** @type \Icinga\Module\Doc\Renderer\DocSectionRenderer $section */ $section ?>
+    <?= /** @var \Icinga\Module\Doc\Renderer\DocSectionRenderer $section */ $section ?>
 </div>
diff --git a/modules/doc/application/views/scripts/index/index.phtml b/modules/doc/application/views/scripts/index/index.phtml
index 65fa0b9d2..0b98623ac 100644
--- a/modules/doc/application/views/scripts/index/index.phtml
+++ b/modules/doc/application/views/scripts/index/index.phtml
@@ -1,5 +1,5 @@
 <div class="controls"></div>
-    <?= /** @type \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton(); ?>
+    <?= /** @var \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton(); ?>
     <h1><?= $this->translate('Available documentations'); ?></h1>
 <div class="content">
     <ul>
@@ -16,4 +16,4 @@
             array('title' => $this->translate('List all modifications for which documentation is available'))
         ); ?></li>
     </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/modules/doc/application/views/scripts/module/index.phtml b/modules/doc/application/views/scripts/module/index.phtml
index e0c57ae79..a4d9276cc 100644
--- a/modules/doc/application/views/scripts/module/index.phtml
+++ b/modules/doc/application/views/scripts/module/index.phtml
@@ -1,5 +1,5 @@
 <div class="controls">
-    <?= /** @type \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton(); ?>
+    <?= /** @var \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton(); ?>
     <h1><?= $this->translate('Module documentations'); ?></h1>
 </div>
 <div class="content">
@@ -16,4 +16,4 @@
         ); ?></li>
     <?php endforeach ?>
     </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/modules/doc/application/views/scripts/pdf.phtml b/modules/doc/application/views/scripts/pdf.phtml
index e76ded957..2666efb1c 100644
--- a/modules/doc/application/views/scripts/pdf.phtml
+++ b/modules/doc/application/views/scripts/pdf.phtml
@@ -1,5 +1,5 @@
 <div class="content">
-    <h1><?= /** @type string $title */ $title ?></h1>
-    <?= /** @type \Icinga\Module\Doc\Renderer\DocTocRenderer $toc */ $toc ?>
-    <?= /** @type \Icinga\Module\Doc\Renderer\DocSectionRenderer $section */ $section ?>
+    <h1><?= /** @var string $title */ $title ?></h1>
+    <?= /** @var \Icinga\Module\Doc\Renderer\DocTocRenderer $toc */ $toc ?>
+    <?= /** @var \Icinga\Module\Doc\Renderer\DocSectionRenderer $section */ $section ?>
 </div>
diff --git a/modules/doc/application/views/scripts/search/index.phtml b/modules/doc/application/views/scripts/search/index.phtml
index 272ab3a79..3311c47a1 100644
--- a/modules/doc/application/views/scripts/search/index.phtml
+++ b/modules/doc/application/views/scripts/search/index.phtml
@@ -1,5 +1,5 @@
 <div class="content">
-    <?php foreach (/** @type \Icinga\Module\Doc\Renderer\DocSearchRenderer[] $searches */ $searches as $title => $search): ?>
+    <?php foreach (/** @var \Icinga\Module\Doc\Renderer\DocSearchRenderer[] $searches */ $searches as $title => $search): ?>
         <?php if (! $search->isEmpty()): ?>
             <h1><?= $this->escape($title) ?></h1>
             <?= $search ?>
diff --git a/modules/doc/application/views/scripts/toc.phtml b/modules/doc/application/views/scripts/toc.phtml
index daec9b177..5a57e5bda 100644
--- a/modules/doc/application/views/scripts/toc.phtml
+++ b/modules/doc/application/views/scripts/toc.phtml
@@ -1,7 +1,7 @@
 <div class="controls">
-    <?= /** @type \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton() ?>
-    <h1><?= /** @type string $title */ $title ?></h1>
+    <?= /** @var \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton() ?>
+    <h1><?= /** @var string $title */ $title ?></h1>
 </div>
 <div class="content">
-    <?= /** @type \Icinga\Module\Doc\Renderer\DocTocRenderer $toc */ $toc ?>
+    <?= /** @var \Icinga\Module\Doc\Renderer\DocTocRenderer $toc */ $toc ?>
 </div>
diff --git a/modules/doc/configuration.php b/modules/doc/configuration.php
index fdbada7af..8ae28763f 100644
--- a/modules/doc/configuration.php
+++ b/modules/doc/configuration.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-/** @type $this \Icinga\Application\Modules\Module */
+/** @var $this \Icinga\Application\Modules\Module */
 
 $section = $this->menuSection($this->translate('Documentation'), array(
     'title'    => 'Documentation',
diff --git a/modules/doc/library/Doc/DocIterator.php b/modules/doc/library/Doc/DocIterator.php
index cbea037d6..430d25445 100644
--- a/modules/doc/library/Doc/DocIterator.php
+++ b/modules/doc/library/Doc/DocIterator.php
@@ -19,7 +19,7 @@ class DocIterator implements Countable, IteratorAggregate
     /**
      * Ordered files
      *
-     * @type array
+     * @var array
      */
     protected $fileInfo;
 
diff --git a/modules/doc/library/Doc/DocParser.php b/modules/doc/library/Doc/DocParser.php
index 9077d3ef9..a35ebc05b 100644
--- a/modules/doc/library/Doc/DocParser.php
+++ b/modules/doc/library/Doc/DocParser.php
@@ -18,14 +18,14 @@ class DocParser
     /**
      * Path to the documentation
      *
-     * @type string
+     * @var string
      */
     protected $path;
 
     /**
      * Iterator over documentation files
      *
-     * @type DocIterator
+     * @var DocIterator
      */
     protected $docIterator;
 
@@ -130,7 +130,7 @@ class DocParser
         $tree = new SimpleTree();
         $stack = new SplStack();
         foreach ($this->docIterator as $fileInfo) {
-            /** @type $fileInfo \SplFileInfo */
+            /** @var $fileInfo \SplFileInfo */
             $file = $fileInfo->openFile();
             $lastLine = null;
             foreach ($file as $line) {
@@ -143,7 +143,7 @@ class DocParser
                     if ($id === null) {
                         $path = array();
                         foreach ($stack as $section) {
-                            /** @type $section DocSection */
+                            /** @var $section DocSection */
                             $path[] = $section->getTitle();
                         }
                         $path[] = $title;
diff --git a/modules/doc/library/Doc/DocSection.php b/modules/doc/library/Doc/DocSection.php
index 4b97db282..4121fd69e 100644
--- a/modules/doc/library/Doc/DocSection.php
+++ b/modules/doc/library/Doc/DocSection.php
@@ -13,35 +13,35 @@ class DocSection extends TreeNode
     /**
      * Chapter the section belongs to
      *
-     * @type DocSection
+     * @var DocSection
      */
     protected $chapter;
 
     /**
      * Content of the section
      *
-     * @type array
+     * @var array
      */
     protected $content = array();
 
     /**
      * Header level
      *
-     * @type int
+     * @var int
      */
     protected $level;
 
     /**
      * Whether to instruct search engines to not index the link to the section
      *
-     * @type bool
+     * @var bool
      */
     protected $noFollow;
 
     /**
      * Title of the section
      *
-     * @type string
+     * @var string
      */
     protected $title;
 
diff --git a/modules/doc/library/Doc/DocSectionFilterIterator.php b/modules/doc/library/Doc/DocSectionFilterIterator.php
index 1087d1584..fa92583ca 100644
--- a/modules/doc/library/Doc/DocSectionFilterIterator.php
+++ b/modules/doc/library/Doc/DocSectionFilterIterator.php
@@ -19,7 +19,7 @@ class DocSectionFilterIterator extends RecursiveFilterIterator implements Counta
     /**
      * Chapter to filter for
      *
-     * @type string
+     * @var string
      */
     protected $chapter;
 
@@ -44,7 +44,7 @@ class DocSectionFilterIterator extends RecursiveFilterIterator implements Counta
     public function accept()
     {
         $section = $this->current();
-        /** @type \Icinga\Module\Doc\DocSection $section */
+        /** @var \Icinga\Module\Doc\DocSection $section */
         if ($section->getChapter()->getId() === $this->chapter) {
             return true;
         }
diff --git a/modules/doc/library/Doc/Renderer/DocRenderer.php b/modules/doc/library/Doc/Renderer/DocRenderer.php
index 4d7ddd0ed..3574f24b0 100644
--- a/modules/doc/library/Doc/Renderer/DocRenderer.php
+++ b/modules/doc/library/Doc/Renderer/DocRenderer.php
@@ -16,21 +16,21 @@ abstract class DocRenderer extends RecursiveIteratorIterator
     /**
      * URL to replace links with
      *
-     * @type string
+     * @var string
      */
     protected $url;
 
     /**
      * Additional URL parameters
      *
-     * @type array
+     * @var array
      */
     protected $urlParams = array();
 
     /**
      * View
      *
-     * @type View|null
+     * @var View|null
      */
     protected $view;
 
diff --git a/modules/doc/library/Doc/Renderer/DocSearchRenderer.php b/modules/doc/library/Doc/Renderer/DocSearchRenderer.php
index 31445dfc8..a89e49333 100644
--- a/modules/doc/library/Doc/Renderer/DocSearchRenderer.php
+++ b/modules/doc/library/Doc/Renderer/DocSearchRenderer.php
@@ -19,7 +19,7 @@ class DocSearchRenderer extends DocRenderer
     /**
      * The content to render
      *
-     * @type array
+     * @var array
      */
     protected $content = array();
 
@@ -105,7 +105,7 @@ class DocSearchRenderer extends DocRenderer
                 $path,
                 array('highlight-search' => $this->getInnerIterator()->getSearch()->getInput())
             );
-            /** @type \Icinga\Web\Url $url */
+            /** @var \Icinga\Web\Url $url */
             $url->setAnchor($this->encodeAnchor($section->getId()));
             $urlAttributes = array(
                 'data-base-target'  => '_next',
diff --git a/modules/doc/library/Doc/Renderer/DocSectionRenderer.php b/modules/doc/library/Doc/Renderer/DocSectionRenderer.php
index e6f0ea186..088c5d617 100644
--- a/modules/doc/library/Doc/Renderer/DocSectionRenderer.php
+++ b/modules/doc/library/Doc/Renderer/DocSectionRenderer.php
@@ -26,28 +26,28 @@ class DocSectionRenderer extends DocRenderer
     /**
      * Content to render
      *
-     * @type array
+     * @var array
      */
     protected $content = array();
 
     /**
      * Search criteria to highlight
      *
-     * @type string
+     * @var string
      */
     protected $highlightSearch;
 
     /**
      * Parsedown instance
      *
-     * @type Parsedown
+     * @var Parsedown
      */
     protected $parsedown;
 
     /**
      * Documentation tree
      *
-     * @type SimpleTree
+     * @var SimpleTree
      */
     protected $tree;
 
@@ -169,7 +169,7 @@ class DocSectionRenderer extends DocRenderer
         $doc->loadHTML($match[0]);
         $xpath = new DOMXPath($doc);
         $blockquote = $xpath->query('//blockquote[1]')->item(0);
-        /** @type \DOMElement $blockquote */
+        /** @var \DOMElement $blockquote */
         if (strtolower(substr(trim($blockquote->nodeValue), 0, 5)) === 'note:') {
             $blockquote->setAttribute('class', 'note');
         }
@@ -189,7 +189,7 @@ class DocSectionRenderer extends DocRenderer
         $doc->loadHTML($match[0]);
         $xpath = new DOMXPath($doc);
         $img = $xpath->query('//img[1]')->item(0);
-        /** @type \DOMElement $img */
+        /** @var \DOMElement $img */
         $img->setAttribute('src', Url::fromPath($img->getAttribute('src'))->getAbsoluteUrl());
         return substr_replace($doc->saveXML($img), '', -2, 1);  // Replace '/>' with '>'
     }
@@ -206,7 +206,7 @@ class DocSectionRenderer extends DocRenderer
         if (($section = $this->tree->getNode($this->decodeAnchor($match['fragment']))) === null) {
             return $match[0];
         }
-        /** @type \Icinga\Module\Doc\DocSection $section */
+        /** @var \Icinga\Module\Doc\DocSection $section */
         $path = $this->getView()->getHelper('Url')->url(
             array_merge(
                 $this->urlParams,
@@ -219,7 +219,7 @@ class DocSectionRenderer extends DocRenderer
             false
         );
         $url = $this->getView()->url($path);
-        /** @type \Icinga\Web\Url $url */
+        /** @var \Icinga\Web\Url $url */
         $url->setAnchor($this->encodeAnchor($section->getId()));
         return sprintf(
             '<a %s%shref="%s"',
diff --git a/modules/doc/library/Doc/Renderer/DocTocRenderer.php b/modules/doc/library/Doc/Renderer/DocTocRenderer.php
index a216a190b..b0f78d3eb 100644
--- a/modules/doc/library/Doc/Renderer/DocTocRenderer.php
+++ b/modules/doc/library/Doc/Renderer/DocTocRenderer.php
@@ -19,7 +19,7 @@ class DocTocRenderer extends DocRenderer
     /**
      * Content to render
      *
-     * @type array
+     * @var array
      */
     protected $content = array();
 
@@ -85,7 +85,7 @@ class DocTocRenderer extends DocRenderer
                 false
             );
             $url = $view->url($path);
-            /** @type \Icinga\Web\Url $url */
+            /** @var \Icinga\Web\Url $url */
             $url->setAnchor($this->encodeAnchor($section->getId()));
             $urlAttributes = array(
                 'data-base-target'  => '_next',
diff --git a/modules/doc/library/Doc/Search/DocSearch.php b/modules/doc/library/Doc/Search/DocSearch.php
index 36f249ed6..459cef208 100644
--- a/modules/doc/library/Doc/Search/DocSearch.php
+++ b/modules/doc/library/Doc/Search/DocSearch.php
@@ -11,14 +11,14 @@ class DocSearch
     /**
      * Search string
      *
-     * @type string
+     * @var string
      */
     protected $input;
 
     /**
      * Search criteria
      *
-     * @type array
+     * @var array
      */
     protected $search;
 
diff --git a/modules/doc/library/Doc/Search/DocSearchIterator.php b/modules/doc/library/Doc/Search/DocSearchIterator.php
index 66ccc8c37..b239254aa 100644
--- a/modules/doc/library/Doc/Search/DocSearchIterator.php
+++ b/modules/doc/library/Doc/Search/DocSearchIterator.php
@@ -19,14 +19,14 @@ class DocSearchIterator extends RecursiveFilterIterator
     /**
      * Search criteria
      *
-     * @type DocSearch
+     * @var DocSearch
      */
     protected $search;
 
     /**
      * Current search matches
      *
-     * @type DocSearchMatch[]|null
+     * @var DocSearchMatch[]|null
      */
     protected $matches;
 
@@ -51,7 +51,7 @@ class DocSearchIterator extends RecursiveFilterIterator
     public function accept()
     {
         $section = $this->current();
-        /** @type $section \Icinga\Module\Doc\DocSection */
+        /** @var $section \Icinga\Module\Doc\DocSection */
         $matches = array();
         if (($match = $this->search->search($section->getTitle())) !== null) {
             $matches[] = $match->setMatchType(DocSearchMatch::MATCH_HEADER);
diff --git a/modules/doc/library/Doc/Search/DocSearchMatch.php b/modules/doc/library/Doc/Search/DocSearchMatch.php
index 4f067d43b..52bd528c9 100644
--- a/modules/doc/library/Doc/Search/DocSearchMatch.php
+++ b/modules/doc/library/Doc/Search/DocSearchMatch.php
@@ -15,56 +15,56 @@ class DocSearchMatch
     /**
      * CSS class for highlighting matches
      *
-     * @type string
+     * @var string
      */
     const HIGHLIGHT_CSS_CLASS = 'search-highlight';
 
     /**
      * Header match
      *
-     * @type int
+     * @var int
      */
     const MATCH_HEADER = 1;
 
     /**
      * Content match
      *
-     * @type int
+     * @var int
      */
     const MATCH_CONTENT = 2;
 
     /**
      * Line
      *
-     * @type string
+     * @var string
      */
     protected $line;
 
     /**
      * Line number
      *
-     * @type int
+     * @var int
      */
     protected $lineno;
 
     /**
      * Type of the match
      *
-     * @type int
+     * @var int
      */
     protected $matchType;
 
     /**
      * Matches
      *
-     * @type array
+     * @var array
      */
     protected $matches = array();
 
     /**
      * View
      *
-     * @type View|null
+     * @var View|null
      */
     protected $view;
 
diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index 62e3858a9..d89c6623f 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -17,7 +17,7 @@ class BackendConfigForm extends ConfigForm
     /**
      * The available monitoring backend resources split by type
      *
-     * @type array
+     * @var array
      */
     protected $resources;
 
diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index 639437a03..2a4e4b033 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -1,6 +1,6 @@
 <?php
 
-/** @type \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+/** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
 
 if ($object->getType() === $object::TYPE_HOST) {
     $isService = false;
diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index fa7d4606a..6a5ed4581 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -2,7 +2,7 @@
     <th><?= $this->translate('Comments'); ?></th>
     <td>
         <?php if ($this->hasPermission('monitoring/command/comment/add')) {
-            /** @type \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+            /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
             if ($object->getType() === $object::TYPE_HOST) {
                 echo $this->qlink(
                     $this->translate('Add comment'),
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 76a4be005..5a8da065d 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -2,7 +2,7 @@
     <th><?= $this->translate('Downtimes'); ?></th>
     <td>
         <?php if ($this->hasPermission('monitoring/command/downtime/schedule')) {
-            /** @type \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+            /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
             if ($object->getType() === $object::TYPE_HOST) {
                 echo $this->qlink(
                     $this->translate('Schedule downtime'),
diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index fa7732e10..797f1663e 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-/** @type $this \Icinga\Application\Modules\Module */
+/** @var $this \Icinga\Application\Modules\Module */
 
 $this->providePermission(
     'monitoring/command/*',
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 4baa7aa9b..aa354d85e 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -120,7 +120,7 @@ abstract class MonitoredObject implements Filterable
     /**
      * Filter
      *
-     * @type Filter
+     * @var Filter
      */
     protected $filter;
 

From b74ef2527a6d7d5922cbcfb2a67d854b35c725fa Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 15:48:21 +0100
Subject: [PATCH 1015/2920] CSS: Remove .sort-box ...

... because we don't use it
---
 modules/monitoring/public/css/module.less | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 6c205cd04..050a8fb5b 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -212,8 +212,3 @@ hr.command-separator {
   border: none;
   border-bottom: 2px solid @colorPetrol;
 }
-
-.sort-box {
-  float: right;
-  margin-right: 1em;
-}

From 77b99552a49181838db66ffe2fb9e1fae7210b77 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 15:51:22 +0100
Subject: [PATCH 1016/2920] Add JSDoc to Icinga.Events.prototype.handleAnchor()

---
 public/js/icinga/events.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 3edd306b9..33bc945bb 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -356,6 +356,11 @@
             return false;
         },
 
+        /**
+         * Handle anchor, i.e. focus the element which is referenced by the anchor
+         *
+         * @param {string} query jQuery selector
+         */
         handleAnchor: function(query) {
             var $element = $(query);
             if ($element.length > 0) {

From 8b7250bfa6fb05a2bae6e5863772b7ec465a47bf Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 16:02:39 +0100
Subject: [PATCH 1017/2920] JS: Focus the element referenced by the anchor on
 anchor navigation ...

... instead of looking for any heading.
---
 public/js/icinga/events.js | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 33bc945bb..54b2aaa00 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -364,21 +364,8 @@
         handleAnchor: function(query) {
             var $element = $(query);
             if ($element.length > 0) {
-                // Try to find the first header. It is more pleasant to users
-                // to select the header instead a container
-                var $header = $element.find(':header:first');
-                if ($header.length > 0) {
-                    $element = $header;
-                } else {
-                    var $input = $element.find(':header:first');
-                    if ($input.length > 0) {
-                        $element = $input
-                    }
-                }
-                // If we want to focus an element which has no tabindex
-                // add one that we can focus is
-                if ($element.prop('tabindex') < 0) {
-                    $element.prop('tabindex', 0);
+                if (typeof $element.attr('tabindex') === 'undefined') {
+                    $element.attr('tabindex', -1);
                 }
                 $element.focus();
             }

From b37757ca6e096f510b54da46bad9de7c1a91c74b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 12 Mar 2015 16:14:50 +0100
Subject: [PATCH 1018/2920] Disable the LdapDiscoveryConfirmPage

As long as the discovery code does not report multiple results, as it should,
actually, it's useless to demand the user to confirm the result.

resolves #8602
refs #8725
refs #8708
---
 modules/setup/library/Setup/WebWizard.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index d16b614f5..afe791732 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -93,7 +93,7 @@ class WebWizard extends Wizard implements SetupWizard
         $this->addPage(new PreferencesPage());
         $this->addPage(new DbResourcePage());
         $this->addPage(new LdapDiscoveryPage());
-        $this->addPage(new LdapDiscoveryConfirmPage());
+        //$this->addPage(new LdapDiscoveryConfirmPage());
         $this->addPage(new LdapResourcePage());
         $this->addPage(new AuthBackendPage());
         $this->addPage(new AdminAccountPage());
@@ -132,13 +132,13 @@ class WebWizard extends Wizard implements SetupWizard
             } elseif ($authData['type'] === 'ldap') {
                 $page->setResourceConfig($this->getPageData('setup_ldap_resource'));
 
-                $suggestions = $this->getPageData('setup_ldap_discovery_confirm');
+                $suggestions = $this->getPageData('setup_ldap_discovery');
                 if (isset($suggestions['backend'])) {
                     $page->populate($suggestions['backend']);
                 }
             }
-        } elseif ($page->getName() === 'setup_ldap_discovery_confirm') {
-            $page->setResourceConfig($this->getPageData('setup_ldap_discovery'));
+        /*} elseif ($page->getName() === 'setup_ldap_discovery_confirm') {
+            $page->setResourceConfig($this->getPageData('setup_ldap_discovery'));*/
         } elseif ($page->getName() === 'setup_admin_account') {
             $page->setBackendConfig($this->getPageData('setup_authentication_backend'));
             $authData = $this->getPageData('setup_authentication_type');
@@ -169,7 +169,7 @@ class WebWizard extends Wizard implements SetupWizard
                 );
             }
 
-            $suggestion = $this->getPageData('setup_ldap_discovery_confirm');
+            $suggestion = $this->getPageData('setup_ldap_discovery');
             if (isset($suggestion['resource'])) {
                 $page->populate($suggestion['resource']);
             }
@@ -199,8 +199,8 @@ class WebWizard extends Wizard implements SetupWizard
         } elseif ($newPage->getname() === 'setup_ldap_discovery') {
             $authData = $this->getPageData('setup_authentication_type');
             $skip = $authData['type'] !== 'ldap';
-        } elseif ($newPage->getName() === 'setup_ldap_discovery_confirm') {
-            $skip = false === $this->hasPageData('setup_ldap_discovery');
+        /*} elseif ($newPage->getName() === 'setup_ldap_discovery_confirm') {
+            $skip = false === $this->hasPageData('setup_ldap_discovery');*/
         } elseif ($newPage->getName() === 'setup_ldap_resource') {
             $authData = $this->getPageData('setup_authentication_type');
             $skip = $authData['type'] !== 'ldap';

From df3d81e181e468e1c3672717ce6f1d08e549c1ac Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 12 Mar 2015 16:30:11 +0100
Subject: [PATCH 1019/2920] SendCustomNotificationCommand: Update phpdoc
 strings

refs #8644
---
 .../Command/Object/SendCustomNotificationCommand.php      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Command/Object/SendCustomNotificationCommand.php b/modules/monitoring/library/Monitoring/Command/Object/SendCustomNotificationCommand.php
index 88446a5aa..83f054295 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/SendCustomNotificationCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/SendCustomNotificationCommand.php
@@ -9,20 +9,20 @@ namespace Icinga\Module\Monitoring\Command\Object;
 class SendCustomNotificationCommand extends WithCommentCommand
 {
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\Object\ObjectCommand::$allowedObjects For the property documentation.
+     * {@inheritdoc}
      */
     protected $allowedObjects = array(
         self::TYPE_HOST,
         self::TYPE_SERVICE
     );
+    
     /**
      * Whether a notification is forced to send
      *
      * Forced notifications are send regardless of time and if notifications
      * are enabled.
      *
-     * @type bool
+     * @var bool
      */
     protected $forced;
 
@@ -32,7 +32,7 @@ class SendCustomNotificationCommand extends WithCommentCommand
      * If broadcast is true, the notification is send to all normal and
      * escalated contacts for the object
      *
-     * @type bool
+     * @var bool
      */
     protected $broadcast;
 

From 7212434856723f16425420aa243bac307227da00 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 16:32:05 +0100
Subject: [PATCH 1020/2920] Remove COLLATE from host_name and
 service_description in the Contact query

refs #8614
refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/ContactQuery.php   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
index a55f582ee..1b5e744d4 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
@@ -34,12 +34,12 @@ class ContactQuery extends IdoQuery
         ),
         'hosts' => array(
             'host'      => 'ho.name1 COLLATE latin1_general_ci',
-            'host_name' => 'ho.name1 COLLATE latin1_general_ci',
+            'host_name' => 'ho.name1',
         ),
         'services' => array(
             'service'               => 'so.name1 COLLATE latin1_general_ci',
-            'service_description'   => 'so.name2 COLLATE latin1_general_ci',
-            'service_host_name'     => 'so.name1 COLLATE latin1_general_ci',
+            'service_description'   => 'so.name2',
+            'service_host_name'     => 'so.name1',
         )
     );
 

From 112f8eb2f9b51a58d04f796e5f91b6ac4cb92149 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 16:33:28 +0100
Subject: [PATCH 1021/2920] Remove COLLATE from host_name and
 service_description in the Contactgroup query

refs #8614
refs #8613
---
 .../Monitoring/Backend/Ido/Query/ContactgroupQuery.php      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
index c19670e8d..cf1586626 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
@@ -33,13 +33,13 @@ class ContactgroupQuery extends IdoQuery
             'contact_notify_host_downtime'      => 'c.notify_host_downtime',
         ),
         'hosts' => array(
-            'host'      => 'ho.name1',
+            'host'      => 'ho.name1 COLLATE latin1_general_ci',
             'host_name' => 'ho.name1'
         ),
         'services' => array(
             'service'               => 'so.name2 COLLATE latin1_general_ci',
-            'service_description'   => 'so.name2 COLLATE latin1_general_ci',
-            'service_host_name'     => 'so.name1 COLLATE latin1_general_ci'
+            'service_description'   => 'so.name2',
+            'service_host_name'     => 'so.name1'
         )
     );
 

From 29b5e4fd4331c3ff00bfde1fac7602d316b9ec4c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 16:38:32 +0100
Subject: [PATCH 1022/2920] Add host_name and service_description columns w/o
 collation to the comment query

refs #8614
---
 .../library/Monitoring/Backend/Ido/Query/CommentQuery.php      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
index ce72de5a2..1348371d3 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
@@ -22,6 +22,9 @@ class CommentQuery extends IdoQuery
             'comment_service'       => 'so.name2 COLLATE latin1_general_ci',
             'service'               => 'so.name2 COLLATE latin1_general_ci', // #7278, #7279
             'comment_objecttype'    => "CASE WHEN ho.object_id IS NOT NULL THEN 'host' ELSE CASE WHEN so.object_id IS NOT NULL THEN 'service' ELSE NULL END END",
+            'service_description'   => 'so.name2',
+            'host_name'             => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END',
+            'service_host_name'     => 'so.name1'
         ),
         'hosts' => array(
             'host_display_name'     => 'CASE WHEN sh.display_name IS NOT NULL THEN sh.display_name ELSE h.display_name END'

From 7156bd7dfb24526d7d4cfb82030b1abd367cf621 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 16:39:20 +0100
Subject: [PATCH 1023/2920] Fetch object comments by host_name and
 service_description

refs #8614
---
 .../Monitoring/Object/MonitoredObject.php     | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 38053f5a2..f50d7249c 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -253,10 +253,13 @@ abstract class MonitoredObject implements Filterable
             'type'      => 'comment_type',
         ))
             ->where('comment_type', array('comment', 'ack'))
-            ->where('comment_objecttype', $this->type)
-            ->where('comment_host', $this->host_name);
+            ->where('comment_objecttype', $this->type);
         if ($this->type === self::TYPE_SERVICE) {
-            $comments->where('comment_service', $this->service_description);
+            $comments
+                ->where('service_host_name', $this->host_name)
+                ->where('service_description', $this->service_description);
+        } else {
+            $comments->where('host_name', $this->host_name);
         }
         $this->comments = $comments->getQuery()->fetchAll();
         return $this;
@@ -387,8 +390,9 @@ abstract class MonitoredObject implements Filterable
                 'contact_pager',
         ));
         if ($this->type === self::TYPE_SERVICE) {
-            $contacts->where('service_host_name', $this->host_name);
-            $contacts->where('service_description', $this->service_description);
+            $contacts
+                ->where('service_host_name', $this->host_name)
+                ->where('service_description', $this->service_description);
         } else {
             $contacts->where('host_name', $this->host_name);
         }
@@ -430,8 +434,9 @@ abstract class MonitoredObject implements Filterable
                 'contactgroup_alias'
         ));
         if ($this->type === self::TYPE_SERVICE) {
-            $contactsGroups->where('service_host_name', $this->host_name);
-            $contactsGroups->where('service_description', $this->service_description);
+            $contactsGroups
+                ->where('service_host_name', $this->host_name)
+                ->where('service_description', $this->service_description);
         } else {
             $contactsGroups->where('host_name', $this->host_name);
         }

From ddd280d57bd98709d05865a294d20441bfc52679 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 12 Mar 2015 16:40:32 +0100
Subject: [PATCH 1024/2920] Fix permission send-custom-notification

refs #8644
---
 modules/monitoring/application/views/scripts/hosts/show.phtml | 2 ++
 .../monitoring/application/views/scripts/services/show.phtml  | 2 ++
 modules/monitoring/configuration.php                          | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index e79fb00eb..5c00cf827 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -31,12 +31,14 @@
             null,
             array('icon' => 'reply')
         ); ?></div>
+        <?php if ($this->hasPermission('monitoring/command/send-custom-notification')): ?>
         <div><?= $this->qlink(
                 sprintf($this->translate('Send a custom notification for all %u hosts'), $hostCount),
                 $sendCustomNotificationLink,
                 null,
                 array('icon' => 'comment')
             ); ?></div>
+        <?php endif; ?>
       <?php if (($unhandledCount = count($unhandledObjects)) > 0): ?>
         <div>
             <h3><?= sprintf(
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index f6e98754b..a71e32792 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -31,12 +31,14 @@
             null,
             array('icon' => 'reply')
         ); ?></div>
+        <?php if ($this->hasPermission('monitoring/command/send-custom-notification')): ?>
         <div><?= $this->qlink(
                 sprintf($this->translate('Send a custom notification for all %u services'), $serviceCount),
                 $sendCustomNotificationLink,
                 null,
                 array('icon' => 'comment')
             ); ?></div>
+        <?php endif; ?>
       <?php if (($unhandledCount = count($unhandledObjects)) > 0): ?>
         <div>
             <h3><?= sprintf(
diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index fa7732e10..8df5d5d85 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -55,6 +55,10 @@ $this->providePermission(
     'monitoring/command/feature/object',
     $this->translate('Allow processing commands for toggling features on host and service objects')
 );
+$this->providesPermission(
+    'monitoring/command/send-custom-notification',
+    $this->translate('Allow sending custom notifications for hosts and services');
+);
 
 $this->provideRestriction(
     'monitoring/hosts/filter',

From 5749ff72b107a4dc47218ffe9217b5732376b0e1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 16:48:29 +0100
Subject: [PATCH 1025/2920] Fix typo in configuration.php

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

diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index 94255a8f4..121494201 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -57,7 +57,7 @@ $this->providePermission(
 );
 $this->providesPermission(
     'monitoring/command/send-custom-notification',
-    $this->translate('Allow sending custom notifications for hosts and services');
+    $this->translate('Allow sending custom notifications for hosts and services')
 );
 
 $this->provideRestriction(

From c1d5231619ab0dc0629c3032f66db2ba9cda2b7b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 17:55:29 +0100
Subject: [PATCH 1026/2920] Add priority param to Module::provideSearchUrl()

refs #8668
---
 library/Icinga/Application/Modules/Module.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index 8c0bc2266..c0036e1fa 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -184,14 +184,18 @@ class Module
     protected $searchUrls = array();
 
     /**
-     * @param string $title
-     * @param string $url
+     * Provide a search URL
+     *
+     * @param string    $title
+     * @param string    $url
+     * @param int       $priority
      */
-    public function provideSearchUrl($title, $url)
+    public function provideSearchUrl($title, $url, $priority = 0)
     {
         $searchUrl = (object) array(
-            'title' => $title,
-            'url'   => $url
+            'title'     => (string) $title,
+            'url'       => (string) $url,
+            'priority'  => (int) $priority
         );
 
         $this->searchUrls[] = $searchUrl;

From 3970d7dec2a7a9236a5091ecadbc417934db53a9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 18:09:43 +0100
Subject: [PATCH 1027/2920] Lower doc modules search priority

refs #8668
---
 modules/doc/configuration.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/doc/configuration.php b/modules/doc/configuration.php
index 8ae28763f..031a62e64 100644
--- a/modules/doc/configuration.php
+++ b/modules/doc/configuration.php
@@ -21,4 +21,4 @@ $section->add($this->translate('Developer - Style'), array(
     'priority' => 200,
 ));
 
-$this->provideSearchUrl($this->translate('Doc'), 'doc/search');
+$this->provideSearchUrl($this->translate('Doc'), 'doc/search', -10);

From 6c5a6215ef4ac8f44cc2c0133688dda73a9c498a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 18:11:06 +0100
Subject: [PATCH 1028/2920] Render search results based on their priority

refs #8668
---
 library/Icinga/Web/Widget/SearchDashboard.php | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/library/Icinga/Web/Widget/SearchDashboard.php b/library/Icinga/Web/Widget/SearchDashboard.php
index 16c2b66d6..c5e1ad8db 100644
--- a/library/Icinga/Web/Widget/SearchDashboard.php
+++ b/library/Icinga/Web/Widget/SearchDashboard.php
@@ -18,13 +18,6 @@ class SearchDashboard extends Dashboard
 {
     const SEARCH_PANE = 'search';
 
-    /**
-     * All searchUrls provided by Modules
-     *
-     * @var array
-     */
-    protected $searchUrls = array();
-
     /**
      * Load all available search dashlets from modules
      *
@@ -64,9 +57,22 @@ class SearchDashboard extends Dashboard
         $this->activate(self::SEARCH_PANE);
 
         $manager = Icinga::app()->getModuleManager();
+        $searchUrls = array();
 
         foreach ($manager->getLoadedModules() as $module) {
-            $this->addSearchDashletsFromModule($searchString, $module, $pane);
+            $moduleSearchUrls = $module->getSearchUrls();
+            if (! empty($moduleSearchUrls)) {
+                $searchUrls = array_merge($searchUrls, $moduleSearchUrls);
+            }
+        }
+
+        usort($searchUrls, array($this, 'compareSearchUrls'));
+
+        foreach (array_reverse($searchUrls) as $searchUrl) {
+            $pane->addDashlet(
+                $searchUrl->title . ': ' . $searchString,
+                Url::fromPath($searchUrl->url, array('q' => $searchString))
+            );
         }
 
         if ($searchString === '' && $pane->hasDashlets()) {
@@ -77,24 +83,18 @@ class SearchDashboard extends Dashboard
     }
 
     /**
-     * Add available search dashlets to the pane
+     * Compare search URLs based on their priority
      *
-     * @param string $searchString
-     * @param Module $module
-     * @param Pane $pane
+     * @param   object  $a
+     * @param   object  $b
+     *
+     * @return  int
      */
-    protected function addSearchDashletsFromModule($searchString, $module, $pane)
+    private function compareSearchUrls($a, $b)
     {
-        $searchUrls = $module->getSearchUrls();
-
-        if (! empty($searchUrls)) {
-            $this->searchUrls[] = $module->getSearchUrls();
-            foreach ($searchUrls as $search) {
-                $pane->addDashlet(
-                    $search->title . ': ' . $searchString,
-                    Url::fromPath($search->url, array('q' => $searchString))
-                );
-            }
+        if ($a->priority === $b->priority) {
+            return 0;
         }
+        return ($a->priority < $b->priority) ? -1 : 1;
     }
 }

From 77cd48e6fec06fd524ced4e9fb81583d3b33e5ff Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 18:11:33 +0100
Subject: [PATCH 1029/2920] We do not use the @package tag

---
 library/Icinga/Web/Widget/SearchDashboard.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/library/Icinga/Web/Widget/SearchDashboard.php b/library/Icinga/Web/Widget/SearchDashboard.php
index c5e1ad8db..f53db5c86 100644
--- a/library/Icinga/Web/Widget/SearchDashboard.php
+++ b/library/Icinga/Web/Widget/SearchDashboard.php
@@ -11,8 +11,6 @@ use Zend_Controller_Action_Exception as ActionError;
 
 /**
  * Class SearchDashboard display multiple search views on a single search page
- *
- * @package Icinga\Web\Widget
  */
 class SearchDashboard extends Dashboard
 {

From 515fe3249f581b41f35b69aa2cf4d7f55f7349c3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 18:44:23 +0100
Subject: [PATCH 1030/2920] Fix PHPDoc of SearchDashboard::search()

refs #8668
---
 library/Icinga/Web/Widget/SearchDashboard.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Web/Widget/SearchDashboard.php b/library/Icinga/Web/Widget/SearchDashboard.php
index f53db5c86..537963b98 100644
--- a/library/Icinga/Web/Widget/SearchDashboard.php
+++ b/library/Icinga/Web/Widget/SearchDashboard.php
@@ -19,12 +19,12 @@ class SearchDashboard extends Dashboard
     /**
      * Load all available search dashlets from modules
      *
-     * @param string $searchString
-     * @return Dashboard|SearchDashboard
+     * @param   string $searchString
+     *
+     * @return  Dashboard|SearchDashboard
      */
     public static function search($searchString = '')
     {
-        /** @var $dashboard SearchDashboard */
         $dashboard = new static('searchDashboard');
         $dashboard->loadSearchDashlets($searchString);
         return $dashboard;

From dc6b472ec9fe19539e00479302c224eae849353a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 18:47:34 +0100
Subject: [PATCH 1031/2920] Don't create search dashlets if the search string
 is empty

refs #8668
---
 library/Icinga/Web/Widget/SearchDashboard.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/library/Icinga/Web/Widget/SearchDashboard.php b/library/Icinga/Web/Widget/SearchDashboard.php
index 537963b98..d81d184cf 100644
--- a/library/Icinga/Web/Widget/SearchDashboard.php
+++ b/library/Icinga/Web/Widget/SearchDashboard.php
@@ -60,6 +60,10 @@ class SearchDashboard extends Dashboard
         foreach ($manager->getLoadedModules() as $module) {
             $moduleSearchUrls = $module->getSearchUrls();
             if (! empty($moduleSearchUrls)) {
+                if ($searchString === '') {
+                    $pane->add(t('Ready to search'), 'search/hint');
+                    return;
+                }
                 $searchUrls = array_merge($searchUrls, $moduleSearchUrls);
             }
         }
@@ -72,12 +76,6 @@ class SearchDashboard extends Dashboard
                 Url::fromPath($searchUrl->url, array('q' => $searchString))
             );
         }
-
-        if ($searchString === '' && $pane->hasDashlets()) {
-            $pane->removeDashlets();
-            $pane->add('Ready to search', 'search/hint');
-            return;
-        }
     }
 
     /**

From 03f78a06fb0fdb13f055d34b7b25cc4291d14d39 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 18:48:59 +0100
Subject: [PATCH 1032/2920] Optimize imports in the SearchDashboard

refs #8668
---
 library/Icinga/Web/Widget/SearchDashboard.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/library/Icinga/Web/Widget/SearchDashboard.php b/library/Icinga/Web/Widget/SearchDashboard.php
index d81d184cf..c1f234d2a 100644
--- a/library/Icinga/Web/Widget/SearchDashboard.php
+++ b/library/Icinga/Web/Widget/SearchDashboard.php
@@ -3,11 +3,9 @@
 
 namespace Icinga\Web\Widget;
 
+use Zend_Controller_Action_Exception;
 use Icinga\Application\Icinga;
-use Icinga\Application\Modules\Module;
 use Icinga\Web\Url;
-use Icinga\Web\Widget\Dashboard\Pane;
-use Zend_Controller_Action_Exception as ActionError;
 
 /**
  * Class SearchDashboard display multiple search views on a single search page
@@ -33,13 +31,14 @@ class SearchDashboard extends Dashboard
     /**
      * Renders the output
      *
-     * @return string
-     * @throws \Zend_Controller_Action_Exception
+     * @return  string
+     *
+     * @throws  Zend_Controller_Action_Exception
      */
     public function render()
     {
         if (! $this->getPane(self::SEARCH_PANE)->hasDashlets()) {
-            throw new ActionError('Site not found', 404);
+            throw new Zend_Controller_Action_Exception(t('Page not found'), 404);
         }
         return parent::render();
     }

From 2e2dd7cd002752746d7015d39f505df477ecd4ed Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 18:51:32 +0100
Subject: [PATCH 1033/2920] Raise priorities of the monitoring search URLs

refs #8668
---
 modules/monitoring/configuration.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index 121494201..78fce4030 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -85,10 +85,10 @@ $this->provideSetupWizard('Icinga\Module\Monitoring\MonitoringWizard');
 /*
  * Available Search Urls
  */
-$this->provideSearchUrl($this->translate('Hosts'), 'monitoring/list/hosts?sort=host_severity&limit=10');
-$this->provideSearchUrl($this->translate('Services'), 'monitoring/list/services?sort=service_severity&limit=10');
-$this->provideSearchUrl($this->translate('Hostgroups'), 'monitoring/list/hostgroups?limit=10');
-$this->provideSearchUrl($this->translate('Servicegroups'), 'monitoring/list/servicegroups?limit=10');
+$this->provideSearchUrl($this->translate('Hosts'), 'monitoring/list/hosts?sort=host_severity&limit=10', 99);
+$this->provideSearchUrl($this->translate('Services'), 'monitoring/list/services?sort=service_severity&limit=10', 98);
+$this->provideSearchUrl($this->translate('Hostgroups'), 'monitoring/list/hostgroups?limit=10', 97);
+$this->provideSearchUrl($this->translate('Servicegroups'), 'monitoring/list/servicegroups?limit=10', 96);
 
 /*
  * Problems Section

From 17393a7b41d2b8f38630bd66d18dc21fe0df7b6f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 23:30:04 +0100
Subject: [PATCH 1034/2920] Remove unnecessary PHPDoc tags from Ldap\Connection

---
 library/Icinga/Protocol/Ldap/Connection.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 3f79a063f..96f3ded9b 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -23,10 +23,6 @@ use Icinga\Data\ConfigObject;
  *     'bind_pw'  => '***'
  * ));
  * </code>
- *
- * @copyright  Copyright (c) 2013 Icinga-Web Team <info@icinga.org>
- * @author     Icinga-Web Team <info@icinga.org>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU General Public License
  */
 class Connection
 {

From 1b9ddaacac756ce545a6779fab1b256a42090af0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 23:35:38 +0100
Subject: [PATCH 1035/2920] Add PHPDoc to Ldap\Connection's encryption consts

---
 library/Icinga/Protocol/Ldap/Connection.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 96f3ded9b..e1954fe1d 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -30,7 +30,19 @@ class Connection
     const LDAP_SIZELIMIT_EXCEEDED = 4;
     const LDAP_ADMINLIMIT_EXCEEDED = 11;
     const PAGE_SIZE = 1000;
+
+    /**
+     * Encrypt connection using STARTTLS (upgrading a plain text connection)
+     *
+     * @var string
+     */
     const STARTTLS = 'tls';
+
+    /**
+     * Encrypt connection using LDAP over SSL (using a separate port)
+     *
+     * @var string
+     */
     const SSL = 'ssl';
 
     protected $ds;

From 86f3ce9133a8289184b11ac93798d70fb75ca25b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 23:42:50 +0100
Subject: [PATCH 1036/2920] Rename Ldap\Connetion::SSL to ::LDAPS

The SSL constant was used to denote LDAP over TLS/SSL. In fact both STARTTLS and LDAPS use encrypted TLS/SSL communication
w/ STARTTLS upgrading a plain text connection and LDAPS using a separate port. Thus speaking of SSL only for LDAPS and TLS only for STARTTLS
is not correct.
---
 application/forms/Config/Resource/LdapResourceForm.php | 2 +-
 library/Icinga/Protocol/Ldap/Connection.php            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 058f8462a..5ce0424a9 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -70,7 +70,7 @@ class LdapResourceForm extends Form
                 ),
                 'multiOptions'  => array(
                     'plaintext'             => $this->translate('Plaintext'),
-                    Connection::SSL         => 'Secure Sockets Layer (SSL)',
+                    Connection::LDAPS       => 'Secure Sockets Layer (SSL)',
                     Connection::STARTTLS    => 'Transport Layer Security (TLS)'
                 )
             )
diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index e1954fe1d..3d3b4265e 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -43,7 +43,7 @@ class Connection
      *
      * @var string
      */
-    const SSL = 'ssl';
+    const LDAPS = 'ssl';
 
     protected $ds;
     protected $hostname;
@@ -481,12 +481,12 @@ class Connection
      */
     protected function prepareNewConnection()
     {
-        if ($this->connectionType === static::STARTTLS || $this->connectionType === static::SSL) {
+        if ($this->connectionType === static::STARTTLS || $this->connectionType === static::LDAPS) {
             $this->prepareTlsEnvironment();
         }
 
         $hostname = $this->hostname;
-        if ($this->connectionType === static::SSL) {
+        if ($this->connectionType === static::LDAPS) {
             $hostname = 'ldaps://' . $hostname;
         }
 

From db08ccad4bff4d165807f68e03482692a3dfd340 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 23:54:05 +0100
Subject: [PATCH 1037/2920] Fix encryption setting written to a LDAP reource's
 INI configuration

Use starttls for STARTTLS and ldaps for LDAPS.
---
 library/Icinga/Protocol/Ldap/Connection.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 3d3b4265e..a5752b799 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -36,14 +36,14 @@ class Connection
      *
      * @var string
      */
-    const STARTTLS = 'tls';
+    const STARTTLS = 'starttls';
 
     /**
      * Encrypt connection using LDAP over SSL (using a separate port)
      *
      * @var string
      */
-    const LDAPS = 'ssl';
+    const LDAPS = 'ldaps';
 
     protected $ds;
     protected $hostname;

From 61e01a4439814c891fbc4b91a9ff5dffa44fbaa0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 00:00:21 +0100
Subject: [PATCH 1038/2920] Fix SSL, TLS vs LDAPS, STARTTLS in the LDAP
 resource form

---
 application/forms/Config/Resource/LdapResourceForm.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 5ce0424a9..7f5cfa35d 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -66,12 +66,13 @@ class LdapResourceForm extends Form
                 'autosubmit'    => true,
                 'label'         => $this->translate('Connection'),
                 'description'   => $this->translate(
-                    'The type of connection to use. Unencrypted (Plaintext) or encrypted (SSL, TLS).'
+                    'Whether to encrypt communication. Choose STARTTLS or LDAPS for encrypted communication or'
+                    . ' Plaintext for unencrypted communication'
                 ),
                 'multiOptions'  => array(
                     'plaintext'             => $this->translate('Plaintext'),
-                    Connection::LDAPS       => 'Secure Sockets Layer (SSL)',
-                    Connection::STARTTLS    => 'Transport Layer Security (TLS)'
+                    Connection::LDAPS       => 'LDAPS',
+                    Connection::STARTTLS    => 'STARTTLS'
                 )
             )
         );

From 708f08302ff19c19aebcb790f21b6cfc975d9189 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 00:02:18 +0100
Subject: [PATCH 1039/2920] Use encryption instead of connection for the
 encryption setting of a LDAP resource

---
 application/forms/Config/Resource/LdapResourceForm.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 7f5cfa35d..2d8a757e2 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -60,11 +60,11 @@ class LdapResourceForm extends Form
         );
         $this->addElement(
             'select',
-            'connection',
+            'encryption',
             array(
                 'required'      => true,
                 'autosubmit'    => true,
-                'label'         => $this->translate('Connection'),
+                'label'         => $this->translate('Encryption'),
                 'description'   => $this->translate(
                     'Whether to encrypt communication. Choose STARTTLS or LDAPS for encrypted communication or'
                     . ' Plaintext for unencrypted communication'
@@ -77,7 +77,7 @@ class LdapResourceForm extends Form
             )
         );
 
-        if (isset($formData['connection']) && $formData['connection'] !== 'plaintext') {
+        if (isset($formData['encryption']) && $formData['encryption'] !== 'plaintext') {
             // TODO(jom): Do not show this checkbox unless the connection is actually failing due to certificate errors
             $this->addElement(
                 'checkbox',

From 020329d201524b09c717c8f1c08bca51b1dc2345 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 00:03:01 +0100
Subject: [PATCH 1040/2920] List STARTTLS before LDAPS ...

... when choosing encryption for a LDAP resource.
---
 application/forms/Config/Resource/LdapResourceForm.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 2d8a757e2..0323ad81a 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -71,8 +71,8 @@ class LdapResourceForm extends Form
                 ),
                 'multiOptions'  => array(
                     'plaintext'             => $this->translate('Plaintext'),
-                    Connection::LDAPS       => 'LDAPS',
-                    Connection::STARTTLS    => 'STARTTLS'
+                    Connection::STARTTLS    => 'STARTTLS',
+                    Connection::LDAPS       => 'LDAPS'
                 )
             )
         );

From a4731ebbb356710295405755b60d9fe547b4066b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 00:25:08 +0100
Subject: [PATCH 1041/2920] Select is_reachable from host and service status

refs #6875
---
 .../library/Monitoring/Backend/Ido/Query/StatusQuery.php    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index 4106fa321..0fb799f48 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -121,6 +121,7 @@ class StatusQuery extends IdoQuery
             'host_retry_check_interval' => 'hs.retry_check_interval',
             'host_check_timeperiod_object_id' => 'hs.check_timeperiod_object_id',
             'host_status_update_time' => 'hs.status_update_time',
+            'host_is_reachable' => 'hs.is_reachable',
             'host_severity' => 'CASE WHEN hs.current_state = 0
             THEN
                 CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL
@@ -259,6 +260,7 @@ class StatusQuery extends IdoQuery
             'service_check_timeperiod_object_id' => 'ss.check_timeperiod_object_id',
             'service_status_update_time' => 'ss.status_update_time',
             'service_problem'  => 'CASE WHEN ss.current_state = 0 THEN 0 ELSE 1 END',
+            'service_is_reachable' => 'ss.is_reachable',
             'service_severity'  => 'CASE WHEN ss.current_state = 0
                 THEN
                     CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL
@@ -345,6 +347,10 @@ class StatusQuery extends IdoQuery
             $this->columnMap['hoststatus']['host_check_source'] = '(NULL)';
             $this->columnMap['servicestatus']['service_check_source'] = '(NULL)';
         }
+        if (version_compare($this->getIdoVersion(), '1.13.0', '<')) {
+            $this->columnMap['hoststatus']['host_is_reachable'] = '(NULL)';
+            $this->columnMap['servicestatus']['service_is_reachable'] = '(NULL)';
+        }
         $this->select->from(array('ho' => $this->prefix . 'objects'), array())
         ->join(
             array('hs' => $this->prefix . 'hoststatus'),

From 37823f041502d86399b5b53a16e0fccc2aab0b4c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 00:25:44 +0100
Subject: [PATCH 1042/2920] Select host_is_reachable in the host detail view

refs #6875
---
 modules/monitoring/library/Monitoring/Object/Host.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 359065e57..342e78812 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -109,6 +109,7 @@ class Host extends MonitoredObject
             'host_handled',
             'host_in_downtime',
             'host_is_flapping',
+            'host_is_reachable',
             'host_last_check',
             'host_last_notification',
             'host_last_state_change',

From 1c8c49e7322663042db38b954e18450d6821310d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 00:26:02 +0100
Subject: [PATCH 1043/2920] Select service_is_reachable in the service detail
 view

refs #6875
---
 modules/monitoring/library/Monitoring/Object/Service.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 4195b0ff4..7c22ae57d 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -137,6 +137,7 @@ class Service extends MonitoredObject
             'service_handled',
             'service_in_downtime',
             'service_is_flapping',
+            'service_is_reachable',
             'service_last_check',
             'service_last_notification',
             'service_last_state_change',

From ce3c2507efbecd8977068886f77046883dd23843 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 00:26:45 +0100
Subject: [PATCH 1044/2920] Show reachability in the host and service detail
 view

refs #6875
---
 .../scripts/show/components/checksource.phtml | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/checksource.phtml b/modules/monitoring/application/views/scripts/show/components/checksource.phtml
index 60bb944f3..07e63e835 100644
--- a/modules/monitoring/application/views/scripts/show/components/checksource.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checksource.phtml
@@ -1,7 +1,20 @@
-<?php if (! $object->check_source) return ?>
+<?php if ($object->check_source !== null): ?>
 <tr>
-  <th><?= $this->translate('Check Source') ?></th>
-  <td>
-      <?= $this->escape($object->check_source) ?>
-  </td>
+    <th>
+        <?= $this->translate('Check Source') ?>
+    </th>
+    <td>
+        <?= $this->escape($object->check_source) ?>
+    </td>
 </tr>
+<?php endif ?>
+<?php if ($object->is_reachable !== null): ?>
+<tr>
+    <th>
+        <?= $this->translate('Reachable') ?>
+    </th>
+    <td>
+        <?= $object->is_reachable ? $this->translate('Yes') : $this->translate('No') ?>
+    </td>
+</tr>
+<?php endif ?>

From d8d0d88c95ef25fb815b411b156239e18bc183cd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 00:29:00 +0100
Subject: [PATCH 1045/2920] Rename Capability::hasStartTLS to
 Capability::hasStartTls()

---
 library/Icinga/Protocol/Ldap/Capability.php | 2 +-
 library/Icinga/Protocol/Ldap/Connection.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Capability.php b/library/Icinga/Protocol/Ldap/Capability.php
index 76d1f11a0..625dc98bb 100644
--- a/library/Icinga/Protocol/Ldap/Capability.php
+++ b/library/Icinga/Protocol/Ldap/Capability.php
@@ -120,7 +120,7 @@ class Capability {
      *
      * @return      bool    Whether StartTLS is supported
      */
-    public function hasStartTLS()
+    public function hasStartTls()
     {
         return isset($this->oids[self::LDAP_SERVER_START_TLS_OID]);
     }
diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index a5752b799..e8c06cb5b 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -502,7 +502,7 @@ class Connection
 
         if ($this->connectionType === static::STARTTLS) {
             $force_tls = false;
-            if ($this->capabilities->hasStartTLS()) {
+            if ($this->capabilities->hasStartTls()) {
                 if (@ldap_start_tls($ds)) {
                     Logger::debug('LDAP STARTTLS succeeded');
                 } else {

From 9f0af662a746e4e3e80bdbb654f72c2ea695d3a1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 00:47:23 +0100
Subject: [PATCH 1046/2920] Write none instead of plaintext for unencrypted
 LDAP resources

---
 application/forms/Config/Resource/LdapResourceForm.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 0323ad81a..13ffcf580 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -67,17 +67,17 @@ class LdapResourceForm extends Form
                 'label'         => $this->translate('Encryption'),
                 'description'   => $this->translate(
                     'Whether to encrypt communication. Choose STARTTLS or LDAPS for encrypted communication or'
-                    . ' Plaintext for unencrypted communication'
+                    . ' none for unencrypted communication'
                 ),
                 'multiOptions'  => array(
-                    'plaintext'             => $this->translate('Plaintext'),
+                    'none'                  => $this->translate('None'),
                     Connection::STARTTLS    => 'STARTTLS',
                     Connection::LDAPS       => 'LDAPS'
                 )
             )
         );
 
-        if (isset($formData['encryption']) && $formData['encryption'] !== 'plaintext') {
+        if (isset($formData['encryption']) && $formData['encryption'] !== 'none') {
             // TODO(jom): Do not show this checkbox unless the connection is actually failing due to certificate errors
             $this->addElement(
                 'checkbox',

From 32487e4e2105c4a4c34bd8383985dbc8863c6703 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 03:41:33 +0100
Subject: [PATCH 1047/2920] Ignore settings from instances.ini that don't have
 a setter on the transport class used

fixes #8543
---
 .../Monitoring/Command/Transport/CommandTransport.php  |  5 ++++-
 .../Monitoring/Command/Transport/LocalCommandFile.php  |  8 +++++---
 .../Monitoring/Command/Transport/RemoteCommandFile.php | 10 ++++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
index 93af4e955..ecb7fb09f 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
@@ -73,7 +73,10 @@ abstract class CommandTransport
         foreach ($config as $key => $value) {
             $method = 'set' . ucfirst($key);
             if (! method_exists($transport, $method)) {
-                throw new ConfigurationError();
+                // Ignore settings from config that don't have a setter on the transport instead of throwing an
+                // exception here because the transport should throw an exception if it's not fully set up
+                // when being about to send a command
+                continue;
             }
             $transport->$method($value);
         }
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
index 6af054734..f5bd9b786 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
@@ -4,8 +4,8 @@
 namespace Icinga\Module\Monitoring\Command\Transport;
 
 use Exception;
-use LogicException;
 use Icinga\Application\Logger;
+use Icinga\Exception\ConfigurationError;
 use Icinga\Module\Monitoring\Command\Exception\TransportException;
 use Icinga\Module\Monitoring\Command\IcingaCommand;
 use Icinga\Module\Monitoring\Command\Renderer\IcingaCommandFileCommandRenderer;
@@ -102,13 +102,15 @@ class LocalCommandFile implements CommandTransportInterface
      * @param   IcingaCommand   $command
      * @param   int|null        $now
      *
-     * @throws  LogicException
+     * @throws  ConfigurationError
      * @throws  TransportException
      */
     public function send(IcingaCommand $command, $now = null)
     {
         if (! isset($this->path)) {
-            throw new LogicException('Can\'t send external Icinga Command. Path to the local command file is missing');
+            throw new ConfigurationError(
+                'Can\'t send external Icinga Command. Path to the local command file is missing'
+            );
         }
         $commandString = $this->renderer->render($command, $now);
         Logger::debug(
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
index 9b69a8cc4..7710abb11 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
@@ -3,8 +3,8 @@
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
-use LogicException;
 use Icinga\Application\Logger;
+use Icinga\Exception\ConfigurationError;
 use Icinga\Module\Monitoring\Command\Exception\TransportException;
 use Icinga\Module\Monitoring\Command\IcingaCommand;
 use Icinga\Module\Monitoring\Command\Renderer\IcingaCommandFileCommandRenderer;
@@ -166,16 +166,18 @@ class RemoteCommandFile implements CommandTransportInterface
      * @param   IcingaCommand   $command
      * @param   int|null        $now
      *
-     * @throws  LogicException
+     * @throws  ConfigurationError
      * @throws  TransportException
      */
     public function send(IcingaCommand $command, $now = null)
     {
         if (! isset($this->path)) {
-            throw new LogicException('Can\'t send external Icinga Command. Path to the remote command file is missing');
+            throw new ConfigurationError(
+                'Can\'t send external Icinga Command. Path to the remote command file is missing'
+            );
         }
         if (! isset($this->host)) {
-            throw new LogicException('Can\'t send external Icinga Command. Remote host is missing');
+            throw new ConfigurationError('Can\'t send external Icinga Command. Remote host is missing');
         }
         $commandString = $this->renderer->render($command, $now);
         Logger::debug(

From b5abff03133c9bae6983408a81f5e0d864dcde02 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 03:48:46 +0100
Subject: [PATCH 1048/2920] Fix that the detail URL is no longer appended to
 the redirect URL on login

JavaScript relied on #redirect but we now protect IDs which make them unusable
for JS and CSS.

refs #8728
---
 public/js/icinga/history.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/js/icinga/history.js b/public/js/icinga/history.js
index 96711f709..a3f45e93d 100644
--- a/public/js/icinga/history.js
+++ b/public/js/icinga/history.js
@@ -112,7 +112,7 @@
             this.lastPushUrl = url;
             window.history.pushState({icinga: true}, null, url);
         },
-        
+
         /**
          * Event handler for pop events
          *
@@ -166,9 +166,10 @@
                 parts = document.location.hash.split(/#!/);
 
                 if ($('#layout > #login').length) {
-                    // We are on the login page!
-                    $('#login form #redirect').val(
-                        $('#login form #redirect').val() + '#!' + parts[1]
+                    // We are on the login page
+                    var redirect = $('#login form input[name=redirect]').first();
+                    redirect.val(
+                        redirect.val() + '#!' + parts[1]
                     );
                 } else {
                     if ($('#col2').data('icingaUrl') !== main) {

From 200982e4f5ccb2a98312cdce22b94f7ccace631e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 03:59:43 +0100
Subject: [PATCH 1049/2920] Set form action automatically only if
 Form::setAction() has not been called

refs #8605
---
 library/Icinga/Web/Form.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 3ff995028..faa212458 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -535,7 +535,13 @@ class Form extends Zend_Form
                 ->addCsrfCounterMeasure()
                 ->addSubmitButton();
 
-            if ($this->getAction() === '') {
+            if ($this->getAttrib('action') === null) {
+                // Use Form::getAttrib() instead of Form::getAction() here because we want to explicitly check against
+                // null. Form::getAction() would return the empty string '' if the action is not set.
+                // For not setting the action attribute use Form::setAction(''). This is required for for the
+                // accessibility's enable/disable auto-refresh mechanic
+
+                // TODO(el): Re-evalute this necessity. JavaScript could use the container's URL if there's no action set.
                 // We MUST set an action as JS gets confused otherwise, if
                 // this form is being displayed in an additional column
                 $this->setAction(Url::fromRequest()->without(array_keys($this->getElements())));

From f60a0b86eca8f5a4f1cba1b05fbdf01b0f6e00b3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 04:01:08 +0100
Subject: [PATCH 1050/2920] POST disable/enable auto-refresh always against the
 current location

refs #8605
---
 application/forms/AutoRefreshForm.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/forms/AutoRefreshForm.php b/application/forms/AutoRefreshForm.php
index e1e436d34..1d2eda2be 100644
--- a/application/forms/AutoRefreshForm.php
+++ b/application/forms/AutoRefreshForm.php
@@ -21,6 +21,8 @@ class AutoRefreshForm extends Form
     public function init()
     {
         $this->setName('form_auto_refresh');
+        // Post against the current location
+        $this->setAction('');
     }
 
     /**

From 1bd2e7cb84da5ff9d17e6cd7b176a55c85ed4a11 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 04:02:42 +0100
Subject: [PATCH 1051/2920] Submit forms to the container's target URL if the
 form's action is not set

refs #8605
---
 public/js/icinga/events.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 54b2aaa00..f83c172f6 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -239,10 +239,8 @@
             event.stopPropagation();
             event.preventDefault();
 
-            icinga.logger.debug('Submitting form: ' + method + ' ' + url, method);
-
             if ($button.length) {
-                // activate spinner indicator
+                // Activate spinner
                 if ($button.hasClass('spinner')) {
                     $button.addClass('active');
                 }
@@ -252,6 +250,13 @@
                 $target = self.getLinkTargetFor($form);
             }
 
+            if (! url) {
+                // Use the URL of the target container if the form's action is not set
+                url = $target.closest('.container').data('icinga-url');
+            }
+
+            icinga.logger.debug('Submitting form: ' + method + ' ' + url, method);
+
             if (method === 'GET') {
                 var dataObj = $form.serializeObject();
 
@@ -274,6 +279,7 @@
                     }
                 }
             }
+
             icinga.loader.loadUrl(url, $target, data, method);
 
             return false;

From 2e1ae185fbb39b4d33c916a15686efb911b1ce61 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 04:04:58 +0100
Subject: [PATCH 1052/2920] Retain detail URL if the layout is rerendered after
 a redirect

refs #8605
---
 public/js/icinga/loader.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 07ab3cbc1..1c674b947 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -292,6 +292,12 @@
                 r.url = redirect;
                 if (parts.length) {
                     r.loadNext = parts;
+                } else if (!! document.location.hash) {
+                    // Retain detail URL if the layout is rerendered
+                    parts = document.location.hash.split('#!').splice(1);
+                    if (parts.length) {
+                        r.loadNext = parts;
+                    }
                 }
 
             } else {

From efd7eb579353ee40c62bc7d20454e5bb39663de4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 04:18:31 +0100
Subject: [PATCH 1053/2920] Simplify skip-links' CSS

refs #8729
---
 public/css/icinga/menu.less | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index c486251b0..b3adec2ef 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -268,35 +268,28 @@ a:focus {
   outline: none;
 }
 
-/* Accessibility Skip Links */
 .skip-links {
-  position: absolute;
-  opacity: 1;
+  position: relative;
   ul {
     list-style-type: none;
     margin: 0;
     padding: 0;
     li {
-      display: inline;
-      margin: 0;
-      padding: 0;
+      display: block;
       a, button[type="submit"] {
-        position: absolute;
-        display: block;
+        background-color: #fff;
         left: -999em;
-        box-sizing: content-box;
-        width: 10.4em !important;
-        top: 0em;
-        text-align: left !important;
         padding: 0.8em;
-        background-color: white;
-        z-index: 4;
-        border: 1px @colorGray solid;
+        position: absolute;
+        width: 100%;
         &:focus {
           left: 0;
-          outline: 1px dotted black !important;
+          outline: 1px dotted black;
         }
       }
+      button[type="submit"] {
+        text-align: left;
+      }
     }
   }
 }

From 99610bc1bde609bae5f3666dee2111ae5cc35894 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 13 Mar 2015 08:32:39 +0100
Subject: [PATCH 1054/2920] Avoid sub-tables when showing comments or downtimes
 in the detail view

fixes #8625
---
 .../Object/DeleteCommentCommandForm.php       | 17 ++++++++----
 .../Object/DeleteDowntimeCommandForm.php      | 17 ++++++++----
 .../scripts/show/components/comments.phtml    | 27 ++++++-------------
 .../scripts/show/components/downtime.phtml    | 27 ++++++-------------
 4 files changed, 40 insertions(+), 48 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
index 6147ed5ff..93b928b86 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
@@ -17,7 +17,7 @@ class DeleteCommentCommandForm extends ObjectsCommandForm
      */
     public function init()
     {
-        $this->setAttrib('class', 'inline link-like');
+        $this->setAttrib('class', 'inline');
     }
 
     /**
@@ -31,12 +31,16 @@ class DeleteCommentCommandForm extends ObjectsCommandForm
                 'hidden',
                 'comment_id',
                 array(
-                    'required' => true
+                    'required'      => true,
+                    'decorators'    => array('ViewHelper')
                 )
             ),
             array(
                 'hidden',
-                'redirect'
+                'redirect',
+                array(
+                    'decorators' => array('ViewHelper')
+                )
             )
         ));
         return $this;
@@ -49,11 +53,14 @@ class DeleteCommentCommandForm extends ObjectsCommandForm
     public function addSubmitButton()
     {
         $this->addElement(
-            'submit',
+            'button',
             'btn_submit',
             array(
                 'ignore'        => true,
-                'label'         => 'X',
+                'escape'        => false,
+                'type'          => 'submit',
+                'class'         => 'link-like',
+                'label'         => $this->getView()->icon('trash'),
                 'title'         => $this->translate('Delete this comment'),
                 'decorators'    => array('ViewHelper')
             )
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
index 2bbd22a4a..d240251cf 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -17,7 +17,7 @@ class DeleteDowntimeCommandForm extends ObjectsCommandForm
      */
     public function init()
     {
-        $this->setAttrib('class', 'inline link-like');
+        $this->setAttrib('class', 'inline');
     }
 
     /**
@@ -31,12 +31,16 @@ class DeleteDowntimeCommandForm extends ObjectsCommandForm
                 'hidden',
                 'downtime_id',
                 array(
-                    'required' => true
+                    'required' => true,
+                    'decorators'    => array('ViewHelper')
                 )
             ),
             array(
                 'hidden',
-                'redirect'
+                'redirect',
+                array(
+                    'decorators' => array('ViewHelper')
+                )
             )
         ));
         return $this;
@@ -49,11 +53,14 @@ class DeleteDowntimeCommandForm extends ObjectsCommandForm
     public function addSubmitButton()
     {
         $this->addElement(
-            'submit',
+            'button',
             'btn_submit',
             array(
                 'ignore'        => true,
-                'label'         => 'X',
+                'escape'        => false,
+                'type'          => 'submit',
+                'class'         => 'link-like',
+                'label'         => $this->getView()->icon('trash'),
                 'title'         => $this->translate('Delete this downtime'),
                 'decorators'    => array('ViewHelper')
             )
diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index 6a5ed4581..5a4d351c0 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -43,26 +43,15 @@ foreach ($object->comments as $comment) {
     ) : $this->escape($comment->comment);
 
     ?>
-
     <tr>
-        <th><?= $this->escape($comment->author) ?> (<?= $this->timeSince($comment->timestamp) ?>)</th>
-        <td>
-            <table>
-                <tr>
-                    <td style="vertical-align: top;" data-base-target="_self">
-                        <?php if (isset($delCommentForm)) { // Form is unset if the current user lacks the respective permission
-                            $delCommentForm = clone $delCommentForm;
-                            $delCommentForm->populate(array('comment_id' => $comment->id));
-                            echo $delCommentForm;
-                        } ?>
-                        (<?= ucfirst($comment->type) ?>):
-                    </td>
-                    <td style="padding-left: .5em;">
-                        <?= nl2br($commentText) ?>
-                    </td>
-                </tr>
-            </table>
+        <th><?= $this->escape($comment->author); ?> (<?= $this->timeSince($comment->timestamp); ?>)</th>
+        <td data-base-target="_self">
+            <?php if (isset($delCommentForm)) { // Form is unset if the current user lacks the respective permission
+                $delCommentForm = clone $delCommentForm;
+                $delCommentForm->populate(array('comment_id' => $comment->id));
+                echo $delCommentForm;
+            } ?>
+            <span class="sr-only">(<?= $this->translate('Comment'); ?>): </span><?= str_replace(array('\r\n', '\n'), '<br>', $commentText); ?>
         </td>
     </tr>
-
 <?php } // endforeach ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 5a8da065d..3804a400b 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -57,26 +57,15 @@ foreach ($object->downtimes as $downtime) {
     }
 
     ?>
-
     <tr>
-        <th><?= $this->escape($downtime->author) ?></th>
-        <td>
-            <table>
-                <tr>
-                    <td style="vertical-align: top;" data-base-target="_self">
-                        <?php if (isset($delDowntimeForm)) { // Form is unset if the current user lacks the respective permission
-                            $delDowntimeForm = clone $delDowntimeForm;
-                            $delDowntimeForm->populate(array('downtime_id' => $downtime->id));
-                            echo $delDowntimeForm;
-                        } ?>
-                        <?= $state ?>
-                    </td>
-                    <td style="padding-left: .5em;">
-                        <?= nl2br($commentText) ?>
-                    </td>
-                </tr>
-            </table>
+        <th><?= $this->escape($downtime->author); ?></th>
+        <td data-base-target="_self">
+            <?php if (isset($delDowntimeForm)) { // Form is unset if the current user lacks the respective permission
+                $delDowntimeForm = clone $delDowntimeForm;
+                $delDowntimeForm->populate(array('downtime_id' => $downtime->id));
+                echo $delDowntimeForm;
+            } ?>
+            <span class="sr-only"><?= $this->translate('Downtime'); ?></span><?= $state; ?><?= str_replace(array('\r\n', '\n'), '<br>', $commentText); ?>
         </td>
     </tr>
-
 <?php } // endforeach ?>

From a3f2d7de7e054088fdff17002e35bf86e41b4dad Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 13 Mar 2015 08:53:08 +0100
Subject: [PATCH 1055/2920] LdapResourceForm: Translate "None" with a context
 as it's ambiguous

---
 application/forms/Config/Resource/LdapResourceForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 13ffcf580..07808b465 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -70,7 +70,7 @@ class LdapResourceForm extends Form
                     . ' none for unencrypted communication'
                 ),
                 'multiOptions'  => array(
-                    'none'                  => $this->translate('None'),
+                    'none'                  => $this->translate('None', 'resource.ldap.encryption'),
                     Connection::STARTTLS    => 'STARTTLS',
                     Connection::LDAPS       => 'LDAPS'
                 )

From 6bf8849d98af937bab7670ff037ebde69025acf5 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 13 Mar 2015 08:52:54 +0100
Subject: [PATCH 1056/2920] doc/search: do not search with less than 3 chars

Please consider this a quickfix to avoid mass results while typing in
the global search field. We need farther improvements here:
* compact mode: e.g. title/first match on one row
* show a hint when less than 3 chars have been provided
* allow two chars once we fixed the above
---
 modules/doc/application/controllers/SearchController.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/doc/application/controllers/SearchController.php b/modules/doc/application/controllers/SearchController.php
index a2e90cd59..f4740f027 100644
--- a/modules/doc/application/controllers/SearchController.php
+++ b/modules/doc/application/controllers/SearchController.php
@@ -25,6 +25,10 @@ class Doc_SearchController extends DocController
             )
         );
         $search->setUrl('doc/icingaweb/chapter');
+        if (strlen($this->params->get('q')) < 3) {
+            $this->view->searches = array();
+            return;
+        }
         $searches = array(
             'Icinga Web 2' => $search
         );

From 697d4aff274913901d822a86f10099248c22980a Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 13 Mar 2015 08:56:37 +0100
Subject: [PATCH 1057/2920] doc/search: do not break on "ill-formed" docs

We got ugly exceptions for non-obvious errors such as missing titles
---
 .../doc/application/controllers/SearchController.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/doc/application/controllers/SearchController.php b/modules/doc/application/controllers/SearchController.php
index f4740f027..5df4ffeb3 100644
--- a/modules/doc/application/controllers/SearchController.php
+++ b/modules/doc/application/controllers/SearchController.php
@@ -36,15 +36,15 @@ class Doc_SearchController extends DocController
             if (($path = $this->getModulePath($module)) !== null) {
                 try {
                     $parser = new DocParser($path);
+                    $search = new DocSearchRenderer(
+                        new DocSearchIterator(
+                            $parser->getDocTree()->getIterator(),
+                            new DocSearch($this->params->get('q'))
+                        )
+                    );
                 } catch (DocException $e) {
                     continue;
                 }
-                $search = new DocSearchRenderer(
-                    new DocSearchIterator(
-                        $parser->getDocTree()->getIterator(),
-                        new DocSearch($this->params->get('q'))
-                    )
-                );
                 $search
                     ->setUrl('doc/module/chapter')
                     ->setUrlParams(array('moduleName' => $module));

From 316d926811cc2218b19d8c403cc493b214cc095e Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 13 Mar 2015 08:58:25 +0100
Subject: [PATCH 1058/2920] Ldap/Query: re-add __toString

We stopped using __toString as it is unable to handle exceptions - and
this makes sense. However, that's IMO not a good reason to completely
drop __toString. Especially when debugging, benchmarking and similar you
often need a quick way to "dump" an object.

In that case you are often not in a mood to figure out whether that
specific class prefers create(), dump(), render() or whatever. We should
not base our view scripts on __toString - at least unless we do not catch
Exceptions in __toString methods, eventually "forwarding" them as triggered
error where needed.
---
 library/Icinga/Protocol/Ldap/Query.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/library/Icinga/Protocol/Ldap/Query.php b/library/Icinga/Protocol/Ldap/Query.php
index 4e25fe9d4..f82a40511 100644
--- a/library/Icinga/Protocol/Ldap/Query.php
+++ b/library/Icinga/Protocol/Ldap/Query.php
@@ -348,6 +348,11 @@ class Query
         }
     }
 
+    public function __toString()
+    {
+        return $this->create();
+    }
+
     /**
      * Descructor
      */

From 560b8a556d60cddd036cf36d1da5f521da7a62d0 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 13 Mar 2015 09:03:46 +0100
Subject: [PATCH 1059/2920] layout-colors.less: replace hardcoded "petrol"

---
 public/css/icinga/layout-colors.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/icinga/layout-colors.less b/public/css/icinga/layout-colors.less
index 74ce55bb0..64642b078 100644
--- a/public/css/icinga/layout-colors.less
+++ b/public/css/icinga/layout-colors.less
@@ -10,7 +10,7 @@
 }
 
 #header {
-  background-color: #049baf;
+  background-color: @colorPetrol;
   color: #ddd;
   color: #d0d0d0;
   border-bottom: solid 1px;

From edf55728cb480f67385e744ce697b44776402a7f Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 13 Mar 2015 09:07:02 +0100
Subject: [PATCH 1060/2920] monitoring/list: fix addcolumns VS addColumns

refs #8641
---
 modules/monitoring/application/controllers/ListController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index b34cab226..41e27ec45 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -686,7 +686,7 @@ class Monitoring_ListController extends Controller
     {
         $columns = preg_split(
             '~,~',
-            $this->params->shift('addcolumns', ''),
+            $this->params->shift('addColumns', ''),
             -1,
             PREG_SPLIT_NO_EMPTY
         );

From 0bc1416b1057faddf1633cea9ad54cbccf2b381e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 13 Mar 2015 11:17:35 +0100
Subject: [PATCH 1061/2920] Use the correct name for malformed LDAP attributes
 automatically

...or more purposefully: Guard lazy users from themselves. I hope I don't
have to explain why _this_ is not part of Icinga\Protocol\Ldap\Query...

resolves #8608
---
 .../Backend/LdapUserBackend.php               | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/Backend/LdapUserBackend.php
index 211f05711..a392fa682 100644
--- a/library/Icinga/Authentication/Backend/LdapUserBackend.php
+++ b/library/Icinga/Authentication/Backend/LdapUserBackend.php
@@ -30,6 +30,18 @@ class LdapUserBackend extends UserBackend
 
     protected $groupOptions;
 
+    /**
+     * Normed attribute names based on known LDAP environments
+     *
+     * @var array
+     */
+    protected $normedAttributes = array(
+        'uid'               => 'uid',
+        'user'              => 'user',
+        'inetorgperson'     => 'inetOrgPerson',
+        'samaccountname'    => 'sAMAccountName'
+    );
+
     public function __construct(
         Connection $conn,
         $userClass,
@@ -40,12 +52,29 @@ class LdapUserBackend extends UserBackend
     ) {
         $this->conn = $conn;
         $this->baseDn = trim($baseDn) ?: $conn->getDN();
-        $this->userClass = $userClass;
-        $this->userNameAttribute = $userNameAttribute;
+        $this->userClass = $this->getNormedAttribute($userClass);
+        $this->userNameAttribute = $this->getNormedAttribute($userNameAttribute);
         $this->customFilter = trim($cutomFilter);
         $this->groupOptions = $groupOptions;
     }
 
+    /**
+     * Return the given attribute name normed to known LDAP enviroments, if possible
+     *
+     * @param   string  $name
+     *
+     * @return  string
+     */
+    protected function getNormedAttribute($name)
+    {
+        $loweredName = strtolower($name);
+        if (array_key_exists($loweredName, $this->normedAttributes)) {
+            return $this->normedAttributes[$loweredName];
+        }
+
+        return $name;
+    }
+
     /**
      * Create a query to select all usernames
      *

From f4e5a7f666f4c30da444e20d570189183da3a3d6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 13 Mar 2015 11:31:24 +0100
Subject: [PATCH 1062/2920] Do not try to set a title on a set of tabs

That's not working anymore since the title related changes were reverted
---
 .../monitoring/application/controllers/TimelineController.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php
index 4abe53c4b..f1ef32592 100644
--- a/modules/monitoring/application/controllers/TimelineController.php
+++ b/modules/monitoring/application/controllers/TimelineController.php
@@ -22,7 +22,7 @@ class Monitoring_TimelineController extends Controller
                 'label' => $this->translate('Timeline'),
                 'url'   => Url::fromRequest()
             )
-        )->activate('timeline')->setTitle($this->translate('Timeline Navigation'));
+        )->activate('timeline');
         $this->view->title = $this->translate('Timeline');
 
         // TODO: filter for hard_states (precedence adjustments necessary!)

From e90200160f08d7cbd01daa58ca360ca61e063a26 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 13 Mar 2015 11:47:49 +0100
Subject: [PATCH 1063/2920] Monitoring permission: Fixing typo in
 configuration.php

refs #8644
---
 modules/monitoring/configuration.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index 78fce4030..05fa86148 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -55,7 +55,7 @@ $this->providePermission(
     'monitoring/command/feature/object',
     $this->translate('Allow processing commands for toggling features on host and service objects')
 );
-$this->providesPermission(
+$this->providePermission(
     'monitoring/command/send-custom-notification',
     $this->translate('Allow sending custom notifications for hosts and services')
 );

From 63f87da53dc7506f281cffe1b16b709154ae7008 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 13 Mar 2015 13:49:45 +0100
Subject: [PATCH 1064/2920] Session: reworked to avoid duplicate notifications

* clear session on initialization, store once on shutdown
* less static method calls
* fixes erraneous cli checks
---
 library/Icinga/Application/Web.php  | 13 ++++++++
 library/Icinga/Web/Notification.php | 47 ++++++++++++++++++++---------
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 0c7ea0ad8..0add09089 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -16,6 +16,7 @@ use Icinga\Authentication\Manager;
 use Icinga\User;
 use Icinga\Util\TimezoneDetect;
 use Icinga\Util\Translator;
+use Icinga\Web\Notification;
 use Icinga\Web\Request;
 use Icinga\Web\Response;
 use Icinga\Web\Session;
@@ -89,6 +90,7 @@ class Web extends ApplicationBootstrap
             ->loadConfig()
             ->setupResourceFactory()
             ->setupSession()
+            ->setupNotifications()
             ->setupUser()
             ->setupTimezone()
             ->setupLogger()
@@ -195,6 +197,17 @@ class Web extends ApplicationBootstrap
         return $this;
     }
 
+    /**
+     * Initialize notifications to remove them immediately from session
+     *
+     * @return $this
+     */
+    private function setupNotifications()
+    {
+        Notification::getInstance();
+        return $this;
+    }
+
     /**
      * Inject dependencies into request
      *
diff --git a/library/Icinga/Web/Notification.php b/library/Icinga/Web/Notification.php
index 1e719c4e7..1dc35e981 100644
--- a/library/Icinga/Web/Notification.php
+++ b/library/Icinga/Web/Notification.php
@@ -18,8 +18,13 @@ use Icinga\Web\Session;
 class Notification
 {
     protected static $instance;
+
     protected $isCli = false;
 
+    protected $session;
+
+    protected $messages = array();
+
     public static function info($msg)
     {
         self::getInstance()->addMessage($msg, 'info');
@@ -74,8 +79,7 @@ class Notification
             return;
         }
 
-        $messages = & Session::getSession()->getByRef('messages');
-        $messages[] = (object) array(
+        $this->messages[] = (object) array(
             'type'    => $type,
             'message' => $message,
         );
@@ -83,30 +87,30 @@ class Notification
 
     public function hasMessages()
     {
-        $session = Session::getSession();
-        return false === empty($session->messages);
+        return false === empty($this->messages);
     }
 
     public function getMessages()
     {
-        $session = Session::getSession();
-        $messages = $session->messages;
-        if (false === empty($messages)) {
-            $session->messages = array();
-        }
-
+        $messages = $this->messages;
+        $this->messages = array();
         return $messages;
     }
 
     final private function __construct()
     {
-        $session = Session::getSession();
-        if (!is_array($session->get('messages'))) {
-            $session->messages = array();
+        if (Platform::isCli()) {
+            $this->isCli = true;
+            return;
         }
 
-        if (Platform::isCli()) {
-            $this->is_cli = true;
+        $this->session = Session::getSession();
+
+        $stored = $this->session->get('messages');
+        if (is_array($stored)) {
+            $this->messages = $stored;
+            $this->session->set('messages', array());
+            $this->session->write();
         }
     }
 
@@ -117,4 +121,17 @@ class Notification
         }
         return self::$instance;
     }
+
+    final public function __destruct()
+    {
+        if ($this->isCli) {
+            return;
+        }
+        if ($this->session->get('messages') !== $this->messages) {
+            $this->session->set('messages', $this->messages);
+        }
+        $this->session->write();
+
+        unset($this->session);
+    }
 }

From 44b1255bbce77687ce4b81b0025607b3c6e725a7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 13 Mar 2015 14:13:02 +0100
Subject: [PATCH 1065/2920] Do not open a new column when removing an
 acknowledgement

---
 .../views/scripts/show/components/acknowledgement.phtml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index 7c50a4882..e7b79354d 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -10,7 +10,7 @@ if (in_array((int) $object->state, array(0, 99))) {
 if ($object->acknowledged): ?>
     <tr>
         <th><?= $this->translate('Acknowledged') ?></th>
-        <td>
+        <td data-base-target="_self">
             <?php if (isset($removeAckForm)) { // Form is unset if the current user lacks the respective permission
                 echo $removeAckForm;
             } else {

From d6e5afa6d5647d7fb6f3e6e34656e1a77c38d211 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 13 Mar 2015 15:01:47 +0100
Subject: [PATCH 1066/2920] Fix that a menu section is not expanded in a popup
 when hovered

fixes #8695
---
 public/js/icinga/behavior/navigation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/icinga/behavior/navigation.js b/public/js/icinga/behavior/navigation.js
index 7a5cf8788..0d3300944 100644
--- a/public/js/icinga/behavior/navigation.js
+++ b/public/js/icinga/behavior/navigation.js
@@ -14,7 +14,7 @@
         this.on('click', '#menu tr[href]', this.linkClicked, this);
         this.on('mouseenter', 'li.dropdown', this.dropdownHover, this);
         this.on('mouseleave', 'li.dropdown', this.dropdownLeave, this);
-        this.on('mouseenter', '#menu > ul > li', this.menuTitleHovered, this);
+        this.on('mouseenter', '#menu > nav > ul > li', this.menuTitleHovered, this);
         this.on('mouseleave', '#sidebar', this.leaveSidebar, this);
         this.on('rendered', this.onRendered);
     };

From 499b9b149a0e198f7ee286fc9ae7199db882002c Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 13 Mar 2015 16:06:19 +0100
Subject: [PATCH 1067/2920] details - notifications: shorter link text

---
 .../views/scripts/show/components/notifications.phtml     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/notifications.phtml b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
index 1f2ddfe33..6b24d322d 100644
--- a/modules/monitoring/application/views/scripts/show/components/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
@@ -15,7 +15,7 @@
       }
       ?>
       <?= $this->qlink(
-          $this->translate('Send Custom Notification'),
+          $this->translate('Send notification'),
           $ackLink,
           null,
           array(
@@ -26,7 +26,7 @@
                   . ' object to contacts.'
               )
           )
-      ); ?>
+      ) ?><br />
       <?php } ?>
 <?php
 // We are not interested in notifications for OK or pending objects
@@ -47,7 +47,7 @@ if (! in_array((int) $object->state, array(0, 99))) {
                 $this->timeSince($object->last_notification)
             );
         }
-        echo '- ' . $msg;
+        echo $msg;
     } else {
         echo '('
             . $this->translate('No notification has been sent for this issue')
@@ -56,4 +56,4 @@ if (! in_array((int) $object->state, array(0, 99))) {
 }
 ?>
   </td>
-</tr>
\ No newline at end of file
+</tr>

From d82b73a2fed0d086a7f2fa3a1ebf322dc65b23c2 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 13 Mar 2015 16:07:20 +0100
Subject: [PATCH 1068/2920] details - notifications: show a bell

---
 .../views/scripts/show/components/notifications.phtml           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/notifications.phtml b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
index 6b24d322d..af57eb934 100644
--- a/modules/monitoring/application/views/scripts/show/components/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
@@ -19,7 +19,7 @@
           $ackLink,
           null,
           array(
-              'icon'              => 'comment',
+              'icon'              => 'bell',
               'data-base-target'  => '_self',
               'title'             => $this->translate(
                   'Send a custom notification, share information about the'

From 2c5c7950577cb60247a6230004b63660756a0cca Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 13 Mar 2015 16:55:01 +0100
Subject: [PATCH 1069/2920] locale/de_DE: a few strings for detail view

---
 .../locale/de_DE/LC_MESSAGES/monitoring.mo    |  Bin 33663 -> 11177 bytes
 .../locale/de_DE/LC_MESSAGES/monitoring.po    | 4876 +++++++++++++----
 2 files changed, 3926 insertions(+), 950 deletions(-)

diff --git a/modules/monitoring/application/locale/de_DE/LC_MESSAGES/monitoring.mo b/modules/monitoring/application/locale/de_DE/LC_MESSAGES/monitoring.mo
index 96f79202619eba3272c65c527b898a1340f47f10..3be118e1c067c64eab9c6fada01475d187cc0e0c 100644
GIT binary patch
literal 11177
zcmbuEe~=u-b;lcw`EfY@!H;0DfrcO?;oIW`5)lF!PP&tH=yZ2Tcap8xz})WK?r^)a
z>zUa*oru9UcCZaLBm@&M*ci)!l);Jrz(pt}aU#2lB&Jf8A}LaFL6UM+65>=URn8Aw
zNu1BOr)PIhcLz#k>fU~)dwRNGzkdC?d+yb<PI<_1eFJ$vGW>R9UW4^Mez^YO=ZrZQ
z{v$jO{tUhsp7%~;E`WoOKeL;k_rQZt_0-`-@N@8D_%yr(z6j5Nufuo1pTPIQlip>_
zh44anHoOk1z6p3f3}8RJ1M0n};i>RBcp5wkPlw<0>6d)^FFap`gFOFxcqV-ByK`O!
zRo@`wk=Y9QGkf@<tL7Fced|#5&qI~J3(7?I!E@llQ01S2D*pnMUf=Wl0aX1jL)qa+
za05J*POgWWq3kpR)y}7&>buvcAMtz=@@Kxu&nfWtpvLEq;1GPp=U;GEUeCo)`mTeR
z+H8U}ZHA%roQ4d!xfQD25K7M&s{K2m?0g@T-5!MM*H@w5dkU)FXQAFd3RVC2eflpU
zDw)@y-v3vq`u-d8XHH?TRo{6~?OhCI*AkSUZT9J#q1yY1=M3CTx&~ADHTWPrm%*sP
z-+~o*7RFJ#3sCjm4b}b^q1t^2@~U~<KmRt=I2`r-q33_W%gBHK&l|G_4#7)d70TZ~
z5BuR$P~~2RD)$CdeHSx%WY-&@>@xv1F1JDTy8%yzcR-EHoj(0pC_V4>`42+b`Ek$R
z^!#lo`#cXd9={LO&P$%Jdj1P^Qyb&T{%1n9e-Tu@{ZM*sf-1KSYW()VYv8Ru{Us>9
zo`!1YccAL|L#X-uXFmN;Q1!k6RsLiqv+C`Gs`p%|@mLEnl^O8q5&wJ)s=iy`FTle-
z{S~Nq@dDI*dIiePKlRTqAULVrYoOY_0m=_{LfLsA)OhTNvcoJ?xkadQpM)y+1*mcl
zK-uL9sB+JGJ_nyYiFpVyt(n6aP{G^{m3|z`Kc3@9{rz*Oc=01BKY0UQ4lklJYvBk~
zJZM1a|1gw3Pe8@fXP||D3RTaKq4YnAhg4<Gf!D$fQ2Ne6+4m5X-giOOdk>VKJ>b)i
zdVU?=K>jljmp4C#YX4-6t8sfLRK4dz`Pt=A<Gu;1zU@%;?|~|}AId+<Q1-}t{(VsI
zJp!fQQ&8`J3u-<-4@>X|a2xz7+yJ-Qe4aI-^mz<QkEfv8{f_4!K-uL*cnbV$NEPO9
z;3SmODF0@t_x3~Sb1T$%H=xGr<4}6t52fcL(D?yW{m=UJccJuo3F^I9px%2Oz775a
zO3(j<YVWj5bGy77Dt!sm^DCg*zZUBKQOMLW`=H9zq4aD+jmzDTAu{*-^tYhmzzb00
z{av^fz6e|JR3_2GZ~-d)E}SrepMa|Gb*TFP9qRp42x8(ppvL7KDE-#KE8%9SajE(A
zqws^I|HSi*%Z<5;^e)&B?||~pr=jA>-@#4r{Iz*~6Occ17eDfwr#zpBviBduli?4c
z?ERWgzYb3${m)Q#`!}fPKZCMc-?}_~Hheqji=ga%8B{x0dk%X}L)9}26_;92{l5pE
z4!;cL2S=dV`8Je)AB6|t%Rb$|KG$m)s+}<?`+XE*BGZ7<<3V^jd=kq3--H^E--T-T
z`%wM+E2w$-xA0W>A5d}Nf1u*d*;g<&umq*geu&GN7-9<Z0L0|xd1&Elun(FK<o!Jp
zs$b_q+4)ka_SZn!;aYeGoP_GnL8x+bP<|Ri`Tspo`aa_MHFy$f>3#&!^~D^nef52}
zPk$N8HoD|nvQHC<5Ul~9K;%=prjQ$vuOoBFuOPP|i-@j=a=2eYwD~Y1`)JO{Zn`j?
z`7}~hf(upM^)}DrvD0U0oaNKH9zcHC-LV&e^6?Ontv4b8B0oQbT!P5P@@HLl<#50E
z^Q$=CMr7Xv*@Juxc^qjVz1PP{Fjb93W)WStBbtMEA{rB28VmWyv=Usul*4=m{syuc
z8AHB`q=?3J2eKB?xGQ$bpB_e9$gRkO$Y+szkw+0-pG2NOK9A`79C96!A={9TBDW!$
z0|${Sk*^>hLOy~#hFp)_f$T-DM#hnQkO~qbz1K}7ejU-ADXug9&841O-~uv($aj0M
z5fXPJgUF{4`MRzvkbOuUQJktFPa?mF=o&_DK<-0MMRZ-5!^IbWYre$I%|7v~u#Ai%
zhmrk=u1Tci?%4l${+j3eJip*6>_SdKzM+J_9)Vktd7s`6--8Sx6Uwv0&4t+RYNlCg
z*X;`8N<FNsUz$4|*Oun*3zPY%94>#M`=Ixo$uO=&aW!wm*dkdJHg-Br!k}CWX6oT`
zO;&i=TY2x}qQ>5ito(dQ4Xr}6>6R_3F!n%@#L~LR>8*76vz`jqRBX+evm(njW4k6b
zoxJ8;HzzI3*pBDop0cTpn^{y2vZxuSwie8Xb|wsCn}%^_XPb%5YEf#VG;N1wO-gn?
z8e7Z;`{6K1%vBDlx!Ue&##t>j8|h#>5q-wy;%2C)DOyTbZHP|TpxQJ;<vE*#jplq<
z(LHM8FV(R3e#wIdI`=+QIwd2E=+*XGSe{GGwxk(U%0Zf$?R!V3Mz;@*8TZ8QL+f(r
z6H`&6xD5}5<+iM2vu<WR$ile1=u4xR+1_k4a9l^Jp|ng`3F~2o{zZC$ewTxG8dmJg
zq7AIZO%)HUT4J^yv|4fw4YXxM{1~kIMr?zwv82RtCGmeWa?QsUO_I*@6eZ#;C}-8A
z*=}`G+$52lq;9silSJLpM3&mA8J;*WZib`OO{j5vX}0jDPOdzxlk1!+uxTqSE7Mt3
zZW`ED(yS&yqqGoJaKa#ssGMfpkF$Nzs2#!3oy5K@NV0CSaG2tGYDOACR5!e1r!<1x
z(ECcK10(b5P#%pE<5IkHs1+rlf5F|SW=C|0f!x7x*kQ&Lw`#^NsnO}&*feXlTCQMt
zC?d-6B)_r4?ZnM9v!jWt<sO;eSIn*;sqiWzV+l@i70d35s47`BikEgWX;N2%T&3u9
z7Us9T#<i_5iJDYK89#)&)k~U^qqEHB@ObaAX|36=S8V9I*-!IKlziGZTk7M0UR-Rp
zv6*JDT?nvOu*}Qc>@J4cW=*Dd9z~k%Oi9;ti$QKBk?UseYH7c1$E&xQGJndvuPBtO
z({D%17(B2GQN1p2!jys6Iti=Tu^y%rp0zX0tY#N#0k1RgPJxt`Ds94uf1z0}V;Oo=
zp<sxLiDsC3=~UtgUJ%A|?n=iFE9l$rYA^dq?=%bAS+l`-Gi~aNGKLQYu4Eh@@>==M
z(7hyN{1c{Tr=bNmF!g9ISH7qoW8&pO6x$HrmEr`a6$aMT>B8sAqZ->{l9(|fV%}vl
z7FJn9&7LT3XLun|Ji-kXfOZf#+GuIUrM)wd8E<wMEqYt7si2gZjp|vL=($%rwW~gN
zF=y51487)o4d$80F3fb+rRL1-c!wG(3dthuE>>x(rpc4fj5jN?>ibJ3+nX(6QmMD_
zsx|sx{uW9V%kFAQr|ohLJ3BklG}E)Y0#uaIiN8w{shQYqCT3FRi$d7MoSBI6(_qoD
zp#|ODErenIXi-c4#Jn~E;eweAs*Lbtz}wvgb}~#D9@avp<#3P%rZ;0Wo^3A4sQ3~D
zdsfs;&-|_RE2f#Ox2w4NL_2G>DNw{gZrBy3)>XMTEGD+uhx6JcJ$5<eHcr%7GA089
zdEpfvrNy(}F{HHH{1oiQWdFd2<s#MlZV{RNGasCNDmD9>NydU~+*+2eI_`GKLgjKO
zOGuepv^^Ulx9{1vhy@#Fiq%^o$96_(ipf~l^lmb?F5XeA-(l%lD`3%OJxlCu-h<Y%
z-y_0&tj!WwF;fb?6K<ldO|4%o{nF%~6=A8;4Bc+huOtKco5j<7c_A)qk7|j@YtrLN
z&<rM%rMwF)f4<}yF})tep_v}vJ+4j2^!VP9q3yedwvCOL=}FVsCEI)r?4~<rpU(Hf
z6z!Y|%yi34r=jiL0FX{P?s#Bm@A&BWPUE-ba!AFX(rBf$Uz#`LE!yxFF>_B-%Z*)k
z)xhAu;GIFeRSPz*@7o);81d4cv>H`P+uGH%G}YX~0x^GM<kq%<W>W2&oR}(Y*Jh16
zOH8G3i@j=a!=}>U)ujzr+YQ%j8QlDV!3~3h6fErx=OeYfV!4gJoPvC5DhcA0{cAJX
zVy9}XP^sM+)@SYYnM>SQB{2|(*$4Z^*oL&3;!^C^;gL?dG!+JoEp}{ZeCPDg&Jlb4
z*w~HrNGgA@Z_ntSk**y!3=H;ZN6E}CO)a*lDP!fhvQ=m8x{d`TNYXIdIz6?cw7FYO
z`pt$(X(TQ;b(Gs;H_t>_A7LN~>Ls>LjdY8RTP~Syz3Muf-)>zO+e^0E4ePJ#`%r0T
z7>De&)W^wYScx*bVPMn1#y+<*O5L(&*Uhlr9y^jn)olHe{C2$BlivKoiF{?#OJ160
z1J_E99i3%6S9o7Hr+C$jN99^(L$=i1%xJ6O3NKY{)j~`4Twbhb=B=vhmRnk5t_w4%
zQ=ofalKZ#mWxTX@U$pn}(n{AXIj{!pS>izV#5%FtcC*s%k##1V3u5g$efiXGV^dbH
zB{E=C%@tW_Cl&OWJ$5v)l_+FYD<ZUI#Y)-ZWromG^hQV6n}V8-utJz0VYRQ`X!m7p
zP6=^-h*g$5#Oh{*h_kHm729;`*m<^-G|GOSbt%luw!-PqnT=(Jr?c#Ja%r=3-;+(@
zZoccS8Jb)9Si4)t+I`!1<!95<&F!$x8DyxPVwYONyXoOD;(V%IeyKOR612m_=a13V
z_^`Pt%nlQf<;YI4*|1hOyYo#h8-dOp-K!t_4oh&>lb83u!l}AuLs_lZY~t`NRrNaO
z(ryjMmu4Jw?v>H<FGjXmAqsn+IH4+R$CA$0t2R2%k|YHiyuhCKFwLx>VTiKqujV*d
zwWU{)BwvSPI<Fyd*6#GwpN?1X)k;WB5xXc((`L9QAsvo)Z0x`pz^w!60)v;ko3rT*
z?i4i|gqedpNL$PjJ|)P~?q}JtIqYQ95ZkJ5v92=~<HRYrw8tNv<uffl9myx1BX@_B
zV%l@(pY1q66U?eHAB;l7dN|AB$2na7vT}|cVd!<3c1PyYNHQ133MHKrbmzu>Akw7C
zPtalA->{wzcb%2NI=sL-fgwk@%V!72X>7udDQl;tW1q&0<oXoZ<#sMnet0hV-K0<D
z#oby^I(`^jCz7DuaE}Wg$YXmEEru0z?1Vcs+wS=G+XZ^4kc7?sk|U2KD9JqdciODi
z%>h@aZRgy;_LfX%j`In7n8P^l-5%l&^+-|JJEtnk=ZwyvY1U7<jwX3j^a>9623OLV
zGk%m*`U}fu#fe**#ny!m4(-8A?bwmH8qpJW);wc{tMhGuB61fQi&7PWHW8qLXL>_8
zeTolqHg;>E%d?z9IQ-^@=+&#+he9*yN7oYi?Y^@G3C<F+zdv@QT+>m)j)&~{@dA{K
z3;l~DIg_;;vY0NtZFQ_wsJpZk*BQ-FT5s4f7xidOg?fh!ZO}pobG{rzj9)&+qrFFN
z1y^2k=JcoT&>y?wo?~~Zd+hd|E8aPX7fAJn-Qf<~)~|rM2NmlaJ)O;0vo|l_v1EAS
zZ@7SX!sYWbx<V!P=*Ec?ZSMd1y5_2%w<p?Sz60vmZ^sHdi+tTG=IqkYO*4MgU)l1V
zslM#B6B;l-!2icSEq9AyoUj@$96K6o1rLi*!ZD6m$qJR_bJXuv<=FYInWbQ<;>$9K
zw|rnw&~MhYNz)gG5zg{cLDi9SQjq0assl~D!ezQW*|EoFbePhP;;p_i@Cku-dcHE0
zj{nNgDUqKmdp<Js1`zF$s)74X$HvipbV!TO4WVuhcRn`|TR3$D1jA)r_Tg9gZYxm<
zXQNm~Tw&LkN9q$Ps`%l;`l{{uVJ-IR-IdKhC>>Ndj4R73=!EJD`{lwpifW2=uA9%X
zRht&8kvBu}EN8@gL&<ic$>yVHpT|F2+!ljPVLhBlSf*@mh%}uq7VLx+6Kv0*6Ot|e
zI3Yl45^++j`JFVIrNmCI_{l;iDLy?Bit9K|XQeOB0{Vn8$G317?Rysvt;23plKZ(|
z4^}P_G%UM$7B+poSXLAB#jj_*A1YQX)>}YZH&zK248CD(8`(WHK0d|W$lkppquY0F
z8`_(H&gjm(?xC_buQNzGi@NjDvIC~RZfH6#*_B!6sm_(1%gz-`s?oQOY5%Q5)AxS?
DolW62

literal 33663
zcmds<d7Pb9nde`SMMBuOu*n-FkdWLW2?0VtppvRAB&ozy#Yk}BR^7L%E_LhP;=cE$
zl2Tk-2T@0D$6Xu5IHHc&xG>$*v87GhiVBX(w6wM@+9KHQ%P7lqJKx_~-sRT4Rh6Fk
zXXbu#>i3>~d!FY!=Q-!(pH4pF9Ra@=9~K1XfJYn~1mEKOXQwGN2v(mP1p2%ZJOkVY
zE&xZsUxKd!j|V5769gxLuLM=j+d%#W_weUD@Ii1P_;c`V@B{+M8Y~5m12=&ug1f*|
z!BLQ=1h;}`f^Ps-?}tFubHL$4F8onY?RyGT{*ywB7lLa4Rp2u4`QUu;72wg}8^Pt^
z+rhKIzXjE<?}MuUUmYGp<4?hV8n^~r0;-%6cmj9}sC=&mF9z=b)t|3`M}gl3)z2S-
zD)(35Jn(;k>d(>V2f+p4nV{N#4R|ux4;}*!gU<#hK-Ig?;p-i~9aMRDg3AAKQ1#sp
zD*r>y{|Kml{}{Xs`~|oQyx_TZ9Bu$t;J+Qb96SIj-EW<L35}HhCQ#$>PUrsysB(^8
zWb<DQYFw+}^T0d6tHJMq>%g-v41%@bOTYs7K~U}bI;ipdHb~Qg$3ccDn0JvacNw?@
z|4TroI=BtgxZDk@zxO)-=N*0-RC(V3HO@Z(Ro-vGN5Rt;L-XM8L5=q_pyv5_Dp9`k
zLG@!LC^{N)xDOP)yv6xH28urK2Q@zb0Mhi}1c;#vyc}E#Mxesq=KOyFUW)%mU^lpc
zL`uIKBq(?TcnSC!@LKRkp!$0O#4LI%fNK9{P~qFb`QQzp_;MK3xHLhgFnBGfc7FsE
zeSQH{Io|@00e=l12|fdgjt*mTgr|ez!==vO3yR-%gPQj`$kYZO0r?j^=={%s>c>Jl
zCENn81SdhI`xwYj1&@II3l68V*MKWP^=AS+0o(`Hz&C(X;8WmnV1vmy9()a``FR_7
z6!;NP{k#WM{~iF31s?~G27e1`Jf8tYk5@tT>h~+b`QYoo6Tm+ORsLNL?*&iCe?O@9
zeH%OxeAM}W4W5MmX;Ager?YC$0#M_39w_;EC5R{tUI3m9HbJ%PHc<U~D>x7QGf;H(
zQBdRk1sDDuQ0;xp;ZMQU_<s$?;KdNtuEWR=z8(MXnWRzhc8IeA{ucZtcoR%s0=Hjb
z+xuBi_5KZbGWa!z-v`x?-+&s|r$F`pR4P@!&IQ%}E5K90YeD7j2UXrMD1N=g;oBVE
z3x<S$14M)bzj1iRm6o2a1|<guL5<t%Ku9yV3sm~AgQC0Nfhzy3HFn<CfSQ-<LAC2f
zQ1dzjD*c4RcY+%41EA>VE1>A_QBZR0ysIq#y%-dIz8O3mJOGMcJ`bJ+J^+f&e&pg0
zN7$*}BSED*4%B#^;V^W#1k^mP1eJa@D0;gNya?O|LZZPW2+0R`gX-5K4u9hCX;9;Q
zEREK<pAM?OOF-3ox$|EOF2KJ96dgyP>U%jTdVeFR{O<!rpZB=<2SG?F_(vChB7>y%
zTmq`zmx5~7&7kD#%bfoMp!oY9Q2l!Z)ObA#J_mdTH1h^Cif`69+yed(|4Tr%xBEI9
zzZ+CJ6;SmxK+WIlz_Y=(JO3vgehyUszY40q4}*|?@KaFZyAYwP_H6=bN)Ur8=TqQ$
z;6tG5`vs`>{vK3+Pg`rpD+CwfUk<AMJ3#SC2~>S!;JM&yzzyJ?pvL<NFa-Yqs=fsX
zA>~^Is+_Ap@zGXL@kQ|U;H}_u!6SNX_+s!I_<O*sz|(ul1MUFVA4YxP6#mE82f=5-
zK^pM|aKT2~uJ3|s|5Kp)d-f(<?p0tv{#_tN2OkGt0R9Tx25z|C^8LHObMW5_YMdVe
zMR(r@HEurwB?o^79u7VUs-9;+(c9UZExj!TmHrw~>DPlwzXMddouJB%K&7iYoB~B3
zuK_hK?*oqoKM!jBz6xsmzYl8M{}oiZ^S4+$0em6jbTW7b;bRQmnc!<d`9A<Yi}=ri
znwP)qv+Lnk!3*#|3SI~v$)H>WE(4c<1EA>T6<`Q{06Y%-Yf$a_8mM|61&;-v2E`Xg
zZMWmU5R^Q69;kZzLG?2NmG2eK|87w0^Sv(o??6Oh@F=M9I_vpX{#*oJi+=^EcHIJM
z-rowUo=<^l$Cp91?_qE)_yjl)T)M-ScR46}TnAnZz7*8B-VRERy$4i3?*LWqC%_ZH
zgP_{^EpQq51gP;n4I(=UEP%&=*Mg#>O`yuz0jm6)K=r2vo(R4iRQ@-+@DGDZ|0(Cc
z9~3`52wnj`3|<D#AFz7IT5vi33Gj08gWxLg5$8W{r}g)Muw1YYM8pQ41J{60gDb(y
zU<#Ep3QB&w$KfL&q!yg9i@tzE;C0|9K=tz%;3?pfpvH0j3vIiu05$FrxB|Qz)OdXd
z)I1!0gB_2PL5<TwhZlpV;=dF;8QchVfj5HBg??`bkHCM=ZaaUU2E`X&2Q~gb2d@PG
z2%ZIAd85SvQ1e{_#kX$+mG9%=7VrV^GVt^lS^C-nUV{HkpxS)^ycGNisQ#S$Vss5~
z8z}#spwfNQ;U7WCn`JMt^mq$+F8*6Vwf}vf`h6#;`Ti&<`ueZneDF)4%6r)1VK24)
z>jDdeUk7UZtDxv(FSr1FC3pt-ZtzU-&q3Au74U5E3GjK~5jWZL*Mf`j*PQ>|p!)Mg
zQ1$!)TmmjCTK_h15&m02g?|WK4L%5}-A4`Dc{>H%hyOzGHt<eR@k@p*UJjm)e;p`#
z*bS<k5g3B61vQ`hLG|-K5E2XS2bqFkK?!*VHbIrU57hX*9u%Lw)8U6f(bH!@jrRkf
z`0ks||IeV({|r?AXF%0=Y-GplH1Ik2SAge(+d++U463|0fttT}fRZ~O0+s%gpyuHr
z7ye`LNc_J6CHJ2MH4nisybD|dHVz{n_%8exjN0%6;3WP+nevGLFv!2)b2r=iE*i7-
zUkYkGyTNn77lNv%>HN2XYUg{w5WL&PKLCn<zX6Kh9s@NFPlA_#&#qW{SPja5GblOn
zUho?5s}ARlTmL3d^5iyf8TePA`0)wwa`61B<+B?=mG>4<>&@pu&CBE9ap05Ae^kxZ
zcLrD>d?ToK?g2FqZvd|c?*cc1KL=Ic<qYZ--~@O$csD3I`#5+Scps?zUvu$~ff}zT
zK+XTJK&5{g)I1+~i}fE5Y97x7j{?sFj|VRVF9a_GHLouMuLj=>o(O*1;S&y@0#(nv
zx}CRELG^1XsQRt}=YtzS&F289`Mm|yeBB0$uHO%;Klg&-pD(%i$G|oCpK{@=Vk?h!
zfa=$~K(*^GFa$phie4WEF93fAD&0v9OV8&xyb3&z@ZI1E;FQDL!K0zi_ktG_epl0$
z_aLZoeGF86KL?fX-@rxS@q6s}t#Y^yRR4E?r-3(uJ>V_iQt&=dbnruPGk7A*A-;SO
zxDb3LDEj#zDEa?M@L2FG;3?qWgG&D|&VSrq+rEXM>RSS;UDtw$${+&I0KW*TU*7{Y
zKF>zDY5oh~so*N`bZ`@RCU_J0R&WYj3?4gW%UK0}5C0Z$J9zQS(AB_~fv;lx9tYot
zfAm&tYTyyCu;Y5zD{cRdd6ngtrJ(4o9}K}M@P**}K+)gtz}?`=SEGZ1Zw5sl4}%NA
z-+-FmQ(t4p|2$Ci*aeF2R)dFwy`cKL5!CpNgX-t2L8X5;sCm5$JRJNqxB$ElJPG_d
zsQLea!=Hd><Nr1IT=2Np+WJ?3%6A>8d^dn<#~64xxEFjD_%iS?@Lc|!iYxJbI{05e
z{Z?8Cc7W1%^?RPfU3|X?cOC9yIE{yBQS<(L+}m-hNP9b|pT-d~4L*Vs?PY(OqgA*&
zaIeB$NIvaTHoLks_ZRc6vAGj>KTZvQHtt(|?!-+fjGyS(|1Kh4<LrM6@V~)%z68Dq
z|M9pDIQ{O$-GCE~{|)X*+!eU5;{GE}G^F1oZp?h8e|lUQT`p*A8WsG6@3U~?rL`{I
zXZY^p`;Xwyahv#l5PT!<&vE)4PMGLJJoE?LS8#uZJBskFxL&@0iPLYHh2Uw2ml408
z?>FNv!Y#+0Ntpj#!pGG(Si#W5UxA`|{Y1+j#BIWDz+LC^9SeR9|C@07_2WO!ewx1@
z=kE(}58)7%#&#)wh3$gB!|AsXS8(NB?@-|<^Zg<4+DzCLd>@A^6TTDt58(T8&*A$E
z;1=-jLH(BU9fBXg-Ge(1|BJyDxFh&p1O7Aaxj6kUAWXk!aBneR_Rmf3dkFlx`#v7L
z4ELwFce=38g9mZFlyi&=JCg4s_}&iA!~NEU3)bPTBFz7;bsvvAJcYRD<G$?^fb((v
zxNW#`oPO`Y-Ha38KZP40&!xDHxR>L90r;2T>u{&>-Hp>4@KW5naQgi>+&|!^<l%?-
z2&%X<<l*;f3(4Q_^EHaA;I7A=O_{F;C97BC-i_1mZVTq`f9CIv8Nc=${`XDy@itIr
zOg{q$acA*;IoOp+i`VFY!U(sLxETDOxWC5fcO~w8+-q_BaQ}#te)kJdzXiAz_+JJ#
z6u|GjxW6@D@E37^!uL8*zlU*O#%;$PL)c#MFz`_@1b+wW*Mqy*eAz#L0sJfOe9~O%
z!biYcak~kVP2oo_T(AWHa-4pjvtaBtkMR8~oOFO6fZua*vfb*p8}|;}cjV!BIpP0g
zKXZRSg>P*xggp`dt8leU_<Zs&!T)0yc7v<u1n@U5?APEz_x%94n7C&-{~qwWxW}A-
z3wR;!lem}Qc93=(?z4Q~2%dvGiSOHRcj1o4okW;^pT=Fu_tnmSAO16O{{wdpPQL@V
zkK(S8hu<*n6S(!b6Up}kcnj{|aL>mrBdiGa;r=`B!?+`H`d#Dd8Q}XU+$H!g01LSP
zgwyYbxS!(w1-Fp+lfl(4-xv8_<GzEir#4v)H`d}t94_8itd=TKX-PhGXLU3m-XGQX
zl!u~RhE2oazFIS!tkuWD$#P>ftTjfXdRQ!tm#gKtQ7<-X_1GjCFYXJ6%hgg?ZiLM^
z8g5p?MlFm-i}ffhSBGo$@nWM~tA@qFTC))r!%^B6*6LwwYYiKt#YR|;!_nfNa&;t}
zsMiK7(Rdt|hr{t2We{HtYt<;M*(RyJ!N{~s=_$F~=nA(M$D%N9l3vY@stq+Z9ITh4
z;jk3NL-q26X$6H$szRkw3rjT$=?cQ_QMIJv%*dr)KQuwOvs#aeL!(6+H+^{9L}o`h
z8|_QX&QAOIYze!H^{SfJF8B1fOwL6m*V>+KyZVB}x4pNoXH(yXG+<}nj^6Hd8@tzT
z>CFUg*SChLT5E(uqtVb<gr8ZgRD8@tF^<c7qRKuWuL#X?9G1$lhO3l@3|ER16ZAtN
zOnLiKiD+A>Bba=-Nnp0<rl)XEWO1;_)K(rcv}lMef{LOlDXNVSDuvFdxE#mLNQr&9
zYl2k_V6z?v-D<8Y0Ah_hW)I0;9H|A}LqpL-!}rC~y%|Hw%161%><B7$EUZW4wLJ_S
z-__bAgE$gpzr*d8O>$w(O3FU)1sqF1D$!7bS+i4;@|~&17oDqToDs>ED}TPj(_&3)
zi<LB0J-VeC#njuHRMj@17YE@w5fy=@QaDr_w^h@P-aS-GFrT*JQPq-?Lj2s2qdHt3
zf$2*U17-r1+GI--B{`doQM$kQ24*wtD~?A?g0=Npu{2a9$GRPx1~#qh-V&Jhgxi{p
zi6)_HT(~2On-%ZrC-+d~Vg}0N{xjMe4K<B~X{3RbVk4>!?Q^LaY`)5sQn+pKW+o*L
z*3n}`vBz}yM3l?Iq8TYi6-Z&aj^InU%H^J0E<Xw#G8wu|s;DC{N25|xygO5d_)v00
zno=68C5feDuHEU7ZI=E>8X)%@471jrxmMO8+borh*Q#ZfL&;}WFBVeQJBG1QtT&Jw
zOuU`y*2$7c8BV0qT$|ZG*DS594aT%gjht&W({s#Hg%jJBVi95Dn{=j&M(A}WshM-v
z(JbN_GDmfzYE*~dkYc0gXW~%$J28hcW*dR*{KumxJSFroGy71#M<}xbZCd6MSIi(k
zML0?_$%->n)DVP&`%rCEu0%~&QfO-mzarX|CzbpibD*Q8tBopcNr?ial|<E7rRvp_
zc!{!V19>%4uQewUA0PFy*33%s;U)XJX1%U%NnKSpNZO1WwQ;k^dXC6*OS=?W)lo1j
zs2{_%N~Jbw7QK2j(ySEg`LZgtk@654X}D<!q9}HuOKE8oftZz}W)(!k9FP)pr1dk)
zYSL>Fz(!+0mtDrRjTGyMGZ-GdQr!^IH|k|0b>d~HnvqeP8GH)L6^4$0UggMXSr|2j
zx&ou4^+Xjk+`f!p2&M<c3WJ1_@$>#-C>BRY_4EO^qrIyu<q}%Cb_ZzUEWkZhI}7c4
z9GbO`VqK_NfJ3{1s3)Q8o&FZ~c+r|fWgDCpvpvI7J+NhxJioRj`j?h(s7srPR0m^V
zT&p_ds+sk)Q!?bg5eFmn;&@@QTte|H#^pFoo?Bv^F31LBw8k*T`_N*>XHJXW*xG`G
z_tG^e>Ej&I&f4TGS;nTxO#DPNq{YM%VuvD<q0E=iA$8jCbS;=QX-<waG_wuATQkLo
zaM3g&JX`)!&{Gp<jj8}c>_bM$vcn81N&tH?lYE4|=v_WE?AJP-dI$DRz#mRB%_N+s
zrAhVPd=#=i32?fVnmavt9Q2MC%ax$l=({b<=>qe-=>prZri;mQrVE_Lm@d2nhjrk~
znKOApZ=0&)w7S&om@>m??NS+9lcdYDu1h)>mh7B#w&u=}om>TT;3k)HuFT|<Tm9pZ
zc?oU^2efhFgC)L{tjfK{l7i{SE{CNimLF-<TJIQXpRmiVs#dowHd)C@$HLFTY?Yl{
z@~}881C3dC&9WKoohY-7>!N-e!P01gq|8N^m^6t1ZP8LfwJzU)Y@MyCGgYf>SC6VT
z8x+6fS)bpo*hug5%eD=LWzFU<@*6h8EM`YFEvjXw-)sA5N8WtL!FuiUP*XI#c3Xz7
z!EQ8^Vj&SXS{@qJO5S8AY1NUEG!v)R<nm7wrgJW1FA@upGJ;W1-C5#2t^>wDkx>IA
ze$ow>QfIu$cq!P}fBXlXs!dFox}v>hj78+MA7PIpwP3wb#*BVqze~Y}N^MZ)25Ad9
zLE&TkIOikn+@c0~gQr<8*rY)Qi{fA-${Y=n4?|yd1f_H%w$568U$9X%IhzZi^08(#
zBKw(Tel1|-TFFEdj4IP_YjXslyiQBjrwWsG345z1yp>qpG+SO+=I9}#u68M-Y?&pq
z2C_>)r$#$(EhpE)yc#RoF;!2n5Kq+0ru$Z#M}uuvEe*D-)7q9y=HW5~6IvB|nF;Zd
zA=zz0($VlR8aG7Sn3U;FwKCl7kfrfqfHj(nwJKX>W}h@@wjC(T;jkx+q-2wq{pF}H
z%UP7!SIELpL@THkwrzG(x;U<lM@Ep$z5X)BbJMsAMj}d#!%7Vn1l9JOFqHD2n4Y`B
zfo%M6IjWSfTiQ8-1<ZD(j@ewJ=KGV(WiqZ>@64`bSx&qn2-%$!lWlf(6EcV*#E4*{
zHC;7B%nTY^ju$6GLr|RQR?Ggxl4y2glC-G}9oTsu^7~VXt-RouvC3|A&2Uwty{=VO
zRLKJDOeB*0{=`8PtY){8Fl6dXUoHEnCL2i39LO>XLtWxoza9;-&8b7fohf+c<Berz
zLjS)w-|&NL7L7`ovl5M$pF4&Y3q(;I${Lt5RO=L&2{U%-_Jdjtdz|7BY=L3yz-K;9
zg)(@WSV`Ju95yGk3<q1H5hOsc1%VrG8xH%M6BD(%%ni<R7TYK^isU0TZhKvSYq{EN
zAhx%r7P<8pEwB*h!Vu)L(gl5@NJAY#UoAabL3LpZ0iSD(hRYSCiQ?U8#bL*IV*=?I
z@A<rA0uCUw*o4JB>;TL`Q=;<N4yqMC5kiin9h#CPGG_FSskDsQwP>a!9ow5*RAxF6
zQM<E=JC^8qcjiVV%Xf#~$4wL@&IV+VqH30x)T~u90dZs^64R>!6AxOAEHH~5F@@{v
zn5Ft^lS}fc5N)JNx}9$2vSmSInUdo~5z2=q(<}jI1asE>k*uIj{2?p<UD+dhgwip$
zrLno!){;Ice%t0?o3}NmU!jDt)!6JZ(;DUH-p7sw+o~)e#eD{`u{TD|7pjAe+7}h;
z!8S_WQ;sHs?Zpw;bh|x`^ysZxF4(OE)-at;UECZTFE?b5&84$;6|49d15+|I-jdxl
z*9<jVKIvQSVcCF9oR;TOAQ+1Zz*@yYQX}(eq@oED#YjXNk2^aLoPY~$iOwdCVhW*g
z;N(o?!47lAh>amRVl<_=U|(q78~a>d(l3se_#mercPh}yPoLV0Lkb9o#bRcp+j2mc
z&x3}l%K=%2&NjJ2bb7pNNmj-A1Fp=cC6;V}(O9hZP-cWn(v2(olp<<`-3|6*gJ!w0
z0pqn2GK3YYn8Zl87Au#c;UZ@treb4iB8O3Yrym`ubQ7h;=a8ejf_~a7Z7*GllMp}R
zL3_)$IbE=tZ8ambTCCpkvIry3Wp@u3OUGt3i#qE>S+=UY_j@TE8-+OL4u?@^Q9g~W
zUivb{Nix)BmsOWtxw#fN)4kp4R3nC%TqDc@JDu{l^aLr593sRBfspMo!=UYiJ5tC>
zOB>M=Vy?dsV=&$3`G9`2)APPu%it+(_FSCX*Et`nQ@y;`$HmD9Vgwys+K<_F_R|k_
zJT-K<4Gr3srM+~oZ%>(}E&E*RW}4G3B$VaUur!^esX3;kVKZA9S~&`1dOwF<s<s`?
zCUG5Tx}O>3SSetj`LLHGq<?vFyv|+{u+hd?Vm}izn#-B^?P8M=-Ly|-XLei6he8D9
zp|O3_gjPR>iJ6*0Y=%3_)fgHa!VJar0#=qi5HpvcOn<l+RUDCWZKRx}ptie}a+R|?
zQ%ln97H_*=n58N|Fd-5{7Zm!<QAIEy6E6H1CQIW$BpxZ&%QD8<laycpiqodn-mKD&
zkg;(WR}`0{a;xfOj*acX7dgt-Y?0e|IopY&@WBY8bgV6PJ6A9y?gg>o>CEX`mucce
zkwY8Kn(E<APNBQVZX0iD%3eqsir8jW=Zj){wis@7HX9S?hnr;P>{QY#UGG|tMw9C^
zUEwZS70kJjS#ijp$yZty4mY)}$aRM#=8l_NhVZK6(+9tVRi*8g)sLJZ6s;Rfi#a8Q
zkQz`+#~yKe26KShiPJ^R2eyOck{$fnDX*PdF{WAV{1Td*CVxfGpL}*M&Cg~cfsCXu
z&G8#^)&fj>etYE(tul<6w{_4C9k`ZS1{xXf23svJ8oLr@*!7(n%<L)3Hz+l;ID;>C
z0cVCVbZzQTso9P*gIozym^)*h)c(0E^ebvwsGaMHI+{V9Yg^Dty~e39qp4FzthH7+
zl8mm9%7~sh3}Z4cb|t{--a3}qPSm3U*RGnD+iVUQf*1y44AOGz>}oSqt-*$v+MLE)
z>Yh$p;ZA$)Q}%=LsLnoqs2n-Foa*!|wi#Nsx4J_Lbq<^5TNmya5!tXr6Gbmo8AN;b
znjzyET5aVb{AxD<c}-u-B9a8LXs!iJ8$xscG);h*L{{h`t1@a%8|Ioo%oQ*0GwdtW
z+4^ZMapWdZ@6C)lgR)l#v^QiKFqaHVQL(}m4%Yol7tq*Y69!5&ZY{hmu{Kae8qwU~
zZ%Ycql5(SlxIM!3_-S!@t7B#x1jSf8VX|~(DmIi$gvcWk?CNVNQ&&+8jcbt7#+x!a
zcWSzYH`!gMY@D>sTX9*m3TAj{7?EaC)4U~PHNDuGny37B=SRU-PV)g9CFO~HSZs2#
z*@{;&KNqQ|M`9e-de5`J@(9~hMg?tWXW!;NUCPZ~z1_Jz*jYtJaPzLyDMfO*H{2*G
zPkMVSRSKQnsUYp>s$g<wIoLT7z@}ku=EMnqJ=r_%>fX_(8^P{2aj?r>H$<kmoxKjF
z7R3Py4!2pN$z;7rCn?!SOUf-O!OHb0;Oe#2N6cA_A?6^-Qg2qxy=J2lZ{O6TT!ABM
z7Z=pVf?8EuT3wnfY$_FAAZo8w*MwVBGvC&l+4L-4*|ofD`74T*iP7S!CG&Pf+8h+N
z#v|oYVQq6HE)3Mxup8TRUD;j&s?|s4ZQnLfSf{&9lv(J3vDbtvm#<h=SiZWja%H$;
z^_u0YmM&kpd^rgVJEA>h)!jbbWlNW@Al(*7s4!43R%66Ot-dB4809!L4mU)V;qYp1
zq2jr21W#8rYFtC|>PVA~OJN`?j;{%~boXu8*}b7Ryn4%)>ni0gnt08;t(&&?ru|;g
zwS1l~Tp>XUx~s4TEn{!vl8Fjh=2eKkVjYq7yqyE<3#-#~YR_;~FZ5Q2*r--V)`Y7E
z%Z+*Fpei=I#c=T;E7QUKjq(TweulbSc(d9mCL6vhs#ZA^2{Cqv)1mWf*qwbafPbnP
z7iFv{)(4|9rdmnGI)BNABrH~tX9o{7rYbt)M03)^f~d+;ojxR>kb?&Xp<F0Jsu|0F
zbJ+4iSfkQ}4Ya(Fne-H%);GnTGb&f2D(g7gd9D*v7ug~hG#qQzr=oDJ%mej^-90PP
z9t2nkn}dV~1;M^WwyNXBp;4MmVOWaMPZ1la5M8j`NHkGDc!2Zmgg?`eghTtN6QPfG
z$H$=bL_6HM8R(cOKONJP`D*eLI#arQi7tOZvVb9A1as|b6P?cw6Fch3Jv!Lgx1o3Y
zj)U)CKcM^nHbvj2bsGo5-W@x7`B>Y%BaJ~6l4>%lGlyZ-jF*}BNk+briLxucrHLet
z1$T^V=H-YzpPL5?8+OOfX$ZuJYT2%EMa*8bA8EBGDLuB!0FMr&>8BhLC8Qa!q^yMr
zpfc6X9d<LylTFjv;e!Y2Y}C*@Vo&5DCXyJQqT_K=iryylH=5#*pjXt}T4dO+BvT1g
ztrZe#mg0*wynAel#|n&Bl&DaeAZrujBL4JfPX+7j=6tOe9pV`T6QTx-WfDpg9lxRx
zIUz$>8ZVPj<hyHmS`*KW*O6%Q;QmogVf?$M9G9m>WNM=gX}B6>JDv1)%fb8La79R9
zB#lT@>hyoOUL47nNrSsZR`ze?2WPY0cyZwrSuoXP&|w)pLSVUt!AE#7#s4p1{Fdkw
z+O&a^UuL?;4Pl03?pcGO-fA-4HnFF;FjENEZFtzwg9MxQuwk<vHuSIC7?^1ayBW^n
zpnJ4X=tWl_q;)p3@cbs?kcKv6x-iP}I}%SJq+M(_xKwOLbr-&c6|*`OTpu;2P(&sA
z==^5nc0v2{F^=}uM#Ir)#X-wd@XA3W>c`Uadxn1xDPKA$w$f>}*<rA3A4!_CXc{_I
z6Wga|C*y?B>=}A>;O4Fg`D}COOS^2dc13q+n8GnuT|>B%SaYbWUA9^45}TyjRsmL?
z(yeDRjyIc`uSV<`WnvRkw;jw@=>$K!ft^FEJ7=D??Wl{~4VQ?u?VUqytyyNR!*4sS
zF!cQ@dZ~$)V@Rme&~(T?i0IQY;0LNx_U-A(jx4-Y77MHIwCnRMO_{x{WH4qaDNi#K
zS&~8DVrxaKi>O&h3ok&^FF3Pegmfdw3hOvb(n5V&F46K3)iu7j!J9<7IBw`jkJQ@O
z<4ocxT^y!WbQse)HMUx*3R)WNqGL5nx3JHth%mRRbgoqDr5ZR+1}-m5NfVvk!idIl
zo;}9ZF)l`!Av0dWwY_37OFr_8&RD|;^`!eTG-RvcOp2$xMnTFowPmUF$)jBQX{rk(
zH;Rpe;gUMd?2RAXfA9{oylVZvZ?r0vp6FIaj&-;*mVKAuw-IJZ47a&w8Bzi4Zh@;}
zZIzv<J~au!OR?|8z=UpfaDR2ogrK;K5O%Yg#S_J<_5`R+F4XKxHA-3OIbE3|j~7=(
z_AVjoI&Z!hKQ75j&28<NRJN&u_px7)L~J);J~kmuOYzLEC3)_qs-ygwiYi$W)&@)5
zRU4#HBN2=Ah(>->Pgh<u$#jT9%_38<cOcO(6AhWDmNg+4*QV{c_*Q|DFS#eJ#;^2w
z#WAC!I#$!n#HQ!@l#KHs6lRYF#xy(GT-?1YkD0B0JP9>~@xlG$4MUo)d5OMNu(DkF
z-Btq5((;}Rq1CS07LF8|q0pYc%$nZn^;S2^Hx7aiGc#dU^{fUz*F3slnC)b)mgyV_
z<+SFolVavz5N(~qZ?;h>_v8wc>N>62tp!fcky&DAPQ2Y&bluWAb7HlHlGD{s;x$8|
z#%?pczuD$Bf~`elh1nExQ3)E!Dznu<+-m;Frk;H0JxRv5HX12c(`2&J=xVz*MOu@M
zXsahexy?#;NQn~x0(IJbR}bT`9nE%bmHGT!S1)YU>yz%BPVN_cFGIY3n+ea5t*Xq#
zv=JYf*v!-z%_W<&JJ*Pm5ju$p%txM4F~oGr?d8G@iHp@qR(|?nMMSpLb^;*F(796E
zC6=^^FoD5OR$k<Cv<zd~=eDhGNj*ce+f72}PG(uNbE;OpoFQe4dMZO^%Aqqf8=lez
zbfQ@u(?(qC7~_^wtEgPs#R0AMiqW>ztc*SlJ8~&hnCRHdOEXB0%d}Y{dy-HKbl5#u
zNjBqkBk+<d&D0S3^;zOV3vW_$RYGSN3x?S+oA&-Yn<35O;QKLeN`Im62?NKbIi_fC
zp&Qj$_C`Zvjv+gH5+Z8^S&M{WFvm_tyvp1H(HW)OF;IRD&L)`F<v<|^_oG|Oh9EnG
z%+d@*9GcQ~G$?a}>{^piWoQ({M(d`;8)v+h74x3Ab^5Zm<E*^+zghTtZtK8Pdh;SX
zP4ec&4S{|0lJ2-$w5ArX9dZ+xfAOLNL0R1FLzk%HK6GO%wW_cOn3}{$FOlojTKBdE
zdN!6hGxNy{UHc-2IM-OKswB~ghA+9}%#&tq>$jJ%7x4~7n|JJqx|Cfw_$Rbc79bj6
z?^BfRTNiEpjnzF+BMLUT{caU9h8OC^=D3YE8n>&Psn`Gdp(6Z-M&EJZ&6#jEhgDAZ
zPX#b9s?8Y#jGOdG9J0r9A51B#3H%OX%xEy#l<{DTCN2xUHhDKksDqU<{bh$~w^ru=
zhEbd@2*f=1&Zxb11$PbXN-C5@ag9EoBhm9iW4TmbV=2iA9Of4ur+6JMNR~JoCqv4S
zl^Lz9{Im3A6yq*BUp9LKo{+d#G3nKN?5ol};Jd7Ni}hei_93*6a>Q+=aB*2D^(9^m
zaVm3YZCPR}cUF15u-Pr!4{EzR(4fC&dnI~C#nz!Ll%zr675aF%p4Twp`G(rhH`{l_
zf@CudW74e<A1M!VKEgq)Y~eaxP9!xaM6#LtL2pMW=1_?{I*y4NUc`tTs#X@!z~bO2
z8^n>aj(En^BWDaGiB=s^uIWZm*U3u^lcPREj)}q29v+x5J-z2@o~6EQyHdjOEwkjn
zWTZ9-BtQTA!NL7HSE31h&Yot@pPY#F&ug?6CH4^(qikKXGfOL<QkgNvl(60MA3Rwe
zS{4p+3@dUGV_xE=irL(=)vw8Z;@Rww&if22Kz{bXFFovQf6@nc8o|(VvZoroAkvwl
zJJDN)837KDYZ6|%QJKsc_6Q~zy^BB&LK!`GAZRCKjz@t;RzO4baKN0BB479)ZJdTN
z)pR<>Z1a(ubwgZ6_mCKH`+muUmSYKe)rcf55WZ!&#R|GjDckda1_M0V%u?%oZs9G6
z%HYqM2_}t`^4(a6iWLsDji`4|aCnNN>*kgwIH}<@R>fMQt~<uiepj;69!X?`moxdp
z)h>a3L{ZJW$SJgWk>d@@L7$_4-;Lc!XHhpo!@R?>JEdx9C3~`xVF9$qU^Ayrm`!Tq
z9CO&UV6N%CIw>uGP8HafI&LLMb+i9BvS-%sxi;8xb22#V+Z=UT1EgQO^M*63aR-*|
zXW9`)tB9Lx>l{Hjo#YU6W#+sGhRJLXyh_0>FIY=9L%W6reOk%V15q9&nE-VXt_xbb
zF)biQ@v&A!X+iGA66TFT^cf1^e>iJVck&rB26T7UnICN!ytM!%k6B^bMWox+&RcYE
zLQQOPtRrpeIE147f;U@1$rk#Mo6wpwQzLJkwCS<OOIFV{@;5drDZvb(BPwT4%tUM(
z)3JRxP#iJH`C5_vnM}UBYG{Tg@On;20=pp;Y4G4Eedd(BKC)GMuNV6Mbk|vz63%fO
z_i4$}F`wRHcR7GDKJ?rfLwT#YC%d03v_5|_8@%+*Q~IUlC=umB@&(x&*^t~ch;-$^
zoKv<fS~KCa0MWU-lpscOW;Et5Exb(_rg>{`BcT`kdd-xEIvquew^0~oFFadLIw76;
zDXEK@u{*O4m9>e5mk+TDl+sWK=5*N59QOc|0Kas51v{>BDu)hVuDTq_gDDg?qiRaX
zQ4$P<9*)L?($OIeZx++z<u>QgY6d$HbNc*$6pb?N&k0?tr}?qqp*NYkMGT<PPW+w^
zg5qU;5k6(Jh}qg~!CIx8OdjU0i@jA&8H>#xf>%^yC}SFi>JrpDZI&`Yehrc8VwXU(
zr!>1JHagg?%!Y}I$>)j=TkCd*ZBtEqU1~%crQ6joPiV}#moM`K_ek8`Byowa&t8KV
zZ^m3hrf73oIm5A_xwy{+x3<EEJHeO;NJpYk65zI#(+WtoXR`iyCD7;c1_dv6x3+(V
zrH!cHwl2c(AX-H2uBK)-?JKOAid}=0P^XmIJ4tZPDCF%H6PX=&&65<8+qtJqmTY3P
zY0ZXTU9xt=*;DJ)ylog;<BS4jmG4<hYF$}XoDnzj(VxfjOwri>+VGH1;!^0z7PJbf
zK`4Gv2;JIe?mbK?njJ!Qn9aYvNCc<*n;6zeVY%OjnL+kzkN$sM*)a_LjMVgzu>n95
z#>f$Du0;GN&%FA}3h>tU*gg7qG|K-8?XP4|u31)fWe~B<)?FryDa45WLmI3RTOo7C
zlD#%edGHP>!`=k7YmatQ%o$cYOr}N*!j?t?d79|TXa*3LR~qtNZZmzkq@7k<a}$zX
zFgF=cF#N+W#F9)(&VX$61^f2v;Qp2a-yVbn|9>DmJBbr+43D}Sf!e$>mU%s}MQhYW
zqhwKc7CD$BXDHD9LTzGGg9hB>MF|3C`Z1(E^X2%}S|r_)AX7V6ecL_*(*;_4^Fs%?
ziJj6iYeGkMJ8mzIXx6MLZqSG?{>O5A=dO@5FeFA!iGXB16;T+I2cptjAJSO8A(5TW
z%E+na7^f1$-0Yk_n)Ka13d_$5ncJIOB$*LQ&cw#Dpm9xyN0MoV-X$7Lq|UT6rkG2M
z{@S9mCe2Ww<_<>IZPb<-ZY3L4Xn1-&87@l%?&8Djb@|2D*#S-Ky)BCWOhLCT?J~{G
zU_V9P*fz=BXpD-q)t6!C-C5Gw?=DF_1wo)w#XRMLlMJCcv6>LCqXK%CH5#V%K>GHA
zx+Ms4i>p;;E17w+!`C`!v_UIByT{rnMqKGoR^*ynE#5?#)E3*7T*e`(9O1^?%_?KR
zOjRc{U)|~LfSD%%BQ6Uc?MZpqDt%gYXPOGvTW90+`k)nc6lcU}*=~@X&3kvU`Z0Js
zA;Stey=_r_oa;1Vby<d&nMY4-nXLT^LDps@O`Yv%-qNAnE_8)`$&&-7%nYN%mz1<|
zsR?~Grl3-BiV}u2mIZhaZMEfbL(97aDiQCF8zEutP$1omthUkyQ7c1y*}QEqt7S+J
z=^jr#iOaEdR>PD0nXtDa+Hc~l#E{@}wQ2}*63+4t3!APBphH4A>N?csx-Hvj`V=G6
zb^BUklnIM@1{dw&_AF-}_NFh~V-$PV#9`C*D(~Xl84==L+P?4MGBjLsBB9|lR%Hyc
z(A!9a;N*b_sull<l^ci5cF$~|%^9OV1~4PlJ_Y99MLgot-!>(w!&WnxK%C)&?>i)$
zmLPv5;da;zyW>yQnW<cY&?*P^-dRhO5i_plmV(iNG!fYhI$2Q;-q=j*UUD3i$OqT7
zg!#m2=43-$$lw(8C);pJH;hYgN#{475!)2qp>Zag-piTw3^469H!{p!L=M*7T80P}
zk&8NYU!#3&qTj3O7{8e(bG&Tshc+ZlctN+ecXM}N-vD2krzGYv-JsulL#Do{mXpt&
zxi=a{T=0&kT}Bf;#*BDNUHXDY5A2ZZEtdey9?9&0%w}mUx#+6rcD#o%&+Sk@d2T1A
z%1nt{;l0Ah|4S=|XN$|SpRDGsMjcUwc`n1Fs(KWRxm%&x%b?=QpmK13bC~}tLkB44
Pxt$L&oS?UMO7*`1ebm8B

diff --git a/modules/monitoring/application/locale/de_DE/LC_MESSAGES/monitoring.po b/modules/monitoring/application/locale/de_DE/LC_MESSAGES/monitoring.po
index d21fec919..4d8b6c0c2 100644
--- a/modules/monitoring/application/locale/de_DE/LC_MESSAGES/monitoring.po
+++ b/modules/monitoring/application/locale/de_DE/LC_MESSAGES/monitoring.po
@@ -1,5 +1,5 @@
 # Icinga Web 2 - Head for multiple monitoring backends.
-# Copyright (C) 2014 Icinga Development Team
+# Copyright (C) 2015 Icinga Development Team
 # This file is distributed under the same license as Monitoring Module.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -7,1574 +7,4550 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Monitoring Module (2.0.0~alpha4)\n"
 "Report-Msgid-Bugs-To: dev@icinga.org\n"
-"POT-Creation-Date: 2014-08-22 18:04+0200\n"
-"PO-Revision-Date: 2014-08-22 18:05+0100\n"
+"POT-Creation-Date: 2015-03-13 16:08+0100\n"
+"PO-Revision-Date: 2015-03-13 16:48+0100\n"
 "Last-Translator: Thomas Gelf <thomas@gelf.net>\n"
+"Language: de_DE\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:235
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:382
 msgid " Down Hosts (Handled)"
 msgstr "Hosts Down (bestätigt)"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:236
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:383
 msgid " Down Hosts (Unhandled)"
 msgstr "Hosts Down (unbestätigt)"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:257
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:350
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:404
 msgid " Down Services (Handled)"
 msgstr "Hosts Down (bestätigt)"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:258
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:351
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:405
 msgid " Down Services (Unhandled)"
-msgstr ""
+msgstr "Services Down (Unbestätigt)"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:41
-msgid " If you work with other administrators you may find it useful to share information about a host or service that is having problems if more than one of you may be working on it. Make sure you enter a brief description of what you are doing."
-msgstr "Wenn du mit anderen Administratoren zusammenarbeitest wirst du es als nützlich empfinden, Informationen über Probleme auf Hosts oder Services an denen du arbeitest zu teilen. Stell sicher eine kurze Beschreibung von dem was du gerade machst zu hinterlassen."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:239
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:386
 msgid " Pending Hosts"
 msgstr "Ungeprüfte Hosts"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:261
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:354
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:408
 msgid " Pending Services"
 msgstr "Ungeprüfte Services"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:237
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:384
 msgid " Unreachable Hosts (Handled)"
 msgstr "Nicht erreichbare Hosts (bestätigt)"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:238
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:385
 msgid " Unreachable Hosts (Unhandled)"
 msgstr "Nicht erreichbare Hosts (unbestätigt)"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:259
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:352
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:406
 msgid " Unreachable Services (Handled)"
 msgstr "Nicht erreichbare Services (bestätigt)"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:260
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:353
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:407
 msgid " Unreachable Services (Unhandled)"
 msgstr "Nicht erreichbare Services (unbestätigt)"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:255
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:381
+msgid " Up Hosts"
+msgstr "Hosts UP"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:401
+msgid " Up Services"
+msgstr "Services UP"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:348
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:402
 msgid " Warning Services (Handled)"
 msgstr "Service-Warnungen (bestätigt)"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:256
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:349
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:403
 msgid " Warning Services (Unhandled)"
 msgstr "Service-Warnungen (unbestätigt)"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:10
-#, php-format
-msgid "%d Hosts DOWN"
-msgstr "%d Hosts DOWN"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:73
+#, fuzzy, php-format
+msgid "%d Active"
+msgid_plural "%d Active"
+msgstr[0] "Aktiv"
+msgstr[1] "Aktiv"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:22
-#, php-format
-msgid "%d Hosts PENDING"
-msgstr "%d Hosts UNGEPRÜFT"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:53
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:109
+#, fuzzy, php-format
+msgid "%d Disabled"
+msgid_plural "%d Disabled"
+msgstr[0] "Deaktiviert"
+msgstr[1] "Deaktiviert"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:17
-#, php-format
-msgid "%d Hosts UNREACHABLE"
-msgstr "%d Hosts NICHT ERREICHBAR"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:35
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:91
+#, fuzzy, php-format
+msgid "%d Passive"
+msgid_plural "%d Passive"
+msgstr[0] "Passiv"
+msgstr[1] "Passiv"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:15
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:43
 #, php-format
-msgid "%d Hosts UP"
-msgstr "%d Hosts UP"
+msgid "%d hosts down on %s"
+msgstr "%d hosts down auf %s"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:57
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:127
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:197
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:232
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:267
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:21
 #, php-format
-msgid "%d are not checked at all"
-msgstr "%d werden nicht überwacht"
+msgid "%d hosts ok on %s"
+msgstr "%d hosts OK auf %s"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:32
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:102
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:172
-#, php-format
-msgid "%d are passively checked"
-msgstr "%d werden passiv überwacht"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:20
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:87
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:138
-#, php-format
-msgid "%d hosts disabled"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:26
+#, fuzzy, php-format
+msgid "%d hosts unreachable on %s"
 msgstr "%d deaktivierte Hosts"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:36
-#, php-format
-msgid "%d hosts flapping"
-msgstr "%d flapping Hosts"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:64
+#, fuzzy, php-format
+msgid "%d more ..."
+msgstr "und %d weitere"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:62
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:132
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:202
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:237
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:272
-#, php-format
-msgid "%d is not checked at all"
-msgstr "%d wird nicht überwacht"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:37
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:107
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:177
-#, php-format
-msgid "%d is passively checked"
-msgstr "%d wird passiv überwacht"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:48
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:107
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:158
-#, php-format
-msgid "%d services disabled"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:31
+#, fuzzy, php-format
+msgid "%d services critical on %s"
 msgstr "%d deaktivierte Services"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:64
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:53
+#, fuzzy, php-format
+msgid "%d services ok on %s"
+msgstr "%d deaktivierte Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:48
 #, php-format
-msgid "%d services flapping"
+msgid "%d services unknown on %s"
+msgstr "%d services unbekannt auf %s"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:37
+#, fuzzy, php-format
+msgid "%d services warning on %s"
 msgstr "%d flapping services"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hosts.phtml:105
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Plugin/Perfdata.php:437
 #, php-format
-msgid "%d unhandled services"
-msgstr "%d unbestätigte Services"
+msgid "%s %s (%s%%)"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/notifications.phtml:22
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:28
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:32
+#, php-format
+msgid "%s ago"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:40
+#, php-format
+msgctxt "timespan"
+msgid "%s ago"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:57
+#, fuzzy, php-format
+msgid "%s has been up and running with PID %d since %s"
+msgstr "läuft mit PID %d"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:8
+#, fuzzy, php-format
+msgid "%s hosts:"
+msgstr "%d Hosts UP"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/not-running.phtml:5
+#, php-format
+msgid "%s is currently not up and running"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:64
+#, fuzzy, php-format
+msgid "%s is not running"
+msgstr "läuft nicht"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:43
 #, php-format
 msgid "%s notications have been sent for this issue"
 msgstr "%s Benachrichtigungen wurden für dieses Problem versandt"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:3
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Link.php:54
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:142
+#, php-format
+msgctxt "Service running on host"
+msgid "%s on %s"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:9
 #, php-format
 msgid "%s services:"
 msgstr "%s Services:"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:91
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:84
+#, fuzzy, php-format
+msgid "%u Acknowledged Host Problem"
+msgid_plural "%u Acknowledged Host Problems"
+msgstr[0] "Problem bestätigen"
+msgstr[1] "Problem bestätigen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:84
+#, fuzzy, php-format
+msgid "%u Acknowledged Service Problem"
+msgid_plural "%u Acknowledged Service Problems"
+msgstr[0] "Problem bestätigen"
+msgstr[1] "Problem bestätigen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:17
+#, fuzzy, php-format
+msgid "%u Active"
+msgid_plural "%u Active"
+msgstr[0] "Aktiv"
+msgstr[1] "Aktiv"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:8
+#, fuzzy, php-format
+msgid "%u Host"
+msgid_plural "%u Hosts"
+msgstr[0] "%d Hosts UP"
+msgstr[1] "%d Hosts UP"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:10
+#, fuzzy, php-format
+msgid "%u Host DOWN"
+msgid_plural "%u Hosts DOWN"
+msgstr[0] "%d Hosts DOWN"
+msgstr[1] "%d Hosts DOWN"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:18
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:139
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:218
+#, fuzzy, php-format
+msgid "%u Host Disabled"
+msgid_plural "%u Hosts Disabled"
+msgstr[0] "%d deaktivierte Hosts"
+msgstr[1] "%d deaktivierte Hosts"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:48
+#, fuzzy, php-format
+msgid "%u Host Flapping"
+msgid_plural "%u Hosts Flapping"
+msgstr[0] "%d flapping Hosts"
+msgstr[1] "%d flapping Hosts"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:33
+#, fuzzy, php-format
+msgid "%u Host PENDING"
+msgid_plural "%u Hosts PENDING"
+msgstr[0] "%d Hosts UNGEPRÜFT"
+msgstr[1] "%d Hosts UNGEPRÜFT"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:29
+#, fuzzy, php-format
+msgid "%u Host UNREACHABLE"
+msgid_plural "%u Hosts UNREACHABLE"
+msgstr[0] "%d Hosts NICHT ERREICHBAR"
+msgstr[1] "%d Hosts NICHT ERREICHBAR"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:15
+#, fuzzy, php-format
+msgid "%u Host UP"
+msgid_plural "%u Hosts UP"
+msgstr[0] "%d Hosts UP"
+msgstr[1] "%d Hosts UP"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:8
+#, fuzzy, php-format
+msgid "%u Service"
+msgid_plural "%u Services"
+msgstr[0] "Service"
+msgstr[1] "Service"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:73
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:173
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:252
+#, fuzzy, php-format
+msgid "%u Service Disabled"
+msgid_plural "%u Services Disabled"
+msgstr[0] "%d deaktivierte Services"
+msgstr[1] "%d deaktivierte Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:103
+#, fuzzy, php-format
+msgid "%u Service Flapping"
+msgid_plural "%u Services Flapping"
+msgstr[0] "%d flapping services"
+msgstr[1] "%d flapping services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:46
+#, fuzzy, php-format
+msgid "%u Unhandled Host Problem"
+msgid_plural "%u Unhandled Host Problems"
+msgstr[0] "Unbestätigte Hosts"
+msgstr[1] "Unbestätigte Hosts"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:46
+#, fuzzy, php-format
+msgid "%u Unhandled Service Problem"
+msgid_plural "%u Unhandled Service Problems"
+msgstr[0] "Unbestätigte Services"
+msgstr[1] "Unbestätigte Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:13
+#, fuzzy, php-format
+msgid "%u configured service:"
+msgid_plural "%u configured services:"
+msgstr[0] "%d unbestätigte Services"
+msgstr[1] "%d unbestätigte Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:80
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:179
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:278
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:325
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:372
+#, fuzzy, php-format
+msgid "%u is not checked at all"
+msgid_plural "%u are not checked at all"
+msgstr[0] "%d wird nicht überwacht"
+msgstr[1] "%d wird nicht überwacht"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:53
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:152
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:251
+#, fuzzy, php-format
+msgid "%u is passively checked"
+msgid_plural "%u are passively checked"
+msgstr[0] "%d wird passiv überwacht"
+msgstr[1] "%d wird passiv überwacht"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:110
+#, fuzzy, php-format
+msgid "%u unhandled service"
+msgid_plural "%u unhandled services"
+msgstr[0] "%d unbestätigte Services"
+msgstr[1] "%d unbestätigte Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:73
+msgid "1 Year"
+msgstr "1 Jahr"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:74
+msgid "2 Years"
+msgstr "2 Jahre"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:70
+msgid "3 Months"
+msgstr "3 Monate"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:97
 msgid "4 Hours"
 msgstr "4 Stunden"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/notifications.phtml:17
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:71
+msgid "4 Months"
+msgstr "4 Monate"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:72
+msgid "8 Months"
+msgstr "8 Monate"
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Plugin/Perfdata.php:437
+#, php-format
+msgid "<b>%s %s</b> (%s%%)"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:453
+msgid "<b>{title}:</b> {value}m max. reaction time"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:443
+msgid "<b>{title}:</b> {value}m min. reaction time"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:296
+msgid "<b>{title}:</b><br> {value} of {sum} hosts are {label}"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:247
+msgid "<b>{title}:</b><br>{value} of {sum} services are {label}"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:38
 #, php-format
 msgid "A notication has been sent for this issue %s ago"
 msgstr "Eine Benachrichtigung für dieses Problem wurde vor %s gesendet"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:93
-msgid "Accept passive host checks"
-msgstr "Akzeptiere passive Host Checks"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:71
-msgid "Accept passive service checks"
-msgstr "Akzeptiere passive Service-Checks"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/history.phtml:43
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:78
 msgid "Ack removed"
 msgstr "Bestätigung entfernt"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/history.phtml:38
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:37
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:73
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:39
 msgid "Acknowledge"
 msgstr "Bestätigen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:116
-msgid "Acknowledge Problem"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:68
+#, fuzzy, php-format
+msgid "Acknowledge %u unhandled host problem"
+msgid_plural "Acknowledge %u unhandled host problems"
+msgstr[0] "Problem bestätigen"
+msgstr[1] "Problem bestätigen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:68
+#, fuzzy, php-format
+msgid "Acknowledge %u unhandled service problem"
+msgid_plural "Acknowledge %u unhandled service problems"
+msgstr[0] "%d unbestätigte Services"
+msgstr[1] "%d unbestätigte Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostController.php:71
+#, fuzzy
+msgid "Acknowledge Host Problem"
 msgstr "Problem bestätigen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/multi/components/comments.phtml:14
-msgid "Acknowledge all problems on the selected hosts or services"
-msgstr "Bestätige alle Probleme auf den ausgewählten Hosts oder Services"
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostsController.php:184
+#, fuzzy
+msgid "Acknowledge Host Problems"
+msgstr "Problem bestätigen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/servicegroups.phtml:59
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/servicegroups.phtml:89
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/servicegroups.phtml:155
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/servicegroups.phtml:189
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/servicegroups.phtml:223
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hostgroups.phtml:56
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hostgroups.phtml:86
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hostgroups.phtml:152
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hostgroups.phtml:186
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hostgroups.phtml:220
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:16
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:86
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:156
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:48
+#, fuzzy
+msgid "Acknowledge Service Problem"
+msgstr "Problem bestätigen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:233
+#, fuzzy
+msgid "Acknowledge Service Problems"
+msgstr "Problem bestätigen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:34
+#, fuzzy
+msgid "Acknowledge problem"
+msgid_plural "Acknowledge problems"
+msgstr[0] "Problem bestätigen"
+msgstr[1] "Problem bestätigen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:46
+msgid ""
+"Acknowledge this problem, suppress all future notifications for it and tag "
+"it as being handled"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:53
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:75
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:12
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:31
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:130
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:229
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:9
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:9
 msgid "Acknowledged"
 msgstr "Bestätigt"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/comments.phtml:45
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/eventhistory.phtml:37
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:39
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:51
 msgid "Acknowledgement"
 msgstr "Bestätigung"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:945
-msgid "Acknowledgement has been sent"
-msgstr "Bestätigung wurde gesendet"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:967
-msgid "Acknowledgement removal has been requested"
-msgstr "Löschung der Bestätigung wurde angefragt"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:53
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:59
 msgid "Acknowledgements"
 msgstr "Bestätigungen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:20
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:52
-msgid "Active"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:157
+#, fuzzy
+msgid "Acknowledging problem.."
+msgid_plural "Acknowledging problems.."
+msgstr[0] "Problem bestätigen"
+msgstr[1] "Problem bestätigen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/actions.phtml:44
+#, fuzzy
+msgid "Actions"
 msgstr "Aktiv"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/flags.phtml:24
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:70
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:98
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:24
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:24
+#, fuzzy
+msgid "Active And Passive Checks Disabled"
+msgstr "Passive Checks nicht mehr akzeptieren"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:39
 msgid "Active Checks"
 msgstr "Aktive Checks"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/comments.phtml:47
-msgid "Add comment"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:72
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:100
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:22
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:22
+#, fuzzy
+msgid "Active Checks Disabled"
+msgstr "Aktive Checks"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:88
+msgid "Active Host Checks Being Executed"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:97
+msgid "Active Service Checks Being Executed"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:120
+#, fuzzy
+msgid "Active checks"
+msgstr "Aktive Checks"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostController.php:83
+#, fuzzy
+msgid "Add Host Comment"
+msgstr "Kommentar absenden"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:48
+msgid "Add New Backend"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:164
+msgid "Add New Instance"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:60
+#, fuzzy
+msgid "Add Service Comment"
 msgstr "Kommentar hinzufügen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:109
-msgid "All Events"
-msgstr "Alle Ereignisse"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:14
+msgid "Add a new comment to this host"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:28
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:95
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:146
-msgid "All hosts enabled"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:25
+msgid "Add a new comment to this service"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:28
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:8
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:19
+#, fuzzy
+msgid "Add comment"
+msgid_plural "Add comments"
+msgstr[0] "Kommentar hinzufügen"
+msgstr[1] "Kommentar hinzufügen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:83
+#, fuzzy
+msgid "Adding comment.."
+msgid_plural "Adding comments.."
+msgstr[0] "Kommentar hinzufügen"
+msgstr[1] "Kommentar hinzufügen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:135
+msgid "Address"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:201
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:44
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:48
+msgid "Alert Summary"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:11
+msgid "Alert summary"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:377
+msgid "Alias"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:37
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:158
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:237
+#, fuzzy
+msgid "All Hosts Enabled"
 msgstr "Alle Hosts aktiviert"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/services.phtml:3
-msgid "All services configured on this host"
-msgstr "Alle auf diesem Host konfigurierten Services"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:26
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:28
+#, fuzzy
+msgid "All Services"
+msgstr "Services"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:56
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:115
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:166
-msgid "All services enabled"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:92
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:192
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:271
+#, fuzzy
+msgid "All Services Enabled"
 msgstr "Alle Services aktiviert"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CommandForm.php:93
-msgid "Author (Your Name)"
-msgstr "Autor (Dein Name)"
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:178
+#, fuzzy
+msgid "All backends are disabled"
+msgstr "Alle Services aktiviert"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CustomNotificationForm.php:63
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:16
+msgid "Allow acknowledging host and service problems"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:24
+msgid "Allow adding and deleting host and service comments"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:8
+msgid "Allow all commands"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:28
+msgid "Allow commenting on hosts and services"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:32
+msgid "Allow deleting host and service comments"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:44
+msgid "Allow deleting host and service downtimes"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:52
+msgid ""
+"Allow processing commands for toggling features on an instance-wide basis"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:56
+msgid ""
+"Allow processing commands for toggling features on host and service objects"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:48
+#, fuzzy
+msgid "Allow processing host and service check results"
+msgstr "Service-Checks verfolgen"
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:20
+#, fuzzy
+msgid "Allow removing problem acknowledgements"
+msgstr "Problembestätigung entfernen"
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:36
+msgid "Allow scheduling and deleting host and service downtimes"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:12
+#, fuzzy
+msgid "Allow scheduling host and service checks"
+msgstr "Service-Checks verfolgen"
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:40
+msgid "Allow scheduling host and service downtimes"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:60
+msgid "Allow sending custom notifications for hosts and services"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:21
+msgid "Apply"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:131
+msgid "Are you sure you want to remove this instance?"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:300
+msgid "Author"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:33
+msgid "Average"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:108
+msgid "Average services per host"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:439
+msgid "Avg (min)"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:78
+#, php-format
+msgid "Backend \"%s\" successfully removed."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:216
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:28
+msgid "Backend Name"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:226
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:44
+msgid "Backend Type"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:75
+msgid "Backends"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:77
 msgid "Broadcast"
 msgstr "Broadcast"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:53
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:34
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:52
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:34
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:52
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:184
 msgid "CRITICAL"
 msgstr "KRITISCH"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:140
-msgid "Check Output"
-msgstr "Check Ausgabe"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:62
+#, fuzzy
+msgctxt "icinga.state"
+msgid "CRITICAL"
+msgstr "KRITISCH"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:116
-msgid "Check Result"
-msgstr "Check-Ergebnis"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/checksource.phtml:3
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml:4
 msgid "Check Source"
 msgstr "Check-Quelle"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:33
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:51
 msgid "Check Time"
 msgstr "Ausführungszeit"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:32
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:61
+#, fuzzy
+msgid "Check attempts"
+msgstr "Check Ausgabe"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:70
 msgid "Check execution time"
 msgstr "Check-Ausführungsdauer"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:38
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:76
 msgid "Check latency"
 msgstr "Check-Latenz"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:8
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:37
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:39
 msgid "Check now"
 msgstr "Jetzt prüfen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:253
-msgid "Child Objects"
-msgstr "Kind-Objekte"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:78
+msgid ""
+"Check this to not to validate connectivity with the given Livestatus socket"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/command.phtml:7
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:77
+msgid ""
+"Check this to not to validate connectivity with the given database server"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:38
+#, fuzzy
+msgid "Child Hosts"
+msgstr "Unbestätigte Hosts"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/SecurityConfigForm.php:58
+msgid ""
+"Comma separated case insensitive list of protected custom variables. Use * "
+"as a placeholder for zero or more wildcard characters. Existance of those "
+"custom variables will be shown, but their values will be masked."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml:9
 msgid "Command"
 msgstr "Befehl"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:290
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:721
-msgid "Command has been sent, active checks will be disabled"
-msgstr "Befehl wurde gesendet, aktive Checks werden deaktiviert"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php:30
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:64
+#, fuzzy
+msgid "Command File"
+msgstr "Befehl"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:315
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:741
-msgid "Command has been sent, active checks will be enabled"
-msgstr "Befehl wurde gesendet, aktive Checks werden aktiviert"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:49
+#, fuzzy
+msgid "Commands"
+msgstr "Befehl"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:334
-msgid "Command has been sent, check will be rescheduled"
-msgstr "Befehl wurde gesendet, Check wird neu geplant"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:701
-msgid "Command has been sent, checks will be rescheduled"
-msgstr "Befehl wurde gesendet, Checks werden neu geplant"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:772
-msgid "Command has been sent, event handlers will be disabled"
-msgstr "Befehl wurde gesendet, Eventhandler werden deaktiviert"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:804
-msgid "Command has been sent, event handlers will be enabled"
-msgstr "Befehl wurde gesendet, Eventhandler werden aktiviert"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:837
-msgid "Command has been sent, flap detection will be disabled"
-msgstr "Befehl wurde gesendet, Flap-Erkennung wird deaktiviert"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:870
-msgid "Command has been sent, flap detection will be enabled"
-msgstr "Befehl wurde gesendet, Flap-Erkennung wird aktiviert"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1047
-msgid "Command has been sent, monitoring process will restart now"
-msgstr "Befehl wurde gesendet, der Monitoring-Prozess wird jetzt neustarten"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:510
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:538
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:661
-msgid "Command has been sent, notifications will be disabled"
-msgstr "Befehl wurde gesendet, Benachrichtigungen werden deaktiviert"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:568
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:682
-msgid "Command has been sent, notifications will be enabled"
-msgstr "Befehl wurde gesendet, Benachrichtigungen werden aktiviert"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:391
-msgid "Command has been sent, obsessing will be disabled"
-msgstr "Befehl wurde gesendet, Verfolgung wird deaktiviert"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:425
-msgid "Command has been sent, obsessing will be enabled"
-msgstr "Befehl wurde gesendet, Verfolgung wird aktiviert"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:492
-msgid "Command has been sent, passive check results will be accepted"
-msgstr "Befehl wurde gesendet, passive Checks werden akzeptiert werden"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:459
-msgid "Command has been sent, passive check results will be refused"
-msgstr "Befehl wurde gesendet, passive Checks werden abgewiesen werden"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1069
-msgid "Command has been sent, performance data processing will be disabled"
-msgstr "Befehl wurde gesendet, Performancedatenverarbeitung wird deaktiviert werden"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1091
-msgid "Command has been sent, performance data processing will be enabled"
-msgstr "Befehl wurde gesendet, Performancedatenverarbeitung wird aktiviert werden"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1026
-msgid "Command has been sent, process will shut down"
-msgstr "Befehl wurde gesendet, der Monitoringprozess wird herunterfahren"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/eventhistory.phtml:32
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/history.phtml:28
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:36
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CommentForm.php:30
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CustomNotificationForm.php:34
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:134
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:49
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:43
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:65
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:52
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:62
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:67
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:46
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:63
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:54
 msgid "Comment"
 msgstr "Kommentar"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/history.phtml:33
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:489
+#, fuzzy
+msgid "Comment Timestamp"
+msgstr "Kommentare"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:492
+#, fuzzy
+msgid "Comment Type"
+msgstr "Kommentar"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:68
 msgid "Comment deleted"
 msgstr "Kommentar gelöscht"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:909
-msgid "Comment removal has been requested"
-msgstr "Löschung des Kommentars wurde angefordert"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/comments.phtml:42
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:36
 msgid "Comment was caused by a downtime."
 msgstr "Kommentar wurde durch eine Downtime erstellt."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/comments.phtml:32
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:26
 msgid "Comment was caused by a flapping host or service."
 msgstr "Kommentar wurde durch einen flappenden Host oder service erstellt."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/comments.phtml:46
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:40
 msgid "Comment was caused by an acknowledgement."
 msgstr "Kommentar wurde durch eine Bestätigung erstellt."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/comments.phtml:37
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:31
 msgid "Comment was created by an user."
 msgstr "Kommentar wurde von einem Benutzer erstellt."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:86
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:48
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/comments.phtml:45
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/multi/components/comments.phtml:6
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:163
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:468
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:54
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:66
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:2
 msgid "Comments"
 msgstr "Kommentare"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:78
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/contacts.phtml:33
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:196
+#, php-format
+msgid "Configuration for backend %s is disabled"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:79
+msgid ""
+"Configure how to protect your monitoring environment against prying eyes"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:74
+msgid "Configure how to retrieve monitoring information"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:434
+#, fuzzy
+msgid "Contact Groups"
+msgstr "Kontaktgruppen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:4
+#, fuzzy
+msgid "Contact details"
+msgstr "Kontakte"
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:159
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:37
 msgid "Contactgroups"
 msgstr "Kontaktgruppen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:90
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/contacts.phtml:14
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:155
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:351
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:17
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:160
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:299
+msgid "Contains host states of each service group."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:240
+msgid "Contains service states for each service group."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:55
+msgid "Could not find any valid monitoring backend resources"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:53
+msgid "Create New Instance"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:9
+#, fuzzy
+msgid "Create New Monitoring Backend"
+msgstr "Monitoring-Prozess neu starten"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:264
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:118
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
 msgid "Critical"
 msgstr "Kritisch"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:101
-msgid "Critical Events"
-msgstr "Kritische Ereignisse"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:45
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:123
 msgid "Current Downtimes"
 msgstr "Aktuelle Downtimes"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:584
-msgid "Custom notification has been sent"
-msgstr "Benutzerdefinierte Bestätigung wurde gesendet"
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:227
+#, fuzzy
+msgid "Current Host State"
+msgstr "Host-Status"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CustomNotificationForm.php:52
-msgid "Custom notifications normally follow the regular notification logic in Icinga. Selecting this option will force the notification to be sent out, regardless of time restrictions, whether or not notifications are enabled, etc."
-msgstr "Benutzeredefinierte Benachrichtigungen verhalten sich gemäß der gewöhnlichen Benachrichtigungslogik in Icinga. Wenn du diese Option wählst wird eine Benachrichtigung erzwungen. Einschränkungen durch Zeitspannen und durch eventuell deaktivierte Benachrichtigungen werden dabei ignoriert."
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:217
+#, fuzzy
+msgid "Current Incidents"
+msgstr "Aktuelle Downtimes"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:47
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:223
+#, fuzzy
+msgid "Current Service State"
+msgstr "Service-Zustand"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:133
+#, fuzzy
+msgid "Current State"
+msgstr "Aktuelle Downtimes"
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:176
 msgid "DOWN"
 msgstr "DOWN"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/DelayNotificationForm.php:51
-msgid "Delay Notification"
-msgstr "Benachrichtigung verzögern"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:57
+#, fuzzy
+msgctxt "icinga.state"
+msgid "DOWN"
+msgstr "DOWN"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/multi/components/comments.phtml:13
-msgid "Delay Notifications"
-msgstr "Benachrichtigungen verzögern"
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:104
+msgid "Database Name"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:997
-msgid "Delete Downtime"
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:83
+msgid "Database Resource"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:92
+#, fuzzy
+msgid "Database Type"
+msgstr "Downtime-Typ"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:643
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:646
+msgid "Day"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:468
+msgid "Defect Chart"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:489
+msgid "Defects"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:46
+msgid "Define what should be done with the child hosts of the hosts."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:64
+#, fuzzy
+msgid "Delete this comment"
 msgstr "Downtime löschen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:999
-msgid "Delete a single downtime with the id shown above"
-msgstr "Lösche eine einzelne Downtime mit der oben gezeigten ID."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php:64
+#, fuzzy
+msgid "Delete this downtime"
+msgstr "Downtime löschen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:278
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:713
-msgid "Disable Active Checks"
-msgstr "Aktive Checks deaktivieren"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:89
+#, fuzzy
+msgid "Deleting comment.."
+msgstr "Kommentar entfernen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:753
-msgid "Disable Event Handler"
-msgstr "Event-Handler deaktivieren"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php:89
+#, fuzzy
+msgid "Deleting downtime.."
+msgstr "Downtime löschen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:816
-msgid "Disable Flapping Detection"
-msgstr "Flap-Erkennung deaktivieren"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:523
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:652
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:99
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:24
 msgid "Disable Notifications"
 msgstr "Benachrichtigungen deaktivieren"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1060
-msgid "Disable Performance Data"
-msgstr "Performancedaten deaktivieren"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:208
+msgid "Disable This Backend"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:714
-msgid "Disable active checks for this host and its services."
-msgstr "Deaktiviere aktive Service-Checks für diesen Host und seine Service-Checks."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:283
-msgid "Disable active checks for this object."
-msgstr "Deaktiviere aktive Service-Checks für dieses Objekt."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:281
-msgid "Disable active checks on a program-wide basis."
-msgstr "Deaktiviere applikationsweit sämtliche aktiven Service-Checks."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:756
-msgid "Disable event handler for the whole system."
-msgstr "Dektiviere Event-Handler für das ganze System."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:758
-msgid "Disable event handler for this object."
-msgstr "Dektiviere Event-Handler für dieses Objekt."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:821
-msgid "Disable flapping detection for this object."
-msgstr "Deaktiviere die Flap-Erkennnung für dieses Objekt."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:819
-msgid "Disable flapping detection on a program-wide basis."
-msgstr "Deaktiviere die Flap-Erkennnung applikationsweit."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:49
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:67
 msgid "Disable notifications for a specific time on a program-wide basis"
-msgstr "Deaktivieren Benachrichtigungen applikationsweit für eine bestimmte Zeitspanne."
+msgstr ""
+"Deaktivieren Benachrichtigungen applikationsweit für eine bestimmte "
+"Zeitspanne."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:526
-msgid "Disable notifications on a program-wide basis."
-msgstr "Deaktiviere die Flap-Erkennnung applikationsweit."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:69
+msgid "Disable temporarily"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:372
-msgid "Disable obsessing on a program-wide basis."
-msgstr "Deaktiviere die Verfolgung applikationsweit."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:61
+#, fuzzy
+msgid "Disabling host and service notifications.."
+msgstr "Benachrichtigungen deaktivieren"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:440
-msgid "Disable passive checks on a program-wide basis."
-msgstr "Deaktiviere Passive Checks applikationsweit."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1061
-msgid "Disable processing of performance data on a program-wide basis."
-msgstr "Deaktiviere die Verarbeitung von Performance-Daten applikationsweit."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:40
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:72
-msgid "Disabled"
-msgstr "Deaktiviert"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:256
-msgid "Do nothing with child objects"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:41
+#, fuzzy
+msgid "Do nothing with child hosts"
 msgstr "Mach nichts mit Kind-Objekten"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:205
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:314
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:139
 msgid "Down"
 msgstr "Down"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/comments.phtml:41
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:35
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:68
 msgid "Downtime"
 msgstr "Downtime"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/eventhistory.phtml:77
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/history.phtml:93
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:88
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:120
 msgid "Downtime End"
 msgstr "Downtime Ende"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/eventhistory.phtml:72
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/history.phtml:88
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:83
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:115
 msgid "Downtime Start"
 msgstr "Downtime Beginn"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:185
-msgid "Downtime Type"
-msgstr "Downtime-Typ"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1006
-msgid "Downtime removal has been requested"
-msgstr "Entfernung dieser Downtime wurde angefordert"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:640
-msgid "Downtime removal requested"
-msgstr "Entfernung dieser Downtime wurde angefordert"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/history.phtml:53
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:88
 msgid "Downtime removed"
 msgstr "Downtime entfernt"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:603
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:621
-msgid "Downtime scheduling requested"
-msgstr "Die Planung dieser Downtime wurde angefordert"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:82
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/downtime.phtml:55
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:167
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:269
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:56
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:2
 msgid "Downtimes"
 msgstr "Downtimes"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/contacts.phtml:28
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/contact.phtml:18
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:305
+#, fuzzy
+msgid "Duration"
+msgstr "Flexible Dauer"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:33
+msgid "Edit Existing Backend"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:150
+msgid "Edit Existing Instance"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:27
+#, fuzzy, php-format
+msgid "Edit monitoring backend %s"
+msgstr "Monitoring-Prozess neu starten"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:71
+#, fuzzy, php-format
+msgid "Edit monitoring instance %s"
+msgstr "Monitoring-Prozess neu starten"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:378
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:28
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:22
 msgid "Email"
 msgstr "E-Mail"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:305
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:733
-msgid "Enable Active Checks"
-msgstr "Aktive Checks aktivieren"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:785
-msgid "Enable Event Handler"
-msgstr "Eventhandler aktivieren"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:849
-msgid "Enable Flapping Detection"
-msgstr "Flap-Erkennung aktivieren"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:553
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:673
-msgid "Enable Notifications"
-msgstr "Benachrichtigungen aktivieren"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1082
-msgid "Enable Performance Data"
-msgstr "Performancedaten aktivieren"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:734
-msgid "Enable active checks for this host and its services."
-msgstr "Aktive Checks für diesen Host und seine Services aktivieren."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:309
-msgid "Enable active checks for this object."
-msgstr "Aktive Checks für dieses Objekt aktivieren."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:307
-msgid "Enable active checks on a program-wide basis."
-msgstr "Aktive Checks anwendungsweit aktivieren."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:790
-msgid "Enable event handler for this object."
-msgstr "Event-Handler für dieses Objekt aktivieren."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:788
-msgid "Enable event handlers on the whole system."
-msgstr "Event-Handler für das gesamte System aktivieren."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:854
-msgid "Enable flapping detection for this object."
-msgstr "Flap-Erkennung für dieses Objekt aktivieren."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:852
-msgid "Enable flapping detection on a program-wide basis."
-msgstr "Flap-Erkennung anwendungsweit aktivieren."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:556
-msgid "Enable notifications on a program-wide basis."
-msgstr "Benachrichtigungen anwendungsweit aktivieren."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:406
-msgid "Enable obsessing on a program-wide basis."
-msgstr "Verfolgung anwendungsweit aktivieren."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:474
-msgid "Enable passive checks on a program-wide basis."
-msgstr "Passive Checks anwendungsweit aktivieren."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1083
-msgid "Enable processing of performance data on a program-wide basis."
-msgstr "Performancedaten-Verarbeitung anwendungsweit aktivieren."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:173
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:302
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:88
 msgid "End Time"
 msgstr "Endzeitpunkt"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:63
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:69
 msgid "Ended downtimes"
 msgstr "Beendete Downtimes"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:238
-msgid "Enter here the duration of the downtime. Icinga will automatically delete the downtime after this time expired."
-msgstr "Die gewünschte Dauer der Downtime hier eintragen. Icinga wird die Downtime nach Ablauf dieser Zeit automatisch löschen."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:159
+#, fuzzy
+msgid ""
+"Enter here the duration of the downtime. The downtime will be automatically "
+"deleted after this time expired."
+msgstr ""
+"Die gewünschte Dauer der Downtime hier eintragen. Icinga wird die Downtime "
+"nach Ablauf dieser Zeit automatisch löschen."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:81
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/DisableNotificationWithExpireForm.php:32
-msgid "Enter the expire date/time for this acknowledgement here. Icinga will  delete the acknowledgement after this date expired."
-msgstr "Den gewünschten Verfallszeitpunkt der Downtime hier eintragen. Icinga wird die Downtime bei Überschreitung dieses Zeitpunkts löschen."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:90
+#, fuzzy
+msgid ""
+"Enter the expire date and time for this acknowledgement here. Icinga will "
+"delete the acknowledgement after this time expired."
+msgstr ""
+"Den gewünschten Verfallszeitpunkt der Downtime hier eintragen. Icinga wird "
+"die Downtime bei Überschreitung dieses Zeitpunkts löschen."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/flags.phtml:46
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:299
+#, fuzzy
+msgid "Entry Time"
+msgstr "Endzeitpunkt"
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:183
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:390
+#, fuzzy
+msgid "Event Grid"
+msgstr "Ereignisse"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:75
 msgid "Event Handler"
 msgstr "Eventhandler"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:124
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:126
-msgid "Event handlers"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:206
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:208
+#, fuzzy
+msgid "Event Handlers"
 msgstr "Eventhandler"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:104
-msgid "Eventhandlers enabled"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:106
+#, fuzzy
+msgid "Event Handlers Enabled"
 msgstr "Eventhandler aktiviert"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:108
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:188
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:613
+#, fuzzy
+msgid "Event Overview"
+msgstr "Übersicht"
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:187
 msgid "Events"
 msgstr "Ereignisse"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:82
-msgid "Execute active host checks"
-msgstr "Aktiven Host Check ausführen"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:127
+#, fuzzy
+msgid "Execution time"
+msgstr "Check-Ausführungsdauer"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:60
-msgid "Execute active service checks"
-msgstr "Aktive Service-Checks ausführen"
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:493
+msgid "Expiration"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:77
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/DisableNotificationWithExpireForm.php:28
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:43
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:87
 msgid "Expire Time"
 msgstr "Verfallszeitpunkt"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/downtimes.phtml:34
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:43
 msgid "Expires"
 msgstr "Verfällt"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:144
-msgid "Fill in the check output string which should be send to Icinga."
-msgstr "Ausgabetext des Checkergebnisses welches an Icinga gesendet werden soll hier eintragen."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:29
+#, fuzzy
+msgid "Feature Commands"
+msgstr "Liste unterstützter Befehle"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:155
-msgid "Fill in the performance data string which should be send to Icinga."
-msgstr "Performancedaten des Checkergebnisses welches an Icinga gesendet werden soll hier eintragen."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:52
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:107
 msgid "Fixed"
 msgstr "Fix"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/contact.phtml:35
-msgid "Flags (host)"
-msgstr "Flags (Host)"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/contact.phtml:31
-msgid "Flags (service)"
-msgstr "Flags (Service)"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/flags.phtml:57
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:84
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:6
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:8
 msgid "Flap Detection"
 msgstr "Flap-Erkennung"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:6
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:8
-msgid "Flap detection"
-msgstr "Flap-Erkennung"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:137
-msgid "Flap detection enabled"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:115
+#, fuzzy
+msgid "Flap Detection Enabled"
 msgstr "Flap-Erkennung aktiv"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/comments.phtml:31
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/eventhistory.phtml:47
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/history.phtml:58
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:86
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:25
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:61
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:57
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:81
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:93
 msgid "Flapping"
 msgstr "Flapping"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/history.phtml:63
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:66
+#, fuzzy
+msgid "Flapping Stopped"
+msgstr "Flapping beendet"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:98
 msgid "Flapping stopped"
 msgstr "Flapping beendet"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:53
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:108
 msgid "Flexible"
 msgstr "Flexibel"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:209
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:157
 msgid "Flexible Duration"
 msgstr "Flexible Dauer"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:46
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:62
 msgid "Force Check"
 msgstr "Check erzwingen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CustomNotificationForm.php:50
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:64
 msgid "Forced"
 msgstr "Erzwungen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:31
-msgid "Global host event handler"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:67
+msgid "From"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:47
+#, fuzzy
+msgid "Global Host Event Handler"
 msgstr "Globaler Host Event Handler"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:35
-msgid "Global service event handler"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:41
+#, fuzzy
+msgid "Global Service Event Handler"
 msgstr "Globaler Service Event Handler"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:34
-#, php-format
-msgid "Handled services with state %s"
-msgstr "Bestätigte Services mit Status %s"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:43
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:49
 msgid "Hard state changes"
 msgstr "Harte Status-Änderungen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:98
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:327
+msgid "Healing Chart"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:180
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:258
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:69
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:233
 msgid "History"
 msgstr "Historie"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:37
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:297
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:490
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:211
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:31
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:58
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:63
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:53
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml:12
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:96
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:186
+#, fuzzy
+msgid "Host"
+msgstr "Hosts"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml:6
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml:21
+#, php-format
+msgid "Host (%u)"
+msgid_plural "Hosts (%u)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:229
+#, fuzzy
+msgid "Host Address"
+msgstr "Host-Probleme"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:133
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:155
+#, fuzzy
+msgid "Host Checks"
+msgstr "Aktive Checks"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:25
+#, fuzzy
+msgid "Host Group"
+msgstr "Hostgruppen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:298
+#, fuzzy
+msgid "Host Group Chart"
+msgstr "Hostgruppen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:596
+#, fuzzy
+msgid "Host Group Name"
+msgstr "Hostgruppen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:561
+#, fuzzy
+msgid "Host Groups"
+msgstr "Hostgruppen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:381
+#, fuzzy
+msgid "Host Notification Timeperiod"
+msgstr "Host-Benachrichtigungszeitraum"
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:111
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:227
 msgid "Host Problems"
 msgstr "Host-Probleme"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/MultiController.php:60
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/MultiController.php:128
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:226
+#, fuzzy
+msgid "Host Severity"
+msgstr "Host-Status"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostsController.php:64
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostsController.php:158
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:85
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:207
 msgid "Host State"
 msgstr "Host-Status"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/contacts.phtml:44
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/contact.phtml:43
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:2
+#, fuzzy
+msgid "Host and Service Checks"
+msgstr "Host- und Servicechecks"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/disable-notifications.phtml:8
+#, fuzzy
+msgid "Host and service notifications are already disabled."
+msgstr "Befehl wurde gesendet, Benachrichtigungen werden deaktiviert"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostController.php:34
+#, fuzzy
+msgid "Host not found"
+msgstr "Kein Host gefunden"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:48
 msgid "Host notification period"
 msgstr "Host-Benachrichtigungszeitraum"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:2
-msgid "Host- and Servicechecks"
-msgstr "Host- und Servicechecks"
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:40
+msgid "Host or service not found"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:74
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml:13
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:90
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:151
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml:16
 msgid "Hostgroups"
 msgstr "Hostgruppen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:58
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:194
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/servicegroups.phtml:28
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hostgroups.phtml:25
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:7
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/multi/components/objectlist.phtml:37
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/multi/components/summary.phtml:5
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:134
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:228
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:657
+#, fuzzy
+msgid "Hostname"
+msgstr "Host-Status"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:33
+msgid "Hostname or address of the remote Icinga instance"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:88
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:139
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:302
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostsController.php:80
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:97
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:101
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:84
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:37
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:7
 msgid "Hosts"
 msgstr "Hosts"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:217
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:640
+#, fuzzy
+msgid "Hour"
+msgstr "Stunden"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:137
 msgid "Hours"
 msgstr "Stunden"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:66
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:44
+msgid ""
+"Icinga Web 2 will protect your monitoring environment against prying eyes "
+"using the configuration specified below:"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:76
+#, php-format
+msgid ""
+"Icinga Web 2 will retrieve information from your monitoring environment "
+"using a backend called \"%s\" and the specified resource below:"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:75
+#, php-format
+msgid ""
+"Icinga Web 2 will use the named pipe located at \"%s\" to send commands to "
+"your monitoring instance."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:48
+#, php-format
+msgid ""
+"Icinga Web 2 will use the named pipe located on a remote machine at \"%s\" "
+"to send commands to your monitoring instance by using the connection details "
+"listed below:"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:74
 msgid "If the acknowledgement should expire, check this option."
 msgstr "Diese Option aktivieren, wenn die Bestätigung verfallen soll"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:110
-msgid "If you do not want an acknowledgement notification to be sent out to the appropriate contacts, uncheck this option."
-msgstr "Wenn du keine Bestätigungsbenachrichtigung zu den jeweiligen Kontakten senden willst, deaktiviere diese Option."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:80
+msgid ""
+"If you check this option, a notification is sent to all normal and escalated "
+"contacts."
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:198
-msgid "If you select the fixed option, the downtime will be in effect between the start and end times you specify whereas a flexible downtime starts when the service enters a non-OK state (sometime between the start and end times you specified) and lasts as long as the duration of time you enter. The duration fields do not apply for fixed downtime."
-msgstr "Wenn du die Option \"fix\" wählst, wird die Downtime zwischen dem gewählten Start- und Endzeitpunkt aktiv sein. Bei einer flexiblen Downtime beginnt die Downtime sobald der Dienst (irgendwann zwischen dem gewählten Start- und Endzeitpunkt) einen nicht-OK Zustand erreicht, und dauert so lange, wie im Feld \"Dauer\" angegeben. Diese Dauer gibt es für fixe Downtimes nicht."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:67
+#, fuzzy
+msgid ""
+"If you check this option, a notification is sentregardless of the current "
+"time and whether notifications are enabled."
+msgstr ""
+"Wenn diese Option aktiviert wird, erzwingt Icinga einen Check unabhängig vom "
+"eingeplanten zeitraum und auch dann, wenn aktive Checks nicht aktiv sind."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:49
-msgid "If you select this option, Icinga will force a check regardless of both what time the scheduled check occurs and whether or not checks are enabled."
-msgstr "Wenn diese Option aktiviert wird, erzwingt Icinga einen Check unabhängig vom eingeplanten zeitraum und auch dann, wenn aktive Checks nicht aktiv sind."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:126
+msgid ""
+"If you do not want an acknowledgement notification to be sent out to the "
+"appropriate contacts, uncheck this option."
+msgstr ""
+"Wenn du keine Bestätigungsbenachrichtigung zu den jeweiligen Kontakten "
+"senden willst, deaktiviere diese Option."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CommentForm.php:49
-msgid "If you uncheck this option, the comment will automatically be deleted the next time Icinga is restarted."
-msgstr "Wenn diese Option deaktiviert wird, wird der Kommentar beim nächsten Neustart von Icinga automatisch gelöscht."
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:124
+msgid ""
+"If you have still any environments or views referring to this instance, you "
+"won't be able to send commands anymore after deletion."
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:97
-msgid "If you want the acknowledgement to disable notifications until the host/service recovers, check this option."
-msgstr "Diese Option aktivieren, wenn die Bestätigung Benachrichtigungen unterdrücken soll, bis der Host/Service sich erholt."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:101
+#, fuzzy
+msgid ""
+"If you select the fixed option, the downtime will be in effect between the "
+"start and end times you specify whereas a flexible downtime starts when the "
+"host or service enters a problem state sometime between the start and end "
+"times you specified and lasts as long as the duration time you enter. The "
+"duration fields do not apply for fixed downtimes."
+msgstr ""
+"Wenn du die Option \"fix\" wählst, wird die Downtime zwischen dem gewählten "
+"Start- und Endzeitpunkt aktiv sein. Bei einer flexiblen Downtime beginnt die "
+"Downtime sobald der Dienst (irgendwann zwischen dem gewählten Start- und "
+"Endzeitpunkt) einen nicht-OK Zustand erreicht, und dauert so lange, wie im "
+"Feld \"Dauer\" angegeben. Diese Dauer gibt es für fixe Downtimes nicht."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CommentForm.php:35
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CustomNotificationForm.php:39
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:139
-msgid "If you work with other administrators, you may find it useful to share information about a host or service that is having problems if more than one of you may be working on it. Make sure you enter a brief description of what you are doing."
-msgstr "Wenn du mit anderen Administratoren zusammenarbeitest, wirst du es nützlich finden, Informationen zu Hosts oder Services mit Problemen zu teilen, insbesondere dann, wenn gemeinsam daran gearbeitet wird. Stell sicher eine kurze Beschreibung zu deiner Tätigkeit hier einzutragen."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:64
+msgid ""
+"If you select this option, Icinga will force a check regardless of both what "
+"time the scheduled check occurs and whether or not checks are enabled."
+msgstr ""
+"Wenn diese Option aktiviert wird, erzwingt Icinga einen Check unabhängig vom "
+"eingeplanten zeitraum und auch dann, wenn aktive Checks nicht aktiv sind."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:55
-msgid "If you would like the comment to remain even when the acknowledgement is removed, check this option."
-msgstr "Diese Option aktivieren, wenn der Kommentar auch nach dem Löschen der Bestätigung bestehen bleiben soll"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:58
+msgid ""
+"If you uncheck this option, the comment will automatically be deleted the "
+"next time Icinga is restarted."
+msgstr ""
+"Wenn diese Option deaktiviert wird, wird der Kommentar beim nächsten "
+"Neustart von Icinga automatisch gelöscht."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/eventhistory.phtml:42
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/history.phtml:48
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:114
+#, fuzzy
+msgid ""
+"If you want the acknowledgement to disable notifications until the host or "
+"service recovers, check this option."
+msgstr ""
+"Diese Option aktivieren, wenn die Bestätigung Benachrichtigungen "
+"unterdrücken soll, bis der Host/Service sich erholt."
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:51
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:45
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:67
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:54
+#, fuzzy
+msgid ""
+"If you work with other administrators, you may find it useful to share "
+"information about the the host or service that is having problems. Make sure "
+"you enter a brief description of what you are doing."
+msgstr ""
+"Wenn du mit anderen Administratoren zusammenarbeitest, wirst du es nützlich "
+"finden, Informationen zu Hosts oder Services mit Problemen zu teilen, "
+"insbesondere dann, wenn gemeinsam daran gearbeitet wird. Stell sicher eine "
+"kurze Beschreibung zu deiner Tätigkeit hier einzutragen."
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:63
+msgid ""
+"If you would like the comment to remain even when the acknowledgement is "
+"removed, check this option."
+msgstr ""
+"Diese Option aktivieren, wenn der Kommentar auch nach dem Löschen der "
+"Bestätigung bestehen bleiben soll"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:56
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:65
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:89
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:83
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:17
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:17
 msgid "In Downtime"
 msgstr "In Downtime"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:6
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:147
+msgid ""
+"In case it's desired that a TCP connection is being used by Icinga Web 2 to "
+"access a Livestatus interface, the Sockets module for PHP is required."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:58
+msgid "Instance"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:160
+#, php-format
+msgid "Instance \"%s\" created successfully."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:163
+#, php-format
+msgid "Instance \"%s\" edited successfully."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:114
+#, php-format
+msgid "Instance \"%s\" successfully removed."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:191
+msgid "Instance Name"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:200
+#, fuzzy
+msgid "Instance Type"
+msgstr "Downtime-Typ"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:74
+msgid "Instance already exists"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:71
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:119
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:138
+msgid "Instance name missing"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:50
+#, php-format
+msgid "Invalid instance type \"%s\" given"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:296
+msgid "Is In Effect"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/WelcomePage.php:42
+msgid ""
+"It offers various status and reporting views with powerful filter "
+"capabilities that allow you to keep track of the most important events in "
+"your monitoring environment."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
+msgid "Label"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:136
+#, fuzzy
+msgid "Last Check"
+msgstr "Letzter Check"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:77
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:93
+#, fuzzy
+msgid "Last Comment: "
+msgstr "Kommentar absenden"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:31
+msgid "Last External Command Check"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:230
+#, fuzzy
+msgid "Last Host Check"
+msgstr "Letzter Check"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:35
+msgid "Last Log File Rotation"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:24
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:24
+#, fuzzy
+msgid "Last Problem"
+msgstr "Host-Probleme"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:225
+#, fuzzy
+msgid "Last Service Check"
+msgstr "Letzter Check"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:27
+#, fuzzy
+msgid "Last Status Update"
+msgstr "Letzer Status-Aktualisierung"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:18
 msgid "Last check"
 msgstr "Letzter Check"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:27
-msgid "Last check command"
-msgstr "Letztes Check-Kommando"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:126
+#, fuzzy
+msgid "Latency"
+msgstr "Check-Latenz"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:23
-msgid "Last status update"
-msgstr "Letzer Status-Aktualisierung"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/timeline/index.phtml:15
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:16
 msgid "Legend"
 msgstr "Legende"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/command/list.phtml:1
-msgid "List Of Supported Commands"
-msgstr "Liste unterstützter Befehle"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:292
+#, php-format
+msgid ""
+"List %s service that is currenlty in state PENDING in service group \"%s\""
+msgid_plural ""
+"List %s services which are currently in state PENDING in service group \"%s\""
+msgstr[0] ""
+msgstr[1] ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/multi/components/objectlist.phtml:49
-msgid "List all"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:157
+#, php-format
+msgid ""
+"List %s service that is currently in state CRITICAL (Acknowledged) in "
+"service group \"%s\""
+msgid_plural ""
+"List %s services which are currently in state CRITICAL (Acknowledged) in "
+"service group \"%s\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:133
+#, php-format
+msgid ""
+"List %s service that is currently in state CRITICAL in service group \"%s\""
+msgid_plural ""
+"List %s services which are currently in state CRITICAL in service group \"%s"
+"\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:106
+#, php-format
+msgid "List %s service that is currently in state OK in service group \"%s\""
+msgid_plural ""
+"List %s services which are currently in state OK in service group \"%s\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:211
+#, php-format
+msgid ""
+"List %s service that is currently in state UNKNOWN (Acknowledged) in service "
+"group \"%s\""
+msgid_plural ""
+"List %s services which are currently in state UNKNOWN (Acknowledged) in "
+"service group \"%s\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:187
+#, php-format
+msgid ""
+"List %s service that is currently in state UNKNOWN in service group \"%s\""
+msgid_plural ""
+"List %s services which are currently in state UNKNOWN in service group \"%s\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:265
+#, php-format
+msgid ""
+"List %s service that is currently in state WARNING (Acknowledged) in service "
+"group \"%s\""
+msgid_plural ""
+"List %s services which are currently in state WARNING (Acknowledged) in "
+"service group \"%s\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:241
+#, php-format
+msgid ""
+"List %s service that is currently in state WARNING in service group \"%s\""
+msgid_plural ""
+"List %s services which are currently in state WARNING in service group \"%s\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:123
+#, fuzzy, php-format
+msgid "List %s unhandled service problem on host %s"
+msgid_plural "List %s unhandled service problems on host %s"
+msgstr[0] "%d unbestätigte Services"
+msgstr[1] "%d unbestätigte Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:111
+#, php-format
+msgctxt "timeline.link.title"
+msgid "List %u %s registered %s"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:24
+#, fuzzy, php-format
+msgid "List %u actively checked host"
+msgid_plural "List %u actively checked hosts"
+msgstr[0] "%d wird passiv überwacht"
+msgstr[1] "%d wird passiv überwacht"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:80
+#, fuzzy, php-format
+msgid "List %u actively checked service"
+msgid_plural "List %u actively checked services"
+msgstr[0] "%d wird passiv überwacht"
+msgstr[1] "%d wird passiv überwacht"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:112
+#, fuzzy, php-format
+msgid "List %u host comment"
+msgid_plural "List %u host comments"
+msgstr[0] "Kommentar absenden"
+msgstr[1] "Kommentar absenden"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:97
+#, fuzzy, php-format
+msgid "List %u host currently in downtime"
+msgid_plural "List %u hosts currently in downtime"
+msgstr[0] "Aktueller Zustand dieses Host"
+msgstr[1] "Aktueller Zustand dieses Host"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:27
+#, fuzzy, php-format
+msgid "List %u host for which flap detection has been disabled"
+msgid_plural "List %u hosts for which flap detection has been disabled"
+msgstr[0] "Befehl wurde gesendet, Flap-Erkennung wird deaktiviert"
+msgstr[1] "Befehl wurde gesendet, Flap-Erkennung wird deaktiviert"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:148
+#, php-format
+msgid "List %u host for which notifications are suppressed"
+msgid_plural "List %u hosts for which notifications are suppressed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:57
+#, php-format
+msgid "List %u host that is currently flapping"
+msgid_plural "List %u hosts which are currently flapping"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:39
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:17
+#, fuzzy, php-format
+msgid "List %u host that is currently in state DOWN"
+msgid_plural "List %u hosts which are currently in state DOWN"
+msgstr[0] "Aktueller Zustand dieses Host"
+msgstr[1] "Aktueller Zustand dieses Host"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:59
+#, php-format
+msgid "List %u host that is currently in state DOWN (Acknowledged)"
+msgid_plural "List %u hosts which are currently in state DOWN (Acknowledged)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:126
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:40
+#, fuzzy, php-format
+msgid "List %u host that is currently in state PENDING"
+msgid_plural "List %u hosts which are currently in state PENDING"
+msgstr[0] "Aktueller Zustand dieses Host"
+msgstr[1] "Aktueller Zustand dieses Host"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:84
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:39
+#, php-format
+msgid "List %u host that is currently in state UNREACHABLE"
+msgid_plural "List %u hosts which are currently in state UNREACHABLE"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:104
+#, php-format
+msgid "List %u host that is currently in state UNREACHABLE (Acknowledged)"
+msgid_plural ""
+"List %u hosts which are currently in state UNREACHABLE (Acknowledged)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:18
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:22
+#, fuzzy, php-format
+msgid "List %u host that is currently in state UP"
+msgid_plural "List %u hosts which are currently in state UP"
+msgstr[0] "Aktueller Zustand dieses Host"
+msgstr[1] "Aktueller Zustand dieses Host"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:60
+#, fuzzy, php-format
+msgid "List %u host that is not being checked at all"
+msgid_plural "List %u hosts which are not being checked at all"
+msgstr[0] "%d wird nicht überwacht"
+msgstr[1] "%d wird nicht überwacht"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:227
+#, php-format
+msgid "List %u host that is not processing any event handlers"
+msgid_plural "List %u hosts which are not processing any event handlers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:42
+#, fuzzy, php-format
+msgid "List %u passively checked host"
+msgid_plural "List %u passively checked hosts"
+msgstr[0] "%d wird passiv überwacht"
+msgstr[1] "%d wird passiv überwacht"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:98
+#, fuzzy, php-format
+msgid "List %u passively checked service"
+msgid_plural "List %u passively checked services"
+msgstr[0] "%d wird passiv überwacht"
+msgstr[1] "%d wird passiv überwacht"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:112
+#, php-format
+msgid "List %u service comment"
+msgid_plural "List %u service comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:97
+#, fuzzy, php-format
+msgid "List %u service currently in downtime"
+msgid_plural "List %u services currently in downtime"
+msgstr[0] "Aktueller Zustand dieses Services"
+msgstr[1] "Aktueller Zustand dieses Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:82
+#, php-format
+msgid "List %u service for which flap detection has been disabled"
+msgid_plural "List %u services for which flap detection has been disabled"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:182
+#, php-format
+msgid "List %u service for which notifications are suppressed"
+msgid_plural "List %u services for which notifications are suppressed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:112
+#, fuzzy, php-format
+msgid "List %u service that is currently flapping"
+msgid_plural "List %u services which are currently flapping"
+msgstr[0] "%d flapping services"
+msgstr[1] "%d flapping services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:57
+#, fuzzy, php-format
+msgid "List %u service that is currently in state %s"
+msgid_plural "List %u services which are currently in state %s"
+msgstr[0] "Aktueller Zustand dieses Services"
+msgstr[1] "Aktueller Zustand dieses Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:82
+#, php-format
+msgid "List %u service that is currently in state %s (Acknowledged)"
+msgid_plural "List %u services which are currently in state %s (Acknowledged)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:108
+#, php-format
+msgid "List %u service that is currently in state %s (Acknowledged) on host %s"
+msgid_plural ""
+"List %u services which are currently in state %s (Acknowledged) on host %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:82
+#, php-format
+msgid "List %u service that is currently in state %s on host %s"
+msgid_plural "List %u services which are currently in state %s on host %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:20
+#, fuzzy, php-format
+msgid "List %u service that is currently in state CRITICAL"
+msgid_plural "List %u services which are currently in state CRITICAL"
+msgstr[0] "Aktueller Zustand dieses Services"
+msgstr[1] "Aktueller Zustand dieses Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:41
+#, php-format
+msgid "List %u service that is currently in state CRITICAL (Acknowledged)"
+msgid_plural ""
+"List %u services which are currently in state CRITICAL (Acknowledged)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:165
+#, php-format
+msgid ""
+"List %u service that is currently in state CRITICAL (Acknowledged) on hosts "
+"in the host group \"%s\""
+msgid_plural ""
+"List %u services which are currently in state CRITICAL (Acknowledged) on "
+"hosts in the host group \"%s\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:95
+#, php-format
+msgid ""
+"List %u service that is currently in state CRITICAL and not checked at all"
+msgid_plural ""
+"List %u services which are currently in state CRITICAL and not checked at all"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:68
+#, php-format
+msgid ""
+"List %u service that is currently in state CRITICAL and passively checked"
+msgid_plural ""
+"List %u services which are currently in state CRITICAL and passively checked"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:141
+#, php-format
+msgid ""
+"List %u service that is currently in state CRITICAL on hosts in the host "
+"group \"%s\""
+msgid_plural ""
+"List %u services which are currently in state CRITICAL on hosts in the host "
+"group \"%s\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:19
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:314
+#, fuzzy, php-format
+msgid "List %u service that is currently in state OK"
+msgid_plural "List %u services which are currently in state OK"
+msgstr[0] "Aktueller Zustand dieses Services"
+msgstr[1] "Aktueller Zustand dieses Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:340
+#, php-format
+msgid "List %u service that is currently in state OK and not checked at all"
+msgid_plural ""
+"List %u services which are currently in state OK and not checked at all"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:43
+#, php-format
+msgid "List %u service that is currently in state OK on host %s"
+msgid_plural "List %u services which are currently in state OK on host %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:114
+#, php-format
+msgid ""
+"List %u service that is currently in state OK on hosts in the host group \"%s"
+"\""
+msgid_plural ""
+"List %u services which are currently in state OK on hosts in the host group "
+"\"%s\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:106
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:361
+#, fuzzy, php-format
+msgid "List %u service that is currently in state PENDING"
+msgid_plural "List %u services which are currently in state PENDING"
+msgstr[0] "Aktueller Zustand dieses Services"
+msgstr[1] "Aktueller Zustand dieses Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:387
+#, php-format
+msgid ""
+"List %u service that is currently in state PENDING and not checked at all"
+msgid_plural ""
+"List %u services which are currently in state PENDING and not checked at all"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:133
+#, php-format
+msgid "List %u service that is currently in state PENDING on host %s"
+msgid_plural "List %u services which are currently in state PENDING on host %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:300
+#, php-format
+msgid ""
+"List %u service that is currently in state PENDING on hosts in the host "
+"group \"%s\""
+msgid_plural ""
+"List %u services which are currently in state PENDING on hosts in the host "
+"group \"%s\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:218
+#, fuzzy, php-format
+msgid "List %u service that is currently in state UNKNOWN"
+msgid_plural "List %u services which are currently in state UNKNOWN"
+msgstr[0] "Aktueller Zustand dieses Services"
+msgstr[1] "Aktueller Zustand dieses Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:239
+#, php-format
+msgid "List %u service that is currently in state UNKNOWN (Acknowledged)"
+msgid_plural ""
+"List %u services which are currently in state UNKNOWN (Acknowledged)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:219
+#, php-format
+msgid ""
+"List %u service that is currently in state UNKNOWN (Acknowledged) on hosts "
+"in the host group \"%s\""
+msgid_plural ""
+"List %u services which are currently in state UNKNOWN (Acknowledged) on "
+"hosts in the host group \"%s\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:293
+#, php-format
+msgid ""
+"List %u service that is currently in state UNKNOWN and not checked at all"
+msgid_plural ""
+"List %u services which are currently in state UNKNOWN and not checked at all"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:266
+#, php-format
+msgid ""
+"List %u service that is currently in state UNKNOWN and passively checked"
+msgid_plural ""
+"List %u services which are currently in state UNKNOWN and passively checked"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:195
+#, php-format
+msgid ""
+"List %u service that is currently in state UNKNOWN on hosts in the host "
+"group \"%s\""
+msgid_plural ""
+"List %u services which are currently in state UNKNOWN on hosts in the host "
+"group \"%s\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:119
+#, fuzzy, php-format
+msgid "List %u service that is currently in state WARNING"
+msgid_plural "List %u services which are currently in state WARNING"
+msgstr[0] "Aktueller Zustand dieses Services"
+msgstr[1] "Aktueller Zustand dieses Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:140
+#, php-format
+msgid "List %u service that is currently in state WARNING (Acknowledged)"
+msgid_plural ""
+"List %u services which are currently in state WARNING (Acknowledged)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:273
+#, php-format
+msgid ""
+"List %u service that is currently in state WARNING (Acknowledged) on hosts "
+"in the host group \"%s\""
+msgid_plural ""
+"List %u services which are currently in state WARNING (Acknowledged) on "
+"hosts in the host group \"%s\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:194
+#, php-format
+msgid ""
+"List %u service that is currently in state WARNING and not checked at all"
+msgid_plural ""
+"List %u services which are currently in state WARNING and not checked at all"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:167
+#, php-format
+msgid ""
+"List %u service that is currently in state WARNING and passively checked"
+msgid_plural ""
+"List %u services which are currently in state WARNING and passively checked"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:249
+#, php-format
+msgid ""
+"List %u service that is currently in state WARNING on hosts in the host "
+"group \"%s\""
+msgid_plural ""
+"List %u services which are currently in state WARNING on hosts in the host "
+"group \"%s\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:116
+#, fuzzy, php-format
+msgid "List %u service that is not being checked at all"
+msgid_plural "List %u services which are not being checked at all"
+msgstr[0] "%d wird nicht überwacht"
+msgstr[1] "%d wird nicht überwacht"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:261
+#, php-format
+msgid "List %u service that is not processing any event handlers"
+msgid_plural "List %u services which are not processing any event handlers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:10
+#, fuzzy, php-format
+msgid "List all %u hosts"
 msgstr "Alle anzeigen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/multi/components/objectlist.phtml:52
-msgid "List all selected objects"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:23
+#, fuzzy, php-format
+msgid "List all %u service on host %s"
+msgid_plural "List all %u services on host %s"
+msgstr[0] "Alle gewählten Objekte anzeigen"
+msgstr[1] "Alle gewählten Objekte anzeigen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:10
+#, fuzzy, php-format
+msgid "List all %u services"
+msgstr "%s Services:"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:73
+#, php-format
+msgctxt "timeline.link.title"
+msgid "List all event records registered %s"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:86
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml:11
+#, php-format
+msgid "List all hosts in the group \"%s\""
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:41
+msgid "List all hosts, for which flap detection is enabled entirely"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:162
+msgid "List all hosts, for which notifications are enabled entirely"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:241
+msgid "List all hosts, which are processing event handlers entirely"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:72
+#, php-format
+msgid "List all reported services on host %s"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:86
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml:11
+#, php-format
+msgid "List all services in the group \"%s\""
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:95
+#, php-format
+msgid "List all services of all hosts in host group \"%s\""
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:237
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:212
+#, fuzzy, php-format
+msgid "List all services on host %s"
 msgstr "Alle gewählten Objekte anzeigen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:222
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:231
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:53
+#, php-format
+msgid "List all services with the name \"%s\" on all reported hosts"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:96
+msgid "List all services, for which flap detection is enabled entirely"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:196
+msgid "List all services, for which notifications are enabled entirely"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:275
+msgid "List all services, which are processing event handlers entirely"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:468
+#, fuzzy
+msgid "List comments"
+msgstr "Kommentar absenden"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:435
+#, fuzzy
+msgid "List contact groups"
+msgstr "Kontaktgruppen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:351
+#, fuzzy
+msgid "List contacts"
+msgstr "Kontakte"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:31
+#, php-format
+msgid "List contacts in contact-group \"%s\""
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:269
+#, fuzzy
+msgid "List downtimes"
+msgstr "Begonnene Downtimes"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:614
+msgid "List event records"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:561
+#, fuzzy
+msgid "List host groups"
+msgstr "Hostgruppen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:97
+msgid "List hosts"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:326
+#, fuzzy
+msgid "List notifications"
+msgstr "Benachrichtigungen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:510
+#, fuzzy
+msgid "List service groups"
+msgstr "Servicegruppen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:171
+#, fuzzy
+msgid "List services"
+msgstr "%s Services:"
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:118
+msgid "Livestatus Resource"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:76
+msgid "Local"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:202
+msgid "Local Command File"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
+msgid "Max"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:449
+msgid "Max (min)"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
+#, fuzzy
+msgid "Min"
+msgstr "Minuten"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:147
 msgid "Minutes"
 msgstr "Minuten"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:2
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:14
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:72
+#, fuzzy
+msgid "Monitoring Backend"
+msgstr "Monitoring-Prozess"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:14
+#, fuzzy
+msgctxt "setup.page.title"
+msgid "Monitoring Backend"
+msgstr "Monitoring-Prozess"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:3
+#, fuzzy
+msgid "Monitoring Backends"
+msgstr "Monitoring-Prozess"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:2
 msgid "Monitoring Features"
 msgstr "Monitoring-Features"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:159
-msgid "Monitoring Process"
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:209
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:29
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:40
+#, fuzzy
+msgid "Monitoring Health"
+msgstr "Monitoring-Features"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:14
+#, fuzzy
+msgctxt "setup.page.title"
+msgid "Monitoring IDO Resource"
+msgstr "Monitoring-Features"
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:42
+#, fuzzy
+msgid "Monitoring Instance"
 msgstr "Monitoring-Prozess"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:21
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/InstancePage.php:14
+#, fuzzy
+msgctxt "setup.page.title"
+msgid "Monitoring Instance"
+msgstr "Monitoring-Prozess"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:50
+#, fuzzy
+msgid "Monitoring Instances"
+msgstr "Monitoring-Prozess"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:14
+#, fuzzy
+msgctxt "setup.page.title"
+msgid "Monitoring Livestatus Resource"
+msgstr "Monitoring-Features"
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:41
+#, fuzzy
+msgid "Monitoring Security"
+msgstr "Monitoring-Features"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/SecurityPage.php:14
+#, fuzzy
+msgctxt "setup.page.title"
+msgid "Monitoring Security"
+msgstr "Monitoring-Features"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:146
+#, php-format
+msgid "Monitoring backend \"%s\" has been successfully changed"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:143
+#, php-format
+msgid "Monitoring backend \"%s\" has been successfully created"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:79
+#, fuzzy
+msgid "Monitoring backend already exists"
+msgstr "Monitoring-Features"
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:146
+#, php-format
+msgid ""
+"Monitoring backend configuration could not be written to: %s; An error "
+"occured:"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:141
+#, php-format
+msgid "Monitoring backend configuration has been successfully written to: %s"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:77
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:124
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:170
+#, fuzzy
+msgid "Monitoring backend name missing"
+msgstr "Monitoring-Prozess"
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:93
+#, php-format
+msgid ""
+"Monitoring instance configuration could not be written to: %s; An error "
+"occured:"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:88
+#, php-format
+msgid "Monitoring instance configuration has been successfully created: %s"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:71
+#, php-format
+msgid ""
+"Monitoring security configuration could not be written to: %s; An error "
+"occured:"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:66
+#, php-format
+msgid "Monitoring security configuration has been successfully created: %s"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:649
+msgid "Month"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:38
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:44
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:50
+msgid "N/A"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:376
+msgid "Name"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:97
+msgid "New instance name missing"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:102
+msgid "New monitoring backend name missing"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/SecurityConfigForm.php:31
+msgid "New security configuration has successfully been stored"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:27
 msgid "Next check"
 msgstr "Nächster Check"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/servicematrix.phtml:26
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml:17
+msgid "No"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:23
 msgid "No Services matching the filter"
 msgstr "Zu diesem Filter wurden keine Services gefunden"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/comments.phtml:20
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:25
+#, fuzzy
+msgid "No active downtimes"
+msgstr "Begonnene Downtimes"
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:176
+msgid "No backend has been configured"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:14
 msgid "No comments matching the filter"
 msgstr "Zu diesem Filter wurden keine Kommentare gefunden"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/contactgroups.phtml:11
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/contacts.phtml:16
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:189
+#, php-format
+msgid "No configuration for backend %s"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/contactgroups.phtml:11
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:12
 msgid "No contacts matching the filter"
 msgstr "Zu diesem Filter wurden keine Kontakte gefunden"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/downtimes.phtml:18
-msgid "No downtimes matching the filter"
-msgstr "Zu diesem Filter wurden keine Downtimes gefunden"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/history.phtml:10
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:24
 msgid "No history available for this object"
 msgstr "Zu diesem Filter wurden keine historischen Ereignisse gefunden"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/statehistorysummary.phtml:12
-msgid "No history entry matching the filter"
-msgstr "Zu diesem Filter wurden keine historischen Ereignisse gefunden"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/eventhistory.phtml:14
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:26
 msgid "No history events matching the filter"
 msgstr "Zu diesem Filter wurden keine historischen Ereignisse gefunden"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hostgroups.phtml:11
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:17
 msgid "No host groups matching the filter"
 msgstr "Zu diesem Filter wurden keine Hostgruppen gefunden"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hosts.phtml:28
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/multi/host.phtml:13
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:6
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:27
 msgid "No hosts matching the filter"
 msgstr "Zu diesem Filter wurden keine Hosts gefunden"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/notifications.phtml:31
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:53
 msgid "No notification has been sent for this issue"
 msgstr "Für dieses Problem wurde keine Benachrichtigung gesendet"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/notifications.phtml:29
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:62
+#, fuzzy
+msgid "No notifications have been sent for this contact"
+msgstr "Für dieses Problem wurde keine Benachrichtigung gesendet"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:21
 msgid "No notifications matching the filter"
 msgstr "Zu diesem Filter wurde keine Benachrichtigung gefunden"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/servicegroups.phtml:11
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:17
 msgid "No service groups matching the filter"
 msgstr "Zu diesem Filter wurden keine Servicegruppen gefunden"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/services.phtml:40
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/multi/service.phtml:17
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:32
+#, fuzzy
+msgid "No services configured on this host"
+msgstr "Alle auf diesem Host konfigurierten Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:39
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:6
 msgid "No services matching the filter"
 msgstr "Zu diesem Filter wurden keine Services gefunden"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/contact.phtml:53
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:69
+msgid "No state changes in the selected time period."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:10
 msgid "No such contact"
 msgstr "Der gewünschte Kontakt existiert nicht"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:32
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:55
+msgid "None"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:23
 msgid "Not acknowledged"
 msgstr "Nicht bestätigt"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:32
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:36
-msgid "Not set"
-msgstr "Nicht gesetzt"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/eventhistory.phtml:27
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/history.phtml:23
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:41
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:52
 msgid "Notification"
 msgstr "Benachrichtigung"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/DelayNotificationForm.php:30
-msgid "Notification Delay (Minutes From Now)"
-msgstr "Benachrichtigungsverzögerung (Minuten ab jetzt)"
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:342
+#, fuzzy
+msgid "Notification Start"
+msgstr "Benachrichtigung"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:984
-msgid "Notification delay has been requested"
-msgstr "Benachrichtigungsverzögerung wurde angefragt"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:105
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:38
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/flags.phtml:35
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/notifications.phtml:10
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:73
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:75
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:171
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:331
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:429
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:472
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:479
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:325
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:44
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:76
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:66
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:2
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:127
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:129
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:39
-msgid "Notifications enabled"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:61
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:85
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:13
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:13
+#, fuzzy
+msgid "Notifications Disabled"
 msgstr "Benachrichtigungen aktiv"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:653
-msgid "Notifications for this host and its services will be disabled."
-msgstr "Benachrichtigungen für diesen Host und seine Services werden deaktiviert."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:124
+#, fuzzy
+msgid "Notifications Enabled"
+msgstr "Benachrichtigungen aktiv"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:674
-msgid "Notifications for this host and its services will be enabled."
-msgstr "Benachrichtigungen für diesen Host und seine Services werden aktiviert."
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:15
+#, fuzzy
+msgid "Notifications and Problems"
+msgstr "Benachrichtigungen aktiv"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:528
-msgid "Notifications for this object will be disabled."
-msgstr "Benachrichtigungen für dieses Objekt werden deaktiviert."
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:328
+msgid "Notifications and average reaction time per hour."
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:558
-msgid "Notifications for this object will be enabled."
-msgstr "Benachrichtigungen für dieses Objekt werden aktiviert."
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:469
+#, fuzzy
+msgid "Notifications and defects per hour"
+msgstr "Zu diesem Filter wurde keine Benachrichtigung gefunden"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:51
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:56
+#, fuzzy
+msgid "Notifications sent to this contact"
+msgstr "Für dieses Problem wurde keine Benachrichtigung gesendet"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:76
+#, php-format
+msgid "Notifications will be re-enabled in <strong>%s</strong>"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/disable-notifications.phtml:11
+#, php-format
+msgid "Notifications will be re-enabled in <strong>%s</strong>."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:70
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:70
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:178
 msgid "OK"
 msgstr "OK"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/flags.phtml:68
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:60
+#, fuzzy
+msgctxt "icinga.state"
+msgid "OK"
+msgstr "OK"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:72
+msgid "Object summaries"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:97
+msgid "Object type"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:57
 msgid "Obsessing"
 msgstr "Verfolgung"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:115
-msgid "Obsessing over host checks"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:144
+#, fuzzy
+msgid "Obsessing Over Hosts"
 msgstr "Host-Checks verfolgen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:126
-msgid "Obsessing over service checks"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:153
+#, fuzzy
+msgid "Obsessing Over Services"
 msgstr "Service-Checks verfolgen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:148
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:636
+msgid "Occurence"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:250
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:121
 msgid "Ok"
 msgstr "Ok"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:92
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:95
+msgid "Old instance name missing"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:100
+msgid "Old monitoring backend name missing"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:536
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:98
 msgid "One day"
 msgstr "Ein Tag"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:94
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:538
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:100
 msgid "One month"
 msgstr "Ein Monat"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:93
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:537
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:99
 msgid "One week"
 msgstr "Eine Woche"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:95
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:539
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:101
 msgid "One year"
 msgstr "Ein Jahr"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:50
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:72
+#, fuzzy
+msgid "Output"
+msgstr "Check Ausgabe"
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:131
 msgid "Overview"
 msgstr "Übersicht"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/contacts.phtml:33
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/contact.phtml:26
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:76
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:76
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:182
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:190
+#, fuzzy
+msgid "PENDING"
+msgstr "%d Hosts UNGEPRÜFT"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:34
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:32
 msgid "Pager"
 msgstr "Pager"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:30
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:62
-msgid "Passive"
-msgstr "Passiv"
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:379
+msgid "Pager Address / Number"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/flags.phtml:13
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:48
 msgid "Passive Checks"
 msgstr "Passive Checks"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:357
-msgid "Passive check result has been submitted"
-msgstr "Passives Check-Ergebnis wurde gesendet"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:162
+msgid "Passive Host Checks Being Accepted"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:476
-msgid "Passive checks for this object will be accepted."
-msgstr "Passives Check-Ergebnis für dieses Objekt werden akzeptiert."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:171
+msgid "Passive Service Checks Being Accepted"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:442
-msgid "Passive checks for this object will be omitted."
-msgstr "Passives Check-Ergebnis für dieses Objekt werden ignoriert."
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:150
+#, fuzzy
+msgid "Passive checks"
+msgstr "Passive Checks"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:152
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:112
+msgid "Password"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:66
+msgid "Path to the Icinga command file on the remote Icinga instance"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php:32
+msgid "Path to the local Icinga command file"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:81
 msgid "Performance Data"
 msgstr "Performancedaten"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:122
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:180
+#, fuzzy
+msgid "Performance Data Being Processed"
+msgstr "Performancedaten"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:70
 msgid "Performance Info"
 msgstr "Performance-Info"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/perfdata.phtml:3
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/perfdata.phtml:3
 msgid "Performance data"
 msgstr "Performancedaten"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CommentForm.php:46
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:55
 msgid "Persistent"
 msgstr "Persisten"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:52
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:61
 msgid "Persistent Comment"
 msgstr "Persistenter Kommentar"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CommentForm.php:55
-msgid "Post Comment"
-msgstr "Kommentar absenden"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:16
+msgid ""
+"Please configure below how Icinga Web 2 should retrieve monitoring "
+"information."
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:25
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/InstancePage.php:16
+msgid "Please define the settings specific to your monitoring instance below."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:16
+msgid ""
+"Please fill out the connection details below to access the IDO database of "
+"your monitoring environment."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:16
+msgid ""
+"Please fill out the connection details below to access the Livestatus socket "
+"interface for your monitoring environment."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/output.phtml:2
+msgid "Plugin Output"
+msgstr "Ausgabe des Plugins"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:42
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:100
+msgid "Port"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml:2
+msgctxt "multiselection"
+msgid ""
+"Press and hold the Ctrl key while clicking on rows to select multiple rows "
+"or press and hold the Shift key to select a range of rows."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:96
 msgid "Problems"
 msgstr "Probleme"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:118
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:19
 msgid "Process Info"
 msgstr "Prozess Info"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:148
-msgid "Process performance data"
-msgstr "Performancedaten verarbeiten"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml:16
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml:27
+#, fuzzy
+msgid "Process check result"
+msgstr "Check-Ergebnis"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:25
-msgid "Remove Acknowledgement"
-msgstr "Bestätigung entfernen"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:111
+msgid "Processing check result.."
+msgid_plural "Processing check results.."
+msgstr[0] ""
+msgstr[1] ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/comments.phtml:104
-msgid "Remove Comment"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:23
+#, fuzzy
+msgid "Program Start Time"
+msgstr "Anfangszeit"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/SecurityConfigForm.php:56
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:52
+msgid "Protected Custom Variables"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml:14
+#, fuzzy
+msgid "Reachable"
+msgstr "Nicht erreichbar"
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:223
+msgid "Recently Recovered Services"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:76
+msgid "Remote"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:203
+#, fuzzy
+msgid "Remote Command File"
 msgstr "Kommentar entfernen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/multi/components/comments.phtml:10
-msgid "Remove Comments"
-msgstr "Kommentare entfernen"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:633
-msgid "Remove Downtime(s)"
-msgstr "Downtime(s) entfernen"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:960
-msgid "Remove Problem Acknowledgement"
-msgstr "Problembestätigung entfernen"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:903
-msgid "Remove comment"
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:58
+#, fuzzy
+msgid "Remote Host"
 msgstr "Kommentar entfernen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:634
-msgid "Remove downtime(s) from this host and its services."
-msgstr "Downtime(s) für diesen Host und seine Services entfernen."
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:62
+msgid "Remote SSH Port"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:26
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:66
+msgid "Remote SSH User"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:15
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:59
+#, fuzzy
+msgid "Remove"
+msgstr "Kommentar entfernen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:86
+msgid "Remove Existing Backend"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:122
+msgid "Remove Existing Instance"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:42
+#, fuzzy, php-format
+msgid "Remove monitoring backend %s"
+msgstr "Monitoring-Prozess neu starten"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:86
+#, fuzzy, php-format
+msgid "Remove monitoring instance %s"
+msgstr "Monitoring-Prozess neu starten"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:30
+#, fuzzy
 msgid "Remove problem acknowledgement"
-msgstr "Problembestätigung entfernen"
+msgid_plural "Remove problem acknowledgements"
+msgstr[0] "Problembestätigung entfernen"
+msgstr[1] "Problembestätigung entfernen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:961
-msgid "Remove problem acknowledgement for this object."
-msgstr "Problembestätigungen für diesen Host und seine Services entfernen."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:48
+#, fuzzy
+msgid "Removing problem acknowledgement.."
+msgid_plural "Removing problem acknowledgements.."
+msgstr[0] "Problembestätigung entfernen"
+msgstr[1] "Problembestätigung entfernen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:28
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:541
+msgid "Report interval"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:196
+msgid "Reporting"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:32
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:45
 msgid "Reschedule"
 msgstr "Neu planen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:64
-msgid "Reschedule Check"
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostController.php:95
+#, fuzzy
+msgid "Reschedule Host Check"
 msgstr "Check neu planen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:9
-msgid "Reschedule next check immediately"
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostsController.php:196
+#, fuzzy
+msgid "Reschedule Host Checks"
+msgstr "Check neu planen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:72
+#, fuzzy
+msgid "Reschedule Service Check"
+msgstr "Check neu planen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:245
+#, fuzzy
+msgid "Reschedule Service Checks"
+msgstr "Check neu planen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:17
+#, fuzzy, php-format
+msgid "Reschedule the next check for all %u hosts"
 msgstr "Nächsten Check sofort einplanen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:921
-msgid "Reset Attributes"
-msgstr "Attribute zurücksetzen"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:17
+#, fuzzy, php-format
+msgid "Reschedule the next check for all %u services"
+msgstr "Nächsten Check sofort einplanen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:922
-msgid "Reset modified attributes to its default."
-msgstr "Veränderte Attribute zurücksetzen."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:240
+#, fuzzy
+msgid "Resource"
+msgstr "Check-Quelle"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:161
-msgid "Restart"
-msgstr "Neustarten"
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:88
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:123
+msgid "Resource Name"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1039
-msgid "Restart monitoring process"
-msgstr "Monitoring-Prozess neu starten"
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:158
+#, php-format
+msgid "Resource configuration could not be udpated: %s; An error occured:"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:162
-msgid "Restart the monitoring process"
-msgstr "Monitoring-Prozess neu starten"
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:155
+#, php-format
+msgid "Resource configuration has been successfully updated: %s"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1040
-msgid "Restart the monitoring process."
-msgstr "Monitoring-Prozess neu starten."
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:65
+msgid "Restrict hosts view to the hosts that match the filter"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:278
-msgid "Schedule Downtime"
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:70
+msgid "Restrict services view to the services that match the filter"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:43
+msgid "SSH port to connect to on the remote Icinga instance"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:30
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:27
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/SecurityConfigForm.php:20
+#, fuzzy
+msgid "Save Changes"
+msgstr "Passive Checks"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostController.php:107
+#, fuzzy
+msgid "Schedule Host Downtime"
 msgstr "Downtime planen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/downtime.phtml:57
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostsController.php:208
+#, fuzzy
+msgid "Schedule Host Downtimes"
+msgstr "Downtime planen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:84
+#, fuzzy
+msgid "Schedule Service Downtime"
+msgstr "Downtime planen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:257
+#, fuzzy
+msgid "Schedule Service Downtimes"
+msgstr "Downtime planen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:55
+#, php-format
+msgid "Schedule a downtime for %u unhandled host problem"
+msgid_plural "Schedule a downtime for %u unhandled host problems"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:55
+#, php-format
+msgid "Schedule a downtime for %u unhandled service problem"
+msgid_plural "Schedule a downtime for %u unhandled service problems"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:23
+#, fuzzy, php-format
+msgid "Schedule a downtime for all %u hosts"
+msgstr "Downtime planen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:23
+#, fuzzy, php-format
+msgid "Schedule a downtime for all %u services"
+msgstr "Downtime planen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:15
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:28
+msgid ""
+"Schedule a downtime to suppress all problem notifications within a specific "
+"period of time"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:34
+#, fuzzy
+msgid "Schedule check"
+msgid_plural "Schedule checks"
+msgstr[0] "Check neu planen"
+msgstr[1] "Check neu planen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:28
+msgid "Schedule check for all services on the hosts and the hosts themselves."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:47
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:8
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:21
+#, fuzzy
 msgid "Schedule downtime"
+msgid_plural "Schedule downtimes"
+msgstr[0] "Downtime planen"
+msgstr[1] "Downtime planen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:30
+msgid ""
+"Schedule downtime for all services on the hosts and the hosts themselves."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:43
+msgid "Schedule non-triggered downtime for all child hosts"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:39
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:52
+msgid "Schedule the next active check at a different time than the current one"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:43
+#, fuzzy
+msgid "Schedule the next active check to run immediately"
+msgstr "Nächsten Check sofort einplanen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:42
+msgid "Schedule triggered downtime for all child hosts"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:304
+#, fuzzy
+msgid "Scheduled End"
 msgstr "Downtime planen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:258
-msgid "Schedule non-triggered downtime for all child objects"
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:303
+#, fuzzy
+msgid "Scheduled Start"
+msgstr "Downtime planen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:72
+#, fuzzy
+msgid "Scheduling check.."
+msgid_plural "Scheduling checks.."
+msgstr[0] "Check neu planen"
+msgstr[1] "Check neu planen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:51
+#, fuzzy
+msgid "Scheduling host check.."
+msgid_plural "Scheduling host checks.."
+msgstr[0] "Host-Checks verfolgen"
+msgstr[1] "Host-Checks verfolgen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:86
+#, fuzzy
+msgid "Scheduling host downtime.."
+msgid_plural "Scheduling host downtimes.."
+msgstr[0] "Downtime planen"
+msgstr[1] "Downtime planen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:100
+#, fuzzy
+msgid "Scheduling service check.."
+msgid_plural "Scheduling service checks.."
+msgstr[0] "Service-Checks verfolgen"
+msgstr[1] "Service-Checks verfolgen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:207
+#, fuzzy
+msgid "Scheduling service downtime.."
+msgid_plural "Scheduling service downtimes.."
+msgstr[0] "Downtime planen"
+msgstr[1] "Downtime planen"
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:80
+msgid "Security"
 msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:257
-msgid "Schedule triggered downtime for all child objects"
-msgstr ""
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CustomNotificationForm.php:65
-msgid "Selecting this option causes the notification to be sent out to all normal (non-escalated)  and escalated contacts. These options allow you to override the normal notification logic if you need to get an important message out."
-msgstr "Das Aktivieren diese Option verursacht, dass die Benachrichtigung an alle normalen (nicht-eskalierten) sowie eskalierten Kontakte gesendet wird. Die erlaubt es, die normale Benachrichtigungslogik zu übergehen, wenn eine dringende Nachricht versendet werden muss."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CustomNotificationForm.php:72
-msgid "Send Custom Notification"
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostController.php:131
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostsController.php:232
+#, fuzzy
+msgid "Send Custom Host Notification"
 msgstr "Benutzerdefinierte Benachrichtigung senden"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:107
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:108
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:281
+#, fuzzy
+msgid "Send Custom Service Notification"
+msgstr "Benutzerdefinierte Benachrichtigung senden"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:123
 msgid "Send Notification"
 msgstr "Benachrichtigung senden"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/header.phtml:23
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:36
+#, fuzzy, php-format
+msgid "Send a custom notification for all %u hosts"
+msgstr "Benutzerdefinierte Benachrichtigung senden"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:36
+#, fuzzy, php-format
+msgid "Send a custom notification for all %u services"
+msgstr "Benutzerdefinierte Benachrichtigung senden"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:25
+msgid ""
+"Send a custom notification, share information about the object to contacts."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:28
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:24
+#, php-format
+msgid "Send a mail to %s"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:34
+#, fuzzy
+msgid "Send custom notification"
+msgid_plural "Send custom notifications"
+msgstr[0] "Benutzerdefinierte Benachrichtigung senden"
+msgstr[1] "Benutzerdefinierte Benachrichtigung senden"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:106
+msgid "Send custom notification.."
+msgid_plural "Send custom notifications.."
+msgstr[0] "Benutzerdefinierte Benachrichtigung senden"
+msgstr[1] "Benutzerdefinierte Benachrichtigungen senden"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:18
+msgid "Send notification"
+msgstr "Benachrichtigung senden"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:62
+#, php-format
+msgid "Sent to %s"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:298
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:491
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:226
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:53
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:58
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:45
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml:13
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/service/object-header.phtml:34
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:201
 msgid "Service"
 msgstr "Service"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:41
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:55
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml:7
+#, fuzzy, php-format
+msgid "Service (%u)"
+msgid_plural "Services (%u)"
+msgstr[0] "Service"
+msgstr[1] "Service"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:141
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:161
+#, fuzzy
+msgid "Service Checks"
+msgstr "Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:119
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:646
+#, fuzzy
+msgid "Service Grid"
+msgstr "Service"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:25
+#, fuzzy
+msgid "Service Group"
+msgstr "Servicegruppen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:239
+#, fuzzy
+msgid "Service Group Chart"
+msgstr "Servicegruppen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:546
+#, fuzzy
+msgid "Service Group Name"
+msgstr "Servicegruppen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:509
+#, fuzzy
+msgid "Service Groups"
+msgstr "Servicegruppen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:224
+#, fuzzy
+msgid "Service Name"
+msgstr "Service-Zustand"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:380
+#, fuzzy
+msgid "Service Notification Timeperiod"
+msgstr "Benachrichtigungzeitraum des Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:115
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:219
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:77
 msgid "Service Problems"
 msgstr "Service-Probleme"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/MultiController.php:123
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:222
+#, fuzzy
+msgid "Service Severity"
+msgstr "Service-Zustand"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:80
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:202
 msgid "Service State"
 msgstr "Service-Zustand"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/contacts.phtml:40
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/contact.phtml:39
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:27
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:27
+#, fuzzy
+msgid "Service States"
+msgstr "Service-Zustand"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:658
+msgid "Service description"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/service/show.phtml:3
+#, fuzzy
+msgid "Service detail information"
+msgstr "Benachrichtigungzeitraum des Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:33
+#, fuzzy
+msgid "Service not found"
+msgstr "Benachrichtigungzeitraum des Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:42
 msgid "Service notification period"
 msgstr "Benachrichtigungzeitraum des Services"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:70
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml:14
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:91
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:147
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml:17
 msgid "Servicegroups"
 msgstr "Servicegruppen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:66
-msgid "Servicematrix"
-msgstr "Service-Matrix"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:62
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:142
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/servicegroups.phtml:29
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hostgroups.phtml:26
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:8
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:28
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:22
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/multi/components/objectlist.phtml:30
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/multi/components/summary.phtml:5
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:89
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:143
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:243
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:171
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:101
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:240
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:100
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:96
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:42
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:8
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:50
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:48
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:215
 msgid "Services"
 msgstr "Services"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:8
-#, php-format
-msgid "Services with state %s"
-msgstr "Service im Zustand %s"
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:550
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:600
+#, fuzzy
+msgid "Services CRITICAL"
+msgstr "KRITISCH"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:37
-msgid "Set the date/time when this check should be executed."
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:548
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:598
+#, fuzzy
+msgid "Services OK"
+msgstr "Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:552
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:602
+#, fuzzy
+msgid "Services PENDING"
+msgstr "Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:549
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:599
+#, fuzzy
+msgid "Services UNKNOWN"
+msgstr "Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:551
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:601
+#, fuzzy
+msgid "Services WARNING"
+msgstr "Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:53
+#, fuzzy
+msgid "Set the date and time when the check should be scheduled."
 msgstr "Setze den Zeitpunkt zu welchem dieser Check ausgeführt werden soll."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:176
-msgid "Set the end date/time for the downtime."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:89
+#, fuzzy
+msgid "Set the end date and time for the downtime."
 msgstr "Setze den Endzeitpunkt für diese Downtime."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:165
-msgid "Set the start date/time for the downtime."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:44
+#, fuzzy
+msgid "Set the expire time."
+msgstr "Verfallszeitpunkt nutzen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:79
+#, fuzzy
+msgid "Set the start date and time for the downtime."
 msgstr "Setze den Startzeitpunkt für diese Downtime."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:132
-msgid "Set the state which should be send to Icinga for this objects."
-msgstr "Setze den Status welcher für dieses Objekt an Icinga gesendet werden soll."
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:97
+msgid "Setup the monitoring module for Icinga Web 2"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1019
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:168
-msgid "Shutdown monitoring process"
-msgstr "Monitoring-Prozess herunterefahren"
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:132
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:545
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:595
+msgid "Severity"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:169
-msgid "Shutdown the monitoring process"
-msgstr "Monitoring-Prozess herunterfahren"
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:256
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:231
+#, php-format
+msgid "Show all event records of host %s"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/notifications.phtml:6
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/servicematrix.phtml:5
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/comments.phtml:11
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/downtimes.phtml:9
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/eventhistory.phtml:5
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hosts.phtml:10
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/services.phtml:10
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:252
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:227
+#, php-format
+msgid "Show all event records of service %s on host %s"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TacticalController.php:15
+msgid ""
+"Show an overview of all hosts and services, their current states and "
+"monitoring feature utilisation"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/contactgroups.phtml:29
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:23
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:36
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:11
+#, php-format
+msgid "Show detailed information about %s"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:208
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Link.php:37
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:104
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:120
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:183
+#, php-format
+msgid "Show detailed information for host %s"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:222
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Link.php:60
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:93
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:112
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:151
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:197
+#, php-format
+msgid "Show detailed information for service %s on host %s"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:26
+msgid ""
+"Show information about the current monitoring instance's process and it's "
+"performance as well as available features"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:41
+msgid ""
+"Show recent alerts and visualize notifications and problems based on their "
+"amount and chronological distribution"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:259
+msgid "Show resource configuration"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostsController.php:77
+#, php-format
+msgid "Show summarized information for %u hosts"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:98
+#, php-format
+msgid "Show summarized information for %u services"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:390
+msgid "Show the Event Grid"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:646
+msgid "Show the Service Grid"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:258
+#, php-format
+msgid "Show the configuration of the %s resource"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:21
+msgid "Show the number of historical event records grouped by time and type"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:75
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:76
+msgid "Skip Validation"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:127
+msgid "Socket"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:5
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:12
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:13
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:7
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:12
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:12
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:10
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:7
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:14
 msgid "Sort by"
 msgstr "Sortiere nach"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:471
-msgid "Start Accepting Passive Checks"
-msgstr "Passive Checks akzepzieren"
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:94
+#, fuzzy
+msgctxt "setup.welcome.btn.next"
+msgid "Start"
+msgstr "Beginnt"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:162
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:301
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:78
 msgid "Start Time"
 msgstr "Anfangszeit"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:403
-msgid "Start obsessing"
-msgstr "Verfolgung beginnen"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:408
-msgid "Start obsessing over this object."
-msgstr "Verfolgung dieses Objekts beginnen"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:58
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:64
 msgid "Started downtimes"
 msgstr "Begonnene Downtimes"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/downtimes.phtml:34
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:43
 msgid "Starts"
 msgstr "Beginnt"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:94
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:115
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:135
+#, fuzzy
+msgid "State"
+msgstr "Host-Status"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:46
+#, fuzzy
+msgid "State Changes"
+msgstr "Harte Status-Änderungen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:53
+msgid "Status"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:111
 msgid "Sticky Acknowledgement"
 msgstr "Klebrige Bestätigung"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:437
-msgid "Stop Accepting Passive Checks"
-msgstr "Passive Checks nicht mehr akzeptieren"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1020
-msgid "Stop monitoring instance. You have to start it again from command line."
-msgstr "Überwachungsinstanz stoppen. Muss anschließen von der Kommandozeile aus neu gestartet werden."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:369
-msgid "Stop obsessing"
-msgstr "Verfolgung deaktivieren"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:374
-msgid "Stop obsessing over this object."
-msgstr "Verfolgung für dieses Objekt deaktivieren"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:159
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:31
+#, fuzzy
 msgid "Submit Passive Check Result"
+msgid_plural "Submit Passive Check Results"
+msgstr[0] "Passives Check-Ergebnis übermitteln"
+msgstr[1] "Passives Check-Ergebnis übermitteln"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostController.php:119
+#, fuzzy
+msgid "Submit Passive Host Check Result"
 msgstr "Passives Check-Ergebnis übermitteln"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:117
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostsController.php:220
+#, fuzzy
+msgid "Submit Passive Host Check Results"
+msgstr "Passives Check-Ergebnis übermitteln"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:96
+#, fuzzy
+msgid "Submit Passive Service Check Result"
+msgstr "Passives Check-Ergebnis übermitteln"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:269
+#, fuzzy
+msgid "Submit Passive Service Check Results"
+msgstr "Passives Check-Ergebnis übermitteln"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml:13
+#, php-format
+msgid "Submit a one time or so called passive result for the %s check"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:29
+#, fuzzy, php-format
+msgid "Submit a passive check result for all %u hosts"
+msgstr "Passives Check-Ergebnis übermitteln"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:29
+#, fuzzy, php-format
+msgid "Submit a passive check result for all %u services"
+msgstr "Passives Check-Ergebnis übermitteln"
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:208
 msgid "System"
 msgstr "System"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:61
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:275
-msgid "TODO: Help message when with children is disabled"
-msgstr ""
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:59
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:247
-msgid "TODO: Help message when with children is enabled"
-msgstr ""
-
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:54
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TacticalController.php:15
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:135
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TacticalController.php:18
 msgid "Tactical Overview"
 msgstr "Taktische Übersicht"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:51
-msgid "Temporarily disable"
-msgstr "Temporär deaktivieren"
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:169
+msgid ""
+"The Zend database adapter for MySQL is required to access a MySQL database."
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/notifications.phtml:25
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:189
+msgid ""
+"The Zend database adapter for PostgreSQL is required to access a PostgreSQL "
+"database."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:227
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:46
+msgid "The data source used for retrieving monitoring information"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/DataView/DataView.php:338
+#, php-format
+msgid "The filter column \"%s\" is not allowed here."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:60
+msgid "The given resource name is already in use."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:217
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:29
+msgid "The identifier of this backend"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:46
 #, php-format
 msgid "The last one occured %s ago"
 msgstr "Die letzte geschah vor %s"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/DelayNotificationForm.php:45
-msgid "The notification delay will be disregarded if the host/service changes state before the next notification is scheduled to be sent out."
-msgstr "Die Benachrichtigungsverzögerung wird ignoriert wenn der Host/Service vor der nächsten zu versendenden Benachrichtigung seinen Status ändert."
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ShowController.php:111
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:122
 msgid "The parameter `contact' is required"
 msgstr "Der Parameter `contact' ist erforderlich"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/history.phtml:3
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:83
+msgid ""
+"The performance data of this check result. Leave empty if this check result "
+"has no performance data"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:73
+msgid "The plugin output of this check result"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:241
+msgid "The resource to use"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/DataView/DataView.php:247
+#, php-format
+msgid "The sort column \"%s\" is not allowed in \"%s\"."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:54
+msgid "The state this check result should report"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:91
+#, php-format
+msgid "There is no \"%s\" monitoring backend"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:17
 msgid "This Object's Event History"
 msgstr "Historie dieses Objekts"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:24
-msgid "This command is used to acknowledge host or service problems. When a problem is acknowledged, future notifications about problems are temporarily disabled until the host/service changes from its current state."
-msgstr "Dieses Kommando wird benutzt um Host- oder Service-Probleme zu bestätigen. Wenn ein Problem bestätigt ist, werden zukünftige Benachrichtigungen temporär deaktiviert, bis der Host/Service seinen Zustand wieder ändert."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:22
+#, fuzzy
+msgid ""
+"This command is used to acknowledge host or service problems. When a problem "
+"is acknowledged, future notifications about problems are temporarily "
+"disabled until the host or service recovers."
+msgstr ""
+"Dieses Kommando wird benutzt um Host- oder Service-Probleme zu bestätigen. "
+"Wenn ein Problem bestätigt ist, werden zukünftige Benachrichtigungen "
+"temporär deaktiviert, bis der Host/Service seinen Zustand wieder ändert."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CommentForm.php:22
-msgid "This command is used to add a comment to hosts or services."
-msgstr "Dieses Kommando wird benutzt um Kommentare zu Hosts oder Services hinzuzufügen."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:19
+#, fuzzy
+msgid "This command is used to add host or service comments."
+msgstr ""
+"Dieses Kommando wird benutzt um Kommentare zu Hosts oder Services "
+"hinzuzufügen."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/DelayNotificationForm.php:24
-msgid "This command is used to delay the next problem notification that is sent out."
-msgstr "Dieses Kommando wird benutzt um den Versand der nächsten Benachrichtigung zu diesem Problem zu verzögern."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:26
+#, fuzzy
+msgid ""
+"This command is used to disable host and service notifications for a "
+"specific time."
+msgstr ""
+"Dieses Kommando wird benutzt um den Versand der nächsten Benachrichtigung zu "
+"diesem Problem zu verzögern."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:121
-msgid "This command is used to schedule downtime for hosts/services. During the specified downtime, Icinga will not send notifications out about the affected objects. When the scheduled downtime expires, Icinga will send out notifications as it normally would. Scheduled downtimes are preserved across program shutdowns and restarts."
-msgstr "Dieses Kommando wird benutzt um Downtimes für Hosts/Services einzuplanen. Während der angegebenen Downtime wird Icinga keine Benachrichtigungen zum entsprechenden Objekt versenden. Wenn die eingeplante Downtime vorüber ist, wird Icinga mit dem Versand der Benachrichtigungen wie gewohnt fortfahren. Eingeplante Downtimes übersteh das Herunterfahren und Neustarten der Applikation."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:33
+#, fuzzy
+msgid ""
+"This command is used to schedule host and service downtimes. During the "
+"specified downtime, Icinga will not send notifications out about the hosts "
+"and services. When the scheduled downtime expires, Icinga will send out "
+"notifications for the hosts and services as it normally would. Scheduled "
+"downtimes are preserved across program shutdowns and restarts."
+msgstr ""
+"Dieses Kommando wird benutzt um Downtimes für Hosts/Services einzuplanen. "
+"Während der angegebenen Downtime wird Icinga keine Benachrichtigungen zum "
+"entsprechenden Objekt versenden. Wenn die eingeplante Downtime vorüber ist, "
+"wird Icinga mit dem Versand der Benachrichtigungen wie gewohnt fortfahren. "
+"Eingeplante Downtimes übersteh das Herunterfahren und Neustarten der "
+"Applikation."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:24
-msgid "This command is used to schedule the next check of hosts/services. Icinga will re-queue the check at the time you specify."
-msgstr "Dieses Kommando wird benutzt, um den nächsten Check des Hosts/Services einzuplanen. Icinga wird den Check für den von dir gewählten Zeitpunkt vormerken."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:23
+#, fuzzy
+msgid ""
+"This command is used to schedule the next check of hosts or services. Icinga "
+"will re-queue the hosts or services to be checked at the time you specify."
+msgstr ""
+"Dieses Kommando wird benutzt, um den nächsten Check des Hosts/Services "
+"einzuplanen. Icinga wird den Check für den von dir gewählten Zeitpunkt "
+"vormerken."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CustomNotificationForm.php:22
-msgid "This command is used to send a custom notification about hosts or services. Useful in emergencies when you need to notify admins of an issue regarding a monitored system or service."
-msgstr "Dieses Kommando ermöglicht es, personalisierte Benachrichtigungen für Hosts oder Services zu versenden. Nützlich ist das vor allem im Notfall, wenn man andere Administratoren über Probleme zu einem bestimmten System oder Dienst informieren möchte."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:21
+#, fuzzy
+msgid ""
+"This command is used to send custom notifications for hosts or services."
+msgstr ""
+"Dieses Kommando wird benutzt um Kommentare zu Hosts oder Services "
+"hinzuzufügen."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:106
-msgid "This command is used to submit a passive check result for particular hosts/services. It is particularly useful for resetting security-related objects to OK states once they have been dealt with."
-msgstr "Dieses Kommando erlaubt es, ein passives Check-Ergebnis für einen bestimmten Host oder Service einzuliefern. Das ist for allem dann nützlich, wenn man sicherheitsrelevante Objekte zurück auf einen OK-Status setzen möchte, sobald man sich darum gekümmert hat."
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:20
+#, fuzzy
+msgid "This command is used to submit passive host or service check results."
+msgstr ""
+"Dieses Kommando wird benutzt um Kommentare zu Hosts oder Services "
+"hinzuzufügen."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/comments.phtml:90
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:76
 msgid "This comment does not expire."
 msgstr "Dieser Kommentar verfällt nicht."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/comments.phtml:87
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:73
 #, php-format
 msgid "This comment expires on %s at %s."
 msgstr "Dieser Kommentar verfällt am %s um %s."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/comments.phtml:83
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:69
 msgid "This comment is not persistent."
 msgstr "Dieser Kommentar ist nicht persistent."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/comments.phtml:82
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:68
 msgid "This comment is persistent."
 msgstr "Dieser Kommentar ist persistent."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/downtimes.phtml:89
-#, php-format
-msgid "This fixed downtime has been scheduled to start on %s at %s and to end on %s at %s."
-msgstr "Diese fixe Downtime wurde eingeplant um am %s um %s zu starten und am %s um %s zu enden."
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:107
+#, fuzzy, php-format
+msgid ""
+"This fixed host downtime has been scheduled to start on %s at %s and to end "
+"on %s at %s."
+msgstr ""
+"Diese fixe Downtime wurde eingeplant um am %s um %s zu starten und am %s um "
+"%s zu enden."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/downtimes.phtml:81
-#, php-format
-msgid "This fixed downtime was started on %s at %s and expires on %s at %s."
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:97
+#, fuzzy, php-format
+msgid ""
+"This fixed host downtime was started on %s at %s and expires on %s at %s."
 msgstr "Diese fixe Downtime begann am %s um %s und endet am %s um %s."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/downtimes.phtml:72
-#, php-format
-msgid "This flexible downtime has been scheduled to start between %s - %s and to last for %s."
-msgstr "Diese flexible Downtime wurde für den Zeitraum von %s - %s eingeplant und wird %s dauern."
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:106
+#, fuzzy, php-format
+msgid ""
+"This fixed service downtime has been scheduled to start on %s at %s and to "
+"end on %s at %s."
+msgstr ""
+"Diese fixe Downtime wurde eingeplant um am %s um %s zu starten und am %s um "
+"%s zu enden."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/downtimes.phtml:63
-#, php-format
-msgid "This flexible downtime was started on %s at %s and lasts for %s until %s at %s."
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:96
+#, fuzzy, php-format
+msgid ""
+"This fixed service downtime was started on %s at %s and expires on %s at %s."
+msgstr "Diese fixe Downtime begann am %s um %s und endet am %s um %s."
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:86
+#, fuzzy, php-format
+msgid ""
+"This flexible host downtime has been scheduled to start between %s - %s and "
+"to last for %s."
+msgstr ""
+"Diese flexible Downtime wurde für den Zeitraum von %s - %s eingeplant und "
+"wird %s dauern."
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:75
+#, fuzzy, php-format
+msgid ""
+"This flexible host downtime was started on %s at %s and lasts for %s until "
+"%s at %s."
 msgstr "Diese flexible Downtime begann am %s um %s und dauert %s bis %s am %s."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/host.phtml:4
-msgid "This host's current state"
-msgstr "Aktueller Zustand dieses Host"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:85
+#, fuzzy, php-format
+msgid ""
+"This flexible service downtime has been scheduled to start between %s - %s "
+"and to last for %s."
+msgstr ""
+"Diese flexible Downtime wurde für den Zeitraum von %s - %s eingeplant und "
+"wird %s dauern."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/service.phtml:4
-msgid "This service's current state"
-msgstr "Aktueller Zustand dieses Services"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:74
+#, fuzzy, php-format
+msgid ""
+"This flexible service downtime was started on %s at %s and lasts for %s "
+"until %s at %s."
+msgstr "Diese flexible Downtime begann am %s um %s und dauert %s bis %s am %s."
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:112
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/WelcomePage.php:33
+msgid "This is the core module for Icinga Web 2."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:22
+msgid "Time to Reaction (Ack, Recover)"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:103
+msgid "TimeLine interval"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:191
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:22
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:26
 msgid "Timeline"
 msgstr "Zeitleiste"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:150
-msgid "Triggered by"
-msgstr "Ausgelöst von"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:83
+msgid "To"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:54
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:160
+msgid ""
+"To access the IDO stored in a MySQL database the PDO-MySQL module for PHP is "
+"required."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:180
+msgid ""
+"To access the IDO stored in a PostgreSQL database the PDO-PostgreSQL module "
+"for PHP is required."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/SecurityPage.php:16
+msgid ""
+"To protect your monitoring environment against prying eyes please fill out "
+"the settings below."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:86
+msgid "Today"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:219
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:133
+msgid "Toggling feature.."
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:56
+msgid "Top 5 Recent Alerts"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:547
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:597
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:26
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:26
+#, fuzzy
+msgid "Total Services"
+msgstr "Services"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:29
+msgid "Trend"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:39
+msgid "Trend for the last 24h"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:99
+msgid "Type"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:31
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:75
+#, php-format
+msgid "Type: %s"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:40
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:58
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:40
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:58
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:187
 msgid "UNKNOWN"
 msgstr "UNBEKANNT"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:48
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:63
+#, fuzzy
+msgctxt "icinga.state"
+msgid "UNKNOWN"
+msgstr "UNBEKANNT"
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:179
 msgid "UNREACHABLE"
 msgstr "UNERREICHBAR"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:46
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:58
+#, fuzzy
+msgctxt "icinga.state"
+msgid "UNREACHABLE"
+msgstr "UNERREICHBAR"
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:173
 msgid "UP"
 msgstr "UP"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:23
-#, php-format
-msgid "Unhandled services with state %s"
-msgstr "Unbestätigte Services mit Status %s"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:56
+#, fuzzy
+msgctxt "icinga.state"
+msgid "UP"
+msgstr "UP"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:29
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:49
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:71
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:5
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:5
+#, fuzzy
+msgid "Unhandled"
+msgstr "Unbestätigte Hosts"
+
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:101
 msgid "Unhandled Hosts"
 msgstr "Unbestätigte Hosts"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/configuration.php:33
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:106
 msgid "Unhandled Services"
 msgstr "Unbestätigte Services"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:166
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:271
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:120
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:211
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:141
+msgid "Unknown instance name given"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:99
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:121
+msgid "Unknown instance name provided"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:104
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:126
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:172
+#, fuzzy
+msgid "Unknown monitoring backend provided"
+msgstr "Monitoring-Prozess herunterefahren"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:321
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:140
 msgid "Unreachable"
 msgstr "Nicht erreichbar"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:199
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:307
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:138
 msgid "Up"
 msgstr "Up"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:65
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:72
 msgid "Use Expire Time"
 msgstr "Verfallszeitpunkt nutzen"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/comments.phtml:36
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:52
+msgid "User"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:30
 msgid "User Comment"
 msgstr "Benutzerkommentar"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:52
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:54
+msgid ""
+"User to log in as on the remote Icinga instance. Please note that key-based "
+"SSH login must be possible for this user"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:108
+#, fuzzy
+msgid "Username"
+msgstr "Benutzerkommentar"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
+msgid "Value"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:624
+msgid "Value for interval not valid"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:46
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:64
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:46
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:64
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:181
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/ChartController.php:154
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:61
+#, fuzzy
+msgctxt "icinga.state"
+msgid "WARNING"
+msgstr "WARNUNG"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:257
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:119
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
 msgid "Warning"
 msgstr "Warnung"
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:54
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/WelcomePage.php:21
+msgid "Welcome to the configuration of the monitoring module for Icinga Web 2!"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml:17
+msgid "Yes"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:166
+msgid "Zend database adapter for MySQL"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:186
+msgid "Zend database adapter for PostgreSQL"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:51
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:39
 #, php-format
-msgid "Will be re-enabled in %s"
-msgstr "Wird in %s wieder aktiviert"
+msgctxt "time"
+msgid "at %s"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:888
-msgid "Your new comment has been submitted"
-msgstr "Dein neuer Kommentar wurde gesendet"
-
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/multi/components/objectlist.phtml:60
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:59
 #, php-format
-msgid "and %d more"
-msgstr "und %d weitere"
+msgctxt "timeline.link.title.datetime.twice"
+msgid "between %s and %s"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/statehistorysummary.phtml:18
-msgid "critical events on "
-msgstr "kritische Ereignisse auf"
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:107
+msgid "changed"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:15
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:182
+msgid "down"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:65
+#, fuzzy
+msgid "hard state"
+msgstr "Harte Status-Änderungen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:47
 #, php-format
-msgid "has been running with PID %d "
-msgstr "läuft mit PID %d"
+msgctxt "timeline.link.title.month.and.year"
+msgid "in %s"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/process/info.phtml:18
-msgid "is not running"
-msgstr "läuft nicht"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:53
+#, php-format
+msgctxt "timeline.link.title.year"
+msgid "in %s"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:8
-msgid "ok"
-msgstr "ok"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:52
+#, php-format
+msgctxt "timespan"
+msgid "in %s"
+msgstr ""
 
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/comments.phtml:66
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/downtimes.phtml:47
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/eventhistory.phtml:97
-#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/history.phtml:114
-msgid "on"
-msgstr "auf"
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:37
+msgid "in the last hour"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:40
+#, php-format
+msgctxt "timeline.link.title.week.and.year"
+msgid "in week %s of %s"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:35
+#, fuzzy
+msgid "notifications per hour"
+msgstr "Host-Benachrichtigungszeitraum"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:50
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:38
+#, php-format
+msgctxt "datetime"
+msgid "on %s"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:34
+#, php-format
+msgctxt "timeline.link.title.time"
+msgid "on %s"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:77
+msgid "overall"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml:5
+msgctxt "multiselection"
+msgid "row(s) selected"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:78
+#, fuzzy
+msgid "scheduled"
+msgstr "Neu planen"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:63
+#, fuzzy
+msgid "soft state"
+msgstr "Host-Status"
+
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:50
+#, fuzzy
+msgid "the monitoring module"
+msgstr "Monitoring-Prozess neu starten"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:180
+msgid "unchanged"
+msgstr ""
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:184
+msgid "up"
+msgstr ""
+
+#~ msgid ""
+#~ " If you work with other administrators you may find it useful to share "
+#~ "information about a host or service that is having problems if more than "
+#~ "one of you may be working on it. Make sure you enter a brief description "
+#~ "of what you are doing."
+#~ msgstr ""
+#~ "Wenn du mit anderen Administratoren zusammenarbeitest wirst du es als "
+#~ "nützlich empfinden, Informationen über Probleme auf Hosts oder Services "
+#~ "an denen du arbeitest zu teilen. Stell sicher eine kurze Beschreibung von "
+#~ "dem was du gerade machst zu hinterlassen."
+
+#~ msgid "%d are not checked at all"
+#~ msgstr "%d werden nicht überwacht"
+
+#~ msgid "%d are passively checked"
+#~ msgstr "%d werden passiv überwacht"
+
+#~ msgid "Accept passive host checks"
+#~ msgstr "Akzeptiere passive Host Checks"
+
+#~ msgid "Accept passive service checks"
+#~ msgstr "Akzeptiere passive Service-Checks"
+
+#~ msgid "Acknowledge all problems on the selected hosts or services"
+#~ msgstr "Bestätige alle Probleme auf den ausgewählten Hosts oder Services"
+
+#~ msgid "Acknowledgement has been sent"
+#~ msgstr "Bestätigung wurde gesendet"
+
+#~ msgid "Acknowledgement removal has been requested"
+#~ msgstr "Löschung der Bestätigung wurde angefragt"
+
+#~ msgid "All Events"
+#~ msgstr "Alle Ereignisse"
+
+#~ msgid "Author (Your Name)"
+#~ msgstr "Autor (Dein Name)"
+
+#~ msgid "Child Objects"
+#~ msgstr "Kind-Objekte"
+
+#~ msgid "Command has been sent, active checks will be disabled"
+#~ msgstr "Befehl wurde gesendet, aktive Checks werden deaktiviert"
+
+#~ msgid "Command has been sent, active checks will be enabled"
+#~ msgstr "Befehl wurde gesendet, aktive Checks werden aktiviert"
+
+#~ msgid "Command has been sent, check will be rescheduled"
+#~ msgstr "Befehl wurde gesendet, Check wird neu geplant"
+
+#~ msgid "Command has been sent, checks will be rescheduled"
+#~ msgstr "Befehl wurde gesendet, Checks werden neu geplant"
+
+#~ msgid "Command has been sent, event handlers will be disabled"
+#~ msgstr "Befehl wurde gesendet, Eventhandler werden deaktiviert"
+
+#~ msgid "Command has been sent, event handlers will be enabled"
+#~ msgstr "Befehl wurde gesendet, Eventhandler werden aktiviert"
+
+#~ msgid "Command has been sent, flap detection will be enabled"
+#~ msgstr "Befehl wurde gesendet, Flap-Erkennung wird aktiviert"
+
+#~ msgid "Command has been sent, monitoring process will restart now"
+#~ msgstr "Befehl wurde gesendet, der Monitoring-Prozess wird jetzt neustarten"
+
+#~ msgid "Command has been sent, notifications will be enabled"
+#~ msgstr "Befehl wurde gesendet, Benachrichtigungen werden aktiviert"
+
+#~ msgid "Command has been sent, obsessing will be disabled"
+#~ msgstr "Befehl wurde gesendet, Verfolgung wird deaktiviert"
+
+#~ msgid "Command has been sent, obsessing will be enabled"
+#~ msgstr "Befehl wurde gesendet, Verfolgung wird aktiviert"
+
+#~ msgid "Command has been sent, passive check results will be accepted"
+#~ msgstr "Befehl wurde gesendet, passive Checks werden akzeptiert werden"
+
+#~ msgid "Command has been sent, passive check results will be refused"
+#~ msgstr "Befehl wurde gesendet, passive Checks werden abgewiesen werden"
+
+#~ msgid "Command has been sent, performance data processing will be disabled"
+#~ msgstr ""
+#~ "Befehl wurde gesendet, Performancedatenverarbeitung wird deaktiviert "
+#~ "werden"
+
+#~ msgid "Command has been sent, performance data processing will be enabled"
+#~ msgstr ""
+#~ "Befehl wurde gesendet, Performancedatenverarbeitung wird aktiviert werden"
+
+#~ msgid "Command has been sent, process will shut down"
+#~ msgstr "Befehl wurde gesendet, der Monitoringprozess wird herunterfahren"
+
+#~ msgid "Comment removal has been requested"
+#~ msgstr "Löschung des Kommentars wurde angefordert"
+
+#~ msgid "Critical Events"
+#~ msgstr "Kritische Ereignisse"
+
+#~ msgid "Custom notification has been sent"
+#~ msgstr "Benutzerdefinierte Bestätigung wurde gesendet"
+
+#~ msgid ""
+#~ "Custom notifications normally follow the regular notification logic in "
+#~ "Icinga. Selecting this option will force the notification to be sent out, "
+#~ "regardless of time restrictions, whether or not notifications are "
+#~ "enabled, etc."
+#~ msgstr ""
+#~ "Benutzeredefinierte Benachrichtigungen verhalten sich gemäß der "
+#~ "gewöhnlichen Benachrichtigungslogik in Icinga. Wenn du diese Option "
+#~ "wählst wird eine Benachrichtigung erzwungen. Einschränkungen durch "
+#~ "Zeitspannen und durch eventuell deaktivierte Benachrichtigungen werden "
+#~ "dabei ignoriert."
+
+#~ msgid "Delay Notification"
+#~ msgstr "Benachrichtigung verzögern"
+
+#~ msgid "Delay Notifications"
+#~ msgstr "Benachrichtigungen verzögern"
+
+#~ msgid "Delete a single downtime with the id shown above"
+#~ msgstr "Lösche eine einzelne Downtime mit der oben gezeigten ID."
+
+#~ msgid "Disable Active Checks"
+#~ msgstr "Aktive Checks deaktivieren"
+
+#~ msgid "Disable Event Handler"
+#~ msgstr "Event-Handler deaktivieren"
+
+#~ msgid "Disable Flapping Detection"
+#~ msgstr "Flap-Erkennung deaktivieren"
+
+#~ msgid "Disable Performance Data"
+#~ msgstr "Performancedaten deaktivieren"
+
+#~ msgid "Disable active checks for this host and its services."
+#~ msgstr ""
+#~ "Deaktiviere aktive Service-Checks für diesen Host und seine Service-"
+#~ "Checks."
+
+#~ msgid "Disable active checks for this object."
+#~ msgstr "Deaktiviere aktive Service-Checks für dieses Objekt."
+
+#~ msgid "Disable active checks on a program-wide basis."
+#~ msgstr "Deaktiviere applikationsweit sämtliche aktiven Service-Checks."
+
+#~ msgid "Disable event handler for the whole system."
+#~ msgstr "Dektiviere Event-Handler für das ganze System."
+
+#~ msgid "Disable event handler for this object."
+#~ msgstr "Dektiviere Event-Handler für dieses Objekt."
+
+#~ msgid "Disable flapping detection for this object."
+#~ msgstr "Deaktiviere die Flap-Erkennnung für dieses Objekt."
+
+#~ msgid "Disable flapping detection on a program-wide basis."
+#~ msgstr "Deaktiviere die Flap-Erkennnung applikationsweit."
+
+#~ msgid "Disable notifications on a program-wide basis."
+#~ msgstr "Deaktiviere die Flap-Erkennnung applikationsweit."
+
+#~ msgid "Disable obsessing on a program-wide basis."
+#~ msgstr "Deaktiviere die Verfolgung applikationsweit."
+
+#~ msgid "Disable passive checks on a program-wide basis."
+#~ msgstr "Deaktiviere Passive Checks applikationsweit."
+
+#~ msgid "Disable processing of performance data on a program-wide basis."
+#~ msgstr ""
+#~ "Deaktiviere die Verarbeitung von Performance-Daten applikationsweit."
+
+#~ msgid "Downtime removal has been requested"
+#~ msgstr "Entfernung dieser Downtime wurde angefordert"
+
+#~ msgid "Downtime removal requested"
+#~ msgstr "Entfernung dieser Downtime wurde angefordert"
+
+#~ msgid "Downtime scheduling requested"
+#~ msgstr "Die Planung dieser Downtime wurde angefordert"
+
+#~ msgid "Enable Active Checks"
+#~ msgstr "Aktive Checks aktivieren"
+
+#~ msgid "Enable Event Handler"
+#~ msgstr "Eventhandler aktivieren"
+
+#~ msgid "Enable Flapping Detection"
+#~ msgstr "Flap-Erkennung aktivieren"
+
+#~ msgid "Enable Notifications"
+#~ msgstr "Benachrichtigungen aktivieren"
+
+#~ msgid "Enable Performance Data"
+#~ msgstr "Performancedaten aktivieren"
+
+#~ msgid "Enable active checks for this host and its services."
+#~ msgstr "Aktive Checks für diesen Host und seine Services aktivieren."
+
+#~ msgid "Enable active checks for this object."
+#~ msgstr "Aktive Checks für dieses Objekt aktivieren."
+
+#~ msgid "Enable active checks on a program-wide basis."
+#~ msgstr "Aktive Checks anwendungsweit aktivieren."
+
+#~ msgid "Enable event handler for this object."
+#~ msgstr "Event-Handler für dieses Objekt aktivieren."
+
+#~ msgid "Enable event handlers on the whole system."
+#~ msgstr "Event-Handler für das gesamte System aktivieren."
+
+#~ msgid "Enable flapping detection for this object."
+#~ msgstr "Flap-Erkennung für dieses Objekt aktivieren."
+
+#~ msgid "Enable flapping detection on a program-wide basis."
+#~ msgstr "Flap-Erkennung anwendungsweit aktivieren."
+
+#~ msgid "Enable notifications on a program-wide basis."
+#~ msgstr "Benachrichtigungen anwendungsweit aktivieren."
+
+#~ msgid "Enable obsessing on a program-wide basis."
+#~ msgstr "Verfolgung anwendungsweit aktivieren."
+
+#~ msgid "Enable passive checks on a program-wide basis."
+#~ msgstr "Passive Checks anwendungsweit aktivieren."
+
+#~ msgid "Enable processing of performance data on a program-wide basis."
+#~ msgstr "Performancedaten-Verarbeitung anwendungsweit aktivieren."
+
+#~ msgid "Event handlers"
+#~ msgstr "Eventhandler"
+
+#~ msgid "Execute active host checks"
+#~ msgstr "Aktiven Host Check ausführen"
+
+#~ msgid "Execute active service checks"
+#~ msgstr "Aktive Service-Checks ausführen"
+
+#~ msgid "Fill in the check output string which should be send to Icinga."
+#~ msgstr ""
+#~ "Ausgabetext des Checkergebnisses welches an Icinga gesendet werden soll "
+#~ "hier eintragen."
+
+#~ msgid "Fill in the performance data string which should be send to Icinga."
+#~ msgstr ""
+#~ "Performancedaten des Checkergebnisses welches an Icinga gesendet werden "
+#~ "soll hier eintragen."
+
+#~ msgid "Flags (host)"
+#~ msgstr "Flags (Host)"
+
+#~ msgid "Flags (service)"
+#~ msgstr "Flags (Service)"
+
+#~ msgid "Flap detection"
+#~ msgstr "Flap-Erkennung"
+
+#~ msgid "Handled services with state %s"
+#~ msgstr "Bestätigte Services mit Status %s"
+
+#~ msgid "Last check command"
+#~ msgstr "Letztes Check-Kommando"
+
+#~ msgid "No downtimes matching the filter"
+#~ msgstr "Zu diesem Filter wurden keine Downtimes gefunden"
+
+#~ msgid "No history entry matching the filter"
+#~ msgstr "Zu diesem Filter wurden keine historischen Ereignisse gefunden"
+
+#~ msgid "Not set"
+#~ msgstr "Nicht gesetzt"
+
+#~ msgid "Notification Delay (Minutes From Now)"
+#~ msgstr "Benachrichtigungsverzögerung (Minuten ab jetzt)"
+
+#~ msgid "Notification delay has been requested"
+#~ msgstr "Benachrichtigungsverzögerung wurde angefragt"
+
+#~ msgid "Notifications for this host and its services will be disabled."
+#~ msgstr ""
+#~ "Benachrichtigungen für diesen Host und seine Services werden deaktiviert."
+
+#~ msgid "Notifications for this host and its services will be enabled."
+#~ msgstr ""
+#~ "Benachrichtigungen für diesen Host und seine Services werden aktiviert."
+
+#~ msgid "Notifications for this object will be disabled."
+#~ msgstr "Benachrichtigungen für dieses Objekt werden deaktiviert."
+
+#~ msgid "Notifications for this object will be enabled."
+#~ msgstr "Benachrichtigungen für dieses Objekt werden aktiviert."
+
+#~ msgid "Passive check result has been submitted"
+#~ msgstr "Passives Check-Ergebnis wurde gesendet"
+
+#~ msgid "Passive checks for this object will be accepted."
+#~ msgstr "Passives Check-Ergebnis für dieses Objekt werden akzeptiert."
+
+#~ msgid "Passive checks for this object will be omitted."
+#~ msgstr "Passives Check-Ergebnis für dieses Objekt werden ignoriert."
+
+#~ msgid "Process performance data"
+#~ msgstr "Performancedaten verarbeiten"
+
+#~ msgid "Remove Acknowledgement"
+#~ msgstr "Bestätigung entfernen"
+
+#~ msgid "Remove Comments"
+#~ msgstr "Kommentare entfernen"
+
+#~ msgid "Remove Downtime(s)"
+#~ msgstr "Downtime(s) entfernen"
+
+#~ msgid "Remove Problem Acknowledgement"
+#~ msgstr "Problembestätigung entfernen"
+
+#~ msgid "Remove downtime(s) from this host and its services."
+#~ msgstr "Downtime(s) für diesen Host und seine Services entfernen."
+
+#~ msgid "Remove problem acknowledgement for this object."
+#~ msgstr "Problembestätigungen für diesen Host und seine Services entfernen."
+
+#~ msgid "Reset Attributes"
+#~ msgstr "Attribute zurücksetzen"
+
+#~ msgid "Reset modified attributes to its default."
+#~ msgstr "Veränderte Attribute zurücksetzen."
+
+#~ msgid "Restart"
+#~ msgstr "Neustarten"
+
+#~ msgid "Restart the monitoring process."
+#~ msgstr "Monitoring-Prozess neu starten."
+
+#~ msgid ""
+#~ "Selecting this option causes the notification to be sent out to all "
+#~ "normal (non-escalated)  and escalated contacts. These options allow you "
+#~ "to override the normal notification logic if you need to get an important "
+#~ "message out."
+#~ msgstr ""
+#~ "Das Aktivieren diese Option verursacht, dass die Benachrichtigung an alle "
+#~ "normalen (nicht-eskalierten) sowie eskalierten Kontakte gesendet wird. "
+#~ "Die erlaubt es, die normale Benachrichtigungslogik zu übergehen, wenn "
+#~ "eine dringende Nachricht versendet werden muss."
+
+#~ msgid "Servicematrix"
+#~ msgstr "Service-Matrix"
+
+#~ msgid "Services with state %s"
+#~ msgstr "Service im Zustand %s"
+
+#~ msgid "Set the state which should be send to Icinga for this objects."
+#~ msgstr ""
+#~ "Setze den Status welcher für dieses Objekt an Icinga gesendet werden soll."
+
+#~ msgid "Shutdown the monitoring process"
+#~ msgstr "Monitoring-Prozess herunterfahren"
+
+#~ msgid "Start Accepting Passive Checks"
+#~ msgstr "Passive Checks akzepzieren"
+
+#~ msgid "Start obsessing"
+#~ msgstr "Verfolgung beginnen"
+
+#~ msgid "Start obsessing over this object."
+#~ msgstr "Verfolgung dieses Objekts beginnen"
+
+#~ msgid ""
+#~ "Stop monitoring instance. You have to start it again from command line."
+#~ msgstr ""
+#~ "Überwachungsinstanz stoppen. Muss anschließen von der Kommandozeile aus "
+#~ "neu gestartet werden."
+
+#~ msgid "Stop obsessing"
+#~ msgstr "Verfolgung deaktivieren"
+
+#~ msgid "Stop obsessing over this object."
+#~ msgstr "Verfolgung für dieses Objekt deaktivieren"
+
+#~ msgid "Temporarily disable"
+#~ msgstr "Temporär deaktivieren"
+
+#~ msgid ""
+#~ "The notification delay will be disregarded if the host/service changes "
+#~ "state before the next notification is scheduled to be sent out."
+#~ msgstr ""
+#~ "Die Benachrichtigungsverzögerung wird ignoriert wenn der Host/Service vor "
+#~ "der nächsten zu versendenden Benachrichtigung seinen Status ändert."
+
+#~ msgid ""
+#~ "This command is used to send a custom notification about hosts or "
+#~ "services. Useful in emergencies when you need to notify admins of an "
+#~ "issue regarding a monitored system or service."
+#~ msgstr ""
+#~ "Dieses Kommando ermöglicht es, personalisierte Benachrichtigungen für "
+#~ "Hosts oder Services zu versenden. Nützlich ist das vor allem im Notfall, "
+#~ "wenn man andere Administratoren über Probleme zu einem bestimmten System "
+#~ "oder Dienst informieren möchte."
+
+#~ msgid ""
+#~ "This command is used to submit a passive check result for particular "
+#~ "hosts/services. It is particularly useful for resetting security-related "
+#~ "objects to OK states once they have been dealt with."
+#~ msgstr ""
+#~ "Dieses Kommando erlaubt es, ein passives Check-Ergebnis für einen "
+#~ "bestimmten Host oder Service einzuliefern. Das ist for allem dann "
+#~ "nützlich, wenn man sicherheitsrelevante Objekte zurück auf einen OK-"
+#~ "Status setzen möchte, sobald man sich darum gekümmert hat."
+
+#~ msgid "Triggered by"
+#~ msgstr "Ausgelöst von"
+
+#~ msgid "Unhandled services with state %s"
+#~ msgstr "Unbestätigte Services mit Status %s"
+
+#~ msgid "Will be re-enabled in %s"
+#~ msgstr "Wird in %s wieder aktiviert"
+
+#~ msgid "Your new comment has been submitted"
+#~ msgstr "Dein neuer Kommentar wurde gesendet"
+
+#~ msgid "critical events on "
+#~ msgstr "kritische Ereignisse auf"
+
+#~ msgid "ok"
+#~ msgstr "ok"
+
+#~ msgid "on"
+#~ msgstr "auf"
 
 #~ msgid "No entries found"
 #~ msgstr "Keine Einträge gefunden"
 
-#~ msgid "No host found"
-#~ msgstr "Kein Host gefunden"
-
 #~ msgid "Since"
 #~ msgstr "Seit"

From 7ca7b2e14102a41cc544c5b711461ba5a1841fdb Mon Sep 17 00:00:00 2001
From: Davide Demuru <davide.demuru@buongiorno.com>
Date: Fri, 13 Mar 2015 16:57:01 +0100
Subject: [PATCH 1070/2920] locale/it_IT: refresh translation

Signed-off-by: Thomas Gelf <thomas@gelf.net>
---
 .../locale/it_IT/LC_MESSAGES/icinga.po        | 1074 +++--
 .../locale/it_IT/LC_MESSAGES/monitoring.po    | 3648 ++++++++++-------
 2 files changed, 2890 insertions(+), 1832 deletions(-)

diff --git a/application/locale/it_IT/LC_MESSAGES/icinga.po b/application/locale/it_IT/LC_MESSAGES/icinga.po
index 991124c18..2b867ca14 100644
--- a/application/locale/it_IT/LC_MESSAGES/icinga.po
+++ b/application/locale/it_IT/LC_MESSAGES/icinga.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Icinga Web 2 (None)\n"
 "Report-Msgid-Bugs-To: dev@icinga.org\n"
-"POT-Creation-Date: 2015-02-11 15:47+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2015-03-13 14:55+0100\n"
+"PO-Revision-Date: 2015-03-13 14:51+0100\n"
+"Last-Translator: Davide Demuru <davide.demuru@gmail.com>\n"
 "Language: it_IT\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/Validator/InArray.php:16
+#, php-format
+msgid "\"%s\" is not in the list of allowed values."
+msgstr ""
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/Validator/InArray.php:19
+#, php-format
+msgid ""
+"\"%s\" is not in the list of allowed values. Did you mean one of the "
+"following?: %s"
+msgstr ""
+
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/ExternalBackendForm.php:56
+#: /usr/share/icingaweb2/application/forms/Config/Resource/FileResourceForm.php:50
+msgid "\"%value%\" is not a valid regular expression."
+msgstr "\"%value%\" non è un'espressione regolare valida"
+
 #: /usr/share/icingaweb2/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php:40
 #, php-format
 msgid "%d unhandled hosts down"
@@ -33,22 +50,59 @@ msgctxt "timespan"
 msgid "%im %ss"
 msgstr ""
 
-#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:9
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/ErrorLabeller.php:47
+#, fuzzy, php-format
+msgctxt "config.path"
+msgid "%s does not exist"
+msgstr "%s non è scrivibile"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/ErrorLabeller.php:48
+#, php-format
+msgctxt "config.path"
+msgid "%s is not readable"
+msgstr "%s non è leggibile"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/ErrorLabeller.php:46
+#, php-format
+msgctxt "config.path"
+msgid "%s is not writable"
+msgstr "%s non è scrivibile"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/ErrorLabeller.php:45
+#, php-format
+msgid "%s is required and must not be empty"
+msgstr "%s non deve essere vuoto"
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/ErrorLabeller.php:50
+#, php-format
+msgid "%s not in the expected format: %%value%%"
+msgstr "%s non è nel formato previsto: %%value%%"
+
 #: /usr/share/icingaweb2/application/views/scripts/pivottablePagination.phtml:9
 #, php-format
 msgid "%s: %d to %d of %d (on the %s-axis)"
-msgstr ""
+msgstr "%s: %d a %d di %d (nell asse %s)"
+
+#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:9
+#, fuzzy, php-format
+msgctxt "pagination.joystick"
+msgid "%s: Show %s %u to %u out of %u"
+msgstr "%s: Mostra %s %u a %u di %u"
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Form/Element/Number.php:138
 #, php-format
 msgid "'%s' is not a valid number"
 msgstr "'%s' non è un numero valido"
 
-#: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:44
+#: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:45
 msgid "...and your password"
 msgstr "...e password"
 
-#: /usr/share/icingaweb2/application/views/scripts/dashboard/new-dashlet.phtml:5
+#: /usr/share/icingaweb2/application/layouts/scripts/parts/navigation.phtml:14
+msgid "Accessibility Skip Links"
+msgstr ""
+
+#: /usr/share/icingaweb2/application/controllers/DashboardController.php:69
 msgid "Add Dashlet To Dashboard"
 msgstr "Aggiungi Vista alla Dashboard"
 
@@ -57,10 +111,24 @@ msgstr "Aggiungi Vista alla Dashboard"
 msgid "Add To Dashboard"
 msgstr "Aggiungi alla Dashboard"
 
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:327
+#, fuzzy
+msgid "Add another filter"
+msgstr "Cliccare per aggiungere un altro filtro"
+
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterWidget.php:80
 msgid "Add filter..."
 msgstr "Aggiungi filtro..."
 
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:28
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:42
+msgid "Adjust the general configuration of Icinga Web 2"
+msgstr "Cambia la configurazione generale di Icinga Web 2"
+
+#: /usr/share/icingaweb2/application/controllers/PreferenceController.php:28
+msgid "Adjust the preferences of Icinga Web 2 according to your needs"
+msgstr ""
+
 #: /usr/share/icingaweb2/application/controllers/AuthenticationController.php:111
 msgid ""
 "All configured authentication methods failed. Please check the system log or "
@@ -69,42 +137,55 @@ msgstr ""
 "Tutti i metodi di autenticazione configurati hanno fallito. Controllare i "
 "log di sistema o di Icinga Web 2 per maggiori informazioni."
 
-#: /usr/share/icingaweb2/application/controllers/RolesController.php:28
-#: /usr/share/icingaweb2/application/controllers/ConfigController.php:42
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/Decorator/FormDescriptions.php:61
+msgid "All fields are required and must be filled in to complete the form."
+msgstr "Tutti i campi del modulo sono obbligatori."
+
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:93
+msgid ""
+"An additional filter to use when looking up users using the specified "
+"connection. Leave empty to not to use any additional filter rules."
+msgstr ""
+"Un ulteriore filtro da usare durante la ricerca degli utenti usando la "
+"connessione specificata. Lasciare vuota se non si vuole utilizzare filtri "
+"aggiuntivi."
+
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:29
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:43
 msgid "Application"
 msgstr "Applicazione"
 
-#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:233
+#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:246
 msgid "Application Log"
 msgstr "Log Applicazione"
 
-#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:66
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:65
 msgid "Application Prefix"
 msgstr "Prefisso dell'applicazione"
 
-#: /usr/share/icingaweb2/library/Icinga/Web/Form/Decorator/NoScriptApply.php:28
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/Decorator/Autosubmit.php:122
 msgid "Apply"
 msgstr "Applica"
 
-#: /usr/share/icingaweb2/application/controllers/RolesController.php:34
-#: /usr/share/icingaweb2/application/controllers/ConfigController.php:49
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:36
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:51
 msgid "Authentication"
 msgstr "Autenticazione"
 
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:213
 #, php-format
 msgid "Authentication backend \"%s\" has been successfully changed"
-msgstr "Backend di autenticazione \"%s\" modificato con successo"
+msgstr "Backend di autenticazione \"%s\" modificato correttamente"
 
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:210
 #, php-format
 msgid "Authentication backend \"%s\" has been successfully created"
-msgstr "Backend di autenticazione \"%s\" creato con successo"
+msgstr "Backend di autenticazione \"%s\" creato correttamente"
 
-#: /usr/share/icingaweb2/application/controllers/ConfigController.php:259
-#, fuzzy, php-format
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:272
+#, php-format
 msgid "Authentication backend \"%s\" has been successfully removed"
-msgstr "Backend di autenticazione \"%s\" creato con successo"
+msgstr "Backend di autenticazione \"%s\" rimosso correttamente"
 
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:95
 msgid "Authentication backend already exists"
@@ -121,8 +202,16 @@ msgstr "Nome del Backend di autenticazione non specificato"
 msgid "Authentication order updated!"
 msgstr "Ordine di autenticazione aggiornato!"
 
+#: /usr/share/icingaweb2/application/forms/AutoRefreshForm.php:44
+msgid "Auto refresh successfully disabled"
+msgstr "Aggiornamento automatico disabilitato correttamente"
+
+#: /usr/share/icingaweb2/application/forms/AutoRefreshForm.php:41
+msgid "Auto refresh successfully enabled"
+msgstr "Aggiornamento automatico abilitato correttamente"
+
 #: /usr/share/icingaweb2/library/Icinga/Web/Wizard.php:617
-#: /usr/share/icingaweb2/library/Icinga/Web/Wizard.php:638
+#: /usr/share/icingaweb2/library/Icinga/Web/Wizard.php:639
 msgid "Back"
 msgstr "Indietro"
 
@@ -141,53 +230,49 @@ msgstr "Nome Backend"
 msgid "Backend Type"
 msgstr "Tipo Backend"
 
-#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:109
-msgid "Base DN"
-msgstr "Base DN"
-
-#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:76
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:112
 msgid "Bind DN"
 msgstr "Bind DN"
 
-#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:86
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:122
 msgid "Bind Password"
 msgstr "Bind Password"
 
-#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:144
-#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:150
-#, fuzzy, php-format
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:145
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:151
+#, php-format
 msgctxt "preferences.form"
 msgid "Browser (%s)"
 msgstr "Browser (%s)"
 
-#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:187
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:186
 #, php-format
 msgid "Can't add role '%s'. Role already exists"
 msgstr "Impossibile aggiungere il ruolo '%s'. Ruolo già esistente."
 
-#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:146
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:145
 #, php-format
 msgid "Can't load role '%s'. Role does not exist"
 msgstr "Impossibile caricare il ruolo '%s'. Ruolo inesistente."
 
-#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:213
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:212
 #, php-format
 msgid "Can't remove role '%s'. Role does not exist"
 msgstr "Impossibile rimuovere il ruolo '%s'. Ruolo inesistente"
 
-#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:246
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:245
 #, php-format
 msgid "Can't update role '%s'. Role does not exist"
 msgstr "Impossibile aggiornare il ruolo '%s'. Ruolo inesistente"
 
-#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:352
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:353
 msgid "Cancel this operation"
 msgstr "Annulla operazione"
 
 #: /usr/share/icingaweb2/library/Icinga/Application/Config.php:298
 #, php-format
 msgid "Cannot read config file \"%s\". Permission denied"
-msgstr "Impossibile leggere il file \"%s\". Accesso negato"
+msgstr "Impossibile leggere il file di configurazion \"%s\". Permesso negato"
 
 #: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:122
 msgid "Check this box if you want to add the dashlet to a new dashboard"
@@ -202,33 +287,46 @@ msgstr ""
 "Selezionare questa casella per forzare le modifiche senza verificare la "
 "connettività."
 
-#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:326
-msgid "Click to add another filter"
-msgstr "Clicca per aggiungere un altro filtro"
-
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterWidget.php:68
-#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:313
 msgid "Click to remove this part of your filter"
-msgstr "Clicca per rimuovere questa parte del filtro"
+msgstr "Cliccare per rimuovere questa parte del filtro"
 
-#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:100
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:99
 msgid "Comma-separated list of groups that are assigned to the role"
 msgstr "Lista dei gruppi assegnati al ruolo separati da virgole"
 
-#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:92
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:91
 msgid "Comma-separated list of users that are assigned to the role"
 msgstr "Lista degli utenti assegnati al ruolo separati da virgole"
 
-#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:223
+#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:234
 msgid "Configuration"
 msgstr "Configurazione"
 
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:35
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:50
+msgid "Configure how users authenticate with and log into Icinga Web 2"
+msgstr "Configura come gli utenti si autenticano e accedono a Icinga Web 2"
+
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:49
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:67
+msgid ""
+"Configure roles to permit or restrict users and groups accessing Icinga Web 2"
+msgstr ""
+"Configura i ruoli per permettere o restringere i permessi di utenti e gruppi "
+"di Icinga Web 2"
+
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:42
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:58
+msgid "Configure which resources are being utilized by Icinga Web 2"
+msgstr "Configura quali risorse saranno utilizzate da Icinga Web 2"
+
 #: /usr/share/icingaweb2/application/forms/ConfirmRemovalForm.php:19
 msgid "Confirm Removal"
 msgstr "Conferma Rimozione"
 
 #: /usr/share/icingaweb2/application/forms/Config/Resource/LivestatusResourceForm.php:79
-#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:126
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:161
 #: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:135
 msgid ""
 "Connectivity validation failed, connection to the given resource not "
@@ -237,6 +335,14 @@ msgstr ""
 "Verifica della connessione fallita, impossibile connettersi alla risorsa "
 "fornita."
 
+#: /usr/share/icingaweb2/library/Icinga/Chart/GridChart.php:90
+msgid "Contains data in a bar or line chart."
+msgstr ""
+
+#: /usr/share/icingaweb2/library/Icinga/Chart/PieChart.php:56
+msgid "Contains data in a pie chart."
+msgstr ""
+
 #: /usr/share/icingaweb2/application/forms/Config/General/ApplicationConfigForm.php:37
 msgid ""
 "Contains the directories that will be searched for available modules, "
@@ -265,24 +371,28 @@ msgstr ""
 "Impossibile leggere authentication.ini, nessun metodo di autenticazione "
 "disponibile."
 
-#: /usr/share/icingaweb2/application/views/scripts/config/authentication/reorder.phtml:7
+#: /usr/share/icingaweb2/application/views/scripts/config/authentication/reorder.phtml:6
 msgid "Create A New Authentication Backend"
 msgstr "Crea un nuovo backend di autenticazione"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/resource.phtml:7
-#: /usr/share/icingaweb2/application/views/scripts/config/resource/create.phtml:4
+#: /usr/share/icingaweb2/application/views/scripts/config/resource.phtml:6
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:306
 msgid "Create A New Resource"
 msgstr "Crea una nuova Risorsa"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/authentication/create.phtml:4
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:218
 msgid "Create New Authentication Backend"
 msgstr "Crea un nuovo backend di autenticazione"
 
-#: /usr/share/icingaweb2/application/controllers/RolesController.php:82
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:89
 msgid "Create Role"
 msgstr "Crea Ruolo"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/authentication/create.phtml:7
+#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:71
+msgid "Create a New Role"
+msgstr "Crea Nuovo Ruolo"
+
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:220
 msgid ""
 "Create a new backend for authenticating your users. This backend will be "
 "added at the end of your authentication order."
@@ -296,24 +406,23 @@ msgid ""
 "Currently there is no dashlet available. This might change once you enabled "
 "some of the available %s."
 msgstr ""
-"Nessuna vista disponibile. E' necessario prima abilitare prima uno dei %s "
-"disponibili."
+"Nessuna vista disponibile. E' possibile abilitarne una da quelle disponibili "
+"%s."
 
 #: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:108
-#: /usr/share/icingaweb2/application/layouts/scripts/body.phtml:31
-#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:213
+#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:224
 msgid "Dashboard"
 msgstr "Dashboard"
 
-#: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:7
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:5
 msgid "Dashboard Settings"
 msgstr "Impostazioni Dashboard"
 
-#: /usr/share/icingaweb2/application/controllers/DashboardController.php:205
+#: /usr/share/icingaweb2/application/controllers/DashboardController.php:208
 msgid "Dashboard has been removed"
 msgstr "Dashboard Rimossa"
 
-#: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:13
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:11
 msgid "Dashlet Name"
 msgstr "Nome Vista"
 
@@ -325,13 +434,13 @@ msgstr "Titolo Vista"
 msgid "Dashlet created"
 msgstr "Vista Creata"
 
-#: /usr/share/icingaweb2/application/controllers/DashboardController.php:166
+#: /usr/share/icingaweb2/application/controllers/DashboardController.php:168
 msgid "Dashlet has been removed from"
 msgstr "Vista rimossa da"
 
-#: /usr/share/icingaweb2/application/controllers/DashboardController.php:128
+#: /usr/share/icingaweb2/application/controllers/DashboardController.php:129
 msgid "Dashlet updated"
-msgstr "Vista aggiornata"
+msgstr "Vista Aggioranta"
 
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:295
 #: /usr/share/icingaweb2/application/forms/Config/General/ApplicationConfigForm.php:53
@@ -351,21 +460,16 @@ msgstr "Nome Database"
 msgid "Database Type"
 msgstr "Tipo Database"
 
-#: /usr/share/icingaweb2/library/Icinga/Web/Form/Validator/DateTimeValidator.php:48
-#, php-format
-msgid "Date/time string not in the expected format %s"
-msgstr "La stringa della Data/Ora non è nel formato atteso %s "
-
-#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:54
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:53
 msgctxt "app.config.logging.level"
 msgid "Debug"
 msgstr "Debug"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:42
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:46
 msgid "Dependencies"
 msgstr "Dipendenze"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:38
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:42
 msgid "Description"
 msgstr "Descrizione"
 
@@ -377,27 +481,70 @@ msgstr ""
 "Maggiori dettagli sono disponibili nel log applicativo. (in caso di accesso "
 "negato al file contattare il proprio amministratore di sistema)"
 
+#: /usr/share/icingaweb2/application/forms/AutoRefreshForm.php:65
+msgid "Disable auto refresh"
+msgstr "Disabilitare aggiornamento automatico"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:26
+#, php-format
+msgid "Disable the %s module"
+msgstr "Disabilita il modulo %s"
+
 #: /usr/share/icingaweb2/application/forms/Config/General/ApplicationConfigForm.php:54
 msgid "Don't Store Preferences"
 msgstr "Non salvare le Preferenze"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/authentication/modify.phtml:4
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:240
 msgid "Edit Backend"
 msgstr "Modifica backend"
 
-#: /usr/share/icingaweb2/application/views/scripts/dashboard/update-dashlet.phtml:6
+#: /usr/share/icingaweb2/application/controllers/DashboardController.php:132
 msgid "Edit Dashlet"
 msgstr "Modifica Vista"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/resource/modify.phtml:4
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:323
 msgid "Edit Existing Resource"
 msgstr "Modifica Risorsa esistente"
 
+#: /usr/share/icingaweb2/application/views/scripts/form/reorder-authbackend.phtml:19
+#, php-format
+msgid "Edit authentication backend %s"
+msgstr "Modifica il backend di autenticazione %s"
+
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:53
+#, php-format
+msgid "Edit dashlet %s"
+msgstr "Modifica la vista %s"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/resource.phtml:23
+#, php-format
+msgid "Edit resource %s"
+msgstr "Modifica risorsa %s"
+
+#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:27
+#, php-format
+msgid "Edit role %s"
+msgstr "Modifica ruolo %s"
+
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:194
+#: /usr/share/icingaweb2/application/forms/AutoRefreshForm.php:63
+msgid "Enable auto refresh"
+msgstr "Abilitare aggiornamento automatico"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:34
+#, php-format
+msgid "Enable the %s module"
+msgstr "Abilita il modulo %s"
+
 #: /usr/share/icingaweb2/application/controllers/ErrorController.php:39
 #, php-format
 msgid "Enabling the \"%s\" module might help!"
 msgstr "Abilitare il modulo \"%s\" potrebbe essere utile!"
 
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:67
+msgid "Encryption"
+msgstr "Crittografia"
+
 #: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:80
 msgid "Enter a title for the dashlet."
 msgstr "Inserisci un titolo per la vista."
@@ -413,7 +560,7 @@ msgid ""
 msgstr ""
 "Inserire l'indirizzo della vista. Incollare l'intera URL, filtri inclusi."
 
-#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:51
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:50
 msgctxt "app.config.logging.level"
 msgid "Error"
 msgstr "Error"
@@ -430,7 +577,7 @@ msgstr "Esterno"
 msgid "File"
 msgstr "File"
 
-#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:36
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:35
 msgctxt "app.config.logging.type"
 msgid "File"
 msgstr "File"
@@ -439,7 +586,7 @@ msgstr "File"
 msgid "File System (INI Files)"
 msgstr "File System (File INI)"
 
-#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:107
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:109
 msgid "File path"
 msgstr "Percorso file"
 
@@ -447,20 +594,20 @@ msgstr "Percorso file"
 msgid "Filepath"
 msgstr "Percorso file"
 
-#: /usr/share/icingaweb2/application/forms/Config/Authentication/ExternalBackendForm.php:54
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/ExternalBackendForm.php:63
 msgid "Filter Pattern"
-msgstr "Filtro"
+msgstr "Pattern"
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterWidget.php:89
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:659
 msgid "Filter this list"
-msgstr "Pattern"
+msgstr "Filtra questa lista"
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterWidget.php:93
 msgid "Filtered"
-msgstr "Filtrato"
+msgstr "Filtrata"
 
-#: /usr/share/icingaweb2/library/Icinga/Web/Wizard.php:648
+#: /usr/share/icingaweb2/library/Icinga/Web/Wizard.php:650
 msgid "Finish"
 msgstr "Fine"
 
@@ -469,8 +616,16 @@ msgstr "Fine"
 msgid "Force Changes"
 msgstr "Forzare Modifiche"
 
-#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:99
-#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:17
+#: /usr/share/icingaweb2/application/forms/Config/GeneralConfigForm.php:23
+msgid "General Configuration"
+msgstr "Configurazione Generale"
+
+#: /usr/share/icingaweb2/library/Icinga/Chart/GridChart.php:89
+msgid "Grid Chart"
+msgstr ""
+
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:98
+#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:16
 msgid "Groups"
 msgstr "Gruppi"
 
@@ -478,14 +633,11 @@ msgstr "Gruppi"
 msgid "Hint"
 msgstr "Suggerimento"
 
-#: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:49
-#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:43
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:44
 #: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:62
 msgid "Host"
 msgstr "Host"
 
-#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:35
-#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:90
 #: /usr/share/icingaweb2/application/views/scripts/pivottablePagination.phtml:28
 msgid "Hosts"
 msgstr "Host"
@@ -494,15 +646,11 @@ msgstr "Host"
 msgid "I'm ready to search, waiting for your input"
 msgstr "Pronto per la ricerca, in attesa di un input."
 
-#: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:50
-msgid "IP or hostname to search."
-msgstr "IP o hostname da cercare."
-
-#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:15
+#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:16
 msgid "Icinga Web 2 Documentation"
 msgstr "Documentazione Icinga Web 2"
 
-#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:16
+#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:17
 msgid "Icinga Web 2 Setup-Wizard"
 msgstr "Installazione Guidata Icinga Web 2"
 
@@ -510,12 +658,15 @@ msgstr "Installazione Guidata Icinga Web 2"
 msgid "Icingaweb Login"
 msgstr "Icingaweb Login"
 
-#: /usr/share/icingaweb2/application/views/scripts/authentication/logout.phtml:14
+#: /usr/share/icingaweb2/application/views/scripts/authentication/logout.phtml:15
 msgid ""
 "If this message does not disappear, it might be necessary to quit the "
 "current session manually by clearing the cache, or by closing the current "
 "browser session."
 msgstr ""
+"Se questo messaggio non scompare, potrebbe essere necessario chiudere "
+"manualmente la sessione corrente pulendo la cache, oppure chiudendo la "
+"sessione del browser."
 
 #: /usr/share/icingaweb2/application/views/scripts/showConfiguration.phtml:21
 msgid ""
@@ -529,15 +680,11 @@ msgstr ""
 msgid "Incorrect username or password"
 msgstr "Utente o password errati"
 
-#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:53
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:52
 msgctxt "app.config.logging.level"
 msgid "Information"
 msgstr "Information"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/modules.phtml:3
-msgid "Installed Modules"
-msgstr "Moduli intallati"
-
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendConfigForm.php:72
 #, php-format
 msgid "Invalid backend type \"%s\" provided"
@@ -548,11 +695,7 @@ msgstr "Tipo \"%s\" di backend non valido"
 msgid "Invalid resource type \"%s\" provided"
 msgstr "Tipo \"%s\" di risorsa non valido"
 
-#: /usr/share/icingaweb2/library/Icinga/Web/Form/Validator/DateTimeValidator.php:41
-msgid "Invalid type given. Instance of DateTime or date/time string expected"
-msgstr "Formato non valido. Istanza di DateTime o stringa Data/Ora prevista."
-
-#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:11
+#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:12
 #, php-format
 msgid ""
 "It appears that you did not configure Icinga Web 2 yet so it's not possible "
@@ -565,98 +708,133 @@ msgstr ""
 "metodo di autenticazione seguendo le istruzioni della %1$sdocumentazione%3$s "
 "o usando la nostra %2$sinstallazione guidata via web%3$s."
 
-#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:67
-msgid "LDAP Resource"
-msgstr "Risorsa LDAP"
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:141
+msgid "LDAP Base DN"
+msgstr "LDAP Base DN"
 
-#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:89
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:67
+msgid "LDAP Connection"
+msgstr "Connessione LDAP"
+
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:91
+msgid "LDAP Filter"
+msgstr "Filtro LDAP"
+
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:121
 msgid "LDAP User Name Attribute"
 msgstr "Attributo per Nome Utente LDAP"
 
-#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:79
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:81
 msgid "LDAP User Object Class"
 msgstr "Object Class Utente LDAP"
 
-#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:48
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/Limiter.php:83
+#, php-format
+msgid "Limit each page to a maximum of %u rows"
+msgstr "Limita tutte le pagine ad un massimo di %u righe"
+
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:124
+msgid "List intalled modules"
+msgstr "Mostra moduli installati"
+
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:47
 msgid "Logging Level"
 msgstr "Livello dei Log"
 
-#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:32
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:31
 msgid "Logging Type"
 msgstr "Tipo di Log"
 
 #: /usr/share/icingaweb2/application/views/scripts/authentication/logout.phtml:12
 msgid "Logging out..."
-msgstr "Uscita..."
+msgstr "Uscita in corso..."
 
-#: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:20
-#: /usr/share/icingaweb2/application/views/scripts/authentication/logout.phtml:21
+#: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:21
+#: /usr/share/icingaweb2/application/views/scripts/authentication/logout.phtml:22
 msgid "Login"
 msgstr "Accedi"
 
-#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:248
+#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:261
 msgid "Logout"
 msgstr "Esci"
 
-#: /usr/share/icingaweb2/application/views/scripts/authentication/logout.phtml:43
+#: /usr/share/icingaweb2/application/views/scripts/authentication/logout.phtml:44
 msgid "Logout successful!"
-msgstr "Uscito con successo!"
+msgstr "Uscito correttamente!"
 
 #: /usr/share/icingaweb2/application/views/scripts/dashboard/error.phtml:7
 msgid "Make sure that the webserver can write to this file."
 msgstr ""
 "Controlla che il server web abbia i permessi per scrivere su questo file."
 
-#: /usr/share/icingaweb2/library/Icinga/Web/Controller/ActionController.php:197
+#: /usr/share/icingaweb2/library/Icinga/Web/Controller/ActionController.php:198
 msgid "Method Not Allowed"
 msgstr "Metodo non consentito"
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterWidget.php:94
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:661
 msgid "Modify this filter"
-msgstr "Modifica questo filtro"
+msgstr "Modifica filtro"
 
-#: /usr/share/icingaweb2/application/controllers/ConfigController.php:179
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:186
 #, php-format
 msgid "Module \"%s\" disabled"
 msgstr "Modulo \"%s\" disabilitato"
 
-#: /usr/share/icingaweb2/application/controllers/ConfigController.php:159
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:166
 #, php-format
 msgid "Module \"%s\" enabled"
 msgstr "Modulo \"%s\" abilitato"
 
+#: /usr/share/icingaweb2/application/views/scripts/config/modules.phtml:17
+#, php-format
+msgid "Module %s has failed to load"
+msgstr "Modulo %s non è stato caricato correttamente"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/modules.phtml:15
+#, php-format
+msgid "Module %s is disabled"
+msgstr "Modulo %s disabilitato"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/modules.phtml:13
+#, php-format
+msgid "Module %s is enabled"
+msgstr "Modulo %s abilitato"
+
 #: /usr/share/icingaweb2/application/forms/Config/General/ApplicationConfigForm.php:33
 msgid "Module Path"
 msgstr "Percorso Modulo"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/modules.phtml:16
-msgid "Module is disabled"
-msgstr "Modulo disabilitato"
-
-#: /usr/share/icingaweb2/application/views/scripts/config/modules.phtml:14
-msgid "Module is enabled"
-msgstr "Modulo abilitato"
-
-#: /usr/share/icingaweb2/application/controllers/ConfigController.php:117
-#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:227
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:123
+#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:239
 msgid "Modules"
 msgstr "Moduli"
 
-#: /usr/share/icingaweb2/application/views/scripts/form/reorder-authbackend.phtml:30
+#: /usr/share/icingaweb2/application/views/scripts/form/reorder-authbackend.phtml:57
+#, php-format
+msgid "Move authentication backend %s downwards"
+msgstr "Sposta il backend di autenticazione %s verso il basso"
+
+#: /usr/share/icingaweb2/application/views/scripts/form/reorder-authbackend.phtml:43
+#, php-format
+msgid "Move authentication backend %s upwards"
+msgstr "Sposta il backend di autenticazione %s verso l'alto"
+
+#: /usr/share/icingaweb2/application/views/scripts/form/reorder-authbackend.phtml:55
 msgid "Move down in authentication order"
 msgstr "Sposta giù nell'ordine di autenticazione"
 
-#: /usr/share/icingaweb2/application/views/scripts/form/reorder-authbackend.phtml:25
+#: /usr/share/icingaweb2/application/views/scripts/form/reorder-authbackend.phtml:41
 msgid "Move up in authentication order"
 msgstr "Sposta su nell'ordine di autenticazione"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:18
-#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:13
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:16
+#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:12
 msgid "Name"
 msgstr "Nome"
 
 #: /usr/share/icingaweb2/application/views/scripts/pivottablePagination.phtml:16
+#: /usr/share/icingaweb2/application/views/scripts/layout/menu.phtml:14
 msgid "Navigation"
 msgstr "Navigazione"
 
@@ -664,8 +842,7 @@ msgstr "Navigazione"
 msgid "New Dashboard Title"
 msgstr "Titolo nuova Dashboard"
 
-#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:68
-#: /usr/share/icingaweb2/application/views/scripts/roles/new.phtml:3
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:88
 msgid "New Role"
 msgstr "Nuovo Ruolo"
 
@@ -673,11 +850,11 @@ msgstr "Nuovo Ruolo"
 msgid "New authentication backend name missing"
 msgstr "Nome del nuovo backend di autenticazione mancante"
 
-#: /usr/share/icingaweb2/application/forms/Config/GeneralConfigForm.php:54
+#: /usr/share/icingaweb2/application/forms/Config/GeneralConfigForm.php:55
 msgid "New configuration has successfully been stored"
 msgstr "Nuova configurazione salvata correttamente"
 
-#: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:120
+#: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:121
 msgid "New dashboard"
 msgstr "Nuova Dashboard"
 
@@ -688,18 +865,9 @@ msgstr "Nome della nuova risorsa non trovato"
 #: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:86
 #: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:89
 #: /usr/share/icingaweb2/library/Icinga/Web/Wizard.php:606
-#: /usr/share/icingaweb2/library/Icinga/Web/Wizard.php:627
+#: /usr/share/icingaweb2/library/Icinga/Web/Wizard.php:628
 msgid "Next"
-msgstr "Prossimo"
-
-#: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:38
-msgid ""
-"No Ldap servers found on this domain. You can try to specify host and port "
-"and try again, or just skip this step and configure the server manually."
-msgstr ""
-"Nessun server LDAP trovato in questo dominio. Si prega di specificare host e "
-"porta e provare di nuovo, altrimenti saltare questo passaggio e configurare "
-"il server manualmente."
+msgstr "Successivo"
 
 #: /usr/share/icingaweb2/application/controllers/AuthenticationController.php:104
 msgid ""
@@ -709,11 +877,11 @@ msgstr ""
 "Nessun metodo di autenticazione trovato. E' stato creato il file "
 "authentication.ini durante l'installazione di Icinga Web 2?"
 
-#: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:37
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:41
 msgid "No dashlets added to dashboard"
 msgstr "Nessuna vista aggiunta a questa dashboard"
 
-#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:8
+#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:7
 msgid "No roles found."
 msgstr "Nessun ruolo trovato."
 
@@ -721,7 +889,12 @@ msgstr "Nessun ruolo trovato."
 msgid "No users found under the specified database backend"
 msgstr "Non sono stai trovati utenti nel database di backend specificato"
 
-#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:37
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:73
+msgctxt "resource.ldap.encryption"
+msgid "None"
+msgstr "None"
+
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:36
 msgctxt "app.config.logging.type"
 msgid "None"
 msgstr "Niente"
@@ -734,7 +907,7 @@ msgstr "Nome del vecchio backend di autenticazione mancante"
 msgid "Old resource name missing"
 msgstr "Nome della vecchia risorsa non presente"
 
-#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:67
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:103
 msgid "Only the root and its child nodes will be accessible on this resource."
 msgstr ""
 "Solo gli oggetti che appartengono a questa risorsa radice saranno accessibili"
@@ -747,6 +920,10 @@ msgstr "Ordine"
 msgid "Page"
 msgstr "Pagina"
 
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/SearchDashboard.php:41
+msgid "Page not found"
+msgstr "Pagina non trovata."
+
 #: /usr/share/icingaweb2/application/controllers/ErrorController.php:36
 msgid "Page not found."
 msgstr "Pagina non trovata."
@@ -756,43 +933,31 @@ msgid "Pagination"
 msgstr "Impaginazione"
 
 #: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:101
-#: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:43
+#: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:44
 msgid "Password"
 msgstr "Password"
 
-#: /usr/share/icingaweb2/library/Icinga/Web/Form/Validator/ReadablePathValidator.php:32
-msgid "Path does not exist"
-msgstr "Percorso non trovato"
-
-#: /usr/share/icingaweb2/library/Icinga/Web/Form/Validator/ReadablePathValidator.php:31
-msgid "Path is not readable"
-msgstr "Percorso non attraversabile"
-
-#: /usr/share/icingaweb2/application/forms/Config/Resource/FileResourceForm.php:51
+#: /usr/share/icingaweb2/application/forms/Config/Resource/FileResourceForm.php:58
 msgid "Pattern"
 msgstr "Pattern"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:54
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:58
 msgid "Permissions"
 msgstr "Permessi"
 
-#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:107
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:106
 msgid "Permissions Set"
 msgstr "Permessi"
 
-#: /usr/share/icingaweb2/application/views/scripts/dashboard/remove-dashlet.phtml:9
-msgid "Please confirm the removal"
-msgstr "Confermare la rimozione"
-
-#: /usr/share/icingaweb2/application/views/scripts/dashboard/remove-pane.phtml:9
-msgid "Please confirm the removal of"
-msgstr "Confermare la rimozione di"
+#: /usr/share/icingaweb2/library/Icinga/Chart/PieChart.php:55
+msgid "Pie Chart"
+msgstr ""
 
 #: /usr/share/icingaweb2/application/views/scripts/dashboard/error.phtml:4
 msgid "Please copy the following dashboard snippet to "
 msgstr "Copiare la seguente porzione di dashboard in "
 
-#: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:34
+#: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:35
 msgid "Please enter your username..."
 msgstr "Inserire nome utente..."
 
@@ -813,63 +978,97 @@ msgstr ""
 "ricerche. Per comodità verrà automaticamente aggiunto dopo l'ultimo "
 "carattere digitato."
 
-#: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:59
-#: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:60
-#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:55
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:56
 #: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:72
 msgid "Port"
 msgstr "Porta"
 
-#: /usr/share/icingaweb2/application/controllers/PreferenceController.php:28
-#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:243
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:43
+#: /usr/share/icingaweb2/application/controllers/PreferenceController.php:29
+#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:256
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:107
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:108
 msgid "Preferences successfully saved"
-msgstr "Preferenze salvate con successo"
+msgstr "Preferenze salvate correttamente"
 
-#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:109
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:110
 msgid "Preferences successfully saved for the current session"
-msgstr "Preferenze per la sessione corrente salvate con successo"
+msgstr "Preferenze per la sessione corrente salvate correttamente"
 
 #: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:48
 #: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:51
 msgid "Prev"
 msgstr "Precedente"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/resource.phtml:13
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/Decorator/Autosubmit.php:120
+msgid ""
+"Push this button to update the form to reflect the change that was made in "
+"the field on the left"
+msgstr ""
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/Decorator/Autosubmit.php:119
+msgid ""
+"Push this button to update the form to reflect the changes that were made "
+"below"
+msgstr ""
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/SearchDashboard.php:63
+msgid "Ready to search"
+msgstr "Pronto per la ricerca"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/resource.phtml:11
 #: /usr/share/icingaweb2/application/views/scripts/form/reorder-authbackend.phtml:5
-#: /usr/share/icingaweb2/application/views/scripts/form/reorder-authbackend.phtml:19
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/authentication/remove.phtml:4
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:280
 msgid "Remove Backend"
 msgstr "Rimuovi Backend"
 
-#: /usr/share/icingaweb2/application/views/scripts/dashboard/remove-pane.phtml:6
+#: /usr/share/icingaweb2/application/controllers/DashboardController.php:221
 msgid "Remove Dashboard"
-msgstr "Rimuovi Dashboard"
+msgstr "Rimouovi Dashboard"
 
-#: /usr/share/icingaweb2/application/views/scripts/dashboard/remove-dashlet.phtml:6
+#: /usr/share/icingaweb2/application/controllers/DashboardController.php:181
 msgid "Remove Dashlet From Dashboard"
-msgstr "Rimuovi Vista dalla Dashboard"
+msgstr "Nessuna Vista dalla Dashboard"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/resource/remove.phtml:4
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:358
 msgid "Remove Existing Resource"
 msgstr "Rimuovi Risorsa esistente"
 
-#: /usr/share/icingaweb2/application/controllers/RolesController.php:179
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:187
 msgid "Remove Role"
 msgstr "Rimuovi ruolo"
 
-#: /usr/share/icingaweb2/application/views/scripts/roles/remove.phtml:3
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:186
 #, php-format
 msgid "Remove Role %s"
 msgstr "Rimuovi Ruolo %s"
 
-#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:56
+#: /usr/share/icingaweb2/application/views/scripts/form/reorder-authbackend.phtml:30
+#, php-format
+msgid "Remove authentication backend %s"
+msgstr "Rimuovi il backend di autenticazione %s"
+
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:71
+#, php-format
+msgid "Remove dashlet %s from pane %s"
+msgstr "Rimuovi Vista %s dal pannello %s"
+
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:32
+#, php-format
+msgid "Remove pane %s"
+msgstr "Rimuovi pannello %s"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/resource.phtml:35
+#, php-format
+msgid "Remove resource %s"
+msgstr "Rimuovi risorsa %s"
+
+#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:61
 #, php-format
 msgid "Remove role %s"
 msgstr "Rimuovi Ruolo %s"
@@ -878,33 +1077,41 @@ msgstr "Rimuovi Ruolo %s"
 msgid "Remove this filter"
 msgstr "Rimuovi filtro"
 
-#: /usr/share/icingaweb2/application/controllers/RolesController.php:99
-#: /usr/share/icingaweb2/application/controllers/RolesController.php:148
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:314
+msgid "Remove this part of your filter"
+msgstr "Rimuovi questa parte del filtro"
+
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:87
+msgid "Require Certificate"
+msgstr "Certificato Richiesto"
+
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:106
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:155
 #, php-format
 msgid "Required parameter '%s' missing"
 msgstr "Parametro richiesto '%s' non trovato"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/resource.phtml:12
+#: /usr/share/icingaweb2/application/views/scripts/config/resource.phtml:10
 msgid "Resource"
 msgstr "Risorsa"
 
 #: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:148
 #, php-format
 msgid "Resource \"%s\" has been successfully changed"
-msgstr "Risorsa \"%s\" aggiornata con successo"
+msgstr "Risorsa \"%s\" aggiornata correttamente"
 
 #: /usr/share/icingaweb2/application/forms/Config/ResourceConfigForm.php:145
 #, php-format
 msgid "Resource \"%s\" has been successfully created"
-msgstr "Risorsa \"%s\" creata con successo"
+msgstr "Risorsa \"%s\" creata correttamente"
 
-#: /usr/share/icingaweb2/application/controllers/ConfigController.php:335
-#, fuzzy, php-format
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:352
+#, php-format
 msgid "Resource \"%s\" has been successfully removed"
-msgstr "Risorsa \"%s\" rimossa con successo"
+msgstr "Risorsa \"%s\" rimossa correttamente"
 
 #: /usr/share/icingaweb2/application/forms/Config/Resource/LivestatusResourceForm.php:35
-#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:34
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:35
 #: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:43
 #: /usr/share/icingaweb2/application/forms/Config/Resource/FileResourceForm.php:32
 msgid "Resource Name"
@@ -924,42 +1131,41 @@ msgstr "Risorsa già presente"
 msgid "Resource name missing"
 msgstr "Nome Risorsa mancante"
 
-#: /usr/share/icingaweb2/application/controllers/RolesController.php:40
-#: /usr/share/icingaweb2/application/controllers/ConfigController.php:56
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:43
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:59
 msgid "Resources"
 msgstr "Risorse"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/resource/create.phtml:5
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:307
 msgid "Resources are entities that provide data to Icinga Web 2."
 msgstr "Le Risorse sono le entità da cui Icinga Web 2 recupera i dati."
 
-#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:62
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:68
 msgid "Restrictions"
 msgstr "Restrizioni"
 
-#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:82
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:81
 msgid "Role Name"
 msgstr "Nome Ruolo"
 
-#: /usr/share/icingaweb2/application/controllers/RolesController.php:75
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:81
 msgid "Role created"
-msgstr "Ruolo Creato"
+msgstr "Ruolo creato"
 
-#: /usr/share/icingaweb2/application/controllers/RolesController.php:172
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:179
 msgid "Role removed"
-msgstr "Ruolo Rimosso"
+msgstr "Ruolo rimosso"
 
-#: /usr/share/icingaweb2/application/controllers/RolesController.php:127
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:135
 msgid "Role updated"
-msgstr "Ruolo Aggiornato"
+msgstr "Ruolo aggiornato"
 
-#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:3
-#: /usr/share/icingaweb2/application/controllers/RolesController.php:45
-#: /usr/share/icingaweb2/application/controllers/ConfigController.php:63
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:51
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:69
 msgid "Roles"
 msgstr "Ruoli"
 
-#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:65
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:101
 msgid "Root DN"
 msgstr "Root DN"
 
@@ -973,11 +1179,11 @@ msgstr "SQL Database"
 msgid "Save Changes"
 msgstr "Salva Modifiche"
 
-#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:208
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:220
 msgid "Save for the current Session"
 msgstr "Salva per la sessione corrente"
 
-#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:194
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:206
 msgid "Save to the Preferences"
 msgstr "Salva Preferenze"
 
@@ -985,15 +1191,15 @@ msgstr "Salva Preferenze"
 msgid "Saving Configuration Failed"
 msgstr "Salvataggio Configurazione fallito"
 
-#: /usr/share/icingaweb2/library/Icinga/Web/Widget/SearchDashboard.php:63
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/SearchDashboard.php:53
 msgid "Search"
-msgstr "Cerca..."
+msgstr "Cerca"
 
-#: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:28
+#: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:27
 msgid "Search Domain"
 msgstr "Cerca nel Dominio"
 
-#: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:29
+#: /usr/share/icingaweb2/application/forms/LdapDiscoveryForm.php:28
 msgid "Search this domain for records of available servers."
 msgstr "Cerca in questo dominio i server disponibili."
 
@@ -1006,25 +1212,38 @@ msgstr "Cerca..."
 msgid "Select a pane you want to add the dashlet."
 msgstr "Selezione un pannello a cui aggiungere la vista."
 
-#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:54
-#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:71
 #: /usr/share/icingaweb2/application/views/scripts/pivottablePagination.phtml:35
 msgid "Services"
-msgstr ""
+msgstr "Servizi"
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php:34
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: /usr/share/icingaweb2/library/Icinga/Web/Widget/Limiter.php:83
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/Dashboard.php:215
 #, php-format
-msgid "Show %s rows on one page"
-msgstr ""
+msgctxt "dashboard.pane.tooltip"
+msgid "Show %s"
+msgstr "Mostra %s"
+
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:61
+#, php-format
+msgid "Show dashlet %s"
+msgstr "Mostra vista %s"
 
 #: /usr/share/icingaweb2/application/views/scripts/mixedPagination.phtml:16
 #, php-format
-msgid "Show rows %d to %d of %d"
-msgstr ""
+msgid "Show rows %u to %u out of %u"
+msgstr "Mostra righe da %u a %u di %u"
+
+#: /usr/share/icingaweb2/application/views/scripts/config/modules.phtml:24
+#, php-format
+msgid "Show the overview of the %s module"
+msgstr "Mostra i dettagli del modulo %s"
+
+#: /usr/share/icingaweb2/application/layouts/scripts/parts/navigation.phtml:17
+msgid "Skip to Content"
+msgstr "Salta al Contenuto"
 
 #: /usr/share/icingaweb2/application/forms/Config/Resource/LivestatusResourceForm.php:44
 msgid "Socket"
@@ -1034,19 +1253,19 @@ msgstr "Socket"
 msgid "Something went wrong while writing the file"
 msgstr "Qualcosa è andato storto durante la scrittura del file"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:22
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:20
 msgid "State"
 msgstr "Stato"
 
-#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:339
+#: /usr/share/icingaweb2/library/Icinga/Web/Widget/FilterEditor.php:340
 msgid "Strip this filter"
-msgstr "Dividi filtro"
+msgstr "Modifica filtro"
 
-#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:219
+#: /usr/share/icingaweb2/library/Icinga/Web/Menu.php:230
 msgid "System"
 msgstr "Sistema"
 
-#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:34
+#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:27
 msgid "The Icinga Project"
 msgstr "Il Progetto Icinga"
 
@@ -1054,10 +1273,29 @@ msgstr "Il Progetto Icinga"
 msgid "The Icinga logo"
 msgstr "Il logo Icinga"
 
-#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:91
-msgid "The attribute name used for storing the user name on the ldap server"
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:69
+msgid "The LDAP connection to use for authenticating with this provider."
+msgstr "La connessione LDAP da usare per autenticarsi con questo servizio."
+
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:69
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:79
+msgid "The application prefix must not contain whitespace."
+msgstr "Il prefisso dell'applicazione non deve contenere spazi."
+
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:123
+msgid "The attribute name used for storing the user name on the LDAP server."
 msgstr ""
-"Il nome dell'attributo usato per memorizzare il nome utente sul server ldap"
+"Il nome dell'attributo usato per memorizzare il nome utente sul server LDAP."
+
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/ExternalBackendForm.php:44
+msgid "The backend name cannot contain '[', ']' or ':'."
+msgstr "Il nome del backend non può contenere i caratteri: '[' , ']' , ':'."
+
+#: /usr/share/icingaweb2/application/forms/Config/Resource/FileResourceForm.php:60
+msgid "The column pattern must be a valid regular expression."
+msgstr ""
+"Il filtro che identifica le colonne deve essere un'espressione regolare "
+"valida."
 
 #: /usr/share/icingaweb2/application/forms/Config/Authentication/DbBackendForm.php:68
 msgid "The database connection to use for authenticating with this provider"
@@ -1072,7 +1310,31 @@ msgstr "Il file %s non può essere salvato. (Errore: \"%s\")"
 msgid "The filename to fetch information from"
 msgstr "Nome del file dal quale recuperare l'informazione"
 
-#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:108
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:109
+msgid "The filter must not be wrapped in parantheses."
+msgstr "Il filtro non deve essere scritto tra parentesi."
+
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:97
+msgid ""
+"The filter needs to be expressed as standard LDAP expression, without outer "
+"parentheses. (e.g. &(foo=bar)(bar=foo) or foo=bar)"
+msgstr ""
+"Il filtro deve essere definito come un'espressione LDAP standard, senza "
+"parentesi. (ex. &(foo=bar)(bar=foo) or foo=bar )"
+
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/ExternalBackendForm.php:68
+msgid "The filter pattern must be a valid regular expression."
+msgstr "Il filtro deve essere un'espressione regolare valida"
+
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/ExternalBackendForm.php:65
+msgid ""
+"The filter to use to strip specific parts off from usernames. Leave empty if "
+"you do not want to strip off anything."
+msgstr ""
+"Filtro da usare per selezionare la parte del nome utente. Lasciare vuoto se "
+"non si vuole escludere nessuna parte."
+
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:110
 msgid "The full path to the log file to write messages to."
 msgstr "Percorso completo del file di  log dove scrivere i messaggi."
 
@@ -1080,16 +1342,16 @@ msgstr "Percorso completo del file di  log dove scrivere i messaggi."
 msgid "The hostname of the database"
 msgstr "Hostname del database"
 
-#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:45
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:46
 msgid "The hostname or address of the LDAP server to use for authentication"
 msgstr ""
 "L'hostname o l'indirizzo ip del server LDAP da usare per l'autenticazione"
 
-#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:49
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:48
 msgid "The maximum logging level to emit."
 msgstr "Livello massimo da scrivere nei log."
 
-#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:68
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:67
 msgid "The name of the application by which to prefix syslog messages."
 msgstr "Nome dell'applicazione da usare come prefisso dei messaggi di syslog."
 
@@ -1097,11 +1359,10 @@ msgstr "Nome dell'applicazione da usare come prefisso dei messaggi di syslog."
 msgid "The name of the database to use"
 msgstr "Nome del database da usare"
 
-#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:83
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:82
 msgid "The name of the role"
 msgstr "Il nome del ruolo"
 
-#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:58
 #: /usr/share/icingaweb2/application/forms/Config/Authentication/ExternalBackendForm.php:34
 #: /usr/share/icingaweb2/application/forms/Config/Authentication/DbBackendForm.php:57
 msgid ""
@@ -1111,15 +1372,22 @@ msgstr ""
 "Nome del servizio di autenticazione che verrà usato per differenziarlo dagli "
 "altri"
 
-#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:80
-msgid "The object class used for storing users on the ldap server"
-msgstr "Object class usata per memorizzare gli utenti su server ldap"
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:58
+msgid ""
+"The name of this authentication provider that is used to differentiate it "
+"from others."
+msgstr ""
+"Il nome del servizio di autenticazione serve per differenziarlo dagli altri"
+
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:82
+msgid "The object class used for storing users on the LDAP server."
+msgstr "Object class usata per memorizzare gli utenti su server ldap."
 
 #: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:102
 msgid "The password to use for authentication"
 msgstr "Password da usare per l'autenticazione"
 
-#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:87
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:123
 msgid "The password to use for querying the ldap server"
 msgstr "Password da usare per interrogare il server ldap"
 
@@ -1129,19 +1397,23 @@ msgstr ""
 "Percorso del socket di livestatus usato per il recupero dei dati di "
 "monitoraggio"
 
-#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:111
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:143
 msgid ""
-"The path where users can be found on the ldap server. Leave empty to select "
-"all users available on the specified resource."
+"The path where users can be found on the LDAP server. Leave empty to select "
+"all users available using the specified connection."
 msgstr ""
-"Percorso dove possono essere trovati gli utenti nel server ldap. Lasciare "
+"Percorso dove possono essere trovati gli utenti nel server LDAP. Lasciare "
 "vuoto per selezionare tutti gli utenti disponibili della risorsa specificata."
 
-#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:109
+#: /usr/share/icingaweb2/application/forms/Config/Resource/FileResourceForm.php:59
+msgid "The pattern by which to identify columns."
+msgstr "L'espressione regolare che consente di identificare le colonne."
+
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:108
 msgid "The permissions to grant. You may select more than one permission"
 msgstr "Permessi da assegnare. E' possibile selezionare più di un permesso"
 
-#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:56
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:57
 msgid "The port of the LDAP server to use for authentication"
 msgstr "La porta del server LDAP da usare per l'autenticazione"
 
@@ -1149,19 +1421,7 @@ msgstr "La porta del server LDAP da usare per l'autenticazione"
 msgid "The port to use"
 msgstr "La porta da usare"
 
-#: /usr/share/icingaweb2/application/forms/Config/Resource/FileResourceForm.php:52
-msgid "The regular expression by which to identify columns"
-msgstr "L'espressione regolare che consente di identificare le colonne"
-
-#: /usr/share/icingaweb2/application/forms/Config/Authentication/ExternalBackendForm.php:56
-msgid ""
-"The regular expression to use to strip specific parts off from usernames. "
-"Leave empty if you do not want to strip off anything"
-msgstr ""
-"Espressione regolare da usare per separare parti specifiche dai nomi utente. "
-"Lasciare vuoto se non si vuole modificare niente."
-
-#: /usr/share/icingaweb2/application/controllers/ConfigController.php:351
+#: /usr/share/icingaweb2/application/controllers/ConfigController.php:369
 #, php-format
 msgid ""
 "The resource \"%s\" is currently in use by the authentication backend \"%s"
@@ -1172,15 +1432,11 @@ msgstr ""
 "Rimuovere la risorsa potrebbe non impedire a tutti gli utenti di poter "
 "effettuare il login."
 
-#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:68
-msgid "The resource to use for authenticating with this provider"
-msgstr "La risorsa da usare per autenticarsi con questo servizio"
-
 #: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:53
 msgid "The type of SQL database"
 msgstr "Tipo di database SQL"
 
-#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:33
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:32
 msgid "The type of logging to utilize."
 msgstr "Tipo di log da utilizzare."
 
@@ -1193,13 +1449,13 @@ msgid "The type of the resource to use for this authenticaton provider"
 msgstr "Il tipo di risorsa da usare per autenticarsi con questo servizio"
 
 #: /usr/share/icingaweb2/application/forms/Config/Resource/LivestatusResourceForm.php:36
-#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:35
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:36
 #: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:44
 #: /usr/share/icingaweb2/application/forms/Config/Resource/FileResourceForm.php:33
 msgid "The unique name of this resource"
 msgstr "Nome univoco per questa risorsa"
 
-#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:77
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:113
 msgid "The user dn to use for querying the ldap server"
 msgstr "Utente DN da usare per interrogare il server ldap"
 
@@ -1207,7 +1463,7 @@ msgstr "Utente DN da usare per interrogare il server ldap"
 msgid "The user name to use for authentication"
 msgstr "Nome utente da usare per l'autenticazione"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:7
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:6
 msgid "There is no such module installed."
 msgstr "Il modulo selezionato no risulta installato"
 
@@ -1221,19 +1477,27 @@ msgstr ""
 msgid "This could have one or more of the following reasons:"
 msgstr "Questo potrebbe avere una o più delle seguenti ragioni:"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:46
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:50
 msgid "This module has no dependencies"
 msgstr "Questo modulo non ha dipendenze"
 
-#: /usr/share/icingaweb2/library/Icinga/Application/Modules/Module.php:500
+#: /usr/share/icingaweb2/library/Icinga/Application/Modules/Module.php:527
 msgid "This module has no description"
 msgstr "Questo modulo non ha descrizione"
 
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:195
+msgid ""
+"This option allows you to enable or to disable the global page content auto "
+"refresh"
+msgstr ""
+"Questa opzione permette di abilitare e disabilitare l'aggiornamento "
+"automatico dei contenuti delle pagine"
+
 #: /usr/share/icingaweb2/application/views/scripts/config/devtools.phtml:5
 msgid "UI Debug"
 msgstr "Debug Interfaccia Utente"
 
-#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:152
+#: /usr/share/icingaweb2/application/forms/Config/Authentication/LdapBackendForm.php:190
 #, php-format
 msgid "Unable to validate authentication: %s"
 msgstr "Non è stato possibile verificare l'autenticazione: %s"
@@ -1251,33 +1515,46 @@ msgstr "Backend di autenticazione sconosciuto"
 msgid "Unknown resource provided"
 msgstr "Risorsa sconosciuta"
 
-#: /usr/share/icingaweb2/application/controllers/DashboardController.php:80
+#: /usr/share/icingaweb2/application/controllers/DashboardController.php:81
 msgid "Update Dashlet"
 msgstr "Aggiorna Vista"
 
-#: /usr/share/icingaweb2/application/controllers/RolesController.php:104
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:112
 msgid "Update Role"
 msgstr "Aggiorna Ruolo"
 
-#: /usr/share/icingaweb2/application/views/scripts/roles/update.phtml:3
+#: /usr/share/icingaweb2/application/controllers/RolesController.php:111
 #, php-format
 msgid "Update Role %s"
 msgstr "Aggiorna Ruolo %s"
 
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/Decorator/Autosubmit.php:99
+msgid ""
+"Upon any of this form's fields were changed, this page is being updated "
+"automatically."
+msgstr ""
+
+#: /usr/share/icingaweb2/library/Icinga/Web/Form.php:693
+#: /usr/share/icingaweb2/library/Icinga/Web/Form/Decorator/Autosubmit.php:100
+msgid ""
+"Upon its value has changed, this field issues an automatic update of this "
+"page."
+msgstr "Cambiando questo valore la pagina verrà ricaricata automaticamente."
+
 #: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:68
-#: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:16
+#: /usr/share/icingaweb2/application/views/scripts/dashboard/settings.phtml:14
 msgid "Url"
 msgstr "Url"
 
-#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:184
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:185
 msgid "Use benchmark"
 msgstr "Attiva analisi delle prestazioni"
 
-#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:161
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:162
 msgid "Use the following language to display texts and messages"
 msgstr "Usa la lingua seguente per visualizzare testi e messaggi"
 
-#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:173
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:174
 msgid "Use the following timezone for dates and times"
 msgstr "Usa il seguente fuso orario per data e ora"
 
@@ -1286,12 +1563,12 @@ msgid "User Preference Storage Type"
 msgstr "Metodo di salvataggio delle preferenze degli utenti"
 
 #: /usr/share/icingaweb2/application/forms/Config/Resource/DbResourceForm.php:91
-#: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:33
+#: /usr/share/icingaweb2/application/forms/Authentication/LoginForm.php:34
 msgid "Username"
 msgstr "Nome Utente"
 
-#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:91
-#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:16
+#: /usr/share/icingaweb2/application/forms/Security/RoleForm.php:90
+#: /usr/share/icingaweb2/application/views/scripts/roles/index.phtml:15
 msgid "Users"
 msgstr "Utenti"
 
@@ -1300,16 +1577,16 @@ msgstr "Utenti"
 msgid "Using the specified backend failed: %s"
 msgstr "Impossibile usare il seguente backend: %s"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:35
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:39
 msgid "Version"
 msgstr "Versione"
 
-#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:52
+#: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:51
 msgctxt "app.config.logging.level"
 msgid "Warning"
 msgstr "Warning"
 
-#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:25
+#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:8
 msgid "Welcome to Icinga Web 2"
 msgstr "Benvenuto in Icinga Web 2!"
 
@@ -1317,11 +1594,39 @@ msgstr "Benvenuto in Icinga Web 2!"
 msgid "Welcome to Icinga Web!"
 msgstr "Benvenuto in Icinga Web!"
 
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:89
+msgid ""
+"When checked, the LDAP server must provide a valid and known (trusted) "
+"certificate."
+msgstr ""
+"Se selzionato, il server LDAP deve fornire un certificato valido e sicuro "
+"(trusted)."
+
+#: /usr/share/icingaweb2/application/forms/Config/Resource/LdapResourceForm.php:69
+msgid ""
+"Whether to encrypt communication. Choose STARTTLS or LDAPS for encrypted "
+"communication or none for unencrypted communication"
+msgstr ""
+"Scegliere STARTTLS o LDAPS per una crittografare la comunicazione o None per "
+"la comunicazione in chiaro"
+
+#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:70
+#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:96
+msgctxt "pagination.joystick"
+msgid "X-Axis"
+msgstr "Asse X"
+
+#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:42
+#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:125
+msgctxt "pagination.joystick"
+msgid "Y-Axis"
+msgstr "Asse Y"
+
 #: /usr/share/icingaweb2/application/views/scripts/showConfiguration.phtml:13
 msgid "You don't have file-system permissions to write to the file"
 msgstr "Nessun permesso per scrivere nel file"
 
-#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:21
+#: /usr/share/icingaweb2/application/views/scripts/authentication/login.phtml:22
 msgid ""
 "You're currently not authenticated using any of the web server's "
 "authentication mechanisms. Make sure you'll configure such, otherwise you'll "
@@ -1330,56 +1635,201 @@ msgstr ""
 "Non sei autenticato con nessun meccanismo di autenticazione. Si prega di "
 "configurarne almeno uno per poter fare effettuare l'accesso."
 
-#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:160
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:161
 msgid "Your Current Language"
 msgstr "Lingua Corrente"
 
-#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:172
+#: /usr/share/icingaweb2/application/forms/PreferenceForm.php:173
 msgid "Your Current Timezone"
 msgstr "Fuso orario corrente"
 
 #: /usr/share/icingaweb2/library/Icinga/Web/Widget/Limiter.php:57
 msgid "all"
-msgstr ""
+msgstr "tutti"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:24
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:23
 msgid "disable"
 msgstr "disabilita"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/modules.phtml:22
-msgid "disabled"
-msgstr "disabilitato"
-
-#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:29
+#: /usr/share/icingaweb2/application/views/scripts/config/module.phtml:31
 msgid "enable"
 msgstr "abilita"
 
-#: /usr/share/icingaweb2/application/views/scripts/config/modules.phtml:22
-msgid "enabled"
-msgstr "abilitato"
-
-#: /usr/share/icingaweb2/application/views/scripts/config/modules.phtml:22
-msgid "failed"
-msgstr "fallito"
-
 #: /usr/share/icingaweb2/library/Icinga/Util/Format.php:82
 #: /usr/share/icingaweb2/library/Icinga/Util/Format.php:88
 msgid "for"
-msgstr ""
+msgstr "per"
+
+#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:43
+#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:126
+msgctxt "pagination.joystick"
+msgid "hosts"
+msgstr "host"
 
 #: /usr/share/icingaweb2/application/views/scripts/dashboard/index.phtml:14
 msgid "modules"
 msgstr "moduli"
 
+#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:71
+#: /usr/share/icingaweb2/application/views/scripts/joystickPagination.phtml:97
+msgctxt "pagination.joystick"
+msgid "services"
+msgstr "servizi"
+
 #: /usr/share/icingaweb2/library/Icinga/Util/Format.php:86
 #: /usr/share/icingaweb2/library/Icinga/Util/Format.php:108
 #: /usr/share/icingaweb2/library/Icinga/Util/Format.php:110
 msgid "since"
-msgstr ""
+msgstr "da"
 
 #: /usr/share/icingaweb2/application/views/scripts/config/devtools.phtml:5
 msgid "toggle"
 msgstr "seleziona"
 
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#~ msgid "Warning"
+#~ msgstr "Warning"
+
+#~ msgid "Information"
+#~ msgstr "Information"
+
+#~ msgid "Debug"
+#~ msgstr "Debug"
+
+#~ msgid "Browser (%s)"
+#~ msgstr "Browser (%s)"
+
+#~ msgid "Dashlet"
+#~ msgstr "Vista"
+
 #~ msgid "Lorem ipsum dolor sit amet"
 #~ msgstr "Lorem ipsum dolor sit amet"
+
+#~ msgid "context service"
+#~ msgstr "context service"
+
+#~ msgid "test"
+#~ msgstr "test"
+
+#~ msgid "Connection"
+#~ msgstr "Connessione"
+
+#~ msgid ""
+#~ "The type of connection to use. Unencrypted (Plaintext) or encrypted (SSL, "
+#~ "TLS)."
+#~ msgstr ""
+#~ "Il tipo di connessione da utilizzare. Criptata (SSL, TLS) o non criptata "
+#~ "(Testo in chiaro)"
+
+#~ msgid "Plaintext"
+#~ msgstr "Testo in chiaro"
+
+#~ msgid "\"%value%\" is not a valid regular expression"
+#~ msgstr "\"%value%\" non è un espressione regolare valida"
+
+#~ msgid "Authentication Configuration"
+#~ msgstr "Configurazione Autenticazione"
+
+#~ msgid "Base DN"
+#~ msgstr "Base DN"
+
+#~ msgid "Create New Resource"
+#~ msgstr "Crea una nuova Risorsa"
+
+#~ msgid "Edit Existing Resources"
+#~ msgstr "Modifica Risorsa esistente"
+
+#~ msgid "Generic Configuration"
+#~ msgstr "Configurazione Generica"
+
+#~ msgid "IP or hostname to search."
+#~ msgstr "IP o hostname da cercare."
+
+#~ msgid "Installed Modules"
+#~ msgstr "Moduli intallati"
+
+#~ msgid "LDAP Resource"
+#~ msgstr "Risorsa LDAP"
+
+#~ msgid "New Authentication Backend"
+#~ msgstr "Nuovo backend di autenticazione"
+
+#~ msgid ""
+#~ "No Ldap servers found on this domain. You can try to specify host and "
+#~ "port and try again, or just skip this step and configure the server "
+#~ "manually."
+#~ msgstr ""
+#~ "Nessun server LDAP trovato in questo dominio. Si prega di specificare "
+#~ "host e porta e provare di nuovo, altrimenti saltare questo passaggio e "
+#~ "configurare il server manualmente."
+
+#~ msgid "Please confirm the removal"
+#~ msgstr "Confermare la rimozione"
+
+#~ msgid "Please confirm the removal of"
+#~ msgstr "Confermare la rimozione di"
+
+#~ msgid "Reorder Authentication Backends"
+#~ msgstr "Riordina Backend di autenticazione"
+
+#~ msgid "Resource Configuration"
+#~ msgstr "Configurazione Risorsa"
+
+#~ msgid "Show %s rows on one page"
+#~ msgstr "Mostra %s righe per pagina"
+
+#~ msgid "Show rows %d to %d of %d"
+#~ msgstr "Mostra da riga %d a %d di %d"
+
+#~ msgid "Skip To Authentication Reorder Form"
+#~ msgstr "Salta al Modulo di Riordino delle Autenticazioni"
+
+#, fuzzy
+#~ msgid "Skip To Existing Resources"
+#~ msgstr "Modifica Risorsa esistente"
+
+#~ msgid "The attribute name used for storing the user name on the ldap server"
+#~ msgstr ""
+#~ "Il nome dell'attributo usato per memorizzare il nome utente sul server "
+#~ "ldap"
+
+#~ msgid "The object class used for storing users on the ldap server"
+#~ msgstr "Object class usata per memorizzare gli utenti su server ldap"
+
+#~ msgid ""
+#~ "The path where users can be found on the ldap server. Leave empty to "
+#~ "select all users available on the specified resource."
+#~ msgstr ""
+#~ "Percorso dove possono essere trovati gli utenti nel server ldap. Lasciare "
+#~ "vuoto per selezionare tutti gli utenti disponibili della risorsa "
+#~ "specificata."
+
+#~ msgid "The regular expression by which to identify columns"
+#~ msgstr "L'espressione regolare che consente di identificare le colonne"
+
+#~ msgid ""
+#~ "The regular expression to use to strip specific parts off from usernames. "
+#~ "Leave empty if you do not want to strip off anything"
+#~ msgstr ""
+#~ "Espressione regolare da usare per separare parti specifiche dai nomi "
+#~ "utente. Lasciare vuoto se non si vuole modificare niente."
+
+#~ msgid "The resource to use for authenticating with this provider"
+#~ msgstr "La risorsa da usare per autenticarsi con questo servizio"
+
+#~ msgid "Module is disabled"
+#~ msgstr "Modulo disabilitato"
+
+#~ msgid "Module is enabled"
+#~ msgstr "Modulo abilitato"
+
+#~ msgid "disabled"
+#~ msgstr "disabilitato"
+
+#~ msgid "enabled"
+#~ msgstr "abilitato"
+
+#~ msgid "failed"
+#~ msgstr "fallito"
diff --git a/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.po b/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.po
index ec4fce37a..a6fe375db 100644
--- a/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.po
+++ b/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Monitoring Module (2.0.0~alpha4)\n"
 "Report-Msgid-Bugs-To: dev@icinga.org\n"
-"POT-Creation-Date: 2015-02-10 18:04+0100\n"
-"PO-Revision-Date: 2015-02-07 18:41+0100\n"
+"POT-Creation-Date: 2015-03-13 16:11+0100\n"
+"PO-Revision-Date: 2015-03-13 14:51+0100\n"
 "Last-Translator: Davide Demuru <davide.demuru@gmail.com>\n"
 "Language: it_IT\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,263 +18,136 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:376
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:382
 msgid " Down Hosts (Handled)"
 msgstr "Host Down (Gestiti)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:377
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:383
 msgid " Down Hosts (Unhandled)"
 msgstr "Host Down (Non Gestiti)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:344
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:398
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:350
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:404
 msgid " Down Services (Handled)"
 msgstr "Servizi Down (Gestiti)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:345
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:399
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:351
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:405
 msgid " Down Services (Unhandled)"
 msgstr "Servizi Down (Non Gestiti)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:380
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:386
 msgid " Pending Hosts"
-msgstr "Host in Attesa"
+msgstr "Host in Pending"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:348
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:402
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:354
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:408
 msgid " Pending Services"
-msgstr "Servizi in Attesa"
+msgstr "Servizi in Pending"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:378
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:384
 msgid " Unreachable Hosts (Handled)"
-msgstr "Host Irraggiungibili (Gestiti)"
+msgstr "Host Unreachable (Gestiti)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:379
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:385
 msgid " Unreachable Hosts (Unhandled)"
-msgstr "Host Irraggiungibili (Non Gestiti)"
+msgstr "Host Unreachable (Non Gestiti)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:346
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:400
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:352
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:406
 msgid " Unreachable Services (Handled)"
-msgstr "Servizi Irraggiungibili (Gestiti)"
+msgstr "Servizi Unreachable (Gestiti)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:347
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:401
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:353
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:407
 msgid " Unreachable Services (Unhandled)"
-msgstr "Servizi Irraggiungibili (Non Gestiti) "
+msgstr "Servizi Unreachable (Non Gestiti) "
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:375
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:381
 msgid " Up Hosts"
 msgstr "Host Up"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:395
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:401
 msgid " Up Services"
 msgstr "Servizi Up"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:342
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:396
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:348
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:402
 msgid " Warning Services (Handled)"
 msgstr "Servizi in Warning (Gestiti)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:343
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:397
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:349
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:403
 msgid " Warning Services (Unhandled)"
 msgstr "Servizi in Warning (Non Gestiti)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:20
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:52
-#, fuzzy, php-format
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:73
+#, php-format
 msgid "%d Active"
 msgid_plural "%d Active"
-msgstr[0] "Attivo"
-msgstr[1] "Attivi"
+msgstr[0] "%d Attivo"
+msgstr[1] "%d Attivi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:8
-#, fuzzy, php-format
-msgctxt "icinga.state"
-msgid "%d CRITICAL"
-msgid_plural "%d CRITICAL"
-msgstr[0] "CRITICAL"
-msgstr[1] "CRITICAL"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:40
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:72
-#, fuzzy, php-format
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:53
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:109
+#, php-format
 msgid "%d Disabled"
 msgid_plural "%d Disabled"
-msgstr[0] "Disabilitato"
-msgstr[1] "Disabilitati"
+msgstr[0] "%d Disabilitato"
+msgstr[1] "%d Disabilitati"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:10
-#, fuzzy, php-format
-msgid "%d Host DOWN"
-msgid_plural "%d Hosts DOWN"
-msgstr[0] "%d Host Down"
-msgstr[1] "%d Host Down"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:20
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:87
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:138
-#, fuzzy, php-format
-msgid "%d Host Disabled"
-msgid_plural "%d Hosts Disabled"
-msgstr[0] "%d host disabilitato"
-msgstr[1] "%d host disabilitati"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:36
-#, fuzzy, php-format
-msgid "%d Host Flapping"
-msgid_plural "%d Hosts Flapping"
-msgstr[0] "%d host instabile"
-msgstr[1] "%d host instabili"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:22
-#, fuzzy, php-format
-msgid "%d Host PENDING"
-msgid_plural "%d Hosts PENDING"
-msgstr[0] "%d Host in Attesa"
-msgstr[1] "%d Host in Attesa"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:17
-#, fuzzy, php-format
-msgid "%d Host UNREACHABLE"
-msgid_plural "%d Hosts UNREACHABLE"
-msgstr[0] "%d Host Irraggiungibile"
-msgstr[1] "%d Host Irraggiungibili"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:15
-#, fuzzy, php-format
-msgid "%d Host UP"
-msgid_plural "%d Hosts UP"
-msgstr[0] "%d Host Up"
-msgstr[1] "%d Host Up"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:252
-#, fuzzy, php-format
-msgctxt "icinga.state"
-msgid "%d PENDING"
-msgid_plural "%d PENDING"
-msgstr[0] "ATTESA"
-msgstr[1] "ATTESA"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:30
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:62
-#, fuzzy, php-format
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:35
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:91
+#, php-format
 msgid "%d Passive"
 msgid_plural "%d Passive"
-msgstr[0] "Passivo"
-msgstr[1] "Passivi"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:48
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:107
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:158
-#, fuzzy, php-format
-msgid "%d Service Disabled"
-msgid_plural "%d Services Disabled"
-msgstr[0] "%d servizio disabilitato"
-msgstr[1] "%d servizi disabilitati"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:64
-#, fuzzy, php-format
-msgid "%d Service Flapping"
-msgid_plural "%d Services Flapping"
-msgstr[0] "%d servizio instabile"
-msgstr[1] "%d servizi instabili"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:148
-#, fuzzy, php-format
-msgctxt "icinga.state"
-msgid "%d UNKNOWN"
-msgid_plural "%d UNKNOWN"
-msgstr[0] "UNKNOWN"
-msgstr[1] "UNKNOWN"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:57
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:127
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:197
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:232
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:267
-#, php-format
-msgid "%d are not checked at all"
-msgstr "%d non sono stati controllati"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:32
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:102
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:172
-#, php-format
-msgid "%d are passively checked"
-msgstr "%d sono controllati passivamente"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:10
-#, fuzzy, php-format
-msgid "%d configured service:"
-msgid_plural "%d configured services:"
-msgstr[0] "%s servizio configurato:"
-msgstr[1] "%s servizi configurati:"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:31
-#, php-format
-msgid "%d critical on %s"
-msgstr "%d critici di %s"
+msgstr[0] "%d Passivo"
+msgstr[1] "%d Passivi"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:43
 #, php-format
-msgid "%d down on %s"
-msgstr "%d down di %s"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:62
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:132
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:202
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:237
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:272
-#, php-format
-msgid "%d is not checked at all"
-msgstr "%d non sono controllati"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:37
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:107
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:177
-#, php-format
-msgid "%d is passively checked"
-msgstr "%d è controllato passivamente"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:64
-#, fuzzy, php-format
-msgid "%d more ..."
-msgstr "e %d più"
+msgid "%d hosts down on %s"
+msgstr "%d host down in %s"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:21
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:53
 #, php-format
-msgid "%d ok on %s"
-msgstr "%d ok di %s"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:103
-#, php-format
-msgid "%d unhandled service"
-msgid_plural "%d unhandled services"
-msgstr[0] "%d servizio non gestito"
-msgstr[1] "%d servizi non gestiti"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:48
-#, php-format
-msgid "%d unknown on %s"
-msgstr "%d unknown di %s"
+msgid "%d hosts ok on %s"
+msgstr "%d host ok in %s"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:26
 #, php-format
-msgid "%d unreachable on %s"
-msgstr "%d irraggiungibili di %s"
+msgid "%d hosts unreachable on %s"
+msgstr "%d host unreachable in %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:64
+#, php-format
+msgid "%d more ..."
+msgstr "%d più ..."
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:31
+#, php-format
+msgid "%d services critical on %s"
+msgstr "%d servizi critical in %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:53
+#, php-format
+msgid "%d services ok on %s"
+msgstr "%d servizi ok in %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:48
+#, php-format
+msgid "%d services unknown on %s"
+msgstr "%d servizi unknown in %s"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:37
 #, php-format
-msgid "%d warning on %s"
-msgstr "%d warning di %s"
+msgid "%d services warning on %s"
+msgstr "%d servizi warning in %s"
 
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Plugin/Perfdata.php:437
 #, php-format
 msgid "%s %s (%s%%)"
-msgstr ""
+msgstr "%s %s (%s%%)"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:40
 #, php-format
@@ -282,18 +155,18 @@ msgctxt "timespan"
 msgid "%s ago"
 msgstr "%s fa"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:29
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:33
-#, fuzzy, php-format
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:28
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:32
+#, php-format
 msgid "%s ago"
 msgstr "%s fa"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:58
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:57
 #, php-format
 msgid "%s has been up and running with PID %d since %s"
-msgstr "%s è in esecuzione con il PID %d da %s"
+msgstr "%s è attivo e funzionante con il PID %d da %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:10
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:8
 #, php-format
 msgid "%s hosts:"
 msgstr "%s host:"
@@ -301,64 +174,167 @@ msgstr "%s host:"
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/not-running.phtml:5
 #, php-format
 msgid "%s is currently not up and running"
-msgstr "%s non è in esecuzione."
+msgstr "%s non è in esecuzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:65
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:64
 #, php-format
 msgid "%s is not running"
-msgstr "%s non è in esecuzione."
+msgstr "%s non è in esecuzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:22
+#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Link.php:54
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:142
 #, php-format
-msgid "%s notications have been sent for this issue"
-msgstr "%s notifiche inviate per questo problema"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Link.php:52
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:137
-#, fuzzy, php-format
 msgctxt "Service running on host"
 msgid "%s on %s"
-msgstr "%s il %s"
+msgstr "%s di %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:8
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:9
 #, php-format
 msgid "%s services:"
 msgstr "%s servizi:"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:112
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:84
 #, php-format
 msgid "%u Acknowledged Host Problem"
 msgid_plural "%u Acknowledged Host Problems"
-msgstr[0] "%u Problema dell'Host Confermato"
-msgstr[1] "%u Problemi dell'Host Confermati"
+msgstr[0] "%u Conferma al Problema dell'Host"
+msgstr[1] "%u Conferme ai Problemi dell'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:100
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:84
 #, php-format
 msgid "%u Acknowledged Service Problem"
 msgid_plural "%u Acknowledged Service Problems"
-msgstr[0] "%u Problema del Servizio Confermato"
-msgstr[1] "%u Problemi del Servizio Confermati"
+msgstr[0] "%u Conferma al Problema del Servizio"
+msgstr[1] "%u Conferma ai Problemi del Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:11
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:17
 #, fuzzy, php-format
+msgid "%u Active"
+msgid_plural "%u Active"
+msgstr[0] "%d Attivo"
+msgstr[1] "%d Attivi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:8
+#, php-format
 msgid "%u Host"
 msgid_plural "%u Hosts"
 msgstr[0] "%u Host"
 msgstr[1] "%u Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:58
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:10
+#, fuzzy, php-format
+msgid "%u Host DOWN"
+msgid_plural "%u Hosts DOWN"
+msgstr[0] "%d Host DOWN"
+msgstr[1] "%d Host DOWN"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:18
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:139
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:218
+#, fuzzy, php-format
+msgid "%u Host Disabled"
+msgid_plural "%u Hosts Disabled"
+msgstr[0] "%d Host Disabilitato"
+msgstr[1] "%d Host Disabilitati"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:48
+#, fuzzy, php-format
+msgid "%u Host Flapping"
+msgid_plural "%u Hosts Flapping"
+msgstr[0] "%d Host Instabile"
+msgstr[1] "%d Host Instabili"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:33
+#, fuzzy, php-format
+msgid "%u Host PENDING"
+msgid_plural "%u Hosts PENDING"
+msgstr[0] "%d Hosts PENDING"
+msgstr[1] "%d Host PENDING"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:29
+#, fuzzy, php-format
+msgid "%u Host UNREACHABLE"
+msgid_plural "%u Hosts UNREACHABLE"
+msgstr[0] "%d Host UNREACHABLE"
+msgstr[1] "%d Host UNREACHABLE"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:15
+#, fuzzy, php-format
+msgid "%u Host UP"
+msgid_plural "%u Hosts UP"
+msgstr[0] "%d Host UP"
+msgstr[1] "%d Host UP"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:8
+#, fuzzy, php-format
+msgid "%u Service"
+msgid_plural "%u Services"
+msgstr[0] "Servizio"
+msgstr[1] "Servizio"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:73
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:173
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:252
+#, fuzzy, php-format
+msgid "%u Service Disabled"
+msgid_plural "%u Services Disabled"
+msgstr[0] "%d Servizio Disabilitato"
+msgstr[1] "%d Servizi Disabilitati"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:103
+#, fuzzy, php-format
+msgid "%u Service Flapping"
+msgid_plural "%u Services Flapping"
+msgstr[0] "%d Servizio Instabile"
+msgstr[1] "%d Servizi Instabili"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:46
 #, php-format
 msgid "%u Unhandled Host Problem"
 msgid_plural "%u Unhandled Host Problems"
-msgstr[0] "%u Problema dell'Host Non Gestito"
-msgstr[1] "%u Problemi dell'Host Non Gestiti"
+msgstr[0] "%u Problema all'Host Non Gestito"
+msgstr[1] "%u Problemi all'Host Non Gestiti"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:46
 #, php-format
 msgid "%u Unhandled Service Problem"
 msgid_plural "%u Unhandled Service Problems"
-msgstr[0] "%u Problema del Servizio Non Gestito"
-msgstr[1] "%u Problemi del Servizio Non Gestiti"
+msgstr[0] "%u Problema al Servizio Non Gestito"
+msgstr[1] "%u Problemi al Servizio Non Gestiti"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:13
+#, fuzzy, php-format
+msgid "%u configured service:"
+msgid_plural "%u configured services:"
+msgstr[0] "%d servizio configurato:"
+msgstr[1] "%d servizi configurati:"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:80
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:179
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:278
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:325
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:372
+#, fuzzy, php-format
+msgid "%u is not checked at all"
+msgid_plural "%u are not checked at all"
+msgstr[0] "%d è stato controllato"
+msgstr[1] "%d è stato controllato"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:53
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:152
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:251
+#, fuzzy, php-format
+msgid "%u is passively checked"
+msgid_plural "%u are passively checked"
+msgstr[0] "%d è controllato passivamente"
+msgstr[1] "%d è controllato passivamente"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:110
+#, fuzzy, php-format
+msgid "%u unhandled service"
+msgid_plural "%u unhandled services"
+msgstr[0] "%d servizio non gestito"
+msgstr[1] "%d servizi non gestiti"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:73
 msgid "1 Year"
@@ -372,9 +348,9 @@ msgstr "2 Anni"
 msgid "3 Months"
 msgstr "3 Mesi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:99
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:97
 msgid "4 Hours"
-msgstr "4 ore"
+msgstr "4 Ore"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:71
 msgid "4 Months"
@@ -387,81 +363,80 @@ msgstr "8 Mesi"
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Plugin/Perfdata.php:437
 #, php-format
 msgid "<b>%s %s</b> (%s%%)"
-msgstr ""
+msgstr "<b>%s %s</b> (%s%%)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:293
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:453
+msgid "<b>{title}:</b> {value}m max. reaction time"
+msgstr "<b>{title}:</b> {value} max. tempo di reazione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:443
+msgid "<b>{title}:</b> {value}m min. reaction time"
+msgstr "<b>{title}:</b> {value} min. tempo di reazione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:296
 msgid "<b>{title}:</b><br> {value} of {sum} hosts are {label}"
-msgstr "<b>{title}:</b><br> {value} di{sum} host sono {label}"
+msgstr "<b>{title}:</b><br> {value} di {sum} host sono {label}"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:244
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:247
 msgid "<b>{title}:</b><br>{value} of {sum} services are {label}"
-msgstr "<b>{title}:</b><br> {value} di{sum} servizi sono {label}"
+msgstr "<b>{title}:</b><br>{value} di {sum} servizi sono {label}"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:17
-#, php-format
-msgid "A notication has been sent for this issue %s ago"
-msgstr "Una notifica è stata inviata per questo problema %s fa"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:73
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:78
 msgid "Ack removed"
 msgstr "Conferma rimossa"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:68
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:73
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:39
 msgid "Acknowledge"
 msgstr "Conferma"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:88
-#, fuzzy, php-format
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:68
+#, php-format
 msgid "Acknowledge %u unhandled host problem"
 msgid_plural "Acknowledge %u unhandled host problems"
-msgstr[0] "Conferma i problemi non gestiti degli Host"
-msgstr[1] "Conferma i problemi non gestiti degli Host"
+msgstr[0] "Conferma %u Problema dell'Host Non Gestito"
+msgstr[1] "Conferma %u Problemi dell'Host Non Gestiti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:76
-#, fuzzy, php-format
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:68
+#, php-format
 msgid "Acknowledge %u unhandled service problem"
 msgid_plural "Acknowledge %u unhandled service problems"
-msgstr[0] "Conferma i problemi non gestiti degli Host"
-msgstr[1] "Conferma i problemi non gestiti degli Host"
+msgstr[0] "Conferma %u Problema del Servizio Non Gestito"
+msgstr[1] "Conferma %u Problemi del Servizio Non Gestiti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:69
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:71
 msgid "Acknowledge Host Problem"
 msgstr "Conferma il Problema dell'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:174
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:184
 msgid "Acknowledge Host Problems"
 msgstr "Conferma i Problemi dell'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:46
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:48
 msgid "Acknowledge Service Problem"
 msgstr "Conferma il Problema del Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:223
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:233
 msgid "Acknowledge Service Problems"
 msgstr "Conferma i Problemi del Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:23
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:34
 msgid "Acknowledge problem"
 msgid_plural "Acknowledge problems"
-msgstr[0] "Conferma il problema"
-msgstr[1] "Conferm i problemi"
+msgstr[0] "Conferma Problema"
+msgstr[1] "Conferma Problemi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:97
-msgid "Acknowledge unhandled host problem"
-msgid_plural "Acknowledge unhandled host problems"
-msgstr[0] "Conferma i problemi non gestiti degli Host"
-msgstr[1] "Conferma i problemi non gestiti degli Host"
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:46
+msgid ""
+"Acknowledge this problem, suppress all future notifications for it and tag "
+"it as being handled"
+msgstr ""
+"Conferma questo problema, disabilita tutte le notifiche future e marca come "
+"gestito"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:85
-msgid "Acknowledge unhandled service problem"
-msgid_plural "Acknowledge unhandled service problems"
-msgstr[0] "Conferma i problemi non gestiti degli Host"
-msgstr[1] "Conferma i problemi non gestiti degli Host"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:16
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:86
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:156
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:31
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:130
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:229
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:12
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:9
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:9
@@ -475,19 +450,19 @@ msgstr "Confermato"
 msgid "Acknowledgement"
 msgstr "Conferma"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:61
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:59
 msgid "Acknowledgements"
-msgstr "Problemi Confermati"
+msgstr "Conferme"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:161
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:157
 msgid "Acknowledging problem.."
 msgid_plural "Acknowledging problems.."
-msgstr[0] "Problema confermato.."
-msgstr[1] "Problemi confermati.."
+msgstr[0] "Conferma in corso.."
+msgstr[1] "Conferme in corso.."
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/actions.phtml:44
 msgid "Actions"
-msgstr "Attivo"
+msgstr "Azioni"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:24
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:24
@@ -496,7 +471,7 @@ msgstr "Attivo"
 msgid "Active And Passive Checks Disabled"
 msgstr "Controlli Attivi e Passivi Disabilitati"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:36
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:39
 msgid "Active Checks"
 msgstr "Controlli Attivi"
 
@@ -507,53 +482,64 @@ msgstr "Controlli Attivi"
 msgid "Active Checks Disabled"
 msgstr "Controlli Attivi Disabilitati"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:85
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:88
 msgid "Active Host Checks Being Executed"
 msgstr "Esegui Controlli Attivi sugli Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:94
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:97
 msgid "Active Service Checks Being Executed"
 msgstr "Esegui Controlli Attivi sui Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:121
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:120
 msgid "Active checks"
 msgstr "Controlli Attivi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:80
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:83
 msgid "Add Host Comment"
 msgstr "Aggiungi commento all'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/createbackend.phtml:4
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:48
 msgid "Add New Backend"
 msgstr "Aggiungi Nuovo Backend"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/createinstance.phtml:4
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:164
 msgid "Add New Instance"
 msgstr "Aggiungi Nuova Istanza"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:57
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:60
 msgid "Add Service Comment"
 msgstr "Aggiungi Commento al Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:21
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:20
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:14
+msgid "Add a new comment to this host"
+msgstr "Aggiungi un nuovo commento all'host"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:25
+msgid "Add a new comment to this service"
+msgstr "Aggiungi un nuovo commento al servizio"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:28
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:8
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:19
+#, fuzzy
 msgid "Add comment"
 msgid_plural "Add comments"
-msgstr[0] "Aggiungi Commento"
-msgstr[1] "Aggiungi Commenti"
+msgstr[0] "Aggiungi commento"
+msgstr[1] "Aggiungi commento"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:89
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:83
 msgid "Adding comment.."
 msgid_plural "Adding comments.."
-msgstr[0] "Aggiunta commento..."
-msgstr[1] "Aggiunta commenti..."
+msgstr[0] "Aggiunta commento.."
+msgstr[1] "Aggiunta commenti.."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:141
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:135
 msgid "Address"
 msgstr "Indirizzo"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:195
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:66
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:201
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:44
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:48
 msgid "Alert Summary"
 msgstr "Storico Allarmi"
 
@@ -561,26 +547,26 @@ msgstr "Storico Allarmi"
 msgid "Alert summary"
 msgstr "Storico Allarmi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:379
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:377
 msgid "Alias"
 msgstr "Alias"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:28
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:95
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:146
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:37
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:158
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:237
 msgid "All Hosts Enabled"
-msgstr "Tutti gli host abilitati"
+msgstr "Tutti gli Host abilitati"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:26
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:29
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:28
 msgid "All Services"
 msgstr "Tutti i Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:56
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:115
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:166
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:92
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:192
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:271
 msgid "All Services Enabled"
-msgstr "Tutti i servizi abilitati"
+msgstr "Tutti i Servizi Abilitati"
 
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:178
 msgid "All backends are disabled"
@@ -588,67 +574,71 @@ msgstr "Tutti i backend sono disabilitati"
 
 #: /usr/share/icingaweb2/modules/monitoring/configuration.php:16
 msgid "Allow acknowledging host and service problems"
-msgstr "Consente la Conferma dei problemi si Host e Servizi"
+msgstr "Consenti la Conferma dei problemi di Host e Servizi"
 
 #: /usr/share/icingaweb2/modules/monitoring/configuration.php:24
 msgid "Allow adding and deleting host and service comments"
-msgstr "Consente la rimozione di Commenti da Host e Servizi"
+msgstr "Consenti la rimozione di Commenti da Host e Servizi"
 
 #: /usr/share/icingaweb2/modules/monitoring/configuration.php:8
 msgid "Allow all commands"
-msgstr "Consente tutti i Comandi"
+msgstr "Consenti tutti i Comandi"
 
 #: /usr/share/icingaweb2/modules/monitoring/configuration.php:28
 msgid "Allow commenting on hosts and services"
-msgstr "Consente l'aggiunta di Commenti su Host e Servizi"
+msgstr "Consenti l'aggiunta di Commenti su Host e Servizi"
 
 #: /usr/share/icingaweb2/modules/monitoring/configuration.php:32
 msgid "Allow deleting host and service comments"
-msgstr "Consente la rimozione di Commenti da Host e Servizi"
+msgstr "Consenti la rimozione di Commenti da Host e Servizi"
 
 #: /usr/share/icingaweb2/modules/monitoring/configuration.php:44
 msgid "Allow deleting host and service downtimes"
-msgstr "Consente la schedulazione di Manutenzioni su Host e Servizi"
+msgstr "Consenti la cancellazione di Manutenzioni da Host e Servizi"
 
 #: /usr/share/icingaweb2/modules/monitoring/configuration.php:52
 msgid ""
 "Allow processing commands for toggling features on an instance-wide basis"
-msgstr ""
+msgstr "Consenti di abilitare/disabilitare funzionalità globali"
 
 #: /usr/share/icingaweb2/modules/monitoring/configuration.php:56
 msgid ""
 "Allow processing commands for toggling features on host and service objects"
-msgstr "Consente l'aggiunta di Commenti su Host e Servizi"
+msgstr "Consenti di abilitare/disabilitare funzionalità di host e servizi"
 
 #: /usr/share/icingaweb2/modules/monitoring/configuration.php:48
 msgid "Allow processing host and service check results"
-msgstr "Consente la schedulazione di Controlli su Host e Servizi"
+msgstr "Consenti l'invio di risultati passivi"
 
 #: /usr/share/icingaweb2/modules/monitoring/configuration.php:20
 msgid "Allow removing problem acknowledgements"
-msgstr "Consente la rimozione di Conferme"
+msgstr "Consenti la rimozione delle Conferme"
 
 #: /usr/share/icingaweb2/modules/monitoring/configuration.php:36
 msgid "Allow scheduling and deleting host and service downtimes"
-msgstr "Consente la schedulazione di Manutenzioni su Host e Servizi"
+msgstr "Consenti la pianificazione di Manutenzioni su Host e Servizi"
 
 #: /usr/share/icingaweb2/modules/monitoring/configuration.php:12
 msgid "Allow scheduling host and service checks"
-msgstr "Consente la schedulazione di Controlli su Host e Servizi"
+msgstr "Consenti la schedulazione di Controlli su Host e Servizi"
 
 #: /usr/share/icingaweb2/modules/monitoring/configuration.php:40
 msgid "Allow scheduling host and service downtimes"
-msgstr "Consente la schedulazione di Manutenzioni su Host e Servizi"
+msgstr "Consenti la pianificazione di Manutenzioni su Host e Servizi"
+
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:60
+msgid "Allow sending custom notifications for hosts and services"
+msgstr "Consenti l'invio di notifiche personalizzate per host e servizi"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:21
 msgid "Apply"
 msgstr "Applica"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/removeinstance.phtml:5
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:131
 msgid "Are you sure you want to remove this instance?"
 msgstr "Sicuro di voler rimuovere l'istanza?"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:306
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:300
 msgid "Author"
 msgstr "Autore"
 
@@ -656,30 +646,38 @@ msgstr "Autore"
 msgid "Average"
 msgstr "Media"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:109
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:108
 msgid "Average services per host"
 msgstr "Media di Servizi per Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:453
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:439
 msgid "Avg (min)"
 msgstr "Media (min)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:75
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:78
 #, php-format
 msgid "Backend \"%s\" successfully removed."
-msgstr "Backend \"%s\" rimosso con successo."
+msgstr "Backend  \"%s\" rimosso correttamente."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:207
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:45
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:216
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:28
 msgid "Backend Name"
 msgstr "Nome Backend"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:217
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:61
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:226
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:44
 msgid "Backend Type"
 msgstr "Tipo Backend"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:222
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:75
+msgid "Backends"
+msgstr "Backend"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:77
+msgid "Broadcast"
+msgstr "Trasmetti a tutti"
+
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:184
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:34
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:52
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:34
@@ -687,52 +685,51 @@ msgstr "Tipo Backend"
 msgid "CRITICAL"
 msgstr "CRITICAL"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:63
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:16
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:62
 msgctxt "icinga.state"
 msgid "CRITICAL"
 msgstr "CRITICAL"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml:3
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml:4
 msgid "Check Source"
-msgstr "Sorgente del Controllo"
+msgstr "Eseguito da"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:54
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:51
 msgid "Check Time"
 msgstr "Ora del Controllo"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:51
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:61
 msgid "Check attempts"
 msgstr "Tentativi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:60
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:70
 msgid "Check execution time"
-msgstr "Durata"
+msgstr "Durata "
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:66
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:76
 msgid "Check latency"
 msgstr "Latenza"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:37
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:38
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:39
 msgid "Check now"
 msgstr "Controlla ora"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:94
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:78
 msgid ""
 "Check this to not to validate connectivity with the given Livestatus socket"
 msgstr ""
 "Spunta questa casella per non verificare la connettività con il socket "
 "Livestatus fornito"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:94
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:77
 msgid ""
 "Check this to not to validate connectivity with the given database server"
 msgstr ""
 "Spunta questa casella per non verificare la connettività con il database "
 "fornito"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:39
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:38
 msgid "Child Hosts"
 msgstr "Host Figli"
 
@@ -753,29 +750,33 @@ msgstr "Comando"
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:64
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php:30
 msgid "Command File"
-msgstr "File del Comando"
+msgstr "File dei comandi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:45
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:49
 msgid "Commands"
 msgstr "Comandi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:68
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:52
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:48
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:58
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:52
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:65
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:49
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:43
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:63
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:54
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:62
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:67
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:46
 msgid "Comment"
 msgstr "Commento"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:486
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:489
 msgid "Comment Timestamp"
 msgstr "Timestamp Commento"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:489
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:492
 msgid "Comment Type"
-msgstr "Tipo di Commento"
+msgstr "Tipo Commento"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:63
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:68
 msgid "Comment deleted"
 msgstr "Commento rimosso"
 
@@ -795,25 +796,30 @@ msgstr "Commento generato dalla conferma di un problema"
 msgid "Comment was created by an user."
 msgstr "Commento creato da un utente."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:77
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:93
-msgid "Comment: "
-msgstr "Commento: "
-
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:157
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:163
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:66
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:2
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:56
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:465
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:54
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:468
 msgid "Comments"
 msgstr "Commenti"
 
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:196
 #, php-format
 msgid "Configuration for backend %s is disabled"
-msgstr "La configurazione per il backend %s è disabilitata"
+msgstr "Configurazione peril backend %s disabilitata"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:433
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:79
+msgid ""
+"Configure how to protect your monitoring environment against prying eyes"
+msgstr ""
+"Configura come proteggere l'ambiente di monitoraggio da occhi indiscreti"
+
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:74
+msgid "Configure how to retrieve monitoring information"
+msgstr "Configura come recuperare le informazioni di monitoraggio"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:434
 msgid "Contact Groups"
 msgstr "Gruppi di Contatti"
 
@@ -821,23 +827,30 @@ msgstr "Gruppi di Contatti"
 msgid "Contact details"
 msgstr "Dettagli del Contatto"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:153
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:33
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:159
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:37
 msgid "Contactgroups"
-msgstr "Gruppi di contatti"
+msgstr "Gruppi di Contatti"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:149
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:14
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:353
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:155
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:17
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:351
 msgid "Contacts"
 msgstr "Contatti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:52
-msgid "Could not find any valid monitoring backend resources"
-msgstr ""
-"Não foi possível encontrar nenhum recurso válido de backend de monitoramento"
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:299
+msgid "Contains host states of each service group."
+msgstr "Contiene gli stati degli host per ogni gruppo di servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:41
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:240
+msgid "Contains service states for each service group."
+msgstr "Contiene gli stati dei servizi per ogni gruppo di servizi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:55
+msgid "Could not find any valid monitoring backend resources"
+msgstr "Non è stata trovata nessun backend di monitoraggio valido"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:53
 msgid "Create New Instance"
 msgstr "Crea una Nuova Istanza"
 
@@ -847,36 +860,35 @@ msgstr "Crea un Nuovo Backend di Monitoraggio"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:118
 #: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:261
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:264
 msgid "Critical"
 msgstr "Critical"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:117
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:123
 msgid "Current Downtimes"
 msgstr "Manutenzioni in corso"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:233
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:227
 msgid "Current Host State"
 msgstr "Stato Corrente degli Host"
 
-# rivedere
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:211
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:217
 msgid "Current Incidents"
 msgstr "Problemi Correnti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:229
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:223
 msgid "Current Service State"
 msgstr "Stato Corrente dei Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:139
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:133
 msgid "Current State"
 msgstr "Stato Corrente"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:178
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:176
 msgid "DOWN"
-msgstr ""
+msgstr "DOWN"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:58
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:57
 msgctxt "icinga.state"
 msgid "DOWN"
 msgstr "DOWN"
@@ -893,126 +905,141 @@ msgstr "Risorsa Database"
 msgid "Database Type"
 msgstr "Tipo Database"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:651
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:654
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:643
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:646
 msgid "Day"
 msgstr "Giorno"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:498
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:468
+msgid "Defect Chart"
+msgstr "Grafico dei Problemi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:489
 msgid "Defects"
 msgstr "Problemi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:47
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:46
 msgid "Define what should be done with the child hosts of the hosts."
 msgstr "Definire che azione compiere con gli Host figli"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:57
-msgid "Delete comment"
-msgstr "Rimuovi Commento"
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:64
+msgid "Delete this comment"
+msgstr "Cancella questo commento"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php:57
-msgid "Delete downtime"
-msgstr "Cancella Manutenzione"
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php:64
+msgid "Delete this downtime"
+msgstr "Cancella questa manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:82
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:89
 msgid "Deleting comment.."
 msgstr "Rimozione commento..."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php:82
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php:89
 msgid "Deleting downtime.."
 msgstr "Cancellazione Manutenzione..."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:23
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:95
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:24
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:99
 msgid "Disable Notifications"
 msgstr "Disabilita le Notifiche"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:199
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:208
 msgid "Disable This Backend"
 msgstr "Disabilita Backend"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:64
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:67
 msgid "Disable notifications for a specific time on a program-wide basis"
 msgstr "Disabilita le notifiche per un periodo specifico sull'intero sistema"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:66
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:69
 msgid "Disable temporarily"
 msgstr "Disabilita Temporaneamente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:68
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:61
 msgid "Disabling host and service notifications.."
-msgstr "Disabilazione Notifiche di Host e Servizi in corso..."
+msgstr "Disabilitazione Notifiche di Host e Servizi in corso..."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:42
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:41
 msgid "Do nothing with child hosts"
 msgstr "Non applicare agli Host figli"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:139
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:308
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:314
 msgid "Down"
 msgstr "Down"
 
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:68
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:35
 msgid "Downtime"
 msgstr "Manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:115
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:120
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:88
 msgid "Downtime End"
 msgstr "Fine Manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:110
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:115
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:83
 msgid "Downtime Start"
 msgstr "Inizio Manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:83
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:88
 msgid "Downtime removed"
 msgstr "Manutenzione cancellata"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:161
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:167
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:56
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:2
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:275
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:269
 msgid "Downtimes"
 msgstr "Manutenzioni"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:311
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:305
 msgid "Duration"
 msgstr "Durata"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/editbackend.phtml:4
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:33
 msgid "Edit Existing Backend"
-msgstr "Modifica Backend Esistenti"
+msgstr "Modifica Backend Esistente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/editinstance.phtml:4
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:150
 msgid "Edit Existing Instance"
-msgstr "Modifica Istanze Esistenti"
+msgstr "Modifica Istanza Esistente"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:27
+#, php-format
+msgid "Edit monitoring backend %s"
+msgstr "Modifica backend di monitoraggio %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:71
+#, php-format
+msgid "Edit monitoring instance %s"
+msgstr "Modifica istanza di monitoraggio %s"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:22
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:24
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:380
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:28
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:378
 msgid "Email"
 msgstr "Email"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:91
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:308
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:88
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:302
 msgid "End Time"
 msgstr "Ora Fine"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:71
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:69
 msgid "Ended downtimes"
-msgstr "Manutenzioni completate"
+msgstr "Manutenzioni Completate"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:162
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:159
 msgid ""
 "Enter here the duration of the downtime. The downtime will be automatically "
 "deleted after this time expired."
 msgstr ""
-"Inserire qui la durata della manutenzione. Icinga cancellerà automaticamente "
-"la manutenzione allo scadere del tempo."
+"Inserire qui la durata della manutenzione. La manutenzione sarà cancellata "
+"automaticamente allo scadere del tempo."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:93
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:90
 msgid ""
 "Enter the expire date and time for this acknowledgement here. Icinga will "
 "delete the acknowledgement after this time expired."
@@ -1020,47 +1047,47 @@ msgstr ""
 "Inserire qui la durata della conferma del problema. Icinga cancellerà "
 "automaticamente la conferma allo scadere del tempo."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:305
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:299
 msgid "Entry Time"
 msgstr "Ora Inserimento"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:177
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:392
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:183
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:390
 msgid "Event Grid"
 msgstr "Griglia Eventi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:72
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:75
 msgid "Event Handler"
 msgstr "Gestore Eventi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:124
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:126
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:206
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:208
 msgid "Event Handlers"
-msgstr "Gestore Eventi"
+msgstr "Gestori Eventi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:103
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:106
 msgid "Event Handlers Enabled"
 msgstr "Gestore Eventi Abilitato"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:182
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:604
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:188
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:613
 msgid "Event Overview"
 msgstr "Panoramica Eventi"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:181
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:187
 msgid "Events"
 msgstr "Eventi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:128
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:127
 msgid "Execution time"
 msgstr "Tempo di Esecuzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:490
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:493
 msgid "Expiration"
 msgstr "Scadenza"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:90
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:50
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:87
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:43
 msgid "Expire Time"
 msgstr "Ora Scadenza"
 
@@ -1068,26 +1095,26 @@ msgstr "Ora Scadenza"
 msgid "Expires"
 msgstr "Scade"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:15
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:29
 msgid "Feature Commands"
 msgstr "Controllo Funzionalità"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:110
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:107
 msgid "Fixed"
 msgstr "Rigido"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:81
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:84
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:6
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:8
 msgid "Flap Detection"
 msgstr "Controllo Instabilità"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:112
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:115
 msgid "Flap Detection Enabled"
 msgstr "Controllo Instabilità Attivato"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:86
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:88
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:93
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:25
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:61
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:57
@@ -1099,83 +1126,80 @@ msgstr "Instabile"
 msgid "Flapping Stopped"
 msgstr "Instabilità Terminata"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:93
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:98
 msgid "Flapping stopped"
 msgstr "Instabilità Terminata"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:111
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:108
 msgid "Flexible"
 msgstr "Flessibile"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:160
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:157
 msgid "Flexible Duration"
 msgstr "Durata Flessibile"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:65
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:62
 msgid "Force Check"
 msgstr "Forza Controllo"
 
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:64
+msgid "Forced"
+msgstr "Forzato"
+
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:67
 msgid "From"
 msgstr "Da"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:48
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:47
 msgid "Global Host Event Handler"
 msgstr "Gestore Eventi Host Globale"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:42
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:41
 msgid "Global Service Event Handler"
 msgstr "Gestore Eventi Servizi Globale"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:39
-msgid "Handled hosts with state DOWN"
-msgstr "Host Gestiti con stato DOWN"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:64
-msgid "Handled hosts with state UNREACHABLE"
-msgstr "Host Gestiti con stato IRRAGGIUNGIBILE"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:68
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:64
-#, php-format
-msgid "Handled services with state %s"
-msgstr "Servizi Gestiti con stato %s"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:51
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:49
 msgid "Hard state changes"
-msgstr "Cambi di stato Hard"
+msgstr "Cambi di Stato HARD"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:174
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:209
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:327
+msgid "Healing Chart"
+msgstr "Grafico Ripristini"
+
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:180
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:233
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:69
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:235
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:258
 msgid "History"
 msgstr "Storico"
 
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:96
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:179
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:186
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:31
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml:12
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:303
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:487
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:205
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:58
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:63
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:53
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:297
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:490
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:211
 msgid "Host"
 msgstr "Host"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml:21
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml:6
-#, fuzzy, php-format
+#, php-format
 msgid "Host (%u)"
 msgid_plural "Hosts (%u)"
 msgstr[0] "Host (%u)"
 msgstr[1] "Host (%u)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:235
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:229
 msgid "Host Address"
 msgstr "Indirizzo Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:134
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:156
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:133
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:155
 msgid "Host Checks"
 msgstr "Controlli Host"
 
@@ -1183,63 +1207,67 @@ msgstr "Controlli Host"
 msgid "Host Group"
 msgstr "Gruppo di Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:589
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:298
+msgid "Host Group Chart"
+msgstr "Grafico dei Gruppi di Host"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:596
 msgid "Host Group Name"
 msgstr "Nome del Gruppo di Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:554
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:561
 msgid "Host Groups"
 msgstr "Gruppi di Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:383
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:381
 msgid "Host Notification Timeperiod"
 msgstr "Periodo delle Notifiche per l'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:105
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:221
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:111
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:227
 msgid "Host Problems"
 msgstr "Host con Problemi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:232
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:226
 msgid "Host Severity"
 msgstr "Impatto Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:63
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:153
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:84
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:202
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:64
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:158
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:85
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:207
 msgid "Host State"
 msgstr "Stato Host"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:2
 msgid "Host and Service Checks"
-msgstr "Controlli per Host o Servizi"
+msgstr "Controlli di Host e Servizi"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/disable-notifications.phtml:8
 msgid "Host and service notifications are already disabled."
-msgstr "Notifiche per Host e Servizi sono già disabilitate"
+msgstr "Notifiche per Host e Servizi sono già disabilitate."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:33
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:34
 msgid "Host not found"
 msgstr "Host non trovato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:43
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:48
 msgid "Host notification period"
-msgstr "Periodo di Notifica per l'Host"
+msgstr "Periodo delle Notifiche per l'Host"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:40
 msgid "Host or service not found"
 msgstr "Host o Servizio non trovato"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:84
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:145
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml:13
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:90
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:151
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml:16
 msgid "Hostgroups"
-msgstr "Gruppi di Servizi"
+msgstr "Gruppi di Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:140
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:234
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:646
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:134
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:228
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:657
 msgid "Hostname"
 msgstr "Nome Host"
 
@@ -1247,31 +1275,23 @@ msgstr "Nome Host"
 msgid "Hostname or address of the remote Icinga instance"
 msgstr "Nome Host o Indirizzo dell'istanza remota di Icinga"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:82
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:133
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:88
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:139
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:101
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:7
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:33
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:85
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:296
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:75
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:103
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:37
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:84
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:302
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:80
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:97
 msgid "Hosts"
 msgstr "Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:79
-msgid "Hosts with state PENDING"
-msgstr "Host in stato ATTESA"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:18
-msgid "Hosts with state UP"
-msgstr "Host in stato UP"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:648
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:640
 msgid "Hour"
-msgstr "Ore"
+msgstr "Ora"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:140
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:137
 msgid "Hours"
 msgstr "Ore"
 
@@ -1281,7 +1301,7 @@ msgid ""
 "using the configuration specified below:"
 msgstr ""
 "Icinga Web 2 proteggerà il tuo ambiente di monitoraggio da occhi indiscreti "
-"usando la configurazione specificata qui sotto:"
+"con la configurazione seguente:"
 
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:76
 #, php-format
@@ -1290,7 +1310,7 @@ msgid ""
 "using a backend called \"%s\" and the specified resource below:"
 msgstr ""
 "Icinga Web 2 recupererà le informazioni dal tuo ambiente di monitoraggio "
-"usando il backend chiamato \"%s\" e le risorse spacificate qui sotto:"
+"usando il backend chiamato \"%s\" e le seguenti risorse:"
 
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:75
 #, php-format
@@ -1308,31 +1328,49 @@ msgid ""
 "to send commands to your monitoring instance by using the connection details "
 "listed below:"
 msgstr ""
-"Icinga Web 2 la pipe situata nella macchina remota in \"%s\" per inviare "
-"comandi alla vostra istanza di monitoraggio utilizzando i dettagli per la "
-"connessione descritti qui sotto:"
+"Icinga Web 2 userà la pipe situata nella macchina remota in \"%s\" per "
+"inviare comandi alla vostra istanza di monitoraggio utilizzando i seguenti "
+"dettagli:"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:77
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:74
 msgid "If the acknowledgement should expire, check this option."
-msgstr "Se la Conferma del Problema deve scadere, spuntare questa casella."
+msgstr ""
+"Spuntare questa casella se si vuole dare una scadenza alla Conferma del "
+"Problema."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:129
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:80
+msgid ""
+"If you check this option, a notification is sent to all normal and escalated "
+"contacts."
+msgstr ""
+"Selezionando questa opzione verrà inviata una notifica ai contatti "
+"configurati."
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:67
+msgid ""
+"If you check this option, a notification is sentregardless of the current "
+"time and whether notifications are enabled."
+msgstr ""
+"Selezionando questa opzione verrà inviata una notifica anche se le notifiche "
+"sono disabilitate e ignorando eventuali restrizioni di orario."
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:126
 msgid ""
 "If you do not want an acknowledgement notification to be sent out to the "
 "appropriate contacts, uncheck this option."
 msgstr ""
-"In caso non si voglia inviare una Notifica di Conferma ai contatti "
-"configurati, deselezionare questa opzione."
+"Deselezionare questa opzione in caso non si voglia inviare una Notifica di "
+"Conferma ai contatti configurati."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/removeinstance.phtml:6
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:124
 msgid ""
 "If you have still any environments or views referring to this instance, you "
 "won't be able to send commands anymore after deletion."
 msgstr ""
-"In caso qualche altro ambiente o vista faccia riferimento a questa istanza, "
+"Nel caso qualche altro ambiente o vista faccia riferimento a questa istanza, "
 "non sarà più possibile inviare comandi dopo la cancellazione."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:104
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:101
 msgid ""
 "If you select the fixed option, the downtime will be in effect between the "
 "start and end times you specify whereas a flexible downtime starts when the "
@@ -1347,7 +1385,7 @@ msgstr ""
 "specificata). Il campi della Durata non avranno effetto sulle Manutenzioni "
 "Rigide."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:67
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:64
 msgid ""
 "If you select this option, Icinga will force a check regardless of both what "
 "time the scheduled check occurs and whether or not checks are enabled."
@@ -1355,25 +1393,26 @@ msgstr ""
 "Selezionando questa opzione, Icinga forzerà l'esecuzione del controllo "
 "ignorando se controlli attivi sono disabilitati e gli orari di schedulazione."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:63
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:58
 msgid ""
 "If you uncheck this option, the comment will automatically be deleted the "
 "next time Icinga is restarted."
 msgstr ""
-"Slezionando questa opzione il commento verrà automaticamente rimosso al "
+"Selezionando questa opzione il commento verrà automaticamente rimosso al "
 "prossimo riavvio di Icinga."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:117
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:114
 msgid ""
 "If you want the acknowledgement to disable notifications until the host or "
 "service recovers, check this option."
 msgstr ""
 "Selezionando questa opzione le notifiche verranno disabilitate fino al "
-"ripristino dell'host o servizio"
+"ripristino dell'host o servizio."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:70
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:54
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:50
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:54
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:67
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:51
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:45
 msgid ""
 "If you work with other administrators, you may find it useful to share "
 "information about the the host or service that is having problems. Make sure "
@@ -1383,15 +1422,14 @@ msgstr ""
 "informazioni riguardo l'host e i servizi che stanno avendo problemi. "
 "Assicurati di inserire una breve descrizione delle azioni che stai svolgendo."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:66
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:63
 msgid ""
 "If you would like the comment to remain even when the acknowledgement is "
 "removed, check this option."
 msgstr ""
-"Selezionando questa opzione il commento rimarrà anche dopo la fine della "
-"Conferma del Problema."
+"Selezionando questa opzione il commento rimarrà anche dopo la fine Problema."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:78
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:83
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:17
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:17
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:56
@@ -1400,32 +1438,32 @@ msgstr ""
 msgid "In Downtime"
 msgstr "In Manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:145
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:147
 msgid ""
 "In case it's desired that a TCP connection is being used by Icinga Web 2 to "
 "access a Livestatus interface, the Sockets module for PHP is required."
 msgstr ""
-"Nel caso si desidera usare uan connessione TCP per permettere a Icinga Web 2 "
-"diaccedere all'interfaccia Livestatus, è richiesto il modulo sockets di PHP."
+"Il modulo PHP Sockets è richiesto nel caso sia necessaria stabilire una "
+"connessione TCP per accedere all'interfaccia Livestatus tramite Icinga Web 2."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:46
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:58
 msgid "Instance"
 msgstr "Istanza"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:160
 #, php-format
 msgid "Instance \"%s\" created successfully."
-msgstr "Istanza \"%s\" creata con successo."
+msgstr "Istanza \"%s\" creata correttamente."
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:163
 #, php-format
 msgid "Instance \"%s\" edited successfully."
-msgstr "Istanza \"%s\" modificata con successo."
+msgstr "Istanza \"%s\" modificata correttamente."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:107
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:114
 #, php-format
 msgid "Instance \"%s\" successfully removed."
-msgstr "Istanza \"%s\" rimossa con successo."
+msgstr "Istanza \"%s\" modificata correttamente."
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:191
 msgid "Instance Name"
@@ -1450,7 +1488,7 @@ msgstr "Nome istanza mancante"
 msgid "Invalid instance type \"%s\" given"
 msgstr "Tipo \"%s\" di Istanza non valido"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:302
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:296
 msgid "Is In Effect"
 msgstr "In Corso"
 
@@ -1468,19 +1506,24 @@ msgstr ""
 msgid "Label"
 msgstr "Etichetta"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:142
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:136
 msgid "Last Check"
-msgstr "Ultimo controllo"
+msgstr "Ultimo Controllo"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:32
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:77
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:93
+msgid "Last Comment: "
+msgstr "Ultimo Commento: "
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:31
 msgid "Last External Command Check"
 msgstr "Ultimo Comando Esterno"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:236
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:230
 msgid "Last Host Check"
 msgstr "Ultimo Controllo dell'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:36
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:35
 msgid "Last Log File Rotation"
 msgstr "Ultima Rotazione del File di Log"
 
@@ -1489,11 +1532,11 @@ msgstr "Ultima Rotazione del File di Log"
 msgid "Last Problem"
 msgstr "Ultimo Problema"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:231
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:225
 msgid "Last Service Check"
 msgstr "Ultimo Controllo del Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:28
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:27
 msgid "Last Status Update"
 msgstr "Ultimo Aggiornamento di Stato"
 
@@ -1501,7 +1544,7 @@ msgstr "Ultimo Aggiornamento di Stato"
 msgid "Last check"
 msgstr "Ultimo Controllo"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:127
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:126
 msgid "Latency"
 msgstr "Latenza"
 
@@ -1509,207 +1552,700 @@ msgstr "Latenza"
 msgid "Legend"
 msgstr "Legenda"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:116
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:292
 #, fuzzy, php-format
-msgid "List %s service problem on host %s"
-msgid_plural "List %s service problems on host %s"
-msgstr[0] "Problemi dei Servizi dell'Host"
-msgstr[1] "Problemi dei Servizi degli Host"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:148
-#, php-format
-msgid "List %s service with status critical handled in service group %s"
+msgid ""
+"List %s service that is currenlty in state PENDING in service group \"%s\""
 msgid_plural ""
-"List %s services with status critical handled in service group %s"
+"List %s services which are currently in state PENDING in service group \"%s\""
 msgstr[0] ""
-msgstr[1] ""
+"Mostra %s servizio in stato warning gestito nel gruppo di servizi %s"
+msgstr[1] "Mostra %s servizi in stato warning gestiti nel gruppo di servizi %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:126
-#, php-format
-msgid "List %s service with status critical unhandled in service group %s"
-msgid_plural ""
-"List %s Services with status critical unhandled in service group %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:101
-#, php-format
-msgid "List %s service with status ok in service group %s"
-msgid_plural "List %s Services with status ok in service group %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:273
-#, php-format
-msgid "List %s service with status pending in service group %s"
-msgid_plural "List %s services with status pending in service group %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:198
-#, php-format
-msgid "List %s service with status unknown handled in service group %s"
-msgid_plural "List %s services with status unknown handled in service group %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:176
-#, php-format
-msgid "List %s service with status unknown unhandled in service group %s"
-msgid_plural ""
-"List %s services with status unknown unhandled in service group %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:248
-#, php-format
-msgid "List %s service with status warning handled in service group %s"
-msgid_plural "List %s services with status warning handled in service group %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:226
-#, php-format
-msgid "List %s service with status warning unhandled in service group %s"
-msgid_plural ""
-"List %s services with status warning unhandled in service group %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:155
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:164
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:157
 #, fuzzy, php-format
+msgid ""
+"List %s service that is currently in state CRITICAL (Acknowledged) in "
+"service group \"%s\""
+msgid_plural ""
+"List %s services which are currently in state CRITICAL (Acknowledged) in "
+"service group \"%s\""
+msgstr[0] ""
+"Mostra %s servizio in stato warning gestito nel gruppo di servizi %s"
+msgstr[1] "Mostra %s servizi in stato warning gestiti nel gruppo di servizi %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:133
+#, fuzzy, php-format
+msgid ""
+"List %s service that is currently in state CRITICAL in service group \"%s\""
+msgid_plural ""
+"List %s services which are currently in state CRITICAL in service group \"%s"
+"\""
+msgstr[0] ""
+"Mostra %s servizio in stato warning gestito nel gruppo di servizi %s"
+msgstr[1] "Mostra %s servizi in stato warning gestiti nel gruppo di servizi %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:106
+#, fuzzy, php-format
+msgid "List %s service that is currently in state OK in service group \"%s\""
+msgid_plural ""
+"List %s services which are currently in state OK in service group \"%s\""
+msgstr[0] "Mostra %s servizio in stato pending nel gruppo di servizi %s"
+msgstr[1] "Mostra %s servizi in stato pending nel gruppo di servizi %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:211
+#, fuzzy, php-format
+msgid ""
+"List %s service that is currently in state UNKNOWN (Acknowledged) in service "
+"group \"%s\""
+msgid_plural ""
+"List %s services which are currently in state UNKNOWN (Acknowledged) in "
+"service group \"%s\""
+msgstr[0] ""
+"Mostra %s servizio in stato warning gestito nel gruppo di servizi %s"
+msgstr[1] "Mostra %s servizi in stato warning gestiti nel gruppo di servizi %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:187
+#, fuzzy, php-format
+msgid ""
+"List %s service that is currently in state UNKNOWN in service group \"%s\""
+msgid_plural ""
+"List %s services which are currently in state UNKNOWN in service group \"%s\""
+msgstr[0] ""
+"Mostra %s servizio in stato warning gestito nel gruppo di servizi %s"
+msgstr[1] "Mostra %s servizi in stato warning gestiti nel gruppo di servizi %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:265
+#, fuzzy, php-format
+msgid ""
+"List %s service that is currently in state WARNING (Acknowledged) in service "
+"group \"%s\""
+msgid_plural ""
+"List %s services which are currently in state WARNING (Acknowledged) in "
+"service group \"%s\""
+msgstr[0] ""
+"Mostra %s servizio in stato warning gestito nel gruppo di servizi %s"
+msgstr[1] "Mostra %s servizi in stato warning gestiti nel gruppo di servizi %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:241
+#, fuzzy, php-format
+msgid ""
+"List %s service that is currently in state WARNING in service group \"%s\""
+msgid_plural ""
+"List %s services which are currently in state WARNING in service group \"%s\""
+msgstr[0] ""
+"Mostra %s servizio in stato warning gestito nel gruppo di servizi %s"
+msgstr[1] "Mostra %s servizi in stato warning gestiti nel gruppo di servizi %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:123
+#, fuzzy, php-format
+msgid "List %s unhandled service problem on host %s"
+msgid_plural "List %s unhandled service problems on host %s"
+msgstr[0] "Mostra %s problema ai servizi dell'host %s"
+msgstr[1] "Mostra %s problemi ai servizi dell'host %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:111
+#, fuzzy, php-format
+msgctxt "timeline.link.title"
+msgid "List %u %s registered %s"
+msgstr "Mostra %u %s salvati %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:24
+#, fuzzy, php-format
+msgid "List %u actively checked host"
+msgid_plural "List %u actively checked hosts"
+msgstr[0] "%d è controllato passivamente"
+msgstr[1] "%d è controllato passivamente"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:80
+#, fuzzy, php-format
+msgid "List %u actively checked service"
+msgid_plural "List %u actively checked services"
+msgstr[0] "%d è controllato passivamente"
+msgstr[1] "%d è controllato passivamente"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:112
+#, php-format
 msgid "List %u host comment"
 msgid_plural "List %u host comments"
-msgstr[0] "Aggiungi commento all'Host"
-msgstr[1] "Aggiungi commento all'Host"
+msgstr[0] "Mostra %u commento dell' host"
+msgstr[1] "Mostra %u commenti dell' host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:139
-#, php-format
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:97
+#, fuzzy, php-format
 msgid "List %u host currently in downtime"
-msgid_plural "List %u hosts currently downtime"
+msgid_plural "List %u hosts currently in downtime"
+msgstr[0] "Mostra %u host in manutenzione"
+msgstr[1] "Mostra %u host in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:27
+#, fuzzy, php-format
+msgid "List %u host for which flap detection has been disabled"
+msgid_plural "List %u hosts for which flap detection has been disabled"
+msgstr[0] "Mostra tutti gli host dove il controllo di instabilità è abilitato"
+msgstr[1] "Mostra tutti gli host dove il controllo di instabilità è abilitato"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:148
+#, fuzzy, php-format
+msgid "List %u host for which notifications are suppressed"
+msgid_plural "List %u hosts for which notifications are suppressed"
+msgstr[0] "Mostra tutti gli host dove le notifiche sono abilitate"
+msgstr[1] "Mostra tutti gli host dove le notifiche sono abilitate"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:57
+#, fuzzy, php-format
+msgid "List %u host that is currently flapping"
+msgid_plural "List %u hosts which are currently flapping"
+msgstr[0] "Mostra %u host in manutenzione"
+msgstr[1] "Mostra %u host in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:17
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:39
+#, fuzzy, php-format
+msgid "List %u host that is currently in state DOWN"
+msgid_plural "List %u hosts which are currently in state DOWN"
+msgstr[0] "Mostra %u host in manutenzione"
+msgstr[1] "Mostra %u host in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:59
+#, fuzzy, php-format
+msgid "List %u host that is currently in state DOWN (Acknowledged)"
+msgid_plural "List %u hosts which are currently in state DOWN (Acknowledged)"
+msgstr[0] "Mostra %u host in manutenzione"
+msgstr[1] "Mostra %u host in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:40
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:126
+#, fuzzy, php-format
+msgid "List %u host that is currently in state PENDING"
+msgid_plural "List %u hosts which are currently in state PENDING"
+msgstr[0] "Mostra %u host in manutenzione"
+msgstr[1] "Mostra %u host in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:39
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:84
+#, fuzzy, php-format
+msgid "List %u host that is currently in state UNREACHABLE"
+msgid_plural "List %u hosts which are currently in state UNREACHABLE"
+msgstr[0] "Mostra %u host in manutenzione"
+msgstr[1] "Mostra %u host in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:104
+#, php-format
+msgid "List %u host that is currently in state UNREACHABLE (Acknowledged)"
+msgid_plural ""
+"List %u hosts which are currently in state UNREACHABLE (Acknowledged)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:130
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:22
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:18
 #, fuzzy, php-format
-msgid "List %u host which is in downtime"
-msgid_plural "List %u hosts which are in downtime"
-msgstr[0] "Host in Manutenzione"
-msgstr[1] "Host in Manutenzione"
+msgid "List %u host that is currently in state UP"
+msgid_plural "List %u hosts which are currently in state UP"
+msgstr[0] "Mostra %u host in manutenzione"
+msgstr[1] "Mostra %u host in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:140
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:149
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:60
 #, fuzzy, php-format
+msgid "List %u host that is not being checked at all"
+msgid_plural "List %u hosts which are not being checked at all"
+msgstr[0] "%d è stato controllato"
+msgstr[1] "%d è stato controllato"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:227
+#, fuzzy, php-format
+msgid "List %u host that is not processing any event handlers"
+msgid_plural "List %u hosts which are not processing any event handlers"
+msgstr[0] "Mostra tutti gli host dove il gestore eventi è abilitato"
+msgstr[1] "Mostra tutti gli host dove il gestore eventi è abilitato"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:42
+#, fuzzy, php-format
+msgid "List %u passively checked host"
+msgid_plural "List %u passively checked hosts"
+msgstr[0] "%d è controllato passivamente"
+msgstr[1] "%d è controllato passivamente"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:98
+#, fuzzy, php-format
+msgid "List %u passively checked service"
+msgid_plural "List %u passively checked services"
+msgstr[0] "%d è controllato passivamente"
+msgstr[1] "%d è controllato passivamente"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:112
+#, php-format
 msgid "List %u service comment"
 msgid_plural "List %u service comments"
-msgstr[0] "Aggiungi Commento al Servizio"
-msgstr[1] "Aggiungi Commento al Servizio"
+msgstr[0] "Mostra %u commento del servizio"
+msgstr[1] "Mostra %u commenti del servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:117
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:125
-#, fuzzy, php-format
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:97
+#, php-format
 msgid "List %u service currently in downtime"
 msgid_plural "List %u services currently in downtime"
-msgstr[0] "Servizi in manutenzione"
-msgstr[1] "Servizi in manutenzione"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:148
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:82
+#, fuzzy, php-format
+msgid "List %u service for which flap detection has been disabled"
+msgid_plural "List %u services for which flap detection has been disabled"
+msgstr[0] ""
+"Mostra tutti i servizi dove il controllo di instabilità è disbilitato"
+msgstr[1] ""
+"Mostra tutti i servizi dove il controllo di instabilità è disbilitato"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:182
+#, fuzzy, php-format
+msgid "List %u service for which notifications are suppressed"
+msgid_plural "List %u services for which notifications are suppressed"
+msgstr[0] "Mostra tutti i servizi dove le notifiche sono disabilitate"
+msgstr[1] "Mostra tutti i servizi dove le notifiche sono disabilitate"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:112
+#, fuzzy, php-format
+msgid "List %u service that is currently flapping"
+msgid_plural "List %u services which are currently flapping"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:57
+#, fuzzy, php-format
+msgid "List %u service that is currently in state %s"
+msgid_plural "List %u services which are currently in state %s"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:82
+#, fuzzy, php-format
+msgid "List %u service that is currently in state %s (Acknowledged)"
+msgid_plural "List %u services which are currently in state %s (Acknowledged)"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:108
+#, fuzzy, php-format
+msgid "List %u service that is currently in state %s (Acknowledged) on host %s"
+msgid_plural ""
+"List %u services which are currently in state %s (Acknowledged) on host %s"
+msgstr[0] ""
+"Mostra %u servizio in stato critical non gestito nel gruppo di host %s"
+msgstr[1] ""
+"Mostra %u servizi in stato critical non gestiti nel gruppo di host %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:82
+#, fuzzy, php-format
+msgid "List %u service that is currently in state %s on host %s"
+msgid_plural "List %u services which are currently in state %s on host %s"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:20
+#, fuzzy, php-format
+msgid "List %u service that is currently in state CRITICAL"
+msgid_plural "List %u services which are currently in state CRITICAL"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:41
+#, fuzzy, php-format
+msgid "List %u service that is currently in state CRITICAL (Acknowledged)"
+msgid_plural ""
+"List %u services which are currently in state CRITICAL (Acknowledged)"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:165
+#, fuzzy, php-format
+msgid ""
+"List %u service that is currently in state CRITICAL (Acknowledged) on hosts "
+"in the host group \"%s\""
+msgid_plural ""
+"List %u services which are currently in state CRITICAL (Acknowledged) on "
+"hosts in the host group \"%s\""
+msgstr[0] ""
+"Mostra %u servizio in stato critical non gestito nel gruppo di host %s"
+msgstr[1] ""
+"Mostra %u servizi in stato critical non gestiti nel gruppo di host %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:95
 #, php-format
-msgid "List %u service with status critical handled in host group %s"
-msgid_plural "List %u services with status critical handled in host group %s"
+msgid ""
+"List %u service that is currently in state CRITICAL and not checked at all"
+msgid_plural ""
+"List %u services which are currently in state CRITICAL and not checked at all"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:126
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:68
 #, php-format
-msgid "List %u service with status critical unhandled in host group %s"
-msgid_plural "List %u services with status critical unhandled in host group %s"
+msgid ""
+"List %u service that is currently in state CRITICAL and passively checked"
+msgid_plural ""
+"List %u services which are currently in state CRITICAL and passively checked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:101
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:141
+#, fuzzy, php-format
+msgid ""
+"List %u service that is currently in state CRITICAL on hosts in the host "
+"group \"%s\""
+msgid_plural ""
+"List %u services which are currently in state CRITICAL on hosts in the host "
+"group \"%s\""
+msgstr[0] "Mostra %u servizio in stato ok nel gruppo di host %s"
+msgstr[1] "Mostra %u servizi in stato ok nel gruppo di host %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:314
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:19
+#, fuzzy, php-format
+msgid "List %u service that is currently in state OK"
+msgid_plural "List %u services which are currently in state OK"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:340
+#, fuzzy, php-format
+msgid "List %u service that is currently in state OK and not checked at all"
+msgid_plural ""
+"List %u services which are currently in state OK and not checked at all"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:43
+#, fuzzy, php-format
+msgid "List %u service that is currently in state OK on host %s"
+msgid_plural "List %u services which are currently in state OK on host %s"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:114
+#, fuzzy, php-format
+msgid ""
+"List %u service that is currently in state OK on hosts in the host group \"%s"
+"\""
+msgid_plural ""
+"List %u services which are currently in state OK on hosts in the host group "
+"\"%s\""
+msgstr[0] "Mostra %u servizio in stato ok nel gruppo di host %s"
+msgstr[1] "Mostra %u servizi in stato ok nel gruppo di host %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:361
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:106
+#, fuzzy, php-format
+msgid "List %u service that is currently in state PENDING"
+msgid_plural "List %u services which are currently in state PENDING"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:387
+#, fuzzy, php-format
+msgid ""
+"List %u service that is currently in state PENDING and not checked at all"
+msgid_plural ""
+"List %u services which are currently in state PENDING and not checked at all"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:133
+#, fuzzy, php-format
+msgid "List %u service that is currently in state PENDING on host %s"
+msgid_plural "List %u services which are currently in state PENDING on host %s"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:300
+#, fuzzy, php-format
+msgid ""
+"List %u service that is currently in state PENDING on hosts in the host "
+"group \"%s\""
+msgid_plural ""
+"List %u services which are currently in state PENDING on hosts in the host "
+"group \"%s\""
+msgstr[0] "Mostra %u servizio in stato ok nel gruppo di host %s"
+msgstr[1] "Mostra %u servizi in stato ok nel gruppo di host %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:218
+#, fuzzy, php-format
+msgid "List %u service that is currently in state UNKNOWN"
+msgid_plural "List %u services which are currently in state UNKNOWN"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:239
+#, fuzzy, php-format
+msgid "List %u service that is currently in state UNKNOWN (Acknowledged)"
+msgid_plural ""
+"List %u services which are currently in state UNKNOWN (Acknowledged)"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:219
+#, fuzzy, php-format
+msgid ""
+"List %u service that is currently in state UNKNOWN (Acknowledged) on hosts "
+"in the host group \"%s\""
+msgid_plural ""
+"List %u services which are currently in state UNKNOWN (Acknowledged) on "
+"hosts in the host group \"%s\""
+msgstr[0] ""
+"Mostra %u servizio in stato critical non gestito nel gruppo di host %s"
+msgstr[1] ""
+"Mostra %u servizi in stato critical non gestiti nel gruppo di host %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:293
+#, fuzzy, php-format
+msgid ""
+"List %u service that is currently in state UNKNOWN and not checked at all"
+msgid_plural ""
+"List %u services which are currently in state UNKNOWN and not checked at all"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:266
 #, php-format
-msgid "List %u service with status ok in host group %s"
-msgid_plural "List %u services with status ok in host group %s"
+msgid ""
+"List %u service that is currently in state UNKNOWN and passively checked"
+msgid_plural ""
+"List %u services which are currently in state UNKNOWN and passively checked"
 msgstr[0] ""
 msgstr[1] ""
 
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:195
+#, fuzzy, php-format
+msgid ""
+"List %u service that is currently in state UNKNOWN on hosts in the host "
+"group \"%s\""
+msgid_plural ""
+"List %u services which are currently in state UNKNOWN on hosts in the host "
+"group \"%s\""
+msgstr[0] "Mostra %u servizio in stato ok nel gruppo di host %s"
+msgstr[1] "Mostra %u servizi in stato ok nel gruppo di host %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:119
+#, fuzzy, php-format
+msgid "List %u service that is currently in state WARNING"
+msgid_plural "List %u services which are currently in state WARNING"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:140
+#, fuzzy, php-format
+msgid "List %u service that is currently in state WARNING (Acknowledged)"
+msgid_plural ""
+"List %u services which are currently in state WARNING (Acknowledged)"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
+
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:273
-#, php-format
-msgid "List %u service with status pending in host group %s"
-msgid_plural "List %u services with status pending in host group %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:198
-#, php-format
-msgid "List %u service with status unknown handled in host group %s"
-msgid_plural "List %u services with status unknown handled in host group %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:176
-#, php-format
-msgid "List %u service with status unknown unhandled in host group %s"
-msgid_plural "List %u services with status unknown unhandled in host group %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:248
-#, php-format
-msgid "List %u service with status warning handled in host group %s"
-msgid_plural "List %u services with status warning handled in host group %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:226
-#, php-format
-msgid "List %u service with status warning unhandled in host group %s"
-msgid_plural "List %u services with status warning unhandled in host group %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:11
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:24
-msgid "List all"
-msgstr "Mostra tutto"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:21
 #, fuzzy, php-format
+msgid ""
+"List %u service that is currently in state WARNING (Acknowledged) on hosts "
+"in the host group \"%s\""
+msgid_plural ""
+"List %u services which are currently in state WARNING (Acknowledged) on "
+"hosts in the host group \"%s\""
+msgstr[0] ""
+"Mostra %u servizio in stato critical non gestito nel gruppo di host %s"
+msgstr[1] ""
+"Mostra %u servizi in stato critical non gestiti nel gruppo di host %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:194
+#, fuzzy, php-format
+msgid ""
+"List %u service that is currently in state WARNING and not checked at all"
+msgid_plural ""
+"List %u services which are currently in state WARNING and not checked at all"
+msgstr[0] "Mostra %u servizio in manutenzione"
+msgstr[1] "Mostra %u servizi in manutenzione"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:167
+#, php-format
+msgid ""
+"List %u service that is currently in state WARNING and passively checked"
+msgid_plural ""
+"List %u services which are currently in state WARNING and passively checked"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:249
+#, fuzzy, php-format
+msgid ""
+"List %u service that is currently in state WARNING on hosts in the host "
+"group \"%s\""
+msgid_plural ""
+"List %u services which are currently in state WARNING on hosts in the host "
+"group \"%s\""
+msgstr[0] "Mostra %u servizio in stato ok nel gruppo di host %s"
+msgstr[1] "Mostra %u servizi in stato ok nel gruppo di host %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:116
+#, fuzzy, php-format
+msgid "List %u service that is not being checked at all"
+msgid_plural "List %u services which are not being checked at all"
+msgstr[0] "%d è stato controllato"
+msgstr[1] "%d è stato controllato"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:261
+#, fuzzy, php-format
+msgid "List %u service that is not processing any event handlers"
+msgid_plural "List %u services which are not processing any event handlers"
+msgstr[0] "Mostra tutti i servizi dove il gestore eventi è abilitato"
+msgstr[1] "Mostra tutti i servizi dove il gestore eventi è abilitato"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:10
+#, php-format
 msgid "List all %u hosts"
-msgstr "Mostra tutto"
+msgstr "Mostra tutti %u host"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:23
+#, fuzzy, php-format
+msgid "List all %u service on host %s"
+msgid_plural "List all %u services on host %s"
+msgstr[0] "Mostra tutti i servizi dell'host %s"
+msgstr[1] "Mostra tutti i servizi dell'host %s"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:10
-#, fuzzy, php-format
+#, php-format
 msgid "List all %u services"
-msgstr "Totale dei Servizi"
+msgstr "Mostra tutti %u servizi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:73
+#, fuzzy, php-format
+msgctxt "timeline.link.title"
+msgid "List all event records registered %s"
+msgstr "Mostra tutti gli eventi dello storico %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml:11
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:86
+#, php-format
+msgid "List all hosts in the group \"%s\""
+msgstr "Mostra tutti gli host del gruppo \"%s\""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:41
+msgid "List all hosts, for which flap detection is enabled entirely"
+msgstr "Mostra tutti gli host dove il controllo di instabilità è abilitato"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:162
+msgid "List all hosts, for which notifications are enabled entirely"
+msgstr "Mostra tutti gli host dove le notifiche sono abilitate"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:241
+msgid "List all hosts, which are processing event handlers entirely"
+msgstr "Mostra tutti gli host dove il gestore eventi è abilitato"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:72
+#, php-format
+msgid "List all reported services on host %s"
+msgstr "Mostra tutti i servizi riportati nell'host %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml:11
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:86
+#, php-format
+msgid "List all services in the group \"%s\""
+msgstr "Mostra tutti i servizi del gruppo \"%s\""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:95
+#, php-format
+msgid "List all services of all hosts in host group \"%s\""
+msgstr "Mostra tutti i servizi di tutti gli host del gruppo \"%s\""
+
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:212
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:237
+#, php-format
+msgid "List all services on host %s"
+msgstr "Mostra tutti i servizi dell'host %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:53
+#, php-format
+msgid "List all services with the name \"%s\" on all reported hosts"
+msgstr "Mostra tutti i servizi con il nome \"%s\" negli host riportati"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:96
+msgid "List all services, for which flap detection is enabled entirely"
+msgstr "Mostra tutti i servizi dove il controllo di instabilità è disbilitato"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:196
+msgid "List all services, for which notifications are enabled entirely"
+msgstr "Mostra tutti i servizi dove le notifiche sono disabilitate"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:275
+msgid "List all services, which are processing event handlers entirely"
+msgstr "Mostra tutti i servizi dove il gestore eventi è abilitato"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:468
+msgid "List comments"
+msgstr "Lista commenti"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:435
+msgid "List contact groups"
+msgstr "Lista gruppi di contatti"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:351
+msgid "List contacts"
+msgstr "Lista contatti"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:31
+#, php-format
+msgid "List contacts in contact-group \"%s\""
+msgstr "Mostra contatti nel gruppo \"%s\""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:269
+msgid "List downtimes"
+msgstr "Lista manutenzioni"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:614
+msgid "List event records"
+msgstr "Lista eventi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:561
+msgid "List host groups"
+msgstr "Lista gruppi di host"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:97
+msgid "List hosts"
+msgstr "LIsta host"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:326
+msgid "List notifications"
+msgstr "Lista notifiche"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:510
+msgid "List service groups"
+msgstr "Lista gruppi di servizi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:171
+msgid "List services"
+msgstr "Lista servizi"
 
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:118
 msgid "Livestatus Resource"
 msgstr "Risorsa Livestatus"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:58
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:76
 msgid "Local"
 msgstr "Locale"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:202
 msgid "Local Command File"
-msgstr "Command File Locale"
+msgstr "Command File locale"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
 msgid "Max"
-msgstr "Massimo"
+msgstr "Max"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:462
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:449
 msgid "Max (min)"
 msgstr "Massimo (min)"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
 msgid "Min"
-msgstr "Minuti"
+msgstr "Min"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:150
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:147
 msgid "Minutes"
 msgstr "Minuti"
 
@@ -1718,7 +2254,7 @@ msgstr "Minuti"
 msgid "Monitoring Backend"
 msgstr "Backend di Monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:22
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:14
 msgctxt "setup.page.title"
 msgid "Monitoring Backend"
 msgstr "Backend di Monitoraggio"
@@ -1729,16 +2265,15 @@ msgstr "Backend di Monitoraggio"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:2
 msgid "Monitoring Features"
-msgstr "Proprietà del Monitoraggio"
+msgstr "Funzionalità di Monitoraggio"
 
-# rivdere
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:203
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:25
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:36
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:209
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:29
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:40
 msgid "Monitoring Health"
-msgstr "Configurazioni Globali"
+msgstr "Impostazioni Globali"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:30
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:14
 msgctxt "setup.page.title"
 msgid "Monitoring IDO Resource"
 msgstr "Risorsa IDO del Monitoraggio"
@@ -1747,40 +2282,40 @@ msgstr "Risorsa IDO del Monitoraggio"
 msgid "Monitoring Instance"
 msgstr "Istanza di Monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/InstancePage.php:22
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/InstancePage.php:14
 msgctxt "setup.page.title"
 msgid "Monitoring Instance"
 msgstr "Istanza di Monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:38
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:50
 msgid "Monitoring Instances"
 msgstr "Istanze di Monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:30
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:14
 msgctxt "setup.page.title"
 msgid "Monitoring Livestatus Resource"
 msgstr "Risorsa Livestatus di Monitoraggio"
 
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:41
 msgid "Monitoring Security"
-msgstr "Sicurezza "
+msgstr "Sicurezza del Monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/SecurityPage.php:22
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/SecurityPage.php:14
 msgctxt "setup.page.title"
 msgid "Monitoring Security"
-msgstr "Sicurezza"
+msgstr "Sicurezza del Monitoraggio"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:146
+#, php-format
+msgid "Monitoring backend \"%s\" has been successfully changed"
+msgstr "Backend di monitoraggio \"%s\" modificato correttamente"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:143
 #, php-format
-msgid "Monitoring backend \"%s\" has been successfully changed"
-msgstr "Backend di monitoraggio \"%s\" modificato con successo"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:140
-#, php-format
 msgid "Monitoring backend \"%s\" has been successfully created"
-msgstr "Backend di monitoraggio \"%s\" creato con successo"
+msgstr "Backend di monitoraggio \"%s\" creato correttamente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:76
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:79
 msgid "Monitoring backend already exists"
 msgstr "Backend di monitoraggio già esistente"
 
@@ -1790,19 +2325,17 @@ msgid ""
 "Monitoring backend configuration could not be written to: %s; An error "
 "occured:"
 msgstr ""
-"Impossibile scrivere la configurazione del backend di monitoraggio in: %s; "
+"Impossibile scrivere la configurazione del vba del monitoraggio in: %s; "
 "Errore:"
 
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:141
 #, php-format
 msgid "Monitoring backend configuration has been successfully written to: %s"
-msgstr ""
-"La configurazione del backend di monitoraggio è stata salvata con successo "
-"in: %s"
+msgstr "Configurazione del Backend di monitoraggio scritta correttmente in: %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:74
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:121
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:167
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:77
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:124
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:170
 msgid "Monitoring backend name missing"
 msgstr "Nome del backend di monitoraggio mancante"
 
@@ -1818,9 +2351,7 @@ msgstr ""
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:88
 #, php-format
 msgid "Monitoring instance configuration has been successfully created: %s"
-msgstr ""
-"La configurazione dell'istanza di monitoraggio è stata salvata con successo "
-"in: %s"
+msgstr "Configuarzione dell'Istanza di monitoraggio creata correttamente: %s"
 
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:71
 #, php-format
@@ -1834,21 +2365,19 @@ msgstr ""
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:66
 #, php-format
 msgid "Monitoring security configuration has been successfully created: %s"
-msgstr ""
-"La configurazione di sicurezza del monitoraggio è stata scritta con successo "
-"in: %s"
+msgstr "Configurazione di sicurezza creata correttamente: %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:657
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:649
 msgid "Month"
-msgstr "3 Mesi"
+msgstr "Mese"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:39
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:45
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:51
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:38
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:44
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:50
 msgid "N/A"
 msgstr "N/A"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:378
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:376
 msgid "Name"
 msgstr "Nome"
 
@@ -1856,20 +2385,24 @@ msgstr "Nome"
 msgid "New instance name missing"
 msgstr "Nome nuova istanza mancante"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:99
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:102
 msgid "New monitoring backend name missing"
 msgstr "Nome del nuovo backend di monitoraggio mancante"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/SecurityConfigForm.php:31
 msgid "New security configuration has successfully been stored"
 msgstr ""
-"La nuova configurazione di sicurezza del monitoraggio è stata salvata con "
-"successo."
+"La nuova configurazione di sicurezza del monitoraggio è stata salvata "
+"correttamente."
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:27
 msgid "Next check"
 msgstr "Prossimo Controllo"
 
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml:17
+msgid "No"
+msgstr "No"
+
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:23
 msgid "No Services matching the filter"
 msgstr "Nessun Servizio soddisfa i criteri di ricerca"
@@ -1880,7 +2413,7 @@ msgstr "Nessuna Manutenzione in corso"
 
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:176
 msgid "No backend has been configured"
-msgstr "Nessun backend configurato"
+msgstr "Nessun Backend configurato"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:14
 msgid "No comments matching the filter"
@@ -1913,11 +2446,7 @@ msgstr "Nessun gruppo di host soddisfa i criteri di ricerca"
 msgid "No hosts matching the filter"
 msgstr "Nessun host soddisfa i criteri di ricerca"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:31
-msgid "No notification has been sent for this issue"
-msgstr "Nessuna notifica è stata inviata per questo problema"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:58
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:62
 msgid "No notifications have been sent for this contact"
 msgstr "Nessuna notifica è stata inviata a questo contatto"
 
@@ -1929,18 +2458,18 @@ msgstr "Nessuna notifica soddisfa i criteri di ricerca"
 msgid "No service groups matching the filter"
 msgstr "Nessun gruppo di servizi soddisfa i criteri di ricerca"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:12
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:32
 msgid "No services configured on this host"
 msgstr "Nessun servizio configurato per questo host"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:6
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:39
 msgid "No services matching the filter"
-msgstr "Nessun servizio soddisfa i criteri di ricerca"
+msgstr "Nessun Servizio soddisfa i criteri di ricerca"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:69
 msgid "No state changes in the selected time period."
-msgstr "Nessun cambio di stato nel periodo di tempo selezionato"
+msgstr "Nessun cambio di stato nel intervallo di tempo selezionato"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:10
 msgid "No such contact"
@@ -1954,27 +2483,27 @@ msgstr "Niente"
 msgid "Not acknowledged"
 msgstr "Non Confermato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:47
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:52
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:41
 msgid "Notification"
 msgstr "Notifica"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:344
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:342
 msgid "Notification Start"
 msgstr "Partenza Notifica"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:165
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:171
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:76
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:63
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:73
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:75
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:10
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:46
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:329
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:346
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:444
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:482
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:489
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:66
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:127
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:129
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:13
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:44
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:325
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:331
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:429
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:472
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:479
 msgid "Notifications"
 msgstr "Notifiche"
 
@@ -1985,7 +2514,7 @@ msgstr "Notifiche"
 msgid "Notifications Disabled"
 msgstr "Notifiche Disabilitate"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:121
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:124
 msgid "Notifications Enabled"
 msgstr "Notifiche Abilitate"
 
@@ -1993,11 +2522,20 @@ msgstr "Notifiche Abilitate"
 msgid "Notifications and Problems"
 msgstr "Notifiche e Problemi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:52
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:328
+#, fuzzy
+msgid "Notifications and average reaction time per hour."
+msgstr "Notifiche e problemi per ora"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:469
+msgid "Notifications and defects per hour"
+msgstr "Notifiche e problemi per ora"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:56
 msgid "Notifications sent to this contact"
 msgstr "Notifiche inviate a questo contatto"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:73
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:76
 #, php-format
 msgid "Notifications will be re-enabled in <strong>%s</strong>"
 msgstr "Le notifiche saranno riabilitate in <strong>%s</strong>"
@@ -2007,21 +2545,18 @@ msgstr "Le notifiche saranno riabilitate in <strong>%s</strong>"
 msgid "Notifications will be re-enabled in <strong>%s</strong>."
 msgstr "Le notifiche saranno riabilitate in <strong>%s</strong>."
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:216
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:20
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:178
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:70
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:70
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:15
 msgid "OK"
 msgstr "OK"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:61
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:217
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:60
 msgctxt "icinga.state"
 msgid "OK"
 msgstr "OK"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:73
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:72
 msgid "Object summaries"
 msgstr "Riepilogo Oggetti"
 
@@ -2029,98 +2564,92 @@ msgstr "Riepilogo Oggetti"
 msgid "Object type"
 msgstr "Tipo Oggetto"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:54
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:57
 msgid "Obsessing"
 msgstr "Modalità Ossessiva"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:141
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:144
 msgid "Obsessing Over Hosts"
 msgstr "Modalità Ossessiva sugli Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:150
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:153
 msgid "Obsessing Over Services"
 msgstr "Modalità Ossessiva sui Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:625
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:636
 msgid "Occurence"
 msgstr "Occorrenze"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:121
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:247
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:250
 msgid "Ok"
 msgstr "Ok"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:95
 msgid "Old instance name missing"
-msgstr "Vecchio nome istanza mancante"
+msgstr "Nome vecchia istanza mancante"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:97
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:100
 msgid "Old monitoring backend name missing"
-msgstr "Vecchio backend di monitoraggio mancante"
+msgstr "Nome del vecchio backend di monitoraggio mancante"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:100
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:544
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:98
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:536
 msgid "One day"
 msgstr "Un giorno"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:102
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:546
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:100
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:538
 msgid "One month"
 msgstr "Un mese"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:101
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:545
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:99
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:537
 msgid "One week"
 msgstr "Una settimana"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:103
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:547
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:101
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:539
 msgid "One year"
 msgstr "Un anno"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:73
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:72
 msgid "Output"
-msgstr "Output del Plugin"
+msgstr "Output"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:125
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:131
 msgid "Overview"
 msgstr "Panoramica"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:228
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:184
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:84
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:190
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:182
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:76
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:76
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:80
 msgid "PENDING"
-msgstr "ATTESA"
+msgstr "PENDING"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:142
-msgid "PHP Module: Sockets"
-msgstr "Modulo PHP: Sockets"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:28
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:29
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:32
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:34
 msgid "Pager"
 msgstr "Recapito"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:381
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:379
 msgid "Pager Address / Number"
 msgstr "Numero di telefono"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:45
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:48
 msgid "Passive Checks"
 msgstr "Controlli Passivi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:159
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:162
 msgid "Passive Host Checks Being Accepted"
 msgstr "Accetta Controlli Passivi sugli Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:168
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:171
 msgid "Passive Service Checks Being Accepted"
 msgstr "Accetta Controlli Passivi sui Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:151
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:150
 msgid "Passive checks"
 msgstr "Controlli passivi"
 
@@ -2136,31 +2665,31 @@ msgstr "Percorso del command file di Icinga nell'istanza remota"
 msgid "Path to the local Icinga command file"
 msgstr "Percorso del command file locale di Icinga"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:82
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:81
 msgid "Performance Data"
 msgstr "Dati di Performance"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:177
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:180
 msgid "Performance Data Being Processed"
 msgstr "Accetta i Dati di Performance"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:71
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:70
 msgid "Performance Info"
-msgstr "Dettagli Performance"
+msgstr "Informazioni sulle Performance"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/perfdata.phtml:3
 msgid "Performance data"
 msgstr "Dati di Performance"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:60
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:55
 msgid "Persistent"
 msgstr "Persistente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:64
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:61
 msgid "Persistent Comment"
 msgstr "Commento Persistente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:34
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:16
 msgid ""
 "Please configure below how Icinga Web 2 should retrieve monitoring "
 "information."
@@ -2168,13 +2697,13 @@ msgstr ""
 "Definire di seguito come Icinga Web 2 recupererà le informazioni del "
 "monitoraggio."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/InstancePage.php:34
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/InstancePage.php:16
 msgid "Please define the settings specific to your monitoring instance below."
 msgstr ""
 "Definire di seguito le impostazioni specifiche della vostra istanza di "
 "monitoraggio."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:42
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:16
 msgid ""
 "Please fill out the connection details below to access the IDO database of "
 "your monitoring environment."
@@ -2182,7 +2711,7 @@ msgstr ""
 "Compilare di seguito i dettagli della connessione per accedere al database "
 "IDO del vostro ambiente di monitoraggio."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:42
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:16
 msgid ""
 "Please fill out the connection details below to access the Livestatus socket "
 "interface for your monitoring environment."
@@ -2208,25 +2737,26 @@ msgstr ""
 "Tenere premuto il tasto CTRL durante i Click per selezionare più righe o "
 "tenere premuto SHIFT per selezionare righe contigue."
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:90
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:96
 msgid "Problems"
 msgstr "Problemi "
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:20
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:19
 msgid "Process Info"
-msgstr "Dettagli Processo"
+msgstr "Informazioni sul Processo"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml:26
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml:16
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml:27
 msgid "Process check result"
-msgstr "Invia Risultato Passivo"
+msgstr "Output del risultato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:113
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:111
 msgid "Processing check result.."
 msgid_plural "Processing check results.."
-msgstr[0] "Schedulazione del Controllo in corso..."
-msgstr[1] "Schedulazione dei Controlli in corso..."
+msgstr[0] "Invio risultato.."
+msgstr[1] "Invio risultati"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:24
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:23
 msgid "Program Start Time"
 msgstr "Ora Avvio del Programma"
 
@@ -2235,11 +2765,15 @@ msgstr "Ora Avvio del Programma"
 msgid "Protected Custom Variables"
 msgstr "Variabili Riservate"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:217
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml:14
+msgid "Reachable"
+msgstr "Raggiungibile"
+
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:223
 msgid "Recently Recovered Services"
 msgstr "Servizi Ripristinati Recentemente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:58
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:76
 msgid "Remote"
 msgstr "Remoto"
 
@@ -2260,67 +2794,80 @@ msgid "Remote SSH User"
 msgstr "Utente SSH Remoto"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:15
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:47
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:59
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/removebackend.phtml:4
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:86
 msgid "Remove Existing Backend"
 msgstr "Rimuovi Backend Esistente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/removeinstance.phtml:4
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:122
 msgid "Remove Existing Instance"
 msgstr "Rimuovi Istanza Esistente"
 
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:42
+#, php-format
+msgid "Remove monitoring backend %s"
+msgstr "Rimuovi backend di monitoraggio %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:86
+#, php-format
+msgid "Remove monitoring instance %s"
+msgstr "Rimuovi istanza di monitoraggio %s"
+
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:30
 msgid "Remove problem acknowledgement"
 msgid_plural "Remove problem acknowledgements"
-msgstr[0] "Rimozione della conferma del Problema"
-msgstr[1] "Rimozione della conferma dei Problemi"
+msgstr[0] "Rimuovi la Conferma del Problema"
+msgstr[1] "Rimuovi le Conferme del Problema"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:48
 msgid "Removing problem acknowledgement.."
 msgid_plural "Removing problem acknowledgements.."
-msgstr[0] "Rimozione della Conferma del problema in corso..."
-msgstr[1] "Rimozione delle Conferme dei problemi in corso..."
+msgstr[0] "Rimozione Conferma in corso.."
+msgstr[1] "Rimozione Conferme in corso.."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:549
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:541
 msgid "Report interval"
 msgstr "Intervallo del Report"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:190
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:196
 msgid "Reporting"
 msgstr "Reportistica"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:44
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:32
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:45
 msgid "Reschedule"
 msgstr "Rischedula"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:91
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:95
 msgid "Reschedule Host Check"
 msgstr "Rischedula il Controllo dell'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:185
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:196
 msgid "Reschedule Host Checks"
 msgstr "Rischedula i Controlli dell'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:68
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:72
 msgid "Reschedule Service Check"
-msgstr "Rischedula il Controlli del Servizio"
+msgstr "Rischedula il Controllo del Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:234
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:245
 msgid "Reschedule Service Checks"
-msgstr "Rischedulaz i Controlli del Servizio"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:35
-msgid "Reschedule host checks"
-msgstr "Rischedula i Controlli dell'Host"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:23
-msgid "Reschedule service checks"
 msgstr "Rischedula i Controlli del Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:229
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:17
+#, php-format
+msgid "Reschedule the next check for all %u hosts"
+msgstr "Rischedula il prossimo controllo per tutti i %u host"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:17
+#, php-format
+msgid "Reschedule the next check for all %u services"
+msgstr "Rischedula il prossimo controllo per tutti i %u servizi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:240
 msgid "Resource"
 msgstr "Risorsa"
 
@@ -2332,22 +2879,20 @@ msgstr "Nome Risorsa"
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:158
 #, php-format
 msgid "Resource configuration could not be udpated: %s; An error occured:"
-msgstr "Impossibile aggiornare la configurazione della Risorsa: %s; Errore:"
+msgstr "La configurazione della risorsa non può essere aggiornata: %s; Errore:"
 
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:155
 #, php-format
 msgid "Resource configuration has been successfully updated: %s"
-msgstr "Configurazione della risorsa aggiornata con successo: %s"
+msgstr "Configurazione Risorsa aggiornata correttamente: %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:61
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:65
 msgid "Restrict hosts view to the hosts that match the filter"
-msgstr ""
-"Restringe la vista agli Host e Servizi che soddisfano i criteri di ricerca"
+msgstr "Restringi la vista degli host a quelli che soddisfano il filtro"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:66
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:70
 msgid "Restrict services view to the services that match the filter"
-msgstr ""
-"Restringe la vista agli Host e Servizi che soddisfano i criteri di ricerca"
+msgstr "Restringi la vista dei servizi a quelli che soddisfano il filtro"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:43
 msgid "SSH port to connect to on the remote Icinga instance"
@@ -2359,304 +2904,456 @@ msgstr "Porta SSH da usare per la connessione all'istanza Icinga remota"
 msgid "Save Changes"
 msgstr "Salva Modifiche"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:102
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:107
 msgid "Schedule Host Downtime"
-msgstr "Schedula Manutenzione dell'Host"
+msgstr "Pianifica Manutenzione all'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:196
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:208
 msgid "Schedule Host Downtimes"
-msgstr "Schedula Manutenzioni dell'Host"
+msgstr "Pianifica Manutenzioni dell'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:79
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:84
 msgid "Schedule Service Downtime"
-msgstr "Schedula Manutenzione del Servizio"
+msgstr "Pianifica Manutenzione al Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:245
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:257
 msgid "Schedule Service Downtimes"
-msgstr "Schedula Manutenzioni del Servizio"
+msgstr "Pianifica Manutenzioni del Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:24
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:55
+#, fuzzy, php-format
+msgid "Schedule a downtime for %u unhandled host problem"
+msgid_plural "Schedule a downtime for %u unhandled host problems"
+msgstr[0] "Pianifica Manutenzione per %u Problema dell'Host Non Gestito"
+msgstr[1] "Pianifica Manutenzione per %u Problemi degli'Host Non Gestiti"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:55
+#, fuzzy, php-format
+msgid "Schedule a downtime for %u unhandled service problem"
+msgid_plural "Schedule a downtime for %u unhandled service problems"
+msgstr[0] "Pianifica Manutenzione per %u Problema del Servizio Non Gestito"
+msgstr[1] "Pianifica Manutenzione per %u Problemi del Servizio Non Gestiti"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:23
+#, php-format
+msgid "Schedule a downtime for all %u hosts"
+msgstr "Pianifica manutenzione per tutti i %u host"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:23
+#, php-format
+msgid "Schedule a downtime for all %u services"
+msgstr "Pianifica manutenzione per tutti i %u servizi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:15
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:28
+msgid ""
+"Schedule a downtime to suppress all problem notifications within a specific "
+"period of time"
+msgstr ""
+"Pianifica una manutenzione per disabilitare le notifiche per un periodo di "
+"tempo specifico"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:34
 msgid "Schedule check"
 msgid_plural "Schedule checks"
-msgstr[0] "Schedula Controllo"
-msgstr[1] "Schedula Controlli"
+msgstr[0] "Rischedula Controllo"
+msgstr[1] "Rischedula Controlli"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:28
 msgid "Schedule check for all services on the hosts and the hosts themselves."
-msgstr ""
-"Schedula Controllo per tutti i servizi negli host e per gli host stessi."
+msgstr "Schedula Controllo per l'host e tutti i suoi servizi."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:34
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:20
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:47
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:8
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:21
+#, fuzzy
 msgid "Schedule downtime"
 msgid_plural "Schedule downtimes"
-msgstr[0] "Schedula Manutenzione"
-msgstr[1] "Schedula Manuenzioni"
+msgstr[0] "Pianifica Manutenzione"
+msgstr[1] "Pianifica Manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:68
-#, fuzzy, php-format
-msgid "Schedule downtime for %u unhandled host problem"
-msgid_plural "Schedule downtimes for %u unhandled host problems"
-msgstr[0] "Schedula Manutenzione per Host con Problemi Non Gestiti"
-msgstr[1] "Schedula Manutenzione per Host con Problemi Non Gestiti"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:56
-#, fuzzy, php-format
-msgid "Schedule downtime for %u unhandled service problem"
-msgid_plural "Schedule downtimes for %u unhandled service problems"
-msgstr[0] "Schedula Manutenzione per Host con Problemi Non Gestiti"
-msgstr[1] "Schedula Manutenzione per Host con Problemi Non Gestiti"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:31
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:30
 msgid ""
 "Schedule downtime for all services on the hosts and the hosts themselves."
-msgstr ""
-"Schedula Manutenzione per tutti i servizi negli host e per gli host stessi."
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:77
-msgid "Schedule downtime for unhandled host problem"
-msgid_plural "Schedule downtimes for unhandled host problems"
-msgstr[0] "Schedula Manutenzione per Host con Problemi Non Gestiti"
-msgstr[1] "Schedula Manutenzione per Host con Problemi Non Gestiti"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:65
-msgid "Schedule downtime for unhandled service problem"
-msgid_plural "Schedule downtimes for unhandled service problems"
-msgstr[0] "Schedula Manutenzione per Host con Problemi Non Gestiti"
-msgstr[1] "Schedula Manutenzione per Host con Problemi Non Gestiti"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:42
-msgid "Schedule host downtimes"
-msgstr "Schedula Manutenzione Host"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:44
-msgid "Schedule non-triggered downtime for all child hosts"
-msgstr "Schedula Manutenzione non collegata per tutti gli Host figli"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:30
-msgid "Schedule service downtimes"
-msgstr "Schedula Manutenzione Sevizio"
+msgstr "PIanifica Manutenzione per l'host e tutti i suoi servizi."
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:43
+msgid "Schedule non-triggered downtime for all child hosts"
+msgstr "Pianifica Manutenzione non dipendente per tutti gli Host figli"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:39
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:52
+msgid "Schedule the next active check at a different time than the current one"
+msgstr "Schedula il prossimo controllo ad un orario diverso da quello corrente"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:43
+msgid "Schedule the next active check to run immediately"
+msgstr "Schedula il prossimo controllo per essere eseguito immediatamente"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:42
 msgid "Schedule triggered downtime for all child hosts"
-msgstr "Schedula Manutenzione dipendente per tutti gli Host figli"
+msgstr "Pianifica Manutenzione dipendente per tutti gli Host figli"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:310
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:304
 msgid "Scheduled End"
-msgstr "Fine Schedulazione"
+msgstr "Fine"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:309
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:303
 msgid "Scheduled Start"
-msgstr "Inizio Schedulazione"
+msgstr "Inizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:70
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:72
 msgid "Scheduling check.."
 msgid_plural "Scheduling checks.."
-msgstr[0] "Schedulazione del Controllo in corso..."
-msgstr[1] "Schedulazione dei Controlli in corso..."
+msgstr[0] "Schedulando Controllo.."
+msgstr[1] "Schedulando Controlli.."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:52
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:51
 msgid "Scheduling host check.."
 msgid_plural "Scheduling host checks.."
-msgstr[0] "Schedulazione del Controllo dell'Host in corso..."
-msgstr[1] "Schedulazione dei Controlli dell'Host in corso..."
+msgstr[0] "Schedulando Controllo dell'Host.."
+msgstr[1] "Schedulando Controlli dell'Host.."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:88
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:86
 msgid "Scheduling host downtime.."
 msgid_plural "Scheduling host downtimes.."
-msgstr[0] "Schedulazione della Manutenzione dell'Host in corso..."
-msgstr[1] "Schedulazione delle Manutenzioni degli Host in corso..."
+msgstr[0] "Pianificando Manutenzione Host.."
+msgstr[1] "Pianificando Manutenzioni Host.."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:104
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:100
 msgid "Scheduling service check.."
 msgid_plural "Scheduling service checks.."
-msgstr[0] "Schedulazione del Controllo del Servizio in corso..."
-msgstr[1] "Schedulazione dei Controlli del Servizio in corso..."
+msgstr[0] "Schedulando Controllo del Servizio.."
+msgstr[1] "Schedulando Controlli del Servizio.."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:211
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:207
 msgid "Scheduling service downtime.."
 msgid_plural "Scheduling service downtimes.."
-msgstr[0] "Schedulazione della Manutenzione del Servizio in corso..."
-msgstr[1] "Schedulazione delle Manutenzioni del Servizio in corso..."
+msgstr[0] "Pianifica Manutenzione Sevizio.."
+msgstr[1] "Pianifica Manutenzione Sevizi.."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:126
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:80
+msgid "Security"
+msgstr "Sicurezza"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:232
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:131
+msgid "Send Custom Host Notification"
+msgstr "Invia Notifica Personalizzata per l'Host"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:29
+msgid "Send Custom Notification"
+msgstr "Invia Notifica Personalizzata"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:108
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:281
+msgid "Send Custom Service Notification"
+msgstr "Invia Notifica Personalizzata per il Servizio"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:123
 msgid "Send Notification"
 msgstr "Invia Notifica"
 
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:36
+#, php-format
+msgid "Send a custom notification for all %u hosts"
+msgstr "Invia notifica personalizzata per tutti i %u host"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:36
+#, php-format
+msgid "Send a custom notification for all %u services"
+msgstr "Invia notifica personalizzata per tutti i %u servizi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:36
+msgid ""
+"Send a custom notification, share information about the object to contacts."
+msgstr ""
+"Invia una notifica personalizzata, condividi le informazioni dell'oggetto "
+"con i contatti."
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:24
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:28
+#, php-format
+msgid "Send a mail to %s"
+msgstr "Invia e-mail a %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:34
+#, fuzzy
+msgid "Send custom notification"
+msgid_plural "Send custom notifications"
+msgstr[0] "Invia Notifica Personalizzata"
+msgstr[1] "Invia Notifica Personalizzata"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:106
+#, fuzzy
+msgid "Send custom notification.."
+msgid_plural "Send custom notifications.."
+msgstr[0] "Invia Notifica Personalizzata"
+msgstr[1] "Invia Notifica Personalizzata"
+
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:62
 #, php-format
 msgid "Sent to %s"
-msgstr ""
+msgstr "Inviata a %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:189
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:201
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml:13
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/object-header.phtml:34
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:304
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:488
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:215
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:53
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:58
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:45
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:298
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:491
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:226
 msgid "Service"
 msgstr "Servizio"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml:7
-#, fuzzy, php-format
+#, php-format
 msgid "Service (%u)"
 msgid_plural "Services (%u)"
-msgstr[0] "Servizi (%u)"
+msgstr[0] "Servizio (%u)"
 msgstr[1] "Servizi (%u)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:142
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:162
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:141
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:161
 msgid "Service Checks"
-msgstr "Controlli Servizio"
+msgstr "Controlli Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:113
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:635
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:119
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:646
 msgid "Service Grid"
-msgstr "Griglia dei Servizi"
+msgstr "Griglia Servizi"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:25
 msgid "Service Group"
 msgstr "Gruppo di Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:539
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:239
+msgid "Service Group Chart"
+msgstr "Grafico dei Gruppi di Servizi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:546
 msgid "Service Group Name"
 msgstr "Nome del Gruppo di Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:504
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:509
 msgid "Service Groups"
 msgstr "Gruppi di Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:230
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:224
 msgid "Service Name"
 msgstr "Nome Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:382
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:380
 msgid "Service Notification Timeperiod"
-msgstr "Periodo delle Notifiche per i Servizi"
+msgstr "Periodo per le Notifiche del Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:109
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:213
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:55
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:115
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:219
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:77
 msgid "Service Problems"
 msgstr "Servizi con Problemi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:228
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:222
 msgid "Service Severity"
-msgstr "Griglia dei Servizi"
+msgstr "Impatto"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:79
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:197
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:80
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:202
 msgid "Service State"
 msgstr "Stato Servizio"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:27
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:27
 msgid "Service States"
-msgstr "Stato dei Servizi"
+msgstr "Stati Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:647
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:658
 msgid "Service description"
 msgstr "Descrizione Servizio"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/service/show.phtml:3
 msgid "Service detail information"
-msgstr "Dettagli del Servizio"
+msgstr "Dettagli Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:32
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:33
 msgid "Service not found"
 msgstr "Servizio non trovato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:37
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:42
 msgid "Service notification period"
 msgstr "Periodo per le Notifiche del Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:85
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:141
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml:14
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:91
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:147
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml:17
 msgid "Servicegroups"
 msgstr "Gruppi di Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:83
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:137
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:199
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:89
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:143
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:215
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:100
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:28
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:50
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:8
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:22
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:38
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:97
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:240
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:177
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:225
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:96
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:48
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:42
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:96
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:243
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:171
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:240
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:101
 msgid "Services"
 msgstr "Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:543
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:593
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:550
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:600
 msgid "Services CRITICAL"
 msgstr "Servizi CRITICAL"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:541
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:591
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:548
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:598
 msgid "Services OK"
 msgstr "Servizi OK"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:545
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:595
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:552
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:602
 msgid "Services PENDING"
 msgstr "Servizi in ATTESA"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:542
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:592
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:549
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:599
 msgid "Services UNKNOWN"
 msgstr "Servizi UNKNOWN"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:544
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:594
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:551
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:601
 msgid "Services WARNING"
 msgstr "Servizi WARNING"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:20
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:84
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:15
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:80
-#, php-format
-msgid "Services with state %s"
-msgstr "Servizi in stato %s"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:56
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:53
 msgid "Set the date and time when the check should be scheduled."
 msgstr "Impostare la data e l'ora dell'esecuzione del controllo."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:92
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:89
 msgid "Set the end date and time for the downtime."
 msgstr "Impostare la data e l'ora della fine della manutenzione."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:51
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:44
 msgid "Set the expire time."
-msgstr "Impostare la l'ora di scadenza."
+msgstr "Impostare l'ora di scadenza."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:82
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:79
 msgid "Set the start date and time for the downtime."
 msgstr "Impostare la date e l'ora d'inizio della manutenzione."
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:96
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:97
 msgid "Setup the monitoring module for Icinga Web 2"
-msgstr "Installa il modulo di monitoraggio per Icinga Web 2"
+msgstr "Configura il modulo di monitoraggio per Icinga Web 2!"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:138
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:538
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:588
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:132
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:545
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:595
 msgid "Severity"
 msgstr "Impatto"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:253
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:231
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:256
+#, php-format
+msgid "Show all event records of host %s"
+msgstr "Mostra tutti gli eventi dell'host %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:227
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:252
+#, php-format
+msgid "Show all event records of service %s on host %s"
+msgstr "Mostra tutti gli eventi del servizio %s dell'host %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TacticalController.php:15
+msgid ""
+"Show an overview of all hosts and services, their current states and "
+"monitoring feature utilisation"
+msgstr ""
+"Mostra una panoramica di tutti gli host e servizi, il loro stato corrente e "
+"le funzionalità utilizzate"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:36
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:11
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:23
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contactgroups.phtml:29
+#, php-format
+msgid "Show detailed information about %s"
+msgstr "Mostra informazioni dettagliate per %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:183
+#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Link.php:37
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:104
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:120
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:208
+#, php-format
+msgid "Show detailed information for host %s"
+msgstr "Mostra informazioni dettagliate per l'host %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:197
+#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Link.php:60
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:151
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:93
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:112
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:222
+#, php-format
+msgid "Show detailed information for service %s on host %s"
+msgstr "Mostra informazioni dettagliate per il servizio %s dell'host %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:26
+msgid ""
+"Show information about the current monitoring instance's process and it's "
+"performance as well as available features"
+msgstr ""
+"Mostra le informazioni riguardo lo stato del processo dell'istanza attiva, "
+"le sue performance e le funzionalità disponibili"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:41
+msgid ""
+"Show recent alerts and visualize notifications and problems based on their "
+"amount and chronological distribution"
+msgstr ""
+"Mostra allarmi recenti e visualizza le notifiche e i problemi rispetto alle "
+"occorrenze e alla distribuzione cronologica"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:259
 msgid "Show resource configuration"
 msgstr "Mostra la configurazione della risorsa"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:92
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:92
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:77
+#, php-format
+msgid "Show summarized information for %u hosts"
+msgstr "Mostra lista informazioni per %u host"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:98
+#, php-format
+msgid "Show summarized information for %u services"
+msgstr "Mostra lista informazioni per %u servizi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:390
+msgid "Show the Event Grid"
+msgstr "Mostra Griglia Eventi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:646
+msgid "Show the Service Grid"
+msgstr "Mostra la Griglia Servizi"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:258
+#, php-format
+msgid "Show the configuration of the %s resource"
+msgstr "Mostra configurazione per la risorsa %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:21
+msgid "Show the number of historical event records grouped by time and type"
+msgstr "Mostra il numero di eventi dello storico raggruppati per ora e tipo"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:75
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:76
 msgid "Skip Validation"
 msgstr "Salta la Verifica"
 
@@ -2676,23 +3373,23 @@ msgstr "Socket"
 msgid "Sort by"
 msgstr "Ordina per"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:93
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:94
 msgctxt "setup.welcome.btn.next"
 msgid "Start"
-msgstr "Inizio"
+msgstr "Inizia"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:81
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:307
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:78
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:301
 msgid "Start Time"
 msgstr "Ora Inizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:66
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:64
 msgid "Started downtimes"
-msgstr "Manutenzioni Iniziate"
+msgstr "Manutenzione iniziate"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:43
 msgid "Starts"
-msgstr "Inizi"
+msgstr "Inizio"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:115
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:135
@@ -2703,61 +3400,73 @@ msgstr "Stato"
 msgid "State Changes"
 msgstr "Cambi di Stato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:54
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:53
 msgid "Status"
 msgstr "Stato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:114
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:111
 msgid "Sticky Acknowledgement"
 msgstr "Commento Permanente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:21
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:31
 msgid "Submit Passive Check Result"
 msgid_plural "Submit Passive Check Results"
-msgstr[0] "Controlli Passivi"
-msgstr[1] "Controlli Passivi"
+msgstr[0] "Invia Risultato Passivo all'Host"
+msgstr[1] "Invia Risultati Passivo all'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:113
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:119
 msgid "Submit Passive Host Check Result"
-msgstr "Accetta Controlli Passivi sugli Host"
+msgstr "Invia Risultato Passivo all'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:207
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:220
 msgid "Submit Passive Host Check Results"
-msgstr "Accetta Controlli Passivi sugli Host"
+msgstr "Invia Risultato Passivo all'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:90
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:96
 msgid "Submit Passive Service Check Result"
-msgstr "Accetta Controlli Passivi sui Servizi"
+msgstr "Invia Risultato Passivo al Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:256
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:269
 msgid "Submit Passive Service Check Results"
-msgstr "Accetta Controlli Passivi sui Servizi"
+msgstr "Invia Risultato Passivo al Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:37
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:49
-msgid "Submit passive check results"
-msgstr "%d è controllato passivamente"
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml:13
+#, php-format
+msgid "Submit a one time or so called passive result for the %s check"
+msgstr "Invia risultato passivo per %s controlli"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:202
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:29
+#, php-format
+msgid "Submit a passive check result for all %u hosts"
+msgstr "Invia risultato passivo per tutti i %u host"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:29
+#, php-format
+msgid "Submit a passive check result for all %u services"
+msgstr "Invia risultato passivo per tutti i %u servizi"
+
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:208
 msgid "System"
 msgstr "Sistema"
 
-# rivedere
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:129
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TacticalController.php:14
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:135
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TacticalController.php:18
 msgid "Tactical Overview"
 msgstr "Visuale Tattica"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:149
-msgid "The PHP Module sockets is available."
-msgstr "Il modulo sockets di PHP è disponibile"
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:169
+msgid ""
+"The Zend database adapter for MySQL is required to access a MySQL database."
+msgstr ""
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:150
-msgid "The PHP Module sockets is not available."
-msgstr "Il modulo sockets di PHP non è disponibile"
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:189
+msgid ""
+"The Zend database adapter for PostgreSQL is required to access a PostgreSQL "
+"database."
+msgstr ""
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:218
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:63
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:227
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:46
 msgid "The data source used for retrieving monitoring information"
 msgstr ""
 "La sorgente dei dati usati per recuperare le informazioni di monitoraggio"
@@ -2765,59 +3474,56 @@ msgstr ""
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/DataView.php:338
 #, php-format
 msgid "The filter column \"%s\" is not allowed here."
-msgstr "Il filtro della colonna \"%s\" non è ammesso."
+msgstr "Il filtro \"%s\" non è ammesso."
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:59
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:60
 msgid "The given resource name is already in use."
-msgstr "Il Nome Risorsa fornito è già in uso."
+msgstr "Il nome risorsa fornito è già in uso."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:208
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:46
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:217
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:29
 msgid "The identifier of this backend"
 msgstr "L'identificatore per questo backend"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:25
-#, php-format
-msgid "The last one occured %s ago"
-msgstr "L'ultimo si è verificato %s fa"
-
 #: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:122
 msgid "The parameter `contact' is required"
 msgstr "Il parametro `contatto' è richiesto"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:84
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:83
 msgid ""
 "The performance data of this check result. Leave empty if this check result "
 "has no performance data"
 msgstr ""
+"Dati di performance per questo controllo. Lasciare vuoto se il controllo non "
+"ha dati performance."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:74
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:73
 msgid "The plugin output of this check result"
-msgstr "L'ouput del plugin per questo controllo"
+msgstr "Output del risultato del controllo"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:230
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:241
 msgid "The resource to use"
 msgstr "La risorsa da usare"
 
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/DataView.php:247
 #, php-format
 msgid "The sort column \"%s\" is not allowed in \"%s\"."
-msgstr "La colonna di ordinamento \"%s\" non è permessa in \"%s\"."
+msgstr "Non è possibile oridinare per colonna \"%s\" in \"%s\"."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:55
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:54
 msgid "The state this check result should report"
-msgstr ""
+msgstr "Stato da riportare nel risultato del controllo"
 
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:91
 #, php-format
 msgid "There is no \"%s\" monitoring backend"
-msgstr "Nessun backend di monitoraggio \"%s\" trovato"
+msgstr "Backend di Monitoraggio \"%s\" non trovato"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:17
 msgid "This Object's Event History"
 msgstr "Storico degli Eventi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:34
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:22
 msgid ""
 "This command is used to acknowledge host or service problems. When a problem "
 "is acknowledged, future notifications about problems are temporarily "
@@ -2827,19 +3533,19 @@ msgstr ""
 "problema è Confermato le notifiche saranno temporaneamente disabilitate fino "
 "al ripristino dell'host o servizio."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:32
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:19
 msgid "This command is used to add host or service comments."
 msgstr "Questo comando serve ad aggiungere commenti agli host o ai servizi."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:33
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:26
 msgid ""
 "This command is used to disable host and service notifications for a "
 "specific time."
 msgstr ""
-"Questo comando serve a disabilitare le notifiche degli host e servizi per un "
+"Questo comando serve a disabilitare le notifiche di host e servizi per un "
 "periodo di tempo specifico."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:45
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:33
 msgid ""
 "This command is used to schedule host and service downtimes. During the "
 "specified downtime, Icinga will not send notifications out about the hosts "
@@ -2847,28 +3553,35 @@ msgid ""
 "notifications for the hosts and services as it normally would. Scheduled "
 "downtimes are preserved across program shutdowns and restarts."
 msgstr ""
-"Questo comando serve a schedulare la manutenzione di un host o servizio. "
+"Questo comando serve a pianificare la manutenzione di un host o servizio. "
 "Durante la Manutenzione, Icinga sopprimerà eventuali notifiche. Allo scadere "
 "della Manutenzione Icinga invierà le notifche per host e servizi come "
 "farebbe normalmente. Le Manutenzioni schedulate saranno preservate da "
 "eventuali arresti o riavvii dell'ambiente."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:35
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:23
 msgid ""
 "This command is used to schedule the next check of hosts or services. Icinga "
 "will re-queue the hosts or services to be checked at the time you specify."
 msgstr ""
 "Questo comando serve a schedulare l'esecuzione del prossimo controllo "
-"dell'host o servizio. Icinga sposterà controllo per l'host o servizio "
+"dell'host o servizio. Icinga eseguirà il controllo per l'host o servizio "
 "all'orario specificato."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:32
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:21
+msgid ""
+"This command is used to send custom notifications for hosts or services."
+msgstr ""
+"Questo comando serve ad inviare notifiche personalizzate per host o servizi."
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:20
 msgid "This command is used to submit passive host or service check results."
-msgstr "Questo comando serve ad aggiungere commenti agli host o ai servizi."
+msgstr ""
+"Questo comando serve ad inviare risultati passivi all'host o al servizio."
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:76
 msgid "This comment does not expire."
-msgstr "Questo commento non scade."
+msgstr "Questo commento ha scadenza."
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:73
 #, php-format
@@ -2884,72 +3597,74 @@ msgid "This comment is persistent."
 msgstr "Questo Commento è permanente."
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:107
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This fixed host downtime has been scheduled to start on %s at %s and to end "
 "on %s at %s."
 msgstr ""
-"Questa Manutenzione Rigida è stata schedulata per iniziare il %s alle %s e "
-"finire il %s alle %s."
+"Questa Manutenzione Rigida dell'Host è stata pianificata per iniziare il %s "
+"alle %s e finire il %s alle %s"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:97
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This fixed host downtime was started on %s at %s and expires on %s at %s."
 msgstr ""
-"Questa Manutenzione Rigida è iniziata il %s alle %s e finirà il %s alle %s."
+"Questa Manutenzione Rigida dell'Host è iniziata il %s alle %s e finirà il %s "
+"alle %s."
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:106
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This fixed service downtime has been scheduled to start on %s at %s and to "
 "end on %s at %s."
 msgstr ""
-"Questa Manutenzione Rigida è stata schedulata per iniziare il %s alle %s e "
-"finire il %s alle %s."
+"Questa Manutenzione Rigida del Servizio è stata pianificata per iniziare il %"
+"s alle %s e finire il %s alle %s"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:96
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This fixed service downtime was started on %s at %s and expires on %s at %s."
 msgstr ""
-"Questa Manutenzione Rigida è iniziata il %s alle %s e finirà il %s alle %s."
+"Questa Manutenzione Rigida del Servizio è iniziata il %s alle %s e finirà il "
+"%s alle %s."
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:86
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This flexible host downtime has been scheduled to start between %s - %s and "
 "to last for %s."
 msgstr ""
-"Questa Manutenzione Flessibile è stata schedulata per iniziare tra %s -%s e "
-"durare per %s"
+"Questa Manutenzione Flessibile dell'Host è stata pianificata per iniziare "
+"tra %s -%s e durare per %s"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:75
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This flexible host downtime was started on %s at %s and lasts for %s until %"
 "s at %s."
 msgstr ""
-"Questa Manutenzione Flessibile è iniziata il %s alle %s e durerà per %s fino "
-"al %s alle %s."
+"Questa Manutenzione Flessibile dell'Host è iniziata il %s alle %s e durerà "
+"per %s fino al %s alle %s."
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:85
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This flexible service downtime has been scheduled to start between %s - %s "
 "and to last for %s."
 msgstr ""
-"Questa Manutenzione Flessibile è stata schedulata per iniziare tra %s -%s e "
-"durare per %s"
+"Questa Manutenzione Flessibile del Servizio è stata pianificata per iniziare "
+"tra %s -%s e durare per %s"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:74
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This flexible service downtime was started on %s at %s and lasts for %s "
 "until %s at %s."
 msgstr ""
-"Questa Manutenzione Flessibile è iniziata il %s alle %s e durerà per %s fino "
-"al %s alle %s."
+"Questa Manutenzione Flessibile del Servizio è iniziata il %s alle %s e "
+"durerà per %s fino al %s alle %s."
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/WelcomePage.php:33
 msgid "This is the core module for Icinga Web 2."
@@ -2959,12 +3674,13 @@ msgstr "Questo è il modulo principale per Icinga Web 2."
 msgid "Time to Reaction (Ack, Recover)"
 msgstr "Tempo di Reazione (Conferma, Ripristino)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:105
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:103
 msgid "TimeLine interval"
-msgstr "Intervallo Cronologico"
+msgstr "Intervallo"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:185
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:28
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:191
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:22
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:26
 msgid "Timeline"
 msgstr "Cronologia"
 
@@ -2972,7 +3688,19 @@ msgstr "Cronologia"
 msgid "To"
 msgstr "A"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/SecurityPage.php:34
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:160
+msgid ""
+"To access the IDO stored in a MySQL database the PDO-MySQL module for PHP is "
+"required."
+msgstr ""
+
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:180
+msgid ""
+"To access the IDO stored in a PostgreSQL database the PDO-PostgreSQL module "
+"for PHP is required."
+msgstr ""
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/SecurityPage.php:16
 msgid ""
 "To protect your monitoring environment against prying eyes please fill out "
 "the settings below."
@@ -2984,8 +3712,8 @@ msgstr ""
 msgid "Today"
 msgstr "Oggi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:130
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:216
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:133
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:219
 msgid "Toggling feature.."
 msgstr "Comando inviato..."
 
@@ -2995,8 +3723,8 @@ msgstr "Ultimi 5 Allarmi"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:26
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:26
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:540
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:590
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:547
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:597
 msgid "Total Services"
 msgstr "Totale dei Servizi"
 
@@ -3008,17 +3736,17 @@ msgstr "Trend"
 msgid "Trend for the last 24h"
 msgstr "Trend nelle ultime 24 ore"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:102
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:99
 msgid "Type"
 msgstr "Tipo"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:25
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:57
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:31
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:75
 #, php-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:225
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:187
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:40
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:58
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:40
@@ -3026,26 +3754,25 @@ msgstr "Tipo: %s"
 msgid "UNKNOWN"
 msgstr "UNKNOWN"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:64
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:156
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:63
 msgctxt "icinga.state"
 msgid "UNKNOWN"
 msgstr "UNKNOWN"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:181
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:179
 msgid "UNREACHABLE"
-msgstr "IRRAGGIUNGIBILE"
+msgstr "UNREACHABLE"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:59
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:58
 msgctxt "icinga.state"
 msgid "UNREACHABLE"
 msgstr "UNREACHABLE"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:175
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:173
 msgid "UP"
 msgstr "UP"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:57
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:56
 msgctxt "icinga.state"
 msgid "UP"
 msgstr "UP"
@@ -3057,30 +3784,16 @@ msgstr "UP"
 msgid "Unhandled"
 msgstr "Non Gestiti"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:95
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:101
 msgid "Unhandled Hosts"
 msgstr "Host Non Gestiti"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:100
+#: /usr/share/icingaweb2/modules/monitoring/configuration.php:106
 msgid "Unhandled Services"
 msgstr "Servizi Non Gestiti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:29
-msgid "Unhandled hosts with state DOWN"
-msgstr "Host Non Gestiti in stato DOWN"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:54
-msgid "Unhandled hosts with state UNREACHABLE"
-msgstr "Host Non Gestiti in stato IRRAGGIUNGIBILE"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:51
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:47
-#, php-format
-msgid "Unhandled services with state %s"
-msgstr "Servizi Non Gestiti in stato %s"
-
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:120
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:268
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:271
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -3093,23 +3806,23 @@ msgstr "Nome Istanza sconosciuto"
 msgid "Unknown instance name provided"
 msgstr "Nome istanza sconosciuto"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:101
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:123
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:169
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:104
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:126
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:172
 msgid "Unknown monitoring backend provided"
 msgstr "Backend di monitoraggio sconosciuto"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:140
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:315
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:321
 msgid "Unreachable"
-msgstr "Irraggiungibile"
+msgstr "Unreachable"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:138
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:301
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:307
 msgid "Up"
-msgstr "Su"
+msgstr "Up"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:75
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:72
 msgid "Use Expire Time"
 msgstr "Scadenza"
 
@@ -3131,17 +3844,17 @@ msgstr ""
 
 #: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:108
 msgid "Username"
-msgstr "Nome Utente"
+msgstr "Utente"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
 msgid "Value"
 msgstr "Valore"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:632
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:624
 msgid "Value for interval not valid"
 msgstr "Intervallo non valido"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:219
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:181
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:46
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:64
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:46
@@ -3149,16 +3862,14 @@ msgstr "Intervallo non valido"
 msgid "WARNING"
 msgstr "WARNING"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:62
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:78
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:86
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:61
 msgctxt "icinga.state"
 msgid "WARNING"
 msgstr "WARNING"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:119
 #: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:254
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:257
 msgid "Warning"
 msgstr "Warning"
 
@@ -3167,6 +3878,18 @@ msgid "Welcome to the configuration of the monitoring module for Icinga Web 2!"
 msgstr ""
 "Benvenuto nella configurazione del modulo di monitoraggio per Icinga Web 2!"
 
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml:17
+msgid "Yes"
+msgstr "Si"
+
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:166
+msgid "Zend database adapter for MySQL"
+msgstr ""
+
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:186
+msgid "Zend database adapter for PostgreSQL"
+msgstr ""
+
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:51
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:39
 #, php-format
@@ -3174,17 +3897,23 @@ msgctxt "time"
 msgid "at %s"
 msgstr "alle %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:104
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:59
+#, fuzzy, php-format
+msgctxt "timeline.link.title.datetime.twice"
+msgid "between %s and %s"
+msgstr "tra %s e %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:107
 msgid "changed"
 msgstr "modificato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:199
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:182
 msgid "down"
 msgstr "down"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:55
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:65
 msgid "hard state"
-msgstr "stato hard"
+msgstr "hard"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:52
 #, php-format
@@ -3192,13 +3921,31 @@ msgctxt "timespan"
 msgid "in %s"
 msgstr "in %s"
 
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:47
+#, fuzzy, php-format
+msgctxt "timeline.link.title.month.and.year"
+msgid "in %s"
+msgstr "il %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:53
+#, fuzzy, php-format
+msgctxt "timeline.link.title.year"
+msgid "in %s"
+msgstr "il %s"
+
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:37
 msgid "in the last hour"
 msgstr "nell'ultima ora"
 
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:40
+#, fuzzy, php-format
+msgctxt "timeline.link.title.week.and.year"
+msgid "in week %s of %s"
+msgstr "nella settimana %s di %s"
+
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:35
 msgid "notifications per hour"
-msgstr "notifche per ora"
+msgstr "notifiche per ora"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:50
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:38
@@ -3207,435 +3954,296 @@ msgctxt "datetime"
 msgid "on %s"
 msgstr "il %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:78
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:34
+#, fuzzy, php-format
+msgctxt "timeline.link.title.time"
+msgid "on %s"
+msgstr "di %s"
+
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:77
 msgid "overall"
-msgstr "complessivi"
+msgstr "complessivo"
 
 #: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml:5
 msgctxt "multiselection"
 msgid "row(s) selected"
 msgstr "righe selezionate"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:79
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:78
 msgid "scheduled"
-msgstr "schedulati"
+msgstr "schedulato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:53
+#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:63
 msgid "soft state"
-msgstr "(stato soft)"
+msgstr "soft"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:49
+#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:50
 msgid "the monitoring module"
 msgstr "il modulo di monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:197
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:180
 msgid "unchanged"
-msgstr "iivariato"
+msgstr "invariato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:201
+#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:184
 msgid "up"
 msgstr "up"
 
-#~ msgid "Acknowledge all problems on the selected hosts or services"
-#~ msgstr "Conferma tutti i problemi degli host o servizi selezionati"
+#~ msgid "Monitoring IDO Resource"
+#~ msgstr "Risorsa IDO"
 
-#~ msgid "Acknowledge unhandled problem services"
-#~ msgstr "Conferma i problemi non gestiti dei Servizi"
+#~ msgid "Monitoring Livestatus Resource"
+#~ msgstr "Risorsa Livestatus"
 
-#~ msgid "Acknowledgement has been sent"
-#~ msgstr "Conferma inviata"
-
-#~ msgid "Acknowledgement removal has been requested"
-#~ msgstr "Rimozione della Conferma in corso"
-
-#~ msgid "Allow all scheduling checks and downtimes"
-#~ msgstr "Consenti la Schedulazione di Controlli e Manutenzioni"
-
-#~ msgid "Allow removing host and service downtimes"
-#~ msgstr "Consenti la rimozione di Manutenzioni da Host e Servizi"
+#~ msgid "%s on %s"
+#~ msgstr "%s di %s"
 
 #~ msgid ""
-#~ "Allow removing problem acknowledgements, host and service comments and "
-#~ "downtimes"
+#~ "Press and hold the Ctrl key while clicking on rows to select multiple "
+#~ "rows or press and hold the Shift key to select a range of rows."
 #~ msgstr ""
-#~ "Permitir a remoção de reconhecimento de problemas, comentários de hosts e "
-#~ "de serviços e paradas"
+#~ "Tenere premuto il tasto CTRL durante i Click per selezionare più righe o "
+#~ "tenere premuto SHIFT per selezionare righe contigue."
 
-#~ msgid "Command has been sent, active checks will be disabled"
-#~ msgstr "Comando inviato, i Controlli Attivi saranno disabilitati"
+#~ msgid "row(s) selected"
+#~ msgstr "righe selezionate"
 
-#~ msgid "Command has been sent, active checks will be enabled"
-#~ msgstr "Comando inviato, i Controlli Attivi saranno abilitati"
+#~ msgid "at %s"
+#~ msgstr "alle %s"
 
-#~ msgid "Command has been sent, check will be rescheduled"
-#~ msgstr "Comando inviato, il Controllo sarà rischedulato"
-
-#~ msgid "Command has been sent, checks will be rescheduled"
-#~ msgstr "Comando inviato, i Controlli saranno rischedulati"
-
-#~ msgid "Command has been sent, event handlers will be disabled"
-#~ msgstr "Comando inviato, il Gestore Eventi sarà disabilitato"
-
-#~ msgid "Command has been sent, event handlers will be enabled"
-#~ msgstr "Comando inviato, il Gestore Eventi sarà abilitato"
-
-# rivedere
-#~ msgid "Command has been sent, flap detection will be disabled"
-#~ msgstr "Comando inviato, il controllo di instabilità sarà disabilitato"
-
-#~ msgid "Command has been sent, flap detection will be enabled"
-#~ msgstr "Comando inviato, il controllo di instabilità sarà abilitato"
-
-#~ msgid "Command has been sent, monitoring process will restart now"
-#~ msgstr "Comando inviato, il processo di monitoraggio sarà riavviato"
-
-#~ msgid "Command has been sent, notifications will be disabled"
-#~ msgstr "Comando inviato, le notifiche saranno disabilitate"
-
-#~ msgid "Command has been sent, notifications will be enabled"
-#~ msgstr "Comando inviato, le notifiche saranno abilitate"
-
-#~ msgid "Command has been sent, obsessing will be disabled"
-#~ msgstr "Comando inviato, la modalità ossessiva sarà disabilitata"
-
-#~ msgid "Command has been sent, obsessing will be enabled"
-#~ msgstr "Comando inviato, la modalità ossessiva sarà abilitata"
-
-#~ msgid "Command has been sent, passive check results will be accepted"
-#~ msgstr ""
-#~ "Comando inviato, i risultati dei controlli passivi saranno accettati"
-
-#~ msgid "Command has been sent, passive check results will be refused"
-#~ msgstr "Comando inviato, i risultati dei controlli passivi saranno ignorati"
-
-#~ msgid "Command has been sent, performance data processing will be disabled"
-#~ msgstr ""
-#~ "Comando inviato, la raccolta dei dati di performance sarà disabilitata"
-
-#~ msgid "Command has been sent, performance data processing will be enabled"
-#~ msgstr "Comando inviato, la raccolta dei dati di performance sarà abilitata"
-
-#~ msgid "Command has been sent, process will shut down"
-#~ msgstr "Comando inviato, il processo sarà arrestato"
-
-#~ msgid "Comment removal has been requested"
-#~ msgstr "Richesta di rimozione del commento inviata"
-
-#~ msgid "Custom notification has been sent"
-#~ msgstr "Notifica personalizza inviata"
-
-#~ msgid "Delay Notifications"
-#~ msgstr "Posticipa Notifiche"
-
-#~ msgid "Delete Downtime"
-#~ msgstr "Cancella Manutenzione"
-
-#~ msgid "Delete a single downtime with the id shown above"
-#~ msgstr "Cancella la manutenzione con ID definito"
-
-#~ msgid "Disable Active Checks"
-#~ msgstr "Disabilita i Controlli Attivi"
-
-#~ msgid "Disable Event Handler"
-#~ msgstr "Disabilita il Gestore Eventi"
-
-#~ msgid "Disable Flapping Detection"
-#~ msgstr "Disabilita il Controllo Instabilità"
-
-#~ msgid "Disable Performance Data"
-#~ msgstr "Disabilita i Dati di Performance"
-
-#~ msgid "Disable active checks for this host and its services."
-#~ msgstr "Disabilita i controlli attivi per questo host e relativi servizi."
-
-#~ msgid "Disable active checks for this object."
-#~ msgstr "Disabilita i controlli attivi per questo oggetto."
-
-#~ msgid "Disable active checks on a program-wide basis."
-#~ msgstr "Disabilita i controlli attivi sull'intero sistema"
-
-#~ msgid "Disable event handler for the whole system."
-#~ msgstr "Disabilita il Gestore Eventi sull'intero sistema."
-
-#~ msgid "Disable event handler for this object."
-#~ msgstr "Disabilita il Gestore Eventi per questo oggetto."
-
-#~ msgid "Disable flapping detection for this object."
-#~ msgstr "Disabilita il Controllo di Instabilità per questo oggetto."
-
-#~ msgid "Disable flapping detection on a program-wide basis."
-#~ msgstr "Disabilita il Controllo di Instabilità per l'intero sistema."
-
-#~ msgid "Disable notifications on a program-wide basis."
-#~ msgstr "Disabilita le notifiche sull'intero sistema"
-
-#~ msgid "Disable obsessing on a program-wide basis."
-#~ msgstr "Disabilita la modalità ossessiva su tutto il sistema."
-
-#~ msgid "Disable passive checks on a program-wide basis."
-#~ msgstr "Disabilita i controlli passivi sull'intero sistema"
-
-#~ msgid "Disable processing of performance data on a program-wide basis."
-#~ msgstr "Disabilita la raccolta dei dati di performance sull'intero sistema"
-
-#~ msgid "Downtime removal has been requested"
-#~ msgstr "Cancellazione della Manutenzione in corso"
-
-#~ msgid "Downtime removal requested"
-#~ msgstr "Richiesta di cancellazione Manutenzione"
-
-#~ msgid "Downtime scheduling requested"
-#~ msgstr "Schedulazione di Manutenzione richiesta"
-
-#~ msgid "Enable Active Checks"
-#~ msgstr "Abilita Controlli Attivi"
-
-#~ msgid "Enable Event Handler"
-#~ msgstr "Abilita Gestore Eventi"
-
-#~ msgid "Enable Flapping Detection"
-#~ msgstr "Abilita il Controllo Instabilità"
-
-#~ msgid "Enable Notifications"
-#~ msgstr "Abilita Notifiche"
-
-#~ msgid "Enable Performance Data"
-#~ msgstr "Abilita i Dati di Performance"
-
-#~ msgid "Enable active checks for this host and its services."
-#~ msgstr "Abilita i controlli attivi per questo host e relativi servizi"
-
-#~ msgid "Enable active checks for this object."
-#~ msgstr "Abilita i controlli attivi per questo oggetto"
-
-#~ msgid "Enable active checks on a program-wide basis."
-#~ msgstr "Abilita i controlli attivi sull'intero sistema"
-
-#~ msgid "Enable event handler for this object."
-#~ msgstr "Abilita il gestore eventi per questo oggetto."
-
-#~ msgid "Enable event handlers on the whole system."
-#~ msgstr "Abilita il gestore eventi sull'intero sistema."
-
-#~ msgid "Enable flapping detection for this object."
-#~ msgstr "Abilita il controllo di instabilità per questo oggetto."
-
-#~ msgid "Enable flapping detection on a program-wide basis."
-#~ msgstr "Abilita il controllo di instabilità su tutto il sistema."
-
-#~ msgid "Enable notifications on a program-wide basis."
-#~ msgstr "Abilita le notifiche sull'intero sistema."
-
-#~ msgid "Enable obsessing on a program-wide basis."
-#~ msgstr "Abilita la modalità ossessiva su tutto il sistema."
-
-#~ msgid "Enable passive checks on a program-wide basis."
-#~ msgstr "Abilita i controlli passivi sull'intero sistema."
-
-#~ msgid "Enable processing of performance data on a program-wide basis."
-#~ msgstr ""
-#~ "Habilitar processamento de dados de performance na base de todo o "
-#~ "programa."
-
-#~ msgid "Event handlers"
-#~ msgstr "Gestori Eventi"
-
-#~ msgid "Flap detection"
-#~ msgstr "Controllo Instabilità"
-
-#~ msgid "Hard State"
-#~ msgstr "Stato Hard"
-
-#~ msgid "Host / Service"
-#~ msgstr "Host / Servizio"
-
-#~ msgid "Host Name"
-#~ msgstr "Nome Host"
-
-#~ msgid "Hosts Down Handled"
-#~ msgstr "Host Down Gestiti"
-
-#~ msgid "Hosts Down Unhandled"
-#~ msgstr "Host Down Non Gestiti"
-
-#~ msgid "Hosts Pending"
-#~ msgstr "Host in Attesa"
-
-#~ msgid "Hosts Unreachable Handled"
-#~ msgstr "Host Irraggiungibili Gestiti"
-
-#~ msgid "Hosts Unreachable Unhandled"
-#~ msgstr "Host Irraggiungibili Non Gestiti"
-
-#~ msgid "Hosts Up"
-#~ msgstr "Host Up"
-
-#~ msgid "Instance is not configured: %s"
-#~ msgstr "Istanza non configurata: %s"
-
-#~ msgid "List Of Supported Commands"
-#~ msgstr "Lista dei Comandi Supportati"
-
-#~ msgid "List all selected objects"
-#~ msgstr "Mostra tutti gli oggetti selezionati"
-
-#~ msgid "No instances are configured yet"
-#~ msgstr "Nessuna istanza ancora configurata"
-
-#~ msgid "Notification delay has been requested"
-#~ msgstr "Posticipo di Notifica richiesta"
-
-#~ msgid "Notifications for this host and its services will be disabled."
-#~ msgstr ""
-#~ "Le notifiche per questo host e relativi servizi saranno disabilitate"
-
-#~ msgid "Notifications for this host and its services will be enabled."
-#~ msgstr "Le notifiche per questo host e relativi servizi saranno abilitate"
-
-#~ msgid "Notifications for this object will be disabled."
-#~ msgstr "Le notifiche per questo oggetto saranno disabilitate"
-
-#~ msgid "Notifications for this object will be enabled."
-#~ msgstr "Le notifiche per questo oggetto saranno abilitate"
+#~ msgid "Timeline Navigation"
+#~ msgstr "Navigazione della Cronologia"
 
 #~ msgctxt "icinga.state"
-#~ msgid "PENDING"
-#~ msgstr "ATTESA"
+#~ msgid "%d CRITICAL"
+#~ msgid_plural "%d CRITICAL"
+#~ msgstr[0] "%d CRITICAL"
+#~ msgstr[1] "%d CRITICAL"
 
-#~ msgid "Passive check result has been submitted"
-#~ msgstr "Risultato passivo inviato"
+#~ msgctxt "icinga.state"
+#~ msgid "%d PENDING"
+#~ msgid_plural "%d PENDING"
+#~ msgstr[0] "%d Host PENDING"
+#~ msgstr[1] "%d Host PENDING"
 
-#~ msgid "Passive checks for this object will be accepted."
-#~ msgstr "I Controlli Passivi per questo oggetto saranno accettati"
+#~ msgctxt "icinga.state"
+#~ msgid "%d UNKNOWN"
+#~ msgid_plural "%d UNKNOWN"
+#~ msgstr[0] "%d UNKNOWN"
+#~ msgstr[1] "%d UNKNOWN"
 
-#~ msgid "Passive checks for this object will be omitted."
-#~ msgstr "I Controlli Passivi per questo oggetto saranno scartati"
+#~ msgid "%d are not checked at all"
+#~ msgstr "%d non sono stati controllati"
 
-#~ msgid "Remove Comments"
+#~ msgid "%d are passively checked"
+#~ msgstr "%d sono controllati passivamente"
+
+#~ msgid "%d critical on %s"
+#~ msgstr "%d critical il %s"
+
+#~ msgid "%d down on %s"
+#~ msgstr "%d down di %s"
+
+#~ msgid "%d ok on %s"
+#~ msgstr "%d ok di %s"
+
+#~ msgid "%d unknown on %s"
+#~ msgstr "%d unknown di %s"
+
+#~ msgid "%d unreachable on %s"
+#~ msgstr "%d unreachable di %s"
+
+#~ msgid "%d warning on %s"
+#~ msgstr "%d warning di %s"
+
+#~ msgid "%s notifications have been sent for this issue"
+#~ msgstr "%s notifiche inviate per questo problema"
+
+#~ msgid "A notification has been sent for this issue %s ago"
+#~ msgstr "Una notifica è stata inviata per questo problema %s fa"
+
+#~ msgid "Acknowledge unhandled host problem"
+#~ msgid_plural "Acknowledge unhandled host problems"
+#~ msgstr[0] "Conferma il Problema dell'Host Non Gestito"
+#~ msgstr[1] "Conferma i Problemi dell'Host Non Gestiti"
+
+#~ msgid "Acknowledge unhandled service problem"
+#~ msgid_plural "Acknowledge unhandled service problems"
+#~ msgstr[0] "Conferma il Problema del Servizio Non Gestito"
+#~ msgstr[1] "Conferma i Problemi del Servizio Non Gestiti"
+
+#~ msgid "Delete comment"
 #~ msgstr "Rimuovi Commento"
 
-#~ msgid "Remove Downtime(s)"
+#~ msgid "Delete downtime"
 #~ msgstr "Cancella Manutenzione"
 
-#~ msgid "Remove Problem Acknowledgement"
-#~ msgstr "Rimuovi Conferma del Problema"
+#~ msgid "Handled hosts with state DOWN"
+#~ msgstr "Host Gestiti in stato DOWN"
 
-#~ msgid "Remove comment"
-#~ msgstr "Rimuovi commento"
+#~ msgid "Handled hosts with state UNREACHABLE"
+#~ msgstr "Host Gestiti con stato UNREACHABLE"
 
-#~ msgid "Remove downtime(s) from this host and its services."
-#~ msgstr "Cancella manutenzione da questo host e relativi servizi"
+#~ msgid "Handled services with state %s"
+#~ msgstr "Servizi Gestiti con stato %s"
 
-#~ msgid "Remove problem acknowledgement for this object."
-#~ msgstr "Rimuovi Conferma del problema da questo oggetto."
+#~ msgid "Hosts with state PENDING"
+#~ msgstr "Host in stato PENDING"
 
-#~ msgid "Reset Attributes"
-#~ msgstr "Reimposta Attributi"
+#~ msgid "Hosts with state UP"
+#~ msgstr "Host in stato UP"
 
-#~ msgid "Reset modified attributes to its default."
-#~ msgstr "Reimposta gli attributi modificati con i valori predefiniti"
+#~ msgid "List %s service with status critical handled in service group %s"
+#~ msgid_plural ""
+#~ "List %s services with status critical handled in service group %s"
+#~ msgstr[0] ""
+#~ "Mostra %s servizio in stato critical gestito nel gruppo di servizi %s"
+#~ msgstr[1] ""
+#~ "Mostra %s servizi in stato critical gestiti nel gruppo di servizi %s"
 
-#~ msgid "Restart monitoring process"
-#~ msgstr "Riavvia processo di monitoraggio"
+#~ msgid "List %s service with status critical unhandled in service group %s"
+#~ msgid_plural ""
+#~ "List %s Services with status critical unhandled in service group %s"
+#~ msgstr[0] ""
+#~ "Mostra %s servizio in stato critical non gestito nel gruppo di servizi %s"
+#~ msgstr[1] ""
+#~ "Mostra %s servizi in stato critical non gestiti nel gruppo di servizi %s"
 
-#~ msgid "Restart the monitoring process."
-#~ msgstr "Riavvia il processo di monitoraggio."
+#~ msgid "List %s service with status ok in service group %s"
+#~ msgid_plural "List %s Services with status ok in service group %s"
+#~ msgstr[0] "Mostra %s servizio in stato ok nel gruppo di servizi %s"
+#~ msgstr[1] "Mostra %s servizi in stato ok nel gruppo di servizi %s"
 
-#~ msgid "Schedule downtimes for unhandled problem services"
-#~ msgstr "Schedula Manutenzione per Servizi con Problemi Non Gestiti"
+#~ msgid "List %s service with status unknown handled in service group %s"
+#~ msgid_plural ""
+#~ "List %s services with status unknown handled in service group %s"
+#~ msgstr[0] ""
+#~ "Mostra %s servizio in stato unknown gestito nel gruppo di servizi %s"
+#~ msgstr[1] ""
+#~ "Mostra %s servizi in stato unknown gestiti nel gruppo di servizi %s"
 
-#~ msgid "Services CRITICAL Handled"
-#~ msgstr "Servizi CRITICAL Gestiti"
+#~ msgid "List %s service with status unknown unhandled in service group %s"
+#~ msgid_plural ""
+#~ "List %s services with status unknown unhandled in service group %s"
+#~ msgstr[0] ""
+#~ "Mostra %s servizio in stato unknown non gestito nel gruppo di servizi %s"
+#~ msgstr[1] ""
+#~ "Mostra %s servizi in stato unknown non gestiti nel gruppo di servizi %s"
 
-#~ msgid "Services CRITICAL Unhandled"
-#~ msgstr "Servizi CRITICAL Non Gestiti"
+#~ msgid "List %s service with status warning unhandled in service group %s"
+#~ msgid_plural ""
+#~ "List %s services with status warning unhandled in service group %s"
+#~ msgstr[0] ""
+#~ "Mostra %s servizio in stato warning non gestito nel gruppo di servizi %s"
+#~ msgstr[1] ""
+#~ "Mostra %s servizi in stato warning non gestiti nel gruppo di servizi %s"
 
-#~ msgid "Services Critical Handled"
-#~ msgstr "Servizi Critical Gestiti"
+#~ msgid "List %u host which is in downtime"
+#~ msgid_plural "List %u hosts which are in downtime"
+#~ msgstr[0] "Mostra %u host in manutenzione"
+#~ msgstr[1] "Mostra %u host in manutenzione"
 
-#~ msgid "Services Critical Unhandled"
-#~ msgstr "Servizi Critical Non Gestiti"
+#~ msgid "List %u service with status critical handled in host group %s"
+#~ msgid_plural ""
+#~ "List %u services with status critical handled in host group %s"
+#~ msgstr[0] ""
+#~ "Mostra %u servizio in stato critical gestito nel gruppo di host %s"
+#~ msgstr[1] ""
+#~ "Mostra %u servizi in stato critical gestiti nel gruppo di host %s"
 
-#~ msgid "Services Ok"
-#~ msgstr "Servizi Ok"
+#~ msgid "List %u service with status pending in host group %s"
+#~ msgid_plural "List %u services with status pending in host group %s"
+#~ msgstr[0] "Mostra %u servizio in stato pending nel gruppo di host %s"
+#~ msgstr[1] "Mostra %u servizi in stato pending nel gruppo di host %s"
 
-#~ msgid "Services Pending"
-#~ msgstr "Servizi in Attesa"
+#~ msgid "List %u service with status unknown handled in host group %s"
+#~ msgid_plural "List %u services with status unknown handled in host group %s"
+#~ msgstr[0] ""
+#~ "Mostra %u servizio in stato unknown gestito nel gruppo di host %s"
+#~ msgstr[1] "Mostra %u servizi in stato unknown gestiti nel gruppo di host %s"
 
-#~ msgid "Services UNKNOWN Handled"
-#~ msgstr "Servizi UNKNOWN Gestiti"
+#~ msgid "List %u service with status unknown unhandled in host group %s"
+#~ msgid_plural ""
+#~ "List %u services with status unknown unhandled in host group %s"
+#~ msgstr[0] ""
+#~ "Mostra %u servizio in stato unknown non gestito nel gruppo di host %s"
+#~ msgstr[1] ""
+#~ "Mostra %u servizi in stato unknown non gestiti nel gruppo di host %s"
 
-#~ msgid "Services UNKNOWN Unhandled"
-#~ msgstr "Servizi UNKNOWN Non Gestiti"
+#~ msgid "List %u service with status warning handled in host group %s"
+#~ msgid_plural "List %u services with status warning handled in host group %s"
+#~ msgstr[0] ""
+#~ "Mostra %u servizio in stato warning gestito nel gruppo di host %s"
+#~ msgstr[1] "Mostra %u servizi in stato warning gestiti nel gruppo di host %s"
 
-#~ msgid "Services Unknown Handled"
-#~ msgstr "Servizi Unknown Gestiti"
+#~ msgid "List %u service with status warning unhandled in host group %s"
+#~ msgid_plural ""
+#~ "List %u services with status warning unhandled in host group %s"
+#~ msgstr[0] ""
+#~ "Mostra %u servizio in stato warning non gestito nel gruppo di host %s"
+#~ msgstr[1] ""
+#~ "Mostra %u servizi in stato warning non gestiti nel gruppo di host %s"
 
-#~ msgid "Services Unknown Unhandled"
-#~ msgstr "Servizi Unknown Non Gestiti"
+#~ msgid "List all"
+#~ msgstr "Mostra tutto"
 
-#~ msgid "Services WARNING Handled"
-#~ msgstr "Servizi WARNING Gestiti"
+#~ msgid "No notification has been sent for this issue"
+#~ msgstr "Nessuna notifica è stata inviata per questo problema"
 
-#~ msgid "Services WARNING Unhandled"
-#~ msgstr "Servizi WARNING Non Gestiti"
+#~ msgid "PHP Module: Sockets"
+#~ msgstr "Modulo PHP: Sockets"
 
-#~ msgid "Services Warning Handled"
-#~ msgstr "Servizi Warning Gestiti"
+#~ msgid "Reschedule host checks"
+#~ msgstr "Rischedula i Controlli dell'Host"
 
-#~ msgid "Services Warning Unhandled"
-#~ msgstr "Servizi Warning Non Gestiti"
+#~ msgid "Reschedule service checks"
+#~ msgstr "Rischedula i Controlli del Servizio"
 
-#~ msgid "Shutdown monitoring process"
-#~ msgstr "Arresta il processo di monitoraggio"
+#~ msgid "Schedule downtime for unhandled host problem"
+#~ msgid_plural "Schedule downtimes for unhandled host problems"
+#~ msgstr[0] "Pianifica Manutenzione per il Problema dell'Host Non Gestito"
+#~ msgstr[1] "Pianifica Manutenzione per i Problemi degli Host Non Gestiti"
 
-#~ msgid "Start Accepting Passive Checks"
-#~ msgstr "Accetta Risultati Passivi"
+#~ msgid "Schedule downtime for unhandled service problem"
+#~ msgid_plural "Schedule downtimes for unhandled service problems"
+#~ msgstr[0] "Pianifica Manutenzione per il Problema del Servizio Non Gestito"
+#~ msgstr[1] "Pianifica Manutenzione per i Problemi del Servizio Non Gestiti"
 
-#~ msgid "Start obsessing"
-#~ msgstr "Avvia Modalità Ossessiva"
+#~ msgid "Schedule host downtimes"
+#~ msgstr "Pianifica Manutenzione Host"
 
-#~ msgid "Start obsessing over this object."
-#~ msgstr "Abilita la Modalità Ossessiva su questo oggetto."
+#~ msgid "Schedule service downtimes"
+#~ msgstr "Pianifica Manutenzione Sevizio"
 
-#~ msgid "Stop Accepting Passive Checks"
-#~ msgstr "Rifiuta Risultati Passivi"
+#~ msgid "Services with state %s"
+#~ msgstr "Servizi in stato %s"
 
-#~ msgid ""
-#~ "Stop monitoring instance. You have to start it again from command line."
-#~ msgstr ""
-#~ "Arresta l'istanza di monitoraggio. Sarà necessario ri-avviarla da linea "
-#~ "di comando."
+#~ msgid "Submit passive check results"
+#~ msgstr "Invia Risultato Passivo"
 
-#~ msgid "Stop obsessing"
-#~ msgstr "Ferma Modalità Ossessiva"
+#~ msgid "The PHP Module sockets is available."
+#~ msgstr "Il modulo PHP Sockets è disponibile"
 
-#~ msgid "Stop obsessing over this object."
-#~ msgstr "Ferma la Modalità Ossessiva su questo oggetto."
+#~ msgid "The PHP Module sockets is not available."
+#~ msgstr "Il modulo PHP Sockets non è disponibile"
 
-#~ msgid "Your new comment has been submitted"
-#~ msgstr "Il nuovo commento è stato inviato"
+#~ msgid "The last one occured %s ago"
+#~ msgstr "L'ultimo si è verificato %s fa"
 
-#~ msgid "critical"
-#~ msgstr "critical"
+#~ msgid "Unhandled hosts with state DOWN"
+#~ msgstr "Host Non Gestiti in stato DOWN"
 
-#~ msgid "ok"
-#~ msgstr "ok"
+#~ msgid "Unhandled hosts with state UNREACHABLE"
+#~ msgstr "Host Non Gestiti in stato UNREACHABLE"
 
-#~ msgid "on"
-#~ msgstr "il"
+#~ msgid "Unhandled services with state %s"
+#~ msgstr "Servizi Non Gestiti in stato %s"
 
-#~ msgid "pending"
-#~ msgstr "in attesa"
+#~ msgid "Comment: "
+#~ msgstr "Commento: "
 
-#~ msgid "since"
-#~ msgstr "da"
+#~ msgid "A notication has been sent for this issue %s ago"
+#~ msgstr "Una notifica è stata inviata per questo problema %s fa"
 
-#~ msgid "unknown"
-#~ msgstr "unknown"
-
-#~ msgid "unreachable"
-#~ msgstr "irraggiungibile"
-
-#~ msgid "warning"
-#~ msgstr "warning"
+#~ msgid "%s notications have been sent for this issue"
+#~ msgstr "%s notifiche inviate per questo problema"

From f038a89fa5b5e924be050d077bc8f4ab159f124f Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 13 Mar 2015 17:06:42 +0100
Subject: [PATCH 1071/2920] locale/it_IT: a few modifications, compile catalog

---
 .../locale/it_IT/LC_MESSAGES/icinga.mo        |  Bin 24613 -> 30402 bytes
 .../locale/it_IT/LC_MESSAGES/monitoring.mo    |  Bin 47775 -> 57825 bytes
 .../locale/it_IT/LC_MESSAGES/monitoring.po    | 2119 +++++++++--------
 3 files changed, 1063 insertions(+), 1056 deletions(-)

diff --git a/application/locale/it_IT/LC_MESSAGES/icinga.mo b/application/locale/it_IT/LC_MESSAGES/icinga.mo
index 8ee94bb0b4a87638951a1eddf71d9a400a6a0533..6978a034b95d55f7e5211f549d1a7c0e81ec0ea0 100644
GIT binary patch
literal 30402
zcmcJX37lkAeeW+aFfbtdrfhdcnx28_Vuno^7?@@j7@eh=o{`1%cGd0f%T(1ZYU!RC
z_xFg3B#Ln(sED}5D2bxR4W34$c__~%G59n-HHH|B=7qQ<ZY1yf`=4`e-RkKE^z(W3
znbW^I_n!Uy_j78#bIhVQMtrV1Ac{@_pR**2KF0UA9;c^KwCCg~S_$q2&j8;8E(gB^
zJ`MaC_*C#DDyzzQ;7Q<B;89=#J{fF-tH76m9q>codT{8}D0&r`fro)V0gnX#6Fdey
z;<P9_2wVyt0S<!~gBN;idHfS_i02Q18rPE3qlhM=3b+j10xkt}a1r=AQ03nQ9uD5?
z@qTbI`3FIb`#YfK`(tngczhg1XM>k}+zlR2{>|Vy;N9Rl@c)3L;AwQK`Y!-41#bo~
z0lxsM{U<TF%fX|-t>74_a(94Qhra{2fj<Ht2G=k-_470~gQbtg!7(rgHSf=W8qY%@
zT|~bEwXUZy*`vYb;4HWXOu>7=L&1~IbnCqg)P7z7YF)-ajq|yn#<LsLy1vlo{|G#U
z{QJOT!FxcJ|ANP_gKFpdpvLj9;9l_8py;JH?8f_Q@I>-=f-3)UkDmumAph4OTO0il
z)Hn`dQAJ-TfhxZORR0%(YWEo+Q;(hxLekMqpz6OCWGkaT1$Tj81~uL@*xW<FbHPR6
zC7{N$4m=dR7S#I*P;|H(RR8<@^IO1!$-e<qdv5`?5AXBOKMktgFL?YCco6xof}*Df
zL9P3f&WfU^fTx0*=hMME!7IV%fDeP3$3`ka5>XA*zP}PY`hX~UKdAM%Z>6jMMes24
z-vY&#KLE9!{{^y?(Fr4NoR@(b_fGI|a01jkb5P@a38?wq1d1<j0nZ2T@cF;-_ybVu
z|4UH&aYV(*m1UsT<8n~%cYzw$4d7yM24pLumw=E)^j=W(`(;r3^$4i-I||}o0v->l
z{TS4~oDXU~Ye9-eDfndY4WQQZE>QLF1#946fLg~h5lTmb8^QCyU7*^z8C1Owft$cD
zfm(-SR=aji0*@enDyaG^L5=HDP~*80)V#((&GTAN<!T^ZM_o{S^e*rv;Ag=%f}`iU
z_P+tD-nT)G^I`Bpa500_JT3#(-g;2`G7f4y*Mmoa8L0O6f!g=mK(+TFQ049eWAFh`
z?f;8^emI+Y4Ed8mm8<ytT2T8i1|AExeEud-^L-b1Hh8zkZ+blF0=EyVJzfrqueO56
zgDH3@_(Jev@b^H`->3ca2YmiPkN@ED5m5W_D5!Nlki}8G!#th@o<e>IRDV~1l9$(m
zTCW*U^zmYlp+>iW8pmfqSS<P?sCoU|<9~u$@5N7d?VbpV|IP>X{2Ea0PJvp7CaCe<
z4jv8O>EGW2YJEQes@?<ODEMuVEr?FL2wDVpfRJ2t8%WpD{on>riv(*$8^JTd4p;$i
z2SrEsgDQX38mDJp3aZ_of?AJZl#klk0BZa<gVH}A0JXnA29E;|M+xl$mx9j%XF*;?
zUk26hlC^Gpt3kCl0lpM`FNi3MhA(sTx*BAQqSu3(@BQE#z;A*lflWGBzpn(<?|VW1
zMfdV227d#d1D?9h@#R)f<L-f5!P`K!{{!%J@DvvFH1JYz9DFvYef%?U2>duG{{9a5
z6!73H9G%CY_~RU(zXaS){u$tb;O(I3<qnXoh&}*n-Tx6h1w3xO>t{8neP07=oz{V(
z&nfUkFb7WnUkPe_cYrSfe*$WKa~AWR;QPVj!R-)(Fa-|;UkGY`FZFl_cn10Vz!>~K
zsPP=Q$zcqt{92FC@%Tbe<GLL@7`zKq`|tD5?*^Yr{-Ykh3TnN61giamu5|Kcna6eD
zK|FsRcraK4Z#@7#32Og-bCuigm75)XYy@MT=b+lV71a9P4W0^q3e<Xi6BNJv8;FRE
z7Ci$Q0bU4-Pwxfa3jPx){=ey&PX4_P)cEfL7lZeKl4qX>VYTS%p!nkOEsp=!fy>GF
zKtyeH2dH)Z8mMyr4vHVog6Kp~&j!x~YvAGFEgo+J)!)0pCxdr`+SgBk;>-W=SlQ;r
zk%F4v+dxPu`XIOq{3$5D+YAv_z&k;W`zs(U9xWbo^BDzIZw!16_<9glj~)Tl?%7vI
z5&xpg`11?!R&W(~^A5M4p9FW3|2jAfu7D^-pI3v*PlHRqTfw8iw}4aN2SB=rj-&FS
zU<#^U4jv7@0#v=*K&{U^J$?{WJNJ3~GN|?ZE_fXHFsOBV)Z<|+hT3@wco=vFcni1+
z90KnJMJL|}MW4R{)&6lT-VxvsC^|SF)c$S<)z2RASnv-(jrSekGVsIx{ez(B_D7(`
zfATfX9$5~aMgAEeBpLNUwfAXI`~G!s5%_KJ1n}=c&F2>$55CrwI}TL;r+}LODp2(<
z1~s0`z!SkSQ2aCvY8*MJaxe1ua&UzFE5MV%kARxTSHUB}pMrOR2VRFx0pA0j1pX3~
zygcT5hv$MZ{JH~FKb>d0b$l79b$=ZwIr278_3s5&fq(1s2Sa@7?{rY*&jF7CF99|F
zZJ@@z3p^gY9@P4^eEyT5>VFkf```1=e+g=SM?TlB=UPzfwi8tOX;AI&0WSbw3Z4gk
z6kGxR5ELCB`#jhGC7{N)4%Gf^@%bvantTpwf8PPB{RhA^z;A=1!vmi0<n`g8+P@jp
zd_D}W1Mdgb|B@HDelG*JlAi=M&X0Kf6sUQ8*5iYq=;WV4(Zer5(bEBm%OC3T7*OkR
zGAR1k488_Tz_){sfRe+vPPp;D35?0V1H2ggtbhI+P~%=)b^V+QYQ96D_U!`jRPZYB
zDc~fi@x2Tbf4v6Oy1pHZ!M_4EpNB!!{|%^eN7lT41y3h`4yb;&gJ*y#sCm8`6hHqV
zxD@<2xD5OjD0+Mp)cBU9uKrU!t^!qm6L>ke4b=X=2GoAt4yyjUL5=?&P~-Xxco6tC
zQ1!n7s@!)$_48x!H1Ic|%AY*x#<LPUi2Qa?e7XzNeoTSdw>N^Tz&k*-`xQ{_egjmy
z4}n_OpMhGBW2W4CoeLgJek1sFa0{q@ZUR;B)!<_Ac2Mhk7byAmQSb`zFG1B?JWXBj
za&QCq``~u)Yv4w3Y3B6X6exPX9n^Rq0QZ28g6D%XH$>5m;QPT#!Bcm;b-y0mOuhx4
z0e%uxyWa&RXNT%;UDko)<adD21m6R$1%Cpb39f3mey;(?$iE7FGx$wV`*>s1#fLrw
zUP%7upw@e3&R&9-fs(rqf$H~{pw{KMmgB==Q0qGlYM!qGSAd@c&jud?w}3}6$&0|}
zf-3(eFb4k|WGSL=fRaa}Z8whV!6EXm14Zv21GNud^7t+AX!1V<wf?^b4+PhBT)P`U
z^_PNYfp>uCf%k)lfscZsgG0M+yhnkDkY598p6fx4=Xu~xa290iqX$5Z>-?UxkFE!g
zB>z3|IPekhAn>3WhlhDQ8dSe0f{VeYfs4SiL5*V-cr5sIQ0+VuJQREZDE_(uRJ|Uk
zdA=A_y_b7@mB-hDYWGc`%D)9X9DJvL{z33b<Ub0k{f~nOfcm_`f&G0ce}{Romh{(r
ze;Vl*q+>{5C+YJM(!rrJ-+xBBg`{;`!*lf`8v8uyO7e%2{*LeWk-|rF4xhjGUw#1Y
zAU#0(HR&Hncaz3RD{12s;M2iTP`vROl0HW{Fup&Z@5fN)zk}M3my<p~x`(9C?IiIr
z>>4el+*iO$NZUzIC4V9K2PDxZTN+(O`VZ2>Bz-O*9ZorY{x?Z7>@4y}k=lCbKW`6T
zz`r5w^m);wKBtiWC+TCPgrv_W9Yja^_P3HhfbV<3ll`-A^8GJK+FQkx{}I$@1L<_~
z7lDWPvU<Lcw4QV=>20Llr0{t%<zRcW+uj0xn{+PEUJIT~(&r5h++W_U@%gL4XOYC4
zcarpZF=-WLuD2X($@lm1{Y#|d_%6EpmVbx3j~*q(JlE$sQib%Vq#u+1g|yhe<E!b&
zd%<^*zDC+eTE_c#f<xe6fxk!kBhoKP`XE~EbG&b7*5?oNd1X)G`yYe<&A$^*KbLeW
z&o_ZzB#968`3urpNvlbpCh7BJ(n*v(pL8)vpR+yc`$oQh8T>EO9i&f@{*ZJ(>3bx7
zzDjxl>0FXNOGyV(ZxQMB_JnvhcnSHg&yVu`Qd0Q*315CrdNb)v(p{w2k+zZEOZp(`
z3#9)+Du4bjnQKTV($<0C2Jp|pqe=QalXMg5SIY4DebU9G4=cmxQU~^T!hgSrHh#+Y
zJ)~p#{?Fhp(mA9}<n=kn<4V52$DZu}=czneMOsbShroX&t@rib&v$*+k-q{QA$^xL
zNm86vpWH#z0FNgf!SjFe&khD(;=ljI<NpF*LmDF;LORd4^9{atNa6EFzHBBf;e8E!
zet6;WLtxc^znn57q!WBwQ#`+b?`Qb@3i974J&F8fq*wC&g{1H~jxWo3ekSQ=zW>I*
zc#g+K9?S4-GOr??Kw3*Wk)+RIr2ixxL|ZQd_4zZ>4@tL@QqpCl?~u+WJ%jWk(mK+W
zq<<s5oAheZ3fg!O+(H^Aokm`tr-94BH<3P0dJ6g5Kz$w|Ew*pY_G$U=S5W3}`TkK-
z?4Jqhq<<%!PI?#VMWpZ<;>+hqGo;V@hZWk<=REycHZ+sed+E@!IP1jCyc;Jm53*X^
zPN#bHq#dVwTJ5yc$?|3;8tSN2JH4@&wbNRhG;49A*Xdfli8M|dt?phGQaf2Q?oRV;
zPb;l<DLk3C8%cLfJmfnZq9D0i+|BhjpVZ&wxvMqQ8A<kJofXmWP-l4V$eO*zMB0uj
zm5K(iH}AFMR?_Lr=IvTETC2qylFoEJ?Z!KE`#O;){>6R|CbN1sZPO6-ZqP(D;;FQm
zwv&2X&6|_iRIi<MnY+ffxtcYnlK7f*B0e`7t@leXyQD|eW;d(4(v7q`o!2_?WRlg>
zS|uK<r%5M`tJ7(9w{_Cl+v%o_xSmhNd3&H`d&XkLjl7+*if-L(`PJuSmey%F;obiG
zz#cFqdbHKgnL?w*N~G4M8e*c&IH}b#&51d>1<)4s7~U*Xp!<9`^Nf2fJ!^OPtE^V0
z!&YVtpr*BHvaK3byd_O${NAe}?Y(a=Y3`k;vv#kZb{I&jRrkwP{vL11rv~z4?Q}BR
zV~_SmqXWx4CmT;B)!iv1v23WbES^p}@kGjmI=yNY0-o&E>wDROq&bDNH`ve<s@YBx
z==gW2*-jhz%)&L3IxW}s!YNs&+gYgnX3|LGMg}7`S)YMrfP!jin+>aJfJ^l@hd3r-
z+v&mC*RoDB0eL(|k+kVbT)|pK`ZKVg%{+dAU*+MrlXklrO(?aEAr_gPds}2Oc4Naf
zhhu?9*C)+k<P4nJ&g*F`7O%uR^mWcsxPtXO*}r5hPo0>tRf}9nx6u2wI&WFGT2G*C
zHLXMZh`qdpSP;ppH&MB^%}WU}QfhPuucvL>Cxk{VZNe?lde8PWGLi3zvq=f9cs6Mo
zr)VL>T{SPZ*t{fernC0I39mT~P$HFFs7j)Uo;&euhQR4{3&xzux_g}<_d|x)kUXLb
z5u=+?D`|Hn*i3{vQ4p=q8;xY7lk!f~6xSh2m6>Yiy;g^M30sHoVKcL-CIx6yqt{k0
zSlJ1Z$E#Zsx3uJPX*`|JdO?)*sUBIygiQfSgl0`fF(97%^))cYoyTlnBV#UY)}YgE
zXVq?K7b5l3OH5Qq-YwAD>~vP0Rs(1qq>3%YM5+qCZdT9su^<zB=c(Lo#5=U|NnKMj
z**Ry6yslVTY@t-4TidB@200cwH3{3wS$|l$qUO3u*3{NOL+IsdH*aT}vbJg#b$}Rz
zSCcl{$JB6~%%GOU=IEH3r147LhYe@=)x4fJJC%5=d+S=N<>FdnH?P~#80G$|39^<&
zaQ*FV)U)PpI`npc>j^8Mj;vZ4Pe7}))?&vtxE0C;dJCc|3{ey9)oV8SNr@FHm#`!#
zTDG-BAI7Ccd3L@dG8Tt<hAQ3}6B`2zR<C5uY$d(TX*CX--FP6ZBZD*T5Rb;&U|a-n
z*%<Khaj?t|PeS48<JXgf45bt6XYh$chL_FzEeG^zb2LV*#5*O=LfJqf$RV~1nh_yM
z>Ica%xG+xJFymgkjm3jbrMxT^$>TzZ6(r_6Yh+W?NGFq4ao$97Nd$Uj6L)fy8{Mhr
zqGmjVl^|QrZCUXx9(Q`D(|_4l_CeRGv}{1rNg=Z{>#~F)SG6sx75Tzo@NLAC?YvRE
z_1cwuH<`eeE55{mpHU3qW$4xwjZGJBNLwsw+N{Ex(T22BZD%dhCL2=tx88}xKQiF*
z9&7KpCg~eVvI{Hm^36_pIBuMl<>h3SlND?N#gHKhZ0M-E)_{_ccL`#_HA|r?GguLA
zaOQwWyf7GwhuVvwj%UAUgYoJ(ZKSa*GIpFz>_i(eCF4NgmhsE$-fWajBk5R>yOo(k
zQGpVNe0w#&c_AOzobkA3CDScq#>(LMH@ato!?%YThaQ`G=;e{4%jvY<S{iL^R@-~s
zo@{L57odi_q8Q^QRrKSkP;$Q4V!&3?L?*lUy|zT5dX)*&7lomj_&QiXyN>q~Y;=s&
zc-M|CE7_@Py;oCZr<mb|jqNsDSaakOZQR2cu;HUkm>%{g9(PW~^3B^e$9jtYB%uB7
zw0#R-H2Sfms|NI3Su=4YeEkE=mQ5lYDw?6O-WeLvmEJoF3f7qySDJMYU4<f!uF7dd
ze>&0T;RZ5V#w`TqRM1N79=s3Di^&*?X3bWw8<iDqydkgl8b}w{`oJr=zt<YMCfg^k
z&b^t%Bg1XTni1S#6KP=ZCsXWLFcYOtS}l|yE8E46mNbIdP{b<PwgKYRI^kD!qKy%o
z-y1iQW)FtiE7e}blWPY`swU{vl`<*pO<s6Pp@oTdK8q6-TB<~wo5p)4{j~Lgd7-XJ
zZ58ckO*(0Pa%E8n%d@Fr%iTrOr&w(w$Ew*##pu@1cr`~Td&9;&28LGn#+#eYvk&an
z#YA_^&}!#185Bwj!TEOvPCQ>324YL;O$^419pE&x8&VG;F|cQQk;I*xDGWQKJy<Uy
z3unI-2CUS24UbQz<s32LRBz!-yHYUeyv4MV7#sC`Hf$Cv*KPOAX(f!|;|#0M=+w%z
zHgw(@So*e~&hJ%pVd&g5I?&jN<bI946amf}0jhW<+OlDE3?Ya;gs)?nl1{L^V>0({
zmk2_7DIV=&hGGe&r5D>LZqNp<uVY|GTQXU!DOAQTLe4B#!hY|`8oh?}<xmg1dsgMJ
zZs0wLlmU99E`lZCi76cPnY3QyOc{k&xD1MZIOgFmd1d5D^xfvA(bi-)CZx92j7kw7
z>%lx`n2N}Fww+0W$y`Odh>|POR*Qke+whbKT;#Km7Y1cEDTBckLhk4h7N{e`VDk+;
z3=XL;h)R;8c7YW~KZ!N0R(MIvbDMEb=d^?PoA&*5K<Uvzt1WN|wQKooa~5&)xCMKy
zQZdyMoy}?2oORbDA(n;So87W4naQS{2$Xp!&1$w#><k$_GZRo>=JXOqZ$co14OA|0
zs5NU#+23eMIE$D_&DS`?F8iR$6^eLHvwOPHwuLR_!b*-eASNU(oar@Z%(A#$2+9W*
z6oM*?k;~PISDtuYX0AeVdg4q(Udu9&H-HUQQE}&aI-81Trs&FnEJ7w`&IM~Y+K!L$
zMAlN}=3kEOO=lA`7D(S@b{C6lI-^E2uQ9yB;&$Gq95IV~Lc5{KO0-=;ooEcUw?EGD
z(Y)qlE6Qh0M<zv#C2044FrpKczQ<_MC<G<*mf7$naak;B+-YXWdW%zp@~CB&(KNSK
zSEL{r;#(sy;-!Q_Br-$itY&baX5};##(pIZF%EX;cZrSq?irEkMp;zttg|~_e%1<N
z6^PANJ*lSC=6;&#!6wwIFtxW!2ua3RI^qwU?M&8fym?r|ug@lXjofIYs082Q9uUCM
z{w9;fiZ~+&KUg*bi;}ll=aRi#`d*T-5KISCo~`W{o#(ZU+cf{6fud?N(T+hwi@YK|
z9ts=XJ?+bq@Ls}24$~%_p8enMZ^!#~O#YO<%PRNTIr|<YQon#_Wl3$hTBx|DS@pjD
zoNVBXQV+om@D<8xrTl2VFxL)uh7qsFm?ET2*j_8;&ovYZflQ%tJAMe_b4PI5!xyKu
z3cqnckcL3>6DsRH(I-;2?SsihS<@6n&a``xn-fnho)3uc@KhUD4r{^Z80v^C)A`;+
zMA~+7iw2`@71gwe8gUnzk$2{XrEkH{w#UWr^(Oe#dZTIx3=F98tG7Ua-pd}BhZ}qk
z%gAjg^T4<>(j$9m7RaE7%5xb(SY)NsoK1Ev6OCI`%mYqGgFsry88y}Hk?|dNHL4rq
zaI!D8kR39CFacdll7r)ET?QNiN8~JRw?Lp*McXr(ylAAcTq3?G7}n<tmzRkrQ;*5<
zSGJj%e(t4~0yd{1^s^74z);QxjK+6oE!AW8UG_5?&k5)YB!#ssvpmIm%k>ovg<Xdw
zrx$8hc3d=$6Q;j}D|py9+?=x+?WCMn(qrvhwrlxO9b3}!W(6Z#{i%`0BvGx+EXxTE
zLxElE$dg>VVl9+IAuYsYwx@sgNW+SOY6{)7(?ZbuI>Eq>jpFIi1wcCrk@`tWhq>3L
zgVWfC>NeK35+s+kfwe2e7J3|h_VCJh__@RK8HU#ky9&fldkwku=3%>G;%q+F$*PvI
zutk2yb+TnLFA@T%D#EFVt%AR1&k;Pb2*Mf@TPupvHZAsJGVS7LlnxwS08AsJQAxw{
zS?_FHPM`&<BrcoK3+}R;zc1cQQ}~6J8G=7WrUJ^i(?x4a_1aSR515G!_+t!+oc?GS
z@^lTy%hL++uQQiV=K0!*q`hJ}f7X&&p`{NG!=zm8-){N+s6Ax@5^1e)=vmchu;cQ{
zNvEwuH(EOEhVluhKisLggV4bGt|`^UzctSDE2Vf3bOOb@P(KXg0s-WmQ{_V$T1Z!C
zn$U{vndkOEHa7SEOBkzGYa<+kR4CE)LhMHfQ`;RpOa@~PWL*xV>ZG`%ZV=@GlsOZx
z+Z~Zm+H)!9oMsi~v48zA0Y54mLb-jZ`8f{}LuIi6=LTVc=pcm6dt-J+fyZgl%5H`n
zQxwH)jU2LScmDsh>SmZbN4_dY-VH{=E=V3x4?E+c5T%`QbwkMJarSAxVmJ2E_TC`d
z>a_#{HXUVC4U}fad!17yII-J<Ax$mxM_Dw|$eWp$mD;6#BU}~0e0Q@@000(uPS!kA
z8sHChgy5EGNJ!r`P<R34!_eowYY_T}z3H+<Y6P#aRtPOP(d*@qo%mS@&&1G_#8kzi
zu8jnX+YQ66SwJ*g@jzeqtGK?f-+z1lX{i<yWp>sITxiFI&R&EzeRvSFAEiYp%>{y-
zOVdH|C}7PAxh%i1JVldQd@{Yd-MDGynuH5F+W{Y=5c4U_Kwynyy(#Xy*q|)3hX|3m
z6*zF<Mc{r-#GP#pRt!TJsH9nh7iH=-g<fLW631HoUNeK}ydL&J+|Z6I02#+MI}+7`
ziI)m0Ri|@FU6kdTa~rXrso`WDM9h9PA<7=g&sj~Z7JQ*lnoYQ!618NN%VI9IP&@(-
zU(w7Z*?G>1ac7NTpHSs}vy+Kv^X=@>j&8JBOvFggOY?rr5~rYpIlac!@<Wre!Dwsc
z!z62U?)(1vlD*FDTtoi2j7g1_WpN=fjev}gni(BV)$<8%2U*NfmX3@>Hm`q3v}<#`
zA)V+=MZ5fIOCBy8%q3#3cy%bXyQyeci2(2vLd+$|?pjeU?0o5sU2ZYQ6fZT}<+5@d
z%HOT87A<FJY9iTClorhUVk@0lX*a0Y^-d4pM*GUd8iY@(-XC%N&PHkam1tMH9_<o~
z5)znhB<<an6Up_rs?H^ho)6Hnj)WTE=X4K)P<S9{zIiHkvqrj4R3LhW3vEQ)so*iI
zCKATA_lIq<PT$mt`FMIMC26HpHc(t&a0c<=Vx_hb&k}V)`PZa%?uJ>!wj5!b|M}AB
z8eI(Ir~~Jrrd1p;lAT!?{KH`6YT|CwmlJg-8dF;lSNqO(MQzfMksd3ngEu&%(LfNm
zJ9LT&<v9yKzH@ZP&YfGvMW@n~<F;774hH2wEfs2p1?@E#C>31?1C)+XWi*fYuv1?H
zn9?Xkw%H{)MARKdZ1iQg1-kmdV}|6^m?W;}YMoHAVfbm1CH=DEf<`L(%sLI-xF`bc
zu&AO>L4GLwUY+KsNozKnu`IrTI+t&uAR-Kk(9W6_jj<iC_feuPo;nAg?)0P=Arm5G
zTg7!%@nXMXM&BaG<qN(xhhpK{oBOvH7cO*7(r!Y$^A(VeTC_=vKF<j3<u>*@@*|gZ
zvk2G61iHJPrDa**wKmpX%iXs4aYY_`rJLvVZq{04t~j#G%f-kE%Lqn|oUH9c2nZi|
zt=y0kwB(A_qH9M+IrE<P)pZNMlG#3gB~gvV2xLwBQ}+skXe_$IpDivQ;+!`~%!>42
z#gjeMwa69-;ZRMZF6KPT;obC+&9xCP4%P$@{u*6vjhCy=iX}Tz*)bzqJ5yP0<ci)@
zXJlu-2F)|GF0+fUmApN*WNiD+5xe_BUn3h3U~A%YSFOHaWYu{itIvy9pTFjU3(j7(
zdetflj_gQhGD)BL%dK|hwh*};*@>mrsq4nV8brR1CQ&zyUb`1xTC;4WX4!R9L~QC%
zZsW2gfy&n){GY#hXOSP-nI?@j@s`nTSMD0Ua$|hymM!b*nFfE^lC7J!ZtO3@>dLAm
z>z%e6k&InqGW;B*dDgr{N`zzC?%G{DH;r7>FQ<{RFC!Z{d)0CMn)srLth;2a&c)&S
z$R;+5Th7gvWjkxny@WWl-mG2TjF+yBSFgBaNz}iBjpT|y_s4OsIZPCTE!Aqto|?+J
ziJf{C8$seK$WGu_cOVen^zv>VUeH1le@#Tf63Pu@-Mj4Fepjy(-MOx1cJrDl1iNVt
zCF<{87sH9Ua-Fulj?Z=TT9*pKm1~^DUUMpopG7a6#@6deDS$j0-Y)c9Zg)FZ<ZOM?
zn8=ct>Otxy`)mRHjci>v8=%x^XOFm9oas^)i?7$nR#{|KU$bb4VhC9*r%A?vOM`Y{
zr|~RpVKXz5sjh2cX(Nec4h?iA#{j>W$q+dTK@yEF!$$O@s3wgTgJ9`RKwwkmbeK;}
z)OCtSJ&Xy=eT7nJ#k2_{K<%S1w7oS516xZA!0p7eT}^0gs-9tfYfdWFB(C7rrx~cj
z>wA=DLL?&TR5K$L2qHn{7^QSF5r_h=X2)}L!gtPk+4gj^83s4%E*sgJ>l8R1cpyUr
zqe-@By*`XQ*6nRq)|b<*;?m+rSNPk*`)^CQf#V|Yx~I;yg>DyfhWS5UJ&Py*mUY@$
zgA0>SywX(mxjW%4QG-UbO}3IYcHt?BSNdC#>-dg44D*nrqan`ga&BrHJ;{vI1=hk4
z^~N~&Npa8T4tl{l$;A8>HaBZo3ZWJ2YOCK#oBLo^A0RDV>vog%6ODFetvt+nf$Q9x
z8}2#>YTA<%J|=EeJ#IsEdAQ$g-v`%~>oBFd9L7OW3)N&X!*&c-V{3Z~fG^Nvsop?u
zVH=)Ez0qcqI2}>}A>c{AJn(ut6=p00QF~s<9WjWx{q9~kOiN%el{m120=?Fhab+bt
z^OiA`_!ge^OskP1Uo}HtOyZoqLr-u~oXI06f(<iYtGeu`;Y);}6pZ~DCPGU5hcWMH
zfi*OKq@N&SkgnWP{@k6&X1LupM~(EC+z&{hQO6)on%jjGNw18H)x8!{QHo_sht%i?
zPZ$2mF%lD>A#0=KxCdi18<2WWuqNW%IoeJn6<M|d-YrQ{7Pe3lh-YY)Q+Rv<U9B1L
zh5AioHsZ_{kolu+5aD?4igegPuTh`HjwF>u0A6I%vzz}MbrSU(zmcnDbdYs&%nOcz
z(E*GlNNO$XJmX>zNxTE0=4Oi>XIp2o+0<vD9-O{Qxb{|NH66rg5?TzAhU-2Nc@XeR
z*l)BWhv1L`o{n~xa0ng~76)YFhG-hfsbAgU(X>1G-kHQuaiQFHw}v0y>PdxF;>}Ju
zW~P{A<49vDK4qj->P$jKyW%Yz#|0GSCM!{B2FCSrH+Vlj(OXcxE78@~19}Rv;sz`W
z2lK*{7*<0u>>xT(g4^g%d=*xtKPd|i#;CqQEw>@Co|};i|CrX8PexF=bT!;xGPf?B
z5o3nOU=O8rB^)7R8^$-j=VWCe6&uP00kOmAD+!OESoIx}*{;eq#7rKS9_%*+35H_e
za7UlzD)H44Z~f7VgwU^kOJO|ii>~~6`n4_UZ-o<grH!b>8;9eP(s7EfO?~Yg`~oc*
zz4i$bqqcmR+_t7`vOFsptNpzcZ*eiyDMK@CQH5QpGncWyv3Wj8<T6M_RiS_XVAQlb
zCS4NY86|dW9KI@8vv_FcMUgX=TjVxm?%Mc1Zk*etamVpnwRkc`xenY-wARKf{Y8So
z;0B!e*qdsIa;)Cva2oo+k(pgT3i?Qb+0<7R*2gaJnwYpw3v)G28l`*WY*b+@`)lN8
zd$8?pT>G0e?q0c-l4;;A<e?5LjNz2jXVf1uMrJ1Bw8?z8It7&kD(^pVdr-Xh#9cDj
zidS^CAdf&3{U)Kn8Iug<hd~GoJTpUvC!?P19%IhF$l!$g_4?~zCRr=*w$lk6mO7_S
zIv`yN|7BfV_jWRwC0x+O-^(!aB?GvhA&L~|h2dixEl`5aWGhe{1p|9<n&^sZ-G})_
zP1er#?Q`b6Ukju)UM<Y&i=Z$PcRStGyu>z_)H_H`e#79X(3}H{3Z>CT-N9<+x==pn
zg1Vl>+)`hmJ82mI(4$CiZqA*b+l6#G_O^xz2mcJt;*vUzd#lE8`?P+ERyGG>e``IB
zt~7NVjrU}-5dp*Q?q66}Xhep%Ur_Ia=`Owu<y5?F>uwj;nRK`~?2NVn<AJ5s5rTI^
zuk2+tB*373;mRvAh_7Y$PTUl8A25c$o%e<Xqm%HJh`d1p3AfiN$o0Y=_XTx!tGnvv
zNQo%?6?XKhTr7E)EiTFiH<F9Ry1w3O>1wZQ!oMo&NvHZ->>`*#c+d|nCvw3H5idPf
zB5u&PW{hh~IfQ2UM6-H^Y(#^XhKNUO9u~G#h$qCdFS;4x7SF@@f<+HJEHBG$sB^2N
z{5~*h>3w-SY#j-UuqWnEg)<qMf86<k_Ctx1RtaieMw0iIP+SOHG!=}8e3hlJpxUm)
z<5-NuZj5SNE!N;MYS7D6&+QFsg=N_jVM)YGKMs|zsvE_*yXvK|K$9pUjH2u6ta*w4
zrab-45MF`c=DD?A)=LVqI|j=w;2w<@UZOa|w3XjBD_Xv?9+zL(^>uEG5g#$xZt+qh
z39SN#JsMLi#jU0`zsQipw+S?yVHV~9F>K+i8j;0PWa1XL`P9_+T}VTCONvdBM3JOX
zne-U~sG7OgbDU^|YKZ>mSVQtzaaJZLc1$J|hB9+sM>o#y*LfNR6o(IND*Co-?z!Fe
zQ2$Um<}5O$P(T!t?@hkP_&q)ID{Swp54_m#sgLyaDc4+NBjIwu#5Yc9^#6Q~^q&>-
z*41&{XVExxuQhyZZ7JIyQEjC#&VRdF7|wNhy{;z$0iTeCQXl40omqY*x6GM1z9j4Y
z*yTizk-IAIDtbfBdB%lF7nM!eBB0|`Vh}G-RAIteTas0ruqy;)el|N?@-m&>!nzH{
zuUyem$3A)l6RW$vZy{*~am-jW!2K@;7-`-GSx~TqDrN<HiKYvrwlPlT?&oCmV~c3|
zvSeV!WkJamdy{Ix7?L%I<ECJPSHHF3?u22wAdjC$#hG*R+vr8knr2tH!!k*w2xSV3
z@x!{8182q7%%oLRQr~NMtj+1Ku&Xt=#@@~37Ng818Oxl6V6hOVf%(lvL<>#17=WK=
z&?xPsMl81Q%bmJ2AJ>QY{PlYerbpbY@uJ7<fN1a;u7^E!v^o}|=wsg4fk92^*lm4D
zA4FBlLb|5Sr68olF?i4owur@!NCft6x~A5|beLVwM;T4ZB{sWW(>CIJy!iQCr(#an
z+&LI*%oB{82WN$=uNEWYzYwS+YH7elz>yKM8L@A3ySQ($8{B(an>4-wTa;gig)liM
zBNir~PA#|w7dG%12v=E*LJnp)*>{2EzQb9|u`TMugyN-v`W@7=DGRx}i~9-oVBw7P
zzk06sCRGu&E*0?hV_`!TwwL)iY~P@~peE`{`#Qe?8sUs0H?n|5JXTJsUX(o8z`o8U
zt(j-tmqfmyc!!Gy;AmiGSjXXwadXj;`TKH{!t2LT5JfrHy%dsNBXJH#xuM{Ml%EBb
zEA_YE0K7U4<MGV8U;MFut)HL;F;1?rqkG2Oy?)MIARPD1-S969V!t*_MG?8gsqEm@
z?kDR9O4-T8Tx~E=qU~b@g9KnAFZ646EgTW@p}vLATP|ScPb9*tLP@y?gi%vp9l<53
zh8=Ep2|Ph`q}m%4`h+p7J!n=oj|}v1onI0ra}f~Rhsf=QJAd&RH=*3;ie+*SpxF8E
z^yBTv7$7eE%*}n}7h)R!y3bzj0q&+8B<#4dLiVS75&K_F++T}>aJ3(!omiHgsv#$h
zaIh!cb0+TXzfu5&Ser_RJN-`HVz?Hh>sHdKNDI#+p)H2sZ}#uY+=+vaGhu6)bz2HE
zSl&!u?F(kG{bBQmdZBbF!qX3LifdRk>E*hX03Jrvq2BCv|J68v)g02rZq!9<ECZ;&
z4HTji#}IqA+eMVhy>Q<5xV$4-gf5osS#4Y*qCw=L9^)QMZRXx&&?5p&MRtowzaQSR
zTdhpXiFR#oVOz<iqG;F!t$oJ&;$U*=Y{7FzQ(1QEO<ksJ)_4mS+v=IVldCk0wy>Yo
z>H?-FudW+ho>Y9pN3}}I5re+4{x#%*#tI8X5~9`n+&vn$@0uxi&6KT)`5i#)eh9!{
z{SJVcxCL|$hP$82`IZILF+*4<R=$6N|JY~#{6u$far;)(Z?nLDRQ5yJVn!GlwvysP
z9gMqQ32^&C&dLhM|A9tKp6kRyw-TJtz$H@n$Zi`LkCdjaKFX7HM8{2c$W9>*mQvB9
z{#um_7ml`B0dv;Jhzk?ben+6w2AyX1o8;F5dmit{0`ZCkI-b+j-0K&c%%c;-_9<I;
zi8XnPl-WSg@>;YKq0Kp+hbiZr&J*6{zkJYMxX^-c2V*1z$rK6V`lI|{AFM@IxVsBF
znkjr#-H6bCfH1}4>VIOe+w`gv$R^q{-2bJ(K=_YeJgA@-hx_yJe&-*-H81>mCtJ){
zZsM*ZA><Xf19WPaE)Mk9(6+e5`TYsVICQ@t=(kc#qi8@o83cekUM#w_sYtr0r9uK3
zr5bB8P#s3}MMe0*z&@;Qg&Zupj<9Vb&P%-np*2slws<CX9-}QEH3`2DP<U{zpz0r?
zDC*$1#4dPY%DCG%#R@q6IrngC{$l)30Zcld^1`sxaG%tS2;9#CShvz|1^Nq>agytV
zfC$nD_bBXtG++w4)SxI-;kDACUT_af6P1hT2V~NC@Jfpl=4EbEaEVi9d^#7eV>^md
zNKrC6x$P~vzL$w>wq^b+R`QGx@e1RZbLD?n;4UU0_3XdK(tq&+PrBd`a=;%^xA8*;
z4yMZEY$@Qu;>dt-RddO7U9od2xHRd<+0=eDFM`xin50FRr1(+pAr6ea)6<a;#zOG8
z_vZywtY9{V+Z3gRE8@<Q=bR%GTSG{>z}}p-SBx5UoAR3*4S-@$2_it3QiEk1gphuE
zP&}lJO}n_EWNIN)@v{>Hb`|$!_+i2Wa=75{1uP6F6}V$OljCBF-v-_N$cHaCY#ZEz
z$KV(fZO+dgth1k_Wbins3Ii5|fhfm3XDYa&3Sqj?3|82#rsCkbC007VQ%uFJzeS0)
z2>LIjD8yz#wPj0~xfRac)$aJU*hYR+OC6n+vIa(%@CoX}!q0FMx6EbwuZes`KWgp%
zw7m7=L~{Q3rDIAf(7)GWl&@g0$gem)Q#OPxHJ4$N9Co{X?zJeSj5EME8#C@kq$rxA
z!%=>Yz<CwaH%X9&sDj%{cHHh%vUD;9kv|IF*foaYw#yu;X*cDsSm<OOEsF#rvMh^x
zM-VN=v!uAx<xh%7?Vy&mc0SZ#R))O0_Na508{Ix}z@d$2PhF%agfnnj6D5cMI(NTW
zaFGr7D}_;A*Wn%iDHQi?!}92kiaY2g6mGXGxjDhF6~cD2g0KNj3F5*V$XI18FK0>K
zh_H(Au_q8N4@#WyV+0)xtF}0r@;r&Q>MEu&s0()3UiQc0&vtpx7uk*}{dO66$H{M%
zGqcM5dns1_NdwmgQ~l2kER5n{<)G%$g<dV?wv>3$EVpjXLEnJxVUVaSyAosUQu_Tu
zxC+apI~l(OAY2uG<$&{7)#Sut{hu!QUoL2|#CPU=*_p1l7%_nCmk-V^$z!P2ZH#et
z`5luZc9C$V;9@<6I<cK7OhD;T91ukcIA4cv3em^{L9O1#WRJPmrC%S|o)v{`9D_$#
zRB{4F7cES+;9w!WG$$wZCpDRp=!cWt=^*OX(cF4}3K?xGQBVkvMW)LgC%gabjA*9$
z754w+h2IHae={pCClN2}ACTx0o^f{RnJtEU=zZ@Yf1lq@Um`DpB4!YojLV`?U4XvU
b!F7>r<VcDc`!O20Z?FA{xam<y^638oOyQ)?

delta 8046
zcmZwL34B!5y}<D^5W*6|z63(x5>|mEgvCH)Nk{@j60$&$ATF1go8-b|ZkU;%P+;7b
z=M%*vin|CZu2iPAwLo1c;(|N`6hzA_SVYC;Rjl%`weR<zdjr_dJ0Je@J?G5abI%^z
zH@@~g`I;|wv|G|TMe6EPsvmA@r<6l}R9C50>hoSo^~Eo+2PXAaDh>N!7aW7BScDO*
z!W7(vo$-C_hR3iCevh5-EKXD^rrOgQ8C8Tsa1{>1jhKPEF$qt2-+zf6DR=4Pnt^R8
zkMJCW(xH4Djx+HhT#6&{A<x~|llQCBWODeTJ;N-(iCBm$Fdes}G;|mzp^wT-a0<$c
zR-laZHk^&?@pC+h((XQ{m26@(mC%n-$p9O%C+}Bl$qdA&QKs%~yaqo&3(Nb{IgF!B
z<qo7TY9Go>oI>fy8I+DB4{&F$7fN{?vZ|^WyJI=Z?@f$J#vzl9t56zz9;G9%;BwrB
zESH*UxZhvq89=s$T8e}5Hlz>g1>_O62W#*vl=n<yl+uw(lqIbl$oxygS5hG(T;~1Y
zI+RUvJIW?o@6|tp$&|OEH28{F-i^}WUe5z4o9!^lnjb}0S#`*CXKpY`d1_|NouXPQ
z7E)oOjNna_18@TQr+(x^)~qidB{&7;#N33^k^2}v`%-N}nUNhR^#@UA^f=0ZzD4QS
z&nN>)iVbnsGzG^|(cdf2@vK8RcFR%LZVk%PJmG!+B1%VJM>z!tkin{tQI_DJn1mTa
z89ipAw3CIh6tO}w!^m8UvIoK_J>P&bMO#oBcpEkD#Q-kiA(^S&D4Xmv9E(37|I~=#
z?(@|+opKP{U>v2rSCHpo>W^fkXM3?7euUD)<0vEl0o!5<hge459p!}sP)<P(a!}Nz
zn1c;oc|ESC{4&Z7H-3cs;&)Nn*@yk*{C`5`Vk&;}elUg|lT0}eWzD9bY{GJs7hQ?6
z)+;du*P;AwgXgbNj_Io?ORyhhVBaDC)K8wnMlsX8U(JyWnkc8i!Jc?4w#P?sB0h~B
z@t9ZtjaNS7*(S^Vz8lI^4?vl@Azpo!XFkeRKLca(!T=e$p;n@dd_AV(V<?;Q1(c2)
zM<z*qg)*YvY#8~yfikjTC@-FavMFo5@0Xy=NEl`5ZpLC<m(Bc3<_HzEsRposL$MrX
zGeuE)x*6qnyHJi}htZr}%tD#sMwGpBC(4EM1m@!zl=jBvDn(W;KxyX=T!H&?ng2pE
zv&OJN@J{TEJ5f4t0A&-krEo9ag0d9pOpEM+8k7!%um`R|>DWdz@KdDEDv8GBRE$Fz
zz(Op?Sd0w+)O&nLL#^3~a;yfSOz|}22&-8r4J<`DmJeVjjAIJE;g$DdYs!DdR6K?g
z@LOb()$lxbMlVBYKNck;Yqknys%}KtG|ysh+={*M9lQjO;YQ4$)t>me=OL7if9=_k
zX&Ov<BpO(WvXo0b*C6kSsprT@PvR(>X}kM{+Ub?w^~(Fb@)5kjM@LW^4A3hX>Gdeb
z^DdN*zkuCv7v7AAQBKd5licIH1pCVQUr9zrd_T&RK8DPedJ$QEbpnTD+GMv}h%&M$
zO2;2SnYkxWUhuZ(hbZlS>Uj#Kqo<L+DBl#`!~4}_$zT+jUG*GF&p$=kwLf4D4r6D{
z!&NAI;vjPL)mfD1h84J*^D2~qJb=>9W~{<(cm`A1@zQScH0Hk#nLILcu?mObQz&b`
z*DIgE4wO@il&Z%xl#X17axWZ0`Ta5Mif2%M-+{9xGt$#D6T48(@hm82{$&cQsOW(U
zP^QT7T!k{SJ5U<jiL%@G;vIMdWdL<0Zo}81jC?K1--gFgj^8#Mh^KG_rcPI?6emoN
zxi7wfio_nkB))hIWkj1$I<(F6ZA_+o2<7)jQ3miC%5&eM%)s}UjL9?H8AwI>zOUy1
z%%VIvMn*<Zjp-P~OuP-{B6<$1aT}&#r<v|Zhv5Lq6Flc5lcBCfgVV7CW$KSI%>H-^
z<@pYmy6p}^naS8#GO~tKQF>g8($h+mC8<G~s>LYh{WmBx^A1Xb$GrNpC>`!H%l-3h
zpse*cly*z-A}qsUxD0tuOg%~_g^G<R4R7(vZz9*U+K(eJsmy&r4i2U~729C|w_qc#
z#Ef$HMGvBM_)l1XM^LWx^x19)DzIG6|21T!hr2xYV0X#~FcnXtyy)*JGx9UaQgyFz
z_dpKH_j#TLC>KyE$|f{13s-ve&*B=&Z{TCRUsYAQSMcAk1LYr4*0vRgb^>Oi)L)Km
zu?{<92)p8H%)q-*_R@<e9e)dD2|n~ZiJd5)L7Bm}Y^<0xIEsu^j6(x!u_LZPdC{#X
zQ+dDV3n<U+#Hsi$reMk(x1+sLp3g+-NDfLzCSx0%jq?25In2NOa3K})A{%A5E=PG_
zJ<4f#24#x(U|0MAWlB$a^*y=0MpN#O(q0A1k}gEKKl~^!eh8&Q8&Ep1WiIpIjm+<;
zkg0hG*>CD2<gQRdxOd0k63oR%kv|7&ANIu5dG6^LgffGTD9_!4vi65jI(!=Gt7>zZ
z`+O}9rF>tEjP!g5R^m5!KTe&`|02dicrm8ex(!t$e-2atSK~%}5;GULd*v<cLD_e?
z+ksvv1I)z&EJoQ|H=_(F_9PiOmxpj9`WA9VF$-n$tw4Dojs_mUH2fZ=W2slTe~gN;
zJLSbFGr8LHPLvsV7+d3uXy8_){g^sHM$UJ~E8X*%hq9TLpse9FC>>mlvIjP!Ozlf3
z9od6J@C4qBDOb6BX)Vf3Y``}7vgdY`_TRv^ic#++lSIXbC@=gN<+vS3*-T%fY?iaw
z9$Q`QmOG;Sz6VNuI{NT?LOS}iHv4vu-AL{_f``>w;%~$^#4$n^ZVw?z=0=ii&n3iP
zr9isGMWxboKk}`-^51b4@f`7c;(6i`q9w`k$&>k&^l{?T{a6FPA!KOdh+7CrOrJVJ
z+)6Aanh8mt5L*&C{?i7x5x@1yQ}8E3w)P>fZkOk$nB-$iyiDd*B2L)Eu*AIl7dc7q
z5X*_Th&GJzUzktqCQ@WNNuLva2sw!|(~@LqW&g=mI7&#`;BxMBD7n?=O76khPI*Yn
zyvTR5)a`kZj~Ge*YvLd=o4AaSR78A8go%F=a##JCI86KpF@lgi)slYpGJEk_Vx3oB
zigIs_^43NDk-{{h6Cr6mkxn!bo$1hB_#z=2SW;W+%H3?@vysm`E+|X(KCdi$`Ufw6
zFB*jQ%4M=Io*;G*lZnfTMZ^b0Cb5x_G@S?#|4GOpNFz280|`lTcfCurqhqh&RH7yQ
zip)OZe~62SuLwz%L~Je}t$9e&gT!rw+!K-p5W|Vjq(ItA{C6V9F~{-5Ltc51XDiyu
z_VTyme4>u9i2o%deMEHPcO8Aq|11in#NC9X4ty~dUr&^{!f_Ju2O>m#K}b4HEF=yP
zHxpkHHxQB{#BriKQBMSkUlT3qVKU2zTv`7g$xI~r6TOI*luSpey~20+43R-36K@dz
zAkGkX5<Q6v)8iE0BVO_<ukb9v-w_LlF0|jW|I|(7cM_+F3gTJ9A@&oS2}y&AtBEQ?
z5`90H-Y54bq8nine<38j;G&}Vn3r$BvtB+{L#CEENyz_`_O18DJba2Mlrr@*;Q`_r
z;!&a{%^<UqC?*Ps2}ExqhmiCp@fzVLE+wufB&~4qDc!r@V!gFrRG-e+tAFZWrPmIa
zo@_=eqj+}wg8}#Yx|xB1VTPP&gB3RF>|oRi>#GL79REvZRjYW>kjH(U&8U?VwHqxX
z5)Ip-di`E{dTV1yL?0WvPHz}is;?eCG`@CtAD@2hqN21)!wDM=P9z#Kc_Qi<5z7qw
z8?v=;#0>q#h*g~<Q8O5{0!FzLXbxHt?H^e>Ews!G+5scFyvZ`^?PXRd+b9k3!;s%H
zoI0bJ9?X>v&~)J6dSh7EHd+2?eDlb@zIN4C#Ay!uEq!9t7+sTfaCD^^ZBXu;3_D^3
z?1;IDmtRn2g)Xeod$P~O$^vE+-3~9a!V#m+X$}PpCuBq$qyeYVwCP=~(`@)nD#ObY
zW26gq-SWh^nahCD<b<P%jQqf?=b2H``NhqVs1aFWH@U4vqE=JlSAHi{XV*7}nXm?{
ztM_iB(F`>+SIe{GujMT9>HOS2LmKFT6){*X#%)KUN(Lw+lbWz)24pb0A~!pS2E&cg
z9Mz2u^Q$U@mMnYXUBCQ_IgUqi_xp6s*wuRcxD0*ExZC3S<9GOyqfr(-qU-Wj=y?;y
z>v@yA=%k4c#n0s5=+pZrjijQR&Le)x>!`CQKamt<>h!_MWBVi~j2)Ah7@Oq|w=7M?
zl)Lr4>0R`gDH%y>ZiA)Qrgzu3=QrrXQyy%0?pNRDWyKq(e&f?y3LlO?G_AES?i8o`
z^rt0hdVR^0+1^5`a|`M&qiR{rI@6YAZfx0OGeYK=tlV59cYOZ1ypf}GN007MS&>z3
zEwdxG6UveemT%OS6jo=IS7a3z8Z#^M%S%TtsF+>Sq0Ed#v*w1)P$XzZop8P}y{4?p
zm|a+2VoWM2FDxx9C@e0nE}1h&7tGwQ?=Fq%i!Z%J-!yAwhma9z_WP|!#L;($)Ai7@
zPXAtYS6RKjynI&6aokis+}A#HNF+1cDD?aF$=R<CHJUh;W_`Wg9ICh2AI%}d3`WCF
z;-rQhRTQ-Sep7F*cs`y}wX~IfY0mX|AxmCrhHb}a3fqmQVJ@<RcGTo?x7-|ZjDTfx
zhUG*wIU!qqp#5`~wv$&m;gG36nL9bJ%=C`D$<Kp9Qx2k;QxP`VZXsjmW+P+;IUwOi
zCdM$MQI=TR)M+)F^x2vkeQMrlJ^Zq-vZiyZ&{y^<mrF<`iabIlWU1*+c!hM0Q)<`Q
z{svt)e|B0a*U0%>Bw!kTE9~c2dh7fu{Zwr*HF2hG!w$)9qB|`pE~cGCKcs7k>%`#_
zkvn7sy|*v8L(Yxq+-RD@vJs+YcD!mqrmt<a9dW`DQ{R7ifgZTf7?hoztym8$V5^dd
z-&QqzFklYS`2`LwT#~%B*@{FReRyG>Zn&c7Q07>!o5a*J*hG(+re9Xr@z1a5<BL^>
zok+xPbkuBCjx}~~AET_eu#!85<IDT(km0^TZXr8lGrl=CD{9pz2Iw6%nI-ogVzs%2
zOhZ<k7N}+#Le0)HXH;SjaiNBywh>`JO_XoF#+yv`j_d*+Y`K@@YdhG|EB9WKr>*RG
z%2n_B^p{ts<*-1^nv>WXUYAwng_W#+*pxd}rog(#%;1i)STovYYq3$C6`Vy&6>%B<
zKlMf+-p72zci|CweNj%&^J}0g!)*M3bW8X1_v^(-W!WPQiySi?P}O#$)aVNTeBC>c
zrmet?krzDdExIAc&+v1VGIPIJ;eQ0S^ed8jM^!gFLC2s$7OkaJsCQd;wq~p7xplwl
zSlZacpFmRvWb5Mk>B+_RGCN@Fd+NvNsSPvSd(yC<k7q2o-KW0`PSQDzC*0b!P_2F`
zv_^+RlUu10-L<qw4*S2E^UOkW8APlmGn^=xVOc)+hV^sN2TazNt)V|zJiHrMpByLo
zVaQG_m7eT8-KxygxlMWTzdEOVx-k5QctIr3r^hwFuTz$dDmuSk)%h&r_4aIw)YNh6
RI0NnlYpaMAv}CNN`aj}tl*Rx6

diff --git a/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.mo b/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.mo
index a1c7df9e7597b908de4a3848e2947f256bc468b7..996008522c25b75a85379c424782370ba7966a09 100644
GIT binary patch
literal 57825
zcmch=2b`Tn_5c5Xp@m+gmxn-1Lb3~i&;kUO)RmMayP*gOH@kOtuep2ga_`=R1h9b(
zR1_=vMJ!;$iUm==pr8U4EMF|3qS(Huh+R-DzxU_N%u{aJ1pNO0_w{=A^Gu&PbLPyM
zGxN+oyvLL`Mf|SZI*JYiPu?qv&U;oAoj+5)QFQOIQS@x^K5!rK$Kbx;6X5>fZpTH@
zF5ql%cW^$ae3pX;gC+0~@Ri`9;QPTHz^{Nife(NOfRBI&f&T>e1P?ggm3Jhl@|S}0
zzW`J@7lSJQ3UEj89p3#xkS0W50`~(S^7v;^<?V7p6m1J003HcW167~Z;56`jQ2D<I
zoCCfdRJuFB`QTT<)4**{r0w8Ra2|LLsPNZ-%Ku()JMbIe_Tcxt`zPN0sK-BmYS-Vv
z+2Af@BAgFGif9<5$mn|TDDb<W+PmFJ4)+9?<30pj4VJ-u!8^hI!0&?xfPVzlFT0!^
zMe5qw;Pb%&Q0@B!xGVU1Q0@9AsPY~G)s8(*arD_A+!^;N;NIXFp!#(!csO{a5B~tD
zd~OAm@4epreNgTF6)67rC#duXE^zrT099TAR5>M&8^CRFzYJ9WTn(z;*MsWs4}xm%
zonROEAb1S8-Ko?aJPCXbxDr(R8{jPP9bhkbFL(yH$7zl)o)6Bz{aR4;|1_v{zXR1j
z`}RZ;T^20@Rj(I<-Qbm=`u`K4+VNRX^|}ibpZyRNpZyY4{dYLs;ohM5<S<b2=6LsU
zKKxX0D*nqsjkmKwwR;#8oh}8H?p2`L@di-s`Y|YenYA#Az5^Z$s$M%Ta^>y`s@xcq
z|141So$JFFg6h9M@KEp~a4z^#a2EJU@DT7}Q2G1|6rHwP97W5(qd@V|Mo{(sAgKIq
z16A+)K&AU0D7yXxJQCb#33UZe2E{Km@F4KzpyJ;Ms-7PP)xURo_qRdGi=Tta|L@=w
zaQmgsy)&qE2Y7cEh`5VR0@WX<g4==1L0B^y09F3Apy>TxQ00Bj``-_$yr25;CqcS4
z+L^{H-74@1a1hiud@ZQ@d=T6o{3xh$KLd(BUjj959st#!zW}!fe+R0ZCqa$7UFh8X
z!Res#Jq_FjJRem2wV>#{4lIM0f|rAjg5sm$=Q_L?6rC;uRsL0=^1sfzKL&1#`%drv
zGB_3YcR=ygPr&WK$3WHl&!FnD4NR!~b_A8*{-EkL7gW6Y9?$Up=Y#5(BDf>C0aUqH
zfTGt`pvKWP;DO)=K=s3yLDm03Q1$p<Q1O2Us=xjW+BjS8^4%MpivKiF_2>dcrv*NI
zC8+$L2P)qU9$yA3-5bDtz;}T2z)yo}=WjsC-M@pX=bkHE{4P-KJ^|FY=>bKbI;eVX
z^zIjeHQZN%F9V+d*MgU?jH35|KLI6&u3QyGXMz6>Ho(35$P2s*d@1-Z@cgZ!=p|=T
zSKJS;j-pYp)*nSx@CV?%;28r^Gz9Lo#?fUXcrEUifvWGm6ml4NC^!vV?A@c_&bVLg
z@ok{!@qX~x;OD^@{4Tf?_yqWVaLU=P-5&-;$4`Kw+Z~|z_v@hg;aA|^;NL){-|ZaN
z&j)!t3RL=qp!$0yC_Xt0JOaD`JPLdzNLNI+f#R!e&vpE;FBs$Q0-4&Pl^(D5crQ2|
z|81V<+CLjqzpVnr7cT+lgYN*DGNK1P?suMZp9_jU*MWP2@AK}@fuiSqpxXUgQ2hH3
za5r$*^If}QQ2w()rC$Ilzt!G-5h(td02OZ&DEajoa0l@9-u-q^^tl04y!V01@3S87
z2St~kdiS3}jhF2&aPbZTkHtOL;|O>t?(0EVFS-+44DR}TC;!)guwK*v7lL2*?x`0#
z_j#b|eFLca-UN#OKLG9regqVK?gftr9|P6ThhG#$TZ2b}hk!?eYR78uU~m|e|I0ky
z<nc@3;rRaooDNPcI6giKJP>z3I0qaD#V^-`ihn<-_<sUbpZyqw%KsFw3%mdnpI!~B
z{%;4>fA0jvuOA0R?>j*C+qXdR^N&G|kH3QZgF6kn`poe7Tu|*E15W^N0=EVq29^IK
z;Ev!QLG|;$K<lp|H~tO+<$o-wbf<!%>*?TO;Q65V;l-fhy%N+ozt-d1!EJHh=-oGi
zivLMa{dPO3cH9Mue;)*=fscZs*N#Q!KNnQKr-7${z2J246`<PjVK4^o@a`Xb{5`1t
z-fGy<ZzoWEb_loxtb!xpr@;;2!8k<UH-l5a8$p%(0Z{#L3n=>B3C;r_0M#!$j5_)s
z2#OBJg9m^;;I`lep!jPD6umD2)!$cod?ToMH-h_sH-r0vcZ1@qAA$#ge*+hQ`;=V$
z&jOXt^`OfAFsSz43W_i80!82NgUauBp!#q77dW{#4HW;a0JjG(1=ap5!PCKOLGjIZ
zz~jJO);amM7*zXT3W_ebf-2{Wpz8kvQ04py6kqOKcH>|sI0N?z5D^zOK#jL=f=j^P
zfro>~jX6E@Jn$IYH-SsR2SLfrLn}_7>j!tneFZ2wydHcG_%2Z6?_N;#{+q|6s;>Sc
zpxS#QD7t<ajKQyhl3$O3v%!CX-QW@9PX9d@RQOHc(crD1^8dB>KlEZp|6{=I@LvF`
z{Y$`Izyi1vI1Z}bmxJPqt3mP64WQ!P0xI4YK*@>w!QH^eJ^mY1`rT?S{=uN~=>k<=
z54bycJ}5q{fH8O#sB|}jYX5DZ;@t)A2tEL+oS%67gU7AwZe6k`D7vfwH4Zj{UEpiM
zIpFP}^8FQfDELS4NN}$SbX9N>sPX-Na60%^@EGt9AW@^~4QK;i2ddsv*E_xcIiSj2
z1?~x63W~q40cU|Xfs4RzfV+ZwF_<-;4hPi_v%#t0F`(MJz=!vN+u%MM6kRUx{_DWK
zao0fc|Es_lybDyjeg;bZZF7m^*IA&(<w{We@)~e1csr<iJPxYdzku_>?KZmhoDLp=
zy8>z)TnDP%p8=Ks1EA>kBq+W<f0Jwf6`<(-7EtZ~BB=O}gG#^0rN~0C8$1^LE!Ynp
zb{YELR>(T=Ew~@L+^wf-FLd+n=Rl2ztzP8Xc?c-}>j9N-0Xzr19P9<Z3!VqYFLrv-
zWuV;mfdk<5mpFUCCh%<B4}z-i+?Tq1&jUr5OF{9?Yrw6+H-payuLIRTPl9`Z{{q$j
zyI<k>embb|d7%1hJ}9|;CaC<*0@eQ)g5vKHaBHv*?f|X_#V;=gmH+EN#eWZ|_TCI0
z4Bi7C2L2LMK2xuB`RolU{eGazods&#c7w2VbP}j~d<;}QZv!RI?*vuO4?X@IT#EZK
z@LAxzm$~p0K*@vCz$xG=P<%W9ivKSJMZX59db|SM3w#T>FZdzv|0VDL9Z=)@*Weq$
zr$DvubuV}H`zWY-eHj#e?g!QG?}IbJe}IRB(_i7n^>abFH-T!`4WR0GJE;2I<J~_3
z=iz=7R6P%RrE6CgsB%sQ)h|oH55u3mp!)fVSGoCQ$E#fZ4g>ece?F*u)`04_qW8Z9
zRD0e4ijQvrr-9!Dw*&tKP6eL=Ro`u|cH{amP~|NG4*|~sRsTys<^NhxbbA-LA9xG6
zBltD%{ywPme*{JMZC~y15K#PZ0=Nyh7?gZC1Kb|m1nvV~;qmR@Ox&LUmH!XHh2W!L
zFF5BluHEaw9^5YnmxA|#+k(5j*5N)L4+d54bnl++@n}%>JrV2%S9rV(JP!BG;0fSQ
z!Q;ULu5s<}2UYJOa1A&HYP{bKitdNJ&e44Vcqs1k!5DlYC_cIY><8}#)erl;-sLyV
z<7{vS{_{Y!=X~!T1b4%IHK>05FHrsZSy1`@$cJxrt>ce9K*@tHkBdO1I}cR+jo@>@
z>p_+GMNoYB7`Q9=SC8Ai!O?GTQ2lx!sPJP!@xfwH?Ys~?27HOfPl1a6D{wBjHG@sz
z^T3n9QBd@~5j-9I5jY);-{i*A67Xc)>p;bOzjr?Zo{Ib6H#>fQKB)0G42oV?gX-^V
zLDlcAp!nz(Q1R{ncLIOr@%Ny{#XrH_!EKln)W7?HN*9Cjp96|M3qZwR=CKdl8TUEh
z^T1*7Oz;b!`ghN_!pq>npwfLCR6joC-M;}<-k-odz<+?sZ`bQwyn{gXQ#W`txCT5D
zd?l#<{0yk{-v#G@KL(e9JH5^6D{DaIdky$(@ZH}18BpoI3Z4Ky0G<f${B}1#F9r9;
z{Zdf<aviAncY@02UT{C~VNmpW65Jo0`d@xt0;k}f2dX_Mf@=3t?>+}qe+`3sfn%WZ
ze<`T;T@CIFehxekd;nCre*o3)?XGunV>+nzodPZb`#{y>P2ln1$H0TYM?uwR+jqGB
z-w{;3_XYO^j{x@p7x?hAK-F&$RDLh;_%cxA=bawE2#Vhx1y%pYLFMxVSO<5#0T~Bg
z0cza*3)}_V<(&=>@;C=ndrtyYuL02L1FC*wpz?nSDE_?)RJm^fRo?ZW;(rQMzugWV
z0{#yuzWoy@|9^Vi>s^jNXM-y5I8gOl28vJ50W}|81Rekmf(L^y0#%=PfTH^?pyGcC
z6n($$!@muxoxk+>7mrik?dZ8DsCsvUinj!u2Ce~BpG!b%C#Z4s7EtwgH#iTx0~9~~
z37iH_d5;U90V=<RpxV6}JO(@;RQ+BDJ_~%4$Lqi{?(4x9gHvy0Zv?y=d>i-|@J#S^
zH#s}ZPr+B?KIXkH-RD8MyWU5gw?ZC+h^Xk84=^W#_kkneksoAD2)+ee0oHGJ^!@_)
zX58NbMaR((x%P~M&%yl$kDmp1!u^QH$3gYyQ=rDh9v^o7Jrfk4ECW9Ro(YN$a)@42
zLDBaBQ0cos@%JJy1}_A~2QLOSZeHi{BcRfM4OBgU<nb5aNw|Lto(j(Ts2hhRP~-X|
zp!)f4a60${AHLPc+&sGkl-#)->;i8E)$U(_CxAPB+>N)z;K{g4;8O6t;C%3LkF#!Z
z{XPV09M!%1)u6_~+rd4+&w--j{h;di15o_+dvI6qDNyy@@e@vN9R}`!doH*wxCq=6
zJOdOTT?p<B4tn>+pyD+^<#U<GH-e()hd`D474QFJk57Q=hh0DE)+<MVb8%k;iXPX3
ztH9g9CEyO9a_fjbupjp(a1nSvH~{YXX*W(r!6~?}2UXv9d-r=mji;NzBf)#XHQ*DV
z+PmUbKmI}W%OI%wzaCUQKkEIz0?x$!q<0_s8MmHW1*%^+fyaQK1ZRPdg2#e;+~)k3
zf!(+-1CIl524{mm1y$}YpLP9wGPn=!4WQ_I4Y&*VW>EZo6SzD05m5a8d2ny=E8w2s
zBj8@(UqH<#Q$OeUY6f^b?lZs>z$?J5!P`OQcPA)*`4*^r9tI@`{|Jh&cE8>6&s<RH
zP6kD%Q$h9L1)%D44XAN*9VmWzmv?^@RC{g(#fNuz|NB6->sz4u;~`M>`7L-j_-|0-
z>G1z{{?7#!|9nvGDS}6U*Mq9}z2HIM4?)%c@7{mEJDi@=1&Tf=g8kr1P<-@muns-}
zUIMPW)0Ovga2woz1=YTPfct^le%|F1gNH`+HK=|&8&o~2pxS>0sPNZ=YX2udg?|>@
z5xgJV4SWbxyMF_Ue*Xkj&Ng3gcnB!@f1=0p!5-W%0#5?J06rW1C#Zhh^Dal{7(5jB
zY%m5_fTC*!JPdpTI1juP6g?jURsP|3yL{$=l0zqg$AB*ZPX#{(o(BHKyN~;#lPl}N
zL-2n&7=!Nxr-Ao?hk?Ha)nB`O$?^S(;PY^gfV056K#iNneE764yYbZrF2MgPa0z%H
z*aPl%j~h3u!6~?318xgm3u?Sy2QCEf0~LSgd)@kK6?mG$LG|lH;7su6pvL3Q_qlO*
z5-9$DE+{%(2A&Ik98`bp_!US0gFw;cTu|fnI#B)aesFv6Q{evK9iY-Z2ucqB#=D;a
z#kV_u)y10)D&7)Md~^;t9UKP5zpn<j1K$OzybpN%j1RvDRQex!_v4__KkI9*KC?iD
z9}Oy>MWFa_IXD%(z=w~5s^=z;SAmirZ}a#+;DNYz`nr>Avq1IVMWFJ1Gk7@o4p8*F
z8yo?j1fK(5bibqbD?sBb@G|`W0&W0n-*EAM4XXaTf7A8T@u2wqB2eRGJvak=9jN~P
z45;?~0~9~(@-5e{XM2o6rJoHdya(I{Tn6p}uJrB;K#kWyQ2et2jKSMHJ_L%dpYnLf
zw_W`fg0t~2gWcd;LDAzLQ1tu;*bDv`JQ$qyKd%1EK;<_MY8<^06#YI47QhEVji-|y
zaP@jVD7w}_mGeGOeEeN-FYw<WA~4$PJB}{j28+1&{x0+ER?r%JAMUSx&)M}RzVGVw
z1yKFE<AbjJnV`yD0jj>^;5zUc@NDoYumbi!<i_(|pvpPu2d=-b07r5E27CcH@Iz;}
zzY|n_e-Dc9_WO~;!$GPS9SM$sb3u*o8^Arl8^PVcTfO^UQ2qA<a6j-7Q1PDvHU6T9
z9sPFzcf`3nxHWi?cgLXen*;6%o&u`B&II=b&-GXX)jwB*%IBk?^7$O7a_#`dPxpYL
z|NY=Az@K^lbw76DHBkJw5mY(Xczg?Z2JRa`<@*~@ba@<9`~C*1UH|qt<tMJ(9YFc-
z0V>@-pz_@xR6VDG^6v)aKNl1qo(R4W>;-oR@Adc)sC18kD*s7vAMja^IKDUll=}p5
z8rTO)zSTjs|Fxj%^CnRJ@itK9eiBr^w}WcWy&mrecfkDssCqsOZUySMH6C|^XW?;G
z@WlNE-cR9q6YmRo^b@a~MSR3k@>|N=0^-f*IhXe{e8`({@6YpW;y)L^FY@%@K0<Du
z9eH01p1^ZF&n%wHeA;6?2H1+YALCgQJiwj&`)BdL)W3g=_Y&`K1@&7)p8CBJ_qIHu
z;bq`%_}>Q}jC(onuK|w&8$SMLaqIUaadzT)3s3lM;-$bdLfkildw>@Zek;!halZ~c
z4!>i;sXV{sc^3Zq9mn$q+#lunH1GQmZxOf<JRkfL&rf*tyO=m9@GK*26L`7vj@}MF
z5BKYNHu64S4{?sfJ)K9t8^E8sSJSt4z<sa}>mx2=F8Zc-E7~^r>9?Iny;ljJtrvc8
z<6Y-g=J+%-h<6zNU*)+=5%_(>hw1%r!i%{7nDN`n=iP_jncjaD_#n@-y!(H_ulRSZ
zgO~gFKY<z#*MT1ff2KnCo#VsxzEXeu?;Rfh1Rg-SC-WRg+-isbGNssWDgMXsyr1XK
z_#6UW%JT`HI?o?{JVZi-*tXx#@YnA|u%EoI0l&+$2hR_9UQgKlpa$8CfJ4Fah<6+B
zqu}3gYdr4H`@>*2kA8dM{<V9J?j+8id7jG?elO(x#l+FrzmBKQ)6eq>o@+DluEu>i
z@lH@U{=WyOfGhFSZ!WkTJOz~8sASSAJp6vk%h5iK{66Ue4h3IJnmfTgd5-0IKJNE{
z`bnmJj;F%2H|byH^Zyn2KmL7p{O|SeL~Hq-htK)MIhQ!k=l!ER({K;_G}nVC;`eK?
zo9B4m!|%ns{1U$(@*KdU-$M?fFXR3(&zHSh@B!Rs^DN>0Ro?$al(n~i5AYJ=Jey}{
zo+t1;+Xsvj_hY=j8~^_W4+H-Vc7giMBz$N0n)|!0+QZYuvm?(xiGNfk#yfHE?(^6P
zF6Q|T;U^LIT5ulE2Y6n{^L4_$%2Och2~fWgo|od*??Il~_#e;H?frHIAF)v8QJ+T6
z7x4ZZo}+pHZ=Myzdmrw56v%HX?mc-l$LRM0-Zj6y*Ie*1aUbG2iATSW@Ek*&eQ|%C
z_t(jj-%oI#%JY36Pk!&>eHwT=@m~&pf#)QiGjQwoMxM9vEX7^nIfeIEljZ<$3GR}Q
zw<GRP;lGgQQ2geCV?OL9;9qb*NgVw?&HI24I|ui>c%GvGevk7!$}@-XSA#Kei@bkE
zX?XPeFP?w!{1o>;crNDsDxL>;zlCQ3@Ba<n3_b?xw+4JRxC43Z%kv}N2Y3$T{hy$I
z|0d4u;B5T<06ri5A^2ka$9Y!q{u!R#cy_`4T5vybJ@M|~{VzOIc>gedJ>Wq+AL9M@
zJbMxLUhtJXNAZN;_QaWs<Kr2>4gP%{VdwBn=lM8suE2jI?-%fV-p4tO_rDT$BzPr{
zelJ%T?>qCnpV!~<?85uWKFuY(AHn<GJTK&ZS1=~dIFEic+<)i!5zj5oD|#z9%yTaB
z?*|_tY^@I~<ELL2&qX}%;kl6TP59pkhTn&HS>oLn@_s$f44&`dcQJ8)#ru6c^LRfU
z)bAw@Z2hnw?-vpGLc$mG=(moi&ilULiQpo_-_853JZpJ>4t|5Yzm)f0p1<*~-*lem
z5%vP`Oz;lE!tYbO{FiqZdH*Eu&mzt)yw`Yc#(lXD{}*ok*7MBaIgEG{;7Y<T<$aLn
zWZXCLgx?rpNBi{Oz;iY4U*tK0_ieymfDiCo$)n%b@Oui}8$6w7h4~VX_cG5OxDNu4
z1izwpo+{-Y!t)#6!|yHO1-y&+d-CXa5%Kh!@K^)S!u>Gezw>c^4(^BlEAa2(c{A>r
zpnkjYzQL#M^(g<_@DINm!wYyYah4JG_Dr~f59j%u_xl$(!@pmH|8IDYN%s-&_ic}l
zg1=N^|2q>L@?i@ybs5EPl&~xC+n)D6-meB<3BG}+!K2?QpXMgQ-obM!?s?!-JlWqn
zalDM@Y#)C;;jiIYoryG4Zo(DixTf^m;`bi>hQKSq+j*Yn)BfD!H2gl#`!b$h@Ap!V
z0Var}-v_}m*Z}wOek0&%JcB&n;W^b}qJ!}MP2L{|&*0JTH2aIbuFCTJ9?v?$wg(sC
z_jm9>o^SKK4FB(fFY;-x;C+ZVCGY+NI14}hw&wj<!u|>tc<y!H_V+RW{sWJ*2){KG
z9$r`A|0SNodCudxfPj0z4d4wtJCXn55Lp;6s&1&n%c}K>dOUMkp)yo14$aE@uBnXX
z{riix^`*gLYl1W&o2IW=87fsqTp>{$oFQ@)uc_3Eg~8Fn+H$eACT#+<nP-DTj@gE^
z56|T=9%{B`JPuhz@!5r1MYRq-*-Tr*G8s-EihBkpO6!YJ?rl-2t_BXtH~ZdKsMmeu
z%<HIi$dLM`T8XFEmCE^5*ERbzGUQ7lk5y~MxVyVs3G1Q125Y5>(qN&S=8yzsvrRl3
zm35U|6_St*o;tp~I#rBkPOnd&J}cs_!0}69v`~-N7K@d*F&@J~ajj7?l5QwXjK+Pv
zi(=KSR2eK<1BtIj&sWM)Jsxb-YQ@S#d1G9uPBi7<qbR`VDIc6PZlYAJsOa@YS9YCD
z;^As7o){(9QoY`wW9kV_D6T<&shxDrNO8!RA?~YH>8!Cy1L>5er2UT29aA@jTLv0>
z%1CG)2`jbKq<u(JqNXyGb(*dzupZ5g&n*^e(a{F==$Lp#wK6eUkLFQ$qbBqoCxn-i
z*Dip3)9WW6xpqP5a{MlxC{2`$m(MrvOV=05jpF5F@mS%K?pT9cy%JB9#)?trxTVTw
z;-0*=wjlO-$JOEZ(t2a;az88zu=}Ou!rEf_^5!CxtR+=FjEQW*o(vDA+}nnOXumNz
zj6?Irs_Plo879iU$8<m=NKmV6Jnoq*lcIC1dgsi18#bR`Q^b6hV!VW7vsKCl<dZb9
zQLctfVflpZTJHVw5pA&gkU4R^F+N@^)}eX191k}p8g#Zs`*1SeHNZ;~CS@iHBlarU
zBLVIwuWTiAoi&Dl$Og)tt&H;UH9?%F1j_i=Ex;rX5hVNL9^{>u=kdbP;^4Y^D)oI7
z=N%Gsh-97M!%nyMEWV^T*qAVevyuYACyg{{Rfu|qynI_&9dqr*V`Xtee0pJU9n-W$
zkh`~1pC}-i%_Auxlc*3^h&Jea;)$vgucH!XDx`gI-3>a$5cPa&5ijRq<Qy7Ok4HV_
zVr?SsZ;Xu<Y8$<aVeeg~f?|}N@QfE%+zcxpUuPE_9Jv^4U6WxdxM?WN&ZMnwhzar&
zf^m>Wh$b*!|G*BGxnjH8E5=Z<T%2f|#y2)eLmlNsqTuCYC^f=Tq@-?XsUg}H7tuMQ
z^a=^%kR|MmI>%J(`b2edQ)YE!q%7azVnKthu8I{ZamjN>*M`y%(`=z$dPX^^iP;v$
z)wM4u4r=gOCuC~X64Uq@(OYknllUfxRa-w=Grd^!gWB?~lX$3M?V7yHn#q(&*uFxc
z=95Ki$<%AdgN^z`b*zn8YsU!V<7EZ|e7mvQKsx%D4FyykhN7F1yu#zV>eQ&GF)>=L
zMLp|_wZaGk+hO48dOTjN8PgFm63-kfRc1wAD#X*K*QZg;pqOO1QAQ{8lU{ccWo3c6
zJ;Wc_IG#A_(do5nVQ8>`WLUVmcc6D+&+^D*Rost?frxRA0VxOWwJ<SJ92=)!owH~H
zFHs<zXSpy@tPF1SQ5dZL%_a_LAl(o^5h)E3m9bW-z+0vDrHPHPDWDUh#dri!U5S_T
z7jZYyKrO5y2dSvUr6b_e%!|Sb42Yu9wOAvkQrXE|nxpYfz<8lXm4;$yQq))~R_f^G
zOd9190|Lbc2A-g@isHCpeW6y8Y^!(2Ye;iMjAmVk$IFGm;%K!zM9*mg+*GVpW6*T}
z4U{`rsFB4e#gSQ!#EUPX1j%)k0y~gba|sX!(X^HZj3OoG#A_Q6a<o{giIxpSKnNcz
z)Ylb<x?QW7I;?ewt0ko}9T`NMUNpgajMdFlVQf705wnC~lUdAd!M%Zo4i*}9NU?S!
zO%9{S6)V-gImU3gFg`9RU_%sYc%j`f1rjZh_9iEqVxqpPCsaHu8FEX))uWZ+(ny2u
z6nm-<{H!7ck>y4*t%Qh0s<lCk>AP41SRGa=O;l^Db+NL(RI64*Gc?SCBrS0_TF^!W
zc1uRJ;zX@fgn2TVlqytZ%qpb>6Lf#Pv{r45TY7U26(<U%a^fDzg?euacU08iknkUl
zwN4KdjV+O=K?#Z*rbi!L<Y*ti!I01Z9WKEyg~~=ZOtUQrWJJQ7kf27^52md22IVB<
z$1)|5&`TjwxYcg7&@Cm+)ZwPR;Im9KP`_H2MCz>!GO0-g43YZ%sxBYTxfZQDdu6mJ
zjCm7+iEFj5dm3(XaZzDow5T}D_>LDcG$*{HE-Y1w@rKdDga)68#4sGH%1<k139LaA
zCvHlxAuNVMQRpT$nn%&etU*8MvVLLYxQOB>9}D%%;>jySlAqIv;+0uFJMkURVmc5y
zL~T{ck#^(7LFwtX_%roEtUppKjAfOFkb~rYwT7@`dUJlNm5t<#CX}BfRacYuql#;k
z%20{04Hf&No=;xT1cy=weW`x%T2YwX5)Zn@5AkU65UUK6qADy9An%*7r+H_FWnk**
zb(c>jh~eYpvckp~nGqE<VW}6yPv{wfE6DPAw8*3{ju;Bk$FoC-*c}fjG_)y5?Lq@B
z1Id6Dh-uu5+qf{SJl)(0nd0Il<E5H}yDLoPIIq|yQ}u<&nc7vFM5tA-JMJBXN(DD#
zxT37e&5<W7y|&R)fr(l|tTYrYwpVAXtmR!$CmUFg!;-*xuR`ZpUn*{Jv51`4EEcQP
zPHNg~(HCvRs7Fhj5*%x8l8PKHDP6);wS);LUc}flBS(`nseoc>TC#APpZX`N<KsTP
zd7%G!kK!dICVQf~mpEa+B~=tA#0J_)WbYJTtByrW%hk1*^-P@QC=fz|49f>DlYRi>
zNk3wlJW{Mj%Zg}Bu(lIT%TO1pth<!4{lVhXm}PIW_xabD<r{*U#1f}gJO6Hzj`OzH
zkgei54-=V|&fGp-R_ItKpq!SfLoTO2XFl;!`-^lcN}UUHQrYqolZIwz>(o(@*g~*S
zW}X>hWcUSPx69XNt7-$GVR>gIofPM!ZmGWECb%TYh?`)Qx*}CMyhvYT{V4J|ovdi$
zhaT~RCrAcMp*A;a_NN~C2xk}9#z(s`_6(H@v>J7}%`Z8H#tUz0KSh?s^V<}es2>@f
zBOZn)C)I3RfrUg{k~E?eTW6SXLExl?2PL3$El|s>`XcR6JYE_{m#$(9#=&H2*`jly
zXrm7M(JLjaS@{aI?rzi2Ns7>-IP}_Bfysv%`<WCg9W&PzwqhZ7udLbnAk!IA;VCJv
zy$036$?G``>|`lZ9haI)<A!bB*b*{FW}D1(FAdg=pOA_UA`GRnY%BI+oh~!_4m$l3
z4dm%&TPuzre^}HcobPS^Zf+4DY#1%l#9FRa&R|n?ww|QaA-CkSB`|t=Gf{HQqB&aM
zXhNxKbtB^ybi~G39cP{8R*TY->vJ&OwvZ_)(>59E6Iw4xiOs0)w21W*Gff@77%tXK
zwYPG#2jS=XIo1mss+AcNs*i1d5hu^3WNgbhH%Hnen(f0nS|5s}>OZX6D0Y23$9!5Q
z|57C`4x8q=wm7jtJ2Ohi1b~T6<kt8w1=(um1|X|t=^D1+91aswlCz~{O*rcF8kJ<v
z2tjDf!c%KiC$#-+Q?HI;CPRVP@_LjsmZ@JELjoDr8Q{n)P)$gbAj?!n5i8j1KtV$q
zE)~mIwmhrQ-)KNuq&UijHl>`L5SLC1bj_+Xq-8cP_#u{O=e1Qdc2ni8N=9cm3A+>R
za4c0Fgx_gOhR>;tW*Q4`&*yFU(RH@h=G{b)*YdQAu+;&*3$ZH2OW+t$KTI*=QtL^n
ze0~@^V-nGuhY~F6C&#8?*}$e)wi24TpjI4Yi=@VI>O7b>RBP*;_73G3@`WKxP^cd$
zWL2e9r;ZiqFs&I;!jZ?AqBMBxtfFK`p*!4~m!V|in#!xa&9#}(0*fwX_-fkooQZX0
zMPVJIAz0IlgXrD0EU$+lV4dAl6QG)>t!GswGagsTCncP%+{z{LQt6>zs3=A=*2ysn
zOC=pK&E%zG-niDDT9tT_*Xg6)iZ>xm%z&$lb*b!>N$U#nz{0-7=EV#`u5LF3vY9O-
zr#w)%f*JQnm@$TxG<b)xF*y$FH``d9WxBZ7Mo!<dK4o1iUfgi&h2F3<4=--=9rQ+&
ztPK%@g+-4|&_$M3)NQgT*|0#ROg5%VCYjn|J8=cQ4vkv-tckxghIou^VY(1svlk{3
zI-bBb<yv5t!l<_%L-fTaL!(~V>JaXA%ok{YvK~4kqDFMB$U@e30^BrU>(cS+1_%n*
z4wuSWa19p53u{Yd%oJExT*sM(T8u@XtSc7BV+H`GNWZunlXxv@jm&Cs!Z-<G2v3os
zlNqTyTCQzT{s!gTzd9qq{Mb1cUqX#4Oz(bq<MenJCS^72US1tBGhe*AN{g9~T(myF
zuW2RaRBspF@5r-eT#HEOW%7VmXUtt*9AOHImeWPr5Ve8p$4^_&dg5F6Hk#(xP5x~X
zB*zS(VweJ&v(27HXo)7x$XC{9?|ppP8BaCHx=Vt=Rs_aet~jN#2y<*`Z5S<KYLhin
z>YrO&YOHz1M-v=F4m*iat8L<}(vzD_Iwy9eN~j?g!=8`?)`Z_jh1*+8cFeB9>$-vI
z(rsX222Jai1VX}21W4k*@JXA*;KmE>NS3CUtjNTGX5-!DjkI=1p48oF-&)&e+8d!>
z+4N7RL(=q5zfb%q@U-_Dx?{M!Uz1CO_OZK~X&uIfPvUq&6MGFyi1A?BMHvtOnrpd>
z?i-k^R%kRak}a9l!Hl|`6&+$se-j~Pn++=pmqa{%(`rSj67jG_UXR*Xg<HLH(Y%o-
z=O>%U#Ar6NFnzT1%O&k+uimT^nPP(((6}%;BbA%moHb@BoBfuga<go^R87-go7&Lt
znXQaLQ(~lxqC9S(1qf)Sr1=c!lQ`QDv!p>+H4U~nG{0Sm`TW{9GoNw0TyoQMrq-pP
zI^>Ia=GE?yVf%V}bw<?4R=VyxTVv?|gq9sL+@easuq%)3iA*QbiH@X!Ig%=5EZsT@
zOx6--lA7cg*N*$iW{6>PrPdj4f?rvUR#t;G4h^y}AuEY9IXPWO;jFl|3z|wA{6dYA
zHV4|OfNIdLJ7yVTo0ekpYRHhTv-Gw*)-gTX95R5$h4t9vZH2A{qZ!KGVFhIpBAHC=
zoRyR)X9ny<0Gon31!hI)q=(Z~rEKKRry-$^%p9!=I&@H8WOu4)5aP)&KrvvlHKM77
zDlUoBsidq?TGNsg2Dct3H(R_qvun5I)<9KC8&fIb$s#B<jEPs$<6=37w*T1t$%czF
z(%6}UTY2xWw~+Uh^6wSl=6n=1WIKQ1v<0@@eCl9sGh(GJ%GM_A<kX5?K^KHRC$mz<
zAi~+qlaKVTO<8Yoy6$Mz8PO^`io<G5N3B?%1P`r<c&}r%(~2p1i?z2BFO!1X?Ah;?
z!f2HY9-P`BgLTm=wl~|$B!z5FCauE6I>bh*khlmty<yTKV_r7uQ0uD3#CT(ZD@FaL
zPv7E|i+WcsjrutLQgeU9&P9A=ys|O2*1YXFwp;DgiRGMXnD>j_F}xlY%;PLrlPJEK
zn~CL2JC+EGhf-^2*I6L_nq1nOSOvkzISt49G6}TV6Ue5P!MhwxI@vs;J{Fy_jp*Em
zcBflBe3M{Xsr+hFCPgoXm7E8wH_L)kUuXpr3iGd~mYG)>gQ096ZXT4KPsi$X_916@
z@Y~$UCPJp$GxnVBsL$oc;E`?J$$|;3u32*@8_b>U`L6gR8wkr0cz3Qvb!;}XyUM0U
z5tY}wXqEOp-Ps-%CzCF?eRZEnIT^**oke1hcq@!eUz;hnF@h}cjNgZqAWB4$?_BH`
z>Q2|w-W-SVk7IPfQ}ePj(>Z_k*M0Qn5S`N`NSpaiin{$$y!`2<h3@pyS>g0jv|8su
zG>!5$2%}(t<wdqZq<SJJRvWVu#dv<99}Y`&uE_goIEMHB{$;T>)rZNwhWW+9`3ghc
zXcaA+_Rapi!F1&VGQ6148CnAqA%;fbL&v?bJ2L~>A*jiNeR5H`Lk7^>vX~@_`ee1)
zo*d&~(DH5)@#c>viY(#Pq_z`V?R{0TByvv7bqvTQ(fBc=vtui1P+EB>Mw3kLouksD
z_R*1wv?D>uOKduB@J@t|Q~7c$g2vFe_N+RsVmf4zsGd1Zw_#Q+%S$!k5ElC|Qg1K^
zvhfpSy7MvHo~b$}ybuhG=`>krTP|hd**>w@Ty{Ve<Yky%C!a6+^;ryC`?l5JPj{Fl
z*Cw~bs@&eY9wq*P16orwhh!3^NB2yO<@!I#xqYNSh_nWocr-cpbwC(7m7E4A^ACbC
za~#QOk7ie8CnU|<ShUHRX-1xdL(Kx!U1w|V79WSMFOH$OV$SGJvkgm}R-a5+AyPuH
zXIxyRTIqs8N6>qavn}~%k4q(ek&HyYDswHjy@jEY%-)D^r-;L!PDu&dx7A99pzZUa
z+xT(|Q#Skc+Hu8>nU?(YYC6Ojo1r8%(}?NwKDT7bLM%3WNmOS1)Lm}k>*U`qK_F(E
zG$E)dneWARMdgAzBn!Fb3k)eks3i`zr+)40`nlM~dUnkbWkdU&kd0d-wED2`*?MF>
z;nhUATlSlc>+28qtFCRM^BK@28+~py?uDW4-P5@)FE-t5pOE?4eA-mIV?gI5qQCNQ
zlba(xVOb%h*e0y48a9{VW#~>)d51q&6@nJJ4|jso4#1@jj`Sv(EY%4k33s%<Tnslq
z=DgG_SG3KYi6bL4O_y_0GKq|4r>`Q@)XCwikb|~(82mnSbEUB}d#FhiceDjvCE2}A
zf}kGkq%&6`zbrk&v8xakJ}zYf)JUE(-8LaoVmr%A$SSE+Jx)GK@Hy3EmcPk+STrUc
zYgV4IQipyMkF$GLuhg=#zex8Y_O-cXoBC#@NKQsL`I(;Ut>a;*0mMfxrPwK-+8LWt
zlUOFM9ZEC-oO;&nB*zwH0i&p@85K9PsheG)Q8$!x9k1)x;!V?b&hoDb)C8vp-7!Yp
z^MmV?e0)A|_6v07r2-W0jz#!%?EX_*zCZ{Q4DHl;bWOCGCist(;s(bMIK5~4l2#|j
zW6XRRF7syuLbcmQ5%qJG?HFs42DX+d%7>O@svp)7?B%1xXd!M5ENOF}acJX1D|n8)
zY$!q|Fk_YUA85HwU|UAQrl4=<TrTTN^+usw+SL5rq)6yhCQb+xbU46ikWjlY#^7@Y
zg9b-2E>+9b5&L?a;~!`fd>EpgU!!o%>*RUm+l6@((xxW*i@50|A=a5ZV&Darsc5*^
zwk4fJRC@XKdrr&y20MgX62NAP3Nwakr+HS)3S?YumS1acp5slB&=?Nu*$6jvPgb%1
zb*1t6EU3%?G|ISdiTb6auVnz);2bb*Q?F!^%+@ZDA>_oT89x&>9alp^rNMO@<DS&0
zX-mrf#@aDX!}NJOl}#5h>k%#JCkZ3Je8OeYekM!Z5}_rFK>NvZX%{ESr~vO_-O<S;
zn4`|R25|tH#(m@HE}CU3hVMXRC?}zPQ#fSiBbv8*H$=}bH(bj%A3bHcjaa(Iq5-MG
zGO{Hm#R2$;-ez54OHv(5!fr?9y+upvXKskwC^qg;QnwCd(3Bfv6?e{r9e&MwRG70O
z-1&f>-5n{e`&2D(Y-~F;L=GE!tZpdWMYZo&_~@d@4xM<NXx@ThIq3wQQQB|cX(Z^z
z29+|-w_+U4BjrU58tG9pvIl%zoQyEC#)m?(Wbclb7q!^bhkP63lCMTKhV5Zg_!6oq
zJ6A^8ELj-oFySVx$R@XF2{~9#(0uc&YrIWDQYfXJS4S$FNgRo?nTJEP?r?yz)d@3o
zjq9aMpQe;0+*!>L*iJTu<MRXRf?$&6)!2k8XY506q7mDB2^OSscYL-ESEeT@NuNnK
z#QB1DAH=&Oa3K>rrk44*CY<0K;(Y7o4(*9h9jecV-ZnpGs;yQs_psRQlqwt^w3HH_
zp~YG4&V7HJS+7efbj~v<Q?5GMOcN2?t*<CF9w%V)^lW(upA!tzwoRfTSeH7Muaj)X
z>DfXxz|F2fQ24&G5@08H*fW&izo0>x@d}oeWThzId`Xfa%BHmp&HD&^cNQD_=?3l8
zcgKDqo1Ijw({*nG9EE>juvSH<fF;aeTOVyqsA{eS#L}EJNw*~=R<$zLJO;n3WXc2_
zrOY;wjjD?q#YTD<(@sYRnrX?#83P-As-;tfZ4%HiIDZIvlCJNx2s1g{TD6XRS$ESy
zm_w8@dy+XT9<pSTqBT@S8x_yEL-(1=D%5%U<%k+My*WL@OR15Bej}wR2f|yz+@WQw
zWx`>pr840@sB1kdwN7$grMuNhm4jTS?FDaNXuFK{k*#Gz4>f1hxp^+9Fuec2sAWsu
z&#<E5T>F-jGaOupcwHHi+T3cYZRq3V%zQrY$ttQ$oB$+uC!m}AC{(zG0F$x6)30+&
z_WxP6;bTb;&Wvg8nVcfdE;wOA>3^`T_KKt_#WT@)=isz`qFENcT-$)QF{b?urQoAA
zrhk-}XZ&e3pVQl>Wp3B5Ui90HwkJsCs@ioPXu1~zThKstJU&*H)QGoBOX~Pdpe**g
z2^}XU(;@da(P52Wj-EFf*=c3{u|q|{$gpPR>cu?^m-U>!d~vj<FG?<QO5gmJdlHfs
zx5i!GMO1f*S6E*<)zO`2ZXd=Ju^t_AC`sC??r0hbaX5A6H}%$xM{C&jUF>WV>K3_c
z_9xjJmXG?E)g)c0>CCM-(V5%rad*dlHx&t~DFg|&uDG$wtyQ%NqE%@n9>W%?d1Rb9
zP9INt3d3<ITdoFDnIqO`TmWW&ElOY_6TmPN-<Jl1j=$wCI=fg#t1+H*+?zez<rk9~
z3Uy%YL!)zx^$0?-_c9d8Mx!}yib>N*vN6JP=fB2`O7`Jww`r$S5(8Dv*S<W@`Czun
zxdRh5d8Qnd59rIM4pe})YPB&cAEno#F&0%NcNB-wIi(NP!ObYTiNfM8oT!!6Nqpp>
zBMgIOR<6>#Xlt#?CsCS{+;>Zs7vs+Pqe1v<o|u@D-1<jL!`A1SbbM|nI%;8{9J`w<
zh3CxrEME%b&MQ~UrDRW2WO-tx6$Ra9C}O-f#=FNkA<}IZnoU`e9*#R5wOb>2vN$>>
zusUo|P8u=nHcu8Qa~NQYGEGjKx=b+>iE+EvPE@+3u}$fhju+Ld(9>8eQqQ)qZe)yU
znu5Jbw084nog+zi;N9+t4cr1bB{Qo?@t$6{MD_7PMK)M1ER~<R;U$9g36mQISg-qP
zRo(g1)jQO6meikWWqzEY`3g5n%sjgLsP3a)SSXK=7Us>G>NdE$R@6sILtUpgM(SMy
z98Dc6u0PGQbhS1zwQtoxmt7D+o?VL=Z}a1$kD7aI*HOoG%{?Zbd;I*P=FL88?ome(
zv1@e^16jv-$GUjSnU=c-V7z*{z@fnT@xUmb(%0jq#qw}`GPkMVIBf(6#GY6%bvbQp
zz)15^*DvfHNZefm#lqP9czMstrE7YYE{;!LzWlUushcV<n7X2O#p09>bGwh4x{y^k
zQ%aYc8Ybw)Bf0jaR5=Naxlp5@Pgygtr0aw<p6bW$T-V~tU{$wl&5uu5Tbh{KSLQ3Y
za@P{h0oCWnm2q>{PdWM|ragt6GP4pNdP+QZ)=5*(=~`N>Ffgo*eN}yz6VL5FwtL=G
zK0HRsE<#wvGncYr;KLR7F}U|z$p}yUZQk2dYL1@w&ZV&2;SqmBXcVGmyevxgPS2)#
z<braUhs<&@S}L0h&8ClC+nM2#jM7&s=qHN|T|&HUU^YkH%-Mr>v7Wm!{aZ<Ii}dBW
zJ_@1(n%oxNXGSgya<Ar_XqTE(8DwN+Ufk=M_h@8p3r#}COLyOvyDgM{OD+pdV%4R|
z5R%O^_=T%NTOx1pH--9urkg^C3lT!%?)S4W5hY^g?M7u2BazRWq$sjQTn<--4i&6n
z?oJxJCbU90X~~*J?qEad>~hb}{&tWOp;zLX9qrR-DqwNSA>UvIw+i`I+2x>&K*kdn
zH=)ZRt+WBg`2#HQGsKJ$Hf$dQ(|jq!D7B5zl84jQsCOnCBIUEmMG9pGOlrhDW)))Z
zHVi_`)ki4Fq}Ut*&S``iTira*Rwv0MsZAzMiF-tQDwQhthyo>DBg)r^TpqfrR@4=u
za&UpD;AvbR%K2h$4>hY5_A1oFg6rT8H;D2T9~X#jHhS(7QL;@h5ygm$eQygc5lvDB
z=FcTuQ%S#~7k6r=EqI2*ir30;aCOW$NcgN);xoT`>XC+Idn@6<Og~iHMa{5cCTgi&
zRO9P*9o#wNcCj;gYxK5`nWU+CM)xBs4b3M`ib|`VPv0g&C_GIP#zX4UH2&u}<ETmC
zc%s3VFEI+L*B}uc-rS1fRHzMdQb9`tZcbq`OsSN44dv*LGcQPxS1f_+RhEt3PXa0N
z>k*q94LQ<XE|=UaQ9?F)d7qskTH`6te8S9(Qi>MWizAIv+!CqY;HpPkO->S}6iD1s
zNYpbjQfgF2m^YjS*shFlA~FeD*{CApgC3ppF2ubIl**<;n$f~Eqfl%$4dwJu#j?wl
zr#Wx(I4lZm77JN1HbV~dhpSWSSHiEC>&t7UO`EFh!Es63V3qZKxlkJ`wYYoAx{!1L
zo+-tFni!1TWM1+CDGgo3#2xpv#9Zr^98NNs;XLF;|6w|&oN_^Z>1L>*Vkt~xjC$9b
zu#K1M>a!$`gp7$(#q*RVO~E*zT^fyqQfzTi^NsC%W-|)b^$;zaRoz`_-7YJt{IrWF
z&7cmjL;0lID+>C`&(wuUt4_6iC)A2Zrc}fT6_gFMt-Iezm+2OzOw+bBA@Rg`wAC|L
zhSW2pYUs)Y+N}LZ_J;jFWu~A!MQ9|aG+n2f*hqS9yi};zt;g+YFgeZrDmSGcMR-9m
zdBXpo)U@@f0F@~l1&`ARn}Q0~M7<ua=3t{W>MwCl!f3a?%2@_+4MSdgapf6o&r4j`
zy{6a`qZK+x=>Ce>p66}8HC@TVo9;Drn|W@&)hSwToS)!sO2!p?O)DkXgRB}Tji-Vu
z@vIf<Y?jiY1)C`7&~U-2ld@=)LxpHn&CRQU+!!e-0X|q?au>@LV)q3+!Y{;OE4)Vg
z$FcqvoPsL;$7%wnNQIDw3n7dbL=FitzGILQZLEw-nzR3eAY(_sHm!>i|MRT1^D85q
ztZ0^_sLZVZ$h}CP13MkLXm=yn=o9}Vde!AKn{PgqsYYARgdu{s0du5UF6ge)0*yOD
z0-D8u!r7TF#xG!2+^7xaOy;f@`0!<F0aX;U28UFXA=)~WC|6-5sDixU2E3Sz8SpIF
z*(lLU*Y5O0u2s3zjlm~DN}*oRB`D6I_hin{6{bOM$_w`JQdC-i?SXQ{)ik+`2iF@|
zacX4)J&~M)1cT#}bopq0As1vz6<vYinJYRZ5s%PPKP8kXC`=0CFJCqLgjMXRVAVk^
z??X*6xer*KoPpyY;aWc#p{}Mvluv;cQkGqU>iTJ1pMTg<V@7FVY;8$-Ye;%SlV%Gm
znBxbd%qUDIT&;pNv^gVAF*PVzEI^m|b5yF3&28D-qNO!%h&OL4!_XqLMH<SQgi(}Z
z?^|sbF-f5pDvLHpDk#jj9xCeHq?1Nnb%e4<RF(;)jIeJ_NEUv%JV{Ee)siIwvY64K
zo74Fx6_teC&6G1EH9W<7$aqLfRjNICZ$4+ss9K`FH>w%+)2mTeqztI8pa+r7=rs%p
zh-UwRL!&`dFew_e=MX3zs3~qDdz*qHvsjx{#TsX_BU)YJv_`#PU!_TyxPg=eFD)Tk
z)M*875QXH7%20tQd9iC#xe7yD$g!W?2CHM^9Di{Zgiv{o+wdAK^lC&{_Y>ER>wG|d
za8lEtFNOH}=PDtI8zvcI78SZEvE+z>SGvQsqg+Co`k(G?${8=B=H^NpzjnnSV#|N*
z#v9jgGr1xUc}Lu0l*r~g;4V_FU~1Ix%LKWqCY2FunB-2>#Doph1Tm;C%3?N#nl_#+
zwj-r1f!w^1$}prS<0t3STft;h&HH5|Bx)U!B;y~ZM!v7-a|4PGQ*pf5?~ya*hakUn
zXcrWOR`V#Dt}pj}&R&&hkx|5Pcd=>)SIcr0WC)D0bpiVqSt2ml#e>{~q{-OsBXcug
zo{yNd@*aLB3c4-BKfSxly3US*#ay??E#Df79A#JE+O<cW%N$JPKM9b?X0=L=W%$yH
zngg4Q%T6AcjNq=;qD2qaWH)j+ZOO<gxKmH1NLE#C@!BD%;4I~xAv9U^@KIucLoJ0d
z^|epw!I)XSgH{!+eEq7GmW!%O;;@%Uf?O--YP`f76HUKo46|Qgi*z4M8*Cz#%9Kf!
z^>&MInPP*l^>&gh9>6wOsvyvk2&RCg-rVA<ElGX7X!p3nN~sU__)WHeb2ZYXt|-M-
zu8eM?q8p^{p4Vb?SihfXLhwROyCRqq&dYjMFG_^y>JoPxVy(c!;Fq(JNp>67>6Nbb
zmaKf8@DFtLbAe5|HW69|St*^)#};HlU##1bBuv{Dt<Ot2nYJ?W(iC2A8?su$-03{f
zJH|JC%vP3zZ?B91X=Pg^98xXVfi*W<o~igVW8O%Kp@CxJ*Nsw+ESmIgH&4T_TUgy{
zSd8dehBSFQ8d)QZT2@+>QRZzA8u`hh$8D7(UrPR<l~qndfd~F{*Dkw@VHx~R9iu@g
zaT5&;GfzV)lP2kx7g>!^MkGxvO;^HtmCXc8i_V7qeA3bzbt&MgWDwfuhlMez7j{*S
zse!&=TTP=nG*`gR{%_(RA<$YRncW1-KUZi-uR^`CeAMS=|3^eInM=u+kY(LrO9sw)
z+R9SY%_^Bl+$>#nte{OH6<eZ>ah)C?9Qs>f|Kp<FCk-r@jXo%rMtrHKPRE_^mvc4&
zX>F3M6<MFvOY!;!%V%_b!nNu!iH_`at!AJE>rrZN?T-4{p_i^;WtxeUHR-t19<<03
zJJ}|R(?Y$<Vw)GR46`EYGcS&5CQAQ7hPr{3Hs`IdHcGPt6yr;2L=%W;RMe*d`rv_)
zqHh&cZ4-!ub5$Rz85>5veJRmG^P~qCIDW3tD(Y2jatkaY3VH!zBQT*K+cxc6z7ol2
z8D314OiL{zL(*Z$zbO&Vu?a9Z$SlgL9?4=eD~1J6de4+|T%~OFYMXZMyo=VXp?-m-
zhpMbnG@ED5W?JJho@a!nx+zi77zfExln+bPzq%_{qIF1HM^H{9f_X#gT*k+)WC)5W
z%1}4rPGn06oGC7y`C5u(`Ok%RlnRl&81M@y*3r(w$mgqsH(1<5E$XHIS#<^-PZcaF
z9cLy98_iw^E17Brb!S2ctq^DnJi%RuT2Qn!%rc|?UeQKw%tCEa|FNR51gutcp{zD}
z(2dtSYeOKF)bgAHT#Ajv%pa2ssN_g6Rtzt@sAJG|RH|{7(`iyJXH1CU+$Mnr+<K_4
zJ*>>Q(6)gVK*sp$z?>Cu(ppIphsBQBRUm$|wis+@$aW?g^qetSJqqi+$<s;9$xDG=
zUU<+uiTNhe1nUy9965X4#dqDPOiplvx9F=J_-Z{ydJ%>c41I<f`WeGVW*(g5)d|Uj
zlAFdQ5jg;FgdBo?rexb-qASL1HL0nFgB&%)N_mEr$XE+y+M-kQ1ytvA2QjYKwoBb{
z5A?u*X@&%i9O|hxf&|Fg8X}60)upmdraGm^muM1?f2tDKF?{MyOhncs{FCb`x};#@
z+3|Z212#<i!b$*THNPZ-#m98krW)%`*KpM<wh1;oM!Ek-!!3xhIzoy&Q&4LWrc5VJ
z8TKuM@G@W^aQXKMTtchaR+q~fWi|M0(dtEA#xP0$@F7!jC$T9nOu3>hTE0g&ft&40
zHm;n#HW!7q*s4)e;WLV6N?0h}%zMER$}ts@Ep595M>kGkqr{==N|+*cSr}SM(>fS>
zA*BR|x8l$Zm{~BntQsDMfVxPQzsgf%)qQ?~OKT!=w2AZa!k{fNh=8A)U`eZwiQw-b
zx!`mt&m#-9EgfNbnIAdG$d$61Xq;Wg=1OAg2uO0ZtVEr}h7Y8uyehPqDseYEtDZHS
z24v7L3~R2`!<kjMUp9#%U8~9}&ZKYZ9ad{5j!gx&6a~9pHW?kPz!{j-gxhCB+Q84j
zoz%i)X1|vUA+$%9NA9?FQ!6?3YZ?imN!r91@2;c8EaCJ*cHa|mXjL`CU~8zGCT4U9
zHPIEsN3}!hcHu$FAxLtQbtVfRrBe*Ig-0_a#X_>g(<jdRiw8{RX$~53mQS&Br&#RH
zIAN6ZsR_Pxxr{^!YpSI2t_o>U$|N@{*rXPc$?hX*?zUWPa&tBGWos{9)(6kJoeNBb
zIP(f0jY&>ReRo2Bx(q~_a?;q7k|Gn0@s{iaZ=Qykgj-Mt2EOQAk<c;mQb{e<NozVb
zU`u+53D|E(H}zAdqU}2>J9Tfa3X^q~+ePw2E^I0p51J|u32c?&cbgKY@3r8zX)DXQ
zF58T{8?tr`<FiZ4vB9!jvfGUtmp)NhTH=Rs<l+Tauym(0p1a9b`@8PCHxqAmiJR<<
zy3y9DQ|@0ea-*%g)wUFQo3TV;&ZytXKW7AMNrn9cHurjmGa!|c>9)BDH-niJ&J}GN
zwM7=FCU<i|nObG15XZI2G~KlOnr&liDx3eeG)2=iZOwJ&I8@;p_l+VdG_8i2G@WnO
zuXWAIRiMQAWZi+gSQp@8eOTC<u2YLu95W_Gncm{8yDmScJxH*u^_y%^K38s{QEYhw
zQgcyrW*r()s3nar&v0FBYrb4X+9_Z5&B~Tm4EZ6gIN_FD?j34Y^ZPn9Bu(70CLA<G
zAJgTxh(||S9Tmb1)2yDE(k8OIqePn}{&Eyw%c+@Nvh`Aaxke>BeDy-vcKDi9QnVO1
z)L|xX2iAqTZX2-QD>1C>_&3A#VOn8Fb6HE6ipUXsj-mP3g`83^J%FOnE`45sGn3k*
z{rI3nv)Qs@k{lezm`N>VUgpjuTNBc((I&0Ew?x~LnnsRet&zdpR9JsJk58^-j0hQ<
zuy)HpnFHLptjP=URq}HItYnk&7NyzZn6e7E%UaWY-C!mYk($mL`qoUA%3FZk;RRW`
zThnY&6Vhh;DQPoZ;;H2$Tk+nOXP@kcme}m*<324`l|^N(4gxTAoHd7G6TZe`8H&Gc
zbfF4+LtWBz32ROL+?r}z=8(h=88FnfoO0$&#r9pn&Jx#cXkC{0_!l-~lec(L#@wIr
z?(u3+HY!Ik-AcNYi3q!TPvcuGE}1~b1el)!;X)gt<yrd&D{8YP=->Uiqkb~%wY}Z<
z8K$$_eOH%?<0U?vtH!HrSaCK{Cs>?A`W_}fTVt-`I#^`WdM$!l{Mdw+(!R{CCfWt3
zX92kT*Nzixvde!>?yfJ&NIscVb}`aRz~PCUU`-~)H5Km1u(JZZaXN?Z4rS*?U|<ZX
zut>!ir1R<FX4FF1X^g`CPJFpp7}vol?g7@Gy0KrmIE*<>bG$dQg%2)zFlcBhZwbkg
zWU@#pVbUzd?Zb`|+*+@@yMdAH65pm&NkFrF)-vDpFTWXK3zjgi*%y>{H*be@PQ6s)
zTyp(uTAN1t(n~m^P;WlnX%pJ(Zt9ZUXXKi>Gn=?w62cQRiL_m8^O%`3p2-moDrU!%
z38%ezV-VI5I}g-;bE#?0m4)A|!bYo*CzLB?)!kq#!SKkWjTX4M9UyAYxY0gJrlwl&
zyL}j+3q!jSOkm>(eXK3P{Dm!@wQvE;tz9Tgt*yw+W&jyyd0Ynj|Fq23Q-D%YHe0Y8
zEXI6%JvPDuMAz)XUO~!XM9f%8;RQ)WnFYf@v$X6s+p$;epvx?rxVv?RA?s7J&HNr`
zJf?=^rmHGA+2U>xMj&EM*Nmhy7pwiIfZJO4a}VL(L@d^2P-~OYH0?+?=Q6&<fEq`(
z-12^sU_`cXYh$bri_HVsVTa>VpK8QeAe6vTz&0mSe2m26m!4S(A)QoBRHqOnjOr$i
z&__@q3M`BKXx+X`Bcun3T}OHYup;>L-$@2RTclrFLTwf@p<=y;0S^PFW@);~eT@ly
zWkjLU7%Ryj>@#FuWw8k2&XW2~{WP+jFAu_2L(+Xfkd4rkMI4llTscWG8k_zTd?Z#b
zPG-k~0qgW`o4B3TrW9@`d)kS_pcwU)4(Tl=07(`ctRN^YyOpkHYSYi1gp+M}ym9v}
zF~dkpQ#-GR&2pkJ>AKTrpNTHbKRwQDD>S|##zI`-8x4s%u@}@y%x<Qc=yMa>eDLZz
z+ZuEla}M;Ohufr=#CD$rZa#x_Z0X#o9qyHUq&Cnb5t+70;8$vXmaA!O7NUNwpD=ou
zZ6DpOFC2%@FME`MDJ5;gjU^_FpgqErtvct?E)Jq4-9=T~nwcrhZnCI>h0@sCG-^qa
zTH0j9$m)?Qnlq#T|C-oqGt7L+?m%uRBx5qm>cNv^LNEk7L#ejo768d+SZHFsQB9bE
zi{ab$O?z*2o?ic9L%t`CJHn>h(<#TVB*)o0(+rRq*Fj^2sd-Hs2b-h5yLC9+=;c8{
zH)OfZQ&ACXk<>BI>D~mTeV&9y?Xyuk{D4L|<@+lXoN)KCKcU&4UX;1{HZ0N6#9rH&
zPb#8~me7Uz&@5Ci>#vWS+WBW>bB7q2F+_}{>dJgYb_8e?P7=Yb9Xga@wMfQThe&z(
zo-Hb05w0=SKI`TpsFYxwGUX&)GMd7ge754g!thc=TFm4T;fj7IC7l+O#`dLDg4F;{
zVYh?Tmp+bhr3AhY8#k`FEld$4iAy9Y(jnm-$za<8XL`_dpHb~>CiVsxMUx52Ex|e0
z<8m%`jp>?Y`$T(EdQ48%$wTR$N%L+AchRAv)hp?O@RGTBna|qo$YU5Y=>jbrZuN=W
zCj=4(p-Ypal{%lkH2D%C#7}ID7Sxn5oPW$k4%JIe7@8Q&o`}pTH9op^Owi3Etg&V+
z>Nnd;lB1kS#W`l0Ie?JFNxqy&e8P)KRU{+&cY6GB^2*uAB2rmf3FC8(JT_g#OoxPf
zn0ZAv?HL$Y+~1SL4!7Hc)ZxAwGedLFiCOiv+Ts9=KfNS<veU5|ILoaJJ0#?EmX5YN
zWi2}q=MsifQsIPME)Z>tbxT?uPD0pOs&;w8hE7M6`o%7Z4rVm314MYQAK7V%Lz7O=
zZCq-?3)}djz^E2GbjT!;f=X8<o;A5Sk>m&$ykO$8<J#2B38_Sx)PX(I3g@T+_VE=O
zoh|GAM<u4P<iEf4hc~sj^Ob9oLT;5UBC73a8zzm`(&9;DQ(Is2j*V}Yj_L6rS)$cQ
z4NsH_TM9e+g|(cW(kjf6gspQUBF!){t9zZ>5F|B)mjXr5ZT0D~j3FpCI^BgLZ&y2G
z-pr|h$nex4$?{@c=5rl?<JzRe7)N^L2yaQXU+b>WV1FUG?Kza|bo7qvmL!_3DsmLI
zuF9V|D0htIX&<r+vUjo0b0##PE+N2={t%y8DO*JqP2{k)$}o&}e1e@XGdR+%1RXh)
zD3`cYHah;u$r-GqT7@80$oDL?Ykis$x#Ln;FSu~W=4>-$c#SNl5ZRCyg9mj@{K98M
z+4K7DyQxTq3R-QJG6as)SU>x**mD*Ye<6VNs$226=`lp$b1Abac8oyg|A!I6gcx+3
zP>pOU&2i`(-xg>7bZZO5juZ?#+2|YHK4N>_XtQwxoAtwp`f}<l8$%pe)A*!Amt#EU
zLMG9i@r#lvHekW(nZa8kZIWqLmGb7hs5h*h{V@%cC!I*4YcZ2CJ@_*m)L6EH@G-68
z*v2*UUPJMg&j^<~55h3aQQ}FzndD7L#DS7Ji^btv(z8}^N8n75alr^>ambeC26Xk;
zJ0lThC~k7dFEI#{e<GPOWrbd;>O-bFhsdZ3r_13|Oq$5fB-~VmQJeB?0ENuhesFg>
zOGc*sBv+DF<PQW1h61c8M!EF7Gh2QdZk`rg_>2jm;HV7MbSMU8-ic#nC*zbN>l9<B
za>M>8^Vtf_+Ys8!FKO2W-6!l<I`fH_PG`D%ga+-C0uh93cdegjn3?D(JtLAS#HL~w
z6HTByKGPk2*23M}>C`z3eR7DL6YycL$hOJYHuB&4NtUOZM`$e?{UQLZ=CdE0o&21b
z6b*;9tv$<MZ)KG&ik3+tailhx=gB*>=5L=zrb1+rYeJwwqAnP{CN*4iswoE;y$L~u
zG#N`MhfMS2hJ|&ITSJ`aSt*?y$F5h$p&Ijq4#Ov(6!-<yC@0-}nm&+g$|$I3B^HQb
z+rm=I#HLYYHA))~fjP$sm#*a|OSG%8LfLHB_N{xShLGIbWT<>#1Ao)Av?B&hT3rqU
zW4Gf3I6R<(*?#RFJ_71U&rpQO*{n9Vv6M)Qb!uXUs{#R>(L-d+$q134C6N>o>CsrO
z5_1(YuTwqsUp-iUQ_G}ZMA~!_ouPD6v(0A~L<9rYZOd7;JO?qJ{0x$-mYc2-da3%K
zjtCcMAtC}ZoT*~E3))9YCVbg|8TYip&-<-W+6CvC7>hGsJIcZfIhRT2Cymro6qGPh
z^iCHzr34D*>V>-FchGX)uC`lHmREJy-_5o*<my<Vg$f<>P4tHUf0~gi?*F1CnJ-_S
zPLJrED@5wzVOS%s=p}X8^m^NV=u}F_7LcV0CYPr=+-8f-^-I2-9I-aTV*gQtas~az
zZK{fuU{1fhM$%UXOXCG5C{ZK3vgUeceRHi9IJZ)}BTqBKw9M7i$=o^%Wi{-Lamj*T
zMRBK<OgWm=!_62JJL$KO4BY1HF{IWZ<43eu(^Tv?q9xA#?sNDqaDK!=4qc~#_`o7-
z@(}@wb!?3k#1a=(GjZ7sR(3_T({aO6Dtk?}P8aaOic%Hhqvx>-a-TFrIxb>+O2G`X
zCVx}4w6&$0c38EU@X31klH#mixUJf(WxX(wj_cIXoT_M<+}PrF(X?)C4#+5N*^TpD
z;>@+4k*@FzACJ4e-E^sCL(_ZueP8hc(>gV2yFul4rqm^lVfgy3#1yW{NMltKJzQ3v
zp<N+nX1BFx-_`L+k^2^iZ>pqK4SL3+B$6>z^GS05GWyI?>dI<SKjkmeu>EHw!T1%f
ztUkS1L0!>BH|oK5TaJP2sd$cR&8&YY2Jwgy;+GPU3G?*6>h#7VyWIneT?d8;HMH|8
z#!&8xqXG9x3XDCb>S|mRIL;R@99X^F1fHnItz)`F+Qwya988i>->hJMfykT%%jeX;
ztar&kO9~em5>N0=7a!$0cakSd?3@;%Wq+ixW?$@cQ)^I)V8{&LWfu$DL$jq^IN*^B
z44e(wbN(SwdOTb#m5Y*WOlV5a2ldL3Scr77vpT4~y)g3nM&w1X{sUHopl4;sdWm=B
N1WK3e5!}oC{{Y1@4c`C&

literal 47775
zcmdU&d7NBD)%PzD1j4?BP2jSGB#;?GSPkoBAIU~$0xE0IbZ4eXPj}nPBmn_MK?PJ)
z6j59NmF+=U+)zXxQ9wa)_i<lQ!AEg_#f|s-J5_b>?Vj!-qJO+^e^T?iwO5@wb?Vfq
zx;H=AWy)J3eur)zMb8IIJ4ew^dA{#Jg+|fR-YD7~><9M%&jt4c*Mob5SA#o%w}WJj
zJ`Sp!N5TETC&2x|tq+f)1HhT!HsA}v?Z82BA20{*3tj~71-=7RJs$>D?w7#r!5{hX
z-+*e*R&%0gTX28yQ1CEtC-8J|H*m!JUj~vTdL5|xKMAUf4}mKGNpLp!cTnw`bwm`+
z1CIeu0bdFp1>Wt$e*r!Z|ABL912_xZ8a%@L=Xw8pkEepi5I+bW2VMzMRrFa<?f;X<
z&5m^a-X0Vk4gp1<Q$W%6EN~{c5nK%32rdJk0M+heXylII0&pjA08~ABQ0;sRsD8f_
z6g@u;P6NLLYJ46C4+gh7+QrWXRn9z6<(}&OXM(%pFM%4TmxC(zI#Bi82dezfdi*N5
zCH^0QJA*$5)!x5=yMbFm9QAi^um?N}q)X8dxC{7J@DT7;Q2qZhI179lJQY0XSU0{E
za0dQ&gQD|8pwi287%&S|JJx`(W^^W~al8UlyWa?^9oK>4lY2n*>yx0``y-FP1~uM)
z_5Lkh5Jgk*?*#4u?gOe{hk~NR$)L(x4ywIpfc@Z2pvM2#;5WdhLAB#Cm{0Y63sgNn
z0~P*jQ1ttgkKgKeH!iz@8oz@<STkA-iar}a&A%H#)&Ch#<vj|DF5dvv-hYA`-|bIu
z?cEnty2C(*C^`z%c%Khyo?h(ZuLsqh_kkLxk9z+Xz}@kG4^;nu?=d>jrQZQmcnod<
z_JZo)T#$d!JpQO%8$h+|)u7717F0WK16BV0py>Q{un&B~#~*f*lLse*`w)IUI0d{M
zRKKnSMc->c)pG+VKED$bo&FnCx<^3O^L20<_#`O)+3aK&zZIzV?F5#<7`zC49VmX-
z_7sQHK=t<kQ1u-Ss=SlDe+?);%zOVjQ28$a#UGb}qR$&awevbq?YIq8d3S;;?^B@K
z{Y_Bme(3SHpu#tUNE)xHpvrwdD7wr9_X2ys=YvbYeZf2^d2lJXA9ypUad;3^d%g`S
z|Bpe@^XH(-{R61>KLd(BQ|G(zy+M_K2q=0i@OT=i^yh+mfailpftP~n-$%hc!3ROL
z^M|0)KMks1Qx-VB-yRfQP6m~J5h#8+2UI(2K7Kt|!+#NY8Teap2pnI?oCLoOGPR?N
z7DZ7V{0Mj{c<5qe@MckT2l!_EQ<p~3DEKb00&dkGMGu4P!8~}%3thk82fhjaUEtQ>
z!c&o1;BxRl@TJ~=4Jf*N%;STg=<#(>eE7d$3~s*6(fc6q7W{KS_50hP=<-8QeE%dU
z`af^E<Bw_JcKCZhjpICz%R%Kk57fA>1I3SZQ0=_{6dhj)s-9~><$ou*1$Za84frAN
zzaLaNp8=Kb3!w6U-{bE<@!^&$T=*WK=J8?Pe+qas{y~pdfCu3JG`JG{3CNH{bMfpC
zZU9$-Zvz?1=n3!dAyEE{LACocpxXN|D1LYp6hD0hJP7<1$dVE5c$%Zf5>Vx@2G#x=
zsCjU?4}YJ>&v|?tJec?`S4Yuw@K8|Wy9yNF*TLD~)!-cPlc3W722}c82V6T|0IJ@z
z!5;7;a7XZVQ0@K%xD)tkP~-U(a2N0g;P&9}K*@t=K=IAAL8q_H2GyP=p!#_}C_cXt
z+#LKasB(V*ZVNsIYFz&Y?gnnT#_{9cpu*>Z%69@NI-U%QjxPo^{uhBtcNr)?dV|Ne
zf#R<ly#E$Z>F)w}1@8qlUS9;&kFS9{fKP&I|I?u8_59Oa_<T_1p9Y=?z64bK+d%c_
zelP|f^Zws@-0TcD&bxr3-@YKM6U_mc;?c{&5%3{!J$U$w9DQ#FH4YyJRqw|^jl%<=
z==5dqDDZJm<?j7rNB<sB^KvPu{^vpUcO58tUjk~Juk`p1Q0Z<5_W<t(_XNKHvJ^!>
z1=Y?2U*hr=LD737sQLU#aCh+a;56{Ppz?nL+zb4=5C4t#Z+WKc&;FqJXeKxxJO(@t
z+z1{6-VL4rJ^`wqhn(g5e<rAUMnSdr5>WMA3+@fx1#1303aZ_|0>%Gx&vyFI86ZVQ
zH-I_tAE3%P_Z+7Wt_M}l?cm|ygP_{^XHayTa<0=8cLO!QjtAA=lE<6C6Yzfr+!@^C
zJjZvlK=IcRpvLhOP~|QMHGXG;iZ6qTzX;qPyaE(|-RAKVpz=KmD*bmrjqekn+Wiku
z_3laM_5lwCm3}cOJ{klSe>Nz7sDLW}LXTH@d?zS6e*k;|_&M+}@EK72ci51V8>fJ?
z@s~lB{|->~z84g|J`IY$z6@&qeG3%d{18+-p7im52Q?qJ7<TR522{R1K(%8(Q2cQ;
z7=vZ-0PqdqLEv4W#`zoI^TEG@mOt<6*$-6w9B?MM2Al_8460xEf`@{SgZqIy6<j|K
z2UY&5;2~fI6usXHs^7Qy_-}#g_us(#!9CWx_2rx30RHWm<U^aW{(;xxe_+(DFJ~5=
z9&`h!{(K75xc?Ybd7GW@^z3~>g)ad`w-HeE-Ux0EUJ9NAUIuOn{tOgfJqfD4{{Y1=
zJFj!`F(|qo0!{%>1XbRAP~&texGgvUs{C`oZNMQ=<5~h${>wnM>kXjj^Fc5MzX__G
z{{yNY&w!%qJ|#!bdEmDA&jD5b`Jl=j1J$03!0o_G!3OvSQ0<#C=GwnKsBzvER6TP%
z9tSSLe~S0N22{VV23796!KvVTLCLKTf}-c=K-K>(Q2hN1a8K~>K79AG3!e^ZzRUx!
z0Z#?huOES;=QE(%Gp*w2wI3+{nF-DWmw^X^P4IB=?cV<dQ2ludRQtB8y7uh>%HIR-
z2p$LS04@bJ9%q1}Uk-dH{FMha-kaB)T$=`}UA>^>!y-`m&jZ!(3aIwK0z43W4=6r-
z0MvLs4yr%f)m=Mw1J%y`!5BON+!s9C`!57{!hb!uJ$MHw`T7Y^^?VJ~xc?sP1^)>u
zeGh{ydY=T!e+D=M90fJ*SNr(uJl+k8o{xYk?~h;~7&YDa&j%Oay#nk9zXU!H+;iOF
z{vHnjHD7wX|45JXz@rK810{FXgU5n*f@<F{LAC2?Q2p9`y`#ecpy+op7=t-b{kRld
z1K#E_+TiGUI;e7T;I82L;9=m!pxS#IsQh<<s`uNV==~(9@!EQ$<FCU&#jgZ4&gX&C
zzzaRT2~@sYLGj~5;4JW0p!jI_3mkv#@9}U@bU7K^6I|rO&jI(sUk26B*MLWYw|V>l
zsPwyB==Mv8fr>vHJRW?b5C0-~9R6oOm2=$7T>MKwg}>GN9|OgI+g{}6&90#6avW&w
z1J#~Ip!nciP;^-bN`AcF<2yjn`4&)gxeFBkKMbn>-vL$b&p_4pD^UFV2k<4}W*4LT
zfoFl5j~@W<0q+Hse(VxQ|0XE^<)G?&J-7>at&hLW<0rsF2!9lu3;qE-96aRZZk$dB
zRZjy{IhTN<<7+^bcOSSr_?Y)U4l3PWz?I-;uW<c54V;dD6twn$%6Ba&y4?Ya4iABQ
zgWm=vAN~lc|65$@`n5AC|AC<BGzV09$AW72DWLeT3ab29c)S+e7yljL9^fOO+W%8<
zA^2xd^&bC9H{VVNmHsMF^7=MV<M=^P?Ys}%75oyY@_ypu{|c&ITfNGaw}Z!7p!j4V
zsP?`PRK5YQ39bWS+33fh<m*|Nx&D_tUg+@(P<(wIsCL{9s=m*HYR@B}%Kss#_Wlyw
z68saW`u+wg{jQh0aoHQ(AO8`c`0q3yex}D7sPTU-sQRt})xP(Gn}Z(#_W|z(_XEG-
z{eJ`x!N1e1ot!=vRQm=&@#QEu1+0P^=cdP3d3-ad_TK3I9|sS_|9MdD_+L={`zNUO
zZTlKm&oof{c_b)47y;F;4WQb2EvWqWfa>q(K&5{SRC~5~ty^EW29<wba0{^4<6IC?
z5FG=)4!j2}f_+yom%-b?`QX`CG8e)3fc%SgxQaGx#yShW1^=$EcXpFo!L^Ei1A9`i
z37!X@cD1AP-Qe5te+JwNJo}AKP8GoE_+Jf*E_Z;U$Co{RAC!D~64X4{>`iW*_W-xX
ze=PU`@Dy+x@F`IJeHv80sc&}tdjJ^YKLOOZpABkWjCs5gRK8n5weRB|KLe^gUjTOj
zzXd)Id=lIh{2i$DTVCVl^Y)<P_wjfjsPUiWu@BVvy%<#cnm+t0kM9M=2ls(Tfe(Rm
zz`ujy!ybsf8XWX^GdK(XU%>(J;I}&501o1R)Z+oyx^|6&;)9Do@yRPdwdZp1aPUS@
z`MwIOzcb!Oo!~rB^cn>vUoQ9IH-IzoKj!^^0T0E0$aQX?a~gOg{wqPX^Hbo_;1fQ4
zf0&{d{{VOlcqw=ocrU1W9|w;GcYTMW<EfzNI}Gjso)3x-HiA2YmxAJhYrtvXyFiW8
zhr!*z&w~enKLAzk=GVLRaULi+PzP1cIH+-d4XFHY0X6?_1tn)51~pE<1eNa(py=~w
zQ1saCovs}xg5r-Q;P&83?>`$<Jq1wZtOwPvOF`B5T2TFZC#Z3FKdAKgf(L_-fSNbI
z_2JXr<<idt)vqH!jYAPsdDnpZg13O8!-GEjyWqC?pYq{<0|)T$^lrxod9aTEUT_20
z^B&iZ_k&yF{}?EG-w&#N4}*Jv-vL*GzxV$6H@J4Z1U!K7GN}Gu?ZdAH)sEXi&BKp^
zRvsw&eFxkN{E5fEgQw!3b|bt14uQLa4}u!E?}4K06W{^hAHf)$c9Wyuu^!I?75)nF
zAn-;|^*soxoG*b3!0&>`f&0IgH4l7|$D6>D@&5*tT<LwE<ByX(o&z38_{AP?0H@>s
zEVvYW64W>y`F_`*bHEDz+dS@lvzu>MfF}_CK2YQM6YvF~jLG7Ud7#F1IVidhfy3b4
zU>TfttCR1Sff~=JK+T`w+Z^B2K$UYLD1Lc8DEi+B?hSs(`yT_v$3F(ukEcM@yZh}f
z-=Uz&Jqc9)<)Grv1vNem@4o_6{&#~)_c?GY@LQn9|A*jI@V7qxZ=mSA{eL;!7gRfY
zK#fbE#|yyy@!tbVo_q~F5}bO6EB_?$5d4cl)jI}054;3aeV2QDBdGRX4{izG?eSxv
z`ggzge-TtWz6Kry{sKH0-1Y+w=YZ<x8jlx(`{BO<RDVAWs$UO-Gr<1=4+EnQx_#Dc
za5mm?Q1Lf`s^<|<{d@{keLLRi;*SE=p0hy7fhwr-ZUHq8Uk5)4J^?NOZ@vqe4*m*U
zu^DszZuau{Z@S0DFa3}k|EoaNb2BJ@eiT$co&x89JABy5y^}%7-BD2Vyac4!=n8NQ
zyb7EG{uLCzJp=9p?(z}mKL`}Pj{!B`PXLwvbZ~3%Oi*;ogFAvHaC7iw;I`l;pvt=v
z6dkSy)y_M?S>R)!==L<Ia`yVD(?bvNI1dzk2SAm-9#r|S237wRp!ns@;BMgC!B>MH
z1XcgBA9L{wz}@k`5L7+qc^m~##a{(QpZh@d_aRXI{Gt#4DyaIt@56r%svW-qRo-tv
z)%Rx~zWKc_d`nR6-X6Rd+!qv|Uk{2d9{`o_Q=sa91l$AsCir~tH{QSP$K5y|1a3q4
zVo?2F1#SnP0qzCnLAB>%Q2n^v<5i&Yy$MviuLs2k-^6WAz?VS%E_4umnaHVx{{sJV
z+;^3j-=}eZ!TkgOJHha~pNE}Qu>alR)Bnx;=|=PbVe7pAJ}~doe39oqp1+UN-29wR
zBYWcac^(9RkDG;i2>;tb{r=bEOrH1R`6D={O*G=eQ7P>A7W|8FAHXdk<PSdltDtO3
zFT-u-+x|Vm7UH%h><d2K(H`GS*w=CU;q?2NgXpFBKaINpca@L3lei!G_(Q<g;>7>Y
zC;mma-{3Ct@n?W9!#zmYRGfY%If$+UKSh|<v<2XnK3>tU#_dA8zXjey_zQ9S`+j^|
z3HTjC*g=F{4ZaWmP2hdF0?*>FU*WF6KaDg?K>glhf3a<Pe+mEP{`pFtpW^w;;5U3a
z!CKsQlp)#pQ{s!@YH%fPOP;g8eeoPX_yge6xcRuB<Fdc^;$aF$zr^Ky#3|ro{yD&l
zDM!B-;LhM#JU$AZ1)c`}8T=^t4{$E-8$AC7_ZgnUugb$b-1`ZifqNIvqdpRG+Vb0z
zJ}xKC$8nOM`W@*YdKF;>++nyq30vmFZv|(O@1KN!9;e?-kIskP2>)ex7Wsg$`uJx&
z-UWURcarzd2LJA#l?Cw`UGM!pU<vnI++TfpH-bOLO{X0jz@5M!5wG88!1MgG{7>`z
z3EUpI_u>AC`ybq!iTeTga&TMleB7Bh{eA_GxX0+F9>4A58u-`pJcT;-TgY<}cL@G-
z!Ck?P;MusHaQEZBM!Ma>BXGatS!+ZOZVmojaQpH6bMSSzCwP7Vcp>iZJRgIb#`9K`
z`&pj1;90+oxNC9axOF~^$7na-uGbLuF#cP>tH3jHdl0vsPy65ab<Z#RI}p#Ce8AB@
z-46JFl1X$e;mW3UKtHWhHNx%ykM(&j_Ne$9{PXD^S1Qo|{z_Oc&+i4V_hFypc?K2i
z1HJ;cFYb8UGsJ%j)bD#9599fC+}*hC$+I{3XX0-6@$UhfguNAf5Zncq{0O@Z_eI>_
zaGxS#DYy!^Iqn*qetY1yrEHc$Te}b7`ISDdtOWf2g#T3cX!`3VJRghuybrq>WQnrh
zQvUuH_geBC?t-E>@O%+&JMR~~8+RgMo8f+q)353A13bsH<EP+Pa8n3B2mCPZXFR_G
z{4Os1b|$Qb=iQ)wuXGR{iT@U!&&Qq2^AX?}cna=MKFxtV5Au9CsNdDNulZ;B57i%j
zzi|+K0+g=zd+!f0g@>nb#}W5>+-W>Niu(>uzk_jKw<q*6U;ZEQ_bZORP6PKQ{Ij@s
z;Wpr2OxPAU{l1A`zaiX}{#pLF;68+ZCS{xhUV___=lyVd<L2XkKDZC=P@d=E^jqP;
z_G3E|cQ4^{2zv<J5%+eUe*w+{9|l*0uftuAI~D)MVEFAz{sZv*AKb0P>GvWBrgu*#
z>^S@{0V}w#;Ho(Nw#EI>o|sGE+X%lKcMZ=^fa`H(+&%ce1ZICX;?HLTc>Z79r9SL3
z;`gF$zXQi{TNA!N_*U?FxDWF@7x!aapU<-=&pVLkK%9QBcM$DH_%htVxb=j62h?vH
z(rx7)ZSVOL!q3Hj5cogfD%@*uKfwJHw>{xokY|`@{dU4Fz%3?xKmq)I$+LcE<IeKW
z^8Xt5hm8LU{72zGUXl7y?hg20?bEyid<^$VqIUIR|78hTLp+`UUPoLEJ^~&E-t5!9
zf#>H@=AGV;*Yx2JdjIYC-=;u*YjDGaUjW{O+bWX>Z?rq*gx`M?_dMK_1k`=tf8p=N
z<#76a44mVi<!|u(1>811?1$i9gb#o(Q38I8ac{)c340Rv2+wZ<!*6#UZu6dF2!A>5
zaoqa}`yg%~+~&0NQNk|8_2XjPs|cTpI}!IdE{Ydc)|ca@m3pHd&s>@-=SzkBtk%#q
z<<ZvgfkJJ(I9!;RA&to9Syd?Ki{%klNfZZfNF2p$%C$mncr-UuDokuihsbQ<+2~MW
zwj-V6TS};gmaVDAp@=9xBUdY{)gdHX=)|~8fz$JGu2zW4l}0=~S{Pnez~6{-rBdW$
zs=0c-I9@1i4DpH>t`!@_;an-Ml;i1jh2%9biLY4iQX&x@3#_b5GdIHs#&tJzDt|(t
z)!HntE4NhK%nVM_n)RMIKA;|t=IZfKp-_&S)fi@pYt6DzZ+)>b8n5bK7*k=rSRO7|
z=SVMxn-@*5$FzUAS*sPw4G1ElwU*$MD8iSi5WEnpQLL0z^?1S6U8j(EZKW1BMk%#e
zuQv-y?E9?hnsMK-`UjJb6!JFi@v2${#v7Y764JC~^=#2KcU!y_kTA)FiaW=&Woj!@
zO-l2%Mb@Ju;ujZkwP>zEJvuU8UMV+5>(NnE-mD3Iz;WT>grSozY!n-%!bS5=IDF`&
z6NYLh#TSm}O3lJWab<0MVZAwaksCN;@C!@1p+f1Rs6)01x#~e;Xl8_reVJiQ8K}b`
z#tdR^q!KZ9ajh^`8877Z9L6#G+)CL@qLzqyOO`g$O%~UhvFbS|Ta6EEO_)wK@qOGW
zU*{y<it+S(mXg|1wG`Gu!7(OIw%hV&Q%er|M)&q+5@y2d7GX1z1P$a{+=m=k<z!vF
zK$5T?FD%w2<yE;Qalx&=35m2gg#zXmROg}%h2dr+EhdbhucdP$6UOu^@8|u3%9!gn
z0V@jY<M}ycb(yAle}B2&$RV*TAgLjfX?WtZ6|WZhI1wdpi=PiLGUfBNLY<_gLah-G
zG{?qrwT<4#9P_?nPAN*pxAk~Y+0%^>-xe1gJS{1PTvwPiOt*YO^HQm@J|@af9JSN<
zQ3AW}W@s2@D_p5v>y;v3C>0tV^Mt;sy~;xy6-1^`j8CE5EEy*JZJF@3hGd&uMfZeS
zH5<jTLMRfpMN?tvabu!3xh0}9GE!3L+Cr|;WIRH{vh9j1L+2NUH5II5nX)F(&A1Ec
zRBx7&^d_rRho3tc+86v3vvTWX&Nr<!lM}kVbD4~t8x&eTS;9=A)oKYwgl9HZnsFVf
z*u(l9%W9+IMXz66{p2_~>T5Pex$V|BUZ~|pm@EzhKcSoyYBu1+jKnj?isf06pK0-d
z)9VLP&9DY&ZL`Gs@1=Whl4M10tdMvHH&zSLg4O+l{R{e*MK;;v0TwgnsPham@cuE^
zXcWe(426p+n8ZL|h{YT}u#{^Q%EKGIk6GcLOnsokQaS*Zz+#@HFm<^MI~2!@jg7Hs
zHjU9jJc6t%$IJMOyl6DhH!28{#=lV(mF0$V^@0(xP@|+`$q6mGqlraCHCLla=#5HO
zEVF9XQ6Q1Jr6SUj<r<!A&{!pD)*F>Ex=|}ih}3)IHRL%oMrF&z)lzP_Fj^_)878St
z7Zhrh7#yoG`s=B8I9H>HQL3Y`8krYupauy>)xy|QR(lP~SVAX@>!VD^+3`>lLXH-S
zHPN!kTnq7IxjOoBuj>`E*LsJnSzIhJNI{0^K`WHUSi?*c#;R$EafVCg1Qm-zNWPwq
z4(FP6NHMgLE(eBp)k<e<PqDU?t5!8}ZB{`IFQ>ZZD7R1Twv_B|G!m*F6`9hK_<3<?
zr^dFtwm8ycV8y5!4KK*00HM()lAMGMh9h25t2C>Y&%F6UBUdaX{*jhg1vg<MG4<La
zG|rVbI@V^a%f&{erVfV+5o9*8$YpJ}6*5^7Ghrx^A+Mj-<ZxS=Xo1t~ZHwt-atK+f
zC4GSD!YKPh{pI0e-t>+TGT@h_)^yIdFia5>5Q%TKZ+4V~n9Nw1+ZZh@tTj;%7R#{q
zD4R0aQzU^=^A&|@v!W?IY!gm{&$1vUFSs?Umr_^+B?%lydT-z;7cDya1g!s-L_r~u
z!rYP^uV5RqHf&^)&_V590x?5U?Rb);#v4e1YGGJ`CeyTjF`a9bky>u7XFarJFzdy7
zQmo`*rG^kd#=BAz4%e#VS=@B;q$0J|<lv~%8htXfA#Q!y{+LjePY<Xf`6N`MTx+D>
zpudO2w9hkqv?yO}IO(Fw0s&e>6Bb-F2CGNZWYRzn%&$P=I(~#zJX%1AY4q}8Qu)yg
z347x~#fF9lv6O2fFqwty$61t2*`V~?T9xS*2X(Wsp<1j-db!F}j|++s;04noj2y|1
zG*!K9`M2iv#{I)|H|Ip6tIC?(o_Mm_Ya2ZkScxPRiuq`fJvxI<t<?v0vXQBB>4I0X
zf{zyq>s=}mw=SKF)N7Ma#E1aCYJ09ni=8?ZOZb`sxVX3hS-cpD8ZTt(uzXg^ZQeL&
zw@M|sYw;$42O5=X)#tYWmNFku*id9OBdL3c6Fyp8K_iH5-H#U6Dr3=-Qe_CsiV2;T
zu7{W)X<8$_HO#B4#{6}Ota#zdGgd@hW7n)$y{K=&(!Tl27A1-N<kG^2h;gM%uM^GM
z>U^xQ<&gqGEUp!{18S`OiP=CPjfqLOLGIb4f95eZS!l`p!eGx?A!B2OMpmrkUB*>z
z3+qcCC@}UYH!hBui+r{+Bp?EjjIcgKSHWRBk6ekhBhLi#JCI&in5{sSCPKo>&Pq0E
zi%Hwkb=NIgNfy7bDR)`=VR(?<!iGiE3SwL0h7t2~3_Zzh>6F8Dp=C%`En2a#f5j3j
zuq9&6D#DsI`%{m6X=fCM;<;|#dSy%MvQ(#JNi3Adi?vEw+6xwpoa#qJZ<Ks1Y(x)g
z+QvkZ1Kl#S_It@Lm7&0vYF>vbYlTLw$atarAz&n}q%*+olQzOtm`m1qNjPdTO<aSi
zrlgezEuecV&}A%-#vvb9i&YfR3YIyE%Z4i!4I1qf9nwn#snqRs3Io&Ip`(*jVN0GL
z;;|en6N~tBsaA?v%TSn_Pw8HxGNn2*7)~W<m(X6DaBIM9XWVtmMWw3Ip>u0(LzQ=1
z3)@$r54M-nG9e(A^k^|qMOt*lEe=&Uu8KZyx`-)*_1Rc-hh=8zSf^P@>kaAUQv5QE
z$y`A%N8s1leyuIkOb@hrWJL8dX0|naeWg63q4t=mo;0lkOTo5na7&e~W!Y}m(Vb9Q
z#bRr<D8!B|vn^!88eA;Lg|$-IsIReJre)(zX%n`zilt1cw3a!ZWml#p-!?XD!@7`^
z%-pY`(2>NIH7bFc5i-!24USWyWD)j~xn3E=?!kJ$>Fp?r{b^q*Ck>M3lq$@4P+drL
z5i3+XZL8R;B0*7ETP&0?Rd`lmSws<$BH<_(`czMNDj_a|7U-JQEXd2EnDbm&D~z!8
zuopBzIaFa$GKJWhWORm;FiFr4$5NHyVT{JsDd<OvnkXkpZt=vR2o#)=Drr*(esqKF
zwPPncTa_*8;-+IeSyV1;fMZ1cAi~9^Hj>i3{Dg8A3TWFtm0(f7__XS^Ockbr4M#f{
z)C$8Gm}^X@?vrVKrMAv3<xmb%<nq`xSh&%PD$1!r9m_Fb+GnBEBEqn5X!6$CNVkgY
z+>p&{8ZWxHx2B<O3PZ~D)uO?y7iY2yU!GfsSO_K>;~++Nh$Uey1gvwMWHLwVppC4W
zWY)k6<)nnO{ZFY#S*ksZ3k^l8vRuV1Fy(Z{w3C;Hd40Y!waW2AuUbd_WpAoz%z&#4
zb!pDjN$+y;;DS|J|ANq^)FCtTLN?nox2(6cEoT-ZGG>e}MNQtd*fJc44VVq4&RQ%k
zwwbeP=_*mOR(NUCsqOti8wd|>y&CqL^{inEg89TQO@XZnZJR7fHZD*pQ;g|qNujn&
zO?*LbLa~*al7wrKjmJ3Gl8W44HoH_Jq2mTN5Z5}hNJahi7@{vS85;G=CWLUWn;EDg
zE0r@=NleuWYz)n`>y`miQmd8q5EQOmTP$hcGn}jDhKeP&_UJ8c;LLa_#$rs?6$;gu
z3BdB>_gG^RuSM-S(YYGNNeDxDiX7dPq~2(m4wd*z-UV9B+~cARG@*<R@3$4%IO%d(
z|FX)6*^lDY6}qV1hLz?uUFT`hWqpvN$C|1(Z!X9L0FTZ}xU4Y3niDN!Ozbo_!+fiQ
z*<l&F53SeVq^V}hTAtew;k*HKd9fVfIKrq$9SkTFgIbdLEmlj|(n7A(7|j+IxTaHB
zOV$C-QcUU3R2$4drWYn>yDcp3HZ1vU@tcy%O|DM4+PJ<$Yg%>W;l!N9nz5c9Fiddb
zJd9<>bM_RY$*@G(!d1x6>r`WFd7Zo2T5zXQT4rUY)x{t&TB~{P&F)fQ=XQH3CTe6G
zUH60Cw%>T}jp|b1CN&C%U2%9{WTH?fa7hPSNUE5zbW0VOY(knzTGGO}c1=N>Y|IKP
zq+YmbzM>L#xU3qvhBgx;wkSIJ7ZH!iRTlO{`BGSDPSW8p+A6&gR@AOVhSYxh2E&E|
z88^%Cl>2T?!c-`8L7W@M9A;X%lti;pxw9)35)x@KM+A52ov9vfYdu+#uK8QGEeSbn
z=aRI^-N~Ry*~Hzia6layw$+E$3|+e5%`EZcy-18Pf%vTC?DdRjB7&+*(sZjywh=hT
zj5b=-q&_(vTzZWZR%goSwbGiyqndHPGvxw-EF#HCtno@}-&Jg4?DYoJY>+r3O^`WN
zZw(GswboEA_<k*HFUQ7;wcIF?HaA;Uu#naYJzm>a=TAWOWruUp^!f>h`^UB>ZgRff
zXyvKVN;`H%z0zSg`bG$lio<iAeT!6}<SCZTGL|Bsq(0gO`jwt=?O-_WqkwhMO052!
zrHx{qP1>x)%#i0uK}cG}n4Z|9QZNr2b?;_nvr%m}qQsaQOiR*2mzz>LkF!f16xO3v
z9GuqN-(c;F506(g$A&D}Zi_h$M`@im)p|H9Fm1UHt+<L-nk4aE_c^<zGU?~aWm}`%
zIs|cM2CsN~%Z)Ta4*eXjcQLGGbITA^3j4Nf8PO^<OWCY+h^UjA2?4&b@Tty*)u&93
zehgkM0cdPi1g9P701d_YM^nNqsDxD@wX$h5ud50iPlg6MYo52^B*wK2D`f0!z0oRH
zUfvxhxyj#<3XNi&oXT{!bGho1VjwIR|J)&Ib|)0fPp+})&PVn2FI=f}26s@5$~~!8
z?VI~t>dC0N?qHjV<F{J2t$LPvn<K~vKN(iB6^Ihq;|G^biiXpTwBK{H!{-`B2-HGs
zT*^j8;T%f&<n1xKT|<;kz?|4Ld$)r8QTPIP6n=U*3XfJ7hG7qED?Di1kMK?;#%i-2
zlf+EOVdt?}N7Ft`lQ29F3@nYUgFa6FH7p|*Kkl-iJlN^E+C3lful<CQXT$r$uGB|V
z-IhPQTG(Ou<k59kt}5zM0Hm@aCP^Z4uC~3Q8*?_C-cKf;{H+r8Ej*eK_Peo;p=wx?
zxJ5#BjcCcD1=?{#OE84imE=r}9bc<VdvIqXi7%}DPVH*Zew+C!OMAZCHlj-rslJoF
z&eF8aq?M(XV6exWsUENm$KV>otP8O{wW%AXOfXlOW@$Fx!`7ThVCT%@LG8a)5nYyn
zMURt<@B!VYUEq(S2AFteK@qE`)|}44^(YAsBb(TNy2fNOIYm54=~t#!zdQOyTqa%j
zy>UbgXBdH`*vbkeZszo+O$+M##E?u=LZbg%byia6Tb><SGD+%gtxU`IqzN<s*^6(>
zkf}j*%xrj)u_#x{J+Si#iVGrh0=2T21d=?VmXJDA&A(Vwo)hDI(k(=`-7)YLNuU|)
zAidgyB+)Wq*1HaA)9_9iLi;<E6{6a*g`Rh)swJvRwoqzog&}8%wahvd$?E&jfD?=X
zgBt0B-Ccpy!*!x0rJW%=x!IC{Ve`V)HtvZhvn8=**X@6j#4N&Qx=sR;!{$%|qlo3L
z#h2EVv1unsoO;CCWXhzO`a<rqZaLY3aV8|)Q?<6upC|j2NuBjLxoa4rVm2qqb5QA%
zfHf;lU7@Q1Nx&I>t5@heISFVz{vRl~(=b^a?P$gJjmi0xaZBcoQk?)hlYxhQP7QZ!
zZnxD=jTD)*?zV>NNCWL8WmAgatqf_M8GSfoTF)BjX`8=9Fd*%^78c-^C717C7OU~;
z?qa1(v~DW|uviUkjBG+X<;@;5GKS%?b3B3A#Wv!}a)qy{6vg3n8{@uogKa9)Kyzq}
z)0kD+JLxg&vUJT!;wY~*<5CI51$NZhIroGF6N>O0F=;8C(j)~{eJ31~KxMmkJg|`+
z&{#AmOO-ZX$@X)Qu}im}{)(zyDoiX#y;1i>noeyAwfCSL-M-cNR^C=Dzi*NV&TvY0
zf~pRu+Mtn?nqy^mWWm9V)uAH=%F-#WYmd8Kn{bg?{YV^)#cVF9+$FW^gUoSE0d@pI
zGH*<?p6M_a)rTFdSpxFmtrE4U%Jo)GdC7U6w|mUUo)uaCYRUF8Y}44-CpBd0Z^@FT
zqG-`H3#*H*C+RM|kfq(aq2oaj!_g%}#k4QPI|~U%X^Y%dE@uX$GUCEkn@1ZM+c$<w
z{}YcG{r-S6#WQp=Zg&Xn_?!G$6V>c^ZBsYp+e~rp{4x|`XN;MfhT-^CubVyFiL1Kb
zrTM&)VQVtB&3e%E-4#qUyKcF{$*<*<Vi>Z*X~|OH-Uev9OWD25AcI|VvW2G0ux_Gh
z1~g!-^e#<^pB)SiW)c(A+a-$DHpv!{9t^7k?(E(7AdHpO5LSg$3v)M6IEVIf*=n*{
zRBmfcVZE4GhwdvNEz2_0=o;jDowxMHUVX|+WE=D<jL*;zo*S-JxL5#7*haiQ+H9!v
zt_P$t@x2KoR`2Zm-_0@Rv}<I_1kfSdMU0X!Z5Ep8NxEHa2{hBrhm#^JOs#ZluPwPc
z!}K>uCTW*j1cKl-u1cHY%JmkCEK_1$U}OqTzPXXf)S*~ET-ugRhe!?nwxwWJh*8j5
zyj^Qz{De62h=9Yo$KPeCrW6^fq04ICzqJcwGg&id<27T*EQ?>JTUBQB(f(gKcvA(r
zR^gupS*DfAtWO;;zEz$5ti>QzFL(=@nY(CQMMl=awik6!f(I+r_-Hj!)U&s!>V!2|
z?*^Q3z>BFj@BZ4tBvRM{F!!j@$WGh!$4<wB*0v^dZ<G6eYr;FT>65oGCoyStX^>;l
zjGkwgMJI`GsW#LZL{-Zr#OZaKA~{|T$gnV*WJR@g(VhGIG;MJV)Hn-dKFK<9Wzk@U
zG#t}%xWO_It*J(9u$(T+-1Ws@Q(!GIubKxwDslGCVus|H)W*;odxIogt=S6CuPbcq
z(K|0}<}g}N4#kXNt<#jPB2IMI*N-He-3%>Iza#WW-t@J<mLxE%O&XY%>(D_H_it`T
zXB0{-lg9gQmSk^Vn)a|My6ypyI|0f^Qo<!lrr0EoB<~`w`uN+uQPJ*r_cB<G!jxoJ
z(GqHW(h|a6qs1Q>wJk8cZQL5Msx^0@0CY_z1Ft{SqA@hbqC2`m6Q8mQ3GGC+-U_m`
z3mUbO28fG5Isq6ip<Qc%qp!6J*9IAQfBnqLVs5)|q@z}aw$cVhi)(GXGx>6HO($v6
zs#Iccd!q=PS)b)=fr(q!Fk~M~16`2?m$fPit8_j>rZlU)RSsBs?bYTf%hQwOV1b=1
zjjZge!|jeq69%*GWQj7i^i3)>xtie$UGJE-cc@YB)xtQ1%?}p!dIfqKYegE_%*1wb
zKQhL&b;Ta*)m(XsRvKQZR+RZ+3*?J#>}eqK5r%+OwTj+;?CH<<oUWCpQl7`rRdTo4
zonpl^=l0I&opW)nR2|J7HEXJ~7xyf$j}-Gg^P3~}o<Xi;<O}1cc<!v!My9S>IoM<G
z5K(5&LgvK0c<!7dj_#Q=x95mC@e#+(n{(7*bB>rZhlD+=3*$xA-Ii|7u}XK;5iXr>
z`1B0IL-kUQ^YD3`DoK*@#=%&#){IZco3}S_-cv@n+E(gi{+~2;8NF@79rI9i&g~ye
z{5^w(+}ON$S>K8!Yx<TficeU!?37Zmm&Ttob$S2tMJYv&=$$il0f&IBMLlj!X)rX0
z^Il!Cd^}n~uEyY<xMpy1&v9uwwUpafJ&Vf26}=ujFFtOl*qFMi#P!co&tg=r`n<Tz
zjstJ~#JR`wnw}m{oLP<!I59qA*6~xhijHtxh@6RME<vZ_Ue>H^*a{|R5^l@l1;zH{
zt-&ohtaNyyk6ShM9D91q>lBcNSc3i<?|hCFo8^(Bu7<U@WI}XH6`{-tsU|dgLW*oT
zvFkO<R46d>NPE4+&$KP1%SL8P)W<Q(kgr~07p8etM2jkO!d-&7ii)+EOql-y2Wt_0
zpakw~9z}LPnpFg7K}dZ`>6tQ=>VaD_HKAPD9zQLWPkJN;*4>EcVnjLS#Ss{wVomcS
zl?Gdj!)HB`{KdAROCr|$PkZ=)x*7$gQ0|AD7cdW{QkG*b&-$-=<a5?V_el@?qKB$(
z&(s?sa3+bc4H?3#$O{w51AA*2U7pJ=(n_=)&8Y<6Yx|N1;>p5wU$`{G_;CR*Q55tp
z1f*!jJ^`aJF#$wL67WW7!K;pR5S^x5Ax__GNi(4w-;x#3!0~anrlct*l#$kxCYn%8
zr$j}*`q5V|SNQ4&P}E01xM|C$KG+24gCFwnxeq~yuXZFK`^Xp5Z+$pk51;JVlw5v{
zS~IRG=NNvs?G|%rTIKv`V{u>sZyRlxDqfq5!eGR;BKJv=L?Iw~Fjkzv3Yq8*e2|HS
zk29GQqGnQr1ja|55|mOF^{tDGA*h%w$a8WrGiOyO-yyJ_#s51=nLi1glUWo(5P=EF
zhLgF%wk%1Rgcb>91u2eOc_u-NT2gp}KE@tt;*C{FuZQVov7{@tw4|F5(3*Tvy)e=&
z#_hSdI+Regdy--p%?Xu6eSTR(*x8%DT>kSyCXHIrtc+KZbNnQSf^%^{9A3U4m!@8j
z78I)Gi#DN}5IZ5H=tGz-p((whs%1<Ap|mcS=Zm%C1s7B>fb%-{aD~lrDOVdSPVo1Y
z^m&oNCPNX6P@_^N(m`+$DS3iFOznv&y>Ze_dNaIb22}UTwEfmFnS6%n(;32dp^W|E
zhyk~FX*iNRn)q(rVMX#}V%Frk=4n{3EG_mq<0xO)j9j2vwy1iuYf&`$U#^}!e*2M2
zn!P-yyWVB_i?C+*`kqS*C)AcshRLd$&@~$xeRUzF{e+@7xg#Bju&K@ZS1aw~-6#$_
zqJbh8{Pez0JYM0;IvP1<A_oa^X$IzT%|`oLiPpm9yugujf0e=WovlMsBz#PVua&rE
z$Zk`Fw?8Vq+;zm15Vn(p#cC=QlD$4BTf9ENG?1<lNKuJa)|~c{h76JlK{#G?FUIHG
z`v*vpkR-=yPH(Fi)N^jtL^R~sfWvuONTp@z1WqsUtMd{ZT>UVq+j!tTL4EU=xiVW)
zOu^dR{rg4hXh^mk8Dp$OQ_dC_ku>)DgmoDsf%_tfHV!om5VdhBely!YXrf)ej%P%=
z9M@)QBb8E4pD<D94wX<uBUL=7H--3ol=O|g@v>~;t`&svMnDejh#j)Ms>N0r6{Li*
z3ATYo%uwF@k0}@`jpf9LdZEic)qy0bM7sLr$B(;<1R##Qh;fTVB<m=wHdbYblOWh3
zl{c12`vhLGGL<G10E1YK>Sz;%iNb@};D{@fh_;_i=47|Ou`J!xY=W$(U9yNx=&YB+
zMJfuqidf7qcJ}rF%~m^NwV{zIE&XH(!|4jMua-D*Cl-XLVL?ERL*2`)2)SrUt;t*d
zjwa%DR(-w<(8y^a3bTXIN+zL3#}Y0G4=WzHsRDnojGz`ia0j1L<n==(;|mv@8k9$y
zV;JN0(jp)5dEf?YfOJQn#IRd;dh~XZoDGJ3=ER8Jx_rw@AsV!-^=i5|glI)!1j83k
zmZu|Tn`Nx;b*;v*5gcJ(ITQyax=Erk`ADtQZD|wf)E4E04#pFkYSHQ<hm7@{U8mLD
zgB9VsBzj4asc6?MwPzB+c{foXZ-B{TzfcWV#;P2ix(!}vB8Rn_wyRB;CJQiKmf2an
zl<6`T0h7g=!i=!eOF~-5AlVFxP1V1c>9xXb5=INz@cC}kvOy&E`w2QAo)aJ2#{-xO
z{st~jd{t_OnS*)O?O?W%nfeCZCsE4Sdc@)(%F`ohipJYSSfZh5M{HxO4rr667j&Jx
zH8!@?j&d^5@ak7OlMy3qqFX}x%NSQGtzp>&2slS=?m1_|lO+OEoQeCe2E~i~IZ=^!
ze|(fvNHOFmQSK8eT7lG}mVzZ#G2_CE1++?Jvsi`qCbgQ_`^!#*w~45580TACkQ`0l
z?llstfUyiQq*gOD!#Tb`<z%ZJ9@~qO-D^$d7t_A#_ixEr;ImYpWbRhADB?QpL<8Sb
zVG88jQF}4cwqA#7cJlr#-nh?iY?yjEPEvDYFiFVi3os@Wi?LDhCKm3fK@e>p)Rx3!
z4+v?uL#o7!o2F87z`?rC+{5Im)g(mI2ZV$4aAG?LyUm#FB_Xkmcakk0#GFzrBV>{U
zDlHSt=T~$%qf62D0T!4k4Z)Ckfoc7=rK>~>5&kXIbJNOwpQX?q7qqevZIj9wRm>u1
zMg(M>eT_vMn2B-yt5^3eS<=5|#ghK{{d|ulDUw!TG1WroOPS7>u5x2Twk$z5<h4G|
z5;jhe>V^b<e`U>1Na}a*wyfDwZ;4GO)N<Aqp00kDY?YT;q|8b`6KT$tWOZ9h!)g)r
zk8wv?O;oGgieZmokXaRxhzg1;vF|ftDj3<4$W)%0MRTOc&}Nou|M3?olnfy18C)Ei
zTMUxgDV^D-CRIA)WXPI!JZ%xWn>E~s<=dN5Su_c%JBvBj@DV#jFJ+7@_D90l4O!pd
z;G%)Pwm{BuSEBOE^}A0kxmP`q8;yc4u+nK1mPV63J`A9RK(z$*KnuJSA#M$gYE6ee
zXh-l)vo0Ob>(}nvEpCAe%a1Hvl9}}iW7YNv7pW!;gH_JB`x{cquf6TFw8qz*(Xwb-
zPG(PcX$YmC6F5@{bOR-49|@BJ-K{lEuI6AjaIIlL^%)mFC)iXEAg;XyET%E*ETWIq
zL3*!*H!3-7hLrMKtaj2N$+JW!eM{+O(;>!qqo4OJ*^;_J{x|DHW3~R+_(-Sp%B8wM
z1DNz>2`$;O-L+DgK{B)%Xg5~07zw!@@7Jr@5Lde}C}P%2ibnH-CR)Dq>?Q#Ajq!@D
zAc1~T?)`K$j%MCEeLUxm8l>u~nU1R(#o1~nU&RoAWNNEajp5STUfRr+Ora|==~8Y+
z1J>wZPaPg+9b;?AEVi|c+g`rqe)wkF_R(#Ds>KKH^=I$e_=LuX!OvGvFhx$UoA|cS
z7dG6!X|Y?BCa(J9nsxfVi^LcVPY!qpmO?9~AhWjl5ENB$vHR2=T-=L9lg%h0NT#}U
z?U_&|d&ovnwL&D#TV_u^oS}qMESmsLf9m4~Z{?}jrA$|rm?*P>U|(x|@AaUfsYg(E
zCUlT8O<!1D_*{WD91}Wbg=PDbn}y=S2Xomp+V%&E`h`?-H#hFKtbtTgXj_!Wq9ZZe
zvw^@M>YX1|KMcuDFt);emea<dZK#>zHn&K}#StkgDukYfVCK3R5GES<AdmJ6WU0Bu
z6C!X++3C=<%5&|+Mrj1XF2VNZ5V&1i^jl<zDm9NeJEm=OZhTxaIjjVec3q+{-6$j`
zfb1%#;T6YGGM`jJF$g0!>K4$zCQulz8ppCKvXFtd7MNt2Prqn4+Tg|mv)5KV1cOA8
zkui@+$CO-~N({u9kw~@=PM~XANoH7u%(TFnwmW0y%4oq`IijK0c8k4nALL+vi>=7b
z8=5ICU9x4U#vN=g+iY4IC;E*Zt%pr1m1?k*>7y3dI40qqmVshKay3)zjoX6|ut_R*
zZ!z+wa?@l~X6wQm&|*4?NT#yB2Lo-`X`5At2`UOFLR#O4k?h8CN!RQ=Xz1Bx1#2E}
zzZ!Wp|H2!Jl6I+qYql&An8inVqZp|J``P^nTHrqx14nU3nx=~6DBm94`e!B)TRbv`
zzm^n~=B|}an#!?sdlFNCLcO+i51vqkDQD2hUUAh6<mgU#)KKlHkizWMET=8knjJpY
z41#PD*c`AdVQIi5v2yKNctr*{{;EvzkpB)0?8_!aEN;?W`h#?S5)kH=B=YJKH~b$2
zvr{=UBSdoSM%vZst1ub~XZL_Jxe1IGz~Yj89Y!o5DdHo^n^nK~!X{1Pvr}wC)^J$~
zAwWx<xC#LaOeLwXi89ff1_!Zbve=YOD<Wr~he;-f`(h0B^7WXI*Q?t}oeM&pnoY4+
zVk;rFPGqpLICGMSHK1KYh)wb)=3MtV8TRu|ebT8#B??xYlxf|^WMr1N?`gVr+6QK|
zV>gKyF#Wg;LdShyrWkqCi5k>mvg#I2rxAh$8*qBrl7~*DdTudx`?6v(P1>t){AZli
zQj8hu3m3q*+16zT+|9UTKDC<LC(q<9m+(h2O}l1jn^Nqm?4qFrwmzWc&JJuQq}`TS
zO|6@BxuxAju1M+gGmG@?nZmpd=F!P=C+FhzT#4OQtBgSTu<NSHzA`aowzVM<2AkfW
zbeHv<I@CS;CiQ4j+ljEzf@ho~GXATSpEQ5kQr+F@LVJIo!aiDq{B=UOZ0EfbL~$}s
zich~2(@x-Iw3cx}!b*a5Ti9(Ao85tB>`2}zO{x4@!PW;`X%Js5e*6~?^|fr^?A8)W
zge?WUOkLwp&82R&@=6Uh<EM{JjOt0tkz~G_M8Vs%YLXJ1VAi6~G95U5Iv*@?ttTDQ
zl|_8=V#6`GRzNygWp^!0l_?Ycz6rO>wFe0W+XCbicMA8X=#y9Cn>3<R4bw_Zi`%3;
zo1F4rygcK3Gg&Ub@pCJwNI5ajCUqh0wpWv%Wk@`=d}6EKaXW*l;r7EK%7igV(r!|N
z*hmez-2v(kg<@e)!F*NN2FJ|H>E1Evw`ml{Ql_~p+)P2tap_EMf38q}i3xjd4gH2i
zED7-s99<+&@xt_OOEx%|g|lH?h;f$eVkUpM4>xhRmSy)fsLi%X(EsotgRhJ|%+gNZ
z<#~?z?7KXxi-l^DyZM!PrA?cnQ#hTcqO%5Pi;h?F(G~>HxYU~oVJytj^-LG*9G#wd
z@zowXHoL$++jDwBb|P)eJ1M^*Hi(O^qIL~8Cf#`$PaN3tk^`G2uIZv$=E~@MZ0>Z6
z&V9DT7JP2z@<u|&h#z@dBOPdRg2BEa{hkkRrsS$RN#_$j`tLMoNQ2G!TJDo(jK==@
z6aV?qurymSnW?mFLj1+344o!Rlu|1#!d)HZrWQrH&-x(FrTJTLB$e6WONTf0%<rXS
zjBB&E%HZ22pMBmZlO5~6+lrFKwznKvC7t7zSBKc-*f*P{Q$pgCosTqOwh+)f6PTQ5
zLTkGcMm)VtJ{#*yzLQ#A+cXLeCc_zNrcCIiO$(w$D-?BkyA(TWR1)?}&t?s!^-Lid
z@iL`q`{Qktt`yd{axhU=k&2n!E!HxByTZNzM60dJjJc13v#OEZ9QZfuoOoG83fQw&
z++hOoCM@4-@`5gg#=hSK=~GYIqH+Tmqn2K1mi%^;fkX7HUCFpOaJ#NNIE6%~vF+)y
zmjkouR$^}GbA}|kLiKuCk>g?aZ6JiG+TbpwU>tGR-&Y3%k$9O|uCoF=){OKi9VWbZ
zQxnT>iuf?eITBmEJ`lu#9&b2V0HVh3R-_@?0_xgQdg2~7YT?}04%w9=+26Osgu8Oa
zjIdF-Z<m^4R71B^$eyqUwWosGX<1c&=GsE})*O68#^un=V80)RJUa&c(2r|BIsz6y
zxpzmPrM_8%LX8=M#)kV~nMWyw>F8_9*!}O86iEV2u1*QkA}mFs5ob!d0Hrw8(=}0h
znrCfGOHI18!FrFR@_T<B?j_q$yIz7(0dXN)3<S;Gv{AQgrl^e8eWyr2A!W^95ebF1
zZE|dP$!keib@VEhWSKTKye8xq>-2)AvmpA71GdSITZjK(QR%eNjU=-XN-8>%B!bc`
zf3#RinP1UrcAgXsXmf-u!|ZeDXF*29%d=MzQa0%npJk&?@wNb@L)$4y8w({#0*j?W
zF6Fwktw}1=lfx}nuN<T1YM5+8;r2I)7lRn8SSlD>I-M3TQur&Xt%1^V?W{~B{|{Ab
zT`<82PbV@5RXV&i!9^%9?^~Mt|4lwqZaa5Dn^C?6QQ{N)%&wHE$uwi;a^tFVW<IW>
z^RX_mc@A#*kC1eN-L>4sI!+6P+rYBq+L>ExV2kfRu-;BqUNZAq)|2)eZL-+O*-3Lq
zK6aks&yua}h%LRbH+jBf+Pd}3s|}m3pFoF1f=pghhmLJ(&Ix_%Qm0eIlHG0SOcdl$
zvhC1CO?N{|3%yV0E^pf2Cxj#xF}n%U64m8yNK)sjuz_dE%iIw(E>ElU$+b=<GNohN
z228U|N_XCD;}_chpy0$_k}T0xv%?gHXgfF$wu8`K&BB%jw`85zYhPF>wCw{_ynq?L
zKjq)WboX6+t~k6P9{k~z@8C!EVtGWTp3Z+N;C3-ivCx)+)!iS$OIzx8I?UnNq#3zn
zAo-#R-FnflEn{-tZ&xW;vD@Nl5&xe^Xb}f`CZReOt6OfWEj`a`+W;AtWRDBO{V9wS
zc6Ei!uuNBlN$LaiA=T-yp{~`3&sD9g@$#<8aJ#7I<Y<(UI4J3AIh}Dr)?L<0Z<-nB
zg}}_db}YvgW-_I7&D#VzgiK}{2y05R51&wA))+HcN$D)xv{cXXHtPVYr7q*1&OR^4
z3>nn*0tnmR<xtjNA`cea?&-9;V$081dvyrI-RSW41xlE9Z)lM^g=Btuqk!qyvYKU%
z=Gz!awc4?#iFe}~{$n2)z)oC!&1@pIkA<I0=rgHaA6|w~>+Il(+1OONWivSY=1A23
z(?wk@RinHa)SI$MqmMLj?#W>}`8k>L$^C1R)a5^6g}LcGn3-wbsLW8><iMLk_`Dw<
z0Fn&ieRAws*{YODuQ*pkudr1J>b5(`a-D@Jd?y;dcUG8e-)XrzpIjR24JO=fCOOL-
zgl4eTyVZ7)ofAi=xtD;k<@hTpd}7F&O?z!W3c)hFOB!c7FqCq8_TKn3ci)FIk7U;h
zS(pfx9cc*rm6N-X!IElrVvMT(YPc9GHLY&qg^}LQt<UlCA$t)`AJ0Vcm^q7^B#Fk3
zEk{-?vpIAtBhw(s@N5?x{rpzI7h@z73Bp1ulO&QnF<`-n9Z8+O$faspWx7mQl-Ww~
zO0V5tk`7Apj4b4T=J7(f&VS)p;{ux90n;!e0`yX>zn{w0mbOdbZ3TsLWE>ASC@r@x
zwrKXW^&Jv(Ux5ie#K&aZ_pHonWA6!NS_skorh~=@M)2RY(t5;fu=62nF1KLpqEEPx
z<oAc+3h5@1vwfL`LEUj(G8vuiVgiK&A!Ug)3Zxm-e}9uGnFPAsWGgPmAjycM2y|=Y
zb7fE`5hMt0S<e>lqAXY|HLnHHqym^ElI;v$aM$jbp%Nx;8Jw7;b2On8J?1R(a2Wri
za8-+oNRnOu`GS=3KJ3efubh@QGYAB}eif{Im07IXiG^wb|HVN?A0`^c&KI6}!B-}7
zi57R67-{q@w|6_;B}S~nXZ$a)Gzo6?)>^TYH;>Autwmy9#9@oxX?5bz9S>Dx_q1Cr
zMZSy0<gs^t?Tc8>_~sSBmak&T*w1Y-Eh~k1uKPrQt`9}}W4556PPSj7=R)-ghIonC
zpNl3-W#7yO_}W^++7oGa<8;yV`hKR2G`hX=4uz+Qr>9@YvZc45Dr60+Gd(Kx;Ucg1
z(RBJN!&ZAlFtjoRS@U^I=GHHfU`T4R6ZfxbI8&~M#<8)K)fqm}n|W<+nzGr^XyvR`
z;sM94z41U1xh2Uc?L^WI7B9_cI-_y5`M}-&4lNf5-OWEPP>M~4Jy+9jvT<ROE&ssM
zUe|fwCcc-2wvpv<O<en2R%OEXvgY$2M!MG{#W$Vw<uLEs$=5#l4v3hbUVDj561cBr
zId0H5v!djsS>p}1Jb@F}w0@#3>~HMc$~f7*8$0OkoiU@v^g^d5WKK8!77VUlX0I=4
zal)FQ?^u~|NUjn?MZ1{BeimZ$pJ23>G_bUP@!*6UF0mvqCRZ-vI)73oYJAJ$#7)^q
zbKG8&!O)+qIo&U7dDF1_KOfNEmUHyP-2^k_cD;TTGNpIP#91v_lbcv>cT$OFx>3*<
irDkbxyew@S)5weN$bF-Osm#PHa@wo^khG#tNBv(snnh3m

diff --git a/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.po b/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.po
index a6fe375db..bfff260f1 100644
--- a/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.po
+++ b/modules/monitoring/application/locale/it_IT/LC_MESSAGES/monitoring.po
@@ -2,431 +2,441 @@
 # Copyright (C) 2015 Icinga Development Team
 # This file is distributed under the same license as Monitoring Module.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
-#, fuzzy
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Monitoring Module (2.0.0~alpha4)\n"
 "Report-Msgid-Bugs-To: dev@icinga.org\n"
-"POT-Creation-Date: 2015-03-13 16:11+0100\n"
-"PO-Revision-Date: 2015-03-13 14:51+0100\n"
-"Last-Translator: Davide Demuru <davide.demuru@gmail.com>\n"
+"POT-Creation-Date: 2015-03-13 17:04+0100\n"
+"PO-Revision-Date: 2015-03-13 17:05+0100\n"
+"Last-Translator: Thomas Gelf <thomas@gelf.net>\n"
 "Language: it_IT\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:382
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:382
 msgid " Down Hosts (Handled)"
 msgstr "Host Down (Gestiti)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:383
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:383
 msgid " Down Hosts (Unhandled)"
 msgstr "Host Down (Non Gestiti)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:350
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:404
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:350
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:404
 msgid " Down Services (Handled)"
 msgstr "Servizi Down (Gestiti)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:351
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:405
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:351
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:405
 msgid " Down Services (Unhandled)"
 msgstr "Servizi Down (Non Gestiti)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:386
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:386
 msgid " Pending Hosts"
 msgstr "Host in Pending"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:354
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:408
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:354
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:408
 msgid " Pending Services"
 msgstr "Servizi in Pending"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:384
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:384
 msgid " Unreachable Hosts (Handled)"
 msgstr "Host Unreachable (Gestiti)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:385
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:385
 msgid " Unreachable Hosts (Unhandled)"
 msgstr "Host Unreachable (Non Gestiti)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:352
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:406
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:352
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:406
 msgid " Unreachable Services (Handled)"
 msgstr "Servizi Unreachable (Gestiti)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:353
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:407
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:353
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:407
 msgid " Unreachable Services (Unhandled)"
 msgstr "Servizi Unreachable (Non Gestiti) "
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:381
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:381
 msgid " Up Hosts"
 msgstr "Host Up"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:401
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:401
 msgid " Up Services"
 msgstr "Servizi Up"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:348
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:402
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:348
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:402
 msgid " Warning Services (Handled)"
 msgstr "Servizi in Warning (Gestiti)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:349
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:403
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:349
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:403
 msgid " Warning Services (Unhandled)"
 msgstr "Servizi in Warning (Non Gestiti)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:73
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:73
 #, php-format
 msgid "%d Active"
 msgid_plural "%d Active"
 msgstr[0] "%d Attivo"
 msgstr[1] "%d Attivi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:53
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:109
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:53
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:109
 #, php-format
 msgid "%d Disabled"
 msgid_plural "%d Disabled"
 msgstr[0] "%d Disabilitato"
 msgstr[1] "%d Disabilitati"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:35
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:91
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:35
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:91
 #, php-format
 msgid "%d Passive"
 msgid_plural "%d Passive"
 msgstr[0] "%d Passivo"
 msgstr[1] "%d Passivi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:43
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:43
 #, php-format
 msgid "%d hosts down on %s"
 msgstr "%d host down in %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:21
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:21
 #, php-format
 msgid "%d hosts ok on %s"
 msgstr "%d host ok in %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:26
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:26
 #, php-format
 msgid "%d hosts unreachable on %s"
 msgstr "%d host unreachable in %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:64
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:64
 #, php-format
 msgid "%d more ..."
 msgstr "%d più ..."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:31
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:31
 #, php-format
 msgid "%d services critical on %s"
 msgstr "%d servizi critical in %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:53
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:53
 #, php-format
 msgid "%d services ok on %s"
 msgstr "%d servizi ok in %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:48
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:48
 #, php-format
 msgid "%d services unknown on %s"
 msgstr "%d servizi unknown in %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:37
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:37
 #, php-format
 msgid "%d services warning on %s"
 msgstr "%d servizi warning in %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Plugin/Perfdata.php:437
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Plugin/Perfdata.php:437
 #, php-format
 msgid "%s %s (%s%%)"
 msgstr "%s %s (%s%%)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:40
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:28
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:32
+#, php-format
+msgid "%s ago"
+msgstr "%s fa"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:40
 #, php-format
 msgctxt "timespan"
 msgid "%s ago"
 msgstr "%s fa"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:28
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:32
-#, php-format
-msgid "%s ago"
-msgstr "%s fa"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:57
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:57
 #, php-format
 msgid "%s has been up and running with PID %d since %s"
 msgstr "%s è attivo e funzionante con il PID %d da %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:8
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:8
 #, php-format
 msgid "%s hosts:"
 msgstr "%s host:"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/not-running.phtml:5
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/not-running.phtml:5
 #, php-format
 msgid "%s is currently not up and running"
 msgstr "%s non è in esecuzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:64
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:64
 #, php-format
 msgid "%s is not running"
 msgstr "%s non è in esecuzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Link.php:54
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:142
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:43
+#, php-format
+msgid "%s notications have been sent for this issue"
+msgstr "%s notifiche inviate per questo problema"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Link.php:54
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:142
 #, php-format
 msgctxt "Service running on host"
 msgid "%s on %s"
 msgstr "%s di %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:9
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:9
 #, php-format
 msgid "%s services:"
 msgstr "%s servizi:"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:84
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:84
 #, php-format
 msgid "%u Acknowledged Host Problem"
 msgid_plural "%u Acknowledged Host Problems"
 msgstr[0] "%u Conferma al Problema dell'Host"
 msgstr[1] "%u Conferme ai Problemi dell'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:84
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:84
 #, php-format
 msgid "%u Acknowledged Service Problem"
 msgid_plural "%u Acknowledged Service Problems"
 msgstr[0] "%u Conferma al Problema del Servizio"
 msgstr[1] "%u Conferma ai Problemi del Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:17
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:17
 #, fuzzy, php-format
 msgid "%u Active"
 msgid_plural "%u Active"
 msgstr[0] "%d Attivo"
 msgstr[1] "%d Attivi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:8
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:8
 #, php-format
 msgid "%u Host"
 msgid_plural "%u Hosts"
 msgstr[0] "%u Host"
 msgstr[1] "%u Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:10
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:10
 #, fuzzy, php-format
 msgid "%u Host DOWN"
 msgid_plural "%u Hosts DOWN"
 msgstr[0] "%d Host DOWN"
 msgstr[1] "%d Host DOWN"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:18
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:139
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:218
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:18
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:139
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:218
 #, fuzzy, php-format
 msgid "%u Host Disabled"
 msgid_plural "%u Hosts Disabled"
 msgstr[0] "%d Host Disabilitato"
 msgstr[1] "%d Host Disabilitati"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:48
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:48
 #, fuzzy, php-format
 msgid "%u Host Flapping"
 msgid_plural "%u Hosts Flapping"
 msgstr[0] "%d Host Instabile"
 msgstr[1] "%d Host Instabili"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:33
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:33
 #, fuzzy, php-format
 msgid "%u Host PENDING"
 msgid_plural "%u Hosts PENDING"
 msgstr[0] "%d Hosts PENDING"
 msgstr[1] "%d Host PENDING"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:29
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:29
 #, fuzzy, php-format
 msgid "%u Host UNREACHABLE"
 msgid_plural "%u Hosts UNREACHABLE"
 msgstr[0] "%d Host UNREACHABLE"
 msgstr[1] "%d Host UNREACHABLE"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:15
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:15
 #, fuzzy, php-format
 msgid "%u Host UP"
 msgid_plural "%u Hosts UP"
 msgstr[0] "%d Host UP"
 msgstr[1] "%d Host UP"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:8
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:8
 #, fuzzy, php-format
 msgid "%u Service"
 msgid_plural "%u Services"
 msgstr[0] "Servizio"
 msgstr[1] "Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:73
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:173
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:252
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:73
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:173
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:252
 #, fuzzy, php-format
 msgid "%u Service Disabled"
 msgid_plural "%u Services Disabled"
 msgstr[0] "%d Servizio Disabilitato"
 msgstr[1] "%d Servizi Disabilitati"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:103
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:103
 #, fuzzy, php-format
 msgid "%u Service Flapping"
 msgid_plural "%u Services Flapping"
 msgstr[0] "%d Servizio Instabile"
 msgstr[1] "%d Servizi Instabili"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:46
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:46
 #, php-format
 msgid "%u Unhandled Host Problem"
 msgid_plural "%u Unhandled Host Problems"
 msgstr[0] "%u Problema all'Host Non Gestito"
 msgstr[1] "%u Problemi all'Host Non Gestiti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:46
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:46
 #, php-format
 msgid "%u Unhandled Service Problem"
 msgid_plural "%u Unhandled Service Problems"
 msgstr[0] "%u Problema al Servizio Non Gestito"
 msgstr[1] "%u Problemi al Servizio Non Gestiti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:13
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:13
 #, fuzzy, php-format
 msgid "%u configured service:"
 msgid_plural "%u configured services:"
 msgstr[0] "%d servizio configurato:"
 msgstr[1] "%d servizi configurati:"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:80
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:179
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:278
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:325
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:372
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:80
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:179
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:278
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:325
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:372
 #, fuzzy, php-format
 msgid "%u is not checked at all"
 msgid_plural "%u are not checked at all"
 msgstr[0] "%d è stato controllato"
 msgstr[1] "%d è stato controllato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:53
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:152
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:251
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:53
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:152
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:251
 #, fuzzy, php-format
 msgid "%u is passively checked"
 msgid_plural "%u are passively checked"
 msgstr[0] "%d è controllato passivamente"
 msgstr[1] "%d è controllato passivamente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:110
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:110
 #, fuzzy, php-format
 msgid "%u unhandled service"
 msgid_plural "%u unhandled services"
 msgstr[0] "%d servizio non gestito"
 msgstr[1] "%d servizi non gestiti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:73
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:73
 msgid "1 Year"
 msgstr "1 Anno"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:74
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:74
 msgid "2 Years"
 msgstr "2 Anni"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:70
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:70
 msgid "3 Months"
 msgstr "3 Mesi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:97
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:97
 msgid "4 Hours"
 msgstr "4 Ore"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:71
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:71
 msgid "4 Months"
 msgstr "4 Mesi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:72
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:72
 msgid "8 Months"
 msgstr "8 Mesi"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Plugin/Perfdata.php:437
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Plugin/Perfdata.php:437
 #, php-format
 msgid "<b>%s %s</b> (%s%%)"
 msgstr "<b>%s %s</b> (%s%%)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:453
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:453
 msgid "<b>{title}:</b> {value}m max. reaction time"
 msgstr "<b>{title}:</b> {value} max. tempo di reazione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:443
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:443
 msgid "<b>{title}:</b> {value}m min. reaction time"
 msgstr "<b>{title}:</b> {value} min. tempo di reazione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:296
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:296
 msgid "<b>{title}:</b><br> {value} of {sum} hosts are {label}"
 msgstr "<b>{title}:</b><br> {value} di {sum} host sono {label}"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:247
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:247
 msgid "<b>{title}:</b><br>{value} of {sum} services are {label}"
 msgstr "<b>{title}:</b><br>{value} di {sum} servizi sono {label}"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:78
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:38
+#, php-format
+msgid "A notication has been sent for this issue %s ago"
+msgstr "Una notifica è stata inviata per questo problema %s fa"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:78
 msgid "Ack removed"
 msgstr "Conferma rimossa"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:73
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:39
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:73
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:39
 msgid "Acknowledge"
 msgstr "Conferma"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:68
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:68
 #, php-format
 msgid "Acknowledge %u unhandled host problem"
 msgid_plural "Acknowledge %u unhandled host problems"
 msgstr[0] "Conferma %u Problema dell'Host Non Gestito"
 msgstr[1] "Conferma %u Problemi dell'Host Non Gestiti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:68
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:68
 #, php-format
 msgid "Acknowledge %u unhandled service problem"
 msgid_plural "Acknowledge %u unhandled service problems"
 msgstr[0] "Conferma %u Problema del Servizio Non Gestito"
 msgstr[1] "Conferma %u Problemi del Servizio Non Gestiti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:71
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostController.php:71
 msgid "Acknowledge Host Problem"
 msgstr "Conferma il Problema dell'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:184
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostsController.php:184
 msgid "Acknowledge Host Problems"
 msgstr "Conferma i Problemi dell'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:48
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:48
 msgid "Acknowledge Service Problem"
 msgstr "Conferma il Problema del Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:233
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:233
 msgid "Acknowledge Service Problems"
 msgstr "Conferma i Problemi del Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:34
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:34
 msgid "Acknowledge problem"
 msgid_plural "Acknowledge problems"
 msgstr[0] "Conferma Problema"
 msgstr[1] "Conferma Problemi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:46
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:46
 msgid ""
 "Acknowledge this problem, suppress all future notifications for it and tag "
 "it as being handled"
@@ -434,306 +444,306 @@ msgstr ""
 "Conferma questo problema, disabilita tutte le notifiche future e marca come "
 "gestito"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:31
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:130
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:229
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:12
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:9
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:9
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:53
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:75
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:53
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:75
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:12
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:31
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:130
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:229
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:9
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:9
 msgid "Acknowledged"
 msgstr "Confermato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:39
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:51
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:39
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:51
 msgid "Acknowledgement"
 msgstr "Conferma"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:59
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:59
 msgid "Acknowledgements"
 msgstr "Conferme"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:157
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:157
 msgid "Acknowledging problem.."
 msgid_plural "Acknowledging problems.."
 msgstr[0] "Conferma in corso.."
 msgstr[1] "Conferme in corso.."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/actions.phtml:44
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/actions.phtml:44
 msgid "Actions"
 msgstr "Azioni"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:24
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:24
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:70
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:98
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:70
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:98
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:24
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:24
 msgid "Active And Passive Checks Disabled"
 msgstr "Controlli Attivi e Passivi Disabilitati"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:39
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:39
 msgid "Active Checks"
 msgstr "Controlli Attivi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:22
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:22
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:72
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:100
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:72
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:100
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:22
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:22
 msgid "Active Checks Disabled"
 msgstr "Controlli Attivi Disabilitati"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:88
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:88
 msgid "Active Host Checks Being Executed"
 msgstr "Esegui Controlli Attivi sugli Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:97
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:97
 msgid "Active Service Checks Being Executed"
 msgstr "Esegui Controlli Attivi sui Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:120
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:120
 msgid "Active checks"
 msgstr "Controlli Attivi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:83
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostController.php:83
 msgid "Add Host Comment"
 msgstr "Aggiungi commento all'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:48
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:48
 msgid "Add New Backend"
 msgstr "Aggiungi Nuovo Backend"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:164
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:164
 msgid "Add New Instance"
 msgstr "Aggiungi Nuova Istanza"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:60
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:60
 msgid "Add Service Comment"
 msgstr "Aggiungi Commento al Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:14
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:14
 msgid "Add a new comment to this host"
 msgstr "Aggiungi un nuovo commento all'host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:25
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:25
 msgid "Add a new comment to this service"
 msgstr "Aggiungi un nuovo commento al servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:28
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:8
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:19
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:28
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:8
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:19
 #, fuzzy
 msgid "Add comment"
 msgid_plural "Add comments"
 msgstr[0] "Aggiungi commento"
 msgstr[1] "Aggiungi commento"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:83
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:83
 msgid "Adding comment.."
 msgid_plural "Adding comments.."
 msgstr[0] "Aggiunta commento.."
 msgstr[1] "Aggiunta commenti.."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:135
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:135
 msgid "Address"
 msgstr "Indirizzo"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:201
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:44
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:48
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:201
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:44
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:48
 msgid "Alert Summary"
 msgstr "Storico Allarmi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:11
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:11
 msgid "Alert summary"
 msgstr "Storico Allarmi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:377
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:377
 msgid "Alias"
 msgstr "Alias"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:37
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:158
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:237
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:37
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:158
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:237
 msgid "All Hosts Enabled"
 msgstr "Tutti gli Host abilitati"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:26
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:28
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:26
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:28
 msgid "All Services"
 msgstr "Tutti i Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:92
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:192
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:271
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:92
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:192
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:271
 msgid "All Services Enabled"
 msgstr "Tutti i Servizi Abilitati"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:178
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:178
 msgid "All backends are disabled"
 msgstr "Tutti i backend sono disabilitati"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:16
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:16
 msgid "Allow acknowledging host and service problems"
 msgstr "Consenti la Conferma dei problemi di Host e Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:24
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:24
 msgid "Allow adding and deleting host and service comments"
 msgstr "Consenti la rimozione di Commenti da Host e Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:8
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:8
 msgid "Allow all commands"
 msgstr "Consenti tutti i Comandi"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:28
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:28
 msgid "Allow commenting on hosts and services"
 msgstr "Consenti l'aggiunta di Commenti su Host e Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:32
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:32
 msgid "Allow deleting host and service comments"
 msgstr "Consenti la rimozione di Commenti da Host e Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:44
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:44
 msgid "Allow deleting host and service downtimes"
 msgstr "Consenti la cancellazione di Manutenzioni da Host e Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:52
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:52
 msgid ""
 "Allow processing commands for toggling features on an instance-wide basis"
 msgstr "Consenti di abilitare/disabilitare funzionalità globali"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:56
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:56
 msgid ""
 "Allow processing commands for toggling features on host and service objects"
 msgstr "Consenti di abilitare/disabilitare funzionalità di host e servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:48
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:48
 msgid "Allow processing host and service check results"
 msgstr "Consenti l'invio di risultati passivi"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:20
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:20
 msgid "Allow removing problem acknowledgements"
 msgstr "Consenti la rimozione delle Conferme"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:36
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:36
 msgid "Allow scheduling and deleting host and service downtimes"
 msgstr "Consenti la pianificazione di Manutenzioni su Host e Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:12
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:12
 msgid "Allow scheduling host and service checks"
 msgstr "Consenti la schedulazione di Controlli su Host e Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:40
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:40
 msgid "Allow scheduling host and service downtimes"
 msgstr "Consenti la pianificazione di Manutenzioni su Host e Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:60
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:60
 msgid "Allow sending custom notifications for hosts and services"
 msgstr "Consenti l'invio di notifiche personalizzate per host e servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:21
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:21
 msgid "Apply"
 msgstr "Applica"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:131
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:131
 msgid "Are you sure you want to remove this instance?"
 msgstr "Sicuro di voler rimuovere l'istanza?"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:300
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:300
 msgid "Author"
 msgstr "Autore"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:33
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:33
 msgid "Average"
 msgstr "Media"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:108
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:108
 msgid "Average services per host"
 msgstr "Media di Servizi per Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:439
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:439
 msgid "Avg (min)"
 msgstr "Media (min)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:78
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:78
 #, php-format
 msgid "Backend \"%s\" successfully removed."
 msgstr "Backend  \"%s\" rimosso correttamente."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:216
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:28
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:216
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:28
 msgid "Backend Name"
 msgstr "Nome Backend"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:226
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:44
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:226
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:44
 msgid "Backend Type"
 msgstr "Tipo Backend"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:75
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:75
 msgid "Backends"
 msgstr "Backend"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:77
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:77
 msgid "Broadcast"
 msgstr "Trasmetti a tutti"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:184
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:34
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:52
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:34
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:52
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:34
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:52
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:34
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:52
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:184
 msgid "CRITICAL"
 msgstr "CRITICAL"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:62
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:62
 msgctxt "icinga.state"
 msgid "CRITICAL"
 msgstr "CRITICAL"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml:4
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml:4
 msgid "Check Source"
 msgstr "Eseguito da"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:51
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:51
 msgid "Check Time"
 msgstr "Ora del Controllo"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:61
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:61
 msgid "Check attempts"
 msgstr "Tentativi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:70
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:70
 msgid "Check execution time"
 msgstr "Durata "
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:76
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:76
 msgid "Check latency"
 msgstr "Latenza"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:37
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:39
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:37
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:39
 msgid "Check now"
 msgstr "Controlla ora"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:78
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:78
 msgid ""
 "Check this to not to validate connectivity with the given Livestatus socket"
 msgstr ""
 "Spunta questa casella per non verificare la connettività con il socket "
 "Livestatus fornito"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:77
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:77
 msgid ""
 "Check this to not to validate connectivity with the given database server"
 msgstr ""
 "Spunta questa casella per non verificare la connettività con il database "
 "fornito"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:38
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:38
 msgid "Child Hosts"
 msgstr "Host Figli"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/SecurityConfigForm.php:58
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/SecurityConfigForm.php:58
 msgid ""
 "Comma separated case insensitive list of protected custom variables. Use * "
 "as a placeholder for zero or more wildcard characters. Existance of those "
@@ -743,295 +753,295 @@ msgstr ""
 "Usare * come carattere jolly. Le variabili fornite verranno mostrate ma il "
 "loro contenuto sarà mascherato."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml:9
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml:9
 msgid "Command"
 msgstr "Comando"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:64
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php:30
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php:30
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:64
 msgid "Command File"
 msgstr "File dei comandi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:49
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:49
 msgid "Commands"
 msgstr "Comandi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:52
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:65
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:49
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:43
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:63
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:54
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:62
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:67
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:46
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:49
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:43
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:65
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:52
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:62
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:67
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:46
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:63
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:54
 msgid "Comment"
 msgstr "Commento"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:489
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:489
 msgid "Comment Timestamp"
 msgstr "Timestamp Commento"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:492
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:492
 msgid "Comment Type"
 msgstr "Tipo Commento"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:68
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:68
 msgid "Comment deleted"
 msgstr "Commento rimosso"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:36
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:36
 msgid "Comment was caused by a downtime."
 msgstr "Commento generato da una manutenzione."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:26
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:26
 msgid "Comment was caused by a flapping host or service."
 msgstr "Commento generato da un host o servizio instabile."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:40
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:40
 msgid "Comment was caused by an acknowledgement."
 msgstr "Commento generato dalla conferma di un problema"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:31
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:31
 msgid "Comment was created by an user."
 msgstr "Commento creato da un utente."
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:163
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:66
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:2
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:54
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:468
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:163
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:468
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:54
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:66
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/comments.phtml:2
 msgid "Comments"
 msgstr "Commenti"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:196
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:196
 #, php-format
 msgid "Configuration for backend %s is disabled"
 msgstr "Configurazione peril backend %s disabilitata"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:79
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:79
 msgid ""
 "Configure how to protect your monitoring environment against prying eyes"
 msgstr ""
 "Configura come proteggere l'ambiente di monitoraggio da occhi indiscreti"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:74
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:74
 msgid "Configure how to retrieve monitoring information"
 msgstr "Configura come recuperare le informazioni di monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:434
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:434
 msgid "Contact Groups"
 msgstr "Gruppi di Contatti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:4
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:4
 msgid "Contact details"
 msgstr "Dettagli del Contatto"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:159
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:37
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:159
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:37
 msgid "Contactgroups"
 msgstr "Gruppi di Contatti"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:155
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:17
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:351
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:155
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:351
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:17
 msgid "Contacts"
 msgstr "Contatti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:299
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:299
 msgid "Contains host states of each service group."
 msgstr "Contiene gli stati degli host per ogni gruppo di servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:240
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:240
 msgid "Contains service states for each service group."
 msgstr "Contiene gli stati dei servizi per ogni gruppo di servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:55
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:55
 msgid "Could not find any valid monitoring backend resources"
 msgstr "Non è stata trovata nessun backend di monitoraggio valido"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:53
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:53
 msgid "Create New Instance"
 msgstr "Crea una Nuova Istanza"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:9
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:9
 msgid "Create New Monitoring Backend"
 msgstr "Crea un Nuovo Backend di Monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:118
-#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:264
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:264
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:118
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
 msgid "Critical"
 msgstr "Critical"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:123
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:123
 msgid "Current Downtimes"
 msgstr "Manutenzioni in corso"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:227
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:227
 msgid "Current Host State"
 msgstr "Stato Corrente degli Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:217
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:217
 msgid "Current Incidents"
 msgstr "Problemi Correnti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:223
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:223
 msgid "Current Service State"
 msgstr "Stato Corrente dei Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:133
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:133
 msgid "Current State"
 msgstr "Stato Corrente"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:176
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:176
 msgid "DOWN"
 msgstr "DOWN"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:57
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:57
 msgctxt "icinga.state"
 msgid "DOWN"
 msgstr "DOWN"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:104
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:104
 msgid "Database Name"
 msgstr "Nome Database"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:83
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:83
 msgid "Database Resource"
 msgstr "Risorsa Database"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:92
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:92
 msgid "Database Type"
 msgstr "Tipo Database"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:643
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:646
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:643
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:646
 msgid "Day"
 msgstr "Giorno"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:468
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:468
 msgid "Defect Chart"
 msgstr "Grafico dei Problemi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:489
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:489
 msgid "Defects"
 msgstr "Problemi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:46
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:46
 msgid "Define what should be done with the child hosts of the hosts."
 msgstr "Definire che azione compiere con gli Host figli"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:64
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:64
 msgid "Delete this comment"
 msgstr "Cancella questo commento"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php:64
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php:64
 msgid "Delete this downtime"
 msgstr "Cancella questa manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:89
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:89
 msgid "Deleting comment.."
 msgstr "Rimozione commento..."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php:89
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php:89
 msgid "Deleting downtime.."
 msgstr "Cancellazione Manutenzione..."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:24
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:99
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:99
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:24
 msgid "Disable Notifications"
 msgstr "Disabilita le Notifiche"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:208
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:208
 msgid "Disable This Backend"
 msgstr "Disabilita Backend"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:67
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:67
 msgid "Disable notifications for a specific time on a program-wide basis"
 msgstr "Disabilita le notifiche per un periodo specifico sull'intero sistema"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:69
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:69
 msgid "Disable temporarily"
 msgstr "Disabilita Temporaneamente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:61
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:61
 msgid "Disabling host and service notifications.."
 msgstr "Disabilitazione Notifiche di Host e Servizi in corso..."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:41
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:41
 msgid "Do nothing with child hosts"
 msgstr "Non applicare agli Host figli"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:139
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:314
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:314
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:139
 msgid "Down"
 msgstr "Down"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:68
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:35
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:35
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:68
 msgid "Downtime"
 msgstr "Manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:120
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:88
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:88
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:120
 msgid "Downtime End"
 msgstr "Fine Manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:115
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:83
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:83
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:115
 msgid "Downtime Start"
 msgstr "Inizio Manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:88
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:88
 msgid "Downtime removed"
 msgstr "Manutenzione cancellata"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:167
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:56
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:2
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:269
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:167
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:269
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:56
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:2
 msgid "Downtimes"
 msgstr "Manutenzioni"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:305
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:305
 msgid "Duration"
 msgstr "Durata"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:33
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:33
 msgid "Edit Existing Backend"
 msgstr "Modifica Backend Esistente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:150
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:150
 msgid "Edit Existing Instance"
 msgstr "Modifica Istanza Esistente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:27
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:27
 #, php-format
 msgid "Edit monitoring backend %s"
 msgstr "Modifica backend di monitoraggio %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:71
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:71
 #, php-format
 msgid "Edit monitoring instance %s"
 msgstr "Modifica istanza di monitoraggio %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:22
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:28
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:378
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:378
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:28
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:22
 msgid "Email"
 msgstr "Email"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:88
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:302
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:302
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:88
 msgid "End Time"
 msgstr "Ora Fine"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:69
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:69
 msgid "Ended downtimes"
 msgstr "Manutenzioni Completate"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:159
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:159
 msgid ""
 "Enter here the duration of the downtime. The downtime will be automatically "
 "deleted after this time expired."
@@ -1039,7 +1049,7 @@ msgstr ""
 "Inserire qui la durata della manutenzione. La manutenzione sarà cancellata "
 "automaticamente allo scadere del tempo."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:90
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:90
 msgid ""
 "Enter the expire date and time for this acknowledgement here. Icinga will "
 "delete the acknowledgement after this time expired."
@@ -1047,255 +1057,255 @@ msgstr ""
 "Inserire qui la durata della conferma del problema. Icinga cancellerà "
 "automaticamente la conferma allo scadere del tempo."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:299
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:299
 msgid "Entry Time"
 msgstr "Ora Inserimento"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:183
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:390
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:183
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:390
 msgid "Event Grid"
 msgstr "Griglia Eventi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:75
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:75
 msgid "Event Handler"
 msgstr "Gestore Eventi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:206
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:208
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:206
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:208
 msgid "Event Handlers"
 msgstr "Gestori Eventi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:106
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:106
 msgid "Event Handlers Enabled"
 msgstr "Gestore Eventi Abilitato"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:188
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:613
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:188
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:613
 msgid "Event Overview"
 msgstr "Panoramica Eventi"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:187
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:187
 msgid "Events"
 msgstr "Eventi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:127
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:127
 msgid "Execution time"
 msgstr "Tempo di Esecuzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:493
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:493
 msgid "Expiration"
 msgstr "Scadenza"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:87
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:43
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:43
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:87
 msgid "Expire Time"
 msgstr "Ora Scadenza"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:43
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:43
 msgid "Expires"
 msgstr "Scade"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:29
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:29
 msgid "Feature Commands"
 msgstr "Controllo Funzionalità"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:107
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:107
 msgid "Fixed"
 msgstr "Rigido"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:84
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:6
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:8
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:84
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:6
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:8
 msgid "Flap Detection"
 msgstr "Controllo Instabilità"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:115
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:115
 msgid "Flap Detection Enabled"
 msgstr "Controllo Instabilità Attivato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:86
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:93
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:25
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:61
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:57
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:81
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:86
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:25
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:61
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:57
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:81
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:93
 msgid "Flapping"
 msgstr "Instabile"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:66
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:66
 msgid "Flapping Stopped"
 msgstr "Instabilità Terminata"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:98
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:98
 msgid "Flapping stopped"
 msgstr "Instabilità Terminata"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:108
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:108
 msgid "Flexible"
 msgstr "Flessibile"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:157
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:157
 msgid "Flexible Duration"
 msgstr "Durata Flessibile"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:62
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:62
 msgid "Force Check"
 msgstr "Forza Controllo"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:64
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:64
 msgid "Forced"
 msgstr "Forzato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:67
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:67
 msgid "From"
 msgstr "Da"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:47
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:47
 msgid "Global Host Event Handler"
 msgstr "Gestore Eventi Host Globale"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:41
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:41
 msgid "Global Service Event Handler"
 msgstr "Gestore Eventi Servizi Globale"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:49
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:49
 msgid "Hard state changes"
 msgstr "Cambi di Stato HARD"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:327
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:327
 msgid "Healing Chart"
 msgstr "Grafico Ripristini"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:180
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:233
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:69
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:258
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:180
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:258
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:69
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:233
 msgid "History"
 msgstr "Storico"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:96
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:186
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:31
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml:12
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:58
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:63
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:53
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:297
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:490
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:211
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:297
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:490
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:211
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:31
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:58
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:63
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:53
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml:12
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:96
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:186
 msgid "Host"
 msgstr "Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml:21
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml:6
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml:6
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml:21
 #, php-format
 msgid "Host (%u)"
 msgid_plural "Hosts (%u)"
 msgstr[0] "Host (%u)"
 msgstr[1] "Host (%u)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:229
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:229
 msgid "Host Address"
 msgstr "Indirizzo Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:133
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:155
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:133
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:155
 msgid "Host Checks"
 msgstr "Controlli Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:25
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:25
 msgid "Host Group"
 msgstr "Gruppo di Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:298
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:298
 msgid "Host Group Chart"
 msgstr "Grafico dei Gruppi di Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:596
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:596
 msgid "Host Group Name"
 msgstr "Nome del Gruppo di Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:561
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:561
 msgid "Host Groups"
 msgstr "Gruppi di Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:381
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:381
 msgid "Host Notification Timeperiod"
 msgstr "Periodo delle Notifiche per l'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:111
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:227
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:111
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:227
 msgid "Host Problems"
 msgstr "Host con Problemi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:226
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:226
 msgid "Host Severity"
 msgstr "Impatto Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:64
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:158
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:85
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:207
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostsController.php:64
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostsController.php:158
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:85
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:207
 msgid "Host State"
 msgstr "Stato Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:2
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:2
 msgid "Host and Service Checks"
 msgstr "Controlli di Host e Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/disable-notifications.phtml:8
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/disable-notifications.phtml:8
 msgid "Host and service notifications are already disabled."
 msgstr "Notifiche per Host e Servizi sono già disabilitate."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:34
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostController.php:34
 msgid "Host not found"
 msgstr "Host non trovato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:48
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:48
 msgid "Host notification period"
 msgstr "Periodo delle Notifiche per l'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:40
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:40
 msgid "Host or service not found"
 msgstr "Host o Servizio non trovato"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:90
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:151
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml:16
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:90
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:151
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml:16
 msgid "Hostgroups"
 msgstr "Gruppi di Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:134
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:228
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:657
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:134
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:228
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:657
 msgid "Hostname"
 msgstr "Nome Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:33
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:33
 msgid "Hostname or address of the remote Icinga instance"
 msgstr "Nome Host o Indirizzo dell'istanza remota di Icinga"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:88
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:139
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:101
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:7
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:37
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:84
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:302
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:80
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:97
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:88
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:139
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:302
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostsController.php:80
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:97
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:101
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:84
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:37
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:7
 msgid "Hosts"
 msgstr "Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:640
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:640
 msgid "Hour"
 msgstr "Ora"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:137
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:137
 msgid "Hours"
 msgstr "Ore"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:44
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:44
 msgid ""
 "Icinga Web 2 will protect your monitoring environment against prying eyes "
 "using the configuration specified below:"
@@ -1303,7 +1313,7 @@ msgstr ""
 "Icinga Web 2 proteggerà il tuo ambiente di monitoraggio da occhi indiscreti "
 "con la configurazione seguente:"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:76
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:76
 #, php-format
 msgid ""
 "Icinga Web 2 will retrieve information from your monitoring environment "
@@ -1312,7 +1322,7 @@ msgstr ""
 "Icinga Web 2 recupererà le informazioni dal tuo ambiente di monitoraggio "
 "usando il backend chiamato \"%s\" e le seguenti risorse:"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:75
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:75
 #, php-format
 msgid ""
 "Icinga Web 2 will use the named pipe located at \"%s\" to send commands to "
@@ -1321,7 +1331,7 @@ msgstr ""
 "Icinga Web 2 utilizzerà la pipe situata in \"%s\" per inviare comandi alla "
 "vostra istanza di monitoraggio."
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:48
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:48
 #, php-format
 msgid ""
 "Icinga Web 2 will use the named pipe located on a remote machine at \"%s\" "
@@ -1332,13 +1342,13 @@ msgstr ""
 "inviare comandi alla vostra istanza di monitoraggio utilizzando i seguenti "
 "dettagli:"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:74
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:74
 msgid "If the acknowledgement should expire, check this option."
 msgstr ""
 "Spuntare questa casella se si vuole dare una scadenza alla Conferma del "
 "Problema."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:80
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:80
 msgid ""
 "If you check this option, a notification is sent to all normal and escalated "
 "contacts."
@@ -1346,7 +1356,7 @@ msgstr ""
 "Selezionando questa opzione verrà inviata una notifica ai contatti "
 "configurati."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:67
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:67
 msgid ""
 "If you check this option, a notification is sentregardless of the current "
 "time and whether notifications are enabled."
@@ -1354,7 +1364,7 @@ msgstr ""
 "Selezionando questa opzione verrà inviata una notifica anche se le notifiche "
 "sono disabilitate e ignorando eventuali restrizioni di orario."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:126
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:126
 msgid ""
 "If you do not want an acknowledgement notification to be sent out to the "
 "appropriate contacts, uncheck this option."
@@ -1362,7 +1372,7 @@ msgstr ""
 "Deselezionare questa opzione in caso non si voglia inviare una Notifica di "
 "Conferma ai contatti configurati."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:124
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:124
 msgid ""
 "If you have still any environments or views referring to this instance, you "
 "won't be able to send commands anymore after deletion."
@@ -1370,7 +1380,7 @@ msgstr ""
 "Nel caso qualche altro ambiente o vista faccia riferimento a questa istanza, "
 "non sarà più possibile inviare comandi dopo la cancellazione."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:101
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:101
 msgid ""
 "If you select the fixed option, the downtime will be in effect between the "
 "start and end times you specify whereas a flexible downtime starts when the "
@@ -1385,7 +1395,7 @@ msgstr ""
 "specificata). Il campi della Durata non avranno effetto sulle Manutenzioni "
 "Rigide."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:64
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:64
 msgid ""
 "If you select this option, Icinga will force a check regardless of both what "
 "time the scheduled check occurs and whether or not checks are enabled."
@@ -1393,7 +1403,7 @@ msgstr ""
 "Selezionando questa opzione, Icinga forzerà l'esecuzione del controllo "
 "ignorando se controlli attivi sono disabilitati e gli orari di schedulazione."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:58
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:58
 msgid ""
 "If you uncheck this option, the comment will automatically be deleted the "
 "next time Icinga is restarted."
@@ -1401,7 +1411,7 @@ msgstr ""
 "Selezionando questa opzione il commento verrà automaticamente rimosso al "
 "prossimo riavvio di Icinga."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:114
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:114
 msgid ""
 "If you want the acknowledgement to disable notifications until the host or "
 "service recovers, check this option."
@@ -1409,10 +1419,10 @@ msgstr ""
 "Selezionando questa opzione le notifiche verranno disabilitate fino al "
 "ripristino dell'host o servizio."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:54
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:67
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:51
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:45
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:51
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:45
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:67
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:54
 msgid ""
 "If you work with other administrators, you may find it useful to share "
 "information about the the host or service that is having problems. Make sure "
@@ -1422,23 +1432,23 @@ msgstr ""
 "informazioni riguardo l'host e i servizi che stanno avendo problemi. "
 "Assicurati di inserire una breve descrizione delle azioni che stai svolgendo."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:63
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:63
 msgid ""
 "If you would like the comment to remain even when the acknowledgement is "
 "removed, check this option."
 msgstr ""
 "Selezionando questa opzione il commento rimarrà anche dopo la fine Problema."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:83
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:17
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:17
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:56
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:65
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:89
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:56
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:65
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:89
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:83
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:17
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:17
 msgid "In Downtime"
 msgstr "In Manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:147
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:147
 msgid ""
 "In case it's desired that a TCP connection is being used by Icinga Web 2 to "
 "access a Livestatus interface, the Sockets module for PHP is required."
@@ -1446,53 +1456,53 @@ msgstr ""
 "Il modulo PHP Sockets è richiesto nel caso sia necessaria stabilire una "
 "connessione TCP per accedere all'interfaccia Livestatus tramite Icinga Web 2."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:58
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:58
 msgid "Instance"
 msgstr "Istanza"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:160
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:160
 #, php-format
 msgid "Instance \"%s\" created successfully."
 msgstr "Istanza \"%s\" creata correttamente."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:163
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:163
 #, php-format
 msgid "Instance \"%s\" edited successfully."
 msgstr "Istanza \"%s\" modificata correttamente."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:114
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:114
 #, php-format
 msgid "Instance \"%s\" successfully removed."
 msgstr "Istanza \"%s\" modificata correttamente."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:191
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:191
 msgid "Instance Name"
 msgstr "Nome Istanza"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:200
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:200
 msgid "Instance Type"
 msgstr "Tipo Istanza"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:74
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:74
 msgid "Instance already exists"
 msgstr "Istanza già esistente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:71
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:119
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:138
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:71
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:119
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:138
 msgid "Instance name missing"
 msgstr "Nome istanza mancante"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:50
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:50
 #, php-format
 msgid "Invalid instance type \"%s\" given"
 msgstr "Tipo \"%s\" di Istanza non valido"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:296
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:296
 msgid "Is In Effect"
 msgstr "In Corso"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/WelcomePage.php:42
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/WelcomePage.php:42
 msgid ""
 "It offers various status and reporting views with powerful filter "
 "capabilities that allow you to keep track of the most important events in "
@@ -1502,57 +1512,57 @@ msgstr ""
 "specifici per permettere di tenere traccia degli eventi più importanti degli "
 "eventi di monitoraggio."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
 msgid "Label"
 msgstr "Etichetta"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:136
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:136
 msgid "Last Check"
 msgstr "Ultimo Controllo"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:77
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:93
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:77
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:93
 msgid "Last Comment: "
 msgstr "Ultimo Commento: "
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:31
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:31
 msgid "Last External Command Check"
 msgstr "Ultimo Comando Esterno"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:230
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:230
 msgid "Last Host Check"
 msgstr "Ultimo Controllo dell'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:35
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:35
 msgid "Last Log File Rotation"
 msgstr "Ultima Rotazione del File di Log"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:24
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:24
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:24
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:24
 msgid "Last Problem"
 msgstr "Ultimo Problema"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:225
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:225
 msgid "Last Service Check"
 msgstr "Ultimo Controllo del Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:27
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:27
 msgid "Last Status Update"
 msgstr "Ultimo Aggiornamento di Stato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:18
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:18
 msgid "Last check"
 msgstr "Ultimo Controllo"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:126
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:126
 msgid "Latency"
 msgstr "Latenza"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:16
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:16
 msgid "Legend"
 msgstr "Legenda"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:292
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:292
 #, fuzzy, php-format
 msgid ""
 "List %s service that is currenlty in state PENDING in service group \"%s\""
@@ -1562,7 +1572,7 @@ msgstr[0] ""
 "Mostra %s servizio in stato warning gestito nel gruppo di servizi %s"
 msgstr[1] "Mostra %s servizi in stato warning gestiti nel gruppo di servizi %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:157
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:157
 #, fuzzy, php-format
 msgid ""
 "List %s service that is currently in state CRITICAL (Acknowledged) in "
@@ -1574,7 +1584,7 @@ msgstr[0] ""
 "Mostra %s servizio in stato warning gestito nel gruppo di servizi %s"
 msgstr[1] "Mostra %s servizi in stato warning gestiti nel gruppo di servizi %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:133
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:133
 #, fuzzy, php-format
 msgid ""
 "List %s service that is currently in state CRITICAL in service group \"%s\""
@@ -1585,7 +1595,7 @@ msgstr[0] ""
 "Mostra %s servizio in stato warning gestito nel gruppo di servizi %s"
 msgstr[1] "Mostra %s servizi in stato warning gestiti nel gruppo di servizi %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:106
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:106
 #, fuzzy, php-format
 msgid "List %s service that is currently in state OK in service group \"%s\""
 msgid_plural ""
@@ -1593,7 +1603,7 @@ msgid_plural ""
 msgstr[0] "Mostra %s servizio in stato pending nel gruppo di servizi %s"
 msgstr[1] "Mostra %s servizi in stato pending nel gruppo di servizi %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:211
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:211
 #, fuzzy, php-format
 msgid ""
 "List %s service that is currently in state UNKNOWN (Acknowledged) in service "
@@ -1605,7 +1615,7 @@ msgstr[0] ""
 "Mostra %s servizio in stato warning gestito nel gruppo di servizi %s"
 msgstr[1] "Mostra %s servizi in stato warning gestiti nel gruppo di servizi %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:187
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:187
 #, fuzzy, php-format
 msgid ""
 "List %s service that is currently in state UNKNOWN in service group \"%s\""
@@ -1615,7 +1625,7 @@ msgstr[0] ""
 "Mostra %s servizio in stato warning gestito nel gruppo di servizi %s"
 msgstr[1] "Mostra %s servizi in stato warning gestiti nel gruppo di servizi %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:265
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:265
 #, fuzzy, php-format
 msgid ""
 "List %s service that is currently in state WARNING (Acknowledged) in service "
@@ -1627,7 +1637,7 @@ msgstr[0] ""
 "Mostra %s servizio in stato warning gestito nel gruppo di servizi %s"
 msgstr[1] "Mostra %s servizi in stato warning gestiti nel gruppo di servizi %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:241
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:241
 #, fuzzy, php-format
 msgid ""
 "List %s service that is currently in state WARNING in service group \"%s\""
@@ -1637,100 +1647,100 @@ msgstr[0] ""
 "Mostra %s servizio in stato warning gestito nel gruppo di servizi %s"
 msgstr[1] "Mostra %s servizi in stato warning gestiti nel gruppo di servizi %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:123
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:123
 #, fuzzy, php-format
 msgid "List %s unhandled service problem on host %s"
 msgid_plural "List %s unhandled service problems on host %s"
 msgstr[0] "Mostra %s problema ai servizi dell'host %s"
 msgstr[1] "Mostra %s problemi ai servizi dell'host %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:111
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:111
 #, fuzzy, php-format
 msgctxt "timeline.link.title"
 msgid "List %u %s registered %s"
 msgstr "Mostra %u %s salvati %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:24
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:24
 #, fuzzy, php-format
 msgid "List %u actively checked host"
 msgid_plural "List %u actively checked hosts"
 msgstr[0] "%d è controllato passivamente"
 msgstr[1] "%d è controllato passivamente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:80
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:80
 #, fuzzy, php-format
 msgid "List %u actively checked service"
 msgid_plural "List %u actively checked services"
 msgstr[0] "%d è controllato passivamente"
 msgstr[1] "%d è controllato passivamente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:112
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:112
 #, php-format
 msgid "List %u host comment"
 msgid_plural "List %u host comments"
 msgstr[0] "Mostra %u commento dell' host"
 msgstr[1] "Mostra %u commenti dell' host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:97
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:97
 #, fuzzy, php-format
 msgid "List %u host currently in downtime"
 msgid_plural "List %u hosts currently in downtime"
 msgstr[0] "Mostra %u host in manutenzione"
 msgstr[1] "Mostra %u host in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:27
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:27
 #, fuzzy, php-format
 msgid "List %u host for which flap detection has been disabled"
 msgid_plural "List %u hosts for which flap detection has been disabled"
 msgstr[0] "Mostra tutti gli host dove il controllo di instabilità è abilitato"
 msgstr[1] "Mostra tutti gli host dove il controllo di instabilità è abilitato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:148
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:148
 #, fuzzy, php-format
 msgid "List %u host for which notifications are suppressed"
 msgid_plural "List %u hosts for which notifications are suppressed"
 msgstr[0] "Mostra tutti gli host dove le notifiche sono abilitate"
 msgstr[1] "Mostra tutti gli host dove le notifiche sono abilitate"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:57
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:57
 #, fuzzy, php-format
 msgid "List %u host that is currently flapping"
 msgid_plural "List %u hosts which are currently flapping"
 msgstr[0] "Mostra %u host in manutenzione"
 msgstr[1] "Mostra %u host in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:17
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:39
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:39
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:17
 #, fuzzy, php-format
 msgid "List %u host that is currently in state DOWN"
 msgid_plural "List %u hosts which are currently in state DOWN"
 msgstr[0] "Mostra %u host in manutenzione"
 msgstr[1] "Mostra %u host in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:59
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:59
 #, fuzzy, php-format
 msgid "List %u host that is currently in state DOWN (Acknowledged)"
 msgid_plural "List %u hosts which are currently in state DOWN (Acknowledged)"
 msgstr[0] "Mostra %u host in manutenzione"
 msgstr[1] "Mostra %u host in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:40
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:126
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:126
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:40
 #, fuzzy, php-format
 msgid "List %u host that is currently in state PENDING"
 msgid_plural "List %u hosts which are currently in state PENDING"
 msgstr[0] "Mostra %u host in manutenzione"
 msgstr[1] "Mostra %u host in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:39
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:84
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:84
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:39
 #, fuzzy, php-format
 msgid "List %u host that is currently in state UNREACHABLE"
 msgid_plural "List %u hosts which are currently in state UNREACHABLE"
 msgstr[0] "Mostra %u host in manutenzione"
 msgstr[1] "Mostra %u host in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:104
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:104
 #, php-format
 msgid "List %u host that is currently in state UNREACHABLE (Acknowledged)"
 msgid_plural ""
@@ -1738,57 +1748,57 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:22
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:18
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml:18
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:22
 #, fuzzy, php-format
 msgid "List %u host that is currently in state UP"
 msgid_plural "List %u hosts which are currently in state UP"
 msgstr[0] "Mostra %u host in manutenzione"
 msgstr[1] "Mostra %u host in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:60
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:60
 #, fuzzy, php-format
 msgid "List %u host that is not being checked at all"
 msgid_plural "List %u hosts which are not being checked at all"
 msgstr[0] "%d è stato controllato"
 msgstr[1] "%d è stato controllato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:227
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:227
 #, fuzzy, php-format
 msgid "List %u host that is not processing any event handlers"
 msgid_plural "List %u hosts which are not processing any event handlers"
 msgstr[0] "Mostra tutti gli host dove il gestore eventi è abilitato"
 msgstr[1] "Mostra tutti gli host dove il gestore eventi è abilitato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:42
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:42
 #, fuzzy, php-format
 msgid "List %u passively checked host"
 msgid_plural "List %u passively checked hosts"
 msgstr[0] "%d è controllato passivamente"
 msgstr[1] "%d è controllato passivamente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:98
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:98
 #, fuzzy, php-format
 msgid "List %u passively checked service"
 msgid_plural "List %u passively checked services"
 msgstr[0] "%d è controllato passivamente"
 msgstr[1] "%d è controllato passivamente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:112
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:112
 #, php-format
 msgid "List %u service comment"
 msgid_plural "List %u service comments"
 msgstr[0] "Mostra %u commento del servizio"
 msgstr[1] "Mostra %u commenti del servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:97
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:97
 #, php-format
 msgid "List %u service currently in downtime"
 msgid_plural "List %u services currently in downtime"
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:82
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:82
 #, fuzzy, php-format
 msgid "List %u service for which flap detection has been disabled"
 msgid_plural "List %u services for which flap detection has been disabled"
@@ -1797,35 +1807,35 @@ msgstr[0] ""
 msgstr[1] ""
 "Mostra tutti i servizi dove il controllo di instabilità è disbilitato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:182
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:182
 #, fuzzy, php-format
 msgid "List %u service for which notifications are suppressed"
 msgid_plural "List %u services for which notifications are suppressed"
 msgstr[0] "Mostra tutti i servizi dove le notifiche sono disabilitate"
 msgstr[1] "Mostra tutti i servizi dove le notifiche sono disabilitate"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:112
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:112
 #, fuzzy, php-format
 msgid "List %u service that is currently flapping"
 msgid_plural "List %u services which are currently flapping"
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:57
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:57
 #, fuzzy, php-format
 msgid "List %u service that is currently in state %s"
 msgid_plural "List %u services which are currently in state %s"
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:82
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:82
 #, fuzzy, php-format
 msgid "List %u service that is currently in state %s (Acknowledged)"
 msgid_plural "List %u services which are currently in state %s (Acknowledged)"
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:108
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:108
 #, fuzzy, php-format
 msgid "List %u service that is currently in state %s (Acknowledged) on host %s"
 msgid_plural ""
@@ -1835,21 +1845,21 @@ msgstr[0] ""
 msgstr[1] ""
 "Mostra %u servizi in stato critical non gestiti nel gruppo di host %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:82
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:82
 #, fuzzy, php-format
 msgid "List %u service that is currently in state %s on host %s"
 msgid_plural "List %u services which are currently in state %s on host %s"
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:20
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:20
 #, fuzzy, php-format
 msgid "List %u service that is currently in state CRITICAL"
 msgid_plural "List %u services which are currently in state CRITICAL"
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:41
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:41
 #, fuzzy, php-format
 msgid "List %u service that is currently in state CRITICAL (Acknowledged)"
 msgid_plural ""
@@ -1857,7 +1867,7 @@ msgid_plural ""
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:165
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:165
 #, fuzzy, php-format
 msgid ""
 "List %u service that is currently in state CRITICAL (Acknowledged) on hosts "
@@ -1870,7 +1880,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Mostra %u servizi in stato critical non gestiti nel gruppo di host %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:95
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:95
 #, php-format
 msgid ""
 "List %u service that is currently in state CRITICAL and not checked at all"
@@ -1879,7 +1889,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:68
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:68
 #, php-format
 msgid ""
 "List %u service that is currently in state CRITICAL and passively checked"
@@ -1888,7 +1898,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:141
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:141
 #, fuzzy, php-format
 msgid ""
 "List %u service that is currently in state CRITICAL on hosts in the host "
@@ -1899,15 +1909,15 @@ msgid_plural ""
 msgstr[0] "Mostra %u servizio in stato ok nel gruppo di host %s"
 msgstr[1] "Mostra %u servizi in stato ok nel gruppo di host %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:314
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:19
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:19
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:314
 #, fuzzy, php-format
 msgid "List %u service that is currently in state OK"
 msgid_plural "List %u services which are currently in state OK"
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:340
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:340
 #, fuzzy, php-format
 msgid "List %u service that is currently in state OK and not checked at all"
 msgid_plural ""
@@ -1915,14 +1925,14 @@ msgid_plural ""
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:43
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:43
 #, fuzzy, php-format
 msgid "List %u service that is currently in state OK on host %s"
 msgid_plural "List %u services which are currently in state OK on host %s"
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:114
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:114
 #, fuzzy, php-format
 msgid ""
 "List %u service that is currently in state OK on hosts in the host group \"%s"
@@ -1933,15 +1943,15 @@ msgid_plural ""
 msgstr[0] "Mostra %u servizio in stato ok nel gruppo di host %s"
 msgstr[1] "Mostra %u servizi in stato ok nel gruppo di host %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:361
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:106
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml:106
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:361
 #, fuzzy, php-format
 msgid "List %u service that is currently in state PENDING"
 msgid_plural "List %u services which are currently in state PENDING"
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:387
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:387
 #, fuzzy, php-format
 msgid ""
 "List %u service that is currently in state PENDING and not checked at all"
@@ -1950,14 +1960,14 @@ msgid_plural ""
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:133
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:133
 #, fuzzy, php-format
 msgid "List %u service that is currently in state PENDING on host %s"
 msgid_plural "List %u services which are currently in state PENDING on host %s"
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:300
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:300
 #, fuzzy, php-format
 msgid ""
 "List %u service that is currently in state PENDING on hosts in the host "
@@ -1968,14 +1978,14 @@ msgid_plural ""
 msgstr[0] "Mostra %u servizio in stato ok nel gruppo di host %s"
 msgstr[1] "Mostra %u servizi in stato ok nel gruppo di host %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:218
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:218
 #, fuzzy, php-format
 msgid "List %u service that is currently in state UNKNOWN"
 msgid_plural "List %u services which are currently in state UNKNOWN"
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:239
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:239
 #, fuzzy, php-format
 msgid "List %u service that is currently in state UNKNOWN (Acknowledged)"
 msgid_plural ""
@@ -1983,7 +1993,7 @@ msgid_plural ""
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:219
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:219
 #, fuzzy, php-format
 msgid ""
 "List %u service that is currently in state UNKNOWN (Acknowledged) on hosts "
@@ -1996,7 +2006,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Mostra %u servizi in stato critical non gestiti nel gruppo di host %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:293
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:293
 #, fuzzy, php-format
 msgid ""
 "List %u service that is currently in state UNKNOWN and not checked at all"
@@ -2005,7 +2015,7 @@ msgid_plural ""
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:266
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:266
 #, php-format
 msgid ""
 "List %u service that is currently in state UNKNOWN and passively checked"
@@ -2014,7 +2024,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:195
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:195
 #, fuzzy, php-format
 msgid ""
 "List %u service that is currently in state UNKNOWN on hosts in the host "
@@ -2025,14 +2035,14 @@ msgid_plural ""
 msgstr[0] "Mostra %u servizio in stato ok nel gruppo di host %s"
 msgstr[1] "Mostra %u servizi in stato ok nel gruppo di host %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:119
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:119
 #, fuzzy, php-format
 msgid "List %u service that is currently in state WARNING"
 msgid_plural "List %u services which are currently in state WARNING"
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:140
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:140
 #, fuzzy, php-format
 msgid "List %u service that is currently in state WARNING (Acknowledged)"
 msgid_plural ""
@@ -2040,7 +2050,7 @@ msgid_plural ""
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:273
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:273
 #, fuzzy, php-format
 msgid ""
 "List %u service that is currently in state WARNING (Acknowledged) on hosts "
@@ -2053,7 +2063,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Mostra %u servizi in stato critical non gestiti nel gruppo di host %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:194
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:194
 #, fuzzy, php-format
 msgid ""
 "List %u service that is currently in state WARNING and not checked at all"
@@ -2062,7 +2072,7 @@ msgid_plural ""
 msgstr[0] "Mostra %u servizio in manutenzione"
 msgstr[1] "Mostra %u servizi in manutenzione"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:167
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:167
 #, php-format
 msgid ""
 "List %u service that is currently in state WARNING and passively checked"
@@ -2071,7 +2081,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:249
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:249
 #, fuzzy, php-format
 msgid ""
 "List %u service that is currently in state WARNING on hosts in the host "
@@ -2082,244 +2092,244 @@ msgid_plural ""
 msgstr[0] "Mostra %u servizio in stato ok nel gruppo di host %s"
 msgstr[1] "Mostra %u servizi in stato ok nel gruppo di host %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:116
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:116
 #, fuzzy, php-format
 msgid "List %u service that is not being checked at all"
 msgid_plural "List %u services which are not being checked at all"
 msgstr[0] "%d è stato controllato"
 msgstr[1] "%d è stato controllato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:261
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:261
 #, fuzzy, php-format
 msgid "List %u service that is not processing any event handlers"
 msgid_plural "List %u services which are not processing any event handlers"
 msgstr[0] "Mostra tutti i servizi dove il gestore eventi è abilitato"
 msgstr[1] "Mostra tutti i servizi dove il gestore eventi è abilitato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:10
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:10
 #, php-format
 msgid "List all %u hosts"
 msgstr "Mostra tutti %u host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:23
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:23
 #, fuzzy, php-format
 msgid "List all %u service on host %s"
 msgid_plural "List all %u services on host %s"
 msgstr[0] "Mostra tutti i servizi dell'host %s"
 msgstr[1] "Mostra tutti i servizi dell'host %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:10
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:10
 #, php-format
 msgid "List all %u services"
 msgstr "Mostra tutti %u servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:73
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:73
 #, fuzzy, php-format
 msgctxt "timeline.link.title"
 msgid "List all event records registered %s"
 msgstr "Mostra tutti gli eventi dello storico %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml:11
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:86
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:86
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml:11
 #, php-format
 msgid "List all hosts in the group \"%s\""
 msgstr "Mostra tutti gli host del gruppo \"%s\""
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:41
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:41
 msgid "List all hosts, for which flap detection is enabled entirely"
 msgstr "Mostra tutti gli host dove il controllo di instabilità è abilitato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:162
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:162
 msgid "List all hosts, for which notifications are enabled entirely"
 msgstr "Mostra tutti gli host dove le notifiche sono abilitate"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:241
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:241
 msgid "List all hosts, which are processing event handlers entirely"
 msgstr "Mostra tutti gli host dove il gestore eventi è abilitato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:72
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:72
 #, php-format
 msgid "List all reported services on host %s"
 msgstr "Mostra tutti i servizi riportati nell'host %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml:11
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:86
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:86
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml:11
 #, php-format
 msgid "List all services in the group \"%s\""
 msgstr "Mostra tutti i servizi del gruppo \"%s\""
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:95
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:95
 #, php-format
 msgid "List all services of all hosts in host group \"%s\""
 msgstr "Mostra tutti i servizi di tutti gli host del gruppo \"%s\""
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:212
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:237
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:237
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:212
 #, php-format
 msgid "List all services on host %s"
 msgstr "Mostra tutti i servizi dell'host %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:53
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:53
 #, php-format
 msgid "List all services with the name \"%s\" on all reported hosts"
 msgstr "Mostra tutti i servizi con il nome \"%s\" negli host riportati"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:96
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:96
 msgid "List all services, for which flap detection is enabled entirely"
 msgstr "Mostra tutti i servizi dove il controllo di instabilità è disbilitato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:196
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:196
 msgid "List all services, for which notifications are enabled entirely"
 msgstr "Mostra tutti i servizi dove le notifiche sono disabilitate"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:275
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:275
 msgid "List all services, which are processing event handlers entirely"
 msgstr "Mostra tutti i servizi dove il gestore eventi è abilitato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:468
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:468
 msgid "List comments"
 msgstr "Lista commenti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:435
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:435
 msgid "List contact groups"
 msgstr "Lista gruppi di contatti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:351
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:351
 msgid "List contacts"
 msgstr "Lista contatti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:31
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:31
 #, php-format
 msgid "List contacts in contact-group \"%s\""
 msgstr "Mostra contatti nel gruppo \"%s\""
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:269
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:269
 msgid "List downtimes"
 msgstr "Lista manutenzioni"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:614
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:614
 msgid "List event records"
 msgstr "Lista eventi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:561
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:561
 msgid "List host groups"
 msgstr "Lista gruppi di host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:97
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:97
 msgid "List hosts"
 msgstr "LIsta host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:326
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:326
 msgid "List notifications"
 msgstr "Lista notifiche"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:510
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:510
 msgid "List service groups"
 msgstr "Lista gruppi di servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:171
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:171
 msgid "List services"
 msgstr "Lista servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:118
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:118
 msgid "Livestatus Resource"
 msgstr "Risorsa Livestatus"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:76
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:76
 msgid "Local"
 msgstr "Locale"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:202
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:202
 msgid "Local Command File"
 msgstr "Command File locale"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
 msgid "Max"
 msgstr "Max"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:449
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:449
 msgid "Max (min)"
 msgstr "Massimo (min)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
 msgid "Min"
 msgstr "Min"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:147
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:147
 msgid "Minutes"
 msgstr "Minuti"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:72
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:14
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:14
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:72
 msgid "Monitoring Backend"
 msgstr "Backend di Monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:14
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:14
 msgctxt "setup.page.title"
 msgid "Monitoring Backend"
 msgstr "Backend di Monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:3
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:3
 msgid "Monitoring Backends"
 msgstr "Backend di Monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:2
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:2
 msgid "Monitoring Features"
 msgstr "Funzionalità di Monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:209
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:29
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:40
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:209
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:29
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:40
 msgid "Monitoring Health"
 msgstr "Impostazioni Globali"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:14
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:14
 msgctxt "setup.page.title"
 msgid "Monitoring IDO Resource"
 msgstr "Risorsa IDO del Monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:42
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:42
 msgid "Monitoring Instance"
 msgstr "Istanza di Monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/InstancePage.php:14
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/InstancePage.php:14
 msgctxt "setup.page.title"
 msgid "Monitoring Instance"
 msgstr "Istanza di Monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:50
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:50
 msgid "Monitoring Instances"
 msgstr "Istanze di Monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:14
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:14
 msgctxt "setup.page.title"
 msgid "Monitoring Livestatus Resource"
 msgstr "Risorsa Livestatus di Monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:41
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:41
 msgid "Monitoring Security"
 msgstr "Sicurezza del Monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/SecurityPage.php:14
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/SecurityPage.php:14
 msgctxt "setup.page.title"
 msgid "Monitoring Security"
 msgstr "Sicurezza del Monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:146
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:146
 #, php-format
 msgid "Monitoring backend \"%s\" has been successfully changed"
 msgstr "Backend di monitoraggio \"%s\" modificato correttamente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:143
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:143
 #, php-format
 msgid "Monitoring backend \"%s\" has been successfully created"
 msgstr "Backend di monitoraggio \"%s\" creato correttamente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:79
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:79
 msgid "Monitoring backend already exists"
 msgstr "Backend di monitoraggio già esistente"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:146
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:146
 #, php-format
 msgid ""
 "Monitoring backend configuration could not be written to: %s; An error "
@@ -2328,18 +2338,18 @@ msgstr ""
 "Impossibile scrivere la configurazione del vba del monitoraggio in: %s; "
 "Errore:"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:141
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:141
 #, php-format
 msgid "Monitoring backend configuration has been successfully written to: %s"
 msgstr "Configurazione del Backend di monitoraggio scritta correttmente in: %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:77
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:124
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:170
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:77
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:124
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:170
 msgid "Monitoring backend name missing"
 msgstr "Nome del backend di monitoraggio mancante"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:93
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:93
 #, php-format
 msgid ""
 "Monitoring instance configuration could not be written to: %s; An error "
@@ -2348,12 +2358,12 @@ msgstr ""
 "Impossibile scrivere la configurazione dell'istanza di monitoraggio in: %s; "
 "Errore:"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:88
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:88
 #, php-format
 msgid "Monitoring instance configuration has been successfully created: %s"
 msgstr "Configuarzione dell'Istanza di monitoraggio creata correttamente: %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:71
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:71
 #, php-format
 msgid ""
 "Monitoring security configuration could not be written to: %s; An error "
@@ -2362,334 +2372,338 @@ msgstr ""
 "Impossibile scrivere la configurazione di sicurezza del monitoraggio in: %s; "
 "Errore:"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:66
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:66
 #, php-format
 msgid "Monitoring security configuration has been successfully created: %s"
 msgstr "Configurazione di sicurezza creata correttamente: %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:649
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:649
 msgid "Month"
 msgstr "Mese"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:38
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:44
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:50
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:38
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:44
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:50
 msgid "N/A"
 msgstr "N/A"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:376
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:376
 msgid "Name"
 msgstr "Nome"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:97
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:97
 msgid "New instance name missing"
 msgstr "Nome nuova istanza mancante"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:102
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:102
 msgid "New monitoring backend name missing"
 msgstr "Nome del nuovo backend di monitoraggio mancante"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/SecurityConfigForm.php:31
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/SecurityConfigForm.php:31
 msgid "New security configuration has successfully been stored"
 msgstr ""
 "La nuova configurazione di sicurezza del monitoraggio è stata salvata "
 "correttamente."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:27
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:27
 msgid "Next check"
 msgstr "Prossimo Controllo"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml:17
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml:17
 msgid "No"
 msgstr "No"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:23
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:23
 msgid "No Services matching the filter"
 msgstr "Nessun Servizio soddisfa i criteri di ricerca"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:25
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:25
 msgid "No active downtimes"
 msgstr "Nessuna Manutenzione in corso"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:176
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:176
 msgid "No backend has been configured"
 msgstr "Nessun Backend configurato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:14
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:14
 msgid "No comments matching the filter"
 msgstr "Nessun commento soddisfa i criteri di ricerca"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:189
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:189
 #, php-format
 msgid "No configuration for backend %s"
 msgstr "Nessuna configurazione per il backend %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:12
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contactgroups.phtml:11
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/contactgroups.phtml:11
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:12
 msgid "No contacts matching the filter"
 msgstr "Nessun contatto soddisfa i criteri di ricerca"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:24
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:24
 msgid "No history available for this object"
 msgstr "Storico non disponibile per questo oggetto"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:26
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:26
 msgid "No history events matching the filter"
 msgstr "Nessun evento dello storico soddisfa i criteri di ricerca"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:17
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:17
 msgid "No host groups matching the filter"
 msgstr "Nessun gruppo di host soddisfa i criteri di ricerca"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:6
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:27
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:6
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:27
 msgid "No hosts matching the filter"
 msgstr "Nessun host soddisfa i criteri di ricerca"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:62
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:53
+msgid "No notification has been sent for this issue"
+msgstr "Nessuna notifica è stata inviata per questo problema"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:62
 msgid "No notifications have been sent for this contact"
 msgstr "Nessuna notifica è stata inviata a questo contatto"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:21
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:21
 msgid "No notifications matching the filter"
 msgstr "Nessuna notifica soddisfa i criteri di ricerca"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:17
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:17
 msgid "No service groups matching the filter"
 msgstr "Nessun gruppo di servizi soddisfa i criteri di ricerca"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:32
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml:32
 msgid "No services configured on this host"
 msgstr "Nessun servizio configurato per questo host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:6
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:39
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:39
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:6
 msgid "No services matching the filter"
 msgstr "Nessun Servizio soddisfa i criteri di ricerca"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:69
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventgrid.phtml:69
 msgid "No state changes in the selected time period."
 msgstr "Nessun cambio di stato nel intervallo di tempo selezionato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:10
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:10
 msgid "No such contact"
 msgstr "Nessun contatto trovato"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:55
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:55
 msgid "None"
 msgstr "Niente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:23
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:23
 msgid "Not acknowledged"
 msgstr "Non Confermato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:52
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:41
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:41
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:52
 msgid "Notification"
 msgstr "Notifica"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:342
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:342
 msgid "Notification Start"
 msgstr "Partenza Notifica"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:171
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:76
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:66
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:127
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:129
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:13
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:44
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:325
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:331
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:429
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:472
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:479
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:171
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:331
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:429
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:472
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:479
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:325
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:44
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:76
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:66
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:2
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:127
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:129
 msgid "Notifications"
 msgstr "Notifiche"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:13
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:13
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:61
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:85
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:61
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:85
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:13
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:13
 msgid "Notifications Disabled"
 msgstr "Notifiche Disabilitate"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:124
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:124
 msgid "Notifications Enabled"
 msgstr "Notifiche Abilitate"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:15
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:15
 msgid "Notifications and Problems"
 msgstr "Notifiche e Problemi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:328
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:328
 #, fuzzy
 msgid "Notifications and average reaction time per hour."
 msgstr "Notifiche e problemi per ora"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:469
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:469
 msgid "Notifications and defects per hour"
 msgstr "Notifiche e problemi per ora"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:56
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:56
 msgid "Notifications sent to this contact"
 msgstr "Notifiche inviate a questo contatto"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:76
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:76
 #, php-format
 msgid "Notifications will be re-enabled in <strong>%s</strong>"
 msgstr "Le notifiche saranno riabilitate in <strong>%s</strong>"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/disable-notifications.phtml:11
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/disable-notifications.phtml:11
 #, php-format
 msgid "Notifications will be re-enabled in <strong>%s</strong>."
 msgstr "Le notifiche saranno riabilitate in <strong>%s</strong>."
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:178
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:70
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:70
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:70
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:70
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:178
 msgid "OK"
 msgstr "OK"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:60
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:60
 msgctxt "icinga.state"
 msgid "OK"
 msgstr "OK"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:72
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:72
 msgid "Object summaries"
 msgstr "Riepilogo Oggetti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:97
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:97
 msgid "Object type"
 msgstr "Tipo Oggetto"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:57
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:57
 msgid "Obsessing"
 msgstr "Modalità Ossessiva"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:144
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:144
 msgid "Obsessing Over Hosts"
 msgstr "Modalità Ossessiva sugli Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:153
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:153
 msgid "Obsessing Over Services"
 msgstr "Modalità Ossessiva sui Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:636
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:636
 msgid "Occurence"
 msgstr "Occorrenze"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:121
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:250
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:250
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:121
 msgid "Ok"
 msgstr "Ok"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:95
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:95
 msgid "Old instance name missing"
 msgstr "Nome vecchia istanza mancante"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:100
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:100
 msgid "Old monitoring backend name missing"
 msgstr "Nome del vecchio backend di monitoraggio mancante"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:98
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:536
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:536
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:98
 msgid "One day"
 msgstr "Un giorno"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:100
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:538
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:538
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:100
 msgid "One month"
 msgstr "Un mese"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:99
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:537
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:537
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:99
 msgid "One week"
 msgstr "Una settimana"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:101
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:539
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:539
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:101
 msgid "One year"
 msgstr "Un anno"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:72
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:72
 msgid "Output"
 msgstr "Output"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:131
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:131
 msgid "Overview"
 msgstr "Panoramica"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:190
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:182
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:76
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:76
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:76
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:76
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:182
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:190
 msgid "PENDING"
 msgstr "PENDING"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:32
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:34
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:34
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:32
 msgid "Pager"
 msgstr "Recapito"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:379
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:379
 msgid "Pager Address / Number"
 msgstr "Numero di telefono"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:48
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:48
 msgid "Passive Checks"
 msgstr "Controlli Passivi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:162
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:162
 msgid "Passive Host Checks Being Accepted"
 msgstr "Accetta Controlli Passivi sugli Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:171
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:171
 msgid "Passive Service Checks Being Accepted"
 msgstr "Accetta Controlli Passivi sui Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:150
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:150
 msgid "Passive checks"
 msgstr "Controlli passivi"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:112
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:112
 msgid "Password"
 msgstr "Password"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:66
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:66
 msgid "Path to the Icinga command file on the remote Icinga instance"
 msgstr "Percorso del command file di Icinga nell'istanza remota"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php:32
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php:32
 msgid "Path to the local Icinga command file"
 msgstr "Percorso del command file locale di Icinga"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:81
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:81
 msgid "Performance Data"
 msgstr "Dati di Performance"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:180
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:180
 msgid "Performance Data Being Processed"
 msgstr "Accetta i Dati di Performance"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:70
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:70
 msgid "Performance Info"
 msgstr "Informazioni sulle Performance"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/perfdata.phtml:3
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/perfdata.phtml:3
 msgid "Performance data"
 msgstr "Dati di Performance"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:55
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:55
 msgid "Persistent"
 msgstr "Persistente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:61
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:61
 msgid "Persistent Comment"
 msgstr "Commento Persistente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:16
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:16
 msgid ""
 "Please configure below how Icinga Web 2 should retrieve monitoring "
 "information."
@@ -2697,13 +2711,13 @@ msgstr ""
 "Definire di seguito come Icinga Web 2 recupererà le informazioni del "
 "monitoraggio."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/InstancePage.php:16
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/InstancePage.php:16
 msgid "Please define the settings specific to your monitoring instance below."
 msgstr ""
 "Definire di seguito le impostazioni specifiche della vostra istanza di "
 "monitoraggio."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:16
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:16
 msgid ""
 "Please fill out the connection details below to access the IDO database of "
 "your monitoring environment."
@@ -2711,7 +2725,7 @@ msgstr ""
 "Compilare di seguito i dettagli della connessione per accedere al database "
 "IDO del vostro ambiente di monitoraggio."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:16
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:16
 msgid ""
 "Please fill out the connection details below to access the Livestatus socket "
 "interface for your monitoring environment."
@@ -2719,16 +2733,16 @@ msgstr ""
 "Compilare di seguito i dettagli della connessione per accedere al socket "
 "Livestatus del vostro ambiente di monitoraggio."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/output.phtml:2
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/output.phtml:2
 msgid "Plugin Output"
 msgstr "Output del Plugin"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:100
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:42
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:42
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:100
 msgid "Port"
 msgstr "Porta"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml:2
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml:2
 msgctxt "multiselection"
 msgid ""
 "Press and hold the Ctrl key while clicking on rows to select multiple rows "
@@ -2737,215 +2751,215 @@ msgstr ""
 "Tenere premuto il tasto CTRL durante i Click per selezionare più righe o "
 "tenere premuto SHIFT per selezionare righe contigue."
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:96
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:96
 msgid "Problems"
 msgstr "Problemi "
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:19
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:19
 msgid "Process Info"
 msgstr "Informazioni sul Processo"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml:16
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml:27
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml:16
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml:27
 msgid "Process check result"
 msgstr "Output del risultato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:111
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:111
 msgid "Processing check result.."
 msgid_plural "Processing check results.."
 msgstr[0] "Invio risultato.."
 msgstr[1] "Invio risultati"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:23
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:23
 msgid "Program Start Time"
 msgstr "Ora Avvio del Programma"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:52
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/SecurityConfigForm.php:56
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/SecurityConfigForm.php:56
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/SecurityStep.php:52
 msgid "Protected Custom Variables"
 msgstr "Variabili Riservate"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml:14
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml:14
 msgid "Reachable"
 msgstr "Raggiungibile"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:223
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:223
 msgid "Recently Recovered Services"
 msgstr "Servizi Ripristinati Recentemente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:76
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:76
 msgid "Remote"
 msgstr "Remoto"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:203
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:203
 msgid "Remote Command File"
 msgstr "Command File Remoto"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:58
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:58
 msgid "Remote Host"
 msgstr "Host Remoto"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:62
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:62
 msgid "Remote SSH Port"
 msgstr "Porta SSH Remota"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:66
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/InstanceStep.php:66
 msgid "Remote SSH User"
 msgstr "Utente SSH Remoto"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:15
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:59
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:15
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:59
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:86
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:86
 msgid "Remove Existing Backend"
 msgstr "Rimuovi Backend Esistente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:122
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ConfigController.php:122
 msgid "Remove Existing Instance"
 msgstr "Rimuovi Istanza Esistente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:42
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:42
 #, php-format
 msgid "Remove monitoring backend %s"
 msgstr "Rimuovi backend di monitoraggio %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:86
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:86
 #, php-format
 msgid "Remove monitoring instance %s"
 msgstr "Rimuovi istanza di monitoraggio %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:30
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:30
 msgid "Remove problem acknowledgement"
 msgid_plural "Remove problem acknowledgements"
 msgstr[0] "Rimuovi la Conferma del Problema"
 msgstr[1] "Rimuovi le Conferme del Problema"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:48
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:48
 msgid "Removing problem acknowledgement.."
 msgid_plural "Removing problem acknowledgements.."
 msgstr[0] "Rimozione Conferma in corso.."
 msgstr[1] "Rimozione Conferme in corso.."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:541
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:541
 msgid "Report interval"
 msgstr "Intervallo del Report"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:196
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:196
 msgid "Reporting"
 msgstr "Reportistica"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:32
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:45
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:32
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:45
 msgid "Reschedule"
 msgstr "Rischedula"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:95
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostController.php:95
 msgid "Reschedule Host Check"
 msgstr "Rischedula il Controllo dell'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:196
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostsController.php:196
 msgid "Reschedule Host Checks"
 msgstr "Rischedula i Controlli dell'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:72
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:72
 msgid "Reschedule Service Check"
 msgstr "Rischedula il Controllo del Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:245
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:245
 msgid "Reschedule Service Checks"
 msgstr "Rischedula i Controlli del Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:17
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:17
 #, php-format
 msgid "Reschedule the next check for all %u hosts"
 msgstr "Rischedula il prossimo controllo per tutti i %u host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:17
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:17
 #, php-format
 msgid "Reschedule the next check for all %u services"
 msgstr "Rischedula il prossimo controllo per tutti i %u servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:240
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:240
 msgid "Resource"
 msgstr "Risorsa"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:88
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:123
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:88
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:123
 msgid "Resource Name"
 msgstr "Nome Risorsa"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:158
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:158
 #, php-format
 msgid "Resource configuration could not be udpated: %s; An error occured:"
 msgstr "La configurazione della risorsa non può essere aggiornata: %s; Errore:"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:155
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:155
 #, php-format
 msgid "Resource configuration has been successfully updated: %s"
 msgstr "Configurazione Risorsa aggiornata correttamente: %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:65
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:65
 msgid "Restrict hosts view to the hosts that match the filter"
 msgstr "Restringi la vista degli host a quelli che soddisfano il filtro"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:70
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:70
 msgid "Restrict services view to the services that match the filter"
 msgstr "Restringi la vista dei servizi a quelli che soddisfano il filtro"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:43
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:43
 msgid "SSH port to connect to on the remote Icinga instance"
 msgstr "Porta SSH da usare per la connessione all'istanza Icinga remota"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:30
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:27
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/SecurityConfigForm.php:20
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:30
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:27
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/SecurityConfigForm.php:20
 msgid "Save Changes"
 msgstr "Salva Modifiche"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:107
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostController.php:107
 msgid "Schedule Host Downtime"
 msgstr "Pianifica Manutenzione all'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:208
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostsController.php:208
 msgid "Schedule Host Downtimes"
 msgstr "Pianifica Manutenzioni dell'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:84
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:84
 msgid "Schedule Service Downtime"
 msgstr "Pianifica Manutenzione al Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:257
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:257
 msgid "Schedule Service Downtimes"
 msgstr "Pianifica Manutenzioni del Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:55
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:55
 #, fuzzy, php-format
 msgid "Schedule a downtime for %u unhandled host problem"
 msgid_plural "Schedule a downtime for %u unhandled host problems"
 msgstr[0] "Pianifica Manutenzione per %u Problema dell'Host Non Gestito"
 msgstr[1] "Pianifica Manutenzione per %u Problemi degli'Host Non Gestiti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:55
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:55
 #, fuzzy, php-format
 msgid "Schedule a downtime for %u unhandled service problem"
 msgid_plural "Schedule a downtime for %u unhandled service problems"
 msgstr[0] "Pianifica Manutenzione per %u Problema del Servizio Non Gestito"
 msgstr[1] "Pianifica Manutenzione per %u Problemi del Servizio Non Gestiti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:23
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:23
 #, php-format
 msgid "Schedule a downtime for all %u hosts"
 msgstr "Pianifica manutenzione per tutti i %u host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:23
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:23
 #, php-format
 msgid "Schedule a downtime for all %u services"
 msgstr "Pianifica manutenzione per tutti i %u servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:15
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:28
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:15
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:28
 msgid ""
 "Schedule a downtime to suppress all problem notifications within a specific "
 "period of time"
@@ -2953,324 +2967,321 @@ msgstr ""
 "Pianifica una manutenzione per disabilitare le notifiche per un periodo di "
 "tempo specifico"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:34
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:34
 msgid "Schedule check"
 msgid_plural "Schedule checks"
 msgstr[0] "Rischedula Controllo"
 msgstr[1] "Rischedula Controlli"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:28
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:28
 msgid "Schedule check for all services on the hosts and the hosts themselves."
 msgstr "Schedula Controllo per l'host e tutti i suoi servizi."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:47
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:8
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:21
-#, fuzzy
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:47
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:8
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/downtime.phtml:21
 msgid "Schedule downtime"
 msgid_plural "Schedule downtimes"
 msgstr[0] "Pianifica Manutenzione"
-msgstr[1] "Pianifica Manutenzione"
+msgstr[1] "Pianifica Manutenzioni"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:30
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:30
 msgid ""
 "Schedule downtime for all services on the hosts and the hosts themselves."
 msgstr "PIanifica Manutenzione per l'host e tutti i suoi servizi."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:43
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:43
 msgid "Schedule non-triggered downtime for all child hosts"
 msgstr "Pianifica Manutenzione non dipendente per tutti gli Host figli"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:39
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:52
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:39
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:52
 msgid "Schedule the next active check at a different time than the current one"
 msgstr "Schedula il prossimo controllo ad un orario diverso da quello corrente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:43
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:43
 msgid "Schedule the next active check to run immediately"
 msgstr "Schedula il prossimo controllo per essere eseguito immediatamente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:42
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:42
 msgid "Schedule triggered downtime for all child hosts"
 msgstr "Pianifica Manutenzione dipendente per tutti gli Host figli"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:304
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:304
 msgid "Scheduled End"
 msgstr "Fine"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:303
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:303
 msgid "Scheduled Start"
 msgstr "Inizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:72
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php:72
 msgid "Scheduling check.."
 msgid_plural "Scheduling checks.."
 msgstr[0] "Schedulando Controllo.."
 msgstr[1] "Schedulando Controlli.."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:51
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:51
 msgid "Scheduling host check.."
 msgid_plural "Scheduling host checks.."
 msgstr[0] "Schedulando Controllo dell'Host.."
 msgstr[1] "Schedulando Controlli dell'Host.."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:86
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:86
 msgid "Scheduling host downtime.."
 msgid_plural "Scheduling host downtimes.."
 msgstr[0] "Pianificando Manutenzione Host.."
 msgstr[1] "Pianificando Manutenzioni Host.."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:100
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:100
 msgid "Scheduling service check.."
 msgid_plural "Scheduling service checks.."
 msgstr[0] "Schedulando Controllo del Servizio.."
 msgstr[1] "Schedulando Controlli del Servizio.."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:207
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:207
 msgid "Scheduling service downtime.."
 msgid_plural "Scheduling service downtimes.."
 msgstr[0] "Pianifica Manutenzione Sevizio.."
 msgstr[1] "Pianifica Manutenzione Sevizi.."
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:80
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:80
 msgid "Security"
 msgstr "Sicurezza"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:232
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:131
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostController.php:131
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostsController.php:232
 msgid "Send Custom Host Notification"
 msgstr "Invia Notifica Personalizzata per l'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:29
-msgid "Send Custom Notification"
-msgstr "Invia Notifica Personalizzata"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:108
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:281
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:108
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:281
 msgid "Send Custom Service Notification"
 msgstr "Invia Notifica Personalizzata per il Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:123
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:123
 msgid "Send Notification"
 msgstr "Invia Notifica"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:36
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:36
 #, php-format
 msgid "Send a custom notification for all %u hosts"
 msgstr "Invia notifica personalizzata per tutti i %u host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:36
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:36
 #, php-format
 msgid "Send a custom notification for all %u services"
 msgstr "Invia notifica personalizzata per tutti i %u servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:36
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:25
 msgid ""
 "Send a custom notification, share information about the object to contacts."
 msgstr ""
 "Invia una notifica personalizzata, condividi le informazioni dell'oggetto "
 "con i contatti."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:24
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:28
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:28
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:24
 #, php-format
 msgid "Send a mail to %s"
 msgstr "Invia e-mail a %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:34
-#, fuzzy
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:34
 msgid "Send custom notification"
 msgid_plural "Send custom notifications"
 msgstr[0] "Invia Notifica Personalizzata"
 msgstr[1] "Invia Notifica Personalizzata"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:106
-#, fuzzy
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:106
 msgid "Send custom notification.."
 msgid_plural "Send custom notifications.."
-msgstr[0] "Invia Notifica Personalizzata"
-msgstr[1] "Invia Notifica Personalizzata"
+msgstr[0] "Invia Notifica Personalizzata.."
+msgstr[1] "Invia Notifica Personalizzata.."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:62
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:18
+msgid "Send notification"
+msgstr "Invia Notifica"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:62
 #, php-format
 msgid "Sent to %s"
 msgstr "Inviata a %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:201
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml:13
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/object-header.phtml:34
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:53
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:58
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:45
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:298
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:491
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:226
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:298
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:491
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:226
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:53
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:58
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:45
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml:13
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/service/object-header.phtml:34
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:201
 msgid "Service"
 msgstr "Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml:7
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml:7
 #, php-format
 msgid "Service (%u)"
 msgid_plural "Services (%u)"
 msgstr[0] "Servizio (%u)"
 msgstr[1] "Servizi (%u)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:141
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:161
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:141
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:161
 msgid "Service Checks"
 msgstr "Controlli Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:119
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:646
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:119
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:646
 msgid "Service Grid"
 msgstr "Griglia Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:25
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:25
 msgid "Service Group"
 msgstr "Gruppo di Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:239
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:239
 msgid "Service Group Chart"
 msgstr "Grafico dei Gruppi di Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:546
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:546
 msgid "Service Group Name"
 msgstr "Nome del Gruppo di Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:509
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:509
 msgid "Service Groups"
 msgstr "Gruppi di Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:224
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:224
 msgid "Service Name"
 msgstr "Nome Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:380
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:380
 msgid "Service Notification Timeperiod"
 msgstr "Periodo per le Notifiche del Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:115
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:219
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:77
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:115
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:219
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:77
 msgid "Service Problems"
 msgstr "Servizi con Problemi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:222
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:222
 msgid "Service Severity"
 msgstr "Impatto"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:80
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:202
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:80
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:202
 msgid "Service State"
 msgstr "Stato Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:27
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:27
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:27
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:27
 msgid "Service States"
 msgstr "Stati Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:658
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:658
 msgid "Service description"
 msgstr "Descrizione Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/service/show.phtml:3
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/service/show.phtml:3
 msgid "Service detail information"
 msgstr "Dettagli Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:33
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:33
 msgid "Service not found"
 msgstr "Servizio non trovato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:42
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:42
 msgid "Service notification period"
 msgstr "Periodo per le Notifiche del Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:91
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:147
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml:17
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:91
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:147
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml:17
 msgid "Servicegroups"
 msgstr "Gruppi di Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:89
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:143
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:215
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:100
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:50
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:8
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:48
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:42
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:96
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:243
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:171
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:240
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:101
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:89
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:143
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:243
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:171
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:101
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:240
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:100
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:96
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/contact.phtml:42
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:8
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:50
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:48
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:215
 msgid "Services"
 msgstr "Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:550
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:600
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:550
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:600
 msgid "Services CRITICAL"
 msgstr "Servizi CRITICAL"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:548
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:598
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:548
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:598
 msgid "Services OK"
 msgstr "Servizi OK"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:552
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:602
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:552
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:602
 msgid "Services PENDING"
 msgstr "Servizi in ATTESA"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:549
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:599
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:549
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:599
 msgid "Services UNKNOWN"
 msgstr "Servizi UNKNOWN"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:551
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:601
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:551
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:601
 msgid "Services WARNING"
 msgstr "Servizi WARNING"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:53
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:53
 msgid "Set the date and time when the check should be scheduled."
 msgstr "Impostare la data e l'ora dell'esecuzione del controllo."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:89
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:89
 msgid "Set the end date and time for the downtime."
 msgstr "Impostare la data e l'ora della fine della manutenzione."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:44
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:44
 msgid "Set the expire time."
 msgstr "Impostare l'ora di scadenza."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:79
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:79
 msgid "Set the start date and time for the downtime."
 msgstr "Impostare la date e l'ora d'inizio della manutenzione."
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:97
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:97
 msgid "Setup the monitoring module for Icinga Web 2"
 msgstr "Configura il modulo di monitoraggio per Icinga Web 2!"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:132
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:545
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:595
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:132
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:545
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:595
 msgid "Severity"
 msgstr "Impatto"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:231
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:256
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:256
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:231
 #, php-format
 msgid "Show all event records of host %s"
 msgstr "Mostra tutti gli eventi dell'host %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:227
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:252
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:252
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:227
 #, php-format
 msgid "Show all event records of service %s on host %s"
 msgstr "Mostra tutti gli eventi del servizio %s dell'host %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TacticalController.php:15
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TacticalController.php:15
 msgid ""
 "Show an overview of all hosts and services, their current states and "
 "monitoring feature utilisation"
@@ -3278,34 +3289,34 @@ msgstr ""
 "Mostra una panoramica di tutti gli host e servizi, il loro stato corrente e "
 "le funzionalità utilizzate"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:36
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:11
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:23
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/contactgroups.phtml:29
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/contactgroups.phtml:29
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/contacts.phtml:23
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:36
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/contacts.phtml:11
 #, php-format
 msgid "Show detailed information about %s"
 msgstr "Mostra informazioni dettagliate per %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:183
-#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Link.php:37
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:104
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:120
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:208
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:208
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Link.php:37
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:104
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:120
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:183
 #, php-format
 msgid "Show detailed information for host %s"
 msgstr "Mostra informazioni dettagliate per l'host %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:197
-#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Link.php:60
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:151
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:93
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:112
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:222
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:222
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Link.php:60
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:93
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:112
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:151
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:197
 #, php-format
 msgid "Show detailed information for service %s on host %s"
 msgstr "Mostra informazioni dettagliate per il servizio %s dell'host %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:26
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ProcessController.php:26
 msgid ""
 "Show information about the current monitoring instance's process and it's "
 "performance as well as available features"
@@ -3313,7 +3324,7 @@ msgstr ""
 "Mostra le informazioni riguardo lo stato del processo dell'istanza attiva, "
 "le sue performance e le funzionalità disponibili"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:41
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:41
 msgid ""
 "Show recent alerts and visualize notifications and problems based on their "
 "amount and chronological distribution"
@@ -3321,175 +3332,180 @@ msgstr ""
 "Mostra allarmi recenti e visualizza le notifiche e i problemi rispetto alle "
 "occorrenze e alla distribuzione cronologica"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:259
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:259
 msgid "Show resource configuration"
 msgstr "Mostra la configurazione della risorsa"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:77
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostsController.php:77
 #, php-format
 msgid "Show summarized information for %u hosts"
 msgstr "Mostra lista informazioni per %u host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:98
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:98
 #, php-format
 msgid "Show summarized information for %u services"
 msgstr "Mostra lista informazioni per %u servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:390
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:390
 msgid "Show the Event Grid"
 msgstr "Mostra Griglia Eventi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:646
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:646
 msgid "Show the Service Grid"
 msgstr "Mostra la Griglia Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:258
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:258
 #, php-format
 msgid "Show the configuration of the %s resource"
 msgstr "Mostra configurazione per la risorsa %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:21
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:21
 msgid "Show the number of historical event records grouped by time and type"
 msgstr "Mostra il numero di eventi dello storico raggruppati per ora e tipo"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:75
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:76
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/IdoResourcePage.php:75
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:76
 msgid "Skip Validation"
 msgstr "Salta la Verifica"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:127
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:127
 msgid "Socket"
 msgstr "Socket"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:10
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:5
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:12
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:13
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:12
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:7
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:7
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:12
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:14
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:5
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:12
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/eventhistory.phtml:13
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:7
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:12
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:12
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegrid.phtml:10
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:7
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:14
 msgid "Sort by"
 msgstr "Ordina per"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:94
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:94
 msgctxt "setup.welcome.btn.next"
 msgid "Start"
 msgstr "Inizia"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:78
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:301
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:301
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:78
 msgid "Start Time"
 msgstr "Ora Inizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:64
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:64
 msgid "Started downtimes"
 msgstr "Manutenzione iniziate"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:43
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:43
 msgid "Starts"
 msgstr "Inizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:115
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:135
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:115
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:135
 msgid "State"
 msgstr "Stato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:46
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/EventOverviewForm.php:46
 msgid "State Changes"
 msgstr "Cambi di Stato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:53
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:53
 msgid "Status"
 msgstr "Stato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:111
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:111
 msgid "Sticky Acknowledgement"
 msgstr "Commento Permanente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:31
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:31
 msgid "Submit Passive Check Result"
 msgid_plural "Submit Passive Check Results"
 msgstr[0] "Invia Risultato Passivo all'Host"
 msgstr[1] "Invia Risultati Passivo all'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostController.php:119
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostController.php:119
 msgid "Submit Passive Host Check Result"
 msgstr "Invia Risultato Passivo all'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/HostsController.php:220
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/HostsController.php:220
 msgid "Submit Passive Host Check Results"
 msgstr "Invia Risultato Passivo all'Host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:96
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServiceController.php:96
 msgid "Submit Passive Service Check Result"
 msgstr "Invia Risultato Passivo al Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:269
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ServicesController.php:269
 msgid "Submit Passive Service Check Results"
 msgstr "Invia Risultato Passivo al Servizio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml:13
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/command.phtml:13
 #, php-format
 msgid "Submit a one time or so called passive result for the %s check"
 msgstr "Invia risultato passivo per %s controlli"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:29
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/hosts/show.phtml:29
 #, php-format
 msgid "Submit a passive check result for all %u hosts"
 msgstr "Invia risultato passivo per tutti i %u host"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:29
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/services/show.phtml:29
 #, php-format
 msgid "Submit a passive check result for all %u services"
 msgstr "Invia risultato passivo per tutti i %u servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:208
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:208
 msgid "System"
 msgstr "Sistema"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:135
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TacticalController.php:18
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:135
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TacticalController.php:18
 msgid "Tactical Overview"
 msgstr "Visuale Tattica"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:169
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:169
 msgid ""
 "The Zend database adapter for MySQL is required to access a MySQL database."
 msgstr ""
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:189
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:189
 msgid ""
 "The Zend database adapter for PostgreSQL is required to access a PostgreSQL "
 "database."
 msgstr ""
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:227
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:46
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:227
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:46
 msgid "The data source used for retrieving monitoring information"
 msgstr ""
 "La sorgente dei dati usati per recuperare le informazioni di monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/DataView.php:338
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/DataView/DataView.php:338
 #, php-format
 msgid "The filter column \"%s\" is not allowed here."
 msgstr "Il filtro \"%s\" non è ammesso."
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:60
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:60
 msgid "The given resource name is already in use."
 msgstr "Il nome risorsa fornito è già in uso."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:217
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:29
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:217
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/BackendPage.php:29
 msgid "The identifier of this backend"
 msgstr "L'identificatore per questo backend"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ShowController.php:122
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/notifications.phtml:46
+#, php-format
+msgid "The last one occured %s ago"
+msgstr "L'ultimo si è verificato %s fa"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ShowController.php:122
 msgid "The parameter `contact' is required"
 msgstr "Il parametro `contatto' è richiesto"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:83
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:83
 msgid ""
 "The performance data of this check result. Leave empty if this check result "
 "has no performance data"
@@ -3497,33 +3513,33 @@ msgstr ""
 "Dati di performance per questo controllo. Lasciare vuoto se il controllo non "
 "ha dati performance."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:73
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:73
 msgid "The plugin output of this check result"
 msgstr "Output del risultato del controllo"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:241
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:241
 msgid "The resource to use"
 msgstr "La risorsa da usare"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/DataView/DataView.php:247
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/DataView/DataView.php:247
 #, php-format
 msgid "The sort column \"%s\" is not allowed in \"%s\"."
 msgstr "Non è possibile oridinare per colonna \"%s\" in \"%s\"."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:54
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:54
 msgid "The state this check result should report"
 msgstr "Stato da riportare nel risultato del controllo"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:91
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php:91
 #, php-format
 msgid "There is no \"%s\" monitoring backend"
 msgstr "Backend di Monitoraggio \"%s\" non trovato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:17
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/history.phtml:17
 msgid "This Object's Event History"
 msgstr "Storico degli Eventi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:22
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:22
 msgid ""
 "This command is used to acknowledge host or service problems. When a problem "
 "is acknowledged, future notifications about problems are temporarily "
@@ -3533,11 +3549,11 @@ msgstr ""
 "problema è Confermato le notifiche saranno temporaneamente disabilitate fino "
 "al ripristino dell'host o servizio."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:19
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:19
 msgid "This command is used to add host or service comments."
 msgstr "Questo comando serve ad aggiungere commenti agli host o ai servizi."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:26
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:26
 msgid ""
 "This command is used to disable host and service notifications for a "
 "specific time."
@@ -3545,7 +3561,7 @@ msgstr ""
 "Questo comando serve a disabilitare le notifiche di host e servizi per un "
 "periodo di tempo specifico."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:33
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:33
 msgid ""
 "This command is used to schedule host and service downtimes. During the "
 "specified downtime, Icinga will not send notifications out about the hosts "
@@ -3559,7 +3575,7 @@ msgstr ""
 "farebbe normalmente. Le Manutenzioni schedulate saranno preservate da "
 "eventuali arresti o riavvii dell'ambiente."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:23
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php:23
 msgid ""
 "This command is used to schedule the next check of hosts or services. Icinga "
 "will re-queue the hosts or services to be checked at the time you specify."
@@ -3568,35 +3584,35 @@ msgstr ""
 "dell'host o servizio. Icinga eseguirà il controllo per l'host o servizio "
 "all'orario specificato."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:21
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:21
 msgid ""
 "This command is used to send custom notifications for hosts or services."
 msgstr ""
 "Questo comando serve ad inviare notifiche personalizzate per host o servizi."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:20
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:20
 msgid "This command is used to submit passive host or service check results."
 msgstr ""
 "Questo comando serve ad inviare risultati passivi all'host o al servizio."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:76
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:76
 msgid "This comment does not expire."
 msgstr "Questo commento ha scadenza."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:73
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:73
 #, php-format
 msgid "This comment expires on %s at %s."
 msgstr "Questo commento scade il %s alle %s."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:69
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:69
 msgid "This comment is not persistent."
 msgstr "Questo Commento non è permanente."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:68
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:68
 msgid "This comment is persistent."
 msgstr "Questo Commento è permanente."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:107
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:107
 #, php-format
 msgid ""
 "This fixed host downtime has been scheduled to start on %s at %s and to end "
@@ -3605,7 +3621,7 @@ msgstr ""
 "Questa Manutenzione Rigida dell'Host è stata pianificata per iniziare il %s "
 "alle %s e finire il %s alle %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:97
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:97
 #, php-format
 msgid ""
 "This fixed host downtime was started on %s at %s and expires on %s at %s."
@@ -3613,16 +3629,16 @@ msgstr ""
 "Questa Manutenzione Rigida dell'Host è iniziata il %s alle %s e finirà il %s "
 "alle %s."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:106
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:106
 #, php-format
 msgid ""
 "This fixed service downtime has been scheduled to start on %s at %s and to "
 "end on %s at %s."
 msgstr ""
-"Questa Manutenzione Rigida del Servizio è stata pianificata per iniziare il %"
-"s alle %s e finire il %s alle %s"
+"Questa Manutenzione Rigida del Servizio è stata pianificata per iniziare il "
+"%s alle %s e finire il %s alle %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:96
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:96
 #, php-format
 msgid ""
 "This fixed service downtime was started on %s at %s and expires on %s at %s."
@@ -3630,7 +3646,7 @@ msgstr ""
 "Questa Manutenzione Rigida del Servizio è iniziata il %s alle %s e finirà il "
 "%s alle %s."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:86
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:86
 #, php-format
 msgid ""
 "This flexible host downtime has been scheduled to start between %s - %s and "
@@ -3639,16 +3655,16 @@ msgstr ""
 "Questa Manutenzione Flessibile dell'Host è stata pianificata per iniziare "
 "tra %s -%s e durare per %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:75
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:75
 #, php-format
 msgid ""
-"This flexible host downtime was started on %s at %s and lasts for %s until %"
-"s at %s."
+"This flexible host downtime was started on %s at %s and lasts for %s until "
+"%s at %s."
 msgstr ""
 "Questa Manutenzione Flessibile dell'Host è iniziata il %s alle %s e durerà "
 "per %s fino al %s alle %s."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:85
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:85
 #, php-format
 msgid ""
 "This flexible service downtime has been scheduled to start between %s - %s "
@@ -3657,7 +3673,7 @@ msgstr ""
 "Questa Manutenzione Flessibile del Servizio è stata pianificata per iniziare "
 "tra %s -%s e durare per %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:74
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:74
 #, php-format
 msgid ""
 "This flexible service downtime was started on %s at %s and lasts for %s "
@@ -3666,41 +3682,41 @@ msgstr ""
 "Questa Manutenzione Flessibile del Servizio è iniziata il %s alle %s e "
 "durerà per %s fino al %s alle %s."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/WelcomePage.php:33
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/WelcomePage.php:33
 msgid "This is the core module for Icinga Web 2."
 msgstr "Questo è il modulo principale per Icinga Web 2."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:22
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:22
 msgid "Time to Reaction (Ack, Recover)"
 msgstr "Tempo di Reazione (Conferma, Ripristino)"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:103
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:103
 msgid "TimeLine interval"
 msgstr "Intervallo"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:191
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:22
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:26
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:191
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:22
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/TimelineController.php:26
 msgid "Timeline"
 msgstr "Cronologia"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:83
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:83
 msgid "To"
 msgstr "A"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:160
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:160
 msgid ""
 "To access the IDO stored in a MySQL database the PDO-MySQL module for PHP is "
 "required."
 msgstr ""
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:180
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:180
 msgid ""
 "To access the IDO stored in a PostgreSQL database the PDO-PostgreSQL module "
 "for PHP is required."
 msgstr ""
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/SecurityPage.php:16
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/SecurityPage.php:16
 msgid ""
 "To protect your monitoring environment against prying eyes please fill out "
 "the settings below."
@@ -3708,133 +3724,133 @@ msgstr ""
 "Per proteggere il tuo ambiente di monitoraggio da occhi indiscreti si prega "
 "di compilare i dettagli seguenti:"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:86
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:86
 msgid "Today"
 msgstr "Oggi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:133
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:219
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:219
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:133
 msgid "Toggling feature.."
 msgstr "Comando inviato..."
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:56
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:56
 msgid "Top 5 Recent Alerts"
 msgstr "Ultimi 5 Allarmi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:26
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:26
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:547
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ListController.php:597
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:547
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ListController.php:597
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:26
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:26
 msgid "Total Services"
 msgstr "Totale dei Servizi"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:29
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:29
 msgid "Trend"
 msgstr "Trend"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:39
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:39
 msgid "Trend for the last 24h"
 msgstr "Trend nelle ultime 24 ore"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:99
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:99
 msgid "Type"
 msgstr "Tipo"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:31
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:75
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:31
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/config/index.phtml:75
 #, php-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:187
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:40
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:58
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:40
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:58
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:40
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:58
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:40
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:58
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:187
 msgid "UNKNOWN"
 msgstr "UNKNOWN"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:63
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:63
 msgctxt "icinga.state"
 msgid "UNKNOWN"
 msgstr "UNKNOWN"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:179
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:179
 msgid "UNREACHABLE"
 msgstr "UNREACHABLE"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:58
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:58
 msgctxt "icinga.state"
 msgid "UNREACHABLE"
 msgstr "UNREACHABLE"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:173
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Object/Host.php:173
 msgid "UP"
 msgstr "UP"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:56
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:56
 msgctxt "icinga.state"
 msgid "UP"
 msgstr "UP"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:5
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:5
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:49
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:71
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hosts.phtml:49
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/services.phtml:71
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:5
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:5
 msgid "Unhandled"
 msgstr "Non Gestiti"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:101
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:101
 msgid "Unhandled Hosts"
 msgstr "Host Non Gestiti"
 
-#: /usr/share/icingaweb2/modules/monitoring/configuration.php:106
+#: /usr/local/icingaweb2/modules/monitoring/configuration.php:106
 msgid "Unhandled Services"
 msgstr "Servizi Non Gestiti"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:120
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:271
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:271
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:120
 msgid "Unknown"
 msgstr "Unknown"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:141
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:141
 msgid "Unknown instance name given"
 msgstr "Nome Istanza sconosciuto"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:99
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:121
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:99
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/InstanceConfigForm.php:121
 msgid "Unknown instance name provided"
 msgstr "Nome istanza sconosciuto"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:104
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:126
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:172
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:104
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:126
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/BackendConfigForm.php:172
 msgid "Unknown monitoring backend provided"
 msgstr "Backend di monitoraggio sconosciuto"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:140
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:321
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:321
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:140
 msgid "Unreachable"
 msgstr "Unreachable"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:138
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:307
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:307
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:138
 msgid "Up"
 msgstr "Up"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:72
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:72
 msgid "Use Expire Time"
 msgstr "Scadenza"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:52
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:52
 msgid "User"
 msgstr "Utente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:30
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/comments.phtml:30
 msgid "User Comment"
 msgstr "Commento dell'Utente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:54
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php:54
 msgid ""
 "User to log in as on the remote Icinga instance. Please note that key-based "
 "SSH login must be possible for this user"
@@ -3842,153 +3858,156 @@ msgstr ""
 "Utente per la connessione all'istanza remota di Icinga. Si fa notare che è "
 "l'utente può effettuare una autenticazione con chiave SSH."
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:108
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/BackendStep.php:108
 msgid "Username"
 msgstr "Utente"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
 msgid "Value"
 msgstr "Valore"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:624
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:624
 msgid "Value for interval not valid"
 msgstr "Intervallo non valido"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:181
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:46
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:64
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:46
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:64
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:46
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/hostgroups.phtml:64
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:46
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/servicegroups.phtml:64
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/Object/Service.php:181
 msgid "WARNING"
 msgstr "WARNING"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:61
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:61
 msgctxt "icinga.state"
 msgid "WARNING"
 msgstr "WARNING"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:119
-#: /usr/share/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/ChartController.php:257
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/ChartController.php:257
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/StatehistoryForm.php:119
+#: /usr/local/icingaweb2/modules/monitoring/application/views/helpers/Perfdata.php:29
 msgid "Warning"
 msgstr "Warning"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Setup/WelcomePage.php:21
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Setup/WelcomePage.php:21
 msgid "Welcome to the configuration of the monitoring module for Icinga Web 2!"
 msgstr ""
 "Benvenuto nella configurazione del modulo di monitoraggio per Icinga Web 2!"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml:17
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checksource.phtml:17
 msgid "Yes"
 msgstr "Si"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:166
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:166
 msgid "Zend database adapter for MySQL"
 msgstr ""
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:186
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:186
 msgid "Zend database adapter for PostgreSQL"
 msgstr ""
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:51
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:39
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:51
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:39
 #, php-format
 msgctxt "time"
 msgid "at %s"
 msgstr "alle %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:59
-#, fuzzy, php-format
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:59
+#, php-format
 msgctxt "timeline.link.title.datetime.twice"
 msgid "between %s and %s"
 msgstr "tra %s e %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:107
+#: /usr/local/icingaweb2/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:107
 msgid "changed"
 msgstr "modificato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:182
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:182
 msgid "down"
 msgstr "down"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:65
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:65
 msgid "hard state"
 msgstr "hard"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:52
-#, php-format
-msgctxt "timespan"
-msgid "in %s"
-msgstr "in %s"
-
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:47
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:47
 #, fuzzy, php-format
 msgctxt "timeline.link.title.month.and.year"
 msgid "in %s"
 msgstr "il %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:53
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:53
 #, fuzzy, php-format
 msgctxt "timeline.link.title.year"
 msgid "in %s"
 msgstr "il %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:37
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:52
+#, php-format
+msgctxt "timespan"
+msgid "in %s"
+msgstr "in %s"
+
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:37
 msgid "in the last hour"
 msgstr "nell'ultima ora"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:40
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:40
 #, fuzzy, php-format
 msgctxt "timeline.link.title.week.and.year"
 msgid "in week %s of %s"
 msgstr "nella settimana %s di %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:35
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/alertsummary/index.phtml:35
 msgid "notifications per hour"
 msgstr "notifiche per ora"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:50
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:38
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/downtimes.phtml:50
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/notifications.phtml:38
 #, php-format
 msgctxt "datetime"
 msgid "on %s"
 msgstr "il %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:34
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/timeline/index.phtml:34
 #, fuzzy, php-format
 msgctxt "timeline.link.title.time"
 msgid "on %s"
 msgstr "di %s"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:77
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:77
 msgid "overall"
 msgstr "complessivo"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml:5
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/list/components/selectioninfo.phtml:5
 msgctxt "multiselection"
 msgid "row(s) selected"
 msgstr "righe selezionate"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:78
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/process/info.phtml:78
 msgid "scheduled"
 msgstr "schedulato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:63
+#: /usr/local/icingaweb2/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:63
 msgid "soft state"
 msgstr "soft"
 
-#: /usr/share/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:50
+#: /usr/local/icingaweb2/modules/monitoring/library/Monitoring/MonitoringWizard.php:50
 msgid "the monitoring module"
 msgstr "il modulo di monitoraggio"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:180
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:180
 msgid "unchanged"
 msgstr "invariato"
 
-#: /usr/share/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:184
+#: /usr/local/icingaweb2/modules/monitoring/application/controllers/AlertsummaryController.php:184
 msgid "up"
 msgstr "up"
 
+#~ msgid "Send Custom Notification"
+#~ msgstr "Invia Notifica Personalizzata"
+
 #~ msgid "Monitoring IDO Resource"
 #~ msgstr "Risorsa IDO"
 
@@ -4187,9 +4206,6 @@ msgstr "up"
 #~ msgid "List all"
 #~ msgstr "Mostra tutto"
 
-#~ msgid "No notification has been sent for this issue"
-#~ msgstr "Nessuna notifica è stata inviata per questo problema"
-
 #~ msgid "PHP Module: Sockets"
 #~ msgstr "Modulo PHP: Sockets"
 
@@ -4227,9 +4243,6 @@ msgstr "up"
 #~ msgid "The PHP Module sockets is not available."
 #~ msgstr "Il modulo PHP Sockets non è disponibile"
 
-#~ msgid "The last one occured %s ago"
-#~ msgstr "L'ultimo si è verificato %s fa"
-
 #~ msgid "Unhandled hosts with state DOWN"
 #~ msgstr "Host Non Gestiti in stato DOWN"
 
@@ -4241,9 +4254,3 @@ msgstr "up"
 
 #~ msgid "Comment: "
 #~ msgstr "Commento: "
-
-#~ msgid "A notication has been sent for this issue %s ago"
-#~ msgstr "Una notifica è stata inviata per questo problema %s fa"
-
-#~ msgid "%s notications have been sent for this issue"
-#~ msgstr "%s notifiche inviate per questo problema"

From cd5e07063f988f3d53ea007d5c5e84683826af0a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 17:01:27 +0100
Subject: [PATCH 1072/2920] RPM: Fix version

---
 icingaweb2.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index 231b2642e..1ea69451d 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -1,6 +1,6 @@
 # Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+
 
-%define revision 2.rc1
+%define revision 3.beta3
 
 Name:           icingaweb2
 Version:        2.0.0

From e17f9d7ebe775d993cbe8f634cd94e538a24269e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 17:01:52 +0100
Subject: [PATCH 1073/2920] Sort host overview by severity by default ...

... as indicated by the sort control.
---
 .../library/Monitoring/DataView/HostStatus.php     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index 904dd41f8..a78e4b143 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -90,6 +90,13 @@ class HostStatus extends DataView
     public function getSortRules()
     {
         return array(
+            'host_severity' => array(
+                'columns' => array(
+                    'host_severity',
+                    'host_last_state_change',
+                ),
+                'order' => self::SORT_DESC
+            ),
             'host_display_name' => array(
                 'order' => self::SORT_ASC
             ),
@@ -101,13 +108,6 @@ class HostStatus extends DataView
             ),
             'host_last_state_change' => array(
                 'order' => self::SORT_ASC
-            ),
-            'host_severity' => array(
-                'columns' => array(
-                    'host_severity',
-                    'host_last_state_change',
-                ),
-                'order' => self::SORT_DESC
             )
         );
     }

From 949438d753d875ad152f9f66898af227668bd59b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 17:09:32 +0100
Subject: [PATCH 1074/2920] lib: Add SimpleQuery::splitOrder() ...

... for supporting specifying the sort direction next to the column, e.g.
'service_display_name ASC'

refs #8716
---
 library/Icinga/Data/SimpleQuery.php | 30 ++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 886030395..704a6ff8a 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -161,6 +161,26 @@ class SimpleQuery implements QueryInterface, Queryable
         throw new IcingaException('This function does nothing and will be removed');
     }
 
+    /**
+     * Split order field into its field and sort direction
+     *
+     * @param   string  $field
+     *
+     * @return  array
+     */
+    public function splitOrder($field)
+    {
+        $fieldAndDirection = explode(' ', $field, 2);
+        if (count($fieldAndDirection) === 1) {
+            $direction = null;
+        } else {
+            $field = $fieldAndDirection[0];
+            $direction = (strtoupper(trim($fieldAndDirection[1])) === 'DESC') ?
+                Sortable::SORT_DESC : Sortable::SORT_ASC;
+        }
+        return array($field, $direction);
+    }
+
     /**
      * Sort result set by the given field (and direction)
      *
@@ -177,13 +197,9 @@ class SimpleQuery implements QueryInterface, Queryable
     public function order($field, $direction = null)
     {
         if ($direction === null) {
-            $fieldAndDirection = explode(' ', $field, 2);
-            if (count($fieldAndDirection) === 1) {
-                $direction = self::SORT_ASC;
-            } else {
-                $field = $fieldAndDirection[0];
-                $direction = (strtoupper(trim($fieldAndDirection[1])) === 'DESC') ?
-                    Sortable::SORT_DESC : Sortable::SORT_ASC;
+            list($field, $direction) = $this->splitOrder($field);
+            if ($direction === null) {
+                $direction = Sortable::SORT_ASC;
             }
         } else {
             switch (($direction = strtoupper($direction))) {

From 7ddd8d7ad299de1a18c4a73da11b61425cf8f26f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 17:12:16 +0100
Subject: [PATCH 1075/2920] Add support for order next to the column to
 DataView::getSortRules()

refs #8716
---
 modules/monitoring/library/Monitoring/DataView/DataView.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 9683c468f..c9537eff8 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -242,6 +242,7 @@ abstract class DataView implements Browsable, Countable, Filterable, Sortable
         $order = (strtoupper($order) === static::SORT_ASC) ? 'ASC' : 'DESC';
 
         foreach ($sortColumns['columns'] as $column) {
+            list($column, $direction) = $this->query->splitOrder($column);
             if (! $this->isValidFilterTarget($column)) {
                 throw new QueryException(
                     mt('monitoring', 'The sort column "%s" is not allowed in "%s".'),
@@ -249,7 +250,7 @@ abstract class DataView implements Browsable, Countable, Filterable, Sortable
                     get_class($this)
                 );
             }
-            $this->query->order($column, $order);
+            $this->query->order($column, $direction !== null ? $direction : $order);
         }
         $this->isSorted = true;
         return $this;

From 03d85ac6aeb56097af79761b6b803707cfe225d4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 17:13:52 +0100
Subject: [PATCH 1076/2920] Sort by service_display_name too when sorting by
 service_severity

refs #8716
---
 .../Monitoring/DataView/ServiceStatus.php     | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index 5c37e45ee..3e3a1c616 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -125,17 +125,26 @@ class ServiceStatus extends DataView
         return array(
             'service_severity' => array(
                 'columns' => array(
-                    'service_severity',
-                    'service_last_state_change'
+                    'service_severity DESC',
+                    'service_last_state_change DESC',
+                    'service_display_name ASC',
+                    'host_display_name ASC'
+                )
+            ),
+            'service_display_name' => array(
+                'columns' => array(
+                    'service_display_name',
+                    'host_display_name'
                 ),
-                'order' => self::SORT_DESC
+                'order' => self::SORT_ASC
             ),
             'host_severity' => array(
                 'columns' => array(
-                    'host_severity',
-                    'host_last_state_change',
-                ),
-                'order' => self::SORT_ASC
+                    'host_severity DESC',
+                    'host_last_state_change DESC',
+                    'host_display_name ASC',
+                    'service_display_name ASC'
+                )
             ),
             'host_display_name' => array(
                 'columns' => array(

From dbb5aba7379521a121206cb2acd5d886ce92af2e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 17:14:14 +0100
Subject: [PATCH 1077/2920] Sort by host_display_name too when sorting by
 host_severity

refs #8716
---
 .../monitoring/library/Monitoring/DataView/HostStatus.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index a78e4b143..7a7c28b0c 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -92,10 +92,10 @@ class HostStatus extends DataView
         return array(
             'host_severity' => array(
                 'columns' => array(
-                    'host_severity',
-                    'host_last_state_change',
-                ),
-                'order' => self::SORT_DESC
+                    'host_severity DESC',
+                    'host_last_state_change DESC',
+                    'host_display_name ASC'
+                )
             ),
             'host_display_name' => array(
                 'order' => self::SORT_ASC

From f1cdc8c9047c39c12c10eb2bd5a936f06cafc424 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 17:19:56 +0100
Subject: [PATCH 1078/2920] Sort host and service overview by display_name by
 default

refs #8716
---
 .../library/Monitoring/DataView/HostStatus.php     |  6 +++---
 .../library/Monitoring/DataView/ServiceStatus.php  | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index 7a7c28b0c..020da34c1 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -90,6 +90,9 @@ class HostStatus extends DataView
     public function getSortRules()
     {
         return array(
+            'host_display_name' => array(
+                'order' => self::SORT_ASC
+            ),
             'host_severity' => array(
                 'columns' => array(
                     'host_severity DESC',
@@ -97,9 +100,6 @@ class HostStatus extends DataView
                     'host_display_name ASC'
                 )
             ),
-            'host_display_name' => array(
-                'order' => self::SORT_ASC
-            ),
             'host_address' => array(
                 'columns' => array(
                     'host_ipv4'
diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index 3e3a1c616..d04191068 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -123,6 +123,13 @@ class ServiceStatus extends DataView
     public function getSortRules()
     {
         return array(
+            'service_display_name' => array(
+                'columns' => array(
+                    'service_display_name',
+                    'host_display_name'
+                ),
+                'order' => self::SORT_ASC
+            ),
             'service_severity' => array(
                 'columns' => array(
                     'service_severity DESC',
@@ -131,13 +138,6 @@ class ServiceStatus extends DataView
                     'host_display_name ASC'
                 )
             ),
-            'service_display_name' => array(
-                'columns' => array(
-                    'service_display_name',
-                    'host_display_name'
-                ),
-                'order' => self::SORT_ASC
-            ),
             'host_severity' => array(
                 'columns' => array(
                     'host_severity DESC',

From ec60f15f09e381f4c622088f16918bfb88e17fa0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 17:22:49 +0100
Subject: [PATCH 1079/2920] Leave note about Upgrading to Icinga Web 2 Beta 3

---
 doc/installation.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/installation.md b/doc/installation.md
index 3ab099e3a..ef968974a 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -133,3 +133,8 @@ After please log out from Icinga Web 2 and log in again for having all permissio
 If you delegated authentication to your web server using the `autologin` backend, you have to switch to the `external`
 authentication backend to be able to log in again. The new name better reflects what’s going on. A similar change
 affects environments that opted for not storing preferences, your new backend is `none`.
+
+## Upgrading to Icinga Web 2 Beta 3
+
+Because Icinga Web 2 Beta 3 does not introduce any backward incompatible change you don't have to change your
+configuration files after upgrading to Icinga Web 2 Beta 3.

From 5383999ef7f8f5d03052a55e6e2fb8ce475ddabd Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 16 Mar 2015 17:38:07 +0100
Subject: [PATCH 1080/2920] Add warning to links that open in a new window

Add warning on mouseover / focus as recommended by as recommended by WCAG20 G201

refs #7937
---
 library/Icinga/Web/Widget/Tab.php               | 17 +++++++++++++++++
 .../Web/Widget/Tabextension/OutputFormat.php    |  7 +++----
 .../views/scripts/show/components/actions.phtml |  6 +++++-
 public/css/icinga/tabs.less                     | 16 ++++++++++++++++
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index a210a206e..28e3fd3bd 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -84,6 +84,13 @@ class Tab extends AbstractWidget
      */
     private $tagParams;
 
+    /**
+     * Whether to open the link target on a new page
+     *
+     * @var boolean
+     */
+    private $targetBlank = false;
+
     /**
      * Sets an icon image for this tab
      *
@@ -198,6 +205,11 @@ class Tab extends AbstractWidget
         $this->tagParams = $tagParams;
     }
 
+    public function setTargetBlank($value = true)
+    {
+        $this->targetBlank =  $value;
+    }
+
     /**
      * Create a new Tab with the given properties
      *
@@ -244,6 +256,11 @@ class Tab extends AbstractWidget
 
         $caption = $view->escape($this->getLabel());
         $tagParams = $this->tagParams;
+        if ($this->targetBlank) {
+            // add warning to links that open in new tabs to improve accessibility, as recommended by WCAG20 G201
+            $caption .= '<span class="info-box display-on-hover"> opens in new window </span>';
+            $tagParams['target'] ='_blank';
+        }
 
         if ($this->title) {
             if ($tagParams !== null) {
diff --git a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
index 0ef7eea69..f2da29f22 100644
--- a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
+++ b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
@@ -48,10 +48,9 @@ class OutputFormat implements Tabextension
         foreach ($this->getSupportedTypes() as $type => $tabConfig) {
             if (!in_array($type, $disabled)) {
                 $tabConfig['url'] = Url::fromRequest();
-                $tabConfig['tagParams'] = array(
-                    'target' => '_blank'
-                );
-                $this->tabs[] = new Tab($tabConfig);
+                $tab = new Tab($tabConfig);
+                $tab->setTargetBlank();
+                $this->tabs[] = $tab;
             }
         }
     }
diff --git a/modules/monitoring/application/views/scripts/show/components/actions.phtml b/modules/monitoring/application/views/scripts/show/components/actions.phtml
index 1d926b33a..2defd616d 100644
--- a/modules/monitoring/application/views/scripts/show/components/actions.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/actions.phtml
@@ -1,7 +1,11 @@
 <?php
 
 $links = array();
-$linkText = '<a href="%s" target="_blank">%s</a>';
+
+// add warning to links that open in new tabs to improve accessibility, as recommended by WCAG20 G201
+$newTabInfo = sprintf('<span class="info-box display-on-hover"> %s </span>', $this->translate('opens in new window'));
+
+$linkText = '<a href="%s" target="_blank">%s ' . $newTabInfo . '</a>';
 $localLinkText = '<a href="%s">%s</a>';
 
 if ($object->notes_url) {
diff --git a/public/css/icinga/tabs.less b/public/css/icinga/tabs.less
index d9161f672..8d391b038 100644
--- a/public/css/icinga/tabs.less
+++ b/public/css/icinga/tabs.less
@@ -148,3 +148,19 @@ a.close-tab {
     content: '\e874';
   }
 }
+
+span.display-on-hover {
+  font-size: 0.8em;
+  left: -9000px;
+  position: relative;
+  display: inline;
+  width: 0;
+  overflow: hidden;
+  color: #000000;
+  text-decoration: none;
+}
+
+:hover > span.display-on-hover, :focus > span.display-on-hover {
+  left:1em; width:12em;
+  text-align: center
+}

From 26ff265219b8cffece609600f390f5db184d9e62 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 19 Mar 2015 11:22:56 +0100
Subject: [PATCH 1081/2920] Improve search field caption for screen readers

Use unicode ellipsis instead of dots to not confuse screen readers. Screen readers shouldn't read 'dot dot dot' when focusing the search button.
---
 application/views/scripts/layout/menu.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/scripts/layout/menu.phtml b/application/views/scripts/layout/menu.phtml
index 920677d7f..fe931c9d4 100644
--- a/application/views/scripts/layout/menu.phtml
+++ b/application/views/scripts/layout/menu.phtml
@@ -5,7 +5,7 @@ use Icinga\Web\Widget\SearchDashboard;
 <? if (SearchDashboard::search('dummy')->getPane('search')->hasDashlets()): ?>
     <form action="<?= $this->href('search') ?>" method="get" role="search">
         <input
-            type="text" name="q" id="search" class="search" placeholder="<?= $this->translate('Search...') ?>"
+            type="text" name="q" id="search" class="search" placeholder="<?= $this->translate('Search') ?> &hellip;"
             autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
         />
     </form>

From 0a7e76d190f69a2fb9b96acb3788243ad529a654 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 30 Mar 2015 11:27:17 +0200
Subject: [PATCH 1082/2920] Fix typo in Perfdata::formatLabel()'s PHPDoc

---
 modules/monitoring/library/Monitoring/Plugin/Perfdata.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
index cbf86ab19..cdafa534c 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -429,7 +429,7 @@ class Perfdata
      *
      * @param bool $html
      *
-     * @return stringS
+     * @return string
      */
     public function formatLabel($html = false)
     {

From ab1dc1faa0e532e00332a5069ab7f2407c8501db Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 30 Mar 2015 11:28:05 +0200
Subject: [PATCH 1083/2920] Do not translate format strings

---
 modules/monitoring/library/Monitoring/Plugin/Perfdata.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
index cdafa534c..b1c71cb72 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -434,7 +434,7 @@ class Perfdata
     public function formatLabel($html = false)
     {
         return sprintf(
-            $html ? t('<b>%s %s</b> (%s%%)') : t('%s %s (%s%%)'),
+            $html ? '<b>%s %s</b> (%s%%)' : '%s %s (%s%%)',
             htmlspecialchars($this->getLabel()),
             $this->format($this->value),
             number_format($this->getPercentage(), 2)

From 820862d5469d3ad45fede14e518e041622469bfa Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 30 Mar 2015 11:58:48 +0200
Subject: [PATCH 1084/2920] Use Controller::translate() instead of t() in the
 AlertsummaryController

refs #7330
---
 .../controllers/AlertsummaryController.php    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 449967fcb..0321e0eae 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -324,11 +324,11 @@ class Monitoring_AlertsummaryController extends Controller
     public function createHealingChart()
     {
         $gridChart = new GridChart();
-        $gridChart->title = t('Healing Chart');
-        $gridChart->description = t('Notifications and average reaction time per hour.');
+        $gridChart->title = $this->translate('Healing Chart');
+        $gridChart->description = $this->translate('Notifications and average reaction time per hour.');
 
         $gridChart->alignTopLeft();
-        $gridChart->setAxisLabel($this->createPeriodDescription(), mt('monitoring', 'Notifications'))
+        $gridChart->setAxisLabel($this->createPeriodDescription(), $this->translate('Notifications'))
             ->setXAxis(new StaticAxis())
             ->setYAxis(new LinearUnit(10))
             ->setAxisMin(null, 0);
@@ -440,7 +440,7 @@ class Monitoring_AlertsummaryController extends Controller
                 'color' => '#ffaa44',
                 'data'  =>  $dAvg,
                 'showPoints' => true,
-                'tooltip' => t('<b>{title}:</b> {value}m min. reaction time')
+                'tooltip' => $this->translate('<b>{title}:</b> {value}m min. reaction time')
             )
         );
 
@@ -450,7 +450,7 @@ class Monitoring_AlertsummaryController extends Controller
                 'color' => '#ff5566',
                 'data'  =>  $dMax,
                 'showPoints' => true,
-                'tooltip' => t('<b>{title}:</b> {value}m max. reaction time')
+                'tooltip' => $this->translate('<b>{title}:</b> {value}m max. reaction time')
             )
         );
 
@@ -465,11 +465,11 @@ class Monitoring_AlertsummaryController extends Controller
     public function createDefectImage()
     {
         $gridChart = new GridChart();
-        $gridChart->title = t('Defect Chart');
-        $gridChart->description = t('Notifications and defects per hour');
+        $gridChart->title = $this->translate('Defect Chart');
+        $gridChart->description = $this->translate('Notifications and defects per hour');
 
         $gridChart->alignTopLeft();
-        $gridChart->setAxisLabel($this->createPeriodDescription(), mt('monitoring', 'Notifications'))
+        $gridChart->setAxisLabel($this->createPeriodDescription(), $this->translate('Notifications'))
             ->setXAxis(new StaticAxis())
             ->setYAxis(new LinearUnit(10))
             ->setAxisMin(null, 0);
@@ -637,16 +637,16 @@ class Monitoring_AlertsummaryController extends Controller
         $int = $this->getInterval();
         switch ($int) {
             case '1d':
-                return t('Hour');
+                return $this->translate('Hour');
                 break;
             case '1w';
-                return t('Day');
+                return $this->translate('Day');
                 break;
             case '1m':
-                return t('Day');
+                return $this->translate('Day');
                 break;
             case '1y':
-                return t('Month');
+                return $this->translate('Month');
                 break;
         }
     }

From be53f4f9bc6657ffd3b104801e919c3574611f72 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 30 Mar 2015 12:04:05 +0200
Subject: [PATCH 1085/2920] Use Controller::translate() instead of t()/mt() in
 the ChartController

refs #7330
---
 .../controllers/ChartController.php           | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/monitoring/application/controllers/ChartController.php b/modules/monitoring/application/controllers/ChartController.php
index f19d3f458..08f9334ee 100644
--- a/modules/monitoring/application/controllers/ChartController.php
+++ b/modules/monitoring/application/controllers/ChartController.php
@@ -236,39 +236,39 @@ class Monitoring_ChartController extends Controller
             $unknownBars[] = array($servicegroup->servicegroup, $servicegroup->services_unknown_unhandled);
         }
         $this->view->chart = new GridChart();
-        $this->view->chart->title = t('Service Group Chart');
-        $this->view->chart->description = t('Contains service states for each service group.');
+        $this->view->chart->title = $this->translate('Service Group Chart');
+        $this->view->chart->description = $this->translate('Contains service states for each service group.');
 
         $this->view->chart->alignTopLeft();
-        $this->view->chart->setAxisLabel('', mt('monitoring', 'Services'))
+        $this->view->chart->setAxisLabel('', $this->translate('Services'))
             ->setXAxis(new StaticAxis())
             ->setAxisMin(null, 0);
 
-        $tooltip = mt('monitoring', '<b>{title}:</b><br>{value} of {sum} services are {label}');
+        $tooltip = $this->translate('<b>{title}:</b><br>{value} of {sum} services are {label}');
         $this->view->chart->drawBars(
             array(
-                'label' => mt('monitoring', 'Ok'),
+                'label' => $this->translate('Ok'),
                 'color' => '#44bb77',
                 'stack' => 'stack1',
                 'data'  => $okBars,
                 'tooltip' => $tooltip
             ),
             array(
-                'label' => mt('monitoring', 'Warning'),
+                'label' => $this->translate('Warning'),
                 'color' => '#ffaa44',
                 'stack' => 'stack1',
                 'data'  => $warningBars,
                 'tooltip' => $tooltip
             ),
             array(
-                'label' => mt('monitoring', 'Critical'),
+                'label' => $this->translate('Critical'),
                 'color' => '#ff5566',
                 'stack' => 'stack1',
                 'data'  => $critBars,
                 'tooltip' => $tooltip
             ),
             array(
-                'label' => mt('monitoring', 'Unknown'),
+                'label' => $this->translate('Unknown'),
                 'color' => '#dd66ff',
                 'stack' => 'stack1',
                 'data'  => $unknownBars,
@@ -293,32 +293,32 @@ class Monitoring_ChartController extends Controller
                 (string)$i, rand(1, 200), rand(1, 200)
             );
         }
-        $tooltip = mt('monitoring', '<b>{title}:</b><br> {value} of {sum} hosts are {label}');
+        $tooltip = $this->translate('<b>{title}:</b><br> {value} of {sum} hosts are {label}');
         $this->view->chart = new GridChart();
-        $this->view->chart->title = t('Host Group Chart');
-        $this->view->chart->description = t('Contains host states of each service group.');
+        $this->view->chart->title = $this->translate('Host Group Chart');
+        $this->view->chart->description = $this->translate('Contains host states of each service group.');
 
         $this->view->chart->alignTopLeft();
-        $this->view->chart->setAxisLabel('', mt('monitoring', 'Hosts'))
+        $this->view->chart->setAxisLabel('', $this->translate('Hosts'))
             ->setXAxis(new StaticAxis())
             ->setAxisMin(null, 0);
         $this->view->chart->drawBars(
             array(
-                'label' => mt('monitoring', 'Up'),
+                'label' => $this->translate('Up'),
                 'color' => '#44bb77',
                 'stack' => 'stack1',
                 'data'  => $upBars,
                 'tooltip' => $tooltip
             ),
             array(
-                'label' => mt('monitoring', 'Down'),
+                'label' => $this->translate('Down'),
                 'color' => '#ff5566',
                 'stack' => 'stack1',
                 'data'  => $downBars,
                 'tooltip' => $tooltip
             ),
             array(
-                'label' => mt('monitoring', 'Unreachable'),
+                'label' => $this->translate('Unreachable'),
                 'color' => '#dd66ff',
                 'stack' => 'stack1',
                 'data'  => $unreachableBars,
@@ -345,13 +345,13 @@ class Monitoring_ChartController extends Controller
             'colors' => array('#44bb77', '#ff4444', '#ff0000', '#ffff00', '#ffff33', '#E066FF', '#f099FF', '#fefefe'),
             'labels'=> array(
                 $query->services_ok . ' Up Services',
-                $query->services_warning_handled . mt('monitoring', ' Warning Services (Handled)'),
-                $query->services_warning_unhandled . mt('monitoring', ' Warning Services (Unhandled)'),
-                $query->services_critical_handled . mt('monitoring', ' Down Services (Handled)'),
-                $query->services_critical_unhandled . mt('monitoring', ' Down Services (Unhandled)'),
-                $query->services_unknown_handled . mt('monitoring', ' Unreachable Services (Handled)'),
-                $query->services_unknown_unhandled . mt('monitoring', ' Unreachable Services (Unhandled)'),
-                $query->services_pending . mt('monitoring', ' Pending Services')
+                $query->services_warning_handled . $this->translate(' Warning Services (Handled)'),
+                $query->services_warning_unhandled . $this->translate(' Warning Services (Unhandled)'),
+                $query->services_critical_handled . $this->translate(' Down Services (Handled)'),
+                $query->services_critical_unhandled . $this->translate(' Down Services (Unhandled)'),
+                $query->services_unknown_handled . $this->translate(' Unreachable Services (Handled)'),
+                $query->services_unknown_unhandled . $this->translate(' Unreachable Services (Unhandled)'),
+                $query->services_pending . $this->translate(' Pending Services')
             )
         ));
     }
@@ -378,12 +378,12 @@ class Monitoring_ChartController extends Controller
                 '#fefefe'
             ),
             'labels'=> array(
-                (int) $query->hosts_up . mt('monitoring', ' Up Hosts'),
-                (int) $query->hosts_down_handled . mt('monitoring', ' Down Hosts (Handled)'),
-                (int) $query->hosts_down_unhandled . mt('monitoring', ' Down Hosts (Unhandled)'),
-                (int) $query->hosts_unreachable_handled . mt('monitoring', ' Unreachable Hosts (Handled)'),
-                (int) $query->hosts_unreachable_unhandled . mt('monitoring', ' Unreachable Hosts (Unhandled)'),
-                (int) $query->hosts_pending . mt('monitoring', ' Pending Hosts')
+                (int) $query->hosts_up . $this->translate(' Up Hosts'),
+                (int) $query->hosts_down_handled . $this->translate(' Down Hosts (Handled)'),
+                (int) $query->hosts_down_unhandled . $this->translate(' Down Hosts (Unhandled)'),
+                (int) $query->hosts_unreachable_handled . $this->translate(' Unreachable Hosts (Handled)'),
+                (int) $query->hosts_unreachable_unhandled . $this->translate(' Unreachable Hosts (Unhandled)'),
+                (int) $query->hosts_pending . $this->translate(' Pending Hosts')
             )
         ), array(
             'data' => array(
@@ -398,14 +398,14 @@ class Monitoring_ChartController extends Controller
             ),
             'colors' => array('#44bb77', '#ff4444', '#ff0000', '#ffff00', '#ffff33', '#E066FF', '#f099FF', '#fefefe'),
             'labels'=> array(
-                $query->services_ok . mt('monitoring', ' Up Services'),
-                $query->services_warning_handled . mt('monitoring', ' Warning Services (Handled)'),
-                $query->services_warning_unhandled . mt('monitoring', ' Warning Services (Unhandled)'),
-                $query->services_critical_handled . mt('monitoring', ' Down Services (Handled)'),
-                $query->services_critical_unhandled . mt('monitoring', ' Down Services (Unhandled)'),
-                $query->services_unknown_handled . mt('monitoring', ' Unreachable Services (Handled)'),
-                $query->services_unknown_unhandled . mt('monitoring', ' Unreachable Services (Unhandled)'),
-                $query->services_pending . mt('monitoring', ' Pending Services')
+                $query->services_ok . $this->translate(' Up Services'),
+                $query->services_warning_handled . $this->translate(' Warning Services (Handled)'),
+                $query->services_warning_unhandled . $this->translate(' Warning Services (Unhandled)'),
+                $query->services_critical_handled . $this->translate(' Down Services (Handled)'),
+                $query->services_critical_unhandled . $this->translate(' Down Services (Unhandled)'),
+                $query->services_unknown_handled . $this->translate(' Unreachable Services (Handled)'),
+                $query->services_unknown_unhandled . $this->translate(' Unreachable Services (Unhandled)'),
+                $query->services_pending . $this->translate(' Pending Services')
             )
         ));
     }

From 83408ee21bc2623f024ce5e3ff7d256ed2493e98 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 30 Mar 2015 12:04:58 +0200
Subject: [PATCH 1086/2920] Use Controller::translate() instead of mt() in the
 AlertsummaryController

refs #7330
---
 .../application/controllers/AlertsummaryController.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 0321e0eae..54150dac2 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -533,12 +533,12 @@ class Monitoring_AlertsummaryController extends Controller
         $box = new SelectBox(
             'intervalBox',
             array(
-                '1d' => mt('monitoring', 'One day'),
-                '1w' => mt('monitoring', 'One week'),
-                '1m' => mt('monitoring', 'One month'),
-                '1y' => mt('monitoring', 'One year')
+                '1d' => $this->translate('One day'),
+                '1w' => $this->translate('One week'),
+                '1m' => $this->translate('One month'),
+                '1y' => $this->translate('One year')
             ),
-            mt('monitoring', 'Report interval'),
+            $this->translate('Report interval'),
             'interval'
         );
         $box->applyRequest($this->getRequest());

From 8c46e5e2858c5a0cf822697a1e3c148f7a4004fe Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 30 Mar 2015 12:08:26 +0200
Subject: [PATCH 1087/2920] Use View::translate() instead of t() in the
 Perfdata view helper

refs #7330
---
 .../application/views/helpers/Perfdata.php           | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 41d903a2f..f669219aa 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -26,7 +26,15 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
         $table = array(
             '<td><b>' . implode(
                 '</b></td><td><b>',
-                array('', t('Label'), t('Value'), t('Min'), t('Max'), t('Warning'), t('Critical'))
+                array(
+                    '',
+                    $this->view->translate('Label'),
+                    $this->view->translate('Value'),
+                    $this->view->translate('Min'),
+                    $this->view->translate('Max'),
+                    $this->view->translate('Warning'),
+                    $this->view->translate('Critical')
+                )
             ) . '<b></td>'
         );
         foreach ($pieChartData as $perfdata) {
@@ -61,7 +69,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
             $table = array_slice ($table, 0, $limit);
             $results = array_slice ($results, 0, $limit);
             if ($count > $limit) {
-                $mess = sprintf(t('%d more ...'), $count - $limit);
+                $mess = sprintf($this->view->translate('%d more ...'), $count - $limit);
                 $results[] = '<span title="' . $mess . '">...</span>';
             }
         }

From 09d713be0d6b91a594fd56e16f71f4eae015dc58 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 30 Mar 2015 12:10:58 +0200
Subject: [PATCH 1088/2920] Fix PHPDoc of the Perfdata view helper

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

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index f669219aa..8c0ea236d 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -1,20 +1,18 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use Icinga\Util\Format;
-use Icinga\Web\Widget\Chart\InlinePie;
 use Icinga\Module\Monitoring\Plugin\Perfdata;
 use Icinga\Module\Monitoring\Plugin\PerfdataSet;
 
 class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
-{#
-
+{
     /**
      * Display the given perfdata string to the user
      *
-     * @param      $perfdataStr The perfdata string
-     * @param bool $compact     Whether to display the perfdata in compact mode
-     * @param      $color       The color indicating the perfdata state
+     * @param   string  $perfdataStr    The perfdata string
+     * @param   bool    $compact        Whether to display the perfdata in compact mode
+     * @param   int     $limit          Max labels to show; 0 for no limit
+     * @param   string  $color          The color indicating the perfdata state
      *
      * @return string
      */

From 5745c1fec41e426e0af0be8840d0610ee22083aa Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 30 Mar 2015 12:12:58 +0200
Subject: [PATCH 1089/2920] Fix code style in the Perfdata view helper

---
 .../application/views/helpers/Perfdata.php          | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 8c0ea236d..36cbaa319 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -19,7 +19,6 @@ 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();
-
         $results = array();
         $table = array(
             '<td><b>' . implode(
@@ -48,12 +47,12 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
                 }
                 $row .= '</td>';
 
-                if (!$compact) {
+                if (! $compact) {
                     foreach ($perfdata->toArray() as $value) {
                         if ($value === '') {
                             $value = '-';
                         }
-                        $row .= '<td>' . (string)$value  . '</td>';
+                        $row .= '<td>' . (string) $value . '</td>';
                     }
                 }
 
@@ -61,17 +60,15 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
                 $table[] = $row;
             }
         }
-
         if ($limit > 0) {
-            $count = max (count($table), count ($results));
-            $table = array_slice ($table, 0, $limit);
-            $results = array_slice ($results, 0, $limit);
+            $count = max(count($table), count($results));
+            $table = array_slice($table, 0, $limit);
+            $results = array_slice($results, 0, $limit);
             if ($count > $limit) {
                 $mess = sprintf($this->view->translate('%d more ...'), $count - $limit);
                 $results[] = '<span title="' . $mess . '">...</span>';
             }
         }
-
         if ($compact) {
             return join('', $results);
         } else {

From b0b0ae157c344ec9f1bdfbc5efe9e14896608500 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 31 Mar 2015 16:29:33 +0200
Subject: [PATCH 1090/2920] Turn prepareStateName into more generic string
 utility function

refs #8565
---
 library/Icinga/Util/String.php                | 41 +++++++++++++++++++
 .../library/Monitoring/Object/HostList.php    | 32 +++++++++++----
 .../library/Monitoring/Object/ObjectList.php  | 11 -----
 .../library/Monitoring/Object/ServiceList.php | 41 ++++++++++++-------
 4 files changed, 93 insertions(+), 32 deletions(-)

diff --git a/library/Icinga/Util/String.php b/library/Icinga/Util/String.php
index 9fb3cb223..d9bd5a6d3 100644
--- a/library/Icinga/Util/String.php
+++ b/library/Icinga/Util/String.php
@@ -79,4 +79,45 @@ class String
 
         return $matches;
     }
+
+    /**
+     * Generates an array of strings that constitutes the cartesian product of all passed sets, with all
+     * string combinations concatenated using the passed join-operator.
+     *
+     * <pre>
+     *  cartesianProduct(
+     *      array(array('foo', 'bar'), array('mumble', 'grumble', null)),
+     *      '_'
+     *  );
+     *     => array('foo_mumble', 'foo_grumble', 'bar_mumble', 'bar_grumble', 'foo', 'bar')
+     * </pre>
+     *
+     * @param   array   $sets   An array of arrays containing all sets for which the cartesian
+     *                          product should be calculated.
+     * @param   string  $glue   The glue used to join the strings, defaults to ''.
+     *
+     * @returns array           The cartesian product in one array of strings.
+     */
+    public static function cartesianProduct(array $sets, $glue = '')
+    {
+        $product = null;
+        foreach ($sets as $set) {
+            if (! isset($product)) {
+                $product = $set;
+            } else {
+                $newProduct = array();
+                foreach ($product as $strA) {
+                    foreach ($set as $strB) {
+                        if ($strB === null) {
+                            $newProduct []= $strA;
+                        } else {
+                            $newProduct []= $strA . $glue . $strB;
+                        }
+                    }
+                }
+                $product = $newProduct;
+            }
+        }
+        return $product;
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/Object/HostList.php b/modules/monitoring/library/Monitoring/Object/HostList.php
index 94157b6fc..b5235eb75 100644
--- a/modules/monitoring/library/Monitoring/Object/HostList.php
+++ b/modules/monitoring/library/Monitoring/Object/HostList.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Module\Monitoring\Object;
 
+use Icinga\Util\String;
+
 /**
  * A host list
  */
@@ -33,13 +35,7 @@ class HostList extends ObjectList
      */
     public function getStateSummary()
     {
-        $hostStates = $this->prepareStateNames('hosts_', array(
-            Host::getStateText(Host::STATE_UP),
-            Host::getStateText(Host::STATE_DOWN),
-            Host::getStateText(Host::STATE_UNREACHABLE),
-            Host::getStateText(Host::STATE_PENDING)
-        ));
-
+        $hostStates = array_fill_keys(self::getHostStatesSummaryEmpty(), 0);
         foreach ($this as $host) {
             $unhandled = (bool) $host->problem === true && (bool) $host->handled === false;
 
@@ -52,4 +48,26 @@ class HostList extends ObjectList
 
         return (object)$hostStates;
     }
+
+    /**
+     * Return an empty array with all possible host state names
+     *
+     * @return array    An array containing all possible host states as keys and 0 as values.
+     */
+    public static function getHostStatesSummaryEmpty()
+    {
+        return String::cartesianProduct(
+            array(
+                array('hosts'),
+                array(
+                    Host::getStateText(Host::STATE_UP),
+                    Host::getStateText(Host::STATE_DOWN),
+                    Host::getStateText(Host::STATE_UNREACHABLE),
+                    Host::getStateText(Host::STATE_PENDING)
+                ),
+                array(null, 'handled', 'unhandled')
+            ),
+            '_'
+        );
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/Object/ObjectList.php b/modules/monitoring/library/Monitoring/Object/ObjectList.php
index f28dded91..62a15173c 100644
--- a/modules/monitoring/library/Monitoring/Object/ObjectList.php
+++ b/modules/monitoring/library/Monitoring/Object/ObjectList.php
@@ -118,15 +118,4 @@ abstract class ObjectList implements Countable, IteratorAggregate
         }
         return $unhandledObjects;
     }
-
-    protected  function prepareStateNames($prefix, array $names) {
-        $new = array();
-        foreach ($names as $name) {
-            $new[$prefix . $name] = 0;
-            $new[$prefix . $name . '_handled'] = 0;
-            $new[$prefix . $name . '_unhandled'] = 0;
-        }
-        $new[$prefix . 'total'] = 0;
-        return $new;
-    }
 }
diff --git a/modules/monitoring/library/Monitoring/Object/ServiceList.php b/modules/monitoring/library/Monitoring/Object/ServiceList.php
index 0625ae0f8..861075004 100644
--- a/modules/monitoring/library/Monitoring/Object/ServiceList.php
+++ b/modules/monitoring/library/Monitoring/Object/ServiceList.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Module\Monitoring\Object;
 
+use Icinga\Util\String;
+
 /**
  * A service list
  */
@@ -33,20 +35,8 @@ class ServiceList extends ObjectList
      */
     public function getStateSummary()
     {
-        $serviceStates = $this->prepareStateNames('services_', array(
-            Service::getStateText(Service::STATE_OK),
-            Service::getStateText(Service::STATE_WARNING),
-            Service::getStateText(Service::STATE_CRITICAL),
-            Service::getStateText(Service::STATE_UNKNOWN),
-            Service::getStateText(Service::STATE_PENDING),
-        ));
-
-        $hostStates = $this->prepareStateNames('hosts_', array(
-            Host::getStateText(Host::STATE_UP),
-            Host::getStateText(Host::STATE_DOWN),
-            Host::getStateText(Host::STATE_UNREACHABLE),
-            Host::getStateText(Host::STATE_PENDING),
-        ));
+        $serviceStates = array_fill_keys(self::getServiceStatesSummaryEmpty(), 0);
+        $hostStates = array_fill_keys(HostList::getHostStatesSummaryEmpty(), 0);
 
         foreach ($this as $service) {
             $unhandled = false;
@@ -67,4 +57,27 @@ class ServiceList extends ObjectList
 
         return (object)$serviceStates;
     }
+
+    /**
+     * Return an empty array with all possible host state names
+     *
+     * @return array    An array containing all possible host states as keys and 0 as values.
+     */
+    public static function getServiceStatesSummaryEmpty()
+    {
+        return String::cartesianProduct(
+            array(
+                array('services'),
+                array(
+                    Service::getStateText(Service::STATE_OK),
+                    Service::getStateText(Service::STATE_WARNING),
+                    Service::getStateText(Service::STATE_CRITICAL),
+                    Service::getStateText(Service::STATE_UNKNOWN),
+                    Service::getStateText(Service::STATE_PENDING)
+                ),
+                array(null, 'handled', 'unhandled')
+            ),
+            '_'
+        );
+    }
 }

From 9fbd7822d05c794331b1c6ce8a3788e8c94fa4e9 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 31 Mar 2015 17:41:57 +0200
Subject: [PATCH 1091/2920] Fix coding guideline violations

---
 library/Icinga/Web/Widget/FilterEditor.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 8bcb9aa60..cfe43351d 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -405,10 +405,10 @@ class FilterEditor extends AbstractWidget
         if ($this->addTo && $this->addTo === $filter->getId()) {
             return
                    preg_replace(
-            '/ class="autosubmit"/',
-            ' class="autofocus"',
-        $this->selectOperator()
-                )
+                       '/ class="autosubmit"/',
+                       ' class="autofocus"',
+                       $this->selectOperator()
+                   )
                   . '<ul><li>'
                   . $this->selectColumn($filter)
                   . $this->selectSign($filter)
@@ -655,7 +655,7 @@ class FilterEditor extends AbstractWidget
               . t('Search...')
               . '" /></form>';
 
-        if  ($this->filter->isEmpty()) {
+        if ($this->filter->isEmpty()) {
             $title = t('Filter this list');
         } else {
             $title = t('Modify this filter');

From 06d9e4113cb5c8a1f49a267ba25618580dd20f72 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 1 Apr 2015 13:53:44 +0200
Subject: [PATCH 1092/2920] Fix that sending multiple commands over SSH failed

The config object has to cloned before unsetting the transport because else the
transport is removed for all subsequent calls to CommandTransport::fromConfig().

fixes #8815
---
 .../library/Monitoring/Command/Transport/CommandTransport.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
index ecb7fb09f..a9839565b 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
@@ -51,6 +51,7 @@ abstract class CommandTransport
      */
     public static function fromConfig(ConfigObject $config)
     {
+        $config = clone $config;
         switch (strtolower($config->transport)) {
             case RemoteCommandFile::TRANSPORT:
                 $transport = new RemoteCommandFile();

From 9ce9e0270c14974712b329eec88c3fd4bee29178 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 2 Apr 2015 10:41:25 +0200
Subject: [PATCH 1093/2920] Fix that LDAP encryption settings have no effect

I renamed the directive for the encryption setting from 'connection' to 'encryption' before releasing Beta3 but
I forgot to change the Connection class accordingly.

fixes #8953
---
 library/Icinga/Protocol/Ldap/Connection.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index e8c06cb5b..687f30e62 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -45,6 +45,13 @@ class Connection
      */
     const LDAPS = 'ldaps';
 
+    /**
+     * Encryption for the connection if any
+     *
+     * @var string|null
+     */
+    protected $encryption;
+
     protected $ds;
     protected $hostname;
     protected $port = 389;
@@ -52,7 +59,6 @@ class Connection
     protected $bind_pw;
     protected $root_dn;
     protected $count;
-    protected $connectionType;
     protected $reqCert = true;
 
     /**
@@ -86,7 +92,10 @@ class Connection
         $this->bind_pw  = $config->bind_pw;
         $this->root_dn  = $config->root_dn;
         $this->port = $config->get('port', $this->port);
-        $this->connectionType = $config->get('connection');
+        $this->encryption = $config->get('encryption');
+        if ($this->encryption !== null) {
+            $this->encryption = strtolower($this->encryption);
+        }
         $this->reqCert = (bool) $config->get('reqcert', $this->reqCert);
     }
 
@@ -481,12 +490,12 @@ class Connection
      */
     protected function prepareNewConnection()
     {
-        if ($this->connectionType === static::STARTTLS || $this->connectionType === static::LDAPS) {
+        if ($this->encryption === static::STARTTLS || $this->encryption === static::LDAPS) {
             $this->prepareTlsEnvironment();
         }
 
         $hostname = $this->hostname;
-        if ($this->connectionType === static::LDAPS) {
+        if ($this->encryption === static::LDAPS) {
             $hostname = 'ldaps://' . $hostname;
         }
 
@@ -499,8 +508,7 @@ class Connection
             Logger::warning('LADP discovery failed, assuming default LDAP settings.');
             $this->capabilities = new Capability(); // create empty default capabilities
         }
-
-        if ($this->connectionType === static::STARTTLS) {
+        if ($this->encryption === static::STARTTLS) {
             $force_tls = false;
             if ($this->capabilities->hasStartTls()) {
                 if (@ldap_start_tls($ds)) {

From 5619ac960c47611c34075ee03b5506ebd00a016d Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 2 Apr 2015 16:25:20 +0200
Subject: [PATCH 1094/2920] Add inline pies to host and service back to
 multi-select views

Add old inline pie code and visualize handled/unhandled state.

refs #8565
---
 library/Icinga/Util/String.php                | 14 +++++
 library/Icinga/Web/Widget/Chart/InlinePie.php | 56 +++++++++++++++++++
 .../controllers/HostsController.php           | 10 +++-
 .../controllers/ServicesController.php        | 21 ++++++-
 .../views/scripts/hosts/show.phtml            |  7 +++
 .../partials/host/objects-header.phtml        |  8 ---
 .../partials/service/objects-header.phtml     |  9 ---
 .../views/scripts/services/show.phtml         | 10 ++++
 .../library/Monitoring/Object/ServiceList.php | 41 ++++++++++++--
 9 files changed, 153 insertions(+), 23 deletions(-)

diff --git a/library/Icinga/Util/String.php b/library/Icinga/Util/String.php
index d9bd5a6d3..0d42d0e76 100644
--- a/library/Icinga/Util/String.php
+++ b/library/Icinga/Util/String.php
@@ -80,6 +80,20 @@ class String
         return $matches;
     }
 
+    /**
+     * Check if a string ends with a different string
+     *
+     * @param $haystack The string to search for matches
+     * @param $needle   The string to match at the start of the haystack
+     *
+     * @return bool     Whether or not needle is at the beginning of haystack
+     */
+    public static function endsWith($haystack, $needle)
+    {
+        return $needle === '' ||
+             (($temp = strlen($haystack) - strlen($needle)) >= 0 && false !== strpos($haystack, $needle, $temp));
+    }
+
     /**
      * Generates an array of strings that constitutes the cartesian product of all passed sets, with all
      * string combinations concatenated using the passed join-operator.
diff --git a/library/Icinga/Web/Widget/Chart/InlinePie.php b/library/Icinga/Web/Widget/Chart/InlinePie.php
index 0bddc906d..70aadf666 100644
--- a/library/Icinga/Web/Widget/Chart/InlinePie.php
+++ b/library/Icinga/Web/Widget/Chart/InlinePie.php
@@ -5,11 +5,13 @@ namespace Icinga\Web\Widget\Chart;
 
 use Icinga\Chart\PieChart;
 use Icinga\Module\Monitoring\Plugin\PerfdataSet;
+use Icinga\Util\String;
 use Icinga\Web\Widget\AbstractWidget;
 use Icinga\Web\Url;
 use Icinga\Util\Format;
 use Icinga\Application\Logger;
 use Icinga\Exception\IcingaException;
+use stdClass;
 
 /**
  * A SVG-PieChart intended to be displayed as a small icon next to labels, to offer a better visualization of the
@@ -27,6 +29,45 @@ class InlinePie extends AbstractWidget
     const NUMBER_FORMAT_BYTES = 'bytes';
     const NUMBER_FORMAT_RATIO = 'ratio';
 
+    public static $colorsHostStates = array(
+        '#44bb77', // up
+        '#ff99aa', // down
+        '#cc77ff', // unreachable
+        '#77aaff'  // pending
+    );
+
+    public static $colorsHostStatesHandledUnhandled = array(
+        '#44bb77', // up
+        '#44bb77',
+        '#ff99aa', // down
+        '#ff5566',
+        '#cc77ff', // unreachable
+        '#aa44ff',
+        '#77aaff', // pending
+        '#77aaff'
+    );
+
+    public static $colorsServiceStates = array(
+        '#44bb77', // Ok
+        '#ffaa44', // Warning
+        '#ff99aa', // Critical
+        '#aa44ff', // Unknown
+        '#77aaff'  // Pending
+    );
+
+    public static $colorsServiceStatesHandleUnhandled = array(
+        '#44bb77', // Ok
+        '#44bb77',
+        '#ffaa44', // Warning
+        '#ffcc66',
+        '#ff99aa', // Critical
+        '#ff5566',
+        '#cc77ff', // Unknown
+        '#aa44ff',
+        '#77aaff', // Pending
+        '#77aaff'
+    );
+
     /**
      * The template string used for rendering this widget
      *
@@ -231,4 +272,19 @@ EOD;
         $template = str_replace('{data}', htmlspecialchars(implode(',', $data)), $template);
         return $template;
     }
+
+    public static function createFromStateSummary(stdClass $states, $title, array $colors)
+    {
+        $handledUnhandledStates = array();
+        foreach ($states as $key => $value) {
+            if (String::endsWith($key, '_handled') || String::endsWith($key, '_unhandled')) {
+                $handledUnhandledStates[$key] = $value;
+            }
+        }
+        $chart = new self(array_values($handledUnhandledStates), $title, $colors);
+        return $chart
+            ->setSize(50)
+            ->setTitle('')
+            ->setSparklineClass('sparkline-multi');
+    }
 }
diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index b8e36e2b0..3c59f4643 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -14,6 +14,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\HostList;
 use Icinga\Web\Url;
+use Icinga\Web\Widget\Chart\InlinePie;
 
 class Monitoring_HostsController extends Controller
 {
@@ -127,13 +128,20 @@ class Monitoring_HostsController extends Controller
             $this->view->removeAckForm = $removeAckForm;
         }
 
+        $hostStates = (object)$this->hostList->getStateSummary();
+        $this->view->hostStatesPieChart = InlinePie::createFromStateSummary(
+            $hostStates,
+            $this->translate('Host State'),
+            InlinePie::$colorsHostStatesHandledUnhandled
+        );
+
         $this->setAutorefreshInterval(15);
         $this->view->rescheduleAllLink = Url::fromRequest()->setPath('monitoring/hosts/reschedule-check');
         $this->view->downtimeAllLink = Url::fromRequest()->setPath('monitoring/hosts/schedule-downtime');
         $this->view->processCheckResultAllLink = Url::fromRequest()->setPath('monitoring/hosts/process-check-result');
         $this->view->addCommentLink = Url::fromRequest()->setPath('monitoring/hosts/add-comment');
         $this->view->deleteCommentLink = Url::fromRequest()->setPath('monitoring/hosts/delete-comment');
-        $this->view->stats = (object)$this->hostList->getStateSummary();
+        $this->view->stats = $hostStates;
         $this->view->objects = $this->hostList;
         $this->view->unhandledObjects = $unhandledObjects;
         $unhandledFilterQueryString = Filter::matchAny($unhandledFilterExpressions)->toQueryString();
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 691897a57..e7199ed26 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -15,7 +15,9 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Module\Monitoring\Object\ServiceList;
+use Icinga\Util\String;
 use Icinga\Web\Url;
+use Icinga\Web\Widget\Chart\InlinePie;
 
 class Monitoring_ServicesController extends Controller
 {
@@ -109,6 +111,8 @@ class Monitoring_ServicesController extends Controller
             'host_name',
             'host_output',
             'host_state',
+            'host_problem',
+            'host_handled',
             'service_output',
             'service_description',
             'service_state',
@@ -153,6 +157,20 @@ class Monitoring_ServicesController extends Controller
                 ->handleRequest();
             $this->view->removeAckForm = $removeAckForm;
         }
+
+        $serviceStates = $this->serviceList->getServiceStateSummary();
+        $this->view->serviceStatesPieChart = InlinePie::createFromStateSummary(
+            $serviceStates,
+            $this->translate('Service State'),
+            InlinePie::$colorsServiceStatesHandleUnhandled
+        );
+
+        $hostStates = $this->serviceList->getHostStateSummary();
+        $this->view->hostStatesPieChart = InlinePie::createFromStateSummary(
+            $hostStates,
+            $this->translate('Host State'),
+            InlinePie::$colorsHostStatesHandledUnhandled
+        );
         /*
         if (! empty($objectsInDowntime)) {
             $removeDowntimeForm = new DeleteDowntimeCommandForm();
@@ -170,7 +188,8 @@ class Monitoring_ServicesController extends Controller
         );
         $this->view->addCommentLink = Url::fromRequest()->setPath('monitoring/services/add-comment');
         $this->view->deleteCommentLink = Url::fromRequest()->setPath('monitoring/services/delete-comment');
-        $this->view->stats = $this->serviceList->getStateSummary();
+        $this->view->stats = $serviceStates;
+        $this->view->hostStats = $hostStates;
         $this->view->objects = $this->serviceList;
         $this->view->unhandledObjects = $unhandledObjects;
         $unhandledFilterQueryString = Filter::matchAny($unhandledFilterExpressions)->toQueryString();
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index d56f92af4..ab92a2f04 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -9,6 +9,13 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
     <?php endif ?>
 
     <?= $this->render('list/components/hostssummary.phtml') ?>
+
+    <br>
+    <div class="hbox-item">
+        <?= $this->translate('Host States:') ?>
+        &nbsp;<?= $hostStatesPieChart; ?>
+    </div>
+
     <?= $this->render('partials/host/objects-header.phtml'); ?>
 
 </div>
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index 322243be1..d2ce6a500 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -12,14 +12,6 @@ $hiddenRich = array();
 
     <p>
     <table class="state statesummary">
-        <thead>
-        <tr>
-            <th></th>
-            <th></th>
-            <th class="oneline"><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
-            <th class="oneline"><?= $this->icon('paste'); ?> <?= $this->translate('Plugin Output'); ?></th>
-        </tr>
-        </thead>
 
         <tbody>
         <?php foreach ($objects as $host): /** @var Host $host */ ?>
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index 5580446a1..24524954c 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -10,15 +10,6 @@ use Icinga\Module\Monitoring\Object\Service;
 <?php if (($serviceCount = count($objects)) > 0): ?>
     <p>
     <table class="state statesummary">
-    <thead>
-    <tr>
-        <th></th>
-        <th></th>
-        <th class="oneline"><?= $this->icon('service'); ?> <?= $this->translate('Service'); ?></th>
-        <th class="oneline"><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
-        <th class="oneline"><?= $this->icon('paste'); ?> <?= $this->translate('Plugin Output'); ?></th>
-    </tr>
-    </thead>
     <tbody>
     <?php foreach ($objects as $service): /** @var Service $service */ ?>
         <?php
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 1daa1a956..2abc968a9 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -9,6 +9,16 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
     <?php endif ?>
 
     <?= $this->render('list/components/servicesummary.phtml') ?>
+    <br>
+    <div class="hbox-item">
+        <?= $this->translate('Service States:') ?>
+        &nbsp;<?= $serviceStatesPieChart; ?>
+    </div>
+    <div class="hbox-item">
+        <?= $this->translate('Host States:') ?>
+        &nbsp;<?= $hostStatesPieChart; ?>
+    </div>
+
     <?= $this->render('partials/service/objects-header.phtml'); ?>
 
 </div>
diff --git a/modules/monitoring/library/Monitoring/Object/ServiceList.php b/modules/monitoring/library/Monitoring/Object/ServiceList.php
index 861075004..4d0e053d7 100644
--- a/modules/monitoring/library/Monitoring/Object/ServiceList.php
+++ b/modules/monitoring/library/Monitoring/Object/ServiceList.php
@@ -10,6 +10,10 @@ use Icinga\Util\String;
  */
 class ServiceList extends ObjectList
 {
+    protected $hostStateSummary;
+
+    protected $serviceStateSummary;
+
     protected $dataViewName = 'serviceStatus';
 
     protected $columns = array('host_name', 'service_description');
@@ -33,7 +37,32 @@ class ServiceList extends ObjectList
      *
      * @return object   The summary
      */
-    public function getStateSummary()
+    public function getServiceStateSummary()
+    {
+        if (! $this->serviceStateSummary) {
+            $this->initStateSummaries();
+        }
+        return (object)$this->serviceStateSummary;
+    }
+
+    /**
+     * Create a state summary of all hosts that can be consumed by hostsummary.phtml
+     *
+     * @return object   The summary
+     */
+    public function getHostStateSummary()
+    {
+        if (! $this->hostStateSummary) {
+            $this->initStateSummaries();
+        }
+        return (object)$this->hostStateSummary;
+    }
+
+    /**
+     * Calculate the current state summary and populate hostStateSummary and serviceStateSummary
+     * properties
+     */
+    protected function initStateSummaries()
     {
         $serviceStates = array_fill_keys(self::getServiceStatesSummaryEmpty(), 0);
         $hostStates = array_fill_keys(HostList::getHostStatesSummaryEmpty(), 0);
@@ -47,15 +76,19 @@ class ServiceList extends ObjectList
             $stateName = 'services_' . $service::getStateText($service->state);
             ++$serviceStates[$stateName];
             ++$serviceStates[$stateName . ($unhandled ? '_unhandled' : '_handled')];
+
             if (! isset($knownHostStates[$service->getHost()->getName()])) {
-                $knownHostStates[$service->getHost()->getName()] = true;
+                $unhandledHost = (bool) $service->host_problem === true && (bool) $service->host_handled === false;
                 ++$hostStates['hosts_' . $service->getHost()->getStateText($service->host_state)];
+                ++$hostStates['hosts_' . $service->getHost()->getStateText($service->host_state)
+                        . ($unhandledHost ? '_unhandled' : '_handled')];
+                $knownHostStates[$service->getHost()->getName()] = true;
             }
         }
 
         $serviceStates['services_total'] = count($this);
-
-        return (object)$serviceStates;
+        $this->hostStateSummary = $hostStates;
+        $this->serviceStateSummary = $serviceStates;
     }
 
     /**

From 45a0982bebb411ed8a202696965c1438b5948c2c Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 2 Apr 2015 16:44:05 +0200
Subject: [PATCH 1095/2920] Add new tab to switch between host and service
 multi-selection

refs #8565
---
 .../controllers/HostsController.php           | 20 ++++++++++++++++++-
 .../controllers/ServicesController.php        | 13 ++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 3c59f4643..632ca69ec 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -25,9 +25,14 @@ class Monitoring_HostsController extends Controller
 
     public function init()
     {
+        // Support switching from service-view using the host and service selection. The filter would error
+        // on any occurrence of a filter based on service.
+        $filterString = preg_replace('/(service=[^)&]*)/', '', (string)$this->params);
+
         $hostList = new HostList($this->backend);
-        $hostList->setFilter(Filter::fromQueryString((string) $this->params));
+        $hostList->setFilter(Filter::fromQueryString($filterString));
         $this->hostList = $hostList;
+
         $this->getTabs()->add(
             'show',
             array(
@@ -40,6 +45,19 @@ class Monitoring_HostsController extends Controller
                 'icon'  => 'host'
             )
         )->activate('show');
+
+        $this->getTabs()->add(
+            'services',
+            array(
+                'title' => sprintf(
+                    $this->translate('Show summarized information for related services')
+                ),
+                'label' => $this->translate('Services'),
+                'url'   => Url::fromPath('monitoring/services/show')->setParams(Url::fromRequest()->getParams()),
+                'icon'  => 'services'
+            )
+        )->activate('show');
+
         $this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/hosts');
     }
 
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index e7199ed26..91da11968 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -32,6 +32,19 @@ class Monitoring_ServicesController extends Controller
         $serviceList->setFilter(Filter::fromQueryString((string) $this->params->without('service_problem', 'service_handled')));
         $this->serviceList = $serviceList;
         $this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/services');
+
+        $this->getTabs()->add(
+            'hosts',
+            array(
+                'title' => sprintf(
+                    $this->translate('Show summarized information for hosts')
+                ),
+                'label' => $this->translate('Hosts'),
+                'url'   => Url::fromPath('monitoring/hosts/show')->setParams(Url::fromRequest()->getParams()),
+                'icon' => 'host'
+            )
+        )->activate('show');
+
         $this->getTabs()->add(
             'show',
             array(

From 6c0f9cf6f55ac382c98c0a0d6ec3b68fb1d8b82e Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 2 Apr 2015 16:51:09 +0200
Subject: [PATCH 1096/2920] Remove comment lists from multi-select views.

refs #8565
---
 .../controllers/HostsController.php           |  3 +-
 .../views/scripts/hosts/show.phtml            | 33 -------------------
 .../views/scripts/services/show.phtml         | 33 -------------------
 3 files changed, 1 insertion(+), 68 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 632ca69ec..53b10e113 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -171,8 +171,7 @@ class Monitoring_HostsController extends Controller
         $this->view->objectsInDowntime = $objectsInDowntime;
         $this->view->inDowntimeLink = Url::fromPath('monitoring/list/downtimes')
             ->setQueryString(Filter::matchAny($downtimeFilterExpressions)->toQueryString());
-        $this->view->commentsLink = Url::fromRequest()
-            ->setPath('monitoring/list/comments');
+        $this->view->commentsLink = Url::fromRequest()->setPath('monitoring/list/comments');
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index ab92a2f04..cc62ba0f8 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -1,7 +1,3 @@
-<?php
-use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
-?>
-
 <div class="controls">
 
     <?php if (! $this->compact): ?>
@@ -183,35 +179,6 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 
         </p>
 
-        <table>
-        <?php foreach ($objects as $service): ?>
-            <?php $service->fetchComments(); ?>
-            <?php foreach ($service->comments as $comment): ?>
-                <tr>
-                    <td style="vertical-align: top;" data-base-target="_self">
-                        <?php
-                        $delCommentForm = new DeleteCommentCommandForm();
-                        $delCommentForm->populate(
-                            array('comment_id' => $comment->id, 'redirect' => html_entity_decode($this->url))
-                        );
-                        $delCommentForm->setAction(
-                            $this->url(
-                                'monitoring/host/delete-comment',
-                                array('host' => $service->getName())
-                            )
-                        );
-                        echo $delCommentForm;
-                        ?>
-                        (<?= ucfirst($comment->type) ?>):
-                    </td>
-                    <td style="padding-left: .5em;">
-                        <?= nl2br($comment->comment) ?>
-                    </td>
-                </tr>
-            <?php endforeach ?>
-        <?php endforeach ?>
-        </table>
-
         <!--
         <p>
         <div><?= $this->qlink(
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 2abc968a9..ce6b1131c 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -1,7 +1,3 @@
-<?php
-use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
-?>
-
 <div class="controls">
 
     <?php if (! $this->compact): ?>
@@ -175,35 +171,6 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
     ); ?>
     <p>
 
-    <table>
-    <?php foreach ($objects as $service): ?>
-        <?php $service->fetchComments(); ?>
-        <?php foreach ($service->comments as $comment): ?>
-        <tr>
-        <td style="vertical-align: top;" data-base-target="_self">
-            <?php
-            $delCommentForm = new DeleteCommentCommandForm();
-            $delCommentForm->populate(
-                array('comment_id' => $comment->id, 'redirect' => html_entity_decode($this->url))
-            );
-            $delCommentForm->setAction(
-                $this->url(
-                    'monitoring/service/delete-comment',
-                    array('host' => $service->getHost()->getName(), 'service' => $service->getName())
-                )
-            );
-            echo $delCommentForm;
-            ?>
-            (<?= ucfirst($comment->type) ?>):
-        </td>
-        <td style="padding-left: .5em;">
-            <?= nl2br($comment->comment) ?>
-        </td>
-        </tr>
-        <?php endforeach ?>
-    <?php endforeach ?>
-    </table>
-
     <!--
     </p>
     <div><?= $this->qlink(

From b0b95ab38790dac0a339a9218d5c77fd9a7ac670 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 7 Apr 2015 10:31:57 +0200
Subject: [PATCH 1097/2920] Fix that Icinga\Application\Logger::writesTo* is
 not functional

---
 library/Icinga/Application/Logger.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Application/Logger.php b/library/Icinga/Application/Logger.php
index 514cab7fc..7de334c01 100644
--- a/library/Icinga/Application/Logger.php
+++ b/library/Icinga/Application/Logger.php
@@ -271,7 +271,7 @@ class Logger
      */
     public static function writesToSyslog()
     {
-        return static::$instance && static::$instance instanceof SyslogWriter;
+        return static::$instance && static::$instance->getWriter() instanceof SyslogWriter;
     }
 
     /**
@@ -281,7 +281,7 @@ class Logger
      */
     public static function writesToFile()
     {
-        return static::$instance && static::$instance instanceof FileWriter;
+        return static::$instance && static::$instance->getWriter() instanceof FileWriter;
     }
 
     /**

From aae1d05684400628556e2a7415c8c4625bed220a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 7 Apr 2015 10:34:55 +0200
Subject: [PATCH 1098/2920] Fetch the log path from the configuration

...instead of using a getter that has been dropped carelessly.

fixes #8972
---
 application/controllers/ListController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index d55381987..feaf13921 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -3,6 +3,7 @@
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Web\Url;
+use Icinga\Application\Config;
 use Icinga\Application\Logger;
 use Icinga\Data\ConfigObject;
 use Icinga\Protocol\File\FileReader;
@@ -44,11 +45,10 @@ class ListController extends Controller
         $pattern = '/^(?<datetime>[0-9]{4}(-[0-9]{2}){2}'                 // date
                  . 'T[0-9]{2}(:[0-9]{2}){2}([\\+\\-][0-9]{2}:[0-9]{2})?)' // time
                  . ' - (?<loglevel>[A-Za-z]+)'                            // loglevel
-                 . ' - (?<message>.*)$/';                                 // message
+                 . ' - (?<message>.*)$/';
 
-        $loggerWriter = Logger::getInstance()->getWriter();
         $resource = new FileReader(new ConfigObject(array(
-            'filename'  => $loggerWriter->getPath(),
+            'filename'  => Config::app()->get('logging', 'file'),
             'fields'    => $pattern
         )));
         $this->view->logData = $resource->select()->order('DESC')->paginate();

From 4d795494fc1c5ab7da89c7f0c83e9ab454b827a9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 7 Apr 2015 10:48:37 +0200
Subject: [PATCH 1099/2920] Fix MissingParameterException's PHPDoc

refs #8886
---
 library/Icinga/Exception/MissingParameterException.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/library/Icinga/Exception/MissingParameterException.php b/library/Icinga/Exception/MissingParameterException.php
index 2673cc2d6..6ccd28dc3 100644
--- a/library/Icinga/Exception/MissingParameterException.php
+++ b/library/Icinga/Exception/MissingParameterException.php
@@ -4,8 +4,7 @@
 namespace Icinga\Exception;
 
 /**
- * Class MissingParameterException
- * @package Icinga\Exception
+ * Exception thrown if a mandatory parameter was not given
  */
 class MissingParameterException extends IcingaException
 {

From 57ed849cee49a4e7c2133a6445dc21ddcdb6cfa2 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Tue, 7 Apr 2015 11:25:32 +0200
Subject: [PATCH 1100/2920] Icinga\Web\Widget\SortBox::applyRequest(): return
 $this

---
 library/Icinga/Web/Widget/SortBox.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 18ed95b86..26e5257e7 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -72,10 +72,13 @@ class SortBox extends AbstractWidget
      * Apply the parameters from the given request on this SortBox
      *
      * @param Request $request The request to use for populating the form
+     *
+     * @return static $this
      */
     public function applyRequest($request)
     {
         $this->request = $request;
+        return $this;
     }
 
     /**

From e32eeb991eda1d457b3ccb95d2d0bf77d513d921 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Tue, 7 Apr 2015 11:32:09 +0200
Subject: [PATCH 1101/2920] Implement Icinga\Web\Widget\SortBox::create()

---
 library/Icinga/Web/Widget/SortBox.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 26e5257e7..a53e5aee3 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -68,6 +68,20 @@ class SortBox extends AbstractWidget
         $this->sortFields = $sortFields;
     }
 
+    /**
+     * Create a SortBox with the entries from $sortFields
+     *
+     * @param string    $name           The name of the sort form
+     * @param array     $sortFields     An array containing the columns and their labels to be displayed
+     *                                  in the sort select box
+     *
+     * @return static
+     */
+    public static function create($name, array $sortFields)
+    {
+        return new static($name, $sortFields);
+    }
+
     /**
      * Apply the parameters from the given request on this SortBox
      *

From 0fc5801e5e8aa2998ad5af1189ff53b8645c827f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 7 Apr 2015 12:15:15 +0200
Subject: [PATCH 1102/2920] lib: Add MissingParameterException::getParameter
 and ::setParameter ...

... for getting/setting the name of the missing parameter which caused the exception.

refs #8886
---
 .../Exception/MissingParameterException.php   | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/library/Icinga/Exception/MissingParameterException.php b/library/Icinga/Exception/MissingParameterException.php
index 6ccd28dc3..4377ef103 100644
--- a/library/Icinga/Exception/MissingParameterException.php
+++ b/library/Icinga/Exception/MissingParameterException.php
@@ -8,4 +8,33 @@ namespace Icinga\Exception;
  */
 class MissingParameterException extends IcingaException
 {
+    /**
+     * Name of the missing parameter
+     *
+     * @var string
+     */
+    protected $parameter;
+
+    /**
+     * Get the name of the missing parameter
+     *
+     * @return string
+     */
+    public function getParameter()
+    {
+        return $this->parameter;
+    }
+
+    /**
+     * Set the name of the missing parameter
+     *
+     * @param   string  $name
+     *
+     * @return  $this
+     */
+    public function setParameter($name)
+    {
+        $this->parameter = (string) $name;
+        return $this;
+    }
 }

From 93b1a35de0e08692c4107d0f1d5726661b55e3b0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 7 Apr 2015 12:17:59 +0200
Subject: [PATCH 1103/2920] lib: Add UrlParams::req()

UrlParams::req() should be used for requiring a mandatory URL parameter.

refs #8886
---
 library/Icinga/Web/UrlParams.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/library/Icinga/Web/UrlParams.php b/library/Icinga/Web/UrlParams.php
index 5c2a79d05..a38c1a229 100644
--- a/library/Icinga/Web/UrlParams.php
+++ b/library/Icinga/Web/UrlParams.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Web;
 
+use Icinga\Exception\MissingParameterException;
+
 class UrlParams
 {
     protected $separator = '&';
@@ -42,6 +44,29 @@ class UrlParams
         return rawurldecode($this->params[ end($this->index[$param]) ][ 1 ]);
     }
 
+    /**
+     * Require a parameter
+     *
+     * @param   string  $name               Name of the parameter
+     * @param   bool    $strict             Whether the parameter's value must not be the empty string
+     *
+     * @return  mixed
+     *
+     * @throws  MissingParameterException   If the parameter was not given
+     */
+    public function req($name, $strict = true)
+    {
+        if ($this->has($name)) {
+            $value = $this->get($name);
+            if (! $strict || strlen($value) > 0) {
+                return $value;
+            }
+        }
+        $e = new MissingParameterException(t('Required parameter \'%s\' missing'), $name);
+        $e->setParameter($name);
+        throw $e;
+    }
+
     /**
      * Get all instances of the given parameter
      *

From 002e793a536efea9da7a3bad99250ce1e9d5656c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 7 Apr 2015 12:20:37 +0200
Subject: [PATCH 1104/2920] lib: Add Params::req()

Params::req() should be used for requiring a mandatory CLI parameter.

refs #8886
---
 library/Icinga/Cli/Params.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/library/Icinga/Cli/Params.php b/library/Icinga/Cli/Params.php
index 27a1df9a1..34dd5e177 100644
--- a/library/Icinga/Cli/Params.php
+++ b/library/Icinga/Cli/Params.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Cli;
 
+use Icinga\Exception\MissingParameterException;
+
 /**
  * Params
  *
@@ -155,6 +157,29 @@ class Params
         return $default;
     }
 
+    /**
+     * Require a parameter
+     *
+     * @param   string  $name               Name of the parameter
+     * @param   bool    $strict             Whether the parameter's value must not be the empty string
+     *
+     * @return  mixed
+     *
+     * @throws  MissingParameterException   If the parameter was not given
+     */
+    public function req($name, $strict = true)
+    {
+        if ($this->has($name)) {
+            $value = $this->get($name);
+            if (! $strict || strlen($value) > 0) {
+                return $value;
+            }
+        }
+        $e = new MissingParameterException(t('Required parameter \'%s\' missing'), $name);
+        $e->setParameter($name);
+        throw $e;
+    }
+
     /**
      * Set a value for the given option
      *

From dfd8c91827a0f7f8ed383c518c53113e2c5ace44 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 7 Apr 2015 12:25:46 +0200
Subject: [PATCH 1105/2920] Add PHPDoc to ActionController::$params

---
 library/Icinga/Web/Controller/ActionController.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 89a56e745..f40b8d538 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -55,6 +55,11 @@ class ActionController extends Zend_Controller_Action
      */
     private $auth;
 
+    /**
+     * URL parameters
+     *
+     * @var UrlParams
+     */
     protected $params;
 
     /**

From 25736cf76e214f20ac14e87993d1908f1b0cfd65 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 7 Apr 2015 12:27:19 +0200
Subject: [PATCH 1106/2920] Return HTTP 400 on MissingParameterException

refs #8886
---
 application/controllers/ErrorController.php | 26 ++++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index 6b75c6488..a77d36f4f 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -3,6 +3,7 @@
 
 use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
+use Icinga\Exception\MissingParameterException;
 use Icinga\Security\SecurityException;
 use Icinga\Web\Controller\ActionController;
 
@@ -42,19 +43,26 @@ class ErrorController extends ActionController
                 }
 
                 break;
-            case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_OTHER:
-                if ($exception instanceof SecurityException) {
-                    $this->getResponse()->setHttpResponseCode(403);
-                    $this->view->message = $exception->getMessage();
-                    break;
-                }
-                // Move to default
             default:
+                switch (true) {
+                    case $exception instanceof SecurityException:
+                        $this->getResponse()->setHttpResponseCode(403);
+                        break;
+                    case $exception instanceof MissingParameterException:
+                        $this->getResponse()->setHttpResponseCode(400);
+                        $this->getResponse()->setHeader(
+                            'X-Status-Reason',
+                            'Missing parameter ' . $exception->getParameter()
+                        );
+                        break;
+                    default:
+                        $this->getResponse()->setHttpResponseCode(500);
+                        break;
+                }
                 $title = preg_replace('/\r?\n.*$/s', '', $exception->getMessage());
-                $this->getResponse()->setHttpResponseCode(500);
                 $this->view->title = 'Server error: ' . $title;
                 $this->view->message = $exception->getMessage();
-                if ($this->getInvokeArg('displayExceptions') == true) {
+                if ($this->getInvokeArg('displayExceptions')) {
                     $this->view->stackTrace = $exception->getTraceAsString();
                 }
                 break;

From cdd5da80f03a5b3666fda821cc1c547544ccf85d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 7 Apr 2015 13:05:12 +0200
Subject: [PATCH 1107/2920] Use Url::getRelativeUrl() when updating dashlets

fixes #8363
---
 application/forms/Dashboard/DashletForm.php        | 6 +++---
 application/views/scripts/dashboard/settings.phtml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/forms/Dashboard/DashletForm.php b/application/forms/Dashboard/DashletForm.php
index 59ae41582..d25001a23 100644
--- a/application/forms/Dashboard/DashletForm.php
+++ b/application/forms/Dashboard/DashletForm.php
@@ -148,9 +148,9 @@ class DashletForm extends Form
         $this->populate(array(
             'pane'          => $dashlet->getPane()->getName(),
             'org_pane'      => $dashlet->getPane()->getName(),
-            'dashlet'     => $dashlet->getTitle(),
-            'org_dashlet' => $dashlet->getTitle(),
-            'url'           => $dashlet->getUrl()
+            'dashlet'       => $dashlet->getTitle(),
+            'org_dashlet'   => $dashlet->getTitle(),
+            'url'           => $dashlet->getUrl()->getRelativeUrl()
         ));
     }
 }
diff --git a/application/views/scripts/dashboard/settings.phtml b/application/views/scripts/dashboard/settings.phtml
index 2c638c318..3376da835 100644
--- a/application/views/scripts/dashboard/settings.phtml
+++ b/application/views/scripts/dashboard/settings.phtml
@@ -55,8 +55,8 @@
                             </td>
                             <td style="table-layout: fixed; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
                                 <?= $this->qlink(
-                                    $dashlet->getUrl(),
-                                    $dashlet->getUrl(),
+                                    $dashlet->getUrl()->getRelativeUrl(),
+                                    $dashlet->getUrl()->getRelativeUrl(),
                                     null,
                                     array('title' => sprintf($this->translate('Show dashlet %s'), $dashlet->getTitle()))
                                 ); ?>
@@ -78,4 +78,4 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-</div>
\ No newline at end of file
+</div>

From 967a2e82dc935201f2de58ea18f1a6f2632af18a Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Tue, 7 Apr 2015 14:23:26 +0200
Subject: [PATCH 1108/2920] Use (only) "@return $this" in fluent interfaces'
 documentation

---
 .../Config/Authentication/DbBackendForm.php   |  2 +-
 .../Config/Authentication/LdapBackendForm.php |  2 +-
 .../AuthenticationBackendConfigForm.php       |  6 ++---
 .../forms/Config/ResourceConfigForm.php       |  2 +-
 application/forms/ConfigForm.php              |  2 +-
 application/forms/PreferenceForm.php          |  7 ++---
 application/views/helpers/DateFormat.php      |  2 +-
 library/Icinga/Application/Config.php         |  6 ++---
 library/Icinga/Application/EmbeddedWeb.php    |  2 +-
 .../Icinga/Application/Modules/Manager.php    | 10 +++----
 library/Icinga/Application/Modules/Module.php | 20 +++++++-------
 library/Icinga/Authentication/UserBackend.php |  2 +-
 library/Icinga/Chart/Axis.php                 | 14 +++++-----
 library/Icinga/Chart/GridChart.php            | 18 ++++++-------
 library/Icinga/Chart/PieChart.php             |  6 ++---
 library/Icinga/Chart/Primitive/Path.php       |  8 +++---
 library/Icinga/Chart/Primitive/PieSlice.php   | 12 ++++-----
 library/Icinga/Chart/Primitive/Styleable.php  | 10 +++----
 library/Icinga/Chart/Primitive/Text.php       |  6 ++---
 library/Icinga/Chart/Unit/CalendarUnit.php    |  2 +-
 library/Icinga/Chart/Unit/LinearUnit.php      |  2 +-
 library/Icinga/Chart/Unit/LogarithmicUnit.php |  2 +-
 library/Icinga/Chart/Unit/StaticAxis.php      |  2 +-
 library/Icinga/Cli/Params.php                 |  6 ++---
 library/Icinga/Data/ConfigObject.php          |  2 +-
 library/Icinga/Data/Db/DbConnection.php       |  2 +-
 library/Icinga/Data/PivotTable.php            |  4 +--
 library/Icinga/Data/SimpleQuery.php           | 10 +++----
 .../Icinga/Protocol/Livestatus/Connection.php |  2 +-
 library/Icinga/Web/Form.php                   | 26 +++++++++----------
 library/Icinga/Web/Menu.php                   |  2 +-
 .../Icinga/Web/Session/SessionNamespace.php   |  2 +-
 library/Icinga/Web/Url.php                    | 16 ++++++------
 library/Icinga/Web/UrlParams.php              |  8 +++---
 library/Icinga/Web/View.php                   |  2 +-
 library/Icinga/Web/Widget/Dashboard.php       |  6 ++---
 .../Icinga/Web/Widget/Dashboard/Dashlet.php   |  2 +-
 library/Icinga/Web/Widget/Dashboard/Pane.php  |  4 +--
 library/Icinga/Web/Widget/SortBox.php         |  2 +-
 library/Icinga/Web/Widget/Tab.php             |  2 +-
 library/Icinga/Web/Widget/Tabs.php            | 12 ++++-----
 library/Icinga/Web/Wizard.php                 | 10 +++----
 .../forms/Config/InstanceConfigForm.php       |  2 +-
 .../views/helpers/CheckPerformance.php        |  2 +-
 .../application/views/helpers/Customvar.php   |  2 +-
 .../views/helpers/RuntimeVariables.php        |  2 +-
 .../Monitoring/Backend/Ido/Query/IdoQuery.php | 10 +++----
 .../Monitoring/Backend/MonitoringBackend.php  |  2 +-
 .../Command/Transport/LocalCommandFile.php    |  4 +--
 .../Command/Transport/RemoteCommandFile.php   |  8 +++---
 .../application/forms/AdminAccountPage.php    |  4 +--
 .../application/forms/AuthBackendPage.php     |  2 +-
 .../forms/DatabaseCreationPage.php            |  6 ++---
 .../forms/LdapDiscoveryConfirmPage.php        |  2 +-
 .../application/forms/RequirementsPage.php    |  2 +-
 .../setup/application/forms/SummaryPage.php   |  2 +-
 modules/setup/library/Setup/Utils/DbTool.php  |  4 +--
 57 files changed, 160 insertions(+), 159 deletions(-)

diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index 619c7dd5d..e96b9637c 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -34,7 +34,7 @@ class DbBackendForm extends Form
      *
      * @param   array   $resources      The resources to choose from
      *
-     * @return  self
+     * @return  $this
      */
     public function setResources(array $resources)
     {
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 838be7776..562526788 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -35,7 +35,7 @@ class LdapBackendForm extends Form
      *
      * @param   array   $resources      The resources to choose from
      *
-     * @return  self
+     * @return  $this
      */
     public function setResources(array $resources)
     {
diff --git a/application/forms/Config/AuthenticationBackendConfigForm.php b/application/forms/Config/AuthenticationBackendConfigForm.php
index 276d73b94..86322902b 100644
--- a/application/forms/Config/AuthenticationBackendConfigForm.php
+++ b/application/forms/Config/AuthenticationBackendConfigForm.php
@@ -38,7 +38,7 @@ class AuthenticationBackendConfigForm extends ConfigForm
      *
      * @param   Config      $resources      The resource configuration
      *
-     * @return  self
+     * @return  $this
      */
     public function setResourceConfig(Config $resourceConfig)
     {
@@ -82,7 +82,7 @@ class AuthenticationBackendConfigForm extends ConfigForm
      *
      * @param   array   $values             The values to extend the configuration with
      *
-     * @return  self
+     * @return  $this
      *
      * @throws  InvalidArgumentException    In case the backend does already exist
      */
@@ -159,7 +159,7 @@ class AuthenticationBackendConfigForm extends ConfigForm
      * @param   string      $name           The name of the backend to be moved
      * @param   int         $position       The new (absolute) position of the backend
      *
-     * @return  self
+     * @return  $this
      *
      * @throws  InvalidArgumentException    In case the backend does not exist
      */
diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php
index ce99d1e4c..5d1eeaa9b 100644
--- a/application/forms/Config/ResourceConfigForm.php
+++ b/application/forms/Config/ResourceConfigForm.php
@@ -53,7 +53,7 @@ class ResourceConfigForm extends ConfigForm
      *
      * @param   array   $values             The values to extend the configuration with
      *
-     * @return  self
+     * @return  $this
      *
      * @thrwos  InvalidArgumentException    In case the resource does already exist
      */
diff --git a/application/forms/ConfigForm.php b/application/forms/ConfigForm.php
index e3602966a..58d550793 100644
--- a/application/forms/ConfigForm.php
+++ b/application/forms/ConfigForm.php
@@ -25,7 +25,7 @@ class ConfigForm extends Form
      *
      * @param   Config      $config     The configuration to use
      *
-     * @return  self
+     * @return  $this
      */
     public function setIniConfig(Config $config)
     {
diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
index 09aa6b652..d098cb781 100644
--- a/application/forms/PreferenceForm.php
+++ b/application/forms/PreferenceForm.php
@@ -48,7 +48,7 @@ class PreferenceForm extends Form
      *
      * @param   Preferences     $preferences    The preferences to work with
      *
-     * @return  self
+     * @return  $this
      */
     public function setPreferences(Preferences $preferences)
     {
@@ -61,17 +61,18 @@ class PreferenceForm extends Form
      *
      * @param   PreferencesStore    $store      The preference store to use
      *
-     * @return  self
+     * @return  $this
      */
     public function setStore(PreferencesStore $store)
     {
         $this->store = $store;
+        return $this;
     }
 
     /**
      * Persist preferences
      *
-     * @return  self
+     * @return  $this
      */
     public function save()
     {
diff --git a/application/views/helpers/DateFormat.php b/application/views/helpers/DateFormat.php
index 3fd323340..6df8c32bb 100644
--- a/application/views/helpers/DateFormat.php
+++ b/application/views/helpers/DateFormat.php
@@ -37,7 +37,7 @@ class Zend_View_Helper_DateFormat extends Zend_View_Helper_Abstract
     /**
      * Helper entry point
      *
-     * @return  self
+     * @return  $this
      */
     public function dateFormat()
     {
diff --git a/library/Icinga/Application/Config.php b/library/Icinga/Application/Config.php
index 230a83e05..8a1746b69 100644
--- a/library/Icinga/Application/Config.php
+++ b/library/Icinga/Application/Config.php
@@ -77,7 +77,7 @@ class Config implements Countable, Iterator
      *
      * @param   string      $filepath   The path to the ini file
      *
-     * @return  self
+     * @return  $this
      */
     public function setConfigFile($filepath)
     {
@@ -223,7 +223,7 @@ class Config implements Countable, Iterator
      * @param   string              $name
      * @param   array|ConfigObject  $config
      *
-     * @return  self
+     * @return  $this
      */
     public function setSection($name, $config = null)
     {
@@ -242,7 +242,7 @@ class Config implements Countable, Iterator
      *
      * @param   string  $name
      *
-     * @return  self
+     * @return  $this
      */
     public function removeSection($name)
     {
diff --git a/library/Icinga/Application/EmbeddedWeb.php b/library/Icinga/Application/EmbeddedWeb.php
index 446b77b57..0408d182e 100644
--- a/library/Icinga/Application/EmbeddedWeb.php
+++ b/library/Icinga/Application/EmbeddedWeb.php
@@ -20,7 +20,7 @@ class EmbeddedWeb extends ApplicationBootstrap
      * Embedded bootstrap parts
      *
      * @see    ApplicationBootstrap::bootstrap
-     * @return self
+     * @return $this
      */
     protected function bootstrap()
     {
diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php
index 3d50df109..8f48d7b77 100644
--- a/library/Icinga/Application/Modules/Manager.php
+++ b/library/Icinga/Application/Modules/Manager.php
@@ -156,7 +156,7 @@ class Manager
     /**
      * Try to set all enabled modules in loaded sate
      *
-     * @return  self
+     * @return  $this
      * @see     Manager::loadModule()
      */
     public function loadEnabledModules()
@@ -173,7 +173,7 @@ class Manager
      * @param string $name    The name of the module to load
      * @param mixed  $basedir Optional module base directory
      *
-     * @return self
+     * @return $this
      */
     public function loadModule($name, $basedir = null)
     {
@@ -197,7 +197,7 @@ class Manager
      *
      * @param   string $name                The module to enable
      *
-     * @return  self
+     * @return  $this
      * @throws  ConfigurationError          When trying to enable a module that is not installed
      * @throws  NotFoundError               In case the "enabledModules" directory does not exist
      * @throws  SystemPermissionException   When insufficient permissions for the application exist
@@ -256,7 +256,7 @@ class Manager
      *
      * @param   string $name                The name of the module to disable
      *
-     * @return  self
+     * @return  $this
      *
      * @throws  ConfigurationError          When the module is not installed or it's not a symlink
      * @throws  SystemPermissionException   When the module can't be disabled
@@ -491,7 +491,7 @@ class Manager
      *
      * @param   array   $availableDirs      Installed modules location
      *
-     * @return self
+     * @return $this
      */
     public function detectInstalledModules(array $availableDirs = null)
     {
diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index c0036e1fa..c1fd84513 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -752,7 +752,7 @@ class Module
      * @param string $name   Unique tab name
      * @param string $config Tab config
      *
-     * @return self
+     * @return $this
      */
     protected function provideConfigTab($name, $config = array())
     {
@@ -769,7 +769,7 @@ class Module
      *
      * @param   string  $className      The name of the class
      *
-     * @return  self
+     * @return  $this
      */
     protected function provideSetupWizard($className)
     {
@@ -780,7 +780,7 @@ class Module
     /**
      * Register new namespaces on the autoloader
      *
-     * @return self
+     * @return $this
      */
     protected function registerAutoloader()
     {
@@ -802,7 +802,7 @@ class Module
     /**
      * Bind text domain for i18n
      *
-     * @return self
+     * @return $this
      */
     protected function registerLocales()
     {
@@ -849,7 +849,7 @@ class Module
      *
      * Add controller directory to mvc
      *
-     * @return self
+     * @return $this
      */
     protected function registerWebIntegration()
     {
@@ -872,7 +872,7 @@ class Module
     /**
      * Add routes for static content and any route added via addRoute() to the route chain
      *
-     * @return  self
+     * @return  $this
      * @see     addRoute()
      */
     protected function registerRoutes()
@@ -912,7 +912,7 @@ class Module
     /**
      * Run module bootstrap script
      *
-     * @return self
+     * @return $this
      */
     protected function launchRunScript()
     {
@@ -924,7 +924,7 @@ class Module
      *
      * @param string $file File to include
      *
-     * @return self
+     * @return $this
      */
     protected function includeScript($file)
     {
@@ -958,7 +958,7 @@ class Module
      * @param string $class
      * @param string $key
      *
-     * @return self
+     * @return $this
      */
     protected function registerHook($name, $class, $key = null)
     {
@@ -977,7 +977,7 @@ class Module
      * @param   string                                  $name   Name of the route
      * @param   Zend_Controller_Router_Route_Abstract   $route  Instance of the route
      *
-     * @return  self
+     * @return  $this
      * @see     registerRoutes()
      */
     protected function addRoute($name, Zend_Controller_Router_Route_Abstract $route)
diff --git a/library/Icinga/Authentication/UserBackend.php b/library/Icinga/Authentication/UserBackend.php
index e5a090bb5..8e35660df 100644
--- a/library/Icinga/Authentication/UserBackend.php
+++ b/library/Icinga/Authentication/UserBackend.php
@@ -26,7 +26,7 @@ abstract class UserBackend implements Countable
      *
      * @param   string $name
      *
-     * @return  self
+     * @return  $this
      */
     public function setName($name)
     {
diff --git a/library/Icinga/Chart/Axis.php b/library/Icinga/Chart/Axis.php
index a7f8d6d5f..2715f3b2d 100644
--- a/library/Icinga/Chart/Axis.php
+++ b/library/Icinga/Chart/Axis.php
@@ -115,7 +115,7 @@ class Axis implements Drawable
      *
      * @param   AxisUnit $unit      The AxisUnit implementation to use for the x axis
      *
-     * @return  self                This Axis Object
+     * @return  $this                This Axis Object
      * @see     Axis::CalendarUnit
      * @see     Axis::LinearUnit
      */
@@ -130,7 +130,7 @@ class Axis implements Drawable
      *
      * @param   AxisUnit $unit      The AxisUnit implementation to use for the y axis
      *
-     * @return  self                This Axis Object
+     * @return  $this                This Axis Object
      * @see     Axis::CalendarUnit
      * @see     Axis::LinearUnit
      */
@@ -331,7 +331,7 @@ class Axis implements Drawable
      *
      * @param   string $label   The label to use for the y axis
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function setYLabel($label)
     {
@@ -346,7 +346,7 @@ class Axis implements Drawable
     *
     * @param    int $xMin   The minimum value to use for the x axis
     *
-    * @return   self        Fluid interface
+    * @return   $this        Fluid interface
     */
     public function setXMin($xMin)
     {
@@ -361,7 +361,7 @@ class Axis implements Drawable
      *
      * @param   int $yMin   The minimum value to use for the x axis
      *
-     * @return  self        Fluid interface
+     * @return  $this        Fluid interface
      */
     public function setYMin($yMin)
     {
@@ -376,7 +376,7 @@ class Axis implements Drawable
      *
      * @param   int $xMax   The minimum value to use for the x axis
      *
-     * @return  self        Fluid interface
+     * @return  $this        Fluid interface
      */
     public function setXMax($xMax)
     {
@@ -391,7 +391,7 @@ class Axis implements Drawable
      *
      * @param   int $yMax   The minimum value to use for the y axis
      *
-     * @return  self        Fluid interface
+     * @return  $this        Fluid interface
      */
     public function setYMax($yMax)
     {
diff --git a/library/Icinga/Chart/GridChart.php b/library/Icinga/Chart/GridChart.php
index 9f867ac66..57ca9f469 100644
--- a/library/Icinga/Chart/GridChart.php
+++ b/library/Icinga/Chart/GridChart.php
@@ -132,7 +132,7 @@ class GridChart extends Chart
      *
      * @param   array $axis,... The line definitions to draw
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function drawLines(array $axis)
     {
@@ -146,7 +146,7 @@ class GridChart extends Chart
      * Refer to the graphs.md for a detailed list of allowed attributes
      *
      * @param   array $axis
-     * @return  self
+     * @return  $this
      */
     public function drawBars(array $axis)
     {
@@ -215,7 +215,7 @@ class GridChart extends Chart
      * @param   string $yAxisLabel  The label to use for the y axis
      * @param   string $axisName    The name of the axis, for now 'default'
      *
-     * @return  self                Fluid interface
+     * @return  $this                Fluid interface
      */
     public function setAxisLabel($xAxisLabel, $yAxisLabel, $axisName = 'default')
     {
@@ -229,7 +229,7 @@ class GridChart extends Chart
      * @param   AxisUnit    $unit       The unit for the x axis
      * @param   string      $axisName   The name of the axis to set the label for, currently only 'default'
      *
-     * @return  self                    Fluid interface
+     * @return  $this                    Fluid interface
      */
     public function setXAxis(AxisUnit $unit, $axisName = 'default')
     {
@@ -243,7 +243,7 @@ class GridChart extends Chart
      * @param   AxisUnit    $unit       The unit for the y axis
      * @param   string      $axisName   The name of the axis to set the label for, currently only 'default'
      *
-     * @return  self                    Fluid interface
+     * @return  $this                    Fluid interface
      */
     public function setYAxis(AxisUnit $unit, $axisName = 'default')
     {
@@ -276,7 +276,7 @@ class GridChart extends Chart
      * @param   Axis    $axis The new axis to use
      * @param   string  $name The name of the axis, currently only 'default'
      *
-     * @return  self          Fluid interface
+     * @return  $this          Fluid interface
      */
     public function setAxis(Axis $axis, $name = 'default')
     {
@@ -290,7 +290,7 @@ class GridChart extends Chart
      * @param   Axis    $axis The axis object to add
      * @param   string  $name The name of the axis
      *
-     * @return  self          Fluid interface
+     * @return  $this          Fluid interface
      */
     public function addAxis(Axis $axis, $name)
     {
@@ -307,7 +307,7 @@ class GridChart extends Chart
      * @param   int     $yMin       The minimum value for the y axis or null to use a dynamic value
      * @param   string  $axisName   The name of the axis to set the minimum, currently only 'default'
      *
-     * @return  self                Fluid interface
+     * @return  $this                Fluid interface
      */
     public function setAxisMin($xMin = null, $yMin = null, $axisName = 'default')
     {
@@ -324,7 +324,7 @@ class GridChart extends Chart
      * @param   int     $yMax       The maximum value for the y axis or null to use a dynamic value
      * @param   string  $axisName   The name of the axis to set the maximum, currently only 'default'
      *
-     * @return  self                Fluid interface
+     * @return  $this                Fluid interface
      */
     public function setAxisMax($xMax = null, $yMax = null, $axisName = 'default')
     {
diff --git a/library/Icinga/Chart/PieChart.php b/library/Icinga/Chart/PieChart.php
index 6b19969c8..b7fdb4755 100644
--- a/library/Icinga/Chart/PieChart.php
+++ b/library/Icinga/Chart/PieChart.php
@@ -107,7 +107,7 @@ class PieChart extends Chart
      *
      * @param   array $dataSet,...  The pie definition, see graphs.md for further details concerning the format
      *
-     * @return  self                Fluent interface
+     * @return  $this                Fluent interface
      */
     public function drawPie(array $dataSet)
     {
@@ -272,7 +272,7 @@ class PieChart extends Chart
      *
      * @param string $type  Either self::STACKED or self::ROW
      *
-     * @return self         Fluent interface
+     * @return $this         Fluent interface
      */
     public function setType($type)
     {
@@ -283,7 +283,7 @@ class PieChart extends Chart
     /**
      * Hide the caption from this PieChart
      *
-     * @return self         Fluent interface
+     * @return $this         Fluent interface
      */
     public function disableLegend()
     {
diff --git a/library/Icinga/Chart/Primitive/Path.php b/library/Icinga/Chart/Primitive/Path.php
index 86c2c729d..c8917622a 100644
--- a/library/Icinga/Chart/Primitive/Path.php
+++ b/library/Icinga/Chart/Primitive/Path.php
@@ -77,7 +77,7 @@ class Path extends Styleable implements Drawable
      *
      * @param   array $points Either a single [x, y] point or an array of x, y points
      *
-     * @return  self          Fluid interface
+     * @return  $this          Fluid interface
      */
     public function append(array $points)
     {
@@ -96,7 +96,7 @@ class Path extends Styleable implements Drawable
      *
      * @param   array $points Either a single [x, y] point or an array of x, y points
      *
-     * @return  self          Fluid interface
+     * @return  $this          Fluid interface
      */
     public function prepend(array $points)
     {
@@ -115,7 +115,7 @@ class Path extends Styleable implements Drawable
      *
      * @param   boolean $bool True to draw discrete or false to draw straight lines between points
      *
-     * @return  self          Fluid interface
+     * @return  $this          Fluid interface
      */
     public function setDiscrete($bool)
     {
@@ -126,7 +126,7 @@ class Path extends Styleable implements Drawable
     /**
      * Mark this path as containing absolute coordinates
      *
-     * @return self Fluid interface
+     * @return $this Fluid interface
      */
     public function toAbsolute()
     {
diff --git a/library/Icinga/Chart/Primitive/PieSlice.php b/library/Icinga/Chart/Primitive/PieSlice.php
index c4bece29c..839c9bc9c 100644
--- a/library/Icinga/Chart/Primitive/PieSlice.php
+++ b/library/Icinga/Chart/Primitive/PieSlice.php
@@ -189,7 +189,7 @@ class PieSlice extends Animatable implements Drawable
      *
      * @param   int $x The new x position
      *
-     * @return  self   Fluid interface
+     * @return  $this   Fluid interface
      */
     public function setX($x)
     {
@@ -202,7 +202,7 @@ class PieSlice extends Animatable implements Drawable
      *
      * @param   int $y  The new y position
      *
-     * @return  self    Fluid interface
+     * @return  $this    Fluid interface
      */
     public function setY($y)
     {
@@ -215,7 +215,7 @@ class PieSlice extends Animatable implements Drawable
      *
      * @param   DOMElement $group   The label group
      *
-     * @return  self                Fluid interface
+     * @return  $this                Fluid interface
      */
     public function setLabelGroup(DOMElement $group)
     {
@@ -228,7 +228,7 @@ class PieSlice extends Animatable implements Drawable
      *
      * @param   string $caption The caption for this element
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function setCaption($caption)
     {
@@ -241,7 +241,7 @@ class PieSlice extends Animatable implements Drawable
      *
      * @param   int $offset     The offset for the caption handle
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function setCaptionOffset($offset)
     {
@@ -254,7 +254,7 @@ class PieSlice extends Animatable implements Drawable
      *
      * @param   int $bound  The offset for the caption text
      *
-     * @return  self        Fluid interface
+     * @return  $this        Fluid interface
      */
     public function setOuterCaptionBound($bound)
     {
diff --git a/library/Icinga/Chart/Primitive/Styleable.php b/library/Icinga/Chart/Primitive/Styleable.php
index e36d60707..b8ff79526 100644
--- a/library/Icinga/Chart/Primitive/Styleable.php
+++ b/library/Icinga/Chart/Primitive/Styleable.php
@@ -59,7 +59,7 @@ class Styleable
      *
      * @param   string $width   The stroke with with unit
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function setStrokeWidth($width)
     {
@@ -72,7 +72,7 @@ class Styleable
      *
      * @param   string $color   The color to set for the stroke
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function setStrokeColor($color)
     {
@@ -85,7 +85,7 @@ class Styleable
      *
      * @param   string $styles  The styles to set additionally
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function setAdditionalStyle($styles)
     {
@@ -98,7 +98,7 @@ class Styleable
      *
      * @param   string $color   The color to use for filling or null to use no fill
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function setFill($color = null)
     {
@@ -111,7 +111,7 @@ class Styleable
      *
      * @param   string $id  The id to set for this element
      *
-     * @return  self        Fluid interface
+     * @return  $this        Fluid interface
      */
     public function setId($id)
     {
diff --git a/library/Icinga/Chart/Primitive/Text.php b/library/Icinga/Chart/Primitive/Text.php
index 3125d1d12..62a11eef7 100644
--- a/library/Icinga/Chart/Primitive/Text.php
+++ b/library/Icinga/Chart/Primitive/Text.php
@@ -104,7 +104,7 @@ class Text extends Styleable implements Drawable
      *
      * @param   string $size    The font size including a unit
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function setFontSize($size)
     {
@@ -117,7 +117,7 @@ class Text extends Styleable implements Drawable
      *
      * @param   String $align   Value how to align
      *
-     * @return  self            Fluid interface
+     * @return  $this            Fluid interface
      */
     public function setAlignment($align)
     {
@@ -130,7 +130,7 @@ class Text extends Styleable implements Drawable
      *
      * @param string $weight    The weight of the string
      *
-     * @return self             Fluid interface
+     * @return $this             Fluid interface
      */
     public function setFontWeight($weight)
     {
diff --git a/library/Icinga/Chart/Unit/CalendarUnit.php b/library/Icinga/Chart/Unit/CalendarUnit.php
index da732c025..5f4c6979c 100644
--- a/library/Icinga/Chart/Unit/CalendarUnit.php
+++ b/library/Icinga/Chart/Unit/CalendarUnit.php
@@ -110,7 +110,7 @@ class CalendarUnit extends LinearUnit
      * @param   array   $dataset    The dataset to update
      * @param   int     $idx        The index to use for determining the data
      *
-     * @return  self                Fluid interface
+     * @return  $this                Fluid interface
      */
     public function addValues(array $dataset, $idx = 0)
     {
diff --git a/library/Icinga/Chart/Unit/LinearUnit.php b/library/Icinga/Chart/Unit/LinearUnit.php
index ab16b2941..bf27ed8a3 100644
--- a/library/Icinga/Chart/Unit/LinearUnit.php
+++ b/library/Icinga/Chart/Unit/LinearUnit.php
@@ -74,7 +74,7 @@ class LinearUnit implements AxisUnit
      * @param   array $dataset  The dataset to add
      * @param   int $idx        The idx (0 for x, 1 for y)
      *
-     * @return  self            Fluent interface
+     * @return  $this            Fluent interface
      */
     public function addValues(array $dataset, $idx = 0)
     {
diff --git a/library/Icinga/Chart/Unit/LogarithmicUnit.php b/library/Icinga/Chart/Unit/LogarithmicUnit.php
index 8f90a9f03..0e87e0433 100644
--- a/library/Icinga/Chart/Unit/LogarithmicUnit.php
+++ b/library/Icinga/Chart/Unit/LogarithmicUnit.php
@@ -65,7 +65,7 @@ class LogarithmicUnit implements AxisUnit
      * @param   array $dataset  The dataset to add
      * @param   int $idx        The idx (0 for x, 1 for y)
      *
-     * @return  self            Fluent interface
+     * @return  $this            Fluent interface
      */
     public function addValues(array $dataset, $idx = 0)
     {
diff --git a/library/Icinga/Chart/Unit/StaticAxis.php b/library/Icinga/Chart/Unit/StaticAxis.php
index 2ea1db136..bc75516ef 100644
--- a/library/Icinga/Chart/Unit/StaticAxis.php
+++ b/library/Icinga/Chart/Unit/StaticAxis.php
@@ -15,7 +15,7 @@ class StaticAxis implements AxisUnit
      * @param array $dataset    The dataset that will be shown in the Axis
      * @param int   $idx        The idx in the dataset (0 for x, 1 for y)
      *
-     * @return self             Fluent interface
+     * @return $this             Fluent interface
      */
     public function addValues(array $dataset, $idx = 0)
     {
diff --git a/library/Icinga/Cli/Params.php b/library/Icinga/Cli/Params.php
index 34dd5e177..507c50e3b 100644
--- a/library/Icinga/Cli/Params.php
+++ b/library/Icinga/Cli/Params.php
@@ -186,7 +186,7 @@ class Params
      * @param   string  $key    The option name
      * @param   mixed   $value  The value to set
      *
-     * @return  self
+     * @return  $this
      */
     public function set($key, $value)
     {
@@ -199,7 +199,7 @@ class Params
      *
      * @param   string|array    $keys   The option or options to remove
      *
-     * @return  self
+     * @return  $this
      */
     public function remove($keys = array())
     {
@@ -263,7 +263,7 @@ class Params
      *
      * @param   mixed   $key    The argument
      *
-     * @return  self
+     * @return  $this
      */
     public function unshift($key)
     {
diff --git a/library/Icinga/Data/ConfigObject.php b/library/Icinga/Data/ConfigObject.php
index fffbeb6a9..641d72846 100644
--- a/library/Icinga/Data/ConfigObject.php
+++ b/library/Icinga/Data/ConfigObject.php
@@ -274,7 +274,7 @@ class ConfigObject implements Countable, Iterator, ArrayAccess
      *
      * @param   array|Config    $data   An array or a config
      *
-     * @return  self
+     * @return  $this
      */
     public function merge($data)
     {
diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php
index e5afa37f9..d1817d24a 100644
--- a/library/Icinga/Data/Db/DbConnection.php
+++ b/library/Icinga/Data/Db/DbConnection.php
@@ -183,7 +183,7 @@ class DbConnection implements Selectable
      *
      * @param   string $prefix
      *
-     * @return  self
+     * @return  $this
      */
     public function setTablePrefix($prefix)
     {
diff --git a/library/Icinga/Data/PivotTable.php b/library/Icinga/Data/PivotTable.php
index 5d0bf9ef6..2131231f8 100644
--- a/library/Icinga/Data/PivotTable.php
+++ b/library/Icinga/Data/PivotTable.php
@@ -63,7 +63,7 @@ class PivotTable
     /**
      * Prepare the queries used for the pre processing
      *
-     * @return  self
+     * @return  $this
      */
     protected function prepareQueries()
     {
@@ -82,7 +82,7 @@ class PivotTable
     /**
      * Set a default sorting for the x- and y-axis without losing any existing rules
      *
-     * @return  self
+     * @return  $this
      */
     protected function adjustSorting()
     {
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 704a6ff8a..16f82cbe4 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -106,7 +106,7 @@ class SimpleQuery implements QueryInterface, Queryable
      *
      * Query will return all available columns if none are given here
      *
-     * @return self
+     * @return $this
      */
     public function from($target, array $fields = null)
     {
@@ -125,7 +125,7 @@ class SimpleQuery implements QueryInterface, Queryable
      * @param   string  $condition
      * @param   mixed   $value
      *
-     * @return  self
+     * @return  $this
      */
     public function where($condition, $value = null)
     {
@@ -192,7 +192,7 @@ class SimpleQuery implements QueryInterface, Queryable
      * @param  string   $field
      * @param  string   $direction
      *
-     * @return self
+     * @return $this
      */
     public function order($field, $direction = null)
     {
@@ -270,7 +270,7 @@ class SimpleQuery implements QueryInterface, Queryable
      * @param   int $count  Number of rows to return
      * @param   int $offset Start returning after this many rows
      *
-     * @return  self
+     * @return  $this
      */
     public function limit($count = null, $offset = null)
     {
@@ -417,7 +417,7 @@ class SimpleQuery implements QueryInterface, Queryable
      *
      * @param   array $columns
      *
-     * @return  self
+     * @return  $this
      */
     public function columns(array $columns)
     {
diff --git a/library/Icinga/Protocol/Livestatus/Connection.php b/library/Icinga/Protocol/Livestatus/Connection.php
index bda091d85..b854e6d36 100644
--- a/library/Icinga/Protocol/Livestatus/Connection.php
+++ b/library/Icinga/Protocol/Livestatus/Connection.php
@@ -416,7 +416,7 @@ if ($col > $size - 1) return $res;
     /**
      * Disconnect in case we are connected to a Livestatus socket
      *
-     * @return self
+     * @return $this
      */
     public function disconnect()
     {
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index faa212458..e727567ee 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -211,7 +211,7 @@ class Form extends Zend_Form
      *
      * @param   string  $label  The label to use for the submit button
      *
-     * @return  self
+     * @return  $this
      */
     public function setSubmitLabel($label)
     {
@@ -234,7 +234,7 @@ class Form extends Zend_Form
      *
      * @param   string|Url  $url    The url to redirect to
      *
-     * @return  self
+     * @return  $this
      */
     public function setRedirectUrl($url)
     {
@@ -263,7 +263,7 @@ class Form extends Zend_Form
      *
      * @param   string  $viewScript     The view script to use
      *
-     * @return  self
+     * @return  $this
      */
     public function setViewScript($viewScript)
     {
@@ -286,7 +286,7 @@ class Form extends Zend_Form
      *
      * @param   bool    $disabled   Set true in order to disable CSRF protection for this form, otherwise false
      *
-     * @return  self
+     * @return  $this
      */
     public function setTokenDisabled($disabled = true)
     {
@@ -314,7 +314,7 @@ class Form extends Zend_Form
      *
      * @param   string  $name   The name to set
      *
-     * @return  self
+     * @return  $this
      */
     public function setTokenElementName($name)
     {
@@ -337,7 +337,7 @@ class Form extends Zend_Form
      *
      * @param   bool    $disabled   Set true in order to disable identification for this form, otherwise false
      *
-     * @return  self
+     * @return  $this
      */
     public function setUidDisabled($disabled = true)
     {
@@ -365,7 +365,7 @@ class Form extends Zend_Form
      *
      * @param   string  $name   The name to set
      *
-     * @return  self
+     * @return  $this
      */
     public function setUidElementName($name)
     {
@@ -388,7 +388,7 @@ class Form extends Zend_Form
      *
      * @param   bool    $state
      *
-     * @return  self
+     * @return  $this
      */
     public function setValidatePartial($state)
     {
@@ -525,7 +525,7 @@ class Form extends Zend_Form
      *
      * @param   array   $formData   The data sent by the user
      *
-     * @return  self
+     * @return  $this
      */
     public function create(array $formData = array())
     {
@@ -593,7 +593,7 @@ class Form extends Zend_Form
      * Uses the label previously set with Form::setSubmitLabel(). Overwrite this
      * method in order to add multiple submit buttons or one with a custom name.
      *
-     * @return  self
+     * @return  $this
      */
     public function addSubmitButton()
     {
@@ -773,7 +773,7 @@ class Form extends Zend_Form
     /**
      * Add a field with a unique and form specific ID
      *
-     * @return  self
+     * @return  $this
      */
     public function addFormIdentification()
     {
@@ -795,7 +795,7 @@ class Form extends Zend_Form
     /**
      * Add CSRF counter measure field to this form
      *
-     * @return  self
+     * @return  $this
      */
     public function addCsrfCounterMeasure()
     {
@@ -948,7 +948,7 @@ class Form extends Zend_Form
      * Overwrites Zend_Form::loadDefaultDecorators to avoid having
      * the HtmlTag-Decorator added and to provide viewscript usage
      *
-     * @return  self
+     * @return  $this
      */
     public function loadDefaultDecorators()
     {
diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index a4bf59605..e95f14c88 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -639,7 +639,7 @@ class Menu implements RecursiveIterator
      *
      * @param   array   $menus  The menus to load, as key-value array
      *
-     * @return  static
+     * @return  $this
      */
     protected function loadSubMenus(array $menus)
     {
diff --git a/library/Icinga/Web/Session/SessionNamespace.php b/library/Icinga/Web/Session/SessionNamespace.php
index 5ed617cb3..281d09bea 100644
--- a/library/Icinga/Web/Session/SessionNamespace.php
+++ b/library/Icinga/Web/Session/SessionNamespace.php
@@ -95,7 +95,7 @@ class SessionNamespace implements IteratorAggregate
      * @param   string      $key        Name of value
      * @param   mixed       $value      Value to set
      *
-     * @return  self
+     * @return  $this
      */
     public function set($key, $value)
     {
diff --git a/library/Icinga/Web/Url.php b/library/Icinga/Web/Url.php
index 080a916fb..3a12b5d77 100644
--- a/library/Icinga/Web/Url.php
+++ b/library/Icinga/Web/Url.php
@@ -163,7 +163,7 @@ class Url
      *
      * @param   string  $baseUrl    The url path to use as the Url Base
      *
-     * @return  self
+     * @return  $this
      */
     public function setBaseUrl($baseUrl)
     {
@@ -190,7 +190,7 @@ class Url
      *
      * @param   string  $path   The path to set
      *
-     * @return  self
+     * @return  $this
      */
     public function setPath($path)
     {
@@ -250,7 +250,7 @@ class Url
      *
      * @param   array   $params     The parameters to add
      *
-     * @return  self
+     * @return  $this
      */
     public function addParams(array $params)
     {
@@ -266,7 +266,7 @@ class Url
      *
      * @param   array   $params     The parameters to set
      *
-     * @return  self
+     * @return  $this
      */
     public function overwriteParams(array $params)
     {
@@ -282,7 +282,7 @@ class Url
      *
      * @param   UrlParams|array   $params     The new parameters to use for the query part
      *
-     * @return  self
+     * @return  $this
      */
     public function setParams($params)
     {
@@ -343,7 +343,7 @@ class Url
      * @param   string          $param      The query parameter name
      * @param   array|string    $value      An array or string to set as the parameter value
      *
-     * @return  self
+     * @return  $this
      */
     public function setParam($param, $value = true)
     {
@@ -356,7 +356,7 @@ class Url
      *
      * @param   string  $anchor     The site's anchor string without the '#'
      *
-     * @return  self
+     * @return  $this
      */
     public function setAnchor($anchor)
     {
@@ -369,7 +369,7 @@ class Url
      *
      * @param   string|array    $keyOrArrayOfKeys   An array of strings or a string representing the key(s)
      *                                              of the parameters to be removed
-     * @return  self
+     * @return  $this
      */
     public function remove($keyOrArrayOfKeys)
     {
diff --git a/library/Icinga/Web/UrlParams.php b/library/Icinga/Web/UrlParams.php
index a38c1a229..e25fa7e6c 100644
--- a/library/Icinga/Web/UrlParams.php
+++ b/library/Icinga/Web/UrlParams.php
@@ -159,7 +159,7 @@ class UrlParams
      * @param string $param The parameter you're interested in
      * @param string $value The value to be stored
      *
-     * @return self
+     * @return $this
      */
     public function add($param, $value = true)
     {
@@ -175,7 +175,7 @@ class UrlParams
      * @param string $param Parameter name or param/value list
      * @param string $value The value to be stored
      *
-     * @return self
+     * @return $this
      */
     public function addValues($param, $values = null)
     {
@@ -231,7 +231,7 @@ class UrlParams
      * @param string $param The parameter you're interested in
      * @param string $value The value to be stored
      *
-     * @return self
+     * @return $this
      */
     public function unshift($param, $value)
     {
@@ -248,7 +248,7 @@ class UrlParams
      * @param string $param The parameter you want to set
      * @param string $value The value to be stored
      *
-     * @return self
+     * @return $this
      */
     public function set($param, $value)
     {
diff --git a/library/Icinga/Web/View.php b/library/Icinga/Web/View.php
index 1265c7d21..79f6f7d70 100644
--- a/library/Icinga/Web/View.php
+++ b/library/Icinga/Web/View.php
@@ -104,7 +104,7 @@ class View extends Zend_View_Abstract
      *
      * @param  string  $name     The desired function name
      * @param  Closure $function An anonymous function
-     * @return self
+     * @return $this
      */
     public function addHelperFunction($name, Closure $function)
     {
diff --git a/library/Icinga/Web/Widget/Dashboard.php b/library/Icinga/Web/Widget/Dashboard.php
index 258c9cf2e..1d6a882f1 100644
--- a/library/Icinga/Web/Widget/Dashboard.php
+++ b/library/Icinga/Web/Widget/Dashboard.php
@@ -64,7 +64,7 @@ class Dashboard extends AbstractWidget
     /**
      * Load Pane items provided by all enabled modules
      *
-     * @return  self
+     * @return  $this
      */
     public function load()
     {
@@ -241,7 +241,7 @@ class Dashboard extends AbstractWidget
      *
      * @param string $title
      *
-     * @return self
+     * @return $this
      */
     public function createPane($title)
     {
@@ -278,7 +278,7 @@ class Dashboard extends AbstractWidget
      *
      * @param Pane $pane        The pane to add
      *
-     * @return self
+     * @return $this
      */
     public function addPane(Pane $pane)
     {
diff --git a/library/Icinga/Web/Widget/Dashboard/Dashlet.php b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
index 614caf845..d972cc5d6 100644
--- a/library/Icinga/Web/Widget/Dashboard/Dashlet.php
+++ b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
@@ -119,7 +119,7 @@ EOD;
      *
      * @param  string|Url $url  The url to use, either as an Url object or as a path
      *
-     * @return self
+     * @return $this
      */
     public function setUrl($url)
     {
diff --git a/library/Icinga/Web/Widget/Dashboard/Pane.php b/library/Icinga/Web/Widget/Dashboard/Pane.php
index b8edd0b52..5f973885f 100644
--- a/library/Icinga/Web/Widget/Dashboard/Pane.php
+++ b/library/Icinga/Web/Widget/Dashboard/Pane.php
@@ -78,7 +78,7 @@ class Pane extends UserWidget
      *
      * @param string $title     The new title to use for this pane
      *
-     * @return self
+     * @return $this
      */
     public function setTitle($title)
     {
@@ -198,7 +198,7 @@ class Pane extends UserWidget
      *                                                  (if a new dashlet will be created)
      * @param string|null $url                          An Url to be used when dashlet is a string
      *
-     * @return self
+     * @return $this
      * @throws \Icinga\Exception\ConfigurationError
      */
     public function addDashlet($dashlet, $url = null)
diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index a53e5aee3..be96b614e 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -87,7 +87,7 @@ class SortBox extends AbstractWidget
      *
      * @param Request $request The request to use for populating the form
      *
-     * @return static $this
+     * @return $this
      */
     public function applyRequest($request)
     {
diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index 28e3fd3bd..5132114f4 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -235,7 +235,7 @@ class Tab extends AbstractWidget
      *
      * @param  bool $active Whether the tab should be active
      *
-     * @return self
+     * @return $this
      */
     public function setActive($active = true)
     {
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index 70f0bd529..770f5093f 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -116,7 +116,7 @@ EOT;
      *
      * @param   string $name Name of the tab going to be activated
      *
-     * @return  self
+     * @return  $this
      *
      * @throws  ProgrammingError When the given tab name doesn't exist
      *
@@ -148,7 +148,7 @@ EOT;
      *
      * @param   string $name CSS class name(s)
      *
-     * @return  self
+     * @return  $this
      */
     public function setClass($name)
     {
@@ -194,7 +194,7 @@ EOT;
      * @param   string      $name   The new tab name
      * @param   array|Tab   $tab    The tab itself of its properties
      *
-     * @return  self
+     * @return  $this
      *
      * @throws  ProgrammingError When the tab name already exists
      */
@@ -219,7 +219,7 @@ EOT;
      * @param   string      $name   The new tab name
      * @param   array|Tab   $tab    The tab itself of its properties
      *
-     * @return  self
+     * @return  $this
      */
     public function set($name, $tab)
     {
@@ -236,7 +236,7 @@ EOT;
      *
      * @param   string  $name
      *
-     * @return  self
+     * @return  $this
      */
     public function remove($name)
     {
@@ -427,7 +427,7 @@ EOT;
      *
      * @param   Tabextension $tabextension
      *
-     * @return  self
+     * @return  $this
      */
     public function extend(Tabextension $tabextension)
     {
diff --git a/library/Icinga/Web/Wizard.php b/library/Icinga/Web/Wizard.php
index d25cd56e5..bede00313 100644
--- a/library/Icinga/Web/Wizard.php
+++ b/library/Icinga/Web/Wizard.php
@@ -92,7 +92,7 @@ class Wizard
      *
      * @param   Wizard  $wizard     The parent wizard
      *
-     * @return  self
+     * @return  $this
      */
     public function setParent(Wizard $wizard)
     {
@@ -144,7 +144,7 @@ class Wizard
      *
      * @param   Form|Wizard     $page   The page or wizard to add to the wizard
      *
-     * @return  self
+     * @return  $this
      */
     public function addPage($page)
     {
@@ -166,7 +166,7 @@ class Wizard
      *
      * @param   array   $pages      The pages or wizards to add to the wizard
      *
-     * @return  self
+     * @return  $this
      */
     public function addPages(array $pages)
     {
@@ -221,7 +221,7 @@ class Wizard
      *
      * @param   Form    $page   The page to set as current page
      *
-     * @return  self
+     * @return  $this
      */
     public function setCurrentPage(Form $page)
     {
@@ -504,7 +504,7 @@ class Wizard
      *
      * @param   bool    $state      Whether this wizard has been completed
      *
-     * @return  self
+     * @return  $this
      */
     public function setIsFinished($state = true)
     {
diff --git a/modules/monitoring/application/forms/Config/InstanceConfigForm.php b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
index c05dc41a9..b2baea89c 100644
--- a/modules/monitoring/application/forms/Config/InstanceConfigForm.php
+++ b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
@@ -60,7 +60,7 @@ class InstanceConfigForm extends ConfigForm
      *
      * @param   array   $values             The values to extend the configuration with
      *
-     * @return  self
+     * @return  $this
      *
      * @throws  InvalidArgumentException    In case the resource already exists
      */
diff --git a/modules/monitoring/application/views/helpers/CheckPerformance.php b/modules/monitoring/application/views/helpers/CheckPerformance.php
index 355be8c20..d72dee491 100644
--- a/modules/monitoring/application/views/helpers/CheckPerformance.php
+++ b/modules/monitoring/application/views/helpers/CheckPerformance.php
@@ -9,7 +9,7 @@ class Zend_View_Helper_CheckPerformance extends Zend_View_Helper_Abstract
     /**
      * Create dispatch instance
      *
-     * @return self
+     * @return $this
      */
     public function checkPerformance()
     {
diff --git a/modules/monitoring/application/views/helpers/Customvar.php b/modules/monitoring/application/views/helpers/Customvar.php
index 42fcd5b02..32391b6ce 100644
--- a/modules/monitoring/application/views/helpers/Customvar.php
+++ b/modules/monitoring/application/views/helpers/Customvar.php
@@ -6,7 +6,7 @@ class Zend_View_Helper_Customvar extends Zend_View_Helper_Abstract
     /**
      * Create dispatch instance
      *
-     * @return self
+     * @return $this
      */
     public function checkPerformance()
     {
diff --git a/modules/monitoring/application/views/helpers/RuntimeVariables.php b/modules/monitoring/application/views/helpers/RuntimeVariables.php
index dfb590f45..9134a9711 100644
--- a/modules/monitoring/application/views/helpers/RuntimeVariables.php
+++ b/modules/monitoring/application/views/helpers/RuntimeVariables.php
@@ -9,7 +9,7 @@ class Zend_View_Helper_RuntimeVariables extends Zend_View_Helper_Abstract
     /**
      * Create dispatch instance
      *
-     * @return self
+     * @return $this
      */
     public function runtimeVariables()
     {
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index c87025fdd..2e6bec024 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -199,7 +199,7 @@ abstract class IdoQuery extends DbQuery
      * @param string $columnOrAlias         The column or column alias to order by
      * @param int $dir                      The sort direction or null to use default direction
      *
-     * @return self                         Fluent interface
+     * @return $this                         Fluent interface
      */
     public function order($columnOrAlias, $dir = null)
     {
@@ -487,7 +487,7 @@ abstract class IdoQuery extends DbQuery
      *
      * @param $alias                                The alias of the column to require
      *
-     * @return self                                 Fluent interface
+     * @return $this                                 Fluent interface
      * @see    IdoQuery::requireVirtualTable        The method initializing required joins
      * @throws \Icinga\Exception\ProgrammingError   When an unknown column is requested
      */
@@ -522,7 +522,7 @@ abstract class IdoQuery extends DbQuery
      * Require a virtual table for the given table name if not already required
      *
      * @param  String $name         The table name to require
-     * @return self                 Fluent interface
+     * @return $this                 Fluent interface
      */
     protected function requireVirtualTable($name)
     {
@@ -549,7 +549,7 @@ abstract class IdoQuery extends DbQuery
      * This requires a join$Table() method to exist
      *
      * @param  String $table        The table to join by calling join$Table() in the concrete implementation
-     * @return self                 Fluent interface
+     * @return $this                 Fluent interface
      *
      * @throws \Icinga\Exception\ProgrammingError   If the join method for this table does not exist
      */
@@ -676,7 +676,7 @@ abstract class IdoQuery extends DbQuery
      *
      * @param   array $columns
      *
-     * @return  self
+     * @return  $this
      */
     public function columns(array $columns)
     {
diff --git a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
index e34035ee0..df29a6b50 100644
--- a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
@@ -239,7 +239,7 @@ class MonitoringBackend implements Selectable, Queryable, ConnectionInterface
     /**
      * Backend entry point
      *
-     * @return self
+     * @return $this
      */
     public function select()
     {
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
index f5bd9b786..197a3fdb1 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
@@ -55,7 +55,7 @@ class LocalCommandFile implements CommandTransportInterface
      *
      * @param   string $path
      *
-     * @return  self
+     * @return  $this
      */
     public function setPath($path)
     {
@@ -78,7 +78,7 @@ class LocalCommandFile implements CommandTransportInterface
      *
      * @param   string $openMode
      *
-     * @return  self
+     * @return  $this
      */
     public function setOpenMode($openMode)
     {
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
index 7710abb11..866497a5a 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
@@ -71,7 +71,7 @@ class RemoteCommandFile implements CommandTransportInterface
      *
      * @param   string $host
      *
-     * @return  self
+     * @return  $this
      */
     public function setHost($host)
     {
@@ -94,7 +94,7 @@ class RemoteCommandFile implements CommandTransportInterface
      *
      * @param   int $port
      *
-     * @return  self
+     * @return  $this
      */
     public function setPort($port)
     {
@@ -117,7 +117,7 @@ class RemoteCommandFile implements CommandTransportInterface
      *
      * @param   string $user
      *
-     * @return  self
+     * @return  $this
      */
     public function setUser($user)
     {
@@ -142,7 +142,7 @@ class RemoteCommandFile implements CommandTransportInterface
      *
      * @param   string $path
      *
-     * @return  self
+     * @return  $this
      */
     public function setPath($path)
     {
diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index d0766ed3c..b123b142d 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -44,7 +44,7 @@ class AdminAccountPage extends Form
      *
      * @param   array   $config
      *
-     * @return  self
+     * @return  $this
      */
     public function setResourceConfig(array $config)
     {
@@ -57,7 +57,7 @@ class AdminAccountPage extends Form
      *
      * @param   array   $config
      *
-     * @return  self
+     * @return  $this
      */
     public function setBackendConfig(array $config)
     {
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index 0ec1de30f..f3bce41fa 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -35,7 +35,7 @@ class AuthBackendPage extends Form
      *
      * @param   array   $config
      *
-     * @return  self
+     * @return  $this
      */
     public function setResourceConfig(array $config)
     {
diff --git a/modules/setup/application/forms/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php
index 9f4ed35a1..f92fce1c3 100644
--- a/modules/setup/application/forms/DatabaseCreationPage.php
+++ b/modules/setup/application/forms/DatabaseCreationPage.php
@@ -53,7 +53,7 @@ class DatabaseCreationPage extends Form
      *
      * @param   array   $config
      *
-     * @return  self
+     * @return  $this
      */
     public function setResourceConfig(array $config)
     {
@@ -66,7 +66,7 @@ class DatabaseCreationPage extends Form
      *
      * @param   array   $privileges     The privileges
      *
-     * @return  self
+     * @return  $this
      */
     public function setDatabaseSetupPrivileges(array $privileges)
     {
@@ -79,7 +79,7 @@ class DatabaseCreationPage extends Form
      *
      * @param   array   $privileges     The privileges
      *
-     * @return  self
+     * @return  $this
      */
     public function setDatabaseUsagePrivileges(array $privileges)
     {
diff --git a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
index 3635fc358..acb2cd9af 100644
--- a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
@@ -45,7 +45,7 @@ EOT;
      *
      * @param   array   $config
      *
-     * @return  self
+     * @return  $this
      */
     public function setResourceConfig(array $config)
     {
diff --git a/modules/setup/application/forms/RequirementsPage.php b/modules/setup/application/forms/RequirementsPage.php
index 3ce50b7f1..2237a04ed 100644
--- a/modules/setup/application/forms/RequirementsPage.php
+++ b/modules/setup/application/forms/RequirementsPage.php
@@ -32,7 +32,7 @@ class RequirementsPage extends Form
      *
      * @param   SetupWizard    $wizard
      *
-     * @return  self
+     * @return  $this
      */
     public function setWizard(SetupWizard $wizard)
     {
diff --git a/modules/setup/application/forms/SummaryPage.php b/modules/setup/application/forms/SummaryPage.php
index 18ffcebc8..c680eaf7c 100644
--- a/modules/setup/application/forms/SummaryPage.php
+++ b/modules/setup/application/forms/SummaryPage.php
@@ -64,7 +64,7 @@ class SummaryPage extends Form
      *
      * @param   array   $summary
      *
-     * @return  self
+     * @return  $this
      */
     public function setSummary(array $summary)
     {
diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index f9628484c..ebfa08a0b 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -127,7 +127,7 @@ class DbTool
     /**
      * Connect to the server
      *
-     * @return  self
+     * @return  $this
      */
     public function connectToHost()
     {
@@ -150,7 +150,7 @@ class DbTool
     /**
      * Connect to the database
      *
-     * @return  self
+     * @return  $this
      */
     public function connectToDb()
     {

From 9596b4fdf75188ee3470aa22a0ad3186fd6548aa Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 7 Apr 2015 15:03:40 +0200
Subject: [PATCH 1109/2920] Form: Make it possible to preserve default values
 during (auto)submission

---
 library/Icinga/Web/Form.php | 44 ++++++++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index e727567ee..faf77770c 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -33,6 +33,11 @@ use Icinga\Web\Form\Element\CsrfCounterMeasure;
  */
 class Form extends Zend_Form
 {
+    /**
+     * The suffix to append to a field's hidden default field name
+     */
+    const DEFAULT_SUFFIX = '_default';
+
     /**
      * Whether this form has been created
      *
@@ -731,6 +736,20 @@ class Form extends Zend_Form
             unset($el->autosubmit);
         }
 
+        if ($el->getAttrib('preserveDefault')) {
+            $el->addDecorator(
+                array('preserveDefault' => 'HtmlTag'),
+                array(
+                    'tag'   => 'input',
+                    'type'  => 'hidden',
+                    'name'  => $name . static::DEFAULT_SUFFIX,
+                    'value' => $el->getValue()
+                )
+            );
+
+            unset($el->preserveDefault);
+        }
+
         return $this->ensureElementAccessibility($el);
     }
 
@@ -814,6 +833,17 @@ class Form extends Zend_Form
     public function populate(array $defaults)
     {
         $this->create($defaults);
+
+        foreach ($this->getElements() as $name => $_) {
+            if (
+                array_key_exists($name, $defaults)
+                && array_key_exists($name . static::DEFAULT_SUFFIX, $defaults)
+                && $defaults[$name] === $defaults[$name . static::DEFAULT_SUFFIX]
+            ) {
+                unset($defaults[$name]);
+            }
+        }
+
         return parent::populate($defaults);
     }
 
@@ -900,10 +930,18 @@ class Form extends Zend_Form
     {
         $this->create($formData);
 
-        // Ensure that disabled elements are not overwritten (http://www.zendframework.com/issues/browse/ZF-6909)
         foreach ($this->getElements() as $name => $element) {
-            if ($element->getAttrib('disabled')) {
-                $formData[$name] = $element->getValue();
+            if (array_key_exists($name, $formData)) {
+                if ($element->getAttrib('disabled')) {
+                    // Ensure that disabled elements are not overwritten
+                    // (http://www.zendframework.com/issues/browse/ZF-6909)
+                    $formData[$name] = $element->getValue();
+                } elseif (
+                    array_key_exists($name . static::DEFAULT_SUFFIX, $formData)
+                    && $formData[$name] === $formData[$name . static::DEFAULT_SUFFIX]
+                ) {
+                    unset($formData[$name]);
+                }
             }
         }
 

From dc4d1246a99199b0713c80fe3c7af402e19b7a79 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 7 Apr 2015 15:05:57 +0200
Subject: [PATCH 1110/2920] Fix that the sql port does not change when updating
 the type of the database

fixes #7491
---
 application/forms/Config/Resource/DbResourceForm.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
index 7bf0cb8ff..0ee64eda3 100644
--- a/application/forms/Config/Resource/DbResourceForm.php
+++ b/application/forms/Config/Resource/DbResourceForm.php
@@ -49,6 +49,7 @@ class DbResourceForm extends Form
             'db',
             array(
                 'required'      => true,
+                'autosubmit'    => true,
                 'label'         => $this->translate('Database Type'),
                 'description'   => $this->translate('The type of SQL database'),
                 'multiOptions'  => $dbChoices
@@ -68,10 +69,11 @@ class DbResourceForm extends Form
             'number',
             'port',
             array(
-                'required'      => true,
-                'label'         => $this->translate('Port'),
-                'description'   => $this->translate('The port to use'),
-                'value'         => 3306
+                'required'          => true,
+                'preserveDefault'   => true,
+                'label'             => $this->translate('Port'),
+                'description'       => $this->translate('The port to use'),
+                'value'             => ! array_key_exists('db', $formData) || $formData['db'] === 'mysql' ? 3306 : 5432
             )
         );
         $this->addElement(

From 62bb35a71eaa768b00466706816563485d358aef Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 7 Apr 2015 15:06:32 +0200
Subject: [PATCH 1111/2920] Fix that the ldap port does not change when
 updating the encryption to use

fixes #8958
---
 .../forms/Config/Resource/LdapResourceForm.php      | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 07808b465..fea16c4e5 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -27,6 +27,10 @@ class LdapResourceForm extends Form
      */
     public function createElements(array $formData)
     {
+        $defaultPort = ! array_key_exists('encryption', $formData) || $formData['encryption'] !== Connection::LDAPS
+            ? 389
+            : 636;
+
         $this->addElement(
             'text',
             'name',
@@ -52,10 +56,11 @@ class LdapResourceForm extends Form
             'number',
             'port',
             array(
-                'required'      => true,
-                'label'         => $this->translate('Port'),
-                'description'   => $this->translate('The port of the LDAP server to use for authentication'),
-                'value'         => 389
+                'required'          => true,
+                'preserveDefault'   => true,
+                'label'             => $this->translate('Port'),
+                'description'       => $this->translate('The port of the LDAP server to use for authentication'),
+                'value'             => $defaultPort
             )
         );
         $this->addElement(

From 2882e2fd5eb74817e6b8743595877c94fa030cb7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 7 Apr 2015 16:14:03 +0200
Subject: [PATCH 1112/2920] Setup: Fix that not any privilege checks are
 working in the wizard

fixes #8929
---
 modules/setup/library/Setup/Utils/DbTool.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index ebfa08a0b..b08f42bf8 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -786,6 +786,6 @@ EOD;
             $privilegesGranted &= $query->fetchColumn() !== false;
         }
 
-        return $privilegesGranted;
+        return (bool) $privilegesGranted;
     }
 }

From 1c5a09158423ec85dccf356669e395ae89028272 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 7 Apr 2015 16:29:10 +0200
Subject: [PATCH 1113/2920] Generate filter in host and service lists

refs #8565
---
 .../controllers/HostsController.php           | 29 ++++++---------
 .../controllers/ServicesController.php        | 32 +++++-----------
 .../library/Monitoring/Object/HostList.php    | 14 +++++++
 .../library/Monitoring/Object/ObjectList.php  | 37 +++++++++++++++++--
 .../library/Monitoring/Object/ServiceList.php | 20 ++++++++++
 5 files changed, 88 insertions(+), 44 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 53b10e113..bee978637 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -125,17 +125,6 @@ class Monitoring_HostsController extends Controller
             'host_active_checks_enabled',
             'host_obsessing'*/
         ));
-        $unhandledObjects = $this->hostList->getUnhandledObjects();
-        $unhandledFilterExpressions = array();
-        foreach ($unhandledObjects as $object) {
-            $unhandledFilterExpressions[] = Filter::where('host', $object->getName());
-        }
-
-        $objectsInDowntime = $this->hostList->getObjectsInDowntime();
-        $downtimeFilterExpressions = array();
-        foreach ($objectsInDowntime as $object) {
-            $downtimeFilterExpressions[] = Filter::where('downtime_host', $object->getName());
-        }
 
         $acknowledgedObjects = $this->hostList->getAcknowledgedObjects();
         if (! empty($acknowledgedObjects)) {
@@ -161,16 +150,20 @@ class Monitoring_HostsController extends Controller
         $this->view->deleteCommentLink = Url::fromRequest()->setPath('monitoring/hosts/delete-comment');
         $this->view->stats = $hostStates;
         $this->view->objects = $this->hostList;
-        $this->view->unhandledObjects = $unhandledObjects;
-        $unhandledFilterQueryString = Filter::matchAny($unhandledFilterExpressions)->toQueryString();
+        $this->view->unhandledObjects = $this->hostList->getUnhandledObjects();
+        $this->view->problemObjects = $this->hostList->getProblemObjects();
+
         $this->view->acknowledgeUnhandledLink = Url::fromPath('monitoring/hosts/acknowledge-problem')
-            ->setQueryString($unhandledFilterQueryString);
+            ->setQueryString($this->hostList->getUnhandledObjects()->filterFromResult());
         $this->view->downtimeUnhandledLink = Url::fromPath('monitoring/hosts/schedule-downtime')
-            ->setQueryString($unhandledFilterQueryString);
-        $this->view->acknowledgedObjects = $acknowledgedObjects;
-        $this->view->objectsInDowntime = $objectsInDowntime;
+            ->setQueryString($this->hostList->getUnhandledObjects()->filterFromResult());
+        $this->view->downtimeLink = Url::fromPath('monitoring/hosts/schedule-downtime')
+            ->setQueryString($this->hostList->getProblemObjects()->filterFromResult());
+        $this->view->acknowledgedObjects = $this->hostList->getAcknowledgedObjects();
+        $this->view->objectsInDowntime = $this->hostList->getObjectsInDowntime();
         $this->view->inDowntimeLink = Url::fromPath('monitoring/list/downtimes')
-            ->setQueryString(Filter::matchAny($downtimeFilterExpressions)->toQueryString());
+            ->setQueryString($this->hostList->getObjectsInDowntime()->filterFromResult());
+
         $this->view->commentsLink = Url::fromRequest()->setPath('monitoring/list/comments');
     }
 
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 91da11968..9ea1ffcb3 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -17,6 +17,7 @@ use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Module\Monitoring\Object\ServiceList;
 use Icinga\Util\String;
 use Icinga\Web\Url;
+use Icinga\Web\UrlParams;
 use Icinga\Web\Widget\Chart\InlinePie;
 
 class Monitoring_ServicesController extends Controller
@@ -144,23 +145,6 @@ class Monitoring_ServicesController extends Controller
             'service_active_checks_enabled',
             'service_obsessing'*/
         ));
-        $unhandledObjects = $this->serviceList->getUnhandledObjects();
-        $unhandledFilterExpressions = array();
-        foreach ($unhandledObjects as $service) {
-            $unhandledFilterExpressions[] = Filter::matchAll(
-                Filter::where('host', $service->getHost()->getName()),
-                Filter::where('service', $service->getName())
-            );
-        }
-
-        $objectsInDowntime = $this->serviceList->getObjectsInDowntime();
-        $downtimeFilterExpressions = array();
-        foreach ($objectsInDowntime as $service) {
-            $downtimeFilterExpressions[] = Filter::matchAll(
-                Filter::where('downtime_host', $service->getHost()->getName()),
-                Filter::where('downtime_service', $service->getName())
-            );
-        }
 
         $acknowledgedObjects = $this->serviceList->getAcknowledgedObjects();
         if (! empty($acknowledgedObjects)) {
@@ -204,16 +188,18 @@ class Monitoring_ServicesController extends Controller
         $this->view->stats = $serviceStates;
         $this->view->hostStats = $hostStates;
         $this->view->objects = $this->serviceList;
-        $this->view->unhandledObjects = $unhandledObjects;
-        $unhandledFilterQueryString = Filter::matchAny($unhandledFilterExpressions)->toQueryString();
+        $this->view->unhandledObjects = $this->serviceList->getUnhandledObjects();
+        $this->view->problemObjects = $this->serviceList->getProblemObjects();
         $this->view->acknowledgeUnhandledLink = Url::fromPath('monitoring/services/acknowledge-problem')
-            ->setQueryString($unhandledFilterQueryString);
+            ->setQueryString($this->serviceList->getUnhandledObjects()->filterFromResult()->toQueryString());
         $this->view->downtimeUnhandledLink = Url::fromPath('monitoring/services/schedule-downtime')
-            ->setQueryString($unhandledFilterQueryString);
+            ->setQueryString($this->serviceList->getUnhandledObjects()->filterFromResult()->toQueryString());
+        $this->view->downtimeLink = Url::fromPath('monitoring/services/schedule-downtime')
+            ->setQueryString($this->serviceList->getProblemObjects()->filterFromResult()->toQueryString());
         $this->view->acknowledgedObjects = $acknowledgedObjects;
-        $this->view->objectsInDowntime = $objectsInDowntime;
+        $this->view->objectsInDowntime = $this->serviceList->getObjectsInDowntime();
         $this->view->inDowntimeLink = Url::fromPath('monitoring/list/downtimes')
-            ->setQueryString(Filter::matchAny($downtimeFilterExpressions)->toQueryString());
+            ->setQueryString($this->serviceList->getObjectsInDowntime()->filterFromResult()->toQueryString());
         $this->view->commentsLink = Url::fromRequest()
             ->setPath('monitoring/list/comments');
     }
diff --git a/modules/monitoring/library/Monitoring/Object/HostList.php b/modules/monitoring/library/Monitoring/Object/HostList.php
index b5235eb75..3f3dcee47 100644
--- a/modules/monitoring/library/Monitoring/Object/HostList.php
+++ b/modules/monitoring/library/Monitoring/Object/HostList.php
@@ -70,4 +70,18 @@ class HostList extends ObjectList
             '_'
         );
     }
+
+    /**
+     * Returns a Filter that matches all hosts in this list
+     *
+     * @return array    An
+     */
+    public function filterFromResult()
+    {
+        $filterExpression = array();
+        foreach ($this as $host) {
+            $filterExpression[] = Filter::where('host', $host->getName());
+        }
+        return FilterOr::matchAny($filterExpression);
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/Object/ObjectList.php b/modules/monitoring/library/Monitoring/Object/ObjectList.php
index 62a15173c..4a375e70d 100644
--- a/modules/monitoring/library/Monitoring/Object/ObjectList.php
+++ b/modules/monitoring/library/Monitoring/Object/ObjectList.php
@@ -94,7 +94,7 @@ abstract class ObjectList implements Countable, IteratorAggregate
                 $acknowledgedObjects[] = $object;
             }
         }
-        return $acknowledgedObjects;
+        return $this->newFromArray($acknowledgedObjects);
     }
 
     public function getObjectsInDowntime()
@@ -105,7 +105,7 @@ abstract class ObjectList implements Countable, IteratorAggregate
                 $objectsInDowntime[] = $object;
             }
         }
-        return $objectsInDowntime;
+        return $this->newFromArray($objectsInDowntime);
     }
 
     public function getUnhandledObjects()
@@ -116,6 +116,37 @@ abstract class ObjectList implements Countable, IteratorAggregate
                 $unhandledObjects[] = $object;
             }
         }
-        return $unhandledObjects;
+        return $this->newFromArray($unhandledObjects);
     }
+
+    /**
+     * @return ObjectList
+     */
+    public function getProblemObjects()
+    {
+        $handledObjects = array();
+        foreach ($this as $object) {
+            if ((bool) $object->problem === true) {
+                $handledObjects[] = $object;
+            }
+        }
+        return $this->newFromArray($handledObjects);
+    }
+
+    /**
+     * Create a ObjectList from an array of hosts without querying a backend
+     *
+     * @return ObjectList
+     */
+    protected function newFromArray(array $objects)
+    {
+        $class = get_called_class();
+        $list = new $class($this->backend);
+        $list->objects = $objects;
+        $list->count = count($objects);
+        $list->filter = $list->filterFromResult();
+        return $list;
+    }
+
+    abstract function filterFromResult();
 }
diff --git a/modules/monitoring/library/Monitoring/Object/ServiceList.php b/modules/monitoring/library/Monitoring/Object/ServiceList.php
index 4d0e053d7..28bcc2b3d 100644
--- a/modules/monitoring/library/Monitoring/Object/ServiceList.php
+++ b/modules/monitoring/library/Monitoring/Object/ServiceList.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Module\Monitoring\Object;
 
+use Icinga\Data\Filter\Filter;
+use Icinga\Data\Filter\FilterOr;
 use Icinga\Util\String;
 
 /**
@@ -113,4 +115,22 @@ class ServiceList extends ObjectList
             '_'
         );
     }
+
+    /**
+     * Returns a Filter that matches all hosts in this HostList
+     *
+     * @return Filter
+     */
+    public function filterFromResult()
+    {
+        $filterExpression = array();
+        foreach ($this as $service) {
+            $filterExpression[] = Filter::matchAll(
+                Filter::where('host', $service->getHost()->getName()),
+                Filter::where('service', $service->getName())
+            );
+        }
+        return FilterOr::matchAny($filterExpression);
+    }
 }
+

From 46da40445267394a38aec18549672291c94ddf28 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 7 Apr 2015 16:32:34 +0200
Subject: [PATCH 1114/2920] Add docstrings to ObjectList and coding style

---
 library/Icinga/Protocol/Ldap/Capability.php   |  3 +-
 library/Icinga/Util/Color.php                 |  3 +-
 .../library/Monitoring/Object/ObjectList.php  | 53 +++++++++++++++++++
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Capability.php b/library/Icinga/Protocol/Ldap/Capability.php
index 76d1f11a0..16825e4f2 100644
--- a/library/Icinga/Protocol/Ldap/Capability.php
+++ b/library/Icinga/Protocol/Ldap/Capability.php
@@ -9,7 +9,8 @@ namespace Icinga\Protocol\Ldap;
  * Provides information about the available encryption mechanisms (StartTLS), the supported
  * LDAP protocol (v2/v3), vendor-specific extensions or protocols controls and extensions.
  */
-class Capability {
+class Capability
+{
 
     const LDAP_SERVER_START_TLS_OID = '1.3.6.1.4.1.1466.20037';
 
diff --git a/library/Icinga/Util/Color.php b/library/Icinga/Util/Color.php
index 5bc2f2815..616bb308a 100644
--- a/library/Icinga/Util/Color.php
+++ b/library/Icinga/Util/Color.php
@@ -6,7 +6,8 @@ namespace Icinga\Util;
 /**
  * Provide functions to change and convert colors.
  */
-class Color {
+class Color
+{
     /**
      * Convert a given color string to an rgb-array containing
      * each color as a decimal value.
diff --git a/modules/monitoring/library/Monitoring/Object/ObjectList.php b/modules/monitoring/library/Monitoring/Object/ObjectList.php
index 4a375e70d..9d81be371 100644
--- a/modules/monitoring/library/Monitoring/Object/ObjectList.php
+++ b/modules/monitoring/library/Monitoring/Object/ObjectList.php
@@ -5,21 +5,40 @@ namespace Icinga\Module\Monitoring\Object;
 
 use ArrayIterator;
 use Countable;
+use Icinga\Data\Filter\Filter;
 use IteratorAggregate;
 use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 
 abstract class ObjectList implements Countable, IteratorAggregate
 {
+    /**
+     * @var string
+     */
     protected $dataViewName;
 
+    /**
+     * @var MonitoringBackend
+     */
     protected $backend;
 
+    /**
+     * @var array
+     */
     protected $columns;
 
+    /**
+     * @var Filter
+     */
     protected $filter;
 
+    /**
+     * @var array
+     */
     protected $objects;
 
+    /**
+     * @var int
+     */
     protected $count;
 
     public function __construct(MonitoringBackend $backend)
@@ -27,23 +46,39 @@ abstract class ObjectList implements Countable, IteratorAggregate
         $this->backend = $backend;
     }
 
+    /**
+     * @param array $columns
+     *
+     * @return $this
+     */
     public function setColumns(array $columns)
     {
         $this->columns = $columns;
         return $this;
     }
 
+    /**
+     * @return array
+     */
     public function getColumns()
     {
         return $this->columns;
     }
 
+    /**
+     * @param $filter
+     *
+     * @return $this
+     */
     public function setFilter($filter)
     {
         $this->filter = $filter;
         return $this;
     }
 
+    /**
+     * @return Filter
+     */
     public function getFilter()
     {
         return $this->filter;
@@ -51,6 +86,9 @@ abstract class ObjectList implements Countable, IteratorAggregate
 
     abstract protected function fetchObjects();
 
+    /**
+     * @return array
+     */
     public function fetch()
     {
         if ($this->objects === null) {
@@ -59,6 +97,9 @@ abstract class ObjectList implements Countable, IteratorAggregate
         return $this->objects;
     }
 
+    /**
+     * @return int
+     */
     public function count()
     {
         if ($this->count === null) {
@@ -86,6 +127,9 @@ abstract class ObjectList implements Countable, IteratorAggregate
         return $this->backend->select()->from('comment')->applyFilter($this->filter);
     }
 
+    /**
+     * @return ObjectList
+     */
     public function getAcknowledgedObjects()
     {
         $acknowledgedObjects = array();
@@ -97,6 +141,9 @@ abstract class ObjectList implements Countable, IteratorAggregate
         return $this->newFromArray($acknowledgedObjects);
     }
 
+    /**
+     * @return ObjectList
+     */
     public function getObjectsInDowntime()
     {
         $objectsInDowntime = array();
@@ -108,6 +155,9 @@ abstract class ObjectList implements Countable, IteratorAggregate
         return $this->newFromArray($objectsInDowntime);
     }
 
+    /**
+     * @return ObjectList
+     */
     public function getUnhandledObjects()
     {
         $unhandledObjects = array();
@@ -148,5 +198,8 @@ abstract class ObjectList implements Countable, IteratorAggregate
         return $list;
     }
 
+    /**
+     * @return Filter
+     */
     abstract function filterFromResult();
 }

From eeb5a38b6c3e982c34af2a8eceea841855a13655 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 7 Apr 2015 17:41:38 +0200
Subject: [PATCH 1115/2920] Add section for problem hosts and services to
 multi-view

Add a section to handle all problems, in contrast to the already existing section for handling all unhandled problems.

refs #8565
---
 .../views/scripts/hosts/show.phtml            |  88 ++++++++----
 .../partials/host/objects-header.phtml        |  31 +++--
 .../partials/service/objects-header.phtml     |  28 ++--
 .../views/scripts/services/show.phtml         | 126 +++++++++++-------
 4 files changed, 178 insertions(+), 95 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index cc62ba0f8..656cf9f47 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -8,7 +8,7 @@
 
     <br>
     <div class="hbox-item">
-        <?= $this->translate('Host States:') ?>
+        <?= $this->translate('States:') ?>
         &nbsp;<?= $hostStatesPieChart; ?>
     </div>
 
@@ -21,7 +21,11 @@
         <?= $this->icon('reschedule') ?>
         <?= $this->translate('Commands') ?>
     </h3>
-    <?= sprintf($this->translate('Issue commands to all %d selected hosts:'), count($objects)) ?>
+    <?= sprintf($this->translatePlural(
+        'Issue commands to %s selected host:',
+        'Issue commands to all %s selected hosts:',
+        count($objects)
+    ), '<b>' . count($objects) . '</b>') ?>
 
     <?php if (($hostCount = count($objects)) === 0): ?>
         <?= $this->translate('No hosts matching the filter'); ?>
@@ -69,29 +73,66 @@
         </div>
       </p>
 
-      <?php if (($unhandledCount = count($unhandledObjects)) > 0): ?>
+        <?php
+            $unhandledCount = count($unhandledObjects);
+            $problemCount = count($problemObjects);
+        ?>
+
+        <?php if ($problemCount || $unhandledCount): ?>
         <div>
             <h3>
                 <?= $this->icon('attention-alt') ?>
                 <?= $this->translatePlural(
-                    'Unhandled Problem',
-                    'Unhandled Problems',
-                    $unhandledCount
+                    'Problem',
+                    'Problems',
+                    $unhandledCount + $problemCount
                 ) ?>
             </h3>
 
+            <?php if ($problemCount): ?>
+                <p>
+                    <?= sprintf(
+                        $this->translatePlural(
+                            'There is %s problem, issue commands to the problematic host:',
+                            'There are %s problems, issue commands to the problematic hosts:',
+                            $problemCount
+                        ),
+                        '<b>' . $problemCount . '</b>'
+                    ); ?>
 
+                <div><?= $this->qlink(
+                        sprintf(
+                            $this->translatePlural(
+                                'Schedule a downtime for %u problem host',
+                                'Schedule a downtime for %u problem hosts',
+                                $problemCount
+                            ),
+                            $problemCount
+                        ),
+                        $downtimeLink,
+                        null,
+                        array('icon' => 'plug')
+                    ); ?></div>
+
+                </p>
+            <?php endif; ?>
+
+            <?php if ($unhandledCount): ?>
             <p>
               <?= sprintf(
-                  $this->translate('There are %s unhandled problems. Issue commands to the problematic hosts:'),
+                  $this->translatePlural(
+                      'There is %s unhandled problem host, issue commands to the problematic host:',
+                      'There are %s unhandled problem hosts, issue commands to the problematic hosts:',
+                      $unhandledCount
+                  ),
                   '<span class="badge badge-critical">' . $unhandledCount . '</span>'
-              ) ?>
+              ); ?>
 
               <div><?= $this->qlink(
                   sprintf(
                       $this->translatePlural(
-                          'Schedule a downtime for %u host',
-                          'Schedule a downtime for %u hosts',
+                          'Schedule a downtime for %u unhandled problem host',
+                          'Schedule a downtime for %u unhandled problem hosts',
                           $unhandledCount
                       ),
                       $unhandledCount
@@ -105,8 +146,8 @@
               <div><?= $this->qlink(
                     sprintf(
                         $this->translatePlural(
-                            'Acknowledge %u unhandled host',
-                            'Acknowledge %u unhandled hosts',
+                            'Acknowledge %u unhandled problem host',
+                            'Acknowledge %u unhandled problem hosts',
                             $unhandledCount
                         ),
                         $unhandledCount
@@ -115,11 +156,12 @@
                     null,
                     array('icon' => 'ok')
               ); ?></div>
-
             </p>
 
+            <?php endif; ?>
+
         </div>
-      <?php endif ?>
+        <?php endif;?>
 
       <?php if (($acknowledgedCount = count($acknowledgedObjects)) > 0): ?>
         <div>
@@ -127,11 +169,11 @@
 
             <p><?= sprintf(
                 $this->translatePlural(
-                    '%u Acknowledged Host Problem',
-                    '%u Acknowledged Host Problems',
+                    '%s Acknowledged Host Problem',
+                    '%s Acknowledged Host Problems',
                     $acknowledgedCount
                 ),
-                $acknowledgedCount
+                '<b>' . $acknowledgedCount . '</b>'
             ); ?></p>
 
             <?= $removeAckForm ?>
@@ -143,11 +185,11 @@
         <h3><?= $this->icon('plug', $this->translate('Downtimes'))?> <?=$this->translate('Downtimes')?></h3>
         <p><?= sprintf(
                 $this->translatePlural(
-                    '%u Host currently in downtime.',
-                    '%u Hosts currently in downtime.',
+                    '%s Host currently in downtime.',
+                    '%s Hosts currently in downtime.',
                     $inDowntimeCount
                 ),
-                $inDowntimeCount
+                '<b>' . $inDowntimeCount . '</b>'
         ) ?>   <?= $this->qlink(
                 $this->translate('List all'),
                 $inDowntimeLink,
@@ -163,11 +205,11 @@
         <p>
             <?= sprintf(
                 $this->translatePlural(
-                    'There is %u host comment.',
-                    'There are %u host comments.',
+                    'There is %s host comment.',
+                    'There are %s host comments.',
                     $commentCount
                 ),
-                $commentCount
+                '<b>' . $commentCount . '</b>'
             ) ?>
 
             <?= $this->qlink(
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index d2ce6a500..0b20cc766 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -59,21 +59,24 @@ $hiddenRich = array();
             </tr>
         <?php endforeach ?>
 
-        <?php if (count($hidden)): ?>
-            <tr>
-                <td class="state">
-                    <div data-title-rich="<span align='left'><?= join('<br>', $hiddenRich) ?></span>"
-                         title="<?= join(', ', $hidden) ?>">
-
-                        <?= $this->qlink(
-                            sprintf($this->translate('%d more ...'), count($hidden)),
+        <tr>
+            <td class="state">
+                <div data-title-rich="<span align='left'><?= join('<br>', $hiddenRich) ?></span>"
+                     title="<?= join(', ', $hidden) ?>">
+                        <?php
+                        echo $this->qlink(
+                            count($hidden) ? sprintf(
+                                $this->translate('%d more ...'),
+                                count($hidden)
+                            ) : $this->translate('list all ...'),
                             $listAllLink,
-                            null
-                        ) ?>
-                    </div>
-                </td>
-            </tr>
-        <?php endif ?>
+                            null,
+                            array('data-base-target' => '_next')
+                        );
+                        ?>
+                </div>
+            </td>
+        </tr>
 
         </tbody>
     </table>
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index 24524954c..57d1b67e6 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -60,21 +60,25 @@ use Icinga\Module\Monitoring\Object\Service;
         </tr>
     <?php endforeach ?>
 
-    <?php if (count($hidden)): ?>
-        <tr>
+    <tr>
         <td class="state">
-        <div data-title-rich="<span align='left'><?= join('<br>', $hiddenRich) ?></span>"
-              title="<?= join(', ', $hidden) ?>">
+            <div data-title-rich="<span align='left'><?= join('<br>', $hiddenRich) ?></span>"
+                 title="<?= join(', ', $hidden) ?>">
 
-              <?= $this->qlink(
-                  sprintf($this->translate('%d more ...'), count($hidden)),
-                  $listAllLink,
-                  null
-              ) ?>
-        </div>
+                <?php
+                echo $this->qlink(
+                    count($hidden) ? sprintf(
+                        $this->translate('%d more ...'),
+                        count($hidden)
+                    ) : $this->translate('list all ...'),
+                    $listAllLink,
+                    null,
+                    array('data-base-target' => '_next')
+                );
+                ?>
+            </div>
         </td>
-        </tr>
-    <?php endif ?>
+    </tr>
 
     </tbody>
     </table>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index ce6b1131c..c252d829d 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -7,11 +7,11 @@
     <?= $this->render('list/components/servicesummary.phtml') ?>
     <br>
     <div class="hbox-item">
-        <?= $this->translate('Service States:') ?>
+        <?= $this->translate('Service states:') ?>
         &nbsp;<?= $serviceStatesPieChart; ?>
     </div>
     <div class="hbox-item">
-        <?= $this->translate('Host States:') ?>
+        <?= $this->translate('Host states:') ?>
         &nbsp;<?= $hostStatesPieChart; ?>
     </div>
 
@@ -27,7 +27,11 @@
     <?php if (($serviceCount = count($objects)) === 0): ?>
         <?= $this->translate('No services matching the filter'); ?>
     <?php else: ?>
-        <?= sprintf($this->translate('Issue commands to all %d selected services:'), count($objects)) ?>
+        <?= sprintf($this->translatePlural(
+            'Issue commands to %s selected service:',
+            'Issue commands to all %s selected services:',
+            count($objects)
+        ), '<b>' . count($objects) . '</b>') ?>
 
         <p>
         <div>
@@ -71,65 +75,95 @@
         </div>
         </p>
 
-        <?php if (($unhandledCount = count($unhandledObjects)) > 0): ?>
+        <?php
+            $unhandledCount = count($unhandledObjects);
+            $problemCount = count($problemObjects);
+        ?>
+
+        <?php if ($problemCount || $unhandledCount): ?>
         <div>
             <h3>
                 <?= $this->icon('attention-alt') ?>
-                    <?= $this->translatePlural(
-                            'Unhandled Problem',
-                            'Unhandled Problems',
-                            $unhandledCount
-                    ) ?>
+                <?= $this->translate('Problems') ?>
             </h3>
 
-            <p><?= sprintf($this->translate('There are %s unhandled problems. ' .
-                    'Issue commands to the problematic services:'),
-                    '<span class="badge badge-critical">' . $unhandledCount . '</span>') ?>
+            <?php if ($problemCount): ?>
+                <p>
+                    <?= sprintf(
+                        $this->translatePlural(
+                            'There is %s problem, issue commands to the problem service',
+                            'There are %s problems, issue commands to the problem services',
+                            $problemCount
+                        ),
+                        '<b>' . $problemCount . '</b>'
+                    ); ?>
 
                 <div>
-                <?= $this->qlink(
-                    sprintf(
-                        $this->translatePlural(
-                            'Schedule a downtime for %u unhandled service problem',
-                            'Schedule a downtime for %u unhandled service problems',
-                            $unhandledCount
+                    <?= $this->qlink(
+                        sprintf(
+                            $this->translatePlural(
+                                'Schedule a downtime for %s problem service',
+                                'Schedule downtimes for %s problem services',
+                                $problemCount
+                            ),
+                            $problemCount
                         ),
-                        $unhandledCount
-                    ),
-                    $downtimeUnhandledLink,
-                    null,
-                    array('icon' => 'plug')
-                ); ?>
+                        $downtimeLink,
+                        null,
+                        array('icon' => 'plug')
+                    ); ?>
                 </div>
+            <?php endif ?>
 
-                <div><?= $this->qlink(
-                    sprintf(
-                        $this->translatePlural(
-                            'Acknowledge %u unhandled service problem',
-                            'Acknowledge %u unhandled service problems',
+            <?php if ($unhandledCount): ?>
+                <p><?= sprintf($this->translate('There are %s unhandled problems. ' .
+                        'Issue commands to the problematic services:'),
+                        '<span class="badge badge-critical">' . $unhandledCount . '</span>') ?>
+                    <div>
+                    <?= $this->qlink(
+                        sprintf(
+                            $this->translatePlural(
+                                'Schedule a downtime for %u unhandled service problem',
+                                'Schedule a downtime for %u unhandled service problems',
+                                $unhandledCount
+                            ),
                             $unhandledCount
                         ),
-                        $unhandledCount
-                    ),
-                    $acknowledgeUnhandledLink,
-                    null,
-                    array('icon' => 'ok')
-                ); ?></div>
-            </p>
+                        $downtimeUnhandledLink,
+                        null,
+                        array('icon' => 'plug')
+                    ); ?>
+                    </div>
+
+                    <div><?= $this->qlink(
+                        sprintf(
+                            $this->translatePlural(
+                                'Acknowledge %u unhandled service problem',
+                                'Acknowledge %u unhandled service problems',
+                                $unhandledCount
+                            ),
+                            $unhandledCount
+                        ),
+                        $acknowledgeUnhandledLink,
+                        null,
+                        array('icon' => 'ok')
+                    ); ?></div>
+                </p>
+            <?php endif ?>
 
         </div>
-    <?php endif ?>
+        <?php endif; ?>
 
     <?php if (($acknowledgedCount = count($acknowledgedObjects)) > 0): ?>
         <h3><?= $this->icon('ok', $this->translate('Acknowledgements')) ?> <?= $this->translate('Acknowledgements') ?></h3>
         <p>
             <?= sprintf(
                 $this->translatePlural(
-                    '%u Acknowledged Service Problem.',
-                    '%u Acknowledged Service Problems.',
+                    '%s Acknowledged Service Problem.',
+                    '%s Acknowledged Service Problems.',
                     $acknowledgedCount
                 ),
-                $acknowledgedCount
+                '<b>' . $acknowledgedCount . '</b>'
             ); ?> <?= $removeAckForm ?>
         </p>
     <?php endif ?>
@@ -138,10 +172,10 @@
     <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0 /*&& $auth->hasPermission('monitoring/command/comment/delete')*/): ?>
         <h3>  <?= $this->icon('plug', $this->translate('Downtimes')) ?> <?= $this->translate('Downtimes') ?>  </h3>
         <p> <?= sprintf($this->translatePlural(
-                '%u service currently in downtime.',
-                '%u services currently in downtime.',
+                '%s service currently in downtime.',
+                '%s services currently in downtime.',
                 $inDowntimeCount
-            ), $inDowntimeCount) ?>
+            ), '<b>' . $inDowntimeCount) . '</b>' ?>
 
             <?= $this->qlink(
                 $this->translate('List all'),
@@ -158,10 +192,10 @@
     <h3> <?= $this->icon('comment') ?> <?= $this->translate('Comments') ?> </h3>
     <p><?= sprintf(
             $this->translatePlural(
-                'There is %d comment.',
-                'There are %d comments.',
+                'There is %s comment.',
+                'There are %s comments.',
                 $commentCount
-            ), $commentCount);
+            ), '<b>' . $commentCount . '</b>');
     ?>
     <?= $this->qlink(
         $this->translate('List all'),

From 028c3ba08c3369fc6fa21d9e7bac8ae50ddd7821 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 7 Apr 2015 17:43:45 +0200
Subject: [PATCH 1116/2920] Fix list-all link in host multi views opened from a
 service-selection

refs #8565
---
 modules/monitoring/application/controllers/HostsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index bee978637..070f4f75c 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -58,7 +58,7 @@ class Monitoring_HostsController extends Controller
             )
         )->activate('show');
 
-        $this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/hosts');
+        $this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/hosts')->setQueryString($filterString);
     }
 
     protected function handleCommandForm(ObjectsCommandForm $form)

From 9ac89edb86b15c3f6db61f3a0c65d0332a9f8b6d Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 7 Apr 2015 18:00:36 +0200
Subject: [PATCH 1117/2920] Add filter to summary links

Add the multiselection filter as a base filter to the state summary, to ensure that the summary links only selected services.

refs #8565
---
 .../controllers/HostsController.php           |  1 +
 .../controllers/ServicesController.php        |  1 +
 .../list/components/hostssummary.phtml        | 80 ++++++++++++-------
 .../list/components/servicesummary.phtml      | 65 +++++++++------
 .../partials/host/servicesummary.phtml        |  9 +++
 .../library/Monitoring/Object/HostList.php    |  2 +
 6 files changed, 107 insertions(+), 51 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 070f4f75c..1da2a95e6 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -165,6 +165,7 @@ class Monitoring_HostsController extends Controller
             ->setQueryString($this->hostList->getObjectsInDowntime()->filterFromResult());
 
         $this->view->commentsLink = Url::fromRequest()->setPath('monitoring/list/comments');
+        $this->view->baseFilter = $this->hostList->getFilter();
     }
 
     /**
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 9ea1ffcb3..789a5fda5 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -202,6 +202,7 @@ class Monitoring_ServicesController extends Controller
             ->setQueryString($this->serviceList->getObjectsInDowntime()->filterFromResult()->toQueryString());
         $this->view->commentsLink = Url::fromRequest()
             ->setPath('monitoring/list/comments');
+        $this->view->baseFilter = $this->serviceList->getFilter();
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
index fc7d30867..418a64906 100644
--- a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
@@ -1,6 +1,17 @@
 <?php
 
 use Icinga\Web\Url;
+use Icinga\Data\Filter\Filter;
+
+function urlAddFilterOptional($url, $filter, $optional) {
+    $url = Url::fromPath($url);
+    $f = $filter;
+    if (isset($optional)) {
+        $f = Filter::matchAll($filter, $optional);
+    }
+    return $url->setQueryString($f->toQueryString());
+}
+$this->baseFilter = isset($this->baseFilter) ? $this->baseFilter : null;
 
 $selfUrl = 'monitoring/list/hosts';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
@@ -10,17 +21,22 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
     <?php if ($this->stats->hosts_up): ?>
     <span class="state ok<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 0))->getRelativeUrl() ? ' active' : ''; ?>">
         <?= $this->qlink(
-            $this->stats->hosts_up,
-            $selfUrl,
-            array('host_state' => 0),
-            array('title' => sprintf(
-                $this->translatePlural(
-                    'List %u host that is currently in state UP',
-                    'List %u hosts which are currently in state UP',
-                    $this->stats->hosts_up
+                $this->stats->hosts_up,
+                urlAddFilterOptional(
+                    $selfUrl,
+                    Filter::where('host_state', 0),
+                    $this->baseFilter
                 ),
-                $this->stats->hosts_up
-            ))
+                null,
+                array('title' => sprintf(
+                    $this->translatePlural(
+                        'List %u host that is currently in state UP',
+                        'List %u hosts which are currently in state UP',
+                        $this->stats->hosts_up
+                    ),
+                    $this->stats->hosts_up
+                )
+            )
         ); ?>
     </span>
     <?php endif; ?>
@@ -29,11 +45,12 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
     <span class="state critical<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 1, 'host_unhandled' => 1))->getRelativeUrl() ? ' active' : ''; ?>">
         <?= $this->qlink(
             $this->stats->hosts_down_unhandled,
-            $selfUrl,
-            array(
-                'host_state'        => 1,
-                'host_unhandled'    => 1
+            urlAddFilterOptional(
+                $selfUrl,
+                Filter::matchAll(Filter::where('host_state', 1), Filter::where('host_unhandled', 1)),
+                $this->baseFilter
             ),
+            null,
             array('title' => sprintf(
                 $this->translatePlural(
                     'List %u host that is currently in state DOWN',
@@ -49,11 +66,12 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
     <span class="state handled critical<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 1, 'host_unhandled' =>0))->getRelativeUrl() ? ' active' : ''; ?>">
         <?= $this->qlink(
             $this->stats->hosts_down_handled,
-            $selfUrl,
-            array(
-                'host_state'        => 1,
-                'host_unhandled'    => 0
+            urlAddFilterOptional(
+                $selfUrl,
+                Filter::matchAll(Filter::where('host_state', 1), Filter::where('host_unhandled', 1)),
+                $this->baseFilter
             ),
+            null,
             array('title' => sprintf(
                 $this->translatePlural(
                     'List %u host that is currently in state DOWN (Acknowledged)',
@@ -74,11 +92,12 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
     <span class="state unknown<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 2, 'host_unhandled' => 1))->getRelativeUrl() ? ' active' : ''; ?>">
         <?= $this->qlink(
             $this->stats->hosts_unreachable_unhandled,
-            $selfUrl,
-            array(
-                'host_state'        => 2,
-                'host_unhandled'    => 1
+            urlAddFilterOptional(
+                $selfUrl,
+                Filter::matchAll(Filter::where('host_state', 2), Filter::where('host_unhandled', 1)),
+                $this->baseFilter
             ),
+            null,
             array('title' => sprintf(
                 $this->translatePlural(
                     'List %u host that is currently in state UNREACHABLE',
@@ -94,11 +113,12 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
     <span class="state handled unknown<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 2, 'host_unhandled' => 0))->getRelativeUrl() ? ' active' : '' ?>">
         <?= $this->qlink(
             $this->stats->hosts_unreachable_handled,
-            $selfUrl,
-            array(
-                'host_state'        => 2,
-                'host_unhandled'    => 0
+            urlAddFilterOptional(
+                $selfUrl,
+                Filter::matchAll(Filter::where('host_state', 2), Filter::where('host_unhandled', 0)),
+                $this->baseFilter
             ),
+            null,
             array('title' => sprintf(
                 $this->translatePlural(
                     'List %u host that is currently in state UNREACHABLE (Acknowledged)',
@@ -119,8 +139,12 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
     <span class="state pending<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 99))->getRelativeUrl() ? ' active' : ''; ?>">
         <?= $this->qlink(
             $this->stats->hosts_pending,
-            $selfUrl,
-            array('host_state' => 99),
+            urlAddFilterOptional(
+                $selfUrl,
+                Filter::where('host_state', 99),
+                $this->baseFilter
+            ),
+            null,
             array('title' => sprintf(
                 $this->translatePlural(
                     'List %u host that is currently in state PENDING',
diff --git a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
index 0554fcfd4..76a51de92 100644
--- a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
@@ -1,8 +1,19 @@
 <?php
 
+use Icinga\Data\Filter\Filter;
 use Icinga\Web\Url;
 use Icinga\Module\Monitoring\Object\Service;
 
+function urlAddFilterOptional($url, $filter, $optional) {
+    $url = Url::fromPath($url);
+    $f = $filter;
+    if (isset($optional)) {
+        $f = Filter::matchAll($filter, $optional);
+    }
+    return $url->setQueryString($f->toQueryString());
+}
+$this->baseFilter = isset($this->baseFilter) ? $this->baseFilter : null;
+
 $selfUrl = 'monitoring/list/services';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
 ?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
@@ -10,19 +21,21 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
 <span class="badges">
 <?php if ($this->stats->services_ok): ?>
 <span class="state ok<?= $currentUrl === Url::fromPath($selfUrl, array('service_state' => 0))->getRelativeUrl() ? ' active' : ''; ?>">
-    <?= $this->qlink(
-        $this->stats->services_ok,
-        $selfUrl,
-        array('service_state' => 0),
-        array('title' => sprintf(
-            $this->translatePlural(
-                'List %u service that is currently in state OK',
-                'List %u services which are currently in state OK',
+    <?=
+        $this->qlink(
+            $this->stats->services_ok,
+            urlAddFilterOptional($selfUrl, Filter::where('service_state', 0), $this->baseFilter),
+            null,
+            array('title' => sprintf(
+                $this->translatePlural(
+                    'List %u service that is currently in state OK',
+                    'List %u services which are currently in state OK',
+                    $this->stats->services_ok
+                ),
                 $this->stats->services_ok
-            ),
-            $this->stats->services_ok
-        ))
-    ); ?>
+            ))
+        );
+    ?>
 </span>
 <?php endif ?>
 <?php
@@ -31,12 +44,18 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
     if ($this->stats->$pre) {
         $handled = $pre . '_handled';
         $unhandled = $pre . '_unhandled';
-        $paramsHandled = array('service_state' => $stateId, 'service_handled' => 1);
-        $paramsUnhandled = array('service_state' => $stateId, 'service_handled' => 0);
+        $paramsHandled = Filter::matchAll(
+            Filter::where('service_state', $stateId),
+            Filter::where('service_handled', 1)
+        );
+        $paramsUnhandled = Filter::matchAll(
+            Filter::where('service_state', $stateId),
+            Filter::where('service_handled', 0)
+        );
         if ($this->stats->$unhandled) {
-            $compareUrl = Url::fromPath($selfUrl, $paramsUnhandled)->getRelativeUrl();
+            $compareUrl = Url::fromPath($selfUrl)->setQueryString($paramsUnhandled->toQueryString())->getRelativeUrl();
         } else {
-            $compareUrl = Url::fromPath($selfUrl, $paramsHandled)->getRelativeUrl();
+            $compareUrl = Url::fromPath($selfUrl)->setQueryString($paramsUnhandled->toQueryString())->getRelativeUrl();
         }
 
         if ($compareUrl === $currentUrl) {
@@ -50,8 +69,8 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
 
             echo $this->qlink(
                 $this->stats->$unhandled,
-                $selfUrl,
-                $paramsUnhandled,
+                urlAddFilterOptional($selfUrl, $paramsUnhandled, $this->baseFilter),
+                null,
                 array('title' => sprintf(
                     $this->translatePlural(
                         'List %u service that is currently in state %s',
@@ -65,7 +84,7 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
         }
         if ($this->stats->$handled) {
 
-            if (Url::fromPath($selfUrl, $paramsHandled)->getRelativeUrl() === $currentUrl) {
+            if (Url::fromPath($selfUrl)->setQueryString($paramsHandled->toQueryString())->getRelativeUrl() === $currentUrl) {
                 $active = ' active';
             } else {
                 $active = '';
@@ -75,8 +94,8 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
             }
             echo $this->qlink(
                 $this->stats->$handled,
-                $selfUrl,
-                $paramsHandled,
+                urlAddFilterOptional($selfUrl, $paramsHandled, $this->baseFilter),
+                null,
                 array('title' => sprintf(
                     $this->translatePlural(
                         'List %u service that is currently in state %s (Acknowledged)',
@@ -99,8 +118,8 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
 <span class="state pending<?= $currentUrl === Url::fromPath($selfUrl, array('service_state' => 99))->getRelativeUrl() ? ' active' : ''; ?>">
     <?= $this->qlink(
         $this->stats->services_pending,
-        $selfUrl,
-        array('service_state' => 99),
+        urlAddFilterOptional($selfUrl, Filter::where('service_state', 99), $this->baseFilter),
+        null,
         array('title' => sprintf(
             $this->translatePlural(
                 'List %u service that is currently in state PENDING',
diff --git a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
index bdd4d9af7..04408808f 100644
--- a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
@@ -3,6 +3,15 @@
 use Icinga\Web\Url;
 use Icinga\Module\Monitoring\Object\Service;
 
+function urlAddFilterOptional($url, $filter, $optional) {
+    $url = Url::fromPath($url);
+    $f = $filter;
+    if (isset($optional)) {
+        $f = Filter::matchAll($filter, $optional);
+    }
+    return $url->setQueryString($f->toQueryString());
+}
+
 $selfUrl = Url::fromPath('monitoring/show/services', array('host' => $object->host_name));
 $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
 ?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
diff --git a/modules/monitoring/library/Monitoring/Object/HostList.php b/modules/monitoring/library/Monitoring/Object/HostList.php
index 3f3dcee47..40dc002df 100644
--- a/modules/monitoring/library/Monitoring/Object/HostList.php
+++ b/modules/monitoring/library/Monitoring/Object/HostList.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Module\Monitoring\Object;
 
+use Icinga\Data\Filter\Filter;
+use Icinga\Data\Filter\FilterOr;
 use Icinga\Util\String;
 
 /**

From 1835479738ab1a45a0892c6b3dd301d27059e58e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 8 Apr 2015 08:55:08 +0200
Subject: [PATCH 1118/2920] Setup: Fix that the mysql privilege checks are not
 working in the wizard

Missed to commit this yesterday as part of the fix for #8929

refs #8929
---
 modules/setup/library/Setup/Utils/DbTool.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index b08f42bf8..3dd450d9c 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -691,7 +691,7 @@ EOD;
             . ' AND ' . $privilegeCondition . ($requireGrants ? " AND is_grantable = 'YES'" : ''),
             array(':grantee' => $grantee)
         );
-        return (int) $query->fetchObject()->matches === count($mysqlPrivileges);
+        return $query->fetchObject()->matches === count($mysqlPrivileges);
     }
 
     /**

From 6e6aabedf20575cbc9a17b08e8c85aa87c47b6fe Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 8 Apr 2015 09:31:11 +0200
Subject: [PATCH 1119/2920] Don't trim filter expressions

Leading and trailing whitespaces may be significant for comparison.

refs #8777
---
 library/Icinga/Data/Filter/FilterExpression.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/library/Icinga/Data/Filter/FilterExpression.php b/library/Icinga/Data/Filter/FilterExpression.php
index 5b580fa38..8ef1e5076 100644
--- a/library/Icinga/Data/Filter/FilterExpression.php
+++ b/library/Icinga/Data/Filter/FilterExpression.php
@@ -12,7 +12,6 @@ class FilterExpression extends Filter
     public function __construct($column, $sign, $expression)
     {
         $column = trim($column);
-        $expression = is_array($expression) ? array_map('trim', $expression) : trim($expression);
         $this->column = $column;
         $this->sign = $sign;
         $this->expression = $expression;

From a18510792738440b589e6f9f9b2c97d2001e1448 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 8 Apr 2015 10:14:42 +0200
Subject: [PATCH 1120/2920] Trim off leading whitespaces from filter values
 when searching

Because whitespaces may be used when searching for entities using the query string format "column = value" we have to trim off leading whitespaces from filter values.
This loses the possibility for search for entities with leading whitespaces of course.

refs #8777
---
 library/Icinga/Web/Widget/FilterEditor.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 2575ce264..735fd14d3 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -201,13 +201,13 @@ class FilterEditor extends AbstractWidget
                 if ($searchCol === null) {
                     throw new Exception('Cannot search here');
                 }
+                $search = ltrim($search);
                 $filter = $this->mergeRootExpression($filter, $searchCol, '=', "*$search*");
 
             } else {
                 list($k, $v) = preg_split('/=/', $search);
-                $filter = $this->mergeRootExpression($filter, $k, '=', $v);
+                $filter = $this->mergeRootExpression($filter, trim($k), '=', ltrim($v));
             }
-
             $url = $this->url()->setQueryString(
                 $filter->toQueryString()
             )->addParams($preserve);

From 09acddb3b7c8d4adc647e79b16cf294adbf07725 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 8 Apr 2015 10:18:42 +0200
Subject: [PATCH 1121/2920] Fix filter tests not taking whitespaces into
 account

refs #8777
---
 .../library/Icinga/Data/Filter/FilterTest.php | 55 ++++++++++++++++---
 1 file changed, 46 insertions(+), 9 deletions(-)

diff --git a/test/php/library/Icinga/Data/Filter/FilterTest.php b/test/php/library/Icinga/Data/Filter/FilterTest.php
index e14decb20..8080d47f7 100644
--- a/test/php/library/Icinga/Data/Filter/FilterTest.php
+++ b/test/php/library/Icinga/Data/Filter/FilterTest.php
@@ -198,16 +198,53 @@ class FilterTest extends BaseTestCase
         $this->assertNotEquals((string) $c, (string) $d);
     }
 
-    public function testLeadingAndTrailingWhitespacesSanitizing()
+    public function testLeadingAndTrailingWhitespaces()
     {
-        $columnHasWhitespaces = Filter::where(' host ', 'localhost');
-        $expressionHasWhitespaces = Filter::where('host', ' localhost ');
-        $bothHaveWhitespaces = Filter::fromQueryString('  host  =  localhost  ');
-        $withArray = Filter::where(' host ', array(' no match  ', '  localhost  '));
-        $this->assertTrue($columnHasWhitespaces->matches($this->sampleData[0]));
-        $this->assertTrue($expressionHasWhitespaces->matches($this->sampleData[0]));
-        $this->assertTrue($bothHaveWhitespaces->matches($this->sampleData[0]));
-        $this->assertTrue($withArray->matches($this->sampleData[0]));
+        $columnWithWhitespaces = Filter::where(' host ', 'localhost');
+        $this->assertTrue($columnWithWhitespaces->matches((object) array(
+                'host' => 'localhost'
+            )),
+            'Filter doesn\'t remove leading and trailing whitespaces from columns'
+        );
+        $expressionWithLeadingWhitespaces = Filter::where('host', ' localhost');
+        $this->assertTrue($expressionWithLeadingWhitespaces->matches((object) array(
+                'host' => ' localhost'
+            )),
+            'Filter doesn\'t take leading whitespaces of expressions into account'
+        );
+        $this->assertFalse($expressionWithLeadingWhitespaces->matches((object) array(
+                'host' => ' localhost '
+            )),
+            'Filter doesn\'t take trailing whitespaces of expressions into account'
+        );
+        $expressionWithTrailingWhitespaces = Filter::where('host', 'localhost ');
+        $this->assertTrue($expressionWithTrailingWhitespaces->matches((object) array(
+                'host' => 'localhost '
+            )),
+            'Filter doesn\'t take trailing whitespaces of expressions into account'
+        );
+        $this->assertFalse($expressionWithTrailingWhitespaces->matches((object) array(
+                'host' => ' localhost '
+            )),
+            'Filter doesn\'t take leading whitespaces of expressions into account'
+        );
+        $expressionWithLeadingAndTrailingWhitespaces = Filter::where('host', ' localhost ');
+        $this->assertTrue($expressionWithLeadingAndTrailingWhitespaces->matches((object) array(
+                'host' => ' localhost '
+            )),
+            'Filter doesn\'t take leading and trailing whitespaces of expressions into account'
+        );
+        $this->assertFalse($expressionWithLeadingAndTrailingWhitespaces->matches((object) array(
+                'host' => ' localhost  '
+            )),
+            'Filter doesn\'t take leading and trailing whitespaces of expressions into account'
+        );
+        $queryStringWithWhitespaces = Filter::fromQueryString(' host = localhost ');
+        $this->assertTrue($queryStringWithWhitespaces->matches((object) array(
+                'host' => ' localhost '
+            )),
+            'Filter doesn\'t take leading and trailing whitespaces of expressions in query strings into account'
+        );
     }
 
     private function row($idx)

From b449127680d55d6df8cfad4cfb1a7e8b585b2b3c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 8 Apr 2015 14:40:34 +0200
Subject: [PATCH 1122/2920] Do not adjust the collation when querying host
 names

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/StatusQuery.php     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index 0fb799f48..3f7bcf286 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -35,7 +35,7 @@ class StatusQuery extends IdoQuery
     protected $columnMap = array(
         'hosts' => array(
             'host'                  => 'ho.name1 COLLATE latin1_general_ci',
-            'host_name'             => 'ho.name1 COLLATE latin1_general_ci',
+            'host_name'             => 'ho.name1',
             'host_display_name'     => 'h.display_name',
             'host_alias'            => 'h.alias',
             'host_address'          => 'h.address',
@@ -168,7 +168,8 @@ class StatusQuery extends IdoQuery
             'servicegroup_alias'    => 'sg.alias'
         ),
         'services' => array(
-            'service_host_name'      => 'so.name1 COLLATE latin1_general_ci',
+            'service_host'           => 'so.name1 COLLATE latin1_general_ci',
+            'service_host_name'      => 'so.name1',
             'service'                => 'so.name2 COLLATE latin1_general_ci',
             'service_description'    => 'so.name2 COLLATE latin1_general_ci',
             'service_display_name'   => 's.display_name',

From 98c76a693ea796db8c3c7440f7c7958dfd8a1baa Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 8 Apr 2015 14:41:13 +0200
Subject: [PATCH 1123/2920] Do not adjust the collation when querying service
 descriptions

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/StatusQuery.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index 3f7bcf286..e78d5c98e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -171,7 +171,7 @@ class StatusQuery extends IdoQuery
             'service_host'           => 'so.name1 COLLATE latin1_general_ci',
             'service_host_name'      => 'so.name1',
             'service'                => 'so.name2 COLLATE latin1_general_ci',
-            'service_description'    => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'    => 'so.name2',
             'service_display_name'   => 's.display_name',
             'service_icon_image'     => 's.icon_image',
             'service_action_url'     => 's.action_url',

From c476ee68552f4c67df13eb9e8897442d296efdb5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 8 Apr 2015 14:42:57 +0200
Subject: [PATCH 1124/2920] Add an additional column for hostgroup names with
 unchanged collation

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/StatusQuery.php         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index e78d5c98e..3c6a31793 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -161,6 +161,7 @@ class StatusQuery extends IdoQuery
         ),
         'hostgroups' => array(
             'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1',
             'hostgroup_alias'   => 'hg.alias'
         ),
         'servicegroups' => array(

From 9557585f6a5b1cfa9ffa23c567164f65fc88bee0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 8 Apr 2015 14:49:18 +0200
Subject: [PATCH 1125/2920] Add an additional column for servicegroup names
 with unchanged collation

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/StatusQuery.php         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index 3c6a31793..17a12259e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -166,6 +166,7 @@ class StatusQuery extends IdoQuery
         ),
         'servicegroups' => array(
             'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
             'servicegroup_alias'    => 'sg.alias'
         ),
         'services' => array(

From c56c5655bd7bc3054c1a4c65971153443646d02a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 8 Apr 2015 14:51:04 +0200
Subject: [PATCH 1126/2920] Do not permit querying columns with changed
 collation and a valid alternative

refs #8613
---
 modules/monitoring/library/Monitoring/DataView/HostStatus.php | 3 +--
 .../monitoring/library/Monitoring/DataView/ServiceStatus.php  | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index 020da34c1..74bc39c82 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -21,7 +21,6 @@ class HostStatus extends DataView
     public function getColumns()
     {
         return array(
-            'host',
             'host_name',
             'host_display_name',
             'host_alias',
@@ -114,7 +113,7 @@ class HostStatus extends DataView
 
     public function getFilterColumns()
     {
-        return array('hostgroup', 'service_problems', 'servicegroup');
+        return array('host', 'hostgroup', 'service', 'servicegroup');
     }
 
     public function isValidFilterTarget($column)
diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index d04191068..ec13abac9 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -72,7 +72,6 @@ class ServiceStatus extends DataView
             'host_action_url',
             'host_notes_url',
             'host_last_comment',
-            'host',
             'host_display_name',
             'host_alias',
             'host_ipv4',
@@ -87,7 +86,6 @@ class ServiceStatus extends DataView
             'host_last_time_down',
             'host_last_time_unreachable',
             'host_modified_host_attributes',
-            'service',
             'service_hard_state',
             'service_problem',
             'service_perfdata',
@@ -165,7 +163,7 @@ class ServiceStatus extends DataView
 
     public function getFilterColumns()
     {
-        return array('hostgroup', 'servicegroup', 'service_problems');
+        return array('host', 'hostgroup', 'service', 'service_host', 'servicegroup');
     }
 
     public function isValidFilterTarget($column)

From e94c99e20ef26a1225b4deb7c2bcf22f329f368f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 8 Apr 2015 14:57:08 +0200
Subject: [PATCH 1127/2920] Use `host' instead of `host_name' when searching
 for hosts

refs #8613
---
 library/Icinga/Web/Widget/FilterEditor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 2575ce264..76246bf2f 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -186,7 +186,7 @@ class FilterEditor extends AbstractWidget
                         $searchCol = 'service_description';
                         break;
                     case 'hosts':
-                        $searchCol = 'host_name';
+                        $searchCol = 'host';
                         break;
                     case 'hostgroups':
                         $searchCol = 'hostgroup';

From 55e94073714731d2ed934a72b13ca764e23c7e04 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 8 Apr 2015 14:57:30 +0200
Subject: [PATCH 1128/2920] Use `service' instead of `service_description' when
 searching for services

refs #8613
---
 library/Icinga/Web/Widget/FilterEditor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 76246bf2f..ad9b1b5b2 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -183,7 +183,7 @@ class FilterEditor extends AbstractWidget
                 // TODO: Ask the view for (multiple) search columns
                 switch($request->getActionName()) {
                     case 'services':
-                        $searchCol = 'service_description';
+                        $searchCol = 'service';
                         break;
                     case 'hosts':
                         $searchCol = 'host';

From 20b09d3bda2584b85ba0a99fd6d95b3e40097b4f Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 8 Apr 2015 15:08:14 +0200
Subject: [PATCH 1129/2920] Inherit from Icinga\Web\Controller rather than from
 Icinga\Web\Controller\ModuleActionController

---
 modules/doc/library/Doc/DocController.php                     | 4 ++--
 .../monitoring/application/controllers/ConfigController.php   | 4 ++--
 modules/monitoring/library/Monitoring/Controller.php          | 4 ++--
 modules/setup/application/controllers/IndexController.php     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/doc/library/Doc/DocController.php b/modules/doc/library/Doc/DocController.php
index de02a3bae..36abe6b10 100644
--- a/modules/doc/library/Doc/DocController.php
+++ b/modules/doc/library/Doc/DocController.php
@@ -5,9 +5,9 @@ namespace Icinga\Module\Doc;
 
 use Icinga\Module\Doc\Renderer\DocSectionRenderer;
 use Icinga\Module\Doc\Renderer\DocTocRenderer;
-use Icinga\Web\Controller\ModuleActionController;
+use Icinga\Web\Controller;
 
-class DocController extends ModuleActionController
+class DocController extends Controller
 {
     /**
      * Render a chapter
diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index 2571b071e..33bf142f3 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -4,7 +4,7 @@
 use Icinga\Web\Notification;
 use Icinga\Data\ResourceFactory;
 use Icinga\Forms\ConfirmRemovalForm;
-use Icinga\Web\Controller\ModuleActionController;
+use Icinga\Web\Controller;
 use Icinga\Module\Monitoring\Forms\Config\BackendConfigForm;
 use Icinga\Module\Monitoring\Forms\Config\InstanceConfigForm;
 use Icinga\Module\Monitoring\Forms\Config\SecurityConfigForm;
@@ -12,7 +12,7 @@ use Icinga\Module\Monitoring\Forms\Config\SecurityConfigForm;
 /**
  * Configuration controller for editing monitoring resources
  */
-class Monitoring_ConfigController extends ModuleActionController
+class Monitoring_ConfigController extends Controller
 {
     /**
      * Display a list of available backends and instances
diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php
index 3aa893502..bf69182d7 100644
--- a/modules/monitoring/library/Monitoring/Controller.php
+++ b/modules/monitoring/library/Monitoring/Controller.php
@@ -6,13 +6,13 @@ namespace Icinga\Module\Monitoring;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Filterable;
 use Icinga\File\Csv;
-use Icinga\Web\Controller\ModuleActionController;
+use Icinga\Web\Controller as IcingaWebController;
 use Icinga\Web\Url;
 
 /**
  * Base class for all monitoring action controller
  */
-class Controller extends ModuleActionController
+class Controller extends IcingaWebController
 {
     /**
      * The backend used for this controller
diff --git a/modules/setup/application/controllers/IndexController.php b/modules/setup/application/controllers/IndexController.php
index b83c9f94e..eec43a737 100644
--- a/modules/setup/application/controllers/IndexController.php
+++ b/modules/setup/application/controllers/IndexController.php
@@ -1,10 +1,10 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use Icinga\Web\Controller\ModuleActionController;
+use Icinga\Web\Controller;
 use Icinga\Module\Setup\WebWizard;
 
-class Setup_IndexController extends ModuleActionController
+class Setup_IndexController extends Controller
 {
     /**
      * Whether the controller requires the user to be authenticated

From 3f2d87777a0e0f7f0aa8ef60ad78c3e44c422f46 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 8 Apr 2015 15:19:51 +0200
Subject: [PATCH 1130/2920] Use IntlDateFormatter in Format::timeUntil()

refs #6778
---
 library/Icinga/Util/Format.php | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Util/Format.php b/library/Icinga/Util/Format.php
index b999626b9..43b579208 100644
--- a/library/Icinga/Util/Format.php
+++ b/library/Icinga/Util/Format.php
@@ -4,6 +4,7 @@
 namespace Icinga\Util;
 
 use DateTime;
+use IntlDateFormatter;
 use Icinga\Exception\ProgrammingError;
 
 class Format
@@ -126,9 +127,35 @@ class Format
         return $result;
     }
 
-    public static function timeUntil($timestamp)
+    public static function timeUntil($time, $now = null)
     {
-        return self::smartTimeDiff($timestamp - time(), $timestamp);
+        $time = (float) $time;
+        if ($now === null) {
+            $now = time();
+        }
+        $diff = $time - $now;
+        if ($diff < 0) {
+            $diff = abs($diff);
+            // return static::timeAgo($time, $now);
+        }
+        if ($diff > 3600 * 24 * 3) {
+            $fmt = new IntlDateFormatter('en_US', IntlDateFormatter::SHORT, IntlDateFormatter::SHORT);
+            $until = $fmt->format($time);
+        } else {
+            $minutes = floor($diff / 60);
+            if ($minutes < 60) {
+                $until = sprintf('%dm %ds', $minutes, $diff % 60);
+            } else {
+                $hours = floor($minutes / 60);
+                if ($hours < 24) {
+                    $fmt = new IntlDateFormatter('en_US', IntlDateFormatter::NONE, IntlDateFormatter::SHORT);
+                    $until = $fmt->format($time);
+                } else {
+                    $until = sprintf('%dd %dh', floor($hours / 24), $hours % 24);
+                }
+            }
+        }
+        return $until;
     }
 
     public static function prefixedTimeUntil($timestamp, $ucfirst)

From 13596ec70f6186db9bd93a44cd49585c58bab3ff Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 8 Apr 2015 15:21:16 +0200
Subject: [PATCH 1131/2920] ShowController: Remove obsolete use statements

---
 modules/monitoring/application/controllers/ShowController.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 4550b20ae..d10fc678f 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use Icinga\Application\Benchmark;
 use Icinga\Module\Monitoring\Object\MonitoredObject;
 use Icinga\Web\Hook;
 use Icinga\Web\Url;
@@ -10,8 +9,6 @@ use Icinga\Web\Widget\Tabextension\OutputFormat;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 use Icinga\Module\Monitoring\Backend;
 use Icinga\Module\Monitoring\Controller;
-use Icinga\Module\Monitoring\Object\Host;
-use Icinga\Module\Monitoring\Object\Service;
 
 /**
  * Class Monitoring_ShowController

From 0de2dbd626831565d5da7e0a19237f0971edb562 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 8 Apr 2015 15:23:00 +0200
Subject: [PATCH 1132/2920] Temporary disable timeuntil ui counter

refs #6778
---
 public/js/icinga/ui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index 2c85a2df9..daae6d390 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -602,7 +602,7 @@
             });
 
             $('.timeuntil').each(function (idx, el) {
-
+                return;
                 // todo remove after replace timeUntil
                 var mp = el.innerHTML.match(/^(.*?)(-?\d+)d\s(-?\d+)h/);
                 if (mp !== null) {

From b93d18a0fc2507d360f122afdfb27317b7708fd4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 8 Apr 2015 16:25:29 +0200
Subject: [PATCH 1133/2920] Require `host_name' instead of `host' to show or
 list particular objects

`host' implies that it is possible to provide case-less identifiers which is
*not* possible.

refs #8613
---
 doc/accessibility/link-labels.html                        | 2 +-
 .../monitoring/application/controllers/HostController.php | 2 +-
 .../application/controllers/ServiceController.php         | 2 +-
 .../monitoring/application/controllers/ShowController.php | 6 +++---
 modules/monitoring/application/views/helpers/Link.php     | 4 ++--
 .../monitoring/application/views/helpers/PluginOutput.php | 2 +-
 .../monitoring/application/views/scripts/list/hosts.phtml | 4 ++--
 .../application/views/scripts/list/servicegrid.phtml      | 6 +++---
 .../application/views/scripts/list/services.phtml         | 8 ++++----
 .../views/scripts/partials/host/servicesummary.phtml      | 2 +-
 .../application/views/scripts/show/history.phtml          | 4 ++--
 .../library/Monitoring/Object/MonitoredObject.php         | 8 ++++----
 .../Web/Controller/MonitoredObjectController.php          | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/doc/accessibility/link-labels.html b/doc/accessibility/link-labels.html
index 439adb85e..a65b909de 100644
--- a/doc/accessibility/link-labels.html
+++ b/doc/accessibility/link-labels.html
@@ -8,7 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 <body>
-    <a href="/monitoring/host/show?host=localhost"
+    <a href="/monitoring/host/show?host_name=localhost"
        title="Show detailed information about the host localhost"
        aria-label="Show detailed information about the host localhost">localhost</a>
 </body>
diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index 11179c1fa..5b336a26b 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -26,7 +26,7 @@ class Monitoring_HostController extends MonitoredObjectController
      */
     public function init()
     {
-        $host = new Host($this->backend, $this->params->get('host'));
+        $host = new Host($this->backend, $this->params->get('host_name'));
 
         $this->applyRestriction('monitoring/hosts/filter', $host);
 
diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index 3dc98c3b8..4f9bdeb1a 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -25,7 +25,7 @@ class Monitoring_ServiceController extends MonitoredObjectController
      */
     public function init()
     {
-        $service = new Service($this->backend, $this->params->get('host'), $this->params->get('service'));
+        $service = new Service($this->backend, $this->params->get('host_name'), $this->params->get('service'));
 
         $this->applyRestriction('monitoring/services/filter', $service);
 
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index d10fc678f..475e80b4f 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -188,12 +188,12 @@ class Monitoring_ShowController extends Controller
         if ($object->getType() === $object::TYPE_HOST) {
             $isService = false;
             $params = array(
-                'host' => $object->getName()
+                'host_name' => $object->getName()
             );
         } else {
             $isService = true;
             $params = array(
-                'host'      => $object->getHost()->getName(),
+                'host_name' => $object->getHost()->getName(),
                 'service'   => $object->getName()
             );
         }
@@ -207,7 +207,7 @@ class Monitoring_ShowController extends Controller
                 ),
                 'label'     => $this->translate('Host'),
                 'icon'      => 'host',
-                'url'       => 'monitoring/show/host',
+                'url'       => 'monitoring/host/show',
                 'urlParams' => $params,
             )
         );
diff --git a/modules/monitoring/application/views/helpers/Link.php b/modules/monitoring/application/views/helpers/Link.php
index 8faf6e5fb..454d37682 100644
--- a/modules/monitoring/application/views/helpers/Link.php
+++ b/modules/monitoring/application/views/helpers/Link.php
@@ -33,7 +33,7 @@ class Zend_View_Helper_Link extends Zend_View_Helper_Abstract
         return $this->view->qlink(
             $linkText,
             'monitoring/host/show',
-            array('host' => $host),
+            array('host_name' => $host),
             array('title' => sprintf($this->view->translate('Show detailed information for host %s'), $host))
         );
     }
@@ -55,7 +55,7 @@ class Zend_View_Helper_Link extends Zend_View_Helper_Abstract
             $this->view->qlink(
                 $serviceLinkText,
                 'monitoring/service/show',
-                array('host' => $host, 'service' => $service),
+                array('host_name' => $host, 'service' => $service),
                 array('title' => sprintf(
                     $this->view->translate('Show detailed information for service %s on host %s'),
                     $service,
diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
index d494a7810..8778d01b3 100644
--- a/modules/monitoring/application/views/helpers/PluginOutput.php
+++ b/modules/monitoring/application/views/helpers/PluginOutput.php
@@ -65,7 +65,7 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
                 parse_str($m[1], $params);
                 if (isset($params['host'])) {
                     $tag->setAttribute('href', $this->view->baseUrl(
-                        '/monitoring/host/show?host=' . urlencode($params['host']
+                        '/monitoring/host/show?host_name=' . urlencode($params['host']
                     )));
                 }
             } else {
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index f5689c927..bdd88a1e9 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -42,7 +42,7 @@ if ($hosts->count() === 0) {
   <?php foreach($hosts as $host):
 
     $hostStateName = Host::getStateText($host->host_state);
-    $hostLink = $this->href('monitoring/host/show', array('host' => $host->host_name));
+    $hostLink = $this->href('monitoring/host/show', array('host_name' => $host->host_name));
 
     $icons = array();
     if (! $host->host_handled && $host->host_state > 0){
@@ -112,7 +112,7 @@ if ($hosts->count() === 0) {
           ),
           'monitoring/show/services',
           array(
-            'host'               => $host->host_name,
+            'host_name'          => $host->host_name,
             'service_problem'    => 1,
             'service_handled'    => 0
            ),
diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
index a102c36eb..9a37a52c5 100644
--- a/modules/monitoring/application/views/scripts/list/servicegrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
@@ -68,7 +68,7 @@ foreach ($serviceDescriptions as $service_description): ?>
           <?= $this->qlink(
             $host_name,
             'monitoring/show/services?' . $serviceFilter,
-            array('host' => $host_name),
+            array('host_name' => $host_name),
             array('title' => sprintf($this->translate('List all reported services on host %s'), $host_name))
           ); ?>
         </th>
@@ -80,9 +80,9 @@ foreach ($serviceDescriptions as $service_description): ?>
           </span>
           <?= $this->qlink(
             '',
-            'monitoring/show/service',
+            'monitoring/service/show',
             array(
-              'host'      => $service->host_name,
+              'host_name' => $service->host_name,
               'service'   => $service->service_description
             ),
             array(
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 3b17e1b63..f3e76e9d0 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -42,14 +42,14 @@ foreach ($services as $service):
     $serviceLink = $this->href(
       'monitoring/service/show',
       array(
-        'host' => $service->host_name,
-        'service' => $service->service_description
+        'host_name' => $service->host_name,
+        'service'   => $service->service_description
       )
     );
     $hostLink = $this->href(
-      'monitoring/show/host',
+      'monitoring/host/show',
       array(
-        'host' => $service->host_name,
+        'host_name' => $service->host_name,
       )
     );
     $serviceStateName = Service::getStateText($service->service_state);
diff --git a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
index c0acdead4..23cc21e97 100644
--- a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
@@ -3,7 +3,7 @@
 use Icinga\Web\Url;
 use Icinga\Module\Monitoring\Object\Service;
 
-$selfUrl = Url::fromPath('monitoring/show/services', array('host' => $object->host_name));
+$selfUrl = Url::fromPath('monitoring/show/services', array('host_name' => $object->host_name));
 $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
 ?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
 <?php if ($object->stats->services_total): ?>
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index 0542294d6..53425b9d9 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -144,8 +144,8 @@ $output = $this->tickets ? preg_replace_callback(
                   $event->service_display_name,
                   'monitoring/show/service',
                   array(
-                      'host' => $event->host_name,
-                      'service' => $event->service_description
+                      'host_name'   => $event->host_name,
+                      'service'     => $event->service_description
                   ),
                   array('title' => sprintf(
                       $this->translate('Show detailed information for service %s on host %s'),
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 87a0cdaf4..9361843e3 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -556,10 +556,10 @@ abstract class MonitoredObject implements Filterable
      */
     public static function fromParams(UrlParams $params)
     {
-        if ($params->has('service') && $params->has('host')) {
-            return new Service(MonitoringBackend::instance(), $params->get('host'), $params->get('service'));
-        } elseif ($params->has('host')) {
-            return new Host(MonitoringBackend::instance(), $params->get('host'));
+        if ($params->has('service') && $params->has('host_name')) {
+            return new Service(MonitoringBackend::instance(), $params->get('host_name'), $params->get('service'));
+        } elseif ($params->has('host_name')) {
+            return new Host(MonitoringBackend::instance(), $params->get('host_name'));
         }
         return null;
     }
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 04102e9d2..3f71cb2c0 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -167,12 +167,12 @@ abstract class MonitoredObjectController extends Controller
         if ($object->getType() === $object::TYPE_HOST) {
             $isService = false;
             $params = array(
-                'host' => $object->getName()
+                'host_name' => $object->getName()
             );
         } else {
             $isService = true;
             $params = array(
-                'host'      => $object->getHost()->getName(),
+                'host_name' => $object->getHost()->getName(),
                 'service'   => $object->getName()
             );
         }

From 09ab6019423e858d222a570c65f247bfcb09e62f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 8 Apr 2015 16:49:52 +0200
Subject: [PATCH 1134/2920] Require `service_description' instead of `service'
 to show a particular service

`service' implies that it is possible to provide case-less identifiers which is
*not* possible.

refs #8613
---
 .../application/controllers/ServiceController.php        | 6 +++++-
 .../application/controllers/ShowController.php           | 6 +++---
 modules/monitoring/application/views/helpers/Link.php    | 2 +-
 .../application/views/scripts/list/servicegrid.phtml     | 4 ++--
 .../application/views/scripts/list/services.phtml        | 4 ++--
 .../application/views/scripts/show/history.phtml         | 6 +++---
 .../library/Monitoring/Object/MonitoredObject.php        | 9 ++++++---
 .../Web/Controller/MonitoredObjectController.php         | 4 ++--
 8 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index 4f9bdeb1a..86579343f 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -25,7 +25,11 @@ class Monitoring_ServiceController extends MonitoredObjectController
      */
     public function init()
     {
-        $service = new Service($this->backend, $this->params->get('host_name'), $this->params->get('service'));
+        $service = new Service(
+            $this->backend,
+            $this->params->get('host_name'),
+            $this->params->get('service_description')
+        );
 
         $this->applyRestriction('monitoring/services/filter', $service);
 
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 475e80b4f..b5ffc0535 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -193,8 +193,8 @@ class Monitoring_ShowController extends Controller
         } else {
             $isService = true;
             $params = array(
-                'host_name' => $object->getHost()->getName(),
-                'service'   => $object->getName()
+                'host_name'             => $object->getHost()->getName(),
+                'service_description'   => $object->getName()
             );
         }
         $tabs = $this->getTabs();
@@ -222,7 +222,7 @@ class Monitoring_ShowController extends Controller
                     ),
                     'label'     => $this->translate('Service'),
                     'icon'      => 'service',
-                    'url'       => 'monitoring/show/service',
+                    'url'       => 'monitoring/service/show',
                     'urlParams' => $params,
                 )
             );
diff --git a/modules/monitoring/application/views/helpers/Link.php b/modules/monitoring/application/views/helpers/Link.php
index 454d37682..7f1324573 100644
--- a/modules/monitoring/application/views/helpers/Link.php
+++ b/modules/monitoring/application/views/helpers/Link.php
@@ -55,7 +55,7 @@ class Zend_View_Helper_Link extends Zend_View_Helper_Abstract
             $this->view->qlink(
                 $serviceLinkText,
                 'monitoring/service/show',
-                array('host_name' => $host, 'service' => $service),
+                array('host_name' => $host, 'service_description' => $service),
                 array('title' => sprintf(
                     $this->view->translate('Show detailed information for service %s on host %s'),
                     $service,
diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
index 9a37a52c5..a2e7502ea 100644
--- a/modules/monitoring/application/views/scripts/list/servicegrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
@@ -82,8 +82,8 @@ foreach ($serviceDescriptions as $service_description): ?>
             '',
             'monitoring/service/show',
             array(
-              'host_name' => $service->host_name,
-              'service'   => $service->service_description
+              'host_name'           => $service->host_name,
+              'service_description' => $service->service_description
             ),
             array(
               'aria-describedby'    => $service->host_name . '_' . $service->service_description . '_desc',
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index f3e76e9d0..3dd0b060d 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -42,8 +42,8 @@ foreach ($services as $service):
     $serviceLink = $this->href(
       'monitoring/service/show',
       array(
-        'host_name' => $service->host_name,
-        'service'   => $service->service_description
+        'host_name'             => $service->host_name,
+        'service_description'   => $service->service_description
       )
     );
     $hostLink = $this->href(
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index 53425b9d9..149eb0ecc 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -142,10 +142,10 @@ $output = $this->tickets ? preg_replace_callback(
               $this->translate('%s on %s', 'Service running on host'),
               $hostContext ? $this->qlink(
                   $event->service_display_name,
-                  'monitoring/show/service',
+                  'monitoring/service/show',
                   array(
-                      'host_name'   => $event->host_name,
-                      'service'     => $event->service_description
+                      'host_name'           => $event->host_name,
+                      'service_description' => $event->service_description
                   ),
                   array('title' => sprintf(
                       $this->translate('Show detailed information for service %s on host %s'),
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 9361843e3..621c25c75 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -556,11 +556,14 @@ abstract class MonitoredObject implements Filterable
      */
     public static function fromParams(UrlParams $params)
     {
-        if ($params->has('service') && $params->has('host_name')) {
-            return new Service(MonitoringBackend::instance(), $params->get('host_name'), $params->get('service'));
+        if ($params->has('service_description') && $params->has('host_name')) {
+            return new Service(
+                MonitoringBackend::instance(),
+                $params->get('host_name'),
+                $params->get('service_description')
+            );
         } elseif ($params->has('host_name')) {
             return new Host(MonitoringBackend::instance(), $params->get('host_name'));
         }
-        return null;
     }
 }
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 3f71cb2c0..de0c3fbfe 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -172,8 +172,8 @@ abstract class MonitoredObjectController extends Controller
         } else {
             $isService = true;
             $params = array(
-                'host_name' => $object->getHost()->getName(),
-                'service'   => $object->getName()
+                'host_name'             => $object->getHost()->getName(),
+                'service_description'   => $object->getName()
             );
         }
         $tabs->add(

From 06a44119de1f33f6da52651a8118ec531d233d93 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 9 Apr 2015 09:52:31 +0200
Subject: [PATCH 1135/2920] Fix formatting issue in service multi-view

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

diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index c252d829d..5401a38d3 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -175,7 +175,7 @@
                 '%s service currently in downtime.',
                 '%s services currently in downtime.',
                 $inDowntimeCount
-            ), '<b>' . $inDowntimeCount) . '</b>' ?>
+            ), '<b>' . $inDowntimeCount . '</b>') ?>
 
             <?= $this->qlink(
                 $this->translate('List all'),

From b9aee47d1f44893ef953bf9168e21f368b95ed7f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 10:27:41 +0200
Subject: [PATCH 1136/2920] Adjust command links so that they'll use
 `host_name' instead of `host'

refs #8613
---
 .../monitoring/application/views/scripts/list/comments.phtml  | 4 ++--
 .../monitoring/application/views/scripts/list/downtimes.phtml | 4 ++--
 .../views/scripts/show/components/acknowledgement.phtml       | 4 ++--
 .../views/scripts/show/components/checkstatistics.phtml       | 4 ++--
 .../application/views/scripts/show/components/command.phtml   | 4 ++--
 .../application/views/scripts/show/components/comments.phtml  | 4 ++--
 .../application/views/scripts/show/components/downtime.phtml  | 4 ++--
 .../views/scripts/show/components/notifications.phtml         | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 6f49bf4a8..4071ce7ff 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -81,9 +81,9 @@
           $delCommentForm = clone $delCommentForm;
           $delCommentForm->populate(array('comment_id' => $comment->id, 'redirect' => $this->url));
           if ($comment->objecttype === 'host') {
-            $delCommentForm->setAction($this->url('monitoring/host/delete-comment', array('host' => $comment->host)));
+            $delCommentForm->setAction($this->url('monitoring/host/delete-comment', array('host_name' => $comment->host)));
           } else {
-            $delCommentForm->setAction($this->url('monitoring/service/delete-comment', array('host' => $comment->host, 'service' => $comment->service)));
+            $delCommentForm->setAction($this->url('monitoring/service/delete-comment', array('host_name' => $comment->host, 'service' => $comment->service)));
           }
           echo $delCommentForm;
           ?>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 1fbaa713f..0b3b0a9c0 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -120,9 +120,9 @@ use Icinga\Module\Monitoring\Object\Service;
           $delDowntimeForm = clone $delDowntimeForm;
           $delDowntimeForm->populate(array('downtime_id' => $downtime->id, 'redirect' => $this->url));
           if (! isset($downtime->service)) {
-            $delDowntimeForm->setAction($this->url('monitoring/host/delete-downtime', array('host' => $downtime->host)));
+            $delDowntimeForm->setAction($this->url('monitoring/host/delete-downtime', array('host_name' => $downtime->host)));
           } else {
-            $delDowntimeForm->setAction($this->url('monitoring/service/delete-downtime', array('host' => $downtime->host, 'service' => $downtime->service)));
+            $delDowntimeForm->setAction($this->url('monitoring/service/delete-downtime', array('host_name' => $downtime->host, 'service' => $downtime->service)));
           }
           echo $delDowntimeForm;
           ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index e7b79354d..588be561c 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -26,12 +26,12 @@ if ($object->acknowledged): ?>
                 if ($object->getType() === $object::TYPE_HOST) {
                     $ackLink = $this->href(
                         'monitoring/host/acknowledge-problem',
-                        array('host' => $object->getName())
+                        array('host_name' => $object->getName())
                     );
                 } else {
                     $ackLink = $this->href(
                         'monitoring/service/acknowledge-problem',
-                        array('host' => $object->getHost()->getName(), 'service' => $object->getName())
+                        array('host_name' => $object->getHost()->getName(), 'service' => $object->getName())
                     );
                 }
             ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index 2a4e4b033..ef1432565 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -31,7 +31,7 @@ if ($object->getType() === $object::TYPE_HOST) {
               echo $this->qlink(
                   $this->translate('Reschedule'),
                   'monitoring/service/reschedule-check',
-                  array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
+                  array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()),
                   array(
                       'icon'                => 'reschedule',
                       'data-base-target'    => '_self',
@@ -44,7 +44,7 @@ if ($object->getType() === $object::TYPE_HOST) {
               echo $this->qlink(
                   $this->translate('Reschedule'),
                   'monitoring/host/reschedule-check',
-                  array('host' => $object->getName()),
+                  array('host_name' => $object->getName()),
                   array(
                       'icon'                => 'reschedule',
                       'data-base-target'    => '_self',
diff --git a/modules/monitoring/application/views/scripts/show/components/command.phtml b/modules/monitoring/application/views/scripts/show/components/command.phtml
index d7fca7cfa..3068c8e1d 100644
--- a/modules/monitoring/application/views/scripts/show/components/command.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/command.phtml
@@ -15,7 +15,7 @@ $command = array_shift($parts);
                 echo $this->qlink(
                     $this->translate('Process check result'),
                     'monitoring/host/process-check-result',
-                    array('host' => $object->getName()),
+                    array('host_name' => $object->getName()),
                     array(
                         'icon'              => 'reply',
                         'data-base-target'  => '_self',
@@ -26,7 +26,7 @@ $command = array_shift($parts);
                 echo $this->qlink(
                     $this->translate('Process check result'),
                     'monitoring/service/process-check-result',
-                    array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
+                    array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()),
                     array(
                         'icon'              => 'reply',
                         'data-base-target'  => '_self',
diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index 5a4d351c0..adeef6200 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -7,7 +7,7 @@
                 echo $this->qlink(
                     $this->translate('Add comment'),
                     'monitoring/host/add-comment',
-                    array('host' => $object->getName()),
+                    array('host_name' => $object->getName()),
                     array(
                         'icon'              => 'comment',
                         'data-base-target'  => '_self',
@@ -18,7 +18,7 @@
                 echo $this->qlink(
                     $this->translate('Add comment'),
                     'monitoring/service/add-comment',
-                    array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
+                    array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()),
                     array(
                         'icon'              => 'comment',
                         'data-base-target'  => '_self',
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 3804a400b..9d5d53c16 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -7,7 +7,7 @@
                 echo $this->qlink(
                     $this->translate('Schedule downtime'),
                     'monitoring/host/schedule-downtime',
-                    array('host' => $object->getName()),
+                    array('host_name' => $object->getName()),
                     array(
                         'icon'              => 'plug',
                         'data-base-target'  => '_self',
@@ -20,7 +20,7 @@
                 echo $this->qlink(
                     $this->translate('Schedule downtime'),
                     'monitoring/service/schedule-downtime',
-                    array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
+                    array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()),
                     array(
                         'icon'              => 'plug',
                         'data-base-target'  => '_self',
diff --git a/modules/monitoring/application/views/scripts/show/components/notifications.phtml b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
index af57eb934..fa4314620 100644
--- a/modules/monitoring/application/views/scripts/show/components/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
@@ -5,12 +5,12 @@
       if ($object->getType() === $object::TYPE_HOST) {
           $ackLink = $this->href(
               'monitoring/host/send-custom-notification',
-              array('host' => $object->getName())
+              array('host_name' => $object->getName())
           );
       } else {
           $ackLink = $this->href(
               'monitoring/service/send-custom-notification',
-              array('host' => $object->getHost()->getName(), 'service' => $object->getName())
+              array('host_name' => $object->getHost()->getName(), 'service' => $object->getName())
           );
       }
       ?>

From cee189a5fc2b94173eda5587ab5a5ce4125a06d0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 10:28:34 +0200
Subject: [PATCH 1137/2920] Adjust command links so that they'll use
 `service_description'

...instead of `service'

refs #8613
---
 .../monitoring/application/views/scripts/list/comments.phtml | 5 ++++-
 .../application/views/scripts/list/downtimes.phtml           | 5 ++++-
 .../views/scripts/show/components/acknowledgement.phtml      | 2 +-
 .../views/scripts/show/components/checkstatistics.phtml      | 2 +-
 .../application/views/scripts/show/components/command.phtml  | 2 +-
 .../application/views/scripts/show/components/comments.phtml | 2 +-
 .../application/views/scripts/show/components/downtime.phtml | 2 +-
 .../views/scripts/show/components/notifications.phtml        | 2 +-
 8 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 4071ce7ff..12668eefd 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -83,7 +83,10 @@
           if ($comment->objecttype === 'host') {
             $delCommentForm->setAction($this->url('monitoring/host/delete-comment', array('host_name' => $comment->host)));
           } else {
-            $delCommentForm->setAction($this->url('monitoring/service/delete-comment', array('host_name' => $comment->host, 'service' => $comment->service)));
+            $delCommentForm->setAction($this->url('monitoring/service/delete-comment', array(
+                'host_name'             => $comment->host,
+                'service_description'   => $comment->service
+            )));
           }
           echo $delCommentForm;
           ?>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 0b3b0a9c0..00d9c7f90 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -122,7 +122,10 @@ use Icinga\Module\Monitoring\Object\Service;
           if (! isset($downtime->service)) {
             $delDowntimeForm->setAction($this->url('monitoring/host/delete-downtime', array('host_name' => $downtime->host)));
           } else {
-            $delDowntimeForm->setAction($this->url('monitoring/service/delete-downtime', array('host_name' => $downtime->host, 'service' => $downtime->service)));
+            $delDowntimeForm->setAction($this->url('monitoring/service/delete-downtime', array(
+                'host_name'             => $downtime->host,
+                'service_description'   => $downtime->service
+            )));
           }
           echo $delDowntimeForm;
           ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index 588be561c..b91807d4f 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -31,7 +31,7 @@ if ($object->acknowledged): ?>
                 } else {
                     $ackLink = $this->href(
                         'monitoring/service/acknowledge-problem',
-                        array('host_name' => $object->getHost()->getName(), 'service' => $object->getName())
+                        array('host_name' => $object->getHost()->getName(), 'service_description' => $object->getName())
                     );
                 }
             ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index ef1432565..8fbdb9059 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -31,7 +31,7 @@ if ($object->getType() === $object::TYPE_HOST) {
               echo $this->qlink(
                   $this->translate('Reschedule'),
                   'monitoring/service/reschedule-check',
-                  array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()),
+                  array('host_name' => $object->getHost()->getName(), 'service_description' => $object->getName()),
                   array(
                       'icon'                => 'reschedule',
                       'data-base-target'    => '_self',
diff --git a/modules/monitoring/application/views/scripts/show/components/command.phtml b/modules/monitoring/application/views/scripts/show/components/command.phtml
index 3068c8e1d..0b028ba71 100644
--- a/modules/monitoring/application/views/scripts/show/components/command.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/command.phtml
@@ -26,7 +26,7 @@ $command = array_shift($parts);
                 echo $this->qlink(
                     $this->translate('Process check result'),
                     'monitoring/service/process-check-result',
-                    array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()),
+                    array('host_name' => $object->getHost()->getName(), 'service_description' => $object->getName()),
                     array(
                         'icon'              => 'reply',
                         'data-base-target'  => '_self',
diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index adeef6200..61ae96517 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -18,7 +18,7 @@
                 echo $this->qlink(
                     $this->translate('Add comment'),
                     'monitoring/service/add-comment',
-                    array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()),
+                    array('host_name' => $object->getHost()->getName(), 'service_description' => $object->getName()),
                     array(
                         'icon'              => 'comment',
                         'data-base-target'  => '_self',
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 9d5d53c16..23c20e21f 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -20,7 +20,7 @@
                 echo $this->qlink(
                     $this->translate('Schedule downtime'),
                     'monitoring/service/schedule-downtime',
-                    array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()),
+                    array('host_name' => $object->getHost()->getName(), 'service_description' => $object->getName()),
                     array(
                         'icon'              => 'plug',
                         'data-base-target'  => '_self',
diff --git a/modules/monitoring/application/views/scripts/show/components/notifications.phtml b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
index fa4314620..dfed6d483 100644
--- a/modules/monitoring/application/views/scripts/show/components/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
@@ -10,7 +10,7 @@
       } else {
           $ackLink = $this->href(
               'monitoring/service/send-custom-notification',
-              array('host_name' => $object->getHost()->getName(), 'service' => $object->getName())
+              array('host_name' => $object->getHost()->getName(), 'service_description' => $object->getName())
           );
       }
       ?>

From 7d984665d672f3c8be11eb23a7fc66088b2bc233 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 11:12:09 +0200
Subject: [PATCH 1138/2920] Use `host_name' to decide whether to show a
 service's host or not

`host' might match multiple hosts even if no * is being part of the filter.

refs #8613
---
 .../monitoring/application/controllers/ListController.php   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 41e27ec45..8a9dc5fa4 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -170,10 +170,8 @@ class Monitoring_ListController extends Controller
 
         $this->addTitleTab('services', $this->translate('Services'), $this->translate('List services'));
         $this->view->showHost = true;
-        if ($host = $this->_getParam('host')) {
-            if (strpos($host, '*') === false) {
-                $this->view->showHost = false;
-            }
+        if (strpos($this->params->get('host_name', '*'), '*') === false) {
+            $this->view->showHost = false;
         }
         $this->setAutorefreshInterval(10);
 

From 878ef058968b1b0ec751d90907226471a25d1bbd Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 9 Apr 2015 11:19:13 +0200
Subject: [PATCH 1139/2920] Fix "show all downtimes" links

refs #8565
---
 .../application/controllers/HostsController.php        |  8 ++++----
 .../application/controllers/ServicesController.php     |  9 +++++----
 .../monitoring/library/Monitoring/Object/HostList.php  |  4 ++--
 .../library/Monitoring/Object/ObjectList.php           | 10 +++++++---
 .../library/Monitoring/Object/ServiceList.php          | 10 ++++++----
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 1da2a95e6..093d0a841 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -154,15 +154,15 @@ class Monitoring_HostsController extends Controller
         $this->view->problemObjects = $this->hostList->getProblemObjects();
 
         $this->view->acknowledgeUnhandledLink = Url::fromPath('monitoring/hosts/acknowledge-problem')
-            ->setQueryString($this->hostList->getUnhandledObjects()->filterFromResult());
+            ->setQueryString($this->hostList->getUnhandledObjects()->objectsFilter());
         $this->view->downtimeUnhandledLink = Url::fromPath('monitoring/hosts/schedule-downtime')
-            ->setQueryString($this->hostList->getUnhandledObjects()->filterFromResult());
+            ->setQueryString($this->hostList->getUnhandledObjects()->objectsFilter());
         $this->view->downtimeLink = Url::fromPath('monitoring/hosts/schedule-downtime')
-            ->setQueryString($this->hostList->getProblemObjects()->filterFromResult());
+            ->setQueryString($this->hostList->getProblemObjects()->objectsFilter());
         $this->view->acknowledgedObjects = $this->hostList->getAcknowledgedObjects();
         $this->view->objectsInDowntime = $this->hostList->getObjectsInDowntime();
         $this->view->inDowntimeLink = Url::fromPath('monitoring/list/downtimes')
-            ->setQueryString($this->hostList->getObjectsInDowntime()->filterFromResult());
+            ->setQueryString($this->hostList->getObjectsInDowntime()->objectsFilter(array('host' => 'downtime_host')));
 
         $this->view->commentsLink = Url::fromRequest()->setPath('monitoring/list/comments');
         $this->view->baseFilter = $this->hostList->getFilter();
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 789a5fda5..e37852fff 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -191,15 +191,16 @@ class Monitoring_ServicesController extends Controller
         $this->view->unhandledObjects = $this->serviceList->getUnhandledObjects();
         $this->view->problemObjects = $this->serviceList->getProblemObjects();
         $this->view->acknowledgeUnhandledLink = Url::fromPath('monitoring/services/acknowledge-problem')
-            ->setQueryString($this->serviceList->getUnhandledObjects()->filterFromResult()->toQueryString());
+            ->setQueryString($this->serviceList->getUnhandledObjects()->objectsFilter()->toQueryString());
         $this->view->downtimeUnhandledLink = Url::fromPath('monitoring/services/schedule-downtime')
-            ->setQueryString($this->serviceList->getUnhandledObjects()->filterFromResult()->toQueryString());
+            ->setQueryString($this->serviceList->getUnhandledObjects()->objectsFilter()->toQueryString());
         $this->view->downtimeLink = Url::fromPath('monitoring/services/schedule-downtime')
-            ->setQueryString($this->serviceList->getProblemObjects()->filterFromResult()->toQueryString());
+            ->setQueryString($this->serviceList->getProblemObjects()->objectsFilter()->toQueryString());
         $this->view->acknowledgedObjects = $acknowledgedObjects;
         $this->view->objectsInDowntime = $this->serviceList->getObjectsInDowntime();
         $this->view->inDowntimeLink = Url::fromPath('monitoring/list/downtimes')
-            ->setQueryString($this->serviceList->getObjectsInDowntime()->filterFromResult()->toQueryString());
+            ->setQueryString($this->serviceList->getObjectsInDowntime()
+            ->objectsFilter(array('host' => 'downtime_host', 'service' => 'downtime_service'))->toQueryString());
         $this->view->commentsLink = Url::fromRequest()
             ->setPath('monitoring/list/comments');
         $this->view->baseFilter = $this->serviceList->getFilter();
diff --git a/modules/monitoring/library/Monitoring/Object/HostList.php b/modules/monitoring/library/Monitoring/Object/HostList.php
index 40dc002df..48a7560b1 100644
--- a/modules/monitoring/library/Monitoring/Object/HostList.php
+++ b/modules/monitoring/library/Monitoring/Object/HostList.php
@@ -78,11 +78,11 @@ class HostList extends ObjectList
      *
      * @return array    An
      */
-    public function filterFromResult()
+    public function objectsFilter($columns = array('host' => 'host'))
     {
         $filterExpression = array();
         foreach ($this as $host) {
-            $filterExpression[] = Filter::where('host', $host->getName());
+            $filterExpression[] = Filter::where($columns['host'], $host->getName());
         }
         return FilterOr::matchAny($filterExpression);
     }
diff --git a/modules/monitoring/library/Monitoring/Object/ObjectList.php b/modules/monitoring/library/Monitoring/Object/ObjectList.php
index 9d81be371..4f5ada43c 100644
--- a/modules/monitoring/library/Monitoring/Object/ObjectList.php
+++ b/modules/monitoring/library/Monitoring/Object/ObjectList.php
@@ -194,12 +194,16 @@ abstract class ObjectList implements Countable, IteratorAggregate
         $list = new $class($this->backend);
         $list->objects = $objects;
         $list->count = count($objects);
-        $list->filter = $list->filterFromResult();
+        $list->filter = $list->objectsFilter();
         return $list;
     }
 
     /**
-     * @return Filter
+     * Create a filter that matches exactly the elements of this object list
+     *
+     * @param   array   $columns    Override default column names.
+     *
+     * @return  Filter
      */
-    abstract function filterFromResult();
+    abstract function objectsFilter($columns = array());
 }
diff --git a/modules/monitoring/library/Monitoring/Object/ServiceList.php b/modules/monitoring/library/Monitoring/Object/ServiceList.php
index 28bcc2b3d..379d8234c 100644
--- a/modules/monitoring/library/Monitoring/Object/ServiceList.php
+++ b/modules/monitoring/library/Monitoring/Object/ServiceList.php
@@ -119,15 +119,17 @@ class ServiceList extends ObjectList
     /**
      * Returns a Filter that matches all hosts in this HostList
      *
-     * @return Filter
+     * @param   array   $columns    Override filter column names
+     *
+     * @return  Filter
      */
-    public function filterFromResult()
+    public function objectsFilter($columns = array('host' => 'host', 'service' => 'service'))
     {
         $filterExpression = array();
         foreach ($this as $service) {
             $filterExpression[] = Filter::matchAll(
-                Filter::where('host', $service->getHost()->getName()),
-                Filter::where('service', $service->getName())
+                Filter::where($columns['host'], $service->getHost()->getName()),
+                Filter::where($columns['service'], $service->getName())
             );
         }
         return FilterOr::matchAny($filterExpression);

From f7550f55c173ff9e6e770fce135e6f7035faaf4a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 11:41:56 +0200
Subject: [PATCH 1140/2920] Permit to filter hosts and services by
 hostgroup_name and servicegroup_name

refs #8613
---
 .../library/Monitoring/DataView/HostStatus.php         |  2 +-
 .../library/Monitoring/DataView/ServiceStatus.php      | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index 74bc39c82..23df6d94a 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -113,7 +113,7 @@ class HostStatus extends DataView
 
     public function getFilterColumns()
     {
-        return array('host', 'hostgroup', 'service', 'servicegroup');
+        return array('host', 'hostgroup', 'hostgroup_name', 'service', 'servicegroup', 'servicegroup_name');
     }
 
     public function isValidFilterTarget($column)
diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index ec13abac9..b4f1038da 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -163,7 +163,15 @@ class ServiceStatus extends DataView
 
     public function getFilterColumns()
     {
-        return array('host', 'hostgroup', 'service', 'service_host', 'servicegroup');
+        return array(
+            'host',
+            'hostgroup',
+            'hostgroup_name',
+            'service',
+            'service_host',
+            'servicegroup',
+            'servicegroup_name'
+        );
     }
 
     public function isValidFilterTarget($column)

From e5eca97169857e7286919629dde2db151a279c86 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 11:43:21 +0200
Subject: [PATCH 1141/2920] Use `hostgroup_name' instead of `hostgroup' to
 filter hosts and services

refs #8613
---
 .../views/scripts/list/hostgroups.phtml       | 30 +++++++++----------
 .../scripts/show/components/hostgroups.phtml  |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index c702197b2..94086f446 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -28,7 +28,7 @@
     </thead>
     <tbody>
     <?php foreach ($hostgroups as $h): ?>
-      <tr href="<?= $this->href('monitoring/list/hosts', array('hostgroup' => $h->hostgroup)) ?>">
+      <tr href="<?= $this->href('monitoring/list/hosts', array('hostgroup_name' => $h->hostgroup)) ?>">
        <?php if ($h->services_critical_last_state_change_unhandled): ?>
         <td class="state change critical unhandled">
           <strong><?= $this->translate('CRITICAL'); ?></strong>
@@ -82,7 +82,7 @@
           <?= $this->qlink(
             $h->hostgroup_alias,
             'monitoring/list/hosts',
-            array('hostgroup' => $h->hostgroup),
+            array('hostgroup_name' => $h->hostgroup),
             array('title' => sprintf($this->translate('List all hosts in the group "%s"'), $h->hostgroup_alias))
           ); ?>
         </td>
@@ -90,7 +90,7 @@
           <?= $this->qlink(
             $h->services_total,
             'monitoring/list/services',
-            array('hostgroup' => $h->hostgroup),
+            array('hostgroup_name' => $h->hostgroup),
             array('title' => sprintf(
                 $this->translate('List all services of all hosts in host group "%s"'),
                 $h->hostgroup_alias
@@ -104,9 +104,9 @@
               $h->services_ok,
               'monitoring/list/services',
               array(
-                'service_state' => 0,
-                'hostgroup'     => $h->hostgroup,
-                'sort'          => 'service_severity'
+                'service_state'     => 0,
+                'hostgroup_name'    => $h->hostgroup,
+                'sort'              => 'service_severity'
               ),
               array(
                 'title' => sprintf(
@@ -132,7 +132,7 @@
                 'service_acknowledged'  => 0,
                 'service_in_downtime'   => 0,
                 'host_problem'          => 0,
-                'hostgroup'             => $h->hostgroup,
+                'hostgroup_name'        => $h->hostgroup,
                 'sort'                  => 'service_severity'
               ),
               array(
@@ -156,7 +156,7 @@
                 array(
                   'service_state'     => 2,
                   'service_handled'   => 1,
-                  'hostgroup'         => $h->hostgroup,
+                  'hostgroup_name'    => $h->hostgroup,
                   'sort'              => 'service_severity'
                 ),
                 array(
@@ -186,7 +186,7 @@
                 'service_acknowledged'  => 0,
                 'service_in_downtime'   => 0,
                 'host_problem'          => 0,
-                'hostgroup'             => $h->hostgroup,
+                'hostgroup_name'        => $h->hostgroup,
                 'sort'                  => 'service_severity'
               ),
               array(
@@ -210,7 +210,7 @@
                 array(
                   'service_state'     => 3,
                   'service_handled'   => 1,
-                  'hostgroup'         => $h->hostgroup,
+                  'hostgroup_name'    => $h->hostgroup,
                   'sort'              => 'service_severity'
                 ),
                 array(
@@ -240,7 +240,7 @@
                 'service_acknowledged'  => 0,
                 'service_in_downtime'   => 0,
                 'host_problem'          => 0,
-                'hostgroup'             => $h->hostgroup,
+                'hostgroup_name'        => $h->hostgroup,
                 'sort'                  => 'service_severity'
               ),
               array(
@@ -264,7 +264,7 @@
                 array(
                   'service_state'     => 1,
                   'service_handled'   => 1,
-                  'hostgroup'         => $h->hostgroup,
+                  'hostgroup_name'    => $h->hostgroup,
                   'sort'              => 'service_severity'
                 ),
                 array(
@@ -290,9 +290,9 @@
               $h->services_pending,
               'monitoring/list/services',
               array(
-                'service_state' => 99,
-                'hostgroup'     => $h->hostgroup,
-                'sort'          => 'service_severity'
+                'service_state'     => 99,
+                'hostgroup_name'    => $h->hostgroup,
+                'sort'              => 'service_severity'
               ),
               array(
                 'title' => sprintf(
diff --git a/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml b/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
index eed1ea328..f4b20147d 100644
--- a/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
@@ -7,7 +7,7 @@ foreach ($object->hostgroups as $name => $alias) {
     $list[] = $this->qlink(
         $alias,
         'monitoring/list/hosts',
-        array('hostgroup' => $name),
+        array('hostgroup_name' => $name),
         array('title' => sprintf($this->translate('List all hosts in the group "%s"'), $alias))
     );
 }

From 1e6f292910712e87ded97202c5f55fffe554abdf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 11:43:51 +0200
Subject: [PATCH 1142/2920] Use `servicegroup_name' instead of `servicegroup'
 to filter services

refs #8613
---
 .../views/scripts/list/servicegroups.phtml    | 28 +++++++++----------
 .../show/components/servicegroups.phtml       |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index 0e958a3f7..cc6b76e6a 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -28,7 +28,7 @@
     </thead>
     <tbody>
     <?php foreach ($servicegroups as $s): ?>
-      <tr href="<?= $this->href('monitoring/list/services', array('servicegroup' => $s->servicegroup)); ?>">
+      <tr href="<?= $this->href('monitoring/list/services', array('servicegroup_name' => $s->servicegroup)); ?>">
        <?php if ($s->services_critical_last_state_change_unhandled): ?>
         <td class="state change critical unhandled">
           <strong><?= $this->translate('CRITICAL'); ?></strong>
@@ -82,7 +82,7 @@
           <?= $this->qlink(
             $s->servicegroup_alias,
             'monitoring/list/services',
-            array('servicegroup' => $s->servicegroup),
+            array('servicegroup_name' => $s->servicegroup),
             array('title' => sprintf($this->translate('List all services in the group "%s"'), $s->servicegroup_alias))
           ); ?>
         </td>
@@ -96,9 +96,9 @@
               $s->services_ok,
               'monitoring/list/services',
               array(
-                'service_state' => 0,
-                'servicegroup'  => $s->servicegroup,
-                'sort'          => 'service_severity'
+                'service_state'     => 0,
+                'servicegroup_name' => $s->servicegroup,
+                'sort'              => 'service_severity'
               ),
               array(
                 'title' => sprintf(
@@ -124,7 +124,7 @@
                 'service_acknowledged'  => 0,
                 'service_in_downtime'   => 0,
                 'host_problem'          => 0,
-                'servicegroup'          => $s->servicegroup,
+                'servicegroup_name'     => $s->servicegroup,
                 'sort'                  => 'service_severity'
               ),
               array(
@@ -148,7 +148,7 @@
                 array(
                   'service_state'     => 2,
                   'service_handled'   => 1,
-                  'servicegroup'      => $s->servicegroup,
+                  'servicegroup_name' => $s->servicegroup,
                   'sort'              => 'service_severity'
                 ),
                 array(
@@ -178,7 +178,7 @@
                 'service_acknowledged'  => 0,
                 'service_in_downtime'   => 0,
                 'host_problem'          => 0,
-                'servicegroup'          => $s->servicegroup,
+                'servicegroup_name'     => $s->servicegroup,
                 'sort'                  => 'service_severity'
               ),
               array(
@@ -202,7 +202,7 @@
                 array(
                   'service_state'     => 3,
                   'service_handled'   => 1,
-                  'servicegroup'      => $s->servicegroup,
+                  'servicegroup_name' => $s->servicegroup,
                   'sort'              => 'service_severity'
                 ),
                 array(
@@ -232,7 +232,7 @@
                 'service_acknowledged'  => 0,
                 'service_in_downtime'   => 0,
                 'host_problem'          => 0,
-                'servicegroup'          => $s->servicegroup,
+                'servicegroup_name'     => $s->servicegroup,
                 'sort'                  => 'service_severity'
               ),
               array(
@@ -256,7 +256,7 @@
                 array(
                     'service_state'     => 1,
                     'service_handled'   => 1,
-                    'servicegroup'      => $s->servicegroup,
+                    'servicegroup_name' => $s->servicegroup,
                     'sort'              => 'service_severity'
                 ),
                 array(
@@ -282,9 +282,9 @@
               $s->services_pending,
               'monitoring/list/services',
               array(
-                'service_state' => 99,
-                'servicegroup'  => $s->servicegroup,
-                'sort'          => 'service_severity'
+                'service_state'     => 99,
+                'servicegroup_name' => $s->servicegroup,
+                'sort'              => 'service_severity'
               ),
               array(
                 'title' => sprintf(
diff --git a/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml b/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
index 093e03286..93697ce89 100644
--- a/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
@@ -7,7 +7,7 @@ foreach ($object->servicegroups as $name => $alias) {
     $list[] = $this->qlink(
         $alias,
         'monitoring/list/services',
-        array('servicegroup' => $name),
+        array('servicegroup_name' => $name),
         array('title' => sprintf($this->translate('List all services in the group "%s"'), $alias))
     );
 }

From 0baeb32751c6a5ac50f3550921412a6020a88161 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 9 Apr 2015 12:05:45 +0200
Subject: [PATCH 1143/2920] Temporary disable timesince ui counter

refs #6778
---
 public/js/icinga/ui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index daae6d390..7ab2ef079 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -580,7 +580,7 @@
         refreshTimeSince: function () {
 
             $('.timesince').each(function (idx, el) {
-
+                return;
                 // todo remove after replace timeSince
                 var mp = el.innerHTML.match(/^(.*?)(-?\d+)d\s(-?\d+)h/);
                 if (mp !== null) {

From cb95f53dba97f3874a4d2ed886f370d0a3d27c45 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 12:49:06 +0200
Subject: [PATCH 1144/2920] CommentQuery: Fetch and display object names with
 their initial collation

i.e. `host_name' instead of `comment_host' alias `host'
and `service_description' instead of `comment_service' alias `service'.

refs #8613
---
 .../application/controllers/ListController.php  |  4 ++--
 .../views/scripts/list/comments.phtml           | 17 +++++++++++------
 .../Backend/Ido/Query/CommentQuery.php          |  8 +++-----
 .../library/Monitoring/DataView/Comment.php     |  4 ++--
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 8a9dc5fa4..cf5821cdc 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -474,8 +474,8 @@ class Monitoring_ListController extends Controller
             'type'       => 'comment_type',
             'persistent' => 'comment_is_persistent',
             'expiration' => 'comment_expiration',
-            'host'       => 'comment_host',
-            'service'    => 'comment_service',
+            'host_name',
+            'service_description',
             'host_display_name',
             'service_display_name'
         ));
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 12668eefd..cdbe28244 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -52,11 +52,14 @@
         <?php if ($comment->objecttype === 'service'): ?>
           <?= $this->icon('service', $this->translate('Service')); ?>
           <?= $this->link()->service(
-              $comment->service, $comment->service_display_name, $comment->host, $comment->host_display_name
-          ) ?>
+              $comment->service_description,
+              $comment->service_display_name,
+              $comment->host_name,
+              $comment->host_display_name
+          ); ?>
         <?php else: ?>
           <?= $this->icon('host', $this->translate('Host')); ?>
-          <?= $this->link()->host($comment->host, $comment->host_display_name) ?>
+          <?= $this->link()->host($comment->host_name, $comment->host_display_name); ?>
         <?php endif ?>
           <br>
           <?= $this->icon('comment', $this->translate('Comment')); ?> <?= isset($comment->author)
@@ -81,11 +84,13 @@
           $delCommentForm = clone $delCommentForm;
           $delCommentForm->populate(array('comment_id' => $comment->id, 'redirect' => $this->url));
           if ($comment->objecttype === 'host') {
-            $delCommentForm->setAction($this->url('monitoring/host/delete-comment', array('host_name' => $comment->host)));
+            $delCommentForm->setAction(
+                $this->url('monitoring/host/delete-comment', array('host_name' => $comment->host_name))
+            );
           } else {
             $delCommentForm->setAction($this->url('monitoring/service/delete-comment', array(
-                'host_name'             => $comment->host,
-                'service_description'   => $comment->service
+                'host_name'             => $comment->host_name,
+                'service_description'   => $comment->service_description
             )));
           }
           echo $delCommentForm;
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
index 1348371d3..91800ef78 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
@@ -17,13 +17,11 @@ class CommentQuery extends IdoQuery
             'comment_type'          => "CASE cm.entry_type WHEN 1 THEN 'comment' WHEN 2 THEN 'downtime' WHEN 3 THEN 'flapping' WHEN 4 THEN 'ack' END",
             'comment_is_persistent' => 'cm.is_persistent',
             'comment_expiration'    => 'CASE cm.expires WHEN 1 THEN UNIX_TIMESTAMP(cm.expiration_time) ELSE NULL END',
-            'comment_host'          => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END COLLATE latin1_general_ci',
-            'host'                  => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END COLLATE latin1_general_ci', // #7278, #7279
-            'comment_service'       => 'so.name2 COLLATE latin1_general_ci',
-            'service'               => 'so.name2 COLLATE latin1_general_ci', // #7278, #7279
             'comment_objecttype'    => "CASE WHEN ho.object_id IS NOT NULL THEN 'host' ELSE CASE WHEN so.object_id IS NOT NULL THEN 'service' ELSE NULL END END",
-            'service_description'   => 'so.name2',
+            'host'                  => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END COLLATE latin1_general_ci',
             'host_name'             => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END',
+            'service'               => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'   => 'so.name2',
             'service_host_name'     => 'so.name1'
         ),
         'hosts' => array(
diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index 5172690bb..c74deeb89 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -22,10 +22,10 @@ class Comment extends DataView
             'comment_type',
             'comment_is_persistent',
             'comment_expiration',
-            'comment_host',
-            'comment_service',
             'host',
             'service',
+            'host_name',
+            'service_description',
             'host_display_name',
             'service_display_name'
         );

From 480f5516d60fc750a846dd4487a218d60082f059 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 12:53:28 +0200
Subject: [PATCH 1145/2920] DataView\Comment: Do not permit querying `host' and
 `service'

refs #8613
---
 .../monitoring/library/Monitoring/DataView/Comment.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index c74deeb89..f7f3703b8 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -22,8 +22,6 @@ class Comment extends DataView
             'comment_type',
             'comment_is_persistent',
             'comment_expiration',
-            'host',
-            'service',
             'host_name',
             'service_description',
             'host_display_name',
@@ -56,4 +54,12 @@ class Comment extends DataView
             )
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFilterColumns()
+    {
+        return array('host', 'service');
+    }
 }

From 002b82083584b06753be0f73fda73fb33c40bdcf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 12:55:57 +0200
Subject: [PATCH 1146/2920] CommentQuery: Provide `service_host' additionally
 to `service_host_name'

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/CommentQuery.php       | 1 +
 modules/monitoring/library/Monitoring/DataView/Comment.php      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
index 91800ef78..882a31ff6 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
@@ -22,6 +22,7 @@ class CommentQuery extends IdoQuery
             'host_name'             => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END',
             'service'               => 'so.name2 COLLATE latin1_general_ci',
             'service_description'   => 'so.name2',
+            'service_host'          => 'so.name1 COLLATE latin1_general_ci',
             'service_host_name'     => 'so.name1'
         ),
         'hosts' => array(
diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index f7f3703b8..8d4e46f90 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -60,6 +60,6 @@ class Comment extends DataView
      */
     public function getFilterColumns()
     {
-        return array('host', 'service');
+        return array('host', 'service', 'service_host');
     }
 }

From 8ed1c8eeb60342a25d21bfa6eabec1988bdc54dc Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 12:56:31 +0200
Subject: [PATCH 1147/2920] DataView\Comment: Add `service_host_name' as
 allowed query column

refs #8613
---
 modules/monitoring/library/Monitoring/DataView/Comment.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index 8d4e46f90..57f7b85bd 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -25,7 +25,8 @@ class Comment extends DataView
             'host_name',
             'service_description',
             'host_display_name',
-            'service_display_name'
+            'service_display_name',
+            'service_host_name'
         );
     }
 

From 21c76010d44f7a24ffabdebef62b3dccab6a355d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 13:06:38 +0200
Subject: [PATCH 1148/2920] CommentQuery: Add `comment_author_name' as
 additional query column

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/CommentQuery.php        | 1 +
 modules/monitoring/library/Monitoring/DataView/Comment.php       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
index 882a31ff6..eff3bc1e7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
@@ -13,6 +13,7 @@ class CommentQuery extends IdoQuery
             'comment_internal_id'   => 'cm.internal_comment_id',
             'comment_data'          => 'cm.comment_data',
             'comment_author'        => 'cm.author_name COLLATE latin1_general_ci',
+            'comment_author_name'   => 'cm.author_name',
             'comment_timestamp'     => 'UNIX_TIMESTAMP(cm.comment_time)',
             'comment_type'          => "CASE cm.entry_type WHEN 1 THEN 'comment' WHEN 2 THEN 'downtime' WHEN 3 THEN 'flapping' WHEN 4 THEN 'ack' END",
             'comment_is_persistent' => 'cm.is_persistent',
diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index 57f7b85bd..c0e5370ff 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -18,6 +18,7 @@ class Comment extends DataView
             'comment_internal_id',
             'comment_data',
             'comment_author',
+            'comment_author_name',
             'comment_timestamp',
             'comment_type',
             'comment_is_persistent',

From 5372dfb7f1b8a273377ae8ea2a726db29ae21db0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 13:07:50 +0200
Subject: [PATCH 1149/2920] Fetch a comment's author using
 `comment_author_name'

refs #8613
---
 modules/monitoring/application/controllers/ListController.php   | 2 +-
 .../monitoring/library/Monitoring/Object/MonitoredObject.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index cf5821cdc..71325e05a 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -469,7 +469,7 @@ class Monitoring_ListController extends Controller
             'id'         => 'comment_internal_id',
             'objecttype' => 'comment_objecttype',
             'comment'    => 'comment_data',
-            'author'     => 'comment_author',
+            'author'     => 'comment_author_name',
             'timestamp'  => 'comment_timestamp',
             'type'       => 'comment_type',
             'persistent' => 'comment_is_persistent',
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 621c25c75..c33e1be2d 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -248,7 +248,7 @@ abstract class MonitoredObject implements Filterable
         $comments = $this->backend->select()->from('comment', array(
             'id'        => 'comment_internal_id',
             'timestamp' => 'comment_timestamp',
-            'author'    => 'comment_author',
+            'author'    => 'comment_author_name',
             'comment'   => 'comment_data',
             'type'      => 'comment_type',
         ))

From bc6a086ff8850184cba7abf32b79f01356dc01e8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 13:08:49 +0200
Subject: [PATCH 1150/2920] DataView\Comment: Do not permit `comment_author' to
 be queried

refs #8163
---
 modules/monitoring/library/Monitoring/DataView/Comment.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index c0e5370ff..1fadd8b62 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -17,7 +17,6 @@ class Comment extends DataView
             'comment_objecttype',
             'comment_internal_id',
             'comment_data',
-            'comment_author',
             'comment_author_name',
             'comment_timestamp',
             'comment_type',
@@ -62,6 +61,6 @@ class Comment extends DataView
      */
     public function getFilterColumns()
     {
-        return array('host', 'service', 'service_host');
+        return array('comment_author', 'host', 'service', 'service_host');
     }
 }

From 0312d8d6da9097e1a513b6b5b987897941004372 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 9 Apr 2015 13:53:05 +0200
Subject: [PATCH 1151/2920] Add pie chart and state summary to command forms

refs #8565
---
 .../controllers/HostsController.php           | 17 +++----
 .../controllers/ServicesController.php        | 49 ++++++-------------
 .../views/scripts/hosts/show.phtml            |  7 ---
 .../list/components/hostssummary.phtml        |  1 -
 .../command/objects-command-form.phtml        |  4 +-
 .../partials/host/objects-header.phtml        |  8 ++-
 .../partials/service/objects-header.phtml     | 22 +++++++--
 .../views/scripts/services/show.phtml         | 10 ----
 public/css/icinga/layout-structure.less       |  1 +
 9 files changed, 49 insertions(+), 70 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 093d0a841..a66e478a2 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -82,19 +82,14 @@ class Monitoring_HostsController extends Controller
             ->setRedirectUrl(Url::fromPath('monitoring/hosts/show')->setParams($this->params))
             ->handleRequest();
 
-        $hostStates = array(
-            Host::getStateText(Host::STATE_UP) => 0,
-            Host::getStateText(Host::STATE_DOWN) => 0,
-            Host::getStateText(Host::STATE_UNREACHABLE) => 0,
-            Host::getStateText(Host::STATE_PENDING) => 0,
-        );
-        foreach ($this->hostList as $host) {
-            ++$hostStates[$host::getStateText($host->state)];
-        }
-
         $this->view->form = $form;
         $this->view->objects = $this->hostList;
-        $this->view->hostStates = $hostStates;
+        $this->view->stats = $this->hostList->getStateSummary();
+        $this->view->hostStatesPieChart = InlinePie::createFromStateSummary(
+            $this->view->stats,
+            $this->translate('Host State'),
+            InlinePie::$colorsHostStatesHandledUnhandled
+        );
         $this->_helper->viewRenderer('partials/command/objects-command-form', null, true);
         return $form;
     }
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index e37852fff..c8a406ca3 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -64,7 +64,10 @@ class Monitoring_ServicesController extends Controller
     {
         $this->serviceList->setColumns(array(
             'host_name',
+            'host_output',
             'host_state',
+            'host_problem',
+            'host_handled',
             'service_description',
             'service_state',
             'service_problem',
@@ -83,32 +86,21 @@ class Monitoring_ServicesController extends Controller
             ->setRedirectUrl(Url::fromPath('monitoring/services/show')->setParams($this->params))
             ->handleRequest();
 
-        $serviceStates = array(
-            Service::getStateText(Service::STATE_OK) => 0,
-            Service::getStateText(Service::STATE_WARNING) => 0,
-            Service::getStateText(Service::STATE_CRITICAL) => 0,
-            Service::getStateText(Service::STATE_UNKNOWN) => 0,
-            Service::getStateText(Service::STATE_PENDING) => 0
-        );
-        $knownHostStates = array();
-        $hostStates = array(
-            Host::getStateText(Host::STATE_UP) => 0,
-            Host::getStateText(Host::STATE_DOWN) => 0,
-            Host::getStateText(Host::STATE_UNREACHABLE) => 0,
-            Host::getStateText(Host::STATE_PENDING) => 0,
-        );
-        foreach ($this->serviceList as $service) {
-            ++$serviceStates[$service::getStateText($service->state)];
-            if (! isset($knownHostStates[$service->getHost()->getName()])) {
-                $knownHostStates[$service->getHost()->getName()] = true;
-                ++$hostStates[$service->getHost()->getStateText($service->host_state)];
-            }
-        }
-
         $this->view->form = $form;
         $this->view->objects = $this->serviceList;
-        $this->view->serviceStates = $serviceStates;
-        $this->view->hostStates = $hostStates;
+        $this->view->stats = $this->serviceList->getServiceStateSummary();
+        $this->view->serviceStates = true;
+        $this->view->serviceStatesPieChart = InlinePie::createFromStateSummary(
+            $this->view->stats,
+            $this->translate('Service State'),
+            InlinePie::$colorsServiceStatesHandleUnhandled
+        );
+        $this->view->hostStates = $this->serviceList->getHostStateSummary();
+        $this->view->hostStatesPieChart = InlinePie::createFromStateSummary(
+            $this->view->hostStates,
+            $this->translate('Service State'),
+            InlinePie::$colorsHostStatesHandledUnhandled
+        );
         $this->_helper->viewRenderer('partials/command/objects-command-form', null, true);
         return $form;
     }
@@ -168,15 +160,6 @@ class Monitoring_ServicesController extends Controller
             $this->translate('Host State'),
             InlinePie::$colorsHostStatesHandledUnhandled
         );
-        /*
-        if (! empty($objectsInDowntime)) {
-            $removeDowntimeForm = new DeleteDowntimeCommandForm();
-            $removeDowntimeForm
-                ->setObjects($objectsInDowntime)
-                ->handleRequest();
-            $this->view->removeDowntimeForm = $removeDowntimeForm;
-        }
-        */
         $this->setAutorefreshInterval(15);
         $this->view->rescheduleAllLink = Url::fromRequest()->setPath('monitoring/services/reschedule-check');
         $this->view->downtimeAllLink = Url::fromRequest()->setPath('monitoring/services/schedule-downtime');
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 656cf9f47..2fcfbc448 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -5,13 +5,6 @@
     <?php endif ?>
 
     <?= $this->render('list/components/hostssummary.phtml') ?>
-
-    <br>
-    <div class="hbox-item">
-        <?= $this->translate('States:') ?>
-        &nbsp;<?= $hostStatesPieChart; ?>
-    </div>
-
     <?= $this->render('partials/host/objects-header.phtml'); ?>
 
 </div>
diff --git a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
index 418a64906..3ecb2279a 100644
--- a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
@@ -12,7 +12,6 @@ function urlAddFilterOptional($url, $filter, $optional) {
     return $url->setQueryString($f->toQueryString());
 }
 $this->baseFilter = isset($this->baseFilter) ? $this->baseFilter : null;
-
 $selfUrl = 'monitoring/list/hosts';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
 ?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
diff --git a/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml b/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
index ece0aea34..42c6e73cd 100644
--- a/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
+++ b/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
@@ -5,10 +5,10 @@
    <?php endif ?>
 
   <?php if (isset($serviceStates)): ?>
-    <h1><?= sprintf($this->translate('%d Services Selected'), count($objects)) ?></h1>
+    <?= $this->render('list/components/servicesummary.phtml') ?>
     <?= $this->render('partials/service/objects-header.phtml'); ?>
   <?php else: ?>
-    <h1><?= sprintf($this->translate('%d Hosts Selected'), count($objects)) ?></h1>
+    <?= $this->render('list/components/hostssummary.phtml') ?>
     <?= $this->render('partials/host/objects-header.phtml'); ?>
   <?php endif ?>
 </div>
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index 0b20cc766..f6ea43d84 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -8,6 +8,11 @@ $hidden = array();
 $hiddenRich = array();
 ?>
 
+<div class="hbox-item">
+    <?= $this->translate('States:') ?>
+    &nbsp;<?= $hostStatesPieChart; ?>
+</div>
+
 <?php if (($hostCount = count($objects)) > 0): ?>
 
     <p>
@@ -61,7 +66,8 @@ $hiddenRich = array();
 
         <tr>
             <td class="state">
-                <div data-title-rich="<span align='left'><?= join('<br>', $hiddenRich) ?></span>"
+                <div <?= count($hidden) ?
+                            'data-title-rich="<span align=\'left\'>' . join('<br>', $hiddenRich) . '</span>"' : ''; ?>
                      title="<?= join(', ', $hidden) ?>">
                         <?php
                         echo $this->qlink(
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index 57d1b67e6..3880e4473 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -2,6 +2,15 @@
 use Icinga\Module\Monitoring\Object\Service;
 ?>
 
+<div class="hbox-item">
+    <?= $this->translate('Service states:') ?>
+    &nbsp;<?= $serviceStatesPieChart; ?>
+</div>
+<div class="hbox-item">
+    <?= $this->translate('Host states:') ?>
+    &nbsp;<?= $hostStatesPieChart; ?>
+</div>
+
 <?php
     $i = 0;
     $hidden = array();
@@ -14,19 +23,22 @@ use Icinga\Module\Monitoring\Object\Service;
     <?php foreach ($objects as $service): /** @var Service $service */ ?>
         <?php
         $i++;
-        if ($i > 5) {
+        if ($i > 5 && $i < 20) {
             $desc = $service->getName() . ' on ' . $service->getHost()->getName();
             $hidden[] = $desc;
             $hiddenRich[] = sprintf("<div class='color-box badge-%s'></div>%s", $service->getStateText($service->service_state) ,$desc);
+        }
+        if ($i == 20) {
+            $hiddenRich[] = '...';
+        }
+        if ($i > 5) {
             continue;
         }
         ?>
 
         <tr class="state <?= Service::getStateText($service->service_state); ?><?= $service->service_handled ? ' handled' : '' ?>">
             <td class="state"><?= Service::getStateText($service->service_state, true); ?><br /></td>
-
             <td>
-
                 <?php if (!$service->service_handled && $service->service_state > 0): ?>
                     <?= $this->icon('attention-alt', $this->translate('Unhandled')) ?>
                 <?php endif ?>
@@ -52,7 +64,6 @@ use Icinga\Module\Monitoring\Object\Service;
                 <?php if (isset($service->service_last_comment) && $service->service_last_comment !== null): ?>
                     <?= $this->icon('comment', $this->translate('Last Comment: ') . $service->service_last_comment) ?>
                 <?php endif ?>
-
             </td>
             <td class="name oneline"><?= $this->escape($service->getName()); ?></td>
             <td class="name oneline"><?= $this->escape($service->getHost()->getName()); ?></b></td>
@@ -62,7 +73,8 @@ use Icinga\Module\Monitoring\Object\Service;
 
     <tr>
         <td class="state">
-            <div data-title-rich="<span align='left'><?= join('<br>', $hiddenRich) ?></span>"
+            <div <?= count($hidden) ?
+                'data-title-rich="<span align=\'left\'>' . join('<br>', $hiddenRich) . '</span>"' : ''; ?>
                  title="<?= join(', ', $hidden) ?>">
 
                 <?php
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 5401a38d3..0c7f20d46 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -5,16 +5,6 @@
     <?php endif ?>
 
     <?= $this->render('list/components/servicesummary.phtml') ?>
-    <br>
-    <div class="hbox-item">
-        <?= $this->translate('Service states:') ?>
-        &nbsp;<?= $serviceStatesPieChart; ?>
-    </div>
-    <div class="hbox-item">
-        <?= $this->translate('Host states:') ?>
-        &nbsp;<?= $hostStatesPieChart; ?>
-    </div>
-
     <?= $this->render('partials/service/objects-header.phtml'); ?>
 
 </div>
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 3aa7da077..ee531d354 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -345,6 +345,7 @@ html {
 .hbox-item {
   display: inline-block;
   vertical-align: top;
+  margin-top: 0.5em;
   margin-bottom: 0.25em;
   margin-left: 1em;
   margin-right: 1em;

From 84a2727523128f1c53b90121ca260add4cf164c6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 14:17:27 +0200
Subject: [PATCH 1152/2920] Eventhistory: Fetch object names using their
 columns with initial collation

refs #8613
---
 .../monitoring/application/controllers/ListController.php   | 4 +---
 .../application/views/scripts/list/eventhistory.phtml       | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 71325e05a..cd0a734ef 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -623,9 +623,7 @@ class Monitoring_ListController extends Controller
             'attempt',
             'max_attempts',
             'output',
-            'type',
-            'host',
-            'service'
+            'type'
         ));
 
         $this->filterQuery($query);
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 0b6b9bcec..3e2ad32c8 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -34,7 +34,7 @@ use Icinga\Module\Monitoring\Object\Service;
       $icon = 'help';
       $title = $event->type;
       $stateName = 'invalid';
-      $isService = isset($event->service);
+      $isService = isset($event->service_description);
       switch ($event->type) {
         case 'notify':
           $icon = 'bell';
@@ -99,10 +99,10 @@ use Icinga\Module\Monitoring\Object\Service;
         <td>
         <?php if ($isService): ?>
           <?= $this->link()->service(
-              $event->service, $event->service_display_name, $event->host, $event->host_display_name
+              $event->service_description, $event->service_display_name, $event->host_name, $event->host_display_name
           ) ?>
         <?php else: ?>
-          <?= $this->link()->host($event->host, $event->host_display_name) ?>
+          <?= $this->link()->host($event->host_name, $event->host_display_name) ?>
         <?php endif ?>
           <br>
           <div>

From 2c38ccda5c238e6c3ecef2c1bf817beb82e42229 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 14:19:31 +0200
Subject: [PATCH 1153/2920] EventHistoryQuery: Drop column `service_host_name'

refs #8613
---
 .../application/controllers/AlertsummaryController.php       | 5 ++---
 .../Monitoring/Backend/Ido/Query/EventHistoryQuery.php       | 3 +--
 .../monitoring/library/Monitoring/DataView/EventHistory.php  | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 54150dac2..22c7035d9 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -263,7 +263,7 @@ class Monitoring_AlertsummaryController extends Controller
         $interval = $this->getInterval();
 
         $query = $this->backend->select()->from(
-            'EventHistory',
+            'eventHistory',
             array(
                 'host_name',
                 'service_description',
@@ -275,8 +275,7 @@ class Monitoring_AlertsummaryController extends Controller
                 'output',
                 'type',
                 'host',
-                'service',
-                'service_host_name'
+                'service'
             )
         );
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index 370fad9af..1b87779ce 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
@@ -40,8 +40,7 @@ class EventHistoryQuery extends IdoQuery
             'attempt'               => 'eh.attempt',
             'max_attempts'          => 'eh.max_attempts',
             'output'                => 'eh.output', // we do not want long_output
-            'type'                  => 'eh.type',
-            'service_host_name'     => 'eho.name1 COLLATE latin1_general_ci'
+            'type'                  => 'eh.type'
         ),
         'hostgroups' => array(
             'hostgroup'             => 'hgo.name1 COLLATE latin1_general_ci',
diff --git a/modules/monitoring/library/Monitoring/DataView/EventHistory.php b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
index 8fcc4f35a..32eadd4ba 100644
--- a/modules/monitoring/library/Monitoring/DataView/EventHistory.php
+++ b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
@@ -30,8 +30,7 @@ class EventHistory extends DataView
             'output',
             'type',
             'host',
-            'service',
-            'service_host_name'
+            'service'
         );
     }
 

From 044a15d113396af890ab4f9d6e551c0ad21afe12 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 14:29:26 +0200
Subject: [PATCH 1154/2920] Alertsummary: Do not fetch more columns than
 necessary..

---
 .../controllers/AlertsummaryController.php    | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 22c7035d9..e6b99c8a4 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -210,12 +210,7 @@ class Monitoring_AlertsummaryController extends Controller
         $query = $this->backend->select()->from(
             'notification',
             array(
-                'host',
-                'service',
-                'notification_output',
-                'notification_contact',
-                'notification_start_time',
-                'notification_state'
+                'notification_start_time'
             )
         );
 
@@ -265,17 +260,7 @@ class Monitoring_AlertsummaryController extends Controller
         $query = $this->backend->select()->from(
             'eventHistory',
             array(
-                'host_name',
-                'service_description',
-                'object_type',
-                'timestamp',
-                'state',
-                'attempt',
-                'max_attempts',
-                'output',
-                'type',
-                'host',
-                'service'
+                'timestamp'
             )
         );
 

From ae10e01ed6dccd94104b423f7a98fd7fac904e84 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 14:39:47 +0200
Subject: [PATCH 1155/2920] EventHistoryQuery: Remove COLLATE from the column
 `host_name'

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index 1b87779ce..9c645aedd 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
@@ -32,8 +32,8 @@ class EventHistoryQuery extends IdoQuery
             'cnt_downtime_end'      => "SUM(CASE eh.type WHEN 'dt_end' THEN 1 ELSE 0 END)",
             'host'                  => 'eho.name1 COLLATE latin1_general_ci',
             'service'               => 'eho.name2 COLLATE latin1_general_ci',
-            'host_name'             => 'eho.name1 COLLATE latin1_general_ci',
             'service_description'   => 'eho.name2 COLLATE latin1_general_ci',
+            'host_name'             => 'eho.name1',
             'object_type'           => 'eh.object_type',
             'timestamp'             => 'eh.timestamp',
             'state'                 => 'eh.state',

From b7e1c2d51811d564010826c4b4766a55d984fc6e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 14:40:12 +0200
Subject: [PATCH 1156/2920] EventHistoryQuery: Remove COLLATE from the column
 `service_description'

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index 9c645aedd..d6dd52c45 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
@@ -32,8 +32,8 @@ class EventHistoryQuery extends IdoQuery
             'cnt_downtime_end'      => "SUM(CASE eh.type WHEN 'dt_end' THEN 1 ELSE 0 END)",
             'host'                  => 'eho.name1 COLLATE latin1_general_ci',
             'service'               => 'eho.name2 COLLATE latin1_general_ci',
-            'service_description'   => 'eho.name2 COLLATE latin1_general_ci',
             'host_name'             => 'eho.name1',
+            'service_description'   => 'eho.name2',
             'object_type'           => 'eh.object_type',
             'timestamp'             => 'eh.timestamp',
             'state'                 => 'eh.state',

From ec67c28629e15528b674c47035e6562a019d38c0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 14:41:10 +0200
Subject: [PATCH 1157/2920] DataView\EventHistory: Do not permit `host' and
 `service' to be queried

refs #8613
---
 .../library/Monitoring/DataView/EventHistory.php          | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/EventHistory.php b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
index 32eadd4ba..2d56f4c5c 100644
--- a/modules/monitoring/library/Monitoring/DataView/EventHistory.php
+++ b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
@@ -28,9 +28,7 @@ class EventHistory extends DataView
             'attempt',
             'max_attempts',
             'output',
-            'type',
-            'host',
-            'service'
+            'type'
         );
     }
 
@@ -46,8 +44,6 @@ class EventHistory extends DataView
 
     public function getFilterColumns()
     {
-        return array(
-            'hostgroups'
-        );
+        return array('host', 'service', 'hostgroup');
     }
 }

From 9e79419eb1ae222eb2ab54bdf84bd9f67307381e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 14:44:10 +0200
Subject: [PATCH 1158/2920] EventHistoryQuery: Provide `hostgroup_name' as
 alternative to `hostgroup'

This can't be queried though until #7274 has been resolved.

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php   | 1 +
 modules/monitoring/library/Monitoring/DataView/EventHistory.php  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index d6dd52c45..0c77e82a6 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
@@ -44,6 +44,7 @@ class EventHistoryQuery extends IdoQuery
         ),
         'hostgroups' => array(
             'hostgroup'             => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_name'        => 'hgo.name1'
         ),
         'hosts' => array(
             'host_display_name'     => 'CASE WHEN sh.display_name IS NOT NULL THEN sh.display_name ELSE h.display_name END'
diff --git a/modules/monitoring/library/Monitoring/DataView/EventHistory.php b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
index 2d56f4c5c..c19a4a376 100644
--- a/modules/monitoring/library/Monitoring/DataView/EventHistory.php
+++ b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
@@ -22,6 +22,7 @@ class EventHistory extends DataView
             'host_display_name',
             'service_description',
             'service_display_name',
+            'hostgroup_name',
             'object_type',
             'timestamp',
             'state',

From 51bf5cfbc8bac617371401eaf4cc75120e72255f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 15:13:59 +0200
Subject: [PATCH 1159/2920] *historyQuery: Drop redundant query columns

refs #8613
---
 .../Ido/Query/CommentdeletionhistoryQuery.php | 32 +++++++++----------
 .../Backend/Ido/Query/CommenthistoryQuery.php | 32 +++++++++----------
 .../Ido/Query/DowntimeendhistoryQuery.php     | 32 +++++++++----------
 .../Ido/Query/DowntimestarthistoryQuery.php   | 32 +++++++++----------
 .../Ido/Query/NotificationhistoryQuery.php    | 32 +++++++++----------
 .../Backend/Ido/Query/StatehistoryQuery.php   |  8 ++---
 6 files changed, 79 insertions(+), 89 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
index ec8fbd147..86ca8c8c2 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
@@ -7,24 +7,22 @@ class CommentdeletionhistoryQuery extends IdoQuery
 {
     protected $columnMap = array(
         'commenthistory' => array(
-            'state_time'    => 'h.deletion_time',
-            'timestamp'     => 'UNIX_TIMESTAMP(h.deletion_time)',
-            'raw_timestamp' => 'h.deletion_time',
-            'object_id'     => 'h.object_id',
-            'type'          => "(CASE h.entry_type WHEN 1 THEN 'comment_deleted' WHEN 2 THEN 'dt_comment_deleted' WHEN 3 THEN 'flapping_deleted' WHEN 4 THEN 'ack_deleted' END)",
-            'state'         => '(NULL)',
-            'state_type'    => '(NULL)',
-            'output'        => "('[' || h.author_name || '] ' || h.comment_data)",
-            'attempt'       => '(NULL)',
-            'max_attempts'  => '(NULL)',
+            'state_time'            => 'h.deletion_time',
+            'timestamp'             => 'UNIX_TIMESTAMP(h.deletion_time)',
+            'raw_timestamp'         => 'h.deletion_time',
+            'object_id'             => 'h.object_id',
+            'type'                  => "(CASE h.entry_type WHEN 1 THEN 'comment_deleted' WHEN 2 THEN 'dt_comment_deleted' WHEN 3 THEN 'flapping_deleted' WHEN 4 THEN 'ack_deleted' END)",
+            'state'                 => '(NULL)',
+            'state_type'            => '(NULL)',
+            'output'                => "('[' || h.author_name || '] ' || h.comment_data)",
+            'attempt'               => '(NULL)',
+            'max_attempts'          => '(NULL)',
 
-            'host'                => 'o.name1 COLLATE latin1_general_ci',
-            'service'             => 'o.name2 COLLATE latin1_general_ci',
-            'host_name'           => 'o.name1 COLLATE latin1_general_ci',
-            'service_description' => 'o.name2 COLLATE latin1_general_ci',
-            'service_host_name'   => 'o.name1 COLLATE latin1_general_ci',
-            'service_description' => 'o.name2 COLLATE latin1_general_ci',
-            'object_type'         => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
+            'host'                  => 'o.name1 COLLATE latin1_general_ci',
+            'service'               => 'o.name2 COLLATE latin1_general_ci',
+            'host_name'             => 'o.name1 COLLATE latin1_general_ci',
+            'service_description'   => 'o.name2 COLLATE latin1_general_ci',
+            'object_type'           => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
         )
     );
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
index 460d4be88..fd6f8a72c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
@@ -7,24 +7,22 @@ class CommenthistoryQuery extends IdoQuery
 {
     protected $columnMap = array(
         'commenthistory' => array(
-            'state_time'    => 'h.comment_time',
-            'timestamp'     => 'UNIX_TIMESTAMP(h.comment_time)',
-            'raw_timestamp' => 'h.comment_time',
-            'object_id'     => 'h.object_id',
-            'type'          => "(CASE h.entry_type WHEN 1 THEN 'comment' WHEN 2 THEN 'dt_comment' WHEN 3 THEN 'flapping' WHEN 4 THEN 'ack' END)",
-            'state'         => '(NULL)',
-            'state_type'    => '(NULL)',
-            'output'        => "('[' || h.author_name || '] ' || h.comment_data)",
-            'attempt'       => '(NULL)',
-            'max_attempts'  => '(NULL)',
+            'state_time'            => 'h.comment_time',
+            'timestamp'             => 'UNIX_TIMESTAMP(h.comment_time)',
+            'raw_timestamp'         => 'h.comment_time',
+            'object_id'             => 'h.object_id',
+            'type'                  => "(CASE h.entry_type WHEN 1 THEN 'comment' WHEN 2 THEN 'dt_comment' WHEN 3 THEN 'flapping' WHEN 4 THEN 'ack' END)",
+            'state'                 => '(NULL)',
+            'state_type'            => '(NULL)',
+            'output'                => "('[' || h.author_name || '] ' || h.comment_data)",
+            'attempt'               => '(NULL)',
+            'max_attempts'          => '(NULL)',
 
-            'host'                => 'o.name1 COLLATE latin1_general_ci',
-            'service'             => 'o.name2 COLLATE latin1_general_ci',
-            'host_name'           => 'o.name1 COLLATE latin1_general_ci',
-            'service_description' => 'o.name2 COLLATE latin1_general_ci',
-            'service_host_name'   => 'o.name1 COLLATE latin1_general_ci',
-            'service_description' => 'o.name2 COLLATE latin1_general_ci',
-            'object_type'         => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
+            'host'                  => 'o.name1 COLLATE latin1_general_ci',
+            'service'               => 'o.name2 COLLATE latin1_general_ci',
+            'host_name'             => 'o.name1 COLLATE latin1_general_ci',
+            'service_description'   => 'o.name2 COLLATE latin1_general_ci',
+            'object_type'           => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
         )
     );
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
index 12f1f94e9..1b7d31ccd 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
@@ -7,24 +7,22 @@ class DowntimeendhistoryQuery extends IdoQuery
 {
     protected $columnMap = array(
         'downtimehistory' => array(
-            'state_time'    => 'h.actual_end_time',
-            'timestamp'     => 'UNIX_TIMESTAMP(h.actual_end_time)',
-            'raw_timestamp' => 'h.actual_end_time',
-            'object_id'     => 'h.object_id',
-            'type'          => "('dt_end')",
-            'state'         => '(NULL)',
-            'state_type'    => '(NULL)',
-            'output'        => "('[' || h.author_name || '] ' || h.comment_data)",
-            'attempt'       => '(NULL)',
-            'max_attempts'  => '(NULL)',
+            'state_time'            => 'h.actual_end_time',
+            'timestamp'             => 'UNIX_TIMESTAMP(h.actual_end_time)',
+            'raw_timestamp'         => 'h.actual_end_time',
+            'object_id'             => 'h.object_id',
+            'type'                  => "('dt_end')",
+            'state'                 => '(NULL)',
+            'state_type'            => '(NULL)',
+            'output'                => "('[' || h.author_name || '] ' || h.comment_data)",
+            'attempt'               => '(NULL)',
+            'max_attempts'          => '(NULL)',
 
-            'host'                => 'o.name1 COLLATE latin1_general_ci',
-            'service'             => 'o.name2 COLLATE latin1_general_ci',
-            'host_name'           => 'o.name1 COLLATE latin1_general_ci',
-            'service_description' => 'o.name2 COLLATE latin1_general_ci',
-            'service_host_name'   => 'o.name1 COLLATE latin1_general_ci',
-            'service_description' => 'o.name2 COLLATE latin1_general_ci',
-            'object_type'         => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
+            'host'                  => 'o.name1 COLLATE latin1_general_ci',
+            'service'               => 'o.name2 COLLATE latin1_general_ci',
+            'host_name'             => 'o.name1 COLLATE latin1_general_ci',
+            'service_description'   => 'o.name2 COLLATE latin1_general_ci',
+            'object_type'           => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
         )
     );
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
index 99b1257ab..a86d47dce 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
@@ -7,24 +7,22 @@ class DowntimestarthistoryQuery extends IdoQuery
 {
     protected $columnMap = array(
         'downtimehistory' => array(
-            'state_time'    => 'h.actual_start_time',
-            'timestamp'     => 'UNIX_TIMESTAMP(h.actual_start_time)',
-            'raw_timestamp' => 'h.actual_start_time',
-            'object_id'     => 'h.object_id',
-            'type'          => "('dt_start')",
-            'state'         => '(NULL)',
-            'state_type'    => '(NULL)',
-            'output'        => "('[' || h.author_name || '] ' || h.comment_data)",
-            'attempt'       => '(NULL)',
-            'max_attempts'  => '(NULL)',
+            'state_time'            => 'h.actual_start_time',
+            'timestamp'             => 'UNIX_TIMESTAMP(h.actual_start_time)',
+            'raw_timestamp'         => 'h.actual_start_time',
+            'object_id'             => 'h.object_id',
+            'type'                  => "('dt_start')",
+            'state'                 => '(NULL)',
+            'state_type'            => '(NULL)',
+            'output'                => "('[' || h.author_name || '] ' || h.comment_data)",
+            'attempt'               => '(NULL)',
+            'max_attempts'          => '(NULL)',
 
-            'host'                => 'o.name1 COLLATE latin1_general_ci',
-            'service'             => 'o.name2 COLLATE latin1_general_ci',
-            'host_name'           => 'o.name1 COLLATE latin1_general_ci',
-            'service_description' => 'o.name2 COLLATE latin1_general_ci',
-            'service_host_name'   => 'o.name1 COLLATE latin1_general_ci',
-            'service_description' => 'o.name2 COLLATE latin1_general_ci',
-            'object_type'         => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
+            'host'                  => 'o.name1 COLLATE latin1_general_ci',
+            'service'               => 'o.name2 COLLATE latin1_general_ci',
+            'host_name'             => 'o.name1 COLLATE latin1_general_ci',
+            'service_description'   => 'o.name2 COLLATE latin1_general_ci',
+            'object_type'           => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
         )
     );
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
index 37a7f48b5..09e4184f7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
@@ -7,24 +7,22 @@ class NotificationhistoryQuery extends IdoQuery
 {
     protected $columnMap = array(
         'history' => array(
-            'timestamp'     => 'UNIX_TIMESTAMP(n.start_time)',
-            'raw_timestamp' => 'n.start_time',
-            'state_time'    => 'n.start_time',
-            'object_id'     => 'n.object_id',
-            'type'          => "('notify')",
-            'state'         => 'n.state',
-            'state_type'    => '(NULL)',
-            'output'        => null,
-            'attempt'       => '(NULL)',
-            'max_attempts'  => '(NULL)',
+            'state_time'            => 'n.start_time',
+            'timestamp'             => 'UNIX_TIMESTAMP(n.start_time)',
+            'raw_timestamp'         => 'n.start_time',
+            'object_id'             => 'n.object_id',
+            'type'                  => "('notify')",
+            'state'                 => 'n.state',
+            'state_type'            => '(NULL)',
+            'output'                => null,
+            'attempt'               => '(NULL)',
+            'max_attempts'          => '(NULL)',
 
-            'host'                => 'o.name1 COLLATE latin1_general_ci',
-            'service'             => 'o.name2 COLLATE latin1_general_ci',
-            'host_name'           => 'o.name1 COLLATE latin1_general_ci',
-            'service_description' => 'o.name2 COLLATE latin1_general_ci',
-            'service_host_name'   => 'o.name1 COLLATE latin1_general_ci',
-            'service_description' => 'o.name2 COLLATE latin1_general_ci',
-            'object_type'         => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
+            'host'                  => 'o.name1 COLLATE latin1_general_ci',
+            'service'               => 'o.name2 COLLATE latin1_general_ci',
+            'host_name'             => 'o.name1 COLLATE latin1_general_ci',
+            'service_description'   => 'o.name2 COLLATE latin1_general_ci',
+            'object_type'           => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
         )
     );
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
index 5456c0b2b..f17c366bd 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
@@ -12,9 +12,9 @@ class StatehistoryQuery extends IdoQuery
 
     protected $columnMap = array(
         'statehistory' => array(
-            'raw_timestamp'         => 'sh.state_time',
-            'timestamp'             => 'UNIX_TIMESTAMP(sh.state_time)',
             'state_time'            => 'sh.state_time',
+            'timestamp'             => 'UNIX_TIMESTAMP(sh.state_time)',
+            'raw_timestamp'         => 'sh.state_time',
             'object_id'             => 'sho.object_id',
             'type'                  => "(CASE WHEN sh.state_type = 1 THEN 'hard_state' ELSE 'soft_state' END)",
             'state'                 => 'sh.state',
@@ -22,11 +22,11 @@ class StatehistoryQuery extends IdoQuery
             'output'                => 'sh.output',
             'attempt'               => 'sh.current_check_attempt',
             'max_attempts'          => 'sh.max_check_attempts',
+
             'host'                  => 'sho.name1 COLLATE latin1_general_ci',
-            'host_name'             => 'sho.name1 COLLATE latin1_general_ci',
             'service'               => 'sho.name2 COLLATE latin1_general_ci',
+            'host_name'             => 'sho.name1 COLLATE latin1_general_ci',
             'service_description'   => 'sho.name2 COLLATE latin1_general_ci',
-            'service_host_name'     => 'sho.name1 COLLATE latin1_general_ci',
             'object_type'           => "CASE WHEN sho.objecttype_id = 1 THEN 'host' ELSE 'service' END"
         )
     );

From ea874f84021f7926b4501eca13d017a1bfd3f8a5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 15:29:01 +0200
Subject: [PATCH 1160/2920] *historyQuery: Remove COLLATE from `host_name' and
 `service_description'

refs #8613
---
 .../Backend/Ido/Query/CommentdeletionhistoryQuery.php         | 4 ++--
 .../Monitoring/Backend/Ido/Query/CommenthistoryQuery.php      | 4 ++--
 .../Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php  | 4 ++--
 .../Backend/Ido/Query/DowntimestarthistoryQuery.php           | 4 ++--
 .../Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php | 4 ++--
 .../Monitoring/Backend/Ido/Query/StatehistoryQuery.php        | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
index 86ca8c8c2..9346ce09a 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
@@ -20,8 +20,8 @@ class CommentdeletionhistoryQuery extends IdoQuery
 
             'host'                  => 'o.name1 COLLATE latin1_general_ci',
             'service'               => 'o.name2 COLLATE latin1_general_ci',
-            'host_name'             => 'o.name1 COLLATE latin1_general_ci',
-            'service_description'   => 'o.name2 COLLATE latin1_general_ci',
+            'host_name'             => 'o.name1',
+            'service_description'   => 'o.name2',
             'object_type'           => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
         )
     );
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
index fd6f8a72c..6b2f821e9 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
@@ -20,8 +20,8 @@ class CommenthistoryQuery extends IdoQuery
 
             'host'                  => 'o.name1 COLLATE latin1_general_ci',
             'service'               => 'o.name2 COLLATE latin1_general_ci',
-            'host_name'             => 'o.name1 COLLATE latin1_general_ci',
-            'service_description'   => 'o.name2 COLLATE latin1_general_ci',
+            'host_name'             => 'o.name1',
+            'service_description'   => 'o.name2',
             'object_type'           => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
         )
     );
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
index 1b7d31ccd..42d23ce05 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
@@ -20,8 +20,8 @@ class DowntimeendhistoryQuery extends IdoQuery
 
             'host'                  => 'o.name1 COLLATE latin1_general_ci',
             'service'               => 'o.name2 COLLATE latin1_general_ci',
-            'host_name'             => 'o.name1 COLLATE latin1_general_ci',
-            'service_description'   => 'o.name2 COLLATE latin1_general_ci',
+            'host_name'             => 'o.name1',
+            'service_description'   => 'o.name2',
             'object_type'           => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
         )
     );
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
index a86d47dce..6f23fe174 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
@@ -20,8 +20,8 @@ class DowntimestarthistoryQuery extends IdoQuery
 
             'host'                  => 'o.name1 COLLATE latin1_general_ci',
             'service'               => 'o.name2 COLLATE latin1_general_ci',
-            'host_name'             => 'o.name1 COLLATE latin1_general_ci',
-            'service_description'   => 'o.name2 COLLATE latin1_general_ci',
+            'host_name'             => 'o.name1',
+            'service_description'   => 'o.name2',
             'object_type'           => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
         )
     );
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
index 09e4184f7..8bbdc0751 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
@@ -20,8 +20,8 @@ class NotificationhistoryQuery extends IdoQuery
 
             'host'                  => 'o.name1 COLLATE latin1_general_ci',
             'service'               => 'o.name2 COLLATE latin1_general_ci',
-            'host_name'             => 'o.name1 COLLATE latin1_general_ci',
-            'service_description'   => 'o.name2 COLLATE latin1_general_ci',
+            'host_name'             => 'o.name1',
+            'service_description'   => 'o.name2',
             'object_type'           => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
         )
     );
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
index f17c366bd..ff3c1055a 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
@@ -25,8 +25,8 @@ class StatehistoryQuery extends IdoQuery
 
             'host'                  => 'sho.name1 COLLATE latin1_general_ci',
             'service'               => 'sho.name2 COLLATE latin1_general_ci',
-            'host_name'             => 'sho.name1 COLLATE latin1_general_ci',
-            'service_description'   => 'sho.name2 COLLATE latin1_general_ci',
+            'host_name'             => 'sho.name1',
+            'service_description'   => 'sho.name2',
             'object_type'           => "CASE WHEN sho.objecttype_id = 1 THEN 'host' ELSE 'service' END"
         )
     );

From 3d096158519786c2fda0736fb5ab5a6efb057e8c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 9 Apr 2015 15:30:21 +0200
Subject: [PATCH 1161/2920] Fix that the user isn't being notified that no
 events were found

empty() seems not work if subqueries are involved.
---
 .../application/views/scripts/list/eventhistory.phtml           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 3e2ad32c8..b76b5a796 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -22,7 +22,7 @@ use Icinga\Module\Monitoring\Object\Service;
 
 <div class="content">
 <?= $this->filterEditor ?>
-<?php if (empty($history)): ?>
+<?php if (count($history) === 0): ?>
   <?= $this->translate('No history events matching the filter') ?>
 </div>
 <?php return; endif ?>

From f2eb20945ec24ba0ad3d4b6180241e606c1b356f Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 9 Apr 2015 15:44:21 +0200
Subject: [PATCH 1162/2920] Deduplicate service and host flags icon handling in
 multi-view

refs #8565
---
 .../controllers/HostsController.php           |  8 +--
 .../controllers/ServicesController.php        | 12 ++--
 .../application/views/helpers/HostFlags.php   | 39 ++++++++++
 .../views/helpers/SelectionToolbar.php        | 24 -------
 .../views/helpers/ServiceFlags.php            | 40 +++++++++++
 .../views/scripts/list/hosts.phtml            | 34 +--------
 .../views/scripts/list/services.phtml         | 34 +--------
 .../partials/host/objects-header.phtml        | 69 ++++--------------
 .../partials/service/objects-header.phtml     | 72 ++++---------------
 9 files changed, 118 insertions(+), 214 deletions(-)
 create mode 100644 modules/monitoring/application/views/helpers/HostFlags.php
 delete mode 100644 modules/monitoring/application/views/helpers/SelectionToolbar.php
 create mode 100644 modules/monitoring/application/views/helpers/ServiceFlags.php

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index a66e478a2..293e0fd66 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -113,11 +113,11 @@ class Monitoring_HostsController extends Controller
             'host_is_flapping',
             'host_last_comment',
             'host_output',
-            'host_notifications_enabled',/*,
-            'host_passive_checks_enabled',
-            'host_event_handler_enabled',
-            'host_flap_detection_enabled',
+            'host_notifications_enabled',
             'host_active_checks_enabled',
+            'host_passive_checks_enabled'
+            /*'host_event_handler_enabled',
+            'host_flap_detection_enabled',
             'host_obsessing'*/
         ));
 
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index c8a406ca3..68ff7f2e8 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -78,7 +78,9 @@ class Monitoring_ServicesController extends Controller
             'service_notifications_enabled',
             'service_output',
             'service_last_ack',
-            'service_last_comment'
+            'service_last_comment',
+            'service_active_checks_enabled',
+            'service_passive_checks_enabled'
         ));
 
         $form
@@ -129,12 +131,12 @@ class Monitoring_ServicesController extends Controller
             'service_is_flapping',
             'service_notifications_enabled',
             'service_last_comment',
-            'service_last_ack'
-            /*,
-            'service_passive_checks_enabled',
+            'service_last_ack',
+            'service_active_checks_enabled',
+            'service_passive_checks_enabled'
+            /*
             'service_event_handler_enabled',
             'service_flap_detection_enabled',
-            'service_active_checks_enabled',
             'service_obsessing'*/
         ));
 
diff --git a/modules/monitoring/application/views/helpers/HostFlags.php b/modules/monitoring/application/views/helpers/HostFlags.php
new file mode 100644
index 000000000..97e6fbf3d
--- /dev/null
+++ b/modules/monitoring/application/views/helpers/HostFlags.php
@@ -0,0 +1,39 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+/**
+ * Generate icons to describe a given hosts state
+ */
+class Zend_View_Helper_HostFlags extends Zend_View_Helper_Abstract
+{
+    public function hostFlags($host)
+    {
+        $icons = array();
+        if (! $host->host_handled && $host->host_state > 0) {
+            $icons[] = $this->view->icon('attention-alt', $this->view->translate('Unhandled'));
+        }
+        if ($host->host_acknowledged) {
+            $icons[] = $this->view->icon('ok', $this->view->translate('Acknowledged'));
+        }
+        if ($host->host_is_flapping) {
+            $icons[] = $this->view->icon('flapping', $this->view->translate('Flapping'));
+        }
+        if (! $host->host_notifications_enabled) {
+            $icons[] = $this->view->icon('bell-off-empty', $this->view->translate('Notifications Disabled'));
+        }
+        if ($host->host_in_downtime) {
+            $icons[] = $this->view->icon('plug', $this->view->translate('In Downtime'));
+        }
+        if (! $host->host_active_checks_enabled) {
+            if (! $host->host_passive_checks_enabled) {
+                $icons[] = $this->view->icon('eye-off', $this->view->translate('Active And Passive Checks Disabled'));
+            } else {
+                $icons[] = $this->view->icon('eye-off', $this->view->translate('Active Checks Disabled'));
+            }
+        }
+        if (isset($host->host_last_comment) && $host->host_last_comment !== null) {
+            $icons[] = $this->view->icon('comment', $this->view->translate('Last Comment: ') . $host->host_last_comment);
+        }
+        return $icons;
+    }
+} 
\ No newline at end of file
diff --git a/modules/monitoring/application/views/helpers/SelectionToolbar.php b/modules/monitoring/application/views/helpers/SelectionToolbar.php
deleted file mode 100644
index 7332b5c01..000000000
--- a/modules/monitoring/application/views/helpers/SelectionToolbar.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-class Zend_View_Helper_SelectionToolbar extends Zend_View_Helper_Abstract
-{
-    /**
-     * Create a selection toolbar
-     *
-     * @param      $type
-     * @param null $target
-     *
-     * @return string
-     */
-    public function selectionToolbar($type, $target = null)
-    {
-        return '';
-        if ($type == 'multi') {
-            return '<div class="selection-toolbar">'
-                . '<a href="' . $target . '" data-base-target="_next"> Show All </a> </div>';
-        } else {
-            return '';
-        }
-    }
-}
diff --git a/modules/monitoring/application/views/helpers/ServiceFlags.php b/modules/monitoring/application/views/helpers/ServiceFlags.php
new file mode 100644
index 000000000..7e71bebda
--- /dev/null
+++ b/modules/monitoring/application/views/helpers/ServiceFlags.php
@@ -0,0 +1,40 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+class Zend_View_Helper_ServiceFlags extends Zend_View_Helper_Abstract
+{
+    public function serviceFlags($service) {
+        $icons = array();
+        if (!$service->service_handled && $service->service_state > 0) {
+            $icons[] = $this->view->icon('attention-alt', $this->view->translate('Unhandled'));
+        }
+        if ($service->service_acknowledged && !$service->service_in_downtime) {
+            $icons[] = $this->view->icon('ok', $this->view->translate('Acknowledged') . (
+                $service->service_last_ack ? ': ' . $service->service_last_ack : ''
+            ));
+        }
+        if ($service->service_is_flapping) {
+            $icons[] = $this->view->icon('flapping', $this->view->translate('Flapping')) ;
+        }
+        if (!$service->service_notifications_enabled) {
+            $icons[] = $this->view->icon('bell-off-empty', $this->view->translate('Notifications Disabled'));
+        }
+        if ($service->service_in_downtime) {
+            $icons[] = $this->view->icon('plug', $this->view->translate('In Downtime'));
+        }
+        if (isset($service->service_last_comment) && $service->service_last_comment !== null) {
+            $icons[] = $this->view->icon(
+                'comment',
+                $this->view->translate('Last Comment: ') . $service->service_last_comment
+            );
+        }
+        if (!$service->service_active_checks_enabled) {
+            if (!$service->service_passive_checks_enabled) {
+                $icons[] = $this->view->icon('eye-off', $this->view->translate('Active And Passive Checks Disabled'));
+            } else {
+                $icons[] =  $this->view->icon('eye-off', $this->view->translate('Active Checks Disabled'));
+            }
+        }
+        return $icons;
+    }
+}
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index dac8d7dde..9de57c384 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -13,7 +13,6 @@ if ($this->compact): ?>
 <?= $this->sortControl->render($this) ?>
 <?= $this->widget('limiter')->setMaxLimit($this->hosts->count()) ?>
 <?= $this->paginationControl($hosts, null, null, array('preserve' => $this->preserve)) ?>
-<?= $this->selectionToolbar('multi', $this->href('monitoring/hosts/show?' . $this->filter->toQueryString())) ?>
 </div>
 
 <div class="content">
@@ -43,38 +42,7 @@ if ($hosts->count() === 0) {
     $hostStateName = Host::getStateText($host->host_state);
     $hostLink = $this->href('monitoring/host/show', array('host' => $host->host_name));
 
-    $icons = array();
-    if (! $host->host_handled && $host->host_state > 0){
-        $icons[] = $this->icon('attention-alt', $this->translate('Unhandled'));
-    }
 
-    if ($host->host_acknowledged) {
-        $icons[] = $this->icon('ok', $this->translate('Acknowledged'));
-    }
-
-    if ($host->host_is_flapping) {
-        $icons[] = $this->icon('flapping', $this->translate('Flapping'));
-    }
-
-    if (! $host->host_notifications_enabled) {
-        $icons[] = $this->icon('bell-off-empty', $this->translate('Notifications Disabled'));
-    }
-
-    if ($host->host_in_downtime) {
-        $icons[] = $this->icon('plug', $this->translate('In Downtime'));
-    }
-
-    if (! $host->host_active_checks_enabled) {
-        if (! $host->host_passive_checks_enabled) {
-            $icons[] = $this->icon('eye-off', $this->translate('Active And Passive Checks Disabled'));
-        } else {
-            $icons[] = $this->icon('eye-off', $this->translate('Active Checks Disabled'));
-        }
-    }
-
-    if (isset($host->host_last_comment) && $host->host_last_comment !== null) {
-        $icons[] = $this->icon('comment', $this->translate('Last Comment: ') . $host->host_last_comment);
-    }
     ?>
     <tr class="state <?= $hostStateName ?><?= $host->host_handled ? ' handled' : '' ?>">
       <!-- State -->
@@ -94,7 +62,7 @@ if ($hosts->count() === 0) {
         <?php if ($host->host_icon_image && ! preg_match('/[\'"]/', $host->host_icon_image)): ?>
         <?= $this->icon($this->resolveMacros($host->host_icon_image, $host)) ?>
         <?php endif ?>
-        <?= implode(' ', $icons) ?>
+        <?= implode(' ', $this->hostFlags($host)) ?>
         <?= $this->qlink(
           $host->host_display_name,
           $hostLink,
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 636303b6e..7f62904f2 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -66,39 +66,7 @@ foreach ($services as $service):
       <td>
         <div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 8) ?> </div>
 
-        <?php if (!$service->service_handled && $service->service_state > 0): ?>
-        <?= $this->icon('attention-alt', $this->translate('Unhandled')) ?>
-        <?php endif ?>
-
-        <?php if ($service->service_acknowledged && !$service->service_in_downtime): ?>
-        <?= $this->icon('ok', $this->translate('Acknowledged') . (
-            $service->service_last_ack ? ': ' . $service->service_last_ack : ''
-        )) ?>
-        <?php endif ?>
-
-        <?php if ($service->service_is_flapping): ?>
-        <?= $this->icon('flapping', $this->translate('Flapping')) ?>
-        <?php endif ?>
-
-        <?php if (!$service->service_notifications_enabled): ?>
-        <?= $this->icon('bell-off-empty', $this->translate('Notifications Disabled')) ?>
-        <?php endif ?>
-
-        <?php if ($service->service_in_downtime): ?>
-        <?= $this->icon('plug', $this->translate('In Downtime')) ?>
-        <?php endif ?>
-
-        <?php if (isset($service->service_last_comment) && $service->service_last_comment !== null): ?>
-        <?= $this->icon('comment', $this->translate('Last Comment: ') . $service->service_last_comment) ?>
-        <?php endif ?>
-
-        <?php if (!$service->service_active_checks_enabled): ?>
-          <?php if (!$service->service_passive_checks_enabled): ?>
-            <?= $this->icon('eye-off', $this->translate('Active And Passive Checks Disabled')) ?>
-          <?php else: ?>
-            <?= $this->icon('eye-off', $this->translate('Active Checks Disabled')) ?>
-          <?php endif ?>
-        <?php endif ?>
+        <?= implode(' ', $this->serviceFlags($service)); ?>
 
       <?php if ($service->service_icon_image && ! preg_match('/[\'"]/', $service->service_icon_image)): ?>
         <?= $this->icon($this->resolveMacros($service->service_icon_image, $service)) ?>
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index f6ea43d84..d47bd59e3 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -15,7 +15,7 @@ $hiddenRich = array();
 
 <?php if (($hostCount = count($objects)) > 0): ?>
 
-    <p>
+<p>
     <table class="state statesummary">
 
         <tbody>
@@ -23,71 +23,30 @@ $hiddenRich = array();
             <?php
             $i++;
             if ($i > 5) {
-                $desc = $host->getName();
-                $hidden[] = $desc;
-                $hiddenRich[] = sprintf("<div class='color-box badge-%s'></div>%s", $host->getStateText($host->host_state) ,$desc);
                 continue;
             }
             ?>
 
             <tr class="state <?= Host::getStateText($host->host_state); ?><?= $host->host_handled ? ' handled' : '' ?>">
                 <td class="state"><?= Host::getStateText($host->host_state, true); ?><br /></td>
-                <td>
-                    <?php if (!$host->host_handled && $host->host_state > 0): ?>
-                        <?= $this->icon('attention-alt', $this->translate('Unhandled')) ?>
-                    <?php endif ?>
-
-                    <?php if ($host->host_acknowledged && !$host->host_in_downtime): ?>
-                        <?= $this->icon('ok', $this->translate('Acknowledged') . (
-                            $host->host_last_ack ? ': ' . $host->host_last_ack : ''
-                            )) ?>
-                    <?php endif ?>
-
-                    <?php if ($host->host_is_flapping): ?>
-                        <?= $this->icon('flapping', $this->translate('Flapping')) ?>
-                    <?php endif ?>
-
-                    <?php if (!$host->host_notifications_enabled): ?>
-                        <?= $this->icon('bell-off-empty', $this->translate('Notifications Disabled')) ?>
-                    <?php endif ?>
-
-                    <?php if ($host->host_in_downtime): ?>
-                        <?= $this->icon('plug', $this->translate('In Downtime')) ?>
-                    <?php endif ?>
-
-                    <?php if (isset($host->host_last_comment) && $host->host_last_comment !== null): ?>
-                        <?= $this->icon('comment', $this->translate('Last Comment: ') . $host->host_last_comment) ?>
-                    <?php endif ?>
-                </td>
+                <td><?= implode(' ', $this->hostFlags($host)) ?></td>
                 <td class="name oneline"><?= $this->escape($host->getName()); ?></td>
                 <td><?= $this->escape($host->host_output) ?></td>
             </tr>
         <?php endforeach ?>
-
-        <tr>
-            <td class="state">
-                <div <?= count($hidden) ?
-                            'data-title-rich="<span align=\'left\'>' . join('<br>', $hiddenRich) . '</span>"' : ''; ?>
-                     title="<?= join(', ', $hidden) ?>">
-                        <?php
-                        echo $this->qlink(
-                            count($hidden) ? sprintf(
-                                $this->translate('%d more ...'),
-                                count($hidden)
-                            ) : $this->translate('list all ...'),
-                            $listAllLink,
-                            null,
-                            array('data-base-target' => '_next')
-                        );
-                        ?>
-                </div>
-            </td>
-        </tr>
-
-        </tbody>
+    </tbody>
     </table>
-    </p>
-
+    <div class="hbox-item">
+        <?=
+        $this->qlink(
+            sprintf($this->translate('list all %d hosts ...'), $i),
+            $listAllLink,
+            null,
+            array('data-base-target' => '_next')
+        );
+        ?>
+    </div>
+</p>
 
 <?php endif ?>
 
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index 3880e4473..e80fe2c0b 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -22,77 +22,29 @@ use Icinga\Module\Monitoring\Object\Service;
     <tbody>
     <?php foreach ($objects as $service): /** @var Service $service */ ?>
         <?php
-        $i++;
-        if ($i > 5 && $i < 20) {
-            $desc = $service->getName() . ' on ' . $service->getHost()->getName();
-            $hidden[] = $desc;
-            $hiddenRich[] = sprintf("<div class='color-box badge-%s'></div>%s", $service->getStateText($service->service_state) ,$desc);
-        }
-        if ($i == 20) {
-            $hiddenRich[] = '...';
-        }
-        if ($i > 5) {
+        if ($i ++ > 5) {
             continue;
         }
         ?>
-
         <tr class="state <?= Service::getStateText($service->service_state); ?><?= $service->service_handled ? ' handled' : '' ?>">
             <td class="state"><?= Service::getStateText($service->service_state, true); ?><br /></td>
-            <td>
-                <?php if (!$service->service_handled && $service->service_state > 0): ?>
-                    <?= $this->icon('attention-alt', $this->translate('Unhandled')) ?>
-                <?php endif ?>
-
-                <?php if ($service->service_acknowledged && !$service->service_in_downtime): ?>
-                    <?= $this->icon('ok', $this->translate('Acknowledged') . (
-                        $service->service_last_ack ? ': ' . $service->service_last_ack : ''
-                        )) ?>
-                <?php endif ?>
-
-                <?php if ($service->service_is_flapping): ?>
-                    <?= $this->icon('flapping', $this->translate('Flapping')) ?>
-                <?php endif ?>
-
-                <?php if (!$service->service_notifications_enabled): ?>
-                    <?= $this->icon('bell-off-empty', $this->translate('Notifications Disabled')) ?>
-                <?php endif ?>
-
-                <?php if ($service->service_in_downtime): ?>
-                    <?= $this->icon('plug', $this->translate('In Downtime')) ?>
-                <?php endif ?>
-
-                <?php if (isset($service->service_last_comment) && $service->service_last_comment !== null): ?>
-                    <?= $this->icon('comment', $this->translate('Last Comment: ') . $service->service_last_comment) ?>
-                <?php endif ?>
-            </td>
+            <td><?= implode(' ', $this->serviceFlags($service)) ?></td>
             <td class="name oneline"><?= $this->escape($service->getName()); ?></td>
             <td class="name oneline"><?= $this->escape($service->getHost()->getName()); ?></b></td>
             <td><?= $this->escape($service->service_output) ?></td>
         </tr>
     <?php endforeach ?>
-
-    <tr>
-        <td class="state">
-            <div <?= count($hidden) ?
-                'data-title-rich="<span align=\'left\'>' . join('<br>', $hiddenRich) . '</span>"' : ''; ?>
-                 title="<?= join(', ', $hidden) ?>">
-
-                <?php
-                echo $this->qlink(
-                    count($hidden) ? sprintf(
-                        $this->translate('%d more ...'),
-                        count($hidden)
-                    ) : $this->translate('list all ...'),
-                    $listAllLink,
-                    null,
-                    array('data-base-target' => '_next')
-                );
-                ?>
-            </div>
-        </td>
-    </tr>
-
     </tbody>
     </table>
+    <div class="hbox-item">
+        <?php
+        echo $this->qlink(
+            sprintf($this->translate('List all %d services ...'), $i),
+            $listAllLink,
+            null,
+            array('data-base-target' => '_next')
+        );
+        ?>
+    </div>
     </p>
 <?php endif ?>

From f4c69395b182a05f049e0cc8fcac1645a146b749 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 9 Apr 2015 17:15:26 +0200
Subject: [PATCH 1163/2920] Add missing database columns

refs #8565
---
 .../monitoring/application/controllers/HostsController.php    | 4 +++-
 .../monitoring/application/controllers/ServicesController.php | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 293e0fd66..b20f8b13c 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -74,7 +74,9 @@ class Monitoring_HostsController extends Controller
             'host_is_flapping',
             'host_last_comment',
             'host_output',
-            'host_notifications_enabled'
+            'host_notifications_enabled',
+            'host_active_checks_enabled',
+            'host_passive_checks_enabled'
         ));
 
         $form
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 68ff7f2e8..edee89878 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -75,10 +75,10 @@ class Monitoring_ServicesController extends Controller
             'service_acknowledged',
             'service_in_downtime',
             'service_is_flapping',
-            'service_notifications_enabled',
             'service_output',
             'service_last_ack',
             'service_last_comment',
+            'service_notifications_enabled',
             'service_active_checks_enabled',
             'service_passive_checks_enabled'
         ));
@@ -129,9 +129,9 @@ class Monitoring_ServicesController extends Controller
             'service_acknowledged',
             'service_in_downtime',
             'service_is_flapping',
-            'service_notifications_enabled',
             'service_last_comment',
             'service_last_ack',
+            'service_notifications_enabled',
             'service_active_checks_enabled',
             'service_passive_checks_enabled'
             /*

From 2efea214da9f6b86571d46f9d96d609f894e0901 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 9 Apr 2015 17:16:14 +0200
Subject: [PATCH 1164/2920] Don't display piecharts for empty host and service
 sets

refs #8565
---
 .../partials/host/objects-header.phtml        | 14 ++++-------
 .../partials/service/objects-header.phtml     | 23 ++++++++-----------
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index d47bd59e3..95e595ac1 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -1,20 +1,14 @@
 <?php
 use Icinga\Module\Monitoring\Object\Host;
-?>
 
-<?php
 $i = 0;
-$hidden = array();
-$hiddenRich = array();
 ?>
 
-<div class="hbox-item">
-    <?= $this->translate('States:') ?>
-    &nbsp;<?= $hostStatesPieChart; ?>
-</div>
-
 <?php if (($hostCount = count($objects)) > 0): ?>
-
+    <div class="hbox-item">
+        <?= $this->translate('States:') ?>
+        &nbsp;<?= $hostStatesPieChart; ?>
+    </div>
 <p>
     <table class="state statesummary">
 
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index e80fe2c0b..e0b330ece 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -1,22 +1,17 @@
 <?php
 use Icinga\Module\Monitoring\Object\Service;
-?>
 
-<div class="hbox-item">
-    <?= $this->translate('Service states:') ?>
-    &nbsp;<?= $serviceStatesPieChart; ?>
-</div>
-<div class="hbox-item">
-    <?= $this->translate('Host states:') ?>
-    &nbsp;<?= $hostStatesPieChart; ?>
-</div>
-
-<?php
-    $i = 0;
-    $hidden = array();
-    $hiddenRich = array();
+$i = 0;
 ?>
 <?php if (($serviceCount = count($objects)) > 0): ?>
+    <div class="hbox-item">
+        <?= $this->translate('Service states:') ?>
+        &nbsp;<?= $serviceStatesPieChart; ?>
+    </div>
+    <div class="hbox-item">
+        <?= $this->translate('Host states:') ?>
+        &nbsp;<?= $hostStatesPieChart; ?>
+    </div>
     <p>
     <table class="state statesummary">
     <tbody>

From 06830e035e7227e1fe48eaac66ce2d3f2d86913d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 09:29:46 +0200
Subject: [PATCH 1165/2920] Set default locale for the intl extension upon
 locale detection

refs #6778
---
 library/Icinga/Util/Translator.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/Icinga/Util/Translator.php b/library/Icinga/Util/Translator.php
index 67825b63b..60f136cc0 100644
--- a/library/Icinga/Util/Translator.php
+++ b/library/Icinga/Util/Translator.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Util;
 
+use Locale;
 use Icinga\Exception\IcingaException;
 
 /**
@@ -173,7 +174,9 @@ class Translator
                     $localeName
                 );
             }
+            Locale::setDefault(static::DEFAULT_LOCALE);
         } else {
+            Locale::setDefault($localeName);
             $locale = setlocale(LC_ALL, 0);
             putenv('LC_ALL=' . $locale); // Failsafe, Win and Unix
             putenv('LANG=' . $locale); // Windows fix, untested

From 3c47ba11eb4b8cdda80f55a83a36b263432e5d27 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 09:39:39 +0200
Subject: [PATCH 1166/2920] monitoring/show/contact: Require `contact_name'
 instead of `contact'

refs #8613
---
 modules/monitoring/application/controllers/ShowController.php | 4 ++--
 .../application/views/scripts/list/contactgroups.phtml        | 2 +-
 .../monitoring/application/views/scripts/list/contacts.phtml  | 2 +-
 .../application/views/scripts/list/notifications.phtml        | 2 +-
 .../application/views/scripts/show/components/contacts.phtml  | 2 +-
 .../monitoring/application/views/scripts/show/history.phtml   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index b5ffc0535..f41811297 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -112,11 +112,11 @@ class Monitoring_ShowController extends Controller
 
     public function contactAction()
     {
-        $contactName = $this->getParam('contact');
+        $contactName = $this->getParam('contact_name');
 
         if (! $contactName) {
             throw new Zend_Controller_Action_Exception(
-                $this->translate('The parameter `contact\' is required'),
+                $this->translate('The parameter `contact_name\' is required'),
                 404
             );
         }
diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index a44b388b7..09083a387 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -24,7 +24,7 @@ foreach ($groupData as $groupName => $groupInfo): ?>
                     <?= $this->qlink(
                         $c->contact_alias,
                         'monitoring/show/contact',
-                        array('contact' => $c->contact_name),
+                        array('contact_name' => $c->contact_name),
                         array('title' => sprintf(
                             $this->translate('Show detailed information about %s'),
                             $c->contact_alias
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 8fba674c0..80405f7c6 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -18,7 +18,7 @@
             <strong><?= $this->qlink(
                 $contact->contact_name,
                 'monitoring/show/contact',
-                array('contact' => $contact->contact_name),
+                array('contact_name' => $contact->contact_name),
                 array('title' => sprintf(
                     $this->translate('Show detailed information about %s'),
                     $contact->contact_alias
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 9cc5f724b..cd2c46538 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -63,7 +63,7 @@ use Icinga\Module\Monitoring\Object\Service;
                             $this->qlink(
                                 $notification->notification_contact,
                                 'monitoring/show/contact',
-                                array('contact' => $notification->notification_contact)
+                                array('contact_name' => $notification->notification_contact)
                             )
                         ) ?>
                     </small>
diff --git a/modules/monitoring/application/views/scripts/show/components/contacts.phtml b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
index c00714e9c..6767a252e 100644
--- a/modules/monitoring/application/views/scripts/show/components/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
@@ -7,7 +7,7 @@ if (! empty($object->contacts)) {
         $list[] = $this->qlink(
             $contact->contact_alias,
             'monitoring/show/contact',
-            array('contact' => $contact->contact_name),
+            array('contact_name' => $contact->contact_name),
             array('title' => sprintf($this->translate('Show detailed information about %s'), $contact->contact_alias))
         );
     }
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index 149eb0ecc..b148888e1 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -32,7 +32,7 @@ function contactsLink($match, $view) {
         $links[] = $view->qlink(
             $contact,
             'monitoring/show/contact',
-            array('contact' => $contact),
+            array('contact_name' => $contact),
             array('title' => sprintf($view->translate('Show detailed information about %s'), $contact))
         );
     }

From f2e50664301f5f7df2574ab50e5e676d4e3e0bb6 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 09:44:38 +0200
Subject: [PATCH 1167/2920] lib: Add DateFormatter for ICU date formatting

The DateFormatter class is supposed to handle locale-dependent date, time, and time diff (ago, since, until) formatting.

refs #6778
---
 library/Icinga/Date/DateFormatter.php | 226 ++++++++++++++++++++++++++
 1 file changed, 226 insertions(+)
 create mode 100644 library/Icinga/Date/DateFormatter.php

diff --git a/library/Icinga/Date/DateFormatter.php b/library/Icinga/Date/DateFormatter.php
new file mode 100644
index 000000000..79523d0a4
--- /dev/null
+++ b/library/Icinga/Date/DateFormatter.php
@@ -0,0 +1,226 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Date;
+
+use IntlDateFormatter;
+use InvalidArgumentException;
+
+/**
+ * ICU date formatting
+ */
+class DateFormatter
+{
+    /**
+     * Internal constant for relative time diffs
+     *
+     * @var int
+     */
+    protected static $relative = 0;
+
+    /**
+     * Format time
+     *
+     * @var int
+     */
+    const TIME = 1;
+
+    /**
+     * Format date
+     *
+     * @var int
+     */
+    const DATE = 2;
+
+    /**
+     * Format date and time
+     *
+     * @var int
+     */
+    const DATETIME = 4;
+
+    /**
+     * Format time diff as time ago
+     *
+     * @var int
+     */
+    const AGO = 8;
+
+    /**
+     * Format time diff as time until
+     *
+     * @var int
+     */
+    const UNTIL = 16;
+
+    /**
+     * Format time diff as time since
+     *
+     * @var int
+     */
+    const SINCE = 32;
+
+    /**
+     * Format used for the DateFormatter
+     *
+     * @var int
+     */
+    protected $format;
+
+    /**
+     * Create a date formatter
+     *
+     * @param int $format
+     */
+    public function __construct($format)
+    {
+        $this->format = $format;
+    }
+
+    /**
+     * Create a date formatter
+     *
+     * @param   int $format
+     *
+     * @return  static
+     */
+    public static function create($format)
+    {
+        return new static($format);
+    }
+
+    /**
+     * Format the diff between two date/time values as a string
+     *
+     * @param   int|float   $time
+     * @param   int|float   $now
+     *
+     * @return  string              The formatted string
+     */
+    protected function diff($time, $now = null)
+    {
+        $now = $now === null ? time() : (float) $now;
+        $invert = false;
+        $diff = $time - $now;
+        if ($diff < 0) {
+            $diff = abs($diff);
+            $invert = true;
+        }
+        if ($diff > 3600 * 24 * 3) {
+            $type = static::DATETIME;
+            $fmt = new IntlDateFormatter(null, IntlDateFormatter::SHORT, IntlDateFormatter::SHORT);
+            $formatted = $fmt->format($time);
+        } else {
+            $minutes = floor($diff / 60);
+            if ($minutes < 60) {
+                $type = static::$relative;
+                $formatted = sprintf('%dm %ds', $minutes, $diff % 60);
+            } else {
+                $hours = floor($minutes / 60);
+                if ($hours < 24) {
+                    $type = static::TIME;
+                    $fmt = new IntlDateFormatter(null, IntlDateFormatter::NONE, IntlDateFormatter::SHORT);
+                    $formatted = $fmt->format($time);
+                } else {
+                    $type = static::$relative;
+                    $formatted = sprintf('%dd %dh', floor($hours / 24), $hours % 24);
+                }
+            }
+        }
+        switch ($this->format) {
+            case static::AGO:
+                switch ($type) {
+                    case static::$relative:
+                        $formatted = sprintf(
+                            t('%s ago', 'An event that happened the given time interval ago'),
+                            $formatted
+                        );
+                        break;
+                    case static::TIME:
+                        $formatted = sprintf(t('at %s', 'An event that happened at the given time'), $formatted);
+                        break;
+                    case static::DATETIME:
+                        $formatted = sprintf(
+                            t('on %s', 'An event that happened at the given date and time'),
+                            $formatted
+                        );
+                        break;
+                }
+                break;
+            case static::UNTIL:
+                switch ($type) {
+                    case static::$relative:
+                        $formatted = sprintf(
+                            t('in %s', 'An event will happen after the given time interval has elapsed'),
+                            $invert ? ('-' . $formatted) : $formatted
+                        );
+                        break;
+                    case static::TIME:
+                        $formatted = sprintf(t('at %s', 'An event will happen at the given time'), $formatted);
+                        break;
+                    case static::DATETIME:
+                        $formatted = sprintf(t('on %s', 'An event will happen on the given date and time'), $formatted);
+                        break;
+                }
+                break;
+            case static::SINCE;
+                switch ($type) {
+                    case static::$relative:
+                        $formatted = sprintf(
+                            t('for %s', 'A status is lasting for the given time interval'),
+                            $formatted
+                        );
+                        break;
+                    case static::TIME:
+                        // Move to next case
+                    case static::DATETIME:
+                        $formatted = sprintf(
+                            t('since %s', 'A status is lasting since the given date and time'),
+                            $formatted
+                        );
+                        break;
+                }
+                break;
+            default:
+                break;
+        }
+        return $formatted;
+    }
+
+    /**
+     * Format a date/time value as a string
+     *
+     * @param   int|float   $time   Date/time to format
+     * @param   int|float   $now
+     *
+     * @return  string              The formatted string
+     */
+    public function format($time, $now = null)
+    {
+        $time = (float) $time;
+        switch ($this->format) {
+            case static::TIME:
+                $fmt = new IntlDateFormatter(null, IntlDateFormatter::NONE, IntlDateFormatter::SHORT);
+                $formatted = $fmt->format($time);
+                break;
+            case static::DATE;
+                $fmt = new IntlDateFormatter(null, IntlDateFormatter::SHORT, IntlDateFormatter::NONE);
+                $formatted = $fmt->format($time);
+                break;
+            case static::DATETIME;
+                $fmt = new IntlDateFormatter(null, IntlDateFormatter::SHORT, IntlDateFormatter::SHORT);
+                $formatted = $fmt->format($time);
+                break;
+            case static::AGO:
+                // Move to next case
+            case static::UNTIL:
+                // Move to next case
+            case static::SINCE:
+                $formatted = $this->diff($time, $now);
+                break;
+            default:
+                throw new InvalidArgumentException('Invalid format');
+        }
+        return $formatted;
+    }
+}

From f00adc2138158dd2c5c75b881aff5fc34cae7d70 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 09:45:23 +0200
Subject: [PATCH 1168/2920] ContactQuery: Provide ci query columns for aliases
 and email addresses

refs #8613
---
 .../application/controllers/ListController.php   | 16 ++++++++--------
 .../application/controllers/ShowController.php   |  6 +++---
 .../views/scripts/list/contacts.phtml            | 10 +++++-----
 .../views/scripts/show/components/contacts.phtml |  4 ++--
 .../application/views/scripts/show/contact.phtml | 10 +++++-----
 .../Backend/Ido/Query/ContactQuery.php           |  6 ++++--
 .../library/Monitoring/DataView/Contact.php      |  6 +++---
 .../Monitoring/Object/MonitoredObject.php        | 14 +++++++-------
 8 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index cd0a734ef..123ec053b 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -350,8 +350,8 @@ class Monitoring_ListController extends Controller
         $query = $this->backend->select()->from('contact', array(
             'contact_name',
             'contact_id',
-            'contact_alias',
-            'contact_email',
+            'contact_alias_name',
+            'contact_email_address',
             'contact_pager',
             'contact_notify_service_timeperiod',
             'contact_notify_service_recovery',
@@ -365,18 +365,18 @@ class Monitoring_ListController extends Controller
             'contact_notify_host_down',
             'contact_notify_host_unreachable',
             'contact_notify_host_flapping',
-            'contact_notify_host_downtime',
+            'contact_notify_host_downtime'
         ));
         $this->filterQuery($query);
         $this->view->contacts = $query->paginate();
 
         $this->setupSortControl(array(
-            'contact_name' => $this->translate('Name'),
-            'contact_alias' => $this->translate('Alias'),
-            'contact_email' => $this->translate('Email'),
-            'contact_pager' => $this->translate('Pager Address / Number'),
+            'contact_name'                      => $this->translate('Name'),
+            'contact_alias_name'                => $this->translate('Alias'),
+            'contact_email_address'             => $this->translate('Email'),
+            'contact_pager'                     => $this->translate('Pager Address / Number'),
             'contact_notify_service_timeperiod' => $this->translate('Service Notification Timeperiod'),
-            'contact_notify_host_timeperiod' => $this->translate('Host Notification Timeperiod')
+            'contact_notify_host_timeperiod'    => $this->translate('Host Notification Timeperiod')
         ));
     }
 
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index f41811297..1a8504d73 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -124,8 +124,8 @@ class Monitoring_ShowController extends Controller
         $query = $this->backend->select()->from('contact', array(
             'contact_name',
             'contact_id',
-            'contact_alias',
-            'contact_email',
+            'contact_alias_name',
+            'contact_email_address',
             'contact_pager',
             'contact_object_id',
             'contact_notify_service_timeperiod',
@@ -140,7 +140,7 @@ class Monitoring_ShowController extends Controller
             'contact_notify_host_down',
             'contact_notify_host_unreachable',
             'contact_notify_host_flapping',
-            'contact_notify_host_downtime',
+            'contact_notify_host_downtime'
         ));
 
         $query->where('contact_name', $contactName);
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 80405f7c6..b321d8e85 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -14,19 +14,19 @@
     }
     foreach ($contacts as $contact): ?>
         <div class="contact">
-            <?= $this->img('/static/gravatar', array('email' => $contact->contact_email)); ?>
+            <?= $this->img('/static/gravatar', array('email' => $contact->contact_email_address)); ?>
             <strong><?= $this->qlink(
                 $contact->contact_name,
                 'monitoring/show/contact',
                 array('contact_name' => $contact->contact_name),
                 array('title' => sprintf(
                     $this->translate('Show detailed information about %s'),
-                    $contact->contact_alias
+                    $contact->contact_alias_name
                 ))
-            ); ?></strong> (<?= $contact->contact_alias; ?>)
+            ); ?></strong> (<?= $contact->contact_alias_name; ?>)
             <div>
-                <?= $this->translate('Email'); ?>: <a href="mailto:<?= $contact->contact_email; ?>" title="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias); ?>" aria-label="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias); ?>">
-                    <?= $this->escape($contact->contact_email); ?>
+                <?= $this->translate('Email'); ?>: <a href="mailto:<?= $contact->contact_email_address; ?>" title="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias_name); ?>" aria-label="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias_name); ?>">
+                    <?= $this->escape($contact->contact_email_address); ?>
                 </a>
             </div>
             <?php if ($contact->contact_pager): ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/contacts.phtml b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
index 6767a252e..a70c23105 100644
--- a/modules/monitoring/application/views/scripts/show/components/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
@@ -5,10 +5,10 @@ if (! empty($object->contacts)) {
     $list = array();
     foreach ($object->contacts as $contact) {
         $list[] = $this->qlink(
-            $contact->contact_alias,
+            $contact->contact_alias_name,
             'monitoring/show/contact',
             array('contact_name' => $contact->contact_name),
-            array('title' => sprintf($this->translate('Show detailed information about %s'), $contact->contact_alias))
+            array('title' => sprintf($this->translate('Show detailed information about %s'), $contact->contact_alias_name))
         );
     }
 
diff --git a/modules/monitoring/application/views/scripts/show/contact.phtml b/modules/monitoring/application/views/scripts/show/contact.phtml
index c4142707a..0b07edd89 100644
--- a/modules/monitoring/application/views/scripts/show/contact.phtml
+++ b/modules/monitoring/application/views/scripts/show/contact.phtml
@@ -3,7 +3,7 @@
   <?= $this->tabs ?>
   <h1><?= $this->translate('Contact details') ?></h1>
   <div class="circular" style="background-image: url('<?=
-      $this->href('static/gravatar', array('email' => $contact->contact_email))
+      $this->href('static/gravatar', array('email' => $contact->contact_email_address))
   ?>')"></div>
 
 <?php if (! $contact): ?>
@@ -15,14 +15,14 @@
     <tbody>
       <tr>
         <th style="width: 20%"></th>
-        <td><strong><?= $this->escape($contact->contact_alias) ?></strong> (<?= $contact->contact_name ?>)</td>
+        <td><strong><?= $this->escape($contact->contact_alias_name) ?></strong> (<?= $contact->contact_name ?>)</td>
       </tr>
-<?php if ($contact->contact_email): ?>
+<?php if ($contact->contact_email_address): ?>
       <tr>
         <th><?= $this->translate('Email') ?></th>
         <td>
-            <a href="mailto:<?= $contact->contact_email; ?>" title="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias); ?>" aria-label="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias); ?>">
-                <?= $this->escape($contact->contact_email); ?>
+            <a href="mailto:<?= $contact->contact_email_address; ?>" title="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias_name); ?>" aria-label="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias_name); ?>">
+                <?= $this->escape($contact->contact_email_address); ?>
             </a>
         </td>
       </tr>
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
index 1b5e744d4..f56bca2b6 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
@@ -9,8 +9,10 @@ class ContactQuery extends IdoQuery
         'contacts' => array(
             'contact_id'                        => 'c.contact_id',
             'contact_name'                      => 'co.name1 COLLATE latin1_general_ci',
-            'contact_alias'                     => 'c.alias COLLATE latin1_general_ci',
-            'contact_email'                     => 'c.email_address COLLATE latin1_general_ci',
+            'alias'                             => 'c.alias COLLATE latin1_general_ci',
+            'contact_alias_name'                => 'c.alias',
+            'email'                             => 'c.email_address COLLATE latin1_general_ci',
+            'contact_email_address'             => 'c.email_address',
             'contact_pager'                     => 'c.pager_address',
             'contact_object_id'                 => 'c.contact_object_id',
             'contact_has_host_notfications'     => 'c.host_notifications_enabled',
diff --git a/modules/monitoring/library/Monitoring/DataView/Contact.php b/modules/monitoring/library/Monitoring/DataView/Contact.php
index 793765fed..34bd67b43 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contact.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contact.php
@@ -19,8 +19,8 @@ class Contact extends DataView
         return array(
             'contact',
             'contact_name',
-            'contact_alias',
-            'contact_email',
+            'contact_alias_name',
+            'contact_email_address',
             'contact_pager',
             'contact_notify_hosts',
             'contact_notify_services',
@@ -57,7 +57,7 @@ class Contact extends DataView
     public function getSortRules()
     {
         return array(
-            'contact_alias' => array(
+            'contact_alias_name' => array(
                 'order' => self::SORT_DESC
             )
         );
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index c33e1be2d..173fd88fa 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -185,10 +185,10 @@ abstract class MonitoredObject implements Filterable
             $this->contacts = array();
             foreach (preg_split('~,~', $this->properties->host_contacts) as $contact) {
                 $this->contacts[] = (object) array(
-                    'contact_name'  => $contact,
-                    'contact_alias' => $contact,
-                    'contact_email' => null,
-                    'contact_pager' => null,
+                    'contact_name'          => $contact,
+                    'contact_alias_name'    => $contact,
+                    'contact_email_address' => null,
+                    'contact_pager'         => null
                 );
             }
         }
@@ -385,9 +385,9 @@ abstract class MonitoredObject implements Filterable
 
         $contacts = $this->backend->select()->from('contact', array(
                 'contact_name',
-                'contact_alias',
-                'contact_email',
-                'contact_pager',
+                'contact_alias_name',
+                'contact_email_address',
+                'contact_pager'
         ));
         if ($this->type === self::TYPE_SERVICE) {
             $contacts

From 52dcecfd0877d2593659f2be59efaa7e2e4b63ee Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 09:46:41 +0200
Subject: [PATCH 1169/2920] ContactQuery: Change query column `contact_name' to
 be case sensitive

...and provide `contact' as case-insensitive alternative.

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/ContactQuery.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
index f56bca2b6..3d867f0d9 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
@@ -8,7 +8,8 @@ class ContactQuery extends IdoQuery
     protected $columnMap = array(
         'contacts' => array(
             'contact_id'                        => 'c.contact_id',
-            'contact_name'                      => 'co.name1 COLLATE latin1_general_ci',
+            'contact'                           => 'co.name1 COLLATE latin1_general_ci',
+            'contact_name'                      => 'co.name1',
             'alias'                             => 'c.alias COLLATE latin1_general_ci',
             'contact_alias_name'                => 'c.alias',
             'email'                             => 'c.email_address COLLATE latin1_general_ci',

From 0ec1a18844bc3cf5c1ec2cece2e8fb5c0e10cec3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 09:48:22 +0200
Subject: [PATCH 1170/2920] ContactQuery: Fix query column `service' not
 referencing a service's name

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/ContactQuery.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
index 3d867f0d9..e4bdc88ea 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
@@ -37,10 +37,10 @@ class ContactQuery extends IdoQuery
         ),
         'hosts' => array(
             'host'      => 'ho.name1 COLLATE latin1_general_ci',
-            'host_name' => 'ho.name1',
+            'host_name' => 'ho.name1'
         ),
         'services' => array(
-            'service'               => 'so.name1 COLLATE latin1_general_ci',
+            'service'               => 'so.name2 COLLATE latin1_general_ci',
             'service_description'   => 'so.name2',
             'service_host_name'     => 'so.name1',
         )

From 6d03b2fe8f06d1629e4636a0c35c6a1aa10448f5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 09:49:47 +0200
Subject: [PATCH 1171/2920] DataView\Contact: Add missing filter columns

refs #8613
---
 .../library/Monitoring/DataView/Contact.php           | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Contact.php b/modules/monitoring/library/Monitoring/DataView/Contact.php
index 34bd67b43..b70dcebc7 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contact.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contact.php
@@ -8,7 +8,6 @@ namespace Icinga\Module\Monitoring\DataView;
  */
 class Contact extends DataView
 {
-
     /**
      * Retrieve columns provided by this view
      *
@@ -17,7 +16,6 @@ class Contact extends DataView
     public function getColumns()
     {
         return array(
-            'contact',
             'contact_name',
             'contact_alias_name',
             'contact_email_address',
@@ -43,9 +41,7 @@ class Contact extends DataView
             'host_name',
             'service_object_id',
             'service_host_name',
-            'service_description',
-            'service',
-            'host',
+            'service_description'
         );
     }
 
@@ -62,4 +58,9 @@ class Contact extends DataView
             )
         );
     }
+
+    public function getFilterColumns()
+    {
+        return array('contact', 'alias', 'email', 'host', 'service');
+    }
 }

From 3d7e418032a80603738e08ea21d9eeaf02ccc4ae Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 09:50:26 +0200
Subject: [PATCH 1172/2920] ContactQuery: Provide case insensitive filter
 column `service_host'

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/ContactQuery.php      | 3 ++-
 modules/monitoring/library/Monitoring/DataView/Contact.php     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
index e4bdc88ea..ce00b6151 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
@@ -42,7 +42,8 @@ class ContactQuery extends IdoQuery
         'services' => array(
             'service'               => 'so.name2 COLLATE latin1_general_ci',
             'service_description'   => 'so.name2',
-            'service_host_name'     => 'so.name1',
+            'service_host'          => 'so.name1 COLLATE latin1_general_ci',
+            'service_host_name'     => 'so.name1'
         )
     );
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Contact.php b/modules/monitoring/library/Monitoring/DataView/Contact.php
index b70dcebc7..3a364b968 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contact.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contact.php
@@ -61,6 +61,6 @@ class Contact extends DataView
 
     public function getFilterColumns()
     {
-        return array('contact', 'alias', 'email', 'host', 'service');
+        return array('contact', 'alias', 'email', 'host', 'service', 'service_host');
     }
 }

From 8477859dc156a004b1a0c78f5e61324aeaef372a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 09:51:08 +0200
Subject: [PATCH 1173/2920] Fix that the user isn't being notified that no
 events were found for an object

---
 modules/monitoring/application/views/scripts/show/history.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index b148888e1..d82f454f6 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -20,7 +20,7 @@ $hostContext = $object->getType() === 'host';
 </div>
 
 <div class="content">
-<?php if (empty($history)): ?>
+<?php if (count($history) === 0): ?>
   <?= $this->translate('No history available for this object'); ?>
 </div>
 <?php return; endif ?>

From 7f73c6ae2998ec121363bbaf4306d6a7629a5ded Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 09:51:15 +0200
Subject: [PATCH 1174/2920] Use DateFormatter in our Format util for time ago,
 since and until

Note that time diff formatting now always includes the prefix using the functions timeAgo, timeSince and timeUntil.
I'll remove the related prefixed* functions later on and implement it as parameter to the functions listed above.

refs #6778
---
 library/Icinga/Util/Format.php | 59 ++++++++++++++--------------------
 1 file changed, 25 insertions(+), 34 deletions(-)

diff --git a/library/Icinga/Util/Format.php b/library/Icinga/Util/Format.php
index 43b579208..aa7e01c09 100644
--- a/library/Icinga/Util/Format.php
+++ b/library/Icinga/Util/Format.php
@@ -4,7 +4,7 @@
 namespace Icinga\Util;
 
 use DateTime;
-use IntlDateFormatter;
+use Icinga\Date\DateFormatter;
 use Icinga\Exception\ProgrammingError;
 
 class Format
@@ -113,9 +113,31 @@ class Format
         return $prefix . self::showHourMin(abs($diff), $includePrefix);
     }
 
-    public static function timeSince($timestamp)
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Date\DateFormatter::timeAgo() For the method description.
+     */
+    public static function timeAgo($time)
     {
-        return self::smartTimeDiff(time() - $timestamp, $timestamp);
+        return DateFormatter::create(DateFormatter::AGO)->format($time);
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Date\DateFormatter::timeUntil() For the method description.
+     */
+    public static function timeUntil($time)
+    {
+        return DateFormatter::create(DateFormatter::UNTIL)->format($time);
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Date\DateFormatter::timeSince() For the method description.
+     */
+    public static function timeSince($time)
+    {
+        return DateFormatter::create(DateFormatter::SINCE)->format($time);
     }
 
     public static function prefixedTimeSince($timestamp, $ucfirst = false)
@@ -127,37 +149,6 @@ class Format
         return $result;
     }
 
-    public static function timeUntil($time, $now = null)
-    {
-        $time = (float) $time;
-        if ($now === null) {
-            $now = time();
-        }
-        $diff = $time - $now;
-        if ($diff < 0) {
-            $diff = abs($diff);
-            // return static::timeAgo($time, $now);
-        }
-        if ($diff > 3600 * 24 * 3) {
-            $fmt = new IntlDateFormatter('en_US', IntlDateFormatter::SHORT, IntlDateFormatter::SHORT);
-            $until = $fmt->format($time);
-        } else {
-            $minutes = floor($diff / 60);
-            if ($minutes < 60) {
-                $until = sprintf('%dm %ds', $minutes, $diff % 60);
-            } else {
-                $hours = floor($minutes / 60);
-                if ($hours < 24) {
-                    $fmt = new IntlDateFormatter('en_US', IntlDateFormatter::NONE, IntlDateFormatter::SHORT);
-                    $until = $fmt->format($time);
-                } else {
-                    $until = sprintf('%dd %dh', floor($hours / 24), $hours % 24);
-                }
-            }
-        }
-        return $until;
-    }
-
     public static function prefixedTimeUntil($timestamp, $ucfirst)
     {
         $result = self::smartTimeDiff($timestamp - time(), $timestamp, true);

From 3ec6caa15b24e3574207b978206909dbf8e8617d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 09:56:39 +0200
Subject: [PATCH 1175/2920] lib: Add timeAgo to views

refs #6778
---
 library/Icinga/Web/View/helpers/format.php | 24 ++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php
index e9d8e23bc..7b1d3f441 100644
--- a/library/Icinga/Web/View/helpers/format.php
+++ b/library/Icinga/Web/View/helpers/format.php
@@ -10,6 +10,14 @@ $this->addHelperFunction('format', function () {
     return Format::getInstance();
 });
 
+$this->addHelperFunction('timeAgo', function ($timestamp) {
+    return sprintf(
+        '<span class="timeAgo" title="%s">%s</span>',
+        date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
+        Format::timeAgo($timestamp)
+    );
+});
+
 $this->addHelperFunction('timeSince', function ($timestamp) {
     return sprintf(
         '<span class="timesince" title="%s">%s</span>',
@@ -18,14 +26,6 @@ $this->addHelperFunction('timeSince', function ($timestamp) {
     );
 });
 
-$this->addHelperFunction('prefixedTimeSince', function ($timestamp, $ucfirst = false) {
-    return sprintf(
-        '<span class="timesince" title="%s">%s</span>',
-        date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
-        Format::prefixedTimeSince($timestamp, $ucfirst)
-    );
-});
-
 $this->addHelperFunction('timeUntil', function ($timestamp) {
     if (! $timestamp) return '';
     return sprintf(
@@ -35,6 +35,14 @@ $this->addHelperFunction('timeUntil', function ($timestamp) {
     );
 });
 
+$this->addHelperFunction('prefixedTimeSince', function ($timestamp, $ucfirst = false) {
+    return sprintf(
+        '<span class="timesince" title="%s">%s</span>',
+        date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
+        Format::prefixedTimeSince($timestamp, $ucfirst)
+    );
+});
+
 $this->addHelperFunction('prefixedTimeUntil', function ($timestamp, $ucfirst = false) {
     if (! $timestamp) return '';
     return sprintf(

From 44ee4cd609201cf2b2d2a1790d4b098905bcecb3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 10:14:22 +0200
Subject: [PATCH 1176/2920] Use timeAgo() instead of timeSince() in the
 monitoring health view

refs #6778
---
 .../monitoring/application/views/scripts/process/info.phtml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml
index 835228814..f09d6b655 100644
--- a/modules/monitoring/application/views/scripts/process/info.phtml
+++ b/modules/monitoring/application/views/scripts/process/info.phtml
@@ -25,11 +25,11 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
                 </tr>
                 <tr>
                     <th><?= $this->translate('Last Status Update'); ?></th>
-                    <td><?= sprintf($this->translate('%s ago'), $this->timeSince($this->programStatus->status_update_time)); ?></td>
+                    <td><?= $this->timeAgo($this->programStatus->status_update_time); ?></td>
                 </tr>
                 <tr>
                     <th><?= $this->translate('Last External Command Check'); ?></th>
-                    <td><?= sprintf($this->translate('%s ago'), $this->timeSince($this->programStatus->last_command_check)); ?></td>
+                    <td><?= $this->timeAgo($this->programStatus->last_command_check); ?></td>
                 </tr>
                 <tr>
                     <th><?= $this->translate('Last Log File Rotation'); ?></th>

From a84b3acee72f3c056df05367e6b3b9838ab225d9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 10:19:10 +0200
Subject: [PATCH 1177/2920] Fix "since since" in the monitoring health view

Because timeSince() now includes the prefix, the prefix has to be removed from the format string.

refs #6778
---
 .../monitoring/application/views/scripts/process/info.phtml  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml
index f09d6b655..0493fa6ed 100644
--- a/modules/monitoring/application/views/scripts/process/info.phtml
+++ b/modules/monitoring/application/views/scripts/process/info.phtml
@@ -54,7 +54,10 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
             <?php if ((bool) $this->programStatus->is_currently_running === true): ?>
                 <div class="backend-running">
                     <?= sprintf(
-                        $this->translate('%s has been up and running with PID %d since %s'),
+                        $this->translate(
+                            '%1$s has been up and running with PID %2$d %3$s',
+                            'Last format parameter represents the time running'
+                        ),
                         $this->backendName,
                         $this->programStatus->process_id,
                         $this->timeSince($this->programStatus->program_start_time)) ?>

From e6f070d0680492112ee872c7f7b4651ffcd95cba Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 10:20:10 +0200
Subject: [PATCH 1178/2920] Use timeAgo() instead of timeSince() when
 displaying object notifications

refs #6778
---
 .../views/scripts/show/components/notifications.phtml     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/notifications.phtml b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
index af57eb934..6ae229d47 100644
--- a/modules/monitoring/application/views/scripts/show/components/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
@@ -35,16 +35,16 @@ if (! in_array((int) $object->state, array(0, 99))) {
     if ($object->current_notification_number > 0) {
         if ((int) $object->current_notification_number === 1) {
             $msg = sprintf(
-                $this->translate('A notication has been sent for this issue %s ago'),
-                $this->timeSince($object->last_notification)
+                $this->translate('A notication has been sent for this issue %s'),
+                $this->timeAgo($object->last_notification)
             );
         } else {
             $msg = sprintf(
                 $this->translate('%s notications have been sent for this issue'),
                 $object->current_notification_number
             ) . '<br />' . sprintf(
-                $this->translate('The last one occured %s ago'),
-                $this->timeSince($object->last_notification)
+                $this->translate('The last one occured %s'),
+                $this->timeAgo($object->last_notification)
             );
         }
         echo $msg;

From 80ab64e2b4b680c2f5b575e2953309ab6fc88968 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 10:21:54 +0200
Subject: [PATCH 1179/2920] Fix typos in the notifications view partial for
 objects

---
 .../views/scripts/show/components/notifications.phtml         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/notifications.phtml b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
index 6ae229d47..5e8480091 100644
--- a/modules/monitoring/application/views/scripts/show/components/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
@@ -35,12 +35,12 @@ if (! in_array((int) $object->state, array(0, 99))) {
     if ($object->current_notification_number > 0) {
         if ((int) $object->current_notification_number === 1) {
             $msg = sprintf(
-                $this->translate('A notication has been sent for this issue %s'),
+                $this->translate('A notification has been sent for this issue %s'),
                 $this->timeAgo($object->last_notification)
             );
         } else {
             $msg = sprintf(
-                $this->translate('%s notications have been sent for this issue'),
+                $this->translate('%d notifications have been sent for this issue'),
                 $object->current_notification_number
             ) . '<br />' . sprintf(
                 $this->translate('The last one occured %s'),

From 613de61e6d0a19bfb4bc8a04476f27f77d249566 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 10:24:15 +0200
Subject: [PATCH 1180/2920] Improve English for "The last one occured %s ago"
 in the notifications view component for objects

fixes #8950
---
 .../views/scripts/show/components/notifications.phtml           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/notifications.phtml b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
index 5e8480091..74158daae 100644
--- a/modules/monitoring/application/views/scripts/show/components/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
@@ -43,7 +43,7 @@ if (! in_array((int) $object->state, array(0, 99))) {
                 $this->translate('%d notifications have been sent for this issue'),
                 $object->current_notification_number
             ) . '<br />' . sprintf(
-                $this->translate('The last one occured %s'),
+                $this->translate('The last one was sent %s'),
                 $this->timeAgo($object->last_notification)
             );
         }

From d6374d47701e72fb3d5ab2d987782e415a56ea05 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 10:27:57 +0200
Subject: [PATCH 1181/2920] Use timeAgo() instead of timeSince() for an
 object's last check

refs #6778
---
 .../views/scripts/show/components/checkstatistics.phtml      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index 2a4e4b033..a42edeb53 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -20,7 +20,7 @@ if ($object->getType() === $object::TYPE_HOST) {
         <?php if (isset($checkNowForm)) { // Form is unset if the current user lacks the respective permission
             echo $checkNowForm;
         } ?>
-        <?= $this->timeSince($object->last_check) ?>
+        <?= $this->timeAgo($object->last_check) ?>
     </td>
 </tr>
 <tr>
@@ -54,7 +54,8 @@ if ($object->getType() === $object::TYPE_HOST) {
                   )
               );
           }
-      } ?> <?= $this->timeUntil($object->next_check) ?>
+      } ?>
+      <?= $this->timeUntil($object->next_check) ?>
   </td>
 </tr>
 <tr>

From 5efc343f03869135d630e20347bc0949577edd59 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 10:28:17 +0200
Subject: [PATCH 1182/2920] Add full stop to sentences in the notifications
 view component for objects

refs #6778
---
 .../views/scripts/show/components/notifications.phtml     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/notifications.phtml b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
index 74158daae..76fd2f952 100644
--- a/modules/monitoring/application/views/scripts/show/components/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
@@ -35,22 +35,22 @@ if (! in_array((int) $object->state, array(0, 99))) {
     if ($object->current_notification_number > 0) {
         if ((int) $object->current_notification_number === 1) {
             $msg = sprintf(
-                $this->translate('A notification has been sent for this issue %s'),
+                $this->translate('A notification has been sent for this issue %s.'),
                 $this->timeAgo($object->last_notification)
             );
         } else {
             $msg = sprintf(
-                $this->translate('%d notifications have been sent for this issue'),
+                $this->translate('%d notifications have been sent for this issue.'),
                 $object->current_notification_number
             ) . '<br />' . sprintf(
-                $this->translate('The last one was sent %s'),
+                $this->translate('The last one was sent %s.'),
                 $this->timeAgo($object->last_notification)
             );
         }
         echo $msg;
     } else {
         echo '('
-            . $this->translate('No notification has been sent for this issue')
+            . $this->translate('No notification has been sent for this issue.')
             . ')';
     }
 }

From df3caa61e93fe9ca5dca0b079f6fec1440a1228f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 10:46:19 +0200
Subject: [PATCH 1183/2920] Improve notifications view component for objects

The old view did not show a hyphen if the user lacked the permissions to send a notification and if viewing a host or service not currently in a problem state.
Further the tooltip for send notification was bad English and the view generated a superfluous <br>.
---
 .../show/components/notifications.phtml       | 119 +++++++++---------
 1 file changed, 63 insertions(+), 56 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/notifications.phtml b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
index 76fd2f952..9a9195862 100644
--- a/modules/monitoring/application/views/scripts/show/components/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
@@ -1,59 +1,66 @@
 <tr>
-  <th><?= $this->translate('Notifications') ?></th>
-  <td>
-      <?php if ($this->hasPermission('monitoring/command/send-custom-notification')) {
-      if ($object->getType() === $object::TYPE_HOST) {
-          $ackLink = $this->href(
-              'monitoring/host/send-custom-notification',
-              array('host' => $object->getName())
-          );
-      } else {
-          $ackLink = $this->href(
-              'monitoring/service/send-custom-notification',
-              array('host' => $object->getHost()->getName(), 'service' => $object->getName())
-          );
-      }
-      ?>
-      <?= $this->qlink(
-          $this->translate('Send notification'),
-          $ackLink,
-          null,
-          array(
-              'icon'              => 'bell',
-              'data-base-target'  => '_self',
-              'title'             => $this->translate(
-                  'Send a custom notification, share information about the'
-                  . ' object to contacts.'
-              )
-          )
-      ) ?><br />
-      <?php } ?>
-<?php
-// We are not interested in notifications for OK or pending objects
-if (! in_array((int) $object->state, array(0, 99))) {
-
-    if ($object->current_notification_number > 0) {
-        if ((int) $object->current_notification_number === 1) {
-            $msg = sprintf(
-                $this->translate('A notification has been sent for this issue %s.'),
-                $this->timeAgo($object->last_notification)
-            );
-        } else {
-            $msg = sprintf(
-                $this->translate('%d notifications have been sent for this issue.'),
-                $object->current_notification_number
-            ) . '<br />' . sprintf(
-                $this->translate('The last one was sent %s.'),
-                $this->timeAgo($object->last_notification)
-            );
+    <th><?= $this->translate('Notifications') ?></th>
+    <td>
+        <?php
+        /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+        if ($this->hasPermission('monitoring/command/send-custom-notification')) {
+            if ($object->getType() === $object::TYPE_HOST) {
+                /** @var \Icinga\Module\Monitoring\Object\Host $object */
+                echo $this->qlink(
+                    $this->translate('Send notification'),
+                    'monitoring/host/send-custom-notification',
+                    array('host' => $object->getName()),
+                    array(
+                        'icon'              => 'bell',
+                        'data-base-target'  => '_self',
+                        'title'             => $this->translate(
+                            'Send a custom notification to contacts responsible for this host'
+                        )
+                    )
+                );
+            } else {
+                /** @var \Icinga\Module\Monitoring\Object\Service $object */
+                echo $this->qlink(
+                    $this->translate('Send notification'),
+                    'monitoring/service/send-custom-notification',
+                    array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
+                    array(
+                        'icon'              => 'bell',
+                        'data-base-target'  => '_self',
+                        'title'             => $this->translate(
+                            'Send a custom notification to contacts responsible for this service'
+                        )
+                    )
+                );
+            }
+            if (! in_array((int) $object->state, array(0, 99))) {
+                echo '<br />';
+            }
+        } elseif (in_array((int) $object->state, array(0, 99))) {
+            echo '&#45;';
         }
-        echo $msg;
-    } else {
-        echo '('
-            . $this->translate('No notification has been sent for this issue.')
-            . ')';
-    }
-}
-?>
-  </td>
+        // We are not interested in notifications for OK or pending objects
+        if (! in_array((int) $object->state, array(0, 99))) {
+            if ($object->current_notification_number > 0) {
+                if ((int) $object->current_notification_number === 1) {
+                    $msg = sprintf(
+                        $this->translate('A notification has been sent for this issue %s.'),
+                        $this->timeAgo($object->last_notification)
+                    );
+                } else {
+                    $msg = sprintf(
+                        $this->translate('%d notifications have been sent for this issue.'),
+                        $object->current_notification_number
+                    ) . '<br />' . sprintf(
+                        $this->translate('The last one was sent %s.'),
+                        $this->timeAgo($object->last_notification)
+                    );
+                }
+            } else {
+                $msg = $this->translate('No notification has been sent for this issue.');
+            }
+            echo $msg;
+        }
+        ?>
+    </td>
 </tr>

From a817d9070e966ecc692ca67f311ee7f2a2cca12f Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 8 Apr 2015 16:48:35 +0200
Subject: [PATCH 1184/2920] Move setupSortControl() from
 Monitoring_ListController to Icinga\Web\Controller

---
 library/Icinga/Web/Controller.php                | 15 +++++++++++++++
 .../application/controllers/ListController.php   | 16 ----------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index 8b6f8ca01..e7a1d51f5 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -4,6 +4,7 @@
 namespace Icinga\Web;
 
 use Icinga\Web\Controller\ModuleActionController;
+use Icinga\Web\Widget\SortBox;
 
 /**
  * This is the controller all modules should inherit from
@@ -12,4 +13,18 @@ use Icinga\Web\Controller\ModuleActionController;
  */
 class Controller extends ModuleActionController
 {
+    /**
+     * Create a sort control box at the 'sortControl' view parameter
+     *
+     * @param array $columns    An array containing the sort columns, with the
+     *                          submit value as the key and the label as the value
+     */
+    protected function setupSortControl(array $columns)
+    {
+        $req = $this->getRequest();
+        $this->view->sortControl = SortBox::create(
+            'sortbox-' . $req->getActionName(),
+            $columns
+        )->applyRequest($req);
+    }
 }
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 41e27ec45..4ef93a47a 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -9,7 +9,6 @@ use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 use Icinga\Web\Widget\Tabextension\OutputFormat;
 use Icinga\Web\Widget\Tabs;
-use Icinga\Web\Widget\SortBox;
 use Icinga\Data\Filter\Filter;
 use Icinga\Web\Widget;
 use Icinga\Module\Monitoring\Forms\StatehistoryForm;
@@ -694,21 +693,6 @@ class Monitoring_ListController extends Controller
         return $columns;
     }
 
-    /**
-     * Create a sort control box at the 'sortControl' view parameter
-     *
-     * @param array $columns    An array containing the sort columns, with the
-     *                          submit value as the key and the value as the label
-     */
-    private function setupSortControl(array $columns)
-    {
-        $this->view->sortControl = new SortBox(
-            'sortbox-' . $this->getRequest()->getActionName(),
-            $columns
-        );
-        $this->view->sortControl->applyRequest($this->getRequest());
-    }
-
     protected function addTitleTab($action, $title, $tip)
     {
         $this->getTabs()->add($action, array(

From 1dc16a1ab61dda30ed3110210ff481daef254c44 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 12:12:50 +0200
Subject: [PATCH 1185/2920] ContactgroupQuery: Remove COLLATE from query column
 `contactgroup_name'

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
index cf1586626..c6744f440 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
@@ -8,7 +8,7 @@ class ContactgroupQuery extends IdoQuery
     protected $columnMap = array(
         'contactgroups' => array(
             'contactgroup'          => 'cgo.name1 COLLATE latin1_general_ci',
-            'contactgroup_name'     => 'cgo.name1 COLLATE latin1_general_ci',
+            'contactgroup_name'     => 'cgo.name1',
             'contactgroup_alias'    => 'cg.alias',
         ),
         'contacts' => array(

From 6536878d5dd8a5a874a5df2916f7674b19be5976 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 12:13:23 +0200
Subject: [PATCH 1186/2920] ContactgroupQuery: Remove COLLATE from query column
 `contact_name'

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
index c6744f440..48df99e4e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
@@ -13,7 +13,7 @@ class ContactgroupQuery extends IdoQuery
         ),
         'contacts' => array(
             'contact'                           => 'co.name1 COLLATE latin1_general_ci',
-            'contact_name'                      => 'co.name1 COLLATE latin1_general_ci',
+            'contact_name'                      => 'co.name1',
             'contact_alias'                     => 'c.alias',
             'contact_email'                     => 'c.email_address',
             'contact_pager'                     => 'c.pager_address',

From 71c013178e068ea166c95accbb8d223a3834ff11 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 12:14:11 +0200
Subject: [PATCH 1187/2920] ContactgroupQuery: Make query column
 `contactgroup_alias' case-insensitive

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
index 48df99e4e..6e7e38f0f 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
@@ -9,7 +9,7 @@ class ContactgroupQuery extends IdoQuery
         'contactgroups' => array(
             'contactgroup'          => 'cgo.name1 COLLATE latin1_general_ci',
             'contactgroup_name'     => 'cgo.name1',
-            'contactgroup_alias'    => 'cg.alias',
+            'contactgroup_alias'    => 'cg.alias COLLATE latin1_general_ci'
         ),
         'contacts' => array(
             'contact'                           => 'co.name1 COLLATE latin1_general_ci',

From 5ec4919aa60a5473188923779808e5509e2c0caf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 12:14:47 +0200
Subject: [PATCH 1188/2920] Do not filter for `contactgroup' in case the
 concrete group name is known

refs #8613
---
 .../application/views/scripts/show/components/contacts.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/contacts.phtml b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
index a70c23105..bad1d9cd3 100644
--- a/modules/monitoring/application/views/scripts/show/components/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
@@ -27,7 +27,7 @@ if (! empty($object->contactgroups)) {
         $list[] = $this->qlink(
             $contactgroup->contactgroup_alias,
             'monitoring/list/contactgroups',
-            array('contactgroup' => $contactgroup->contactgroup_name),
+            array('contactgroup_name' => $contactgroup->contactgroup_name),
             array('title' => sprintf($this->translate('List contacts in contact-group "%s"'), $contactgroup->contactgroup_alias))
         );
     }

From a51b93ebfba2fb461529c7c449affcbc5534177e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 12:17:52 +0200
Subject: [PATCH 1189/2920] DataView\Contactgroup: Do not permit querying
 case-insensitive columns

refs #8163
---
 .../library/Monitoring/DataView/Contactgroup.php         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
index b55b6914a..cb5772e76 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
@@ -17,13 +17,9 @@ class Contactgroup extends DataView
     public function getColumns()
     {
         return array(
-            'contact',
             'contact_name',
-            'contactgroup',
             'contactgroup_name',
             'contactgroup_alias',
-            'host',
-            'service'
         );
     }
 
@@ -43,4 +39,9 @@ class Contactgroup extends DataView
             )
         );
     }
+
+    public function getFilterColumns()
+    {
+        return array('contactgroup', 'contact', 'host', 'service');
+    }
 }

From 31a05a3ec04e4efdd68d84f7f3697300f6ef4c3c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 12:19:19 +0200
Subject: [PATCH 1190/2920] DataView\Contactgroup: Add missing query columns

---
 .../Monitoring/DataView/Contactgroup.php      | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
index cb5772e76..287b835f2 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
@@ -8,7 +8,6 @@ namespace Icinga\Module\Monitoring\DataView;
  */
 class Contactgroup extends DataView
 {
-
     /**
      * Retrieve columns provided by this view
      *
@@ -17,9 +16,29 @@ class Contactgroup extends DataView
     public function getColumns()
     {
         return array(
-            'contact_name',
             'contactgroup_name',
             'contactgroup_alias',
+            'contact_name',
+            'contact_alias',
+            'contact_email',
+            'contact_pager',
+            'contact_has_host_notfications',
+            'contact_has_service_notfications',
+            'contact_can_submit_commands',
+            'contact_notify_service_recovery',
+            'contact_notify_service_warning',
+            'contact_notify_service_critical',
+            'contact_notify_service_unknown',
+            'contact_notify_service_flapping',
+            'contact_notify_service_downtime',
+            'contact_notify_host_recovery',
+            'contact_notify_host_down',
+            'contact_notify_host_unreachable',
+            'contact_notify_host_flapping',
+            'contact_notify_host_downtime',
+            'host_name',
+            'service_description',
+            'service_host_name'
         );
     }
 

From 03c8de5d7b773aa3c78271946501f0a64e6155fb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 12:20:28 +0200
Subject: [PATCH 1191/2920] ContactgroupQuery: Provide case-insensitive filter
 column `service_host'

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php  | 1 +
 modules/monitoring/library/Monitoring/DataView/Contactgroup.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
index 6e7e38f0f..8a29e1954 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
@@ -39,6 +39,7 @@ class ContactgroupQuery extends IdoQuery
         'services' => array(
             'service'               => 'so.name2 COLLATE latin1_general_ci',
             'service_description'   => 'so.name2',
+            'service_host'          => 'so.name1 COLLATE latin1_general_ci',
             'service_host_name'     => 'so.name1'
         )
     );
diff --git a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
index 287b835f2..0c432c2dc 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
@@ -61,6 +61,6 @@ class Contactgroup extends DataView
 
     public function getFilterColumns()
     {
-        return array('contactgroup', 'contact', 'host', 'service');
+        return array('contactgroup', 'contact', 'host', 'service', 'service_host');
     }
 }

From 0fe59aa519f4f51f5c89b8a6297ea90039ebcb5f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 12:23:35 +0200
Subject: [PATCH 1192/2920] Revert "ContactQuery: Provide ci query columns for
 aliases and email addresses"

This reverts commit f00adc2138158dd2c5c75b881aff5fc34cae7d70.

Conflicts:
	modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
---
 .../application/controllers/ListController.php   | 16 ++++++++--------
 .../application/controllers/ShowController.php   |  6 +++---
 .../views/scripts/list/contacts.phtml            | 10 +++++-----
 .../views/scripts/show/components/contacts.phtml |  4 ++--
 .../application/views/scripts/show/contact.phtml | 10 +++++-----
 .../Backend/Ido/Query/ContactQuery.php           |  6 ++----
 .../library/Monitoring/DataView/Contact.php      |  6 +++---
 .../Monitoring/Object/MonitoredObject.php        | 14 +++++++-------
 8 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 123ec053b..cd0a734ef 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -350,8 +350,8 @@ class Monitoring_ListController extends Controller
         $query = $this->backend->select()->from('contact', array(
             'contact_name',
             'contact_id',
-            'contact_alias_name',
-            'contact_email_address',
+            'contact_alias',
+            'contact_email',
             'contact_pager',
             'contact_notify_service_timeperiod',
             'contact_notify_service_recovery',
@@ -365,18 +365,18 @@ class Monitoring_ListController extends Controller
             'contact_notify_host_down',
             'contact_notify_host_unreachable',
             'contact_notify_host_flapping',
-            'contact_notify_host_downtime'
+            'contact_notify_host_downtime',
         ));
         $this->filterQuery($query);
         $this->view->contacts = $query->paginate();
 
         $this->setupSortControl(array(
-            'contact_name'                      => $this->translate('Name'),
-            'contact_alias_name'                => $this->translate('Alias'),
-            'contact_email_address'             => $this->translate('Email'),
-            'contact_pager'                     => $this->translate('Pager Address / Number'),
+            'contact_name' => $this->translate('Name'),
+            'contact_alias' => $this->translate('Alias'),
+            'contact_email' => $this->translate('Email'),
+            'contact_pager' => $this->translate('Pager Address / Number'),
             'contact_notify_service_timeperiod' => $this->translate('Service Notification Timeperiod'),
-            'contact_notify_host_timeperiod'    => $this->translate('Host Notification Timeperiod')
+            'contact_notify_host_timeperiod' => $this->translate('Host Notification Timeperiod')
         ));
     }
 
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 1a8504d73..f41811297 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -124,8 +124,8 @@ class Monitoring_ShowController extends Controller
         $query = $this->backend->select()->from('contact', array(
             'contact_name',
             'contact_id',
-            'contact_alias_name',
-            'contact_email_address',
+            'contact_alias',
+            'contact_email',
             'contact_pager',
             'contact_object_id',
             'contact_notify_service_timeperiod',
@@ -140,7 +140,7 @@ class Monitoring_ShowController extends Controller
             'contact_notify_host_down',
             'contact_notify_host_unreachable',
             'contact_notify_host_flapping',
-            'contact_notify_host_downtime'
+            'contact_notify_host_downtime',
         ));
 
         $query->where('contact_name', $contactName);
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index b321d8e85..80405f7c6 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -14,19 +14,19 @@
     }
     foreach ($contacts as $contact): ?>
         <div class="contact">
-            <?= $this->img('/static/gravatar', array('email' => $contact->contact_email_address)); ?>
+            <?= $this->img('/static/gravatar', array('email' => $contact->contact_email)); ?>
             <strong><?= $this->qlink(
                 $contact->contact_name,
                 'monitoring/show/contact',
                 array('contact_name' => $contact->contact_name),
                 array('title' => sprintf(
                     $this->translate('Show detailed information about %s'),
-                    $contact->contact_alias_name
+                    $contact->contact_alias
                 ))
-            ); ?></strong> (<?= $contact->contact_alias_name; ?>)
+            ); ?></strong> (<?= $contact->contact_alias; ?>)
             <div>
-                <?= $this->translate('Email'); ?>: <a href="mailto:<?= $contact->contact_email_address; ?>" title="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias_name); ?>" aria-label="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias_name); ?>">
-                    <?= $this->escape($contact->contact_email_address); ?>
+                <?= $this->translate('Email'); ?>: <a href="mailto:<?= $contact->contact_email; ?>" title="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias); ?>" aria-label="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias); ?>">
+                    <?= $this->escape($contact->contact_email); ?>
                 </a>
             </div>
             <?php if ($contact->contact_pager): ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/contacts.phtml b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
index bad1d9cd3..f445e10d1 100644
--- a/modules/monitoring/application/views/scripts/show/components/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
@@ -5,10 +5,10 @@ if (! empty($object->contacts)) {
     $list = array();
     foreach ($object->contacts as $contact) {
         $list[] = $this->qlink(
-            $contact->contact_alias_name,
+            $contact->contact_alias,
             'monitoring/show/contact',
             array('contact_name' => $contact->contact_name),
-            array('title' => sprintf($this->translate('Show detailed information about %s'), $contact->contact_alias_name))
+            array('title' => sprintf($this->translate('Show detailed information about %s'), $contact->contact_alias))
         );
     }
 
diff --git a/modules/monitoring/application/views/scripts/show/contact.phtml b/modules/monitoring/application/views/scripts/show/contact.phtml
index 0b07edd89..c4142707a 100644
--- a/modules/monitoring/application/views/scripts/show/contact.phtml
+++ b/modules/monitoring/application/views/scripts/show/contact.phtml
@@ -3,7 +3,7 @@
   <?= $this->tabs ?>
   <h1><?= $this->translate('Contact details') ?></h1>
   <div class="circular" style="background-image: url('<?=
-      $this->href('static/gravatar', array('email' => $contact->contact_email_address))
+      $this->href('static/gravatar', array('email' => $contact->contact_email))
   ?>')"></div>
 
 <?php if (! $contact): ?>
@@ -15,14 +15,14 @@
     <tbody>
       <tr>
         <th style="width: 20%"></th>
-        <td><strong><?= $this->escape($contact->contact_alias_name) ?></strong> (<?= $contact->contact_name ?>)</td>
+        <td><strong><?= $this->escape($contact->contact_alias) ?></strong> (<?= $contact->contact_name ?>)</td>
       </tr>
-<?php if ($contact->contact_email_address): ?>
+<?php if ($contact->contact_email): ?>
       <tr>
         <th><?= $this->translate('Email') ?></th>
         <td>
-            <a href="mailto:<?= $contact->contact_email_address; ?>" title="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias_name); ?>" aria-label="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias_name); ?>">
-                <?= $this->escape($contact->contact_email_address); ?>
+            <a href="mailto:<?= $contact->contact_email; ?>" title="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias); ?>" aria-label="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias); ?>">
+                <?= $this->escape($contact->contact_email); ?>
             </a>
         </td>
       </tr>
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
index ce00b6151..3d23b8947 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
@@ -10,10 +10,8 @@ class ContactQuery extends IdoQuery
             'contact_id'                        => 'c.contact_id',
             'contact'                           => 'co.name1 COLLATE latin1_general_ci',
             'contact_name'                      => 'co.name1',
-            'alias'                             => 'c.alias COLLATE latin1_general_ci',
-            'contact_alias_name'                => 'c.alias',
-            'email'                             => 'c.email_address COLLATE latin1_general_ci',
-            'contact_email_address'             => 'c.email_address',
+            'contact_alias'                     => 'c.alias COLLATE latin1_general_ci',
+            'contact_email'                     => 'c.email_address COLLATE latin1_general_ci',
             'contact_pager'                     => 'c.pager_address',
             'contact_object_id'                 => 'c.contact_object_id',
             'contact_has_host_notfications'     => 'c.host_notifications_enabled',
diff --git a/modules/monitoring/library/Monitoring/DataView/Contact.php b/modules/monitoring/library/Monitoring/DataView/Contact.php
index 3a364b968..fdc32e8be 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contact.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contact.php
@@ -17,8 +17,8 @@ class Contact extends DataView
     {
         return array(
             'contact_name',
-            'contact_alias_name',
-            'contact_email_address',
+            'contact_alias',
+            'contact_email',
             'contact_pager',
             'contact_notify_hosts',
             'contact_notify_services',
@@ -53,7 +53,7 @@ class Contact extends DataView
     public function getSortRules()
     {
         return array(
-            'contact_alias_name' => array(
+            'contact_alias' => array(
                 'order' => self::SORT_DESC
             )
         );
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 173fd88fa..c33e1be2d 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -185,10 +185,10 @@ abstract class MonitoredObject implements Filterable
             $this->contacts = array();
             foreach (preg_split('~,~', $this->properties->host_contacts) as $contact) {
                 $this->contacts[] = (object) array(
-                    'contact_name'          => $contact,
-                    'contact_alias_name'    => $contact,
-                    'contact_email_address' => null,
-                    'contact_pager'         => null
+                    'contact_name'  => $contact,
+                    'contact_alias' => $contact,
+                    'contact_email' => null,
+                    'contact_pager' => null,
                 );
             }
         }
@@ -385,9 +385,9 @@ abstract class MonitoredObject implements Filterable
 
         $contacts = $this->backend->select()->from('contact', array(
                 'contact_name',
-                'contact_alias_name',
-                'contact_email_address',
-                'contact_pager'
+                'contact_alias',
+                'contact_email',
+                'contact_pager',
         ));
         if ($this->type === self::TYPE_SERVICE) {
             $contacts

From 638eda7773dd3f5ac23fd9fc0f4e436c2a68a4ad Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 12:27:24 +0200
Subject: [PATCH 1193/2920] ContactgroupQuery: Make query column
 `contact_alias' case-insensitive

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
index 8a29e1954..c87afaa9c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
@@ -14,7 +14,7 @@ class ContactgroupQuery extends IdoQuery
         'contacts' => array(
             'contact'                           => 'co.name1 COLLATE latin1_general_ci',
             'contact_name'                      => 'co.name1',
-            'contact_alias'                     => 'c.alias',
+            'contact_alias'                     => 'c.alias COLLATE latin1_general_ci',
             'contact_email'                     => 'c.email_address',
             'contact_pager'                     => 'c.pager_address',
             'contact_has_host_notfications'     => 'c.host_notifications_enabled',

From 0628efb4cdd0e1e4ff7549da1a245b8484908399 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 12:27:44 +0200
Subject: [PATCH 1194/2920] ContactgroupQuery: Make query column
 `contact_email' case-insensitive

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
index c87afaa9c..152e964f8 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
@@ -15,7 +15,7 @@ class ContactgroupQuery extends IdoQuery
             'contact'                           => 'co.name1 COLLATE latin1_general_ci',
             'contact_name'                      => 'co.name1',
             'contact_alias'                     => 'c.alias COLLATE latin1_general_ci',
-            'contact_email'                     => 'c.email_address',
+            'contact_email'                     => 'c.email_address COLLATE latin1_general_ci',
             'contact_pager'                     => 'c.pager_address',
             'contact_has_host_notfications'     => 'c.host_notifications_enabled',
             'contact_has_service_notfications'  => 'c.service_notifications_enabled',

From b8efe01170e15b228a12e381db474e646ceb1f69 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 12:56:18 +0200
Subject: [PATCH 1195/2920] CustomvarQuery: Remove COLLATE from query columns

...and provide case-insensitive filter columns alternatively.

refs #8613
---
 .../Monitoring/Backend/Ido/Query/CustomvarQuery.php  | 12 ++++++------
 .../library/Monitoring/DataView/Customvar.php        | 11 ++++++++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
index d40a7133d..3bf54756a 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
@@ -13,14 +13,14 @@ class CustomvarQuery extends IdoQuery
         ),
         'objects' => array(
             'host'                => 'cvo.name1 COLLATE latin1_general_ci',
-            'host_name'           => 'cvo.name1 COLLATE latin1_general_ci',
-            'service_host_name'   => 'cvo.name1 COLLATE latin1_general_ci',
-            'service' => 'cvo.name2 COLLATE latin1_general_ci',
-            'service_description' => 'cvo.name2 COLLATE latin1_general_ci',
-            'contact_name'        => 'cvo.name1 COLLATE latin1_general_ci',
+            'host_name'           => 'cvo.name1',
+            'service'             => 'cvo.name2 COLLATE latin1_general_ci',
+            'service_description' => 'cvo.name2',
+            'contact'             => 'cvo.name1 COLLATE latin1_general_ci',
+            'contact_name'        => 'cvo.name1',
             'object_type'         => "CASE cvo.objecttype_id WHEN 1 THEN 'host' WHEN 2 THEN 'service' WHEN 10 THEN 'contact' ELSE 'invalid' END",
             'object_type_id'      => 'cvo.objecttype_id'
-//             'object_type'         => "CASE cvo.objecttype_id WHEN 1 THEN 'host' WHEN 2 THEN 'service' WHEN 3 THEN 'hostgroup' WHEN 4 THEN 'servicegroup' WHEN 5 THEN 'hostescalation' WHEN 6 THEN 'serviceescalation' WHEN 7 THEN 'hostdependency' WHEN 8 THEN 'servicedependency' WHEN 9 THEN 'timeperiod' WHEN 10 THEN 'contact' WHEN 11 THEN 'contactgroup' WHEN 12 THEN 'command' ELSE 'other' END"
+//            'object_type'         => "CASE cvo.objecttype_id WHEN 1 THEN 'host' WHEN 2 THEN 'service' WHEN 3 THEN 'hostgroup' WHEN 4 THEN 'servicegroup' WHEN 5 THEN 'hostescalation' WHEN 6 THEN 'serviceescalation' WHEN 7 THEN 'hostdependency' WHEN 8 THEN 'servicedependency' WHEN 9 THEN 'timeperiod' WHEN 10 THEN 'contact' WHEN 11 THEN 'contactgroup' WHEN 12 THEN 'command' ELSE 'other' END"
         ),
     );
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Customvar.php b/modules/monitoring/library/Monitoring/DataView/Customvar.php
index 0517542c7..d62ff3f51 100644
--- a/modules/monitoring/library/Monitoring/DataView/Customvar.php
+++ b/modules/monitoring/library/Monitoring/DataView/Customvar.php
@@ -19,7 +19,11 @@ class Customvar extends DataView
             'varname',
             'varvalue',
             'is_json',
-            'object_type'
+            'host_name',
+            'service_description',
+            'contact_name',
+            'object_type',
+            'object_type_id'
         );
     }
 
@@ -37,4 +41,9 @@ class Customvar extends DataView
             )
         );
     }
+
+    public function getFilterColumns()
+    {
+        return array('host', 'service', 'contact');
+    }
 }

From dc757e3b19ec84a0d2cc2485f358de04c8b01900 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 12:56:49 +0200
Subject: [PATCH 1196/2920] Use timeAgo() for the comment creation date and
 time instead of prefixedTimeSince()

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

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 6f49bf4a8..e199c1324 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -46,7 +46,7 @@
           <br>
           <strong><?= $this->escape($title); ?></strong>
           <br>
-          <?= $this->prefixedTimeSince($comment->timestamp); ?>
+          <?= $this->timeAgo($comment->timestamp); ?>
         </td>
         <td>
         <?php if ($comment->objecttype === 'service'): ?>

From 1dcb3b3ad2b34749a195a83652577ab1c62be13b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 13:20:41 +0200
Subject: [PATCH 1197/2920] Use timeUntil() for the comment expiration date and
 time

refs #6778
---
 .../application/views/scripts/list/comments.phtml          | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index e199c1324..a07e46875 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -70,10 +70,9 @@
           ?>
           <br>
           <?= $comment->expiration ? sprintf(
-              $this->translate('This comment expires on %s at %s.'),
-              date('d.m.y', $comment->expiration),
-              date('H:i', $comment->expiration)
-            ) : $this->translate('This comment does not expire.'); ?>
+              $this->translate('This comment expires %s.'),
+              $this->timeUntil($comment->expiration)
+          ) : $this->translate('This comment does not expire.'); ?>
         </td>
         <?php if (isset($delCommentForm)): // Form is unset if the current user lacks the respective permission ?>
         <td style="width: 2em" data-base-target="self">

From 5a46821d91cba5e158f65c5b5403f4d590f4b8d7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 14:19:08 +0200
Subject: [PATCH 1198/2920] Rename timeago, timesince and timeuntil CSS classes
 to time-ago, time-since and time-until

refs #6778
---
 library/Icinga/Web/View/helpers/format.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php
index 7b1d3f441..7bd36f308 100644
--- a/library/Icinga/Web/View/helpers/format.php
+++ b/library/Icinga/Web/View/helpers/format.php
@@ -12,7 +12,7 @@ $this->addHelperFunction('format', function () {
 
 $this->addHelperFunction('timeAgo', function ($timestamp) {
     return sprintf(
-        '<span class="timeAgo" title="%s">%s</span>',
+        '<span class="time-ago" title="%s">%s</span>',
         date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
         Format::timeAgo($timestamp)
     );
@@ -20,7 +20,7 @@ $this->addHelperFunction('timeAgo', function ($timestamp) {
 
 $this->addHelperFunction('timeSince', function ($timestamp) {
     return sprintf(
-        '<span class="timesince" title="%s">%s</span>',
+        '<span class="time-since" title="%s">%s</span>',
         date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
         Format::timeSince($timestamp)
     );
@@ -29,7 +29,7 @@ $this->addHelperFunction('timeSince', function ($timestamp) {
 $this->addHelperFunction('timeUntil', function ($timestamp) {
     if (! $timestamp) return '';
     return sprintf(
-        '<span class="timeuntil" title="%s">%s</span>',
+        '<span class="time-until" title="%s">%s</span>',
         date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
         Format::timeUntil($timestamp)
     );

From fda261bf2268d0e7d7afa5682ad37359cfd48e1b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 14:19:38 +0200
Subject: [PATCH 1199/2920] Use case-sensitive query columns when filtering
 downtimes by object

refs #8613
---
 .../controllers/HostsController.php           |  2 +-
 .../controllers/ListController.php            |  4 ++--
 .../controllers/ServicesController.php        |  4 ++--
 .../views/scripts/list/downtimes.phtml        | 22 +++++++++----------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 8d0fc1f73..27d26e51b 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -123,7 +123,7 @@ class Monitoring_HostsController extends Controller
             }
             if ((bool) $host->in_downtime === true) {
                 $objectsInDowntime[] = $host;
-                $downtimeFilterExpressions[] = Filter::where('downtime_host', $host->getName());
+                $downtimeFilterExpressions[] = Filter::where('host_name', $host->getName());
             }
             ++$hostStates[$host::getStateText($host->state)];
         }
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index cd0a734ef..ed4f337b0 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -280,10 +280,10 @@ class Monitoring_ListController extends Controller
             'is_fixed'        => 'downtime_is_fixed',
             'is_in_effect'    => 'downtime_is_in_effect',
             'entry_time'      => 'downtime_entry_time',
-            'host'            => 'host_name',
-            'service'         => 'service_description',
             'host_state'      => 'downtime_host_state',
             'service_state'   => 'downtime_service_state',
+            'host_name',
+            'service_description',
             'host_display_name',
             'service_display_name'
         ));
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index efe89f4c1..b82d6f00e 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -158,8 +158,8 @@ class Monitoring_ServicesController extends Controller
             if ((bool) $service->in_downtime === true) {
                 $objectsInDowntime[] = $service;
                 $downtimeFilterExpressions[] = Filter::matchAll(
-                    Filter::where('downtime_host', $service->getHost()->getName()),
-                    Filter::where('downtime_service', $service->getName())
+                    Filter::where('host_name', $service->getHost()->getName()),
+                    Filter::where('service_description', $service->getName())
                 );
             }
             ++$serviceStates[$service::getStateText($service->state)];
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 00d9c7f90..3e15beef4 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -30,7 +30,7 @@ use Icinga\Module\Monitoring\Object\Service;
     <tbody>
     <?php foreach ($downtimes as $downtime): ?>
     <?php
-      if (isset($downtime->service)) {
+      if (isset($downtime->service_description)) {
           $isService = true;
           $stateName = Service::getStateText($downtime->service_state);
       } else {
@@ -57,11 +57,11 @@ use Icinga\Module\Monitoring\Object\Service;
         <?php if ($isService): ?>
           <?= $this->icon('service', $this->translate('Service')); ?>
           <?= $this->link()->service(
-              $downtime->service, $downtime->service_display_name, $downtime->host, $downtime->host_display_name
+              $downtime->service_description, $downtime->service_display_name, $downtime->host_name, $downtime->host_display_name
           ) ?>
         <?php else: ?>
           <?= $this->icon('host', $this->translate('Host')); ?>
-          <?= $this->link()->host($downtime->host, $downtime->host_display_name) ?>
+          <?= $this->link()->host($downtime->host_name, $downtime->host_display_name) ?>
         <?php endif ?>
           <br>
           <?= $this->icon('comment', $this->translate('Comment')); ?> [<?= $this->escape($downtime->author) ?>] <?= $this->escape($downtime->comment) ?>
@@ -70,7 +70,7 @@ use Icinga\Module\Monitoring\Object\Service;
         <?php if ($downtime->is_flexible): ?>
           <?php if ($downtime->is_in_effect): ?>
             <?= sprintf(
-              isset($downtime->service)
+              $isService
                 ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
                 : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
               date('d.m.y', $downtime->start),
@@ -81,7 +81,7 @@ use Icinga\Module\Monitoring\Object\Service;
             ); ?>
           <?php else: ?>
             <?= sprintf(
-              isset($downtime->service)
+              $isService
                 ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
                 : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
               date('d.m.y H:i', $downtime->scheduled_start),
@@ -92,7 +92,7 @@ use Icinga\Module\Monitoring\Object\Service;
         <?php else: ?>
           <?php if ($downtime->is_in_effect): ?>
             <?= sprintf(
-              isset($downtime->service)
+              $isService
                 ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
                 : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
               date('d.m.y', $downtime->start),
@@ -102,7 +102,7 @@ use Icinga\Module\Monitoring\Object\Service;
             ); ?>
           <?php else: ?>
             <?= sprintf(
-              isset($downtime->service)
+              $isService
                 ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
                 : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
               date('d.m.y', $downtime->scheduled_start),
@@ -119,12 +119,12 @@ use Icinga\Module\Monitoring\Object\Service;
           <?php
           $delDowntimeForm = clone $delDowntimeForm;
           $delDowntimeForm->populate(array('downtime_id' => $downtime->id, 'redirect' => $this->url));
-          if (! isset($downtime->service)) {
-            $delDowntimeForm->setAction($this->url('monitoring/host/delete-downtime', array('host_name' => $downtime->host)));
+          if (! $isService) {
+            $delDowntimeForm->setAction($this->url('monitoring/host/delete-downtime', array('host_name' => $downtime->host_name)));
           } else {
             $delDowntimeForm->setAction($this->url('monitoring/service/delete-downtime', array(
-                'host_name'             => $downtime->host,
-                'service_description'   => $downtime->service
+                'host_name'             => $downtime->host_name,
+                'service_description'   => $downtime->service_description
             )));
           }
           echo $delDowntimeForm;

From d5427f03ab15ff7acf4c4c987103b795d4a2ee21 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 14:22:06 +0200
Subject: [PATCH 1200/2920] Use timeSince() for displaying status changes of
 hosts instead of prefixedTimeSince()

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

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index f5689c927..4b50a01bf 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -82,7 +82,7 @@ if ($hosts->count() === 0) {
       <td class="state">
         <strong><?= Host::getStateText($host->host_state, true); ?></strong><br />
         <?php if ((int) $host->host_state !== 99): ?>
-        <?= $this->prefixedTimeSince($host->host_last_state_change, true) ?>
+        <?= $this->timeSince($host->host_last_state_change) ?>
         <?php if ($host->host_state > 0 && (int) $host->host_state_type === 0): ?>
         <br />
         <strong>Soft <?= $host->host_attempt ?></strong>

From 1c32d8ebe569d4b00fa11dd5aec3eb5c393b212f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 14:23:05 +0200
Subject: [PATCH 1201/2920] DowntimeQuery: Add _name suffix to the query column
 `downtime_author'

...to indicate that it's a case-sensitive column.

refs #8613
---
 modules/monitoring/application/controllers/ListController.php   | 2 +-
 .../monitoring/application/views/scripts/list/downtimes.phtml   | 2 +-
 .../application/views/scripts/show/components/downtime.phtml    | 2 +-
 .../library/Monitoring/Backend/Ido/Query/DowntimeQuery.php      | 2 +-
 modules/monitoring/library/Monitoring/DataView/Downtime.php     | 2 +-
 .../monitoring/library/Monitoring/Object/MonitoredObject.php    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index ed4f337b0..f0eb7e5fa 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -270,7 +270,7 @@ class Monitoring_ListController extends Controller
             'id'              => 'downtime_internal_id',
             'objecttype'      => 'downtime_objecttype',
             'comment'         => 'downtime_comment',
-            'author'          => 'downtime_author',
+            'author_name'     => 'downtime_author_name',
             'start'           => 'downtime_start',
             'scheduled_start' => 'downtime_scheduled_start',
             'scheduled_end'   => 'downtime_scheduled_end',
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 3e15beef4..2387e9487 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -64,7 +64,7 @@ use Icinga\Module\Monitoring\Object\Service;
           <?= $this->link()->host($downtime->host_name, $downtime->host_display_name) ?>
         <?php endif ?>
           <br>
-          <?= $this->icon('comment', $this->translate('Comment')); ?> [<?= $this->escape($downtime->author) ?>] <?= $this->escape($downtime->comment) ?>
+          <?= $this->icon('comment', $this->translate('Comment')); ?> [<?= $this->escape($downtime->author_name) ?>] <?= $this->escape($downtime->comment) ?>
           <br>
           <small>
         <?php if ($downtime->is_flexible): ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 23c20e21f..b30043bda 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -58,7 +58,7 @@ foreach ($object->downtimes as $downtime) {
 
     ?>
     <tr>
-        <th><?= $this->escape($downtime->author); ?></th>
+        <th><?= $this->escape($downtime->author_name); ?></th>
         <td data-base-target="_self">
             <?php if (isset($delDowntimeForm)) { // Form is unset if the current user lacks the respective permission
                 $delDowntimeForm = clone $delDowntimeForm;
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index f1981ef7f..a98b8e2c4 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -13,7 +13,7 @@ class DowntimeQuery extends IdoQuery
      */
     protected $columnMap = array(
         'downtime' => array(
-            'downtime_author'           => 'sd.author_name',
+            'downtime_author_name'      => 'sd.author_name',
             'author'                    => 'sd.author_name',
             'downtime_comment'          => 'sd.comment_data',
             'downtime_entry_time'       => 'UNIX_TIMESTAMP(sd.entry_time)',
diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index 07123dd4f..0b2b02491 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -14,7 +14,7 @@ class Downtime extends DataView
     {
         return array(
             'downtime_objecttype',
-            'downtime_author',
+            'downtime_author_name',
             'author',
             'downtime_comment',
             'downtime_entry_time',
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index c33e1be2d..a653ea6ed 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -276,7 +276,7 @@ abstract class MonitoredObject implements Filterable
             'id'                => 'downtime_internal_id',
             'objecttype'        => 'downtime_objecttype',
             'comment'           => 'downtime_comment',
-            'author'            => 'downtime_author',
+            'author_name'       => 'downtime_author_name',
             'start'             => 'downtime_start',
             'scheduled_start'   => 'downtime_scheduled_start',
             'end'               => 'downtime_end',

From 0f0727491ed67650621dad7050708367918c207a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 14:24:53 +0200
Subject: [PATCH 1202/2920] DowntimeQuery: Make query column `author'
 case-insensitive

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/DowntimeQuery.php  | 2 +-
 modules/monitoring/library/Monitoring/DataView/Downtime.php | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index a98b8e2c4..3f0d0293a 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -14,7 +14,7 @@ class DowntimeQuery extends IdoQuery
     protected $columnMap = array(
         'downtime' => array(
             'downtime_author_name'      => 'sd.author_name',
-            'author'                    => 'sd.author_name',
+            'author'                    => 'sd.author_name COLLATE latin1_general_ci',
             'downtime_comment'          => 'sd.comment_data',
             'downtime_entry_time'       => 'UNIX_TIMESTAMP(sd.entry_time)',
             'downtime_is_fixed'         => 'sd.is_fixed',
diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index 0b2b02491..04cf872db 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -15,7 +15,6 @@ class Downtime extends DataView
         return array(
             'downtime_objecttype',
             'downtime_author_name',
-            'author',
             'downtime_comment',
             'downtime_entry_time',
             'downtime_is_fixed',
@@ -69,4 +68,9 @@ class Downtime extends DataView
             )
         );
     }
+
+    public function getFilterColumns()
+    {
+        return array('author', 'host', 'service');
+    }
 }

From 5ccf6a7efa6f530c3424d4d98ce6daa69d2ab79f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 14:25:26 +0200
Subject: [PATCH 1203/2920] DowntimeQuery: Remove redundant query columns

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/DowntimeQuery.php    | 4 +---
 modules/monitoring/library/Monitoring/DataView/Downtime.php   | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index 3f0d0293a..47db6af94 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -28,11 +28,9 @@ class DowntimeQuery extends IdoQuery
             'downtime_is_in_effect'     => 'sd.is_in_effect',
             'downtime_internal_id'      => 'sd.internal_downtime_id',
             'downtime_objecttype'       => "CASE WHEN ho.object_id IS NULL THEN 'service' ELSE 'host' END",
-            'downtime_host'             => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END COLLATE latin1_general_ci', // #7278, #7279
             'host'                      => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END COLLATE latin1_general_ci',
             'host_name'                 => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END',
-            'downtime_service'          => 'so.name2 COLLATE latin1_general_ci',
-            'service'                   => 'so.name2 COLLATE latin1_general_ci', // #7278, #7279
+            'service'                   => 'so.name2 COLLATE latin1_general_ci',
             'service_description'       => 'so.name2',
             'service_host_name'         => 'so.name1'
         ),
diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index 04cf872db..e2eaf7aee 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -27,8 +27,6 @@ class Downtime extends DataView
             'downtime_is_in_effect',
             'downtime_triggered_by_id',
             'downtime_internal_id',
-            'downtime_host',
-            'downtime_service',
             'downtime_host_state',
             'downtime_service_state',
             'host_display_name',

From 92634a19216d4887bd27a99a0e7ee93c3883821f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 14:25:53 +0200
Subject: [PATCH 1204/2920] DowntimeQuery: Provide case-insensitive filter
 column `service_host'

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/DowntimeQuery.php      | 1 +
 modules/monitoring/library/Monitoring/DataView/Downtime.php     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index 47db6af94..a3e66cbaf 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -32,6 +32,7 @@ class DowntimeQuery extends IdoQuery
             'host_name'                 => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END',
             'service'                   => 'so.name2 COLLATE latin1_general_ci',
             'service_description'       => 'so.name2',
+            'service_host'              => 'so.name1 COLLATE latin1_general_ci',
             'service_host_name'         => 'so.name1'
         ),
         'hosts' => array(
diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index e2eaf7aee..4eaab1860 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -69,6 +69,6 @@ class Downtime extends DataView
 
     public function getFilterColumns()
     {
-        return array('author', 'host', 'service');
+        return array('author', 'host', 'service', 'service_host');
     }
 }

From 2854859a670aabbc8f0c58788898467fd9a22e0e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 14:27:34 +0200
Subject: [PATCH 1205/2920] Use timeSince() for displaying status changes of
 services instead of prefixedTimeSince()

Note that only the services view excluded the prefix from time diffs when being displayed in the dashboard. I'll readd that for both hosts and services later on.
Further, note that only the hosts view excludes the date of the status change when in state pending. I'll add that for the services view too.

refs #6778
---
 .../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 3b17e1b63..5597585de 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -57,7 +57,7 @@ foreach ($services as $service):
     <tr class="state <?= $serviceStateName ?><?= $service->service_handled ? ' handled' : '' ?>">
       <td class="state">
         <strong><?= 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 ?>
+            <?= $this->timeSince($service->service_last_state_change) ?>
             <?php if ($service->service_state > 0 && (int) $service->service_state_type === 0): ?>
               <br />
               <strong>Soft <?= $service->service_attempt ?></strong>

From 1f4b3aa8ea66ac51275d050c19f0801da033d2d7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 15:04:59 +0200
Subject: [PATCH 1206/2920] Fix host and service multiselection

refs #8613
---
 modules/monitoring/application/views/scripts/list/hosts.phtml   | 2 +-
 .../monitoring/application/views/scripts/list/services.phtml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index bdd88a1e9..a7511fcd8 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -36,7 +36,7 @@ if ($hosts->count() === 0) {
     data-base-target="_next"
     class="action multiselect"
     data-icinga-multiselect-url="<?= $this->href('monitoring/hosts/show') ?>"
-    data-icinga-multiselect-data="host"
+    data-icinga-multiselect-data="host_name"
 >
   <tbody>
   <?php foreach($hosts as $host):
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 3dd0b060d..3f1437dae 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -31,7 +31,7 @@ if (!$this->compact): ?>
 <table data-base-target="_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">
+    data-icinga-multiselect-data="service_description,host_name">
   <tbody>
 <?php
 

From 9f075e0691eca381afce71af4d43a43f20de6b12 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 15:19:55 +0200
Subject: [PATCH 1207/2920] HostgroupQuery: Remove COLLATE from query column
 `hostgroup_name'

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/HostgroupQuery.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
index 71e1bbc19..f0ab54b73 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
@@ -8,7 +8,7 @@ class HostgroupQuery extends IdoQuery
     protected $columnMap = array(
         'hostgroups' => array(
             'hostgroups'      => 'hgo.name1 COLLATE latin1_general_ci',
-            'hostgroup_name'  => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_name'  => 'hgo.name1',
             'hostgroup_alias' => 'hg.alias',
             'id'              => 'hg.hostgroup_id',
         ),

From 69e520a514a5cd8add1c0cc8ee7701b0823120a4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 15:20:19 +0200
Subject: [PATCH 1208/2920] HostgroupQuery: Remove COLLATE from query column
 `host_name'

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/HostgroupQuery.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
index f0ab54b73..219479745 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
@@ -14,7 +14,7 @@ class HostgroupQuery extends IdoQuery
         ),
         'hosts' => array(
             'host'            => 'ho.name1 COLLATE latin1_general_ci',
-            'host_name'       => 'ho.name1 COLLATE latin1_general_ci'
+            'host_name'       => 'ho.name1'
         )
     );
 

From f61370f55a134f3e37faa2b9f1ffc4b81f6c21bf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 15:21:18 +0200
Subject: [PATCH 1209/2920] DataView\Hostgroup: Add missing query columns

refs #8613
---
 .../Backend/Ido/Query/HostgroupQuery.php           |  2 +-
 .../library/Monitoring/DataView/Hostgroup.php      | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
index 219479745..d41a9e00b 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
@@ -10,7 +10,7 @@ class HostgroupQuery extends IdoQuery
             'hostgroups'      => 'hgo.name1 COLLATE latin1_general_ci',
             'hostgroup_name'  => 'hgo.name1',
             'hostgroup_alias' => 'hg.alias',
-            'id'              => 'hg.hostgroup_id',
+            'hostgroup_id'    => 'hg.hostgroup_id'
         ),
         'hosts' => array(
             'host'            => 'ho.name1 COLLATE latin1_general_ci',
diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroup.php b/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
index 84beb4bf0..c139d8977 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-
 namespace Icinga\Module\Monitoring\DataView;
 
 /**
@@ -17,9 +16,10 @@ class Hostgroup extends DataView
     public function getColumns()
     {
         return array(
-            'host',
             'hostgroup_name',
-            'hostgroup_alias'
+            'hostgroup_alias',
+            'hostgroup_id',
+            'host_name'
         );
     }
 
@@ -33,7 +33,15 @@ class Hostgroup extends DataView
         return array(
             'hostgroup_name' => array(
                 'order' => self::SORT_ASC
+            ),
+            'hostgroup_alias' => array(
+                'order' => self::SORT_ASC
             )
         );
     }
+
+    public function getFilterColumns()
+    {
+        return array('hostgroup', 'host');
+    }
 }

From 26f0b46516f63d3a977c21e11958cf8e0917b640 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 15:31:09 +0200
Subject: [PATCH 1210/2920] ServicegroupQuery: Remove COLLATE from query column
 `host_name'

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
index 490cc152f..9ec98a5a9 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
@@ -12,7 +12,7 @@ class ServicegroupQuery extends IdoQuery
         ),
         'services' => array(
             'host'                => 'so.name1 COLLATE latin1_general_ci',
-            'host_name'           => 'so.name1 COLLATE latin1_general_ci',
+            'host_name'           => 'so.name1',
             'service'             => 'so.name2 COLLATE latin1_general_ci',
             'service_host_name'   => 'so.name1 COLLATE latin1_general_ci',
             'service_description' => 'so.name2 COLLATE latin1_general_ci'

From 19cae4b751430901653a6f24aa2825aa8d08cb47 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 15:31:20 +0200
Subject: [PATCH 1211/2920] Don't show last status change for services if
 they're in state pending

---
 .../application/views/scripts/list/services.phtml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 5597585de..0c8645e78 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -56,12 +56,15 @@ foreach ($services as $service):
 ?>
     <tr class="state <?= $serviceStateName ?><?= $service->service_handled ? ' handled' : '' ?>">
       <td class="state">
-        <strong><?= Service::getStateText($service->service_state, true); ?></strong><br />
-            <?= $this->timeSince($service->service_last_state_change) ?>
-            <?php if ($service->service_state > 0 && (int) $service->service_state_type === 0): ?>
-              <br />
-              <strong>Soft <?= $service->service_attempt ?></strong>
-            <?php endif ?>
+        <strong><?= Service::getStateText($service->service_state, true); ?></strong>
+        <?php if ((int) $service->service_state !== 99): ?>
+          <br />
+          <?= $this->timeSince($service->service_last_state_change) ?>
+          <?php if ((int) $service->service_state > 0 && (int) $service->service_state_type === 0): ?>
+            <br />
+            <strong>Soft <?= $service->service_attempt ?></strong>
+          <?php endif ?>
+        <?php endif ?>
       </td>
 
       <td>

From a17c2eddb7fd7df51ce631e0534e9de6cb29d48b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 15:31:51 +0200
Subject: [PATCH 1212/2920] ServicegroupQuery: Remove COLLATE from query column
 `service_host_name'

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
index 9ec98a5a9..48052aa33 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
@@ -14,7 +14,7 @@ class ServicegroupQuery extends IdoQuery
             'host'                => 'so.name1 COLLATE latin1_general_ci',
             'host_name'           => 'so.name1',
             'service'             => 'so.name2 COLLATE latin1_general_ci',
-            'service_host_name'   => 'so.name1 COLLATE latin1_general_ci',
+            'service_host_name'   => 'so.name1',
             'service_description' => 'so.name2 COLLATE latin1_general_ci'
         )
     );

From 055cd6142164dbe85f9ba5f32e6bd1a56255a19b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 15:32:47 +0200
Subject: [PATCH 1213/2920] ServicegroupQuery: Remove COLLATE from query column
 `service_desription'

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
index 48052aa33..76b9b1921 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
@@ -15,7 +15,7 @@ class ServicegroupQuery extends IdoQuery
             'host_name'           => 'so.name1',
             'service'             => 'so.name2 COLLATE latin1_general_ci',
             'service_host_name'   => 'so.name1',
-            'service_description' => 'so.name2 COLLATE latin1_general_ci'
+            'service_description' => 'so.name2'
         )
     );
 

From fdd6a4d59ba6770bc9a824d347566800c66d8a57 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 15:34:28 +0200
Subject: [PATCH 1214/2920] ServicegroupQuery: Remove COLLATE from query column
 `servicegroup_name'

...and add a case-insensitive alternative called `servicegroup'.

refs #8613
---
 .../Monitoring/Backend/Ido/Query/ServicegroupQuery.php       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
index 76b9b1921..c9ab100c6 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
@@ -7,8 +7,9 @@ class ServicegroupQuery extends IdoQuery
 {
     protected $columnMap = array(
         'servicegroups' => array(
-            'servicegroup_name'  => 'sgo.name1 COLLATE latin1_general_ci',
-            'servicegroup_alias' => 'sg.alias',
+            'servicegroup'       => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'  => 'sgo.name1',
+            'servicegroup_alias' => 'sg.alias'
         ),
         'services' => array(
             'host'                => 'so.name1 COLLATE latin1_general_ci',

From 4bc3afaca41b9b26437b4cd2a33d5e4252abb8b9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 15:34:55 +0200
Subject: [PATCH 1215/2920] ServicegroupQuery: Make query column
 `servicegroup_alias' case-insensitive

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
index c9ab100c6..125c07005 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
@@ -9,7 +9,7 @@ class ServicegroupQuery extends IdoQuery
         'servicegroups' => array(
             'servicegroup'       => 'sgo.name1 COLLATE latin1_general_ci',
             'servicegroup_name'  => 'sgo.name1',
-            'servicegroup_alias' => 'sg.alias'
+            'servicegroup_alias' => 'sg.alias COLLATE latin1_general_ci'
         ),
         'services' => array(
             'host'                => 'so.name1 COLLATE latin1_general_ci',

From 629becf2cc4f360abab5232538be45207f64fcd5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 15:35:24 +0200
Subject: [PATCH 1216/2920] DataView\Servicegroup: Add missing query and filter
 columns

refs #8613
---
 .../Monitoring/DataView/Servicegroup.php        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroup.php b/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
index 411b550fc..82feabd88 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
@@ -1,10 +1,8 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-
 namespace Icinga\Module\Monitoring\DataView;
 
-
 class Servicegroup extends DataView
 {
     /**
@@ -15,10 +13,11 @@ class Servicegroup extends DataView
     public function getColumns()
     {
         return array(
-            'service',
-            'host',
             'servicegroup_name',
-            'servicegroup_alias'
+            'servicegroup_alias',
+            'host_name',
+            'service_host_name',
+            'service_description'
         );
     }
 
@@ -32,7 +31,15 @@ class Servicegroup extends DataView
         return array(
             'servicegroup_name' => array(
                 'order' => self::SORT_ASC
+            ),
+            'servicegroup_alias' => array(
+                'order' => self::SORT_ASC
             )
         );
     }
+
+    public function getFilterColumns()
+    {
+        return array('servicegroup', 'host', 'service');
+    }
 }

From 291c6bf167d7ce2c8e1be2ca2141682d7108d889 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 15:36:09 +0200
Subject: [PATCH 1217/2920] Remove superfluous <br /> after state pending in
 the hosts overview

---
 .../application/views/scripts/list/hosts.phtml      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 4b50a01bf..bf25e0cf0 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -80,13 +80,14 @@ if ($hosts->count() === 0) {
     <tr class="state <?= $hostStateName ?><?= $host->host_handled ? ' handled' : '' ?>">
       <!-- State -->
       <td class="state">
-        <strong><?= Host::getStateText($host->host_state, true); ?></strong><br />
+        <strong><?= Host::getStateText($host->host_state, true); ?></strong>
         <?php if ((int) $host->host_state !== 99): ?>
-        <?= $this->timeSince($host->host_last_state_change) ?>
-        <?php if ($host->host_state > 0 && (int) $host->host_state_type === 0): ?>
-        <br />
-        <strong>Soft <?= $host->host_attempt ?></strong>
-        <?php endif ?>
+          <br />
+          <?= $this->timeSince($host->host_last_state_change) ?>
+          <?php if ((int) $host->host_state > 0 && (int) $host->host_state_type === 0): ?>
+            <br />
+            <strong>Soft <?= $host->host_attempt ?></strong>
+          <?php endif ?>
         <?php endif ?>
       </td>
 

From 904e91bfa95dbc05dbea7f67a87a6f270e340ff3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 15:54:18 +0200
Subject: [PATCH 1218/2920] EventgridQuery: Remove COLLATE from query column
 `host_name'

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/EventgridQuery.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
index c7764d516..115cd7d37 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
@@ -25,7 +25,7 @@ class EventgridQuery extends IdoQuery
             'cnt_ok'               => 'SUM(CASE WHEN sho.objecttype_id = 2 AND sh.state = 0 THEN 1 ELSE 0 END)',
             'host'                => 'sho.name1 COLLATE latin1_general_ci',
             'service'             => 'sho.name2 COLLATE latin1_general_ci',
-            'host_name'           => 'sho.name1 COLLATE latin1_general_ci',
+            'host_name'           => 'sho.name1',
             'service_description' => 'sho.name2 COLLATE latin1_general_ci',
             'timestamp'           => 'UNIX_TIMESTAMP(sh.state_time)'
         ),

From 8b2c0191c43faa0f46682058abdd67ecf3d1dc5a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 15:54:55 +0200
Subject: [PATCH 1219/2920] EventgridQuery: Remove COLLATE from query column
 `service_description'

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/EventgridQuery.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
index 115cd7d37..b3eeb5335 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
@@ -26,7 +26,7 @@ class EventgridQuery extends IdoQuery
             'host'                => 'sho.name1 COLLATE latin1_general_ci',
             'service'             => 'sho.name2 COLLATE latin1_general_ci',
             'host_name'           => 'sho.name1',
-            'service_description' => 'sho.name2 COLLATE latin1_general_ci',
+            'service_description' => 'sho.name2',
             'timestamp'           => 'UNIX_TIMESTAMP(sh.state_time)'
         ),
 

From 42e93ffb63d46ef7151b29c6e33c44fc95ec8a19 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 15:58:55 +0200
Subject: [PATCH 1220/2920] DataView\Eventgrid: Add missing query and filter
 columns

refs #8613
---
 .../library/Monitoring/DataView/Eventgrid.php        | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
index 022c98d9c..88ff94908 100644
--- a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
+++ b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
@@ -15,6 +15,7 @@ class Eventgrid extends DataView
         return array(
             'day',
             'cnt_events',
+            'objecttype_id',
             'cnt_up',
             'cnt_down_hard',
             'cnt_down',
@@ -22,12 +23,16 @@ class Eventgrid extends DataView
             'cnt_unreachable',
             'cnt_unknown_hard',
             'cnt_unknown',
-            'cnt_unknown_hard',
             'cnt_critical',
             'cnt_critical_hard',
             'cnt_warning',
             'cnt_warning_hard',
             'cnt_ok',
+            'host_name',
+            'service_description',
+            'timestamp',
+            'servicegroup_name',
+            'hostgroup_name'
         );
     }
 
@@ -39,4 +44,9 @@ class Eventgrid extends DataView
             )
         );
     }
+
+    public function getFilterColumns()
+    {
+        return array('host', 'service');
+    }
 }

From ea16d45aa3d357ec1afb29f3c2e322afab73f7a0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 16:01:09 +0200
Subject: [PATCH 1221/2920] EventgridQuery: Make filter column `hostgroup'
 case-insensitive

...and add a case-sensitive query column.

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/EventgridQuery.php    | 3 ++-
 modules/monitoring/library/Monitoring/DataView/Eventgrid.php   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
index b3eeb5335..766dced21 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
@@ -35,7 +35,8 @@ class EventgridQuery extends IdoQuery
         ),
 
         'hostgroups' => array(
-            'hostgroup'  => 'hgo.name1'
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
         )
     );
 
diff --git a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
index 88ff94908..c7ea5b9ac 100644
--- a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
+++ b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
@@ -47,6 +47,6 @@ class Eventgrid extends DataView
 
     public function getFilterColumns()
     {
-        return array('host', 'service');
+        return array('host', 'service', 'hostgroup');
     }
 }

From e7c1e552a52c21451ad98a3e7dc556a6ad9f5fb4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 16:01:22 +0200
Subject: [PATCH 1222/2920] EventgridQuery: Make filter column `servicegroup'
 case-insensitive

...and add a case-sensitive query column.

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/EventgridQuery.php    | 3 ++-
 modules/monitoring/library/Monitoring/DataView/Eventgrid.php   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
index 766dced21..2dac92e3d 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
@@ -31,7 +31,8 @@ class EventgridQuery extends IdoQuery
         ),
 
         'servicegroups' => array(
-            'servicegroup' => 'sgo.name1'
+            'servicegroup'      => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name' => 'sgo.name1'
         ),
 
         'hostgroups' => array(
diff --git a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
index c7ea5b9ac..b7c7e0b3a 100644
--- a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
+++ b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
@@ -47,6 +47,6 @@ class Eventgrid extends DataView
 
     public function getFilterColumns()
     {
-        return array('host', 'service', 'hostgroup');
+        return array('host', 'service', 'hostgroup', 'servicegroup');
     }
 }

From c59d5ac7d51e3d3c601a4b281d5ffa537856bd1b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 16:28:33 +0200
Subject: [PATCH 1223/2920] Hostgroups: Use query column `hostgroup_name'
 instead of `hostgroup'

refs #8613
---
 .../controllers/ListController.php            |  2 +-
 .../views/scripts/list/hostgroups.phtml       | 22 +++++++++----------
 .../Backend/Ido/Query/GroupsummaryQuery.php   |  6 ++---
 .../Backend/Ido/Query/HoststatusQuery.php     |  2 +-
 .../Monitoring/DataView/Groupsummary.php      |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index f0eb7e5fa..82f3febb4 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -559,7 +559,7 @@ class Monitoring_ListController extends Controller
         $this->addTitleTab('hostgroups', $this->translate('Host Groups'), $this->translate('List host groups'));
         $this->setAutorefreshInterval(12);
         $query = $this->backend->select()->from('groupsummary', array(
-            'hostgroup',
+            'hostgroup_name',
             'hostgroup_alias',
             'hosts_up',
             'hosts_unreachable_handled',
diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index 94086f446..1e3eb29ac 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -28,7 +28,7 @@
     </thead>
     <tbody>
     <?php foreach ($hostgroups as $h): ?>
-      <tr href="<?= $this->href('monitoring/list/hosts', array('hostgroup_name' => $h->hostgroup)) ?>">
+      <tr href="<?= $this->href('monitoring/list/hosts', array('hostgroup_name' => $h->hostgroup_name)) ?>">
        <?php if ($h->services_critical_last_state_change_unhandled): ?>
         <td class="state change critical unhandled">
           <strong><?= $this->translate('CRITICAL'); ?></strong>
@@ -82,7 +82,7 @@
           <?= $this->qlink(
             $h->hostgroup_alias,
             'monitoring/list/hosts',
-            array('hostgroup_name' => $h->hostgroup),
+            array('hostgroup_name' => $h->hostgroup_name),
             array('title' => sprintf($this->translate('List all hosts in the group "%s"'), $h->hostgroup_alias))
           ); ?>
         </td>
@@ -90,7 +90,7 @@
           <?= $this->qlink(
             $h->services_total,
             'monitoring/list/services',
-            array('hostgroup_name' => $h->hostgroup),
+            array('hostgroup_name' => $h->hostgroup_name),
             array('title' => sprintf(
                 $this->translate('List all services of all hosts in host group "%s"'),
                 $h->hostgroup_alias
@@ -105,7 +105,7 @@
               'monitoring/list/services',
               array(
                 'service_state'     => 0,
-                'hostgroup_name'    => $h->hostgroup,
+                'hostgroup_name'    => $h->hostgroup_name,
                 'sort'              => 'service_severity'
               ),
               array(
@@ -132,7 +132,7 @@
                 'service_acknowledged'  => 0,
                 'service_in_downtime'   => 0,
                 'host_problem'          => 0,
-                'hostgroup_name'        => $h->hostgroup,
+                'hostgroup_name'        => $h->hostgroup_name,
                 'sort'                  => 'service_severity'
               ),
               array(
@@ -156,7 +156,7 @@
                 array(
                   'service_state'     => 2,
                   'service_handled'   => 1,
-                  'hostgroup_name'    => $h->hostgroup,
+                  'hostgroup_name'    => $h->hostgroup_name,
                   'sort'              => 'service_severity'
                 ),
                 array(
@@ -186,7 +186,7 @@
                 'service_acknowledged'  => 0,
                 'service_in_downtime'   => 0,
                 'host_problem'          => 0,
-                'hostgroup_name'        => $h->hostgroup,
+                'hostgroup_name'        => $h->hostgroup_name,
                 'sort'                  => 'service_severity'
               ),
               array(
@@ -210,7 +210,7 @@
                 array(
                   'service_state'     => 3,
                   'service_handled'   => 1,
-                  'hostgroup_name'    => $h->hostgroup,
+                  'hostgroup_name'    => $h->hostgroup_name,
                   'sort'              => 'service_severity'
                 ),
                 array(
@@ -240,7 +240,7 @@
                 'service_acknowledged'  => 0,
                 'service_in_downtime'   => 0,
                 'host_problem'          => 0,
-                'hostgroup_name'        => $h->hostgroup,
+                'hostgroup_name'        => $h->hostgroup_name,
                 'sort'                  => 'service_severity'
               ),
               array(
@@ -264,7 +264,7 @@
                 array(
                   'service_state'     => 1,
                   'service_handled'   => 1,
-                  'hostgroup_name'    => $h->hostgroup,
+                  'hostgroup_name'    => $h->hostgroup_name,
                   'sort'              => 'service_severity'
                 ),
                 array(
@@ -291,7 +291,7 @@
               'monitoring/list/services',
               array(
                 'service_state'     => 99,
-                'hostgroup_name'    => $h->hostgroup,
+                'hostgroup_name'    => $h->hostgroup_name,
                 'sort'              => 'service_severity'
               ),
               array(
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
index 867da7e78..84023b971 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@@ -19,7 +19,7 @@ class GroupSummaryQuery extends IdoQuery
             'hosts_down_handled'            => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime != 0 THEN 1 ELSE 0 END)',
             'hosts_down_unhandled'          => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
             'hosts_pending'                 => 'SUM(CASE WHEN object_type = \'host\' AND state = 99 THEN 1 ELSE 0 END)',
-            'hostgroup'                     => 'hostgroup',
+            'hostgroup_name'                => 'hostgroup_name',
             'hostgroup_alias'               => 'hostgroup_alias'
         ),
         'servicestatussummary' => array(
@@ -61,9 +61,9 @@ class GroupSummaryQuery extends IdoQuery
             $columns[] = 'servicegroup_alias';
             $groupColumns = array('servicegroup', 'servicegroup_alias');
         } else {
-            $columns[] = 'hostgroup';
+            $columns[] = 'hostgroup_name';
             $columns[] = 'hostgroup_alias';
-            $groupColumns = array('hostgroup', 'hostgroup_alias');
+            $groupColumns = array('hostgroup_name', 'hostgroup_alias');
         }
         $hosts = $this->createSubQuery(
             'Hoststatus',
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index d9b4f2892..d280c7a80 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -83,7 +83,7 @@ class HoststatusQuery extends IdoQuery
             END'
         ),
         'hostgroups' => array(
-            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1',
             'hostgroup_alias'   => 'hg.alias'
         ),
         'servicegroups' => array(
diff --git a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
index bd74aebf2..f4b0cfac8 100644
--- a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
@@ -15,7 +15,7 @@ class Groupsummary extends DataView
         return array(
             'servicegroup',
             'servicegroup_alias',
-            'hostgroup',
+            'hostgroup_name',
             'hostgroup_alias',
             'hosts_up',
             'hosts_unreachable',

From c10617d409187fd6d7e6a73985bed2158decd558 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 16:28:57 +0200
Subject: [PATCH 1224/2920] Servicegroups: Use query column `servicegroup_name'
 instead of `servicegroup'

refs #8613
---
 .../controllers/ListController.php            |  2 +-
 .../views/scripts/list/servicegroups.phtml    | 20 +++++++++----------
 .../Backend/Ido/Query/GroupsummaryQuery.php   | 10 +++++-----
 .../Backend/Ido/Query/HoststatusQuery.php     |  2 +-
 .../Monitoring/DataView/Groupsummary.php      |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 82f3febb4..2802714aa 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -509,7 +509,7 @@ class Monitoring_ListController extends Controller
         );
         $this->setAutorefreshInterval(12);
         $query = $this->backend->select()->from('groupsummary', array(
-            'servicegroup',
+            'servicegroup_name',
             'servicegroup_alias',
             'hosts_up',
             'hosts_unreachable_handled',
diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index cc6b76e6a..9ef23a95a 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -28,7 +28,7 @@
     </thead>
     <tbody>
     <?php foreach ($servicegroups as $s): ?>
-      <tr href="<?= $this->href('monitoring/list/services', array('servicegroup_name' => $s->servicegroup)); ?>">
+      <tr href="<?= $this->href('monitoring/list/services', array('servicegroup_name' => $s->servicegroup_name)); ?>">
        <?php if ($s->services_critical_last_state_change_unhandled): ?>
         <td class="state change critical unhandled">
           <strong><?= $this->translate('CRITICAL'); ?></strong>
@@ -82,7 +82,7 @@
           <?= $this->qlink(
             $s->servicegroup_alias,
             'monitoring/list/services',
-            array('servicegroup_name' => $s->servicegroup),
+            array('servicegroup_name' => $s->servicegroup_name),
             array('title' => sprintf($this->translate('List all services in the group "%s"'), $s->servicegroup_alias))
           ); ?>
         </td>
@@ -97,7 +97,7 @@
               'monitoring/list/services',
               array(
                 'service_state'     => 0,
-                'servicegroup_name' => $s->servicegroup,
+                'servicegroup_name' => $s->servicegroup_name,
                 'sort'              => 'service_severity'
               ),
               array(
@@ -124,7 +124,7 @@
                 'service_acknowledged'  => 0,
                 'service_in_downtime'   => 0,
                 'host_problem'          => 0,
-                'servicegroup_name'     => $s->servicegroup,
+                'servicegroup_name'     => $s->servicegroup_name,
                 'sort'                  => 'service_severity'
               ),
               array(
@@ -148,7 +148,7 @@
                 array(
                   'service_state'     => 2,
                   'service_handled'   => 1,
-                  'servicegroup_name' => $s->servicegroup,
+                  'servicegroup_name' => $s->servicegroup_name,
                   'sort'              => 'service_severity'
                 ),
                 array(
@@ -178,7 +178,7 @@
                 'service_acknowledged'  => 0,
                 'service_in_downtime'   => 0,
                 'host_problem'          => 0,
-                'servicegroup_name'     => $s->servicegroup,
+                'servicegroup_name'     => $s->servicegroup_name,
                 'sort'                  => 'service_severity'
               ),
               array(
@@ -202,7 +202,7 @@
                 array(
                   'service_state'     => 3,
                   'service_handled'   => 1,
-                  'servicegroup_name' => $s->servicegroup,
+                  'servicegroup_name' => $s->servicegroup_name,
                   'sort'              => 'service_severity'
                 ),
                 array(
@@ -232,7 +232,7 @@
                 'service_acknowledged'  => 0,
                 'service_in_downtime'   => 0,
                 'host_problem'          => 0,
-                'servicegroup_name'     => $s->servicegroup,
+                'servicegroup_name'     => $s->servicegroup_name,
                 'sort'                  => 'service_severity'
               ),
               array(
@@ -256,7 +256,7 @@
                 array(
                     'service_state'     => 1,
                     'service_handled'   => 1,
-                    'servicegroup_name' => $s->servicegroup,
+                    'servicegroup_name' => $s->servicegroup_name,
                     'sort'              => 'service_severity'
                 ),
                 array(
@@ -283,7 +283,7 @@
               'monitoring/list/services',
               array(
                 'service_state'     => 99,
-                'servicegroup_name' => $s->servicegroup,
+                'servicegroup_name' => $s->servicegroup_name,
                 'sort'              => 'service_severity'
               ),
               array(
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
index 84023b971..5852c329c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@@ -44,7 +44,7 @@ class GroupSummaryQuery extends IdoQuery
             'services_warning_last_state_change_unhandled'  => 'MAX(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
             'services_critical_last_state_change_unhandled' => 'MAX(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
             'services_unknown_last_state_change_unhandled'  => 'MAX(CASE WHEN object_type = \'service\' AND state = 3 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
-            'servicegroup'                                  => 'servicegroup',
+            'servicegroup_name'                             => 'servicegroup_name',
             'servicegroup_alias'                            => 'servicegroup_alias'
         )
     );
@@ -56,10 +56,10 @@ class GroupSummaryQuery extends IdoQuery
             'host_state'
         );
 
-        if (in_array('servicegroup', $this->desiredColumns)) {
-            $columns[] = 'servicegroup';
+        if (in_array('servicegroup_name', $this->desiredColumns)) {
+            $columns[] = 'servicegroup_name';
             $columns[] = 'servicegroup_alias';
-            $groupColumns = array('servicegroup', 'servicegroup_alias');
+            $groupColumns = array('servicegroup_name', 'servicegroup_alias');
         } else {
             $columns[] = 'hostgroup_name';
             $columns[] = 'hostgroup_alias';
@@ -75,7 +75,7 @@ class GroupSummaryQuery extends IdoQuery
                 'severity'     => 'host_severity'
             )
         );
-        if (in_array('servicegroup', $this->desiredColumns)) {
+        if (in_array('servicegroup_name', $this->desiredColumns)) {
             $hosts->group(array(
                 'sgo.name1',
                 'ho.object_id',
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index d280c7a80..5428d881e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -87,7 +87,7 @@ class HoststatusQuery extends IdoQuery
             'hostgroup_alias'   => 'hg.alias'
         ),
         'servicegroups' => array(
-            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
             'servicegroup_alias'    => 'sg.alias'
         ),
         'contactgroups' => array(
diff --git a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
index f4b0cfac8..e60e53151 100644
--- a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
@@ -13,7 +13,7 @@ class Groupsummary extends DataView
     public function getColumns()
     {
         return array(
-            'servicegroup',
+            'servicegroup_name',
             'servicegroup_alias',
             'hostgroup_name',
             'hostgroup_alias',

From 5c61405a9a1a7b2a055f99fd09f33faade87b550 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 13 Apr 2015 10:27:10 +0200
Subject: [PATCH 1225/2920] Revert "Setup: Fix that the mysql privilege checks
 are not working in the wizard"

This reverts commit 1835479738ab1a45a0892c6b3dd301d27059e58e.
Operator precedence is a damn useful thing, if known by the developer...
---
 modules/setup/library/Setup/Utils/DbTool.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index 3dd450d9c..b08f42bf8 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -691,7 +691,7 @@ EOD;
             . ' AND ' . $privilegeCondition . ($requireGrants ? " AND is_grantable = 'YES'" : ''),
             array(':grantee' => $grantee)
         );
-        return $query->fetchObject()->matches === count($mysqlPrivileges);
+        return (int) $query->fetchObject()->matches === count($mysqlPrivileges);
     }
 
     /**

From d038a2795dc30c49ec36abaf6a170e92adeb29b8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 13 Apr 2015 14:10:24 +0200
Subject: [PATCH 1226/2920] Wizard: Differentiate between privileges required
 to create and setup a db

Fixes the bug that if a database and a login are already existing and only
the schema needs to be set up, which is possible using the resource's login,
the user is required to provide another login with the seemingly missing
privileges.

refs #8707
---
 modules/setup/library/Setup/Utils/DbTool.php | 17 ++++++-----
 modules/setup/library/Setup/WebWizard.php    | 32 ++++++++++++++------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index b08f42bf8..3073778c8 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -721,7 +721,8 @@ EOD;
             foreach (array_intersect($privileges, array_keys($this->pgsqlGrantContexts)) as $privilege) {
                 if (false === empty($context) && $this->pgsqlGrantContexts[$privilege] & static::TABLE_LEVEL) {
                     $tablePrivileges[] = $privilege;
-                } elseif ($this->pgsqlGrantContexts[$privilege] & static::DATABASE_LEVEL) {
+                }
+                if ($this->pgsqlGrantContexts[$privilege] & static::DATABASE_LEVEL) {
                     $dbPrivileges[] = $privilege;
                 }
             }
@@ -760,14 +761,14 @@ EOD;
             // connected to the database defined in the resource configuration it is safe to just ignore them
             // as the chances are very high that the database is created later causing the current user being
             // the owner with ALL privileges. (Which in turn can be granted to others.)
-        }
 
-        if (array_search('CREATE', $privileges) !== false) {
-            $query = $this->query(
-                'select rolcreatedb from pg_roles where rolname = :user',
-                array(':user' => $username !== null ? $username : $this->config['username'])
-            );
-            $privilegesGranted &= $query->fetchColumn() !== false;
+            if (array_search('CREATE', $privileges) !== false) {
+                $query = $this->query(
+                    'select rolcreatedb from pg_roles where rolname = :user',
+                    array(':user' => $username !== null ? $username : $this->config['username'])
+                );
+                $privilegesGranted &= $query->fetchColumn() !== false;
+            }
         }
 
         if (array_search('CREATEROLE', $privileges) !== false) {
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index afe791732..1180379bb 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -17,7 +17,7 @@ use Icinga\Module\Setup\Forms\PreferencesPage;
 use Icinga\Module\Setup\Forms\AuthBackendPage;
 use Icinga\Module\Setup\Forms\AdminAccountPage;
 use Icinga\Module\Setup\Forms\LdapDiscoveryPage;
-use Icinga\Module\Setup\Forms\LdapDiscoveryConfirmPage;
+//use Icinga\Module\Setup\Forms\LdapDiscoveryConfirmPage;
 use Icinga\Module\Setup\Forms\LdapResourcePage;
 use Icinga\Module\Setup\Forms\RequirementsPage;
 use Icinga\Module\Setup\Forms\GeneralConfigPage;
@@ -41,6 +41,17 @@ use Icinga\Module\Setup\Requirement\ConfigDirectoryRequirement;
  */
 class WebWizard extends Wizard implements SetupWizard
 {
+    /**
+     * The privileges required by Icinga Web 2 to create the database and a login
+     *
+     * @var array
+     */
+    protected $databaseCreationPrivileges = array(
+        'CREATE',
+        'CREATE USER', // MySQL
+        'CREATEROLE' // PostgreSQL
+    );
+
     /**
      * The privileges required by Icinga Web 2 to setup the database
      *
@@ -48,10 +59,8 @@ class WebWizard extends Wizard implements SetupWizard
      */
     protected $databaseSetupPrivileges = array(
         'CREATE',
-        'ALTER',
-        'REFERENCES',
-        'CREATE USER', // MySQL
-        'CREATEROLE' // PostgreSQL
+        'ALTER', // MySQL only
+        'REFERENCES'
     );
 
     /**
@@ -148,7 +157,9 @@ class WebWizard extends Wizard implements SetupWizard
                 $page->setResourceConfig($this->getPageData('setup_ldap_resource'));
             }
         } elseif ($page->getName() === 'setup_database_creation') {
-            $page->setDatabaseSetupPrivileges($this->databaseSetupPrivileges);
+            $page->setDatabaseSetupPrivileges(
+                array_merge($this->databaseCreationPrivileges, $this->databaseSetupPrivileges)
+            );
             $page->setDatabaseUsagePrivileges($this->databaseUsagePrivileges);
             $page->setResourceConfig($this->getPageData('setup_db_resource'));
         } elseif ($page->getName() === 'setup_summary') {
@@ -211,8 +222,8 @@ class WebWizard extends Wizard implements SetupWizard
                 try {
                     $db->connectToDb(); // Are we able to login on the database?
                     if (array_search(key($this->databaseTables), $db->listTables()) === false) {
-                        // In case the database schema does not yet exist the user
-                        // needs the privileges to create and setup the database
+                        // In case the database schema does not yet exist the
+                        // user needs the privileges to setup the database
                         $skip = $db->checkPrivileges($this->databaseSetupPrivileges, $this->databaseTables);
                     } else {
                         // In case the database schema exists the user needs the required privileges
@@ -224,7 +235,10 @@ class WebWizard extends Wizard implements SetupWizard
                         $db->connectToHost(); // Are we able to login on the server?
                         // It is not possible to reliably determine whether a database exists or not if a user can't
                         // log in to the database, so we just require the user to be able to create the database
-                        $skip = $db->checkPrivileges($this->databaseSetupPrivileges, $this->databaseTables);
+                        $skip = $db->checkPrivileges(
+                            array_merge($this->databaseCreationPrivileges, $this->databaseSetupPrivileges),
+                            $this->databaseTables
+                        );
                     } catch (PDOException $_) {
                         // We are NOT able to login on the server..
                     }

From e0891aedca366a9ba15b0ac8822a119ba30d7d28 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 13 Apr 2015 14:13:02 +0200
Subject: [PATCH 1227/2920] DbTool: Add mysql context identifiers for the
 REFERENCES privilege

Though this privilege is not in use until mysql version 5.7.6 it is registered
as privilege in the privilege tables in earlier versions.

refs #8707
---
 modules/setup/library/Setup/Utils/DbTool.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index 3073778c8..3e5fb479c 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -78,7 +78,7 @@ class DbTool
         'INSERT'                    => 29,
         'LOCK TABLES'               => 5,
         'PROCESS'                   => 1,
-        'REFERENCES'                => 0,
+        'REFERENCES'                => 12,
         'RELOAD'                    => 1,
         'REPLICATION CLIENT'        => 1,
         'REPLICATION SLAVE'         => 1,

From a21d54460db20e924415d85467cb81bfa41cdc02 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 13 Apr 2015 14:17:18 +0200
Subject: [PATCH 1228/2920] DbTool: Fix that all mysql privileges were checked
 regardless of their context

refs #8707
---
 modules/setup/library/Setup/Utils/DbTool.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index 3e5fb479c..ae2fcc38f 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -629,10 +629,6 @@ EOD;
         $mysqlPrivileges = array_intersect($privileges, array_keys($this->mysqlGrantContexts));
         list($_, $host) = explode('@', $this->query('select current_user()')->fetchColumn());
         $grantee = "'" . ($username === null ? $this->config['username'] : $username) . "'@'" . $host . "'";
-        $privilegeCondition = sprintf(
-            'privilege_type IN (%s)',
-            join(',', array_map(array($this, 'quote'), $mysqlPrivileges))
-        );
 
         if (isset($this->config['dbname'])) {
             $dbPrivileges = array();
@@ -653,7 +649,7 @@ EOD;
                     . ' FROM information_schema.schema_privileges'
                     . ' WHERE grantee = :grantee'
                     . ' AND table_schema = :dbname'
-                    . ' AND ' . $privilegeCondition
+                    . ' AND privilege_type IN (' . join(',', array_map(array($this, 'quote'), $dbPrivileges)) . ')'
                     . ($requireGrants ? " AND is_grantable = 'YES'" : ''),
                     array(':grantee' => $grantee, ':dbname' => $this->config['dbname'])
                 );
@@ -666,14 +662,13 @@ EOD;
                     !$dbPrivilegesGranted || array_intersect($dbPrivileges, $tablePrivileges) != $tablePrivileges
                 )
             ) {
-                $tableCondition = 'table_name IN (' . join(',', array_map(array($this, 'quote'), $context)) . ')';
                 $query = $this->query(
                     'SELECT COUNT(*) as matches'
                     . ' FROM information_schema.table_privileges'
                     . ' WHERE grantee = :grantee'
                     . ' AND table_schema = :dbname'
-                    . ' AND ' . $tableCondition
-                    . ' AND ' . $privilegeCondition
+                    . ' AND table_name IN (' . join(',', array_map(array($this, 'quote'), $context)) . ')'
+                    . ' AND privilege_type IN (' . join(',', array_map(array($this, 'quote'), $tablePrivileges)) . ')'
                     . ($requireGrants ? " AND is_grantable = 'YES'" : ''),
                     array(':grantee' => $grantee, ':dbname' => $this->config['dbname'])
                 );
@@ -688,7 +683,8 @@ EOD;
 
         $query = $this->query(
             'SELECT COUNT(*) as matches FROM information_schema.user_privileges WHERE grantee = :grantee'
-            . ' AND ' . $privilegeCondition . ($requireGrants ? " AND is_grantable = 'YES'" : ''),
+            . ' AND privilege_type IN (' . join(',', array_map(array($this, 'quote'), $mysqlPrivileges)) . ')'
+            . ($requireGrants ? " AND is_grantable = 'YES'" : ''),
             array(':grantee' => $grantee)
         );
         return (int) $query->fetchObject()->matches === count($mysqlPrivileges);

From 24e06e5bc0ac2942702b3bc089dd3030f72e5412 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 13 Apr 2015 15:15:42 +0200
Subject: [PATCH 1229/2920] Alertsummary: Remove another bunch of redundant
 query columns

---
 .../controllers/AlertsummaryController.php     | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index e6b99c8a4..0f6b6cdb8 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -85,12 +85,7 @@ class Monitoring_AlertsummaryController extends Controller
         $query = $this->backend->select()->from(
             'notification',
             array(
-                'host',
-                'service',
-                'notification_output',
-                'notification_contact',
-                'notification_start_time',
-                'notification_state'
+                'notification_start_time'
             )
         );
 
@@ -138,12 +133,7 @@ class Monitoring_AlertsummaryController extends Controller
         $query = $this->backend->select()->from(
             'notification',
             array(
-                'host',
-                'service',
-                'notification_output',
-                'notification_contact',
-                'notification_start_time',
-                'notification_state'
+                'notification_start_time'
             )
         );
 
@@ -322,11 +312,7 @@ class Monitoring_AlertsummaryController extends Controller
         $query = $this->backend->select()->from(
             'notification',
             array(
-                'host',
-                'service',
                 'notification_object_id',
-                'notification_output',
-                'notification_contact',
                 'notification_start_time',
                 'notification_state',
                 'acknowledgement_entry_time'

From 96954ea9a170db6b8a92f7113b8975a14c8e2524 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 13 Apr 2015 15:24:15 +0200
Subject: [PATCH 1230/2920] NotificationQuery: Use query column `host_name'
 instead of `host'

refs #8613
---
 .../application/controllers/AlertsummaryController.php        | 4 ++--
 modules/monitoring/application/controllers/ListController.php | 2 +-
 modules/monitoring/application/controllers/ShowController.php | 2 +-
 .../application/views/scripts/list/notifications.phtml        | 4 ++--
 .../Monitoring/Backend/Ido/Query/NotificationQuery.php        | 2 +-
 .../monitoring/library/Monitoring/DataView/Notification.php   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 0f6b6cdb8..d6e95b601 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -59,7 +59,7 @@ class Monitoring_AlertsummaryController extends Controller
         $query = $this->backend->select()->from(
             'notification',
             array(
-                'host',
+                'host_name',
                 'host_display_name',
                 'service',
                 'service_display_name',
@@ -477,7 +477,7 @@ class Monitoring_AlertsummaryController extends Controller
         $query = $this->backend->select()->from(
             'notification',
             array(
-                'host',
+                'host_name',
                 'host_display_name',
                 'service',
                 'service_display_name',
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 2802714aa..64cec8a2c 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -325,7 +325,7 @@ class Monitoring_ListController extends Controller
         );
         $this->setAutorefreshInterval(15);
         $query = $this->backend->select()->from('notification', array(
-            'host',
+            'host_name',
             'service',
             'notification_output',
             'notification_contact',
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index f41811297..680ed719d 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -156,7 +156,7 @@ class Monitoring_ShowController extends Controller
             $this->view->commands = $commands->paginate();
 
             $notifications = $this->backend->select()->from('notification', array(
-                'host',
+                'host_name',
                 'service',
                 'notification_output',
                 'notification_contact',
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index cd2c46538..b5d5adde1 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -46,12 +46,12 @@ use Icinga\Module\Monitoring\Object\Service;
                     <?= $this->link()->service(
                         $notification->service,
                         $notification->service_display_name,
-                        $notification->host,
+                        $notification->host_name,
                         $notification->host_display_name
                     ) ?>
                 <?php else: ?>
                     <?= $this->icon('host', $this->translate('Host')); ?>
-                    <?= $this->link()->host($notification->host, $notification->host_display_name) ?>
+                    <?= $this->link()->host($notification->host_name, $notification->host_display_name) ?>
                 <?php endif ?>
                 <br>
                 <?= $this->escape($this->ellipsis($notification->notification_output, 10000)) ?>
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index 4eebc640f..d974cd1eb 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -13,7 +13,7 @@ class NotificationQuery extends IdoQuery
             'notification_object_id'        => 'n.object_id'
         ),
         'objects' => array(
-            'host'                          => 'o.name1',
+            'host_name'                     => 'o.name1',
             'service'                       => 'o.name2'
         ),
         'contact' => array(
diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php
index b4632b57c..f716d0066 100644
--- a/modules/monitoring/library/Monitoring/DataView/Notification.php
+++ b/modules/monitoring/library/Monitoring/DataView/Notification.php
@@ -13,7 +13,7 @@ class Notification extends DataView
     public function getColumns()
     {
         return array(
-            'host',
+            'host_name',
             'service',
             'notification_state',
             'notification_start_time',

From 15399d77ceea9feab481289930f3afe95fa43b8c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 13 Apr 2015 15:25:10 +0200
Subject: [PATCH 1231/2920] NotificationQuery: Use query column
 `service_description' instead of `service'

refs #8613
---
 .../application/controllers/AlertsummaryController.php        | 4 ++--
 modules/monitoring/application/controllers/ListController.php | 2 +-
 modules/monitoring/application/controllers/ShowController.php | 2 +-
 .../application/views/scripts/list/notifications.phtml        | 4 ++--
 .../Monitoring/Backend/Ido/Query/NotificationQuery.php        | 2 +-
 .../monitoring/library/Monitoring/DataView/Notification.php   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index d6e95b601..22329cd7a 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -61,7 +61,7 @@ class Monitoring_AlertsummaryController extends Controller
             array(
                 'host_name',
                 'host_display_name',
-                'service',
+                'service_description',
                 'service_display_name',
                 'notification_output',
                 'notification_contact',
@@ -479,7 +479,7 @@ class Monitoring_AlertsummaryController extends Controller
             array(
                 'host_name',
                 'host_display_name',
-                'service',
+                'service_description',
                 'service_display_name',
                 'notification_output',
                 'notification_contact',
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 64cec8a2c..ef0ee4db2 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -326,7 +326,7 @@ class Monitoring_ListController extends Controller
         $this->setAutorefreshInterval(15);
         $query = $this->backend->select()->from('notification', array(
             'host_name',
-            'service',
+            'service_description',
             'notification_output',
             'notification_contact',
             'notification_start_time',
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 680ed719d..f89b70d07 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -157,7 +157,7 @@ class Monitoring_ShowController extends Controller
 
             $notifications = $this->backend->select()->from('notification', array(
                 'host_name',
-                'service',
+                'service_description',
                 'notification_output',
                 'notification_contact',
                 'notification_start_time',
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index b5d5adde1..b9fd7e309 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -24,7 +24,7 @@ use Icinga\Module\Monitoring\Object\Service;
     <table data-base-target="_next" class="action">
     <tbody>
     <?php foreach ($notifications as $notification):
-        if (isset($notification->service)) {
+        if (isset($notification->service_description)) {
             $isService = true;
             $stateName = Service::getStateText($notification->notification_state);
         } else {
@@ -44,7 +44,7 @@ use Icinga\Module\Monitoring\Object\Service;
                 <?php if ($isService): ?>
                     <?= $this->icon('service', $this->translate('Service')); ?>
                     <?= $this->link()->service(
-                        $notification->service,
+                        $notification->service_description,
                         $notification->service_display_name,
                         $notification->host_name,
                         $notification->host_display_name
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index d974cd1eb..41526f612 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -14,7 +14,7 @@ class NotificationQuery extends IdoQuery
         ),
         'objects' => array(
             'host_name'                     => 'o.name1',
-            'service'                       => 'o.name2'
+            'service_description'           => 'o.name2'
         ),
         'contact' => array(
             'notification_contact'          => 'c_o.name1',
diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php
index f716d0066..0eb761ae3 100644
--- a/modules/monitoring/library/Monitoring/DataView/Notification.php
+++ b/modules/monitoring/library/Monitoring/DataView/Notification.php
@@ -14,7 +14,7 @@ class Notification extends DataView
     {
         return array(
             'host_name',
-            'service',
+            'service_description',
             'notification_state',
             'notification_start_time',
             'notification_contact',

From 644a386bf8ef0041497bb12dcbf72089ed55125d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 13 Apr 2015 15:26:06 +0200
Subject: [PATCH 1232/2920] NotificationQuery: Use query column
 `notification_contact_name'

...instead of `notification_contact'.

refs #8613
---
 .../application/controllers/AlertsummaryController.php        | 4 ++--
 modules/monitoring/application/controllers/ListController.php | 2 +-
 modules/monitoring/application/controllers/ShowController.php | 2 +-
 .../application/views/scripts/list/notifications.phtml        | 4 ++--
 .../Monitoring/Backend/Ido/Query/NotificationQuery.php        | 2 +-
 .../monitoring/library/Monitoring/DataView/Notification.php   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 22329cd7a..0d3917e90 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -64,7 +64,7 @@ class Monitoring_AlertsummaryController extends Controller
                 'service_description',
                 'service_display_name',
                 'notification_output',
-                'notification_contact',
+                'notification_contact_name',
                 'notification_start_time',
                 'notification_state'
             )
@@ -482,7 +482,7 @@ class Monitoring_AlertsummaryController extends Controller
                 'service_description',
                 'service_display_name',
                 'notification_output',
-                'notification_contact',
+                'notification_contact_name',
                 'notification_start_time',
                 'notification_state'
             )
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index ef0ee4db2..b06291c67 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -328,7 +328,7 @@ class Monitoring_ListController extends Controller
             'host_name',
             'service_description',
             'notification_output',
-            'notification_contact',
+            'notification_contact_name',
             'notification_start_time',
             'notification_state',
             'host_display_name',
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index f89b70d07..0d7df501a 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -159,7 +159,7 @@ class Monitoring_ShowController extends Controller
                 'host_name',
                 'service_description',
                 'notification_output',
-                'notification_contact',
+                'notification_contact_name',
                 'notification_start_time',
                 'notification_state',
                 'host_display_name',
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index b9fd7e309..9a3b424b4 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -61,9 +61,9 @@ use Icinga\Module\Monitoring\Object\Service;
                         <?= sprintf(
                             $this->translate('Sent to %s'),
                             $this->qlink(
-                                $notification->notification_contact,
+                                $notification->notification_contact_name,
                                 'monitoring/show/contact',
-                                array('contact_name' => $notification->notification_contact)
+                                array('contact_name' => $notification->notification_contact_name)
                             )
                         ) ?>
                     </small>
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index 41526f612..3496ca9e2 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -17,7 +17,7 @@ class NotificationQuery extends IdoQuery
             'service_description'           => 'o.name2'
         ),
         'contact' => array(
-            'notification_contact'          => 'c_o.name1',
+            'notification_contact_name'     => 'c_o.name1',
             'contact_object_id'             => 'c_o.object_id'
         ),
         'command' => array(
diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php
index 0eb761ae3..757334063 100644
--- a/modules/monitoring/library/Monitoring/DataView/Notification.php
+++ b/modules/monitoring/library/Monitoring/DataView/Notification.php
@@ -17,7 +17,7 @@ class Notification extends DataView
             'service_description',
             'notification_state',
             'notification_start_time',
-            'notification_contact',
+            'notification_contact_name',
             'notification_output',
             'notification_command',
             'host_display_name',

From 3653ec810a71bbfbef3468ca7e80a4208e46c935 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 13 Apr 2015 15:32:52 +0200
Subject: [PATCH 1233/2920] NotificationQuery: Provide case-insensitive filter
 column `host'

refs #8613
---
 .../Monitoring/Backend/Ido/Query/NotificationQuery.php       | 1 +
 .../monitoring/library/Monitoring/DataView/Notification.php  | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index 3496ca9e2..b60e98a62 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -13,6 +13,7 @@ class NotificationQuery extends IdoQuery
             'notification_object_id'        => 'n.object_id'
         ),
         'objects' => array(
+            'host'                          => 'o.name1 COLLATE latin1_general_ci',
             'host_name'                     => 'o.name1',
             'service_description'           => 'o.name2'
         ),
diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php
index 757334063..3da39877f 100644
--- a/modules/monitoring/library/Monitoring/DataView/Notification.php
+++ b/modules/monitoring/library/Monitoring/DataView/Notification.php
@@ -34,4 +34,9 @@ class Notification extends DataView
             )
         );
     }
+
+    public function getFilterColumns()
+    {
+        return array('host');
+    }
 }

From 29f05bf87813c7097643d9037a6085c6432900cb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 13 Apr 2015 15:33:19 +0200
Subject: [PATCH 1234/2920] NotificationQuery: Provide case-insensitive filter
 column `service'

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/NotificationQuery.php  | 1 +
 modules/monitoring/library/Monitoring/DataView/Notification.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index b60e98a62..db267fbc9 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -15,6 +15,7 @@ class NotificationQuery extends IdoQuery
         'objects' => array(
             'host'                          => 'o.name1 COLLATE latin1_general_ci',
             'host_name'                     => 'o.name1',
+            'service'                       => 'o.name2 COLLATE latin1_general_ci',
             'service_description'           => 'o.name2'
         ),
         'contact' => array(
diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php
index 3da39877f..f84eaddf0 100644
--- a/modules/monitoring/library/Monitoring/DataView/Notification.php
+++ b/modules/monitoring/library/Monitoring/DataView/Notification.php
@@ -37,6 +37,6 @@ class Notification extends DataView
 
     public function getFilterColumns()
     {
-        return array('host');
+        return array('host', 'service');
     }
 }

From 9cc546930515eff34b2628e840a3365739ce4dd2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 13 Apr 2015 15:33:33 +0200
Subject: [PATCH 1235/2920] NotificationQuery: Provide case-insensitive filter
 column `contact'

refs #8613
---
 .../library/Monitoring/Backend/Ido/Query/NotificationQuery.php  | 1 +
 modules/monitoring/library/Monitoring/DataView/Notification.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index db267fbc9..0133dc637 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -19,6 +19,7 @@ class NotificationQuery extends IdoQuery
             'service_description'           => 'o.name2'
         ),
         'contact' => array(
+            'contact'                       => 'c_o.name1 COLLATE latin1_general_ci',
             'notification_contact_name'     => 'c_o.name1',
             'contact_object_id'             => 'c_o.object_id'
         ),
diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php
index f84eaddf0..48d8fd058 100644
--- a/modules/monitoring/library/Monitoring/DataView/Notification.php
+++ b/modules/monitoring/library/Monitoring/DataView/Notification.php
@@ -37,6 +37,6 @@ class Notification extends DataView
 
     public function getFilterColumns()
     {
-        return array('host', 'service');
+        return array('host', 'service', 'contact');
     }
 }

From 67ad575cf5085f7b41802e2d00965ad4b5b721d9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 13 Apr 2015 17:09:49 +0200
Subject: [PATCH 1236/2920] Set the configured logging level even if the
 configured logging type is invalid

refs #8957
---
 .../Application/ApplicationBootstrap.php      | 11 ++-
 library/Icinga/Application/Logger.php         | 68 +++++++++++--------
 2 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 76efd4386..2ab75066c 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -506,12 +506,21 @@ abstract class ApplicationBootstrap
     protected function setupLogger()
     {
         if ($this->config->hasSection('logging')) {
+            $loggingConfig = $this->config->getSection('logging');
+
             try {
-                Logger::create($this->config->getSection('logging'));
+                Logger::create($loggingConfig);
             } catch (ConfigurationError $e) {
                 Logger::error($e);
+
+                try {
+                    Logger::getInstance()->setLevel($loggingConfig->get('level', Logger::ERROR));
+                } catch (ConfigurationError $e) {
+                    Logger::error($e);
+                }
             }
         }
+
         return $this;
     }
 
diff --git a/library/Icinga/Application/Logger.php b/library/Icinga/Application/Logger.php
index 7de334c01..ff176c6c2 100644
--- a/library/Icinga/Application/Logger.php
+++ b/library/Icinga/Application/Logger.php
@@ -81,39 +81,53 @@ class Logger
             throw new ConfigurationError('Required logging configuration directive \'log\' missing');
         }
 
-        if (($level = $config->level) !== null) {
-            if (is_numeric($level)) {
-                $level = (int) $level;
-                if (! isset(static::$levels[$level])) {
-                    throw new ConfigurationError(
-                        'Can\'t set logging level %d. Logging level is not defined. Use one of %s or one of the'
-                        . ' Logger\'s constants.',
-                        $level,
-                        implode(', ', array_keys(static::$levels))
-                    );
-                }
-                $this->level = $level;
-            } else {
-                $level = strtoupper($level);
-                $levels = array_flip(static::$levels);
-                if (! isset($levels[$level])) {
-                    throw new ConfigurationError(
-                        'Can\'t set logging level "%s". Logging level is not defined. Use one of %s.',
-                        $level,
-                        implode(', ', array_keys($levels))
-                    );
-                }
-                $this->level = $levels[$level];
-            }
-        } else {
-            $this->level = static::ERROR;
-        }
+        $this->setLevel($config->get('level', static::ERROR));
 
         if (strtolower($config->get('log', 'syslog')) !== 'none') {
             $this->writer = $this->createWriter($config);
         }
     }
 
+    /**
+     * Set the logging level to use
+     *
+     * @param   mixed   $level
+     *
+     * @return  $this
+     *
+     * @throws  ConfigurationError      In case the given level is invalid
+     */
+    public function setLevel($level)
+    {
+        if (is_numeric($level)) {
+            $level = (int) $level;
+            if (! isset(static::$levels[$level])) {
+                throw new ConfigurationError(
+                    'Can\'t set logging level %d. Logging level is invalid. Use one of %s or one of the'
+                    . ' Logger\'s constants.',
+                    $level,
+                    implode(', ', array_keys(static::$levels))
+                );
+            }
+
+            $this->level = $level;
+        } else {
+            $level = strtoupper($level);
+            $levels = array_flip(static::$levels);
+            if (! isset($levels[$level])) {
+                throw new ConfigurationError(
+                    'Can\'t set logging level "%s". Logging level is invalid. Use one of %s.',
+                    $level,
+                    implode(', ', array_keys($levels))
+                );
+            }
+
+            $this->level = $levels[$level];
+        }
+
+        return $this;
+    }
+
     /**
      * Create a new logger object
      *

From 36fed037641fb390053694b15828aaa157c2a64b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 13 Apr 2015 17:11:42 +0200
Subject: [PATCH 1237/2920] Do not log that the logging configuration is
 invalid on every request

Instead, log those messages *everytime* a subsequent message is being
logged.

refs #8957
---
 .../Application/ApplicationBootstrap.php      |  4 +--
 library/Icinga/Application/Logger.php         | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 2ab75066c..070edb0cb 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -511,12 +511,12 @@ abstract class ApplicationBootstrap
             try {
                 Logger::create($loggingConfig);
             } catch (ConfigurationError $e) {
-                Logger::error($e);
+                Logger::getInstance()->registerConfigError($e->getMessage());
 
                 try {
                     Logger::getInstance()->setLevel($loggingConfig->get('level', Logger::ERROR));
                 } catch (ConfigurationError $e) {
-                    Logger::error($e);
+                    Logger::getInstance()->registerConfigError($e->getMessage());
                 }
             }
         }
diff --git a/library/Icinga/Application/Logger.php b/library/Icinga/Application/Logger.php
index ff176c6c2..925695dad 100644
--- a/library/Icinga/Application/Logger.php
+++ b/library/Icinga/Application/Logger.php
@@ -67,6 +67,13 @@ class Logger
      */
     protected $level;
 
+    /**
+     * Error messages to be displayed prior to any other log message
+     *
+     * @var array
+     */
+    protected $configErrors = array();
+
     /**
      * Create a new logger object
      *
@@ -128,6 +135,24 @@ class Logger
         return $this;
     }
 
+    /**
+     * Register the given message as config error
+     *
+     * Config errors are logged every time a log message is being logged.
+     *
+     * @param   mixed   $arg,...    A string, exception or format-string + substitutions
+     *
+     * @return  $this
+     */
+    public function registerConfigError()
+    {
+        if (func_num_args() > 0) {
+            $this->configErrors[] = static::formatMessage(func_get_args());
+        }
+
+        return $this;
+    }
+
     /**
      * Create a new logger object
      *
@@ -170,6 +195,10 @@ class Logger
     public function log($level, $message)
     {
         if ($this->writer !== null && $this->level <= $level) {
+            foreach ($this->configErrors as $error_message) {
+                $this->writer->log(static::ERROR, $error_message);
+            }
+
             $this->writer->log($level, $message);
         }
     }

From 16b9c73436bab9318d1a09f5caaba8412fd168c2 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 13 Apr 2015 16:10:58 +0200
Subject: [PATCH 1238/2920] Do not destroy all global on mailto link clicks

Only call the cleanup code on the unload event, beforeunload is only for asking for confirmation.

fixes #7759
---
 public/js/icinga/events.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index f83c172f6..f3e01c908 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -106,7 +106,6 @@
 
             // Destroy Icinga, clean up and interrupt pending requests on unload
             $( window ).on('unload', { self: this }, this.onUnload);
-            $( window ).on('beforeunload', { self: this }, this.onUnload);
 
             // We catch scroll events in our containers
             $('.container').on('scroll', { self: this }, this.icinga.events.onContainerScroll);
@@ -559,7 +558,6 @@
             $(window).off('resize', this.onWindowResize);
             $(window).off('load', this.onLoad);
             $(window).off('unload', this.onUnload);
-            $(window).off('beforeunload', this.onUnload);
             $(document).off('scroll', '.container', this.onContainerScroll);
             $(document).off('click', 'a', this.linkClicked);
             $(document).off('click', 'table.action tr[href]', this.rowSelected);

From f4c0b35effc975e8485e86384fc0695d7090a22a Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 13 Apr 2015 16:28:55 +0200
Subject: [PATCH 1239/2920] Remove unused code

---
 public/js/icinga/events.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index f3e01c908..43ecdf09f 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -17,12 +17,6 @@
 
     Icinga.Events.prototype = {
 
-        keyboard: {
-            ctrlKey:    false,
-            altKey:     false,
-            shiftKey:   false
-        },
-
         /**
          * Icinga will call our initialize() function once it's ready
          */

From 1f0940c8e8be7dee81b9cdeaf6a05871f8fa0db2 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 13 Apr 2015 17:45:38 +0200
Subject: [PATCH 1240/2920] Remove all selections closing the detail area

fixes #8781
---
 public/js/icinga/events.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 43ecdf09f..491ca82f2 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -460,6 +460,9 @@
                             } else {
                                 icinga.ui.layout1col();
                             }
+                            $('table tr[href].active').removeClass('active');
+                            icinga.ui.storeSelectionData(null);
+                            icinga.ui.loadSelectionData();
                             icinga.history.pushCurrentState();
                         }
                     }

From 9ef414c9ed0d5419b37623f23623e21cdff6dbf3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 14 Apr 2015 09:20:43 +0200
Subject: [PATCH 1241/2920] Add separator when listing downtimes in the detail
 view

fixes #9046
---
 .../application/views/scripts/show/components/downtime.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index b30043bda..9eb4b6c18 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -65,7 +65,7 @@ foreach ($object->downtimes as $downtime) {
                 $delDowntimeForm->populate(array('downtime_id' => $downtime->id));
                 echo $delDowntimeForm;
             } ?>
-            <span class="sr-only"><?= $this->translate('Downtime'); ?></span><?= $state; ?><?= str_replace(array('\r\n', '\n'), '<br>', $commentText); ?>
+            <span class="sr-only"><?= $this->translate('Downtime'); ?></span><?= $state; ?> - <?= str_replace(array('\r\n', '\n'), '<br>', $commentText); ?>
         </td>
     </tr>
 <?php } // endforeach ?>

From 2618d4a4681173e5e9f2fbbedaab65a340ef9196 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 14 Apr 2015 12:27:54 +0200
Subject: [PATCH 1242/2920] DataView\Contact: Add missing query columns

fixes #9057
---
 modules/monitoring/library/Monitoring/DataView/Contact.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Contact.php b/modules/monitoring/library/Monitoring/DataView/Contact.php
index fdc32e8be..8116e11a4 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contact.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contact.php
@@ -16,6 +16,7 @@ class Contact extends DataView
     public function getColumns()
     {
         return array(
+            'contact_id',
             'contact_name',
             'contact_alias',
             'contact_email',
@@ -41,7 +42,9 @@ class Contact extends DataView
             'host_name',
             'service_object_id',
             'service_host_name',
-            'service_description'
+            'service_description',
+            'contact_notify_host_timeperiod',
+            'contact_notify_service_timeperiod'
         );
     }
 

From 923bc11b391a1c6f70c3d5fa9febaf39a5b30fa3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 14 Apr 2015 12:44:24 +0200
Subject: [PATCH 1243/2920] GroupsummaryQuery: Provide case insensitive filter
 columns for group names

I've renamed those and made them case sensitive as part of #8613 but
missed that they are required by the global search.

fixes #9056
---
 .../Monitoring/Backend/Ido/Query/GroupsummaryQuery.php | 10 +++++++---
 .../Monitoring/Backend/Ido/Query/HoststatusQuery.php   |  2 ++
 .../library/Monitoring/DataView/Groupsummary.php       |  5 +++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
index 5852c329c..8b72bbf79 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@@ -20,7 +20,8 @@ class GroupSummaryQuery extends IdoQuery
             'hosts_down_unhandled'          => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
             'hosts_pending'                 => 'SUM(CASE WHEN object_type = \'host\' AND state = 99 THEN 1 ELSE 0 END)',
             'hostgroup_name'                => 'hostgroup_name',
-            'hostgroup_alias'               => 'hostgroup_alias'
+            'hostgroup_alias'               => 'hostgroup_alias',
+            'hostgroup'                     => 'hostgroup'
         ),
         'servicestatussummary' => array(
             'services_total'                                => 'SUM(CASE WHEN object_type = \'service\' THEN 1 ELSE 0 END)',
@@ -45,7 +46,8 @@ class GroupSummaryQuery extends IdoQuery
             'services_critical_last_state_change_unhandled' => 'MAX(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
             'services_unknown_last_state_change_unhandled'  => 'MAX(CASE WHEN object_type = \'service\' AND state = 3 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
             'servicegroup_name'                             => 'servicegroup_name',
-            'servicegroup_alias'                            => 'servicegroup_alias'
+            'servicegroup_alias'                            => 'servicegroup_alias',
+            'servicegroup'                                  => 'servicegroup'
         )
     );
 
@@ -56,11 +58,13 @@ class GroupSummaryQuery extends IdoQuery
             'host_state'
         );
 
-        if (in_array('servicegroup_name', $this->desiredColumns)) {
+        if (in_array('servicegroup', $this->desiredColumns) || in_array('servicegroup_name', $this->desiredColumns)) {
+            $columns[] = 'servicegroup';
             $columns[] = 'servicegroup_name';
             $columns[] = 'servicegroup_alias';
             $groupColumns = array('servicegroup_name', 'servicegroup_alias');
         } else {
+            $columns[] = 'hostgroup';
             $columns[] = 'hostgroup_name';
             $columns[] = 'hostgroup_alias';
             $groupColumns = array('hostgroup_name', 'hostgroup_alias');
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index 5428d881e..23a8b585a 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -83,10 +83,12 @@ class HoststatusQuery extends IdoQuery
             END'
         ),
         'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
             'hostgroup_name'    => 'hgo.name1',
             'hostgroup_alias'   => 'hg.alias'
         ),
         'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
             'servicegroup_name'     => 'sgo.name1',
             'servicegroup_alias'    => 'sg.alias'
         ),
diff --git a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
index e60e53151..562bed1da 100644
--- a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
@@ -58,4 +58,9 @@ class Groupsummary extends DataView
             )
         );
     }
+
+    public function getFilterColumns()
+    {
+        return array('hostgroup', 'servicegroup');
+    }
 }

From d02c078e4ae269d1c984bf0eab5b90f2f6c80a53 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 15 Apr 2015 09:26:39 +0200
Subject: [PATCH 1244/2920] Wizard: Ensure that privileges are checked only
 once

Another entry in the "The provided credentials cannot be
used to create the database and/or the user" story...
---
 modules/setup/library/Setup/WebWizard.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 1180379bb..96d39e63f 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -158,7 +158,7 @@ class WebWizard extends Wizard implements SetupWizard
             }
         } elseif ($page->getName() === 'setup_database_creation') {
             $page->setDatabaseSetupPrivileges(
-                array_merge($this->databaseCreationPrivileges, $this->databaseSetupPrivileges)
+                array_unique(array_merge($this->databaseCreationPrivileges, $this->databaseSetupPrivileges))
             );
             $page->setDatabaseUsagePrivileges($this->databaseUsagePrivileges);
             $page->setResourceConfig($this->getPageData('setup_db_resource'));
@@ -236,7 +236,9 @@ class WebWizard extends Wizard implements SetupWizard
                         // It is not possible to reliably determine whether a database exists or not if a user can't
                         // log in to the database, so we just require the user to be able to create the database
                         $skip = $db->checkPrivileges(
-                            array_merge($this->databaseCreationPrivileges, $this->databaseSetupPrivileges),
+                            array_unique(
+                                array_merge($this->databaseCreationPrivileges, $this->databaseSetupPrivileges)
+                            ),
                             $this->databaseTables
                         );
                     } catch (PDOException $_) {

From d882ea11b49bbcb88dfdab1521294e0d09e1b075 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 15 Apr 2015 11:00:47 +0200
Subject: [PATCH 1245/2920] Avoid to set an empty redirect url parameter when
 accessing icinga web 2

---
 library/Icinga/Web/Controller/ActionController.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index f40b8d538..26e0e452a 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -315,13 +315,18 @@ class ActionController extends Zend_Controller_Action
             if ($redirect !== null) {
                 $login->setParam('redirect', '__SELF__');
             }
+
             $this->_response->setHttpResponseCode(403);
         } elseif ($redirect !== null) {
             if (! $redirect instanceof Url) {
                 $redirect = Url::fromPath($redirect);
             }
-            $login->setParam('redirect', $redirect->getRelativeUrl());
+
+            if (($relativeUrl = $redirect->getRelativeUrl())) {
+                $login->setParam('redirect', $relativeUrl);
+            }
         }
+
         $this->rerenderLayout()->redirectNow($login);
     }
 

From be05d3a73ae55aaf26d03033946496e4b00895fd Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 15 Apr 2015 13:23:34 +0200
Subject: [PATCH 1246/2920] Fix dashboard header handling

refs #7876
---
 public/js/icinga/loader.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 1c674b947..e63125a4d 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -760,12 +760,8 @@
                 // $container.html(content);
 
             } else {
-                if ($container.closest('.dashboard').length
-                ) {
-                    if (! $('h1', $content).length) {
-                        var title = $('h1', $container).first().detach();
-                        $('h1', $content).first().detach();
-                    }
+                if ($container.closest('.dashboard').length) {
+                    var title = $('h1', $container).first().detach();
                     $container.html(title).append(content);
                 } else if (action === 'replace') {
                     $container.html(content);

From ed2de3c4d04886e5af21ba0f828da2bb4dc0d40c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 15 Apr 2015 14:20:36 +0200
Subject: [PATCH 1247/2920] Fix SortBox widget

refs #7876
---
 library/Icinga/Web/Controller.php     |   8 +-
 library/Icinga/Web/StyleSheet.php     |   3 +-
 library/Icinga/Web/Widget/SortBox.php | 127 +++++++++++---------------
 public/css/icinga/controls.less       |  18 ++++
 4 files changed, 78 insertions(+), 78 deletions(-)
 create mode 100644 public/css/icinga/controls.less

diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index e7a1d51f5..da9486b9e 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -14,15 +14,15 @@ use Icinga\Web\Widget\SortBox;
 class Controller extends ModuleActionController
 {
     /**
-     * Create a sort control box at the 'sortControl' view parameter
+     * Create a SortBox widget at the `sortBox' view property
      *
-     * @param array $columns    An array containing the sort columns, with the
-     *                          submit value as the key and the label as the value
+     * @param   array   $columns    An array containing the sort columns, with the
+     *                               submit value as the key and the label as the value
      */
     protected function setupSortControl(array $columns)
     {
         $req = $this->getRequest();
-        $this->view->sortControl = SortBox::create(
+        $this->view->sortBox = SortBox::create(
             'sortbox-' . $req->getActionName(),
             $columns
         )->applyRequest($req);
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index 3f1e2b2a7..ab36d78c5 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -26,7 +26,8 @@ class StyleSheet
         'css/icinga/pagination.less',
         'css/icinga/monitoring-colors.less',
         'css/icinga/selection-toolbar.less',
-        'css/icinga/login.less'
+        'css/icinga/login.less',
+        'css/icinga/controls.less'
     );
 
     public static function compileForPdf()
diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index be96b614e..fc2025e5b 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -3,64 +3,57 @@
 
 namespace Icinga\Web\Widget;
 
-use Zend_Form_Element_Submit;
 use Icinga\Web\Form;
 use Icinga\Web\Request;
-use Icinga\Web\Form\Decorator\ConditionalHidden;
 
 /**
- *  Sortbox widget
+ * SortBox widget
  *
- *  The "SortBox" Widget allows you to create a generic sort input for sortable views.
- *  It automatically creates a form containing a select box with all sort options and a
- *  dropbox with the sort direction. It also handles automatic submission of sorting changes and draws an additional
- *  submit button when JavaScript is disabled.
+ * The "SortBox" Widget allows you to create a generic sort input for sortable views. It automatically creates a form
+ * containing a select box with all sort options and a dropbox with the sort direction. It also handles automatic
+ * submission of sorting changes and draws an additional submit button when JavaScript is disabled.
  *
- *  The constructor takes an string for the component name ad an array containing the select options, where the key is
- *  the value to be submitted and the value is the label that will be shown. You then should call applyRequest in order
- *  to  make sure the form is correctly populated when a request with a sort parameter is being made.
+ * The constructor takes an string for the component name and an array containing the select options, where the key is
+ * the value to be submitted and the value is the label that will be shown. You then should call applyRequest in order
+ * to  make sure the form is correctly populated when a request with a sort parameter is being made.
  *
- *  Example:
- *      <pre><code>
+ * Example:
+ *  <pre><code>
  *      $this->view->sortControl = new SortBox(
- *      $this->getRequest()->getActionName(),
+ *          $this->getRequest()->getActionName(),
  *          $columns
  *      );
  *      $this->view->sortControl->applyRequest($this->getRequest());
- *      </code></pre>
- * By default the sortBox uses the GET parameter 'sort' for the sorting key and 'dir' for the sorting direction
- *
+ *  </code></pre>
  */
 class SortBox extends AbstractWidget
 {
-
     /**
      * An array containing all sort columns with their associated labels
      *
      * @var array
      */
-    private $sortFields;
+    protected $sortFields;
 
     /**
      * The name of the form that will be created
      *
      * @var string
      */
-    private $name;
+    protected $name;
 
     /**
      * A request object used for initial form population
      *
-     * @var \Icinga\Web\Request
+     * @var Request
      */
-    private $request;
+    protected $request;
 
     /**
      * Create a SortBox with the entries from $sortFields
      *
-     * @param string    $name           The name of the sort form
-     * @param array     $sortFields     An array containing the columns and their labels to be displayed
-     *                                  in the sort select box
+     * @param   string  $name           The name for the SortBox
+     * @param   array   $sortFields     An array containing the columns and their labels to be displayed in the SortBox
      */
     public function __construct($name, array $sortFields)
     {
@@ -69,13 +62,12 @@ class SortBox extends AbstractWidget
     }
 
     /**
-     * Create a SortBox with the entries from $sortFields
+     * Create a SortBox
      *
-     * @param string    $name           The name of the sort form
-     * @param array     $sortFields     An array containing the columns and their labels to be displayed
-     *                                  in the sort select box
+     * @param   string  $name           The name for the SortBox
+     * @param   array   $sortFields     An array containing the columns and their labels to be displayed in the SortBox
      *
-     * @return static
+     * @return  SortBox
      */
     public static function create($name, array $sortFields)
     {
@@ -85,9 +77,9 @@ class SortBox extends AbstractWidget
     /**
      * Apply the parameters from the given request on this SortBox
      *
-     * @param Request $request The request to use for populating the form
+     * @param   Request     $request    The request to use for populating the form
      *
-     * @return $this
+     * @return  $this
      */
     public function applyRequest($request)
     {
@@ -96,60 +88,49 @@ class SortBox extends AbstractWidget
     }
 
     /**
-     * Create a submit button that is hidden via the ConditionalDecorator
-     * in order to allow sorting changes to be submitted in a JavaScript-less environment
-     *
-     * @return  Zend_Form_Element_Submit    The submit button that is hidden by default
-     * @see     ConditionalDecorator
-     */
-    private function createFallbackSubmitButton()
-    {
-        $manualSubmitButton = new Zend_Form_Element_Submit(
-            array(
-                'name'      => 'submit_' . $this->name,
-                'label'     => 'Sort',
-                'class'     => '',
-                'condition' => 0,
-                'value'     => '{{SUBMIT_ICON}}'
-            )
-        );
-        $manualSubmitButton->addDecorator(new ConditionalHidden());
-        $manualSubmitButton->setAttrib('addLabelPlaceholder', true);
-        return $manualSubmitButton;
-    }
-
-    /**
-     * Renders this widget via the given view and returns the
-     * HTML as a string
+     * Render this SortBox as HTML
      *
      * @return  string
      */
     public function render()
     {
         $form = new Form();
-        $form->setAttrib('class', 'inline');
-        $form->setMethod('POST');
         $form->setTokenDisabled();
         $form->setName($this->name);
-        $form->addElement('select', 'sort', array(
-            'label'         => 'Sort By',
-            'multiOptions'  => $this->sortFields,
-            'style'         => 'width: 12em',
-            'autosubmit'    => true
+        $form->setAttrib('class', 'sort-control inline');
+
+        $form->addElement(
+            'select',
+            'sort',
+            array(
+                'autosubmit'    => true,
+                'label'         => $this->view()->translate('Sort by'),
+                'multiOptions'  => $this->sortFields
+            )
+        );
+        $form->getElement('sort')->setDecorators(array(
+            array('ViewHelper'),
+            array('Label')
         ));
-        $form->addElement('select', 'dir', array(
-            'multiOptions'  => array(
-                'asc'       => 'Asc',
-                'desc'      => 'Desc',
-            ),
-            'style'         => 'width: 5em',
-            'autosubmit'    => true
-        ));
-        $sort = $form->getElement('sort')->setDecorators(array('ViewHelper'));
-        $dir = $form->getElement('dir')->setDecorators(array('ViewHelper'));
+        $form->addElement(
+            'select',
+            'dir',
+            array(
+                'autosubmit'    => true,
+                'multiOptions'  => array(
+                    'asc'       => 'Asc',
+                    'desc'      => 'Desc',
+                ),
+                'decorators'    => array(
+                    array('ViewHelper')
+                )
+            )
+        );
+
         if ($this->request) {
             $form->populate($this->request->getParams());
         }
+
         return $form;
     }
 }
diff --git a/public/css/icinga/controls.less b/public/css/icinga/controls.less
new file mode 100644
index 000000000..9445beb46
--- /dev/null
+++ b/public/css/icinga/controls.less
@@ -0,0 +1,18 @@
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+form.sort-control {
+  label {
+    width: auto;
+    margin-right: 0.5em;
+  }
+
+  select[name=sort] {
+    width: 12em;
+    margin-left: 0;
+  }
+
+  select[name=dir] {
+    width: 5em;
+    margin-left: 0;
+  }
+}

From 17262ae2bd46f75416c386dcd63280b7516a7c5a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 15 Apr 2015 14:21:27 +0200
Subject: [PATCH 1248/2920] Make the sort control floating at the right by
 default

refs #7876
---
 public/css/icinga/controls.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/css/icinga/controls.less b/public/css/icinga/controls.less
index 9445beb46..73e78b3e9 100644
--- a/public/css/icinga/controls.less
+++ b/public/css/icinga/controls.less
@@ -1,6 +1,8 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 form.sort-control {
+  float: right;
+
   label {
     width: auto;
     margin-right: 0.5em;

From b8849c0ac98b450baa1c38e549cafbc0151a20a0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 12:02:26 +0200
Subject: [PATCH 1249/2920] Return $this in the setters of the
 SendCustomNotificationCommand

Further fixed bad PHPDoc.
---
 .../Object/SendCustomNotificationCommand.php  | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Command/Object/SendCustomNotificationCommand.php b/modules/monitoring/library/Monitoring/Command/Object/SendCustomNotificationCommand.php
index 83f054295..647804310 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/SendCustomNotificationCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/SendCustomNotificationCommand.php
@@ -15,29 +15,27 @@ class SendCustomNotificationCommand extends WithCommentCommand
         self::TYPE_HOST,
         self::TYPE_SERVICE
     );
-    
+
     /**
-     * Whether a notification is forced to send
+     * Whether the notification is forced
      *
-     * Forced notifications are send regardless of time and if notifications
-     * are enabled.
+     * Forced notifications are sent out regardless of time restrictions and whether or not notifications are enabled.
      *
      * @var bool
      */
     protected $forced;
 
     /**
-     * Broadcast the notification
+     * Whether to broadcast the notification
      *
-     * If broadcast is true, the notification is send to all normal and
-     * escalated contacts for the object
+     * Broadcast notifications are sent out to all normal and escalated contacts.
      *
      * @var bool
      */
     protected $broadcast;
 
     /**
-     * Get notification force flag
+     * Get whether to force the notification
      *
      * @return bool
      */
@@ -47,17 +45,20 @@ class SendCustomNotificationCommand extends WithCommentCommand
     }
 
     /**
-     * Set whether notification should be forced
+     * Set whether to force the notification
      *
-     * @param bool $forced
+     * @param   bool $forced
+     *
+     * @return  $this
      */
     public function setForced($forced = true)
     {
         $this->forced = $forced;
+        return $this;
     }
 
     /**
-     * Get notification broadcast flag
+     * Get whether to broadcast the notification
      *
      * @return bool
      */
@@ -67,12 +68,15 @@ class SendCustomNotificationCommand extends WithCommentCommand
     }
 
     /**
-     * Set notification to broadcast
+     * Set whether to broadcast the notification
      *
-     * @param bool $broadcast
+     * @param   bool $broadcast
+     *
+     * @return  $this
      */
     public function setBroadcast($broadcast = true)
     {
         $this->broadcast = $broadcast;
+        return $this;
     }
 }

From 9d4460d02f01afbceb10995e1167970ac54ba50e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 12:03:21 +0200
Subject: [PATCH 1250/2920] Use inheritdoc in the ScheduleServiceCheckCommand

---
 .../Command/Object/ScheduleServiceCheckCommand.php        | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
index ac5e4be61..192bae850 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/ScheduleServiceCheckCommand.php
@@ -9,8 +9,7 @@ namespace Icinga\Module\Monitoring\Command\Object;
 class ScheduleServiceCheckCommand extends ObjectCommand
 {
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\Object\ObjectCommand::$allowedObjects For the property documentation.
+     * {@inheritdoc}
      */
     protected $allowedObjects = array(
         self::TYPE_SERVICE
@@ -74,7 +73,7 @@ class ScheduleServiceCheckCommand extends ObjectCommand
     }
 
     /**
-     * Is the check forced?
+     * Get whether the check is forced
      *
      * @return bool
      */
@@ -84,8 +83,7 @@ class ScheduleServiceCheckCommand extends ObjectCommand
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\Object\IcingaCommand::getName() For the method documentation.
+     * {@inheritdoc}
      */
     public function getName()
     {

From a8ce3abca746e326ea7ebc434fb32965a4c4c889 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 12:05:26 +0200
Subject: [PATCH 1251/2920] Fix code compliance in the
 SendCustomNotificationCommandForm

---
 .../SendCustomNotificationCommandForm.php     | 47 +++++++------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php b/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php
index 068f85e1b..b9ab60065 100644
--- a/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php
@@ -17,29 +17,20 @@ class SendCustomNotificationCommandForm extends ObjectsCommandForm
     public function init()
     {
         $this->addDescription(
-            $this->translate(
-                'This command is used to send custom notifications for hosts or'
-                . ' services.'
-            )
+            $this->translate('This command is used to send custom notifications about hosts or services.')
         );
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
+     * {@inheritdoc}
      */
     public function getSubmitLabel()
     {
-        return $this->translatePlural(
-            'Send custom notification',
-            'Send custom notifications',
-            count($this->objects)
-        );
+        return $this->translatePlural('Send custom notification',  'Send custom notifications',  count($this->objects));
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     * {@inheritdoc}
      */
     public function createElements(array $formData = array())
     {
@@ -64,9 +55,8 @@ class SendCustomNotificationCommandForm extends ObjectsCommandForm
                     'label'         => $this->translate('Forced'),
                     'value'         => false,
                     'description'   => $this->translate(
-                        'If you check this option, a notification is sent'
-                        . 'regardless of the current time and whether'
-                        . ' notifications are enabled.'
+                        'If you check this option, the notification is sent out regardless of time restrictions and'
+                        . ' whether or not notifications are enabled.'
                     )
                 )
             ),
@@ -77,8 +67,7 @@ class SendCustomNotificationCommandForm extends ObjectsCommandForm
                     'label'         => $this->translate('Broadcast'),
                     'value'         => false,
                     'description'   => $this->translate(
-                        'If you check this option, a notification is sent to'
-                        . ' all normal and escalated contacts.'
+                        'If you check this option, the notification is sent out to all normal and escalated contacts.'
                     )
                 )
             )
@@ -87,24 +76,24 @@ class SendCustomNotificationCommandForm extends ObjectsCommandForm
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     * {@inheritdoc}
      */
     public function onSuccess()
     {
         foreach ($this->objects as $object) {
             /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
-            $comment = new SendCustomNotificationCommand();
-            $comment->setObject($object);
-            $comment->setComment($this->getElement('comment')->getValue());
-            $comment->setAuthor($this->request->getUser()->getUsername());
-            $comment->setForced($this->getElement('forced')->isChecked());
-            $comment->setBroadcast($this->getElement('broadcast')->isChecked());
-            $this->getTransport($this->request)->send($comment);
+            $notification = new SendCustomNotificationCommand();
+            $notification
+                ->setObject($object)
+                ->setComment($this->getElement('comment')->getValue())
+                ->setAuthor($this->request->getUser()->getUsername())
+                ->setForced($this->getElement('forced')->isChecked())
+                ->setBroadcast($this->getElement('broadcast')->isChecked());
+            $this->getTransport($this->request)->send($notification);
         }
         Notification::success($this->translatePlural(
-            'Send custom notification..',
-            'Send custom notifications..',
+            'Sending custom notification..',
+            'Sending custom notifications..',
             count($this->objects)
         ));
         return true;

From a4d815051cceeb6880db5ca92ea5aae9be1b9a38 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 10 Apr 2015 12:52:37 +0200
Subject: [PATCH 1252/2920] Add missing break statements in the comments list
 view

---
 .../monitoring/application/views/scripts/list/comments.phtml    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index cdbe28244..e3d30c5d0 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -34,10 +34,12 @@
           $icon = 'plug';
           $title = $this->translate('Downtime');
           $tooltip = $this->translate('Comment was caused by a downtime.');
+          break;
         case 'ack':
           $icon = 'ok';
           $title = $this->translate('Acknowledgement');
           $tooltip = $this->translate('Comment was caused by an acknowledgement.');
+          break;
       }
     ?>
       <tr class="state invalid">

From b84452140cb40feba7e310eda83f30dada3a7057 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 15 Apr 2015 15:02:27 +0200
Subject: [PATCH 1253/2920] Use timeSince() for the last status change in the
 host's detail view

Instead of using prefixedTimeSince() which will be removed.

refs #6778
---
 .../views/scripts/partials/host/object-header.phtml           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/host/object-header.phtml b/modules/monitoring/application/views/scripts/partials/host/object-header.phtml
index 69d0f62f5..ed99fd1b7 100644
--- a/modules/monitoring/application/views/scripts/partials/host/object-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/object-header.phtml
@@ -10,7 +10,7 @@ use Icinga\Module\Monitoring\Object\Host;
     <tr class="state <?= Host::getStateText($object->host_state); ?><?= $object->host_handled ? ' handled' : ''; ?>">
         <td class="state">
             <strong><?= Host::getStateText($object->host_state, true); ?></strong><br>
-            <?= $this->prefixedTimeSince($object->host_last_state_change, true); ?>
+            <?= $this->timeSince($object->host_last_state_change); ?>
         </td>
         <td>
             <strong><?= $this->escape($object->host_display_name); ?></strong>
@@ -24,4 +24,4 @@ use Icinga\Module\Monitoring\Object\Host;
             <?= $this->render('partials/host/statusicons.phtml'); ?>
         </td>
     </tr>
-</table>
\ No newline at end of file
+</table>

From a6a9bd28ebc6055aa52670627ffa1f7db9997ccd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 15 Apr 2015 15:06:15 +0200
Subject: [PATCH 1254/2920] Use timeSince() for the last status change in the
 service's detail view

Instead of using prefixedTimeSince() which will be removed.

refs #6778
---
 .../views/scripts/partials/service/object-header.phtml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/service/object-header.phtml b/modules/monitoring/application/views/scripts/partials/service/object-header.phtml
index 5f3ccb70f..9ecd66ef9 100644
--- a/modules/monitoring/application/views/scripts/partials/service/object-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/object-header.phtml
@@ -11,7 +11,7 @@ use Icinga\Module\Monitoring\Object\Service;
     <tr class="state <?= Host::getStateText($object->host_state); ?><?= $object->host_handled ? ' handled' : ''; ?>">
         <td class="state">
             <strong><?= Host::getStateText($object->host_state, true); ?></strong><br>
-            <?= $this->prefixedTimeSince($object->host_last_state_change, true); ?>
+            <?= $this->timeSince($object->host_last_state_change) ?>
         </td>
         <td>
             <strong><?= $this->escape($object->host_display_name); ?></strong>
@@ -28,7 +28,7 @@ use Icinga\Module\Monitoring\Object\Service;
     <tr class="state <?= Service::getStateText($object->service_state); ?><?= $object->service_handled ? ' handled' : ''; ?>">
         <td class="state">
             <strong><?= Service::getStateText($object->service_state, true); ?></strong><br>
-            <?= $this->prefixedTimeSince($object->service_last_state_change, true); ?>
+            <?= $this->timeSince($object->service_last_state_change) ?>
         </td>
         <td>
             <strong><?= $this->translate('Service'); ?>: <?= $this->escape($object->service_display_name); ?></strong>

From 5e92171ab7fd317531080687a6ec7efa3d3d1b0c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 15 Apr 2015 15:15:03 +0200
Subject: [PATCH 1255/2920] Drop the `inline' view property, as it's not used
 anywhere

---
 .../monitoring/application/controllers/ListController.php   | 4 ----
 .../application/views/scripts/alertsummary/index.phtml      | 6 ++----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index b4167f83d..e1726a68d 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -22,10 +22,6 @@ class Monitoring_ListController extends Controller
     {
         $this->createTabs();
         $this->view->compact = $this->_request->getParam('view') === 'compact';
-        if ($this->_request->getParam('view') === 'inline') {
-            $this->view->compact = true;
-            $this->view->inline = true;
-        }
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/alertsummary/index.phtml b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
index dbfff6433..8bb36b518 100644
--- a/modules/monitoring/application/views/scripts/alertsummary/index.phtml
+++ b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
@@ -59,8 +59,7 @@
             <div class="alertsummary-flex">
                 <?= $this->partial('list/notifications.phtml', array(
                     'notifications' => $this->recentAlerts,
-                    'compact'       => true,
-                    'inline'        => true
+                    'compact'       => true
                 )); ?>
             </div>
         </div>
@@ -71,8 +70,7 @@
         <div class="alertsummary-flex">
             <?= $this->partial('list/notifications.phtml', array(
                 'notifications' => $this->notifications,
-                'compact'       => true,
-                'inline'        => true
+                'compact'       => true
             )); ?>
         </div>
     </div>

From 32e8b606b4384073fa9d3256d1c514376d35be53 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 15 Apr 2015 15:17:59 +0200
Subject: [PATCH 1256/2920] Monitoring\Controller: Drop `compactView' property,
 as it's not used anywere

---
 .../monitoring/library/Monitoring/Controller.php   | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php
index bf69182d7..c3cbe3c2d 100644
--- a/modules/monitoring/library/Monitoring/Controller.php
+++ b/modules/monitoring/library/Monitoring/Controller.php
@@ -21,16 +21,6 @@ class Controller extends IcingaWebController
      */
     protected $backend;
 
-    /**
-     * Compact layout name
-     *
-     * Set to a string containing the compact layout name to use when
-     * 'compact' is set as the layout parameter, otherwise null
-     *
-     * @var string
-     */
-    protected $compactView;
-
     protected function moduleInit()
     {
         $this->backend = Backend::createBackend($this->_getParam('backend'));
@@ -39,10 +29,6 @@ class Controller extends IcingaWebController
 
     protected function handleFormatRequest($query)
     {
-        if ($this->compactView !== null && ($this->_getParam('view', false) === 'compact')) {
-            $this->_helper->viewRenderer($this->compactView);
-        }
-
         if ($this->_getParam('format') === 'sql') {
             echo '<pre>'
                 . htmlspecialchars(wordwrap($query->dump()))

From 9b9975bd732ddb4de00f4c04775ab8777f55f357 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 15 Apr 2015 15:21:19 +0200
Subject: [PATCH 1257/2920] Use timeSince() in the service groups view

Instead of prefixedTimeSince() which will be removed.

refs #6778
---
 .../views/scripts/list/servicegroups.phtml       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index 0e958a3f7..c215d6b20 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -33,49 +33,49 @@
         <td class="state change critical unhandled">
           <strong><?= $this->translate('CRITICAL'); ?></strong>
           <br>
-          <?= $this->prefixedTimeSince($s->services_critical_last_state_change_unhandled); ?>
+          <?= $this->timeSince($s->services_critical_last_state_change_unhandled); ?>
         </td>
        <?php elseif ($s->services_unknown_last_state_change_unhandled): ?>
         <td class="state change unknown unhandled">
           <strong><?= $this->translate('UNKNOWN'); ?></strong>
           <br>
-          <?= $this->prefixedTimeSince($s->services_unknown_last_state_change_unhandled); ?>
+          <?= $this->timeSince($s->services_unknown_last_state_change_unhandled); ?>
         </td>
        <?php elseif ($s->services_warning_last_state_change_unhandled): ?>
         <td class="state change warning unhandled">
           <strong><?= $this->translate('WARNING'); ?></strong>
           <br>
-          <?= $this->prefixedTimeSince($s->services_warning_last_state_change_unhandled); ?>
+          <?= $this->timeSince($s->services_warning_last_state_change_unhandled); ?>
         </td>
        <?php elseif ($s->services_critical_last_state_change_handled): ?>
         <td class="state change critical">
           <strong><?= $this->translate('CRITICAL'); ?></strong>
           <br>
-          <?= $this->prefixedTimeSince($s->services_critical_last_state_change_handled); ?>
+          <?= $this->timeSince($s->services_critical_last_state_change_handled); ?>
         </td>
        <?php elseif ($s->services_unknown_last_state_change_handled): ?>
         <td class="state change unknown">
           <strong><?= $this->translate('UNKNOWN'); ?></strong>
           <br>
-          <?= $this->prefixedTimeSince($s->services_unknown_last_state_change_handled); ?>
+          <?= $this->timeSince($s->services_unknown_last_state_change_handled); ?>
         </td>
        <?php elseif ($s->services_warning_last_state_change_handled): ?>
         <td class="state change warning">
           <strong><?= $this->translate('WARNING'); ?></strong>
           <br>
-          <?= $this->prefixedTimeSince($s->services_warning_last_state_change_handled); ?>
+          <?= $this->timeSince($s->services_warning_last_state_change_handled); ?>
         </td>
        <?php elseif ($s->services_ok_last_state_change): ?>
         <td class="state change ok">
           <strong><?= $this->translate('OK'); ?></strong>
           <br>
-          <?= $this->prefixedTimeSince($s->services_ok_last_state_change); ?>
+          <?= $this->timeSince($s->services_ok_last_state_change); ?>
         </td>
        <?php else: ?>
         <td class="state change pending">
           <strong><?= $this->translate('PENDING'); ?></strong>
           <br>
-          <?= $this->prefixedTimeSince($s->services_pending_last_state_change); ?>
+          <?= $this->timeSince($s->services_pending_last_state_change); ?>
         </td>
        <?php endif ?>
         <td class="groupname">

From 2440308699414436e8786cf977010de533be4ea3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 15 Apr 2015 15:22:26 +0200
Subject: [PATCH 1258/2920] Use timeSince() in the host groups view

Instead of prefixedTimeSince() which will be removed.

refs #6778
---
 .../views/scripts/list/hostgroups.phtml          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index c702197b2..4794c194e 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -33,49 +33,49 @@
         <td class="state change critical unhandled">
           <strong><?= $this->translate('CRITICAL'); ?></strong>
           <br>
-          <?= $this->prefixedTimeSince($h->services_critical_last_state_change_unhandled); ?>
+          <?= $this->timeSince($h->services_critical_last_state_change_unhandled); ?>
         </td>
        <?php elseif ($h->services_unknown_last_state_change_unhandled): ?>
         <td class="state change unknown unhandled">
           <strong><?= $this->translate('UNKNOWN'); ?></strong>
           <br>
-          <?= $this->prefixedTimeSince($h->services_unknown_last_state_change_unhandled); ?>
+          <?= $this->timeSince($h->services_unknown_last_state_change_unhandled); ?>
         </td>
        <?php elseif ($h->services_warning_last_state_change_unhandled): ?>
         <td class="state change warning unhandled">
           <strong><?= $this->translate('WARNING'); ?></strong>
           <br>
-          <?= $this->prefixedTimeSince($h->services_warning_last_state_change_unhandled); ?>
+          <?= $this->timeSince($h->services_warning_last_state_change_unhandled); ?>
         </td>
        <?php elseif ($h->services_critical_last_state_change_handled): ?>
         <td class="state change critical">
           <strong><?= $this->translate('CRITICAL'); ?></strong>
           <br>
-          <?= $this->prefixedTimeSince($h->services_critical_last_state_change_handled); ?>
+          <?= $this->timeSince($h->services_critical_last_state_change_handled); ?>
         </td>
        <?php elseif ($h->services_unknown_last_state_change_handled): ?>
         <td class="state change unknown">
           <strong><?= $this->translate('UNKNOWN'); ?></strong>
           <br>
-          <?= $this->prefixedTimeSince($h->services_unknown_last_state_change_handled); ?>
+          <?= $this->timeSince($h->services_unknown_last_state_change_handled); ?>
         </td>
        <?php elseif ($h->services_warning_last_state_change_handled): ?>
         <td class="state change warning">
           <strong><?= $this->translate('WARNING'); ?></strong>
           <br>
-          <?= $this->prefixedTimeSince($h->services_warning_last_state_change_handled); ?>
+          <?= $this->timeSince($h->services_warning_last_state_change_handled); ?>
         </td>
        <?php elseif ($h->services_ok_last_state_change): ?>
         <td class="state change ok">
           <strong><?= $this->translate('OK'); ?></strong>
           <br>
-          <?= $this->prefixedTimeSince($h->services_ok_last_state_change); ?>
+          <?= $this->timeSince($h->services_ok_last_state_change); ?>
         </td>
        <?php else: ?>
         <td class="state change pending">
           <strong><?= $this->translate('PENDING'); ?></strong>
           <br>
-          <?= $this->prefixedTimeSince($h->services_pending_last_state_change); ?>
+          <?= $this->timeSince($h->services_pending_last_state_change); ?>
         </td>
        <?php endif ?>
         <td class="groupname">

From ae1962af27d52bd7ec3dde0af42d2cfd98b058c5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 15 Apr 2015 15:26:25 +0200
Subject: [PATCH 1259/2920] Let DateFormatter format dates like
 Format::smartTimeDiff()

Date diffs which are bigger than 3 days are now displayed w/o time again.

refs #6778
---
 library/Icinga/Date/DateFormatter.php | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/library/Icinga/Date/DateFormatter.php b/library/Icinga/Date/DateFormatter.php
index 79523d0a4..f89b936c2 100644
--- a/library/Icinga/Date/DateFormatter.php
+++ b/library/Icinga/Date/DateFormatter.php
@@ -107,8 +107,8 @@ class DateFormatter
             $invert = true;
         }
         if ($diff > 3600 * 24 * 3) {
-            $type = static::DATETIME;
-            $fmt = new IntlDateFormatter(null, IntlDateFormatter::SHORT, IntlDateFormatter::SHORT);
+            $type = static::DATE;
+            $fmt = new IntlDateFormatter(null, IntlDateFormatter::SHORT, IntlDateFormatter::NONE);
             $formatted = $fmt->format($time);
         } else {
             $minutes = floor($diff / 60);
@@ -137,11 +137,14 @@ class DateFormatter
                         );
                         break;
                     case static::TIME:
-                        $formatted = sprintf(t('at %s', 'An event that happened at the given time'), $formatted);
+                        $formatted = sprintf(t('at %s', 'An event happened at the given time'), $formatted);
                         break;
+                    case static::DATE:
+                        // Move to next case
                     case static::DATETIME:
+                        // TODO(el): Use own format string for date?
                         $formatted = sprintf(
-                            t('on %s', 'An event that happened at the given date and time'),
+                            t('on %s', 'An event happened on the given date or date and time'),
                             $formatted
                         );
                         break;
@@ -158,8 +161,14 @@ class DateFormatter
                     case static::TIME:
                         $formatted = sprintf(t('at %s', 'An event will happen at the given time'), $formatted);
                         break;
+                    case static::DATE:
+                        // Move to next case
                     case static::DATETIME:
-                        $formatted = sprintf(t('on %s', 'An event will happen on the given date and time'), $formatted);
+                        // TODO(el): Use own format string for date?
+                        $formatted = sprintf(
+                            t('on %s', 'An event will happen on the given date or date and time'),
+                            $formatted
+                        );
                         break;
                 }
                 break;
@@ -173,9 +182,12 @@ class DateFormatter
                         break;
                     case static::TIME:
                         // Move to next case
+                    case static::DATE:
+                        // Move to next case
                     case static::DATETIME:
+                        // TODO(el): Use own format strings for time and date?
                         $formatted = sprintf(
-                            t('since %s', 'A status is lasting since the given date and time'),
+                            t('since %s', 'A status is lasting since the given time, date or date and time'),
                             $formatted
                         );
                         break;

From eb77fff012974997471ce0e11c5d3b6a6611677a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 15 Apr 2015 15:28:34 +0200
Subject: [PATCH 1260/2920] Capitalize status change information in tables via
 CSS

refs #6778
---
 modules/monitoring/public/css/module.less | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 050a8fb5b..b10db4227 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -212,3 +212,11 @@ hr.command-separator {
   border: none;
   border-bottom: 2px solid @colorPetrol;
 }
+
+td.state {
+  .time-ago,
+  .time-since,
+  .time-until {
+    text-transform: capitalize;
+  }
+}

From 675d070b86808bb4ca6b520f2e5bae456875b7fc Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 15 Apr 2015 15:33:00 +0200
Subject: [PATCH 1261/2920] Set the view property `compact' exactly once

refs #7876
---
 library/Icinga/Web/Controller/ActionController.php           | 1 +
 .../monitoring/application/controllers/ChartController.php   | 5 -----
 .../monitoring/application/controllers/ListController.php    | 1 -
 .../monitoring/application/controllers/ShowController.php    | 2 --
 .../monitoring/application/views/scripts/show/contact.phtml  | 5 ++++-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 26e0e452a..b78090a7f 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -87,6 +87,7 @@ class ActionController extends Zend_Controller_Action
         $this->_helper->layout()->isIframe = $request->getUrl()->shift('isIframe');
         $this->_helper->layout()->moduleName = false;
 
+        $this->view->compact = $request->getParam('view') === 'compact';
         if ($this->rerenderLayout = $request->getUrl()->shift('renderLayout')) {
             $this->xhrLayout = 'body';
         }
diff --git a/modules/monitoring/application/controllers/ChartController.php b/modules/monitoring/application/controllers/ChartController.php
index 08f9334ee..39f60c304 100644
--- a/modules/monitoring/application/controllers/ChartController.php
+++ b/modules/monitoring/application/controllers/ChartController.php
@@ -16,11 +16,6 @@ use Icinga\Chart\Unit\LinearUnit;
 
 class Monitoring_ChartController extends Controller
 {
-    public function init()
-    {
-        $this->view->compact = $this->_request->getParam('view') === 'compact';
-    }
-
     private function drawLogChart1()
     {
         $chart = new GridChart();
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index e1726a68d..ac1d41590 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -21,7 +21,6 @@ class Monitoring_ListController extends Controller
     public function init()
     {
         $this->createTabs();
-        $this->view->compact = $this->_request->getParam('view') === 'compact';
     }
 
     /**
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 0d7df501a..fe5633ab2 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -167,8 +167,6 @@ class Monitoring_ShowController extends Controller
             ));
 
             $notifications->where('contact_object_id', $contact->contact_object_id);
-
-            $this->view->compact = true;
             $this->view->notifications = $notifications->paginate();
         }
 
diff --git a/modules/monitoring/application/views/scripts/show/contact.phtml b/modules/monitoring/application/views/scripts/show/contact.phtml
index c4142707a..1ad5eccf9 100644
--- a/modules/monitoring/application/views/scripts/show/contact.phtml
+++ b/modules/monitoring/application/views/scripts/show/contact.phtml
@@ -57,7 +57,10 @@
 </div>
 
 <?php if (count($notifications)): ?>
-<?= $this->render('list/notifications.phtml') ?>
+<?= $this->partial('list/notifications.phtml', array(
+    'notifications' => $notifications,
+    'compact' => true
+)); ?>
 <?php else: ?>
 <div class="content"><?= $this->translate('No notifications have been sent for this contact') ?></div>
 <?php endif ?>

From e500715bda803522f6bbc7c0f96e082909df7f63 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 15 Apr 2015 15:33:44 +0200
Subject: [PATCH 1262/2920] Use timeAgo() when displaying comments in the
 detail views

refs #6778
---
 .../application/views/scripts/show/components/comments.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index 5a4d351c0..bf42db4db 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -44,7 +44,7 @@ foreach ($object->comments as $comment) {
 
     ?>
     <tr>
-        <th><?= $this->escape($comment->author); ?> (<?= $this->timeSince($comment->timestamp); ?>)</th>
+        <th><?= $this->escape($comment->author); ?> (<?= $this->timeAgo($comment->timestamp); ?>)</th>
         <td data-base-target="_self">
             <?php if (isset($delCommentForm)) { // Form is unset if the current user lacks the respective permission
                 $delCommentForm = clone $delCommentForm;

From 229e266daf4d57a1052ff69ecb132575bcd40941 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 15 Apr 2015 15:40:40 +0200
Subject: [PATCH 1263/2920] Add new line between comment author and creation
 time in the detail views

refs #6778
---
 .../views/scripts/show/components/comments.phtml            | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index bf42db4db..32253194c 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -44,7 +44,11 @@ foreach ($object->comments as $comment) {
 
     ?>
     <tr>
-        <th><?= $this->escape($comment->author); ?> (<?= $this->timeAgo($comment->timestamp); ?>)</th>
+        <th>
+            <?= $this->escape($comment->author) ?>
+            <br>
+            <?= $this->timeAgo($comment->timestamp) ?>
+        </th>
         <td data-base-target="_self">
             <?php if (isset($delCommentForm)) { // Form is unset if the current user lacks the respective permission
                 $delCommentForm = clone $delCommentForm;

From 0f70701034d6db26d01f1f08325e21d25db6bc39 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 15 Apr 2015 15:46:12 +0200
Subject: [PATCH 1264/2920] Use timeSince() in the monitoring list command

refs #6778
---
 modules/monitoring/application/clicommands/ListCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/clicommands/ListCommand.php b/modules/monitoring/application/clicommands/ListCommand.php
index 57a1afecf..9fd892652 100644
--- a/modules/monitoring/application/clicommands/ListCommand.php
+++ b/modules/monitoring/application/clicommands/ListCommand.php
@@ -299,7 +299,7 @@ class ListCommand extends Command
                 $leaf,
                 $screen->underline($row->service_description),
                 $screen->colorize($utils->objectStateFlags('service', $row) . $perf, 'lightblue'),
-                Format::prefixedTimeSince($row->service_last_state_change, true)
+                ucfirst(Format::timeSince($row->service_last_state_change))
             );
             if ($this->isVerbose) {
                 $out .= $emptyLine . preg_replace(

From 44c8d3728847792241364e0666e1928b63c1b890 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 15 Apr 2015 15:47:10 +0200
Subject: [PATCH 1265/2920] lib: Remove prefixedTimeSince()

refs #6778
---
 library/Icinga/Util/Format.php             | 9 ---------
 library/Icinga/Web/View/helpers/format.php | 8 --------
 2 files changed, 17 deletions(-)

diff --git a/library/Icinga/Util/Format.php b/library/Icinga/Util/Format.php
index aa7e01c09..14705d7ee 100644
--- a/library/Icinga/Util/Format.php
+++ b/library/Icinga/Util/Format.php
@@ -140,15 +140,6 @@ class Format
         return DateFormatter::create(DateFormatter::SINCE)->format($time);
     }
 
-    public static function prefixedTimeSince($timestamp, $ucfirst = false)
-    {
-        $result = self::smartTimeDiff(time() - $timestamp, $timestamp, true);
-        if ($ucfirst) {
-            $result = ucfirst($result);
-        }
-        return $result;
-    }
-
     public static function prefixedTimeUntil($timestamp, $ucfirst)
     {
         $result = self::smartTimeDiff($timestamp - time(), $timestamp, true);
diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php
index 7bd36f308..e584fa47a 100644
--- a/library/Icinga/Web/View/helpers/format.php
+++ b/library/Icinga/Web/View/helpers/format.php
@@ -35,14 +35,6 @@ $this->addHelperFunction('timeUntil', function ($timestamp) {
     );
 });
 
-$this->addHelperFunction('prefixedTimeSince', function ($timestamp, $ucfirst = false) {
-    return sprintf(
-        '<span class="timesince" title="%s">%s</span>',
-        date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
-        Format::prefixedTimeSince($timestamp, $ucfirst)
-    );
-});
-
 $this->addHelperFunction('prefixedTimeUntil', function ($timestamp, $ucfirst = false) {
     if (! $timestamp) return '';
     return sprintf(

From ff45faf123b739e98af89d3d33fe2cf71be6bee1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 15 Apr 2015 15:47:39 +0200
Subject: [PATCH 1266/2920] lib: Remove prefixedTimeUntil()

refs #6778
---
 library/Icinga/Util/Format.php             | 9 ---------
 library/Icinga/Web/View/helpers/format.php | 9 ---------
 2 files changed, 18 deletions(-)

diff --git a/library/Icinga/Util/Format.php b/library/Icinga/Util/Format.php
index 14705d7ee..f6e64def3 100644
--- a/library/Icinga/Util/Format.php
+++ b/library/Icinga/Util/Format.php
@@ -140,15 +140,6 @@ class Format
         return DateFormatter::create(DateFormatter::SINCE)->format($time);
     }
 
-    public static function prefixedTimeUntil($timestamp, $ucfirst)
-    {
-        $result = self::smartTimeDiff($timestamp - time(), $timestamp, true);
-        if ($ucfirst) {
-            $result = ucfirst($result);
-        }
-        return $result;
-    }
-
     protected static function formatForUnits($value, & $units, $base)
     {
         $sign = '';
diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php
index e584fa47a..c5f7ca9e6 100644
--- a/library/Icinga/Web/View/helpers/format.php
+++ b/library/Icinga/Web/View/helpers/format.php
@@ -35,15 +35,6 @@ $this->addHelperFunction('timeUntil', function ($timestamp) {
     );
 });
 
-$this->addHelperFunction('prefixedTimeUntil', function ($timestamp, $ucfirst = false) {
-    if (! $timestamp) return '';
-    return sprintf(
-        '<span class="timeuntil" title="%s">%s</span>',
-        date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
-        Format::prefixedTimeUntil($timestamp, $ucfirst)
-    );
-});
-
 $this->addHelperFunction('dateTimeRenderer', function ($dateTimeOrTimestamp, $future = false) {
     return DateTimeRenderer::create($dateTimeOrTimestamp, $future);
 });

From aa409bda72b86da27edc7db14f34ab9af3d8802a Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 16 Apr 2015 12:13:31 +0200
Subject: [PATCH 1267/2920] Fix formatting of js error log entries generated
 from responses

Replace multiple whitespace characters with a single one and remove linebreaks.

refs #8711
---
 public/js/icinga/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 1c674b947..535e414a9 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -640,7 +640,7 @@
                 this.icinga.logger.error(
                     req.status,
                     errorThrown + ':',
-                    $(req.responseText).text().slice(0, 100)
+                    $(req.responseText).text().replace(/\s+/g, ' ').slice(0, 100)
                 );
                 this.renderContentToContainer(
                     req.responseText,

From 36726560ddd3b76b88c079f556f8044ab12e1e1b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 16 Apr 2015 13:59:17 +0200
Subject: [PATCH 1268/2920] Document how to install Icinga Web 2 from Package

---
 doc/installation.md | 148 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 131 insertions(+), 17 deletions(-)

diff --git a/doc/installation.md b/doc/installation.md
index ef968974a..133f6cb98 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -3,21 +3,133 @@
 The preferred way of installing Icinga Web 2 is to use the official package repositories depending on which operating
 system and distribution you are running. But it is also possible to install Icinga Web 2 directly from source.
 
-## <a id="installation-requirements"></a> Installing Requirements
+## <a id="installing-requirements"></a> Installing Requirements
 
 * A web server, e.g. Apache or nginx
-* PHP >= 5.3.0 w/ gettext and OpenSSL support
-* MySQL or PostgreSQL PHP libraries when using a database for authentication or storing user preferences into a database
+* PHP >= 5.3.0 w/ gettext, intl and OpenSSL support
+* MySQL or PostgreSQL PHP libraries when using a database for authentication or for storing preferences into a database
 * LDAP PHP library when using Active Directory or LDAP for authentication
-* Icinga 1.x w/ Livestatus or IDO, Icinga 2 w/ Livestatus or IDO feature enabled
+* Icinga 1.x w/ Livestatus or IDO; Icinga 2.x w/ Livestatus or IDO feature enabled
+* MySQL or PostgreSQL PHP libraries when using IDO
 
-## <a id="installation-from-package"></a> Installing Icinga Web 2 from Package
+## <a id="installing-from-package"></a> Installing Icinga Web 2 from Package
 
-A guide on how to install Icinga Web 2 from package will follow shortly.
+Below is a list of official package repositories for installing Icinga Web 2 for various operating systems.
 
-## <a id="installation-from-source"></a> Installing Icinga Web 2 from Source
+Distribution            | Repository
+------------------------|---------------------------
+Debian                  | [debmon](http://debmon.org/packages/debmon-wheezy/icingaweb2), [Icinga Repository](http://packages.icinga.org/debian/)
+Ubuntu                  | [Icinga Repository](http://packages.icinga.org/ubuntu/)
+RHEL/CentOS             | [Icinga Repository](http://packages.icinga.org/epel/)
+openSUSE                | [Icinga Repository](http://packages.icinga.org/openSUSE/)
+SLES                    | [Icinga Repository](http://packages.icinga.org/SUSE/)
+Gentoo                  | -
+FreeBSD                 | -
+ArchLinux               | [Upstream](https://aur.archlinux.org/packages/icingaweb2)
 
-**Step 1: Getting the Source**
+Packages for distributions other than the ones listed above may also be available.
+Please contact your distribution packagers.
+
+### <a id="package-repositories"></a> Setting up Package Repositories
+
+You need to add the Icinga repository to your package management configuration for installing Icinga Web 2.
+Below is a list with examples for various distributions.
+
+Debian (debmon):
+````
+wget -O - http://debmon.org/debmon/repo.key 2>/dev/null | apt-key add -
+echo 'deb http://debmon.org/debmon debmon-wheezy main' >/etc/apt/sources.list.d/debmon.list
+apt-get update
+````
+
+Ubuntu Trusty:
+````
+wget -O - http://packages.icinga.org/icinga.key | apt-key add -
+add-apt-repository 'deb http://packages.icinga.org/ubuntu icinga-trusty main'
+apt-get update
+````
+
+For other Ubuntu versions just replace trusty with your distribution's code name.
+
+RHEL and CentOS:
+````
+rpm --import http://packages.icinga.org/icinga.key
+curl -o /etc/yum.repos.d/ICINGA-release.repo http://packages.icinga.org/epel/ICINGA-release.repo
+yum makecache
+````
+
+Fedora:
+````
+rpm --import http://packages.icinga.org/icinga.key
+curl -o /etc/yum.repos.d/ICINGA-release.repo http://packages.icinga.org/fedora/ICINGA-release.repo
+yum makecache
+````
+
+SLES 11:
+````
+zypper ar http://packages.icinga.org/SUSE/ICINGA-release-11.repo
+zypper ref
+````
+
+SLES 12:
+````
+zypper ar http://packages.icinga.org/SUSE/ICINGA-release.repo
+zypper ref
+````
+
+openSUSE:
+````
+zypper ar http://packages.icinga.org/openSUSE/ICINGA-release.repo
+zypper ref
+````
+
+The packages for RHEL/CentOS depend on other packages which are distributed as part of the
+[EPEL repository](http://fedoraproject.org/wiki/EPEL). Please make sure to enable this repository by following
+[these instructions](http://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F).
+
+### <a id="installing-from-package-example"></a> Installing Icinga Web 2
+
+You can install Icinga Web 2 by using your distribution's package manager to install the `icingaweb2` package.
+Below is a list with examples for various distributions.
+
+Debian and Ubuntu:
+````
+apt-get install icingaweb2
+````
+
+RHEL, CentOS and Fedora:
+````
+yum install icingaweb2
+````
+
+SLES and openSUSE:
+````
+zypper install icingaweb2
+````
+
+### <a id="preparing-web-setup-from-package"></a> Preparing Web Setup
+
+You can set up Icinga Web 2 quickly and easily with the Icinga Web 2 setup wizard which is available the first time
+you visit Icinga Web 2 in your browser. When using the web setup you are required to authenticate using a token.
+In order to generate a token use the `icingacli`:
+````
+icingacli setup token create
+````
+
+In case you do not remember the token you can show it using the `icingacli`:
+````
+icingacli setup token show
+````
+
+Finally visit Icinga Web 2 in your browser to access the setup wizard and complete the installation:
+`/icingaweb2/setup`.
+
+## <a id="installing-from-source"></a> Installing Icinga Web 2 from Source
+
+Although the preferred way of installing Icinga Web 2 is to use packages, it is also possible to install Icinga Web 2
+directly from source.
+
+### <a id="getting-the-source"></a> Getting the Source
 
 First of all, you need to download the sources. Icinga Web 2 is available through a Git repository. You can clone this
 repository either via git or http protocol using the following URLs:
@@ -33,7 +145,7 @@ This version also offers snapshots for easy download which you can use if you do
 git clone git://git.icinga.org/icingaweb2.git
 ````
 
-**Step 2: Install the Source**
+### <a id="installing-from-source-example"></a> Installing Icinga Web 2
 
 Choose a target directory and move Icinga Web 2 there.
 
@@ -41,7 +153,7 @@ Choose a target directory and move Icinga Web 2 there.
 mv icingaweb2 /usr/share/icingaweb2
 ````
 
-**Step 3: Configuring the Web Server**
+### <a id="configuring-web-server"></a> Configuring the Web Server
 
 Use `icingacli` to generate web server configuration for either Apache or nginx.
 
@@ -57,13 +169,15 @@ nginx:
 
 Save the output as new file in your webserver's configuration directory.
 
-Example for Apache on RHEL/CentOS:
+Example for Apache on RHEL or CentOS:
 ````
 ./bin/icingacli setup config webserver apache --document-root /usr/share/icingaweb2/public > /etc/httpd/conf.d/icingaweb2.conf
 ````
 
+### <a id="preparing-web-setup-from-source"></a> Preparing Web Setup
 
-**Step 4: Preparing Web Setup**
+You can set up Icinga Web 2 quickly and easily with the Icinga Web 2 setup wizard which is available the first time
+you visit Icinga Web 2 in your browser. Please follow the steps listed below for preparing the web setup.
 
 Because both web and CLI must have access to configuration and logs, permissions will be managed using a special
 system group. The web server user and CLI user have to be added to this system group.
@@ -102,6 +216,7 @@ Use `icingacli` to create the configuration directory which defaults to **/etc/i
 ./bin/icingacli setup config directory
 ````
 
+
 When using the web setup you are required to authenticate using a token. In order to generate a token use the
 `icingacli`:
 ````
@@ -113,11 +228,10 @@ In case you do not remember the token you can show it using the `icingacli`:
 ./bin/icingacli setup token show
 ````
 
-**Step 5: Web Setup**
+Finally visit Icinga Web 2 in your browser to access the setup wizard and complete the installation:
+`/icingaweb2/setup`.
 
-Visit Icinga Web 2 in your browser and complete installation using the web setup: /icingaweb2/setup
-
-## Upgrading to Icinga Web 2 Beta 2
+## <a id="upgrading-to-beta2"></a> Upgrading to Icinga Web 2 Beta 2
 
 Icinga Web 2 Beta 2 introduces access control based on roles for secured actions. If you've already set up Icinga Web 2,
 you are required to create the file **roles.ini** beneath Icinga Web 2's configuration directory with the following
@@ -134,7 +248,7 @@ If you delegated authentication to your web server using the `autologin` backend
 authentication backend to be able to log in again. The new name better reflects what’s going on. A similar change
 affects environments that opted for not storing preferences, your new backend is `none`.
 
-## Upgrading to Icinga Web 2 Beta 3
+## <a id="upgrading-to-beta3"></a> Upgrading to Icinga Web 2 Beta 3
 
 Because Icinga Web 2 Beta 3 does not introduce any backward incompatible change you don't have to change your
 configuration files after upgrading to Icinga Web 2 Beta 3.

From 3015028f5df2e4c5c81813fffb515c26043705e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Helfensd=C3=B6rfer?= <tim@visualappeal.de>
Date: Fri, 10 Apr 2015 13:20:09 +0200
Subject: [PATCH 1269/2920] Remove quotation marks in password example

Otherwise the quotation marks are included in the password.

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
---
 doc/authentication.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/authentication.md b/doc/authentication.md
index 604c85a2e..13a821441 100644
--- a/doc/authentication.md
+++ b/doc/authentication.md
@@ -107,7 +107,7 @@ Icinga Web 2 uses the MD5 based BSD password algorithm. For generating a passwor
 command:
 
 ````
-openssl passwd -1 "password"
+openssl passwd -1 password
 ````
 
 > Note: The switch to `openssl passwd` is the **number one** (`-1`) for using the MD5 based BSD password algorithm.

From 168577ff336aec67d398109f47435df2babf8c31 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 16 Apr 2015 14:29:06 +0200
Subject: [PATCH 1270/2920] Use icon instead of the letter 'X' in close tab

---
 library/Icinga/Web/Widget/Tabs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index 770f5093f..aa5e7cda6 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -49,7 +49,7 @@ EOT;
      */
     private $closeTpl = <<< 'EOT'
 <li class="dropdown" style="float: right;">
-  <a href="#" class="dropdown-toggle close-toggle">X</a>
+  <a href="#" class="dropdown-toggle close-toggle"> <i aria-hidden="true" class="icon-cancel"></i> </a>
 </li>
 EOT;
 

From f07c0d83e8c2be5a68d90385d6e17fe839303ed5 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 16 Apr 2015 18:25:23 +0200
Subject: [PATCH 1271/2920] Add option to change tooltip settings from data
 attributes

refs #9025
---
 public/js/icinga/behavior/tooltip.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/public/js/icinga/behavior/tooltip.js b/public/js/icinga/behavior/tooltip.js
index c9a64257f..a1a94b62b 100644
--- a/public/js/icinga/behavior/tooltip.js
+++ b/public/js/icinga/behavior/tooltip.js
@@ -30,7 +30,18 @@
         $('svg .chart-data', el).tipsy({ gravity: 'se', html: true });
         $('.historycolorgrid a[title]', el).tipsy({ gravity: 's', offset: 2 });
         $('img.icon[title]', el).tipsy({ gravity: $.fn.tipsy.autoNS, offset: 2 });
-        $('[title]', el).tipsy({ gravity: $.fn.tipsy.autoNS, delayIn: 500 });
+        $('[title]', el).each(function (i, el) {
+           var $el = $(el);
+           var delay = 500;
+           if ($el.data('tooltip-delay') !== undefined) {
+               delay = $el.data('tooltip-delay');
+           }
+           var gravity = $.fn.tipsy.autoNS;
+           if ($el.data('tooltip-gravity')) {
+               gravity = $el.data('tooltip-gravity');
+           }
+           $el.tipsy({ gravity: gravity, delayIn: delay });
+        });
 
         // migrate or remove all orphaned tooltips
         $('.tipsy').each(function () {

From 0974b70e0e2bde622670d1a4ad34752a03164e26 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 16 Apr 2015 18:27:47 +0200
Subject: [PATCH 1272/2920] Display service grid tooltips on the top

fixes #9025
---
 .../application/views/scripts/list/servicegrid.phtml           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
index a2e7502ea..9219e5dda 100644
--- a/modules/monitoring/application/views/scripts/list/servicegrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
@@ -50,7 +50,8 @@ foreach ($serviceDescriptions as $service_description): ?>
                   'service_description' => $service_description
                 ),
                 array(
-                  'title' => sprintf($this->translate('List all services with the name "%s" on all reported hosts'), $service_description)
+                  'title' => sprintf($this->translate('List all services with the name "%s" on all reported hosts'), $service_description),
+                  'data-tooltip-gravity' => 's'
                 ),
                 false
               ); ?>

From 6898a4e0d5d2594ffbf761a0cdf6d1f29c8c49cf Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 16 Apr 2015 18:30:49 +0200
Subject: [PATCH 1273/2920] Display icon tooltips without delay

Original functionality was broken when changing the icon library.
---
 library/Icinga/Web/Widget/Chart/HistoryColorGrid.php | 3 ++-
 public/js/icinga/behavior/tooltip.js                 | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
index d1c9a677f..8ffd3ea00 100644
--- a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
+++ b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
@@ -127,7 +127,8 @@ class HistoryColorGrid extends AbstractWidget {
                     . ' opacity: ' . $this->opacity . ';" ' .
                 'aria-label="' . $entry['caption'] . '" ' .
                 'title="' . $entry['caption'] . '" ' .
-                'href="'  . $entry['url'] . '"' .
+                'href="'  . $entry['url'] . '" ' .
+                'data-tooltip-delay="0"' .
             '></a>';
         } else {
             return '<span ' .
diff --git a/public/js/icinga/behavior/tooltip.js b/public/js/icinga/behavior/tooltip.js
index a1a94b62b..d3dc6c539 100644
--- a/public/js/icinga/behavior/tooltip.js
+++ b/public/js/icinga/behavior/tooltip.js
@@ -28,8 +28,7 @@
             $el.attr('title', $el.data('title-rich') || $el.attr('title'));
         });
         $('svg .chart-data', el).tipsy({ gravity: 'se', html: true });
-        $('.historycolorgrid a[title]', el).tipsy({ gravity: 's', offset: 2 });
-        $('img.icon[title]', el).tipsy({ gravity: $.fn.tipsy.autoNS, offset: 2 });
+        $('i[title]', el).tipsy({ gravity: $.fn.tipsy.autoNS, offset: 2 });
         $('[title]', el).each(function (i, el) {
            var $el = $(el);
            var delay = 500;

From ae7d679a6a96832893a1feb51013f88ba68d6f56 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 16 Apr 2015 21:01:08 +0200
Subject: [PATCH 1274/2920] Revert "Do not destroy all global on mailto link
 clicks"

This reverts commit 16b9c73436bab9318d1a09f5caaba8412fd168c2.

As I already mentioned, this re-introduces the problem that you'll
get ugly "lost connection to web server" notifications. Easiest way
to reproduce this: click your browsers reload button while a request
is pending - or just click reload a couple of times while showing the
dashboard.

refs #7759
---
 public/js/icinga/events.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 491ca82f2..7e87a8fb6 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -100,6 +100,7 @@
 
             // Destroy Icinga, clean up and interrupt pending requests on unload
             $( window ).on('unload', { self: this }, this.onUnload);
+            $( window ).on('beforeunload', { self: this }, this.onUnload);
 
             // We catch scroll events in our containers
             $('.container').on('scroll', { self: this }, this.icinga.events.onContainerScroll);
@@ -555,6 +556,7 @@
             $(window).off('resize', this.onWindowResize);
             $(window).off('load', this.onLoad);
             $(window).off('unload', this.onUnload);
+            $(window).off('beforeunload', this.onUnload);
             $(document).off('scroll', '.container', this.onContainerScroll);
             $(document).off('click', 'a', this.linkClicked);
             $(document).off('click', 'table.action tr[href]', this.rowSelected);

From 6d0870ad2e8b75cff9b61e1af2dbc04375c22ce8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 10:04:24 +0200
Subject: [PATCH 1275/2920] Adjust padding and margin of .content and .controls

refs #7876
---
 modules/monitoring/public/css/module.less |  3 +++
 public/css/icinga/controls.less           |  1 +
 public/css/icinga/layout-structure.less   | 12 ++++++------
 public/css/icinga/tabs.less               |  4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 050a8fb5b..f121bb66f 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -94,11 +94,14 @@ div.contacts div.notification-periods {
 div.tinystatesummary {
   .page-header();
   font-size: 1em;
+  margin-bottom: 0.5em;
+
   .badges {
     display: inline-block;
     margin-bottom: 4px;
     margin-left: 1em;
   }
+
   .state > a {
     color: white;
     font-size: 0.8em;
diff --git a/public/css/icinga/controls.less b/public/css/icinga/controls.less
index 73e78b3e9..b8e82b795 100644
--- a/public/css/icinga/controls.less
+++ b/public/css/icinga/controls.less
@@ -1,6 +1,7 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 form.sort-control {
+  .dontprint;
   float: right;
 
   label {
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index a1bf3682d..b10c6e6ed 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -119,12 +119,12 @@ html {
 .container .controls {
   top: 0;
   background-color: white;
-  padding: 0;
+  padding: 1em 1em 0;
   z-index: 100;
 }
 
 .container .fake-controls {
-  padding: 0;
+  padding: 1em 1em 0;
 }
 
 .container .controls .pagination {
@@ -149,10 +149,6 @@ html {
   font-size: 0.9em;
 }
 
-.container .controls > * {
-  margin-left: 1em;
-}
-
 .container .controls .pagination {
   margin-left: 1.2em;
 }
@@ -161,6 +157,10 @@ html {
   padding: 1em;
 }
 
+.controls + .fake-controls + .content {
+  padding-top: 0;
+}
+
 .dashboard .content {
   padding: 0;
   overflow: auto;
diff --git a/public/css/icinga/tabs.less b/public/css/icinga/tabs.less
index 8d391b038..6d35c5e20 100644
--- a/public/css/icinga/tabs.less
+++ b/public/css/icinga/tabs.less
@@ -1,12 +1,12 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 ul.tabs {
-  padding: 1em 0 0 0;
+  padding: 0;
   list-style-type: inside;
 }
 
 .controls ul.tabs {
-  margin-left: 0em;
+  margin-left: -1em;
   margin-top: -3.54em;
   height: 2.6em;
   overflow: hidden;

From b52b5071348f066c31cea3565e71b339defda25c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 10:05:48 +0200
Subject: [PATCH 1276/2920] FilterEditor: Fix css

---
 library/Icinga/Web/Widget/FilterEditor.php | 30 ++++++++++++----------
 public/css/icinga/widgets.less             | 22 +++++++++++-----
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index ad9b1b5b2..7812cdf47 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -649,7 +649,7 @@ class FilterEditor extends AbstractWidget
 
     public function renderSearch()
     {
-        $html = ' <form method="post" class="inline dontprint" action="'
+        $html = ' <form method="post" class="search inline dontprint" action="'
               . $this->preservedUrl()
               . '"><input type="text" name="q" style="width: 8em" class="search" value="" placeholder="'
               . t('Search...')
@@ -678,20 +678,22 @@ class FilterEditor extends AbstractWidget
     public function render()
     {
         if (! $this->preservedUrl()->getParam('modifyFilter')) {
-            return $this->renderSearch() . $this->shorten($this->filter, 50);
+            return '<div class="filter">' . $this->renderSearch() . $this->shorten($this->filter, 50) . '</div>';
         }
-        return  $this->renderSearch()
-              . '<form action="'
-              . Url::fromRequest()
-              . '" class="filterEditor" method="POST">'
-              . '<ul class="tree widgetFilter"><li>'
-              . $this->renderFilter($this->filter)
-              . '</li></ul>'
-              . '<div style="float: right">'
-              . '<input type="submit" name="submit" value="Apply" />'
-              . '<input type="submit" name="cancel" value="Cancel" />'
-              . '</div>'
-              . '</form>';
+        return  '<div class="filter">'
+            . $this->renderSearch()
+            . '<form action="'
+            . Url::fromRequest()
+            . '" class="editor" method="POST">'
+            . '<ul class="tree"><li>'
+            . $this->renderFilter($this->filter)
+            . '</li></ul>'
+            . '<div class="buttons">'
+            . '<input type="submit" name="submit" value="Apply" />'
+            . '<input type="submit" name="cancel" value="Cancel" />'
+            . '</div>'
+            . '</form>'
+            . '</div>';
     }
 
     protected function shorten($string, $length)
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index 45701a697..1993704b6 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -48,8 +48,22 @@ table.multiselect tr[href] td {
   -ms-user-select: none;
 }
 
-#main form.filterEditor input[type=text], #main form.filterEditor select {
-    width: 12em;
+#main div.filter {
+  margin-top: 1em;
+
+  form.editor {
+    input[type=text], select {
+      width: 12em;
+    }
+
+    ul.tree li.active {
+      background-color: #eee;
+    }
+
+    div.buttons {
+      float: right;
+    }
+  }
 }
 
 ul.datafilter li {
@@ -281,10 +295,6 @@ li li .badge {
   background-color: @colorUnknown;
 }
 
-.widgetFilter li.active {
-    background-color: #eee;
-}
-
 .sparkline-box {
   position: relative;
   top: -3px;

From 7735e5d31d0cf1e8fb70530502a4ee965b237954 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:07:18 +0200
Subject: [PATCH 1277/2920] Fix padding and margin of .content and .controls

refs #7876
---
 public/css/icinga/layout-structure.less | 4 ----
 public/css/icinga/main-content.less     | 6 ------
 public/css/icinga/tabs.less             | 1 +
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index b10c6e6ed..23a598b52 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -157,10 +157,6 @@ html {
   padding: 1em;
 }
 
-.controls + .fake-controls + .content {
-  padding-top: 0;
-}
-
 .dashboard .content {
   padding: 0;
   overflow: auto;
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 32054e242..b442723cb 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -118,7 +118,6 @@ table.avp a:hover {
 
 /* Definitively monitoring-only: */
 table.objectstate {
-  margin: 1em;
   border-collapse: separate;
   border-spacing: 1px;
 }
@@ -194,11 +193,6 @@ table.benchmark {
   color: inherit;
 }
 
-/* controls have no padding as of tabs */
-.controls > h1 {
-  margin-right: 1em;
-}
-
 [class^="icon-"]:before, [class*=" icon-"]:before {
     text-decoration: none;
 }
diff --git a/public/css/icinga/tabs.less b/public/css/icinga/tabs.less
index 6d35c5e20..2c02bfb94 100644
--- a/public/css/icinga/tabs.less
+++ b/public/css/icinga/tabs.less
@@ -7,6 +7,7 @@ ul.tabs {
 
 .controls ul.tabs {
   margin-left: -1em;
+  margin-right: -1em;
   margin-top: -3.54em;
   height: 2.6em;
   overflow: hidden;

From 2bd31ee39509c99458860fe1b8b72fa5ef01227f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:08:41 +0200
Subject: [PATCH 1278/2920] Icinga\Web\Controller: Add helper functions to
 create control widgets

refs #7876
---
 library/Icinga/Web/Controller.php | 72 ++++++++++++++++++++++++++++---
 1 file changed, 67 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index da9486b9e..42bd94b5e 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -3,8 +3,10 @@
 
 namespace Icinga\Web;
 
+use Zend_Paginator;
 use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Web\Widget\SortBox;
+use Icinga\Web\Widget\Limiter;
 
 /**
  * This is the controller all modules should inherit from
@@ -16,15 +18,75 @@ class Controller extends ModuleActionController
     /**
      * Create a SortBox widget at the `sortBox' view property
      *
+     * In case the current view has been requested as compact this method does nothing.
+     *
      * @param   array   $columns    An array containing the sort columns, with the
      *                               submit value as the key and the label as the value
+     *
+     * @return  $this
      */
     protected function setupSortControl(array $columns)
     {
-        $req = $this->getRequest();
-        $this->view->sortBox = SortBox::create(
-            'sortbox-' . $req->getActionName(),
-            $columns
-        )->applyRequest($req);
+        if (! $this->view->compact) {
+            $req = $this->getRequest();
+            $this->view->sortBox = SortBox::create(
+                'sortbox-' . $req->getActionName(),
+                $columns
+            )->applyRequest($req);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Create a Limiter widget at the `limiter' view property
+     *
+     * In case the current view has been requested as compact this method does nothing.
+     *
+     * @return  $this
+     */
+    protected function setupLimitControl()
+    {
+        if (! $this->view->compact) {
+            $this->view->limiter = new Limiter();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the view property `paginator' to the given Zend_Paginator
+     *
+     * In case the current view has been requested as compact this method does nothing.
+     *
+     * @param   Zend_Paginator  $paginator  The Zend_Paginator for which to show a pagination control
+     *
+     * @return  $this
+     */
+    protected function setupPaginationControl(Zend_Paginator $paginator)
+    {
+        if (! $this->view->compact) {
+            $this->view->paginator = $paginator;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the view property `filterEditor' to the given FilterEditor
+     *
+     * In case the current view has been requested as compact this method does nothing.
+     *
+     * @param   Form    $editor    The FilterEditor
+     *
+     * @return  $this
+     */
+    protected function setupFilterControl($editor)
+    {
+        if (! $this->view->compact) {
+            $this->view->filterEditor = $editor;
+        }
+
+        return $this;
     }
 }

From d5cc340439fba9008df8e4aaae82581d8c1596a8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:09:17 +0200
Subject: [PATCH 1279/2920] ApplicationLog: Ensure dashboard compliance

refs #7876
---
 application/controllers/ListController.php          |  3 +++
 application/views/scripts/list/applicationlog.phtml | 11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index feaf13921..985c53512 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -52,5 +52,8 @@ class ListController extends Controller
             'fields'    => $pattern
         )));
         $this->view->logData = $resource->select()->order('DESC')->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->logData);
     }
 }
diff --git a/application/views/scripts/list/applicationlog.phtml b/application/views/scripts/list/applicationlog.phtml
index 583fde516..cc412eb9c 100644
--- a/application/views/scripts/list/applicationlog.phtml
+++ b/application/views/scripts/list/applicationlog.phtml
@@ -1,9 +1,12 @@
+<?php if (! $this->compact): ?>
 <div class="controls">
-    <?= $this->tabs->render($this) ?>
-    <div style="margin-top: 1em"></div>
-    <?=  $this->logData ?>
+  <?= $this->tabs; ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
 </div>
-
+<?php endif ?>
 <div class="content">
     <?php if ($this->logData !== null): ?>
     <table class="action">

From 57d519bca8a96a29e2c2265a5ebdf86f3855ae6d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:09:35 +0200
Subject: [PATCH 1280/2920] ModuleOverview: Ensure dashboard compliance

refs #7876
---
 application/controllers/ConfigController.php   | 12 ++++++++++--
 application/views/scripts/config/modules.phtml | 10 +++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 491a33ef3..370b8f5d0 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -11,14 +11,14 @@ use Icinga\Forms\Config\GeneralConfigForm;
 use Icinga\Forms\Config\ResourceConfigForm;
 use Icinga\Forms\ConfirmRemovalForm;
 use Icinga\Security\SecurityException;
-use Icinga\Web\Controller\ActionController;
+use Icinga\Web\Controller;
 use Icinga\Web\Notification;
 use Icinga\Web\Widget;
 
 /**
  * Application and module configuration
  */
-class ConfigController extends ActionController
+class ConfigController extends Controller
 {
     /**
      * The first allowed config action according to the user's permissions
@@ -130,6 +130,14 @@ class ConfigController extends ActionController
             ->order('enabled', 'desc')
             ->order('name')
             ->paginate();
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->modules);
+        // TODO: Not working
+        /*$this->setupSortControl(array(
+            'name'      => $this->translate('Modulename'),
+            'path'      => $this->translate('Installation Path'),
+            'enabled'   => $this->translate('State')
+        ));*/
     }
 
     public function moduleAction()
diff --git a/application/views/scripts/config/modules.phtml b/application/views/scripts/config/modules.phtml
index 9121de405..2abf16fc6 100644
--- a/application/views/scripts/config/modules.phtml
+++ b/application/views/scripts/config/modules.phtml
@@ -1,8 +1,12 @@
+<?php if (! $this->compact): ?>
 <div class="controls">
-<?= $this->tabs ?>
-<?= $this->paginationControl($modules) ?>
+  <?= $this->tabs; ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
 </div>
-
+<?php endif ?>
 <div class="content">
   <table class="action" data-base-target="_next">
     <tbody>

From 5f4a61f36e4e5dc3da7298a68dc03d008773146a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:09:50 +0200
Subject: [PATCH 1281/2920] Alertsummary: Ensure dashboard compliance

refs #7876
---
 .../controllers/AlertsummaryController.php            |  4 +++-
 .../views/scripts/alertsummary/index.phtml            | 11 ++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 0d3917e90..aea8def93 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -69,8 +69,10 @@ class Monitoring_AlertsummaryController extends Controller
                 'notification_state'
             )
         );
-
         $this->view->notifications = $query->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->notifications);
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/alertsummary/index.phtml b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
index 8bb36b518..d96ca5bdc 100644
--- a/modules/monitoring/application/views/scripts/alertsummary/index.phtml
+++ b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
@@ -1,12 +1,13 @@
+<?php if (! $this->compact): ?>
 <div class="controls">
-    <?= $this->tabs ?>
-    <div style="margin: 1em;" class="dontprint">
+    <?= $this->tabs; ?>
+    <div style="float: right;" class="dontprint">
         <?= $intervalBox; ?>
     </div>
-    <?= $this->widget('limiter') ?>
-    <?= $this->paginationControl($notifications, null, null, array('preserve' => $this->preserve)) ?>
+    <?= $this->limiter; ?>
+    <?= $this->paginator; ?>
 </div>
-
+<?php endif ?>
 <div class="content alertsummary">
     <!-- <h1><?= $this->translate('Alert summary'); ?></h1> -->
 

From 93889442834a464085fe3e7a36a7978ed9cf57c7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:10:21 +0200
Subject: [PATCH 1282/2920] show/history: Ensure dashboard compliance

refs #7876
---
 .../controllers/ShowController.php            |  3 ++
 .../views/scripts/show/history.phtml          | 30 +++++++++++--------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index fe5633ab2..bf8c5298d 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -73,6 +73,9 @@ class Monitoring_ShowController extends Controller
         $this->view->history = $this->view->object->eventhistory->getQuery()->paginate($this->params->get('limit', 50));
         $this->handleFormatRequest($this->view->object->eventhistory);
         $this->fetchHostStats();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->history);
     }
 
     public function servicesAction()
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index d82f454f6..d2fd1a383 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -1,29 +1,33 @@
 <?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">
-<?php if ($hostContext): ?>
+  <?= $this->tabs; ?>
+ <?php if ($hostContext): ?>
   <?= $this->render('partials/host/object-header.phtml'); ?>
-<?php else: ?>
+ <?php else: ?>
   <?= $this->render('partials/service/object-header.phtml'); ?>
-<?php endif ?>
+ <?php endif ?>
   <h1><?= $this->translate('This Object\'s Event History'); ?></h1>
-  <?= $this->widget('limiter', array('url' => $url, 'max' => $history->count())); ?>
-  <?= $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
 </div>
-
+<?php endif ?>
 <div class="content">
-<?php if (count($history) === 0): ?>
-  <?= $this->translate('No history available for this object'); ?>
-</div>
-<?php return; endif ?>
+<?php
+
+if (count($history) === 0) {
+    echo $this->translate('No history available for this object') . '</div>';
+    return;
+}
+?>
 
 <?php
 function contactsLink($match, $view) {

From 3f092ffb2d3c405746d533db8be62e2e890d34ae Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:10:49 +0200
Subject: [PATCH 1283/2920] show/contact: Ensure dashboard compliance

refs #7876
---
 .../monitoring/application/controllers/ShowController.php   | 4 ++--
 .../monitoring/application/views/scripts/show/contact.phtml | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index bf8c5298d..968512c26 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -145,9 +145,7 @@ class Monitoring_ShowController extends Controller
             'contact_notify_host_flapping',
             'contact_notify_host_downtime',
         ));
-
         $query->where('contact_name', $contactName);
-
         $contact = $query->getQuery()->fetchRow();
 
         if ($contact) {
@@ -171,6 +169,8 @@ class Monitoring_ShowController extends Controller
 
             $notifications->where('contact_object_id', $contact->contact_object_id);
             $this->view->notifications = $notifications->paginate();
+            $this->setupLimitControl();
+            $this->setupPaginationControl($this->view->notifications);
         }
 
         $this->view->contact = $contact;
diff --git a/modules/monitoring/application/views/scripts/show/contact.phtml b/modules/monitoring/application/views/scripts/show/contact.phtml
index 1ad5eccf9..027301c88 100644
--- a/modules/monitoring/application/views/scripts/show/contact.phtml
+++ b/modules/monitoring/application/views/scripts/show/contact.phtml
@@ -1,6 +1,8 @@
 <?php $contactHelper = $this->getHelper('ContactFlags') ?>
 <div class="controls">
-  <?= $this->tabs ?>
+ <?php if (! $this->compact): ?>
+  <?= $this->tabs; ?>
+ <?php endif ?>
   <h1><?= $this->translate('Contact details') ?></h1>
   <div class="circular" style="background-image: url('<?=
       $this->href('static/gravatar', array('email' => $contact->contact_email))
@@ -54,6 +56,8 @@
   </ul>
   <?php endif ?>
   <h1><?= $this->translate('Notifications sent to this contact') ?></h1>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
 </div>
 
 <?php if (count($notifications)): ?>

From 073dc31128d0aaa6580b83522deb9e08e7b0c689 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:11:06 +0200
Subject: [PATCH 1284/2920] Timeline: Ensure dashboard compliance

refs #7876
---
 .../application/views/scripts/timeline/index.phtml    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/timeline/index.phtml b/modules/monitoring/application/views/scripts/timeline/index.phtml
index 6557b4a28..d0cc8d34c 100644
--- a/modules/monitoring/application/views/scripts/timeline/index.phtml
+++ b/modules/monitoring/application/views/scripts/timeline/index.phtml
@@ -3,13 +3,12 @@ use Icinga\Web\Url;
 use Icinga\Util\Color;
 
 $groupInfo = $timeline->getGroupInfo();
-$firstRow = !$beingExtended;
+$firstRow = ! $beingExtended;
 
-?>
-<?php if (!$beingExtended): ?>
+if (! $beingExtended && !$this->compact): ?>
 <div class="controls">
-    <?= $this->tabs ?>
-    <div style="margin: 1em;" class="dontprint">
+    <?= $this->tabs; ?>
+    <div style="float: right;" class="dontprint">
         <?= $intervalBox; ?>
     </div>
     <div style="margin: 1em;" class="timeline-legend">
@@ -21,6 +20,8 @@ $firstRow = !$beingExtended;
 <?php endforeach ?>
     </div>
 </div>
+<?php endif ?>
+<?php if (! $beingExtended): ?>
 <div class="content" data-base-target="_next">
     <div class="timeline">
 <?php endif ?>

From 74cf3cf3753dc8be236597d623283fb780f226ec Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:12:35 +0200
Subject: [PATCH 1285/2920] list/hosts: Ensure dashboard compliance

refs #7876
---
 .../controllers/ListController.php            | 20 +++++------
 .../views/scripts/list/hosts.phtml            | 34 +++++++------------
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index ac1d41590..a1e22d442 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -117,18 +117,8 @@ class Monitoring_ListController extends Controller
             'host_current_check_attempt',
             'host_max_check_attempts'
         ), $this->extraColumns()));
-
         $this->filterQuery($query);
-
         $this->applyRestriction('monitoring/hosts/filter', $query);
-
-        $this->setupSortControl(array(
-            'host_severity'     => $this->translate('Severity'),
-            'host_state'        => $this->translate('Current State'),
-            'host_display_name' => $this->translate('Hostname'),
-            'host_address'      => $this->translate('Address'),
-            'host_last_check'   => $this->translate('Last Check')
-        ));
         $this->view->hosts = $query->paginate();
 
         $this->view->stats = $this->backend->select()->from('statusSummary', array(
@@ -142,6 +132,16 @@ class Monitoring_ListController extends Controller
             'hosts_unreachable_unhandled',
             'hosts_pending',
         ))->getQuery()->fetchRow();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->hosts);
+        $this->setupSortControl(array(
+            'host_severity'     => $this->translate('Severity'),
+            'host_state'        => $this->translate('Current State'),
+            'host_display_name' => $this->translate('Hostname'),
+            'host_address'      => $this->translate('Address'),
+            'host_last_check'   => $this->translate('Last Check')
+        ));
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index a7511fcd8..3efb70320 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -1,33 +1,25 @@
 <?php
 use Icinga\Module\Monitoring\Object\Host;
 
-if ($this->compact): ?>
-<div class="content">
-<?php else: ?>
+if (! $this->compact): ?>
 <div class="controls">
-  <?= $this->tabs ?>
-  <div style="margin: 1em;" class="dontprint">
-    <?= $this->render('list/components/selectioninfo.phtml') ?>
-    <?= $this->render('list/components/hostssummary.phtml') ?>
-    <?= $this->translate('Sort by') ?> <?= $this->sortControl->render($this) ?>
+  <?= $this->tabs; ?>
+  <div class="dontprint">
+    <?= $this->render('list/components/selectioninfo.phtml'); ?>
+    <?= $this->render('list/components/hostssummary.phtml'); ?>
   </div>
-
-<?= $this->widget('limiter')->setMaxLimit($this->hosts->count()) ?>
-<?= $this->paginationControl($hosts, null, null, array('preserve' => $this->preserve)) ?>
-<?= $this->selectionToolbar('multi', $this->href('monitoring/hosts/show?' . $this->filter->toQueryString())) ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->selectionToolbar('multi', $this->href('monitoring/hosts/show?' . $this->filter->toQueryString())); ?>
+  <?= $this->filterEditor; ?>
 </div>
-
+<?php endif ?>
 <div class="content">
-<?= $this->filterEditor ?>
 <?php
 
-endif;
-
-if ($hosts->count() === 0) {
-    echo $this->translate('No hosts matching the filter');
-    if (! $this->compact) {
-        echo '</div>';
-    }
+if (count($hosts) === 0) {
+    echo $this->translate('No hosts found matching the filter') . '</div>';
     return;
 }
 ?>

From 29648191e4be272138b7b73a77a14c721fca18a4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:12:56 +0200
Subject: [PATCH 1286/2920] list/services: Ensure dashboard compliance

refs #7876
---
 .../controllers/ListController.php            | 14 ++-----
 .../views/scripts/list/services.phtml         | 42 ++++++++-----------
 2 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index a1e22d442..e69c9034f 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -205,11 +205,12 @@ class Monitoring_ListController extends Controller
             'max_check_attempts'    => 'service_max_check_attempts'
         ), $this->extraColumns());
         $query = $this->backend->select()->from('serviceStatus', $columns);
-
         $this->filterQuery($query);
-
         $this->applyRestriction('monitoring/services/filter', $query);
+        $this->view->services = $query->paginate();
 
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->services);
         $this->setupSortControl(array(
             'service_severity'      => $this->translate('Service Severity'),
             'service_state'         => $this->translate('Current Service State'),
@@ -221,14 +222,6 @@ class Monitoring_ListController extends Controller
             'host_address'          => $this->translate('Host Address'),
             'host_last_check'       => $this->translate('Last Host Check')
         ));
-        $limit = $this->params->get('limit');
-        $this->view->limit = $limit;
-        if ($limit === 0) {
-            $this->view->services = $query->getQuery()->fetchAll();
-        } else {
-            // TODO: Workaround, paginate should be able to fetch limit from new params
-            $this->view->services = $query->paginate($this->params->get('limit'));
-        }
 
         $this->view->stats = $this->backend->select()->from('statusSummary', array(
             'services_total',
@@ -247,7 +240,6 @@ class Monitoring_ListController extends Controller
             'services_unknown_handled',
             'services_pending',
         ))->getQuery()->fetchRow();
-
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 3f1437dae..7473f7f25 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -4,41 +4,33 @@ use Icinga\Module\Monitoring\Object\Service;
 
 $selfUrl = 'monitoring/list/services';
 
-if (!$this->compact): ?>
+if (! $this->compact): ?>
 <div class="controls">
-<?= $this->tabs ?>
-<div style="margin: 1em;" class="dontprint">
-<?= $this->render('list/components/selectioninfo.phtml') ?>
-<?= $this->render('list/components/servicesummary.phtml') ?>
-<div style="float: right">
-<?= $this->translate('Sort by') ?> <?= $this->sortControl ?>
+  <?= $this->tabs; ?>
+  <div class="dontprint">
+    <?= $this->render('list/components/selectioninfo.phtml'); ?>
+    <?= $this->render('list/components/servicesummary.phtml'); ?>
+  </div>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
 </div>
-</div>
-<?php if ($this->limit === 0): ?>
-<?= $this->widget('limiter') ?>
-<?php else: ?>
-<?= $this->widget('limiter')->setCurrentPageCount($this->services->count()) ?>
-<?= $this->paginationControl($services, null, null, array('preserve' => $this->preserve)) ?>
 <?php endif ?>
-</div>
-
 <div class="content">
-<?= $this->filterEditor ?>
-<?php else: ?>
+<?php
 
-<div class="content">
-<?php endif ?>
+if (count($services) === 0) {
+    echo $this->translate('No services found matching the filter') . '</div>';
+    return;
+}
+?>
 <table data-base-target="_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_description,host_name">
   <tbody>
-<?php
-
-if (count($services) === 0) {
-    echo mt('monitoring', 'No services matching the filter');
-}
-foreach ($services as $service):
+<?php foreach ($services as $service):
     $serviceLink = $this->href(
       'monitoring/service/show',
       array(

From 5f19ec1b2e5d02325268da114ca903f5d140bf80 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:13:22 +0200
Subject: [PATCH 1287/2920] list/downtimes: Ensure dashboard compliance

refs #7876
---
 .../controllers/ListController.php            |  8 +++--
 .../views/scripts/list/downtimes.phtml        | 32 ++++++++-----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index e69c9034f..f1f758e9c 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -250,8 +250,10 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
+
         $this->addTitleTab('downtimes', $this->translate('Downtimes'), $this->translate('List downtimes'));
         $this->setAutorefreshInterval(12);
+
         $query = $this->backend->select()->from('downtime', array(
             'id'              => 'downtime_internal_id',
             'objecttype'      => 'downtime_objecttype',
@@ -273,9 +275,11 @@ class Monitoring_ListController extends Controller
             'host_display_name',
             'service_display_name'
         ));
-
         $this->filterQuery($query);
+        $this->view->downtimes = $query->paginate();
 
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->downtimes);
         $this->setupSortControl(array(
             'downtime_is_in_effect'     => $this->translate('Is In Effect'),
             'host_display_name'         => $this->translate('Host'),
@@ -289,8 +293,6 @@ class Monitoring_ListController extends Controller
             'downtime_duration'         => $this->translate('Duration')
         ));
 
-        $this->view->downtimes = $query->paginate();
-
         if ($this->Auth()->hasPermission('monitoring/command/downtime/delete')) {
             $this->view->delDowntimeForm = new DeleteDowntimeCommandForm();
         }
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 2387e9487..b279d4063 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -1,30 +1,24 @@
 <?php
-
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
-?>
-
-<?php if (false === $this->compact): ?>
+if (! $this->compact): ?>
 <div class="controls">
-  <?= $this->tabs->render($this); ?>
-  <div style="margin: 1em" class="dontprint">
-    <?= $this->translate('Sort by'); ?> <?= $this->sortControl->render($this); ?>
-    <?php if (! $this->filterEditor): ?>
-        <?= $this->filterPreview ?>
-    <?php endif; ?>
-  </div>
-  <?= $this->widget('limiter', array('url' => $this->url, 'max' => $downtimes->count())); ?>
-  <?= $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
+  <?= $this->tabs; ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
 </div>
 <?php endif ?>
-
 <div class="content">
-<?= $this->filterEditor ?>
-<?php if (count($downtimes) === 0): ?>
-  <?= $this->translate('No active downtimes'); ?>
-</div>
-<?php return; endif ?>
+<?php
+
+if (count($downtimes) === 0) {
+    echo $this->translate('No downtimes found matching the filter') . '</div>';
+    return;
+}
+?>
 
   <table data-base-target="_next" class="action">
     <tbody>

From a09e41e3b8fbe2249e739d01cc3961aa5a531d47 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:13:36 +0200
Subject: [PATCH 1288/2920] list/notifications: Ensure dashboard compliance

refs #7876
---
 .../controllers/ListController.php            |  5 ++++
 .../views/scripts/list/notifications.phtml    | 26 +++++++++----------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index f1f758e9c..b040da72d 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -306,12 +306,14 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
+
         $this->addTitleTab(
             'notifications',
             $this->translate('Notifications'),
             $this->translate('List notifications')
         );
         $this->setAutorefreshInterval(15);
+
         $query = $this->backend->select()->from('notification', array(
             'host_name',
             'service_description',
@@ -324,6 +326,9 @@ class Monitoring_ListController extends Controller
         ));
         $this->filterQuery($query);
         $this->view->notifications = $query->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->notifications);
         $this->setupSortControl(array(
             'notification_start_time' => $this->translate('Notification Start')
         ));
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 9a3b424b4..c49f5fc3f 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -1,26 +1,24 @@
 <?php
-
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
-?>
-
-<?php if (! $this->compact): ?>
+if (! $this->compact): ?>
 <div class="controls">
-    <?= $this->tabs ?>
-    <div class="dontprint" style="margin: 1em;">
-        <?= $this->translate('Sort by') ?> <?= $this->sortControl->render($this) ?>
-    </div>
-    <?= $this->widget('limiter') ?>
-    <?= $this->paginationControl($notifications, null, null, array('preserve' => $this->preserve)) ?>
+  <?= $this->tabs; ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
 </div>
 <?php endif ?>
-
 <div class="content">
-    <?php if (count($notifications) === 0): ?>
-    <?= $this->translate('No notifications matching the filter') ?>
-    <?php return; endif ?>
+<?php
 
+if (count($notifications) === 0) {
+    echo $this->translate('No notifications found matching the filter') . '</div>';
+    return;
+}
+?>
     <table data-base-target="_next" class="action">
     <tbody>
     <?php foreach ($notifications as $notification):

From d725b2feb78dca474a4a0c836eef390f10ec59fe Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:13:56 +0200
Subject: [PATCH 1289/2920] list/contacts: Ensure dashboard compliance

refs #7876
---
 .../controllers/ListController.php            |  4 +++
 .../views/scripts/list/contacts.phtml         | 27 ++++++++++---------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index b040da72d..8a09ef213 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -339,7 +339,9 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
+
         $this->addTitleTab('contacts', $this->translate('Contacts'), $this->translate('List contacts'));
+
         $query = $this->backend->select()->from('contact', array(
             'contact_name',
             'contact_id',
@@ -363,6 +365,8 @@ class Monitoring_ListController extends Controller
         $this->filterQuery($query);
         $this->view->contacts = $query->paginate();
 
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->contacts);
         $this->setupSortControl(array(
             'contact_name' => $this->translate('Name'),
             'contact_alias' => $this->translate('Alias'),
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 80405f7c6..78910cead 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -1,18 +1,21 @@
+<?php if (! $this->compact): ?>
 <div class="controls">
-    <?= $this->tabs ?>
-    <div style="margin: 1em">
-        <?= $this->sortControl->render($this); ?>
-    </div>
-    <?= $this->paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?>
+  <?= $this->tabs; ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
 </div>
-
+<?php endif ?>
 <div data-base-target="_next" class="content contacts">
-    <?php
-    if (count($contacts) === 0) {
-        echo $this->translate('No contacts matching the filter');
-        return;
-    }
-    foreach ($contacts as $contact): ?>
+<?php
+
+if (count($contacts) === 0) {
+    echo $this->translate('No contacts found matching the filter') . '</div>';
+    return;
+}
+?>
+<?php foreach ($contacts as $contact): ?>
         <div class="contact">
             <?= $this->img('/static/gravatar', array('email' => $contact->contact_email)); ?>
             <strong><?= $this->qlink(

From b9249dac4e3de98b4c04cbd6f973b28461ab4044 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:14:13 +0200
Subject: [PATCH 1290/2920] list/contactgroups: Ensure dashboard compliance

refs #7876
---
 .../controllers/ListController.php            |  9 +++++++-
 .../views/scripts/list/contactgroups.phtml    | 21 ++++++++++++-------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 8a09ef213..3e6abce48 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -424,11 +424,13 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
+
         $this->addTitleTab(
             'contactgroups',
             $this->translate('Contact Groups'),
             $this->translate('List contact groups')
         );
+
         $query = $this->backend->select()->from('contactgroup', array(
             'contactgroup_name',
             'contactgroup_alias',
@@ -436,7 +438,7 @@ class Monitoring_ListController extends Controller
             'contact_alias',
             'contact_email',
             'contact_pager',
-        ))->order('contactgroup_alias');
+        ));
         $this->filterQuery($query);
 
         // Fetch and prepare all contact groups:
@@ -453,6 +455,11 @@ class Monitoring_ListController extends Controller
         }
         // TODO: Find a better naming
         $this->view->groupData = $groupData;
+
+        $this->setupSortControl(array(
+            'contactgroup_name'     => $this->translate('Contactgroup Name'),
+            'contactgroup_alias'    => $this->translate('Contactgroup Alias')
+        ));
     }
 
     public function commentsAction()
diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index 09083a387..5e3b038a7 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -1,17 +1,22 @@
-<?php if (!$this->compact): ?>
+<?php if (! $this->compact): ?>
 <div class="controls">
-    <?= $this->tabs ?>
+  <?= $this->tabs; ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
 </div>
 <?php endif ?>
 <div class="content">
-    <div class="boxview" data-base-target="_next">
-
 <?php
-if (count($groupData) === 0) {
-    echo mt('monitoring', 'No contacts matching the filter');
-}
 
-foreach ($groupData as $groupName => $groupInfo): ?>
+if (count($groupData) === 0) {
+    echo $this->translate('No contactgroups found matching the filter') . '</div>';
+    return;
+}
+?>
+    <div class="boxview" data-base-target="_next">
+<?php foreach ($groupData as $groupName => $groupInfo): ?>
         <div class="box contactgroup">
             <h2><?= $groupInfo['alias']; ?></h2>
 <?php if ($groupInfo['alias'] !== $groupName): ?>

From 2190e553be82f60005aa855e354f7903d2767012 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:14:29 +0200
Subject: [PATCH 1291/2920] list/comments: Ensure dashboard compliance

refs #7876
---
 .../controllers/ListController.php            |  4 ++++
 .../views/scripts/list/comments.phtml         | 24 +++++++++----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 3e6abce48..61fb84956 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -467,8 +467,10 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
+
         $this->addTitleTab('comments', $this->translate('Comments'), $this->translate('List comments'));
         $this->setAutorefreshInterval(12);
+
         $query = $this->backend->select()->from('comment', array(
             'id'         => 'comment_internal_id',
             'objecttype' => 'comment_objecttype',
@@ -486,6 +488,8 @@ class Monitoring_ListController extends Controller
         $this->filterQuery($query);
         $this->view->comments = $query->paginate();
 
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->comments);
         $this->setupSortControl(
             array(
                 'comment_timestamp'     => $this->translate('Comment Timestamp'),
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index cdbe28244..ee752b037 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -1,20 +1,20 @@
-<?php if (false === $this->compact): ?>
+<?php if (! $this->compact): ?>
 <div class="controls">
-  <?= $this->tabs->render($this); ?>
-  <div style="margin: 1em" class="dontprint">
-    <?= $this->translate('Sort by'); ?> <?= $this->sortControl->render($this); ?>
-  </div>
-  <?= $this->widget('limiter', array('url' => $this->url, 'max' => $comments->count())); ?>
-  <?= $this->paginationControl($comments, null, null, array('preserve' => $this->preserve)); ?>
+  <?= $this->tabs; ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
 </div>
 <?php endif ?>
-
 <div class="content">
-<?php if (count($comments) === 0): ?>
-  <?= $this->translate('No comments matching the filter'); ?>
-</div>
-<?php return; endif ?>
+<?php
 
+if (count($comments) === 0) {
+    echo $this->translate('No comments found matching the filter') . '</div>';
+    return;
+}
+?>
   <table data-base-target="_next" class="action comments">
     <tbody>
     <?php foreach ($comments as $comment): ?>

From 7ae7bf38c47617c24252a31c4c541a22a5910249 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:14:46 +0200
Subject: [PATCH 1292/2920] list/servicegroups: Ensure dashboard compliance

refs #7876
---
 .../controllers/ListController.php            |  5 +++
 .../views/scripts/list/servicegroups.phtml    | 32 ++++++++-----------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 61fb84956..def41fb57 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -510,12 +510,14 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
+
         $this->addTitleTab(
             'servicegroups',
             $this->translate('Service Groups'),
             $this->translate('List service groups')
         );
         $this->setAutorefreshInterval(12);
+
         $query = $this->backend->select()->from('groupsummary', array(
             'servicegroup_name',
             'servicegroup_alias',
@@ -547,6 +549,9 @@ class Monitoring_ListController extends Controller
         // service groups. We should separate them.
         $this->filterQuery($query);
         $this->view->servicegroups = $query->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->servicegroups);
         $this->setupSortControl(array(
             'services_severity'     => $this->translate('Severity'),
             'servicegroup_alias'    => $this->translate('Service Group Name'),
diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index 9ef23a95a..9fb8d0e08 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -1,24 +1,20 @@
-<?php if ($this->compact): ?>
-<div class="content">
-<?php else: ?>
+<?php if (! $this->compact): ?>
 <div class="controls">
-  <?= $this->tabs ?>
-  <div style="margin: 1em;" class="dontprint">
-    <?= $this->translate('Sort by'); ?> <?= $this->sortControl->render($this); ?>
-  </div>
-  <?= $this->widget('limiter')->setMaxLimit(count($servicegroups)); ?>
-  <?= $this->paginationControl($servicegroups, null, null, array('preserve' => $this->preserve)); ?>
-</div>
-<div class="content">
+  <?= $this->tabs; ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
   <?= $this->filterEditor; ?>
+</div>
 <?php endif ?>
-  <?php
-    if (count($servicegroups) === 0) {
-      echo $this->translate('No service groups matching the filter');
-      echo '</div>';
-      return;
-    }
-  ?>
+<div class="content">
+<?php
+
+if (count($servicegroups) === 0) {
+    echo $this->translate('No servicegroups found matching the filter') . '</div>';
+    return;
+}
+?>
   <table class="groupview" data-base-target="_next">
     <thead>
       <th><?= $this->translate('Last Problem'); ?></th>

From faa29e3dee6e93a5ed8d0142f75040d9d6055a0b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:14:59 +0200
Subject: [PATCH 1293/2920] list/hostgroups: Ensure dashboard compliance

refs #7876
---
 .../controllers/ListController.php            |  5 +++
 .../views/scripts/list/hostgroups.phtml       | 32 ++++++++-----------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index def41fb57..f655f7192 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -569,8 +569,10 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
+
         $this->addTitleTab('hostgroups', $this->translate('Host Groups'), $this->translate('List host groups'));
         $this->setAutorefreshInterval(12);
+
         $query = $this->backend->select()->from('groupsummary', array(
             'hostgroup_name',
             'hostgroup_alias',
@@ -602,6 +604,9 @@ class Monitoring_ListController extends Controller
         // service groups. We should separate them.
         $this->filterQuery($query);
         $this->view->hostgroups = $query->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->hostgroups);
         $this->setupSortControl(array(
             'services_severity' => $this->translate('Severity'),
             'hostgroup_alias'   => $this->translate('Host Group Name'),
diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index 1e3eb29ac..ef8cd78ea 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -1,24 +1,20 @@
-<?php if ($this->compact): ?>
-<div class="content">
-<?php else: ?>
+<?php if (! $this->compact): ?>
 <div class="controls">
-  <?= $this->tabs ?>
-  <div style="margin: 1em;" class="dontprint">
-    <?= $this->translate('Sort by'); ?> <?= $this->sortControl->render($this); ?>
-  </div>
-  <?= $this->widget('limiter')->setMaxLimit(count($hostgroups)); ?>
-  <?= $this->paginationControl($hostgroups, null, null, array('preserve' => $this->preserve)); ?>
-</div>
-<div class="content">
+  <?= $this->tabs; ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
   <?= $this->filterEditor; ?>
+</div>
 <?php endif ?>
-  <?php
-    if (count($hostgroups) === 0) {
-      echo $this->translate('No host groups matching the filter');
-      echo '</div>';
-      return;
-    }
-  ?>
+<div class="content">
+<?php
+
+if (count($hostgroups) === 0) {
+    echo $this->translate('No hostgroups found matching the filter') . '</div>';
+    return;
+}
+?>
   <table class="groupview" data-base-target="_next">
     <thead>
       <th><?= $this->translate('Last Problem'); ?></th>

From 7be00791a79eabd76465f3ee4d09c68c3a6f44d5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:15:58 +0200
Subject: [PATCH 1294/2920] list/eventhistory: Ensure dashboard compliance

refs #7876
---
 .../controllers/ListController.php            |  5 ++-
 .../views/scripts/list/eventhistory.phtml     | 33 +++++++------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index f655f7192..a6c38c2e1 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -624,6 +624,7 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
+
         $this->addTitleTab(
             'eventhistory',
             $this->translate('Event Overview'),
@@ -645,11 +646,13 @@ class Monitoring_ListController extends Controller
         ));
 
         $this->filterQuery($query);
+        $this->view->history = $query->paginate();
 
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->history);
         $this->setupSortControl(array(
             'timestamp' => $this->translate('Occurence')
         ));
-        $this->view->history = $query->paginate();
     }
 
     public function servicegridAction()
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index b76b5a796..9ab581d59 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -1,32 +1,23 @@
 <?php
-
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
-?>
-
-<?php if (false === $this->compact): ?>
+if (! $this->compact): ?>
 <div class="controls">
-  <?= $this->tabs ?>
-  <div style="margin: 1em" class="dontprint">
-    <div style="float: right">
-      <?= $this->translate('Sort by') ?> <?= $this->sortControl ?>
-    </div>
-  </div>
-
-  <?= $this->widget('limiter', array('url' => $this->url, 'max' => $this->history->count())); ?>
-  <?= $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
-
+  <?= $this->tabs; ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
 </div>
 <?php endif ?>
-
 <div class="content">
-<?= $this->filterEditor ?>
-<?php if (count($history) === 0): ?>
-  <?= $this->translate('No history events matching the filter') ?>
-</div>
-<?php return; endif ?>
-
+<?php
+if (count($history) === 0) {
+    echo $this->translate('No history events found matching the filter') . '</div>';
+    return;
+}
+?>
   <table data-base-target="_next" class="action">
     <tbody>
     <?php foreach ($history as $event): ?>

From 58b93101c70af2b2c1dc95a230b4584320dca322 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:18:56 +0200
Subject: [PATCH 1295/2920] multiselect views: Ensure dashboard compliance

refs #7876
---
 .../monitoring/application/views/scripts/hosts/show.phtml    | 5 ++++-
 .../views/scripts/partials/host/objects-header.phtml         | 3 ---
 .../views/scripts/partials/service/objects-header.phtml      | 3 ---
 .../monitoring/application/views/scripts/services/show.phtml | 5 ++++-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 5c00cf827..9d532d6dd 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -1,9 +1,12 @@
 <div class="controls">
+  <?php if (! $this->compact): ?>
+    <?= $tabs; ?>
+  <?php endif ?>
     <?= $this->render('partials/host/objects-header.phtml'); ?>
 </div>
 <div class="content">
     <?php if (($hostCount = count($objects)) === 0): ?>
-        <?= $this->translate('No hosts matching the filter'); ?>
+        <?= $this->translate('No hosts found matching the filter'); ?>
     <?php else: ?>
         <h3><?= sprintf($this->translatePlural('%u Host', '%u Hosts', $hostCount), $hostCount); ?></h3>
         <div><?= $this->qlink(
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index f5edd0213..838a78dd8 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -1,6 +1,3 @@
-<?php if (! $this->compact): ?>
-    <?= $tabs; ?>
-<?php endif ?>
 <?php if (($hostCount = count($objects)) > 0): ?>
 <div class="hbox-item">
     <strong><?= sprintf($this->translatePlural('Host (%u)', 'Hosts (%u)', $hostCount), $hostCount); ?></strong>
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index 1ac27b934..25a7117dd 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -1,6 +1,3 @@
-<?php if (! $this->compact): ?>
-    <?= $tabs; ?>
-<?php endif ?>
 <?php if (($serviceCount = count($objects)) > 0): ?>
 <div class="hbox">
     <div class="hbox-item" style="width: 6em;">
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index a71e32792..8bf45a32c 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -1,9 +1,12 @@
 <div class="controls">
+  <?php if (! $this->compact): ?>
+    <?= $tabs; ?>
+  <?php endif ?>
     <?= $this->render('partials/service/objects-header.phtml'); ?>
 </div>
 <div class="content">
     <?php if (($serviceCount = count($objects)) === 0): ?>
-        <?= $this->translate('No services matching the filter'); ?>
+        <?= $this->translate('No services found matching the filter'); ?>
     <?php else: ?>
         <h3><?= sprintf($this->translatePlural('%u Service', '%u Services', $serviceCount), $serviceCount); ?></h3>
         <div><?= $this->qlink(

From b2246c2aff322ac8800dde80564b3e82a67f92c5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:19:30 +0200
Subject: [PATCH 1296/2920] host/show: Ensure dashboard compliance

refs #7876
---
 modules/monitoring/application/views/scripts/host/show.phtml  | 3 +++
 .../views/scripts/partials/host/object-header.phtml           | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/host/show.phtml b/modules/monitoring/application/views/scripts/host/show.phtml
index 867692301..32389515b 100644
--- a/modules/monitoring/application/views/scripts/host/show.phtml
+++ b/modules/monitoring/application/views/scripts/host/show.phtml
@@ -1,4 +1,7 @@
 <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>
diff --git a/modules/monitoring/application/views/scripts/partials/host/object-header.phtml b/modules/monitoring/application/views/scripts/partials/host/object-header.phtml
index 69d0f62f5..0efedf328 100644
--- a/modules/monitoring/application/views/scripts/partials/host/object-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/object-header.phtml
@@ -1,11 +1,7 @@
 <?php
-
 use Icinga\Module\Monitoring\Object\Host;
 
 ?>
-<?php if (! $this->compact): ?>
-    <?= $tabs; ?>
-<?php endif ?>
 <table class="objectstate">
     <tr class="state <?= Host::getStateText($object->host_state); ?><?= $object->host_handled ? ' handled' : ''; ?>">
         <td class="state">

From b9f9ea614236e8a65bad6698091aede4fcf97cb7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:19:38 +0200
Subject: [PATCH 1297/2920] service/show: Ensure dashboard compliance

refs #7876
---
 .../views/scripts/partials/service/object-header.phtml        | 4 ----
 .../monitoring/application/views/scripts/service/show.phtml   | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/service/object-header.phtml b/modules/monitoring/application/views/scripts/partials/service/object-header.phtml
index 5f3ccb70f..45111fe1e 100644
--- a/modules/monitoring/application/views/scripts/partials/service/object-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/object-header.phtml
@@ -1,12 +1,8 @@
 <?php
-
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
 ?>
-<?php if (! $this->compact): ?>
-    <?= $tabs; ?>
-<?php endif ?>
 <table class="objectstate">
     <tr class="state <?= Host::getStateText($object->host_state); ?><?= $object->host_handled ? ' handled' : ''; ?>">
         <td class="state">
diff --git a/modules/monitoring/application/views/scripts/service/show.phtml b/modules/monitoring/application/views/scripts/service/show.phtml
index 3a09e2bf4..4d33644ce 100644
--- a/modules/monitoring/application/views/scripts/service/show.phtml
+++ b/modules/monitoring/application/views/scripts/service/show.phtml
@@ -1,4 +1,7 @@
 <div class="controls">
+  <?php if (! $this->compact): ?>
+    <?= $this->tabs; ?>
+  <?php endif ?>
     <?= $this->render('partials/service/object-header.phtml') ?>
     <h1><?= $this->translate("Service detail information") ?></h1>
 </div>

From 78e4df2ce99a6ff3f8b8b734479564f9c5bce4a0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:20:06 +0200
Subject: [PATCH 1298/2920] monitoring health views: Ensure dashboard
 compliance

refs #7876
---
 .../views/scripts/process/disable-notifications.phtml       | 4 +++-
 .../monitoring/application/views/scripts/process/info.phtml | 6 +++---
 .../application/views/scripts/process/not-running.phtml     | 4 +++-
 .../application/views/scripts/process/performance.phtml     | 5 +++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/process/disable-notifications.phtml b/modules/monitoring/application/views/scripts/process/disable-notifications.phtml
index 9b9a2b133..e8c75e53f 100644
--- a/modules/monitoring/application/views/scripts/process/disable-notifications.phtml
+++ b/modules/monitoring/application/views/scripts/process/disable-notifications.phtml
@@ -1,6 +1,8 @@
+<?php if (! $this->compact): ?>
 <div class="controls">
-    <?= $this->tabs->showOnlyCloseButton() ?>
+    <?= $this->tabs->showOnlyCloseButton(); ?>
 </div>
+<?php endif ?>
 <div class="content">
     <h1><?= $title; ?></h1>
     <?php if ((bool) $programStatus->notifications_enabled === false): ?>
diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml
index 835228814..8cb5aebe1 100644
--- a/modules/monitoring/application/views/scripts/process/info.phtml
+++ b/modules/monitoring/application/views/scripts/process/info.phtml
@@ -1,12 +1,12 @@
 <?php
-
 $rv = $this->runtimeVariables()->create($this->runtimevariables);
 $cp = $this->checkPerformance()->create($this->checkperformance);
 
-?>
+if (! $this->compact): ?>
 <div class="controls">
-    <?= $this->tabs ?>
+    <?= $this->tabs; ?>
 </div>
+<?php endif ?>
 
 <div class="content processinfo">
     <div class="boxview">
diff --git a/modules/monitoring/application/views/scripts/process/not-running.phtml b/modules/monitoring/application/views/scripts/process/not-running.phtml
index 58b6c2980..8439fc49e 100644
--- a/modules/monitoring/application/views/scripts/process/not-running.phtml
+++ b/modules/monitoring/application/views/scripts/process/not-running.phtml
@@ -1,6 +1,8 @@
+<?php if (! $this->compact): ?>
 <div class="controls">
-    <?= $this->tabs ?>
+    <?= $this->tabs; ?>
 </div>
+<?php endif ?>
 <div class="content">
     <?= sprintf($this->translate('%s is currently not up and running'), $this->backendName) ?>
 </div>
diff --git a/modules/monitoring/application/views/scripts/process/performance.phtml b/modules/monitoring/application/views/scripts/process/performance.phtml
index 6276d76d1..0bff8891f 100644
--- a/modules/monitoring/application/views/scripts/process/performance.phtml
+++ b/modules/monitoring/application/views/scripts/process/performance.phtml
@@ -1,7 +1,8 @@
+<?php if (! $this->compact): ?>
 <div class="controls">
-<?= $this->tabs ?>
+    <?= $this->tabs; ?>
 </div>
-<?php
+<?php endif;
 
 $rv = $this->runtimeVariables()->create($this->runtimevariables);
 $cp = $this->checkPerformance()->create($this->checkperformance);

From c099b7ddd70e9ae5c0ff3824eab9614961653dca Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:20:22 +0200
Subject: [PATCH 1299/2920] eventgrid: Ensure dashboard compliance

refs #7876
---
 .../views/scripts/list/eventgrid.phtml        | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/eventgrid.phtml b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
index 1af75caf9..6936e9063 100644
--- a/modules/monitoring/application/views/scripts/list/eventgrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
@@ -1,21 +1,25 @@
 <?php
 use Icinga\Data\Filter\Filter;
 use Icinga\Web\Widget\Chart\HistoryColorGrid;
-?>
-
-
-<? if (! $compact): ?>
-    <div class="controls">
-        <?= $this->tabs->render($this); ?>
-        <div class="fake-controls">
-            <?= $form ?>
-        </div>
-    </div>
-<? endif; ?>
 
+if (! $this->compact): ?>
+<div class="controls">
+  <?= $this->tabs; ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
+  <?= $form; ?>
+</div>
+<?php endif ?>
 <div class="content" data-base-target="_next">
 <?php
 
+if (count($summary) === 0) {
+    echo $this->translate('No state changes in the selected time period.') . '</div>';
+    return;
+}
+
 $settings = array(
     'cnt_up' => array(
         'tooltip' => $this->translate('%d hosts ok on %s'),
@@ -63,11 +67,8 @@ $to = intval($form->getValue('to', time()));
 if ($to - $from > 315360000) {
     $from = $to - 315360000;
 }
-$data = array();
 
-if (count($summary) === 0) {
-    echo $this->translate('No state changes in the selected time period.');
-}
+$data = array();
 foreach ($summary as $entry) {
     $day = $entry->day;
     $value = $entry->$column;

From 14a555629d8016955c5f4642ac357f6ef3629c3c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:20:29 +0200
Subject: [PATCH 1300/2920] servicegrid: Ensure dashboard compliance

refs #7876
---
 .../views/scripts/list/servicegrid.phtml      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
index a2e7502ea..6fb6db63e 100644
--- a/modules/monitoring/application/views/scripts/list/servicegrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
@@ -1,28 +1,28 @@
 <?php
-
 use Icinga\Module\Monitoring\Object\Service;
 
-?>
-<?php if (!$this->compact): ?>
+if (! $this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
-  <div style="margin: 1em;" class="dontprint">
-    <?= $this->translate('Sort by'); ?> <?= $this->sortControl; ?>
-  </div>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
 </div>
 <?php endif ?>
 <div class="content" data-base-target="_next">
-  <table class="pivot servicestates">
 <?php
+
 $hasHeader = false;
 $pivotData = $this->pivot->toArray();
+if (count($pivotData) === 0) {
+    echo $this->translate('No services found matching the filter') . '</div>';
+    return;
+}
+
 $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . ')';
 ?>
-
-<?php if (count($pivotData) === 0): ?>
-    <?= $this->translate('No Services matching the filter'); ?>
-<?php endif ?>
-
+  <table class="pivot servicestates">
 <?php foreach ($pivotData as $host_name => $serviceStates): ?>
 <?php if (!$hasHeader): ?>
     <thead>

From dbf471feac723f77aa159e76cb968490b924f521 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:21:14 +0200
Subject: [PATCH 1301/2920] Use the helper to setup the FilterEditor widget

refs #7876
---
 modules/monitoring/application/controllers/ListController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index a6c38c2e1..78c88dabc 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -689,7 +689,7 @@ class Monitoring_ListController extends Controller
             ->handleRequest($this->getRequest());
         $query->applyFilter($editor->getFilter());
 
-        $this->view->filterEditor = $editor;
+        $this->setupFilterControl($editor);
         $this->view->filter = $editor->getFilter();
 
         if ($sort = $this->params->get('sort')) {

From 8dba5752dcb43c9da8008bccdb8576b9419b372f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 10:09:33 +0200
Subject: [PATCH 1302/2920] ModuleManager: Improve error messages when
 en-/disabling modules

---
 .../Icinga/Application/Modules/Manager.php    | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php
index 8f48d7b77..90e55f0b4 100644
--- a/library/Icinga/Application/Modules/Manager.php
+++ b/library/Icinga/Application/Modules/Manager.php
@@ -12,7 +12,6 @@ use Icinga\Exception\ConfigurationError;
 use Icinga\Exception\SystemPermissionException;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Exception\NotReadableError;
-use Icinga\Exception\NotFoundError;
 
 /**
  * Module manager that handles detecting, enabling and disabling of modules
@@ -199,7 +198,6 @@ class Manager
      *
      * @return  $this
      * @throws  ConfigurationError          When trying to enable a module that is not installed
-     * @throws  NotFoundError               In case the "enabledModules" directory does not exist
      * @throws  SystemPermissionException   When insufficient permissions for the application exist
      */
     public function enableModule($name)
@@ -218,14 +216,15 @@ class Manager
         if (! is_dir($this->enableDir) && !@mkdir($this->enableDir, 02770, true)) {
             $error = error_get_last();
             throw new SystemPermissionException(
-                'Failed to create enabledModule directory "%s" (%s)',
+                'Failed to create enabledModules directory "%s" (%s)',
                 $this->enableDir,
                 $error['message']
             );
         } elseif (! is_writable($this->enableDir)) {
             throw new SystemPermissionException(
-                'Cannot enable module "%s". Insufficient system permissions for enabling modules.',
-                $name
+                'Cannot enable module "%s". Check the permissions for the enabledModules directory: %s',
+                $name,
+                $this->enableDir
             );
         }
 
@@ -237,10 +236,11 @@ class Manager
             $error = error_get_last();
             if (strstr($error["message"], "File exists") === false) {
                 throw new SystemPermissionException(
-                    'Could not enable module "%s" due to file system errors. '
+                    'Cannot enable module "%s" at %s due to file system errors. '
                     . 'Please check path and mounting points because this is not a permission error. '
                     . 'Primary error was: %s',
                     $name,
+                    $this->enableDir,
                     $error['message']
                 );
             }
@@ -259,32 +259,37 @@ class Manager
      * @return  $this
      *
      * @throws  ConfigurationError          When the module is not installed or it's not a symlink
-     * @throws  SystemPermissionException   When the module can't be disabled
+     * @throws  SystemPermissionException   When insufficient permissions for the application exist
      */
     public function disableModule($name)
     {
         if (! $this->hasEnabled($name)) {
             return $this;
         }
+
         if (! is_writable($this->enableDir)) {
             throw new SystemPermissionException(
-                'Could not disable module. Module path is not writable.'
+                'Cannot disable module "%s". Check the permissions for the enabledModules directory: %s',
+                $name,
+                $this->enableDir
             );
         }
+
         $link = $this->enableDir . DIRECTORY_SEPARATOR . $name;
         if (! file_exists($link)) {
             throw new ConfigurationError(
-                'Could not disable module. The module %s was not found.',
+                'Cannot disable module "%s". Module is not installed.',
                 $name
             );
         }
         if (! is_link($link)) {
             throw new ConfigurationError(
-                'Could not disable module. The module "%s" is not a symlink. '
+                'Cannot disable module %s at %s. '
                 . 'It looks like you have installed this module manually and moved it to your module folder. '
                 . 'In order to dynamically enable and disable modules, you have to create a symlink to '
-                . 'the enabled_modules folder.',
-                $name
+                . 'the enabledModules folder.',
+                $name,
+                $this->enableDir
             );
         }
 
@@ -292,10 +297,11 @@ class Manager
             if (! @unlink($link)) {
                 $error = error_get_last();
                 throw new SystemPermissionException(
-                    'Could not disable module "%s" due to file system errors. '
+                    'Cannot enable module "%s" at %s due to file system errors. '
                     . 'Please check path and mounting points because this is not a permission error. '
                     . 'Primary error was: %s',
                     $name,
+                    $this->enableDir,
                     $error['message']
                 );
             }

From ce6be0cc0f8242885d625aab2dbd8b044b1f5753 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 20 Apr 2015 11:11:35 +0200
Subject: [PATCH 1303/2920] Only use JS tooltips when non-native tooltip
 behavior is required

Only display JS tooltips when there are specific requirements for delay, there is a specific alignment or HTML markup can be rendered in the tooltip.

fixes #9025
---
 public/js/icinga/behavior/tooltip.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/public/js/icinga/behavior/tooltip.js b/public/js/icinga/behavior/tooltip.js
index d3dc6c539..e0826b005 100644
--- a/public/js/icinga/behavior/tooltip.js
+++ b/public/js/icinga/behavior/tooltip.js
@@ -31,15 +31,25 @@
         $('i[title]', el).tipsy({ gravity: $.fn.tipsy.autoNS, offset: 2 });
         $('[title]', el).each(function (i, el) {
            var $el = $(el);
-           var delay = 500;
+           var delay, gravity;
            if ($el.data('tooltip-delay') !== undefined) {
                delay = $el.data('tooltip-delay');
            }
-           var gravity = $.fn.tipsy.autoNS;
            if ($el.data('tooltip-gravity')) {
                gravity = $el.data('tooltip-gravity');
            }
-           $el.tipsy({ gravity: gravity, delayIn: delay });
+           if (delay === undefined &&
+               gravity === undefined &&
+               !$el.data('title-rich')) {
+               // use native tooltips for everything that doesn't
+               // require specific behavior or html markup
+               return;
+           }
+           delay = delay === undefined ? 500 : delay;
+           $el.tipsy({
+               gravity: gravity || $.fn.tipsy.autoNS,
+               delayIn: delay
+           });
         });
 
         // migrate or remove all orphaned tooltips

From 423b92f8dce5b2e4cf7b0dd18d2e581fa93fa3fd Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 20 Apr 2015 12:02:17 +0200
Subject: [PATCH 1304/2920] Remove gravity settings from servicegrid

refs #9025
---
 .../application/views/scripts/list/servicegrid.phtml           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
index 9219e5dda..a2e7502ea 100644
--- a/modules/monitoring/application/views/scripts/list/servicegrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
@@ -50,8 +50,7 @@ foreach ($serviceDescriptions as $service_description): ?>
                   'service_description' => $service_description
                 ),
                 array(
-                  'title' => sprintf($this->translate('List all services with the name "%s" on all reported hosts'), $service_description),
-                  'data-tooltip-gravity' => 's'
+                  'title' => sprintf($this->translate('List all services with the name "%s" on all reported hosts'), $service_description)
                 ),
                 false
               ); ?>

From 593ea7add5d3e5e6803a4950552fbd137841e140 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 20 Apr 2015 13:02:12 +0200
Subject: [PATCH 1305/2920] Move monitoring module renderers from global module
 to monitoring module

refs #7642
---
 .../library/Monitoring}/Web/Menu/MonitoringMenuItemRenderer.php   | 0
 .../library/Monitoring}/Web/Menu/ProblemMenuItemRenderer.php      | 0
 .../Monitoring}/Web/Menu/UnhandledHostMenuItemRenderer.php        | 0
 .../Monitoring}/Web/Menu/UnhandledServiceMenuItemRenderer.php     | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename {library/Icinga => modules/monitoring/library/Monitoring}/Web/Menu/MonitoringMenuItemRenderer.php (100%)
 rename {library/Icinga => modules/monitoring/library/Monitoring}/Web/Menu/ProblemMenuItemRenderer.php (100%)
 rename {library/Icinga => modules/monitoring/library/Monitoring}/Web/Menu/UnhandledHostMenuItemRenderer.php (100%)
 rename {library/Icinga => modules/monitoring/library/Monitoring}/Web/Menu/UnhandledServiceMenuItemRenderer.php (100%)

diff --git a/library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php b/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php
similarity index 100%
rename from library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php
rename to modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php
diff --git a/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php b/modules/monitoring/library/Monitoring/Web/Menu/ProblemMenuItemRenderer.php
similarity index 100%
rename from library/Icinga/Web/Menu/ProblemMenuItemRenderer.php
rename to modules/monitoring/library/Monitoring/Web/Menu/ProblemMenuItemRenderer.php
diff --git a/library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php b/modules/monitoring/library/Monitoring/Web/Menu/UnhandledHostMenuItemRenderer.php
similarity index 100%
rename from library/Icinga/Web/Menu/UnhandledHostMenuItemRenderer.php
rename to modules/monitoring/library/Monitoring/Web/Menu/UnhandledHostMenuItemRenderer.php
diff --git a/library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php b/modules/monitoring/library/Monitoring/Web/Menu/UnhandledServiceMenuItemRenderer.php
similarity index 100%
rename from library/Icinga/Web/Menu/UnhandledServiceMenuItemRenderer.php
rename to modules/monitoring/library/Monitoring/Web/Menu/UnhandledServiceMenuItemRenderer.php

From 4b43fbe5276219499bca90c2f36a29a70b5997d5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 13:03:13 +0200
Subject: [PATCH 1306/2920] Host- and Service multiselection: Ensure dashboard
 compliance

refs #7876
---
 .../monitoring/application/controllers/HostsController.php    | 2 +-
 .../monitoring/application/controllers/ServicesController.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 27d26e51b..7ffd02394 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -26,7 +26,7 @@ class Monitoring_HostsController extends Controller
     public function init()
     {
         $hostList = new HostList($this->backend);
-        $hostList->setFilter(Filter::fromQueryString((string) $this->params));
+        $hostList->setFilter(Filter::fromQueryString((string) $this->params->without('view')));
         $this->hostList = $hostList;
     }
 
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index b82d6f00e..d902b3b75 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -27,7 +27,9 @@ class Monitoring_ServicesController extends Controller
     public function init()
     {
         $serviceList = new ServiceList($this->backend);
-        $serviceList->setFilter(Filter::fromQueryString((string) $this->params->without('service_problem', 'service_handled')));
+        $serviceList->setFilter(Filter::fromQueryString(
+            (string) $this->params->without('service_problem', 'service_handled', 'view')
+        ));
         $this->serviceList = $serviceList;
     }
 

From c76e4e35837326538d64afcde0f1ad68bc681d1a Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 20 Apr 2015 13:05:23 +0200
Subject: [PATCH 1307/2920] Change the global namespace to the module specific
 namespace

refs #7642
---
 .../Monitoring/Web/Menu/MonitoringMenuItemRenderer.php       | 5 +++--
 .../library/Monitoring/Web/Menu/ProblemMenuItemRenderer.php  | 2 +-
 .../Monitoring/Web/Menu/UnhandledHostMenuItemRenderer.php    | 4 +---
 .../Monitoring/Web/Menu/UnhandledServiceMenuItemRenderer.php | 4 +---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php b/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php
index 33e1c6a60..7df80e034 100644
--- a/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php
+++ b/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php
@@ -1,10 +1,11 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Web\Menu;
+namespace Icinga\Module\Monitoring\Web\Menu;
 
+use Icinga\Web\Menu as Menu;
 use Icinga\Module\Monitoring\Backend\MonitoringBackend;
-use Icinga\Web\Menu;
+use Icinga\Web\Menu\MenuItemRenderer;
 use Icinga\Web\Url;
 
 class MonitoringMenuItemRenderer implements MenuItemRenderer {
diff --git a/modules/monitoring/library/Monitoring/Web/Menu/ProblemMenuItemRenderer.php b/modules/monitoring/library/Monitoring/Web/Menu/ProblemMenuItemRenderer.php
index c72d7718e..d17431398 100644
--- a/modules/monitoring/library/Monitoring/Web/Menu/ProblemMenuItemRenderer.php
+++ b/modules/monitoring/library/Monitoring/Web/Menu/ProblemMenuItemRenderer.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Web\Menu;
+namespace Icinga\Module\Monitoring\Web\Menu;
 
 class ProblemMenuItemRenderer extends MonitoringMenuItemRenderer
 {
diff --git a/modules/monitoring/library/Monitoring/Web/Menu/UnhandledHostMenuItemRenderer.php b/modules/monitoring/library/Monitoring/Web/Menu/UnhandledHostMenuItemRenderer.php
index 8f8fe64e5..a4692745b 100644
--- a/modules/monitoring/library/Monitoring/Web/Menu/UnhandledHostMenuItemRenderer.php
+++ b/modules/monitoring/library/Monitoring/Web/Menu/UnhandledHostMenuItemRenderer.php
@@ -1,9 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Web\Menu;
-
-use Icinga\Web\Menu;
+namespace Icinga\Module\Monitoring\Web\Menu;
 
 class UnhandledHostMenuItemRenderer extends MonitoringMenuItemRenderer
 {
diff --git a/modules/monitoring/library/Monitoring/Web/Menu/UnhandledServiceMenuItemRenderer.php b/modules/monitoring/library/Monitoring/Web/Menu/UnhandledServiceMenuItemRenderer.php
index fdddf529c..0c72cf47e 100644
--- a/modules/monitoring/library/Monitoring/Web/Menu/UnhandledServiceMenuItemRenderer.php
+++ b/modules/monitoring/library/Monitoring/Web/Menu/UnhandledServiceMenuItemRenderer.php
@@ -1,9 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Web\Menu;
-
-use Icinga\Web\Menu;
+namespace Icinga\Module\Monitoring\Web\Menu;
 
 class UnhandledServiceMenuItemRenderer extends MonitoringMenuItemRenderer
 {

From 5196f16bdeef69d408a45e56fe26cdbc61df76b7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 13:06:45 +0200
Subject: [PATCH 1308/2920] Do not forcibly hide controls in the dashboard

Our views respect view=compact now entirely so there is no need for such
a generic "solution" since it also prevents some views from being
completely displayed in the dashboard such as the host, service and
contact detail view.

refs #7876
---
 public/css/icinga/layout-structure.less | 2 +-
 public/js/icinga/ui.js                  | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 23a598b52..9d0d38def 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -163,7 +163,7 @@ html {
 }
 
 .dashboard .controls {
-  display: none;
+  padding: 0;
 }
 
 /* Not growing larger than 3840px at 1em=16px right now */
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index 2c85a2df9..3bfb87c61 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -716,8 +716,6 @@
         },
 
         initializeControls: function (parent) {
-
-            var self = this;
             if ($(parent).closest('.dashboard').length) {
                 return;
             }
@@ -747,7 +745,6 @@
         },
 
         fixControls: function ($parent) {
-
             var self = this;
 
             if ('undefined' === typeof $parent) {
@@ -773,6 +770,11 @@
 
             $('.controls', $parent).each(function (idx, el) {
                 var $el = $(el);
+
+                if ($el.closest('.dashboard').length) {
+                    return;
+                }
+
                 var $fake = $el.next('.fake-controls');
                 var y = $parent.scrollTop();
 

From a9819907ed934c94245dd6a42466824ebfcb5fa3 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 20 Apr 2015 13:08:49 +0200
Subject: [PATCH 1309/2920] Add namespaced item renderer class loader

refs #7642
---
 library/Icinga/Web/Menu.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index e95f14c88..056e2ff88 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -117,13 +117,17 @@ class Menu implements RecursiveIterator
             foreach ($props as $key => $value) {
                 $method = 'set' . implode('', array_map('ucfirst', explode('_', strtolower($key))));
                 if ($key === 'renderer') {
-                    $class = '\Icinga\Web\Menu\\' . $value;
-                    if (!class_exists($class)) {
-                        throw new ConfigurationError(
-                            sprintf('ItemRenderer with class "%s" does not exist', $class)
-                        );
+                    if (class_exists($value)) {
+                        $value = new $value;
+                    } else {
+                        $class = '\Icinga\Web\Menu\\' . $value;
+                        if (!class_exists($class)) {
+                            throw new ConfigurationError(
+                                sprintf('ItemRenderer with class "%s" does not exist', $class)
+                            );
+                        }
+                        $value = new $class;
                     }
-                    $value = new $class;
                 }
                 if (method_exists($this, $method)) {
                     $this->{$method}($value);

From c43947d66648a76b3ff9c8c1279e8b9dc407f8f0 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 20 Apr 2015 13:11:52 +0200
Subject: [PATCH 1310/2920] Update renderer property definition for problems
 section

refs #7642
---
 modules/monitoring/configuration.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index 05fa86148..a7f8047c4 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -94,17 +94,17 @@ $this->provideSearchUrl($this->translate('Servicegroups'), 'monitoring/list/serv
  * Problems Section
  */
 $section = $this->menuSection($this->translate('Problems'), array(
-    'renderer'  => 'ProblemMenuItemRenderer',
+    'renderer'  => 'Icinga\Module\Monitoring\Web\Menu\ProblemMenuItemRenderer',
     'icon'      => 'block',
     'priority'  => 20
 ));
 $section->add($this->translate('Unhandled Hosts'), array(
-    'renderer'  => 'UnhandledHostMenuItemRenderer',
+    'renderer'  => 'Icinga\Module\Monitoring\Web\Menu\UnhandledHostMenuItemRenderer',
     'url'       => 'monitoring/list/hosts?host_problem=1&host_handled=0',
     'priority'  => 30
 ));
 $section->add($this->translate('Unhandled Services'), array(
-    'renderer'  => 'UnhandledServiceMenuItemRenderer',
+    'renderer'  => 'Icinga\Module\Monitoring\Web\Menu\UnhandledServiceMenuItemRenderer',
     'url'       => 'monitoring/list/services?service_problem=1&service_handled=0&sort=service_severity',
     'priority'  => 40
 ));

From 8b18c5a60a6873122bc4c38871e0096dce1b2ffb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 13:18:36 +0200
Subject: [PATCH 1311/2920] Fix parameters to ignore when setting a filter for
 the ServiceList

refs #7876
---
 .../monitoring/application/controllers/ServicesController.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index d902b3b75..0f94e91aa 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -28,7 +28,7 @@ class Monitoring_ServicesController extends Controller
     {
         $serviceList = new ServiceList($this->backend);
         $serviceList->setFilter(Filter::fromQueryString(
-            (string) $this->params->without('service_problem', 'service_handled', 'view')
+            (string) $this->params->without(array('service_problem', 'service_handled', 'view'))
         ));
         $this->serviceList = $serviceList;
     }

From 76305269a91f410575baf3fb65971e5b89d2b7bb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 13:18:57 +0200
Subject: [PATCH 1312/2920] Hide the top margin for group views in the
 dashboard

refs #7876
---
 public/css/icinga/monitoring-colors.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index 5c19bfe35..8ab95b3cc 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -814,6 +814,10 @@ div.timeline {
 
 /* Monitoring groupsummary styles */
 
+.dashboard table.groupview {
+  margin-top: 0;
+}
+
 table.groupview {
   width: 100%;
   margin-top: 1em;

From 7bc07c4368c539727c41d215150b27789297ff6e Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 20 Apr 2015 13:21:37 +0200
Subject: [PATCH 1313/2920] Force absolute nampesace for module menu item
 renderer

refs #7642
---
 library/Icinga/Web/Menu.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 056e2ff88..bca1e17d1 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -117,10 +117,11 @@ class Menu implements RecursiveIterator
             foreach ($props as $key => $value) {
                 $method = 'set' . implode('', array_map('ucfirst', explode('_', strtolower($key))));
                 if ($key === 'renderer') {
+                    $value = '\\' . ltrim($value, '\\');
                     if (class_exists($value)) {
                         $value = new $value;
                     } else {
-                        $class = '\Icinga\Web\Menu\\' . $value;
+                        $class = '\Icinga\Web\Menu' . $value;
                         if (!class_exists($class)) {
                             throw new ConfigurationError(
                                 sprintf('ItemRenderer with class "%s" does not exist', $class)

From 0be8b8997b1cf4dd8e4ca49d1584b6710ff596e1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 13:25:29 +0200
Subject: [PATCH 1314/2920] Timeline: Do not enable infinite scrolling when
 shown in the dashboard

refs #7876
---
 modules/monitoring/public/js/module.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/public/js/module.js b/modules/monitoring/public/js/module.js
index 03cfc1c3d..3421be2cf 100644
--- a/modules/monitoring/public/js/module.js
+++ b/modules/monitoring/public/js/module.js
@@ -44,7 +44,8 @@
       /**
        * Prepare the timer to handle the timeline's infinite loading
        */
-      if ($('div.timeline').length) {
+      var $timeline = $('div.timeline');
+      if ($timeline.length && !$timeline.closest('.dashboard').length) {
         if (this.scrollCheckTimer === null) {
           this.scrollCheckTimer = this.module.icinga.timer.register(
             this.checkTimelinePosition,

From 6b3dd63bb344bf45116e5513264b3f4c5b21520f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 14:55:18 +0200
Subject: [PATCH 1315/2920] Doc module: Fix div.controls of the index
 controller's index action

refs #7876
---
 modules/doc/application/views/scripts/index/index.phtml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/doc/application/views/scripts/index/index.phtml b/modules/doc/application/views/scripts/index/index.phtml
index 0b98623ac..67ee52ac1 100644
--- a/modules/doc/application/views/scripts/index/index.phtml
+++ b/modules/doc/application/views/scripts/index/index.phtml
@@ -1,6 +1,7 @@
-<div class="controls"></div>
+<div class="controls">
     <?= /** @var \Icinga\Web\Widget\Tabs $tabs */ $tabs->showOnlyCloseButton(); ?>
     <h1><?= $this->translate('Available documentations'); ?></h1>
+</div>
 <div class="content">
     <ul>
         <li><?= $this->qlink(

From 0997eaf45935b5252cf5a3467938a05ea3b6cd84 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 14:56:30 +0200
Subject: [PATCH 1316/2920] Host detail view: Fix that the list of services is
 missing all tabs

refs #7876
---
 .../monitoring/application/views/scripts/show/services.phtml   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/show/services.phtml b/modules/monitoring/application/views/scripts/show/services.phtml
index 57b4b204e..d3a0c3ef8 100644
--- a/modules/monitoring/application/views/scripts/show/services.phtml
+++ b/modules/monitoring/application/views/scripts/show/services.phtml
@@ -1,4 +1,7 @@
 <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>

From 1ff9449ad7a23a1f32b237938ba14d6fcac88b00 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 14:58:25 +0200
Subject: [PATCH 1317/2920] List views: Show the output and dashboard actions
 for all views

refs #7876
---
 application/controllers/ListController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index 985c53512..972573dc1 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -3,6 +3,8 @@
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Web\Url;
+use Icinga\Web\Widget\Tabextension\DashboardAction;
+use Icinga\Web\Widget\Tabextension\OutputFormat;
 use Icinga\Application\Config;
 use Icinga\Application\Logger;
 use Icinga\Data\ConfigObject;
@@ -29,7 +31,7 @@ class ListController extends Controller
                     'list/'
                     . str_replace(' ', '', $action)
                 )
-        ))->activate($action);
+        ))->extend(new OutputFormat())->extend(new DashboardAction())->activate($action);
     }
 
     /**

From 48df225f987a0bf3140b28735558f0fd8c04ac12 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 14:58:47 +0200
Subject: [PATCH 1318/2920] Alertsummary: Add dashboard action

refs #7876
---
 .../application/controllers/AlertsummaryController.php         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index aea8def93..dcc805286 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -6,6 +6,7 @@ use Icinga\Chart\Unit\LinearUnit;
 use Icinga\Chart\Unit\StaticAxis;
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Web\Widget\SelectBox;
+use Icinga\Web\Widget\Tabextension\DashboardAction;
 use Icinga\Web\Url;
 
 class Monitoring_AlertsummaryController extends Controller
@@ -44,7 +45,7 @@ class Monitoring_AlertsummaryController extends Controller
                 'label' => $this->translate('Alert Summary'),
                 'url'   => Url::fromRequest()
             )
-        )->activate('alertsummary');
+        )->extend(new DashboardAction())->activate('alertsummary');
         $this->view->title = $this->translate('Alert Summary');
 
         $this->view->intervalBox = $this->createIntervalBox();

From 4e27ff962cfaaa35cd62f8d505020070e9c623ae Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 14:59:05 +0200
Subject: [PATCH 1319/2920] Host multiselection view: Add dashboard action

refs #7876
---
 modules/monitoring/application/controllers/HostsController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 7ffd02394..e208da312 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -15,6 +15,7 @@ use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\HostList;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Chart\InlinePie;
+use Icinga\Web\Widget\Tabextension\DashboardAction;
 
 class Monitoring_HostsController extends Controller
 {
@@ -80,7 +81,7 @@ class Monitoring_HostsController extends Controller
                 'label' => $this->translate('Hosts'),
                 'url'   => Url::fromRequest()
             )
-        )->activate('show');
+        )->extend(new DashboardAction())->activate('show');
         $this->setAutorefreshInterval(15);
         $checkNowForm = new CheckNowCommandForm();
         $checkNowForm

From 41222fd34ebe1301b9853335598dc10f32a0f9a9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 14:59:20 +0200
Subject: [PATCH 1320/2920] Service multiselection view: Add dashboard action

refs #7876
---
 .../monitoring/application/controllers/ServicesController.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 0f94e91aa..8aa27272a 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -16,6 +16,7 @@ use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Module\Monitoring\Object\ServiceList;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Chart\InlinePie;
+use Icinga\Web\Widget\Tabextension\DashboardAction;
 
 class Monitoring_ServicesController extends Controller
 {
@@ -103,7 +104,7 @@ class Monitoring_ServicesController extends Controller
                 'label' => $this->translate('Services'),
                 'url'   => Url::fromRequest()
             )
-        )->activate('show');
+        )->extend(new DashboardAction())->activate('show');
         $this->setAutorefreshInterval(15);
         $checkNowForm = new CheckNowCommandForm();
         $checkNowForm

From a4f08067e4b8da9e85d872d610d76c90011f2c24 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 14:59:32 +0200
Subject: [PATCH 1321/2920] Applicationlog: : Add dashboard action

refs #7876
---
 .../application/controllers/ListController.php        | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 78c88dabc..9eb014421 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -728,15 +728,6 @@ class Monitoring_ListController extends Controller
      */
     private function createTabs()
     {
-        $tabs = $this->getTabs();
-        if (in_array($this->_request->getActionName(), array(
-            'hosts',
-            'services',
-            'eventhistory',
-            'eventgrid',
-            'notifications'
-        ))) {
-            $tabs->extend(new OutputFormat())->extend(new DashboardAction());
-        }
+        $this->getTabs()->extend(new OutputFormat())->extend(new DashboardAction());
     }
 }

From 48f9cf61e7ce785a439ec42e13b020bcc841a476 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 14:59:44 +0200
Subject: [PATCH 1322/2920] Monitoring health view: Add dashboard action

refs #7876
---
 .../monitoring/application/controllers/ProcessController.php   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php
index b20bd7576..a07ac5f3a 100644
--- a/modules/monitoring/application/controllers/ProcessController.php
+++ b/modules/monitoring/application/controllers/ProcessController.php
@@ -1,6 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
+use Icinga\Web\Widget\Tabextension\DashboardAction;
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Forms\Command\Instance\DisableNotificationsExpireCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Instance\ToggleInstanceFeaturesCommandForm;
@@ -29,7 +30,7 @@ class Monitoring_ProcessController extends Controller
                     'label' => $this->translate('Monitoring Health'),
                     'url'   =>'monitoring/process/info'
                 )
-            );
+            )->extend(new DashboardAction());
     }
 
     /**

From a3eb6e37f294df32fabff10920268ec808acf685 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 14:59:54 +0200
Subject: [PATCH 1323/2920] Tactical overview: Add dashboard action

refs #7876
---
 .../monitoring/application/controllers/TacticalController.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/TacticalController.php b/modules/monitoring/application/controllers/TacticalController.php
index 33681528c..d9da6d3d5 100644
--- a/modules/monitoring/application/controllers/TacticalController.php
+++ b/modules/monitoring/application/controllers/TacticalController.php
@@ -2,6 +2,7 @@
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Module\Monitoring\Controller as MonitoringController;
+use Icinga\Web\Widget\Tabextension\DashboardAction;
 use Icinga\Web\Url;
 
 class Monitoring_TacticalController extends MonitoringController
@@ -18,7 +19,7 @@ class Monitoring_TacticalController extends MonitoringController
                 'label' => $this->translate('Tactical Overview'),
                 'url'   => Url::fromRequest()
             )
-        )->activate('tactical_overview');
+        )->extend(new DashboardAction())->activate('tactical_overview');
 
         $this->view->statusSummary = $this->backend->select()->from(
             'statusSummary',

From b68fd935295a9cede0f405e78f7339a997524846 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 15:00:01 +0200
Subject: [PATCH 1324/2920] Timeline: Add dashboard action

refs #7876
---
 .../monitoring/application/controllers/TimelineController.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php
index f1ef32592..25827c766 100644
--- a/modules/monitoring/application/controllers/TimelineController.php
+++ b/modules/monitoring/application/controllers/TimelineController.php
@@ -10,6 +10,7 @@ use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Timeline\TimeLine;
 use Icinga\Module\Monitoring\Timeline\TimeRange;
 use Icinga\Module\Monitoring\Web\Widget\SelectBox;
+use Icinga\Web\Widget\Tabextension\DashboardAction;
 
 class Monitoring_TimelineController extends Controller
 {
@@ -22,7 +23,7 @@ class Monitoring_TimelineController extends Controller
                 'label' => $this->translate('Timeline'),
                 'url'   => Url::fromRequest()
             )
-        )->activate('timeline');
+        )->extend(new DashboardAction())->activate('timeline');
         $this->view->title = $this->translate('Timeline');
 
         // TODO: filter for hard_states (precedence adjustments necessary!)

From 9bbb23ae7dd7ffab8462bda7158a03d657dd918b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 16:08:51 +0200
Subject: [PATCH 1325/2920] Revert "Adjust command links so that they'll use
 `service_description'"

This reverts commit cee189a5fc2b94173eda5587ab5a5ce4125a06d0.

Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml
---
 .../monitoring/application/views/scripts/list/comments.phtml  | 4 ++--
 .../monitoring/application/views/scripts/list/downtimes.phtml | 4 ++--
 .../views/scripts/show/components/acknowledgement.phtml       | 2 +-
 .../views/scripts/show/components/checkstatistics.phtml       | 2 +-
 .../application/views/scripts/show/components/command.phtml   | 2 +-
 .../application/views/scripts/show/components/comments.phtml  | 2 +-
 .../application/views/scripts/show/components/downtime.phtml  | 2 +-
 .../views/scripts/show/components/notifications.phtml         | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 53a00835a..ee6302fef 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -91,8 +91,8 @@ if (count($comments) === 0) {
             );
           } else {
             $delCommentForm->setAction($this->url('monitoring/service/delete-comment', array(
-                'host_name'             => $comment->host_name,
-                'service_description'   => $comment->service_description
+                'host_name' => $comment->host_name,
+                'service'   => $comment->service_description
             )));
           }
           echo $delCommentForm;
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index b279d4063..3bab05104 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -117,8 +117,8 @@ if (count($downtimes) === 0) {
             $delDowntimeForm->setAction($this->url('monitoring/host/delete-downtime', array('host_name' => $downtime->host_name)));
           } else {
             $delDowntimeForm->setAction($this->url('monitoring/service/delete-downtime', array(
-                'host_name'             => $downtime->host_name,
-                'service_description'   => $downtime->service_description
+                'host_name' => $downtime->host_name,
+                'service'   => $downtime->service_description
             )));
           }
           echo $delDowntimeForm;
diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index b91807d4f..588be561c 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -31,7 +31,7 @@ if ($object->acknowledged): ?>
                 } else {
                     $ackLink = $this->href(
                         'monitoring/service/acknowledge-problem',
-                        array('host_name' => $object->getHost()->getName(), 'service_description' => $object->getName())
+                        array('host_name' => $object->getHost()->getName(), 'service' => $object->getName())
                     );
                 }
             ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index 8fbdb9059..ef1432565 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -31,7 +31,7 @@ if ($object->getType() === $object::TYPE_HOST) {
               echo $this->qlink(
                   $this->translate('Reschedule'),
                   'monitoring/service/reschedule-check',
-                  array('host_name' => $object->getHost()->getName(), 'service_description' => $object->getName()),
+                  array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()),
                   array(
                       'icon'                => 'reschedule',
                       'data-base-target'    => '_self',
diff --git a/modules/monitoring/application/views/scripts/show/components/command.phtml b/modules/monitoring/application/views/scripts/show/components/command.phtml
index 0b028ba71..3068c8e1d 100644
--- a/modules/monitoring/application/views/scripts/show/components/command.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/command.phtml
@@ -26,7 +26,7 @@ $command = array_shift($parts);
                 echo $this->qlink(
                     $this->translate('Process check result'),
                     'monitoring/service/process-check-result',
-                    array('host_name' => $object->getHost()->getName(), 'service_description' => $object->getName()),
+                    array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()),
                     array(
                         'icon'              => 'reply',
                         'data-base-target'  => '_self',
diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index 61ae96517..adeef6200 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -18,7 +18,7 @@
                 echo $this->qlink(
                     $this->translate('Add comment'),
                     'monitoring/service/add-comment',
-                    array('host_name' => $object->getHost()->getName(), 'service_description' => $object->getName()),
+                    array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()),
                     array(
                         'icon'              => 'comment',
                         'data-base-target'  => '_self',
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 9eb4b6c18..abb150892 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -20,7 +20,7 @@
                 echo $this->qlink(
                     $this->translate('Schedule downtime'),
                     'monitoring/service/schedule-downtime',
-                    array('host_name' => $object->getHost()->getName(), 'service_description' => $object->getName()),
+                    array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()),
                     array(
                         'icon'              => 'plug',
                         'data-base-target'  => '_self',
diff --git a/modules/monitoring/application/views/scripts/show/components/notifications.phtml b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
index dfed6d483..fa4314620 100644
--- a/modules/monitoring/application/views/scripts/show/components/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
@@ -10,7 +10,7 @@
       } else {
           $ackLink = $this->href(
               'monitoring/service/send-custom-notification',
-              array('host_name' => $object->getHost()->getName(), 'service_description' => $object->getName())
+              array('host_name' => $object->getHost()->getName(), 'service' => $object->getName())
           );
       }
       ?>

From 96fb0370a44e65f4946a76d0b0e24a1eb836f630 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 16:09:14 +0200
Subject: [PATCH 1326/2920] Revert "Require `service_description' instead of
 `service' to show a particular service"

This reverts commit 09ab6019423e858d222a570c65f247bfcb09e62f.
---
 .../application/controllers/ServiceController.php        | 6 +-----
 .../application/controllers/ShowController.php           | 6 +++---
 modules/monitoring/application/views/helpers/Link.php    | 2 +-
 .../application/views/scripts/list/servicegrid.phtml     | 4 ++--
 .../application/views/scripts/list/services.phtml        | 4 ++--
 .../application/views/scripts/show/history.phtml         | 6 +++---
 .../library/Monitoring/Object/MonitoredObject.php        | 9 +++------
 .../Web/Controller/MonitoredObjectController.php         | 4 ++--
 8 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index 86579343f..4f9bdeb1a 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -25,11 +25,7 @@ class Monitoring_ServiceController extends MonitoredObjectController
      */
     public function init()
     {
-        $service = new Service(
-            $this->backend,
-            $this->params->get('host_name'),
-            $this->params->get('service_description')
-        );
+        $service = new Service($this->backend, $this->params->get('host_name'), $this->params->get('service'));
 
         $this->applyRestriction('monitoring/services/filter', $service);
 
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 968512c26..13b55da7d 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -194,8 +194,8 @@ class Monitoring_ShowController extends Controller
         } else {
             $isService = true;
             $params = array(
-                'host_name'             => $object->getHost()->getName(),
-                'service_description'   => $object->getName()
+                'host_name' => $object->getHost()->getName(),
+                'service'   => $object->getName()
             );
         }
         $tabs = $this->getTabs();
@@ -223,7 +223,7 @@ class Monitoring_ShowController extends Controller
                     ),
                     'label'     => $this->translate('Service'),
                     'icon'      => 'service',
-                    'url'       => 'monitoring/service/show',
+                    'url'       => 'monitoring/show/service',
                     'urlParams' => $params,
                 )
             );
diff --git a/modules/monitoring/application/views/helpers/Link.php b/modules/monitoring/application/views/helpers/Link.php
index 7f1324573..454d37682 100644
--- a/modules/monitoring/application/views/helpers/Link.php
+++ b/modules/monitoring/application/views/helpers/Link.php
@@ -55,7 +55,7 @@ class Zend_View_Helper_Link extends Zend_View_Helper_Abstract
             $this->view->qlink(
                 $serviceLinkText,
                 'monitoring/service/show',
-                array('host_name' => $host, 'service_description' => $service),
+                array('host_name' => $host, 'service' => $service),
                 array('title' => sprintf(
                     $this->view->translate('Show detailed information for service %s on host %s'),
                     $service,
diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
index 6fb6db63e..2802ad9b4 100644
--- a/modules/monitoring/application/views/scripts/list/servicegrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
@@ -82,8 +82,8 @@ foreach ($serviceDescriptions as $service_description): ?>
             '',
             'monitoring/service/show',
             array(
-              'host_name'           => $service->host_name,
-              'service_description' => $service->service_description
+              'host_name' => $service->host_name,
+              'service'   => $service->service_description
             ),
             array(
               'aria-describedby'    => $service->host_name . '_' . $service->service_description . '_desc',
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 7473f7f25..12dec8c75 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -34,8 +34,8 @@ if (count($services) === 0) {
     $serviceLink = $this->href(
       'monitoring/service/show',
       array(
-        'host_name'             => $service->host_name,
-        'service_description'   => $service->service_description
+        'host_name' => $service->host_name,
+        'service'   => $service->service_description
       )
     );
     $hostLink = $this->href(
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index d2fd1a383..392490595 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -146,10 +146,10 @@ $output = $this->tickets ? preg_replace_callback(
               $this->translate('%s on %s', 'Service running on host'),
               $hostContext ? $this->qlink(
                   $event->service_display_name,
-                  'monitoring/service/show',
+                  'monitoring/show/service',
                   array(
-                      'host_name'           => $event->host_name,
-                      'service_description' => $event->service_description
+                      'host_name'   => $event->host_name,
+                      'service'     => $event->service_description
                   ),
                   array('title' => sprintf(
                       $this->translate('Show detailed information for service %s on host %s'),
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index a653ea6ed..084eb86cc 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -556,14 +556,11 @@ abstract class MonitoredObject implements Filterable
      */
     public static function fromParams(UrlParams $params)
     {
-        if ($params->has('service_description') && $params->has('host_name')) {
-            return new Service(
-                MonitoringBackend::instance(),
-                $params->get('host_name'),
-                $params->get('service_description')
-            );
+        if ($params->has('service') && $params->has('host_name')) {
+            return new Service(MonitoringBackend::instance(), $params->get('host_name'), $params->get('service'));
         } elseif ($params->has('host_name')) {
             return new Host(MonitoringBackend::instance(), $params->get('host_name'));
         }
+        return null;
     }
 }
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index de0c3fbfe..3f71cb2c0 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -172,8 +172,8 @@ abstract class MonitoredObjectController extends Controller
         } else {
             $isService = true;
             $params = array(
-                'host_name'             => $object->getHost()->getName(),
-                'service_description'   => $object->getName()
+                'host_name' => $object->getHost()->getName(),
+                'service'   => $object->getName()
             );
         }
         $tabs->add(

From 894457a1c13dd362b6f91d6094a5e22b6d9540ca Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 16:11:08 +0200
Subject: [PATCH 1327/2920] Revert "Adjust command links so that they'll use
 `host_name' instead of `host'"

This reverts commit b9aee47d1f44893ef953bf9168e21f368b95ed7f.

Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml
---
 .../monitoring/application/views/scripts/list/comments.phtml  | 4 ++--
 .../monitoring/application/views/scripts/list/downtimes.phtml | 4 ++--
 .../views/scripts/show/components/acknowledgement.phtml       | 4 ++--
 .../views/scripts/show/components/checkstatistics.phtml       | 4 ++--
 .../application/views/scripts/show/components/command.phtml   | 4 ++--
 .../application/views/scripts/show/components/comments.phtml  | 4 ++--
 .../application/views/scripts/show/components/downtime.phtml  | 4 ++--
 .../views/scripts/show/components/notifications.phtml         | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index ee6302fef..9f383345c 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -87,11 +87,11 @@ if (count($comments) === 0) {
           $delCommentForm->populate(array('comment_id' => $comment->id, 'redirect' => $this->url));
           if ($comment->objecttype === 'host') {
             $delCommentForm->setAction(
-                $this->url('monitoring/host/delete-comment', array('host_name' => $comment->host_name))
+                $this->url('monitoring/host/delete-comment', array('host' => $comment->host_name))
             );
           } else {
             $delCommentForm->setAction($this->url('monitoring/service/delete-comment', array(
-                'host_name' => $comment->host_name,
+                'host'      => $comment->host_name,
                 'service'   => $comment->service_description
             )));
           }
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 3bab05104..3f882a733 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -114,10 +114,10 @@ if (count($downtimes) === 0) {
           $delDowntimeForm = clone $delDowntimeForm;
           $delDowntimeForm->populate(array('downtime_id' => $downtime->id, 'redirect' => $this->url));
           if (! $isService) {
-            $delDowntimeForm->setAction($this->url('monitoring/host/delete-downtime', array('host_name' => $downtime->host_name)));
+            $delDowntimeForm->setAction($this->url('monitoring/host/delete-downtime', array('host' => $downtime->host_name)));
           } else {
             $delDowntimeForm->setAction($this->url('monitoring/service/delete-downtime', array(
-                'host_name' => $downtime->host_name,
+                'host'      => $downtime->host_name,
                 'service'   => $downtime->service_description
             )));
           }
diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index 588be561c..e7b79354d 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -26,12 +26,12 @@ if ($object->acknowledged): ?>
                 if ($object->getType() === $object::TYPE_HOST) {
                     $ackLink = $this->href(
                         'monitoring/host/acknowledge-problem',
-                        array('host_name' => $object->getName())
+                        array('host' => $object->getName())
                     );
                 } else {
                     $ackLink = $this->href(
                         'monitoring/service/acknowledge-problem',
-                        array('host_name' => $object->getHost()->getName(), 'service' => $object->getName())
+                        array('host' => $object->getHost()->getName(), 'service' => $object->getName())
                     );
                 }
             ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index ef1432565..2a4e4b033 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -31,7 +31,7 @@ if ($object->getType() === $object::TYPE_HOST) {
               echo $this->qlink(
                   $this->translate('Reschedule'),
                   'monitoring/service/reschedule-check',
-                  array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()),
+                  array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
                   array(
                       'icon'                => 'reschedule',
                       'data-base-target'    => '_self',
@@ -44,7 +44,7 @@ if ($object->getType() === $object::TYPE_HOST) {
               echo $this->qlink(
                   $this->translate('Reschedule'),
                   'monitoring/host/reschedule-check',
-                  array('host_name' => $object->getName()),
+                  array('host' => $object->getName()),
                   array(
                       'icon'                => 'reschedule',
                       'data-base-target'    => '_self',
diff --git a/modules/monitoring/application/views/scripts/show/components/command.phtml b/modules/monitoring/application/views/scripts/show/components/command.phtml
index 3068c8e1d..d7fca7cfa 100644
--- a/modules/monitoring/application/views/scripts/show/components/command.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/command.phtml
@@ -15,7 +15,7 @@ $command = array_shift($parts);
                 echo $this->qlink(
                     $this->translate('Process check result'),
                     'monitoring/host/process-check-result',
-                    array('host_name' => $object->getName()),
+                    array('host' => $object->getName()),
                     array(
                         'icon'              => 'reply',
                         'data-base-target'  => '_self',
@@ -26,7 +26,7 @@ $command = array_shift($parts);
                 echo $this->qlink(
                     $this->translate('Process check result'),
                     'monitoring/service/process-check-result',
-                    array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()),
+                    array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
                     array(
                         'icon'              => 'reply',
                         'data-base-target'  => '_self',
diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index adeef6200..5a4d351c0 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -7,7 +7,7 @@
                 echo $this->qlink(
                     $this->translate('Add comment'),
                     'monitoring/host/add-comment',
-                    array('host_name' => $object->getName()),
+                    array('host' => $object->getName()),
                     array(
                         'icon'              => 'comment',
                         'data-base-target'  => '_self',
@@ -18,7 +18,7 @@
                 echo $this->qlink(
                     $this->translate('Add comment'),
                     'monitoring/service/add-comment',
-                    array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()),
+                    array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
                     array(
                         'icon'              => 'comment',
                         'data-base-target'  => '_self',
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index abb150892..b338f8a71 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -7,7 +7,7 @@
                 echo $this->qlink(
                     $this->translate('Schedule downtime'),
                     'monitoring/host/schedule-downtime',
-                    array('host_name' => $object->getName()),
+                    array('host' => $object->getName()),
                     array(
                         'icon'              => 'plug',
                         'data-base-target'  => '_self',
@@ -20,7 +20,7 @@
                 echo $this->qlink(
                     $this->translate('Schedule downtime'),
                     'monitoring/service/schedule-downtime',
-                    array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()),
+                    array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
                     array(
                         'icon'              => 'plug',
                         'data-base-target'  => '_self',
diff --git a/modules/monitoring/application/views/scripts/show/components/notifications.phtml b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
index fa4314620..af57eb934 100644
--- a/modules/monitoring/application/views/scripts/show/components/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
@@ -5,12 +5,12 @@
       if ($object->getType() === $object::TYPE_HOST) {
           $ackLink = $this->href(
               'monitoring/host/send-custom-notification',
-              array('host_name' => $object->getName())
+              array('host' => $object->getName())
           );
       } else {
           $ackLink = $this->href(
               'monitoring/service/send-custom-notification',
-              array('host_name' => $object->getHost()->getName(), 'service' => $object->getName())
+              array('host' => $object->getHost()->getName(), 'service' => $object->getName())
           );
       }
       ?>

From f11ea045577c25af14b3b961edd45cef33be59a9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 16:11:22 +0200
Subject: [PATCH 1328/2920] Revert "Require `host_name' instead of `host' to
 show or list particular objects"

This reverts commit b93d18a0fc2507d360f122afdfb27317b7708fd4.
---
 doc/accessibility/link-labels.html                        | 2 +-
 .../monitoring/application/controllers/HostController.php | 2 +-
 .../application/controllers/ServiceController.php         | 2 +-
 .../monitoring/application/controllers/ShowController.php | 6 +++---
 modules/monitoring/application/views/helpers/Link.php     | 4 ++--
 .../monitoring/application/views/helpers/PluginOutput.php | 2 +-
 .../monitoring/application/views/scripts/list/hosts.phtml | 4 ++--
 .../application/views/scripts/list/servicegrid.phtml      | 6 +++---
 .../application/views/scripts/list/services.phtml         | 8 ++++----
 .../views/scripts/partials/host/servicesummary.phtml      | 2 +-
 .../application/views/scripts/show/history.phtml          | 4 ++--
 .../library/Monitoring/Object/MonitoredObject.php         | 8 ++++----
 .../Web/Controller/MonitoredObjectController.php          | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/doc/accessibility/link-labels.html b/doc/accessibility/link-labels.html
index a65b909de..439adb85e 100644
--- a/doc/accessibility/link-labels.html
+++ b/doc/accessibility/link-labels.html
@@ -8,7 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 <body>
-    <a href="/monitoring/host/show?host_name=localhost"
+    <a href="/monitoring/host/show?host=localhost"
        title="Show detailed information about the host localhost"
        aria-label="Show detailed information about the host localhost">localhost</a>
 </body>
diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index 5b336a26b..11179c1fa 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -26,7 +26,7 @@ class Monitoring_HostController extends MonitoredObjectController
      */
     public function init()
     {
-        $host = new Host($this->backend, $this->params->get('host_name'));
+        $host = new Host($this->backend, $this->params->get('host'));
 
         $this->applyRestriction('monitoring/hosts/filter', $host);
 
diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index 4f9bdeb1a..3dc98c3b8 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -25,7 +25,7 @@ class Monitoring_ServiceController extends MonitoredObjectController
      */
     public function init()
     {
-        $service = new Service($this->backend, $this->params->get('host_name'), $this->params->get('service'));
+        $service = new Service($this->backend, $this->params->get('host'), $this->params->get('service'));
 
         $this->applyRestriction('monitoring/services/filter', $service);
 
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 13b55da7d..c1522d2a1 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -189,12 +189,12 @@ class Monitoring_ShowController extends Controller
         if ($object->getType() === $object::TYPE_HOST) {
             $isService = false;
             $params = array(
-                'host_name' => $object->getName()
+                'host' => $object->getName()
             );
         } else {
             $isService = true;
             $params = array(
-                'host_name' => $object->getHost()->getName(),
+                'host'      => $object->getHost()->getName(),
                 'service'   => $object->getName()
             );
         }
@@ -208,7 +208,7 @@ class Monitoring_ShowController extends Controller
                 ),
                 'label'     => $this->translate('Host'),
                 'icon'      => 'host',
-                'url'       => 'monitoring/host/show',
+                'url'       => 'monitoring/show/host',
                 'urlParams' => $params,
             )
         );
diff --git a/modules/monitoring/application/views/helpers/Link.php b/modules/monitoring/application/views/helpers/Link.php
index 454d37682..8faf6e5fb 100644
--- a/modules/monitoring/application/views/helpers/Link.php
+++ b/modules/monitoring/application/views/helpers/Link.php
@@ -33,7 +33,7 @@ class Zend_View_Helper_Link extends Zend_View_Helper_Abstract
         return $this->view->qlink(
             $linkText,
             'monitoring/host/show',
-            array('host_name' => $host),
+            array('host' => $host),
             array('title' => sprintf($this->view->translate('Show detailed information for host %s'), $host))
         );
     }
@@ -55,7 +55,7 @@ class Zend_View_Helper_Link extends Zend_View_Helper_Abstract
             $this->view->qlink(
                 $serviceLinkText,
                 'monitoring/service/show',
-                array('host_name' => $host, 'service' => $service),
+                array('host' => $host, 'service' => $service),
                 array('title' => sprintf(
                     $this->view->translate('Show detailed information for service %s on host %s'),
                     $service,
diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
index 8778d01b3..d494a7810 100644
--- a/modules/monitoring/application/views/helpers/PluginOutput.php
+++ b/modules/monitoring/application/views/helpers/PluginOutput.php
@@ -65,7 +65,7 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
                 parse_str($m[1], $params);
                 if (isset($params['host'])) {
                     $tag->setAttribute('href', $this->view->baseUrl(
-                        '/monitoring/host/show?host_name=' . urlencode($params['host']
+                        '/monitoring/host/show?host=' . urlencode($params['host']
                     )));
                 }
             } else {
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 3efb70320..d1cdaf1b3 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -34,7 +34,7 @@ if (count($hosts) === 0) {
   <?php foreach($hosts as $host):
 
     $hostStateName = Host::getStateText($host->host_state);
-    $hostLink = $this->href('monitoring/host/show', array('host_name' => $host->host_name));
+    $hostLink = $this->href('monitoring/host/show', array('host' => $host->host_name));
 
     $icons = array();
     if (! $host->host_handled && $host->host_state > 0){
@@ -104,7 +104,7 @@ if (count($hosts) === 0) {
           ),
           'monitoring/show/services',
           array(
-            'host_name'          => $host->host_name,
+            'host'               => $host->host_name,
             'service_problem'    => 1,
             'service_handled'    => 0
            ),
diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
index 2802ad9b4..a9cbac445 100644
--- a/modules/monitoring/application/views/scripts/list/servicegrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
@@ -68,7 +68,7 @@ foreach ($serviceDescriptions as $service_description): ?>
           <?= $this->qlink(
             $host_name,
             'monitoring/show/services?' . $serviceFilter,
-            array('host_name' => $host_name),
+            array('host' => $host_name),
             array('title' => sprintf($this->translate('List all reported services on host %s'), $host_name))
           ); ?>
         </th>
@@ -80,9 +80,9 @@ foreach ($serviceDescriptions as $service_description): ?>
           </span>
           <?= $this->qlink(
             '',
-            'monitoring/service/show',
+            'monitoring/show/service',
             array(
-              'host_name' => $service->host_name,
+              'host'      => $service->host_name,
               'service'   => $service->service_description
             ),
             array(
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 12dec8c75..b8d344bde 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -34,14 +34,14 @@ if (count($services) === 0) {
     $serviceLink = $this->href(
       'monitoring/service/show',
       array(
-        'host_name' => $service->host_name,
-        'service'   => $service->service_description
+        'host' => $service->host_name,
+        'service' => $service->service_description
       )
     );
     $hostLink = $this->href(
-      'monitoring/host/show',
+      'monitoring/show/host',
       array(
-        'host_name' => $service->host_name,
+        'host' => $service->host_name,
       )
     );
     $serviceStateName = Service::getStateText($service->service_state);
diff --git a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
index 23cc21e97..c0acdead4 100644
--- a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
@@ -3,7 +3,7 @@
 use Icinga\Web\Url;
 use Icinga\Module\Monitoring\Object\Service;
 
-$selfUrl = Url::fromPath('monitoring/show/services', array('host_name' => $object->host_name));
+$selfUrl = Url::fromPath('monitoring/show/services', array('host' => $object->host_name));
 $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
 ?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
 <?php if ($object->stats->services_total): ?>
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index 392490595..3777d0384 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -148,8 +148,8 @@ $output = $this->tickets ? preg_replace_callback(
                   $event->service_display_name,
                   'monitoring/show/service',
                   array(
-                      'host_name'   => $event->host_name,
-                      'service'     => $event->service_description
+                      'host' => $event->host_name,
+                      'service' => $event->service_description
                   ),
                   array('title' => sprintf(
                       $this->translate('Show detailed information for service %s on host %s'),
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 084eb86cc..05f201428 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -556,10 +556,10 @@ abstract class MonitoredObject implements Filterable
      */
     public static function fromParams(UrlParams $params)
     {
-        if ($params->has('service') && $params->has('host_name')) {
-            return new Service(MonitoringBackend::instance(), $params->get('host_name'), $params->get('service'));
-        } elseif ($params->has('host_name')) {
-            return new Host(MonitoringBackend::instance(), $params->get('host_name'));
+        if ($params->has('service') && $params->has('host')) {
+            return new Service(MonitoringBackend::instance(), $params->get('host'), $params->get('service'));
+        } elseif ($params->has('host')) {
+            return new Host(MonitoringBackend::instance(), $params->get('host'));
         }
         return null;
     }
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 3f71cb2c0..04102e9d2 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -167,12 +167,12 @@ abstract class MonitoredObjectController extends Controller
         if ($object->getType() === $object::TYPE_HOST) {
             $isService = false;
             $params = array(
-                'host_name' => $object->getName()
+                'host' => $object->getName()
             );
         } else {
             $isService = true;
             $params = array(
-                'host_name' => $object->getHost()->getName(),
+                'host'      => $object->getHost()->getName(),
                 'service'   => $object->getName()
             );
         }

From 1e064a537923fef693da74c796e479ef31a83eb8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Apr 2015 16:13:03 +0200
Subject: [PATCH 1329/2920] Revert "Fix host and service multiselection"

This reverts commit 1f4b3aa8ea66ac51275d050c19f0801da033d2d7.
---
 modules/monitoring/application/views/scripts/list/hosts.phtml   | 2 +-
 .../monitoring/application/views/scripts/list/services.phtml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index d1cdaf1b3..04fadf2ec 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -28,7 +28,7 @@ if (count($hosts) === 0) {
     data-base-target="_next"
     class="action multiselect"
     data-icinga-multiselect-url="<?= $this->href('monitoring/hosts/show') ?>"
-    data-icinga-multiselect-data="host_name"
+    data-icinga-multiselect-data="host"
 >
   <tbody>
   <?php foreach($hosts as $host):
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index b8d344bde..f3e36c18c 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -28,7 +28,7 @@ if (count($services) === 0) {
 <table data-base-target="_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_description,host_name">
+    data-icinga-multiselect-data="service,host">
   <tbody>
 <?php foreach ($services as $service):
     $serviceLink = $this->href(

From f543321ac4fa173d491ed7f7d7c28326c0da9ce3 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 20 Apr 2015 17:02:42 +0200
Subject: [PATCH 1330/2920] Replace MenuItemRenderer interface with a base
 class MenuItemRenderer

refs #7658
---
 library/Icinga/Web/Menu/MenuItemRenderer.php | 102 ++++++++++++++++++-
 1 file changed, 99 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Web/Menu/MenuItemRenderer.php b/library/Icinga/Web/Menu/MenuItemRenderer.php
index 15e6b2930..33c653a7c 100644
--- a/library/Icinga/Web/Menu/MenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/MenuItemRenderer.php
@@ -3,11 +3,107 @@
 
 namespace Icinga\Web\Menu;
 
+use Icinga\Application\Icinga;
 use Icinga\Web\Menu;
+use Icinga\Web\View;
 
 /**
- * Renders the html content of a single menu item
+ * Default MenuItemRenderer class
  */
-interface MenuItemRenderer {
-    public function render(Menu $menu);
+class MenuItemRenderer
+{
+    /**
+     * Contains <a> element specific attributes
+     *
+     * @var array
+     */
+    protected $attributes = array();
+
+    /**
+     * View
+     *
+     * @var View|null
+     */
+    protected $view;
+
+    /**
+     * Set the view
+     *
+     * @param   View    $view
+     *
+     * @return  $this
+     */
+    public function setView(View $view)
+    {
+        $this->view = $view;
+        return $this;
+    }
+
+    /**
+     * Get the view
+     *
+     * @return View
+     */
+    public function getView()
+    {
+        if ($this->view === null) {
+            $this->view = Icinga::app()->getViewRenderer()->view;
+        }
+        return $this->view;
+    }
+
+    /**
+     * Renders the html content of a single menu item
+     *
+     * @param Menu $menu
+     *
+     * @return string
+     */
+    public function render(Menu $menu)
+    {
+        return $this->createLink($menu);
+    }
+
+    /**
+     * Creates a menu item link element
+     *
+     * @param Menu $menu
+     *
+     * @return string
+     */
+    public function createLink(Menu $menu)
+    {
+        if ($menu->getIcon() && strpos($menu->getIcon(), '.') === false) {
+            return sprintf(
+                '<a href="%s"%s><i aria-hidden="true" class="icon-%s"></i>%s</a>',
+                $menu->getUrl() ? : '#',
+                $this->getAttributes(),
+                $menu->getIcon(),
+                $this->getView()->escape($menu->getTitle())
+            );
+        }
+
+        return sprintf(
+            '<a href="%s"%s>%s%s<span></span></a>',
+            $menu->getUrl() ? : '#',
+            $this->getAttributes(),
+            $menu->getIcon() ? '<img aria-hidden="true" src="' . Url::fromPath($menu->getIcon()) . '" class="icon" /> ' : '',
+            $this->getView()->escape($menu->getTitle())
+        );
+    }
+
+    /**
+     * Returns <a> element specific attributes if present
+     *
+     * @return string
+     */
+    protected function getAttributes()
+    {
+        $attributes = '';
+        $view = $this->getView();
+        foreach ($this->attributes as $attribute => $value) {
+            $attributes .= ' ' . $view->escape($attribute) . '="' . $view->escape($value) . '"';
+        }
+        return $attributes;
+    }
 }

From 4eb5f75c62056b6c9b19c156c52bac165b1169ba Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 20 Apr 2015 17:04:46 +0200
Subject: [PATCH 1331/2920] Use default MenuItemRenderer as renderer if no
 custom renderer is set

refs #7658
---
 library/Icinga/Web/MenuRenderer.php | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/library/Icinga/Web/MenuRenderer.php b/library/Icinga/Web/MenuRenderer.php
index 7d2cd5ad3..4dec9404e 100644
--- a/library/Icinga/Web/MenuRenderer.php
+++ b/library/Icinga/Web/MenuRenderer.php
@@ -4,6 +4,7 @@
 namespace Icinga\Web;
 
 use Exception;
+use Icinga\Web\Menu\MenuItemRenderer;
 use RecursiveIteratorIterator;
 use Icinga\Application\Logger;
 use Icinga\Web\Menu\PermittedMenuItemFilter;
@@ -32,6 +33,11 @@ class MenuRenderer extends RecursiveIteratorIterator
      */
     protected $useCustomRenderer = false;
 
+    /**
+     * @var MenuItemRenderer
+     */
+    protected $defaultRenderer;
+
     /**
      * Create a new MenuRenderer
      *
@@ -45,6 +51,7 @@ class MenuRenderer extends RecursiveIteratorIterator
         } else {
             $this->url = Url::fromPath($url);
         }
+        $this->defaultRenderer = new MenuItemRenderer();
         parent::__construct(new PermittedMenuItemFilter($menu), RecursiveIteratorIterator::CHILD_FIRST);
     }
 
@@ -114,22 +121,8 @@ class MenuRenderer extends RecursiveIteratorIterator
                 Logger::error('Could not invoke custom renderer. Exception: '. $e->getMessage());
             }
         }
-        if ($child->getIcon() && strpos($child->getIcon(), '.') === false) {
-            return sprintf(
-                '<a href="%s"><i aria-hidden="true" class="icon-%s"></i>%s</a>',
-                $child->getUrl() ?: '#',
-                $child->getIcon(),
-                htmlspecialchars($child->getTitle())
-            );
-        }
-        return sprintf(
-            '<a href="%s">%s%s</a>',
-            $child->getUrl() ?: '#',
-            $child->getIcon()
-                ? '<img aria-hidden="true" src="' . Url::fromPath($child->getIcon()) . '" class="icon" /> '
-                : '',
-            htmlspecialchars($child->getTitle())
-        );
+
+        return $this->defaultRenderer->render($child);
     }
 
     /**

From 9ebf4742de1bfe7484e7b521bd9dff4d52f91eba Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 20 Apr 2015 17:07:34 +0200
Subject: [PATCH 1332/2920] Use the MenuItemRenderer render() implemnetations

refs #7658
---
 .../Web/Menu/ForeignMenuItemRenderer.php      | 16 +++------
 .../Web/Menu/MonitoringMenuItemRenderer.php   | 34 ++++++-------------
 2 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php b/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
index 2ed418bf3..b898b4d08 100644
--- a/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/ForeignMenuItemRenderer.php
@@ -9,15 +9,9 @@ use Icinga\Web\Url;
 /**
  * A menu item with a link that surpasses the regular navigation link behavior
  */
-class ForeignMenuItemRenderer implements MenuItemRenderer {
-
-    public function render(Menu $menu)
-    {
-        return sprintf(
-            '<a href="%s" target="_self">%s%s<span></span></a>',
-            $menu->getUrl() ?: '#',
-            $menu->getIcon() ? '<img aria-hidden="true" src="' . Url::fromPath($menu->getIcon()) . '" class="icon" /> ' : '',
-            htmlspecialchars($menu->getTitle())
-        );
-    }
+class ForeignMenuItemRenderer extends MenuItemRenderer
+{
+    protected $attributes = array(
+        'target' => '_self'
+    );
 }
diff --git a/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php b/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php
index 7df80e034..80ffb3d9c 100644
--- a/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php
+++ b/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php
@@ -6,10 +6,9 @@ namespace Icinga\Module\Monitoring\Web\Menu;
 use Icinga\Web\Menu as Menu;
 use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 use Icinga\Web\Menu\MenuItemRenderer;
-use Icinga\Web\Url;
-
-class MonitoringMenuItemRenderer implements MenuItemRenderer {
 
+class MonitoringMenuItemRenderer extends MenuItemRenderer
+{
     protected static $summary;
 
     protected $columns = array();
@@ -70,31 +69,18 @@ class MonitoringMenuItemRenderer implements MenuItemRenderer {
 
     public function render(Menu $menu)
     {
-        $count = $this->countItems();
-        $badge = '';
-        if ($count) {
-            $badge = sprintf(
+        return $this->getBadge() . $this->createLink($menu);
+    }
+
+    protected function getBadge()
+    {
+        if ($count = $this->countItems()) {
+            return sprintf(
                 '<div title="%s" class="badge-container"><span class="badge badge-critical">%s</span></div>',
                 $this->getBadgeTitle(),
                 $count
             );
         }
-        if ($menu->getIcon() && strpos($menu->getIcon(), '.') === false) {
-            return sprintf(
-                '%s <a href="%s"><i aria-hidden="true" class="icon-%s"></i>%s</a>',
-                $badge,
-                $menu->getUrl() ?: '#',
-                $menu->getIcon(),
-                htmlspecialchars($menu->getTitle())
-            );
-        }
-
-        return sprintf(
-            '%s<a href="%s">%s%s<span></span></a>',
-            $badge,
-            $menu->getUrl() ?: '#',
-            $menu->getIcon() ? '<img aria-hidden="true" src="' . Url::fromPath($menu->getIcon()) . '" class="icon" /> ' : '',
-            htmlspecialchars($menu->getTitle())
-        );
+        return '';
     }
 }

From d6e7061de3e9b8cce25f44fb0bfe79ed1b49a97d Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 20 Apr 2015 17:54:47 +0200
Subject: [PATCH 1333/2920] Implement
 Icinga\Web\Widget\FilterEditor::setSearchColumns() for specifying custom
 search columns

---
 library/Icinga/Web/Widget/FilterEditor.php | 88 ++++++++++++++++------
 1 file changed, 64 insertions(+), 24 deletions(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 7812cdf47..63293050c 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -6,6 +6,7 @@ namespace Icinga\Web\Widget;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Filter\FilterExpression;
 use Icinga\Data\Filter\FilterChain;
+use Icinga\Data\Filter\FilterOr;
 use Icinga\Web\Url;
 use Icinga\Application\Icinga;
 use Icinga\Exception\ProgrammingError;
@@ -39,6 +40,8 @@ class FilterEditor extends AbstractWidget
 
     protected $ignoreParams = array();
 
+    protected $searchColumns = null;
+
     /**
      * @var string
      */
@@ -73,6 +76,12 @@ class FilterEditor extends AbstractWidget
         return $this->filter;
     }
 
+    public function setSearchColumns(array $searchColumns)
+    {
+        $this->searchColumns = $searchColumns;
+        return $this;
+    }
+
     public function setUrl($url)
     {
         $this->url = $url;
@@ -147,6 +156,26 @@ class FilterEditor extends AbstractWidget
         return $filter;
     }
 
+    protected function resetSearchColumns(Filter &$filter)
+    {
+        if ($filter->isChain()) {
+            $filters = &$filter->filters();
+            if (!($empty = empty($filters))) {
+                foreach ($filters as $k => &$f) {
+                    if (false === $this->resetSearchColumns($f)) {
+                        unset($filters[$k]);
+                    }
+                }
+            }
+            return $empty || !empty($filters);
+        }
+        return $filter->isExpression() ? !(
+            in_array($filter->getColumn(), $this->searchColumns)
+            &&
+            $filter->getSign() === '='
+        ) : true;
+    }
+
     public function handleRequest($request)
     {
         $this->setUrl($request->getUrl()->without($this->ignoreParams));
@@ -179,33 +208,44 @@ class FilterEditor extends AbstractWidget
         $filter = $this->getFilter();
 
         if ($search !== null) {
-            if (strpos($search, '=') === false) {
-                // TODO: Ask the view for (multiple) search columns
-                switch($request->getActionName()) {
-                    case 'services':
-                        $searchCol = 'service';
-                        break;
-                    case 'hosts':
-                        $searchCol = 'host';
-                        break;
-                    case 'hostgroups':
-                        $searchCol = 'hostgroup';
-                        break;
-                    case 'servicegroups':
-                        $searchCol = 'servicegroup';
-                        break;
-                    default:
-                        $searchCol = null;
-                }
+            if ($this->searchColumns === null) {
+                if (strpos($search, '=') === false) {
+                    // TODO: Ask the view for (multiple) search columns
+                    switch($request->getActionName()) {
+                        case 'services':
+                            $searchCol = 'service';
+                            break;
+                        case 'hosts':
+                            $searchCol = 'host';
+                            break;
+                        case 'hostgroups':
+                            $searchCol = 'hostgroup';
+                            break;
+                        case 'servicegroups':
+                            $searchCol = 'servicegroup';
+                            break;
+                        default:
+                            $searchCol = null;
+                    }
 
-                if ($searchCol === null) {
-                    throw new Exception('Cannot search here');
+                    if ($searchCol === null) {
+                        throw new Exception('Cannot search here');
+                    }
+                    $filter = $this->mergeRootExpression($filter, $searchCol, '=', "*$search*");
+                } else {
+                    list($k, $v) = preg_split('/=/', $search);
+                    $filter = $this->mergeRootExpression($filter, $k, '=', $v);
                 }
-                $filter = $this->mergeRootExpression($filter, $searchCol, '=', "*$search*");
-
             } else {
-                list($k, $v) = preg_split('/=/', $search);
-                $filter = $this->mergeRootExpression($filter, $k, '=', $v);
+                if (false === $this->resetSearchColumns($filter)) {
+                    $filter = Filter::matchAll();
+                }
+
+                $filters = array();
+                foreach ($this->searchColumns as $searchColumn) {
+                    $filters[] = Filter::expression($searchColumn, '=', "*$search*");
+                }
+                $filter->andFilter(new FilterOr($filters));
             }
 
             $url = $this->url()->setQueryString(

From d3964a31fb5c5543da17fa5e99ef8fd69240b4f8 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 20 Apr 2015 21:49:45 +0200
Subject: [PATCH 1334/2920] MenuItemRenderer: add missing use clause

Otherwise this completely broke Icinga Web as soon as a single module
used a legacy icon.

refs #7658
---
 library/Icinga/Web/Menu/MenuItemRenderer.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/Icinga/Web/Menu/MenuItemRenderer.php b/library/Icinga/Web/Menu/MenuItemRenderer.php
index 33c653a7c..d40650d91 100644
--- a/library/Icinga/Web/Menu/MenuItemRenderer.php
+++ b/library/Icinga/Web/Menu/MenuItemRenderer.php
@@ -5,6 +5,7 @@ namespace Icinga\Web\Menu;
 
 use Icinga\Application\Icinga;
 use Icinga\Web\Menu;
+use Icinga\Web\Url;
 use Icinga\Web\View;
 
 /**

From 8058eb021516bbc15c77e6fcebdad709f9c9ed0f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Apr 2015 12:32:18 +0200
Subject: [PATCH 1335/2920] Move UserGroupBackend class to
 Icinga\Authentication\UserGroup

refs #8826
---
 library/Icinga/Authentication/Backend/DbUserGroupBackend.php    | 2 +-
 library/Icinga/Authentication/Backend/IniUserGroupBackend.php   | 2 +-
 library/Icinga/Authentication/Manager.php                       | 1 +
 .../Icinga/Authentication/{ => UserGroup}/UserGroupBackend.php  | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename library/Icinga/Authentication/{ => UserGroup}/UserGroupBackend.php (98%)

diff --git a/library/Icinga/Authentication/Backend/DbUserGroupBackend.php b/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
index d2230bf04..9b744257e 100644
--- a/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
@@ -3,7 +3,7 @@
 
 namespace Icinga\Authentication\Backend;
 
-use Icinga\Authentication\UserGroupBackend;
+use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Data\Db\DbConnection;
 use Icinga\User;
 
diff --git a/library/Icinga/Authentication/Backend/IniUserGroupBackend.php b/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
index b7f366511..ff5cebefe 100644
--- a/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
+++ b/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
@@ -4,7 +4,7 @@
 namespace Icinga\Authentication\Backend;
 
 use Icinga\Application\Config;
-use Icinga\Authentication\UserGroupBackend;
+use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Exception\ConfigurationError;
 use Icinga\User;
 use Icinga\Util\String;
diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 993475636..9d86b6ad6 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -4,6 +4,7 @@
 namespace Icinga\Authentication;
 
 use Exception;
+use Icinga\Authentication\Usergroup\UserGroupBackend;
 use Icinga\Application\Config;
 use Icinga\Exception\IcingaException;
 use Icinga\Exception\NotReadableError;
diff --git a/library/Icinga/Authentication/UserGroupBackend.php b/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
similarity index 98%
rename from library/Icinga/Authentication/UserGroupBackend.php
rename to library/Icinga/Authentication/UserGroup/UserGroupBackend.php
index f1289220d..9535d2be0 100644
--- a/library/Icinga/Authentication/UserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Authentication;
+namespace Icinga\Authentication\UserGroup;
 
 use Icinga\Authentication\Backend\DbUserGroupBackend;
 use Icinga\Authentication\Backend\IniUserGroupBackend;

From b51ce9c7abb16e0a64da65877116b536d45c5b94 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Apr 2015 12:38:57 +0200
Subject: [PATCH 1336/2920] Move concrete UserGroupBackend classes to
 Icinga\Authentication\UserGroup

refs #8826
---
 .../{Backend => UserGroup}/DbUserGroupBackend.php              | 3 +--
 .../{Backend => UserGroup}/IniUserGroupBackend.php             | 3 +--
 library/Icinga/Authentication/UserGroup/UserGroupBackend.php   | 2 --
 3 files changed, 2 insertions(+), 6 deletions(-)
 rename library/Icinga/Authentication/{Backend => UserGroup}/DbUserGroupBackend.php (94%)
 rename library/Icinga/Authentication/{Backend => UserGroup}/IniUserGroupBackend.php (94%)

diff --git a/library/Icinga/Authentication/Backend/DbUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
similarity index 94%
rename from library/Icinga/Authentication/Backend/DbUserGroupBackend.php
rename to library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
index 9b744257e..a5a2a539a 100644
--- a/library/Icinga/Authentication/Backend/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
@@ -1,9 +1,8 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Authentication\Backend;
+namespace Icinga\Authentication\UserGroup;
 
-use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Data\Db\DbConnection;
 use Icinga\User;
 
diff --git a/library/Icinga/Authentication/Backend/IniUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
similarity index 94%
rename from library/Icinga/Authentication/Backend/IniUserGroupBackend.php
rename to library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
index ff5cebefe..ad9178899 100644
--- a/library/Icinga/Authentication/Backend/IniUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
@@ -1,10 +1,9 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Authentication\Backend;
+namespace Icinga\Authentication\UserGroup;
 
 use Icinga\Application\Config;
-use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Exception\ConfigurationError;
 use Icinga\User;
 use Icinga\Util\String;
diff --git a/library/Icinga/Authentication/UserGroup/UserGroupBackend.php b/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
index 9535d2be0..29ea7094a 100644
--- a/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
@@ -3,8 +3,6 @@
 
 namespace Icinga\Authentication\UserGroup;
 
-use Icinga\Authentication\Backend\DbUserGroupBackend;
-use Icinga\Authentication\Backend\IniUserGroupBackend;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;

From 39473e89395641f79318e1a0774a190a574452f2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Apr 2015 12:42:21 +0200
Subject: [PATCH 1337/2920] Move UserGroupBackend to Icinga\Authentication\User

refs #8826
---
 library/Icinga/Authentication/AuthChain.php               | 1 +
 library/Icinga/Authentication/Backend/DbUserBackend.php   | 2 +-
 library/Icinga/Authentication/Backend/ExternalBackend.php | 2 +-
 library/Icinga/Authentication/Backend/LdapUserBackend.php | 2 +-
 library/Icinga/Authentication/{ => User}/UserBackend.php  | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename library/Icinga/Authentication/{ => User}/UserBackend.php (99%)

diff --git a/library/Icinga/Authentication/AuthChain.php b/library/Icinga/Authentication/AuthChain.php
index 9b9f873c5..167661f39 100644
--- a/library/Icinga/Authentication/AuthChain.php
+++ b/library/Icinga/Authentication/AuthChain.php
@@ -5,6 +5,7 @@ namespace Icinga\Authentication;
 
 use Iterator;
 use Icinga\Data\ConfigObject;
+use Icinga\Authentication\User\UserBackend;
 use Icinga\Application\Config;
 use Icinga\Application\Logger;
 use Icinga\Exception\ConfigurationError;
diff --git a/library/Icinga/Authentication/Backend/DbUserBackend.php b/library/Icinga/Authentication/Backend/DbUserBackend.php
index 12fa0392f..de3489fc3 100644
--- a/library/Icinga/Authentication/Backend/DbUserBackend.php
+++ b/library/Icinga/Authentication/Backend/DbUserBackend.php
@@ -4,7 +4,7 @@
 namespace Icinga\Authentication\Backend;
 
 use PDO;
-use Icinga\Authentication\UserBackend;
+use Icinga\Authentication\User\UserBackend;
 use Icinga\Data\Db\DbConnection;
 use Icinga\User;
 use Icinga\Exception\AuthenticationException;
diff --git a/library/Icinga/Authentication/Backend/ExternalBackend.php b/library/Icinga/Authentication/Backend/ExternalBackend.php
index fb73c55e8..612a66a52 100644
--- a/library/Icinga/Authentication/Backend/ExternalBackend.php
+++ b/library/Icinga/Authentication/Backend/ExternalBackend.php
@@ -3,7 +3,7 @@
 
 namespace Icinga\Authentication\Backend;
 
-use Icinga\Authentication\UserBackend;
+use Icinga\Authentication\User\UserBackend;
 use Icinga\Data\ConfigObject;
 use Icinga\User;
 
diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/Backend/LdapUserBackend.php
index a392fa682..d9e19588e 100644
--- a/library/Icinga/Authentication/Backend/LdapUserBackend.php
+++ b/library/Icinga/Authentication/Backend/LdapUserBackend.php
@@ -4,7 +4,7 @@
 namespace Icinga\Authentication\Backend;
 
 use Icinga\User;
-use Icinga\Authentication\UserBackend;
+use Icinga\Authentication\User\UserBackend;
 use Icinga\Protocol\Ldap\Query;
 use Icinga\Protocol\Ldap\Connection;
 use Icinga\Exception\AuthenticationException;
diff --git a/library/Icinga/Authentication/UserBackend.php b/library/Icinga/Authentication/User/UserBackend.php
similarity index 99%
rename from library/Icinga/Authentication/UserBackend.php
rename to library/Icinga/Authentication/User/UserBackend.php
index 8e35660df..bee481be6 100644
--- a/library/Icinga/Authentication/UserBackend.php
+++ b/library/Icinga/Authentication/User/UserBackend.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Authentication;
+namespace Icinga\Authentication\User;
 
 use Countable;
 use Icinga\Authentication\Backend\ExternalBackend;

From 6ca68f438d12f39b44956129ab3d52f16d419fd6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Apr 2015 12:51:31 +0200
Subject: [PATCH 1338/2920] Move concrete UserBackend classes to
 Icinga\Authentication\User

refs #8826
---
 application/controllers/AuthenticationController.php          | 2 +-
 application/forms/Config/Authentication/DbBackendForm.php     | 2 +-
 application/forms/Config/Authentication/LdapBackendForm.php   | 2 +-
 .../Icinga/Authentication/{Backend => User}/DbUserBackend.php | 3 +--
 .../Authentication/{Backend => User}/ExternalBackend.php      | 3 +--
 .../Authentication/{Backend => User}/LdapUserBackend.php      | 3 +--
 library/Icinga/Authentication/User/UserBackend.php            | 3 ---
 modules/setup/application/forms/AdminAccountPage.php          | 4 ++--
 modules/setup/library/Setup/Steps/AuthenticationStep.php      | 2 +-
 9 files changed, 9 insertions(+), 15 deletions(-)
 rename library/Icinga/Authentication/{Backend => User}/DbUserBackend.php (98%)
 rename library/Icinga/Authentication/{Backend => User}/ExternalBackend.php (95%)
 rename library/Icinga/Authentication/{Backend => User}/LdapUserBackend.php (98%)

diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index 7d492f8c1..4d6fe9928 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -7,7 +7,7 @@ use Icinga\Application\Config;
 use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
 use Icinga\Authentication\AuthChain;
-use Icinga\Authentication\Backend\ExternalBackend;
+use Icinga\Authentication\User\ExternalBackend;
 use Icinga\Exception\AuthenticationException;
 use Icinga\Exception\ConfigurationError;
 use Icinga\Exception\NotReadableError;
diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index e96b9637c..98d955f4a 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -7,7 +7,7 @@ use Exception;
 use Icinga\Web\Form;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
-use Icinga\Authentication\Backend\DbUserBackend;
+use Icinga\Authentication\User\DbUserBackend;
 
 /**
  * Form class for adding/modifying database authentication backends
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 562526788..867f5658c 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -8,7 +8,7 @@ use Icinga\Web\Form;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
 use Icinga\Exception\AuthenticationException;
-use Icinga\Authentication\Backend\LdapUserBackend;
+use Icinga\Authentication\User\LdapUserBackend;
 
 /**
  * Form class for adding/modifying LDAP authentication backends
diff --git a/library/Icinga/Authentication/Backend/DbUserBackend.php b/library/Icinga/Authentication/User/DbUserBackend.php
similarity index 98%
rename from library/Icinga/Authentication/Backend/DbUserBackend.php
rename to library/Icinga/Authentication/User/DbUserBackend.php
index de3489fc3..e572927d8 100644
--- a/library/Icinga/Authentication/Backend/DbUserBackend.php
+++ b/library/Icinga/Authentication/User/DbUserBackend.php
@@ -1,10 +1,9 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Authentication\Backend;
+namespace Icinga\Authentication\User;
 
 use PDO;
-use Icinga\Authentication\User\UserBackend;
 use Icinga\Data\Db\DbConnection;
 use Icinga\User;
 use Icinga\Exception\AuthenticationException;
diff --git a/library/Icinga/Authentication/Backend/ExternalBackend.php b/library/Icinga/Authentication/User/ExternalBackend.php
similarity index 95%
rename from library/Icinga/Authentication/Backend/ExternalBackend.php
rename to library/Icinga/Authentication/User/ExternalBackend.php
index 612a66a52..4861ff7de 100644
--- a/library/Icinga/Authentication/Backend/ExternalBackend.php
+++ b/library/Icinga/Authentication/User/ExternalBackend.php
@@ -1,9 +1,8 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Authentication\Backend;
+namespace Icinga\Authentication\User;
 
-use Icinga\Authentication\User\UserBackend;
 use Icinga\Data\ConfigObject;
 use Icinga\User;
 
diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
similarity index 98%
rename from library/Icinga/Authentication/Backend/LdapUserBackend.php
rename to library/Icinga/Authentication/User/LdapUserBackend.php
index d9e19588e..86dd247fc 100644
--- a/library/Icinga/Authentication/Backend/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -1,10 +1,9 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Authentication\Backend;
+namespace Icinga\Authentication\User;
 
 use Icinga\User;
-use Icinga\Authentication\User\UserBackend;
 use Icinga\Protocol\Ldap\Query;
 use Icinga\Protocol\Ldap\Connection;
 use Icinga\Exception\AuthenticationException;
diff --git a/library/Icinga/Authentication/User/UserBackend.php b/library/Icinga/Authentication/User/UserBackend.php
index bee481be6..7d5ebd83f 100644
--- a/library/Icinga/Authentication/User/UserBackend.php
+++ b/library/Icinga/Authentication/User/UserBackend.php
@@ -4,9 +4,6 @@
 namespace Icinga\Authentication\User;
 
 use Countable;
-use Icinga\Authentication\Backend\ExternalBackend;
-use Icinga\Authentication\Backend\DbUserBackend;
-use Icinga\Authentication\Backend\LdapUserBackend;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;
diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index b123b142d..7462b18df 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -8,8 +8,8 @@ use LogicException;
 use Icinga\Web\Form;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
-use Icinga\Authentication\Backend\DbUserBackend;
-use Icinga\Authentication\Backend\LdapUserBackend;
+use Icinga\Authentication\User\DbUserBackend;
+use Icinga\Authentication\User\LdapUserBackend;
 
 /**
  * Wizard page to define the initial administrative account
diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
index 9de0c9867..913f83066 100644
--- a/modules/setup/library/Setup/Steps/AuthenticationStep.php
+++ b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -7,7 +7,7 @@ use Exception;
 use Icinga\Application\Config;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
-use Icinga\Authentication\Backend\DbUserBackend;
+use Icinga\Authentication\User\DbUserBackend;
 use Icinga\Module\Setup\Step;
 
 class AuthenticationStep extends Step

From a7af54607876188d08429148fa3639d1159fc17f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Apr 2015 13:14:27 +0200
Subject: [PATCH 1339/2920] UserBackend: Drop abstract method hasUser

refs #8826
---
 library/Icinga/Authentication/User/UserBackend.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/library/Icinga/Authentication/User/UserBackend.php b/library/Icinga/Authentication/User/UserBackend.php
index 7d5ebd83f..9842505b0 100644
--- a/library/Icinga/Authentication/User/UserBackend.php
+++ b/library/Icinga/Authentication/User/UserBackend.php
@@ -144,15 +144,6 @@ abstract class UserBackend implements Countable
         return $backend;
     }
 
-    /**
-     * Test whether the given user exists
-     *
-     * @param   User $user
-     *
-     * @return  bool
-     */
-    abstract public function hasUser(User $user);
-
     /**
      * Authenticate
      *

From 11f522d9292bad2135fca4efd04c55eeeceba188 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Apr 2015 13:14:50 +0200
Subject: [PATCH 1340/2920] DbUserBackend: Drop redundant method hasUser

refs #8826
---
 .../Authentication/User/DbUserBackend.php       | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/library/Icinga/Authentication/User/DbUserBackend.php b/library/Icinga/Authentication/User/DbUserBackend.php
index e572927d8..2286f4e93 100644
--- a/library/Icinga/Authentication/User/DbUserBackend.php
+++ b/library/Icinga/Authentication/User/DbUserBackend.php
@@ -39,23 +39,6 @@ class DbUserBackend extends UserBackend
         $this->conn = $conn;
     }
 
-    /**
-     * Test whether the given user exists
-     *
-     * @param   User $user
-     *
-     * @return  bool
-     */
-    public function hasUser(User $user)
-    {
-        $select = new Zend_Db_Select($this->conn->getDbAdapter());
-        $row = $select->from('icingaweb_user', array(new Zend_Db_Expr(1)))
-            ->where('name = ?', $user->getUsername())
-            ->query()->fetchObject();
-
-        return ($row !== false) ? true : false;
-    }
-
     /**
      * Add a new user
      *

From 60a86546147c761dd6b0b230f9bbcce4011168e3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Apr 2015 13:15:06 +0200
Subject: [PATCH 1341/2920] ExternalBackend: Drop redundant method hasUser

refs #8826
---
 .../Authentication/User/ExternalBackend.php   | 46 ++++++++-----------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/library/Icinga/Authentication/User/ExternalBackend.php b/library/Icinga/Authentication/User/ExternalBackend.php
index 4861ff7de..4f9dd47b3 100644
--- a/library/Icinga/Authentication/User/ExternalBackend.php
+++ b/library/Icinga/Authentication/User/ExternalBackend.php
@@ -40,33 +40,6 @@ class ExternalBackend extends UserBackend
         return 1;
     }
 
-    /**
-     * Test whether the given user exists
-     *
-     * @param   User $user
-     *
-     * @return  bool
-     */
-    public function hasUser(User $user)
-    {
-        if (isset($_SERVER['REMOTE_USER'])) {
-            $username = $_SERVER['REMOTE_USER'];
-            $user->setRemoteUserInformation($username, 'REMOTE_USER');
-            if ($this->stripUsernameRegexp) {
-                $stripped = preg_replace($this->stripUsernameRegexp, '', $username);
-                if ($stripped !== false) {
-                    // TODO(el): PHP issues a warning when PHP cannot compile the regular expression. Should we log an
-                    // additional message in that case?
-                    $username = $stripped;
-                }
-            }
-            $user->setUsername($username);
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * Authenticate
      *
@@ -77,6 +50,23 @@ class ExternalBackend extends UserBackend
      */
     public function authenticate(User $user, $password = null)
     {
-        return $this->hasUser($user);
+        if (isset($_SERVER['REMOTE_USER'])) {
+            $username = $_SERVER['REMOTE_USER'];
+            $user->setRemoteUserInformation($username, 'REMOTE_USER');
+
+            if ($this->stripUsernameRegexp) {
+                $stripped = preg_replace($this->stripUsernameRegexp, '', $username);
+                if ($stripped !== false) {
+                    // TODO(el): PHP issues a warning when PHP cannot compile the regular expression. Should we log an
+                    // additional message in that case?
+                    $username = $stripped;
+                }
+            }
+
+            $user->setUsername($username);
+            return true;
+        }
+
+        return false;
     }
 }

From 319ca3625c8f6b78fe0f82d67d66b85291c75914 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Apr 2015 13:15:40 +0200
Subject: [PATCH 1342/2920] LdapUserBackend: Drop redundant method hasUser

refs #8826
---
 .../Authentication/User/LdapUserBackend.php   | 28 +++----------------
 library/Icinga/Protocol/Ldap/Connection.php   |  2 +-
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index 86dd247fc..8bc8f0222 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -185,25 +185,6 @@ class LdapUserBackend extends UserBackend
         return $groups;
     }
 
-    /**
-     * Return whether the given user exists
-     *
-     * @param   User    $user
-     *
-     * @return  bool
-     */
-    public function hasUser(User $user)
-    {
-        $username = $user->getUsername();
-        $entry = $this->selectUser($username)->fetchOne();
-
-        if (is_array($entry)) {
-            return in_array(strtolower($username), array_map('strtolower', $entry));
-        }
-
-        return strtolower($entry) === strtolower($username);
-    }
-
     /**
      * Return whether the given user credentials are valid
      *
@@ -229,17 +210,16 @@ class LdapUserBackend extends UserBackend
             }
         }
 
-        if (! $this->hasUser($user)) {
-            return false;
-        }
-
         try {
             $userDn = $this->conn->fetchDN($this->selectUser($user->getUsername()));
+            if ($userDn === null) {
+                return false;
+            }
+
             $authenticated = $this->conn->testCredentials(
                 $userDn,
                 $password
             );
-
             if ($authenticated) {
                 $groups = $this->getGroups($userDn);
                 if ($groups !== null) {
diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 687f30e62..992a2f553 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -201,7 +201,7 @@ class Connection
     public function fetchDN(Query $query, $fields = array())
     {
         $rows = $this->fetchAll($query, $fields);
-        if (count($rows) !== 1) {
+        if (count($rows) > 1) {
             throw new LdapException(
                 'Cannot fetch single DN for %s',
                 $query->create()

From 97caeb27f7f4dfc5c160861dec90a7f82f15f21d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Apr 2015 13:59:35 +0200
Subject: [PATCH 1343/2920] UserBackend: Add missing and fix existing method
 documentation

refs #8826
---
 .../Authentication/User/UserBackend.php       | 42 ++++++++++++-------
 library/Icinga/Data/ResourceFactory.php       |  9 ++--
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/library/Icinga/Authentication/User/UserBackend.php b/library/Icinga/Authentication/User/UserBackend.php
index 9842505b0..dc88d83d4 100644
--- a/library/Icinga/Authentication/User/UserBackend.php
+++ b/library/Icinga/Authentication/User/UserBackend.php
@@ -9,19 +9,22 @@ use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;
 use Icinga\User;
 
+/**
+ * Base class for concrete user backends
+ */
 abstract class UserBackend implements Countable
 {
     /**
-     * Name of the backend
+     * The name of this backend
      *
      * @var string
      */
     protected $name;
 
     /**
-     * Setter for the backend's name
+     * Set this backend's name
      *
-     * @param   string $name
+     * @param   string  $name
      *
      * @return  $this
      */
@@ -32,20 +35,31 @@ abstract class UserBackend implements Countable
     }
 
     /**
-     * Getter for the backend's name
+     * Return this backend's name
      *
-     * @return string
+     * @return  string
      */
     public function getName()
     {
         return $this->name;
     }
 
+    /**
+     * Create and return a UserBackend with the given name and given configuration applied to it
+     *
+     * @param   string          $name
+     * @param   ConfigObject    $backendConfig
+     *
+     * @return  UserBackend
+     *
+     * @throws  ConfigurationError
+     */
     public static function create($name, ConfigObject $backendConfig)
     {
         if ($backendConfig->name !== null) {
             $name = $backendConfig->name;
         }
+
         if (isset($backendConfig->class)) {
             // Use a custom backend class, this is only useful for testing
             if (!class_exists($backendConfig->class)) {
@@ -58,32 +72,27 @@ abstract class UserBackend implements Countable
             }
             return new $backendConfig->class($backendConfig);
         }
-        if (($backendType = $backendConfig->backend) === null) {
+
+        if (! ($backendType = strtolower($backendConfig->backend))) {
             throw new ConfigurationError(
                 'Authentication configuration for backend "%s" is missing the backend directive',
                 $name
             );
         }
-        $backendType = strtolower($backendType);
         if ($backendType === 'external') {
             $backend = new ExternalBackend($backendConfig);
             $backend->setName($name);
             return $backend;
         }
+
         if ($backendConfig->resource === null) {
             throw new ConfigurationError(
                 'Authentication configuration for backend "%s" is missing the resource directive',
                 $name
             );
         }
-        try {
-            $resourceConfig = ResourceFactory::getResourceConfig($backendConfig->resource);
-        } catch (ProgrammingError $e) {
-            throw new ConfigurationError(
-                'Resources not set up. Please contact your Icinga Web administrator'
-            );
-        }
-        $resource = ResourceFactory::createResource($resourceConfig);
+        $resource = ResourceFactory::createResource(ResourceFactory::getResourceConfig($backendConfig->resource));
+
         switch ($backendType) {
             case 'db':
                 $backend = new DbUserBackend($resource);
@@ -140,12 +149,13 @@ abstract class UserBackend implements Countable
                     $backendType
                 );
         }
+
         $backend->setName($name);
         return $backend;
     }
 
     /**
-     * Authenticate
+     * Authenticate the given user
      *
      * @param   User    $user
      * @param   string  $password
diff --git a/library/Icinga/Data/ResourceFactory.php b/library/Icinga/Data/ResourceFactory.php
index 249a70958..add35baac 100644
--- a/library/Icinga/Data/ResourceFactory.php
+++ b/library/Icinga/Data/ResourceFactory.php
@@ -4,7 +4,6 @@
 namespace Icinga\Data;
 
 use Icinga\Application\Config;
-use Icinga\Exception\ProgrammingError;
 use Icinga\Util\ConfigAwareFactory;
 use Icinga\Exception\ConfigurationError;
 use Icinga\Data\Db\DbConnection;
@@ -70,13 +69,13 @@ class ResourceFactory implements ConfigAwareFactory
     /**
      * Check if the existing resources are set. If not, throw an error.
      *
-     * @throws ProgrammingError
+     * @throws  ConfigurationError
      */
     private static function assertResourcesExist()
     {
-        if (!isset(self::$resources)) {
-            throw new ProgrammingError(
-                'The ResourceFactory must be initialised by setting a config, before it can be used'
+        if (self::$resources === null) {
+            throw new ConfigurationError(
+                'Resources not set up. Please contact your Icinga Web administrator'
             );
         }
     }

From b45e576722aea29d81654d903ff8c84203adb35f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Apr 2015 14:15:43 +0200
Subject: [PATCH 1344/2920] UserBackend: Remove testing only related code

There are no tests for this class at all.
---
 library/Icinga/Authentication/User/UserBackend.php | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/library/Icinga/Authentication/User/UserBackend.php b/library/Icinga/Authentication/User/UserBackend.php
index dc88d83d4..0f25e565f 100644
--- a/library/Icinga/Authentication/User/UserBackend.php
+++ b/library/Icinga/Authentication/User/UserBackend.php
@@ -60,19 +60,6 @@ abstract class UserBackend implements Countable
             $name = $backendConfig->name;
         }
 
-        if (isset($backendConfig->class)) {
-            // Use a custom backend class, this is only useful for testing
-            if (!class_exists($backendConfig->class)) {
-                throw new ConfigurationError(
-                    'Authentication configuration for backend "%s" defines an invalid backend class.'
-                    . ' Backend class "%s" not found',
-                    $name,
-                    $backendConfig->class
-                );
-            }
-            return new $backendConfig->class($backendConfig);
-        }
-
         if (! ($backendType = strtolower($backendConfig->backend))) {
             throw new ConfigurationError(
                 'Authentication configuration for backend "%s" is missing the backend directive',

From 33628cbf04e5e401bcc5e5eae288eb7fe983d3a1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 22 Apr 2015 09:06:26 +0200
Subject: [PATCH 1345/2920] Icinga\Application\Modules\Module: Add missing
 documentation

---
 library/Icinga/Application/Modules/Module.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index c1fd84513..80bbcb3e8 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -179,6 +179,8 @@ class Module
     protected $paneItems = array();
 
     /**
+     * A set of objects representing a searchUrl configuration
+     *
      * @var array
      */
     protected $searchUrls = array();
@@ -201,6 +203,11 @@ class Module
         $this->searchUrls[] = $searchUrl;
     }
 
+    /**
+     * Return this module's search urls
+     *
+     * @return  array
+     */
     public function getSearchUrls()
     {
         $this->launchConfigScript();

From 847c02ed8e4f560a9cb532a9ca538662068f8ed1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 22 Apr 2015 09:07:58 +0200
Subject: [PATCH 1346/2920] UserBackend: Add support for custom authentication
 backends

refs #8826
refs #8877
---
 library/Icinga/Application/Modules/Module.php |  32 +++++
 .../Authentication/User/UserBackend.php       | 112 ++++++++++++++++--
 2 files changed, 137 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index 80bbcb3e8..a575b9b9a 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -185,6 +185,13 @@ class Module
      */
     protected $searchUrls = array();
 
+    /**
+     * This module's user backends providing several authentication mechanisms
+     *
+     * @var array
+     */
+    protected $userBackends = array();
+
     /**
      * Provide a search URL
      *
@@ -709,6 +716,17 @@ class Module
         return new $this->setupWizard;
     }
 
+    /**
+     * Return this module's user backends
+     *
+     * @return  array
+     */
+    public function getUserBackends()
+    {
+        $this->launchConfigScript();
+        return $this->userBackends;
+    }
+
     /**
      * Provide a named permission
      *
@@ -784,6 +802,20 @@ class Module
         return $this;
     }
 
+    /**
+     * Provide a user backend capable of authenticating users
+     *
+     * @param   string  $identifier     The identifier of the new backend type
+     * @param   string  $className      The name of the class
+     *
+     * @return  $this
+     */
+    protected function provideUserBackend($identifier, $className)
+    {
+        $this->userBackends[strtolower($identifier)] = $className;
+        return $this;
+    }
+
     /**
      * Register new namespaces on the autoloader
      *
diff --git a/library/Icinga/Authentication/User/UserBackend.php b/library/Icinga/Authentication/User/UserBackend.php
index 0f25e565f..68ca10157 100644
--- a/library/Icinga/Authentication/User/UserBackend.php
+++ b/library/Icinga/Authentication/User/UserBackend.php
@@ -4,6 +4,8 @@
 namespace Icinga\Authentication\User;
 
 use Countable;
+use Icinga\Application\Logger;
+use Icinga\Application\Icinga;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;
@@ -14,6 +16,25 @@ use Icinga\User;
  */
 abstract class UserBackend implements Countable
 {
+    /**
+     * The default user backend types provided by Icinga Web 2
+     *
+     * @var array
+     */
+    private static $defaultBackends = array( // I would have liked it if I were able to declare this as constant :'(
+        'external',
+        'db',
+        'ldap',
+        'msldap'
+    );
+
+    /**
+     * The registered custom user backends with their identifier as key and class name as value
+     *
+     * @var array
+     */
+    protected static $customBackends;
+
     /**
      * The name of this backend
      *
@@ -44,6 +65,75 @@ abstract class UserBackend implements Countable
         return $this->name;
     }
 
+    /**
+     * Fetch all custom user backends from all loaded modules
+     */
+    public static function loadCustomUserBackends()
+    {
+        if (static::$customBackends !== null) {
+            return;
+        }
+
+        static::$customBackends = array();
+        $providedBy = array();
+        foreach (Icinga::app()->getModuleManager()->getLoadedModules() as $module) {
+            foreach ($module->getUserBackends() as $identifier => $className) {
+                if (array_key_exists($identifier, $providedBy)) {
+                    Logger::warning(
+                        'Cannot register UserBackend of type "%s" provided by module "%s".'
+                        . ' The type is already provided by module "%s"',
+                        $identifier,
+                        $module->getName(),
+                        $providedBy[$identifier]
+                    );
+                } elseif (in_array($identifier, static::$defaultBackends)) {
+                    Logger::warning(
+                        'Cannot register UserBackend of type "%s" provided by module "%s".'
+                        . ' The type is a default type provided by Icinga Web 2',
+                        $identifier,
+                        $module->getName()
+                    );
+                } else {
+                    $providedBy[$identifier] = $module->getName();
+                    static::$customBackends[$identifier] = $className;
+                }
+            }
+        }
+    }
+
+    /**
+     * Validate and return the class for the given custom user backend
+     *
+     * @param   string  $identifier     The identifier of the custom user backend
+     *
+     * @return  string|null             The name of the class or null in case there was no
+     *                                   backend found with the given identifier
+     *
+     * @throws  ConfigurationError      In case the class could not be successfully validated
+     */
+    protected static function getCustomUserBackend($identifier)
+    {
+        static::loadCustomUserBackends();
+        if (array_key_exists($identifier, static::$customBackends)) {
+            $className = static::$customBackends[$identifier];
+            if (! class_exists($className)) {
+                throw new ConfigurationError(
+                    'Cannot utilize UserBackend of type "%s". Class "%s" does not exist',
+                    $identifier,
+                    $className
+                );
+            } elseif (! is_subclass_of($className, __CLASS__)) {
+                throw new ConfigurationError(
+                    'Cannot utilize UserBackend of type "%s". Class "%s" is not a sub-type of UserBackend',
+                    $identifier,
+                    $className
+                );
+            }
+
+            return $className;
+        }
+    }
+
     /**
      * Create and return a UserBackend with the given name and given configuration applied to it
      *
@@ -71,6 +161,21 @@ abstract class UserBackend implements Countable
             $backend->setName($name);
             return $backend;
         }
+        if (in_array($backendType, static::$defaultBackends)) {
+            // The default backend check is the first one because of performance reasons:
+            // Do not attempt to load a custom user backend unless it's actually required
+        } elseif (($customClass = static::getCustomUserBackend($backendType)) !== null) {
+            $backend = new $customClass($backendConfig);
+            $backend->setName($name);
+            return $backend;
+        } else {
+            throw new ConfigurationError(
+                'Authentication configuration for backend "%s" defines an invalid backend type.'
+                . ' Backend type "%s" is not supported',
+                $name,
+                $backendType
+            );
+        }
 
         if ($backendConfig->resource === null) {
             throw new ConfigurationError(
@@ -128,13 +233,6 @@ abstract class UserBackend implements Countable
                     $groupOptions
                 );
                 break;
-            default:
-                throw new ConfigurationError(
-                    'Authentication configuration for backend "%s" defines an invalid backend type.'
-                    . ' Backend type "%s" is not supported',
-                    $name,
-                    $backendType
-                );
         }
 
         $backend->setName($name);

From c9dcddb1343f9bd2190863020d5eeabea03385ac Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 22 Apr 2015 09:35:06 +0200
Subject: [PATCH 1347/2920] UserGroupBackend: Add missing and fix existing
 method documentation

---
 .../UserGroup/UserGroupBackend.php            | 47 +++++++++----------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/library/Icinga/Authentication/UserGroup/UserGroupBackend.php b/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
index 29ea7094a..1cc7abec5 100644
--- a/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
@@ -6,7 +6,6 @@ namespace Icinga\Authentication\UserGroup;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;
-use Icinga\Exception\IcingaException;
 use Icinga\User;
 
 /**
@@ -15,16 +14,16 @@ use Icinga\User;
 abstract class UserGroupBackend
 {
     /**
-     * Name of the backend
+     * The name of this backend
      *
      * @var string
      */
     protected $name;
 
     /**
-     * Set the backend name
+     * Set this backend's name
      *
-     * @param   string $name
+     * @param   string  $name
      *
      * @return  $this
      */
@@ -35,9 +34,9 @@ abstract class UserGroupBackend
     }
 
     /**
-     * Get the backend name
+     * Return this backend's name
      *
-     * @return string
+     * @return  string
      */
     public function getName()
     {
@@ -45,42 +44,36 @@ abstract class UserGroupBackend
     }
 
     /**
-     * Create a user group backend
+     * Create and return a UserGroupBackend with the given name and given configuration applied to it
      *
      * @param   string          $name
      * @param   ConfigObject    $backendConfig
      *
-     * @return DbUserGroupBackend|IniUserGroupBackend
-     * @throws ConfigurationError If the backend configuration is invalid
+     * @return  UserGroupBackend
+     *
+     * @throws  ConfigurationError
      */
     public static function create($name, ConfigObject $backendConfig)
     {
         if ($backendConfig->name !== null) {
             $name = $backendConfig->name;
         }
-        if (($backendType = $backendConfig->backend) === null) {
+
+        if (! ($backendType = strtolower($backendConfig->backend))) {
             throw new ConfigurationError(
-                'Configuration for user group backend \'%s\' is missing the \'backend\' directive',
+                'Configuration for user group backend "%s" is missing the \'backend\' directive',
                 $name
             );
         }
-        $backendType = strtolower($backendType);
-        if (($resourceName = $backendConfig->resource) === null) {
+
+        if ($backendConfig->resource === null) {
             throw new ConfigurationError(
-                'Configuration for user group backend \'%s\' is missing the \'resource\' directive',
+                'Configuration for user group backend "%s" is missing the \'resource\' directive',
                 $name
             );
         }
-        $resourceName = strtolower($resourceName);
-        try {
-            $resource = ResourceFactory::create($resourceName);
-        } catch (IcingaException $e) {
-            throw new ConfigurationError(
-                'Can\'t create user group backend \'%s\'. An exception was thrown: %s',
-                $resourceName,
-                $e
-            );
-        }
+        $resource = ResourceFactory::create($backendConfig->resource);
+
         switch ($backendType) {
             case 'db':
                 $backend = new DbUserGroupBackend($resource);
@@ -90,11 +83,13 @@ abstract class UserGroupBackend
                 break;
             default:
                 throw new ConfigurationError(
-                    'Can\'t create user group backend \'%s\'. Invalid backend type \'%s\'.',
+                    'Configuration for user group backend "%s" defines an invalid backend type.'
+                    . ' Backend type "%s" is not supported',
                     $name,
                     $backendType
                 );
         }
+
         $backend->setName($name);
         return $backend;
     }
@@ -102,7 +97,7 @@ abstract class UserGroupBackend
     /**
      * Get the groups the given user is a member of
      *
-     * @param   User $user
+     * @param   User    $user
      *
      * @return  array
      */

From a1d8ed6e8fb12fa66efa539474d9831d01830821 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 22 Apr 2015 09:35:41 +0200
Subject: [PATCH 1348/2920] UserBackend: Utilize ResourceFactory::create

---
 library/Icinga/Authentication/User/UserBackend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/User/UserBackend.php b/library/Icinga/Authentication/User/UserBackend.php
index 68ca10157..40d76f398 100644
--- a/library/Icinga/Authentication/User/UserBackend.php
+++ b/library/Icinga/Authentication/User/UserBackend.php
@@ -183,7 +183,7 @@ abstract class UserBackend implements Countable
                 $name
             );
         }
-        $resource = ResourceFactory::createResource(ResourceFactory::getResourceConfig($backendConfig->resource));
+        $resource = ResourceFactory::create($backendConfig->resource);
 
         switch ($backendType) {
             case 'db':

From a2cd5d63f157174bb65879fea1330435b335522f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 22 Apr 2015 09:36:45 +0200
Subject: [PATCH 1349/2920] UserBackend: Wrap config directives as part of
 errors in single quotes

---
 library/Icinga/Authentication/User/UserBackend.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Authentication/User/UserBackend.php b/library/Icinga/Authentication/User/UserBackend.php
index 40d76f398..89bd1f56e 100644
--- a/library/Icinga/Authentication/User/UserBackend.php
+++ b/library/Icinga/Authentication/User/UserBackend.php
@@ -152,7 +152,7 @@ abstract class UserBackend implements Countable
 
         if (! ($backendType = strtolower($backendConfig->backend))) {
             throw new ConfigurationError(
-                'Authentication configuration for backend "%s" is missing the backend directive',
+                'Authentication configuration for backend "%s" is missing the \'backend\' directive',
                 $name
             );
         }
@@ -179,7 +179,7 @@ abstract class UserBackend implements Countable
 
         if ($backendConfig->resource === null) {
             throw new ConfigurationError(
-                'Authentication configuration for backend "%s" is missing the resource directive',
+                'Authentication configuration for backend "%s" is missing the \'resource\' directive',
                 $name
             );
         }
@@ -208,13 +208,14 @@ abstract class UserBackend implements Countable
             case 'ldap':
                 if ($backendConfig->user_class === null) {
                     throw new ConfigurationError(
-                        'Authentication configuration for backend "%s" is missing the user_class directive',
+                        'Authentication configuration for backend "%s" is missing the \'user_class\' directive',
                         $name
                     );
                 }
                 if ($backendConfig->user_name_attribute === null) {
                     throw new ConfigurationError(
-                        'Authentication configuration for backend "%s" is missing the user_name_attribute directive',
+                        'Authentication configuration for backend "%s" is'
+                        . ' missing the \'user_name_attribute\' directive',
                         $name
                     );
                 }

From 7960e911a661984a732ae8364ffe0508c89d29ca Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 22 Apr 2015 09:52:08 +0200
Subject: [PATCH 1350/2920] UserGroupBackend: Add support for custom backends
 to fetch user groups

refs #8826
refs #9122
---
 library/Icinga/Application/Modules/Module.php |  32 +++++
 .../UserGroup/UserGroupBackend.php            | 110 ++++++++++++++++--
 2 files changed, 135 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index a575b9b9a..516e6ad0f 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -192,6 +192,13 @@ class Module
      */
     protected $userBackends = array();
 
+    /**
+     * This module's user group backends
+     *
+     * @var array
+     */
+    protected $userGroupBackends = array();
+
     /**
      * Provide a search URL
      *
@@ -727,6 +734,17 @@ class Module
         return $this->userBackends;
     }
 
+    /**
+     * Return this module's user group backends
+     *
+     * @return  array
+     */
+    public function getUserGroupBackends()
+    {
+        $this->launchConfigScript();
+        return $this->userGroupBackends;
+    }
+
     /**
      * Provide a named permission
      *
@@ -816,6 +834,20 @@ class Module
         return $this;
     }
 
+    /**
+     * Provide a user group backend
+     *
+     * @param   string  $identifier     The identifier of the new backend type
+     * @param   string  $className      The name of the class
+     *
+     * @return  $this
+     */
+    protected function provideUserGroupBackend($identifier, $className)
+    {
+        $this->userGroupBackends[strtolower($identifier)] = $className;
+        return $this;
+    }
+
     /**
      * Register new namespaces on the autoloader
      *
diff --git a/library/Icinga/Authentication/UserGroup/UserGroupBackend.php b/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
index 1cc7abec5..410b5114d 100644
--- a/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Authentication\UserGroup;
 
+use Icinga\Application\Logger;
+use Icinga\Application\Icinga;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;
@@ -13,6 +15,23 @@ use Icinga\User;
  */
 abstract class UserGroupBackend
 {
+    /**
+     * The default user group backend types provided by Icinga Web 2
+     *
+     * @var array
+     */
+    private static $defaultBackends = array( // I would have liked it if I were able to declare this as constant :'(
+        'db',
+        'ini'
+    );
+
+    /**
+     * The registered custom user group backends with their identifier as key and class name as value
+     *
+     * @var array
+     */
+    protected static $customBackends;
+
     /**
      * The name of this backend
      *
@@ -43,6 +62,75 @@ abstract class UserGroupBackend
         return $this->name;
     }
 
+    /**
+     * Fetch all custom user group backends from all loaded modules
+     */
+    public static function loadCustomUserGroupBackends()
+    {
+        if (static::$customBackends !== null) {
+            return;
+        }
+
+        static::$customBackends = array();
+        $providedBy = array();
+        foreach (Icinga::app()->getModuleManager()->getLoadedModules() as $module) {
+            foreach ($module->getUserGroupBackends() as $identifier => $className) {
+                if (array_key_exists($identifier, $providedBy)) {
+                    Logger::warning(
+                        'Cannot register UserGroupBackend of type "%s" provided by module "%s".'
+                        . ' The type is already provided by module "%s"',
+                        $identifier,
+                        $module->getName(),
+                        $providedBy[$identifier]
+                    );
+                } elseif (in_array($identifier, static::$defaultBackends)) {
+                    Logger::warning(
+                        'Cannot register UserGroupBackend of type "%s" provided by module "%s".'
+                        . ' The type is a default type provided by Icinga Web 2',
+                        $identifier,
+                        $module->getName()
+                    );
+                } else {
+                    $providedBy[$identifier] = $module->getName();
+                    static::$customBackends[$identifier] = $className;
+                }
+            }
+        }
+    }
+
+    /**
+     * Validate and return the class for the given custom user group backend
+     *
+     * @param   string  $identifier     The identifier of the custom user group backend
+     *
+     * @return  string|null             The name of the class or null in case there was no
+     *                                   backend found with the given identifier
+     *
+     * @throws  ConfigurationError      In case the class could not be successfully validated
+     */
+    protected static function getCustomUserGroupBackend($identifier)
+    {
+        static::loadCustomUserGroupBackends();
+        if (array_key_exists($identifier, static::$customBackends)) {
+            $className = static::$customBackends[$identifier];
+            if (! class_exists($className)) {
+                throw new ConfigurationError(
+                    'Cannot utilize UserGroupBackend of type "%s". Class "%s" does not exist',
+                    $identifier,
+                    $className
+                );
+            } elseif (! is_subclass_of($className, __CLASS__)) {
+                throw new ConfigurationError(
+                    'Cannot utilize UserGroupBackend of type "%s". Class "%s" is not a sub-type of UserGroupBackend',
+                    $identifier,
+                    $className
+                );
+            }
+
+            return $className;
+        }
+    }
+
     /**
      * Create and return a UserGroupBackend with the given name and given configuration applied to it
      *
@@ -65,6 +153,21 @@ abstract class UserGroupBackend
                 $name
             );
         }
+        if (in_array($backendType, static::$defaultBackends)) {
+            // The default backend check is the first one because of performance reasons:
+            // Do not attempt to load a custom user group backend unless it's actually required
+        } elseif (($customClass = static::getCustomUserGroupBackend($backendType)) !== null) {
+            $backend = new $customClass($backendConfig);
+            $backend->setName($name);
+            return $backend;
+        } else {
+            throw new ConfigurationError(
+                'Configuration for user group backend "%s" defines an invalid backend type.'
+                . ' Backend type "%s" is not supported',
+                $name,
+                $backendType
+            );
+        }
 
         if ($backendConfig->resource === null) {
             throw new ConfigurationError(
@@ -81,13 +184,6 @@ abstract class UserGroupBackend
             case 'ini':
                 $backend = new IniUserGroupBackend($resource);
                 break;
-            default:
-                throw new ConfigurationError(
-                    'Configuration for user group backend "%s" defines an invalid backend type.'
-                    . ' Backend type "%s" is not supported',
-                    $name,
-                    $backendType
-                );
         }
 
         $backend->setName($name);

From adae7b34c1cb5ca03d07ee9de2baa68ae9db094a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 22 Apr 2015 10:36:37 +0200
Subject: [PATCH 1351/2920] Fix DbBackendFormTest and LdapBackendFormTest

refs #8826
---
 .../forms/Config/Authentication/DbBackendFormTest.php         | 4 ++--
 .../forms/Config/Authentication/LdapBackendFormTest.php       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
index b7d1ea3c1..010118544 100644
--- a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
+++ b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
@@ -27,7 +27,7 @@ class DbBackendFormTest extends BaseTestCase
     public function testValidBackendIsValid()
     {
         $this->setUpResourceFactoryMock();
-        Mockery::mock('overload:Icinga\Authentication\Backend\DbUserBackend')
+        Mockery::mock('overload:Icinga\Authentication\User\DbUserBackend')
             ->shouldReceive('count')
             ->andReturn(2);
 
@@ -52,7 +52,7 @@ class DbBackendFormTest extends BaseTestCase
     public function testInvalidBackendIsNotValid()
     {
         $this->setUpResourceFactoryMock();
-        Mockery::mock('overload:Icinga\Authentication\Backend\DbUserBackend')
+        Mockery::mock('overload:Icinga\Authentication\User\DbUserBackend')
             ->shouldReceive('count')
             ->andReturn(0);
 
diff --git a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
index d31033ba9..d933005b7 100644
--- a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
+++ b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
@@ -28,7 +28,7 @@ class LdapBackendFormTest extends BaseTestCase
     public function testValidBackendIsValid()
     {
         $this->setUpResourceFactoryMock();
-        Mockery::mock('overload:Icinga\Authentication\Backend\LdapUserBackend')
+        Mockery::mock('overload:Icinga\Authentication\User\LdapUserBackend')
             ->shouldReceive('assertAuthenticationPossible')->andReturnNull();
 
         $form = Mockery::mock('Icinga\Forms\Config\Authentication\LdapBackendForm[getView]');
@@ -52,7 +52,7 @@ class LdapBackendFormTest extends BaseTestCase
     public function testInvalidBackendIsNotValid()
     {
         $this->setUpResourceFactoryMock();
-        Mockery::mock('overload:Icinga\Authentication\Backend\LdapUserBackend')
+        Mockery::mock('overload:Icinga\Authentication\User\LdapUserBackend')
             ->shouldReceive('assertAuthenticationPossible')->andThrow(new AuthenticationException);
 
         $form = Mockery::mock('Icinga\Forms\Config\Authentication\LdapBackendForm[getView]');

From 9393d11c0b1b698c89e3291d4801bb249de7cc4a Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 22 Apr 2015 16:44:00 +0200
Subject: [PATCH 1352/2920] Display an error message when enabled modules
 cannot be read because /etc/icingaweb2 is not readable

resolves #9141
---
 library/Icinga/Application/Modules/Manager.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php
index 90e55f0b4..84ee5e650 100644
--- a/library/Icinga/Application/Modules/Manager.php
+++ b/library/Icinga/Application/Modules/Manager.php
@@ -101,6 +101,16 @@ class Manager
      */
     private function detectEnabledModules()
     {
+        if (false === file_exists($parent = dirname($this->enableDir))) {
+            return;
+        }
+        if (false === is_readable($parent)) {
+            throw new NotReadableError(
+                'Cannot read enabled modules. Module directory\'s parent directory "%s" is not readable',
+                $parent
+            );
+        }
+
         if (! file_exists($this->enableDir)) {
             return;
         }

From 1daecbbca0cd5d3251e81a9702f87ca60f6781f7 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 22 Apr 2015 17:04:31 +0200
Subject: [PATCH 1353/2920] Don't use `false === ...' when `! ...' is enough

---
 library/Icinga/Application/Modules/Manager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php
index 84ee5e650..e3e5ec6f2 100644
--- a/library/Icinga/Application/Modules/Manager.php
+++ b/library/Icinga/Application/Modules/Manager.php
@@ -101,10 +101,10 @@ class Manager
      */
     private function detectEnabledModules()
     {
-        if (false === file_exists($parent = dirname($this->enableDir))) {
+        if (! file_exists($parent = dirname($this->enableDir))) {
             return;
         }
-        if (false === is_readable($parent)) {
+        if (! is_readable($parent)) {
             throw new NotReadableError(
                 'Cannot read enabled modules. Module directory\'s parent directory "%s" is not readable',
                 $parent

From 9cd7765d9ed57aa9e0ebf110604d90aaed4645d2 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 22 Apr 2015 17:25:51 +0200
Subject: [PATCH 1354/2920] If session_save_path() returns '', use
 sys_get_temp_dir()

resolves #8994
---
 library/Icinga/Web/Session/PhpSession.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Session/PhpSession.php b/library/Icinga/Web/Session/PhpSession.php
index f4aa72fa3..7f47763c0 100644
--- a/library/Icinga/Web/Session/PhpSession.php
+++ b/library/Icinga/Web/Session/PhpSession.php
@@ -77,7 +77,7 @@ class PhpSession extends Session
             }
         }
 
-        $sessionSavePath = session_save_path();
+        $sessionSavePath = session_save_path() ?: sys_get_temp_dir();
         if (session_module_name() === 'files' && !is_writable($sessionSavePath)) {
             throw new ConfigurationError("Can't save session, path '$sessionSavePath' is not writable.");
         }

From 6ba6cb79404c02dc95648604148bfd0e1a89a66d Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Thu, 23 Apr 2015 11:58:54 +0200
Subject: [PATCH 1355/2920] Improve layout of dictionaries in the host and
 service detail views

resolves #8474
---
 modules/monitoring/application/views/helpers/Customvar.php | 2 +-
 modules/monitoring/public/css/module.less                  | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Customvar.php b/modules/monitoring/application/views/helpers/Customvar.php
index 32391b6ce..87bde6b77 100644
--- a/modules/monitoring/application/views/helpers/Customvar.php
+++ b/modules/monitoring/application/views/helpers/Customvar.php
@@ -38,7 +38,7 @@ class Zend_View_Helper_Customvar extends Zend_View_Helper_Abstract
 
     protected function renderObject($object)
     {
-        if (empty($object)) {
+        if (0 === count((array) $object)) {
             return '{}';
         }
         $out = "{<ul>\n";
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index f121bb66f..549328ef8 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -177,11 +177,14 @@ table.avp form.object-features div.header h4 {
   margin: 0;
 }
 
-table.avp .customvar ul {
+table.avp .customvar ul,
+table.avp .customvar ul li {
     list-style-type: none;
     margin: 0;
+    margin-top: -0.5em;
+    margin-bottom: -0.5em;
     padding: 0;
-    padding-left: 1.5em;
+    padding-left: 0.5em;
 }
 
 div.selection-info {

From e4a98430216b14218418fb16b6e15b6bfad929b6 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Thu, 23 Apr 2015 12:38:29 +0200
Subject: [PATCH 1356/2920] Show Icinga 2 boolean variables in the host and
 service detail views

resolves #8747
---
 .../monitoring/application/views/helpers/Customvar.php    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Customvar.php b/modules/monitoring/application/views/helpers/Customvar.php
index 87bde6b77..bb9f70a7e 100644
--- a/modules/monitoring/application/views/helpers/Customvar.php
+++ b/modules/monitoring/application/views/helpers/Customvar.php
@@ -15,8 +15,12 @@ class Zend_View_Helper_Customvar extends Zend_View_Helper_Abstract
 
     public function customvar($struct)
     {
-        if (is_string($struct) || is_int($struct) || is_float($struct)) {
-            return $this->view->escape((string) $struct);
+        if (is_scalar($struct)) {
+            return $this->view->escape(
+                is_string($struct)
+                    ? $struct
+                    : var_export($struct, true)
+            );
         } elseif (is_array($struct)) {
             return $this->renderArray($struct);
         } elseif (is_object($struct)) {

From a976d777b349421bde3e15ba0569dc9fbbbceb21 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Thu, 23 Apr 2015 13:31:02 +0200
Subject: [PATCH 1357/2920] Show custom variables visually separated in the
 host and service detail views

resolves #8966
---
 .../views/scripts/show/components/customvars.phtml           | 5 +++++
 modules/monitoring/public/css/module.less                    | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/customvars.phtml b/modules/monitoring/application/views/scripts/show/components/customvars.phtml
index aa2e479e4..50b82dbef 100644
--- a/modules/monitoring/application/views/scripts/show/components/customvars.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/customvars.phtml
@@ -1,3 +1,8 @@
+<tr class="newsection">
+    <td colspan="2">
+        <h4 class="customvar"><?= $this->translate('Custom variables') ?></h4>
+    </td>
+</tr>
 <?php
 
 foreach ($object->customvars as $name => $value) {
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 549328ef8..4cc68e18e 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -173,7 +173,8 @@ form.instance-features span.description, form.object-features span.description {
   }
 }
 
-table.avp form.object-features div.header h4 {
+table.avp form.object-features div.header h4,
+table.avp h4.customvar {
   margin: 0;
 }
 

From 39042ab306c85af0b5320987e959c9f2b4135718 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Thu, 23 Apr 2015 17:44:00 +0200
Subject: [PATCH 1358/2920] Log each line of a multiline log message separatly

resolves #9000
---
 library/Icinga/Application/Logger.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Application/Logger.php b/library/Icinga/Application/Logger.php
index 925695dad..61d5f4329 100644
--- a/library/Icinga/Application/Logger.php
+++ b/library/Icinga/Application/Logger.php
@@ -199,7 +199,9 @@ class Logger
                 $this->writer->log(static::ERROR, $error_message);
             }
 
-            $this->writer->log($level, $message);
+            foreach (explode("\n", $message) as $msg) {
+                $this->writer->log($level, $msg);
+            }
         }
     }
 

From a429617a9523afb270a6b9393855a48232653d5a Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 24 Apr 2015 10:17:35 +0200
Subject: [PATCH 1359/2920] Revert "Log each line of a multiline log message
 separatly"

This reverts commit 39042ab306c85af0b5320987e959c9f2b4135718.
---
 library/Icinga/Application/Logger.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/library/Icinga/Application/Logger.php b/library/Icinga/Application/Logger.php
index 61d5f4329..925695dad 100644
--- a/library/Icinga/Application/Logger.php
+++ b/library/Icinga/Application/Logger.php
@@ -199,9 +199,7 @@ class Logger
                 $this->writer->log(static::ERROR, $error_message);
             }
 
-            foreach (explode("\n", $message) as $msg) {
-                $this->writer->log($level, $msg);
-            }
+            $this->writer->log($level, $message);
         }
     }
 

From 5ba539b7c11407f751b33eb6a441180112e2ecdb Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 24 Apr 2015 10:28:45 +0200
Subject: [PATCH 1360/2920] SyslogWriter: replace \n w/ 4 spaces in multiline
 log messages

---
 library/Icinga/Application/Logger/Writer/SyslogWriter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Application/Logger/Writer/SyslogWriter.php b/library/Icinga/Application/Logger/Writer/SyslogWriter.php
index e18c5eeec..4494c9971 100644
--- a/library/Icinga/Application/Logger/Writer/SyslogWriter.php
+++ b/library/Icinga/Application/Logger/Writer/SyslogWriter.php
@@ -67,6 +67,6 @@ class SyslogWriter extends LogWriter
     public function log($level, $message)
     {
         openlog($this->ident, LOG_PID, $this->facility);
-        syslog(static::$severityMap[$level], $message);
+        syslog(static::$severityMap[$level], str_replace("\n", '    ', $message));
     }
 }

From 3d53e6f9b58654577ce7cecc9a3863f37864d614 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 24 Apr 2015 11:10:40 +0200
Subject: [PATCH 1361/2920] Icinga\Protocol\File\FileReader::count(): call
 iterator_count() only once per instance and cache the returned value

---
 library/Icinga/Protocol/File/FileReader.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Protocol/File/FileReader.php b/library/Icinga/Protocol/File/FileReader.php
index aaef31840..8fb1ed4cb 100644
--- a/library/Icinga/Protocol/File/FileReader.php
+++ b/library/Icinga/Protocol/File/FileReader.php
@@ -26,6 +26,13 @@ class FileReader implements Selectable, Countable
      */
     protected $filename;
 
+    /**
+     * Cache for static::count()
+     *
+     * @var int
+     */
+    protected $count = null;
+
     /**
      * Create a new reader
      *
@@ -71,7 +78,10 @@ class FileReader implements Selectable, Countable
      */
     public function count()
     {
-        return iterator_count($this->iterate());
+        if ($this->count === null) {
+            $this->count = iterator_count($this->iterate());
+        }
+        return $this->count;
     }
 
     /**

From ec82b3bc0902c347feec2ddef7eb008cd0ad2f15 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 24 Apr 2015 15:04:19 +0200
Subject: [PATCH 1362/2920] Implement Icinga\Protocol\File\LogFileIterator

---
 .../Icinga/Protocol/File/LogFileIterator.php  | 154 ++++++++++++++++++
 1 file changed, 154 insertions(+)
 create mode 100644 library/Icinga/Protocol/File/LogFileIterator.php

diff --git a/library/Icinga/Protocol/File/LogFileIterator.php b/library/Icinga/Protocol/File/LogFileIterator.php
new file mode 100644
index 000000000..4b587b58e
--- /dev/null
+++ b/library/Icinga/Protocol/File/LogFileIterator.php
@@ -0,0 +1,154 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Protocol\File;
+
+use Icinga\Exception\IcingaException;
+use SplFileObject;
+use Iterator;
+
+/**
+ * Iterate over a log file, yielding the regex fields of the log messages
+ */
+class LogFileIterator implements Iterator
+{
+    /**
+     * Log file
+     *
+     * @var SplFileObject
+     */
+    protected $file;
+
+    /**
+     * A PCRE string with the fields to extract
+     * from the log messages as named subpatterns
+     *
+     * @var string
+     */
+    protected $fields;
+
+    /**
+     * Value for static::current()
+     *
+     * @var string
+     */
+    protected $current;
+
+    /**
+     * Index for static::key()
+     *
+     * @var int
+     */
+    protected $index;
+
+    /**
+     * Value for static::valid()
+     *
+     * @var boolean
+     */
+    protected $valid;
+
+    /**
+     * @var string
+     */
+    protected $next = null;
+
+    /**
+     * @param string $filename      The log file's name
+     * @param string $fields        A PCRE string with the fields to extract
+     *                              from the log messages as named subpatterns
+     */
+    public function __construct($filename, $fields)
+    {
+        $this->file = new SplFileObject($filename);
+        $this->file->setFlags(
+            SplFileObject::DROP_NEW_LINE |
+            SplFileObject::READ_AHEAD
+        );
+        $this->fields = $fields;
+    }
+
+    public function rewind()
+    {
+        $this->file->rewind();
+        $this->index = 0;
+        $this->nextMessage();
+    }
+
+    public function next()
+    {
+        $this->file->next();
+        ++$this->index;
+        $this->nextMessage();
+    }
+
+    /**
+     * @return string
+     */
+    public function current()
+    {
+        return $this->current;
+    }
+
+    /**
+     * @return int
+     */
+    public function key()
+    {
+        return $this->index;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function valid()
+    {
+        return $this->valid;
+    }
+
+    protected function nextMessage()
+    {
+        $message = $this->next === null ? array() : array($this->next);
+        $this->valid = null;
+        while ($this->file->valid()) {
+            if (false === ($res = preg_match(
+                $this->fields, $current = $this->file->current()
+            ))) {
+                throw new IcingaException('Failed at preg_match()');
+            }
+            if (empty($message)) {
+                if ($res === 1) {
+                    $message[] = $current;
+                }
+            } else if ($res === 1) {
+                $this->next = $current;
+                $this->valid = true;
+                break;
+            } else {
+                $message[] = $current;
+            }
+
+            $this->file->next();
+        }
+        if ($this->valid === null) {
+            $this->next = null;
+            $this->valid = ! empty($message);
+        }
+
+        if ($this->valid) {
+            while (! empty($message)) {
+                $matches = array();
+                if (false === ($res = preg_match(
+                    $this->fields, implode(PHP_EOL, $message), $matches
+                ))) {
+                    throw new IcingaException('Failed at preg_match()');
+                }
+                if ($res === 1) {
+                    $this->current = $matches;
+                    return;
+                }
+                array_pop($message);
+            }
+            $this->valid = false;
+        }
+    }

From 7c0be30def6ab64edc800a5c503da7ca5b2dd364 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 24 Apr 2015 16:30:29 +0200
Subject: [PATCH 1363/2920] Handle and display multiline log messages correctly

---
 application/controllers/ListController.php          | 8 +++-----
 application/views/scripts/list/applicationlog.phtml | 2 +-
 library/Icinga/Protocol/File/FileReader.php         | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index 972573dc1..ca7265f0e 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -44,14 +44,12 @@ class ListController extends Controller
         }
 
         $this->addTitleTab('application log');
-        $pattern = '/^(?<datetime>[0-9]{4}(-[0-9]{2}){2}'                 // date
-                 . 'T[0-9]{2}(:[0-9]{2}){2}([\\+\\-][0-9]{2}:[0-9]{2})?)' // time
-                 . ' - (?<loglevel>[A-Za-z]+)'                            // loglevel
-                 . ' - (?<message>.*)$/';
 
         $resource = new FileReader(new ConfigObject(array(
             'filename'  => Config::app()->get('logging', 'file'),
-            'fields'    => $pattern
+            'fields'    => '/(?<!.)(?<datetime>[0-9]{4}(?:-[0-9]{2}){2}'    // date
+                . 'T[0-9]{2}(?::[0-9]{2}){2}(?:[\+\-][0-9]{2}:[0-9]{2})?)'  // time
+                . ' - (?<loglevel>[A-Za-z]+) - (?<message>.*)(?!.)/msS'     // loglevel, message
         )));
         $this->view->logData = $resource->select()->order('DESC')->paginate();
 
diff --git a/application/views/scripts/list/applicationlog.phtml b/application/views/scripts/list/applicationlog.phtml
index cc412eb9c..00102e855 100644
--- a/application/views/scripts/list/applicationlog.phtml
+++ b/application/views/scripts/list/applicationlog.phtml
@@ -19,7 +19,7 @@
                         <?= $this->escape($value->loglevel) ?>
                     </td>
                     <td>
-                        <?= $this->escape($value->message) ?>
+                        <?= nl2br($this->escape($value->message), false) ?>
                     </td>
                 </tr>
             <?php endforeach; ?>
diff --git a/library/Icinga/Protocol/File/FileReader.php b/library/Icinga/Protocol/File/FileReader.php
index 8fb1ed4cb..2c43d390a 100644
--- a/library/Icinga/Protocol/File/FileReader.php
+++ b/library/Icinga/Protocol/File/FileReader.php
@@ -58,7 +58,7 @@ class FileReader implements Selectable, Countable
      */
     public function iterate()
     {
-        return new FileIterator($this->filename, $this->fields);
+        return new LogFileIterator($this->filename, $this->fields);
     }
 
     /**

From 6f0fd7d44de11efb4631ccb5730c0b337c570560 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 27 Apr 2015 13:06:55 +0200
Subject: [PATCH 1364/2920] Remove right petrol border from plugin output in
 the host and service detail views

resolves #8967
---
 modules/monitoring/public/css/module.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 4cc68e18e..97d236966 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -32,7 +32,6 @@ p.pluginoutput {
 }
 
 div.pluginoutput {
-  border-right: solid 5px @colorPetrol;
   overflow: auto;
   color: black;
   margin-bottom: 1em;

From c839cc0b0884fa33fa0cf95c5af84c60af6f3a61 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 27 Apr 2015 13:16:54 +0200
Subject: [PATCH 1365/2920] Remove exclamation mark from the notification
 "Authentication order updated!"

resolves #8960
---
 application/forms/Config/AuthenticationBackendReorderForm.php | 2 +-
 application/locale/it_IT/LC_MESSAGES/icinga.po                | 2 +-
 application/locale/pt_BR/LC_MESSAGES/icinga.po                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/forms/Config/AuthenticationBackendReorderForm.php b/application/forms/Config/AuthenticationBackendReorderForm.php
index e4ac90c12..34f20d851 100644
--- a/application/forms/Config/AuthenticationBackendReorderForm.php
+++ b/application/forms/Config/AuthenticationBackendReorderForm.php
@@ -51,7 +51,7 @@ class AuthenticationBackendReorderForm extends ConfigForm
 
             try {
                 if ($configForm->move($backendName, $position)->save()) {
-                    Notification::success($this->translate('Authentication order updated!'));
+                    Notification::success($this->translate('Authentication order updated'));
                 } else {
                     return false;
                 }
diff --git a/application/locale/it_IT/LC_MESSAGES/icinga.po b/application/locale/it_IT/LC_MESSAGES/icinga.po
index 2b867ca14..c61195216 100644
--- a/application/locale/it_IT/LC_MESSAGES/icinga.po
+++ b/application/locale/it_IT/LC_MESSAGES/icinga.po
@@ -199,7 +199,7 @@ msgid "Authentication backend name missing"
 msgstr "Nome del Backend di autenticazione non specificato"
 
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendReorderForm.php:54
-msgid "Authentication order updated!"
+msgid "Authentication order updated"
 msgstr "Ordine di autenticazione aggiornato!"
 
 #: /usr/share/icingaweb2/application/forms/AutoRefreshForm.php:44
diff --git a/application/locale/pt_BR/LC_MESSAGES/icinga.po b/application/locale/pt_BR/LC_MESSAGES/icinga.po
index 01dc18a9f..ba35c265e 100644
--- a/application/locale/pt_BR/LC_MESSAGES/icinga.po
+++ b/application/locale/pt_BR/LC_MESSAGES/icinga.po
@@ -130,7 +130,7 @@ msgid "Authentication backend name missing"
 msgstr "Falta o nome do backend de autenticação"
 
 #: /usr/local/icingaweb/application/forms/Config/AuthenticationBackendReorderForm.php:55
-msgid "Authentication order updated!"
+msgid "Authentication order updated"
 msgstr "Ordem da autenticação atualizada!"
 
 #: /usr/local/icingaweb/application/forms/Config/AuthenticationBackendConfigForm.php:307

From 9917e63e020991bfc3895fb954968efc610a0f31 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 27 Apr 2015 13:16:54 +0200
Subject: [PATCH 1366/2920] Remove exclamation mark from the notification
 "Authentication order updated!"'s translations

---
 application/locale/it_IT/LC_MESSAGES/icinga.po | 2 +-
 application/locale/pt_BR/LC_MESSAGES/icinga.po | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/locale/it_IT/LC_MESSAGES/icinga.po b/application/locale/it_IT/LC_MESSAGES/icinga.po
index c61195216..73d616bfa 100644
--- a/application/locale/it_IT/LC_MESSAGES/icinga.po
+++ b/application/locale/it_IT/LC_MESSAGES/icinga.po
@@ -200,7 +200,7 @@ msgstr "Nome del Backend di autenticazione non specificato"
 
 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendReorderForm.php:54
 msgid "Authentication order updated"
-msgstr "Ordine di autenticazione aggiornato!"
+msgstr "Ordine di autenticazione aggiornato"
 
 #: /usr/share/icingaweb2/application/forms/AutoRefreshForm.php:44
 msgid "Auto refresh successfully disabled"
diff --git a/application/locale/pt_BR/LC_MESSAGES/icinga.po b/application/locale/pt_BR/LC_MESSAGES/icinga.po
index ba35c265e..16aba2378 100644
--- a/application/locale/pt_BR/LC_MESSAGES/icinga.po
+++ b/application/locale/pt_BR/LC_MESSAGES/icinga.po
@@ -131,7 +131,7 @@ msgstr "Falta o nome do backend de autenticação"
 
 #: /usr/local/icingaweb/application/forms/Config/AuthenticationBackendReorderForm.php:55
 msgid "Authentication order updated"
-msgstr "Ordem da autenticação atualizada!"
+msgstr "Ordem da autenticação atualizada"
 
 #: /usr/local/icingaweb/application/forms/Config/AuthenticationBackendConfigForm.php:307
 msgid "Autologin"

From f3ca80ffced18497322a74b8b49e94e88bb31cdc Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 27 Apr 2015 14:44:19 +0200
Subject: [PATCH 1367/2920] Don't fetchAll() and loop afterwards in the alert
 summary report

refs #8340
---
 .../application/controllers/AlertsummaryController.php         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index dcc805286..5b4e2e3fa 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -274,7 +274,6 @@ class Monitoring_AlertsummaryController extends Controller
         );
 
         $defects = array();
-        $records = $query->getQuery()->fetchAll();
         $period     = $this->createPeriod($interval);
 
         foreach ($period as $entry) {
@@ -282,7 +281,7 @@ class Monitoring_AlertsummaryController extends Controller
             $defects[$id] = array($id, 0);
         }
 
-        foreach ($records as $item) {
+        foreach ($query as $item) {
             $id = $this->getPeriodFormat($interval, $item->timestamp);
             if (empty($defects[$id])) {
                 $defects[$id] = array($id, 0);

From d27b94dcecdd18b59912c851234b80fdd5d93cec Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 28 Apr 2015 12:52:59 +0200
Subject: [PATCH 1368/2920] Revert "Don't fetchAll() and loop afterwards in the
 alert summary report"

This reverts commit f3ca80ffced18497322a74b8b49e94e88bb31cdc.
---
 .../application/controllers/AlertsummaryController.php         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 5b4e2e3fa..dcc805286 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -274,6 +274,7 @@ class Monitoring_AlertsummaryController extends Controller
         );
 
         $defects = array();
+        $records = $query->getQuery()->fetchAll();
         $period     = $this->createPeriod($interval);
 
         foreach ($period as $entry) {
@@ -281,7 +282,7 @@ class Monitoring_AlertsummaryController extends Controller
             $defects[$id] = array($id, 0);
         }
 
-        foreach ($query as $item) {
+        foreach ($records as $item) {
             $id = $this->getPeriodFormat($interval, $item->timestamp);
             if (empty($defects[$id])) {
                 $defects[$id] = array($id, 0);

From 3da144f1995623769a809007c4e3d3cce9b00527 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 28 Apr 2015 15:57:33 +0200
Subject: [PATCH 1369/2920] Revert "Sort LDAP user list"

This reverts commit d4dc0177c0880ca3324b6854b219cef2d2ce9300.
---
 library/Icinga/Protocol/Ldap/Connection.php          | 2 +-
 modules/setup/application/forms/AdminAccountPage.php | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 992a2f553..829545bd8 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -426,7 +426,7 @@ class Connection
             ldap_control_paged_result($this->ds, 0);
         }
 
-        return $entries;
+        return $entries; // TODO(7693): Sort entries post-processed
     }
 
     protected function cleanupAttributes($attrs)
diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 7462b18df..9b1ed06fc 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -285,9 +285,7 @@ class AdminAccountPage extends Form
         }
 
         try {
-            $users = $backend->listUsers();
-            natsort ($users);
-            return $users;
+            return $backend->listUsers();
         } catch (Exception $e) {
             // No need to handle anything special here. Error means no users found.
             return array();

From 034421d0cba6fcf117445e04746663b8e50fc5ed Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 30 Apr 2015 15:20:19 +0200
Subject: [PATCH 1370/2920] Fix form tests utilizing Mockery's partial mock
 functionality

Since an update of Mockery, partial mocks do not call the constructor
of their mocked classes anymore without explicitly passing a non empty
array. This is a regression of the following bug:
https://github.com/padraic/mockery/issues/144
---
 .../forms/Config/Authentication/DbBackendFormTest.php       | 6 ++++--
 .../forms/Config/Authentication/LdapBackendFormTest.php     | 6 ++++--
 .../forms/Config/Resource/LdapResourceFormTest.php          | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
index b7d1ea3c1..fb93f6050 100644
--- a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
+++ b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
@@ -31,7 +31,8 @@ class DbBackendFormTest extends BaseTestCase
             ->shouldReceive('count')
             ->andReturn(2);
 
-        $form = Mockery::mock('Icinga\Forms\Config\Authentication\DbBackendForm[getView]');
+        // Passing array(null) is required to make Mockery call the constructor...
+        $form = Mockery::mock('Icinga\Forms\Config\Authentication\DbBackendForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
             ->andReturnUsing(function ($s) { return $s; });
@@ -56,7 +57,8 @@ class DbBackendFormTest extends BaseTestCase
             ->shouldReceive('count')
             ->andReturn(0);
 
-        $form = Mockery::mock('Icinga\Forms\Config\Authentication\DbBackendForm[getView]');
+        // Passing array(null) is required to make Mockery call the constructor...
+        $form = Mockery::mock('Icinga\Forms\Config\Authentication\DbBackendForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
             ->andReturnUsing(function ($s) { return $s; });
diff --git a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
index d31033ba9..56ea08987 100644
--- a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
+++ b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
@@ -31,7 +31,8 @@ class LdapBackendFormTest extends BaseTestCase
         Mockery::mock('overload:Icinga\Authentication\Backend\LdapUserBackend')
             ->shouldReceive('assertAuthenticationPossible')->andReturnNull();
 
-        $form = Mockery::mock('Icinga\Forms\Config\Authentication\LdapBackendForm[getView]');
+        // Passing array(null) is required to make Mockery call the constructor...
+        $form = Mockery::mock('Icinga\Forms\Config\Authentication\LdapBackendForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
             ->andReturnUsing(function ($s) { return $s; });
@@ -55,7 +56,8 @@ class LdapBackendFormTest extends BaseTestCase
         Mockery::mock('overload:Icinga\Authentication\Backend\LdapUserBackend')
             ->shouldReceive('assertAuthenticationPossible')->andThrow(new AuthenticationException);
 
-        $form = Mockery::mock('Icinga\Forms\Config\Authentication\LdapBackendForm[getView]');
+        // Passing array(null) is required to make Mockery call the constructor...
+        $form = Mockery::mock('Icinga\Forms\Config\Authentication\LdapBackendForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
             ->andReturnUsing(function ($s) { return $s; });
diff --git a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
index d074f1b3b..f382f8bb8 100644
--- a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
+++ b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
@@ -29,7 +29,8 @@ class LdapResourceFormTest extends BaseTestCase
             Mockery::mock()->shouldReceive('testCredentials')->once()->andReturn(true)->getMock()
         );
 
-        $form = Mockery::mock('Icinga\Forms\Config\Resource\LdapResourceForm[getView]');
+        // Passing array(null) is required to make Mockery call the constructor...
+        $form = Mockery::mock('Icinga\Forms\Config\Resource\LdapResourceForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
             ->andReturnUsing(function ($s) { return $s; });
@@ -51,7 +52,8 @@ class LdapResourceFormTest extends BaseTestCase
             Mockery::mock()->shouldReceive('testCredentials')->once()->andThrow('\Exception')->getMock()
         );
 
-        $form = Mockery::mock('Icinga\Forms\Config\Resource\LdapResourceForm[getView]');
+        // Passing array(null) is required to make Mockery call the constructor...
+        $form = Mockery::mock('Icinga\Forms\Config\Resource\LdapResourceForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
             ->andReturnUsing(function ($s) { return $s; });

From 7f28c0a2372694b0a55df4f107dfe3933ce290b6 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 30 Apr 2015 16:06:05 +0200
Subject: [PATCH 1371/2920] Implement ProblemMenuItemRenderer

refs # 4139
---
 library/Icinga/Web/Menu.php                   | 23 ++++++-
 .../Web/Menu/ProblemMenuItemRenderer.php      | 64 +++++++++++++++++++
 2 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 library/Icinga/Web/Menu/ProblemMenuItemRenderer.php

diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index bca1e17d1..476d73879 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -234,7 +234,8 @@ class Menu implements RecursiveIterator
 
             $section = $this->add(t('System'), array(
                 'icon'     => 'wrench',
-                'priority' => 200
+                'priority' => 200,
+                'renderer' => 'ProblemMenuItemRenderer'
             ));
             $section->add(t('Configuration'), array(
                 'url'           => 'config',
@@ -469,6 +470,26 @@ class Menu implements RecursiveIterator
         return $this->permission;
     }
 
+    /**
+     * Get parent menu
+     *
+     * @return \Icinga\Web\Menu
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Get submenus
+     *
+     * @return array
+     */
+    public function getSubMenus()
+    {
+        return $this->subMenus;
+    }
+
     /**
      * Set permission a user is required to have granted to display the menu item
      *
diff --git a/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php b/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php
new file mode 100644
index 000000000..010bdc034
--- /dev/null
+++ b/library/Icinga/Web/Menu/ProblemMenuItemRenderer.php
@@ -0,0 +1,64 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Web\Menu;
+
+use Icinga\Web\Menu;
+
+class ProblemMenuItemRenderer extends MenuItemRenderer
+{
+    /**
+     * Set of summarized problems from submenus
+     *
+     * @var array
+     */
+    protected $summary = array();
+
+    /**
+     * Renders the html content of a single menu item and summarizes submenu problems
+     *
+     * @param Menu $menu
+     *
+     * @return string
+     */
+    public function render(Menu $menu)
+    {
+        if ($menu->getParent() !== null && $menu->hasSubMenus()) {
+            /** @var $submenu Menu */
+            foreach ($menu->getSubMenus() as $submenu) {
+                $renderer = $submenu->getRenderer();
+                if (method_exists($renderer, 'getSummary')) {
+                    if ($renderer->getSummary() !== null) {
+                        $this->summary[] =  $renderer->getSummary();
+                    }
+                }
+            }
+        }
+        return $this->getBadge() . $this->createLink($menu);
+    }
+
+    /**
+     * Get the problem badge
+     *
+     * @return string
+     */
+    protected function getBadge()
+    {
+        if (count($this->summary) > 0) {
+            $problems = 0;
+            $titles = array();
+
+            foreach ($this->summary as $summary) {
+                $problems += $summary['problems'];
+                $titles[] = $summary['title'];
+            }
+
+            return sprintf(
+                '<div title="%s" class="badge-container"><span class="badge badge-critical">%s</span></div>',
+                implode(', ', $titles),
+                $problems
+            );
+        }
+        return '';
+    }
+}

From 5075ccdf38698d03fb11b8f02cd4ae77fdd14826 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 30 Apr 2015 16:08:10 +0200
Subject: [PATCH 1372/2920] Add ProblemMenuItemRenderer to system menu as
 renderer

refs #4139
---
 modules/monitoring/configuration.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index a7f8047c4..fd3ee334d 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -208,7 +208,8 @@ $section->add($this->translate('Alert Summary'), array(
 $section = $this->menuSection($this->translate('System'));
 $section->add($this->translate('Monitoring Health'), array(
     'url'      => 'monitoring/process/info',
-    'priority' => 120
+    'priority' => 120,
+    'renderer'  => 'Icinga\Module\Monitoring\Web\Menu\BackendAvailabilityMenuItemRenderer'
 ));
 
 /*

From 880b1eb21a2740aac5a0ea6df1eabefb1ddcfc6a Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 30 Apr 2015 16:12:36 +0200
Subject: [PATCH 1373/2920] Add better styling for backend-not-running class

refs #4139
---
 modules/monitoring/public/css/module.less | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 4cc68e18e..881e38f09 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -173,19 +173,15 @@ form.instance-features span.description, form.object-features span.description {
   }
 }
 
-table.avp form.object-features div.header h4,
-table.avp h4.customvar {
+table.avp form.object-features div.header h4 {
   margin: 0;
 }
 
-table.avp .customvar ul,
-table.avp .customvar ul li {
+table.avp .customvar ul {
     list-style-type: none;
     margin: 0;
-    margin-top: -0.5em;
-    margin-bottom: -0.5em;
     padding: 0;
-    padding-left: 0.5em;
+    padding-left: 1.5em;
 }
 
 div.selection-info {
@@ -219,3 +215,10 @@ hr.command-separator {
   border: none;
   border-bottom: 2px solid @colorPetrol;
 }
+
+div.backend-not-running {
+  background: @colorCritical;
+  color: white;
+  text-align: center;
+  padding: 0.1em;
+}

From 8484a27b5685f22ab209808c453893b04186c548 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 30 Apr 2015 16:13:10 +0200
Subject: [PATCH 1374/2920] Add a backend problem menu item renderer to system
 menu

refs #4139
---
 .../BackendAvailabilityMenuItemRenderer.php   | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Web/Menu/BackendAvailabilityMenuItemRenderer.php

diff --git a/modules/monitoring/library/Monitoring/Web/Menu/BackendAvailabilityMenuItemRenderer.php b/modules/monitoring/library/Monitoring/Web/Menu/BackendAvailabilityMenuItemRenderer.php
new file mode 100644
index 000000000..186351a40
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Web/Menu/BackendAvailabilityMenuItemRenderer.php
@@ -0,0 +1,62 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Web\Menu;
+
+use Icinga\Web\Menu as Menu;
+use Icinga\Module\Monitoring\Backend\MonitoringBackend;
+use Icinga\Web\Menu\MenuItemRenderer;
+
+class BackendAvailabilityMenuItemRenderer extends MenuItemRenderer
+{
+    /**
+     * Checks whether the monitoring backend is running or not
+     *
+     * @return mixed
+     */
+    protected function isCurrentlyRunning()
+    {
+        return MonitoringBackend::instance()->select()->from(
+            'programstatus',
+            array(
+                'is_currently_running'
+            )
+        )->getQuery()->fetchRow()->is_currently_running;
+    }
+
+    /**
+     * @see MenuItemRenderer::render()
+     */
+    public function render(Menu $menu)
+    {
+        return $this->getBadge() . $this->createLink($menu);
+    }
+
+    protected function getBadge()
+    {
+        if (! (bool)$this->isCurrentlyRunning()) {
+            return sprintf(
+                '<div title="%s" class="badge-container"><span class="badge badge-critical">%s</span></div>',
+                mt('monitoring', 'monitoring backend is not running'),
+                1
+            );
+        }
+        return '';
+    }
+
+    /**
+     * Get the problem data for the summary
+     *
+     * @return array|null
+     */
+    public function getSummary()
+    {
+        if (! (bool)$this->isCurrentlyRunning()) {
+            return array(
+                'problems' => 1,
+                'title' => mt('monitoring', 'monitoring backend is not running')
+            );
+        }
+        return null;
+    }
+}

From d43f4729f10797c8388578852323de2e7aa440c8 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Thu, 30 Apr 2015 17:25:14 +0200
Subject: [PATCH 1375/2920] Monitoring_ListController::filterQuery(): preserve
 parameter `_dev'

resolves #8453
---
 .../monitoring/application/controllers/ListController.php    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 9eb014421..e6147c31b 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -684,7 +684,10 @@ class Monitoring_ListController extends Controller
     {
         $editor = Widget::create('filterEditor')
             ->setQuery($query)
-            ->preserveParams('limit', 'sort', 'dir', 'format', 'view', 'backend', 'stateType', 'addColumns')
+            ->preserveParams(
+                'limit', 'sort', 'dir', 'format', 'view', 'backend',
+                'stateType', 'addColumns', '_dev'
+            )
             ->ignoreParams('page')
             ->handleRequest($this->getRequest());
         $query->applyFilter($editor->getFilter());

From ffe23a184f0a1659ffeb8cfc0d05a7b36fd9a7c1 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Thu, 30 Apr 2015 17:47:23 +0200
Subject: [PATCH 1376/2920] Don't display "Add To Dashboard" on the dashboard

resolves #9026
---
 library/Icinga/Web/Widget/Tabextension/DashboardSettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php b/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
index f05786a0c..f6b2cad2c 100644
--- a/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
+++ b/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
@@ -22,7 +22,7 @@ class DashboardSettings implements Tabextension
             'dashboard_add',
             array(
                 'icon'      => 'img/icons/dashboard.png',
-                'label'     => t('Add To Dashboard'),
+                'label'     => t('Add New Pane Or Dashlet'),
                 'url'       => Url::fromPath('dashboard/new-dashlet')
             )
         );

From ab0b478e4f40c9a5f796d26adae4bacf50fabef1 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Thu, 30 Apr 2015 17:49:42 +0200
Subject: [PATCH 1377/2920] 
 Icinga\Web\Widget\Tabextension\DashboardAction::apply(): translate label "Add
 To Dashboard"

---
 library/Icinga/Web/Widget/Tabextension/DashboardAction.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
index ca9bc99be..569bc6f67 100644
--- a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
+++ b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
@@ -24,7 +24,7 @@ class DashboardAction implements Tabextension
             'dashboard',
             array(
                 'icon'      => 'dashboard',
-                'label'     => 'Add To Dashboard',
+                'label'     => t('Add To Dashboard'),
                 'url'       => Url::fromPath('dashboard/new-dashlet'),
                 'urlParams' => array(
                     'url' => rawurlencode(Url::fromRequest()->getRelativeUrl())

From ca5ef2da2bb9ce21701a32a668c149c0608fc8bb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 11:07:50 +0200
Subject: [PATCH 1378/2920] Merge Queryable into QueryInterface

A *Query*Interface describes an object as being queryable, now.

refs #8826
---
 library/Icinga/Data/QueryInterface.php | 2 +-
 library/Icinga/Data/SimpleQuery.php    | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Data/QueryInterface.php b/library/Icinga/Data/QueryInterface.php
index 4d43d1059..7f82c8c09 100644
--- a/library/Icinga/Data/QueryInterface.php
+++ b/library/Icinga/Data/QueryInterface.php
@@ -5,4 +5,4 @@ namespace Icinga\Data;
 
 use Countable;
 
-interface QueryInterface extends Browsable, Fetchable, Filterable, Limitable, Sortable, Countable {};
+interface QueryInterface extends Queryable, Browsable, Fetchable, Filterable, Limitable, Sortable, Countable {};
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 16f82cbe4..ea8eca3d2 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -3,14 +3,13 @@
 
 namespace Icinga\Data;
 
+use Zend_Paginator;
 use Icinga\Application\Icinga;
 use Icinga\Data\Filter\Filter;
-use Icinga\Web\Paginator\Adapter\QueryAdapter;
-use Zend_Paginator;
-use Exception;
 use Icinga\Exception\IcingaException;
+use Icinga\Web\Paginator\Adapter\QueryAdapter;
 
-class SimpleQuery implements QueryInterface, Queryable
+class SimpleQuery implements QueryInterface
 {
     /**
      * Query data source

From e7789ed6403d7e338ac128fc0b80f72c94d9f12a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 11:12:43 +0200
Subject: [PATCH 1379/2920] SimpleQuery: Rename unused property `table' to
 `target'

`target' is already in use, but was not declared. `table' was declared but not
used anywhere. So `table' is now `target'.
---
 library/Icinga/Data/SimpleQuery.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index ea8eca3d2..a069e03cd 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -19,9 +19,11 @@ class SimpleQuery implements QueryInterface
     protected $ds;
 
     /**
-     * The table you are going to query
+     * The target you are going to query
+     *
+     * @var mixed
      */
-    protected $table;
+    protected $target;
 
     /**
      * The columns you asked for
@@ -101,11 +103,14 @@ class SimpleQuery implements QueryInterface
     }
 
     /**
-     * Choose a table and the colums you are interested in
+     * Choose a table and the columns you are interested in
      *
-     * Query will return all available columns if none are given here
+     * Query will return all available columns if none are given here.
      *
-     * @return $this
+     * @param   mixed   $target
+     * @param   array   $fields
+     *
+     * @return  $this
      */
     public function from($target, array $fields = null)
     {

From ecd059dec543795529539fd0aa4db2d928d6bcb7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 11:13:38 +0200
Subject: [PATCH 1380/2920] DbConnection: select() returns a DbQuery, not a
 Query

---
 library/Icinga/Data/Db/DbConnection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php
index d1817d24a..83c74fb8e 100644
--- a/library/Icinga/Data/Db/DbConnection.php
+++ b/library/Icinga/Data/Db/DbConnection.php
@@ -72,7 +72,7 @@ class DbConnection implements Selectable
     /**
      * Provide a query on this connection
      *
-     * @return Query
+     * @return  DbQuery
      */
     public function select()
     {

From 7178026b8bdf06700a6fecb06f0953a2a6dd9616 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 11:15:20 +0200
Subject: [PATCH 1381/2920] Ldap\Connection: Implement interface Selectable

refs #8826
---
 library/Icinga/Protocol/Ldap/Connection.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 829545bd8..de7d7b628 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -3,12 +3,13 @@
 
 namespace Icinga\Protocol\Ldap;
 
-use Icinga\Exception\ProgrammingError;
-use Icinga\Protocol\Ldap\Exception as LdapException;
-use Icinga\Application\Platform;
 use Icinga\Application\Config;
 use Icinga\Application\Logger;
+use Icinga\Application\Platform;
 use Icinga\Data\ConfigObject;
+use Icinga\Data\Selectable;
+use Icinga\Exception\ProgrammingError;
+use Icinga\Protocol\Ldap\Exception as LdapException;
 
 /**
  * Backend class managing all the LDAP stuff for you.
@@ -24,7 +25,7 @@ use Icinga\Data\ConfigObject;
  * ));
  * </code>
  */
-class Connection
+class Connection implements Selectable
 {
     const LDAP_NO_SUCH_OBJECT = 32;
     const LDAP_SIZELIMIT_EXCEEDED = 4;
@@ -122,6 +123,11 @@ class Connection
         return $this->root;
     }
 
+    /**
+     * Provide a query on this connection
+     *
+     * @return  Query
+     */
     public function select()
     {
         return new Query($this);

From 99213432f51aeb22d69a22886f72f5964a13e9c3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 11:16:16 +0200
Subject: [PATCH 1382/2920] Ldap\Connection: Rename fetchDN() to fetchDn()

We're using CamelCase names for methods.
---
 library/Icinga/Protocol/Ldap/Connection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index de7d7b628..f7567b6e7 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -204,7 +204,7 @@ class Connection implements Selectable
      * @return string        Returns the distinguished name, or false when the given query yields no results
      * @throws LdapException When the query result is empty and contains no DN to fetch
      */
-    public function fetchDN(Query $query, $fields = array())
+    public function fetchDn(Query $query, $fields = array())
     {
         $rows = $this->fetchAll($query, $fields);
         if (count($rows) > 1) {

From 5baa0590b16db240028ebd577c4b87345e783aa9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 11:26:27 +0200
Subject: [PATCH 1383/2920] Ldap\Query: Extend SimpleQuery and add missing
 documentation

refs #8826
refs #8955
---
 library/Icinga/Protocol/Ldap/Connection.php   |  40 ++-
 library/Icinga/Protocol/Ldap/Query.php        | 340 ++++++------------
 .../Icinga/Protocol/Ldap/QueryTest.php        |  63 +---
 3 files changed, 135 insertions(+), 308 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index f7567b6e7..6193d630f 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -210,7 +210,7 @@ class Connection implements Selectable
         if (count($rows) > 1) {
             throw new LdapException(
                 'Cannot fetch single DN for %s',
-                $query->create()
+                $query
             );
         }
         return key($rows);
@@ -272,16 +272,20 @@ class Connection implements Selectable
      * @return array            The matched entries
      * @throws LdapException
      */
-    protected function runQuery(Query $query, $fields = array())
+    protected function runQuery(Query $query, array $fields = null)
     {
         $limit = $query->getLimit();
         $offset = $query->hasOffset() ? $query->getOffset() - 1 : 0;
 
+        if (empty($fields)) {
+            $fields = $query->getColumns();
+        }
+
         $results = @ldap_search(
             $this->ds,
-            $query->hasBase() ? $query->getBase() : $this->root_dn,
-            $query->create(),
-            empty($fields) ? $query->listFields() : $fields,
+            $query->getBase() ?: $this->root_dn,
+            (string) $query,
+            array_values($fields),
             0, // Attributes and values
             $limit ? $offset + $limit : 0
         );
@@ -292,8 +296,8 @@ class Connection implements Selectable
 
             throw new LdapException(
                 'LDAP query "%s" (base %s) failed. Error: %s',
-                $query->create(),
-                $query->hasBase() ? $query->getBase() : $this->root_dn,
+                $query,
+                $query->getBase() ?: $this->root_dn,
                 ldap_error($this->ds)
             );
         } elseif (ldap_count_entries($this->ds, $results) === 0) {
@@ -336,28 +340,29 @@ class Connection implements Selectable
      *
      * @param Query $query      The query to execute
      * @param array $fields     The fields that will be fetched from the matches
-     * @param int   $page_size  The maximum page size, defaults to Connection::PAGE_SIZE
+     * @param int   $pageSize   The maximum page size, defaults to Connection::PAGE_SIZE
      *
      * @return array            The matched entries
      * @throws LdapException
      * @throws ProgrammingError When executed without available page controls (check with pageControlAvailable() )
      */
-    protected function runPagedQuery(Query $query, $fields = array(), $pageSize = null)
+    protected function runPagedQuery(Query $query, array $fields = null, $pageSize = null)
     {
         if (! $this->pageControlAvailable($query)) {
             throw new ProgrammingError('LDAP: Page control not available.');
         }
+
         if (! isset($pageSize)) {
             $pageSize = static::PAGE_SIZE;
         }
 
         $limit = $query->getLimit();
         $offset = $query->hasOffset() ? $query->getOffset() - 1 : 0;
-        $queryString = $query->create();
-        $base = $query->hasBase() ? $query->getBase() : $this->root_dn;
+        $queryString = (string) $query;
+        $base = $query->getBase() ?: $this->root_dn;
 
         if (empty($fields)) {
-            $fields = $query->listFields();
+            $fields = $query->getColumns();
         }
 
         $count = 0;
@@ -368,7 +373,14 @@ class Connection implements Selectable
             // possibillity  server to return an answer in case the pagination extension is missing.
             ldap_control_paged_result($this->ds, $pageSize, false, $cookie);
 
-            $results = @ldap_search($this->ds, $base, $queryString, $fields, 0, $limit ? $offset + $limit : 0);
+            $results = @ldap_search(
+                $this->ds,
+                $base,
+                $queryString,
+                array_values($fields),
+                0, // Attributes and values
+                $limit ? $offset + $limit : 0
+            );
             if ($results === false) {
                 if (ldap_errno($this->ds) === self::LDAP_NO_SUCH_OBJECT) {
                     break;
@@ -426,7 +438,7 @@ class Connection implements Selectable
             // pagedResultsControl with the size set to zero (0) and the cookie set to the last cookie returned by
             // the server: https://www.ietf.org/rfc/rfc2696.txt
             ldap_control_paged_result($this->ds, 0, false, $cookie);
-            ldap_search($this->ds, $base, $queryString, $fields); // Returns no entries, due to the page size
+            ldap_search($this->ds, $base, $queryString); // Returns no entries, due to the page size
         } else {
             // Reset the paged search request so that subsequent requests succeed
             ldap_control_paged_result($this->ds, 0);
diff --git a/library/Icinga/Protocol/Ldap/Query.php b/library/Icinga/Protocol/Ldap/Query.php
index f82a40511..d923c8ebd 100644
--- a/library/Icinga/Protocol/Ldap/Query.php
+++ b/library/Icinga/Protocol/Ldap/Query.php
@@ -3,151 +3,151 @@
 
 namespace Icinga\Protocol\Ldap;
 
+use Icinga\Data\SimpleQuery;
+use Icinga\Data\Filter\Filter;
+use Icinga\Exception\NotImplementedError;
+
 /**
- * Search class
- *
- * @package Icinga\Protocol\Ldap
+ * LDAP query class
  */
-/**
- * Search abstraction class
- *
- * Usage example:
- *
- * <code>
- * $connection->select()->from('user')->where('sAMAccountName = ?', 'icinga');
- * </code>
- *
- * @copyright  Copyright (c) 2013 Icinga-Web Team <info@icinga.org>
- * @author     Icinga-Web Team <info@icinga.org>
- * @package    Icinga\Protocol\Ldap
- * @license    http://www.gnu.org/copyleft/gpl.html GNU General Public License
- */
-class Query
+class Query extends SimpleQuery
 {
-    protected $connection;
-    protected $filters = array();
-    protected $fields = array();
-    protected $limit_count = 0;
-    protected $limit_offset = 0;
-    protected $sort_columns = array();
-    protected $count;
-    protected $base;
-    protected $usePagedResults = true;
+    /**
+     * This query's filters
+     *
+     * Currently just a basic key/value pair based array. Can be removed once Icinga\Data\Filter is supported.
+     *
+     * @var array
+     */
+    protected $filters;
 
     /**
-     * Constructor
+     * The base dn being used for this query
      *
-     * @param Connection LDAP Connection object
-     * @return void
+     * @var string
      */
-    public function __construct(Connection $connection)
+    protected $base;
+
+    /**
+     * Whether this query is permitted to utilize paged results
+     *
+     * @var bool
+     */
+    protected $usePagedResults;
+
+    /**
+     * Initialize this query
+     */
+    protected function init()
     {
-        $this->connection = $connection;
+        $this->filters = array();
+        $this->usePagedResults = true;
     }
 
+    /**
+     * Set the base dn to be used for this query
+     *
+     * @param   string  $base
+     *
+     * @return  $this
+     */
     public function setBase($base)
     {
         $this->base = $base;
         return $this;
     }
 
-    public function hasBase()
-    {
-        return $this->base !== null;
-    }
-
+    /**
+     * Return the base dn being used for this query
+     *
+     * @return  string
+     */
     public function getBase()
     {
         return $this->base;
     }
 
+    /**
+     * Set whether this query is permitted to utilize paged results
+     *
+     * @param   bool    $state
+     *
+     * @return  $this
+     */
     public function setUsePagedResults($state = true)
     {
         $this->usePagedResults = (bool) $state;
         return $this;
     }
 
+    /**
+     * Return whether this query is permitted to utilize paged results
+     *
+     * @return  bool
+     */
     public function getUsePagedResults()
     {
         return $this->usePagedResults;
     }
 
     /**
-     * Count result set, ignoring limits
+     * Choose an objectClass and the columns you are interested in
      *
-     * @return int
+     * {@inheritdoc} This creates an objectClass filter.
      */
-    public function count()
+    public function from($target, array $fields = null)
     {
-        if ($this->count === null) {
-            $this->count = $this->connection->count($this);
-        }
-        return $this->count;
+        $this->filters['objectClass'] = $target;
+        return parent::from($target, $fields);
     }
 
     /**
-     * Count result set, ignoring limits
+     * Add a new filter to the query
      *
-     * @return int
+     * @param   string      $condition  Column to search in
+     * @param   mixed       $value      Value to look for (asterisk wildcards are allowed)
+     *
+     * @return  $this
      */
-    public function limit($count = null, $offset = null)
+    public function where($condition, $value = null)
     {
-        if (! preg_match('~^\d+~', $count . $offset)) {
-            throw new Exception(
-                'Got invalid limit: %s, %s',
-                $count,
-                $offset
-            );
+        // TODO: Adjust this once support for Icinga\Data\Filter is available
+        if ($condition instanceof Expression) {
+            $this->filters[] = $condition;
+        } else {
+            $this->filters[$condition] = $value;
         }
-        $this->limit_count  = (int) $count;
-        $this->limit_offset = (int) $offset;
+
         return $this;
     }
 
-    /**
-     * Whether a limit has been set
-     *
-     * @return boolean
-     */
-    public function hasLimit()
+    public function getFilter()
     {
-        return $this->limit_count > 0;
+        throw new NotImplementedError('Support for Icinga\Data\Filter is still missing. Use $this->where() instead');
     }
 
-    /**
-     * Whether an offset (limit) has been set
-     *
-     * @return boolean
-     */
-    public function hasOffset()
+    public function applyFilter(Filter $filter)
     {
-        return $this->limit_offset > 0;
+        throw new NotImplementedError('Support for Icinga\Data\Filter is still missing. Use $this->where() instead');
     }
 
-    /**
-     * Retrieve result limit
-     *
-     * @return int
-     */
-    public function getLimit()
+    public function addFilter(Filter $filter)
     {
-        return $this->limit_count;
+        throw new NotImplementedError('Support for Icinga\Data\Filter is still missing. Use $this->where() instead');
     }
 
-    /**
-     * Retrieve result offset
-     *
-     * @return int
-     */
-    public function getOffset()
+    public function setFilter(Filter $filter)
     {
-        return $this->limit_offset;
+        throw new NotImplementedError('Support for Icinga\Data\Filter is still missing. Use $this->where() instead');
     }
 
     /**
      * Fetch result as tree
      *
-     * @return Node
+     * @return  Root
+     *
+     * @todo    This is untested waste, not being used anywhere and ignores the query's order and base dn.
+     *           Evaluate whether it's reasonable to properly implement and test it.
      */
     public function fetchTree()
     {
@@ -179,157 +179,32 @@ class Query
     }
 
     /**
-     * Fetch result as an array of objects
+     * Fetch the distinguished name of the first result
      *
-     * @return array
+     * @return  string|false    The distinguished name or false in case it's not possible to fetch a result
+     *
+     * @throws  Exception       In case the query returns multiple results
+     *                          (i.e. it's not possible to fetch a unique DN)
      */
-    public function fetchAll()
+    public function fetchDn()
     {
-        return $this->connection->fetchAll($this);
+        return $this->ds->fetchDn($this);
     }
 
     /**
-     * Fetch first result row
+     * Return the LDAP filter to be applied on this query
      *
-     * @return object
+     * @return  string
+     *
+     * @throws  Exception   In case the objectClass filter does not exist
      */
-    public function fetchRow()
+    protected function renderFilter()
     {
-        return $this->connection->fetchRow($this);
-    }
-
-    /**
-     * Fetch first column value from first result row
-     *
-     * @return mixed
-     */
-    public function fetchOne()
-    {
-        return $this->connection->fetchOne($this);
-    }
-
-    /**
-     * Fetch a key/value list, first column is key, second is value
-     *
-     * @return array
-     */
-    public function fetchPairs()
-    {
-        // STILL TODO!!
-        return $this->connection->fetchPairs($this);
-    }
-
-    /**
-     * Where to select (which fields) from
-     *
-     * This creates an objectClass filter
-     *
-     * @return Query
-     */
-    public function from($objectClass, $fields = array())
-    {
-        $this->filters['objectClass'] = $objectClass;
-        $this->fields = $fields;
-        return $this;
-    }
-
-    /**
-     * Add a new filter to the query
-     *
-     * @param  string  Column to search in
-     * @param  string  Filter text (asterisks are allowed)
-     * @return Query
-     */
-    public function where($key, $val)
-    {
-        $this->filters[$key] = $val;
-        return $this;
-    }
-
-    /**
-     * Sort by given column
-     *
-     * TODO: Sort direction is not implemented yet
-     *
-     * @param  string  Order column
-     * @param  string  Order direction
-     * @return Query
-     */
-    public function order($column, $direction = 'ASC')
-    {
-        $this->sort_columns[] = array($column, $direction);
-        return $this;
-    }
-
-    /**
-     * Retrieve a list of the desired fields
-     *
-     * @return array
-     */
-    public function listFields()
-    {
-        return $this->fields;
-    }
-
-    /**
-     * Retrieve a list containing current sort columns
-     *
-     * @return array
-     */
-    public function getSortColumns()
-    {
-        return $this->sort_columns;
-    }
-
-    /**
-     * Return a pagination adapter for the current query
-     *
-     * @return \Zend_Paginator
-     */
-    public function paginate($limit = null, $page = null)
-    {
-        if ($page === null || $limit === null) {
-            $request = \Zend_Controller_Front::getInstance()->getRequest();
-            if ($page === null) {
-                $page = $request->getParam('page', 0);
-            }
-            if ($limit === null) {
-                $limit = $request->getParam('limit', 20);
-            }
-        }
-        $paginator = new \Zend_Paginator(
-            // TODO: Adapter doesn't fit yet:
-            new \Icinga\Web\Paginator\Adapter\QueryAdapter($this)
-        );
-        $paginator->setItemCountPerPage($limit);
-        $paginator->setCurrentPageNumber($page);
-        return $paginator;
-    }
-
-    /**
-     * Add a filter expression to this query
-     *
-     * @param   Expression  $expression
-     *
-     * @return  Query
-     */
-    public function addFilter(Expression $expression)
-    {
-        $this->filters[] = $expression;
-        return $this;
-    }
-
-    /**
-     * Returns the LDAP filter that will be applied
-     *
-     * @string
-     */
-    public function create()
-    {
-        $parts = array();
-        if (! isset($this->filters['objectClass']) || $this->filters['objectClass'] === null) {
+        if (! isset($this->filters['objectClass'])) {
             throw new Exception('Object class is mandatory');
         }
+
+        $parts = array();
         foreach ($this->filters as $key => $value) {
             if ($value instanceof Expression) {
                 $parts[] = (string) $value;
@@ -341,6 +216,7 @@ class Query
                 );
             }
         }
+
         if (count($parts) > 1) {
             return '(&(' . implode(')(', $parts) . '))';
         } else {
@@ -348,17 +224,13 @@ class Query
         }
     }
 
+    /**
+     * Return the LDAP filter to be applied on this query
+     *
+     * @return  string
+     */
     public function __toString()
     {
-        return $this->create();
-    }
-
-    /**
-     * Descructor
-     */
-    public function __destruct()
-    {
-        // To be on the safe side:
-        unset($this->connection);
+        return $this->renderFilter();
     }
 }
diff --git a/test/php/library/Icinga/Protocol/Ldap/QueryTest.php b/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
index 589dc8f36..44e47df78 100644
--- a/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
+++ b/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
@@ -36,51 +36,11 @@ class QueryTest extends BaseTestCase
         return $select;
     }
 
-    public function testLimit()
-    {
-        $select = $this->prepareSelect();
-        $this->assertEquals(10, $select->getLimit());
-        $this->assertEquals(4, $select->getOffset());
-    }
-
-    public function testHasLimit()
-    {
-        $select = $this->emptySelect();
-        $this->assertFalse($select->hasLimit());
-        $select = $this->prepareSelect();
-        $this->assertTrue($select->hasLimit());
-    }
-
-    public function testHasOffset()
-    {
-        $select = $this->emptySelect();
-        $this->assertFalse($select->hasOffset());
-        $select = $this->prepareSelect();
-        $this->assertTrue($select->hasOffset());
-    }
-
-    public function testGetLimit()
-    {
-        $select = $this->prepareSelect();
-        $this->assertEquals(10, $select->getLimit());
-    }
-
-    public function testGetOffset()
-    {
-        $select = $this->prepareSelect();
-        $this->assertEquals(10, $select->getLimit());
-    }
-
     public function testFetchTree()
     {
         $this->markTestIncomplete('testFetchTree is not implemented yet - requires real LDAP');
     }
 
-    public function testFrom()
-    {
-        return $this->testListFields();
-    }
-
     public function testWhere()
     {
         $this->markTestIncomplete('testWhere is not implemented yet');
@@ -88,30 +48,13 @@ class QueryTest extends BaseTestCase
 
     public function testOrder()
     {
-        $select = $this->emptySelect()->order('bla');
-        // tested by testGetSortColumns
+        $this->markTestIncomplete('testOrder is not implemented yet, order support for ldap queries is incomplete');
     }
 
-    public function testListFields()
-    {
-        $select = $this->prepareSelect();
-        $this->assertEquals(
-            array('testIntColumn', 'testStringColumn'),
-            $select->listFields()
-        );
-    }
-
-    public function testGetSortColumns()
-    {
-        $select = $this->prepareSelect();
-        $cols = $select->getSortColumns();
-        $this->assertEquals('testIntColumn', $cols[0][0]);
-    }
-
-    public function testCreateQuery()
+    public function testRenderFilter()
     {
         $select = $this->prepareSelect();
         $res = '(&(objectClass=dummyClass)(testIntColumn=1)(testStringColumn=test)(testWildcard=abc*))';
-        $this->assertEquals($res, $select->create());
+        $this->assertEquals($res, (string) $select);
     }
 }

From 664017573f9aba9914e963140e617658f585d514 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 11:32:03 +0200
Subject: [PATCH 1384/2920] Ldap\Connection: Add query alias support

refs #8826
---
 library/Icinga/Protocol/Ldap/Connection.php | 91 +++++++++++++--------
 1 file changed, 55 insertions(+), 36 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 6193d630f..0472d5079 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -315,7 +315,7 @@ class Connection implements Selectable
             $count += 1;
             if ($offset === 0 || $offset < $count) {
                 $entries[ldap_get_dn($this->ds, $entry)] = $this->cleanupAttributes(
-                    ldap_get_attributes($this->ds, $entry)
+                    ldap_get_attributes($this->ds, $entry), array_flip($fields)
                 );
             }
         } while (($limit === 0 || $limit !== count($entries)) && ($entry = ldap_next_entry($this->ds, $entry)));
@@ -412,7 +412,7 @@ class Connection implements Selectable
                 $count += 1;
                 if ($offset === 0 || $offset < $count) {
                     $entries[ldap_get_dn($this->ds, $entry)] = $this->cleanupAttributes(
-                        ldap_get_attributes($this->ds, $entry)
+                        ldap_get_attributes($this->ds, $entry), array_flip($fields)
                     );
                 }
             } while (($limit === 0 || $limit !== count($entries)) && ($entry = ldap_next_entry($this->ds, $entry)));
@@ -447,20 +447,48 @@ class Connection implements Selectable
         return $entries; // TODO(7693): Sort entries post-processed
     }
 
-    protected function cleanupAttributes($attrs)
+    protected function cleanupAttributes($attributes, array $requestedFields)
     {
-        $clean = (object) array();
-        for ($i = 0; $i < $attrs['count']; $i++) {
-            $attr_name = $attrs[$i];
-            if ($attrs[$attr_name]['count'] === 1) {
-                $clean->$attr_name = $attrs[$attr_name][0];
+        // In case the result contains attributes with a differing case than the requested fields, it is
+        // necessary to create another array to map attributes case insensitively to their requested counterparts.
+        // This does also apply the virtual alias handling. (Since an LDAP server does not handle such)
+        $loweredFieldMap = array();
+        foreach ($requestedFields as $name => $alias) {
+            $loweredFieldMap[strtolower($name)] = is_string($alias) ? $alias : $name;
+        }
+
+        $cleanedAttributes = array();
+        for ($i = 0; $i < $attributes['count']; $i++) {
+            $attribute_name = $attributes[$i];
+            if ($attributes[$attribute_name]['count'] === 1) {
+                $attribute_value = $attributes[$attribute_name][0];
             } else {
-                for ($j = 0; $j < $attrs[$attr_name]['count']; $j++) {
-                    $clean->{$attr_name}[] = $attrs[$attr_name][$j];
+                $attribute_value = array();
+                for ($j = 0; $j < $attributes[$attribute_name]['count']; $j++) {
+                    $attribute_value[] = $attributes[$attribute_name][$j];
                 }
             }
+
+            $requestedAttributeName = isset($loweredFieldMap[strtolower($attribute_name)])
+                ? $loweredFieldMap[strtolower($attribute_name)]
+                : $attribute_name;
+            $cleanedAttributes[$requestedAttributeName] = $attribute_value;
         }
-        return $clean;
+
+        // The result may not contain all requested fields, so populate the cleaned
+        // result with the missing fields and their value being set to null
+        foreach ($requestedFields as $name => $alias) {
+            if (! is_string($alias)) {
+                $alias = $name;
+            }
+
+            if (! array_key_exists($alias, $cleanedAttributes)) {
+                $cleanedAttributes[$alias] = null;
+                Logger::debug('LDAP query result does not provide the requested field "%s"', $name);
+            }
+        }
+
+        return (object) $cleanedAttributes;
     }
 
     public function testCredentials($username, $password)
@@ -608,30 +636,22 @@ class Connection implements Selectable
      */
     protected function discoverCapabilities($ds)
     {
-        $query = $this->select()->from(
-            '*',
-            array(
-                'defaultNamingContext',
-                'namingContexts',
-                'vendorName',
-                'vendorVersion',
-                'supportedSaslMechanisms',
-                'dnsHostName',
-                'schemaNamingContext',
-                'supportedLDAPVersion', // => array(3, 2)
-                'supportedCapabilities',
-                'supportedControl',
-                'supportedExtension',
-                '+'
-            )
-        );
-        $result = @ldap_read(
-            $ds,
-            '',
-            $query->create(),
-            $query->listFields()
+        $fields = array(
+            'defaultNamingContext',
+            'namingContexts',
+            'vendorName',
+            'vendorVersion',
+            'supportedSaslMechanisms',
+            'dnsHostName',
+            'schemaNamingContext',
+            'supportedLDAPVersion', // => array(3, 2)
+            'supportedCapabilities',
+            'supportedControl',
+            'supportedExtension',
+            '+'
         );
 
+        $result = @ldap_read($ds, '', (string) $this->select()->from('*', $fields), $fields);
         if (! $result) {
             throw new LdapException(
                 'Capability query failed (%s:%d): %s. Check if hostname and port of the'
@@ -641,6 +661,7 @@ class Connection implements Selectable
                 ldap_error($ds)
             );
         }
+
         $entry = ldap_first_entry($ds, $result);
         if ($entry === false) {
             throw new LdapException(
@@ -651,9 +672,7 @@ class Connection implements Selectable
             );
         }
 
-        $ldapAttributes = ldap_get_attributes($ds, $entry);
-        $result = $this->cleanupAttributes($ldapAttributes);
-        return new Capability($result);
+        return new Capability($this->cleanupAttributes(ldap_get_attributes($ds, $entry), array_flip($fields)));
     }
 
     /**

From 6612e4c1ae79c2bc3a5cd08e1594fc152107618e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 11:34:39 +0200
Subject: [PATCH 1385/2920] SimpleQuery: Make compare() alias aware

refs #8826
refs #7693
---
 library/Icinga/Data/SimpleQuery.php | 64 +++++++++++++++++++----------
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index a069e03cd..1507ba589 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -43,6 +43,15 @@ class SimpleQuery implements QueryInterface
      */
     protected $columns = array();
 
+    /**
+     * The columns and their aliases flipped in order to handle aliased sort columns
+     *
+     * Supposed to be used and populated by $this->compare *only*.
+     *
+     * @var array
+     */
+    protected $flippedColumns;
+
     /**
      * The columns you're using to sort the query result
      *
@@ -219,32 +228,42 @@ class SimpleQuery implements QueryInterface
         return $this;
     }
 
-    public function compare($a, $b, $col_num = 0)
+    /**
+     * Compare $a with $b based on this query's sort rules and column aliases
+     *
+     * @param   object  $a
+     * @param   object  $b
+     * @param   int     $orderIndex
+     *
+     * @return  int
+     */
+    public function compare($a, $b, $orderIndex = 0)
     {
-        // Last column to sort reached, rows are considered being equal
-        if (! array_key_exists($col_num, $this->order)) {
-            return 0;
-        }
-        $col = $this->order[$col_num][0];
-        $dir = $this->order[$col_num][1];
-// TODO: throw Exception if column is missing
-        //$res = strnatcmp(strtolower($a->$col), strtolower($b->$col));
-        $res = @strcmp(strtolower($a->$col), strtolower($b->$col));
-        if ($res === 0) {
-//            return $this->compare($a, $b, $col_num++);
-
-            if (array_key_exists(++$col_num, $this->order)) {
-                return $this->compare($a, $b, $col_num);
-            } else {
-                return 0;
-            }
-
+        if (! array_key_exists($orderIndex, $this->order)) {
+            return 0; // Last column to sort reached, rows are considered being equal
         }
 
-        if ($dir === self::SORT_ASC) {
-            return $res;
+        if ($this->flippedColumns === null) {
+            $this->flippedColumns = array_flip($this->columns);
+        }
+
+        $column = $this->order[$orderIndex][0];
+        if (array_key_exists($column, $this->flippedColumns)) {
+            $column = $this->flippedColumns[$column];
+        }
+
+        // TODO: throw Exception if column is missing
+        //$res = strnatcmp(strtolower($a->$column), strtolower($b->$column));
+        $result = @strcmp(strtolower($a->$column), strtolower($b->$column));
+        if ($result === 0) {
+            return $this->compare($a, $b, $orderIndex);
+        }
+
+        $direction = $this->order[$orderIndex][1];
+        if ($direction === self::SORT_ASC) {
+            return $result;
         } else {
-            return $res * -1;
+            return $result * -1;
         }
     }
 
@@ -426,6 +445,7 @@ class SimpleQuery implements QueryInterface
     public function columns(array $columns)
     {
         $this->columns = $columns;
+        $this->flippedColumns = null; // Reset, due to updated columns
         return $this;
     }
 

From 7b7a7c9299eca3f6615158b6a5f73e125ba562a8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 11:36:38 +0200
Subject: [PATCH 1386/2920] Ldap\Connection: Add proper order support

Will now utilize SimpleQuery::compare() to provide support for multiple
order columns.

refs #8826
refs #7693
---
 library/Icinga/Protocol/Ldap/Connection.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 0472d5079..edda85dcf 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -304,10 +304,6 @@ class Connection implements Selectable
             return array();
         }
 
-        foreach ($query->getSortColumns() as $col) {
-            ldap_sort($this->ds, $results, $col[0]);
-        }
-
         $count = 0;
         $entries = array();
         $entry = ldap_first_entry($this->ds, $results);
@@ -320,6 +316,10 @@ class Connection implements Selectable
             }
         } while (($limit === 0 || $limit !== count($entries)) && ($entry = ldap_next_entry($this->ds, $entry)));
 
+        if ($query->hasOrder()) {
+            uasort($entries, array($query, 'compare'));
+        }
+
         ldap_free_result($results);
         return $entries;
     }
@@ -444,7 +444,11 @@ class Connection implements Selectable
             ldap_control_paged_result($this->ds, 0);
         }
 
-        return $entries; // TODO(7693): Sort entries post-processed
+        if ($query->hasOrder()) {
+            uasort($entries, array($query, 'compare'));
+        }
+
+        return $entries;
     }
 
     protected function cleanupAttributes($attributes, array $requestedFields)

From 3b93b84ecf66acddfd70dc20807e5641aa47b6f3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 11:37:48 +0200
Subject: [PATCH 1387/2920] Introduce class Icinga\Repository\Repository

refs #8826
---
 library/Icinga/Repository/Repository.php | 353 +++++++++++++++++++++++
 1 file changed, 353 insertions(+)
 create mode 100644 library/Icinga/Repository/Repository.php

diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
new file mode 100644
index 000000000..e1b39e1c8
--- /dev/null
+++ b/library/Icinga/Repository/Repository.php
@@ -0,0 +1,353 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Repository;
+
+use Icinga\Data\Selectable;
+use Icinga\Exception\ProgrammingError;
+use Icinga\Exception\QueryException;
+
+/**
+ * Abstract base class for concrete repository implementations
+ *
+ * To utilize this class and its features, the following is required:
+ * <ul>
+ *  <li>Concrete implementations need to initialize Repository::$queryColumns</li>
+ *  <li>The datasource passed to a repository must implement the Selectable interface</li>
+ *  <li>The datasource must yield an instance of QueryInterface when its select() method is called</li>
+ * </ul>
+ */
+abstract class Repository implements Selectable
+{
+    /**
+     * The name of this repository
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * The datasource being used
+     *
+     * @var Selectable
+     */
+    protected $ds;
+
+    /**
+     * The base table name this repository is responsible for
+     *
+     * This will be automatically set to the first key of $queryColumns if not explicitly set.
+     *
+     * @var mixed
+     */
+    protected $baseTable;
+
+    /**
+     * The query columns being provided
+     *
+     * This must be overwritten by concrete repository implementations, in the following format
+     * <pre><code>
+     *  array(
+     *      'baseTable' => array(
+     *          'column1',
+     *          'alias1' => 'column2',
+     *          'alias2' => 'column3'
+     *      )
+     *  )
+     * <pre><code>
+     *
+     * @var array
+     */
+    protected $queryColumns;
+
+    /**
+     * The columns (or aliases) which are not permitted to be queried. (by design)
+     *
+     * @var array   An array of strings
+     */
+    protected $filterColumns;
+
+    /**
+     * The default sort rules to be applied on a query
+     *
+     * This may be overwritten by concrete repository implementations, in the following format
+     * <pre><code>
+     *  array(
+     *      'alias_or_column_name' => array(
+     *          'order'     => 'asc'
+     *      ),
+     *      'alias_or_column_name' => array(
+     *          'columns'   => array(
+     *              'once_more_the_alias_or_column_name_as_in_the_parent_key',
+     *              'an_additional_alias_or_column_name_with_a_specific_direction asc'
+     *          ),
+     *          'order'     => 'desc'
+     *      ),
+     *      'alias_or_column_name' => array(
+     *          'columns'   => array('a_different_alias_or_column_name_designated_to_act_as_the_only_sort_column')
+     *          // Ascendant sort by default
+     *      )
+     *  )
+     * <pre><code>
+     * Note that it's mandatory to supply the alias name in case there is one.
+     *
+     * @var array
+     */
+    protected $sortRules;
+
+    /**
+     * An array to map table names to aliases
+     *
+     * @var array
+     */
+    protected $aliasTableMap;
+
+    /**
+     * A flattened array to map query columns to aliases
+     *
+     * @var array
+     */
+    protected $aliasColumnMap;
+
+    /**
+     * Create a new repository object
+     *
+     * @param   Selectable  $ds     The datasource to use
+     */
+    public function __construct(Selectable $ds)
+    {
+        $this->ds = $ds;
+        $this->aliasTableMap = array();
+        $this->aliasColumnMap = array();
+
+        $this->init();
+
+        if ($this->filterColumns === null) {
+            $this->filterColumns = $this->getFilterColumns();
+        }
+
+        if ($this->sortRules === null) {
+            $this->sortRules = $this->getSortRules();
+        }
+    }
+
+    /**
+     * Initialize this repository
+     *
+     * Supposed to be overwritten by concrete repository implementations.
+     */
+    protected function init()
+    {
+
+    }
+
+    /**
+     * Set this repository's name
+     *
+     * @param   string  $name
+     *
+     * @return  $this
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    /**
+     * Return this repository's name
+     *
+     * In case no name has been explicitly set yet, the class name is returned.
+     *
+     * @return  string
+     */
+    public function getName()
+    {
+        return $this->name ?: __CLASS__;
+    }
+
+    /**
+     * Return the datasource being used
+     *
+     * @return  Selectable
+     */
+    public function getDataSource()
+    {
+        return $this->ds;
+    }
+
+    /**
+     * Return the base table name this repository is responsible for
+     *
+     * @return  mixed
+     *
+     * @throws  ProgrammingError    In case no base table name has been set and
+     *                               $this->queryColumns does not provide one either
+     */
+    public function getBaseTable()
+    {
+        if ($this->baseTable === null) {
+            $queryColumns = $this->queryColumns; // Copy because of reset()
+            reset($queryColumns);
+            $this->baseTable = key($queryColumns);
+            if (is_int($this->baseTable) || !is_array($queryColumns[$this->baseTable])) {
+                throw new ProgrammingError('"%s" is not a valid base table', $this->baseTable);
+            }
+        }
+
+        return $this->baseTable;
+    }
+
+    /**
+     * Return the columns (or aliases) which are not permitted to be queried
+     *
+     * @return  array
+     */
+    public function getFilterColumns()
+    {
+        if ($this->filterColumns !== null) {
+            return $this->filterColumns;
+        }
+
+        return array();
+    }
+
+    /**
+     * Return the default sort rules to be applied on a query
+     *
+     * @return  array
+     */
+    public function getSortRules()
+    {
+        if ($this->sortRules !== null) {
+            return $this->sortRules;
+        }
+
+        return array();
+    }
+
+    /**
+     * Return a new query for the given columns
+     *
+     * @param   array   $columns    The desired columns, if null all columns will be queried
+     *
+     * @return  RepositoryQuery
+     *
+     * @throws  ProgrammingError    In case $this->queryColumns has not been initialized yet
+     */
+    public function select(array $columns = null)
+    {
+        if (empty($this->queryColumns)) {
+            throw new ProgrammingError('Repositories are required to initialize $this->queryColumns first');
+        }
+
+        $this->initializeAliasMaps();
+
+        $query = new RepositoryQuery($this);
+        $query->from($this->getBaseTable(), $columns);
+        return $query;
+    }
+
+    /**
+     * Initialize $this->aliasTableMap and $this->aliasColumnMap
+     */
+    protected function initializeAliasMaps()
+    {
+        if (! empty($this->aliasColumnMap)) {
+            return;
+        }
+
+        foreach ($this->queryColumns as $table => $columns) {
+            foreach ($columns as $alias => $column) {
+                if (! is_string($alias)) {
+                    $this->aliasTableMap[$column] = $table;
+                    $this->aliasColumnMap[$column] = $column;
+                } else {
+                    $this->aliasTableMap[$alias] = $table;
+                    $this->aliasColumnMap[$alias] = preg_replace('~\n\s*~', ' ', $column);
+                }
+            }
+        }
+    }
+
+    /**
+     * Return this repository's query columns mapped to their respective aliases
+     *
+     * @return  array
+     */
+    public function requireAllQueryColumns()
+    {
+        $map = array();
+        foreach ($this->aliasColumnMap as $alias => $_) {
+            if ($this->hasQueryColumn($alias)) {
+                // Just in case $this->requireQueryColumn has been overwritten and there is some magic going on
+                $map[$alias] = $this->requireQueryColumn($alias);
+            }
+        }
+
+        return $map;
+    }
+
+    /**
+     * Return whether the given column name or alias is a valid query column
+     *
+     * @param   string  $name   The column name or alias to check
+     *
+     * @return  bool
+     */
+    public function hasQueryColumn($name)
+    {
+        return array_key_exists($name, $this->aliasColumnMap) && !in_array($name, $this->filterColumns);
+    }
+
+    /**
+     * Validate that the given column is a valid query target and return it or the actual name if it's an alias
+     *
+     * @param   string  $name       The name or alias of the column to validate
+     *
+     * @return  string              The given column's name
+     *
+     * @throws  QueryException      In case the given column is not a valid query column
+     */
+    public function requireQueryColumn($name)
+    {
+        if (in_array($name, $this->filterColumns)) {
+            throw new QueryException(t('Filter column "%s" cannot be queried'), $name);
+        }
+        if (! array_key_exists($name, $this->aliasColumnMap)) {
+            throw new QueryException(t('Query column "%s" not found'), $name);
+        }
+
+        return $this->aliasColumnMap[$name];
+    }
+
+    /**
+     * Return whether the given column name or alias is a valid filter column
+     *
+     * @param   string  $name   The column name or alias to check
+     *
+     * @return  bool
+     */
+    public function hasFilterColumn($name)
+    {
+        return array_key_exists($name, $this->aliasColumnMap);
+    }
+
+    /**
+     * Validate that the given column is a valid filter target and return it or the actual name if it's an alias
+     *
+     * @param   string  $name       The name or alias of the column to validate
+     *
+     * @return  string              The given column's name
+     *
+     * @throws  QueryException      In case the given column is not a valid filter column
+     */
+    public function requireFilterColumn($name)
+    {
+        if (! array_key_exists($name, $this->aliasColumnMap)) {
+            throw new QueryException(t('Filter column "%s" not found'), $name);
+        }
+
+        return $this->aliasColumnMap[$name];
+    }
+}

From fa1906ee7d1366f33656017bc6894f7101b91071 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 11:38:21 +0200
Subject: [PATCH 1388/2920] Introduce class Icinga\Repository\RepositoryQuery

refs #8826
---
 library/Icinga/Repository/RepositoryQuery.php | 453 ++++++++++++++++++
 1 file changed, 453 insertions(+)
 create mode 100644 library/Icinga/Repository/RepositoryQuery.php

diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
new file mode 100644
index 000000000..df5d17cd6
--- /dev/null
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -0,0 +1,453 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Repository;
+
+use Zend_Paginator;
+use Icinga\Application\Logger;
+use Icinga\Data\QueryInterface;
+use Icinga\Data\Filter\Filter;
+use Icinga\Exception\QueryException;
+
+/**
+ * Query class supposed to mediate between a repository and its datasource's query
+ */
+class RepositoryQuery implements QueryInterface
+{
+    /**
+     * The repository being used
+     *
+     * @var Repository
+     */
+    protected $repository;
+
+    /**
+     * The real query being used
+     *
+     * @var QueryInterface
+     */
+    protected $query;
+
+    /**
+     * Create a new repository query
+     *
+     * @param   Repository  $repository     The repository to use
+     */
+    public function __construct(Repository $repository)
+    {
+        $this->repository = $repository;
+        $this->query = $repository->getDataSource()->select();
+    }
+
+    /**
+     * Return the real query being used
+     *
+     * @return  QueryInterface
+     */
+    public function getQuery()
+    {
+        return $this->query;
+    }
+
+    /**
+     * Set where to fetch which columns
+     *
+     * This notifies the repository about each desired query column.
+     *
+     * @param   mixed   $target     The type and purpose of this parameter depends on this query's repository
+     * @param   array   $columns    If null or an empty array, all columns will be fetched
+     *
+     * @return  $this
+     */
+    public function from($target, array $columns = null)
+    {
+        $this->query->from($target, $this->prepareQueryColumns($columns));
+        return $this;
+    }
+
+    /**
+     * Set which columns to fetch
+     *
+     * This notifies the repository about each desired query column.
+     *
+     * @param   array   $columns    If null or an empty array, all columns will be fetched
+     *
+     * @return  $this
+     */
+    public function columns(array $columns)
+    {
+        $this->query->columns($this->prepareQueryColumns($columns));
+        return $this;
+    }
+
+    /**
+     * Resolve the given columns supposed to be fetched
+     *
+     * This notifies the repository about each desired query column.
+     *
+     * @param   array   $desiredColumns     Pass null or an empty array to require all query columns
+     *
+     * @return  array                       The desired columns indexed by their respective alias
+     */
+    protected function prepareQueryColumns(array $desiredColumns = null)
+    {
+        if (empty($desiredColumns)) {
+            $columns = $this->repository->requireAllQueryColumns();
+        } else {
+            $columns = array();
+            foreach ($desiredColumns as $customAlias => $columnAlias) {
+                $resolvedColumn = $this->repository->requireQueryColumn($columnAlias);
+                if ($resolvedColumn !== $columnAlias) {
+                    $columns[is_string($customAlias) ? $customAlias : $columnAlias] = $resolvedColumn;
+                } elseif (is_string($customAlias)) {
+                    $columns[$customAlias] = $columnAlias;
+                } else {
+                    $columns[] = $columnAlias;
+                }
+            }
+        }
+
+        return $columns;
+    }
+
+    /**
+     * Filter this query using the given column and value
+     *
+     * This notifies the repository about the required filter column.
+     *
+     * @param   string  $column
+     * @param   mixed   $value
+     *
+     * @return  $this
+     */
+    public function where($column, $value = null)
+    {
+        $this->query->where($this->repository->requireFilterColumn($column), $value);
+        return $this;
+    }
+
+    /**
+     * Add an additional filter expression to this query
+     *
+     * This notifies the repository about each required filter column.
+     *
+     * @param   Filter  $filter
+     *
+     * @return  $this
+     */
+    public function applyFilter(Filter $filter)
+    {
+        return $this->addFilter($filter);
+    }
+
+    /**
+     * Set a filter for this query
+     *
+     * This notifies the repository about each required filter column.
+     *
+     * @param   Filter  $filter
+     *
+     * @return  $this
+     */
+    public function setFilter(Filter $filter)
+    {
+        $this->requireFilterColumns($filter);
+        $this->query->setFilter($filter);
+        return $this;
+    }
+
+    /**
+     * Add an additional filter expression to this query
+     *
+     * This notifies the repository about each required filter column.
+     *
+     * @param   Filter  $filter
+     *
+     * @return  $this
+     */
+    public function addFilter(Filter $filter)
+    {
+        $this->requireFilterColumns($filter);
+        $this->query->addFilter($filter);
+        return $this;
+    }
+
+    /*+
+     * Recurse the given filter and notify the repository about each required filter column
+     */
+    protected function requireFilterColumns(Filter $filter)
+    {
+        if ($filter->isExpression()) {
+            $filter->setColumn($this->repository->requireFilterColumn($filter->getColumn()));
+        } elseif ($filter->isChain()) {
+            foreach ($filter->filters() as $chainOrExpression) {
+                $this->requireFilterColumns($chainOrExpression);
+            }
+        }
+    }
+
+    /**
+     * Return the current filter
+     *
+     * @return  Filter
+     */
+    public function getFilter()
+    {
+        return $this->query->getFilter();
+    }
+
+    /**
+     * Add a sort rule for this query
+     *
+     * If called without a specific column, the repository's defaul sort rules will be applied.
+     * This notifies the repository about each column being required as filter column.
+     *
+     * @param   string  $field      The name of the column by which to sort the query's result
+     * @param   string  $direction  The direction to use when sorting (asc or desc, default is asc)
+     *
+     * @return  $this
+     */
+    public function order($field = null, $direction = null)
+    {
+        $sortRules = $this->repository->getSortRules();
+        if ($field === null) {
+            // Use first available sort rule as default
+            if (empty($sortRules)) {
+                // Return early in case of no sort defaults and no given $field
+                return $this;
+            }
+
+            $sortColumns = reset($sortRules);
+            if (! array_key_exists('columns', $sortColumns)) {
+                $sortColumns['columns'] = array(key($sortRules));
+            }
+            if ($direction !== null || !array_key_exists('order', $sortColumns)) {
+                $sortColumns['order'] = $direction ?: static::SORT_ASC;
+            }
+        } elseif (array_key_exists($field, $sortRules)) {
+            $sortColumns = $sortRules[$field];
+            if (! array_key_exists('columns', $sortColumns)) {
+                $sortColumns['columns'] = array($field);
+            }
+            if ($direction !== null || !array_key_exists('order', $sortColumns)) {
+                $sortColumns['order'] = $direction ?: static::SORT_ASC;
+            }
+        } else {
+            $sortColumns = array(
+                'columns'   => array($field),
+                'order'     => $direction
+            );
+        };
+
+        $baseDirection = strtoupper($sortColumns['order']) === static::SORT_DESC ? static::SORT_DESC : static::SORT_ASC;
+
+        foreach ($sortColumns['columns'] as $column) {
+            list($column, $specificDirection) = $this->splitOrder($column);
+
+            try {
+                $this->query->order(
+                    $this->repository->requireFilterColumn($column),
+                    $direction ? $baseDirection : ($specificDirection ?: $baseDirection)
+                );
+            } catch (QueryException $_) {
+                Logger::info('Cannot order by column "%s" in repository "%s"', $column, $this->repository->getName());
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Extract and return the name and direction of the given sort column definition
+     *
+     * @param   string  $field
+     *
+     * @return  array               An array of two items: $columnName, $direction
+     */
+    protected function splitOrder($field)
+    {
+        $columnAndDirection = explode(' ', $field, 2);
+        if (count($columnAndDirection) === 1) {
+            $column = $field;
+            $direction = null;
+        } else {
+            $column = $columnAndDirection[0];
+            $direction = strtoupper($columnAndDirection[1]) === static::SORT_DESC
+                ? static::SORT_DESC
+                : static::SORT_ASC;
+        }
+
+        return array($column, $direction);
+    }
+
+    /**
+     * Return whether any sort rules were applied to this query
+     *
+     * @return  bool
+     */
+    public function hasOrder()
+    {
+        return $this->query->hasOrder();
+    }
+
+    /**
+     * Return the sort rules applied to this query
+     *
+     * @return  array
+     */
+    public function getOrder()
+    {
+        return $this->query->getOrder();
+    }
+
+    /**
+     * Limit this query's results
+     *
+     * @param   int     $count      When to stop returning results
+     * @param   int     $offset     When to start returning results
+     *
+     * @return  $this
+     */
+    public function limit($count = null, $offset = null)
+    {
+        $this->query->limit($count, $offset);
+        return $this;
+    }
+
+    /**
+     * Return whether this query does not return all available entries from its result
+     *
+     * @return  bool
+     */
+    public function hasLimit()
+    {
+        return $this->query->hasLimit();
+    }
+
+    /**
+     * Return the limit when to stop returning results
+     *
+     * @return  int
+     */
+    public function getLimit()
+    {
+        return $this->query->getLimit();
+    }
+
+    /**
+     * Return whether this query does not start returning results at the very first entry
+     *
+     * @return  bool
+     */
+    public function hasOffset()
+    {
+        return $this->query->hasOffset();
+    }
+
+    /**
+     * Return the offset when to start returning results
+     *
+     * @return  int
+     */
+    public function getOffset()
+    {
+        return $this->query->getOffset();
+    }
+
+    /**
+     * Return a paginator object for this query
+     *
+     * If not given, $itemsPerPage and $pageNumber will be set to their URL parameter counterparts.
+     *
+     * @param   int     $itemsPerPage   Number of items per page
+     * @param   int     $pageNumber     Current page number
+     *
+     * @return  Zend_Paginator
+     */
+    public function paginate($itemsPerPage = null, $pageNumber = null)
+    {
+        return $this->query->paginate($itemsPerPage, $pageNumber);
+    }
+
+    /**
+     * Fetch and return the first column of this query's first row
+     *
+     * @return  mixed
+     */
+    public function fetchOne()
+    {
+        if (! $this->hasOrder()) {
+            $this->order();
+        }
+
+        return $this->query->fetchOne();
+    }
+
+    /**
+     * Fetch and return the first row of this query's result
+     *
+     * @return  object
+     */
+    public function fetchRow()
+    {
+        if (! $this->hasOrder()) {
+            $this->order();
+        }
+
+        return $this->query->fetchRow();
+    }
+
+    /**
+     * Fetch and return a column of all rows of the result set as an array
+     *
+     * @param   int     $columnIndex    Index of the column to fetch
+     *
+     * @return  array
+     */
+    public function fetchColumn($columnIndex = 0)
+    {
+        if (! $this->hasOrder()) {
+            $this->order();
+        }
+
+        return $this->query->fetchColumn($columnIndex);
+    }
+
+    /**
+     * Fetch and return all rows of this query's result as a flattened key/value based array
+     *
+     * @return  array
+     */
+    public function fetchPairs()
+    {
+        if (! $this->hasOrder()) {
+            $this->order();
+        }
+
+        return $this->query->fetchPairs();
+    }
+
+    /**
+     * Fetch and return all results of this query
+     *
+     * @return  array
+     */
+    public function fetchAll()
+    {
+        if (! $this->hasOrder()) {
+            $this->order();
+        }
+
+        return $this->query->fetchAll();
+    }
+
+    /**
+     * Count all results of this query
+     *
+     * @return  int
+     */
+    public function count()
+    {
+        return $this->query->count();
+    }
+}

From 870e75c99c811da73791582e3ab7129ee4b4ad20 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 11:39:12 +0200
Subject: [PATCH 1389/2920] Introduce class Icinga\Repository\DbRepository

refs #8826
---
 library/Icinga/Repository/DbRepository.php | 64 ++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 library/Icinga/Repository/DbRepository.php

diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
new file mode 100644
index 000000000..8ba43efaf
--- /dev/null
+++ b/library/Icinga/Repository/DbRepository.php
@@ -0,0 +1,64 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Repository;
+
+use Icinga\Exception\IcingaException;
+use Icinga\Exception\ProgrammingError;
+
+/**
+ * Abstract base class for concrete database repository implementations
+ *
+ * Additionally provided features:
+ * <ul>
+ *  <li>Automatic table prefix handling</li>
+ * </ul>
+ */
+abstract class DbRepository extends Repository
+{
+    /**
+     * Return the base table name this repository is responsible for
+     *
+     * This prepends the datasource's table prefix, if available and required.
+     *
+     * @return  mixed
+     *
+     * @throws  ProgrammingError    In case no base table name has been set and
+     *                               $this->queryColumns does not provide one either
+     */
+    public function getBaseTable()
+    {
+        return $this->prependTablePrefix(parent::getBaseTable());
+    }
+
+    /**
+     * Return the given table with the datasource's prefix being prepended
+     *
+     * @param   array|string    $table
+     *
+     * @return  array|string
+     *
+     * @throws  IcingaException         In case $table is not of a supported type
+     */
+    protected function prependTablePrefix($table)
+    {
+        $prefix = $this->ds->getTablePrefix();
+        if (! $prefix) {
+            return $table;
+        }
+
+        if (is_array($table)) {
+            foreach ($table as & $tableName) {
+                if (strpos($tableName, $prefix) === false) {
+                    $tableName = $prefix . $tableName;
+                }
+            }
+        } elseif (is_string($table)) {
+            $table = (strpos($table, $prefix) === false ? $prefix : '') . $table;
+        } else {
+            throw new IcingaException('Table prefix handling for type "%s" is not supported', type($table));
+        }
+
+        return $table;
+    }
+}

From 68657c02ee1db0af30b4915c1911de249d4430ab Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 11:40:17 +0200
Subject: [PATCH 1390/2920] Introduce interface
 Icinga\Authentication\User\UserBackendInterface

refs #8826
---
 .../User/UserBackendInterface.php             | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 library/Icinga/Authentication/User/UserBackendInterface.php

diff --git a/library/Icinga/Authentication/User/UserBackendInterface.php b/library/Icinga/Authentication/User/UserBackendInterface.php
new file mode 100644
index 000000000..cfb2e3753
--- /dev/null
+++ b/library/Icinga/Authentication/User/UserBackendInterface.php
@@ -0,0 +1,41 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Authentication\User;
+
+use Icinga\Exception\AuthenticationException;
+use Icinga\User;
+
+/**
+ * Interface for user backends
+ */
+interface UserBackendInterface
+{
+    /**
+     * Set this backend's name
+     *
+     * @param   string  $name
+     *
+     * @return  $this
+     */
+    public function setName($name);
+
+    /**
+     * Return this backend's name
+     *
+     * @return  string
+     */
+    public function getName();
+
+    /**
+     * Authenticate the given user
+     *
+     * @param   User        $user
+     * @param   string      $password
+     *
+     * @return  bool                        True on success, false on failure
+     *
+     * @throws  AuthenticationException     In case authentication is not possible due to an error
+     */
+    public function authenticate(User $user, $password);
+}

From 1824eb9c3b6eb79088ed282ba6017fb6493fbc95 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 11:43:53 +0200
Subject: [PATCH 1391/2920] Make class UserBackend being just a factory for
 user backends

refs #8826
---
 .../Authentication/User/UserBackend.php       | 88 +++++--------------
 1 file changed, 24 insertions(+), 64 deletions(-)

diff --git a/library/Icinga/Authentication/User/UserBackend.php b/library/Icinga/Authentication/User/UserBackend.php
index 89bd1f56e..8bda07323 100644
--- a/library/Icinga/Authentication/User/UserBackend.php
+++ b/library/Icinga/Authentication/User/UserBackend.php
@@ -3,25 +3,23 @@
 
 namespace Icinga\Authentication\User;
 
-use Countable;
 use Icinga\Application\Logger;
 use Icinga\Application\Icinga;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;
-use Icinga\User;
 
 /**
- * Base class for concrete user backends
+ * Factory for user backends
  */
-abstract class UserBackend implements Countable
+class UserBackend
 {
     /**
      * The default user backend types provided by Icinga Web 2
      *
      * @var array
      */
-    private static $defaultBackends = array( // I would have liked it if I were able to declare this as constant :'(
+    protected static $defaultBackends = array(
         'external',
         'db',
         'ldap',
@@ -36,39 +34,9 @@ abstract class UserBackend implements Countable
     protected static $customBackends;
 
     /**
-     * The name of this backend
-     *
-     * @var string
+     * Register all custom user backends from all loaded modules
      */
-    protected $name;
-
-    /**
-     * Set this backend's name
-     *
-     * @param   string  $name
-     *
-     * @return  $this
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-        return $this;
-    }
-
-    /**
-     * Return this backend's name
-     *
-     * @return  string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Fetch all custom user backends from all loaded modules
-     */
-    public static function loadCustomUserBackends()
+    protected static function registerCustomUserBackends()
     {
         if (static::$customBackends !== null) {
             return;
@@ -80,7 +48,7 @@ abstract class UserBackend implements Countable
             foreach ($module->getUserBackends() as $identifier => $className) {
                 if (array_key_exists($identifier, $providedBy)) {
                     Logger::warning(
-                        'Cannot register UserBackend of type "%s" provided by module "%s".'
+                        'Cannot register user backend of type "%s" provided by module "%s".'
                         . ' The type is already provided by module "%s"',
                         $identifier,
                         $module->getName(),
@@ -88,7 +56,7 @@ abstract class UserBackend implements Countable
                     );
                 } elseif (in_array($identifier, static::$defaultBackends)) {
                     Logger::warning(
-                        'Cannot register UserBackend of type "%s" provided by module "%s".'
+                        'Cannot register user backend of type "%s" provided by module "%s".'
                         . ' The type is a default type provided by Icinga Web 2',
                         $identifier,
                         $module->getName()
@@ -102,29 +70,23 @@ abstract class UserBackend implements Countable
     }
 
     /**
-     * Validate and return the class for the given custom user backend
+     * Return the class for the given custom user backend
      *
      * @param   string  $identifier     The identifier of the custom user backend
      *
      * @return  string|null             The name of the class or null in case there was no
      *                                   backend found with the given identifier
      *
-     * @throws  ConfigurationError      In case the class could not be successfully validated
+     * @throws  ConfigurationError      In case the class associated to the given identifier does not exist
      */
     protected static function getCustomUserBackend($identifier)
     {
-        static::loadCustomUserBackends();
+        static::registerCustomUserBackends();
         if (array_key_exists($identifier, static::$customBackends)) {
             $className = static::$customBackends[$identifier];
             if (! class_exists($className)) {
                 throw new ConfigurationError(
-                    'Cannot utilize UserBackend of type "%s". Class "%s" does not exist',
-                    $identifier,
-                    $className
-                );
-            } elseif (! is_subclass_of($className, __CLASS__)) {
-                throw new ConfigurationError(
-                    'Cannot utilize UserBackend of type "%s". Class "%s" is not a sub-type of UserBackend',
+                    'Cannot utilize user backend of type "%s". Class "%s" does not exist',
                     $identifier,
                     $className
                 );
@@ -135,12 +97,12 @@ abstract class UserBackend implements Countable
     }
 
     /**
-     * Create and return a UserBackend with the given name and given configuration applied to it
+     * Create and return a user backend with the given name and given configuration applied to it
      *
      * @param   string          $name
      * @param   ConfigObject    $backendConfig
      *
-     * @return  UserBackend
+     * @return  UserBackendInterface
      *
      * @throws  ConfigurationError
      */
@@ -152,7 +114,7 @@ abstract class UserBackend implements Countable
 
         if (! ($backendType = strtolower($backendConfig->backend))) {
             throw new ConfigurationError(
-                'Authentication configuration for backend "%s" is missing the \'backend\' directive',
+                'Authentication configuration for user backend "%s" is missing the \'backend\' directive',
                 $name
             );
         }
@@ -166,11 +128,19 @@ abstract class UserBackend implements Countable
             // Do not attempt to load a custom user backend unless it's actually required
         } elseif (($customClass = static::getCustomUserBackend($backendType)) !== null) {
             $backend = new $customClass($backendConfig);
+            if (! is_a($backend, 'Icinga\Authentication\User\UserBackendInterface')) {
+                throw new ConfigurationError(
+                    'Cannot utilize user backend of type "%s". Class "%s" does not implement UserBackendInterface',
+                    $backendType,
+                    $customClass
+                );
+            }
+
             $backend->setName($name);
             return $backend;
         } else {
             throw new ConfigurationError(
-                'Authentication configuration for backend "%s" defines an invalid backend type.'
+                'Authentication configuration for user backend "%s" defines an invalid backend type.'
                 . ' Backend type "%s" is not supported',
                 $name,
                 $backendType
@@ -179,7 +149,7 @@ abstract class UserBackend implements Countable
 
         if ($backendConfig->resource === null) {
             throw new ConfigurationError(
-                'Authentication configuration for backend "%s" is missing the \'resource\' directive',
+                'Authentication configuration for user backend "%s" is missing the \'resource\' directive',
                 $name
             );
         }
@@ -239,14 +209,4 @@ abstract class UserBackend implements Countable
         $backend->setName($name);
         return $backend;
     }
-
-    /**
-     * Authenticate the given user
-     *
-     * @param   User    $user
-     * @param   string  $password
-     *
-     * @return  bool
-     */
-    abstract public function authenticate(User $user, $password);
 }

From 7b41fc020a1662973b0dc1b7f72576747eef3ab0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 11:44:41 +0200
Subject: [PATCH 1392/2920] AuthChain: Yield UserBackendInterface instead of
 UserBackend

refs #8826
---
 library/Icinga/Authentication/AuthChain.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Authentication/AuthChain.php b/library/Icinga/Authentication/AuthChain.php
index 167661f39..7354825a2 100644
--- a/library/Icinga/Authentication/AuthChain.php
+++ b/library/Icinga/Authentication/AuthChain.php
@@ -6,6 +6,7 @@ namespace Icinga\Authentication;
 use Iterator;
 use Icinga\Data\ConfigObject;
 use Icinga\Authentication\User\UserBackend;
+use Icinga\Authentication\User\UserBackendInterface;
 use Icinga\Application\Config;
 use Icinga\Application\Logger;
 use Icinga\Exception\ConfigurationError;
@@ -25,7 +26,7 @@ class AuthChain implements Iterator
     /**
      * The consecutive user backend while looping
      *
-     * @var UserBackend
+     * @var UserBackendInterface
      */
     private $currentBackend;
 
@@ -53,7 +54,7 @@ class AuthChain implements Iterator
     /**
      * Return the current user backend
      *
-     * @return UserBackend
+     * @return UserBackendInterface
      */
     public function current()
     {

From 99ac0b78ea51554b6feb20c4d63a59efe18cfd2a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 12:15:05 +0200
Subject: [PATCH 1393/2920] DbUserBackend: Extend DbRepository and implement
 UserBackendInterface

refs #8826
---
 .../Config/Authentication/DbBackendForm.php   |  4 +-
 .../Authentication/User/DbUserBackend.php     | 94 ++++++++-----------
 .../Authentication/DbBackendFormTest.php      |  2 +-
 3 files changed, 44 insertions(+), 56 deletions(-)

diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index 98d955f4a..babd4383b 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -107,8 +107,8 @@ class DbBackendForm extends Form
     {
         try {
             $dbUserBackend = new DbUserBackend(ResourceFactory::createResource($form->getResourceConfig()));
-            if ($dbUserBackend->count() < 1) {
-                $form->addError($form->translate('No users found under the specified database backend'));
+            if ($dbUserBackend->select()->where('is_active', true)->count() < 1) {
+                $form->addError($form->translate('No active users found under the specified database backend'));
                 return false;
             }
         } catch (Exception $e) {
diff --git a/library/Icinga/Authentication/User/DbUserBackend.php b/library/Icinga/Authentication/User/DbUserBackend.php
index 2286f4e93..08c2006d6 100644
--- a/library/Icinga/Authentication/User/DbUserBackend.php
+++ b/library/Icinga/Authentication/User/DbUserBackend.php
@@ -3,15 +3,13 @@
 
 namespace Icinga\Authentication\User;
 
-use PDO;
-use Icinga\Data\Db\DbConnection;
-use Icinga\User;
-use Icinga\Exception\AuthenticationException;
 use Exception;
-use Zend_Db_Expr;
-use Zend_Db_Select;
+use PDO;
+use Icinga\Exception\AuthenticationException;
+use Icinga\Repository\DbRepository;
+use Icinga\User;
 
-class DbUserBackend extends UserBackend
+class DbUserBackend extends DbRepository implements UserBackendInterface
 {
     /**
      * The algorithm to use when hashing passwords
@@ -28,15 +26,38 @@ class DbUserBackend extends UserBackend
     const SALT_LENGTH = 12; // 12 is required by MD5
 
     /**
-     * Connection to the database
+     * The query columns being provided
      *
-     * @var DbConnection
+     * @var array
      */
-    protected $conn;
+    protected $queryColumns = array(
+        'user' => array(
+            'user_name'     => 'name',
+            'is_active'     => 'active',
+            'created_at'    => 'UNIX_TIMESTAMP(ctime)',
+            'last_modified' => 'UNIX_TIMESTAMP(mtime)'
+        )
+    );
 
-    public function __construct(DbConnection $conn)
+    /**
+     * The default sort rules to be applied on a query
+     *
+     * @var array
+     */
+    protected $sortRules = array(
+        'user_name' => array(
+            'order' => 'asc'
+        )
+    );
+
+    /**
+     * Initialize this database user backend
+     */
+    protected function init()
     {
-        $this->conn = $conn;
+        if (! $this->ds->getTablePrefix()) {
+            $this->ds->setTablePrefix('icingaweb_');
+        }
     }
 
     /**
@@ -50,7 +71,7 @@ class DbUserBackend extends UserBackend
     {
         $passwordHash = $this->hashPassword($password);
 
-        $stmt = $this->conn->getDbAdapter()->prepare(
+        $stmt = $this->ds->getDbAdapter()->prepare(
             'INSERT INTO icingaweb_user VALUES (:name, :active, :password_hash, now(), DEFAULT);'
         );
         $stmt->bindParam(':name', $username, PDO::PARAM_STR);
@@ -68,13 +89,13 @@ class DbUserBackend extends UserBackend
      */
     protected function getPasswordHash($username)
     {
-        if ($this->conn->getDbType() === 'pgsql') {
+        if ($this->ds->getDbType() === 'pgsql') {
             // Since PostgreSQL version 9.0 the default value for bytea_output is 'hex' instead of 'escape'
-            $stmt = $this->conn->getDbAdapter()->prepare(
+            $stmt = $this->ds->getDbAdapter()->prepare(
                 'SELECT ENCODE(password_hash, \'escape\') FROM icingaweb_user WHERE name = :name AND active = 1'
             );
         } else {
-            $stmt = $this->conn->getDbAdapter()->prepare(
+            $stmt = $this->ds->getDbAdapter()->prepare(
                 'SELECT password_hash FROM icingaweb_user WHERE name = :name AND active = 1'
             );
         }
@@ -86,18 +107,18 @@ class DbUserBackend extends UserBackend
             $lob = stream_get_contents($lob);
         }
 
-        return $this->conn->getDbType() === 'pgsql' ? pg_unescape_bytea($lob) : $lob;
+        return $this->ds->getDbType() === 'pgsql' ? pg_unescape_bytea($lob) : $lob;
     }
 
     /**
-     * Authenticate the given user and return true on success, false on failure and throw an exception on error
+     * Authenticate the given user
      *
      * @param   User        $user
      * @param   string      $password
      *
-     * @return  bool
+     * @return  bool                        True on success, false on failure
      *
-     * @throws  AuthenticationException
+     * @throws  AuthenticationException     In case authentication is not possible due to an error
      */
     public function authenticate(User $user, $password)
     {
@@ -152,37 +173,4 @@ class DbUserBackend extends UserBackend
     {
         return crypt($password, self::HASH_ALGORITHM . ($salt !== null ? $salt : $this->generateSalt()));
     }
-
-    /**
-     * Get the number of users available
-     *
-     * @return int
-     */
-    public function count()
-    {
-        $select = new Zend_Db_Select($this->conn->getDbAdapter());
-        $row = $select->from(
-            'icingaweb_user',
-            array('count' => 'COUNT(*)')
-        )->query()->fetchObject();
-
-        return ($row !== false) ? $row->count : 0;
-    }
-
-    /**
-     * Return the names of all available users
-     *
-     * @return  array
-     */
-    public function listUsers()
-    {
-        $query = $this->conn->select()->from('icingaweb_user', array('name'));
-
-        $users = array();
-        foreach ($query->fetchAll() as $row) {
-            $users[] = $row->name;
-        }
-
-        return $users;
-    }
 }
diff --git a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
index f574a8292..695ef4885 100644
--- a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
+++ b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
@@ -28,7 +28,7 @@ class DbBackendFormTest extends BaseTestCase
     {
         $this->setUpResourceFactoryMock();
         Mockery::mock('overload:Icinga\Authentication\User\DbUserBackend')
-            ->shouldReceive('count')
+            ->shouldReceive('select->where->count')
             ->andReturn(2);
 
         // Passing array(null) is required to make Mockery call the constructor...

From e74194c18ebbd9cfa9337f077ed77f7688a72601 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 12:15:50 +0200
Subject: [PATCH 1394/2920] ExternalBackend: Implement UserBackendInterface

refs #8826
---
 .../Authentication/User/ExternalBackend.php   | 42 ++++++++++++++-----
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/library/Icinga/Authentication/User/ExternalBackend.php b/library/Icinga/Authentication/User/ExternalBackend.php
index 4f9dd47b3..413c0553b 100644
--- a/library/Icinga/Authentication/User/ExternalBackend.php
+++ b/library/Icinga/Authentication/User/ExternalBackend.php
@@ -9,14 +9,21 @@ use Icinga\User;
 /**
  * Test login with external authentication mechanism, e.g. Apache
  */
-class ExternalBackend extends UserBackend
+class ExternalBackend implements UserBackendInterface
 {
+    /**
+     * The name of this backend
+     *
+     * @var string
+     */
+    protected $name;
+
     /**
      * Regexp expression to strip values from a username
      *
      * @var string
      */
-    private $stripUsernameRegexp;
+    protected $stripUsernameRegexp;
 
     /**
      * Create new authentication backend of type "external"
@@ -29,24 +36,37 @@ class ExternalBackend extends UserBackend
     }
 
     /**
-     * Count the available users
+     * Set this backend's name
      *
-     * Authenticaton backends of type "external" will always return 1
+     * @param   string  $name
      *
-     * @return int
+     * @return  $this
      */
-    public function count()
+    public function setName($name)
     {
-        return 1;
+        $this->name = $name;
+        return $this;
     }
 
     /**
-     * Authenticate
+     * Return this backend's name
      *
-     * @param   User    $user
-     * @param   string  $password
+     * @return  string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Authenticate the given user
      *
-     * @return  bool
+     * @param   User        $user
+     * @param   string      $password
+     *
+     * @return  bool                        True on success, false on failure
+     *
+     * @throws  AuthenticationException     In case authentication is not possible due to an error
      */
     public function authenticate(User $user, $password = null)
     {

From c44111732445b6764900c96d26ab898d829f8c31 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 12:18:25 +0200
Subject: [PATCH 1395/2920] LdapUserBackend: Extend Repository and implement
 UserBackendInterface

refs #8826
---
 .../Config/Authentication/LdapBackendForm.php |   9 +-
 .../Authentication/User/LdapUserBackend.php   | 320 ++++++++++++------
 .../Authentication/User/UserBackend.php       |  47 +--
 .../application/forms/AdminAccountPage.php    |   9 +-
 .../Authentication/LdapBackendFormTest.php    |   3 +-
 5 files changed, 231 insertions(+), 157 deletions(-)

diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php
index 867f5658c..0ec2c3e38 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/Authentication/LdapBackendForm.php
@@ -170,13 +170,8 @@ class LdapBackendForm extends Form
     public static function isValidAuthenticationBackend(Form $form)
     {
         try {
-            $ldapUserBackend = new LdapUserBackend(
-                ResourceFactory::createResource($form->getResourceConfig()),
-                $form->getElement('user_class')->getValue(),
-                $form->getElement('user_name_attribute')->getValue(),
-                $form->getElement('base_dn')->getValue(),
-                $form->getElement('filter')->getValue()
-            );
+            $ldapUserBackend = new LdapUserBackend(ResourceFactory::createResource($form->getResourceConfig()));
+            $ldapUserBackend->setConfig(new ConfigObject($form->getValues()));
             $ldapUserBackend->assertAuthenticationPossible();
         } catch (AuthenticationException $e) {
             if (($previous = $e->getPrevious()) !== null) {
diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index 8bc8f0222..9b2012b46 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -3,29 +3,55 @@
 
 namespace Icinga\Authentication\User;
 
-use Icinga\User;
-use Icinga\Protocol\Ldap\Query;
-use Icinga\Protocol\Ldap\Connection;
+use Icinga\Data\ConfigObject;
 use Icinga\Exception\AuthenticationException;
+use Icinga\Exception\ProgrammingError;
+use Icinga\Repository\Repository;
+use Icinga\Repository\RepositoryQuery;
 use Icinga\Protocol\Ldap\Exception as LdapException;
 use Icinga\Protocol\Ldap\Expression;
+use Icinga\User;
 
-class LdapUserBackend extends UserBackend
+class LdapUserBackend extends Repository implements UserBackendInterface
 {
     /**
-     * Connection to the LDAP server
+     * The base DN to use for a query
      *
-     * @var Connection
+     * @var string
      */
-    protected $conn;
-
     protected $baseDn;
 
+    /**
+     * The objectClass where look for users
+     *
+     * @var string
+     */
     protected $userClass;
 
+    /**
+     * The attribute name where to find a user's name
+     *
+     * @var string
+     */
     protected $userNameAttribute;
 
-    protected $customFilter;
+    /**
+     * The custom LDAP filter to apply on search queries
+     *
+     * @var string
+     */
+    protected $filter;
+
+    /**
+     * The default sort rules to be applied on a query
+     *
+     * @var array
+     */
+    protected $sortRules = array(
+        'user_name' => array(
+            'order' => 'asc'
+        )
+    );
 
     protected $groupOptions;
 
@@ -41,20 +67,115 @@ class LdapUserBackend extends UserBackend
         'samaccountname'    => 'sAMAccountName'
     );
 
-    public function __construct(
-        Connection $conn,
-        $userClass,
-        $userNameAttribute,
-        $baseDn,
-        $cutomFilter,
-        $groupOptions = null
-    ) {
-        $this->conn = $conn;
-        $this->baseDn = trim($baseDn) ?: $conn->getDN();
-        $this->userClass = $this->getNormedAttribute($userClass);
+    /**
+     * Set the base DN to use for a query
+     *
+     * @param   string  $baseDn
+     *
+     * @return  $this
+     */
+    public function setBaseDn($baseDn)
+    {
+        if (($baseDn = trim($baseDn))) {
+            $this->baseDn = $baseDn;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Return the base DN to use for a query
+     *
+     * @return  string
+     */
+    public function getBaseDn()
+    {
+        return $this->baseDn;
+    }
+
+    /**
+     * Set the objectClass where to look for users
+     *
+     * Sets also the base table name for the underlying repository.
+     *
+     * @param   string  $userClass
+     *
+     * @return  $this
+     */
+    public function setUserClass($userClass)
+    {
+        $this->baseTable = $this->userClass = $this->getNormedAttribute($userClass);
+        return $this;
+    }
+
+    /**
+     * Return the objectClass where to look for users
+     *
+     * @return string
+     */
+    public function getUserClass()
+    {
+        return $this->userClass;
+    }
+
+    /**
+     * Set the attribute name where to find a user's name
+     *
+     * @param   string  $userNameAttribute
+     *
+     * @return  $this
+     */
+    public function setUserNameAttribute($userNameAttribute)
+    {
         $this->userNameAttribute = $this->getNormedAttribute($userNameAttribute);
-        $this->customFilter = trim($cutomFilter);
-        $this->groupOptions = $groupOptions;
+        return $this;
+    }
+
+    /**
+     * Return the attribute name where to find a user's name
+     *
+     * @return  string
+     */
+    public function getUserNameAttribute()
+    {
+        return $this->userNameAttribute;
+    }
+
+    /**
+     * Set the custom LDAP filter to apply on search queries
+     *
+     * @param   string  $filter
+     *
+     * @return  $this
+     */
+    public function setFilter($filter)
+    {
+        if (($filter = trim($filter))) {
+            $this->filter = $filter;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Return the custom LDAP filter to apply on search queries
+     *
+     * @return  string
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    public function setGroupOptions(array $options)
+    {
+        $this->groupOptions = $options;
+        return $this;
+    }
+
+    public function getGroupOptions()
+    {
+        return $this->groupOptions;
     }
 
     /**
@@ -75,45 +196,69 @@ class LdapUserBackend extends UserBackend
     }
 
     /**
-     * Create a query to select all usernames
+     * Apply the given configuration to this backend
      *
-     * @return  Query
+     * @param   ConfigObject    $config
+     *
+     * @return  $this
      */
-    protected function selectUsers()
+    public function setConfig(ConfigObject $config)
     {
-        $query = $this->conn->select()->setBase($this->baseDn)->from(
-            $this->userClass,
-            array(
-                $this->userNameAttribute
-            )
-        );
+        return $this
+            ->setBaseDn($config->base_dn)
+            ->setUserClass($config->user_class)
+            ->setUserNameAttribute($config->user_name_attribute)
+            ->setFilter($config->filter);
+    }
 
-        if ($this->customFilter) {
-            $query->addFilter(new Expression($this->customFilter));
+    /**
+     * Return a new query for the given columns
+     *
+     * @param   array   $columns    The desired columns, if null all columns will be queried
+     *
+     * @return  RepositoryQuery
+     */
+    public function select(array $columns = null)
+    {
+        $this->initializeQueryColumns();
+
+        $query = parent::select($columns);
+        $query->getQuery()->setBase($this->baseDn);
+        if ($this->filter) {
+            $query->getQuery()->where(new Expression($this->filter));
         }
 
         return $query;
     }
 
     /**
-     * Create a query filtered by the given username
+     * Initialize this repository's query columns
      *
-     * @param   string  $username
-     *
-     * @return  Query
+     * @throws  ProgrammingError    In case either $this->userNameAttribute or $this->userClass has not been set yet
      */
-    protected function selectUser($username)
+    protected function initializeQueryColumns()
     {
-        return $this->selectUsers()->setUsePagedResults(false)->where(
-            $this->userNameAttribute,
-            str_replace('*', '', $username)
-        );
+        if ($this->queryColumns === null) {
+            if ($this->userClass === null) {
+                throw new ProgrammingError('It is required to set the objectClass where to look for users first');
+            }
+            if ($this->userNameAttribute === null) {
+                throw new ProgrammingError('It is required to set a attribute name where to find a user\'s name first');
+            }
+
+            $this->queryColumns[$this->userClass] = array(
+                'user_name'     => $this->userNameAttribute,
+                'is_active'     => 'unknown', // msExchUserAccountControl == 2/512/514? <- AD LDAP
+                'created_at'    => 'whenCreated', // That's AD LDAP,
+                'last_modified' => 'whenChanged' // what's OpenLDAP?
+            );
+        }
     }
 
     /**
      * Probe the backend to test if authentication is possible
      *
-     * Try to bind to the backend and query all available users to check if:
+     * Try to bind to the backend and fetch a single user to check if:
      * <ul>
      *  <li>Connection credentials are correct and the bind is possible</li>
      *  <li>At least one user exists</li>
@@ -125,23 +270,23 @@ class LdapUserBackend extends UserBackend
     public function assertAuthenticationPossible()
     {
         try {
-            $result = $this->selectUsers()->fetchRow();
+            $result = $this->select()->fetchRow();
         } catch (LdapException $e) {
             throw new AuthenticationException('Connection not possible.', $e);
         }
 
         if ($result === null) {
             throw new AuthenticationException(
-                'No objects with objectClass="%s" in DN="%s" found. (Filter: %s)',
+                'No objects with objectClass "%s" in DN "%s" found. (Filter: %s)',
                 $this->userClass,
-                $this->baseDn,
-                $this->customFilter ?: 'None'
+                $this->baseDn ?: $this->ds->getDn(),
+                $this->filter ?: 'None'
             );
         }
 
-        if (! isset($result->{$this->userNameAttribute})) {
+        if (! isset($result->user_name)) {
             throw new AuthenticationException(
-                'UserNameAttribute "%s" not existing in objectClass="%s"',
+                'UserNameAttribute "%s" not existing in objectClass "%s"',
                 $this->userNameAttribute,
                 $this->userClass
             );
@@ -163,7 +308,7 @@ class LdapUserBackend extends UserBackend
             return array();
         }
 
-        $q = $this->conn->select()
+        $result = $this->ds->select()
             ->setBase($this->groupOptions['group_base_dn'])
             ->from(
                 $this->groupOptions['group_class'],
@@ -172,12 +317,10 @@ class LdapUserBackend extends UserBackend
             ->where(
                 $this->groupOptions['group_member_attribute'],
                 $dn
-            );
-
-        $result = $this->conn->fetchAll($q);
+            )
+            ->fetchAll();
 
         $groups = array();
-
         foreach ($result as $group) {
             $groups[] = $group->{$this->groupOptions['group_attribute']};
         }
@@ -186,40 +329,30 @@ class LdapUserBackend extends UserBackend
     }
 
     /**
-     * Return whether the given user credentials are valid
+     * Authenticate the given user
      *
-     * @param   User    $user
-     * @param   string  $password
-     * @param   boolean $healthCheck        Assert that authentication is possible at all
+     * @param   User        $user
+     * @param   string      $password
      *
-     * @return  bool
+     * @return  bool                        True on success, false on failure
      *
-     * @throws  AuthenticationException     In case an error occured or the health check has failed
+     * @throws  AuthenticationException     In case authentication is not possible due to an error
      */
-    public function authenticate(User $user, $password, $healthCheck = false)
+    public function authenticate(User $user, $password)
     {
-        if ($healthCheck) {
-            try {
-                $this->assertAuthenticationPossible();
-            } catch (AuthenticationException $e) {
-                throw new AuthenticationException(
-                    'Authentication against backend "%s" not possible.',
-                    $this->getName(),
-                    $e
-                );
-            }
-        }
-
         try {
-            $userDn = $this->conn->fetchDN($this->selectUser($user->getUsername()));
+            $userDn = $this
+                ->select()
+                ->where('user_name', str_replace('*', '', $user->getUsername()))
+                ->getQuery()
+                ->setUsePagedResults(false)
+                ->fetchDn();
+
             if ($userDn === null) {
                 return false;
             }
 
-            $authenticated = $this->conn->testCredentials(
-                $userDn,
-                $password
-            );
+            $authenticated = $this->ds->testCredentials($userDn, $password);
             if ($authenticated) {
                 $groups = $this->getGroups($userDn);
                 if ($groups !== null) {
@@ -237,35 +370,4 @@ class LdapUserBackend extends UserBackend
             );
         }
     }
-
-    /**
-     * Get the number of users available
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return $this->selectUsers()->count();
-    }
-
-    /**
-     * Return the names of all available users
-     *
-     * @return  array
-     */
-    public function listUsers()
-    {
-        $users = array();
-        foreach ($this->selectUsers()->fetchAll() as $row) {
-            if (is_array($row->{$this->userNameAttribute})) {
-                foreach ($row->{$this->userNameAttribute} as $col) {
-                    $users[] = $col;
-                }
-            } else {
-                $users[] = $row->{$this->userNameAttribute};
-            }
-        }
-
-        return $users;
-    }
 }
diff --git a/library/Icinga/Authentication/User/UserBackend.php b/library/Icinga/Authentication/User/UserBackend.php
index 8bda07323..3d11289fb 100644
--- a/library/Icinga/Authentication/User/UserBackend.php
+++ b/library/Icinga/Authentication/User/UserBackend.php
@@ -160,49 +160,30 @@ class UserBackend
                 $backend = new DbUserBackend($resource);
                 break;
             case 'msldap':
-                $groupOptions = array(
+                $backend = new LdapUserBackend($resource);
+                $backend->setBaseDn($backendConfig->base_dn);
+                $backend->setUserClass($backendConfig->get('user_class', 'user'));
+                $backend->setUserNameAttribute($backendConfig->get('user_name_attribute', 'sAMAccountName'));
+                $backend->setFilter($backendConfig->filter);
+                $backend->setGroupOptions(array(
                     'group_base_dn'             => $backendConfig->get('group_base_dn', $resource->getDN()),
                     'group_attribute'           => $backendConfig->get('group_attribute', 'sAMAccountName'),
                     'group_member_attribute'    => $backendConfig->get('group_member_attribute', 'member'),
                     'group_class'               => $backendConfig->get('group_class', 'group')
-                );
-                $backend = new LdapUserBackend(
-                    $resource,
-                    $backendConfig->get('user_class', 'user'),
-                    $backendConfig->get('user_name_attribute', 'sAMAccountName'),
-                    $backendConfig->get('base_dn', $resource->getDN()),
-                    $backendConfig->get('filter'),
-                    $groupOptions
-                );
+                ));
                 break;
             case 'ldap':
-                if ($backendConfig->user_class === null) {
-                    throw new ConfigurationError(
-                        'Authentication configuration for backend "%s" is missing the \'user_class\' directive',
-                        $name
-                    );
-                }
-                if ($backendConfig->user_name_attribute === null) {
-                    throw new ConfigurationError(
-                        'Authentication configuration for backend "%s" is'
-                        . ' missing the \'user_name_attribute\' directive',
-                        $name
-                    );
-                }
-                $groupOptions = array(
+                $backend = new LdapUserBackend($resource);
+                $backend->setBaseDn($backendConfig->base_dn);
+                $backend->setUserClass($backendConfig->get('user_class', 'inetOrgPerson'));
+                $backend->setUserNameAttribute($backendConfig->get('user_name_attribute', 'uid'));
+                $backend->setFilter($backendConfig->filter);
+                $backend->setGroupOptions(array(
                     'group_base_dn'             => $backendConfig->group_base_dn,
                     'group_attribute'           => $backendConfig->group_attribute,
                     'group_member_attribute'    => $backendConfig->group_member_attribute,
                     'group_class'               => $backendConfig->group_class
-                );
-                $backend = new LdapUserBackend(
-                    $resource,
-                    $backendConfig->user_class,
-                    $backendConfig->user_name_attribute,
-                    $backendConfig->get('base_dn', $resource->getDN()),
-                    $backendConfig->get('filter'),
-                    $groupOptions
-                );
+                ));
                 break;
         }
 
diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 9b1ed06fc..7378a4095 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -268,13 +268,8 @@ class AdminAccountPage extends Form
         if ($this->backendConfig['backend'] === 'db') {
             $backend = new DbUserBackend(ResourceFactory::createResource(new ConfigObject($this->resourceConfig)));
         } elseif ($this->backendConfig['backend'] === 'ldap') {
-            $backend = new LdapUserBackend(
-                ResourceFactory::createResource(new ConfigObject($this->resourceConfig)),
-                $this->backendConfig['user_class'],
-                $this->backendConfig['user_name_attribute'],
-                $this->backendConfig['base_dn'],
-                $this->backendConfig['filter']
-            );
+            $backend = new LdapUserBackend(ResourceFactory::createResource(new ConfigObject($this->resourceConfig)));
+            $backend->setConfig($this->backendConfig);
         } else {
             throw new LogicException(
                 sprintf(
diff --git a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
index 43b8bc1d2..442770e83 100644
--- a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
+++ b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
@@ -29,7 +29,8 @@ class LdapBackendFormTest extends BaseTestCase
     {
         $this->setUpResourceFactoryMock();
         Mockery::mock('overload:Icinga\Authentication\User\LdapUserBackend')
-            ->shouldReceive('assertAuthenticationPossible')->andReturnNull();
+            ->shouldReceive('assertAuthenticationPossible')->andReturnNull()
+            ->shouldReceive('setConfig')->andReturnNull();
 
         // Passing array(null) is required to make Mockery call the constructor...
         $form = Mockery::mock('Icinga\Forms\Config\Authentication\LdapBackendForm[getView]', array(null));

From 437090d2b17089a9a73f7f90feab6484179f42f8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 12:21:17 +0200
Subject: [PATCH 1396/2920] AdminAccountPage: Backends do provide a unified
 interface now, use it

refs #8826
refs #7693
---
 modules/setup/application/forms/AdminAccountPage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 7378a4095..a7bd8fc6c 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -280,8 +280,8 @@ class AdminAccountPage extends Form
         }
 
         try {
-            return $backend->listUsers();
-        } catch (Exception $e) {
+            return $backend->select(array('user_name'))->fetchColumn();
+        } catch (Exception $_) {
             // No need to handle anything special here. Error means no users found.
             return array();
         }

From 100d475b588db657cec0b24dcfa09c41f1cdb274 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 13:25:07 +0200
Subject: [PATCH 1397/2920] Fix ldap ConnectionTest

If I ever have to look at this test again, I'll drop it.

refs #8826
---
 test/php/library/Icinga/Protocol/Ldap/ConnectionTest.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/php/library/Icinga/Protocol/Ldap/ConnectionTest.php b/test/php/library/Icinga/Protocol/Ldap/ConnectionTest.php
index 182004703..b49250ba5 100644
--- a/test/php/library/Icinga/Protocol/Ldap/ConnectionTest.php
+++ b/test/php/library/Icinga/Protocol/Ldap/ConnectionTest.php
@@ -126,12 +126,11 @@ class ConnectionTest extends BaseTestCase
         return Mockery::mock('overload:Icinga\Protocol\Ldap\Query')
                 ->shouldReceive(array(
                     'from' => Mockery::self(),
-                    'create' => array('count' => 1),
-                    'listFields' => array('count' => 1),
+                    'getColumns' => array('count' => 1),
                     'getLimit' => 1,
                     'hasOffset' => false,
-                    'hasBase' => false,
-                    'getSortColumns' => array(),
+                    'getBase' => null,
+                    'hasOrder' => false,
                     'getUsePagedResults' => true
                 ));
     }

From 9163fb0f0f5f91d16a06c3f7812bd798c0186f9d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 13:40:54 +0200
Subject: [PATCH 1398/2920] Drop Icinga\Protocol\Ldap\ConnectionTest

...located at *test*/php/library/Icinga/Protocol/Ldap/.
---
 .../Icinga/Protocol/Ldap/ConnectionTest.php   | 257 ------------------
 1 file changed, 257 deletions(-)
 delete mode 100644 test/php/library/Icinga/Protocol/Ldap/ConnectionTest.php

diff --git a/test/php/library/Icinga/Protocol/Ldap/ConnectionTest.php b/test/php/library/Icinga/Protocol/Ldap/ConnectionTest.php
deleted file mode 100644
index b49250ba5..000000000
--- a/test/php/library/Icinga/Protocol/Ldap/ConnectionTest.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-// We need to overwrite the library functions in the regular namespace to mock library functions. We run
-// this test in a separate process to not alter different test cases.
-namespace Icinga\Protocol\Ldap;
-
-use Icinga\Test\BaseTestCase;
-use Icinga\Data\ConfigObject;
-use Mockery;
-
-/**
- *  @runTestsInSeparateProcesses
- */
-class ConnectionTest extends BaseTestCase
-{
-    private $connection;
-
-    public $pagedResultsCalled;
-    public $startTlsCalled;
-    public $activatedOptions;
-
-    private function mockLdapFunctions () {
-
-        global $self;
-        $self = $this;
-
-        function ldap_connect()
-        {
-            return true;
-        }
-
-        function ldap_bind()
-        {
-            return true;
-        }
-
-        function ldap_search ()
-        {
-            return true;
-        }
-
-        function ldap_get_entries()
-        {
-            return 1;
-        }
-
-        function ldap_count_entries()
-        {
-            return 1;
-        }
-
-        function ldap_read()
-        {
-            return true;
-        }
-
-        function ldap_first_entry($ds, $result)
-        {
-            return $result;
-        }
-
-        function ldap_get_attributes()
-        {
-            global $self;
-            return $self->getAttributesMock;
-        }
-
-        function ldap_start_tls()
-        {
-            global $self;
-            $self->startTlsCalled = true;
-        }
-
-        function ldap_set_option($ds, $option, $value)
-        {
-            global $self;
-            $self->activatedOptions[$option] = $value;
-            return true;
-        }
-
-        function ldap_set($ds, $option)
-        {
-            global $self;
-            $self->activatedOptions[] = $option;
-        }
-
-        function ldap_control_paged_result()
-        {
-            global $self;
-            $self->pagedResultsCalled = true;
-            return true;
-        }
-
-        function ldap_control_paged_result_response()
-        {
-            return true;
-        }
-
-        function ldap_get_dn()
-        {
-            return NULL;
-        }
-
-        function ldap_free_result()
-        {
-            return NULL;
-        }
-    }
-
-    private function node(&$element, $name)
-    {
-        $element['count']++;
-        $element[$name] = array('count' => 0);
-        $element[] = $name;
-    }
-
-    private function addEntry(&$element, $name, $entry)
-    {
-        $element[$name]['count']++;
-        $element[$name][] = $entry;
-    }
-
-    private function mockQuery()
-    {
-        return Mockery::mock('overload:Icinga\Protocol\Ldap\Query')
-                ->shouldReceive(array(
-                    'from' => Mockery::self(),
-                    'getColumns' => array('count' => 1),
-                    'getLimit' => 1,
-                    'hasOffset' => false,
-                    'getBase' => null,
-                    'hasOrder' => false,
-                    'getUsePagedResults' => true
-                ));
-    }
-
-    private function connectionFetchAll()
-    {
-        $this->mockQuery();
-        $this->connection->connect();
-        $this->connection->fetchAll(Mockery::self());
-    }
-
-    public function setUp()
-    {
-        $this->pagedResultsCalled = false;
-        $this->startTlsCalled = false;
-        $this->activatedOptions = array();
-
-        $this->mockLdapFunctions();
-
-        $config = new ConfigObject(
-            array(
-                'hostname' => 'localhost',
-                'root_dn'  => 'dc=example,dc=com',
-                'bind_dn'  => 'cn=user,ou=users,dc=example,dc=com',
-                'bind_pw'  => '***'
-            )
-        );
-        $this->connection = new Connection($config);
-
-        $caps = array('count' => 0);
-        $this->node($caps, 'defaultNamingContext');
-        $this->node($caps, 'namingContexts');
-        $this->node($caps, 'supportedCapabilities');
-        $this->node($caps, 'supportedControl');
-        $this->node($caps, 'supportedLDAPVersion');
-        $this->node($caps, 'supportedExtension');
-        $this->getAttributesMock = $caps;
-    }
-
-    public function testUsePageControlWhenAnnounced()
-    {
-        if (version_compare(PHP_VERSION, '5.4.0') < 0) {
-            $this->markTestSkipped('Page control needs at least PHP_VERSION 5.4.0');
-        }
-
-        $this->addEntry($this->getAttributesMock, 'supportedControl', Capability::LDAP_PAGED_RESULT_OID_STRING);
-        $this->connectionFetchAll();
-
-        // see ticket #7993
-        $this->assertEquals(true, $this->pagedResultsCalled, "Use paged result when capability is present.");
-    }
-
-    public function testDontUsePagecontrolWhenNotAnnounced()
-    {
-        if (version_compare(PHP_VERSION, '5.4.0') < 0) {
-            $this->markTestSkipped('Page control needs at least PHP_VERSION 5.4.0');
-        }
-        $this->connectionFetchAll();
-
-        // see ticket #8490
-        $this->assertEquals(false, $this->pagedResultsCalled, "Don't use paged result when capability is not announced.");
-    }
-
-    public function testUseLdapV2WhenAnnounced()
-    {
-         // TODO: Test turned off, see other TODO in Ldap/Connection.
-         $this->markTestSkipped('LdapV2 currently turned off.');
-
-         $this->addEntry($this->getAttributesMock, 'supportedLDAPVersion', 2);
-         $this->connectionFetchAll();
-
-         $this->assertArrayHasKey(LDAP_OPT_PROTOCOL_VERSION, $this->activatedOptions, "LDAP version must be set");
-         $this->assertEquals($this->activatedOptions[LDAP_OPT_PROTOCOL_VERSION], 2);
-    }
-
-    public function testUseLdapV3WhenAnnounced()
-    {
-        $this->addEntry($this->getAttributesMock, 'supportedLDAPVersion', 3);
-        $this->connectionFetchAll();
-
-        $this->assertArrayHasKey(LDAP_OPT_PROTOCOL_VERSION, $this->activatedOptions, "LDAP version must be set");
-        $this->assertEquals($this->activatedOptions[LDAP_OPT_PROTOCOL_VERSION], 3, "LDAPv3 must be active");
-    }
-
-    public function testDefaultSettings()
-    {
-        $this->connectionFetchAll();
-
-        $this->assertArrayHasKey(LDAP_OPT_PROTOCOL_VERSION, $this->activatedOptions, "LDAP version must be set");
-        $this->assertEquals($this->activatedOptions[LDAP_OPT_PROTOCOL_VERSION], 3, "LDAPv3 must be active");
-
-        $this->assertArrayHasKey(LDAP_OPT_REFERRALS, $this->activatedOptions, "Following referrals must be turned off");
-        $this->assertEquals($this->activatedOptions[LDAP_OPT_REFERRALS], 0, "Following referrals must be turned off");
-    }
-
-
-    public function testActiveDirectoryDiscovery()
-    {
-        $this->addEntry($this->getAttributesMock, 'supportedCapabilities', Capability::LDAP_CAP_ACTIVE_DIRECTORY_OID);
-        $this->connectionFetchAll();
-
-        $this->assertEquals(true, $this->connection->getCapabilities()->hasAdOid(),
-            "Server with LDAP_CAP_ACTIVE_DIRECTORY_OID must be recognized as Active Directory.");
-    }
-
-    public function testDefaultNamingContext()
-    {
-        $this->addEntry($this->getAttributesMock, 'defaultNamingContext', 'dn=default,dn=contex');
-        $this->connectionFetchAll();
-
-        $this->assertEquals('dn=default,dn=contex', $this->connection->getCapabilities()->getDefaultNamingContext(),
-            'Default naming context must be correctly recognized.');
-    }
-
-    public function testDefaultNamingContextFallback()
-    {
-        $this->addEntry($this->getAttributesMock, 'namingContexts', 'dn=some,dn=other,dn=context');
-        $this->addEntry($this->getAttributesMock, 'namingContexts', 'dn=default,dn=context');
-        $this->connectionFetchAll();
-
-        $this->assertEquals('dn=some,dn=other,dn=context', $this->connection->getCapabilities()->getDefaultNamingContext(),
-            'If defaultNamingContext is missing, the connection must fallback to first namingContext.');
-    }
-}

From 993cb315725ec5c49508ca534ca1f5f0023b6d45 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 4 May 2015 14:39:12 +0200
Subject: [PATCH 1399/2920] Fix the permission for the toggle object feature
 assertion

fixes #9198
---
 .../forms/Command/Object/ToggleObjectFeaturesCommandForm.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
index a6c20f630..34fbb4c2c 100644
--- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
@@ -30,7 +30,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
      */
     public function createElements(array $formData = array())
     {
-        $toggleDisabled = $this->hasPermission('monitoring/command/feature/instance')  ? null : '';
+        $toggleDisabled = $this->hasPermission('monitoring/command/feature/object')  ? null : '';
         $this->addElements(array(
             array(
                 'checkbox',

From b86a0024c35e80d683fe9783437268dcea4d126e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 15:55:36 +0200
Subject: [PATCH 1400/2920] DbUserBackend: Use is_active as well as a default
 sort column

refs #8826
---
 library/Icinga/Authentication/User/DbUserBackend.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/User/DbUserBackend.php b/library/Icinga/Authentication/User/DbUserBackend.php
index 08c2006d6..3cea0ccc9 100644
--- a/library/Icinga/Authentication/User/DbUserBackend.php
+++ b/library/Icinga/Authentication/User/DbUserBackend.php
@@ -46,7 +46,10 @@ class DbUserBackend extends DbRepository implements UserBackendInterface
      */
     protected $sortRules = array(
         'user_name' => array(
-            'order' => 'asc'
+            'columns'   => array(
+                'user_name asc',
+                'is_active desc'
+            )
         )
     );
 

From 842b043f7fba9dc280ae23d059619986de13a845 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 15:56:13 +0200
Subject: [PATCH 1401/2920] LdapUserBackend: Use is_active as well as a default
 sort column

refs #8826
---
 library/Icinga/Authentication/User/LdapUserBackend.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index 9b2012b46..e7fa6767b 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -49,7 +49,10 @@ class LdapUserBackend extends Repository implements UserBackendInterface
      */
     protected $sortRules = array(
         'user_name' => array(
-            'order' => 'asc'
+            'columns'   => array(
+                'user_name asc',
+                'is_active desc'
+            )
         )
     );
 

From f9089c3e0c3fab228d5ac3f3aaefb2b7d8330f8c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 15:56:58 +0200
Subject: [PATCH 1402/2920] RepositoryQuery: Ensure compatibility with the
 FilterEditor widget

refs #8826
---
 library/Icinga/Repository/RepositoryQuery.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index df5d17cd6..e9acb945b 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -65,6 +65,16 @@ class RepositoryQuery implements QueryInterface
         return $this;
     }
 
+    /**
+     * Return the columns to fetch
+     *
+     * @return  array
+     */
+    public function getColumns()
+    {
+        return $this->query->getColumns();
+    }
+
     /**
      * Set which columns to fetch
      *

From 3e8ef5cc0f86753794592b448027973f370d19b9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 16:17:14 +0200
Subject: [PATCH 1403/2920] Ldap\Query: Quick fix for naive filter support

Since this will ignore any logical clauses and operators it must be
considered a quick fix and be dropped once real filter support exists.

refs #8826
---
 library/Icinga/Protocol/Ldap/Query.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Query.php b/library/Icinga/Protocol/Ldap/Query.php
index d923c8ebd..d5bf1f080 100644
--- a/library/Icinga/Protocol/Ldap/Query.php
+++ b/library/Icinga/Protocol/Ldap/Query.php
@@ -126,14 +126,17 @@ class Query extends SimpleQuery
         throw new NotImplementedError('Support for Icinga\Data\Filter is still missing. Use $this->where() instead');
     }
 
-    public function applyFilter(Filter $filter)
-    {
-        throw new NotImplementedError('Support for Icinga\Data\Filter is still missing. Use $this->where() instead');
-    }
-
     public function addFilter(Filter $filter)
     {
-        throw new NotImplementedError('Support for Icinga\Data\Filter is still missing. Use $this->where() instead');
+        // TODO: This should be considered a quick fix only.
+        //       Drop this entirely once support for Icinga\Data\Filter is available
+        if ($filter->isExpression()) {
+            $this->where($filter->getColumn(), $filter->getValue());
+        } elseif ($filter->isChain()) {
+            foreach ($filter->filters() as $chainOrExpression) {
+                $this->addFilter($chainOrExpression);
+            }
+        }
     }
 
     public function setFilter(Filter $filter)

From d0a353c3da2d5de43803779f7e35053beb0d1866 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 16:24:17 +0200
Subject: [PATCH 1404/2920] Ldap\Connection: Fix result counting

Missed to adjust this once I refactored the query execution..

refs #8826
---
 library/Icinga/Protocol/Ldap/Connection.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index edda85dcf..9296c5f88 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -241,14 +241,9 @@ class Connection implements Selectable
         $this->connect();
         $this->bind();
 
-        $count = 0;
-        $results = $this->runQuery($query);
-        while (! empty($results)) {
-            $count += ldap_count_entries($this->ds, $results);
-            $results = $this->runQuery($query);
-        }
-
-        return $count;
+        // TODO: That's still not the best solution, this should probably not request any attributes
+        $res = $this->runQuery($query);
+        return count($res);
     }
 
     public function fetchAll(Query $query, $fields = array())

From d171dd2ec91ec79ce7c9d718188c0d2bab4024e1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 4 May 2015 17:04:50 +0200
Subject: [PATCH 1405/2920] Introduce controller UserController

Still only able to list users, more to follow...

refs #8826
---
 application/controllers/UserController.php | 102 +++++++++++++++++++++
 application/views/scripts/user/list.phtml  |  49 ++++++++++
 library/Icinga/Web/Menu.php                |  17 ++--
 public/css/icinga/main-content.less        |  20 ++++
 4 files changed, 182 insertions(+), 6 deletions(-)
 create mode 100644 application/controllers/UserController.php
 create mode 100644 application/views/scripts/user/list.phtml

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
new file mode 100644
index 000000000..5ffbcdf25
--- /dev/null
+++ b/application/controllers/UserController.php
@@ -0,0 +1,102 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+use \Zend_Controller_Action_Exception;
+use Icinga\Application\Config;
+use Icinga\Authentication\User\UserBackend;
+use Icinga\Authentication\User\UserBackendInterface;
+use Icinga\Data\Selectable;
+use Icinga\Web\Controller;
+use Icinga\Web\Widget;
+
+class UserController extends Controller
+{
+    /**
+     * Redirect to this controller's list action
+     */
+    public function indexAction()
+    {
+        $this->redirectNow('user/list');
+    }
+
+    /**
+     * List all users of a single backend
+     */
+    public function listAction()
+    {
+        $backend = $this->getUserBackend($this->params->get('backend'));
+        if ($backend === null) {
+            $this->view->backend = null;
+            return;
+        }
+
+        $query = $backend->select(array(
+            'user_name',
+            'is_active',
+            'created_at',
+            'last_modified'
+        ));
+
+        $filterEditor = Widget::create('filterEditor')
+            ->setQuery($query)
+            ->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
+            ->ignoreParams('page')
+            ->handleRequest($this->getRequest());
+        $query->applyFilter($filterEditor->getFilter());
+        $this->setupFilterControl($filterEditor);
+
+        $this->view->backend = $backend;
+        $this->view->users = $query->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->users);
+        $this->setupSortControl(array(
+            'user_name'     => $this->translate('Username'),
+            'is_active'     => $this->translate('Active'),
+            'created_at'    => $this->translate('Created at'),
+            'last_modified' => $this->translate('Last modified')
+        ));
+    }
+
+    /**
+     * Return the given user backend or the first match in order
+     *
+     * @param   string  $name           The name of the backend, or null in case the first match should be returned
+     * @param   bool    $selectable     Whether the backend should implement the Selectable interface
+     *
+     * @return  UserBackendInterface
+     *
+     * @throws  Zend_Controller_Action_Exception    In case the given backend name is invalid
+     */
+    protected function getUserBackend($name = null, $selectable = true)
+    {
+        $config = Config::app('authentication');
+        if ($name !== null) {
+            if (! $config->hasSection($name)) {
+                throw new Zend_Controller_Action_Exception(
+                    sprintf($this->translate('Authentication backend "%s" not found'), $name),
+                    404
+                );
+            } else {
+                $backend = UserBackend::create($name, $config->getSection($name));
+                if ($selectable && !$backend instanceof Selectable) {
+                    throw new Zend_Controller_Action_Exception(
+                        sprintf($this->translate('Authentication backend "%s" is not able to list users'), $name),
+                        400
+                    );
+                }
+            }
+        } else {
+            $backend = null;
+            foreach ($config as $backendName => $backendConfig) {
+                $candidate = UserBackend::create($backendName, $backendConfig);
+                if (! $selectable || $candidate instanceof Selectable) {
+                    $backend = $candidate;
+                    break;
+                }
+            }
+        }
+
+        return $backend;
+    }
+}
diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
new file mode 100644
index 000000000..8ccc37bee
--- /dev/null
+++ b/application/views/scripts/user/list.phtml
@@ -0,0 +1,49 @@
+<?php if (! $this->compact): ?>
+<div class="controls">
+  <?= $this->tabs; ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
+</div>
+<?php endif ?>
+<div class="content">
+<?php
+
+if ($backend === null) {
+    echo $this->translate('No backend found which is able to list users') . '</div>';
+    return;
+}
+
+if (count($users) === 0) {
+    echo $this->translate('No users found matching the filter') . '</div>';
+    return;
+}
+?>
+
+<table data-base-target="_next" class="action user-list">
+  <thead>
+    <tr>
+      <th class="user-name"><?= $this->translate('Username'); ?></th>
+      <th class="user-state"><?= $this->translate('State'); ?></th>
+      <th class="user-created"><?= $this->translate('Created at'); ?></th>
+      <th class="user-modified"><?= $this->translate('Last modified'); ?></th>
+    </tr>
+  </thead>
+  <tbody>
+  <?php foreach ($users as $user): ?>
+    <tr>
+      <td clas="user-name"><?= $this->escape($user->user_name); ?></td>
+      <td class="user-state"><?= $user->is_active === null ? $this->translate('N/A') : (
+        $user->is_active ? $this->translate('Active') : $this->translate('Inactive')
+      ); ?></td>
+      <td class="user-created">
+        <?= $user->created_at === null ? $this->translate('N/A') : date('d/m/Y g:i A', $user->created_at); ?>
+      </td>
+      <td class="user-modified">
+        <?= $user->last_modified === null ? $this->translate('Never') : date('d/m/Y g:i A', $user->last_modified); ?>
+      </td>
+    </tr>
+  <?php endforeach ?>
+  </tbody>
+</table>
\ No newline at end of file
diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index bca1e17d1..aff6c7abb 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -236,36 +236,41 @@ class Menu implements RecursiveIterator
                 'icon'     => 'wrench',
                 'priority' => 200
             ));
+            $section->add(t('User-Management'), array(
+                'url'           => 'user/list',
+                'permission'    => 'config/application/*',
+                'priority'      => 300
+            ));
             $section->add(t('Configuration'), array(
                 'url'           => 'config',
                 'permission'    => 'config/application/*',
-                'priority'      => 300
+                'priority'      => 400
             ));
             $section->add(t('Modules'), array(
                 'url'           => 'config/modules',
                 'permission'    => 'config/modules',
-                'priority'      => 400
+                'priority'      => 500
             ));
 
             if (Logger::writesToFile()) {
                 $section->add(t('Application Log'), array(
                     'url'      => 'list/applicationlog',
-                    'priority' => 500
+                    'priority' => 600
                 ));
             }
 
             $section = $this->add($auth->getUser()->getUsername(), array(
                 'icon'     => 'user',
-                'priority' => 600
+                'priority' => 700
             ));
             $section->add(t('Preferences'), array(
                 'url'      => 'preference',
-                'priority' => 601
+                'priority' => 701
             ));
 
             $section->add(t('Logout'), array(
                 'url'      => 'authentication/logout',
-                'priority' => 700,
+                'priority' => 800,
                 'renderer' => 'ForeignMenuItemRenderer'
             ));
         }
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index b442723cb..06a0b1b90 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -202,3 +202,23 @@ table.benchmark {
   border: 1px solid lightgrey;
   background-color: #fbfcc5;
 }
+
+table.user-list {
+  th {
+    &.user-state {
+      width: 6%;
+      padding-right: 0.5em;
+      text-align: right;
+    }
+
+    &.user-created, &.user-modified {
+      width: 12%;
+      padding-right: 0.5em;
+      text-align: right;
+    }
+  }
+
+  td.user-state, td.user-created, td.user-modified {
+    text-align: right;
+  }
+}
\ No newline at end of file

From 271e350faae3e476402757f8a016cf9ed284ecec Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 5 May 2015 07:12:25 +0200
Subject: [PATCH 1406/2920] UserController: Add missing closing div tag to the
 list action's view script

refs #8826
---
 application/views/scripts/user/list.phtml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index 8ccc37bee..b6ff7e0ef 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -46,4 +46,5 @@ if (count($users) === 0) {
     </tr>
   <?php endforeach ?>
   </tbody>
-</table>
\ No newline at end of file
+</table>
+</div>
\ No newline at end of file

From d71df6a9b85ed2206fecb9938b463b516fd61798 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 5 May 2015 07:30:42 +0200
Subject: [PATCH 1407/2920] Revert "SimpleQuery: Make compare() alias aware"

This reverts commit 6612e4c1ae79c2bc3a5cd08e1594fc152107618e.
---
 library/Icinga/Data/SimpleQuery.php | 64 ++++++++++-------------------
 1 file changed, 22 insertions(+), 42 deletions(-)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 1507ba589..a069e03cd 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -43,15 +43,6 @@ class SimpleQuery implements QueryInterface
      */
     protected $columns = array();
 
-    /**
-     * The columns and their aliases flipped in order to handle aliased sort columns
-     *
-     * Supposed to be used and populated by $this->compare *only*.
-     *
-     * @var array
-     */
-    protected $flippedColumns;
-
     /**
      * The columns you're using to sort the query result
      *
@@ -228,42 +219,32 @@ class SimpleQuery implements QueryInterface
         return $this;
     }
 
-    /**
-     * Compare $a with $b based on this query's sort rules and column aliases
-     *
-     * @param   object  $a
-     * @param   object  $b
-     * @param   int     $orderIndex
-     *
-     * @return  int
-     */
-    public function compare($a, $b, $orderIndex = 0)
+    public function compare($a, $b, $col_num = 0)
     {
-        if (! array_key_exists($orderIndex, $this->order)) {
-            return 0; // Last column to sort reached, rows are considered being equal
+        // Last column to sort reached, rows are considered being equal
+        if (! array_key_exists($col_num, $this->order)) {
+            return 0;
+        }
+        $col = $this->order[$col_num][0];
+        $dir = $this->order[$col_num][1];
+// TODO: throw Exception if column is missing
+        //$res = strnatcmp(strtolower($a->$col), strtolower($b->$col));
+        $res = @strcmp(strtolower($a->$col), strtolower($b->$col));
+        if ($res === 0) {
+//            return $this->compare($a, $b, $col_num++);
+
+            if (array_key_exists(++$col_num, $this->order)) {
+                return $this->compare($a, $b, $col_num);
+            } else {
+                return 0;
+            }
+
         }
 
-        if ($this->flippedColumns === null) {
-            $this->flippedColumns = array_flip($this->columns);
-        }
-
-        $column = $this->order[$orderIndex][0];
-        if (array_key_exists($column, $this->flippedColumns)) {
-            $column = $this->flippedColumns[$column];
-        }
-
-        // TODO: throw Exception if column is missing
-        //$res = strnatcmp(strtolower($a->$column), strtolower($b->$column));
-        $result = @strcmp(strtolower($a->$column), strtolower($b->$column));
-        if ($result === 0) {
-            return $this->compare($a, $b, $orderIndex);
-        }
-
-        $direction = $this->order[$orderIndex][1];
-        if ($direction === self::SORT_ASC) {
-            return $result;
+        if ($dir === self::SORT_ASC) {
+            return $res;
         } else {
-            return $result * -1;
+            return $res * -1;
         }
     }
 
@@ -445,7 +426,6 @@ class SimpleQuery implements QueryInterface
     public function columns(array $columns)
     {
         $this->columns = $columns;
-        $this->flippedColumns = null; // Reset, due to updated columns
         return $this;
     }
 

From bd136d39f472be8db78861214b44212f52e4dcfb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 5 May 2015 07:31:50 +0200
Subject: [PATCH 1408/2920] SimpleQuery: Make compare() alias aware

refs #8826
refs #7693
---
 library/Icinga/Data/SimpleQuery.php | 64 +++++++++++++++++++----------
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index a069e03cd..3477c2331 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -43,6 +43,15 @@ class SimpleQuery implements QueryInterface
      */
     protected $columns = array();
 
+    /**
+     * The columns and their aliases flipped in order to handle aliased sort columns
+     *
+     * Supposed to be used and populated by $this->compare *only*.
+     *
+     * @var array
+     */
+    protected $flippedColumns;
+
     /**
      * The columns you're using to sort the query result
      *
@@ -219,32 +228,42 @@ class SimpleQuery implements QueryInterface
         return $this;
     }
 
-    public function compare($a, $b, $col_num = 0)
+    /**
+     * Compare $a with $b based on this query's sort rules and column aliases
+     *
+     * @param   object  $a
+     * @param   object  $b
+     * @param   int     $orderIndex
+     *
+     * @return  int
+     */
+    public function compare($a, $b, $orderIndex = 0)
     {
-        // Last column to sort reached, rows are considered being equal
-        if (! array_key_exists($col_num, $this->order)) {
-            return 0;
-        }
-        $col = $this->order[$col_num][0];
-        $dir = $this->order[$col_num][1];
-// TODO: throw Exception if column is missing
-        //$res = strnatcmp(strtolower($a->$col), strtolower($b->$col));
-        $res = @strcmp(strtolower($a->$col), strtolower($b->$col));
-        if ($res === 0) {
-//            return $this->compare($a, $b, $col_num++);
-
-            if (array_key_exists(++$col_num, $this->order)) {
-                return $this->compare($a, $b, $col_num);
-            } else {
-                return 0;
-            }
-
+        if (! array_key_exists($orderIndex, $this->order)) {
+            return 0; // Last column to sort reached, rows are considered being equal
         }
 
-        if ($dir === self::SORT_ASC) {
-            return $res;
+        if ($this->flippedColumns === null) {
+            $this->flippedColumns = array_flip($this->columns);
+        }
+
+        $column = $this->order[$orderIndex][0];
+        if (array_key_exists($column, $this->flippedColumns)) {
+            $column = $this->flippedColumns[$column];
+        }
+
+        // TODO: throw Exception if column is missing
+        //$res = strnatcmp(strtolower($a->$column), strtolower($b->$column));
+        $result = @strcmp(strtolower($a->$column), strtolower($b->$column));
+        if ($result === 0) {
+            return $this->compare($a, $b, ++$orderIndex);
+        }
+
+        $direction = $this->order[$orderIndex][1];
+        if ($direction === self::SORT_ASC) {
+            return $result;
         } else {
-            return $res * -1;
+            return $result * -1;
         }
     }
 
@@ -426,6 +445,7 @@ class SimpleQuery implements QueryInterface
     public function columns(array $columns)
     {
         $this->columns = $columns;
+        $this->flippedColumns = null; // Reset, due to updated columns
         return $this;
     }
 

From 8cf0c29223c71a88229a05667dd596c80bcd25a4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 5 May 2015 07:36:14 +0200
Subject: [PATCH 1409/2920] UserController: Add tab for the list action

refs #8826
---
 application/controllers/UserController.php | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 5ffbcdf25..b5fcc50f1 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -11,6 +11,14 @@ use Icinga\Web\Widget;
 
 class UserController extends Controller
 {
+    /**
+     * Initialize this controller
+     */
+    public function init()
+    {
+        $this->createTabs();
+    }
+
     /**
      * Redirect to this controller's list action
      */
@@ -45,6 +53,7 @@ class UserController extends Controller
         $query->applyFilter($filterEditor->getFilter());
         $this->setupFilterControl($filterEditor);
 
+        $this->getTabs()->activate('user/list');
         $this->view->backend = $backend;
         $this->view->users = $query->paginate();
 
@@ -99,4 +108,21 @@ class UserController extends Controller
 
         return $backend;
     }
+
+    /**
+     * Create the tabs
+     */
+    protected function createTabs()
+    {
+        $tabs = $this->getTabs();
+        $tabs->add(
+            'user/list',
+            array(
+                'title'     => $this->translate('List users of authentication backends'),
+                'label'     => $this->translate('Users'),
+                'icon'      => 'users',
+                'url'       => 'user/list'
+            )
+        );
+    }
 }

From 7b2fc1ba41154d8778d671cd4e497ea84922160d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 5 May 2015 08:26:38 +0200
Subject: [PATCH 1410/2920] Make class UserGroupBackend being just a factory
 for user group backends

refs #8826
---
 .../UserGroup/UserGroupBackend.php            | 81 +++++--------------
 1 file changed, 22 insertions(+), 59 deletions(-)

diff --git a/library/Icinga/Authentication/UserGroup/UserGroupBackend.php b/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
index 410b5114d..a6382c8e5 100644
--- a/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
@@ -8,19 +8,18 @@ use Icinga\Application\Icinga;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;
-use Icinga\User;
 
 /**
- * Base class and factory for user group backends
+ * Factory for user group backends
  */
-abstract class UserGroupBackend
+class UserGroupBackend
 {
     /**
      * The default user group backend types provided by Icinga Web 2
      *
      * @var array
      */
-    private static $defaultBackends = array( // I would have liked it if I were able to declare this as constant :'(
+    protected static $defaultBackends = array(
         'db',
         'ini'
     );
@@ -33,39 +32,9 @@ abstract class UserGroupBackend
     protected static $customBackends;
 
     /**
-     * The name of this backend
-     *
-     * @var string
+     * Register all custom user group backends from all loaded modules
      */
-    protected $name;
-
-    /**
-     * Set this backend's name
-     *
-     * @param   string  $name
-     *
-     * @return  $this
-     */
-    public function setName($name)
-    {
-        $this->name = (string) $name;
-        return $this;
-    }
-
-    /**
-     * Return this backend's name
-     *
-     * @return  string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Fetch all custom user group backends from all loaded modules
-     */
-    public static function loadCustomUserGroupBackends()
+    public static function registerCustomUserGroupBackends()
     {
         if (static::$customBackends !== null) {
             return;
@@ -77,7 +46,7 @@ abstract class UserGroupBackend
             foreach ($module->getUserGroupBackends() as $identifier => $className) {
                 if (array_key_exists($identifier, $providedBy)) {
                     Logger::warning(
-                        'Cannot register UserGroupBackend of type "%s" provided by module "%s".'
+                        'Cannot register user group backend of type "%s" provided by module "%s".'
                         . ' The type is already provided by module "%s"',
                         $identifier,
                         $module->getName(),
@@ -85,7 +54,7 @@ abstract class UserGroupBackend
                     );
                 } elseif (in_array($identifier, static::$defaultBackends)) {
                     Logger::warning(
-                        'Cannot register UserGroupBackend of type "%s" provided by module "%s".'
+                        'Cannot register user group backend of type "%s" provided by module "%s".'
                         . ' The type is a default type provided by Icinga Web 2',
                         $identifier,
                         $module->getName()
@@ -99,29 +68,23 @@ abstract class UserGroupBackend
     }
 
     /**
-     * Validate and return the class for the given custom user group backend
+     * Return the class for the given custom user group backend
      *
      * @param   string  $identifier     The identifier of the custom user group backend
      *
      * @return  string|null             The name of the class or null in case there was no
      *                                   backend found with the given identifier
      *
-     * @throws  ConfigurationError      In case the class could not be successfully validated
+     * @throws  ConfigurationError      In case the class associated to the given identifier does not exist
      */
     protected static function getCustomUserGroupBackend($identifier)
     {
-        static::loadCustomUserGroupBackends();
+        static::registerCustomUserGroupBackends();
         if (array_key_exists($identifier, static::$customBackends)) {
             $className = static::$customBackends[$identifier];
             if (! class_exists($className)) {
                 throw new ConfigurationError(
-                    'Cannot utilize UserGroupBackend of type "%s". Class "%s" does not exist',
-                    $identifier,
-                    $className
-                );
-            } elseif (! is_subclass_of($className, __CLASS__)) {
-                throw new ConfigurationError(
-                    'Cannot utilize UserGroupBackend of type "%s". Class "%s" is not a sub-type of UserGroupBackend',
+                    'Cannot utilize user group backend of type "%s". Class "%s" does not exist',
                     $identifier,
                     $className
                 );
@@ -132,12 +95,12 @@ abstract class UserGroupBackend
     }
 
     /**
-     * Create and return a UserGroupBackend with the given name and given configuration applied to it
+     * Create and return a user group backend with the given name and given configuration applied to it
      *
      * @param   string          $name
      * @param   ConfigObject    $backendConfig
      *
-     * @return  UserGroupBackend
+     * @return  UserGroupBackendInterface
      *
      * @throws  ConfigurationError
      */
@@ -158,6 +121,15 @@ abstract class UserGroupBackend
             // Do not attempt to load a custom user group backend unless it's actually required
         } elseif (($customClass = static::getCustomUserGroupBackend($backendType)) !== null) {
             $backend = new $customClass($backendConfig);
+            if (! is_a($backend, 'Icinga\Authentication\UserGroup\UserGroupBackendInterface')) {
+                throw new ConfigurationError(
+                    'Cannot utilize user group backend of type "%s".'
+                    . ' Class "%s" does not implement UserGroupBackendInterface',
+                    $backendType,
+                    $customClass
+                );
+            }
+
             $backend->setName($name);
             return $backend;
         } else {
@@ -189,13 +161,4 @@ abstract class UserGroupBackend
         $backend->setName($name);
         return $backend;
     }
-
-    /**
-     * Get the groups the given user is a member of
-     *
-     * @param   User    $user
-     *
-     * @return  array
-     */
-    abstract public function getMemberships(User $user);
 }

From b1454c199ade46ac6d82d5bd158b77cc4e4bcc24 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 5 May 2015 08:27:11 +0200
Subject: [PATCH 1411/2920] Introduce interface UserGroupBackendInterface

refs #8826
---
 .../UserGroup/UserGroupBackendInterface.php   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 library/Icinga/Authentication/UserGroup/UserGroupBackendInterface.php

diff --git a/library/Icinga/Authentication/UserGroup/UserGroupBackendInterface.php b/library/Icinga/Authentication/UserGroup/UserGroupBackendInterface.php
new file mode 100644
index 000000000..a567d1f0a
--- /dev/null
+++ b/library/Icinga/Authentication/UserGroup/UserGroupBackendInterface.php
@@ -0,0 +1,37 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Authentication\UserGroup;
+
+use Icinga\User;
+
+/**
+ * Interface for user group backends
+ */
+interface UserGroupBackendInterface
+{
+    /**
+     * Set this backend's name
+     *
+     * @param   string  $name
+     *
+     * @return  $this
+     */
+    public function setName($name);
+
+    /**
+     * Return this backend's name
+     *
+     * @return  string
+     */
+    public function getName();
+
+    /**
+     * Return the groups the given user is a member of
+     *
+     * @param   User    $user
+     *
+     * @return  array
+     */
+    public function getMemberships(User $user);
+}

From 58233b00725d56b83376c207f66d1529eafba55a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 5 May 2015 09:23:29 +0200
Subject: [PATCH 1412/2920] DbUserGroupBackend: Extend DbRepository and
 implement UserGroupBackendInterface

refs #8826
---
 .../UserGroup/DbUserGroupBackend.php          | 67 ++++++++++++-------
 1 file changed, 44 insertions(+), 23 deletions(-)

diff --git a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
index a5a2a539a..7e5341e69 100644
--- a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
@@ -3,59 +3,80 @@
 
 namespace Icinga\Authentication\UserGroup;
 
-use Icinga\Data\Db\DbConnection;
+use Icinga\Repository\DbRepository;
 use Icinga\User;
 
-/**
- * Database user group backend
- */
-class DbUserGroupBackend extends UserGroupBackend
+class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterface
 {
     /**
-     * Connection to the database
+     * The query columns being provided
      *
-     * @var DbConnection
+     * @var array
      */
-    private $conn;
+    protected $queryColumns = array(
+        'group' => array(
+            'group_name'    => 'name',
+            'parent_name'   => 'parent',
+            'created_at'    => 'UNIX_TIMESTAMP(ctime)',
+            'last_modified' => 'UNIX_TIMESTAMP(mtime)'
+        )
+    );
 
     /**
-     * Create a new database user group backend
+     * The default sort rules to be applied on a query
      *
-     * @param DbConnection $conn
+     * @var array
      */
-    public function __construct(DbConnection $conn)
+    protected $sortRules = array(
+        'group_name' => array(
+            'columns'   => array(
+                'group_name',
+                'parent_name'
+            )
+        )
+    );
+
+    /**
+     * Initialize this database user group backend
+     */
+    protected function init()
     {
-        $this->conn = $conn;
+        if (! $this->ds->getTablePrefix()) {
+            $this->ds->setTablePrefix('icingaweb_');
+        }
     }
 
     /**
-     * (non-PHPDoc)
-     * @see UserGroupBackend::getMemberships() For the method documentation.
+     * Return the groups the given user is a member of
+     *
+     * @param   User    $user
+     *
+     * @return  array
      */
     public function getMemberships(User $user)
     {
         $groups = array();
-        $groupsStmt = $this->conn->getDbAdapter()
-            ->select()
-            ->from($this->conn->getTablePrefix() . 'group', array('name', 'parent'))
-            ->query();
+        $groupsStmt = $this->select(array('group_name', 'parent_name'))->getQuery()->getSelectQuery()->query();
         foreach ($groupsStmt as $group) {
-            $groups[$group->name] = $group->parent;
+            $groups[$group->group_name] = $group->parent_name;
         }
+
         $memberships = array();
-        $membershipsStmt = $this->conn->getDbAdapter()
+        $membershipsStmt = $this->ds->getDbAdapter() // TODO: Use the join feature, once available
             ->select()
-            ->from($this->conn->getTablePrefix() . 'group_membership', array('group_name'))
+            ->from($this->ds->getTablePrefix() . 'group_membership', array('group_name'))
             ->where('username = ?', $user->getUsername())
             ->query();
         foreach ($membershipsStmt as $membership) {
             $memberships[] = $membership->group_name;
             $parent = $groups[$membership->group_name];
-            while (isset($parent)) {
+            while ($parent !== null) {
                 $memberships[] = $parent;
-                $parent = $groups[$parent];
+                // Usually a parent is an existing group, but since we do not have a constraint on our table..
+                $parent = isset($groups[$parent]) ? $groups[$parent] : null;
             }
         }
+
         return $memberships;
     }
 }

From 1682b0ee32f904d8df119dd137a258bce7070980 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 5 May 2015 09:24:28 +0200
Subject: [PATCH 1413/2920] Introduce controller GroupController

Still only able to list groups, more to follow...

refs #8826
---
 application/controllers/GroupController.php | 137 ++++++++++++++++++++
 application/controllers/UserController.php  |   9 ++
 application/views/scripts/group/list.phtml  |  50 +++++++
 public/css/icinga/main-content.less         |  20 +++
 4 files changed, 216 insertions(+)
 create mode 100644 application/controllers/GroupController.php
 create mode 100644 application/views/scripts/group/list.phtml

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
new file mode 100644
index 000000000..ffa32584a
--- /dev/null
+++ b/application/controllers/GroupController.php
@@ -0,0 +1,137 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+use \Zend_Controller_Action_Exception;
+use Icinga\Application\Config;
+use Icinga\Authentication\UserGroup\UserGroupBackend;
+use Icinga\Authentication\UserGroup\UserGroupBackendInterface;
+use Icinga\Data\Selectable;
+use Icinga\Web\Controller;
+use Icinga\Web\Widget;
+
+class GroupController extends Controller
+{
+    /**
+     * Initialize this controller
+     */
+    public function init()
+    {
+        $this->createTabs();
+    }
+
+    /**
+     * Redirect to this controller's list action
+     */
+    public function indexAction()
+    {
+        $this->redirectNow('group/list');
+    }
+
+    /**
+     * List all user groups of a single backend
+     */
+    public function listAction()
+    {
+        $backend = $this->getUserGroupBackend($this->params->get('backend'));
+        if ($backend === null) {
+            $this->view->backend = null;
+            return;
+        }
+
+        $query = $backend->select(array(
+            'group_name',
+            'parent_name',
+            'created_at',
+            'last_modified'
+        ));
+
+        $filterEditor = Widget::create('filterEditor')
+            ->setQuery($query)
+            ->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
+            ->ignoreParams('page')
+            ->handleRequest($this->getRequest());
+        $query->applyFilter($filterEditor->getFilter());
+        $this->setupFilterControl($filterEditor);
+
+        $this->getTabs()->activate('group/list');
+        $this->view->backend = $backend;
+        $this->view->groups = $query->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->groups);
+        $this->setupSortControl(array(
+            'group_name'    => $this->translate('Group'),
+            'parent_name'   => $this->translate('Parent'),
+            'created_at'    => $this->translate('Created at'),
+            'last_modified' => $this->translate('Last modified')
+        ));
+    }
+
+    /**
+     * Return the given user group backend or the first match in order
+     *
+     * @param   string  $name           The name of the backend, or null in case the first match should be returned
+     * @param   bool    $selectable     Whether the backend should implement the Selectable interface
+     *
+     * @return  UserGroupBackendInterface
+     *
+     * @throws  Zend_Controller_Action_Exception    In case the given backend name is invalid
+     */
+    protected function getUserGroupBackend($name = null, $selectable = true)
+    {
+        $config = Config::app('groups');
+        if ($name !== null) {
+            if (! $config->hasSection($name)) {
+                throw new Zend_Controller_Action_Exception(
+                    sprintf($this->translate('User group backend "%s" not found'), $name),
+                    404
+                );
+            } else {
+                $backend = UserGroupBackend::create($name, $config->getSection($name));
+                if ($selectable && !$backend instanceof Selectable) {
+                    throw new Zend_Controller_Action_Exception(
+                        sprintf($this->translate('User group backend "%s" is not able to list groups'), $name),
+                        400
+                    );
+                }
+            }
+        } else {
+            $backend = null;
+            foreach ($config as $backendName => $backendConfig) {
+                $candidate = UserGroupBackend::create($backendName, $backendConfig);
+                if (! $selectable || $candidate instanceof Selectable) {
+                    $backend = $candidate;
+                    break;
+                }
+            }
+        }
+
+        return $backend;
+    }
+
+    /**
+     * Create the tabs
+     */
+    protected function createTabs()
+    {
+        $tabs = $this->getTabs();
+        $tabs->add(
+            'user/list',
+            array(
+                'title'     => $this->translate('List users of authentication backends'),
+                'label'     => $this->translate('Users'),
+                'icon'      => 'users',
+                'url'       => 'user/list'
+            )
+        );
+        $tabs->add(
+            'group/list',
+            array(
+                'title'     => $this->translate('List groups of user group backends'),
+                'label'     => $this->translate('Groups'),
+                'icon'      => 'cubes',
+                'url'       => 'group/list'
+            )
+        );
+    }
+}
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index b5fcc50f1..ccb5aac03 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -124,5 +124,14 @@ class UserController extends Controller
                 'url'       => 'user/list'
             )
         );
+        $tabs->add(
+            'group/list',
+            array(
+                'title'     => $this->translate('List groups of user group backends'),
+                'label'     => $this->translate('Groups'),
+                'icon'      => 'cubes',
+                'url'       => 'group/list'
+            )
+        );
     }
 }
diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
new file mode 100644
index 000000000..3871b675e
--- /dev/null
+++ b/application/views/scripts/group/list.phtml
@@ -0,0 +1,50 @@
+<?php if (! $this->compact): ?>
+<div class="controls">
+  <?= $this->tabs; ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
+</div>
+<?php endif ?>
+<div class="content">
+<?php
+
+if ($backend === null) {
+    echo $this->translate('No backend found which is able to list groups') . '</div>';
+    return;
+}
+
+if (count($groups) === 0) {
+    echo $this->translate('No groups found matching the filter') . '</div>';
+    return;
+}
+?>
+
+<table data-base-target="_next" class="action group-list">
+  <thead>
+    <tr>
+      <th class="group-name"><?= $this->translate('Group'); ?></th>
+      <th class="group-parent"><?= $this->translate('Parent'); ?></th>
+      <th class="group-created"><?= $this->translate('Created at'); ?></th>
+      <th class="group-modified"><?= $this->translate('Last modified'); ?></th>
+    </tr>
+  </thead>
+  <tbody>
+  <?php foreach ($groups as $group): ?>
+    <tr>
+      <td clas="group-name"><?= $this->escape($group->group_name); ?></td>
+      <td class="group-parent">
+        <?= $group->parent_name === null ? $this->translate('None', 'user.group.parent') : $this->escape($group->parent_name); ?>
+      </td>
+      <td class="group-created">
+        <?= $group->created_at === null ? $this->translate('N/A') : date('d/m/Y g:i A', $group->created_at); ?>
+      </td>
+      <td class="group-modified">
+        <?= $group->last_modified === null ? $this->translate('Never') : date('d/m/Y g:i A', $group->last_modified); ?>
+      </td>
+    </tr>
+  <?php endforeach ?>
+  </tbody>
+</table>
+</div>
\ No newline at end of file
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 06a0b1b90..830ecdd44 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -221,4 +221,24 @@ table.user-list {
   td.user-state, td.user-created, td.user-modified {
     text-align: right;
   }
+}
+
+table.group-list {
+  th {
+    &.group-parent {
+      width: 6%;
+      padding-right: 0.5em;
+      text-align: right;
+    }
+
+    &.group-created, &.group-modified {
+      width: 12%;
+      padding-right: 0.5em;
+      text-align: right;
+    }
+  }
+
+  td.group-parent, td.group-created, td.group-modified {
+    text-align: right;
+  }
 }
\ No newline at end of file

From 37e47f0d3f9a21d9f68253bfe2e0c49704159845 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 5 May 2015 09:34:23 +0200
Subject: [PATCH 1414/2920] DbUserBackend: Add case insensitive filter column
 `user'

refs #8826
---
 library/Icinga/Authentication/User/DbUserBackend.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/library/Icinga/Authentication/User/DbUserBackend.php b/library/Icinga/Authentication/User/DbUserBackend.php
index 3cea0ccc9..367418f7b 100644
--- a/library/Icinga/Authentication/User/DbUserBackend.php
+++ b/library/Icinga/Authentication/User/DbUserBackend.php
@@ -32,6 +32,7 @@ class DbUserBackend extends DbRepository implements UserBackendInterface
      */
     protected $queryColumns = array(
         'user' => array(
+            'user'          => 'name COLLATE utf8_general_ci',
             'user_name'     => 'name',
             'is_active'     => 'active',
             'created_at'    => 'UNIX_TIMESTAMP(ctime)',
@@ -39,6 +40,13 @@ class DbUserBackend extends DbRepository implements UserBackendInterface
         )
     );
 
+    /**
+     * The columns which are not permitted to be queried
+     *
+     * @var array
+     */
+    protected $filterColumns = array('user');
+
     /**
      * The default sort rules to be applied on a query
      *

From de68d7893865ae29ed1dae9470de9c446240fd48 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 5 May 2015 09:34:49 +0200
Subject: [PATCH 1415/2920] DbUserGroupBackend: Add case insensitive filter
 columns `group' and `parent'

refs #8826
---
 .../Authentication/UserGroup/DbUserGroupBackend.php      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
index 7e5341e69..32d65ab53 100644
--- a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
@@ -15,13 +15,22 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
      */
     protected $queryColumns = array(
         'group' => array(
+            'group'         => 'name COLLATE utf8_general_ci',
             'group_name'    => 'name',
+            'parent'        => 'parent COLLATE utf8_general_ci',
             'parent_name'   => 'parent',
             'created_at'    => 'UNIX_TIMESTAMP(ctime)',
             'last_modified' => 'UNIX_TIMESTAMP(mtime)'
         )
     );
 
+    /**
+     * The columns which are not permitted to be queried
+     *
+     * @var array
+     */
+    protected $filterColumns = array('group', 'parent');
+
     /**
      * The default sort rules to be applied on a query
      *

From 612fefba9cfad1bfc850cf6a490a4363208b6a4a Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Tue, 5 May 2015 12:36:26 +0200
Subject: [PATCH 1416/2920] Fix the permission wildcards assertion

fixes #9202
---
 library/Icinga/User.php              | 18 +++++++++---------
 test/php/library/Icinga/UserTest.php |  6 +++++-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index 18d44af96..f9df0d664 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -413,30 +413,30 @@ class User
     /**
      * Whether the user has a given permission
      *
-     * @param   string $permission
+     * @param   string $requiredPermission
      *
      * @return  bool
      */
-    public function can($permission)
+    public function can($requiredPermission)
     {
-        if (isset($this->permissions['*']) || isset($this->permissions[$permission])) {
+        if (isset($this->permissions['*']) || isset($this->permissions[$requiredPermission])) {
             return true;
         }
         // If the permission to check contains a wildcard, grant the permission if any permit related to the permission
         // matches
-        $any = strpos($permission, '*');
-        foreach ($this->permissions as $permitted) {
-            if ($any !== false) {
+        $any = strpos($requiredPermission, '*');
+        foreach ($this->permissions as $grantedPermission) {
+            if ($any !== false && strpos($grantedPermission, '*') === false) {
                 $wildcard = $any;
             } else {
                 // If the permit contains a wildcard, grant the permission if it's related to the permit
-                $wildcard = strpos($permitted, '*');
+                $wildcard = strpos($grantedPermission, '*');
             }
             if ($wildcard !== false) {
-                if (substr($permission, 0, $wildcard) === substr($permitted, 0, $wildcard)) {
+                if (substr($requiredPermission, 0, $wildcard) === substr($grantedPermission, 0, $wildcard)) {
                     return true;
                 }
-            } elseif ($permission === $permitted) {
+            } elseif ($requiredPermission === $grantedPermission) {
                 return true;
             }
         }
diff --git a/test/php/library/Icinga/UserTest.php b/test/php/library/Icinga/UserTest.php
index 9c14a93d3..ffdcbd905 100644
--- a/test/php/library/Icinga/UserTest.php
+++ b/test/php/library/Icinga/UserTest.php
@@ -66,12 +66,16 @@ class UserTest extends BaseTestCase
         $user->setPermissions(array(
             'test',
             'test/some/specific',
-            'test/more/*'
+            'test/more/*',
+            'test/wildcard-with-wildcard/*'
         ));
         $this->assertTrue($user->can('test'));
         $this->assertTrue($user->can('test/some/specific'));
         $this->assertTrue($user->can('test/more/everything'));
+        $this->assertTrue($user->can('test/wildcard-with-wildcard/*'));
+        $this->assertTrue($user->can('test/wildcard/sub/sub'));
         $this->assertFalse($user->can('not/test'));
         $this->assertFalse($user->can('test/some/not/so/specific'));
+        $this->assertFalse($user->can('test/wildcard2/*'));
     }
 }

From be696e5adfd756940ad832f27d44d952403b9091 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Tue, 5 May 2015 12:50:35 +0200
Subject: [PATCH 1417/2920] LogFileIterator: Fix missing closing bracket

---
 library/Icinga/Protocol/File/LogFileIterator.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/Icinga/Protocol/File/LogFileIterator.php b/library/Icinga/Protocol/File/LogFileIterator.php
index 4b587b58e..0815a5376 100644
--- a/library/Icinga/Protocol/File/LogFileIterator.php
+++ b/library/Icinga/Protocol/File/LogFileIterator.php
@@ -152,3 +152,4 @@ class LogFileIterator implements Iterator
             $this->valid = false;
         }
     }
+}

From 0e4201a997bc9c7b9469d6471d7c29c85f7517f6 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Tue, 5 May 2015 15:20:25 +0200
Subject: [PATCH 1418/2920] Add info about the active ido endpoint to
 monitoring health overview

resolves #9223
---
 .../application/controllers/ProcessController.php           | 1 +
 .../monitoring/application/views/scripts/process/info.phtml | 6 ++++++
 .../Monitoring/Backend/Ido/Query/ProgramstatusQuery.php     | 1 +
 3 files changed, 8 insertions(+)

diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php
index a07ac5f3a..bec7ec852 100644
--- a/modules/monitoring/application/controllers/ProcessController.php
+++ b/modules/monitoring/application/controllers/ProcessController.php
@@ -49,6 +49,7 @@ class Monitoring_ProcessController extends Controller
                 array(
                     'is_currently_running',
                     'process_id',
+                    'endpoint_name',
                     'program_start_time',
                     'status_update_time',
                     'last_command_check',
diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml
index 8cb5aebe1..de322ac83 100644
--- a/modules/monitoring/application/views/scripts/process/info.phtml
+++ b/modules/monitoring/application/views/scripts/process/info.phtml
@@ -49,6 +49,12 @@ if (! $this->compact): ?>
                             ? $this->programStatus->global_host_event_handler
                             : $this->translate('N/A'); ?></td>
                 </tr>
+                <tr>
+                    <th><?= $this->translate('Active IDO Endpoint'); ?></th>
+                    <td><?= $this->programStatus->endpoint_name
+                            ? $this->programStatus->endpoint_name
+                            : $this->translate('N/A') ?></td>
+                </tr>
                 </tbody>
             </table>
             <?php if ((bool) $this->programStatus->is_currently_running === true): ?>
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
index d63db8173..1f44cff8f 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
@@ -26,6 +26,7 @@ class ProgramstatusQuery extends IdoQuery
                     END
                 END',
             'process_id'                        => 'process_id',
+            'endpoint_name'                     => 'endpoint_name',
             'daemon_mode'                       => 'daemon_mode',
             'last_command_check'                => 'UNIX_TIMESTAMP(programstatus.last_command_check)',
             'last_log_rotation'                 => 'UNIX_TIMESTAMP(programstatus.last_log_rotation)',

From 5cc7f267282932dca38e279dae97227d24cc9321 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 5 May 2015 15:21:34 +0200
Subject: [PATCH 1419/2920] ConfigObject: Extend ArrayDatasource

This makes it possible to use a ini file as repository!!!1
One thing is missing: Section names are currently ignored and should be
mapped to a virtual column.

refs #8826
---
 library/Icinga/Application/Config.php | 16 ++++++++++--
 library/Icinga/Data/ConfigObject.php  | 36 +++++++--------------------
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/library/Icinga/Application/Config.php b/library/Icinga/Application/Config.php
index 8a1746b69..6bad014a6 100644
--- a/library/Icinga/Application/Config.php
+++ b/library/Icinga/Application/Config.php
@@ -9,13 +9,15 @@ use LogicException;
 use UnexpectedValueException;
 use Icinga\Util\File;
 use Icinga\Data\ConfigObject;
+use Icinga\Data\Selectable;
+use Icinga\Data\SimpleQuery;
 use Icinga\File\Ini\IniWriter;
 use Icinga\Exception\NotReadableError;
 
 /**
  * Container for INI like configuration and global registry of application and module related configuration.
  */
-class Config implements Countable, Iterator
+class Config implements Countable, Iterator, Selectable
 {
     /**
      * Configuration directory where ALL (application and module) configuration is located
@@ -85,6 +87,16 @@ class Config implements Countable, Iterator
         return $this;
     }
 
+    /**
+     * Provide a query for the internal config object
+     *
+     * @return  SimpleQuery
+     */
+    public function select()
+    {
+        return $this->config->select();
+    }
+
     /**
      * Return the count of available sections
      *
@@ -92,7 +104,7 @@ class Config implements Countable, Iterator
      */
     public function count()
     {
-        return $this->config->count();
+        return $this->select()->count();
     }
 
     /**
diff --git a/library/Icinga/Data/ConfigObject.php b/library/Icinga/Data/ConfigObject.php
index 641d72846..de00e5b5e 100644
--- a/library/Icinga/Data/ConfigObject.php
+++ b/library/Icinga/Data/ConfigObject.php
@@ -4,22 +4,15 @@
 namespace Icinga\Data;
 
 use Iterator;
-use Countable;
 use ArrayAccess;
-use LogicException;
+use Icinga\Data\DataArray\ArrayDatasource;
+use Icinga\Exception\ProgrammingError;
 
 /**
  * Container for configuration values
  */
-class ConfigObject implements Countable, Iterator, ArrayAccess
+class ConfigObject extends ArrayDatasource implements Iterator, ArrayAccess
 {
-    /**
-     * This config's data
-     *
-     * @var array
-     */
-    protected $data;
-
     /**
      * Create a new config
      *
@@ -27,15 +20,14 @@ class ConfigObject implements Countable, Iterator, ArrayAccess
      */
     public function __construct(array $data = array())
     {
-        $this->data = array();
-
-        foreach ($data as $key => $value) {
+        // Convert all embedded arrays to ConfigObjects as well
+        foreach ($data as & $value) {
             if (is_array($value)) {
-                $this->data[$key] = new static($value);
-            } else {
-                $this->data[$key] = $value;
+                $value = new static($value);
             }
         }
+
+        parent::__construct($data);
     }
 
     /**
@@ -55,16 +47,6 @@ class ConfigObject implements Countable, Iterator, ArrayAccess
         $this->data = $array;
     }
 
-    /**
-     * Return the count of available sections and properties
-     *
-     * @return  int
-     */
-    public function count()
-    {
-        return count($this->data);
-    }
-
     /**
      * Reset the current position of $this->data
      *
@@ -197,7 +179,7 @@ class ConfigObject implements Countable, Iterator, ArrayAccess
     public function offsetSet($key, $value)
     {
         if ($key === null) {
-            throw new LogicException('Appending values without an explicit key is not supported');
+            throw new ProgrammingError('Appending values without an explicit key is not supported');
         }
 
         $this->$key = $value;

From 89029308ef578bbfa0f49e9a76d81656578bbb72 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 5 May 2015 15:24:18 +0200
Subject: [PATCH 1420/2920] IniUserGroupBackend: Extend Repository and
 implement UserGroupBackendInterface

Note that it was necessary to change the structure of ini files providing
the membership information. They need to be structured like our db
table rows now.

refs #8826
---
 .../UserGroup/IniUserGroupBackend.php         | 97 ++++++++++++-------
 1 file changed, 60 insertions(+), 37 deletions(-)

diff --git a/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
index ad9178899..6377bd9c0 100644
--- a/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
@@ -3,61 +3,84 @@
 
 namespace Icinga\Authentication\UserGroup;
 
-use Icinga\Application\Config;
-use Icinga\Exception\ConfigurationError;
+use Icinga\Repository\Repository;
 use Icinga\User;
 use Icinga\Util\String;
 
-/**
- * INI user group backend
- */
-class IniUserGroupBackend extends UserGroupBackend
+class IniUserGroupBackend extends Repository implements UserGroupBackendInterface
 {
     /**
-     * Config
+     * The query columns being provided
      *
-     * @var Config
+     * @var array
      */
-    private $config;
+    protected $queryColumns = array(
+        'groups' => array(
+            'group'         => 'name',
+            'group_name'    => 'name',
+            'parent'        => 'parent',
+            'parent_name'   => 'parent',
+            'created_at'    => 'ctime',
+            'last_modified' => 'mtime',
+            'users'
+        )
+    );
 
     /**
-     * Create a new INI user group backend
+     * The columns which are not permitted to be queried
      *
-     * @param Config $config
+     * @var array
      */
-    public function __construct(Config $config)
-    {
-        $this->config = $config;
-    }
+    protected $filterColumns = array('group', 'parent');
 
     /**
-     * (non-PHPDoc)
-     * @see UserGroupBackend::getMemberships() For the method documentation.
+     * The default sort rules to be applied on a query
+     *
+     * @var array
+     */
+    protected $sortRules = array(
+        'group_name' => array(
+            'columns'   => array(
+                'group_name',
+                'parent_name'
+            )
+        )
+    );
+
+    /**
+     * Return the groups the given user is a member of
+     *
+     * @param   User    $user
+     *
+     * @return  array
      */
     public function getMemberships(User $user)
     {
-        $username = strtolower($user->getUsername());
+        $result = $this->select()->fetchAll();
+
         $groups = array();
-        foreach ($this->config as $name => $section) {
-            if (empty($section->users)) {
-                throw new ConfigurationError(
-                    'Membership section \'%s\' in \'%s\' is missing the \'users\' section',
-                    $name,
-                    $this->config->getConfigFile()
-                );
-            }
-            if (empty($section->groups)) {
-                throw new ConfigurationError(
-                    'Membership section \'%s\' in \'%s\' is missing the \'groups\' section',
-                    $name,
-                    $this->config->getConfigFile()
-                );
-            }
-            $users = array_map('strtolower', String::trimSplit($section->users));
-            if (in_array($username, $users)) {
-                $groups = array_merge($groups, array_diff(String::trimSplit($section->groups), $groups));
+        foreach ($result as $group) {
+            if ($group->group_name) { // TODO: Can we set this somehow automatically to the section's name??
+                $groups[$group->group_name] = $group->parent_name;
             }
         }
-        return $groups;
+
+        $username = strtolower($user->getUsername());
+        $memberships = array();
+        foreach ($result as $group) {
+            if ($group->group_name && $group->users) {
+                $users = array_map('strtolower', String::trimSplit($group->users));
+                if (! in_array($group->group_name, $memberships) && in_array($username, $users)) {
+                    $memberships[] = $group->group_name;
+                    $parent = $groups[$group->group_name];
+                    while ($parent !== null) {
+                        $memberships[] = $parent;
+                        $parent = isset($groups[$parent]) ? $groups[$parent] : null;
+                    }
+                }
+            }
+        }
+
+        return $memberships;
     }
 }

From e228404bf46ce202455e198eaff5dcdde830d90a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 5 May 2015 15:36:15 +0200
Subject: [PATCH 1421/2920] Adjust ConfigObjectTest as ConfigObjects are not
 countable anymore

They are of course still indirectly countable, by using Config::count() or
ConfigObject::select()::count().
---
 test/php/library/Icinga/Data/ConfigObjectTest.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/test/php/library/Icinga/Data/ConfigObjectTest.php b/test/php/library/Icinga/Data/ConfigObjectTest.php
index eabdf80cf..820d17b83 100644
--- a/test/php/library/Icinga/Data/ConfigObjectTest.php
+++ b/test/php/library/Icinga/Data/ConfigObjectTest.php
@@ -60,14 +60,6 @@ class ConfigObjectTest extends BaseTestCase
         );
     }
 
-    public function testWhetherConfigObjectsAreCountable()
-    {
-        $config = new ConfigObject(array('a' => 'b', 'c' => array('d' => 'e')));
-
-        $this->assertInstanceOf('Countable', $config, 'ConfigObject objects do not implement interface `Countable\'');
-        $this->assertEquals(2, count($config), 'ConfigObject objects do not count properties and sections correctly');
-    }
-
     public function testWhetherConfigObjectsAreTraversable()
     {
         $config = new ConfigObject(array('a' => 'b', 'c' => 'd'));
@@ -124,7 +116,7 @@ class ConfigObjectTest extends BaseTestCase
     }
 
     /**
-     * @expectedException LogicException
+     * @expectedException \Icinga\Exception\ProgrammingError
      */
     public function testWhetherItIsNotPossibleToAppendProperties()
     {
@@ -142,9 +134,6 @@ class ConfigObjectTest extends BaseTestCase
         $this->assertFalse(isset($config->c), 'ConfigObjects do not allow to unset sections');
     }
 
-    /**
-     * @depends testWhetherConfigObjectsAreCountable
-     */
     public function testWhetherOneCanCheckIfAConfigObjectHasAnyPropertiesOrSections()
     {
         $config = new ConfigObject();

From d1f1f5d7d7454dc8a269091d58e8e89797992d61 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Tue, 5 May 2015 16:32:18 +0200
Subject: [PATCH 1422/2920] ProgrammStatusQuery: Add fallback if ido_version is
 older than required

resolves #9223
---
 .../Monitoring/Backend/Ido/Query/ProgramstatusQuery.php  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
index 1f44cff8f..57f8ed1ac 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
@@ -48,4 +48,13 @@ class ProgramstatusQuery extends IdoQuery
             'global_service_event_handler'      => 'global_service_event_handler',
         )
     );
+
+    protected function joinBaseTables()
+    {
+        parent::joinBaseTables();
+
+        if (version_compare($this->getIdoVersion(), '1.11.7', '<')) {
+            $this->columnMap['programstatus']['endpoint_name'] = '(0)';
+        }
+    }
 }

From defda53ff5ba9e99ba3c01418e846193de60bb18 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@gmail.com>
Date: Fri, 1 May 2015 16:00:55 +0200
Subject: [PATCH 1423/2920] Show icinga program version in Monitoring Health

Also emphasize on the backends used.

fixes #9207
---
 .../application/controllers/ProcessController.php    |  1 +
 .../application/views/scripts/process/info.phtml     | 12 +++++++++---
 .../Backend/Ido/Query/ProgramstatusQuery.php         |  4 ++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php
index bec7ec852..2e52733bd 100644
--- a/modules/monitoring/application/controllers/ProcessController.php
+++ b/modules/monitoring/application/controllers/ProcessController.php
@@ -52,6 +52,7 @@ class Monitoring_ProcessController extends Controller
                     'endpoint_name',
                     'program_start_time',
                     'status_update_time',
+                    'program_version',
                     'last_command_check',
                     'last_log_rotation',
                     'global_service_event_handler',
diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml
index de322ac83..5ebecce4d 100644
--- a/modules/monitoring/application/views/scripts/process/info.phtml
+++ b/modules/monitoring/application/views/scripts/process/info.phtml
@@ -19,6 +19,12 @@ if (! $this->compact): ?>
             <h2><?= $this->translate('Process Info') ?></h2>
             <table class="avp">
                 <tbody>
+                <tr>
+                    <th><?= $this->translate('Program Version') ?></th>
+                    <td><?= $this->programStatus->program_version
+                            ? $this->programStatus->program_version
+                            : $this->translate('N/A') ?></td>
+                </tr>
                 <tr>
                     <th><?= $this->translate('Program Start Time') ?></th>
                     <td><?= $this->dateFormat()->formatDateTime($this->programStatus->program_start_time) ?></td>
@@ -50,7 +56,7 @@ if (! $this->compact): ?>
                             : $this->translate('N/A'); ?></td>
                 </tr>
                 <tr>
-                    <th><?= $this->translate('Active IDO Endpoint'); ?></th>
+                    <th><?= $this->translate('Active Endpoint'); ?></th>
                     <td><?= $this->programStatus->endpoint_name
                             ? $this->programStatus->endpoint_name
                             : $this->translate('N/A') ?></td>
@@ -60,14 +66,14 @@ if (! $this->compact): ?>
             <?php if ((bool) $this->programStatus->is_currently_running === true): ?>
                 <div class="backend-running">
                     <?= sprintf(
-                        $this->translate('%s has been up and running with PID %d since %s'),
+                        $this->translate('Backend %s has been up and running with PID %d since %s'),
                         $this->backendName,
                         $this->programStatus->process_id,
                         $this->timeSince($this->programStatus->program_start_time)) ?>
                 </div>
             <?php else: ?>
                 <div class="backend-not-running">
-                    <?= sprintf($this->translate('%s is not running'), $this->backendName) ?>
+                    <?= sprintf($this->translate('Backend %s is not running'), $this->backendName) ?>
                 </div>
             <?php endif ?>
         </div>
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
index 57f8ed1ac..d1e0b71b4 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
@@ -12,6 +12,7 @@ class ProgramstatusQuery extends IdoQuery
         'programstatus' => array(
             'id'                    => 'programstatus_id',
             'status_update_time'    => 'UNIX_TIMESTAMP(programstatus.status_update_time)',
+            'program_version'       => 'program_version',
             'program_start_time'    => 'UNIX_TIMESTAMP(programstatus.program_start_time)',
             'program_end_time'      => 'UNIX_TIMESTAMP(programstatus.program_end_time)',
             'is_currently_running'  => 'CASE WHEN (programstatus.is_currently_running = 0)
@@ -56,5 +57,8 @@ class ProgramstatusQuery extends IdoQuery
         if (version_compare($this->getIdoVersion(), '1.11.7', '<')) {
             $this->columnMap['programstatus']['endpoint_name'] = '(0)';
         }
+        if (version_compare($this->getIdoVersion(), '1.11.8', '<')) {
+            $this->columnMap['programstatus']['program_version'] = '(NULL)';
+        }
     }
 }

From f1f1710f47fea6393423edb9314a141a54699859 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 6 May 2015 08:07:42 +0200
Subject: [PATCH 1424/2920] Config: Add method getConfigObject to access the
 internal ConfigObject

---
 library/Icinga/Application/Config.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/library/Icinga/Application/Config.php b/library/Icinga/Application/Config.php
index 6bad014a6..02851b975 100644
--- a/library/Icinga/Application/Config.php
+++ b/library/Icinga/Application/Config.php
@@ -87,6 +87,16 @@ class Config implements Countable, Iterator, Selectable
         return $this;
     }
 
+    /**
+     * Return the internal ConfigObject
+     *
+     * @return  ConfigObject
+     */
+    public function getConfigObject()
+    {
+        return $this->config;
+    }
+
     /**
      * Provide a query for the internal config object
      *

From b1cbc1422bdfb0bac278374f229d181d88d17916 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 6 May 2015 08:40:02 +0200
Subject: [PATCH 1425/2920] ArrayDatasource: Add support for associative arrays

Keys are now preserved in case a non-numeric one is found. By using
setKeyColumn() it is now also possible to map such a key to a specific
column of a row generated by createResult().
---
 .../Icinga/Data/DataArray/ArrayDatasource.php | 76 +++++++++++++++----
 1 file changed, 61 insertions(+), 15 deletions(-)

diff --git a/library/Icinga/Data/DataArray/ArrayDatasource.php b/library/Icinga/Data/DataArray/ArrayDatasource.php
index 72ccc4b4c..6a2ff573f 100644
--- a/library/Icinga/Data/DataArray/ArrayDatasource.php
+++ b/library/Icinga/Data/DataArray/ArrayDatasource.php
@@ -12,6 +12,16 @@ class ArrayDatasource implements Selectable
 
     protected $result;
 
+    /**
+     * The name of the column to map array keys on
+     *
+     * In case the array being used as data source provides keys of type string,this name
+     * will be used to set such as column on each row, if the column is not set already.
+     *
+     * @var string
+     */
+    protected $keyColumn;
+
     /**
      * Constructor, create a new Datasource for the given Array
      *
@@ -22,6 +32,29 @@ class ArrayDatasource implements Selectable
         $this->data = (array) $array;
     }
 
+    /**
+     * Set the name of the column to map array keys on
+     *
+     * @param   string  $name
+     *
+     * @return  $this
+     */
+    public function setKeyColumn($name)
+    {
+        $this->keyColumn = $name;
+        return $this;
+    }
+
+    /**
+     * Return the name of the column to map array keys on
+     *
+     * @return  string
+     */
+    public function getKeyColumn()
+    {
+        return $this->keyColumn;
+    }
+
     /**
      * Instantiate a Query object
      *
@@ -83,39 +116,52 @@ class ArrayDatasource implements Selectable
         if ($this->hasResult()) {
             return $this;
         }
-        $result = array();
 
         $columns = $query->getColumns();
         $filter = $query->getFilter();
-        foreach ($this->data as & $row) {
+        $foundStringKey = false;
+        $result = array();
+        foreach ($this->data as $key => $row) {
+            if (is_string($key) && $this->keyColumn !== null && !isset($row->{$this->keyColumn})) {
+                $row = clone $row; // Make sure that this won't affect the actual data
+                $row->{$this->keyColumn} = $key;
+            }
 
             if (! $filter->matches($row)) {
                 continue;
             }
 
             // Get only desired columns if asked so
-            if (empty($columns)) {
-                $result[] = $row;
-            } else {
-                $c_row = (object) array();
-                foreach ($columns as $alias => $key) {
-                    if (is_int($alias)) {
-                        $alias = $key;
+            if (! empty($columns)) {
+                $filteredRow = (object) array();
+                foreach ($columns as $alias => $name) {
+                    if (! is_string($alias)) {
+                        $alias = $name;
                     }
-                    if (isset($row->$key)) {
-                        $c_row->$alias = $row->$key;
+
+                    if (isset($row->$name)) {
+                        $filteredRow->$alias = $row->$name;
                     } else {
-                        $c_row->$alias = null;
+                        $filteredRow->$alias = null;
                     }
                 }
-                $result[] = $c_row;
+            } else {
+                $filteredRow = $row;
             }
+
+            $foundStringKey |= is_string($key);
+            $result[$key] = $filteredRow;
         }
 
         // Sort the result
-
         if ($query->hasOrder()) {
-            usort($result, array($query, 'compare'));
+            if ($foundStringKey) {
+                uasort($result, array($query, 'compare'));
+            } else {
+                usort($result, array($query, 'compare'));
+            }
+        } elseif (! $foundStringKey) {
+            $result = array_values($result);
         }
 
         $this->setResult($result);

From 9c799dca2284be249779c40b59b4ef6bb2cb11a2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 6 May 2015 08:41:54 +0200
Subject: [PATCH 1426/2920] IniUserGroupBackend: Automatically set section
 names on column `name'

refs #8826
---
 .../UserGroup/IniUserGroupBackend.php            | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
index 6377bd9c0..ba92093aa 100644
--- a/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
@@ -47,6 +47,14 @@ class IniUserGroupBackend extends Repository implements UserGroupBackendInterfac
         )
     );
 
+    /**
+     * Initialize this ini user group backend
+     */
+    protected function init()
+    {
+        $this->ds->getConfigObject()->setKeyColumn('name');
+    }
+
     /**
      * Return the groups the given user is a member of
      *
@@ -60,17 +68,15 @@ class IniUserGroupBackend extends Repository implements UserGroupBackendInterfac
 
         $groups = array();
         foreach ($result as $group) {
-            if ($group->group_name) { // TODO: Can we set this somehow automatically to the section's name??
-                $groups[$group->group_name] = $group->parent_name;
-            }
+            $groups[$group->group_name] = $group->parent_name;
         }
 
         $username = strtolower($user->getUsername());
         $memberships = array();
         foreach ($result as $group) {
-            if ($group->group_name && $group->users) {
+            if ($group->users && !in_array($group->group_name, $memberships)) {
                 $users = array_map('strtolower', String::trimSplit($group->users));
-                if (! in_array($group->group_name, $memberships) && in_array($username, $users)) {
+                if (in_array($username, $users)) {
                     $memberships[] = $group->group_name;
                     $parent = $groups[$group->group_name];
                     while ($parent !== null) {

From d63381c0020faa2698f290de1850d84c9e9a11a3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 6 May 2015 09:12:48 +0200
Subject: [PATCH 1427/2920] ArrayDatasource: Add missing and fix existing
 documentation

---
 .../Icinga/Data/DataArray/ArrayDatasource.php | 97 +++++++++++++++++--
 1 file changed, 88 insertions(+), 9 deletions(-)

diff --git a/library/Icinga/Data/DataArray/ArrayDatasource.php b/library/Icinga/Data/DataArray/ArrayDatasource.php
index 6a2ff573f..b2ecce533 100644
--- a/library/Icinga/Data/DataArray/ArrayDatasource.php
+++ b/library/Icinga/Data/DataArray/ArrayDatasource.php
@@ -8,8 +8,18 @@ use Icinga\Data\SimpleQuery;
 
 class ArrayDatasource implements Selectable
 {
+    /**
+     * The array being used as data source
+     *
+     * @var array
+     */
     protected $data;
 
+    /**
+     * The current result
+     *
+     * @var array
+     */
     protected $result;
 
     /**
@@ -23,13 +33,13 @@ class ArrayDatasource implements Selectable
     protected $keyColumn;
 
     /**
-     * Constructor, create a new Datasource for the given Array
+     * Create a new data source for the given array
      *
-     * @param array $array The array you're going to use as a data source
+     * @param   array   $data   The array you're going to use as a data source
      */
-    public function __construct(array $array)
+    public function __construct(array $data)
     {
-        $this->data = (array) $array;
+        $this->data = $data;
     }
 
     /**
@@ -56,15 +66,22 @@ class ArrayDatasource implements Selectable
     }
 
     /**
-     * Instantiate a Query object
+     * Provide a query for this data source
      *
-     * @return SimpleQuery
+     * @return  SimpleQuery
      */
     public function select()
     {
         return new SimpleQuery($this);
     }
 
+    /**
+     * Fetch and return a column of all rows of the result set as an array
+     *
+     * @param   SimpleQuery     $query
+     *
+     * @return  array
+     */
     public function fetchColumn(SimpleQuery $query)
     {
         $result = array();
@@ -75,6 +92,13 @@ class ArrayDatasource implements Selectable
         return $result;
     }
 
+    /**
+     * Fetch and return all rows of the given query's result as a flattened key/value based array
+     *
+     * @param   SimpleQuery     $query
+     *
+     * @return  array
+     */
     public function fetchPairs(SimpleQuery $query)
     {
         $result = array();
@@ -91,6 +115,13 @@ class ArrayDatasource implements Selectable
         return $result;
     }
 
+    /**
+     * Fetch and return the first row of the given query's result
+     *
+     * @param   SimpleQuery     $query
+     *
+     * @return  object|false    The row or false in case the result is empty
+     */
     public function fetchRow(SimpleQuery $query)
     {
         $result = $this->getResult($query);
@@ -100,17 +131,38 @@ class ArrayDatasource implements Selectable
         return $result[0];
     }
 
+    /**
+     * Fetch and return all rows of the given query's result as an array
+     *
+     * @param   SimpleQuery     $query
+     *
+     * @return  array
+     */
     public function fetchAll(SimpleQuery $query)
     {
         return $this->getResult($query);
     }
 
+    /**
+     * Count all rows of the given query's result
+     *
+     * @param   SimpleQuery     $query
+     *
+     * @return  int
+     */
     public function count(SimpleQuery $query)
     {
         $this->createResult($query);
         return count($this->result);
     }
 
+    /**
+     * Create the result for the given query, in case there is none yet
+     *
+     * @param   SimpleQuery     $query
+     *
+     * @return  $this
+     */
     protected function createResult(SimpleQuery $query)
     {
         if ($this->hasResult()) {
@@ -168,7 +220,14 @@ class ArrayDatasource implements Selectable
         return $this;
     }
 
-    protected function getLimitedResult($query)
+    /**
+     * Apply the limit, if any, of the given query to the current result and return the result
+     *
+     * @param   SimpleQuery     $query
+     *
+     * @return  array
+     */
+    protected function getLimitedResult(SimpleQuery $query)
     {
         if ($query->hasLimit()) {
             if ($query->hasOffset()) {
@@ -182,16 +241,36 @@ class ArrayDatasource implements Selectable
         }
     }
 
+    /**
+     * Return whether a query result exists
+     *
+     * @return  bool
+     */
     protected function hasResult()
     {
         return $this->result !== null;
     }
 
-    protected function setResult($result)
+    /**
+     * Set the current result
+     *
+     * @param   array   $result
+     *
+     * @return  $this
+     */
+    protected function setResult(array $result)
     {
-        return $this->result = $result;
+        $this->result = $result;
+        return $this;
     }
 
+    /**
+     * Return the result for the given query
+     *
+     * @param   SimpleQuery     $query
+     *
+     * @return  array
+     */
     protected function getResult(SimpleQuery $query)
     {
         if (! $this->hasResult()) {

From f2ad2838f431e7f3da1cdeb3998361c67eed2fbe Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 6 May 2015 09:39:43 +0200
Subject: [PATCH 1428/2920] ArrayDatasource: Apply a query's limit and offset
 when creating the result

---
 .../Icinga/Data/DataArray/ArrayDatasource.php | 33 +++++++------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/library/Icinga/Data/DataArray/ArrayDatasource.php b/library/Icinga/Data/DataArray/ArrayDatasource.php
index b2ecce533..243fb1d7d 100644
--- a/library/Icinga/Data/DataArray/ArrayDatasource.php
+++ b/library/Icinga/Data/DataArray/ArrayDatasource.php
@@ -171,8 +171,11 @@ class ArrayDatasource implements Selectable
 
         $columns = $query->getColumns();
         $filter = $query->getFilter();
+        $offset = $query->hasOffset() ? $query->getOffset() : 0;
+        $limit = $query->hasLimit() ? $query->getLimit() : 0;
         $foundStringKey = false;
         $result = array();
+        $skipped = 0;
         foreach ($this->data as $key => $row) {
             if (is_string($key) && $this->keyColumn !== null && !isset($row->{$this->keyColumn})) {
                 $row = clone $row; // Make sure that this won't affect the actual data
@@ -181,6 +184,9 @@ class ArrayDatasource implements Selectable
 
             if (! $filter->matches($row)) {
                 continue;
+            } elseif ($skipped < $offset) {
+                $skipped++;
+                continue;
             }
 
             // Get only desired columns if asked so
@@ -203,6 +209,10 @@ class ArrayDatasource implements Selectable
 
             $foundStringKey |= is_string($key);
             $result[$key] = $filteredRow;
+
+            if (count($result) === $limit) {
+                break;
+            }
         }
 
         // Sort the result
@@ -220,27 +230,6 @@ class ArrayDatasource implements Selectable
         return $this;
     }
 
-    /**
-     * Apply the limit, if any, of the given query to the current result and return the result
-     *
-     * @param   SimpleQuery     $query
-     *
-     * @return  array
-     */
-    protected function getLimitedResult(SimpleQuery $query)
-    {
-        if ($query->hasLimit()) {
-            if ($query->hasOffset()) {
-                $offset = $query->getOffset();
-            } else {
-                $offset = 0;
-            }
-            return array_slice($this->result, $offset, $query->getLimit());
-        } else {
-            return $this->result;
-        }
-    }
-
     /**
      * Return whether a query result exists
      *
@@ -276,6 +265,6 @@ class ArrayDatasource implements Selectable
         if (! $this->hasResult()) {
             $this->createResult($query);
         }
-        return $this->getLimitedResult($query);
+        return $this->result;
     }
 }

From 7b2ed3bef7fe4eb77ad2a28af709c984abcdbec3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 6 May 2015 10:08:07 +0200
Subject: [PATCH 1429/2920] ArrayDatasource: Create a new result when counting

There is usually no limit and offset when a query is going to be counted
so the cached result must not be used.
---
 .../Icinga/Data/DataArray/ArrayDatasource.php | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/library/Icinga/Data/DataArray/ArrayDatasource.php b/library/Icinga/Data/DataArray/ArrayDatasource.php
index 243fb1d7d..25ba47ed1 100644
--- a/library/Icinga/Data/DataArray/ArrayDatasource.php
+++ b/library/Icinga/Data/DataArray/ArrayDatasource.php
@@ -22,6 +22,13 @@ class ArrayDatasource implements Selectable
      */
     protected $result;
 
+    /**
+     * The result of a counted query
+     *
+     * @var int
+     */
+    protected $count;
+
     /**
      * The name of the column to map array keys on
      *
@@ -89,6 +96,7 @@ class ArrayDatasource implements Selectable
             $arr = (array) $row;
             $result[] = array_shift($arr);
         }
+
         return $result;
     }
 
@@ -110,8 +118,10 @@ class ArrayDatasource implements Selectable
                     $keys[1] = $keys[0];
                 }
             }
+
             $result[$row->{$keys[0]}] = $row->{$keys[1]};
         }
+
         return $result;
     }
 
@@ -152,27 +162,27 @@ class ArrayDatasource implements Selectable
      */
     public function count(SimpleQuery $query)
     {
-        $this->createResult($query);
-        return count($this->result);
+        if ($this->count === null) {
+            $this->count = count($this->createResult($query));
+        }
+
+        return $this->count;
     }
 
     /**
-     * Create the result for the given query, in case there is none yet
+     * Create and return the result for the given query
      *
      * @param   SimpleQuery     $query
      *
-     * @return  $this
+     * @return  array
      */
     protected function createResult(SimpleQuery $query)
     {
-        if ($this->hasResult()) {
-            return $this;
-        }
-
         $columns = $query->getColumns();
         $filter = $query->getFilter();
         $offset = $query->hasOffset() ? $query->getOffset() : 0;
         $limit = $query->hasLimit() ? $query->getLimit() : 0;
+
         $foundStringKey = false;
         $result = array();
         $skipped = 0;
@@ -226,8 +236,7 @@ class ArrayDatasource implements Selectable
             $result = array_values($result);
         }
 
-        $this->setResult($result);
-        return $this;
+        return $result;
     }
 
     /**
@@ -263,8 +272,9 @@ class ArrayDatasource implements Selectable
     protected function getResult(SimpleQuery $query)
     {
         if (! $this->hasResult()) {
-            $this->createResult($query);
+            $this->setResult($this->createResult($query));
         }
+
         return $this->result;
     }
 }

From cfa91761924439cdd0a11efdc4832d9dd4930cc0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 6 May 2015 10:10:29 +0200
Subject: [PATCH 1430/2920] ArrayDatasource: use array_shift in fetchRow()
 instead of index access

Since associative arrays are supported, the numeric index 0 might not be
the first entry in the result.
---
 library/Icinga/Data/DataArray/ArrayDatasource.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Data/DataArray/ArrayDatasource.php b/library/Icinga/Data/DataArray/ArrayDatasource.php
index 25ba47ed1..11f8e59e8 100644
--- a/library/Icinga/Data/DataArray/ArrayDatasource.php
+++ b/library/Icinga/Data/DataArray/ArrayDatasource.php
@@ -138,7 +138,8 @@ class ArrayDatasource implements Selectable
         if (empty($result)) {
             return false;
         }
-        return $result[0];
+
+        return array_shift($result);
     }
 
     /**

From 108f55128f5f01c90ad783f428655d58face896c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 6 May 2015 10:24:50 +0200
Subject: [PATCH 1431/2920] Ldap\Query: Fix access of a filter's expression

---
 library/Icinga/Protocol/Ldap/Query.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Protocol/Ldap/Query.php b/library/Icinga/Protocol/Ldap/Query.php
index d5bf1f080..b54f8b15e 100644
--- a/library/Icinga/Protocol/Ldap/Query.php
+++ b/library/Icinga/Protocol/Ldap/Query.php
@@ -131,7 +131,7 @@ class Query extends SimpleQuery
         // TODO: This should be considered a quick fix only.
         //       Drop this entirely once support for Icinga\Data\Filter is available
         if ($filter->isExpression()) {
-            $this->where($filter->getColumn(), $filter->getValue());
+            $this->where($filter->getColumn(), $filter->getExpression());
         } elseif ($filter->isChain()) {
             foreach ($filter->filters() as $chainOrExpression) {
                 $this->addFilter($chainOrExpression);

From 4044e56a03e8364d31b2e472b97f2680419fc516 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 6 May 2015 10:27:26 +0200
Subject: [PATCH 1432/2920] LdapUserBackend: Provide filter column `user'

refs #8826
---
 library/Icinga/Authentication/User/LdapUserBackend.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index e7fa6767b..051b5672f 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -42,6 +42,13 @@ class LdapUserBackend extends Repository implements UserBackendInterface
      */
     protected $filter;
 
+    /**
+     * The columns which are not permitted to be queried
+     *
+     * @var array
+     */
+    protected $filterColumns = array('user');
+
     /**
      * The default sort rules to be applied on a query
      *
@@ -250,6 +257,7 @@ class LdapUserBackend extends Repository implements UserBackendInterface
             }
 
             $this->queryColumns[$this->userClass] = array(
+                'user'          => $this->userNameAttribute,
                 'user_name'     => $this->userNameAttribute,
                 'is_active'     => 'unknown', // msExchUserAccountControl == 2/512/514? <- AD LDAP
                 'created_at'    => 'whenCreated', // That's AD LDAP,

From 16a7b010bcf34988f61ae85bf39a5e0a0b2100c8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 6 May 2015 10:41:39 +0200
Subject: [PATCH 1433/2920] SimpleQuery: Ignore limit and offset when counting

---
 library/Icinga/Data/SimpleQuery.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 3477c2331..875f5222a 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -426,13 +426,15 @@ class SimpleQuery implements QueryInterface
     }
 
     /**
-     * Count all rows of the result set
+     * Count all rows of the result set, ignoring limit and offset
      *
-     * @return int
+     * @return  int
      */
     public function count()
     {
-        return $this->ds->count($this);
+        $query = clone $this;
+        $query->limit(0, 0);
+        return $this->ds->count($query);
     }
 
     /**

From 4d83b2f93d8e59b4a20643f6f0e9b1a8277d60ea Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 6 May 2015 12:18:57 +0200
Subject: [PATCH 1434/2920] Authentication\Manager: Fix invalid class path in
 use statement

refs #8826
---
 library/Icinga/Authentication/Manager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 9d86b6ad6..8a150c8b0 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -4,7 +4,7 @@
 namespace Icinga\Authentication;
 
 use Exception;
-use Icinga\Authentication\Usergroup\UserGroupBackend;
+use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Application\Config;
 use Icinga\Exception\IcingaException;
 use Icinga\Exception\NotReadableError;

From 6df031dc786256e0bd42f8047d6c308e90abedf6 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 6 May 2015 14:21:46 +0200
Subject: [PATCH 1435/2920] Add proper respond http codes to service and host
 controller

fixes #6281
---
 application/controllers/ErrorController.php         |  6 +++++-
 .../application/controllers/HostController.php      | 13 ++++++++++++-
 .../application/controllers/ServiceController.php   | 13 ++++++++++++-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index a77d36f4f..b1343dc81 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -34,7 +34,11 @@ class ErrorController extends ActionController
                 $path = preg_split('~/~', $path);
                 $path = array_shift($path);
                 $this->getResponse()->setHttpResponseCode(404);
-                $this->view->message = $this->translate('Page not found.');
+                $title = preg_replace('/\r?\n.*$/s', '', $exception->getMessage());
+                $this->view->title = 'Server error: ' . $title;
+                if ($this->getInvokeArg('displayExceptions')) {
+                    $this->view->stackTrace = $exception->getTraceAsString();
+                }
                 if ($modules->hasInstalled($path) && ! $modules->hasEnabled($path)) {
                     $this->view->message .= ' ' . sprintf(
                         $this->translate('Enabling the "%s" module might help!'),
diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index 11179c1fa..f820fc27f 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -1,6 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
+use Icinga\Exception\MissingParameterException;
 use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ProcessCheckResultCommandForm;
@@ -26,12 +27,22 @@ class Monitoring_HostController extends MonitoredObjectController
      */
     public function init()
     {
+        if ($this->params->get('host') === null) {
+            throw new MissingParameterException(
+                $this->translate('Required parameter \'%s\' is missing'),
+                'host'
+            );
+        }
+
         $host = new Host($this->backend, $this->params->get('host'));
 
         $this->applyRestriction('monitoring/hosts/filter', $host);
 
         if ($host->fetch() === false) {
-            throw new Zend_Controller_Action_Exception($this->translate('Host not found'));
+            throw new Zend_Controller_Action_Exception(
+                sprintf($this->translate('Host \'%s\' not found'), $this->params->get('host')),
+                404
+            );
         }
         $this->object = $host;
         $this->createTabs();
diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index 3dc98c3b8..4df109b3e 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -1,6 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
+use Icinga\Exception\MissingParameterException;
 use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ProcessCheckResultCommandForm;
@@ -25,12 +26,22 @@ class Monitoring_ServiceController extends MonitoredObjectController
      */
     public function init()
     {
+        if ($this->params->get('host') === null || $this->params->get('service') === null) {
+            throw new MissingParameterException(
+                $this->translate('One of the required parameters \'%s\' is missing'),
+                'host or service'
+            );
+        }
+
         $service = new Service($this->backend, $this->params->get('host'), $this->params->get('service'));
 
         $this->applyRestriction('monitoring/services/filter', $service);
 
         if ($service->fetch() === false) {
-            throw new Zend_Controller_Action_Exception($this->translate('Service not found'));
+            throw new Zend_Controller_Action_Exception(
+                sprintf($this->translate('Service \'%s\' not found'), $this->params->get('service')),
+                404
+            );
         }
         $this->object = $service;
         $this->createTabs();

From ba4330de43f8614564614719842a4d418495cc24 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 7 May 2015 08:03:07 +0200
Subject: [PATCH 1436/2920] Repository: We do not overwrite properties, we're
 initializing them

refs #8826
---
 library/Icinga/Repository/Repository.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index e1b39e1c8..dde702bc8 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -45,7 +45,7 @@ abstract class Repository implements Selectable
     /**
      * The query columns being provided
      *
-     * This must be overwritten by concrete repository implementations, in the following format
+     * This must be initialized by concrete repository implementations, in the following format
      * <pre><code>
      *  array(
      *      'baseTable' => array(
@@ -70,7 +70,7 @@ abstract class Repository implements Selectable
     /**
      * The default sort rules to be applied on a query
      *
-     * This may be overwritten by concrete repository implementations, in the following format
+     * This may be initialized by concrete repository implementations, in the following format
      * <pre><code>
      *  array(
      *      'alias_or_column_name' => array(

From 99be3587148f1c764e57c2381d315844b11fe6a0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 7 May 2015 08:28:32 +0200
Subject: [PATCH 1437/2920] Repository: Make it possible to initialize column
 properties lazily

refs #8826
---
 .../Authentication/User/LdapUserBackend.php   | 24 ++---
 library/Icinga/Repository/Repository.php      | 87 ++++++++++++++-----
 2 files changed, 77 insertions(+), 34 deletions(-)

diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index 051b5672f..7b9ffa253 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -230,8 +230,6 @@ class LdapUserBackend extends Repository implements UserBackendInterface
      */
     public function select(array $columns = null)
     {
-        $this->initializeQueryColumns();
-
         $query = parent::select($columns);
         $query->getQuery()->setBase($this->baseDn);
         if ($this->filter) {
@@ -244,26 +242,28 @@ class LdapUserBackend extends Repository implements UserBackendInterface
     /**
      * Initialize this repository's query columns
      *
+     * @return  array
+     *
      * @throws  ProgrammingError    In case either $this->userNameAttribute or $this->userClass has not been set yet
      */
     protected function initializeQueryColumns()
     {
-        if ($this->queryColumns === null) {
-            if ($this->userClass === null) {
-                throw new ProgrammingError('It is required to set the objectClass where to look for users first');
-            }
-            if ($this->userNameAttribute === null) {
-                throw new ProgrammingError('It is required to set a attribute name where to find a user\'s name first');
-            }
+        if ($this->userClass === null) {
+            throw new ProgrammingError('It is required to set the objectClass where to look for users first');
+        }
+        if ($this->userNameAttribute === null) {
+            throw new ProgrammingError('It is required to set a attribute name where to find a user\'s name first');
+        }
 
-            $this->queryColumns[$this->userClass] = array(
+        return array(
+            $this->userClass => array(
                 'user'          => $this->userNameAttribute,
                 'user_name'     => $this->userNameAttribute,
                 'is_active'     => 'unknown', // msExchUserAccountControl == 2/512/514? <- AD LDAP
                 'created_at'    => 'whenCreated', // That's AD LDAP,
                 'last_modified' => 'whenChanged' // what's OpenLDAP?
-            );
-        }
+            )
+        );
     }
 
     /**
diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index dde702bc8..4f578f8fd 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -121,14 +121,6 @@ abstract class Repository implements Selectable
         $this->aliasColumnMap = array();
 
         $this->init();
-
-        if ($this->filterColumns === null) {
-            $this->filterColumns = $this->getFilterColumns();
-        }
-
-        if ($this->sortRules === null) {
-            $this->sortRules = $this->getSortRules();
-        }
     }
 
     /**
@@ -187,7 +179,7 @@ abstract class Repository implements Selectable
     public function getBaseTable()
     {
         if ($this->baseTable === null) {
-            $queryColumns = $this->queryColumns; // Copy because of reset()
+            $queryColumns = $this->getQueryColumns();
             reset($queryColumns);
             $this->baseTable = key($queryColumns);
             if (is_int($this->baseTable) || !is_array($queryColumns[$this->baseTable])) {
@@ -198,31 +190,81 @@ abstract class Repository implements Selectable
         return $this->baseTable;
     }
 
+    /**
+     * Return the query columns being provided
+     *
+     * Calls $this->initializeQueryColumns() in case $this->queryColumns is null.
+     *
+     * @return  array
+     */
+    public function getQueryColumns()
+    {
+        if ($this->queryColumns === null) {
+            $this->queryColumns = $this->initializeQueryColumns();
+        }
+
+        return $this->queryColumns;
+    }
+
+    /**
+     * Overwrite this in your repository implementation in case you need to initialize the query columns lazily
+     *
+     * @return  array
+     */
+    protected function initializeQueryColumns()
+    {
+        return array();
+    }
+
     /**
      * Return the columns (or aliases) which are not permitted to be queried
      *
+     * Calls $this->initializeFilterColumns() in case $this->filterColumns is null.
+     *
      * @return  array
      */
     public function getFilterColumns()
     {
-        if ($this->filterColumns !== null) {
-            return $this->filterColumns;
+        if ($this->filterColumns === null) {
+            $this->filterColumns = $this->initializeFilterColumns();
         }
 
+        return $this->filterColumns;
+    }
+
+    /**
+     * Overwrite this in your repository implementation in case you need to initialize the filter columns lazily
+     *
+     * @return  array
+     */
+    protected function initializeFilterColumns()
+    {
         return array();
     }
 
     /**
      * Return the default sort rules to be applied on a query
      *
+     * Calls $this->initializeSortRules() in case $this->sortRules is null.
+     *
      * @return  array
      */
     public function getSortRules()
     {
-        if ($this->sortRules !== null) {
-            return $this->sortRules;
+        if ($this->sortRules === null) {
+            $this->sortRules = $this->initializeSortRules();
         }
 
+        return $this->sortRules;
+    }
+
+    /**
+     * Overwrite this in your repository implementation in case you need to initialize the sort rules lazily
+     *
+     * @return  array
+     */
+    protected function initializeSortRules()
+    {
         return array();
     }
 
@@ -232,15 +274,9 @@ abstract class Repository implements Selectable
      * @param   array   $columns    The desired columns, if null all columns will be queried
      *
      * @return  RepositoryQuery
-     *
-     * @throws  ProgrammingError    In case $this->queryColumns has not been initialized yet
      */
     public function select(array $columns = null)
     {
-        if (empty($this->queryColumns)) {
-            throw new ProgrammingError('Repositories are required to initialize $this->queryColumns first');
-        }
-
         $this->initializeAliasMaps();
 
         $query = new RepositoryQuery($this);
@@ -250,6 +286,8 @@ abstract class Repository implements Selectable
 
     /**
      * Initialize $this->aliasTableMap and $this->aliasColumnMap
+     *
+     * @throws  ProgrammingError    In case $this->queryColumns does not provide any column information
      */
     protected function initializeAliasMaps()
     {
@@ -257,7 +295,12 @@ abstract class Repository implements Selectable
             return;
         }
 
-        foreach ($this->queryColumns as $table => $columns) {
+        $queryColumns = $this->getQueryColumns();
+        if (empty($queryColumns)) {
+            throw new ProgrammingError('Repositories are required to initialize $this->queryColumns first');
+        }
+
+        foreach ($queryColumns as $table => $columns) {
             foreach ($columns as $alias => $column) {
                 if (! is_string($alias)) {
                     $this->aliasTableMap[$column] = $table;
@@ -297,7 +340,7 @@ abstract class Repository implements Selectable
      */
     public function hasQueryColumn($name)
     {
-        return array_key_exists($name, $this->aliasColumnMap) && !in_array($name, $this->filterColumns);
+        return array_key_exists($name, $this->aliasColumnMap) && !in_array($name, $this->getFilterColumns());
     }
 
     /**
@@ -311,7 +354,7 @@ abstract class Repository implements Selectable
      */
     public function requireQueryColumn($name)
     {
-        if (in_array($name, $this->filterColumns)) {
+        if (in_array($name, $this->getFilterColumns())) {
             throw new QueryException(t('Filter column "%s" cannot be queried'), $name);
         }
         if (! array_key_exists($name, $this->aliasColumnMap)) {

From eac5e398beb2d34867b8c29cb435aebc54ec3a5a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 7 May 2015 09:04:50 +0200
Subject: [PATCH 1438/2920] Repository: Initialize the internal column and
 table maps lazily as well

refs #8826
---
 library/Icinga/Repository/Repository.php | 65 ++++++++++++++++--------
 1 file changed, 45 insertions(+), 20 deletions(-)

diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index 4f578f8fd..701b0ff55 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -269,19 +269,31 @@ abstract class Repository implements Selectable
     }
 
     /**
-     * Return a new query for the given columns
+     * Return an array to map table names to aliases
      *
-     * @param   array   $columns    The desired columns, if null all columns will be queried
-     *
-     * @return  RepositoryQuery
+     * @return  array
      */
-    public function select(array $columns = null)
+    protected function getAliasTableMap()
     {
-        $this->initializeAliasMaps();
+        if (empty($this->aliasTableMap)) {
+            $this->initializeAliasMaps();
+        }
 
-        $query = new RepositoryQuery($this);
-        $query->from($this->getBaseTable(), $columns);
-        return $query;
+        return $this->aliasTableMap;
+    }
+
+    /**
+     * Return a flattened array to map query columns to aliases
+     *
+     * @return  array
+     */
+    protected function getAliasColumnMap()
+    {
+        if (empty($this->aliasColumnMap)) {
+            $this->initializeAliasMaps();
+        }
+
+        return $this->aliasColumnMap;
     }
 
     /**
@@ -291,10 +303,6 @@ abstract class Repository implements Selectable
      */
     protected function initializeAliasMaps()
     {
-        if (! empty($this->aliasColumnMap)) {
-            return;
-        }
-
         $queryColumns = $this->getQueryColumns();
         if (empty($queryColumns)) {
             throw new ProgrammingError('Repositories are required to initialize $this->queryColumns first');
@@ -313,6 +321,20 @@ abstract class Repository implements Selectable
         }
     }
 
+    /**
+     * Return a new query for the given columns
+     *
+     * @param   array   $columns    The desired columns, if null all columns will be queried
+     *
+     * @return  RepositoryQuery
+     */
+    public function select(array $columns = null)
+    {
+        $query = new RepositoryQuery($this);
+        $query->from($this->getBaseTable(), $columns);
+        return $query;
+    }
+
     /**
      * Return this repository's query columns mapped to their respective aliases
      *
@@ -321,7 +343,7 @@ abstract class Repository implements Selectable
     public function requireAllQueryColumns()
     {
         $map = array();
-        foreach ($this->aliasColumnMap as $alias => $_) {
+        foreach ($this->getAliasColumnMap() as $alias => $_) {
             if ($this->hasQueryColumn($alias)) {
                 // Just in case $this->requireQueryColumn has been overwritten and there is some magic going on
                 $map[$alias] = $this->requireQueryColumn($alias);
@@ -340,7 +362,7 @@ abstract class Repository implements Selectable
      */
     public function hasQueryColumn($name)
     {
-        return array_key_exists($name, $this->aliasColumnMap) && !in_array($name, $this->getFilterColumns());
+        return array_key_exists($name, $this->getAliasColumnMap()) && !in_array($name, $this->getFilterColumns());
     }
 
     /**
@@ -357,11 +379,13 @@ abstract class Repository implements Selectable
         if (in_array($name, $this->getFilterColumns())) {
             throw new QueryException(t('Filter column "%s" cannot be queried'), $name);
         }
-        if (! array_key_exists($name, $this->aliasColumnMap)) {
+
+        $aliasColumnMap = $this->getAliasColumnMap();
+        if (! array_key_exists($name, $aliasColumnMap)) {
             throw new QueryException(t('Query column "%s" not found'), $name);
         }
 
-        return $this->aliasColumnMap[$name];
+        return $aliasColumnMap[$name];
     }
 
     /**
@@ -373,7 +397,7 @@ abstract class Repository implements Selectable
      */
     public function hasFilterColumn($name)
     {
-        return array_key_exists($name, $this->aliasColumnMap);
+        return array_key_exists($name, $this->getAliasColumnMap());
     }
 
     /**
@@ -387,10 +411,11 @@ abstract class Repository implements Selectable
      */
     public function requireFilterColumn($name)
     {
-        if (! array_key_exists($name, $this->aliasColumnMap)) {
+        $aliasColumnMap = $this->getAliasColumnMap();
+        if (! array_key_exists($name, $aliasColumnMap)) {
             throw new QueryException(t('Filter column "%s" not found'), $name);
         }
 
-        return $this->aliasColumnMap[$name];
+        return $aliasColumnMap[$name];
     }
 }

From 7b6641dc848b6fd912b32de960760854715a35eb Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 21 Apr 2015 14:49:27 +0200
Subject: [PATCH 1439/2920] Add basic downtime controller and views

refs #8902
---
 .../controllers/DowntimeController.php        |  79 ++++++++
 .../views/scripts/downtime/show.phtml         | 179 ++++++++++++++++++
 2 files changed, 258 insertions(+)
 create mode 100644 modules/monitoring/application/controllers/DowntimeController.php
 create mode 100644 modules/monitoring/application/views/scripts/downtime/show.phtml

diff --git a/modules/monitoring/application/controllers/DowntimeController.php b/modules/monitoring/application/controllers/DowntimeController.php
new file mode 100644
index 000000000..13e7f9e14
--- /dev/null
+++ b/modules/monitoring/application/controllers/DowntimeController.php
@@ -0,0 +1,79 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+use Icinga\Module\Monitoring\Controller;
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
+use Icinga\Web\Url;
+use Icinga\Web\Widget\Tabextension\DashboardAction;
+
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ * Display detailed information about a downtime
+ */
+class Monitoring_DowntimeController extends Controller
+{
+    protected $downtime;
+    
+    /**
+     * Add tabs
+     */
+    public function init()
+    {
+        $downtimeId = $this->params->get('downtime_id');
+        
+        $this->downtime = $this->backend->select()->from('downtime', array(
+            'id'              => 'downtime_internal_id',
+            'objecttype'      => 'downtime_objecttype',
+            'comment'         => 'downtime_comment',
+            'author_name'     => 'downtime_author_name',
+            'start'           => 'downtime_start',
+            'scheduled_start' => 'downtime_scheduled_start',
+            'scheduled_end'   => 'downtime_scheduled_end',
+            'end'             => 'downtime_end',
+            'duration'        => 'downtime_duration',
+            'is_flexible'     => 'downtime_is_flexible',
+            'is_fixed'        => 'downtime_is_fixed',
+            'is_in_effect'    => 'downtime_is_in_effect',
+            'entry_time'      => 'downtime_entry_time',
+            'host_state'      => 'downtime_host_state',
+            'service_state'   => 'downtime_service_state',
+            'host_name',
+            'host',
+            'service',
+            'service_description',
+            'host_display_name',
+            'service_display_name'
+        ))->where('downtime_internal_id', $downtimeId)->getQuery()->fetchRow();
+        
+        $this->getTabs()
+            ->add(
+                'downtime',
+                array(
+                    'title' => $this->translate(
+                        'Display detailed information about a downtime.'
+                    ),
+                    'icon' => 'plug',
+                    'label' => $this->translate('Downtime'),
+                    'url'   =>'monitoring/downtimes/show'
+                )
+        )->activate('downtime')->extend(new DashboardAction());
+    }
+    
+    public function showAction()
+    {
+        $this->view->downtime = $this->downtime;
+        $this->view->delDowntimeForm = new DeleteDowntimeCommandForm();
+        $this->view->delDowntimeForm->setObjects($this->downtime);
+        $this->view->listAllLink = Url::fromPath('monitoring/list/downtimes');
+        $this->view->showHostLink = Url::fromPath('monitoring/host/show')
+                ->setParam('host', $this->downtime->host);
+        $this->view->showServiceLink = Url::fromPath('monitoring/service/show')
+                ->setParam('host', $this->downtime->host)
+                ->setParam('service', $this->downtime->service_description);
+    }
+}
diff --git a/modules/monitoring/application/views/scripts/downtime/show.phtml b/modules/monitoring/application/views/scripts/downtime/show.phtml
new file mode 100644
index 000000000..806897e90
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/downtime/show.phtml
@@ -0,0 +1,179 @@
+<?php
+use Icinga\Module\Monitoring\Object\Service;
+use Icinga\Module\Monitoring\Object\Host;
+
+if (isset($downtime->service_description)) {
+    $isService = true;
+    $stateName = Service::getStateText($downtime->service_state);
+} else {
+    $isService = false;
+    $stateName = Host::getStateText($downtime->host_state);
+}
+?>
+
+<div class="controls">
+  <?php if (! $this->compact): ?>
+    <?= $this->tabs; ?>
+  <?php endif ?>
+  <h1>
+    <?php if ($isService): ?>
+       <?php 
+          $link = $this->link()->service(
+                $downtime->service_description, 
+                $downtime->service_display_name,
+                $downtime->host_name,
+                $downtime->host_display_name
+          );
+          $icon = $this->icon('service', $this->translate('Service')); 
+        ?>
+    <?php else: ?>
+      <?php 
+        $icon = $this->icon('host', $this->translate('Host'));
+        $link = $this->link()->host($downtime->host_name, $downtime->host_display_name)
+      ?>
+    <?php endif ?>
+    <?= sprintf(
+            $this->translate(
+                'Downtime for %s',
+                'Downtime for host or service.'
+            ),
+            $link
+        ); ?>
+    <?= $icon ?>
+  </h1>
+</div>
+
+<div class="content" data-base-target="_next">
+<small>
+  <?php if ($downtime->is_flexible): ?>
+    <?php if ($downtime->is_in_effect): ?>
+      <?= sprintf(
+        $isService
+          ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
+          : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
+        date('d.m.y', $downtime->start),
+        date('H:i', $downtime->start),
+        $this->format()->duration($downtime->duration),
+        date('d.m.y', $downtime->end),
+        date('H:i', $downtime->end)
+      ); ?>
+    <?php else: ?>
+      <?= sprintf(
+        $isService
+          ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
+          : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
+        date('d.m.y H:i', $downtime->scheduled_start),
+        date('d.m.y H:i', $downtime->scheduled_end),
+        $this->format()->duration($downtime->duration)
+      ); ?>
+    <?php endif ?>
+  <?php else: ?>
+    <?php if ($downtime->is_in_effect): ?>
+      <?= sprintf(
+        $isService
+          ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
+          : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
+        date('d.m.y', $downtime->start),
+        date('H:i', $downtime->start),
+        date('d.m.y', $downtime->end),
+        date('H:i', $downtime->end)
+      ); ?>
+    <?php else: ?>
+      <?= sprintf(
+        $isService
+          ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
+          : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
+        date('d.m.y', $downtime->scheduled_start),
+        date('H:i', $downtime->scheduled_start),
+        date('d.m.y', $downtime->scheduled_end),
+        date('H:i', $downtime->scheduled_end)
+      ); ?>
+    <?php endif ?>
+  <?php endif ?>
+</small>
+<br>
+<br>
+    
+<table class="avp newsection"> 
+  <tbody>
+    <tr>
+      <th><?= $this->translate('Author') ?></th>
+      <td><?= $this->escape($this->downtime->author_name) ?></td>
+    </tr>
+    <tr>
+      <th><?= $this->translate('Comments') ?></th>
+      <td><?= $this->escape($this->downtime->comment) ?></td>
+    </tr>
+    <tr>
+      <th><?= $this->translate('Scheduled start') ?></th>
+      <td><?= date('d.m.y H:i', $this->downtime->scheduled_start) ?></td>
+    </tr>
+    <tr>
+      <th><?= $this->translate('Scheduled end') ?></th>
+      <td><?= date('d.m.y H:i', $this->downtime->scheduled_end) ?></td>
+    </tr>
+    <tr>
+      <th><?= $this->translate('Is Flexible') ?></th>
+      <td>
+      <?= $this->escape(
+          $this->downtime->is_flexible ? 
+          $this->translate('Yes') : $this->translate('No')
+        ); 
+      ?>
+      </td>
+    </tr>
+    <tr>
+      <th><?= $this->translate('In Effect') ?></th>
+      <td>
+      <?= $this->escape(
+          $this->downtime->is_in_effect ? 
+          $this->translate('Yes') : $this->translate('No')
+        ); 
+      ?>
+      </td>
+    </tr>
+
+    <?php if ($this->downtime->is_flexible && $this->downtime->is_in_effect): ?>
+    <tr>
+      <th><?= $this->translate('Start') ?></th>
+      <td><?= date('d.m.y H:i', $downtime->start); ?></td>
+    </tr>
+    <tr>
+      <th><?= $this->translate('End') ?></th>
+      <td><?= date('d.m.y H:i', $downtime->end); ?></td>
+    </tr>
+    <?php endif; ?>
+    <tr>
+      <th><?= $this->translate('Duration') ?></th>
+      <td><?= $this->format()->duration($this->escape($this->downtime->duration)); ?></td>
+    </tr>
+    
+    <?php if (isset($delDowntimeForm)): // Form is unset if the current user lacks the respective permission ?>
+    <tr class="newsection">
+      <th><?= $this->translate('Commands') ?></th>
+      <td>
+        <?php
+        $delDowntimeForm->populate(array('downtime_id' => $downtime->id, 'redirect' => $this->listAllLink));
+        if (! $isService) {
+          $delDowntimeForm->setAction(
+              $this->url('monitoring/host/delete-downtime',
+              array('host' => $downtime->host_name))
+          );
+        } else {
+          $delDowntimeForm->setAction(
+              $this->url('monitoring/service/delete-downtime', array(
+                  'host'      => $downtime->host_name,
+                  'service'   => $downtime->service_description
+              ))
+          );
+        }
+        echo $delDowntimeForm;
+        ?>
+      </td>
+    </tr>
+    <?php endif ?>
+  </tbody>
+</table>
+
+</div>
+

From ff47b892e9c2d4ab78cd34443ccab75d5a2d6167 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 21 Apr 2015 17:24:17 +0200
Subject: [PATCH 1440/2920] Improve order and content of downtime properties

Add rows for missing properties, reorder and group related properties.

refs #8902
---
 .../controllers/DowntimeController.php        | 40 +++++++++++-
 .../views/scripts/downtime/show.phtml         | 64 +++----------------
 2 files changed, 47 insertions(+), 57 deletions(-)

diff --git a/modules/monitoring/application/controllers/DowntimeController.php b/modules/monitoring/application/controllers/DowntimeController.php
index 13e7f9e14..af2888383 100644
--- a/modules/monitoring/application/controllers/DowntimeController.php
+++ b/modules/monitoring/application/controllers/DowntimeController.php
@@ -19,13 +19,15 @@ class Monitoring_DowntimeController extends Controller
 {
     protected $downtime;
     
+    protected $isService;
+    
     /**
      * Add tabs
      */
     public function init()
     {
         $downtimeId = $this->params->get('downtime_id');
-        
+         
         $this->downtime = $this->backend->select()->from('downtime', array(
             'id'              => 'downtime_internal_id',
             'objecttype'      => 'downtime_objecttype',
@@ -50,6 +52,12 @@ class Monitoring_DowntimeController extends Controller
             'service_display_name'
         ))->where('downtime_internal_id', $downtimeId)->getQuery()->fetchRow();
         
+        if (isset($this->downtime->service_description)) {
+            $this->isService = true;
+        } else {
+            $this->isService = false;
+        }
+         
         $this->getTabs()
             ->add(
                 'downtime',
@@ -67,8 +75,8 @@ class Monitoring_DowntimeController extends Controller
     public function showAction()
     {
         $this->view->downtime = $this->downtime;
-        $this->view->delDowntimeForm = new DeleteDowntimeCommandForm();
-        $this->view->delDowntimeForm->setObjects($this->downtime);
+        $this->view->isService = $this->isService;
+        $this->view->delDowntimeForm = $this->createDelDowntimeForm();
         $this->view->listAllLink = Url::fromPath('monitoring/list/downtimes');
         $this->view->showHostLink = Url::fromPath('monitoring/host/show')
                 ->setParam('host', $this->downtime->host);
@@ -76,4 +84,30 @@ class Monitoring_DowntimeController extends Controller
                 ->setParam('host', $this->downtime->host)
                 ->setParam('service', $this->downtime->service_description);
     }
+    
+    private function createDelDowntimeForm()
+    {
+        $delDowntimeForm = new DeleteDowntimeCommandForm();
+        $delDowntimeForm->setObjects($this->downtime);
+        $delDowntimeForm->populate(
+            array(
+                'downtime_id' => $this->downtime->id, 
+                'redirect' => Url::fromPath('monitoring/list/downtimes')
+            )
+        );
+        if (! $this->isService) {
+            $delDowntimeForm->setAction(
+                $this->view->url('monitoring/host/delete-downtime',
+                array('host' => $this->downtime->host_name))
+            );
+        } else {
+            $delDowntimeForm->setAction(
+                $this->view->url('monitoring/service/delete-downtime', array(
+                    'host'      => $this->downtime->host_name,
+                    'service'   => $this->downtime->service_description
+                ))
+            );
+        }
+        return $delDowntimeForm;
+    }
 }
diff --git a/modules/monitoring/application/views/scripts/downtime/show.phtml b/modules/monitoring/application/views/scripts/downtime/show.phtml
index 806897e90..d71b92c55 100644
--- a/modules/monitoring/application/views/scripts/downtime/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtime/show.phtml
@@ -1,22 +1,9 @@
-<?php
-use Icinga\Module\Monitoring\Object\Service;
-use Icinga\Module\Monitoring\Object\Host;
-
-if (isset($downtime->service_description)) {
-    $isService = true;
-    $stateName = Service::getStateText($downtime->service_state);
-} else {
-    $isService = false;
-    $stateName = Host::getStateText($downtime->host_state);
-}
-?>
-
 <div class="controls">
   <?php if (! $this->compact): ?>
     <?= $this->tabs; ?>
   <?php endif ?>
-  <h1>
-    <?php if ($isService): ?>
+  <h1 data-base-target="_next">
+    <?php if ($this->isService): ?>
        <?php 
           $link = $this->link()->service(
                 $downtime->service_description, 
@@ -34,7 +21,7 @@ if (isset($downtime->service_description)) {
     <?php endif ?>
     <?= sprintf(
             $this->translate(
-                'Downtime for %s',
+                'Downtime on %s',
                 'Downtime for host or service.'
             ),
             $link
@@ -43,12 +30,12 @@ if (isset($downtime->service_description)) {
   </h1>
 </div>
 
-<div class="content" data-base-target="_next">
+<div class="content">
 <small>
   <?php if ($downtime->is_flexible): ?>
     <?php if ($downtime->is_in_effect): ?>
       <?= sprintf(
-        $isService
+        $this->isService
           ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
           : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
         date('d.m.y', $downtime->start),
@@ -59,7 +46,7 @@ if (isset($downtime->service_description)) {
       ); ?>
     <?php else: ?>
       <?= sprintf(
-        $isService
+        $this->isService
           ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
           : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
         date('d.m.y H:i', $downtime->scheduled_start),
@@ -70,7 +57,7 @@ if (isset($downtime->service_description)) {
   <?php else: ?>
     <?php if ($downtime->is_in_effect): ?>
       <?= sprintf(
-        $isService
+        $this->isService
           ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
           : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
         date('d.m.y', $downtime->start),
@@ -80,7 +67,7 @@ if (isset($downtime->service_description)) {
       ); ?>
     <?php else: ?>
       <?= sprintf(
-        $isService
+        $this->isService
           ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
           : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
         date('d.m.y', $downtime->scheduled_start),
@@ -132,43 +119,12 @@ if (isset($downtime->service_description)) {
       ?>
       </td>
     </tr>
-
-    <?php if ($this->downtime->is_flexible && $this->downtime->is_in_effect): ?>
-    <tr>
-      <th><?= $this->translate('Start') ?></th>
-      <td><?= date('d.m.y H:i', $downtime->start); ?></td>
-    </tr>
-    <tr>
-      <th><?= $this->translate('End') ?></th>
-      <td><?= date('d.m.y H:i', $downtime->end); ?></td>
-    </tr>
-    <?php endif; ?>
-    <tr>
-      <th><?= $this->translate('Duration') ?></th>
-      <td><?= $this->format()->duration($this->escape($this->downtime->duration)); ?></td>
-    </tr>
-    
+  
     <?php if (isset($delDowntimeForm)): // Form is unset if the current user lacks the respective permission ?>
     <tr class="newsection">
       <th><?= $this->translate('Commands') ?></th>
       <td>
-        <?php
-        $delDowntimeForm->populate(array('downtime_id' => $downtime->id, 'redirect' => $this->listAllLink));
-        if (! $isService) {
-          $delDowntimeForm->setAction(
-              $this->url('monitoring/host/delete-downtime',
-              array('host' => $downtime->host_name))
-          );
-        } else {
-          $delDowntimeForm->setAction(
-              $this->url('monitoring/service/delete-downtime', array(
-                  'host'      => $downtime->host_name,
-                  'service'   => $downtime->service_description
-              ))
-          );
-        }
-        echo $delDowntimeForm;
-        ?>
+        <?= $delDowntimeForm;?>
       </td>
     </tr>
     <?php endif ?>

From bb7afd9b2b4a1579188902720182aa2a955dd179 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 21 Apr 2015 17:25:43 +0200
Subject: [PATCH 1441/2920] Add tooltips to downtime detail view

refs #8902
---
 .../views/scripts/downtime/show.phtml         | 75 ++++++++++++++-----
 1 file changed, 55 insertions(+), 20 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/downtime/show.phtml b/modules/monitoring/application/views/scripts/downtime/show.phtml
index d71b92c55..c6084a29f 100644
--- a/modules/monitoring/application/views/scripts/downtime/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtime/show.phtml
@@ -80,37 +80,72 @@
 </small>
 <br>
 <br>
-    
+
 <table class="avp newsection"> 
   <tbody>
-    <tr>
+    <tr title="<?= $this->translate('The name of the person who scheduled this downtime'); ?>">
       <th><?= $this->translate('Author') ?></th>
-      <td><?= $this->escape($this->downtime->author_name) ?></td>
+      <td><?= $this->icon('user') ?> <?= $this->escape($this->downtime->author_name) ?></td>
     </tr>
-    <tr>
-      <th><?= $this->translate('Comments') ?></th>
-      <td><?= $this->escape($this->downtime->comment) ?></td>
+    <tr title="<?= $this->translate('A comment, as entered by the author, associated with the scheduled downtime'); ?>">
+      <th><?= $this->translate('Comment') ?></th>
+      <td><?= $this->icon('comment') ?> <?= $this->escape($this->downtime->comment) ?></td>
     </tr>
-    <tr>
-      <th><?= $this->translate('Scheduled start') ?></th>
-      <td><?= date('d.m.y H:i', $this->downtime->scheduled_start) ?></td>
+     <tr title="<?= $this->translate('Date and time this downtime was entered'); ?>">
+      <th><?= $this->translate('Entry Time') ?></th>
+      <td> <?= date('d.m.y H:i' ,$this->escape($this->downtime->entry_time)) ?></td>
     </tr>
-    <tr>
-      <th><?= $this->translate('Scheduled end') ?></th>
-      <td><?= date('d.m.y H:i', $this->downtime->scheduled_end) ?></td>
-    </tr>
-    <tr>
-      <th><?= $this->translate('Is Flexible') ?></th>
+    <tr class="newsection">
+      <th><?= $this->escape(
+          $this->downtime->is_flexible ? 
+          $this->translate('Flexible') : $this->translate('Fixed')
+        );  ?></th>
       <td>
       <?= $this->escape(
           $this->downtime->is_flexible ? 
-          $this->translate('Yes') : $this->translate('No')
-        ); 
-      ?>
+          $this->translate('Flexible downtimes have a hard start and end time,' 
+            . ' but also an additional restriction on the duration in which ' 
+            . ' the host or service may actually be down.') : 
+          $this->translate('Fixed downtimes have a static start and end time.')
+        );  ?>
       </td>
     </tr>
-    <tr>
-      <th><?= $this->translate('In Effect') ?></th>
+    <tr title="<?= $this->translate('The date/time the scheduled downtime is'
+            . ' supposed to start. If this is a flexible (non-fixed) downtime, '
+            . 'this refers to the earliest possible time that the downtime'
+            . ' can start'); ?>">
+      <th><?= $this->translate('Scheduled start') ?></th>
+      <td><?= date('d.m.y H:i', $this->downtime->scheduled_start) ?></td>
+    </tr>
+    <tr title="<?= $this->translate('The date/time the scheduled downtime is '
+            . 'supposed to end. If this is a flexible (non-fixed) downtime, '
+            . 'this refers to the last possible time that the downtime can '
+            . 'start'); ?>">
+      <th><?= $this->translate('Scheduled end') ?></th>
+      <td><?= date('d.m.y H:i', $this->downtime->scheduled_end) ?></td>
+    </tr>
+    <?php if ($this->downtime->is_flexible): ?>
+      <tr title="<?= $this->translate('Indicates the number of seconds that the '
+              . 'scheduled downtime should last. This is usually only needed if'
+              . ' this is a flexible downtime, which can start at a variable '
+              . 'time, but lasts for the specified duration'); ?>">
+        <th tit><?= $this->translate('Duration') ?></th>
+        <td><?= $this->format()->duration($this->escape($this->downtime->duration)); ?></td>
+      </tr>
+      <tr title="<?= $this->translate('he date/time the scheduled downtime was'
+              . ' actually started'); ?>">
+         <th><?= $this->translate('Actual start time') ?></th>
+         <td><?= date('d.m.y H:i', $downtime->start); ?></td>
+       </tr>
+       <tr title="<?= $this->translate('The date/time the scheduled downtime '
+               . 'actually ended'); ?>">
+         <th><?= $this->translate('Actual end time') ?></th>
+         <td><?= date('d.m.y H:i', $downtime->end); ?></td>
+       </tr>
+    <?php endif; ?>
+      
+    <tr class="newsection">
+      <th><?= $this->translate('In effect') ?></th>
       <td>
       <?= $this->escape(
           $this->downtime->is_in_effect ? 

From ab0720fe95f6361596a21324752a762e7dc634e0 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 21 Apr 2015 17:26:08 +0200
Subject: [PATCH 1442/2920] Add support for multi-selection to downtime list

refs #8902
---
 .../views/scripts/list/downtimes.phtml        | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 3f882a733..2dd62761e 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -19,8 +19,10 @@ if (count($downtimes) === 0) {
     return;
 }
 ?>
-
-  <table data-base-target="_next" class="action">
+  <table data-base-target="_next" 
+         class="action multiselect" 
+         data-icinga-multiselect-url="/icingaweb2/monitoring/downtimes/show"
+         data-icinga-multiselect-data="downtime_id">
     <tbody>
     <?php foreach ($downtimes as $downtime): ?>
     <?php
@@ -48,15 +50,22 @@ if (count($downtimes) === 0) {
             ?>
         </td>
         <td>
-        <?php if ($isService): ?>
-          <?= $this->icon('service', $this->translate('Service')); ?>
-          <?= $this->link()->service(
-              $downtime->service_description, $downtime->service_display_name, $downtime->host_name, $downtime->host_display_name
-          ) ?>
-        <?php else: ?>
-          <?= $this->icon('host', $this->translate('Host')); ?>
-          <?= $this->link()->host($downtime->host_name, $downtime->host_display_name) ?>
-        <?php endif ?>
+        <?php 
+            if ($isService) {
+                echo $this->icon('service');
+            } else {
+                echo $this->icon('host');
+            } 
+        ?>
+        <?= $this->qlink(
+            sprintf($this->translate('%s on %s', 'Service running on host'), $downtime->service_display_name, $downtime->host_display_name),
+                'monitoring/downtime/show',
+                array('downtime_id' => $downtime->id),
+                array('title' => sprintf(
+                $this->translate('Show detailed information for downtime on %s for %s'),
+                $downtime->service_display_name,
+                $downtime->host_display_name
+        ))) ?>
           <br>
           <?= $this->icon('comment', $this->translate('Comment')); ?> [<?= $this->escape($downtime->author_name) ?>] <?= $this->escape($downtime->comment) ?>
           <br>

From 9114a34223c227eb0440b64fe97d46ca2642c808 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 23 Apr 2015 11:31:53 +0200
Subject: [PATCH 1443/2920] Display host and service state in downtime detail
 area

refs #8902
---
 .../controllers/DowntimeController.php        |   6 +
 .../views/scripts/downtime/show.phtml         | 121 ++++++++++--------
 2 files changed, 76 insertions(+), 51 deletions(-)

diff --git a/modules/monitoring/application/controllers/DowntimeController.php b/modules/monitoring/application/controllers/DowntimeController.php
index af2888383..32c183ba1 100644
--- a/modules/monitoring/application/controllers/DowntimeController.php
+++ b/modules/monitoring/application/controllers/DowntimeController.php
@@ -2,6 +2,8 @@
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Module\Monitoring\Controller;
+use Icinga\Module\Monitoring\Object\Service;
+use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
@@ -76,6 +78,10 @@ class Monitoring_DowntimeController extends Controller
     {
         $this->view->downtime = $this->downtime;
         $this->view->isService = $this->isService;
+        $this->view->stateName = isset($this->downtime->service_description) ? 
+                Service::getStateText($this->downtime->service_state) :
+                Host::getStateText($this->downtime->host_state);
+        
         $this->view->delDowntimeForm = $this->createDelDowntimeForm();
         $this->view->listAllLink = Url::fromPath('monitoring/list/downtimes');
         $this->view->showHostLink = Url::fromPath('monitoring/host/show')
diff --git a/modules/monitoring/application/views/scripts/downtime/show.phtml b/modules/monitoring/application/views/scripts/downtime/show.phtml
index c6084a29f..34751cd7c 100644
--- a/modules/monitoring/application/views/scripts/downtime/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtime/show.phtml
@@ -2,6 +2,75 @@
   <?php if (! $this->compact): ?>
     <?= $this->tabs; ?>
   <?php endif ?>
+    
+    <table class="action">
+        <tr class="state <?= $stateName; ?><?= $downtime->is_in_effect ? ' handled' : ''; ?>">
+        <td class="state">
+          <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
+          <br>
+            <?=
+            $this->dateTimeRenderer(
+                ($downtime->is_in_effect ? $downtime->end : $downtime->start),
+                true
+            )->render(
+                $this->translate('on %s', 'datetime'),
+                $this->translate('at %s', 'time'),
+                $this->translate('in %s', 'timespan')
+            );
+            ?>
+        </td>
+        <td>
+          <small>
+            <?php if ($downtime->is_flexible): ?>
+                <?php if ($downtime->is_in_effect): ?>
+                  <?= sprintf(
+                    $this->isService
+                      ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
+                      : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
+                    date('d.m.y', $downtime->start),
+                    date('H:i', $downtime->start),
+                    $this->format()->duration($downtime->duration),
+                    date('d.m.y', $downtime->end),
+                    date('H:i', $downtime->end)
+                  ); ?>
+                <?php else: ?>
+                  <?= sprintf(
+                    $this->isService
+                      ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
+                      : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
+                    date('d.m.y H:i', $downtime->scheduled_start),
+                    date('d.m.y H:i', $downtime->scheduled_end),
+                    $this->format()->duration($downtime->duration)
+                  ); ?>
+                <?php endif ?>
+                <?php else: ?>
+                  <?php if ($downtime->is_in_effect): ?>
+                    <?= sprintf(
+                      $this->isService
+                        ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
+                        : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
+                      date('d.m.y', $downtime->start),
+                      date('H:i', $downtime->start),
+                      date('d.m.y', $downtime->end),
+                      date('H:i', $downtime->end)
+                    ); ?>
+                  <?php else: ?>
+                    <?= sprintf(
+                      $this->isService
+                        ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
+                        : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
+                      date('d.m.y', $downtime->scheduled_start),
+                      date('H:i', $downtime->scheduled_start),
+                      date('d.m.y', $downtime->scheduled_end),
+                      date('H:i', $downtime->scheduled_end)
+                    ); ?>
+                  <?php endif ?>
+                <?php endif ?>
+          </small>
+        </td>
+      </tr>
+    </table>
+    
   <h1 data-base-target="_next">
     <?php if ($this->isService): ?>
        <?php 
@@ -31,57 +100,7 @@
 </div>
 
 <div class="content">
-<small>
-  <?php if ($downtime->is_flexible): ?>
-    <?php if ($downtime->is_in_effect): ?>
-      <?= sprintf(
-        $this->isService
-          ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
-          : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
-        date('d.m.y', $downtime->start),
-        date('H:i', $downtime->start),
-        $this->format()->duration($downtime->duration),
-        date('d.m.y', $downtime->end),
-        date('H:i', $downtime->end)
-      ); ?>
-    <?php else: ?>
-      <?= sprintf(
-        $this->isService
-          ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
-          : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
-        date('d.m.y H:i', $downtime->scheduled_start),
-        date('d.m.y H:i', $downtime->scheduled_end),
-        $this->format()->duration($downtime->duration)
-      ); ?>
-    <?php endif ?>
-  <?php else: ?>
-    <?php if ($downtime->is_in_effect): ?>
-      <?= sprintf(
-        $this->isService
-          ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
-          : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
-        date('d.m.y', $downtime->start),
-        date('H:i', $downtime->start),
-        date('d.m.y', $downtime->end),
-        date('H:i', $downtime->end)
-      ); ?>
-    <?php else: ?>
-      <?= sprintf(
-        $this->isService
-          ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
-          : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
-        date('d.m.y', $downtime->scheduled_start),
-        date('H:i', $downtime->scheduled_start),
-        date('d.m.y', $downtime->scheduled_end),
-        date('H:i', $downtime->scheduled_end)
-      ); ?>
-    <?php endif ?>
-  <?php endif ?>
-</small>
-<br>
-<br>
-
-<table class="avp newsection"> 
+<table class="avp"> 
   <tbody>
     <tr title="<?= $this->translate('The name of the person who scheduled this downtime'); ?>">
       <th><?= $this->translate('Author') ?></th>

From 20b25e656be03a4258316f5ae9b48418ea35288c Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 23 Apr 2015 12:19:58 +0200
Subject: [PATCH 1444/2920] Show better error message for unknown downtimes

refs #8902
---
 .../application/controllers/DowntimeController.php          | 4 +++-
 .../application/views/scripts/downtime/show.phtml           | 6 ++++++
 .../application/views/scripts/list/downtimes.phtml          | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/DowntimeController.php b/modules/monitoring/application/controllers/DowntimeController.php
index 32c183ba1..37f466807 100644
--- a/modules/monitoring/application/controllers/DowntimeController.php
+++ b/modules/monitoring/application/controllers/DowntimeController.php
@@ -76,12 +76,14 @@ class Monitoring_DowntimeController extends Controller
     
     public function showAction()
     {
+        if (false === $this->downtime) {
+            return;
+        }
         $this->view->downtime = $this->downtime;
         $this->view->isService = $this->isService;
         $this->view->stateName = isset($this->downtime->service_description) ? 
                 Service::getStateText($this->downtime->service_state) :
                 Host::getStateText($this->downtime->host_state);
-        
         $this->view->delDowntimeForm = $this->createDelDowntimeForm();
         $this->view->listAllLink = Url::fromPath('monitoring/list/downtimes');
         $this->view->showHostLink = Url::fromPath('monitoring/host/show')
diff --git a/modules/monitoring/application/views/scripts/downtime/show.phtml b/modules/monitoring/application/views/scripts/downtime/show.phtml
index 34751cd7c..ddc91eeeb 100644
--- a/modules/monitoring/application/views/scripts/downtime/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtime/show.phtml
@@ -1,4 +1,10 @@
 <div class="controls">
+  <?php if (! isset($downtime)): ?>
+    <?= $this->translate('No scheduled downtime matching the filter.') ?>
+    </div>
+    <?php return; ?>
+  <?php endif; ?>
+   
   <?php if (! $this->compact): ?>
     <?= $this->tabs; ?>
   <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 2dd62761e..b21e3c3fb 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -15,7 +15,8 @@ if (! $this->compact): ?>
 <?php
 
 if (count($downtimes) === 0) {
-    echo $this->translate('No downtimes found matching the filter') . '</div>';
+    echo $this->translate('No downtimes found matching the filter,'
+            . ' maybe the downtime already expired.') . '</div>';
     return;
 }
 ?>

From a87e1f91d9b9ae5c169850985d19016c8025bb42 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 23 Apr 2015 14:43:30 +0200
Subject: [PATCH 1445/2920] Implement detail view for multiple downtimes

refs #8902
---
 .../controllers/DowntimesController.php       | 122 ++++++++++++++++++
 .../views/scripts/downtimes/show.phtml        |  41 ++++++
 2 files changed, 163 insertions(+)
 create mode 100644 modules/monitoring/application/controllers/DowntimesController.php
 create mode 100644 modules/monitoring/application/views/scripts/downtimes/show.phtml

diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php
new file mode 100644
index 000000000..b0057466f
--- /dev/null
+++ b/modules/monitoring/application/controllers/DowntimesController.php
@@ -0,0 +1,122 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+use Icinga\Data\Filter\Filter;
+use Icinga\Module\Monitoring\Controller;
+use Icinga\Module\Monitoring\Object\Service;
+use Icinga\Module\Monitoring\Object\Host;
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
+use Icinga\Web\Url;
+use Icinga\Web\Widget\Tabextension\DashboardAction;
+
+
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ * Display detailed information about a downtime
+ */
+class Monitoring_DowntimesController extends Controller
+{
+    protected $downtimes;
+    
+    protected $isService;
+    
+    protected $filter;
+    
+    /**
+     * Add tabs
+     */
+    public function init()
+    {
+        $this->filter = Filter::fromQueryString(str_replace(
+                'downtime_id', 
+                'downtime_internal_id', 
+                (string)$this->params
+        ));
+        $this->downtimes = $this->backend->select()->from('downtime', array(
+            'id'              => 'downtime_internal_id',
+            'objecttype'      => 'downtime_objecttype',
+            'comment'         => 'downtime_comment',
+            'author_name'     => 'downtime_author_name',
+            'start'           => 'downtime_start',
+            'scheduled_start' => 'downtime_scheduled_start',
+            'scheduled_end'   => 'downtime_scheduled_end',
+            'end'             => 'downtime_end',
+            'duration'        => 'downtime_duration',
+            'is_flexible'     => 'downtime_is_flexible',
+            'is_fixed'        => 'downtime_is_fixed',
+            'is_in_effect'    => 'downtime_is_in_effect',
+            'entry_time'      => 'downtime_entry_time',
+            'host_state'      => 'downtime_host_state',
+            'service_state'   => 'downtime_service_state',
+            'host_name',
+            'host',
+            'service',
+            'service_description',
+            'host_display_name',
+            'service_display_name'
+        ))->addFilter($this->filter)->getQuery()->fetchAll();
+        $this->getTabs()
+            ->add(
+                'downtimes',
+                array(
+                    'title' => $this->translate(
+                        'Display detailed information about multiple downtimes.'
+                    ),
+                    'icon' => 'plug',
+                    'label' => $this->translate('Downtimes'),
+                    'url'   =>'monitoring/downtimes/show'
+                )
+        )->activate('downtimes')->extend(new DashboardAction());
+    }
+    
+    public function showAction()
+    {
+        if (false === $this->downtimes) {
+            return;
+        }
+        $this->view->downtimes = $this->downtimes;
+        $this->view->isService = $this->isService;
+
+        // $this->view->delDowntimeForm = $this->createDelDowntimeForm();
+        $this->view->listAllLink = Url::fromPath('monitoring/list/downtimes')
+                ->setQueryString($this->filter->toQueryString());
+        $this->view->removeAllLink = Url::fromPath('monitoring/downtimes/removeAll')
+                ->setParams($this->params);
+    }
+    
+    public function removeAllAction()
+    {
+        
+    }
+    
+    private function createDelDowntimeForm()
+    {
+        $delDowntimeForm = new DeleteDowntimeCommandForm();
+        $delDowntimeForm->setObjects($this->downtimes);
+        $delDowntimeForm->populate(
+            array(
+                'downtime_id' => $this->downtime->id, 
+                'redirect' => Url::fromPath('monitoring/list/downtimes')
+            )
+        );
+        if (! $this->isService) {
+            $delDowntimeForm->setAction(
+                $this->view->url('monitoring/host/delete-downtime',
+                array('host' => $this->downtime->host_name))
+            );
+        } else {
+            $delDowntimeForm->setAction(
+                $this->view->url('monitoring/service/delete-downtime', array(
+                    'host'      => $this->downtime->host_name,
+                    'service'   => $this->downtime->service_description
+                ))
+            );
+        }
+        return $delDowntimeForm;
+    }
+}
diff --git a/modules/monitoring/application/views/scripts/downtimes/show.phtml b/modules/monitoring/application/views/scripts/downtimes/show.phtml
new file mode 100644
index 000000000..89ecc7073
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/downtimes/show.phtml
@@ -0,0 +1,41 @@
+<div class="controls">
+  <?php if (! isset($downtimes)): ?>
+    <?= $this->translate('No scheduled downtimes matching the filter.') ?>
+    </div>
+    <?php return; ?>
+  <?php endif; ?>
+   
+  <?php if (! $this->compact): ?>
+    <?= $this->tabs; ?>
+  <?php endif ?>
+    
+  <h1 data-base-target="_next"> 
+    <?= sprintf('%d Downtimes', count($downtimes)) ?>
+  </h1>
+</div>
+
+<div class="content">
+    <p>
+        <?= $this->translate('You have selected') ?>
+        <?= $this->qlink(
+            sprintf($this->translate('%d downtimes'), count($downtimes)),
+            $listAllLink,
+            null,
+            array('title' => $this->translate('List all selected downtimes.'))
+        ) ?>
+        <div>
+            <?= $this->qlink(
+                sprintf(
+                        $this->translate('Remove all %d downtimes.'),
+                        count($downtimes)
+                ),
+                $removeAllLink,
+                null,
+                array(
+                    'icon' => 'trash',
+                    'title' => $this->translate('Remove all selected downtimes.')
+                )
+            ) ?>
+        </div>
+    </p>
+</div>

From 07c5e67304e993b7c6ba45b842a2f5fffb44474c Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 23 Apr 2015 16:35:35 +0200
Subject: [PATCH 1446/2920] Display additional downtime info in multiselection
 detail view

refs #8902
---
 .../controllers/DowntimesController.php       |  24 +--
 .../views/scripts/downtimes/show.phtml        | 153 ++++++++++++++----
 2 files changed, 138 insertions(+), 39 deletions(-)

diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php
index b0057466f..eec408110 100644
--- a/modules/monitoring/application/controllers/DowntimesController.php
+++ b/modules/monitoring/application/controllers/DowntimesController.php
@@ -23,8 +23,6 @@ class Monitoring_DowntimesController extends Controller
 {
     protected $downtimes;
     
-    protected $isService;
-    
     protected $filter;
     
     /**
@@ -72,6 +70,20 @@ class Monitoring_DowntimesController extends Controller
                     'url'   =>'monitoring/downtimes/show'
                 )
         )->activate('downtimes')->extend(new DashboardAction());
+        
+        foreach ($this->downtimes as $downtime) {
+            if (isset($downtime->service_description)) {
+                $downtime->isService = true;
+            } else {
+                $downtime->isService = false;
+            }
+            
+            if ($downtime->isService) {
+                $downtime->stateText = Service::getStateText($downtime->service_state);
+            } else {
+                $downtime->stateText = Host::getStateText($downtime->host_state);
+            }
+        }
     }
     
     public function showAction()
@@ -80,9 +92,6 @@ class Monitoring_DowntimesController extends Controller
             return;
         }
         $this->view->downtimes = $this->downtimes;
-        $this->view->isService = $this->isService;
-
-        // $this->view->delDowntimeForm = $this->createDelDowntimeForm();
         $this->view->listAllLink = Url::fromPath('monitoring/list/downtimes')
                 ->setQueryString($this->filter->toQueryString());
         $this->view->removeAllLink = Url::fromPath('monitoring/downtimes/removeAll')
@@ -90,11 +99,6 @@ class Monitoring_DowntimesController extends Controller
     }
     
     public function removeAllAction()
-    {
-        
-    }
-    
-    private function createDelDowntimeForm()
     {
         $delDowntimeForm = new DeleteDowntimeCommandForm();
         $delDowntimeForm->setObjects($this->downtimes);
diff --git a/modules/monitoring/application/views/scripts/downtimes/show.phtml b/modules/monitoring/application/views/scripts/downtimes/show.phtml
index 89ecc7073..a683722ac 100644
--- a/modules/monitoring/application/views/scripts/downtimes/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtimes/show.phtml
@@ -8,34 +8,129 @@
   <?php if (! $this->compact): ?>
     <?= $this->tabs; ?>
   <?php endif ?>
-    
-  <h1 data-base-target="_next"> 
-    <?= sprintf('%d Downtimes', count($downtimes)) ?>
-  </h1>
-</div>
 
-<div class="content">
-    <p>
-        <?= $this->translate('You have selected') ?>
-        <?= $this->qlink(
-            sprintf($this->translate('%d downtimes'), count($downtimes)),
-            $listAllLink,
-            null,
-            array('title' => $this->translate('List all selected downtimes.'))
-        ) ?>
-        <div>
-            <?= $this->qlink(
-                sprintf(
-                        $this->translate('Remove all %d downtimes.'),
-                        count($downtimes)
-                ),
-                $removeAllLink,
-                null,
-                array(
-                    'icon' => 'trash',
-                    'title' => $this->translate('Remove all selected downtimes.')
-                )
-            ) ?>
-        </div>
-    </p>
+  <h1>
+    <?= sprintf($this->translate('%d Downtimes'), count($downtimes)) ?>
+    <?= count($downtimes) > 5 ? 
+            sprintf($this->translate('(%d not shown)'), count ($downtimes) - 5) 
+            : ''; 
+    ?>
+  </h1>
+<p>
+  <table class="action">
+    <tbody>
+    <?php $i = 0; foreach ($downtimes as $downtime):
+        if (++ $i > 5) {
+            continue;
+        } ?>
+        <tr class="state <?= $downtime->stateText ?>">
+          <td class="state">
+            <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
+            <br>
+            <?=
+                $this->dateTimeRenderer(
+                    ($downtime->is_in_effect ? $downtime->end : $downtime->start),
+                    true
+                )->render(
+                    $this->translate('on %s', 'datetime'),
+                    $this->translate('at %s', 'time'),
+                    $this->translate('in %s', 'timespan')
+                );
+            ?>
+          </td>
+          <td class="name oneline">
+            <?php if ($downtime->isService): ?>
+                <?= $this->icon('service') ?>
+                <b><?= $downtime->service ?> on <?= $downtime->host_name ?>.</b>
+            <?php else: ?>
+                 <?= $this->icon('host') ?>
+                <b><?= $downtime->host_name ?>.</b>
+            <?php endif; ?>
+                
+            <?php if ($downtime->is_flexible): ?>
+              <?php if ($downtime->is_in_effect): ?>
+                <?= sprintf(
+                  $this->isService
+                    ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
+                    : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
+                  date('d.m.y', $downtime->start),
+                  date('H:i', $downtime->start),
+                  $this->format()->duration($downtime->duration),
+                  date('d.m.y', $downtime->end),
+                  date('H:i', $downtime->end)
+                ); ?>
+              <?php else: ?>
+                <?= sprintf(
+                  $this->isService
+                    ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
+                    : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
+                  date('d.m.y H:i', $downtime->scheduled_start),
+                  date('d.m.y H:i', $downtime->scheduled_end),
+                  $this->format()->duration($downtime->duration)
+                ); ?>
+              <?php endif ?>
+            <?php else: ?>
+              <?php if ($downtime->is_in_effect): ?>
+                <?= sprintf(
+                  $this->isService
+                    ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
+                    : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
+                  date('d.m.y', $downtime->start),
+                  date('H:i', $downtime->start),
+                  date('d.m.y', $downtime->end),
+                  date('H:i', $downtime->end)
+                ); ?>
+              <?php else: ?>
+                <?= sprintf(
+                  $this->isService
+                    ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
+                    : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
+                  date('d.m.y', $downtime->scheduled_start),
+                  date('H:i', $downtime->scheduled_start),
+                  date('d.m.y', $downtime->scheduled_end),
+                  date('H:i', $downtime->scheduled_end)
+                ); ?>
+              <?php endif ?>
+            <?php endif ?>
+            </td>
+        </tr>
+    <?php endforeach; ?>
+    </tbody>
+  </table>
+  <p> 
+    <?= $this->qlink(
+        sprintf($this->translate('List all %d downtimes …'), count($downtimes)),
+        $listAllLink,
+        null,
+        array(
+            'title' => $this->translate('List all'),
+            'data-base-target' => "_next"
+        )
+    ) ?>
+  </p>
+</p>
+</div>
+<div class="content">
+  <h3><?= $this->icon('reschedule') ?> <?= $this->translate('Commands') ?> </h3>
+  <p>
+    <?= sprintf(
+            $this->translate('Issue commands to all %s selected downtimes.'),
+            '<b>' . count($downtimes) . '</b>'
+        )
+    ?>
+    <div>
+    <?= $this->qlink(
+        sprintf(
+            $this->translate('Remove all %d scheduled downtimes'),
+            count($downtimes)
+        ),
+        $removeAllLink,
+        null,
+        array(
+            'icon' => 'trash',
+            'title' => $this->translate('Remove all selected downtimes.')
+        )
+    ) ?>
+    </div>
+  </p>
 </div>

From 400f351ea580800d22f56c23c0512839686f1b25 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 23 Apr 2015 16:55:59 +0200
Subject: [PATCH 1447/2920] Improve detail view layout

refs #8902
---
 .../views/scripts/downtime/show.phtml         | 57 +++++++++----------
 .../views/scripts/downtimes/show.phtml        | 12 +---
 2 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/downtime/show.phtml b/modules/monitoring/application/views/scripts/downtime/show.phtml
index ddc91eeeb..ade9495b0 100644
--- a/modules/monitoring/application/views/scripts/downtime/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtime/show.phtml
@@ -76,45 +76,44 @@
         </td>
       </tr>
     </table>
-    
-  <h1 data-base-target="_next">
-    <?php if ($this->isService): ?>
-       <?php 
-          $link = $this->link()->service(
-                $downtime->service_description, 
-                $downtime->service_display_name,
-                $downtime->host_name,
-                $downtime->host_display_name
-          );
-          $icon = $this->icon('service', $this->translate('Service')); 
-        ?>
-    <?php else: ?>
-      <?php 
-        $icon = $this->icon('host', $this->translate('Host'));
-        $link = $this->link()->host($downtime->host_name, $downtime->host_display_name)
-      ?>
-    <?php endif ?>
-    <?= sprintf(
-            $this->translate(
-                'Downtime on %s',
-                'Downtime for host or service.'
-            ),
-            $link
-        ); ?>
-    <?= $icon ?>
-  </h1>
 </div>
 
 <div class="content">
+    <h3><?= $this->translate('Downtime detail information') ?></h3>
 <table class="avp"> 
   <tbody>
+      <tr>
+          <th>
+              <?= $this->isService ? $this->translate('Service') : $this->translate('Host') ?>
+          </th>
+          <td data-base-target="_next">
+              <?php if ($this->isService): ?>
+              <?php 
+                  $link = $this->link()->service(
+                       $downtime->service_description, 
+                       $downtime->service_display_name,
+                       $downtime->host_name,
+                       $downtime->host_display_name
+                  );
+                  $icon = $this->icon('service', $this->translate('Service')); 
+               ?>
+              <?php else: ?>
+              <?php 
+                  $icon = $this->icon('host', $this->translate('Host'));
+                  $link = $this->link()->host($downtime->host_name, $downtime->host_display_name)
+              ?>
+              <?php endif ?>
+              <?= $icon ?>
+              <?= $link ?>
+          </td>
+      </tr>    
     <tr title="<?= $this->translate('The name of the person who scheduled this downtime'); ?>">
       <th><?= $this->translate('Author') ?></th>
-      <td><?= $this->icon('user') ?> <?= $this->escape($this->downtime->author_name) ?></td>
+      <td><?= $this->icon('user', $this->translate('User')) ?> <?= $this->escape($this->downtime->author_name) ?></td>
     </tr>
     <tr title="<?= $this->translate('A comment, as entered by the author, associated with the scheduled downtime'); ?>">
       <th><?= $this->translate('Comment') ?></th>
-      <td><?= $this->icon('comment') ?> <?= $this->escape($this->downtime->comment) ?></td>
+      <td><?= $this->icon('comment', $this->translate('Comment')) ?> <?= $this->escape($this->downtime->comment) ?></td>
     </tr>
      <tr title="<?= $this->translate('Date and time this downtime was entered'); ?>">
       <th><?= $this->translate('Entry Time') ?></th>
diff --git a/modules/monitoring/application/views/scripts/downtimes/show.phtml b/modules/monitoring/application/views/scripts/downtimes/show.phtml
index a683722ac..c7ddb0ae6 100644
--- a/modules/monitoring/application/views/scripts/downtimes/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtimes/show.phtml
@@ -8,14 +8,6 @@
   <?php if (! $this->compact): ?>
     <?= $this->tabs; ?>
   <?php endif ?>
-
-  <h1>
-    <?= sprintf($this->translate('%d Downtimes'), count($downtimes)) ?>
-    <?= count($downtimes) > 5 ? 
-            sprintf($this->translate('(%d not shown)'), count ($downtimes) - 5) 
-            : ''; 
-    ?>
-  </h1>
 <p>
   <table class="action">
     <tbody>
@@ -40,10 +32,10 @@
           </td>
           <td class="name oneline">
             <?php if ($downtime->isService): ?>
-                <?= $this->icon('service') ?>
+                <?= $this->icon('service', $this->translate('Service')) ?>
                 <b><?= $downtime->service ?> on <?= $downtime->host_name ?>.</b>
             <?php else: ?>
-                 <?= $this->icon('host') ?>
+                 <?= $this->icon('host', $this->translate('Host')) ?>
                 <b><?= $downtime->host_name ?>.</b>
             <?php endif; ?>
                 

From b186ce2cacc6da511a2cb5a1f696f12cb097c51e Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 27 Apr 2015 17:53:17 +0200
Subject: [PATCH 1448/2920] Handle non-existed downtime ids with exceptions

refs #8902
---
 .../application/controllers/DowntimeController.php |  7 ++++---
 .../controllers/DowntimesController.php            |  6 ++++++
 .../application/views/scripts/downtime/show.phtml  | 14 ++++----------
 .../application/views/scripts/downtimes/show.phtml |  5 -----
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/modules/monitoring/application/controllers/DowntimeController.php b/modules/monitoring/application/controllers/DowntimeController.php
index 37f466807..26a88ae3b 100644
--- a/modules/monitoring/application/controllers/DowntimeController.php
+++ b/modules/monitoring/application/controllers/DowntimeController.php
@@ -54,6 +54,10 @@ class Monitoring_DowntimeController extends Controller
             'service_display_name'
         ))->where('downtime_internal_id', $downtimeId)->getQuery()->fetchRow();
         
+        if (false === $this->downtime) {
+            throw new Zend_Controller_Action_Exception($this->translate('Downtime not found'));
+        }
+        
         if (isset($this->downtime->service_description)) {
             $this->isService = true;
         } else {
@@ -76,9 +80,6 @@ class Monitoring_DowntimeController extends Controller
     
     public function showAction()
     {
-        if (false === $this->downtime) {
-            return;
-        }
         $this->view->downtime = $this->downtime;
         $this->view->isService = $this->isService;
         $this->view->stateName = isset($this->downtime->service_description) ? 
diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php
index eec408110..fe4e9f5bb 100644
--- a/modules/monitoring/application/controllers/DowntimesController.php
+++ b/modules/monitoring/application/controllers/DowntimesController.php
@@ -58,6 +58,12 @@ class Monitoring_DowntimesController extends Controller
             'host_display_name',
             'service_display_name'
         ))->addFilter($this->filter)->getQuery()->fetchAll();
+        if (false === $this->downtimes) {
+            throw new Zend_Controller_Action_Exception(
+                    $this->translate('Downtime not found')
+            );
+        }
+        
         $this->getTabs()
             ->add(
                 'downtimes',
diff --git a/modules/monitoring/application/views/scripts/downtime/show.phtml b/modules/monitoring/application/views/scripts/downtime/show.phtml
index ade9495b0..6ecc11a7b 100644
--- a/modules/monitoring/application/views/scripts/downtime/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtime/show.phtml
@@ -1,13 +1,7 @@
-<div class="controls">
-  <?php if (! isset($downtime)): ?>
-    <?= $this->translate('No scheduled downtime matching the filter.') ?>
-    </div>
-    <?php return; ?>
-  <?php endif; ?>
-   
-  <?php if (! $this->compact): ?>
-    <?= $this->tabs; ?>
-  <?php endif ?>
+<div class="controls">   
+    <?php if (! $this->compact): ?>
+        <?= $this->tabs; ?>
+    <?php endif ?>
     
     <table class="action">
         <tr class="state <?= $stateName; ?><?= $downtime->is_in_effect ? ' handled' : ''; ?>">
diff --git a/modules/monitoring/application/views/scripts/downtimes/show.phtml b/modules/monitoring/application/views/scripts/downtimes/show.phtml
index c7ddb0ae6..caff167f2 100644
--- a/modules/monitoring/application/views/scripts/downtimes/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtimes/show.phtml
@@ -1,9 +1,4 @@
 <div class="controls">
-  <?php if (! isset($downtimes)): ?>
-    <?= $this->translate('No scheduled downtimes matching the filter.') ?>
-    </div>
-    <?php return; ?>
-  <?php endif; ?>
    
   <?php if (! $this->compact): ?>
     <?= $this->tabs; ?>

From 6ddb0042309d5c088ece002962839936f7def6a2 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 27 Apr 2015 18:04:10 +0200
Subject: [PATCH 1449/2920] Move removal command actions into the downtime
 controllers

refs #8902
---
 .../controllers/DowntimeController.php        | 33 ++++------
 .../controllers/DowntimesController.php       | 41 +++++-------
 .../controllers/ListController.php            |  4 +-
 .../Object/DeleteDowntimeCommandForm.php      | 63 +++++++++----------
 .../Object/DeleteDowntimeQuickCommandForm.php | 36 +++++++++++
 .../Command/Object/DeleteDowntimeCommand.php  | 42 ++++++++++---
 .../IcingaCommandFileCommandRenderer.php      |  2 +-
 .../Controller/MonitoredObjectController.php  | 12 +---
 8 files changed, 131 insertions(+), 102 deletions(-)
 create mode 100644 modules/monitoring/application/forms/Command/Object/DeleteDowntimeQuickCommandForm.php

diff --git a/modules/monitoring/application/controllers/DowntimeController.php b/modules/monitoring/application/controllers/DowntimeController.php
index 26a88ae3b..086e39f10 100644
--- a/modules/monitoring/application/controllers/DowntimeController.php
+++ b/modules/monitoring/application/controllers/DowntimeController.php
@@ -4,7 +4,7 @@
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Module\Monitoring\Object\Host;
-use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeQuickCommandForm;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 
@@ -85,38 +85,27 @@ class Monitoring_DowntimeController extends Controller
         $this->view->stateName = isset($this->downtime->service_description) ? 
                 Service::getStateText($this->downtime->service_state) :
                 Host::getStateText($this->downtime->host_state);
-        $this->view->delDowntimeForm = $this->createDelDowntimeForm();
         $this->view->listAllLink = Url::fromPath('monitoring/list/downtimes');
         $this->view->showHostLink = Url::fromPath('monitoring/host/show')
                 ->setParam('host', $this->downtime->host);
         $this->view->showServiceLink = Url::fromPath('monitoring/service/show')
                 ->setParam('host', $this->downtime->host)
                 ->setParam('service', $this->downtime->service_description);
+        if ($this->hasPermission('monitoring/command/downtime/delete')) {
+            $this->view->delDowntimeForm = $this->createDelDowntimeForm();
+        }
     }
     
     private function createDelDowntimeForm()
     {
-        $delDowntimeForm = new DeleteDowntimeCommandForm();
-        $delDowntimeForm->setObjects($this->downtime);
-        $delDowntimeForm->populate(
-            array(
-                'downtime_id' => $this->downtime->id, 
-                'redirect' => Url::fromPath('monitoring/list/downtimes')
-            )
-        );
-        if (! $this->isService) {
-            $delDowntimeForm->setAction(
-                $this->view->url('monitoring/host/delete-downtime',
-                array('host' => $this->downtime->host_name))
+        $this->assertPermission('monitoring/command/downtime/delete');
+        
+        $delDowntimeForm = new DeleteDowntimeQuickCommandForm();
+        $delDowntimeForm->setDowntimes(array($this->downtime))
+            ->populate(
+                array('redirect' => Url::fromPath('monitoring/list/downtimes'))
             );
-        } else {
-            $delDowntimeForm->setAction(
-                $this->view->url('monitoring/service/delete-downtime', array(
-                    'host'      => $this->downtime->host_name,
-                    'service'   => $this->downtime->service_description
-                ))
-            );
-        }
+        $delDowntimeForm->handleRequest();
         return $delDowntimeForm;
     }
 }
diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php
index fe4e9f5bb..608e3c9fc 100644
--- a/modules/monitoring/application/controllers/DowntimesController.php
+++ b/modules/monitoring/application/controllers/DowntimesController.php
@@ -94,39 +94,28 @@ class Monitoring_DowntimesController extends Controller
     
     public function showAction()
     {
-        if (false === $this->downtimes) {
-            return;
-        }
         $this->view->downtimes = $this->downtimes;
         $this->view->listAllLink = Url::fromPath('monitoring/list/downtimes')
                 ->setQueryString($this->filter->toQueryString());
-        $this->view->removeAllLink = Url::fromPath('monitoring/downtimes/removeAll')
+        $this->view->removeAllLink = Url::fromPath('monitoring/downtimes/remove-all')
                 ->setParams($this->params);
     }
     
     public function removeAllAction()
     {
+        $this->assertPermission('monitoring/command/downtime/delete');
+        $this->view->downtimes = $this->downtimes;
+        $this->view->listAllLink = Url::fromPath('monitoring/list/downtimes')
+                ->setQueryString($this->filter->toQueryString());
         $delDowntimeForm = new DeleteDowntimeCommandForm();
-        $delDowntimeForm->setObjects($this->downtimes);
-        $delDowntimeForm->populate(
-            array(
-                'downtime_id' => $this->downtime->id, 
-                'redirect' => Url::fromPath('monitoring/list/downtimes')
-            )
-        );
-        if (! $this->isService) {
-            $delDowntimeForm->setAction(
-                $this->view->url('monitoring/host/delete-downtime',
-                array('host' => $this->downtime->host_name))
-            );
-        } else {
-            $delDowntimeForm->setAction(
-                $this->view->url('monitoring/service/delete-downtime', array(
-                    'host'      => $this->downtime->host_name,
-                    'service'   => $this->downtime->service_description
-                ))
-            );
-        }
-        return $delDowntimeForm;
+        $delDowntimeForm->setTitle($this->view->translate('Remove all Downtimes'));
+        $delDowntimeForm->addDescription(sprintf(
+            $this->translate('Confirm removal of %d downtimes.'),
+            count($this->downtimes)
+        ));
+        $delDowntimeForm->setDowntimes($this->downtimes)
+                ->setRedirectUrl(Url::fromPath('monitoring/list/downtimes'))
+                ->handleRequest();
+        $this->view->delDowntimeForm = $delDowntimeForm;
     }
-}
+}
\ No newline at end of file
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index e6147c31b..b0b0d9f2e 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -4,7 +4,7 @@
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Backend;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
-use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeQuickCommandForm;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 use Icinga\Web\Widget\Tabextension\OutputFormat;
@@ -294,7 +294,7 @@ class Monitoring_ListController extends Controller
         ));
 
         if ($this->Auth()->hasPermission('monitoring/command/downtime/delete')) {
-            $this->view->delDowntimeForm = new DeleteDowntimeCommandForm();
+            $this->view->delDowntimeForm = new DeleteDowntimeQuickCommandForm();
         }
     }
 
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
index d240251cf..72728cd5a 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -4,13 +4,16 @@
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
 use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand;
+use \Icinga\Module\Monitoring\Forms\Command\CommandForm;
 use Icinga\Web\Notification;
 
 /**
  * Form for deleting host or service downtimes
  */
-class DeleteDowntimeCommandForm extends ObjectsCommandForm
+class DeleteDowntimeCommandForm extends CommandForm
 {
+    protected $downtimes;
+    
     /**
      * (non-PHPDoc)
      * @see \Zend_Form::init() For the method documentation.
@@ -27,14 +30,6 @@ class DeleteDowntimeCommandForm extends ObjectsCommandForm
     public function createElements(array $formData = array())
     {
         $this->addElements(array(
-            array(
-                'hidden',
-                'downtime_id',
-                array(
-                    'required' => true,
-                    'decorators'    => array('ViewHelper')
-                )
-            ),
             array(
                 'hidden',
                 'redirect',
@@ -45,48 +40,50 @@ class DeleteDowntimeCommandForm extends ObjectsCommandForm
         ));
         return $this;
     }
-
+ 
     /**
      * (non-PHPDoc)
-     * @see \Icinga\Web\Form::addSubmitButton() For the method documentation.
+     * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
      */
-    public function addSubmitButton()
+    public function getSubmitLabel()
     {
-        $this->addElement(
-            'button',
-            'btn_submit',
-            array(
-                'ignore'        => true,
-                'escape'        => false,
-                'type'          => 'submit',
-                'class'         => 'link-like',
-                'label'         => $this->getView()->icon('trash'),
-                'title'         => $this->translate('Delete this downtime'),
-                'decorators'    => array('ViewHelper')
-            )
-        );
-        return $this;
+        return $this->translatePlural('Remove', 'Remove All', count($this->downtimes));
     }
-
+    
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::onSuccess() For the method documentation.
      */
     public function onSuccess()
     {
-        foreach ($this->objects as $object) {
-            /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+        foreach ($this->downtimes as $downtime) {
             $delDowntime = new DeleteDowntimeCommand();
-            $delDowntime
-                ->setObject($object)
-                ->setDowntimeId($this->getElement('downtime_id')->getValue());
+            $delDowntime->setDowntimeId($downtime->id);
+            $delDowntime->setDowntimeType(
+                    isset($downtime->service_description) ? 
+                    DeleteDowntimeCommand::DOWNTIME_TYPE_SERVICE :
+                    DeleteDowntimeCommand::DOWNTIME_TYPE_HOST
+            );
             $this->getTransport($this->request)->send($delDowntime);
         }
         $redirect = $this->getElement('redirect')->getValue();
         if (! empty($redirect)) {
             $this->setRedirectUrl($redirect);
         }
-        Notification::success($this->translate('Deleting downtime..'));
+        Notification::success($this->translate('Deleting downtime.'));
         return true;
     }
+    
+    /**
+     * Set the downtimes to be deleted upon success
+     * 
+     * @param type $downtimes
+     * 
+     * @return $this
+     */
+    public function setDowntimes($downtimes)
+    {
+        $this->downtimes = $downtimes;
+        return $this;
+    }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeQuickCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeQuickCommandForm.php
new file mode 100644
index 000000000..adbfcae43
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeQuickCommandForm.php
@@ -0,0 +1,36 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Forms\Command\Object;
+
+use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand;
+use \Icinga\Module\Monitoring\Forms\Command\CommandForm;
+use Icinga\Web\Notification;
+
+/**
+ * Form for deleting host or service downtimes
+ */
+class DeleteDowntimeQuickCommandForm extends DeleteDowntimeCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::addSubmitButton() For the method documentation.
+     */
+    public function addSubmitButton()
+    {
+        $this->addElement(
+            'button',
+            'btn_submit',
+            array(
+                'ignore'        => true,
+                'escape'        => false,
+                'type'          => 'submit',
+                'class'         => 'link-like',
+                'label'         => $this->getView()->icon('trash'),
+                'title'         => $this->translate('Delete this downtime'),
+                'decorators'    => array('ViewHelper')
+            )
+        );
+        return $this;
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
index 52ad99e1b..96dc8f755 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
@@ -3,19 +3,22 @@
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
+use Icinga\Module\Monitoring\Command\IcingaCommand;
+
 /**
  * Delete a host or service downtime
  */
-class DeleteDowntimeCommand extends ObjectCommand
+class DeleteDowntimeCommand extends IcingaCommand
 {
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\Object\ObjectCommand::$allowedObjects For the property documentation.
+     * Downtime for a host
      */
-    protected $allowedObjects = array(
-        self::TYPE_HOST,
-        self::TYPE_SERVICE
-    );
+    const DOWNTIME_TYPE_HOST = 'host';
+
+    /**
+     * Downtime for a service
+     */
+    const DOWNTIME_TYPE_SERVICE = 'service';
 
     /**
      * ID of the downtime that is to be deleted
@@ -23,6 +26,31 @@ class DeleteDowntimeCommand extends ObjectCommand
      * @var int
      */
     protected $downtimeId;
+    
+    /**
+     *
+     * @var type
+     */
+    protected $downtimeType = self::DOWNTIME_TYPE_HOST;
+    
+    /**
+     * Set the downtime type, either host or service
+     *
+     * @param string $type  the downtime type
+     */
+    public function setDowntimeType($type)
+    {
+        $this->downtimeType = $type;
+    }
+    
+    /**
+     * 
+     * @return type
+     */
+    public function getDowntimeType()
+    {
+        return $this->downtimeType;
+    }
 
     /**
      * Set the ID of the downtime that is to be deleted
diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
index cf88d7d2e..83fbd4364 100644
--- a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
@@ -337,7 +337,7 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
 
     public function renderDeleteDowntime(DeleteDowntimeCommand $command)
     {
-        if ($command->getObject()->getType() === $command::TYPE_HOST) {
+        if ($command->getDowntimeType() === 'host') {
             $commandString = 'DEL_HOST_DOWNTIME';
         } else {
             $commandString = 'DEL_SVC_DOWNTIME';
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 04102e9d2..42060d2f0 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -90,7 +90,7 @@ abstract class MonitoredObjectController extends Controller
         if (! empty($this->object->downtimes) && $auth->hasPermission('monitoring/command/downtime/delete')) {
             $delDowntimeForm = new DeleteDowntimeCommandForm();
             $delDowntimeForm
-                ->setObjects($this->object)
+                ->setDowntimes($this->object->downtimes)
                 ->handleRequest();
             $this->view->delDowntimeForm = $delDowntimeForm;
         }
@@ -147,16 +147,6 @@ abstract class MonitoredObjectController extends Controller
         $this->handleCommandForm(new DeleteCommentCommandForm());
     }
 
-    /**
-     * Delete a downtime
-     */
-    public function deleteDowntimeAction()
-    {
-        $this->assertHttpMethod('POST');
-        $this->assertPermission('monitoring/command/downtime/delete');
-        $this->handleCommandForm(new DeleteDowntimeCommandForm());
-    }
-
     /**
      * Create tabs
      */

From be566746a94544ba86b9ad64d4e07cbeca644227 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 30 Apr 2015 13:43:30 +0200
Subject: [PATCH 1450/2920] Provide downtime header in remove and remove-all
 commands

Add new show script for downtimes and move downtime headers into partials to deduplicate code.

refs #8902
---
 .../views/scripts/downtime/remove.phtml       | 11 +++
 .../views/scripts/downtime/show.phtml         | 71 +-------------
 .../views/scripts/downtimes/remove-all.phtml  | 12 +++
 .../views/scripts/downtimes/show.phtml        | 96 +------------------
 .../partials/downtime/downtime-header.phtml   | 67 +++++++++++++
 .../partials/downtime/downtimes-header.phtml  | 92 ++++++++++++++++++
 6 files changed, 187 insertions(+), 162 deletions(-)
 create mode 100644 modules/monitoring/application/views/scripts/downtime/remove.phtml
 create mode 100644 modules/monitoring/application/views/scripts/downtimes/remove-all.phtml
 create mode 100644 modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
 create mode 100644 modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml

diff --git a/modules/monitoring/application/views/scripts/downtime/remove.phtml b/modules/monitoring/application/views/scripts/downtime/remove.phtml
new file mode 100644
index 000000000..57fe36655
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/downtime/remove.phtml
@@ -0,0 +1,11 @@
+<div class="controls">
+       
+  <?php if (! $this->compact): ?>
+    <?= $this->tabs; ?>
+  <?php endif ?>
+
+  <?= $this->render('partials/downtime/downtime-header.phtml'); ?>
+</div>
+<div class="content object-command">
+    <?= $delDowntimeForm; ?>
+</div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/downtime/show.phtml b/modules/monitoring/application/views/scripts/downtime/show.phtml
index 6ecc11a7b..aed35b9ac 100644
--- a/modules/monitoring/application/views/scripts/downtime/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtime/show.phtml
@@ -3,75 +3,8 @@
         <?= $this->tabs; ?>
     <?php endif ?>
     
-    <table class="action">
-        <tr class="state <?= $stateName; ?><?= $downtime->is_in_effect ? ' handled' : ''; ?>">
-        <td class="state">
-          <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
-          <br>
-            <?=
-            $this->dateTimeRenderer(
-                ($downtime->is_in_effect ? $downtime->end : $downtime->start),
-                true
-            )->render(
-                $this->translate('on %s', 'datetime'),
-                $this->translate('at %s', 'time'),
-                $this->translate('in %s', 'timespan')
-            );
-            ?>
-        </td>
-        <td>
-          <small>
-            <?php if ($downtime->is_flexible): ?>
-                <?php if ($downtime->is_in_effect): ?>
-                  <?= sprintf(
-                    $this->isService
-                      ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
-                      : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
-                    date('d.m.y', $downtime->start),
-                    date('H:i', $downtime->start),
-                    $this->format()->duration($downtime->duration),
-                    date('d.m.y', $downtime->end),
-                    date('H:i', $downtime->end)
-                  ); ?>
-                <?php else: ?>
-                  <?= sprintf(
-                    $this->isService
-                      ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
-                      : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
-                    date('d.m.y H:i', $downtime->scheduled_start),
-                    date('d.m.y H:i', $downtime->scheduled_end),
-                    $this->format()->duration($downtime->duration)
-                  ); ?>
-                <?php endif ?>
-                <?php else: ?>
-                  <?php if ($downtime->is_in_effect): ?>
-                    <?= sprintf(
-                      $this->isService
-                        ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
-                        : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
-                      date('d.m.y', $downtime->start),
-                      date('H:i', $downtime->start),
-                      date('d.m.y', $downtime->end),
-                      date('H:i', $downtime->end)
-                    ); ?>
-                  <?php else: ?>
-                    <?= sprintf(
-                      $this->isService
-                        ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
-                        : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
-                      date('d.m.y', $downtime->scheduled_start),
-                      date('H:i', $downtime->scheduled_start),
-                      date('d.m.y', $downtime->scheduled_end),
-                      date('H:i', $downtime->scheduled_end)
-                    ); ?>
-                  <?php endif ?>
-                <?php endif ?>
-          </small>
-        </td>
-      </tr>
-    </table>
+    <?= $this->render('partials/downtime/downtime-header.phtml'); ?>
 </div>
-
 <div class="content">
     <h3><?= $this->translate('Downtime detail information') ?></h3>
 <table class="avp"> 
@@ -177,7 +110,7 @@
     <tr class="newsection">
       <th><?= $this->translate('Commands') ?></th>
       <td>
-        <?= $delDowntimeForm;?>
+        <?= $delDowntimeForm ?>
       </td>
     </tr>
     <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/downtimes/remove-all.phtml b/modules/monitoring/application/views/scripts/downtimes/remove-all.phtml
new file mode 100644
index 000000000..fed0e12f7
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/downtimes/remove-all.phtml
@@ -0,0 +1,12 @@
+<div class="controls">
+    
+  <?php if (! $this->compact): ?>
+    <?= $this->tabs; ?>
+  <?php endif ?>
+
+  <?= $this->render('partials/downtime/downtimes-header.phtml'); ?>
+</div>
+
+<div class="content object-command">
+    <?= $delDowntimeForm ?>
+</div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/downtimes/show.phtml b/modules/monitoring/application/views/scripts/downtimes/show.phtml
index caff167f2..98999f012 100644
--- a/modules/monitoring/application/views/scripts/downtimes/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtimes/show.phtml
@@ -3,98 +3,8 @@
   <?php if (! $this->compact): ?>
     <?= $this->tabs; ?>
   <?php endif ?>
-<p>
-  <table class="action">
-    <tbody>
-    <?php $i = 0; foreach ($downtimes as $downtime):
-        if (++ $i > 5) {
-            continue;
-        } ?>
-        <tr class="state <?= $downtime->stateText ?>">
-          <td class="state">
-            <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
-            <br>
-            <?=
-                $this->dateTimeRenderer(
-                    ($downtime->is_in_effect ? $downtime->end : $downtime->start),
-                    true
-                )->render(
-                    $this->translate('on %s', 'datetime'),
-                    $this->translate('at %s', 'time'),
-                    $this->translate('in %s', 'timespan')
-                );
-            ?>
-          </td>
-          <td class="name oneline">
-            <?php if ($downtime->isService): ?>
-                <?= $this->icon('service', $this->translate('Service')) ?>
-                <b><?= $downtime->service ?> on <?= $downtime->host_name ?>.</b>
-            <?php else: ?>
-                 <?= $this->icon('host', $this->translate('Host')) ?>
-                <b><?= $downtime->host_name ?>.</b>
-            <?php endif; ?>
-                
-            <?php if ($downtime->is_flexible): ?>
-              <?php if ($downtime->is_in_effect): ?>
-                <?= sprintf(
-                  $this->isService
-                    ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
-                    : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
-                  date('d.m.y', $downtime->start),
-                  date('H:i', $downtime->start),
-                  $this->format()->duration($downtime->duration),
-                  date('d.m.y', $downtime->end),
-                  date('H:i', $downtime->end)
-                ); ?>
-              <?php else: ?>
-                <?= sprintf(
-                  $this->isService
-                    ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
-                    : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
-                  date('d.m.y H:i', $downtime->scheduled_start),
-                  date('d.m.y H:i', $downtime->scheduled_end),
-                  $this->format()->duration($downtime->duration)
-                ); ?>
-              <?php endif ?>
-            <?php else: ?>
-              <?php if ($downtime->is_in_effect): ?>
-                <?= sprintf(
-                  $this->isService
-                    ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
-                    : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
-                  date('d.m.y', $downtime->start),
-                  date('H:i', $downtime->start),
-                  date('d.m.y', $downtime->end),
-                  date('H:i', $downtime->end)
-                ); ?>
-              <?php else: ?>
-                <?= sprintf(
-                  $this->isService
-                    ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
-                    : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
-                  date('d.m.y', $downtime->scheduled_start),
-                  date('H:i', $downtime->scheduled_start),
-                  date('d.m.y', $downtime->scheduled_end),
-                  date('H:i', $downtime->scheduled_end)
-                ); ?>
-              <?php endif ?>
-            <?php endif ?>
-            </td>
-        </tr>
-    <?php endforeach; ?>
-    </tbody>
-  </table>
-  <p> 
-    <?= $this->qlink(
-        sprintf($this->translate('List all %d downtimes …'), count($downtimes)),
-        $listAllLink,
-        null,
-        array(
-            'title' => $this->translate('List all'),
-            'data-base-target' => "_next"
-        )
-    ) ?>
-  </p>
+
+  <?= $this->render('partials/downtime/downtimes-header.phtml'); ?> 
 </p>
 </div>
 <div class="content">
@@ -119,5 +29,5 @@
         )
     ) ?>
     </div>
-  </p>
+    </p>
 </div>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
new file mode 100644
index 000000000..92759a12a
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
@@ -0,0 +1,67 @@
+<table class="action">
+  <tr class="state <?= $stateName; ?><?= $downtime->is_in_effect ? ' handled' : ''; ?>">
+    <td class="state">
+      <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
+      <br>
+        <?=
+        $this->dateTimeRenderer(
+            ($downtime->is_in_effect ? $downtime->end : $downtime->start),
+            true
+        )->render(
+            $this->translate('on %s', 'datetime'),
+            $this->translate('at %s', 'time'),
+            $this->translate('in %s', 'timespan')
+        );
+        ?>
+    </td>
+    <td>
+      <small>
+        <?php if ($downtime->is_flexible): ?>
+            <?php if ($downtime->is_in_effect): ?>
+              <?= sprintf(
+                $this->isService
+                  ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
+                  : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
+                date('d.m.y', $downtime->start),
+                date('H:i', $downtime->start),
+                $this->format()->duration($downtime->duration),
+                date('d.m.y', $downtime->end),
+                date('H:i', $downtime->end)
+              ); ?>
+            <?php else: ?>
+              <?= sprintf(
+                $this->isService
+                  ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
+                  : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
+                date('d.m.y H:i', $downtime->scheduled_start),
+                date('d.m.y H:i', $downtime->scheduled_end),
+                $this->format()->duration($downtime->duration)
+              ); ?>
+            <?php endif ?>
+            <?php else: ?>
+              <?php if ($downtime->is_in_effect): ?>
+                <?= sprintf(
+                  $this->isService
+                    ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
+                    : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
+                  date('d.m.y', $downtime->start),
+                  date('H:i', $downtime->start),
+                  date('d.m.y', $downtime->end),
+                  date('H:i', $downtime->end)
+                ); ?>
+              <?php else: ?>
+                <?= sprintf(
+                  $this->isService
+                    ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
+                    : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
+                  date('d.m.y', $downtime->scheduled_start),
+                  date('H:i', $downtime->scheduled_start),
+                  date('d.m.y', $downtime->scheduled_end),
+                  date('H:i', $downtime->scheduled_end)
+                ); ?>
+              <?php endif ?>
+            <?php endif ?>
+      </small>
+    </td>
+  </tr>
+</table>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
new file mode 100644
index 000000000..54cd0210c
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -0,0 +1,92 @@
+ <table class="action">
+    <tbody>
+    <?php $i = 0; foreach ($downtimes as $downtime):
+        if (++ $i > 5) {
+            continue;
+        } ?>
+        <tr class="state <?= $downtime->stateText ?>">
+          <td class="state">
+            <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
+            <br>
+            <?=
+                $this->dateTimeRenderer(
+                    ($downtime->is_in_effect ? $downtime->end : $downtime->start),
+                    true
+                )->render(
+                    $this->translate('on %s', 'datetime'),
+                    $this->translate('at %s', 'time'),
+                    $this->translate('in %s', 'timespan')
+                );
+            ?>
+          </td>
+          <td class="name oneline">
+            <?php if ($downtime->isService): ?>
+                <?= $this->icon('service', $this->translate('Service')) ?>
+                <b><?= $downtime->service ?> on <?= $downtime->host_name ?>.</b>
+            <?php else: ?>
+                 <?= $this->icon('host', $this->translate('Host')) ?>
+                <b><?= $downtime->host_name ?>.</b>
+            <?php endif; ?>
+                
+            <?php if ($downtime->is_flexible): ?>
+              <?php if ($downtime->is_in_effect): ?>
+                <?= sprintf(
+                  $this->isService
+                    ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
+                    : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
+                  date('d.m.y', $downtime->start),
+                  date('H:i', $downtime->start),
+                  $this->format()->duration($downtime->duration),
+                  date('d.m.y', $downtime->end),
+                  date('H:i', $downtime->end)
+                ); ?>
+              <?php else: ?>
+                <?= sprintf(
+                  $this->isService
+                    ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
+                    : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
+                  date('d.m.y H:i', $downtime->scheduled_start),
+                  date('d.m.y H:i', $downtime->scheduled_end),
+                  $this->format()->duration($downtime->duration)
+                ); ?>
+              <?php endif ?>
+            <?php else: ?>
+              <?php if ($downtime->is_in_effect): ?>
+                <?= sprintf(
+                  $this->isService
+                    ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
+                    : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
+                  date('d.m.y', $downtime->start),
+                  date('H:i', $downtime->start),
+                  date('d.m.y', $downtime->end),
+                  date('H:i', $downtime->end)
+                ); ?>
+              <?php else: ?>
+                <?= sprintf(
+                  $this->isService
+                    ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
+                    : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
+                  date('d.m.y', $downtime->scheduled_start),
+                  date('H:i', $downtime->scheduled_start),
+                  date('d.m.y', $downtime->scheduled_end),
+                  date('H:i', $downtime->scheduled_end)
+                ); ?>
+              <?php endif ?>
+            <?php endif ?>
+            </td>
+        </tr>
+    <?php endforeach; ?>
+    </tbody>
+  </table>
+
+  <p> 
+    <?= $this->qlink(
+        sprintf($this->translate('List all %d downtimes …'), count($downtimes)),
+        $listAllLink,
+        null,
+        array(
+            'title' => $this->translate('List all'),
+            'data-base-target' => "_next"
+        )
+    ) ?>
+  </p>
\ No newline at end of file

From a46dece13650902ee130391bc71002c7beb96098 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 30 Apr 2015 16:30:04 +0200
Subject: [PATCH 1451/2920] Provie link to detail view in downtime partial

refs #8902
---
 .../scripts/show/components/downtime.phtml     | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index b338f8a71..bfb9bbf45 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -47,12 +47,15 @@ foreach ($object->downtimes as $downtime) {
     ) : $this->escape($downtime->comment);
 
     if ((bool) $downtime->is_in_effect) {
-        $state = 'in downtime since ' . $this->timeSince($downtime->start);
+        $state = 'in downtime since ';
+        $time = $this->timeSince($downtime->start);
     } else {
         if ((bool) $downtime->is_fixed) {
-            $state = 'scheduled ' . $this->timeUntil($downtime->start);
+            $state = 'scheduled ';
+            $time = $this->timeUntil($downtime->start);
         } else {
-            $state = 'scheduled flexible ' . $this->timeUntil($downtime->start);
+            $state = 'scheduled flexible ';
+            $time = $this->timeUntil($downtime->start);
         }
     }
 
@@ -65,7 +68,14 @@ foreach ($object->downtimes as $downtime) {
                 $delDowntimeForm->populate(array('downtime_id' => $downtime->id));
                 echo $delDowntimeForm;
             } ?>
-            <span class="sr-only"><?= $this->translate('Downtime'); ?></span><?= $state; ?> - <?= str_replace(array('\r\n', '\n'), '<br>', $commentText); ?>
+            <span class="sr-only"><?= $this->translate('Downtime'); ?></span>
+            <?= 
+            $this->qlink(
+                $state,
+                'monitoring/downtime/show',
+                array('downtime_id' => $downtime->id),
+                array('data-base-target'  => '_next')
+            ) . $time ; ?> - <?= str_replace(array('\r\n', '\n'), '<br>', $commentText); ?>
         </td>
     </tr>
 <?php } // endforeach ?>

From d316b31cbb5358df479a7370b6152196909a4294 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 30 Apr 2015 16:50:55 +0200
Subject: [PATCH 1452/2920] Fix downtime removal command in detail view

Use removal command for single downtimes in detail view. Move removing single and multiple downtimees into seperate forms.

refs #8902
---
 .../controllers/DowntimeController.php        | 18 ++--
 .../controllers/DowntimesController.php       |  4 +-
 .../controllers/ListController.php            |  4 +-
 .../Object/DeleteDowntimeCommandForm.php      | 95 +++++++++++--------
 .../Object/DeleteDowntimeQuickCommandForm.php | 36 -------
 .../Object/DeleteDowntimesCommandForm.php     | 89 +++++++++++++++++
 .../Controller/MonitoredObjectController.php  |  4 +-
 7 files changed, 159 insertions(+), 91 deletions(-)
 delete mode 100644 modules/monitoring/application/forms/Command/Object/DeleteDowntimeQuickCommandForm.php
 create mode 100644 modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php

diff --git a/modules/monitoring/application/controllers/DowntimeController.php b/modules/monitoring/application/controllers/DowntimeController.php
index 086e39f10..7a769b4d6 100644
--- a/modules/monitoring/application/controllers/DowntimeController.php
+++ b/modules/monitoring/application/controllers/DowntimeController.php
@@ -4,7 +4,7 @@
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Module\Monitoring\Object\Host;
-use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeQuickCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 
@@ -100,11 +100,17 @@ class Monitoring_DowntimeController extends Controller
     {
         $this->assertPermission('monitoring/command/downtime/delete');
         
-        $delDowntimeForm = new DeleteDowntimeQuickCommandForm();
-        $delDowntimeForm->setDowntimes(array($this->downtime))
-            ->populate(
-                array('redirect' => Url::fromPath('monitoring/list/downtimes'))
-            );
+        $delDowntimeForm = new DeleteDowntimeCommandForm();
+        $delDowntimeForm->setAction(
+            Url::fromPath('monitoring/downtime/show')
+                ->setParam('downtime_id', $this->downtime->id)
+        );
+        $delDowntimeForm->populate(
+            array(
+                'redirect' => Url::fromPath('monitoring/list/downtimes'),
+                'downtime_id' => $this->downtime->id
+            )
+        );
         $delDowntimeForm->handleRequest();
         return $delDowntimeForm;
     }
diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php
index 608e3c9fc..28ba76cb4 100644
--- a/modules/monitoring/application/controllers/DowntimesController.php
+++ b/modules/monitoring/application/controllers/DowntimesController.php
@@ -5,7 +5,7 @@ use Icinga\Data\Filter\Filter;
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Module\Monitoring\Object\Host;
-use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimesCommandForm;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 
@@ -107,7 +107,7 @@ class Monitoring_DowntimesController extends Controller
         $this->view->downtimes = $this->downtimes;
         $this->view->listAllLink = Url::fromPath('monitoring/list/downtimes')
                 ->setQueryString($this->filter->toQueryString());
-        $delDowntimeForm = new DeleteDowntimeCommandForm();
+        $delDowntimeForm = new DeleteDowntimesCommandForm();
         $delDowntimeForm->setTitle($this->view->translate('Remove all Downtimes'));
         $delDowntimeForm->addDescription(sprintf(
             $this->translate('Confirm removal of %d downtimes.'),
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index b0b0d9f2e..e6147c31b 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -4,7 +4,7 @@
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Backend;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
-use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeQuickCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 use Icinga\Web\Widget\Tabextension\OutputFormat;
@@ -294,7 +294,7 @@ class Monitoring_ListController extends Controller
         ));
 
         if ($this->Auth()->hasPermission('monitoring/command/downtime/delete')) {
-            $this->view->delDowntimeForm = new DeleteDowntimeQuickCommandForm();
+            $this->view->delDowntimeForm = new DeleteDowntimeCommandForm();
         }
     }
 
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
index 72728cd5a..8862c2b53 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -12,8 +12,6 @@ use Icinga\Web\Notification;
  */
 class DeleteDowntimeCommandForm extends CommandForm
 {
-    protected $downtimes;
-    
     /**
      * (non-PHPDoc)
      * @see \Zend_Form::init() For the method documentation.
@@ -22,50 +20,76 @@ class DeleteDowntimeCommandForm extends CommandForm
     {
         $this->setAttrib('class', 'inline');
     }
-
-    /**
+    
+        /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::createElements() For the method documentation.
      */
     public function createElements(array $formData = array())
     {
-        $this->addElements(array(
+        $this->addElements(
             array(
-                'hidden',
-                'redirect',
                 array(
-                    'decorators' => array('ViewHelper')
+                    'hidden',
+                    'downtime_id',
+                    array(
+                        'decorators' => array('ViewHelper')
+                    )
+                ),
+                array(
+                    'hidden',
+                    'redirect',
+                    array(
+                        'decorators' => array('ViewHelper')
+                    )
                 )
             )
-        ));
+        );
         return $this;
     }
- 
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
-     */
-    public function getSubmitLabel()
-    {
-        return $this->translatePlural('Remove', 'Remove All', count($this->downtimes));
-    }
     
     /**
      * (non-PHPDoc)
-     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     * @see \Icinga\Web\Form::addSubmitButton() For the method documentation.
+     */
+    public function addSubmitButton()
+    {
+        $this->addElement(
+            'button',
+            'btn_submit',
+            array(
+                'ignore'        => true,
+                'escape'        => false,
+                'type'          => 'submit',
+                'class'         => 'link-like',
+                'label'         => $this->getView()->icon('trash'),
+                'title'         => $this->translate('Delete this downtime'),
+                'decorators'    => array('ViewHelper')
+            )
+        );
+        return $this;
+    }
+   
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::onSuccess() For  the method documentation.
      */
     public function onSuccess()
     {
-        foreach ($this->downtimes as $downtime) {
-            $delDowntime = new DeleteDowntimeCommand();
-            $delDowntime->setDowntimeId($downtime->id);
-            $delDowntime->setDowntimeType(
-                    isset($downtime->service_description) ? 
-                    DeleteDowntimeCommand::DOWNTIME_TYPE_SERVICE :
-                    DeleteDowntimeCommand::DOWNTIME_TYPE_HOST
-            );
-            $this->getTransport($this->request)->send($delDowntime);
-        }
+        $id = $this->getElement('downtime_id')->getValue();
+        
+        // Presence of downtime id, only delete this specific downtime
+        $firstDowntime = $this->downtimes[0];
+        
+        $delDowntime = new DeleteDowntimeCommand();
+        $delDowntime->setDowntimeId($id);
+        $delDowntime->setDowntimeType(
+            isset($firstDowntime->service_description) ? 
+            DeleteDowntimeCommand::DOWNTIME_TYPE_SERVICE :
+            DeleteDowntimeCommand::DOWNTIME_TYPE_HOST
+        );
+        $this->getTransport($this->request)->send($delDowntime);
+        
         $redirect = $this->getElement('redirect')->getValue();
         if (! empty($redirect)) {
             $this->setRedirectUrl($redirect);
@@ -73,17 +97,4 @@ class DeleteDowntimeCommandForm extends CommandForm
         Notification::success($this->translate('Deleting downtime.'));
         return true;
     }
-    
-    /**
-     * Set the downtimes to be deleted upon success
-     * 
-     * @param type $downtimes
-     * 
-     * @return $this
-     */
-    public function setDowntimes($downtimes)
-    {
-        $this->downtimes = $downtimes;
-        return $this;
-    }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeQuickCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeQuickCommandForm.php
deleted file mode 100644
index adbfcae43..000000000
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeQuickCommandForm.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\Module\Monitoring\Forms\Command\Object;
-
-use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand;
-use \Icinga\Module\Monitoring\Forms\Command\CommandForm;
-use Icinga\Web\Notification;
-
-/**
- * Form for deleting host or service downtimes
- */
-class DeleteDowntimeQuickCommandForm extends DeleteDowntimeCommandForm
-{
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::addSubmitButton() For the method documentation.
-     */
-    public function addSubmitButton()
-    {
-        $this->addElement(
-            'button',
-            'btn_submit',
-            array(
-                'ignore'        => true,
-                'escape'        => false,
-                'type'          => 'submit',
-                'class'         => 'link-like',
-                'label'         => $this->getView()->icon('trash'),
-                'title'         => $this->translate('Delete this downtime'),
-                'decorators'    => array('ViewHelper')
-            )
-        );
-        return $this;
-    }
-}
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
new file mode 100644
index 000000000..f460f3601
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
@@ -0,0 +1,89 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Forms\Command\Object;
+
+use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand;
+use \Icinga\Module\Monitoring\Forms\Command\CommandForm;
+use Icinga\Web\Notification;
+
+/**
+ * Form for deleting host or service downtimes
+ */
+class DeleteDowntimesCommandForm extends CommandForm
+{
+    protected $downtimes;
+    
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setAttrib('class', 'inline');
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     */
+    public function createElements(array $formData = array())
+    {
+        $this->addElements(array(
+            array(
+                    'hidden',
+                    'redirect',
+                    array(
+                        'decorators' => array('ViewHelper')
+                    )
+                )
+        ));
+        return $this;
+    }
+ 
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
+     */
+    public function getSubmitLabel()
+    {
+        return $this->translatePlural('Remove', 'Remove All', count($this->downtimes));
+    }
+    
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     */
+    public function onSuccess()
+    {
+        foreach ($this->downtimes as $downtime) {
+            $delDowntime = new DeleteDowntimeCommand();
+            $delDowntime->setDowntimeId($downtime->id);
+            $delDowntime->setDowntimeType(
+                isset($downtime->service_description) ? 
+                DeleteDowntimeCommand::DOWNTIME_TYPE_SERVICE :
+                DeleteDowntimeCommand::DOWNTIME_TYPE_HOST
+            );
+            $this->getTransport($this->request)->send($delDowntime);
+        }
+        $redirect = $this->getElement('redirect')->getValue();
+        if (! empty($redirect)) {
+            $this->setRedirectUrl($redirect);
+        }
+        Notification::success($this->translate('Deleting downtime.'));
+        return true;
+    }
+    
+    /**
+     * Set the downtimes to be deleted upon success
+     * 
+     * @param type $downtimes
+     * 
+     * @return $this
+     */
+    public function setDowntimes($downtimes)
+    {
+        $this->downtimes = $downtimes;
+        return $this;
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 42060d2f0..94d9f6399 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -89,9 +89,7 @@ abstract class MonitoredObjectController extends Controller
         }
         if (! empty($this->object->downtimes) && $auth->hasPermission('monitoring/command/downtime/delete')) {
             $delDowntimeForm = new DeleteDowntimeCommandForm();
-            $delDowntimeForm
-                ->setDowntimes($this->object->downtimes)
-                ->handleRequest();
+            $delDowntimeForm->handleRequest();
             $this->view->delDowntimeForm = $delDowntimeForm;
         }
         $this->view->object = $this->object;

From dedc1759672c1ef8e2e2f4ff10c31d9cee4512d5 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 30 Apr 2015 18:18:09 +0200
Subject: [PATCH 1453/2920] Add basic comment detail view

refs #8903
---
 .../controllers/CommentController.php         | 88 +++++++++++++++++++
 .../views/scripts/comment/show.phtml          | 76 ++++++++++++++++
 .../views/scripts/list/comments.phtml         | 35 ++++++--
 .../partials/comment/comment-header.phtml     | 57 ++++++++++++
 4 files changed, 248 insertions(+), 8 deletions(-)
 create mode 100644 modules/monitoring/application/controllers/CommentController.php
 create mode 100644 modules/monitoring/application/views/scripts/comment/show.phtml
 create mode 100644 modules/monitoring/application/views/scripts/partials/comment/comment-header.phtml

diff --git a/modules/monitoring/application/controllers/CommentController.php b/modules/monitoring/application/controllers/CommentController.php
new file mode 100644
index 000000000..8d700770b
--- /dev/null
+++ b/modules/monitoring/application/controllers/CommentController.php
@@ -0,0 +1,88 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+use Icinga\Module\Monitoring\Controller;
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
+use Icinga\Web\Url;
+use Icinga\Web\Widget\Tabextension\DashboardAction;
+
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ * Display detailed information about a comment
+ */
+class Monitoring_CommentController extends Controller
+{
+    protected $comment;
+
+    /**
+     * Add tabs
+     */
+    public function init()
+    {
+        $commentId = $this->params->get('comment_id');
+         
+        $this->comment = $this->backend->select()->from('comment', array(
+            'id'         => 'comment_internal_id',      
+            'objecttype' => 'comment_objecttype',
+            'comment'    => 'comment_data',
+            'author'     => 'comment_author_name',    
+            'timestamp'  => 'comment_timestamp',
+            'type'       => 'comment_type',
+            'persistent' => 'comment_is_persistent',
+            'expiration' => 'comment_expiration',
+            'host_name',
+            'service_description',
+            'host_display_name',
+            'service_display_name'
+        ))->where('comment_internal_id', $commentId)->getQuery()->fetchRow();
+        
+        if (false === $this->comment) {
+            throw new Zend_Controller_Action_Exception($this->translate('Comment not found'));
+        }
+         
+        $this->getTabs()
+            ->add(
+                'comment',
+                array(
+                    'title' => $this->translate(
+                        'Display detailed information about a comment.'
+                    ),
+                    'icon' => 'comment',
+                    'label' => $this->translate('Comment'),
+                    'url'   =>'monitoring/comments/show'
+                )
+        )->activate('comment')->extend(new DashboardAction());
+    }
+    
+    public function showAction()
+    {
+        $this->view->comment = $this->comment;
+        if ($this->hasPermission('monitoring/command/comment/delete')) {
+            $this->view->delCommentForm = $this->createDelCommentForm();
+        }
+    }
+    
+    private function createDelCommentForm()
+    {
+        $this->assertPermission('monitoring/command/comment/delete');
+        
+        $delCommentForm = new DeleteCommentCommandForm();
+        $delCommentForm->setAction(
+            Url::fromPath('monitoring/comment/show')
+                ->setParam('comment_id', $this->comment->id)
+        );
+        $delCommentForm->populate(
+            array(
+                'redirect' => Url::fromPath('monitoring/list/comments'),
+                'comment_id' => $this->comment->id
+            )
+        );
+        $delCommentForm->handleRequest();
+        return $delCommentForm;
+    }
+}
diff --git a/modules/monitoring/application/views/scripts/comment/show.phtml b/modules/monitoring/application/views/scripts/comment/show.phtml
new file mode 100644
index 000000000..c5492a1cf
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/comment/show.phtml
@@ -0,0 +1,76 @@
+<div class="controls">   
+    <?php if (! $this->compact): ?>
+        <?= $this->tabs; ?>
+    <?php endif ?>
+    
+    <?= $this->render('partials/comment/comment-header.phtml'); ?>
+</div>
+<div class="content">
+    
+<h3><?= $this->translate('Comment detail information') ?></h3>
+<table class="avp"> 
+  <tbody>
+    <tr>
+      <?php if ($this->comment->objecttype === 'service'): ?>
+        <th> <?= $this->translate('Service') ?> </th> 
+        <td>
+          <?= $this->icon('service', $this->translate('Service')); ?>  
+          <?= $this->link()->service(
+           $this->comment->service_description,
+           $this->comment->service_display_name,
+           $this->comment->host_name,
+           $this->comment->host_display_name
+          ); ?>
+        </td>
+     <?php else: ?>
+        <th> <?= $this->translate('Host') ?> </th> 
+        <td>
+          <?= $this->icon('host', $this->translate('Host')); ?>
+          <?= $this->link()->host(
+                  $this->comment->host_name,
+                  $this->comment->host_display_name
+              ); ?>
+        </td> 
+     <?php endif ?>
+    </tr>
+
+    <tr>
+      <th><?= $this->translate('Author') ?></th>
+      <td><?= $this->icon('user', $this->translate('User')) ?> <?= $this->escape($this->comment->author) ?></td>
+    </tr>
+    
+    <tr>
+      <th><?= $this->translate('Persistent') ?></th>
+      <td><?= $this->escape($this->comment->persistent) ? $this->translate('Yes') : $this->translate('No') ?></td>
+    </tr>
+    
+    <tr>
+      <th><?= $this->translate('Created') ?></th>
+      <td><?= date('d.m.y H:i' ,$this->escape($this->comment->timestamp)) ?></td>
+    </tr>
+  
+    <tr>
+      <th><?= $this->translate('Expires') ?></th>
+      <td>
+          <?= $this->comment->expiration ? sprintf(
+              $this->translate('This comment expires on %s at %s.'),
+              date('d.m.y', $this->comment->expiration),
+              date('H:i', $this->comment->expiration)
+          ) : $this->translate('This comment does not expire.'); ?>
+      </td>
+    </tr>
+  
+    <?php if (isset($delCommentForm)): // Form is unset if the current user lacks the respective permission ?>
+    <tr class="newsection">
+      <th><?= $this->translate('Commands') ?></th>
+      <td>
+        <?= $delCommentForm ?>
+      </td>
+    </tr>
+    <?php endif ?>
+  
+  </tbody>
+</table>
+
+</div>
+
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 9f383345c..8810c6e67 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -15,7 +15,10 @@ if (count($comments) === 0) {
     return;
 }
 ?>
-  <table data-base-target="_next" class="action comments">
+  <table data-base-target="_next"
+         class="action comments multiselect" 
+         data-icinga-multiselect-url="/icingaweb2/monitoring/comments/show"
+         data-icinga-multiselect-data="downtime_id">
     <tbody>
     <?php foreach ($comments as $comment): ?>
     <?php
@@ -53,15 +56,31 @@ if (count($comments) === 0) {
         <td>
         <?php if ($comment->objecttype === 'service'): ?>
           <?= $this->icon('service', $this->translate('Service')); ?>
-          <?= $this->link()->service(
-              $comment->service_description,
-              $comment->service_display_name,
-              $comment->host_name,
-              $comment->host_display_name
-          ); ?>
+            
+          <?= $this->qlink(
+            sprintf(
+                $this->translate('%s on %s', 'Service running on host'),
+                $comment->service_display_name,
+                $comment->host_display_name
+            ),
+            'monitoring/comment/show',
+            array('comment_id' => $comment->id),
+            array('title' => sprintf(
+                $this->translate('Show detailed information for comment on %s for %s'),
+                $comment->service_display_name,
+                $comment->host_display_name
+          ))) ?>
         <?php else: ?>
           <?= $this->icon('host', $this->translate('Host')); ?>
-          <?= $this->link()->host($comment->host_name, $comment->host_display_name); ?>
+            
+          <?= $this->qlink(
+            $comment->host_display_name,
+            'monitoring/comment/show',
+            array('comment_id' => $comment->id),
+            array('title' => sprintf(
+                $this->translate('Show detailed information for comment on %s'),
+                $comment->host_display_name
+          ))) ?>
         <?php endif ?>
           <br>
           <?= $this->icon('comment', $this->translate('Comment')); ?> <?= isset($comment->author)
diff --git a/modules/monitoring/application/views/scripts/partials/comment/comment-header.phtml b/modules/monitoring/application/views/scripts/partials/comment/comment-header.phtml
new file mode 100644
index 000000000..6b9a5c53e
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/comment/comment-header.phtml
@@ -0,0 +1,57 @@
+<table class="action">
+  <tr class="state invalid">
+    <td class="state">    
+    
+    <?php
+      switch ($comment->type) {
+        case 'flapping':
+          $icon = 'flapping';
+          $title = $this->translate('Flapping');
+          $tooltip = $this->translate('Comment was caused by a flapping host or service.');
+          break;
+        case 'comment':
+          $icon = 'user';
+          $title = $this->translate('User Comment');
+          $tooltip = $this->translate('Comment was created by an user.');
+          break;
+        case 'downtime':
+          $icon = 'plug';
+          $title = $this->translate('Downtime');
+          $tooltip = $this->translate('Comment was caused by a downtime.');
+          break;
+        case 'ack':
+          $icon = 'ok';
+          $title = $this->translate('Acknowledgement');
+          $tooltip = $this->translate('Comment was caused by an acknowledgement.');
+          break;
+      }
+    ?>
+        
+        <strong><?= $this->escape($title); ?></strong>
+        <br>
+        <?= $this->icon($icon, $tooltip) ?>
+        <?= $this->prefixedTimeSince($comment->timestamp); ?>
+    </td>
+        
+    <td>
+        <?php if ($comment->objecttype === 'service'): ?>
+          <?= $this->icon('service', $this->translate('Service')); ?>
+          <?= $this->link()->service(
+              $comment->service_description,
+              $comment->service_display_name,
+              $comment->host_name,
+              $comment->host_display_name
+          ); ?>
+        <?php else: ?>
+          <?= $this->icon('host', $this->translate('Host')); ?>
+          <?= $this->link()->host($comment->host_name, $comment->host_display_name); ?>
+        <?php endif ?>
+        
+        <br>
+          <?= $this->icon('comment', $this->translate('Comment')); ?> <?= isset($comment->author)
+            ? '[' . $comment->author . '] '
+            : '';
+          ?><?= $this->escape($comment->comment); ?>
+    </td>
+  </tr>
+</table>

From 32da02c16239ab8475e48e029d3c514e11742117 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 4 May 2015 14:30:25 +0200
Subject: [PATCH 1454/2920] Deduplicate comment views

Move comment detail and description into separate partial to reduce code duplication
---
 .../views/scripts/list/comments.phtml         | 36 ++-----------
 .../comment/comment-description.phtml         | 27 ++++++++++
 .../partials/comment/comment-detail.phtml     | 18 +++++++
 .../partials/comment/comment-header.phtml     | 51 +------------------
 4 files changed, 52 insertions(+), 80 deletions(-)
 create mode 100644 modules/monitoring/application/views/scripts/partials/comment/comment-description.phtml
 create mode 100644 modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 8810c6e67..248c40490 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -18,40 +18,14 @@ if (count($comments) === 0) {
   <table data-base-target="_next"
          class="action comments multiselect" 
          data-icinga-multiselect-url="/icingaweb2/monitoring/comments/show"
-         data-icinga-multiselect-data="downtime_id">
+         data-icinga-multiselect-data="comment_id">
     <tbody>
-    <?php foreach ($comments as $comment): ?>
-    <?php
-      switch ($comment->type) {
-        case 'flapping':
-          $icon = 'flapping';
-          $title = $this->translate('Flapping');
-          $tooltip = $this->translate('Comment was caused by a flapping host or service.');
-          break;
-        case 'comment':
-          $icon = 'user';
-          $title = $this->translate('User Comment');
-          $tooltip = $this->translate('Comment was created by an user.');
-          break;
-        case 'downtime':
-          $icon = 'plug';
-          $title = $this->translate('Downtime');
-          $tooltip = $this->translate('Comment was caused by a downtime.');
-          break;
-        case 'ack':
-          $icon = 'ok';
-          $title = $this->translate('Acknowledgement');
-          $tooltip = $this->translate('Comment was caused by an acknowledgement.');
-          break;
-      }
-    ?>
+    <?php foreach ($comments as $comment):
+        $this->comment = $comment; ?>
+
       <tr class="state invalid">
         <td class="state" style="width: 12em;">
-          <?= $this->icon($icon, $tooltip) ?>
-          <br>
-          <strong><?= $this->escape($title); ?></strong>
-          <br>
-          <?= $this->prefixedTimeSince($comment->timestamp); ?>
+          <?= $this->render('partials/comment/comment-description.phtml'); ?>
         </td>
         <td>
         <?php if ($comment->objecttype === 'service'): ?>
diff --git a/modules/monitoring/application/views/scripts/partials/comment/comment-description.phtml b/modules/monitoring/application/views/scripts/partials/comment/comment-description.phtml
new file mode 100644
index 000000000..2c5f07133
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/comment/comment-description.phtml
@@ -0,0 +1,27 @@
+<?php
+ switch ($comment->type) {
+    case 'flapping':
+        $icon = 'flapping';
+        $title = $this->translate('Flapping');
+        $tooltip = $this->translate('Comment was caused by a flapping host or service.');
+        break;
+    case 'comment':
+        $icon = 'user';
+        $title = $this->translate('User Comment');
+        $tooltip = $this->translate('Comment was created by an user.');
+        break;
+    case 'downtime':
+        $icon = 'plug';
+        $title = $this->translate('Downtime');
+        $tooltip = $this->translate('Comment was caused by a downtime.');
+        break;
+    case 'ack':
+        $icon = 'ok';
+        $title = $this->translate('Acknowledgement');
+        $tooltip = $this->translate('Comment was caused by an acknowledgement.');
+        break;
+}
+?>
+<strong><?= $this->escape($title); ?></strong><br>
+<?= $this->icon($icon, $tooltip) ?>
+<?= $this->prefixedTimeSince($comment->timestamp); ?>
diff --git a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
new file mode 100644
index 000000000..e31f1fdce
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
@@ -0,0 +1,18 @@
+<?php if ($comment->objecttype === 'service'): ?>
+    <?= $this->icon('service', $this->translate('Service')); ?>
+    <?= $this->link()->service(
+        $comment->service_description,
+        $comment->service_display_name,
+        $comment->host_name,
+        $comment->host_display_name
+    ); ?>
+<?php else: ?>
+    <?= $this->icon('host', $this->translate('Host')); ?>
+    <?= $this->link()->host($comment->host_name, $comment->host_display_name); ?>
+<?php endif ?>
+
+<br>
+<?= $this->icon('comment', $this->translate('Comment')); ?> <?= isset($comment->author)
+  ? '[' . $comment->author . '] '
+  : '';
+?><?= $this->escape($comment->comment); ?>
diff --git a/modules/monitoring/application/views/scripts/partials/comment/comment-header.phtml b/modules/monitoring/application/views/scripts/partials/comment/comment-header.phtml
index 6b9a5c53e..ce0eabe03 100644
--- a/modules/monitoring/application/views/scripts/partials/comment/comment-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/comment/comment-header.phtml
@@ -1,57 +1,10 @@
 <table class="action">
   <tr class="state invalid">
     <td class="state">    
-    
-    <?php
-      switch ($comment->type) {
-        case 'flapping':
-          $icon = 'flapping';
-          $title = $this->translate('Flapping');
-          $tooltip = $this->translate('Comment was caused by a flapping host or service.');
-          break;
-        case 'comment':
-          $icon = 'user';
-          $title = $this->translate('User Comment');
-          $tooltip = $this->translate('Comment was created by an user.');
-          break;
-        case 'downtime':
-          $icon = 'plug';
-          $title = $this->translate('Downtime');
-          $tooltip = $this->translate('Comment was caused by a downtime.');
-          break;
-        case 'ack':
-          $icon = 'ok';
-          $title = $this->translate('Acknowledgement');
-          $tooltip = $this->translate('Comment was caused by an acknowledgement.');
-          break;
-      }
-    ?>
-        
-        <strong><?= $this->escape($title); ?></strong>
-        <br>
-        <?= $this->icon($icon, $tooltip) ?>
-        <?= $this->prefixedTimeSince($comment->timestamp); ?>
+        <?= $this->render('partials/comment/comment-description.phtml'); ?>
     </td>
-        
     <td>
-        <?php if ($comment->objecttype === 'service'): ?>
-          <?= $this->icon('service', $this->translate('Service')); ?>
-          <?= $this->link()->service(
-              $comment->service_description,
-              $comment->service_display_name,
-              $comment->host_name,
-              $comment->host_display_name
-          ); ?>
-        <?php else: ?>
-          <?= $this->icon('host', $this->translate('Host')); ?>
-          <?= $this->link()->host($comment->host_name, $comment->host_display_name); ?>
-        <?php endif ?>
-        
-        <br>
-          <?= $this->icon('comment', $this->translate('Comment')); ?> <?= isset($comment->author)
-            ? '[' . $comment->author . '] '
-            : '';
-          ?><?= $this->escape($comment->comment); ?>
+        <?= $this->render('partials/comment/comment-detail.phtml'); ?>
     </td>
   </tr>
 </table>

From cab198eadc67b7274fde6dec2f21c989cbdd1e8f Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 4 May 2015 14:50:29 +0200
Subject: [PATCH 1455/2920] Fix whitespaces and unused comments

---
 .../application/controllers/DowntimesController.php       | 8 +-------
 .../application/views/scripts/downtimes/show.phtml        | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php
index 28ba76cb4..3a79a9f40 100644
--- a/modules/monitoring/application/controllers/DowntimesController.php
+++ b/modules/monitoring/application/controllers/DowntimesController.php
@@ -9,13 +9,6 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimesCommandForm;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
 /**
  * Display detailed information about a downtime
  */
@@ -58,6 +51,7 @@ class Monitoring_DowntimesController extends Controller
             'host_display_name',
             'service_display_name'
         ))->addFilter($this->filter)->getQuery()->fetchAll();
+
         if (false === $this->downtimes) {
             throw new Zend_Controller_Action_Exception(
                     $this->translate('Downtime not found')
diff --git a/modules/monitoring/application/views/scripts/downtimes/show.phtml b/modules/monitoring/application/views/scripts/downtimes/show.phtml
index 98999f012..35edc04f4 100644
--- a/modules/monitoring/application/views/scripts/downtimes/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtimes/show.phtml
@@ -29,5 +29,5 @@
         )
     ) ?>
     </div>
-    </p>
+  </p>
 </div>

From ca839d51236148d1de2d401e16eb8613bf55d02e Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 4 May 2015 14:51:26 +0200
Subject: [PATCH 1456/2920] Display amount of selected rows

refs #8903
---
 .../application/views/scripts/list/comments.phtml           | 6 ++++++
 .../application/views/scripts/list/downtimes.phtml          | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 248c40490..dd0c4a7f8 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -1,6 +1,12 @@
 <?php if (! $this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
+  <div class="dontprint">
+     <?= $this->render('list/components/selectioninfo.phtml'); ?>
+  </div>
+  <div class="tinystatesummary">
+     <?= $comments->getTotalItemCount() ?> <?= $this->translate('Comments') ?>:
+  </div>
   <?= $this->sortBox; ?>
   <?= $this->limiter; ?>
   <?= $this->paginator; ?>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index b21e3c3fb..f1351a225 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -5,6 +5,12 @@ use Icinga\Module\Monitoring\Object\Service;
 if (! $this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
+    <div class="dontprint">
+        <?= $this->render('list/components/selectioninfo.phtml'); ?>
+    </div>
+    <div class="tinystatesummary">
+        <?= $downtimes->getTotalItemCount() ?> <?= $this->translate('Downtimes') ?>
+    </div>
   <?= $this->sortBox; ?>
   <?= $this->limiter; ?>
   <?= $this->paginator; ?>

From 0c7d8ab48164a90ce55940f497eed43d8cc17ab4 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 4 May 2015 14:59:39 +0200
Subject: [PATCH 1457/2920] Add controlle for handling multiple comments

refs #8903
---
 .../controllers/CommentsController.php        | 86 +++++++++++++++++++
 .../views/scripts/comment/remove.phtml        | 11 +++
 .../views/scripts/comments/remove-all.phtml   | 12 +++
 .../views/scripts/comments/show.phtml         | 32 +++++++
 .../partials/comment/comment-header.phtml     |  2 +-
 .../partials/comment/comments-header.phtml    | 30 +++++++
 6 files changed, 172 insertions(+), 1 deletion(-)
 create mode 100644 modules/monitoring/application/controllers/CommentsController.php
 create mode 100644 modules/monitoring/application/views/scripts/comment/remove.phtml
 create mode 100644 modules/monitoring/application/views/scripts/comments/remove-all.phtml
 create mode 100644 modules/monitoring/application/views/scripts/comments/show.phtml
 create mode 100644 modules/monitoring/application/views/scripts/partials/comment/comments-header.phtml

diff --git a/modules/monitoring/application/controllers/CommentsController.php b/modules/monitoring/application/controllers/CommentsController.php
new file mode 100644
index 000000000..9e477d3bb
--- /dev/null
+++ b/modules/monitoring/application/controllers/CommentsController.php
@@ -0,0 +1,86 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+use Icinga\Module\Monitoring\Controller;
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
+use Icinga\Web\Url;
+use Icinga\Web\Widget\Tabextension\DashboardAction;
+use Icinga\Data\Filter\Filter;
+
+/**
+ * Display detailed information about a comment
+ */
+class Monitoring_CommentsController extends Controller
+{
+    protected $comments;
+
+    /**
+     * Add tabs
+     */
+    public function init()
+    {
+        $this->filter = Filter::fromQueryString(str_replace(
+                'comment_id',
+                'comment_internal_id',
+                (string)$this->params
+        ));
+        $this->comments = $this->backend->select()->from('comment', array(
+            'id'         => 'comment_internal_id',
+            'objecttype' => 'comment_objecttype',
+            'comment'    => 'comment_data',
+            'author'     => 'comment_author_name',
+            'timestamp'  => 'comment_timestamp',
+            'type'       => 'comment_type',
+            'persistent' => 'comment_is_persistent',
+            'expiration' => 'comment_expiration',
+            'host_name',
+            'service_description',
+            'host_display_name',
+            'service_display_name'
+        ))->addFilter($this->filter)->getQuery()->fetchAll();
+        
+        if (false === $this->comments) {
+            throw new Zend_Controller_Action_Exception($this->translate('Comment not found'));
+        }
+         
+        $this->getTabs()
+            ->add(
+                'comments',
+                array(
+                    'title' => $this->translate(
+                        'Display detailed information about multiple comments.'
+                    ),
+                    'icon' => 'comment',
+                    'label' => $this->translate('Comments'),
+                    'url'   =>'monitoring/comments/show'
+                )
+        )->activate('comments')->extend(new DashboardAction());
+    }
+    
+    public function showAction()
+    {
+        $this->view->comments = $this->comments;
+        $this->view->listAllLink = Url::fromPath('monitoring/list/comments')
+                ->setQueryString($this->filter->toQueryString());
+        $this->view->removeAllLink = Url::fromPath('monitoring/comments/remove-all')
+                ->setParams($this->params);
+    }
+
+    public function removeAllAction()
+    {
+        $this->assertPermission('monitoring/command/comment/delete');
+        $this->view->comments = $this->comments;
+        $this->view->listAllLink = Url::fromPath('monitoring/list/comments')
+                ->setQueryString($this->filter->toQueryString());
+        $delCommentForm = new DeleteCommentCommandForm();
+        $delCommentForm->setTitle($this->view->translate('Remove all Comments'));
+        $delCommentForm->addDescription(sprintf(
+            $this->translate('Confirm removal of %d comments.'),
+            count($this->comments)
+        ));
+        $delCommentForm->setObjects($this->comments)
+                ->setRedirectUrl(Url::fromPath('monitoring/list/downtimes'))
+                ->handleRequest();
+        $this->view->delCommentForm = $delCommentForm;
+    }
+}
diff --git a/modules/monitoring/application/views/scripts/comment/remove.phtml b/modules/monitoring/application/views/scripts/comment/remove.phtml
new file mode 100644
index 000000000..73f8c68a8
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/comment/remove.phtml
@@ -0,0 +1,11 @@
+<div class="controls">
+       
+  <?php if (! $this->compact): ?>
+    <?= $this->tabs; ?>
+  <?php endif ?>
+
+  <?= $this->render('partials/downtime/downtime-header.phtml'); ?>
+</div>
+<div class="content object-command">
+    <?= $delDowntimeForm; ?>
+</div>
diff --git a/modules/monitoring/application/views/scripts/comments/remove-all.phtml b/modules/monitoring/application/views/scripts/comments/remove-all.phtml
new file mode 100644
index 000000000..698c4eea7
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/comments/remove-all.phtml
@@ -0,0 +1,12 @@
+<div class="controls">
+    
+  <?php if (! $this->compact): ?>
+    <?= $this->tabs; ?>
+  <?php endif ?>
+
+  <?= $this->render('partials/comment/comments-header.phtml'); ?>
+</div>
+
+<div class="content object-command">
+    <?= $delCommentForm ?>
+</div>
diff --git a/modules/monitoring/application/views/scripts/comments/show.phtml b/modules/monitoring/application/views/scripts/comments/show.phtml
new file mode 100644
index 000000000..f54f3904a
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/comments/show.phtml
@@ -0,0 +1,32 @@
+<div class="controls">
+    <?php if (! $this->compact): ?>
+        <?= $this->tabs; ?>
+    <?php endif ?>
+    
+    <?= $this->render('partials/comment/comments-header.phtml'); ?>
+</div>
+
+<div class="content">
+  <h3><?= $this->icon('reschedule') ?> <?= $this->translate('Commands') ?> </h3>
+  <p>
+    <?= sprintf(
+            $this->translate('Issue commands to all %s selected comments.'),
+            '<b>' . count($comments) . '</b>'
+        )
+    ?>
+    <div>
+    <?= $this->qlink(
+        sprintf(
+            $this->translate('Remove all %d scheduled comments'),
+            count($comments)
+        ),
+        $removeAllLink,
+        null,
+        array(
+            'icon' => 'trash',
+            'title' => $this->translate('Remove all selected comments.')
+        )
+    ) ?>
+    </div>
+  </p>
+</div>
diff --git a/modules/monitoring/application/views/scripts/partials/comment/comment-header.phtml b/modules/monitoring/application/views/scripts/partials/comment/comment-header.phtml
index ce0eabe03..c3e0fadda 100644
--- a/modules/monitoring/application/views/scripts/partials/comment/comment-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/comment/comment-header.phtml
@@ -1,6 +1,6 @@
 <table class="action">
   <tr class="state invalid">
-    <td class="state">    
+    <td class="state" style="width: 12em;">
         <?= $this->render('partials/comment/comment-description.phtml'); ?>
     </td>
     <td>
diff --git a/modules/monitoring/application/views/scripts/partials/comment/comments-header.phtml b/modules/monitoring/application/views/scripts/partials/comment/comments-header.phtml
new file mode 100644
index 000000000..4ec725549
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/partials/comment/comments-header.phtml
@@ -0,0 +1,30 @@
+<table class="action">
+    <?php $i = 0; foreach ($comments as $comment):
+        if (++ $i > 5) {
+            continue;
+        }
+        $this->comment = $comment;
+    ?>
+
+        <tr class="state invalid">
+          <td class="state" style="width: 12em;">
+            <?= $this->render('partials/comment/comment-description.phtml'); ?>
+          </td>
+          <td>
+            <?= $this->render('partials/comment/comment-detail.phtml'); ?>
+          </td>
+        </tr>
+    <?php endforeach; ?>
+</table>
+
+<p>
+    <?= $this->qlink(
+        sprintf($this->translate('List all %d comments …'), count($comments)),
+        $listAllLink,
+        null,
+        array(
+            'title' => $this->translate('List all'),
+            'data-base-target' => "_next"
+        )
+    ) ?>
+</p>

From 6ff903c8a986355a3fb502e996e2f4cb53a66722 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 4 May 2015 15:04:33 +0200
Subject: [PATCH 1458/2920] Remove useless comments

---
 .../application/controllers/CommentController.php           | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/CommentController.php b/modules/monitoring/application/controllers/CommentController.php
index 8d700770b..9defa18fe 100644
--- a/modules/monitoring/application/controllers/CommentController.php
+++ b/modules/monitoring/application/controllers/CommentController.php
@@ -6,12 +6,6 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
 /**
  * Display detailed information about a comment
  */

From c71786a6241a386f25b4cb4a37579d713f81e913 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 4 May 2015 15:43:24 +0200
Subject: [PATCH 1459/2920] Remove useless comments

---
 .../application/controllers/CommentController.php        | 3 ---
 .../application/controllers/CommentsController.php       | 3 ---
 .../application/controllers/DowntimeController.php       | 9 ---------
 .../application/controllers/DowntimesController.php      | 3 ---
 4 files changed, 18 deletions(-)

diff --git a/modules/monitoring/application/controllers/CommentController.php b/modules/monitoring/application/controllers/CommentController.php
index 9defa18fe..a595ffeca 100644
--- a/modules/monitoring/application/controllers/CommentController.php
+++ b/modules/monitoring/application/controllers/CommentController.php
@@ -13,9 +13,6 @@ class Monitoring_CommentController extends Controller
 {
     protected $comment;
 
-    /**
-     * Add tabs
-     */
     public function init()
     {
         $commentId = $this->params->get('comment_id');
diff --git a/modules/monitoring/application/controllers/CommentsController.php b/modules/monitoring/application/controllers/CommentsController.php
index 9e477d3bb..85fddcb50 100644
--- a/modules/monitoring/application/controllers/CommentsController.php
+++ b/modules/monitoring/application/controllers/CommentsController.php
@@ -14,9 +14,6 @@ class Monitoring_CommentsController extends Controller
 {
     protected $comments;
 
-    /**
-     * Add tabs
-     */
     public function init()
     {
         $this->filter = Filter::fromQueryString(str_replace(
diff --git a/modules/monitoring/application/controllers/DowntimeController.php b/modules/monitoring/application/controllers/DowntimeController.php
index 7a769b4d6..dcf4dc373 100644
--- a/modules/monitoring/application/controllers/DowntimeController.php
+++ b/modules/monitoring/application/controllers/DowntimeController.php
@@ -8,12 +8,6 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
 /**
  * Display detailed information about a downtime
  */
@@ -23,9 +17,6 @@ class Monitoring_DowntimeController extends Controller
     
     protected $isService;
     
-    /**
-     * Add tabs
-     */
     public function init()
     {
         $downtimeId = $this->params->get('downtime_id');
diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php
index 3a79a9f40..bbd3e1bb4 100644
--- a/modules/monitoring/application/controllers/DowntimesController.php
+++ b/modules/monitoring/application/controllers/DowntimesController.php
@@ -18,9 +18,6 @@ class Monitoring_DowntimesController extends Controller
     
     protected $filter;
     
-    /**
-     * Add tabs
-     */
     public function init()
     {
         $this->filter = Filter::fromQueryString(str_replace(

From e6740c5093f591ac25c78d171b7a614a4ba228a7 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 4 May 2015 15:51:17 +0200
Subject: [PATCH 1460/2920] Set link target to next page in all comment views

refs #8903
---
 .../application/views/scripts/comment/show.phtml     |  8 +++++---
 .../application/views/scripts/comments/show.phtml    | 12 +++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/comment/show.phtml b/modules/monitoring/application/views/scripts/comment/show.phtml
index c5492a1cf..fa2682d2e 100644
--- a/modules/monitoring/application/views/scripts/comment/show.phtml
+++ b/modules/monitoring/application/views/scripts/comment/show.phtml
@@ -2,15 +2,17 @@
     <?php if (! $this->compact): ?>
         <?= $this->tabs; ?>
     <?php endif ?>
-    
-    <?= $this->render('partials/comment/comment-header.phtml'); ?>
+
+    <div data-base-target='_next'>
+        <?= $this->render('partials/comment/comment-header.phtml'); ?>
+    </div>
 </div>
 <div class="content">
     
 <h3><?= $this->translate('Comment detail information') ?></h3>
 <table class="avp"> 
   <tbody>
-    <tr>
+    <tr data-base-target='_next'>
       <?php if ($this->comment->objecttype === 'service'): ?>
         <th> <?= $this->translate('Service') ?> </th> 
         <td>
diff --git a/modules/monitoring/application/views/scripts/comments/show.phtml b/modules/monitoring/application/views/scripts/comments/show.phtml
index f54f3904a..6298749b2 100644
--- a/modules/monitoring/application/views/scripts/comments/show.phtml
+++ b/modules/monitoring/application/views/scripts/comments/show.phtml
@@ -1,9 +1,11 @@
 <div class="controls">
-    <?php if (! $this->compact): ?>
-        <?= $this->tabs; ?>
-    <?php endif ?>
-    
-    <?= $this->render('partials/comment/comments-header.phtml'); ?>
+  <?php if (! $this->compact): ?>
+      <?= $this->tabs; ?>
+  <?php endif ?>
+
+  <div data-base-target='_next'>
+     <?= $this->render('partials/comment/comments-header.phtml'); ?>
+  </div>
 </div>
 
 <div class="content">

From 5477a2f18e497fcd497168357bf784fa0cce6440 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 4 May 2015 16:01:14 +0200
Subject: [PATCH 1461/2920] Escape missing variables

refs #8903
---
 .../monitoring/application/views/scripts/list/comments.phtml    | 2 +-
 .../views/scripts/partials/comment/comment-detail.phtml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index dd0c4a7f8..ab9eb6548 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -64,7 +64,7 @@ if (count($comments) === 0) {
         <?php endif ?>
           <br>
           <?= $this->icon('comment', $this->translate('Comment')); ?> <?= isset($comment->author)
-            ? '[' . $comment->author . '] '
+            ? '[' . $this->escape($comment->author) . '] '
             : '';
           ?><?= $this->escape($comment->comment); ?>
           <br>
diff --git a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
index e31f1fdce..98ee0534b 100644
--- a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
+++ b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
@@ -13,6 +13,6 @@
 
 <br>
 <?= $this->icon('comment', $this->translate('Comment')); ?> <?= isset($comment->author)
-  ? '[' . $comment->author . '] '
+  ? '[' . $this->escape($comment->author) . '] '
   : '';
 ?><?= $this->escape($comment->comment); ?>

From e5e3e8030052e7cd0e983a649dcbe59fe3f0e8c7 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 4 May 2015 16:29:07 +0200
Subject: [PATCH 1462/2920] Conform to coding guidelines

---
 .../controllers/CommentController.php         | 49 +++++++++++++------
 .../controllers/CommentsController.php        | 45 +++++++++++------
 .../views/scripts/comment/show.phtml          |  2 +-
 .../views/scripts/list/comments.phtml         |  2 +-
 4 files changed, 65 insertions(+), 33 deletions(-)

diff --git a/modules/monitoring/application/controllers/CommentController.php b/modules/monitoring/application/controllers/CommentController.php
index a595ffeca..e5e181449 100644
--- a/modules/monitoring/application/controllers/CommentController.php
+++ b/modules/monitoring/application/controllers/CommentController.php
@@ -11,17 +11,27 @@ use Icinga\Web\Widget\Tabextension\DashboardAction;
  */
 class Monitoring_CommentController extends Controller
 {
+    /**
+     * The fetched comment
+     *
+     * @var stdClass
+     */
     protected $comment;
 
+    /**
+     * Fetch the first comment with the given id and add tabs
+     *
+     * @throws Zend_Controller_Action_Exception
+     */
     public function init()
     {
         $commentId = $this->params->get('comment_id');
          
         $this->comment = $this->backend->select()->from('comment', array(
-            'id'         => 'comment_internal_id',      
+            'id'         => 'comment_internal_id',
             'objecttype' => 'comment_objecttype',
             'comment'    => 'comment_data',
-            'author'     => 'comment_author_name',    
+            'author'     => 'comment_author_name',
             'timestamp'  => 'comment_timestamp',
             'type'       => 'comment_type',
             'persistent' => 'comment_is_persistent',
@@ -35,21 +45,23 @@ class Monitoring_CommentController extends Controller
         if (false === $this->comment) {
             throw new Zend_Controller_Action_Exception($this->translate('Comment not found'));
         }
-         
-        $this->getTabs()
-            ->add(
-                'comment',
-                array(
-                    'title' => $this->translate(
-                        'Display detailed information about a comment.'
-                    ),
-                    'icon' => 'comment',
-                    'label' => $this->translate('Comment'),
-                    'url'   =>'monitoring/comments/show'
-                )
+
+        $this->getTabs()->add(
+            'comment',
+            array(
+                'title' => $this->translate(
+                    'Display detailed information about a comment.'
+                ),
+                'icon' => 'comment',
+                'label' => $this->translate('Comment'),
+                'url'   =>'monitoring/comments/show'
+            )
         )->activate('comment')->extend(new DashboardAction());
     }
-    
+
+    /**
+     * Display comment detail view
+     */
     public function showAction()
     {
         $this->view->comment = $this->comment;
@@ -57,7 +69,12 @@ class Monitoring_CommentController extends Controller
             $this->view->delCommentForm = $this->createDelCommentForm();
         }
     }
-    
+
+    /**
+     * Create a command form to delete a single comment
+     *
+     * @return DeleteCommentCommandForm
+     */
     private function createDelCommentForm()
     {
         $this->assertPermission('monitoring/command/comment/delete');
diff --git a/modules/monitoring/application/controllers/CommentsController.php b/modules/monitoring/application/controllers/CommentsController.php
index 85fddcb50..bde2170e3 100644
--- a/modules/monitoring/application/controllers/CommentsController.php
+++ b/modules/monitoring/application/controllers/CommentsController.php
@@ -12,14 +12,24 @@ use Icinga\Data\Filter\Filter;
  */
 class Monitoring_CommentsController extends Controller
 {
+    /**
+     * The fetched comments
+     *
+     * @var array
+     */
     protected $comments;
 
+    /**
+     * Fetch all comments matching the current filter and add tabs
+     *
+     * @throws Zend_Controller_Action_Exception
+     */
     public function init()
     {
         $this->filter = Filter::fromQueryString(str_replace(
-                'comment_id',
-                'comment_internal_id',
-                (string)$this->params
+            'comment_id',
+            'comment_internal_id',
+            (string)$this->params
         ));
         $this->comments = $this->backend->select()->from('comment', array(
             'id'         => 'comment_internal_id',
@@ -40,20 +50,22 @@ class Monitoring_CommentsController extends Controller
             throw new Zend_Controller_Action_Exception($this->translate('Comment not found'));
         }
          
-        $this->getTabs()
-            ->add(
-                'comments',
-                array(
-                    'title' => $this->translate(
-                        'Display detailed information about multiple comments.'
-                    ),
-                    'icon' => 'comment',
-                    'label' => $this->translate('Comments'),
-                    'url'   =>'monitoring/comments/show'
-                )
+        $this->getTabs()->add(
+            'comments',
+            array(
+                'title' => $this->translate(
+                    'Display detailed information about multiple comments.'
+                ),
+                'icon' => 'comment',
+                'label' => $this->translate('Comments'),
+                'url'   =>'monitoring/comments/show'
+            )
         )->activate('comments')->extend(new DashboardAction());
     }
-    
+
+    /**
+     * Display the detail view for a comment list
+     */
     public function showAction()
     {
         $this->view->comments = $this->comments;
@@ -63,6 +75,9 @@ class Monitoring_CommentsController extends Controller
                 ->setParams($this->params);
     }
 
+    /**
+     * Display the form for removing a comment list
+     */
     public function removeAllAction()
     {
         $this->assertPermission('monitoring/command/comment/delete');
diff --git a/modules/monitoring/application/views/scripts/comment/show.phtml b/modules/monitoring/application/views/scripts/comment/show.phtml
index fa2682d2e..88a25a57b 100644
--- a/modules/monitoring/application/views/scripts/comment/show.phtml
+++ b/modules/monitoring/application/views/scripts/comment/show.phtml
@@ -21,7 +21,7 @@
            $this->comment->service_description,
            $this->comment->service_display_name,
            $this->comment->host_name,
-           $this->comment->host_display_name
+           $this->comment->host_display_names
           ); ?>
         </td>
      <?php else: ?>
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index ab9eb6548..5d5d21217 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -22,7 +22,7 @@ if (count($comments) === 0) {
 }
 ?>
   <table data-base-target="_next"
-         class="action comments multiselect" 
+         class="action comments multiselect"
          data-icinga-multiselect-url="/icingaweb2/monitoring/comments/show"
          data-icinga-multiselect-data="comment_id">
     <tbody>

From 1586275521ccd02bc14360b448809a9fc0a6c41d Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 4 May 2015 16:30:26 +0200
Subject: [PATCH 1463/2920] Conform to coding guidelines in downtime controller

---
 .../controllers/DowntimeController.php        | 33 ++++++++++++++++---
 .../controllers/DowntimesController.php       | 29 +++++++++++++---
 2 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/application/controllers/DowntimeController.php b/modules/monitoring/application/controllers/DowntimeController.php
index dcf4dc373..ec1da00ef 100644
--- a/modules/monitoring/application/controllers/DowntimeController.php
+++ b/modules/monitoring/application/controllers/DowntimeController.php
@@ -13,10 +13,25 @@ use Icinga\Web\Widget\Tabextension\DashboardAction;
  */
 class Monitoring_DowntimeController extends Controller
 {
+    /**
+     * The fetched downtime
+     *
+     * @var stdClass
+     */
     protected $downtime;
-    
+
+    /**
+     * If the downtime is a service or not
+     *
+     * @var boolean
+     */
     protected $isService;
-    
+
+    /**
+     * Fetch the downtime matching the given id and add tabs
+     *
+     * @throws Zend_Controller_Action_Exception
+     */
     public function init()
     {
         $downtimeId = $this->params->get('downtime_id');
@@ -54,7 +69,7 @@ class Monitoring_DowntimeController extends Controller
         } else {
             $this->isService = false;
         }
-         
+        
         $this->getTabs()
             ->add(
                 'downtime',
@@ -68,7 +83,10 @@ class Monitoring_DowntimeController extends Controller
                 )
         )->activate('downtime')->extend(new DashboardAction());
     }
-    
+
+    /**
+     * Display the detail view for a downtime
+     */
     public function showAction()
     {
         $this->view->downtime = $this->downtime;
@@ -86,7 +104,12 @@ class Monitoring_DowntimeController extends Controller
             $this->view->delDowntimeForm = $this->createDelDowntimeForm();
         }
     }
-    
+
+    /**
+     * Create a command form to delete a single comment
+     *
+     * @return DeleteDowntimeCommandForm
+     */
     private function createDelDowntimeForm()
     {
         $this->assertPermission('monitoring/command/downtime/delete');
diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php
index bbd3e1bb4..d25a757b5 100644
--- a/modules/monitoring/application/controllers/DowntimesController.php
+++ b/modules/monitoring/application/controllers/DowntimesController.php
@@ -14,10 +14,25 @@ use Icinga\Web\Widget\Tabextension\DashboardAction;
  */
 class Monitoring_DowntimesController extends Controller
 {
+    /**
+     * The fetched downtimes
+     *
+     * @var array
+     */
     protected $downtimes;
-    
+
+    /**
+     * A filter matching all current downtimes
+     *
+     * @var Filter
+     */
     protected $filter;
-    
+
+    /**
+     * Fetch all downtimes matching the current filter and add tabs
+     *
+     * @throws Zend_Controller_Action_Exception
+     */
     public function init()
     {
         $this->filter = Filter::fromQueryString(str_replace(
@@ -82,7 +97,10 @@ class Monitoring_DowntimesController extends Controller
             }
         }
     }
-    
+
+    /**
+     * Display the detail view for a downtime list
+     */
     public function showAction()
     {
         $this->view->downtimes = $this->downtimes;
@@ -91,7 +109,10 @@ class Monitoring_DowntimesController extends Controller
         $this->view->removeAllLink = Url::fromPath('monitoring/downtimes/remove-all')
                 ->setParams($this->params);
     }
-    
+
+    /**
+     * Display the form for removing a downtime list
+     */
     public function removeAllAction()
     {
         $this->assertPermission('monitoring/command/downtime/delete');

From 31879755539b4a72caede73e0d27ea1e883a81ad Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 4 May 2015 17:02:14 +0200
Subject: [PATCH 1464/2920] Conform to coding guidelines

---
 .../controllers/DowntimesController.php       | 31 +++++++++----------
 .../Object/DeleteDowntimeCommandForm.php      |  2 +-
 .../Object/DeleteDowntimesCommandForm.php     | 21 ++++++++-----
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php
index d25a757b5..2931f7d3e 100644
--- a/modules/monitoring/application/controllers/DowntimesController.php
+++ b/modules/monitoring/application/controllers/DowntimesController.php
@@ -36,9 +36,9 @@ class Monitoring_DowntimesController extends Controller
     public function init()
     {
         $this->filter = Filter::fromQueryString(str_replace(
-                'downtime_id', 
-                'downtime_internal_id', 
-                (string)$this->params
+            'downtime_id',
+            'downtime_internal_id',
+            (string)$this->params
         ));
         $this->downtimes = $this->backend->select()->from('downtime', array(
             'id'              => 'downtime_internal_id',
@@ -66,22 +66,21 @@ class Monitoring_DowntimesController extends Controller
 
         if (false === $this->downtimes) {
             throw new Zend_Controller_Action_Exception(
-                    $this->translate('Downtime not found')
+                $this->translate('Downtime not found')
             );
         }
         
-        $this->getTabs()
-            ->add(
-                'downtimes',
-                array(
-                    'title' => $this->translate(
-                        'Display detailed information about multiple downtimes.'
-                    ),
-                    'icon' => 'plug',
-                    'label' => $this->translate('Downtimes'),
-                    'url'   =>'monitoring/downtimes/show'
-                )
-        )->activate('downtimes')->extend(new DashboardAction());
+        $this->getTabs()->add(
+            'downtimes',
+            array(
+                'title' => $this->translate(
+                    'Display detailed information about multiple downtimes.'
+                ),
+                'icon' => 'plug',
+                'label' => $this->translate('Downtimes'),
+                'url'   =>'monitoring/downtimes/show'
+            )
+        )->activate('downtimes');
         
         foreach ($this->downtimes as $downtime) {
             if (isset($downtime->service_description)) {
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
index 8862c2b53..070451e7f 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -84,7 +84,7 @@ class DeleteDowntimeCommandForm extends CommandForm
         $delDowntime = new DeleteDowntimeCommand();
         $delDowntime->setDowntimeId($id);
         $delDowntime->setDowntimeType(
-            isset($firstDowntime->service_description) ? 
+            isset($firstDowntime->service_description) ?
             DeleteDowntimeCommand::DOWNTIME_TYPE_SERVICE :
             DeleteDowntimeCommand::DOWNTIME_TYPE_HOST
         );
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
index f460f3601..f11ac1128 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
@@ -12,6 +12,11 @@ use Icinga\Web\Notification;
  */
 class DeleteDowntimesCommandForm extends CommandForm
 {
+    /**
+     * The downtimes to delete on success
+     *
+     * @var array
+     */
     protected $downtimes;
     
     /**
@@ -31,12 +36,12 @@ class DeleteDowntimesCommandForm extends CommandForm
     {
         $this->addElements(array(
             array(
-                    'hidden',
-                    'redirect',
-                    array(
-                        'decorators' => array('ViewHelper')
-                    )
+                'hidden',
+                'redirect',
+                array(
+                    'decorators' => array('ViewHelper')
                 )
+            )
         ));
         return $this;
     }
@@ -60,7 +65,7 @@ class DeleteDowntimesCommandForm extends CommandForm
             $delDowntime = new DeleteDowntimeCommand();
             $delDowntime->setDowntimeId($downtime->id);
             $delDowntime->setDowntimeType(
-                isset($downtime->service_description) ? 
+                isset($downtime->service_description) ?
                 DeleteDowntimeCommand::DOWNTIME_TYPE_SERVICE :
                 DeleteDowntimeCommand::DOWNTIME_TYPE_HOST
             );
@@ -76,9 +81,9 @@ class DeleteDowntimesCommandForm extends CommandForm
     
     /**
      * Set the downtimes to be deleted upon success
-     * 
+     *
      * @param type $downtimes
-     * 
+     *
      * @return $this
      */
     public function setDowntimes($downtimes)

From 11c9cde5570875c490228387460d70fcf4648ace Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 4 May 2015 17:05:18 +0200
Subject: [PATCH 1465/2920] Remove dashboard action from multi view

refs #8903
---
 .../monitoring/application/controllers/CommentsController.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/CommentsController.php b/modules/monitoring/application/controllers/CommentsController.php
index bde2170e3..2e8656085 100644
--- a/modules/monitoring/application/controllers/CommentsController.php
+++ b/modules/monitoring/application/controllers/CommentsController.php
@@ -60,7 +60,7 @@ class Monitoring_CommentsController extends Controller
                 'label' => $this->translate('Comments'),
                 'url'   =>'monitoring/comments/show'
             )
-        )->activate('comments')->extend(new DashboardAction());
+        )->activate('comments');
     }
 
     /**

From 7c8ff44fd1c1c524fcf70a110e0c80b808ebf877 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 4 May 2015 17:59:16 +0200
Subject: [PATCH 1466/2920] Fix comment and downtime list inline forms

refs #8903
refs #8902
---
 .../application/controllers/CommentController.php     |  9 +++++++++
 .../application/controllers/DowntimeController.php    |  9 +++++++++
 .../application/controllers/DowntimesController.php   |  1 -
 .../application/views/scripts/list/comments.phtml     | 11 +----------
 .../application/views/scripts/list/downtimes.phtml    |  9 +--------
 public/js/icinga/events.js                            |  4 ++++
 6 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/modules/monitoring/application/controllers/CommentController.php b/modules/monitoring/application/controllers/CommentController.php
index e5e181449..b5b374c12 100644
--- a/modules/monitoring/application/controllers/CommentController.php
+++ b/modules/monitoring/application/controllers/CommentController.php
@@ -70,6 +70,15 @@ class Monitoring_CommentController extends Controller
         }
     }
 
+    /**
+     * Receive DeleteCommentCommandForm post from other controller
+     */
+    public function removeAction()
+    {
+        $this->assertHttpMethod('POST');
+        $this->createDelCommentForm();
+    }
+
     /**
      * Create a command form to delete a single comment
      *
diff --git a/modules/monitoring/application/controllers/DowntimeController.php b/modules/monitoring/application/controllers/DowntimeController.php
index ec1da00ef..20eebc6ca 100644
--- a/modules/monitoring/application/controllers/DowntimeController.php
+++ b/modules/monitoring/application/controllers/DowntimeController.php
@@ -105,6 +105,15 @@ class Monitoring_DowntimeController extends Controller
         }
     }
 
+    /**
+     * Receive DeleteDowntimeCommandForm post from other controller
+     */
+    public function removeAction()
+    {
+        $this->assertHttpMethod('POST');
+        $this->createDelDowntimeForm();
+    }
+
     /**
      * Create a command form to delete a single comment
      *
diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php
index 2931f7d3e..f6dc53cb3 100644
--- a/modules/monitoring/application/controllers/DowntimesController.php
+++ b/modules/monitoring/application/controllers/DowntimesController.php
@@ -7,7 +7,6 @@ use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimesCommandForm;
 use Icinga\Web\Url;
-use Icinga\Web\Widget\Tabextension\DashboardAction;
 
 /**
  * Display detailed information about a downtime
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 5d5d21217..141c688e7 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -84,16 +84,7 @@ if (count($comments) === 0) {
           <?php
           $delCommentForm = clone $delCommentForm;
           $delCommentForm->populate(array('comment_id' => $comment->id, 'redirect' => $this->url));
-          if ($comment->objecttype === 'host') {
-            $delCommentForm->setAction(
-                $this->url('monitoring/host/delete-comment', array('host' => $comment->host_name))
-            );
-          } else {
-            $delCommentForm->setAction($this->url('monitoring/service/delete-comment', array(
-                'host'      => $comment->host_name,
-                'service'   => $comment->service_description
-            )));
-          }
+          $delCommentForm->setAction($this->url('monitoring/comment/remove', array('comment_id' => $comment->id)));
           echo $delCommentForm;
           ?>
         </td>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index f1351a225..859326b2e 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -129,14 +129,7 @@ if (count($downtimes) === 0) {
           <?php
           $delDowntimeForm = clone $delDowntimeForm;
           $delDowntimeForm->populate(array('downtime_id' => $downtime->id, 'redirect' => $this->url));
-          if (! $isService) {
-            $delDowntimeForm->setAction($this->url('monitoring/host/delete-downtime', array('host' => $downtime->host_name)));
-          } else {
-            $delDowntimeForm->setAction($this->url('monitoring/service/delete-downtime', array(
-                'host'      => $downtime->host_name,
-                'service'   => $downtime->service_description
-            )));
-          }
+          $delDowntimeForm->setAction($this->url('monitoring/downtime/remove', array('downtime_id' => $downtime->id)));
           echo $delDowntimeForm;
           ?>
         </td>
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 7e87a8fb6..cc927feb6 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -303,6 +303,10 @@
             var data     = self.icinga.ui.getSelectionKeys($table);
             var url      = $table.data('icinga-multiselect-url');
 
+            if ($(event.target).closest('form').length) {
+                // allow form actions in table rows to pass through
+                return;
+            }
             event.stopPropagation();
             event.preventDefault();
 

From b35dd4ddfee5789b0363b07e2c3209b34cec7f6a Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 7 May 2015 14:03:09 +0200
Subject: [PATCH 1467/2920] Separate forms for deleting single and multiple
 comments

refs #8624
---
 .../controllers/CommentController.php         | 15 +--
 .../controllers/CommentsController.php        |  4 +-
 .../controllers/DowntimeController.php        | 15 +--
 .../controllers/ListController.php            |  4 +-
 .../Object/DeleteCommentCommandForm.php       | 50 +++++-----
 .../Object/DeleteCommentsCommandForm.php      | 92 +++++++++++++++++++
 .../Object/DeleteDowntimeCommandForm.php      | 29 +++---
 .../views/scripts/comment/show.phtml          |  4 +-
 .../scripts/show/components/downtime.phtml    |  7 +-
 .../Command/Object/DeleteCommentCommand.php   | 43 +++++++--
 .../IcingaCommandFileCommandRenderer.php      |  7 +-
 .../Controller/MonitoredObjectController.php  |  6 +-
 12 files changed, 201 insertions(+), 75 deletions(-)
 create mode 100644 modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php

diff --git a/modules/monitoring/application/controllers/CommentController.php b/modules/monitoring/application/controllers/CommentController.php
index b5b374c12..1c7f3e36d 100644
--- a/modules/monitoring/application/controllers/CommentController.php
+++ b/modules/monitoring/application/controllers/CommentController.php
@@ -67,6 +67,13 @@ class Monitoring_CommentController extends Controller
         $this->view->comment = $this->comment;
         if ($this->hasPermission('monitoring/command/comment/delete')) {
             $this->view->delCommentForm = $this->createDelCommentForm();
+            $this->view->delCommentForm->populate(
+                array(
+                    'redirect' => Url::fromPath('monitoring/list/comments'),
+                    'comment_id' => $this->comment->id,
+                    'comment_is_service' => isset($this->comment->service_description)
+                )
+            );
         }
     }
 
@@ -82,7 +89,7 @@ class Monitoring_CommentController extends Controller
     /**
      * Create a command form to delete a single comment
      *
-     * @return DeleteCommentCommandForm
+     * @return DeleteCommentsCommandForm
      */
     private function createDelCommentForm()
     {
@@ -93,12 +100,6 @@ class Monitoring_CommentController extends Controller
             Url::fromPath('monitoring/comment/show')
                 ->setParam('comment_id', $this->comment->id)
         );
-        $delCommentForm->populate(
-            array(
-                'redirect' => Url::fromPath('monitoring/list/comments'),
-                'comment_id' => $this->comment->id
-            )
-        );
         $delCommentForm->handleRequest();
         return $delCommentForm;
     }
diff --git a/modules/monitoring/application/controllers/CommentsController.php b/modules/monitoring/application/controllers/CommentsController.php
index 2e8656085..106dd4650 100644
--- a/modules/monitoring/application/controllers/CommentsController.php
+++ b/modules/monitoring/application/controllers/CommentsController.php
@@ -2,7 +2,7 @@
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Module\Monitoring\Controller;
-use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentsCommandForm;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 use Icinga\Data\Filter\Filter;
@@ -84,7 +84,7 @@ class Monitoring_CommentsController extends Controller
         $this->view->comments = $this->comments;
         $this->view->listAllLink = Url::fromPath('monitoring/list/comments')
                 ->setQueryString($this->filter->toQueryString());
-        $delCommentForm = new DeleteCommentCommandForm();
+        $delCommentForm = new DeleteCommentsCommandForm();
         $delCommentForm->setTitle($this->view->translate('Remove all Comments'));
         $delCommentForm->addDescription(sprintf(
             $this->translate('Confirm removal of %d comments.'),
diff --git a/modules/monitoring/application/controllers/DowntimeController.php b/modules/monitoring/application/controllers/DowntimeController.php
index 20eebc6ca..1fed470fe 100644
--- a/modules/monitoring/application/controllers/DowntimeController.php
+++ b/modules/monitoring/application/controllers/DowntimeController.php
@@ -5,6 +5,7 @@ use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
+use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 
@@ -102,6 +103,13 @@ class Monitoring_DowntimeController extends Controller
                 ->setParam('service', $this->downtime->service_description);
         if ($this->hasPermission('monitoring/command/downtime/delete')) {
             $this->view->delDowntimeForm = $this->createDelDowntimeForm();
+            $this->view->delDowntimeForm->populate(
+                array(
+                    'redirect' => Url::fromPath('monitoring/list/downtimes'),
+                    'downtime_id' => $this->downtime->id,
+                    'downtime_is_service' => $this->isService
+                )
+            );
         }
     }
 
@@ -122,18 +130,11 @@ class Monitoring_DowntimeController extends Controller
     private function createDelDowntimeForm()
     {
         $this->assertPermission('monitoring/command/downtime/delete');
-        
         $delDowntimeForm = new DeleteDowntimeCommandForm();
         $delDowntimeForm->setAction(
             Url::fromPath('monitoring/downtime/show')
                 ->setParam('downtime_id', $this->downtime->id)
         );
-        $delDowntimeForm->populate(
-            array(
-                'redirect' => Url::fromPath('monitoring/list/downtimes'),
-                'downtime_id' => $this->downtime->id
-            )
-        );
         $delDowntimeForm->handleRequest();
         return $delDowntimeForm;
     }
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index e6147c31b..53b0e1edd 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -3,7 +3,7 @@
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Backend;
-use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentsCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
@@ -501,7 +501,7 @@ class Monitoring_ListController extends Controller
         );
 
         if ($this->Auth()->hasPermission('monitoring/command/comment/delete')) {
-            $this->view->delCommentForm = new DeleteCommentCommandForm();
+            $this->view->delCommentForm = new DeleteCommentsCommandForm();
         }
     }
 
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
index 93b928b86..1c8144475 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
@@ -4,12 +4,13 @@
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
 use Icinga\Module\Monitoring\Command\Object\DeleteCommentCommand;
+use Icinga\Module\Monitoring\Forms\Command\CommandForm;
 use Icinga\Web\Notification;
 
 /**
  * Form for deleting host or service comments
  */
-class DeleteCommentCommandForm extends ObjectsCommandForm
+class DeleteCommentCommandForm extends CommandForm
 {
     /**
      * (non-PHPDoc)
@@ -26,23 +27,34 @@ class DeleteCommentCommandForm extends ObjectsCommandForm
      */
     public function createElements(array $formData = array())
     {
-        $this->addElements(array(
+         $this->addElements(
             array(
-                'hidden',
-                'comment_id',
                 array(
-                    'required'      => true,
-                    'decorators'    => array('ViewHelper')
-                )
-            ),
-            array(
-                'hidden',
-                'redirect',
+                    'hidden',
+                    'comment_id',
+                    array(
+                        'required' => true,
+                        'validators' => array('NotEmpty'),
+                        'decorators' => array('ViewHelper')
+                    )
+                ),
                 array(
-                    'decorators' => array('ViewHelper')
+                    'hidden',
+                    'comment_is_service',
+                    array(
+                        'filters' => array('Boolean'),
+                        'decorators' => array('ViewHelper')
+                    )
+                ),
+                array(
+                    'hidden',
+                    'redirect',
+                    array(
+                        'decorators' => array('ViewHelper')
+                    )
                 )
             )
-        ));
+        );
         return $this;
     }
 
@@ -74,14 +86,10 @@ class DeleteCommentCommandForm extends ObjectsCommandForm
      */
     public function onSuccess()
     {
-        foreach ($this->objects as $object) {
-            /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
-            $delComment = new DeleteCommentCommand();
-            $delComment
-                ->setObject($object)
-                ->setCommentId($this->getElement('comment_id')->getValue());
-            $this->getTransport($this->request)->send($delComment);
-        }
+        $cmd = new DeleteCommentCommand();
+        $cmd->setIsService($this->getElement('comment_is_service')->getValue())
+             ->setCommentId($this->getElement('comment_id')->getValue());
+        $this->getTransport($this->request)->send($cmd);
         $redirect = $this->getElement('redirect')->getValue();
         if (! empty($redirect)) {
             $this->setRedirectUrl($redirect);
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php
new file mode 100644
index 000000000..119020411
--- /dev/null
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php
@@ -0,0 +1,92 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Forms\Command\Object;
+
+use Icinga\Module\Monitoring\Command\Object\DeleteCommentCommand;
+use Icinga\Web\Notification;
+
+/**
+ * Form for deleting host or service comments
+ */
+class DeleteCommentsCommandForm extends ObjectsCommandForm
+{
+    /**
+     * (non-PHPDoc)
+     * @see \Zend_Form::init() For the method documentation.
+     */
+    public function init()
+    {
+        $this->setAttrib('class', 'inline');
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     */
+    public function createElements(array $formData = array())
+    {
+        $this->addElements(array(
+            array(
+                'hidden',
+                'comment_id',
+                array(
+                    'required'      => true,
+                    'decorators'    => array('ViewHelper')
+                )
+            ),
+            array(
+                'hidden',
+                'redirect',
+                array(
+                    'decorators' => array('ViewHelper')
+                )
+            )
+        ));
+        return $this;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::addSubmitButton() For the method documentation.
+     */
+    public function addSubmitButton()
+    {
+        $this->addElement(
+            'button',
+            'btn_submit',
+            array(
+                'ignore'        => true,
+                'escape'        => false,
+                'type'          => 'submit',
+                'class'         => 'link-like',
+                'label'         => $this->getView()->icon('trash'),
+                'title'         => $this->translate('Delete this comment'),
+                'decorators'    => array('ViewHelper')
+            )
+        );
+        return $this;
+    }
+
+    /**
+     * (non-PHPDoc)
+     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     */
+    public function onSuccess()
+    {
+        foreach ($this->objects as $object) {
+            /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+            $delComment = new DeleteCommentCommand();
+            $delComment
+                ->setObject($object)
+                ->setCommentId($this->getElement('comment_id')->getValue());
+            $this->getTransport($this->request)->send($delComment);
+        }
+        $redirect = $this->getElement('redirect')->getValue();
+        if (! empty($redirect)) {
+            $this->setRedirectUrl($redirect);
+        }
+        Notification::success($this->translate('Deleting comment..'));
+        return true;
+    }
+}
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
index 070451e7f..1d959caab 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -33,6 +33,16 @@ class DeleteDowntimeCommandForm extends CommandForm
                     'hidden',
                     'downtime_id',
                     array(
+                        'required' => true,
+                        'validators' => array('NotEmpty'),
+                        'decorators' => array('ViewHelper')
+                    )
+                ),
+                array(
+                    'hidden',
+                    'downtime_is_service',
+                    array(
+                        'filters' => array('Boolean'),
                         'decorators' => array('ViewHelper')
                     )
                 ),
@@ -76,20 +86,11 @@ class DeleteDowntimeCommandForm extends CommandForm
      */
     public function onSuccess()
     {
-        $id = $this->getElement('downtime_id')->getValue();
-        
-        // Presence of downtime id, only delete this specific downtime
-        $firstDowntime = $this->downtimes[0];
-        
-        $delDowntime = new DeleteDowntimeCommand();
-        $delDowntime->setDowntimeId($id);
-        $delDowntime->setDowntimeType(
-            isset($firstDowntime->service_description) ?
-            DeleteDowntimeCommand::DOWNTIME_TYPE_SERVICE :
-            DeleteDowntimeCommand::DOWNTIME_TYPE_HOST
-        );
-        $this->getTransport($this->request)->send($delDowntime);
-        
+        $cmd = new DeleteDowntimeCommand();
+        $cmd->setDowntimeId($this->getElement('downtime_id')->getValue());
+        $cmd->setIsService($this->getElement('downtime_is_service')->getValue());
+        $this->getTransport($this->request)->send($cmd);
+    
         $redirect = $this->getElement('redirect')->getValue();
         if (! empty($redirect)) {
             $this->setRedirectUrl($redirect);
diff --git a/modules/monitoring/application/views/scripts/comment/show.phtml b/modules/monitoring/application/views/scripts/comment/show.phtml
index 88a25a57b..9010021c3 100644
--- a/modules/monitoring/application/views/scripts/comment/show.phtml
+++ b/modules/monitoring/application/views/scripts/comment/show.phtml
@@ -16,12 +16,12 @@
       <?php if ($this->comment->objecttype === 'service'): ?>
         <th> <?= $this->translate('Service') ?> </th> 
         <td>
-          <?= $this->icon('service', $this->translate('Service')); ?>  
+          <?= $this->icon('service', $this->translate('Service')); ?>
           <?= $this->link()->service(
            $this->comment->service_description,
            $this->comment->service_display_name,
            $this->comment->host_name,
-           $this->comment->host_display_names
+           $this->comment->host_display_name
           ); ?>
         </td>
      <?php else: ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index bfb9bbf45..a10863054 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -65,7 +65,12 @@ foreach ($object->downtimes as $downtime) {
         <td data-base-target="_self">
             <?php if (isset($delDowntimeForm)) { // Form is unset if the current user lacks the respective permission
                 $delDowntimeForm = clone $delDowntimeForm;
-                $delDowntimeForm->populate(array('downtime_id' => $downtime->id));
+                $delDowntimeForm->populate(
+                    array(
+                        'downtime_id' => $downtime->id,
+                        'downtime_is_service' => $object->getType() === $object::TYPE_SERVICE
+                    )
+                );
                 echo $delDowntimeForm;
             } ?>
             <span class="sr-only"><?= $this->translate('Downtime'); ?></span>
diff --git a/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
index 00ba63a78..75f2ffb8e 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
@@ -3,20 +3,13 @@
 
 namespace Icinga\Module\Monitoring\Command\Object;
 
+use Icinga\Module\Monitoring\Command\IcingaCommand;
+
 /**
  * Delete a host or service comment
  */
-class DeleteCommentCommand extends ObjectCommand
+class DeleteCommentCommand extends IcingaCommand
 {
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Module\Monitoring\Command\Object\ObjectCommand::$allowedObjects For the property documentation.
-     */
-    protected $allowedObjects = array(
-        self::TYPE_HOST,
-        self::TYPE_SERVICE
-    );
-
     /**
      * ID of the comment that is to be deleted
      *
@@ -24,6 +17,13 @@ class DeleteCommentCommand extends ObjectCommand
      */
     protected $commentId;
 
+    /**
+     * The type of the comment, either 'host' or 'service'
+     *
+     * @var boolean
+     */
+    protected $isService = false;
+
     /**
      * Set the ID of the comment that is to be deleted
      *
@@ -46,4 +46,27 @@ class DeleteCommentCommand extends ObjectCommand
     {
         return $this->commentId;
     }
+
+    /**
+     * Whether the command affects a service comment
+     *
+     * @return boolean
+     */
+    public function getIsService()
+    {
+        return $this->isService;
+    }
+
+    /**
+     * Set whether the command affects a service
+     *
+     * @param boolean $value    The value, defaults to true
+     *
+     * @return this             fluent interface
+     */
+    public function setIsService($value = true)
+    {
+        $this->isService = (bool) $value;
+        return $this;
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
index 83fbd4364..19d7574ca 100644
--- a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
@@ -323,14 +323,9 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
 
     public function renderDeleteComment(DeleteCommentCommand $command)
     {
-        if ($command->getObject()->getType() === $command::TYPE_HOST) {
-            $commandString = 'DEL_HOST_COMMENT';
-        } else {
-            $commandString = 'DEL_SVC_COMMENT';
-        }
         return sprintf(
             '%s;%u',
-            $commandString,
+            $command->getIsService() ? 'DEL_SVC_COMMENT' : 'DEL_HOST_COMMENT',
             $command->getCommentId()
         );
     }
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 94d9f6399..3629a4182 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -5,7 +5,7 @@ namespace Icinga\Module\Monitoring\Web\Controller;
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Forms\Command\Object\CheckNowCommandForm;
-use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentsCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ObjectsCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm;
@@ -81,7 +81,7 @@ abstract class MonitoredObjectController extends Controller
             ->handleRequest();
         $this->view->toggleFeaturesForm = $toggleFeaturesForm;
         if (! empty($this->object->comments) && $auth->hasPermission('monitoring/command/comment/delete')) {
-            $delCommentForm = new DeleteCommentCommandForm();
+            $delCommentForm = new DeleteCommentsCommandForm();
             $delCommentForm
                 ->setObjects($this->object)
                 ->handleRequest();
@@ -142,7 +142,7 @@ abstract class MonitoredObjectController extends Controller
     {
         $this->assertHttpMethod('POST');
         $this->assertPermission('monitoring/command/comment/delete');
-        $this->handleCommandForm(new DeleteCommentCommandForm());
+        $this->handleCommandForm(new DeleteCommentsCommandForm());
     }
 
     /**

From ffd12e325cf59a628c8a19d586c1103d04400f01 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 7 May 2015 14:05:16 +0200
Subject: [PATCH 1468/2920] Improve up downtime command form properties

Use a flag instead of a enumeration in delete downtime command form, to remove needless boilerplate.

refs #8624
---
 .../Object/DeleteDowntimeCommandForm.php      |  2 +-
 .../Command/Object/DeleteDowntimeCommand.php  | 34 +++++++------------
 .../IcingaCommandFileCommandRenderer.php      |  7 +---
 3 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
index 1d959caab..31ec778fa 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -21,7 +21,7 @@ class DeleteDowntimeCommandForm extends CommandForm
         $this->setAttrib('class', 'inline');
     }
     
-        /**
+    /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::createElements() For the method documentation.
      */
diff --git a/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
index 96dc8f755..a2c593f26 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
@@ -10,46 +10,38 @@ use Icinga\Module\Monitoring\Command\IcingaCommand;
  */
 class DeleteDowntimeCommand extends IcingaCommand
 {
-    /**
-     * Downtime for a host
-     */
-    const DOWNTIME_TYPE_HOST = 'host';
-
-    /**
-     * Downtime for a service
-     */
-    const DOWNTIME_TYPE_SERVICE = 'service';
-
     /**
      * ID of the downtime that is to be deleted
      *
      * @var int
      */
     protected $downtimeId;
-    
+
     /**
+     * If the command affects a service downtime
      *
-     * @var type
+     * @var boolean
      */
-    protected $downtimeType = self::DOWNTIME_TYPE_HOST;
-    
+    protected $isService = false;
+
     /**
-     * Set the downtime type, either host or service
+     * Set if this command affects a service
      *
-     * @param string $type  the downtime type
+     * @param type $value
      */
-    public function setDowntimeType($type)
+    public function setIsService($value = true)
     {
-        $this->downtimeType = $type;
+        $this->isService = (bool) $value;
     }
     
     /**
-     * 
+     * Return whether the command affects a service
+     *
      * @return type
      */
-    public function getDowntimeType()
+    public function getIsService()
     {
-        return $this->downtimeType;
+        return $this->isService;
     }
 
     /**
diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
index 19d7574ca..f6a35dcc2 100644
--- a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
@@ -332,14 +332,9 @@ class IcingaCommandFileCommandRenderer implements IcingaCommandRendererInterface
 
     public function renderDeleteDowntime(DeleteDowntimeCommand $command)
     {
-        if ($command->getDowntimeType() === 'host') {
-            $commandString = 'DEL_HOST_DOWNTIME';
-        } else {
-            $commandString = 'DEL_SVC_DOWNTIME';
-        }
         return sprintf(
             '%s;%u',
-            $commandString,
+            $command->getIsService() ? 'DEL_SVC_DOWNTIME' : 'DEL_HOST_DOWNTIME',
             $command->getDowntimeId()
         );
     }

From f83d16acb2db348095598f893f21954dc088f915 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 7 May 2015 14:45:47 +0200
Subject: [PATCH 1469/2920] RepositoryQuery: Do not lose the repository context
 during pagination

refs #8826
---
 library/Icinga/Repository/RepositoryQuery.php |  4 +-
 .../Web/Paginator/Adapter/QueryAdapter.php    | 61 +++++++++++++------
 2 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index e9acb945b..3cbde0228 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -376,7 +376,9 @@ class RepositoryQuery implements QueryInterface
      */
     public function paginate($itemsPerPage = null, $pageNumber = null)
     {
-        return $this->query->paginate($itemsPerPage, $pageNumber);
+        $paginator = $this->query->paginate($itemsPerPage, $pageNumber);
+        $paginator->getAdapter()->setQuery($this);
+        return $paginator;
     }
 
     /**
diff --git a/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php b/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
index 5d85a4428..3f2b71cc3 100644
--- a/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
+++ b/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
@@ -4,44 +4,64 @@
 namespace Icinga\Web\Paginator\Adapter;
 
 use Zend_Paginator_Adapter_Interface;
-
-/**
- * @see Zend_Paginator_Adapter_Interface
- */
+use Icinga\Data\QueryInterface;
 
 class QueryAdapter implements Zend_Paginator_Adapter_Interface
 {
     /**
-     * Array
+     * The query being paginated
      *
-     * @var array
+     * @var QueryInterface
      */
-    protected $query = null;
+    protected $query;
 
     /**
      * Item count
      *
-     * @var integer
+     * @var int
      */
-    protected $count = null;
+    protected $count;
 
     /**
-     * Constructor.
+     * Create a new QueryAdapter
      *
-     * @param array $query Query to paginate
+     * @param   QueryInterface  $query      The query to paginate
      */
-    // TODO: This might be ready for (QueryInterface $query)
-    public function __construct($query)
+    public function __construct(QueryInterface $query)
     {
-        $this->query = $query;
+        $this->setQuery($query);
     }
 
     /**
-     * Returns an array of items for a page.
+     * Set the query to paginate
      *
-     * @param  integer $offset Page offset
-     * @param  integer $itemCountPerPage Number of items per page
-     * @return array
+     * @param   QueryInterface  $query
+     *
+     * @return  $this
+     */
+    public function setQuery(QueryInterface $query)
+    {
+        $this->query = $query;
+        return $this;
+    }
+
+    /**
+     * Return the query being paginated
+     *
+     * @return  QueryInterface
+     */
+    public function getQuery()
+    {
+        return $this->query;
+    }
+
+    /**
+     * Fetch and return the rows in the given range of the query result
+     *
+     * @param   int     $offset             Page offset
+     * @param   int     $itemCountPerPage   Number of items per page
+     *
+     * @return  array
      */
     public function getItems($offset, $itemCountPerPage)
     {
@@ -49,15 +69,16 @@ class QueryAdapter implements Zend_Paginator_Adapter_Interface
     }
 
     /**
-     * Returns the total number of items in the query result.
+     * Return the total number of items in the query result
      *
-     * @return integer
+     * @return  int
      */
     public function count()
     {
         if ($this->count === null) {
             $this->count = $this->query->count();
         }
+
         return $this->count;
     }
 }

From f383ddd00a25850eab4e5032f106c81862efaa43 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 7 May 2015 14:49:13 +0200
Subject: [PATCH 1470/2920] Repository: Add support for client side value
 conversion

refs #8826
---
 library/Icinga/Repository/Repository.php      | 136 ++++++++++++++++++
 library/Icinga/Repository/RepositoryQuery.php |  82 +++++++++--
 2 files changed, 209 insertions(+), 9 deletions(-)

diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index 701b0ff55..c4ff95ce2 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Repository;
 
+use Icinga\Application\Logger;
 use Icinga\Data\Selectable;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Exception\QueryException;
@@ -95,6 +96,21 @@ abstract class Repository implements Selectable
      */
     protected $sortRules;
 
+    /**
+     * The value conversion rules to apply on a query
+     *
+     * This may be initialized by concrete repository implementations and describes for which aliases or column
+     * names what type of conversion is available. For entries, where the key is the alias/column and the value
+     * is the type identifier, the repository attempts to find a conversion method for the alias/column first and,
+     * if none is found, then for the type. If an entry only provides a value, which is the alias/column, the
+     * repository only attempts to find a conversion method for the alias/column. The name of a conversion method
+     * is expected to be declared using lowerCamelCase. (e.g. user_name will be translated to persistUserName and
+     * groupname will be translated to retrieveGroupname)
+     *
+     * @var array
+     */
+    protected $conversionRules;
+
     /**
      * An array to map table names to aliases
      *
@@ -268,6 +284,32 @@ abstract class Repository implements Selectable
         return array();
     }
 
+    /**
+     * Return the value conversion rules to apply on a query
+     *
+     * Calls $this->initializeConversionRules() in case $this->conversionRules is null.
+     *
+     * @return  array
+     */
+    public function getConversionRules()
+    {
+        if ($this->conversionRules === null) {
+            $this->conversionRules = $this->initializeConversionRules();
+        }
+
+        return $this->conversionRules;
+    }
+
+    /**
+     * Overwrite this in your repository implementation in case you need to initialize the conversion rules lazily
+     *
+     * @return  array
+     */
+    protected function initializeConversionRules()
+    {
+        return array();
+    }
+
     /**
      * Return an array to map table names to aliases
      *
@@ -335,6 +377,100 @@ abstract class Repository implements Selectable
         return $query;
     }
 
+    /**
+     * Return whether this repository is capable of converting values
+     *
+     * @return  bool
+     */
+    public function providesValueConversion()
+    {
+        $conversionRules = $this->getConversionRules();
+        return !empty($conversionRules);
+    }
+
+    /**
+     * Convert a value supposed to be transmitted to the data source
+     *
+     * @param   string  $name       The alias or column name
+     * @param   mixed   $value      The value to convert
+     *
+     * @return  mixed               If conversion was possible, the converted value, otherwise the unchanged value
+     */
+    public function persistColumn($name, $value)
+    {
+        $converter = $this->getConverter($name, 'persist');
+        if ($converter !== null) {
+            $value = $this->$converter($value);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Convert a value which was fetched from the data source
+     *
+     * @param   string  $name       The alias or column name
+     * @param   mixed   $value      The value to convert
+     *
+     * @return  mixed               If conversion was possible, the converted value, otherwise the unchanged value
+     */
+    public function retrieveColumn($name, $value)
+    {
+        $converter = $this->getConverter($name, 'retrieve');
+        if ($converter !== null) {
+            $value = $this->$converter($value);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Return the name of the conversion method for the given alias or column name and context
+     *
+     * @param   string  $name       The alias or column name for which to return a conversion method
+     * @param   string  $context    The context of the conversion: persist or retrieve
+     *
+     * @return  string
+     *
+     * @throws  ProgrammingError    In case a conversion rule is found but not any conversion method
+     */
+    protected function getConverter($name, $context)
+    {
+        $conversionRules = $this->getConversionRules();
+
+        // Check for a conversion method for the alias/column first
+        if (array_key_exists($name, $conversionRules) || in_array($name, $conversionRules)) {
+            $methodName = $context . join('', array_map('ucfirst', explode('_', $name)));
+            if (method_exists($this, $methodName)) {
+                return $methodName;
+            }
+        }
+
+        // The conversion method for the type is just a fallback, but it is required to exist if defined
+        if (isset($conversionRules[$name])) {
+            $identifier = join('', array_map('ucfirst', explode('_', $conversionRules[$name])));
+            if (! method_exists($this, $context . $identifier)) {
+                // Do not throw an error in case at least one conversion method exists
+                if (! method_exists($this, ($context === 'persist' ? 'retrieve' : 'persist') . $identifier)) {
+                    throw new ProgrammingError(
+                        'Cannot find any conversion method for type "%s"'
+                        . '. Add a proper conversion method or remove the type definition',
+                        $conversionRules[$name]
+                    );
+                }
+
+                Logger::debug(
+                    'Conversion method "%s" for type definition "%s" does not exist in repository "%s".',
+                    $context . $identifier,
+                    $conversionRules[$name],
+                    $this->getName()
+                );
+            } else {
+                return $context . $identifier;
+            }
+        }
+    }
+
     /**
      * Return this repository's query columns mapped to their respective aliases
      *
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index 3cbde0228..8c47bf6ff 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -132,7 +132,10 @@ class RepositoryQuery implements QueryInterface
      */
     public function where($column, $value = null)
     {
-        $this->query->where($this->repository->requireFilterColumn($column), $value);
+        $this->query->where(
+            $this->repository->requireFilterColumn($column),
+            $this->repository->persistColumn($column, $value)
+        );
         return $this;
     }
 
@@ -182,13 +185,15 @@ class RepositoryQuery implements QueryInterface
         return $this;
     }
 
-    /*+
+    /**
      * Recurse the given filter and notify the repository about each required filter column
      */
     protected function requireFilterColumns(Filter $filter)
     {
         if ($filter->isExpression()) {
-            $filter->setColumn($this->repository->requireFilterColumn($filter->getColumn()));
+            $column = $filter->getColumn();
+            $filter->setColumn($this->repository->requireFilterColumn($column));
+            $filter->setExpression($this->repository->persistColumn($column, $filter->getExpression()));
         } elseif ($filter->isChain()) {
             foreach ($filter->filters() as $chainOrExpression) {
                 $this->requireFilterColumns($chainOrExpression);
@@ -392,7 +397,14 @@ class RepositoryQuery implements QueryInterface
             $this->order();
         }
 
-        return $this->query->fetchOne();
+        $result = $this->query->fetchOne();
+        if ($this->repository->providesValueConversion()) {
+            $columns = $this->getColumns();
+            $column = isset($columns[0]) ? $columns[0] : key($columns);
+            return $this->repository->retrieveColumn($column, $result);
+        }
+
+        return $result;
     }
 
     /**
@@ -406,7 +418,18 @@ class RepositoryQuery implements QueryInterface
             $this->order();
         }
 
-        return $this->query->fetchRow();
+        $result = $this->query->fetchRow();
+        if ($this->repository->providesValueConversion()) {
+            foreach ($this->getColumns() as $alias => $column) {
+                if (! is_string($alias)) {
+                    $alias = $column;
+                }
+
+                $result->$alias = $this->repository->retrieveColumn($alias, $result->$alias);
+            }
+        }
+
+        return $result;
     }
 
     /**
@@ -422,11 +445,23 @@ class RepositoryQuery implements QueryInterface
             $this->order();
         }
 
-        return $this->query->fetchColumn($columnIndex);
+        $results = $this->query->fetchColumn($columnIndex);
+        if ($this->repository->providesValueConversion()) {
+            $columns = $this->getColumns();
+            $aliases = array_keys($columns);
+            $column = is_int($aliases[$columnIndex]) ? $columns[$columnIndex] : $aliases[$columnIndex];
+            foreach ($results as & $value) {
+                $value = $this->repository->retrieveColumn($column, $value);
+            }
+        }
+
+        return $results;
     }
 
     /**
-     * Fetch and return all rows of this query's result as a flattened key/value based array
+     * Fetch and return all rows of this query's result set as an array of key-value pairs
+     *
+     * The first column is the key, the second column is the value.
      *
      * @return  array
      */
@@ -436,7 +471,22 @@ class RepositoryQuery implements QueryInterface
             $this->order();
         }
 
-        return $this->query->fetchPairs();
+        $results = $this->query->fetchPairs();
+        if ($this->repository->providesValueConversion()) {
+            $columns = $this->getColumns();
+            $aliases = array_keys($columns);
+            $newResults = array();
+            foreach ($results as $colOneValue => $colTwoValue) {
+                $colOne = $aliases[0] !== 0 ? $aliases[0] : $columns[0];
+                $colTwo = count($aliases) < 2 ? $colOne : ($aliases[1] !== 1 ? $aliases[1] : $columns[1]);
+                $colOneValue = $this->repository->retrieveColumn($colOne, $colOneValue);
+                $newResults[$colOneValue] = $this->repository->retrieveColumn($colTwo, $colTwoValue);
+            }
+
+            $results = $newResults;
+        }
+
+        return $results;
     }
 
     /**
@@ -450,7 +500,21 @@ class RepositoryQuery implements QueryInterface
             $this->order();
         }
 
-        return $this->query->fetchAll();
+        $results = $this->query->fetchAll();
+        if ($this->repository->providesValueConversion()) {
+            $columns = $this->getColumns();
+            foreach ($results as $row) {
+                foreach ($columns as $alias => $column) {
+                    if (! is_string($alias)) {
+                        $alias = $column;
+                    }
+
+                    $row->$alias = $this->repository->retrieveColumn($alias, $row->$alias);
+                }
+            }
+        }
+
+        return $results;
     }
 
     /**

From 4463f16f04972f4eae8eb7fb9a62cf8de015dfd3 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 7 May 2015 15:11:54 +0200
Subject: [PATCH 1471/2920] Add abbillity to remove multiple comments by id

refs #8624
---
 .../controllers/CommentsController.php        |  4 +-
 .../Object/DeleteCommentsCommandForm.php      | 47 +++++++++++--------
 .../Object/DeleteDowntimesCommandForm.php     |  8 +---
 .../views/scripts/list/comments.phtml         |  8 +++-
 .../views/scripts/list/downtimes.phtml        |  7 ++-
 .../Controller/MonitoredObjectController.php  |  8 ++--
 6 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/modules/monitoring/application/controllers/CommentsController.php b/modules/monitoring/application/controllers/CommentsController.php
index 106dd4650..9521af7c9 100644
--- a/modules/monitoring/application/controllers/CommentsController.php
+++ b/modules/monitoring/application/controllers/CommentsController.php
@@ -90,8 +90,8 @@ class Monitoring_CommentsController extends Controller
             $this->translate('Confirm removal of %d comments.'),
             count($this->comments)
         ));
-        $delCommentForm->setObjects($this->comments)
-                ->setRedirectUrl(Url::fromPath('monitoring/list/downtimes'))
+        $delCommentForm->setComments($this->comments)
+                ->setRedirectUrl(Url::fromPath('monitoring/list/comments'))
                 ->handleRequest();
         $this->view->delCommentForm = $delCommentForm;
     }
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php
index 119020411..57f6aae5a 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php
@@ -4,13 +4,21 @@
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
 use Icinga\Module\Monitoring\Command\Object\DeleteCommentCommand;
+use \Icinga\Module\Monitoring\Forms\Command\CommandForm;
 use Icinga\Web\Notification;
 
 /**
  * Form for deleting host or service comments
  */
-class DeleteCommentsCommandForm extends ObjectsCommandForm
+class DeleteCommentsCommandForm extends CommandForm
 {
+    /**
+     * The comments deleted on success
+     *
+     * @var array
+     */
+    protected $comments;
+
     /**
      * (non-PHPDoc)
      * @see \Zend_Form::init() For the method documentation.
@@ -27,20 +35,10 @@ class DeleteCommentsCommandForm extends ObjectsCommandForm
     public function createElements(array $formData = array())
     {
         $this->addElements(array(
-            array(
-                'hidden',
-                'comment_id',
-                array(
-                    'required'      => true,
-                    'decorators'    => array('ViewHelper')
-                )
-            ),
             array(
                 'hidden',
                 'redirect',
-                array(
-                    'decorators' => array('ViewHelper')
-                )
+                array('decorators' => array('ViewHelper'))
             )
         ));
         return $this;
@@ -74,13 +72,11 @@ class DeleteCommentsCommandForm extends ObjectsCommandForm
      */
     public function onSuccess()
     {
-        foreach ($this->objects as $object) {
-            /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
-            $delComment = new DeleteCommentCommand();
-            $delComment
-                ->setObject($object)
-                ->setCommentId($this->getElement('comment_id')->getValue());
-            $this->getTransport($this->request)->send($delComment);
+        foreach ($this->comments as $comment) {
+            $cmd = new DeleteCommentCommand();
+            $cmd->setCommentId($comment->id)
+                ->setIsService(isset($comment->service_description));
+            $this->getTransport($this->request)->send($cmd);
         }
         $redirect = $this->getElement('redirect')->getValue();
         if (! empty($redirect)) {
@@ -89,4 +85,17 @@ class DeleteCommentsCommandForm extends ObjectsCommandForm
         Notification::success($this->translate('Deleting comment..'));
         return true;
     }
+
+    /**
+     * Set the comments to be deleted upon success
+     *
+     * @param array $comments
+     *
+     * @return this             fluent interface
+     */
+    public function setComments(array $comments)
+    {
+        $this->comments = $comments;
+        return $this;
+    }
 }
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
index f11ac1128..566ad572c 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
@@ -64,11 +64,7 @@ class DeleteDowntimesCommandForm extends CommandForm
         foreach ($this->downtimes as $downtime) {
             $delDowntime = new DeleteDowntimeCommand();
             $delDowntime->setDowntimeId($downtime->id);
-            $delDowntime->setDowntimeType(
-                isset($downtime->service_description) ?
-                DeleteDowntimeCommand::DOWNTIME_TYPE_SERVICE :
-                DeleteDowntimeCommand::DOWNTIME_TYPE_HOST
-            );
+            $delDowntime->setIsService(isset($downtime->service_description));
             $this->getTransport($this->request)->send($delDowntime);
         }
         $redirect = $this->getElement('redirect')->getValue();
@@ -86,7 +82,7 @@ class DeleteDowntimesCommandForm extends CommandForm
      *
      * @return $this
      */
-    public function setDowntimes($downtimes)
+    public function setDowntimes(array $downtimes)
     {
         $this->downtimes = $downtimes;
         return $this;
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 141c688e7..690095360 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -83,7 +83,13 @@ if (count($comments) === 0) {
         <td style="width: 2em" data-base-target="self">
           <?php
           $delCommentForm = clone $delCommentForm;
-          $delCommentForm->populate(array('comment_id' => $comment->id, 'redirect' => $this->url));
+          $delCommentForm->populate(
+              array(
+                  'comment_id' => $comment->id,
+                  'comment_is_service' => isset($comment->service_description),
+                  'redirect' => $this->url
+              )
+          );
           $delCommentForm->setAction($this->url('monitoring/comment/remove', array('comment_id' => $comment->id)));
           echo $delCommentForm;
           ?>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 859326b2e..1268a4050 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -128,7 +128,12 @@ if (count($downtimes) === 0) {
         <td style="width: 2em" data-base-target="self">
           <?php
           $delDowntimeForm = clone $delDowntimeForm;
-          $delDowntimeForm->populate(array('downtime_id' => $downtime->id, 'redirect' => $this->url));
+          $delDowntimeForm->populate(
+              array(
+                  'downtime_id' => $downtime->id,
+                  'redirect' => $this->url
+              )
+          );
           $delDowntimeForm->setAction($this->url('monitoring/downtime/remove', array('downtime_id' => $downtime->id)));
           echo $delDowntimeForm;
           ?>
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 3629a4182..ce565df86 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -5,7 +5,7 @@ namespace Icinga\Module\Monitoring\Web\Controller;
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Forms\Command\Object\CheckNowCommandForm;
-use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentsCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ObjectsCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm;
@@ -81,10 +81,8 @@ abstract class MonitoredObjectController extends Controller
             ->handleRequest();
         $this->view->toggleFeaturesForm = $toggleFeaturesForm;
         if (! empty($this->object->comments) && $auth->hasPermission('monitoring/command/comment/delete')) {
-            $delCommentForm = new DeleteCommentsCommandForm();
-            $delCommentForm
-                ->setObjects($this->object)
-                ->handleRequest();
+            $delCommentForm = new DeleteCommentCommandForm();
+            $delCommentForm->handleRequest();
             $this->view->delCommentForm = $delCommentForm;
         }
         if (! empty($this->object->downtimes) && $auth->hasPermission('monitoring/command/downtime/delete')) {

From b314c074cc277de1102cfbac5f050df886adc73f Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 7 May 2015 16:20:59 +0200
Subject: [PATCH 1472/2920] Fix downtime and comment form redirects

refs #8624
---
 .../application/controllers/DowntimesController.php        | 4 +---
 .../monitoring/application/controllers/ListController.php  | 6 ++++--
 .../application/views/scripts/list/comments.phtml          | 4 +---
 .../application/views/scripts/list/downtimes.phtml         | 3 +--
 .../views/scripts/show/components/comments.phtml           | 7 ++++++-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php
index f6dc53cb3..a5d49cd97 100644
--- a/modules/monitoring/application/controllers/DowntimesController.php
+++ b/modules/monitoring/application/controllers/DowntimesController.php
@@ -123,9 +123,7 @@ class Monitoring_DowntimesController extends Controller
             $this->translate('Confirm removal of %d downtimes.'),
             count($this->downtimes)
         ));
-        $delDowntimeForm->setDowntimes($this->downtimes)
-                ->setRedirectUrl(Url::fromPath('monitoring/list/downtimes'))
-                ->handleRequest();
+        $delDowntimeForm->setDowntimes($this->downtimes)->handleRequest();
         $this->view->delDowntimeForm = $delDowntimeForm;
     }
 }
\ No newline at end of file
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 53b0e1edd..518bd6528 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -3,7 +3,7 @@
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Backend;
-use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentsCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
@@ -295,6 +295,7 @@ class Monitoring_ListController extends Controller
 
         if ($this->Auth()->hasPermission('monitoring/command/downtime/delete')) {
             $this->view->delDowntimeForm = new DeleteDowntimeCommandForm();
+            $this->view->delDowntimeForm->handleRequest();
         }
     }
 
@@ -501,7 +502,8 @@ class Monitoring_ListController extends Controller
         );
 
         if ($this->Auth()->hasPermission('monitoring/command/comment/delete')) {
-            $this->view->delCommentForm = new DeleteCommentsCommandForm();
+            $this->view->delCommentForm = new DeleteCommentCommandForm();
+            $this->view->delCommentForm->handleRequest();
         }
     }
 
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 690095360..f05adff1f 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -86,11 +86,9 @@ if (count($comments) === 0) {
           $delCommentForm->populate(
               array(
                   'comment_id' => $comment->id,
-                  'comment_is_service' => isset($comment->service_description),
-                  'redirect' => $this->url
+                  'comment_is_service' => isset($comment->service_description)
               )
           );
-          $delCommentForm->setAction($this->url('monitoring/comment/remove', array('comment_id' => $comment->id)));
           echo $delCommentForm;
           ?>
         </td>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 1268a4050..0d35b77cd 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -131,10 +131,9 @@ if (count($downtimes) === 0) {
           $delDowntimeForm->populate(
               array(
                   'downtime_id' => $downtime->id,
-                  'redirect' => $this->url
+                  'downtime_is_service' => isset($downtime->service_description)
               )
           );
-          $delDowntimeForm->setAction($this->url('monitoring/downtime/remove', array('downtime_id' => $downtime->id)));
           echo $delDowntimeForm;
           ?>
         </td>
diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index 5a4d351c0..478b1e7f3 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -48,7 +48,12 @@ foreach ($object->comments as $comment) {
         <td data-base-target="_self">
             <?php if (isset($delCommentForm)) { // Form is unset if the current user lacks the respective permission
                 $delCommentForm = clone $delCommentForm;
-                $delCommentForm->populate(array('comment_id' => $comment->id));
+                $delCommentForm->populate(
+                    array(
+                        'comment_id' => $comment->id,
+                        'comment_is_service' => isset($comment->service_description)
+                    )
+                );
                 echo $delCommentForm;
             } ?>
             <span class="sr-only">(<?= $this->translate('Comment'); ?>): </span><?= str_replace(array('\r\n', '\n'), '<br>', $commentText); ?>

From ac599e642ad07703bb3665623854e83ac176a570 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 7 May 2015 16:21:34 +0200
Subject: [PATCH 1473/2920] Add submit button label to multi comment form

refs #8624
---
 .../Object/DeleteCommentsCommandForm.php      | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php
index 57f6aae5a..805002922 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php
@@ -46,24 +46,11 @@ class DeleteCommentsCommandForm extends CommandForm
 
     /**
      * (non-PHPDoc)
-     * @see \Icinga\Web\Form::addSubmitButton() For the method documentation.
+     * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
      */
-    public function addSubmitButton()
+    public function getSubmitLabel()
     {
-        $this->addElement(
-            'button',
-            'btn_submit',
-            array(
-                'ignore'        => true,
-                'escape'        => false,
-                'type'          => 'submit',
-                'class'         => 'link-like',
-                'label'         => $this->getView()->icon('trash'),
-                'title'         => $this->translate('Delete this comment'),
-                'decorators'    => array('ViewHelper')
-            )
-        );
-        return $this;
+        return $this->translatePlural('Remove', 'Remove All', count($this->downtimes));
     }
 
     /**

From 7cf2cb034e30192180377e5842c0508f8dc020c5 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 7 May 2015 16:22:17 +0200
Subject: [PATCH 1474/2920] Remove unused and redundant controller actions

refs #8624
---
 .../application/controllers/CommentController.php      |  9 ---------
 .../Web/Controller/MonitoredObjectController.php       | 10 ----------
 2 files changed, 19 deletions(-)

diff --git a/modules/monitoring/application/controllers/CommentController.php b/modules/monitoring/application/controllers/CommentController.php
index 1c7f3e36d..c97f12558 100644
--- a/modules/monitoring/application/controllers/CommentController.php
+++ b/modules/monitoring/application/controllers/CommentController.php
@@ -77,15 +77,6 @@ class Monitoring_CommentController extends Controller
         }
     }
 
-    /**
-     * Receive DeleteCommentCommandForm post from other controller
-     */
-    public function removeAction()
-    {
-        $this->assertHttpMethod('POST');
-        $this->createDelCommentForm();
-    }
-
     /**
      * Create a command form to delete a single comment
      *
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index ce565df86..9c0921b9e 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -133,16 +133,6 @@ abstract class MonitoredObjectController extends Controller
      */
     abstract public function scheduleDowntimeAction();
 
-    /**
-     * Delete a comment
-     */
-    public function deleteCommentAction()
-    {
-        $this->assertHttpMethod('POST');
-        $this->assertPermission('monitoring/command/comment/delete');
-        $this->handleCommandForm(new DeleteCommentsCommandForm());
-    }
-
     /**
      * Create tabs
      */

From 1fa550838d8bb63c647d8dd6c773ac58bed64544 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 7 May 2015 16:37:35 +0200
Subject: [PATCH 1475/2920] Coding guidelines and cleanup

---
 .../monitoring/application/controllers/CommentsController.php | 2 +-
 .../forms/Command/Object/DeleteDowntimesCommandForm.php       | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/CommentsController.php b/modules/monitoring/application/controllers/CommentsController.php
index 9521af7c9..dcd1523e8 100644
--- a/modules/monitoring/application/controllers/CommentsController.php
+++ b/modules/monitoring/application/controllers/CommentsController.php
@@ -4,7 +4,6 @@
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentsCommandForm;
 use Icinga\Web\Url;
-use Icinga\Web\Widget\Tabextension\DashboardAction;
 use Icinga\Data\Filter\Filter;
 
 /**
@@ -81,6 +80,7 @@ class Monitoring_CommentsController extends Controller
     public function removeAllAction()
     {
         $this->assertPermission('monitoring/command/comment/delete');
+
         $this->view->comments = $this->comments;
         $this->view->listAllLink = Url::fromPath('monitoring/list/comments')
                 ->setQueryString($this->filter->toQueryString());
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
index 566ad572c..4a19cac96 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
@@ -38,9 +38,7 @@ class DeleteDowntimesCommandForm extends CommandForm
             array(
                 'hidden',
                 'redirect',
-                array(
-                    'decorators' => array('ViewHelper')
-                )
+                array('decorators' => array('ViewHelper'))
             )
         ));
         return $this;

From c6c78989a582293904c5742c214b4081e825fd63 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 7 May 2015 17:02:34 +0200
Subject: [PATCH 1476/2920] Fix redirects after deleting a comment

refs #8624
---
 .../application/controllers/CommentController.php    |  5 ++++-
 .../application/controllers/CommentsController.php   | 12 +++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/CommentController.php b/modules/monitoring/application/controllers/CommentController.php
index c97f12558..c3fcd18f8 100644
--- a/modules/monitoring/application/controllers/CommentController.php
+++ b/modules/monitoring/application/controllers/CommentController.php
@@ -64,12 +64,15 @@ class Monitoring_CommentController extends Controller
      */
     public function showAction()
     {
+        $listCommentsLink = Url::fromPath('monitoring/list/comments')
+            ->setQueryString('comment_type=(comment|ack)');
+
         $this->view->comment = $this->comment;
         if ($this->hasPermission('monitoring/command/comment/delete')) {
             $this->view->delCommentForm = $this->createDelCommentForm();
             $this->view->delCommentForm->populate(
                 array(
-                    'redirect' => Url::fromPath('monitoring/list/comments'),
+                    'redirect' => $listCommentsLink,
                     'comment_id' => $this->comment->id,
                     'comment_is_service' => isset($this->comment->service_description)
                 )
diff --git a/modules/monitoring/application/controllers/CommentsController.php b/modules/monitoring/application/controllers/CommentsController.php
index dcd1523e8..64eeeb361 100644
--- a/modules/monitoring/application/controllers/CommentsController.php
+++ b/modules/monitoring/application/controllers/CommentsController.php
@@ -81,9 +81,8 @@ class Monitoring_CommentsController extends Controller
     {
         $this->assertPermission('monitoring/command/comment/delete');
 
-        $this->view->comments = $this->comments;
-        $this->view->listAllLink = Url::fromPath('monitoring/list/comments')
-                ->setQueryString($this->filter->toQueryString());
+        $listCommentsLink = Url::fromPath('monitoring/list/comments')
+            ->setQueryString('comment_type=(comment|ack)');
         $delCommentForm = new DeleteCommentsCommandForm();
         $delCommentForm->setTitle($this->view->translate('Remove all Comments'));
         $delCommentForm->addDescription(sprintf(
@@ -91,8 +90,11 @@ class Monitoring_CommentsController extends Controller
             count($this->comments)
         ));
         $delCommentForm->setComments($this->comments)
-                ->setRedirectUrl(Url::fromPath('monitoring/list/comments'))
-                ->handleRequest();
+            ->setRedirectUrl($listCommentsLink)
+            ->handleRequest();
         $this->view->delCommentForm = $delCommentForm;
+        $this->view->comments = $this->comments;
+        $this->view->listAllLink = Url::fromPath('monitoring/list/comments')
+                ->setQueryString($this->filter->toQueryString());
     }
 }

From 9936df5157e5e701ea6c27eac465b7e5c721fbfa Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus@lazyfrosch.de>
Date: Thu, 7 May 2015 17:08:01 +0200
Subject: [PATCH 1477/2920] Fix current base version to v2.0.0-beta3

We can't really fix tag and release tarballs though.

This is mainly for Jenkins...
---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 2f8540190..a00bf2444 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.0.0-beta2
+v2.0.0-beta3

From 891ce0fe57d8325e94987083eb7ad75aa0c750de Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 7 May 2015 17:19:00 +0200
Subject: [PATCH 1478/2920] UserTest: Fix wrong assert condition for wildcard

---
 test/php/library/Icinga/UserTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/php/library/Icinga/UserTest.php b/test/php/library/Icinga/UserTest.php
index ffdcbd905..dc55dc62d 100644
--- a/test/php/library/Icinga/UserTest.php
+++ b/test/php/library/Icinga/UserTest.php
@@ -73,7 +73,7 @@ class UserTest extends BaseTestCase
         $this->assertTrue($user->can('test/some/specific'));
         $this->assertTrue($user->can('test/more/everything'));
         $this->assertTrue($user->can('test/wildcard-with-wildcard/*'));
-        $this->assertTrue($user->can('test/wildcard/sub/sub'));
+        $this->assertTrue($user->can('test/wildcard-with-wildcard/sub/sub'));
         $this->assertFalse($user->can('not/test'));
         $this->assertFalse($user->can('test/some/not/so/specific'));
         $this->assertFalse($user->can('test/wildcard2/*'));

From 83efc3a4a307158bcda000b071312eeea1c66d92 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 7 May 2015 17:17:24 +0200
Subject: [PATCH 1479/2920] Conform to coding guidelines

---
 .../controllers/DowntimeController.php        |  4 ++--
 .../views/scripts/comment/show.phtml          | 23 +++++++++++--------
 .../Controller/MonitoredObjectController.php  |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/modules/monitoring/application/controllers/DowntimeController.php b/modules/monitoring/application/controllers/DowntimeController.php
index 1fed470fe..c06e0311d 100644
--- a/modules/monitoring/application/controllers/DowntimeController.php
+++ b/modules/monitoring/application/controllers/DowntimeController.php
@@ -82,7 +82,7 @@ class Monitoring_DowntimeController extends Controller
                     'label' => $this->translate('Downtime'),
                     'url'   =>'monitoring/downtimes/show'
                 )
-        )->activate('downtime')->extend(new DashboardAction());
+            )->activate('downtime')->extend(new DashboardAction());
     }
 
     /**
@@ -92,7 +92,7 @@ class Monitoring_DowntimeController extends Controller
     {
         $this->view->downtime = $this->downtime;
         $this->view->isService = $this->isService;
-        $this->view->stateName = isset($this->downtime->service_description) ? 
+        $this->view->stateName = isset($this->downtime->service_description) ?
                 Service::getStateText($this->downtime->service_state) :
                 Host::getStateText($this->downtime->host_state);
         $this->view->listAllLink = Url::fromPath('monitoring/list/downtimes');
diff --git a/modules/monitoring/application/views/scripts/comment/show.phtml b/modules/monitoring/application/views/scripts/comment/show.phtml
index 9010021c3..8216a9c70 100644
--- a/modules/monitoring/application/views/scripts/comment/show.phtml
+++ b/modules/monitoring/application/views/scripts/comment/show.phtml
@@ -18,11 +18,12 @@
         <td>
           <?= $this->icon('service', $this->translate('Service')); ?>
           <?= $this->link()->service(
-           $this->comment->service_description,
-           $this->comment->service_display_name,
-           $this->comment->host_name,
-           $this->comment->host_display_name
-          ); ?>
+                  $this->comment->service_description,
+                  $this->comment->service_display_name,
+                  $this->comment->host_name,
+                  $this->comment->host_display_name
+              );
+          ?>
         </td>
      <?php else: ?>
         <th> <?= $this->translate('Host') ?> </th> 
@@ -31,7 +32,8 @@
           <?= $this->link()->host(
                   $this->comment->host_name,
                   $this->comment->host_display_name
-              ); ?>
+              );
+          ?>
         </td> 
      <?php endif ?>
     </tr>
@@ -55,10 +57,11 @@
       <th><?= $this->translate('Expires') ?></th>
       <td>
           <?= $this->comment->expiration ? sprintf(
-              $this->translate('This comment expires on %s at %s.'),
-              date('d.m.y', $this->comment->expiration),
-              date('H:i', $this->comment->expiration)
-          ) : $this->translate('This comment does not expire.'); ?>
+                  $this->translate('This comment expires on %s at %s.'),
+                  date('d.m.y', $this->comment->expiration),
+                  date('H:i', $this->comment->expiration)
+              ) : $this->translate('This comment does not expire.');
+          ?>
       </td>
     </tr>
   
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 9c0921b9e..9d27b1268 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -62,7 +62,7 @@ abstract class MonitoredObjectController extends Controller
                 ->handleRequest();
             $this->view->checkNowForm = $checkNowForm;
         }
-        if ( ! in_array((int) $this->object->state, array(0, 99))) {
+        if (! in_array((int) $this->object->state, array(0, 99))) {
             if ((bool) $this->object->acknowledged) {
                 if ($auth->hasPermission('monitoring/command/remove-acknowledgement')) {
                     $removeAckForm = new RemoveAcknowledgementCommandForm();

From fff2d5c816cdd12d7aca63123d5d0b4e16ff3922 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 7 May 2015 17:29:46 +0200
Subject: [PATCH 1480/2920] Use consistent controller names

refs #8624
---
 .../monitoring/application/controllers/CommentsController.php | 4 ++--
 .../application/controllers/DowntimesController.php           | 4 ++--
 .../scripts/comments/{remove-all.phtml => delete-all.phtml}   | 0
 .../scripts/downtimes/{remove-all.phtml => delete-all.phtml}  | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename modules/monitoring/application/views/scripts/comments/{remove-all.phtml => delete-all.phtml} (100%)
 rename modules/monitoring/application/views/scripts/downtimes/{remove-all.phtml => delete-all.phtml} (100%)

diff --git a/modules/monitoring/application/controllers/CommentsController.php b/modules/monitoring/application/controllers/CommentsController.php
index 64eeeb361..e9a885dbe 100644
--- a/modules/monitoring/application/controllers/CommentsController.php
+++ b/modules/monitoring/application/controllers/CommentsController.php
@@ -70,14 +70,14 @@ class Monitoring_CommentsController extends Controller
         $this->view->comments = $this->comments;
         $this->view->listAllLink = Url::fromPath('monitoring/list/comments')
                 ->setQueryString($this->filter->toQueryString());
-        $this->view->removeAllLink = Url::fromPath('monitoring/comments/remove-all')
+        $this->view->removeAllLink = Url::fromPath('monitoring/comments/delete-all')
                 ->setParams($this->params);
     }
 
     /**
      * Display the form for removing a comment list
      */
-    public function removeAllAction()
+    public function deleteAllAction()
     {
         $this->assertPermission('monitoring/command/comment/delete');
 
diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php
index a5d49cd97..dfd5a6758 100644
--- a/modules/monitoring/application/controllers/DowntimesController.php
+++ b/modules/monitoring/application/controllers/DowntimesController.php
@@ -104,14 +104,14 @@ class Monitoring_DowntimesController extends Controller
         $this->view->downtimes = $this->downtimes;
         $this->view->listAllLink = Url::fromPath('monitoring/list/downtimes')
                 ->setQueryString($this->filter->toQueryString());
-        $this->view->removeAllLink = Url::fromPath('monitoring/downtimes/remove-all')
+        $this->view->removeAllLink = Url::fromPath('monitoring/downtimes/delete-all')
                 ->setParams($this->params);
     }
 
     /**
      * Display the form for removing a downtime list
      */
-    public function removeAllAction()
+    public function deleteAllAction()
     {
         $this->assertPermission('monitoring/command/downtime/delete');
         $this->view->downtimes = $this->downtimes;
diff --git a/modules/monitoring/application/views/scripts/comments/remove-all.phtml b/modules/monitoring/application/views/scripts/comments/delete-all.phtml
similarity index 100%
rename from modules/monitoring/application/views/scripts/comments/remove-all.phtml
rename to modules/monitoring/application/views/scripts/comments/delete-all.phtml
diff --git a/modules/monitoring/application/views/scripts/downtimes/remove-all.phtml b/modules/monitoring/application/views/scripts/downtimes/delete-all.phtml
similarity index 100%
rename from modules/monitoring/application/views/scripts/downtimes/remove-all.phtml
rename to modules/monitoring/application/views/scripts/downtimes/delete-all.phtml

From 8c5f2662ea9d99485283e973ee095a251b2f07c7 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 7 May 2015 17:33:38 +0200
Subject: [PATCH 1481/2920] Fix redirects in downtime multi view

refs #8624
---
 .../monitoring/application/controllers/DowntimesController.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php
index dfd5a6758..49424ed3a 100644
--- a/modules/monitoring/application/controllers/DowntimesController.php
+++ b/modules/monitoring/application/controllers/DowntimesController.php
@@ -123,6 +123,7 @@ class Monitoring_DowntimesController extends Controller
             $this->translate('Confirm removal of %d downtimes.'),
             count($this->downtimes)
         ));
+        $delDowntimeForm->setRedirectUrl(Url::fromPath('monitoring/list/downtimes'));
         $delDowntimeForm->setDowntimes($this->downtimes)->handleRequest();
         $this->view->delDowntimeForm = $delDowntimeForm;
     }

From 1e1b9540f02f6a6f859ca1b7766c86436b70a012 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 8 May 2015 09:54:45 +0200
Subject: [PATCH 1482/2920] UserController: Add backend selection control

refs #8826
---
 application/controllers/UserController.php | 67 +++++++++++++++++-----
 application/views/scripts/user/list.phtml  |  5 +-
 public/css/icinga/main-content.less        | 18 ++++++
 3 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index ccb5aac03..0f3a073a3 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -5,8 +5,8 @@ use \Zend_Controller_Action_Exception;
 use Icinga\Application\Config;
 use Icinga\Authentication\User\UserBackend;
 use Icinga\Authentication\User\UserBackendInterface;
-use Icinga\Data\Selectable;
 use Icinga\Web\Controller;
+use Icinga\Web\Form;
 use Icinga\Web\Widget;
 
 class UserController extends Controller
@@ -32,6 +32,26 @@ class UserController extends Controller
      */
     public function listAction()
     {
+        $backendNames = array_map(
+            function ($b) { return $b->getName(); },
+            $this->loadUserBackends('Icinga\Data\Selectable')
+        );
+        $this->view->backendSelection = new Form();
+        $this->view->backendSelection->setAttrib('class', 'backend-selection');
+        $this->view->backendSelection->setUidDisabled();
+        $this->view->backendSelection->setMethod('GET');
+        $this->view->backendSelection->setTokenDisabled();
+        $this->view->backendSelection->addElement(
+            'select',
+            'backend',
+            array(
+                'autosubmit'    => true,
+                'label'         => $this->translate('Authentication Backend'),
+                'multiOptions'  => array_combine($backendNames, $backendNames),
+                'value'         => $this->params->get('backend')
+            )
+        );
+
         $backend = $this->getUserBackend($this->params->get('backend'));
         if ($backend === null) {
             $this->view->backend = null;
@@ -67,20 +87,40 @@ class UserController extends Controller
         ));
     }
 
+    /**
+     * Return all user backends implementing the given interface
+     *
+     * @param   string  $interface      The class path of the interface, or null if no interface check should be made
+     *
+     * @return  array
+     */
+    protected function loadUserBackends($interface = null)
+    {
+        $backends = array();
+        foreach (Config::app('authentication') as $backendName => $backendConfig) {
+            $candidate = UserBackend::create($backendName, $backendConfig);
+            if (! $interface || $candidate instanceof $interface) {
+                $backends[] = $candidate;
+            }
+        }
+
+        return $backends;
+    }
+
     /**
      * Return the given user backend or the first match in order
      *
      * @param   string  $name           The name of the backend, or null in case the first match should be returned
-     * @param   bool    $selectable     Whether the backend should implement the Selectable interface
+     * @param   string  $interface      The interface the backend should implement, no interface check if null
      *
      * @return  UserBackendInterface
      *
      * @throws  Zend_Controller_Action_Exception    In case the given backend name is invalid
      */
-    protected function getUserBackend($name = null, $selectable = true)
+    protected function getUserBackend($name = null, $interface = 'Icinga\Data\Selectable')
     {
-        $config = Config::app('authentication');
         if ($name !== null) {
+            $config = Config::app('authentication');
             if (! $config->hasSection($name)) {
                 throw new Zend_Controller_Action_Exception(
                     sprintf($this->translate('Authentication backend "%s" not found'), $name),
@@ -88,22 +128,21 @@ class UserController extends Controller
                 );
             } else {
                 $backend = UserBackend::create($name, $config->getSection($name));
-                if ($selectable && !$backend instanceof Selectable) {
+                if ($interface && !$backend instanceof $interface) {
+                    $interfaceParts = explode('\\', strtolower($interface));
                     throw new Zend_Controller_Action_Exception(
-                        sprintf($this->translate('Authentication backend "%s" is not able to list users'), $name),
+                        sprintf(
+                            $this->translate('Authentication backend "%s" is not %s'),
+                            $name,
+                            array_pop($interfaceParts)
+                        ),
                         400
                     );
                 }
             }
         } else {
-            $backend = null;
-            foreach ($config as $backendName => $backendConfig) {
-                $candidate = UserBackend::create($backendName, $backendConfig);
-                if (! $selectable || $candidate instanceof Selectable) {
-                    $backend = $candidate;
-                    break;
-                }
-            }
+            $backends = $this->loadUserBackends($interface);
+            $backend = array_shift($backends);
         }
 
         return $backend;
diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index b6ff7e0ef..a914312c0 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -4,7 +4,10 @@
   <?= $this->sortBox; ?>
   <?= $this->limiter; ?>
   <?= $this->paginator; ?>
-  <?= $this->filterEditor; ?>
+  <div>
+    <?= $this->backendSelection; ?>
+    <?= $this->filterEditor; ?>
+  </div>
 </div>
 <?php endif ?>
 <div class="content">
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 830ecdd44..a3e8cb69c 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -241,4 +241,22 @@ table.group-list {
   td.group-parent, td.group-created, td.group-modified {
     text-align: right;
   }
+}
+
+form.backend-selection {
+  float: right;
+
+  div.element {
+    margin: 0;
+
+    label {
+      width: auto;
+      margin-right: 0.5em;
+    }
+
+    select {
+      width: 11.5em;
+      margin-left: 0;
+    }
+  }
 }
\ No newline at end of file

From 5ace0a08f3e23ce31d5f6d933b8c79c14c0ea66b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 8 May 2015 09:56:07 +0200
Subject: [PATCH 1483/2920] GroupController: Add backend selection control

refs #8826
---
 application/controllers/GroupController.php | 67 ++++++++++++++++-----
 application/views/scripts/group/list.phtml  |  5 +-
 2 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index ffa32584a..d7a208826 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -5,8 +5,8 @@ use \Zend_Controller_Action_Exception;
 use Icinga\Application\Config;
 use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Authentication\UserGroup\UserGroupBackendInterface;
-use Icinga\Data\Selectable;
 use Icinga\Web\Controller;
+use Icinga\Web\Form;
 use Icinga\Web\Widget;
 
 class GroupController extends Controller
@@ -32,6 +32,26 @@ class GroupController extends Controller
      */
     public function listAction()
     {
+        $backendNames = array_map(
+            function ($b) { return $b->getName(); },
+            $this->loadUserGroupBackends('Icinga\Data\Selectable')
+        );
+        $this->view->backendSelection = new Form();
+        $this->view->backendSelection->setAttrib('class', 'backend-selection');
+        $this->view->backendSelection->setUidDisabled();
+        $this->view->backendSelection->setMethod('GET');
+        $this->view->backendSelection->setTokenDisabled();
+        $this->view->backendSelection->addElement(
+            'select',
+            'backend',
+            array(
+                'autosubmit'    => true,
+                'label'         => $this->translate('Usergroup Backend'),
+                'multiOptions'  => array_combine($backendNames, $backendNames),
+                'value'         => $this->params->get('backend')
+            )
+        );
+
         $backend = $this->getUserGroupBackend($this->params->get('backend'));
         if ($backend === null) {
             $this->view->backend = null;
@@ -67,20 +87,40 @@ class GroupController extends Controller
         ));
     }
 
+    /**
+     * Return all user group backends implementing the given interface
+     *
+     * @param   string  $interface      The class path of the interface, or null if no interface check should be made
+     *
+     * @return  array
+     */
+    protected function loadUserGroupBackends($interface = null)
+    {
+        $backends = array();
+        foreach (Config::app('groups') as $backendName => $backendConfig) {
+            $candidate = UserGroupBackend::create($backendName, $backendConfig);
+            if (! $interface || $candidate instanceof $interface) {
+                $backends[] = $candidate;
+            }
+        }
+
+        return $backends;
+    }
+
     /**
      * Return the given user group backend or the first match in order
      *
      * @param   string  $name           The name of the backend, or null in case the first match should be returned
-     * @param   bool    $selectable     Whether the backend should implement the Selectable interface
+     * @param   string  $interface      The interface the backend should implement, no interface check if null
      *
      * @return  UserGroupBackendInterface
      *
      * @throws  Zend_Controller_Action_Exception    In case the given backend name is invalid
      */
-    protected function getUserGroupBackend($name = null, $selectable = true)
+    protected function getUserGroupBackend($name = null, $interface = 'Icinga\Data\Selectable')
     {
-        $config = Config::app('groups');
         if ($name !== null) {
+            $config = Config::app('groups');
             if (! $config->hasSection($name)) {
                 throw new Zend_Controller_Action_Exception(
                     sprintf($this->translate('User group backend "%s" not found'), $name),
@@ -88,22 +128,21 @@ class GroupController extends Controller
                 );
             } else {
                 $backend = UserGroupBackend::create($name, $config->getSection($name));
-                if ($selectable && !$backend instanceof Selectable) {
+                if ($interface && !$backend instanceof $interface) {
+                    $interfaceParts = explode('\\', strtolower($interface));
                     throw new Zend_Controller_Action_Exception(
-                        sprintf($this->translate('User group backend "%s" is not able to list groups'), $name),
+                        sprintf(
+                            $this->translate('User group backend "%s" is not %s'),
+                            $name,
+                            array_pop($interfaceParts)
+                        ),
                         400
                     );
                 }
             }
         } else {
-            $backend = null;
-            foreach ($config as $backendName => $backendConfig) {
-                $candidate = UserGroupBackend::create($backendName, $backendConfig);
-                if (! $selectable || $candidate instanceof Selectable) {
-                    $backend = $candidate;
-                    break;
-                }
-            }
+            $backends = $this->loadUserGroupBackends($interface);
+            $backend = array_shift($backends);
         }
 
         return $backend;
diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
index 3871b675e..6e63fafdb 100644
--- a/application/views/scripts/group/list.phtml
+++ b/application/views/scripts/group/list.phtml
@@ -4,7 +4,10 @@
   <?= $this->sortBox; ?>
   <?= $this->limiter; ?>
   <?= $this->paginator; ?>
-  <?= $this->filterEditor; ?>
+  <div>
+    <?= $this->backendSelection; ?>
+    <?= $this->filterEditor; ?>
+  </div>
 </div>
 <?php endif ?>
 <div class="content">

From 938da806cae8fa9dc44814b4a5de0510aab7ba81 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 8 May 2015 12:15:02 +0200
Subject: [PATCH 1484/2920] Repository: Recurse a filter in the repository
 instead of in the query

This allows to recurse and adjust a filter outside the query context as well

refs #8826
---
 library/Icinga/Repository/Repository.php      | 19 ++++++++++++++++++
 library/Icinga/Repository/RepositoryQuery.php | 20 ++-----------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index c4ff95ce2..3ecdbe61c 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -4,6 +4,7 @@
 namespace Icinga\Repository;
 
 use Icinga\Application\Logger;
+use Icinga\Data\Filter\Filter;
 use Icinga\Data\Selectable;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Exception\QueryException;
@@ -471,6 +472,24 @@ abstract class Repository implements Selectable
         }
     }
 
+    /**
+     * Recurse the given filter, require each filter column and convert all values
+     *
+     * @param   Filter  $filter
+     */
+    public function requireFilter(Filter $filter)
+    {
+        if ($filter->isExpression()) {
+            $column = $filter->getColumn();
+            $filter->setColumn($this->requireFilterColumn($column));
+            $filter->setExpression($this->persistColumn($column, $filter->getExpression()));
+        } elseif ($filter->isChain()) {
+            foreach ($filter->filters() as $chainOrExpression) {
+                $this->requireFilter($chainOrExpression);
+            }
+        }
+    }
+
     /**
      * Return this repository's query columns mapped to their respective aliases
      *
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index 8c47bf6ff..806bdd93a 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -164,7 +164,7 @@ class RepositoryQuery implements QueryInterface
      */
     public function setFilter(Filter $filter)
     {
-        $this->requireFilterColumns($filter);
+        $this->repository->requireFilter($filter);
         $this->query->setFilter($filter);
         return $this;
     }
@@ -180,27 +180,11 @@ class RepositoryQuery implements QueryInterface
      */
     public function addFilter(Filter $filter)
     {
-        $this->requireFilterColumns($filter);
+        $this->repository->requireFilter($filter);
         $this->query->addFilter($filter);
         return $this;
     }
 
-    /**
-     * Recurse the given filter and notify the repository about each required filter column
-     */
-    protected function requireFilterColumns(Filter $filter)
-    {
-        if ($filter->isExpression()) {
-            $column = $filter->getColumn();
-            $filter->setColumn($this->repository->requireFilterColumn($column));
-            $filter->setExpression($this->repository->persistColumn($column, $filter->getExpression()));
-        } elseif ($filter->isChain()) {
-            foreach ($filter->filters() as $chainOrExpression) {
-                $this->requireFilterColumns($chainOrExpression);
-            }
-        }
-    }
-
     /**
      * Return the current filter
      *

From 12ff708ac0c4af9653b562714fadd8bad3806fe8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 8 May 2015 15:17:36 +0200
Subject: [PATCH 1485/2920] Introduce exception StatementException

refs #8826
---
 library/Icinga/Exception/StatementException.php | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 library/Icinga/Exception/StatementException.php

diff --git a/library/Icinga/Exception/StatementException.php b/library/Icinga/Exception/StatementException.php
new file mode 100644
index 000000000..0bf2bb80a
--- /dev/null
+++ b/library/Icinga/Exception/StatementException.php
@@ -0,0 +1,8 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Exception;
+
+class StatementException extends IcingaException
+{
+}

From 84f20ecb5fff4df843d082e033363a262d5d6e7c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 8 May 2015 15:18:28 +0200
Subject: [PATCH 1486/2920] Introduce interface Extensible

refs #8826
---
 library/Icinga/Data/Extensible.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 library/Icinga/Data/Extensible.php

diff --git a/library/Icinga/Data/Extensible.php b/library/Icinga/Data/Extensible.php
new file mode 100644
index 000000000..8b9f39d42
--- /dev/null
+++ b/library/Icinga/Data/Extensible.php
@@ -0,0 +1,22 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Data;
+
+use Icinga\Exception\StatementException;
+
+/**
+ * Interface for data insertion
+ */
+interface Extensible
+{
+    /**
+     * Insert the given data for the given target
+     *
+     * @param   string  $target
+     * @param   array   $data
+     *
+     * @throws  StatementException
+     */
+    public function insert($target, array $data);
+}

From 2c1fac9da8cebda0bf1b24c9d7f58cfa65055b2d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 8 May 2015 15:18:42 +0200
Subject: [PATCH 1487/2920] Introduce interface Reducible

refs #8826
---
 library/Icinga/Data/Reducible.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 library/Icinga/Data/Reducible.php

diff --git a/library/Icinga/Data/Reducible.php b/library/Icinga/Data/Reducible.php
new file mode 100644
index 000000000..bfe627243
--- /dev/null
+++ b/library/Icinga/Data/Reducible.php
@@ -0,0 +1,23 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Data;
+
+use Icinga\Data\Filter\Filter;
+use Icinga\Exception\StatementException;
+
+/**
+ * Interface for data deletion
+ */
+interface Reducible
+{
+    /**
+     * Delete entries in the given target, optionally limiting the affected entries by using a filter
+     *
+     * @param   string  $target
+     * @param   Filter  $filter
+     *
+     * @throws  StatementException
+     */
+    public function delete($target, Filter $filter = null);
+}

From 8690056e1c664123d51336b71ed83cb52bba1bf4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 8 May 2015 15:18:56 +0200
Subject: [PATCH 1488/2920] Introduce interface Updatable

refs #8826
---
 library/Icinga/Data/Updatable.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 library/Icinga/Data/Updatable.php

diff --git a/library/Icinga/Data/Updatable.php b/library/Icinga/Data/Updatable.php
new file mode 100644
index 000000000..ec07537cb
--- /dev/null
+++ b/library/Icinga/Data/Updatable.php
@@ -0,0 +1,24 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Data;
+
+use Icinga\Data\Filter\Filter;
+use Icinga\Exception\StatementException;
+
+/**
+ * Interface for data updating
+ */
+interface Updatable
+{
+    /**
+     * Update the target with the given data and optionally limit the affected entries by using a filter
+     *
+     * @param   string  $target
+     * @param   array   $data
+     * @param   Filter  $filter
+     *
+     * @throws  StatementException
+     */
+    public function update($target, array $data, Filter $filter = null);
+}

From 6ef4bbe21021e4998945daabd4e97592366e8f4a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 8 May 2015 15:22:51 +0200
Subject: [PATCH 1489/2920] Introduce class IniRepository

refs #8826
---
 library/Icinga/Repository/IniRepository.php | 201 ++++++++++++++++++++
 library/Icinga/Repository/Repository.php    |  53 ++++++
 2 files changed, 254 insertions(+)
 create mode 100644 library/Icinga/Repository/IniRepository.php

diff --git a/library/Icinga/Repository/IniRepository.php b/library/Icinga/Repository/IniRepository.php
new file mode 100644
index 000000000..7953422be
--- /dev/null
+++ b/library/Icinga/Repository/IniRepository.php
@@ -0,0 +1,201 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Repository;
+
+use Exception;
+use Icinga\Data\Extensible;
+use Icinga\Data\Filter\Filter;
+use Icinga\Data\Updatable;
+use Icinga\Data\Reducible;
+use Icinga\Exception\ProgrammingError;
+use Icinga\Exception\StatementException;
+
+/**
+ * Abstract base class for concrete INI repository implementations
+ *
+ * Additionally provided features:
+ * <ul>
+ *  <li>Insert, update and delete capabilities</li>
+ * </ul>
+ */
+abstract class IniRepository extends Repository implements Extensible, Updatable, Reducible
+{
+    /**
+     * Insert the given data for the given target
+     *
+     * In case the data source provides a valid key column, $data must provide a proper
+     * value for it which is then being used as the section name instead of $target.
+     *
+     * @param   string  $target
+     * @param   array   $data
+     *
+     * @throws  StatementException  In case the operation has failed
+     */
+    public function insert($target, array $data)
+    {
+        $newData = $this->requireStatementColumns($data);
+        $section = $this->extractSectionName($target, $newData);
+
+        if ($this->ds->hasSection($section)) {
+            throw new StatementException(t('Cannot insert. Section "%s" does already exist'), $section);
+        }
+
+        $this->ds->setSection($section, $newData);
+
+        try {
+            $this->ds->saveIni();
+        } catch (Exception $e) {
+            throw new StatementException(t('Failed to insert. An error occurred: %s'), $e->getMessage());
+        }
+    }
+
+    /**
+     * Update the target with the given data and optionally limit the affected entries by using a filter
+     *
+     * The section(s) to update are either identified by $filter or $target, in order. If neither of both
+     * is given, all sections provided by the data source are going to be updated. Uniqueness of a section's
+     * name will be ensured.
+     *
+     * @param   string  $target
+     * @param   array   $data
+     * @param   Filter  $filter
+     *
+     * @throws  StatementException  In case the operation has failed
+     */
+    public function update($target, array $data, Filter $filter = null)
+    {
+        $newData = $this->requireStatementColumns($data);
+        $keyColumn = $this->ds->getConfigObject()->getKeyColumn();
+        if ($keyColumn && $filter === null && isset($newData[$keyColumn]) && !$this->ds->hasSection($target)) {
+            throw new StatementException(
+                t('Cannot update. Column "%s" holds a section\'s name which must be unique'),
+                $keyColumn
+            );
+        }
+
+        if ($target && !$filter) {
+            if (! $this->ds->hasSection($target)) {
+                throw new StatementException(t('Cannot update. Section "%s" does not exist'), $target);
+            }
+
+            $results = array($target => $this->ds->getSection($target));
+        } else {
+            $query = $this->ds->select();
+            if ($filter) {
+                $this->requireFilter($filter);
+                $query->applyFilter($filter);
+            }
+
+            $results = $query->fetchAll();
+        }
+
+        $newSection = null;
+        foreach ($results as $section => $config) {
+            if ($newSection !== null) {
+                throw new StatementException(
+                    t('Cannot update. Column "%s" holds a section\'s name which must be unique'),
+                    $keyColumn
+                );
+            }
+
+            foreach ($newData as $column => $value) {
+                if ($keyColumn && $column === $keyColumn) {
+                    $newSection = $value;
+                } else {
+                    $config->$column = $value;
+                }
+            }
+
+            if ($keyColumn && isset($config->$keyColumn) && $config->$keyColumn === $section) {
+                unset($config->$keyColumn);
+            }
+
+            if ($newSection) {
+                if ($this->ds->hasSection($newSection)) {
+                    throw new StatementException(t('Cannot update. Section "%s" does already exist'), $newSection);
+                }
+
+                $this->ds->removeSection($section)->setSection($newSection, $config);
+            } else {
+                $this->ds->setSection($section, $config);
+            }
+        }
+
+        try {
+            $this->ds->saveIni();
+        } catch (Exception $e) {
+            throw new StatementException(t('Failed to update. An error occurred: %s'), $e->getMessage());
+        }
+    }
+
+    /**
+     * Delete entries in the given target, optionally limiting the affected entries by using a filter
+     *
+     * The section(s) to delete are either identified by $filter or $target, in order. If neither of both
+     * is given, all sections provided by the data source are going to be deleted.
+     *
+     * @param   string  $target
+     * @param   Filter  $filter
+     *
+     * @throws  StatementException  In case the operation has failed
+     */
+    public function delete($target, Filter $filter = null)
+    {
+        if ($target && !$filter) {
+            if (! $this->ds->hasSection($target)) {
+                return; // Nothing to do
+            }
+
+            $results = array($target => $this->ds->getSection($target));
+        } else {
+            $query = $this->ds->select();
+            if ($filter) {
+                $this->requireFilter($filter);
+                $query->applyFilter($filter);
+            }
+
+            $results = $query->fetchAll();
+        }
+
+        foreach ($results as $section => $_) {
+            $this->ds->removeSection($section);
+        }
+
+        try {
+            $this->ds->saveIni();
+        } catch (Exception $e) {
+            throw new StatementException(t('Failed to delete. An error occurred: %s'), $e->getMessage());
+        }
+    }
+
+    /**
+     * Extract and return the section name off of the given $data, if available, or validate $target
+     *
+     * @param   string  $target
+     * @param   array   $data
+     *
+     * @return  string
+     *
+     * @throws  ProgrammingError    In case no valid section name is available
+     */
+    protected function extractSectionName($target, array & $data)
+    {
+        if (($keyColumn = $this->ds->getConfigObject()->getKeyColumn())) {
+            if (! isset($data[$keyColumn])) {
+                throw new ProgrammingError('$data does not provide a value for key column "%s"', $keyColumn);
+            }
+
+            $target = $data[$keyColumn];
+            unset($data[$keyColumn]);
+        }
+
+        if (! is_string($target)) {
+            throw new ProgrammingError(
+                'Neither the data source nor the $target parameter provide a valid section name'
+            );
+        }
+
+        return $target;
+    }
+}
diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index 3ecdbe61c..1726426ba 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -8,6 +8,7 @@ use Icinga\Data\Filter\Filter;
 use Icinga\Data\Selectable;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Exception\QueryException;
+use Icinga\Exception\StatementException;
 
 /**
  * Abstract base class for concrete repository implementations
@@ -573,4 +574,56 @@ abstract class Repository implements Selectable
 
         return $aliasColumnMap[$name];
     }
+
+    /**
+     * Return whether the given column name or alias is a valid statement column
+     *
+     * @param   string  $name   The column name or alias to check
+     *
+     * @return  bool
+     */
+    public function hasStatementColumn($name)
+    {
+        return $this->hasQueryColumn($name);
+    }
+
+    /**
+     * Validate that the given column is a valid statement column and return it or the actual name if it's an alias
+     *
+     * @param   string  $name       The name or alias of the column to validate
+     *
+     * @return  string              The given column's name
+     *
+     * @throws  StatementException  In case the given column is not a statement column
+     */
+    public function requireStatementColumn($name)
+    {
+        if (in_array($name, $this->filterColumns)) {
+            throw new StatementException('Filter column "%s" cannot be referenced in a statement', $name);
+        }
+
+        $aliasColumnMap = $this->getAliasColumnMap();
+        if (! array_key_exists($name, $aliasColumnMap)) {
+            throw new StatementException('Statement column "%s" not found', $name);
+        }
+
+        return $aliasColumnMap[$name];
+    }
+
+    /**
+     * Resolve the given aliases or column names supposed to be persisted and convert their values
+     *
+     * @param   array   $data
+     *
+     * @return  array
+     */
+    public function requireStatementColumns(array $data)
+    {
+        $resolved = array();
+        foreach ($data as $alias => $value) {
+            $resolved[$this->requireStatementColumn($alias)] = $this->persistColumn($alias, $value);
+        }
+
+        return $resolved;
+    }
 }

From 59ec11f0476b40632a5a32e2a05b8ad09fcb14d4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 8 May 2015 15:26:35 +0200
Subject: [PATCH 1490/2920] IniUserGroupBackend: Extend IniRepository

We are now able to insert, update and delete user groups stored in INI files

refs #8826
---
 .../UserGroup/IniUserGroupBackend.php         | 35 +++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
index ba92093aa..62fed0179 100644
--- a/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
@@ -3,11 +3,13 @@
 
 namespace Icinga\Authentication\UserGroup;
 
-use Icinga\Repository\Repository;
+use Icinga\Exception\StatementException;
+use Icinga\Data\Filter\Filter;
+use Icinga\Repository\IniRepository;
 use Icinga\User;
 use Icinga\Util\String;
 
-class IniUserGroupBackend extends Repository implements UserGroupBackendInterface
+class IniUserGroupBackend extends IniRepository implements UserGroupBackendInterface
 {
     /**
      * The query columns being provided
@@ -55,6 +57,35 @@ class IniUserGroupBackend extends Repository implements UserGroupBackendInterfac
         $this->ds->getConfigObject()->setKeyColumn('name');
     }
 
+    /**
+     * Add a new group to this backend
+     *
+     * @param   string  $target
+     * @param   array   $data
+     *
+     * @throws  StatementException  In case the operation has failed
+     */
+    public function insert($target, array $data)
+    {
+        $data['created_at'] = time();
+        parent::insert($target, $data);
+    }
+
+    /**
+     * Update groups of this backend, optionally limited using a filter
+     *
+     * @param   string  $target
+     * @param   array   $data
+     * @param   Filter  $filter
+     *
+     * @throws  StatementException  In case the operation has failed
+     */
+    public function update($target, array $data, Filter $filter = null)
+    {
+        $data['last_modified'] = time();
+        parent::update($target, $data, $filter);
+    }
+
     /**
      * Return the groups the given user is a member of
      *

From f1c82fc3188885069298f075858baf2c4ff770f4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 8 May 2015 15:28:10 +0200
Subject: [PATCH 1491/2920] IniUserGroupBackend: Convert timestamps and
 arrays...

...to formatted datetime strings and comma separated strings respectively

refs #8826
---
 .../UserGroup/IniUserGroupBackend.php         |  11 ++
 library/Icinga/Repository/Repository.php      | 100 ++++++++++++++++++
 2 files changed, 111 insertions(+)

diff --git a/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
index 62fed0179..e70c9953c 100644
--- a/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
@@ -49,6 +49,17 @@ class IniUserGroupBackend extends IniRepository implements UserGroupBackendInter
         )
     );
 
+    /**
+     * The value conversion rules to apply on a query
+     *
+     * @var array
+     */
+    protected $conversionRules = array(
+        'created_at'    => 'date_time',
+        'last_modified' => 'date_time',
+        'users'         => 'comma_separated_string'
+    );
+
     /**
      * Initialize this ini user group backend
      */
diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index 1726426ba..f33140b1f 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -3,12 +3,14 @@
 
 namespace Icinga\Repository;
 
+use DateTime;
 use Icinga\Application\Logger;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Selectable;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Exception\QueryException;
 use Icinga\Exception\StatementException;
+use Icinga\Util\String;
 
 /**
  * Abstract base class for concrete repository implementations
@@ -22,6 +24,11 @@ use Icinga\Exception\StatementException;
  */
 abstract class Repository implements Selectable
 {
+    /**
+     * The format to use when converting values of type date_time
+     */
+    const DATETIME_FORMAT = 'd/m/Y g:i A';
+
     /**
      * The name of this repository
      *
@@ -473,6 +480,99 @@ abstract class Repository implements Selectable
         }
     }
 
+    /**
+     * Convert a timestamp or DateTime object to a string formatted using static::DATETIME_FORMAT
+     *
+     * @param   mixed   $value
+     *
+     * @return  string
+     */
+    protected function persistDateTime($value)
+    {
+        if (is_numeric($value)) {
+            $value = date(static::DATETIME_FORMAT, $value);
+        } elseif ($value instanceof DateTime) {
+            $value = date(static::DATETIME_FORMAT, $value->getTimestamp()); // Using date here, to ignore any timezone
+        } elseif ($value !== null) {
+            throw new ProgrammingError(
+                'Cannot persist value "%s" as type date_time. It\'s not a timestamp or DateTime object',
+                $value
+            );
+        }
+
+        return $value;
+    }
+
+    /**
+     * Convert a string formatted using static::DATETIME_FORMAT to a unix timestamp
+     *
+     * @param   string  $value
+     *
+     * @return  int
+     */
+    protected function retrieveDateTime($value)
+    {
+        if (is_numeric($value)) {
+            $value = (int) $value;
+        } elseif (is_string($value)) {
+            $dateTime = DateTime::createFromFormat(static::DATETIME_FORMAT, $value);
+            if ($dateTime === false) {
+                Logger::debug(
+                    'Unable to parse string "%s" as type date_time with format "%s" in repository "%s"',
+                    $value,
+                    static::DATETIME_FORMAT,
+                    $this->getName()
+                );
+                $value = null;
+            } else {
+                $value = $dateTime->getTimestamp();
+            }
+        } elseif ($value !== null) {
+            throw new ProgrammingError(
+                'Cannot retrieve value "%s" as type date_time. It\'s not a integer or (numeric) string',
+                $value
+            );
+        }
+
+        return $value;
+    }
+
+    /**
+     * Convert the given array to an comma separated string
+     *
+     * @param   array|string    $value
+     *
+     * @return  string
+     */
+    protected function persistCommaSeparatedString($value)
+    {
+        if (is_array($value)) {
+            $value = join(',', array_map('trim', $value));
+        } elseif ($value !== null && !is_string($value)) {
+            throw new ProgrammingError('Cannot persist value "%s" as comma separated string', $value);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Convert the given comma separated string to an array
+     *
+     * @param   string  $value
+     *
+     * @return  array
+     */
+    protected function retrieveCommaSeparatedString($value)
+    {
+        if ($value && is_string($value)) {
+            $value = String::trimSplit($value);
+        } elseif ($value !== null) {
+            throw new ProgrammingError('Cannot retrieve value "%s" as array. It\'s not a string', $value);
+        }
+
+        return $value;
+    }
+
     /**
      * Recurse the given filter, require each filter column and convert all values
      *

From 30bc1db6ee44de9a80c066503e3da32ff2cb3391 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 11 May 2015 07:46:36 +0200
Subject: [PATCH 1492/2920] IniRepository: There is no need to fetch the
 results using a query

Icinga\Application\Config is iterable.

refs #8826
---
 library/Icinga/Repository/IniRepository.php | 30 +++++++++------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/library/Icinga/Repository/IniRepository.php b/library/Icinga/Repository/IniRepository.php
index 7953422be..6b95fcdc1 100644
--- a/library/Icinga/Repository/IniRepository.php
+++ b/library/Icinga/Repository/IniRepository.php
@@ -79,19 +79,21 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
                 throw new StatementException(t('Cannot update. Section "%s" does not exist'), $target);
             }
 
-            $results = array($target => $this->ds->getSection($target));
+            $contents = array($target => $this->ds->getSection($target));
         } else {
-            $query = $this->ds->select();
             if ($filter) {
                 $this->requireFilter($filter);
-                $query->applyFilter($filter);
             }
 
-            $results = $query->fetchAll();
+            $contents = iterator_to_array($this->ds);
         }
 
         $newSection = null;
-        foreach ($results as $section => $config) {
+        foreach ($contents as $section => $config) {
+            if ($filter && !$filter->matches($config)) {
+                continue;
+            }
+
             if ($newSection !== null) {
                 throw new StatementException(
                     t('Cannot update. Column "%s" holds a section\'s name which must be unique'),
@@ -107,10 +109,6 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
                 }
             }
 
-            if ($keyColumn && isset($config->$keyColumn) && $config->$keyColumn === $section) {
-                unset($config->$keyColumn);
-            }
-
             if ($newSection) {
                 if ($this->ds->hasSection($newSection)) {
                     throw new StatementException(t('Cannot update. Section "%s" does already exist'), $newSection);
@@ -147,19 +145,17 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
                 return; // Nothing to do
             }
 
-            $results = array($target => $this->ds->getSection($target));
+            $this->ds->removeSection($target);
         } else {
-            $query = $this->ds->select();
             if ($filter) {
                 $this->requireFilter($filter);
-                $query->applyFilter($filter);
             }
 
-            $results = $query->fetchAll();
-        }
-
-        foreach ($results as $section => $_) {
-            $this->ds->removeSection($section);
+            foreach (iterator_to_array($this->ds) as $section => $config) {
+                if (! $filter || $filter->matches($config)) {
+                    $this->ds->removeSection($section);
+                }
+            }
         }
 
         try {

From c3b4ea71d3a65ef1cb454141f80bb55acae91ed4 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 11 May 2015 10:32:34 +0200
Subject: [PATCH 1493/2920] Add ido schema and instance availability validation

refs #9203
---
 .../forms/Config/BackendConfigForm.php        | 63 +++++++++++++++++++
 .../forms/Setup/IdoResourcePage.php           | 11 +++-
 2 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index d89c6623f..567f7a575 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -3,6 +3,10 @@
 
 namespace Icinga\Module\Monitoring\Forms\Config;
 
+use Exception;
+use Icinga\Data\ConfigObject;
+use Icinga\Data\ResourceFactory;
+use Icinga\Web\Form;
 use InvalidArgumentException;
 use Icinga\Application\Config;
 use Icinga\Exception\ConfigurationError;
@@ -271,4 +275,63 @@ class BackendConfigForm extends ConfigForm
             )
         );
     }
+
+    /**
+     * Validate the ido instance schema resource
+     *
+     * @param   Form            $form
+     * @param   ConfigObject    $resourceConfig
+     *
+     * @return  bool                                Whether validation succeeded or not
+     */
+    public static function isValidIdoSchema(Form $form, ConfigObject $resourceConfig)
+    {
+        try {
+            $resource = ResourceFactory::createResource($resourceConfig);
+            $result = $resource->select()->from('icinga_dbversion', array('version'));
+            $result->fetchOne();
+        } catch (Exception $e) {
+            $form->addError(
+                $form->translate(
+                    'IDO schema validation failed, it looks like that the IDO schema is missing in the given database.'
+                )
+            );
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Validate the ido instance availability
+     *
+     * @param   Form            $form
+     * @param   ConfigObject    $resourceConfig
+     *
+     * @return  bool                                Whether validation succeeded or not
+     */
+    public static function isValidIdoInstance(Form $form, ConfigObject $resourceConfig)
+    {
+        $resource = ResourceFactory::createResource($resourceConfig);
+        $result = $resource->select()->from('icinga_instances', array('instance_name'));
+        $instances = $result->fetchAll();
+
+        if (count($instances) === 1) {
+            return true;
+        } elseif (count($instances) > 1) {
+            $form->addError(
+                $form->translate(
+                    'WARNING: IDO instance validation failed, because there are multiple instances available.'
+                )
+            );
+            return false;
+        }
+
+        $form->addError(
+            $form->translate(
+                'IDO instance validation failed, because there is no IDO instance available.'
+            )
+        );
+
+        return false;
+    }
 }
diff --git a/modules/monitoring/application/forms/Setup/IdoResourcePage.php b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
index f52601359..b856c590c 100644
--- a/modules/monitoring/application/forms/Setup/IdoResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
+use Icinga\Data\ConfigObject;
+use Icinga\Module\Monitoring\Forms\Config\BackendConfigForm;
 use Icinga\Web\Form;
 use Icinga\Forms\Config\Resource\DbResourceForm;
 
@@ -53,7 +55,14 @@ class IdoResourcePage extends Form
         }
 
         if (false === isset($data['skip_validation']) || $data['skip_validation'] == 0) {
-            if (false === DbResourceForm::isValidResource($this)) {
+            $configObject = new ConfigObject($this->getValues());
+            if (false === DbResourceForm::isValidResource($this, $configObject)) {
+                $this->addSkipValidationCheckbox();
+                return false;
+            } elseif (false === BackendConfigForm::isValidIdoSchema($this, $configObject)) {
+                $this->addSkipValidationCheckbox();
+                return false;
+            } elseif (false === BackendConfigForm::isValidIdoInstance($this, $configObject)) {
                 $this->addSkipValidationCheckbox();
                 return false;
             }

From 3aaa6d39a14879830a6155c07133fe50ea8db251 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 11 May 2015 13:25:50 +0200
Subject: [PATCH 1494/2920] DbConnection: Make it possible to insert, update
 and delete table rows

refs #8826
---
 library/Icinga/Data/Db/DbConnection.php | 120 +++++++++++++++++++++++-
 1 file changed, 119 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php
index 83c74fb8e..d0d2ddf98 100644
--- a/library/Icinga/Data/Db/DbConnection.php
+++ b/library/Icinga/Data/Db/DbConnection.php
@@ -8,14 +8,22 @@ use Zend_Db;
 use Icinga\Application\Benchmark;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\Db\DbQuery;
+use Icinga\Data\Extensible;
+use Icinga\Data\Filter\Filter;
+use Icinga\Data\Filter\FilterAnd;
+use Icinga\Data\Filter\FilterNot;
+use Icinga\Data\Filter\FilterOr;
+use Icinga\Data\Reducible;
 use Icinga\Data\ResourceFactory;
 use Icinga\Data\Selectable;
+use Icinga\Data\Updatable;
 use Icinga\Exception\ConfigurationError;
+use Icinga\Exception\ProgrammingError;
 
 /**
  * Encapsulate database connections and query creation
  */
-class DbConnection implements Selectable
+class DbConnection implements Selectable, Extensible, Updatable, Reducible
 {
     /**
      * Connection config
@@ -259,4 +267,114 @@ class DbConnection implements Selectable
     {
         return $this->dbAdapter->fetchPairs($query->getSelectQuery());
     }
+
+    /**
+     * Insert a table row with the given data
+     *
+     * @param   string  $table
+     * @param   array   $bind
+     *
+     * @return  int             The number of affected rows
+     */
+    public function insert($table, array $bind)
+    {
+        return $this->dbAdapter->insert($table, $bind);
+    }
+
+    /**
+     * Update table rows with the given data, optionally limited by using a filter
+     *
+     * @param   string  $table
+     * @param   array   $bind
+     * @param   Filter  $filter
+     *
+     * @return  int             The number of affected rows
+     */
+    public function update($table, array $bind, Filter $filter = null)
+    {
+        return $this->dbAdapter->update($table, $bind, $filter ? $this->renderFilter($filter) : '');
+    }
+
+    /**
+     * Delete table rows, optionally limited by using a filter
+     *
+     * @param   string  $table
+     * @param   Filter  $filter
+     *
+     * @return  int             The number of affected rows
+     */
+    public function delete($table, Filter $filter = null)
+    {
+        return $this->dbAdapter->delete($table, $filter ? $this->renderFilter($filter) : '');
+    }
+
+    /**
+     * Render and return the given filter as SQL-WHERE clause
+     *
+     * @param   Filter  $filter
+     *
+     * @return  string
+     */
+    public function renderFilter(Filter $filter, $level = 0)
+    {
+        // TODO: This is supposed to supersede DbQuery::renderFilter()
+        $where = '';
+        if ($filter->isChain()) {
+            if ($filter instanceof FilterAnd) {
+                $operator = ' AND ';
+            } elseif ($filter instanceof FilterOr) {
+                $operator = ' OR ';
+            } elseif ($filter instanceof FilterNot) {
+                $operator = ' AND ';
+                $where .= ' NOT ';
+            } else {
+                throw new ProgrammingError('Cannot render filter: %s', get_class($filter));
+            }
+
+            if (! $filter->isEmpty()) {
+                $parts = array();
+                foreach ($filter->filters() as $filterPart) {
+                    $part = $this->renderFilter($filterPart, $level + 1);
+                    if ($part) {
+                        $parts[] = $part;
+                    }
+                }
+
+                if ($level > 0) {
+                    $where .= ' (' . implode($operator, $parts) . ') ';
+                } else {
+                    $where .= implode($operator, $parts);
+                }
+            }
+        } else {
+            $where .= $this->renderFilterExpression($filter);
+        }
+
+        return $where;
+    }
+
+    /**
+     * Render and return the given filter expression
+     *
+     * @param   Filter  $filter
+     *
+     * @return  string
+     */
+    protected function renderFilterExpression(Filter $filter)
+    {
+        $column = $filter->getColumn();
+        $sign = $filter->getSign();
+        $value = $filter->getExpression();
+
+        if (is_array($value) && $sign === '=') {
+            // TODO: Should we support this? Doesn't work for blub*
+            return $column . ' IN (' . $this->dbAdapter->quote($value) . ')';
+        } elseif ($sign === '=' && strpos($value, '*') !== false) {
+            return $column . ' LIKE ' . $this->dbAdapter->quote(preg_replace('~\*~', '%', $value));
+        } elseif ($sign === '!=' && strpos($value, '*') !== false) {
+            return $column . ' NOT LIKE ' . $this->dbAdapter->quote(preg_replace('~\*~', '%', $value));
+        } else {
+            return $column . ' ' . $sign . ' ' . $this->dbAdapter->quote($value);
+        }
+    }
 }

From ca166b0175fe6fdee226566700387e7214471be4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 11 May 2015 13:26:41 +0200
Subject: [PATCH 1495/2920] DbRepository: Add insert, update and delete
 capabilities

refs #8826
---
 library/Icinga/Repository/DbRepository.php | 191 ++++++++++++++++++++-
 1 file changed, 190 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index 8ba43efaf..2b9901c21 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -3,6 +3,10 @@
 
 namespace Icinga\Repository;
 
+use Icinga\Data\Extensible;
+use Icinga\Data\Filter\Filter;
+use Icinga\Data\Reducible;
+use Icinga\Data\Updatable;
 use Icinga\Exception\IcingaException;
 use Icinga\Exception\ProgrammingError;
 
@@ -12,10 +16,45 @@ use Icinga\Exception\ProgrammingError;
  * Additionally provided features:
  * <ul>
  *  <li>Automatic table prefix handling</li>
+ *  <li>Insert, update and delete capabilities</li>
+ *  <li>Differentiation between statement and query columns</li>
  * </ul>
  */
-abstract class DbRepository extends Repository
+abstract class DbRepository extends Repository implements Extensible, Updatable, Reducible
 {
+    /**
+     * The statement columns being provided
+     *
+     * This may be initialized by repositories which are going to make use of table aliases. It allows to provide
+     * alias-less column names to be used for a statement. The array needs to be in the following format:
+     * <pre><code>
+     *  array(
+     *      'table_name' => array(
+     *          'column1',
+     *          'alias1' => 'column2',
+     *          'alias2' => 'column3'
+     *      )
+     *  )
+     * <pre><code>
+     *
+     * @var array
+     */
+    protected $statementColumns;
+
+    /**
+     * An array to map table names to statement columns/aliases
+     *
+     * @var array
+     */
+    protected $statementTableMap;
+
+    /**
+     * A flattened array to map statement columns to aliases
+     *
+     * @var array
+     */
+    protected $statementColumnMap;
+
     /**
      * Return the base table name this repository is responsible for
      *
@@ -61,4 +100,154 @@ abstract class DbRepository extends Repository
 
         return $table;
     }
+
+    /**
+     * Insert a table row with the given data
+     *
+     * @param   string  $table
+     * @param   array   $bind
+     */
+    public function insert($table, array $bind)
+    {
+        $this->ds->insert($this->prependTablePrefix($table), $this->requireStatementColumns($bind));
+    }
+
+    /**
+     * Update table rows with the given data, optionally limited by using a filter
+     *
+     * @param   string  $table
+     * @param   array   $bind
+     * @param   Filter  $filter
+     */
+    public function update($table, array $bind, Filter $filter = null)
+    {
+        if ($filter) {
+            $this->requireFilter($filter);
+        }
+
+        $this->ds->update($this->prependTablePrefix($table), $this->requireStatementColumns($bind), $filter);
+    }
+
+    /**
+     * Delete table rows, optionally limited by using a filter
+     *
+     * @param   string  $table
+     * @param   Filter  $filter
+     */
+    public function delete($table, Filter $filter = null)
+    {
+        if ($filter) {
+            $this->requireFilter($filter);
+        }
+
+        $this->ds->delete($this->prependTablePrefix($table), $filter);
+    }
+
+    /**
+     * Return the statement columns being provided
+     *
+     * Calls $this->initializeStatementColumns() in case $this->statementColumns is null.
+     *
+     * @return  array
+     */
+    public function getStatementColumns()
+    {
+        if ($this->statementColumns === null) {
+            $this->statementColumns = $this->initializeStatementColumns();
+        }
+
+        return $this->statementColumns;
+    }
+
+    /**
+     * Overwrite this in your repository implementation in case you need to initialize the statement columns lazily
+     *
+     * @return  array
+     */
+    protected function initializeStatementColumns()
+    {
+        return array();
+    }
+
+    /**
+     * Return an array to map table names to statement columns/aliases
+     *
+     * @return  array
+     */
+    protected function getStatementTableMap()
+    {
+        if ($this->statementTableMap === null) {
+            $this->initializeStatementMaps();
+        }
+
+        return $this->statementTableMap;
+    }
+
+    /**
+     * Return a flattened array to map statement columns to aliases
+     *
+     * @return  array
+     */
+    protected function getStatementColumnMap()
+    {
+        if ($this->statementColumnMap === null) {
+            $this->initializeStatementMaps();
+        }
+
+        return $this->statementColumnMap;
+    }
+
+    /**
+     * Initialize $this->statementTableMap and $this->statementColumnMap
+     */
+    protected function initializeStatementMaps()
+    {
+        foreach ($this->getStatementColumns() as $table => $columns) {
+            foreach ($columns as $alias => $column) {
+                if (! is_string($alias)) {
+                    $this->statementTableMap[$column] = $table;
+                    $this->statementColumnMap[$column] = $column;
+                } else {
+                    $this->statementTableMap[$alias] = $table;
+                    $this->statementColumnMap[$alias] = $column;
+                }
+            }
+        }
+    }
+
+    /**
+     * Return whether the given column name or alias is a valid statement column
+     *
+     * @param   string  $name   The column name or alias to check
+     *
+     * @return  bool
+     */
+    public function hasStatementColumn($name)
+    {
+        $statementColumnMap = $this->getStatementColumnMap();
+        if (! array_key_exists($name, $statementColumnMap)) {
+            return parent::hasStatementColumn($name);
+        }
+
+        return true;
+    }
+
+    /**
+     * Validate that the given column is a valid statement column and return it or the actual name if it's an alias
+     *
+     * @param   string  $name       The name or alias of the column to validate
+     *
+     * @return  string              The given column's name
+     *
+     * @throws  QueryException      In case the given column is not a statement column
+     */
+    public function requireStatementColumn($name)
+    {
+        $statementColumnMap = $this->getStatementColumnMap();
+        if (! array_key_exists($name, $statementColumnMap)) {
+            return parent::requireStatementColumn($name);
+        }
+
+        return $statementColumnMap[$name];
+    }
 }

From b3957c556be2a25242b16069c0517581aba8e495 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 11 May 2015 13:28:01 +0200
Subject: [PATCH 1496/2920] DbUserGroupBackend: Properly utilize the insert and
 update capability

refs #8826
---
 .../UserGroup/DbUserGroupBackend.php          | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
index 32d65ab53..1e4ad395e 100644
--- a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Authentication\UserGroup;
 
+use Icinga\Data\Filter\Filter;
 use Icinga\Repository\DbRepository;
 use Icinga\User;
 
@@ -24,6 +25,18 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
         )
     );
 
+    /**
+     * The statement columns being provided
+     *
+     * @var array
+     */
+    protected $statementColumns = array(
+        'group' => array(
+            'created_at'    => 'ctime',
+            'last_modified' => 'mtime'
+        )
+    );
+
     /**
      * The columns which are not permitted to be queried
      *
@@ -55,6 +68,31 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
         }
     }
 
+    /**
+     * Insert a table row with the given data
+     *
+     * @param   string  $table
+     * @param   array   $bind
+     */
+    public function insert($table, array $bind)
+    {
+        $bind['created_at'] = date('Y-m-d H:i:s');
+        parent::insert($table, $bind);
+    }
+
+    /**
+     * Update table rows with the given data, optionally limited by using a filter
+     *
+     * @param   string  $table
+     * @param   array   $bind
+     * @param   Filter  $filter
+     */
+    public function update($table, array $bind, Filter $filter = null)
+    {
+        $bind['last_modified'] = date('Y-m-d H:i:s');
+        parent::update($table, $bind, $filter);
+    }
+
     /**
      * Return the groups the given user is a member of
      *

From 152c6a8f7f0699133c85507744b3fa2cb2865aa6 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 11 May 2015 13:36:58 +0200
Subject: [PATCH 1497/2920] Merge Monitoring_ListController::hasBetterUrl()
 into Icinga\Web\Controller::init()

refs #9220
---
 library/Icinga/Web/Controller.php             | 21 ++++++
 .../controllers/ListController.php            | 66 +------------------
 2 files changed, 22 insertions(+), 65 deletions(-)

diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index 42bd94b5e..6fa578c22 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -15,6 +15,27 @@ use Icinga\Web\Widget\Limiter;
  */
 class Controller extends ModuleActionController
 {
+    /**
+     * @see ActionController::init
+     */
+    public function init()
+    {
+        parent::init();
+
+        $request = $this->getRequest();
+        $url = Url::fromRequest();
+
+        if ($request->isPost() && ($sort = $request->getPost('sort'))) {
+            $url->setParam('sort', $sort);
+            if ($dir = $request->getPost('dir')) {
+                $url->setParam('dir', $dir);
+            } else {
+                $url->removeParam('dir');
+            }
+            $this->redirectNow($url);
+        }
+    }
+
     /**
      * Create a SortBox widget at the `sortBox' view property
      *
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 518bd6528..b8b959a18 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -20,6 +20,7 @@ class Monitoring_ListController extends Controller
      */
     public function init()
     {
+        parent::init();
         $this->createTabs();
     }
 
@@ -41,25 +42,6 @@ class Monitoring_ListController extends Controller
         return $query;
     }
 
-    protected function hasBetterUrl()
-    {
-        $request = $this->getRequest();
-        $url = Url::fromRequest();
-
-        if ($this->getRequest()->isPost()) {
-            if ($request->getPost('sort')) {
-                $url->setParam('sort', $request->getPost('sort'));
-                if ($request->getPost('dir')) {
-                    $url->setParam('dir', $request->getPost('dir'));
-                } else {
-                    $url->removeParam('dir');
-                }
-                return $url;
-            }
-        }
-        return false;
-    }
-
     /**
      * Overwrite the backend to use (used for testing)
      *
@@ -75,10 +57,6 @@ class Monitoring_ListController extends Controller
      */
     public function hostsAction()
     {
-        if ($url = $this->hasBetterUrl()) {
-            return $this->redirectNow($url);
-        }
-
         // Handle soft and hard states
         if (strtolower($this->params->shift('stateType', 'soft')) === 'hard') {
             $stateColumn = 'host_hard_state';
@@ -149,10 +127,6 @@ class Monitoring_ListController extends Controller
      */
     public function servicesAction()
     {
-        if ($url = $this->hasBetterUrl()) {
-            return $this->redirectNow($url);
-        }
-
         // Handle soft and hard states
         if (strtolower($this->params->shift('stateType', 'soft')) === 'hard') {
             $stateColumn = 'service_hard_state';
@@ -247,10 +221,6 @@ class Monitoring_ListController extends Controller
      */
     public function downtimesAction()
     {
-        if ($url = $this->hasBetterUrl()) {
-            return $this->redirectNow($url);
-        }
-
         $this->addTitleTab('downtimes', $this->translate('Downtimes'), $this->translate('List downtimes'));
         $this->setAutorefreshInterval(12);
 
@@ -304,10 +274,6 @@ class Monitoring_ListController extends Controller
      */
     public function notificationsAction()
     {
-        if ($url = $this->hasBetterUrl()) {
-            return $this->redirectNow($url);
-        }
-
         $this->addTitleTab(
             'notifications',
             $this->translate('Notifications'),
@@ -337,10 +303,6 @@ class Monitoring_ListController extends Controller
 
     public function contactsAction()
     {
-        if ($url = $this->hasBetterUrl()) {
-            return $this->redirectNow($url);
-        }
-
         $this->addTitleTab('contacts', $this->translate('Contacts'), $this->translate('List contacts'));
 
         $query = $this->backend->select()->from('contact', array(
@@ -380,9 +342,6 @@ class Monitoring_ListController extends Controller
 
     public function eventgridAction()
     {
-        if ($url = $this->hasBetterUrl()) {
-            return $this->redirectNow($url);
-        }
         $this->addTitleTab('eventgrid', $this->translate('Event Grid'), $this->translate('Show the Event Grid'));
 
         $form = new StatehistoryForm();
@@ -422,10 +381,6 @@ class Monitoring_ListController extends Controller
 
     public function contactgroupsAction()
     {
-        if ($url = $this->hasBetterUrl()) {
-            return $this->redirectNow($url);
-        }
-
         $this->addTitleTab(
             'contactgroups',
             $this->translate('Contact Groups'),
@@ -465,10 +420,6 @@ class Monitoring_ListController extends Controller
 
     public function commentsAction()
     {
-        if ($url = $this->hasBetterUrl()) {
-            return $this->redirectNow($url);
-        }
-
         $this->addTitleTab('comments', $this->translate('Comments'), $this->translate('List comments'));
         $this->setAutorefreshInterval(12);
 
@@ -509,10 +460,6 @@ class Monitoring_ListController extends Controller
 
     public function servicegroupsAction()
     {
-        if ($url = $this->hasBetterUrl()) {
-            return $this->redirectNow($url);
-        }
-
         $this->addTitleTab(
             'servicegroups',
             $this->translate('Service Groups'),
@@ -568,10 +515,6 @@ class Monitoring_ListController extends Controller
 
     public function hostgroupsAction()
     {
-        if ($url = $this->hasBetterUrl()) {
-            return $this->redirectNow($url);
-        }
-
         $this->addTitleTab('hostgroups', $this->translate('Host Groups'), $this->translate('List host groups'));
         $this->setAutorefreshInterval(12);
 
@@ -623,10 +566,6 @@ class Monitoring_ListController extends Controller
 
     public function eventhistoryAction()
     {
-        if ($url = $this->hasBetterUrl()) {
-            return $this->redirectNow($url);
-        }
-
         $this->addTitleTab(
             'eventhistory',
             $this->translate('Event Overview'),
@@ -659,9 +598,6 @@ class Monitoring_ListController extends Controller
 
     public function servicegridAction()
     {
-        if ($url = $this->hasBetterUrl()) {
-            return $this->redirectNow($url);
-        }
         $this->addTitleTab('servicegrid', $this->translate('Service Grid'), $this->translate('Show the Service Grid'));
         $this->setAutorefreshInterval(15);
         $query = $this->backend->select()->from('serviceStatus', array(

From 295254d1d5313bcc8bbcb210c405a1486c859dbf Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 11 May 2015 14:07:57 +0200
Subject: [PATCH 1498/2920] Rename Icinga\Web\Widget\SortBox::applyRequest() to
 ...::setRequest()

refs #9220
---
 library/Icinga/Web/Controller.php     | 2 +-
 library/Icinga/Web/Widget/SortBox.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index 6fa578c22..939147321 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -53,7 +53,7 @@ class Controller extends ModuleActionController
             $this->view->sortBox = SortBox::create(
                 'sortbox-' . $req->getActionName(),
                 $columns
-            )->applyRequest($req);
+            )->setRequest($req);
         }
 
         return $this;
diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index fc2025e5b..80c413658 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -14,7 +14,7 @@ use Icinga\Web\Request;
  * submission of sorting changes and draws an additional submit button when JavaScript is disabled.
  *
  * The constructor takes an string for the component name and an array containing the select options, where the key is
- * the value to be submitted and the value is the label that will be shown. You then should call applyRequest in order
+ * the value to be submitted and the value is the label that will be shown. You then should call setRequest in order
  * to  make sure the form is correctly populated when a request with a sort parameter is being made.
  *
  * Example:
@@ -23,7 +23,7 @@ use Icinga\Web\Request;
  *          $this->getRequest()->getActionName(),
  *          $columns
  *      );
- *      $this->view->sortControl->applyRequest($this->getRequest());
+ *      $this->view->sortControl->setRequest($this->getRequest());
  *  </code></pre>
  */
 class SortBox extends AbstractWidget
@@ -81,7 +81,7 @@ class SortBox extends AbstractWidget
      *
      * @return  $this
      */
-    public function applyRequest($request)
+    public function setRequest($request)
     {
         $this->request = $request;
         return $this;

From 6658415b6fa14d59c595a542dbc79e4125468085 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 11 May 2015 14:40:23 +0200
Subject: [PATCH 1499/2920] Remove uneeded use statements

---
 .../monitoring/application/controllers/HostsController.php   | 1 -
 .../application/controllers/ServicesController.php           | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index c390894bf..6c3c6850e 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -12,7 +12,6 @@ use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostCheckCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostDowntimeCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\SendCustomNotificationCommandForm;
-use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\HostList;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Chart\InlinePie;
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 7148aae57..1365fbb8a 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -13,12 +13,8 @@ use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceDowntimeCommand
 use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\SendCustomNotificationCommandForm;
-use Icinga\Module\Monitoring\Object\Host;
-use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Module\Monitoring\Object\ServiceList;
-use Icinga\Util\String;
 use Icinga\Web\Url;
-use Icinga\Web\UrlParams;
 use Icinga\Web\Widget\Chart\InlinePie;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 
@@ -208,7 +204,6 @@ class Monitoring_ServicesController extends Controller
         $form = new AddCommentCommandForm();
         $form->setTitle($this->translate('Add Service Comments'));
         $this->handleCommandForm($form);
-
     }
 
 

From 17ebe07e578713ee0c61af9f628ca3f2a9986205 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 11 May 2015 15:37:00 +0200
Subject: [PATCH 1500/2920] Implement Icinga\Web\Widget\SortBox::setQuery()

refs #9220
---
 library/Icinga/Web/Widget/SortBox.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 80c413658..1026596ca 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -5,6 +5,7 @@ namespace Icinga\Web\Widget;
 
 use Icinga\Web\Form;
 use Icinga\Web\Request;
+use Icinga\Data\Sortable;
 
 /**
  * SortBox widget
@@ -49,6 +50,13 @@ class SortBox extends AbstractWidget
      */
     protected $request;
 
+    /**
+     * What to apply sort parameters on
+     *
+     * @var Sortable
+     */
+    protected $query = null;
+
     /**
      * Create a SortBox with the entries from $sortFields
      *
@@ -87,6 +95,17 @@ class SortBox extends AbstractWidget
         return $this;
     }
 
+    /**
+     * @param Sortable $query
+     *
+     * @return $this
+     */
+    public function setQuery(Sortable $query)
+    {
+        $this->query = $query;
+        return $this;
+    }
+
     /**
      * Render this SortBox as HTML
      *

From 44bbd93cbc3b63367c63a4b3f5a3b64e6b158518 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 11 May 2015 16:00:24 +0200
Subject: [PATCH 1501/2920] DbUserBackend: Provide a custom insert and update
 implementation

As we're transmitting password hashes which may contain special chars
and the like, we need to utilize prepared statements with explicit types.

refs #8826
---
 .../Authentication/User/DbUserBackend.php     | 115 ++++++++++++++++--
 1 file changed, 102 insertions(+), 13 deletions(-)

diff --git a/library/Icinga/Authentication/User/DbUserBackend.php b/library/Icinga/Authentication/User/DbUserBackend.php
index 367418f7b..93602da21 100644
--- a/library/Icinga/Authentication/User/DbUserBackend.php
+++ b/library/Icinga/Authentication/User/DbUserBackend.php
@@ -5,6 +5,7 @@ namespace Icinga\Authentication\User;
 
 use Exception;
 use PDO;
+use Icinga\Data\Filter\Filter;
 use Icinga\Exception\AuthenticationException;
 use Icinga\Repository\DbRepository;
 use Icinga\User;
@@ -40,6 +41,19 @@ class DbUserBackend extends DbRepository implements UserBackendInterface
         )
     );
 
+    /**
+     * The statement columns being provided
+     *
+     * @var array
+     */
+    protected $statementColumns = array(
+        'user' => array(
+            'password'      => 'password_hash',
+            'created_at'    => 'ctime',
+            'last_modified' => 'mtime'
+        )
+    );
+
     /**
      * The columns which are not permitted to be queried
      *
@@ -61,6 +75,13 @@ class DbUserBackend extends DbRepository implements UserBackendInterface
         )
     );
 
+    /**
+     * The value conversion rules to apply on a query/statement
+     *
+     * @var array
+     */
+    protected $conversionRules = array('password');
+
     /**
      * Initialize this database user backend
      */
@@ -72,23 +93,91 @@ class DbUserBackend extends DbRepository implements UserBackendInterface
     }
 
     /**
-     * Add a new user
+     * Insert a table row with the given data
      *
-     * @param   string  $username   The name of the new user
-     * @param   string  $password   The new user's password
-     * @param   bool    $active     Whether the user is active
+     * @param   string  $table
+     * @param   array   $data
      */
-    public function addUser($username, $password, $active = true)
+    public function insert($table, array $data)
     {
-        $passwordHash = $this->hashPassword($password);
+        $newData['created_at'] = date('Y-m-d H:i:s');
+        $newData = $this->requireStatementColumns($data);
 
-        $stmt = $this->ds->getDbAdapter()->prepare(
-            'INSERT INTO icingaweb_user VALUES (:name, :active, :password_hash, now(), DEFAULT);'
-        );
-        $stmt->bindParam(':name', $username, PDO::PARAM_STR);
-        $stmt->bindParam(':active', $active, PDO::PARAM_INT);
-        $stmt->bindParam(':password_hash', $passwordHash, PDO::PARAM_LOB);
-        $stmt->execute();
+        $values = array();
+        foreach ($newData as $column => $_) {
+            $values[] = ':' . $column;
+        }
+
+        $sql = 'INSERT INTO '
+            . $this->prependTablePrefix($table)
+            . ' (' . join(', ', array_keys($newData)) . ') '
+            . 'VALUES (' . join(', ', $values) . ')';
+        $statement = $this->ds->getDbAdapter()->prepare($sql);
+
+        foreach ($newData as $column => $value) {
+            $type = PDO::PARAM_STR;
+            if ($column === 'password_hash') {
+                $type = PDO::PARAM_LOB;
+            } elseif ($column === 'active') {
+                $type = PDO::PARAM_INT;
+            }
+
+            $statement->bindValue(':' . $column, $value, $type);
+        }
+
+        $statement->execute();
+    }
+
+    /**
+     * Update table rows with the given data, optionally limited by using a filter
+     *
+     * @param   string  $table
+     * @param   array   $data
+     * @param   Filter  $filter
+     */
+    public function update($table, array $data, Filter $filter = null)
+    {
+        $newData['last_modified'] = date('Y-m-d H:i:s');
+        $newData = $this->requireStatementColumns($data);
+        if ($filter) {
+            $this->requireFilter($filter);
+        }
+
+        $set = array();
+        foreach ($newData as $column => $_) {
+            $set[] = $column . ' = :' . $column;
+        }
+
+        $sql = 'UPDATE '
+            . $this->prependTablePrefix($table)
+            . ' SET ' . join(', ', $set)
+            . ($filter ? ' WHERE ' . $this->ds->renderFilter($filter) : '');
+        $statement = $this->ds->getDbAdapter()->prepare($sql);
+
+        foreach ($newData as $column => $value) {
+            $type = PDO::PARAM_STR;
+            if ($column === 'password_hash') {
+                $type = PDO::PARAM_LOB;
+            } elseif ($column === 'active') {
+                $type = PDO::PARAM_INT;
+            }
+
+            $statement->bindValue(':' . $column, $value, $type);
+        }
+
+        $statement->execute();
+    }
+
+    /**
+     * Hash and return the given password
+     *
+     * @param   string  $value
+     *
+     * @return  string
+     */
+    protected function persistPassword($value)
+    {
+        return $this->hashPassword($value);
     }
 
     /**

From 399bbf0795cc502c75ab94538d920ba97300cb45 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 11 May 2015 16:01:20 +0200
Subject: [PATCH 1502/2920] AuthenticationStep: Adjust usage of a
 DbUserBackend's insert capability

refs #8826
---
 .../setup/library/Setup/Steps/AuthenticationStep.php  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
index 913f83066..58d9d68d7 100644
--- a/modules/setup/library/Setup/Steps/AuthenticationStep.php
+++ b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -88,11 +88,12 @@ class AuthenticationStep extends Step
                 ResourceFactory::createResource(new ConfigObject($this->data['adminAccountData']['resourceConfig']))
             );
 
-            if (array_search($this->data['adminAccountData']['username'], $backend->listUsers()) === false) {
-                $backend->addUser(
-                    $this->data['adminAccountData']['username'],
-                    $this->data['adminAccountData']['password']
-                );
+            if ($backend->select()->where('user_name', $this->data['adminAccountData']['username'])->count() === 0) {
+                $backend->insert('user', array(
+                    'user_name' => $this->data['adminAccountData']['username'],
+                    'password'  => $this->data['adminAccountData']['password'],
+                    'is_active' => true
+                ));
             }
         } catch (Exception $e) {
             $this->dbError = $e;

From 32659647b93864ebdaf9042738ca8ee689c7da48 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 11 May 2015 16:09:20 +0200
Subject: [PATCH 1503/2920] Implement
 Icinga\Web\Widget\SortBox::handleRequest()

refs #9220
---
 library/Icinga/Web/Widget/SortBox.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 1026596ca..7896fb8ef 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -6,6 +6,7 @@ namespace Icinga\Web\Widget;
 use Icinga\Web\Form;
 use Icinga\Web\Request;
 use Icinga\Data\Sortable;
+use Icinga\Application\Icinga;
 
 /**
  * SortBox widget
@@ -106,6 +107,17 @@ class SortBox extends AbstractWidget
         return $this;
     }
 
+    public function handleRequest(Request $request = null)
+    {
+        if ($request === null) {
+            $request = Icinga::app()->getFrontController()->getRequest();
+        }
+        if ($sort = $request->getParam('sort')) {
+            $this->query->order($sort, $request->getParam('dir'));
+        }
+        return $this;
+    }
+
     /**
      * Render this SortBox as HTML
      *

From e1c3d23d127a50fe86c6fe53f0baf467fbe133e3 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 11 May 2015 16:28:23 +0200
Subject: [PATCH 1504/2920] Icinga\Web\Controller::setupSortControl(): set
 query on the newly created SortBox (if given)

refs #9220
---
 library/Icinga/Web/Controller.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index 939147321..4f3fb5794 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -41,19 +41,24 @@ class Controller extends ModuleActionController
      *
      * In case the current view has been requested as compact this method does nothing.
      *
-     * @param   array   $columns    An array containing the sort columns, with the
+     * @param   array    $columns    An array containing the sort columns, with the
      *                               submit value as the key and the label as the value
+     * @param   Sortable $query      Query to set on the newly created SortBox
      *
      * @return  $this
      */
-    protected function setupSortControl(array $columns)
+    protected function setupSortControl(array $columns, Sortable $query = null)
     {
         if (! $this->view->compact) {
             $req = $this->getRequest();
-            $this->view->sortBox = SortBox::create(
+            $this->view->sortBox = $sortBox = SortBox::create(
                 'sortbox-' . $req->getActionName(),
                 $columns
             )->setRequest($req);
+            if ($query !== null) {
+                $sortBox->setQuery($query);
+            }
+            $sortBox->handleRequest();
         }
 
         return $this;

From dd58f1466c6b5f6ee8efd399b27c29c15c383fc2 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 12 May 2015 10:16:51 +0200
Subject: [PATCH 1505/2920] Don't apply sort rules in
 Monitoring_ListController::filterQuery()

refs #9220
---
 .../controllers/ListController.php            | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index b8b959a18..ece98d28c 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -119,7 +119,7 @@ class Monitoring_ListController extends Controller
             'host_display_name' => $this->translate('Hostname'),
             'host_address'      => $this->translate('Address'),
             'host_last_check'   => $this->translate('Last Check')
-        ));
+        ), $query);
     }
 
     /**
@@ -195,7 +195,7 @@ class Monitoring_ListController extends Controller
             'host_display_name'     => $this->translate('Hostname'),
             'host_address'          => $this->translate('Host Address'),
             'host_last_check'       => $this->translate('Last Host Check')
-        ));
+        ), $query);
 
         $this->view->stats = $this->backend->select()->from('statusSummary', array(
             'services_total',
@@ -261,7 +261,7 @@ class Monitoring_ListController extends Controller
             'downtime_scheduled_start'  => $this->translate('Scheduled Start'),
             'downtime_scheduled_end'    => $this->translate('Scheduled End'),
             'downtime_duration'         => $this->translate('Duration')
-        ));
+        ), $query);
 
         if ($this->Auth()->hasPermission('monitoring/command/downtime/delete')) {
             $this->view->delDowntimeForm = new DeleteDowntimeCommandForm();
@@ -298,7 +298,7 @@ class Monitoring_ListController extends Controller
         $this->setupPaginationControl($this->view->notifications);
         $this->setupSortControl(array(
             'notification_start_time' => $this->translate('Notification Start')
-        ));
+        ), $query);
     }
 
     public function contactsAction()
@@ -337,7 +337,7 @@ class Monitoring_ListController extends Controller
             'contact_pager' => $this->translate('Pager Address / Number'),
             'contact_notify_service_timeperiod' => $this->translate('Service Notification Timeperiod'),
             'contact_notify_host_timeperiod' => $this->translate('Host Notification Timeperiod')
-        ));
+        ), $query);
     }
 
     public function eventgridAction()
@@ -415,7 +415,7 @@ class Monitoring_ListController extends Controller
         $this->setupSortControl(array(
             'contactgroup_name'     => $this->translate('Contactgroup Name'),
             'contactgroup_alias'    => $this->translate('Contactgroup Alias')
-        ));
+        ), $query);
     }
 
     public function commentsAction()
@@ -449,7 +449,8 @@ class Monitoring_ListController extends Controller
                 'service_display_name'  => $this->translate('Service'),
                 'comment_type'          => $this->translate('Comment Type'),
                 'comment_expiration'    => $this->translate('Expiration')
-            )
+            ),
+            $query
         );
 
         if ($this->Auth()->hasPermission('monitoring/command/comment/delete')) {
@@ -510,7 +511,7 @@ class Monitoring_ListController extends Controller
             'services_critical'     => $this->translate('Services CRITICAL'),
             'services_warning'      => $this->translate('Services WARNING'),
             'services_pending'      => $this->translate('Services PENDING')
-        ));
+        ), $query);
     }
 
     public function hostgroupsAction()
@@ -561,7 +562,7 @@ class Monitoring_ListController extends Controller
             'services_critical' => $this->translate('Services CRITICAL'),
             'services_warning'  => $this->translate('Services WARNING'),
             'services_pending'  => $this->translate('Services PENDING')
-        ));
+        ), $query);
     }
 
     public function eventhistoryAction()
@@ -593,7 +594,7 @@ class Monitoring_ListController extends Controller
         $this->setupPaginationControl($this->view->history);
         $this->setupSortControl(array(
             'timestamp' => $this->translate('Occurence')
-        ));
+        ), $query);
     }
 
     public function servicegridAction()
@@ -611,7 +612,7 @@ class Monitoring_ListController extends Controller
         $this->setupSortControl(array(
             'host_name'           => $this->translate('Hostname'),
             'service_description' => $this->translate('Service description')
-        ));
+        ), $query);
         $pivot = $query->pivot('service_description', 'host_name');
         $this->view->pivot = $pivot;
         $this->view->horizontalPaginator = $pivot->paginateXAxis();
@@ -633,9 +634,6 @@ class Monitoring_ListController extends Controller
         $this->setupFilterControl($editor);
         $this->view->filter = $editor->getFilter();
 
-        if ($sort = $this->params->get('sort')) {
-            $query->order($sort, $this->params->get('dir'));
-        }
         $this->handleFormatRequest($query);
         return $query;
     }

From afa0dc0956b23ae91e654d4d0ea7defd0378c321 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 12 May 2015 10:29:50 +0200
Subject: [PATCH 1506/2920] SortBox::handleRequest(): check whether
 $this->query !== null

refs #9220
---
 library/Icinga/Web/Widget/SortBox.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 7896fb8ef..022efdf32 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -109,11 +109,13 @@ class SortBox extends AbstractWidget
 
     public function handleRequest(Request $request = null)
     {
-        if ($request === null) {
-            $request = Icinga::app()->getFrontController()->getRequest();
-        }
-        if ($sort = $request->getParam('sort')) {
-            $this->query->order($sort, $request->getParam('dir'));
+        if ($this->query !== null) {
+            if ($request === null) {
+                $request = Icinga::app()->getFrontController()->getRequest();
+            }
+            if ($sort = $request->getParam('sort')) {
+                $this->query->order($sort, $request->getParam('dir'));
+            }
         }
         return $this;
     }

From 053c9cdcb358a95886f126f57afd797bef771bad Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 12 May 2015 15:38:29 +0200
Subject: [PATCH 1507/2920] Repository: Check whether a column is queried from
 the correct table

refs #8826
---
 .../Authentication/User/DbUserBackend.php     |   6 +-
 library/Icinga/Repository/DbRepository.php    |  98 +++++++++++--
 library/Icinga/Repository/IniRepository.php   |   8 +-
 library/Icinga/Repository/Repository.php      | 136 ++++++++++++------
 library/Icinga/Repository/RepositoryQuery.php |  29 ++--
 5 files changed, 202 insertions(+), 75 deletions(-)

diff --git a/library/Icinga/Authentication/User/DbUserBackend.php b/library/Icinga/Authentication/User/DbUserBackend.php
index 93602da21..441e6cdf3 100644
--- a/library/Icinga/Authentication/User/DbUserBackend.php
+++ b/library/Icinga/Authentication/User/DbUserBackend.php
@@ -101,7 +101,7 @@ class DbUserBackend extends DbRepository implements UserBackendInterface
     public function insert($table, array $data)
     {
         $newData['created_at'] = date('Y-m-d H:i:s');
-        $newData = $this->requireStatementColumns($data);
+        $newData = $this->requireStatementColumns($table, $data);
 
         $values = array();
         foreach ($newData as $column => $_) {
@@ -138,9 +138,9 @@ class DbUserBackend extends DbRepository implements UserBackendInterface
     public function update($table, array $data, Filter $filter = null)
     {
         $newData['last_modified'] = date('Y-m-d H:i:s');
-        $newData = $this->requireStatementColumns($data);
+        $newData = $this->requireStatementColumns($table, $data);
         if ($filter) {
-            $this->requireFilter($filter);
+            $this->requireFilter($table, $filter);
         }
 
         $set = array();
diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index 2b9901c21..80788ed73 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -9,6 +9,7 @@ use Icinga\Data\Reducible;
 use Icinga\Data\Updatable;
 use Icinga\Exception\IcingaException;
 use Icinga\Exception\ProgrammingError;
+use Icinga\Exception\StatementException;
 
 /**
  * Abstract base class for concrete database repository implementations
@@ -101,6 +102,37 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
         return $table;
     }
 
+    /**
+     * Remove the datasource's prefix from the given table name and return the remaining part
+     *
+     * @param   mixed   $table
+     *
+     * @return  mixed
+     */
+    protected function removeTablePrefix($table)
+    {
+        $prefix = $this->ds->getTablePrefix();
+        if (! $prefix) {
+            return $table;
+        }
+
+        if (is_array($table)) {
+            foreach ($table as & $tableName) {
+                if (strpos($tableName, $prefix) === 0) {
+                    $tableName = str_replace($prefix, '', $tableName);
+                }
+            }
+        } elseif (is_string($table)) {
+            if (strpos($table, $prefix) === 0) {
+                $table = str_replace($prefix, '', $table);
+            }
+        } else {
+            throw new IcingaException('Table prefix handling for type "%s" is not supported', type($table));
+        }
+
+        return $table;
+    }
+
     /**
      * Insert a table row with the given data
      *
@@ -109,7 +141,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      */
     public function insert($table, array $bind)
     {
-        $this->ds->insert($this->prependTablePrefix($table), $this->requireStatementColumns($bind));
+        $this->ds->insert($this->prependTablePrefix($table), $this->requireStatementColumns($table, $bind));
     }
 
     /**
@@ -122,10 +154,10 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     public function update($table, array $bind, Filter $filter = null)
     {
         if ($filter) {
-            $this->requireFilter($filter);
+            $this->requireFilter($table, $filter);
         }
 
-        $this->ds->update($this->prependTablePrefix($table), $this->requireStatementColumns($bind), $filter);
+        $this->ds->update($this->prependTablePrefix($table), $this->requireStatementColumns($table, $bind), $filter);
     }
 
     /**
@@ -137,7 +169,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     public function delete($table, Filter $filter = null)
     {
         if ($filter) {
-            $this->requireFilter($filter);
+            $this->requireFilter($table, $filter);
         }
 
         $this->ds->delete($this->prependTablePrefix($table), $filter);
@@ -216,17 +248,56 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     }
 
     /**
-     * Return whether the given column name or alias is a valid statement column
+     * Return whether the given query column name or alias is available in the given table
      *
+     * @param   mixed   $table
+     * @param   string  $column
+     *
+     * @return  bool
+     */
+    public function validateQueryColumnAssociation($table, $column)
+    {
+        if (is_array($table)) {
+            $table = array_shift($table);
+        }
+
+        return parent::validateQueryColumnAssociation($this->removeTablePrefix($table), $column);
+    }
+
+    /**
+     * Return whether the given statement column name or alias is available in the given table
+     *
+     * @param   mixed   $table
+     * @param   string  $column
+     *
+     * @return  bool
+     */
+    public function validateStatementColumnAssociation($table, $column)
+    {
+        if (is_array($table)) {
+            $table = array_shift($table);
+        }
+
+        $statementTableMap = $this->getStatementTableMap();
+        return $statementTableMap[$column] === $this->removeTablePrefix($table);
+    }
+
+    /**
+     * Return whether the given column name or alias of the given table is a valid statement column
+     *
+     * @param   mixed   $table  The table where to look for the column or alias
      * @param   string  $name   The column name or alias to check
      *
      * @return  bool
      */
-    public function hasStatementColumn($name)
+    public function hasStatementColumn($table, $name)
     {
         $statementColumnMap = $this->getStatementColumnMap();
-        if (! array_key_exists($name, $statementColumnMap)) {
-            return parent::hasStatementColumn($name);
+        if (
+            ! array_key_exists($name, $statementColumnMap)
+            || !$this->validateStatementColumnAssociation($table, $name)
+        ) {
+            return parent::hasStatementColumn($table, $name);
         }
 
         return true;
@@ -235,17 +306,22 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     /**
      * Validate that the given column is a valid statement column and return it or the actual name if it's an alias
      *
+     * @param   mixed   $table      The table for which to require the column
      * @param   string  $name       The name or alias of the column to validate
      *
      * @return  string              The given column's name
      *
-     * @throws  QueryException      In case the given column is not a statement column
+     * @throws  StatementException  In case the given column is not a statement column
      */
-    public function requireStatementColumn($name)
+    public function requireStatementColumn($table, $name)
     {
         $statementColumnMap = $this->getStatementColumnMap();
         if (! array_key_exists($name, $statementColumnMap)) {
-            return parent::requireStatementColumn($name);
+            return parent::requireStatementColumn($table, $name);
+        }
+
+        if (! $this->validateStatementColumnAssociation($table, $name)) {
+            throw new StatementException('Statement column "%s" not found in table "%s"', $name, $table);
         }
 
         return $statementColumnMap[$name];
diff --git a/library/Icinga/Repository/IniRepository.php b/library/Icinga/Repository/IniRepository.php
index 6b95fcdc1..6d6d24ee6 100644
--- a/library/Icinga/Repository/IniRepository.php
+++ b/library/Icinga/Repository/IniRepository.php
@@ -34,7 +34,7 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
      */
     public function insert($target, array $data)
     {
-        $newData = $this->requireStatementColumns($data);
+        $newData = $this->requireStatementColumns($target, $data);
         $section = $this->extractSectionName($target, $newData);
 
         if ($this->ds->hasSection($section)) {
@@ -65,7 +65,7 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
      */
     public function update($target, array $data, Filter $filter = null)
     {
-        $newData = $this->requireStatementColumns($data);
+        $newData = $this->requireStatementColumns($target, $data);
         $keyColumn = $this->ds->getConfigObject()->getKeyColumn();
         if ($keyColumn && $filter === null && isset($newData[$keyColumn]) && !$this->ds->hasSection($target)) {
             throw new StatementException(
@@ -82,7 +82,7 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
             $contents = array($target => $this->ds->getSection($target));
         } else {
             if ($filter) {
-                $this->requireFilter($filter);
+                $this->requireFilter($target, $filter);
             }
 
             $contents = iterator_to_array($this->ds);
@@ -148,7 +148,7 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
             $this->ds->removeSection($target);
         } else {
             if ($filter) {
-                $this->requireFilter($filter);
+                $this->requireFilter($target, $filter);
             }
 
             foreach (iterator_to_array($this->ds) as $section => $config) {
diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index f33140b1f..24cd48161 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -574,63 +574,87 @@ abstract class Repository implements Selectable
     }
 
     /**
-     * Recurse the given filter, require each filter column and convert all values
+     * Recurse the given filter, require each column for the given table and convert all values
      *
+     * @param   string  $table
      * @param   Filter  $filter
      */
-    public function requireFilter(Filter $filter)
+    public function requireFilter($table, Filter $filter)
     {
         if ($filter->isExpression()) {
             $column = $filter->getColumn();
-            $filter->setColumn($this->requireFilterColumn($column));
+            $filter->setColumn($this->requireFilterColumn($table, $column));
             $filter->setExpression($this->persistColumn($column, $filter->getExpression()));
         } elseif ($filter->isChain()) {
             foreach ($filter->filters() as $chainOrExpression) {
-                $this->requireFilter($chainOrExpression);
+                $this->requireFilter($table, $chainOrExpression);
             }
         }
     }
 
     /**
-     * Return this repository's query columns mapped to their respective aliases
+     * Return this repository's query columns of the given table mapped to their respective aliases
+     *
+     * @param   string  $table
      *
      * @return  array
      */
-    public function requireAllQueryColumns()
+    public function requireAllQueryColumns($table)
     {
         $map = array();
         foreach ($this->getAliasColumnMap() as $alias => $_) {
-            if ($this->hasQueryColumn($alias)) {
+            if ($this->hasQueryColumn($table, $alias)) {
                 // Just in case $this->requireQueryColumn has been overwritten and there is some magic going on
-                $map[$alias] = $this->requireQueryColumn($alias);
+                $map[$alias] = $this->requireQueryColumn($table, $alias);
             }
         }
 
         return $map;
     }
 
+    /**
+     * Return whether the given query column name or alias is available in the given table
+     *
+     * @param   string  $table
+     * @param   string  $column
+     *
+     * @return  bool
+     */
+    public function validateQueryColumnAssociation($table, $column)
+    {
+        $aliasTableMap = $this->getAliasTableMap();
+        return $aliasTableMap[$column] === $table;
+    }
+
     /**
      * Return whether the given column name or alias is a valid query column
      *
+     * @param   string  $table  The table where to look for the column or alias
      * @param   string  $name   The column name or alias to check
      *
      * @return  bool
      */
-    public function hasQueryColumn($name)
+    public function hasQueryColumn($table, $name)
     {
-        return array_key_exists($name, $this->getAliasColumnMap()) && !in_array($name, $this->getFilterColumns());
+        if (in_array($name, $this->getFilterColumns())) {
+            return false;
+        }
+
+        return array_key_exists($name, $this->getAliasColumnMap())
+            && $this->validateQueryColumnAssociation($table, $name);
     }
 
     /**
      * Validate that the given column is a valid query target and return it or the actual name if it's an alias
      *
+     * @param   string  $table      The table where to look for the column or alias
      * @param   string  $name       The name or alias of the column to validate
      *
      * @return  string              The given column's name
      *
      * @throws  QueryException      In case the given column is not a valid query column
      */
-    public function requireQueryColumn($name)
+    public function requireQueryColumn($table, $name)
     {
         if (in_array($name, $this->getFilterColumns())) {
             throw new QueryException(t('Filter column "%s" cannot be queried'), $name);
@@ -641,62 +665,75 @@ abstract class Repository implements Selectable
             throw new QueryException(t('Query column "%s" not found'), $name);
         }
 
-        return $aliasColumnMap[$name];
-    }
-
-    /**
-     * Return whether the given column name or alias is a valid filter column
-     *
-     * @param   string  $name   The column name or alias to check
-     *
-     * @return  bool
-     */
-    public function hasFilterColumn($name)
-    {
-        return array_key_exists($name, $this->getAliasColumnMap());
-    }
-
-    /**
-     * Validate that the given column is a valid filter target and return it or the actual name if it's an alias
-     *
-     * @param   string  $name       The name or alias of the column to validate
-     *
-     * @return  string              The given column's name
-     *
-     * @throws  QueryException      In case the given column is not a valid filter column
-     */
-    public function requireFilterColumn($name)
-    {
-        $aliasColumnMap = $this->getAliasColumnMap();
-        if (! array_key_exists($name, $aliasColumnMap)) {
-            throw new QueryException(t('Filter column "%s" not found'), $name);
+        if (! $this->validateQueryColumnAssociation($table, $name)) {
+            throw new QueryException(t('Query column "%s" not found in table "%s"'), $name, $table);
         }
 
         return $aliasColumnMap[$name];
     }
 
     /**
-     * Return whether the given column name or alias is a valid statement column
+     * Return whether the given column name or alias is a valid filter column
      *
+     * @param   string  $table  The table where to look for the column or alias
      * @param   string  $name   The column name or alias to check
      *
      * @return  bool
      */
-    public function hasStatementColumn($name)
+    public function hasFilterColumn($table, $name)
     {
-        return $this->hasQueryColumn($name);
+        return array_key_exists($name, $this->getAliasColumnMap())
+            && $this->validateQueryColumnAssociation($table, $name);
+    }
+
+    /**
+     * Validate that the given column is a valid filter target and return it or the actual name if it's an alias
+     *
+     * @param   string  $table      The table where to look for the column or alias
+     * @param   string  $name       The name or alias of the column to validate
+     *
+     * @return  string              The given column's name
+     *
+     * @throws  QueryException      In case the given column is not a valid filter column
+     */
+    public function requireFilterColumn($table, $name)
+    {
+        $aliasColumnMap = $this->getAliasColumnMap();
+        if (! array_key_exists($name, $aliasColumnMap)) {
+            throw new QueryException(t('Filter column "%s" not found'), $name);
+        }
+
+        if (! $this->validateQueryColumnAssociation($table, $name)) {
+            throw new QueryException(t('Filter column "%s" not found in table "%s"'), $name, $table);
+        }
+
+        return $aliasColumnMap[$name];
+    }
+
+    /**
+     * Return whether the given column name or alias of the given table is a valid statement column
+     *
+     * @param   string  $table  The table where to look for the column or alias
+     * @param   string  $name   The column name or alias to check
+     *
+     * @return  bool
+     */
+    public function hasStatementColumn($table, $name)
+    {
+        return $this->hasQueryColumn($table, $name);
     }
 
     /**
      * Validate that the given column is a valid statement column and return it or the actual name if it's an alias
      *
+     * @param   string  $table      The table for which to require the column
      * @param   string  $name       The name or alias of the column to validate
      *
      * @return  string              The given column's name
      *
      * @throws  StatementException  In case the given column is not a statement column
      */
-    public function requireStatementColumn($name)
+    public function requireStatementColumn($table, $name)
     {
         if (in_array($name, $this->filterColumns)) {
             throw new StatementException('Filter column "%s" cannot be referenced in a statement', $name);
@@ -707,21 +744,26 @@ abstract class Repository implements Selectable
             throw new StatementException('Statement column "%s" not found', $name);
         }
 
+        if (! $this->validateQueryColumnAssociation($table, $name)) {
+            throw new StatementException('Statement column "%s" not found in table "%s"', $name, $table);
+        }
+
         return $aliasColumnMap[$name];
     }
 
     /**
-     * Resolve the given aliases or column names supposed to be persisted and convert their values
+     * Resolve the given aliases or column names of the given table supposed to be persisted and convert their values
      *
+     * @param   string  $table
      * @param   array   $data
      *
      * @return  array
      */
-    public function requireStatementColumns(array $data)
+    public function requireStatementColumns($table, array $data)
     {
         $resolved = array();
         foreach ($data as $alias => $value) {
-            $resolved[$this->requireStatementColumn($alias)] = $this->persistColumn($alias, $value);
+            $resolved[$this->requireStatementColumn($table, $alias)] = $this->persistColumn($alias, $value);
         }
 
         return $resolved;
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index 806bdd93a..86527a66e 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -28,6 +28,13 @@ class RepositoryQuery implements QueryInterface
      */
     protected $query;
 
+    /**
+     * The current target to be queried
+     *
+     * @var mixed
+     */
+    protected $target;
+
     /**
      * Create a new repository query
      *
@@ -54,14 +61,15 @@ class RepositoryQuery implements QueryInterface
      *
      * This notifies the repository about each desired query column.
      *
-     * @param   mixed   $target     The type and purpose of this parameter depends on this query's repository
+     * @param   mixed   $target     The target from which to fetch the columns
      * @param   array   $columns    If null or an empty array, all columns will be fetched
      *
      * @return  $this
      */
     public function from($target, array $columns = null)
     {
-        $this->query->from($target, $this->prepareQueryColumns($columns));
+        $this->query->from($target, $this->prepareQueryColumns($target, $columns));
+        $this->target = $target;
         return $this;
     }
 
@@ -86,7 +94,7 @@ class RepositoryQuery implements QueryInterface
      */
     public function columns(array $columns)
     {
-        $this->query->columns($this->prepareQueryColumns($columns));
+        $this->query->columns($this->prepareQueryColumns($this->target, $columns));
         return $this;
     }
 
@@ -95,18 +103,19 @@ class RepositoryQuery implements QueryInterface
      *
      * This notifies the repository about each desired query column.
      *
+     * @param   mixed   $target             The target where to look for each column
      * @param   array   $desiredColumns     Pass null or an empty array to require all query columns
      *
      * @return  array                       The desired columns indexed by their respective alias
      */
-    protected function prepareQueryColumns(array $desiredColumns = null)
+    protected function prepareQueryColumns($target, array $desiredColumns = null)
     {
         if (empty($desiredColumns)) {
-            $columns = $this->repository->requireAllQueryColumns();
+            $columns = $this->repository->requireAllQueryColumns($target);
         } else {
             $columns = array();
             foreach ($desiredColumns as $customAlias => $columnAlias) {
-                $resolvedColumn = $this->repository->requireQueryColumn($columnAlias);
+                $resolvedColumn = $this->repository->requireQueryColumn($target, $columnAlias);
                 if ($resolvedColumn !== $columnAlias) {
                     $columns[is_string($customAlias) ? $customAlias : $columnAlias] = $resolvedColumn;
                 } elseif (is_string($customAlias)) {
@@ -133,7 +142,7 @@ class RepositoryQuery implements QueryInterface
     public function where($column, $value = null)
     {
         $this->query->where(
-            $this->repository->requireFilterColumn($column),
+            $this->repository->requireFilterColumn($this->target, $column),
             $this->repository->persistColumn($column, $value)
         );
         return $this;
@@ -164,7 +173,7 @@ class RepositoryQuery implements QueryInterface
      */
     public function setFilter(Filter $filter)
     {
-        $this->repository->requireFilter($filter);
+        $this->repository->requireFilter($this->target, $filter);
         $this->query->setFilter($filter);
         return $this;
     }
@@ -180,7 +189,7 @@ class RepositoryQuery implements QueryInterface
      */
     public function addFilter(Filter $filter)
     {
-        $this->repository->requireFilter($filter);
+        $this->repository->requireFilter($this->target, $filter);
         $this->query->addFilter($filter);
         return $this;
     }
@@ -245,7 +254,7 @@ class RepositoryQuery implements QueryInterface
 
             try {
                 $this->query->order(
-                    $this->repository->requireFilterColumn($column),
+                    $this->repository->requireFilterColumn($this->target, $column),
                     $direction ? $baseDirection : ($specificDirection ?: $baseDirection)
                 );
             } catch (QueryException $_) {

From 2e0a444f13443583048910c4a5228a4214039cec Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 12 May 2015 15:49:24 +0200
Subject: [PATCH 1508/2920] GroupController: Ensure that the sort and dir
 parameters are being applied

refs #8826
---
 application/controllers/GroupController.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index d7a208826..0f45802cb 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -16,6 +16,7 @@ class GroupController extends Controller
      */
     public function init()
     {
+        parent::init();
         $this->createTabs();
     }
 
@@ -79,12 +80,15 @@ class GroupController extends Controller
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->groups);
-        $this->setupSortControl(array(
-            'group_name'    => $this->translate('Group'),
-            'parent_name'   => $this->translate('Parent'),
-            'created_at'    => $this->translate('Created at'),
-            'last_modified' => $this->translate('Last modified')
-        ));
+        $this->setupSortControl(
+            array(
+                'group_name'    => $this->translate('Group'),
+                'parent_name'   => $this->translate('Parent'),
+                'created_at'    => $this->translate('Created at'),
+                'last_modified' => $this->translate('Last modified')
+            ),
+            $query
+        );
     }
 
     /**

From a9f0fd0708db382fd79eaa2f965acf1a83601d83 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 12 May 2015 15:49:45 +0200
Subject: [PATCH 1509/2920] UserController: Ensure that the sort and dir
 parameters are being applied

refs #8826
---
 application/controllers/UserController.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 0f3a073a3..587bd4107 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -16,6 +16,7 @@ class UserController extends Controller
      */
     public function init()
     {
+        parent::init();
         $this->createTabs();
     }
 
@@ -79,12 +80,15 @@ class UserController extends Controller
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->users);
-        $this->setupSortControl(array(
-            'user_name'     => $this->translate('Username'),
-            'is_active'     => $this->translate('Active'),
-            'created_at'    => $this->translate('Created at'),
-            'last_modified' => $this->translate('Last modified')
-        ));
+        $this->setupSortControl(
+            array(
+                'user_name'     => $this->translate('Username'),
+                'is_active'     => $this->translate('Active'),
+                'created_at'    => $this->translate('Created at'),
+                'last_modified' => $this->translate('Last modified')
+            ),
+            $query
+        );
     }
 
     /**

From 7353c0d287513366d067053c79f8d1b321e399d4 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 12 May 2015 16:35:14 +0200
Subject: [PATCH 1510/2920] IdoQuery::initializeForPostgres(): cast only valid
 IP addresses to inet

fixes #7165
---
 .../library/Monitoring/Backend/Ido/Query/IdoQuery.php       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index 2e6bec024..fda2f188e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -370,7 +370,11 @@ abstract class IdoQuery extends DbQuery
                 if ($count > 0) {
                     $this->columnsWithoutCollation[] = $this->getMappedField($key);
                 }
-                $value = preg_replace('/inet_aton\(([[:word:].]+)\)/i', '$1::inet - \'0.0.0.0\'', $value);
+                $value = preg_replace(
+                    '/inet_aton\(([[:word:].]+)\)/i',
+                    '(CASE WHEN $1 ~ \'(?:[0-9]{1,3}\\\\.){3}[0-9]{1,3}\' THEN $1::inet - \'0.0.0.0\' ELSE NULL END)',
+                    $value
+                );
                 $value = preg_replace(
                     '/UNIX_TIMESTAMP(\((?>[^()]|(?-1))*\))/i',
                     'CASE WHEN ($1 < \'1970-01-03 00:00:00+00\'::timestamp with time zone) THEN 0 ELSE UNIX_TIMESTAMP($1) END',

From d43513dcacf50e149b312d76962349cc63f288c6 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 12 May 2015 16:38:31 +0200
Subject: [PATCH 1511/2920] Controller: use Icinga\Data\Sortable

---
 library/Icinga/Web/Controller.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index 4f3fb5794..b70dbd3fc 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -7,6 +7,7 @@ use Zend_Paginator;
 use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Web\Widget\SortBox;
 use Icinga\Web\Widget\Limiter;
+use Icinga\Data\Sortable;
 
 /**
  * This is the controller all modules should inherit from

From 3c73f281570f45694292788061723274a85507b2 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 12 May 2015 17:19:20 +0200
Subject: [PATCH 1512/2920] Display performance data metrics with value 0

fixes #8744
---
 modules/monitoring/application/views/helpers/Perfdata.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 36cbaa319..67d3a819f 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -50,7 +50,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
                 if (! $compact) {
                     foreach ($perfdata->toArray() as $value) {
                         if ($value === '') {
-                            $value = '-';
+                            $value = '0';
                         }
                         $row .= '<td>' . (string) $value . '</td>';
                     }

From 9e4c00506d3bc5c0493eb615013ec18b02888df1 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 12 May 2015 17:22:25 +0200
Subject: [PATCH 1513/2920] Revert "Display performance data metrics with value
 0"

This reverts commit 3c73f281570f45694292788061723274a85507b2.
---
 modules/monitoring/application/views/helpers/Perfdata.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 67d3a819f..36cbaa319 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -50,7 +50,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
                 if (! $compact) {
                     foreach ($perfdata->toArray() as $value) {
                         if ($value === '') {
-                            $value = '0';
+                            $value = '-';
                         }
                         $row .= '<td>' . (string) $value . '</td>';
                     }

From 9e3d65e4e99d4343ea97145046ff0cefad4cc2a5 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 12 May 2015 17:44:53 +0200
Subject: [PATCH 1514/2920] Display performance data metrics with value 0

fixes #8744
---
 modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php b/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
index 269107c82..d503bc19f 100644
--- a/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
+++ b/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
@@ -83,7 +83,7 @@ class PerfdataSet implements IteratorAggregate
             $label = trim($this->readLabel());
             $value = trim($this->readUntil(' '));
 
-            if ($label && $value) {
+            if ($label) {
                 $this->perfdata[] = new Perfdata($label, $value);
             }
         }

From 7d08dd27651dfea564b21f0ebccf65e5952728b2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 13 May 2015 09:15:18 +0200
Subject: [PATCH 1515/2920] DbConnection: Adjust insert and update to support
 custom type definitions

This strips the custom insert and update implementataions in
DbUserBackend down so that it does not need to do such low level stuff...

refs #8826
---
 .../Authentication/User/DbUserBackend.php     | 78 ++++++-------------
 library/Icinga/Data/Db/DbConnection.php       | 48 +++++++++++-
 2 files changed, 67 insertions(+), 59 deletions(-)

diff --git a/library/Icinga/Authentication/User/DbUserBackend.php b/library/Icinga/Authentication/User/DbUserBackend.php
index 441e6cdf3..36402d862 100644
--- a/library/Icinga/Authentication/User/DbUserBackend.php
+++ b/library/Icinga/Authentication/User/DbUserBackend.php
@@ -96,76 +96,44 @@ class DbUserBackend extends DbRepository implements UserBackendInterface
      * Insert a table row with the given data
      *
      * @param   string  $table
-     * @param   array   $data
+     * @param   array   $bind
      */
-    public function insert($table, array $data)
+    public function insert($table, array $bind)
     {
-        $newData['created_at'] = date('Y-m-d H:i:s');
-        $newData = $this->requireStatementColumns($table, $data);
-
-        $values = array();
-        foreach ($newData as $column => $_) {
-            $values[] = ':' . $column;
-        }
-
-        $sql = 'INSERT INTO '
-            . $this->prependTablePrefix($table)
-            . ' (' . join(', ', array_keys($newData)) . ') '
-            . 'VALUES (' . join(', ', $values) . ')';
-        $statement = $this->ds->getDbAdapter()->prepare($sql);
-
-        foreach ($newData as $column => $value) {
-            $type = PDO::PARAM_STR;
-            if ($column === 'password_hash') {
-                $type = PDO::PARAM_LOB;
-            } elseif ($column === 'active') {
-                $type = PDO::PARAM_INT;
-            }
-
-            $statement->bindValue(':' . $column, $value, $type);
-        }
-
-        $statement->execute();
+        $bind['created_at'] = date('Y-m-d H:i:s');
+        $this->ds->insert(
+            $this->prependTablePrefix($table),
+            $this->requireStatementColumns($table, $bind),
+            array(
+                'active'        => PDO::PARAM_INT,
+                'password_hash' => PDO::PARAM_LOB
+            )
+        );
     }
 
     /**
      * Update table rows with the given data, optionally limited by using a filter
      *
      * @param   string  $table
-     * @param   array   $data
+     * @param   array   $bind
      * @param   Filter  $filter
      */
-    public function update($table, array $data, Filter $filter = null)
+    public function update($table, array $bind, Filter $filter = null)
     {
-        $newData['last_modified'] = date('Y-m-d H:i:s');
-        $newData = $this->requireStatementColumns($table, $data);
+        $bind['last_modified'] = date('Y-m-d H:i:s');
         if ($filter) {
             $this->requireFilter($table, $filter);
         }
 
-        $set = array();
-        foreach ($newData as $column => $_) {
-            $set[] = $column . ' = :' . $column;
-        }
-
-        $sql = 'UPDATE '
-            . $this->prependTablePrefix($table)
-            . ' SET ' . join(', ', $set)
-            . ($filter ? ' WHERE ' . $this->ds->renderFilter($filter) : '');
-        $statement = $this->ds->getDbAdapter()->prepare($sql);
-
-        foreach ($newData as $column => $value) {
-            $type = PDO::PARAM_STR;
-            if ($column === 'password_hash') {
-                $type = PDO::PARAM_LOB;
-            } elseif ($column === 'active') {
-                $type = PDO::PARAM_INT;
-            }
-
-            $statement->bindValue(':' . $column, $value, $type);
-        }
-
-        $statement->execute();
+        $this->ds->update(
+            $this->prependTablePrefix($table),
+            $this->requireStatementColumns($table, $bind),
+            $filter,
+            array(
+                'active'        => PDO::PARAM_INT,
+                'password_hash' => PDO::PARAM_LOB
+            )
+        );
     }
 
     /**
diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php
index d0d2ddf98..ebe6e5743 100644
--- a/library/Icinga/Data/Db/DbConnection.php
+++ b/library/Icinga/Data/Db/DbConnection.php
@@ -271,28 +271,68 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible
     /**
      * Insert a table row with the given data
      *
+     * Pass an array with a column name (the same as in $bind) and a PDO::PARAM_* constant as value
+     * as third parameter $types to define a different type than string for a particular column.
+     *
      * @param   string  $table
      * @param   array   $bind
+     * @param   array   $types
      *
      * @return  int             The number of affected rows
      */
-    public function insert($table, array $bind)
+    public function insert($table, array $bind, array $types = array())
     {
-        return $this->dbAdapter->insert($table, $bind);
+        $values = array();
+        foreach ($bind as $column => $_) {
+            $values[] = ':' . $column;
+        }
+
+        $sql = 'INSERT INTO ' . $table
+            . ' (' . join(', ', array_keys($bind)) . ') '
+            . 'VALUES (' . join(', ', $values) . ')';
+        $statement = $this->dbAdapter->prepare($sql);
+
+        foreach ($bind as $column => $value) {
+            $type = isset($types[$column]) ? $types[$column] : PDO::PARAM_STR;
+            $statement->bindValue(':' . $column, $value, $type);
+        }
+
+        $statement->execute();
+        return $statement->rowCount();
     }
 
     /**
      * Update table rows with the given data, optionally limited by using a filter
      *
+     * Pass an array with a column name (the same as in $bind) and a PDO::PARAM_* constant as value
+     * as fourth parameter $types to define a different type than string for a particular column.
+     *
      * @param   string  $table
      * @param   array   $bind
      * @param   Filter  $filter
+     * @param   array   $types
      *
      * @return  int             The number of affected rows
      */
-    public function update($table, array $bind, Filter $filter = null)
+    public function update($table, array $bind, Filter $filter = null, array $types = array())
     {
-        return $this->dbAdapter->update($table, $bind, $filter ? $this->renderFilter($filter) : '');
+        $set = array();
+        foreach ($bind as $column => $_) {
+            $set[] = $column . ' = :' . $column;
+        }
+
+        $sql = 'UPDATE ' . $table
+            . ' SET ' . join(', ', $set)
+            . ($filter ? ' WHERE ' . $this->renderFilter($filter) : '');
+        $statement = $this->dbAdapter->prepare($sql);
+
+        foreach ($bind as $column => $value) {
+            $type = isset($types[$column]) ? $types[$column] : PDO::PARAM_STR;
+            $statement->bindValue(':' . $column, $value, $type);
+        }
+
+        $statement->execute();
+        return $statement->rowCount();
     }
 
     /**

From 104c1c6bba286a5a9888eebd3ef615cc757ae785 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 13 May 2015 09:16:24 +0200
Subject: [PATCH 1516/2920] DbUserBackend: Utilize Zend_Db_Select when fetching
 the password hash

---
 .../Authentication/User/DbUserBackend.php     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/library/Icinga/Authentication/User/DbUserBackend.php b/library/Icinga/Authentication/User/DbUserBackend.php
index 36402d862..362b2fb02 100644
--- a/library/Icinga/Authentication/User/DbUserBackend.php
+++ b/library/Icinga/Authentication/User/DbUserBackend.php
@@ -159,18 +159,19 @@ class DbUserBackend extends DbRepository implements UserBackendInterface
     {
         if ($this->ds->getDbType() === 'pgsql') {
             // Since PostgreSQL version 9.0 the default value for bytea_output is 'hex' instead of 'escape'
-            $stmt = $this->ds->getDbAdapter()->prepare(
-                'SELECT ENCODE(password_hash, \'escape\') FROM icingaweb_user WHERE name = :name AND active = 1'
-            );
+            $columns = array('password_hash' => 'ENCODE(password_hash, \'escape\')');
         } else {
-            $stmt = $this->ds->getDbAdapter()->prepare(
-                'SELECT password_hash FROM icingaweb_user WHERE name = :name AND active = 1'
-            );
+            $columns = array('password_hash');
         }
 
-        $stmt->execute(array(':name' => $username));
-        $stmt->bindColumn(1, $lob, PDO::PARAM_LOB);
-        $stmt->fetch(PDO::FETCH_BOUND);
+        $query = $this->ds->select()
+            ->from($this->prependTablePrefix('user'), $columns)
+            ->where('name', $username)
+            ->where('active', true);
+        $statement = $this->ds->getDbAdapter()->prepare($query->getSelectQuery());
+        $statement->execute();
+        $statement->bindColumn(1, $lob, PDO::PARAM_LOB);
+        $statement->fetch(PDO::FETCH_BOUND);
         if (is_resource($lob)) {
             $lob = stream_get_contents($lob);
         }

From d5d0c67d2c62998a737a2e2114e826e41339e486 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 13 May 2015 09:48:46 +0200
Subject: [PATCH 1517/2920] IniRepository: Do not handle $target as a section's
 name

That's bullshit.

refs #8826
---
 library/Icinga/Repository/IniRepository.php | 103 +++++++++-----------
 1 file changed, 46 insertions(+), 57 deletions(-)

diff --git a/library/Icinga/Repository/IniRepository.php b/library/Icinga/Repository/IniRepository.php
index 6d6d24ee6..43f42e749 100644
--- a/library/Icinga/Repository/IniRepository.php
+++ b/library/Icinga/Repository/IniRepository.php
@@ -4,6 +4,7 @@
 namespace Icinga\Repository;
 
 use Exception;
+use Icinga\Application\Config;
 use Icinga\Data\Extensible;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Updatable;
@@ -21,11 +22,33 @@ use Icinga\Exception\StatementException;
  */
 abstract class IniRepository extends Repository implements Extensible, Updatable, Reducible
 {
+    /**
+     * The datasource being used
+     *
+     * @var Config
+     */
+    protected $ds;
+
+    /**
+     * Create a new INI repository object
+     *
+     * @param   Config  $ds         The data source to use
+     *
+     * @throws  ProgrammingError    In case the given data source does not provide a valid key column
+     */
+    public function __construct(Config $ds)
+    {
+        parent::__construct($ds); // First! Due to init().
+
+        if (! $ds->getConfigObject()->getKeyColumn()) {
+            throw new ProgrammingError('INI repositories require their data source to provide a valid key column');
+        }
+    }
+
     /**
      * Insert the given data for the given target
      *
-     * In case the data source provides a valid key column, $data must provide a proper
-     * value for it which is then being used as the section name instead of $target.
+     * $data must provide a proper value for the data source's key column.
      *
      * @param   string  $target
      * @param   array   $data
@@ -35,7 +58,7 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
     public function insert($target, array $data)
     {
         $newData = $this->requireStatementColumns($target, $data);
-        $section = $this->extractSectionName($target, $newData);
+        $section = $this->extractSectionName($newData);
 
         if ($this->ds->hasSection($section)) {
             throw new StatementException(t('Cannot insert. Section "%s" does already exist'), $section);
@@ -53,10 +76,6 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
     /**
      * Update the target with the given data and optionally limit the affected entries by using a filter
      *
-     * The section(s) to update are either identified by $filter or $target, in order. If neither of both
-     * is given, all sections provided by the data source are going to be updated. Uniqueness of a section's
-     * name will be ensured.
-     *
      * @param   string  $target
      * @param   array   $data
      * @param   Filter  $filter
@@ -67,30 +86,20 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
     {
         $newData = $this->requireStatementColumns($target, $data);
         $keyColumn = $this->ds->getConfigObject()->getKeyColumn();
-        if ($keyColumn && $filter === null && isset($newData[$keyColumn]) && !$this->ds->hasSection($target)) {
+        if ($filter === null && isset($newData[$keyColumn])) {
             throw new StatementException(
                 t('Cannot update. Column "%s" holds a section\'s name which must be unique'),
                 $keyColumn
             );
         }
 
-        if ($target && !$filter) {
-            if (! $this->ds->hasSection($target)) {
-                throw new StatementException(t('Cannot update. Section "%s" does not exist'), $target);
-            }
-
-            $contents = array($target => $this->ds->getSection($target));
-        } else {
-            if ($filter) {
-                $this->requireFilter($target, $filter);
-            }
-
-            $contents = iterator_to_array($this->ds);
+        if ($filter !== null) {
+            $this->requireFilter($target, $filter);
         }
 
         $newSection = null;
-        foreach ($contents as $section => $config) {
-            if ($filter && !$filter->matches($config)) {
+        foreach (iterator_to_array($this->ds) as $section => $config) {
+            if ($filter !== null && !$filter->matches($config)) {
                 continue;
             }
 
@@ -102,7 +111,7 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
             }
 
             foreach ($newData as $column => $value) {
-                if ($keyColumn && $column === $keyColumn) {
+                if ($column === $keyColumn) {
                     $newSection = $value;
                 } else {
                     $config->$column = $value;
@@ -130,9 +139,6 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
     /**
      * Delete entries in the given target, optionally limiting the affected entries by using a filter
      *
-     * The section(s) to delete are either identified by $filter or $target, in order. If neither of both
-     * is given, all sections provided by the data source are going to be deleted.
-     *
      * @param   string  $target
      * @param   Filter  $filter
      *
@@ -140,21 +146,13 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
      */
     public function delete($target, Filter $filter = null)
     {
-        if ($target && !$filter) {
-            if (! $this->ds->hasSection($target)) {
-                return; // Nothing to do
-            }
+        if ($filter !== null) {
+            $this->requireFilter($target, $filter);
+        }
 
-            $this->ds->removeSection($target);
-        } else {
-            if ($filter) {
-                $this->requireFilter($target, $filter);
-            }
-
-            foreach (iterator_to_array($this->ds) as $section => $config) {
-                if (! $filter || $filter->matches($config)) {
-                    $this->ds->removeSection($section);
-                }
+        foreach (iterator_to_array($this->ds) as $section => $config) {
+            if ($filter === null || $filter->matches($config)) {
+                $this->ds->removeSection($section);
             }
         }
 
@@ -166,32 +164,23 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
     }
 
     /**
-     * Extract and return the section name off of the given $data, if available, or validate $target
+     * Extract and return the section name off of the given $data
      *
-     * @param   string  $target
      * @param   array   $data
      *
      * @return  string
      *
      * @throws  ProgrammingError    In case no valid section name is available
      */
-    protected function extractSectionName($target, array & $data)
+    protected function extractSectionName(array & $data)
     {
-        if (($keyColumn = $this->ds->getConfigObject()->getKeyColumn())) {
-            if (! isset($data[$keyColumn])) {
-                throw new ProgrammingError('$data does not provide a value for key column "%s"', $keyColumn);
-            }
-
-            $target = $data[$keyColumn];
-            unset($data[$keyColumn]);
+        $keyColumn = $this->ds->getConfigObject()->getKeyColumn();
+        if (! isset($data[$keyColumn])) {
+            throw new ProgrammingError('$data does not provide a value for key column "%s"', $keyColumn);
         }
 
-        if (! is_string($target)) {
-            throw new ProgrammingError(
-                'Neither the data source nor the $target parameter provide a valid section name'
-            );
-        }
-
-        return $target;
+        $section = $data[$keyColumn];
+        unset($data[$keyColumn]);
+        return $section;
     }
 }

From 7d982068a58dd2a35ce28217385297baee617efb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 13 May 2015 09:52:29 +0200
Subject: [PATCH 1518/2920] DbRepository: Ensure that we'll work with a
 instance of DbConnection

refs #8826
---
 library/Icinga/Repository/DbRepository.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index 80788ed73..0e5a4c665 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Repository;
 
+use Icinga\Data\Db\DbConnection;
 use Icinga\Data\Extensible;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Reducible;
@@ -23,6 +24,13 @@ use Icinga\Exception\StatementException;
  */
 abstract class DbRepository extends Repository implements Extensible, Updatable, Reducible
 {
+    /**
+     * The datasource being used
+     *
+     * @var DbConnection
+     */
+    protected $ds;
+
     /**
      * The statement columns being provided
      *
@@ -56,6 +64,16 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      */
     protected $statementColumnMap;
 
+    /**
+     * Create a new DB repository object
+     *
+     * @param   DbConnection    $ds     The datasource to use
+     */
+    public function __construct(DbConnection $ds)
+    {
+        parent::__construct($ds);
+    }
+
     /**
      * Return the base table name this repository is responsible for
      *

From 47dfcf5e1d584227c67e6f77a0a0e3fdec41b175 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 13 May 2015 10:34:00 +0200
Subject: [PATCH 1519/2920] DbUserGroupBackend: Do not use the repository
 abstraction internally

That's overhead which is not necessary.

refs #8826
---
 .../UserGroup/DbUserGroupBackend.php          | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
index 1e4ad395e..8275421ff 100644
--- a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
@@ -102,19 +102,23 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
      */
     public function getMemberships(User $user)
     {
+        $groupStmt = $this->ds->select()
+            ->from($this->prependTablePrefix('group'), array('name', 'parent'))
+            ->getSelectQuery()
+            ->query();
         $groups = array();
-        $groupsStmt = $this->select(array('group_name', 'parent_name'))->getQuery()->getSelectQuery()->query();
-        foreach ($groupsStmt as $group) {
-            $groups[$group->group_name] = $group->parent_name;
+        foreach ($groupStmt as $group) {
+            $groups[$group->name] = $group->parent;
         }
 
-        $memberships = array();
-        $membershipsStmt = $this->ds->getDbAdapter() // TODO: Use the join feature, once available
-            ->select()
-            ->from($this->ds->getTablePrefix() . 'group_membership', array('group_name'))
-            ->where('username = ?', $user->getUsername())
+        $membershipStmt = $this->ds->select() // TODO: Join this table
+            ->from($this->prependTablePrefix('group_membership'), array('group_name'))
+            ->where('username', $user->getUsername())
+            ->getSelectQuery()
             ->query();
-        foreach ($membershipsStmt as $membership) {
+        $memberships = array();
+
+        foreach ($membershipStmt as $membership) {
             $memberships[] = $membership->group_name;
             $parent = $groups[$membership->group_name];
             while ($parent !== null) {

From 223ecab991980c4cea0ffbe63e02f63d6d490d6d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 13 May 2015 10:34:39 +0200
Subject: [PATCH 1520/2920] DbUserGroupBackend: Make it possible to handle
 memberships

refs #8826
---
 .../UserGroup/DbUserGroupBackend.php               | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
index 8275421ff..3abe44348 100644
--- a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
@@ -22,6 +22,14 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
             'parent_name'   => 'parent',
             'created_at'    => 'UNIX_TIMESTAMP(ctime)',
             'last_modified' => 'UNIX_TIMESTAMP(mtime)'
+        ),
+        'group_membership' => array(
+            'group'         => 'group_name COLLATE utf8_general_ci',
+            'group_name',
+            'user'          => 'username COLLATE utf8_general_ci',
+            'user_name'     => 'username',
+            'created_at'    => 'UNIX_TIMESTAMP(ctime)',
+            'last_modified' => 'UNIX_TIMESTAMP(mtime)'
         )
     );
 
@@ -34,6 +42,10 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
         'group' => array(
             'created_at'    => 'ctime',
             'last_modified' => 'mtime'
+        ),
+        'group_membership' => array(
+            'created_at'    => 'ctime',
+            'last_modified' => 'mtime'
         )
     );
 
@@ -42,7 +54,7 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
      *
      * @var array
      */
-    protected $filterColumns = array('group', 'parent');
+    protected $filterColumns = array('group', 'parent', 'user');
 
     /**
      * The default sort rules to be applied on a query

From f93c2de6be4e04fa2117e0fbe8b0f15c0a4d9864 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 13 May 2015 10:45:54 +0200
Subject: [PATCH 1521/2920] UserGroupBackend: Disable default backend type
 `ini'

We're not going to support this until a proper membership implementation
exists (or is required at all).

refs #8826
---
 library/Icinga/Authentication/UserGroup/UserGroupBackend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/UserGroup/UserGroupBackend.php b/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
index a6382c8e5..dd4900ea8 100644
--- a/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
@@ -21,7 +21,7 @@ class UserGroupBackend
      */
     protected static $defaultBackends = array(
         'db',
-        'ini'
+        //'ini'
     );
 
     /**

From 0a387573f34127ae36d310c0636a7243a5ab7f2c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 13 May 2015 10:46:34 +0200
Subject: [PATCH 1522/2920] Logger: Fix substitution of exception messages

---
 library/Icinga/Application/Logger.php     | 4 +++-
 library/Icinga/Authentication/Manager.php | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Application/Logger.php b/library/Icinga/Application/Logger.php
index 925695dad..26241b3d5 100644
--- a/library/Icinga/Application/Logger.php
+++ b/library/Icinga/Application/Logger.php
@@ -243,7 +243,9 @@ class Logger
         return vsprintf(
             array_shift($arguments),
             array_map(
-                function ($a) { return is_string($a) ? $a : json_encode($a); },
+                function ($a) {
+                    return is_string($a) ? $a : ($a instanceof Exception ? $a->getMessage() : json_encode($a));
+                },
                 $arguments
             )
         );
diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 8a150c8b0..5becbe6d3 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -56,7 +56,7 @@ class Manager
         } catch (NotReadableError $e) {
             Logger::error(
                 new IcingaException(
-                    'Cannot load preferences for user "%s". An exception was thrown',
+                    'Cannot load preferences for user "%s". An exception was thrown: %s',
                     $username,
                     $e
                 )
@@ -74,7 +74,7 @@ class Manager
             } catch (NotReadableError $e) {
                 Logger::error(
                     new IcingaException(
-                        'Cannot load preferences for user "%s". An exception was thrown',
+                        'Cannot load preferences for user "%s". An exception was thrown: %s',
                         $username,
                         $e
                     )
@@ -92,7 +92,7 @@ class Manager
                 $groupsFromBackend = $groupBackend->getMemberships($user);
             } catch (Exception $e) {
                 Logger::error(
-                    'Can\'t get group memberships for user \'%s\' from backend \'%s\'. An exception was thrown:',
+                    'Can\'t get group memberships for user \'%s\' from backend \'%s\'. An exception was thrown: %s',
                     $username,
                     $name,
                     $e

From e9fee2dad68d13d0d3ef2de97da64ee273abefdf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 13 May 2015 13:27:08 +0200
Subject: [PATCH 1523/2920] Repository: Handle column name ambiguousness
 automatically

refs #8826
---
 library/Icinga/Repository/DbRepository.php | 103 ++++++++++++++++++---
 library/Icinga/Repository/Repository.php   |  90 ++++++++++++------
 2 files changed, 153 insertions(+), 40 deletions(-)

diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index 0e5a4c665..1e511abe7 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -252,19 +252,66 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      */
     protected function initializeStatementMaps()
     {
+        $this->statementTableMap = array();
+        $this->statementColumnMap = array();
         foreach ($this->getStatementColumns() as $table => $columns) {
             foreach ($columns as $alias => $column) {
-                if (! is_string($alias)) {
-                    $this->statementTableMap[$column] = $table;
-                    $this->statementColumnMap[$column] = $column;
+                $key = is_string($alias) ? $alias : $column;
+                if (array_key_exists($key, $this->statementTableMap)) {
+                    if ($this->statementTableMap[$key] !== null) {
+                        $existingTable = $this->statementTableMap[$key];
+                        $existingColumn = $this->statementColumnMap[$key];
+                        $this->statementTableMap[$existingTable . '.' . $key] = $existingTable;
+                        $this->statementColumnMap[$existingTable . '.' . $key] = $existingColumn;
+                        $this->statementTableMap[$key] = null;
+                        $this->statementColumnMap[$key] = null;
+                    }
+
+                    $this->statementTableMap[$table . '.' . $key] = $table;
+                    $this->statementColumnMap[$table . '.' . $key] = $column;
                 } else {
-                    $this->statementTableMap[$alias] = $table;
-                    $this->statementColumnMap[$alias] = $column;
+                    $this->statementTableMap[$key] = $table;
+                    $this->statementColumnMap[$key] = $column;
                 }
             }
         }
     }
 
+    /**
+     * Return this repository's query columns of the given table mapped to their respective aliases
+     *
+     * @param   mixed   $table
+     *
+     * @return  array
+     *
+     * @throws  ProgrammingError    In case $table does not exist
+     */
+    public function requireAllQueryColumns($table)
+    {
+        if (is_array($table)) {
+            $table = array_shift($table);
+        }
+
+        return parent::requireAllQueryColumns($this->removeTablePrefix($table));
+    }
+
+    /**
+     * Return the query column name for the given alias or null in case the alias does not exist
+     *
+     * @param   mixed   $table
+     * @param   string  $alias
+     *
+     * @return  string|null
+     */
+    public function resolveQueryColumnAlias($table, $alias)
+    {
+        if (is_array($table)) {
+            $table = array_shift($table);
+        }
+
+        return parent::resolveQueryColumnAlias($this->removeTablePrefix($table), $alias);
+    }
+
     /**
      * Return whether the given query column name or alias is available in the given table
      *
@@ -283,21 +330,51 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     }
 
     /**
-     * Return whether the given statement column name or alias is available in the given table
+     * Return the statement column name for the given alias or null in case the alias does not exist
      *
      * @param   mixed   $table
-     * @param   string  $column
+     * @param   string  $alias
+     *
+     * @return  string|null
+     */
+    public function resolveStatementColumnAlias($table, $alias)
+    {
+        if (is_array($table)) {
+            $table = array_shift($table);
+        }
+
+        $statementColumnMap = $this->getStatementColumnMap();
+        if (isset($statementColumnMap[$alias])) {
+            return $statementColumnMap[$alias];
+        }
+
+        $prefixedAlias = $table . '.' . $alias;
+        if (isset($statementColumnMap[$prefixedAlias])) {
+            return $statementColumnMap[$prefixedAlias];
+        }
+    }
+
+    /**
+     * Return whether the given alias or statement column name is available in the given table
+     *
+     * @param   mixed   $table
+     * @param   string  $alias
      *
      * @return  bool
      */
-    public function validateStatementColumnAssociation($table, $column)
+    public function validateStatementColumnAssociation($table, $alias)
     {
         if (is_array($table)) {
             $table = array_shift($table);
         }
 
         $statementTableMap = $this->getStatementTableMap();
-        return $statementTableMap[$column] === $this->removeTablePrefix($table);
+        if (isset($statementTableMap[$alias])) {
+            return $statementTableMap[$alias] === $this->removeTablePrefix($table);
+        }
+
+        $prefixedAlias = $this->removeTablePrefix($table) . '.' . $alias;
+        return isset($statementTableMap[$prefixedAlias]);
     }
 
     /**
@@ -310,9 +387,8 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      */
     public function hasStatementColumn($table, $name)
     {
-        $statementColumnMap = $this->getStatementColumnMap();
         if (
-            ! array_key_exists($name, $statementColumnMap)
+            $this->resolveStatementColumnAlias($table, $name) === null
             || !$this->validateStatementColumnAssociation($table, $name)
         ) {
             return parent::hasStatementColumn($table, $name);
@@ -333,8 +409,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      */
     public function requireStatementColumn($table, $name)
     {
-        $statementColumnMap = $this->getStatementColumnMap();
-        if (! array_key_exists($name, $statementColumnMap)) {
+        if (($column = $this->resolveStatementColumnAlias($table, $name)) === null) {
             return parent::requireStatementColumn($table, $name);
         }
 
@@ -342,6 +417,6 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
             throw new StatementException('Statement column "%s" not found in table "%s"', $name, $table);
         }
 
-        return $statementColumnMap[$name];
+        return $column;
     }
 }
diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index 24cd48161..58f199f1b 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -362,11 +362,27 @@ abstract class Repository implements Selectable
         foreach ($queryColumns as $table => $columns) {
             foreach ($columns as $alias => $column) {
                 if (! is_string($alias)) {
-                    $this->aliasTableMap[$column] = $table;
-                    $this->aliasColumnMap[$column] = $column;
+                    $key = $column;
                 } else {
-                    $this->aliasTableMap[$alias] = $table;
-                    $this->aliasColumnMap[$alias] = preg_replace('~\n\s*~', ' ', $column);
+                    $key = $alias;
+                    $column = preg_replace('~\n\s*~', ' ', $column);
+                }
+
+                if (array_key_exists($key, $this->aliasTableMap)) {
+                    if ($this->aliasTableMap[$key] !== null) {
+                        $existingTable = $this->aliasTableMap[$key];
+                        $existingColumn = $this->aliasColumnMap[$key];
+                        $this->aliasTableMap[$existingTable . '.' . $key] = $existingTable;
+                        $this->aliasColumnMap[$existingTable . '.' . $key] = $existingColumn;
+                        $this->aliasTableMap[$key] = null;
+                        $this->aliasColumnMap[$key] = null;
+                    }
+
+                    $this->aliasTableMap[$table . '.' . $key] = $table;
+                    $this->aliasColumnMap[$table . '.' . $key] = $column;
+                } else {
+                    $this->aliasTableMap[$key] = $table;
+                    $this->aliasColumnMap[$key] = $column;
                 }
             }
         }
@@ -598,32 +614,57 @@ abstract class Repository implements Selectable
      * @param   string  $table
      *
      * @return  array
+     *
+     * @throws  ProgrammingError    In case $table does not exist
      */
     public function requireAllQueryColumns($table)
     {
-        $map = array();
-        foreach ($this->getAliasColumnMap() as $alias => $_) {
-            if ($this->hasQueryColumn($table, $alias)) {
-                // Just in case $this->requireQueryColumn has been overwritten and there is some magic going on
-                $map[$alias] = $this->requireQueryColumn($table, $alias);
-            }
+        $queryColumns = $this->getQueryColumns();
+        if (! array_key_exists($table, $queryColumns)) {
+            throw new ProgrammingError('Table name "%s" not found', $table);
         }
 
-        return $map;
+        return $queryColumns[$table];
     }
 
     /**
-     * Return whether the given query column name or alias is available in the given table
+     * Return the query column name for the given alias or null in case the alias does not exist
      *
      * @param   string  $table
-     * @param   string  $column
+     * @param   string  $alias
+     *
+     * @return  string|null
+     */
+    public function resolveQueryColumnAlias($table, $alias)
+    {
+        $aliasColumnMap = $this->getAliasColumnMap();
+        if (isset($aliasColumnMap[$alias])) {
+            return $aliasColumnMap[$alias];
+        }
+
+        $prefixedAlias = $table . '.' . $alias;
+        if (isset($aliasColumnMap[$prefixedAlias])) {
+            return $aliasColumnMap[$prefixedAlias];
+        }
+    }
+
+    /**
+     * Return whether the given alias or query column name is available in the given table
+     *
+     * @param   string  $table
+     * @param   string  $alias
      *
      * @return  bool
      */
-    public function validateQueryColumnAssociation($table, $column)
+    public function validateQueryColumnAssociation($table, $alias)
     {
         $aliasTableMap = $this->getAliasTableMap();
-        return $aliasTableMap[$column] === $table;
+        if (isset($aliasTableMap[$alias])) {
+            return $aliasTableMap[$alias] === $table;
+        }
+
+        $prefixedAlias = $table . '.' . $alias;
+        return isset($aliasTableMap[$prefixedAlias]);
     }
 
     /**
@@ -640,7 +681,7 @@ abstract class Repository implements Selectable
             return false;
         }
 
-        return array_key_exists($name, $this->getAliasColumnMap())
+        return $this->resolveQueryColumnAlias($table, $name) !== null
             && $this->validateQueryColumnAssociation($table, $name);
     }
 
@@ -660,8 +701,7 @@ abstract class Repository implements Selectable
             throw new QueryException(t('Filter column "%s" cannot be queried'), $name);
         }
 
-        $aliasColumnMap = $this->getAliasColumnMap();
-        if (! array_key_exists($name, $aliasColumnMap)) {
+        if (($column = $this->resolveQueryColumnAlias($table, $name)) === null) {
             throw new QueryException(t('Query column "%s" not found'), $name);
         }
 
@@ -669,7 +709,7 @@ abstract class Repository implements Selectable
             throw new QueryException(t('Query column "%s" not found in table "%s"'), $name, $table);
         }
 
-        return $aliasColumnMap[$name];
+        return $column;
     }
 
     /**
@@ -682,7 +722,7 @@ abstract class Repository implements Selectable
      */
     public function hasFilterColumn($table, $name)
     {
-        return array_key_exists($name, $this->getAliasColumnMap())
+        return $this->resolveQueryColumnAlias($table, $name) !== null
             && $this->validateQueryColumnAssociation($table, $name);
     }
 
@@ -698,8 +738,7 @@ abstract class Repository implements Selectable
      */
     public function requireFilterColumn($table, $name)
     {
-        $aliasColumnMap = $this->getAliasColumnMap();
-        if (! array_key_exists($name, $aliasColumnMap)) {
+        if (($column = $this->resolveQueryColumnAlias($table, $name)) === null) {
             throw new QueryException(t('Filter column "%s" not found'), $name);
         }
 
@@ -707,7 +746,7 @@ abstract class Repository implements Selectable
             throw new QueryException(t('Filter column "%s" not found in table "%s"'), $name, $table);
         }
 
-        return $aliasColumnMap[$name];
+        return $column;
     }
 
     /**
@@ -739,8 +778,7 @@ abstract class Repository implements Selectable
             throw new StatementException('Filter column "%s" cannot be referenced in a statement', $name);
         }
 
-        $aliasColumnMap = $this->getAliasColumnMap();
-        if (! array_key_exists($name, $aliasColumnMap)) {
+        if (($column = $this->resolveQueryColumnAlias($table, $name)) === null) {
             throw new StatementException('Statement column "%s" not found', $name);
         }
 
@@ -748,7 +786,7 @@ abstract class Repository implements Selectable
             throw new StatementException('Statement column "%s" not found in table "%s"', $name, $table);
         }
 
-        return $aliasColumnMap[$name];
+        return $column;
     }
 
     /**

From 892712126636103322a51475ecc61f5eaba040ac Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 13 May 2015 13:50:19 +0200
Subject: [PATCH 1524/2920] UserController: Behave nicely when it's not
 possible to fetch any users

refs #8826
---
 application/controllers/UserController.php | 13 ++++++++++---
 application/views/scripts/user/list.phtml  |  5 +++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 587bd4107..9c4a298e1 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -1,12 +1,14 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
+use \Exception;
 use \Zend_Controller_Action_Exception;
 use Icinga\Application\Config;
 use Icinga\Authentication\User\UserBackend;
 use Icinga\Authentication\User\UserBackendInterface;
 use Icinga\Web\Controller;
 use Icinga\Web\Form;
+use Icinga\Web\Notification;
 use Icinga\Web\Widget;
 
 class UserController extends Controller
@@ -74,12 +76,17 @@ class UserController extends Controller
         $query->applyFilter($filterEditor->getFilter());
         $this->setupFilterControl($filterEditor);
 
-        $this->getTabs()->activate('user/list');
+        try {
+            $this->view->users = $query->paginate();
+            $this->setupPaginationControl($this->view->users);
+        } catch (Exception $e) {
+            Notification::error($e->getMessage());
+        }
+
         $this->view->backend = $backend;
-        $this->view->users = $query->paginate();
+        $this->getTabs()->activate('user/list');
 
         $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->users);
         $this->setupSortControl(
             array(
                 'user_name'     => $this->translate('Username'),
diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index a914312c0..c7904f9b4 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -18,6 +18,11 @@ if ($backend === null) {
     return;
 }
 
+if (! isset($users)) {
+    echo $this->translate('Failed to fetch any users') . '</div>';
+    return;
+}
+
 if (count($users) === 0) {
     echo $this->translate('No users found matching the filter') . '</div>';
     return;

From 5db6fc9ba9694c130b16af84fbd9634e8b6cace9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 13 May 2015 13:50:32 +0200
Subject: [PATCH 1525/2920] GroupController: Behave nicely when it's not
 possible to fetch any groups

refs #8826
---
 application/controllers/GroupController.php | 13 ++++++++++---
 application/views/scripts/group/list.phtml  |  5 +++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 0f45802cb..bf027c836 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -1,12 +1,14 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
+use \Exception;
 use \Zend_Controller_Action_Exception;
 use Icinga\Application\Config;
 use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Authentication\UserGroup\UserGroupBackendInterface;
 use Icinga\Web\Controller;
 use Icinga\Web\Form;
+use Icinga\Web\Notification;
 use Icinga\Web\Widget;
 
 class GroupController extends Controller
@@ -74,12 +76,17 @@ class GroupController extends Controller
         $query->applyFilter($filterEditor->getFilter());
         $this->setupFilterControl($filterEditor);
 
-        $this->getTabs()->activate('group/list');
+        try {
+            $this->view->groups = $query->paginate();
+            $this->setupPaginationControl($this->view->groups);
+        } catch (Exception $e) {
+            Notification::error($e->getMessage());
+        }
+
         $this->view->backend = $backend;
-        $this->view->groups = $query->paginate();
+        $this->getTabs()->activate('group/list');
 
         $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->groups);
         $this->setupSortControl(
             array(
                 'group_name'    => $this->translate('Group'),
diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
index 6e63fafdb..9b1b545d2 100644
--- a/application/views/scripts/group/list.phtml
+++ b/application/views/scripts/group/list.phtml
@@ -18,6 +18,11 @@ if ($backend === null) {
     return;
 }
 
+if (! isset($groups)) {
+    echo $this->translate('Failed to fetch any groups') . '</div>';
+    return;
+}
+
 if (count($groups) === 0) {
     echo $this->translate('No groups found matching the filter') . '</div>';
     return;

From 07a54736169ff75e30a9a0afbe9b465c7f3186ef Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 13 May 2015 13:58:40 +0200
Subject: [PATCH 1526/2920] UserController: Since logging errors as well is
 usually a good idea, log errors

refs #8826
---
 application/controllers/UserController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 9c4a298e1..487cfc920 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -4,6 +4,7 @@
 use \Exception;
 use \Zend_Controller_Action_Exception;
 use Icinga\Application\Config;
+use Icinga\Application\Logger;
 use Icinga\Authentication\User\UserBackend;
 use Icinga\Authentication\User\UserBackendInterface;
 use Icinga\Web\Controller;
@@ -81,6 +82,7 @@ class UserController extends Controller
             $this->setupPaginationControl($this->view->users);
         } catch (Exception $e) {
             Notification::error($e->getMessage());
+            Logger::error($e);
         }
 
         $this->view->backend = $backend;

From 9eaa231c4f55ed7dbf889f5067d87bae36bd4f7b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 13 May 2015 13:58:48 +0200
Subject: [PATCH 1527/2920] GroupController: Since logging errors as well is
 usually a good idea, log errors

refs #8826
---
 application/controllers/GroupController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index bf027c836..bbe97b64f 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -4,6 +4,7 @@
 use \Exception;
 use \Zend_Controller_Action_Exception;
 use Icinga\Application\Config;
+use Icinga\Application\Logger;
 use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Authentication\UserGroup\UserGroupBackendInterface;
 use Icinga\Web\Controller;
@@ -81,6 +82,7 @@ class GroupController extends Controller
             $this->setupPaginationControl($this->view->groups);
         } catch (Exception $e) {
             Notification::error($e->getMessage());
+            Logger::error($e);
         }
 
         $this->view->backend = $backend;

From ca79b020e30c5f039e7eb8c5cb75f797b8bf3a4d Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 13 May 2015 14:33:29 +0200
Subject: [PATCH 1528/2920] ListController: set up sort control before
 paginating a query

---
 .../controllers/ListController.php            | 84 +++++++++----------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index ece98d28c..1261c7685 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -97,6 +97,13 @@ class Monitoring_ListController extends Controller
         ), $this->extraColumns()));
         $this->filterQuery($query);
         $this->applyRestriction('monitoring/hosts/filter', $query);
+        $this->setupSortControl(array(
+            'host_severity'     => $this->translate('Severity'),
+            'host_state'        => $this->translate('Current State'),
+            'host_display_name' => $this->translate('Hostname'),
+            'host_address'      => $this->translate('Address'),
+            'host_last_check'   => $this->translate('Last Check')
+        ), $query);
         $this->view->hosts = $query->paginate();
 
         $this->view->stats = $this->backend->select()->from('statusSummary', array(
@@ -113,13 +120,6 @@ class Monitoring_ListController extends Controller
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->hosts);
-        $this->setupSortControl(array(
-            'host_severity'     => $this->translate('Severity'),
-            'host_state'        => $this->translate('Current State'),
-            'host_display_name' => $this->translate('Hostname'),
-            'host_address'      => $this->translate('Address'),
-            'host_last_check'   => $this->translate('Last Check')
-        ), $query);
     }
 
     /**
@@ -181,10 +181,6 @@ class Monitoring_ListController extends Controller
         $query = $this->backend->select()->from('serviceStatus', $columns);
         $this->filterQuery($query);
         $this->applyRestriction('monitoring/services/filter', $query);
-        $this->view->services = $query->paginate();
-
-        $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->services);
         $this->setupSortControl(array(
             'service_severity'      => $this->translate('Service Severity'),
             'service_state'         => $this->translate('Current Service State'),
@@ -196,6 +192,10 @@ class Monitoring_ListController extends Controller
             'host_address'          => $this->translate('Host Address'),
             'host_last_check'       => $this->translate('Last Host Check')
         ), $query);
+        $this->view->services = $query->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->services);
 
         $this->view->stats = $this->backend->select()->from('statusSummary', array(
             'services_total',
@@ -246,10 +246,6 @@ class Monitoring_ListController extends Controller
             'service_display_name'
         ));
         $this->filterQuery($query);
-        $this->view->downtimes = $query->paginate();
-
-        $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->downtimes);
         $this->setupSortControl(array(
             'downtime_is_in_effect'     => $this->translate('Is In Effect'),
             'host_display_name'         => $this->translate('Host'),
@@ -262,6 +258,10 @@ class Monitoring_ListController extends Controller
             'downtime_scheduled_end'    => $this->translate('Scheduled End'),
             'downtime_duration'         => $this->translate('Duration')
         ), $query);
+        $this->view->downtimes = $query->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->downtimes);
 
         if ($this->Auth()->hasPermission('monitoring/command/downtime/delete')) {
             $this->view->delDowntimeForm = new DeleteDowntimeCommandForm();
@@ -292,13 +292,13 @@ class Monitoring_ListController extends Controller
             'service_display_name'
         ));
         $this->filterQuery($query);
+        $this->setupSortControl(array(
+            'notification_start_time' => $this->translate('Notification Start')
+        ), $query);
         $this->view->notifications = $query->paginate();
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->notifications);
-        $this->setupSortControl(array(
-            'notification_start_time' => $this->translate('Notification Start')
-        ), $query);
     }
 
     public function contactsAction()
@@ -326,10 +326,6 @@ class Monitoring_ListController extends Controller
             'contact_notify_host_downtime',
         ));
         $this->filterQuery($query);
-        $this->view->contacts = $query->paginate();
-
-        $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->contacts);
         $this->setupSortControl(array(
             'contact_name' => $this->translate('Name'),
             'contact_alias' => $this->translate('Alias'),
@@ -338,6 +334,10 @@ class Monitoring_ListController extends Controller
             'contact_notify_service_timeperiod' => $this->translate('Service Notification Timeperiod'),
             'contact_notify_host_timeperiod' => $this->translate('Host Notification Timeperiod')
         ), $query);
+        $this->view->contacts = $query->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->contacts);
     }
 
     public function eventgridAction()
@@ -397,6 +397,11 @@ class Monitoring_ListController extends Controller
         ));
         $this->filterQuery($query);
 
+        $this->setupSortControl(array(
+            'contactgroup_name'     => $this->translate('Contactgroup Name'),
+            'contactgroup_alias'    => $this->translate('Contactgroup Alias')
+        ), $query);
+
         // Fetch and prepare all contact groups:
         $contactgroups = $query->getQuery()->fetchAll();
         $groupData = array();
@@ -411,11 +416,6 @@ class Monitoring_ListController extends Controller
         }
         // TODO: Find a better naming
         $this->view->groupData = $groupData;
-
-        $this->setupSortControl(array(
-            'contactgroup_name'     => $this->translate('Contactgroup Name'),
-            'contactgroup_alias'    => $this->translate('Contactgroup Alias')
-        ), $query);
     }
 
     public function commentsAction()
@@ -438,10 +438,6 @@ class Monitoring_ListController extends Controller
             'service_display_name'
         ));
         $this->filterQuery($query);
-        $this->view->comments = $query->paginate();
-
-        $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->comments);
         $this->setupSortControl(
             array(
                 'comment_timestamp'     => $this->translate('Comment Timestamp'),
@@ -452,6 +448,10 @@ class Monitoring_ListController extends Controller
             ),
             $query
         );
+        $this->view->comments = $query->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->comments);
 
         if ($this->Auth()->hasPermission('monitoring/command/comment/delete')) {
             $this->view->delCommentForm = new DeleteCommentCommandForm();
@@ -498,10 +498,6 @@ class Monitoring_ListController extends Controller
         // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
         // service groups. We should separate them.
         $this->filterQuery($query);
-        $this->view->servicegroups = $query->paginate();
-
-        $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->servicegroups);
         $this->setupSortControl(array(
             'services_severity'     => $this->translate('Severity'),
             'servicegroup_alias'    => $this->translate('Service Group Name'),
@@ -512,6 +508,10 @@ class Monitoring_ListController extends Controller
             'services_warning'      => $this->translate('Services WARNING'),
             'services_pending'      => $this->translate('Services PENDING')
         ), $query);
+        $this->view->servicegroups = $query->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->servicegroups);
     }
 
     public function hostgroupsAction()
@@ -549,10 +549,6 @@ class Monitoring_ListController extends Controller
         // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
         // service groups. We should separate them.
         $this->filterQuery($query);
-        $this->view->hostgroups = $query->paginate();
-
-        $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->hostgroups);
         $this->setupSortControl(array(
             'services_severity' => $this->translate('Severity'),
             'hostgroup_alias'   => $this->translate('Host Group Name'),
@@ -563,6 +559,10 @@ class Monitoring_ListController extends Controller
             'services_warning'  => $this->translate('Services WARNING'),
             'services_pending'  => $this->translate('Services PENDING')
         ), $query);
+        $this->view->hostgroups = $query->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->hostgroups);
     }
 
     public function eventhistoryAction()
@@ -588,13 +588,13 @@ class Monitoring_ListController extends Controller
         ));
 
         $this->filterQuery($query);
+        $this->setupSortControl(array(
+            'timestamp' => $this->translate('Occurence')
+        ), $query);
         $this->view->history = $query->paginate();
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->history);
-        $this->setupSortControl(array(
-            'timestamp' => $this->translate('Occurence')
-        ), $query);
     }
 
     public function servicegridAction()

From 59753acece33c46fbd2070cf0e525343fa30caf6 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 13 May 2015 14:40:40 +0200
Subject: [PATCH 1529/2920] SortBox::handleRequest(): set query order direction
 to asc if it's not given

---
 library/Icinga/Web/Widget/SortBox.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 022efdf32..895e9120c 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -114,7 +114,7 @@ class SortBox extends AbstractWidget
                 $request = Icinga::app()->getFrontController()->getRequest();
             }
             if ($sort = $request->getParam('sort')) {
-                $this->query->order($sort, $request->getParam('dir'));
+                $this->query->order($sort, $request->getParam('dir', 'asc'));
             }
         }
         return $this;

From 43d8968bd2ccde47ca6dacd55695032519d4742b Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 13 May 2015 16:22:47 +0200
Subject: [PATCH 1530/2920] GroupsummaryQuery: add columns

hosts_up_last_state_change
hosts_pending_last_state_change
hosts_down_last_state_change_handled
hosts_unreachable_last_state_change_handled
hosts_down_last_state_change_unhandled
hosts_unreachable_last_state_change_unhandled

refs #8860
---
 .../Backend/Ido/Query/GroupsummaryQuery.php   | 28 +++++++++++--------
 .../Monitoring/DataView/Groupsummary.php      |  6 ++++
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
index 8b72bbf79..fd389562e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@@ -11,17 +11,23 @@ class GroupSummaryQuery extends IdoQuery
 
     protected $columnMap = array(
         'hoststatussummary' => array(
-            'hosts_up'                      => 'SUM(CASE WHEN object_type = \'host\' AND state = 0 THEN 1 ELSE 0 END)',
-            'hosts_unreachable'             => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 THEN 1 ELSE 0 END)',
-            'hosts_unreachable_handled'     => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 AND acknowledged + in_downtime != 0 THEN 1 ELSE 0 END)',
-            'hosts_unreachable_unhandled'   => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
-            'hosts_down'                    => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 THEN 1 ELSE 0 END)',
-            'hosts_down_handled'            => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime != 0 THEN 1 ELSE 0 END)',
-            'hosts_down_unhandled'          => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
-            'hosts_pending'                 => 'SUM(CASE WHEN object_type = \'host\' AND state = 99 THEN 1 ELSE 0 END)',
-            'hostgroup_name'                => 'hostgroup_name',
-            'hostgroup_alias'               => 'hostgroup_alias',
-            'hostgroup'                     => 'hostgroup'
+            'hosts_up'                                      => 'SUM(CASE WHEN object_type = \'host\' AND state = 0 THEN 1 ELSE 0 END)',
+            'hosts_unreachable'                             => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 THEN 1 ELSE 0 END)',
+            'hosts_unreachable_handled'                     => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 AND acknowledged + in_downtime != 0 THEN 1 ELSE 0 END)',
+            'hosts_unreachable_unhandled'                   => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
+            'hosts_down'                                    => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 THEN 1 ELSE 0 END)',
+            'hosts_down_handled'                            => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime != 0 THEN 1 ELSE 0 END)',
+            'hosts_down_unhandled'                          => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
+            'hosts_pending'                                 => 'SUM(CASE WHEN object_type = \'host\' AND state = 99 THEN 1 ELSE 0 END)',
+            'hosts_up_last_state_change'                    => 'MAX(CASE WHEN object_type = \'host\' AND state = 0 THEN state_change ELSE 0 END)',
+            'hosts_pending_last_state_change'               => 'MAX(CASE WHEN object_type = \'host\' AND state = 99 THEN state_change ELSE 0 END)',
+            'hosts_down_last_state_change_handled'          => 'MAX(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime != 0 THEN state_change ELSE 0 END)',
+            'hosts_unreachable_last_state_change_handled'   => 'MAX(CASE WHEN object_type = \'host\' AND state = 2 AND acknowledged + in_downtime != 0 THEN state_change ELSE 0 END)',
+            'hosts_down_last_state_change_unhandled'        => 'MAX(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime = 0 THEN state_change ELSE 0 END)',
+            'hosts_unreachable_last_state_change_unhandled' => 'MAX(CASE WHEN object_type = \'host\' AND state = 2 AND acknowledged + in_downtime = 0 THEN state_change ELSE 0 END)',
+            'hostgroup_name'                                => 'hostgroup_name',
+            'hostgroup_alias'                               => 'hostgroup_alias',
+            'hostgroup'                                     => 'hostgroup'
         ),
         'servicestatussummary' => array(
             'services_total'                                => 'SUM(CASE WHEN object_type = \'service\' THEN 1 ELSE 0 END)',
diff --git a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
index 562bed1da..d29c1c418 100644
--- a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
@@ -25,6 +25,12 @@ class Groupsummary extends DataView
             'hosts_down_handled',
             'hosts_down_unhandled',
             'hosts_pending',
+            'hosts_up_last_state_change',
+            'hosts_pending_last_state_change',
+            'hosts_down_last_state_change_handled',
+            'hosts_unreachable_last_state_change_handled',
+            'hosts_down_last_state_change_unhandled',
+            'hosts_unreachable_last_state_change_unhandled',
             'services_total',
             'services_ok',
             'services_unknown',

From ab2f8e09d687dc105a979f5ac2113c43745f2054 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 13 May 2015 16:31:25 +0200
Subject: [PATCH 1531/2920] Calculate states for host group view from host
 states

refs #8860
---
 .../controllers/ListController.php            |  6 ++
 .../views/scripts/list/hostgroups.phtml       | 90 ++++++++-----------
 2 files changed, 44 insertions(+), 52 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 1261c7685..948050db6 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -528,6 +528,12 @@ class Monitoring_ListController extends Controller
             'hosts_down_handled',
             'hosts_down_unhandled',
             'hosts_pending',
+            'hosts_up_last_state_change',
+            'hosts_pending_last_state_change',
+            'hosts_down_last_state_change_handled',
+            'hosts_unreachable_last_state_change_handled',
+            'hosts_down_last_state_change_unhandled',
+            'hosts_unreachable_last_state_change_unhandled',
             'services_ok',
             'services_unknown_handled',
             'services_unknown_unhandled',
diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index ef8cd78ea..90e96e660 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -1,4 +1,7 @@
-<?php if (! $this->compact): ?>
+<?php
+use Icinga\Module\Monitoring\Object\Host;
+
+if (! $this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
   <?= $this->sortBox; ?>
@@ -15,7 +18,7 @@ if (count($hostgroups) === 0) {
     return;
 }
 ?>
-  <table class="groupview" data-base-target="_next">
+  <table class="groupview action" data-base-target="_next">
     <thead>
       <th><?= $this->translate('Last Problem'); ?></th>
       <th><?= $this->translate('Host Group'); ?></th>
@@ -23,57 +26,40 @@ if (count($hostgroups) === 0) {
       <th><?= $this->translate('Service States'); ?></th>
     </thead>
     <tbody>
-    <?php foreach ($hostgroups as $h): ?>
-      <tr href="<?= $this->href('monitoring/list/hosts', array('hostgroup_name' => $h->hostgroup_name)) ?>">
-       <?php if ($h->services_critical_last_state_change_unhandled): ?>
-        <td class="state change critical unhandled">
-          <strong><?= $this->translate('CRITICAL'); ?></strong>
+    <?php foreach ($hostgroups as $h):
+        if ($h->hosts_down_unhandled) {
+            $handled = false;
+            $state = Host::STATE_DOWN;
+            $lastStateChange = $h->hosts_down_last_state_change_unhandled;
+        } elseif ($h->hosts_unreachable_unhandled) {
+            $handled = false;
+            $state = Host::STATE_UNREACHABLE;
+            $lastStateChange = $h->hosts_unreachable_last_state_change_unhandled;
+        } else {
+            $handled = true;
+            if ($h->hosts_down_handled) {
+                $state = Host::STATE_DOWN;
+                $lastStateChange = $h->hosts_down_last_state_change_handled;
+            } elseif ($h->hosts_unreachable_handled) {
+                $state = Host::STATE_UNREACHABLE;
+                $lastStateChange = $h->hosts_unreachable_last_state_change_handled;
+            } elseif ($h->hosts_up) {
+                $state = Host::STATE_UP;
+                $lastStateChange = $h->hosts_up_last_state_change;
+            } else {
+                $state = Host::STATE_PENDING;
+                $lastStateChange = $h->hosts_pending_last_state_change;
+            }
+        }
+    ?>
+      <tr class="state <?= Host::getStateText($state) ?><?= $handled ? ' handled' : '' ?>" href="<?=
+        $this->href('monitoring/list/hosts', array('hostgroup_name' => $h->hostgroup_name))
+      ?>">
+        <td class="state">
+          <strong><?= Host::getStateText($state, true); ?></strong>
           <br>
-          <?= $this->prefixedTimeSince($h->services_critical_last_state_change_unhandled); ?>
+          <?= $this->prefixedTimeSince($lastStateChange); ?>
         </td>
-       <?php elseif ($h->services_unknown_last_state_change_unhandled): ?>
-        <td class="state change unknown unhandled">
-          <strong><?= $this->translate('UNKNOWN'); ?></strong>
-          <br>
-          <?= $this->prefixedTimeSince($h->services_unknown_last_state_change_unhandled); ?>
-        </td>
-       <?php elseif ($h->services_warning_last_state_change_unhandled): ?>
-        <td class="state change warning unhandled">
-          <strong><?= $this->translate('WARNING'); ?></strong>
-          <br>
-          <?= $this->prefixedTimeSince($h->services_warning_last_state_change_unhandled); ?>
-        </td>
-       <?php elseif ($h->services_critical_last_state_change_handled): ?>
-        <td class="state change critical">
-          <strong><?= $this->translate('CRITICAL'); ?></strong>
-          <br>
-          <?= $this->prefixedTimeSince($h->services_critical_last_state_change_handled); ?>
-        </td>
-       <?php elseif ($h->services_unknown_last_state_change_handled): ?>
-        <td class="state change unknown">
-          <strong><?= $this->translate('UNKNOWN'); ?></strong>
-          <br>
-          <?= $this->prefixedTimeSince($h->services_unknown_last_state_change_handled); ?>
-        </td>
-       <?php elseif ($h->services_warning_last_state_change_handled): ?>
-        <td class="state change warning">
-          <strong><?= $this->translate('WARNING'); ?></strong>
-          <br>
-          <?= $this->prefixedTimeSince($h->services_warning_last_state_change_handled); ?>
-        </td>
-       <?php elseif ($h->services_ok_last_state_change): ?>
-        <td class="state change ok">
-          <strong><?= $this->translate('OK'); ?></strong>
-          <br>
-          <?= $this->prefixedTimeSince($h->services_ok_last_state_change); ?>
-        </td>
-       <?php else: ?>
-        <td class="state change pending">
-          <strong><?= $this->translate('PENDING'); ?></strong>
-          <br>
-          <?= $this->prefixedTimeSince($h->services_pending_last_state_change); ?>
-        </td>
-       <?php endif ?>
         <td class="groupname">
           <?= $this->qlink(
             $h->hostgroup_alias,
@@ -93,7 +79,7 @@ if (count($hostgroups) === 0) {
             ))
           ); ?>
         </td>
-        <td class="state">
+        <td>
         <?php if ($h->services_ok): ?>
           <span class="state ok">
             <?= $this->qlink(

From 7e1f9f6dccc1085bc1066e6152e548d854050fac Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 13 May 2015 17:48:34 +0200
Subject: [PATCH 1532/2920] Make ascending sort by host or service severity
 initiatable

fixes #9059
---
 .../library/Monitoring/DataView/HostStatus.php     |  7 ++++---
 .../library/Monitoring/DataView/ServiceStatus.php  | 14 ++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index 23df6d94a..a84098aa4 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -94,10 +94,11 @@ class HostStatus extends DataView
             ),
             'host_severity' => array(
                 'columns' => array(
-                    'host_severity DESC',
-                    'host_last_state_change DESC',
+                    'host_severity',
+                    'host_last_state_change',
                     'host_display_name ASC'
-                )
+                ),
+                'order' => self::SORT_DESC
             ),
             'host_address' => array(
                 'columns' => array(
diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index b4f1038da..4d4d617ab 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -130,19 +130,21 @@ class ServiceStatus extends DataView
             ),
             'service_severity' => array(
                 'columns' => array(
-                    'service_severity DESC',
-                    'service_last_state_change DESC',
+                    'service_severity',
+                    'service_last_state_change',
                     'service_display_name ASC',
                     'host_display_name ASC'
-                )
+                ),
+                'order' => self::SORT_DESC
             ),
             'host_severity' => array(
                 'columns' => array(
-                    'host_severity DESC',
-                    'host_last_state_change DESC',
+                    'host_severity',
+                    'host_last_state_change',
                     'host_display_name ASC',
                     'service_display_name ASC'
-                )
+                ),
+                'order' => self::SORT_DESC
             ),
             'host_display_name' => array(
                 'columns' => array(

From ead0a642444c8718c3ca1475e205421a1f01239c Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 13 May 2015 18:10:18 +0200
Subject: [PATCH 1533/2920] GroupsummaryQuery: add column `hosts_total'

refs #8054
---
 .../library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php   | 1 +
 modules/monitoring/library/Monitoring/DataView/Groupsummary.php  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
index fd389562e..392c97538 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@@ -11,6 +11,7 @@ class GroupSummaryQuery extends IdoQuery
 
     protected $columnMap = array(
         'hoststatussummary' => array(
+            'hosts_total'                                   => 'SUM(CASE WHEN object_type = \'host\' THEN 1 ELSE 0 END)',
             'hosts_up'                                      => 'SUM(CASE WHEN object_type = \'host\' AND state = 0 THEN 1 ELSE 0 END)',
             'hosts_unreachable'                             => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 THEN 1 ELSE 0 END)',
             'hosts_unreachable_handled'                     => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 AND acknowledged + in_downtime != 0 THEN 1 ELSE 0 END)',
diff --git a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
index d29c1c418..36174bfde 100644
--- a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
@@ -17,6 +17,7 @@ class Groupsummary extends DataView
             'servicegroup_alias',
             'hostgroup_name',
             'hostgroup_alias',
+            'hosts_total',
             'hosts_up',
             'hosts_unreachable',
             'hosts_unreachable_handled',

From e879ba445dc308c5524bb83e6cddb9c73b32071e Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 13 May 2015 18:15:04 +0200
Subject: [PATCH 1534/2920] List number of hosts in host groups

refs #8054
---
 .../application/controllers/ListController.php       |  1 +
 .../application/views/scripts/list/hostgroups.phtml  | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 948050db6..540f21bae 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -534,6 +534,7 @@ class Monitoring_ListController extends Controller
             'hosts_unreachable_last_state_change_handled',
             'hosts_down_last_state_change_unhandled',
             'hosts_unreachable_last_state_change_unhandled',
+            'hosts_total',
             'services_ok',
             'services_unknown_handled',
             'services_unknown_unhandled',
diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index 90e96e660..89045d9ab 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -22,6 +22,7 @@ if (count($hostgroups) === 0) {
     <thead>
       <th><?= $this->translate('Last Problem'); ?></th>
       <th><?= $this->translate('Host Group'); ?></th>
+      <th><?= $this->translate('Total Hosts'); ?></th>
       <th><?= $this->translate('Total Services'); ?></th>
       <th><?= $this->translate('Service States'); ?></th>
     </thead>
@@ -68,6 +69,17 @@ if (count($hostgroups) === 0) {
             array('title' => sprintf($this->translate('List all hosts in the group "%s"'), $h->hostgroup_alias))
           ); ?>
         </td>
+        <td class="total">
+          <?= $this->qlink(
+            $h->hosts_total,
+            'monitoring/list/hosts',
+            array('hostgroup_name' => $h->hostgroup_name),
+            array('title' => sprintf(
+                $this->translate('List all hosts in host group "%s"'),
+                $h->hostgroup_alias
+            ))
+          ); ?>
+        </td>
         <td class="total">
           <?= $this->qlink(
             $h->services_total,

From 149e893ecdb8fea16c225d5e95c4fb1f3f004747 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 15 May 2015 10:54:30 +0200
Subject: [PATCH 1535/2920] Revert "Make ascending sort by host or service
 severity initiatable"

This reverts commit 7e1f9f6dccc1085bc1066e6152e548d854050fac.
---
 .../library/Monitoring/DataView/HostStatus.php     |  7 +++----
 .../library/Monitoring/DataView/ServiceStatus.php  | 14 ++++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index a84098aa4..23df6d94a 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -94,11 +94,10 @@ class HostStatus extends DataView
             ),
             'host_severity' => array(
                 'columns' => array(
-                    'host_severity',
-                    'host_last_state_change',
+                    'host_severity DESC',
+                    'host_last_state_change DESC',
                     'host_display_name ASC'
-                ),
-                'order' => self::SORT_DESC
+                )
             ),
             'host_address' => array(
                 'columns' => array(
diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index 4d4d617ab..b4f1038da 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -130,21 +130,19 @@ class ServiceStatus extends DataView
             ),
             'service_severity' => array(
                 'columns' => array(
-                    'service_severity',
-                    'service_last_state_change',
+                    'service_severity DESC',
+                    'service_last_state_change DESC',
                     'service_display_name ASC',
                     'host_display_name ASC'
-                ),
-                'order' => self::SORT_DESC
+                )
             ),
             'host_severity' => array(
                 'columns' => array(
-                    'host_severity',
-                    'host_last_state_change',
+                    'host_severity DESC',
+                    'host_last_state_change DESC',
                     'host_display_name ASC',
                     'service_display_name ASC'
-                ),
-                'order' => self::SORT_DESC
+                )
             ),
             'host_display_name' => array(
                 'columns' => array(

From 386d4db851aed056652d892d539de35b403c5062 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 13 May 2015 17:48:34 +0200
Subject: [PATCH 1536/2920] Make ascending sort by host or service severity
 initiatable

fixes #9059
---
 .../library/Monitoring/DataView/DataView.php          | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index c9537eff8..be5862abe 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -238,11 +238,11 @@ abstract class DataView implements Browsable, Countable, Filterable, Sortable
             };
         }
 
-        $order = $order === null ? (isset($sortColumns['order']) ? $sortColumns['order'] : static::SORT_ASC) : $order;
-        $order = (strtoupper($order) === static::SORT_ASC) ? 'ASC' : 'DESC';
+        $globalDefaultOrder = isset($sortColumns['order']) ? $sortColumns['order'] : static::SORT_ASC;
+        $globalDefaultOrder = (strtoupper($globalDefaultOrder) === static::SORT_ASC) ? 'ASC' : 'DESC';
 
         foreach ($sortColumns['columns'] as $column) {
-            list($column, $direction) = $this->query->splitOrder($column);
+            list($column, $specificDefaultOrder) = $this->query->splitOrder($column);
             if (! $this->isValidFilterTarget($column)) {
                 throw new QueryException(
                     mt('monitoring', 'The sort column "%s" is not allowed in "%s".'),
@@ -250,7 +250,10 @@ abstract class DataView implements Browsable, Countable, Filterable, Sortable
                     get_class($this)
                 );
             }
-            $this->query->order($column, $direction !== null ? $direction : $order);
+            $this->query->order(
+                $column,
+                $order === null && $specificDefaultOrder !== null ? $specificDefaultOrder : $globalDefaultOrder
+            );
         }
         $this->isSorted = true;
         return $this;

From c7d1a7211f63510c0bb9f932f2bccbfdc4dfc705 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 15 May 2015 11:28:16 +0200
Subject: [PATCH 1537/2920] Show host states in host groups

---
 .../views/scripts/list/hostgroups.phtml       | 157 ++++++++++++++++++
 1 file changed, 157 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index 89045d9ab..23d031b3f 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -23,6 +23,7 @@ if (count($hostgroups) === 0) {
       <th><?= $this->translate('Last Problem'); ?></th>
       <th><?= $this->translate('Host Group'); ?></th>
       <th><?= $this->translate('Total Hosts'); ?></th>
+      <th><?= $this->translate('Host States'); ?></th>
       <th><?= $this->translate('Total Services'); ?></th>
       <th><?= $this->translate('Service States'); ?></th>
     </thead>
@@ -80,6 +81,162 @@ if (count($hostgroups) === 0) {
             ))
           ); ?>
         </td>
+        <td>
+        <?php if ($h->hosts_up): ?>
+          <span class="state ok">
+            <?= $this->qlink(
+              $h->hosts_up,
+              'monitoring/list/hosts',
+              array(
+                'host_state'        => 0,
+                'hostgroup_name'    => $h->hostgroup_name,
+                'sort'              => 'host_severity'
+              ),
+              array(
+                'title' => sprintf(
+                  $this->translatePlural(
+                    'List %u host that is currently in state UP in the host group "%s"',
+                    'List %u hosts which are currently in state UP in the host group "%s"',
+                    $h->hosts_up
+                  ),
+                  $h->hosts_up,
+                  $h->hostgroup_alias
+                )
+              )
+            ); ?>
+          </span>
+        <?php endif ?>
+        <?php if ($h->hosts_down_unhandled): ?>
+          <span class="state critical">
+            <?= $this->qlink(
+              $h->hosts_down_unhandled,
+              'monitoring/list/hosts',
+              array(
+                'host_state'        => 1,
+                'host_acknowledged' => 0,
+                'host_in_downtime'  => 0,
+                'hostgroup_name'    => $h->hostgroup_name,
+                'sort'              => 'host_severity'
+              ),
+              array(
+                'title' => sprintf(
+                  $this->translatePlural(
+                    'List %u host that is currently in state DOWN in the host group "%s"',
+                    'List %u hosts which are currently in state DOWN in the host group "%s"',
+                    $h->hosts_down_unhandled
+                  ),
+                  $h->hosts_down_unhandled,
+                  $h->hostgroup_alias
+                )
+              )
+            ); ?>
+        <?php endif ?>
+          <?php if ($h->hosts_down_handled): ?>
+            <span class="state critical handled">
+              <?= $this->qlink(
+                $h->hosts_down_handled,
+                'monitoring/list/hosts',
+                array(
+                  'host_state'      => 1,
+                  'host_handled'    => 1,
+                  'hostgroup_name'  => $h->hostgroup_name,
+                  'sort'            => 'host_severity'
+                ),
+                array(
+                  'title' => sprintf(
+                    $this->translatePlural(
+                      'List %u host that is currently in state DOWN (Acknowledged) in the host group "%s"',
+                      'List %u hosts which are currently in state DOWN (Acknowledged) in the host group "%s"',
+                      $h->hosts_down_handled
+                    ),
+                    $h->hosts_down_handled,
+                    $h->hostgroup_alias
+                  )
+                )
+              ); ?>
+            </span>
+          <?php endif ?>
+        <?php if ($h->hosts_down_unhandled): ?>
+          </span>
+        <?php endif ?>
+        <?php if ($h->hosts_unreachable_unhandled): ?>
+          <span class="state unknown">
+            <?= $this->qlink(
+              $h->hosts_unreachable_unhandled,
+              'monitoring/list/hosts',
+              array(
+                'host_state'        => 2,
+                'host_acknowledged' => 0,
+                'host_in_downtime'  => 0,
+                'hostgroup_name'    => $h->hostgroup_name,
+                'sort'              => 'host_severity'
+              ),
+              array(
+                'title' => sprintf(
+                  $this->translatePlural(
+                    'List %u host that is currently in state UNREACHABLE in the host group "%s"',
+                    'List %u hosts which are currently in state UNREACHABLE in the host group "%s"',
+                    $h->hosts_unreachable_unhandled
+                  ),
+                  $h->hosts_unreachable_unhandled,
+                  $h->hostgroup_alias
+                )
+              )
+            ); ?>
+        <?php endif ?>
+          <?php if ($h->hosts_unreachable_handled): ?>
+            <span class="state unknown handled">
+              <?= $this->qlink(
+                $h->hosts_unreachable_handled,
+                'monitoring/list/hosts',
+                array(
+                  'host_state'      => 2,
+                  'host_handled'    => 1,
+                  'hostgroup_name'  => $h->hostgroup_name,
+                  'sort'            => 'host_severity'
+                ),
+                array(
+                  'title' => sprintf(
+                    $this->translatePlural(
+                      'List %u host that is currently in state UNREACHABLE (Acknowledged) in the host group "%s"',
+                      'List %u hosts which are currently in state UNREACHABLE (Acknowledged) in the host group "%s"',
+                      $h->hosts_unreachable_handled
+                    ),
+                    $h->hosts_unreachable_handled,
+                    $h->hostgroup_alias
+                  )
+                )
+              ); ?>
+            </span>
+          <?php endif ?>
+        <?php if ($h->hosts_unreachable_unhandled): ?>
+          </span>
+        <?php endif ?>
+        <?php if ($h->hosts_pending): ?>
+          <span class="state pending">
+            <?= $this->qlink(
+              $h->hosts_pending,
+              'monitoring/list/hosts',
+              array(
+                'host_state'        => 99,
+                'hostgroup_name'    => $h->hostgroup_name,
+                'sort'              => 'host_severity'
+              ),
+              array(
+                'title' => sprintf(
+                  $this->translatePlural(
+                    'List %u host that is currently in state PENDING in the host group "%s"',
+                    'List %u hosts which are currently in state PENDING in the host group "%s"',
+                    $h->hosts_pending
+                  ),
+                  $h->hosts_pending,
+                  $h->hostgroup_alias
+                )
+              )
+            ); ?>
+          </span>
+        <?php endif ?>
+        </td>
         <td class="total">
           <?= $this->qlink(
             $h->services_total,

From 8b084733413b74131100abf6a31efc02793695c5 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 15 May 2015 12:34:59 +0200
Subject: [PATCH 1538/2920] Hostgroups view: reduce "Last Problem" column's
 width

---
 .../application/views/scripts/list/hostgroups.phtml           | 2 +-
 public/css/icinga/main-content.less                           | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index 23d031b3f..e75359b23 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -20,7 +20,7 @@ if (count($hostgroups) === 0) {
 ?>
   <table class="groupview action" data-base-target="_next">
     <thead>
-      <th><?= $this->translate('Last Problem'); ?></th>
+      <th class="state"><?= $this->translate('Last Problem'); ?></th>
       <th><?= $this->translate('Host Group'); ?></th>
       <th><?= $this->translate('Total Hosts'); ?></th>
       <th><?= $this->translate('Host States'); ?></th>
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index b442723cb..59c7830da 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -169,6 +169,10 @@ table.benchmark {
   width: 96%;
 }
 
+table.groupview th.state {
+  width: 9em;
+}
+
 .dashboard h1 {
   font-size: 1em;
 }

From 1eb11625ef89b9659e9e4cc440e1247c18c93ffa Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Fri, 15 May 2015 13:02:54 +0200
Subject: [PATCH 1539/2920] Add new FormNotification Decorator to render form
 notifications

refs #9203
---
 .../Web/Form/Decorator/FormNotifications.php  | 95 +++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 library/Icinga/Web/Form/Decorator/FormNotifications.php

diff --git a/library/Icinga/Web/Form/Decorator/FormNotifications.php b/library/Icinga/Web/Form/Decorator/FormNotifications.php
new file mode 100644
index 000000000..ed725e625
--- /dev/null
+++ b/library/Icinga/Web/Form/Decorator/FormNotifications.php
@@ -0,0 +1,95 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Web\Form\Decorator;
+
+use Zend_Form_Decorator_Abstract;
+use Icinga\Web\Form as Form;
+
+/**
+ * Decorator to add a list of notifications at the top of a form
+ */
+class FormNotifications extends Zend_Form_Decorator_Abstract
+{
+    /**
+     * Render form descriptions
+     *
+     * @param   string      $content    The html rendered so far
+     *
+     * @return  string                  The updated html
+     */
+    public function render($content = '')
+    {
+        $form = $this->getElement();
+        if (! $form instanceof Form) {
+            return $content;
+        }
+
+        $view = $form->getView();
+        if ($view === null) {
+            return $content;
+        }
+
+        $notifications = $this->recurseForm($form);
+
+        if (empty($notifications)) {
+            return $content;
+        }
+
+        $html = '<ul class="form-notifications">';
+
+        asort($notifications);
+        foreach ($notifications as $message => $type) {
+            $html .= '<li class="'.self::getNotificationTypeName($type).'">' . $view->escape($message) . '</li>';
+        }
+
+        switch ($this->getPlacement()) {
+            case self::APPEND:
+                return $content . $html . '</ul>';
+            case self::PREPEND:
+                return $html . '</ul>' . $content;
+        }
+    }
+
+    /**
+     * Recurse the given form and return the notifications for it and all of its subforms
+     *
+     * @param   Form    $form       The form to recurse
+     *
+     * @return array
+     */
+    protected function recurseForm(Form $form)
+    {
+        $notifications = $form->getNotifications();
+
+        foreach ($form->getSubForms() as $subForm) {
+            $notifications = $notifications + $this->recurseForm($subForm);
+        }
+
+        return $notifications;
+    }
+
+    /**
+     * Get the readable type name of the notification
+     *
+     * @param   $type       Type of the message
+     *
+     * @return  string
+     */
+    public static function getNotificationTypeName($type)
+    {
+        switch ($type) {
+            case Form::NOTIFICATION_ERROR:
+                return 'error';
+                break;
+            case Form::NOTIFICATION_WARNING:
+                return 'warning';
+                break;
+            case Form::NOTIFICATION_INFO:
+                return 'info';
+                break;
+            default:
+                return 'unknown';
+        }
+    }
+}

From 9f35db71bfa4645a186a22f7b7e3b1ae733e51a9 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Fri, 15 May 2015 13:04:01 +0200
Subject: [PATCH 1540/2920] Form: Add typed notifications to the form

refs #9203
---
 library/Icinga/Web/Form.php | 76 +++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index faf77770c..48f7acdb7 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -38,6 +38,28 @@ class Form extends Zend_Form
      */
     const DEFAULT_SUFFIX = '_default';
 
+    /**
+     * The type of the notification for the error
+     */
+    const NOTIFICATION_ERROR    = 0;
+
+    /**
+     * The type of the notification for the warning
+     */
+    const NOTIFICATION_WARNING  = 2;
+
+    /**
+     * The type of the notification for the info
+     */
+    const NOTIFICATION_INFO     = 4;
+
+    /**
+     * The notifications of the form
+     *
+     * @var array
+     */
+    protected $notifications = array();
+
     /**
      * Whether this form has been created
      *
@@ -1009,6 +1031,7 @@ class Form extends Zend_Form
                 }
 
                 $this->addDecorator('FormErrors', array('onlyCustomFormErrors' => true))
+                    ->addDecorator('FormNotifications')
                     ->addDecorator('FormDescriptions')
                     ->addDecorator('FormElements')
                     //->addDecorator('HtmlTag', array('tag' => 'dl', 'class' => 'zend_form'))
@@ -1208,4 +1231,57 @@ class Form extends Zend_Form
             throw new SecurityException('No permission for %s', $permission);
         }
     }
+
+    /**
+     * Return all form notifications
+     *
+     * @return array
+     */
+    public function getNotifications()
+    {
+        return $this->notifications;
+    }
+
+    /**
+     * Add a typed message to the notifications
+     *
+     * @param string    $message    The message which would be displayed to the user
+     *
+     * @param int       $type       The type of the message notification
+     */
+    public function addNotification($message, $type = self::NOTIFICATION_ERROR)
+    {
+        $this->notifications[$message] = $type;
+        $this->markAsError();
+    }
+
+    /**
+     * Add a error message to notifications
+     *
+     * @param string $message
+     */
+    public function error($message)
+    {
+        $this->addNotification($message, $type = self::NOTIFICATION_ERROR);
+    }
+
+    /**
+     * Add a warning message to notifications
+     *
+     * @param string $message
+     */
+    public function warning($message)
+    {
+        $this->addNotification($message, $type = self::NOTIFICATION_WARNING);
+    }
+
+    /**
+     * Add a info message to notifications
+     *
+     * @param string $message
+     */
+    public function info($message)
+    {
+        $this->addNotification($message, $type = self::NOTIFICATION_INFO);
+    }
 }

From 93470db81de5eeaf1360e4e36b356044dd611bcc Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Fri, 15 May 2015 13:05:24 +0200
Subject: [PATCH 1541/2920] Add css styling for form notifications

refs #9203
---
 public/css/icinga/defaults.less |  3 +++
 public/css/icinga/forms.less    | 26 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index 3dc277300..e3e033eff 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -23,6 +23,9 @@
 @colorUnreachableHandled: #cc77ff;
 @colorPending: #77aaff;
 @colorInvalid: #999;
+@colorFormNotificationInfo: #77aaff;
+@colorFormNotificationWarning: #ffaa44;
+@colorFormNotificationError: #ff5566;
 
 /* Mixins */
 
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 41525a4c7..85c7b20a9 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -165,6 +165,32 @@ form ul.form-errors {
   }
 }
 
+form ul.form-notifications {
+  .non-list-like-list;
+  margin-bottom: 1em;
+  padding: 0em;
+
+  li.info {
+    background: @colorFormNotificationInfo;
+  }
+
+  li.warning {
+    background: @colorFormNotificationWarning;
+  }
+
+  li.error {
+    background: @colorFormNotificationError;
+  }
+
+  li {
+    color: white;
+    font-weight: bold;
+    line-height: 1.5em;
+    padding: 0.5em;
+    margin-bottom: 0.5em;
+  }
+}
+
 form div.element {
   margin: 0.5em 0;
 }

From df7b56881fa061acd449fac6457000b2918a8b9a Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Fri, 15 May 2015 13:06:33 +0200
Subject: [PATCH 1542/2920] Add IDO instance validation

refs #9203
---
 .../application/forms/Config/BackendConfigForm.php          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index 567f7a575..1380b416d 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -318,15 +318,15 @@ class BackendConfigForm extends ConfigForm
         if (count($instances) === 1) {
             return true;
         } elseif (count($instances) > 1) {
-            $form->addError(
+            $form->warning(
                 $form->translate(
-                    'WARNING: IDO instance validation failed, because there are multiple instances available.'
+                    'IDO instance validation failed, because there are multiple instances available.'
                 )
             );
             return false;
         }
 
-        $form->addError(
+        $form->error(
             $form->translate(
                 'IDO instance validation failed, because there is no IDO instance available.'
             )

From 19243e6885cabd31a86ba8d05be7a7da2857b8f6 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Fri, 15 May 2015 13:24:27 +0200
Subject: [PATCH 1543/2920] Add css cursor:pointer to buttons

---
 public/css/icinga/forms.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 85c7b20a9..c8b5df161 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -87,6 +87,10 @@ button::-moz-focus-inner {
   outline: 0;
 }
 
+button {
+  cursor: pointer;
+}
+
 select::-moz-focus-inner {
   border: 0;
   outline: 0;

From ad8903660ddd85fdc43cdc8182a1f65bef2bd54f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 15 May 2015 10:56:33 +0200
Subject: [PATCH 1544/2920] Revert "SortBox::handleRequest(): set query order
 direction to asc if it's not given"

This reverts commit 59753acece33c46fbd2070cf0e525343fa30caf6.
---
 library/Icinga/Web/Widget/SortBox.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 895e9120c..022efdf32 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -114,7 +114,7 @@ class SortBox extends AbstractWidget
                 $request = Icinga::app()->getFrontController()->getRequest();
             }
             if ($sort = $request->getParam('sort')) {
-                $this->query->order($sort, $request->getParam('dir', 'asc'));
+                $this->query->order($sort, $request->getParam('dir'));
             }
         }
         return $this;

From 3b7f27f614a0fb5e185eada48d1cb493c22cd8ff Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 15 May 2015 10:56:52 +0200
Subject: [PATCH 1545/2920] Revert "ListController: set up sort control before
 paginating a query"

This reverts commit ca79b020e30c5f039e7eb8c5cb75f797b8bf3a4d.
---
 .../controllers/ListController.php            | 84 +++++++++----------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 948050db6..bec65ac9b 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -97,13 +97,6 @@ class Monitoring_ListController extends Controller
         ), $this->extraColumns()));
         $this->filterQuery($query);
         $this->applyRestriction('monitoring/hosts/filter', $query);
-        $this->setupSortControl(array(
-            'host_severity'     => $this->translate('Severity'),
-            'host_state'        => $this->translate('Current State'),
-            'host_display_name' => $this->translate('Hostname'),
-            'host_address'      => $this->translate('Address'),
-            'host_last_check'   => $this->translate('Last Check')
-        ), $query);
         $this->view->hosts = $query->paginate();
 
         $this->view->stats = $this->backend->select()->from('statusSummary', array(
@@ -120,6 +113,13 @@ class Monitoring_ListController extends Controller
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->hosts);
+        $this->setupSortControl(array(
+            'host_severity'     => $this->translate('Severity'),
+            'host_state'        => $this->translate('Current State'),
+            'host_display_name' => $this->translate('Hostname'),
+            'host_address'      => $this->translate('Address'),
+            'host_last_check'   => $this->translate('Last Check')
+        ), $query);
     }
 
     /**
@@ -181,6 +181,10 @@ class Monitoring_ListController extends Controller
         $query = $this->backend->select()->from('serviceStatus', $columns);
         $this->filterQuery($query);
         $this->applyRestriction('monitoring/services/filter', $query);
+        $this->view->services = $query->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->services);
         $this->setupSortControl(array(
             'service_severity'      => $this->translate('Service Severity'),
             'service_state'         => $this->translate('Current Service State'),
@@ -192,10 +196,6 @@ class Monitoring_ListController extends Controller
             'host_address'          => $this->translate('Host Address'),
             'host_last_check'       => $this->translate('Last Host Check')
         ), $query);
-        $this->view->services = $query->paginate();
-
-        $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->services);
 
         $this->view->stats = $this->backend->select()->from('statusSummary', array(
             'services_total',
@@ -246,6 +246,10 @@ class Monitoring_ListController extends Controller
             'service_display_name'
         ));
         $this->filterQuery($query);
+        $this->view->downtimes = $query->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->downtimes);
         $this->setupSortControl(array(
             'downtime_is_in_effect'     => $this->translate('Is In Effect'),
             'host_display_name'         => $this->translate('Host'),
@@ -258,10 +262,6 @@ class Monitoring_ListController extends Controller
             'downtime_scheduled_end'    => $this->translate('Scheduled End'),
             'downtime_duration'         => $this->translate('Duration')
         ), $query);
-        $this->view->downtimes = $query->paginate();
-
-        $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->downtimes);
 
         if ($this->Auth()->hasPermission('monitoring/command/downtime/delete')) {
             $this->view->delDowntimeForm = new DeleteDowntimeCommandForm();
@@ -292,13 +292,13 @@ class Monitoring_ListController extends Controller
             'service_display_name'
         ));
         $this->filterQuery($query);
-        $this->setupSortControl(array(
-            'notification_start_time' => $this->translate('Notification Start')
-        ), $query);
         $this->view->notifications = $query->paginate();
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->notifications);
+        $this->setupSortControl(array(
+            'notification_start_time' => $this->translate('Notification Start')
+        ), $query);
     }
 
     public function contactsAction()
@@ -326,6 +326,10 @@ class Monitoring_ListController extends Controller
             'contact_notify_host_downtime',
         ));
         $this->filterQuery($query);
+        $this->view->contacts = $query->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->contacts);
         $this->setupSortControl(array(
             'contact_name' => $this->translate('Name'),
             'contact_alias' => $this->translate('Alias'),
@@ -334,10 +338,6 @@ class Monitoring_ListController extends Controller
             'contact_notify_service_timeperiod' => $this->translate('Service Notification Timeperiod'),
             'contact_notify_host_timeperiod' => $this->translate('Host Notification Timeperiod')
         ), $query);
-        $this->view->contacts = $query->paginate();
-
-        $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->contacts);
     }
 
     public function eventgridAction()
@@ -397,11 +397,6 @@ class Monitoring_ListController extends Controller
         ));
         $this->filterQuery($query);
 
-        $this->setupSortControl(array(
-            'contactgroup_name'     => $this->translate('Contactgroup Name'),
-            'contactgroup_alias'    => $this->translate('Contactgroup Alias')
-        ), $query);
-
         // Fetch and prepare all contact groups:
         $contactgroups = $query->getQuery()->fetchAll();
         $groupData = array();
@@ -416,6 +411,11 @@ class Monitoring_ListController extends Controller
         }
         // TODO: Find a better naming
         $this->view->groupData = $groupData;
+
+        $this->setupSortControl(array(
+            'contactgroup_name'     => $this->translate('Contactgroup Name'),
+            'contactgroup_alias'    => $this->translate('Contactgroup Alias')
+        ), $query);
     }
 
     public function commentsAction()
@@ -438,6 +438,10 @@ class Monitoring_ListController extends Controller
             'service_display_name'
         ));
         $this->filterQuery($query);
+        $this->view->comments = $query->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->comments);
         $this->setupSortControl(
             array(
                 'comment_timestamp'     => $this->translate('Comment Timestamp'),
@@ -448,10 +452,6 @@ class Monitoring_ListController extends Controller
             ),
             $query
         );
-        $this->view->comments = $query->paginate();
-
-        $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->comments);
 
         if ($this->Auth()->hasPermission('monitoring/command/comment/delete')) {
             $this->view->delCommentForm = new DeleteCommentCommandForm();
@@ -498,6 +498,10 @@ class Monitoring_ListController extends Controller
         // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
         // service groups. We should separate them.
         $this->filterQuery($query);
+        $this->view->servicegroups = $query->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->servicegroups);
         $this->setupSortControl(array(
             'services_severity'     => $this->translate('Severity'),
             'servicegroup_alias'    => $this->translate('Service Group Name'),
@@ -508,10 +512,6 @@ class Monitoring_ListController extends Controller
             'services_warning'      => $this->translate('Services WARNING'),
             'services_pending'      => $this->translate('Services PENDING')
         ), $query);
-        $this->view->servicegroups = $query->paginate();
-
-        $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->servicegroups);
     }
 
     public function hostgroupsAction()
@@ -555,6 +555,10 @@ class Monitoring_ListController extends Controller
         // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
         // service groups. We should separate them.
         $this->filterQuery($query);
+        $this->view->hostgroups = $query->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->hostgroups);
         $this->setupSortControl(array(
             'services_severity' => $this->translate('Severity'),
             'hostgroup_alias'   => $this->translate('Host Group Name'),
@@ -565,10 +569,6 @@ class Monitoring_ListController extends Controller
             'services_warning'  => $this->translate('Services WARNING'),
             'services_pending'  => $this->translate('Services PENDING')
         ), $query);
-        $this->view->hostgroups = $query->paginate();
-
-        $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->hostgroups);
     }
 
     public function eventhistoryAction()
@@ -594,13 +594,13 @@ class Monitoring_ListController extends Controller
         ));
 
         $this->filterQuery($query);
-        $this->setupSortControl(array(
-            'timestamp' => $this->translate('Occurence')
-        ), $query);
         $this->view->history = $query->paginate();
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->history);
+        $this->setupSortControl(array(
+            'timestamp' => $this->translate('Occurence')
+        ), $query);
     }
 
     public function servicegridAction()

From e04655e8cfb2a1150c52a5b2c0a2ce4291c8e8b6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 15 May 2015 12:33:41 +0200
Subject: [PATCH 1546/2920] Controller: Apply the user chosen sort rules when
 in compact view as well

---
 library/Icinga/Web/Controller.php | 42 ++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index b70dbd3fc..b223921a3 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -22,44 +22,56 @@ class Controller extends ModuleActionController
     public function init()
     {
         parent::init();
+        $this->handleSortControlSubmit();
+    }
 
+    /**
+     * Check whether the sort control has been submitted and redirect using GET parameters
+     */
+    protected function handleSortControlSubmit()
+    {
         $request = $this->getRequest();
-        $url = Url::fromRequest();
+        if (! $request->isPost()) {
+            return;
+        }
 
-        if ($request->isPost() && ($sort = $request->getPost('sort'))) {
+        if (($sort = $request->getPost('sort'))) {
+            $url = Url::fromRequest();
             $url->setParam('sort', $sort);
-            if ($dir = $request->getPost('dir')) {
+            if (($dir = $request->getPost('dir'))) {
                 $url->setParam('dir', $dir);
             } else {
                 $url->removeParam('dir');
             }
+
             $this->redirectNow($url);
         }
     }
 
     /**
-     * Create a SortBox widget at the `sortBox' view property
+     * Create a SortBox widget and apply its sort rules on the given query
      *
-     * In case the current view has been requested as compact this method does nothing.
+     * The widget is set on the `sortBox' view property only if the current view has not been requested as compact
      *
      * @param   array    $columns    An array containing the sort columns, with the
      *                               submit value as the key and the label as the value
-     * @param   Sortable $query      Query to set on the newly created SortBox
+     * @param   Sortable $query      Query to apply the user chosen sort rules on
      *
      * @return  $this
      */
     protected function setupSortControl(array $columns, Sortable $query = null)
     {
+        $request = $this->getRequest();
+        $sortBox = SortBox::create('sortbox-' . $request->getActionName(), $columns);
+        $sortBox->setRequest($request);
+
+        if ($query) {
+            $sortBox->setQuery($query);
+            $sortBox->handleRequest($request);
+        }
+
         if (! $this->view->compact) {
-            $req = $this->getRequest();
-            $this->view->sortBox = $sortBox = SortBox::create(
-                'sortbox-' . $req->getActionName(),
-                $columns
-            )->setRequest($req);
-            if ($query !== null) {
-                $sortBox->setQuery($query);
-            }
-            $sortBox->handleRequest();
+            $this->view->sortBox = $sortBox;
         }
 
         return $this;

From 3770741ba557ea1f96df30f51eeb69f4f886798b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 15 May 2015 14:23:40 +0200
Subject: [PATCH 1547/2920] DataView: Implement QueryInterface

An instance of DataView should implement the full interface, not only
parts of it.
---
 .../library/Monitoring/DataView/DataView.php  | 119 ++++++++++++++++--
 1 file changed, 112 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index be5862abe..0a47c0d3b 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -3,14 +3,11 @@
 
 namespace Icinga\Module\Monitoring\DataView;
 
-use Countable;
+use Icinga\Data\QueryInterface;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Filter\FilterMatch;
-use Icinga\Data\Browsable;
 use Icinga\Data\PivotTable;
-use Icinga\Data\Sortable;
 use Icinga\Data\ConnectionInterface;
-use Icinga\Data\Filterable;
 use Icinga\Exception\QueryException;
 use Icinga\Web\Request;
 use Icinga\Web\Url;
@@ -19,12 +16,12 @@ use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 /**
  * A read-only view of an underlying query
  */
-abstract class DataView implements Browsable, Countable, Filterable, Sortable
+abstract class DataView implements QueryInterface, IteratorAggregate
 {
     /**
      * The query used to populate the view
      *
-     * @var \Icinga\Data\SimpleQuery
+     * @var QueryInterface
      */
     protected $query;
 
@@ -403,6 +400,114 @@ abstract class DataView implements Browsable, Countable, Filterable, Sortable
      */
     public function count()
     {
-        return count($this->query);
+        return $this->query->count();
+    }
+
+    /**
+     * Set a limit count and offset
+     *
+     * @param   int $count  Number of rows to return
+     * @param   int $offset Start returning after this many rows
+     *
+     * @return  self
+     */
+    public function limit($count = null, $offset = null)
+    {
+        $this->query->limit($count, $offset);
+        return $this;
+    }
+
+    /**
+     * Whether a limit is set
+     *
+     * @return bool
+     */
+    public function hasLimit()
+    {
+        return $this->query->hasLimit();
+    }
+
+    /**
+     * Get the limit if any
+     *
+     * @return int|null
+     */
+    public function getLimit()
+    {
+        return $this->query->getLimit();
+    }
+
+    /**
+     * Whether an offset is set
+     *
+     * @return bool
+     */
+    public function hasOffset()
+    {
+        return $this->query->hasOffset();
+    }
+
+    /**
+     * Get the offset if any
+     *
+     * @return int|null
+     */
+    public function getOffset()
+    {
+        return $this->query->hasOffset();
+    }
+
+    /**
+     * Retrieve an array containing all rows of the result set
+     *
+     * @return  array
+     */
+    public function fetchAll()
+    {
+        return $this->getQuery()->fetchAll();
+    }
+
+    /**
+     * Fetch the first row of the result set
+     *
+     * @return  mixed
+     */
+    public function fetchRow()
+    {
+        return $this->getQuery()->fetchRow();
+    }
+
+    /**
+     * Fetch a column of all rows of the result set as an array
+     *
+     * @param   int $columnIndex Index of the column to fetch
+     *
+     * @return  array
+     */
+    public function fetchColumn($columnIndex = 0)
+    {
+        return $this->getQuery()->fetchColumn($columnIndex);
+    }
+
+    /**
+     * Fetch the first column of the first row of the result set
+     *
+     * @return  string
+     */
+    public function fetchOne()
+    {
+        return $this->getQuery()->fetchOne();
+    }
+
+    /**
+     * Fetch all rows of the result set as an array of key-value pairs
+     *
+     * The first column is the key, the second column is the value.
+     *
+     * @return  array
+     */
+    public function fetchPairs()
+    {
+        return $this->getQuery()->fetchPairs();
     }
 }

From ed5f646b6ff2bb4781f7360998dc6db45084fb0e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 15 May 2015 14:26:00 +0200
Subject: [PATCH 1548/2920] SimpleQuery: Implement interface IteratorAggregate

I'd like to foreach such.
---
 library/Icinga/Data/SimpleQuery.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 16f82cbe4..20d514ecf 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -4,13 +4,15 @@
 namespace Icinga\Data;
 
 use Icinga\Application\Icinga;
+use ArrayIterator;
+use IteratorAggregate;
 use Icinga\Data\Filter\Filter;
 use Icinga\Web\Paginator\Adapter\QueryAdapter;
 use Zend_Paginator;
 use Exception;
 use Icinga\Exception\IcingaException;
 
-class SimpleQuery implements QueryInterface, Queryable
+class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
 {
     /**
      * Query data source
@@ -91,6 +93,16 @@ class SimpleQuery implements QueryInterface, Queryable
      */
     protected function init() {}
 
+    /**
+     * Return a iterable for this query's result
+     *
+     * @return  ArrayIterator
+     */
+    public function getIterator()
+    {
+        return new ArrayIterator($this->fetchAll());
+    }
+
     /**
      * Get the data source
      *

From 5faebb4a88e40cb4c07c8de9f4b76098a3a1beee Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 15 May 2015 14:26:32 +0200
Subject: [PATCH 1549/2920] DataView: Implement interface IteratorAggregate

I'd like to foreach such.
---
 .../library/Monitoring/DataView/DataView.php         | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 0a47c0d3b..6bed36fe1 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Module\Monitoring\DataView;
 
+use ArrayIterator;
+use IteratorAggregate;
 use Icinga\Data\QueryInterface;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Filter\FilterMatch;
@@ -56,6 +58,16 @@ abstract class DataView implements QueryInterface, IteratorAggregate
     {
     }
 
+    /**
+     * Return a iterator for all rows of the result set
+     *
+     * @return  ArrayIterator
+     */
+    public function getIterator()
+    {
+        return new ArrayIterator($this->fetchAll());
+    }
+
     /**
      * Get the query name this data view relies on
      *

From fbf0ad4339a8736169cdaeabd850bacc9b78811f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 15 May 2015 14:32:58 +0200
Subject: [PATCH 1550/2920] Drop interface Browsable

We're not required to handle objects of Zend_Paginator in any way, so
creating such as part of a query is not necessary since QueryAdapter
accepts any instance of QueryInterface. (gets enforced in the near future)

refs #8339
---
 application/controllers/ConfigController.php  |  3 +-
 application/controllers/ListController.php    |  2 +-
 library/Icinga/Data/Browsable.php             | 20 -----------
 library/Icinga/Data/QueryInterface.php        |  2 +-
 library/Icinga/Data/SimpleQuery.php           | 33 -------------------
 library/Icinga/File/Csv.php                   |  4 +--
 .../controllers/AlertsummaryController.php    |  4 +--
 .../controllers/ListController.php            | 18 +++++-----
 .../controllers/ShowController.php            |  8 ++---
 .../views/scripts/list/comments.phtml         |  2 +-
 .../views/scripts/list/downtimes.phtml        |  2 +-
 11 files changed, 21 insertions(+), 77 deletions(-)
 delete mode 100644 library/Icinga/Data/Browsable.php

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 370b8f5d0..77b5b66d9 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -128,8 +128,7 @@ class ConfigController extends Controller
         $this->view->modules = Icinga::app()->getModuleManager()->select()
             ->from('modules')
             ->order('enabled', 'desc')
-            ->order('name')
-            ->paginate();
+            ->order('name');
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->modules);
         // TODO: Not working
diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index ca7265f0e..4271e385a 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -51,7 +51,7 @@ class ListController extends Controller
                 . 'T[0-9]{2}(?::[0-9]{2}){2}(?:[\+\-][0-9]{2}:[0-9]{2})?)'  // time
                 . ' - (?<loglevel>[A-Za-z]+) - (?<message>.*)(?!.)/msS'     // loglevel, message
         )));
-        $this->view->logData = $resource->select()->order('DESC')->paginate();
+        $this->view->logData = $resource->select()->order('DESC');
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->logData);
diff --git a/library/Icinga/Data/Browsable.php b/library/Icinga/Data/Browsable.php
deleted file mode 100644
index a734a2680..000000000
--- a/library/Icinga/Data/Browsable.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\Data;
-
-/**
- * Interface for browsing data
- */
-interface Browsable
-{
-    /**
-     * Paginate data
-     *
-     * @param   int $itemsPerPage   Number of items per page
-     * @param   int $pageNumber     Current page number
-     *
-     * @return  Zend_Paginator
-     */
-    public function paginate($itemsPerPage = null, $pageNumber = null);
-}
diff --git a/library/Icinga/Data/QueryInterface.php b/library/Icinga/Data/QueryInterface.php
index 4d43d1059..5a6d5d5ab 100644
--- a/library/Icinga/Data/QueryInterface.php
+++ b/library/Icinga/Data/QueryInterface.php
@@ -5,4 +5,4 @@ namespace Icinga\Data;
 
 use Countable;
 
-interface QueryInterface extends Browsable, Fetchable, Filterable, Limitable, Sortable, Countable {};
+interface QueryInterface extends Fetchable, Filterable, Limitable, Sortable, Countable {};
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 20d514ecf..bf9360799 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -3,13 +3,9 @@
 
 namespace Icinga\Data;
 
-use Icinga\Application\Icinga;
 use ArrayIterator;
 use IteratorAggregate;
 use Icinga\Data\Filter\Filter;
-use Icinga\Web\Paginator\Adapter\QueryAdapter;
-use Zend_Paginator;
-use Exception;
 use Icinga\Exception\IcingaException;
 
 class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
@@ -331,35 +327,6 @@ class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
         return $this->limitOffset;
     }
 
-    /**
-     * Paginate data
-     *
-     * Auto-detects pagination parameters from request when unset
-     *
-     * @param   int $itemsPerPage   Number of items per page
-     * @param   int $pageNumber     Current page number
-     *
-     * @return  Zend_Paginator
-     */
-    public function paginate($itemsPerPage = null, $pageNumber = null)
-    {
-        if ($itemsPerPage === null || $pageNumber === null) {
-            // Detect parameters from request
-            $request = Icinga::app()->getFrontController()->getRequest();
-            if ($itemsPerPage === null) {
-                $itemsPerPage = $request->getParam('limit', 25);
-            }
-            if ($pageNumber === null) {
-                $pageNumber = $request->getParam('page', 0);
-            }
-        }
-        $this->limit($itemsPerPage, $pageNumber * $itemsPerPage);
-        $paginator = new Zend_Paginator(new QueryAdapter($this));
-        $paginator->setItemCountPerPage($itemsPerPage);
-        $paginator->setCurrentPageNumber($pageNumber);
-        return $paginator;
-    }
-
     /**
      * Retrieve an array containing all rows of the result set
      *
diff --git a/library/Icinga/File/Csv.php b/library/Icinga/File/Csv.php
index ee88262c3..5d9975bc7 100644
--- a/library/Icinga/File/Csv.php
+++ b/library/Icinga/File/Csv.php
@@ -3,15 +3,13 @@
 
 namespace Icinga\File;
 
-use Icinga\Data\Browsable;
-
 class Csv
 {
     protected $query;
 
     protected function __construct() {}
 
-    public static function fromQuery(Browsable $query)
+    public static function fromQuery($query)
     {
         $csv = new Csv();
         $csv->query = $query;
diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index dcc805286..1dc3b137b 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -70,7 +70,7 @@ class Monitoring_AlertsummaryController extends Controller
                 'notification_state'
             )
         );
-        $this->view->notifications = $query->paginate();
+        $this->view->notifications = $query;
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->notifications);
@@ -493,7 +493,7 @@ class Monitoring_AlertsummaryController extends Controller
 
         $query->order('notification_start_time', 'desc');
 
-        return $query->paginate(5);
+        return $query->limit(5);
     }
 
     /**
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index bec65ac9b..27f02f3f9 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -97,7 +97,7 @@ class Monitoring_ListController extends Controller
         ), $this->extraColumns()));
         $this->filterQuery($query);
         $this->applyRestriction('monitoring/hosts/filter', $query);
-        $this->view->hosts = $query->paginate();
+        $this->view->hosts = $query;
 
         $this->view->stats = $this->backend->select()->from('statusSummary', array(
             'hosts_total',
@@ -181,7 +181,7 @@ class Monitoring_ListController extends Controller
         $query = $this->backend->select()->from('serviceStatus', $columns);
         $this->filterQuery($query);
         $this->applyRestriction('monitoring/services/filter', $query);
-        $this->view->services = $query->paginate();
+        $this->view->services = $query;
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->services);
@@ -246,7 +246,7 @@ class Monitoring_ListController extends Controller
             'service_display_name'
         ));
         $this->filterQuery($query);
-        $this->view->downtimes = $query->paginate();
+        $this->view->downtimes = $query;
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->downtimes);
@@ -292,7 +292,7 @@ class Monitoring_ListController extends Controller
             'service_display_name'
         ));
         $this->filterQuery($query);
-        $this->view->notifications = $query->paginate();
+        $this->view->notifications = $query;
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->notifications);
@@ -326,7 +326,7 @@ class Monitoring_ListController extends Controller
             'contact_notify_host_downtime',
         ));
         $this->filterQuery($query);
-        $this->view->contacts = $query->paginate();
+        $this->view->contacts = $query;
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->contacts);
@@ -438,7 +438,7 @@ class Monitoring_ListController extends Controller
             'service_display_name'
         ));
         $this->filterQuery($query);
-        $this->view->comments = $query->paginate();
+        $this->view->comments = $query;
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->comments);
@@ -498,7 +498,7 @@ class Monitoring_ListController extends Controller
         // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
         // service groups. We should separate them.
         $this->filterQuery($query);
-        $this->view->servicegroups = $query->paginate();
+        $this->view->servicegroups = $query;
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->servicegroups);
@@ -555,7 +555,7 @@ class Monitoring_ListController extends Controller
         // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
         // service groups. We should separate them.
         $this->filterQuery($query);
-        $this->view->hostgroups = $query->paginate();
+        $this->view->hostgroups = $query;
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->hostgroups);
@@ -594,7 +594,7 @@ class Monitoring_ListController extends Controller
         ));
 
         $this->filterQuery($query);
-        $this->view->history = $query->paginate();
+        $this->view->history = $query;
 
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->history);
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index c1522d2a1..8edb2a437 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -70,12 +70,12 @@ class Monitoring_ShowController extends Controller
     {
         $this->getTabs()->activate('history');
         $this->view->object->fetchEventHistory();
-        $this->view->history = $this->view->object->eventhistory->getQuery()->paginate($this->params->get('limit', 50));
+        $this->view->history = $this->view->object->eventhistory;
         $this->handleFormatRequest($this->view->object->eventhistory);
         $this->fetchHostStats();
 
         $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->history);
+        $this->setupPaginationControl($this->view->history, 50);
     }
 
     public function servicesAction()
@@ -154,7 +154,7 @@ class Monitoring_ShowController extends Controller
                 'command_name'
             ))->where('contact_id', $contact->contact_id);
 
-            $this->view->commands = $commands->paginate();
+            $this->view->commands = $commands;
 
             $notifications = $this->backend->select()->from('notification', array(
                 'host_name',
@@ -168,7 +168,7 @@ class Monitoring_ShowController extends Controller
             ));
 
             $notifications->where('contact_object_id', $contact->contact_object_id);
-            $this->view->notifications = $notifications->paginate();
+            $this->view->notifications = $notifications;
             $this->setupLimitControl();
             $this->setupPaginationControl($this->view->notifications);
         }
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index f05adff1f..f8c4383bd 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -5,7 +5,7 @@
      <?= $this->render('list/components/selectioninfo.phtml'); ?>
   </div>
   <div class="tinystatesummary">
-     <?= $comments->getTotalItemCount() ?> <?= $this->translate('Comments') ?>:
+     <?= count($comments) ?> <?= $this->translate('Comments') ?>:
   </div>
   <?= $this->sortBox; ?>
   <?= $this->limiter; ?>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 0d35b77cd..79a0e1b92 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -9,7 +9,7 @@ if (! $this->compact): ?>
         <?= $this->render('list/components/selectioninfo.phtml'); ?>
     </div>
     <div class="tinystatesummary">
-        <?= $downtimes->getTotalItemCount() ?> <?= $this->translate('Downtimes') ?>
+        <?= count($downtimes) ?> <?= $this->translate('Downtimes') ?>
     </div>
   <?= $this->sortBox; ?>
   <?= $this->limiter; ?>

From 9a043386dee510e43b0463022c5eeb74222a9c40 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 15 May 2015 14:36:13 +0200
Subject: [PATCH 1551/2920] Controller: Make setupSortControl creating a
 Zend_Paginator on its own

We're accessing the url GET parameters `sort' and `dir' in a controller now.

fixes #8339
---
 library/Icinga/Web/Controller.php | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index b223921a3..4c68da0ff 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -4,10 +4,12 @@
 namespace Icinga\Web;
 
 use Zend_Paginator;
-use Icinga\Web\Controller\ModuleActionController;
-use Icinga\Web\Widget\SortBox;
-use Icinga\Web\Widget\Limiter;
 use Icinga\Data\Sortable;
+use Icinga\Data\QueryInterface;
+use Icinga\Web\Paginator\Adapter\QueryAdapter;
+use Icinga\Web\Controller\ModuleActionController;
+use Icinga\Web\Widget\Limiter;
+use Icinga\Web\Widget\SortBox;
 
 /**
  * This is the controller all modules should inherit from
@@ -94,17 +96,28 @@ class Controller extends ModuleActionController
     }
 
     /**
-     * Set the view property `paginator' to the given Zend_Paginator
+     * Apply the given page limit and number on the given query and setup a paginator for it
      *
-     * In case the current view has been requested as compact this method does nothing.
+     * The $itemsPerPage and $pageNumber parameters are only applied if not available in the current request.
+     * The paginator is set on the `paginator' view property only if the current view has not been requested as compact.
      *
-     * @param   Zend_Paginator  $paginator  The Zend_Paginator for which to show a pagination control
+     * @param   QueryInterface  $query          The query to create a paginator for
+     * @param   int             $itemsPerPage   Number of items per page
+     * @param   int             $pageNumber     Current page number
      *
      * @return  $this
      */
-    protected function setupPaginationControl(Zend_Paginator $paginator)
+    protected function setupPaginationControl(QueryInterface $query, $itemsPerPage = 25, $pageNumber = 0)
     {
+        $request = $this->getRequest();
+        $limit = $request->getParam('limit', $itemsPerPage);
+        $page = $request->getParam('page', $pageNumber);
+        $query->limit($limit, $page * $limit);
+
         if (! $this->view->compact) {
+            $paginator = new Zend_Paginator(new QueryAdapter($query));
+            $paginator->setItemCountPerPage($limit);
+            $paginator->setCurrentPageNumber($page);
             $this->view->paginator = $paginator;
         }
 

From 99c511eefdcf2beb727f94ccf35ebab742859dc7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 15 May 2015 15:22:22 +0200
Subject: [PATCH 1552/2920] Limiter: Do not use a hardcoded default limit

---
 library/Icinga/Web/Controller.php     |  9 ++++++---
 library/Icinga/Web/Widget/Limiter.php | 10 +++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index 4c68da0ff..61e80173b 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -84,12 +84,15 @@ class Controller extends ModuleActionController
      *
      * In case the current view has been requested as compact this method does nothing.
      *
+     * @param   int             $itemsPerPage   Default number of items per page
+     *
      * @return  $this
      */
-    protected function setupLimitControl()
+    protected function setupLimitControl($itemsPerPage = 25)
     {
         if (! $this->view->compact) {
             $this->view->limiter = new Limiter();
+            $this->view->limiter->setDefaultLimit($itemsPerPage);
         }
 
         return $this;
@@ -102,8 +105,8 @@ class Controller extends ModuleActionController
      * The paginator is set on the `paginator' view property only if the current view has not been requested as compact.
      *
      * @param   QueryInterface  $query          The query to create a paginator for
-     * @param   int             $itemsPerPage   Number of items per page
-     * @param   int             $pageNumber     Current page number
+     * @param   int             $itemsPerPage   Default number of items per page
+     * @param   int             $pageNumber     Default page number
      *
      * @return  $this
      */
diff --git a/library/Icinga/Web/Widget/Limiter.php b/library/Icinga/Web/Widget/Limiter.php
index 9febf6f63..1c6c82f62 100644
--- a/library/Icinga/Web/Widget/Limiter.php
+++ b/library/Icinga/Web/Widget/Limiter.php
@@ -21,6 +21,8 @@ class Limiter extends AbstractWidget
 
     private $pages;
 
+    private $default;
+
     public function setUrl(Url $url)
     {
         $this->url = $url;
@@ -39,13 +41,19 @@ class Limiter extends AbstractWidget
         return $this;
     }
 
+    public function setDefaultLimit($limit)
+    {
+        $this->default = $limit;
+        return $this;
+    }
+
     public function render()
     {
         if ($this->url === null) {
             $this->url = Url::fromRequest();
         }
 
-        $currentLimit = (int) $this->url->getParam('limit', 25); // Default??
+        $currentLimit = (int) $this->url->getParam('limit', $this->default);
         $availableLimits = array(
             10 => '10',
             25 => '25',

From d0cc2ae7041d5834053cc6077f2118838669953f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 15 May 2015 15:23:49 +0200
Subject: [PATCH 1553/2920] ShowController: Use a default limit of 50 for an
 object's history listing

refs #8337
---
 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 8edb2a437..a8a4583d1 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -74,7 +74,7 @@ class Monitoring_ShowController extends Controller
         $this->handleFormatRequest($this->view->object->eventhistory);
         $this->fetchHostStats();
 
-        $this->setupLimitControl();
+        $this->setupLimitControl(50);
         $this->setupPaginationControl($this->view->history, 50);
     }
 

From e6ba3d6470e87a90c4a73beccc14662122b84eed Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Fri, 15 May 2015 15:49:57 +0200
Subject: [PATCH 1554/2920] Add descriptive message to custom validations

refs #9203
---
 .../forms/Setup/IdoResourcePage.php           | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/forms/Setup/IdoResourcePage.php b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
index b856c590c..3f6bb1564 100644
--- a/modules/monitoring/application/forms/Setup/IdoResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
@@ -57,13 +57,19 @@ class IdoResourcePage extends Form
         if (false === isset($data['skip_validation']) || $data['skip_validation'] == 0) {
             $configObject = new ConfigObject($this->getValues());
             if (false === DbResourceForm::isValidResource($this, $configObject)) {
-                $this->addSkipValidationCheckbox();
+                $this->addSkipValidationCheckbox($this->translate(
+                    'Check this to not to validate connectivity with the given database server'
+                ));
                 return false;
             } elseif (false === BackendConfigForm::isValidIdoSchema($this, $configObject)) {
-                $this->addSkipValidationCheckbox();
+                $this->addSkipValidationCheckbox($this->translate(
+                    'Check this to not to validate the ido schema'
+                ));
                 return false;
             } elseif (false === BackendConfigForm::isValidIdoInstance($this, $configObject)) {
-                $this->addSkipValidationCheckbox();
+                $this->addSkipValidationCheckbox($this->translate(
+                    'Check this to not to validate the ido instance'
+                ));
                 return false;
             }
         }
@@ -74,17 +80,21 @@ class IdoResourcePage extends Form
     /**
      * Add a checkbox to the form by which the user can skip the connection validation
      */
-    protected function addSkipValidationCheckbox()
+    protected function addSkipValidationCheckbox($description = '')
     {
+        if (empty($description)) {
+            $description = $this->translate(
+                'Proceed without any further (custom) validation'
+            );
+        }
+
         $this->addElement(
             'checkbox',
             'skip_validation',
             array(
                 'required'      => true,
                 'label'         => $this->translate('Skip Validation'),
-                'description'   => $this->translate(
-                    'Check this to not to validate connectivity with the given database server'
-                )
+                'description'   => $description
             )
         );
     }

From 58434d97438a19aafa33eee3f942c67436fe8b63 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 15 May 2015 17:01:28 +0200
Subject: [PATCH 1555/2920] ToggleInstanceFeaturesCommandForm::onSuccess():
 show a notification for each feature about whether it has been enabled or
 disabled

fixes #9023
---
 .../Instance/ToggleInstanceFeaturesCommandForm.php        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index ec58bb4b6..79d15f5c1 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -215,8 +215,14 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 ->setFeature($feature)
                 ->setEnabled($enabled);
             $this->getTransport($this->request)->send($toggleFeature);
+
+            if ($this->status->{$feature} != $enabled) {
+                Notification::success($enabled
+                    ? $this->translate('Enabling feature..')
+                    : $this->translate('Disabling feature..')
+                );
+            }
         }
-        Notification::success($this->translate('Toggling feature..'));
         return true;
     }
 }

From 533c980a2956890439014e7b92b9aae1de695362 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 15 May 2015 17:32:13 +0200
Subject: [PATCH 1556/2920] Show only three significant digits in check
 execution time

fixes #8849
---
 .../scripts/show/components/checkstatistics.phtml   | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index 2a4e4b033..b0699c799 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -68,7 +68,18 @@ if ($object->getType() === $object::TYPE_HOST) {
 <?php if ($object->check_execution_time): ?>
     <tr>
         <th><?= $this->translate('Check execution time') ?></th>
-        <td><?= $object->check_execution_time ?>s</td>
+        <td><?php
+            $matches = array();
+            if (preg_match(
+                '/(?<!.)([0-9]+\.[0-9]{4,})(?!.)/ms',
+                $object->check_execution_time,
+                $matches
+            )) {
+                printf('%.3f', (float) $matches[1]);
+            } else {
+                echo $object->check_execution_time;
+            }
+        ?>s</td>
     </tr>
 <?php endif ?>
 <?php if ($object->check_latency): ?>

From 130fea314687196b10c2bfe1381236c98f09327e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 18 May 2015 11:25:02 +0200
Subject: [PATCH 1557/2920] Revert "Merge Queryable into QueryInterface"

This reverts commit ca5ef2da2bb9ce21701a32a668c149c0608fc8bb.
A perfect example of a change as a result of being mentally deranged.
---
 library/Icinga/Data/QueryInterface.php | 2 +-
 library/Icinga/Data/SimpleQuery.php    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Data/QueryInterface.php b/library/Icinga/Data/QueryInterface.php
index 7f82c8c09..4d43d1059 100644
--- a/library/Icinga/Data/QueryInterface.php
+++ b/library/Icinga/Data/QueryInterface.php
@@ -5,4 +5,4 @@ namespace Icinga\Data;
 
 use Countable;
 
-interface QueryInterface extends Queryable, Browsable, Fetchable, Filterable, Limitable, Sortable, Countable {};
+interface QueryInterface extends Browsable, Fetchable, Filterable, Limitable, Sortable, Countable {};
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 875f5222a..c38cf9c53 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -3,13 +3,14 @@
 
 namespace Icinga\Data;
 
-use Zend_Paginator;
 use Icinga\Application\Icinga;
 use Icinga\Data\Filter\Filter;
-use Icinga\Exception\IcingaException;
 use Icinga\Web\Paginator\Adapter\QueryAdapter;
+use Zend_Paginator;
+use Exception;
+use Icinga\Exception\IcingaException;
 
-class SimpleQuery implements QueryInterface
+class SimpleQuery implements QueryInterface, Queryable
 {
     /**
      * Query data source

From 62d8c441f85a951bc51392748fd9db2764cd900d Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Mon, 18 May 2015 11:45:39 +0200
Subject: [PATCH 1558/2920] Add ServiceActionsHook

refs #9284
---
 .../controllers/HostController.php            |  7 ++-
 .../controllers/ServiceController.php         | 29 ++++++++++++
 .../scripts/show/components/actions.phtml     |  4 +-
 .../Web/Hook/ServiceActionsHook.php           | 46 +++++++++++++++++++
 4 files changed, 83 insertions(+), 3 deletions(-)
 create mode 100644 modules/monitoring/library/Monitoring/Web/Hook/ServiceActionsHook.php

diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index f820fc27f..7693023eb 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -49,6 +49,11 @@ class Monitoring_HostController extends MonitoredObjectController
         $this->getTabs()->activate('host');
     }
 
+    /**
+     * Get host actions from hook
+     *
+     * @return array
+     */
     protected function getHostActions()
     {
         $urls = array();
@@ -67,7 +72,7 @@ class Monitoring_HostController extends MonitoredObjectController
      */
     public function showAction()
     {
-        $this->view->hostActions = $this->getHostActions();
+        $this->view->actions = $this->getHostActions();
         parent::showAction();
     }
 
diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index 4df109b3e..e61c4685d 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -10,6 +10,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceDowntimeCommand
 use Icinga\Module\Monitoring\Forms\Command\Object\SendCustomNotificationCommandForm;
 use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Module\Monitoring\Web\Controller\MonitoredObjectController;
+use Icinga\Web\Hook;
 
 class Monitoring_ServiceController extends MonitoredObjectController
 {
@@ -48,6 +49,34 @@ class Monitoring_ServiceController extends MonitoredObjectController
         $this->getTabs()->activate('service');
     }
 
+    /**
+     * Get service actions from hook
+     *
+     * @return array
+     */
+    protected function getServiceActions()
+    {
+        $urls = array();
+
+        foreach (Hook::all('Monitoring\\ServiceActions') as $hook) {
+            foreach ($hook->getActionsForService($this->object) as $id => $url) {
+                $urls[$id] = $url;
+            }
+        }
+
+        return $urls;
+    }
+
+    /**
+     * Show a service
+     */
+    public function showAction()
+    {
+        $this->view->actions = $this->getServiceActions();
+        parent::showAction();
+    }
+
+
     /**
      * Acknowledge a service problem
      */
diff --git a/modules/monitoring/application/views/scripts/show/components/actions.phtml b/modules/monitoring/application/views/scripts/show/components/actions.phtml
index 2defd616d..0681d5d91 100644
--- a/modules/monitoring/application/views/scripts/show/components/actions.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/actions.phtml
@@ -33,8 +33,8 @@ if ($object->action_url) {
     }
 }
 
-if (isset($this->hostActions)) {
-    foreach ($this->hostActions as $id => $action) {
+if (isset($this->actions)) {
+    foreach ($this->actions as $id => $action) {
         $links[] = sprintf($localLinkText, $action, $id);
     }
 }
diff --git a/modules/monitoring/library/Monitoring/Web/Hook/ServiceActionsHook.php b/modules/monitoring/library/Monitoring/Web/Hook/ServiceActionsHook.php
new file mode 100644
index 000000000..2df3c4f55
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Web/Hook/ServiceActionsHook.php
@@ -0,0 +1,46 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Web\Hook;
+
+use Icinga\Module\Monitoring\Object\Service;
+
+/**
+ * Base class for host action hooks
+ */
+abstract class ServiceActionsHook
+{
+    /**
+     * Implementors of this method should return an array containing
+     * additional action links for a specific host. You get a full Service
+     * object, which allows you to return specific links only for nodes
+     * with specific properties.
+     *
+     * The result array should be in the form title => url, where title will
+     * be used as link caption. Url should be an Icinga\Web\Url object when
+     * the link should point to an Icinga Web url - otherwise a string would
+     * be fine.
+     *
+     * Mixed example:
+     * <code>
+     * return array(
+     *     'Wiki' => 'http://my.wiki/host=' . rawurlencode($service->service_name),
+     *     'Logstash' => Url::fromPath(
+     *         'logstash/search/syslog',
+     *         array('service' => $service->host_name)
+     *     )
+     * );
+     * </code>
+     *
+     * One might also provide ssh:// or rdp:// urls if equipped with fitting
+     * (safe) URL handlers for his browser(s).
+     *
+     * TODO: I'd love to see some kind of a Link/LinkSet object implemented
+     *       for this and similar hooks.
+     *
+     * @param   Service $service Monitoring service object
+     *
+     * @return  array   An array containing a list of service action links
+     */
+    abstract public function getActionsForService(Service $service);
+}

From 4ff7d7a845156fcb38be17d230a2b130a9446bf2 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 18 May 2015 13:35:38 +0200
Subject: [PATCH 1559/2920] Don't parse $object->check_execution_time w/ regex
 as it's always a float (or null)

---
 .../scripts/show/components/checkstatistics.phtml   | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index b0699c799..18fbdb82f 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -68,17 +68,8 @@ if ($object->getType() === $object::TYPE_HOST) {
 <?php if ($object->check_execution_time): ?>
     <tr>
         <th><?= $this->translate('Check execution time') ?></th>
-        <td><?php
-            $matches = array();
-            if (preg_match(
-                '/(?<!.)([0-9]+\.[0-9]{4,})(?!.)/ms',
-                $object->check_execution_time,
-                $matches
-            )) {
-                printf('%.3f', (float) $matches[1]);
-            } else {
-                echo $object->check_execution_time;
-            }
+        <td><?= $object->check_execution_time === null
+            ? '-' : round((float) $object->check_execution_time, 3)
         ?>s</td>
     </tr>
 <?php endif ?>

From fe2ee3617b3b482d8213ff72c1d19c569433e2c0 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 18 May 2015 13:56:35 +0200
Subject: [PATCH 1560/2920] Remove pie charts from multi-views

refs #8565
---
 .../controllers/HostsController.php           |  5 ----
 .../controllers/ServicesController.php        | 27 ++-----------------
 .../partials/host/objects-header.phtml        |  7 -----
 .../partials/service/objects-header.phtml     | 10 -------
 4 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 6c3c6850e..af29d3489 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -134,11 +134,6 @@ class Monitoring_HostsController extends Controller
         }
 
         $hostStates = (object)$this->hostList->getStateSummary();
-        $this->view->hostStatesPieChart = InlinePie::createFromStateSummary(
-            $hostStates,
-            $this->translate('Host State'),
-            InlinePie::$colorsHostStatesHandledUnhandled
-        );
 
         $this->setAutorefreshInterval(15);
         $this->view->rescheduleAllLink = Url::fromRequest()->setPath('monitoring/hosts/reschedule-check');
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 1365fbb8a..17be9569f 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -92,17 +92,7 @@ class Monitoring_ServicesController extends Controller
         $this->view->objects = $this->serviceList;
         $this->view->stats = $this->serviceList->getServiceStateSummary();
         $this->view->serviceStates = true;
-        $this->view->serviceStatesPieChart = InlinePie::createFromStateSummary(
-            $this->view->stats,
-            $this->translate('Service State'),
-            InlinePie::$colorsServiceStatesHandleUnhandled
-        );
         $this->view->hostStates = $this->serviceList->getHostStateSummary();
-        $this->view->hostStatesPieChart = InlinePie::createFromStateSummary(
-            $this->view->hostStates,
-            $this->translate('Service State'),
-            InlinePie::$colorsHostStatesHandledUnhandled
-        );
         $this->_helper->viewRenderer('partials/command/objects-command-form', null, true);
         return $form;
     }
@@ -149,19 +139,6 @@ class Monitoring_ServicesController extends Controller
             $this->view->removeAckForm = $removeAckForm;
         }
 
-        $serviceStates = $this->serviceList->getServiceStateSummary();
-        $this->view->serviceStatesPieChart = InlinePie::createFromStateSummary(
-            $serviceStates,
-            $this->translate('Service State'),
-            InlinePie::$colorsServiceStatesHandleUnhandled
-        );
-
-        $hostStates = $this->serviceList->getHostStateSummary();
-        $this->view->hostStatesPieChart = InlinePie::createFromStateSummary(
-            $hostStates,
-            $this->translate('Host State'),
-            InlinePie::$colorsHostStatesHandledUnhandled
-        );
         $this->setAutorefreshInterval(15);
         $this->view->rescheduleAllLink = Url::fromRequest()->setPath('monitoring/services/reschedule-check');
         $this->view->downtimeAllLink = Url::fromRequest()->setPath('monitoring/services/schedule-downtime');
@@ -170,8 +147,8 @@ class Monitoring_ServicesController extends Controller
         );
         $this->view->addCommentLink = Url::fromRequest()->setPath('monitoring/services/add-comment');
         $this->view->deleteCommentLink = Url::fromRequest()->setPath('monitoring/services/delete-comment');
-        $this->view->stats = $serviceStates;
-        $this->view->hostStats = $hostStates;
+        $this->view->stats = $this->serviceList->getServiceStateSummary();
+        $this->view->hostStats = $this->serviceList->getHostStateSummary();
         $this->view->objects = $this->serviceList;
         $this->view->unhandledObjects = $this->serviceList->getUnhandledObjects();
         $this->view->problemObjects = $this->serviceList->getProblemObjects();
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index 5a54b6f11..ef48eefe0 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -5,11 +5,6 @@ $i = 0;
 ?>
 
 <?php if (($hostCount = count($objects)) > 0): ?>
-    <div class="hbox-item">
-        <?= $this->translate('States:') ?>
-        &nbsp;<?= $hostStatesPieChart; ?>
-    </div>
-<p>
     <table class="state statesummary">
 
         <tbody>
@@ -40,7 +35,5 @@ $i = 0;
         );
         ?>
     </div>
-</p>
-
 <?php endif ?>
 
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index e0b330ece..7c707f0bf 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -4,15 +4,6 @@ use Icinga\Module\Monitoring\Object\Service;
 $i = 0;
 ?>
 <?php if (($serviceCount = count($objects)) > 0): ?>
-    <div class="hbox-item">
-        <?= $this->translate('Service states:') ?>
-        &nbsp;<?= $serviceStatesPieChart; ?>
-    </div>
-    <div class="hbox-item">
-        <?= $this->translate('Host states:') ?>
-        &nbsp;<?= $hostStatesPieChart; ?>
-    </div>
-    <p>
     <table class="state statesummary">
     <tbody>
     <?php foreach ($objects as $service): /** @var Service $service */ ?>
@@ -41,5 +32,4 @@ $i = 0;
         );
         ?>
     </div>
-    </p>
 <?php endif ?>

From 7a6837de0e331e19d09a22a8565ab0ea2e11a0cf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 18 May 2015 13:59:16 +0200
Subject: [PATCH 1561/2920] Fetchable: Add method fetch() which returns an
 iterator

---
 library/Icinga/Data/Fetchable.php                |  9 +++++++++
 library/Icinga/Data/SimpleQuery.php              | 15 +++++++++++++--
 .../library/Monitoring/DataView/DataView.php     | 16 +++++++++++++---
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Data/Fetchable.php b/library/Icinga/Data/Fetchable.php
index 0992be933..2164bb1b2 100644
--- a/library/Icinga/Data/Fetchable.php
+++ b/library/Icinga/Data/Fetchable.php
@@ -3,11 +3,20 @@
 
 namespace Icinga\Data;
 
+use Iterator;
+
 /**
  * Interface for retrieving data
  */
 interface Fetchable
 {
+    /**
+     * Fetch and return all rows of the result set using an iterator
+     *
+     * @return  Iterator
+     */
+    public function fetch();
+
     /**
      * Retrieve an array containing all rows of the result set
      *
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 8da712598..ebcaa61a2 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -4,6 +4,7 @@
 namespace Icinga\Data;
 
 use ArrayIterator;
+use Iterator;
 use IteratorAggregate;
 use Icinga\Data\Filter\Filter;
 use Icinga\Exception\IcingaException;
@@ -103,11 +104,11 @@ class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
     /**
      * Return a iterable for this query's result
      *
-     * @return  ArrayIterator
+     * @return  Iterator
      */
     public function getIterator()
     {
-        return new ArrayIterator($this->fetchAll());
+        return $this->fetch();
     }
 
     /**
@@ -351,6 +352,16 @@ class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
         return $this->limitOffset;
     }
 
+    /**
+     * Fetch and return all rows of the result set using an iterator
+     *
+     * @return  ArrayIterator
+     */
+    public function fetch()
+    {
+        return new ArrayIterator($this->fetchAll());
+    }
+
     /**
      * Retrieve an array containing all rows of the result set
      *
diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 6bed36fe1..dfbdd8a14 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -3,7 +3,7 @@
 
 namespace Icinga\Module\Monitoring\DataView;
 
-use ArrayIterator;
+use Iterator;
 use IteratorAggregate;
 use Icinga\Data\QueryInterface;
 use Icinga\Data\Filter\Filter;
@@ -61,11 +61,11 @@ abstract class DataView implements QueryInterface, IteratorAggregate
     /**
      * Return a iterator for all rows of the result set
      *
-     * @return  ArrayIterator
+     * @return  Iterator
      */
     public function getIterator()
     {
-        return new ArrayIterator($this->fetchAll());
+        return $this->fetch();
     }
 
     /**
@@ -469,6 +469,16 @@ abstract class DataView implements QueryInterface, IteratorAggregate
         return $this->query->hasOffset();
     }
 
+    /**
+     * Fetch and return all rows of the result set using an iterator
+     *
+     * @return  Iterator
+     */
+    public function fetch()
+    {
+        return $this->getQuery()->fetch();
+    }
+
     /**
      * Retrieve an array containing all rows of the result set
      *

From d39c697d0e839e299143584e83ba58263e19d2e7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 18 May 2015 14:01:17 +0200
Subject: [PATCH 1562/2920] Repository: QueryInterface is _not_ queryable
 anymore...

refs #8826
---
 library/Icinga/Repository/Repository.php      | 2 +-
 library/Icinga/Repository/RepositoryQuery.php | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index 58f199f1b..9a40a3d6f 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -19,7 +19,7 @@ use Icinga\Util\String;
  * <ul>
  *  <li>Concrete implementations need to initialize Repository::$queryColumns</li>
  *  <li>The datasource passed to a repository must implement the Selectable interface</li>
- *  <li>The datasource must yield an instance of QueryInterface when its select() method is called</li>
+ *  <li>The datasource must yield an instance of Queryable when its select() method is called</li>
  * </ul>
  */
 abstract class Repository implements Selectable
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index 86527a66e..d70afd457 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -43,7 +43,6 @@ class RepositoryQuery implements QueryInterface
     public function __construct(Repository $repository)
     {
         $this->repository = $repository;
-        $this->query = $repository->getDataSource()->select();
     }
 
     /**
@@ -68,7 +67,10 @@ class RepositoryQuery implements QueryInterface
      */
     public function from($target, array $columns = null)
     {
-        $this->query->from($target, $this->prepareQueryColumns($target, $columns));
+        $this->query = $this->repository
+            ->getDataSource()
+            ->select()
+            ->from($target, $this->prepareQueryColumns($target, $columns));
         $this->target = $target;
         return $this;
     }

From 00bbb762a1b8b4611ffc1142acb9819a04ed43a1 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 18 May 2015 14:03:10 +0200
Subject: [PATCH 1563/2920] Integrate comments and downtimes into
 MonitoredObjectsController

Add option to list all related commends and downtimes into the specific hosts and serivces views.

refs #8565
---
 .../controllers/HostsController.php           | 19 +++++++++++++++----
 .../controllers/ServicesController.php        |  9 +++++++--
 .../library/Monitoring/Object/HostList.php    | 13 +++++++++++++
 .../library/Monitoring/Object/ObjectList.php  | 10 ++++++++++
 .../library/Monitoring/Object/ServiceList.php | 14 +++++++++++++-
 5 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index af29d3489..32916ba42 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -2,6 +2,7 @@
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Data\Filter\Filter;
+use Icinga\Data\Filter\FilterEqual;
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\CheckNowCommandForm;
@@ -140,7 +141,6 @@ class Monitoring_HostsController extends Controller
         $this->view->downtimeAllLink = Url::fromRequest()->setPath('monitoring/hosts/schedule-downtime');
         $this->view->processCheckResultAllLink = Url::fromRequest()->setPath('monitoring/hosts/process-check-result');
         $this->view->addCommentLink = Url::fromRequest()->setPath('monitoring/hosts/add-comment');
-        $this->view->deleteCommentLink = Url::fromRequest()->setPath('monitoring/hosts/delete-comment');
         $this->view->stats = $hostStates;
         $this->view->objects = $this->hostList;
         $this->view->unhandledObjects = $this->hostList->getUnhandledObjects();
@@ -154,9 +154,20 @@ class Monitoring_HostsController extends Controller
             ->setQueryString($this->hostList->getProblemObjects()->objectsFilter());
         $this->view->acknowledgedObjects = $this->hostList->getAcknowledgedObjects();
         $this->view->objectsInDowntime = $this->hostList->getObjectsInDowntime();
-        $this->view->inDowntimeLink = Url::fromPath('monitoring/list/downtimes')
-            ->setQueryString($this->hostList->getObjectsInDowntime()->objectsFilter(array('host' => 'downtime_host')));
-
+        $this->view->inDowntimeLink = Url::fromPath('monitoring/list/hosts')
+            ->setQueryString(
+                $this->hostList
+                    ->getObjectsInDowntime()
+                    ->objectsFilter()
+                    ->toQueryString()
+            );
+        $this->view->showDowntimesLink = Url::fromPath('monitoring/list/downtimes')
+            ->setQueryString(
+                $this->hostList
+                    ->objectsFilter()
+                    ->andFilter(FilterEqual::where('downtime_objecttype', 'host'))
+                    ->toQueryString()
+            );
         $this->view->commentsLink = Url::fromRequest()->setPath('monitoring/list/comments');
         $this->view->baseFilter = $this->hostList->getFilter();
         $this->view->sendCustomNotificationLink = Url::fromRequest()->setPath('monitoring/hosts/send-custom-notification');
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 17be9569f..583b03246 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -160,9 +160,14 @@ class Monitoring_ServicesController extends Controller
             ->setQueryString($this->serviceList->getProblemObjects()->objectsFilter()->toQueryString());
         $this->view->acknowledgedObjects = $acknowledgedObjects;
         $this->view->objectsInDowntime = $this->serviceList->getObjectsInDowntime();
-        $this->view->inDowntimeLink = Url::fromPath('monitoring/list/downtimes')
+        $this->view->inDowntimeLink = Url::fromPath('monitoring/list/services')
             ->setQueryString($this->serviceList->getObjectsInDowntime()
-            ->objectsFilter(array('host' => 'downtime_host', 'service' => 'downtime_service'))->toQueryString());
+            ->objectsFilter(array('host' => 'host_name', 'service' => 'service_description'))->toQueryString());
+        $this->view->showDowntimesLink = Url::fromPath('monitoring/downtimes/show')
+            ->setQueryString(
+                $this->serviceList->getObjectsInDowntime()
+                    ->objectsFilter()->toQueryString()
+            );
         $this->view->commentsLink = Url::fromRequest()
             ->setPath('monitoring/list/comments');
         $this->view->baseFilter = $this->serviceList->getFilter();
diff --git a/modules/monitoring/library/Monitoring/Object/HostList.php b/modules/monitoring/library/Monitoring/Object/HostList.php
index 48a7560b1..4236f94d8 100644
--- a/modules/monitoring/library/Monitoring/Object/HostList.php
+++ b/modules/monitoring/library/Monitoring/Object/HostList.php
@@ -86,4 +86,17 @@ class HostList extends ObjectList
         }
         return FilterOr::matchAny($filterExpression);
     }
+
+    /**
+     * Get the scheduled downtimes
+     *
+     * @return type
+     */
+    public function getScheduledDowntimes()
+    {
+        return $this->backend->select()
+                ->from('downtime')
+                ->applyFilter(clone $this->filter)
+                ->where('downtime_objecttype', 'host');
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/Object/ObjectList.php b/modules/monitoring/library/Monitoring/Object/ObjectList.php
index 4f5ada43c..75fe1ba76 100644
--- a/modules/monitoring/library/Monitoring/Object/ObjectList.php
+++ b/modules/monitoring/library/Monitoring/Object/ObjectList.php
@@ -127,6 +127,16 @@ abstract class ObjectList implements Countable, IteratorAggregate
         return $this->backend->select()->from('comment')->applyFilter($this->filter);
     }
 
+    /**
+     * Get the scheduled downtimes
+     *
+     * @return type
+     */
+    public function getScheduledDowntimes()
+    {
+        return $this->backend->select()->from('downtime')->applyFilter($this->filter);
+    }
+
     /**
      * @return ObjectList
      */
diff --git a/modules/monitoring/library/Monitoring/Object/ServiceList.php b/modules/monitoring/library/Monitoring/Object/ServiceList.php
index 379d8234c..5ae9b8193 100644
--- a/modules/monitoring/library/Monitoring/Object/ServiceList.php
+++ b/modules/monitoring/library/Monitoring/Object/ServiceList.php
@@ -134,5 +134,17 @@ class ServiceList extends ObjectList
         }
         return FilterOr::matchAny($filterExpression);
     }
-}
 
+    /**
+     * Get the scheduled downtimes
+     *
+     * @return type
+     */
+    public function getScheduledDowntimes()
+    {
+        return $this->backend->select()
+                ->from('downtime')
+                ->applyFilter(clone $this->filter)
+                ->where('downtime_objecttype', 'service');
+    }
+}

From 3f25cf560ed30c08770f86958ce96fd780bc5d14 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 18 May 2015 14:03:22 +0200
Subject: [PATCH 1564/2920] RepositoryQuery: Remove method paginate()

refs #8826
---
 application/controllers/GroupController.php   |  4 ++--
 application/controllers/UserController.php    |  4 ++--
 library/Icinga/Repository/RepositoryQuery.php | 18 ------------------
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index bbe97b64f..aefcb6eac 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -78,8 +78,8 @@ class GroupController extends Controller
         $this->setupFilterControl($filterEditor);
 
         try {
-            $this->view->groups = $query->paginate();
-            $this->setupPaginationControl($this->view->groups);
+            $this->setupPaginationControl($query);
+            $this->view->groups = $query;
         } catch (Exception $e) {
             Notification::error($e->getMessage());
             Logger::error($e);
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 487cfc920..b88898a54 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -78,8 +78,8 @@ class UserController extends Controller
         $this->setupFilterControl($filterEditor);
 
         try {
-            $this->view->users = $query->paginate();
-            $this->setupPaginationControl($this->view->users);
+            $this->setupPaginationControl($query);
+            $this->view->users = $query;
         } catch (Exception $e) {
             Notification::error($e->getMessage());
             Logger::error($e);
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index d70afd457..a2f40ae8e 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -3,7 +3,6 @@
 
 namespace Icinga\Repository;
 
-use Zend_Paginator;
 use Icinga\Application\Logger;
 use Icinga\Data\QueryInterface;
 use Icinga\Data\Filter\Filter;
@@ -364,23 +363,6 @@ class RepositoryQuery implements QueryInterface
         return $this->query->getOffset();
     }
 
-    /**
-     * Return a paginator object for this query
-     *
-     * If not given, $itemsPerPage and $pageNumber will be set to their URL parameter counterparts.
-     *
-     * @param   int     $itemsPerPage   Number of items per page
-     * @param   int     $pageNumber     Current page number
-     *
-     * @return  Zend_Paginator
-     */
-    public function paginate($itemsPerPage = null, $pageNumber = null)
-    {
-        $paginator = $this->query->paginate($itemsPerPage, $pageNumber);
-        $paginator->getAdapter()->setQuery($this);
-        return $paginator;
-    }
-
     /**
      * Fetch and return the first column of this query's first row
      *

From be36809552272e42a219f301a07d261a283368a4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 18 May 2015 14:05:02 +0200
Subject: [PATCH 1565/2920] RepositoryQuery: Implement interface Iterator

refs #8826
---
 library/Icinga/Repository/RepositoryQuery.php | 91 ++++++++++++++++++-
 1 file changed, 90 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index a2f40ae8e..2186573f0 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Repository;
 
+use Iterator;
+use IteratorAggregate;
 use Icinga\Application\Logger;
 use Icinga\Data\QueryInterface;
 use Icinga\Data\Filter\Filter;
@@ -11,7 +13,7 @@ use Icinga\Exception\QueryException;
 /**
  * Query class supposed to mediate between a repository and its datasource's query
  */
-class RepositoryQuery implements QueryInterface
+class RepositoryQuery implements QueryInterface, Iterator
 {
     /**
      * The repository being used
@@ -34,6 +36,13 @@ class RepositoryQuery implements QueryInterface
      */
     protected $target;
 
+    /**
+     * The real query's iterator
+     *
+     * @var Iterator
+     */
+    protected $iterator;
+
     /**
      * Create a new repository query
      *
@@ -363,6 +372,16 @@ class RepositoryQuery implements QueryInterface
         return $this->query->getOffset();
     }
 
+    /**
+     * Fetch and return all rows of the result set using an iterator
+     *
+     * @return  Iterator
+     */
+    public function fetch()
+    {
+        return $this;
+    }
+
     /**
      * Fetch and return the first column of this query's first row
      *
@@ -503,4 +522,74 @@ class RepositoryQuery implements QueryInterface
     {
         return $this->query->count();
     }
+
+    /**
+     * Start or rewind the iteration
+     */
+    public function rewind()
+    {
+        if ($this->iterator === null) {
+            if (! $this->hasOrder()) {
+                $this->order();
+            }
+
+            $iterator = $this->query->fetch();
+            if ($iterator instanceof IteratorAggregate) {
+                $this->iterator = $iterator->getIterator();
+            } else {
+                $this->iterator = $iterator;
+            }
+        }
+
+        $this->iterator->rewind();
+    }
+
+    /**
+     * Fetch and return the current row of this query's result
+     *
+     * @return  object
+     */
+    public function current()
+    {
+        $row = $this->iterator->current();
+        if ($this->repository->providesValueConversion()) {
+            foreach ($this->getColumns() as $alias => $column) {
+                if (! is_string($alias)) {
+                    $alias = $column;
+                }
+
+                $row->$alias = $this->repository->retrieveColumn($alias, $row->$alias);
+            }
+        }
+
+        return $row;
+    }
+
+    /**
+     * Return whether the current row of this query's result is valid
+     *
+     * @return  bool
+     */
+    public function valid()
+    {
+        return $this->iterator->valid();
+    }
+
+    /**
+     * Return the key for the current row of this query's result
+     *
+     * @return  mixed
+     */
+    public function key()
+    {
+        return $this->iterator->key();
+    }
+
+    /**
+     * Advance to the next row of this query's result
+     */
+    public function next()
+    {
+        $this->iterator->next();
+    }
 }

From e1f6aee2e76701d85c9e3df616a026d3e74575f0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 18 May 2015 14:17:48 +0200
Subject: [PATCH 1566/2920] Use timeAgo in the notifications overview

refs #6778
---
 .../application/views/scripts/list/notifications.phtml      | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 9a3b424b4..a037aca25 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -34,11 +34,7 @@ use Icinga\Module\Monitoring\Object\Service;
     ?>
         <tr class="state <?= $stateName ?>">
             <td class="state">
-                <?= $this->dateTimeRenderer($notification->notification_start_time)->render(
-                    $this->translate('on %s', 'datetime'),
-                    $this->translate('at %s', 'time'),
-                    $this->translate('%s ago', 'timespan')
-                ) ?>
+                <?= $this->timeAgo($notification->notification_start_time) ?>
             </td>
             <td style="font-size: 0.8em">
                 <?php if ($isService): ?>

From bd51bed9d717ef35c09fa0ee7069c80c33ff763f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 18 May 2015 14:18:22 +0200
Subject: [PATCH 1567/2920] Use timeSince and timeUntil in the dowtimes
 overview

refs #6778
---
 .../application/views/scripts/list/downtimes.phtml    | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 2387e9487..0c1352aa5 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -42,16 +42,7 @@ use Icinga\Module\Monitoring\Object\Service;
         <td class="state">
           <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
           <br>
-            <?=
-            $this->dateTimeRenderer(
-                ($downtime->is_in_effect ? $downtime->end : $downtime->start),
-                true
-            )->render(
-                $this->translate('on %s', 'datetime'),
-                $this->translate('at %s', 'time'),
-                $this->translate('in %s', 'timespan')
-            );
-            ?>
+          <?= $downtime->is_in_effect ? $this->timeSince($downtime->start) : $this->timeUntil($downtime->start) ?>
         </td>
         <td>
         <?php if ($isService): ?>

From 4fbadaea2c2a7e998d017d318dbb65b1c3a5306a Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 18 May 2015 14:20:17 +0200
Subject: [PATCH 1568/2920] 
 ToggleInstanceFeaturesCommandForm::createElements(): make form labels shorter

refs #9023
---
 .../ToggleInstanceFeaturesCommandForm.php        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index 79d15f5c1..e26931f7b 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -85,7 +85,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_ACTIVE_HOST_CHECKS,
                 array(
-                    'label'         =>  $this->translate('Active Host Checks Being Executed'),
+                    'label'         =>  $this->translate('Active Host Checks'),
                     'autosubmit'    => true,
                     'disabled'      => $toggleDisabled
                 )
@@ -94,7 +94,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_ACTIVE_SERVICE_CHECKS,
                 array(
-                    'label'         =>  $this->translate('Active Service Checks Being Executed'),
+                    'label'         =>  $this->translate('Active Service Checks'),
                     'autosubmit'    => true,
                     'disabled'      => $toggleDisabled
                 )
@@ -103,7 +103,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_EVENT_HANDLERS,
                 array(
-                    'label'         => $this->translate('Event Handlers Enabled'),
+                    'label'         => $this->translate('Event Handlers'),
                     'autosubmit'    => true,
                     'disabled'      => $toggleDisabled
                 )
@@ -112,7 +112,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_FLAP_DETECTION,
                 array(
-                    'label'         => $this->translate('Flap Detection Enabled'),
+                    'label'         => $this->translate('Flap Detection'),
                     'autosubmit'    => true,
                     'disabled'      => $toggleDisabled
                 )
@@ -121,7 +121,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_NOTIFICATIONS,
                 array(
-                    'label'         => $this->translate('Notifications Enabled'),
+                    'label'         => $this->translate('Notifications'),
                     'autosubmit'    => true,
                     'description'   => $notificationDescription,
                     'decorators'    => array(
@@ -159,7 +159,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_PASSIVE_HOST_CHECKS,
                 array(
-                    'label'         =>  $this->translate('Passive Host Checks Being Accepted'),
+                    'label'         =>  $this->translate('Passive Host Checks'),
                     'autosubmit'    => true,
                     'disabled'      => $toggleDisabled
                 )
@@ -168,7 +168,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_PASSIVE_SERVICE_CHECKS,
                 array(
-                    'label'         =>  $this->translate('Passive Service Checks Being Accepted'),
+                    'label'         =>  $this->translate('Passive Service Checks'),
                     'autosubmit'    => true,
                     'disabled'      => $toggleDisabled
                 )
@@ -177,7 +177,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_PERFORMANCE_DATA,
                 array(
-                    'label'         =>  $this->translate('Performance Data Being Processed'),
+                    'label'         =>  $this->translate('Performance Data'),
                     'autosubmit'    => true,
                     'disabled'      => $toggleDisabled
                 )

From e49f938f5622718df99d6a9b307c8589878e158b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 18 May 2015 14:33:49 +0200
Subject: [PATCH 1569/2920] Use timeSince and timeUntil when displaying object
 downtimes

refs #6778
---
 .../views/scripts/show/components/downtime.phtml  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 9eb4b6c18..f8475b9a6 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -47,12 +47,21 @@ foreach ($object->downtimes as $downtime) {
     ) : $this->escape($downtime->comment);
 
     if ((bool) $downtime->is_in_effect) {
-        $state = 'in downtime since ' . $this->timeSince($downtime->start);
+        $state = sprintf(
+            $this->translate('in downtime %s', 'Last format parameter represents the time in downtime'),
+            $this->timeSince($downtime->start)
+        );
     } else {
         if ((bool) $downtime->is_fixed) {
-            $state = 'scheduled ' . $this->timeUntil($downtime->start);
+            $state = sprintf(
+                $this->translate('scheduled %s', 'Last format parameter represents the time scheduled'),
+                $this->timeUntil($downtime->start)
+            );
         } else {
-            $state = 'scheduled flexible ' . $this->timeUntil($downtime->start);
+            $state = sprintf(
+                $this->translate('scheduled flexible %s', 'Last format parameter represents the time scheduled'),
+                $this->timeUntil($downtime->start)
+            );
         }
     }
 

From 13a38c9d18e058e1136d8fc2fdfb23393caf9078 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 18 May 2015 14:36:35 +0200
Subject: [PATCH 1570/2920] Revert "Add new line between comment author and
 creation time in the detail views"

This reverts commit 229e266daf4d57a1052ff69ecb132575bcd40941.

The new line does not help for improving the layout but makes it more confusing.
---
 .../views/scripts/show/components/comments.phtml            | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index d883378ba..99c735dd4 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -44,11 +44,7 @@ foreach ($object->comments as $comment) {
 
     ?>
     <tr>
-        <th>
-            <?= $this->escape($comment->author) ?>
-            <br>
-            <?= $this->timeAgo($comment->timestamp) ?>
-        </th>
+        <th><?= $this->escape($comment->author); ?> (<?= $this->timeAgo($comment->timestamp); ?>)</th>
         <td data-base-target="_self">
             <?php if (isset($delCommentForm)) { // Form is unset if the current user lacks the respective permission
                 $delCommentForm = clone $delCommentForm;

From 9ffeffdf09eadfd9bec66def65ff8d6e93b553c7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 18 May 2015 14:39:36 +0200
Subject: [PATCH 1571/2920] Show when an object's dowtime was added

refs #6778
---
 .../application/views/scripts/show/components/downtime.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index f8475b9a6..6e138d704 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -67,7 +67,7 @@ foreach ($object->downtimes as $downtime) {
 
     ?>
     <tr>
-        <th><?= $this->escape($downtime->author_name); ?></th>
+        <th><?= $this->escape($downtime->author_name); ?> (<?= $this->timeAgo($downtime->entry_time); ?>)</th>
         <td data-base-target="_self">
             <?php if (isset($delDowntimeForm)) { // Form is unset if the current user lacks the respective permission
                 $delDowntimeForm = clone $delDowntimeForm;

From aaa8e4bf6a523b9f109d4c80069775ceada2be7a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 18 May 2015 14:40:55 +0200
Subject: [PATCH 1572/2920] Don't render time information when the timestamp
 evaluates to false

refs #6778
---
 library/Icinga/Web/View/helpers/format.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php
index c5f7ca9e6..6011c954f 100644
--- a/library/Icinga/Web/View/helpers/format.php
+++ b/library/Icinga/Web/View/helpers/format.php
@@ -11,6 +11,9 @@ $this->addHelperFunction('format', function () {
 });
 
 $this->addHelperFunction('timeAgo', function ($timestamp) {
+    if (! $timestamp) {
+        return '';
+    }
     return sprintf(
         '<span class="time-ago" title="%s">%s</span>',
         date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
@@ -19,6 +22,9 @@ $this->addHelperFunction('timeAgo', function ($timestamp) {
 });
 
 $this->addHelperFunction('timeSince', function ($timestamp) {
+    if (! $timestamp) {
+        return '';
+    }
     return sprintf(
         '<span class="time-since" title="%s">%s</span>',
         date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
@@ -27,7 +33,9 @@ $this->addHelperFunction('timeSince', function ($timestamp) {
 });
 
 $this->addHelperFunction('timeUntil', function ($timestamp) {
-    if (! $timestamp) return '';
+    if (! $timestamp) {
+        return '';
+    }
     return sprintf(
         '<span class="time-until" title="%s">%s</span>',
         date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format

From e84491d438c36c4023665f7a5f15e28aa934a0c5 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 18 May 2015 14:49:06 +0200
Subject: [PATCH 1573/2920] Improve multi view layout

refs #8565
---
 .../views/scripts/comments/show.phtml         |   2 +-
 .../views/scripts/hosts/show.phtml            | 199 +++++++-------
 .../partials/host/objects-header.phtml        |  14 +-
 .../partials/service/objects-header.phtml     |  17 +-
 .../views/scripts/services/show.phtml         | 253 +++++++++---------
 public/css/icinga/monitoring-colors.less      |   2 +-
 6 files changed, 239 insertions(+), 248 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/comments/show.phtml b/modules/monitoring/application/views/scripts/comments/show.phtml
index 6298749b2..f84f512b1 100644
--- a/modules/monitoring/application/views/scripts/comments/show.phtml
+++ b/modules/monitoring/application/views/scripts/comments/show.phtml
@@ -19,7 +19,7 @@
     <div>
     <?= $this->qlink(
         sprintf(
-            $this->translate('Remove all %d scheduled comments'),
+            $this->translate('Remove %d comments'),
             count($comments)
         ),
         $removeAllLink,
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index a5e1cff38..45bf19ebb 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -13,66 +13,61 @@
         <?= $this->icon('reschedule') ?>
         <?= $this->translate('Commands') ?>
     </h3>
+
+    <p>
     <?= sprintf($this->translatePlural(
         'Issue commands to %s selected host:',
         'Issue commands to all %s selected hosts:',
         count($objects)
     ), '<b>' . count($objects) . '</b>') ?>
+    </p>
 
     <?php if (($hostCount = count($objects)) === 0): ?>
         <?= $this->translate('No hosts found matching the filter'); ?>
     <?php else: ?>
+        <?= $checkNowForm; ?>
 
-      <p>
-        <div>
-            <?= $checkNowForm; ?>
-        </div>
+        <br>
+        <?= $this->qlink(
+            $this->translate('Reschedule next checks'),
+            $rescheduleAllLink,
+            null,
+            array('icon' => 'reschedule')
+        ); ?>
 
-        <div>
-            <?= $this->qlink(
-                $this->translate('Reschedule next checks'),
-                $rescheduleAllLink,
-                null,
-                array('icon' => 'reschedule')
-            ); ?>
-        </div>
+        <br>
+        <?= $this->qlink(
+            $this->translate('Schedule downtimes'),
+            $downtimeAllLink,
+            null,
+            array('icon' => 'plug')
+        ); ?>
 
-        <div>
-            <?= $this->qlink(
-                $this->translate('Schedule downtimes'),
-                $downtimeAllLink,
-                null,
-                array('icon' => 'plug')
-            ); ?>
-        </div>
+        <br>
+        <?= $this->qlink(
+            $this->translate('Submit passive check results'),
+            $processCheckResultAllLink,
+            null,
+            array('icon' => 'reply')
+        ); ?>
 
-        <div>
-            <?= $this->qlink(
-                $this->translate('Submit passive check results'),
-                $processCheckResultAllLink,
-                null,
-                array('icon' => 'reply')
-            ); ?>
-        </div>
-
-        <div>
-            <?= $this->qlink(
-                $this->translate('Add comments'),
-                $addCommentLink,
-                null,
-                array('icon' => 'comment')
-            ); ?>
-        </div>
+        <br>
+        <?= $this->qlink(
+            $this->translate('Add comments'),
+            $addCommentLink,
+            null,
+            array('icon' => 'comment')
+        ); ?>
 
         <?php if ($this->hasPermission('monitoring/command/send-custom-notification')): ?>
-            <div><?= $this->qlink(
+            <br>
+            <?= $this->qlink(
                     sprintf($this->translate('Send a custom notification for all %u hosts'), $hostCount),
                     $sendCustomNotificationLink,
                     null,
                     array('icon' => 'comment')
-            ); ?></div>
+            ); ?>
         <?php endif; ?>
-      </p>
 
         <?php
             $unhandledCount = count($unhandledObjects);
@@ -80,7 +75,6 @@
         ?>
 
         <?php if ($problemCount || $unhandledCount): ?>
-        <div>
             <h3>
                 <?= $this->icon('attention-alt') ?>
                 <?= $this->translatePlural(
@@ -92,16 +86,16 @@
 
             <?php if ($problemCount): ?>
                 <p>
-                    <?= sprintf(
-                        $this->translatePlural(
-                            'There is %s problem, issue commands to the problematic host:',
-                            'There are %s problems, issue commands to the problematic hosts:',
-                            $problemCount
-                        ),
-                        '<b>' . $problemCount . '</b>'
-                    ); ?>
-
-                <div><?= $this->qlink(
+                <?= sprintf(
+                    $this->translatePlural(
+                        'There is %s problem.',
+                        'There are %s problems.',
+                        $problemCount
+                    ),
+                    '<b>' . $problemCount . '</b>'
+                ); ?>
+                </p>
+                <?= $this->qlink(
                         sprintf(
                             $this->translatePlural(
                                 'Schedule a downtime for %u problem host',
@@ -113,13 +107,11 @@
                         $downtimeLink,
                         null,
                         array('icon' => 'plug')
-                    ); ?></div>
-
-                </p>
+                ); ?>
             <?php endif; ?>
 
             <?php if ($unhandledCount): ?>
-            <p>
+              <p>
               <?= sprintf(
                   $this->translatePlural(
                       'There is %s unhandled problem host, issue commands to the problematic host:',
@@ -128,8 +120,9 @@
                   ),
                   '<span class="badge badge-critical">' . $unhandledCount . '</span>'
               ); ?>
+              </p>
 
-              <div><?= $this->qlink(
+              <?= $this->qlink(
                   sprintf(
                       $this->translatePlural(
                           'Schedule a downtime for %u unhandled problem host',
@@ -141,10 +134,10 @@
                   $downtimeUnhandledLink,
                   null,
                   array('icon' => 'plug')
-              ); ?></div>
+              ); ?>
 
-
-              <div><?= $this->qlink(
+              <br>
+              <?= $this->qlink(
                     sprintf(
                         $this->translatePlural(
                             'Acknowledge %u unhandled problem host',
@@ -156,19 +149,16 @@
                     $acknowledgeUnhandledLink,
                     null,
                     array('icon' => 'ok')
-              ); ?></div>
-            </p>
+              ); ?>
 
             <?php endif; ?>
-
-        </div>
         <?php endif;?>
 
       <?php if (($acknowledgedCount = count($acknowledgedObjects)) > 0): ?>
         <div>
             <h3><?= $this->icon('ok', $this->translate('Acknowledgements')) ?> <?= $this->translate('Acknowledgements') ?></h3>
 
-            <p><?= sprintf(
+            <?= sprintf(
                 $this->translatePlural(
                     '%s Acknowledged Host Problem',
                     '%s Acknowledged Host Problems',
@@ -181,57 +171,60 @@
         </div>
       <?php endif ?>
 
-      <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0): ?>
+      <?php $scheduledDowntimeCount = count($objects->getScheduledDowntimes()) ?>
 
-        <h3><?= $this->icon('plug', $this->translate('Downtimes'))?> <?=$this->translate('Downtimes')?></h3>
-        <p><?= sprintf(
-                $this->translatePlural(
-                    '%s Host currently in downtime.',
-                    '%s Hosts currently in downtime.',
-                    $inDowntimeCount
+      <?php if ($scheduledDowntimeCount): ?>
+          <h3><?= $this->icon('plug', $this->translate('Downtimes'))?> <?=$this->translate('Downtimes')?></h3>
+            <?= $this->qlink(
+                sprintf(
+                    $this->translatePlural(
+                        '%s scheduled downtime',
+                        '%s scheduled downtimes',
+                        $scheduledDowntimeCount
+                    ),
+                    $scheduledDowntimeCount
                 ),
-                '<b>' . $inDowntimeCount . '</b>'
-        ) ?>   <?= $this->qlink(
-                $this->translate('List all'),
-                $inDowntimeLink,
+                $showDowntimesLink,
                 null,
                 array('data-base-target' => '_next')
-            ); ?>
+            );?>
+            <?= sprintf($this->translate('on all selected hosts.')) ?>
 
-        </p>
+            <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0): ?>
+                <br>
+                <?= $this->qlink(
+                    sprintf(
+                        $this->translatePlural(
+                            '%s host',
+                            '%s hosts',
+                            $inDowntimeCount
+                        ),
+                        $inDowntimeCount
+                    ),
+                    $inDowntimeLink,
+                    null,
+                    array('data-base-target' => '_next')
+                ); ?>
+            <?= $this->translate('are currently in downtime.') ?>
+            <?php endif; ?>
       <?php endif ?>
 
       <?php if (($commentCount = count($objects->getComments())) > 0): ?>
         <h3> <?= $this->icon('comment', $this->translate('Comments'))?> <?=$this->translate('Comments') ?></h3>
-        <p>
-            <?= sprintf(
+        <?= $this->qlink(
+            sprintf(
                 $this->translatePlural(
-                    'There is %s host comment.',
-                    'There are %s host comments.',
+                    '%s comment',
+                    '%s comments',
                     $commentCount
                 ),
-                '<b>' . $commentCount . '</b>'
-            ) ?>
-
-            <?= $this->qlink(
-                $this->translate('List all'),
-                $commentsLink,
-                null,
-                array('data-base-target' => '_next')
-            ); ?>
-
-        </p>
-
-        <!--
-        <p>
-        <div><?= $this->qlink(
-                $this->translate('Remove all'),
-                $deleteCommentLink,
-                null,
-                array('icon' => 'trash')
-            ); ?></div>
-        </p>
-        -->
+                $commentCount
+            ),
+            $commentsLink,
+            null,
+            array('data-base-target' => '_next')
+        ); ?>
+        <?= $this->translate('on all selected hosts.') ?>
       <?php endif ?>
 
     <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index ef48eefe0..17cf9f7fe 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -5,22 +5,22 @@ $i = 0;
 ?>
 
 <?php if (($hostCount = count($objects)) > 0): ?>
-    <table class="state statesummary">
-
+    <table class="action state statesummary">
         <tbody>
         <?php foreach ($objects as $host): /** @var Host $host */ ?>
             <?php
-            $i++;
-            if ($i > 5) {
+            if (++ $i > 5) {
                 continue;
             }
             ?>
 
             <tr class="state <?= Host::getStateText($host->host_state); ?><?= $host->host_handled ? ' handled' : '' ?>">
                 <td class="state"><?= Host::getStateText($host->host_state, true); ?><br /></td>
-                <td><?= implode(' ', $this->hostFlags($host)) ?></td>
-                <td class="name oneline"><?= $this->escape($host->getName()); ?></td>
-                <td><?= $this->escape($host->host_output) ?></td>
+                <td>
+                <?= implode(' ', $this->hostFlags($host)) ?>
+                <b><?= $this->escape($host->getName()); ?></b><br>
+                <?= $this->escape($host->host_output) ?>
+                </td>
             </tr>
         <?php endforeach ?>
     </tbody>
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index 7c707f0bf..e3c1227f3 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -4,20 +4,25 @@ use Icinga\Module\Monitoring\Object\Service;
 $i = 0;
 ?>
 <?php if (($serviceCount = count($objects)) > 0): ?>
-    <table class="state statesummary">
+    <table class="action state statesummary">
     <tbody>
     <?php foreach ($objects as $service): /** @var Service $service */ ?>
         <?php
-        if ($i ++ > 5) {
+        if (++ $i > 5) {
             continue;
         }
         ?>
         <tr class="state <?= Service::getStateText($service->service_state); ?><?= $service->service_handled ? ' handled' : '' ?>">
             <td class="state"><?= Service::getStateText($service->service_state, true); ?><br /></td>
-            <td><?= implode(' ', $this->serviceFlags($service)) ?></td>
-            <td class="name oneline"><?= $this->escape($service->getName()); ?></td>
-            <td class="name oneline"><?= $this->escape($service->getHost()->getName()); ?></b></td>
-            <td><?= $this->escape($service->service_output) ?></td>
+            <td>
+            <?= implode(' ', $this->serviceFlags($service)) ?>
+            <b>
+               <?= $this->escape($service->getName()); ?>
+               <?= $this->translate('on') ?>
+               <?= $this->escape($service->getHost()->getName()); ?><br>
+            </b>
+            <?= $this->escape($service->service_output) ?>
+            </td>
         </tr>
     <?php endforeach ?>
     </tbody>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 5159e65b3..9291f6ef3 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -17,62 +17,55 @@
     <?php if (($serviceCount = count($objects)) === 0): ?>
         <?= $this->translate('No services found matching the filter'); ?>
     <?php else: ?>
+        <p>
         <?= sprintf($this->translatePlural(
             'Issue commands to %s selected service:',
             'Issue commands to all %s selected services:',
             count($objects)
         ), '<b>' . count($objects) . '</b>') ?>
+        </p>
+        <?= $checkNowForm; ?>
+        <br>
+        <?= $this->qlink(
+            $this->translate('Reschedule next checks'),
+            $rescheduleAllLink,
+            null,
+            array('icon' => 'reschedule')
+        ); ?>
 
-        <p>
-        <div>
-            <?= $checkNowForm; ?>
-        </div>
+        <br>
+        <?= $this->qlink(
+            $this->translate('Schedule downtimes'),
+            $downtimeAllLink,
+            null,
+            array('icon' => 'plug')
+        ); ?>
 
-        <div>
-            <?= $this->qlink(
-                $this->translate('Reschedule next checks'),
-                $rescheduleAllLink,
-                null,
-                array('icon' => 'reschedule')
-            ); ?>
-        </div>
+        <br>
+        <?= $this->qlink(
+            $this->translate('Submit passive check results'),
+            $processCheckResultAllLink,
+            null,
+            array('icon' => 'reply')
+        ); ?>
 
-        <div>
-            <?= $this->qlink(
-                $this->translate('Schedule downtimes'),
-                $downtimeAllLink,
-                null,
-                array('icon' => 'plug')
-            ); ?>
-        </div>
-
-        <div>
-            <?= $this->qlink(
-                $this->translate('Submit passive check results'),
-                $processCheckResultAllLink,
-                null,
-                array('icon' => 'reply')
-            ); ?>
-        </div>
-
-        <div>
-            <?= $this->qlink(
-                $this->translate('Add comments'),
-                $addCommentLink,
-                null,
-                array('icon' => 'comment')
-            ); ?>
-        </div>
+        <br>
+        <?= $this->qlink(
+            $this->translate('Add comments'),
+            $addCommentLink,
+            null,
+            array('icon' => 'comment')
+        ); ?>
 
         <?php if ($this->hasPermission('monitoring/command/send-custom-notification')): ?>
-            <div><?= $this->qlink(
+            <br>
+            <?= $this->qlink(
                     sprintf($this->translate('Send a custom notification for all %u services'), $serviceCount),
                     $sendCustomNotificationLink,
                     null,
                     array('icon' => 'comment')
-                ); ?></div>
+            ); ?>
         <?php endif; ?>
-        </p>
 
         <?php
             $unhandledCount = count($unhandledObjects);
@@ -88,66 +81,65 @@
 
             <?php if ($problemCount): ?>
                 <p>
-                    <?= sprintf(
+                <?= sprintf(
+                    $this->translatePlural(
+                        'There is %s problem, issue commands to the problem service',
+                        'There are %s problems, issue commands to the problem services',
+                        $problemCount
+                    ),
+                    '<b>' . $problemCount . '</b>'
+                ); ?>
+                </p>
+                <?= $this->qlink(
+                    sprintf(
                         $this->translatePlural(
-                            'There is %s problem, issue commands to the problem service',
-                            'There are %s problems, issue commands to the problem services',
+                            'Schedule a downtime for %s problem service',
+                            'Schedule downtimes for %s problem services',
                             $problemCount
                         ),
-                        '<b>' . $problemCount . '</b>'
-                    ); ?>
-
-                <div>
-                    <?= $this->qlink(
-                        sprintf(
-                            $this->translatePlural(
-                                'Schedule a downtime for %s problem service',
-                                'Schedule downtimes for %s problem services',
-                                $problemCount
-                            ),
-                            $problemCount
-                        ),
-                        $downtimeLink,
-                        null,
-                        array('icon' => 'plug')
-                    ); ?>
-                </div>
+                        $problemCount
+                    ),
+                    $downtimeLink,
+                    null,
+                    array('icon' => 'plug')
+                ); ?>
             <?php endif ?>
 
             <?php if ($unhandledCount): ?>
-                <p><?= sprintf($this->translate('There are %s unhandled problems. ' .
+                <p>
+                <?= sprintf($this->translate('There are %s unhandled problem services. ' .
                         'Issue commands to the problematic services:'),
                         '<span class="badge badge-critical">' . $unhandledCount . '</span>') ?>
-                    <div>
-                    <?= $this->qlink(
-                        sprintf(
-                            $this->translatePlural(
-                                'Schedule a downtime for %u unhandled service problem',
-                                'Schedule a downtime for %u unhandled service problems',
-                                $unhandledCount
-                            ),
-                            $unhandledCount
-                        ),
-                        $downtimeUnhandledLink,
-                        null,
-                        array('icon' => 'plug')
-                    ); ?>
-                    </div>
 
-                    <div><?= $this->qlink(
-                        sprintf(
-                            $this->translatePlural(
-                                'Acknowledge %u unhandled service problem',
-                                'Acknowledge %u unhandled service problems',
-                                $unhandledCount
-                            ),
+                </p>
+                <?= $this->qlink(
+                    sprintf(
+                        $this->translatePlural(
+                            'Schedule a downtime for %u unhandled problem service',
+                            'Schedule a downtime for %u unhandled problem services',
                             $unhandledCount
                         ),
-                        $acknowledgeUnhandledLink,
-                        null,
-                        array('icon' => 'ok')
-                    ); ?></div>
-                </p>
+                        $unhandledCount
+                    ),
+                    $downtimeUnhandledLink,
+                    null,
+                    array('icon' => 'plug')
+                ); ?>
+
+                <br>
+                <?= $this->qlink(
+                    sprintf(
+                        $this->translatePlural(
+                            'Acknowledge %u unhandled problem service',
+                            'Acknowledge %u unhandled problem services',
+                            $unhandledCount
+                        ),
+                        $unhandledCount
+                    ),
+                    $acknowledgeUnhandledLink,
+                    null,
+                    array('icon' => 'ok')
+                ); ?>
             <?php endif ?>
 
         </div>
@@ -167,55 +159,56 @@
         </p>
     <?php endif ?>
 
+    <?php $scheduledDowntimeCount = count($objects->getScheduledDowntimes()) ?>
 
-    <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0 /*&& $auth->hasPermission('monitoring/command/comment/delete')*/): ?>
-        <h3>  <?= $this->icon('plug', $this->translate('Downtimes')) ?> <?= $this->translate('Downtimes') ?>  </h3>
-        <p> <?= sprintf($this->translatePlural(
-                '%s service currently in downtime.',
-                '%s services currently in downtime.',
-                $inDowntimeCount
-            ), '<b>' . $inDowntimeCount . '</b>') ?>
+    <?php if ($scheduledDowntimeCount): ?>
+    <h3><?= $this->icon('plug', $this->translate('Downtimes')) ?> <?= $this->translate('Downtimes') ?></h3>
+        <?= $this->qlink(
+            sprintf(
+                $this->translatePlural(
+                    '%s scheduled downtime',
+                    '%s scheduled downtimes',
+                    $scheduledDowntimeCount
+                ),
+                $scheduledDowntimeCount
+            ),
+            $showDowntimesLink,
+            null,
+            array('data-base-target' => '_next')
+        );?>
+        <?= sprintf($this->translate('on all selected services.')) ?>
 
+        <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0): ?>
+            <br>
             <?= $this->qlink(
-                $this->translate('List all'),
+                sprintf($this->translatePlural(
+                    '%s service',
+                    '%s services',
+                    $inDowntimeCount
+                ), $inDowntimeCount),
                 $inDowntimeLink,
                 null,
                 array('data-base-target' => '_next')
             );?>
-        </p>
+            <?= sprintf($this->translate('are currently in downtime.')) ?>
+        <?php endif ?>
     <?php endif ?>
 
-
-<?php $commentCount = count($objects->getComments()) ?>
-<?php if ($commentCount > 0): ?>
-    <h3> <?= $this->icon('comment') ?> <?= $this->translate('Comments') ?> </h3>
-    <p><?= sprintf(
-            $this->translatePlural(
-                'There is %s comment.',
-                'There are %s comments.',
-                $commentCount
-            ), '<b>' . $commentCount . '</b>');
-    ?>
-    <?= $this->qlink(
-        $this->translate('List all'),
-        $commentsLink,
-        null,
-        array('data-base-target' => '_next')
-    ); ?>
-    <p>
-
-    <!--
-    </p>
-    <div><?= $this->qlink(
-            $this->translate('Remove all'),
-            $deleteCommentLink,
+    <?php $commentCount = count($objects->getComments()) ?>
+    <?php if ($commentCount > 0): ?>
+        <h3> <?= $this->icon('comment') ?> <?= $this->translate('Comments') ?> </h3>
+        <?= $this->qlink(
+            sprintf(
+                $this->translatePlural(
+                    '%s comment.',
+                    '%s comments.',
+                    $commentCount
+            ), $commentCount),
+            $commentsLink,
             null,
-            array('icon' => 'trash')
-    ); ?></div>
-    </p>
-    -->
-
-    <?php endif ?>
-
+            array('data-base-target' => '_next')
+        ); ?>
+        <?= $this->translate('on all selected services.') ?>
     <?php endif ?>
+<?php endif ?>
 </div>
diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index 3078fdec7..4902bebb1 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -944,7 +944,7 @@ table.statesummary {
   }
 
   td {
-    font-size: 0.85em;
+    font-size: 0.9em;
     line-height: 1.2em;
     padding-left: 0.2em;
     margin: 0;

From 729fb9a4d16d5667910bbc59350b8c2eb0dcb8af Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 18 May 2015 14:51:22 +0200
Subject: [PATCH 1574/2920] ToggleInstanceFeaturesCommandForm::onSuccess():
 notifications: show which feature has been enabled or disabled

refs #9023
---
 .../ToggleInstanceFeaturesCommandForm.php     | 51 +++++++++++++++++--
 1 file changed, 47 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index e26931f7b..50970df0c 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -209,6 +209,50 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
     public function onSuccess()
     {
         $this->assertPermission('monitoring/command/feature/instance');
+
+        $notifications = array(
+            ToggleInstanceFeatureCommand::FEATURE_ACTIVE_HOST_CHECKS => array(
+                $this->translate('Enabling active host checks...'),
+                $this->translate('Disabling active host checks...')
+            ),
+            ToggleInstanceFeatureCommand::FEATURE_ACTIVE_SERVICE_CHECKS => array(
+                $this->translate('Enabling active service checks...'),
+                $this->translate('Disabling active service checks...')
+            ),
+            ToggleInstanceFeatureCommand::FEATURE_EVENT_HANDLERS => array(
+                $this->translate('Enabling event handlers...'),
+                $this->translate('Disabling event handlers...')
+            ),
+            ToggleInstanceFeatureCommand::FEATURE_FLAP_DETECTION => array(
+                $this->translate('Enabling flap detection...'),
+                $this->translate('Disabling flap detection...')
+            ),
+            ToggleInstanceFeatureCommand::FEATURE_NOTIFICATIONS => array(
+                $this->translate('Enabling notifications...'),
+                $this->translate('Disabling notifications...')
+            ),
+            ToggleInstanceFeatureCommand::FEATURE_HOST_OBSESSING => array(
+                $this->translate('Enabling obsessing over hosts...'),
+                $this->translate('Disabling obsessing over hosts...')
+            ),
+            ToggleInstanceFeatureCommand::FEATURE_SERVICE_OBSESSING => array(
+                $this->translate('Enabling obsessing over services...'),
+                $this->translate('Disabling obsessing over services...')
+            ),
+            ToggleInstanceFeatureCommand::FEATURE_PASSIVE_HOST_CHECKS => array(
+                $this->translate('Enabling passive host checks...'),
+                $this->translate('Disabling passive host checks...')
+            ),
+            ToggleInstanceFeatureCommand::FEATURE_PASSIVE_SERVICE_CHECKS => array(
+                $this->translate('Enabling passive service checks...'),
+                $this->translate('Disabling passive service checks...')
+            ),
+            ToggleInstanceFeatureCommand::FEATURE_PERFORMANCE_DATA => array(
+                $this->translate('Enabling performance data...'),
+                $this->translate('Disabling performance data...')
+            )
+        );
+
         foreach ($this->getValues() as $feature => $enabled) {
             $toggleFeature = new ToggleInstanceFeatureCommand();
             $toggleFeature
@@ -216,10 +260,9 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                 ->setEnabled($enabled);
             $this->getTransport($this->request)->send($toggleFeature);
 
-            if ($this->status->{$feature} != $enabled) {
-                Notification::success($enabled
-                    ? $this->translate('Enabling feature..')
-                    : $this->translate('Disabling feature..')
+            if ((bool) $this->status->{$feature} !== (bool) $enabled) {
+                Notification::success(
+                    $notifications[$feature][$enabled ? 0 : 1]
                 );
             }
         }

From 342a8a39d103c2d49bb32e8f9bd3f9f5ac389bcc Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 18 May 2015 14:58:51 +0200
Subject: [PATCH 1575/2920] Fix state summary in multi views

refs #8565
---
 .../views/scripts/list/components/hostssummary.phtml          | 4 ++--
 .../views/scripts/list/components/servicesummary.phtml        | 2 +-
 .../views/scripts/partials/service/objects-header.phtml       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
index 3ecb2279a..a21a6c9ea 100644
--- a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
@@ -14,7 +14,7 @@ function urlAddFilterOptional($url, $filter, $optional) {
 $this->baseFilter = isset($this->baseFilter) ? $this->baseFilter : null;
 $selfUrl = 'monitoring/list/hosts';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
-?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
+?><div data-base-target='_next' class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
   <?= sprintf($this->translate('%s hosts:'), $this->stats->hosts_total); ?>
   <span class="badges">
     <?php if ($this->stats->hosts_up): ?>
@@ -67,7 +67,7 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
             $this->stats->hosts_down_handled,
             urlAddFilterOptional(
                 $selfUrl,
-                Filter::matchAll(Filter::where('host_state', 1), Filter::where('host_unhandled', 1)),
+                Filter::matchAll(Filter::where('host_state', 1), Filter::where('host_unhandled', 0)),
                 $this->baseFilter
             ),
             null,
diff --git a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
index 76a51de92..97d5f9fdf 100644
--- a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
@@ -16,7 +16,7 @@ $this->baseFilter = isset($this->baseFilter) ? $this->baseFilter : null;
 
 $selfUrl = 'monitoring/list/services';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
-?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
+?><div data-base-target='_next' class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
 <?= sprintf($this->translate('%s services:'), $this->stats->services_total); ?>
 <span class="badges">
 <?php if ($this->stats->services_ok): ?>
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index e3c1227f3..c51861f03 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -4,7 +4,7 @@ use Icinga\Module\Monitoring\Object\Service;
 $i = 0;
 ?>
 <?php if (($serviceCount = count($objects)) > 0): ?>
-    <table class="action state statesummary">
+    <table class='action state statesummary'>
     <tbody>
     <?php foreach ($objects as $service): /** @var Service $service */ ?>
         <?php

From 742dfcaf41507407955d70e810245c63309c6e74 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 18 May 2015 15:17:22 +0200
Subject: [PATCH 1576/2920] Revert "Fetchable: Add method fetch() which returns
 an iterator"

This reverts commit 7a6837de0e331e19d09a22a8565ab0ea2e11a0cf.
---
 library/Icinga/Data/Fetchable.php                |  9 ---------
 library/Icinga/Data/SimpleQuery.php              | 15 ++-------------
 .../library/Monitoring/DataView/DataView.php     | 16 +++-------------
 3 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/library/Icinga/Data/Fetchable.php b/library/Icinga/Data/Fetchable.php
index 2164bb1b2..0992be933 100644
--- a/library/Icinga/Data/Fetchable.php
+++ b/library/Icinga/Data/Fetchable.php
@@ -3,20 +3,11 @@
 
 namespace Icinga\Data;
 
-use Iterator;
-
 /**
  * Interface for retrieving data
  */
 interface Fetchable
 {
-    /**
-     * Fetch and return all rows of the result set using an iterator
-     *
-     * @return  Iterator
-     */
-    public function fetch();
-
     /**
      * Retrieve an array containing all rows of the result set
      *
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index ebcaa61a2..8da712598 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -4,7 +4,6 @@
 namespace Icinga\Data;
 
 use ArrayIterator;
-use Iterator;
 use IteratorAggregate;
 use Icinga\Data\Filter\Filter;
 use Icinga\Exception\IcingaException;
@@ -104,11 +103,11 @@ class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
     /**
      * Return a iterable for this query's result
      *
-     * @return  Iterator
+     * @return  ArrayIterator
      */
     public function getIterator()
     {
-        return $this->fetch();
+        return new ArrayIterator($this->fetchAll());
     }
 
     /**
@@ -352,16 +351,6 @@ class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
         return $this->limitOffset;
     }
 
-    /**
-     * Fetch and return all rows of the result set using an iterator
-     *
-     * @return  ArrayIterator
-     */
-    public function fetch()
-    {
-        return new ArrayIterator($this->fetchAll());
-    }
-
     /**
      * Retrieve an array containing all rows of the result set
      *
diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index dfbdd8a14..6bed36fe1 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -3,7 +3,7 @@
 
 namespace Icinga\Module\Monitoring\DataView;
 
-use Iterator;
+use ArrayIterator;
 use IteratorAggregate;
 use Icinga\Data\QueryInterface;
 use Icinga\Data\Filter\Filter;
@@ -61,11 +61,11 @@ abstract class DataView implements QueryInterface, IteratorAggregate
     /**
      * Return a iterator for all rows of the result set
      *
-     * @return  Iterator
+     * @return  ArrayIterator
      */
     public function getIterator()
     {
-        return $this->fetch();
+        return new ArrayIterator($this->fetchAll());
     }
 
     /**
@@ -469,16 +469,6 @@ abstract class DataView implements QueryInterface, IteratorAggregate
         return $this->query->hasOffset();
     }
 
-    /**
-     * Fetch and return all rows of the result set using an iterator
-     *
-     * @return  Iterator
-     */
-    public function fetch()
-    {
-        return $this->getQuery()->fetch();
-    }
-
     /**
      * Retrieve an array containing all rows of the result set
      *

From 0d48ddcc062f67cb2fb4d5e6eaf81bb06aaeb481 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 18 May 2015 15:18:26 +0200
Subject: [PATCH 1577/2920] ToggleObjectFeaturesCommandForm::onSuccess(): show
 a notification for each feature about whether it has been enabled or disabled

refs #9023
---
 .../ToggleObjectFeaturesCommandForm.php       | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
index 34fbb4c2c..85a6ae3fd 100644
--- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
@@ -117,6 +117,34 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
     public function onSuccess()
     {
         $this->assertPermission('monitoring/command/feature/object');
+
+        $notifications = array(
+            ToggleObjectFeatureCommand::FEATURE_ACTIVE_CHECKS => array(
+                $this->translate('Enabling active checks...'),
+                $this->translate('Disabling active checks...')
+            ),
+            ToggleObjectFeatureCommand::FEATURE_PASSIVE_CHECKS => array(
+                $this->translate('Enabling passive checks...'),
+                $this->translate('Disabling passive checks...')
+            ),
+            ToggleObjectFeatureCommand::FEATURE_OBSESSING => array(
+                $this->translate('Enabling obsessing...'),
+                $this->translate('Disabling obsessing...')
+            ),
+            ToggleObjectFeatureCommand::FEATURE_NOTIFICATIONS => array(
+                $this->translate('Enabling notifications...'),
+                $this->translate('Disabling notifications...')
+            ),
+            ToggleObjectFeatureCommand::FEATURE_EVENT_HANDLER => array(
+                $this->translate('Enabling event handler...'),
+                $this->translate('Disabling event handler...')
+            ),
+            ToggleObjectFeatureCommand::FEATURE_FLAP_DETECTION => array(
+                $this->translate('Enabling flap detection...'),
+                $this->translate('Disabling flap detection...')
+            )
+        );
+
         foreach ($this->objects as $object) {
             /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
             foreach ($this->getValues() as $feature => $enabled) {
@@ -127,10 +155,13 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                         ->setObject($object)
                         ->setEnabled($enabled);
                     $this->getTransport($this->request)->send($toggleFeature);
+
+                    Notification::success(
+                        $notifications[$feature][$enabled ? 0 : 1]
+                    );
                 }
             }
         }
-        Notification::success($this->translate('Toggling feature..'));
         return true;
     }
 }

From c3129890aae2d3316d9737dd364195339a8972f9 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 18 May 2015 15:22:10 +0200
Subject: [PATCH 1578/2920] Improve multi-view tabs

Display the current object count next to the tab title, to clarify that those views display a summary of multiple items. Only display the current tab for hosts or services, to avoid confusion.

refs #8565
---
 .../controllers/HostsController.php           | 19 +++----------------
 .../controllers/ServicesController.php        | 19 +++----------------
 .../library/Monitoring/Object/HostList.php    |  2 +-
 3 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 32916ba42..5a734cbbe 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -15,7 +15,6 @@ use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\SendCustomNotificationCommandForm;
 use Icinga\Module\Monitoring\Object\HostList;
 use Icinga\Web\Url;
-use Icinga\Web\Widget\Chart\InlinePie;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 
 class Monitoring_HostsController extends Controller
@@ -42,24 +41,12 @@ class Monitoring_HostsController extends Controller
                     $this->translate('Show summarized information for %u hosts'),
                     count($this->hostList)
                 ),
-                'label' => $this->translate('Hosts'),
+                'label' => sprintf($this->translate('Hosts (%d)'), count($this->hostList)),
                 'url'   => Url::fromRequest(),
                 'icon'  => 'host'
             )
-        )->extend(new DashboardAction());
-
-        $this->getTabs()->add(
-            'services',
-            array(
-                'title' => sprintf(
-                    $this->translate('Show summarized information for related services')
-                ),
-                'label' => $this->translate('Services'),
-                'url'   => Url::fromPath('monitoring/services/show')->setParams(Url::fromRequest()->getParams()),
-                'icon'  => 'services'
-            )
-        )->activate('show');
-
+        )->extend(new DashboardAction())->activate('show');
+        
         $this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/hosts')->setQueryString($filterString);
     }
 
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 583b03246..83b1b5dd5 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -15,7 +15,6 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\SendCustomNotificationCommandForm;
 use Icinga\Module\Monitoring\Object\ServiceList;
 use Icinga\Web\Url;
-use Icinga\Web\Widget\Chart\InlinePie;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 
 class Monitoring_ServicesController extends Controller
@@ -34,18 +33,6 @@ class Monitoring_ServicesController extends Controller
         $this->serviceList = $serviceList;
         $this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/services');
 
-        $this->getTabs()->add(
-            'hosts',
-            array(
-                'title' => sprintf(
-                    $this->translate('Show summarized information for hosts')
-                ),
-                'label' => $this->translate('Hosts'),
-                'url'   => Url::fromPath('monitoring/hosts/show')->setParams(Url::fromRequest()->getParams()),
-                'icon' => 'host'
-            )
-        )->extend(new DashboardAction());
-
         $this->getTabs()->add(
             'show',
             array(
@@ -53,11 +40,11 @@ class Monitoring_ServicesController extends Controller
                     $this->translate('Show summarized information for %u services'),
                     count($this->serviceList)
                 ),
-                'label' => $this->translate('Services'),
+                'label' => sprintf($this->translate('Services (%d)'), count($this->serviceList)),
                 'url'   => Url::fromRequest(),
-                'icon' => 'services'
+                'icon'  => 'services'
             )
-        )->activate('show');
+        )->extend(new DashboardAction())->activate('show');
     }
 
     protected function handleCommandForm(ObjectsCommandForm $form)
diff --git a/modules/monitoring/library/Monitoring/Object/HostList.php b/modules/monitoring/library/Monitoring/Object/HostList.php
index 4236f94d8..2aa5bb04f 100644
--- a/modules/monitoring/library/Monitoring/Object/HostList.php
+++ b/modules/monitoring/library/Monitoring/Object/HostList.php
@@ -76,7 +76,7 @@ class HostList extends ObjectList
     /**
      * Returns a Filter that matches all hosts in this list
      *
-     * @return array    An
+     * @return Filter
      */
     public function objectsFilter($columns = array('host' => 'host'))
     {

From 1f20ba1bc63ad40913a91231fbacaa4184a4c25c Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 18 May 2015 15:48:04 +0200
Subject: [PATCH 1579/2920] Fix state summary base target in multi views

refs #8565
---
 modules/monitoring/application/views/scripts/hosts/show.phtml   | 2 +-
 .../views/scripts/list/components/hostssummary.phtml            | 2 +-
 .../views/scripts/list/components/servicesummary.phtml          | 2 +-
 .../monitoring/application/views/scripts/services/show.phtml    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 45bf19ebb..6b4ed4ca3 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -1,4 +1,4 @@
-<div class="controls">
+<div data-base-target='_next' class="controls">
     <?php if (! $this->compact): ?>
         <?= $tabs; ?>
     <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
index a21a6c9ea..d6166a52d 100644
--- a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
@@ -14,7 +14,7 @@ function urlAddFilterOptional($url, $filter, $optional) {
 $this->baseFilter = isset($this->baseFilter) ? $this->baseFilter : null;
 $selfUrl = 'monitoring/list/hosts';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
-?><div data-base-target='_next' class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
+?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
   <?= sprintf($this->translate('%s hosts:'), $this->stats->hosts_total); ?>
   <span class="badges">
     <?php if ($this->stats->hosts_up): ?>
diff --git a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
index 97d5f9fdf..76a51de92 100644
--- a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
@@ -16,7 +16,7 @@ $this->baseFilter = isset($this->baseFilter) ? $this->baseFilter : null;
 
 $selfUrl = 'monitoring/list/services';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
-?><div data-base-target='_next' class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
+?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
 <?= sprintf($this->translate('%s services:'), $this->stats->services_total); ?>
 <span class="badges">
 <?php if ($this->stats->services_ok): ?>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 9291f6ef3..429f43ea6 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -1,4 +1,4 @@
-<div class="controls">
+<div data-base-target='_next' class="controls">
 
     <?php if (! $this->compact): ?>
         <?= $tabs; ?>

From 0e0341f78aa9dae06b124a091c4843f3747267a4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 18 May 2015 16:01:58 +0200
Subject: [PATCH 1580/2920] It's the connection which provides a cursor, not
 the query

---
 library/Icinga/Data/DataArray/ArrayDatasource.php   | 13 +++++++++++++
 library/Icinga/Data/Db/DbConnection.php             | 13 +++++++++++++
 library/Icinga/Data/SimpleQuery.php                 |  5 ++---
 library/Icinga/Protocol/Ldap/Connection.php         |  6 ++++++
 library/Icinga/Repository/RepositoryQuery.php       | 12 +-----------
 .../library/Monitoring/DataView/DataView.php        |  8 ++++----
 6 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/library/Icinga/Data/DataArray/ArrayDatasource.php b/library/Icinga/Data/DataArray/ArrayDatasource.php
index 11f8e59e8..ef5b4e3ed 100644
--- a/library/Icinga/Data/DataArray/ArrayDatasource.php
+++ b/library/Icinga/Data/DataArray/ArrayDatasource.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Data\DataArray;
 
+use ArrayIterator;
 use Icinga\Data\Selectable;
 use Icinga\Data\SimpleQuery;
 
@@ -82,6 +83,18 @@ class ArrayDatasource implements Selectable
         return new SimpleQuery($this);
     }
 
+    /**
+     * Fetch and return all rows of the given query's result set using an iterator
+     *
+     * @param   SimpleQuery     $query
+     *
+     * @return  ArrayIterator
+     */
+    public function query(SimpleQuery $query)
+    {
+        return new ArrayIterator($this->fetchAll($query));
+    }
+
     /**
      * Fetch and return a column of all rows of the result set as an array
      *
diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php
index ebe6e5743..f6398831d 100644
--- a/library/Icinga/Data/Db/DbConnection.php
+++ b/library/Icinga/Data/Db/DbConnection.php
@@ -4,6 +4,7 @@
 namespace Icinga\Data\Db;
 
 use PDO;
+use Iterator;
 use Zend_Db;
 use Icinga\Application\Benchmark;
 use Icinga\Data\ConfigObject;
@@ -87,6 +88,18 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible
         return new DbQuery($this);
     }
 
+    /**
+     * Fetch and return all rows of the given query's result set using an iterator
+     *
+     * @param   DbQuery     $query
+     *
+     * @return  Iterator
+     */
+    public function query(DbQuery $query)
+    {
+        return $query->getSelectQuery()->query();
+    }
+
     /**
      * Getter for database type
      *
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 8da712598..c2dd5c1d9 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -3,7 +3,6 @@
 
 namespace Icinga\Data;
 
-use ArrayIterator;
 use IteratorAggregate;
 use Icinga\Data\Filter\Filter;
 use Icinga\Exception\IcingaException;
@@ -103,11 +102,11 @@ class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
     /**
      * Return a iterable for this query's result
      *
-     * @return  ArrayIterator
+     * @return  Iterator
      */
     public function getIterator()
     {
-        return new ArrayIterator($this->fetchAll());
+        return $this->ds->query($this);
     }
 
     /**
diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 9296c5f88..2f7cccd41 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Protocol\Ldap;
 
+use ArrayIterator;
 use Icinga\Application\Config;
 use Icinga\Application\Logger;
 use Icinga\Application\Platform;
@@ -133,6 +134,11 @@ class Connection implements Selectable
         return new Query($this);
     }
 
+    public function query(Query $query)
+    {
+        return new ArrayIterator($this->fetchAll($query));
+    }
+
     public function fetchOne($query, $fields = array())
     {
         $row = (array) $this->fetchRow($query, $fields);
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index 2186573f0..220e85632 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -372,16 +372,6 @@ class RepositoryQuery implements QueryInterface, Iterator
         return $this->query->getOffset();
     }
 
-    /**
-     * Fetch and return all rows of the result set using an iterator
-     *
-     * @return  Iterator
-     */
-    public function fetch()
-    {
-        return $this;
-    }
-
     /**
      * Fetch and return the first column of this query's first row
      *
@@ -533,7 +523,7 @@ class RepositoryQuery implements QueryInterface, Iterator
                 $this->order();
             }
 
-            $iterator = $this->query->fetch();
+            $iterator = $this->repository->getDataSource()->query($this->query);
             if ($iterator instanceof IteratorAggregate) {
                 $this->iterator = $iterator->getIterator();
             } else {
diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 6bed36fe1..442e1e7c2 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -3,7 +3,6 @@
 
 namespace Icinga\Module\Monitoring\DataView;
 
-use ArrayIterator;
 use IteratorAggregate;
 use Icinga\Data\QueryInterface;
 use Icinga\Data\Filter\Filter;
@@ -13,6 +12,7 @@ use Icinga\Data\ConnectionInterface;
 use Icinga\Exception\QueryException;
 use Icinga\Web\Request;
 use Icinga\Web\Url;
+use Icinga\Module\Monitoring\Backend\Ido\Query\IdoQuery;
 use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 
 /**
@@ -23,7 +23,7 @@ abstract class DataView implements QueryInterface, IteratorAggregate
     /**
      * The query used to populate the view
      *
-     * @var QueryInterface
+     * @var IdoQuery
      */
     protected $query;
 
@@ -61,11 +61,11 @@ abstract class DataView implements QueryInterface, IteratorAggregate
     /**
      * Return a iterator for all rows of the result set
      *
-     * @return  ArrayIterator
+     * @return  IdoQuery
      */
     public function getIterator()
     {
-        return new ArrayIterator($this->fetchAll());
+        return $this->getQuery();
     }
 
     /**

From 9af25acf3877e38e3f2ca2c365665fa5c5e801f7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 18 May 2015 16:02:55 +0200
Subject: [PATCH 1581/2920] RepositoryQuery: Benchmark when iterating a query's
 result

refs #8826
---
 library/Icinga/Repository/RepositoryQuery.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index 220e85632..91988605c 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -5,6 +5,7 @@ namespace Icinga\Repository;
 
 use Iterator;
 use IteratorAggregate;
+use Icinga\Application\Benchmark;
 use Icinga\Application\Logger;
 use Icinga\Data\QueryInterface;
 use Icinga\Data\Filter\Filter;
@@ -532,6 +533,7 @@ class RepositoryQuery implements QueryInterface, Iterator
         }
 
         $this->iterator->rewind();
+        Benchmark::measure('Query result iteration started');
     }
 
     /**
@@ -562,7 +564,12 @@ class RepositoryQuery implements QueryInterface, Iterator
      */
     public function valid()
     {
-        return $this->iterator->valid();
+        if (! $this->iterator->valid()) {
+            Benchmark::measure('Query result iteration finished');
+            return false;
+        }
+
+        return true;
     }
 
     /**

From 7caba93a28c972585bafaaa0fa7dc59da59758e3 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 18 May 2015 16:03:15 +0200
Subject: [PATCH 1582/2920] Replace `...' w/ `..'

refs #9023
---
 .../ToggleInstanceFeaturesCommandForm.php     | 40 +++++++++----------
 .../ToggleObjectFeaturesCommandForm.php       | 24 +++++------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index 50970df0c..9ef90718f 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -212,44 +212,44 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
 
         $notifications = array(
             ToggleInstanceFeatureCommand::FEATURE_ACTIVE_HOST_CHECKS => array(
-                $this->translate('Enabling active host checks...'),
-                $this->translate('Disabling active host checks...')
+                $this->translate('Enabling active host checks..'),
+                $this->translate('Disabling active host checks..')
             ),
             ToggleInstanceFeatureCommand::FEATURE_ACTIVE_SERVICE_CHECKS => array(
-                $this->translate('Enabling active service checks...'),
-                $this->translate('Disabling active service checks...')
+                $this->translate('Enabling active service checks..'),
+                $this->translate('Disabling active service checks..')
             ),
             ToggleInstanceFeatureCommand::FEATURE_EVENT_HANDLERS => array(
-                $this->translate('Enabling event handlers...'),
-                $this->translate('Disabling event handlers...')
+                $this->translate('Enabling event handlers..'),
+                $this->translate('Disabling event handlers..')
             ),
             ToggleInstanceFeatureCommand::FEATURE_FLAP_DETECTION => array(
-                $this->translate('Enabling flap detection...'),
-                $this->translate('Disabling flap detection...')
+                $this->translate('Enabling flap detection..'),
+                $this->translate('Disabling flap detection..')
             ),
             ToggleInstanceFeatureCommand::FEATURE_NOTIFICATIONS => array(
-                $this->translate('Enabling notifications...'),
-                $this->translate('Disabling notifications...')
+                $this->translate('Enabling notifications..'),
+                $this->translate('Disabling notifications..')
             ),
             ToggleInstanceFeatureCommand::FEATURE_HOST_OBSESSING => array(
-                $this->translate('Enabling obsessing over hosts...'),
-                $this->translate('Disabling obsessing over hosts...')
+                $this->translate('Enabling obsessing over hosts..'),
+                $this->translate('Disabling obsessing over hosts..')
             ),
             ToggleInstanceFeatureCommand::FEATURE_SERVICE_OBSESSING => array(
-                $this->translate('Enabling obsessing over services...'),
-                $this->translate('Disabling obsessing over services...')
+                $this->translate('Enabling obsessing over services..'),
+                $this->translate('Disabling obsessing over services..')
             ),
             ToggleInstanceFeatureCommand::FEATURE_PASSIVE_HOST_CHECKS => array(
-                $this->translate('Enabling passive host checks...'),
-                $this->translate('Disabling passive host checks...')
+                $this->translate('Enabling passive host checks..'),
+                $this->translate('Disabling passive host checks..')
             ),
             ToggleInstanceFeatureCommand::FEATURE_PASSIVE_SERVICE_CHECKS => array(
-                $this->translate('Enabling passive service checks...'),
-                $this->translate('Disabling passive service checks...')
+                $this->translate('Enabling passive service checks..'),
+                $this->translate('Disabling passive service checks..')
             ),
             ToggleInstanceFeatureCommand::FEATURE_PERFORMANCE_DATA => array(
-                $this->translate('Enabling performance data...'),
-                $this->translate('Disabling performance data...')
+                $this->translate('Enabling performance data..'),
+                $this->translate('Disabling performance data..')
             )
         );
 
diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
index 85a6ae3fd..ad6196d44 100644
--- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
@@ -120,28 +120,28 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
 
         $notifications = array(
             ToggleObjectFeatureCommand::FEATURE_ACTIVE_CHECKS => array(
-                $this->translate('Enabling active checks...'),
-                $this->translate('Disabling active checks...')
+                $this->translate('Enabling active checks..'),
+                $this->translate('Disabling active checks..')
             ),
             ToggleObjectFeatureCommand::FEATURE_PASSIVE_CHECKS => array(
-                $this->translate('Enabling passive checks...'),
-                $this->translate('Disabling passive checks...')
+                $this->translate('Enabling passive checks..'),
+                $this->translate('Disabling passive checks..')
             ),
             ToggleObjectFeatureCommand::FEATURE_OBSESSING => array(
-                $this->translate('Enabling obsessing...'),
-                $this->translate('Disabling obsessing...')
+                $this->translate('Enabling obsessing..'),
+                $this->translate('Disabling obsessing..')
             ),
             ToggleObjectFeatureCommand::FEATURE_NOTIFICATIONS => array(
-                $this->translate('Enabling notifications...'),
-                $this->translate('Disabling notifications...')
+                $this->translate('Enabling notifications..'),
+                $this->translate('Disabling notifications..')
             ),
             ToggleObjectFeatureCommand::FEATURE_EVENT_HANDLER => array(
-                $this->translate('Enabling event handler...'),
-                $this->translate('Disabling event handler...')
+                $this->translate('Enabling event handler..'),
+                $this->translate('Disabling event handler..')
             ),
             ToggleObjectFeatureCommand::FEATURE_FLAP_DETECTION => array(
-                $this->translate('Enabling flap detection...'),
-                $this->translate('Disabling flap detection...')
+                $this->translate('Enabling flap detection..'),
+                $this->translate('Disabling flap detection..')
             )
         );
 

From 0bde465295e765e295b29304b737ee2f833a5e13 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 18 May 2015 16:29:33 +0200
Subject: [PATCH 1583/2920] Rename ::extraColumns() to ::addColumns()

refs #4498
---
 .../monitoring/application/controllers/ListController.php | 8 ++++----
 .../monitoring/application/views/scripts/list/hosts.phtml | 2 +-
 .../application/views/scripts/list/services.phtml         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 27f02f3f9..5be9fcd09 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -94,7 +94,7 @@ class Monitoring_ListController extends Controller
             'host_passive_checks_enabled',
             'host_current_check_attempt',
             'host_max_check_attempts'
-        ), $this->extraColumns()));
+        ), $this->addColumns()));
         $this->filterQuery($query);
         $this->applyRestriction('monitoring/hosts/filter', $query);
         $this->view->hosts = $query;
@@ -177,7 +177,7 @@ class Monitoring_ListController extends Controller
             'service_passive_checks_enabled',
             'current_check_attempt' => 'service_current_check_attempt',
             'max_check_attempts'    => 'service_max_check_attempts'
-        ), $this->extraColumns());
+        ), $this->addColumns());
         $query = $this->backend->select()->from('serviceStatus', $columns);
         $this->filterQuery($query);
         $this->applyRestriction('monitoring/services/filter', $query);
@@ -644,7 +644,7 @@ class Monitoring_ListController extends Controller
         return $query;
     }
 
-    protected function extraColumns()
+    protected function addColumns()
     {
         $columns = preg_split(
             '~,~',
@@ -652,7 +652,7 @@ class Monitoring_ListController extends Controller
             -1,
             PREG_SPLIT_NO_EMPTY
         );
-        $this->view->extraColumns = $columns;
+        $this->view->addColumns = $columns;
         return $columns;
     }
 
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 196279b04..89c2e7d26 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -92,7 +92,7 @@ if (count($hosts) === 0) {
         <?php endif ?>
         <p class="pluginoutput"><?= $this->escape($this->ellipsis($host->host_output, 10000)) ?></p>
       </td>
-      <?php foreach($this->extraColumns as $col): ?>
+      <?php foreach($this->addColumns as $col): ?>
       <td><?= $this->escape($host->$col) ?></td>
       <?php endforeach ?>
     </tr>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 63d9076c3..12ba232cc 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -81,7 +81,7 @@ if (count($services) === 0) {
         ); ?><?php endif ?><br>
         <p class="pluginoutput"><?= $this->escape($this->ellipsis($service->service_output, 10000)); ?></p>
       </td>
-<?php foreach($this->extraColumns as $col): ?>
+<?php foreach($this->addColumns as $col): ?>
       <td><?= $this->escape($service->$col) ?></td>
 <?php endforeach ?>
     </tr>

From 94555d7998c6f0e3c0378b8e2f555307b810ac6a Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 18 May 2015 17:13:46 +0200
Subject: [PATCH 1584/2920] Streamline layout of all multi-views

Fix small inconsistencies between layout of downtime, comment, service and host multi-views.
---
 .../application/controllers/CommentsController.php |  4 ++--
 .../controllers/DowntimesController.php            |  4 ++--
 .../application/controllers/HostsController.php    |  2 +-
 .../application/controllers/ServicesController.php |  2 +-
 .../application/views/scripts/comments/show.phtml  | 11 +----------
 .../application/views/scripts/downtimes/show.phtml | 13 ++-----------
 .../application/views/scripts/hosts/show.phtml     |  4 ++--
 .../scripts/partials/comment/comments-header.phtml |  6 ++++--
 .../partials/downtime/downtimes-header.phtml       |  8 +++++---
 .../scripts/partials/host/objects-header.phtml     | 11 ++++++++---
 .../scripts/partials/service/objects-header.phtml  | 14 +++++++++-----
 .../application/views/scripts/services/show.phtml  |  2 +-
 public/css/icinga/layout-structure.less            |  3 ++-
 public/css/icinga/monitoring-colors.less           |  5 -----
 14 files changed, 40 insertions(+), 49 deletions(-)

diff --git a/modules/monitoring/application/controllers/CommentsController.php b/modules/monitoring/application/controllers/CommentsController.php
index e9a885dbe..e1092b033 100644
--- a/modules/monitoring/application/controllers/CommentsController.php
+++ b/modules/monitoring/application/controllers/CommentsController.php
@@ -55,8 +55,8 @@ class Monitoring_CommentsController extends Controller
                 'title' => $this->translate(
                     'Display detailed information about multiple comments.'
                 ),
-                'icon' => 'comment',
-                'label' => $this->translate('Comments'),
+                'icon'  => 'comment',
+                'label' => $this->translate('Comments') . sprintf(' (%d)', count($this->comments)),
                 'url'   =>'monitoring/comments/show'
             )
         )->activate('comments');
diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php
index 49424ed3a..4ba872bbd 100644
--- a/modules/monitoring/application/controllers/DowntimesController.php
+++ b/modules/monitoring/application/controllers/DowntimesController.php
@@ -75,8 +75,8 @@ class Monitoring_DowntimesController extends Controller
                 'title' => $this->translate(
                     'Display detailed information about multiple downtimes.'
                 ),
-                'icon' => 'plug',
-                'label' => $this->translate('Downtimes'),
+                'icon'  => 'plug',
+                'label' => $this->translate('Downtimes') . sprintf(' (%d)', count($this->downtimes)),
                 'url'   =>'monitoring/downtimes/show'
             )
         )->activate('downtimes');
diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 5a734cbbe..45eca1135 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -41,7 +41,7 @@ class Monitoring_HostsController extends Controller
                     $this->translate('Show summarized information for %u hosts'),
                     count($this->hostList)
                 ),
-                'label' => sprintf($this->translate('Hosts (%d)'), count($this->hostList)),
+                'label' => $this->translate('Hosts') . sprintf(' (%d)', count($this->hostList)),
                 'url'   => Url::fromRequest(),
                 'icon'  => 'host'
             )
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 83b1b5dd5..f4ee73cf5 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -40,7 +40,7 @@ class Monitoring_ServicesController extends Controller
                     $this->translate('Show summarized information for %u services'),
                     count($this->serviceList)
                 ),
-                'label' => sprintf($this->translate('Services (%d)'), count($this->serviceList)),
+                'label' => $this->translate('Services') . sprintf(' (%d)', count($this->serviceList)),
                 'url'   => Url::fromRequest(),
                 'icon'  => 'services'
             )
diff --git a/modules/monitoring/application/views/scripts/comments/show.phtml b/modules/monitoring/application/views/scripts/comments/show.phtml
index f84f512b1..4f9c64d47 100644
--- a/modules/monitoring/application/views/scripts/comments/show.phtml
+++ b/modules/monitoring/application/views/scripts/comments/show.phtml
@@ -8,15 +8,8 @@
   </div>
 </div>
 
-<div class="content">
+<div class="content multi-commands">
   <h3><?= $this->icon('reschedule') ?> <?= $this->translate('Commands') ?> </h3>
-  <p>
-    <?= sprintf(
-            $this->translate('Issue commands to all %s selected comments.'),
-            '<b>' . count($comments) . '</b>'
-        )
-    ?>
-    <div>
     <?= $this->qlink(
         sprintf(
             $this->translate('Remove %d comments'),
@@ -29,6 +22,4 @@
             'title' => $this->translate('Remove all selected comments.')
         )
     ) ?>
-    </div>
-  </p>
 </div>
diff --git a/modules/monitoring/application/views/scripts/downtimes/show.phtml b/modules/monitoring/application/views/scripts/downtimes/show.phtml
index 35edc04f4..1c508bbc9 100644
--- a/modules/monitoring/application/views/scripts/downtimes/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtimes/show.phtml
@@ -7,15 +7,8 @@
   <?= $this->render('partials/downtime/downtimes-header.phtml'); ?> 
 </p>
 </div>
-<div class="content">
-  <h3><?= $this->icon('reschedule') ?> <?= $this->translate('Commands') ?> </h3>
-  <p>
-    <?= sprintf(
-            $this->translate('Issue commands to all %s selected downtimes.'),
-            '<b>' . count($downtimes) . '</b>'
-        )
-    ?>
-    <div>
+<div class="content multi-commands">
+    <h3><?= $this->icon('reschedule') ?> <?= $this->translate('Commands') ?> </h3>
     <?= $this->qlink(
         sprintf(
             $this->translate('Remove all %d scheduled downtimes'),
@@ -28,6 +21,4 @@
             'title' => $this->translate('Remove all selected downtimes.')
         )
     ) ?>
-    </div>
-  </p>
 </div>
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 6b4ed4ca3..6bbb3c80d 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -8,7 +8,7 @@
 
 </div>
 
-<div class="content no-padding-top">
+<div class="content multi-commands">
     <h3>
         <?= $this->icon('reschedule') ?>
         <?= $this->translate('Commands') ?>
@@ -165,7 +165,7 @@
                     $acknowledgedCount
                 ),
                 '<b>' . $acknowledgedCount . '</b>'
-            ); ?></p>
+            ); ?>
 
             <?= $removeAckForm ?>
         </div>
diff --git a/modules/monitoring/application/views/scripts/partials/comment/comments-header.phtml b/modules/monitoring/application/views/scripts/partials/comment/comments-header.phtml
index 4ec725549..7e2a5d87c 100644
--- a/modules/monitoring/application/views/scripts/partials/comment/comments-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/comment/comments-header.phtml
@@ -18,13 +18,15 @@
 </table>
 
 <p>
+    <?php if ($i > 5): ?>
     <?= $this->qlink(
-        sprintf($this->translate('List all %d comments …'), count($comments)),
+        sprintf($this->translate('show all %d comments'), $i),
         $listAllLink,
         null,
         array(
-            'title' => $this->translate('List all'),
+            'icon' => $i > 5 ? 'down-open' : '',
             'data-base-target' => "_next"
         )
     ) ?>
+    <?php endif ?>
 </p>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index 54cd0210c..5518e5022 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -79,14 +79,16 @@
     </tbody>
   </table>
 
-  <p> 
+  <p>
+    <?php if ($i > 5): ?>
     <?= $this->qlink(
-        sprintf($this->translate('List all %d downtimes …'), count($downtimes)),
+        sprintf($this->translate('show all %d downtimes'), $i),
         $listAllLink,
         null,
         array(
-            'title' => $this->translate('List all'),
+            'icon' => $i > 5 ? 'down-open' : '',
             'data-base-target' => "_next"
         )
     ) ?>
+    <?php endif ?>
   </p>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index 17cf9f7fe..d59479e07 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -25,15 +25,20 @@ $i = 0;
         <?php endforeach ?>
     </tbody>
     </table>
-    <div class="hbox-item">
+    <div class="hbox-item multi-commands">
+        <?php if ($i > 5): ?>
         <?=
         $this->qlink(
-            sprintf($this->translate('list all %d hosts ...'), $i),
+            sprintf($this->translate('show all %d hosts'), $i),
             $listAllLink,
             null,
-            array('data-base-target' => '_next')
+            array(
+                'icon' => 'down-open',
+                'data-base-target' => '_next'
+            )
         );
         ?>
+        <?php endif ?>
     </div>
 <?php endif ?>
 
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index c51861f03..0d3d4840d 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -27,14 +27,18 @@ $i = 0;
     <?php endforeach ?>
     </tbody>
     </table>
-    <div class="hbox-item">
-        <?php
-        echo $this->qlink(
-            sprintf($this->translate('List all %d services ...'), $i),
+    <div class="hbox-item multi-commands">
+        <?php if ($i > 5): ?>
+        <?= $this->qlink(
+            sprintf($this->translate('show all %d services'), $i),
             $listAllLink,
             null,
-            array('data-base-target' => '_next')
+            array(
+                'icon' => 'down-open',
+                'data-base-target' => '_next'
+            )
         );
         ?>
+        <?php endif ?>
     </div>
 <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 429f43ea6..746e24871 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -8,7 +8,7 @@
     <?= $this->render('partials/service/objects-header.phtml'); ?>
 
 </div>
-<div class="content no-padding-top">
+<div class="content multi-commands">
     <h3>
         <?= $this->icon('reschedule') ?>
         <?= $this->translate('Commands') ?>
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 63be9f546..3a8713a38 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -373,6 +373,7 @@ html {
   width: 1px;
 }
 
-.no-padding-top {
+.multi-commands {
   padding-top: 0em;
+  font-size: 0.9em;
 }
diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index 4902bebb1..ba0877232 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -933,11 +933,6 @@ table.statesummary {
   width: auto;
   border-collapse: separate;
 
-  td {
-    padding: 0em 0.4em 0em 0.4em;
-    line-height: 1.2em;
-  }
-
   tr.state td.state {
     width: auto;
     font-weight: bold;

From 7b6ca0826bf78c69807595db33325c9cfda8c364 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 19 May 2015 09:34:22 +0200
Subject: [PATCH 1585/2920] DbQuery: Let the DbConnection do the count query

---
 library/Icinga/Data/Db/DbConnection.php | 12 ++++++++++++
 library/Icinga/Data/Db/DbQuery.php      |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php
index f6398831d..9960fd491 100644
--- a/library/Icinga/Data/Db/DbConnection.php
+++ b/library/Icinga/Data/Db/DbConnection.php
@@ -212,6 +212,18 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible
         return $this;
     }
 
+    /**
+     * Count all rows of the result set
+     *
+     * @param   DbQuery     $query
+     *
+     * @return  int
+     */
+    public function count(DbQuery $query)
+    {
+        return $this->dbAdapter->fetchOne($query->getCountQuery());
+    }
+
     /**
      * Retrieve an array containing all rows of the result set
      *
diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index 45a586b9a..1149fbeec 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -297,7 +297,7 @@ class DbQuery extends SimpleQuery
     {
         if ($this->count === null) {
             Benchmark::measure('DB is counting');
-            $this->count = $this->db->fetchOne($this->getCountQuery());
+            $this->count = parent::count();
             Benchmark::measure('DB finished count');
         }
         return $this->count;

From a1276fd709069e31f2ab3c33cdf06d0b80854ee7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 19 May 2015 09:41:18 +0200
Subject: [PATCH 1586/2920] Benchmark all queries by default, not only db
 queries

---
 library/Icinga/Data/Db/DbConnection.php | 11 ++-------
 library/Icinga/Data/Db/DbQuery.php      |  5 +---
 library/Icinga/Data/SimpleQuery.php     | 31 ++++++++++++++++++++-----
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php
index 9960fd491..6167a23db 100644
--- a/library/Icinga/Data/Db/DbConnection.php
+++ b/library/Icinga/Data/Db/DbConnection.php
@@ -6,7 +6,6 @@ namespace Icinga\Data\Db;
 use PDO;
 use Iterator;
 use Zend_Db;
-use Icinga\Application\Benchmark;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\Db\DbQuery;
 use Icinga\Data\Extensible;
@@ -233,10 +232,7 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible
      */
     public function fetchAll(DbQuery $query)
     {
-        Benchmark::measure('DB is fetching All');
-        $result = $this->dbAdapter->fetchAll($query->getSelectQuery());
-        Benchmark::measure('DB fetch done');
-        return $result;
+        return $this->dbAdapter->fetchAll($query->getSelectQuery());
     }
 
     /**
@@ -248,10 +244,7 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible
      */
     public function fetchRow(DbQuery $query)
     {
-        Benchmark::measure('DB is fetching row');
-        $result = $this->dbAdapter->fetchRow($query->getSelectQuery());
-        Benchmark::measure('DB row done');
-        return $result;
+        return $this->dbAdapter->fetchRow($query->getSelectQuery());
     }
 
     /**
diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index 1149fbeec..ee0128608 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -4,9 +4,7 @@
 namespace Icinga\Data\Db;
 
 use Icinga\Data\SimpleQuery;
-use Icinga\Application\Benchmark;
 use Icinga\Data\Filter\FilterChain;
-use Icinga\Data\Filter\FilterExpression;
 use Icinga\Data\Filter\FilterOr;
 use Icinga\Data\Filter\FilterAnd;
 use Icinga\Data\Filter\FilterNot;
@@ -296,10 +294,9 @@ class DbQuery extends SimpleQuery
     public function count()
     {
         if ($this->count === null) {
-            Benchmark::measure('DB is counting');
             $this->count = parent::count();
-            Benchmark::measure('DB finished count');
         }
+
         return $this->count;
     }
 
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index c2dd5c1d9..876e76b55 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -4,6 +4,7 @@
 namespace Icinga\Data;
 
 use IteratorAggregate;
+use Icinga\Application\Benchmark;
 use Icinga\Data\Filter\Filter;
 use Icinga\Exception\IcingaException;
 
@@ -357,7 +358,10 @@ class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
      */
     public function fetchAll()
     {
-        return $this->ds->fetchAll($this);
+        Benchmark::measure('Fetching all results started');
+        $results = $this->ds->fetchAll($this);
+        Benchmark::measure('Fetching all results finished');
+        return $results;
     }
 
     /**
@@ -367,7 +371,10 @@ class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
      */
     public function fetchRow()
     {
-        return $this->ds->fetchRow($this);
+        Benchmark::measure('Fetching one row started');
+        $row = $this->ds->fetchRow($this);
+        Benchmark::measure('Fetching one row finished');
+        return $row;
     }
 
     /**
@@ -379,7 +386,10 @@ class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
      */
     public function fetchColumn($columnIndex = 0)
     {
-        return $this->ds->fetchColumn($this, $columnIndex);
+        Benchmark::measure('Fetching one column started');
+        $values = $this->ds->fetchColumn($this, $columnIndex);
+        Benchmark::measure('Fetching one column finished');
+        return $values;
     }
 
     /**
@@ -389,7 +399,10 @@ class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
      */
     public function fetchOne()
     {
-        return $this->ds->fetchOne($this);
+        Benchmark::measure('Fetching one value started');
+        $value = $this->ds->fetchOne($this);
+        Benchmark::measure('Fetching one value finished');
+        return $value;
     }
 
     /**
@@ -401,7 +414,10 @@ class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
      */
     public function fetchPairs()
     {
-        return $this->ds->fetchPairs($this);
+        Benchmark::measure('Fetching pairs started');
+        $pairs = $this->ds->fetchPairs($this);
+        Benchmark::measure('Fetching pairs finished');
+        return $pairs;
     }
 
     /**
@@ -413,7 +429,10 @@ class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
     {
         $query = clone $this;
         $query->limit(0, 0);
-        return $this->ds->count($query);
+        Benchmark::measure('Counting all results started');
+        $count = $this->ds->count($query);
+        Benchmark::measure('Counting all results finished');
+        return $count;
     }
 
     /**

From cf989a0f7f51fb197bac9a92c72ba04b42cb0a94 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 19 May 2015 09:41:55 +0200
Subject: [PATCH 1587/2920] SimpleQuery: Implement interface Iterator to
 benchmark result iteration

---
 library/Icinga/Data/SimpleQuery.php | 81 +++++++++++++++++++++++++----
 1 file changed, 70 insertions(+), 11 deletions(-)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 876e76b55..dd0a80d04 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -3,12 +3,13 @@
 
 namespace Icinga\Data;
 
+use Iterator;
 use IteratorAggregate;
 use Icinga\Application\Benchmark;
 use Icinga\Data\Filter\Filter;
 use Icinga\Exception\IcingaException;
 
-class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
+class SimpleQuery implements QueryInterface, Queryable, Iterator
 {
     /**
      * Query data source
@@ -17,6 +18,13 @@ class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
      */
     protected $ds;
 
+    /**
+     * This query's iterator
+     *
+     * @var Iterator
+     */
+    protected $iterator;
+
     /**
      * The target you are going to query
      *
@@ -100,16 +108,6 @@ class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
      */
     protected function init() {}
 
-    /**
-     * Return a iterable for this query's result
-     *
-     * @return  Iterator
-     */
-    public function getIterator()
-    {
-        return $this->ds->query($this);
-    }
-
     /**
      * Get the data source
      *
@@ -120,6 +118,67 @@ class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
         return $this->ds;
     }
 
+    /**
+     * Start or rewind the iteration
+     */
+    public function rewind()
+    {
+        if ($this->iterator === null) {
+            $iterator = $this->ds->query($this);
+            if ($iterator instanceof IteratorAggregate) {
+                $this->iterator = $iterator->getIterator();
+            } else {
+                $this->iterator = $iterator;
+            }
+        }
+
+        $this->iterator->rewind();
+        Benchmark::measure('Query result iteration started');
+    }
+
+    /**
+     * Fetch and return the current row of this query's result
+     *
+     * @return  object
+     */
+    public function current()
+    {
+        return $this->iterator->current();
+    }
+
+    /**
+     * Return whether the current row of this query's result is valid
+     *
+     * @return  bool
+     */
+    public function valid()
+    {
+        if (! $this->iterator->valid()) {
+            Benchmark::measure('Query result iteration finished');
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Return the key for the current row of this query's result
+     *
+     * @return  mixed
+     */
+    public function key()
+    {
+        return $this->iterator->key();
+    }
+
+    /**
+     * Advance to the next row of this query's result
+     */
+    public function next()
+    {
+        $this->iterator->next();
+    }
+
     /**
      * Choose a table and the columns you are interested in
      *

From f305a334d5ad2c293f984e77f8a98a6332ed4ebc Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 19 May 2015 09:48:20 +0200
Subject: [PATCH 1588/2920] DbConnection: Drop param $columnIndex in
 fetchColumn(), it's unused

---
 library/Icinga/Data/Db/DbConnection.php                |  5 ++---
 library/Icinga/Data/Fetchable.php                      |  6 ++----
 library/Icinga/Data/SimpleQuery.php                    |  8 +++-----
 library/Icinga/Repository/RepositoryQuery.php          | 10 ++++------
 .../library/Monitoring/DataView/DataView.php           |  8 +++-----
 5 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php
index 6167a23db..a7f933f88 100644
--- a/library/Icinga/Data/Db/DbConnection.php
+++ b/library/Icinga/Data/Db/DbConnection.php
@@ -248,14 +248,13 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible
     }
 
     /**
-     * Fetch a column of all rows of the result set as an array
+     * Fetch the first column of all rows of the result set as an array
      *
      * @param   DbQuery   $query
-     * @param   int         $columnIndex Index of the column to fetch
      *
      * @return  array
      */
-    public function fetchColumn(DbQuery $query, $columnIndex = 0)
+    public function fetchColumn(DbQuery $query)
     {
         return $this->dbAdapter->fetchCol($query->getSelectQuery());
     }
diff --git a/library/Icinga/Data/Fetchable.php b/library/Icinga/Data/Fetchable.php
index 0992be933..17ab7c359 100644
--- a/library/Icinga/Data/Fetchable.php
+++ b/library/Icinga/Data/Fetchable.php
@@ -23,13 +23,11 @@ interface Fetchable
     public function fetchRow();
 
     /**
-     * Fetch a column of all rows of the result set as an array
-     *
-     * @param   int $columnIndex Index of the column to fetch
+     * Fetch the first column of all rows of the result set as an array
      *
      * @return  array
      */
-    public function fetchColumn($columnIndex = 0);
+    public function fetchColumn();
 
     /**
      * Fetch the first column of the first row of the result set
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index dd0a80d04..7dec095d2 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -437,16 +437,14 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
     }
 
     /**
-     * Fetch a column of all rows of the result set as an array
-     *
-     * @param   int $columnIndex Index of the column to fetch
+     * Fetch the first column of all rows of the result set as an array
      *
      * @return  array
      */
-    public function fetchColumn($columnIndex = 0)
+    public function fetchColumn()
     {
         Benchmark::measure('Fetching one column started');
-        $values = $this->ds->fetchColumn($this, $columnIndex);
+        $values = $this->ds->fetchColumn($this);
         Benchmark::measure('Fetching one column finished');
         return $values;
     }
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index 91988605c..8a86829fd 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -420,23 +420,21 @@ class RepositoryQuery implements QueryInterface, Iterator
     }
 
     /**
-     * Fetch and return a column of all rows of the result set as an array
-     *
-     * @param   int     $columnIndex    Index of the column to fetch
+     * Fetch and return the first column of all rows of the result set as an array
      *
      * @return  array
      */
-    public function fetchColumn($columnIndex = 0)
+    public function fetchColumn()
     {
         if (! $this->hasOrder()) {
             $this->order();
         }
 
-        $results = $this->query->fetchColumn($columnIndex);
+        $results = $this->query->fetchColumn();
         if ($this->repository->providesValueConversion()) {
             $columns = $this->getColumns();
             $aliases = array_keys($columns);
-            $column = is_int($aliases[$columnIndex]) ? $columns[$columnIndex] : $aliases[$columnIndex];
+            $column = is_int($aliases[0]) ? $columns[0] : $aliases[0];
             foreach ($results as & $value) {
                 $value = $this->repository->retrieveColumn($column, $value);
             }
diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 442e1e7c2..a5d8fffe2 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -490,15 +490,13 @@ abstract class DataView implements QueryInterface, IteratorAggregate
     }
 
     /**
-     * Fetch a column of all rows of the result set as an array
-     *
-     * @param   int $columnIndex Index of the column to fetch
+     * Fetch the first column of all rows of the result set as an array
      *
      * @return  array
      */
-    public function fetchColumn($columnIndex = 0)
+    public function fetchColumn()
     {
-        return $this->getQuery()->fetchColumn($columnIndex);
+        return $this->getQuery()->fetchColumn();
     }
 
     /**

From bf8c4f1e9de161875950af59de2d1c46e482abef Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 09:55:21 +0200
Subject: [PATCH 1589/2920] Replace DateFormatter format constants w/ format
 functions

refs #6778
---
 library/Icinga/Date/DateFormatter.php | 289 +++++++++++++-------------
 1 file changed, 139 insertions(+), 150 deletions(-)

diff --git a/library/Icinga/Date/DateFormatter.php b/library/Icinga/Date/DateFormatter.php
index f89b936c2..bcea91ca1 100644
--- a/library/Icinga/Date/DateFormatter.php
+++ b/library/Icinga/Date/DateFormatter.php
@@ -4,7 +4,6 @@
 namespace Icinga\Date;
 
 use IntlDateFormatter;
-use InvalidArgumentException;
 
 /**
  * ICU date formatting
@@ -12,11 +11,11 @@ use InvalidArgumentException;
 class DateFormatter
 {
     /**
-     * Internal constant for relative time diffs
+     * Format relative
      *
      * @var int
      */
-    protected static $relative = 0;
+    const RELATIVE = 0;
 
     /**
      * Format time
@@ -40,67 +39,17 @@ class DateFormatter
     const DATETIME = 4;
 
     /**
-     * Format time diff as time ago
+     * Get the diff between the given time and the current time
      *
-     * @var int
-     */
-    const AGO = 8;
-
-    /**
-     * Format time diff as time until
+     * @param   int|float $time
      *
-     * @var int
+     * @return  array
      */
-    const UNTIL = 16;
-
-    /**
-     * Format time diff as time since
-     *
-     * @var int
-     */
-    const SINCE = 32;
-
-    /**
-     * Format used for the DateFormatter
-     *
-     * @var int
-     */
-    protected $format;
-
-    /**
-     * Create a date formatter
-     *
-     * @param int $format
-     */
-    public function __construct($format)
+    protected static function diff($time)
     {
-        $this->format = $format;
-    }
-
-    /**
-     * Create a date formatter
-     *
-     * @param   int $format
-     *
-     * @return  static
-     */
-    public static function create($format)
-    {
-        return new static($format);
-    }
-
-    /**
-     * Format the diff between two date/time values as a string
-     *
-     * @param   int|float   $time
-     * @param   int|float   $now
-     *
-     * @return  string              The formatted string
-     */
-    protected function diff($time, $now = null)
-    {
-        $now = $now === null ? time() : (float) $now;
         $invert = false;
+        $now = time();
+        $time = (float) $time;
         $diff = $time - $now;
         if ($diff < 0) {
             $diff = abs($diff);
@@ -113,7 +62,7 @@ class DateFormatter
         } else {
             $minutes = floor($diff / 60);
             if ($minutes < 60) {
-                $type = static::$relative;
+                $type = static::RELATIVE;
                 $formatted = sprintf('%dm %ds', $minutes, $diff % 60);
             } else {
                 $hours = floor($minutes / 60);
@@ -122,116 +71,156 @@ class DateFormatter
                     $fmt = new IntlDateFormatter(null, IntlDateFormatter::NONE, IntlDateFormatter::SHORT);
                     $formatted = $fmt->format($time);
                 } else {
-                    $type = static::$relative;
+                    $type = static::RELATIVE;
                     $formatted = sprintf('%dd %dh', floor($hours / 24), $hours % 24);
                 }
             }
         }
-        switch ($this->format) {
-            case static::AGO:
-                switch ($type) {
-                    case static::$relative:
-                        $formatted = sprintf(
-                            t('%s ago', 'An event that happened the given time interval ago'),
-                            $formatted
-                        );
-                        break;
-                    case static::TIME:
-                        $formatted = sprintf(t('at %s', 'An event happened at the given time'), $formatted);
-                        break;
-                    case static::DATE:
-                        // Move to next case
-                    case static::DATETIME:
-                        // TODO(el): Use own format string for date?
-                        $formatted = sprintf(
-                            t('on %s', 'An event happened on the given date or date and time'),
-                            $formatted
-                        );
-                        break;
-                }
+        return array($type, $formatted, $invert);
+    }
+
+    /**
+     * Format date
+     *
+     * @param   int|float time
+     *
+     * @return  string
+     */
+    public static function formatDate($time)
+    {
+        $fmt = new IntlDateFormatter(null, IntlDateFormatter::SHORT, IntlDateFormatter::NONE);
+        return $fmt->format((float) $time);
+    }
+
+    /**
+     * Format date and time
+     *
+     * @param   int|float time
+     *
+     * @return  string
+     */
+    public static function formatDateTime($time)
+    {
+        $fmt = new IntlDateFormatter(null, IntlDateFormatter::SHORT, IntlDateFormatter::SHORT);
+        return $fmt->format((float) $time);
+    }
+
+    /**
+     * Format time
+     *
+     * @param   int|float time
+     *
+     * @return  string
+     */
+    public static function formatTime($time)
+    {
+        $fmt = new IntlDateFormatter(null, IntlDateFormatter::NONE, IntlDateFormatter::SHORT);
+        return $fmt->format((float) $time);
+    }
+
+    /**
+     * Format time as time ago
+     *
+     * @param   int|float   $time
+     * @param   bool        $timeOnly
+     *
+     * @return  string
+     */
+    public static function timeAgo($time, $timeOnly = false)
+    {
+        list($type, $ago, $invert) = static::diff($time);
+        if ($timeOnly) {
+            return $ago;
+        }
+        switch ($type) {
+            case static::DATE:
+                // Move to next case
+            case static::DATETIME:
+                $formatted = sprintf(
+                    t('on %s', 'An event happened on the given date or date and time'),
+                    $ago
+                );
                 break;
-            case static::UNTIL:
-                switch ($type) {
-                    case static::$relative:
-                        $formatted = sprintf(
-                            t('in %s', 'An event will happen after the given time interval has elapsed'),
-                            $invert ? ('-' . $formatted) : $formatted
-                        );
-                        break;
-                    case static::TIME:
-                        $formatted = sprintf(t('at %s', 'An event will happen at the given time'), $formatted);
-                        break;
-                    case static::DATE:
-                        // Move to next case
-                    case static::DATETIME:
-                        // TODO(el): Use own format string for date?
-                        $formatted = sprintf(
-                            t('on %s', 'An event will happen on the given date or date and time'),
-                            $formatted
-                        );
-                        break;
-                }
+            case static::RELATIVE:
+                $formatted = sprintf(
+                    t('%s ago', 'An event that happened the given time interval ago'),
+                    $ago
+                );
                 break;
-            case static::SINCE;
-                switch ($type) {
-                    case static::$relative:
-                        $formatted = sprintf(
-                            t('for %s', 'A status is lasting for the given time interval'),
-                            $formatted
-                        );
-                        break;
-                    case static::TIME:
-                        // Move to next case
-                    case static::DATE:
-                        // Move to next case
-                    case static::DATETIME:
-                        // TODO(el): Use own format strings for time and date?
-                        $formatted = sprintf(
-                            t('since %s', 'A status is lasting since the given time, date or date and time'),
-                            $formatted
-                        );
-                        break;
-                }
-                break;
-            default:
+            case static::TIME:
+                $formatted = sprintf(t('at %s', 'An event happened at the given time'), $ago);
                 break;
         }
         return $formatted;
     }
 
     /**
-     * Format a date/time value as a string
+     * Format time as time since
      *
-     * @param   int|float   $time   Date/time to format
-     * @param   int|float   $now
+     * @param   int|float   $time
+     * @param   bool        $timeOnly
      *
-     * @return  string              The formatted string
+     * @return  string
      */
-    public function format($time, $now = null)
+    public static function timeSince($time, $timeOnly = false)
     {
-        $time = (float) $time;
-        switch ($this->format) {
+        list($type, $since, $invert) = static::diff($time);
+        if ($timeOnly) {
+            return $since;
+        }
+        switch ($type) {
+            case static::RELATIVE:
+                $formatted = sprintf(
+                    t('for %s', 'A status is lasting for the given time interval'),
+                    $since
+                );
+                break;
+            case static::DATE:
+                // Move to next case
+            case static::DATETIME:
+                // Move to next case
             case static::TIME:
-                $fmt = new IntlDateFormatter(null, IntlDateFormatter::NONE, IntlDateFormatter::SHORT);
-                $formatted = $fmt->format($time);
+                $formatted = sprintf(
+                    t('since %s', 'A status is lasting since the given time, date or date and time'),
+                    $since
+                );
                 break;
-            case static::DATE;
-                $fmt = new IntlDateFormatter(null, IntlDateFormatter::SHORT, IntlDateFormatter::NONE);
-                $formatted = $fmt->format($time);
-                break;
-            case static::DATETIME;
-                $fmt = new IntlDateFormatter(null, IntlDateFormatter::SHORT, IntlDateFormatter::SHORT);
-                $formatted = $fmt->format($time);
-                break;
-            case static::AGO:
+        }
+        return $formatted;
+    }
+
+    /**
+     * Format time as time until
+     *
+     * @param   int|float   $time
+     * @param   bool        $timeOnly
+     *
+     * @return  string
+     */
+    public static function timeUntil($time, $timeOnly = false)
+    {
+        list($type, $until, $invert) = static::diff($time);
+        if ($timeOnly) {
+            return $until;
+        }
+        switch ($type) {
+            case static::DATE:
                 // Move to next case
-            case static::UNTIL:
-                // Move to next case
-            case static::SINCE:
-                $formatted = $this->diff($time, $now);
+            case static::DATETIME:
+                $formatted = sprintf(
+                    t('on %s', 'An event will happen on the given date or date and time'),
+                    $until
+                );
+                break;
+            case static::RELATIVE:
+                $formatted = sprintf(
+                    t('in %s', 'An event will happen after the given time interval has elapsed'),
+                    $invert ? ('-' . $until) : $until
+                );
+                break;
+            case static::TIME:
+                $formatted = sprintf(t('at %s', 'An event will happen at the given time'), $until);
                 break;
-            default:
-                throw new InvalidArgumentException('Invalid format');
         }
         return $formatted;
     }

From 9477fdcea405eef67b8fdb2d55ea0486d69de04f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 09:56:20 +0200
Subject: [PATCH 1590/2920] Use DateFormatter's format functions in the format
 view helper

refs #6778
---
 library/Icinga/Web/View/helpers/format.php | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php
index 6011c954f..4bada25ed 100644
--- a/library/Icinga/Web/View/helpers/format.php
+++ b/library/Icinga/Web/View/helpers/format.php
@@ -3,43 +3,43 @@
 
 namespace Icinga\Web\View;
 
-use Icinga\Web\Url;
+use Icinga\Date\DateFormatter;
 use Icinga\Util\Format;
 
 $this->addHelperFunction('format', function () {
     return Format::getInstance();
 });
 
-$this->addHelperFunction('timeAgo', function ($timestamp) {
-    if (! $timestamp) {
+$this->addHelperFunction('timeAgo', function ($time, $timeOnly = false) {
+    if (! $time) {
         return '';
     }
     return sprintf(
         '<span class="time-ago" title="%s">%s</span>',
-        date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
-        Format::timeAgo($timestamp)
+        date('Y-m-d H:i:s', $time), // TODO: internationalized format
+        DateFormatter::timeAgo($time, $timeOnly)
     );
 });
 
-$this->addHelperFunction('timeSince', function ($timestamp) {
-    if (! $timestamp) {
+$this->addHelperFunction('timeSince', function ($time, $timeOnly = false) {
+    if (! $time) {
         return '';
     }
     return sprintf(
         '<span class="time-since" title="%s">%s</span>',
-        date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
-        Format::timeSince($timestamp)
+        date('Y-m-d H:i:s', $time), // TODO: internationalized format
+        DateFormatter::timeSince($time, $timeOnly)
     );
 });
 
-$this->addHelperFunction('timeUntil', function ($timestamp) {
-    if (! $timestamp) {
+$this->addHelperFunction('timeUntil', function ($time, $timeOnly = false) {
+    if (! $time) {
         return '';
     }
     return sprintf(
         '<span class="time-until" title="%s">%s</span>',
-        date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
-        Format::timeUntil($timestamp)
+        date('Y-m-d H:i:s', $time), // TODO: internationalized format
+        DateFormatter::timeUntil($time, $timeOnly)
     );
 });
 

From 2eb93d0309a17e826a56b327032515de0cf15126 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 09:56:48 +0200
Subject: [PATCH 1591/2920] Remove time formatting functions from the format
 util

The DateFormatter class now has these functions.

refs #6778
---
 library/Icinga/Util/Format.php | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/library/Icinga/Util/Format.php b/library/Icinga/Util/Format.php
index f6e64def3..696b34b7e 100644
--- a/library/Icinga/Util/Format.php
+++ b/library/Icinga/Util/Format.php
@@ -113,33 +113,6 @@ class Format
         return $prefix . self::showHourMin(abs($diff), $includePrefix);
     }
 
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Date\DateFormatter::timeAgo() For the method description.
-     */
-    public static function timeAgo($time)
-    {
-        return DateFormatter::create(DateFormatter::AGO)->format($time);
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Date\DateFormatter::timeUntil() For the method description.
-     */
-    public static function timeUntil($time)
-    {
-        return DateFormatter::create(DateFormatter::UNTIL)->format($time);
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see \Icinga\Date\DateFormatter::timeSince() For the method description.
-     */
-    public static function timeSince($time)
-    {
-        return DateFormatter::create(DateFormatter::SINCE)->format($time);
-    }
-
     protected static function formatForUnits($value, & $units, $base)
     {
         $sign = '';

From 3fdf1d2a5c73fb539931e133cf323153efafec02 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 09:57:46 +0200
Subject: [PATCH 1592/2920] Use timeAgo in the event history overview

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

diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index b76b5a796..03a03557c 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -94,7 +94,7 @@ use Icinga\Module\Monitoring\Object\Service;
         <td class="state">
           <strong><?= $this->escape($title); ?></strong>
           <br>
-          <?= date('d.m. H:i', $event->timestamp); ?>
+          <?= $this->timeAgo($event->timestamp); ?>
         </td>
         <td>
         <?php if ($isService): ?>

From 7212c038f17f4b8c134234ca77d97d6226283cc3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 10:00:27 +0200
Subject: [PATCH 1593/2920] Don't show ago, since, ... for monitoring list
 views in the dashboard

refs #6778
---
 .../monitoring/application/views/scripts/list/comments.phtml    | 2 +-
 .../monitoring/application/views/scripts/list/downtimes.phtml   | 2 +-
 .../application/views/scripts/list/eventhistory.phtml           | 2 +-
 modules/monitoring/application/views/scripts/list/hosts.phtml   | 2 +-
 .../application/views/scripts/list/notifications.phtml          | 2 +-
 .../monitoring/application/views/scripts/list/services.phtml    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index d74405f59..4a315a8a8 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -48,7 +48,7 @@
           <br>
           <strong><?= $this->escape($title); ?></strong>
           <br>
-          <?= $this->timeAgo($comment->timestamp); ?>
+          <?= $this->timeAgo($comment->timestamp, $this->compact); ?>
         </td>
         <td>
         <?php if ($comment->objecttype === 'service'): ?>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 0c1352aa5..25d68b459 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -42,7 +42,7 @@ use Icinga\Module\Monitoring\Object\Service;
         <td class="state">
           <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
           <br>
-          <?= $downtime->is_in_effect ? $this->timeSince($downtime->start) : $this->timeUntil($downtime->start) ?>
+          <?= $downtime->is_in_effect ? $this->timeSince($downtime->start, $this->compact) : $this->timeUntil($downtime->start, $this->compact) ?>
         </td>
         <td>
         <?php if ($isService): ?>
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 03a03557c..1f09f80d7 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -94,7 +94,7 @@ use Icinga\Module\Monitoring\Object\Service;
         <td class="state">
           <strong><?= $this->escape($title); ?></strong>
           <br>
-          <?= $this->timeAgo($event->timestamp); ?>
+          <?= $this->timeAgo($event->timestamp, $this->compact); ?>
         </td>
         <td>
         <?php if ($isService): ?>
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 0448fb269..09b58cfa3 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -83,7 +83,7 @@ if ($hosts->count() === 0) {
         <strong><?= Host::getStateText($host->host_state, true); ?></strong>
         <?php if ((int) $host->host_state !== 99): ?>
           <br />
-          <?= $this->timeSince($host->host_last_state_change) ?>
+          <?= $this->timeSince($host->host_last_state_change, $this->compact) ?>
           <?php if ((int) $host->host_state > 0 && (int) $host->host_state_type === 0): ?>
             <br />
             <strong>Soft <?= $host->host_attempt ?></strong>
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index a037aca25..c934f674b 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -34,7 +34,7 @@ use Icinga\Module\Monitoring\Object\Service;
     ?>
         <tr class="state <?= $stateName ?>">
             <td class="state">
-                <?= $this->timeAgo($notification->notification_start_time) ?>
+                <?= $this->timeAgo($notification->notification_start_time, $this->compact) ?>
             </td>
             <td style="font-size: 0.8em">
                 <?php if ($isService): ?>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 38391bfc0..d6dd14815 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -59,7 +59,7 @@ foreach ($services as $service):
         <strong><?= Service::getStateText($service->service_state, true); ?></strong>
         <?php if ((int) $service->service_state !== 99): ?>
           <br />
-          <?= $this->timeSince($service->service_last_state_change) ?>
+          <?= $this->timeSince($service->service_last_state_change, $this->compact) ?>
           <?php if ((int) $service->service_state > 0 && (int) $service->service_state_type === 0): ?>
             <br />
             <strong>Soft <?= $service->service_attempt ?></strong>

From 1301b775473c3c9b5a727ee6d41c0cfdfe3fabc7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 10:04:17 +0200
Subject: [PATCH 1594/2920] Use DateFormatter::formatDate() for formatting the
 date and time tooltip in the format view helper

refs #6678
---
 library/Icinga/Web/View/helpers/format.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php
index 4bada25ed..0e798f877 100644
--- a/library/Icinga/Web/View/helpers/format.php
+++ b/library/Icinga/Web/View/helpers/format.php
@@ -16,7 +16,7 @@ $this->addHelperFunction('timeAgo', function ($time, $timeOnly = false) {
     }
     return sprintf(
         '<span class="time-ago" title="%s">%s</span>',
-        date('Y-m-d H:i:s', $time), // TODO: internationalized format
+        DateFormatter::formatDate($time),
         DateFormatter::timeAgo($time, $timeOnly)
     );
 });
@@ -27,7 +27,7 @@ $this->addHelperFunction('timeSince', function ($time, $timeOnly = false) {
     }
     return sprintf(
         '<span class="time-since" title="%s">%s</span>',
-        date('Y-m-d H:i:s', $time), // TODO: internationalized format
+        DateFormatter::formatDate($time),
         DateFormatter::timeSince($time, $timeOnly)
     );
 });
@@ -38,7 +38,7 @@ $this->addHelperFunction('timeUntil', function ($time, $timeOnly = false) {
     }
     return sprintf(
         '<span class="time-until" title="%s">%s</span>',
-        date('Y-m-d H:i:s', $time), // TODO: internationalized format
+        DateFormatter::formatDate($time),
         DateFormatter::timeUntil($time, $timeOnly)
     );
 });

From a66cb907ae8fb83ef41e9920de8798d4f86fe58b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 10:06:19 +0200
Subject: [PATCH 1595/2920] Remove dateTimeRenderer view helper

The helper is no longer used anywhere.

refs #6778
---
 library/Icinga/Web/View/helpers/format.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php
index 0e798f877..33aeb86a1 100644
--- a/library/Icinga/Web/View/helpers/format.php
+++ b/library/Icinga/Web/View/helpers/format.php
@@ -42,7 +42,3 @@ $this->addHelperFunction('timeUntil', function ($time, $timeOnly = false) {
         DateFormatter::timeUntil($time, $timeOnly)
     );
 });
-
-$this->addHelperFunction('dateTimeRenderer', function ($dateTimeOrTimestamp, $future = false) {
-    return DateTimeRenderer::create($dateTimeOrTimestamp, $future);
-});

From d53c3d7075763e5f95df4eca27a76d431c9c791f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 10:10:23 +0200
Subject: [PATCH 1596/2920] Add view helper functions for formatting, date,
 date and time, and time

refs #6778
---
 library/Icinga/Web/View/helpers/format.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php
index 33aeb86a1..115f13424 100644
--- a/library/Icinga/Web/View/helpers/format.php
+++ b/library/Icinga/Web/View/helpers/format.php
@@ -10,6 +10,27 @@ $this->addHelperFunction('format', function () {
     return Format::getInstance();
 });
 
+$this->addHelperFunction('formatDate', function ($date) {
+    if (! $date) {
+        return '';
+    }
+    return DateFormatter::formatDate($date);
+});
+
+$this->addHelperFunction('formatDateTime', function ($dateTime) {
+    if (! $dateTime) {
+        return '';
+    }
+    return DateFormatter::formatDateTime($dateTime);
+});
+
+$this->addHelperFunction('formatTime', function ($time) {
+    if (! $time) {
+        return '';
+    }
+    return DateFormatter::formatTime($time);
+});
+
 $this->addHelperFunction('timeAgo', function ($time, $timeOnly = false) {
     if (! $time) {
         return '';

From 8f40d76cca75ad7e195e117f8661f7d1a2da2df8 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 10:11:12 +0200
Subject: [PATCH 1597/2920] Use date format view helper function in the event
 grid

I'm about to drop the DateFormat view helper class.

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

diff --git a/modules/monitoring/application/views/scripts/list/eventgrid.phtml b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
index 1af75caf9..be327623a 100644
--- a/modules/monitoring/application/views/scripts/list/eventgrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
@@ -74,7 +74,7 @@ foreach ($summary as $entry) {
     $caption = sprintf(
         $settings[$column]['tooltip'],
         $value,
-        $this->dateFormat()->formatDate(strtotime($day))
+        $this->formatDate(strtotime($day))
     );
     $linkFilter = Filter::matchAll(
         Filter::expression('timestamp', '<', strtotime($day . ' 23:59:59')),

From d539a0e0174143471afa73dbd9f802281e67224b Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 19 May 2015 10:11:54 +0200
Subject: [PATCH 1598/2920] Add PHPDoc to ::addColumns()

refs #4498
---
 .../monitoring/application/controllers/ListController.php   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 5be9fcd09..0ab1192f7 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -644,6 +644,12 @@ class Monitoring_ListController extends Controller
         return $query;
     }
 
+    /**
+     * Get columns to be added from URL parameter 'addColumns'
+     * and assign to $this->view->addColumns (as array)
+     *
+     * @return array
+     */
     protected function addColumns()
     {
         $columns = preg_split(

From 979f16e5f65bc08d1e7ca0a19fb6b25312c26682 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 10:13:58 +0200
Subject: [PATCH 1599/2920] Use date and time format view helper function in
 the monitoring health view

I'm about to drop the DateFormat view helper class.

refs #6778
---
 modules/monitoring/application/views/scripts/process/info.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml
index 0493fa6ed..04fe93c85 100644
--- a/modules/monitoring/application/views/scripts/process/info.phtml
+++ b/modules/monitoring/application/views/scripts/process/info.phtml
@@ -21,7 +21,7 @@ $cp = $this->checkPerformance()->create($this->checkperformance);
                 <tbody>
                 <tr>
                     <th><?= $this->translate('Program Start Time') ?></th>
-                    <td><?= $this->dateFormat()->formatDateTime($this->programStatus->program_start_time) ?></td>
+                    <td><?= $this->formatDateTime($this->programStatus->program_start_time) ?></td>
                 </tr>
                 <tr>
                     <th><?= $this->translate('Last Status Update'); ?></th>

From e46af792293815030fc34b725c3785f130891e8b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 10:14:35 +0200
Subject: [PATCH 1600/2920] Drop the DateFormat view helper class

The view helper class is no longer in use.

refs #6778
---
 application/views/helpers/DateFormat.php | 133 -----------------------
 1 file changed, 133 deletions(-)
 delete mode 100644 application/views/helpers/DateFormat.php

diff --git a/application/views/helpers/DateFormat.php b/application/views/helpers/DateFormat.php
deleted file mode 100644
index 6df8c32bb..000000000
--- a/application/views/helpers/DateFormat.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-use Icinga\Application\Icinga;
-use Icinga\Util\DateTimeFactory;
-
-/**
- * Helper to format date and time. Utilizes DateTimeFactory to ensure time zone awareness
- *
- * @see DateTimeFactory::create()
- */
-class Zend_View_Helper_DateFormat extends Zend_View_Helper_Abstract
-{
-    /**
-     * Current request
-     *
-     * @var Zend_Controller_Request_Abstract
-     */
-    protected $request;
-
-    /**
-     * Constructor
-     *
-     * Retrieves the request from the application's front controller if not given.
-     *
-     * @param Zend_Controller_Request_Abstract  $request    The request to use
-     */
-    public function __construct(Zend_Controller_Request_Abstract $request = null)
-    {
-        if ($request === null) {
-            $this->request = Icinga::app()->getFrontController()->getRequest();
-        } else {
-            $this->request = $request;
-        }
-    }
-
-    /**
-     * Helper entry point
-     *
-     * @return  $this
-     */
-    public function dateFormat()
-    {
-        return $this;
-    }
-
-    /**
-     * Return date formatted according to given format respecting the user's timezone
-     *
-     * @param   int     $timestamp
-     * @param   string  $format
-     *
-     * @return  string
-     */
-    public function format($timestamp, $format)
-    {
-        $dt = DateTimeFactory::create();
-        if (DateTimeFactory::isUnixTimestamp($timestamp)) {
-            $dt->setTimestamp($timestamp);
-        } else {
-            return $timestamp;
-        }
-
-        return $dt->format($format);
-    }
-
-    /**
-     * Format date according to user's format
-     *
-     * @param   int     $timestamp  A unix timestamp
-     *
-     * @return  string  The formatted date string
-     */
-    public function formatDate($timestamp)
-    {
-        return $this->format($timestamp, $this->getDateFormat());
-    }
-
-    /**
-     * Format time according to user's format
-     *
-     * @param   int     $timestamp  A unix timestamp
-     *
-     * @return  string  The formatted time string
-     */
-    public function formatTime($timestamp)
-    {
-        return $this->format($timestamp, $this->getTimeFormat());
-    }
-
-    /**
-     * Format datetime according to user's format
-     *
-     * @param   int     $timestamp  A unix timestamp
-     * @return  string  The formatted datetime string
-     */
-    public function formatDateTime($timestamp)
-    {
-        return $this->format($timestamp, $this->getDateTimeFormat());
-    }
-
-    /**
-     * Retrieve the user's date format string
-     *
-     * @return  string
-     */
-    public function getDateFormat()
-    {
-        // TODO(mh): Missing localized format (#6077)
-        return 'd/m/Y';
-    }
-
-    /**
-     * Retrieve the user's time format string
-     *
-     * @return  string
-     */
-    public function getTimeFormat()
-    {
-        // TODO(mh): Missing localized format (#6077)
-        return 'g:i A';
-    }
-
-    /**
-     * Retrieve the user's datetime format string
-     *
-     * @return  string
-     */
-    public function getDateTimeFormat()
-    {
-        return $this->getDateFormat() . ' ' . $this->getTimeFormat();
-    }
-}

From e87067db3b8a171cc7e222eb3c71857980026795 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 11:10:35 +0200
Subject: [PATCH 1601/2920] lib/chart: Use PHP's DateTime instead of our
 DateTimeFactory

I'm about to drop the DateTimeFactory because date_default_timezone_set() in combination w/ PHP's DateTime is sufficient.

refs #6778
---
 library/Icinga/Chart/Unit/CalendarUnit.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Chart/Unit/CalendarUnit.php b/library/Icinga/Chart/Unit/CalendarUnit.php
index 5f4c6979c..0b0fe834f 100644
--- a/library/Icinga/Chart/Unit/CalendarUnit.php
+++ b/library/Icinga/Chart/Unit/CalendarUnit.php
@@ -4,7 +4,7 @@
 
 namespace Icinga\Chart\Unit;
 
-use Icinga\Util\DateTimeFactory;
+use DateTime;
 
 /**
  * Calendar Axis Unit that transforms timestamps into user-readable values
@@ -81,7 +81,7 @@ class CalendarUnit extends LinearUnit
      */
     private function calculateLabels($unit)
     {
-        $fac = DateTimeFactory::create();
+        $fac = new DateTime();
 
         $duration = $this->getMax() - $this->getMin();
 

From 1ce9900c8675cbd5b818dcf3d16993996e069236 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 19 May 2015 11:11:43 +0200
Subject: [PATCH 1602/2920] Add PHPDoc to ::setSearchColumns()

---
 library/Icinga/Web/Widget/FilterEditor.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index a362d1014..83f5f2955 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -76,6 +76,11 @@ class FilterEditor extends AbstractWidget
         return $this->filter;
     }
 
+    /**
+     * Set columns to search in
+     *
+     * @param array $searchColumns
+     */
     public function setSearchColumns(array $searchColumns)
     {
         $this->searchColumns = $searchColumns;

From 5cf8e2504e6f5cd00116c0df55b578cd9185b6a0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 11:14:41 +0200
Subject: [PATCH 1603/2920] lib/grid: Use PHP's DateTime instead of our
 DateTimeFactory

I'm about to drop the DateTimeFactory because date_default_timezone_set() in combination w/ PHP's DateTime is sufficient.

refs #6778
---
 library/Icinga/Web/Widget/Chart/HistoryColorGrid.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
index d1c9a677f..efaa02a5b 100644
--- a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
+++ b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
@@ -3,10 +3,10 @@
 
 namespace Icinga\Web\Widget\Chart;
 
-use Icinga\Util\DateTimeFactory;
+use DateInterval;
+use DateTime;
 use Icinga\Util\Color;
 use Icinga\Web\Widget\AbstractWidget;
-use DateInterval;
 
 /**
  * Display a colored grid that visualizes a set of values for each day
@@ -312,7 +312,7 @@ class HistoryColorGrid extends AbstractWidget {
     private function monthName($month, $year)
     {
         // TODO: find a way to render years without messing up the layout
-        $dt = DateTimeFactory::create($year . '-' . $month . '-01');
+        $dt = new DateTime($year . '-' . $month . '-01');
         return $dt->format('M');
     }
 
@@ -323,7 +323,7 @@ class HistoryColorGrid extends AbstractWidget {
      */
     private function weekdayName($weekday)
     {
-        $sun = DateTimeFactory::create('last Sunday');
+        $sun = new DateTime('last Sunday');
         $interval = new DateInterval('P' .  $weekday . 'D');
         $sun->add($interval);
         return substr($sun->format('D'), 0, 2);

From b5a0f7950e1c7e0e148168a9a7246a8deef603cc Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 11:17:00 +0200
Subject: [PATCH 1604/2920] Use PHP's DateTime instead of our DateTimeFactory
 in the TimeLineController

I'm about to drop the DateTimeFactory because date_default_timezone_set() in combination w/ PHP's DateTime is sufficient.

refs #6778
---
 .../application/controllers/TimelineController.php           | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php
index f1ef32592..78b2ad100 100644
--- a/modules/monitoring/application/controllers/TimelineController.php
+++ b/modules/monitoring/application/controllers/TimelineController.php
@@ -1,11 +1,8 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \DateTime;
-use \DateInterval;
 use Icinga\Web\Url;
 use Icinga\Util\Format;
-use Icinga\Util\DateTimeFactory;
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\Timeline\TimeLine;
 use Icinga\Module\Monitoring\Timeline\TimeRange;
@@ -233,7 +230,7 @@ class Monitoring_TimelineController extends Controller
      */
     private function buildTimeRanges()
     {
-        $startTime = DateTimeFactory::create();
+        $startTime = new DateTime();
         $startParam = $this->_request->getParam('start');
         $startTimestamp = is_numeric($startParam) ? intval($startParam) : strtotime($startParam);
         if ($startTimestamp !== false) {

From ab7c529094dc8c43eebe9f7ab812139ce7b77cc9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 11:22:23 +0200
Subject: [PATCH 1605/2920] Show the expected input format if a date-and-time
 input is not valid

refs #6778
---
 library/Icinga/Web/Form/Validator/DateTimeValidator.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Form/Validator/DateTimeValidator.php b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
index 576ed36f8..c0abfc481 100644
--- a/library/Icinga/Web/Form/Validator/DateTimeValidator.php
+++ b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
@@ -5,7 +5,6 @@ namespace Icinga\Web\Form\Validator;
 
 use DateTime;
 use Zend_Validate_Abstract;
-use Icinga\Util\DateTimeFactory;
 
 /**
  * Validator for date-and-time input controls
@@ -68,7 +67,7 @@ class DateTimeValidator extends Zend_Validate_Abstract
             }
 
             if ($dateTime === false || $dateTime->format($format) !== $value) {
-                $this->_error(self::INVALID_DATETIME_FORMAT, DateTimeFactory::create()->format($baseFormat));
+                $this->_error(self::INVALID_DATETIME_FORMAT, $baseFormat);
                 return false;
             }
         }

From ba258524a8bb0ad5e3a00a451079aa9e686cbcc3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 11:23:50 +0200
Subject: [PATCH 1606/2920] Don't setup the DateTimeFactory when bootstrapping
 Icinga Web 2

DateTimeFactory will be removed soon.

refs #6778
---
 library/Icinga/Application/ApplicationBootstrap.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 070edb0cb..e265b91ee 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -12,7 +12,6 @@ use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;
 use Icinga\Exception\NotReadableError;
 use Icinga\Application\Logger;
-use Icinga\Util\DateTimeFactory;
 use Icinga\Util\Translator;
 use Icinga\Exception\IcingaException;
 
@@ -568,7 +567,6 @@ abstract class ApplicationBootstrap
                 date_default_timezone_set($timezone);
             }
         }
-        DateTimeFactory::setConfig(array('timezone' => $timezone));
         return $this;
     }
 

From 1d6ef5ec3a521dcd53e0675f0d8f81eec0e1436e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 11:25:06 +0200
Subject: [PATCH 1607/2920] Don't setup the DateTimeFactory in our tests

DateTimeFactory will be removed soon.

refs #6778
---
 library/Icinga/Test/BaseTestCase.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/library/Icinga/Test/BaseTestCase.php b/library/Icinga/Test/BaseTestCase.php
index 542c493f1..9fdc72a57 100644
--- a/library/Icinga/Test/BaseTestCase.php
+++ b/library/Icinga/Test/BaseTestCase.php
@@ -25,7 +25,6 @@ namespace Icinga\Test {
     use Mockery;
     use PHPUnit_Framework_TestCase;
     use Icinga\Application\Icinga;
-    use Icinga\Util\DateTimeFactory;
     use Icinga\Data\ConfigObject;
     use Icinga\Data\ResourceFactory;
     use Icinga\Data\Db\DbConnection;
@@ -104,12 +103,11 @@ namespace Icinga\Test {
         );
 
         /**
-         * Setup the default timezone and pass it to DateTimeFactory::setConfig
+         * Setup the default timezone
          */
         public static function setupTimezone()
         {
             date_default_timezone_set('UTC');
-            DateTimeFactory::setConfig(array('timezone' => 'UTC'));
         }
 
         /**

From 603dcbde926a65f10e562b710dc9e391ea42341c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 11:25:32 +0200
Subject: [PATCH 1608/2920] Drop the DateTimeFactory

refs #6778
---
 library/Icinga/Util/DateTimeFactory.php | 92 -------------------------
 1 file changed, 92 deletions(-)
 delete mode 100644 library/Icinga/Util/DateTimeFactory.php

diff --git a/library/Icinga/Util/DateTimeFactory.php b/library/Icinga/Util/DateTimeFactory.php
deleted file mode 100644
index 3a532552b..000000000
--- a/library/Icinga/Util/DateTimeFactory.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\Util;
-
-use Exception;
-use DateTime;
-use DateTimeZone;
-use Icinga\Util\ConfigAwareFactory;
-use Icinga\Exception\ConfigurationError;
-
-/**
- * Factory for time zone aware DateTime objects
- */
-class DateTimeFactory implements ConfigAwareFactory
-{
-    /**
-     * Time zone used throughout DateTime object creation
-     *
-     * @var DateTimeZone
-     */
-    protected static $timeZone;
-
-    /**
-     * Set the factory's config
-     *
-     * Set the factory's time zone via key timezone in the given config array
-     *
-     * @param   array               $config     An array with key 'timezone'
-     *
-     * @throws  ConfigurationError              if the given array misses the key 'timezone'
-     */
-    public static function setConfig($config)
-    {
-        try {
-            $tz = new DateTimeZone(isset($config['timezone']) ? $config['timezone'] : '');
-        } catch (Exception $e) {
-            throw new ConfigurationError('"DateTimeFactory" expects a valid time zone be set via "setConfig"');
-        }
-
-        self::$timeZone = $tz;
-    }
-
-    /**
-     * Return new DateTime object using the given format, time and set timezone
-     *
-     * Wraps DateTime::createFromFormat()
-     *
-     * @param   string          $format
-     * @param   string          $time
-     * @param   DateTimeZone    $timeZone
-     *
-     * @return  DateTime
-     *
-     * @see     DateTime::createFromFormat()
-     */
-    public static function parse($time, $format, DateTimeZone $timeZone = null)
-    {
-        return DateTime::createFromFormat($format, $time, $timeZone !== null ? $timeZone : self::$timeZone);
-    }
-
-    /**
-     * Return new DateTime object using the given date/time string and set time zone
-     *
-     * Wraps DateTime::__construct()
-     *
-     * @param   string          $time
-     * @param   DateTimeZone    $timeZone
-     *
-     * @return  DateTime
-     *
-     * @see     DateTime::__construct()
-     */
-    public static function create($time = 'now', DateTimeZone $timeZone = null)
-    {
-        return new DateTime($time, $timeZone !== null ? $timeZone : self::$timeZone);
-    }
-
-    /**
-     * Check whether a variable is a Unix timestamp
-     *
-     * @param   mixed $timestamp
-     *
-     * @return  bool
-     */
-    public static function isUnixTimestamp($timestamp)
-    {
-        return (is_int($timestamp) || ctype_digit($timestamp))
-        && ($timestamp <= PHP_INT_MAX)
-        && ($timestamp >= ~PHP_INT_MAX);
-    }
-}

From f028c74a5edca47cf3fd04860fb7cb99fde903db Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 11:25:54 +0200
Subject: [PATCH 1609/2920] Improve parameter names for the date formatting
 functions

refs #6778
---
 library/Icinga/Date/DateFormatter.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/Date/DateFormatter.php b/library/Icinga/Date/DateFormatter.php
index bcea91ca1..4e7d2e15f 100644
--- a/library/Icinga/Date/DateFormatter.php
+++ b/library/Icinga/Date/DateFormatter.php
@@ -82,33 +82,33 @@ class DateFormatter
     /**
      * Format date
      *
-     * @param   int|float time
+     * @param   int|float $date
      *
      * @return  string
      */
-    public static function formatDate($time)
+    public static function formatDate($date)
     {
         $fmt = new IntlDateFormatter(null, IntlDateFormatter::SHORT, IntlDateFormatter::NONE);
-        return $fmt->format((float) $time);
+        return $fmt->format((float) $date);
     }
 
     /**
      * Format date and time
      *
-     * @param   int|float time
+     * @param   int|float $dateTime
      *
      * @return  string
      */
-    public static function formatDateTime($time)
+    public static function formatDateTime($dateTime)
     {
         $fmt = new IntlDateFormatter(null, IntlDateFormatter::SHORT, IntlDateFormatter::SHORT);
-        return $fmt->format((float) $time);
+        return $fmt->format((float) $dateTime);
     }
 
     /**
      * Format time
      *
-     * @param   int|float time
+     * @param   int|float $time
      *
      * @return  string
      */

From 15b2e873b2a0528d2d994f2b174dc37ff2582717 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 11:27:56 +0200
Subject: [PATCH 1610/2920] Drop the DateTimeFactoryTest

refs #6778
---
 .../Icinga/Util/DateTimeFactoryTest.php       | 69 -------------------
 1 file changed, 69 deletions(-)
 delete mode 100644 test/php/library/Icinga/Util/DateTimeFactoryTest.php

diff --git a/test/php/library/Icinga/Util/DateTimeFactoryTest.php b/test/php/library/Icinga/Util/DateTimeFactoryTest.php
deleted file mode 100644
index 2e8e097eb..000000000
--- a/test/php/library/Icinga/Util/DateTimeFactoryTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Tests\Icinga\Util;
-
-use DateTimeZone;
-use Icinga\Test\BaseTestCase;
-use Icinga\Util\DateTimeFactory;
-
-class DateTimeFactoryTest extends BaseTestCase
-{
-    /**
-     * @expectedException Icinga\Exception\ConfigurationError
-     */
-    public function testWhetherSetConfigThrowsAnExceptionWhenTimezoneMissing()
-    {
-        DateTimeFactory::setConfig(array());
-    }
-
-    /**
-     * @expectedException Icinga\Exception\ConfigurationError
-     */
-    public function testWhetherSetConfigThrowsAnExceptionWhenTimezoneInvalid()
-    {
-        DateTimeFactory::setConfig(array('timezone' => 'invalid'));
-    }
-
-    public function testWhetherParseWorksWithASpecificTimezone()
-    {
-        $dt = DateTimeFactory::parse('17-04-14 17:00', 'd-m-y H:i', new DateTimeZone('Europe/Berlin'));
-        $dt->setTimezone(new DateTimeZone('UTC'));
-
-        $this->assertEquals(
-            '15',
-            $dt->format('H'),
-            'DateTimeFactory::parse does not properly parse a given datetime or does not respect the given timezone'
-        );
-    }
-
-    public function testWhetherParseWorksWithoutASpecificTimezone()
-    {
-        $this->assertEquals(
-            '15',
-            DateTimeFactory::parse('17-04-14 15:00', 'd-m-y H:i')->format('H'),
-            'DateTimeFactory::parse does not properly parse a given datetime'
-        );
-    }
-
-    public function testWhetherCreateWorksWithASpecificTimezone()
-    {
-        $dt = DateTimeFactory::create('2014-04-17 5PM', new DateTimeZone('Europe/Berlin'));
-        $dt->setTimezone(new DateTimeZone('UTC'));
-
-        $this->assertEquals(
-            '15',
-            $dt->format('H'),
-            'DateTimeFactory::create does not properly parse a given datetime or does not respect the given timezone'
-        );
-    }
-
-    public function testWhetherCreateWorksWithoutASpecificTimezone()
-    {
-        $this->assertEquals(
-            '15',
-            DateTimeFactory::create('2014-04-17 3PM')->format('H'),
-            'DateTimeFactory::create does not properly parse a given datetime'
-        );
-    }
-}

From f968984feb77f540656790a335e882cef1c9a036 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 12:46:08 +0200
Subject: [PATCH 1611/2920] Drop the DateTimeRenderer

refs #6778
---
 library/Icinga/Web/View/DateTimeRenderer.php | 204 -------------------
 1 file changed, 204 deletions(-)
 delete mode 100644 library/Icinga/Web/View/DateTimeRenderer.php

diff --git a/library/Icinga/Web/View/DateTimeRenderer.php b/library/Icinga/Web/View/DateTimeRenderer.php
deleted file mode 100644
index 058f07ad8..000000000
--- a/library/Icinga/Web/View/DateTimeRenderer.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\Web\View;
-
-use DateTime;
-
-class DateTimeRenderer
-{
-    const TYPE_DATETIME = 0;
-    const TYPE_TIME = 1;
-    const TYPE_TIMESPAN = 2;
-
-    const HOUR = 3600;
-
-    /**
-     * The present DateTime
-     *
-     * @var DateTime
-     */
-    protected $now;
-
-    /**
-     * The DateTime tense
-     *
-     * @var bool
-     */
-    protected $future;
-
-    /**
-     * The given DateTime type
-     *
-     * @var integer
-     */
-    protected $type;
-
-    /**
-     * The given DateTime
-     *
-     * @var DateTime
-     */
-    protected $dateTime;
-
-    public function __construct($dateTime, $future = false)
-    {
-        $this->future = $future;
-        $this->now = new DateTime();
-        $this->dateTime = $this->normalize($dateTime);
-        $this->detectType();
-    }
-
-    /**
-     * Creates a new DateTimeRenderer
-     *
-     * @param DateTime|int $dateTime
-     * @param bool $future
-     *
-     * @return DateTimeRenderer
-     */
-    public static function create($dateTime, $future = false)
-    {
-        return new static($dateTime, $future);
-    }
-
-    /**
-     * Detects the DateTime context
-     */
-    protected function detectType()
-    {
-        if ($this->now->format('Y-m-d') !== $this->dateTime->format('Y-m-d')) {
-            $this->type = self::TYPE_DATETIME;
-            return;
-        }
-
-        if (
-            $this->now->format('Y-m-d') === $this->dateTime->format('Y-m-d') &&
-            (abs($this->now->getTimestamp() - $this->dateTime->getTimestamp()) >= self::HOUR)
-        ) {
-            $this->type = self::TYPE_TIME;
-            return;
-        }
-
-        if (
-            $this->now->format('Y-m-d') === $this->dateTime->format('Y-m-d') &&
-            (abs($this->now->getTimestamp() - $this->dateTime->getTimestamp()) < self::HOUR)
-        ) {
-            $this->type = self::TYPE_TIMESPAN;
-            return;
-        }
-    }
-
-    /**
-     * Normalizes the given DateTime
-     *
-     * @param DateTime|int $dateTime
-     *
-     * @return DateTime
-     */
-    public static function normalize($dateTime)
-    {
-        if (! ($dt = $dateTime) instanceof DateTime) {
-            $dt = new DateTime();
-            $dt->setTimestamp($dateTime);
-        }
-        return $dt;
-    }
-
-    /**
-     * Checks whether DateTime is a date with time
-     *
-     * @return bool
-     */
-    public function isDateTime()
-    {
-        return $this->type === self::TYPE_DATETIME;
-    }
-
-    /**
-     * Checks whether DateTime is a time of the current day
-     *
-     * @return bool
-     */
-    public function isTime()
-    {
-        return $this->type === self::TYPE_TIME;
-    }
-
-    /**
-     * Checks whether DateTime is in a defined interval
-     *
-     * @return bool
-     */
-    public function isTimespan()
-    {
-        return $this->type === self::TYPE_TIMESPAN;
-    }
-
-    /**
-     * Returns the type of the DateTime
-     *
-     * @return mixed
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Renders the DateTime on the basis of the type and returns suited text
-     *
-     * @param string $dateTimeText
-     * @param string $timeText
-     * @param string $timespanText
-     *
-     * @return string
-     */
-    public function render($dateTimeText, $timeText, $timespanText)
-    {
-        if ($this->isDateTime()) {
-            return sprintf($dateTimeText, $this);
-        } elseif ($this->isTime()) {
-            return sprintf($timeText, $this);
-        } elseif ($this->isTimespan()) {
-            return sprintf($timespanText, $this);
-        }
-
-        return $dateTimeText;
-    }
-
-    /**
-     * Returns a rendered html wrapped text
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        switch ($this->type) {
-            case self::TYPE_DATETIME:
-                $format = $this->dateTime->format('d.m.Y - H:i:s');
-                break;
-            case self::TYPE_TIME:
-                $format = $this->dateTime->format('H:i:s');
-                break;
-            case self::TYPE_TIMESPAN:
-                $format = $this->dateTime->diff($this->now)->format(t('%im %ss', 'timespan'));
-                break;
-            default:
-                $format = $this->dateTime->format('d.m.Y - H:i:s');
-                break;
-        }
-
-        $css = '';
-        if ($this->type === self::TYPE_TIMESPAN) {
-            $css = $this->future === true ? 'timeuntil' : 'timesince';
-        }
-
-        return sprintf(
-            '<span class="%s" title="%s">%s</span>',
-            $css,
-            $this->dateTime->format('d.m.Y - H:i:s'),
-            $format
-        );
-    }
-}

From 5b3957baca54e5210fa88f4325e5aa8bdf64bbca Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 12:46:33 +0200
Subject: [PATCH 1612/2920] Drop the DateTimeRendererTest

refs #6778
---
 .../Icinga/Web/View/DateTimeRendererTest.php  | 101 ------------------
 1 file changed, 101 deletions(-)
 delete mode 100644 test/php/library/Icinga/Web/View/DateTimeRendererTest.php

diff --git a/test/php/library/Icinga/Web/View/DateTimeRendererTest.php b/test/php/library/Icinga/Web/View/DateTimeRendererTest.php
deleted file mode 100644
index 279c18ba1..000000000
--- a/test/php/library/Icinga/Web/View/DateTimeRendererTest.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Tests\Icinga\Web;
-
-use DateTime;
-use Icinga\Test\BaseTestCase;
-use Icinga\Web\View\DateTimeRenderer;
-
-class DateTimeRendererTest extends BaseTestCase
-{
-    public function testWhetherCreateCreatesDateTimeRenderer()
-    {
-        $dateTime = new DateTime();
-        $dt = DateTimeRenderer::create($dateTime);
-
-        $this->assertInstanceOf(
-            'Icinga\Web\View\DateTimeRenderer',
-            $dt,
-            'Dashboard::create() could not create DateTimeRenderer'
-        );
-    }
-
-    /**
-     * @depends testWhetherCreateCreatesDateTimeRenderer
-     */
-    public function testWhetherIsDateTimeReturnsRightType()
-    {
-        $dateTime = new DateTime('+1 day');
-        $dt = DateTimeRenderer::create($dateTime);
-
-        $this->assertTrue(
-            $dt->isDateTime(),
-            'Dashboard::isDateTime() returns wrong type'
-        );
-    }
-
-    /**
-     * @depends testWhetherCreateCreatesDateTimeRenderer
-     */
-    public function testWhetherIsTimeReturnsRightType()
-    {
-        $dateTime = new DateTime('+1 hour');
-        $dt = DateTimeRenderer::create($dateTime);
-
-        $this->assertTrue(
-            $dt->isTime(),
-            'Dashboard::isTime() returns wrong type'
-        );
-    }
-
-    /**
-     * @depends testWhetherCreateCreatesDateTimeRenderer
-     */
-    public function testWhetherIsTimespanReturnsRightType()
-    {
-        $dateTime = new DateTime('+1 minute');
-        $dt = DateTimeRenderer::create($dateTime);
-
-        $this->assertTrue(
-            $dt->isTimespan(),
-            'Dashboard::isTimespan() returns wrong type'
-        );
-    }
-
-    /**
-     * @depends testWhetherCreateCreatesDateTimeRenderer
-     */
-    public function testWhetherNormalizeReturnsNormalizedDateTime()
-    {
-        $dateTime = time();
-        $dt = DateTimeRenderer::normalize($dateTime);
-
-        $this->assertInstanceOf(
-            'DateTime',
-            $dt,
-            'Dashboard::normalize() returns wrong instance'
-        );
-    }
-
-    /**
-     * @depends testWhetherCreateCreatesDateTimeRenderer
-     */
-    public function testWhetherRenderReturnsRightText()
-    {
-        $dateTime = new DateTime('+1 minute');
-        $dt = DateTimeRenderer::create($dateTime);
-
-        $text = $dt->render(
-            '#1 The service is down since %s',
-            '#2 The service is down since %s o\'clock.',
-            '#3 The service is down for %s.'
-        );
-
-        $this->assertRegExp(
-            '/#3/',
-            $text,
-            'Dashboard::render() returns wrong text'
-        );
-    }
-}

From 4f4d7ccba206ed2e5c30b79797204eb1a91d230a Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 19 May 2015 12:55:40 +0200
Subject: [PATCH 1613/2920] Correct PHPDoc of ::setSearchColumns()

---
 library/Icinga/Web/Widget/FilterEditor.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 83f5f2955..40953a518 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -80,6 +80,8 @@ class FilterEditor extends AbstractWidget
      * Set columns to search in
      *
      * @param array $searchColumns
+     *
+     * @return $this
      */
     public function setSearchColumns(array $searchColumns)
     {

From 9edc4a129b94288341adc96ce6df73631cd1de0a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 13:25:57 +0200
Subject: [PATCH 1614/2920] Fix date-and-time tooltips not showing the time

refs #6778
---
 library/Icinga/Web/View/helpers/format.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php
index 115f13424..a364f6cde 100644
--- a/library/Icinga/Web/View/helpers/format.php
+++ b/library/Icinga/Web/View/helpers/format.php
@@ -37,7 +37,7 @@ $this->addHelperFunction('timeAgo', function ($time, $timeOnly = false) {
     }
     return sprintf(
         '<span class="time-ago" title="%s">%s</span>',
-        DateFormatter::formatDate($time),
+        DateFormatter::formatDateTime($time),
         DateFormatter::timeAgo($time, $timeOnly)
     );
 });
@@ -48,7 +48,7 @@ $this->addHelperFunction('timeSince', function ($time, $timeOnly = false) {
     }
     return sprintf(
         '<span class="time-since" title="%s">%s</span>',
-        DateFormatter::formatDate($time),
+        DateFormatter::formatDateTime($time),
         DateFormatter::timeSince($time, $timeOnly)
     );
 });
@@ -59,7 +59,7 @@ $this->addHelperFunction('timeUntil', function ($time, $timeOnly = false) {
     }
     return sprintf(
         '<span class="time-until" title="%s">%s</span>',
-        DateFormatter::formatDate($time),
+        DateFormatter::formatDateTime($time),
         DateFormatter::timeUntil($time, $timeOnly)
     );
 });

From 14b24ff57d09d0064b0dbfc8e490f77478ed3d75 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 13:26:46 +0200
Subject: [PATCH 1615/2920] Use international standard date and time notation
 ...

... instead of depending on the locale.
We hardcode date and time formats all over the place anyway.

refs #6778
---
 library/Icinga/Date/DateFormatter.php | 30 ++++++++++++++-------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/library/Icinga/Date/DateFormatter.php b/library/Icinga/Date/DateFormatter.php
index 4e7d2e15f..8ea8e2b3c 100644
--- a/library/Icinga/Date/DateFormatter.php
+++ b/library/Icinga/Date/DateFormatter.php
@@ -3,10 +3,8 @@
 
 namespace Icinga\Date;
 
-use IntlDateFormatter;
-
 /**
- * ICU date formatting
+ * Date formatting
  */
 class DateFormatter
 {
@@ -57,8 +55,11 @@ class DateFormatter
         }
         if ($diff > 3600 * 24 * 3) {
             $type = static::DATE;
-            $fmt = new IntlDateFormatter(null, IntlDateFormatter::SHORT, IntlDateFormatter::NONE);
-            $formatted = $fmt->format($time);
+            if (date('Y') === date('Y', $time)) {
+                $formatted = date('M j', $time);
+            } else {
+                $formatted = date('Y-m', $time);
+            }
         } else {
             $minutes = floor($diff / 60);
             if ($minutes < 60) {
@@ -67,9 +68,13 @@ class DateFormatter
             } else {
                 $hours = floor($minutes / 60);
                 if ($hours < 24) {
-                    $type = static::TIME;
-                    $fmt = new IntlDateFormatter(null, IntlDateFormatter::NONE, IntlDateFormatter::SHORT);
-                    $formatted = $fmt->format($time);
+                    if (date('d') === date('d', $time)) {
+                        $type = static::TIME;
+                        $formatted = date('H:i', $time);
+                    } else {
+                        $type = static::DATE;
+                        $formatted = date('M j H:i', $time);
+                    }
                 } else {
                     $type = static::RELATIVE;
                     $formatted = sprintf('%dd %dh', floor($hours / 24), $hours % 24);
@@ -88,8 +93,7 @@ class DateFormatter
      */
     public static function formatDate($date)
     {
-        $fmt = new IntlDateFormatter(null, IntlDateFormatter::SHORT, IntlDateFormatter::NONE);
-        return $fmt->format((float) $date);
+        return date('Y-m-d', (float) $date);
     }
 
     /**
@@ -101,8 +105,7 @@ class DateFormatter
      */
     public static function formatDateTime($dateTime)
     {
-        $fmt = new IntlDateFormatter(null, IntlDateFormatter::SHORT, IntlDateFormatter::SHORT);
-        return $fmt->format((float) $dateTime);
+        return date('Y-m-d H:i:s', (float) $dateTime);
     }
 
     /**
@@ -114,8 +117,7 @@ class DateFormatter
      */
     public static function formatTime($time)
     {
-        $fmt = new IntlDateFormatter(null, IntlDateFormatter::NONE, IntlDateFormatter::SHORT);
-        return $fmt->format((float) $time);
+        return date('H:i:s', (float) $time);
     }
 
     /**

From afe07f48148c6ab0ee3742c00f320090946b6303 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 13:42:57 +0200
Subject: [PATCH 1616/2920] Revert "Hostgroups view: reduce "Last Problem"
 column's width"

This reverts commit 8b084733413b74131100abf6a31efc02793695c5.

Common table style is subject of #8935.

refs #8054
---
 .../application/views/scripts/list/hostgroups.phtml           | 2 +-
 public/css/icinga/main-content.less                           | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index e75359b23..23d031b3f 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -20,7 +20,7 @@ if (count($hostgroups) === 0) {
 ?>
   <table class="groupview action" data-base-target="_next">
     <thead>
-      <th class="state"><?= $this->translate('Last Problem'); ?></th>
+      <th><?= $this->translate('Last Problem'); ?></th>
       <th><?= $this->translate('Host Group'); ?></th>
       <th><?= $this->translate('Total Hosts'); ?></th>
       <th><?= $this->translate('Host States'); ?></th>
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 59c7830da..b442723cb 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -169,10 +169,6 @@ table.benchmark {
   width: 96%;
 }
 
-table.groupview th.state {
-  width: 9em;
-}
-
 .dashboard h1 {
   font-size: 1em;
 }

From 73e8c51fd1e7a0814fb28b938f50642e8f3aca8d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 19 May 2015 12:21:32 +0200
Subject: [PATCH 1617/2920] Ldap\Query: Remove method paginate()

---
 library/Icinga/Protocol/Ldap/Query.php | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Query.php b/library/Icinga/Protocol/Ldap/Query.php
index f82a40511..004c2e43e 100644
--- a/library/Icinga/Protocol/Ldap/Query.php
+++ b/library/Icinga/Protocol/Ldap/Query.php
@@ -281,31 +281,6 @@ class Query
         return $this->sort_columns;
     }
 
-    /**
-     * Return a pagination adapter for the current query
-     *
-     * @return \Zend_Paginator
-     */
-    public function paginate($limit = null, $page = null)
-    {
-        if ($page === null || $limit === null) {
-            $request = \Zend_Controller_Front::getInstance()->getRequest();
-            if ($page === null) {
-                $page = $request->getParam('page', 0);
-            }
-            if ($limit === null) {
-                $limit = $request->getParam('limit', 20);
-            }
-        }
-        $paginator = new \Zend_Paginator(
-            // TODO: Adapter doesn't fit yet:
-            new \Icinga\Web\Paginator\Adapter\QueryAdapter($this)
-        );
-        $paginator->setItemCountPerPage($limit);
-        $paginator->setCurrentPageNumber($page);
-        return $paginator;
-    }
-
     /**
      * Add a filter expression to this query
      *

From a629adb4483d3391b930ff19ae27deeaea709ccd Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 19 May 2015 12:21:44 +0200
Subject: [PATCH 1618/2920] DataView: Remove method paginate()

---
 .../library/Monitoring/DataView/DataView.php     | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 6bed36fe1..f39f1d96d 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -389,22 +389,6 @@ abstract class DataView implements QueryInterface, IteratorAggregate
         return $this;
     }
 
-    /**
-     * Paginate data
-     *
-     * @param   int $itemsPerPage   Number of items per page
-     * @param   int $pageNumber     Current page number
-     *
-     * @return  Zend_Paginator
-     */
-    public function paginate($itemsPerPage = null, $pageNumber = null)
-    {
-        if (! $this->isSorted) {
-            $this->order();
-        }
-        return $this->query->paginate($itemsPerPage, $pageNumber);
-    }
-
     /**
      * Count result set
      *

From 4cedfce07fc8b54f74ae7912ce8a04d3320ce85a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 19 May 2015 12:22:20 +0200
Subject: [PATCH 1619/2920] DataView: Fix that method getOffset() calls
 parent::hasOffset()

---
 modules/monitoring/library/Monitoring/DataView/DataView.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index f39f1d96d..8212d7bb7 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -450,7 +450,7 @@ abstract class DataView implements QueryInterface, IteratorAggregate
      */
     public function getOffset()
     {
-        return $this->query->hasOffset();
+        return $this->query->getOffset();
     }
 
     /**

From bd7c7f963663cc570f378f395863d99e9a1c3d7d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 19 May 2015 13:57:11 +0200
Subject: [PATCH 1620/2920] Introduce widget Paginator

This does not support custom scrolling styles as of now. Custom view
scripts are supported though. In case Paginator::getPages() does not
suffice, feel free to improve this.
---
 library/Icinga/Web/Controller.php       |  10 +-
 library/Icinga/Web/Widget/Paginator.php | 168 ++++++++++++++++++++++++
 2 files changed, 172 insertions(+), 6 deletions(-)
 create mode 100644 library/Icinga/Web/Widget/Paginator.php

diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index 61e80173b..9acf17469 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -3,12 +3,11 @@
 
 namespace Icinga\Web;
 
-use Zend_Paginator;
 use Icinga\Data\Sortable;
 use Icinga\Data\QueryInterface;
-use Icinga\Web\Paginator\Adapter\QueryAdapter;
 use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Web\Widget\Limiter;
+use Icinga\Web\Widget\Paginator;
 use Icinga\Web\Widget\SortBox;
 
 /**
@@ -115,12 +114,11 @@ class Controller extends ModuleActionController
         $request = $this->getRequest();
         $limit = $request->getParam('limit', $itemsPerPage);
         $page = $request->getParam('page', $pageNumber);
-        $query->limit($limit, $page * $limit);
+        $query->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
         if (! $this->view->compact) {
-            $paginator = new Zend_Paginator(new QueryAdapter($query));
-            $paginator->setItemCountPerPage($limit);
-            $paginator->setCurrentPageNumber($page);
+            $paginator = new Paginator();
+            $paginator->setQuery($query);
             $this->view->paginator = $paginator;
         }
 
diff --git a/library/Icinga/Web/Widget/Paginator.php b/library/Icinga/Web/Widget/Paginator.php
new file mode 100644
index 000000000..dc014e371
--- /dev/null
+++ b/library/Icinga/Web/Widget/Paginator.php
@@ -0,0 +1,168 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Web\Widget;
+
+use Icinga\Data\QueryInterface;
+use Icinga\Exception\ProgrammingError;
+
+/**
+ * Paginator
+ */
+class Paginator extends AbstractWidget
+{
+    /**
+     * The query the paginator widget is created for
+     *
+     * @var QueryInterface
+     */
+    protected $query;
+
+    /**
+     * The view script in use
+     *
+     * @var string|array
+     */
+    protected $viewScript = array('mixedPagination.phtml', 'default');
+
+    /**
+     * Set the query to create the paginator widget for
+     *
+     * @param   QueryInterface      $query
+     *
+     * @return  $this
+     */
+    public function setQuery(QueryInterface $query)
+    {
+        $this->query = $query;
+        return $this;
+    }
+
+    /**
+     * Set the view script to use
+     *
+     * @param   string|array    $script
+     *
+     * @return  $this
+     */
+    public function setViewScript($script)
+    {
+        $this->viewScript = $script;
+        return $this;
+    }
+
+    /**
+     * Render this paginator
+     */
+    public function render()
+    {
+        if ($this->query === null) {
+            throw new ProgrammingError('Need a query to create the paginator widget for');
+        }
+
+        $itemCountPerPage = $this->query->getLimit();
+        if (! $itemCountPerPage) {
+            return ''; // No pagination required
+        }
+
+        $totalItemCount = count($this->query);
+        $pageCount = (int) ceil($totalItemCount / $itemCountPerPage);
+        $currentPage = $this->query->hasOffset() ? ($this->query->getOffset() / $itemCountPerPage) + 1 : 1;
+        $pagesInRange = $this->getPages($pageCount, $currentPage);
+        $variables = array(
+            'totalItemCount'    => $totalItemCount,
+            'pageCount'         => $pageCount,
+            'itemCountPerPage'  => $itemCountPerPage,
+            'first'             => 1,
+            'current'           => $currentPage,
+            'last'              => $pageCount,
+            'pagesInRange'      => $pagesInRange,
+            'firstPageInRange'  => min($pagesInRange),
+            'lastPageInRange'   => max($pagesInRange)
+        );
+
+        if ($currentPage > 1) {
+            $variables['previous'] = $currentPage - 1;
+        }
+
+        if ($currentPage < $pageCount) {
+            $variables['next'] = $currentPage + 1;
+        }
+
+        if (is_array($this->viewScript)) {
+            if ($this->viewScript[1] !== null) {
+                return $this->view()->partial($this->viewScript[0], $this->viewScript[1], $variables);
+            }
+
+            return $this->view()->partial($this->viewScript[0], $variables);
+        }
+
+        return $this->view()->partial($this->viewScript, $variables);
+    }
+
+    /**
+     * Returns an array of "local" pages given the page count and current page number
+     *
+     * @return  array
+     */
+    protected function getPages($pageCount, $currentPage)
+    {
+        $range = array();
+
+        if ($pageCount < 10) {
+            // Show all pages if we have less than 10
+            for ($i = 1; $i < 10; $i++) {
+                if ($i > $pageCount) {
+                    break;
+                }
+
+                $range[$i] = $i;
+            }
+        } else {
+            // More than 10 pages:
+            foreach (array(1, 2) as $i) {
+                $range[$i] = $i;
+            }
+
+            if ($currentPage < 6 ) {
+                // We are on page 1-5 from
+                for ($i = 1; $i <= 7; $i++) {
+                    $range[$i] = $i;
+                }
+            } else {
+                // Current page > 5
+                $range[] = '...';
+
+                if (($pageCount - $currentPage) < 5) {
+                    // Less than 5 pages left
+                    $start = 5 - ($pageCount - $currentPage);
+                } else {
+                    $start = 1;
+                }
+
+                for ($i = $currentPage - $start; $i < ($currentPage + (4 - $start)); $i++) {
+                    if ($i > $pageCount) {
+                        break;
+                    }
+
+                    $range[$i] = $i;
+                }
+            }
+
+            if ($currentPage < ($pageCount - 2)) {
+                $range[] = '...';
+            }
+
+            foreach (array($pageCount - 1, $pageCount) as $i) {
+                $range[$i] = $i;
+            }
+
+        }
+
+        if (empty($range)) {
+            $range[] = 1;
+        }
+
+        return $range;
+    }
+}

From 85dd496d35970ccf64acefed1b24c92d210eb8e1 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 19 May 2015 13:29:21 +0200
Subject: [PATCH 1621/2920] Add parameter $searchColumns to ::filterQuery()

refs #8241
---
 .../application/controllers/ListController.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 0ab1192f7..6c685f34a 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -12,6 +12,7 @@ use Icinga\Web\Widget\Tabs;
 use Icinga\Data\Filter\Filter;
 use Icinga\Web\Widget;
 use Icinga\Module\Monitoring\Forms\StatehistoryForm;
+use Icinga\Data\Filterable;
 
 class Monitoring_ListController extends Controller
 {
@@ -625,7 +626,15 @@ class Monitoring_ListController extends Controller
         $this->view->verticalPaginator   = $pivot->paginateYAxis();
     }
 
-    protected function filterQuery($query)
+    /**
+     * Apply filters on a query
+     *
+     * @param Filterable    $query          The query to apply filters on
+     * @param array         $searchColumns  Columns to search in
+     *
+     * @return Filterable   $query
+     */
+    protected function filterQuery(Filterable $query, array $searchColumns = null)
     {
         $editor = Widget::create('filterEditor')
             ->setQuery($query)
@@ -633,8 +642,11 @@ class Monitoring_ListController extends Controller
                 'limit', 'sort', 'dir', 'format', 'view', 'backend',
                 'stateType', 'addColumns', '_dev'
             )
-            ->ignoreParams('page')
-            ->handleRequest($this->getRequest());
+            ->ignoreParams('page');
+        if ($searchColumns !== null) {
+            $editor->setSearchColumns($searchColumns);
+        }
+        $editor->handleRequest($this->getRequest());
         $query->applyFilter($editor->getFilter());
 
         $this->setupFilterControl($editor);

From a2b262eab173ed8c8f18c8f239b918aa56cf6eb2 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 19 May 2015 13:58:08 +0200
Subject: [PATCH 1622/2920] Take display_name into account when searching for
 host and service names

refs #8241
---
 .../monitoring/application/controllers/ListController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 6c685f34a..a793f2a0a 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -96,7 +96,7 @@ class Monitoring_ListController extends Controller
             'host_current_check_attempt',
             'host_max_check_attempts'
         ), $this->addColumns()));
-        $this->filterQuery($query);
+        $this->filterQuery($query, array('host', 'host_display_name'));
         $this->applyRestriction('monitoring/hosts/filter', $query);
         $this->view->hosts = $query;
 
@@ -180,7 +180,7 @@ class Monitoring_ListController extends Controller
             'max_check_attempts'    => 'service_max_check_attempts'
         ), $this->addColumns());
         $query = $this->backend->select()->from('serviceStatus', $columns);
-        $this->filterQuery($query);
+        $this->filterQuery($query, array('service', 'service_display_name'));
         $this->applyRestriction('monitoring/services/filter', $query);
         $this->view->services = $query;
 
@@ -498,7 +498,7 @@ class Monitoring_ListController extends Controller
         ))->order('services_severity')->order('servicegroup_alias');
         // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
         // service groups. We should separate them.
-        $this->filterQuery($query);
+        $this->filterQuery($query, array('servicegroup', 'servicegroup_alias'));
         $this->view->servicegroups = $query;
 
         $this->setupLimitControl();
@@ -555,7 +555,7 @@ class Monitoring_ListController extends Controller
         ))->order('services_severity')->order('hostgroup_alias');
         // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
         // service groups. We should separate them.
-        $this->filterQuery($query);
+        $this->filterQuery($query, array('hostgroup', 'hostgroup_alias'));
         $this->view->hostgroups = $query;
 
         $this->setupLimitControl();

From 2715e8ed2b49e0eea914d6964ed76c4a0d56ed79 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 16:21:36 +0200
Subject: [PATCH 1623/2920] Revert "Set default locale for the intl extension
 upon locale detection"

This reverts commit 06830e035e7227e1fe48eaac66ce2d3f2d86913d.

We don't use the intl extension at the moment.

refs #6778
---
 library/Icinga/Util/Translator.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/library/Icinga/Util/Translator.php b/library/Icinga/Util/Translator.php
index 60f136cc0..67825b63b 100644
--- a/library/Icinga/Util/Translator.php
+++ b/library/Icinga/Util/Translator.php
@@ -3,7 +3,6 @@
 
 namespace Icinga\Util;
 
-use Locale;
 use Icinga\Exception\IcingaException;
 
 /**
@@ -174,9 +173,7 @@ class Translator
                     $localeName
                 );
             }
-            Locale::setDefault(static::DEFAULT_LOCALE);
         } else {
-            Locale::setDefault($localeName);
             $locale = setlocale(LC_ALL, 0);
             putenv('LC_ALL=' . $locale); // Failsafe, Win and Unix
             putenv('LANG=' . $locale); // Windows fix, untested

From 94bdb8b4b072c9fadac77830325f727a14f93f85 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 19 May 2015 16:35:44 +0200
Subject: [PATCH 1624/2920] Abort pending AJAX requests before page unload

Abort all pending requests before the page unload, to avoid confusing error messages during page reloads. Avoid rendering the site unusable in cases where the site is still being used after the beforeunload event.

fixes #7759
---
 public/js/icinga/events.js | 13 +++++++++++--
 public/js/icinga/loader.js | 14 ++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index cc927feb6..d458ab7fc 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -100,7 +100,7 @@
 
             // Destroy Icinga, clean up and interrupt pending requests on unload
             $( window ).on('unload', { self: this }, this.onUnload);
-            $( window ).on('beforeunload', { self: this }, this.onUnload);
+            $( window ).on('beforeunload', { self: this }, this.onBeforeUnload);
 
             // We catch scroll events in our containers
             $('.container').on('scroll', { self: this }, this.icinga.events.onContainerScroll);
@@ -153,6 +153,15 @@
             icinga.destroy();
         },
 
+        onBeforeUnload: function (event) {
+            var icinga = event.data.self.icinga;
+
+            // Browsers may call the error handler on all pending AJAX requests, when the page is reloaded,
+            // which could in turn cause needless error messages to show up in the frontend until the page is loaded.
+            // To circumvent this cancel all pending requests.
+            icinga.loader.cancelRequests();
+        },
+
         /**
          * A scroll event happened in one of our containers
          */
@@ -560,7 +569,7 @@
             $(window).off('resize', this.onWindowResize);
             $(window).off('load', this.onLoad);
             $(window).off('unload', this.onUnload);
-            $(window).off('beforeunload', this.onUnload);
+            $(window).off('beforeunload', this.onBeforeUnload);
             $(document).off('scroll', '.container', this.onContainerScroll);
             $(document).off('click', 'a', this.linkClicked);
             $(document).off('click', 'table.action tr[href]', this.rowSelected);
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 99667ac1c..e01e03cec 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -793,16 +793,22 @@
         },
 
         /**
-         * On shutdown we kill all pending requests
+         * Cancel and dereference all pending requests and dereference this object
          */
         destroy: function() {
+            this.icinga.loader.cancelRequests();
+            this.icinga = null;
+            this.requests = {};
+        },
+
+        /**
+         * Cancel all pendings ajax requests
+         */
+        cancelRequests: function() {
             $.each(this.requests, function(id, request) {
                 request.abort();
             });
-            this.icinga = null;
-            this.requests = {};
         }
-
     };
 
 }(Icinga, jQuery));

From 54207d34275fc1bfed0adc31365c00fc98645be0 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 19 May 2015 17:05:04 +0200
Subject: [PATCH 1625/2920] Revert "Abort pending AJAX requests before page
 unload"

This reverts commit 94bdb8b4b072c9fadac77830325f727a14f93f85. After the patch, Firefox shows an error message on each reload for an unknown reason.

refs #7759
---
 public/js/icinga/events.js | 13 ++-----------
 public/js/icinga/loader.js | 14 ++++----------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index d458ab7fc..cc927feb6 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -100,7 +100,7 @@
 
             // Destroy Icinga, clean up and interrupt pending requests on unload
             $( window ).on('unload', { self: this }, this.onUnload);
-            $( window ).on('beforeunload', { self: this }, this.onBeforeUnload);
+            $( window ).on('beforeunload', { self: this }, this.onUnload);
 
             // We catch scroll events in our containers
             $('.container').on('scroll', { self: this }, this.icinga.events.onContainerScroll);
@@ -153,15 +153,6 @@
             icinga.destroy();
         },
 
-        onBeforeUnload: function (event) {
-            var icinga = event.data.self.icinga;
-
-            // Browsers may call the error handler on all pending AJAX requests, when the page is reloaded,
-            // which could in turn cause needless error messages to show up in the frontend until the page is loaded.
-            // To circumvent this cancel all pending requests.
-            icinga.loader.cancelRequests();
-        },
-
         /**
          * A scroll event happened in one of our containers
          */
@@ -569,7 +560,7 @@
             $(window).off('resize', this.onWindowResize);
             $(window).off('load', this.onLoad);
             $(window).off('unload', this.onUnload);
-            $(window).off('beforeunload', this.onBeforeUnload);
+            $(window).off('beforeunload', this.onUnload);
             $(document).off('scroll', '.container', this.onContainerScroll);
             $(document).off('click', 'a', this.linkClicked);
             $(document).off('click', 'table.action tr[href]', this.rowSelected);
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index e01e03cec..99667ac1c 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -793,22 +793,16 @@
         },
 
         /**
-         * Cancel and dereference all pending requests and dereference this object
+         * On shutdown we kill all pending requests
          */
         destroy: function() {
-            this.icinga.loader.cancelRequests();
-            this.icinga = null;
-            this.requests = {};
-        },
-
-        /**
-         * Cancel all pendings ajax requests
-         */
-        cancelRequests: function() {
             $.each(this.requests, function(id, request) {
                 request.abort();
             });
+            this.icinga = null;
+            this.requests = {};
         }
+
     };
 
 }(Icinga, jQuery));

From b1b2e3fc21f3a66cc5b30dc8ab6b72359df48253 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 19 May 2015 17:13:46 +0200
Subject: [PATCH 1626/2920] Revert "Merge branch
 'bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241'"

This reverts commit 75b004dc429a3ef32b113ebd0fb3791896ebf89b, reversing
changes made to bd7c7f963663cc570f378f395863d99e9a1c3d7d.
---
 .../controllers/ListController.php            | 26 +++++--------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 656b59032..92c42d4ad 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -12,7 +12,6 @@ use Icinga\Web\Widget\Tabs;
 use Icinga\Data\Filter\Filter;
 use Icinga\Web\Widget;
 use Icinga\Module\Monitoring\Forms\StatehistoryForm;
-use Icinga\Data\Filterable;
 
 class Monitoring_ListController extends Controller
 {
@@ -96,7 +95,7 @@ class Monitoring_ListController extends Controller
             'host_current_check_attempt',
             'host_max_check_attempts'
         ), $this->addColumns()));
-        $this->filterQuery($query, array('host', 'host_display_name'));
+        $this->filterQuery($query);
         $this->applyRestriction('monitoring/hosts/filter', $query);
         $this->view->hosts = $query;
 
@@ -180,7 +179,7 @@ class Monitoring_ListController extends Controller
             'max_check_attempts'    => 'service_max_check_attempts'
         ), $this->addColumns());
         $query = $this->backend->select()->from('serviceStatus', $columns);
-        $this->filterQuery($query, array('service', 'service_display_name'));
+        $this->filterQuery($query);
         $this->applyRestriction('monitoring/services/filter', $query);
         $this->view->services = $query;
 
@@ -498,7 +497,7 @@ class Monitoring_ListController extends Controller
         ))->order('services_severity')->order('servicegroup_alias');
         // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
         // service groups. We should separate them.
-        $this->filterQuery($query, array('servicegroup', 'servicegroup_alias'));
+        $this->filterQuery($query);
         $this->view->servicegroups = $query;
 
         $this->setupLimitControl();
@@ -556,7 +555,7 @@ class Monitoring_ListController extends Controller
         ))->order('services_severity')->order('hostgroup_alias');
         // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
         // service groups. We should separate them.
-        $this->filterQuery($query, array('hostgroup', 'hostgroup_alias'));
+        $this->filterQuery($query);
         $this->view->hostgroups = $query;
 
         $this->setupLimitControl();
@@ -627,15 +626,7 @@ class Monitoring_ListController extends Controller
         $this->view->verticalPaginator   = $pivot->paginateYAxis();
     }
 
-    /**
-     * Apply filters on a query
-     *
-     * @param Filterable    $query          The query to apply filters on
-     * @param array         $searchColumns  Columns to search in
-     *
-     * @return Filterable   $query
-     */
-    protected function filterQuery(Filterable $query, array $searchColumns = null)
+    protected function filterQuery($query)
     {
         $editor = Widget::create('filterEditor')
             ->setQuery($query)
@@ -643,11 +634,8 @@ class Monitoring_ListController extends Controller
                 'limit', 'sort', 'dir', 'format', 'view', 'backend',
                 'stateType', 'addColumns', '_dev'
             )
-            ->ignoreParams('page');
-        if ($searchColumns !== null) {
-            $editor->setSearchColumns($searchColumns);
-        }
-        $editor->handleRequest($this->getRequest());
+            ->ignoreParams('page')
+            ->handleRequest($this->getRequest());
         $query->applyFilter($editor->getFilter());
 
         $this->setupFilterControl($editor);

From 3243f9a65a45ba080ce36ff652bf02a6cf5a1f1f Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 19 May 2015 15:26:21 +0200
Subject: [PATCH 1627/2920] Don't handle the case $this->searchColumns === null
 for actions in which ::setSearchColumns() is called

refs #8241
---
 library/Icinga/Web/Widget/FilterEditor.php | 24 +---------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 40953a518..fb346b573 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -217,29 +217,7 @@ class FilterEditor extends AbstractWidget
         if ($search !== null) {
             if ($this->searchColumns === null) {
                 if (strpos($search, '=') === false) {
-                    // TODO: Ask the view for (multiple) search columns
-                    switch($request->getActionName()) {
-                        case 'services':
-                            $searchCol = 'service';
-                            break;
-                        case 'hosts':
-                            $searchCol = 'host';
-                            break;
-                        case 'hostgroups':
-                            $searchCol = 'hostgroup';
-                            break;
-                        case 'servicegroups':
-                            $searchCol = 'servicegroup';
-                            break;
-                        default:
-                            $searchCol = null;
-                    }
-
-                    if ($searchCol === null) {
-                        throw new Exception('Cannot search here');
-                    }
-                    $search = ltrim($search);
-                    $filter = $this->mergeRootExpression($filter, $searchCol, '=', "*$search*");
+                    throw new Exception('Cannot search here');
                 } else {
                     list($k, $v) = preg_split('/=/', $search);
                     $filter = $this->mergeRootExpression($filter, trim($k), '=', ltrim($v));

From 36713fb519f38cd2071fb0a001dad444f1c83db7 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 19 May 2015 15:43:47 +0200
Subject: [PATCH 1628/2920] Rename parameter $query of ::filterQuery() to
 $dataView

refs #8241
---
 .../controllers/ListController.php            | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index a793f2a0a..df5a10dee 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -13,6 +13,7 @@ use Icinga\Data\Filter\Filter;
 use Icinga\Web\Widget;
 use Icinga\Module\Monitoring\Forms\StatehistoryForm;
 use Icinga\Data\Filterable;
+use Icinga\Module\Monitoring\DataView\DataView;
 
 class Monitoring_ListController extends Controller
 {
@@ -627,17 +628,17 @@ class Monitoring_ListController extends Controller
     }
 
     /**
-     * Apply filters on a query
+     * Apply filters on a DataView
      *
-     * @param Filterable    $query          The query to apply filters on
-     * @param array         $searchColumns  Columns to search in
+     * @param DataView  $dataView       The DataView to apply filters on
+     * @param array     $searchColumns  Columns to search in
      *
-     * @return Filterable   $query
+     * @return DataView $dataView
      */
-    protected function filterQuery(Filterable $query, array $searchColumns = null)
+    protected function filterQuery(DataView $dataView, array $searchColumns = null)
     {
         $editor = Widget::create('filterEditor')
-            ->setQuery($query)
+            ->setQuery($dataView)
             ->preserveParams(
                 'limit', 'sort', 'dir', 'format', 'view', 'backend',
                 'stateType', 'addColumns', '_dev'
@@ -647,13 +648,13 @@ class Monitoring_ListController extends Controller
             $editor->setSearchColumns($searchColumns);
         }
         $editor->handleRequest($this->getRequest());
-        $query->applyFilter($editor->getFilter());
+        $dataView->applyFilter($editor->getFilter());
 
         $this->setupFilterControl($editor);
         $this->view->filter = $editor->getFilter();
 
-        $this->handleFormatRequest($query);
-        return $query;
+        $this->handleFormatRequest($dataView);
+        return $dataView;
     }
 
     /**

From cc050ed696fc73ebb4d344bbd1e5f679a18e5e71 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 19 May 2015 16:28:07 +0200
Subject: [PATCH 1629/2920] Display an error notification rather than throwing
 an exception

refs #8241
---
 library/Icinga/Web/Widget/FilterEditor.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index fb346b573..07640872b 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -10,6 +10,7 @@ use Icinga\Data\Filter\FilterOr;
 use Icinga\Web\Url;
 use Icinga\Application\Icinga;
 use Icinga\Exception\ProgrammingError;
+use Icinga\Web\Notification;
 use Exception;
 
 /**
@@ -217,7 +218,8 @@ class FilterEditor extends AbstractWidget
         if ($search !== null) {
             if ($this->searchColumns === null) {
                 if (strpos($search, '=') === false) {
-                    throw new Exception('Cannot search here');
+                    Notification::error(mt('monitoring', 'Cannot search here'));
+                    return $this;
                 } else {
                     list($k, $v) = preg_split('/=/', $search);
                     $filter = $this->mergeRootExpression($filter, trim($k), '=', ltrim($v));

From 2ed1d6c66b0f1975b9cdbe8b74e28958a3764ff7 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 19 May 2015 16:37:39 +0200
Subject: [PATCH 1630/2920] Implement ::getSearchColumns()

refs #8241
---
 .../library/Monitoring/DataView/DataView.php           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 8212d7bb7..6456fa203 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -378,6 +378,16 @@ abstract class DataView implements QueryInterface, IteratorAggregate
         return $this;
     }
 
+    /**
+     * Get the view's search columns
+     *
+     * @return string[]
+     */
+    public function getSearchColumns()
+    {
+        return array();
+    }
+
     /**
      * @deprecated(EL): Only use DataView::applyFilter() for applying filter because all other functions are missing
      * column validation.

From c0cf6e4918af12905b197b46fb418be5cb8c8bcb Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 19 May 2015 18:08:26 +0200
Subject: [PATCH 1631/2920] Display icon_images in all host and service detail
 views

refs #8665
---
 .../application/controllers/HostsController.php    |  2 ++
 .../application/controllers/ServicesController.php |  2 ++
 .../scripts/partials/host/object-header.phtml      |  3 +++
 .../scripts/partials/host/objects-header.phtml     |  3 +++
 .../scripts/partials/service/object-header.phtml   | 14 ++++++++++----
 .../scripts/partials/service/objects-header.phtml  |  3 +++
 .../monitoring/library/Monitoring/Object/Host.php  |  1 +
 .../library/Monitoring/Object/Service.php          |  2 ++
 8 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 45eca1135..ac55ade9b 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -53,6 +53,7 @@ class Monitoring_HostsController extends Controller
     protected function handleCommandForm(ObjectsCommandForm $form)
     {
         $this->hostList->setColumns(array(
+            'host_icon_image',
             'host_name',
             'host_state',
             'host_problem',
@@ -94,6 +95,7 @@ class Monitoring_HostsController extends Controller
             ->handleRequest();
         $this->view->checkNowForm = $checkNowForm;
         $this->hostList->setColumns(array(
+            'host_icon_image',
             'host_name',
             'host_state',
             'host_problem',
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index f4ee73cf5..ca9788ff2 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -55,6 +55,7 @@ class Monitoring_ServicesController extends Controller
             'host_state',
             'host_problem',
             'host_handled',
+            'service_icon_image',
             'service_description',
             'service_state',
             'service_problem',
@@ -98,6 +99,7 @@ class Monitoring_ServicesController extends Controller
             'host_state',
             'host_problem',
             'host_handled',
+            'service_icon_image',
             'service_output',
             'service_description',
             'service_state',
diff --git a/modules/monitoring/application/views/scripts/partials/host/object-header.phtml b/modules/monitoring/application/views/scripts/partials/host/object-header.phtml
index 0efedf328..127f492e6 100644
--- a/modules/monitoring/application/views/scripts/partials/host/object-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/object-header.phtml
@@ -9,6 +9,9 @@ use Icinga\Module\Monitoring\Object\Host;
             <?= $this->prefixedTimeSince($object->host_last_state_change, true); ?>
         </td>
         <td>
+          <?php if ($object->host_icon_image && ! preg_match('/[\'"]/', $object->host_icon_image)): ?>
+            <?= $this->icon($this->resolveMacros($object->host_icon_image, $object)) ?>
+          <?php endif ?>
             <strong><?= $this->escape($object->host_display_name); ?></strong>
           <?php if ($object->host_display_name !== $object->host_name): ?>
             <small>(<?= $this->escape($object->host_name); ?>)</small>
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index d59479e07..b6856609c 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -18,6 +18,9 @@ $i = 0;
                 <td class="state"><?= Host::getStateText($host->host_state, true); ?><br /></td>
                 <td>
                 <?= implode(' ', $this->hostFlags($host)) ?>
+                <?php if ($host->host_icon_image && ! preg_match('/[\'"]/', $host->host_icon_image)): ?>
+                    <?= $this->icon($this->resolveMacros($host->host_icon_image, $host)) ?>
+                <?php endif ?>
                 <b><?= $this->escape($host->getName()); ?></b><br>
                 <?= $this->escape($host->host_output) ?>
                 </td>
diff --git a/modules/monitoring/application/views/scripts/partials/service/object-header.phtml b/modules/monitoring/application/views/scripts/partials/service/object-header.phtml
index 45111fe1e..b50aff9bc 100644
--- a/modules/monitoring/application/views/scripts/partials/service/object-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/object-header.phtml
@@ -10,7 +10,10 @@ use Icinga\Module\Monitoring\Object\Service;
             <?= $this->prefixedTimeSince($object->host_last_state_change, true); ?>
         </td>
         <td>
-            <strong><?= $this->escape($object->host_display_name); ?></strong>
+          <?php if ($object->host_icon_image && ! preg_match('/[\'"]/', $object->host_icon_image)): ?>
+            <?= $this->icon($this->resolveMacros($object->host_icon_image, $object)) ?>
+          <?php endif ?>
+          <strong><?= $this->escape($object->host_display_name); ?></strong>
           <?php if ($object->host_display_name !== $object->host_name): ?>
             <small>(<?= $this->escape($object->host_name); ?>)</small>
           <?php endif ?>
@@ -27,10 +30,13 @@ use Icinga\Module\Monitoring\Object\Service;
             <?= $this->prefixedTimeSince($object->service_last_state_change, true); ?>
         </td>
         <td>
+            <?php if ($object->service_icon_image && ! preg_match('/[\'"]/', $object->service_icon_image)): ?>
+              <?= $this->icon($this->resolveMacros($object->service_icon_image, $object)) ?>
+            <?php endif ?>
             <strong><?= $this->translate('Service'); ?>: <?= $this->escape($object->service_display_name); ?></strong>
-          <?php if ($object->service_display_name !== $object->service_description): ?>
-            <small>(<?= $this->escape($object->service_description); ?>)</small>
-          <?php endif ?>
+            <?php if ($object->service_display_name !== $object->service_description): ?>
+              <small>(<?= $this->escape($object->service_description); ?>)</small>
+            <?php endif ?>
             <?= $this->render('partials/service/statusicons.phtml'); ?>
         </td>
     </tr>
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index 0d3d4840d..fe1e4b16a 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -16,6 +16,9 @@ $i = 0;
             <td class="state"><?= Service::getStateText($service->service_state, true); ?><br /></td>
             <td>
             <?= implode(' ', $this->serviceFlags($service)) ?>
+            <?php if ($service->service_icon_image && ! preg_match('/[\'"]/', $service->service_icon_image)): ?>
+                <?= $this->icon($this->resolveMacros($service->service_icon_image, $service)) ?>
+            <?php endif ?>
             <b>
                <?= $this->escape($service->getName()); ?>
                <?= $this->translate('on') ?>
diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 342e78812..2c01fe0eb 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -89,6 +89,7 @@ class Host extends MonitoredObject
     protected function getDataView()
     {
         $columns = array(
+            'host_icon_image',
             'host_acknowledged',
             'host_action_url',
             'host_active_checks_enabled',
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 7c22ae57d..fec5de238 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -106,6 +106,7 @@ class Service extends MonitoredObject
     protected function getDataView()
     {
         return $this->backend->select()->from('serviceStatus', array(
+            'host_icon_image',
             'host_acknowledged',
             'host_active_checks_enabled',
             'host_address',
@@ -118,6 +119,7 @@ class Service extends MonitoredObject
             'host_notifications_enabled',
             'host_passive_checks_enabled',
             'host_state',
+            'service_icon_image',
             'service_acknowledged',
             'service_action_url',
             'service_active_checks_enabled',

From 6ba07b089ddd7b9c76730455a60e2733784bdcbe Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 19 May 2015 17:31:17 +0200
Subject: [PATCH 1632/2920] Implement and use Hostgroupsummary and
 Servicegroupsummary

refs #8241
---
 .../application/controllers/ChartController.php      |  4 ++--
 .../application/controllers/ListController.php       |  4 ++--
 .../library/Monitoring/DataView/Groupsummary.php     |  5 -----
 .../library/Monitoring/DataView/Hostgroupsummary.php | 12 ++++++++++++
 .../Monitoring/DataView/Servicegroupsummary.php      | 12 ++++++++++++
 5 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
 create mode 100644 modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php

diff --git a/modules/monitoring/application/controllers/ChartController.php b/modules/monitoring/application/controllers/ChartController.php
index 39f60c304..d2e9f990c 100644
--- a/modules/monitoring/application/controllers/ChartController.php
+++ b/modules/monitoring/application/controllers/ChartController.php
@@ -163,7 +163,7 @@ class Monitoring_ChartController extends Controller
     public function hostgroupAction()
     {
         $query = $this->backend->select()->from(
-            'groupsummary',
+            'hostgroupsummary',
             array(
                 'hostgroup',
                 'hosts_up',
@@ -194,7 +194,7 @@ class Monitoring_ChartController extends Controller
     public function servicegroupAction()
     {
         $query = $this->backend->select()->from(
-            'groupsummary',
+            'servicegroupsummary',
             array(
                 'servicegroup',
                 'services_ok',
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index df5a10dee..01e2adc44 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -470,7 +470,7 @@ class Monitoring_ListController extends Controller
         );
         $this->setAutorefreshInterval(12);
 
-        $query = $this->backend->select()->from('groupsummary', array(
+        $query = $this->backend->select()->from('servicegroupsummary', array(
             'servicegroup_name',
             'servicegroup_alias',
             'hosts_up',
@@ -521,7 +521,7 @@ class Monitoring_ListController extends Controller
         $this->addTitleTab('hostgroups', $this->translate('Host Groups'), $this->translate('List host groups'));
         $this->setAutorefreshInterval(12);
 
-        $query = $this->backend->select()->from('groupsummary', array(
+        $query = $this->backend->select()->from('hostgroupsummary', array(
             'hostgroup_name',
             'hostgroup_alias',
             'hosts_up',
diff --git a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
index d29c1c418..f823d00a4 100644
--- a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
@@ -64,9 +64,4 @@ class Groupsummary extends DataView
             )
         );
     }
-
-    public function getFilterColumns()
-    {
-        return array('hostgroup', 'servicegroup');
-    }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
new file mode 100644
index 000000000..ba8e49987
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
@@ -0,0 +1,12 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\DataView;
+
+class Hostgroupsummary extends Groupsummary
+{
+    public function getFilterColumns()
+    {
+        return array('hostgroup');
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
new file mode 100644
index 000000000..550f8744c
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
@@ -0,0 +1,12 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\DataView;
+
+class Servicegroupsummary extends Groupsummary
+{
+    public function getFilterColumns()
+    {
+        return array('servicegroup');
+    }
+}

From 93db1d15cb7f4e13e406e7c05d91c1100d9def6d Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 19 May 2015 17:50:07 +0200
Subject: [PATCH 1633/2920] Override ::getSearchColumns()

refs #8241
---
 .../monitoring/library/Monitoring/DataView/HostStatus.php | 8 ++++++++
 .../library/Monitoring/DataView/Hostgroupsummary.php      | 8 ++++++++
 .../library/Monitoring/DataView/ServiceStatus.php         | 8 ++++++++
 .../library/Monitoring/DataView/Servicegroupsummary.php   | 8 ++++++++
 4 files changed, 32 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index 23df6d94a..eebe496a5 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -125,4 +125,12 @@ class HostStatus extends DataView
         }
         return parent::isValidFilterTarget($column);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSearchColumns()
+    {
+        return array('host', 'host_display_name');
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
index ba8e49987..b923b49e4 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
@@ -9,4 +9,12 @@ class Hostgroupsummary extends Groupsummary
     {
         return array('hostgroup');
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSearchColumns()
+    {
+        return array('hostgroup', 'hostgroup_alias');
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index b4f1038da..ff57266a3 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -183,4 +183,12 @@ class ServiceStatus extends DataView
         }
         return parent::isValidFilterTarget($column);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSearchColumns()
+    {
+        return array('service', 'service_display_name');
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
index 550f8744c..f21f49d3e 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
@@ -9,4 +9,12 @@ class Servicegroupsummary extends Groupsummary
     {
         return array('servicegroup');
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSearchColumns()
+    {
+        return array('servicegroup', 'servicegroup_alias');
+    }
 }

From 0b937c86dc6e4956857cc2e812c72cf50976960a Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 19 May 2015 18:00:47 +0200
Subject: [PATCH 1634/2920] Get columns for FilterEditor::setSearchColumns()
 from DataView::getSearchColumns()

refs #8241
---
 .../controllers/ListController.php            | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 01e2adc44..59fcd6f85 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -97,7 +97,7 @@ class Monitoring_ListController extends Controller
             'host_current_check_attempt',
             'host_max_check_attempts'
         ), $this->addColumns()));
-        $this->filterQuery($query, array('host', 'host_display_name'));
+        $this->filterQuery($query);
         $this->applyRestriction('monitoring/hosts/filter', $query);
         $this->view->hosts = $query;
 
@@ -181,7 +181,7 @@ class Monitoring_ListController extends Controller
             'max_check_attempts'    => 'service_max_check_attempts'
         ), $this->addColumns());
         $query = $this->backend->select()->from('serviceStatus', $columns);
-        $this->filterQuery($query, array('service', 'service_display_name'));
+        $this->filterQuery($query);
         $this->applyRestriction('monitoring/services/filter', $query);
         $this->view->services = $query;
 
@@ -499,7 +499,7 @@ class Monitoring_ListController extends Controller
         ))->order('services_severity')->order('servicegroup_alias');
         // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
         // service groups. We should separate them.
-        $this->filterQuery($query, array('servicegroup', 'servicegroup_alias'));
+        $this->filterQuery($query);
         $this->view->servicegroups = $query;
 
         $this->setupLimitControl();
@@ -556,7 +556,7 @@ class Monitoring_ListController extends Controller
         ))->order('services_severity')->order('hostgroup_alias');
         // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
         // service groups. We should separate them.
-        $this->filterQuery($query, array('hostgroup', 'hostgroup_alias'));
+        $this->filterQuery($query);
         $this->view->hostgroups = $query;
 
         $this->setupLimitControl();
@@ -631,11 +631,10 @@ class Monitoring_ListController extends Controller
      * Apply filters on a DataView
      *
      * @param DataView  $dataView       The DataView to apply filters on
-     * @param array     $searchColumns  Columns to search in
      *
      * @return DataView $dataView
      */
-    protected function filterQuery(DataView $dataView, array $searchColumns = null)
+    protected function filterQuery(DataView $dataView)
     {
         $editor = Widget::create('filterEditor')
             ->setQuery($dataView)
@@ -643,11 +642,9 @@ class Monitoring_ListController extends Controller
                 'limit', 'sort', 'dir', 'format', 'view', 'backend',
                 'stateType', 'addColumns', '_dev'
             )
-            ->ignoreParams('page');
-        if ($searchColumns !== null) {
-            $editor->setSearchColumns($searchColumns);
-        }
-        $editor->handleRequest($this->getRequest());
+            ->ignoreParams('page')
+            ->setSearchColumns($dataView->getSearchColumns())
+            ->handleRequest($this->getRequest());
         $dataView->applyFilter($editor->getFilter());
 
         $this->setupFilterControl($editor);

From a3d5cfc28a926a345c225482ba02034f0b67e2c7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 09:11:46 +0200
Subject: [PATCH 1635/2920] RepositoryQuery: Properly handle queries returning
 no results

refs #8826
---
 library/Icinga/Repository/RepositoryQuery.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index 8a86829fd..60848d69c 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -385,7 +385,7 @@ class RepositoryQuery implements QueryInterface, Iterator
         }
 
         $result = $this->query->fetchOne();
-        if ($this->repository->providesValueConversion()) {
+        if ($result !== false && $this->repository->providesValueConversion()) {
             $columns = $this->getColumns();
             $column = isset($columns[0]) ? $columns[0] : key($columns);
             return $this->repository->retrieveColumn($column, $result);
@@ -406,7 +406,7 @@ class RepositoryQuery implements QueryInterface, Iterator
         }
 
         $result = $this->query->fetchRow();
-        if ($this->repository->providesValueConversion()) {
+        if ($result !== false && $this->repository->providesValueConversion()) {
             foreach ($this->getColumns() as $alias => $column) {
                 if (! is_string($alias)) {
                     $alias = $column;
@@ -431,7 +431,7 @@ class RepositoryQuery implements QueryInterface, Iterator
         }
 
         $results = $this->query->fetchColumn();
-        if ($this->repository->providesValueConversion()) {
+        if ($results !== false && $this->repository->providesValueConversion()) {
             $columns = $this->getColumns();
             $aliases = array_keys($columns);
             $column = is_int($aliases[0]) ? $columns[0] : $aliases[0];
@@ -457,7 +457,7 @@ class RepositoryQuery implements QueryInterface, Iterator
         }
 
         $results = $this->query->fetchPairs();
-        if ($this->repository->providesValueConversion()) {
+        if (! empty($results) && $this->repository->providesValueConversion()) {
             $columns = $this->getColumns();
             $aliases = array_keys($columns);
             $newResults = array();
@@ -486,7 +486,7 @@ class RepositoryQuery implements QueryInterface, Iterator
         }
 
         $results = $this->query->fetchAll();
-        if ($this->repository->providesValueConversion()) {
+        if (! empty($results) && $this->repository->providesValueConversion()) {
             $columns = $this->getColumns();
             foreach ($results as $row) {
                 foreach ($columns as $alias => $column) {

From 093857641a8ded3ccdf88eb307cbd9ad6dd6a029 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 09:30:23 +0200
Subject: [PATCH 1636/2920] DbConnection: Cast a queries count to integer
 forcefully

---
 library/Icinga/Data/Db/DbConnection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php
index a7f933f88..1a79a0f2c 100644
--- a/library/Icinga/Data/Db/DbConnection.php
+++ b/library/Icinga/Data/Db/DbConnection.php
@@ -220,7 +220,7 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible
      */
     public function count(DbQuery $query)
     {
-        return $this->dbAdapter->fetchOne($query->getCountQuery());
+        return (int) $this->dbAdapter->fetchOne($query->getCountQuery());
     }
 
     /**

From 3a2238f737ca228a21d5a9225924a909f8658c5d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 17:12:18 +0200
Subject: [PATCH 1637/2920] Rename UrlParams::req() to ::getRequired()

req() seems mysterious :)
---
 library/Icinga/Web/UrlParams.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/UrlParams.php b/library/Icinga/Web/UrlParams.php
index e25fa7e6c..df5162459 100644
--- a/library/Icinga/Web/UrlParams.php
+++ b/library/Icinga/Web/UrlParams.php
@@ -54,7 +54,7 @@ class UrlParams
      *
      * @throws  MissingParameterException   If the parameter was not given
      */
-    public function req($name, $strict = true)
+    public function getRequired($name, $strict = true)
     {
         if ($this->has($name)) {
             $value = $this->get($name);

From 3d1c3609c026b6f24c68230f236a7f01168d1a58 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 17:21:53 +0200
Subject: [PATCH 1638/2920] lib: Add UrlParams::shiftRequired()

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

diff --git a/library/Icinga/Web/UrlParams.php b/library/Icinga/Web/UrlParams.php
index df5162459..d97f83b39 100644
--- a/library/Icinga/Web/UrlParams.php
+++ b/library/Icinga/Web/UrlParams.php
@@ -138,6 +138,30 @@ class UrlParams
         return $ret;
     }
 
+    /**
+     * Require and remove a parameter
+     *
+     * @param   string  $name               Name of the parameter
+     * @param   bool    $strict             Whether the parameter's value must not be the empty string
+     *
+     * @return  mixed
+     *
+     * @throws  MissingParameterException   If the parameter was not given
+     */
+    public function shiftRequired($name, $strict = true)
+    {
+        if ($this->has($name)) {
+            $value = $this->get($name);
+            if (! $strict || strlen($value) > 0) {
+                $this->shift($name);
+                return $value;
+            }
+        }
+        $e = new MissingParameterException(t('Required parameter \'%s\' missing'), $name);
+        $e->setParameter($name);
+        throw $e;
+    }
+
     public function addEncoded($param, $value = true)
     {
         $this->params[] = array($param, $this->cleanupValue($value));

From ccaebd1d73e8ad7195e98ad159422c79da92f5bd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 17:22:23 +0200
Subject: [PATCH 1639/2920] cli: Rename Params::req() to ::getRequired()

---
 library/Icinga/Cli/Params.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Cli/Params.php b/library/Icinga/Cli/Params.php
index 507c50e3b..d51e912e2 100644
--- a/library/Icinga/Cli/Params.php
+++ b/library/Icinga/Cli/Params.php
@@ -167,7 +167,7 @@ class Params
      *
      * @throws  MissingParameterException   If the parameter was not given
      */
-    public function req($name, $strict = true)
+    public function getRequired($name, $strict = true)
     {
         if ($this->has($name)) {
             $value = $this->get($name);

From 338fad5da95bbe4c5513ac899bf9b96a3f127aa4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 17:23:37 +0200
Subject: [PATCH 1640/2920] cli: Add Params::shiftRequired()

---
 library/Icinga/Cli/Params.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/library/Icinga/Cli/Params.php b/library/Icinga/Cli/Params.php
index d51e912e2..9e30cf19e 100644
--- a/library/Icinga/Cli/Params.php
+++ b/library/Icinga/Cli/Params.php
@@ -258,6 +258,30 @@ class Params
         return $result;
     }
 
+    /**
+     * Require and remove a parameter
+     *
+     * @param   string  $name               Name of the parameter
+     * @param   bool    $strict             Whether the parameter's value must not be the empty string
+     *
+     * @return  mixed
+     *
+     * @throws  MissingParameterException   If the parameter was not given
+     */
+    public function shiftRequired($name, $strict = true)
+    {
+        if ($this->has($name)) {
+            $value = $this->get($name);
+            if (! $strict || strlen($value) > 0) {
+                $this->shift($name);
+                return $value;
+            }
+        }
+        $e = new MissingParameterException(t('Required parameter \'%s\' missing'), $name);
+        $e->setParameter($name);
+        throw $e;
+    }
+
     /**
      * Put the given value onto the argument stack
      *

From 5a69c26d2cd3667ee7c4d535a92e11c4e261af21 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 17:24:05 +0200
Subject: [PATCH 1641/2920] Fix typo in PHPDoc of ConfirmRemovalForm::init()

---
 application/forms/ConfirmRemovalForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/forms/ConfirmRemovalForm.php b/application/forms/ConfirmRemovalForm.php
index 985413907..5d9ca86b4 100644
--- a/application/forms/ConfirmRemovalForm.php
+++ b/application/forms/ConfirmRemovalForm.php
@@ -11,7 +11,7 @@ use Icinga\Web\Form;
 class ConfirmRemovalForm extends Form
 {
     /**
-     * Initalize this form
+     * Initialize this form
      */
     public function init()
     {

From bd54784496d4d522d4693d3246d9f5e2d7ed19f3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 17:25:48 +0200
Subject: [PATCH 1642/2920] Don't override submit label in the
 ConfirmRemovalForm

---
 application/forms/ConfirmRemovalForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/forms/ConfirmRemovalForm.php b/application/forms/ConfirmRemovalForm.php
index 5d9ca86b4..357928cd0 100644
--- a/application/forms/ConfirmRemovalForm.php
+++ b/application/forms/ConfirmRemovalForm.php
@@ -16,6 +16,6 @@ class ConfirmRemovalForm extends Form
     public function init()
     {
         $this->setName('form_confirm_removal');
-        $this->setSubmitLabel($this->translate('Confirm Removal'));
+        $this->getSubmitLabel() ?: $this->setSubmitLabel($this->translate('Confirm Removal'));
     }
 }

From 902c00e836fad029ee2279f1712e31abf382779a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 17:29:34 +0200
Subject: [PATCH 1643/2920] lib: Introduce Controller::httpNotFound()

Many actions require loading specific objects from database or any other storage.
If the object isn't found, Controller::httpNotFound($message) should be used
for immediately returning w/ HTTP 404.
---
 library/Icinga/Web/Controller.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index 9acf17469..0975d4c13 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Web;
 
+use Zend_Controller_Action_Exception;
 use Icinga\Data\Sortable;
 use Icinga\Data\QueryInterface;
 use Icinga\Web\Controller\ModuleActionController;
@@ -49,6 +50,18 @@ class Controller extends ModuleActionController
         }
     }
 
+    /**
+     * Immediately respond w/ HTTP 404
+     *
+     * @param   $message
+     *
+     * @throws  Zend_Controller_Action_Exception
+     */
+    public function httpNotFound($message)
+    {
+        throw new Zend_Controller_Action_Exception($message, 404);
+    }
+
     /**
      * Create a SortBox widget and apply its sort rules on the given query
      *

From 9b4f08eb433879f520dc7f93a4e205ae9bc631b5 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 20 May 2015 10:43:54 +0200
Subject: [PATCH 1644/2920] Implement classes HostgroupsummaryQuery and
 ServicegroupsummaryQuery

Without this the Hostgroupsummary and Servicegroupsummary DataViews would not work

refs #8241
---
 .../Backend/Ido/Query/HostgroupsummaryQuery.php           | 8 ++++++++
 .../Backend/Ido/Query/ServicegroupsummaryQuery.php        | 8 ++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
new file mode 100644
index 000000000..5711b88f5
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
@@ -0,0 +1,8 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+class HostgroupsummaryQuery extends GroupsummaryQuery
+{
+}
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php
new file mode 100644
index 000000000..c50519d94
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php
@@ -0,0 +1,8 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+class ServicegroupsummaryQuery extends GroupsummaryQuery
+{
+}

From 7dff1ca2b81b3dff71c365b42763d4322b9684cf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 10:52:50 +0200
Subject: [PATCH 1645/2920] UserController: Do not throw
 Zend_Controller_Action_Exception (404)

Use Controller::httpNotFound() instead.

refs #8826
---
 application/controllers/UserController.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index b88898a54..3481b7e8a 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -135,10 +135,7 @@ class UserController extends Controller
         if ($name !== null) {
             $config = Config::app('authentication');
             if (! $config->hasSection($name)) {
-                throw new Zend_Controller_Action_Exception(
-                    sprintf($this->translate('Authentication backend "%s" not found'), $name),
-                    404
-                );
+                $this->httpNotFound(sprintf($this->translate('Authentication backend "%s" not found'), $name));
             } else {
                 $backend = UserBackend::create($name, $config->getSection($name));
                 if ($interface && !$backend instanceof $interface) {

From 8ea3cd0a133c0248fceadebf3c07e71466eed304 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 10:53:31 +0200
Subject: [PATCH 1646/2920] Introduce class RepositoryForm

refs #8826
---
 application/forms/RepositoryForm.php | 336 +++++++++++++++++++++++++++
 1 file changed, 336 insertions(+)
 create mode 100644 application/forms/RepositoryForm.php

diff --git a/application/forms/RepositoryForm.php b/application/forms/RepositoryForm.php
new file mode 100644
index 000000000..89b8940a4
--- /dev/null
+++ b/application/forms/RepositoryForm.php
@@ -0,0 +1,336 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Forms;
+
+use Exception;
+use Icinga\Data\Filter\Filter;
+use Icinga\Repository\Repository;
+use Icinga\Web\Form;
+use Icinga\Web\Notification;
+
+/**
+ * Form base-class providing standard functionality for extensible, updatable and reducible repositories
+ */
+abstract class RepositoryForm extends Form
+{
+    /**
+     * Insert mode
+     */
+    const MODE_INSERT = 0;
+
+    /**
+     * Update mode
+     */
+    const MODE_UPDATE = 1;
+
+    /**
+     * Delete mode
+     */
+    const MODE_DELETE = 2;
+
+    /**
+     * The repository being worked with
+     *
+     * @var Repository 
+     */
+    protected $repository;
+
+    /**
+     * How to interact with the repository
+     *
+     * @var int
+     */
+    protected $mode;
+
+    /**
+     * The name of the entry being handled when in mode update or delete
+     *
+     * @var string
+     */
+    protected $identifier;
+
+    /**
+     * The data of the entry to pre-populate the form with when in mode insert or update
+     *
+     * @var type 
+     */
+    protected $data;
+
+    /**
+     * Set the repository to work with
+     *
+     * @param   Repository  $repository
+     *
+     * @return  $this
+     */
+    public function setRepository(Repository $repository)
+    {
+        $this->repository = $repository;
+        return $this;
+    }
+
+    /**
+     * Return the name of the entry to handle
+     *
+     * @return  string
+     */
+    protected function getIdentifier()
+    {
+        return $this->identifier;
+    }
+
+    /**
+     * Return the current data of the entry being handled
+     *
+     * @return  array
+     */
+    protected function getData()
+    {
+        return $this->data;
+    }
+
+    /**
+     * Return whether an entry should be inserted
+     *
+     * @return  bool
+     */
+    public function shouldInsert()
+    {
+        return $this->mode === self::MODE_INSERT;
+    }
+
+    /**
+     * Return whether an entry should be udpated
+     *
+     * @return  bool
+     */
+    public function shouldUpdate()
+    {
+        return $this->mode === self::MODE_UPDATE;
+    }
+
+    /**
+     * Return whether an entry should be deleted
+     *
+     * @return  bool
+     */
+    public function shouldDelete()
+    {
+        return $this->mode === self::MODE_DELETE;
+    }
+
+    /**
+     * Add a new entry
+     *
+     * @param   array   $data   The defaults to use, if any
+     *
+     * @return  $this
+     */
+    public function add(array $data = array())
+    {
+        $this->mode = static::MODE_INSERT;
+        $this->data = $data;
+        return $this;
+    }
+
+    /**
+     * Edit an entry
+     *
+     * @param   string  $name   The entry's name
+     * @param   array   $data   The entry's current data
+     *
+     * @return  $this
+     */
+    public function edit($name, array $data = array())
+    {
+        $this->mode = static::MODE_UPDATE;
+        $this->identifier = $name;
+        $this->data = $data;
+        return $this;
+    }
+
+    /**
+     * Remove an entry
+     *
+     * @param   string  $name   The entry's name
+     *
+     * @return  $this
+     */
+    public function remove($name)
+    {
+        $this->mode = static::MODE_DELETE;
+        $this->identifier = $name;
+        return $this;
+    }
+
+    /**
+     * Create and add elements to this form
+     *
+     * @param   array   $formData   The data sent by the user
+     */
+    public function createElements(array $formData)
+    {
+        if ($this->shouldInsert()) {
+            $this->createInsertElements($formData);
+        } elseif ($this->shouldUpdate()) {
+            $this->createUpdateElements($formData);
+        } elseif ($this->shouldDelete()) {
+            $this->createDeleteElements($formData);
+        }
+    }
+
+    /**
+     * Populate the data of the entry being handled
+     */
+    public function onRequest()
+    {
+        $data = $this->getData();
+        if (! empty($data)) {
+            $this->populate($data);
+        }
+    }
+
+    /**
+     * Apply the requested mode on the repository
+     *
+     * @return  bool
+     */
+    public function onSuccess()
+    {
+        if ($this->shouldInsert()) {
+            return $this->onInsertSuccess();
+        } elseif ($this->shouldUpdate()) {
+            return $this->onUpdateSuccess();
+        } elseif ($this->shouldDelete()) {
+            return $this->onDeleteSuccess();
+        }
+    }
+
+    /**
+     * Apply mode insert on the repository
+     *
+     * @return  bool
+     */
+    protected function onInsertSuccess()
+    {
+        try {
+            $this->repository->insert(
+                $this->repository->getBaseTable(),
+                $this->getValues()
+            );
+        } catch (Exception $e) {
+            Notification::error($this->getInsertMessage(false));
+            $this->error($e->getMessage());
+            return false;
+        }
+
+        Notification::success($this->getInsertMessage(true));
+        return true;
+    }
+
+    /**
+     * Apply mode update on the repository
+     *
+     * @return  bool
+     */
+    protected function onUpdateSuccess()
+    {
+        try {
+            $this->repository->update(
+                $this->repository->getBaseTable(),
+                $this->getValues(),
+                $this->createFilter()
+            );
+        } catch (Exception $e) {
+            Notification::error($this->getUpdateMessage(false));
+            $this->error($e->getMessage());
+            return false;
+        }
+
+        Notification::success($this->getUpdateMessage(true));
+        return true;
+    }
+
+    /**
+     * Apply mode delete on the repository
+     *
+     * @return  bool
+     */
+    protected function onDeleteSuccess()
+    {
+        try {
+            $this->repository->delete(
+                $this->repository->getBaseTable(),
+                $this->createFilter()
+            );
+        } catch (Exception $e) {
+            Notification::error($this->getDeleteMessage(false));
+            $this->error($e->getMessage());
+            return false;
+        }
+
+        Notification::success($this->getDeleteMessage(true));
+        return true;
+    }
+
+    /**
+     * Create and add elements to this form to insert an entry
+     *
+     * @param   array   $formData   The data sent by the user
+     */
+    abstract protected function createInsertElements(array $formData);
+
+    /**
+     * Create and add elements to this form to update an entry
+     *
+     * Calls createInsertElements() by default. Overwrite this to add different elements when in mode update.
+     *
+     * @param   array   $formData   The data sent by the user
+     */
+    protected function createUpdateElements(array $formData)
+    {
+        $this->createInsertElements($formData);
+    }
+
+    /**
+     * Create and add elements to this form to delete an entry
+     *
+     * @param   array   $formData   The data sent by the user
+     */
+    abstract protected function createDeleteElements(array $formData);
+
+    /**
+     * Create and return a filter to use when selecting, updating or deleting an entry
+     *
+     * @return  Filter
+     */
+    abstract protected function createFilter();
+
+    /**
+     * Return a notification message to use when inserting an entry
+     *
+     * @param   bool    $success    true or false, whether the operation was successful
+     *
+     * @return  string
+     */
+    abstract protected function getInsertMessage($success);
+
+    /**
+     * Return a notification message to use when updating an entry
+     *
+     * @param   bool    $success    true or false, whether the operation was successful
+     *
+     * @return  string
+     */
+    abstract protected function getUpdateMessage($success);
+
+    /**
+     * Return a notification message to use when deleting an entry
+     *
+     * @param   bool    $success    true or false, whether the operation was successful
+     *
+     * @return  string
+     */
+    abstract protected function getDeleteMessage($success);
+}

From 32d15695201b50111ad6e9afb43079c4b8e7d2b3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 10:54:06 +0200
Subject: [PATCH 1647/2920] Introduce class UserForm

refs #8826
---
 application/forms/Config/UserForm.php | 157 ++++++++++++++++++++++++++
 1 file changed, 157 insertions(+)
 create mode 100644 application/forms/Config/UserForm.php

diff --git a/application/forms/Config/UserForm.php b/application/forms/Config/UserForm.php
new file mode 100644
index 000000000..fb20ab8e3
--- /dev/null
+++ b/application/forms/Config/UserForm.php
@@ -0,0 +1,157 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Forms\Config;
+
+use Icinga\Data\Filter\Filter;
+use Icinga\Forms\RepositoryForm;
+
+class UserForm extends RepositoryForm
+{
+    /**
+     * Create and add elements to this form to insert or update a user
+     *
+     * @param   array   $formData   The data sent by the user
+     */
+    protected function createInsertElements(array $formData)
+    {
+        $this->addElement(
+            'checkbox',
+            'is_active',
+            array(
+                'required'      => true,
+                'value'         => true,
+                'label'         => $this->translate('Active'),
+                'description'   => $this->translate('Prevents the user from logging in if unchecked')
+            )
+        );
+        $this->addElement(
+            'text',
+            'user_name',
+            array(
+                'required'  => true,
+                'label'     => $this->translate('Username')
+            )
+        );
+        $this->addElement(
+            'text',
+            'password',
+            array(
+                'required'  => true,
+                'label'     => $this->translate('Password')
+            )
+        );
+
+        $this->setTitle($this->translate('Add a new user'));
+        $this->setSubmitLabel($this->translate('Add'));
+    }
+
+    /**
+     * Create and add elements to this form to update a user
+     *
+     * @param   array   $formData   The data sent by the user
+     */
+    protected function createUpdateElements(array $formData)
+    {
+        $this->createInsertElements($formData);
+
+        $this->addElement(
+            'text',
+            'password',
+            array(
+                'label' => $this->translate('Password')
+            )
+        );
+
+        $this->setTitle(sprintf($this->translate('Edit user %s'), $this->getIdentifier()));
+        $this->setSubmitLabel($this->translate('Save'));
+    }
+
+    /**
+     * Retrieve all form element values
+     *
+     * Strips off the password if null or the empty string.
+     *
+     * @param   bool    $suppressArrayNotation
+     *
+     * @return  array
+     */
+    public function getValues($suppressArrayNotation = false)
+    {
+        $values = parent::getValues($suppressArrayNotation);
+        if (! $values['password']) {
+            unset($values['password']);
+        }
+
+        return $values;
+    }
+
+    /**
+     * Create and add elements to this form to delete a user
+     *
+     * @param   array   $formData   The data sent by the user
+     */
+    protected function createDeleteElements(array $formData)
+    {
+        $this->setTitle(sprintf($this->translate('Remove user %s?'), $this->getIdentifier()));
+        $this->setSubmitLabel($this->translate('Yes'));
+    }
+
+    /**
+     * Create and return a filter to use when updating or deleting a user
+     *
+     * @return  Filter
+     */
+    protected function createFilter()
+    {
+        return Filter::where('user_name', $this->getIdentifier());
+    }
+
+    /**
+     * Return a notification message to use when inserting a user
+     *
+     * @param   bool    $success    true or false, whether the operation was successful
+     *
+     * @return  string
+     */
+    protected function getInsertMessage($success)
+    {
+        if ($success) {
+            return $this->translate('User added successfully');
+        } else {
+            return $this->translate('Failed to add user');
+        }
+    }
+
+    /**
+     * Return a notification message to use when updating a user
+     *
+     * @param   bool    $success    true or false, whether the operation was successful
+     *
+     * @return  string
+     */
+    protected function getUpdateMessage($success)
+    {
+        if ($success) {
+            return sprintf($this->translate('User "%s" has been edited'), $this->getIdentifier());
+        } else {
+            return sprintf($this->translate('Failed to edit user "%s"'), $this->getIdentifier());
+        }
+    }
+
+    /**
+     * Return a notification message to use when deleting a user
+     *
+     * @param   bool    $success    true or false, whether the operation was successful
+     *
+     * @return  string
+     */
+    protected function getDeleteMessage($success)
+    {
+        if ($success) {
+            return sprintf($this->translate('User "%s" has been removed'), $this->getIdentifier());
+        } else {
+            return sprintf($this->translate('Failed to remove user "%s"'), $this->getIdentifier());
+        }
+    }
+}

From 605ae3d8028c388edfaf9a39097fab12dd243ae1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 10:54:42 +0200
Subject: [PATCH 1648/2920] UserController: Introduce addAction, editAction and
 removeAction

refs #8826
---
 application/controllers/UserController.php | 55 ++++++++++++++++++++++
 application/views/scripts/user/form.phtml  |  6 +++
 2 files changed, 61 insertions(+)
 create mode 100644 application/views/scripts/user/form.phtml

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 3481b7e8a..03cc06b20 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -7,6 +7,7 @@ use Icinga\Application\Config;
 use Icinga\Application\Logger;
 use Icinga\Authentication\User\UserBackend;
 use Icinga\Authentication\User\UserBackendInterface;
+use Icinga\Forms\Config\UserForm;
 use Icinga\Web\Controller;
 use Icinga\Web\Form;
 use Icinga\Web\Notification;
@@ -100,6 +101,60 @@ class UserController extends Controller
         );
     }
 
+    /**
+     * Add a user
+     */
+    public function addAction()
+    {
+        $form = new UserForm();
+        $form->setRepository($this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Extensible'));
+        $form->add()->handleRequest();
+
+        $this->view->form = $form;
+        $this->render('form');
+    }
+
+    /**
+     * Edit a user
+     */
+    public function editAction()
+    {
+        $userName = $this->params->getRequired('user');
+        $backend = $this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Updatable');
+
+        $row = $backend->select(array('user_name', 'is_active'))->where('user_name', $userName)->fetchRow();
+        if ($row === false) {
+            $this->httpNotFound(sprintf($this->translate('User "%s" not found'), $userName));
+        }
+
+        $form = new UserForm();
+        $form->setRepository($backend);
+        $form->edit($userName, get_object_vars($row))->handleRequest();
+
+        $this->view->form = $form;
+        $this->render('form');
+    }
+
+    /**
+     * Remove a user
+     */
+    public function removeAction()
+    {
+        $userName = $this->params->getRequired('user');
+        $backend = $this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Reducible');
+
+        if ($backend->select()->where('user_name', $userName)->count() === 0) {
+            $this->httpNotFound(sprintf($this->translate('User "%s" not found'), $userName));
+        }
+
+        $form = new UserForm();
+        $form->setRepository($backend);
+        $form->remove($userName)->handleRequest();
+
+        $this->view->form = $form;
+        $this->render('form');
+    }
+
     /**
      * Return all user backends implementing the given interface
      *
diff --git a/application/views/scripts/user/form.phtml b/application/views/scripts/user/form.phtml
new file mode 100644
index 000000000..cbf06590d
--- /dev/null
+++ b/application/views/scripts/user/form.phtml
@@ -0,0 +1,6 @@
+<div class="controls">
+  <?= $tabs->showOnlyCloseButton(); ?>
+</div>
+<div class="content">
+  <?= $form; ?>
+</div>
\ No newline at end of file

From bd07f78d94ac591c2b273aa8812c1be5a799c690 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 10:59:41 +0200
Subject: [PATCH 1649/2920] GroupController: Do not throw
 Zend_Controller_Action_Exception (404)

Use Controller::httpNotFound() instead.

refs #8826
---
 application/controllers/GroupController.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index aefcb6eac..ffaadd76a 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -135,10 +135,7 @@ class GroupController extends Controller
         if ($name !== null) {
             $config = Config::app('groups');
             if (! $config->hasSection($name)) {
-                throw new Zend_Controller_Action_Exception(
-                    sprintf($this->translate('User group backend "%s" not found'), $name),
-                    404
-                );
+                $this->httpNotFound(sprintf($this->translate('User group backend "%s" not found'), $name));
             } else {
                 $backend = UserGroupBackend::create($name, $config->getSection($name));
                 if ($interface && !$backend instanceof $interface) {

From 0dda19dc7a67b023c8aa4fde8e3e13fa5dd9ac64 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 11:50:09 +0200
Subject: [PATCH 1650/2920] DbRepository: Remove the table prefix when
 resolving statement columns

refs #8826
---
 library/Icinga/Repository/DbRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index 1e511abe7..aec2a4639 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -348,7 +348,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
             return $statementColumnMap[$alias];
         }
 
-        $prefixedAlias = $table . '.' . $alias;
+        $prefixedAlias = $this->removeTablePrefix($table) . '.' . $alias;
         if (isset($statementColumnMap[$prefixedAlias])) {
             return $statementColumnMap[$prefixedAlias];
         }

From 9c6a8898fdd98e29b05ab3e1427af5217c3fa2e4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 11:53:04 +0200
Subject: [PATCH 1651/2920] Introduce class UserGroupForm

refs #8826
---
 application/forms/Config/UserGroupForm.php | 104 +++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 application/forms/Config/UserGroupForm.php

diff --git a/application/forms/Config/UserGroupForm.php b/application/forms/Config/UserGroupForm.php
new file mode 100644
index 000000000..80a48643f
--- /dev/null
+++ b/application/forms/Config/UserGroupForm.php
@@ -0,0 +1,104 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Forms\Config;
+
+use Icinga\Data\Filter\Filter;
+use Icinga\Forms\RepositoryForm;
+
+class UserGroupForm extends RepositoryForm
+{
+    /**
+     * Create and add elements to this form to insert or update a group
+     *
+     * @param   array   $formData   The data sent by the user
+     */
+    protected function createInsertElements(array $formData)
+    {
+        $this->addElement(
+            'text',
+            'group_name',
+            array(
+                'required'  => true,
+                'label'     => $this->translate('Group Name')
+            )
+        );
+
+        if ($this->shouldInsert()) {
+            $this->setTitle($this->translate('Add a new group'));
+            $this->setSubmitLabel($this->translate('Add'));
+        } else { // $this->shouldUpdate()
+            $this->setTitle(sprintf($this->translate('Edit group %s'), $this->getIdentifier()));
+            $this->setSubmitLabel($this->translate('Save'));
+        }
+    }
+
+    /**
+     * Create and add elements to this form to delete a group
+     *
+     * @param   array   $formData   The data sent by the user
+     */
+    protected function createDeleteElements(array $formData)
+    {
+        $this->setTitle(sprintf($this->translate('Remove group %s?'), $this->getIdentifier()));
+        $this->setSubmitLabel($this->translate('Yes'));
+    }
+
+    /**
+     * Create and return a filter to use when updating or deleting a group
+     *
+     * @return  Filter
+     */
+    protected function createFilter()
+    {
+        return Filter::where('group_name', $this->getIdentifier());
+    }
+
+    /**
+     * Return a notification message to use when inserting a group
+     *
+     * @param   bool    $success    true or false, whether the operation was successful
+     *
+     * @return  string
+     */
+    protected function getInsertMessage($success)
+    {
+        if ($success) {
+            return $this->translate('Group added successfully');
+        } else {
+            return $this->translate('Failed to add group');
+        }
+    }
+
+    /**
+     * Return a notification message to use when updating a group
+     *
+     * @param   bool    $success    true or false, whether the operation was successful
+     *
+     * @return  string
+     */
+    protected function getUpdateMessage($success)
+    {
+        if ($success) {
+            return sprintf($this->translate('Group "%s" has been edited'), $this->getIdentifier());
+        } else {
+            return sprintf($this->translate('Failed to edit group "%s"'), $this->getIdentifier());
+        }
+    }
+
+    /**
+     * Return a notification message to use when deleting a group
+     *
+     * @param   bool    $success    true or false, whether the operation was successful
+     *
+     * @return  string
+     */
+    protected function getDeleteMessage($success)
+    {
+        if ($success) {
+            return sprintf($this->translate('Group "%s" has been removed'), $this->getIdentifier());
+        } else {
+            return sprintf($this->translate('Failed to remove group "%s"'), $this->getIdentifier());
+        }
+    }
+}

From 539b824470c5e6c9b1b437ecf910cfcf2b1ce0de Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 11:54:28 +0200
Subject: [PATCH 1652/2920] GroupController: Introduce addAction, editAction
 and removeAction

refs #8826
---
 application/controllers/GroupController.php | 57 +++++++++++++++++++++
 application/views/scripts/group/form.phtml  |  6 +++
 2 files changed, 63 insertions(+)
 create mode 100644 application/views/scripts/group/form.phtml

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index ffaadd76a..7e30f7ccd 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -7,6 +7,7 @@ use Icinga\Application\Config;
 use Icinga\Application\Logger;
 use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Authentication\UserGroup\UserGroupBackendInterface;
+use Icinga\Forms\Config\UserGroupForm;
 use Icinga\Web\Controller;
 use Icinga\Web\Form;
 use Icinga\Web\Notification;
@@ -100,6 +101,62 @@ class GroupController extends Controller
         );
     }
 
+    /**
+     * Add a group
+     */
+    public function addAction()
+    {
+        $form = new UserGroupForm();
+        $form->setRepository(
+            $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Extensible')
+        );
+        $form->add()->handleRequest();
+
+        $this->view->form = $form;
+        $this->render('form');
+    }
+
+    /**
+     * Edit a group
+     */
+    public function editAction()
+    {
+        $groupName = $this->params->getRequired('group');
+        $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Updatable');
+
+        $row = $backend->select(array('group_name'))->where('group_name', $groupName)->fetchRow();
+        if ($row === false) {
+            $this->httpNotFound(sprintf($this->translate('Group "%s" not found'), $groupName));
+        }
+
+        $form = new UserGroupForm();
+        $form->setRepository($backend);
+        $form->edit($groupName, get_object_vars($row))->handleRequest();
+
+        $this->view->form = $form;
+        $this->render('form');
+    }
+
+    /**
+     * Remove a group
+     */
+    public function removeAction()
+    {
+        $groupName = $this->params->getRequired('group');
+        $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Reducible');
+
+        if ($backend->select()->where('group_name', $groupName)->count() === 0) {
+            $this->httpNotFound(sprintf($this->translate('Group "%s" not found'), $groupName));
+        }
+
+        $form = new UserGroupForm();
+        $form->setRepository($backend);
+        $form->remove($groupName)->handleRequest();
+
+        $this->view->form = $form;
+        $this->render('form');
+    }
+
     /**
      * Return all user group backends implementing the given interface
      *
diff --git a/application/views/scripts/group/form.phtml b/application/views/scripts/group/form.phtml
new file mode 100644
index 000000000..cbf06590d
--- /dev/null
+++ b/application/views/scripts/group/form.phtml
@@ -0,0 +1,6 @@
+<div class="controls">
+  <?= $tabs->showOnlyCloseButton(); ?>
+</div>
+<div class="content">
+  <?= $form; ?>
+</div>
\ No newline at end of file

From a524b1433ec11f9a0cd83246b27eded00caa3590 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 20 May 2015 13:48:51 +0200
Subject: [PATCH 1653/2920] Don't let a long plugin output make the whole
 container horizontally scrollable

fixes #8941
---
 public/css/icinga/monitoring-colors.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index ba0877232..020db57cd 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -23,7 +23,7 @@ table.action {
   border-collapse: separate;
   border-spacing: 1px;
   width: 100%;
-  table-layout: fixed;
+  table-layout: fixed !important;
   margin: 0;
   color: @colorTextDefault;
 }

From fecf7a52b03bcbf6d4675bfa61f10ff4c63a92b3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 13:53:19 +0200
Subject: [PATCH 1654/2920] UserController: Add links to add and delete users
 to the list action's view

refs #8826
---
 application/views/scripts/user/list.phtml | 36 ++++++++++++++++++++++-
 public/css/icinga/main-content.less       |  4 +--
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index c7904f9b4..5824f7681 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -1,4 +1,9 @@
-<?php if (! $this->compact): ?>
+<?php
+
+use Icinga\Data\Extensible;
+use Icinga\Data\Reducible;
+
+if (! $this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
   <?= $this->sortBox; ?>
@@ -16,6 +21,9 @@
 if ($backend === null) {
     echo $this->translate('No backend found which is able to list users') . '</div>';
     return;
+} else {
+    $extensible = $backend instanceof Extensible;
+    $reducible = $backend instanceof Reducible;
 }
 
 if (! isset($users)) {
@@ -36,6 +44,9 @@ if (count($users) === 0) {
       <th class="user-state"><?= $this->translate('State'); ?></th>
       <th class="user-created"><?= $this->translate('Created at'); ?></th>
       <th class="user-modified"><?= $this->translate('Last modified'); ?></th>
+     <?php if ($reducible): ?>
+      <th class="user-remove"><?= $this->translate('Remove'); ?></th>
+     <?php endif ?>
     </tr>
   </thead>
   <tbody>
@@ -51,8 +62,31 @@ if (count($users) === 0) {
       <td class="user-modified">
         <?= $user->last_modified === null ? $this->translate('Never') : date('d/m/Y g:i A', $user->last_modified); ?>
       </td>
+     <?php if ($reducible): ?>
+      <td class="user-remove">
+        <?= $this->qlink(
+          null,
+          'user/remove',
+          array(
+            'backend'   => $backend->getName(),
+            'user'      => $user->user_name
+          ),
+          array(
+            'title'     => sprintf($this->translate('Remove user %s'), $user->user_name),
+            'icon'      => 'trash'
+          )
+        ); ?>
+      </td>
+     <?php endif ?>
     </tr>
   <?php endforeach ?>
   </tbody>
 </table>
+<?php if ($extensible): ?>
+<?= $this->qlink($this->translate('Add a new user'), 'user/add', array('backend' => $backend->getName()), array(
+  'icon'                => 'plus',
+  'data-base-target'    => '_next',
+  'class'               => 'user-add'
+)); ?>
+<?php endif ?>
 </div>
\ No newline at end of file
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index a3e8cb69c..ac4549d1e 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -205,7 +205,7 @@ table.benchmark {
 
 table.user-list {
   th {
-    &.user-state {
+    &.user-state, &.user-remove {
       width: 6%;
       padding-right: 0.5em;
       text-align: right;
@@ -218,7 +218,7 @@ table.user-list {
     }
   }
 
-  td.user-state, td.user-created, td.user-modified {
+  td.user-state, td.user-created, td.user-modified, td.user-remove {
     text-align: right;
   }
 }

From f86a05e0c332586f93afda02a01b483b8a7416a7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 13:54:05 +0200
Subject: [PATCH 1655/2920] UserController: Use proper redirect urls when
 adding and removing users

refs #8826
---
 application/controllers/UserController.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 03cc06b20..bb318c7f7 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -11,6 +11,7 @@ use Icinga\Forms\Config\UserForm;
 use Icinga\Web\Controller;
 use Icinga\Web\Form;
 use Icinga\Web\Notification;
+use Icinga\Web\Url;
 use Icinga\Web\Widget;
 
 class UserController extends Controller
@@ -106,8 +107,10 @@ class UserController extends Controller
      */
     public function addAction()
     {
+        $backend = $this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Extensible');
         $form = new UserForm();
-        $form->setRepository($this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Extensible'));
+        $form->setRedirectUrl(Url::fromPath('user/list', array('backend' => $backend->getName())));
+        $form->setRepository($backend);
         $form->add()->handleRequest();
 
         $this->view->form = $form;
@@ -148,6 +151,7 @@ class UserController extends Controller
         }
 
         $form = new UserForm();
+        $form->setRedirectUrl(Url::fromPath('user/list', array('backend' => $backend->getName())));
         $form->setRepository($backend);
         $form->remove($userName)->handleRequest();
 

From 66611d4887f0fc801230c89fce7c9a4cbf2d796c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 14:06:59 +0200
Subject: [PATCH 1656/2920] GroupController: Use proper redirect urls when
 adding and removing groups

refs #8826
---
 application/controllers/GroupController.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 7e30f7ccd..4a0652e4e 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -11,6 +11,7 @@ use Icinga\Forms\Config\UserGroupForm;
 use Icinga\Web\Controller;
 use Icinga\Web\Form;
 use Icinga\Web\Notification;
+use Icinga\Web\Url;
 use Icinga\Web\Widget;
 
 class GroupController extends Controller
@@ -106,10 +107,10 @@ class GroupController extends Controller
      */
     public function addAction()
     {
+        $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Extensible');
         $form = new UserGroupForm();
-        $form->setRepository(
-            $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Extensible')
-        );
+        $form->setRedirectUrl(Url::fromPath('group/list', array('backend' => $backend->getName())));
+        $form->setRepository($backend);
         $form->add()->handleRequest();
 
         $this->view->form = $form;
@@ -150,6 +151,7 @@ class GroupController extends Controller
         }
 
         $form = new UserGroupForm();
+        $form->setRedirectUrl(Url::fromPath('group/list', array('backend' => $backend->getName())));
         $form->setRepository($backend);
         $form->remove($groupName)->handleRequest();
 

From 4a48997f479c8768ba1e390f2ea7b2cb27b97bc1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 14:07:24 +0200
Subject: [PATCH 1657/2920] GroupController: Add links to add and remove groups
 to the list action's view

refs #8826
---
 application/views/scripts/group/list.phtml | 48 ++++++++++++++++++----
 public/css/icinga/main-content.less        | 28 ++++++++-----
 2 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
index 9b1b545d2..3d9afd9b4 100644
--- a/application/views/scripts/group/list.phtml
+++ b/application/views/scripts/group/list.phtml
@@ -1,4 +1,9 @@
-<?php if (! $this->compact): ?>
+<?php
+
+use Icinga\Data\Extensible;
+use Icinga\Data\Reducible;
+
+if (! $this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
   <?= $this->sortBox; ?>
@@ -10,12 +15,15 @@
   </div>
 </div>
 <?php endif ?>
-<div class="content">
+<div class="content groups">
 <?php
 
 if ($backend === null) {
     echo $this->translate('No backend found which is able to list groups') . '</div>';
     return;
+} else {
+    $extensible = $backend instanceof Extensible;
+    $reducible = $backend instanceof Reducible;
 }
 
 if (! isset($groups)) {
@@ -23,12 +31,7 @@ if (! isset($groups)) {
     return;
 }
 
-if (count($groups) === 0) {
-    echo $this->translate('No groups found matching the filter') . '</div>';
-    return;
-}
-?>
-
+if (count($groups) > 0): ?>
 <table data-base-target="_next" class="action group-list">
   <thead>
     <tr>
@@ -36,6 +39,9 @@ if (count($groups) === 0) {
       <th class="group-parent"><?= $this->translate('Parent'); ?></th>
       <th class="group-created"><?= $this->translate('Created at'); ?></th>
       <th class="group-modified"><?= $this->translate('Last modified'); ?></th>
+     <?php if ($reducible): ?>
+      <th class="group-remove"><?= $this->translate('Remove'); ?></th>
+     <?php endif ?>
     </tr>
   </thead>
   <tbody>
@@ -51,8 +57,34 @@ if (count($groups) === 0) {
       <td class="group-modified">
         <?= $group->last_modified === null ? $this->translate('Never') : date('d/m/Y g:i A', $group->last_modified); ?>
       </td>
+     <?php if ($reducible): ?>
+      <td class="group-remove">
+        <?= $this->qlink(
+          null,
+          'group/remove',
+          array(
+            'backend'   => $backend->getName(),
+            'group'     => $group->group_name
+          ),
+          array(
+            'title'     => sprintf($this->translate('Remove group %s'), $group->group_name),
+            'icon'      => 'trash'
+          )
+        ); ?>
+      </td>
+     <?php endif ?>
     </tr>
   <?php endforeach ?>
   </tbody>
 </table>
+<?php else: ?>
+<p><?= $this->translate('No groups found matching the filter'); ?></p>
+<?php endif ?>
+<?php if ($extensible): ?>
+<?= $this->qlink($this->translate('Add a new group'), 'group/add', array('backend' => $backend->getName()), array(
+  'icon'                => 'plus',
+  'data-base-target'    => '_next',
+  'class'               => 'group-add'
+)); ?>
+<?php endif ?>
 </div>
\ No newline at end of file
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index ac4549d1e..032e7df24 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -223,23 +223,29 @@ table.user-list {
   }
 }
 
-table.group-list {
-  th {
-    &.group-parent {
-      width: 6%;
-      padding-right: 0.5em;
-      text-align: right;
+div.content.groups {
+  table.group-list {
+    th {
+      &.group-parent, &.group-remove {
+        width: 6%;
+        padding-right: 0.5em;
+        text-align: right;
+      }
+
+      &.group-created, &.group-modified {
+        width: 12%;
+        padding-right: 0.5em;
+        text-align: right;
+      }
     }
 
-    &.group-created, &.group-modified {
-      width: 12%;
-      padding-right: 0.5em;
+    td.group-parent, td.group-created, td.group-modified, td.group-remove {
       text-align: right;
     }
   }
 
-  td.group-parent, td.group-created, td.group-modified {
-    text-align: right;
+  p {
+    margin-top: 0;
   }
 }
 

From 9fdcadaa97620f12d72a35ba06aa96dd4be43617 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 14:13:55 +0200
Subject: [PATCH 1658/2920] UserController: Allow to add new users in case no
 users were found

refs #8826
---
 application/views/scripts/user/list.phtml | 12 ++++------
 public/css/icinga/main-content.less       | 28 ++++++++++++++---------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index 5824f7681..1373868fe 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -15,7 +15,7 @@ if (! $this->compact): ?>
   </div>
 </div>
 <?php endif ?>
-<div class="content">
+<div class="content users">
 <?php
 
 if ($backend === null) {
@@ -31,12 +31,7 @@ if (! isset($users)) {
     return;
 }
 
-if (count($users) === 0) {
-    echo $this->translate('No users found matching the filter') . '</div>';
-    return;
-}
-?>
-
+if (count($users) > 0): ?>
 <table data-base-target="_next" class="action user-list">
   <thead>
     <tr>
@@ -82,6 +77,9 @@ if (count($users) === 0) {
   <?php endforeach ?>
   </tbody>
 </table>
+<?php else: ?>
+<p><?= $this->translate('No users found matching the filter'); ?></p>
+<?php endif ?>
 <?php if ($extensible): ?>
 <?= $this->qlink($this->translate('Add a new user'), 'user/add', array('backend' => $backend->getName()), array(
   'icon'                => 'plus',
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 032e7df24..1a7c82f54 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -203,23 +203,29 @@ table.benchmark {
   background-color: #fbfcc5;
 }
 
-table.user-list {
-  th {
-    &.user-state, &.user-remove {
-      width: 6%;
-      padding-right: 0.5em;
-      text-align: right;
+div.content.users {
+  table.user-list {
+    th {
+      &.user-state, &.user-remove {
+        width: 6%;
+        padding-right: 0.5em;
+        text-align: right;
+      }
+
+      &.user-created, &.user-modified {
+        width: 12%;
+        padding-right: 0.5em;
+        text-align: right;
+      }
     }
 
-    &.user-created, &.user-modified {
-      width: 12%;
-      padding-right: 0.5em;
+    td.user-state, td.user-created, td.user-modified, td.user-remove {
       text-align: right;
     }
   }
 
-  td.user-state, td.user-created, td.user-modified, td.user-remove {
-    text-align: right;
+  p {
+    margin-top: 0;
   }
 }
 

From 9891dc4491df98f30ed717173efa71a4bb67bf3c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 15:00:29 +0200
Subject: [PATCH 1659/2920] UserController: Just show a user's name when
 listing users

Any additional information will be shown in the detail view soon.

refs #8826
---
 application/controllers/UserController.php |  8 +-------
 application/views/scripts/user/list.phtml  | 12 -----------
 public/css/icinga/main-content.less        | 23 ++++++++++------------
 3 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index bb318c7f7..c9e9dbb0d 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -64,13 +64,7 @@ class UserController extends Controller
             return;
         }
 
-        $query = $backend->select(array(
-            'user_name',
-            'is_active',
-            'created_at',
-            'last_modified'
-        ));
-
+        $query = $backend->select(array('user_name'));
         $filterEditor = Widget::create('filterEditor')
             ->setQuery($query)
             ->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index 1373868fe..b550d4533 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -36,9 +36,6 @@ if (count($users) > 0): ?>
   <thead>
     <tr>
       <th class="user-name"><?= $this->translate('Username'); ?></th>
-      <th class="user-state"><?= $this->translate('State'); ?></th>
-      <th class="user-created"><?= $this->translate('Created at'); ?></th>
-      <th class="user-modified"><?= $this->translate('Last modified'); ?></th>
      <?php if ($reducible): ?>
       <th class="user-remove"><?= $this->translate('Remove'); ?></th>
      <?php endif ?>
@@ -48,15 +45,6 @@ if (count($users) > 0): ?>
   <?php foreach ($users as $user): ?>
     <tr>
       <td clas="user-name"><?= $this->escape($user->user_name); ?></td>
-      <td class="user-state"><?= $user->is_active === null ? $this->translate('N/A') : (
-        $user->is_active ? $this->translate('Active') : $this->translate('Inactive')
-      ); ?></td>
-      <td class="user-created">
-        <?= $user->created_at === null ? $this->translate('N/A') : date('d/m/Y g:i A', $user->created_at); ?>
-      </td>
-      <td class="user-modified">
-        <?= $user->last_modified === null ? $this->translate('Never') : date('d/m/Y g:i A', $user->last_modified); ?>
-      </td>
      <?php if ($reducible): ?>
       <td class="user-remove">
         <?= $this->qlink(
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 1a7c82f54..6c829cacb 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -205,21 +205,13 @@ table.benchmark {
 
 div.content.users {
   table.user-list {
-    th {
-      &.user-state, &.user-remove {
-        width: 6%;
-        padding-right: 0.5em;
-        text-align: right;
-      }
-
-      &.user-created, &.user-modified {
-        width: 12%;
-        padding-right: 0.5em;
-        text-align: right;
-      }
+    th.user-remove {
+      width: 8em;
+      padding-right: 0.5em;
+      text-align: right;
     }
 
-    td.user-state, td.user-created, td.user-modified, td.user-remove {
+    td.user-remove {
       text-align: right;
     }
   }
@@ -227,6 +219,11 @@ div.content.users {
   p {
     margin-top: 0;
   }
+
+  a.user-add {
+    display: block;
+    margin-top: 1em;
+  }
 }
 
 div.content.groups {

From 2493535ac77c1dac21549a240176191d18a58116 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 20 May 2015 15:29:45 +0200
Subject: [PATCH 1660/2920] Revert "Implement classes HostgroupsummaryQuery and
 ServicegroupsummaryQuery"

This reverts commit 9b4f08eb433879f520dc7f93a4e205ae9bc631b5.

There's DataView::getQueryName() for this.

refs #8241
---
 .../Backend/Ido/Query/HostgroupsummaryQuery.php           | 8 --------
 .../Backend/Ido/Query/ServicegroupsummaryQuery.php        | 8 --------
 2 files changed, 16 deletions(-)
 delete mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
 delete mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
deleted file mode 100644
index 5711b88f5..000000000
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\Module\Monitoring\Backend\Ido\Query;
-
-class HostgroupsummaryQuery extends GroupsummaryQuery
-{
-}
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php
deleted file mode 100644
index c50519d94..000000000
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\Module\Monitoring\Backend\Ido\Query;
-
-class ServicegroupsummaryQuery extends GroupsummaryQuery
-{
-}

From 2cec4a6d67de02aebb01c6c992fc3479d631bc29 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 15:41:02 +0200
Subject: [PATCH 1661/2920] UserController: Add showAction

refs #8826
---
 application/controllers/UserController.php | 23 ++++++++++++++
 application/views/scripts/user/list.phtml  |  7 ++++-
 application/views/scripts/user/show.phtml  | 35 ++++++++++++++++++++++
 public/css/icinga/main-content.less        | 15 ++++++++++
 4 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 application/views/scripts/user/show.phtml

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index c9e9dbb0d..217859574 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -96,6 +96,28 @@ class UserController extends Controller
         );
     }
 
+    /**
+     * Show a user
+     */
+    public function showAction()
+    {
+        $userName = $this->params->getRequired('user');
+        $backend = $this->getUserBackend($this->params->getRequired('backend'));
+
+        $user = $backend->select(array(
+            'user_name',
+            'is_active',
+            'created_at',
+            'last_modified'
+        ))->where('user_name', $userName)->fetchRow();
+        if ($user === false) {
+            $this->httpNotFound(sprintf($this->translate('User "%s" not found'), $userName));
+        }
+
+        $this->view->user = $user;
+        $this->view->backend = $backend;
+    }
+
     /**
      * Add a user
      */
@@ -125,6 +147,7 @@ class UserController extends Controller
         }
 
         $form = new UserForm();
+        $form->setRedirectUrl(Url::fromPath('user/show', array('backend' => $backend->getName(), 'user' => $userName)));
         $form->setRepository($backend);
         $form->edit($userName, get_object_vars($row))->handleRequest();
 
diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index b550d4533..093270d4b 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -44,7 +44,12 @@ if (count($users) > 0): ?>
   <tbody>
   <?php foreach ($users as $user): ?>
     <tr>
-      <td clas="user-name"><?= $this->escape($user->user_name); ?></td>
+      <td class="user-name"><?= $this->qlink($user->user_name, 'user/show', array(
+        'backend'   => $backend->getName(),
+        'user'      => $user->user_name
+      ), array(
+        'title'     => sprintf($this->translate('Show detailed information about %s'), $user->user_name)
+      )); ?></td>
      <?php if ($reducible): ?>
       <td class="user-remove">
         <?= $this->qlink(
diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
new file mode 100644
index 000000000..00b242512
--- /dev/null
+++ b/application/views/scripts/user/show.phtml
@@ -0,0 +1,35 @@
+<?php 
+
+use Icinga\Data\Updatable;
+
+$editLink = null;
+if ($backend instanceof Updatable) {
+    $editLink = $this->qlink(
+        null,
+        'user/edit',
+        array(
+            'backend'   => $backend->getName(),
+            'user'      => $user->user_name
+        ),
+        array(
+            'title' => sprintf($this->translate('Edit user %s'), $user->user_name),
+            'class' => 'user-edit',
+            'icon'  => 'edit'
+        )
+    );
+}
+
+?>
+<div class="controls">
+  <?php if (! $this->compact): ?>
+    <?= $tabs->showOnlyCloseButton(); ?>
+  <?php endif ?>
+  <div class="user-header">
+    <p class="user-name"><strong><?= $this->escape($user->user_name); ?></strong></p> <?= $editLink; ?>
+    <p class="user-state"><strong><?= $this->translate('State'); ?>:</strong> <?= $user->is_active ? $this->translate('Active') : $this->translate('Inactive'); ?></p>
+    <p class="user-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $user->created_at === null ? '-' : $this->formatDateTime($user->created_at); ?></p>
+    <p class="user-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $user->last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?></p>
+  </div>
+</div>
+<div class="content" data-base-target="_next">
+</div>
\ No newline at end of file
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 6c829cacb..82c58674c 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -226,6 +226,21 @@ div.content.users {
   }
 }
 
+div.controls div.user-header {
+  border-bottom: 2px solid @colorPetrol;
+
+  .user-name {
+    display: inline-block;
+    margin: 0 0 0.3em;
+    font-size: 2em;
+  }
+
+  .user-state, .user-created, .user-modified {
+    margin: 0 0 0.2em;
+    font-size: 0.8em;
+  }
+}
+
 div.content.groups {
   table.group-list {
     th {

From 41e72396eee296ac728a523852718a8d8c15bc8c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 20 May 2015 15:37:24 +0200
Subject: [PATCH 1662/2920] monitoring: Use the groupsummary query for the host
 group summary view

refs #8241
---
 .../library/Monitoring/DataView/Hostgroupsummary.php      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
index b923b49e4..5383aae82 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
@@ -17,4 +17,12 @@ class Hostgroupsummary extends Groupsummary
     {
         return array('hostgroup', 'hostgroup_alias');
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getQueryName()
+    {
+        return 'groupsummary';
+    }
 }

From 5efbad3a714b9c4424796b0408874b662b479186 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 20 May 2015 15:38:48 +0200
Subject: [PATCH 1663/2920] monitoring: Don't sort the host group summary by
 service severity

refs #8241
---
 modules/monitoring/application/controllers/ListController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 59fcd6f85..5905e77a2 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -553,7 +553,7 @@ class Monitoring_ListController extends Controller
             'services_critical_last_state_change_unhandled',
             'services_unknown_last_state_change_unhandled',
             'services_total'
-        ))->order('services_severity')->order('hostgroup_alias');
+        ))->order('hostgroup_alias');
         // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
         // service groups. We should separate them.
         $this->filterQuery($query);

From d379b27c245523a39813f8c06bb025fc87175518 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 20 May 2015 15:40:49 +0200
Subject: [PATCH 1664/2920] monitoring: Hostgroupsummary must not extend
 Groupsummary which is subject to remove

refs #8241
---
 .../Monitoring/DataView/Hostgroupsummary.php  | 40 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
index 5383aae82..e4d91b74d 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
@@ -3,8 +3,46 @@
 
 namespace Icinga\Module\Monitoring\DataView;
 
-class Hostgroupsummary extends Groupsummary
+/**
+ * Data view for the host group summary
+ */
+class Hostgroupsummary extends DataView
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function getColumns()
+    {
+        return array(
+            'hostgroup_alias',
+            'hostgroup_name',
+            'hosts_down_handled',
+            'hosts_down_last_state_change_handled',
+            'hosts_down_last_state_change_unhandled',
+            'hosts_down_unhandled',
+            'hosts_pending',
+            'hosts_pending_last_state_change',
+            'hosts_unreachable_handled',
+            'hosts_unreachable_last_state_change_handled',
+            'hosts_unreachable_last_state_change_unhandled',
+            'hosts_unreachable_unhandled',
+            'hosts_up',
+            'hosts_up_last_state_change',
+            'services_critical_handled',
+            'services_critical_unhandled',
+            'services_ok',
+            'services_pending',
+            'services_total',
+            'services_unknown_handled',
+            'services_unknown_unhandled',
+            'services_warning_handled',
+            'services_warning_unhandled'
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
     public function getFilterColumns()
     {
         return array('hostgroup');

From 94cd4b91e545c4b79a703802e2c7f05fcde28211 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 15:54:47 +0200
Subject: [PATCH 1665/2920] GroupController: Just show a group's name when
 listing groups

refs #8826
---
 application/controllers/GroupController.php |  8 +------
 application/views/scripts/group/list.phtml  | 12 -----------
 public/css/icinga/main-content.less         | 23 +++++++++------------
 3 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 4a0652e4e..45d677e50 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -64,13 +64,7 @@ class GroupController extends Controller
             return;
         }
 
-        $query = $backend->select(array(
-            'group_name',
-            'parent_name',
-            'created_at',
-            'last_modified'
-        ));
-
+        $query = $backend->select(array('group_name'));
         $filterEditor = Widget::create('filterEditor')
             ->setQuery($query)
             ->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
index 3d9afd9b4..05b79d5f7 100644
--- a/application/views/scripts/group/list.phtml
+++ b/application/views/scripts/group/list.phtml
@@ -36,9 +36,6 @@ if (count($groups) > 0): ?>
   <thead>
     <tr>
       <th class="group-name"><?= $this->translate('Group'); ?></th>
-      <th class="group-parent"><?= $this->translate('Parent'); ?></th>
-      <th class="group-created"><?= $this->translate('Created at'); ?></th>
-      <th class="group-modified"><?= $this->translate('Last modified'); ?></th>
      <?php if ($reducible): ?>
       <th class="group-remove"><?= $this->translate('Remove'); ?></th>
      <?php endif ?>
@@ -48,15 +45,6 @@ if (count($groups) > 0): ?>
   <?php foreach ($groups as $group): ?>
     <tr>
       <td clas="group-name"><?= $this->escape($group->group_name); ?></td>
-      <td class="group-parent">
-        <?= $group->parent_name === null ? $this->translate('None', 'user.group.parent') : $this->escape($group->parent_name); ?>
-      </td>
-      <td class="group-created">
-        <?= $group->created_at === null ? $this->translate('N/A') : date('d/m/Y g:i A', $group->created_at); ?>
-      </td>
-      <td class="group-modified">
-        <?= $group->last_modified === null ? $this->translate('Never') : date('d/m/Y g:i A', $group->last_modified); ?>
-      </td>
      <?php if ($reducible): ?>
       <td class="group-remove">
         <?= $this->qlink(
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 82c58674c..bea9b4a0f 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -243,21 +243,13 @@ div.controls div.user-header {
 
 div.content.groups {
   table.group-list {
-    th {
-      &.group-parent, &.group-remove {
-        width: 6%;
-        padding-right: 0.5em;
-        text-align: right;
-      }
-
-      &.group-created, &.group-modified {
-        width: 12%;
-        padding-right: 0.5em;
-        text-align: right;
-      }
+    th.group-remove {
+      width: 8em;
+      padding-right: 0.5em;
+      text-align: right;
     }
 
-    td.group-parent, td.group-created, td.group-modified, td.group-remove {
+    td.group-remove {
       text-align: right;
     }
   }
@@ -265,6 +257,11 @@ div.content.groups {
   p {
     margin-top: 0;
   }
+
+  a.group-add {
+    display: block;
+    margin-top: 1em;
+  }
 }
 
 form.backend-selection {

From 2dc6d5467d68a02dd0ae38bf80f4f3aeef2b41d0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 20 May 2015 16:06:45 +0200
Subject: [PATCH 1666/2920] monitoring: Don't select unnecessary columns in the
 host group summary

refs #8241
---
 .../controllers/ListController.php            | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 5905e77a2..536fa3ecf 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -522,37 +522,29 @@ class Monitoring_ListController extends Controller
         $this->setAutorefreshInterval(12);
 
         $query = $this->backend->select()->from('hostgroupsummary', array(
-            'hostgroup_name',
             'hostgroup_alias',
-            'hosts_up',
-            'hosts_unreachable_handled',
-            'hosts_unreachable_unhandled',
+            'hostgroup_name',
             'hosts_down_handled',
+            'hosts_down_last_state_change_handled',
+            'hosts_down_last_state_change_unhandled',
             'hosts_down_unhandled',
             'hosts_pending',
-            'hosts_up_last_state_change',
             'hosts_pending_last_state_change',
-            'hosts_down_last_state_change_handled',
+            'hosts_unreachable_handled',
             'hosts_unreachable_last_state_change_handled',
-            'hosts_down_last_state_change_unhandled',
             'hosts_unreachable_last_state_change_unhandled',
-            'services_ok',
-            'services_unknown_handled',
-            'services_unknown_unhandled',
+            'hosts_unreachable_unhandled',
+            'hosts_up',
+            'hosts_up_last_state_change',
             'services_critical_handled',
             'services_critical_unhandled',
-            'services_warning_handled',
-            'services_warning_unhandled',
+            'services_ok',
             'services_pending',
-            'services_ok_last_state_change',
-            'services_pending_last_state_change',
-            'services_warning_last_state_change_handled',
-            'services_critical_last_state_change_handled',
-            'services_unknown_last_state_change_handled',
-            'services_warning_last_state_change_unhandled',
-            'services_critical_last_state_change_unhandled',
-            'services_unknown_last_state_change_unhandled',
-            'services_total'
+            'services_total',
+            'services_unknown_handled',
+            'services_unknown_unhandled',
+            'services_warning_handled',
+            'services_warning_unhandled'
         ))->order('hostgroup_alias');
         // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
         // service groups. We should separate them.

From a9d6a949571b0951595aa4ec2121e95281300510 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 20 May 2015 16:09:30 +0200
Subject: [PATCH 1667/2920] monitoring: Use the groupsummary query for the
 service group summary view

refs #8241
---
 .../Monitoring/DataView/Servicegroupsummary.php       | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
index f21f49d3e..1b96e0788 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
@@ -5,11 +5,22 @@ namespace Icinga\Module\Monitoring\DataView;
 
 class Servicegroupsummary extends Groupsummary
 {
+    /**
+     * {@inheritdoc}
+     */
     public function getFilterColumns()
     {
         return array('servicegroup');
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public static function getQueryName()
+    {
+        return 'groupsummary';
+    }
+
     /**
      * {@inheritdoc}
      */

From f9952cf231253af8c0e96d973a1a2fb1ab845958 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 20 May 2015 16:15:38 +0200
Subject: [PATCH 1668/2920] monitoring: Don't sort the service group summary by
 service severity

refs #8241
---
 modules/monitoring/application/controllers/ListController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 536fa3ecf..8e45f497e 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -496,7 +496,7 @@ class Monitoring_ListController extends Controller
             'services_critical_last_state_change_unhandled',
             'services_unknown_last_state_change_unhandled',
             'services_total'
-        ))->order('services_severity')->order('servicegroup_alias');
+        ))->order('servicegroup_alias');
         // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
         // service groups. We should separate them.
         $this->filterQuery($query);

From 80b174f526538d2fc28cf3a01d18a6c6bc90184a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 20 May 2015 16:16:21 +0200
Subject: [PATCH 1669/2920] monitoring: Servicegroupsummary must not extend
 Groupsummary which is subject to remove

refs #8241
---
 .../DataView/Servicegroupsummary.php          | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
index 1b96e0788..3633248f4 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
@@ -3,8 +3,42 @@
 
 namespace Icinga\Module\Monitoring\DataView;
 
-class Servicegroupsummary extends Groupsummary
+class Servicegroupsummary extends DataView
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function getColumns()
+    {
+        return array(
+            'hosts_down_handled',
+            'hosts_down_unhandled',
+            'hosts_pending',
+            'hosts_unreachable_handled',
+            'hosts_unreachable_unhandled',
+            'hosts_up',
+            'servicegroup_alias',
+            'servicegroup_name',
+            'services_critical_handled',
+            'services_critical_last_state_change_handled',
+            'services_critical_last_state_change_unhandled',
+            'services_critical_unhandled',
+            'services_ok',
+            'services_ok_last_state_change',
+            'services_pending',
+            'services_pending_last_state_change',
+            'services_total',
+            'services_unknown_handled',
+            'services_unknown_last_state_change_handled',
+            'services_unknown_last_state_change_unhandled',
+            'services_unknown_unhandled',
+            'services_warning_handled',
+            'services_warning_last_state_change_handled',
+            'services_warning_last_state_change_unhandled',
+            'services_warning_unhandled'
+        );
+    }
+
     /**
      * {@inheritdoc}
      */

From ed166d6eb7c939ff02714219d0019cdda7a5cc9b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 16:17:37 +0200
Subject: [PATCH 1670/2920] GroupController: Add showAction

refs #8826
---
 application/controllers/GroupController.php | 25 ++++++++++++
 application/views/scripts/group/list.phtml  |  7 +++-
 application/views/scripts/group/show.phtml  | 45 +++++++++++++++++++++
 public/css/icinga/main-content.less         | 15 +++++++
 4 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 application/views/scripts/group/show.phtml

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 45d677e50..f0addcd51 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -96,6 +96,28 @@ class GroupController extends Controller
         );
     }
 
+    /**
+     * Show a group
+     */
+    public function showAction()
+    {
+        $groupName = $this->params->getRequired('group');
+        $backend = $this->getUserGroupBackend($this->params->getRequired('backend'));
+
+        $group = $backend->select(array(
+            'group_name',
+            'parent_name',
+            'created_at',
+            'last_modified'
+        ))->where('group_name', $groupName)->fetchRow();
+        if ($group === false) {
+            $this->httpNotFound(sprintf($this->translate('Group "%s" not found'), $groupName));
+        }
+
+        $this->view->group = $group;
+        $this->view->backend = $backend;
+    }
+
     /**
      * Add a group
      */
@@ -125,6 +147,9 @@ class GroupController extends Controller
         }
 
         $form = new UserGroupForm();
+        $form->setRedirectUrl(
+            Url::fromPath('group/show', array('backend' => $backend->getName(), 'group' => $groupName))
+        );
         $form->setRepository($backend);
         $form->edit($groupName, get_object_vars($row))->handleRequest();
 
diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
index 05b79d5f7..be2dfae1a 100644
--- a/application/views/scripts/group/list.phtml
+++ b/application/views/scripts/group/list.phtml
@@ -44,7 +44,12 @@ if (count($groups) > 0): ?>
   <tbody>
   <?php foreach ($groups as $group): ?>
     <tr>
-      <td clas="group-name"><?= $this->escape($group->group_name); ?></td>
+      <td class="group-name"><?= $this->qlink($group->group_name, 'group/show', array(
+        'backend'   => $backend->getName(),
+        'group'     => $group->group_name
+      ), array(
+        'title'     => sprintf($this->translate('Show detailed information for group %s'), $group->group_name)
+      )); ?></td>
      <?php if ($reducible): ?>
       <td class="group-remove">
         <?= $this->qlink(
diff --git a/application/views/scripts/group/show.phtml b/application/views/scripts/group/show.phtml
new file mode 100644
index 000000000..302917b2a
--- /dev/null
+++ b/application/views/scripts/group/show.phtml
@@ -0,0 +1,45 @@
+<?php 
+
+use Icinga\Data\Updatable;
+
+$editLink = null;
+if ($backend instanceof Updatable) {
+    $editLink = $this->qlink(
+        null,
+        'group/edit',
+        array(
+            'backend'   => $backend->getName(),
+            'group'     => $group->group_name
+        ),
+        array(
+            'title' => sprintf($this->translate('Edit group %s'), $group->group_name),
+            'class' => 'group-edit',
+            'icon'  => 'edit'
+        )
+    );
+}
+
+?>
+<div class="controls">
+  <?php if (! $this->compact): ?>
+    <?= $tabs->showOnlyCloseButton(); ?>
+  <?php endif ?>
+  <div class="group-header">
+    <p class="group-name"><strong><?= $this->escape($group->group_name); ?></strong></p> <?= $editLink; ?>
+    <p class="group-parent"><strong><?= $this->translate('Parent'); ?>:</strong> <?= $group->parent_name === null ? '-' : $this->qlink(
+      $group->parent_name,
+      'group/show',
+      array(
+        'backend'   => $backend->getName(),
+        'group'     => $group->parent_name
+      ),
+      array(
+        'title'     => sprintf($this->translate('Show detailed information for group %s'), $group->parent_name)
+      )
+    ); ?></p>
+    <p class="group-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $group->created_at === null ? '-' : $this->formatDateTime($group->created_at); ?></p>
+    <p class="group-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $group->last_modified === null ? '-' : $this->formatDateTime($group->last_modified); ?></p>
+  </div>
+</div>
+<div class="content" data-base-target="_next">
+</div>
\ No newline at end of file
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index bea9b4a0f..d7082d5fd 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -264,6 +264,21 @@ div.content.groups {
   }
 }
 
+div.controls div.group-header {
+  border-bottom: 2px solid @colorPetrol;
+
+  .group-name {
+    display: inline-block;
+    margin: 0 0 0.3em;
+    font-size: 2em;
+  }
+
+  .group-parent, .group-created, .group-modified {
+    margin: 0 0 0.2em;
+    font-size: 0.8em;
+  }
+}
+
 form.backend-selection {
   float: right;
 

From cfb819ec61bf398333a2b41eb4693421ab8661d5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 20 May 2015 17:03:23 +0200
Subject: [PATCH 1671/2920] monitoring: Add missing column to the host group
 summary data view

refs #8241
---
 .../monitoring/library/Monitoring/DataView/Hostgroupsummary.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
index e4d91b74d..81725595a 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
@@ -22,6 +22,7 @@ class Hostgroupsummary extends DataView
             'hosts_down_unhandled',
             'hosts_pending',
             'hosts_pending_last_state_change',
+            'hosts_total',
             'hosts_unreachable_handled',
             'hosts_unreachable_last_state_change_handled',
             'hosts_unreachable_last_state_change_unhandled',

From 1e9337846aaae625153149e64cf9f13969736d2b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 10:16:54 +0200
Subject: [PATCH 1672/2920] ui: Fix refreshing partial time counters

refs #6778
---
 public/js/icinga/ui.js | 102 +++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 56 deletions(-)

diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index 7ab2ef079..26c4abf96 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -577,70 +577,60 @@
             );
         },
 
+        /**
+         * Refresh partial time counters
+         *
+         * This function runs every second.
+         */
         refreshTimeSince: function () {
-
-            $('.timesince').each(function (idx, el) {
-                return;
-                // todo remove after replace timeSince
-                var mp = el.innerHTML.match(/^(.*?)(-?\d+)d\s(-?\d+)h/);
-                if (mp !== null) {
-                    return true;
-                }
-
-                var m = el.innerHTML.match(/^(.*?)(-?\d+)(.+\s)(-?\d+)(.+)/);
-                if (m !== null) {
-                    var nm = parseInt(m[2]);
-                    var ns = parseInt(m[4]);
-                    if (ns < 59) {
-                        ns++;
+            $('.time-ago, .time-since').each(function (idx, el) {
+                var partialTime = /(\d{1,2})m (\d{1,2})s/.exec(el.innerHTML);
+                if (partialTime !== null) {
+                    var minute = parseInt(partialTime[1], 10),
+                        second = parseInt(partialTime[2], 10);
+                    if (second < 59) {
+                        ++second;
                     } else {
-                        ns = 0;
-                        nm++;
+                        ++minute;
+                        second = 0;
                     }
-                    $(el).html(m[1] + nm + m[3] + ns + m[5]);
+                    el.innerHTML = el.innerHTML.substr(0, partialTime.index) + minute.toString() + 'm '
+                        + second.toString() + 's' + el.innerHTML.substr(partialTime.index + partialTime[0].length);
                 }
             });
 
-            $('.timeuntil').each(function (idx, el) {
-                return;
-                // todo remove after replace timeUntil
-                var mp = el.innerHTML.match(/^(.*?)(-?\d+)d\s(-?\d+)h/);
-                if (mp !== null) {
-                    return true;
-                }
-
-                var m = el.innerHTML.match(/^(.*?)(-?\d+)(.+\s)(-?\d+)(.+)/);
-                if (m !== null) {
-                    var nm = parseInt(m[2]);
-                    var ns = parseInt(m[4]);
-                    var signed = '';
-                    var sec = 0;
-
-                    if (nm < 0) {
-                        signed = '-';
-                        nm = nm * -1;
-                        sec = nm * 60 + ns;
-                        sec++;
-                    } else if (nm == 0 && ns == 0) {
-                        signed = '-';
-                        sec = 1;
-                    } else if (nm == 0 && m[2][0] == '-') {
-                        signed = '-';
-                        sec = ns;
-                        sec++;
-                    } else if (nm == 0 && m[2][0] != '-') {
-                        sec = ns;
-                        sec--;
+            $('.time-until').each(function (idx, el) {
+                var partialTime = /(-?)(\d{1,2})m (\d{1,2})s/.exec(el.innerHTML);
+                if (partialTime !== null) {
+                    var minute = parseInt(partialTime[2], 10),
+                        second = parseInt(partialTime[3], 10),
+                        invert = partialTime[1];
+                    if (invert.length) {
+                        // Count up because partial time is negative
+                        if (second < 59) {
+                            ++second;
+                        } else {
+                            ++minute;
+                            second = 0;
+                        }
                     } else {
-                        signed = '';
-                        sec = nm * 60 + ns;
-                        sec--;
+                        // Count down because partial time is positive
+                        if (second === 0) {
+                            if (minute === 0) {
+                                // Invert counter
+                                minute = 0;
+                                second = 1;
+                                invert = '-';
+                            } else {
+                                --minute;
+                                second = 59;
+                            }
+                        } else {
+                            --second;
+                        }
                     }
-
-                    nm = Math.floor(sec/60);
-                    ns = sec - nm * 60;
-
-                    $(el).html(m[1] + signed + nm + m[3] + ns + m[5]);
+                    el.innerHTML = el.innerHTML.substr(0, partialTime.index) + invert + minute.toString() + 'm '
+                        + second.toString() + 's' + el.innerHTML.substr(partialTime.index + partialTime[0].length);
                 }
             });
         },

From 970d4d7a4a5c3dbd68ae2337d7300452a13df157 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 10:19:07 +0200
Subject: [PATCH 1673/2920] Fix that time-until doesn't show negative partial
 time in the dashboard

refs #6778
---
 library/Icinga/Date/DateFormatter.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Date/DateFormatter.php b/library/Icinga/Date/DateFormatter.php
index 8ea8e2b3c..411c19535 100644
--- a/library/Icinga/Date/DateFormatter.php
+++ b/library/Icinga/Date/DateFormatter.php
@@ -202,6 +202,9 @@ class DateFormatter
     public static function timeUntil($time, $timeOnly = false)
     {
         list($type, $until, $invert) = static::diff($time);
+        if ($invert) {
+            $until = '-' . $until;
+        }
         if ($timeOnly) {
             return $until;
         }
@@ -217,7 +220,7 @@ class DateFormatter
             case static::RELATIVE:
                 $formatted = sprintf(
                     t('in %s', 'An event will happen after the given time interval has elapsed'),
-                    $invert ? ('-' . $until) : $until
+                    $until
                 );
                 break;
             case static::TIME:

From ce463d16ef1f5c5737aa74e38de0d954ea92ce65 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 11:19:58 +0200
Subject: [PATCH 1674/2920] Reorder group summary query's columns by name

refs #8241
---
 .../Backend/Ido/Query/GroupsummaryQuery.php   | 84 +++++++++++--------
 1 file changed, 48 insertions(+), 36 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
index 392c97538..3418e1b2f 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@@ -5,12 +5,19 @@ namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 use Zend_Db_Select;
 
+/**
+ * Query for host and service group summaries
+ */
 class GroupSummaryQuery extends IdoQuery
 {
-    protected $useSubqueryCount = true;
-
+    /**
+     * {@inheritdoc}
+     */
     protected $columnMap = array(
         'hoststatussummary' => array(
+            'hostgroup'                                     => 'hostgroup',
+            'hostgroup_alias'                               => 'hostgroup_alias',
+            'hostgroup_name'                                => 'hostgroup_name',
             'hosts_total'                                   => 'SUM(CASE WHEN object_type = \'host\' THEN 1 ELSE 0 END)',
             'hosts_up'                                      => 'SUM(CASE WHEN object_type = \'host\' AND state = 0 THEN 1 ELSE 0 END)',
             'hosts_unreachable'                             => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 THEN 1 ELSE 0 END)',
@@ -18,46 +25,51 @@ class GroupSummaryQuery extends IdoQuery
             'hosts_unreachable_unhandled'                   => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
             'hosts_down'                                    => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 THEN 1 ELSE 0 END)',
             'hosts_down_handled'                            => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime != 0 THEN 1 ELSE 0 END)',
+            'hosts_down_last_state_change_handled'          => 'MAX(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime != 0 THEN state_change ELSE 0 END)',
+            'hosts_down_last_state_change_unhandled'        => 'MAX(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime = 0 THEN state_change ELSE 0 END)',
             'hosts_down_unhandled'                          => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
             'hosts_pending'                                 => 'SUM(CASE WHEN object_type = \'host\' AND state = 99 THEN 1 ELSE 0 END)',
-            'hosts_up_last_state_change'                    => 'MAX(CASE WHEN object_type = \'host\' AND state = 0 THEN state_change ELSE 0 END)',
             'hosts_pending_last_state_change'               => 'MAX(CASE WHEN object_type = \'host\' AND state = 99 THEN state_change ELSE 0 END)',
-            'hosts_down_last_state_change_handled'          => 'MAX(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime != 0 THEN state_change ELSE 0 END)',
             'hosts_unreachable_last_state_change_handled'   => 'MAX(CASE WHEN object_type = \'host\' AND state = 2 AND acknowledged + in_downtime != 0 THEN state_change ELSE 0 END)',
-            'hosts_down_last_state_change_unhandled'        => 'MAX(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime = 0 THEN state_change ELSE 0 END)',
             'hosts_unreachable_last_state_change_unhandled' => 'MAX(CASE WHEN object_type = \'host\' AND state = 2 AND acknowledged + in_downtime = 0 THEN state_change ELSE 0 END)',
-            'hostgroup_name'                                => 'hostgroup_name',
-            'hostgroup_alias'                               => 'hostgroup_alias',
-            'hostgroup'                                     => 'hostgroup'
+            'hosts_up_last_state_change'                    => 'MAX(CASE WHEN object_type = \'host\' AND state = 0 THEN state_change ELSE 0 END)'
         ),
         'servicestatussummary' => array(
-            'services_total'                                => 'SUM(CASE WHEN object_type = \'service\' THEN 1 ELSE 0 END)',
-            'services_ok'                                   => 'SUM(CASE WHEN object_type = \'service\' AND state = 0 THEN 1 ELSE 0 END)',
-            'services_pending'                              => 'SUM(CASE WHEN object_type = \'service\' AND state = 99 THEN 1 ELSE 0 END)',
-            'services_warning'                              => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 THEN 1 ELSE 0 END)',
-            'services_warning_handled'                      => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_state > 0 THEN 1 ELSE 0 END)',
+            'servicegroup'                                  => 'servicegroup',
+            'servicegroup_alias'                            => 'servicegroup_alias',
+            'servicegroup_name'                             => 'servicegroup_name',
             'services_critical'                             => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 THEN 1 ELSE 0 END)',
             'services_critical_handled'                     => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state > 0 THEN 1 ELSE 0 END)',
+            'services_critical_last_state_change_handled'   => 'MAX(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state > 0 THEN state_change ELSE 0 END)',
+            'services_critical_last_state_change_unhandled' => 'MAX(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
+            'services_critical_unhandled'                   => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state = 0 THEN 1 ELSE 0 END)',
+            'services_ok'                                   => 'SUM(CASE WHEN object_type = \'service\' AND state = 0 THEN 1 ELSE 0 END)',
+            'services_ok_last_state_change'                 => 'MAX(CASE WHEN object_type = \'service\' AND state = 0 THEN state_change ELSE 0 END)',
+            'services_pending'                              => 'SUM(CASE WHEN object_type = \'service\' AND state = 99 THEN 1 ELSE 0 END)',
+            'services_pending_last_state_change'            => 'MAX(CASE WHEN object_type = \'service\' AND state = 99 THEN state_change ELSE 0 END)',
+            'services_severity'                             => 'MAX(CASE WHEN object_type = \'service\' THEN severity ELSE 0 END)',
+            'services_total'                                => 'SUM(CASE WHEN object_type = \'service\' THEN 1 ELSE 0 END)',
             'services_unknown'                              => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 THEN 1 ELSE 0 END)',
             'services_unknown_handled'                      => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND acknowledged + in_downtime + host_state > 0 THEN 1 ELSE 0 END)',
-            'services_warning_unhandled'                    => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_state = 0 THEN 1 ELSE 0 END)',
-            'services_critical_unhandled'                   => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state = 0 THEN 1 ELSE 0 END)',
-            'services_unknown_unhandled'                    => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND acknowledged + in_downtime + host_state = 0 THEN 1 ELSE 0 END)',
-            'services_severity'                             => 'MAX(CASE WHEN object_type = \'service\' THEN severity ELSE 0 END)',
-            'services_ok_last_state_change'                 => 'MAX(CASE WHEN object_type = \'service\' AND state = 0 THEN state_change ELSE 0 END)',
-            'services_pending_last_state_change'            => 'MAX(CASE WHEN object_type = \'service\' AND state = 99 THEN state_change ELSE 0 END)',
-            'services_warning_last_state_change_handled'    => 'MAX(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_state > 0 THEN state_change ELSE 0 END)',
-            'services_critical_last_state_change_handled'   => 'MAX(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state > 0 THEN state_change ELSE 0 END)',
             'services_unknown_last_state_change_handled'    => 'MAX(CASE WHEN object_type = \'service\' AND state = 3 AND acknowledged + in_downtime + host_state > 0 THEN state_change ELSE 0 END)',
-            'services_warning_last_state_change_unhandled'  => 'MAX(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
-            'services_critical_last_state_change_unhandled' => 'MAX(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
             'services_unknown_last_state_change_unhandled'  => 'MAX(CASE WHEN object_type = \'service\' AND state = 3 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
-            'servicegroup_name'                             => 'servicegroup_name',
-            'servicegroup_alias'                            => 'servicegroup_alias',
-            'servicegroup'                                  => 'servicegroup'
+            'services_unknown_unhandled'                    => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND acknowledged + in_downtime + host_state = 0 THEN 1 ELSE 0 END)',
+            'services_warning'                              => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 THEN 1 ELSE 0 END)',
+            'services_warning_handled'                      => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_state > 0 THEN 1 ELSE 0 END)',
+            'services_warning_last_state_change_handled'    => 'MAX(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_state > 0 THEN state_change ELSE 0 END)',
+            'services_warning_last_state_change_unhandled'  => 'MAX(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_state = 0 THEN state_change ELSE 0 END)',
+            'services_warning_unhandled'                    => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_state = 0 THEN 1 ELSE 0 END)'
         )
     );
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $useSubqueryCount = true;
+
+    /**
+     * {@inheritdoc}
+     */
     protected function joinBaseTables()
     {
         $columns = array(
@@ -79,11 +91,11 @@ class GroupSummaryQuery extends IdoQuery
         $hosts = $this->createSubQuery(
             'Hoststatus',
             $columns + array(
-                'state'        => 'host_state',
-                'acknowledged' => 'host_acknowledged',
-                'in_downtime'  => 'host_in_downtime',
-                'state_change' => 'host_last_state_change',
-                'severity'     => 'host_severity'
+                'state'         => 'host_state',
+                'acknowledged'  => 'host_acknowledged',
+                'in_downtime'   => 'host_in_downtime',
+                'state_change'  => 'host_last_state_change',
+                'severity'      => 'host_severity'
             )
         );
         if (in_array('servicegroup_name', $this->desiredColumns)) {
@@ -101,11 +113,11 @@ class GroupSummaryQuery extends IdoQuery
         $services = $this->createSubQuery(
             'Status',
             $columns + array(
-                'state'        => 'service_state',
-                'acknowledged' => 'service_acknowledged',
-                'in_downtime'  => 'service_in_downtime',
-                'state_change' => 'service_last_state_change',
-                'severity'     => 'service_severity'
+                'state'         => 'service_state',
+                'acknowledged'  => 'service_acknowledged',
+                'in_downtime'   => 'service_in_downtime',
+                'state_change'  => 'service_last_state_change',
+                'severity'      => 'service_severity'
             )
         );
         $union = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL);

From bbed2cffae334d95301f12b9d8c91fdf8aec0bb4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 11:23:55 +0200
Subject: [PATCH 1675/2920] monitoring: Add column hosts_severity to the group
 summary query

refs #8241
---
 .../library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
index 3418e1b2f..df1a38d88 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@@ -18,7 +18,6 @@ class GroupSummaryQuery extends IdoQuery
             'hostgroup'                                     => 'hostgroup',
             'hostgroup_alias'                               => 'hostgroup_alias',
             'hostgroup_name'                                => 'hostgroup_name',
-            'hosts_total'                                   => 'SUM(CASE WHEN object_type = \'host\' THEN 1 ELSE 0 END)',
             'hosts_up'                                      => 'SUM(CASE WHEN object_type = \'host\' AND state = 0 THEN 1 ELSE 0 END)',
             'hosts_unreachable'                             => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 THEN 1 ELSE 0 END)',
             'hosts_unreachable_handled'                     => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 AND acknowledged + in_downtime != 0 THEN 1 ELSE 0 END)',
@@ -30,6 +29,8 @@ class GroupSummaryQuery extends IdoQuery
             'hosts_down_unhandled'                          => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
             'hosts_pending'                                 => 'SUM(CASE WHEN object_type = \'host\' AND state = 99 THEN 1 ELSE 0 END)',
             'hosts_pending_last_state_change'               => 'MAX(CASE WHEN object_type = \'host\' AND state = 99 THEN state_change ELSE 0 END)',
+            'hosts_severity'                                => 'MAX(CASE WHEN object_type = \'host\' THEN severity ELSE 0 END)',
+            'hosts_total'                                   => 'SUM(CASE WHEN object_type = \'host\' THEN 1 ELSE 0 END)',
             'hosts_unreachable_last_state_change_handled'   => 'MAX(CASE WHEN object_type = \'host\' AND state = 2 AND acknowledged + in_downtime != 0 THEN state_change ELSE 0 END)',
             'hosts_unreachable_last_state_change_unhandled' => 'MAX(CASE WHEN object_type = \'host\' AND state = 2 AND acknowledged + in_downtime = 0 THEN state_change ELSE 0 END)',
             'hosts_up_last_state_change'                    => 'MAX(CASE WHEN object_type = \'host\' AND state = 0 THEN state_change ELSE 0 END)'

From 37abc724de21b38f4f1156ae2ba36cb9dc51c449 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 11:24:31 +0200
Subject: [PATCH 1676/2920] monitoring: Let the host group summary provide the
 column hosts_severity

refs #8241
---
 .../library/Monitoring/DataView/Hostgroupsummary.php     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
index 81725595a..a2c1dfd7a 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
@@ -22,6 +22,7 @@ class Hostgroupsummary extends DataView
             'hosts_down_unhandled',
             'hosts_pending',
             'hosts_pending_last_state_change',
+            'hosts_severity',
             'hosts_total',
             'hosts_unreachable_handled',
             'hosts_unreachable_last_state_change_handled',
@@ -52,16 +53,16 @@ class Hostgroupsummary extends DataView
     /**
      * {@inheritdoc}
      */
-    public function getSearchColumns()
+    public static function getQueryName()
     {
-        return array('hostgroup', 'hostgroup_alias');
+        return 'groupsummary';
     }
 
     /**
      * {@inheritdoc}
      */
-    public static function getQueryName()
+    public function getSearchColumns()
     {
-        return 'groupsummary';
+        return array('hostgroup', 'hostgroup_alias');
     }
 }

From a52264aa3212c6f61c1391676230ba254a999783 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 11:26:10 +0200
Subject: [PATCH 1677/2920] monitoring: Sort by hosts_severity when sorting the
 host group summary by severity

refs #8241
---
 modules/monitoring/application/controllers/ListController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 5e05de83b..a21edbbda 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -554,7 +554,7 @@ class Monitoring_ListController extends Controller
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->hostgroups);
         $this->setupSortControl(array(
-            'services_severity' => $this->translate('Severity'),
+            'hosts_severity'    => $this->translate('Severity'),
             'hostgroup_alias'   => $this->translate('Host Group Name'),
             'services_total'    => $this->translate('Total Services'),
             'services_ok'       => $this->translate('Services OK'),

From ee6c669441ce8a8d34a269a8f7c7dfc76efaafda Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 21 May 2015 11:40:08 +0200
Subject: [PATCH 1678/2920] Deduplicate code and fix layout

Move icon rendering code into a separate for better maintainabillity.

refs #8665
---
 .../controllers/ServicesController.php        |  2 +
 .../application/views/helpers/IconImage.php   | 46 +++++++++++++++++++
 .../views/scripts/list/hosts.phtml            |  6 +--
 .../views/scripts/list/services.phtml         |  6 +--
 .../scripts/partials/host/object-header.phtml |  6 +--
 .../partials/host/objects-header.phtml        |  4 +-
 .../partials/service/object-header.phtml      |  8 +---
 .../partials/service/objects-header.phtml     |  4 +-
 8 files changed, 57 insertions(+), 25 deletions(-)
 create mode 100644 modules/monitoring/application/views/helpers/IconImage.php

diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index ca9788ff2..6877aca02 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -50,6 +50,7 @@ class Monitoring_ServicesController extends Controller
     protected function handleCommandForm(ObjectsCommandForm $form)
     {
         $this->serviceList->setColumns(array(
+            'host_icon_image',
             'host_name',
             'host_output',
             'host_state',
@@ -94,6 +95,7 @@ class Monitoring_ServicesController extends Controller
             ->handleRequest();
         $this->view->checkNowForm = $checkNowForm;
         $this->serviceList->setColumns(array(
+            'host_icon_image',
             'host_name',
             'host_output',
             'host_state',
diff --git a/modules/monitoring/application/views/helpers/IconImage.php b/modules/monitoring/application/views/helpers/IconImage.php
new file mode 100644
index 000000000..2ed3b1d25
--- /dev/null
+++ b/modules/monitoring/application/views/helpers/IconImage.php
@@ -0,0 +1,46 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+/**
+ * Generate icons to describe a given hosts state
+ */
+class Zend_View_Helper_IconImage extends Zend_View_Helper_Abstract
+{
+    /**
+     * Create dispatch instance
+     *
+     * @return \Zend_View_Helper_IconImage
+     */
+    public function iconImage()
+    {
+        return $this;
+    }
+
+    /**
+     * Display the image_icon of a MonitoredObject
+     *
+     * @param   MonitoredObject|stdClass   $object  The host or service
+     * @return  string
+     */
+    public function host($object)
+    {
+        if ($object->host_icon_image && ! preg_match('/[\'"]/', $object->host_icon_image)) {
+            return $this->view->icon($this->view->resolveMacros($object->host_icon_image, $object));
+        }
+        return '';
+    }
+
+    /**
+     * Display the image_icon of a MonitoredObject
+     *
+     * @param   MonitoredObject|stdClass   $object  The host or service
+     * @return  string
+     */
+    public function service($object)
+    {
+        if ($object->service_icon_image && ! preg_match('/[\'"]/', $object->service_icon_image)) {
+            return $this->view->icon($this->view->resolveMacros($object->service_icon_image, $object));
+        }
+        return '';
+    }
+}
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 89c2e7d26..a83f3bb8a 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -52,9 +52,7 @@ if (count($hosts) === 0) {
 
       <!-- Host / Status / Output -->
       <td>
-        <?php if ($host->host_icon_image && ! preg_match('/[\'"]/', $host->host_icon_image)): ?>
-        <?= $this->icon($this->resolveMacros($host->host_icon_image, $host)) ?>
-        <?php endif ?>
+        <?= $this->iconImage()->host($host) ?>
         <?= implode(' ', $this->hostFlags($host)) ?>
         <?= $this->qlink(
           $host->host_display_name,
@@ -75,7 +73,7 @@ if (count($hosts) === 0) {
             'host'               => $host->host_name,
             'service_problem'    => 1,
             'service_handled'    => 0
-           ),
+          ),
           array(
             'style' => 'font-weight: normal',
             'title' => sprintf(
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 12ba232cc..964a0e982 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -58,12 +58,8 @@ if (count($services) === 0) {
 
       <td>
         <div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 8) ?> </div>
-
+        <?= $this->iconImage()->service($service) ?>
         <?= implode(' ', $this->serviceFlags($service)); ?>
-
-      <?php if ($service->service_icon_image && ! preg_match('/[\'"]/', $service->service_icon_image)): ?>
-        <?= $this->icon($this->resolveMacros($service->service_icon_image, $service)) ?>
-      <?php endif ?>
         <?= $this->qlink(
           $service->service_display_name,
           $serviceLink,
diff --git a/modules/monitoring/application/views/scripts/partials/host/object-header.phtml b/modules/monitoring/application/views/scripts/partials/host/object-header.phtml
index 127f492e6..ed7edae79 100644
--- a/modules/monitoring/application/views/scripts/partials/host/object-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/object-header.phtml
@@ -9,9 +9,7 @@ use Icinga\Module\Monitoring\Object\Host;
             <?= $this->prefixedTimeSince($object->host_last_state_change, true); ?>
         </td>
         <td>
-          <?php if ($object->host_icon_image && ! preg_match('/[\'"]/', $object->host_icon_image)): ?>
-            <?= $this->icon($this->resolveMacros($object->host_icon_image, $object)) ?>
-          <?php endif ?>
+          <?= $this->iconImage()->host($object) ?>
             <strong><?= $this->escape($object->host_display_name); ?></strong>
           <?php if ($object->host_display_name !== $object->host_name): ?>
             <small>(<?= $this->escape($object->host_name); ?>)</small>
@@ -23,4 +21,4 @@ use Icinga\Module\Monitoring\Object\Host;
             <?= $this->render('partials/host/statusicons.phtml'); ?>
         </td>
     </tr>
-</table>
\ No newline at end of file
+</table>
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index b6856609c..bce62db6b 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -17,10 +17,8 @@ $i = 0;
             <tr class="state <?= Host::getStateText($host->host_state); ?><?= $host->host_handled ? ' handled' : '' ?>">
                 <td class="state"><?= Host::getStateText($host->host_state, true); ?><br /></td>
                 <td>
+                <?= $this->iconImage()->host($host) ?>
                 <?= implode(' ', $this->hostFlags($host)) ?>
-                <?php if ($host->host_icon_image && ! preg_match('/[\'"]/', $host->host_icon_image)): ?>
-                    <?= $this->icon($this->resolveMacros($host->host_icon_image, $host)) ?>
-                <?php endif ?>
                 <b><?= $this->escape($host->getName()); ?></b><br>
                 <?= $this->escape($host->host_output) ?>
                 </td>
diff --git a/modules/monitoring/application/views/scripts/partials/service/object-header.phtml b/modules/monitoring/application/views/scripts/partials/service/object-header.phtml
index b50aff9bc..c6dbb4730 100644
--- a/modules/monitoring/application/views/scripts/partials/service/object-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/object-header.phtml
@@ -10,9 +10,7 @@ use Icinga\Module\Monitoring\Object\Service;
             <?= $this->prefixedTimeSince($object->host_last_state_change, true); ?>
         </td>
         <td>
-          <?php if ($object->host_icon_image && ! preg_match('/[\'"]/', $object->host_icon_image)): ?>
-            <?= $this->icon($this->resolveMacros($object->host_icon_image, $object)) ?>
-          <?php endif ?>
+          <?= $this->iconImage()->service($object) ?>
           <strong><?= $this->escape($object->host_display_name); ?></strong>
           <?php if ($object->host_display_name !== $object->host_name): ?>
             <small>(<?= $this->escape($object->host_name); ?>)</small>
@@ -30,9 +28,7 @@ use Icinga\Module\Monitoring\Object\Service;
             <?= $this->prefixedTimeSince($object->service_last_state_change, true); ?>
         </td>
         <td>
-            <?php if ($object->service_icon_image && ! preg_match('/[\'"]/', $object->service_icon_image)): ?>
-              <?= $this->icon($this->resolveMacros($object->service_icon_image, $object)) ?>
-            <?php endif ?>
+            <?= $this->iconImage()->host($object) ?>
             <strong><?= $this->translate('Service'); ?>: <?= $this->escape($object->service_display_name); ?></strong>
             <?php if ($object->service_display_name !== $object->service_description): ?>
               <small>(<?= $this->escape($object->service_description); ?>)</small>
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index fe1e4b16a..176c43d92 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -15,10 +15,8 @@ $i = 0;
         <tr class="state <?= Service::getStateText($service->service_state); ?><?= $service->service_handled ? ' handled' : '' ?>">
             <td class="state"><?= Service::getStateText($service->service_state, true); ?><br /></td>
             <td>
+            <?= $this->iconImage()->service($service) ?>
             <?= implode(' ', $this->serviceFlags($service)) ?>
-            <?php if ($service->service_icon_image && ! preg_match('/[\'"]/', $service->service_icon_image)): ?>
-                <?= $this->icon($this->resolveMacros($service->service_icon_image, $service)) ?>
-            <?php endif ?>
             <b>
                <?= $this->escape($service->getName()); ?>
                <?= $this->translate('on') ?>

From 82f9425b904f8567b373b56056669c32806fa6af Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 12:01:58 +0200
Subject: [PATCH 1679/2920] Revert "Make ascending sort by host or service
 severity initiatable"

This reverts commit 386d4db851aed056652d892d539de35b403c5062.

The commit introduced the bug that changing the sort direction no longer changed the sort direction :)

refs #9059
---
 .../library/Monitoring/DataView/DataView.php          | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 8212d7bb7..5175c4481 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -247,11 +247,11 @@ abstract class DataView implements QueryInterface, IteratorAggregate
             };
         }
 
-        $globalDefaultOrder = isset($sortColumns['order']) ? $sortColumns['order'] : static::SORT_ASC;
-        $globalDefaultOrder = (strtoupper($globalDefaultOrder) === static::SORT_ASC) ? 'ASC' : 'DESC';
+        $order = $order === null ? (isset($sortColumns['order']) ? $sortColumns['order'] : static::SORT_ASC) : $order;
+        $order = (strtoupper($order) === static::SORT_ASC) ? 'ASC' : 'DESC';
 
         foreach ($sortColumns['columns'] as $column) {
-            list($column, $specificDefaultOrder) = $this->query->splitOrder($column);
+            list($column, $direction) = $this->query->splitOrder($column);
             if (! $this->isValidFilterTarget($column)) {
                 throw new QueryException(
                     mt('monitoring', 'The sort column "%s" is not allowed in "%s".'),
@@ -259,10 +259,7 @@ abstract class DataView implements QueryInterface, IteratorAggregate
                     get_class($this)
                 );
             }
-            $this->query->order(
-                $column,
-                $order === null && $specificDefaultOrder !== null ? $specificDefaultOrder : $globalDefaultOrder
-            );
+            $this->query->order($column, $direction !== null ? $direction : $order);
         }
         $this->isSorted = true;
         return $this;

From 195275a716be571bb2c94cf868c3f7364fe0ecfb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 12:17:25 +0200
Subject: [PATCH 1680/2920] monitoring: Don't hardcode sort direction of the
 severity columns

fixes #9059
---
 .../library/Monitoring/DataView/HostStatus.php         |  5 +++--
 .../library/Monitoring/DataView/ServiceStatus.php      | 10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index 23df6d94a..31daabf65 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -94,10 +94,11 @@ class HostStatus extends DataView
             ),
             'host_severity' => array(
                 'columns' => array(
-                    'host_severity DESC',
+                    'host_severity',
                     'host_last_state_change DESC',
                     'host_display_name ASC'
-                )
+                ),
+                'order' => self::SORT_DESC
             ),
             'host_address' => array(
                 'columns' => array(
diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index b4f1038da..40096ee02 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -130,19 +130,21 @@ class ServiceStatus extends DataView
             ),
             'service_severity' => array(
                 'columns' => array(
-                    'service_severity DESC',
+                    'service_severity',
                     'service_last_state_change DESC',
                     'service_display_name ASC',
                     'host_display_name ASC'
-                )
+                ),
+                'order' => self::SORT_DESC
             ),
             'host_severity' => array(
                 'columns' => array(
-                    'host_severity DESC',
+                    'host_severity',
                     'host_last_state_change DESC',
                     'host_display_name ASC',
                     'service_display_name ASC'
-                )
+                ),
+                'order' => self::SORT_DESC
             ),
             'host_display_name' => array(
                 'columns' => array(

From 58b3192ce3a48193b78736356d8b23254e10ee77 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 12:26:27 +0200
Subject: [PATCH 1681/2920] monitoring: Add sort rules to the host group
 summary

refs #8241
---
 .../Monitoring/DataView/Hostgroupsummary.php  | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
index a2c1dfd7a..0a5ec184e 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
@@ -65,4 +65,30 @@ class Hostgroupsummary extends DataView
     {
         return array('hostgroup', 'hostgroup_alias');
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSortRules()
+    {
+        return array(
+            'hostgroup_alias' => array(
+                'order' => self::SORT_ASC
+            ),
+            'hosts_severity' => array(
+                'columns' => array(
+                    'hosts_severity',
+                    'hostgroup_alias ASC'
+                ),
+                'order' => self::SORT_DESC
+            ),
+            'hosts_total' => array(
+                'columns' => array(
+                    'hosts_total',
+                    'hostgroup_alias ASC'
+                ),
+                'order' => self::SORT_ASC
+            )
+        );
+    }
 }

From 4b9f7eb910b7ffab89b4810b3d4e3922f5c92ba3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 12:36:05 +0200
Subject: [PATCH 1682/2920] monitoring: Default to the sort rules of the host
 group summary

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

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index a21edbbda..d3d573389 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -545,9 +545,7 @@ class Monitoring_ListController extends Controller
             'services_unknown_unhandled',
             'services_warning_handled',
             'services_warning_unhandled'
-        ))->order('hostgroup_alias');
-        // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
-        // service groups. We should separate them.
+        ));
         $this->filterQuery($query);
         $this->view->hostgroups = $query;
 

From 73eb8cc805617e84dd4797369a4abd22e1e38b9a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 12:37:53 +0200
Subject: [PATCH 1683/2920] monitoring: Add sort rule for total services to the
 host group summary

refs #8241
---
 .../library/Monitoring/DataView/Hostgroupsummary.php       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
index 0a5ec184e..63c04df79 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
@@ -88,6 +88,13 @@ class Hostgroupsummary extends DataView
                     'hostgroup_alias ASC'
                 ),
                 'order' => self::SORT_ASC
+            ),
+            'services_total' => array(
+                'columns' => array(
+                    'services_total',
+                    'hostgroup_alias ASC'
+                ),
+                'order' => self::SORT_ASC
             )
         );
     }

From 89bac33595ec22c417472f7fbe0ac44bf541ff7d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 12:38:20 +0200
Subject: [PATCH 1684/2920] monitoring: Fix sort control columns for the host
 group summary

refs #8241
---
 .../monitoring/application/controllers/ListController.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index d3d573389..be3139b72 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -554,12 +554,8 @@ class Monitoring_ListController extends Controller
         $this->setupSortControl(array(
             'hosts_severity'    => $this->translate('Severity'),
             'hostgroup_alias'   => $this->translate('Host Group Name'),
-            'services_total'    => $this->translate('Total Services'),
-            'services_ok'       => $this->translate('Services OK'),
-            'services_unknown'  => $this->translate('Services UNKNOWN'),
-            'services_critical' => $this->translate('Services CRITICAL'),
-            'services_warning'  => $this->translate('Services WARNING'),
-            'services_pending'  => $this->translate('Services PENDING')
+            'hosts_total'       => $this->translate('Total Hosts'),
+            'services_total'    => $this->translate('Total Services')
         ), $query);
     }
 

From e7396ea49cb853348e2d638816a58e55f84bff6f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 12:38:58 +0200
Subject: [PATCH 1685/2920] monitoring: Add services_severity to the service
 group summary data view

refs #8241
---
 .../library/Monitoring/DataView/Servicegroupsummary.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
index 3633248f4..c9f60f75c 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
@@ -27,6 +27,7 @@ class Servicegroupsummary extends DataView
             'services_ok_last_state_change',
             'services_pending',
             'services_pending_last_state_change',
+            'services_severity',
             'services_total',
             'services_unknown_handled',
             'services_unknown_last_state_change_handled',

From 1a1f93db23d1b27907add455a3f8a75ff2c21fc4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 12:41:29 +0200
Subject: [PATCH 1686/2920] monitoring: Add sort rules to the service group
 summary

refs #8241
---
 .../DataView/Servicegroupsummary.php          | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
index c9f60f75c..11d6ec07e 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
@@ -63,4 +63,30 @@ class Servicegroupsummary extends DataView
     {
         return array('servicegroup', 'servicegroup_alias');
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSortRules()
+    {
+        return array(
+            'servicegroup_alias' => array(
+                'order' => self::SORT_ASC
+            ),
+            'services_severity' => array(
+                'columns' => array(
+                    'services_severity',
+                    'servicegroup_alias ASC'
+                ),
+                'order' => self::SORT_DESC
+            ),
+            'services_total' => array(
+                'columns' => array(
+                    'services_total',
+                    'servicegroup_alias ASC'
+                ),
+                'order' => self::SORT_ASC
+            )
+        );
+    }
 }

From 0db7cfca885ae7cc0da78cd8574e28547a292328 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 12:41:59 +0200
Subject: [PATCH 1687/2920] monitoring: Default to the sort rules of the
 service group summary

refs #8241
---
 .../controllers/ListController.php            | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index be3139b72..dc82fcf65 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -470,34 +470,32 @@ class Monitoring_ListController extends Controller
         $this->setAutorefreshInterval(12);
 
         $query = $this->backend->select()->from('servicegroupsummary', array(
-            'servicegroup_name',
-            'servicegroup_alias',
-            'hosts_up',
-            'hosts_unreachable_handled',
-            'hosts_unreachable_unhandled',
             'hosts_down_handled',
             'hosts_down_unhandled',
             'hosts_pending',
-            'services_ok',
-            'services_unknown_handled',
-            'services_unknown_unhandled',
+            'hosts_unreachable_handled',
+            'hosts_unreachable_unhandled',
+            'hosts_up',
+            'servicegroup_alias',
+            'servicegroup_name',
             'services_critical_handled',
-            'services_critical_unhandled',
-            'services_warning_handled',
-            'services_warning_unhandled',
-            'services_pending',
-            'services_ok_last_state_change',
-            'services_pending_last_state_change',
-            'services_warning_last_state_change_handled',
             'services_critical_last_state_change_handled',
-            'services_unknown_last_state_change_handled',
-            'services_warning_last_state_change_unhandled',
             'services_critical_last_state_change_unhandled',
+            'services_critical_unhandled',
+            'services_ok',
+            'services_ok_last_state_change',
+            'services_pending',
+            'services_pending_last_state_change',
+            'services_total',
+            'services_unknown_handled',
+            'services_unknown_last_state_change_handled',
             'services_unknown_last_state_change_unhandled',
-            'services_total'
-        ))->order('servicegroup_alias');
-        // TODO(el): Can't default to the sort rules of the data view because it's meant for both host groups and
-        // service groups. We should separate them.
+            'services_unknown_unhandled',
+            'services_warning_handled',
+            'services_warning_last_state_change_handled',
+            'services_warning_last_state_change_unhandled',
+            'services_warning_unhandled'
+        ));
         $this->filterQuery($query);
         $this->view->servicegroups = $query;
 

From e0c6ce58c393ca47327cfde1232b7796dc303db8 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 12:42:53 +0200
Subject: [PATCH 1688/2920] monitoring: Fix sort control columns for the
 service group summary

refs #8241
---
 .../monitoring/application/controllers/ListController.php  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index dc82fcf65..c08acf2ad 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -504,12 +504,7 @@ class Monitoring_ListController extends Controller
         $this->setupSortControl(array(
             'services_severity'     => $this->translate('Severity'),
             'servicegroup_alias'    => $this->translate('Service Group Name'),
-            'services_total'        => $this->translate('Total Services'),
-            'services_ok'           => $this->translate('Services OK'),
-            'services_unknown'      => $this->translate('Services UNKNOWN'),
-            'services_critical'     => $this->translate('Services CRITICAL'),
-            'services_warning'      => $this->translate('Services WARNING'),
-            'services_pending'      => $this->translate('Services PENDING')
+            'services_total'        => $this->translate('Total Services')
         ), $query);
     }
 

From ad5ab16b3f175a6e93553551f03c4c438b2e1710 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 12:43:27 +0200
Subject: [PATCH 1689/2920] monitoring: Drop the Groupsummary data view

We have Hostgroupsummary and Servicegroupsummary now.

refs #8241
---
 .../Monitoring/DataView/Groupsummary.php      | 68 -------------------
 1 file changed, 68 deletions(-)
 delete mode 100644 modules/monitoring/library/Monitoring/DataView/Groupsummary.php

diff --git a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php b/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
deleted file mode 100644
index d27bf9ee8..000000000
--- a/modules/monitoring/library/Monitoring/DataView/Groupsummary.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\Module\Monitoring\DataView;
-
-class Groupsummary extends DataView
-{
-    /**
-     * Retrieve columns provided by this view
-     *
-     * @return array
-     */
-    public function getColumns()
-    {
-        return array(
-            'servicegroup_name',
-            'servicegroup_alias',
-            'hostgroup_name',
-            'hostgroup_alias',
-            'hosts_total',
-            'hosts_up',
-            'hosts_unreachable',
-            'hosts_unreachable_handled',
-            'hosts_unreachable_unhandled',
-            'hosts_down',
-            'hosts_down_handled',
-            'hosts_down_unhandled',
-            'hosts_pending',
-            'hosts_up_last_state_change',
-            'hosts_pending_last_state_change',
-            'hosts_down_last_state_change_handled',
-            'hosts_unreachable_last_state_change_handled',
-            'hosts_down_last_state_change_unhandled',
-            'hosts_unreachable_last_state_change_unhandled',
-            'services_total',
-            'services_ok',
-            'services_unknown',
-            'services_unknown_handled',
-            'services_unknown_unhandled',
-            'services_critical',
-            'services_critical_handled',
-            'services_critical_unhandled',
-            'services_warning',
-            'services_warning_handled',
-            'services_warning_unhandled',
-            'services_pending',
-            'services_severity',
-            'services_ok_last_state_change',
-            'services_pending_last_state_change',
-            'services_warning_last_state_change_handled',
-            'services_critical_last_state_change_handled',
-            'services_unknown_last_state_change_handled',
-            'services_warning_last_state_change_unhandled',
-            'services_critical_last_state_change_unhandled',
-            'services_unknown_last_state_change_unhandled'
-        );
-    }
-
-    public function getSortRules()
-    {
-        return array(
-            'services_severity' => array(
-                'columns'   => array('services_severity'),
-                'order'     => self::SORT_DESC
-            )
-        );
-    }
-}

From 0c72686ba12dd280d86aee849a2f6e3199195791 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 12:46:47 +0200
Subject: [PATCH 1690/2920] monitoring: Make display_name columns case
 insensitive

The display_name columns should be case insenstive because we now support them when searching.

refs #8241
---
 .../library/Monitoring/Backend/Ido/Query/HoststatusQuery.php  | 2 +-
 .../library/Monitoring/Backend/Ido/Query/StatusQuery.php      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index 23a8b585a..5d32550e7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -11,7 +11,7 @@ class HoststatusQuery extends IdoQuery
         'hosts' => array(
             'host'              => 'ho.name1 COLLATE latin1_general_ci',
             'host_name'         => 'ho.name1 COLLATE latin1_general_ci',
-            'host_display_name' => 'h.display_name',
+            'host_display_name' => 'h.display_name COLLATE latin1_general_ci',
             'host_alias'        => 'h.alias',
             'host_address'      => 'h.address',
             'host_ipv4'         => 'INET_ATON(h.address)',
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index 17a12259e..a070c983c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -36,7 +36,7 @@ class StatusQuery extends IdoQuery
         'hosts' => array(
             'host'                  => 'ho.name1 COLLATE latin1_general_ci',
             'host_name'             => 'ho.name1',
-            'host_display_name'     => 'h.display_name',
+            'host_display_name'     => 'h.display_name COLLATE latin1_general_ci',
             'host_alias'            => 'h.alias',
             'host_address'          => 'h.address',
             'host_ipv4'             => 'INET_ATON(h.address)',
@@ -174,7 +174,7 @@ class StatusQuery extends IdoQuery
             'service_host_name'      => 'so.name1',
             'service'                => 'so.name2 COLLATE latin1_general_ci',
             'service_description'    => 'so.name2',
-            'service_display_name'   => 's.display_name',
+            'service_display_name'   => 's.display_name COLLATE latin1_general_ci',
             'service_icon_image'     => 's.icon_image',
             'service_action_url'     => 's.action_url',
             'service_notes_url'      => 's.notes_url',

From 6369643145c484e97856dca7e7e44e153a1d9bab Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 21 May 2015 13:51:15 +0200
Subject: [PATCH 1691/2920] DbUserGroupBackend: Do not sort by parent when
 sorting by group_name

refs #8826
---
 .../UserGroup/DbUserGroupBackend.php               | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
index 3abe44348..36aa61a1d 100644
--- a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
@@ -56,20 +56,6 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
      */
     protected $filterColumns = array('group', 'parent', 'user');
 
-    /**
-     * The default sort rules to be applied on a query
-     *
-     * @var array
-     */
-    protected $sortRules = array(
-        'group_name' => array(
-            'columns'   => array(
-                'group_name',
-                'parent_name'
-            )
-        )
-    );
-
     /**
      * Initialize this database user group backend
      */

From 9278d708d7570e4c162375c6de9abd2a2c37f088 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 21 May 2015 13:51:24 +0200
Subject: [PATCH 1692/2920] IniUserGroupBackend: Do not sort by parent when
 sorting by group_name

refs #8826
---
 .../UserGroup/IniUserGroupBackend.php              | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
index e70c9953c..a9d73038c 100644
--- a/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
@@ -35,20 +35,6 @@ class IniUserGroupBackend extends IniRepository implements UserGroupBackendInter
      */
     protected $filterColumns = array('group', 'parent');
 
-    /**
-     * The default sort rules to be applied on a query
-     *
-     * @var array
-     */
-    protected $sortRules = array(
-        'group_name' => array(
-            'columns'   => array(
-                'group_name',
-                'parent_name'
-            )
-        )
-    );
-
     /**
      * The value conversion rules to apply on a query
      *

From ba31be96952c8dc4c2daaadb7f2964e0336d2382 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 21 May 2015 13:52:43 +0200
Subject: [PATCH 1693/2920] RepositoryQuery: Disim.. Fix sort order handling

refs #8826
---
 library/Icinga/Repository/RepositoryQuery.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index 60848d69c..dc13ec68c 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -266,7 +266,9 @@ class RepositoryQuery implements QueryInterface, Iterator
             try {
                 $this->query->order(
                     $this->repository->requireFilterColumn($this->target, $column),
-                    $direction ? $baseDirection : ($specificDirection ?: $baseDirection)
+                    $specificDirection ?: $baseDirection
+                    // I would have liked the following solution, but hey, a coder should be allowed to produce crap...
+                    // $specificDirection && (! $direction || $column !== $field) ? $specificDirection : $baseDirection
                 );
             } catch (QueryException $_) {
                 Logger::info('Cannot order by column "%s" in repository "%s"', $column, $this->repository->getName());

From 4d79731646d3b54c387791f41e781a2e0da40022 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 21 May 2015 13:53:18 +0200
Subject: [PATCH 1694/2920] DbUserBackend: Fix sorting when sorting by
 user_name

refs #8826
---
 library/Icinga/Authentication/User/DbUserBackend.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Authentication/User/DbUserBackend.php b/library/Icinga/Authentication/User/DbUserBackend.php
index 362b2fb02..7a3de8966 100644
--- a/library/Icinga/Authentication/User/DbUserBackend.php
+++ b/library/Icinga/Authentication/User/DbUserBackend.php
@@ -69,8 +69,8 @@ class DbUserBackend extends DbRepository implements UserBackendInterface
     protected $sortRules = array(
         'user_name' => array(
             'columns'   => array(
-                'user_name asc',
-                'is_active desc'
+                'is_active desc',
+                'user_name'
             )
         )
     );

From 10b158a1822957b7ff2a2357fd326eb98e718309 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 21 May 2015 13:53:27 +0200
Subject: [PATCH 1695/2920] LdapUserBackend: Fix sorting when sorting by
 user_name

refs #8826
---
 library/Icinga/Authentication/User/LdapUserBackend.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index 7b9ffa253..7fc61dbc1 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -57,8 +57,8 @@ class LdapUserBackend extends Repository implements UserBackendInterface
     protected $sortRules = array(
         'user_name' => array(
             'columns'   => array(
-                'user_name asc',
-                'is_active desc'
+                'is_active desc',
+                'user_name'
             )
         )
     );

From 57328aa6ed5f2e1b1d173430eb7cc44f1fda9040 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 13:58:54 +0200
Subject: [PATCH 1696/2920] monitoring: Make host group and service group alias
 columns case insensitive

The alias columns should be case insenstive because we now support them when searching.

refs #8241
---
 .../Monitoring/Backend/Ido/Query/GroupsummaryQuery.php    | 8 ++++----
 .../Monitoring/Backend/Ido/Query/HoststatusQuery.php      | 2 +-
 .../library/Monitoring/Backend/Ido/Query/StatusQuery.php  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
index df1a38d88..da33c2bc6 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@@ -15,8 +15,8 @@ class GroupSummaryQuery extends IdoQuery
      */
     protected $columnMap = array(
         'hoststatussummary' => array(
-            'hostgroup'                                     => 'hostgroup',
-            'hostgroup_alias'                               => 'hostgroup_alias',
+            'hostgroup'                                     => 'hostgroup COLLATE latin1_general_ci',
+            'hostgroup_alias'                               => 'hostgroup_alias COLLATE latin1_general_ci',
             'hostgroup_name'                                => 'hostgroup_name',
             'hosts_up'                                      => 'SUM(CASE WHEN object_type = \'host\' AND state = 0 THEN 1 ELSE 0 END)',
             'hosts_unreachable'                             => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 THEN 1 ELSE 0 END)',
@@ -36,8 +36,8 @@ class GroupSummaryQuery extends IdoQuery
             'hosts_up_last_state_change'                    => 'MAX(CASE WHEN object_type = \'host\' AND state = 0 THEN state_change ELSE 0 END)'
         ),
         'servicestatussummary' => array(
-            'servicegroup'                                  => 'servicegroup',
-            'servicegroup_alias'                            => 'servicegroup_alias',
+            'servicegroup'                                  => 'servicegroup COLLATE latin1_general_ci',
+            'servicegroup_alias'                            => 'servicegroup_alias COLLATE latin1_general_ci',
             'servicegroup_name'                             => 'servicegroup_name',
             'services_critical'                             => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 THEN 1 ELSE 0 END)',
             'services_critical_handled'                     => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_state > 0 THEN 1 ELSE 0 END)',
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index 5d32550e7..ec9e6bd32 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -85,7 +85,7 @@ class HoststatusQuery extends IdoQuery
         'hostgroups' => array(
             'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
             'hostgroup_name'    => 'hgo.name1',
-            'hostgroup_alias'   => 'hg.alias'
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci'
         ),
         'servicegroups' => array(
             'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index a070c983c..84a7b64f1 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -162,12 +162,12 @@ class StatusQuery extends IdoQuery
         'hostgroups' => array(
             'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
             'hostgroup_name'    => 'hgo.name1',
-            'hostgroup_alias'   => 'hg.alias'
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci'
         ),
         'servicegroups' => array(
             'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
             'servicegroup_name'     => 'sgo.name1',
-            'servicegroup_alias'    => 'sg.alias'
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
         ),
         'services' => array(
             'service_host'           => 'so.name1 COLLATE latin1_general_ci',

From c47465a7329afaa32f57dd51103298b5057f4e71 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 14:04:04 +0200
Subject: [PATCH 1697/2920] lib/filter: Fix check against unset search columns

refs #8241
---
 library/Icinga/Web/Widget/FilterEditor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 07640872b..2d64e4c2b 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -216,7 +216,7 @@ class FilterEditor extends AbstractWidget
         $filter = $this->getFilter();
 
         if ($search !== null) {
-            if ($this->searchColumns === null) {
+            if (empty($this->searchColumns)) {
                 if (strpos($search, '=') === false) {
                     Notification::error(mt('monitoring', 'Cannot search here'));
                     return $this;

From 0002c0be260c0299ab92e7368f82e17ce4e53b45 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 21 May 2015 14:40:52 +0200
Subject: [PATCH 1698/2920] Provide default config name for Module::getConfig()

---
 library/Icinga/Application/Modules/Module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index c1fd84513..e8481aab8 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -600,7 +600,7 @@ class Module
      *
      * @return Config
      */
-    public function getConfig($file = null)
+    public function getConfig($file = 'config')
     {
         return $this->app->getConfig()->module($this->name, $file);
     }

From e8e3b940affa3e0f2458d080a293f7f92b7d5306 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 21 May 2015 14:34:43 +0200
Subject: [PATCH 1699/2920] Use CustomVariable names case insensitive

refs #8696
---
 .../Monitoring/Backend/Ido/Query/IdoQuery.php | 36 +++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index fda2f188e..5e27f6e00 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -86,6 +86,18 @@ abstract class IdoQuery extends DbQuery
      */
     protected $customVars = array();
 
+    /**
+     * Printf compatible string to joins custom vars
+     *
+     * - %1$s   Source field, contain the object_id
+     * - %2$s   Alias used for the relation
+     * - %3$s   Name of the CustomVariable
+     *
+     * @var string
+     */
+    private $customVarsJoinTemplate =
+        '%1$s = %2$s.object_id AND %2$s.varname = %3$s';
+
     /**
      * An array with all 'virtual' tables that are already joined
      *
@@ -393,14 +405,17 @@ abstract class IdoQuery extends DbQuery
     {
         parent::init();
         $this->prefix = $this->ds->getTablePrefix();
-
-        if ($this->ds->getDbType() === 'oracle') {
+        $dbType = $this->ds->getDbType();
+        if ($dbType === 'oracle') {
             $this->initializeForOracle();
-        } elseif ($this->ds->getDbType() === 'pgsql') {
+        } elseif ($dbType === 'pgsql') {
             $this->initializeForPostgres();
+            $this->customVarsJoinTemplate =
+                '%1$s = %2$s.object_id AND LOWER(%2$s.varname) = %3$s';
+        } elseif ($dbType === 'mysql') {
+            $this->customVarsJoinTemplate .= ' COLLATE latin1_general_ci';
         }
         $this->dbSelect();
-
         $this->select->columns($this->columns);
         //$this->joinBaseTables();
         $this->prepareAliasIndexes();
@@ -604,14 +619,14 @@ abstract class IdoQuery extends DbQuery
 
     protected function hasCustomvar($customvar)
     {
-        return array_key_exists($customvar, $this->customVars);
+        return array_key_exists(strtolower($customvar), $this->customVars);
     }
 
     protected function joinCustomvar($customvar)
     {
         // TODO: This is not generic enough yet
         list($type, $name) = $this->customvarNameToTypeName($customvar);
-        $alias = ($type === 'host' ? 'hcv_' : 'scv_') . strtolower($name);
+        $alias = ($type === 'host' ? 'hcv_' : 'scv_') . $name;
 
         $this->customVars[$customvar] = $alias;
 
@@ -622,12 +637,12 @@ abstract class IdoQuery extends DbQuery
         } else {
             $leftcol = 'h.' . $type . '_object_id';
         }
+
         $joinOn = sprintf(
-            '%s = %s.object_id AND %s.varname = %s',
+            $this->customVarsJoinTemplate,
             $leftcol,
             $alias,
-            $alias,
-            $this->db->quote(strtoupper($name))
+            $this->db->quote($name)
         );
 
         $this->select->joinLeft(
@@ -641,6 +656,7 @@ abstract class IdoQuery extends DbQuery
 
     protected function customvarNameToTypeName($customvar)
     {
+        $customvar = strtolower($customvar);
         // TODO: Improve this:
         if (! preg_match('~^_(host|service)_([a-zA-Z0-9_]+)$~', $customvar, $m)) {
             throw new ProgrammingError(
@@ -658,7 +674,7 @@ abstract class IdoQuery extends DbQuery
 
     protected function getCustomvarColumnName($customvar)
     {
-        return $this->customVars[$customvar] . '.varvalue';
+        return $this->customVars[strtolower($customvar)] . '.varvalue';
     }
 
     public function aliasToColumnName($alias)

From 598ef1e8f409b61e47ee1070009bc40d2484fef9 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 21 May 2015 14:59:12 +0200
Subject: [PATCH 1700/2920] Add alt-text to icon_images

Print alt-text as title and alt-attribute in the helper class and add the alt-column to the backend query.

refs #9300
---
 .../controllers/HostsController.php            |  2 ++
 .../application/controllers/ListController.php |  2 ++
 .../controllers/ServicesController.php         |  4 ++++
 .../application/views/helpers/IconImage.php    | 18 ++++++++++++++++--
 .../Backend/Ido/Query/StatusQuery.php          |  2 ++
 .../Monitoring/DataView/ServiceStatus.php      |  2 --
 .../library/Monitoring/Object/Host.php         |  1 +
 .../library/Monitoring/Object/Service.php      |  2 ++
 8 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index ac55ade9b..78c8eaa7e 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -54,6 +54,7 @@ class Monitoring_HostsController extends Controller
     {
         $this->hostList->setColumns(array(
             'host_icon_image',
+            'host_icon_image_alt',
             'host_name',
             'host_state',
             'host_problem',
@@ -96,6 +97,7 @@ class Monitoring_HostsController extends Controller
         $this->view->checkNowForm = $checkNowForm;
         $this->hostList->setColumns(array(
             'host_icon_image',
+            'host_icon_image_alt',
             'host_name',
             'host_state',
             'host_problem',
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 92c42d4ad..6b864be24 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -70,6 +70,7 @@ class Monitoring_ListController extends Controller
         $this->setAutorefreshInterval(10);
         $query = $this->backend->select()->from('hostStatus', array_merge(array(
             'host_icon_image',
+            'host_icon_image_alt',
             'host_name',
             'host_display_name',
             'host_state' => $stateColumn,
@@ -162,6 +163,7 @@ class Monitoring_ListController extends Controller
             'service_attempt',
             'service_last_state_change' => $stateChangeColumn,
             'service_icon_image',
+            'service_icon_image_alt',
             'service_is_flapping',
             'service_state_type',
             'service_handled',
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 6877aca02..1a8ec9a58 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -51,12 +51,14 @@ class Monitoring_ServicesController extends Controller
     {
         $this->serviceList->setColumns(array(
             'host_icon_image',
+            'host_icon_image_alt',
             'host_name',
             'host_output',
             'host_state',
             'host_problem',
             'host_handled',
             'service_icon_image',
+            'service_icon_image_alt',
             'service_description',
             'service_state',
             'service_problem',
@@ -96,12 +98,14 @@ class Monitoring_ServicesController extends Controller
         $this->view->checkNowForm = $checkNowForm;
         $this->serviceList->setColumns(array(
             'host_icon_image',
+            'host_icon_image_alt',
             'host_name',
             'host_output',
             'host_state',
             'host_problem',
             'host_handled',
             'service_icon_image',
+            'service_icon_image_alt',
             'service_output',
             'service_description',
             'service_state',
diff --git a/modules/monitoring/application/views/helpers/IconImage.php b/modules/monitoring/application/views/helpers/IconImage.php
index 2ed3b1d25..416a4f335 100644
--- a/modules/monitoring/application/views/helpers/IconImage.php
+++ b/modules/monitoring/application/views/helpers/IconImage.php
@@ -25,7 +25,14 @@ class Zend_View_Helper_IconImage extends Zend_View_Helper_Abstract
     public function host($object)
     {
         if ($object->host_icon_image && ! preg_match('/[\'"]/', $object->host_icon_image)) {
-            return $this->view->icon($this->view->resolveMacros($object->host_icon_image, $object));
+            return $this->view->img(
+                'img/icons/' . $this->view->resolveMacros($object->host_icon_image, $object),
+                null,
+                array(
+                    'alt' => $object->host_icon_image_alt,
+                    'title' => $object->host_icon_image_alt
+                )
+            );
         }
         return '';
     }
@@ -39,7 +46,14 @@ class Zend_View_Helper_IconImage extends Zend_View_Helper_Abstract
     public function service($object)
     {
         if ($object->service_icon_image && ! preg_match('/[\'"]/', $object->service_icon_image)) {
-            return $this->view->icon($this->view->resolveMacros($object->service_icon_image, $object));
+            return $this->view->img(
+                'img/icons/' . $this->view->resolveMacros($object->service_icon_image, $object),
+                null,
+                array(
+                    'alt' => $object->service_icon_image_alt,
+                    'title' => $object->service_icon_image_alt
+                )
+            );
         }
         return '';
     }
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index 17a12259e..14ffb438b 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -41,6 +41,7 @@ class StatusQuery extends IdoQuery
             'host_address'          => 'h.address',
             'host_ipv4'             => 'INET_ATON(h.address)',
             'host_icon_image'       => 'h.icon_image',
+            'host_icon_image_alt'   => 'h.icon_image_alt',
             'host_action_url'       => 'h.action_url',
             'host_notes_url'        => 'h.notes_url'
         ),
@@ -176,6 +177,7 @@ class StatusQuery extends IdoQuery
             'service_description'    => 'so.name2',
             'service_display_name'   => 's.display_name',
             'service_icon_image'     => 's.icon_image',
+            'service_icon_image_alt' => 's.icon_image_alt',
             'service_action_url'     => 's.action_url',
             'service_notes_url'      => 's.notes_url',
             'object_type'            => '(\'service\')'
diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index b4f1038da..18bf1aa80 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -40,7 +40,6 @@ class ServiceStatus extends DataView
             'service_unhandled',
             'service_output',
             'service_last_state_change',
-            'service_icon_image',
             'service_long_output',
             'service_is_flapping',
             'service_state_type',
@@ -60,7 +59,6 @@ class ServiceStatus extends DataView
             'service_last_notification',
             'service_check_command',
             'service_current_notification_number',
-            'host_icon_image',
             'host_acknowledged',
             'host_output',
             'host_long_output',
diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 2c01fe0eb..a158625b5 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -90,6 +90,7 @@ class Host extends MonitoredObject
     {
         $columns = array(
             'host_icon_image',
+            'host_icon_image_alt',
             'host_acknowledged',
             'host_action_url',
             'host_active_checks_enabled',
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index fec5de238..0e8c975f2 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -107,6 +107,7 @@ class Service extends MonitoredObject
     {
         return $this->backend->select()->from('serviceStatus', array(
             'host_icon_image',
+            'host_icon_image_alt',
             'host_acknowledged',
             'host_active_checks_enabled',
             'host_address',
@@ -120,6 +121,7 @@ class Service extends MonitoredObject
             'host_passive_checks_enabled',
             'host_state',
             'service_icon_image',
+            'service_icon_image_alt',
             'service_acknowledged',
             'service_action_url',
             'service_active_checks_enabled',

From 4833ff109c6fcfb2dbd3b836d024ca89a0fac331 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 21 May 2015 15:01:13 +0200
Subject: [PATCH 1701/2920] RepositoryQuery: Validate the table passed when
 calling from()

refs #8826
---
 library/Icinga/Repository/DbRepository.php    | 34 +++++++++++--------
 library/Icinga/Repository/Repository.php      | 19 +++++++++++
 library/Icinga/Repository/RepositoryQuery.php |  1 +
 3 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index aec2a4639..a1fb800ee 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -74,21 +74,6 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
         parent::__construct($ds);
     }
 
-    /**
-     * Return the base table name this repository is responsible for
-     *
-     * This prepends the datasource's table prefix, if available and required.
-     *
-     * @return  mixed
-     *
-     * @throws  ProgrammingError    In case no base table name has been set and
-     *                               $this->queryColumns does not provide one either
-     */
-    public function getBaseTable()
-    {
-        return $this->prependTablePrefix(parent::getBaseTable());
-    }
-
     /**
      * Return the given table with the datasource's prefix being prepended
      *
@@ -277,6 +262,25 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
         }
     }
 
+    /**
+     * Validate that the requested table exists
+     *
+     * @param   string  $table
+     *
+     * @return  string              The table's name, with the table prefix being prepended
+     *
+     * @throws  ProgrammingError    In case the given table does not exist
+     */
+    public function requireTable($table)
+    {
+        $statementColumns = $this->getStatementColumns();
+        if (! isset($statementColumns[$table])) {
+            $table = parent::requireTable($table);
+        }
+
+        return $this->prependTablePrefix($table);
+    }
+
     /**
      * Return this repository's query columns of the given table mapped to their respective aliases
      *
diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index 9a40a3d6f..8bc6517af 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -589,6 +589,25 @@ abstract class Repository implements Selectable
         return $value;
     }
 
+    /**
+     * Validate that the requested table exists
+     *
+     * @param   string  $table
+     *
+     * @return  string              The table's name, may differ from the given one
+     *
+     * @throws  ProgrammingError    In case the given table does not exist
+     */
+    public function requireTable($table)
+    {
+        $queryColumns = $this->getQueryColumns();
+        if (! isset($queryColumns[$table])) {
+            throw new ProgrammingError('Table "%s" not found', $table);
+        }
+
+        return $table;
+    }
+
     /**
      * Recurse the given filter, require each column for the given table and convert all values
      *
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index dc13ec68c..bdd51f53f 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -76,6 +76,7 @@ class RepositoryQuery implements QueryInterface, Iterator
      */
     public function from($target, array $columns = null)
     {
+        $target = $this->repository->requireTable($target);
         $this->query = $this->repository
             ->getDataSource()
             ->select()

From f808d373ea8124df7101639b0ea650a1cecf8097 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 21 May 2015 15:02:23 +0200
Subject: [PATCH 1702/2920] Display image icon tooltip instantly

refs #9300
---
 modules/monitoring/application/views/helpers/IconImage.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/IconImage.php b/modules/monitoring/application/views/helpers/IconImage.php
index 416a4f335..e0e969db4 100644
--- a/modules/monitoring/application/views/helpers/IconImage.php
+++ b/modules/monitoring/application/views/helpers/IconImage.php
@@ -30,7 +30,8 @@ class Zend_View_Helper_IconImage extends Zend_View_Helper_Abstract
                 null,
                 array(
                     'alt' => $object->host_icon_image_alt,
-                    'title' => $object->host_icon_image_alt
+                    'title' => $object->host_icon_image_alt,
+                    'data-tooltip-delay' => 0
                 )
             );
         }
@@ -51,7 +52,8 @@ class Zend_View_Helper_IconImage extends Zend_View_Helper_Abstract
                 null,
                 array(
                     'alt' => $object->service_icon_image_alt,
-                    'title' => $object->service_icon_image_alt
+                    'title' => $object->service_icon_image_alt,
+                    'data-tooltip-delay' => 0
                 )
             );
         }

From fac2ebce8051d56144d79930bb58a220b0cbac1a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 21 May 2015 15:02:56 +0200
Subject: [PATCH 1703/2920] RepositoryQuery: Fix handling of queries returning
 no results in fetchColumn()

refs #8826
---
 library/Icinga/Repository/RepositoryQuery.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index bdd51f53f..b25f8d00c 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -379,7 +379,7 @@ class RepositoryQuery implements QueryInterface, Iterator
     /**
      * Fetch and return the first column of this query's first row
      *
-     * @return  mixed
+     * @return  mixed|false     False in case of no result
      */
     public function fetchOne()
     {
@@ -400,7 +400,7 @@ class RepositoryQuery implements QueryInterface, Iterator
     /**
      * Fetch and return the first row of this query's result
      *
-     * @return  object
+     * @return  object|false    False in case of no result
      */
     public function fetchRow()
     {
@@ -434,7 +434,7 @@ class RepositoryQuery implements QueryInterface, Iterator
         }
 
         $results = $this->query->fetchColumn();
-        if ($results !== false && $this->repository->providesValueConversion()) {
+        if (! empty($results) && $this->repository->providesValueConversion()) {
             $columns = $this->getColumns();
             $aliases = array_keys($columns);
             $column = is_int($aliases[0]) ? $columns[0] : $aliases[0];

From 7c04664888d1bad237312fd3ecbade6016bf5e40 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Thu, 21 May 2015 16:09:03 +0200
Subject: [PATCH 1704/2920] Make MySQL collation syntax default

Overwrite customVarsJoinTemplate for Postgres and Oracle.

refs #8696
---
 .../library/Monitoring/Backend/Ido/Query/IdoQuery.php  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index 5e27f6e00..9371399bc 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -96,7 +96,7 @@ abstract class IdoQuery extends DbQuery
      * @var string
      */
     private $customVarsJoinTemplate =
-        '%1$s = %2$s.object_id AND %2$s.varname = %3$s';
+        '%1$s = %2$s.object_id AND %2$s.varname = %3$s COLLATE latin1_general_ci';
 
     /**
      * An array with all 'virtual' tables that are already joined
@@ -363,6 +363,8 @@ abstract class IdoQuery extends DbQuery
         $this->object_id = $this->host_id = $this->service_id
             = $this->hostgroup_id = $this->servicegroup_id
             = $this->contact_id = $this->contactgroup_id = 'id';
+        $this->customVarsJoinTemplate =
+            '%1$s = %2$s.object_id AND LOWER(%2$s.varname) = %3$s';
         foreach ($this->columnMap as &$columns) {
             foreach ($columns as &$value) {
                 $value = preg_replace('/UNIX_TIMESTAMP/', 'localts2unixts', $value);
@@ -376,6 +378,8 @@ abstract class IdoQuery extends DbQuery
      */
     private function initializeForPostgres()
     {
+        $this->customVarsJoinTemplate =
+            '%1$s = %2$s.object_id AND LOWER(%2$s.varname) = %3$s';
         foreach ($this->columnMap as $table => & $columns) {
             foreach ($columns as $key => & $value) {
                 $value = preg_replace('/ COLLATE .+$/', '', $value, -1, $count);
@@ -410,10 +414,6 @@ abstract class IdoQuery extends DbQuery
             $this->initializeForOracle();
         } elseif ($dbType === 'pgsql') {
             $this->initializeForPostgres();
-            $this->customVarsJoinTemplate =
-                '%1$s = %2$s.object_id AND LOWER(%2$s.varname) = %3$s';
-        } elseif ($dbType === 'mysql') {
-            $this->customVarsJoinTemplate .= ' COLLATE latin1_general_ci';
         }
         $this->dbSelect();
         $this->select->columns($this->columns);

From ce9110d22d0f8114ebd5902f5e9577724c85fdc0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 20 May 2015 10:31:58 +0200
Subject: [PATCH 1705/2920] Revert "Add proper respond http codes to service
 and host controller"

This reverts commit 6df031dc786256e0bd42f8047d6c308e90abedf6.

I revert this commit for the following reasons:
- MissingParameterException must not be thrown manually because we have UrlParams::getRequired() which was UrlParams::req() before.
- The commit introduces the untranslated string 'host or service'.
- 4xx are client, not server errors.
- Copy and paste code for the stack trace handling in the ErrorController.

refs #6281
---
 application/controllers/ErrorController.php         |  6 +-----
 .../application/controllers/HostController.php      | 13 +------------
 .../application/controllers/ServiceController.php   | 13 +------------
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index b1343dc81..a77d36f4f 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -34,11 +34,7 @@ class ErrorController extends ActionController
                 $path = preg_split('~/~', $path);
                 $path = array_shift($path);
                 $this->getResponse()->setHttpResponseCode(404);
-                $title = preg_replace('/\r?\n.*$/s', '', $exception->getMessage());
-                $this->view->title = 'Server error: ' . $title;
-                if ($this->getInvokeArg('displayExceptions')) {
-                    $this->view->stackTrace = $exception->getTraceAsString();
-                }
+                $this->view->message = $this->translate('Page not found.');
                 if ($modules->hasInstalled($path) && ! $modules->hasEnabled($path)) {
                     $this->view->message .= ' ' . sprintf(
                         $this->translate('Enabling the "%s" module might help!'),
diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index 7693023eb..2fc2bc7f3 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use Icinga\Exception\MissingParameterException;
 use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ProcessCheckResultCommandForm;
@@ -27,22 +26,12 @@ class Monitoring_HostController extends MonitoredObjectController
      */
     public function init()
     {
-        if ($this->params->get('host') === null) {
-            throw new MissingParameterException(
-                $this->translate('Required parameter \'%s\' is missing'),
-                'host'
-            );
-        }
-
         $host = new Host($this->backend, $this->params->get('host'));
 
         $this->applyRestriction('monitoring/hosts/filter', $host);
 
         if ($host->fetch() === false) {
-            throw new Zend_Controller_Action_Exception(
-                sprintf($this->translate('Host \'%s\' not found'), $this->params->get('host')),
-                404
-            );
+            throw new Zend_Controller_Action_Exception($this->translate('Host not found'));
         }
         $this->object = $host;
         $this->createTabs();
diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index e61c4685d..d6105df4d 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use Icinga\Exception\MissingParameterException;
 use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\ProcessCheckResultCommandForm;
@@ -27,22 +26,12 @@ class Monitoring_ServiceController extends MonitoredObjectController
      */
     public function init()
     {
-        if ($this->params->get('host') === null || $this->params->get('service') === null) {
-            throw new MissingParameterException(
-                $this->translate('One of the required parameters \'%s\' is missing'),
-                'host or service'
-            );
-        }
-
         $service = new Service($this->backend, $this->params->get('host'), $this->params->get('service'));
 
         $this->applyRestriction('monitoring/services/filter', $service);
 
         if ($service->fetch() === false) {
-            throw new Zend_Controller_Action_Exception(
-                sprintf($this->translate('Service \'%s\' not found'), $this->params->get('service')),
-                404
-            );
+            throw new Zend_Controller_Action_Exception($this->translate('Service not found'));
         }
         $this->object = $service;
         $this->createTabs();

From e8c704b98d46abb1304e098b744f61f8d2829c2b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 20 May 2015 10:36:05 +0200
Subject: [PATCH 1706/2920] monitoring: Fix HTTP response code when showing an
 invalid service

refs #6281
---
 .../application/controllers/ServiceController.php         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index d6105df4d..2886650c9 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -21,17 +21,17 @@ class Monitoring_ServiceController extends MonitoredObjectController
 
     /**
      * Fetch the requested service from the monitoring backend
-     *
-     * @throws Zend_Controller_Action_Exception If the service was not found
      */
     public function init()
     {
-        $service = new Service($this->backend, $this->params->get('host'), $this->params->get('service'));
+        $service = new Service(
+            $this->backend, $this->params->getRequired('host'), $this->params->getRequired('service')
+        );
 
         $this->applyRestriction('monitoring/services/filter', $service);
 
         if ($service->fetch() === false) {
-            throw new Zend_Controller_Action_Exception($this->translate('Service not found'));
+            $this->httpNotFound($this->translate('Service not found'));
         }
         $this->object = $service;
         $this->createTabs();

From 0b81a1130f9df955801273c0a91c2c2d3e0ef0cb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 20 May 2015 10:38:00 +0200
Subject: [PATCH 1707/2920] monitoring: Fix HTTP response code when showing an
 invalid host

refs #6281
---
 .../monitoring/application/controllers/HostController.php   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index 2fc2bc7f3..464da200c 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -21,17 +21,15 @@ class Monitoring_HostController extends MonitoredObjectController
 
     /**
      * Fetch the requested host from the monitoring backend
-     *
-     * @throws Zend_Controller_Action_Exception If the host was not found
      */
     public function init()
     {
-        $host = new Host($this->backend, $this->params->get('host'));
+        $host = new Host($this->backend, $this->params->getRequired('host'));
 
         $this->applyRestriction('monitoring/hosts/filter', $host);
 
         if ($host->fetch() === false) {
-            throw new Zend_Controller_Action_Exception($this->translate('Host not found'));
+            $this->httpNotFound($this->translate('Host not found'));
         }
         $this->object = $host;
         $this->createTabs();

From 54f72377c5cb9e3ac388dced40dda61a64032d9b Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 21 May 2015 16:28:00 +0200
Subject: [PATCH 1708/2920] Do not display mouse-over effect in comment
 multi-view

---
 .../views/scripts/partials/comment/comment-detail.phtml    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
index 98ee0534b..46de949d2 100644
--- a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
+++ b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
@@ -1,11 +1,10 @@
 <?php if ($comment->objecttype === 'service'): ?>
     <?= $this->icon('service', $this->translate('Service')); ?>
-    <?= $this->link()->service(
-        $comment->service_description,
+    <?= sprintf(
+        $this->translate('%s on %s', 'Service running on host'),
         $comment->service_display_name,
-        $comment->host_name,
         $comment->host_display_name
-    ); ?>
+    ) ?>
 <?php else: ?>
     <?= $this->icon('host', $this->translate('Host')); ?>
     <?= $this->link()->host($comment->host_name, $comment->host_display_name); ?>

From 0686bc1d86da5b90a4af72d724dcee0db647bae1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 21 May 2015 16:38:47 +0200
Subject: [PATCH 1709/2920] GroupController: List members when showing a group

refs #8826
---
 application/controllers/GroupController.php | 45 +++++++++++++++++
 application/views/scripts/group/show.phtml  | 55 +++++++++++++++++++--
 public/css/icinga/main-content.less         | 28 +++++++++++
 3 files changed, 124 insertions(+), 4 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index f0addcd51..26bcec54b 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -7,6 +7,7 @@ use Icinga\Application\Config;
 use Icinga\Application\Logger;
 use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Authentication\UserGroup\UserGroupBackendInterface;
+use Icinga\Data\Reducible;
 use Icinga\Forms\Config\UserGroupForm;
 use Icinga\Web\Controller;
 use Icinga\Web\Form;
@@ -114,8 +115,52 @@ class GroupController extends Controller
             $this->httpNotFound(sprintf($this->translate('Group "%s" not found'), $groupName));
         }
 
+        $members = $backend
+            ->select()
+            ->from('group_membership', array('user_name'))
+            ->where('group_name', $groupName);
+
+        $filterEditor = Widget::create('filterEditor')
+            ->setQuery($members)
+            ->preserveParams('limit', 'sort', 'dir', 'view', 'backend', 'group')
+            ->ignoreParams('page')
+            ->handleRequest($this->getRequest());
+        $members->applyFilter($filterEditor->getFilter());
+
+        $this->setupFilterControl($filterEditor);
+        $this->setupPaginationControl($members);
+        $this->setupLimitControl();
+        $this->setupSortControl(
+            array(
+                'user_name'     => $this->translate('Username'),
+                'created_at'    => $this->translate('Created at'),
+                'last_modified' => $this->translate('Last modified')
+            ),
+            $members
+        );
+
         $this->view->group = $group;
         $this->view->backend = $backend;
+        $this->view->members = $members;
+
+        if ($backend instanceof Reducible) {
+            $removeForm = new Form();
+            $removeForm->setName('removemember');
+            $removeForm->setAction(
+                Url::fromPath('group/removemember', array('backend' => $backend->getName(), 'group' => $groupName))
+            );
+            $removeForm->addElement('hidden', 'user_name', array('decorators' => array('ViewHelper')));
+            $removeForm->addElement('button', 'btn_submit', array(
+                'escape'        => false,
+                'type'          => 'submit',
+                'class'         => 'link-like',
+                'value'         => 'btn_submit',
+                'decorators'    => array('ViewHelper'),
+                'label'         => $this->view->icon('trash'),
+                'title'         => $this->translate('Remove this member')
+            ));
+            $this->view->removeForm = $removeForm;
+        }
     }
 
     /**
diff --git a/application/views/scripts/group/show.phtml b/application/views/scripts/group/show.phtml
index 302917b2a..2b783796c 100644
--- a/application/views/scripts/group/show.phtml
+++ b/application/views/scripts/group/show.phtml
@@ -1,7 +1,10 @@
 <?php 
 
+use Icinga\Data\Extensible;
 use Icinga\Data\Updatable;
 
+$extensible = $backend instanceof Extensible;
+
 $editLink = null;
 if ($backend instanceof Updatable) {
     $editLink = $this->qlink(
@@ -21,9 +24,9 @@ if ($backend instanceof Updatable) {
 
 ?>
 <div class="controls">
-  <?php if (! $this->compact): ?>
-    <?= $tabs->showOnlyCloseButton(); ?>
-  <?php endif ?>
+ <?php if (! $this->compact): ?>
+  <?= $tabs->showOnlyCloseButton(); ?>
+ <?php endif ?>
   <div class="group-header">
     <p class="group-name"><strong><?= $this->escape($group->group_name); ?></strong></p> <?= $editLink; ?>
     <p class="group-parent"><strong><?= $this->translate('Parent'); ?>:</strong> <?= $group->parent_name === null ? '-' : $this->qlink(
@@ -40,6 +43,50 @@ if ($backend instanceof Updatable) {
     <p class="group-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $group->created_at === null ? '-' : $this->formatDateTime($group->created_at); ?></p>
     <p class="group-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $group->last_modified === null ? '-' : $this->formatDateTime($group->last_modified); ?></p>
   </div>
+ <?php if (! $this->compact): ?>
+  <?= $this->sortBox; ?>
+ <?php endif ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+ <?php if (! $this->compact): ?>
+  <?= $this->filterEditor; ?>
+ <?php endif ?>
 </div>
-<div class="content" data-base-target="_next">
+<div class="content members" data-base-target="_next">
+<?php if (count($members) > 0): ?>
+  <table data-base-target="_next" class="action member-list">
+    <thead>
+      <tr>
+        <th class="member-name"><?= $this->translate('Username'); ?></th>
+       <?php if (isset($removeForm)): ?>
+        <th class="member-remove"><?= $this->translate('Remove'); ?></th>
+       <?php endif ?>
+      </tr>
+    </thead>
+    <tbody>
+    <?php foreach ($members as $member): ?>
+      <tr>
+        <td class="member-name"><?= $this->escape($member->user_name); ?></td>
+       <?php if (isset($removeForm)): ?>
+        <td class="member-remove">
+          <?php $removeForm->getElement('user_name')->setValue($member->user_name); echo $removeForm; ?>
+        </td>
+       <?php endif ?>
+      </tr>
+    <?php endforeach ?>
+    </tbody>
+  </table>
+<?php else: ?>
+  <p><?= $this->translate('No group member found matching the filter'); ?></p>
+<?php endif ?>
+<?php if ($extensible): ?>
+  <?= $this->qlink($this->translate('Add a new member'), 'group/addmember', array(
+    'backend'           => $backend->getName(),
+    'group'             => $group->group_name
+  ), array(
+    'icon'              => 'plus',
+    'data-base-target'  => '_next',
+    'class'             => 'member-add'
+  )); ?>
+ <?php endif ?>
 </div>
\ No newline at end of file
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index d7082d5fd..603466f67 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -266,6 +266,7 @@ div.content.groups {
 
 div.controls div.group-header {
   border-bottom: 2px solid @colorPetrol;
+  margin-bottom: 1em;
 
   .group-name {
     display: inline-block;
@@ -279,6 +280,33 @@ div.controls div.group-header {
   }
 }
 
+div.content.members {
+  table.member-list {
+    th.member-remove {
+      width: 8em;
+      padding-right: 0.5em;
+      text-align: right;
+    }
+
+    td.member-remove {
+      text-align: right;
+
+      form button.link-like {
+        color: inherit;
+      }
+    }
+  }
+
+  p {
+    margin-top: 0;
+  }
+
+  a.member-add {
+    display: block;
+    margin-top: 1em;
+  }
+}
+
 form.backend-selection {
   float: right;
 

From c4ed49cb1a0a12ca153606cb1949b42ba740011b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 16:43:58 +0200
Subject: [PATCH 1710/2920] lib: Add HttpNotFoundException

The HttpNotFoundException should be used for sending a HTTP 404 response w/ a custom message.

There's also Zend_Controller_Action_Exception but this exception will always show 'Page not found' because we
want to hide messages generated by Zend, like 'Action "foobar" does not exist and was not trapped in __call()'.

refs #6281
---
 library/Icinga/Exception/HttpNotFoundException.php | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 library/Icinga/Exception/HttpNotFoundException.php

diff --git a/library/Icinga/Exception/HttpNotFoundException.php b/library/Icinga/Exception/HttpNotFoundException.php
new file mode 100644
index 000000000..09febf0b4
--- /dev/null
+++ b/library/Icinga/Exception/HttpNotFoundException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Icinga\Exception;
+
+/**
+ * Exception thrown for sending a HTTP 404 response w/ a custom message
+ */
+class HttpNotFoundException extends IcingaException
+{
+
+}

From dd1025119d81ee4bf8435a823a88e47c4697defe Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 16:54:00 +0200
Subject: [PATCH 1711/2920] Throw HttpNotFoundException on
 Controller::httpNotFound()

refs #6281
---
 library/Icinga/Web/Controller.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index 0975d4c13..cdc049c87 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -3,7 +3,7 @@
 
 namespace Icinga\Web;
 
-use Zend_Controller_Action_Exception;
+use Icinga\Exception\HttpNotFoundException;
 use Icinga\Data\Sortable;
 use Icinga\Data\QueryInterface;
 use Icinga\Web\Controller\ModuleActionController;
@@ -55,11 +55,11 @@ class Controller extends ModuleActionController
      *
      * @param   $message
      *
-     * @throws  Zend_Controller_Action_Exception
+     * @throws  HttpNotFoundException
      */
     public function httpNotFound($message)
     {
-        throw new Zend_Controller_Action_Exception($message, 404);
+        throw new HttpNotFoundException($message);
     }
 
     /**

From 03b4de32530e5b7c3822ca66129230d1debcbc5a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 16:56:27 +0200
Subject: [PATCH 1712/2920] Handle the HttpNotFoundException in the
 ErrorController

refs #6281
---
 application/controllers/ErrorController.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index a77d36f4f..ba9b44266 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -3,6 +3,7 @@
 
 use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
+use Icinga\Exception\HttpNotFoundException;
 use Icinga\Exception\MissingParameterException;
 use Icinga\Security\SecurityException;
 use Icinga\Web\Controller\ActionController;
@@ -45,8 +46,8 @@ class ErrorController extends ActionController
                 break;
             default:
                 switch (true) {
-                    case $exception instanceof SecurityException:
-                        $this->getResponse()->setHttpResponseCode(403);
+                    case $exception instanceof HttpNotFoundException:
+                        $this->getResponse()->setHttpResponseCode(404);
                         break;
                     case $exception instanceof MissingParameterException:
                         $this->getResponse()->setHttpResponseCode(400);
@@ -55,6 +56,9 @@ class ErrorController extends ActionController
                             'Missing parameter ' . $exception->getParameter()
                         );
                         break;
+                    case $exception instanceof SecurityException:
+                        $this->getResponse()->setHttpResponseCode(403);
+                        break;
                     default:
                         $this->getResponse()->setHttpResponseCode(500);
                         break;

From 5e520e7b59420371e8b882cd3e2e8d5de5ab1064 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 16:57:43 +0200
Subject: [PATCH 1713/2920] Don't display a error message as title too

refs #6281
---
 application/controllers/ErrorController.php | 2 --
 application/views/scripts/error/error.phtml | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index ba9b44266..e5e98ee7e 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -63,8 +63,6 @@ class ErrorController extends ActionController
                         $this->getResponse()->setHttpResponseCode(500);
                         break;
                 }
-                $title = preg_replace('/\r?\n.*$/s', '', $exception->getMessage());
-                $this->view->title = 'Server error: ' . $title;
                 $this->view->message = $exception->getMessage();
                 if ($this->getInvokeArg('displayExceptions')) {
                     $this->view->stackTrace = $exception->getTraceAsString();
diff --git a/application/views/scripts/error/error.phtml b/application/views/scripts/error/error.phtml
index d9422474c..5b3480922 100644
--- a/application/views/scripts/error/error.phtml
+++ b/application/views/scripts/error/error.phtml
@@ -1,13 +1,8 @@
 <div class="controls">
 <?= $this->tabs->showOnlyCloseButton() ?>
-<?php if ($this->title): ?>
-<h1><?= $this->escape($title) ?></h1>
-<?php endif ?>
 </div>
 <div class="content">
-<?php if ($this->message): ?>
   <p><strong><?= nl2br($this->escape($message)) ?></strong></p>
-<?php endif ?>
 <?php if (isset($stackTrace)) : ?>
   <hr />
   <pre><?= $this->escape($stackTrace) ?></pre>

From 8f42d7a1d34c5867738ddf8aa460f679b3b8c873 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 17:17:25 +0200
Subject: [PATCH 1714/2920] monitoring: Fix HTTP response code when showing an
 invalid downtime

refs #6281
---
 .../application/controllers/DowntimeController.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/controllers/DowntimeController.php b/modules/monitoring/application/controllers/DowntimeController.php
index c06e0311d..706090f62 100644
--- a/modules/monitoring/application/controllers/DowntimeController.php
+++ b/modules/monitoring/application/controllers/DowntimeController.php
@@ -35,8 +35,8 @@ class Monitoring_DowntimeController extends Controller
      */
     public function init()
     {
-        $downtimeId = $this->params->get('downtime_id');
-         
+        $downtimeId = $this->params->getRequired('downtime_id');
+
         $this->downtime = $this->backend->select()->from('downtime', array(
             'id'              => 'downtime_internal_id',
             'objecttype'      => 'downtime_objecttype',
@@ -60,17 +60,17 @@ class Monitoring_DowntimeController extends Controller
             'host_display_name',
             'service_display_name'
         ))->where('downtime_internal_id', $downtimeId)->getQuery()->fetchRow();
-        
-        if (false === $this->downtime) {
-            throw new Zend_Controller_Action_Exception($this->translate('Downtime not found'));
+
+        if ($this->downtime === false) {
+            $this->httpNotFound($this->translate('Downtime not found'));
         }
-        
+
         if (isset($this->downtime->service_description)) {
             $this->isService = true;
         } else {
             $this->isService = false;
         }
-        
+
         $this->getTabs()
             ->add(
                 'downtime',

From fcd7aaef876a9826471aa40df30ad48d81b61e87 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 17:18:29 +0200
Subject: [PATCH 1715/2920] lib: Add HttpException as base class for HTTP
 exceptions

refs #6281
---
 library/Icinga/Exception/Http/HttpException.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 library/Icinga/Exception/Http/HttpException.php

diff --git a/library/Icinga/Exception/Http/HttpException.php b/library/Icinga/Exception/Http/HttpException.php
new file mode 100644
index 000000000..4f47f5b67
--- /dev/null
+++ b/library/Icinga/Exception/Http/HttpException.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Icinga\Exception\Http;
+
+use Icinga\Exception\IcingaException;
+
+/**
+ * Base class for HTTP exceptions
+ */
+abstract class HttpException extends IcingaException
+{
+
+}

From fde60f4a00fdbfeb27f46caee3df36c5e85fbd5a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 17:19:07 +0200
Subject: [PATCH 1716/2920] lib: Add HttpMethodNotAllowedException

At the moment we throw a Zend_Controller_Action_Exception when the HTTP method is not allowed.
I'll replace this w/ the exception introduced.

refs #6281
---
 .../Http/HttpMethodNotAllowedException.php    | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 library/Icinga/Exception/Http/HttpMethodNotAllowedException.php

diff --git a/library/Icinga/Exception/Http/HttpMethodNotAllowedException.php b/library/Icinga/Exception/Http/HttpMethodNotAllowedException.php
new file mode 100644
index 000000000..5826e52de
--- /dev/null
+++ b/library/Icinga/Exception/Http/HttpMethodNotAllowedException.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Icinga\Exception\Http;
+
+use Icinga\Exception\IcingaException;
+
+/**
+ * Exception thrown if the HTTP method is not allowed
+ */
+class HttpMethodNotAllowedException extends IcingaException
+{
+    /**
+     * Allowed HTTP methods
+     *
+     * @var string
+     */
+    protected $allowedMethods;
+
+    /**
+     * Get the allowed HTTP methods
+     *
+     * @return string
+     */
+    public function getAllowedMethods()
+    {
+        return $this->allowedMethods;
+    }
+
+    /**
+     * Set the allowed HTTP methods
+     *
+     * @param   string $allowedMethods
+     *
+     * @return  $this
+     */
+    public function setAllowedMethods($allowedMethods)
+    {
+        $this->allowedMethods = (string) $allowedMethods;
+        return $this;
+    }
+}

From 71a2324cb9c9e3f817abf8519a5e39bb0817b5e7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 09:12:42 +0200
Subject: [PATCH 1717/2920] lib: Let Controller::assertHttpMethod() throw a
 HttpMethodNotAllowedException

refs #6281
---
 library/Icinga/Web/Controller/ActionController.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index b78090a7f..a60c82c8e 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -7,6 +7,7 @@ use Exception;
 use Icinga\Application\Benchmark;
 use Icinga\Application\Config;
 use Icinga\Authentication\Manager;
+use Icinga\Exception\Http\HttpMethodNotAllowedException;
 use Icinga\Exception\IcingaException;
 use Icinga\Exception\ProgrammingError;
 use Icinga\File\Pdf;
@@ -192,16 +193,17 @@ class ActionController extends Zend_Controller_Action
     /**
      * Respond with HTTP 405 if the current request's method is not one of the given methods
      *
-     * @param   string $httpMethod                  Unlimited number of allowed HTTP methods
+     * @param   string $httpMethod              Unlimited number of allowed HTTP methods
      *
-     * @throws  \Zend_Controller_Action_Exception   If the request method is not one of the given methods
+     * @throws  HttpMethodNotAllowedException   If the request method is not one of the given methods
      */
     public function assertHttpMethod($httpMethod)
     {
         $httpMethods = array_flip(array_map('strtoupper', func_get_args()));
         if (! isset($httpMethods[$this->getRequest()->getMethod()])) {
-            $this->getResponse()->setHeader('Allow', implode(', ', array_keys($httpMethods)));
-            throw new \Zend_Controller_Action_Exception($this->translate('Method Not Allowed'), 405);
+            $e = new HttpMethodNotAllowedException($this->translate('Method Not Allowed'));
+            $e->setAllowedMethods(implode(', ', array_keys($httpMethods)));
+            throw $e;
         }
     }
 

From 3f608fda24276ea9942d0b92236a66d432ad1162 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 09:15:52 +0200
Subject: [PATCH 1718/2920] Handle the HttpMethodNotAllowedException in the
 ErrorController

refs #6281
---
 application/controllers/ErrorController.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index e5e98ee7e..0acc85bdd 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -3,6 +3,7 @@
 
 use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
+use Icinga\Exception\Http\HttpMethodNotAllowedException;
 use Icinga\Exception\HttpNotFoundException;
 use Icinga\Exception\MissingParameterException;
 use Icinga\Security\SecurityException;
@@ -46,6 +47,10 @@ class ErrorController extends ActionController
                 break;
             default:
                 switch (true) {
+                    case $exception instanceof HttpMethodNotAllowedException:
+                        $this->getResponse()->setHttpResponseCode(405);
+                        $this->getResponse()->setHeader('Allow', $exception->getAllowedMethods());
+                        break;
                     case $exception instanceof HttpNotFoundException:
                         $this->getResponse()->setHttpResponseCode(404);
                         break;

From e137263c4b061bd4f2b26c96406a8aff4d3a7d22 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 09:20:27 +0200
Subject: [PATCH 1719/2920] monitoring: Fix HTTP response code when showing an
 invalid comment

refs #6281
---
 .../application/controllers/CommentController.php  | 14 ++++++--------
 .../application/controllers/DowntimeController.php |  2 --
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/controllers/CommentController.php b/modules/monitoring/application/controllers/CommentController.php
index c3fcd18f8..4237d598b 100644
--- a/modules/monitoring/application/controllers/CommentController.php
+++ b/modules/monitoring/application/controllers/CommentController.php
@@ -20,13 +20,11 @@ class Monitoring_CommentController extends Controller
 
     /**
      * Fetch the first comment with the given id and add tabs
-     *
-     * @throws Zend_Controller_Action_Exception
      */
     public function init()
     {
-        $commentId = $this->params->get('comment_id');
-         
+        $commentId = $this->params->getRequired('comment_id');
+
         $this->comment = $this->backend->select()->from('comment', array(
             'id'         => 'comment_internal_id',
             'objecttype' => 'comment_objecttype',
@@ -41,9 +39,9 @@ class Monitoring_CommentController extends Controller
             'host_display_name',
             'service_display_name'
         ))->where('comment_internal_id', $commentId)->getQuery()->fetchRow();
-        
-        if (false === $this->comment) {
-            throw new Zend_Controller_Action_Exception($this->translate('Comment not found'));
+
+        if ($this->comment === false) {
+            $this->httpNotFound($this->translate('Comment not found'));
         }
 
         $this->getTabs()->add(
@@ -88,7 +86,7 @@ class Monitoring_CommentController extends Controller
     private function createDelCommentForm()
     {
         $this->assertPermission('monitoring/command/comment/delete');
-        
+
         $delCommentForm = new DeleteCommentCommandForm();
         $delCommentForm->setAction(
             Url::fromPath('monitoring/comment/show')
diff --git a/modules/monitoring/application/controllers/DowntimeController.php b/modules/monitoring/application/controllers/DowntimeController.php
index 706090f62..67b8b6a33 100644
--- a/modules/monitoring/application/controllers/DowntimeController.php
+++ b/modules/monitoring/application/controllers/DowntimeController.php
@@ -30,8 +30,6 @@ class Monitoring_DowntimeController extends Controller
 
     /**
      * Fetch the downtime matching the given id and add tabs
-     *
-     * @throws Zend_Controller_Action_Exception
      */
     public function init()
     {

From d2bb74a2f96fe5c4e03c8dec3b8e7206faeba2d9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 09:25:49 +0200
Subject: [PATCH 1720/2920] lib: Move HttpNotFoundException beneath the Http
 Exception namespace

refs #6281
---
 application/controllers/ErrorController.php                   | 2 +-
 .../Icinga/Exception/Http/HttpMethodNotAllowedException.php   | 4 +---
 library/Icinga/Exception/{ => Http}/HttpNotFoundException.php | 4 ++--
 library/Icinga/Web/Controller.php                             | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)
 rename library/Icinga/Exception/{ => Http}/HttpNotFoundException.php (52%)

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index 0acc85bdd..0223a66b7 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -4,7 +4,7 @@
 use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
 use Icinga\Exception\Http\HttpMethodNotAllowedException;
-use Icinga\Exception\HttpNotFoundException;
+use Icinga\Exception\Http\HttpNotFoundException;
 use Icinga\Exception\MissingParameterException;
 use Icinga\Security\SecurityException;
 use Icinga\Web\Controller\ActionController;
diff --git a/library/Icinga/Exception/Http/HttpMethodNotAllowedException.php b/library/Icinga/Exception/Http/HttpMethodNotAllowedException.php
index 5826e52de..57144a883 100644
--- a/library/Icinga/Exception/Http/HttpMethodNotAllowedException.php
+++ b/library/Icinga/Exception/Http/HttpMethodNotAllowedException.php
@@ -2,12 +2,10 @@
 
 namespace Icinga\Exception\Http;
 
-use Icinga\Exception\IcingaException;
-
 /**
  * Exception thrown if the HTTP method is not allowed
  */
-class HttpMethodNotAllowedException extends IcingaException
+class HttpMethodNotAllowedException extends HttpException
 {
     /**
      * Allowed HTTP methods
diff --git a/library/Icinga/Exception/HttpNotFoundException.php b/library/Icinga/Exception/Http/HttpNotFoundException.php
similarity index 52%
rename from library/Icinga/Exception/HttpNotFoundException.php
rename to library/Icinga/Exception/Http/HttpNotFoundException.php
index 09febf0b4..8ec6b7fcb 100644
--- a/library/Icinga/Exception/HttpNotFoundException.php
+++ b/library/Icinga/Exception/Http/HttpNotFoundException.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Icinga\Exception;
+namespace Icinga\Exception\Http;
 
 /**
  * Exception thrown for sending a HTTP 404 response w/ a custom message
  */
-class HttpNotFoundException extends IcingaException
+class HttpNotFoundException extends HttpException
 {
 
 }
diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index cdc049c87..a8d0545cf 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -3,9 +3,9 @@
 
 namespace Icinga\Web;
 
-use Icinga\Exception\HttpNotFoundException;
 use Icinga\Data\Sortable;
 use Icinga\Data\QueryInterface;
+use Icinga\Exception\Http\HttpNotFoundException;
 use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Web\Widget\Limiter;
 use Icinga\Web\Widget\Paginator;

From d187d77a7f2deb2033c38d54086d208f0d562aad Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 09:29:33 +0200
Subject: [PATCH 1721/2920] monitoring: Use timeAgo in the comment-description
 partial

refs #6778
---
 .../views/scripts/partials/comment/comment-description.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/partials/comment/comment-description.phtml b/modules/monitoring/application/views/scripts/partials/comment/comment-description.phtml
index 2c5f07133..87a7308fc 100644
--- a/modules/monitoring/application/views/scripts/partials/comment/comment-description.phtml
+++ b/modules/monitoring/application/views/scripts/partials/comment/comment-description.phtml
@@ -24,4 +24,4 @@
 ?>
 <strong><?= $this->escape($title); ?></strong><br>
 <?= $this->icon($icon, $tooltip) ?>
-<?= $this->prefixedTimeSince($comment->timestamp); ?>
+<?= $this->timeAgo($comment->timestamp, $this->compact); ?>

From d17842b48561c251ad73df864d6c7821520cad8e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 09:33:30 +0200
Subject: [PATCH 1722/2920] monitoring: Fix usage of the dropped
 DateTimeRenderer

refs #6778
---
 .../partials/downtime/downtime-header.phtml       | 11 +----------
 .../partials/downtime/downtimes-header.phtml      | 15 +++------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
index 92759a12a..8544d36de 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
@@ -3,16 +3,7 @@
     <td class="state">
       <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
       <br>
-        <?=
-        $this->dateTimeRenderer(
-            ($downtime->is_in_effect ? $downtime->end : $downtime->start),
-            true
-        )->render(
-            $this->translate('on %s', 'datetime'),
-            $this->translate('at %s', 'time'),
-            $this->translate('in %s', 'timespan')
-        );
-        ?>
+      <?= $downtime->is_in_effect ? $this->timeSince($downtime->start, $this->compact) : $this->timeUntil($downtime->start, $this->compact) ?>
     </td>
     <td>
       <small>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index 5518e5022..ddc436c2c 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -8,16 +8,7 @@
           <td class="state">
             <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
             <br>
-            <?=
-                $this->dateTimeRenderer(
-                    ($downtime->is_in_effect ? $downtime->end : $downtime->start),
-                    true
-                )->render(
-                    $this->translate('on %s', 'datetime'),
-                    $this->translate('at %s', 'time'),
-                    $this->translate('in %s', 'timespan')
-                );
-            ?>
+            <?= $downtime->is_in_effect ? $this->timeSince($downtime->start, $this->compact) : $this->timeUntil($downtime->start, $this->compact) ?>
           </td>
           <td class="name oneline">
             <?php if ($downtime->isService): ?>
@@ -27,7 +18,7 @@
                  <?= $this->icon('host', $this->translate('Host')) ?>
                 <b><?= $downtime->host_name ?>.</b>
             <?php endif; ?>
-                
+
             <?php if ($downtime->is_flexible): ?>
               <?php if ($downtime->is_in_effect): ?>
                 <?= sprintf(
@@ -91,4 +82,4 @@
         )
     ) ?>
     <?php endif ?>
-  </p>
\ No newline at end of file
+  </p>

From dd298edb8195dd5406b5fb20a660f9f9f1174cdf Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 09:33:51 +0200
Subject: [PATCH 1723/2920] lib: Only invert relative partial times if
 necessary

refs #6778
---
 library/Icinga/Date/DateFormatter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Date/DateFormatter.php b/library/Icinga/Date/DateFormatter.php
index 411c19535..d3563e6e6 100644
--- a/library/Icinga/Date/DateFormatter.php
+++ b/library/Icinga/Date/DateFormatter.php
@@ -202,7 +202,7 @@ class DateFormatter
     public static function timeUntil($time, $timeOnly = false)
     {
         list($type, $until, $invert) = static::diff($time);
-        if ($invert) {
+        if ($invert && $type === static::RELATIVE) {
             $until = '-' . $until;
         }
         if ($timeOnly) {

From edd386e14be8846db36fc8738c8c6a8cf3df590c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 09:49:06 +0200
Subject: [PATCH 1724/2920] lib: Add DateFormatter::formatDuration()

refs #6778
---
 library/Icinga/Date/DateFormatter.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/library/Icinga/Date/DateFormatter.php b/library/Icinga/Date/DateFormatter.php
index d3563e6e6..6d98efe8d 100644
--- a/library/Icinga/Date/DateFormatter.php
+++ b/library/Icinga/Date/DateFormatter.php
@@ -108,6 +108,29 @@ class DateFormatter
         return date('Y-m-d H:i:s', (float) $dateTime);
     }
 
+    /**
+     * Format a duration
+     *
+     * @param   int|float $seconds Duration in seconds
+     *
+     * @return  string
+     */
+    public static function formatDuration($seconds)
+    {
+        $minutes = floor((float) $seconds / 60);
+        if ($minutes < 60) {
+            $formatted = sprintf('%dm %ds', $minutes, $seconds % 60);
+        } else {
+            $hours = floor($minutes / 60);
+            if ($hours < 24) {
+                $formatted = sprintf('%dh %dm', $hours, $minutes % 60);
+            } else {
+                $formatted = sprintf('%dd %dh', floor($hours / 24), $hours % 24);
+            }
+        }
+        return $formatted;
+    }
+
     /**
      * Format time
      *

From de9be044b3657799c6aef1a010ac6498ea069918 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 10:04:00 +0200
Subject: [PATCH 1725/2920] lib: Provide formatDuration() in our views

refs #6778
---
 library/Icinga/Web/View/helpers/format.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php
index a364f6cde..73257d079 100644
--- a/library/Icinga/Web/View/helpers/format.php
+++ b/library/Icinga/Web/View/helpers/format.php
@@ -24,6 +24,13 @@ $this->addHelperFunction('formatDateTime', function ($dateTime) {
     return DateFormatter::formatDateTime($dateTime);
 });
 
+$this->addHelperFunction('formatDuration', function ($seconds) {
+    if (! $seconds) {
+        return '';
+    }
+    return DateFormatter::formatDuration($seconds);
+});
+
 $this->addHelperFunction('formatTime', function ($time) {
     if (! $time) {
         return '';

From da97523fa0b02dd180c681e961271d0b0588978c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 10:06:55 +0200
Subject: [PATCH 1726/2920] monitoring: Fix duration, date and time formatting
 for downtimes

refs #6778
---
 .../views/scripts/downtime/show.phtml         | 46 +++++++++----------
 .../views/scripts/list/downtimes.phtml        | 40 ++++++++--------
 .../partials/downtime/downtime-header.phtml   | 32 ++++++-------
 .../partials/downtime/downtimes-header.phtml  | 32 ++++++-------
 4 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/downtime/show.phtml b/modules/monitoring/application/views/scripts/downtime/show.phtml
index aed35b9ac..4a3583363 100644
--- a/modules/monitoring/application/views/scripts/downtime/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtime/show.phtml
@@ -1,13 +1,13 @@
-<div class="controls">   
+<div class="controls">
     <?php if (! $this->compact): ?>
         <?= $this->tabs; ?>
     <?php endif ?>
-    
+
     <?= $this->render('partials/downtime/downtime-header.phtml'); ?>
 </div>
 <div class="content">
     <h3><?= $this->translate('Downtime detail information') ?></h3>
-<table class="avp"> 
+<table class="avp">
   <tbody>
       <tr>
           <th>
@@ -15,17 +15,17 @@
           </th>
           <td data-base-target="_next">
               <?php if ($this->isService): ?>
-              <?php 
+              <?php
                   $link = $this->link()->service(
-                       $downtime->service_description, 
+                       $downtime->service_description,
                        $downtime->service_display_name,
                        $downtime->host_name,
                        $downtime->host_display_name
                   );
-                  $icon = $this->icon('service', $this->translate('Service')); 
+                  $icon = $this->icon('service', $this->translate('Service'));
                ?>
               <?php else: ?>
-              <?php 
+              <?php
                   $icon = $this->icon('host', $this->translate('Host'));
                   $link = $this->link()->host($downtime->host_name, $downtime->host_display_name)
               ?>
@@ -33,7 +33,7 @@
               <?= $icon ?>
               <?= $link ?>
           </td>
-      </tr>    
+      </tr>
     <tr title="<?= $this->translate('The name of the person who scheduled this downtime'); ?>">
       <th><?= $this->translate('Author') ?></th>
       <td><?= $this->icon('user', $this->translate('User')) ?> <?= $this->escape($this->downtime->author_name) ?></td>
@@ -44,19 +44,19 @@
     </tr>
      <tr title="<?= $this->translate('Date and time this downtime was entered'); ?>">
       <th><?= $this->translate('Entry Time') ?></th>
-      <td> <?= date('d.m.y H:i' ,$this->escape($this->downtime->entry_time)) ?></td>
+      <td><?= $this->formatDateTime($this->downtime->entry_time) ?></td>
     </tr>
     <tr class="newsection">
       <th><?= $this->escape(
-          $this->downtime->is_flexible ? 
+          $this->downtime->is_flexible ?
           $this->translate('Flexible') : $this->translate('Fixed')
         );  ?></th>
       <td>
       <?= $this->escape(
-          $this->downtime->is_flexible ? 
-          $this->translate('Flexible downtimes have a hard start and end time,' 
-            . ' but also an additional restriction on the duration in which ' 
-            . ' the host or service may actually be down.') : 
+          $this->downtime->is_flexible ?
+          $this->translate('Flexible downtimes have a hard start and end time,'
+            . ' but also an additional restriction on the duration in which '
+            . ' the host or service may actually be down.') :
           $this->translate('Fixed downtimes have a static start and end time.')
         );  ?>
       </td>
@@ -66,14 +66,14 @@
             . 'this refers to the earliest possible time that the downtime'
             . ' can start'); ?>">
       <th><?= $this->translate('Scheduled start') ?></th>
-      <td><?= date('d.m.y H:i', $this->downtime->scheduled_start) ?></td>
+      <td><?= $this->formatDateTime($this->downtime->scheduled_start) ?></td>
     </tr>
     <tr title="<?= $this->translate('The date/time the scheduled downtime is '
             . 'supposed to end. If this is a flexible (non-fixed) downtime, '
             . 'this refers to the last possible time that the downtime can '
             . 'start'); ?>">
       <th><?= $this->translate('Scheduled end') ?></th>
-      <td><?= date('d.m.y H:i', $this->downtime->scheduled_end) ?></td>
+      <td><?= $this->formatDateTime($this->downtime->scheduled_end) ?></td>
     </tr>
     <?php if ($this->downtime->is_flexible): ?>
       <tr title="<?= $this->translate('Indicates the number of seconds that the '
@@ -81,31 +81,31 @@
               . ' this is a flexible downtime, which can start at a variable '
               . 'time, but lasts for the specified duration'); ?>">
         <th tit><?= $this->translate('Duration') ?></th>
-        <td><?= $this->format()->duration($this->escape($this->downtime->duration)); ?></td>
+        <td><?= $this->formatDuration($this->downtime->duration) ?></td>
       </tr>
       <tr title="<?= $this->translate('he date/time the scheduled downtime was'
               . ' actually started'); ?>">
          <th><?= $this->translate('Actual start time') ?></th>
-         <td><?= date('d.m.y H:i', $downtime->start); ?></td>
+         <td><?= $this->formatDateTime($downtime->start) ?></td>
        </tr>
        <tr title="<?= $this->translate('The date/time the scheduled downtime '
                . 'actually ended'); ?>">
          <th><?= $this->translate('Actual end time') ?></th>
-         <td><?= date('d.m.y H:i', $downtime->end); ?></td>
+         <td><?= $this->formatDateTime($downtime->end) ?></td>
        </tr>
     <?php endif; ?>
-      
+
     <tr class="newsection">
       <th><?= $this->translate('In effect') ?></th>
       <td>
       <?= $this->escape(
-          $this->downtime->is_in_effect ? 
+          $this->downtime->is_in_effect ?
           $this->translate('Yes') : $this->translate('No')
-        ); 
+        );
       ?>
       </td>
     </tr>
-  
+
     <?php if (isset($delDowntimeForm)): // Form is unset if the current user lacks the respective permission ?>
     <tr class="newsection">
       <th><?= $this->translate('Commands') ?></th>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 9448eb402..ffcb7f335 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -26,8 +26,8 @@ if (count($downtimes) === 0) {
     return;
 }
 ?>
-  <table data-base-target="_next" 
-         class="action multiselect" 
+  <table data-base-target="_next"
+         class="action multiselect"
          data-icinga-multiselect-url="/icingaweb2/monitoring/downtimes/show"
          data-icinga-multiselect-data="downtime_id">
     <tbody>
@@ -48,12 +48,12 @@ if (count($downtimes) === 0) {
           <?= $downtime->is_in_effect ? $this->timeSince($downtime->start, $this->compact) : $this->timeUntil($downtime->start, $this->compact) ?>
         </td>
         <td>
-        <?php 
+        <?php
             if ($isService) {
                 echo $this->icon('service');
             } else {
                 echo $this->icon('host');
-            } 
+            }
         ?>
         <?= $this->qlink(
             sprintf($this->translate('%s on %s', 'Service running on host'), $downtime->service_display_name, $downtime->host_display_name),
@@ -74,20 +74,20 @@ if (count($downtimes) === 0) {
               $isService
                 ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
                 : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
-              date('d.m.y', $downtime->start),
-              date('H:i', $downtime->start),
-              $this->format()->duration($downtime->duration),
-              date('d.m.y', $downtime->end),
-              date('H:i', $downtime->end)
+                $this->formatDate($downtime->start),
+                $this->formatTime($downtime->start),
+                $this->formatDuration($downtime->duration),
+                $this->formatDate($downtime->end),
+                $this->formatTime($downtime->end)
             ); ?>
           <?php else: ?>
             <?= sprintf(
               $isService
                 ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
                 : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
-              date('d.m.y H:i', $downtime->scheduled_start),
-              date('d.m.y H:i', $downtime->scheduled_end),
-              $this->format()->duration($downtime->duration)
+                $this->formatDateTime($downtime->scheduled_start),
+                $this->formatDateTime($downtime->scheduled_end),
+                $this->formatDuration($downtime->duration)
             ); ?>
           <?php endif ?>
         <?php else: ?>
@@ -96,20 +96,20 @@ if (count($downtimes) === 0) {
               $isService
                 ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
                 : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
-              date('d.m.y', $downtime->start),
-              date('H:i', $downtime->start),
-              date('d.m.y', $downtime->end),
-              date('H:i', $downtime->end)
+                $this->formatDate($downtime->start),
+                $this->formatTime($downtime->start),
+                $this->formatDate($downtime->end),
+                $this->formatTime($downtime->end)
             ); ?>
           <?php else: ?>
             <?= sprintf(
               $isService
                 ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
                 : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
-              date('d.m.y', $downtime->scheduled_start),
-              date('H:i', $downtime->scheduled_start),
-              date('d.m.y', $downtime->scheduled_end),
-              date('H:i', $downtime->scheduled_end)
+                $this->formatDate($downtime->start),
+                $this->formatTime($downtime->start),
+                $this->formatDate($downtime->end),
+                $this->formatTime($downtime->end)
             ); ?>
           <?php endif ?>
         <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
index 8544d36de..a1d2f9803 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
@@ -13,20 +13,20 @@
                 $this->isService
                   ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
                   : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
-                date('d.m.y', $downtime->start),
-                date('H:i', $downtime->start),
-                $this->format()->duration($downtime->duration),
-                date('d.m.y', $downtime->end),
-                date('H:i', $downtime->end)
+                $this->formatDate($downtime->start),
+                $this->formatTime($downtime->start),
+                $this->formatDuration($downtime->duration),
+                $this->formatDate($downtime->end),
+                $this->formatTime($downtime->end)
               ); ?>
             <?php else: ?>
               <?= sprintf(
                 $this->isService
                   ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
                   : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
-                date('d.m.y H:i', $downtime->scheduled_start),
-                date('d.m.y H:i', $downtime->scheduled_end),
-                $this->format()->duration($downtime->duration)
+                $this->formatDateTime($downtime->scheduled_start),
+                $this->formatDateTime($downtime->scheduled_end),
+                $this->formatDuration($downtime->duration)
               ); ?>
             <?php endif ?>
             <?php else: ?>
@@ -35,20 +35,20 @@
                   $this->isService
                     ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
                     : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
-                  date('d.m.y', $downtime->start),
-                  date('H:i', $downtime->start),
-                  date('d.m.y', $downtime->end),
-                  date('H:i', $downtime->end)
+                    $this->formatDate($downtime->start),
+                    $this->formatTime($downtime->start),
+                    $this->formatDate($downtime->end),
+                    $this->formatTime($downtime->end)
                 ); ?>
               <?php else: ?>
                 <?= sprintf(
                   $this->isService
                     ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
                     : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
-                  date('d.m.y', $downtime->scheduled_start),
-                  date('H:i', $downtime->scheduled_start),
-                  date('d.m.y', $downtime->scheduled_end),
-                  date('H:i', $downtime->scheduled_end)
+                    $this->formatDate($downtime->start),
+                    $this->formatTime($downtime->start),
+                    $this->formatDate($downtime->end),
+                    $this->formatTime($downtime->end)
                 ); ?>
               <?php endif ?>
             <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index ddc436c2c..074f342b4 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -25,20 +25,20 @@
                   $this->isService
                     ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
                     : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
-                  date('d.m.y', $downtime->start),
-                  date('H:i', $downtime->start),
-                  $this->format()->duration($downtime->duration),
-                  date('d.m.y', $downtime->end),
-                  date('H:i', $downtime->end)
+                    $this->formatDate($downtime->start),
+                    $this->formatTime($downtime->start),
+                    $this->formatDuration($downtime->duration),
+                    $this->formatDate($downtime->end),
+                    $this->formatTime($downtime->end)
                 ); ?>
               <?php else: ?>
                 <?= sprintf(
                   $this->isService
                     ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
                     : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
-                  date('d.m.y H:i', $downtime->scheduled_start),
-                  date('d.m.y H:i', $downtime->scheduled_end),
-                  $this->format()->duration($downtime->duration)
+                    $this->formatDateTime($downtime->scheduled_start),
+                    $this->formatDateTime($downtime->scheduled_end),
+                    $this->formatDuration($downtime->duration)
                 ); ?>
               <?php endif ?>
             <?php else: ?>
@@ -47,20 +47,20 @@
                   $this->isService
                     ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
                     : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
-                  date('d.m.y', $downtime->start),
-                  date('H:i', $downtime->start),
-                  date('d.m.y', $downtime->end),
-                  date('H:i', $downtime->end)
+                    $this->formatDate($downtime->start),
+                    $this->formatTime($downtime->start),
+                    $this->formatDate($downtime->end),
+                    $this->formatTime($downtime->end)
                 ); ?>
               <?php else: ?>
                 <?= sprintf(
                   $this->isService
                     ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
                     : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
-                  date('d.m.y', $downtime->scheduled_start),
-                  date('H:i', $downtime->scheduled_start),
-                  date('d.m.y', $downtime->scheduled_end),
-                  date('H:i', $downtime->scheduled_end)
+                    $this->formatDate($downtime->start),
+                    $this->formatTime($downtime->start),
+                    $this->formatDate($downtime->end),
+                    $this->formatTime($downtime->end)
                 ); ?>
               <?php endif ?>
             <?php endif ?>

From 873bc22a1e05a05a1ac47173cf5da167d5c1af0e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 10:22:14 +0200
Subject: [PATCH 1727/2920] monitoring: Fix date and time formatting for
 comments

refs #6778
---
 .../views/scripts/comment/show.phtml          | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/comment/show.phtml b/modules/monitoring/application/views/scripts/comment/show.phtml
index 8216a9c70..17e72e7c9 100644
--- a/modules/monitoring/application/views/scripts/comment/show.phtml
+++ b/modules/monitoring/application/views/scripts/comment/show.phtml
@@ -1,4 +1,4 @@
-<div class="controls">   
+<div class="controls">
     <?php if (! $this->compact): ?>
         <?= $this->tabs; ?>
     <?php endif ?>
@@ -8,13 +8,13 @@
     </div>
 </div>
 <div class="content">
-    
+
 <h3><?= $this->translate('Comment detail information') ?></h3>
-<table class="avp"> 
+<table class="avp">
   <tbody>
     <tr data-base-target='_next'>
       <?php if ($this->comment->objecttype === 'service'): ?>
-        <th> <?= $this->translate('Service') ?> </th> 
+        <th> <?= $this->translate('Service') ?> </th>
         <td>
           <?= $this->icon('service', $this->translate('Service')); ?>
           <?= $this->link()->service(
@@ -26,7 +26,7 @@
           ?>
         </td>
      <?php else: ?>
-        <th> <?= $this->translate('Host') ?> </th> 
+        <th> <?= $this->translate('Host') ?> </th>
         <td>
           <?= $this->icon('host', $this->translate('Host')); ?>
           <?= $this->link()->host(
@@ -34,7 +34,7 @@
                   $this->comment->host_display_name
               );
           ?>
-        </td> 
+        </td>
      <?php endif ?>
     </tr>
 
@@ -42,29 +42,29 @@
       <th><?= $this->translate('Author') ?></th>
       <td><?= $this->icon('user', $this->translate('User')) ?> <?= $this->escape($this->comment->author) ?></td>
     </tr>
-    
+
     <tr>
       <th><?= $this->translate('Persistent') ?></th>
       <td><?= $this->escape($this->comment->persistent) ? $this->translate('Yes') : $this->translate('No') ?></td>
     </tr>
-    
+
     <tr>
       <th><?= $this->translate('Created') ?></th>
-      <td><?= date('d.m.y H:i' ,$this->escape($this->comment->timestamp)) ?></td>
+      <td><?= $this->formatDateTime($this->comment->timestamp) ?></td>
     </tr>
-  
+
     <tr>
       <th><?= $this->translate('Expires') ?></th>
       <td>
           <?= $this->comment->expiration ? sprintf(
                   $this->translate('This comment expires on %s at %s.'),
-                  date('d.m.y', $this->comment->expiration),
-                  date('H:i', $this->comment->expiration)
+                  $this->formatDate($this->comment->expiration),
+                  $this->formatTime($this->comment->expiration)
               ) : $this->translate('This comment does not expire.');
           ?>
       </td>
     </tr>
-  
+
     <?php if (isset($delCommentForm)): // Form is unset if the current user lacks the respective permission ?>
     <tr class="newsection">
       <th><?= $this->translate('Commands') ?></th>
@@ -73,7 +73,7 @@
       </td>
     </tr>
     <?php endif ?>
-  
+
   </tbody>
 </table>
 

From 3fced8472b0a5e9e7754bdd3f555578581f95e74 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 10:27:50 +0200
Subject: [PATCH 1728/2920] lib: Remove unused function from our format util

refs #6778
---
 library/Icinga/Util/Format.php | 45 ----------------------------------
 1 file changed, 45 deletions(-)

diff --git a/library/Icinga/Util/Format.php b/library/Icinga/Util/Format.php
index 696b34b7e..62ef53d1e 100644
--- a/library/Icinga/Util/Format.php
+++ b/library/Icinga/Util/Format.php
@@ -68,51 +68,6 @@ class Format
         return sprintf('0.2f d', $value / 86400);
     }
 
-    public static function duration($duration)
-    {
-        if ($duration === null || $duration === false) {
-            return '-';
-        }
-        return self::showHourMin($duration);
-    }
-
-    protected static function showHourMin($sec, $includePrefix = false)
-    {
-        $min = floor($sec / 60);
-        if ($min < 60) {
-            return ($includePrefix ? t('for') . ' ' : '') . $min . 'm ' . ($sec % 60) . 's';
-        }
-        $hour = floor($min / 60);
-        if ($hour < 24) {
-            return ($includePrefix ? t('since') . ' ' : '') . date('H:i', time() - $sec);
-        }
-        return ($includePrefix ? t('for') . ' ' : '') . floor($hour / 24) . 'd ' . ($hour % 24) . 'h';
-    }
-
-    protected static function smartTimeDiff($diff, $timestamp, $includePrefix = false)
-    {
-        if ($timestamp === null || $timestamp === false) {
-            return '-';
-        }
-        if (! preg_match('~^\d+$~', $timestamp)) {
-            throw new ProgrammingError(
-                '"%s" is not a number',
-                $timestamp
-            );
-        }
-        $prefix = '';
-        if ($diff < 0) {
-            $prefix = '-';
-        }
-        if (abs($diff) > 3600 * 24 * 3) {
-            if (date('Y') === date('Y', $timestamp)) {
-                return ($includePrefix ? t('since') . ' ' : '') . date('d.m.', $timestamp);
-            }
-            return ($includePrefix ? t('since') . ' ' : '') . date('m.Y', $timestamp);
-        }
-        return $prefix . self::showHourMin(abs($diff), $includePrefix);
-    }
-
     protected static function formatForUnits($value, & $units, $base)
     {
         $sign = '';

From 8d6d52f9dbb7f070423eb43bf457eeacf3945634 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 10:59:17 +0200
Subject: [PATCH 1729/2920] monitoring: Fix date and time formatting in the
 timeline

refs #6778
---
 .../application/controllers/TimelineController.php          | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php
index 0427447be..6d313083f 100644
--- a/modules/monitoring/application/controllers/TimelineController.php
+++ b/modules/monitoring/application/controllers/TimelineController.php
@@ -268,8 +268,7 @@ class Monitoring_TimelineController extends Controller
      */
     private function getTimeFormat()
     {
-        // TODO(mh): Missing localized format (#6077)
-        return 'g:i A';
+        return 'H:i';
     }
 
     /**
@@ -279,7 +278,6 @@ class Monitoring_TimelineController extends Controller
      */
     private function getDateFormat()
     {
-        // TODO(mh): Missing localized format (#6077)
-        return 'd/m/Y';
+        return 'Y-m-d';
     }
 }

From 01b453eeb1fd1c3e1a299570e1f3b093683c92a7 Mon Sep 17 00:00:00 2001
From: Bence Nagy <bence@underyx.me>
Date: Tue, 10 Mar 2015 15:31:25 +0100
Subject: [PATCH 1730/2920] Fix tactical overview colors

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
---
 public/css/icinga/monitoring-colors.less | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index 020db57cd..2b2b70b27 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -445,8 +445,9 @@ div.box.contents.zero {
 
 div.box.contents.zero span {
   font-weight: bold;
+  line-height: 2em;
 
-  color: white;
+  color: #666;
 }
 
 div.box.contents.zero h3 {
@@ -454,7 +455,7 @@ div.box.contents.zero h3 {
   font-size: 12em;
   line-height: 1em;
 
-  color: white;
+  color: #666;
 }
 
 div.box.ok_hosts.state_up {

From 83a6e85b5db4e4b59950cdc6edea1151de4dcf8a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 13:53:57 +0200
Subject: [PATCH 1731/2920] lib: Don't render empty filters to SQL

Else we are presented with syntax errors.

fixes #9211
---
 library/Icinga/Data/Db/DbQuery.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index 45a586b9a..4fa7f132d 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -166,10 +166,12 @@ class DbQuery extends SimpleQuery
                         $parts[] = $filterPart;
                     }
                 }
-                if ($level > 0) {
-                    $str .= ' (' . implode($op, $parts) . ') ';
-                } else {
-                    $str .= implode($op, $parts);
+                if (! empty($parts)) {
+                    if ($level > 0) {
+                        $str .= ' (' . implode($op, $parts) . ') ';
+                    } else {
+                        $str .= implode($op, $parts);
+                    }
                 }
             }
         } else {

From 59ff4221f615af6d3ef8caa0a30210d479f2b1d8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 22 May 2015 14:01:11 +0200
Subject: [PATCH 1732/2920] CommandTransport: Make sure to reset the config
 before calling current()

---
 .../Monitoring/Command/Transport/CommandTransport.php        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
index a9839565b..f39b0b4c3 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php
@@ -108,7 +108,8 @@ abstract class CommandTransport
      */
     public static function first()
     {
-        $config = self::getConfig()->current();
-        return self::fromConfig($config);
+        $config = self::getConfig();
+        $config->rewind();
+        return self::fromConfig($config->current());
     }
 }

From 4f0b4e55efd236f955fe216750a6b4adfb6ade99 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 22 May 2015 14:01:26 +0200
Subject: [PATCH 1733/2920] ErrorLabeller: Use an element's name if no label is
 set

---
 library/Icinga/Web/Form/ErrorLabeller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form/ErrorLabeller.php b/library/Icinga/Web/Form/ErrorLabeller.php
index 455f5f81e..f66260149 100644
--- a/library/Icinga/Web/Form/ErrorLabeller.php
+++ b/library/Icinga/Web/Form/ErrorLabeller.php
@@ -39,7 +39,7 @@ class ErrorLabeller extends Zend_Translate_Adapter
 
     protected function createMessages($element)
     {
-        $label = $element->getLabel();
+        $label = $element->getLabel() ?: $element->getName();
 
         return array(
             Zend_Validate_NotEmpty::IS_EMPTY    => sprintf(t('%s is required and must not be empty'), $label),

From 250f863faa462cbd9e9f71b5cf42c0da36c8477e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 14:15:59 +0200
Subject: [PATCH 1734/2920] Allow anonymous LDAP binding

fixes #9224
---
 application/forms/Config/Resource/LdapResourceForm.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index fea16c4e5..6d9bf74d4 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -113,16 +113,17 @@ class LdapResourceForm extends Form
             'text',
             'bind_dn',
             array(
-                'required'      => true,
                 'label'         => $this->translate('Bind DN'),
-                'description'   => $this->translate('The user dn to use for querying the ldap server')
+                'description'   => $this->translate(
+                    'The user dn to use for querying the ldap server. Leave the dn and password empty for attempting'
+                    . ' an anonymous bind'
+                )
             )
         );
         $this->addElement(
             'password',
             'bind_pw',
             array(
-                'required'          => true,
                 'renderPassword'    => true,
                 'label'             => $this->translate('Bind Password'),
                 'description'       => $this->translate('The password to use for querying the ldap server')

From 75f15b934c2a8f82bfa9078a20805a4bed4b621b Mon Sep 17 00:00:00 2001
From: Daniel Shirley <aditaa@ig2ad.com>
Date: Wed, 6 May 2015 16:02:52 -0500
Subject: [PATCH 1735/2920] Update authentication.md

Typo for database config

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
---
 doc/authentication.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/authentication.md b/doc/authentication.md
index 13a821441..b196d9e0d 100644
--- a/doc/authentication.md
+++ b/doc/authentication.md
@@ -87,8 +87,8 @@ Directive               | Description
 **Example:**
 
 ```
-[auth_ad]
-backend  = ad
+[auth_db]
+backend  = db
 resource = icingaweb-mysql
 ```
 

From 394c6273973cb145cab26430d56f6c681868f992 Mon Sep 17 00:00:00 2001
From: rkcpi <thieme.sandra@gmail.com>
Date: Wed, 13 May 2015 15:24:03 +0200
Subject: [PATCH 1736/2920] Update links to resources.md in authentication.md

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
---
 doc/authentication.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/authentication.md b/doc/authentication.md
index b196d9e0d..06ab4c13d 100644
--- a/doc/authentication.md
+++ b/doc/authentication.md
@@ -32,7 +32,7 @@ If your web server is not configured for authentication though the `autologin` s
 ### <a id="authentication-configuration-ad-or-ldap-authentication"></a> Active Directory or LDAP Authentication
 
 If you want to authenticate against Active Directory or LDAP, you have to define a
-[LDAP resource](#resources-configuration-ldap) which will be referenced as data source for the Active Directory
+[LDAP resource](resources.md#resources-configuration-ldap) which will be referenced as data source for the Active Directory
 or LDAP configuration method.
 
 #### <a id="authentication-configuration-ldap-authentication"></a> LDAP
@@ -40,7 +40,7 @@ or LDAP configuration method.
 Directive               | Description
 ------------------------|------------
 **backend**             | `ldap`
-**resource**            | The name of the LDAP resource defined in [resources.ini](#resources).
+**resource**            | The name of the LDAP resource defined in [resources.ini](resources.md#resources).
 **user_class**          | LDAP user class.
 **user_name_attribute** | LDAP attribute which contains the username.
 

From 030db8c8da3b252adbca2eae55cb4a6bc43c692f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 22 May 2015 14:35:34 +0200
Subject: [PATCH 1737/2920] GroupController: Add removememberAction()

refs #8826
---
 application/controllers/GroupController.php | 64 ++++++++++++++++++++-
 application/views/scripts/group/show.phtml  |  2 +-
 2 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 26bcec54b..e4a9f6bb7 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -8,6 +8,7 @@ use Icinga\Application\Logger;
 use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Authentication\UserGroup\UserGroupBackendInterface;
 use Icinga\Data\Reducible;
+use Icinga\Data\Filter\Filter;
 use Icinga\Forms\Config\UserGroupForm;
 use Icinga\Web\Controller;
 use Icinga\Web\Form;
@@ -145,11 +146,21 @@ class GroupController extends Controller
 
         if ($backend instanceof Reducible) {
             $removeForm = new Form();
-            $removeForm->setName('removemember');
+            $removeForm->setUidDisabled();
             $removeForm->setAction(
                 Url::fromPath('group/removemember', array('backend' => $backend->getName(), 'group' => $groupName))
             );
-            $removeForm->addElement('hidden', 'user_name', array('decorators' => array('ViewHelper')));
+            $removeForm->addElement('hidden', 'user_name', array(
+                'isArray'       => true,
+                'decorators'    => array('ViewHelper')
+            ));
+            $removeForm->addElement('hidden', 'redirect', array(
+                'value'         => Url::fromPath('group/show', array(
+                    'backend'   => $backend->getName(),
+                    'group'     => $groupName
+                )),
+                'decorators'    => array('ViewHelper')
+            ));
             $removeForm->addElement('button', 'btn_submit', array(
                 'escape'        => false,
                 'type'          => 'submit',
@@ -223,6 +234,55 @@ class GroupController extends Controller
         $this->render('form');
     }
 
+    /**
+     * Remove a group member
+     */
+    public function removememberAction()
+    {
+        $this->assertHttpMethod('POST');
+        $groupName = $this->params->getRequired('group');
+        $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Reducible');
+
+        if ($backend->select()->where('group_name', $groupName)->count() === 0) {
+            $this->httpNotFound(sprintf($this->translate('Group "%s" not found'), $groupName));
+        }
+
+        $form = new Form(array(
+            'onSuccess' => function ($form) use ($groupName, $backend) {
+                foreach ($form->getValue('user_name') as $userName) {
+                    try {
+                        $backend->delete(
+                            'group_membership',
+                            Filter::matchAll(
+                                Filter::where('group_name', $groupName),
+                                Filter::where('user_name', $userName)
+                            )
+                        );
+                        Notification::success(sprintf(
+                            t('User "%s" has been removed from group "%s"'),
+                            $userName,
+                            $groupName
+                        ));
+                    } catch (Exception $e) {
+                        Notification::error($e->getMessage());
+                    }
+                }
+
+                $redirect = $form->getValue('redirect');
+                if (! empty($redirect)) {
+                    $form->setRedirectUrl(htmlspecialchars_decode($redirect));
+                }
+
+                return true;
+            }
+        ));
+        $form->setUidDisabled();
+        $form->setSubmitLabel('btn_submit'); // Required to ensure that isSubmitted() is called
+        $form->addElement('hidden', 'user_name', array('required' => true, 'isArray' => true));
+        $form->addElement('hidden', 'redirect');
+        $form->handleRequest();
+    }
+
     /**
      * Return all user group backends implementing the given interface
      *
diff --git a/application/views/scripts/group/show.phtml b/application/views/scripts/group/show.phtml
index 2b783796c..647f31eab 100644
--- a/application/views/scripts/group/show.phtml
+++ b/application/views/scripts/group/show.phtml
@@ -68,7 +68,7 @@ if ($backend instanceof Updatable) {
       <tr>
         <td class="member-name"><?= $this->escape($member->user_name); ?></td>
        <?php if (isset($removeForm)): ?>
-        <td class="member-remove">
+        <td class="member-remove" data-base-target="_self">
           <?php $removeForm->getElement('user_name')->setValue($member->user_name); echo $removeForm; ?>
         </td>
        <?php endif ?>

From 20a9621036b514b405253572ad17cf831067be09 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 15:30:37 +0200
Subject: [PATCH 1738/2920] doc: Add filenames to anchor links

This allows other markdown viewers like to follow those links.
---
 doc/authentication.md | 8 ++++----
 doc/preferences.md    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/authentication.md b/doc/authentication.md
index 06ab4c13d..39e0caf3c 100644
--- a/doc/authentication.md
+++ b/doc/authentication.md
@@ -63,7 +63,7 @@ with Icinga Web 2 (e.g. an alias) no matter what the primary user id might actua
 Directive               | Description
 ------------------------|------------
 **backend**             | `ad`
-**resource**            | The name of the LDAP resource defined in [resources.ini](#resources).
+**resource**            | The name of the LDAP resource defined in [resources.ini](resources.md#resources).
 
 **Example:**
 
@@ -76,13 +76,13 @@ resource = my_ad
 ### <a id="authentication-configuration-db-authentication"></a> Database Authentication
 
 If you want to authenticate against a MySQL or a PostgreSQL database, you have to define a
-[database resource](#resources-configuration-database) which will be referenced as data source for the database
+[database resource](resources.md#resources-configuration-database) which will be referenced as data source for the database
 authentication method.
 
 Directive               | Description
 ------------------------|------------
 **backend**             | `db`
-**resource**            | The name of the database resource defined in [resources.ini](#resources).
+**resource**            | The name of the database resource defined in [resources.ini](resources.md#resources).
 
 **Example:**
 
@@ -99,7 +99,7 @@ For authenticating against a database, you have to import one of the following d
 * **etc/schema/preferences.mysql.sql** (for **MySQL** database)
 * **etc/schema/preferences.pgsql.sql** (for **PostgreSQL** databases)
 
-After that you have to define the [database resource](#resources-configuration-database).
+After that you have to define the [database resource](resources.md#resources-configuration-database).
 
 **Manually Creating Users**
 
diff --git a/doc/preferences.md b/doc/preferences.md
index 4ece5edf6..ca26b66b0 100644
--- a/doc/preferences.md
+++ b/doc/preferences.md
@@ -27,13 +27,13 @@ type = ini
 ### <a id="preferences-configuration-db"></a> Store Preferences in a Database
 
 In order to be more flexible in distributed setups you can store preferences in a MySQL or in a PostgreSQL database.
-For storing preferences in a database, you have to define a [database resource](#resources-configuration-database)
+For storing preferences in a database, you have to define a [database resource](resources.md#resources-configuration-database)
 which will be referenced as resource for the preferences storage.
 
 Directive               | Description
 ------------------------|------------
 **type**                | `db`
-**resource**            | The name of the database resource defined in [resources.ini](resources).
+**resource**            | The name of the database resource defined in [resources.ini](resources.md#resources).
 
 **Example:**
 
@@ -50,4 +50,4 @@ For storing preferences in a database, you have to import one of the following d
 * **etc/schema/preferences.mysql.sql** (for **MySQL** database)
 * **etc/schema/preferences.pgsql.sql** (for **PostgreSQL** databases)
 
-After that you have to define the [database resource](#resources-configuration-database).
+After that you have to define the [database resource](resources.md#resources-configuration-database).

From 705bb665a520ea7b161b7c51b69c97221bb27cce Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 22 May 2015 15:53:47 +0200
Subject: [PATCH 1739/2920] UserController: List memberships when showing a
 user

refs #8826
---
 application/controllers/UserController.php | 71 ++++++++++++++++++++++
 application/views/scripts/user/show.phtml  | 60 ++++++++++++++++--
 public/css/icinga/main-content.less        | 28 +++++++++
 3 files changed, 154 insertions(+), 5 deletions(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 217859574..3fe3dd604 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -7,7 +7,10 @@ use Icinga\Application\Config;
 use Icinga\Application\Logger;
 use Icinga\Authentication\User\UserBackend;
 use Icinga\Authentication\User\UserBackendInterface;
+use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Forms\Config\UserForm;
+use Icinga\Data\DataArray\ArrayDatasource;
+use Icinga\User;
 use Icinga\Web\Controller;
 use Icinga\Web\Form;
 use Icinga\Web\Notification;
@@ -114,8 +117,53 @@ class UserController extends Controller
             $this->httpNotFound(sprintf($this->translate('User "%s" not found'), $userName));
         }
 
+        $memberships = $this->loadMemberships(new User($userName))->select();
+
+        $filterEditor = Widget::create('filterEditor')
+            ->setQuery($memberships)
+            ->preserveParams('limit', 'sort', 'dir', 'view', 'backend', 'user')
+            ->ignoreParams('page')
+            ->handleRequest($this->getRequest());
+        $memberships->applyFilter($filterEditor->getFilter());
+
+        $this->setupFilterControl($filterEditor);
+        $this->setupPaginationControl($memberships);
+        $this->setupLimitControl();
+        $this->setupSortControl(
+            array(
+                'group_name' => $this->translate('Group')
+            ),
+            $memberships
+        );
+
         $this->view->user = $user;
         $this->view->backend = $backend;
+        $this->view->memberships = $memberships;
+
+        $removeForm = new Form();
+        $removeForm->setUidDisabled();
+        $removeForm->addElement('hidden', 'user_name', array(
+            'isArray'       => true,
+            'value'         => $userName,
+            'decorators'    => array('ViewHelper')
+        ));
+        $removeForm->addElement('hidden', 'redirect', array(
+            'value'         => Url::fromPath('user/show', array(
+                'backend'   => $backend->getName(),
+                'user'      => $userName
+            )),
+            'decorators'    => array('ViewHelper')
+        ));
+        $removeForm->addElement('button', 'btn_submit', array(
+            'escape'        => false,
+            'type'          => 'submit',
+            'class'         => 'link-like',
+            'value'         => 'btn_submit',
+            'decorators'    => array('ViewHelper'),
+            'label'         => $this->view->icon('trash'),
+            'title'         => $this->translate('Cancel this membership')
+        ));
+        $this->view->removeForm = $removeForm;
     }
 
     /**
@@ -176,6 +224,29 @@ class UserController extends Controller
         $this->render('form');
     }
 
+    /**
+     * Fetch and return the given user's groups from all user group backends
+     *
+     * @param   User    $user
+     *
+     * @return  ArrayDatasource
+     */
+    protected function loadMemberships(User $user)
+    {
+        $groups = array();
+        foreach (Config::app('groups') as $backendName => $backendConfig) {
+            $backend = UserGroupBackend::create($backendName, $backendConfig);
+            foreach ($backend->getMemberships($user) as $groupName) {
+                $groups[] = (object) array(
+                    'group_name'    => $groupName,
+                    'backend'       => $backend
+                );
+            }
+        }
+
+        return new ArrayDatasource($groups);
+    }
+
     /**
      * Return all user backends implementing the given interface
      *
diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index 00b242512..cd8801b1a 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -1,6 +1,7 @@
-<?php 
+<?php
 
 use Icinga\Data\Updatable;
+use Icinga\Data\Reducible;
 
 $editLink = null;
 if ($backend instanceof Updatable) {
@@ -21,15 +22,64 @@ if ($backend instanceof Updatable) {
 
 ?>
 <div class="controls">
-  <?php if (! $this->compact): ?>
-    <?= $tabs->showOnlyCloseButton(); ?>
-  <?php endif ?>
+ <?php if (! $this->compact): ?>
+   <?= $tabs->showOnlyCloseButton(); ?>
+ <?php endif ?>
   <div class="user-header">
     <p class="user-name"><strong><?= $this->escape($user->user_name); ?></strong></p> <?= $editLink; ?>
     <p class="user-state"><strong><?= $this->translate('State'); ?>:</strong> <?= $user->is_active ? $this->translate('Active') : $this->translate('Inactive'); ?></p>
     <p class="user-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $user->created_at === null ? '-' : $this->formatDateTime($user->created_at); ?></p>
     <p class="user-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $user->last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?></p>
   </div>
+ <?php if (! $this->compact): ?>
+  <?= $this->sortBox; ?>
+ <?php endif ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+ <?php if (! $this->compact): ?>
+  <?= $this->filterEditor; ?>
+ <?php endif ?>
 </div>
-<div class="content" data-base-target="_next">
+<div class="content memberships" data-base-target="_next">
+<?php if (count($memberships) > 0): ?>
+  <table data-base-target="_next" class="action membership-list">
+    <thead>
+      <tr>
+        <th class="membership-group"><?= $this->translate('Group'); ?></th>
+        <th class="membership-cancel"><?= $this->translate('Cancel', 'group.membership'); ?></th>
+      </tr>
+    </thead>
+    <tbody>
+    <?php foreach ($memberships as $membership): ?>
+      <tr>
+        <td class="membership-group"><?= $this->qlink($membership->group_name, 'group/show', array(
+          'backend' => $membership->backend->getName(),
+          'group'   => $membership->group_name
+        ), array(
+          'title'   => sprintf($this->translate('Show detailed information for group %s'), $membership->group_name)
+        )); ?></td>
+        <td class="membership-cancel" data-base-target="_self">
+       <?php if ($membership->backend instanceof Reducible): ?>
+          <?= $removeForm->setAction($this->url('group/removemember', array(
+            'backend'   => $membership->backend->getName(),
+            'group'     => $membership->group_name
+          ))); ?>
+       <?php else: ?>
+          -
+       <?php endif ?>
+        </td>
+      </tr>
+    <?php endforeach ?>
+    </tbody>
+  </table>
+<?php else: ?>
+  <p><?= $this->translate('No memberships found matching the filter'); ?></p>
+<?php endif ?>
+<?= $this->qlink($this->translate('Create new membership'), 'user/createmembership', array(
+  'user'              => $user->user_name
+), array(
+  'icon'              => 'plus',
+  'data-base-target'  => '_next',
+  'class'             => 'membership-create'
+)); ?>
 </div>
\ No newline at end of file
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 603466f67..4d5c4c896 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -228,6 +228,7 @@ div.content.users {
 
 div.controls div.user-header {
   border-bottom: 2px solid @colorPetrol;
+  margin-bottom: 1em;
 
   .user-name {
     display: inline-block;
@@ -241,6 +242,33 @@ div.controls div.user-header {
   }
 }
 
+div.content.memberships {
+  table.membership-list {
+    th.membership-cancel {
+      width: 8em;
+      padding-right: 0.5em;
+      text-align: right;
+    }
+
+    td.membership-cancel {
+      text-align: right;
+
+      form button.link-like {
+        color: inherit;
+      }
+    }
+  }
+
+  p {
+    margin-top: 0;
+  }
+
+  a.membership-create {
+    display: block;
+    margin-top: 1em;
+  }
+}
+
 div.content.groups {
   table.group-list {
     th.group-remove {

From b0f7773260212cc6c5329abe9d7adc8d351f46dc Mon Sep 17 00:00:00 2001
From: rbelinsky <rbelinsky@dalet.com>
Date: Tue, 19 May 2015 19:11:53 +0300
Subject: [PATCH 1740/2920] lib: Fix sprintf format strings used in
 Format::seconds()

fixes #9291

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
---
 library/Icinga/Util/Format.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Util/Format.php b/library/Icinga/Util/Format.php
index 62ef53d1e..ba536e443 100644
--- a/library/Icinga/Util/Format.php
+++ b/library/Icinga/Util/Format.php
@@ -59,13 +59,13 @@ class Format
         if ($value < 60) {
             return self::formatForUnits($value, self::$secondPrefix, self::$secondBase);
         } elseif ($value < 3600) {
-            return sprintf('0.2f m', $value / 60);
+            return sprintf('%0.2f m', $value / 60);
         } elseif ($value < 86400) {
-            return sprintf('0.2f h', $value / 3600);
+            return sprintf('%0.2f h', $value / 3600);
         }
 
         // TODO: Do we need weeks, months and years?
-        return sprintf('0.2f d', $value / 86400);
+        return sprintf('%0.2f d', $value / 86400);
     }
 
     protected static function formatForUnits($value, & $units, $base)

From 5c6d5f51c422226bfac1246c00d83570ad0aec4a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 22 May 2015 16:13:20 +0200
Subject: [PATCH 1741/2920] UserController: Display a tab when showing a user

refs #8826
---
 application/controllers/UserController.php | 44 +++++++++++++++-------
 application/views/scripts/user/show.phtml  |  2 +-
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 3fe3dd604..bd7534c7d 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -19,15 +19,6 @@ use Icinga\Web\Widget;
 
 class UserController extends Controller
 {
-    /**
-     * Initialize this controller
-     */
-    public function init()
-    {
-        parent::init();
-        $this->createTabs();
-    }
-
     /**
      * Redirect to this controller's list action
      */
@@ -85,7 +76,7 @@ class UserController extends Controller
         }
 
         $this->view->backend = $backend;
-        $this->getTabs()->activate('user/list');
+        $this->createListTabs()->activate('user/list');
 
         $this->setupLimitControl();
         $this->setupSortControl(
@@ -139,6 +130,7 @@ class UserController extends Controller
         $this->view->user = $user;
         $this->view->backend = $backend;
         $this->view->memberships = $memberships;
+        $this->createShowTabs($backend->getName(), $userName)->activate('user/show');
 
         $removeForm = new Form();
         $removeForm->setUidDisabled();
@@ -306,9 +298,9 @@ class UserController extends Controller
     }
 
     /**
-     * Create the tabs
+     * Create the tabs to list users and groups
      */
-    protected function createTabs()
+    protected function createListTabs()
     {
         $tabs = $this->getTabs();
         $tabs->add(
@@ -316,7 +308,7 @@ class UserController extends Controller
             array(
                 'title'     => $this->translate('List users of authentication backends'),
                 'label'     => $this->translate('Users'),
-                'icon'      => 'users',
+                'icon'      => 'user',
                 'url'       => 'user/list'
             )
         );
@@ -325,9 +317,33 @@ class UserController extends Controller
             array(
                 'title'     => $this->translate('List groups of user group backends'),
                 'label'     => $this->translate('Groups'),
-                'icon'      => 'cubes',
+                'icon'      => 'users',
                 'url'       => 'group/list'
             )
         );
+
+        return $tabs;
+    }
+
+    /**
+     * Create the tabs to display when showing a user
+     *
+     * @param   string  $backendName
+     * @param   string  $userName
+     */
+    protected function createShowTabs($backendName, $userName)
+    {
+        $tabs = $this->getTabs();
+        $tabs->add(
+            'user/show',
+            array(
+                'title'     => sprintf($this->translate('Show user %s'), $userName),
+                'label'     => $this->translate('User'),
+                'icon'      => 'user',
+                'url'       => Url::fromPath('user/show', array('backend' => $backendName, 'user' => $userName))
+            )
+        );
+
+        return $tabs;
     }
 }
diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index cd8801b1a..733d3309a 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -23,7 +23,7 @@ if ($backend instanceof Updatable) {
 ?>
 <div class="controls">
  <?php if (! $this->compact): ?>
-   <?= $tabs->showOnlyCloseButton(); ?>
+   <?= $tabs; ?>
  <?php endif ?>
   <div class="user-header">
     <p class="user-name"><strong><?= $this->escape($user->user_name); ?></strong></p> <?= $editLink; ?>

From e5819ef1b2cc4428461308bd342d3d7c95895440 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 22 May 2015 16:13:38 +0200
Subject: [PATCH 1742/2920] GroupController: Display a tab when showing a group

refs #8826
---
 application/controllers/GroupController.php | 44 ++++++++++++++-------
 application/views/scripts/group/show.phtml  |  2 +-
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index e4a9f6bb7..ddb4d1e84 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -18,15 +18,6 @@ use Icinga\Web\Widget;
 
 class GroupController extends Controller
 {
-    /**
-     * Initialize this controller
-     */
-    public function init()
-    {
-        parent::init();
-        $this->createTabs();
-    }
-
     /**
      * Redirect to this controller's list action
      */
@@ -84,7 +75,7 @@ class GroupController extends Controller
         }
 
         $this->view->backend = $backend;
-        $this->getTabs()->activate('group/list');
+        $this->createListTabs()->activate('group/list');
 
         $this->setupLimitControl();
         $this->setupSortControl(
@@ -143,6 +134,7 @@ class GroupController extends Controller
         $this->view->group = $group;
         $this->view->backend = $backend;
         $this->view->members = $members;
+        $this->createShowTabs($backend->getName(), $groupName)->activate('group/show');
 
         if ($backend instanceof Reducible) {
             $removeForm = new Form();
@@ -342,9 +334,9 @@ class GroupController extends Controller
     }
 
     /**
-     * Create the tabs
+     * Create the tabs to list users and groups
      */
-    protected function createTabs()
+    protected function createListTabs()
     {
         $tabs = $this->getTabs();
         $tabs->add(
@@ -352,7 +344,7 @@ class GroupController extends Controller
             array(
                 'title'     => $this->translate('List users of authentication backends'),
                 'label'     => $this->translate('Users'),
-                'icon'      => 'users',
+                'icon'      => 'user',
                 'url'       => 'user/list'
             )
         );
@@ -361,9 +353,33 @@ class GroupController extends Controller
             array(
                 'title'     => $this->translate('List groups of user group backends'),
                 'label'     => $this->translate('Groups'),
-                'icon'      => 'cubes',
+                'icon'      => 'users',
                 'url'       => 'group/list'
             )
         );
+
+        return $tabs;
+    }
+
+    /**
+     * Create the tabs to display when showing a group
+     *
+     * @param   string  $backendName
+     * @param   string  $groupName
+     */
+    protected function createShowTabs($backendName, $groupName)
+    {
+        $tabs = $this->getTabs();
+        $tabs->add(
+            'group/show',
+            array(
+                'title'     => sprintf($this->translate('Show group %s'), $groupName),
+                'label'     => $this->translate('Group'),
+                'icon'      => 'users',
+                'url'       => Url::fromPath('group/show', array('backend' => $backendName, 'group' => $groupName))
+            )
+        );
+
+        return $tabs;
     }
 }
diff --git a/application/views/scripts/group/show.phtml b/application/views/scripts/group/show.phtml
index 647f31eab..718dde255 100644
--- a/application/views/scripts/group/show.phtml
+++ b/application/views/scripts/group/show.phtml
@@ -25,7 +25,7 @@ if ($backend instanceof Updatable) {
 ?>
 <div class="controls">
  <?php if (! $this->compact): ?>
-  <?= $tabs->showOnlyCloseButton(); ?>
+  <?= $tabs; ?>
  <?php endif ?>
   <div class="group-header">
     <p class="group-name"><strong><?= $this->escape($group->group_name); ?></strong></p> <?= $editLink; ?>

From 1d22d0c9899053be8c453eb7ac76960847db78aa Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 16:50:24 +0200
Subject: [PATCH 1743/2920] monitoring: Fix wrong partial time when a downtime
 expires

---
 .../monitoring/application/views/scripts/list/downtimes.phtml   | 2 +-
 .../views/scripts/partials/downtime/downtime-header.phtml       | 2 +-
 .../views/scripts/partials/downtime/downtimes-header.phtml      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index ffcb7f335..d062274e7 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -45,7 +45,7 @@ if (count($downtimes) === 0) {
         <td class="state">
           <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
           <br>
-          <?= $downtime->is_in_effect ? $this->timeSince($downtime->start, $this->compact) : $this->timeUntil($downtime->start, $this->compact) ?>
+          <?= $this->timeUntil($downtime->is_in_effect ? $downtime->end : $downtime->start, $this->compact) ?>
         </td>
         <td>
         <?php
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
index a1d2f9803..85bd06b5c 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
@@ -3,7 +3,7 @@
     <td class="state">
       <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
       <br>
-      <?= $downtime->is_in_effect ? $this->timeSince($downtime->start, $this->compact) : $this->timeUntil($downtime->start, $this->compact) ?>
+      <?= $this->timeUntil($downtime->is_in_effect ? $downtime->end : $downtime->start, $this->compact) ?>
     </td>
     <td>
       <small>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index 074f342b4..d3dc665a9 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -8,7 +8,7 @@
           <td class="state">
             <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
             <br>
-            <?= $downtime->is_in_effect ? $this->timeSince($downtime->start, $this->compact) : $this->timeUntil($downtime->start, $this->compact) ?>
+            <?= $this->timeUntil($downtime->is_in_effect ? $downtime->end : $downtime->start, $this->compact) ?>
           </td>
           <td class="name oneline">
             <?php if ($downtime->isService): ?>

From ea8c49753904d47e16f31b1d1b0018f0b1016a63 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 16:51:23 +0200
Subject: [PATCH 1744/2920] Fix exception when following command links for
 multiple selected hosts

---
 .../monitoring/application/controllers/HostsController.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 78c8eaa7e..20ae71e6b 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -46,7 +46,7 @@ class Monitoring_HostsController extends Controller
                 'icon'  => 'host'
             )
         )->extend(new DashboardAction())->activate('show');
-        
+
         $this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/hosts')->setQueryString($filterString);
     }
 
@@ -78,11 +78,6 @@ class Monitoring_HostsController extends Controller
         $this->view->form = $form;
         $this->view->objects = $this->hostList;
         $this->view->stats = $this->hostList->getStateSummary();
-        $this->view->hostStatesPieChart = InlinePie::createFromStateSummary(
-            $this->view->stats,
-            $this->translate('Host State'),
-            InlinePie::$colorsHostStatesHandledUnhandled
-        );
         $this->_helper->viewRenderer('partials/command/objects-command-form', null, true);
         return $form;
     }

From 88f5bb83689b92289c06d9a7e4bdc326ea271a92 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 22 May 2015 16:54:59 +0200
Subject: [PATCH 1745/2920] js: Relax check whether to switch to single column
 layout upon redirect

This fixes the problem when redirecting from a form using the same route
as in the leftmost column but with a different querystring, that one gets
the same route shown twice.
---
 public/js/icinga/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 99667ac1c..082b41e87 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -310,7 +310,7 @@
                 } else {
 
                     if (req.$target.attr('id') === 'col2') { // TODO: multicol
-                        if ($('#col1').data('icingaUrl') === redirect) {
+                        if ($('#col1').data('icingaUrl').split('?')[0] === redirect.split('?')[0]) {
                             icinga.ui.layout1col();
                             req.$target = $('#col1');
                             delete(this.requests['col2']);

From 18e413d15a82936396f6aa8ca82bdc934b03f727 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 22 May 2015 17:01:34 +0200
Subject: [PATCH 1746/2920] UserForm: Fix redirect when renaming a user

refs #8826
---
 application/forms/Config/UserForm.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/application/forms/Config/UserForm.php b/application/forms/Config/UserForm.php
index fb20ab8e3..cf3b7f083 100644
--- a/application/forms/Config/UserForm.php
+++ b/application/forms/Config/UserForm.php
@@ -67,6 +67,24 @@ class UserForm extends RepositoryForm
         $this->setSubmitLabel($this->translate('Save'));
     }
 
+    /**
+     * Update a user
+     *
+     * @return  bool
+     */
+    protected function onUpdateSuccess()
+    {
+        if (parent::onUpdateSuccess()) {
+            if (($newName = $this->getValue('user_name')) !== $this->getIdentifier()) {
+                $this->getRedirectUrl()->setParam('user', $newName);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Retrieve all form element values
      *

From f3124ffd591a3eb285be9e6d45df6fea360ee54f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 22 May 2015 17:03:02 +0200
Subject: [PATCH 1747/2920] UserGroupForm: Fix redirect when renaming a group

refs #8826
---
 application/forms/Config/UserGroupForm.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/application/forms/Config/UserGroupForm.php b/application/forms/Config/UserGroupForm.php
index 80a48643f..b2ac015e4 100644
--- a/application/forms/Config/UserGroupForm.php
+++ b/application/forms/Config/UserGroupForm.php
@@ -33,6 +33,24 @@ class UserGroupForm extends RepositoryForm
         }
     }
 
+    /**
+     * Update a group
+     *
+     * @return  bool
+     */
+    protected function onUpdateSuccess()
+    {
+        if (parent::onUpdateSuccess()) {
+            if (($newName = $this->getValue('group_name')) !== $this->getIdentifier()) {
+                $this->getRedirectUrl()->setParam('group', $newName);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Create and add elements to this form to delete a group
      *

From 54354b17bf2d2af545dac57b79e3ff325d890726 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 26 May 2015 09:26:55 +0200
Subject: [PATCH 1748/2920] DbConnection: Replicate the fix for #9211

---
 library/Icinga/Data/Db/DbConnection.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php
index 1a79a0f2c..471905907 100644
--- a/library/Icinga/Data/Db/DbConnection.php
+++ b/library/Icinga/Data/Db/DbConnection.php
@@ -397,11 +397,15 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible
                     }
                 }
 
-                if ($level > 0) {
-                    $where .= ' (' . implode($operator, $parts) . ') ';
-                } else {
-                    $where .= implode($operator, $parts);
+                if (! empty($parts)) {
+                    if ($level > 0) {
+                        $where .= ' (' . implode($operator, $parts) . ') ';
+                    } else {
+                        $where .= implode($operator, $parts);
+                    }
                 }
+            } else {
+                return ''; // Explicitly return the empty string due to the FilterNot case
             }
         } else {
             $where .= $this->renderFilterExpression($filter);

From 20f0b46574ebc0e12214e21f309aaf244d549477 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 26 May 2015 10:11:40 +0200
Subject: [PATCH 1749/2920] Introduce class AuthBackendController

refs #8826
---
 .../Web/Controller/AuthBackendController.php  | 162 ++++++++++++++++++
 1 file changed, 162 insertions(+)
 create mode 100644 library/Icinga/Web/Controller/AuthBackendController.php

diff --git a/library/Icinga/Web/Controller/AuthBackendController.php b/library/Icinga/Web/Controller/AuthBackendController.php
new file mode 100644
index 000000000..1f93de1c7
--- /dev/null
+++ b/library/Icinga/Web/Controller/AuthBackendController.php
@@ -0,0 +1,162 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Web\Controller;
+
+use \Zend_Controller_Action_Exception;
+use Icinga\Application\Config;
+use Icinga\Authentication\User\UserBackend;
+use Icinga\Authentication\User\UserBackendInterface;
+use Icinga\Authentication\UserGroup\UserGroupBackend;
+use Icinga\Authentication\UserGroup\UserGroupBackendInterface;
+use Icinga\Web\Controller;
+
+/**
+ * Base class for authentication backend controllers
+ */
+class AuthBackendController extends Controller
+{
+    /**
+     * Return all user backends implementing the given interface
+     *
+     * @param   string  $interface      The class path of the interface, or null if no interface check should be made
+     *
+     * @return  array
+     */
+    protected function loadUserBackends($interface = null)
+    {
+        $backends = array();
+        foreach (Config::app('authentication') as $backendName => $backendConfig) {
+            $candidate = UserBackend::create($backendName, $backendConfig);
+            if (! $interface || $candidate instanceof $interface) {
+                $backends[] = $candidate;
+            }
+        }
+
+        return $backends;
+    }
+
+    /**
+     * Return the given user backend or the first match in order
+     *
+     * @param   string  $name           The name of the backend, or null in case the first match should be returned
+     * @param   string  $interface      The interface the backend should implement, no interface check if null
+     *
+     * @return  UserBackendInterface
+     *
+     * @throws  Zend_Controller_Action_Exception    In case the given backend name is invalid
+     */
+    protected function getUserBackend($name = null, $interface = 'Icinga\Data\Selectable')
+    {
+        if ($name !== null) {
+            $config = Config::app('authentication');
+            if (! $config->hasSection($name)) {
+                $this->httpNotFound(sprintf($this->translate('Authentication backend "%s" not found'), $name));
+            } else {
+                $backend = UserBackend::create($name, $config->getSection($name));
+                if ($interface && !$backend instanceof $interface) {
+                    $interfaceParts = explode('\\', strtolower($interface));
+                    throw new Zend_Controller_Action_Exception(
+                        sprintf(
+                            $this->translate('Authentication backend "%s" is not %s'),
+                            $name,
+                            array_pop($interfaceParts)
+                        ),
+                        400
+                    );
+                }
+            }
+        } else {
+            $backends = $this->loadUserBackends($interface);
+            $backend = array_shift($backends);
+        }
+
+        return $backend;
+    }
+
+    /**
+     * Return all user group backends implementing the given interface
+     *
+     * @param   string  $interface      The class path of the interface, or null if no interface check should be made
+     *
+     * @return  array
+     */
+    protected function loadUserGroupBackends($interface = null)
+    {
+        $backends = array();
+        foreach (Config::app('groups') as $backendName => $backendConfig) {
+            $candidate = UserGroupBackend::create($backendName, $backendConfig);
+            if (! $interface || $candidate instanceof $interface) {
+                $backends[] = $candidate;
+            }
+        }
+
+        return $backends;
+    }
+
+    /**
+     * Return the given user group backend or the first match in order
+     *
+     * @param   string  $name           The name of the backend, or null in case the first match should be returned
+     * @param   string  $interface      The interface the backend should implement, no interface check if null
+     *
+     * @return  UserGroupBackendInterface
+     *
+     * @throws  Zend_Controller_Action_Exception    In case the given backend name is invalid
+     */
+    protected function getUserGroupBackend($name = null, $interface = 'Icinga\Data\Selectable')
+    {
+        if ($name !== null) {
+            $config = Config::app('groups');
+            if (! $config->hasSection($name)) {
+                $this->httpNotFound(sprintf($this->translate('User group backend "%s" not found'), $name));
+            } else {
+                $backend = UserGroupBackend::create($name, $config->getSection($name));
+                if ($interface && !$backend instanceof $interface) {
+                    $interfaceParts = explode('\\', strtolower($interface));
+                    throw new Zend_Controller_Action_Exception(
+                        sprintf(
+                            $this->translate('User group backend "%s" is not %s'),
+                            $name,
+                            array_pop($interfaceParts)
+                        ),
+                        400
+                    );
+                }
+            }
+        } else {
+            $backends = $this->loadUserGroupBackends($interface);
+            $backend = array_shift($backends);
+        }
+
+        return $backend;
+    }
+
+    /**
+     * Create the tabs to list users and groups
+     */
+    protected function createListTabs()
+    {
+        $tabs = $this->getTabs();
+        $tabs->add(
+            'user/list',
+            array(
+                'title'     => $this->translate('List users of authentication backends'),
+                'label'     => $this->translate('Users'),
+                'icon'      => 'user',
+                'url'       => 'user/list'
+            )
+        );
+        $tabs->add(
+            'group/list',
+            array(
+                'title'     => $this->translate('List groups of user group backends'),
+                'label'     => $this->translate('Groups'),
+                'icon'      => 'users',
+                'url'       => 'group/list'
+            )
+        );
+
+        return $tabs;
+    }
+}

From a4f38f23348485fab3070e3c486e6a9b7187361b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 26 May 2015 10:12:10 +0200
Subject: [PATCH 1750/2920] UserController: Extend AuthBackendController

refs #8826
---
 application/controllers/UserController.php | 98 +---------------------
 1 file changed, 3 insertions(+), 95 deletions(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index bd7534c7d..6dc54abde 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -2,22 +2,17 @@
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use \Exception;
-use \Zend_Controller_Action_Exception;
-use Icinga\Application\Config;
 use Icinga\Application\Logger;
-use Icinga\Authentication\User\UserBackend;
-use Icinga\Authentication\User\UserBackendInterface;
-use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Forms\Config\UserForm;
 use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\User;
-use Icinga\Web\Controller;
+use Icinga\Web\Controller\AuthBackendController;
 use Icinga\Web\Form;
 use Icinga\Web\Notification;
 use Icinga\Web\Url;
 use Icinga\Web\Widget;
 
-class UserController extends Controller
+class UserController extends AuthBackendController
 {
     /**
      * Redirect to this controller's list action
@@ -226,8 +221,7 @@ class UserController extends Controller
     protected function loadMemberships(User $user)
     {
         $groups = array();
-        foreach (Config::app('groups') as $backendName => $backendConfig) {
-            $backend = UserGroupBackend::create($backendName, $backendConfig);
+        foreach ($this->loadUserGroupBackends() as $backend) {
             foreach ($backend->getMemberships($user) as $groupName) {
                 $groups[] = (object) array(
                     'group_name'    => $groupName,
@@ -239,92 +233,6 @@ class UserController extends Controller
         return new ArrayDatasource($groups);
     }
 
-    /**
-     * Return all user backends implementing the given interface
-     *
-     * @param   string  $interface      The class path of the interface, or null if no interface check should be made
-     *
-     * @return  array
-     */
-    protected function loadUserBackends($interface = null)
-    {
-        $backends = array();
-        foreach (Config::app('authentication') as $backendName => $backendConfig) {
-            $candidate = UserBackend::create($backendName, $backendConfig);
-            if (! $interface || $candidate instanceof $interface) {
-                $backends[] = $candidate;
-            }
-        }
-
-        return $backends;
-    }
-
-    /**
-     * Return the given user backend or the first match in order
-     *
-     * @param   string  $name           The name of the backend, or null in case the first match should be returned
-     * @param   string  $interface      The interface the backend should implement, no interface check if null
-     *
-     * @return  UserBackendInterface
-     *
-     * @throws  Zend_Controller_Action_Exception    In case the given backend name is invalid
-     */
-    protected function getUserBackend($name = null, $interface = 'Icinga\Data\Selectable')
-    {
-        if ($name !== null) {
-            $config = Config::app('authentication');
-            if (! $config->hasSection($name)) {
-                $this->httpNotFound(sprintf($this->translate('Authentication backend "%s" not found'), $name));
-            } else {
-                $backend = UserBackend::create($name, $config->getSection($name));
-                if ($interface && !$backend instanceof $interface) {
-                    $interfaceParts = explode('\\', strtolower($interface));
-                    throw new Zend_Controller_Action_Exception(
-                        sprintf(
-                            $this->translate('Authentication backend "%s" is not %s'),
-                            $name,
-                            array_pop($interfaceParts)
-                        ),
-                        400
-                    );
-                }
-            }
-        } else {
-            $backends = $this->loadUserBackends($interface);
-            $backend = array_shift($backends);
-        }
-
-        return $backend;
-    }
-
-    /**
-     * Create the tabs to list users and groups
-     */
-    protected function createListTabs()
-    {
-        $tabs = $this->getTabs();
-        $tabs->add(
-            'user/list',
-            array(
-                'title'     => $this->translate('List users of authentication backends'),
-                'label'     => $this->translate('Users'),
-                'icon'      => 'user',
-                'url'       => 'user/list'
-            )
-        );
-        $tabs->add(
-            'group/list',
-            array(
-                'title'     => $this->translate('List groups of user group backends'),
-                'label'     => $this->translate('Groups'),
-                'icon'      => 'users',
-                'url'       => 'group/list'
-            )
-        );
-
-        return $tabs;
-    }
-
     /**
      * Create the tabs to display when showing a user
      *

From 2164fcf4b4944f74a940f57e7ad39e4dbc156c6f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 26 May 2015 10:12:25 +0200
Subject: [PATCH 1751/2920] GroupController: Extend AuthBackendController

refs #8826
---
 application/controllers/GroupController.php | 94 +--------------------
 1 file changed, 2 insertions(+), 92 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index ddb4d1e84..eb5d5df8f 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -2,21 +2,17 @@
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use \Exception;
-use \Zend_Controller_Action_Exception;
-use Icinga\Application\Config;
 use Icinga\Application\Logger;
-use Icinga\Authentication\UserGroup\UserGroupBackend;
-use Icinga\Authentication\UserGroup\UserGroupBackendInterface;
 use Icinga\Data\Reducible;
 use Icinga\Data\Filter\Filter;
 use Icinga\Forms\Config\UserGroupForm;
-use Icinga\Web\Controller;
+use Icinga\Web\Controller\AuthBackendController;
 use Icinga\Web\Form;
 use Icinga\Web\Notification;
 use Icinga\Web\Url;
 use Icinga\Web\Widget;
 
-class GroupController extends Controller
+class GroupController extends AuthBackendController
 {
     /**
      * Redirect to this controller's list action
@@ -275,92 +271,6 @@ class GroupController extends Controller
         $form->handleRequest();
     }
 
-    /**
-     * Return all user group backends implementing the given interface
-     *
-     * @param   string  $interface      The class path of the interface, or null if no interface check should be made
-     *
-     * @return  array
-     */
-    protected function loadUserGroupBackends($interface = null)
-    {
-        $backends = array();
-        foreach (Config::app('groups') as $backendName => $backendConfig) {
-            $candidate = UserGroupBackend::create($backendName, $backendConfig);
-            if (! $interface || $candidate instanceof $interface) {
-                $backends[] = $candidate;
-            }
-        }
-
-        return $backends;
-    }
-
-    /**
-     * Return the given user group backend or the first match in order
-     *
-     * @param   string  $name           The name of the backend, or null in case the first match should be returned
-     * @param   string  $interface      The interface the backend should implement, no interface check if null
-     *
-     * @return  UserGroupBackendInterface
-     *
-     * @throws  Zend_Controller_Action_Exception    In case the given backend name is invalid
-     */
-    protected function getUserGroupBackend($name = null, $interface = 'Icinga\Data\Selectable')
-    {
-        if ($name !== null) {
-            $config = Config::app('groups');
-            if (! $config->hasSection($name)) {
-                $this->httpNotFound(sprintf($this->translate('User group backend "%s" not found'), $name));
-            } else {
-                $backend = UserGroupBackend::create($name, $config->getSection($name));
-                if ($interface && !$backend instanceof $interface) {
-                    $interfaceParts = explode('\\', strtolower($interface));
-                    throw new Zend_Controller_Action_Exception(
-                        sprintf(
-                            $this->translate('User group backend "%s" is not %s'),
-                            $name,
-                            array_pop($interfaceParts)
-                        ),
-                        400
-                    );
-                }
-            }
-        } else {
-            $backends = $this->loadUserGroupBackends($interface);
-            $backend = array_shift($backends);
-        }
-
-        return $backend;
-    }
-
-    /**
-     * Create the tabs to list users and groups
-     */
-    protected function createListTabs()
-    {
-        $tabs = $this->getTabs();
-        $tabs->add(
-            'user/list',
-            array(
-                'title'     => $this->translate('List users of authentication backends'),
-                'label'     => $this->translate('Users'),
-                'icon'      => 'user',
-                'url'       => 'user/list'
-            )
-        );
-        $tabs->add(
-            'group/list',
-            array(
-                'title'     => $this->translate('List groups of user group backends'),
-                'label'     => $this->translate('Groups'),
-                'icon'      => 'users',
-                'url'       => 'group/list'
-            )
-        );
-
-        return $tabs;
-    }
-
     /**
      * Create the tabs to display when showing a group
      *

From e2c250ca77fab5606f621decd9b2c82245a436e8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 26 May 2015 10:23:40 +0200
Subject: [PATCH 1752/2920] Move UserForm to the Icinga\Forms\Config\User
 namespace

refs #8826
---
 application/controllers/UserController.php       | 2 +-
 application/forms/Config/{ => User}/UserForm.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename application/forms/Config/{ => User}/UserForm.php (99%)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 6dc54abde..b24f3b76e 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -3,7 +3,7 @@
 
 use \Exception;
 use Icinga\Application\Logger;
-use Icinga\Forms\Config\UserForm;
+use Icinga\Forms\Config\User\UserForm;
 use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\User;
 use Icinga\Web\Controller\AuthBackendController;
diff --git a/application/forms/Config/UserForm.php b/application/forms/Config/User/UserForm.php
similarity index 99%
rename from application/forms/Config/UserForm.php
rename to application/forms/Config/User/UserForm.php
index cf3b7f083..765b95882 100644
--- a/application/forms/Config/UserForm.php
+++ b/application/forms/Config/User/UserForm.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Forms\Config;
+namespace Icinga\Forms\Config\User;
 
 use Icinga\Data\Filter\Filter;
 use Icinga\Forms\RepositoryForm;

From 75c5aa2869afc777c9228de864bd0f8744527846 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 26 May 2015 10:24:13 +0200
Subject: [PATCH 1753/2920] Move UserGroupForm to the
 Icinga\Forms\Config\UserGroup namespace

refs #8826
---
 application/controllers/GroupController.php                | 2 +-
 application/forms/Config/{ => UserGroup}/UserGroupForm.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename application/forms/Config/{ => UserGroup}/UserGroupForm.php (98%)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index eb5d5df8f..4d5aa3cc3 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -5,7 +5,7 @@ use \Exception;
 use Icinga\Application\Logger;
 use Icinga\Data\Reducible;
 use Icinga\Data\Filter\Filter;
-use Icinga\Forms\Config\UserGroupForm;
+use Icinga\Forms\Config\UserGroup\UserGroupForm;
 use Icinga\Web\Controller\AuthBackendController;
 use Icinga\Web\Form;
 use Icinga\Web\Notification;
diff --git a/application/forms/Config/UserGroupForm.php b/application/forms/Config/UserGroup/UserGroupForm.php
similarity index 98%
rename from application/forms/Config/UserGroupForm.php
rename to application/forms/Config/UserGroup/UserGroupForm.php
index b2ac015e4..eb3c2846d 100644
--- a/application/forms/Config/UserGroupForm.php
+++ b/application/forms/Config/UserGroup/UserGroupForm.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Forms\Config;
+namespace Icinga\Forms\Config\UserGroup;
 
 use Icinga\Data\Filter\Filter;
 use Icinga\Forms\RepositoryForm;

From 86146b80486e46827e1356c75e84fc85e01bd1e8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 26 May 2015 14:30:55 +0200
Subject: [PATCH 1754/2920] Introduce form AddMemberForm

refs #8826
---
 .../forms/Config/UserGroup/AddMemberForm.php  | 179 ++++++++++++++++++
 1 file changed, 179 insertions(+)
 create mode 100644 application/forms/Config/UserGroup/AddMemberForm.php

diff --git a/application/forms/Config/UserGroup/AddMemberForm.php b/application/forms/Config/UserGroup/AddMemberForm.php
new file mode 100644
index 000000000..6a57df3b4
--- /dev/null
+++ b/application/forms/Config/UserGroup/AddMemberForm.php
@@ -0,0 +1,179 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Forms\Config\UserGroup;
+
+use Exception;
+use Icinga\Data\Extensible;
+use Icinga\Data\Filter\Filter;
+use Icinga\Data\Selectable;
+use Icinga\Web\Form;
+use Icinga\Web\Notification;
+
+/**
+ * Form for adding one or more group members
+ */
+class AddMemberForm extends Form
+{
+    /**
+     * The data source to fetch users from
+     *
+     * @var Selectable
+     */
+    protected $ds;
+
+    /**
+     * The user group backend to use
+     *
+     * @var Extensible
+     */
+    protected $backend;
+
+    /**
+     * The group to add members for
+     *
+     * @var string
+     */
+    protected $groupName;
+
+    /**
+     * Set the data source to fetch users from
+     *
+     * @param   Selectable  $ds
+     *
+     * @return  $this
+     */
+    public function setDataSource(Selectable $ds)
+    {
+        $this->ds = $ds;
+        return $this;
+    }
+
+    /**
+     * Set the user group backend to use
+     *
+     * @param   Extensible  $backend
+     *
+     * @return  $this
+     */
+    public function setBackend(Extensible $backend)
+    {
+        $this->backend = $backend;
+        return $this;
+    }
+
+    /**
+     * Set the group to add members for
+     *
+     * @param   string  $groupName
+     *
+     * @return  $this
+     */
+    public function setGroupName($groupName)
+    {
+        $this->groupName = $groupName;
+        return $this;
+    }
+
+    /**
+     * Create and add elements to this form
+     *
+     * @param   array   $formData   The data sent by the user
+     */
+    public function createElements(array $formData)
+    {
+        // TODO(jom): Fetching already existing members to prevent the user from mistakenly creating duplicate
+        // memberships (no matter whether the data source permits it or not, a member does never need to be
+        // added more than once) should be kept at backend level (GroupController::fetchUsers) but this does
+        // not work currently as our ldap protocol stuff is unable to handle our filter implementation..
+        $members = $this->backend
+            ->select()
+            ->from('group_membership', array('user_name'))
+            ->where('group_name', $this->groupName)
+            ->fetchColumn();
+        $filter = empty($members) ? Filter::matchAll() : Filter::not(Filter::where('user_name', $members));
+
+        $users = $this->ds->select()->from('user', array('user_name'))->applyFilter($filter)->fetchColumn();
+        if (! empty($users)) {
+            $this->addElement(
+                'multiselect',
+                'user_name',
+                array(
+                    'multiOptions'  => array_combine($users, $users),
+                    'label'         => $this->translate('Backend Users'),
+                    'description'   => $this->translate(
+                        'Select one or more users (fetched from your user backends) to add as group member'
+                    ),
+                    'class'         => 'grant-permissions'
+                )
+            );
+        }
+
+        $this->addElement(
+            'textarea',
+            'users',
+            array(
+                'required'      => empty($users),
+                'label'         => $this->translate('Users'),
+                'description'   => $this->translate(
+                    'Provide one or more usernames separated by comma to add as group member'
+                )
+            )
+        );
+
+        $this->setTitle(sprintf($this->translate('Add members for group %s'), $this->groupName));
+        $this->setSubmitLabel($this->translate('Add'));
+    }
+
+    /**
+     * Insert the members for the group
+     *
+     * @return  bool
+     */
+    public function onSuccess()
+    {
+        $userNames = $this->getValue('user_name') ?: array();
+        if (($users = $this->getValue('users'))) {
+            $userNames = array_merge($userNames, array_map('trim', explode(',', $users)));
+        }
+
+        if (empty($userNames)) {
+            $this->info($this->translate(
+                'Please provide at least one username, either by choosing one '
+                . 'in the list or by manually typing one in the text box below'
+            ));
+            return false;
+        }
+
+        $single = null;
+        foreach ($userNames as $userName) {
+            try {
+                $this->backend->insert(
+                    'group_membership',
+                    array(
+                        'group_name'    => $this->groupName,
+                        'user_name'     => $userName
+                    )
+                );
+            } catch (Exception $e) {
+                Notification::error(sprintf(
+                    $this->translate('Failed to add "%s" as group member for "%s"'),
+                    $userName,
+                    $this->groupName
+                ));
+                $this->error($e->getMessage());
+                return false;
+            }
+
+            $single = $single === null;
+        }
+
+        if ($single) {
+            Notification::success(sprintf($this->translate('Group member "%s" added successfully'), $userName));
+        } else {
+            Notification::success($this->translate('Group members added successfully'));
+        }
+
+        return true;
+    }
+}

From 899a00e98339da557140a8132d3c81fbb4955a6f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 26 May 2015 14:32:14 +0200
Subject: [PATCH 1755/2920] GroupController: Add addmemberAction()

refs #8826
---
 application/controllers/GroupController.php | 45 +++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 4d5aa3cc3..3704c038e 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -3,8 +3,10 @@
 
 use \Exception;
 use Icinga\Application\Logger;
+use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\Data\Reducible;
 use Icinga\Data\Filter\Filter;
+use Icinga\Forms\Config\UserGroup\AddMemberForm;
 use Icinga\Forms\Config\UserGroup\UserGroupForm;
 use Icinga\Web\Controller\AuthBackendController;
 use Icinga\Web\Form;
@@ -222,6 +224,32 @@ class GroupController extends AuthBackendController
         $this->render('form');
     }
 
+    /**
+     * Add a group member
+     */
+    public function addmemberAction()
+    {
+        $groupName = $this->params->getRequired('group');
+        $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Extensible');
+
+        if ($backend->select()->where('group_name', $groupName)->count() === 0) {
+            $this->httpNotFound(sprintf($this->translate('Group "%s" not found'), $groupName));
+        }
+
+        $form = new AddMemberForm();
+        $form->setDataSource($this->fetchUsers())
+            ->setBackend($backend)
+            ->setGroupName($groupName)
+            ->setRedirectUrl(
+                Url::fromPath('group/show', array('backend' => $backend->getName(), 'group' => $groupName))
+            )
+            ->setUidDisabled()
+            ->handleRequest();
+
+        $this->view->form = $form;
+        $this->render('form');
+    }
+
     /**
      * Remove a group member
      */
@@ -271,6 +299,23 @@ class GroupController extends AuthBackendController
         $form->handleRequest();
     }
 
+    /**
+     * Fetch and return all users from all user backends
+     *
+     * @return  ArrayDatasource
+     */
+    protected function fetchUsers()
+    {
+        $users = array();
+        foreach ($this->loadUserBackends('Icinga\Data\Selectable') as $backend) {
+            foreach ($backend->select(array('user_name')) as $row) {
+                $users[] = $row;
+            }
+        }
+
+        return new ArrayDatasource($users);
+    }
+
     /**
      * Create the tabs to display when showing a group
      *

From 237b50f953f7e4a139ef60b6ad7b5186d9beb91a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 26 May 2015 14:32:47 +0200
Subject: [PATCH 1756/2920] RepositoryQuery: Ensure that we'll adjust a copy of
 a filter

---
 library/Icinga/Repository/RepositoryQuery.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index b25f8d00c..4d87e5026 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -185,6 +185,7 @@ class RepositoryQuery implements QueryInterface, Iterator
      */
     public function setFilter(Filter $filter)
     {
+        $filter = clone $filter;
         $this->repository->requireFilter($this->target, $filter);
         $this->query->setFilter($filter);
         return $this;
@@ -201,6 +202,7 @@ class RepositoryQuery implements QueryInterface, Iterator
      */
     public function addFilter(Filter $filter)
     {
+        $filter = clone $filter;
         $this->repository->requireFilter($this->target, $filter);
         $this->query->addFilter($filter);
         return $this;

From 4ac7557c2ff93c82cd8aa1b15e789443c0958079 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 26 May 2015 15:47:01 +0200
Subject: [PATCH 1757/2920] Show host and service notes in the host and service
 detail view

refs #8235
---
 .../application/views/scripts/host/show.phtml |  1 +
 .../views/scripts/service/show.phtml          |  1 +
 .../scripts/show/components/actions.phtml     | 12 ------
 .../views/scripts/show/components/notes.phtml | 28 +++++++++++++
 .../Backend/Ido/Query/StatusQuery.php         |  2 +
 .../library/Monitoring/Object/Host.php        | 11 +++++
 .../Monitoring/Object/MonitoredObject.php     | 40 +++++++++++++++++++
 .../library/Monitoring/Object/Service.php     | 11 +++++
 8 files changed, 94 insertions(+), 12 deletions(-)
 create mode 100644 modules/monitoring/application/views/scripts/show/components/notes.phtml

diff --git a/modules/monitoring/application/views/scripts/host/show.phtml b/modules/monitoring/application/views/scripts/host/show.phtml
index 32389515b..76d8c1b55 100644
--- a/modules/monitoring/application/views/scripts/host/show.phtml
+++ b/modules/monitoring/application/views/scripts/host/show.phtml
@@ -11,6 +11,7 @@
 
     <table class="avp newsection">
         <tbody>
+        <?= $this->render('show/components/notes.phtml') ?>
         <?= $this->render('show/components/acknowledgement.phtml') ?>
         <?= $this->render('show/components/comments.phtml') ?>
         <?= $this->render('show/components/notifications.phtml') ?>
diff --git a/modules/monitoring/application/views/scripts/service/show.phtml b/modules/monitoring/application/views/scripts/service/show.phtml
index 4d33644ce..43dc77030 100644
--- a/modules/monitoring/application/views/scripts/service/show.phtml
+++ b/modules/monitoring/application/views/scripts/service/show.phtml
@@ -11,6 +11,7 @@
 
     <table class="avp newsection">
         <tbody>
+        <?= $this->render('show/components/notes.phtml') ?>
         <?= $this->render('show/components/acknowledgement.phtml') ?>
         <?= $this->render('show/components/comments.phtml') ?>
         <?= $this->render('show/components/notifications.phtml') ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/actions.phtml b/modules/monitoring/application/views/scripts/show/components/actions.phtml
index 0681d5d91..35077abc0 100644
--- a/modules/monitoring/application/views/scripts/show/components/actions.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/actions.phtml
@@ -8,18 +8,6 @@ $newTabInfo = sprintf('<span class="info-box display-on-hover"> %s </span>', $th
 $linkText = '<a href="%s" target="_blank">%s ' . $newTabInfo . '</a>';
 $localLinkText = '<a href="%s">%s</a>';
 
-if ($object->notes_url) {
-    if (strpos($object->notes_url, "' ") === false) {
-        $links[] = sprintf($linkText, $this->resolveMacros($object->notes_url, $object), 'Notes');
-    } else {
-        // TODO: We should find out document what's going on here. Looks strange :p
-        foreach(explode("' ", $object->notes_url) as $url) {
-            $url = strpos($url, "'") === 0 ? substr($url, 1) : $url;
-            $url = strrpos($url, "'") === strlen($url) - 1 ? substr($url, 0, strlen($url) - 1) : $url;
-            $links[] = sprintf($linkText, $this->resolveMacros($url, $object), 'Notes');
-        }
-    }
-}
 if ($object->action_url) {
     if (strpos($object->action_url, "' ") === false) {
         $links[] = sprintf($linkText, $this->resolveMacros($object->action_url, $object), 'Action');
diff --git a/modules/monitoring/application/views/scripts/show/components/notes.phtml b/modules/monitoring/application/views/scripts/show/components/notes.phtml
new file mode 100644
index 000000000..cdc379184
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/show/components/notes.phtml
@@ -0,0 +1,28 @@
+<?php
+$notes = trim($object->getNotes());
+$links = $object->getNotesUrls();
+?>
+
+<?php if (! empty($links) || ! empty($notes)): ?>
+<tr>
+    <th><?= $this->translate('Notes') ?></th>
+    <td>
+        <?php
+            if (! empty($notes)) {
+                echo $notes . '<br>';
+            }
+            // add warning to links that open in new tabs to improve accessibility, as recommended by WCAG20 G201
+            $newTabInfo = sprintf(
+                '<span class="info-box display-on-hover"> %s </span>',
+                $this->translate('opens in new window')
+            );
+            $linkText = '<a href="%s" target="_blank">%s ' . $newTabInfo . '</a>';
+            foreach ($links as $i => $link) {
+                $resolved = $this->resolveMacros($link, $object);
+                $links[$i] = sprintf($linkText, $this->escape($resolved), $this->escape($resolved));
+            }
+            echo implode('<br>', $links);
+        ?>
+    </td>
+</tr>
+<?php endif ?>
\ No newline at end of file
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index 2aad7d31c..7181e8b89 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -43,6 +43,7 @@ class StatusQuery extends IdoQuery
             'host_icon_image'       => 'h.icon_image',
             'host_icon_image_alt'   => 'h.icon_image_alt',
             'host_action_url'       => 'h.action_url',
+            'host_notes'            => 'h.notes',
             'host_notes_url'        => 'h.notes_url'
         ),
         'hoststatus' => array(
@@ -179,6 +180,7 @@ class StatusQuery extends IdoQuery
             'service_icon_image'     => 's.icon_image',
             'service_icon_image_alt' => 's.icon_image_alt',
             'service_action_url'     => 's.action_url',
+            'service_notes'          => 's.notes',
             'service_notes_url'      => 's.notes_url',
             'object_type'            => '(\'service\')'
         ),
diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index a158625b5..6bf6b05cc 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -119,6 +119,7 @@ class Host extends MonitoredObject
             'host_max_check_attempts',
             'host_name',
             'host_next_check',
+            'host_notes',
             'host_notes_url',
             'host_notifications_enabled',
             'host_notifications_enabled_changed',
@@ -188,4 +189,14 @@ class Host extends MonitoredObject
         }
         return $text;
     }
+
+    public function getNotesUrls()
+    {
+        return MonitoredObject::parseAttributeUrls($this->host_notes_url);
+    }
+
+    public function getNotes()
+    {
+        return $this->host_notes;
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 05f201428..236ca2aaa 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -563,4 +563,44 @@ abstract class MonitoredObject implements Filterable
         }
         return null;
     }
+
+    /**
+     * The notes for this monitored object
+     *
+     * @return string   The notes as a string
+     */
+    public function getNotes() {}
+
+    /**
+     * Get all note urls configured for this monitored object
+     *
+     * @return array    All note urls as a string
+     */
+    public function getNotesUrls() {}
+
+    /**
+     * Parse the content of the action_url or notes_url attributes
+     *
+     * @link http://docs.icinga.org/latest/de/objectdefinitions.html
+     *
+     * @param   string  $urlString  A string containing one or more urls
+     * @return  array                   Array of urls as strings
+     */
+    public static function parseAttributeUrls($urlString)
+    {
+        if (empty($urlString)) {
+            return array();
+        }
+        if (strpos($urlString, "' ") === false) {
+            $links[] = $urlString;
+        } else {
+            // parse notes-url format
+            foreach (explode("' ", $urlString) as $url) {
+                $url = strpos($url, "'") === 0 ? substr($url, 1) : $url;
+                $url = strrpos($url, "'") === strlen($url) - 1 ? substr($url, 0, strlen($url) - 1) : $url;
+                $links[] = $url;
+            }
+        }
+        return $links;
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 0e8c975f2..17fd143b5 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -147,6 +147,7 @@ class Service extends MonitoredObject
             'service_last_state_change',
             'service_long_output',
             'service_next_check',
+            'service_notes',
             'service_notes_url',
             'service_notifications_enabled',
             'service_notifications_enabled_changed',
@@ -198,4 +199,14 @@ class Service extends MonitoredObject
         }
         return $text;
     }
+
+    public function getNotesUrls()
+    {
+        return MonitoredObject::parseAttributeUrls($this->service_notes_url);
+    }
+
+    public function getNotes()
+    {
+        return $this->service_notes;
+    }
 }

From a7135bad62b83445f298d6fcdfe5814e163b3193 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 26 May 2015 16:49:08 +0200
Subject: [PATCH 1758/2920] Resolve runtime macros in notes too

refs #8235
---
 .../application/views/scripts/show/components/notes.phtml      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/notes.phtml b/modules/monitoring/application/views/scripts/show/components/notes.phtml
index cdc379184..678d70c90 100644
--- a/modules/monitoring/application/views/scripts/show/components/notes.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/notes.phtml
@@ -9,6 +9,7 @@ $links = $object->getNotesUrls();
     <td>
         <?php
             if (! empty($notes)) {
+                $notes = $this->resolveMacros($notes, $object);
                 echo $notes . '<br>';
             }
             // add warning to links that open in new tabs to improve accessibility, as recommended by WCAG20 G201
@@ -25,4 +26,4 @@ $links = $object->getNotesUrls();
         ?>
     </td>
 </tr>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>

From 6e382bd1270dff31b73e1307607d3c135e65e873 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 26 May 2015 16:53:47 +0200
Subject: [PATCH 1759/2920] Provide a css rule for informational notifications

aka Notification::info()
---
 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 4d5c4c896..e1a305509 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -41,6 +41,10 @@ img.icon {
   background-position: 1em center;
 }
 
+#notifications > li.info {
+  background-color: @colorFormNotificationInfo;
+}
+
 #notifications > li.warning {
   background-color: @colorWarningHandled;
 }

From e9dd69267cab2460c608f2dc67f42894dacfd3e2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 26 May 2015 13:36:53 +0200
Subject: [PATCH 1760/2920] monitoring: Prepare HoststatusQuery to be used when
 viewing hosts

The Hoststatusquery does not include the joins for last ack, comment and downtime as where unsure whether or not we will still support this.

refs #7344
refs #9009
---
 .../Backend/Ido/Query/HoststatusQuery.php     | 375 +++++++-----------
 1 file changed, 140 insertions(+), 235 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index ec9e6bd32..5095b401c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -3,49 +3,86 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
+use Zend_Db_Expr;
+
 class HoststatusQuery extends IdoQuery
 {
+    /**
+     * {@inheritdoc}
+     */
     protected $allowCustomVars = true;
 
+    /**
+     * {@inheritdoc}
+     */
     protected $columnMap = array(
         'hosts' => array(
-            'host'              => 'ho.name1 COLLATE latin1_general_ci',
-            'host_name'         => 'ho.name1 COLLATE latin1_general_ci',
-            'host_display_name' => 'h.display_name COLLATE latin1_general_ci',
-            'host_alias'        => 'h.alias',
-            'host_address'      => 'h.address',
-            'host_ipv4'         => 'INET_ATON(h.address)',
-            'host_icon_image'   => 'h.icon_image',
-            'object_type'       => '(\'host\')'
+            'host'                  => 'ho.name1 COLLATE latin1_general_ci',
+            'host_action_url'       => 'h.action_url',
+            'host_address'          => 'h.address',
+            'host_alias'            => 'h.alias',
+            'host_display_name'     => 'h.display_name COLLATE latin1_general_ci',
+            'host_icon_image'       => 'h.icon_image',
+            'host_icon_image_alt'   => 'h.icon_image_alt',
+            'host_ipv4'             => 'INET_ATON(h.address)',
+            'host_name'             => 'ho.name1',
+            'host_notes_url'        => 'h.notes_url',
+            'object_type'           => '(\'host\')'
         ),
         'hoststatus' => array(
-            'problems'                      => 'CASE WHEN hs.current_state = 0 THEN 0 ELSE 1 END',
-            'handled'                       => 'CASE WHEN (hs.problem_has_been_acknowledged + hs.scheduled_downtime_depth) > 0 THEN 1 ELSE 0 END',
-            'unhandled'                     => 'CASE WHEN (hs.problem_has_been_acknowledged + hs.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END',
-            'host_state'                    => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END',
-            'host_output'                   => 'hs.output',
-            'host_long_output'              => 'hs.long_output',
-            'host_perfdata'                 => 'hs.perfdata',
-            'host_problem'                  => 'CASE WHEN hs.current_state = 0 THEN 0 ELSE 1 END',
-            'host_acknowledged'             => 'hs.problem_has_been_acknowledged',
-            'host_in_downtime'              => 'CASE WHEN (hs.scheduled_downtime_depth = 0) THEN 0 ELSE 1 END',
-            'host_handled'                  => 'CASE WHEN (hs.problem_has_been_acknowledged + hs.scheduled_downtime_depth) > 0 THEN 1 ELSE 0 END',
-            'host_does_active_checks'       => 'hs.active_checks_enabled',
-            'host_accepts_passive_checks'   => 'hs.passive_checks_enabled',
-            'host_last_state_change'        => 'UNIX_TIMESTAMP(hs.last_state_change)',
-            'host_last_hard_state'          => 'hs.last_hard_state',
-            'host_check_command'            => 'hs.check_command',
-            'host_last_check'               => 'UNIX_TIMESTAMP(hs.last_check)',
-            'host_next_check'               => 'CASE WHEN hs.should_be_scheduled THEN UNIX_TIMESTAMP(hs.next_check) ELSE NULL END',
-            'host_check_execution_time'     => 'hs.execution_time',
-            'host_check_latency'            => 'hs.latency',
-            'host_notifications_enabled'    => 'hs.notifications_enabled',
-            'host_last_time_up'             => 'hs.last_time_up',
-            'host_last_time_down'           => 'hs.last_time_down',
-            'host_last_time_unreachable'    => 'hs.last_time_unreachable',
-            'host_current_check_attempt'    => 'hs.current_check_attempt',
-            'host_max_check_attempts'       => 'hs.max_check_attempts',
-            'host_severity'                 => 'CASE WHEN hs.current_state = 0
+            'host_acknowledged'                     => 'hs.problem_has_been_acknowledged',
+            'host_acknowledgement_type'             => 'hs.acknowledgement_type',
+            'host_active_checks_enabled'            => 'hs.active_checks_enabled',
+            'host_active_checks_enabled_changed'    => 'CASE WHEN hs.active_checks_enabled = h.active_checks_enabled THEN 0 ELSE 1 END',
+            'host_attempt'                          => 'hs.current_check_attempt || \'/\' || hs.max_check_attempts',
+            'host_check_command'                    => 'hs.check_command',
+            'host_check_execution_time'             => 'hs.execution_time',
+            'host_check_latency'                    => 'hs.latency',
+            'host_check_source'                     => 'hs.check_source',
+            'host_check_type'                       => 'hs.check_type',
+            'host_current_check_attempt'            => 'hs.current_check_attempt',
+            'host_current_notification_number'      => 'hs.current_notification_number',
+            'host_event_handler'                    => 'hs.event_handler',
+            'host_event_handler_enabled'            => 'hs.event_handler_enabled',
+            'host_event_handler_enabled_changed'    => 'CASE WHEN hs.event_handler_enabled = h.event_handler_enabled THEN 0 ELSE 1 END',
+            'host_failure_prediction_enabled'       => 'hs.failure_prediction_enabled',
+            'host_flap_detection_enabled'           => 'hs.flap_detection_enabled',
+            'host_flap_detection_enabled_changed'   => 'CASE WHEN hs.flap_detection_enabled = h.flap_detection_enabled THEN 0 ELSE 1 END',
+            'host_handled'                          => 'CASE WHEN (hs.problem_has_been_acknowledged + hs.scheduled_downtime_depth) > 0 THEN 1 ELSE 0 END',
+            'host_hard_state'                       => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE CASE WHEN hs.state_type = 1 THEN hs.current_state ELSE hs.last_hard_state END END',
+            'host_in_downtime'                      => 'CASE WHEN (hs.scheduled_downtime_depth = 0) THEN 0 ELSE 1 END',
+            'host_is_flapping'                      => 'hs.is_flapping',
+            'host_is_reachable'                     => 'hs.is_reachable',
+            'host_last_check'                       => 'UNIX_TIMESTAMP(hs.last_check)',
+            'host_last_hard_state'                  => 'hs.last_hard_state',
+            'host_last_hard_state_change'           => 'UNIX_TIMESTAMP(hs.last_hard_state_change)',
+            'host_last_notification'                => 'UNIX_TIMESTAMP(hs.last_notification)',
+            'host_last_state_change'                => 'UNIX_TIMESTAMP(hs.last_state_change)',
+            'host_last_time_down'                   => 'UNIX_TIMESTAMP(hs.last_time_down)',
+            'host_last_time_unreachable'            => 'UNIX_TIMESTAMP(hs.last_time_unreachable)',
+            'host_last_time_up'                     => 'UNIX_TIMESTAMP(hs.last_time_up)',
+            'host_long_output'                      => 'hs.long_output',
+            'host_max_check_attempts'               => 'hs.max_check_attempts',
+            'host_modified_host_attributes'         => 'hs.modified_host_attributes',
+            'host_next_check'                       => 'CASE hs.should_be_scheduled WHEN 1 THEN UNIX_TIMESTAMP(hs.next_check) ELSE NULL END',
+            'host_next_notification'                => 'UNIX_TIMESTAMP(hs.next_notification)',
+            'host_no_more_notifications'            => 'hs.no_more_notifications',
+            'host_normal_check_interval'            => 'hs.normal_check_interval',
+            'host_notifications_enabled'            => 'hs.notifications_enabled',
+            'host_notifications_enabled_changed'    => 'CASE WHEN hs.notifications_enabled = h.notifications_enabled THEN 0 ELSE 1 END',
+            'host_obsessing'                        => 'hs.obsess_over_host',
+            'host_obsessing_changed'                => 'CASE WHEN hs.obsess_over_host = h.obsess_over_host THEN 0 ELSE 1 END',
+            'host_output'                           => 'hs.output',
+            'host_passive_checks_enabled'           => 'hs.passive_checks_enabled',
+            'host_passive_checks_enabled_changed'   => 'CASE WHEN hs.passive_checks_enabled = h.passive_checks_enabled THEN 0 ELSE 1 END',
+            'host_percent_state_change'             => 'hs.percent_state_change',
+            'host_perfdata'                         => 'hs.perfdata',
+            'host_problem'                          => 'CASE WHEN COALESCE(hs.current_state, 0) = 0 THEN 0 ELSE 1 END',
+            'host_problem_has_been_acknowledged'    => 'hs.problem_has_been_acknowledged',
+            'host_process_performance_data'         => 'hs.process_performance_data',
+            'host_retry_check_interval'             => 'hs.retry_check_interval',
+            'host_scheduled_downtime_depth'         => 'hs.scheduled_downtime_depth',
+            'host_severity'                         => 'CASE WHEN hs.current_state = 0
             THEN
                 CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL
                      THEN 16
@@ -80,245 +117,113 @@ class HoststatusQuery extends IdoQuery
             CASE WHEN hs.state_type = 1
                 THEN 8
                 ELSE 0
-            END'
+            END',
+            'host_state'                => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END',
+            'host_state_type'           => 'hs.state_type',
+            'host_status_update_time'   => 'hs.status_update_time',
+            'host_unhandled'            => 'CASE WHEN (hs.problem_has_been_acknowledged + hs.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END'
         ),
         'hostgroups' => array(
             'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
-            'hostgroup_name'    => 'hgo.name1',
-            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci'
-        ),
-        'servicegroups' => array(
-            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
-            'servicegroup_name'     => 'sgo.name1',
-            'servicegroup_alias'    => 'sg.alias'
-        ),
-        'contactgroups' => array(
-            'contactgroup'  => 'contactgroup',
-        ),
-        'contacts' => array(
-            'contact'       => 'hco.name1 COLLATE latin1_general_ci',
-        ),
-        'services' => array(
-            'services_cnt' => 'SUM(1)',
-            'services_ok' => 'SUM(CASE WHEN ss.current_state = 0 THEN 1 ELSE 0 END)',
-            'services_warning' => 'SUM(CASE WHEN ss.current_state = 1 THEN 1 ELSE 0 END)',
-            'services_critical' => 'SUM(CASE WHEN ss.current_state = 2 THEN 1 ELSE 0 END)',
-            'services_unknown' => 'SUM(CASE WHEN ss.current_state = 3 THEN 1 ELSE 0 END)',
-            'services_pending' => 'SUM(CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 1 ELSE 0 END)',
-            'services_problem' => 'SUM(CASE WHEN ss.current_state > 0 THEN 1 ELSE 0 END)',
-            'services_problem_handled' => 'SUM(CASE WHEN ss.current_state > 0 AND (ss.problem_has_been_acknowledged = 1 OR ss.scheduled_downtime_depth > 0) THEN 1 ELSE 0 END)',
-            'services_problem_unhandled' => 'SUM(CASE WHEN ss.current_state > 0 AND (ss.problem_has_been_acknowledged = 0 AND ss.scheduled_downtime_depth = 0) THEN 1 ELSE 0 END)',
-            'services_warning_handled' => 'SUM(CASE WHEN ss.current_state = 1 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0 THEN 1 ELSE 0 END)',
-            'services_critical_handled' => 'SUM(CASE WHEN ss.current_state = 2 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0 THEN 1 ELSE 0 END)',
-            'services_unknown_handled' => 'SUM(CASE WHEN ss.current_state = 3 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0 THEN 1 ELSE 0 END)',
-            'services_warning_unhandled' => 'SUM(CASE WHEN ss.current_state = 1 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) = 0 THEN 1 ELSE 0 END)',
-            'services_critical_unhandled' => 'SUM(CASE WHEN ss.current_state = 2 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) = 0 THEN 1 ELSE 0 END)',
-            'services_unknown_unhandled' => 'SUM(CASE WHEN ss.current_state = 3 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) = 0 THEN 1 ELSE 0 END)',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
         ),
+        'serviceproblemsummary' => array(
+            'host_unhandled_services' => 'sps.unhandled_services_count'
+        )
     );
 
-    protected $aggregateColumnIdx = array(
-        'services_cnt' => true,
-        'services_problem' => true,
-        'services_problem_handled' => true,
-        'services_problem_unhandled' => true,
-    );
-
-    protected $hcgSub;
-
-    public function getDefaultColumns()
-    {
-        return $this->columnMap['hosts'] + $this->columnMap['hoststatus'];
-    }
-
+    /**
+     * {@inheritdoc}
+     */
     protected function joinBaseTables()
     {
-        // TODO: Shall we always add hostobject?
         $this->select->from(
             array('ho' => $this->prefix . 'objects'),
             array()
-        )->join(
-            array('hs' => $this->prefix . 'hoststatus'),
-            'ho.' . $this->object_id . ' = hs.host_object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
-            array()
         )->join(
             array('h' => $this->prefix . 'hosts'),
-            'hs.host_object_id = h.host_object_id',
+            'h.host_object_id = ho.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
             array()
         );
-        $this->joinedVirtualTables = array(
-            'hosts' => true,
-            'hoststatus' => true,
-        );
+        $this->joinedVirtualTables['hosts'] = true;
     }
 
-    protected function joinStatus()
-    {
-        $this->requireVirtualTable('services');
-    }
-
-    protected function joinServiceStatus()
-    {
-        $this->requireVirtualTable('services');
-    }
-
-    protected function joinServices()
+    /**
+     * Join host status
+     *
+     * @return $this
+     */
+    protected function joinHoststatus()
     {
         $this->select->join(
-            array('s' => $this->prefix . 'services'),
-            's.host_object_id = h.host_object_id',
-            array()
-        )->join(
-            array('so' => $this->prefix . 'objects'),
-            'so.' . $this->object_id . ' = s.service_object_id AND so.is_active = 1',
-            array()
-        )->joinLeft(
-            array('ss' => $this->prefix . 'servicestatus'),
-            'so.' . $this->object_id . ' = ss.service_object_id',
+            array('hs' => $this->prefix . 'hoststatus'),
+            'hs.host_object_id = ho.object_id',
             array()
         );
-        foreach ($this->getColumns() as $col) {
-            $real = $this->aliasToColumnName($col);
-            if (substr($real, 0, 4) === 'SUM(') {
-                continue;
-            }
-            $this->select->group($real);
-        }
-        $this->useSubqueryCount = true;
+        return $this;
     }
 
+    /**
+     * Join host groups
+     *
+     * @return $this
+     */
     protected function joinHostgroups()
-    {
-        if ($this->hasJoinedVirtualTable('services')) {
-            return $this->joinServiceHostgroups();
-        } else {
-            return $this->joinHostHostgroups();
-        }
-    }
-
-    protected function joinServiceHostgroups()
     {
         $this->select->join(
             array('hgm' => $this->prefix . 'hostgroup_members'),
-            'hgm.host_object_id = s.host_object_id',
+            'hgm.host_object_id = ho.object_id',
             array()
         )->join(
             array('hg' => $this->prefix . 'hostgroups'),
-            'hgm.hostgroup_id = hg.' . $this->hostgroup_id,
+            'hg.hostgroup_id = hgm.hostgroup_id',
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.' . $this->object_id . ' = hg.hostgroup_object_id'
-            . ' AND hgo.is_active = 1',
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
         );
         return $this;
     }
 
-    protected function joinHostHostgroups()
+    /**
+     * Join service problem summary
+     *
+     * @return $this
+     */
+    protected function joinServiceproblemsummary()
     {
-        $this->select->join(
-            array('hgm' => $this->prefix . 'hostgroup_members'),
-            'hgm.host_object_id = h.host_object_id',
-            array()
-        )->join(
-            array('hg' => $this->prefix . 'hostgroups'),
-            'hgm.hostgroup_id = hg.' . $this->hostgroup_id,
-            array()
-        )->join(
-            array('hgo' => $this->prefix . 'objects'),
-            'hgo.' . $this->object_id . ' = hg.hostgroup_object_id' . ' AND hgo.is_active = 1',
-            array()
-        );
-        return $this;
-    }
-
-    protected function joinContacts()
-    {
-        $this->hcgcSub = $this->db->select()->distinct()->from(
-            array('hcgc' => $this->prefix . 'host_contactgroups'),
-            array('host_name' => 'ho.name1')
-        )->join(
-            array('cgo' => $this->prefix . 'objects'),
-            'hcg.contactgroup_object_id = cgo.' . $this->object_id . ' AND cgo.is_active = 1',
-            array()
-        )->join(
-            array('h' => $this->prefix . 'hosts'),
-            'hcg.host_id = h.host_id',
-            array()
-        )->join(
-            array('ho' => $this->prefix . 'objects'),
-            'h.host_object_id = ho.' . $this->object_id . ' AND ho.is_active = 1',
-            array()
-        );
-        $this->select->join(
-            array('hcg' => $this->hcgSub),
-            'hcg.host_name = ho.name1',
-            array()
-        );
-
-        return $this;
-    }
-
-    protected function filterContactgroup($value)
-    {
-        $this->hcgSub->where(
-            $this->prepareFilterStringForColumn(
-                'cgo.name1 COLLATE latin1_general_ci',
-                $value
-            )
-        );
-        return $this;
-    }
-
-    protected function joinContactgroups()
-    {
-        $this->hcgSub = $this->createContactgroupFilterSubselect();
-        $this->select->join(
-            array('hcg' => $this->hcgSub),
-            'hcg.object_id = ho.object_id',
-            array()
-        );
-        return $this;
-    }
-
-    protected function createContactgroupFilterSubselect()
-    {
-        die((string) $this->db->select()->distinct()->from(
-            array('hcg' => $this->prefix . 'host_contactgroups'),
-            array('object_id' => 'ho.object_id')
-        )->join(
-            array('cgo' => $this->prefix . 'objects'),
-            'hcg.contactgroup_object_id = cgo.' . $this->object_id
-            . ' AND cgo.is_active = 1',
-            array()
-        )->join(
-            array('h' => $this->prefix . 'hosts'),
-            'hcg.host_id = h.host_id',
-            array()
-        )->join(
-            array('ho' => $this->prefix . 'objects'),
-            'h.host_object_id = ho.' . $this->object_id . ' AND ho.is_active = 1',
-            array()
-        ));
-    }
-
-    protected function joinServicegroups()
-    {
-        // TODO: Only hosts with services having such servicegroups
-        $this->requireVirtualTable('services');
-        $this->select->join(
-            array('sgm' => $this->prefix . 'servicegroup_members'),
-            'sgm.service_object_id = s.service_object_id',
-            array()
-        )->join(
-            array('sg' => $this->prefix . 'servicegroups'),
-            'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
-            array()
-        )->join(
-            array('sgo' => $this->prefix . 'objects'),
-            'sgo.' . $this->object_id . ' = sg.servicegroup_object_id'
-            . ' AND sgo.is_active = 1',
+        $select = <<<'SQL'
+SELECT
+    SUM(
+        CASE WHEN(ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0
+        THEN 0
+        ELSE 1
+        END
+    ) AS unhandled_services_count,
+    SUM(
+        CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0) ) > 0
+        THEN 1
+        ELSE 0
+        END
+    ) AS handled_services_count,
+    s.host_object_id
+FROM
+    icinga_servicestatus ss
+    JOIN icinga_objects o ON o.object_id = ss.service_object_id
+    JOIN icinga_services s ON s.service_object_id = o.object_id
+    JOIN icinga_hoststatus hs ON hs.host_object_id = s.host_object_id
+WHERE
+    o.is_active = 1
+    AND o.objecttype_id = 2
+    AND ss.current_state > 0
+GROUP BY
+    s.host_object_id
+SQL;
+        $this->select->joinLeft(
+            array('sps' => new Zend_Db_Expr('(' . $select . ')')),
+            'sps.host_object_id = ho.object_id',
             array()
         );
         return $this;

From c81d13d77a0f1bb2a6d146be6cee73840e65455c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 26 May 2015 13:42:42 +0200
Subject: [PATCH 1761/2920] monitoring: Use the HostatusQuery in the HostStatus
 data view

refs #7344
refs #9009
---
 .../Monitoring/DataView/HostStatus.php        | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index a7c77e2e2..90d58643a 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -6,17 +6,7 @@ namespace Icinga\Module\Monitoring\DataView;
 class HostStatus extends DataView
 {
     /**
-     * @see DataView::init()
-     */
-    public function init()
-    {
-        $this->query->setMode('host');
-    }
-
-    /**
-     * Retrieve columns provided by this view
-     *
-     * @return array
+     * {@inheritdoc}
      */
     public function getColumns()
     {
@@ -76,11 +66,6 @@ class HostStatus extends DataView
         );
     }
 
-    public static function getQueryName()
-    {
-        return 'status';
-    }
-
     /**
      * The sort rules for this query
      *
@@ -112,11 +97,17 @@ class HostStatus extends DataView
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getFilterColumns()
     {
         return array('host', 'hostgroup', 'hostgroup_name', 'service', 'servicegroup', 'servicegroup_name');
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function isValidFilterTarget($column)
     {
         if ($column[0] === '_'

From e240f7b9550c9ed72b0d9840a140cc57180a8451 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 26 May 2015 13:43:49 +0200
Subject: [PATCH 1762/2920] monitoring: Don't select host last ack, comment and
 downtime

Where unsure whether or not we will still support this.

refs #7344
refs #9009
---
 .../monitoring/application/controllers/ListController.php | 6 +++---
 .../monitoring/library/Monitoring/DataView/HostStatus.php | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 1c49e36d1..f771d3376 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -89,9 +89,9 @@ class Monitoring_ListController extends Controller
             'host_unhandled_services',
             'host_action_url',
             'host_notes_url',
-            'host_last_comment',
-            'host_last_ack',
-            'host_last_downtime',
+//            'host_last_comment',
+//            'host_last_ack',
+//            'host_last_downtime',
             'host_active_checks_enabled',
             'host_passive_checks_enabled',
             'host_current_check_attempt',
diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index 90d58643a..40b6645e6 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -52,10 +52,10 @@ class HostStatus extends DataView
             'host_current_notification_number',
             'host_percent_state_change',
             'host_is_flapping',
-            'host_last_comment',
-            'host_last_downtime',
-            'host_last_ack',
-            'host_last_flapping',
+//            'host_last_comment',
+//            'host_last_downtime',
+//            'host_last_ack',
+//            'host_last_flapping',
             'host_action_url',
             'host_notes_url',
             'host_percent_state_change',

From b24e3393f02675ecfa9828d60b976069a72d1a16 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 26 May 2015 13:48:48 +0200
Subject: [PATCH 1763/2920] monitoring: Prohibit sorting the HostStatus data
 view by service columns

refs #7344
refs #9009
---
 .../Monitoring/DataView/HostStatus.php        | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index 40b6645e6..45c0ee05e 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -5,6 +5,19 @@ namespace Icinga\Module\Monitoring\DataView;
 
 class HostStatus extends DataView
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_host_/', $column)
+        ) {
+            return true;
+        }
+        return parent::isValidFilterTarget($column);
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -66,6 +79,22 @@ class HostStatus extends DataView
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getFilterColumns()
+    {
+        return array('host', 'hostgroup', 'hostgroup_name');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSearchColumns()
+    {
+        return array('host', 'host_display_name');
+    }
+
     /**
      * The sort rules for this query
      *
@@ -96,33 +125,4 @@ class HostStatus extends DataView
             )
         );
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFilterColumns()
-    {
-        return array('host', 'hostgroup', 'hostgroup_name', 'service', 'servicegroup', 'servicegroup_name');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isValidFilterTarget($column)
-    {
-        if ($column[0] === '_'
-            && preg_match('/^_(?:host|service)_/', $column)
-        ) {
-            return true;
-        }
-        return parent::isValidFilterTarget($column);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSearchColumns()
-    {
-        return array('host', 'host_display_name');
-    }
 }

From b0576d93defeb1224e7ca2ebffea2c8c28a387a0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 26 May 2015 16:59:38 +0200
Subject: [PATCH 1764/2920] monitoring: Support selecting NULL as column

refs #9009
---
 .../Monitoring/Backend/Ido/Query/IdoQuery.php | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index 9371399bc..9cd7eff08 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -3,14 +3,15 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
-use Icinga\Exception\IcingaException;
+use Zend_Db_Expr;
+use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
 use Icinga\Data\Db\DbQuery;
-use Icinga\Exception\ProgrammingError;
-use Icinga\Application\Icinga;
-use Icinga\Web\Session;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Filter\FilterExpression;
+use Icinga\Exception\IcingaException;
+use Icinga\Exception\ProgrammingError;
+use Icinga\Web\Session;
 
 /**
  * Base class for Ido Queries
@@ -471,6 +472,11 @@ abstract class IdoQuery extends DbQuery
         $resolvedColumns = array();
 
         foreach ($columns as $alias => $col) {
+            if ($col instanceof Zend_Db_Expr) {
+                // Support selecting NULL as column for example
+                $resolvedColumns[$alias] = $col;
+                continue;
+            }
             $this->requireColumn($col);
             if ($this->isCustomvar($col)) {
                 $name = $this->getCustomvarColumnName($col);
@@ -682,6 +688,14 @@ abstract class IdoQuery extends DbQuery
         return $this->idxAliasColumn[$alias];
     }
 
+    /**
+     * Create a sub query
+     *
+     * @param   string  $queryName
+     * @param   array   $columns
+     *
+     * @return  static
+     */
     protected function createSubQuery($queryName, $columns = array())
     {
         $class = '\\'

From 18499a4a591b126bffc5be19041d2d1436f61811 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 26 May 2015 17:02:13 +0200
Subject: [PATCH 1765/2920] monitoring: Support joining downtimes on the
 Hoststatus query

refs #7344
refs #9009
---
 .../Backend/Ido/Query/HoststatusQuery.php     | 73 ++++++++++++++-----
 1 file changed, 53 insertions(+), 20 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index 5095b401c..d5e9cefd7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -16,6 +16,27 @@ class HoststatusQuery extends IdoQuery
      * {@inheritdoc}
      */
     protected $columnMap = array(
+        'downtimes' => array(
+            'downtime_author'           => 'sd.author_name COLLATE latin1_general_ci',
+            'downtime_author_name'      => 'sd.author_name',
+            'downtime_comment'          => 'sd.comment_data',
+            'downtime_duration'         => 'sd.duration',
+            'downtime_end'              => 'CASE WHEN sd.is_fixed > 0 THEN UNIX_TIMESTAMP(sd.scheduled_end_time) ELSE UNIX_TIMESTAMP(sd.trigger_time) + sd.duration END',
+            'downtime_entry_time'       => 'UNIX_TIMESTAMP(sd.entry_time)',
+            'downtime_internal_id'      => 'sd.internal_downtime_id',
+            'downtime_is_fixed'         => 'sd.is_fixed',
+            'downtime_is_flexible'      => 'CASE WHEN sd.is_fixed = 0 THEN 1 ELSE 0 END',
+            'downtime_is_in_effect'     => 'sd.is_in_effect',
+            'downtime_scheduled_end'    => 'UNIX_TIMESTAMP(sd.scheduled_end_time)',
+            'downtime_scheduled_start'  => 'UNIX_TIMESTAMP(sd.scheduled_start_time)',
+            'downtime_start'            => 'UNIX_TIMESTAMP(CASE WHEN UNIX_TIMESTAMP(sd.trigger_time) > 0 then sd.trigger_time ELSE sd.scheduled_start_time END)',
+            'downtime_triggered_by_id'  => 'sd.triggered_by_id'
+        ),
+        'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
+        ),
         'hosts' => array(
             'host'                  => 'ho.name1 COLLATE latin1_general_ci',
             'host_action_url'       => 'h.action_url',
@@ -123,11 +144,6 @@ class HoststatusQuery extends IdoQuery
             'host_status_update_time'   => 'hs.status_update_time',
             'host_unhandled'            => 'CASE WHEN (hs.problem_has_been_acknowledged + hs.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END'
         ),
-        'hostgroups' => array(
-            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
-            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
-            'hostgroup_name'    => 'hgo.name1'
-        ),
         'serviceproblemsummary' => array(
             'host_unhandled_services' => 'sps.unhandled_services_count'
         )
@@ -143,31 +159,32 @@ class HoststatusQuery extends IdoQuery
             array()
         )->join(
             array('h' => $this->prefix . 'hosts'),
-            'h.host_object_id = ho.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
+            'h.host_object_id = ho.object_id',
             array()
+        )->where(
+            'ho.is_active = ?',
+            1
+        )->where(
+            'ho.objecttype_id = ?',
+            1
         );
         $this->joinedVirtualTables['hosts'] = true;
     }
 
     /**
-     * Join host status
-     *
-     * @return $this
+     * Join downtimes
      */
-    protected function joinHoststatus()
+    protected function joinDowntimes()
     {
         $this->select->join(
-            array('hs' => $this->prefix . 'hoststatus'),
-            'hs.host_object_id = ho.object_id',
+            array('sd' => $this->prefix . 'scheduleddowntime'),
+            'sd.object_id = ho.object_id',
             array()
         );
-        return $this;
     }
 
     /**
      * Join host groups
-     *
-     * @return $this
      */
     protected function joinHostgroups()
     {
@@ -181,16 +198,33 @@ class HoststatusQuery extends IdoQuery
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
+            'hgo.object_id = hg.hostgroup_object_id',
+            array()
+        )->where(
+            'hgo.is_active = ?',
+            1
+        )
+            ->where(
+                'hgo.objecttype_id = ?',
+                3
+            );
+        $this->distinct();
+    }
+
+    /**
+     * Join host status
+     */
+    protected function joinHoststatus()
+    {
+        $this->select->join(
+            array('hs' => $this->prefix . 'hoststatus'),
+            'hs.host_object_id = ho.object_id',
             array()
         );
-        return $this;
     }
 
     /**
      * Join service problem summary
-     *
-     * @return $this
      */
     protected function joinServiceproblemsummary()
     {
@@ -226,6 +260,5 @@ SQL;
             'sps.host_object_id = ho.object_id',
             array()
         );
-        return $this;
     }
 }

From a75c74eae1868d5bc8ee21e090499220863d56c3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 26 May 2015 17:02:27 +0200
Subject: [PATCH 1766/2920] Introduce form CreateMembershipForm

refs #8826
---
 .../Config/User/CreateMembershipForm.php      | 173 ++++++++++++++++++
 1 file changed, 173 insertions(+)
 create mode 100644 application/forms/Config/User/CreateMembershipForm.php

diff --git a/application/forms/Config/User/CreateMembershipForm.php b/application/forms/Config/User/CreateMembershipForm.php
new file mode 100644
index 000000000..a957edf6a
--- /dev/null
+++ b/application/forms/Config/User/CreateMembershipForm.php
@@ -0,0 +1,173 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Forms\Config\User;
+
+use Exception;
+use Icinga\Data\DataArray\ArrayDatasource;
+use Icinga\Web\Form;
+use Icinga\Web\Notification;
+
+/**
+ * Form for creating one or more group memberships
+ */
+class CreateMembershipForm extends Form
+{
+    /**
+     * The user group backends to fetch groups from
+     *
+     * Each backend must implement the Icinga\Data\Extensible and Icinga\Data\Selectable interface.
+     *
+     * @var array
+     */
+    protected $backends;
+
+    /**
+     * The username to create memberships for
+     *
+     * @var string
+     */
+    protected $userName;
+
+    /**
+     * Set the user group backends to fetch groups from
+     *
+     * @param   array   $backends
+     *
+     * @return  $this
+     */
+    public function setBackends($backends)
+    {
+        $this->backends = $backends;
+        return $this;
+    }
+
+    /**
+     * Set the username to create memberships for
+     *
+     * @param   string  $userName
+     *
+     * @return  $this
+     */
+    public function setUsername($userName)
+    {
+        $this->userName = $userName;
+        return $this;
+    }
+
+    /**
+     * Create and add elements to this form
+     *
+     * @param   array   $formData   The data sent by the user
+     */
+    public function createElements(array $formData)
+    {
+        $query = $this->createDataSource()->select()->from('group', array('group_name', 'backend_name'));
+
+        $options = array();
+        foreach ($query as $row) {
+            $options[$row->backend_name . ';' . $row->group_name] = $row->group_name . ' (' . $row->backend_name . ')';
+        }
+
+        $this->addElement(
+            'multiselect',
+            'groups',
+            array(
+                'required'      => true,
+                'multiOptions'  => $options,
+                'label'         => $this->translate('Groups'),
+                'description'   => sprintf(
+                    $this->translate('Select one or more groups where to add %s as member'),
+                    $this->userName
+                ),
+                'class'         => 'grant-permissions'
+            )
+        );
+
+        $this->setTitle(sprintf($this->translate('Create memberships for %s'), $this->userName));
+        $this->setSubmitLabel($this->translate('Create'));
+    }
+
+    /**
+     * Instantly redirect back in case the user is already a member of all groups
+     */
+    public function onRequest()
+    {
+        if ($this->createDataSource()->select()->from('group')->count() === 0) {
+            Notification::info(sprintf($this->translate('User %s is already a member of all groups'), $this->userName));
+            $this->getResponse()->redirectAndExit($this->getRedirectUrl());
+        }
+    }
+
+    /**
+     * Create the memberships for the user
+     *
+     * @return  bool
+     */
+    public function onSuccess()
+    {
+        $backendMap = array();
+        foreach ($this->backends as $backend) {
+            $backendMap[$backend->getName()] = $backend;
+        }
+
+        $single = null;
+        foreach ($this->getValue('groups') as $backendAndGroup) {
+            list($backendName, $groupName) = explode(';', $backendAndGroup, 2);
+            try {
+                $backendMap[$backendName]->insert(
+                    'group_membership',
+                    array(
+                        'group_name'    => $groupName,
+                        'user_name'     => $this->userName
+                    )
+                );
+            } catch (Exception $e) {
+                Notification::error(sprintf(
+                    $this->translate('Failed to add "%s" as group member for "%s"'),
+                    $this->userName,
+                    $groupName
+                ));
+                $this->error($e->getMessage());
+                return false;
+            }
+
+            $single = $single === null;
+        }
+
+        if ($single) {
+            Notification::success(
+                sprintf($this->translate('Membership for group %s created successfully'), $groupName)
+            );
+        } else {
+            Notification::success($this->translate('Memberships created successfully'));
+        }
+
+        return true;
+    }
+
+    /**
+     * Create and return a data source to fetch all groups from all backends where the user is not already a member of
+     *
+     * @return  ArrayDatasource
+     */
+    protected function createDataSource()
+    {
+        $groups = array();
+        foreach ($this->backends as $backend) {
+            $memberships = $backend
+                ->select()
+                ->from('group_membership', array('group_name'))
+                ->where('user_name', $this->userName)
+                ->fetchColumn();
+            foreach ($backend->select(array('group_name')) as $row) {
+                if (! in_array($row->group_name, $memberships)) { // TODO(jom): Apply this as native query filter
+                    $row->backend_name = $backend->getName();
+                    $groups[] = $row;
+                }
+            }
+        }
+
+        return new ArrayDatasource($groups);
+    }
+}

From 788481e2b11ba4706353ce84c733535b5926cc51 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 26 May 2015 17:02:41 +0200
Subject: [PATCH 1767/2920] monitoring: Add Servicestatus query

refs #7344
refs #9009
---
 .../Backend/Ido/Query/ServicestatusQuery.php  | 257 ++++++++++++++++++
 1 file changed, 257 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
new file mode 100644
index 000000000..0e2c9c1c5
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -0,0 +1,257 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+class ServicestatusQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'downtimes' => array(
+            'downtime_author'           => 'sd.author_name COLLATE latin1_general_ci',
+            'downtime_author_name'      => 'sd.author_name',
+            'downtime_comment'          => 'sd.comment_data',
+            'downtime_duration'         => 'sd.duration',
+            'downtime_end'              => 'CASE WHEN sd.is_fixed > 0 THEN UNIX_TIMESTAMP(sd.scheduled_end_time) ELSE UNIX_TIMESTAMP(sd.trigger_time) + sd.duration END',
+            'downtime_entry_time'       => 'UNIX_TIMESTAMP(sd.entry_time)',
+            'downtime_internal_id'      => 'sd.internal_downtime_id',
+            'downtime_is_fixed'         => 'sd.is_fixed',
+            'downtime_is_flexible'      => 'CASE WHEN sd.is_fixed = 0 THEN 1 ELSE 0 END',
+            'downtime_is_in_effect'     => 'sd.is_in_effect',
+            'downtime_scheduled_end'    => 'UNIX_TIMESTAMP(sd.scheduled_end_time)',
+            'downtime_scheduled_start'  => 'UNIX_TIMESTAMP(sd.scheduled_start_time)',
+            'downtime_start'            => 'UNIX_TIMESTAMP(CASE WHEN UNIX_TIMESTAMP(sd.trigger_time) > 0 then sd.trigger_time ELSE sd.scheduled_start_time END)',
+            'downtime_triggered_by_id'  => 'sd.triggered_by_id'
+        ),
+        'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
+        ),
+        'hosts' => array(
+            'host'                  => 'so.name1 COLLATE latin1_general_ci',
+            'host_action_url'       => 'h.action_url',
+            'host_address'          => 'h.address',
+            'host_alias'            => 'h.alias',
+            'host_display_name'     => 'h.display_name COLLATE latin1_general_ci',
+            'host_icon_image'       => 'h.icon_image',
+            'host_icon_image_alt'   => 'h.icon_image_alt',
+            'host_ipv4'             => 'INET_ATON(h.address)',
+            'host_name'             => 'so.name1',
+            'host_notes_url'        => 'h.notes_url',
+            'object_type'           => '(\'host\')'
+        ),
+        'hoststatus' => array(
+            'host_acknowledged'                     => 'hs.problem_has_been_acknowledged',
+            'host_acknowledgement_type'             => 'hs.acknowledgement_type',
+            'host_active_checks_enabled'            => 'hs.active_checks_enabled',
+            'host_active_checks_enabled_changed'    => 'CASE WHEN hs.active_checks_enabled = h.active_checks_enabled THEN 0 ELSE 1 END',
+            'host_attempt'                          => 'hs.current_check_attempt || \'/\' || hs.max_check_attempts',
+            'host_check_command'                    => 'hs.check_command',
+            'host_check_execution_time'             => 'hs.execution_time',
+            'host_check_latency'                    => 'hs.latency',
+            'host_check_source'                     => 'hs.check_source',
+            'host_check_type'                       => 'hs.check_type',
+            'host_current_check_attempt'            => 'hs.current_check_attempt',
+            'host_current_notification_number'      => 'hs.current_notification_number',
+            'host_event_handler'                    => 'hs.event_handler',
+            'host_event_handler_enabled'            => 'hs.event_handler_enabled',
+            'host_event_handler_enabled_changed'    => 'CASE WHEN hs.event_handler_enabled = h.event_handler_enabled THEN 0 ELSE 1 END',
+            'host_failure_prediction_enabled'       => 'hs.failure_prediction_enabled',
+            'host_flap_detection_enabled'           => 'hs.flap_detection_enabled',
+            'host_flap_detection_enabled_changed'   => 'CASE WHEN hs.flap_detection_enabled = h.flap_detection_enabled THEN 0 ELSE 1 END',
+            'host_handled'                          => 'CASE WHEN (hs.problem_has_been_acknowledged + hs.scheduled_downtime_depth) > 0 THEN 1 ELSE 0 END',
+            'host_hard_state'                       => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE CASE WHEN hs.state_type = 1 THEN hs.current_state ELSE hs.last_hard_state END END',
+            'host_in_downtime'                      => 'CASE WHEN (hs.scheduled_downtime_depth = 0) THEN 0 ELSE 1 END',
+            'host_is_flapping'                      => 'hs.is_flapping',
+            'host_is_reachable'                     => 'hs.is_reachable',
+            'host_last_check'                       => 'UNIX_TIMESTAMP(hs.last_check)',
+            'host_last_hard_state'                  => 'hs.last_hard_state',
+            'host_last_hard_state_change'           => 'UNIX_TIMESTAMP(hs.last_hard_state_change)',
+            'host_last_notification'                => 'UNIX_TIMESTAMP(hs.last_notification)',
+            'host_last_state_change'                => 'UNIX_TIMESTAMP(hs.last_state_change)',
+            'host_last_time_down'                   => 'UNIX_TIMESTAMP(hs.last_time_down)',
+            'host_last_time_unreachable'            => 'UNIX_TIMESTAMP(hs.last_time_unreachable)',
+            'host_last_time_up'                     => 'UNIX_TIMESTAMP(hs.last_time_up)',
+            'host_long_output'                      => 'hs.long_output',
+            'host_max_check_attempts'               => 'hs.max_check_attempts',
+            'host_modified_host_attributes'         => 'hs.modified_host_attributes',
+            'host_next_check'                       => 'CASE hs.should_be_scheduled WHEN 1 THEN UNIX_TIMESTAMP(hs.next_check) ELSE NULL END',
+            'host_next_notification'                => 'UNIX_TIMESTAMP(hs.next_notification)',
+            'host_no_more_notifications'            => 'hs.no_more_notifications',
+            'host_normal_check_interval'            => 'hs.normal_check_interval',
+            'host_notifications_enabled'            => 'hs.notifications_enabled',
+            'host_notifications_enabled_changed'    => 'CASE WHEN hs.notifications_enabled = h.notifications_enabled THEN 0 ELSE 1 END',
+            'host_obsessing'                        => 'hs.obsess_over_host',
+            'host_obsessing_changed'                => 'CASE WHEN hs.obsess_over_host = h.obsess_over_host THEN 0 ELSE 1 END',
+            'host_output'                           => 'hs.output',
+            'host_passive_checks_enabled'           => 'hs.passive_checks_enabled',
+            'host_passive_checks_enabled_changed'   => 'CASE WHEN hs.passive_checks_enabled = h.passive_checks_enabled THEN 0 ELSE 1 END',
+            'host_percent_state_change'             => 'hs.percent_state_change',
+            'host_perfdata'                         => 'hs.perfdata',
+            'host_problem'                          => 'CASE WHEN COALESCE(hs.current_state, 0) = 0 THEN 0 ELSE 1 END',
+            'host_problem_has_been_acknowledged'    => 'hs.problem_has_been_acknowledged',
+            'host_process_performance_data'         => 'hs.process_performance_data',
+            'host_retry_check_interval'             => 'hs.retry_check_interval',
+            'host_scheduled_downtime_depth'         => 'hs.scheduled_downtime_depth',
+            'host_severity'                         => 'CASE WHEN hs.current_state = 0
+            THEN
+                CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL
+                     THEN 16
+                     ELSE 0
+                END
+                +
+                CASE WHEN hs.problem_has_been_acknowledged = 1
+                     THEN 2
+                     ELSE
+                        CASE WHEN hs.scheduled_downtime_depth > 0
+                            THEN 1
+                            ELSE 4
+                        END
+                END
+            ELSE
+                CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 16
+                     WHEN hs.current_state = 1 THEN 32
+                     WHEN hs.current_state = 2 THEN 64
+                     ELSE 256
+                END
+                +
+                CASE WHEN hs.problem_has_been_acknowledged = 1
+                     THEN 2
+                     ELSE
+                        CASE WHEN hs.scheduled_downtime_depth > 0
+                            THEN 1
+                            ELSE 4
+                        END
+                END
+            END
+            +
+            CASE WHEN hs.state_type = 1
+                THEN 8
+                ELSE 0
+            END',
+            'host_state'                => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END',
+            'host_state_type'           => 'hs.state_type',
+            'host_status_update_time'   => 'hs.status_update_time',
+            'host_unhandled'            => 'CASE WHEN (hs.problem_has_been_acknowledged + hs.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END'
+        ),
+        'services' => array(
+            'object_type'            => '(\'service\')',
+            'service'                => 'so.name2 COLLATE latin1_general_ci',
+            'service_action_url'     => 's.action_url',
+            'service_description'    => 'so.name2',
+            'service_display_name'   => 's.display_name COLLATE latin1_general_ci',
+            'service_host'           => 'so.name1 COLLATE latin1_general_ci',
+            'service_host_name'      => 'so.name1',
+            'service_icon_image'     => 's.icon_image',
+            'service_icon_image_alt' => 's.icon_image_alt',
+            'service_notes_url'      => 's.notes_url'
+        ),
+        'servicestatus' => array(
+            'service_state'          => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END'
+        )
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        $this->select->from(
+            array('so' => $this->prefix . 'objects'),
+            array()
+        )->join(
+            array('s' => $this->prefix . 'services'),
+            's.service_object_id = so.object_id',
+            array()
+        )->where(
+            'so.is_active = ?',
+            1
+        )->where(
+            'so.objecttype_id = ?',
+            2
+        );
+        $this->joinedVirtualTables['services'] = true;
+    }
+
+    /**
+     * Join downtimes
+     */
+    protected function joinDowntimes()
+    {
+        $this->select->join(
+            array('sd' => $this->prefix . 'scheduleddowntime'),
+            'sd.object_id = so.object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join host groups
+     */
+    protected function joinHostgroups()
+    {
+        $this->select->join(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = s.host_object_id',
+            array()
+        )->join(
+            array('hg' => $this->prefix . 'hostgroups'),
+            'hg.hostgroup_id = hgm.hostgroup_id',
+            array()
+        )->join(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hg.hostgroup_object_id',
+            array()
+        )->where(
+            'hgo.is_active = ?',
+            1
+        )->where(
+            'hgo.objecttype_id = ?',
+            3
+        );
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $this->select->join(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = s.host_object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join host status
+     */
+    protected function joinHoststatus()
+    {
+        $this->select->join(
+            array('hs' => $this->prefix . 'hoststatus'),
+            'hs.host_object_id = s.host_object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join service status
+     */
+    protected function joinServicestatus()
+    {
+        $this->select->join(
+            array('ss' => $this->prefix . 'servicestatus'),
+            'ss.service_object_id = so.object_id',
+            array()
+        );
+    }
+}

From 02afa9fd554ecd6e18d0a3522553e8044e34786a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 26 May 2015 17:03:10 +0200
Subject: [PATCH 1768/2920] UserController: Add createmembershipAction()

refs #8826
---
 application/controllers/UserController.php | 34 ++++++++++++++++++++++
 application/views/scripts/user/show.phtml  | 11 ++++---
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index b24f3b76e..90979a3a7 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -3,6 +3,8 @@
 
 use \Exception;
 use Icinga\Application\Logger;
+use Icinga\Exception\ConfigurationError;
+use Icinga\Forms\Config\User\CreateMembershipForm;
 use Icinga\Forms\Config\User\UserForm;
 use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\User;
@@ -122,6 +124,9 @@ class UserController extends AuthBackendController
             $memberships
         );
 
+        $extensibleBackends = $this->loadUserGroupBackends('Icinga\Data\Extensible');
+        $this->view->showCreateMembershipLink = ! empty($extensibleBackends);
+
         $this->view->user = $user;
         $this->view->backend = $backend;
         $this->view->memberships = $memberships;
@@ -211,6 +216,35 @@ class UserController extends AuthBackendController
         $this->render('form');
     }
 
+    /**
+     * Create a membership for a user
+     */
+    public function createmembershipAction()
+    {
+        $userName = $this->params->getRequired('user');
+        $backend = $this->getUserBackend($this->params->getRequired('backend'));
+
+        if ($backend->select()->where('user_name', $userName)->count() === 0) {
+            $this->httpNotFound(sprintf($this->translate('User "%s" not found'), $userName));
+        }
+
+        $backends = $this->loadUserGroupBackends('Icinga\Data\Extensible');
+        if (empty($backends)) {
+            throw new ConfigurationError($this->translate(
+                'You\'ll need to configure at least one user group backend first that allows to create new memberships'
+            ));
+        }
+
+        $form = new CreateMembershipForm();
+        $form->setBackends($backends)
+            ->setUsername($userName)
+            ->setRedirectUrl(Url::fromPath('user/show', array('backend' => $backend->getName(), 'user' => $userName)))
+            ->handleRequest();
+
+        $this->view->form = $form;
+        $this->render('form');
+    }
+
     /**
      * Fetch and return the given user's groups from all user group backends
      *
diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index 733d3309a..1049a426a 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -75,11 +75,14 @@ if ($backend instanceof Updatable) {
 <?php else: ?>
   <p><?= $this->translate('No memberships found matching the filter'); ?></p>
 <?php endif ?>
+<?php if ($showCreateMembershipLink): ?>
 <?= $this->qlink($this->translate('Create new membership'), 'user/createmembership', array(
-  'user'              => $user->user_name
+  'backend'             => $backend->getName(),
+  'user'                => $user->user_name
 ), array(
-  'icon'              => 'plus',
-  'data-base-target'  => '_next',
-  'class'             => 'membership-create'
+  'icon'                => 'plus',
+  'data-base-target'    => '_next',
+  'class'               => 'membership-create'
 )); ?>
+<?php endif ?>
 </div>
\ No newline at end of file

From bb9b9bc7547ce1e98c45624a9abc68decd67c317 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 26 May 2015 17:05:47 +0200
Subject: [PATCH 1769/2920] monitoring: Apply host and service restrictions to
 downtimes

refs #9009
refs #9319
---
 .../Backend/Ido/Query/DowntimeQuery.php       | 211 ++++++++++--------
 1 file changed, 122 insertions(+), 89 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index a3e66cbaf..b08944e77 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -3,6 +3,11 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
+use Zend_Db_Expr;
+use Zend_Db_Select;
+use Icinga\Authentication\Manager;
+use Icinga\Data\Filter\Filter;
+
 /**
  * Query for host and service downtimes
  */
@@ -12,127 +17,155 @@ class DowntimeQuery extends IdoQuery
      * {@inheritdoc}
      */
     protected $columnMap = array(
-        'downtime' => array(
-            'downtime_author_name'      => 'sd.author_name',
-            'author'                    => 'sd.author_name COLLATE latin1_general_ci',
-            'downtime_comment'          => 'sd.comment_data',
-            'downtime_entry_time'       => 'UNIX_TIMESTAMP(sd.entry_time)',
-            'downtime_is_fixed'         => 'sd.is_fixed',
-            'downtime_is_flexible'      => 'CASE WHEN sd.is_fixed = 0 THEN 1 ELSE 0 END',
-            'downtime_triggered_by_id'  => 'sd.triggered_by_id',
-            'downtime_scheduled_start'  => 'UNIX_TIMESTAMP(sd.scheduled_start_time)',
-            'downtime_scheduled_end'    => 'UNIX_TIMESTAMP(sd.scheduled_end_time)',
-            'downtime_start'            => "UNIX_TIMESTAMP(CASE WHEN UNIX_TIMESTAMP(sd.trigger_time) > 0 then sd.trigger_time ELSE sd.scheduled_start_time END)",
-            'downtime_end'              => 'CASE WHEN sd.is_fixed > 0 THEN UNIX_TIMESTAMP(sd.scheduled_end_time) ELSE UNIX_TIMESTAMP(sd.trigger_time) + sd.duration END',
-            'downtime_duration'         => 'sd.duration',
-            'downtime_is_in_effect'     => 'sd.is_in_effect',
-            'downtime_internal_id'      => 'sd.internal_downtime_id',
-            'downtime_objecttype'       => "CASE WHEN ho.object_id IS NULL THEN 'service' ELSE 'host' END",
-            'host'                      => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END COLLATE latin1_general_ci',
-            'host_name'                 => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END',
-            'service'                   => 'so.name2 COLLATE latin1_general_ci',
-            'service_description'       => 'so.name2',
-            'service_host'              => 'so.name1 COLLATE latin1_general_ci',
-            'service_host_name'         => 'so.name1'
+        'downtimes' => array(
+            'downtime_author'           => 'd.downtime_author',
+            'downtime_author_name'      => 'd.downtime_author_name',
+            'downtime_comment'          => 'd.downtime_comment',
+            'downtime_duration'         => 'd.downtime_duration',
+            'downtime_end'              => 'd.downtime_end',
+            'downtime_entry_time'       => 'd.downtime_entry_time',
+            'downtime_internal_id'      => 'd.downtime_internal_id',
+            'downtime_is_fixed'         => 'd.downtime_is_fixed',
+            'downtime_is_flexible'      => 'd.downtime_is_flexible',
+            'downtime_is_in_effect'     => 'd.downtime_is_in_effect',
+            'downtime_scheduled_end'    => 'd.downtime_scheduled_end',
+            'downtime_scheduled_start'  => 'd.downtime_scheduled_start',
+            'downtime_start'            => 'd.downtime_start',
+            'object_type'               => 'd.object_type'
         ),
         'hosts' => array(
-            'host_display_name'         => 'CASE WHEN h.display_name IS NULL THEN sh.display_name ELSE h.display_name END'
-        ),
-        'hoststatus' => array(
-            'downtime_host_state'       => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END'
+            'host_display_name'         => 'd.host_display_name',
+            'host_name'                 => 'd.host_name',
+            'host_state'                => 'd.host_state'
         ),
         'services' => array(
-            'service_display_name'      => 's.display_name'
-        ),
-        'servicestatus' => array(
-            'downtime_service_state'    => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END'
+            'service_description'       => 'd.service_description',
+            'service_display_name'      => 'd.service_display_name',
+            'service_host_name'         => 'd.service_host_name',
+            'service_state'             => 'd.service_state'
         )
     );
 
+    /**
+     * The union
+     *
+     * @var Zend_Db_Select
+     */
+    protected $downtimeQuery;
+
+    /**
+     * Subqueries used for the downtime query
+     *
+     * @var IdoQuery[]
+     */
+    protected $subQueries = array();
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addFilter(Filter $filter)
+    {
+        foreach ($this->subQueries as $sub) {
+            $sub->applyFilter(clone $filter);
+        }
+        return $this;
+    }
+
+    /**
+     * Apply host restrictions to a query
+     *
+     * @param IdoQuery $query
+     */
+    protected function applyHostRestrictions(IdoQuery $query)
+    {
+        $hostRestrictions = Filter::matchAny();
+        foreach (Manager::getInstance()->getRestrictions('monitoring/hosts/filter') as $restriction) {
+            $hostRestrictions->addFilter(Filter::fromQueryString($restriction));
+        }
+        $query->addFilter($hostRestrictions);
+    }
+
+    /**
+     * Apply host and service restrictions to a query
+     *
+     * @param IdoQuery $query
+     */
+    protected function applyServiceRestrictions(IdoQuery $query)
+    {
+        $hostAndServiceRestrictions = Filter::matchAll();
+        $hostRestrictions = Filter::matchAny();
+        $serviceRestrictions = Filter::matchAny();
+        foreach (Manager::getInstance()->getRestrictions('monitoring/hosts/filter') as $restriction) {
+            $hostRestrictions->addFilter(Filter::fromQueryString($restriction));
+        }
+        foreach (Manager::getInstance()->getRestrictions('monitoring/services/filter') as $restriction) {
+            $serviceRestrictions->addFilter(Filter::fromQueryString($restriction));
+        }
+        $hostAndServiceRestrictions->addFilter($hostRestrictions);
+        $hostAndServiceRestrictions->addFilter($serviceRestrictions);
+        $query->addFilter($hostAndServiceRestrictions);
+    }
+
     /**
      * {@inheritdoc}
      */
     protected function joinBaseTables()
     {
+        $this->downtimeQuery = $this->db->select();
         $this->select->from(
-            array('sd' => $this->prefix . 'scheduleddowntime'),
+            array('d' => $this->downtimeQuery),
             array()
         );
-        $this->select->joinLeft(
-            array('ho' => $this->prefix . 'objects'),
-            'sd.object_id = ho.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
-            array()
-        );
-        $this->select->joinLeft(
-            array('so' => $this->prefix . 'objects'),
-            'sd.object_id = so.object_id AND so.is_active = 1 AND so.objecttype_id = 2',
-            array()
-        );
-        $this->joinedVirtualTables = array('downtime' => true);
+        $this->joinedVirtualTables['downtimes'] = true;
     }
 
     /**
-     * Join downtimes' hosts
-     *
-     * @return $this
+     * Join hosts
      */
     protected function joinHosts()
     {
-        $this->select->joinLeft(
-            array('h' => $this->prefix . 'hosts'),
-            'h.host_object_id = ho.object_id',
-            array()
-        );
-        return $this;
+        $columns = array_keys($this->columnMap['downtimes'] + $this->columnMap['hosts']);
+        foreach (array_keys($this->columnMap['services']) as $column) {
+            $columns[$column] = new Zend_Db_Expr('NULL');
+        }
+        $hosts = $this->createSubQuery('hoststatus', $columns);
+        $this->applyHostRestrictions($hosts);
+        $this->subQueries[] = $hosts;
+        $this->downtimeQuery->union(array($hosts), Zend_Db_Select::SQL_UNION_ALL);
     }
 
     /**
-     * Join downtimes' hosts' status
-     *
-     * @return $this
-     */
-    protected function joinHoststatus()
-    {
-        $this->select->joinLeft(
-            array('hs' => $this->prefix . 'hoststatus'),
-            'ho.object_id = hs.host_object_id',
-            array()
-        );
-        return $this;
-    }
-
-    /**
-     * Join downtimes' services
-     *
-     * @return $this
+     * Join services
      */
     protected function joinServices()
     {
-        $this->select->joinLeft(
-            array('s' => $this->prefix . 'services'),
-            's.service_object_id = so.object_id',
-            array()
-        );
-        $this->select->joinLeft(
-            array('sh' => $this->prefix . 'hosts'),
-            'sh.host_object_id = s.host_object_id',
-            array()
-        );
-        return $this;
+        $columns = array_keys($this->columnMap['downtimes'] + $this->columnMap['hosts'] + $this->columnMap['services']);
+        $services = $this->createSubQuery('servicestatus', $columns);
+        $this->applyServiceRestrictions($services);
+        $this->subQueries[] = $services;
+        $this->downtimeQuery->union(array($services), Zend_Db_Select::SQL_UNION_ALL);
     }
 
     /**
-     * Join downtimes' services' status
-     *
-     * @return $this
+     * {@inheritdoc}
      */
-    protected function joinServicestatus()
+    public function order($columnOrAlias, $dir = null)
     {
-        $this->select->joinLeft(
-            array('ss' => $this->prefix . 'servicestatus'),
-            'so.object_id = ss.service_object_id',
-            array()
-        );
+        foreach ($this->subQueries as $sub) {
+            $sub->requireColumn($columnOrAlias);
+        }
+        return parent::order($columnOrAlias, $dir);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function where($condition, $value = null)
+    {
+        $this->requireColumn($condition);
+        foreach ($this->subQueries as $sub) {
+            $sub->where($condition, $value);
+        }
         return $this;
     }
 }

From cd1ee3e306f83c3ae9181d5a9fe2f866591736a8 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 26 May 2015 17:07:58 +0200
Subject: [PATCH 1770/2920] monitoring: Fix select columns for downtimes

refs #9009
refs #9319
---
 .../monitoring/application/controllers/ListController.php   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index f771d3376..197bf5b69 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -229,7 +229,7 @@ class Monitoring_ListController extends Controller
 
         $query = $this->backend->select()->from('downtime', array(
             'id'              => 'downtime_internal_id',
-            'objecttype'      => 'downtime_objecttype',
+            'objecttype'      => 'object_type',
             'comment'         => 'downtime_comment',
             'author_name'     => 'downtime_author_name',
             'start'           => 'downtime_start',
@@ -241,8 +241,8 @@ class Monitoring_ListController extends Controller
             'is_fixed'        => 'downtime_is_fixed',
             'is_in_effect'    => 'downtime_is_in_effect',
             'entry_time'      => 'downtime_entry_time',
-            'host_state'      => 'downtime_host_state',
-            'service_state'   => 'downtime_service_state',
+            'host_state',
+            'service_state',
             'host_name',
             'service_description',
             'host_display_name',

From 61565543ab675356b5beb0de7aec5d02addcd71a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 26 May 2015 17:10:23 +0200
Subject: [PATCH 1771/2920] monitoring: Fix downtime filter columns

refs #9009
refs #9319
---
 .../library/Monitoring/DataView/Downtime.php  | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index 4eaab1860..366e80d78 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -6,9 +6,20 @@ namespace Icinga\Module\Monitoring\DataView;
 class Downtime extends DataView
 {
     /**
-     * Retrieve columns provided by this view
-     *
-     * @return array
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        }
+        return parent::isValidFilterTarget($column);
+    }
+
+    /**
+     * {@inheritdoc}
      */
     public function getColumns()
     {
@@ -37,6 +48,17 @@ class Downtime extends DataView
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getFilterColumns()
+    {
+        return array('hostgroup', 'hostgroup_alias', 'hostgroup_name', 'servicegroup', 'servicegroup_alias', 'servicegroup_name');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
     public function getSortRules()
     {
         return array(
@@ -66,9 +88,4 @@ class Downtime extends DataView
             )
         );
     }
-
-    public function getFilterColumns()
-    {
-        return array('author', 'host', 'service', 'service_host');
-    }
 }

From 0c1df335fcee05ac1609a38d52b5cd27a7a924cd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 26 May 2015 17:15:03 +0200
Subject: [PATCH 1772/2920] monitoring: Fix select columns for downtimes, again

refs #9009
refs #9319
---
 .../controllers/DowntimeController.php           | 12 +++++-------
 .../controllers/DowntimesController.php          | 16 +++++++---------
 .../Monitoring/Object/MonitoredObject.php        |  4 ++--
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/modules/monitoring/application/controllers/DowntimeController.php b/modules/monitoring/application/controllers/DowntimeController.php
index 67b8b6a33..49bcd9529 100644
--- a/modules/monitoring/application/controllers/DowntimeController.php
+++ b/modules/monitoring/application/controllers/DowntimeController.php
@@ -37,7 +37,7 @@ class Monitoring_DowntimeController extends Controller
 
         $this->downtime = $this->backend->select()->from('downtime', array(
             'id'              => 'downtime_internal_id',
-            'objecttype'      => 'downtime_objecttype',
+            'objecttype'      => 'object_type',
             'comment'         => 'downtime_comment',
             'author_name'     => 'downtime_author_name',
             'start'           => 'downtime_start',
@@ -49,11 +49,9 @@ class Monitoring_DowntimeController extends Controller
             'is_fixed'        => 'downtime_is_fixed',
             'is_in_effect'    => 'downtime_is_in_effect',
             'entry_time'      => 'downtime_entry_time',
-            'host_state'      => 'downtime_host_state',
-            'service_state'   => 'downtime_service_state',
+            'host_state',
+            'service_state',
             'host_name',
-            'host',
-            'service',
             'service_description',
             'host_display_name',
             'service_display_name'
@@ -95,9 +93,9 @@ class Monitoring_DowntimeController extends Controller
                 Host::getStateText($this->downtime->host_state);
         $this->view->listAllLink = Url::fromPath('monitoring/list/downtimes');
         $this->view->showHostLink = Url::fromPath('monitoring/host/show')
-                ->setParam('host', $this->downtime->host);
+                ->setParam('host', $this->downtime->host_name);
         $this->view->showServiceLink = Url::fromPath('monitoring/service/show')
-                ->setParam('host', $this->downtime->host)
+                ->setParam('host', $this->downtime->host_name)
                 ->setParam('service', $this->downtime->service_description);
         if ($this->hasPermission('monitoring/command/downtime/delete')) {
             $this->view->delDowntimeForm = $this->createDelDowntimeForm();
diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php
index 4ba872bbd..a1d210cc8 100644
--- a/modules/monitoring/application/controllers/DowntimesController.php
+++ b/modules/monitoring/application/controllers/DowntimesController.php
@@ -41,7 +41,7 @@ class Monitoring_DowntimesController extends Controller
         ));
         $this->downtimes = $this->backend->select()->from('downtime', array(
             'id'              => 'downtime_internal_id',
-            'objecttype'      => 'downtime_objecttype',
+            'objecttype'      => 'object_type',
             'comment'         => 'downtime_comment',
             'author_name'     => 'downtime_author_name',
             'start'           => 'downtime_start',
@@ -53,11 +53,9 @@ class Monitoring_DowntimesController extends Controller
             'is_fixed'        => 'downtime_is_fixed',
             'is_in_effect'    => 'downtime_is_in_effect',
             'entry_time'      => 'downtime_entry_time',
-            'host_state'      => 'downtime_host_state',
-            'service_state'   => 'downtime_service_state',
+            'host_state',
+            'service_state',
             'host_name',
-            'host',
-            'service',
             'service_description',
             'host_display_name',
             'service_display_name'
@@ -68,7 +66,7 @@ class Monitoring_DowntimesController extends Controller
                 $this->translate('Downtime not found')
             );
         }
-        
+
         $this->getTabs()->add(
             'downtimes',
             array(
@@ -80,14 +78,14 @@ class Monitoring_DowntimesController extends Controller
                 'url'   =>'monitoring/downtimes/show'
             )
         )->activate('downtimes');
-        
+
         foreach ($this->downtimes as $downtime) {
             if (isset($downtime->service_description)) {
                 $downtime->isService = true;
             } else {
                 $downtime->isService = false;
             }
-            
+
             if ($downtime->isService) {
                 $downtime->stateText = Service::getStateText($downtime->service_state);
             } else {
@@ -127,4 +125,4 @@ class Monitoring_DowntimesController extends Controller
         $delDowntimeForm->setDowntimes($this->downtimes)->handleRequest();
         $this->view->delDowntimeForm = $delDowntimeForm;
     }
-}
\ No newline at end of file
+}
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 05f201428..fdf64fc51 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -274,7 +274,7 @@ abstract class MonitoredObject implements Filterable
     {
         $downtimes = $this->backend->select()->from('downtime', array(
             'id'                => 'downtime_internal_id',
-            'objecttype'        => 'downtime_objecttype',
+            'objecttype'        => 'object_type',
             'comment'           => 'downtime_comment',
             'author_name'       => 'downtime_author_name',
             'start'             => 'downtime_start',
@@ -286,7 +286,7 @@ abstract class MonitoredObject implements Filterable
             'is_in_effect'      => 'downtime_is_in_effect',
             'entry_time'        => 'downtime_entry_time'
         ))
-            ->where('downtime_objecttype', $this->type)
+            ->where('object_type', $this->type)
             ->order('downtime_is_in_effect', 'DESC')
             ->order('downtime_scheduled_start', 'ASC');
         if ($this->type === self::TYPE_SERVICE) {

From b842a396503f0df8dd7771d07b4bf31069e9a537 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 26 May 2015 18:23:26 +0200
Subject: [PATCH 1773/2920] Implement ::getLinuxDistro()

refs #8705
---
 library/Icinga/Application/Platform.php | 118 ++++++++++++++++++++++++
 1 file changed, 118 insertions(+)

diff --git a/library/Icinga/Application/Platform.php b/library/Icinga/Application/Platform.php
index 355311b97..a6e0d9604 100644
--- a/library/Icinga/Application/Platform.php
+++ b/library/Icinga/Application/Platform.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Application;
 
+use Icinga\Exception\IcingaException;
+
 /**
  * Platform tests for icingaweb
  */
@@ -59,6 +61,122 @@ class Platform
         return strtoupper(substr(self::getOperatingSystemName(), 0, 5)) === 'LINUX';
     }
 
+    /**
+     * Return the Linux distribution's name
+     * or 'linux' if the name could not be found out
+     * or false if the OS isn't Linux or an error occurred
+     *
+     * @param int $reliable
+     *      3: Only parse /etc/os-release (or /usr/lib/os-release).
+     *          For the paranoid ones.
+     *      2: If that (3) doesn't help, check /etc/*-release, too.
+     *          If something is unclear, return 'linux'.
+     *      1: Almost equal to mode 2. The possible return values also include:
+     *          'redhat' -- unclear whether RHEL/Fedora/...
+     *          'suse' -- unclear whether SLES/openSUSE/...
+     *      0: If even that (1) doesn't help, check /proc/version, too.
+     *          This may not work (as expected) on LXC containers!
+     *          (No reliability at all!)
+     *
+     * @return string|bool
+     */
+    public static function getLinuxDistro($reliable = 2)
+    {
+        if (! self::isLinux()) {
+            return false;
+        }
+
+        foreach (array('/etc/os-release', '/usr/lib/os-release') as $osReleaseFile) {
+            if (false === ($osRelease = @file(
+                $osReleaseFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES
+            ))) {
+                continue;
+            }
+
+            foreach ($osRelease as $osInfo) {
+                if (false === ($res = @preg_match('/(?<!.)[ \t]*#/ms', $osInfo))) {
+                    throw new IcingaException('Failed at preg_match()');
+                }
+                if ($res === 1) {
+                    continue;
+                }
+
+                $matches = array();
+                if (false === ($res = @preg_match(
+                    '/(?<!.)[ \t]*ID[ \t]*=[ \t]*(\'|"|)(.*?)(?:\1)[ \t]*(?!.)/msi',
+                    $osInfo,
+                    $matches
+                ))) {
+                    throw new IcingaException('Failed at preg_match()');
+                }
+                if (! ($res === 0 || $matches[2] === '' || $matches[2] === 'linux')) {
+                    return $matches[2];
+                }
+            }
+        }
+
+        if ($reliable > 2) {
+            return 'linux';
+        }
+
+        foreach (array(
+            'fedora' => '/etc/fedora-release',
+            'centos' => '/etc/centos-release'
+        ) as $distro => $releaseFile) {
+            if (! (false === (
+                $release = @file_get_contents($releaseFile)
+            ) || false === strpos(strtolower($release), $distro))) {
+                return $distro;
+            }
+        }
+
+        if (false !== ($release = @file_get_contents('/etc/redhat-release'))) {
+            $release = strtolower($release);
+            if (false !== strpos($release, 'red hat enterprise linux')) {
+                return 'rhel';
+            }
+            foreach (array('fedora', 'centos') as $distro) {
+                if (false !== strpos($release, $distro)) {
+                    return $distro;
+                }
+            }
+            return $reliable < 2 ? 'redhat' : 'linux';
+        }
+
+        if (false !== ($release = @file_get_contents('/etc/SuSE-release'))) {
+            $release = strtolower($release);
+            foreach (array(
+                'opensuse'  => 'opensuse',
+                'sles'      => 'suse linux enterprise server',
+                'sled'      => 'suse linux enterprise desktop'
+            ) as $distro => $name) {
+                if (false !== strpos($release, $name)) {
+                    return $distro;
+                }
+            }
+            return $reliable < 2 ? 'suse' : 'linux';
+        }
+
+        if ($reliable < 1) {
+            if (false === ($procVersion = @file_get_contents('/proc/version'))) {
+                throw new IcingaException('Failed at file_get_contents(/proc/version)');
+            }
+            $procVersion = strtolower($procVersion);
+            foreach (array(
+                'redhat'    => 'red hat',
+                'suse'      => 'suse linux',
+                'ubuntu'    => 'ubuntu',
+                'debian'    => 'debian'
+            ) as $distro => $name) {
+                if (false !== strpos($procVersion, $name)) {
+                    return $distro;
+                }
+            }
+        }
+
+        return 'linux';
+    }
+
     /**
      * Test of CLI environment
      *

From e0f0fbf1cc2e3b661ffa3f15bea8400f68e97b9c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 08:53:13 +0200
Subject: [PATCH 1774/2920] GroupController: Remove redundant error handling

refs #8826
---
 application/controllers/GroupController.php | 10 ++--------
 application/views/scripts/group/list.phtml  |  5 -----
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 3704c038e..f400e5bae 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -64,17 +64,11 @@ class GroupController extends AuthBackendController
         $query->applyFilter($filterEditor->getFilter());
         $this->setupFilterControl($filterEditor);
 
-        try {
-            $this->setupPaginationControl($query);
-            $this->view->groups = $query;
-        } catch (Exception $e) {
-            Notification::error($e->getMessage());
-            Logger::error($e);
-        }
-
+        $this->view->groups = $query;
         $this->view->backend = $backend;
         $this->createListTabs()->activate('group/list');
 
+        $this->setupPaginationControl($query);
         $this->setupLimitControl();
         $this->setupSortControl(
             array(
diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
index be2dfae1a..c737af078 100644
--- a/application/views/scripts/group/list.phtml
+++ b/application/views/scripts/group/list.phtml
@@ -26,11 +26,6 @@ if ($backend === null) {
     $reducible = $backend instanceof Reducible;
 }
 
-if (! isset($groups)) {
-    echo $this->translate('Failed to fetch any groups') . '</div>';
-    return;
-}
-
 if (count($groups) > 0): ?>
 <table data-base-target="_next" class="action group-list">
   <thead>

From 676d20920b4fc80d7253c1f667e2a216630e7e7e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 08:53:34 +0200
Subject: [PATCH 1775/2920] UserController: Remove redundant error handling

refs #8826
---
 application/controllers/UserController.php | 10 ++--------
 application/views/scripts/user/list.phtml  |  5 -----
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 90979a3a7..fc13c5455 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -64,17 +64,11 @@ class UserController extends AuthBackendController
         $query->applyFilter($filterEditor->getFilter());
         $this->setupFilterControl($filterEditor);
 
-        try {
-            $this->setupPaginationControl($query);
-            $this->view->users = $query;
-        } catch (Exception $e) {
-            Notification::error($e->getMessage());
-            Logger::error($e);
-        }
-
+        $this->view->users = $query;
         $this->view->backend = $backend;
         $this->createListTabs()->activate('user/list');
 
+        $this->setupPaginationControl($query);
         $this->setupLimitControl();
         $this->setupSortControl(
             array(
diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index 093270d4b..a1e4a6994 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -26,11 +26,6 @@ if ($backend === null) {
     $reducible = $backend instanceof Reducible;
 }
 
-if (! isset($users)) {
-    echo $this->translate('Failed to fetch any users') . '</div>';
-    return;
-}
-
 if (count($users) > 0): ?>
 <table data-base-target="_next" class="action user-list">
   <thead>

From adc2d338149d1449bb8b4f41b0c9a45a95a0b1d0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 08:55:02 +0200
Subject: [PATCH 1776/2920] GroupController: Properly handle errors when
 fetching users

refs #8826
---
 application/controllers/GroupController.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index f400e5bae..0df9da8f2 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -302,8 +302,16 @@ class GroupController extends AuthBackendController
     {
         $users = array();
         foreach ($this->loadUserBackends('Icinga\Data\Selectable') as $backend) {
-            foreach ($backend->select(array('user_name')) as $row) {
-                $users[] = $row;
+            try {
+                foreach ($backend->select(array('user_name')) as $row) {
+                    $users[] = $row;
+                }
+            } catch (Exception $e) {
+                Logger::error($e);
+                Notification::warning(sprintf(
+                    $this->translate('Failed to fetch any users from backend %s. Please check your log'),
+                    $backend->getName()
+                ));
             }
         }
 

From 45fd1b78f14d72fde16ce8cfa20a195478bdb718 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 08:55:14 +0200
Subject: [PATCH 1777/2920] UserGroupController: Properly handle errors when
 fetching memberships

refs #8826
---
 application/controllers/UserController.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index fc13c5455..c96e94dab 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -250,11 +250,19 @@ class UserController extends AuthBackendController
     {
         $groups = array();
         foreach ($this->loadUserGroupBackends() as $backend) {
-            foreach ($backend->getMemberships($user) as $groupName) {
-                $groups[] = (object) array(
-                    'group_name'    => $groupName,
-                    'backend'       => $backend
-                );
+            try {
+                foreach ($backend->getMemberships($user) as $groupName) {
+                    $groups[] = (object) array(
+                        'group_name'    => $groupName,
+                        'backend'       => $backend
+                    );
+                }
+            } catch (Exception $e) {
+                Logger::error($e);
+                Notification::warning(sprintf(
+                    $this->translate('Failed to fetch memberships from backend %s. Please check your log'),
+                    $backend->getName()
+                ));
             }
         }
 

From 170379b74308d76f37f9f8911a0142836d962f20 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 08:55:53 +0200
Subject: [PATCH 1778/2920] CreateMembershipForm: Properly handle errors when
 fetching groups

refs #8826
---
 .../Config/User/CreateMembershipForm.php      | 38 ++++++++++++++-----
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/application/forms/Config/User/CreateMembershipForm.php b/application/forms/Config/User/CreateMembershipForm.php
index a957edf6a..a0b40b4ee 100644
--- a/application/forms/Config/User/CreateMembershipForm.php
+++ b/application/forms/Config/User/CreateMembershipForm.php
@@ -4,6 +4,7 @@
 namespace Icinga\Forms\Config\User;
 
 use Exception;
+use Icinga\Application\Logger;
 use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\Web\Form;
 use Icinga\Web\Notification;
@@ -153,18 +154,35 @@ class CreateMembershipForm extends Form
      */
     protected function createDataSource()
     {
-        $groups = array();
+        $groups = $failures = array();
         foreach ($this->backends as $backend) {
-            $memberships = $backend
-                ->select()
-                ->from('group_membership', array('group_name'))
-                ->where('user_name', $this->userName)
-                ->fetchColumn();
-            foreach ($backend->select(array('group_name')) as $row) {
-                if (! in_array($row->group_name, $memberships)) { // TODO(jom): Apply this as native query filter
-                    $row->backend_name = $backend->getName();
-                    $groups[] = $row;
+            try {
+                $memberships = $backend
+                    ->select()
+                    ->from('group_membership', array('group_name'))
+                    ->where('user_name', $this->userName)
+                    ->fetchColumn();
+                foreach ($backend->select(array('group_name')) as $row) {
+                    if (! in_array($row->group_name, $memberships)) { // TODO(jom): Apply this as native query filter
+                        $row->backend_name = $backend->getName();
+                        $groups[] = $row;
+                    }
                 }
+            } catch (Exception $e) {
+                $failures[] = array($backend->getName(), $e);
+            }
+        }
+
+        if (empty($groups) && !empty($failures)) {
+            // In case there are only failures, throw the very first exception again
+            throw $failures[0][1];
+        } elseif (! empty($failures)) {
+            foreach ($failures as $failure) {
+                Logger::error($failure[1]);
+                Notification::warning(sprintf(
+                    $this->translate('Failed to fetch any groups from backend %s. Please check your log'),
+                    $failure[0]
+                ));
             }
         }
 

From 32c1a844b529c47387a45cfd8d5642c0831ce1c4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 09:03:00 +0200
Subject: [PATCH 1779/2920] UserController: Do not show duplicate memberships
 when showing a user

refs #8826
---
 application/controllers/UserController.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index c96e94dab..788ee7708 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -248,10 +248,15 @@ class UserController extends AuthBackendController
      */
     protected function loadMemberships(User $user)
     {
-        $groups = array();
+        $groups = $alreadySeen = array();
         foreach ($this->loadUserGroupBackends() as $backend) {
             try {
                 foreach ($backend->getMemberships($user) as $groupName) {
+                    if (array_key_exists($groupName, $alreadySeen)) {
+                        continue; // Ignore duplicate memberships
+                    }
+
+                    $alreadySeen[$groupName] = null;
                     $groups[] = (object) array(
                         'group_name'    => $groupName,
                         'backend'       => $backend

From 2cbea558effd29ba7318747adab2b5f6d9ee750c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 10:23:59 +0200
Subject: [PATCH 1780/2920] UserController: Apply permission
 config/application/users/show

refs #8826
---
 application/controllers/UserController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 788ee7708..571cc633e 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -29,6 +29,7 @@ class UserController extends AuthBackendController
      */
     public function listAction()
     {
+        $this->assertPermission('config/application/users/show');
         $backendNames = array_map(
             function ($b) { return $b->getName(); },
             $this->loadUserBackends('Icinga\Data\Selectable')
@@ -86,6 +87,7 @@ class UserController extends AuthBackendController
      */
     public function showAction()
     {
+        $this->assertPermission('config/application/users/show');
         $userName = $this->params->getRequired('user');
         $backend = $this->getUserBackend($this->params->getRequired('backend'));
 

From 88ba718ffbacb55b63ba114da8c02f35dfefeed7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 10:26:43 +0200
Subject: [PATCH 1781/2920] UserController: Apply permission
 config/application/users/add

refs #8826
---
 application/controllers/UserController.php | 1 +
 application/views/scripts/user/list.phtml  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 571cc633e..ac0afc9a0 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -159,6 +159,7 @@ class UserController extends AuthBackendController
      */
     public function addAction()
     {
+        $this->assertPermission('config/application/users/add');
         $backend = $this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Extensible');
         $form = new UserForm();
         $form->setRedirectUrl(Url::fromPath('user/list', array('backend' => $backend->getName())));
diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index a1e4a6994..a6ba5f601 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -22,8 +22,8 @@ if ($backend === null) {
     echo $this->translate('No backend found which is able to list users') . '</div>';
     return;
 } else {
-    $extensible = $backend instanceof Extensible;
     $reducible = $backend instanceof Reducible;
+    $extensible = $this->hasPermission('config/application/users/add') && $backend instanceof Extensible;
 }
 
 if (count($users) > 0): ?>

From 01b790cf186f47021d152d0aa61f63313bcba287 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 10:27:48 +0200
Subject: [PATCH 1782/2920] UserController: Apply permission
 config/application/users/edit

refs #8826
---
 application/controllers/UserController.php | 1 +
 application/views/scripts/user/show.phtml  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index ac0afc9a0..cff627b6b 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -175,6 +175,7 @@ class UserController extends AuthBackendController
      */
     public function editAction()
     {
+        $this->assertPermission('config/application/users/edit');
         $userName = $this->params->getRequired('user');
         $backend = $this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Updatable');
 
diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index 1049a426a..4db1b0635 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -4,7 +4,7 @@ use Icinga\Data\Updatable;
 use Icinga\Data\Reducible;
 
 $editLink = null;
-if ($backend instanceof Updatable) {
+if ($this->hasPermission('config/application/users/edit') && $backend instanceof Updatable) {
     $editLink = $this->qlink(
         null,
         'user/edit',

From 0e37aad6cef695a0066c3fe8af9a89a80a318807 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 10:29:21 +0200
Subject: [PATCH 1783/2920] UserController: Apply permission
 config/application/users/remove

refs #8826
---
 application/controllers/UserController.php | 1 +
 application/views/scripts/user/list.phtml  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index cff627b6b..f2c2ba2d4 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -198,6 +198,7 @@ class UserController extends AuthBackendController
      */
     public function removeAction()
     {
+        $this->assertPermission('config/application/users/remove');
         $userName = $this->params->getRequired('user');
         $backend = $this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Reducible');
 
diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index a6ba5f601..51c0eb7b7 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -22,8 +22,8 @@ if ($backend === null) {
     echo $this->translate('No backend found which is able to list users') . '</div>';
     return;
 } else {
-    $reducible = $backend instanceof Reducible;
     $extensible = $this->hasPermission('config/application/users/add') && $backend instanceof Extensible;
+    $reducible = $this->hasPermission('config/application/users/remove') && $backend instanceof Reducible;
 }
 
 if (count($users) > 0): ?>

From e31c99be1cc6d88c937b43a2224be0ecdc5dd3c9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 10:30:42 +0200
Subject: [PATCH 1784/2920] GroupController: Apply permission
 config/application/groups/show

refs #8826
---
 application/controllers/GroupController.php |  2 ++
 application/views/scripts/user/show.phtml   | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 0df9da8f2..53bfa204c 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -29,6 +29,7 @@ class GroupController extends AuthBackendController
      */
     public function listAction()
     {
+        $this->assertPermission('config/application/groups/show');
         $backendNames = array_map(
             function ($b) { return $b->getName(); },
             $this->loadUserGroupBackends('Icinga\Data\Selectable')
@@ -86,6 +87,7 @@ class GroupController extends AuthBackendController
      */
     public function showAction()
     {
+        $this->assertPermission('config/application/groups/show');
         $groupName = $this->params->getRequired('group');
         $backend = $this->getUserGroupBackend($this->params->getRequired('backend'));
 
diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index 4db1b0635..1c8c41c8b 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -2,6 +2,7 @@
 
 use Icinga\Data\Updatable;
 use Icinga\Data\Reducible;
+use Icinga\Data\Selectable;
 
 $editLink = null;
 if ($this->hasPermission('config/application/users/edit') && $backend instanceof Updatable) {
@@ -52,12 +53,18 @@ if ($this->hasPermission('config/application/users/edit') && $backend instanceof
     <tbody>
     <?php foreach ($memberships as $membership): ?>
       <tr>
-        <td class="membership-group"><?= $this->qlink($membership->group_name, 'group/show', array(
-          'backend' => $membership->backend->getName(),
-          'group'   => $membership->group_name
-        ), array(
-          'title'   => sprintf($this->translate('Show detailed information for group %s'), $membership->group_name)
-        )); ?></td>
+        <td class="membership-group">
+         <?php if ($this->hasPermission('config/application/groups/show') && $membership->backend instanceof Selectable): ?>
+          <?= $this->qlink($membership->group_name, 'group/show', array(
+            'backend' => $membership->backend->getName(),
+            'group'   => $membership->group_name
+          ), array(
+            'title'   => sprintf($this->translate('Show detailed information for group %s'), $membership->group_name)
+          )); ?>
+         <?php else: ?>
+          <?= $this->escape($membership->group_name); ?>
+         <?php endif ?>
+        </td>
         <td class="membership-cancel" data-base-target="_self">
        <?php if ($membership->backend instanceof Reducible): ?>
           <?= $removeForm->setAction($this->url('group/removemember', array(

From fd2ecf395db1641754366e850c921b02097eb2a8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 10:32:09 +0200
Subject: [PATCH 1785/2920] GroupController: Apply permission
 config/application/groups/add

refs #8826
---
 application/controllers/GroupController.php | 1 +
 application/views/scripts/group/list.phtml  | 2 +-
 application/views/scripts/group/show.phtml  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 53bfa204c..fe8853a06 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -165,6 +165,7 @@ class GroupController extends AuthBackendController
      */
     public function addAction()
     {
+        $this->assertPermission('config/application/groups/add');
         $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Extensible');
         $form = new UserGroupForm();
         $form->setRedirectUrl(Url::fromPath('group/list', array('backend' => $backend->getName())));
diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
index c737af078..3ad65f624 100644
--- a/application/views/scripts/group/list.phtml
+++ b/application/views/scripts/group/list.phtml
@@ -22,8 +22,8 @@ if ($backend === null) {
     echo $this->translate('No backend found which is able to list groups') . '</div>';
     return;
 } else {
-    $extensible = $backend instanceof Extensible;
     $reducible = $backend instanceof Reducible;
+    $extensible = $this->hasPermission('config/application/groups/add') && $backend instanceof Extensible;
 }
 
 if (count($groups) > 0): ?>
diff --git a/application/views/scripts/group/show.phtml b/application/views/scripts/group/show.phtml
index 718dde255..61f793cb7 100644
--- a/application/views/scripts/group/show.phtml
+++ b/application/views/scripts/group/show.phtml
@@ -3,7 +3,7 @@
 use Icinga\Data\Extensible;
 use Icinga\Data\Updatable;
 
-$extensible = $backend instanceof Extensible;
+$extensible = $this->hasPermission('config/application/groups/add') && $backend instanceof Extensible;
 
 $editLink = null;
 if ($backend instanceof Updatable) {

From b58cd4747c103b7da0b25a196d75eec188bbf476 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 10:32:41 +0200
Subject: [PATCH 1786/2920] GroupController: Apply permission
 config/application/groups/edit

refs #8826
---
 application/controllers/GroupController.php | 1 +
 application/views/scripts/group/show.phtml  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index fe8853a06..0b752a854 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -181,6 +181,7 @@ class GroupController extends AuthBackendController
      */
     public function editAction()
     {
+        $this->assertPermission('config/application/groups/edit');
         $groupName = $this->params->getRequired('group');
         $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Updatable');
 
diff --git a/application/views/scripts/group/show.phtml b/application/views/scripts/group/show.phtml
index 61f793cb7..75895b908 100644
--- a/application/views/scripts/group/show.phtml
+++ b/application/views/scripts/group/show.phtml
@@ -6,7 +6,7 @@ use Icinga\Data\Updatable;
 $extensible = $this->hasPermission('config/application/groups/add') && $backend instanceof Extensible;
 
 $editLink = null;
-if ($backend instanceof Updatable) {
+if ($this->hasPermission('config/application/groups/edit') && $backend instanceof Updatable) {
     $editLink = $this->qlink(
         null,
         'group/edit',

From 0c9bac06865ffcafe4907dc5c80fd00b7f382dd3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 10:33:20 +0200
Subject: [PATCH 1787/2920] GroupController: Apply permission
 config/application/groups/remove

refs #8826
---
 application/controllers/GroupController.php | 3 ++-
 application/views/scripts/group/list.phtml  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 0b752a854..7c7b11da3 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -130,7 +130,7 @@ class GroupController extends AuthBackendController
         $this->view->members = $members;
         $this->createShowTabs($backend->getName(), $groupName)->activate('group/show');
 
-        if ($backend instanceof Reducible) {
+        if ($this->hasPermission('config/application/groups/remove') && $backend instanceof Reducible) {
             $removeForm = new Form();
             $removeForm->setUidDisabled();
             $removeForm->setAction(
@@ -206,6 +206,7 @@ class GroupController extends AuthBackendController
      */
     public function removeAction()
     {
+        $this->assertPermission('config/application/groups/remove');
         $groupName = $this->params->getRequired('group');
         $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Reducible');
 
diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
index 3ad65f624..49d8dc4c9 100644
--- a/application/views/scripts/group/list.phtml
+++ b/application/views/scripts/group/list.phtml
@@ -22,8 +22,8 @@ if ($backend === null) {
     echo $this->translate('No backend found which is able to list groups') . '</div>';
     return;
 } else {
-    $reducible = $backend instanceof Reducible;
     $extensible = $this->hasPermission('config/application/groups/add') && $backend instanceof Extensible;
+    $reducible = $this->hasPermission('config/application/groups/remove') && $backend instanceof Reducible;
 }
 
 if (count($groups) > 0): ?>

From 1517c72be17d7a4dc6247db6d3184211806ba544 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 10:34:10 +0200
Subject: [PATCH 1788/2920] GroupController: Apply permission
 config/application/groups/member/add

refs #8826
---
 application/controllers/GroupController.php | 1 +
 application/controllers/UserController.php  | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 7c7b11da3..9b16c9880 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -228,6 +228,7 @@ class GroupController extends AuthBackendController
      */
     public function addmemberAction()
     {
+        $this->assertPermission('config/application/groups/member/add');
         $groupName = $this->params->getRequired('group');
         $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Extensible');
 
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index f2c2ba2d4..8b926a44f 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -120,8 +120,12 @@ class UserController extends AuthBackendController
             $memberships
         );
 
-        $extensibleBackends = $this->loadUserGroupBackends('Icinga\Data\Extensible');
-        $this->view->showCreateMembershipLink = ! empty($extensibleBackends);
+        if ($this->hasPermission('config/application/groups/member/add')) {
+            $extensibleBackends = $this->loadUserGroupBackends('Icinga\Data\Extensible');
+            $this->view->showCreateMembershipLink = ! empty($extensibleBackends);
+        } else {
+            $this->view->showCreateMembershipLink = false;
+        }
 
         $this->view->user = $user;
         $this->view->backend = $backend;
@@ -220,6 +224,7 @@ class UserController extends AuthBackendController
      */
     public function createmembershipAction()
     {
+        $this->assertPermission('config/application/groups/member/add');
         $userName = $this->params->getRequired('user');
         $backend = $this->getUserBackend($this->params->getRequired('backend'));
 

From d157dec13b22f11f47be6af328be9ce7722943f8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 10:38:02 +0200
Subject: [PATCH 1789/2920] GroupController: Apply permission
 config/application/groups/member/remove

refs #8826
---
 application/controllers/GroupController.php |  3 +-
 application/controllers/UserController.php  | 50 +++++++++++----------
 application/views/scripts/user/show.phtml   |  2 +-
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 9b16c9880..2ae15c967 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -130,7 +130,7 @@ class GroupController extends AuthBackendController
         $this->view->members = $members;
         $this->createShowTabs($backend->getName(), $groupName)->activate('group/show');
 
-        if ($this->hasPermission('config/application/groups/remove') && $backend instanceof Reducible) {
+        if ($this->hasPermission('config/application/groups/member/remove') && $backend instanceof Reducible) {
             $removeForm = new Form();
             $removeForm->setUidDisabled();
             $removeForm->setAction(
@@ -255,6 +255,7 @@ class GroupController extends AuthBackendController
      */
     public function removememberAction()
     {
+        $this->assertPermission('config/application/groups/member/remove');
         $this->assertHttpMethod('POST');
         $groupName = $this->params->getRequired('group');
         $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Reducible');
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 8b926a44f..db60d4e96 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -132,30 +132,32 @@ class UserController extends AuthBackendController
         $this->view->memberships = $memberships;
         $this->createShowTabs($backend->getName(), $userName)->activate('user/show');
 
-        $removeForm = new Form();
-        $removeForm->setUidDisabled();
-        $removeForm->addElement('hidden', 'user_name', array(
-            'isArray'       => true,
-            'value'         => $userName,
-            'decorators'    => array('ViewHelper')
-        ));
-        $removeForm->addElement('hidden', 'redirect', array(
-            'value'         => Url::fromPath('user/show', array(
-                'backend'   => $backend->getName(),
-                'user'      => $userName
-            )),
-            'decorators'    => array('ViewHelper')
-        ));
-        $removeForm->addElement('button', 'btn_submit', array(
-            'escape'        => false,
-            'type'          => 'submit',
-            'class'         => 'link-like',
-            'value'         => 'btn_submit',
-            'decorators'    => array('ViewHelper'),
-            'label'         => $this->view->icon('trash'),
-            'title'         => $this->translate('Cancel this membership')
-        ));
-        $this->view->removeForm = $removeForm;
+        if ($this->hasPermission('config/application/groups/member/remove')) {
+            $removeForm = new Form();
+            $removeForm->setUidDisabled();
+            $removeForm->addElement('hidden', 'user_name', array(
+                'isArray'       => true,
+                'value'         => $userName,
+                'decorators'    => array('ViewHelper')
+            ));
+            $removeForm->addElement('hidden', 'redirect', array(
+                'value'         => Url::fromPath('user/show', array(
+                    'backend'   => $backend->getName(),
+                    'user'      => $userName
+                )),
+                'decorators'    => array('ViewHelper')
+            ));
+            $removeForm->addElement('button', 'btn_submit', array(
+                'escape'        => false,
+                'type'          => 'submit',
+                'class'         => 'link-like',
+                'value'         => 'btn_submit',
+                'decorators'    => array('ViewHelper'),
+                'label'         => $this->view->icon('trash'),
+                'title'         => $this->translate('Cancel this membership')
+            ));
+            $this->view->removeForm = $removeForm;
+        }
     }
 
     /**
diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index 1c8c41c8b..96af9224c 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -66,7 +66,7 @@ if ($this->hasPermission('config/application/users/edit') && $backend instanceof
          <?php endif ?>
         </td>
         <td class="membership-cancel" data-base-target="_self">
-       <?php if ($membership->backend instanceof Reducible): ?>
+       <?php if (isset($removeForm) && $membership->backend instanceof Reducible): ?>
           <?= $removeForm->setAction($this->url('group/removemember', array(
             'backend'   => $membership->backend->getName(),
             'group'     => $membership->group_name

From 8713f59e66642b68e6016b69beb22a66fcab6f52 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 10:38:35 +0200
Subject: [PATCH 1790/2920] AuthBackendController: Only show tabs the user is
 permitted to view

refs #8826
---
 .../Web/Controller/AuthBackendController.php  | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/library/Icinga/Web/Controller/AuthBackendController.php b/library/Icinga/Web/Controller/AuthBackendController.php
index 1f93de1c7..5b2a4f18e 100644
--- a/library/Icinga/Web/Controller/AuthBackendController.php
+++ b/library/Icinga/Web/Controller/AuthBackendController.php
@@ -138,24 +138,30 @@ class AuthBackendController extends Controller
     protected function createListTabs()
     {
         $tabs = $this->getTabs();
-        $tabs->add(
-            'user/list',
-            array(
-                'title'     => $this->translate('List users of authentication backends'),
-                'label'     => $this->translate('Users'),
-                'icon'      => 'user',
-                'url'       => 'user/list'
-            )
-        );
-        $tabs->add(
-            'group/list',
-            array(
-                'title'     => $this->translate('List groups of user group backends'),
-                'label'     => $this->translate('Groups'),
-                'icon'      => 'users',
-                'url'       => 'group/list'
-            )
-        );
+
+        if ($this->hasPermission('config/application/users/show')) {
+            $tabs->add(
+                'user/list',
+                array(
+                    'title'     => $this->translate('List users of authentication backends'),
+                    'label'     => $this->translate('Users'),
+                    'icon'      => 'user',
+                    'url'       => 'user/list'
+                )
+            );
+        }
+
+        if ($this->hasPermission('config/application/groups/show')) {
+            $tabs->add(
+                'group/list',
+                array(
+                    'title'     => $this->translate('List groups of user group backends'),
+                    'label'     => $this->translate('Groups'),
+                    'icon'      => 'users',
+                    'url'       => 'group/list'
+                )
+            );
+        }
 
         return $tabs;
     }

From e55d43418d228b1afe7ad2ba97cb239dccd209b5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 10:39:29 +0200
Subject: [PATCH 1791/2920] RoleForm: Add new permission sets for user and
 group management

refs #8826
---
 application/forms/Security/RoleForm.php | 28 ++++++++++++++++++-------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 07b09ce17..536a7efe0 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -21,14 +21,26 @@ class RoleForm extends ConfigForm
      * @var array
      */
     protected $providedPermissions = array(
-        '*'                                 => '*',
-        'config/*'                          => 'config/*',
-        'config/application/*'              => 'config/application/*',
-        'config/application/general'        => 'config/application/general',
-        'config/application/authentication' => 'config/application/authentication',
-        'config/application/resources'      => 'config/application/resources',
-        'config/application/roles'          => 'config/application/roles',
-        'config/modules'                    => 'config/modules'
+        '*'                                         => '*',
+        'config/*'                                  => 'config/*',
+        'config/application/*'                      => 'config/application/*',
+        'config/application/general'                => 'config/application/general',
+        'config/application/authentication'         => 'config/application/authentication',
+        'config/application/resources'              => 'config/application/resources',
+        'config/application/roles'                  => 'config/application/roles',
+        'config/application/users/*'                => 'config/application/users/*',
+        'config/application/users/show'             => 'config/application/users/show',
+        'config/application/users/add'              => 'config/application/users/add',
+        'config/application/users/edit'             => 'config/application/users/edit',
+        'config/application/users/remove'           => 'config/application/users/remove',
+        'config/application/groups/*'               => 'config/application/groups/*',
+        'config/application/groups/show'            => 'config/application/groups/show',
+        'config/application/groups/add'             => 'config/application/groups/add',
+        'config/application/groups/edit'            => 'config/application/groups/edit',
+        'config/application/groups/remove'          => 'config/application/groups/remove',
+        'config/application/groups/member/add'      => 'config/application/groups/member/add',
+        'config/application/groups/member/remove'   => 'config/application/groups/member/remove',
+        'config/modules'                            => 'config/modules'
     );
 
     /**

From 5aa9738b55b01ae3a04eaf4b3e7e4846ec35c6fb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 27 May 2015 10:44:52 +0200
Subject: [PATCH 1792/2920] Translate no permission for configuration error
 message

refs #6339
---
 application/controllers/ConfigController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 77b5b66d9..8df6620c2 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -85,7 +85,7 @@ class ConfigController extends Controller
     public function indexAction()
     {
         if ($this->firstAllowedAction === null) {
-            throw new SecurityException('No permission for configuration');
+            throw new SecurityException($this->translate('No permission for configuration'));
         }
         $action = $this->getTabs()->get($this->firstAllowedAction);
         if (substr($action->getUrl()->getPath(), 0, 7) === 'config/') {

From d8097d4a160bf416f1beb1a5eec33b796247eea1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 27 May 2015 10:46:20 +0200
Subject: [PATCH 1793/2920] Add missing return argument when removing an auth
 backend fails

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

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 8df6620c2..0606f8661 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -271,7 +271,7 @@ class ConfigController extends Controller
                     $configForm->remove($authBackend);
                 } catch (InvalidArgumentException $e) {
                     Notification::error($e->getMessage());
-                    return;
+                    return false;
                 }
 
                 if ($configForm->save()) {

From ee5cc63fbca492370a6817a12a831d461d6f5717 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 27 May 2015 10:48:27 +0200
Subject: [PATCH 1794/2920] Add missing return argument when removing a
 resource fails

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

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 0606f8661..5df2be008 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -352,7 +352,7 @@ class ConfigController extends Controller
                     $configForm->remove($resource);
                 } catch (InvalidArgumentException $e) {
                     Notification::error($e->getMessage());
-                    return;
+                    return false;
                 }
 
                 if ($configForm->save()) {

From ba8d7e0afd67aa5459b9112cb47a4777b1a85477 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 27 May 2015 10:49:34 +0200
Subject: [PATCH 1795/2920] Use Controller::translate() instead of just t()

refs #7330
---
 application/controllers/DashboardController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 325556be0..7e4ac479b 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -78,7 +78,7 @@ class DashboardController extends ActionController
         $dashboard = $this->dashboard;
         $form = new DashletForm();
         $form->setDashboard($dashboard);
-        $form->setSubmitLabel(t('Update Dashlet'));
+        $form->setSubmitLabel($this->translate('Update Dashlet'));
         if (! $this->_request->getParam('pane')) {
             throw new Zend_Controller_Action_Exception(
                 'Missing parameter "pane"',

From 49f89ee505cc977c439ccea457cffd200f6737e6 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 27 May 2015 10:59:35 +0200
Subject: [PATCH 1796/2920] Add missing return argument in the
 ResourceConfigForm

---
 application/forms/Config/ResourceConfigForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php
index 5d1eeaa9b..bfec65938 100644
--- a/application/forms/Config/ResourceConfigForm.php
+++ b/application/forms/Config/ResourceConfigForm.php
@@ -149,7 +149,7 @@ class ResourceConfigForm extends ConfigForm
             }
         } catch (InvalidArgumentException $e) {
             Notification::error($e->getMessage());
-            return;
+            return false;
         }
 
         if ($this->save()) {

From e025f59807626dea79a637a7e512a2a5973da9db Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 27 May 2015 11:05:06 +0200
Subject: [PATCH 1797/2920] Don't provide helpful error messages for
 unauthenticated users

fixes #6952
---
 application/controllers/ErrorController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index 0223a66b7..1c01b1672 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -37,7 +37,7 @@ class ErrorController extends ActionController
                 $path = array_shift($path);
                 $this->getResponse()->setHttpResponseCode(404);
                 $this->view->message = $this->translate('Page not found.');
-                if ($modules->hasInstalled($path) && ! $modules->hasEnabled($path)) {
+                if ($this->Auth()->isAuthenticated() && $modules->hasInstalled($path) && ! $modules->hasEnabled($path)) {
                     $this->view->message .= ' ' . sprintf(
                         $this->translate('Enabling the "%s" module might help!'),
                         $path

From 38cecdb724af28ce0e7d44a7b6829a187be5a0ad Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 27 May 2015 11:39:13 +0200
Subject: [PATCH 1798/2920] Setup Wizard: show how to add a system group
 "icingaweb2" and how to add the webserver's user to it

refs #8705
---
 .../views/scripts/form/setup-welcome.phtml    | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/modules/setup/application/views/scripts/form/setup-welcome.phtml b/modules/setup/application/views/scripts/form/setup-welcome.phtml
index 1b37f60f0..9a4c631fa 100644
--- a/modules/setup/application/views/scripts/form/setup-welcome.phtml
+++ b/modules/setup/application/views/scripts/form/setup-welcome.phtml
@@ -10,6 +10,39 @@ $configDir = Icinga::app()->getConfigDir();
 $setupTokenPath = rtrim($configDir, '/') . '/setup.token';
 $cliPath = realpath(Icinga::app()->getApplicationDir() . '/../bin/icingacli');
 
+$groupadd = null;
+$usermod = null;
+if (! (false === ($distro = Platform::getLinuxDistro(1)) || $distro === 'linux')) {
+    foreach (array(
+        'groupadd -r icingaweb2' => array(
+            'redhat', 'rhel', 'centos', 'fedora',
+            'suse', 'sles', 'sled', 'opensuse'
+        ),
+        'addgroup --system icingaweb2' => array('debian', 'ubuntu')
+    ) as $groupadd_ => $distros) {
+        if (in_array($distro, $distros)) {
+            $groupadd = $groupadd_;
+            break;
+        }
+    }
+
+    foreach (array(
+        'usermod -a -G icingaweb2 apache' => array(
+            'redhat', 'rhel', 'centos', 'fedora'
+        ),
+        'usermod -A icingaweb2 wwwrun' => array(
+            'suse', 'sles', 'sled', 'opensuse'
+        ),
+        'usermod -a -G icingaweb2 www-data' => array(
+            'debian', 'ubuntu'
+        )
+    ) as $usermod_ => $distros) {
+        if (in_array($distro, $distros)) {
+            $usermod = $usermod_;
+            break;
+        }
+    }
+}
 ?>
 <div class="welcome-page">
   <h2><?= $this->translate('Welcome to the configuration of Icinga Web 2!') ?></h2>
@@ -51,6 +84,12 @@ $cliPath = realpath(Icinga::app()->getApplicationDir() . '/../bin/icingacli');
         <li><?= $this->translate('Your webserver\'s user is a member of the system group "icingaweb2"'); ?></li>
         <?php endif ?>
       </ul>
+      <?php if (! ($groupadd === null || $usermod === null)) { ?>
+      <div class="code">
+        <span><?= $this->escape($groupadd . ';') ?></span>
+        <span><?= $this->escape($usermod . ';') ?></span>
+      </div>
+      <?php } ?>
       <p><?= $this->translate('If you\'ve got the IcingaCLI installed you can do the following:'); ?></p>
       <div class="code">
         <span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup config directory --group icingaweb2<?= $configDir !== '/etc/icingaweb2' ? ' --config ' . $configDir : ''; ?>;</span>

From 23b7ab07647a51b6d5c53deeab211c076bda5691 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 27 May 2015 11:47:18 +0200
Subject: [PATCH 1799/2920] DbRepository: Remove COLLATE from a query column in
 case of a pgsql connection

refs #8826
---
 library/Icinga/Repository/DbRepository.php | 85 ++++++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index a1fb800ee..f4c7c8332 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -64,14 +64,72 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      */
     protected $statementColumnMap;
 
+    /**
+     * List of columns where the COLLATE SQL-instruction has been removed
+     *
+     * This list is being populated in case of a PostgreSQL backend only,
+     * to ensure case-insensitive string comparison in WHERE clauses.
+     *
+     * @var array
+     */
+    protected $columnsWithoutCollation;
+
     /**
      * Create a new DB repository object
      *
+     * In case $this->queryColumns has already been initialized, this initializes
+     * $this->columnsWithoutCollation in case of a PostgreSQL connection.
+     *
      * @param   DbConnection    $ds     The datasource to use
      */
     public function __construct(DbConnection $ds)
     {
         parent::__construct($ds);
+
+        $this->columnsWithoutCollation = array();
+        if ($ds->getDbType() === 'pgsql' && $this->queryColumns !== null) {
+            $this->queryColumns = $this->removeCollateInstruction($this->queryColumns);
+        }
+    }
+
+    /**
+     * Return the query columns being provided
+     *
+     * Initializes $this->columnsWithoutCollation in case of a PostgreSQL connection.
+     *
+     * @return  array
+     */
+    public function getQueryColumns()
+    {
+        if ($this->queryColumns === null) {
+            $this->queryColumns = parent::getQueryColumns();
+            if ($this->ds->getDbType() === 'pgsql') {
+                $this->queryColumns = $this->removeCollateInstruction($this->queryColumns);
+            }
+        }
+
+        return $this->queryColumns;
+    }
+
+    /**
+     * Remove each COLLATE SQL-instruction from all given query columns
+     *
+     * @param   array   $queryColumns
+     *
+     * @return  array                   $queryColumns, the updated version
+     */
+    protected function removeCollateInstruction($queryColumns)
+    {
+        foreach ($queryColumns as & $columns) {
+            foreach ($columns as & $column) {
+                $column = preg_replace('/ COLLATE .+$/', '', $column, -1, $count);
+                if ($count > 0) {
+                    $this->columnsWithoutCollation[] = $column;
+                }
+            }
+        }
+
+        return $queryColumns;
     }
 
     /**
@@ -281,6 +339,33 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
         return $this->prependTablePrefix($table);
     }
 
+    /**
+     * Recurse the given filter, require each column for the given table and convert all values
+     *
+     * In case of a PostgreSQL connection, this applies LOWER() on the column and strtolower()
+     * on the value if a COLLATE SQL-instruction is part of the resolved column.
+     *
+     * @param   string  $table
+     * @param   Filter  $filter
+     */
+    public function requireFilter($table, Filter $filter)
+    {
+        parent::requireFilter($table, $filter);
+
+        if ($filter->isExpression()) {
+            $column = $filter->getColumn();
+            if (in_array($column, $this->columnsWithoutCollation) && strpos($column, 'LOWER') !== 0) {
+                $filter->setColumn('LOWER(' . $column . ')');
+                $expression = $filter->getExpression();
+                if (is_array($expression)) {
+                    $filter->setExpression(array_map('strtolower', $expression));
+                } else {
+                    $filter->setExpression(strtolower($expression));
+                }
+            }
+        }
+    }
+
     /**
      * Return this repository's query columns of the given table mapped to their respective aliases
      *

From cbf37bf90e7bae3bd7285838f3388c949926f896 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 27 May 2015 13:19:50 +0200
Subject: [PATCH 1800/2920] Inherit from Icinga\Web\Controller

fixes #9317
---
 application/controllers/ListController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index 4271e385a..5e937d91b 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use Icinga\Module\Monitoring\Controller;
+use Icinga\Web\Controller;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 use Icinga\Web\Widget\Tabextension\OutputFormat;

From cba36ec01749c50c8de44be3022809fe818e885f Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 27 May 2015 15:13:53 +0200
Subject: [PATCH 1801/2920] Ignore the preferences' loadability during
 authentication

fixes #8956
---
 library/Icinga/Authentication/Manager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 993475636..5705b493b 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -70,7 +70,7 @@ class Manager
                     $user
                 );
                 $preferences = new Preferences($preferencesStore->load());
-            } catch (NotReadableError $e) {
+            } catch (Exception $e) {
                 Logger::error(
                     new IcingaException(
                         'Cannot load preferences for user "%s". An exception was thrown',

From e06225fcf16eaf28a5d98120113ed5efb7d2b53c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 27 May 2015 11:45:00 +0200
Subject: [PATCH 1802/2920] monitoring: Fix that searching for specific columns
 is no longer possible if default search columns are set

---
 library/Icinga/Web/Widget/FilterEditor.php | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 2d64e4c2b..dd84a5e52 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -216,25 +216,22 @@ class FilterEditor extends AbstractWidget
         $filter = $this->getFilter();
 
         if ($search !== null) {
-            if (empty($this->searchColumns)) {
-                if (strpos($search, '=') === false) {
-                    Notification::error(mt('monitoring', 'Cannot search here'));
-                    return $this;
-                } else {
-                    list($k, $v) = preg_split('/=/', $search);
-                    $filter = $this->mergeRootExpression($filter, trim($k), '=', ltrim($v));
-                }
-            } else {
-                if (false === $this->resetSearchColumns($filter)) {
+            if (strpos($search, '=') !== false) {
+                list($k, $v) = preg_split('/=/', $search);
+                $filter = $this->mergeRootExpression($filter, trim($k), '=', ltrim($v));
+            } elseif (! empty($this->searchColumns)) {
+                if (! $this->resetSearchColumns($filter)) {
                     $filter = Filter::matchAll();
                 }
-
                 $filters = array();
                 $search = ltrim($search);
                 foreach ($this->searchColumns as $searchColumn) {
                     $filters[] = Filter::expression($searchColumn, '=', "*$search*");
                 }
                 $filter->andFilter(new FilterOr($filters));
+            } else {
+                Notification::error(mt('monitoring', 'Cannot search here'));
+                return $this;
             }
 
             $url = $this->url()->setQueryString(

From 2833f9edcc4896e501ae991bbf549c2cbe722d98 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 28 May 2015 09:44:01 +0200
Subject: [PATCH 1803/2920] Disable all form controls on submit to prevent
 resubmission

fixes #7151
---
 public/js/icinga/events.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index cc927feb6..84354c960 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -274,6 +274,10 @@
                 }
             }
 
+            // Disable all form controls to prevent resubmission except for our search input
+            // Note that disabled form inputs will not be enabled via JavaScript again
+            $form.find(':input:not(#search):not(:disabled)').prop('disabled', true);
+
             icinga.loader.loadUrl(url, $target, data, method);
 
             return false;

From 344e17a6053ce036f7828b850c86cd89a90144fb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 28 May 2015 10:33:13 +0200
Subject: [PATCH 1804/2920] monitoring: Fix command links when showing multiple
 selected hosts

fixes #9327
---
 .../monitoring/application/controllers/HostsController.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 20ae71e6b..8f88330aa 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -131,13 +131,12 @@ class Monitoring_HostsController extends Controller
         $this->view->objects = $this->hostList;
         $this->view->unhandledObjects = $this->hostList->getUnhandledObjects();
         $this->view->problemObjects = $this->hostList->getProblemObjects();
-
         $this->view->acknowledgeUnhandledLink = Url::fromPath('monitoring/hosts/acknowledge-problem')
-            ->setQueryString($this->hostList->getUnhandledObjects()->objectsFilter());
+            ->setQueryString($this->hostList->getUnhandledObjects()->objectsFilter()->toQueryString());
         $this->view->downtimeUnhandledLink = Url::fromPath('monitoring/hosts/schedule-downtime')
-            ->setQueryString($this->hostList->getUnhandledObjects()->objectsFilter());
+            ->setQueryString($this->hostList->getUnhandledObjects()->objectsFilter()->toQueryString());
         $this->view->downtimeLink = Url::fromPath('monitoring/hosts/schedule-downtime')
-            ->setQueryString($this->hostList->getProblemObjects()->objectsFilter());
+            ->setQueryString($this->hostList->getProblemObjects()->objectsFilter()->toQueryString());
         $this->view->acknowledgedObjects = $this->hostList->getAcknowledgedObjects();
         $this->view->objectsInDowntime = $this->hostList->getObjectsInDowntime();
         $this->view->inDowntimeLink = Url::fromPath('monitoring/list/hosts')

From 8dc79a388aa092d7893b60b47eb89e817895e025 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 28 May 2015 10:42:18 +0200
Subject: [PATCH 1805/2920] Update resource documentation with the ssh resource
 configuration

refs #7595
---
 doc/resources.md | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/doc/resources.md b/doc/resources.md
index 29a35c30d..70255a201 100644
--- a/doc/resources.md
+++ b/doc/resources.md
@@ -8,7 +8,7 @@ different files, when the information about a data source changes.
 
 Each section in **config/resources.ini** represents a data source with the section name being the identifier used to
 reference this specific data source. Depending on the data source type, the sections define different directives.
-The available data source types are *db*, *ldap* and *livestatus* which will described in detail in the following
+The available data source types are *db*, *ldap*, *ssh* and *livestatus* which will described in detail in the following
 paragraphs.
 
 ### <a id="resources-configuration-database"></a> Database
@@ -64,6 +64,26 @@ bind_dn   = "cn=admin,ou=people,dc=icinga,dc=org"
 bind_pw   = admin`
 ````
 
+### <a id="resources-configuration-ssh"></a> SSH
+
+A SSH resource contains the information about the user and the private key location, which can be used for the key-based
+ssh authentication.
+
+Directive           | Description
+--------------------|------------
+**type**            | `ssh`
+**user**            | The username to use when connecting to the server.
+**identity_key**    | The path to the private key of the user.
+
+**Example:**
+
+````
+[ssh]
+type                = "ssh"
+user                = "ssh-user"
+identity_key        = "/etc/icingaweb2/ssh/ssh-user"
+````
+
 ### <a id="resources-configuration-livestatus"></a> Livestatus
 
 A Livestatus resource represents the location of a Livestatus socket which is used for fetching monitoring data.

From 9fdf2a215cbaf640abf69306f35dc92667df6eea Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 28 May 2015 10:43:30 +0200
Subject: [PATCH 1806/2920] Update instance documentation with the usage of a
 ssh resource

refs #7595
---
 modules/monitoring/doc/instances.md | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/doc/instances.md b/modules/monitoring/doc/instances.md
index dd04ea30c..6c139cd05 100644
--- a/modules/monitoring/doc/instances.md
+++ b/modules/monitoring/doc/instances.md
@@ -3,7 +3,8 @@
 ## Abstract
 
 The instance.ini defines how icingaweb accesses the command pipe of your icinga process in order to submit external
-commands. When you are at the root of your icingaweb installation you can find it under ./config/modules/monitoring/instances.ini.
+commands. Depending on the config path (default: /etc/icingaweb2) of your icingaweb installation you can find it
+under ./modules/monitoring/instances.ini.
 
 ## Syntax
 
@@ -33,5 +34,22 @@ setup key authentication at the endpoint and allow your icingweb's user to acces
     port=22                                  ; the port to use (22 if none is given)
     user=jdoe                                ; the user to authenticate with
 
+You can also make use of the ssh resource for accessing an icinga pipe with key-based authentication, which will give
+you the possibility to define the location of the private key for a specific user, let's have a look:
+
+    [icinga]
+    path=/usr/local/icinga/var/rw/icinga.cmd ; the path on the remote machine where the icinga.cmd can be found
+    host=my.remote.machine.com               ; the hostname or address of the remote machine
+    port=22                                  ; the port to use (22 if none is given)
+    resource=ssh                             ; the ssh resource which contains the username and the location of the private key
+
+And the associated ssh resource:
+
+    [ssh]
+    type                = "ssh"
+    user                = "ssh-user"
+    identity_key        = "/etc/icingaweb2/ssh/ssh-user"
+
+
 
 

From bf21f556568c0e96079ba51488ce6e1b4b117d8e Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 28 May 2015 10:44:58 +0200
Subject: [PATCH 1807/2920] Add a new ssh resource form

refs #7595
---
 .../forms/Config/Resource/SshResourceForm.php | 147 ++++++++++++++++++
 library/Icinga/Util/File.php                  |   2 +-
 2 files changed, 148 insertions(+), 1 deletion(-)
 create mode 100644 application/forms/Config/Resource/SshResourceForm.php

diff --git a/application/forms/Config/Resource/SshResourceForm.php b/application/forms/Config/Resource/SshResourceForm.php
new file mode 100644
index 000000000..ebebada34
--- /dev/null
+++ b/application/forms/Config/Resource/SshResourceForm.php
@@ -0,0 +1,147 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Forms\Config\Resource;
+
+use Icinga\Application\Icinga;
+use Icinga\Data\ConfigObject;
+use Icinga\Forms\Config\ResourceConfigForm;
+use Icinga\Web\Form;
+use Icinga\Util\File;
+use Zend_Validate_Callback;
+
+/**
+ * Form class for adding/modifying ssh identity resources
+ */
+class SshResourceForm extends Form
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_resource_ssh');
+    }
+
+    /**
+     * @see Form::createElements()
+     */
+    public function createElements(array $formData)
+    {
+        $this->addElement(
+            'text',
+            'name',
+            array(
+                'required'      => true,
+                'label'         => $this->translate('Resource Name'),
+                'description'   => $this->translate('The unique name of this resource')
+            )
+        );
+        $this->addElement(
+            'text',
+            'user',
+            array(
+                'required'      => true,
+                'label'         => $this->translate('User'),
+                'description'   => $this->translate(
+                    'User to log in as on the remote Icinga instance. Please note that key-based SSH login must be'
+                    . ' possible for this user'
+                )
+            )
+        );
+
+        if ($this->getRequest()->getActionName() != 'editresource') {
+
+            $callbackValidator = new Zend_Validate_Callback(function ($value) {
+                if (openssl_pkey_get_private($value) === false) {
+                    return false;
+                }
+                return true;
+            });
+            $callbackValidator->setMessage(
+                $this->translate('The given SSH key is invalid'),
+                Zend_Validate_Callback::INVALID_VALUE
+            );
+
+            $this->addElement(
+                'textarea',
+                'identity_key',
+                array(
+                    'required'      => true,
+                    'label'         => $this->translate('Private Key'),
+                    'description'   => $this->translate('The private key which will be used for the SSH connections'),
+                    'class'         => 'resource ssh-identity',
+                    'validators'    => array($callbackValidator)
+                )
+            );
+        } else {
+            $resourceName = $formData['name'];
+            $this->addElement(
+                'note',
+                'identity_key_note',
+                array(
+                    'escape'        => false,
+                    'label'         => $this->translate('Private Key'),
+                    'value'         => sprintf(
+                        '<a href="%1$s" data-base-target="_next" title="%2$s" aria-label="%2$s">%3$s</a>',
+                        $this->getView()->url('config/removeresource', array('resource' => $resourceName)),
+                        sprintf($this->translate(
+                            'Remove the %s resource'
+                        ), $resourceName),
+                        $this->translate('To modify the private key you must recreate this resource.')
+                    )
+                )
+            );
+        }
+
+        return $this;
+    }
+
+    /**
+     * Remove the assigned key to the resource
+     *
+     * @param ConfigObject $config
+     *
+     * @return bool
+     */
+    public static function beforeRemove(ConfigObject $config)
+    {
+        $file = $config->identity_key;
+
+        if (file_exists($file)) {
+            unlink($file);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Creates the assigned key to the resource
+     *
+     * @param ResourceConfigForm $form
+     *
+     * @return bool
+     */
+    public static function beforeAdd(ResourceConfigForm $form)
+    {
+        $configDir = Icinga::app()->getConfigDir();
+        $user = $form->getElement('user')->getValue();
+
+        $filePath = $configDir . '/ssh/' . $user;
+
+        if (! file_exists($filePath)) {
+            $file = File::create($filePath, 0600);
+        } else {
+            $form->error(
+                sprintf($form->translate('The private key for the user "%s" is already exists.'), $user)
+            );
+            return false;
+        }
+
+        $file->fwrite($form->getElement('identity_key')->getValue());
+
+        $form->getElement('identity_key')->setValue($configDir . '/ssh/' . $user);
+
+        return true;
+    }
+}
diff --git a/library/Icinga/Util/File.php b/library/Icinga/Util/File.php
index 8dd436137..58104e2cc 100644
--- a/library/Icinga/Util/File.php
+++ b/library/Icinga/Util/File.php
@@ -63,7 +63,7 @@ class File extends SplFileObject
             throw new NotWritableError(sprintf('Path "%s" is not writable', $dirPath));
         }
 
-        $file = new static($path, 'x');
+        $file = new static($path, 'x+');
 
         if (! @chmod($path, $accessMode)) {
             $error = error_get_last();

From b2e61a2ebde015f8ff5c5219b50498785375ea98 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 28 May 2015 10:45:57 +0200
Subject: [PATCH 1808/2920] Add resource teaxtarea css styling for ssh-identity

refs #7595
---
 public/css/icinga/forms.less | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index c8b5df161..f1483b600 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -215,6 +215,13 @@ textarea {
   height: 4em;
 }
 
+textarea.resource {
+  &.ssh-identity {
+    width: 50%;
+    height: 25em;
+  }
+}
+
 form .description {
   font-size: 0.8em;
   margin: 0.3em 0 0 0.6em;

From 6c44f6a11a1154a9678257601071ed3c813e5799 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 28 May 2015 10:47:44 +0200
Subject: [PATCH 1809/2920] Deduplicate url-attribute parsing code

Use function to fetch all host links in MonitoredObject instead.
---
 .../scripts/show/components/actions.phtml     | 26 +++++++------------
 .../Monitoring/Object/MonitoredObject.php     | 13 ++++++++++
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/actions.phtml b/modules/monitoring/application/views/scripts/show/components/actions.phtml
index 35077abc0..18f8a8482 100644
--- a/modules/monitoring/application/views/scripts/show/components/actions.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/actions.phtml
@@ -1,29 +1,21 @@
 <?php
-
-$links = array();
+use Icinga\Module\Monitoring\Object\MonitoredObject;
 
 // add warning to links that open in new tabs to improve accessibility, as recommended by WCAG20 G201
 $newTabInfo = sprintf('<span class="info-box display-on-hover"> %s </span>', $this->translate('opens in new window'));
 
-$linkText = '<a href="%s" target="_blank">%s ' . $newTabInfo . '</a>';
-$localLinkText = '<a href="%s">%s</a>';
-
-if ($object->action_url) {
-    if (strpos($object->action_url, "' ") === false) {
-        $links[] = sprintf($linkText, $this->resolveMacros($object->action_url, $object), 'Action');
-    } else {
-        // TODO: We should find out document what's going on here. Looks strange :p
-        foreach(explode("' ", $object->action_url) as $url) {
-            $url = strpos($url, "'") === 0 ? substr($url, 1) : $url;
-            $url = strrpos($url, "'") === strlen($url) - 1 ? substr($url, 0, strlen($url) - 1) : $url;
-            $links[] = sprintf($linkText, $this->resolveMacros($url, $object), 'Action');
-        }
-    }
+$links = MonitoredObject::parseAttributeUrls($object->action_url);
+foreach ($links as $i => $link) {
+    $links[$i] = sprintf(
+        '<a href="%s" target="_blank">%s ' . $newTabInfo . '</a>',
+        $this->resolveMacros($object->action_url, $object),
+        'Action'
+    );
 }
 
 if (isset($this->actions)) {
     foreach ($this->actions as $id => $action) {
-        $links[] = sprintf($localLinkText, $action, $id);
+        $links[] = sprintf('<a href="%s">%s</a>', $action, $id);
     }
 }
 
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 236ca2aaa..37d29c82e 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -578,9 +578,22 @@ abstract class MonitoredObject implements Filterable
      */
     public function getNotesUrls() {}
 
+    /**
+     * Get all action urls configured for this monitored object
+     *
+     * @return array    All note urls as a string
+     */
+    public function getActionUrls()
+    {
+        return MonitoredObject::parseAttributeUrls($this->action_url);
+    }
+
     /**
      * Parse the content of the action_url or notes_url attributes
      *
+     * Find all occurences of http links, separated by whitespaces and quoted
+     * by single or double-ticks.
+     *
      * @link http://docs.icinga.org/latest/de/objectdefinitions.html
      *
      * @param   string  $urlString  A string containing one or more urls

From 558120e23bf82d152d512b3207f89e626d6addab Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 28 May 2015 10:50:13 +0200
Subject: [PATCH 1810/2920] Add resource ssh usage to resources and instances

refs #7595
---
 .../forms/Config/ResourceConfigForm.php       |  19 ++-
 .../Config/Instance/RemoteInstanceForm.php    | 115 ++++++++++++++++--
 .../forms/Config/InstanceConfigForm.php       |   5 +
 3 files changed, 125 insertions(+), 14 deletions(-)

diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php
index 5d1eeaa9b..92ee63476 100644
--- a/application/forms/Config/ResourceConfigForm.php
+++ b/application/forms/Config/ResourceConfigForm.php
@@ -10,6 +10,7 @@ use Icinga\Forms\Config\Resource\DbResourceForm;
 use Icinga\Forms\Config\Resource\FileResourceForm;
 use Icinga\Forms\Config\Resource\LdapResourceForm;
 use Icinga\Forms\Config\Resource\LivestatusResourceForm;
+use Icinga\Forms\Config\Resource\SshResourceForm;
 use Icinga\Application\Platform;
 use Icinga\Exception\ConfigurationError;
 
@@ -41,6 +42,8 @@ class ResourceConfigForm extends ConfigForm
             return new LivestatusResourceForm();
         } elseif ($type === 'file') {
             return new FileResourceForm();
+        } elseif ($type === 'ssh') {
+            return new SshResourceForm();
         } else {
             throw new InvalidArgumentException(sprintf($this->translate('Invalid resource type "%s" provided'), $type));
         }
@@ -55,7 +58,7 @@ class ResourceConfigForm extends ConfigForm
      *
      * @return  $this
      *
-     * @thrwos  InvalidArgumentException    In case the resource does already exist
+     * @throws  InvalidArgumentException    In case the resource does already exist
      */
     public function add(array $values)
     {
@@ -116,6 +119,11 @@ class ResourceConfigForm extends ConfigForm
         }
 
         $resourceConfig = $this->config->getSection($name);
+        $resourceForm = $this->getResourceForm($resourceConfig->type);
+        if (method_exists($resourceForm, 'beforeRemove')) {
+            $resourceForm::beforeRemove($resourceConfig);
+        }
+
         $this->config->removeSection($name);
         return $resourceConfig;
     }
@@ -130,8 +138,9 @@ class ResourceConfigForm extends ConfigForm
      */
     public function onSuccess()
     {
+        $resourceForm = $this->getResourceForm($this->getElement('type')->getValue());
+
         if (($el = $this->getElement('force_creation')) === null || false === $el->isChecked()) {
-            $resourceForm = $this->getResourceForm($this->getElement('type')->getValue());
             if (method_exists($resourceForm, 'isValidResource') && false === $resourceForm::isValidResource($this)) {
                 $this->addElement($this->getForceCreationCheckbox());
                 return false;
@@ -141,6 +150,11 @@ class ResourceConfigForm extends ConfigForm
         $resource = $this->request->getQuery('resource');
         try {
             if ($resource === null) { // create new resource
+                if (method_exists($resourceForm, 'beforeAdd')) {
+                    if (! $resourceForm::beforeAdd($this)) {
+                        return false;
+                    }
+                }
                 $this->add($this->getValues());
                 $message = $this->translate('Resource "%s" has been successfully created');
             } else { // edit existing resource
@@ -212,6 +226,7 @@ class ResourceConfigForm extends ConfigForm
         $resourceTypes = array(
             'file'          => $this->translate('File'),
             'livestatus'    => 'Livestatus',
+            'ssh'           => $this->translate('SSH Identity'),
         );
         if ($resourceType === 'ldap' || Platform::extensionLoaded('ldap')) {
             $resourceTypes['ldap'] = 'LDAP';
diff --git a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
index 8a1a34b40..244bf66d1 100644
--- a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
@@ -3,10 +3,19 @@
 
 namespace Icinga\Module\Monitoring\Forms\Config\Instance;
 
+use Icinga\Data\ResourceFactory;
+use Icinga\Exception\ConfigurationError;
 use Icinga\Web\Form;
 
 class RemoteInstanceForm extends Form
 {
+    /**
+     * The available monitoring instance resources split by type
+     *
+     * @var array
+     */
+    protected $resources;
+
     /**
      * (non-PHPDoc)
      * @see Form::init() For the method documentation.
@@ -16,12 +25,89 @@ class RemoteInstanceForm extends Form
         $this->setName('form_config_monitoring_instance_remote');
     }
 
+    /**
+     * Load all available ssh identity resources
+     *
+     * @return $this
+     *
+     * @throws \Icinga\Exception\ConfigurationError
+     */
+    public function loadResources()
+    {
+        $resourceConfig = ResourceFactory::getResourceConfigs();
+
+        $resources = array();
+        foreach ($resourceConfig as $name => $resource) {
+            if ($resource->type === 'ssh') {
+                $resources['ssh'][$name] = $name;
+            }
+        }
+
+        if (empty($resources)) {
+            throw new ConfigurationError($this->translate('Could not find any valid monitoring instance resources'));
+        }
+
+        $this->resources = $resources;
+
+        return $this;
+    }
+
     /**
      * (non-PHPDoc)
      * @see Form::createElements() For the method documentation.
      */
     public function createElements(array $formData = array())
     {
+        $useResource = isset($formData['use_resource']) ? $formData['use_resource'] : $this->getValue('use_resource');
+
+        $this->addElement(
+            'checkbox',
+            'use_resource',
+            array(
+                'label'         => $this->translate('Use SSH Identity'),
+                'description'   => $this->translate('Make use of the ssh identity resource'),
+                'autosubmit'    => true,
+                'ignore'        => true
+            )
+        );
+
+        if ($useResource) {
+
+            $this->loadResources();
+
+            $decorators = static::$defaultElementDecorators;
+            array_pop($decorators); // Removes the HtmlTag decorator
+
+            $this->addElement(
+                'select',
+                'resource',
+                array(
+                    'required'      => true,
+                    'label'         => $this->translate('SSH Identity'),
+                    'description'   => $this->translate('The resource to use'),
+                    'decorators'    => $decorators,
+                    'multiOptions'  => $this->resources['ssh'],
+                    'value'         => current($this->resources['ssh']),
+                    'autosubmit'    => false
+                )
+            );
+            $resourceName = isset($formData['resource']) ? $formData['resource'] : $this->getValue('resource');
+            $this->addElement(
+                'note',
+                'resource_note',
+                array(
+                    'escape'        => false,
+                    'decorators'    => $decorators,
+                    'value'         => sprintf(
+                        '<a href="%1$s" data-base-target="_next" title="%2$s" aria-label="%2$s">%3$s</a>',
+                        $this->getView()->url('config/editresource', array('resource' => $resourceName)),
+                        sprintf($this->translate('Show the configuration of the %s resource'), $resourceName),
+                        $this->translate('Show resource configuration')
+                    )
+                )
+            );
+        }
+
         $this->addElements(array(
             array(
                 'text',
@@ -43,8 +129,11 @@ class RemoteInstanceForm extends Form
                     'description'   => $this->translate('SSH port to connect to on the remote Icinga instance'),
                     'value'         => 22
                 )
-            ),
-            array(
+            )
+        ));
+
+        if (! $useResource) {
+            $this->addElement(
                 'text',
                 'user',
                 array(
@@ -55,18 +144,20 @@ class RemoteInstanceForm extends Form
                         . ' possible for this user'
                     )
                 )
-            ),
+            );
+        }
+
+        $this->addElement(
+            'text',
+            'path',
             array(
-                'text',
-                'path',
-                array(
-                    'required'      => true,
-                    'label'         => $this->translate('Command File'),
-                    'value'         => '/var/run/icinga2/cmd/icinga2.cmd',
-                    'description'   => $this->translate('Path to the Icinga command file on the remote Icinga instance')
-                )
+                'required'      => true,
+                'label'         => $this->translate('Command File'),
+                'value'         => '/var/run/icinga2/cmd/icinga2.cmd',
+                'description'   => $this->translate('Path to the Icinga command file on the remote Icinga instance')
             )
-        ));
+        );
+
         return $this;
     }
 }
diff --git a/modules/monitoring/application/forms/Config/InstanceConfigForm.php b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
index b2baea89c..c44e480ac 100644
--- a/modules/monitoring/application/forms/Config/InstanceConfigForm.php
+++ b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
@@ -143,6 +143,11 @@ class InstanceConfigForm extends ConfigForm
 
             $instanceConfig = $this->config->getSection($instanceName)->toArray();
             $instanceConfig['name'] = $instanceName;
+
+            if (isset($instanceConfig['resource'])) {
+                $instanceConfig['use_resource'] = true;
+            }
+
             $this->populate($instanceConfig);
         }
     }

From a47d05a0381bb0c025de02f346412ac40b71a055 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 28 May 2015 10:51:56 +0200
Subject: [PATCH 1811/2920] Add identity key usage for a specific user in
 remote command

refs #7595
fixes #7447
---
 .../Command/Transport/RemoteCommandFile.php   | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
index 866497a5a..4bae550a8 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
@@ -4,6 +4,7 @@
 namespace Icinga\Module\Monitoring\Command\Transport;
 
 use Icinga\Application\Logger;
+use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;
 use Icinga\Module\Monitoring\Command\Exception\TransportException;
 use Icinga\Module\Monitoring\Command\IcingaCommand;
@@ -44,6 +45,13 @@ class RemoteCommandFile implements CommandTransportInterface
      */
     protected $user;
 
+    /**
+     * Path to the identity (private key) file for the key-based authentication
+     *
+     * @var string
+     */
+    protected $identityKey;
+
     /**
      * Path to the Icinga command file on the remote host
      *
@@ -137,6 +145,55 @@ class RemoteCommandFile implements CommandTransportInterface
         return $this->user;
     }
 
+    /**
+     * Set the path to the identity file
+     *
+     * @param string $identityKey
+     *
+     * @return $this
+     */
+    public function setIdentityKey($identityKey)
+    {
+        $this->identityKey = (string) $identityKey;
+        return $this;
+    }
+
+    /**
+     * Get the path to the identity path
+     *
+     * @return string
+     */
+    public function getIdentityKey()
+    {
+        return $this->identityKey;
+    }
+
+    /**
+     * Use a given resource to set the user and the key
+     *
+     * @param string
+     *
+     * @throws ConfigurationError
+     */
+    public function setResource($resource = null)
+    {
+        $config = ResourceFactory::getResourceConfig($resource);
+
+        if (! isset($config->user)) {
+            throw new ConfigurationError(
+                t("Can't send external Icinga Command. Remote user is missing")
+            );
+        }
+        if (! isset($config->identity_key)) {
+            throw new ConfigurationError(
+                t("Can't send external Icinga Command. The identity key for the remote user is missing")
+            );
+        }
+
+        $this->setUser($config->user);
+        $this->setIdentityKey($config->identity_key);
+    }
+
     /**
      * Set the path to the Icinga command file on the remote host
      *
@@ -192,6 +249,9 @@ class RemoteCommandFile implements CommandTransportInterface
         if (isset($this->user)) {
             $ssh .= sprintf(' -l %s', escapeshellarg($this->user));
         }
+        if (isset($this->identityKey)) {
+            $ssh .= sprintf(' -o StrictHostKeyChecking=no -i %s', escapeshellarg($this->identityKey));
+        }
         $ssh .= sprintf(
             ' %s "echo %s > %s" 2>&1', // Redirect stderr to stdout
             escapeshellarg($this->host),

From 646cffd62d615e6a4d716440a9f5728c19b87120 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 28 May 2015 12:22:57 +0200
Subject: [PATCH 1812/2920] monitoring: Remove the services tab when showing
 host or service details

refs #7998
---
 .../Web/Controller/MonitoredObjectController.php    | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 9d27b1268..7ac509d7b 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -181,19 +181,6 @@ 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 b3e0851b62d079c49d486b542c7845e662e88068 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 28 May 2015 12:24:00 +0200
Subject: [PATCH 1813/2920] monitoring: Remove the services tab when showing an
 object's history

refs #7998
---
 .../application/controllers/ShowController.php      | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index a8a4583d1..c26bb460f 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -228,19 +228,6 @@ 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 8dbb215e27e199e8522ab597a355d5c6a247b9cf Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 28 May 2015 12:25:31 +0200
Subject: [PATCH 1814/2920] monitoring: Remove services action from the
 ShowController

refs #7998
---
 .../application/controllers/ShowController.php     | 14 --------------
 .../application/views/scripts/show/services.phtml  |  8 --------
 2 files changed, 22 deletions(-)
 delete mode 100644 modules/monitoring/application/views/scripts/show/services.phtml

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index c26bb460f..538a75132 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -78,20 +78,6 @@ class Monitoring_ShowController extends Controller
         $this->setupPaginationControl($this->view->history, 50);
     }
 
-    public function servicesAction()
-    {
-        $this->setAutorefreshInterval(15);
-        $this->getTabs()->activate('services');
-        $this->_setParam('service', '');
-        // TODO: This used to be a hack and still is. Modifying query string here.
-        $_SERVER['QUERY_STRING'] = (string) $this->params->without('service')->set('limit', '');
-        $this->view->services = $this->view->action('services', 'list', 'monitoring', array(
-            'view'  => 'compact',
-            'sort'  => 'service_description',
-        ));
-        $this->fetchHostStats();
-    }
-
     protected function fetchHostStats()
     {
         $this->view->stats = $this->backend->select()->from('statusSummary', array(
diff --git a/modules/monitoring/application/views/scripts/show/services.phtml b/modules/monitoring/application/views/scripts/show/services.phtml
deleted file mode 100644
index d3a0c3ef8..000000000
--- a/modules/monitoring/application/views/scripts/show/services.phtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<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>
-<?= $services ?>

From e0fe6440d242398da3f5ea984b949facb2e1059e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 28 May 2015 12:26:22 +0200
Subject: [PATCH 1815/2920] monitoring: Show host's services in the next
 container

refs #7998
---
 .../partials/host/servicesummary.phtml        | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
index 04408808f..a851b7255 100644
--- a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
@@ -12,7 +12,7 @@ function urlAddFilterOptional($url, $filter, $optional) {
     return $url->setQueryString($f->toQueryString());
 }
 
-$selfUrl = Url::fromPath('monitoring/show/services', array('host' => $object->host_name));
+$selfUrl = Url::fromPath('monitoring/list/services', array('host' => $object->host_name));
 $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
 ?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
 <?php if ($object->stats->services_total): ?>
@@ -27,15 +27,18 @@ $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
     ),
     $selfUrl,
     null,
-    array('title' => sprintf(
-        $this->translatePlural(
-            'List all %u service on host %s',
-            'List all %u services on host %s',
-            $object->stats->services_total
+    array(
+        'title' => sprintf(
+            $this->translatePlural(
+                'List all %u service on host %s',
+                'List all %u services on host %s',
+                $object->stats->services_total
+            ),
+            $object->stats->services_total,
+            $object->host_name
         ),
-        $object->stats->services_total,
-        $object->host_name
-    ))
+        'data-base-target' => '_next'
+    )
 ); ?>
 <?php else: ?>
 <?= $this->translate('No services configured on this host'); ?>
@@ -151,4 +154,4 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
 </span>
 <?php endif ?>
 </span>
-</div>
\ No newline at end of file
+</div>

From 701fd817fd07077b6de7187e0f8ffa7e7371e6f8 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 28 May 2015 12:35:30 +0200
Subject: [PATCH 1816/2920] Vagrantfile: Update centos-6.5-64 to centos-6.6-64

Because the puppetlabs/centos-6.5-64-puppet vagrantbox is not anymore available
---
 Vagrantfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 86de14bb1..28ac3897d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -22,7 +22,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision :shell, :path => ".puppet/manifests/puppet.sh"
 
   config.vm.provider :virtualbox do |v, override|
-    override.vm.box = "puppetlabs/centos-6.5-64-puppet"
+    override.vm.box = "puppetlabs/centos-6.6-64-puppet"
 
     v.customize ["modifyvm", :id, "--memory", "1024"]
   end

From 903b02a13452353e07fa6250242db842a8254f65 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 27 May 2015 10:44:52 +0200
Subject: [PATCH 1817/2920] Translate no permission for configuration error
 message

refs #6339
---
 application/controllers/ConfigController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 77b5b66d9..8df6620c2 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -85,7 +85,7 @@ class ConfigController extends Controller
     public function indexAction()
     {
         if ($this->firstAllowedAction === null) {
-            throw new SecurityException('No permission for configuration');
+            throw new SecurityException($this->translate('No permission for configuration'));
         }
         $action = $this->getTabs()->get($this->firstAllowedAction);
         if (substr($action->getUrl()->getPath(), 0, 7) === 'config/') {

From bd5d6e966160728f1587471c5ef6116c975957dd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 27 May 2015 10:46:20 +0200
Subject: [PATCH 1818/2920] Add missing return argument when removing an auth
 backend fails

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

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 8df6620c2..0606f8661 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -271,7 +271,7 @@ class ConfigController extends Controller
                     $configForm->remove($authBackend);
                 } catch (InvalidArgumentException $e) {
                     Notification::error($e->getMessage());
-                    return;
+                    return false;
                 }
 
                 if ($configForm->save()) {

From a304645b1489ed721f3280ec93e396342b5d9e02 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 27 May 2015 10:48:27 +0200
Subject: [PATCH 1819/2920] Add missing return argument when removing a
 resource fails

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

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 0606f8661..5df2be008 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -352,7 +352,7 @@ class ConfigController extends Controller
                     $configForm->remove($resource);
                 } catch (InvalidArgumentException $e) {
                     Notification::error($e->getMessage());
-                    return;
+                    return false;
                 }
 
                 if ($configForm->save()) {

From c2d7f0577e3c931be9d6285638ac76b0d130c7cd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 27 May 2015 10:49:34 +0200
Subject: [PATCH 1820/2920] Use Controller::translate() instead of just t()

refs #7330
---
 application/controllers/DashboardController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 325556be0..7e4ac479b 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -78,7 +78,7 @@ class DashboardController extends ActionController
         $dashboard = $this->dashboard;
         $form = new DashletForm();
         $form->setDashboard($dashboard);
-        $form->setSubmitLabel(t('Update Dashlet'));
+        $form->setSubmitLabel($this->translate('Update Dashlet'));
         if (! $this->_request->getParam('pane')) {
             throw new Zend_Controller_Action_Exception(
                 'Missing parameter "pane"',

From 8b07a0e29a0253febe791cbf78974162f305e2cf Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 27 May 2015 10:59:35 +0200
Subject: [PATCH 1821/2920] Add missing return argument in the
 ResourceConfigForm

---
 application/forms/Config/ResourceConfigForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php
index 5d1eeaa9b..bfec65938 100644
--- a/application/forms/Config/ResourceConfigForm.php
+++ b/application/forms/Config/ResourceConfigForm.php
@@ -149,7 +149,7 @@ class ResourceConfigForm extends ConfigForm
             }
         } catch (InvalidArgumentException $e) {
             Notification::error($e->getMessage());
-            return;
+            return false;
         }
 
         if ($this->save()) {

From 124173f3c867c4a2cdf6e743344719fbb563a668 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 27 May 2015 11:05:06 +0200
Subject: [PATCH 1822/2920] Don't provide helpful error messages for
 unauthenticated users

fixes #6952
---
 application/controllers/ErrorController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index 0223a66b7..1c01b1672 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -37,7 +37,7 @@ class ErrorController extends ActionController
                 $path = array_shift($path);
                 $this->getResponse()->setHttpResponseCode(404);
                 $this->view->message = $this->translate('Page not found.');
-                if ($modules->hasInstalled($path) && ! $modules->hasEnabled($path)) {
+                if ($this->Auth()->isAuthenticated() && $modules->hasInstalled($path) && ! $modules->hasEnabled($path)) {
                     $this->view->message .= ' ' . sprintf(
                         $this->translate('Enabling the "%s" module might help!'),
                         $path

From 31400ea16a05a0c47efcdbf9ca8d2f37b23ef0cd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 27 May 2015 11:45:00 +0200
Subject: [PATCH 1823/2920] monitoring: Fix that searching for specific columns
 is no longer possible if default search columns are set

---
 library/Icinga/Web/Widget/FilterEditor.php | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 2d64e4c2b..dd84a5e52 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -216,25 +216,22 @@ class FilterEditor extends AbstractWidget
         $filter = $this->getFilter();
 
         if ($search !== null) {
-            if (empty($this->searchColumns)) {
-                if (strpos($search, '=') === false) {
-                    Notification::error(mt('monitoring', 'Cannot search here'));
-                    return $this;
-                } else {
-                    list($k, $v) = preg_split('/=/', $search);
-                    $filter = $this->mergeRootExpression($filter, trim($k), '=', ltrim($v));
-                }
-            } else {
-                if (false === $this->resetSearchColumns($filter)) {
+            if (strpos($search, '=') !== false) {
+                list($k, $v) = preg_split('/=/', $search);
+                $filter = $this->mergeRootExpression($filter, trim($k), '=', ltrim($v));
+            } elseif (! empty($this->searchColumns)) {
+                if (! $this->resetSearchColumns($filter)) {
                     $filter = Filter::matchAll();
                 }
-
                 $filters = array();
                 $search = ltrim($search);
                 foreach ($this->searchColumns as $searchColumn) {
                     $filters[] = Filter::expression($searchColumn, '=', "*$search*");
                 }
                 $filter->andFilter(new FilterOr($filters));
+            } else {
+                Notification::error(mt('monitoring', 'Cannot search here'));
+                return $this;
             }
 
             $url = $this->url()->setQueryString(

From 1bfbce98ac15d8aef13c02bb4b10d0fbbbbd5dab Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 28 May 2015 09:44:01 +0200
Subject: [PATCH 1824/2920] Disable all form controls on submit to prevent
 resubmission

fixes #7151
---
 public/js/icinga/events.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index cc927feb6..84354c960 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -274,6 +274,10 @@
                 }
             }
 
+            // Disable all form controls to prevent resubmission except for our search input
+            // Note that disabled form inputs will not be enabled via JavaScript again
+            $form.find(':input:not(#search):not(:disabled)').prop('disabled', true);
+
             icinga.loader.loadUrl(url, $target, data, method);
 
             return false;

From 5fdaa2cd7e95761dc9fa0e82e01cc01b317cee8b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 28 May 2015 10:33:13 +0200
Subject: [PATCH 1825/2920] monitoring: Fix command links when showing multiple
 selected hosts

fixes #9327
---
 .../monitoring/application/controllers/HostsController.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 20ae71e6b..8f88330aa 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -131,13 +131,12 @@ class Monitoring_HostsController extends Controller
         $this->view->objects = $this->hostList;
         $this->view->unhandledObjects = $this->hostList->getUnhandledObjects();
         $this->view->problemObjects = $this->hostList->getProblemObjects();
-
         $this->view->acknowledgeUnhandledLink = Url::fromPath('monitoring/hosts/acknowledge-problem')
-            ->setQueryString($this->hostList->getUnhandledObjects()->objectsFilter());
+            ->setQueryString($this->hostList->getUnhandledObjects()->objectsFilter()->toQueryString());
         $this->view->downtimeUnhandledLink = Url::fromPath('monitoring/hosts/schedule-downtime')
-            ->setQueryString($this->hostList->getUnhandledObjects()->objectsFilter());
+            ->setQueryString($this->hostList->getUnhandledObjects()->objectsFilter()->toQueryString());
         $this->view->downtimeLink = Url::fromPath('monitoring/hosts/schedule-downtime')
-            ->setQueryString($this->hostList->getProblemObjects()->objectsFilter());
+            ->setQueryString($this->hostList->getProblemObjects()->objectsFilter()->toQueryString());
         $this->view->acknowledgedObjects = $this->hostList->getAcknowledgedObjects();
         $this->view->objectsInDowntime = $this->hostList->getObjectsInDowntime();
         $this->view->inDowntimeLink = Url::fromPath('monitoring/list/hosts')

From 647dd9d4251efe04e9998d1740d3217bce6974c3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 28 May 2015 13:25:26 +0200
Subject: [PATCH 1826/2920] RepositoryQuery: Pass through the query when
 requiring a table or column

This allows now to adjust the query in custom repository implementations.

refs #8826
---
 library/Icinga/Repository/DbRepository.php    | 18 +++++---
 library/Icinga/Repository/Repository.php      | 44 +++++++++++--------
 library/Icinga/Repository/RepositoryQuery.php | 12 ++---
 3 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index f4c7c8332..433842a57 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -323,13 +323,15 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     /**
      * Validate that the requested table exists
      *
-     * @param   string  $table
+     * @param   string              $table      The table to validate
+     * @param   RepositoryQuery     $query      An optional query to pass as context
+     *                                          (unused by the base implementation)
      *
      * @return  string              The table's name, with the table prefix being prepended
      *
-     * @throws  ProgrammingError    In case the given table does not exist
+     * @throws  ProgrammingError                In case the given table does not exist
      */
-    public function requireTable($table)
+    public function requireTable($table, RepositoryQuery $query = null)
     {
         $statementColumns = $this->getStatementColumns();
         if (! isset($statementColumns[$table])) {
@@ -345,12 +347,14 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      * In case of a PostgreSQL connection, this applies LOWER() on the column and strtolower()
      * on the value if a COLLATE SQL-instruction is part of the resolved column.
      *
-     * @param   string  $table
-     * @param   Filter  $filter
+     * @param   string              $table      The table being filtered
+     * @param   Filter              $filter     The filter to recurse
+     * @param   RepositoryQuery     $query      An optional query to pass as context
+     *                                          (Directly passed through to $this->requireFilterColumn)
      */
-    public function requireFilter($table, Filter $filter)
+    public function requireFilter($table, Filter $filter, RepositoryQuery $query = null)
     {
-        parent::requireFilter($table, $filter);
+        parent::requireFilter($table, $filter, $query);
 
         if ($filter->isExpression()) {
             $column = $filter->getColumn();
diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index 8bc6517af..56f383f0c 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -592,13 +592,15 @@ abstract class Repository implements Selectable
     /**
      * Validate that the requested table exists
      *
-     * @param   string  $table
+     * @param   string              $table      The table to validate
+     * @param   RepositoryQuery     $query      An optional query to pass as context
+     *                                          (unused by the base implementation)
      *
-     * @return  string              The table's name, may differ from the given one
+     * @return  string                          The table's name, may differ from the given one
      *
-     * @throws  ProgrammingError    In case the given table does not exist
+     * @throws  ProgrammingError                In case the given table does not exist
      */
-    public function requireTable($table)
+    public function requireTable($table, RepositoryQuery $query = null)
     {
         $queryColumns = $this->getQueryColumns();
         if (! isset($queryColumns[$table])) {
@@ -611,18 +613,20 @@ abstract class Repository implements Selectable
     /**
      * Recurse the given filter, require each column for the given table and convert all values
      *
-     * @param   string  $table
-     * @param   Filter  $filter
+     * @param   string              $table      The table being filtered
+     * @param   Filter              $filter     The filter to recurse
+     * @param   RepositoryQuery     $query      An optional query to pass as context
+     *                                          (Directly passed through to $this->requireFilterColumn)
      */
-    public function requireFilter($table, Filter $filter)
+    public function requireFilter($table, Filter $filter, RepositoryQuery $query = null)
     {
         if ($filter->isExpression()) {
             $column = $filter->getColumn();
-            $filter->setColumn($this->requireFilterColumn($table, $column));
+            $filter->setColumn($this->requireFilterColumn($table, $column, $query));
             $filter->setExpression($this->persistColumn($column, $filter->getExpression()));
         } elseif ($filter->isChain()) {
             foreach ($filter->filters() as $chainOrExpression) {
-                $this->requireFilter($table, $chainOrExpression);
+                $this->requireFilter($table, $chainOrExpression, $query);
             }
         }
     }
@@ -707,14 +711,15 @@ abstract class Repository implements Selectable
     /**
      * Validate that the given column is a valid query target and return it or the actual name if it's an alias
      *
-     * @param   string  $table      The table where to look for the column or alias
-     * @param   string  $name       The name or alias of the column to validate
+     * @param   string              $table  The table where to look for the column or alias
+     * @param   string              $name   The name or alias of the column to validate
+     * @param   RepositoryQuery     $query  An optional query to pass as context (unused by the base implementation)
      *
-     * @return  string              The given column's name
+     * @return  string                      The given column's name
      *
-     * @throws  QueryException      In case the given column is not a valid query column
+     * @throws  QueryException              In case the given column is not a valid query column
      */
-    public function requireQueryColumn($table, $name)
+    public function requireQueryColumn($table, $name, RepositoryQuery $query = null)
     {
         if (in_array($name, $this->getFilterColumns())) {
             throw new QueryException(t('Filter column "%s" cannot be queried'), $name);
@@ -748,14 +753,15 @@ abstract class Repository implements Selectable
     /**
      * Validate that the given column is a valid filter target and return it or the actual name if it's an alias
      *
-     * @param   string  $table      The table where to look for the column or alias
-     * @param   string  $name       The name or alias of the column to validate
+     * @param   string              $table  The table where to look for the column or alias
+     * @param   string              $name   The name or alias of the column to validate
+     * @param   RepositoryQuery     $query  An optional query to pass as context (unused by the base implementation)
      *
-     * @return  string              The given column's name
+     * @return  string                      The given column's name
      *
-     * @throws  QueryException      In case the given column is not a valid filter column
+     * @throws  QueryException              In case the given column is not a valid filter column
      */
-    public function requireFilterColumn($table, $name)
+    public function requireFilterColumn($table, $name, RepositoryQuery $query = null)
     {
         if (($column = $this->resolveQueryColumnAlias($table, $name)) === null) {
             throw new QueryException(t('Filter column "%s" not found'), $name);
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index 4d87e5026..f92d7eb9f 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -76,7 +76,7 @@ class RepositoryQuery implements QueryInterface, Iterator
      */
     public function from($target, array $columns = null)
     {
-        $target = $this->repository->requireTable($target);
+        $target = $this->repository->requireTable($target, $this);
         $this->query = $this->repository
             ->getDataSource()
             ->select()
@@ -127,7 +127,7 @@ class RepositoryQuery implements QueryInterface, Iterator
         } else {
             $columns = array();
             foreach ($desiredColumns as $customAlias => $columnAlias) {
-                $resolvedColumn = $this->repository->requireQueryColumn($target, $columnAlias);
+                $resolvedColumn = $this->repository->requireQueryColumn($target, $columnAlias, $this);
                 if ($resolvedColumn !== $columnAlias) {
                     $columns[is_string($customAlias) ? $customAlias : $columnAlias] = $resolvedColumn;
                 } elseif (is_string($customAlias)) {
@@ -154,7 +154,7 @@ class RepositoryQuery implements QueryInterface, Iterator
     public function where($column, $value = null)
     {
         $this->query->where(
-            $this->repository->requireFilterColumn($this->target, $column),
+            $this->repository->requireFilterColumn($this->target, $column, $this),
             $this->repository->persistColumn($column, $value)
         );
         return $this;
@@ -186,7 +186,7 @@ class RepositoryQuery implements QueryInterface, Iterator
     public function setFilter(Filter $filter)
     {
         $filter = clone $filter;
-        $this->repository->requireFilter($this->target, $filter);
+        $this->repository->requireFilter($this->target, $filter, $this);
         $this->query->setFilter($filter);
         return $this;
     }
@@ -203,7 +203,7 @@ class RepositoryQuery implements QueryInterface, Iterator
     public function addFilter(Filter $filter)
     {
         $filter = clone $filter;
-        $this->repository->requireFilter($this->target, $filter);
+        $this->repository->requireFilter($this->target, $filter, $this);
         $this->query->addFilter($filter);
         return $this;
     }
@@ -268,7 +268,7 @@ class RepositoryQuery implements QueryInterface, Iterator
 
             try {
                 $this->query->order(
-                    $this->repository->requireFilterColumn($this->target, $column),
+                    $this->repository->requireFilterColumn($this->target, $column, $this),
                     $specificDirection ?: $baseDirection
                     // I would have liked the following solution, but hey, a coder should be allowed to produce crap...
                     // $specificDirection && (! $direction || $column !== $field) ? $specificDirection : $baseDirection

From 5326ce6bca17efe66a144d8afba56af3a66053fd Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 28 May 2015 13:44:51 +0200
Subject: [PATCH 1827/2920] DbRepository: Add support for table specific
 aliases

This was previously only possible for the base table and in case one wanted
to use table aliases in the query column definition for non-base tables as
well, it did not work well due to not being explicitly supported. Now, to use
such table aliases one must initialize DbRepository::tableAliases.

refs #8826
---
 library/Icinga/Repository/DbRepository.php | 136 +++++++++++++++------
 library/Icinga/Repository/Repository.php   |   4 +-
 2 files changed, 102 insertions(+), 38 deletions(-)

diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index 433842a57..f3b0c679c 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -17,6 +17,7 @@ use Icinga\Exception\StatementException;
  *
  * Additionally provided features:
  * <ul>
+ *  <li>Support for table aliases</li>
  *  <li>Automatic table prefix handling</li>
  *  <li>Insert, update and delete capabilities</li>
  *  <li>Differentiation between statement and query columns</li>
@@ -31,6 +32,17 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      */
     protected $ds;
 
+    /**
+     * The table aliases being applied
+     *
+     * This must be initialized by repositories which are going to make use of table aliases. Every table for which
+     * aliased columns are provided must be defined in this array using its name as key and the alias being used as
+     * value. Failure to do so will result in invalid queries.
+     *
+     * @var array
+     */
+    protected $tableAliases;
+
     /**
      * The statement columns being provided
      *
@@ -111,6 +123,32 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
         return $this->queryColumns;
     }
 
+    /**
+     * Return the table aliases to be applied
+     *
+     * Calls $this->initializeTableAliases() in case $this->tableAliases is null.
+     *
+     * @return  array
+     */
+    public function getTableAliases()
+    {
+        if ($this->tableAliases === null) {
+            $this->tableAliases = $this->initializeTableAliases();
+        }
+
+        return $this->tableAliases;
+    }
+
+    /**
+     * Overwrite this in your repository implementation in case you need to initialize the table aliases lazily
+     *
+     * @return  array
+     */
+    protected function initializeTableAliases()
+    {
+        return array();
+    }
+
     /**
      * Remove each COLLATE SQL-instruction from all given query columns
      *
@@ -166,9 +204,11 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     /**
      * Remove the datasource's prefix from the given table name and return the remaining part
      *
-     * @param   mixed   $table
+     * @param   array|string    $table
      *
-     * @return  mixed
+     * @return  array|string
+     *
+     * @throws  IcingaException         In case $table is not of a supported type
      */
     protected function removeTablePrefix($table)
     {
@@ -194,6 +234,45 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
         return $table;
     }
 
+    /**
+     * Return the given table with its alias being applied
+     *
+     * @param   array|string    $table
+     *
+     * @return  array|string
+     */
+    protected function applyTableAlias($table)
+    {
+        $tableAliases = $this->getTableAliases();
+        if (is_array($table) || !isset($tableAliases[($nonPrefixedTable = $this->removeTablePrefix($table))])) {
+            return $table;
+        }
+
+        return array($tableAliases[$nonPrefixedTable] => $table);
+    }
+
+    /**
+     * Return the given table with its alias being cleared
+     *
+     * @param   array|string    $table
+     *
+     * @return  string
+     *
+     * @throws  IcingaException         In case $table is not of a supported type
+     */
+    protected function clearTableAlias($table)
+    {
+        if (is_string($table)) {
+            return $table;
+        }
+
+        if (is_array($table)) {
+            return reset($table);
+        }
+
+        throw new IcingaException('Table alias handling for type "%s" is not supported', type($table));
+    }
+
     /**
      * Insert a table row with the given data
      *
@@ -323,11 +402,13 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     /**
      * Validate that the requested table exists
      *
+     * This will prepend the datasource's table prefix and will apply the table's alias, if any.
+     *
      * @param   string              $table      The table to validate
      * @param   RepositoryQuery     $query      An optional query to pass as context
      *                                          (unused by the base implementation)
      *
-     * @return  string              The table's name, with the table prefix being prepended
+     * @return  array|string
      *
      * @throws  ProgrammingError                In case the given table does not exist
      */
@@ -338,7 +419,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
             $table = parent::requireTable($table);
         }
 
-        return $this->prependTablePrefix($table);
+        return $this->prependTablePrefix($this->applyTableAlias($table));
     }
 
     /**
@@ -373,7 +454,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     /**
      * Return this repository's query columns of the given table mapped to their respective aliases
      *
-     * @param   mixed   $table
+     * @param   array|string    $table
      *
      * @return  array
      *
@@ -381,61 +462,48 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      */
     public function requireAllQueryColumns($table)
     {
-        if (is_array($table)) {
-            $table = array_shift($table);
-        }
-
-        return parent::requireAllQueryColumns($this->removeTablePrefix($table));
+        return parent::requireAllQueryColumns($this->removeTablePrefix($this->clearTableAlias($table)));
     }
 
     /**
      * Return the query column name for the given alias or null in case the alias does not exist
      *
-     * @param   mixed   $table
-     * @param   string  $alias
+     * @param   array|string    $table
+     * @param   string          $alias
      *
      * @return  string|null
      */
     public function resolveQueryColumnAlias($table, $alias)
     {
-        if (is_array($table)) {
-            $table = array_shift($table);
-        }
-
-        return parent::resolveQueryColumnAlias($this->removeTablePrefix($table), $alias);
+        return parent::resolveQueryColumnAlias($this->removeTablePrefix($this->clearTableAlias($table)), $alias);
     }
 
     /**
      * Return whether the given query column name or alias is available in the given table
      *
-     * @param   mixed   $table
-     * @param   string  $column
+     * @param   array|string    $table
+     * @param   string          $column
      *
      * @return  bool
      */
     public function validateQueryColumnAssociation($table, $column)
     {
-        if (is_array($table)) {
-            $table = array_shift($table);
-        }
-
-        return parent::validateQueryColumnAssociation($this->removeTablePrefix($table), $column);
+        return parent::validateQueryColumnAssociation(
+            $this->removeTablePrefix($this->clearTableAlias($table)),
+            $column
+        );
     }
 
     /**
      * Return the statement column name for the given alias or null in case the alias does not exist
      *
-     * @param   mixed   $table
+     * @param   string  $table
      * @param   string  $alias
      *
      * @return  string|null
      */
     public function resolveStatementColumnAlias($table, $alias)
     {
-        if (is_array($table)) {
-            $table = array_shift($table);
-        }
-
         $statementColumnMap = $this->getStatementColumnMap();
         if (isset($statementColumnMap[$alias])) {
             return $statementColumnMap[$alias];
@@ -450,17 +518,13 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     /**
      * Return whether the given alias or statement column name is available in the given table
      *
-     * @param   mixed   $table
+     * @param   string  $table
      * @param   string  $alias
      *
      * @return  bool
      */
     public function validateStatementColumnAssociation($table, $alias)
     {
-        if (is_array($table)) {
-            $table = array_shift($table);
-        }
-
         $statementTableMap = $this->getStatementTableMap();
         if (isset($statementTableMap[$alias])) {
             return $statementTableMap[$alias] === $this->removeTablePrefix($table);
@@ -473,7 +537,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     /**
      * Return whether the given column name or alias of the given table is a valid statement column
      *
-     * @param   mixed   $table  The table where to look for the column or alias
+     * @param   string  $table  The table where to look for the column or alias
      * @param   string  $name   The column name or alias to check
      *
      * @return  bool
@@ -493,7 +557,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     /**
      * Validate that the given column is a valid statement column and return it or the actual name if it's an alias
      *
-     * @param   mixed   $table      The table for which to require the column
+     * @param   string  $table      The table for which to require the column
      * @param   string  $name       The name or alias of the column to validate
      *
      * @return  string              The given column's name
diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index 56f383f0c..7fba11727 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -48,7 +48,7 @@ abstract class Repository implements Selectable
      *
      * This will be automatically set to the first key of $queryColumns if not explicitly set.
      *
-     * @var mixed
+     * @var string
      */
     protected $baseTable;
 
@@ -196,7 +196,7 @@ abstract class Repository implements Selectable
     /**
      * Return the base table name this repository is responsible for
      *
-     * @return  mixed
+     * @return  string
      *
      * @throws  ProgrammingError    In case no base table name has been set and
      *                               $this->queryColumns does not provide one either

From 58d78f59f3fa2b875ad67a620cfe8799d9a478cd Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 28 May 2015 13:49:36 +0200
Subject: [PATCH 1828/2920] DbQuery: Initialize self::$select as early as
 possible

I'd like to use Zend's implementation instead of re-inventing the wheel just
because someone decided to only work with a copy of it in the frameworks
query but do exactly the opposite in the monitoring module's IDO query...
---
 library/Icinga/Data/Db/DbQuery.php            | 21 +++++++++++--------
 .../Monitoring/Backend/Ido/Query/IdoQuery.php | 12 +----------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index c284f0e86..df90ef13c 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -8,7 +8,7 @@ use Icinga\Data\Filter\FilterChain;
 use Icinga\Data\Filter\FilterOr;
 use Icinga\Data\Filter\FilterAnd;
 use Icinga\Data\Filter\FilterNot;
-use Icinga\Exception\IcingaException;
+use Icinga\Exception\QueryException;
 use Zend_Db_Select;
 
 /**
@@ -66,6 +66,7 @@ class DbQuery extends SimpleQuery
     protected function init()
     {
         $this->db = $this->ds->getDbAdapter();
+        $this->select = $this->db->select();
         parent::init();
     }
 
@@ -75,6 +76,13 @@ class DbQuery extends SimpleQuery
         return $this;
     }
 
+    public function from($target, array $fields = null)
+    {
+        parent::from($target, $fields);
+        $this->select->from($this->target, array());
+        return $this;
+    }
+
     public function where($condition, $value = null)
     {
         // $this->count = $this->select = null;
@@ -83,9 +91,6 @@ class DbQuery extends SimpleQuery
 
     protected function dbSelect()
     {
-        if ($this->select === null) {
-            $this->select = $this->db->select()->from($this->target, array());
-        }
         return clone $this->select;
     }
 
@@ -151,7 +156,7 @@ class DbQuery extends SimpleQuery
                 $op = ' AND ';
                 $str .= ' NOT ';
             } else {
-                throw new IcingaException(
+                throw new QueryException(
                     'Cannot render filter: %s',
                     $filter
                 );
@@ -212,7 +217,7 @@ class DbQuery extends SimpleQuery
         if (! $value) {
             /*
             NOTE: It's too late to throw exceptions, we might finish in __toString
-            throw new IcingaException(sprintf(
+            throw new QueryException(sprintf(
                 '"%s" is not a valid time expression',
                 $value
             ));
@@ -318,9 +323,7 @@ class DbQuery extends SimpleQuery
 
     public function __clone()
     {
-        if ($this->select) {
-            $this->select = clone $this->select;
-        }
+        $this->select = clone $this->select;
     }
 
     /**
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index 9371399bc..0b436d7bf 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -415,21 +415,11 @@ abstract class IdoQuery extends DbQuery
         } elseif ($dbType === 'pgsql') {
             $this->initializeForPostgres();
         }
-        $this->dbSelect();
+        $this->joinBaseTables();
         $this->select->columns($this->columns);
-        //$this->joinBaseTables();
         $this->prepareAliasIndexes();
     }
 
-    protected function dbSelect()
-    {
-        if ($this->select === null) {
-            $this->select = $this->db->select();
-            $this->joinBaseTables();
-        }
-        return clone $this->select;
-    }
-
     /**
      * Join the base tables for this query
      */

From 119b2fdddb0d8dd15406581f28d51b52ae906b8d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 28 May 2015 13:52:00 +0200
Subject: [PATCH 1829/2920] DbQuery: Allow to join additional tables

This should just be the beginning of such additions, there is still a group(),
distinct(), etc missing..
---
 library/Icinga/Data/Db/DbQuery.php | 133 +++++++++++++++++++++++++++++
 1 file changed, 133 insertions(+)

diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index df90ef13c..19849c943 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -346,4 +346,137 @@ class DbQuery extends SimpleQuery
         $this->group = $group;
         return $this;
     }
+
+    /**
+     * Return whether the given table has been joined
+     *
+     * @param   string  $table
+     *
+     * @return  bool
+     */
+    public function hasJoinedTable($table)
+    {
+        $fromPart = $this->select->getPart(Zend_Db_Select::FROM);
+        if (isset($fromPart[$table])) {
+            return true;
+        }
+
+        foreach ($fromPart as $options) {
+            if ($options['tableName'] === $table && $options['joinType'] !== Zend_Db_Select::FROM) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Add an INNER JOIN table and colums to the query
+     *
+     * @param   array|string|Zend_Db_Expr   $name   The table name
+     * @param   string                      $cond   Join on this condition
+     * @param   array|string                $cols   The columns to select from the joined table
+     * @param   string                      $schema The database name to specify, if any
+     *
+     * @return  $this
+     */
+    public function join($name, $cond, $cols = Zend_Db_Select::SQL_WILDCARD, $schema = null)
+    {
+        $this->select->joinInner($name, $cond, $cols, $schema);
+        return $this;
+    }
+
+    /**
+     * Add an INNER JOIN table and colums to the query
+     *
+     * @param   array|string|Zend_Db_Expr   $name   The table name
+     * @param   string                      $cond   Join on this condition
+     * @param   array|string                $cols   The columns to select from the joined table
+     * @param   string                      $schema The database name to specify, if any
+     *
+     * @return  $this
+     */
+    public function joinInner($name, $cond, $cols = Zend_Db_Select::SQL_WILDCARD, $schema = null)
+    {
+        $this->select->joinInner($name, $cond, $cols, $schema);
+        return $this;
+    }
+
+    /**
+     * Add a LEFT OUTER JOIN table and colums to the query
+     *
+     * @param   array|string|Zend_Db_Expr   $name   The table name
+     * @param   string                      $cond   Join on this condition
+     * @param   array|string                $cols   The columns to select from the joined table
+     * @param   string                      $schema The database name to specify, if any
+     *
+     * @return  $this
+     */
+    public function joinLeft($name, $cond, $cols = Zend_Db_Select::SQL_WILDCARD, $schema = null)
+    {
+        $this->select->joinLeft($name, $cond, $cols, $schema);
+        return $this;
+    }
+
+    /**
+     * Add a RIGHT OUTER JOIN table and colums to the query
+     *
+     * @param   array|string|Zend_Db_Expr   $name   The table name
+     * @param   string                      $cond   Join on this condition
+     * @param   array|string                $cols   The columns to select from the joined table
+     * @param   string                      $schema The database name to specify, if any
+     *
+     * @return  $this
+     */
+    public function joinRight($name, $cond, $cols = Zend_Db_Select::SQL_WILDCARD, $schema = null)
+    {
+        $this->select->joinRight($name, $cond, $cols, $schema);
+        return $this;
+    }
+
+    /**
+     * Add a FULL OUTER JOIN table and colums to the query
+     *
+     * @param   array|string|Zend_Db_Expr   $name   The table name
+     * @param   string                      $cond   Join on this condition
+     * @param   array|string                $cols   The columns to select from the joined table
+     * @param   string                      $schema The database name to specify, if any
+     *
+     * @return  $this
+     */
+    public function joinFull($name, $cond, $cols = Zend_Db_Select::SQL_WILDCARD, $schema = null)
+    {
+        $this->select->joinFull($name, $cond, $cols, $schema);
+        return $this;
+    }
+
+    /**
+     * Add a CROSS JOIN table and colums to the query
+     *
+     * @param   array|string|Zend_Db_Expr   $name   The table name
+     * @param   array|string                $cols   The columns to select from the joined table
+     * @param   string                      $schema The database name to specify, if any
+     *
+     * @return  $this
+     */
+    public function joinCross($name, $cols = Zend_Db_Select::SQL_WILDCARD, $schema = null)
+    {
+        $this->select->joinCross($name, $cols, $schema);
+        return $this;
+    }
+
+    /**
+     * Add a NATURAL JOIN table and colums to the query
+     *
+     * @param   array|string|Zend_Db_Expr   $name   The table name
+     * @param   array|string                $cols   The columns to select from the joined table
+     * @param   string                      $schema The database name to specify, if any
+     *
+     * @return  $this
+     */
+    public function joinNatural($name, $cols = Zend_Db_Select::SQL_WILDCARD, $schema = null)
+    {
+        $this->select->joinNatural($name, $cols, $schema);
+        return $this;
+    }
 }

From 08f8fe6f49be64bb3e52f6d4a3b29d9d4e10ace3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 28 May 2015 13:53:49 +0200
Subject: [PATCH 1830/2920] DbRepository: Add support for joining tables based
 on query/filter columns

refs #8826
---
 library/Icinga/Repository/DbRepository.php | 121 +++++++++++++++++++++
 1 file changed, 121 insertions(+)

diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index f3b0c679c..38099b0e7 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -11,6 +11,7 @@ use Icinga\Data\Updatable;
 use Icinga\Exception\IcingaException;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Exception\StatementException;
+use Icinga\Util\String;
 
 /**
  * Abstract base class for concrete database repository implementations
@@ -21,6 +22,7 @@ use Icinga\Exception\StatementException;
  *  <li>Automatic table prefix handling</li>
  *  <li>Insert, update and delete capabilities</li>
  *  <li>Differentiation between statement and query columns</li>
+ *  <li>Capability to join additional tables depending on the columns being selected or used in a filter</li>
  * </ul>
  */
 abstract class DbRepository extends Repository implements Extensible, Updatable, Reducible
@@ -494,6 +496,54 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
         );
     }
 
+    /**
+     * Validate that the given column is a valid query target and return it or the actual name if it's an alias
+     *
+     * Attempts to join the given column from a different table if its association to the given table cannot be
+     * verified.
+     *
+     * @param   string              $table  The table where to look for the column or alias
+     * @param   string              $name   The name or alias of the column to validate
+     * @param   RepositoryQuery     $query  An optional query to pass as context,
+     *                                      if not given no join will be attempted
+     *
+     * @return  string                      The given column's name
+     *
+     * @throws  QueryException              In case the given column is not a valid query column
+     */
+    public function requireQueryColumn($table, $name, RepositoryQuery $query = null)
+    {
+        if ($query === null || $this->validateQueryColumnAssociation($table, $name)) {
+            return parent::requireQueryColumn($table, $name, $query);
+        }
+
+        return $this->joinColumn($name, $table, $query);
+    }
+
+    /**
+     * Validate that the given column is a valid filter target and return it or the actual name if it's an alias
+     *
+     * Attempts to join the given column from a different table if its association to the given table cannot be
+     * verified.
+     *
+     * @param   string              $table  The table where to look for the column or alias
+     * @param   string              $name   The name or alias of the column to validate
+     * @param   RepositoryQuery     $query  An optional query to pass as context,
+     *                                      if not given no join will be attempted
+     *
+     * @return  string                      The given column's name
+     *
+     * @throws  QueryException              In case the given column is not a valid filter column
+     */
+    public function requireFilterColumn($table, $name, RepositoryQuery $query = null)
+    {
+        if ($query === null || $this->validateQueryColumnAssociation($table, $name)) {
+            return parent::requireFilterColumn($table, $name, $query);
+        }
+
+        return $this->joinColumn($name, $table, $query);
+    }
+
     /**
      * Return the statement column name for the given alias or null in case the alias does not exist
      *
@@ -576,4 +626,75 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
 
         return $column;
     }
+
+    /**
+     * Join alias or column $name into $table using $query
+     *
+     * Attempts to find a valid table for the given alias or column name and a method labelled join<TableName>
+     * to process the actual join logic. If neither of those is found, ProgrammingError will be thrown.
+     * The method is called with the same parameters but in reversed order.
+     *
+     * @param   string              $name       The alias or column name to join into $target
+     * @param   array|string        $target     The table to join $name into
+     * @param   RepositoryQUery     $query      The query to apply the JOIN-clause on
+     *
+     * @return  string                          The resolved alias or $name
+     *
+     * @throws  ProgrammingError                In case no valid table or join<TableName>-method is found
+     */
+    public function joinColumn($name, $target, RepositoryQuery $query)
+    {
+        $tableName = $this->findTableName($name);
+        if (! $tableName) {
+            throw new ProgrammingError(
+                'Unable to find a valid table for column "%s" to join into "%s"',
+                $name,
+                $this->removeTablePrefix($this->clearTableAlias($target))
+            );
+        }
+
+        $column = $this->resolveQueryColumnAlias($tableName, $name);
+
+        $prefixedTableName = $this->prependTablePrefix($tableName);
+        if ($query->getQuery()->hasJoinedTable($prefixedTableName)) {
+            return $column;
+        }
+
+        $joinMethod = 'join' . String::cname($tableName);
+        if (! method_exists($this, $joinMethod)) {
+            throw new ProgrammingError(
+                'Unable to join table "%s" into "%s". Method "%s" not found',
+                $tableName,
+                $this->removeTablePrefix($this->clearTableAlias($target)),
+                $joinMethod
+            );
+        }
+
+        $this->$joinMethod($query, $target, $name);
+        return $column;
+    }
+
+    /**
+     * Return the table name for the given alias or column name
+     *
+     * @param   string  $column
+     *
+     * @return  string|null         null in case no table is found
+     */
+    protected function findTableName($column)
+    {
+        $aliasTableMap = $this->getAliasTableMap();
+        if (isset($aliasTableMap[$column])) {
+            return $aliasTableMap[$column];
+        }
+
+        foreach ($aliasTableMap as $alias => $table) {
+            if (strpos($alias, '.') !== false) {
+                list($_, $alias) = split('.', $column, 2);
+                if ($alias === $column) {
+                    return $table;
+                }
+            }
+        }
+    }
 }

From 49589128ef0b23a86cf932ee8d7e29598b89b4c8 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 28 May 2015 14:09:13 +0200
Subject: [PATCH 1831/2920] Rename identity_key with private_key in ssh
 resource

refs #7595
---
 .../forms/Config/Resource/SshResourceForm.php | 10 +++----
 .../Command/Transport/RemoteCommandFile.php   | 28 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/application/forms/Config/Resource/SshResourceForm.php b/application/forms/Config/Resource/SshResourceForm.php
index ebebada34..c5c49d1e0 100644
--- a/application/forms/Config/Resource/SshResourceForm.php
+++ b/application/forms/Config/Resource/SshResourceForm.php
@@ -65,7 +65,7 @@ class SshResourceForm extends Form
 
             $this->addElement(
                 'textarea',
-                'identity_key',
+                'private_key',
                 array(
                     'required'      => true,
                     'label'         => $this->translate('Private Key'),
@@ -78,7 +78,7 @@ class SshResourceForm extends Form
             $resourceName = $formData['name'];
             $this->addElement(
                 'note',
-                'identity_key_note',
+                'private_key_note',
                 array(
                     'escape'        => false,
                     'label'         => $this->translate('Private Key'),
@@ -106,7 +106,7 @@ class SshResourceForm extends Form
      */
     public static function beforeRemove(ConfigObject $config)
     {
-        $file = $config->identity_key;
+        $file = $config->private_key;
 
         if (file_exists($file)) {
             unlink($file);
@@ -138,9 +138,9 @@ class SshResourceForm extends Form
             return false;
         }
 
-        $file->fwrite($form->getElement('identity_key')->getValue());
+        $file->fwrite($form->getElement('private_key')->getValue());
 
-        $form->getElement('identity_key')->setValue($configDir . '/ssh/' . $user);
+        $form->getElement('private_key')->setValue($configDir . '/ssh/' . $user);
 
         return true;
     }
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
index 4bae550a8..14902cbbf 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
@@ -46,11 +46,11 @@ class RemoteCommandFile implements CommandTransportInterface
     protected $user;
 
     /**
-     * Path to the identity (private key) file for the key-based authentication
+     * Path to the private key file for the key-based authentication
      *
      * @var string
      */
-    protected $identityKey;
+    protected $privateKey;
 
     /**
      * Path to the Icinga command file on the remote host
@@ -146,26 +146,26 @@ class RemoteCommandFile implements CommandTransportInterface
     }
 
     /**
-     * Set the path to the identity file
+     * Set the path to the private key file
      *
-     * @param string $identityKey
+     * @param string $privateKey
      *
      * @return $this
      */
-    public function setIdentityKey($identityKey)
+    public function setPrivateKey($privateKey)
     {
-        $this->identityKey = (string) $identityKey;
+        $this->privateKey = (string) $privateKey;
         return $this;
     }
 
     /**
-     * Get the path to the identity path
+     * Get the path to the private key
      *
      * @return string
      */
-    public function getIdentityKey()
+    public function getPrivateKey()
     {
-        return $this->identityKey;
+        return $this->privateKey;
     }
 
     /**
@@ -184,14 +184,14 @@ class RemoteCommandFile implements CommandTransportInterface
                 t("Can't send external Icinga Command. Remote user is missing")
             );
         }
-        if (! isset($config->identity_key)) {
+        if (! isset($config->private_key)) {
             throw new ConfigurationError(
-                t("Can't send external Icinga Command. The identity key for the remote user is missing")
+                t("Can't send external Icinga Command. The private key for the remote user is missing")
             );
         }
 
         $this->setUser($config->user);
-        $this->setIdentityKey($config->identity_key);
+        $this->setPrivateKey($config->private_key);
     }
 
     /**
@@ -249,8 +249,8 @@ class RemoteCommandFile implements CommandTransportInterface
         if (isset($this->user)) {
             $ssh .= sprintf(' -l %s', escapeshellarg($this->user));
         }
-        if (isset($this->identityKey)) {
-            $ssh .= sprintf(' -o StrictHostKeyChecking=no -i %s', escapeshellarg($this->identityKey));
+        if (isset($this->privateKey)) {
+            $ssh .= sprintf(' -o StrictHostKeyChecking=no -i %s', escapeshellarg($this->privateKey));
         }
         $ssh .= sprintf(
             ' %s "echo %s > %s" 2>&1', // Redirect stderr to stdout

From f3a37e957542a615bbe8026d27a8cae5847a9f34 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 28 May 2015 14:15:01 +0200
Subject: [PATCH 1832/2920] Update documentation for resources and instances

I've just only renamed the identity_key to the private_key thats it

refs #7595
---
 doc/resources.md                    | 4 ++--
 modules/monitoring/doc/instances.md | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/resources.md b/doc/resources.md
index 70255a201..19cb84a57 100644
--- a/doc/resources.md
+++ b/doc/resources.md
@@ -73,7 +73,7 @@ Directive           | Description
 --------------------|------------
 **type**            | `ssh`
 **user**            | The username to use when connecting to the server.
-**identity_key**    | The path to the private key of the user.
+**private_key**    | The path to the private key of the user.
 
 **Example:**
 
@@ -81,7 +81,7 @@ Directive           | Description
 [ssh]
 type                = "ssh"
 user                = "ssh-user"
-identity_key        = "/etc/icingaweb2/ssh/ssh-user"
+private_key        = "/etc/icingaweb2/ssh/ssh-user"
 ````
 
 ### <a id="resources-configuration-livestatus"></a> Livestatus
diff --git a/modules/monitoring/doc/instances.md b/modules/monitoring/doc/instances.md
index 6c139cd05..ea8b3f5b8 100644
--- a/modules/monitoring/doc/instances.md
+++ b/modules/monitoring/doc/instances.md
@@ -48,7 +48,7 @@ And the associated ssh resource:
     [ssh]
     type                = "ssh"
     user                = "ssh-user"
-    identity_key        = "/etc/icingaweb2/ssh/ssh-user"
+    private_key        = "/etc/icingaweb2/ssh/ssh-user"
 
 
 

From d7bdc5980120e7662f38c825d5f474def0cce022 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Thu, 28 May 2015 14:25:36 +0200
Subject: [PATCH 1833/2920] Don't change the status text's color for ok/up on
 hover

fixes #8934
---
 public/css/icinga/monitoring-colors.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index 2b2b70b27..7f1499f02 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -191,7 +191,6 @@ tr[href]:hover {
 }
 
 tr.state[href]:hover td.state {
-  color: white;
   background-color: #eee;
 }
 

From fd931e42320e55f082d169a6704f69d51f4afba5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 28 May 2015 14:26:48 +0200
Subject: [PATCH 1834/2920] RepositoryQuery: getQuery() might be called during
 prepareQueryColumns()

---
 library/Icinga/Repository/RepositoryQuery.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index f92d7eb9f..8048ce434 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -77,10 +77,8 @@ class RepositoryQuery implements QueryInterface, Iterator
     public function from($target, array $columns = null)
     {
         $target = $this->repository->requireTable($target, $this);
-        $this->query = $this->repository
-            ->getDataSource()
-            ->select()
-            ->from($target, $this->prepareQueryColumns($target, $columns));
+        $this->query = $this->repository->getDataSource()->select()->from($target);
+        $this->query->columns($this->prepareQueryColumns($target, $columns));
         $this->target = $target;
         return $this;
     }

From 37f58e55d87de18e494d92daf7de2f199ce7991c Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 28 May 2015 14:21:05 +0200
Subject: [PATCH 1835/2920] Move macro resolcing functionality into separate
 class

Make macro resolving functionality available to all code, instead of depending on a view

resf #6392
---
 .../application/views/helpers/IconImage.php   |  6 +-
 .../views/helpers/ResolveMacros.php           | 50 +-------------
 .../library/Monitoring/Object/Host.php        |  2 +-
 .../library/Monitoring/Object/Macro.php       | 67 +++++++++++++++++++
 .../library/Monitoring/Object/Service.php     |  2 +-
 .../views/helpers/ResolveMacrosTest.php       | 25 +++----
 6 files changed, 86 insertions(+), 66 deletions(-)
 create mode 100644 modules/monitoring/library/Monitoring/Object/Macro.php

diff --git a/modules/monitoring/application/views/helpers/IconImage.php b/modules/monitoring/application/views/helpers/IconImage.php
index e0e969db4..ccd74ee3c 100644
--- a/modules/monitoring/application/views/helpers/IconImage.php
+++ b/modules/monitoring/application/views/helpers/IconImage.php
@@ -1,6 +1,8 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
+use Icinga\Module\Monitoring\Object\Macro;
+
 /**
  * Generate icons to describe a given hosts state
  */
@@ -26,7 +28,7 @@ class Zend_View_Helper_IconImage extends Zend_View_Helper_Abstract
     {
         if ($object->host_icon_image && ! preg_match('/[\'"]/', $object->host_icon_image)) {
             return $this->view->img(
-                'img/icons/' . $this->view->resolveMacros($object->host_icon_image, $object),
+                'img/icons/' . Macro::resolveMacro($object->host_icon_image, $object),
                 null,
                 array(
                     'alt' => $object->host_icon_image_alt,
@@ -48,7 +50,7 @@ class Zend_View_Helper_IconImage extends Zend_View_Helper_Abstract
     {
         if ($object->service_icon_image && ! preg_match('/[\'"]/', $object->service_icon_image)) {
             return $this->view->img(
-                'img/icons/' . $this->view->resolveMacros($object->service_icon_image, $object),
+                'img/icons/' . Macro::resolveMacros($object->service_icon_image, $object),
                 null,
                 array(
                     'alt' => $object->service_icon_image_alt,
diff --git a/modules/monitoring/application/views/helpers/ResolveMacros.php b/modules/monitoring/application/views/helpers/ResolveMacros.php
index 7d555f8fd..e6566936e 100644
--- a/modules/monitoring/application/views/helpers/ResolveMacros.php
+++ b/modules/monitoring/application/views/helpers/ResolveMacros.php
@@ -2,61 +2,17 @@
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use \Zend_View_Helper_Abstract;
-use Icinga\Module\Monitoring\Object\MonitoredObject;
+use Icinga\Module\Monitoring\Object\Macro;
 
 class Zend_View_Helper_ResolveMacros extends Zend_View_Helper_Abstract
 {
-    /**
-     * Known icinga macros
-     *
-     * @var array
-     */
-    private $icingaMacros = array(
-        'HOSTNAME'      => 'host_name',
-        'HOSTADDRESS'   => 'host_address',
-        'SERVICEDESC'   => 'service_description'
-    );
-
-    /**
-     * Return the given string with macros being resolved
-     *
-     * @param   string                      $input      The string in which to look for macros
-     * @param   MonitoredObject|stdClass     $object     The host or service used to resolve macros
-     *
-     * @return  string                                  The substituted or unchanged string
-     */
     public function resolveMacros($input, $object)
     {
-        $matches = array();
-        if (preg_match_all('@\$([^\$\s]+)\$@', $input, $matches)) {
-            foreach ($matches[1] as $key => $value) {
-                $newValue = $this->resolveMacro($value, $object);
-                if ($newValue !== $value) {
-                    $input = str_replace($matches[0][$key], $newValue, $input);
-                }
-            }
-        }
-
-        return $input;
+        return Macro::resolveMacros($input, $object);
     }
 
-    /**
-     * Resolve a macro based on the given object
-     *
-     * @param   string                      $macro      The macro to resolve
-     * @param   MonitoredObject|stdClass     $object     The object used to resolve the macro
-     *
-     * @return  string                                  The new value or the macro if it cannot be resolved
-     */
     public function resolveMacro($macro, $object)
     {
-        if (array_key_exists($macro, $this->icingaMacros) && $object->{$this->icingaMacros[$macro]} !== false) {
-            return $object->{$this->icingaMacros[$macro]};
-        }
-        if (array_key_exists($macro, $object->customvars)) {
-            return $object->customvars[$macro];
-        }
-
-        return $macro;
+        return Macro::resolveMacro($macro, $object);
     }
 }
diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 6bf6b05cc..da3d66613 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -7,7 +7,7 @@ use InvalidArgumentException;
 use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 
 /**
- * A Icinga host
+ * An Icinga host
  */
 class Host extends MonitoredObject
 {
diff --git a/modules/monitoring/library/Monitoring/Object/Macro.php b/modules/monitoring/library/Monitoring/Object/Macro.php
new file mode 100644
index 000000000..4a9045b58
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Object/Macro.php
@@ -0,0 +1,67 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Object;
+
+/**
+ * Expand macros in string in the context of MonitoredObjects
+ */
+class Macro
+{
+    /**
+     * Known icinga macros
+     *
+     * @var array
+     */
+    private static $icingaMacros = array(
+        'HOSTNAME'     => 'host_name',
+        'HOSTADDRESS'  => 'host_address',
+        'SERVICEDESC'  => 'service_description',
+        'host.name'    => 'host_name',
+        'host.address' => 'host_address',
+        'service.description' => 'service_description'
+    );
+
+    /**
+     * Return the given string with macros being resolved
+     *
+     * @param   string                      $input      The string in which to look for macros
+     * @param   MonitoredObject|stdClass    $object     The host or service used to resolve macros
+     *
+     * @return  string                                  The substituted or unchanged string
+     */
+    public static function resolveMacros($input, $object)
+    {
+        $matches = array();
+        if (preg_match_all('@\$([^\$\s]+)\$@', $input, $matches)) {
+            foreach ($matches[1] as $key => $value) {
+                $newValue = self::resolveMacro($value, $object);
+                if ($newValue !== $value) {
+                    $input = str_replace($matches[0][$key], $newValue, $input);
+                }
+            }
+        }
+
+        return $input;
+    }
+
+    /**
+     * Resolve a macro based on the given object
+     *
+     * @param   string                      $macro      The macro to resolve
+     * @param   MonitoredObject|stdClass    $object     The object used to resolve the macro
+     *
+     * @return  string                                  The new value or the macro if it cannot be resolved
+     */
+    public static function resolveMacro($macro, $object)
+    {
+        if (array_key_exists($macro, self::$icingaMacros) && $object->{self::$icingaMacros[$macro]} !== false) {
+            return $object->{self::$icingaMacros[$macro]};
+        }
+        if (array_key_exists($macro, $object->customvars)) {
+            return $object->customvars[$macro];
+        }
+
+        return $macro;
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 17fd143b5..6b5cd5bf9 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -7,7 +7,7 @@ use InvalidArgumentException;
 use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 
 /**
- * A Icinga service
+ * An Icinga service
  */
 class Service extends MonitoredObject
 {
diff --git a/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php b/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
index 31bf839a3..dc05f1e3d 100644
--- a/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
+++ b/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
@@ -4,10 +4,10 @@
 namespace Tests\Icinga\Modules\Monitoring\Application\Views\Helpers;
 
 use Mockery;
-use Zend_View_Helper_ResolveMacros;
 use Icinga\Test\BaseTestCase;
+use Icinga\Module\Monitoring\Object\Macro;
 
-require_once realpath(BaseTestCase::$moduleDir . '/monitoring/application/views/helpers/ResolveMacros.php');
+require_once realpath(BaseTestCase::$moduleDir . '/monitoring/library/Monitoring/Object/Macro.php');
 
 class ResolveMacrosTest extends BaseTestCase
 {
@@ -17,9 +17,8 @@ class ResolveMacrosTest extends BaseTestCase
         $hostMock->host_name = 'test';
         $hostMock->host_address = '1.1.1.1';
 
-        $helper = new Zend_View_Helper_ResolveMacros();
-        $this->assertEquals($helper->resolveMacros('$HOSTNAME$', $hostMock), $hostMock->host_name);
-        $this->assertEquals($helper->resolveMacros('$HOSTADDRESS$', $hostMock), $hostMock->host_address);
+        $this->assertEquals(Macro::resolveMacros('$HOSTNAME$', $hostMock), $hostMock->host_name);
+        $this->assertEquals(Macro::resolveMacros('$HOSTADDRESS$', $hostMock), $hostMock->host_address);
     }
 
     public function testServiceMacros()
@@ -29,10 +28,9 @@ class ResolveMacrosTest extends BaseTestCase
         $svcMock->host_address = '1.1.1.1';
         $svcMock->service_description = 'a service';
 
-        $helper = new Zend_View_Helper_ResolveMacros();
-        $this->assertEquals($helper->resolveMacros('$HOSTNAME$', $svcMock), $svcMock->host_name);
-        $this->assertEquals($helper->resolveMacros('$HOSTADDRESS$', $svcMock), $svcMock->host_address);
-        $this->assertEquals($helper->resolveMacros('$SERVICEDESC$', $svcMock), $svcMock->service_description);
+        $this->assertEquals(Macro::resolveMacros('$HOSTNAME$', $svcMock), $svcMock->host_name);
+        $this->assertEquals(Macro::resolveMacros('$HOSTADDRESS$', $svcMock), $svcMock->host_address);
+        $this->assertEquals(Macro::resolveMacros('$SERVICEDESC$', $svcMock), $svcMock->service_description);
     }
 
     public function testCustomvars()
@@ -42,8 +40,7 @@ class ResolveMacrosTest extends BaseTestCase
             'CUSTOMVAR' => 'test'
         );
 
-        $helper = new Zend_View_Helper_ResolveMacros();
-        $this->assertEquals($helper->resolveMacros('$CUSTOMVAR$', $objectMock), $objectMock->customvars['CUSTOMVAR']);
+        $this->assertEquals(Macro::resolveMacros('$CUSTOMVAR$', $objectMock), $objectMock->customvars['CUSTOMVAR']);
     }
 
     public function testFaultyMacros()
@@ -55,9 +52,8 @@ class ResolveMacrosTest extends BaseTestCase
             'NAME' => 'st'
         );
 
-        $helper = new Zend_View_Helper_ResolveMacros();
         $this->assertEquals(
-            $helper->resolveMacros('$$HOSTNAME$ $ HOSTNAME$ $HOST$NAME$', $hostMock),
+            Macro::resolveMacros('$$HOSTNAME$ $ HOSTNAME$ $HOST$NAME$', $hostMock),
             '$test $ HOSTNAME$ teNAME$'
         );
     }
@@ -69,9 +65,8 @@ class ResolveMacrosTest extends BaseTestCase
             'V€RY_SP3C|@L' => 'not too special!'
         );
 
-        $helper = new Zend_View_Helper_ResolveMacros();
         $this->assertEquals(
-            $helper->resolveMacros('$V€RY_SP3C|@L$', $objectMock),
+            Macro::resolveMacros('$V€RY_SP3C|@L$', $objectMock),
             $objectMock->customvars['V€RY_SP3C|@L']
         );
     }

From 1950ddcbd6aee92c74741d4de36821466d54e988 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 28 May 2015 15:00:46 +0200
Subject: [PATCH 1836/2920] mysql schema: Introduce `id' and `group_id'

Required to ensure referential integrity when renaming groups.

refs #8826
---
 etc/schema/mysql.schema.sql | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/etc/schema/mysql.schema.sql b/etc/schema/mysql.schema.sql
index 16ba9f4ff..bbc801d8b 100644
--- a/etc/schema/mysql.schema.sql
+++ b/etc/schema/mysql.schema.sql
@@ -1,21 +1,23 @@
 # Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+
 
 CREATE TABLE `icingaweb_group`(
+  `id`     int(10) unsigned NOT NULL AUTO_INCREMENT,
   `name`   varchar(64) COLLATE utf8_unicode_ci NOT NULL,
   `parent` varchar(64) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
   `ctime`  timestamp NULL DEFAULT NULL,
   `mtime`  timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`name`)
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `idx_name` (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `icingaweb_group_membership`(
-  `group_name` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `group_id`   int(10) unsigned NOT NULL,
   `username`   varchar(64) COLLATE utf8_unicode_ci NOT NULL,
   `ctime`      timestamp NULL DEFAULT NULL,
   `mtime`      timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`group_name`,`username`),
-  CONSTRAINT `fk_icingaweb_group_membership_icingaweb_group` FOREIGN KEY (`group_name`)
-    REFERENCES `icingaweb_group` (`name`)
+  PRIMARY KEY (`group_id`,`username`),
+  CONSTRAINT `fk_icingaweb_group_membership_icingaweb_group` FOREIGN KEY (`group_id`)
+    REFERENCES `icingaweb_group` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `icingaweb_user`(

From a66949162bdb21daee4850bed261d26fa08e4118 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 28 May 2015 14:58:16 +0200
Subject: [PATCH 1837/2920] Resolve macros when accessing getters on
 MonitoredObjects

refs #6392
---
 .../scripts/show/components/actions.phtml     |  9 ++------
 .../views/scripts/show/components/notes.phtml |  7 ++----
 .../library/Monitoring/Object/Host.php        |  4 +++-
 .../Monitoring/Object/MonitoredObject.php     | 22 ++++++++++++++++---
 .../library/Monitoring/Object/Service.php     |  4 +++-
 5 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/actions.phtml b/modules/monitoring/application/views/scripts/show/components/actions.phtml
index 18f8a8482..78365f733 100644
--- a/modules/monitoring/application/views/scripts/show/components/actions.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/actions.phtml
@@ -1,16 +1,11 @@
 <?php
-use Icinga\Module\Monitoring\Object\MonitoredObject;
 
 // add warning to links that open in new tabs to improve accessibility, as recommended by WCAG20 G201
 $newTabInfo = sprintf('<span class="info-box display-on-hover"> %s </span>', $this->translate('opens in new window'));
 
-$links = MonitoredObject::parseAttributeUrls($object->action_url);
+$links = $object->getActionUrls();
 foreach ($links as $i => $link) {
-    $links[$i] = sprintf(
-        '<a href="%s" target="_blank">%s ' . $newTabInfo . '</a>',
-        $this->resolveMacros($object->action_url, $object),
-        'Action'
-    );
+    $links[$i] = sprintf('<a href="%s" target="_blank">%s ' . $newTabInfo . '</a>', $link, 'Action');
 }
 
 if (isset($this->actions)) {
diff --git a/modules/monitoring/application/views/scripts/show/components/notes.phtml b/modules/monitoring/application/views/scripts/show/components/notes.phtml
index 678d70c90..4a5041e50 100644
--- a/modules/monitoring/application/views/scripts/show/components/notes.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/notes.phtml
@@ -1,15 +1,13 @@
 <?php
 $notes = trim($object->getNotes());
 $links = $object->getNotesUrls();
-?>
 
-<?php if (! empty($links) || ! empty($notes)): ?>
+if (! empty($links) || ! empty($notes)): ?>
 <tr>
     <th><?= $this->translate('Notes') ?></th>
     <td>
         <?php
             if (! empty($notes)) {
-                $notes = $this->resolveMacros($notes, $object);
                 echo $notes . '<br>';
             }
             // add warning to links that open in new tabs to improve accessibility, as recommended by WCAG20 G201
@@ -19,8 +17,7 @@ $links = $object->getNotesUrls();
             );
             $linkText = '<a href="%s" target="_blank">%s ' . $newTabInfo . '</a>';
             foreach ($links as $i => $link) {
-                $resolved = $this->resolveMacros($link, $object);
-                $links[$i] = sprintf($linkText, $this->escape($resolved), $this->escape($resolved));
+                $links[$i] = sprintf($linkText, $this->escape($link), $this->escape($link));
             }
             echo implode('<br>', $links);
         ?>
diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index da3d66613..dd9b4c0c1 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -192,7 +192,9 @@ class Host extends MonitoredObject
 
     public function getNotesUrls()
     {
-        return MonitoredObject::parseAttributeUrls($this->host_notes_url);
+        return $this->resolveAllStrings(
+            MonitoredObject::parseAttributeUrls($this->host_notes_url)
+        );
     }
 
     public function getNotes()
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 37d29c82e..b68bc0539 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -569,14 +569,14 @@ abstract class MonitoredObject implements Filterable
      *
      * @return string   The notes as a string
      */
-    public function getNotes() {}
+    public abstract function getNotes();
 
     /**
      * Get all note urls configured for this monitored object
      *
      * @return array    All note urls as a string
      */
-    public function getNotesUrls() {}
+    public abstract function getNotesUrls();
 
     /**
      * Get all action urls configured for this monitored object
@@ -585,7 +585,23 @@ abstract class MonitoredObject implements Filterable
      */
     public function getActionUrls()
     {
-        return MonitoredObject::parseAttributeUrls($this->action_url);
+        return $this->resolveAllStrings(
+            MonitoredObject::parseAttributeUrls($this->action_url)
+        );
+    }
+
+    /**
+     * Resolve macros in all given strings in the current object context
+     *
+     * @param   array   $strs   An array of urls as string
+     * @return  type
+     */
+    protected function resolveAllStrings(array $strs)
+    {
+        foreach ($strs as $i => $str) {
+            $strs[$i] = Macro::resolveMacros($str, $this);
+        }
+        return $strs;
     }
 
     /**
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index 6b5cd5bf9..cb5615df1 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -202,7 +202,9 @@ class Service extends MonitoredObject
 
     public function getNotesUrls()
     {
-        return MonitoredObject::parseAttributeUrls($this->service_notes_url);
+        return $this->resolveAllStrings(
+            MonitoredObject::parseAttributeUrls($this->service_notes_url)
+        );
     }
 
     public function getNotes()

From 1c6ded9324c11e71e9e05d81459fec638028cf99 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 28 May 2015 15:01:21 +0200
Subject: [PATCH 1838/2920] pgsql schema: Introduce `id' and `group_id'

Required to ensure referential integrity when renaming groups.

refs #8826
---
 etc/schema/pgsql.schema.sql | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/etc/schema/pgsql.schema.sql b/etc/schema/pgsql.schema.sql
index 034d8288a..09ecb0b71 100644
--- a/etc/schema/pgsql.schema.sql
+++ b/etc/schema/pgsql.schema.sql
@@ -1,6 +1,7 @@
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 CREATE TABLE "icingaweb_group" (
+  "id"     serial,
   "name"   character varying(64) NOT NULL,
   "parent" character varying(64) NULL DEFAULT NULL,
   "ctime"  timestamp NULL DEFAULT NULL,
@@ -10,7 +11,7 @@ CREATE TABLE "icingaweb_group" (
 ALTER TABLE ONLY "icingaweb_group"
   ADD CONSTRAINT pk_icingaweb_group
   PRIMARY KEY (
-    "name"
+    "id"
 );
 
 CREATE UNIQUE INDEX idx_icingaweb_group
@@ -20,7 +21,7 @@ CREATE UNIQUE INDEX idx_icingaweb_group
 );
 
 CREATE TABLE "icingaweb_group_membership" (
-  "group_name" character varying(64) NOT NULL,
+  "group_id"   int NOT NULL,
   "username"   character varying(64) NOT NULL,
   "ctime"      timestamp NULL DEFAULT NULL,
   "mtime"      timestamp NULL DEFAULT NULL
@@ -28,15 +29,17 @@ CREATE TABLE "icingaweb_group_membership" (
 
 ALTER TABLE ONLY "icingaweb_group_membership"
   ADD CONSTRAINT pk_icingaweb_group_membership
-  PRIMARY KEY (
-    "group_name",
-    "username"
+  FOREIGN KEY (
+    "group_id"
+  )
+  REFERENCES "icingaweb_group" (
+    "id"
 );
 
 CREATE UNIQUE INDEX idx_icingaweb_group_membership
   ON "icingaweb_group_membership"
   USING btree (
-    lower((group_name)::text),
+    group_id,
     lower((username)::text)
 );
 

From 60e5608b4034a4ed67b79fc8b27b18114b858eeb Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 28 May 2015 15:02:58 +0200
Subject: [PATCH 1839/2920] Rename ResolveMacroTest

refs #6392
---
 .../Monitoring/Object/MacroTest.php}                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename modules/monitoring/test/php/{application/views/helpers/ResolveMacrosTest.php => library/Monitoring/Object/MacroTest.php} (98%)

diff --git a/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php b/modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php
similarity index 98%
rename from modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
rename to modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php
index dc05f1e3d..d328df367 100644
--- a/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
+++ b/modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php
@@ -9,7 +9,7 @@ use Icinga\Module\Monitoring\Object\Macro;
 
 require_once realpath(BaseTestCase::$moduleDir . '/monitoring/library/Monitoring/Object/Macro.php');
 
-class ResolveMacrosTest extends BaseTestCase
+class MacroTest extends BaseTestCase
 {
     public function testHostMacros()
     {

From 2572842aa481b4c7b7939fa13cdf9b9a315c4816 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 28 May 2015 15:07:46 +0200
Subject: [PATCH 1840/2920] Add unit test cases for the new macro syntax

refs #6392
---
 .../test/php/library/Monitoring/Object/MacroTest.php         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php b/modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php
index d328df367..88cebe63e 100644
--- a/modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php
+++ b/modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php
@@ -19,6 +19,8 @@ class MacroTest extends BaseTestCase
 
         $this->assertEquals(Macro::resolveMacros('$HOSTNAME$', $hostMock), $hostMock->host_name);
         $this->assertEquals(Macro::resolveMacros('$HOSTADDRESS$', $hostMock), $hostMock->host_address);
+        $this->assertEquals(Macro::resolveMacros('$host.name$', $hostMock), $hostMock->host_name);
+        $this->assertEquals(Macro::resolveMacros('$host.address$', $hostMock), $hostMock->host_address);
     }
 
     public function testServiceMacros()
@@ -31,6 +33,9 @@ class MacroTest extends BaseTestCase
         $this->assertEquals(Macro::resolveMacros('$HOSTNAME$', $svcMock), $svcMock->host_name);
         $this->assertEquals(Macro::resolveMacros('$HOSTADDRESS$', $svcMock), $svcMock->host_address);
         $this->assertEquals(Macro::resolveMacros('$SERVICEDESC$', $svcMock), $svcMock->service_description);
+        $this->assertEquals(Macro::resolveMacros('$host.name$', $svcMock), $svcMock->host_name);
+        $this->assertEquals(Macro::resolveMacros('$host.address$', $svcMock), $svcMock->host_address);
+        $this->assertEquals(Macro::resolveMacros('$service.description', $svcMock), $svcMock->service_description);
     }
 
     public function testCustomvars()

From 3b601decc595b07ee4673f01040f7a312c24b554 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 28 May 2015 15:15:07 +0200
Subject: [PATCH 1841/2920] Remove unused ResolceMacro Helper

refs #6392
---
 .../views/helpers/ResolveMacros.php            | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 modules/monitoring/application/views/helpers/ResolveMacros.php

diff --git a/modules/monitoring/application/views/helpers/ResolveMacros.php b/modules/monitoring/application/views/helpers/ResolveMacros.php
deleted file mode 100644
index e6566936e..000000000
--- a/modules/monitoring/application/views/helpers/ResolveMacros.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-use \Zend_View_Helper_Abstract;
-use Icinga\Module\Monitoring\Object\Macro;
-
-class Zend_View_Helper_ResolveMacros extends Zend_View_Helper_Abstract
-{
-    public function resolveMacros($input, $object)
-    {
-        return Macro::resolveMacros($input, $object);
-    }
-
-    public function resolveMacro($macro, $object)
-    {
-        return Macro::resolveMacro($macro, $object);
-    }
-}

From eb5c48ade927548f0dd19a8995e5d56fa44875b2 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 28 May 2015 15:21:56 +0200
Subject: [PATCH 1842/2920] Access correct resolver function in IconImage

refs #6392
---
 modules/monitoring/application/views/helpers/IconImage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/helpers/IconImage.php b/modules/monitoring/application/views/helpers/IconImage.php
index ccd74ee3c..12108f30b 100644
--- a/modules/monitoring/application/views/helpers/IconImage.php
+++ b/modules/monitoring/application/views/helpers/IconImage.php
@@ -28,7 +28,7 @@ class Zend_View_Helper_IconImage extends Zend_View_Helper_Abstract
     {
         if ($object->host_icon_image && ! preg_match('/[\'"]/', $object->host_icon_image)) {
             return $this->view->img(
-                'img/icons/' . Macro::resolveMacro($object->host_icon_image, $object),
+                'img/icons/' . Macro::resolveMacros($object->host_icon_image, $object),
                 null,
                 array(
                     'alt' => $object->host_icon_image_alt,

From 32b99be8abff5eabfb6c75b34f7faed1a82bc918 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 28 May 2015 15:22:15 +0200
Subject: [PATCH 1843/2920] DbUserGroupBackend: Adjust to fit the new database
 schema

refs #8826
---
 .../UserGroup/DbUserGroupBackend.php          | 88 ++++++++++++++-----
 1 file changed, 64 insertions(+), 24 deletions(-)

diff --git a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
index 36aa61a1d..d3096dadd 100644
--- a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
@@ -5,6 +5,7 @@ namespace Icinga\Authentication\UserGroup;
 
 use Icinga\Data\Filter\Filter;
 use Icinga\Repository\DbRepository;
+use Icinga\Repository\RepositoryQuery;
 use Icinga\User;
 
 class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterface
@@ -16,23 +17,33 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
      */
     protected $queryColumns = array(
         'group' => array(
-            'group'         => 'name COLLATE utf8_general_ci',
-            'group_name'    => 'name',
-            'parent'        => 'parent COLLATE utf8_general_ci',
-            'parent_name'   => 'parent',
-            'created_at'    => 'UNIX_TIMESTAMP(ctime)',
-            'last_modified' => 'UNIX_TIMESTAMP(mtime)'
+            'group_id'      => 'g.id',
+            'group'         => 'g.name COLLATE utf8_general_ci',
+            'group_name'    => 'g.name',
+            'parent'        => 'g.parent COLLATE utf8_general_ci',
+            'parent_name'   => 'g.parent',
+            'created_at'    => 'UNIX_TIMESTAMP(g.ctime)',
+            'last_modified' => 'UNIX_TIMESTAMP(g.mtime)'
         ),
         'group_membership' => array(
-            'group'         => 'group_name COLLATE utf8_general_ci',
-            'group_name',
-            'user'          => 'username COLLATE utf8_general_ci',
-            'user_name'     => 'username',
-            'created_at'    => 'UNIX_TIMESTAMP(ctime)',
-            'last_modified' => 'UNIX_TIMESTAMP(mtime)'
+            'group_id'      => 'gm.group_id',
+            'user'          => 'gm.username COLLATE utf8_general_ci',
+            'user_name'     => 'gm.username',
+            'created_at'    => 'UNIX_TIMESTAMP(gm.ctime)',
+            'last_modified' => 'UNIX_TIMESTAMP(gm.mtime)'
         )
     );
 
+    /**
+     * The table aliases being applied
+     *
+     * @var array
+     */
+    protected $tableAliases = array(
+        'group'             => 'g',
+        'group_membership'  => 'gm'
+    );
+
     /**
      * The statement columns being provided
      *
@@ -40,10 +51,15 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
      */
     protected $statementColumns = array(
         'group' => array(
+            'group_id'      => 'id',
+            'group_name'    => 'name',
+            'parent_name'   => 'parent',
             'created_at'    => 'ctime',
             'last_modified' => 'mtime'
         ),
         'group_membership' => array(
+            'group_id'      => 'group_id',
+            'user_name'     => 'username',
             'created_at'    => 'ctime',
             'last_modified' => 'mtime'
         )
@@ -100,23 +116,19 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
      */
     public function getMemberships(User $user)
     {
-        $groupStmt = $this->ds->select()
-            ->from($this->prependTablePrefix('group'), array('name', 'parent'))
-            ->getSelectQuery()
-            ->query();
         $groups = array();
-        foreach ($groupStmt as $group) {
+        foreach ($this->ds->select()->from($this->prependTablePrefix('group'), array('name', 'parent')) as $group) {
+            // Using the raw query here due to the non-existent necessity to join, convert, or...
             $groups[$group->name] = $group->parent;
         }
 
-        $membershipStmt = $this->ds->select() // TODO: Join this table
-            ->from($this->prependTablePrefix('group_membership'), array('group_name'))
-            ->where('username', $user->getUsername())
-            ->getSelectQuery()
-            ->query();
-        $memberships = array();
+        $membershipQuery = $this
+            ->select()
+            ->from('group_membership', array('group_name'))
+            ->where('user_name', $user->getUsername());
 
-        foreach ($membershipStmt as $membership) {
+        $memberships = array();
+        foreach ($membershipQuery as $membership) {
             $memberships[] = $membership->group_name;
             $parent = $groups[$membership->group_name];
             while ($parent !== null) {
@@ -128,4 +140,32 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
 
         return $memberships;
     }
+
+    /**
+     * Join group into group_membership
+     *
+     * @param   RepositoryQuery     $query
+     */
+    protected function joinGroup(RepositoryQuery $query)
+    {
+        $query->getQuery()->join(
+            $this->requireTable('group'),
+            'gm.group_id = g.id',
+            array()
+        );
+    }
+
+    /**
+     * Join group_membership into group
+     *
+     * @param   RepositoryQuery     $query
+     */
+    protected function joinGroupMembership(RepositoryQuery $query)
+    {
+        $query->getQuery()->join(
+            $this->requireTable('group_membership'),
+            'g.id = gm.group_id',
+            array()
+        );
+    }
 }

From a298197e6ce085fe5dfd7b1420322f34196cc1da Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 28 May 2015 15:31:50 +0200
Subject: [PATCH 1844/2920] Fix layout of action lincs in view

refs #6392
---
 .../application/views/scripts/show/components/actions.phtml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/actions.phtml b/modules/monitoring/application/views/scripts/show/components/actions.phtml
index 78365f733..329a06fb9 100644
--- a/modules/monitoring/application/views/scripts/show/components/actions.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/actions.phtml
@@ -21,5 +21,5 @@ if (empty($links)) {
 ?>
 <tr>
   <th><?= $this->translate('Actions') ?></th>
-  <td><?= implode("\n ", $links) . "\n" ?></td>
+  <td><?= implode("<br>", $links) ?></td>
 </tr>

From c7261bd4811a371312a43722b0ba41c5e6eedc1a Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 28 May 2015 15:37:01 +0200
Subject: [PATCH 1845/2920] Add missing columns for macro expansion

refs #6392
---
 modules/monitoring/application/controllers/HostsController.php  | 2 ++
 .../monitoring/application/controllers/ServicesController.php   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 20ae71e6b..961e08822 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -56,6 +56,7 @@ class Monitoring_HostsController extends Controller
             'host_icon_image',
             'host_icon_image_alt',
             'host_name',
+            'host_address',
             'host_state',
             'host_problem',
             'host_handled',
@@ -94,6 +95,7 @@ class Monitoring_HostsController extends Controller
             'host_icon_image',
             'host_icon_image_alt',
             'host_name',
+            'host_address',
             'host_state',
             'host_problem',
             'host_handled',
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 1a8ec9a58..097ee607b 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -53,6 +53,7 @@ class Monitoring_ServicesController extends Controller
             'host_icon_image',
             'host_icon_image_alt',
             'host_name',
+            'host_address',
             'host_output',
             'host_state',
             'host_problem',
@@ -100,6 +101,7 @@ class Monitoring_ServicesController extends Controller
             'host_icon_image',
             'host_icon_image_alt',
             'host_name',
+            'host_address',
             'host_output',
             'host_state',
             'host_problem',

From 1a51368a76c1f0f36f4b3e116fcee8901f9b776b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 28 May 2015 16:08:21 +0200
Subject: [PATCH 1846/2920] Fix MacroTest

Pushing failing tests to the master is a mystery to me.

refs #6392
---
 .../monitoring/test/php/library/Monitoring/Object/MacroTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php b/modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php
index 88cebe63e..e1b3595e3 100644
--- a/modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php
+++ b/modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php
@@ -35,7 +35,7 @@ class MacroTest extends BaseTestCase
         $this->assertEquals(Macro::resolveMacros('$SERVICEDESC$', $svcMock), $svcMock->service_description);
         $this->assertEquals(Macro::resolveMacros('$host.name$', $svcMock), $svcMock->host_name);
         $this->assertEquals(Macro::resolveMacros('$host.address$', $svcMock), $svcMock->host_address);
-        $this->assertEquals(Macro::resolveMacros('$service.description', $svcMock), $svcMock->service_description);
+        $this->assertEquals(Macro::resolveMacros('$service.description$', $svcMock), $svcMock->service_description);
     }
 
     public function testCustomvars()

From a4a1a296d181904fbf76246f93ef533b991f2cc3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 28 May 2015 13:36:00 +0200
Subject: [PATCH 1847/2920] monitoring: Reduce error output when transporting a
 command to a local command file failed

refs #8006
---
 .../Monitoring/Command/Transport/LocalCommandFile.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
index 197a3fdb1..a26999f18 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
@@ -4,6 +4,7 @@
 namespace Icinga\Module\Monitoring\Command\Transport;
 
 use Exception;
+use RuntimeException;
 use Icinga\Application\Logger;
 use Icinga\Exception\ConfigurationError;
 use Icinga\Module\Monitoring\Command\Exception\TransportException;
@@ -123,11 +124,15 @@ class LocalCommandFile implements CommandTransportInterface
             $file->fwrite($commandString . "\n");
             $file->fflush();
         } catch (Exception $e) {
+            $message = $e->getMessage();
+            if ($e instanceof RuntimeException && ($pos = strrpos($message, ':')) !== false) {
+                // Assume RuntimeException thrown by SplFileObject in the format: __METHOD__ . "({$filename}): Message"
+                $message = substr($message, $pos + 1);
+            }
             throw new TransportException(
-                'Can\'t send external Icinga command "%s" to the local command file "%s": %s',
-                $commandString,
+                'Can\'t send external Icinga command to the local command file "%s": %s',
                 $this->path,
-                $e
+                $message
             );
         }
     }

From 70d98f3ae0de374cd1b58de019066bf59d64dacb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 28 May 2015 16:27:43 +0200
Subject: [PATCH 1848/2920] Don't render disabled input elements white

---
 public/css/icinga/forms.less | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index c8b5df161..b5d5bca01 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -96,11 +96,6 @@ select::-moz-focus-inner {
   outline: 0;
 }
 
-input:disabled, select:disabled {
-    background-color: #fff;
-    border-color: white;
-}
-
 form.inline {
   margin: 0;
   padding: 0;
@@ -263,4 +258,4 @@ form > div.header {
   h1, h2, h3, h4, h5, h6 {
     display: inline-block;
   }
-}
\ No newline at end of file
+}

From 385042ea92d2a79efa823cadf9311937b40c3be5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 28 May 2015 16:27:48 +0200
Subject: [PATCH 1849/2920] RepositoryForm: Verify that the entry to work with
 is valid

refs #8826
---
 application/forms/RepositoryForm.php | 55 +++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/application/forms/RepositoryForm.php b/application/forms/RepositoryForm.php
index 89b8940a4..136855d1e 100644
--- a/application/forms/RepositoryForm.php
+++ b/application/forms/RepositoryForm.php
@@ -5,6 +5,7 @@ namespace Icinga\Forms;
 
 use Exception;
 use Icinga\Data\Filter\Filter;
+use Icinga\Exception\NotFoundError;
 use Icinga\Repository\Repository;
 use Icinga\Web\Form;
 use Icinga\Web\Notification;
@@ -181,9 +182,25 @@ abstract class RepositoryForm extends Form
     }
 
     /**
-     * Populate the data of the entry being handled
+     * Prepare the form for the requested mode
      */
     public function onRequest()
+    {
+        if ($this->shouldInsert()) {
+            $this->onInsertRequest();
+        } elseif ($this->shouldUpdate()) {
+            $this->onUpdateRequest();
+        } elseif ($this->shouldDelete()) {
+            $this->onDeleteRequest();
+        }
+    }
+
+    /**
+     * Prepare the form for mode insert
+     *
+     * Populates the form with the data passed to add().
+     */
+    protected function onInsertRequest()
     {
         $data = $this->getData();
         if (! empty($data)) {
@@ -191,6 +208,42 @@ abstract class RepositoryForm extends Form
         }
     }
 
+    /**
+     * Prepare the form for mode update
+     *
+     * Populates the form with either the data passed to edit() or tries to fetch it from the repository.
+     *
+     * @throws  NotFoundError   In case the entry to update cannot be found
+     */
+    protected function onUpdateRequest()
+    {
+        $data = $this->getData();
+        if (empty($data)) {
+            $row = $this->repository->select()->applyFilter($this->createFilter())->fetchRow();
+            if ($row === false) {
+                throw new NotFoundError('Entry "%s" not found', $this->getIdentifier());
+            }
+
+            $data = get_object_vars($row);
+        }
+
+        $this->populate($data);
+    }
+
+    /**
+     * Prepare the form for mode delete
+     *
+     * Verifies that the repository contains the entry to delete.
+     *
+     * @throws  NotFoundError   In case the entry to delete cannot be found
+     */
+    protected function onDeleteRequest()
+    {
+        if ($this->repository->select()->addFilter($this->createFilter())->count() === 0) {
+            throw new NotFoundError('Entry "%s" not found', $this->getIdentifier());
+        }
+    }
+
     /**
      * Apply the requested mode on the repository
      *

From ad6b4016f0a0454cac25fc24881acb294b3fc7f5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 28 May 2015 16:28:43 +0200
Subject: [PATCH 1850/2920] UserController: Let the form validate the user's
 name

refs #8826
---
 application/controllers/UserController.php | 24 ++++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index db60d4e96..05adf03d7 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -4,6 +4,7 @@
 use \Exception;
 use Icinga\Application\Logger;
 use Icinga\Exception\ConfigurationError;
+use Icinga\Exception\NotFoundError;
 use Icinga\Forms\Config\User\CreateMembershipForm;
 use Icinga\Forms\Config\User\UserForm;
 use Icinga\Data\DataArray\ArrayDatasource;
@@ -185,15 +186,15 @@ class UserController extends AuthBackendController
         $userName = $this->params->getRequired('user');
         $backend = $this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Updatable');
 
-        $row = $backend->select(array('user_name', 'is_active'))->where('user_name', $userName)->fetchRow();
-        if ($row === false) {
-            $this->httpNotFound(sprintf($this->translate('User "%s" not found'), $userName));
-        }
-
         $form = new UserForm();
         $form->setRedirectUrl(Url::fromPath('user/show', array('backend' => $backend->getName(), 'user' => $userName)));
         $form->setRepository($backend);
-        $form->edit($userName, get_object_vars($row))->handleRequest();
+
+        try {
+            $form->edit($userName)->handleRequest();
+        } catch (NotFoundError $_) {
+            $this->httpNotFound(sprintf($this->translate('User "%s" not found'), $userName));
+        }
 
         $this->view->form = $form;
         $this->render('form');
@@ -208,14 +209,15 @@ class UserController extends AuthBackendController
         $userName = $this->params->getRequired('user');
         $backend = $this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Reducible');
 
-        if ($backend->select()->where('user_name', $userName)->count() === 0) {
-            $this->httpNotFound(sprintf($this->translate('User "%s" not found'), $userName));
-        }
-
         $form = new UserForm();
         $form->setRedirectUrl(Url::fromPath('user/list', array('backend' => $backend->getName())));
         $form->setRepository($backend);
-        $form->remove($userName)->handleRequest();
+
+        try {
+            $form->remove($userName)->handleRequest();
+        } catch (NotFoundError $_) {
+            $this->httpNotFound(sprintf($this->translate('User "%s" not found'), $userName));
+        }
 
         $this->view->form = $form;
         $this->render('form');

From 2c9af2fb81826d06af999f29608ccbcdb288c446 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 28 May 2015 16:28:59 +0200
Subject: [PATCH 1851/2920] GroupController: Let the form validate a group's
 name

refs #8826
---
 application/controllers/GroupController.php | 24 +++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 2ae15c967..360ff17dd 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -6,6 +6,7 @@ use Icinga\Application\Logger;
 use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\Data\Reducible;
 use Icinga\Data\Filter\Filter;
+use Icinga\Exception\NotFoundError;
 use Icinga\Forms\Config\UserGroup\AddMemberForm;
 use Icinga\Forms\Config\UserGroup\UserGroupForm;
 use Icinga\Web\Controller\AuthBackendController;
@@ -185,17 +186,17 @@ class GroupController extends AuthBackendController
         $groupName = $this->params->getRequired('group');
         $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Updatable');
 
-        $row = $backend->select(array('group_name'))->where('group_name', $groupName)->fetchRow();
-        if ($row === false) {
-            $this->httpNotFound(sprintf($this->translate('Group "%s" not found'), $groupName));
-        }
-
         $form = new UserGroupForm();
         $form->setRedirectUrl(
             Url::fromPath('group/show', array('backend' => $backend->getName(), 'group' => $groupName))
         );
         $form->setRepository($backend);
-        $form->edit($groupName, get_object_vars($row))->handleRequest();
+
+        try {
+            $form->edit($groupName)->handleRequest();
+        } catch (NotFoundError $_) {
+            $this->httpNotFound(sprintf($this->translate('Group "%s" not found'), $groupName));
+        }
 
         $this->view->form = $form;
         $this->render('form');
@@ -210,14 +211,15 @@ class GroupController extends AuthBackendController
         $groupName = $this->params->getRequired('group');
         $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Reducible');
 
-        if ($backend->select()->where('group_name', $groupName)->count() === 0) {
-            $this->httpNotFound(sprintf($this->translate('Group "%s" not found'), $groupName));
-        }
-
         $form = new UserGroupForm();
         $form->setRedirectUrl(Url::fromPath('group/list', array('backend' => $backend->getName())));
         $form->setRepository($backend);
-        $form->remove($groupName)->handleRequest();
+
+        try {
+            $form->remove($groupName)->handleRequest();
+        } catch (NotFoundError $_) {
+            $this->httpNotFound(sprintf($this->translate('Group "%s" not found'), $groupName));
+        }
 
         $this->view->form = $form;
         $this->render('form');

From 9f155ea99d9126f9d90e5fa9b74fda2bbbeffb38 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 28 May 2015 16:33:35 +0200
Subject: [PATCH 1852/2920] monitoring: Don't show SSH command when
 transporting a command to a remote command file failed

refs #8006
---
 .../library/Monitoring/Command/Transport/RemoteCommandFile.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
index 866497a5a..c0f670bfe 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
@@ -201,8 +201,7 @@ class RemoteCommandFile implements CommandTransportInterface
         exec($ssh, $output, $status);
         if ($status !== 0) {
             throw new TransportException(
-                'Can\'t send external Icinga command "%s": %s',
-                $ssh,
+                'Can\'t send external Icinga command: %s',
                 implode(' ', $output)
             );
         }

From 5e0ae6410b19096f0a3ffa142bdead841d0d31ff Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 May 2015 08:02:12 +0200
Subject: [PATCH 1853/2920] DbRepository: Consider a filter column without
 query context as a statement column

Feels wrong..somehow, but it works.

refs #8826
---
 library/Icinga/Repository/DbRepository.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index 38099b0e7..c43e8df54 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -529,7 +529,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      * @param   string              $table  The table where to look for the column or alias
      * @param   string              $name   The name or alias of the column to validate
      * @param   RepositoryQuery     $query  An optional query to pass as context,
-     *                                      if not given no join will be attempted
+     *                                      if not given the column is considered being used for a statement filter
      *
      * @return  string                      The given column's name
      *
@@ -537,7 +537,11 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      */
     public function requireFilterColumn($table, $name, RepositoryQuery $query = null)
     {
-        if ($query === null || $this->validateQueryColumnAssociation($table, $name)) {
+        if ($query === null) {
+            return $this->requireStatementColumn($table, $name);
+        }
+
+        if ($this->validateQueryColumnAssociation($table, $name)) {
             return parent::requireFilterColumn($table, $name, $query);
         }
 

From b123afe5943b6b6798ae492c9cb0554046c1f9b5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 May 2015 08:54:32 +0200
Subject: [PATCH 1854/2920] mysql schema: Make parent column a foreign key as
 well

refs #8826
---
 etc/schema/mysql.schema.sql | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/etc/schema/mysql.schema.sql b/etc/schema/mysql.schema.sql
index bbc801d8b..5f22aead3 100644
--- a/etc/schema/mysql.schema.sql
+++ b/etc/schema/mysql.schema.sql
@@ -3,11 +3,13 @@
 CREATE TABLE `icingaweb_group`(
   `id`     int(10) unsigned NOT NULL AUTO_INCREMENT,
   `name`   varchar(64) COLLATE utf8_unicode_ci NOT NULL,
-  `parent` varchar(64) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
+  `parent` int(10) unsigned NULL DEFAULT NULL,
   `ctime`  timestamp NULL DEFAULT NULL,
   `mtime`  timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
-  UNIQUE KEY `idx_name` (`name`)
+  UNIQUE KEY `idx_name` (`name`),
+  CONSTRAINT `fk_icingaweb_group_parent_id` FOREIGN KEY (`parent`)
+    REFERENCES `icingaweb_group` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `icingaweb_group_membership`(

From 9fcebb001498307d4fe9b4e8af9155df13d5ef9d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 May 2015 08:54:45 +0200
Subject: [PATCH 1855/2920] pgsql schema: Make parent column a foreign key as
 well

refs #8826
---
 etc/schema/pgsql.schema.sql | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/etc/schema/pgsql.schema.sql b/etc/schema/pgsql.schema.sql
index 09ecb0b71..7f28c5d81 100644
--- a/etc/schema/pgsql.schema.sql
+++ b/etc/schema/pgsql.schema.sql
@@ -3,7 +3,7 @@
 CREATE TABLE "icingaweb_group" (
   "id"     serial,
   "name"   character varying(64) NOT NULL,
-  "parent" character varying(64) NULL DEFAULT NULL,
+  "parent" int NULL DEFAULT NULL,
   "ctime"  timestamp NULL DEFAULT NULL,
   "mtime"  timestamp NULL DEFAULT NULL
 );
@@ -20,6 +20,15 @@ CREATE UNIQUE INDEX idx_icingaweb_group
     lower((name)::text)
 );
 
+ALTER TABLE ONLY "icingaweb_group"
+  ADD CONSTRAINT fk_icingaweb_group_parent_id
+  FOREIGN KEY (
+    "parent"
+  )
+  REFERENCES "icingaweb_group" (
+    "id"
+);
+
 CREATE TABLE "icingaweb_group_membership" (
   "group_id"   int NOT NULL,
   "username"   character varying(64) NOT NULL,

From c94e6a329275d7502e09a0eeebd73a8f2dc2e4c1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 May 2015 08:56:58 +0200
Subject: [PATCH 1856/2920] Db/IniUserGroupBackend: Drop column parent_name,
 it's not a name anymore

refs #8826
---
 application/controllers/GroupController.php           |  2 --
 application/views/scripts/group/show.phtml            | 11 -----------
 .../Authentication/UserGroup/DbUserGroupBackend.php   |  7 +++----
 .../Authentication/UserGroup/IniUserGroupBackend.php  |  5 ++---
 4 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 360ff17dd..8a13bfd6f 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -75,7 +75,6 @@ class GroupController extends AuthBackendController
         $this->setupSortControl(
             array(
                 'group_name'    => $this->translate('Group'),
-                'parent_name'   => $this->translate('Parent'),
                 'created_at'    => $this->translate('Created at'),
                 'last_modified' => $this->translate('Last modified')
             ),
@@ -94,7 +93,6 @@ class GroupController extends AuthBackendController
 
         $group = $backend->select(array(
             'group_name',
-            'parent_name',
             'created_at',
             'last_modified'
         ))->where('group_name', $groupName)->fetchRow();
diff --git a/application/views/scripts/group/show.phtml b/application/views/scripts/group/show.phtml
index 75895b908..1fd3e48c6 100644
--- a/application/views/scripts/group/show.phtml
+++ b/application/views/scripts/group/show.phtml
@@ -29,17 +29,6 @@ if ($this->hasPermission('config/application/groups/edit') && $backend instanceo
  <?php endif ?>
   <div class="group-header">
     <p class="group-name"><strong><?= $this->escape($group->group_name); ?></strong></p> <?= $editLink; ?>
-    <p class="group-parent"><strong><?= $this->translate('Parent'); ?>:</strong> <?= $group->parent_name === null ? '-' : $this->qlink(
-      $group->parent_name,
-      'group/show',
-      array(
-        'backend'   => $backend->getName(),
-        'group'     => $group->parent_name
-      ),
-      array(
-        'title'     => sprintf($this->translate('Show detailed information for group %s'), $group->parent_name)
-      )
-    ); ?></p>
     <p class="group-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $group->created_at === null ? '-' : $this->formatDateTime($group->created_at); ?></p>
     <p class="group-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $group->last_modified === null ? '-' : $this->formatDateTime($group->last_modified); ?></p>
   </div>
diff --git a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
index d3096dadd..2cf177e01 100644
--- a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
@@ -20,8 +20,7 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
             'group_id'      => 'g.id',
             'group'         => 'g.name COLLATE utf8_general_ci',
             'group_name'    => 'g.name',
-            'parent'        => 'g.parent COLLATE utf8_general_ci',
-            'parent_name'   => 'g.parent',
+            'parent'        => 'g.parent',
             'created_at'    => 'UNIX_TIMESTAMP(g.ctime)',
             'last_modified' => 'UNIX_TIMESTAMP(g.mtime)'
         ),
@@ -53,7 +52,7 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
         'group' => array(
             'group_id'      => 'id',
             'group_name'    => 'name',
-            'parent_name'   => 'parent',
+            'parent'        => 'parent',
             'created_at'    => 'ctime',
             'last_modified' => 'mtime'
         ),
@@ -70,7 +69,7 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
      *
      * @var array
      */
-    protected $filterColumns = array('group', 'parent', 'user');
+    protected $filterColumns = array('group', 'user');
 
     /**
      * Initialize this database user group backend
diff --git a/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
index a9d73038c..f17cbb6a8 100644
--- a/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
@@ -21,7 +21,6 @@ class IniUserGroupBackend extends IniRepository implements UserGroupBackendInter
             'group'         => 'name',
             'group_name'    => 'name',
             'parent'        => 'parent',
-            'parent_name'   => 'parent',
             'created_at'    => 'ctime',
             'last_modified' => 'mtime',
             'users'
@@ -33,7 +32,7 @@ class IniUserGroupBackend extends IniRepository implements UserGroupBackendInter
      *
      * @var array
      */
-    protected $filterColumns = array('group', 'parent');
+    protected $filterColumns = array('group');
 
     /**
      * The value conversion rules to apply on a query
@@ -96,7 +95,7 @@ class IniUserGroupBackend extends IniRepository implements UserGroupBackendInter
 
         $groups = array();
         foreach ($result as $group) {
-            $groups[$group->group_name] = $group->parent_name;
+            $groups[$group->group_name] = $group->parent;
         }
 
         $username = strtolower($user->getUsername());

From 60ce78c958e517f6711d7308e54313c2cb48f1bb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 May 2015 08:57:49 +0200
Subject: [PATCH 1857/2920] DbUserGroupBackend: Adjust how to load the name of
 a group's parent

refs #8826
---
 .../UserGroup/DbUserGroupBackend.php          | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
index 2cf177e01..10e2b8036 100644
--- a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
@@ -115,10 +115,23 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
      */
     public function getMemberships(User $user)
     {
+        $groupQuery = $this->ds
+            ->select()
+            ->from(
+                array('g' => $this->prependTablePrefix('group')),
+                array(
+                    'group_name'    => 'g.name',
+                    'parent_name'   => 'gg.name'
+                )
+            )->joinLeft(
+                array('gg' => $this->prependTablePrefix('group')),
+                'g.parent = gg.id',
+                array()
+            );
+
         $groups = array();
-        foreach ($this->ds->select()->from($this->prependTablePrefix('group'), array('name', 'parent')) as $group) {
-            // Using the raw query here due to the non-existent necessity to join, convert, or...
-            $groups[$group->name] = $group->parent;
+        foreach ($groupQuery as $group) {
+            $groups[$group->group_name] = $group->parent_name;
         }
 
         $membershipQuery = $this

From 41be32adff19bc578731a1d4692a3f7657d850c3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 11:23:47 +0200
Subject: [PATCH 1858/2920] monitoring: Provide only the
 monitoring/filter/objects restriction

We'll combine the hosts and services filter restrictions into a single restriction.

refs #9009
---
 modules/monitoring/configuration.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index fd3ee334d..e548a36e5 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -61,13 +61,8 @@ $this->providePermission(
 );
 
 $this->provideRestriction(
-    'monitoring/hosts/filter',
-    $this->translate('Restrict hosts view to the hosts that match the filter')
-);
-
-$this->provideRestriction(
-    'monitoring/services/filter',
-    $this->translate('Restrict services view to the services that match the filter')
+    'monitoring/filter/objects',
+    $this->translate('Restrict views to the Icinga objects that match the filter')
 );
 
 $this->provideConfigTab('backends', array(

From bb285db05beabe0ce2a4b0dee258295e36716bc9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 May 2015 11:32:15 +0200
Subject: [PATCH 1859/2920] Differentiate the source or destination of a column
 when converting values

refs #8826
---
 .../Authentication/User/DbUserBackend.php     |  8 +++-
 .../UserGroup/IniUserGroupBackend.php         | 10 +++--
 library/Icinga/Repository/DbRepository.php    | 42 +++++++++++++++++++
 library/Icinga/Repository/Repository.php      | 38 ++++++++++-------
 library/Icinga/Repository/RepositoryQuery.php | 28 ++++++-------
 5 files changed, 90 insertions(+), 36 deletions(-)

diff --git a/library/Icinga/Authentication/User/DbUserBackend.php b/library/Icinga/Authentication/User/DbUserBackend.php
index 7a3de8966..8a7991a0f 100644
--- a/library/Icinga/Authentication/User/DbUserBackend.php
+++ b/library/Icinga/Authentication/User/DbUserBackend.php
@@ -76,11 +76,15 @@ class DbUserBackend extends DbRepository implements UserBackendInterface
     );
 
     /**
-     * The value conversion rules to apply on a query/statement
+     * The value conversion rules to apply on a query or statement
      *
      * @var array
      */
-    protected $conversionRules = array('password');
+    protected $conversionRules = array(
+        'user' => array(
+            'password'
+        )
+    );
 
     /**
      * Initialize this database user backend
diff --git a/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
index f17cbb6a8..53eadc147 100644
--- a/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/IniUserGroupBackend.php
@@ -35,14 +35,16 @@ class IniUserGroupBackend extends IniRepository implements UserGroupBackendInter
     protected $filterColumns = array('group');
 
     /**
-     * The value conversion rules to apply on a query
+     * The value conversion rules to apply on a query or statement
      *
      * @var array
      */
     protected $conversionRules = array(
-        'created_at'    => 'date_time',
-        'last_modified' => 'date_time',
-        'users'         => 'comma_separated_string'
+        'groups' => array(
+            'created_at'    => 'date_time',
+            'last_modified' => 'date_time',
+            'users'         => 'comma_separated_string'
+        )
     );
 
     /**
diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index c43e8df54..9131b5052 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -401,6 +401,46 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
         }
     }
 
+    /**
+     * Return whether this repository is capable of converting values for the given table
+     *
+     * @param   array|string    $table
+     *
+     * @return  bool
+     */
+    public function providesValueConversion($table)
+    {
+        return parent::providesValueConversion($this->removeTablePrefix($this->clearTableAlias($table)));
+    }
+
+    /**
+     * Return the name of the conversion method for the given alias or column name and context
+     *
+     * @param   array|string    $table      The datasource's table
+     * @param   string          $name       The alias or column name for which to return a conversion method
+     * @param   string          $context    The context of the conversion: persist or retrieve
+     *
+     * @return  string
+     *
+     * @throws  ProgrammingError    In case a conversion rule is found but not any conversion method
+     */
+    protected function getConverter($table, $name, $context)
+    {
+        if (
+            $this->validateQueryColumnAssociation($table, $name)
+            || $this->validateStatementColumnAssociation($table, $name)
+        ) {
+            $table = $this->removeTablePrefix($this->clearTableAlias($table));
+        } else {
+            $table = $this->findTableName($name);
+            if (! $table) {
+                throw new ProgrammingError('Column name validation seems to have failed. Did you require the column?');
+            }
+        }
+
+        return parent::getConverter($table, $name, $context);
+    }
+
     /**
      * Validate that the requested table exists
      *
@@ -692,6 +732,8 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
             return $aliasTableMap[$column];
         }
 
+        // TODO(jom): Elaborate whether it makes sense to throw ProgrammingError
+        //            instead (duplicate aliases in different tables?)
         foreach ($aliasTableMap as $alias => $table) {
             if (strpos($alias, '.') !== false) {
                 list($_, $alias) = split('.', $column, 2);
diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index 7fba11727..7568a17f6 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -106,7 +106,7 @@ abstract class Repository implements Selectable
     protected $sortRules;
 
     /**
-     * The value conversion rules to apply on a query
+     * The value conversion rules to apply on a query or statement
      *
      * This may be initialized by concrete repository implementations and describes for which aliases or column
      * names what type of conversion is available. For entries, where the key is the alias/column and the value
@@ -403,27 +403,30 @@ abstract class Repository implements Selectable
     }
 
     /**
-     * Return whether this repository is capable of converting values
+     * Return whether this repository is capable of converting values for the given table
+     *
+     * @param   string  $table
      *
      * @return  bool
      */
-    public function providesValueConversion()
+    public function providesValueConversion($table)
     {
         $conversionRules = $this->getConversionRules();
-        return !empty($conversionRules);
+        return !empty($conversionRules) && isset($conversionRules[$table]);
     }
 
     /**
      * Convert a value supposed to be transmitted to the data source
      *
+     * @param   string  $table      The table where to persist the value
      * @param   string  $name       The alias or column name
      * @param   mixed   $value      The value to convert
      *
      * @return  mixed               If conversion was possible, the converted value, otherwise the unchanged value
      */
-    public function persistColumn($name, $value)
+    public function persistColumn($table, $name, $value)
     {
-        $converter = $this->getConverter($name, 'persist');
+        $converter = $this->getConverter($table, $name, 'persist');
         if ($converter !== null) {
             $value = $this->$converter($value);
         }
@@ -434,14 +437,15 @@ abstract class Repository implements Selectable
     /**
      * Convert a value which was fetched from the data source
      *
+     * @param   string  $table      The table the value has been fetched from
      * @param   string  $name       The alias or column name
      * @param   mixed   $value      The value to convert
      *
      * @return  mixed               If conversion was possible, the converted value, otherwise the unchanged value
      */
-    public function retrieveColumn($name, $value)
+    public function retrieveColumn($table, $name, $value)
     {
-        $converter = $this->getConverter($name, 'retrieve');
+        $converter = $this->getConverter($table, $name, 'retrieve');
         if ($converter !== null) {
             $value = $this->$converter($value);
         }
@@ -452,6 +456,7 @@ abstract class Repository implements Selectable
     /**
      * Return the name of the conversion method for the given alias or column name and context
      *
+     * @param   string  $table      The datasource's table
      * @param   string  $name       The alias or column name for which to return a conversion method
      * @param   string  $context    The context of the conversion: persist or retrieve
      *
@@ -459,12 +464,13 @@ abstract class Repository implements Selectable
      *
      * @throws  ProgrammingError    In case a conversion rule is found but not any conversion method
      */
-    protected function getConverter($name, $context)
+    protected function getConverter($table, $name, $context)
     {
         $conversionRules = $this->getConversionRules();
+        $tableRules = $conversionRules[$table];
 
         // Check for a conversion method for the alias/column first
-        if (array_key_exists($name, $conversionRules) || in_array($name, $conversionRules)) {
+        if (array_key_exists($name, $tableRules) || in_array($name, $tableRules)) {
             $methodName = $context . join('', array_map('ucfirst', explode('_', $name)));
             if (method_exists($this, $methodName)) {
                 return $methodName;
@@ -472,22 +478,22 @@ abstract class Repository implements Selectable
         }
 
         // The conversion method for the type is just a fallback, but it is required to exist if defined
-        if (isset($conversionRules[$name])) {
-            $identifier = join('', array_map('ucfirst', explode('_', $conversionRules[$name])));
+        if (isset($tableRules[$name])) {
+            $identifier = join('', array_map('ucfirst', explode('_', $tableRules[$name])));
             if (! method_exists($this, $context . $identifier)) {
                 // Do not throw an error in case at least one conversion method exists
                 if (! method_exists($this, ($context === 'persist' ? 'retrieve' : 'persist') . $identifier)) {
                     throw new ProgrammingError(
                         'Cannot find any conversion method for type "%s"'
                         . '. Add a proper conversion method or remove the type definition',
-                        $conversionRules[$name]
+                        $tableRules[$name]
                     );
                 }
 
                 Logger::debug(
                     'Conversion method "%s" for type definition "%s" does not exist in repository "%s".',
                     $context . $identifier,
-                    $conversionRules[$name],
+                    $tableRules[$name],
                     $this->getName()
                 );
             } else {
@@ -623,7 +629,7 @@ abstract class Repository implements Selectable
         if ($filter->isExpression()) {
             $column = $filter->getColumn();
             $filter->setColumn($this->requireFilterColumn($table, $column, $query));
-            $filter->setExpression($this->persistColumn($column, $filter->getExpression()));
+            $filter->setExpression($this->persistColumn($table, $column, $filter->getExpression()));
         } elseif ($filter->isChain()) {
             foreach ($filter->filters() as $chainOrExpression) {
                 $this->requireFilter($table, $chainOrExpression, $query);
@@ -826,7 +832,7 @@ abstract class Repository implements Selectable
     {
         $resolved = array();
         foreach ($data as $alias => $value) {
-            $resolved[$this->requireStatementColumn($table, $alias)] = $this->persistColumn($alias, $value);
+            $resolved[$this->requireStatementColumn($table, $alias)] = $this->persistColumn($table, $alias, $value);
         }
 
         return $resolved;
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index 8048ce434..9a8eb7e83 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -153,7 +153,7 @@ class RepositoryQuery implements QueryInterface, Iterator
     {
         $this->query->where(
             $this->repository->requireFilterColumn($this->target, $column, $this),
-            $this->repository->persistColumn($column, $value)
+            $this->repository->persistColumn($this->target, $column, $value)
         );
         return $this;
     }
@@ -388,10 +388,10 @@ class RepositoryQuery implements QueryInterface, Iterator
         }
 
         $result = $this->query->fetchOne();
-        if ($result !== false && $this->repository->providesValueConversion()) {
+        if ($result !== false && $this->repository->providesValueConversion($this->target)) {
             $columns = $this->getColumns();
             $column = isset($columns[0]) ? $columns[0] : key($columns);
-            return $this->repository->retrieveColumn($column, $result);
+            return $this->repository->retrieveColumn($this->target, $column, $result);
         }
 
         return $result;
@@ -409,13 +409,13 @@ class RepositoryQuery implements QueryInterface, Iterator
         }
 
         $result = $this->query->fetchRow();
-        if ($result !== false && $this->repository->providesValueConversion()) {
+        if ($result !== false && $this->repository->providesValueConversion($this->target)) {
             foreach ($this->getColumns() as $alias => $column) {
                 if (! is_string($alias)) {
                     $alias = $column;
                 }
 
-                $result->$alias = $this->repository->retrieveColumn($alias, $result->$alias);
+                $result->$alias = $this->repository->retrieveColumn($this->target, $alias, $result->$alias);
             }
         }
 
@@ -434,12 +434,12 @@ class RepositoryQuery implements QueryInterface, Iterator
         }
 
         $results = $this->query->fetchColumn();
-        if (! empty($results) && $this->repository->providesValueConversion()) {
+        if (! empty($results) && $this->repository->providesValueConversion($this->target)) {
             $columns = $this->getColumns();
             $aliases = array_keys($columns);
             $column = is_int($aliases[0]) ? $columns[0] : $aliases[0];
             foreach ($results as & $value) {
-                $value = $this->repository->retrieveColumn($column, $value);
+                $value = $this->repository->retrieveColumn($this->target, $column, $value);
             }
         }
 
@@ -460,15 +460,15 @@ class RepositoryQuery implements QueryInterface, Iterator
         }
 
         $results = $this->query->fetchPairs();
-        if (! empty($results) && $this->repository->providesValueConversion()) {
+        if (! empty($results) && $this->repository->providesValueConversion($this->target)) {
             $columns = $this->getColumns();
             $aliases = array_keys($columns);
             $newResults = array();
             foreach ($results as $colOneValue => $colTwoValue) {
                 $colOne = $aliases[0] !== 0 ? $aliases[0] : $columns[0];
                 $colTwo = count($aliases) < 2 ? $colOne : ($aliases[1] !== 1 ? $aliases[1] : $columns[1]);
-                $colOneValue = $this->repository->retrieveColumn($colOne, $colOneValue);
-                $newResults[$colOneValue] = $this->repository->retrieveColumn($colTwo, $colTwoValue);
+                $colOneValue = $this->repository->retrieveColumn($this->target, $colOne, $colOneValue);
+                $newResults[$colOneValue] = $this->repository->retrieveColumn($this->target, $colTwo, $colTwoValue);
             }
 
             $results = $newResults;
@@ -489,7 +489,7 @@ class RepositoryQuery implements QueryInterface, Iterator
         }
 
         $results = $this->query->fetchAll();
-        if (! empty($results) && $this->repository->providesValueConversion()) {
+        if (! empty($results) && $this->repository->providesValueConversion($this->target)) {
             $columns = $this->getColumns();
             foreach ($results as $row) {
                 foreach ($columns as $alias => $column) {
@@ -497,7 +497,7 @@ class RepositoryQuery implements QueryInterface, Iterator
                         $alias = $column;
                     }
 
-                    $row->$alias = $this->repository->retrieveColumn($alias, $row->$alias);
+                    $row->$alias = $this->repository->retrieveColumn($this->target, $alias, $row->$alias);
                 }
             }
         }
@@ -545,13 +545,13 @@ class RepositoryQuery implements QueryInterface, Iterator
     public function current()
     {
         $row = $this->iterator->current();
-        if ($this->repository->providesValueConversion()) {
+        if ($this->repository->providesValueConversion($this->target)) {
             foreach ($this->getColumns() as $alias => $column) {
                 if (! is_string($alias)) {
                     $alias = $column;
                 }
 
-                $row->$alias = $this->repository->retrieveColumn($alias, $row->$alias);
+                $row->$alias = $this->repository->retrieveColumn($this->target, $alias, $row->$alias);
             }
         }
 

From a88037f45d42311394fce7ce9c352332399c18e7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 May 2015 11:33:35 +0200
Subject: [PATCH 1860/2920] DbUserGroupBackend: Fetch and persist a group's id
 when it's name is given

refs #8826
---
 .../UserGroup/DbUserGroupBackend.php          | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
index 10e2b8036..e77d50f78 100644
--- a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
@@ -4,6 +4,7 @@
 namespace Icinga\Authentication\UserGroup;
 
 use Icinga\Data\Filter\Filter;
+use Icinga\Exception\NotFoundError;
 use Icinga\Repository\DbRepository;
 use Icinga\Repository\RepositoryQuery;
 use Icinga\User;
@@ -58,6 +59,7 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
         ),
         'group_membership' => array(
             'group_id'      => 'group_id',
+            'group_name'    => 'group_id',
             'user_name'     => 'username',
             'created_at'    => 'ctime',
             'last_modified' => 'mtime'
@@ -71,6 +73,20 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
      */
     protected $filterColumns = array('group', 'user');
 
+    /**
+     * The value conversion rules to apply on a query or statement
+     *
+     * @var array
+     */
+    protected $conversionRules = array(
+        'group'             => array(
+            'parent'        => 'group_id'
+        ),
+        'group_membership'  => array(
+            'group_name'    => 'group_id'
+        )
+    );
+
     /**
      * Initialize this database user group backend
      */
@@ -180,4 +196,31 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
             array()
         );
     }
+
+    /**
+     * Fetch and return the corresponding id for the given group's name
+     *
+     * @param   string  $groupName
+     *
+     * @return  int
+     *
+     * @throws  NotFoundError       In case no group with the given name is found
+     */
+    protected function persistGroupId($groupName)
+    {
+        if (is_int($groupName)) {
+            return $groupName; // It's obviously already an id
+        }
+
+        $groupId = $this->ds
+            ->select()
+            ->from($this->prependTablePrefix('group'), array('id'))
+            ->where('name', $groupName)
+            ->fetchOne();
+        if ($groupId === false) {
+            throw new NotFoundError('Group "%s" does not exist', $groupName);
+        }
+
+        return $groupId;
+    }
 }

From 3959dc27d7128140150e8212c8d6785da9e7872c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 May 2015 11:36:08 +0200
Subject: [PATCH 1861/2920] Repository: Do not return filter columns when
 requiring all query columns

I really wonder why I did not notice this until now...

refs #8826
---
 library/Icinga/Repository/Repository.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index 7568a17f6..d615fd149 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -653,7 +653,15 @@ abstract class Repository implements Selectable
             throw new ProgrammingError('Table name "%s" not found', $table);
         }
 
-        return $queryColumns[$table];
+        $filterColumns = $this->getFilterColumns();
+        $columns = array();
+        foreach ($queryColumns[$table] as $alias => $column) {
+            if (! in_array(is_string($alias) ? $alias : $column, $filterColumns)) {
+                $columns[$alias] = $column;
+            }
+        }
+
+        return $columns;
     }
 
     /**

From b82d7d7cc0da17ec41162fb1f40182dcabe7fd07 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 May 2015 11:37:42 +0200
Subject: [PATCH 1862/2920] DbRepository: split() is deprecated, use explode()
 instead

Why php, why? :'(

refs #8826
---
 library/Icinga/Repository/DbRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index 9131b5052..6c7a7b22b 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -736,7 +736,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
         //            instead (duplicate aliases in different tables?)
         foreach ($aliasTableMap as $alias => $table) {
             if (strpos($alias, '.') !== false) {
-                list($_, $alias) = split('.', $column, 2);
+                list($_, $alias) = explode('.', $column, 2);
                 if ($alias === $column) {
                     return $table;
                 }

From 7793b61e4cfd5e341e8d0c88b5e0612101ea2c7d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 11:40:26 +0200
Subject: [PATCH 1863/2920] monitoring: Combine restrictions w/ OR

If a user has more than one filter for the same restriction, the filters will be combined w/ or. The combined filters will then be applied w/ AND to the query.

refs #9009
---
 modules/monitoring/library/Monitoring/Controller.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php
index c3cbe3c2d..b6b65fc0c 100644
--- a/modules/monitoring/library/Monitoring/Controller.php
+++ b/modules/monitoring/library/Monitoring/Controller.php
@@ -58,9 +58,11 @@ class Controller extends IcingaWebController
      */
     protected function applyRestriction($restriction, Filterable $view)
     {
+        $restrictions = Filter::matchAny();
         foreach ($this->getRestrictions($restriction) as $filter) {
-            $view->applyFilter(Filter::fromQueryString($filter));
+            $restrictions->addFilter(Filter::fromQueryString($filter));
         }
+        $view->applyFilter($restrictions);
         return $view;
     }
 }

From 4544653c2e922fc087b4ccecfc941abdacf9880b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 11:41:39 +0200
Subject: [PATCH 1864/2920] monitoring: Don't apply restrictions in the
 downtime query

Restrictions should be applied from the controller.

refs #9009
---
 .../Backend/Ido/Query/DowntimeQuery.php       | 37 -------------------
 1 file changed, 37 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index b08944e77..67be1929b 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -71,41 +71,6 @@ class DowntimeQuery extends IdoQuery
         return $this;
     }
 
-    /**
-     * Apply host restrictions to a query
-     *
-     * @param IdoQuery $query
-     */
-    protected function applyHostRestrictions(IdoQuery $query)
-    {
-        $hostRestrictions = Filter::matchAny();
-        foreach (Manager::getInstance()->getRestrictions('monitoring/hosts/filter') as $restriction) {
-            $hostRestrictions->addFilter(Filter::fromQueryString($restriction));
-        }
-        $query->addFilter($hostRestrictions);
-    }
-
-    /**
-     * Apply host and service restrictions to a query
-     *
-     * @param IdoQuery $query
-     */
-    protected function applyServiceRestrictions(IdoQuery $query)
-    {
-        $hostAndServiceRestrictions = Filter::matchAll();
-        $hostRestrictions = Filter::matchAny();
-        $serviceRestrictions = Filter::matchAny();
-        foreach (Manager::getInstance()->getRestrictions('monitoring/hosts/filter') as $restriction) {
-            $hostRestrictions->addFilter(Filter::fromQueryString($restriction));
-        }
-        foreach (Manager::getInstance()->getRestrictions('monitoring/services/filter') as $restriction) {
-            $serviceRestrictions->addFilter(Filter::fromQueryString($restriction));
-        }
-        $hostAndServiceRestrictions->addFilter($hostRestrictions);
-        $hostAndServiceRestrictions->addFilter($serviceRestrictions);
-        $query->addFilter($hostAndServiceRestrictions);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -129,7 +94,6 @@ class DowntimeQuery extends IdoQuery
             $columns[$column] = new Zend_Db_Expr('NULL');
         }
         $hosts = $this->createSubQuery('hoststatus', $columns);
-        $this->applyHostRestrictions($hosts);
         $this->subQueries[] = $hosts;
         $this->downtimeQuery->union(array($hosts), Zend_Db_Select::SQL_UNION_ALL);
     }
@@ -141,7 +105,6 @@ class DowntimeQuery extends IdoQuery
     {
         $columns = array_keys($this->columnMap['downtimes'] + $this->columnMap['hosts'] + $this->columnMap['services']);
         $services = $this->createSubQuery('servicestatus', $columns);
-        $this->applyServiceRestrictions($services);
         $this->subQueries[] = $services;
         $this->downtimeQuery->union(array($services), Zend_Db_Select::SQL_UNION_ALL);
     }

From c17334deeeb6196c7f6cefa3746baef854cf8a0e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 11:42:05 +0200
Subject: [PATCH 1865/2920] monitoring: Support restricting the downtimes
 overview

refs #9009
---
 modules/monitoring/application/controllers/ListController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 197bf5b69..816aeb153 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -249,6 +249,9 @@ class Monitoring_ListController extends Controller
             'service_display_name'
         ));
         $this->filterQuery($query);
+
+        $this->applyRestriction('monitoring/filter/objects', $query);
+
         $this->view->downtimes = $query;
 
         $this->setupLimitControl();

From b1446fcb232d55d26fe1034432e3dc9b2b117ad4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 11:43:41 +0200
Subject: [PATCH 1866/2920] monitoring: Allow the hoststatus query to be
 filtered by restrictable columns

refs #9009
---
 .../Backend/Ido/Query/HoststatusQuery.php     | 71 +++++++++++++++++--
 1 file changed, 67 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index d5e9cefd7..3c0ee9688 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -144,8 +144,18 @@ class HoststatusQuery extends IdoQuery
             'host_status_update_time'   => 'hs.status_update_time',
             'host_unhandled'            => 'CASE WHEN (hs.problem_has_been_acknowledged + hs.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END'
         ),
+        'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
+        ),
         'serviceproblemsummary' => array(
             'host_unhandled_services' => 'sps.unhandled_services_count'
+        ),
+        'services' => array(
+            'service'                => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'    => 'so.name2',
+            'service_display_name'   => 's.display_name COLLATE latin1_general_ci',
         )
     );
 
@@ -204,10 +214,10 @@ class HoststatusQuery extends IdoQuery
             'hgo.is_active = ?',
             1
         )
-            ->where(
-                'hgo.objecttype_id = ?',
-                3
-            );
+        ->where(
+            'hgo.objecttype_id = ?',
+            3
+        );
         $this->distinct();
     }
 
@@ -223,6 +233,59 @@ class HoststatusQuery extends IdoQuery
         );
     }
 
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = s.service_object_id',
+            array()
+        )->join(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
+            array()
+        )->join(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id',
+            array()
+        )->where(
+            'sgo.is_active = ?',
+            1
+        )
+        ->where(
+            'sgo.objecttype_id = ?',
+            4
+        );
+        $this->distinct();
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $this->select->join(
+            array('s' => $this->prefix . 'services'),
+            's.host_object_id = h.host_object_id',
+            array()
+        )->join(
+            array('so' => $this->prefix . 'objects'),
+            'so.object_id = s.service_object_id AND so.is_active = 1',
+            array()
+        )->where(
+            'so.is_active = ?',
+            1
+        )
+        ->where(
+            'so.objecttype_id = ?',
+            2
+        );
+        $this->distinct();
+    }
+
     /**
      * Join service problem summary
      */

From 3a69e8185fd3bf3c875a5037ce9e223d406e917b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 11:44:34 +0200
Subject: [PATCH 1867/2920] monitoring: Add restrictable filter columns to the
 downtime data view

refs #9009
---
 .../library/Monitoring/DataView/Downtime.php  | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index 366e80d78..3664bf95b 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -24,27 +24,25 @@ class Downtime extends DataView
     public function getColumns()
     {
         return array(
-            'downtime_objecttype',
+            'downtime_author',
             'downtime_author_name',
             'downtime_comment',
+            'downtime_duration',
+            'downtime_end',
             'downtime_entry_time',
+            'downtime_internal_id',
             'downtime_is_fixed',
             'downtime_is_flexible',
-            'downtime_start',
-            'downtime_scheduled_start',
-            'downtime_scheduled_end',
-            'downtime_end',
-            'downtime_duration',
             'downtime_is_in_effect',
-            'downtime_triggered_by_id',
-            'downtime_internal_id',
-            'downtime_host_state',
-            'downtime_service_state',
+            'downtime_scheduled_end',
+            'downtime_scheduled_start',
+            'downtime_start',
             'host_display_name',
-            'service_display_name',
             'host_name',
-            'service_host_name',
-            'service_description'
+            'object_type',
+            'service_description',
+            'service_display_name',
+            'service_host_name'
         );
     }
 
@@ -53,7 +51,10 @@ class Downtime extends DataView
      */
     public function getFilterColumns()
     {
-        return array('hostgroup', 'hostgroup_alias', 'hostgroup_name', 'servicegroup', 'servicegroup_alias', 'servicegroup_name');
+        return array(
+            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+        );
     }
 
     /**

From cc779024fe78070b8c2ff420716f4da8626f361b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 May 2015 11:57:38 +0200
Subject: [PATCH 1868/2920] Repository: providesValueConversion() should not be
 required being called

refs #8826
---
 library/Icinga/Repository/Repository.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index d615fd149..ccb3da96a 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -467,6 +467,10 @@ abstract class Repository implements Selectable
     protected function getConverter($table, $name, $context)
     {
         $conversionRules = $this->getConversionRules();
+        if (! isset($conversionRules[$table])) {
+            return;
+        }
+
         $tableRules = $conversionRules[$table];
 
         // Check for a conversion method for the alias/column first

From c8e8a39f5a08de37cb1e51fa88336c90d804adfc Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 May 2015 11:58:21 +0200
Subject: [PATCH 1869/2920] DbRepository: Relax check in
 providesValueConversion()

Would otherwise conflict when tables are joined in.

refs #8826
---
 library/Icinga/Repository/DbRepository.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index 6c7a7b22b..e2ba7d994 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -402,15 +402,19 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     }
 
     /**
-     * Return whether this repository is capable of converting values for the given table
+     * Return whether this repository is capable of converting values
+     *
+     * This does not check whether any conversion for the given table is available, as it may be possible
+     * that columns from another table where joined in which would otherwise not being converted.
      *
      * @param   array|string    $table
      *
      * @return  bool
      */
-    public function providesValueConversion($table)
+    public function providesValueConversion($_)
     {
-        return parent::providesValueConversion($this->removeTablePrefix($this->clearTableAlias($table)));
+        $conversionRules = $this->getConversionRules();
+        return !empty($conversionRules);
     }
 
     /**

From cb4d6f013a10be29b695d0c308ececc42f690a9c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 May 2015 12:57:39 +0200
Subject: [PATCH 1870/2920] GroupController: Properly handle 404's when
 handling group members

refs #8826
---
 application/controllers/GroupController.php   | 26 +++++++++++--------
 .../forms/Config/UserGroup/AddMemberForm.php  |  3 +++
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 8a13bfd6f..0c2a4a45d 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -232,10 +232,6 @@ class GroupController extends AuthBackendController
         $groupName = $this->params->getRequired('group');
         $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Extensible');
 
-        if ($backend->select()->where('group_name', $groupName)->count() === 0) {
-            $this->httpNotFound(sprintf($this->translate('Group "%s" not found'), $groupName));
-        }
-
         $form = new AddMemberForm();
         $form->setDataSource($this->fetchUsers())
             ->setBackend($backend)
@@ -243,8 +239,13 @@ class GroupController extends AuthBackendController
             ->setRedirectUrl(
                 Url::fromPath('group/show', array('backend' => $backend->getName(), 'group' => $groupName))
             )
-            ->setUidDisabled()
-            ->handleRequest();
+            ->setUidDisabled();
+
+        try {
+            $form->handleRequest();
+        } catch (NotFoundError $_) {
+            $this->httpNotFound(sprintf($this->translate('Group "%s" not found'), $groupName));
+        }
 
         $this->view->form = $form;
         $this->render('form');
@@ -260,10 +261,6 @@ class GroupController extends AuthBackendController
         $groupName = $this->params->getRequired('group');
         $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Reducible');
 
-        if ($backend->select()->where('group_name', $groupName)->count() === 0) {
-            $this->httpNotFound(sprintf($this->translate('Group "%s" not found'), $groupName));
-        }
-
         $form = new Form(array(
             'onSuccess' => function ($form) use ($groupName, $backend) {
                 foreach ($form->getValue('user_name') as $userName) {
@@ -280,6 +277,8 @@ class GroupController extends AuthBackendController
                             $userName,
                             $groupName
                         ));
+                    } catch (NotFoundError $e) {
+                        throw $e;
                     } catch (Exception $e) {
                         Notification::error($e->getMessage());
                     }
@@ -297,7 +296,12 @@ class GroupController extends AuthBackendController
         $form->setSubmitLabel('btn_submit'); // Required to ensure that isSubmitted() is called
         $form->addElement('hidden', 'user_name', array('required' => true, 'isArray' => true));
         $form->addElement('hidden', 'redirect');
-        $form->handleRequest();
+
+        try {
+            $form->handleRequest();
+        } catch (NotFoundError $_) {
+            $this->httpNotFound(sprintf($this->translate('Group "%s" not found'), $groupName));
+        }
     }
 
     /**
diff --git a/application/forms/Config/UserGroup/AddMemberForm.php b/application/forms/Config/UserGroup/AddMemberForm.php
index 6a57df3b4..88064dcdd 100644
--- a/application/forms/Config/UserGroup/AddMemberForm.php
+++ b/application/forms/Config/UserGroup/AddMemberForm.php
@@ -7,6 +7,7 @@ use Exception;
 use Icinga\Data\Extensible;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Selectable;
+use Icinga\Exception\NotFoundError;
 use Icinga\Web\Form;
 use Icinga\Web\Notification;
 
@@ -155,6 +156,8 @@ class AddMemberForm extends Form
                         'user_name'     => $userName
                     )
                 );
+            } catch (NotFoundError $e) {
+                throw $e; // Trigger 404, the group name is initially accessed as GET parameter
             } catch (Exception $e) {
                 Notification::error(sprintf(
                     $this->translate('Failed to add "%s" as group member for "%s"'),

From 3e53426ecefe5032957122e86b0d866c030a4e0e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 13:10:20 +0200
Subject: [PATCH 1871/2920] monitoring: Add query for host downtimes

refs #9009
---
 .../Backend/Ido/Query/HostdowntimeQuery.php   | 189 ++++++++++++++++++
 1 file changed, 189 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
new file mode 100644
index 000000000..7d123132d
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
@@ -0,0 +1,189 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+/**
+ * Query for host downtimes
+ */
+class HostdowntimeQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'downtimes' => array(
+            'downtime_author'           => 'sd.author_name COLLATE latin1_general_ci',
+            'downtime_author_name'      => 'sd.author_name',
+            'downtime_comment'          => 'sd.comment_data',
+            'downtime_duration'         => 'sd.duration',
+            'downtime_end'              => 'CASE WHEN sd.is_fixed > 0 THEN UNIX_TIMESTAMP(sd.scheduled_end_time) ELSE UNIX_TIMESTAMP(sd.trigger_time) + sd.duration END',
+            'downtime_entry_time'       => 'UNIX_TIMESTAMP(sd.entry_time)',
+            'downtime_internal_id'      => 'sd.internal_downtime_id',
+            'downtime_is_fixed'         => 'sd.is_fixed',
+            'downtime_is_flexible'      => 'CASE WHEN sd.is_fixed = 0 THEN 1 ELSE 0 END',
+            'downtime_is_in_effect'     => 'sd.is_in_effect',
+            'downtime_scheduled_end'    => 'UNIX_TIMESTAMP(sd.scheduled_end_time)',
+            'downtime_scheduled_start'  => 'UNIX_TIMESTAMP(sd.scheduled_start_time)',
+            'downtime_start'            => 'UNIX_TIMESTAMP(CASE WHEN UNIX_TIMESTAMP(sd.trigger_time) > 0 then sd.trigger_time ELSE sd.scheduled_start_time END)',
+            'downtime_triggered_by_id'  => 'sd.triggered_by_id',
+            'host'                      => 'ho.name1 COLLATE latin1_general_ci',
+            'host_name'                 => 'ho.name1',
+            'object_type'               => '(\'host\')'
+        ),
+        'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
+        ),
+        'hosts' => array(
+            'host_alias'            => 'h.alias',
+            'host_display_name'     => 'h.display_name COLLATE latin1_general_ci'
+        ),
+        'hoststatus' => array(
+            'host_state' => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END'
+        ),
+        'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
+        ),
+        'services' => array(
+            'service'                => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'    => 'so.name2',
+            'service_display_name'   => 's.display_name COLLATE latin1_general_ci',
+        )
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        $this->select->from(
+            array('sd' => $this->prefix . 'scheduleddowntime'),
+            array()
+        )->join(
+            array('ho' => $this->prefix . 'objects'),
+            'sd.object_id = ho.object_id',
+            array()
+        )->where(
+            'ho.is_active = ?',
+            1
+        )->where(
+            'ho.objecttype_id = ?',
+            1
+        );
+        $this->joinedVirtualTables['downtimes'] = true;
+    }
+
+    /**
+     * Join host groups
+     */
+    protected function joinHostgroups()
+    {
+        $this->select->join(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = ho.object_id',
+            array()
+        )->join(
+            array('hg' => $this->prefix . 'hostgroups'),
+            'hg.hostgroup_id = hgm.hostgroup_id',
+            array()
+        )->join(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hg.hostgroup_object_id',
+            array()
+        )->where(
+            'hgo.is_active = ?',
+            1
+        )
+        ->where(
+            'hgo.objecttype_id = ?',
+            3
+        );
+        $this->distinct();
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $this->select->join(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = ho.object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join host status
+     */
+    protected function joinHoststatus()
+    {
+        $this->select->join(
+            array('hs' => $this->prefix . 'hoststatus'),
+            'hs.host_object_id = ho.object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = s.service_object_id',
+            array()
+        )->join(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
+            array()
+        )->join(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id',
+            array()
+        )->where(
+            'sgo.is_active = ?',
+            1
+        )
+        ->where(
+            'sgo.objecttype_id = ?',
+            4
+        );
+        $this->distinct();
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $this->select->join(
+            array('s' => $this->prefix . 'services'),
+            's.host_object_id = h.host_object_id',
+            array()
+        )->join(
+            array('so' => $this->prefix . 'objects'),
+            'so.object_id = s.service_object_id AND so.is_active = 1',
+            array()
+        )->where(
+            'so.is_active = ?',
+            1
+        )
+        ->where(
+            'so.objecttype_id = ?',
+            2
+        );
+        $this->distinct();
+    }
+}

From 22a83b738884f100e5f6bf67d29b62f1ff8f52fd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 13:11:32 +0200
Subject: [PATCH 1872/2920] monitoring: Add data view for host downtimes

refs #9009
---
 .../Monitoring/DataView/Hostdowntime.php      | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/DataView/Hostdowntime.php

diff --git a/modules/monitoring/library/Monitoring/DataView/Hostdowntime.php b/modules/monitoring/library/Monitoring/DataView/Hostdowntime.php
new file mode 100644
index 000000000..f95f82da2
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/DataView/Hostdowntime.php
@@ -0,0 +1,59 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\DataView;
+
+/**
+ * Host downtime view
+ */
+class Hostdowntime extends DataView
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        }
+        return parent::isValidFilterTarget($column);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getColumns()
+    {
+        return array(
+            'downtime_author',
+            'downtime_author_name',
+            'downtime_comment',
+            'downtime_duration',
+            'downtime_end',
+            'downtime_entry_time',
+            'downtime_internal_id',
+            'downtime_is_fixed',
+            'downtime_is_flexible',
+            'downtime_is_in_effect',
+            'downtime_scheduled_end',
+            'downtime_scheduled_start',
+            'downtime_start',
+            'host_display_name',
+            'host_name',
+            'object_type'
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFilterColumns()
+    {
+        return array(
+            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+        );
+    }
+}

From 02cabf3a50e6755b3304f180e852fffd9c375bc1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 13:11:48 +0200
Subject: [PATCH 1873/2920] monitoring: Add query for service downtimes

refs #9009
---
 .../Ido/Query/ServicedowntimeQuery.php        | 195 ++++++++++++++++++
 1 file changed, 195 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
new file mode 100644
index 000000000..67f21c67c
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
@@ -0,0 +1,195 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+/**
+ * Query for service downtimes
+ */
+class ServicedowntimeQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'downtimes' => array(
+            'downtime_author'           => 'sd.author_name COLLATE latin1_general_ci',
+            'downtime_author_name'      => 'sd.author_name',
+            'downtime_comment'          => 'sd.comment_data',
+            'downtime_duration'         => 'sd.duration',
+            'downtime_end'              => 'CASE WHEN sd.is_fixed > 0 THEN UNIX_TIMESTAMP(sd.scheduled_end_time) ELSE UNIX_TIMESTAMP(sd.trigger_time) + sd.duration END',
+            'downtime_entry_time'       => 'UNIX_TIMESTAMP(sd.entry_time)',
+            'downtime_internal_id'      => 'sd.internal_downtime_id',
+            'downtime_is_fixed'         => 'sd.is_fixed',
+            'downtime_is_flexible'      => 'CASE WHEN sd.is_fixed = 0 THEN 1 ELSE 0 END',
+            'downtime_is_in_effect'     => 'sd.is_in_effect',
+            'downtime_scheduled_end'    => 'UNIX_TIMESTAMP(sd.scheduled_end_time)',
+            'downtime_scheduled_start'  => 'UNIX_TIMESTAMP(sd.scheduled_start_time)',
+            'downtime_start'            => 'UNIX_TIMESTAMP(CASE WHEN UNIX_TIMESTAMP(sd.trigger_time) > 0 then sd.trigger_time ELSE sd.scheduled_start_time END)',
+            'downtime_triggered_by_id'  => 'sd.triggered_by_id',
+            'host'                      => 'so.name1 COLLATE latin1_general_ci',
+            'host_name'                 => 'so.name1',
+            'object_type'               => '(\'service\')',
+            'service'                   => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'       => 'so.name2',
+            'service_host'              => 'so.name1 COLLATE latin1_general_ci',
+            'service_host_name'         => 'so.name1'
+        ),
+        'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
+        ),
+        'hosts' => array(
+            'host_alias'            => 'h.alias',
+            'host_display_name'     => 'h.display_name COLLATE latin1_general_ci'
+        ),
+        'hoststatus' => array(
+            'host_state' => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END'
+        ),
+        'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
+        ),
+        'services' => array(
+            'service_display_name' => 's.display_name COLLATE latin1_general_ci'
+        ),
+        'servicestatus' => array(
+            'service_state' => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END'
+        )
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        $this->select->from(
+            array('sd' => $this->prefix . 'scheduleddowntime'),
+            array()
+        )->join(
+            array('so' => $this->prefix . 'objects'),
+            'sd.object_id = so.object_id',
+            array()
+        )->where(
+            'so.is_active = ?',
+            1
+        )->where(
+            'so.objecttype_id = 2',
+            1
+        );
+        $this->joinedVirtualTables['downtimes'] = true;
+    }
+    /**
+     * Join host groups
+     */
+    protected function joinHostgroups()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = s.host_object_id',
+            array()
+        )->join(
+            array('hg' => $this->prefix . 'hostgroups'),
+            'hg.hostgroup_id = hgm.hostgroup_id',
+            array()
+        )->join(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hg.hostgroup_object_id',
+            array()
+        )->where(
+            'hgo.is_active = ?',
+            1
+        )
+        ->where(
+            'hgo.objecttype_id = ?',
+            3
+        );
+        $this->distinct();
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = s.host_object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join host status
+     */
+    protected function joinHoststatus()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('hs' => $this->prefix . 'hoststatus'),
+            'hs.host_object_id = s.host_object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->select->join(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = so.object_id',
+            array()
+        )->join(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
+            array()
+        )->join(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id',
+            array()
+        )->where(
+            'sgo.is_active = ?',
+            1
+        )
+        ->where(
+            'sgo.objecttype_id = ?',
+            4
+        );
+        $this->distinct();
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $this->select->join(
+            array('s' => $this->prefix . 'services'),
+            's.service_object_id = so.object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join service status
+     */
+    protected function joinServicestatus()
+    {
+        $this->select->join(
+            array('ss' => $this->prefix . 'servicestatus'),
+            'ss.service_object_id = so.object_id',
+            array()
+        );
+    }
+}

From b833a04110927f59b464f61699d2dd65f650c863 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 13:12:03 +0200
Subject: [PATCH 1874/2920] monitoring: Add data view for service downtimes

refs #9009
---
 .../Monitoring/DataView/Servicedowntime.php   | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/DataView/Servicedowntime.php

diff --git a/modules/monitoring/library/Monitoring/DataView/Servicedowntime.php b/modules/monitoring/library/Monitoring/DataView/Servicedowntime.php
new file mode 100644
index 000000000..1969aec44
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/DataView/Servicedowntime.php
@@ -0,0 +1,59 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\DataView;
+
+class Servicedowntime extends DataView
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        }
+        return parent::isValidFilterTarget($column);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getColumns()
+    {
+        return array(
+            'downtime_author',
+            'downtime_author_name',
+            'downtime_comment',
+            'downtime_duration',
+            'downtime_end',
+            'downtime_entry_time',
+            'downtime_internal_id',
+            'downtime_is_fixed',
+            'downtime_is_flexible',
+            'downtime_is_in_effect',
+            'downtime_scheduled_end',
+            'downtime_scheduled_start',
+            'downtime_start',
+            'host_display_name',
+            'host_name',
+            'object_type',
+            'service_description',
+            'service_display_name',
+            'service_host_name'
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFilterColumns()
+    {
+        return array(
+            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+        );
+    }
+}

From 6e94755c4c2494099383a61e3bf6d269c77f2996 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 13:12:34 +0200
Subject: [PATCH 1875/2920] monitoring: Use host and service downtime query in
 the downtime query

refs #9009
---
 .../library/Monitoring/Backend/Ido/Query/DowntimeQuery.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index 67be1929b..3ff4a9a24 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -93,7 +93,7 @@ class DowntimeQuery extends IdoQuery
         foreach (array_keys($this->columnMap['services']) as $column) {
             $columns[$column] = new Zend_Db_Expr('NULL');
         }
-        $hosts = $this->createSubQuery('hoststatus', $columns);
+        $hosts = $this->createSubQuery('hostdowntime', $columns);
         $this->subQueries[] = $hosts;
         $this->downtimeQuery->union(array($hosts), Zend_Db_Select::SQL_UNION_ALL);
     }
@@ -104,7 +104,7 @@ class DowntimeQuery extends IdoQuery
     protected function joinServices()
     {
         $columns = array_keys($this->columnMap['downtimes'] + $this->columnMap['hosts'] + $this->columnMap['services']);
-        $services = $this->createSubQuery('servicestatus', $columns);
+        $services = $this->createSubQuery('servicedowntime', $columns);
         $this->subQueries[] = $services;
         $this->downtimeQuery->union(array($services), Zend_Db_Select::SQL_UNION_ALL);
     }

From ba07077ca834d926b5a091c86a1af595ca9c0dc0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 13:13:28 +0200
Subject: [PATCH 1876/2920] monitoring: Don't join downtimes in the hoststatus
 query

refs #9009
---
 .../Backend/Ido/Query/HoststatusQuery.php     | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index 3c0ee9688..ca8ae8b56 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -16,22 +16,6 @@ class HoststatusQuery extends IdoQuery
      * {@inheritdoc}
      */
     protected $columnMap = array(
-        'downtimes' => array(
-            'downtime_author'           => 'sd.author_name COLLATE latin1_general_ci',
-            'downtime_author_name'      => 'sd.author_name',
-            'downtime_comment'          => 'sd.comment_data',
-            'downtime_duration'         => 'sd.duration',
-            'downtime_end'              => 'CASE WHEN sd.is_fixed > 0 THEN UNIX_TIMESTAMP(sd.scheduled_end_time) ELSE UNIX_TIMESTAMP(sd.trigger_time) + sd.duration END',
-            'downtime_entry_time'       => 'UNIX_TIMESTAMP(sd.entry_time)',
-            'downtime_internal_id'      => 'sd.internal_downtime_id',
-            'downtime_is_fixed'         => 'sd.is_fixed',
-            'downtime_is_flexible'      => 'CASE WHEN sd.is_fixed = 0 THEN 1 ELSE 0 END',
-            'downtime_is_in_effect'     => 'sd.is_in_effect',
-            'downtime_scheduled_end'    => 'UNIX_TIMESTAMP(sd.scheduled_end_time)',
-            'downtime_scheduled_start'  => 'UNIX_TIMESTAMP(sd.scheduled_start_time)',
-            'downtime_start'            => 'UNIX_TIMESTAMP(CASE WHEN UNIX_TIMESTAMP(sd.trigger_time) > 0 then sd.trigger_time ELSE sd.scheduled_start_time END)',
-            'downtime_triggered_by_id'  => 'sd.triggered_by_id'
-        ),
         'hostgroups' => array(
             'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
             'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
@@ -181,18 +165,6 @@ class HoststatusQuery extends IdoQuery
         $this->joinedVirtualTables['hosts'] = true;
     }
 
-    /**
-     * Join downtimes
-     */
-    protected function joinDowntimes()
-    {
-        $this->select->join(
-            array('sd' => $this->prefix . 'scheduleddowntime'),
-            'sd.object_id = ho.object_id',
-            array()
-        );
-    }
-
     /**
      * Join host groups
      */

From e71682ffb3a889adec661f69a5dcb903778820c2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 13:20:01 +0200
Subject: [PATCH 1877/2920] monitoring: Don't join downtimes in the
 servicestatus query

refs #9009
---
 .../Backend/Ido/Query/ServicestatusQuery.php  | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
index 0e2c9c1c5..990e5a9b2 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -14,22 +14,6 @@ class ServicestatusQuery extends IdoQuery
      * {@inheritdoc}
      */
     protected $columnMap = array(
-        'downtimes' => array(
-            'downtime_author'           => 'sd.author_name COLLATE latin1_general_ci',
-            'downtime_author_name'      => 'sd.author_name',
-            'downtime_comment'          => 'sd.comment_data',
-            'downtime_duration'         => 'sd.duration',
-            'downtime_end'              => 'CASE WHEN sd.is_fixed > 0 THEN UNIX_TIMESTAMP(sd.scheduled_end_time) ELSE UNIX_TIMESTAMP(sd.trigger_time) + sd.duration END',
-            'downtime_entry_time'       => 'UNIX_TIMESTAMP(sd.entry_time)',
-            'downtime_internal_id'      => 'sd.internal_downtime_id',
-            'downtime_is_fixed'         => 'sd.is_fixed',
-            'downtime_is_flexible'      => 'CASE WHEN sd.is_fixed = 0 THEN 1 ELSE 0 END',
-            'downtime_is_in_effect'     => 'sd.is_in_effect',
-            'downtime_scheduled_end'    => 'UNIX_TIMESTAMP(sd.scheduled_end_time)',
-            'downtime_scheduled_start'  => 'UNIX_TIMESTAMP(sd.scheduled_start_time)',
-            'downtime_start'            => 'UNIX_TIMESTAMP(CASE WHEN UNIX_TIMESTAMP(sd.trigger_time) > 0 then sd.trigger_time ELSE sd.scheduled_start_time END)',
-            'downtime_triggered_by_id'  => 'sd.triggered_by_id'
-        ),
         'hostgroups' => array(
             'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
             'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
@@ -181,18 +165,6 @@ class ServicestatusQuery extends IdoQuery
         $this->joinedVirtualTables['services'] = true;
     }
 
-    /**
-     * Join downtimes
-     */
-    protected function joinDowntimes()
-    {
-        $this->select->join(
-            array('sd' => $this->prefix . 'scheduleddowntime'),
-            'sd.object_id = so.object_id',
-            array()
-        );
-    }
-
     /**
      * Join host groups
      */

From a93ef04d5db0b1c1c909c073e0f67e3db88151f5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 13:30:02 +0200
Subject: [PATCH 1878/2920] Revert "Add new tab to switch between host and
 service multi-selection"

This reverts commit 45a0982bebb411ed8a202696965c1438b5948c2c.

Conflicts:
	modules/monitoring/application/controllers/HostsController.php
	modules/monitoring/application/controllers/ServicesController.php

The tab was removed w/ another commit I guess. This revert removes the related not yet removed crap.
---
 .../application/controllers/HostsController.php        | 10 ++--------
 .../application/controllers/ServicesController.php     |  1 -
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 20ae71e6b..253a1fb74 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -26,14 +26,9 @@ class Monitoring_HostsController extends Controller
 
     public function init()
     {
-        // Support switching from service-view using the host and service selection. The filter would error
-        // on any occurrence of a filter based on service.
-        $filterString = preg_replace('/(service=[^)&]*)/', '', (string)$this->params);
-
         $hostList = new HostList($this->backend);
-        $hostList->setFilter(Filter::fromQueryString((string) $this->params->without('view')));
+        $hostList->setFilter(Filter::fromQueryString((string) $this->params));
         $this->hostList = $hostList;
-
         $this->getTabs()->add(
             'show',
             array(
@@ -46,8 +41,7 @@ class Monitoring_HostsController extends Controller
                 'icon'  => 'host'
             )
         )->extend(new DashboardAction())->activate('show');
-
-        $this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/hosts')->setQueryString($filterString);
+        $this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/hosts');
     }
 
     protected function handleCommandForm(ObjectsCommandForm $form)
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 1a8ec9a58..8381a640d 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -32,7 +32,6 @@ class Monitoring_ServicesController extends Controller
         ));
         $this->serviceList = $serviceList;
         $this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/services');
-
         $this->getTabs()->add(
             'show',
             array(

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 1879/2920] 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 07299730452e49d4de7bac38c3b0976fd35c5d85 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 15:07:06 +0200
Subject: [PATCH 1880/2920] monitoring: Add last *comment columns to the host
 status queries

---
 .../Backend/Ido/Query/HoststatusQuery.php     | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index ca8ae8b56..e630727d4 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -128,6 +128,18 @@ class HoststatusQuery extends IdoQuery
             'host_status_update_time'   => 'hs.status_update_time',
             'host_unhandled'            => 'CASE WHEN (hs.problem_has_been_acknowledged + hs.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END'
         ),
+        'lasthostackcomment' => array(
+            'host_last_ack' => 'hlac.last_ack_data'
+        ),
+        'lasthostcomment' => array(
+            'host_last_comment' => 'hlc.last_comment_data'
+        ),
+        'lasthostdowntimecomment' => array(
+            'host_last_downtime' => 'hldc.last_downtime_data'
+        ),
+        'lasthostflappingcomment' => array(
+            'host_last_flapping' => 'hlfc.last_flapping_data'
+        ),
         'servicegroups' => array(
             'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
             'servicegroup_name'     => 'sgo.name1',
@@ -143,6 +155,37 @@ class HoststatusQuery extends IdoQuery
         )
     );
 
+    /**
+     * Create a sub query to join comments into status query
+     *
+     * @param   int     $entryType
+     * @param   string  $alias
+     *
+     * @return  Zend_Db_Expr
+     */
+    protected function createLastCommentSubQuery($entryType, $alias)
+    {
+        $sql = <<<SQL
+SELECT
+  c.object_id,
+  '[' || c.author_name || '] ' || c.comment_data AS $alias
+FROM
+  icinga_comments c
+INNER JOIN
+  (
+    SELECT
+      MAX(comment_id) AS comment_id,
+      object_id
+    FROM
+      icinga_comments
+    WHERE
+      entry_type = $entryType
+    GROUP BY object_id
+  ) ec ON ec.comment_id = c.comment_id
+SQL;
+        return new Zend_Db_Expr('(' . $sql . ')');
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -205,6 +248,54 @@ class HoststatusQuery extends IdoQuery
         );
     }
 
+    /**
+     * Join last host acknowledgement comment
+     */
+    protected function joinLasthostackcomment()
+    {
+        $this->select->joinLeft(
+            array('hlac' => $this->createLastCommentSubQuery(4, 'last_ack_data')),
+            'hlac.object_id = ho.object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join last host comment
+     */
+    protected function joinLasthostcomment()
+    {
+        $this->select->joinLeft(
+            array('hlc' => $this->createLastCommentSubQuery(1, 'last_comment_data')),
+            'hlc.object_id = ho.object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join last host downtime comment
+     */
+    protected function joinLasthostdowntimeComment()
+    {
+        $this->select->joinLeft(
+            array('hldc' => $this->createLastCommentSubQuery(2, 'last_downtime_data')),
+            'hldc.object_id = ho.object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join last host flapping comment
+     */
+    protected function joinLasthostflappingcomment()
+    {
+        $this->select->joinLeft(
+            array('hlfc' => $this->createLastCommentSubQuery(3, 'last_flapping_data')),
+            'hlfc.object_id = ho.object_id',
+            array()
+        );
+    }
+
     /**
      * Join service groups
      */

From 2cbadbf957d6bc7a887ef90e979c0f6ee58f2162 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 15:09:21 +0200
Subject: [PATCH 1881/2920] Revert "monitoring: Don't select host last ack,
 comment and downtime"

This reverts commit e240f7b9550c9ed72b0d9840a140cc57180a8451.

refs #7344
refs #9009
---
 .../monitoring/application/controllers/ListController.php | 6 +++---
 .../monitoring/library/Monitoring/DataView/HostStatus.php | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 816aeb153..2e4e34390 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -89,9 +89,9 @@ class Monitoring_ListController extends Controller
             'host_unhandled_services',
             'host_action_url',
             'host_notes_url',
-//            'host_last_comment',
-//            'host_last_ack',
-//            'host_last_downtime',
+            'host_last_comment',
+            'host_last_ack',
+            'host_last_downtime',
             'host_active_checks_enabled',
             'host_passive_checks_enabled',
             'host_current_check_attempt',
diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index 45c0ee05e..cb992752a 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -65,10 +65,10 @@ class HostStatus extends DataView
             'host_current_notification_number',
             'host_percent_state_change',
             'host_is_flapping',
-//            'host_last_comment',
-//            'host_last_downtime',
-//            'host_last_ack',
-//            'host_last_flapping',
+            'host_last_comment',
+            'host_last_downtime',
+            'host_last_ack',
+            'host_last_flapping',
             'host_action_url',
             'host_notes_url',
             'host_percent_state_change',

From f1bb0640209178ee88b831bc14c596147c92614b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 15:10:00 +0200
Subject: [PATCH 1882/2920] monitoring: Use the Servicedowntime data view in
 the ServiceList

refs #9009
---
 .../library/Monitoring/Object/ServiceList.php          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/ServiceList.php b/modules/monitoring/library/Monitoring/Object/ServiceList.php
index 5ae9b8193..b06cffc89 100644
--- a/modules/monitoring/library/Monitoring/Object/ServiceList.php
+++ b/modules/monitoring/library/Monitoring/Object/ServiceList.php
@@ -138,13 +138,13 @@ class ServiceList extends ObjectList
     /**
      * Get the scheduled downtimes
      *
-     * @return type
+     * @return \Icinga\Module\Monitoring\DataView\Servicedowntime
      */
     public function getScheduledDowntimes()
     {
-        return $this->backend->select()
-                ->from('downtime')
-                ->applyFilter(clone $this->filter)
-                ->where('downtime_objecttype', 'service');
+        return $this->backend
+            ->select()
+            ->from('servicedowntime', array('host_name', 'service_description'))
+            ->applyFilter(clone $this->filter);
     }
 }

From bb97269c55cf7b3ae4564ffef7ccb3c6fcb5ea9b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 15:10:14 +0200
Subject: [PATCH 1883/2920] monitoring: Use the Hostdowntime data view in the
 HostList

refs #9009
---
 .../monitoring/library/Monitoring/Object/HostList.php  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/HostList.php b/modules/monitoring/library/Monitoring/Object/HostList.php
index 2aa5bb04f..31f360d03 100644
--- a/modules/monitoring/library/Monitoring/Object/HostList.php
+++ b/modules/monitoring/library/Monitoring/Object/HostList.php
@@ -90,13 +90,13 @@ class HostList extends ObjectList
     /**
      * Get the scheduled downtimes
      *
-     * @return type
+     * @return \Icinga\Module\Monitoring\DataView\Hostdowntime
      */
     public function getScheduledDowntimes()
     {
-        return $this->backend->select()
-                ->from('downtime')
-                ->applyFilter(clone $this->filter)
-                ->where('downtime_objecttype', 'host');
+        return $this->backend
+            ->select()
+            ->from('hostdowntime', array('host_name'))
+            ->applyFilter(clone $this->filter);
     }
 }

From ebe8a409e3b54555cd055f9be7dd7f2e0e9457bc Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 15:34:18 +0200
Subject: [PATCH 1884/2920] monitoring: Add host comment query

refs #9009
---
 .../Backend/Ido/Query/HostcommentQuery.php    | 183 ++++++++++++++++++
 1 file changed, 183 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
new file mode 100644
index 000000000..a61043b4c
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
@@ -0,0 +1,183 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+/**
+ * Query for host comments
+ */
+class HostcommentQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'comments' => array(
+            'comment_author'        => 'c.author_name COLLATE latin1_general_ci',
+            'comment_author_name'   => 'c.author_name',
+            'comment_data'          => 'c.comment_data',
+            'comment_expiration'    => 'CASE c.expires WHEN 1 THEN UNIX_TIMESTAMP(c.expiration_time) ELSE NULL END',
+            'comment_internal_id'   => 'c.internal_comment_id',
+            'comment_is_persistent' => 'c.is_persistent',
+            'comment_timestamp'     => 'UNIX_TIMESTAMP(c.comment_time)',
+            'comment_type'          => "CASE c.entry_type WHEN 1 THEN 'comment' WHEN 2 THEN 'downtime' WHEN 3 THEN 'flapping' WHEN 4 THEN 'ack' END",
+            'host'                  => 'ho.name1 COLLATE latin1_general_ci',
+            'host_name'             => 'ho.name1',
+            'object_type'           => '(\'host\')'
+        ),
+        'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
+        ),
+        'hosts' => array(
+            'host_alias'            => 'h.alias',
+            'host_display_name'     => 'h.display_name COLLATE latin1_general_ci'
+        ),
+        'hoststatus' => array(
+            'host_state' => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END'
+        ),
+        'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
+        ),
+        'services' => array(
+            'service'                => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'    => 'so.name2',
+            'service_display_name'   => 's.display_name COLLATE latin1_general_ci',
+        )
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        $this->select->from(
+            array('c' => $this->prefix . 'comments'),
+            array()
+        )->join(
+            array('ho' => $this->prefix . 'objects'),
+            'ho.object_id = c.object_id',
+            array()
+        )->where(
+            'ho.is_active = ?',
+            1
+        )->where(
+            'ho.objecttype_id = ?',
+            1
+        );
+        $this->joinedVirtualTables['comments'] = true;
+    }
+
+    /**
+     * Join host groups
+     */
+    protected function joinHostgroups()
+    {
+        $this->select->join(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = ho.object_id',
+            array()
+        )->join(
+            array('hg' => $this->prefix . 'hostgroups'),
+            'hg.hostgroup_id = hgm.hostgroup_id',
+            array()
+        )->join(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hg.hostgroup_object_id',
+            array()
+        )->where(
+            'hgo.is_active = ?',
+            1
+        )
+        ->where(
+            'hgo.objecttype_id = ?',
+            3
+        );
+        $this->distinct();
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $this->select->join(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = ho.object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join host status
+     */
+    protected function joinHoststatus()
+    {
+        $this->select->join(
+            array('hs' => $this->prefix . 'hoststatus'),
+            'hs.host_object_id = ho.object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = s.service_object_id',
+            array()
+        )->join(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
+            array()
+        )->join(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id',
+            array()
+        )->where(
+            'sgo.is_active = ?',
+            1
+        )
+        ->where(
+            'sgo.objecttype_id = ?',
+            4
+        );
+        $this->distinct();
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $this->select->join(
+            array('s' => $this->prefix . 'services'),
+            's.host_object_id = h.host_object_id',
+            array()
+        )->join(
+            array('so' => $this->prefix . 'objects'),
+            'so.object_id = s.service_object_id AND so.is_active = 1',
+            array()
+        )->where(
+            'so.is_active = ?',
+            1
+        )
+        ->where(
+            'so.objecttype_id = ?',
+            2
+        );
+        $this->distinct();
+    }
+}

From a9680bfd68a26d83d1036a70ae0395fe92ea46c4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 15:34:38 +0200
Subject: [PATCH 1885/2920] monitoring: Add host comment data view

refs #9009
---
 .../Monitoring/DataView/Hostcomment.php       | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/DataView/Hostcomment.php

diff --git a/modules/monitoring/library/Monitoring/DataView/Hostcomment.php b/modules/monitoring/library/Monitoring/DataView/Hostcomment.php
new file mode 100644
index 000000000..b751a82b9
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/DataView/Hostcomment.php
@@ -0,0 +1,54 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\DataView;
+
+/**
+ * Host comment view
+ */
+class Hostcomment extends DataView
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        }
+        return parent::isValidFilterTarget($column);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getColumns()
+    {
+        return array(
+            'comment_author',
+            'comment_author_name',
+            'comment_data',
+            'comment_expiration',
+            'comment_internal_id',
+            'comment_is_persistent',
+            'comment_timestamp',
+            'comment_type',
+            'host_display_name',
+            'host_name',
+            'object_type'
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFilterColumns()
+    {
+        return array(
+            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+        );
+    }
+}

From 3c15b2b9727fe60dd29943b83b94b8eb7cdc9e8c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 15:34:52 +0200
Subject: [PATCH 1886/2920] monitoring: Add service comment query

refs #9009
---
 .../Backend/Ido/Query/ServicecommentQuery.php | 189 ++++++++++++++++++
 1 file changed, 189 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
new file mode 100644
index 000000000..655f0c0cc
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
@@ -0,0 +1,189 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+/**
+ * Query for service comments
+ */
+class ServicecommentQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'comments' => array(
+            'comment_author'        => 'c.author_name COLLATE latin1_general_ci',
+            'comment_author_name'   => 'c.author_name',
+            'comment_data'          => 'c.comment_data',
+            'comment_expiration'    => 'CASE c.expires WHEN 1 THEN UNIX_TIMESTAMP(c.expiration_time) ELSE NULL END',
+            'comment_internal_id'   => 'c.internal_comment_id',
+            'comment_is_persistent' => 'c.is_persistent',
+            'comment_timestamp'     => 'UNIX_TIMESTAMP(c.comment_time)',
+            'comment_type'          => "CASE c.entry_type WHEN 1 THEN 'comment' WHEN 2 THEN 'downtime' WHEN 3 THEN 'flapping' WHEN 4 THEN 'ack' END",
+            'host'                  => 'so.name1 COLLATE latin1_general_ci',
+            'host_name'             => 'so.name1',
+            'object_type'           => '(\'service\')',
+            'service'               => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'   => 'so.name2',
+            'service_host'          => 'so.name1 COLLATE latin1_general_ci',
+            'service_host_name'     => 'so.name1'
+        ),
+        'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
+        ),
+        'hosts' => array(
+            'host_alias'            => 'h.alias',
+            'host_display_name'     => 'h.display_name COLLATE latin1_general_ci'
+        ),
+        'hoststatus' => array(
+            'host_state' => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END'
+        ),
+        'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
+        ),
+        'services' => array(
+            'service_display_name' => 's.display_name COLLATE latin1_general_ci'
+        ),
+        'servicestatus' => array(
+            'service_state' => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END'
+        )
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        $this->select->from(
+            array('c' => $this->prefix . 'comments'),
+            array()
+        )->join(
+            array('so' => $this->prefix . 'objects'),
+            'so.object_id = c.object_id',
+            array()
+        )->where(
+            'so.is_active = ?',
+            1
+        )->where(
+            'so.objecttype_id = 2',
+            1
+        );
+        $this->joinedVirtualTables['comments'] = true;
+    }
+    /**
+     * Join host groups
+     */
+    protected function joinHostgroups()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = s.host_object_id',
+            array()
+        )->join(
+            array('hg' => $this->prefix . 'hostgroups'),
+            'hg.hostgroup_id = hgm.hostgroup_id',
+            array()
+        )->join(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hg.hostgroup_object_id',
+            array()
+        )->where(
+            'hgo.is_active = ?',
+            1
+        )
+        ->where(
+            'hgo.objecttype_id = ?',
+            3
+        );
+        $this->distinct();
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = s.host_object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join host status
+     */
+    protected function joinHoststatus()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('hs' => $this->prefix . 'hoststatus'),
+            'hs.host_object_id = s.host_object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->select->join(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = so.object_id',
+            array()
+        )->join(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
+            array()
+        )->join(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id',
+            array()
+        )->where(
+            'sgo.is_active = ?',
+            1
+        )
+        ->where(
+            'sgo.objecttype_id = ?',
+            4
+        );
+        $this->distinct();
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $this->select->join(
+            array('s' => $this->prefix . 'services'),
+            's.service_object_id = so.object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join service status
+     */
+    protected function joinServicestatus()
+    {
+        $this->select->join(
+            array('ss' => $this->prefix . 'servicestatus'),
+            'ss.service_object_id = so.object_id',
+            array()
+        );
+    }
+}

From 82644b6122ed9927fc0cc6c3aff349f47596e08e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 15:35:08 +0200
Subject: [PATCH 1887/2920] monitoring: Add service comment data view

refs #9009
---
 .../Monitoring/DataView/Servicecomment.php    | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/DataView/Servicecomment.php

diff --git a/modules/monitoring/library/Monitoring/DataView/Servicecomment.php b/modules/monitoring/library/Monitoring/DataView/Servicecomment.php
new file mode 100644
index 000000000..64d193cfa
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/DataView/Servicecomment.php
@@ -0,0 +1,57 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\DataView;
+
+/**
+ * Service comment view
+ */
+class Servicecomment extends DataView
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        }
+        return parent::isValidFilterTarget($column);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getColumns()
+    {
+        return array(
+            'comment_author',
+            'comment_author_name',
+            'comment_data',
+            'comment_expiration',
+            'comment_internal_id',
+            'comment_is_persistent',
+            'comment_timestamp',
+            'comment_type',
+            'host_display_name',
+            'host_name',
+            'object_type',
+            'service_description',
+            'service_display_name',
+            'service_host_name'
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFilterColumns()
+    {
+        return array(
+            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+        );
+    }
+}

From 85c21b042d5667ca27c1836d5b50168abc37216b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 15:35:39 +0200
Subject: [PATCH 1888/2920] monitoring: Use the host and service comment
 queries in the comment query

refs #9009
---
 .../Backend/Ido/Query/CommentQuery.php        | 152 ++++++++++++------
 1 file changed, 100 insertions(+), 52 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
index eff3bc1e7..d80f74d36 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
@@ -3,78 +3,126 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
+use Zend_Db_Expr;
+use Zend_Db_Select;
+use Icinga\Data\Filter\Filter;
+
 /**
- * Query map for comments
+ * Query for host and service comments
  */
 class CommentQuery extends IdoQuery
 {
+    /**
+     * {@inheritdoc}
+     */
     protected $columnMap = array(
         'comments' => array(
-            'comment_internal_id'   => 'cm.internal_comment_id',
-            'comment_data'          => 'cm.comment_data',
-            'comment_author'        => 'cm.author_name COLLATE latin1_general_ci',
-            'comment_author_name'   => 'cm.author_name',
-            'comment_timestamp'     => 'UNIX_TIMESTAMP(cm.comment_time)',
-            'comment_type'          => "CASE cm.entry_type WHEN 1 THEN 'comment' WHEN 2 THEN 'downtime' WHEN 3 THEN 'flapping' WHEN 4 THEN 'ack' END",
-            'comment_is_persistent' => 'cm.is_persistent',
-            'comment_expiration'    => 'CASE cm.expires WHEN 1 THEN UNIX_TIMESTAMP(cm.expiration_time) ELSE NULL END',
-            'comment_objecttype'    => "CASE WHEN ho.object_id IS NOT NULL THEN 'host' ELSE CASE WHEN so.object_id IS NOT NULL THEN 'service' ELSE NULL END END",
-            'host'                  => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END COLLATE latin1_general_ci',
-            'host_name'             => 'CASE WHEN ho.name1 IS NULL THEN so.name1 ELSE ho.name1 END',
-            'service'               => 'so.name2 COLLATE latin1_general_ci',
-            'service_description'   => 'so.name2',
-            'service_host'          => 'so.name1 COLLATE latin1_general_ci',
-            'service_host_name'     => 'so.name1'
+            'comment_author'        => 'c.comment_author',
+            'comment_author_name'   => 'c.comment_author_name',
+            'comment_data'          => 'c.comment_data',
+            'comment_expiration'    => 'c.comment_expiration',
+            'comment_internal_id'   => 'c.comment_internal_id',
+            'comment_is_persistent' => 'c.comment_is_persistent',
+            'comment_timestamp'     => 'c.comment_timestamp',
+            'comment_type'          => 'c.comment_type',
+            'object_type'           => 'c.object_type'
         ),
         'hosts' => array(
-            'host_display_name'     => 'CASE WHEN sh.display_name IS NOT NULL THEN sh.display_name ELSE h.display_name END'
+            'host_display_name' => 'c.host_display_name',
+            'host_name'         => 'c.host_name',
+            'host_state'        => 'c.host_state'
         ),
         'services' => array(
-            'service_display_name'  => 's.display_name'
+            'service_description'   => 'c.service_description',
+            'service_display_name'  => 'c.service_display_name',
+            'service_host_name'     => 'c.service_host_name',
+            'service_state'         => 'c.service_state'
         )
     );
 
-    protected function joinBaseTables()
-    {
-        $this->select->from(
-            array('cm' => $this->prefix . 'comments'),
-            array()
-        );
-        $this->select->joinLeft(
-            array('ho' => $this->prefix . 'objects'),
-            'cm.object_id = ho.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
-            array()
-        );
-        $this->select->joinLeft(
-            array('so' => $this->prefix . 'objects'),
-            'cm.object_id = so.object_id AND so.is_active = 1 AND so.objecttype_id = 2',
-            array()
-        );
-        $this->joinedVirtualTables = array('comments' => true);
-    }
+    /**
+     * The union
+     *
+     * @var Zend_Db_Select
+     */
+    protected $commentQuery;
 
-    protected function joinHosts()
+    /**
+     * Subqueries used for the comment query
+     *
+     * @var IdoQuery[]
+     */
+    protected $subQueries = array();
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addFilter(Filter $filter)
     {
-        $this->select->joinLeft(
-            array('h' => $this->prefix . 'hosts'),
-            'h.host_object_id = ho.object_id',
-            array()
-        );
+        foreach ($this->subQueries as $sub) {
+            $sub->applyFilter(clone $filter);
+        }
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        $this->commentQuery = $this->db->select();
+        $this->select->from(
+            array('c' => $this->commentQuery),
+            array()
+        );
+        $this->joinedVirtualTables['comments'] = true;
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $columns = array_keys($this->columnMap['comments'] + $this->columnMap['hosts']);
+        foreach (array_keys($this->columnMap['services']) as $column) {
+            $columns[$column] = new Zend_Db_Expr('NULL');
+        }
+        $hosts = $this->createSubQuery('hostcomment', $columns);
+        $this->subQueries[] = $hosts;
+        $this->commentQuery->union(array($hosts), Zend_Db_Select::SQL_UNION_ALL);
+    }
+
+    /**
+     * Join services
+     */
     protected function joinServices()
     {
-        $this->select->joinLeft(
-            array('s' => $this->prefix . 'services'),
-            's.service_object_id = so.object_id',
-            array()
-        );
-        $this->select->joinLeft(
-            array('sh' => $this->prefix . 'hosts'),
-            'sh.host_object_id = s.host_object_id',
-            array()
-        );
+        $columns = array_keys($this->columnMap['comments'] + $this->columnMap['hosts'] + $this->columnMap['services']);
+        $services = $this->createSubQuery('servicecomment', $columns);
+        $this->subQueries[] = $services;
+        $this->commentQuery->union(array($services), Zend_Db_Select::SQL_UNION_ALL);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function order($columnOrAlias, $dir = null)
+    {
+        foreach ($this->subQueries as $sub) {
+            $sub->requireColumn($columnOrAlias);
+        }
+        return parent::order($columnOrAlias, $dir);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function where($condition, $value = null)
+    {
+        $this->requireColumn($condition);
+        foreach ($this->subQueries as $sub) {
+            $sub->where($condition, $value);
+        }
         return $this;
     }
 }

From 16ab26cb7cbf0e66778716dc2a086d09340b29dc Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 15:36:03 +0200
Subject: [PATCH 1889/2920] monitoring: Remove unused alias from the downtime
 query

refs #9009
---
 .../library/Monitoring/Backend/Ido/Query/DowntimeQuery.php       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index 3ff4a9a24..1127a537c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -5,7 +5,6 @@ namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 use Zend_Db_Expr;
 use Zend_Db_Select;
-use Icinga\Authentication\Manager;
 use Icinga\Data\Filter\Filter;
 
 /**

From 41bc4e3b21faf554f6bff84bfcd5d49715c83241 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 15:36:42 +0200
Subject: [PATCH 1890/2920] monitoring: Provide downtime_author only as filter
 column

refs #9009
---
 modules/monitoring/library/Monitoring/DataView/Downtime.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index 3664bf95b..c654716ba 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -3,6 +3,9 @@
 
 namespace Icinga\Module\Monitoring\DataView;
 
+/**
+ * Host and service downtimes view
+ */
 class Downtime extends DataView
 {
     /**
@@ -24,7 +27,6 @@ class Downtime extends DataView
     public function getColumns()
     {
         return array(
-            'downtime_author',
             'downtime_author_name',
             'downtime_comment',
             'downtime_duration',
@@ -52,6 +54,7 @@ class Downtime extends DataView
     public function getFilterColumns()
     {
         return array(
+            'downtime_author',
             'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
             'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
         );

From 54eb0eaf221b5957c2816903fe4f804058ab6cc1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 15:37:05 +0200
Subject: [PATCH 1891/2920] monitoring: Add restrictable filter columns to the
 comment data view

refs #9009
---
 .../library/Monitoring/DataView/Comment.php   | 49 +++++++++++++------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index 1fadd8b62..9d7aa612e 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -4,32 +4,57 @@
 namespace Icinga\Module\Monitoring\DataView;
 
 /**
- * View representation for comments
+ * Host and service comments view
  */
 class Comment extends DataView
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        }
+        return parent::isValidFilterTarget($column);
+    }
+
     /**
      * {@inheritdoc}
      */
     public function getColumns()
     {
         return array(
-            'comment_objecttype',
-            'comment_internal_id',
-            'comment_data',
             'comment_author_name',
+            'comment_data',
+            'comment_expiration',
+            'comment_internal_id',
+            'comment_is_persistent',
             'comment_timestamp',
             'comment_type',
-            'comment_is_persistent',
-            'comment_expiration',
-            'host_name',
-            'service_description',
             'host_display_name',
+            'host_name',
+            'object_type',
+            'service_description',
             'service_display_name',
             'service_host_name'
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getFilterColumns()
+    {
+        return array(
+            'comment_author ',
+            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+        );
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -55,12 +80,4 @@ class Comment extends DataView
             )
         );
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFilterColumns()
-    {
-        return array('comment_author', 'host', 'service', 'service_host');
-    }
 }

From 46fdaf4698cde5ddd062a840c284e7d837667717 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 15:38:03 +0200
Subject: [PATCH 1892/2920] monitoring: Fix select columns for the comment data
 views

refs #9009
---
 .../application/controllers/CommentController.php   |  2 +-
 .../application/controllers/CommentsController.php  |  6 +++---
 .../application/controllers/ListController.php      |  2 +-
 .../library/Monitoring/Object/HostList.php          | 13 +++++++++++++
 .../library/Monitoring/Object/MonitoredObject.php   |  2 +-
 .../library/Monitoring/Object/ServiceList.php       | 13 +++++++++++++
 6 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/CommentController.php b/modules/monitoring/application/controllers/CommentController.php
index 4237d598b..7ab331adc 100644
--- a/modules/monitoring/application/controllers/CommentController.php
+++ b/modules/monitoring/application/controllers/CommentController.php
@@ -27,7 +27,7 @@ class Monitoring_CommentController extends Controller
 
         $this->comment = $this->backend->select()->from('comment', array(
             'id'         => 'comment_internal_id',
-            'objecttype' => 'comment_objecttype',
+            'objecttype' => 'object_type',
             'comment'    => 'comment_data',
             'author'     => 'comment_author_name',
             'timestamp'  => 'comment_timestamp',
diff --git a/modules/monitoring/application/controllers/CommentsController.php b/modules/monitoring/application/controllers/CommentsController.php
index e1092b033..9b31755cc 100644
--- a/modules/monitoring/application/controllers/CommentsController.php
+++ b/modules/monitoring/application/controllers/CommentsController.php
@@ -32,7 +32,7 @@ class Monitoring_CommentsController extends Controller
         ));
         $this->comments = $this->backend->select()->from('comment', array(
             'id'         => 'comment_internal_id',
-            'objecttype' => 'comment_objecttype',
+            'objecttype' => 'object_type',
             'comment'    => 'comment_data',
             'author'     => 'comment_author_name',
             'timestamp'  => 'comment_timestamp',
@@ -44,11 +44,11 @@ class Monitoring_CommentsController extends Controller
             'host_display_name',
             'service_display_name'
         ))->addFilter($this->filter)->getQuery()->fetchAll();
-        
+
         if (false === $this->comments) {
             throw new Zend_Controller_Action_Exception($this->translate('Comment not found'));
         }
-         
+
         $this->getTabs()->add(
             'comments',
             array(
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 2e4e34390..1a3733a7a 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -431,7 +431,7 @@ class Monitoring_ListController extends Controller
 
         $query = $this->backend->select()->from('comment', array(
             'id'         => 'comment_internal_id',
-            'objecttype' => 'comment_objecttype',
+            'objecttype' => 'object_type',
             'comment'    => 'comment_data',
             'author'     => 'comment_author_name',
             'timestamp'  => 'comment_timestamp',
diff --git a/modules/monitoring/library/Monitoring/Object/HostList.php b/modules/monitoring/library/Monitoring/Object/HostList.php
index 31f360d03..cbbafdecf 100644
--- a/modules/monitoring/library/Monitoring/Object/HostList.php
+++ b/modules/monitoring/library/Monitoring/Object/HostList.php
@@ -87,6 +87,19 @@ class HostList extends ObjectList
         return FilterOr::matchAny($filterExpression);
     }
 
+    /**
+     * Get the comments
+     *
+     * @return \Icinga\Module\Monitoring\DataView\Hostcomment
+     */
+    public function getComments()
+    {
+        return $this->backend
+            ->select()
+            ->from('hostcomment', array('host_name'))
+            ->applyFilter(clone $this->filter);
+    }
+
     /**
      * Get the scheduled downtimes
      *
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index fdf64fc51..626b5cd3d 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -253,7 +253,7 @@ abstract class MonitoredObject implements Filterable
             'type'      => 'comment_type',
         ))
             ->where('comment_type', array('comment', 'ack'))
-            ->where('comment_objecttype', $this->type);
+            ->where('object_type', $this->type);
         if ($this->type === self::TYPE_SERVICE) {
             $comments
                 ->where('service_host_name', $this->host_name)
diff --git a/modules/monitoring/library/Monitoring/Object/ServiceList.php b/modules/monitoring/library/Monitoring/Object/ServiceList.php
index b06cffc89..f4cc38598 100644
--- a/modules/monitoring/library/Monitoring/Object/ServiceList.php
+++ b/modules/monitoring/library/Monitoring/Object/ServiceList.php
@@ -135,6 +135,19 @@ class ServiceList extends ObjectList
         return FilterOr::matchAny($filterExpression);
     }
 
+    /**
+     * Get the comments
+     *
+     * @return \Icinga\Module\Monitoring\DataView\Hostcomment
+     */
+    public function getComments()
+    {
+        return $this->backend
+            ->select()
+            ->from('servicecomment', array('host_name', 'service_description'))
+            ->applyFilter(clone $this->filter);
+    }
+
     /**
      * Get the scheduled downtimes
      *

From 42d9f05c0f8661bac9392fc9c72e46223aec0461 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 29 May 2015 15:39:41 +0200
Subject: [PATCH 1893/2920] monitoring: Apply host and service restrctions to
 the comments overview

refs #9009
---
 modules/monitoring/application/controllers/ListController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 1a3733a7a..fa9c25546 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -444,6 +444,9 @@ class Monitoring_ListController extends Controller
             'service_display_name'
         ));
         $this->filterQuery($query);
+
+        $this->applyRestriction('monitoring/filter/objects', $query);
+
         $this->view->comments = $query;
 
         $this->setupLimitControl();

From 04835db13eae1f6efc2019f30d80018e19a8fcc4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 May 2015 16:34:34 +0200
Subject: [PATCH 1894/2920] Introduce form UserGroupBackendForm

refs #8826
---
 .../UserGroup/DbUserGroupBackendForm.php      |  58 +++++
 .../Config/UserGroup/UserGroupBackendForm.php | 198 ++++++++++++++++++
 2 files changed, 256 insertions(+)
 create mode 100644 application/forms/Config/UserGroup/DbUserGroupBackendForm.php
 create mode 100644 application/forms/Config/UserGroup/UserGroupBackendForm.php

diff --git a/application/forms/Config/UserGroup/DbUserGroupBackendForm.php b/application/forms/Config/UserGroup/DbUserGroupBackendForm.php
new file mode 100644
index 000000000..9f1915968
--- /dev/null
+++ b/application/forms/Config/UserGroup/DbUserGroupBackendForm.php
@@ -0,0 +1,58 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Forms\Config\UserGroup;
+
+use Icinga\Data\ResourceFactory;
+use Icinga\Web\Form;
+
+/**
+ * Form for managing database user group backends
+ */
+class DbUserGroupBackendForm extends Form
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_dbusergroupbackend');
+    }
+
+    /**
+     * Create and add elements to this form
+     *
+     * @param   array   $formData
+     */
+    public function createElements(array $formData)
+    {
+        $resourceNames = $this->getDatabaseResourceNames();
+        $this->addElement(
+            'select',
+            'resource',
+            array(
+                'required'      => true,
+                'label'         => $this->translate('Database Connection'),
+                'description'   => $this->translate('The database connection to use for this backend'),
+                'multiOptions'  => empty($resourceNames) ? array() : array_combine($resourceNames, $resourceNames)
+            )
+        );
+    }
+
+    /**
+     * Return the names of all configured database resources
+     *
+     * @return  array
+     */
+    protected function getDatabaseResourceNames()
+    {
+        $names = array();
+        foreach (ResourceFactory::getResourceConfigs() as $name => $config) {
+            if (strtolower($config->type) === 'db') {
+                $names[] = $name;
+            }
+        }
+
+        return $names;
+    }
+}
diff --git a/application/forms/Config/UserGroup/UserGroupBackendForm.php b/application/forms/Config/UserGroup/UserGroupBackendForm.php
new file mode 100644
index 000000000..dd9875c9a
--- /dev/null
+++ b/application/forms/Config/UserGroup/UserGroupBackendForm.php
@@ -0,0 +1,198 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Forms\Config\UserGroup;
+
+use InvalidArgumentException;
+use Icinga\Exception\IcingaException;
+use Icinga\Exception\NotFoundError;
+use Icinga\Forms\ConfigForm;
+
+/**
+ * Form for managing user group backends
+ */
+class UserGroupBackendForm extends ConfigForm
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_usergroupbackend');
+        $this->setSubmitLabel($this->translate('Save Changes'));
+    }
+
+    /**
+     * Return a form object for the given backend type
+     *
+     * @param   string      $type   The backend type for which to return a form
+     *
+     * @return  Form
+     */
+    public function getBackendForm($type)
+    {
+        if ($type === 'db') {
+            return new DbUserGroupBackendForm();
+        } else {
+            throw new InvalidArgumentException(sprintf($this->translate('Invalid backend type "%s" provided'), $type));
+        }
+    }
+
+    /**
+     * Populate the form with the given backend's config
+     *
+     * @param   string  $name
+     *
+     * @return  $this
+     *
+     * @throws  NotFoundError   In case no backend with the given name is found
+     */
+    public function load($name)
+    {
+        if (! $this->config->hasSection($name)) {
+            throw new NotFoundError('No user group backend called "%s" found', $name);
+        }
+
+        $data = $this->config->getSection($name)->toArray();
+        $data['type'] = $data['backend'];
+        $data['name'] = $name;
+        $this->populate($data);
+        return $this;
+    }
+
+    /**
+     * Add a new user group backend
+     *
+     * @param   array   $data
+     *
+     * @return  $this
+     *
+     * @throws  InvalidArgumentException    In case $data does not contain a backend name
+     * @throws  IcingaException             In case a backend with the same name already exists
+     */
+    public function add(array $data)
+    {
+        if (! isset($data['name'])) {
+            throw new InvalidArgumentException('Key \'name\' missing');
+        }
+
+        $backendName = $data['name'];
+        if ($this->config->hasSection($backendName)) {
+            throw new IcingaException('A user group backend with the name "%s" does already exist', $backendName);
+        }
+
+        unset($data['name']);
+        $this->config->setSection($backendName, $data);
+        return $this;
+    }
+
+    /**
+     * Edit a user group backend
+     *
+     * @param   string  $name
+     * @param   array   $data
+     *
+     * @return  $this
+     *
+     * @throws  NotFoundError   In case no backend with the given name is found
+     */
+    public function edit($name, array $data)
+    {
+        if (! $this->config->hasSection($name)) {
+            throw new NotFoundError('No user group backend called "%s" found', $name);
+        }
+
+        $backendConfig = $this->config->getSection($name);
+        if (isset($data['name']) && $data['name'] !== $name) {
+            $this->config->removeSection($name);
+            $name = $data['name'];
+            unset($data['name']);
+        }
+
+        $this->config->setSection($name, $backendConfig->merge($data));
+        return $this;
+    }
+
+    /**
+     * Remove a user group backend
+     *
+     * @param   string  $name
+     *
+     * @return  $this
+     */
+    public function delete($name)
+    {
+        $this->config->removeSection($name);
+        return $this;
+    }
+
+    /**
+     * Create and add elements to this form
+     *
+     * @param   array   $formData
+     */
+    public function createElements(array $formData)
+    {
+        $this->addElement(
+            'text',
+            'name',
+            array(
+                'required'      => true,
+                'label'         => $this->translate('Backend Name'),
+                'description'   => $this->translate(
+                    'The name of this user group backend that is used to differentiate it from others'
+                ),
+                'validators'    => array(
+                    array(
+                        'Regex',
+                        false,
+                        array(
+                            'pattern'  => '/^[^\\[\\]:]+$/',
+                            'messages' => array(
+                                'regexNotMatch' => $this->translate(
+                                    'The backend name cannot contain \'[\', \']\' or \':\'.'
+                                )
+                            )
+                        )
+                    )
+                )
+            )
+        );
+
+        // TODO(jom): We did not think about how to configure custom group backends yet!
+        $backendTypes = array(
+            'db'    => $this->translate('Database')
+        );
+
+        $backendType = isset($formData['type']) ? $formData['type'] : null;
+        if ($backendType === null) {
+            $backendType = key($backendTypes);
+        }
+
+        $this->addElement(
+            'hidden',
+            'backend',
+            array(
+                'disabled'  => true, // Prevents the element from being submitted, see #7717
+                'value'     => $backendType
+            )
+        );
+
+        $this->addElement(
+            'select',
+            'type',
+            array(
+                'ignore'            => true,
+                'required'          => true,
+                'autosubmit'        => true,
+                'label'             => $this->translate('Backend Type'),
+                'description'       => $this->translate('The type of this user group backend'),
+                'multiOptions'      => $backendTypes
+            )
+        );
+
+        $backendForm = $this->getBackendForm($backendType);
+        $backendForm->createElements($formData);
+        $this->addElements($backendForm->getElements());
+    }
+}

From ea959c2dfde844620b81a53fd6664a5af30802ca Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 May 2015 16:35:30 +0200
Subject: [PATCH 1895/2920] Introduce controller UsergroupbackendController

refs #8826
---
 .../UsergroupbackendController.php            | 149 ++++++++++++++++++
 application/forms/Security/RoleForm.php       |  44 +++---
 .../views/scripts/usergroupbackend/form.phtml |   6 +
 .../views/scripts/usergroupbackend/list.phtml |  63 ++++++++
 public/css/icinga/main-content.less           |  11 ++
 5 files changed, 253 insertions(+), 20 deletions(-)
 create mode 100644 application/controllers/UsergroupbackendController.php
 create mode 100644 application/views/scripts/usergroupbackend/form.phtml
 create mode 100644 application/views/scripts/usergroupbackend/list.phtml

diff --git a/application/controllers/UsergroupbackendController.php b/application/controllers/UsergroupbackendController.php
new file mode 100644
index 000000000..91560bf55
--- /dev/null
+++ b/application/controllers/UsergroupbackendController.php
@@ -0,0 +1,149 @@
+<?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;
+use Icinga\Forms\Config\UserGroup\UserGroupBackendForm;
+use Icinga\Web\Controller;
+use Icinga\Web\Notification;
+use Icinga\Web\Url;
+
+/**
+ * Controller to configure user group backends
+ */
+class UsergroupbackendController extends Controller
+{
+    /**
+     * Redirect to this controller's list action
+     */
+    public function indexAction()
+    {
+        $this->redirectNow('usergroupbackend/list');
+    }
+
+    /**
+     * Show a list of all user group backends
+     */
+    public function listAction()
+    {
+        $this->assertPermission('config/application/usergroupbackend/*');
+        $this->view->backendNames = Config::app('groups')->keys();
+        $this->getTabs()->add(
+            'usergroupbackend/list',
+            array(
+                'title' => $this->translate('List all user group backends'),
+                'label' => $this->translate('User group backends'),
+                'url'   => 'usergroupbackend/list'
+            )
+        )->activate('usergroupbackend/list');
+    }
+
+    /**
+     * Create a new user group backend
+     */
+    public function createAction()
+    {
+        $this->assertPermission('config/application/usergroupbackend/create');
+
+        $form = new UserGroupBackendForm();
+        $form->setRedirectUrl('usergroupbackend/list');
+        $form->setTitle($this->translate('Create New User Group Backend'));
+        $form->addDescription($this->translate('Create a new backend to associate users and groups with.'));
+        $form->setIniConfig(Config::app('groups'));
+        $form->setOnSuccess(function (UserGroupBackendForm $form) {
+            try {
+                $form->add($form->getValues());
+            } catch (Exception $e) {
+                $form->error($e->getMessage());
+                return false;
+            }
+
+            if ($form->save()) {
+                Notification::success(t('User group backend successfully created'));
+                return true;
+            }
+
+            return false;
+        });
+        $form->handleRequest();
+
+        $this->view->form = $form;
+        $this->render('form');
+    }
+
+    /**
+     * Edit an user group backend
+     */
+    public function editAction()
+    {
+        $this->assertPermission('config/application/usergroupbackend/edit');
+        $backendName = $this->params->getRequired('backend');
+
+        $form = new UserGroupBackendForm();
+        $form->setAction(Url::fromRequest());
+        $form->setRedirectUrl('usergroupbackend/list');
+        $form->setTitle(sprintf($this->translate('Edit User Group Backend %s'), $backendName));
+        $form->setIniConfig(Config::app('groups'));
+        $form->setOnSuccess(function (UserGroupBackendForm $form) use ($backendName) {
+            try {
+                $form->edit($backendName, $form->getValues());
+            } catch (Exception $e) {
+                $form->error($e->getMessage());
+                return false;
+            }
+
+            if ($form->save()) {
+                Notification::success(sprintf(t('User group backend "%s" successfully updated'), $backendName));
+                return true;
+            }
+
+            return false;
+        });
+
+        try {
+            $form->load($backendName);
+            $form->handleRequest();
+        } catch (NotFoundError $_) {
+            $this->httpNotFound(sprintf($this->translate('User group backend "%s" not found'), $backendName));
+        }
+
+        $this->view->form = $form;
+        $this->render('form');
+    }
+
+    /**
+     * Remove a user group backend
+     */
+    public function removeAction()
+    {
+        $this->assertPermission('config/application/usergroupbackend/remove');
+        $backendName = $this->params->getRequired('backend');
+
+        $backendForm = new UserGroupBackendForm();
+        $backendForm->setIniConfig(Config::app('groups'));
+        $form = new ConfirmRemovalForm();
+        $form->setRedirectUrl('usergroupbackend/list');
+        $form->setTitle(sprintf($this->translate('Remove User Group Backend %s'), $backendName));
+        $form->setOnSuccess(function (ConfirmRemovalForm $form) use ($backendName, $backendForm) {
+            try {
+                $backendForm->delete($backendName);
+            } catch (Exception $e) {
+                $form->error($e->getMessage());
+                return false;
+            }
+
+            if ($backendForm->save()) {
+                Notification::success(sprintf(t('User group backend "%s" successfully removed'), $backendName));
+                return true;
+            }
+
+            return false;
+        });
+        $form->handleRequest();
+
+        $this->view->form = $form;
+        $this->render('form');
+    }
+}
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 536a7efe0..43ae6c1a0 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -21,26 +21,30 @@ class RoleForm extends ConfigForm
      * @var array
      */
     protected $providedPermissions = array(
-        '*'                                         => '*',
-        'config/*'                                  => 'config/*',
-        'config/application/*'                      => 'config/application/*',
-        'config/application/general'                => 'config/application/general',
-        'config/application/authentication'         => 'config/application/authentication',
-        'config/application/resources'              => 'config/application/resources',
-        'config/application/roles'                  => 'config/application/roles',
-        'config/application/users/*'                => 'config/application/users/*',
-        'config/application/users/show'             => 'config/application/users/show',
-        'config/application/users/add'              => 'config/application/users/add',
-        'config/application/users/edit'             => 'config/application/users/edit',
-        'config/application/users/remove'           => 'config/application/users/remove',
-        'config/application/groups/*'               => 'config/application/groups/*',
-        'config/application/groups/show'            => 'config/application/groups/show',
-        'config/application/groups/add'             => 'config/application/groups/add',
-        'config/application/groups/edit'            => 'config/application/groups/edit',
-        'config/application/groups/remove'          => 'config/application/groups/remove',
-        'config/application/groups/member/add'      => 'config/application/groups/member/add',
-        'config/application/groups/member/remove'   => 'config/application/groups/member/remove',
-        'config/modules'                            => 'config/modules'
+        '*'                                             => '*',
+        'config/*'                                      => 'config/*',
+        'config/application/*'                          => 'config/application/*',
+        'config/application/general'                    => 'config/application/general',
+        'config/application/authentication'             => 'config/application/authentication',
+        'config/application/resources'                  => 'config/application/resources',
+        'config/application/roles'                      => 'config/application/roles',
+        'config/application/users/*'                    => 'config/application/users/*',
+        'config/application/users/show'                 => 'config/application/users/show',
+        'config/application/users/add'                  => 'config/application/users/add',
+        'config/application/users/edit'                 => 'config/application/users/edit',
+        'config/application/users/remove'               => 'config/application/users/remove',
+        'config/application/groups/*'                   => 'config/application/groups/*',
+        'config/application/groups/show'                => 'config/application/groups/show',
+        'config/application/groups/add'                 => 'config/application/groups/add',
+        'config/application/groups/edit'                => 'config/application/groups/edit',
+        'config/application/groups/remove'              => 'config/application/groups/remove',
+        'config/application/groups/member/add'          => 'config/application/groups/member/add',
+        'config/application/groups/member/remove'       => 'config/application/groups/member/remove',
+        'config/application/usergroupbackend/*'         => 'config/application/usergroupbackend/*',
+        'config/application/usergroupbackend/create'    => 'config/application/usergroupbackend/create',
+        'config/application/usergroupbackend/edit'      => 'config/application/usergroupbackend/edit',
+        'config/application/usergroupbackend/remove'    => 'config/application/usergroupbackend/remove',
+        'config/modules'                                => 'config/modules'
     );
 
     /**
diff --git a/application/views/scripts/usergroupbackend/form.phtml b/application/views/scripts/usergroupbackend/form.phtml
new file mode 100644
index 000000000..cbf06590d
--- /dev/null
+++ b/application/views/scripts/usergroupbackend/form.phtml
@@ -0,0 +1,6 @@
+<div class="controls">
+  <?= $tabs->showOnlyCloseButton(); ?>
+</div>
+<div class="content">
+  <?= $form; ?>
+</div>
\ No newline at end of file
diff --git a/application/views/scripts/usergroupbackend/list.phtml b/application/views/scripts/usergroupbackend/list.phtml
new file mode 100644
index 000000000..d98d207f1
--- /dev/null
+++ b/application/views/scripts/usergroupbackend/list.phtml
@@ -0,0 +1,63 @@
+<?php
+
+$createPermitted = $this->hasPermission('config/application/usergroupbackend/create');
+$editPermitted = $this->hasPermission('config/application/usergroupbackend/edit');
+$removePermitted = $this->hasPermission('config/application/usergroupbackend/remove');
+
+?>
+<div class="controls">
+  <?= $tabs; ?>
+</div>
+<div class="content" data-base-target="_next">
+<?php if ($createPermitted): ?>
+<?= $this->qlink(
+  $this->translate('Create A New User Group Backend'),
+  'usergroupbackend/create',
+  null,
+  array(
+    'icon' => 'plus'
+  )
+); ?>
+<?php endif ?>
+<?php if (count($backendNames) > 0): ?>
+<table class="action usergroupbackend-list">
+  <thead>
+    <tr>
+      <th class="backend-name"><?= $this->translate('Backend'); ?></th>
+     <?php if ($removePermitted): ?>
+      <th class="backend-remove"><?= $this->translate('Remove'); ?></th>
+     <?php endif ?>
+    <tr>
+  </thead>
+  <tbody>
+<?php foreach ($backendNames as $backendName): ?>
+    <tr>
+      <td class="backend-name">
+       <?php if ($editPermitted): ?>
+        <?= $this->qlink(
+          $backendName,
+          'usergroupbackend/edit',
+          array('backend' => $backendName),
+          array('title' => sprintf($this->translate('Edit user group backend %s'), $backendName))
+        ); ?>
+       <?php else: ?>
+        <?= $this->escape($backendName); ?>
+       <?php endif ?>
+      </td>
+     <?php if ($removePermitted): ?>
+      <td class="backend-remove"><?= $this->qlink(
+        null,
+        'usergroupbackend/remove',
+        array('backend' => $backendName),
+        array(
+          'title' => sprintf($this->translate('Remove user group backend %s'), $backendName),
+          'icon'  => 'trash'
+        )
+      ); ?></td>
+     <?php endif ?>
+    </tr>
+<?php endforeach ?>
+  </tbody>
+</table>
+<?php endif ?>
+</div>
\ No newline at end of file
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index e1a305509..2b0e2e50d 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -355,4 +355,15 @@ form.backend-selection {
       margin-left: 0;
     }
   }
+}
+
+table.usergroupbackend-list {
+  th.backend-remove {
+    width: 8em;
+    text-align: right;
+  }
+
+  td.backend-remove {
+    text-align: right;
+  }
 }
\ No newline at end of file

From d097f7fe8f94340346f1b4b9cd040193b479d23c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 29 May 2015 16:36:05 +0200
Subject: [PATCH 1896/2920] Add menu entry for the user group backend
 configuration

That's definitely just a placeholder...

refs #8826
---
 library/Icinga/Web/Menu.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 9fe7aa0a1..014909ff0 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -242,6 +242,11 @@ class Menu implements RecursiveIterator
                 'permission'    => 'config/application/*',
                 'priority'      => 300
             ));
+            $section->add(t('UserGroupBackends'), array(
+                'url'           => 'usergroupbackend/list',
+                'permission'    => 'config/application/usergroupbackend/*',
+                'priority'      => 301
+            ));
             $section->add(t('Configuration'), array(
                 'url'           => 'config',
                 'permission'    => 'config/application/*',

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 1897/2920] 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 1898/2920] 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 1899/2920] 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 1900/2920] 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 7127d5eb398b6549dd97578ae21318fd891c9be2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Jun 2015 12:20:36 +0200
Subject: [PATCH 1901/2920] Ldap\Connection: Connect automatically in case
 capabilities are not set yet

---
 library/Icinga/Protocol/Ldap/Connection.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 2f7cccd41..ba6203aab 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -617,6 +617,10 @@ class Connection implements Selectable
      */
     public function getCapabilities()
     {
+        if ($this->capabilities === null) {
+            $this->connect(); // Populates $this->capabilities
+        }
+
         return $this->capabilities;
     }
 

From d1a5321d02df6531e6fa1a3bd3670e9fc2e29e12 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Jun 2015 12:23:16 +0200
Subject: [PATCH 1902/2920] LdapUserBackend: Fetch and interpret the correct
 attributes (ActiveDirectory)

refs #8826
---
 .../Authentication/User/LdapUserBackend.php   | 93 ++++++++++++++++++-
 1 file changed, 90 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index 7fc61dbc1..dc6fe04b5 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Authentication\User;
 
+use DateTime;
+use Icinga\Application\Logger;
 use Icinga\Data\ConfigObject;
 use Icinga\Exception\AuthenticationException;
 use Icinga\Exception\ProgrammingError;
@@ -255,17 +257,102 @@ class LdapUserBackend extends Repository implements UserBackendInterface
             throw new ProgrammingError('It is required to set a attribute name where to find a user\'s name first');
         }
 
+        if ($this->ds->getCapabilities()->hasAdOid()) {
+            $isActiveAttribute = 'userAccountControl';
+            $createdAtAttribute = 'whenCreated';
+            $lastModifiedAttribute = 'whenChanged';
+        } else {
+            $isActiveAttribute = 'unknown';
+            $createdAtAttribute = 'unknown';
+            $lastModifiedAttribute = 'unknown';
+        }
+
         return array(
             $this->userClass => array(
                 'user'          => $this->userNameAttribute,
                 'user_name'     => $this->userNameAttribute,
-                'is_active'     => 'unknown', // msExchUserAccountControl == 2/512/514? <- AD LDAP
-                'created_at'    => 'whenCreated', // That's AD LDAP,
-                'last_modified' => 'whenChanged' // what's OpenLDAP?
+                'is_active'     => $isActiveAttribute,
+                'created_at'    => $createdAtAttribute,
+                'last_modified' => $lastModifiedAttribute
             )
         );
     }
 
+    /**
+     * Initialize this repository's conversion rules
+     *
+     * @return  array
+     *
+     * @throws  ProgrammingError    In case $this->userClass has not been set yet
+     */
+    protected function initializeConversionRules()
+    {
+        if ($this->userClass === null) {
+            throw new ProgrammingError('It is required to set the objectClass where to look for users first');
+        }
+
+        if ($this->ds->getCapabilities()->hasAdOid()) {
+            $stateConverter = 'user_account_control';
+            $timeConverter = 'generalized_time';
+        } else {
+            $timeConverter = null;
+            $stateConverter = null;
+        }
+
+        return array(
+            $this->userClass => array(
+                'is_active'     => $stateConverter,
+                'created_at'    => $timeConverter,
+                'last_modified' => $timeConverter
+            )
+        );
+    }
+
+    /**
+     * Return whether the given userAccountControl value defines that a user is permitted to login
+     *
+     * @param   string|null     $value
+     *
+     * @return  bool
+     */
+    protected function retrieveUserAccountControl($value)
+    {
+        if ($value === null) {
+            return $value;
+        }
+
+        $ADS_UF_ACCOUNTDISABLE = 2;
+        return ((int) $value & $ADS_UF_ACCOUNTDISABLE) === 0;
+    }
+
+    /**
+     * Parse the given value based on the ASN.1 standard (GeneralizedTime) and return its timestamp representation
+     *
+     * @param   string|null     $value
+     *
+     * @return  int
+     */
+    protected function retrieveGeneralizedTime($value)
+    {
+        if ($value === null) {
+            return $value;
+        }
+
+        if (
+            ($dateTime = DateTime::createFromFormat('YmdHis.uO', $value)) !== false
+            || ($dateTime = DateTime::createFromFormat('YmdHis.uZ', $value)) !== false
+            || ($dateTime = DateTime::createFromFormat('YmdHis.u', $value)) !== false
+        ) {
+            return $dateTime->getTimeStamp();
+        } else {
+            Logger::debug(sprintf(
+                'Failed to parse "%s" based on the ASN.1 standard (GeneralizedTime) for user backend "%s".',
+                $value,
+                $this->getName()
+            ));
+        }
+    }
+
     /**
      * Probe the backend to test if authentication is possible
      *

From 29cc92a3f3417f639deab9eb7c78df3cec24632b Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 1 Jun 2015 12:22:53 +0200
Subject: [PATCH 1903/2920] Display acknowledgement action for all
 unacknowledged objects

Instead of displaying the ack for all unhandled problem host, make acknowledgement possible for all monitored objects in multi views.

fixes #7931
---
 .../controllers/HostsController.php           |  5 +--
 .../controllers/ServicesController.php        |  5 +--
 .../views/scripts/hosts/show.phtml            | 36 ++++++++++---------
 .../views/scripts/services/show.phtml         | 36 +++++++++++--------
 .../library/Monitoring/Object/HostList.php    | 15 ++++++++
 .../library/Monitoring/Object/ObjectList.php  |  5 +++
 .../library/Monitoring/Object/ServiceList.php | 15 ++++++++
 7 files changed, 82 insertions(+), 35 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 2a40efc5b..487955da4 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -133,13 +133,14 @@ class Monitoring_HostsController extends Controller
         $this->view->objects = $this->hostList;
         $this->view->unhandledObjects = $this->hostList->getUnhandledObjects();
         $this->view->problemObjects = $this->hostList->getProblemObjects();
-        $this->view->acknowledgeUnhandledLink = Url::fromPath('monitoring/hosts/acknowledge-problem')
-            ->setQueryString($this->hostList->getUnhandledObjects()->objectsFilter()->toQueryString());
         $this->view->downtimeUnhandledLink = Url::fromPath('monitoring/hosts/schedule-downtime')
             ->setQueryString($this->hostList->getUnhandledObjects()->objectsFilter()->toQueryString());
         $this->view->downtimeLink = Url::fromPath('monitoring/hosts/schedule-downtime')
             ->setQueryString($this->hostList->getProblemObjects()->objectsFilter()->toQueryString());
         $this->view->acknowledgedObjects = $this->hostList->getAcknowledgedObjects();
+        $this->view->acknowledgeLink = Url::fromPath('monitoring/hosts/acknowledge-problem')
+            ->setQueryString($this->hostList->getUnacknowledgedObjects()->objectsFilter()->toQueryString());
+        $this->view->unacknowledgedObjects = $this->hostList->getUnacknowledgedObjects();
         $this->view->objectsInDowntime = $this->hostList->getObjectsInDowntime();
         $this->view->inDowntimeLink = Url::fromPath('monitoring/list/hosts')
             ->setQueryString(
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 097ee607b..a05a10e4d 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -149,13 +149,14 @@ class Monitoring_ServicesController extends Controller
         $this->view->objects = $this->serviceList;
         $this->view->unhandledObjects = $this->serviceList->getUnhandledObjects();
         $this->view->problemObjects = $this->serviceList->getProblemObjects();
-        $this->view->acknowledgeUnhandledLink = Url::fromPath('monitoring/services/acknowledge-problem')
-            ->setQueryString($this->serviceList->getUnhandledObjects()->objectsFilter()->toQueryString());
         $this->view->downtimeUnhandledLink = Url::fromPath('monitoring/services/schedule-downtime')
             ->setQueryString($this->serviceList->getUnhandledObjects()->objectsFilter()->toQueryString());
         $this->view->downtimeLink = Url::fromPath('monitoring/services/schedule-downtime')
             ->setQueryString($this->serviceList->getProblemObjects()->objectsFilter()->toQueryString());
         $this->view->acknowledgedObjects = $acknowledgedObjects;
+        $this->view->acknowledgeLink = Url::fromPath('monitoring/services/acknowledge-problem')
+            ->setQueryString($this->serviceList->getUnacknowledgedObjects()->objectsFilter()->toQueryString());
+        $this->view->unacknowledgedObjects = $this->serviceList->getUnacknowledgedObjects();
         $this->view->objectsInDowntime = $this->serviceList->getObjectsInDowntime();
         $this->view->inDowntimeLink = Url::fromPath('monitoring/list/services')
             ->setQueryString($this->serviceList->getObjectsInDowntime()
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 6bbb3c80d..1abc2d21d 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -72,9 +72,10 @@
         <?php
             $unhandledCount = count($unhandledObjects);
             $problemCount = count($problemObjects);
+            $unackCount = count($unacknowledgedObjects);
         ?>
 
-        <?php if ($problemCount || $unhandledCount): ?>
+        <?php if ($problemCount || $unhandledCount || $unackCount): ?>
             <h3>
                 <?= $this->icon('attention-alt') ?>
                 <?= $this->translatePlural(
@@ -110,6 +111,24 @@
                 ); ?>
             <?php endif; ?>
 
+            <?php
+                if ($unackCount > 0): ?>
+                <br>
+                    <?= $this->qlink(
+                        sprintf(
+                            $this->translatePlural(
+                                'Acknowledge %u unacknowledged problem hosts',
+                                'Acknowledge %u unacknowledged problem hosts',
+                                $unackCount
+                            ),
+                            $unackCount
+                        ),
+                        $acknowledgeLink,
+                        null,
+                        array('icon' => 'ok')
+                    ); ?>
+            <?php endif; ?>
+
             <?php if ($unhandledCount): ?>
               <p>
               <?= sprintf(
@@ -136,21 +155,6 @@
                   array('icon' => 'plug')
               ); ?>
 
-              <br>
-              <?= $this->qlink(
-                    sprintf(
-                        $this->translatePlural(
-                            'Acknowledge %u unhandled problem host',
-                            'Acknowledge %u unhandled problem hosts',
-                            $unhandledCount
-                        ),
-                        $unhandledCount
-                    ),
-                    $acknowledgeUnhandledLink,
-                    null,
-                    array('icon' => 'ok')
-              ); ?>
-
             <?php endif; ?>
         <?php endif;?>
 
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 746e24871..f4469fe2d 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -70,9 +70,10 @@
         <?php
             $unhandledCount = count($unhandledObjects);
             $problemCount = count($problemObjects);
+            $unackCount = count($unacknowledgedObjects);
         ?>
 
-        <?php if ($problemCount || $unhandledCount): ?>
+        <?php if ($problemCount || $unhandledCount || $unackCount): ?>
         <div>
             <h3>
                 <?= $this->icon('attention-alt') ?>
@@ -105,6 +106,25 @@
                 ); ?>
             <?php endif ?>
 
+            <?php
+            ?>
+            <?php if ($unackCount > 0): ?>
+                <br>
+                <?= $this->qlink(
+                    sprintf(
+                        $this->translatePlural(
+                            'Acknowledge %u unacknowledged problem service',
+                            'Acknowledge %u unacknowledged problem services',
+                            $unackCount
+                        ),
+                        $unackCount
+                    ),
+                    $acknowledgeLink,
+                    null,
+                    array('icon' => 'ok')
+                ); ?>
+            <?php endif; ?>
+
             <?php if ($unhandledCount): ?>
                 <p>
                 <?= sprintf($this->translate('There are %s unhandled problem services. ' .
@@ -126,20 +146,6 @@
                     array('icon' => 'plug')
                 ); ?>
 
-                <br>
-                <?= $this->qlink(
-                    sprintf(
-                        $this->translatePlural(
-                            'Acknowledge %u unhandled problem service',
-                            'Acknowledge %u unhandled problem services',
-                            $unhandledCount
-                        ),
-                        $unhandledCount
-                    ),
-                    $acknowledgeUnhandledLink,
-                    null,
-                    array('icon' => 'ok')
-                ); ?>
             <?php endif ?>
 
         </div>
diff --git a/modules/monitoring/library/Monitoring/Object/HostList.php b/modules/monitoring/library/Monitoring/Object/HostList.php
index 2aa5bb04f..51b58776b 100644
--- a/modules/monitoring/library/Monitoring/Object/HostList.php
+++ b/modules/monitoring/library/Monitoring/Object/HostList.php
@@ -99,4 +99,19 @@ class HostList extends ObjectList
                 ->applyFilter(clone $this->filter)
                 ->where('downtime_objecttype', 'host');
     }
+
+    /**
+     * @return ObjectList
+     */
+    public function getUnacknowledgedObjects()
+    {
+        $unhandledObjects = array();
+        foreach ($this as $object) {
+            if (! in_array((int) $object->state, array(0, 99)) &&
+                (bool) $object->host_acknowledged === false) {
+                $unhandledObjects[] = $object;
+            }
+        }
+        return $this->newFromArray($unhandledObjects);
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/Object/ObjectList.php b/modules/monitoring/library/Monitoring/Object/ObjectList.php
index 75fe1ba76..c4ecdddb2 100644
--- a/modules/monitoring/library/Monitoring/Object/ObjectList.php
+++ b/modules/monitoring/library/Monitoring/Object/ObjectList.php
@@ -193,6 +193,11 @@ abstract class ObjectList implements Countable, IteratorAggregate
         return $this->newFromArray($handledObjects);
     }
 
+    /**
+     * @return ObjectList
+     */
+    public abstract function getUnacknowledgedObjects();
+
     /**
      * Create a ObjectList from an array of hosts without querying a backend
      *
diff --git a/modules/monitoring/library/Monitoring/Object/ServiceList.php b/modules/monitoring/library/Monitoring/Object/ServiceList.php
index 5ae9b8193..01ecf4da9 100644
--- a/modules/monitoring/library/Monitoring/Object/ServiceList.php
+++ b/modules/monitoring/library/Monitoring/Object/ServiceList.php
@@ -147,4 +147,19 @@ class ServiceList extends ObjectList
                 ->applyFilter(clone $this->filter)
                 ->where('downtime_objecttype', 'service');
     }
+
+    /**
+     * @return ObjectList
+     */
+    public function getUnacknowledgedObjects()
+    {
+        $unhandledObjects = array();
+        foreach ($this as $object) {
+            if (! in_array((int) $object->state, array(0, 99)) &&
+                  (bool) $object->service_acknowledged === false) {
+                $unhandledObjects[] = $object;
+            }
+        }
+        return $this->newFromArray($unhandledObjects);
+    }
 }

From 601b720a03543fd24cedb763585e64c3457e9f35 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Jun 2015 14:05:44 +0200
Subject: [PATCH 1904/2920] LdapUserBackend: Fetch and interpret the correct
 attributes (OpenLDAP)

refs #8826
---
 .../Authentication/User/LdapUserBackend.php   | 38 +++++++++++++++----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index dc6fe04b5..154a33a44 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -262,9 +262,11 @@ class LdapUserBackend extends Repository implements UserBackendInterface
             $createdAtAttribute = 'whenCreated';
             $lastModifiedAttribute = 'whenChanged';
         } else {
-            $isActiveAttribute = 'unknown';
-            $createdAtAttribute = 'unknown';
-            $lastModifiedAttribute = 'unknown';
+            // TODO(jom): Elaborate whether it is possible to add dynamic support for the ppolicy
+            $isActiveAttribute = 'shadowExpire';
+
+            $createdAtAttribute = 'createTimestamp';
+            $lastModifiedAttribute = 'modifyTimestamp';
         }
 
         return array(
@@ -293,17 +295,15 @@ class LdapUserBackend extends Repository implements UserBackendInterface
 
         if ($this->ds->getCapabilities()->hasAdOid()) {
             $stateConverter = 'user_account_control';
-            $timeConverter = 'generalized_time';
         } else {
-            $timeConverter = null;
-            $stateConverter = null;
+            $stateConverter = 'shadow_expire';
         }
 
         return array(
             $this->userClass => array(
                 'is_active'     => $stateConverter,
-                'created_at'    => $timeConverter,
-                'last_modified' => $timeConverter
+                'created_at'    => 'generalized_time',
+                'last_modified' => 'generalized_time'
             )
         );
     }
@@ -342,6 +342,9 @@ class LdapUserBackend extends Repository implements UserBackendInterface
             ($dateTime = DateTime::createFromFormat('YmdHis.uO', $value)) !== false
             || ($dateTime = DateTime::createFromFormat('YmdHis.uZ', $value)) !== false
             || ($dateTime = DateTime::createFromFormat('YmdHis.u', $value)) !== false
+            || ($dateTime = DateTime::createFromFormat('YmdHis', $value)) !== false
+            || ($dateTime = DateTime::createFromFormat('YmdHi', $value)) !== false
+            || ($dateTime = DateTime::createFromFormat('YmdH', $value)) !== false
         ) {
             return $dateTime->getTimeStamp();
         } else {
@@ -353,6 +356,25 @@ class LdapUserBackend extends Repository implements UserBackendInterface
         }
     }
 
+    /**
+     * Return whether the given shadowExpire value defines that a user is permitted to login
+     *
+     * @param   string|null     $value
+     *
+     * @return  bool
+     */
+    protected function retrieveShadowExpire($value)
+    {
+        if ($value === null) {
+            return $value;
+        }
+
+        $now = new DateTime();
+        $bigBang = clone $now;
+        $bigBang->setTimestamp(0);
+        return ((int) $value) >= $bigBang->diff($now)->days;
+    }
+
     /**
      * Probe the backend to test if authentication is possible
      *

From 89311f96df3cc11424a3827c23ea3cabb1e1d917 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Jun 2015 14:06:37 +0200
Subject: [PATCH 1905/2920] Show a minus for a user's state if the state cannot
 be determined

refs #8826
---
 application/views/scripts/user/show.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index 96af9224c..aadc00614 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -28,7 +28,7 @@ if ($this->hasPermission('config/application/users/edit') && $backend instanceof
  <?php endif ?>
   <div class="user-header">
     <p class="user-name"><strong><?= $this->escape($user->user_name); ?></strong></p> <?= $editLink; ?>
-    <p class="user-state"><strong><?= $this->translate('State'); ?>:</strong> <?= $user->is_active ? $this->translate('Active') : $this->translate('Inactive'); ?></p>
+    <p class="user-state"><strong><?= $this->translate('State'); ?>:</strong> <?= $user->is_active === null ? '-' : ($user->is_active ? $this->translate('Active') : $this->translate('Inactive')); ?></p>
     <p class="user-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $user->created_at === null ? '-' : $this->formatDateTime($user->created_at); ?></p>
     <p class="user-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $user->last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?></p>
   </div>

From 4bd36bc5004ea5f53265ecfe979f56136b3967a3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Jun 2015 14:25:29 +0200
Subject: [PATCH 1906/2920] UserGroupForm: Notify the user that memberships
 will be cleared...

...when removing a group.

refs #8826
---
 application/forms/Config/UserGroup/UserGroupForm.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/application/forms/Config/UserGroup/UserGroupForm.php b/application/forms/Config/UserGroup/UserGroupForm.php
index eb3c2846d..598029c1d 100644
--- a/application/forms/Config/UserGroup/UserGroupForm.php
+++ b/application/forms/Config/UserGroup/UserGroupForm.php
@@ -59,6 +59,10 @@ class UserGroupForm extends RepositoryForm
     protected function createDeleteElements(array $formData)
     {
         $this->setTitle(sprintf($this->translate('Remove group %s?'), $this->getIdentifier()));
+        $this->addDescription($this->translate(
+            'Note that all users that are currently a member of this group will'
+            . ' have their membership cleared automatically.'
+        ));
         $this->setSubmitLabel($this->translate('Yes'));
     }
 

From beb5bd7370549c40590a27d5ace56f11943318c0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Jun 2015 15:03:08 +0200
Subject: [PATCH 1907/2920] Repository: Clone a filter implicitly in
 self::requireFilter($clone = true)

refs #8826
---
 .../Icinga/Authentication/User/DbUserBackend.php    |  2 +-
 library/Icinga/Repository/DbRepository.php          | 13 +++++++++----
 library/Icinga/Repository/IniRepository.php         |  4 ++--
 library/Icinga/Repository/Repository.php            | 13 +++++++++++--
 library/Icinga/Repository/RepositoryQuery.php       |  8 ++------
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/library/Icinga/Authentication/User/DbUserBackend.php b/library/Icinga/Authentication/User/DbUserBackend.php
index 8a7991a0f..0e5dad5fa 100644
--- a/library/Icinga/Authentication/User/DbUserBackend.php
+++ b/library/Icinga/Authentication/User/DbUserBackend.php
@@ -126,7 +126,7 @@ class DbUserBackend extends DbRepository implements UserBackendInterface
     {
         $bind['last_modified'] = date('Y-m-d H:i:s');
         if ($filter) {
-            $this->requireFilter($table, $filter);
+            $filter = $this->requireFilter($table, $filter);
         }
 
         $this->ds->update(
diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index e2ba7d994..93f9ceaeb 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -296,7 +296,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     public function update($table, array $bind, Filter $filter = null)
     {
         if ($filter) {
-            $this->requireFilter($table, $filter);
+            $filter = $this->requireFilter($table, $filter);
         }
 
         $this->ds->update($this->prependTablePrefix($table), $this->requireStatementColumns($table, $bind), $filter);
@@ -311,7 +311,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     public function delete($table, Filter $filter = null)
     {
         if ($filter) {
-            $this->requireFilter($table, $filter);
+            $filter = $this->requireFilter($table, $filter);
         }
 
         $this->ds->delete($this->prependTablePrefix($table), $filter);
@@ -478,10 +478,13 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      * @param   Filter              $filter     The filter to recurse
      * @param   RepositoryQuery     $query      An optional query to pass as context
      *                                          (Directly passed through to $this->requireFilterColumn)
+     * @param   bool                $clone      Whether to clone $filter first
+     *
+     * @return  Filter                          The udpated filter
      */
-    public function requireFilter($table, Filter $filter, RepositoryQuery $query = null)
+    public function requireFilter($table, Filter $filter, RepositoryQuery $query = null, $clone = true)
     {
-        parent::requireFilter($table, $filter, $query);
+        $filter = parent::requireFilter($table, $filter, $query, $clone);
 
         if ($filter->isExpression()) {
             $column = $filter->getColumn();
@@ -495,6 +498,8 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
                 }
             }
         }
+
+        return $filter;
     }
 
     /**
diff --git a/library/Icinga/Repository/IniRepository.php b/library/Icinga/Repository/IniRepository.php
index 43f42e749..3c73464e5 100644
--- a/library/Icinga/Repository/IniRepository.php
+++ b/library/Icinga/Repository/IniRepository.php
@@ -94,7 +94,7 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
         }
 
         if ($filter !== null) {
-            $this->requireFilter($target, $filter);
+            $filter = $this->requireFilter($target, $filter);
         }
 
         $newSection = null;
@@ -147,7 +147,7 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
     public function delete($target, Filter $filter = null)
     {
         if ($filter !== null) {
-            $this->requireFilter($target, $filter);
+            $filter = $this->requireFilter($target, $filter);
         }
 
         foreach (iterator_to_array($this->ds) as $section => $config) {
diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index ccb3da96a..803f4958f 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -627,18 +627,27 @@ abstract class Repository implements Selectable
      * @param   Filter              $filter     The filter to recurse
      * @param   RepositoryQuery     $query      An optional query to pass as context
      *                                          (Directly passed through to $this->requireFilterColumn)
+     * @param   bool                $clone      Whether to clone $filter first
+     *
+     * @return  Filter                          The udpated filter
      */
-    public function requireFilter($table, Filter $filter, RepositoryQuery $query = null)
+    public function requireFilter($table, Filter $filter, RepositoryQuery $query = null, $clone = true)
     {
+        if ($clone) {
+            $filter = clone $filter;
+        }
+
         if ($filter->isExpression()) {
             $column = $filter->getColumn();
             $filter->setColumn($this->requireFilterColumn($table, $column, $query));
             $filter->setExpression($this->persistColumn($table, $column, $filter->getExpression()));
         } elseif ($filter->isChain()) {
             foreach ($filter->filters() as $chainOrExpression) {
-                $this->requireFilter($table, $chainOrExpression, $query);
+                $this->requireFilter($table, $chainOrExpression, $query, false);
             }
         }
+
+        return $filter;
     }
 
     /**
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index 9a8eb7e83..c5e9ac9ed 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -183,9 +183,7 @@ class RepositoryQuery implements QueryInterface, Iterator
      */
     public function setFilter(Filter $filter)
     {
-        $filter = clone $filter;
-        $this->repository->requireFilter($this->target, $filter, $this);
-        $this->query->setFilter($filter);
+        $this->query->setFilter($this->repository->requireFilter($this->target, $filter, $this));
         return $this;
     }
 
@@ -200,9 +198,7 @@ class RepositoryQuery implements QueryInterface, Iterator
      */
     public function addFilter(Filter $filter)
     {
-        $filter = clone $filter;
-        $this->repository->requireFilter($this->target, $filter, $this);
-        $this->query->addFilter($filter);
+        $this->query->addFilter($this->repository->requireFilter($this->target, $filter, $this));
         return $this;
     }
 

From 62fff9480826f8e5dc9d79a98c9f13e4bd780ea4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Jun 2015 15:16:03 +0200
Subject: [PATCH 1908/2920] DbUserGroupBackend: Do not try to fetch a group id
 for null

refs #8826
---
 .../Icinga/Authentication/UserGroup/DbUserGroupBackend.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
index e77d50f78..fd1228065 100644
--- a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
@@ -208,8 +208,8 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
      */
     protected function persistGroupId($groupName)
     {
-        if (is_int($groupName)) {
-            return $groupName; // It's obviously already an id
+        if (! $groupName || is_int($groupName)) {
+            return $groupName; // It's obviously already an id or NULL
         }
 
         $groupId = $this->ds

From 1385295e4eeb75e07cf3772d82157a702857ed12 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Jun 2015 15:33:35 +0200
Subject: [PATCH 1909/2920] DbUserGroupBackend: Properly handle sequences of
 group names

refs #8826
---
 .../UserGroup/DbUserGroupBackend.php          | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
index fd1228065..fbc58bd5f 100644
--- a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
@@ -200,16 +200,33 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
     /**
      * Fetch and return the corresponding id for the given group's name
      *
-     * @param   string  $groupName
+     * @param   string|array    $groupName
      *
      * @return  int
      *
-     * @throws  NotFoundError       In case no group with the given name is found
+     * @throws  NotFoundError
      */
     protected function persistGroupId($groupName)
     {
-        if (! $groupName || is_int($groupName)) {
-            return $groupName; // It's obviously already an id or NULL
+        if (! $groupName || empty($groupName) || is_int($groupName)) {
+            return $groupName;
+        }
+
+        if (is_array($groupName)) {
+            if (is_int($groupName[0])) {
+                return $groupName; // In case the array contains mixed types...
+            }
+
+            $groupIds = $this->ds
+                ->select()
+                ->from($this->prependTablePrefix('group'), array('id'))
+                ->where('name', $groupName)
+                ->fetchColumn();
+            if (empty($groupIds)) {
+                throw new NotFoundError('No groups found matching one of: %s', implode(', ', $groupName));
+            }
+
+            return $groupIds;
         }
 
         $groupId = $this->ds

From e936c76ca937c9b0fe6029db83306568f3e05c69 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Jun 2015 15:34:38 +0200
Subject: [PATCH 1910/2920] DbUserGroupBackend: Really clear memberships and
 parent relations...

...when removing a group.

refs #8826
---
 .../UserGroup/DbUserGroupBackend.php          | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
index fbc58bd5f..e59b03258 100644
--- a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
@@ -122,6 +122,27 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
         parent::update($table, $bind, $filter);
     }
 
+    /**
+     * Delete table rows, optionally limited by using a filter
+     *
+     * @param   string  $table
+     * @param   Filter  $filter
+     */
+    public function delete($table, Filter $filter = null)
+    {
+        if ($table === 'group') {
+            parent::delete('group_membership', $filter);
+            $idQuery = $this->select(array('group_id'));
+            if ($filter !== null) {
+                $idQuery->applyFilter($filter);
+            }
+
+            $this->update('group', array('parent' => null), Filter::where('parent', $idQuery->fetchColumn()));
+        }
+
+        parent::delete($table, $filter);
+    }
+
     /**
      * Return the groups the given user is a member of
      *

From 80e4e419e2ed1d816411403d0c3d1d3a3b952439 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Jun 2015 15:56:01 +0200
Subject: [PATCH 1911/2920] pgsql schema: Add function definition for
 unix_timestamp

This does not seem to require any special privileges since we're using SQL
as language and no unusual data types. If this proves false though, feel
free to fix this.

refs #8826
---
 etc/schema/pgsql.schema.sql | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/etc/schema/pgsql.schema.sql b/etc/schema/pgsql.schema.sql
index 7f28c5d81..56117d4f8 100644
--- a/etc/schema/pgsql.schema.sql
+++ b/etc/schema/pgsql.schema.sql
@@ -1,5 +1,9 @@
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
+CREATE OR REPLACE FUNCTION unix_timestamp(timestamp with time zone) RETURNS bigint AS '
+        SELECT EXTRACT(EPOCH FROM $1)::bigint AS result
+' LANGUAGE sql;
+
 CREATE TABLE "icingaweb_group" (
   "id"     serial,
   "name"   character varying(64) NOT NULL,

From c7ce1498bf34efc435d2fa8d2252eb25c50c297d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Jun 2015 16:10:23 +0200
Subject: [PATCH 1912/2920] Introduce menu entry "Configuration"

---
 library/Icinga/Web/Menu.php          | 35 ++++++++++++++++------------
 modules/doc/configuration.php        |  4 ++--
 modules/monitoring/configuration.php |  2 +-
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 014909ff0..7e092cc92 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -233,50 +233,55 @@ class Menu implements RecursiveIterator
             ));
 
             $section = $this->add(t('System'), array(
-                'icon'     => 'wrench',
+                'icon'     => 'services',
                 'priority' => 200,
                 'renderer' => 'ProblemMenuItemRenderer'
             ));
+            if (Logger::writesToFile()) {
+                $section->add(t('Application Log'), array(
+                    'url'      => 'list/applicationlog',
+                    'priority' => 300
+                ));
+            }
+
+            $section = $this->add(t('Configuration'), array(
+                'icon'          => 'wrench',
+                'permission'    => 'config/*',
+                'priority'      => 400
+            ));
             $section->add(t('User-Management'), array(
                 'url'           => 'user/list',
                 'permission'    => 'config/application/*',
-                'priority'      => 300
+                'priority'      => 500
             ));
             $section->add(t('UserGroupBackends'), array(
                 'url'           => 'usergroupbackend/list',
                 'permission'    => 'config/application/usergroupbackend/*',
-                'priority'      => 301
+                'priority'      => 510
             ));
             $section->add(t('Configuration'), array(
                 'url'           => 'config',
                 'permission'    => 'config/application/*',
-                'priority'      => 400
+                'priority'      => 600
             ));
             $section->add(t('Modules'), array(
                 'url'           => 'config/modules',
                 'permission'    => 'config/modules',
-                'priority'      => 500
+                'priority'      => 700
             ));
 
-            if (Logger::writesToFile()) {
-                $section->add(t('Application Log'), array(
-                    'url'      => 'list/applicationlog',
-                    'priority' => 600
-                ));
-            }
-
             $section = $this->add($auth->getUser()->getUsername(), array(
                 'icon'     => 'user',
-                'priority' => 700
+                'priority' => 800
             ));
             $section->add(t('Preferences'), array(
                 'url'      => 'preference',
-                'priority' => 701
+                'priority' => 810
             ));
 
             $section->add(t('Logout'), array(
                 'url'      => 'authentication/logout',
-                'priority' => 800,
+                'priority' => 890,
                 'renderer' => 'ForeignMenuItemRenderer'
             ));
         }
diff --git a/modules/doc/configuration.php b/modules/doc/configuration.php
index 031a62e64..ee3d9ebdd 100644
--- a/modules/doc/configuration.php
+++ b/modules/doc/configuration.php
@@ -7,7 +7,7 @@ $section = $this->menuSection($this->translate('Documentation'), array(
     'title'    => 'Documentation',
     'icon'     => 'book',
     'url'      => 'doc',
-    'priority' => 190
+    'priority' => 390
 ));
 
 $section->add('Icinga Web 2', array(
@@ -18,7 +18,7 @@ $section->add('Module documentations', array(
 ));
 $section->add($this->translate('Developer - Style'), array(
     'url' => 'doc/style/guide',
-    'priority' => 200,
+    'priority' => 399
 ));
 
 $this->provideSearchUrl($this->translate('Doc'), 'doc/search', -10);
diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index fd3ee334d..aa3b4a2fd 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -208,7 +208,7 @@ $section->add($this->translate('Alert Summary'), array(
 $section = $this->menuSection($this->translate('System'));
 $section->add($this->translate('Monitoring Health'), array(
     'url'      => 'monitoring/process/info',
-    'priority' => 120,
+    'priority' => 220,
     'renderer'  => 'Icinga\Module\Monitoring\Web\Menu\BackendAvailabilityMenuItemRenderer'
 ));
 

From 1901f0af980a69ee28d5bc3457fca874396a28b9 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 1 Jun 2015 16:12:02 +0200
Subject: [PATCH 1913/2920] Improve .ini file formatting

End every file with a newline, and only display 1 empty line between each section, to improve readabillity.

fixes #8706
---
 library/Icinga/File/Ini/IniEditor.php                  | 10 +++++++++-
 .../application/views/scripts/services/show.phtml      |  2 --
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/File/Ini/IniEditor.php b/library/Icinga/File/Ini/IniEditor.php
index a772a8f41..c324808bc 100644
--- a/library/Icinga/File/Ini/IniEditor.php
+++ b/library/Icinga/File/Ini/IniEditor.php
@@ -62,7 +62,7 @@ class IniEditor
         $this->commentIndentation = array_key_exists('commentIndentation', $options)
             ? $options['commentIndentation'] : 43;
         $this->sectionSeparators = array_key_exists('sectionSeparators', $options)
-            ? $options['sectionSeparators'] : 2;
+            ? $options['sectionSeparators'] : 1;
     }
 
     /**
@@ -323,6 +323,12 @@ class IniEditor
     private function cleanUpWhitespaces()
     {
         $i = count($this->text) - 1;
+
+        // remove all trailing whitespaces
+        while ($i > 0 && preg_match('/^\s*$/', $this->text[$i]) === 1) {
+            $this->deleteLine($i);
+            $i--;
+        }
         for (; $i > 0; $i--) {
             $line = $this->text[$i];
             if ($this->isSectionDeclaration($line) && $i > 0) {
@@ -351,6 +357,8 @@ class IniEditor
                 }
             }
         }
+        // always end file with a linebreak
+        $this->insertAtLine(count($this->text) + 1, "");
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index f4469fe2d..fc2e87ad2 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -106,8 +106,6 @@
                 ); ?>
             <?php endif ?>
 
-            <?php
-            ?>
             <?php if ($unackCount > 0): ?>
                 <br>
                 <?= $this->qlink(

From 49bb09d9d363f5863996c228c19a56037a9283fe Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Jun 2015 16:31:48 +0200
Subject: [PATCH 1914/2920] Add dedicated menu entries to manage users, groups
 and roles

refs #8826
---
 library/Icinga/Web/Menu.php | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 7e092cc92..1757f0e88 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -249,20 +249,30 @@ class Menu implements RecursiveIterator
                 'permission'    => 'config/*',
                 'priority'      => 400
             ));
-            $section->add(t('User-Management'), array(
-                'url'           => 'user/list',
+            $section->add(t('Application'), array(
+                'url'           => 'config/application',
                 'permission'    => 'config/application/*',
+                'priority'      => 450
+            ));
+            $section->add(t('Users'), array(
+                'url'           => 'user/list',
+                'permission'    => 'config/application/user/show',
                 'priority'      => 500
             ));
+            $section->add(t('Groups'), array(
+                'url'           => 'group/list',
+                'permission'    => 'config/application/group/show',
+                'priority'      => 550
+            ));
+            $section->add(t('Roles'), array(
+                'url'           => 'roles',
+                'permission'    => 'config/application/roles',
+                'priority'      => 600
+            ));
             $section->add(t('UserGroupBackends'), array(
                 'url'           => 'usergroupbackend/list',
                 'permission'    => 'config/application/usergroupbackend/*',
-                'priority'      => 510
-            ));
-            $section->add(t('Configuration'), array(
-                'url'           => 'config',
-                'permission'    => 'config/application/*',
-                'priority'      => 600
+                'priority'      => 650
             ));
             $section->add(t('Modules'), array(
                 'url'           => 'config/modules',

From 66fd7dfd9313f76911ffefdf568a674809665e67 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Jun 2015 16:35:27 +0200
Subject: [PATCH 1915/2920] ConfigController: Rename applicationAction to
 generalAction

---
 application/controllers/ConfigController.php     | 16 ++++++++--------
 .../config/{application.phtml => general.phtml}  |  0
 library/Icinga/Web/Menu.php                      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename application/views/scripts/config/{application.phtml => general.phtml} (100%)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 77b5b66d9..321fcf882 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -38,12 +38,12 @@ class ConfigController extends Controller
         $auth = $this->Auth();
         $allowedActions = array();
         if ($auth->hasPermission('config/application/general')) {
-            $tabs->add('application', array(
+            $tabs->add('general', array(
                 'title' => $this->translate('Adjust the general configuration of Icinga Web 2'),
-                'label' => $this->translate('Application'),
-                'url'   => 'config/application'
+                'label' => $this->translate('General'),
+                'url'   => 'config/general'
             ));
-            $allowedActions[] = 'application';
+            $allowedActions[] = 'general';
         }
         if ($auth->hasPermission('config/application/authentication')) {
             $tabs->add('authentication', array(
@@ -96,11 +96,11 @@ class ConfigController extends Controller
     }
 
     /**
-     * Application configuration
+     * General configuration
      *
-     * @throws SecurityException    If the user lacks the permission for configuring the application
+     * @throws SecurityException    If the user lacks the permission for configuring the general configuration
      */
-    public function applicationAction()
+    public function generalAction()
     {
         $this->assertPermission('config/application/general');
         $form = new GeneralConfigForm();
@@ -108,7 +108,7 @@ class ConfigController extends Controller
         $form->handleRequest();
 
         $this->view->form = $form;
-        $this->view->tabs->activate('application');
+        $this->view->tabs->activate('general');
     }
 
     /**
diff --git a/application/views/scripts/config/application.phtml b/application/views/scripts/config/general.phtml
similarity index 100%
rename from application/views/scripts/config/application.phtml
rename to application/views/scripts/config/general.phtml
diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 1757f0e88..e5fd610ad 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -250,7 +250,7 @@ class Menu implements RecursiveIterator
                 'priority'      => 400
             ));
             $section->add(t('Application'), array(
-                'url'           => 'config/application',
+                'url'           => 'config',
                 'permission'    => 'config/application/*',
                 'priority'      => 450
             ));

From 17e7f1e7543ced6889192becddf0cb1690691b96 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Jun 2015 16:43:11 +0200
Subject: [PATCH 1916/2920] Link the roles configuration with the user and
 group management

refs #8826
---
 application/controllers/ConfigController.php  | 10 ----
 application/controllers/RolesController.php   | 51 +++----------------
 .../Web/Controller/AuthBackendController.php  | 13 +++++
 3 files changed, 20 insertions(+), 54 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 321fcf882..ab4b62049 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -61,16 +61,6 @@ class ConfigController extends Controller
             ));
             $allowedActions[] = 'resource';
         }
-        if ($auth->hasPermission('config/application/roles')) {
-            $tabs->add('roles', array(
-                'title' => $this->translate(
-                    'Configure roles to permit or restrict users and groups accessing Icinga Web 2'
-                ),
-                'label' => $this->translate('Roles'),
-                'url'   => 'roles'
-            ));
-            $allowedActions[] = 'roles';
-        }
         $this->firstAllowedAction = array_shift($allowedActions);
     }
 
diff --git a/application/controllers/RolesController.php b/application/controllers/RolesController.php
index d4b7b7c63..b889083c6 100644
--- a/application/controllers/RolesController.php
+++ b/application/controllers/RolesController.php
@@ -4,61 +4,21 @@
 use Icinga\Application\Config;
 use Icinga\Forms\ConfirmRemovalForm;
 use Icinga\Forms\Security\RoleForm;
-use Icinga\Web\Controller\ActionController;
+use Icinga\Web\Controller\AuthBackendController;
 use Icinga\Web\Notification;
-use Icinga\Web\Widget;
 
 /**
  * Roles configuration
  */
-class RolesController extends ActionController
+class RolesController extends AuthBackendController
 {
-    /**
-     * Initialize tabs and validate the user's permissions
-     *
-     * @throws \Icinga\Security\SecurityException   If the user lacks permissions for configuring roles
-     */
-    public function init()
-    {
-        $this->assertPermission('config/application/roles');
-        $tabs = $this->getTabs();
-        $auth = $this->Auth();
-        if ($auth->hasPermission('config/application/general')) {
-            $tabs->add('application', array(
-                'title' => $this->translate('Adjust the general configuration of Icinga Web 2'),
-                'label' => $this->translate('Application'),
-                'url'   => 'config'
-            ));
-        }
-        if ($auth->hasPermission('config/application/authentication')) {
-            $tabs->add('authentication', array(
-                'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'),
-                'label' => $this->translate('Authentication'),
-                'url'   => 'config/authentication'
-            ));
-        }
-        if ($auth->hasPermission('config/application/resources')) {
-            $tabs->add('resource', array(
-                'title' => $this->translate('Configure which resources are being utilized by Icinga Web 2'),
-                'label' => $this->translate('Resources'),
-                'url'   => 'config/resource'
-            ));
-        }
-        $tabs->add('roles', array(
-            'title' => $this->translate(
-                'Configure roles to permit or restrict users and groups accessing Icinga Web 2'
-            ),
-            'label' => $this->translate('Roles'),
-            'url'   => 'roles'
-        ));
-    }
-
     /**
      * List roles
      */
     public function indexAction()
     {
-        $this->view->tabs->activate('roles');
+        $this->assertPermission('config/application/roles');
+        $this->createListTabs()->activate('roles');
         $this->view->roles = Config::app('roles', true);
     }
 
@@ -67,6 +27,7 @@ class RolesController extends ActionController
      */
     public function newAction()
     {
+        $this->assertPermission('config/application/roles');
         $role = new RoleForm(array(
             'onSuccess' => function (RoleForm $role) {
                 $name = $role->getElement('name')->getValue();
@@ -100,6 +61,7 @@ class RolesController extends ActionController
      */
     public function updateAction()
     {
+        $this->assertPermission('config/application/roles');
         $name = $this->_request->getParam('role');
         if (empty($name)) {
             throw new Zend_Controller_Action_Exception(
@@ -149,6 +111,7 @@ class RolesController extends ActionController
      */
     public function removeAction()
     {
+        $this->assertPermission('config/application/roles');
         $name = $this->_request->getParam('role');
         if (empty($name)) {
             throw new Zend_Controller_Action_Exception(
diff --git a/library/Icinga/Web/Controller/AuthBackendController.php b/library/Icinga/Web/Controller/AuthBackendController.php
index 5b2a4f18e..a3d93e0f8 100644
--- a/library/Icinga/Web/Controller/AuthBackendController.php
+++ b/library/Icinga/Web/Controller/AuthBackendController.php
@@ -163,6 +163,19 @@ class AuthBackendController extends Controller
             );
         }
 
+        if ($this->hasPermission('config/application/roles')) {
+            $tabs->add(
+                'roles',
+                array(
+                    'title' => $this->translate(
+                        'Configure roles to permit or restrict users and groups accessing Icinga Web 2'
+                    ),
+                    'label' => $this->translate('Roles'),
+                    'url'   => 'roles'
+                )
+            );
+        }
+
         return $tabs;
     }
 }

From 4c6a2b4f0695c0e4cb7e417cab386a69f6897240 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 1 Jun 2015 16:46:52 +0200
Subject: [PATCH 1917/2920] Fix ini writer unit tests

refs #8706
---
 .../library/Icinga/File/Ini/IniWriterTest.php | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/test/php/library/Icinga/File/Ini/IniWriterTest.php b/test/php/library/Icinga/File/Ini/IniWriterTest.php
index 4dc94a63a..2d9659675 100644
--- a/test/php/library/Icinga/File/Ini/IniWriterTest.php
+++ b/test/php/library/Icinga/File/Ini/IniWriterTest.php
@@ -521,12 +521,10 @@ EOD
 key1                = "1"
 key2                = "2"
 
-
 [two]
 a.b                 = "c"
 d.e                 = "f"
 
-
 [three]
 key                 = "value"
 foo.bar             = "raboof"
@@ -537,12 +535,10 @@ EOD;
 key                 = "value"
 foo.bar             = "raboof"
 
-
 [two]
 a.b                 = "c"
 d.e                 = "f"
 
-
 [one]
 key1                = "1"
 key2                = "2"
@@ -589,7 +585,6 @@ EOD;
 ; comment 1
 [one]
 
-
 ; comment 2
 [two]
 EOD;
@@ -598,7 +593,6 @@ EOD;
 ; comment 2
 [two]
 
-
 ; comment 1
 [one]
 EOD;
@@ -637,8 +631,8 @@ EOD;
         );
 
         $this->assertEquals(
-            $config,
-            $writer->render(),
+            trim($config),
+            trim($writer->render()),
             'IniWriter does not preserve comments on empty lines'
         );
     }
@@ -667,8 +661,8 @@ EOD;
         );
 
         $this->assertEquals(
-            $config,
-            $writer->render(),
+            trim($config),
+            trim($writer->render()),
             'IniWriter does not preserve comments on property lines'
         );
     }
@@ -686,8 +680,8 @@ EOD;
         );
 
         $this->assertEquals(
-            $config,
-            $writer->render(),
+            trim($config),
+            trim($writer->render()),
             'IniWriter does not preserve comments on empty section lines'
         );
     }
@@ -719,8 +713,8 @@ EOD;
         );
 
         $this->assertEquals(
-            $config,
-            $writer->render(),
+            trim($config),
+            trim($writer->render()),
             'IniWriter does not preserve comments on property lines'
         );
     }

From 6661d49bd268fd4fc78e052c82526bc7f01815ac Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 1 Jun 2015 17:00:43 +0200
Subject: [PATCH 1918/2920] Use ltrim instead of a manual loop to remove
 trailing lines in ini writer

refs #8706
---
 library/Icinga/File/Ini/IniEditor.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/library/Icinga/File/Ini/IniEditor.php b/library/Icinga/File/Ini/IniEditor.php
index c324808bc..1f8202d9d 100644
--- a/library/Icinga/File/Ini/IniEditor.php
+++ b/library/Icinga/File/Ini/IniEditor.php
@@ -314,7 +314,7 @@ class IniEditor
     public function getText()
     {
         $this->cleanUpWhitespaces();
-        return implode(PHP_EOL, $this->text);
+        return rtrim(implode(PHP_EOL, $this->text)) . PHP_EOL;
     }
 
     /**
@@ -323,12 +323,6 @@ class IniEditor
     private function cleanUpWhitespaces()
     {
         $i = count($this->text) - 1;
-
-        // remove all trailing whitespaces
-        while ($i > 0 && preg_match('/^\s*$/', $this->text[$i]) === 1) {
-            $this->deleteLine($i);
-            $i--;
-        }
         for (; $i > 0; $i--) {
             $line = $this->text[$i];
             if ($this->isSectionDeclaration($line) && $i > 0) {
@@ -357,8 +351,6 @@ class IniEditor
                 }
             }
         }
-        // always end file with a linebreak
-        $this->insertAtLine(count($this->text) + 1, "");
     }
 
     /**

From 7b9983de38969c142cf6c913a7c0675c6d747f48 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Jun 2015 17:16:24 +0200
Subject: [PATCH 1919/2920] Merge the menu entries for users, groups and roles
 into "Authentication"

---
 library/Icinga/Web/Menu.php          | 36 ++++++++++------------------
 modules/doc/configuration.php        |  4 ++--
 modules/monitoring/configuration.php |  2 +-
 3 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index e5fd610ad..4dff8e735 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -234,64 +234,54 @@ class Menu implements RecursiveIterator
 
             $section = $this->add(t('System'), array(
                 'icon'     => 'services',
-                'priority' => 200,
+                'priority' => 700,
                 'renderer' => 'ProblemMenuItemRenderer'
             ));
             if (Logger::writesToFile()) {
                 $section->add(t('Application Log'), array(
                     'url'      => 'list/applicationlog',
-                    'priority' => 300
+                    'priority' => 710
                 ));
             }
 
             $section = $this->add(t('Configuration'), array(
                 'icon'          => 'wrench',
                 'permission'    => 'config/*',
-                'priority'      => 400
+                'priority'      => 800
             ));
             $section->add(t('Application'), array(
                 'url'           => 'config',
                 'permission'    => 'config/application/*',
-                'priority'      => 450
+                'priority'      => 810
             ));
-            $section->add(t('Users'), array(
-                'url'           => 'user/list',
-                'permission'    => 'config/application/user/show',
-                'priority'      => 500
-            ));
-            $section->add(t('Groups'), array(
-                'url'           => 'group/list',
-                'permission'    => 'config/application/group/show',
-                'priority'      => 550
-            ));
-            $section->add(t('Roles'), array(
-                'url'           => 'roles',
-                'permission'    => 'config/application/roles',
-                'priority'      => 600
+            $section->add(t('Authentication'), array(
+                'url'           => 'user',
+                'permission'    => 'config/authentication/*',
+                'priority'      => 820
             ));
             $section->add(t('UserGroupBackends'), array(
                 'url'           => 'usergroupbackend/list',
                 'permission'    => 'config/application/usergroupbackend/*',
-                'priority'      => 650
+                'priority'      => 830
             ));
             $section->add(t('Modules'), array(
                 'url'           => 'config/modules',
                 'permission'    => 'config/modules',
-                'priority'      => 700
+                'priority'      => 890
             ));
 
             $section = $this->add($auth->getUser()->getUsername(), array(
                 'icon'     => 'user',
-                'priority' => 800
+                'priority' => 900
             ));
             $section->add(t('Preferences'), array(
                 'url'      => 'preference',
-                'priority' => 810
+                'priority' => 910
             ));
 
             $section->add(t('Logout'), array(
                 'url'      => 'authentication/logout',
-                'priority' => 890,
+                'priority' => 990,
                 'renderer' => 'ForeignMenuItemRenderer'
             ));
         }
diff --git a/modules/doc/configuration.php b/modules/doc/configuration.php
index ee3d9ebdd..392009798 100644
--- a/modules/doc/configuration.php
+++ b/modules/doc/configuration.php
@@ -7,7 +7,7 @@ $section = $this->menuSection($this->translate('Documentation'), array(
     'title'    => 'Documentation',
     'icon'     => 'book',
     'url'      => 'doc',
-    'priority' => 390
+    'priority' => 700
 ));
 
 $section->add('Icinga Web 2', array(
@@ -18,7 +18,7 @@ $section->add('Module documentations', array(
 ));
 $section->add($this->translate('Developer - Style'), array(
     'url' => 'doc/style/guide',
-    'priority' => 399
+    'priority' => 790
 ));
 
 $this->provideSearchUrl($this->translate('Doc'), 'doc/search', -10);
diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index aa3b4a2fd..66b42aa20 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -208,7 +208,7 @@ $section->add($this->translate('Alert Summary'), array(
 $section = $this->menuSection($this->translate('System'));
 $section->add($this->translate('Monitoring Health'), array(
     'url'      => 'monitoring/process/info',
-    'priority' => 220,
+    'priority' => 720,
     'renderer'  => 'Icinga\Module\Monitoring\Web\Menu\BackendAvailabilityMenuItemRenderer'
 ));
 

From fa1a5c609d4148ff6c25d05939edfdcef2af7245 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Jun 2015 17:21:11 +0200
Subject: [PATCH 1920/2920] monitoring: Open links of a host's service summary
 in the next container

refs #7998
---
 .../partials/host/servicesummary.phtml        | 80 +++++++++++--------
 1 file changed, 46 insertions(+), 34 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
index a851b7255..dd111b27b 100644
--- a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
@@ -51,15 +51,18 @@ $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
         $object->stats->services_ok,
         $selfUrl,
         array('service_state' => 0),
-        array('title' => sprintf(
-            $this->translatePlural(
-                'List %u service that is currently in state OK on host %s',
-                'List %u services which are currently in state OK on host %s',
-                $object->stats->services_ok
+        array(
+            'title' => sprintf(
+                $this->translatePlural(
+                    'List %u service that is currently in state OK on host %s',
+                    'List %u services which are currently in state OK on host %s',
+                    $object->stats->services_ok
+                ),
+                $object->stats->services_ok,
+                $object->host_name
             ),
-            $object->stats->services_ok,
-            $object->host_name
-        ))
+            'data-base-target' => '_next'
+        )
     ); ?>
 </span>
 <?php endif ?>
@@ -90,16 +93,19 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
                 $object->stats->$unhandled,
                 $selfUrl,
                 $paramsUnhandled,
-                array('title' => sprintf(
-                    $this->translatePlural(
-                        'List %u service that is currently in state %s on host %s',
-                        'List %u services which are currently in state %s on host %s',
-                        $object->stats->$unhandled
+                array(
+                    'title' => sprintf(
+                        $this->translatePlural(
+                            'List %u service that is currently in state %s on host %s',
+                            'List %u services which are currently in state %s on host %s',
+                            $object->stats->$unhandled
+                        ),
+                        $object->stats->$unhandled,
+                        Service::getStateText($stateId, true),
+                        $object->host_name
                     ),
-                    $object->stats->$unhandled,
-                    Service::getStateText($stateId, true),
-                    $object->host_name
-                ))
+                    'data-base-target' => '_next'
+                )
             );
         }
         if ($object->stats->$handled) {
@@ -116,16 +122,19 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
                 $object->stats->$handled,
                 $selfUrl,
                 $paramsHandled,
-                array('title' => sprintf(
-                    $this->translatePlural(
-                        'List %u service that is currently in state %s (Acknowledged) on host %s',
-                        'List %u services which are currently in state %s (Acknowledged) on host %s',
-                        $object->stats->$handled
+                array(
+                    'title' => sprintf(
+                        $this->translatePlural(
+                            'List %u service that is currently in state %s (Acknowledged) on host %s',
+                            'List %u services which are currently in state %s (Acknowledged) on host %s',
+                            $object->stats->$handled
+                        ),
+                        $object->stats->$handled,
+                        Service::getStateText($stateId, true),
+                        $object->host_name
                     ),
-                    $object->stats->$handled,
-                    Service::getStateText($stateId, true),
-                    $object->host_name
-                ))
+                    'data-base-target' => '_next'
+                )
             );
             if ($object->stats->$unhandled) {
                 echo "</span>\n";
@@ -141,15 +150,18 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
         $object->stats->services_pending,
         $selfUrl,
         array('service_state' => 99),
-        array('title' => sprintf(
-            $this->translatePlural(
-                'List %u service that is currently in state PENDING on host %s',
-                'List %u services which are currently in state PENDING on host %s',
-                $object->stats->services_pending
+        array(
+            'title' => sprintf(
+                $this->translatePlural(
+                    'List %u service that is currently in state PENDING on host %s',
+                    'List %u services which are currently in state PENDING on host %s',
+                    $object->stats->services_pending
+                ),
+                $object->stats->services_pending,
+                $object->host_name
             ),
-            $object->stats->services_pending,
-            $object->host_name
-        ))
+            'data-base-target' => '_next'
+        )
     ) ?>
 </span>
 <?php endif ?>

From 44968266f6bdfacdbec4ac9c3d1525c2a57cd44d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Jun 2015 14:01:40 +0200
Subject: [PATCH 1921/2920] Fix no-op searches

Depeding on the current filter, Filter::andFilter() may return a new filter object w/ the and filter applied or the and filter is applied to the object itself.
The FilterEditor did not make use of the return value of Filter::andFilter() thus resulting in no-op searches in some scenarios.
---
 library/Icinga/Web/Widget/FilterEditor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index dd84a5e52..42561aeee 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -228,7 +228,7 @@ class FilterEditor extends AbstractWidget
                 foreach ($this->searchColumns as $searchColumn) {
                     $filters[] = Filter::expression($searchColumn, '=', "*$search*");
                 }
-                $filter->andFilter(new FilterOr($filters));
+                $filter = $filter->andFilter(new FilterOr($filters));
             } else {
                 Notification::error(mt('monitoring', 'Cannot search here'));
                 return $this;

From 34edf87461cde09d643837c401c253c1f6f82c22 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Jun 2015 17:24:34 +0200
Subject: [PATCH 1922/2920] monitoring: Readd link to all configured services

---
 .../scripts/list/components/servicesummary.phtml  | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
index 76a51de92..5776285ee 100644
--- a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
@@ -17,7 +17,18 @@ $this->baseFilter = isset($this->baseFilter) ? $this->baseFilter : null;
 $selfUrl = 'monitoring/list/services';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
 ?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
-<?= sprintf($this->translate('%s services:'), $this->stats->services_total); ?>
+<?= $this->qlink(
+    sprintf($this->translatePlural(
+        '%u Service', '%u Services', $this->stats->services_total),
+        $this->stats->services_total
+    ),
+    $selfUrl,
+    null,
+    array('title' => sprintf(
+        $this->translatePlural('List %u service', 'List all %u services', $this->stats->services_total),
+        $this->stats->services_total
+    ))
+) ?>&#58;
 <span class="badges">
 <?php if ($this->stats->services_ok): ?>
 <span class="state ok<?= $currentUrl === Url::fromPath($selfUrl, array('service_state' => 0))->getRelativeUrl() ? ' active' : ''; ?>">
@@ -63,7 +74,7 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
         } else {
             $active = '';
         }
-        
+
         echo '<span class="state ' . $state . $active . ($this->stats->$unhandled ? '' : ' handled') . '">';
         if ($this->stats->$unhandled) {
 

From 9b4f3c9f608faea39ff1d381390e1cb35606c1e6 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 1 Jun 2015 17:25:10 +0200
Subject: [PATCH 1923/2920] monitoring: Readd link to all configured hosts

---
 .../views/scripts/list/components/hostssummary.phtml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
index d6166a52d..1690bf0a7 100644
--- a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
@@ -15,7 +15,15 @@ $this->baseFilter = isset($this->baseFilter) ? $this->baseFilter : null;
 $selfUrl = 'monitoring/list/hosts';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
 ?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
-  <?= sprintf($this->translate('%s hosts:'), $this->stats->hosts_total); ?>
+  <?= $this->qlink(
+      sprintf($this->translatePlural('%u Host', '%u Hosts', $this->stats->hosts_total), $this->stats->hosts_total),
+      $selfUrl,
+      null,
+      array('title' => sprintf(
+          $this->translatePlural('List %u host', 'List all %u hosts', $this->stats->hosts_total),
+          $this->stats->hosts_total
+      ))
+  ) ?>&#58;
   <span class="badges">
     <?php if ($this->stats->hosts_up): ?>
     <span class="state ok<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 0))->getRelativeUrl() ? ' active' : ''; ?>">
@@ -156,4 +164,4 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
     </span>
     <?php endif; ?>
   </span>
-</div>
\ No newline at end of file
+</div>

From cf95994ff54b4b8bd70cb675cf3d4a6648d245c7 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@netways.de>
Date: Tue, 26 May 2015 16:04:57 +0200
Subject: [PATCH 1924/2920] Documentation: Add config overview as first draft

refs #7153
---
 doc/configuration.md                    | 15 +++++++++++++++
 modules/monitoring/doc/configuration.md | 16 ++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 doc/configuration.md
 create mode 100644 modules/monitoring/doc/configuration.md

diff --git a/doc/configuration.md b/doc/configuration.md
new file mode 100644
index 000000000..90946be83
--- /dev/null
+++ b/doc/configuration.md
@@ -0,0 +1,15 @@
+# <a id="configuration"></a> Configuration
+
+## Overview
+
+Apart from its web configuration capabilities, the local configuration is
+stored in `/etc/icingaweb2` by default (depending on your config setup).
+
+  Location                      | File	                | Description
+  ------------------------------|-----------------------|---------------------------
+  .     			| config.ini	        | General configuration (logging, preferences)
+  .				| resources.ini         | Global resources (Icinga Web 2 database for preferences and authentication, icinga ido database)
+  .		    		| roles.ini	        | User specific roles (e.g. `administrators`) and permissions
+  .		    		| [authentication.ini](authentication.md)    | Authentication backends (e.g. database)
+  enabledModules    		| Symlink	        | Contains symlinks to enabled modules from `/usr/share/icingaweb2/modules/*`. Defaults to [monitoring](modules/monitoring/doc/configuration.md) and `doc`.
+  modules	    		| Directory	        | Module specific configuration
diff --git a/modules/monitoring/doc/configuration.md b/modules/monitoring/doc/configuration.md
new file mode 100644
index 000000000..7636b1a52
--- /dev/null
+++ b/modules/monitoring/doc/configuration.md
@@ -0,0 +1,16 @@
+# <a id="monitoring-configuration"></a> Monitoring Module Configuration
+
+## Overview
+
+Apart from its web configuration capabilities, the local configuration is
+stored in `/etc/icingaweb2` by default (depending on your config setup).
+
+  Location                      | File	                | Description
+  ------------------------------|-----------------------|---------------------------
+  modules/monitoring		| Directory		| `monitoring` module specific configuration
+  modules/monitoring		| config.ini		| Security settings (e.g. protected custom vars) for the `monitoring` module
+  modules/monitoring		| backends.ini		| Backend type and resources (e.g. Icinga IDO DB)
+  modules/monitoring		| [instances.ini](instances.md#instances) | Instances and their transport (e.g. local external command pipe)
+
+
+

From 46e2393074671e2ad2f8f7ec211b3893fbed35d3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Jun 2015 08:58:21 +0200
Subject: [PATCH 1925/2920] UsergroupbackendController: Do only assert that the
 user has one permission

The configuration of a backend itself should not be that granular.

refs #8826
---
 .../controllers/UsergroupbackendController.php  | 13 ++++++++-----
 application/forms/Security/RoleForm.php         |  5 +----
 .../views/scripts/usergroupbackend/list.phtml   | 17 -----------------
 library/Icinga/Web/Menu.php                     |  2 +-
 4 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/application/controllers/UsergroupbackendController.php b/application/controllers/UsergroupbackendController.php
index 91560bf55..e03880637 100644
--- a/application/controllers/UsergroupbackendController.php
+++ b/application/controllers/UsergroupbackendController.php
@@ -15,6 +15,14 @@ use Icinga\Web\Url;
  */
 class UsergroupbackendController extends Controller
 {
+    /**
+     * Initialize this controller
+     */
+    public function init()
+    {
+        $this->assertPermission('config/application/usergroupbackend');
+    }
+
     /**
      * Redirect to this controller's list action
      */
@@ -28,7 +36,6 @@ class UsergroupbackendController extends Controller
      */
     public function listAction()
     {
-        $this->assertPermission('config/application/usergroupbackend/*');
         $this->view->backendNames = Config::app('groups')->keys();
         $this->getTabs()->add(
             'usergroupbackend/list',
@@ -45,8 +52,6 @@ class UsergroupbackendController extends Controller
      */
     public function createAction()
     {
-        $this->assertPermission('config/application/usergroupbackend/create');
-
         $form = new UserGroupBackendForm();
         $form->setRedirectUrl('usergroupbackend/list');
         $form->setTitle($this->translate('Create New User Group Backend'));
@@ -78,7 +83,6 @@ class UsergroupbackendController extends Controller
      */
     public function editAction()
     {
-        $this->assertPermission('config/application/usergroupbackend/edit');
         $backendName = $this->params->getRequired('backend');
 
         $form = new UserGroupBackendForm();
@@ -118,7 +122,6 @@ class UsergroupbackendController extends Controller
      */
     public function removeAction()
     {
-        $this->assertPermission('config/application/usergroupbackend/remove');
         $backendName = $this->params->getRequired('backend');
 
         $backendForm = new UserGroupBackendForm();
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 43ae6c1a0..93f5db014 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -27,6 +27,7 @@ class RoleForm extends ConfigForm
         'config/application/general'                    => 'config/application/general',
         'config/application/authentication'             => 'config/application/authentication',
         'config/application/resources'                  => 'config/application/resources',
+        'config/application/usergroupbackend'           => 'config/application/usergroupbackend',
         'config/application/roles'                      => 'config/application/roles',
         'config/application/users/*'                    => 'config/application/users/*',
         'config/application/users/show'                 => 'config/application/users/show',
@@ -40,10 +41,6 @@ class RoleForm extends ConfigForm
         'config/application/groups/remove'              => 'config/application/groups/remove',
         'config/application/groups/member/add'          => 'config/application/groups/member/add',
         'config/application/groups/member/remove'       => 'config/application/groups/member/remove',
-        'config/application/usergroupbackend/*'         => 'config/application/usergroupbackend/*',
-        'config/application/usergroupbackend/create'    => 'config/application/usergroupbackend/create',
-        'config/application/usergroupbackend/edit'      => 'config/application/usergroupbackend/edit',
-        'config/application/usergroupbackend/remove'    => 'config/application/usergroupbackend/remove',
         'config/modules'                                => 'config/modules'
     );
 
diff --git a/application/views/scripts/usergroupbackend/list.phtml b/application/views/scripts/usergroupbackend/list.phtml
index d98d207f1..58aa2deba 100644
--- a/application/views/scripts/usergroupbackend/list.phtml
+++ b/application/views/scripts/usergroupbackend/list.phtml
@@ -1,15 +1,7 @@
-<?php
-
-$createPermitted = $this->hasPermission('config/application/usergroupbackend/create');
-$editPermitted = $this->hasPermission('config/application/usergroupbackend/edit');
-$removePermitted = $this->hasPermission('config/application/usergroupbackend/remove');
-
-?>
 <div class="controls">
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">
-<?php if ($createPermitted): ?>
 <?= $this->qlink(
   $this->translate('Create A New User Group Backend'),
   'usergroupbackend/create',
@@ -18,33 +10,25 @@ $removePermitted = $this->hasPermission('config/application/usergroupbackend/rem
     'icon' => 'plus'
   )
 ); ?>
-<?php endif ?>
 <?php if (count($backendNames) > 0): ?>
 <table class="action usergroupbackend-list">
   <thead>
     <tr>
       <th class="backend-name"><?= $this->translate('Backend'); ?></th>
-     <?php if ($removePermitted): ?>
       <th class="backend-remove"><?= $this->translate('Remove'); ?></th>
-     <?php endif ?>
     <tr>
   </thead>
   <tbody>
 <?php foreach ($backendNames as $backendName): ?>
     <tr>
       <td class="backend-name">
-       <?php if ($editPermitted): ?>
         <?= $this->qlink(
           $backendName,
           'usergroupbackend/edit',
           array('backend' => $backendName),
           array('title' => sprintf($this->translate('Edit user group backend %s'), $backendName))
         ); ?>
-       <?php else: ?>
-        <?= $this->escape($backendName); ?>
-       <?php endif ?>
       </td>
-     <?php if ($removePermitted): ?>
       <td class="backend-remove"><?= $this->qlink(
         null,
         'usergroupbackend/remove',
@@ -54,7 +38,6 @@ $removePermitted = $this->hasPermission('config/application/usergroupbackend/rem
           'icon'  => 'trash'
         )
       ); ?></td>
-     <?php endif ?>
     </tr>
 <?php endforeach ?>
   </tbody>
diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 4dff8e735..ef27204c8 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -261,7 +261,7 @@ class Menu implements RecursiveIterator
             ));
             $section->add(t('UserGroupBackends'), array(
                 'url'           => 'usergroupbackend/list',
-                'permission'    => 'config/application/usergroupbackend/*',
+                'permission'    => 'config/application/usergroupbackend',
                 'priority'      => 830
             ));
             $section->add(t('Modules'), array(

From a558f2873ab1304d593d38a73927fd0ab7c9ea6f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Jun 2015 09:02:57 +0200
Subject: [PATCH 1926/2920] Rename permission config/application/users* to
 config/authentication/...

refs #8826
---
 application/controllers/UserController.php             | 10 +++++-----
 application/forms/Security/RoleForm.php                | 10 +++++-----
 application/views/scripts/user/list.phtml              |  4 ++--
 application/views/scripts/user/show.phtml              |  2 +-
 .../Icinga/Web/Controller/AuthBackendController.php    |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 05adf03d7..a8db8d541 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -30,7 +30,7 @@ class UserController extends AuthBackendController
      */
     public function listAction()
     {
-        $this->assertPermission('config/application/users/show');
+        $this->assertPermission('config/authentication/users/show');
         $backendNames = array_map(
             function ($b) { return $b->getName(); },
             $this->loadUserBackends('Icinga\Data\Selectable')
@@ -88,7 +88,7 @@ class UserController extends AuthBackendController
      */
     public function showAction()
     {
-        $this->assertPermission('config/application/users/show');
+        $this->assertPermission('config/authentication/users/show');
         $userName = $this->params->getRequired('user');
         $backend = $this->getUserBackend($this->params->getRequired('backend'));
 
@@ -166,7 +166,7 @@ class UserController extends AuthBackendController
      */
     public function addAction()
     {
-        $this->assertPermission('config/application/users/add');
+        $this->assertPermission('config/authentication/users/add');
         $backend = $this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Extensible');
         $form = new UserForm();
         $form->setRedirectUrl(Url::fromPath('user/list', array('backend' => $backend->getName())));
@@ -182,7 +182,7 @@ class UserController extends AuthBackendController
      */
     public function editAction()
     {
-        $this->assertPermission('config/application/users/edit');
+        $this->assertPermission('config/authentication/users/edit');
         $userName = $this->params->getRequired('user');
         $backend = $this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Updatable');
 
@@ -205,7 +205,7 @@ class UserController extends AuthBackendController
      */
     public function removeAction()
     {
-        $this->assertPermission('config/application/users/remove');
+        $this->assertPermission('config/authentication/users/remove');
         $userName = $this->params->getRequired('user');
         $backend = $this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Reducible');
 
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 93f5db014..d321ac8fd 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -29,11 +29,11 @@ class RoleForm extends ConfigForm
         'config/application/resources'                  => 'config/application/resources',
         'config/application/usergroupbackend'           => 'config/application/usergroupbackend',
         'config/application/roles'                      => 'config/application/roles',
-        'config/application/users/*'                    => 'config/application/users/*',
-        'config/application/users/show'                 => 'config/application/users/show',
-        'config/application/users/add'                  => 'config/application/users/add',
-        'config/application/users/edit'                 => 'config/application/users/edit',
-        'config/application/users/remove'               => 'config/application/users/remove',
+        'config/authentication/users/*'                 => 'config/authentication/users/*',
+        'config/authentication/users/show'              => 'config/authentication/users/show',
+        'config/authentication/users/add'               => 'config/authentication/users/add',
+        'config/authentication/users/edit'              => 'config/authentication/users/edit',
+        'config/authentication/users/remove'            => 'config/authentication/users/remove',
         'config/application/groups/*'                   => 'config/application/groups/*',
         'config/application/groups/show'                => 'config/application/groups/show',
         'config/application/groups/add'                 => 'config/application/groups/add',
diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index 51c0eb7b7..76a6f2b8b 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -22,8 +22,8 @@ if ($backend === null) {
     echo $this->translate('No backend found which is able to list users') . '</div>';
     return;
 } else {
-    $extensible = $this->hasPermission('config/application/users/add') && $backend instanceof Extensible;
-    $reducible = $this->hasPermission('config/application/users/remove') && $backend instanceof Reducible;
+    $extensible = $this->hasPermission('config/authentication/users/add') && $backend instanceof Extensible;
+    $reducible = $this->hasPermission('config/authentication/users/remove') && $backend instanceof Reducible;
 }
 
 if (count($users) > 0): ?>
diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index aadc00614..bccfaa21e 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -5,7 +5,7 @@ use Icinga\Data\Reducible;
 use Icinga\Data\Selectable;
 
 $editLink = null;
-if ($this->hasPermission('config/application/users/edit') && $backend instanceof Updatable) {
+if ($this->hasPermission('config/authentication/users/edit') && $backend instanceof Updatable) {
     $editLink = $this->qlink(
         null,
         'user/edit',
diff --git a/library/Icinga/Web/Controller/AuthBackendController.php b/library/Icinga/Web/Controller/AuthBackendController.php
index a3d93e0f8..a423b8023 100644
--- a/library/Icinga/Web/Controller/AuthBackendController.php
+++ b/library/Icinga/Web/Controller/AuthBackendController.php
@@ -139,7 +139,7 @@ class AuthBackendController extends Controller
     {
         $tabs = $this->getTabs();
 
-        if ($this->hasPermission('config/application/users/show')) {
+        if ($this->hasPermission('config/authentication/users/show')) {
             $tabs->add(
                 'user/list',
                 array(

From 3fffd90135b382f69f312eab8c2d176a75670cfc Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Jun 2015 09:04:34 +0200
Subject: [PATCH 1927/2920] Rename permission config/application/groups* to
 config/authentication/...

refs #8826
---
 application/controllers/GroupController.php            | 10 +++++-----
 application/forms/Security/RoleForm.php                | 10 +++++-----
 application/views/scripts/group/list.phtml             |  4 ++--
 application/views/scripts/group/show.phtml             |  4 ++--
 application/views/scripts/user/show.phtml              |  2 +-
 .../Icinga/Web/Controller/AuthBackendController.php    |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 0c2a4a45d..ef95dc3fc 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -30,7 +30,7 @@ class GroupController extends AuthBackendController
      */
     public function listAction()
     {
-        $this->assertPermission('config/application/groups/show');
+        $this->assertPermission('config/authentication/groups/show');
         $backendNames = array_map(
             function ($b) { return $b->getName(); },
             $this->loadUserGroupBackends('Icinga\Data\Selectable')
@@ -87,7 +87,7 @@ class GroupController extends AuthBackendController
      */
     public function showAction()
     {
-        $this->assertPermission('config/application/groups/show');
+        $this->assertPermission('config/authentication/groups/show');
         $groupName = $this->params->getRequired('group');
         $backend = $this->getUserGroupBackend($this->params->getRequired('backend'));
 
@@ -164,7 +164,7 @@ class GroupController extends AuthBackendController
      */
     public function addAction()
     {
-        $this->assertPermission('config/application/groups/add');
+        $this->assertPermission('config/authentication/groups/add');
         $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Extensible');
         $form = new UserGroupForm();
         $form->setRedirectUrl(Url::fromPath('group/list', array('backend' => $backend->getName())));
@@ -180,7 +180,7 @@ class GroupController extends AuthBackendController
      */
     public function editAction()
     {
-        $this->assertPermission('config/application/groups/edit');
+        $this->assertPermission('config/authentication/groups/edit');
         $groupName = $this->params->getRequired('group');
         $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Updatable');
 
@@ -205,7 +205,7 @@ class GroupController extends AuthBackendController
      */
     public function removeAction()
     {
-        $this->assertPermission('config/application/groups/remove');
+        $this->assertPermission('config/authentication/groups/remove');
         $groupName = $this->params->getRequired('group');
         $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Reducible');
 
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index d321ac8fd..b3b7aa9cd 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -34,11 +34,11 @@ class RoleForm extends ConfigForm
         'config/authentication/users/add'               => 'config/authentication/users/add',
         'config/authentication/users/edit'              => 'config/authentication/users/edit',
         'config/authentication/users/remove'            => 'config/authentication/users/remove',
-        'config/application/groups/*'                   => 'config/application/groups/*',
-        'config/application/groups/show'                => 'config/application/groups/show',
-        'config/application/groups/add'                 => 'config/application/groups/add',
-        'config/application/groups/edit'                => 'config/application/groups/edit',
-        'config/application/groups/remove'              => 'config/application/groups/remove',
+        'config/authentication/groups/*'                => 'config/authentication/groups/*',
+        'config/authentication/groups/show'             => 'config/authentication/groups/show',
+        'config/authentication/groups/add'              => 'config/authentication/groups/add',
+        'config/authentication/groups/edit'             => 'config/authentication/groups/edit',
+        'config/authentication/groups/remove'           => 'config/authentication/groups/remove',
         'config/application/groups/member/add'          => 'config/application/groups/member/add',
         'config/application/groups/member/remove'       => 'config/application/groups/member/remove',
         'config/modules'                                => 'config/modules'
diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
index 49d8dc4c9..bcd9dca93 100644
--- a/application/views/scripts/group/list.phtml
+++ b/application/views/scripts/group/list.phtml
@@ -22,8 +22,8 @@ if ($backend === null) {
     echo $this->translate('No backend found which is able to list groups') . '</div>';
     return;
 } else {
-    $extensible = $this->hasPermission('config/application/groups/add') && $backend instanceof Extensible;
-    $reducible = $this->hasPermission('config/application/groups/remove') && $backend instanceof Reducible;
+    $extensible = $this->hasPermission('config/authentication/groups/add') && $backend instanceof Extensible;
+    $reducible = $this->hasPermission('config/authentication/groups/remove') && $backend instanceof Reducible;
 }
 
 if (count($groups) > 0): ?>
diff --git a/application/views/scripts/group/show.phtml b/application/views/scripts/group/show.phtml
index 1fd3e48c6..636a449d4 100644
--- a/application/views/scripts/group/show.phtml
+++ b/application/views/scripts/group/show.phtml
@@ -3,10 +3,10 @@
 use Icinga\Data\Extensible;
 use Icinga\Data\Updatable;
 
-$extensible = $this->hasPermission('config/application/groups/add') && $backend instanceof Extensible;
+$extensible = $this->hasPermission('config/authentication/groups/add') && $backend instanceof Extensible;
 
 $editLink = null;
-if ($this->hasPermission('config/application/groups/edit') && $backend instanceof Updatable) {
+if ($this->hasPermission('config/authentication/groups/edit') && $backend instanceof Updatable) {
     $editLink = $this->qlink(
         null,
         'group/edit',
diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index bccfaa21e..82f4c53f9 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -54,7 +54,7 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
     <?php foreach ($memberships as $membership): ?>
       <tr>
         <td class="membership-group">
-         <?php if ($this->hasPermission('config/application/groups/show') && $membership->backend instanceof Selectable): ?>
+         <?php if ($this->hasPermission('config/authentication/groups/show') && $membership->backend instanceof Selectable): ?>
           <?= $this->qlink($membership->group_name, 'group/show', array(
             'backend' => $membership->backend->getName(),
             'group'   => $membership->group_name
diff --git a/library/Icinga/Web/Controller/AuthBackendController.php b/library/Icinga/Web/Controller/AuthBackendController.php
index a423b8023..ad9921303 100644
--- a/library/Icinga/Web/Controller/AuthBackendController.php
+++ b/library/Icinga/Web/Controller/AuthBackendController.php
@@ -151,7 +151,7 @@ class AuthBackendController extends Controller
             );
         }
 
-        if ($this->hasPermission('config/application/groups/show')) {
+        if ($this->hasPermission('config/authentication/groups/show')) {
             $tabs->add(
                 'group/list',
                 array(

From cf96e66ff2a1589b1504280d4a5e23cdfcb1d19e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Jun 2015 09:07:06 +0200
Subject: [PATCH 1928/2920] Rename permission config/application/roles* to
 config/authentication/...

Does also split it into *, show, add, edit, remove as this should behave like
any other authentication configuration.

refs #8826
---
 application/controllers/RolesController.php             | 8 ++++----
 application/forms/Security/RoleForm.php                 | 6 +++++-
 library/Icinga/Web/Controller/AuthBackendController.php | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/application/controllers/RolesController.php b/application/controllers/RolesController.php
index b889083c6..57c972f32 100644
--- a/application/controllers/RolesController.php
+++ b/application/controllers/RolesController.php
@@ -17,7 +17,7 @@ class RolesController extends AuthBackendController
      */
     public function indexAction()
     {
-        $this->assertPermission('config/application/roles');
+        $this->assertPermission('config/authentication/roles/show');
         $this->createListTabs()->activate('roles');
         $this->view->roles = Config::app('roles', true);
     }
@@ -27,7 +27,7 @@ class RolesController extends AuthBackendController
      */
     public function newAction()
     {
-        $this->assertPermission('config/application/roles');
+        $this->assertPermission('config/authentication/roles/add');
         $role = new RoleForm(array(
             'onSuccess' => function (RoleForm $role) {
                 $name = $role->getElement('name')->getValue();
@@ -61,7 +61,7 @@ class RolesController extends AuthBackendController
      */
     public function updateAction()
     {
-        $this->assertPermission('config/application/roles');
+        $this->assertPermission('config/authentication/roles/edit');
         $name = $this->_request->getParam('role');
         if (empty($name)) {
             throw new Zend_Controller_Action_Exception(
@@ -111,7 +111,7 @@ class RolesController extends AuthBackendController
      */
     public function removeAction()
     {
-        $this->assertPermission('config/application/roles');
+        $this->assertPermission('config/authentication/roles/remove');
         $name = $this->_request->getParam('role');
         if (empty($name)) {
             throw new Zend_Controller_Action_Exception(
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index b3b7aa9cd..7175b0931 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -28,7 +28,6 @@ class RoleForm extends ConfigForm
         'config/application/authentication'             => 'config/application/authentication',
         'config/application/resources'                  => 'config/application/resources',
         'config/application/usergroupbackend'           => 'config/application/usergroupbackend',
-        'config/application/roles'                      => 'config/application/roles',
         'config/authentication/users/*'                 => 'config/authentication/users/*',
         'config/authentication/users/show'              => 'config/authentication/users/show',
         'config/authentication/users/add'               => 'config/authentication/users/add',
@@ -41,6 +40,11 @@ class RoleForm extends ConfigForm
         'config/authentication/groups/remove'           => 'config/authentication/groups/remove',
         'config/application/groups/member/add'          => 'config/application/groups/member/add',
         'config/application/groups/member/remove'       => 'config/application/groups/member/remove',
+        'config/authentication/roles/*'                 => 'config/authentication/roles/*',
+        'config/authentication/roles/show'              => 'config/authentication/roles/show',
+        'config/authentication/roles/add'               => 'config/authentication/roles/add',
+        'config/authentication/roles/edit'              => 'config/authentication/roles/edit',
+        'config/authentication/roles/remove'            => 'config/authentication/roles/remove',
         'config/modules'                                => 'config/modules'
     );
 
diff --git a/library/Icinga/Web/Controller/AuthBackendController.php b/library/Icinga/Web/Controller/AuthBackendController.php
index ad9921303..aafa2d703 100644
--- a/library/Icinga/Web/Controller/AuthBackendController.php
+++ b/library/Icinga/Web/Controller/AuthBackendController.php
@@ -163,7 +163,7 @@ class AuthBackendController extends Controller
             );
         }
 
-        if ($this->hasPermission('config/application/roles')) {
+        if ($this->hasPermission('config/authentication/roles/show')) {
             $tabs->add(
                 'roles',
                 array(

From 9bd5d4148ee1293a7987f36627b65f26304ebc51 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Jun 2015 09:08:16 +0200
Subject: [PATCH 1929/2920] Drop permission config/application/groups/member

refs #8826
---
 application/controllers/GroupController.php | 6 +++---
 application/controllers/UserController.php  | 6 +++---
 application/forms/Security/RoleForm.php     | 2 --
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index ef95dc3fc..fe8dd58f8 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -129,7 +129,7 @@ class GroupController extends AuthBackendController
         $this->view->members = $members;
         $this->createShowTabs($backend->getName(), $groupName)->activate('group/show');
 
-        if ($this->hasPermission('config/application/groups/member/remove') && $backend instanceof Reducible) {
+        if ($this->hasPermission('config/authentication/groups/edit') && $backend instanceof Reducible) {
             $removeForm = new Form();
             $removeForm->setUidDisabled();
             $removeForm->setAction(
@@ -228,7 +228,7 @@ class GroupController extends AuthBackendController
      */
     public function addmemberAction()
     {
-        $this->assertPermission('config/application/groups/member/add');
+        $this->assertPermission('config/authentication/groups/edit');
         $groupName = $this->params->getRequired('group');
         $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Extensible');
 
@@ -256,7 +256,7 @@ class GroupController extends AuthBackendController
      */
     public function removememberAction()
     {
-        $this->assertPermission('config/application/groups/member/remove');
+        $this->assertPermission('config/authentication/groups/edit');
         $this->assertHttpMethod('POST');
         $groupName = $this->params->getRequired('group');
         $backend = $this->getUserGroupBackend($this->params->getRequired('backend'), 'Icinga\Data\Reducible');
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index a8db8d541..30e0bc100 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -121,7 +121,7 @@ class UserController extends AuthBackendController
             $memberships
         );
 
-        if ($this->hasPermission('config/application/groups/member/add')) {
+        if ($this->hasPermission('config/authentication/groups/edit')) {
             $extensibleBackends = $this->loadUserGroupBackends('Icinga\Data\Extensible');
             $this->view->showCreateMembershipLink = ! empty($extensibleBackends);
         } else {
@@ -133,7 +133,7 @@ class UserController extends AuthBackendController
         $this->view->memberships = $memberships;
         $this->createShowTabs($backend->getName(), $userName)->activate('user/show');
 
-        if ($this->hasPermission('config/application/groups/member/remove')) {
+        if ($this->hasPermission('config/authentication/groups/edit')) {
             $removeForm = new Form();
             $removeForm->setUidDisabled();
             $removeForm->addElement('hidden', 'user_name', array(
@@ -228,7 +228,7 @@ class UserController extends AuthBackendController
      */
     public function createmembershipAction()
     {
-        $this->assertPermission('config/application/groups/member/add');
+        $this->assertPermission('config/authentication/groups/edit');
         $userName = $this->params->getRequired('user');
         $backend = $this->getUserBackend($this->params->getRequired('backend'));
 
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 7175b0931..afedf772f 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -38,8 +38,6 @@ class RoleForm extends ConfigForm
         'config/authentication/groups/add'              => 'config/authentication/groups/add',
         'config/authentication/groups/edit'             => 'config/authentication/groups/edit',
         'config/authentication/groups/remove'           => 'config/authentication/groups/remove',
-        'config/application/groups/member/add'          => 'config/application/groups/member/add',
-        'config/application/groups/member/remove'       => 'config/application/groups/member/remove',
         'config/authentication/roles/*'                 => 'config/authentication/roles/*',
         'config/authentication/roles/show'              => 'config/authentication/roles/show',
         'config/authentication/roles/add'               => 'config/authentication/roles/add',

From 8875ce7d950956e953a8d6247ec8cfd922fb13cd Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Jun 2015 09:09:11 +0200
Subject: [PATCH 1930/2920] Provide permission config/authentication/*

---
 application/forms/Security/RoleForm.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index afedf772f..03f5e06ca 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -28,6 +28,7 @@ class RoleForm extends ConfigForm
         'config/application/authentication'             => 'config/application/authentication',
         'config/application/resources'                  => 'config/application/resources',
         'config/application/usergroupbackend'           => 'config/application/usergroupbackend',
+        'config/authentication/*'                       => 'config/authentication/*',
         'config/authentication/users/*'                 => 'config/authentication/users/*',
         'config/authentication/users/show'              => 'config/authentication/users/show',
         'config/authentication/users/add'               => 'config/authentication/users/add',

From 2490d0ae67b53a93d737cead1a2bb59d5477c6bb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Jun 2015 09:58:57 +0200
Subject: [PATCH 1931/2920] ConfigController: We're configuring user backends
 from now on

refs #8826
---
 application/controllers/ConfigController.php  | 81 ++++++++++---------
 .../DbBackendForm.php                         | 10 +--
 .../ExternalBackendForm.php                   |  6 +-
 .../LdapBackendForm.php                       | 10 +--
 ...nfigForm.php => UserBackendConfigForm.php} | 52 ++++++------
 ...derForm.php => UserBackendReorderForm.php} |  8 +-
 application/forms/Security/RoleForm.php       |  2 +-
 .../create.phtml                              |  0
 .../modify.phtml                              |  0
 .../remove.phtml                              |  0
 .../reorder.phtml                             |  4 +-
 .../scripts/form/reorder-authbackend.phtml    | 16 ++--
 .../application/forms/AuthBackendPage.php     |  8 +-
 .../DbBackendFormTest.php                     | 16 ++--
 .../LdapBackendFormTest.php                   | 16 ++--
 ...est.php => UserBackendReorderFormTest.php} | 16 ++--
 16 files changed, 124 insertions(+), 121 deletions(-)
 rename application/forms/Config/{Authentication => UserBackend}/DbBackendForm.php (90%)
 rename application/forms/Config/{Authentication => UserBackend}/ExternalBackendForm.php (93%)
 rename application/forms/Config/{Authentication => UserBackend}/LdapBackendForm.php (94%)
 rename application/forms/Config/{AuthenticationBackendConfigForm.php => UserBackendConfigForm.php} (87%)
 rename application/forms/Config/{AuthenticationBackendReorderForm.php => UserBackendReorderForm.php} (87%)
 rename application/views/scripts/config/{authentication => userbackend}/create.phtml (100%)
 rename application/views/scripts/config/{authentication => userbackend}/modify.phtml (100%)
 rename application/views/scripts/config/{authentication => userbackend}/remove.phtml (100%)
 rename application/views/scripts/config/{authentication => userbackend}/reorder.phtml (71%)
 rename test/php/application/forms/Config/{Authentication => UserBackend}/DbBackendFormTest.php (79%)
 rename test/php/application/forms/Config/{Authentication => UserBackend}/LdapBackendFormTest.php (79%)
 rename test/php/application/forms/Config/{AuthenticationBackendReorderFormTest.php => UserBackendReorderFormTest.php} (64%)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index ab4b62049..6b7dbc705 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -5,14 +5,15 @@ use Icinga\Application\Config;
 use Icinga\Application\Icinga;
 use Icinga\Application\Modules\Module;
 use Icinga\Data\ResourceFactory;
-use Icinga\Forms\Config\AuthenticationBackendConfigForm;
-use Icinga\Forms\Config\AuthenticationBackendReorderForm;
+use Icinga\Forms\Config\UserBackendConfigForm;
+use Icinga\Forms\Config\UserBackendReorderForm;
 use Icinga\Forms\Config\GeneralConfigForm;
 use Icinga\Forms\Config\ResourceConfigForm;
 use Icinga\Forms\ConfirmRemovalForm;
 use Icinga\Security\SecurityException;
 use Icinga\Web\Controller;
 use Icinga\Web\Notification;
+use Icinga\Web\Url;
 use Icinga\Web\Widget;
 
 /**
@@ -45,13 +46,13 @@ class ConfigController extends Controller
             ));
             $allowedActions[] = 'general';
         }
-        if ($auth->hasPermission('config/application/authentication')) {
-            $tabs->add('authentication', array(
+        if ($auth->hasPermission('config/application/userbackend')) {
+            $tabs->add('userbackend', array(
                 'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'),
                 'label' => $this->translate('Authentication'),
-                'url'   => 'config/authentication'
+                'url'   => 'config/userbackend'
             ));
-            $allowedActions[] = 'authentication';
+            $allowedActions[] = 'userbackend';
         }
         if ($auth->hasPermission('config/application/resources')) {
             $tabs->add('resource', array(
@@ -191,71 +192,72 @@ class ConfigController extends Controller
     }
 
     /**
-     * Action for listing and reordering authentication backends
+     * Action for listing and reordering user backends
      */
-    public function authenticationAction()
+    public function userbackendAction()
     {
-        $this->assertPermission('config/application/authentication');
-        $form = new AuthenticationBackendReorderForm();
+        $this->assertPermission('config/application/userbackend');
+        $form = new UserBackendReorderForm();
         $form->setIniConfig(Config::app('authentication'));
         $form->handleRequest();
 
         $this->view->form = $form;
-        $this->view->tabs->activate('authentication');
-        $this->render('authentication/reorder');
+        $this->view->tabs->activate('userbackend');
+        $this->render('userbackend/reorder');
     }
 
     /**
-     * Action for creating a new authentication backend
+     * Action for creating a new user backend
      */
-    public function createauthenticationbackendAction()
+    public function createuserbackendAction()
     {
-        $this->assertPermission('config/application/authentication');
-        $form = new AuthenticationBackendConfigForm();
-        $form->setTitle($this->translate('Create New Authentication Backend'));
+        $this->assertPermission('config/application/userbackend');
+        $form = new UserBackendConfigForm();
+        $form->setTitle($this->translate('Create New User Backend'));
         $form->addDescription($this->translate(
             'Create a new backend for authenticating your users. This backend'
             . ' will be added at the end of your authentication order.'
         ));
         $form->setIniConfig(Config::app('authentication'));
         $form->setResourceConfig(ResourceFactory::getResourceConfigs());
-        $form->setRedirectUrl('config/authentication');
+        $form->setRedirectUrl('config/userbackend');
         $form->handleRequest();
 
         $this->view->form = $form;
-        $this->view->tabs->activate('authentication');
-        $this->render('authentication/create');
+        $this->view->tabs->activate('userbackend');
+        $this->render('userbackend/create');
     }
 
     /**
-     * Action for editing authentication backends
+     * Action for editing user backends
      */
-    public function editauthenticationbackendAction()
+    public function edituserbackendAction()
     {
-        $this->assertPermission('config/application/authentication');
-        $form = new AuthenticationBackendConfigForm();
-        $form->setTitle($this->translate('Edit Backend'));
+        $this->assertPermission('config/application/userbackend');
+        $form = new UserBackendConfigForm();
+        $form->setTitle($this->translate('Edit User Backend'));
         $form->setIniConfig(Config::app('authentication'));
         $form->setResourceConfig(ResourceFactory::getResourceConfigs());
-        $form->setRedirectUrl('config/authentication');
+        $form->setRedirectUrl('config/userbackend');
+        $form->setAction(Url::fromRequest());
         $form->handleRequest();
 
         $this->view->form = $form;
-        $this->view->tabs->activate('authentication');
-        $this->render('authentication/modify');
+        $this->view->tabs->activate('userbackend');
+        $this->render('userbackend/modify');
     }
 
     /**
-     * Action for removing a backend from the authentication list
+     * Action for removing a user backend
      */
-    public function removeauthenticationbackendAction()
+    public function removeuserbackendAction()
     {
-        $this->assertPermission('config/application/authentication');
+        $this->assertPermission('config/application/userbackend');
         $form = new ConfirmRemovalForm(array(
             'onSuccess' => function ($form) {
-                $configForm = new AuthenticationBackendConfigForm();
+                $configForm = new UserBackendConfigForm();
                 $configForm->setIniConfig(Config::app('authentication'));
-                $authBackend = $form->getRequest()->getQuery('auth_backend');
+                $authBackend = $form->getRequest()->getQuery('backend');
 
                 try {
                     $configForm->remove($authBackend);
@@ -266,7 +268,7 @@ class ConfigController extends Controller
 
                 if ($configForm->save()) {
                     Notification::success(sprintf(
-                        t('Authentication backend "%s" has been successfully removed'),
+                        t('User backend "%s" has been successfully removed'),
                         $authBackend
                     ));
                 } else {
@@ -274,13 +276,14 @@ class ConfigController extends Controller
                 }
             }
         ));
-        $form->setTitle($this->translate('Remove Backend'));
-        $form->setRedirectUrl('config/authentication');
+        $form->setTitle($this->translate('Remove User Backend'));
+        $form->setRedirectUrl('config/userbackend');
+        $form->setAction(Url::fromRequest());
         $form->handleRequest();
 
         $this->view->form = $form;
-        $this->view->tabs->activate('authentication');
-        $this->render('authentication/remove');
+        $this->view->tabs->activate('userbackend');
+        $this->render('userbackend/remove');
     }
 
     /**
@@ -363,7 +366,7 @@ class ConfigController extends Controller
             if ($config->get('resource') === $resource) {
                 $form->addDescription(sprintf(
                     $this->translate(
-                        'The resource "%s" is currently in use by the authentication backend "%s". ' .
+                        'The resource "%s" is currently utilized for authentication by user backend "%s". ' .
                         'Removing the resource can result in noone being able to log in any longer.'
                     ),
                     $resource,
diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/UserBackend/DbBackendForm.php
similarity index 90%
rename from application/forms/Config/Authentication/DbBackendForm.php
rename to application/forms/Config/UserBackend/DbBackendForm.php
index babd4383b..f096f3e35 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/UserBackend/DbBackendForm.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Forms\Config\Authentication;
+namespace Icinga\Forms\Config\UserBackend;
 
 use Exception;
 use Icinga\Web\Form;
@@ -10,7 +10,7 @@ use Icinga\Data\ResourceFactory;
 use Icinga\Authentication\User\DbUserBackend;
 
 /**
- * Form class for adding/modifying database authentication backends
+ * Form class for adding/modifying database user backends
  */
 class DbBackendForm extends Form
 {
@@ -85,13 +85,13 @@ class DbBackendForm extends Form
     }
 
     /**
-     * Validate that the selected resource is a valid database authentication backend
+     * Validate that the selected resource is a valid database user backend
      *
      * @see Form::onSuccess()
      */
     public function onSuccess()
     {
-        if (false === static::isValidAuthenticationBackend($this)) {
+        if (false === static::isValidUserBackend($this)) {
             return false;
         }
     }
@@ -103,7 +103,7 @@ class DbBackendForm extends Form
      *
      * @return  bool            Whether validation succeeded or not
      */
-    public static function isValidAuthenticationBackend(Form $form)
+    public static function isValidUserBackend(Form $form)
     {
         try {
             $dbUserBackend = new DbUserBackend(ResourceFactory::createResource($form->getResourceConfig()));
diff --git a/application/forms/Config/Authentication/ExternalBackendForm.php b/application/forms/Config/UserBackend/ExternalBackendForm.php
similarity index 93%
rename from application/forms/Config/Authentication/ExternalBackendForm.php
rename to application/forms/Config/UserBackend/ExternalBackendForm.php
index 86087eb66..4f3a4585f 100644
--- a/application/forms/Config/Authentication/ExternalBackendForm.php
+++ b/application/forms/Config/UserBackend/ExternalBackendForm.php
@@ -1,13 +1,13 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Forms\Config\Authentication;
+namespace Icinga\Forms\Config\UserBackend;
 
 use Zend_Validate_Callback;
 use Icinga\Web\Form;
 
 /**
- * Form class for adding/modifying authentication backends of type "external"
+ * Form class for adding/modifying user backends of type "external"
  */
 class ExternalBackendForm extends Form
 {
@@ -90,7 +90,7 @@ class ExternalBackendForm extends Form
      *
      * @return  bool            Whether validation succeeded or not
      */
-    public static function isValidAuthenticationBackend(Form $form)
+    public static function isValidUserBackend(Form $form)
     {
         return true;
     }
diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/UserBackend/LdapBackendForm.php
similarity index 94%
rename from application/forms/Config/Authentication/LdapBackendForm.php
rename to application/forms/Config/UserBackend/LdapBackendForm.php
index 0ec2c3e38..c520ec68f 100644
--- a/application/forms/Config/Authentication/LdapBackendForm.php
+++ b/application/forms/Config/UserBackend/LdapBackendForm.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Forms\Config\Authentication;
+namespace Icinga\Forms\Config\UserBackend;
 
 use Exception;
 use Icinga\Web\Form;
@@ -11,7 +11,7 @@ use Icinga\Exception\AuthenticationException;
 use Icinga\Authentication\User\LdapUserBackend;
 
 /**
- * Form class for adding/modifying LDAP authentication backends
+ * Form class for adding/modifying LDAP user backends
  */
 class LdapBackendForm extends Form
 {
@@ -149,13 +149,13 @@ class LdapBackendForm extends Form
     }
 
     /**
-     * Validate that the selected resource is a valid ldap authentication backend
+     * Validate that the selected resource is a valid ldap user backend
      *
      * @see Form::onSuccess()
      */
     public function onSuccess()
     {
-        if (false === static::isValidAuthenticationBackend($this)) {
+        if (false === static::isValidUserBackend($this)) {
             return false;
         }
     }
@@ -167,7 +167,7 @@ class LdapBackendForm extends Form
      *
      * @return  bool            Whether validation succeeded or not
      */
-    public static function isValidAuthenticationBackend(Form $form)
+    public static function isValidUserBackend(Form $form)
     {
         try {
             $ldapUserBackend = new LdapUserBackend(ResourceFactory::createResource($form->getResourceConfig()));
diff --git a/application/forms/Config/AuthenticationBackendConfigForm.php b/application/forms/Config/UserBackendConfigForm.php
similarity index 87%
rename from application/forms/Config/AuthenticationBackendConfigForm.php
rename to application/forms/Config/UserBackendConfigForm.php
index 86322902b..0a30dd590 100644
--- a/application/forms/Config/AuthenticationBackendConfigForm.php
+++ b/application/forms/Config/UserBackendConfigForm.php
@@ -11,11 +11,11 @@ use Icinga\Application\Platform;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;
-use Icinga\Forms\Config\Authentication\DbBackendForm;
-use Icinga\Forms\Config\Authentication\LdapBackendForm;
-use Icinga\Forms\Config\Authentication\ExternalBackendForm;
+use Icinga\Forms\Config\UserBackend\DbBackendForm;
+use Icinga\Forms\Config\UserBackend\LdapBackendForm;
+use Icinga\Forms\Config\UserBackend\ExternalBackendForm;
 
-class AuthenticationBackendConfigForm extends ConfigForm
+class UserBackendConfigForm extends ConfigForm
 {
     /**
      * The available resources split by type
@@ -76,7 +76,7 @@ class AuthenticationBackendConfigForm extends ConfigForm
     }
 
     /**
-     * Add a particular authentication backend
+     * Add a particular user backend
      *
      * The backend to add is identified by the array-key `name'.
      *
@@ -90,9 +90,9 @@ class AuthenticationBackendConfigForm extends ConfigForm
     {
         $name = isset($values['name']) ? $values['name'] : '';
         if (! $name) {
-            throw new InvalidArgumentException($this->translate('Authentication backend name missing'));
+            throw new InvalidArgumentException($this->translate('User backend name missing'));
         } elseif ($this->config->hasSection($name)) {
-            throw new InvalidArgumentException($this->translate('Authentication backend already exists'));
+            throw new InvalidArgumentException($this->translate('User backend already exists'));
         }
 
         unset($values['name']);
@@ -101,7 +101,7 @@ class AuthenticationBackendConfigForm extends ConfigForm
     }
 
     /**
-     * Edit a particular authentication backend
+     * Edit a particular user backend
      *
      * @param   string  $name               The name of the backend to edit
      * @param   array   $values             The values to edit the configuration with
@@ -113,11 +113,11 @@ class AuthenticationBackendConfigForm extends ConfigForm
     public function edit($name, array $values)
     {
         if (! $name) {
-            throw new InvalidArgumentException($this->translate('Old authentication backend name missing'));
+            throw new InvalidArgumentException($this->translate('Old user backend name missing'));
         } elseif (! ($newName = isset($values['name']) ? $values['name'] : '')) {
-            throw new InvalidArgumentException($this->translate('New authentication backend name missing'));
+            throw new InvalidArgumentException($this->translate('New user backend name missing'));
         } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException($this->translate('Unknown authentication backend provided'));
+            throw new InvalidArgumentException($this->translate('Unknown user backend provided'));
         }
 
         $backendConfig = $this->config->getSection($name);
@@ -132,7 +132,7 @@ class AuthenticationBackendConfigForm extends ConfigForm
     }
 
     /**
-     * Remove the given authentication backend
+     * Remove the given user backend
      *
      * @param   string      $name           The name of the backend to remove
      *
@@ -143,9 +143,9 @@ class AuthenticationBackendConfigForm extends ConfigForm
     public function remove($name)
     {
         if (! $name) {
-            throw new InvalidArgumentException($this->translate('Authentication backend name missing'));
+            throw new InvalidArgumentException($this->translate('user backend name missing'));
         } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException($this->translate('Unknown authentication backend provided'));
+            throw new InvalidArgumentException($this->translate('Unknown user backend provided'));
         }
 
         $backendConfig = $this->config->getSection($name);
@@ -154,7 +154,7 @@ class AuthenticationBackendConfigForm extends ConfigForm
     }
 
     /**
-     * Move the given authentication backend up or down in order
+     * Move the given user backend up or down in order
      *
      * @param   string      $name           The name of the backend to be moved
      * @param   int         $position       The new (absolute) position of the backend
@@ -166,9 +166,9 @@ class AuthenticationBackendConfigForm extends ConfigForm
     public function move($name, $position)
     {
         if (! $name) {
-            throw new InvalidArgumentException($this->translate('Authentication backend name missing'));
+            throw new InvalidArgumentException($this->translate('User backend name missing'));
         } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException($this->translate('Unknown authentication backend provided'));
+            throw new InvalidArgumentException($this->translate('Unknown user backend provided'));
         }
 
         $backendOrder = $this->config->keys();
@@ -186,7 +186,7 @@ class AuthenticationBackendConfigForm extends ConfigForm
     }
 
     /**
-     * Add or edit an authentication backend and save the configuration
+     * Add or edit an user backend and save the configuration
      *
      * Performs a connectivity validation using the submitted values. A checkbox is
      * added to the form to skip the check if it fails and redirection is aborted.
@@ -197,20 +197,20 @@ class AuthenticationBackendConfigForm extends ConfigForm
     {
         if (($el = $this->getElement('force_creation')) === null || false === $el->isChecked()) {
             $backendForm = $this->getBackendForm($this->getElement('type')->getValue());
-            if (false === $backendForm::isValidAuthenticationBackend($this)) {
+            if (false === $backendForm::isValidUserBackend($this)) {
                 $this->addElement($this->getForceCreationCheckbox());
                 return false;
             }
         }
 
-        $authBackend = $this->request->getQuery('auth_backend');
+        $authBackend = $this->request->getQuery('backend');
         try {
             if ($authBackend === null) { // create new backend
                 $this->add($this->getValues());
-                $message = $this->translate('Authentication backend "%s" has been successfully created');
+                $message = $this->translate('User backend "%s" has been successfully created');
             } else { // edit existing backend
                 $this->edit($authBackend, $this->getValues());
-                $message = $this->translate('Authentication backend "%s" has been successfully changed');
+                $message = $this->translate('User backend "%s" has been successfully changed');
             }
         } catch (InvalidArgumentException $e) {
             Notification::error($e->getMessage());
@@ -225,7 +225,7 @@ class AuthenticationBackendConfigForm extends ConfigForm
     }
 
     /**
-     * Populate the form in case an authentication backend is being edited
+     * Populate the form in case an user backend is being edited
      *
      * @see Form::onRequest()
      *
@@ -233,12 +233,12 @@ class AuthenticationBackendConfigForm extends ConfigForm
      */
     public function onRequest()
     {
-        $authBackend = $this->request->getQuery('auth_backend');
+        $authBackend = $this->request->getQuery('backend');
         if ($authBackend !== null) {
             if ($authBackend === '') {
-                throw new ConfigurationError($this->translate('Authentication backend name missing'));
+                throw new ConfigurationError($this->translate('User backend name missing'));
             } elseif (! $this->config->hasSection($authBackend)) {
-                throw new ConfigurationError($this->translate('Unknown authentication backend provided'));
+                throw new ConfigurationError($this->translate('Unknown user backend provided'));
             } elseif ($this->config->getSection($authBackend)->backend === null) {
                 throw new ConfigurationError(
                     sprintf($this->translate('Backend "%s" has no `backend\' setting'), $authBackend)
diff --git a/application/forms/Config/AuthenticationBackendReorderForm.php b/application/forms/Config/UserBackendReorderForm.php
similarity index 87%
rename from application/forms/Config/AuthenticationBackendReorderForm.php
rename to application/forms/Config/UserBackendReorderForm.php
index 34f20d851..9069e73e3 100644
--- a/application/forms/Config/AuthenticationBackendReorderForm.php
+++ b/application/forms/Config/UserBackendReorderForm.php
@@ -7,7 +7,7 @@ use InvalidArgumentException;
 use Icinga\Web\Notification;
 use Icinga\Forms\ConfigForm;
 
-class AuthenticationBackendReorderForm extends ConfigForm
+class UserBackendReorderForm extends ConfigForm
 {
     /**
      * Initialize this form
@@ -38,7 +38,7 @@ class AuthenticationBackendReorderForm extends ConfigForm
     }
 
     /**
-     * Update the authentication backend order and save the configuration
+     * Update the user backend order and save the configuration
      *
      * @see Form::onSuccess()
      */
@@ -62,13 +62,13 @@ class AuthenticationBackendReorderForm extends ConfigForm
     }
 
     /**
-     * Return the config form for authentication backends
+     * Return the config form for user backends
      *
      * @return  ConfigForm
      */
     protected function getConfigForm()
     {
-        $form = new AuthenticationBackendConfigForm();
+        $form = new UserBackendConfigForm();
         $form->setIniConfig($this->config);
         return $form;
     }
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 03f5e06ca..ee5d312f0 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -25,8 +25,8 @@ class RoleForm extends ConfigForm
         'config/*'                                      => 'config/*',
         'config/application/*'                          => 'config/application/*',
         'config/application/general'                    => 'config/application/general',
-        'config/application/authentication'             => 'config/application/authentication',
         'config/application/resources'                  => 'config/application/resources',
+        'config/application/userbackend'                => 'config/application/userbackend',
         'config/application/usergroupbackend'           => 'config/application/usergroupbackend',
         'config/authentication/*'                       => 'config/authentication/*',
         'config/authentication/users/*'                 => 'config/authentication/users/*',
diff --git a/application/views/scripts/config/authentication/create.phtml b/application/views/scripts/config/userbackend/create.phtml
similarity index 100%
rename from application/views/scripts/config/authentication/create.phtml
rename to application/views/scripts/config/userbackend/create.phtml
diff --git a/application/views/scripts/config/authentication/modify.phtml b/application/views/scripts/config/userbackend/modify.phtml
similarity index 100%
rename from application/views/scripts/config/authentication/modify.phtml
rename to application/views/scripts/config/userbackend/modify.phtml
diff --git a/application/views/scripts/config/authentication/remove.phtml b/application/views/scripts/config/userbackend/remove.phtml
similarity index 100%
rename from application/views/scripts/config/authentication/remove.phtml
rename to application/views/scripts/config/userbackend/remove.phtml
diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/userbackend/reorder.phtml
similarity index 71%
rename from application/views/scripts/config/authentication/reorder.phtml
rename to application/views/scripts/config/userbackend/reorder.phtml
index e4b72d7e1..64a6fc594 100644
--- a/application/views/scripts/config/authentication/reorder.phtml
+++ b/application/views/scripts/config/userbackend/reorder.phtml
@@ -2,8 +2,8 @@
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">
-  <a href="<?= $this->href('/config/createAuthenticationBackend'); ?>">
-    <?= $this->icon('plus'); ?><?= $this->translate('Create A New Authentication Backend'); ?>
+  <a href="<?= $this->href('/config/createuserbackend'); ?>">
+    <?= $this->icon('plus'); ?><?= $this->translate('Create A New User Backend'); ?>
   </a>
   <div id="authentication-reorder-form">
     <?= $form; ?>
diff --git a/application/views/scripts/form/reorder-authbackend.phtml b/application/views/scripts/form/reorder-authbackend.phtml
index cd8001436..20d4e3696 100644
--- a/application/views/scripts/form/reorder-authbackend.phtml
+++ b/application/views/scripts/form/reorder-authbackend.phtml
@@ -12,22 +12,22 @@
         <td class="action">
           <?= $this->qlink(
             $backendNames[$i],
-            'config/editAuthenticationBackend',
-            array('auth_backend' => $backendNames[$i]),
+            'config/edituserbackend',
+            array('backend' => $backendNames[$i]),
             array(
                 'icon'  => 'edit',
-                'title' => sprintf($this->translate('Edit authentication backend %s'), $backendNames[$i])
+                'title' => sprintf($this->translate('Edit user backend %s'), $backendNames[$i])
             )
           ); ?>
         </td>
         <td>
           <?= $this->qlink(
             '',
-            'config/removeAuthenticationBackend',
-            array('auth_backend' => $backendNames[$i]),
+            'config/removeuserbackend',
+            array('backend' => $backendNames[$i]),
             array(
                 'icon'  => 'trash',
-                'title' => sprintf($this->translate('Remove authentication backend %s'), $backendNames[$i])
+                'title' => sprintf($this->translate('Remove user backend %s'), $backendNames[$i])
             )
           ); ?>
         </td>
@@ -40,7 +40,7 @@
           ); ?>" title="<?= $this->translate(
             'Move up in authentication order'
           ); ?>" aria-label="<?= sprintf(
-            $this->translate('Move authentication backend %s upwards'),
+            $this->translate('Move user backend %s upwards'),
             $backendNames[$i]
           ); ?>">
             <?= $this->icon('up-big'); ?>
@@ -54,7 +54,7 @@
           ); ?>" title="<?= $this->translate(
             'Move down in authentication order'
           ); ?>" aria-label="<?= sprintf(
-            $this->translate('Move authentication backend %s downwards'),
+            $this->translate('Move user backend %s downwards'),
             $backendNames[$i]
           ); ?>">
             <?= $this->icon('down-big'); ?>
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index f3bce41fa..bb68792a6 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -4,9 +4,9 @@
 namespace Icinga\Module\Setup\Forms;
 
 use Icinga\Web\Form;
-use Icinga\Forms\Config\Authentication\DbBackendForm;
-use Icinga\Forms\Config\Authentication\LdapBackendForm;
-use Icinga\Forms\Config\Authentication\ExternalBackendForm;
+use Icinga\Forms\Config\UserBackend\DbBackendForm;
+use Icinga\Forms\Config\UserBackend\LdapBackendForm;
+use Icinga\Forms\Config\UserBackend\ExternalBackendForm;
 use Icinga\Data\ConfigObject;
 
 /**
@@ -105,7 +105,7 @@ class AuthBackendPage extends Form
         }
 
         if (false === isset($data['skip_validation']) || $data['skip_validation'] == 0) {
-            if ($this->config['type'] === 'ldap' && false === LdapBackendForm::isValidAuthenticationBackend($this)) {
+            if ($this->config['type'] === 'ldap' && false === LdapBackendForm::isValidUserBackend($this)) {
                 $this->addSkipValidationCheckbox();
                 return false;
             }
diff --git a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php b/test/php/application/forms/Config/UserBackend/DbBackendFormTest.php
similarity index 79%
rename from test/php/application/forms/Config/Authentication/DbBackendFormTest.php
rename to test/php/application/forms/Config/UserBackend/DbBackendFormTest.php
index 695ef4885..d58ff8a33 100644
--- a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php
+++ b/test/php/application/forms/Config/UserBackend/DbBackendFormTest.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Tests\Icinga\Forms\Config\Authentication;
+namespace Tests\Icinga\Forms\Config\UserBackend;
 
 // Necessary as some of these tests disable phpunit's preservation
 // of the global state (e.g. autoloaders are in the global state)
@@ -10,7 +10,7 @@ require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php');
 use Mockery;
 use Icinga\Data\ConfigObject;
 use Icinga\Test\BaseTestCase;
-use Icinga\Forms\Config\Authentication\DbBackendForm;
+use Icinga\Forms\Config\UserBackend\DbBackendForm;
 
 class DbBackendFormTest extends BaseTestCase
 {
@@ -32,7 +32,7 @@ class DbBackendFormTest extends BaseTestCase
             ->andReturn(2);
 
         // Passing array(null) is required to make Mockery call the constructor...
-        $form = Mockery::mock('Icinga\Forms\Config\Authentication\DbBackendForm[getView]', array(null));
+        $form = Mockery::mock('Icinga\Forms\Config\UserBackend\DbBackendForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
             ->andReturnUsing(function ($s) { return $s; });
@@ -41,8 +41,8 @@ class DbBackendFormTest extends BaseTestCase
         $form->populate(array('resource' => 'test_db_backend'));
 
         $this->assertTrue(
-            DbBackendForm::isValidAuthenticationBackend($form),
-            'DbBackendForm claims that a valid authentication backend with users is not valid'
+            DbBackendForm::isValidUserBackend($form),
+            'DbBackendForm claims that a valid user backend with users is not valid'
         );
     }
 
@@ -58,7 +58,7 @@ class DbBackendFormTest extends BaseTestCase
             ->andReturn(0);
 
         // Passing array(null) is required to make Mockery call the constructor...
-        $form = Mockery::mock('Icinga\Forms\Config\Authentication\DbBackendForm[getView]', array(null));
+        $form = Mockery::mock('Icinga\Forms\Config\UserBackend\DbBackendForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
             ->andReturnUsing(function ($s) { return $s; });
@@ -67,8 +67,8 @@ class DbBackendFormTest extends BaseTestCase
         $form->populate(array('resource' => 'test_db_backend'));
 
         $this->assertFalse(
-            DbBackendForm::isValidAuthenticationBackend($form),
-            'DbBackendForm claims that an invalid authentication backend without users is valid'
+            DbBackendForm::isValidUserBackend($form),
+            'DbBackendForm claims that an invalid user backend without users is valid'
         );
     }
 
diff --git a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php b/test/php/application/forms/Config/UserBackend/LdapBackendFormTest.php
similarity index 79%
rename from test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
rename to test/php/application/forms/Config/UserBackend/LdapBackendFormTest.php
index 442770e83..f7373a7ae 100644
--- a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
+++ b/test/php/application/forms/Config/UserBackend/LdapBackendFormTest.php
@@ -1,7 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Tests\Icinga\Forms\Config\Authentication;
+namespace Tests\Icinga\Forms\Config\UserBackend;
 
 // Necessary as some of these tests disable phpunit's preservation
 // of the global state (e.g. autoloaders are in the global state)
@@ -10,7 +10,7 @@ require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php');
 use Mockery;
 use Icinga\Data\ConfigObject;
 use Icinga\Test\BaseTestCase;
-use Icinga\Forms\Config\Authentication\LdapBackendForm;
+use Icinga\Forms\Config\UserBackend\LdapBackendForm;
 use Icinga\Exception\AuthenticationException;
 
 class LdapBackendFormTest extends BaseTestCase
@@ -33,7 +33,7 @@ class LdapBackendFormTest extends BaseTestCase
             ->shouldReceive('setConfig')->andReturnNull();
 
         // Passing array(null) is required to make Mockery call the constructor...
-        $form = Mockery::mock('Icinga\Forms\Config\Authentication\LdapBackendForm[getView]', array(null));
+        $form = Mockery::mock('Icinga\Forms\Config\UserBackend\LdapBackendForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
             ->andReturnUsing(function ($s) { return $s; });
@@ -42,8 +42,8 @@ class LdapBackendFormTest extends BaseTestCase
         $form->populate(array('resource' => 'test_ldap_backend'));
 
         $this->assertTrue(
-            LdapBackendForm::isValidAuthenticationBackend($form),
-            'LdapBackendForm claims that a valid authentication backend with users is not valid'
+            LdapBackendForm::isValidUserBackend($form),
+            'LdapBackendForm claims that a valid user backend with users is not valid'
         );
     }
 
@@ -58,7 +58,7 @@ class LdapBackendFormTest extends BaseTestCase
             ->shouldReceive('assertAuthenticationPossible')->andThrow(new AuthenticationException);
 
         // Passing array(null) is required to make Mockery call the constructor...
-        $form = Mockery::mock('Icinga\Forms\Config\Authentication\LdapBackendForm[getView]', array(null));
+        $form = Mockery::mock('Icinga\Forms\Config\UserBackend\LdapBackendForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
             ->andReturnUsing(function ($s) { return $s; });
@@ -67,8 +67,8 @@ class LdapBackendFormTest extends BaseTestCase
         $form->populate(array('resource' => 'test_ldap_backend'));
 
         $this->assertFalse(
-            LdapBackendForm::isValidAuthenticationBackend($form),
-            'LdapBackendForm claims that an invalid authentication backend without users is valid'
+            LdapBackendForm::isValidUserBackend($form),
+            'LdapBackendForm claims that an invalid user backend without users is valid'
         );
     }
 
diff --git a/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php b/test/php/application/forms/Config/UserBackendReorderFormTest.php
similarity index 64%
rename from test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php
rename to test/php/application/forms/Config/UserBackendReorderFormTest.php
index 23563f31b..240d578be 100644
--- a/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php
+++ b/test/php/application/forms/Config/UserBackendReorderFormTest.php
@@ -5,10 +5,10 @@ namespace Tests\Icinga\Forms\Config;
 
 use Icinga\Test\BaseTestCase;
 use Icinga\Application\Config;
-use Icinga\Forms\Config\AuthenticationBackendConfigForm;
-use Icinga\Forms\Config\AuthenticationBackendReorderForm;
+use Icinga\Forms\Config\UserBackendConfigForm;
+use Icinga\Forms\Config\UserBackendReorderForm;
 
-class AuthenticationBackendConfigFormWithoutSave extends AuthenticationBackendConfigForm
+class UserBackendConfigFormWithoutSave extends UserBackendConfigForm
 {
     public static $newConfig;
 
@@ -19,11 +19,11 @@ class AuthenticationBackendConfigFormWithoutSave extends AuthenticationBackendCo
     }
 }
 
-class AuthenticationBackendReorderFormProvidingConfigFormWithoutSave extends AuthenticationBackendReorderForm
+class UserBackendReorderFormProvidingConfigFormWithoutSave extends UserBackendReorderForm
 {
     public function getConfigForm()
     {
-        $form = new AuthenticationBackendConfigFormWithoutSave();
+        $form = new UserBackendConfigFormWithoutSave();
         $form->setIniConfig($this->config);
         return $form;
     }
@@ -45,7 +45,7 @@ class AuthenticationBackendReorderFormTest extends BaseTestCase
             ->shouldReceive('isPost')->andReturn(true)
             ->shouldReceive('getPost')->andReturn(array('backend_newpos' => 'test3|1'));
 
-        $form = new AuthenticationBackendReorderFormProvidingConfigFormWithoutSave();
+        $form = new UserBackendReorderFormProvidingConfigFormWithoutSave();
         $form->setIniConfig($config);
         $form->setTokenDisabled();
         $form->setUidDisabled();
@@ -53,8 +53,8 @@ class AuthenticationBackendReorderFormTest extends BaseTestCase
 
         $this->assertEquals(
             array('test1', 'test3', 'test2'),
-            AuthenticationBackendConfigFormWithoutSave::$newConfig->keys(),
-            'Moving elements with AuthenticationBackendReorderForm does not seem to properly work'
+            UserBackendConfigFormWithoutSave::$newConfig->keys(),
+            'Moving elements with UserBackendReorderForm does not seem to properly work'
         );
     }
 }

From 0ce2227385f5fc1531a5a8338adb730b986720b2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 2 Jun 2015 10:06:54 +0200
Subject: [PATCH 1932/2920] monitoring: Don't add class active to followed
 links of a host's service summary

The links now open in the next container. Managing active state of followed links is not yet possible.

refs #7998
---
 .../partials/host/servicesummary.phtml        | 27 +++----------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
index dd111b27b..b69682e1b 100644
--- a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
@@ -13,7 +13,6 @@ function urlAddFilterOptional($url, $filter, $optional) {
 }
 
 $selfUrl = Url::fromPath('monitoring/list/services', array('host' => $object->host_name));
-$currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
 ?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
 <?php if ($object->stats->services_total): ?>
 <?= $this->qlink(
@@ -46,7 +45,7 @@ $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl();
 
 <span class="badges">
 <?php if ($object->stats->services_ok): ?>
-<span class="state ok<?= $currentUrl === $selfUrl->with('service_state', 0)->getRelativeUrl() ? ' active' : ''; ?>">
+<span class="state ok">
     <?= $this->qlink(
         $object->stats->services_ok,
         $selfUrl,
@@ -74,19 +73,7 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
         $unhandled = $pre . '_unhandled';
         $paramsHandled = array('service_state' => $stateId, 'service_handled' => 1);
         $paramsUnhandled = array('service_state' => $stateId, 'service_handled' => 0);
-        if ($object->stats->$unhandled) {
-            $compareUrl = $selfUrl->with($paramsUnhandled)->getRelativeUrl();
-        } else {
-            $compareUrl = $selfUrl->with($paramsHandled)->getRelativeUrl();
-        }
-
-        if ($compareUrl === $currentUrl) {
-            $active = ' active';
-        } else {
-            $active = '';
-        }
-
-        echo '<span class="state ' . $state . $active . ($object->stats->$unhandled ? '' : ' handled') . '">';
+        echo '<span class="state ' . $state . ($object->stats->$unhandled ? '' : ' handled') . '">';
         if ($object->stats->$unhandled) {
 
             echo $this->qlink(
@@ -109,14 +96,8 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
             );
         }
         if ($object->stats->$handled) {
-
-            if ($selfUrl->with($paramsHandled)->getRelativeUrl() === $currentUrl) {
-                $active = ' active';
-            } else {
-                $active = '';
-            }
             if ($object->stats->$unhandled) {
-                echo '<span class="state handled ' . $state . $active . '">';
+                echo '<span class="state handled ' . $state . '">';
             }
             echo $this->qlink(
                 $object->stats->$handled,
@@ -145,7 +126,7 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
 }
 ?>
 <?php if ($object->stats->services_pending): ?>
-<span class="state pending<?= $currentUrl === $selfUrl->with('service_state', 99)->getRelativeUrl() ? ' active' : ''; ?>">
+<span class="state pending">
     <?= $this->qlink(
         $object->stats->services_pending,
         $selfUrl,

From c01512d5e94558f3ce897de57fb16ea367c979dd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 2 Jun 2015 10:07:13 +0200
Subject: [PATCH 1933/2920] monitoring: Fix link to unhandled services of a
 host

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

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 5535d14fa..f8b77574d 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -69,7 +69,7 @@ if (count($hosts) === 0) {
             $this->translatePlural('%u unhandled service', '%u unhandled services', $host->host_unhandled_services),
             $host->host_unhandled_services
           ),
-          'monitoring/show/services',
+          'monitoring/list/services',
           array(
             'host'               => $host->host_name,
             'service_problem'    => 1,

From 2da45d2e942f74d1b32389fe19474977ea2d9ae2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 2 Jun 2015 10:07:43 +0200
Subject: [PATCH 1934/2920] monitoring: Fix link to a host's services in the
 service grid

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

diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
index a9cbac445..73fbfe3b5 100644
--- a/modules/monitoring/application/views/scripts/list/servicegrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
@@ -67,7 +67,7 @@ foreach ($serviceDescriptions as $service_description): ?>
         <th>
           <?= $this->qlink(
             $host_name,
-            'monitoring/show/services?' . $serviceFilter,
+            'monitoring/list/services?' . $serviceFilter,
             array('host' => $host_name),
             array('title' => sprintf($this->translate('List all reported services on host %s'), $host_name))
           ); ?>

From ae30a62055efffa007160d2845dc5cb3644cc322 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Jun 2015 10:23:40 +0200
Subject: [PATCH 1935/2920] ConfigController: Add tab for the user group
 backend configuration

refs #8826
---
 application/controllers/ConfigController.php  | 20 +++++---
 .../UsergroupbackendController.php            | 47 +++++++++++++++----
 library/Icinga/Web/Menu.php                   |  5 --
 3 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 6b7dbc705..ce020733b 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -46,6 +46,14 @@ class ConfigController extends Controller
             ));
             $allowedActions[] = 'general';
         }
+        if ($auth->hasPermission('config/application/resources')) {
+            $tabs->add('resource', array(
+                'title' => $this->translate('Configure which resources are being utilized by Icinga Web 2'),
+                'label' => $this->translate('Resources'),
+                'url'   => 'config/resource'
+            ));
+            $allowedActions[] = 'resource';
+        }
         if ($auth->hasPermission('config/application/userbackend')) {
             $tabs->add('userbackend', array(
                 'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'),
@@ -54,13 +62,13 @@ class ConfigController extends Controller
             ));
             $allowedActions[] = 'userbackend';
         }
-        if ($auth->hasPermission('config/application/resources')) {
-            $tabs->add('resource', array(
-                'title' => $this->translate('Configure which resources are being utilized by Icinga Web 2'),
-                'label' => $this->translate('Resources'),
-                'url'   => 'config/resource'
+        if ($auth->hasPermission('config/application/usergroupbackend')) {
+            $tabs->add('usergroupbackend', array(
+                'title' => $this->translate('Configure how users are associated with groups by Icinga Web 2'),
+                'label' => $this->translate('User Groups'),
+                'url'   => 'usergroupbackend/list'
             ));
-            $allowedActions[] = 'resource';
+            $allowedActions[] = 'usergroupbackend';
         }
         $this->firstAllowedAction = array_shift($allowedActions);
     }
diff --git a/application/controllers/UsergroupbackendController.php b/application/controllers/UsergroupbackendController.php
index e03880637..cdb6826be 100644
--- a/application/controllers/UsergroupbackendController.php
+++ b/application/controllers/UsergroupbackendController.php
@@ -37,14 +37,7 @@ class UsergroupbackendController extends Controller
     public function listAction()
     {
         $this->view->backendNames = Config::app('groups')->keys();
-        $this->getTabs()->add(
-            'usergroupbackend/list',
-            array(
-                'title' => $this->translate('List all user group backends'),
-                'label' => $this->translate('User group backends'),
-                'url'   => 'usergroupbackend/list'
-            )
-        )->activate('usergroupbackend/list');
+        $this->createListTabs()->activate('usergroupbackend');
     }
 
     /**
@@ -149,4 +142,42 @@ class UsergroupbackendController extends Controller
         $this->view->form = $form;
         $this->render('form');
     }
+
+    /**
+     * Create the tabs for the application configuration
+     */
+    protected function createListTabs()
+    {
+        $tabs = $this->getTabs();
+        if ($this->hasPermission('config/application/general')) {
+            $tabs->add('general', array(
+                'title' => $this->translate('Adjust the general configuration of Icinga Web 2'),
+                'label' => $this->translate('General'),
+                'url'   => 'config/general'
+            ));
+        }
+        if ($this->hasPermission('config/application/resources')) {
+            $tabs->add('resource', array(
+                'title' => $this->translate('Configure which resources are being utilized by Icinga Web 2'),
+                'label' => $this->translate('Resources'),
+                'url'   => 'config/resource'
+            ));
+        }
+        if ($this->hasPermission('config/application/userbackend')) {
+            $tabs->add('userbackend', array(
+                'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'),
+                'label' => $this->translate('Authentication'),
+                'url'   => 'config/userbackend'
+            ));
+        }
+        if ($this->hasPermission('config/application/usergroupbackend')) {
+            $tabs->add('usergroupbackend', array(
+                'title' => $this->translate('Configure how users are associated with groups by Icinga Web 2'),
+                'label' => $this->translate('User Groups'),
+                'url'   => 'usergroupbackend/list'
+            ));
+        }
+
+        return $tabs;
+    }
 }
diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index ef27204c8..63d92fc9f 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -259,11 +259,6 @@ class Menu implements RecursiveIterator
                 'permission'    => 'config/authentication/*',
                 'priority'      => 820
             ));
-            $section->add(t('UserGroupBackends'), array(
-                'url'           => 'usergroupbackend/list',
-                'permission'    => 'config/application/usergroupbackend',
-                'priority'      => 830
-            ));
             $section->add(t('Modules'), array(
                 'url'           => 'config/modules',
                 'permission'    => 'config/modules',

From 5d50eabb4410ceea0ba9170bbfe3e5fb5004ffe5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Jun 2015 10:39:49 +0200
Subject: [PATCH 1936/2920] FileReader: Mimic cursor capability

---
 library/Icinga/Protocol/File/FileReader.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/library/Icinga/Protocol/File/FileReader.php b/library/Icinga/Protocol/File/FileReader.php
index 2c43d390a..d9c984ca8 100644
--- a/library/Icinga/Protocol/File/FileReader.php
+++ b/library/Icinga/Protocol/File/FileReader.php
@@ -4,6 +4,7 @@
 namespace Icinga\Protocol\File;
 
 use Countable;
+use ArrayIterator;
 use Icinga\Data\Selectable;
 use Icinga\Data\ConfigObject;
 
@@ -71,6 +72,18 @@ class FileReader implements Selectable, Countable
         return new FileQuery($this);
     }
 
+    /**
+     * Fetch and return all rows of the given query's result set using an iterator
+     *
+     * @param   FileQuery   $query
+     *
+     * @return  ArrayIterator
+     */
+    public function query(FileQuery $query)
+    {
+        return new ArrayIterator($this->fetchAll($query));
+    }
+
     /**
      * Return the number of available valid lines.
      *

From 00c31ffd28845babbad674e1cf8c5c2bc5f59920 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Jun 2015 11:57:13 +0200
Subject: [PATCH 1937/2920] RolesController: Rename to RoleController

---
 ...RolesController.php => RoleController.php} | 22 +++++++++----------
 .../{roles/update.phtml => role/form.phtml}   |  4 ++--
 .../{roles/index.phtml => role/list.phtml}    |  6 ++---
 application/views/scripts/roles/new.phtml     |  6 -----
 application/views/scripts/roles/remove.phtml  |  6 -----
 .../Web/Controller/AuthBackendController.php  |  4 ++--
 6 files changed, 18 insertions(+), 30 deletions(-)
 rename application/controllers/{RolesController.php => RoleController.php} (91%)
 rename application/views/scripts/{roles/update.phtml => role/form.phtml} (50%)
 rename application/views/scripts/{roles/index.phtml => role/list.phtml} (95%)
 delete mode 100644 application/views/scripts/roles/new.phtml
 delete mode 100644 application/views/scripts/roles/remove.phtml

diff --git a/application/controllers/RolesController.php b/application/controllers/RoleController.php
similarity index 91%
rename from application/controllers/RolesController.php
rename to application/controllers/RoleController.php
index 57c972f32..0384009ec 100644
--- a/application/controllers/RolesController.php
+++ b/application/controllers/RoleController.php
@@ -7,25 +7,22 @@ use Icinga\Forms\Security\RoleForm;
 use Icinga\Web\Controller\AuthBackendController;
 use Icinga\Web\Notification;
 
-/**
- * Roles configuration
- */
-class RolesController extends AuthBackendController
+class RoleController extends AuthBackendController
 {
     /**
      * List roles
      */
-    public function indexAction()
+    public function listAction()
     {
         $this->assertPermission('config/authentication/roles/show');
-        $this->createListTabs()->activate('roles');
+        $this->createListTabs()->activate('role/list');
         $this->view->roles = Config::app('roles', true);
     }
 
     /**
      * Create a new role
      */
-    public function newAction()
+    public function addAction()
     {
         $this->assertPermission('config/authentication/roles/add');
         $role = new RoleForm(array(
@@ -49,9 +46,10 @@ class RolesController extends AuthBackendController
             ->setTitle($this->translate('New Role'))
             ->setSubmitLabel($this->translate('Create Role'))
             ->setIniConfig(Config::app('roles', true))
-            ->setRedirectUrl('roles')
+            ->setRedirectUrl('role/list')
             ->handleRequest();
         $this->view->form = $role;
+        $this->render('form');
     }
 
     /**
@@ -59,7 +57,7 @@ class RolesController extends AuthBackendController
      *
      * @throws Zend_Controller_Action_Exception If the required parameter 'role' is missing or the role does not exist
      */
-    public function updateAction()
+    public function editAction()
     {
         $this->assertPermission('config/authentication/roles/edit');
         $name = $this->_request->getParam('role');
@@ -99,9 +97,10 @@ class RolesController extends AuthBackendController
                 }
                 return false;
             })
-            ->setRedirectUrl('roles')
+            ->setRedirectUrl('role/list')
             ->handleRequest();
         $this->view->form = $role;
+        $this->render('form');
     }
 
     /**
@@ -148,8 +147,9 @@ class RolesController extends AuthBackendController
         $confirmation
             ->setTitle(sprintf($this->translate('Remove Role %s'), $name))
             ->setSubmitLabel($this->translate('Remove Role'))
-            ->setRedirectUrl('roles')
+            ->setRedirectUrl('role/list')
             ->handleRequest();
         $this->view->form = $confirmation;
+        $this->render('form');
     }
 }
diff --git a/application/views/scripts/roles/update.phtml b/application/views/scripts/role/form.phtml
similarity index 50%
rename from application/views/scripts/roles/update.phtml
rename to application/views/scripts/role/form.phtml
index ca1e1559e..cbf06590d 100644
--- a/application/views/scripts/roles/update.phtml
+++ b/application/views/scripts/role/form.phtml
@@ -1,6 +1,6 @@
 <div class="controls">
-    <?= $tabs->showOnlyCloseButton() ?>
+  <?= $tabs->showOnlyCloseButton(); ?>
 </div>
 <div class="content">
-    <?= $form ?>
+  <?= $form; ?>
 </div>
\ No newline at end of file
diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/role/list.phtml
similarity index 95%
rename from application/views/scripts/roles/index.phtml
rename to application/views/scripts/role/list.phtml
index 17e947249..766ba26f3 100644
--- a/application/views/scripts/roles/index.phtml
+++ b/application/views/scripts/role/list.phtml
@@ -22,7 +22,7 @@
                         <td>
                             <?= $this->qlink(
                                 $name,
-                                'roles/update',
+                                'role/edit',
                                 array('role' => $name),
                                 array('title' => sprintf($this->translate('Edit role %s'), $name))
                             ); ?>
@@ -54,7 +54,7 @@
                         <td>
                             <?= $this->qlink(
                                 '',
-                                'roles/remove',
+                                'role/remove',
                                 array('role' => $name),
                                 array(
                                     'icon'  => 'trash',
@@ -67,7 +67,7 @@
                 </tbody>
             </table>
         <?php endif ?>
-        <a data-base-target="_next" href="<?= $this->href('roles/new') ?>">
+        <a data-base-target="_next" href="<?= $this->href('role/new') ?>">
             <?= $this->translate('Create a New Role') ?>
         </a>
     </div>
diff --git a/application/views/scripts/roles/new.phtml b/application/views/scripts/roles/new.phtml
deleted file mode 100644
index ca1e1559e..000000000
--- a/application/views/scripts/roles/new.phtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="controls">
-    <?= $tabs->showOnlyCloseButton() ?>
-</div>
-<div class="content">
-    <?= $form ?>
-</div>
\ No newline at end of file
diff --git a/application/views/scripts/roles/remove.phtml b/application/views/scripts/roles/remove.phtml
deleted file mode 100644
index ca1e1559e..000000000
--- a/application/views/scripts/roles/remove.phtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="controls">
-    <?= $tabs->showOnlyCloseButton() ?>
-</div>
-<div class="content">
-    <?= $form ?>
-</div>
\ No newline at end of file
diff --git a/library/Icinga/Web/Controller/AuthBackendController.php b/library/Icinga/Web/Controller/AuthBackendController.php
index aafa2d703..45b512c8a 100644
--- a/library/Icinga/Web/Controller/AuthBackendController.php
+++ b/library/Icinga/Web/Controller/AuthBackendController.php
@@ -165,13 +165,13 @@ class AuthBackendController extends Controller
 
         if ($this->hasPermission('config/authentication/roles/show')) {
             $tabs->add(
-                'roles',
+                'role/list',
                 array(
                     'title' => $this->translate(
                         'Configure roles to permit or restrict users and groups accessing Icinga Web 2'
                     ),
                     'label' => $this->translate('Roles'),
-                    'url'   => 'roles'
+                    'url'   => 'role/list'
                 )
             );
         }

From 7213379cacb0c10e6d31d8761c1bd023829806aa Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Jun 2015 11:59:04 +0200
Subject: [PATCH 1938/2920] AuthBackendController: Add final indexAction

Required to automatically redirect to the first permitted list action.

refs #8826
---
 application/controllers/ConfigController.php    |  2 +-
 application/controllers/GroupController.php     |  8 --------
 application/controllers/UserController.php      |  8 --------
 .../Web/Controller/AuthBackendController.php    | 17 +++++++++++++++++
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 1837d3a89..9d55910e9 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -84,7 +84,7 @@ class ConfigController extends Controller
     public function indexAction()
     {
         if ($this->firstAllowedAction === null) {
-            throw new SecurityException($this->translate('No permission for configuration'));
+            throw new SecurityException($this->translate('No permission for application configuration'));
         }
         $action = $this->getTabs()->get($this->firstAllowedAction);
         if (substr($action->getUrl()->getPath(), 0, 7) === 'config/') {
diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index fe8dd58f8..70954aaf1 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -17,14 +17,6 @@ use Icinga\Web\Widget;
 
 class GroupController extends AuthBackendController
 {
-    /**
-     * Redirect to this controller's list action
-     */
-    public function indexAction()
-    {
-        $this->redirectNow('group/list');
-    }
-
     /**
      * List all user groups of a single backend
      */
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 30e0bc100..c71fe9696 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -17,14 +17,6 @@ use Icinga\Web\Widget;
 
 class UserController extends AuthBackendController
 {
-    /**
-     * Redirect to this controller's list action
-     */
-    public function indexAction()
-    {
-        $this->redirectNow('user/list');
-    }
-
     /**
      * List all users of a single backend
      */
diff --git a/library/Icinga/Web/Controller/AuthBackendController.php b/library/Icinga/Web/Controller/AuthBackendController.php
index 45b512c8a..43ed78fd7 100644
--- a/library/Icinga/Web/Controller/AuthBackendController.php
+++ b/library/Icinga/Web/Controller/AuthBackendController.php
@@ -9,6 +9,7 @@ use Icinga\Authentication\User\UserBackend;
 use Icinga\Authentication\User\UserBackendInterface;
 use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Authentication\UserGroup\UserGroupBackendInterface;
+use Icinga\Security\SecurityException;
 use Icinga\Web\Controller;
 
 /**
@@ -16,6 +17,22 @@ use Icinga\Web\Controller;
  */
 class AuthBackendController extends Controller
 {
+    /**
+     * Redirect to the first permitted list action
+     */
+    final public function indexAction()
+    {
+        if ($this->hasPermission('config/authentication/users/show')) {
+            $this->redirectNow('user/list');
+        } elseif ($this->hasPermission('config/authentication/groups/show')) {
+            $this->redirectNow('group/list');
+        } elseif ($this->hasPermission('config/authentication/roles/show')) {
+            $this->redirectNow('role/list');
+        } else {
+            throw new SecurityException($this->translate('No permission for authentication configuration'));
+        }
+    }
+
     /**
      * Return all user backends implementing the given interface
      *

From 267e71f38beb896b2983563f89f4ca7772ba573a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Jun 2015 12:01:02 +0200
Subject: [PATCH 1939/2920] User: Consider the required permission more
 important if it has a wildcard

refs #9202
---
 library/Icinga/User.php              | 2 +-
 test/php/library/Icinga/UserTest.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index f9df0d664..c322a04d0 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -426,7 +426,7 @@ class User
         // matches
         $any = strpos($requiredPermission, '*');
         foreach ($this->permissions as $grantedPermission) {
-            if ($any !== false && strpos($grantedPermission, '*') === false) {
+            if ($any !== false) {
                 $wildcard = $any;
             } else {
                 // If the permit contains a wildcard, grant the permission if it's related to the permit
diff --git a/test/php/library/Icinga/UserTest.php b/test/php/library/Icinga/UserTest.php
index dc55dc62d..97cf412c0 100644
--- a/test/php/library/Icinga/UserTest.php
+++ b/test/php/library/Icinga/UserTest.php
@@ -67,13 +67,15 @@ class UserTest extends BaseTestCase
             'test',
             'test/some/specific',
             'test/more/*',
-            'test/wildcard-with-wildcard/*'
+            'test/wildcard-with-wildcard/*',
+            'test/even-more/specific-with-wildcard/*'
         ));
         $this->assertTrue($user->can('test'));
         $this->assertTrue($user->can('test/some/specific'));
         $this->assertTrue($user->can('test/more/everything'));
         $this->assertTrue($user->can('test/wildcard-with-wildcard/*'));
         $this->assertTrue($user->can('test/wildcard-with-wildcard/sub/sub'));
+        $this->assertTrue($user->can('test/even-more/*'));
         $this->assertFalse($user->can('not/test'));
         $this->assertFalse($user->can('test/some/not/so/specific'));
         $this->assertFalse($user->can('test/wildcard2/*'));

From 06fb6ff6fc6cdf14d5e1e7dec11c935c2b7aafc7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 2 Jun 2015 14:47:29 +0200
Subject: [PATCH 1940/2920] SimpleQuery: Re-add method paginate but flag it as
 deprecated

---
 library/Icinga/Data/SimpleQuery.php | 40 +++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index bf9360799..3d962a194 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -5,8 +5,11 @@ namespace Icinga\Data;
 
 use ArrayIterator;
 use IteratorAggregate;
+use Zend_Paginator;
+use Icinga\Application\Icinga;
 use Icinga\Data\Filter\Filter;
 use Icinga\Exception\IcingaException;
+use Icinga\Web\Paginator\Adapter\QueryAdapter;
 
 class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
 {
@@ -327,6 +330,43 @@ class SimpleQuery implements QueryInterface, Queryable, IteratorAggregate
         return $this->limitOffset;
     }
 
+    /**
+     * Paginate data
+     *
+     * Auto-detects pagination parameters from request when unset
+     *
+     * @param   int $itemsPerPage   Number of items per page
+     * @param   int $pageNumber     Current page number
+     *
+     * @return  Zend_Paginator
+     *
+     * @deprecated      Use Icinga\Web\Controller::setupPaginationControl() and/or Icinga\Web\Widget\Paginator instead
+     */
+    public function paginate($itemsPerPage = null, $pageNumber = null)
+    {
+        trigger_error(
+            'SimpleQuery::paginate() is deprecated. Use Icinga\Web\Controller::setupPaginationControl()'
+            . ' and/or Icinga\Web\Widget\Paginator instead',
+            E_USER_DEPRECATED
+        );
+
+        if ($itemsPerPage === null || $pageNumber === null) {
+            // Detect parameters from request
+            $request = Icinga::app()->getFrontController()->getRequest();
+            if ($itemsPerPage === null) {
+                $itemsPerPage = $request->getParam('limit', 25);
+            }
+            if ($pageNumber === null) {
+                $pageNumber = $request->getParam('page', 0);
+            }
+        }
+        $this->limit($itemsPerPage, $pageNumber * $itemsPerPage);
+        $paginator = new Zend_Paginator(new QueryAdapter($this));
+        $paginator->setItemCountPerPage($itemsPerPage);
+        $paginator->setCurrentPageNumber($pageNumber);
+        return $paginator;
+    }
+
     /**
      * Retrieve an array containing all rows of the result set
      *

From a5c3782de7a7ef66d144ac1d59abb83cc5ac4d4a Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 2 Jun 2015 15:20:27 +0200
Subject: [PATCH 1941/2920] Do not display columns that don't include any
 values

refs #8334
---
 .../application/views/helpers/Perfdata.php    | 61 +++++++++++--------
 .../library/Monitoring/Plugin/Perfdata.php    |  2 +-
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 36cbaa319..7b3fae266 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -20,44 +20,51 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
     {
         $pieChartData = PerfdataSet::fromString($perfdataStr)->asArray();
         $results = array();
-        $table = array(
-            '<td><b>' . implode(
-                '</b></td><td><b>',
-                array(
-                    '',
-                    $this->view->translate('Label'),
-                    $this->view->translate('Value'),
-                    $this->view->translate('Min'),
-                    $this->view->translate('Max'),
-                    $this->view->translate('Warning'),
-                    $this->view->translate('Critical')
-                )
-            ) . '<b></td>'
+        $columns = array();
+        $labels = array_combine(
+            array('', 'label', 'value', 'min', 'max', 'warn', 'crit'),
+            array(
+                '',
+                $this->view->translate('Label'),
+                $this->view->translate('Value'),
+                $this->view->translate('Min'),
+                $this->view->translate('Max'),
+                $this->view->translate('Warning'),
+                $this->view->translate('Critical')
+            )
         );
         foreach ($pieChartData as $perfdata) {
-
+            if ($perfdata->isVisualizable()) {
+                $columns[''] = '';
+            }
+        }
+        foreach ($pieChartData as $perfdata) {
+            foreach ($perfdata->toArray() as $column => $value) {
+                if (! empty($value)) {
+                    $columns[$column] = $labels[$column];
+                }
+            }
+        }
+        $table = array('<td><b>' . implode('</b></td><td><b>', $columns) . '<b></td>');
+        foreach ($pieChartData as $perfdata) {
             if ($compact && $perfdata->isVisualizable()) {
                 $results[] = $perfdata->asInlinePie($color)->render();
             } else {
-                $row = '<tr>';
-
-                $row .= '<td>';
+                $data = array();
                 if ($perfdata->isVisualizable()) {
-                    $row .= $perfdata->asInlinePie($color)->render() . '&nbsp;';
+                    $data []= $perfdata->asInlinePie($color)->render() . '&nbsp;';
+                } else if (isset($columns[''])) {
+                    $data []= '';
                 }
-                $row .= '</td>';
-
                 if (! $compact) {
-                    foreach ($perfdata->toArray() as $value) {
-                        if ($value === '') {
-                            $value = '-';
+                    foreach ($perfdata->toArray() as $column => $value) {
+                        if (! isset($columns[$column])) {
+                            continue;
                         }
-                        $row .= '<td>' . (string) $value . '</td>';
+                        $data []= empty($value) ? '-' : (string) $value;
                     }
                 }
-
-                $row .= '</tr>';
-                $table[] = $row;
+                $table []= '<tr><td>' . implode('</td><td>', $data) . '</td></tr>';
             }
         }
         if ($limit > 0) {
diff --git a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
index b1c71cb72..df1b6016a 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -444,7 +444,7 @@ class Perfdata
     public function toArray()
     {
         $parts = array(
-            $this->getLabel(),
+            'label' => $this->getLabel(),
             'value' => $this->format($this->getvalue()),
             'min' => isset($this->minValue) && !$this->isPercentage() ? $this->format($this->minValue) : '',
             'max' => isset($this->maxValue) && !$this->isPercentage() ? $this->format($this->maxValue) : '',

From 8e35bb446a9541060356b63ddebbd095648df22b Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 2 Jun 2015 16:06:26 +0200
Subject: [PATCH 1942/2920] Hide columns with useless information in perfdata
 table

Hide columns that don't provide any useful information, to reduce the size of the perfdata table.

refs #8334
---
 .../application/views/helpers/Perfdata.php    | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 7b3fae266..5e17adea5 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -20,9 +20,10 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
     {
         $pieChartData = PerfdataSet::fromString($perfdataStr)->asArray();
         $results = array();
+        $keys = array('', 'label', 'value', 'min', 'max', 'warn', 'crit');
         $columns = array();
         $labels = array_combine(
-            array('', 'label', 'value', 'min', 'max', 'warn', 'crit'),
+            $keys,
             array(
                 '',
                 $this->view->translate('Label'),
@@ -37,15 +38,23 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
             if ($perfdata->isVisualizable()) {
                 $columns[''] = '';
             }
-        }
-        foreach ($pieChartData as $perfdata) {
             foreach ($perfdata->toArray() as $column => $value) {
-                if (! empty($value)) {
-                    $columns[$column] = $labels[$column];
+                if (empty($value) ||
+                    $column === 'min' && floatval($value) === 0.0 ||
+                    $column === 'max' && $perfdata->isPercentage() && floatval($value) === 100) {
+                    continue;
                 }
+                $columns[$column] = $labels[$column];
             }
         }
-        $table = array('<td><b>' . implode('</b></td><td><b>', $columns) . '<b></td>');
+        // restore original column array sorting sorting
+        $headers = array();
+        foreach ($keys as $i => $column) {
+            if (isset($columns[$column])) {
+                $headers[$column] = $labels[$column];
+            }
+        }
+        $table = array('<td><b>' . implode('</b></td><td><b>', $headers) . '<b></td>');
         foreach ($pieChartData as $perfdata) {
             if ($compact && $perfdata->isVisualizable()) {
                 $results[] = $perfdata->asInlinePie($color)->render();

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 1943/2920] 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 441fc336437c2ed9ae2e44f6ebc5e9928e20897b Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 2 Jun 2015 11:53:43 +0200
Subject: [PATCH 1944/2920] Include version information on `git archive'

refs #9247
---
 .gitattributes      | 3 +++
 application/VERSION | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 application/VERSION

diff --git a/.gitattributes b/.gitattributes
index a05c2f5cd..6ae8ee7af 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,3 +6,6 @@ Vagrantfile export-ignore
 
 # Normalize puppet manifests' line endings to LF on checkin and prevent conversion to CRLF when the files are checked out
 .puppet* eol=lf
+
+# Include version information on `git archive'
+/application/VERSION export-subst
diff --git a/application/VERSION b/application/VERSION
new file mode 100644
index 000000000..47f3a662f
--- /dev/null
+++ b/application/VERSION
@@ -0,0 +1,2 @@
+GitCommitID: $Format:%H%d$
+GitCommitDate: $Format:%ci$

From 887bd0b8f04b76a57b27b7a46cb8333c5e5d1755 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 2 Jun 2015 16:43:32 +0200
Subject: [PATCH 1945/2920] Show Icinga Web 2's version in the frontend

refs #9247
---
 application/controllers/AboutController.php | 91 +++++++++++++++++++++
 application/views/scripts/about/index.phtml | 20 +++++
 2 files changed, 111 insertions(+)
 create mode 100644 application/controllers/AboutController.php
 create mode 100644 application/views/scripts/about/index.phtml

diff --git a/application/controllers/AboutController.php b/application/controllers/AboutController.php
new file mode 100644
index 000000000..6572d7e8b
--- /dev/null
+++ b/application/controllers/AboutController.php
@@ -0,0 +1,91 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+# namespace Icinga\Application\Controllers;
+
+use Icinga\Web\Controller\ActionController;
+use Icinga\Application\Icinga;
+use Icinga\Exception\IcingaException;
+
+class AboutController extends ActionController
+{
+    public function indexAction()
+    {
+        $this->view->appVersion = null;
+        $this->view->gitCommitID = null;
+        $this->view->gitCommitDate = null;
+
+        if (false !== ($appVersion = @file(
+            Icinga::app()->getApplicationDir() . DIRECTORY_SEPARATOR . 'VERSION',
+            FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES
+        ))) {
+            foreach ($appVersion as $av) {
+                $matches = array();
+                if (false === ($res = preg_match(
+                    '/(?<!.)\s*(.+?)\s*:\s*(.+?)\s*(?!.)/ms', $av, $matches
+                ))) {
+                    throw new IcingaException('Failed at preg_match()');
+                }
+                if ($res === 0) {
+                    continue;
+                }
+
+                switch ($matches[1]) {
+                    case 'GitCommitID':
+                        if ($this->view->gitCommitID !== null) {
+                            break;
+                        }
+
+                        $matches2 = array();
+                        if (false === ($res = preg_match(
+                            '/(?<!.)(.+?)(?:\s*\(\s*(.+?)\s*\))?(?!.)/ms',
+                            $matches[2],
+                            $matches2
+                        ))) {
+                            throw new IcingaException('Failed at preg_match()');
+                        }
+                        if ($res === 0) {
+                            break;
+                        }
+
+                        $this->view->gitCommitID = $matches2[1];
+                        if (! isset($matches2[2])) {
+                            break;
+                        }
+
+                        foreach (preg_split(
+                            '/\s*,\s*/', $matches2[2], -1, PREG_SPLIT_NO_EMPTY
+                        ) as $refName) {
+                            $matches3 = array();
+                            if (false === ($res = preg_match(
+                                '/(?<!.)tag\s*:\s*v(.+?)(?!.)/ms',
+                                $refName,
+                                $matches3
+                            ))) {
+                                throw new IcingaException('Failed at preg_match()');
+                            }
+                            if ($res === 1) {
+                                $this->view->appVersion = $matches3[1];
+                                break;
+                            }
+                        }
+                        break;
+                    case 'GitCommitDate':
+                        if ($this->view->gitCommitDate !== null) {
+                            break;
+                        }
+
+                        $matches2 = array();
+                        if (false === ($res = preg_match(
+                            '/(?<!.)(\S+)/ms', $matches[2], $matches2
+                        ))) {
+                            throw new IcingaException('Failed at preg_match()');
+                        }
+                        if ($res === 1) {
+                            $this->view->gitCommitDate = $matches2[1];
+                        }
+                }
+            }
+        }
+    }
+}
diff --git a/application/views/scripts/about/index.phtml b/application/views/scripts/about/index.phtml
new file mode 100644
index 000000000..0429a5374
--- /dev/null
+++ b/application/views/scripts/about/index.phtml
@@ -0,0 +1,20 @@
+<div class="content">
+    <h1>Icinga Web 2</h1>
+    <?php
+    $versionInfo = array();
+    foreach (array(
+        array($this->translate('Version: %s'),          $appVersion),
+        array($this->translate('Git commit ID: %s'),    $gitCommitID),
+        array($this->translate('Git commit date: %s'),  $gitCommitDate)
+    ) as $version) {
+        list($label, $value) = $version;
+        if ($value !== null) {
+            $versionInfo[] = sprintf($label, htmlspecialchars($value));
+        }
+    }
+    ?>
+    <p><?= 0 === count($versionInfo)
+        ? $this->translate('unknown version')
+        : nl2br(implode("\n", $versionInfo), false)
+    ?></p>
+</div>

From ff01ee4f2007cd9e2fba2d2eabbc17e158c5e098 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 2 Jun 2015 17:07:34 +0200
Subject: [PATCH 1946/2920] Move perfdata table left to save horizontal space

refs #8334
---
 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 b442723cb..8dd0f1405 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -142,6 +142,10 @@ table.objectstate tr.state.handled td.state {
 table.perfdata {
   min-width: 24em;
   font-size: 0.9em;
+  position: relative;
+  top: 1.8em;
+  left: -2.6em;
+  margin-bottom: 1.8em;
 }
 
 table.perfdata th {

From 1e8151bed32398a27b0980e57fb8a54b8f5bc081 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 2 Jun 2015 17:09:40 +0200
Subject: [PATCH 1947/2920] Limit perfdata label size

Add paratentheses when perfdata label size exceeds a certain limit. Display the full label as tooltip.

refs #8334
---
 library/Icinga/Util/String.php                | 20 +++++++++++++++++++
 .../application/views/helpers/Perfdata.php    | 10 ++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Util/String.php b/library/Icinga/Util/String.php
index 0d42d0e76..d67035b3f 100644
--- a/library/Icinga/Util/String.php
+++ b/library/Icinga/Util/String.php
@@ -54,6 +54,26 @@ class String
         return $string;
     }
 
+    /**
+     * Add ellipsis in the center of a string when a string is longer than max length
+     *
+     * @param   string  $string
+     * @param   int     $maxLength
+     * @param   string  $ellipsis
+     *
+     * @return  string
+     */
+    public static function ellipsisCenter($string, $maxLength, $ellipsis = '...')
+    {
+        $start = ceil($maxLength / 2.0);
+        $end = floor($maxLength / 2.0);
+        if (strlen($string) > $maxLength) {
+            return substr($string, 0, $start - strlen($ellipsis)) . $ellipsis . substr($string, - $end);
+        }
+
+        return $string;
+    }
+
     /**
      * Find and return all similar strings in $possibilites matching $string with the given minimum $similarity
      *
diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 5e17adea5..9c6a11d05 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -3,6 +3,7 @@
 
 use Icinga\Module\Monitoring\Plugin\Perfdata;
 use Icinga\Module\Monitoring\Plugin\PerfdataSet;
+use Icinga\Util\String;
 
 class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
 {
@@ -47,7 +48,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
                 $columns[$column] = $labels[$column];
             }
         }
-        // restore original column array sorting sorting
+        // restore original column array sorting
         $headers = array();
         foreach ($keys as $i => $column) {
             if (isset($columns[$column])) {
@@ -70,7 +71,12 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
                         if (! isset($columns[$column])) {
                             continue;
                         }
-                        $data []= empty($value) ? '-' : (string) $value;
+                        $text = $this->view->escape(empty($value) ? '-' : $value);
+                        $data []= sprintf(
+                            '<span title="%s">%s</span>',
+                            $text,
+                            String::ellipsisCenter($text, 24)
+                        );
                     }
                 }
                 $table []= '<tr><td>' . implode('</td><td>', $data) . '</td></tr>';

From 5b8de49cdf46ad6499f33a90252e5822cb83fc82 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 2 Jun 2015 17:16:27 +0200
Subject: [PATCH 1948/2920] Link to the about page

refs #9247
---
 library/Icinga/Web/Menu.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 63d92fc9f..45dd2dd9c 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -279,6 +279,11 @@ class Menu implements RecursiveIterator
                 'priority' => 990,
                 'renderer' => 'ForeignMenuItemRenderer'
             ));
+
+            $this->add(t('About'), array(
+                'url'       => 'about',
+                'priority'  => 1000
+            ));
         }
     }
 

From 198834294f979a9537ec228432f55983161d8aa7 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 2 Jun 2015 17:30:24 +0200
Subject: [PATCH 1949/2920] Fix table position for perfdata without piecharts

refs #8334
---
 .../monitoring/application/views/helpers/Perfdata.php  | 10 ++++++++--
 public/css/icinga/main-content.less                    |  7 ++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 9c6a11d05..76e6518ec 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -94,8 +94,14 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
         if ($compact) {
             return join('', $results);
         } else {
-            $pieCharts = empty($table) ? '' : '<table class="perfdata">' . implode("\n", $table) . '</table>';
-            return $pieCharts;
+            if (empty($table)) {
+                return '';
+            }
+            return sprintf(
+                '<table class="perfdata %s">%s</table>',
+                isset($columns['']) ? 'perfdata-piecharts' : '',
+                implode("\n", $table)
+            );
         }
     }
 }
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 8dd0f1405..f05f08886 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -142,10 +142,11 @@ table.objectstate tr.state.handled td.state {
 table.perfdata {
   min-width: 24em;
   font-size: 0.9em;
-  position: relative;
-  top: 1.8em;
+}
+
+table.perfdata.perfdata-piecharts {
   left: -2.6em;
-  margin-bottom: 1.8em;
+  position: relative;
 }
 
 table.perfdata th {

From ab129d094bd5e4335f13b489be55030c2ec3daa9 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 2 Jun 2015 17:50:31 +0200
Subject: [PATCH 1950/2920] remove unneeded code

---
 modules/monitoring/application/views/helpers/Perfdata.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 76e6518ec..092aeff0f 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -50,7 +50,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
         }
         // restore original column array sorting
         $headers = array();
-        foreach ($keys as $i => $column) {
+        foreach ($keys as $column) {
             if (isset($columns[$column])) {
                 $headers[$column] = $labels[$column];
             }
@@ -63,7 +63,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
                 $data = array();
                 if ($perfdata->isVisualizable()) {
                     $data []= $perfdata->asInlinePie($color)->render() . '&nbsp;';
-                } else if (isset($columns[''])) {
+                } elseif (isset($columns[''])) {
                     $data []= '';
                 }
                 if (! $compact) {

From dd7cbf4b6927fb573a105a5978c5a7981b649d9d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 3 Jun 2015 08:54:56 +0200
Subject: [PATCH 1951/2920] User-/GroupController: Create tabs as early as
 possible

fixes #9350
---
 application/controllers/GroupController.php | 2 +-
 application/controllers/UserController.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 70954aaf1..1e7090019 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -23,6 +23,7 @@ class GroupController extends AuthBackendController
     public function listAction()
     {
         $this->assertPermission('config/authentication/groups/show');
+        $this->createListTabs()->activate('group/list');
         $backendNames = array_map(
             function ($b) { return $b->getName(); },
             $this->loadUserGroupBackends('Icinga\Data\Selectable')
@@ -60,7 +61,6 @@ class GroupController extends AuthBackendController
 
         $this->view->groups = $query;
         $this->view->backend = $backend;
-        $this->createListTabs()->activate('group/list');
 
         $this->setupPaginationControl($query);
         $this->setupLimitControl();
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index c71fe9696..6fec397cd 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -23,6 +23,7 @@ class UserController extends AuthBackendController
     public function listAction()
     {
         $this->assertPermission('config/authentication/users/show');
+        $this->createListTabs()->activate('user/list');
         $backendNames = array_map(
             function ($b) { return $b->getName(); },
             $this->loadUserBackends('Icinga\Data\Selectable')
@@ -60,7 +61,6 @@ class UserController extends AuthBackendController
 
         $this->view->users = $query;
         $this->view->backend = $backend;
-        $this->createListTabs()->activate('user/list');
 
         $this->setupPaginationControl($query);
         $this->setupLimitControl();

From 916a26572becebe483462b506d0f7acd3ef9824c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 3 Jun 2015 09:16:05 +0200
Subject: [PATCH 1952/2920] User-/GroupController: Register search columns to
 support quick searches

fixes #9353
---
 application/controllers/GroupController.php | 1 +
 application/controllers/UserController.php  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 1e7090019..8f2c33e62 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -53,6 +53,7 @@ class GroupController extends AuthBackendController
         $query = $backend->select(array('group_name'));
         $filterEditor = Widget::create('filterEditor')
             ->setQuery($query)
+            ->setSearchColumns(array('group', 'user'))
             ->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
             ->ignoreParams('page')
             ->handleRequest($this->getRequest());
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 6fec397cd..e944af52c 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -53,6 +53,7 @@ class UserController extends AuthBackendController
         $query = $backend->select(array('user_name'));
         $filterEditor = Widget::create('filterEditor')
             ->setQuery($query)
+            ->setSearchColumns(array('user'))
             ->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
             ->ignoreParams('page')
             ->handleRequest($this->getRequest());

From 798f4adc3454621663edf214bcaa3e1f9ee30ae8 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 11:40:03 +0200
Subject: [PATCH 1953/2920] monitoring: Add query for the host group summary

refs #9009
---
 .../Ido/Query/HostgroupsummaryQuery.php       | 151 ++++++++++++++++++
 1 file changed, 151 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
new file mode 100644
index 000000000..eee708fa1
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
@@ -0,0 +1,151 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+use Icinga\Data\Filter\Filter;
+use Zend_Db_Expr;
+use Zend_Db_Select;
+
+/**
+ * Query for host and service group summaries
+ */
+class HostgroupsummaryQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'hoststatussummary' => array(
+            'hostgroup'                                     => 'hostgroup COLLATE latin1_general_ci',
+            'hostgroup_alias'                               => 'hostgroup_alias COLLATE latin1_general_ci',
+            'hostgroup_name'                                => 'hostgroup_name',
+            'hosts_down'                                    => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 THEN 1 ELSE 0 END)',
+            'hosts_down_handled'                            => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND handled != 0 THEN 1 ELSE 0 END)',
+            'hosts_down_handled_last_state_change'          => 'MAX(CASE WHEN object_type = \'host\' AND state = 1 AND handled != 0 THEN state_change ELSE 0 END)',
+            'hosts_down_unhandled'                          => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND handled = 0 THEN 1 ELSE 0 END)',
+            'hosts_down_unhandled_last_state_change'        => 'MAX(CASE WHEN object_type = \'host\' AND state = 1 AND handled = 0 THEN state_change ELSE 0 END)',
+            'hosts_pending'                                 => 'SUM(CASE WHEN object_type = \'host\' AND state = 99 THEN 1 ELSE 0 END)',
+            'hosts_pending_last_state_change'               => 'MAX(CASE WHEN object_type = \'host\' AND state = 99 THEN state_change ELSE 0 END)',
+            'hosts_severity'                                => 'MAX(CASE WHEN object_type = \'host\' THEN severity ELSE 0 END)',
+            'hosts_total'                                   => 'SUM(CASE WHEN object_type = \'host\' THEN 1 ELSE 0 END)',
+            'hosts_unreachable'                             => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 THEN 1 ELSE 0 END)',
+            'hosts_unreachable_handled'                     => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 AND handled != 0 THEN 1 ELSE 0 END)',
+            'hosts_unreachable_handled_last_state_change'   => 'MAX(CASE WHEN object_type = \'host\' AND state = 2 AND handled != 0 THEN state_change ELSE 0 END)',
+            'hosts_unreachable_unhandled'                   => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 AND handled = 0 THEN 1 ELSE 0 END)',
+            'hosts_unreachable_unhandled_last_state_change' => 'MAX(CASE WHEN object_type = \'host\' AND state = 2 AND handled = 0 THEN state_change ELSE 0 END)',
+            'hosts_up'                                      => 'SUM(CASE WHEN object_type = \'host\' AND state = 0 THEN 1 ELSE 0 END)',
+            'hosts_up_last_state_change'                    => 'MAX(CASE WHEN object_type = \'host\' AND state = 0 THEN state_change ELSE 0 END)',
+            'services_critical'                             => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 THEN 1 ELSE 0 END)',
+            'services_critical_handled'                     => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND handled + host_state > 0 THEN 1 ELSE 0 END)',
+            'services_critical_handled_last_state_change'   => 'MAX(CASE WHEN object_type = \'service\' AND state = 2 AND handled + host_state > 0 THEN state_change ELSE 0 END)',
+            'services_critical_unhandled'                   => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND handled + host_state = 0 THEN 1 ELSE 0 END)',
+            'services_critical_unhandled_last_state_change' => 'MAX(CASE WHEN object_type = \'service\' AND state = 2 AND handled + host_state = 0 THEN state_change ELSE 0 END)',
+            'services_ok'                                   => 'SUM(CASE WHEN object_type = \'service\' AND state = 0 THEN 1 ELSE 0 END)',
+            'services_ok_last_state_change'                 => 'MAX(CASE WHEN object_type = \'service\' AND state = 0 THEN state_change ELSE 0 END)',
+            'services_pending'                              => 'SUM(CASE WHEN object_type = \'service\' AND state = 99 THEN 1 ELSE 0 END)',
+            'services_pending_last_state_change'            => 'MAX(CASE WHEN object_type = \'service\' AND state = 99 THEN state_change ELSE 0 END)',
+            'services_severity'                             => 'MAX(CASE WHEN object_type = \'service\' THEN severity ELSE 0 END)',
+            'services_total'                                => 'SUM(CASE WHEN object_type = \'service\' THEN 1 ELSE 0 END)',
+            'services_unknown'                              => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 THEN 1 ELSE 0 END)',
+            'services_unknown_handled'                      => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND handled + host_state > 0 THEN 1 ELSE 0 END)',
+            'services_unknown_handled_last_state_change'    => 'MAX(CASE WHEN object_type = \'service\' AND state = 3 AND handled + host_state > 0 THEN state_change ELSE 0 END)',
+            'services_unknown_unhandled'                    => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND handled + host_state = 0 THEN 1 ELSE 0 END)',
+            'services_unknown_unhandled_last_state_change'  => 'MAX(CASE WHEN object_type = \'service\' AND state = 3 AND handled + host_state = 0 THEN state_change ELSE 0 END)',
+            'services_warning'                              => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 THEN 1 ELSE 0 END)',
+            'services_warning_handled'                      => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND handled + host_state > 0 THEN 1 ELSE 0 END)',
+            'services_warning_handled_last_state_change'    => 'MAX(CASE WHEN object_type = \'service\' AND state = 1 AND handled + host_state > 0 THEN state_change ELSE 0 END)',
+            'services_warning_unhandled'                    => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND handled + host_state = 0 THEN 1 ELSE 0 END)',
+            'services_warning_unhandled_last_state_change'  => 'MAX(CASE WHEN object_type = \'service\' AND state = 1 AND handled + host_state = 0 THEN state_change ELSE 0 END)'
+        )
+    );
+
+    /**
+     * The union
+     *
+     * @var Zend_Db_Select
+     */
+    protected $summaryQuery;
+
+    /**
+     * Subqueries used for the summary query
+     *
+     * @var IdoQuery[]
+     */
+    protected $subQueries = array();
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addFilter(Filter $filter)
+    {
+        foreach ($this->subQueries as $sub) {
+            $sub->applyFilter(clone $filter);
+        }
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        // TODO(el): Allow to switch between hard and soft states
+        $hosts = $this->createSubQuery(
+            'Hoststatus',
+            array(
+                'handled'       => 'host_handled',
+                'host_state'    => new Zend_Db_Expr('NULL'),
+                'hostgroup_alias',
+                'hostgroup_name',
+                'object_type',
+                'severity'      => 'host_severity',
+                'state'         => 'host_hard_state',
+                'state_change'  => 'host_last_hard_state_change'
+            )
+        );
+        $this->subQueries[] = $hosts;
+        $services = $this->createSubQuery(
+            'Servicestatus',
+            array(
+                'handled'       => 'service_handled',
+                'host_state'    => 'host_hard_state',
+                'hostgroup_alias',
+                'hostgroup_name',
+                'object_type',
+                'severity'      => new Zend_Db_Expr('NULL'),
+                'state'         => 'service_hard_state',
+                'state_change'  => 'service_last_hard_state_change'
+            )
+        );
+        $this->subQueries[] = $services;
+        $this->summaryQuery = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL);
+        $this->select->from(array('statussummary' => $this->summaryQuery), array())->group('hostgroup_name');
+        $this->joinedVirtualTables['hoststatussummary'] = true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function order($columnOrAlias, $dir = null)
+    {
+        if (! $this->hasAliasName($columnOrAlias)) {
+            foreach ($this->subQueries as $sub) {
+                $sub->requireColumn($columnOrAlias);
+            }
+        }
+        return parent::order($columnOrAlias, $dir);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function where($condition, $value = null)
+    {
+        $this->requireColumn($condition);
+        foreach ($this->subQueries as $sub) {
+            $sub->where($condition, $value);
+        }
+        return $this;
+    }
+}

From 4b2c83fbf72ecd634ad52fdbab42442d1fad1a13 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 11:40:55 +0200
Subject: [PATCH 1954/2920] monitoring: Use the host group summary query

refs #9009
---
 .../library/Monitoring/DataView/Hostgroupsummary.php      | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
index 63c04df79..31a1ae035 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
@@ -50,14 +50,6 @@ class Hostgroupsummary extends DataView
         return array('hostgroup');
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function getQueryName()
-    {
-        return 'groupsummary';
-    }
-
     /**
      * {@inheritdoc}
      */

From 947b5436c37188e7b35b3623d691c42cc3335d17 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 11:41:31 +0200
Subject: [PATCH 1955/2920] monitoring: Fix host group summary select columns

refs #9009
---
 .../monitoring/application/controllers/ListController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index fa9c25546..d470d6498 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -525,15 +525,15 @@ class Monitoring_ListController extends Controller
             'hostgroup_alias',
             'hostgroup_name',
             'hosts_down_handled',
-            'hosts_down_last_state_change_handled',
-            'hosts_down_last_state_change_unhandled',
+            'hosts_down_last_state_change_handled'  => 'hosts_down_handled_last_state_change',
+            'hosts_down_last_state_change_unhandled' => 'hosts_down_unhandled_last_state_change',
             'hosts_down_unhandled',
             'hosts_pending',
             'hosts_pending_last_state_change',
             'hosts_total',
             'hosts_unreachable_handled',
-            'hosts_unreachable_last_state_change_handled',
-            'hosts_unreachable_last_state_change_unhandled',
+            'hosts_unreachable_last_state_change_handled' => 'hosts_unreachable_handled_last_state_change',
+            'hosts_unreachable_last_state_change_unhandled' => 'hosts_unreachable_unhandled_last_state_change',
             'hosts_unreachable_unhandled',
             'hosts_up',
             'hosts_up_last_state_change',

From 761de2eb33e1bab7df830bf014c67b9a2f0b93be Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 11:48:14 +0200
Subject: [PATCH 1956/2920] monitoring: Fix a join condition in the host status
 query

refs #9009
---
 .../library/Monitoring/Backend/Ido/Query/HoststatusQuery.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index e630727d4..ca7089e79 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -336,7 +336,7 @@ SQL;
             array()
         )->join(
             array('so' => $this->prefix . 'objects'),
-            'so.object_id = s.service_object_id AND so.is_active = 1',
+            'so.object_id = s.service_object_id',
             array()
         )->where(
             'so.is_active = ?',

From 71f19b2cc6d8a0f19e861bb5b5ce7b496cadf1bf Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 11:48:34 +0200
Subject: [PATCH 1957/2920] monitoring: Add missing columns to the service
 status query

refs #9009
---
 .../Monitoring/Backend/Ido/Query/ServicestatusQuery.php     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
index 990e5a9b2..78e4053b3 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -139,7 +139,11 @@ class ServicestatusQuery extends IdoQuery
             'service_notes_url'      => 's.notes_url'
         ),
         'servicestatus' => array(
-            'service_state'          => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END'
+            'service_handled'                   => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN 1 ELSE 0 END',
+            'service_hard_state'                => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE CASE WHEN ss.state_type = 1 THEN ss.current_state ELSE ss.last_hard_state END END',
+            'service_last_hard_state_change'    => 'UNIX_TIMESTAMP(ss.last_hard_state_change)',
+            'service_state'                     => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END',
+            'service_unhandled'                 => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END'
         )
     );
 

From 69264522688ba640eb8496da8d430d507b2e9de6 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 11:49:21 +0200
Subject: [PATCH 1958/2920] monitoring: Add restrictable filter columns to the
 host group summary

refs #9009
---
 .../Monitoring/DataView/Hostgroupsummary.php      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
index 31a1ae035..56ae7be35 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
@@ -17,17 +17,16 @@ class Hostgroupsummary extends DataView
             'hostgroup_alias',
             'hostgroup_name',
             'hosts_down_handled',
-            'hosts_down_last_state_change_handled',
-            'hosts_down_last_state_change_unhandled',
+            'hosts_down_handled_last_state_change',
             'hosts_down_unhandled',
+            'hosts_down_unhandled_last_state_change',
             'hosts_pending',
             'hosts_pending_last_state_change',
-            'hosts_severity',
             'hosts_total',
             'hosts_unreachable_handled',
-            'hosts_unreachable_last_state_change_handled',
-            'hosts_unreachable_last_state_change_unhandled',
+            'hosts_unreachable_handled_last_state_change',
             'hosts_unreachable_unhandled',
+            'hosts_unreachable_unhandled_last_state_change',
             'hosts_up',
             'hosts_up_last_state_change',
             'services_critical_handled',
@@ -47,7 +46,11 @@ class Hostgroupsummary extends DataView
      */
     public function getFilterColumns()
     {
-        return array('hostgroup');
+        return array(
+            'hosts_severity',
+            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+        );
     }
 
     /**

From c1c8c1c005dcc5f47ae091ee716c32bfa3bab7a5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 11:49:31 +0200
Subject: [PATCH 1959/2920] monitoring: Restrict the host group summary

refs #9009
---
 modules/monitoring/application/controllers/ListController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index d470d6498..741ca3360 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -548,6 +548,9 @@ class Monitoring_ListController extends Controller
             'services_warning_unhandled'
         ));
         $this->filterQuery($query);
+
+        $this->applyRestriction('monitoring/filter/objects', $query);
+
         $this->view->hostgroups = $query;
 
         $this->setupLimitControl();

From 8bc9e46757edd2df9bf6ba8aac2a928d731b9cf5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 12:21:29 +0200
Subject: [PATCH 1960/2920] monitoring: Don't select host counts in the service
 group overview

We're not showing the counts.

refs #9009
---
 .../monitoring/application/controllers/ListController.php   | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 741ca3360..f46370261 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -478,12 +478,6 @@ class Monitoring_ListController extends Controller
         $this->setAutorefreshInterval(12);
 
         $query = $this->backend->select()->from('servicegroupsummary', array(
-            'hosts_down_handled',
-            'hosts_down_unhandled',
-            'hosts_pending',
-            'hosts_unreachable_handled',
-            'hosts_unreachable_unhandled',
-            'hosts_up',
             'servicegroup_alias',
             'servicegroup_name',
             'services_critical_handled',

From 082f9b1edd9afb3e493d760a0abfd23759df31e1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 12:26:01 +0200
Subject: [PATCH 1961/2920] monitoring: Don't provide unnecessary columns in
 the host group summary query

refs #9009
---
 .../Backend/Ido/Query/HostgroupsummaryQuery.php        | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
index eee708fa1..42e379e01 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
@@ -8,7 +8,7 @@ use Zend_Db_Expr;
 use Zend_Db_Select;
 
 /**
- * Query for host and service group summaries
+ * Query for host group summary
  */
 class HostgroupsummaryQuery extends IdoQuery
 {
@@ -38,25 +38,17 @@ class HostgroupsummaryQuery extends IdoQuery
             'hosts_up_last_state_change'                    => 'MAX(CASE WHEN object_type = \'host\' AND state = 0 THEN state_change ELSE 0 END)',
             'services_critical'                             => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 THEN 1 ELSE 0 END)',
             'services_critical_handled'                     => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND handled + host_state > 0 THEN 1 ELSE 0 END)',
-            'services_critical_handled_last_state_change'   => 'MAX(CASE WHEN object_type = \'service\' AND state = 2 AND handled + host_state > 0 THEN state_change ELSE 0 END)',
             'services_critical_unhandled'                   => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND handled + host_state = 0 THEN 1 ELSE 0 END)',
-            'services_critical_unhandled_last_state_change' => 'MAX(CASE WHEN object_type = \'service\' AND state = 2 AND handled + host_state = 0 THEN state_change ELSE 0 END)',
             'services_ok'                                   => 'SUM(CASE WHEN object_type = \'service\' AND state = 0 THEN 1 ELSE 0 END)',
-            'services_ok_last_state_change'                 => 'MAX(CASE WHEN object_type = \'service\' AND state = 0 THEN state_change ELSE 0 END)',
             'services_pending'                              => 'SUM(CASE WHEN object_type = \'service\' AND state = 99 THEN 1 ELSE 0 END)',
-            'services_pending_last_state_change'            => 'MAX(CASE WHEN object_type = \'service\' AND state = 99 THEN state_change ELSE 0 END)',
             'services_severity'                             => 'MAX(CASE WHEN object_type = \'service\' THEN severity ELSE 0 END)',
             'services_total'                                => 'SUM(CASE WHEN object_type = \'service\' THEN 1 ELSE 0 END)',
             'services_unknown'                              => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 THEN 1 ELSE 0 END)',
             'services_unknown_handled'                      => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND handled + host_state > 0 THEN 1 ELSE 0 END)',
-            'services_unknown_handled_last_state_change'    => 'MAX(CASE WHEN object_type = \'service\' AND state = 3 AND handled + host_state > 0 THEN state_change ELSE 0 END)',
             'services_unknown_unhandled'                    => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND handled + host_state = 0 THEN 1 ELSE 0 END)',
-            'services_unknown_unhandled_last_state_change'  => 'MAX(CASE WHEN object_type = \'service\' AND state = 3 AND handled + host_state = 0 THEN state_change ELSE 0 END)',
             'services_warning'                              => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 THEN 1 ELSE 0 END)',
             'services_warning_handled'                      => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND handled + host_state > 0 THEN 1 ELSE 0 END)',
-            'services_warning_handled_last_state_change'    => 'MAX(CASE WHEN object_type = \'service\' AND state = 1 AND handled + host_state > 0 THEN state_change ELSE 0 END)',
             'services_warning_unhandled'                    => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND handled + host_state = 0 THEN 1 ELSE 0 END)',
-            'services_warning_unhandled_last_state_change'  => 'MAX(CASE WHEN object_type = \'service\' AND state = 1 AND handled + host_state = 0 THEN state_change ELSE 0 END)'
         )
     );
 

From d1bb19d0371db0d492d82f4918f743ca96b72674 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 12:48:04 +0200
Subject: [PATCH 1962/2920] monitoring: Add service status summary query

refs #9009
---
 .../Ido/Query/ServicestatussummaryQuery.php   | 186 ++++++++++++++++++
 1 file changed, 186 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php
new file mode 100644
index 000000000..0a04e9c41
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php
@@ -0,0 +1,186 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+/**
+ * Query for service status summary
+ *
+ * TODO(el): Allow to switch between hard and soft states
+ */
+class ServicestatussummaryQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
+        ),
+        'hosts' => array(
+            'host'              => 'so.name1 COLLATE latin1_general_ci',
+            'host_alias'        => 'h.alias COLLATE latin1_general_ci',
+            'host_display_name' => 'h.display_name COLLATE latin1_general_ci',
+            'host_name'         => 'so.name1'
+        ),
+        'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
+        ),
+        'services' => array(
+            'service_display_name' => 's.display_name COLLATE latin1_general_ci'
+        ),
+        'servicestatussummary' => array(
+            'object_type'                                   => '(\'service\')',
+            'service'                                       => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'                           => 'so.name2',
+            'service_host'                                  => 'so.name1 COLLATE latin1_general_ci',
+            'service_host_name'                             => 'so.name1',
+            'services_critical'                             => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 2 THEN 1 ELSE 0 END END)',
+            'services_critical_handled'                     => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 2 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN 1 ELSE 0 END END)',
+            'services_critical_handled_last_state_change'   => 'MAX(CASE WHEN ss.has_been_checked != 1 THEN NULL ELSE CASE WHEN ss.current_state = 2 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN UNIX_TIMESTAMP(ss.last_state_change) ELSE NULL END END)',
+            'services_critical_unhandled'                   => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 2 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END END)',
+            'services_critical_unhandled_last_state_change' => 'MAX(CASE WHEN ss.has_been_checked != 1 THEN NULL ELSE CASE WHEN ss.current_state = 2 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) = 0 THEN UNIX_TIMESTAMP(ss.last_state_change) ELSE NULL END END)',
+            'services_ok'                                   => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 0 THEN 1 ELSE 0 END END)',
+            'services_ok_last_state_change'                 => 'MAX(CASE WHEN ss.has_been_checked != 1 THEN NULL ELSE CASE WHEN ss.current_state = 0 THEN UNIX_TIMESTAMP(ss.last_state_change) ELSE NULL END END)',
+            'services_pending'                              => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 1 ELSE 0 END)',
+            'services_pending_last_state_change'            => 'MAX(CASE WHEN ss.has_been_checked != 1 THEN UNIX_TIMESTAMP(ss.last_state_change) ELSE NULL END)',
+            'services_total'                                => 'SUM(1)',
+            'services_unknown'                              => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 3 THEN 1 ELSE 0 END END)',
+            'services_unknown_handled'                      => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 3 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN 1 ELSE 0 END END)',
+            'services_unknown_handled_last_state_change'    => 'MAX(CASE WHEN ss.has_been_checked != 1 THEN NULL ELSE CASE WHEN ss.current_state = 3 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN UNIX_TIMESTAMP(ss.last_state_change) ELSE NULL END END)',
+            'services_unknown_unhandled'                    => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 3 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END END)',
+            'services_unknown_unhandled_last_state_change'  => 'MAX(CASE WHEN ss.has_been_checked != 1 THEN NULL ELSE CASE WHEN ss.current_state = 3 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) = 0 THEN UNIX_TIMESTAMP(ss.last_state_change) ELSE NULL END END)',
+            'services_warning'                              => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 1 THEN 1 ELSE 0 END END)',
+            'services_warning_handled'                      => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 1 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN 1 ELSE 0 END END)',
+            'services_warning_handled_last_state_change'    => 'MAX(CASE WHEN ss.has_been_checked != 1 THEN NULL ELSE CASE WHEN ss.current_state = 1 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN UNIX_TIMESTAMP(ss.last_state_change) ELSE NULL END END)',
+            'services_warning_unhandled'                    => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 1 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END END)',
+            'services_warning_unhandled_last_state_change'  => 'MAX(CASE WHEN ss.has_been_checked != 1 THEN NULL ELSE CASE WHEN ss.current_state = 1 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) = 0 THEN UNIX_TIMESTAMP(ss.last_state_change) ELSE NULL END END)'
+        )
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        $this->select->from(
+            array('so' => $this->prefix . 'objects'),
+            array()
+        )->join(
+            array('ss' => $this->prefix . 'servicestatus'),
+            'ss.service_object_id = so.object_id',
+            array()
+        )->where(
+            'so.is_active = ?',
+            1
+        )->where(
+            'so.objecttype_id = ?',
+            2
+        );
+        $this->joinedVirtualTables['servicestatussummary'] = true;
+    }
+
+    /**
+     * Join host groups
+     */
+    protected function joinHostgroups()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = s.host_object_id',
+            array()
+        )->join(
+            array('hg' => $this->prefix . 'hostgroups'),
+            'hg.hostgroup_id = hgm.hostgroup_id',
+            array()
+        )->join(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hg.hostgroup_object_id',
+            array()
+        )->where(
+            'hgo.is_active = ?',
+            1
+        )->where(
+            'hgo.objecttype_id = ?',
+            3
+        );
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = s.host_object_id',
+            array()
+        );
+        // TODO(el): Join host objects for is_active check?
+    }
+
+    /**
+     * Join host status
+     */
+    protected function joinHoststatus()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('hs' => $this->prefix . 'hoststatus'),
+            'hs.host_object_id = s.host_object_id',
+            array()
+        );
+        // TODO(el): Join host objects for is_active check?
+    }
+
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->select->join(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = so.object_id',
+            array()
+        )->join(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
+            array()
+        )->join(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id',
+            array()
+        )->where(
+            'sgo.is_active = ?',
+            1
+        )
+        ->where(
+            'sgo.objecttype_id = ?',
+            4
+        )
+        ->group('sgo.name1');
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $this->select->join(
+            array('s' => $this->prefix . 'services'),
+            's.service_object_id = so.object_id',
+            array()
+        );
+    }
+}

From a8b925e2ec8925a9787f23716f51981a0cb37e92 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 12:48:22 +0200
Subject: [PATCH 1963/2920] monitoring: Use the service status summary query in
 the service groups overview

refs #9009
---
 .../library/Monitoring/DataView/Servicegroupsummary.php   | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
index 11d6ec07e..b37af02aa 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
@@ -11,12 +11,6 @@ class Servicegroupsummary extends DataView
     public function getColumns()
     {
         return array(
-            'hosts_down_handled',
-            'hosts_down_unhandled',
-            'hosts_pending',
-            'hosts_unreachable_handled',
-            'hosts_unreachable_unhandled',
-            'hosts_up',
             'servicegroup_alias',
             'servicegroup_name',
             'services_critical_handled',
@@ -53,7 +47,7 @@ class Servicegroupsummary extends DataView
      */
     public static function getQueryName()
     {
-        return 'groupsummary';
+        return 'servicestatussummary';
     }
 
     /**

From 6588c73b4e038fb209c42afebc0bd5b8359c1451 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 12:53:56 +0200
Subject: [PATCH 1964/2920] monitoring: Add restrictable filter columns to the
 service group summary

refs #9009
---
 .../DataView/Servicegroupsummary.php          | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
index b37af02aa..37045a4d5 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
@@ -3,6 +3,9 @@
 
 namespace Icinga\Module\Monitoring\DataView;
 
+/**
+ * Data view for service group summaries
+ */
 class Servicegroupsummary extends DataView
 {
     /**
@@ -14,23 +17,22 @@ class Servicegroupsummary extends DataView
             'servicegroup_alias',
             'servicegroup_name',
             'services_critical_handled',
-            'services_critical_last_state_change_handled',
-            'services_critical_last_state_change_unhandled',
+            'services_critical_handled_last_state_change',
             'services_critical_unhandled',
+            'services_critical_unhandled_last_state_change',
             'services_ok',
             'services_ok_last_state_change',
             'services_pending',
             'services_pending_last_state_change',
-            'services_severity',
             'services_total',
             'services_unknown_handled',
-            'services_unknown_last_state_change_handled',
-            'services_unknown_last_state_change_unhandled',
+            'services_unknown_handled_last_state_change',
             'services_unknown_unhandled',
+            'services_unknown_unhandled_last_state_change',
             'services_warning_handled',
-            'services_warning_last_state_change_handled',
-            'services_warning_last_state_change_unhandled',
-            'services_warning_unhandled'
+            'services_warning_handled_last_state_change',
+            'services_warning_unhandled',
+            'services_warning_unhandled_last_state_change'
         );
     }
 
@@ -39,7 +41,11 @@ class Servicegroupsummary extends DataView
      */
     public function getFilterColumns()
     {
-        return array('servicegroup');
+        return array(
+            'services_severity',
+            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+        );
     }
 
     /**

From fe488c7b77e3ece1d89395bb6213738724189773 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 12:54:25 +0200
Subject: [PATCH 1965/2920] monitoring: Restrict the service group overview

refs #9009
---
 .../application/controllers/ListController.php    | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index f46370261..5f5162532 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -481,8 +481,8 @@ class Monitoring_ListController extends Controller
             'servicegroup_alias',
             'servicegroup_name',
             'services_critical_handled',
-            'services_critical_last_state_change_handled',
-            'services_critical_last_state_change_unhandled',
+            'services_critical_last_state_change_handled' => 'services_critical_handled_last_state_change',
+            'services_critical_last_state_change_unhandled' => 'services_critical_unhandled_last_state_change',
             'services_critical_unhandled',
             'services_ok',
             'services_ok_last_state_change',
@@ -490,15 +490,18 @@ class Monitoring_ListController extends Controller
             'services_pending_last_state_change',
             'services_total',
             'services_unknown_handled',
-            'services_unknown_last_state_change_handled',
-            'services_unknown_last_state_change_unhandled',
+            'services_unknown_last_state_change_handled' => 'services_unknown_handled_last_state_change',
+            'services_unknown_last_state_change_unhandled' => 'services_unknown_unhandled_last_state_change',
             'services_unknown_unhandled',
             'services_warning_handled',
-            'services_warning_last_state_change_handled',
-            'services_warning_last_state_change_unhandled',
+            'services_warning_last_state_change_handled' => 'services_warning_handled_last_state_change',
+            'services_warning_last_state_change_unhandled' => 'services_warning_unhandled_last_state_change',
             'services_warning_unhandled'
         ));
         $this->filterQuery($query);
+
+        $this->applyRestriction('monitoring/filter/objects', $query);
+
         $this->view->servicegroups = $query;
 
         $this->setupLimitControl();

From 8e88864f4a0ef2bb89d7348ac7ce015416fb2667 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 12:54:51 +0200
Subject: [PATCH 1966/2920] monitoring: Fix host columns of the service status
 query

refs #9009
---
 .../Backend/Ido/Query/ServicestatusQuery.php  | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
index 78e4053b3..7c099b058 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -3,6 +3,9 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
+/**
+ * Query for service status
+ */
 class ServicestatusQuery extends IdoQuery
 {
     /**
@@ -20,17 +23,14 @@ class ServicestatusQuery extends IdoQuery
             'hostgroup_name'    => 'hgo.name1'
         ),
         'hosts' => array(
-            'host'                  => 'so.name1 COLLATE latin1_general_ci',
             'host_action_url'       => 'h.action_url',
             'host_address'          => 'h.address',
-            'host_alias'            => 'h.alias',
+            'host_alias'            => 'h.alias COLLATE latin1_general_ci',
             'host_display_name'     => 'h.display_name COLLATE latin1_general_ci',
             'host_icon_image'       => 'h.icon_image',
             'host_icon_image_alt'   => 'h.icon_image_alt',
             'host_ipv4'             => 'INET_ATON(h.address)',
-            'host_name'             => 'so.name1',
-            'host_notes_url'        => 'h.notes_url',
-            'object_type'           => '(\'host\')'
+            'host_notes_url'        => 'h.notes_url'
         ),
         'hoststatus' => array(
             'host_acknowledged'                     => 'hs.problem_has_been_acknowledged',
@@ -127,16 +127,18 @@ class ServicestatusQuery extends IdoQuery
             'host_unhandled'            => 'CASE WHEN (hs.problem_has_been_acknowledged + hs.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END'
         ),
         'services' => array(
-            'object_type'            => '(\'service\')',
-            'service'                => 'so.name2 COLLATE latin1_general_ci',
-            'service_action_url'     => 's.action_url',
-            'service_description'    => 'so.name2',
-            'service_display_name'   => 's.display_name COLLATE latin1_general_ci',
-            'service_host'           => 'so.name1 COLLATE latin1_general_ci',
-            'service_host_name'      => 'so.name1',
-            'service_icon_image'     => 's.icon_image',
-            'service_icon_image_alt' => 's.icon_image_alt',
-            'service_notes_url'      => 's.notes_url'
+            'host'                      => 'so.name1 COLLATE latin1_general_ci',
+            'host_name'                 => 'so.name1',
+            'object_type'               => '(\'service\')',
+            'service'                   => 'so.name2 COLLATE latin1_general_ci',
+            'service_action_url'        => 's.action_url',
+            'service_description'       => 'so.name2',
+            'service_display_name'      => 's.display_name COLLATE latin1_general_ci',
+            'service_host'              => 'so.name1 COLLATE latin1_general_ci',
+            'service_host_name'         => 'so.name1',
+            'service_icon_image'        => 's.icon_image',
+            'service_icon_image_alt'    => 's.icon_image_alt',
+            'service_notes_url'         => 's.notes_url'
         ),
         'servicestatus' => array(
             'service_handled'                   => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN 1 ELSE 0 END',

From ae7861344388d986d3b95e3179c9919cae7cbb3c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 14:13:15 +0200
Subject: [PATCH 1967/2920] lib: Add sub query mode to the DbQuery

refs #9009
---
 library/Icinga/Data/Db/DbQuery.php | 33 +++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index 4fa7f132d..42937147b 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -23,6 +23,15 @@ class DbQuery extends SimpleQuery
      */
     protected $db;
 
+    /**
+     * Whether or not the query is a sub query
+     *
+     * Sub queries are automatically wrapped in parentheses
+     *
+     * @var bool
+     */
+    protected $isSubQuery = false;
+
     /**
      * Select query
      *
@@ -71,6 +80,27 @@ class DbQuery extends SimpleQuery
         parent::init();
     }
 
+    /**
+     * Get whether or not the query is a sub query
+     */
+    public function getIsSubQuery()
+    {
+        return $this->isSubQuery;
+    }
+
+    /**
+     * Set whether or not the query is a sub query
+     *
+     * @param   bool $isSubQuery
+     *
+     * @return  $this
+     */
+    public function setIsSubQuery($isSubQuery = true)
+    {
+        $this->isSubQuery = (bool) $isSubQuery;
+        return $this;
+    }
+
     public function setUseSubqueryCount($useSubqueryCount = true)
     {
         $this->useSubqueryCount = $useSubqueryCount;
@@ -331,7 +361,8 @@ class DbQuery extends SimpleQuery
      */
     public function __toString()
     {
-        return (string) $this->getSelectQuery();
+        $select = (string) $this->getSelectQuery();
+        return $this->getIsSubQuery() ? ('(' . $select . ')') : $select;
     }
 
     /**

From 131af8e818f3cf84f9973100b6d2a47c77de7078 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 14:14:55 +0200
Subject: [PATCH 1968/2920] monitoring: Add host status summary query

refs #9009
---
 .../Ido/Query/HoststatussummaryQuery.php      | 80 +++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatussummaryQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatussummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatussummaryQuery.php
new file mode 100644
index 000000000..7965d897a
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatussummaryQuery.php
@@ -0,0 +1,80 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+use Icinga\Data\Filter\Filter;
+
+/**
+ * Query for host group summaries
+ */
+class HoststatussummaryQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'hoststatussummary' => array(
+            'hosts_down'                    => 'SUM(CASE WHEN state = 1 THEN 1 ELSE 0 END)',
+            'hosts_down_handled'            => 'SUM(CASE WHEN state = 1 AND handled != 0 THEN 1 ELSE 0 END)',
+            'hosts_down_unhandled'          => 'SUM(CASE WHEN state = 1 AND handled = 0 THEN 1 ELSE 0 END)',
+            'hosts_pending'                 => 'SUM(CASE WHEN state = 99 THEN 1 ELSE 0 END)',
+            'hosts_total'                   => 'SUM(1)',
+            'hosts_unreachable'             => 'SUM(CASE WHEN state = 2 THEN 1 ELSE 0 END)',
+            'hosts_unreachable_handled'     => 'SUM(CASE WHEN state = 2 AND handled != 0 THEN 1 ELSE 0 END)',
+            'hosts_unreachable_unhandled'   => 'SUM(CASE WHEN state = 2 AND handled = 0 THEN 1 ELSE 0 END)',
+            'hosts_up'                      => 'SUM(CASE WHEN state = 0 THEN 1 ELSE 0 END)'
+        )
+    );
+
+    /**
+     * The host status sub select
+     *
+     * @var HostStatusQuery
+     */
+    protected $subSelect;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addFilter(Filter $filter)
+    {
+        $this->subSelect->applyFilter(clone $filter);
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        // TODO(el): Allow to switch between hard and soft states
+        $this->subSelect = $this->createSubQuery(
+            'Hoststatus',
+            array(
+                'handled'       => 'host_handled',
+                'state'         => 'host_hard_state',
+                'state_change'  => 'host_last_hard_state_change'
+            )
+        );
+        $this->select->from(
+            array('hoststatussummary' => $this->subSelect->setIsSubQuery(true)),
+            array()
+        );
+        $this->joinedVirtualTables['hoststatussummary'] = true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function where($condition, $value = null)
+    {
+        $this->subSelect->where($condition, $value);
+        return $this;
+    }
+}

From e9308e847ab8f6a974cf7f94ae27f70673b3d0ab Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 14:15:09 +0200
Subject: [PATCH 1969/2920] monitoring: Add host status summary data view

refs #9009
---
 .../Monitoring/DataView/Hoststatussummary.php | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/DataView/Hoststatussummary.php

diff --git a/modules/monitoring/library/Monitoring/DataView/Hoststatussummary.php b/modules/monitoring/library/Monitoring/DataView/Hoststatussummary.php
new file mode 100644
index 000000000..094c40b95
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/DataView/Hoststatussummary.php
@@ -0,0 +1,47 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\DataView;
+
+/**
+ * Data view for host status summaries
+ */
+class Hoststatussummary extends DataView
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getColumns()
+    {
+        return array(
+            'hosts_down_handled',
+            'hosts_down_unhandled',
+            'hosts_pending',
+            'hosts_total',
+            'hosts_unreachable_handled',
+            'hosts_unreachable_unhandled',
+            'hosts_up',
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFilterColumns()
+    {
+        return array(
+            'host', 'host_alias', 'host_name',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'service_description', 'service_display_name',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        return in_array($column, $this->getFilterColumns());
+    }
+}

From 8f111406f300a1d217eccd8a8ed5461bb1c12381 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 14:16:22 +0200
Subject: [PATCH 1970/2920] monitoring: Restrict the host overview and the host
 status summary

refs #9009
---
 .../application/controllers/ListController.php      | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 5f5162532..b08a84e3d 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -66,10 +66,9 @@ class Monitoring_ListController extends Controller
             $stateColumn = 'host_state';
             $stateChangeColumn = 'host_last_state_change';
         }
-
         $this->addTitleTab('hosts', $this->translate('Hosts'), $this->translate('List hosts'));
         $this->setAutorefreshInterval(10);
-        $query = $this->backend->select()->from('hostStatus', array_merge(array(
+        $query = $this->backend->select()->from('hoststatus', array_merge(array(
             'host_icon_image',
             'host_icon_image_alt',
             'host_name',
@@ -98,10 +97,9 @@ class Monitoring_ListController extends Controller
             'host_max_check_attempts'
         ), $this->addColumns()));
         $this->filterQuery($query);
-        $this->applyRestriction('monitoring/hosts/filter', $query);
+        $this->applyRestriction('monitoring/filter/objects', $query);
         $this->view->hosts = $query;
-
-        $this->view->stats = $this->backend->select()->from('statusSummary', array(
+        $stats = $this->backend->select()->from('hoststatussummary', array(
             'hosts_total',
             'hosts_up',
             'hosts_down',
@@ -111,8 +109,9 @@ class Monitoring_ListController extends Controller
             'hosts_unreachable_handled',
             'hosts_unreachable_unhandled',
             'hosts_pending',
-        ))->getQuery()->fetchRow();
-
+        ));
+        $this->applyRestriction('monitoring/filter/objects', $stats);
+        $this->view->stats = $stats->fetchRow();
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->hosts);
         $this->setupSortControl(array(

From 1a0d1702c9dce26dd27844faa587c0b59f7a9619 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 3 Jun 2015 14:22:38 +0200
Subject: [PATCH 1971/2920] Ldap\Connection: Do not sort *after* the result has
 been limited

fixes #9352
---
 library/Icinga/Protocol/Ldap/Connection.php | 83 +++++++++++++++++----
 1 file changed, 69 insertions(+), 14 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index ba6203aab..e0a02037f 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -9,6 +9,7 @@ use Icinga\Application\Logger;
 use Icinga\Application\Platform;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\Selectable;
+use Icinga\Data\Sortable;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Protocol\Ldap\Exception as LdapException;
 
@@ -282,13 +283,23 @@ class Connection implements Selectable
             $fields = $query->getColumns();
         }
 
+        $serverSorting = $this->capabilities->hasOid(Capability::LDAP_SERVER_SORT_OID);
+        if ($serverSorting && $query->hasOrder()) {
+            ldap_set_option($this->ds, LDAP_OPT_SERVER_CONTROLS, array(
+                array(
+                    'oid'           => Capability::LDAP_SERVER_SORT_OID,
+                    'value'         => $this->encodeSortRules($query->getOrder())
+                )
+            ));
+        }
+
         $results = @ldap_search(
             $this->ds,
             $query->getBase() ?: $this->root_dn,
             (string) $query,
             array_values($fields),
             0, // Attributes and values
-            $limit ? $offset + $limit : 0
+            $serverSorting && $limit ? $offset + $limit : 0
         );
         if ($results === false) {
             if (ldap_errno($this->ds) === self::LDAP_NO_SUCH_OBJECT) {
@@ -310,15 +321,21 @@ class Connection implements Selectable
         $entry = ldap_first_entry($this->ds, $results);
         do {
             $count += 1;
-            if ($offset === 0 || $offset < $count) {
+            if (! $serverSorting || $offset === 0 || $offset < $count) {
                 $entries[ldap_get_dn($this->ds, $entry)] = $this->cleanupAttributes(
                     ldap_get_attributes($this->ds, $entry), array_flip($fields)
                 );
             }
-        } while (($limit === 0 || $limit !== count($entries)) && ($entry = ldap_next_entry($this->ds, $entry)));
+        } while (
+            (! $serverSorting || $limit === 0 || $limit !== count($entries))
+            && ($entry = ldap_next_entry($this->ds, $entry))
+        );
 
-        if ($query->hasOrder()) {
+        if (! $serverSorting && $query->hasOrder()) {
             uasort($entries, array($query, 'compare'));
+            if ($limit && $count > $limit) {
+                $entries = array_splice($entries, $query->hasOffset() ? $query->getOffset() : 0, $limit);
+            }
         }
 
         ldap_free_result($results);
@@ -349,10 +366,6 @@ class Connection implements Selectable
      */
     protected function runPagedQuery(Query $query, array $fields = null, $pageSize = null)
     {
-        if (! $this->pageControlAvailable($query)) {
-            throw new ProgrammingError('LDAP: Page control not available.');
-        }
-
         if (! isset($pageSize)) {
             $pageSize = static::PAGE_SIZE;
         }
@@ -366,6 +379,16 @@ class Connection implements Selectable
             $fields = $query->getColumns();
         }
 
+        $serverSorting = $this->capabilities->hasOid(Capability::LDAP_SERVER_SORT_OID);
+        if ($serverSorting && $query->hasOrder()) {
+            ldap_set_option($this->ds, LDAP_OPT_SERVER_CONTROLS, array(
+                array(
+                    'oid'           => Capability::LDAP_SERVER_SORT_OID,
+                    'value'         => $this->encodeSortRules($query->getOrder())
+                )
+            ));
+        }
+
         $count = 0;
         $cookie = '';
         $entries = array();
@@ -380,7 +403,7 @@ class Connection implements Selectable
                 $queryString,
                 array_values($fields),
                 0, // Attributes and values
-                $limit ? $offset + $limit : 0
+                $serverSorting && $limit ? $offset + $limit : 0
             );
             if ($results === false) {
                 if (ldap_errno($this->ds) === self::LDAP_NO_SUCH_OBJECT) {
@@ -411,19 +434,22 @@ class Connection implements Selectable
             $entry = ldap_first_entry($this->ds, $results);
             do {
                 $count += 1;
-                if ($offset === 0 || $offset < $count) {
+                if (! $serverSorting || $offset === 0 || $offset < $count) {
                     $entries[ldap_get_dn($this->ds, $entry)] = $this->cleanupAttributes(
                         ldap_get_attributes($this->ds, $entry), array_flip($fields)
                     );
                 }
-            } while (($limit === 0 || $limit !== count($entries)) && ($entry = ldap_next_entry($this->ds, $entry)));
+            } while (
+                (! $serverSorting || $limit === 0 || $limit !== count($entries))
+                && ($entry = ldap_next_entry($this->ds, $entry))
+            );
 
             if (false === @ldap_control_paged_result_response($this->ds, $results, $cookie)) {
                 // If the page size is greater than or equal to the sizeLimit value, the server should ignore the
                 // control as the request can be satisfied in a single page: https://www.ietf.org/rfc/rfc2696.txt
                 // This applies no matter whether paged search requests are permitted or not. You're done once you
                 // got everything you were out for.
-                if (count($entries) !== $limit) {
+                if ($serverSorting && count($entries) !== $limit) {
 
                     // The server does not support pagination, but still returned a response by ignoring the
                     // pagedResultsControl. We output a warning to indicate that the pagination control was ignored.
@@ -432,7 +458,7 @@ class Connection implements Selectable
             }
 
             ldap_free_result($results);
-        } while ($cookie && ($limit === 0 || count($entries) < $limit));
+        } while ($cookie && (! $serverSorting || $limit === 0 || count($entries) < $limit));
 
         if ($cookie) {
             // A sequence of paged search requests is abandoned by the client sending a search request containing a
@@ -445,8 +471,11 @@ class Connection implements Selectable
             ldap_control_paged_result($this->ds, 0);
         }
 
-        if ($query->hasOrder()) {
+        if (! $serverSorting && $query->hasOrder()) {
             uasort($entries, array($query, 'compare'));
+            if ($limit && $count > $limit) {
+                $entries = array_splice($entries, $query->hasOffset() ? $query->getOffset() : 0, $limit);
+            }
         }
 
         return $entries;
@@ -496,6 +525,32 @@ class Connection implements Selectable
         return (object) $cleanedAttributes;
     }
 
+    /**
+     * Encode the given array of sort rules as ASN.1 octet stream according to RFC 2891
+     *
+     * @param   array   $sortRules
+     *
+     * @return  string
+     */
+    protected function encodeSortRules(array $sortRules)
+    {
+        if (count($sortRules) > 127) {
+            throw new ProgrammingError(
+                'Cannot encode more than 127 sort rules. Only length octets in short form are supported'
+            );
+        }
+
+        $seq = '30' . str_pad(dechex(count($sortRules)), 2, '0', STR_PAD_LEFT);
+        foreach ($sortRules as $rule) {
+            $hexdAttribute = unpack('H*', $rule[0]);
+            $seq .= '3002'
+                . '04' . str_pad(dechex(strlen($rule[0])), 2, '0', STR_PAD_LEFT) . $hexdAttribute[1]
+                . '0101' . ($rule[1] === Sortable::SORT_DESC ? 'ff' : '00');
+        }
+
+        return $seq;
+    }
+
     public function testCredentials($username, $password)
     {
         $this->connect();

From 5dd39505942efd92433cefe9bdd02b46ca1ae180 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 3 Jun 2015 14:24:48 +0200
Subject: [PATCH 1972/2920] Ldap\Connection: Disable server side sorting as
 it's not working

refs #9364
---
 library/Icinga/Protocol/Ldap/Connection.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index e0a02037f..c2758154a 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -283,7 +283,7 @@ class Connection implements Selectable
             $fields = $query->getColumns();
         }
 
-        $serverSorting = $this->capabilities->hasOid(Capability::LDAP_SERVER_SORT_OID);
+        $serverSorting = false;//$this->capabilities->hasOid(Capability::LDAP_SERVER_SORT_OID);
         if ($serverSorting && $query->hasOrder()) {
             ldap_set_option($this->ds, LDAP_OPT_SERVER_CONTROLS, array(
                 array(
@@ -379,7 +379,7 @@ class Connection implements Selectable
             $fields = $query->getColumns();
         }
 
-        $serverSorting = $this->capabilities->hasOid(Capability::LDAP_SERVER_SORT_OID);
+        $serverSorting = false;//$this->capabilities->hasOid(Capability::LDAP_SERVER_SORT_OID);
         if ($serverSorting && $query->hasOrder()) {
             ldap_set_option($this->ds, LDAP_OPT_SERVER_CONTROLS, array(
                 array(
@@ -531,6 +531,8 @@ class Connection implements Selectable
      * @param   array   $sortRules
      *
      * @return  string
+     *
+     * @todo    Produces an invalid stream, obviously
      */
     protected function encodeSortRules(array $sortRules)
     {

From e0c0e9c8743ce4b9a1d364c75a96be5fbdfc2da3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 3 Jun 2015 14:36:46 +0200
Subject: [PATCH 1973/2920] LdapUserBackend: Move function
 retrieveGeneralizedTime into its parent

refs #7343
---
 .../Authentication/User/LdapUserBackend.php   | 32 -------------------
 library/Icinga/Repository/Repository.php      | 31 ++++++++++++++++++
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index 154a33a44..64ce0ac24 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -4,7 +4,6 @@
 namespace Icinga\Authentication\User;
 
 use DateTime;
-use Icinga\Application\Logger;
 use Icinga\Data\ConfigObject;
 use Icinga\Exception\AuthenticationException;
 use Icinga\Exception\ProgrammingError;
@@ -325,37 +324,6 @@ class LdapUserBackend extends Repository implements UserBackendInterface
         return ((int) $value & $ADS_UF_ACCOUNTDISABLE) === 0;
     }
 
-    /**
-     * Parse the given value based on the ASN.1 standard (GeneralizedTime) and return its timestamp representation
-     *
-     * @param   string|null     $value
-     *
-     * @return  int
-     */
-    protected function retrieveGeneralizedTime($value)
-    {
-        if ($value === null) {
-            return $value;
-        }
-
-        if (
-            ($dateTime = DateTime::createFromFormat('YmdHis.uO', $value)) !== false
-            || ($dateTime = DateTime::createFromFormat('YmdHis.uZ', $value)) !== false
-            || ($dateTime = DateTime::createFromFormat('YmdHis.u', $value)) !== false
-            || ($dateTime = DateTime::createFromFormat('YmdHis', $value)) !== false
-            || ($dateTime = DateTime::createFromFormat('YmdHi', $value)) !== false
-            || ($dateTime = DateTime::createFromFormat('YmdH', $value)) !== false
-        ) {
-            return $dateTime->getTimeStamp();
-        } else {
-            Logger::debug(sprintf(
-                'Failed to parse "%s" based on the ASN.1 standard (GeneralizedTime) for user backend "%s".',
-                $value,
-                $this->getName()
-            ));
-        }
-    }
-
     /**
      * Return whether the given shadowExpire value defines that a user is permitted to login
      *
diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index 803f4958f..98b3e0ab4 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -599,6 +599,37 @@ abstract class Repository implements Selectable
         return $value;
     }
 
+    /**
+     * Parse the given value based on the ASN.1 standard (GeneralizedTime) and return its timestamp representation
+     *
+     * @param   string|null     $value
+     *
+     * @return  int
+     */
+    protected function retrieveGeneralizedTime($value)
+    {
+        if ($value === null) {
+            return $value;
+        }
+
+        if (
+            ($dateTime = DateTime::createFromFormat('YmdHis.uO', $value)) !== false
+            || ($dateTime = DateTime::createFromFormat('YmdHis.uZ', $value)) !== false
+            || ($dateTime = DateTime::createFromFormat('YmdHis.u', $value)) !== false
+            || ($dateTime = DateTime::createFromFormat('YmdHis', $value)) !== false
+            || ($dateTime = DateTime::createFromFormat('YmdHi', $value)) !== false
+            || ($dateTime = DateTime::createFromFormat('YmdH', $value)) !== false
+        ) {
+            return $dateTime->getTimeStamp();
+        } else {
+            Logger::debug(sprintf(
+                'Failed to parse "%s" based on the ASN.1 standard (GeneralizedTime) in repository "%s".',
+                $value,
+                $this->getName()
+            ));
+        }
+    }
+
     /**
      * Validate that the requested table exists
      *

From f2f3fe2c07c9fe489f2476a30aef042f1550e510 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 14:39:10 +0200
Subject: [PATCH 1974/2920] monitoring: Add missing restrictable filter columns
 to the host status data view

refs #9009
---
 .../Monitoring/DataView/HostStatus.php        | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
index cb992752a..a9d6be771 100644
--- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php
@@ -5,19 +5,6 @@ namespace Icinga\Module\Monitoring\DataView;
 
 class HostStatus extends DataView
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function isValidFilterTarget($column)
-    {
-        if ($column[0] === '_'
-            && preg_match('/^_host_/', $column)
-        ) {
-            return true;
-        }
-        return parent::isValidFilterTarget($column);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -84,7 +71,12 @@ class HostStatus extends DataView
      */
     public function getFilterColumns()
     {
-        return array('host', 'hostgroup', 'hostgroup_name');
+        return array(
+            'host',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'service_description', 'service_display_name',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+        );
     }
 
     /**
@@ -125,4 +117,17 @@ class HostStatus extends DataView
             )
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        }
+        return parent::isValidFilterTarget($column);
+    }
 }

From fc2a50a9ffa40c1b67f78d7e5bea208c3c7e99d8 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 14:39:43 +0200
Subject: [PATCH 1975/2920] monitoring: Add missing restrictable filter columns
 to the host status summary data view

refs #9009
---
 .../library/Monitoring/DataView/Hoststatussummary.php  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Hoststatussummary.php b/modules/monitoring/library/Monitoring/DataView/Hoststatussummary.php
index 094c40b95..292698376 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hoststatussummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hoststatussummary.php
@@ -30,7 +30,7 @@ class Hoststatussummary extends DataView
     public function getFilterColumns()
     {
         return array(
-            'host', 'host_alias', 'host_name',
+            'host', 'host_alias', 'host_display_name', 'host_name',
             'hostgroup', 'hostgroup_alias', 'hostgroup_name',
             'service', 'service_description', 'service_display_name',
             'servicegroup', 'servicegroup_alias', 'servicegroup_name'
@@ -42,6 +42,12 @@ class Hoststatussummary extends DataView
      */
     public function isValidFilterTarget($column)
     {
-        return in_array($column, $this->getFilterColumns());
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        } else {
+            return in_array($column, $this->getFilterColumns());
+        }
     }
 }

From 7ffa1b93a3dc07999b9a05dfad71c3ff85f58d5b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 14:44:16 +0200
Subject: [PATCH 1976/2920] monitoring: Add service status summary data view

refs #9009
---
 .../DataView/Servicestatussummary.php         | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/DataView/Servicestatussummary.php

diff --git a/modules/monitoring/library/Monitoring/DataView/Servicestatussummary.php b/modules/monitoring/library/Monitoring/DataView/Servicestatussummary.php
new file mode 100644
index 000000000..5cb6b137f
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/DataView/Servicestatussummary.php
@@ -0,0 +1,58 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\DataView;
+
+/**
+ * Data view for service status summaries
+ */
+class Servicestatussummary extends DataView
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getColumns()
+    {
+        return array(
+            'services_critical',
+            'services_critical_handled',
+            'services_critical_unhandled',
+            'services_ok',
+            'services_pending',
+            'services_total',
+            'services_unknown',
+            'services_unknown_handled',
+            'services_unknown_unhandled',
+            'services_warning',
+            'services_warning_handled',
+            'services_warning_unhandled'
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFilterColumns()
+    {
+        return array(
+            'host', 'host_alias', 'host_display_name', 'host_name',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'service_description', 'service_display_name',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        } else {
+            return in_array($column, $this->getFilterColumns());
+        }
+    }
+}

From f479ea1da8aaead5b9d45918d3e4973642f5e251 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 14:44:36 +0200
Subject: [PATCH 1977/2920] monitoring: Restrict the service status summary

refs #9009
---
 .../controllers/ListController.php            | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index b08a84e3d..4eb95f7df 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -199,23 +199,22 @@ class Monitoring_ListController extends Controller
             'host_last_check'       => $this->translate('Last Host Check')
         ), $query);
 
-        $this->view->stats = $this->backend->select()->from('statusSummary', array(
-            'services_total',
-            'services_ok',
-            'services_problem',
-            'services_problem_handled',
-            'services_problem_unhandled',
+        $stats = $this->backend->select()->from('servicestatussummary', array(
             '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_critical_unhandled',
+            'services_ok',
             'services_pending',
-        ))->getQuery()->fetchRow();
+            'services_total',
+            'services_unknown',
+            'services_unknown_handled',
+            'services_unknown_unhandled',
+            'services_warning',
+            'services_warning_handled',
+            'services_warning_unhandled'
+        ));
+        $this->applyRestriction('monitoring/filter/objects', $stats);
+        $this->view->stats = $stats->fetchRow();
     }
 
     /**

From f8b49864bb861c5d47910b8b31aa6697dc020e94 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 3 Jun 2015 14:59:20 +0200
Subject: [PATCH 1978/2920] monitoring: Restrict the services overview

refs #9009
---
 modules/monitoring/application/controllers/ListController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 4eb95f7df..9e5ac6d33 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -182,7 +182,7 @@ class Monitoring_ListController extends Controller
         ), $this->addColumns());
         $query = $this->backend->select()->from('serviceStatus', $columns);
         $this->filterQuery($query);
-        $this->applyRestriction('monitoring/services/filter', $query);
+        $this->applyRestriction('monitoring/filter/objects', $query);
         $this->view->services = $query;
 
         $this->setupLimitControl();

From 96f5f8fd4950e40bbe5121c435cf7bda9b1838a6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 3 Jun 2015 15:16:54 +0200
Subject: [PATCH 1979/2920] LdapUserBackend: Do not fetch a user's groups

refs #7343
---
 .../Authentication/User/LdapUserBackend.php   | 58 +------------------
 .../Authentication/User/UserBackend.php       | 12 ----
 2 files changed, 1 insertion(+), 69 deletions(-)

diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index 64ce0ac24..e85a39029 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -64,8 +64,6 @@ class LdapUserBackend extends Repository implements UserBackendInterface
         )
     );
 
-    protected $groupOptions;
-
     /**
      * Normed attribute names based on known LDAP environments
      *
@@ -178,17 +176,6 @@ class LdapUserBackend extends Repository implements UserBackendInterface
         return $this->filter;
     }
 
-    public function setGroupOptions(array $options)
-    {
-        $this->groupOptions = $options;
-        return $this;
-    }
-
-    public function getGroupOptions()
-    {
-        return $this->groupOptions;
-    }
-
     /**
      * Return the given attribute name normed to known LDAP enviroments, if possible
      *
@@ -381,41 +368,6 @@ class LdapUserBackend extends Repository implements UserBackendInterface
         }
     }
 
-    /**
-     * Retrieve the user groups
-     *
-     * @TODO: Subject to change, see #7343
-     *
-     * @param string $dn
-     *
-     * @return array
-     */
-    public function getGroups($dn)
-    {
-        if (empty($this->groupOptions) || ! isset($this->groupOptions['group_base_dn'])) {
-            return array();
-        }
-
-        $result = $this->ds->select()
-            ->setBase($this->groupOptions['group_base_dn'])
-            ->from(
-                $this->groupOptions['group_class'],
-                array($this->groupOptions['group_attribute'])
-            )
-            ->where(
-                $this->groupOptions['group_member_attribute'],
-                $dn
-            )
-            ->fetchAll();
-
-        $groups = array();
-        foreach ($result as $group) {
-            $groups[] = $group->{$this->groupOptions['group_attribute']};
-        }
-
-        return $groups;
-    }
-
     /**
      * Authenticate the given user
      *
@@ -440,15 +392,7 @@ class LdapUserBackend extends Repository implements UserBackendInterface
                 return false;
             }
 
-            $authenticated = $this->ds->testCredentials($userDn, $password);
-            if ($authenticated) {
-                $groups = $this->getGroups($userDn);
-                if ($groups !== null) {
-                    $user->setGroups($groups);
-                }
-            }
-
-            return $authenticated;
+            return $this->ds->testCredentials($userDn, $password);
         } catch (LdapException $e) {
             throw new AuthenticationException(
                 'Failed to authenticate user "%s" against backend "%s". An exception was thrown:',
diff --git a/library/Icinga/Authentication/User/UserBackend.php b/library/Icinga/Authentication/User/UserBackend.php
index 3d11289fb..42a4c2b42 100644
--- a/library/Icinga/Authentication/User/UserBackend.php
+++ b/library/Icinga/Authentication/User/UserBackend.php
@@ -165,12 +165,6 @@ class UserBackend
                 $backend->setUserClass($backendConfig->get('user_class', 'user'));
                 $backend->setUserNameAttribute($backendConfig->get('user_name_attribute', 'sAMAccountName'));
                 $backend->setFilter($backendConfig->filter);
-                $backend->setGroupOptions(array(
-                    'group_base_dn'             => $backendConfig->get('group_base_dn', $resource->getDN()),
-                    'group_attribute'           => $backendConfig->get('group_attribute', 'sAMAccountName'),
-                    'group_member_attribute'    => $backendConfig->get('group_member_attribute', 'member'),
-                    'group_class'               => $backendConfig->get('group_class', 'group')
-                ));
                 break;
             case 'ldap':
                 $backend = new LdapUserBackend($resource);
@@ -178,12 +172,6 @@ class UserBackend
                 $backend->setUserClass($backendConfig->get('user_class', 'inetOrgPerson'));
                 $backend->setUserNameAttribute($backendConfig->get('user_name_attribute', 'uid'));
                 $backend->setFilter($backendConfig->filter);
-                $backend->setGroupOptions(array(
-                    'group_base_dn'             => $backendConfig->group_base_dn,
-                    'group_attribute'           => $backendConfig->group_attribute,
-                    'group_member_attribute'    => $backendConfig->group_member_attribute,
-                    'group_class'               => $backendConfig->group_class
-                ));
                 break;
         }
 

From 757e993871f4409678bd3064d1bd40eb18cec3e6 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 3 Jun 2015 14:40:58 +0200
Subject: [PATCH 1980/2920] Outsource version-getting logic to Version::get()

refs #9247
---
 application/controllers/AboutController.php |  80 +--------------
 application/views/scripts/about/index.phtml |  17 ++--
 library/Icinga/Version.php                  | 105 ++++++++++++++++++++
 3 files changed, 116 insertions(+), 86 deletions(-)
 create mode 100644 library/Icinga/Version.php

diff --git a/application/controllers/AboutController.php b/application/controllers/AboutController.php
index 6572d7e8b..376490443 100644
--- a/application/controllers/AboutController.php
+++ b/application/controllers/AboutController.php
@@ -4,88 +4,12 @@
 # namespace Icinga\Application\Controllers;
 
 use Icinga\Web\Controller\ActionController;
-use Icinga\Application\Icinga;
-use Icinga\Exception\IcingaException;
+use Icinga\Version;
 
 class AboutController extends ActionController
 {
     public function indexAction()
     {
-        $this->view->appVersion = null;
-        $this->view->gitCommitID = null;
-        $this->view->gitCommitDate = null;
-
-        if (false !== ($appVersion = @file(
-            Icinga::app()->getApplicationDir() . DIRECTORY_SEPARATOR . 'VERSION',
-            FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES
-        ))) {
-            foreach ($appVersion as $av) {
-                $matches = array();
-                if (false === ($res = preg_match(
-                    '/(?<!.)\s*(.+?)\s*:\s*(.+?)\s*(?!.)/ms', $av, $matches
-                ))) {
-                    throw new IcingaException('Failed at preg_match()');
-                }
-                if ($res === 0) {
-                    continue;
-                }
-
-                switch ($matches[1]) {
-                    case 'GitCommitID':
-                        if ($this->view->gitCommitID !== null) {
-                            break;
-                        }
-
-                        $matches2 = array();
-                        if (false === ($res = preg_match(
-                            '/(?<!.)(.+?)(?:\s*\(\s*(.+?)\s*\))?(?!.)/ms',
-                            $matches[2],
-                            $matches2
-                        ))) {
-                            throw new IcingaException('Failed at preg_match()');
-                        }
-                        if ($res === 0) {
-                            break;
-                        }
-
-                        $this->view->gitCommitID = $matches2[1];
-                        if (! isset($matches2[2])) {
-                            break;
-                        }
-
-                        foreach (preg_split(
-                            '/\s*,\s*/', $matches2[2], -1, PREG_SPLIT_NO_EMPTY
-                        ) as $refName) {
-                            $matches3 = array();
-                            if (false === ($res = preg_match(
-                                '/(?<!.)tag\s*:\s*v(.+?)(?!.)/ms',
-                                $refName,
-                                $matches3
-                            ))) {
-                                throw new IcingaException('Failed at preg_match()');
-                            }
-                            if ($res === 1) {
-                                $this->view->appVersion = $matches3[1];
-                                break;
-                            }
-                        }
-                        break;
-                    case 'GitCommitDate':
-                        if ($this->view->gitCommitDate !== null) {
-                            break;
-                        }
-
-                        $matches2 = array();
-                        if (false === ($res = preg_match(
-                            '/(?<!.)(\S+)/ms', $matches[2], $matches2
-                        ))) {
-                            throw new IcingaException('Failed at preg_match()');
-                        }
-                        if ($res === 1) {
-                            $this->view->gitCommitDate = $matches2[1];
-                        }
-                }
-            }
-        }
+        $this->view->version = Version::get();
     }
 }
diff --git a/application/views/scripts/about/index.phtml b/application/views/scripts/about/index.phtml
index 0429a5374..3c37a5e73 100644
--- a/application/views/scripts/about/index.phtml
+++ b/application/views/scripts/about/index.phtml
@@ -2,14 +2,15 @@
     <h1>Icinga Web 2</h1>
     <?php
     $versionInfo = array();
-    foreach (array(
-        array($this->translate('Version: %s'),          $appVersion),
-        array($this->translate('Git commit ID: %s'),    $gitCommitID),
-        array($this->translate('Git commit date: %s'),  $gitCommitDate)
-    ) as $version) {
-        list($label, $value) = $version;
-        if ($value !== null) {
-            $versionInfo[] = sprintf($label, htmlspecialchars($value));
+    if ($version !== false) {
+        foreach (array(
+            'appVersion'    => $this->translate('Version: %s'),
+            'gitCommitID'   => $this->translate('Git commit ID: %s'),
+            'gitCommitDate' => $this->translate('Git commit date: %s')
+        ) as $key => $label) {
+            if (null !== ($value = $version[$key])) {
+                $versionInfo[] = sprintf($label, htmlspecialchars($value));
+            }
         }
     }
     ?>
diff --git a/library/Icinga/Version.php b/library/Icinga/Version.php
new file mode 100644
index 000000000..130e75060
--- /dev/null
+++ b/library/Icinga/Version.php
@@ -0,0 +1,105 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga;
+
+use Icinga\Application\Icinga;
+use Icinga\Exception\IcingaException;
+
+class Version
+{
+    /**
+     * Get the version of this instance of Icinga Web 2
+     *
+     * @return array|bool   array on success, false otherwise
+     */
+    public static function get()
+    {
+        $versionInfo = array(
+            'appVersion'    => null,
+            'gitCommitID'   => null,
+            'gitCommitDate' => null
+        );
+
+        if (false !== ($appVersion = @file(
+            Icinga::app()->getApplicationDir() . DIRECTORY_SEPARATOR . 'VERSION',
+            FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES
+        ))) {
+            foreach ($appVersion as $av) {
+                $matches = array();
+                if (false === ($res = preg_match(
+                    '/(?<!.)\s*(.+?)\s*:\s*(.+?)\s*(?!.)/ms', $av, $matches
+                ))) {
+                    throw new IcingaException('Failed at preg_match()');
+                }
+                if ($res === 0) {
+                    continue;
+                }
+
+                switch ($matches[1]) {
+                    case 'GitCommitID':
+                        if ($versionInfo['gitCommitID'] !== null) {
+                            break;
+                        }
+
+                        $matches2 = array();
+                        if (false === ($res = preg_match(
+                            '/(?<!.)(.+?)(?:\s*\(\s*(.+?)\s*\))?(?!.)/ms',
+                            $matches[2],
+                            $matches2
+                        ))) {
+                            throw new IcingaException('Failed at preg_match()');
+                        }
+                        if ($res === 0) {
+                            break;
+                        }
+
+                        $versionInfo['gitCommitID'] = $matches2[1];
+                        if (! isset($matches2[2])) {
+                            break;
+                        }
+
+                        foreach (preg_split(
+                            '/\s*,\s*/', $matches2[2], -1, PREG_SPLIT_NO_EMPTY
+                        ) as $refName) {
+                            $matches3 = array();
+                            if (false === ($res = preg_match(
+                                '/(?<!.)tag\s*:\s*v(.+?)(?!.)/ms',
+                                $refName,
+                                $matches3
+                            ))) {
+                                throw new IcingaException('Failed at preg_match()');
+                            }
+                            if ($res === 1) {
+                                $versionInfo['appVersion'] = $matches3[1];
+                                break;
+                            }
+                        }
+                        break;
+                    case 'GitCommitDate':
+                        if ($versionInfo['gitCommitDate'] !== null) {
+                            break;
+                        }
+
+                        $matches2 = array();
+                        if (false === ($res = preg_match(
+                            '/(?<!.)(\S+)/ms', $matches[2], $matches2
+                        ))) {
+                            throw new IcingaException('Failed at preg_match()');
+                        }
+                        if ($res === 1) {
+                            $versionInfo['gitCommitDate'] = $matches2[1];
+                        }
+                }
+            }
+        }
+
+        foreach (array('gitCommitID', 'gitCommitDate') as $key) {
+            if ($versionInfo[$key] === null) {
+                return false;
+            }
+        }
+
+        return $versionInfo;
+    }
+}

From 86c63ec913c4789e0ba017338934133239003a99 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 3 Jun 2015 15:28:07 +0200
Subject: [PATCH 1981/2920] Introduce class LdapRepository

refs #7343
---
 .../Authentication/User/LdapUserBackend.php   | 33 +---------
 library/Icinga/Repository/LdapRepository.php  | 65 +++++++++++++++++++
 2 files changed, 67 insertions(+), 31 deletions(-)
 create mode 100644 library/Icinga/Repository/LdapRepository.php

diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index e85a39029..333969891 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -7,13 +7,13 @@ use DateTime;
 use Icinga\Data\ConfigObject;
 use Icinga\Exception\AuthenticationException;
 use Icinga\Exception\ProgrammingError;
-use Icinga\Repository\Repository;
+use Icinga\Repository\LdapRepository;
 use Icinga\Repository\RepositoryQuery;
 use Icinga\Protocol\Ldap\Exception as LdapException;
 use Icinga\Protocol\Ldap\Expression;
 use Icinga\User;
 
-class LdapUserBackend extends Repository implements UserBackendInterface
+class LdapUserBackend extends LdapRepository implements UserBackendInterface
 {
     /**
      * The base DN to use for a query
@@ -64,18 +64,6 @@ class LdapUserBackend extends Repository implements UserBackendInterface
         )
     );
 
-    /**
-     * Normed attribute names based on known LDAP environments
-     *
-     * @var array
-     */
-    protected $normedAttributes = array(
-        'uid'               => 'uid',
-        'user'              => 'user',
-        'inetorgperson'     => 'inetOrgPerson',
-        'samaccountname'    => 'sAMAccountName'
-    );
-
     /**
      * Set the base DN to use for a query
      *
@@ -176,23 +164,6 @@ class LdapUserBackend extends Repository implements UserBackendInterface
         return $this->filter;
     }
 
-    /**
-     * Return the given attribute name normed to known LDAP enviroments, if possible
-     *
-     * @param   string  $name
-     *
-     * @return  string
-     */
-    protected function getNormedAttribute($name)
-    {
-        $loweredName = strtolower($name);
-        if (array_key_exists($loweredName, $this->normedAttributes)) {
-            return $this->normedAttributes[$loweredName];
-        }
-
-        return $name;
-    }
-
     /**
      * Apply the given configuration to this backend
      *
diff --git a/library/Icinga/Repository/LdapRepository.php b/library/Icinga/Repository/LdapRepository.php
new file mode 100644
index 000000000..15594d269
--- /dev/null
+++ b/library/Icinga/Repository/LdapRepository.php
@@ -0,0 +1,65 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Repository;
+
+use Icinga\Protocol\Ldap\Connection;
+
+/**
+ * Abstract base class for concrete LDAP repository implementations
+ *
+ * Additionally provided features:
+ * <ul>
+ *  <li>Attribute name normalization</li>
+ * </ul>
+ */
+abstract class LdapRepository extends Repository
+{
+    /**
+     * The datasource being used
+     *
+     * @var Connection
+     */
+    protected $ds;
+
+    /**
+     * Normed attribute names based on known LDAP environments
+     *
+     * @var array
+     */
+    protected $normedAttributes = array(
+        'uid'               => 'uid',
+        'user'              => 'user',
+        'group'             => 'group',
+        'member'            => 'member',
+        'inetorgperson'     => 'inetOrgPerson',
+        'samaccountname'    => 'sAMAccountName'
+    );
+
+    /**
+     * Create a new LDAP repository object
+     *
+     * @param   Connection  $ds     The data source to use
+     */
+    public function __construct(Connection $ds)
+    {
+        parent::__construct($ds);
+    }
+
+    /**
+     * Return the given attribute name normed to known LDAP enviroments, if possible
+     *
+     * @param   string  $name
+     *
+     * @return  string
+     */
+    protected function getNormedAttribute($name)
+    {
+        $loweredName = strtolower($name);
+        if (array_key_exists($loweredName, $this->normedAttributes)) {
+            return $this->normedAttributes[$loweredName];
+        }
+
+        return $name;
+    }
+}
\ No newline at end of file

From 34700f483f6cb5b272c8fcb9b53ae97bae14f966 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 3 Jun 2015 14:50:27 +0200
Subject: [PATCH 1982/2920] defaults.less: no more petrol headers

---
 public/css/icinga/defaults.less | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index e3e033eff..99e6b301b 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -97,7 +97,6 @@ h1 {
 
 h2 {
     font-size:  1.5em;
-    color: @colorPetrol;
 }
 
 h3 {
@@ -106,7 +105,6 @@ h3 {
 
 h4 {
   font-size:    1em;
-  color: @colorPetrol;
 }
 
 h5 {
@@ -141,4 +139,4 @@ button {
   position: absolute;
   top: -2em;
 }
-/*** END of Base rules */
\ No newline at end of file
+/*** END of Base rules */

From 5b19f9474cab8d33f6fd6195988147c15950404b Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 3 Jun 2015 14:50:58 +0200
Subject: [PATCH 1983/2920] CheckNowCommandForm: remove visible whitespace

---
 .../application/forms/Command/Object/CheckNowCommandForm.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
index e5cf6b9e4..850443e0e 100644
--- a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php
@@ -35,7 +35,7 @@ class CheckNowCommandForm extends ObjectsCommandForm
                     'ignore'        => true,
                     'type'          => 'submit',
                     'value'         => $this->translate('Check now'),
-                    'label'         => '<i aria-hidden="true" class="icon-reschedule"></i> '
+                    'label'         => '<i aria-hidden="true" class="icon-reschedule"></i>'
                         . $this->translate('Check now'),
                     'decorators'    => array('ViewHelper'),
                     'escape'        => false,

From 38a88d129c59c5063fdd5bdc55a7ca0ffde74262 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 3 Jun 2015 14:51:21 +0200
Subject: [PATCH 1984/2920] DeleteCommentCommandForm: choose another icon

---
 .../forms/Command/Object/DeleteCommentCommandForm.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
index 1c8144475..ce95d24b9 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
@@ -72,7 +72,7 @@ class DeleteCommentCommandForm extends CommandForm
                 'escape'        => false,
                 'type'          => 'submit',
                 'class'         => 'link-like',
-                'label'         => $this->getView()->icon('trash'),
+                'label'         => $this->getView()->icon('cancel'),
                 'title'         => $this->translate('Delete this comment'),
                 'decorators'    => array('ViewHelper')
             )

From 421cd1fdd8d7fd79948df590192d5005ae5eaa1b Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 3 Jun 2015 14:53:04 +0200
Subject: [PATCH 1985/2920] main-content.less: no border for new sections

---
 public/css/icinga/main-content.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 18bc03a57..4103f1d98 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -99,7 +99,7 @@ table.avp > tbody > tr > td {
 }
 
 table.avp.newsection, table.avp tr.newsection {
-  border-top: 1px solid #d9d9d9;
+  margin-top: 1em;
 }
 
 .content table.avp dd, .content table.avp dd {

From d4a9f4fd98d950ebedf1de0a79e250da22e849f3 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 3 Jun 2015 14:53:56 +0200
Subject: [PATCH 1986/2920] controls: introduce new "separated" class

Controls defined as "separated" will be separated by space/border/shadow
or similar
---
 modules/monitoring/application/views/scripts/host/show.phtml    | 2 +-
 modules/monitoring/application/views/scripts/list/hosts.phtml   | 2 +-
 .../monitoring/application/views/scripts/list/services.phtml    | 2 +-
 modules/monitoring/application/views/scripts/service/show.phtml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/host/show.phtml b/modules/monitoring/application/views/scripts/host/show.phtml
index 76d8c1b55..3c100b440 100644
--- a/modules/monitoring/application/views/scripts/host/show.phtml
+++ b/modules/monitoring/application/views/scripts/host/show.phtml
@@ -1,4 +1,4 @@
-<div class="controls">
+<div class="controls separated">
   <?php if (! $this->compact): ?>
     <?= $this->tabs; ?>
   <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 5535d14fa..2a0bdb8ab 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -2,7 +2,7 @@
 use Icinga\Module\Monitoring\Object\Host;
 
 if (! $this->compact): ?>
-<div class="controls">
+<div class="controls separated">
   <?= $this->tabs; ?>
   <div class="dontprint">
     <?= $this->render('list/components/selectioninfo.phtml'); ?>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 9f87e7c60..f152d635d 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -5,7 +5,7 @@ use Icinga\Module\Monitoring\Object\Service;
 $selfUrl = 'monitoring/list/services';
 
 if (! $this->compact): ?>
-<div class="controls">
+<div class="controls separated">
   <?= $this->tabs; ?>
   <div class="dontprint">
     <?= $this->render('list/components/selectioninfo.phtml'); ?>
diff --git a/modules/monitoring/application/views/scripts/service/show.phtml b/modules/monitoring/application/views/scripts/service/show.phtml
index 43dc77030..57e42d842 100644
--- a/modules/monitoring/application/views/scripts/service/show.phtml
+++ b/modules/monitoring/application/views/scripts/service/show.phtml
@@ -1,4 +1,4 @@
-<div class="controls">
+<div class="controls separated">
   <?php if (! $this->compact): ?>
     <?= $this->tabs; ?>
   <?php endif ?>

From 6e1ba30acc8153de90e641b82db99754ccd80932 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 3 Jun 2015 14:56:23 +0200
Subject: [PATCH 1987/2920] Styling: re-organize and style comments

---
 .../scripts/show/components/comments.phtml    | 146 +++++++++++-------
 .../scripts/show/components/contacts.phtml    |   6 +-
 modules/monitoring/public/css/module.less     |  79 ++++++++++
 3 files changed, 168 insertions(+), 63 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index c4b947e3c..3d806c577 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -1,62 +1,90 @@
-<tr>
-    <th><?= $this->translate('Comments'); ?></th>
-    <td>
-        <?php if ($this->hasPermission('monitoring/command/comment/add')) {
-            /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
-            if ($object->getType() === $object::TYPE_HOST) {
-                echo $this->qlink(
-                    $this->translate('Add comment'),
-                    'monitoring/host/add-comment',
-                    array('host' => $object->getName()),
-                    array(
-                        'icon'              => 'comment',
-                        'data-base-target'  => '_self',
-                        'title'             => $this->translate('Add a new comment to this host')
-                    )
-                );
-            } else {
-                echo $this->qlink(
-                    $this->translate('Add comment'),
-                    'monitoring/service/add-comment',
-                    array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
-                    array(
-                        'icon'              => 'comment',
-                        'data-base-target'  => '_self',
-                        'title'             => $this->translate('Add a new comment to this service')
-                    )
-                );
-            }
-        } else {
-            echo '&#45;';
-        } ?>
-    </td>
-</tr>
-
 <?php
 
-foreach ($object->comments as $comment) {
-    // Ticket hook sample
-    $commentText = $this->tickets ? preg_replace_callback(
-        $this->tickets->getPattern(),
-        array($this->tickets, 'createLink'),
-        $this->escape($comment->comment)
-    ) : $this->escape($comment->comment);
+$addLink = '';
 
-    ?>
-    <tr>
-        <th><?= $this->escape($comment->author); ?> (<?= $this->timeAgo($comment->timestamp); ?>)</th>
-        <td data-base-target="_self">
-            <?php if (isset($delCommentForm)) { // Form is unset if the current user lacks the respective permission
-                $delCommentForm = clone $delCommentForm;
-                $delCommentForm->populate(
-                    array(
-                        'comment_id' => $comment->id,
-                        'comment_is_service' => isset($comment->service_description)
-                    )
-                );
-                echo $delCommentForm;
-            } ?>
-            <span class="sr-only">(<?= $this->translate('Comment'); ?>): </span><?= str_replace(array('\r\n', '\n'), '<br>', $commentText); ?>
-        </td>
-    </tr>
-<?php } // endforeach ?>
+if ($this->hasPermission('monitoring/command/comment/add')) {
+    /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+    if ($object->getType() === $object::TYPE_HOST) {
+        $addLink = $this->qlink(
+            $this->translate('Add comment'),
+            'monitoring/host/add-comment',
+            array('host' => $object->getName()),
+            array(
+                'icon'              => 'comment',
+                'data-base-target'  => '_self',
+                'title'             => $this->translate('Add a new comment to this host')
+            )
+        );
+    } else {
+        $addLink = $this->qlink(
+            $this->translate('Add comment'),
+            'monitoring/service/add-comment',
+            array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
+            array(
+                'icon'              => 'comment',
+                'data-base-target'  => '_self',
+                'title'             => $this->translate('Add a new comment to this service')
+            )
+        );
+    }
+}
+
+if (empty($object->comments) && ! $addLink) {
+    return;
+}
+
+?>
+<tr>
+    <th><?php
+
+    echo $this->translate('Comments');
+
+    if (! empty($object->comments) && $addLink) {
+        echo '<br />' . $addLink;
+    }
+
+    ?></th>
+    <td data-base-target="_self">
+<?php if (empty($object->comments)): ?>
+<?= $addLink ?>
+<?php else: ?>
+    <ul class="inline-comments">
+ <?php foreach ($object->comments as $comment): ?>
+ <?php
+
+// Ticket hook sample
+$commentText = $this->tickets ? preg_replace_callback(
+    $this->tickets->getPattern(),
+    array($this->tickets, 'createLink'),
+    $this->escape($comment->comment)
+) : $this->escape($comment->comment);
+
+
+// Form is unset if the current user lacks the respective permission
+if (isset($delCommentForm)) { 
+    $deleteButton = clone($delCommentForm);
+    $deleteButton->populate(
+        array(
+            'comment_id' => $comment->id,
+            'comment_is_service' => isset($comment->service_description)
+        )
+    );
+} else {
+    $deleteButton = '';
+}
+
+ ?>
+	    <li class="comment-item">
+	    	<h4>
+		    	<span class="author"><?= $this->escape($comment->author) ?></span>
+		    	<?= $this->timeAgo($comment->timestamp) ?>
+                <?= $deleteButton ?>
+		    </h4>
+		    <p><span class="sr-only">(<?= $this->translate('Comment'); ?>): </span><?= str_replace(array('\r\n', '\n'), '<br>', $commentText) ?></p>
+         </li>
+ <?php endforeach ?>
+    </ul>
+<?php endif ?>
+
+    </td>
+</tr>
diff --git a/modules/monitoring/application/views/scripts/show/components/contacts.phtml b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
index f445e10d1..641efb597 100644
--- a/modules/monitoring/application/views/scripts/show/components/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
@@ -13,9 +13,8 @@ if (! empty($object->contacts)) {
     }
 
     printf(
-        "<tr><th>%s</th><td>%s %s</td></tr>\n",
+        "<tr><th>%s</th><td class=\"go-ahead\">%s</td></tr>\n",
         $this->translate('Contacts'),
-        $this->icon('user'),
         implode(', ', $list)
     );
 
@@ -33,9 +32,8 @@ if (! empty($object->contactgroups)) {
     }
 
     printf(
-        "<tr><th>%s</th><td>%s %s</td></tr>\n",
+        "<tr><th>%s</th><td class=\"go-ahead\">%s</td></tr>\n",
         $this->translate('Contactgroups'),
-        $this->icon('users'),
         implode(', ', $list)
     );
 
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index c64f24b84..3e2d41bbf 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -189,6 +189,33 @@ table.avp form.object-features div.header h4 {
   margin: 0;
 }
 
+table.avp {
+    th {
+        font-weight: normal;
+        font-size: 0.9em;
+        padding-top: 0.2em;
+        padding-bottom: 0.3em;
+    }
+
+    td {
+        color: #666;
+        padding-bottom: 0.3em;
+        th, td {
+            padding: 0;
+        }
+    }
+
+    a, button.link-like {
+        color: @colorPetrol;
+    }
+
+    .go-ahead {
+        a, button.link-like {
+            color: #222;
+        }
+    }
+}
+
 table.avp .customvar ul {
     list-style-type: none;
     margin: 0;
@@ -242,3 +269,55 @@ td.state {
     text-transform: capitalize;
   }
 }
+
+.inline-comments {
+    padding: 0;
+    margin: 0;
+
+    .time-ago {
+        font-style: italic;
+        color: #919191;
+    }
+
+    li {
+        list-style-type: none;
+        margin-bottom: 8px;
+    }
+
+    h4 {
+        border-bottom: 1px solid gray;
+        font-weight: normal;
+        font-size: inherit;
+        color: inherit;
+        margin: 0;
+    }
+
+    h4 .author {
+        font-weight: bold;
+    }
+
+    h4 form {
+        display: none;
+    }
+
+    h4 form {
+        float: right;
+    }
+
+    li:hover h4 {
+        background: #F9F9F9;
+        position: relative;
+
+        form {
+            display: inline;
+        }
+    }
+
+    p {
+        margin: 0;
+
+        a {
+            color: #222;
+        }
+    }
+}

From 2318eaf4c35bde486ec74b4b90c52d1a6b532535 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 3 Jun 2015 14:56:54 +0200
Subject: [PATCH 1988/2920] monitoring/module.less: highlight plugin output

---
 modules/monitoring/public/css/module.less | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 3e2d41bbf..619dd0b30 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -33,7 +33,7 @@ p.pluginoutput {
 
 div.pluginoutput {
   overflow: auto;
-  color: black;
+  color: #888;
   margin-bottom: 1em;
   padding: 0.2em;
 }
@@ -43,8 +43,11 @@ div.pluginoutput h4 {
   margin: 0em;
 }
 
-div.pluginoutput pre{
+div.pluginoutput pre {
   white-space: pre-wrap;
+  border-left: 4px solid #d8d8d8;
+  padding: 0.3em 0 0.3em 1em;
+  font-size: 0.9em;
 }
 
 table.objecthistory td {

From c785b6187483e188911ba6400777a2197b895b6b Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 3 Jun 2015 14:57:51 +0200
Subject: [PATCH 1989/2920] layout-structure.less: style separated controls

---
 public/css/icinga/layout-structure.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 3a8713a38..046efa90f 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -121,6 +121,10 @@ html {
   background-color: white;
   padding: 1em 1em 0;
   z-index: 100;
+
+.container .controls.separated {
+    box-shadow: 0 3px 4px -4px rgba(0, 0, 0, 0.2);
+    padding-bottom: 0.5em;
 }
 
 .container .fake-controls {

From 7a20432b6beb0598c366d9bac8c23ef80d069aeb Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 3 Jun 2015 14:58:17 +0200
Subject: [PATCH 1990/2920] main-content.less: no left margin for icons

---
 public/css/icinga/main-content.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 4103f1d98..ef8a6326b 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -204,6 +204,7 @@ table.benchmark {
 
 [class^="icon-"]:before, [class*=" icon-"]:before {
     text-decoration: none;
+    margin-left: 0;
 }
 
 .info-box {

From b5769d2f4bd4ba23811793cfef4b5a7320ed0c58 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 3 Jun 2015 15:02:53 +0200
Subject: [PATCH 1991/2920] layout-structure.less: fix missing bracket

---
 public/css/icinga/layout-structure.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 046efa90f..bb8d09136 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -121,6 +121,7 @@ html {
   background-color: white;
   padding: 1em 1em 0;
   z-index: 100;
+}
 
 .container .controls.separated {
     box-shadow: 0 3px 4px -4px rgba(0, 0, 0, 0.2);

From 9c8752844fa1a5dc5e97ede84c6419beb1f82de9 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 3 Jun 2015 15:10:38 +0200
Subject: [PATCH 1992/2920] main-content-less: no border for controls title

---
 public/css/icinga/main-content.less | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index ef8a6326b..911e6292e 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -202,6 +202,14 @@ table.benchmark {
   color: inherit;
 }
 
+.controls {
+  h1 {
+    border: none;
+    margin-bottom: 0;
+    color: #666;
+  }
+}
+
 [class^="icon-"]:before, [class*=" icon-"]:before {
     text-decoration: none;
     margin-left: 0;

From e65cf954e69ec750f0ebe89eff3a4c5f144170b1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 3 Jun 2015 16:08:29 +0200
Subject: [PATCH 1993/2920] LdapRepository: Add normed attribute `gid'

refs #7343
---
 library/Icinga/Repository/LdapRepository.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/Icinga/Repository/LdapRepository.php b/library/Icinga/Repository/LdapRepository.php
index 15594d269..7cf00ae66 100644
--- a/library/Icinga/Repository/LdapRepository.php
+++ b/library/Icinga/Repository/LdapRepository.php
@@ -29,6 +29,7 @@ abstract class LdapRepository extends Repository
      */
     protected $normedAttributes = array(
         'uid'               => 'uid',
+        'gid'               => 'gid',
         'user'              => 'user',
         'group'             => 'group',
         'member'            => 'member',

From 89d992278baf8e4fcd56255746f77a8f2850fdd9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 3 Jun 2015 16:27:50 +0200
Subject: [PATCH 1994/2920] Introduce class LdapUserGroupBackend

refs #743
---
 .../UserGroup/LdapUserGroupBackend.php        | 376 ++++++++++++++++++
 .../UserGroup/UserGroupBackend.php            |  24 ++
 2 files changed, 400 insertions(+)
 create mode 100644 library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php

diff --git a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
new file mode 100644
index 000000000..1e6addba2
--- /dev/null
+++ b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
@@ -0,0 +1,376 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Authentication\UserGroup;
+
+use Icinga\Exception\ProgrammingError;
+use Icinga\Repository\LdapRepository;
+use Icinga\Repository\RepositoryQuery;
+use Icinga\User;
+
+class LdapUserGroupBackend extends LdapRepository implements UserGroupBackendInterface
+{
+    /**
+     * The base DN to use for a user query
+     *
+     * @var string
+     */
+    protected $userBaseDn;
+
+    /**
+     * The base DN to use for a group query
+     *
+     * @var string
+     */
+    protected $groupBaseDn;
+
+    /**
+     * The objectClass where look for users
+     *
+     * @var string
+     */
+    protected $userClass;
+
+    /**
+     * The objectClass where look for groups
+     *
+     * @var string
+     */
+    protected $groupClass;
+
+    /**
+     * The attribute name where to find a user's name
+     *
+     * @var string
+     */
+    protected $userNameAttribute;
+
+    /**
+     * The attribute name where to find a group's name
+     *
+     * @var string
+     */
+    protected $groupNameAttribute;
+
+    /**
+     * The attribute name where to find a group's member
+     *
+     * @var string
+     */
+    protected $groupMemberAttribute;
+
+    /**
+     * The columns which are not permitted to be queried
+     *
+     * @var array
+     */
+    protected $filterColumns = array('group', 'user');
+
+    /**
+     * The default sort rules to be applied on a query
+     *
+     * @var array
+     */
+    protected $sortRules = array(
+        'group_name' => array(
+            'order' => 'asc'
+        )
+    );
+
+    /**
+     * Set the base DN to use for a user query
+     *
+     * @param   string  $baseDn
+     *
+     * @return  $this
+     */
+    public function setUserBaseDn($baseDn)
+    {
+        if (($baseDn = trim($baseDn))) {
+            $this->userBaseDn = $baseDn;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Return the base DN to use for a user query
+     *
+     * @return  string
+     */
+    public function getUserBaseDn()
+    {
+        return $this->userBaseDn;
+    }
+
+    /**
+     * Set the base DN to use for a group query
+     *
+     * @param   string  $baseDn
+     *
+     * @return  $this
+     */
+    public function setGroupBaseDn($baseDn)
+    {
+        if (($baseDn = trim($baseDn))) {
+            $this->groupBaseDn = $baseDn;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Return the base DN to use for a group query
+     *
+     * @return  string
+     */
+    public function getGroupBaseDn()
+    {
+        return $this->groupBaseDn;
+    }
+
+    /**
+     * Set the objectClass where to look for users
+     *
+     * @param   string  $userClass
+     *
+     * @return  $this
+     */
+    public function setUserClass($userClass)
+    {
+        $this->userClass = $this->getNormedAttribute($userClass);
+        return $this;
+    }
+
+    /**
+     * Return the objectClass where to look for users
+     *
+     * @return string
+     */
+    public function getUserClass()
+    {
+        return $this->userClass;
+    }
+
+    /**
+     * Set the objectClass where to look for groups
+     *
+     * Sets also the base table name for the underlying repository.
+     *
+     * @param   string  $groupClass
+     *
+     * @return  $this
+     */
+    public function setGroupClass($groupClass)
+    {
+        $this->baseTable = $this->groupClass = $this->getNormedAttribute($groupClass);
+        return $this;
+    }
+
+    /**
+     * Return the objectClass where to look for groups
+     *
+     * @return string
+     */
+    public function getGroupClass()
+    {
+        return $this->groupClass;
+    }
+
+    /**
+     * Set the attribute name where to find a user's name
+     *
+     * @param   string  $userNameAttribute
+     *
+     * @return  $this
+     */
+    public function setUserNameAttribute($userNameAttribute)
+    {
+        $this->userNameAttribute = $this->getNormedAttribute($userNameAttribute);
+        return $this;
+    }
+
+    /**
+     * Return the attribute name where to find a user's name
+     *
+     * @return  string
+     */
+    public function getUserNameAttribute()
+    {
+        return $this->userNameAttribute;
+    }
+
+    /**
+     * Set the attribute name where to find a group's name
+     *
+     * @param   string  $groupNameAttribute
+     *
+     * @return  $this
+     */
+    public function setGroupNameAttribute($groupNameAttribute)
+    {
+        $this->groupNameAttribute = $this->getNormedAttribute($groupNameAttribute);
+        return $this;
+    }
+
+    /**
+     * Return the attribute name where to find a group's name
+     *
+     * @return  string
+     */
+    public function getGroupNameAttribute()
+    {
+        return $this->groupNameAttribute;
+    }
+
+    /**
+     * Set the attribute name where to find a group's member
+     *
+     * @param   string  $groupMemberAttribute
+     *
+     * @return  $this
+     */
+    public function setGroupMemberAttribute($groupMemberAttribute)
+    {
+        $this->groupMemberAttribute = $this->getNormedAttribute($groupMemberAttribute);
+        return $this;
+    }
+
+    /**
+     * Return the attribute name where to find a group's member
+     *
+     * @return  string
+     */
+    public function getGroupMemberAttribute()
+    {
+        return $this->groupMemberAttribute;
+    }
+
+    /**
+     * Return a new query for the given columns
+     *
+     * @param   array   $columns    The desired columns, if null all columns will be queried
+     *
+     * @return  RepositoryQuery
+     */
+    public function select(array $columns = null)
+    {
+        $query = parent::select($columns);
+        $query->getQuery()->setBase($this->groupBaseDn);
+        return $query;
+    }
+
+    /**
+     * Initialize this repository's query columns
+     *
+     * @return  array
+     *
+     * @throws  ProgrammingError    In case either $this->groupNameAttribute or $this->groupClass has not been set yet
+     */
+    protected function initializeQueryColumns()
+    {
+        if ($this->groupClass === null) {
+            throw new ProgrammingError('It is required to set the objectClass where to look for groups first');
+        }
+        if ($this->groupNameAttribute === null) {
+            throw new ProgrammingError('It is required to set a attribute name where to find a group\'s name first');
+        }
+
+        if ($this->ds->getCapabilities()->hasAdOid()) {
+            $createdAtAttribute = 'whenCreated';
+            $lastModifiedAttribute = 'whenChanged';
+        } else {
+            $createdAtAttribute = 'createTimestamp';
+            $lastModifiedAttribute = 'modifyTimestamp';
+        }
+
+        $columns = array(
+            'group'         => $this->groupNameAttribute,
+            'group_name'    => $this->groupNameAttribute,
+            'user'          => $this->groupMemberAttribute,
+            'user_name'     => $this->groupMemberAttribute,
+            'created_at'    => $createdAtAttribute,
+            'last_modified' => $lastModifiedAttribute
+        );
+        return array('group' => $columns, 'group_membership' => $columns);
+    }
+
+    /**
+     * Initialize this repository's conversion rules
+     *
+     * @return  array
+     *
+     * @throws  ProgrammingError    In case $this->groupClass has not been set yet
+     */
+    protected function initializeConversionRules()
+    {
+        if ($this->groupClass === null) {
+            throw new ProgrammingError('It is required to set the objectClass where to look for groups first');
+        }
+
+        return array(
+            $this->groupClass => array(
+                'created_at'    => 'generalized_time',
+                'last_modified' => 'generalized_time'
+            )
+        );
+    }
+
+    /**
+     * Validate that the requested table exists
+     *
+     * This will return $this->groupClass in case $table equals "group" or "group_membership".
+     *
+     * @param   string              $table      The table to validate
+     * @param   RepositoryQuery     $query      An optional query to pass as context
+     *                                          (unused by the base implementation)
+     *
+     * @return  string
+     *
+     * @throws  ProgrammingError                In case the given table does not exist
+     */
+    public function requireTable($table, RepositoryQuery $query = null)
+    {
+        $table = parent::requireTable($table, $query);
+        if ($table === 'group' || $table === 'group_membership') {
+            $table = $this->groupClass;
+        }
+
+        return $table;
+    }
+
+    /**
+     * Return the groups the given user is a member of
+     *
+     * @param   User    $user
+     *
+     * @return  array
+     */
+    public function getMemberships(User $user)
+    {
+        $userDn = $this->ds
+            ->select()
+            ->from($this->userClass)
+            ->where($this->userNameAttribute, $user->getUsername())
+            ->setBase($this->userBaseDn)
+            ->setUsePagedResults(false)
+            ->fetchDn();
+
+        if ($userDn === null) {
+            return array();
+        }
+
+        $groupQuery = $this->ds
+            ->select()
+            ->from($this->groupClass, array($this->groupNameAttribute))
+            ->where($this->groupMemberAttribute, $userDn)
+            ->setBase($this->groupBaseDn);
+
+        $groups = array();
+        foreach ($groupQuery as $row) {
+            $groups[] = $row->{$this->groupNameAttribute};
+        }
+
+        return $groups;
+    }
+}
diff --git a/library/Icinga/Authentication/UserGroup/UserGroupBackend.php b/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
index dd4900ea8..585f7c449 100644
--- a/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
@@ -21,6 +21,8 @@ class UserGroupBackend
      */
     protected static $defaultBackends = array(
         'db',
+        'ldap',
+        'msldap',
         //'ini'
     );
 
@@ -156,6 +158,28 @@ class UserGroupBackend
             case 'ini':
                 $backend = new IniUserGroupBackend($resource);
                 break;
+            case 'ldap':
+                $backend = new LdapUserGroupBackend($resource);
+                $backend
+                    ->setGroupBaseDn($backendConfig->base_dn)
+                    ->setUserBaseDn($backendConfig->get('user_base_dn', $backend->getGroupBaseDn()))
+                    ->setGroupClass($backendConfig->get('group_class', 'group'))
+                    ->setUserClass($backendConfig->get('user_class', 'inetOrgPerson'))
+                    ->setGroupNameAttribute($backendConfig->get('group_name_attribute', 'gid'))
+                    ->setUserNameAttribute($backendConfig->get('user_name_attribute', 'uid'))
+                    ->setGroupMemberAttribute($backendConfig->get('group_member_attribute', 'member'));
+                break;
+            case 'msldap':
+                $backend = new LdapUserGroupBackend($resource);
+                $backend
+                    ->setGroupBaseDn($backendConfig->base_dn)
+                    ->setUserBaseDn($backendConfig->get('user_base_dn', $backend->getGroupBaseDn()))
+                    ->setGroupClass($backendConfig->get('group_class', 'group'))
+                    ->setUserClass($backendConfig->get('user_class', 'user'))
+                    ->setGroupNameAttribute($backendConfig->get('group_name_attribute', 'sAMAccountName'))
+                    ->setUserNameAttribute($backendConfig->get('user_name_attribute', $backend->getGroupNameAttribute()))
+                    ->setGroupMemberAttribute($backendConfig->get('group_member_attribute', 'member'));
+                break;
         }
 
         $backend->setName($name);

From d9eb8f9e8dc8bead46b738fd1aa6270ec7ce8e0e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 3 Jun 2015 16:33:22 +0200
Subject: [PATCH 1995/2920] LdapUserGroupBackend: Do not extend LdapRepository

Selecting groups works, but not memberships. Does not make sense
until both things work...

refs #7343
---
 .../UserGroup/LdapUserGroupBackend.php        | 67 ++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
index 1e6addba2..1873cdc8e 100644
--- a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
@@ -8,7 +8,7 @@ use Icinga\Repository\LdapRepository;
 use Icinga\Repository\RepositoryQuery;
 use Icinga\User;
 
-class LdapUserGroupBackend extends LdapRepository implements UserGroupBackendInterface
+class LdapUserGroupBackend /*extends LdapRepository*/ implements UserGroupBackendInterface
 {
     /**
      * The base DN to use for a user query
@@ -77,6 +77,70 @@ class LdapUserGroupBackend extends LdapRepository implements UserGroupBackendInt
         )
     );
 
+    /**
+     * Normed attribute names based on known LDAP environments
+     *
+     * @var array
+     */
+    protected $normedAttributes = array(
+        'uid'               => 'uid',
+        'gid'               => 'gid',
+        'user'              => 'user',
+        'group'             => 'group',
+        'member'            => 'member',
+        'inetorgperson'     => 'inetOrgPerson',
+        'samaccountname'    => 'sAMAccountName'
+    );
+
+    /**
+     * The name of this repository
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * Return the given attribute name normed to known LDAP enviroments, if possible
+     *
+     * @param   string  $name
+     *
+     * @return  string
+     */
+    protected function getNormedAttribute($name)
+    {
+        $loweredName = strtolower($name);
+        if (array_key_exists($loweredName, $this->normedAttributes)) {
+            return $this->normedAttributes[$loweredName];
+        }
+
+        return $name;
+    }
+
+    /**
+     * Set this repository's name
+     *
+     * @param   string  $name
+     *
+     * @return  $this
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    /**
+     * Return this repository's name
+     *
+     * In case no name has been explicitly set yet, the class name is returned.
+     *
+     * @return  string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
     /**
      * Set the base DN to use for a user query
      *
@@ -284,6 +348,7 @@ class LdapUserGroupBackend extends LdapRepository implements UserGroupBackendInt
             $lastModifiedAttribute = 'modifyTimestamp';
         }
 
+        // TODO(jom): Fetching memberships does not work currently, we'll need some aggregate functionality!
         $columns = array(
             'group'         => $this->groupNameAttribute,
             'group_name'    => $this->groupNameAttribute,

From 90d946f149abc57899b4e875e8eedd3b1e66fb38 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 3 Jun 2015 16:40:14 +0200
Subject: [PATCH 1996/2920] LdapUserGroupBackend: We need a datasource,
 actually

Forgot to add this when disabling LdapRepository inheritance...

refs #7343
---
 .../UserGroup/LdapUserGroupBackend.php          | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
index 1873cdc8e..718006fea 100644
--- a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
@@ -99,6 +99,23 @@ class LdapUserGroupBackend /*extends LdapRepository*/ implements UserGroupBacken
      */
     protected $name;
 
+    /**
+     * The datasource being used
+     *
+     * @var Connection
+     */
+    protected $ds;
+
+    /**
+     * Create a new LDAP repository object
+     *
+     * @param   Connection  $ds     The data source to use
+     */
+    public function __construct($ds)
+    {
+        $this->ds = $ds;
+    }
+
     /**
      * Return the given attribute name normed to known LDAP enviroments, if possible
      *

From 7577b37cdb466470373df072ef23cd0d55a0241b Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 3 Jun 2015 15:28:36 +0200
Subject: [PATCH 1997/2920] Change VERSION's format

refs #9247
---
 application/VERSION                         |   3 +-
 application/views/scripts/about/index.phtml |   2 +-
 library/Icinga/Version.php                  | 100 ++++----------------
 3 files changed, 21 insertions(+), 84 deletions(-)

diff --git a/application/VERSION b/application/VERSION
index 47f3a662f..519b667a7 100644
--- a/application/VERSION
+++ b/application/VERSION
@@ -1,2 +1 @@
-GitCommitID: $Format:%H%d$
-GitCommitDate: $Format:%ci$
+$Format:%H%d %ci$
diff --git a/application/views/scripts/about/index.phtml b/application/views/scripts/about/index.phtml
index 3c37a5e73..53f5a1842 100644
--- a/application/views/scripts/about/index.phtml
+++ b/application/views/scripts/about/index.phtml
@@ -8,7 +8,7 @@
             'gitCommitID'   => $this->translate('Git commit ID: %s'),
             'gitCommitDate' => $this->translate('Git commit date: %s')
         ) as $key => $label) {
-            if (null !== ($value = $version[$key])) {
+            if (array_key_exists($key, $version) && null !== ($value = $version[$key])) {
                 $versionInfo[] = sprintf($label, htmlspecialchars($value));
             }
         }
diff --git a/library/Icinga/Version.php b/library/Icinga/Version.php
index 130e75060..4e5b36945 100644
--- a/library/Icinga/Version.php
+++ b/library/Icinga/Version.php
@@ -15,91 +15,29 @@ class Version
      */
     public static function get()
     {
-        $versionInfo = array(
-            'appVersion'    => null,
-            'gitCommitID'   => null,
-            'gitCommitDate' => null
-        );
-
-        if (false !== ($appVersion = @file(
-            Icinga::app()->getApplicationDir() . DIRECTORY_SEPARATOR . 'VERSION',
-            FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES
+        if (false === ($appVersion = @file_get_contents(
+            Icinga::app()->getApplicationDir() . DIRECTORY_SEPARATOR . 'VERSION'
         ))) {
-            foreach ($appVersion as $av) {
-                $matches = array();
-                if (false === ($res = preg_match(
-                    '/(?<!.)\s*(.+?)\s*:\s*(.+?)\s*(?!.)/ms', $av, $matches
-                ))) {
-                    throw new IcingaException('Failed at preg_match()');
-                }
-                if ($res === 0) {
-                    continue;
-                }
-
-                switch ($matches[1]) {
-                    case 'GitCommitID':
-                        if ($versionInfo['gitCommitID'] !== null) {
-                            break;
-                        }
-
-                        $matches2 = array();
-                        if (false === ($res = preg_match(
-                            '/(?<!.)(.+?)(?:\s*\(\s*(.+?)\s*\))?(?!.)/ms',
-                            $matches[2],
-                            $matches2
-                        ))) {
-                            throw new IcingaException('Failed at preg_match()');
-                        }
-                        if ($res === 0) {
-                            break;
-                        }
-
-                        $versionInfo['gitCommitID'] = $matches2[1];
-                        if (! isset($matches2[2])) {
-                            break;
-                        }
-
-                        foreach (preg_split(
-                            '/\s*,\s*/', $matches2[2], -1, PREG_SPLIT_NO_EMPTY
-                        ) as $refName) {
-                            $matches3 = array();
-                            if (false === ($res = preg_match(
-                                '/(?<!.)tag\s*:\s*v(.+?)(?!.)/ms',
-                                $refName,
-                                $matches3
-                            ))) {
-                                throw new IcingaException('Failed at preg_match()');
-                            }
-                            if ($res === 1) {
-                                $versionInfo['appVersion'] = $matches3[1];
-                                break;
-                            }
-                        }
-                        break;
-                    case 'GitCommitDate':
-                        if ($versionInfo['gitCommitDate'] !== null) {
-                            break;
-                        }
-
-                        $matches2 = array();
-                        if (false === ($res = preg_match(
-                            '/(?<!.)(\S+)/ms', $matches[2], $matches2
-                        ))) {
-                            throw new IcingaException('Failed at preg_match()');
-                        }
-                        if ($res === 1) {
-                            $versionInfo['gitCommitDate'] = $matches2[1];
-                        }
-                }
-            }
+            return false;
         }
 
-        foreach (array('gitCommitID', 'gitCommitDate') as $key) {
-            if ($versionInfo[$key] === null) {
-                return false;
-            }
+        $matches = array();
+        if (false === ($res = preg_match(
+            '/(?<!.)\s*(?P<gitCommitID>\w+)(?:\s*\(.*?(?:(?<=[\(,])\s*tag\s*:\s*v(?P<appVersion>.+?)\s*(?=[\),]).*?)?\))?\s*(?P<gitCommitDate>\S+)/ms',
+            $appVersion,
+            $matches
+        ))) {
+            throw new IcingaException('Failed at preg_match()');
+        }
+        if ($res === 0) {
+            return false;
         }
 
-        return $versionInfo;
+        foreach ($matches as $key => $value) {
+            if (is_int($key) || $value === '') {
+                unset($matches[$key]);
+            }
+        }
+        return $matches;
     }
 }

From b409609df753e987dc845e12aa534f436d9c5a47 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 09:11:10 +0200
Subject: [PATCH 1998/2920] monitoring: Use sub query count when joining
 service related tables to the host query

Fixes count problems.

refs #9009
---
 .../library/Monitoring/Backend/Ido/Query/HoststatusQuery.php   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index ca7089e79..e515dd8a2 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -323,6 +323,7 @@ SQL;
             4
         );
         $this->distinct();
+        $this->setUseSubqueryCount(true);
     }
 
     /**
@@ -330,6 +331,7 @@ SQL;
      */
     protected function joinServices()
     {
+        $this->requireVirtualTable('hosts');
         $this->select->join(
             array('s' => $this->prefix . 'services'),
             's.host_object_id = h.host_object_id',
@@ -347,6 +349,7 @@ SQL;
             2
         );
         $this->distinct();
+        $this->setUseSubqueryCount(true);
     }
 
     /**

From 28b1cf57628b4b5fafd9c6a9ccd0ea6e5329173d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 09:13:17 +0200
Subject: [PATCH 1999/2920] monitoring: Support joining the service status
 query by service groups

refs #9009
---
 .../Backend/Ido/Query/ServicestatusQuery.php  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
index 7c099b058..7956082f7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -140,6 +140,11 @@ class ServicestatusQuery extends IdoQuery
             'service_icon_image_alt'    => 's.icon_image_alt',
             'service_notes_url'         => 's.notes_url'
         ),
+        'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
+        ),
         'servicestatus' => array(
             'service_handled'                   => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN 1 ELSE 0 END',
             'service_hard_state'                => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE CASE WHEN ss.state_type = 1 THEN ss.current_state ELSE ss.last_hard_state END END',
@@ -221,6 +226,34 @@ class ServicestatusQuery extends IdoQuery
         );
     }
 
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->select->join(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = so.object_id',
+            array()
+        )->join(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
+            array()
+        )->join(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id',
+            array()
+        )->where(
+            'sgo.is_active = ?',
+            1
+        )
+            ->where(
+                'sgo.objecttype_id = ?',
+                4
+            );
+        $this->distinct();
+    }
+
     /**
      * Join service status
      */

From c299fb3ce9889e1f342b3f07088a69023d908059 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 09:14:26 +0200
Subject: [PATCH 2000/2920] monitoring: Support filtering the host group
 overview by service custom variables

refs #9009
---
 .../Monitoring/DataView/Hostgroupsummary.php  | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
index 56ae7be35..b576c685b 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
@@ -48,8 +48,10 @@ class Hostgroupsummary extends DataView
     {
         return array(
             'hosts_severity',
-            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
-            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+            'host', 'host_alias', 'host_display_name', 'host_name',
+            'hostgroup',
+            'service', 'service_description',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
         );
     }
 
@@ -93,4 +95,18 @@ class Hostgroupsummary extends DataView
             )
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        } else {
+            return parent::isValidFilterTarget($column);
+        }
+    }
 }

From 1ea7335b96b9b220b922e0e696856e5f02a3e1f7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 09:15:09 +0200
Subject: [PATCH 2001/2920] monitoring: Support filtering the service group
 summary by service custom variables

refs #9009
---
 .../Ido/Query/ServicestatussummaryQuery.php   | 54 ++++++-------------
 1 file changed, 16 insertions(+), 38 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php
index 0a04e9c41..306e52843 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php
@@ -24,24 +24,20 @@ class ServicestatussummaryQuery extends IdoQuery
             'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
             'hostgroup_name'    => 'hgo.name1'
         ),
-        'hosts' => array(
-            'host'              => 'so.name1 COLLATE latin1_general_ci',
-            'host_alias'        => 'h.alias COLLATE latin1_general_ci',
-            'host_display_name' => 'h.display_name COLLATE latin1_general_ci',
-            'host_name'         => 'so.name1'
-        ),
         'servicegroups' => array(
             'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
             'servicegroup_name'     => 'sgo.name1',
             'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
         ),
-        'services' => array(
-            'service_display_name' => 's.display_name COLLATE latin1_general_ci'
-        ),
         'servicestatussummary' => array(
+            'host'                                          => 'so.name1 COLLATE latin1_general_ci',
+            'host_alias'                                    => 'h.alias COLLATE latin1_general_ci',
+            'host_display_name'                             => 'h.display_name COLLATE latin1_general_ci',
+            'host_name'                                     => 'so.name1',
             'object_type'                                   => '(\'service\')',
             'service'                                       => 'so.name2 COLLATE latin1_general_ci',
             'service_description'                           => 'so.name2',
+            'service_display_name'                          => 's.display_name COLLATE latin1_general_ci',
             'service_host'                                  => 'so.name1 COLLATE latin1_general_ci',
             'service_host_name'                             => 'so.name1',
             'services_critical'                             => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 2 THEN 1 ELSE 0 END END)',
@@ -75,10 +71,18 @@ class ServicestatussummaryQuery extends IdoQuery
         $this->select->from(
             array('so' => $this->prefix . 'objects'),
             array()
+        )->join(
+            array('s' => $this->prefix . 'services'),
+            's.service_object_id = so.object_id',
+            array()
         )->join(
             array('ss' => $this->prefix . 'servicestatus'),
             'ss.service_object_id = so.object_id',
             array()
+        )->join(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = s.host_object_id',
+            array()
         )->where(
             'so.is_active = ?',
             1
@@ -87,6 +91,8 @@ class ServicestatussummaryQuery extends IdoQuery
             2
         );
         $this->joinedVirtualTables['servicestatussummary'] = true;
+        // Provide table services for custom var joins
+        $this->joinedVirtualTables['services'] = true;
     }
 
     /**
@@ -94,7 +100,6 @@ class ServicestatussummaryQuery extends IdoQuery
      */
     protected function joinHostgroups()
     {
-        $this->requireVirtualTable('services');
         $this->select->join(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = s.host_object_id',
@@ -116,20 +121,6 @@ class ServicestatussummaryQuery extends IdoQuery
         );
     }
 
-    /**
-     * Join hosts
-     */
-    protected function joinHosts()
-    {
-        $this->requireVirtualTable('services');
-        $this->select->join(
-            array('h' => $this->prefix . 'hosts'),
-            'h.host_object_id = s.host_object_id',
-            array()
-        );
-        // TODO(el): Join host objects for is_active check?
-    }
-
     /**
      * Join host status
      */
@@ -138,10 +129,9 @@ class ServicestatussummaryQuery extends IdoQuery
         $this->requireVirtualTable('services');
         $this->select->join(
             array('hs' => $this->prefix . 'hoststatus'),
-            'hs.host_object_id = s.host_object_id',
+            'hs.host_object_id = so.object_id',
             array()
         );
-        // TODO(el): Join host objects for is_active check?
     }
 
     /**
@@ -171,16 +161,4 @@ class ServicestatussummaryQuery extends IdoQuery
         )
         ->group('sgo.name1');
     }
-
-    /**
-     * Join services
-     */
-    protected function joinServices()
-    {
-        $this->select->join(
-            array('s' => $this->prefix . 'services'),
-            's.service_object_id = so.object_id',
-            array()
-        );
-    }
 }

From 82b03547048226362389687b9953d90a0e57b04f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 09:16:28 +0200
Subject: [PATCH 2002/2920] monitoring: Support filtering the service group
 overview by custom variables

refs #9009
---
 .../Monitoring/DataView/Servicegroupsummary.php  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
index 37045a4d5..6eb2d4711 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
@@ -44,7 +44,7 @@ class Servicegroupsummary extends DataView
         return array(
             'services_severity',
             'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
-            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+            'service', 'servicegroup'
         );
     }
 
@@ -89,4 +89,18 @@ class Servicegroupsummary extends DataView
             )
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        } else {
+            return parent::isValidFilterTarget($column);
+        }
+    }
 }

From 3fd0d99db2e01d6db6faf9c504ed92710fdd008b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 09:57:40 +0200
Subject: [PATCH 2003/2920] LdapUserGroupBackend: Add support for custom query
 filters

refs #7343
---
 .../UserGroup/LdapUserGroupBackend.php        | 85 ++++++++++++++++++-
 1 file changed, 81 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
index 718006fea..c0eaa0cb4 100644
--- a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
@@ -4,6 +4,7 @@
 namespace Icinga\Authentication\UserGroup;
 
 use Icinga\Exception\ProgrammingError;
+use Icinga\Protocol\Ldap\Expression;
 use Icinga\Repository\LdapRepository;
 use Icinga\Repository\RepositoryQuery;
 use Icinga\User;
@@ -59,6 +60,20 @@ class LdapUserGroupBackend /*extends LdapRepository*/ implements UserGroupBacken
      */
     protected $groupMemberAttribute;
 
+    /**
+     * The custom LDAP filter to apply on a user query
+     *
+     * @var string
+     */
+    protected $userFilter;
+
+    /**
+     * The custom LDAP filter to apply on a group query
+     *
+     * @var string
+     */
+    protected $groupFilter;
+
     /**
      * The columns which are not permitted to be queried
      *
@@ -327,6 +342,58 @@ class LdapUserGroupBackend /*extends LdapRepository*/ implements UserGroupBacken
         return $this->groupMemberAttribute;
     }
 
+    /**
+     * Set the custom LDAP filter to apply on a user query
+     *
+     * @param   string  $filter
+     *
+     * @return  $this
+     */
+    public function setUserFilter($filter)
+    {
+        if (($filter = trim($filter))) {
+            $this->userFilter = $filter;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Return the custom LDAP filter to apply on a user query
+     *
+     * @return  string
+     */
+    public function getUserFilter()
+    {
+        return $this->userFilter;
+    }
+
+    /**
+     * Set the custom LDAP filter to apply on a group query
+     *
+     * @param   string  $filter
+     *
+     * @return  $this
+     */
+    public function setGroupFilter($filter)
+    {
+        if (($filter = trim($filter))) {
+            $this->groupFilter = $filter;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Return the custom LDAP filter to apply on a group query
+     *
+     * @return  string
+     */
+    public function getGroupFilter()
+    {
+        return $this->groupFilter;
+    }
+
     /**
      * Return a new query for the given columns
      *
@@ -338,6 +405,11 @@ class LdapUserGroupBackend /*extends LdapRepository*/ implements UserGroupBacken
     {
         $query = parent::select($columns);
         $query->getQuery()->setBase($this->groupBaseDn);
+        if ($this->groupFilter) {
+            // TODO(jom): This should differentiate between groups and their memberships
+            $query->getQuery()->where(new Expression($this->groupFilter));
+        }
+
         return $query;
     }
 
@@ -430,15 +502,17 @@ class LdapUserGroupBackend /*extends LdapRepository*/ implements UserGroupBacken
      */
     public function getMemberships(User $user)
     {
-        $userDn = $this->ds
+        $userQuery = $this->ds
             ->select()
             ->from($this->userClass)
             ->where($this->userNameAttribute, $user->getUsername())
             ->setBase($this->userBaseDn)
-            ->setUsePagedResults(false)
-            ->fetchDn();
+            ->setUsePagedResults(false);
+        if ($this->userFilter) {
+            $userQuery->where(new Expression($this->userFilter));
+        }
 
-        if ($userDn === null) {
+        if (($userDn = $userQuery->fetchDn()) === null) {
             return array();
         }
 
@@ -447,6 +521,9 @@ class LdapUserGroupBackend /*extends LdapRepository*/ implements UserGroupBacken
             ->from($this->groupClass, array($this->groupNameAttribute))
             ->where($this->groupMemberAttribute, $userDn)
             ->setBase($this->groupBaseDn);
+        if ($this->groupFilter) {
+            $groupQuery->where(new Expression($this->groupFilter));
+        }
 
         $groups = array();
         foreach ($groupQuery as $row) {

From a1c1ca13e9cb0a5e74274fdf5f825f24cab26a47 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 5 Jun 2015 10:06:43 +0200
Subject: [PATCH 2004/2920] monitoring/css: align feature commands

---
 modules/monitoring/public/css/module.less | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 619dd0b30..191460a4a 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -217,6 +217,17 @@ table.avp {
             color: #222;
         }
     }
+
+    .object-features {
+        label {
+            font-weight: normal;
+            margin-right: 0;
+        }
+
+        input {
+            margin: 0;
+        }
+    }
 }
 
 table.avp .customvar ul {

From c857a3de769882a37af5bfc9c9a93a9d2c63dadb Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 5 Jun 2015 10:15:54 +0200
Subject: [PATCH 2005/2920] monitoring/css: change section title styling

* white on gray
* temporarily disabled autosubmit hint
---
 modules/monitoring/public/css/module.less | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 191460a4a..337d776a4 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -218,6 +218,20 @@ table.avp {
         }
     }
 
+    h4 {
+        font-weight: normal;
+        color: white;
+        text-transform: uppercase;
+        background-color: #aaa;
+        display: block;
+        padding: 0.2em 1em 0.2em 1em;
+        font-size: 0.9em;
+    }
+
+    .autosubmit-warning {
+        display: none;
+    }
+
     .object-features {
         label {
             font-weight: normal;

From 7b176261f896a473b6a26c295114e925c24c58d2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 10:16:17 +0200
Subject: [PATCH 2006/2920] monitoring: Add query for service group summaries

refs #9009
---
 .../Ido/Query/ServicegroupsummaryQuery.php    | 136 ++++++++++++++++++
 1 file changed, 136 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php
new file mode 100644
index 000000000..76b004272
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php
@@ -0,0 +1,136 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+use Icinga\Data\Filter\Filter;
+use Zend_Db_Expr;
+use Zend_Db_Select;
+
+/**
+ * Query for service group summary
+ */
+class ServicegroupsummaryQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'servicestatussummary' => array(
+            'servicegroup'                                  => 'servicegroup COLLATE latin1_general_ci',
+            'servicegroup_alias'                            => 'servicegroup_alias COLLATE latin1_general_ci',
+            'servicegroup_name'                             => 'servicegroup_name',
+            'services_critical'                             => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 THEN 1 ELSE 0 END)',
+            'services_critical_handled'                     => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND handled + host_state > 0 THEN 1 ELSE 0 END)',
+            'services_critical_handled_last_state_change'   => 'MAX(CASE WHEN object_type = \'service\' AND state = 2 AND handled + host_state > 0 THEN state_change ELSE 0 END)',
+            'services_critical_unhandled'                   => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND handled + host_state = 0 THEN 1 ELSE 0 END)',
+            'services_critical_unhandled_last_state_change' => 'MAX(CASE WHEN object_type = \'service\' AND state = 2 AND handled + host_state = 0 THEN state_change ELSE 0 END)',
+            'services_ok'                                   => 'SUM(CASE WHEN object_type = \'service\' AND state = 0 THEN 1 ELSE 0 END)',
+            'services_ok_last_state_change'                 => 'MAX(CASE WHEN object_type = \'service\' AND state = 0 THEN state_change ELSE 0 END)',
+            'services_pending'                              => 'SUM(CASE WHEN object_type = \'service\' AND state = 99 THEN 1 ELSE 0 END)',
+            'services_pending_last_state_change'            => 'MAX(CASE WHEN object_type = \'service\' AND state = 99 THEN state_change ELSE 0 END)',
+            'services_severity'                             => 'MAX(CASE WHEN object_type = \'service\' THEN severity ELSE 0 END)',
+            'services_total'                                => 'SUM(CASE WHEN object_type = \'service\' THEN 1 ELSE 0 END)',
+            'services_unknown'                              => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 THEN 1 ELSE 0 END)',
+            'services_unknown_handled'                      => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND handled + host_state > 0 THEN 1 ELSE 0 END)',
+            'services_unknown_handled_last_state_change'    => 'MAX(CASE WHEN object_type = \'service\' AND state = 3 AND handled + host_state > 0 THEN state_change ELSE 0 END)',
+            'services_unknown_unhandled'                    => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND handled + host_state = 0 THEN 1 ELSE 0 END)',
+            'services_unknown_unhandled_last_state_change'  => 'MAX(CASE WHEN object_type = \'service\' AND state = 3 AND handled + host_state = 0 THEN state_change ELSE 0 END)',
+            'services_warning'                              => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 THEN 1 ELSE 0 END)',
+            'services_warning_handled'                      => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND handled + host_state > 0 THEN 1 ELSE 0 END)',
+            'services_warning_handled_last_state_change'    => 'MAX(CASE WHEN object_type = \'service\' AND state = 1 AND handled + host_state > 0 THEN state_change ELSE 0 END)',
+            'services_warning_unhandled'                    => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND handled + host_state = 0 THEN 1 ELSE 0 END)',
+            'services_warning_unhandled_last_state_change'  => 'MAX(CASE WHEN object_type = \'service\' AND state = 1 AND handled + host_state = 0 THEN state_change ELSE 0 END)'
+        )
+    );
+
+    /**
+     * The union
+     *
+     * @var Zend_Db_Select
+     */
+    protected $summaryQuery;
+
+    /**
+     * Subqueries used for the summary query
+     *
+     * @var IdoQuery[]
+     */
+    protected $subQueries = array();
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addFilter(Filter $filter)
+    {
+        foreach ($this->subQueries as $sub) {
+            $sub->applyFilter(clone $filter);
+        }
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        // TODO(el): Allow to switch between hard and soft states
+        $hosts = $this->createSubQuery(
+            'Hoststatus',
+            array(
+                'handled'       => 'host_handled',
+                'host_state'    => new Zend_Db_Expr('NULL'),
+                'servicegroup_alias',
+                'servicegroup_name',
+                'object_type',
+                'severity'      => 'host_severity',
+                'state'         => 'host_state',
+                'state_change'  => 'host_last_state_change'
+            )
+        );
+        $this->subQueries[] = $hosts;
+        $services = $this->createSubQuery(
+            'Servicestatus',
+            array(
+                'handled'       => 'service_handled',
+                'host_state'    => 'host_state',
+                'servicegroup_alias',
+                'servicegroup_name',
+                'object_type',
+                'severity'      => new Zend_Db_Expr('NULL'),
+                'state'         => 'service_state',
+                'state_change'  => 'service_last_state_change'
+            )
+        );
+        $this->subQueries[] = $services;
+        $this->summaryQuery = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL);
+        $this->select->from(array('statussummary' => $this->summaryQuery), array());
+        $this->group('servicegroup_name');
+        $this->joinedVirtualTables['servicestatussummary'] = true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function order($columnOrAlias, $dir = null)
+    {
+        if (! $this->hasAliasName($columnOrAlias)) {
+            foreach ($this->subQueries as $sub) {
+                $sub->requireColumn($columnOrAlias);
+            }
+        }
+        return parent::order($columnOrAlias, $dir);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function where($condition, $value = null)
+    {
+        $this->requireColumn($condition);
+        foreach ($this->subQueries as $sub) {
+            $sub->where($condition, $value);
+        }
+        return $this;
+    }
+}

From 480becd3d6b19a4104349c08e29db93f620458fe Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 10:16:41 +0200
Subject: [PATCH 2007/2920] monitoring: Fix pagination of the host group
 overview

refs #9009
---
 .../Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
index 42e379e01..045682cd6 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
@@ -112,7 +112,8 @@ class HostgroupsummaryQuery extends IdoQuery
         );
         $this->subQueries[] = $services;
         $this->summaryQuery = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL);
-        $this->select->from(array('statussummary' => $this->summaryQuery), array())->group('hostgroup_name');
+        $this->select->from(array('statussummary' => $this->summaryQuery), array());
+        $this->group('hostgroup_name');
         $this->joinedVirtualTables['hoststatussummary'] = true;
     }
 

From 3f0219789180c22415f34e6dc54660119dacbb32 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 10:17:07 +0200
Subject: [PATCH 2008/2920] monitoring: Remove allowCustomVars form the host
 status summary query

allowCustomVars is not needed on this query because all filters are passed to the underlying query.

refs #9009
---
 .../Monitoring/Backend/Ido/Query/HoststatussummaryQuery.php  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatussummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatussummaryQuery.php
index 7965d897a..aed8c20ea 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatussummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatussummaryQuery.php
@@ -10,11 +10,6 @@ use Icinga\Data\Filter\Filter;
  */
 class HoststatussummaryQuery extends IdoQuery
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $allowCustomVars = true;
-
     /**
      * {@inheritdoc}
      */

From 76e2d8f5eec29d754b4562149ee68cb7962906b5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 10:17:54 +0200
Subject: [PATCH 2009/2920] monitoring: Add service_last_state_change to the
 service status query

refs #9009
---
 .../library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
index 7956082f7..aed350491 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -149,6 +149,7 @@ class ServicestatusQuery extends IdoQuery
             'service_handled'                   => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN 1 ELSE 0 END',
             'service_hard_state'                => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE CASE WHEN ss.state_type = 1 THEN ss.current_state ELSE ss.last_hard_state END END',
             'service_last_hard_state_change'    => 'UNIX_TIMESTAMP(ss.last_hard_state_change)',
+            'service_last_state_change'         => 'UNIX_TIMESTAMP(ss.last_state_change)',
             'service_state'                     => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END',
             'service_unhandled'                 => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END'
         )

From 602f0cf7556489675dbf488ca429898415f5f383 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 5 Jun 2015 10:18:24 +0200
Subject: [PATCH 2010/2920] Move Version to Icinga\Application\

refs #9247
---
 application/controllers/AboutController.php  | 2 +-
 library/Icinga/{ => Application}/Version.php | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename library/Icinga/{ => Application}/Version.php (95%)

diff --git a/application/controllers/AboutController.php b/application/controllers/AboutController.php
index 376490443..a4247f234 100644
--- a/application/controllers/AboutController.php
+++ b/application/controllers/AboutController.php
@@ -4,7 +4,7 @@
 # namespace Icinga\Application\Controllers;
 
 use Icinga\Web\Controller\ActionController;
-use Icinga\Version;
+use Icinga\Application\Version;
 
 class AboutController extends ActionController
 {
diff --git a/library/Icinga/Version.php b/library/Icinga/Application/Version.php
similarity index 95%
rename from library/Icinga/Version.php
rename to library/Icinga/Application/Version.php
index 4e5b36945..0c49330ae 100644
--- a/library/Icinga/Version.php
+++ b/library/Icinga/Application/Version.php
@@ -1,9 +1,8 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga;
+namespace Icinga\Application;
 
-use Icinga\Application\Icinga;
 use Icinga\Exception\IcingaException;
 
 class Version

From ee2462a6b2e55eddfb796d20a16f70946c92764d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 10:19:28 +0200
Subject: [PATCH 2011/2920] LdapUserGroupBackend: Let the backend decide which
 defaults to use

refs #7343
---
 .../UserGroup/LdapUserGroupBackend.php        | 62 +++++++++++++++++++
 .../UserGroup/UserGroupBackend.php            | 19 +-----
 2 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
index c0eaa0cb4..d2387b7b4 100644
--- a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Authentication\UserGroup;
 
+use Icinga\Data\ConfigObject;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Protocol\Ldap\Expression;
 use Icinga\Repository\LdapRepository;
@@ -532,4 +533,65 @@ class LdapUserGroupBackend /*extends LdapRepository*/ implements UserGroupBacken
 
         return $groups;
     }
+
+    /**
+     * Apply the given configuration on this backend
+     *
+     * @param   ConfigObject    $config
+     *
+     * @return  $this
+     */
+    public function setConfig(ConfigObject $config)
+    {
+        if ($config->backend === 'ldap') {
+            $defaults = $this->getOpenLdapDefaults();
+        } elseif ($config->backend === 'msldap') {
+            $defaults = $this->getActiveDirectoryDefaults();
+        } else {
+            $defaults = new ConfigObject();
+        }
+
+        return $this
+            ->setGroupBaseDn($config->base_dn)
+            ->setUserBaseDn($config->get('user_base_dn', $this->getGroupBaseDn()))
+            ->setGroupClass($config->get('group_class', $defaults->group_class))
+            ->setUserClass($config->get('user_class', $defaults->user_class))
+            ->setGroupNameAttribute($config->get('group_name_attribute', $defaults->group_name_attribute))
+            ->setUserNameAttribute($config->get('user_name_attribute', $defaults->user_name_attribute))
+            ->setGroupMemberAttribute($config->get('group_member_attribute', $defaults->group_member_attribute))
+            ->setGroupFilter($config->filter)
+            ->setUserFilter($config->user_filter);
+    }
+
+    /**
+     * Return the configuration defaults for an OpenLDAP environment
+     *
+     * @return  ConfigObject
+     */
+    protected function getOpenLdapDefaults()
+    {
+        return new ConfigObject(array(
+            'group_class'               => 'group',
+            'user_class'                => 'inetOrgPerson',
+            'group_name_attribute'      => 'gid',
+            'user_name_attribute'       => 'uid',
+            'group_member_attribute'    => 'member'
+        ));
+    }
+
+    /**
+     * Return the configuration defaults for an ActiveDirectory environment
+     *
+     * @return  ConfigObject
+     */
+    protected function getActiveDirectoryDefaults()
+    {
+        return new ConfigObject(array(
+            'group_class'               => 'group',
+            'user_class'                => 'user',
+            'group_name_attribute'      => 'sAMAccountName',
+            'user_name_attribute'       => 'sAMAccountName',
+            'group_member_attribute'    => 'member'
+        ));
+    }
 }
diff --git a/library/Icinga/Authentication/UserGroup/UserGroupBackend.php b/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
index 585f7c449..978860a37 100644
--- a/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/UserGroupBackend.php
@@ -159,26 +159,9 @@ class UserGroupBackend
                 $backend = new IniUserGroupBackend($resource);
                 break;
             case 'ldap':
-                $backend = new LdapUserGroupBackend($resource);
-                $backend
-                    ->setGroupBaseDn($backendConfig->base_dn)
-                    ->setUserBaseDn($backendConfig->get('user_base_dn', $backend->getGroupBaseDn()))
-                    ->setGroupClass($backendConfig->get('group_class', 'group'))
-                    ->setUserClass($backendConfig->get('user_class', 'inetOrgPerson'))
-                    ->setGroupNameAttribute($backendConfig->get('group_name_attribute', 'gid'))
-                    ->setUserNameAttribute($backendConfig->get('user_name_attribute', 'uid'))
-                    ->setGroupMemberAttribute($backendConfig->get('group_member_attribute', 'member'));
-                break;
             case 'msldap':
                 $backend = new LdapUserGroupBackend($resource);
-                $backend
-                    ->setGroupBaseDn($backendConfig->base_dn)
-                    ->setUserBaseDn($backendConfig->get('user_base_dn', $backend->getGroupBaseDn()))
-                    ->setGroupClass($backendConfig->get('group_class', 'group'))
-                    ->setUserClass($backendConfig->get('user_class', 'user'))
-                    ->setGroupNameAttribute($backendConfig->get('group_name_attribute', 'sAMAccountName'))
-                    ->setUserNameAttribute($backendConfig->get('user_name_attribute', $backend->getGroupNameAttribute()))
-                    ->setGroupMemberAttribute($backendConfig->get('group_member_attribute', 'member'));
+                $backend->setConfig($backendConfig);
                 break;
         }
 

From cbc731034a20b6f4860ec5e70887f4d98fe5f0a9 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 5 Jun 2015 10:23:17 +0200
Subject: [PATCH 2012/2920] Don't throw any exception

refs #9247
---
 library/Icinga/Application/Version.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/library/Icinga/Application/Version.php b/library/Icinga/Application/Version.php
index 0c49330ae..65b6138d9 100644
--- a/library/Icinga/Application/Version.php
+++ b/library/Icinga/Application/Version.php
@@ -3,8 +3,6 @@
 
 namespace Icinga\Application;
 
-use Icinga\Exception\IcingaException;
-
 class Version
 {
     /**
@@ -25,10 +23,7 @@ class Version
             '/(?<!.)\s*(?P<gitCommitID>\w+)(?:\s*\(.*?(?:(?<=[\(,])\s*tag\s*:\s*v(?P<appVersion>.+?)\s*(?=[\),]).*?)?\))?\s*(?P<gitCommitDate>\S+)/ms',
             $appVersion,
             $matches
-        ))) {
-            throw new IcingaException('Failed at preg_match()');
-        }
-        if ($res === 0) {
+        )) || $res === 0) {
             return false;
         }
 

From e0b117915ab9a829d52cf9869c861a382f8fc4a3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 10:28:50 +0200
Subject: [PATCH 2013/2920] monitoring: Use a sub select in the service status
 summary

refs #9009
---
 .../Ido/Query/ServicestatussummaryQuery.php   | 179 +++++-------------
 1 file changed, 51 insertions(+), 128 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php
index 306e52843..325203717 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php
@@ -2,6 +2,7 @@
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+use Icinga\Data\Filter\Filter;
 
 /**
  * Query for service status summary
@@ -13,152 +14,74 @@ class ServicestatussummaryQuery extends IdoQuery
     /**
      * {@inheritdoc}
      */
-    protected $allowCustomVars = true;
+    protected $columnMap = array(
+        'servicestatussummary' => array(
+            'services_critical'                             => 'SUM(CASE WHEN state = 2 THEN 1 ELSE 0 END)',
+            'services_critical_handled'                     => 'SUM(CASE WHEN state = 2 AND handled = 1 THEN 1 ELSE 0 END)',
+//            'services_critical_handled_last_state_change'   => 'MAX(CASE WHEN state = 2 AND handled = 1 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
+            'services_critical_unhandled'                   => 'SUM(CASE WHEN state = 2 AND handled = 0 THEN 1 ELSE 0 END)',
+//            'services_critical_unhandled_last_state_change' => 'MAX(CASE WHEN state = 2 AND handled = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
+            'services_ok'                                   => 'SUM(CASE WHEN state = 0 THEN 1 ELSE 0 END)',
+//            'services_ok_last_state_change'                 => 'MAX(CASE WHEN state = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
+            'services_pending'                              => 'SUM(CASE WHEN state = 99 THEN 1 ELSE 0 END)',
+//            'services_pending_last_state_change'            => 'MAX(CASE WHEN state = 99 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
+            'services_total'                                => 'SUM(1)',
+            'services_unknown'                              => 'SUM(CASE WHEN state = 3 THEN 1 ELSE 0 END)',
+            'services_unknown_handled'                      => 'SUM(CASE WHEN state = 3 AND handled = 1 THEN 1 ELSE 0 END)',
+//            'services_unknown_handled_last_state_change'    => 'MAX(CASE WHEN state = 3 AND handled = 1 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
+            'services_unknown_unhandled'                    => 'SUM(CASE WHEN state = 3 AND handled = 0 THEN 1 ELSE 0 END)',
+//            'services_unknown_unhandled_last_state_change'  => 'MAX(CASE WHEN state = 3 AND handled = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
+            'services_warning'                              => 'SUM(CASE WHEN state = 1 THEN 1 ELSE 0 END)',
+            'services_warning_handled'                      => 'SUM(CASE WHEN state = 1 AND handled = 1 THEN 1 ELSE 0 END)',
+//            'services_warning_handled_last_state_change'    => 'MAX(CASE WHEN state = 1 AND handled = 1 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
+            'services_warning_unhandled'                    => 'SUM(CASE WHEN state = 1 AND handled = 0 THEN 1 ELSE 0 END)',
+//            'services_warning_unhandled_last_state_change'  => 'MAX(CASE WHEN state = 1 AND handled = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)'
+        )
+    );
+
+    /**
+     * The service status sub select
+     *
+     * @var ServiceStatusQuery
+     */
+    protected $subSelect;
 
     /**
      * {@inheritdoc}
      */
-    protected $columnMap = array(
-        'hostgroups' => array(
-            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
-            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
-            'hostgroup_name'    => 'hgo.name1'
-        ),
-        'servicegroups' => array(
-            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
-            'servicegroup_name'     => 'sgo.name1',
-            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
-        ),
-        'servicestatussummary' => array(
-            'host'                                          => 'so.name1 COLLATE latin1_general_ci',
-            'host_alias'                                    => 'h.alias COLLATE latin1_general_ci',
-            'host_display_name'                             => 'h.display_name COLLATE latin1_general_ci',
-            'host_name'                                     => 'so.name1',
-            'object_type'                                   => '(\'service\')',
-            'service'                                       => 'so.name2 COLLATE latin1_general_ci',
-            'service_description'                           => 'so.name2',
-            'service_display_name'                          => 's.display_name COLLATE latin1_general_ci',
-            'service_host'                                  => 'so.name1 COLLATE latin1_general_ci',
-            'service_host_name'                             => 'so.name1',
-            'services_critical'                             => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 2 THEN 1 ELSE 0 END END)',
-            'services_critical_handled'                     => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 2 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN 1 ELSE 0 END END)',
-            'services_critical_handled_last_state_change'   => 'MAX(CASE WHEN ss.has_been_checked != 1 THEN NULL ELSE CASE WHEN ss.current_state = 2 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN UNIX_TIMESTAMP(ss.last_state_change) ELSE NULL END END)',
-            'services_critical_unhandled'                   => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 2 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END END)',
-            'services_critical_unhandled_last_state_change' => 'MAX(CASE WHEN ss.has_been_checked != 1 THEN NULL ELSE CASE WHEN ss.current_state = 2 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) = 0 THEN UNIX_TIMESTAMP(ss.last_state_change) ELSE NULL END END)',
-            'services_ok'                                   => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 0 THEN 1 ELSE 0 END END)',
-            'services_ok_last_state_change'                 => 'MAX(CASE WHEN ss.has_been_checked != 1 THEN NULL ELSE CASE WHEN ss.current_state = 0 THEN UNIX_TIMESTAMP(ss.last_state_change) ELSE NULL END END)',
-            'services_pending'                              => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 1 ELSE 0 END)',
-            'services_pending_last_state_change'            => 'MAX(CASE WHEN ss.has_been_checked != 1 THEN UNIX_TIMESTAMP(ss.last_state_change) ELSE NULL END)',
-            'services_total'                                => 'SUM(1)',
-            'services_unknown'                              => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 3 THEN 1 ELSE 0 END END)',
-            'services_unknown_handled'                      => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 3 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN 1 ELSE 0 END END)',
-            'services_unknown_handled_last_state_change'    => 'MAX(CASE WHEN ss.has_been_checked != 1 THEN NULL ELSE CASE WHEN ss.current_state = 3 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN UNIX_TIMESTAMP(ss.last_state_change) ELSE NULL END END)',
-            'services_unknown_unhandled'                    => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 3 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END END)',
-            'services_unknown_unhandled_last_state_change'  => 'MAX(CASE WHEN ss.has_been_checked != 1 THEN NULL ELSE CASE WHEN ss.current_state = 3 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) = 0 THEN UNIX_TIMESTAMP(ss.last_state_change) ELSE NULL END END)',
-            'services_warning'                              => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 1 THEN 1 ELSE 0 END END)',
-            'services_warning_handled'                      => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 1 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN 1 ELSE 0 END END)',
-            'services_warning_handled_last_state_change'    => 'MAX(CASE WHEN ss.has_been_checked != 1 THEN NULL ELSE CASE WHEN ss.current_state = 1 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN UNIX_TIMESTAMP(ss.last_state_change) ELSE NULL END END)',
-            'services_warning_unhandled'                    => 'SUM(CASE WHEN ss.has_been_checked != 1 THEN 0 ELSE CASE WHEN ss.current_state = 1 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END END)',
-            'services_warning_unhandled_last_state_change'  => 'MAX(CASE WHEN ss.has_been_checked != 1 THEN NULL ELSE CASE WHEN ss.current_state = 1 AND (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) = 0 THEN UNIX_TIMESTAMP(ss.last_state_change) ELSE NULL END END)'
-        )
-    );
+    public function addFilter(Filter $filter)
+    {
+        $this->subSelect->applyFilter(clone $filter);
+        return $this;
+    }
 
     /**
      * {@inheritdoc}
      */
     protected function joinBaseTables()
     {
+        // TODO(el): Allow to switch between hard and soft states
+        $this->subSelect = $this->createSubQuery(
+            'servicestatus',
+            array(
+                'handled'       => 'service_handled',
+                'state'         => 'service_state',
+                'state_change'  => 'service_last_state_change'
+            )
+        );
         $this->select->from(
-            array('so' => $this->prefix . 'objects'),
+            array('servicestatussummary' => $this->subSelect->setIsSubQuery(true)),
             array()
-        )->join(
-            array('s' => $this->prefix . 'services'),
-            's.service_object_id = so.object_id',
-            array()
-        )->join(
-            array('ss' => $this->prefix . 'servicestatus'),
-            'ss.service_object_id = so.object_id',
-            array()
-        )->join(
-            array('h' => $this->prefix . 'hosts'),
-            'h.host_object_id = s.host_object_id',
-            array()
-        )->where(
-            'so.is_active = ?',
-            1
-        )->where(
-            'so.objecttype_id = ?',
-            2
         );
         $this->joinedVirtualTables['servicestatussummary'] = true;
-        // Provide table services for custom var joins
-        $this->joinedVirtualTables['services'] = true;
     }
 
     /**
-     * Join host groups
+     * {@inheritdoc}
      */
-    protected function joinHostgroups()
+    public function where($condition, $value = null)
     {
-        $this->select->join(
-            array('hgm' => $this->prefix . 'hostgroup_members'),
-            'hgm.host_object_id = s.host_object_id',
-            array()
-        )->join(
-            array('hg' => $this->prefix . 'hostgroups'),
-            'hg.hostgroup_id = hgm.hostgroup_id',
-            array()
-        )->join(
-            array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id',
-            array()
-        )->where(
-            'hgo.is_active = ?',
-            1
-        )->where(
-            'hgo.objecttype_id = ?',
-            3
-        );
-    }
-
-    /**
-     * Join host status
-     */
-    protected function joinHoststatus()
-    {
-        $this->requireVirtualTable('services');
-        $this->select->join(
-            array('hs' => $this->prefix . 'hoststatus'),
-            'hs.host_object_id = so.object_id',
-            array()
-        );
-    }
-
-    /**
-     * Join service groups
-     */
-    protected function joinServicegroups()
-    {
-        $this->select->join(
-            array('sgm' => $this->prefix . 'servicegroup_members'),
-            'sgm.service_object_id = so.object_id',
-            array()
-        )->join(
-            array('sg' => $this->prefix . 'servicegroups'),
-            'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
-            array()
-        )->join(
-            array('sgo' => $this->prefix . 'objects'),
-            'sgo.object_id = sg.servicegroup_object_id',
-            array()
-        )->where(
-            'sgo.is_active = ?',
-            1
-        )
-        ->where(
-            'sgo.objecttype_id = ?',
-            4
-        )
-        ->group('sgo.name1');
+        $this->subSelect->where($condition, $value);
+        return $this;
     }
 }

From 0719c294d8c6ccc2b8010dd7426d2b4e4308ca5c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 10:29:30 +0200
Subject: [PATCH 2014/2920] monitoring: Use the service group summary query

refs #9009
---
 .../library/Monitoring/DataView/Servicegroupsummary.php   | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
index 6eb2d4711..290c8f697 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
@@ -48,14 +48,6 @@ class Servicegroupsummary extends DataView
         );
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function getQueryName()
-    {
-        return 'servicestatussummary';
-    }
-
     /**
      * {@inheritdoc}
      */

From 127489ca20cc22255024e6c017220fc28f983c84 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 10:40:47 +0200
Subject: [PATCH 2015/2920] UserBackend: Allow to only pass a backend's name

---
 library/Icinga/Authentication/User/UserBackend.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/User/UserBackend.php b/library/Icinga/Authentication/User/UserBackend.php
index 42a4c2b42..7afd561a7 100644
--- a/library/Icinga/Authentication/User/UserBackend.php
+++ b/library/Icinga/Authentication/User/UserBackend.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Authentication\User;
 
+use Icinga\Application\Config;
 use Icinga\Application\Logger;
 use Icinga\Application\Icinga;
 use Icinga\Data\ConfigObject;
@@ -106,8 +107,17 @@ class UserBackend
      *
      * @throws  ConfigurationError
      */
-    public static function create($name, ConfigObject $backendConfig)
+    public static function create($name, ConfigObject $backendConfig = null)
     {
+        if ($backendConfig === null) {
+            $authConfig = Config::app('authentication');
+            if ($authConfig->hasSection($name)) {
+                $backendConfig = $authConfig->getSection($name);
+            } else {
+                throw new ConfigurationError('User backend "%s" does not exist', $name);
+            }
+        }
+
         if ($backendConfig->name !== null) {
             $name = $backendConfig->name;
         }

From 0ab192cd1f75a90a1e23e913a2819e5429afb602 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 10:41:47 +0200
Subject: [PATCH 2016/2920] LdapUserGroupBackend: Allow to link a user backend

refs #7343
---
 .../UserGroup/LdapUserGroupBackend.php        | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
index d2387b7b4..42d67a0e8 100644
--- a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
@@ -3,7 +3,10 @@
 
 namespace Icinga\Authentication\UserGroup;
 
+use Icinga\Authentication\User\UserBackend;
+use Icinga\Authentication\User\LdapUserBackend;
 use Icinga\Data\ConfigObject;
+use Icinga\Exception\ConfigurationError;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Protocol\Ldap\Expression;
 use Icinga\Repository\LdapRepository;
@@ -540,6 +543,8 @@ class LdapUserGroupBackend /*extends LdapRepository*/ implements UserGroupBacken
      * @param   ConfigObject    $config
      *
      * @return  $this
+     *
+     * @throws  ConfigurationError      In case a linked user backend does not exist or is not a LdapUserBackend
      */
     public function setConfig(ConfigObject $config)
     {
@@ -551,6 +556,20 @@ class LdapUserGroupBackend /*extends LdapRepository*/ implements UserGroupBacken
             $defaults = new ConfigObject();
         }
 
+        if ($config->user_backend) {
+            $userBackend = UserBackend::create($config->user_backend);
+            if (! $userBackend instanceof LdapUserBackend) {
+                throw new ConfigurationError('User backend "%s" is not of type LDAP', $config->user_backend);
+            }
+
+            $defaults->merge(array(
+                'user_base_dn'          => $userBackend->getBaseDn(),
+                'user_class'            => $userBackend->getUserClass(),
+                'user_name_attribute'   => $userBackend->getUserNameAttribute(),
+                'user_filter'           => $userBackend->getFilter()
+            ));
+        }
+
         return $this
             ->setGroupBaseDn($config->base_dn)
             ->setUserBaseDn($config->get('user_base_dn', $this->getGroupBaseDn()))

From 02d2ea682e0774cbe072626fd7dd412d19457e6f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 10:51:54 +0200
Subject: [PATCH 2017/2920] LdapUserGroupBackend: Do not permit to link
 different directories

I cannot think of a valid usecase right now. In case someone got one,
revert this commit and make use of the backend itself and not only
its configuration.

refs #7343
---
 .../UserGroup/LdapUserGroupBackend.php              | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
index 42d67a0e8..a51df856d 100644
--- a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
@@ -544,7 +544,7 @@ class LdapUserGroupBackend /*extends LdapRepository*/ implements UserGroupBacken
      *
      * @return  $this
      *
-     * @throws  ConfigurationError      In case a linked user backend does not exist or is not a LdapUserBackend
+     * @throws  ConfigurationError      In case a linked user backend does not exist or is invalid
      */
     public function setConfig(ConfigObject $config)
     {
@@ -562,6 +562,17 @@ class LdapUserGroupBackend /*extends LdapRepository*/ implements UserGroupBacken
                 throw new ConfigurationError('User backend "%s" is not of type LDAP', $config->user_backend);
             }
 
+            if (
+                $this->ds->getHostname() !== $userBackend->getDataSource()->getHostname()
+                || $this->ds->getPort() !== $userBackend->getDataSource()->getPort()
+            ) {
+                // TODO(jom): Elaborate whether it makes sense to link directories on different hosts
+                throw new ConfigurationError(
+                    'It is required that a linked user backend refers to the '
+                    . 'same directory as it\'s user group backend counterpart'
+                );
+            }
+
             $defaults->merge(array(
                 'user_base_dn'          => $userBackend->getBaseDn(),
                 'user_class'            => $userBackend->getUserClass(),

From cacd97fb4665284e325a4ee287152b1bf1b999d6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 11:09:31 +0200
Subject: [PATCH 2018/2920] LdapUserGroupBackend: Make default configuration
 providers public

I'd like to access these when preparing a config form.

refs #7343
---
 .../Icinga/Authentication/UserGroup/LdapUserGroupBackend.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
index a51df856d..60b94ec27 100644
--- a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
@@ -598,7 +598,7 @@ class LdapUserGroupBackend /*extends LdapRepository*/ implements UserGroupBacken
      *
      * @return  ConfigObject
      */
-    protected function getOpenLdapDefaults()
+    public function getOpenLdapDefaults()
     {
         return new ConfigObject(array(
             'group_class'               => 'group',
@@ -614,7 +614,7 @@ class LdapUserGroupBackend /*extends LdapRepository*/ implements UserGroupBacken
      *
      * @return  ConfigObject
      */
-    protected function getActiveDirectoryDefaults()
+    public function getActiveDirectoryDefaults()
     {
         return new ConfigObject(array(
             'group_class'               => 'group',

From 044027772dabfe1af1163daa0c15fc1bf5bef30d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 11:46:45 +0200
Subject: [PATCH 2019/2920] monitoring: Use grouping instead of distinct in the
 host comment query

refs #9009
---
 .../Monitoring/Backend/Ido/Query/HostcommentQuery.php       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
index a61043b4c..aafd7dbae 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
@@ -101,7 +101,7 @@ class HostcommentQuery extends IdoQuery
             'hgo.objecttype_id = ?',
             3
         );
-        $this->distinct();
+        $this->group('ho.name1');
     }
 
     /**
@@ -154,7 +154,7 @@ class HostcommentQuery extends IdoQuery
             'sgo.objecttype_id = ?',
             4
         );
-        $this->distinct();
+        $this->group('ho.name1');
     }
 
     /**
@@ -178,6 +178,6 @@ class HostcommentQuery extends IdoQuery
             'so.objecttype_id = ?',
             2
         );
-        $this->distinct();
+        $this->group('ho.name1');
     }
 }

From 2539e51549cc914734b9560f3c39d15f76bdfee5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 11:47:07 +0200
Subject: [PATCH 2020/2920] monitoring: Use grouping instead of distinct in the
 host downtime query

refs #9009
---
 .../Monitoring/Backend/Ido/Query/HostdowntimeQuery.php      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
index 7d123132d..91fe488d3 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
@@ -107,7 +107,7 @@ class HostdowntimeQuery extends IdoQuery
             'hgo.objecttype_id = ?',
             3
         );
-        $this->distinct();
+        $this->group('ho.name1');
     }
 
     /**
@@ -160,7 +160,7 @@ class HostdowntimeQuery extends IdoQuery
             'sgo.objecttype_id = ?',
             4
         );
-        $this->distinct();
+        $this->group('ho.name1');
     }
 
     /**
@@ -184,6 +184,6 @@ class HostdowntimeQuery extends IdoQuery
             'so.objecttype_id = ?',
             2
         );
-        $this->distinct();
+        $this->group('ho.name1');
     }
 }

From c3c1993870dc550b9eca0869c39dc3639727abf4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 11:47:39 +0200
Subject: [PATCH 2021/2920] monitoring: Use grouping instead of distinct in the
 service comment query

refs #9009
---
 .../Monitoring/Backend/Ido/Query/ServicecommentQuery.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
index 655f0c0cc..40b6e805f 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
@@ -106,7 +106,7 @@ class ServicecommentQuery extends IdoQuery
             'hgo.objecttype_id = ?',
             3
         );
-        $this->distinct();
+        $this->group(array('so.name2', 'so.name1'));
     }
 
     /**
@@ -160,7 +160,7 @@ class ServicecommentQuery extends IdoQuery
             'sgo.objecttype_id = ?',
             4
         );
-        $this->distinct();
+        $this->group(array('so.name2', 'so.name1'));
     }
 
     /**

From c993ee63b79aa9c16dba957419221159a36d35bb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 11:48:03 +0200
Subject: [PATCH 2022/2920] monitoring: Use grouping instead of distinct in the
 service downtime query

refs #9009
---
 .../Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
index 67f21c67c..55b8e466c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
@@ -112,7 +112,7 @@ class ServicedowntimeQuery extends IdoQuery
             'hgo.objecttype_id = ?',
             3
         );
-        $this->distinct();
+        $this->group(array('so.name2', 'so.name1'));
     }
 
     /**
@@ -166,7 +166,7 @@ class ServicedowntimeQuery extends IdoQuery
             'sgo.objecttype_id = ?',
             4
         );
-        $this->distinct();
+        $this->group(array('so.name2', 'so.name1'));
     }
 
     /**

From c08a98f6acab3113f2c81fe84652bf5f82bee074 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 11:48:33 +0200
Subject: [PATCH 2023/2920] monitoring: Use grouping instead of distinct in the
 host status query

refs #9009
---
 .../Monitoring/Backend/Ido/Query/HoststatusQuery.php      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index e515dd8a2..79a8e9e60 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -233,7 +233,7 @@ SQL;
             'hgo.objecttype_id = ?',
             3
         );
-        $this->distinct();
+        $this->group('ho.name1');
     }
 
     /**
@@ -322,8 +322,7 @@ SQL;
             'sgo.objecttype_id = ?',
             4
         );
-        $this->distinct();
-        $this->setUseSubqueryCount(true);
+        $this->group('ho.name1');
     }
 
     /**
@@ -348,8 +347,7 @@ SQL;
             'so.objecttype_id = ?',
             2
         );
-        $this->distinct();
-        $this->setUseSubqueryCount(true);
+        $this->group('ho.name1');
     }
 
     /**

From 55921b48545eb148c3dbbe97e31edfa90d7b3d3c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 11:49:00 +0200
Subject: [PATCH 2024/2920] monitoring: Fix service status query regarding
 handled/unhandled and using distinct

refs #9009
---
 .../Backend/Ido/Query/ServicestatusQuery.php     | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
index aed350491..7ee5ee2a7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -146,12 +146,12 @@ class ServicestatusQuery extends IdoQuery
             'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
         ),
         'servicestatus' => array(
-            'service_handled'                   => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) > 0 THEN 1 ELSE 0 END',
+            'service_handled'                   => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0 THEN 1 ELSE 0 END',
             'service_hard_state'                => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE CASE WHEN ss.state_type = 1 THEN ss.current_state ELSE ss.last_hard_state END END',
             'service_last_hard_state_change'    => 'UNIX_TIMESTAMP(ss.last_hard_state_change)',
             'service_last_state_change'         => 'UNIX_TIMESTAMP(ss.last_state_change)',
             'service_state'                     => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END',
-            'service_unhandled'                 => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END'
+            'service_unhandled'                 => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) = 0 THEN 1 ELSE 0 END',
         )
     );
 
@@ -201,6 +201,7 @@ class ServicestatusQuery extends IdoQuery
             'hgo.objecttype_id = ?',
             3
         );
+        $this->group(array('so.name2', 'so.name1'));
     }
 
     /**
@@ -248,11 +249,11 @@ class ServicestatusQuery extends IdoQuery
             'sgo.is_active = ?',
             1
         )
-            ->where(
-                'sgo.objecttype_id = ?',
-                4
-            );
-        $this->distinct();
+        ->where(
+            'sgo.objecttype_id = ?',
+            4
+        );
+        $this->group(array('so.name2', 'so.name1'));
     }
 
     /**
@@ -260,6 +261,7 @@ class ServicestatusQuery extends IdoQuery
      */
     protected function joinServicestatus()
     {
+        $this->requireVirtualTable('hoststatus');
         $this->select->join(
             array('ss' => $this->prefix . 'servicestatus'),
             'ss.service_object_id = so.object_id',

From 67322e0b364d6ff4d33a35e77ff2890299fbc035 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 5 Jun 2015 11:56:15 +0200
Subject: [PATCH 2025/2920] Show an error message rather than just "unknown
 version"

refs #9247
---
 application/views/scripts/about/index.phtml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/application/views/scripts/about/index.phtml b/application/views/scripts/about/index.phtml
index 53f5a1842..6a01e1bf9 100644
--- a/application/views/scripts/about/index.phtml
+++ b/application/views/scripts/about/index.phtml
@@ -13,9 +13,13 @@
             }
         }
     }
+
+    echo (
+        0 === count($versionInfo)
+            ? '<p class="fileNotReadable">' . $this->translate(
+                'Can\'t determine Icinga Web 2\'s version'
+            )
+            : '<p>' . nl2br(implode("\n", $versionInfo), false)
+    ) . '</p>';
     ?>
-    <p><?= 0 === count($versionInfo)
-        ? $this->translate('unknown version')
-        : nl2br(implode("\n", $versionInfo), false)
-    ?></p>
 </div>

From 0a5dcd2c8f5340e76c66c058d3bbee0441e27930 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 5 Jun 2015 12:03:23 +0200
Subject: [PATCH 2026/2920] Include VERSION in the RPM package

refs #9247
---
 icingaweb2.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index 1ea69451d..c7aa4cb8d 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -218,6 +218,7 @@ rm -rf %{buildroot}
 %{basedir}/application/forms
 %{basedir}/application/layouts
 %{basedir}/application/views
+%{basedir}/application/VERSION
 %{basedir}/doc
 %{basedir}/modules
 %{basedir}/public

From 99b5c7b243ef3ebf232ff493b2486f0507cb6421 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 12:36:56 +0200
Subject: [PATCH 2027/2920] monitoring: Add columns the to service status query
 required by the tactical overview

refs #9009
---
 .../Backend/Ido/Query/ServicestatusQuery.php  | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
index 7ee5ee2a7..f336ce30d 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -146,10 +146,57 @@ class ServicestatusQuery extends IdoQuery
             'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
         ),
         'servicestatus' => array(
+            'service_active_checks_enabled'     => 'ss.active_checks_enabled',
+            'service_event_handler_enabled'     => 'ss.event_handler_enabled',
+            'service_flap_detection_enabled'    => 'ss.flap_detection_enabled',
             'service_handled'                   => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0 THEN 1 ELSE 0 END',
             'service_hard_state'                => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE CASE WHEN ss.state_type = 1 THEN ss.current_state ELSE ss.last_hard_state END END',
+            'service_is_flapping'               => 'ss.is_flapping',
+            'service_is_passive_checked'        => 'CASE WHEN ss.active_checks_enabled = 0 AND ss.passive_checks_enabled = 1 THEN 1 ELSE 0 END',
             'service_last_hard_state_change'    => 'UNIX_TIMESTAMP(ss.last_hard_state_change)',
             'service_last_state_change'         => 'UNIX_TIMESTAMP(ss.last_state_change)',
+            'service_notifications_enabled'     => 'ss.notifications_enabled',
+            'service_severity'                  => 'CASE WHEN ss.current_state = 0
+            THEN
+                CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL
+                     THEN 16
+                     ELSE 0
+                END
+                +
+                CASE WHEN ss.problem_has_been_acknowledged = 1
+                     THEN 2
+                     ELSE
+                        CASE WHEN ss.scheduled_downtime_depth > 0
+                            THEN 1
+                            ELSE 4
+                        END
+                END
+            ELSE
+                CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 16
+                     WHEN ss.current_state = 1 THEN 32
+                     WHEN ss.current_state = 2 THEN 128
+                     WHEN ss.current_state = 3 THEN 64
+                     ELSE 256
+                END
+                +
+                CASE WHEN hs.current_state > 0
+                     THEN 1024
+                     ELSE
+                         CASE WHEN ss.problem_has_been_acknowledged = 1
+                              THEN 512
+                              ELSE
+                                 CASE WHEN ss.scheduled_downtime_depth > 0
+                                     THEN 256
+                                     ELSE 2048
+                                 END
+                         END
+                     END
+            END
+            +
+            CASE WHEN ss.state_type = 1
+                THEN 8
+                ELSE 0
+            END',
             'service_state'                     => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END',
             'service_unhandled'                 => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) = 0 THEN 1 ELSE 0 END',
         )

From b69b47277ed95debbfc7f5d62358f06cedf3efe9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 12:37:29 +0200
Subject: [PATCH 2028/2920] monitoring: Add columns the to host status query
 required by the tactical overview

refs #9009
---
 .../library/Monitoring/Backend/Ido/Query/HoststatusQuery.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index 79a8e9e60..7b0219f89 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -57,6 +57,7 @@ class HoststatusQuery extends IdoQuery
             'host_hard_state'                       => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE CASE WHEN hs.state_type = 1 THEN hs.current_state ELSE hs.last_hard_state END END',
             'host_in_downtime'                      => 'CASE WHEN (hs.scheduled_downtime_depth = 0) THEN 0 ELSE 1 END',
             'host_is_flapping'                      => 'hs.is_flapping',
+            'host_is_passive_checked'               => 'CASE WHEN hs.active_checks_enabled = 0 AND hs.passive_checks_enabled = 1 THEN 1 ELSE 0 END',
             'host_is_reachable'                     => 'hs.is_reachable',
             'host_last_check'                       => 'UNIX_TIMESTAMP(hs.last_check)',
             'host_last_hard_state'                  => 'hs.last_hard_state',

From 6b14195809ce51bdf6f1c803af165438e948bd72 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 5 Jun 2015 12:38:55 +0200
Subject: [PATCH 2029/2920] Rename .fileNotReadable to .message-error

refs #9247
---
 public/css/icinga/layout-structure.less | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 3a8713a38..5b5eee5ef 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -331,8 +331,7 @@ html {
   position: absolute;
 }
 
-/* TODO: replace this with .error */
-.fileNotReadable {
+.message-error {
   padding: 0.5em;
   background-color: @colorCritical;
   font-weight: bold;

From 6c5c153fedac90b8dd696165c3ed56e9811cdcf6 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 5 Jun 2015 12:41:11 +0200
Subject: [PATCH 2030/2920] monitoring/css: temporarily disable header styling

---
 modules/monitoring/public/css/module.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 337d776a4..63afd2c3d 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -1,5 +1,6 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
+/*
 h1 {
     font-size: 1em;
 }
@@ -11,7 +12,7 @@ h2 {
 h3 {
     font-size: 1em;
 }
-
+*/
 table.action.comments td p, table.action.downtimes td p {
   margin: 0;
   font-size: 0.8em;

From 2b3acc99e29215a9f5fc9121684cd1ae9c068731 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 12:42:27 +0200
Subject: [PATCH 2031/2920] monitoring: Use host and service status queries in
 the status summary query

refs #9009
---
 .../Backend/Ido/Query/StatusSummaryQuery.php  | 234 ++++++++++--------
 1 file changed, 129 insertions(+), 105 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
index af67f832a..df30ba103 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
@@ -3,19 +3,19 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
+use Zend_Db_Expr;
 use Zend_Db_Select;
+use Icinga\Data\Filter\Filter;
 
+/**
+ * Query for host and service status summary
+ */
 class StatusSummaryQuery extends IdoQuery
 {
-    protected $subHosts;
-
-    protected $subServices;
-
+    /**
+     * {@inheritdoc}
+     */
     protected $columnMap = array(
-        'services' => array(
-            'service_host_name' => 'so.name1',
-            'service_description' => 'so.name2',
-        ),
         'hoststatussummary' => array(
             'hosts_total'                           => 'SUM(CASE WHEN object_type = \'host\' THEN 1 ELSE 0 END)',
             'hosts_up'                              => 'SUM(CASE WHEN object_type = \'host\' AND state = 0 THEN 1 ELSE 0 END)',
@@ -23,13 +23,13 @@ class StatusSummaryQuery extends IdoQuery
             'hosts_pending'                         => 'SUM(CASE WHEN object_type = \'host\' AND state = 99 THEN 1 ELSE 0 END)',
             'hosts_pending_not_checked'             => 'SUM(CASE WHEN object_type = \'host\' AND state = 99 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
             'hosts_down'                            => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 THEN 1 ELSE 0 END)',
-            'hosts_down_handled'                    => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime > 0 THEN 1 ELSE 0 END)',
-            'hosts_down_unhandled'                  => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
+            'hosts_down_handled'                    => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND handled > 0 THEN 1 ELSE 0 END)',
+            'hosts_down_unhandled'                  => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND handled = 0 THEN 1 ELSE 0 END)',
             'hosts_down_passive'                    => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND is_passive_checked = 1 THEN 1 ELSE 0 END)',
             'hosts_down_not_checked'                => 'SUM(CASE WHEN object_type = \'host\' AND state = 1 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
             'hosts_unreachable'                     => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 THEN 1 ELSE 0 END)',
-            'hosts_unreachable_handled'             => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 AND acknowledged + in_downtime > 0 THEN 1 ELSE 0 END)',
-            'hosts_unreachable_unhandled'           => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
+            'hosts_unreachable_handled'             => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 AND handled > 0 THEN 1 ELSE 0 END)',
+            'hosts_unreachable_unhandled'           => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 AND handled = 0 THEN 1 ELSE 0 END)',
             'hosts_unreachable_passive'             => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 AND is_passive_checked = 1 THEN 1 ELSE 0 END)',
             'hosts_unreachable_not_checked'         => 'SUM(CASE WHEN object_type = \'host\' AND state = 2 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
             'hosts_active'                          => 'SUM(CASE WHEN object_type = \'host\' AND is_active_checked = 1 THEN 1 ELSE 0 END)',
@@ -43,25 +43,25 @@ class StatusSummaryQuery extends IdoQuery
         'servicestatussummary' => array(
             'services_total'                            => 'SUM(CASE WHEN object_type = \'service\' THEN 1 ELSE 0 END)',
             'services_problem'                          => 'SUM(CASE WHEN object_type = \'service\' AND state > 0 THEN 1 ELSE 0 END)',
-            'services_problem_handled'                  => 'SUM(CASE WHEN object_type = \'service\' AND state > 0 AND acknowledged + in_downtime + host_problem > 0 THEN 1 ELSE 0 END)',
-            'services_problem_unhandled'                => 'SUM(CASE WHEN object_type = \'service\' AND state > 0 AND acknowledged + in_downtime + host_problem = 0 THEN 1 ELSE 0 END)',
+            'services_problem_handled'                  => 'SUM(CASE WHEN object_type = \'service\' AND state > 0 AND handled + host_problem > 0 THEN 1 ELSE 0 END)',
+            'services_problem_unhandled'                => 'SUM(CASE WHEN object_type = \'service\' AND state > 0 AND handled + host_problem = 0 THEN 1 ELSE 0 END)',
             'services_ok'                               => 'SUM(CASE WHEN object_type = \'service\' AND state = 0 THEN 1 ELSE 0 END)',
             'services_ok_not_checked'                   => 'SUM(CASE WHEN object_type = \'service\' AND state = 0 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
             'services_pending'                          => 'SUM(CASE WHEN object_type = \'service\' AND state = 99 THEN 1 ELSE 0 END)',
             'services_pending_not_checked'              => 'SUM(CASE WHEN object_type = \'service\' AND state = 99 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
             'services_warning'                          => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 THEN 1 ELSE 0 END)',
-            'services_warning_handled'                  => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_problem > 0 THEN 1 ELSE 0 END)',
-            'services_warning_unhandled'                => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND acknowledged + in_downtime + host_problem = 0 THEN 1 ELSE 0 END)',
+            'services_warning_handled'                  => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND handled + host_problem > 0 THEN 1 ELSE 0 END)',
+            'services_warning_unhandled'                => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND handled + host_problem = 0 THEN 1 ELSE 0 END)',
             'services_warning_passive'                  => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND is_passive_checked = 1 THEN 1 ELSE 0 END)',
             'services_warning_not_checked'              => 'SUM(CASE WHEN object_type = \'service\' AND state = 1 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
             'services_critical'                         => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 THEN 1 ELSE 0 END)',
-            'services_critical_handled'                 => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_problem > 0 THEN 1 ELSE 0 END)',
-            'services_critical_unhandled'               => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND acknowledged + in_downtime + host_problem = 0 THEN 1 ELSE 0 END)',
+            'services_critical_handled'                 => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND handled + host_problem > 0 THEN 1 ELSE 0 END)',
+            'services_critical_unhandled'               => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND handled + host_problem = 0 THEN 1 ELSE 0 END)',
             'services_critical_passive'                 => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND is_passive_checked = 1 THEN 1 ELSE 0 END)',
             'services_critical_not_checked'             => 'SUM(CASE WHEN object_type = \'service\' AND state = 2 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
             'services_unknown'                          => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 THEN 1 ELSE 0 END)',
-            'services_unknown_handled'                  => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND acknowledged + in_downtime + host_problem > 0 THEN 1 ELSE 0 END)',
-            'services_unknown_unhandled'                => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND acknowledged + in_downtime + host_problem = 0 THEN 1 ELSE 0 END)',
+            'services_unknown_handled'                  => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND handled + host_problem > 0 THEN 1 ELSE 0 END)',
+            'services_unknown_unhandled'                => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND handled + host_problem = 0 THEN 1 ELSE 0 END)',
             'services_unknown_passive'                  => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND is_passive_checked = 1 THEN 1 ELSE 0 END)',
             'services_unknown_not_checked'              => 'SUM(CASE WHEN object_type = \'service\' AND state = 3 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
             'services_active'                           => 'SUM(CASE WHEN object_type = \'service\' AND is_active_checked = 1 THEN 1 ELSE 0 END)',
@@ -85,114 +85,138 @@ We have to find a better solution here.
             'services_ok_not_checked_on_ok_hosts'               => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 0 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
             'services_pending_on_ok_hosts'                      => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 99 THEN 1 ELSE 0 END)',
             'services_pending_not_checked_on_ok_hosts'          => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 99 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
-            'services_warning_handled_on_ok_hosts'              => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 1 AND acknowledged + in_downtime > 0 THEN 1 ELSE 0 END)',
-            'services_warning_unhandled_on_ok_hosts'            => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 1 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
+            'services_warning_handled_on_ok_hosts'              => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 1 AND handled > 0 THEN 1 ELSE 0 END)',
+            'services_warning_unhandled_on_ok_hosts'            => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 1 AND handled = 0 THEN 1 ELSE 0 END)',
             'services_warning_passive_on_ok_hosts'              => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 1 AND is_passive_checked = 1 THEN 1 ELSE 0 END)',
             'services_warning_not_checked_on_ok_hosts'          => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 1 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
-            'services_critical_handled_on_ok_hosts'             => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 2 AND acknowledged + in_downtime > 0 THEN 1 ELSE 0 END)',
-            'services_critical_unhandled_on_ok_hosts'           => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 2 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
+            'services_critical_handled_on_ok_hosts'             => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 2 AND handled > 0 THEN 1 ELSE 0 END)',
+            'services_critical_unhandled_on_ok_hosts'           => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 2 AND handled = 0 THEN 1 ELSE 0 END)',
             'services_critical_passive_on_ok_hosts'             => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 2 AND is_passive_checked = 1 THEN 1 ELSE 0 END)',
             'services_critical_not_checked_on_ok_hosts'         => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 2 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
-            'services_unknown_handled_on_ok_hosts'              => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 3 AND acknowledged + in_downtime > 0 THEN 1 ELSE 0 END)',
-            'services_unknown_unhandled_on_ok_hosts'            => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 3 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
+            'services_unknown_handled_on_ok_hosts'              => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 3 AND handled > 0 THEN 1 ELSE 0 END)',
+            'services_unknown_unhandled_on_ok_hosts'            => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 3 AND handled = 0 THEN 1 ELSE 0 END)',
             'services_unknown_passive_on_ok_hosts'              => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 3 AND is_passive_checked = 1 THEN 1 ELSE 0 END)',
             'services_unknown_not_checked_on_ok_hosts'          => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 1 AND host_state != 2 AND state = 3 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
             'services_ok_on_problem_hosts'                      => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 0 THEN 1 ELSE 0 END)',
             'services_ok_not_checked_on_problem_hosts'          => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 0 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
             'services_pending_on_problem_hosts'                 => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 99 THEN 1 ELSE 0 END)',
             'services_pending_not_checked_on_problem_hosts'     => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 99 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
-            'services_warning_handled_on_problem_hosts'         => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 1 AND acknowledged + in_downtime > 0 THEN 1 ELSE 0 END)',
-            'services_warning_unhandled_on_problem_hosts'       => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 1 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
+            'services_warning_handled_on_problem_hosts'         => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 1 AND handled > 0 THEN 1 ELSE 0 END)',
+            'services_warning_unhandled_on_problem_hosts'       => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 1 AND handled = 0 THEN 1 ELSE 0 END)',
             'services_warning_passive_on_problem_hosts'         => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 1 AND is_passive_checked = 1 THEN 1 ELSE 0 END)',
             'services_warning_not_checked_on_problem_hosts'     => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 1 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
-            'services_critical_handled_on_problem_hosts'        => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 2 AND acknowledged + in_downtime > 0 THEN 1 ELSE 0 END)',
-            'services_critical_unhandled_on_problem_hosts'      => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 2 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
+            'services_critical_handled_on_problem_hosts'        => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 2 AND handled > 0 THEN 1 ELSE 0 END)',
+            'services_critical_unhandled_on_problem_hosts'      => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 2 AND handled = 0 THEN 1 ELSE 0 END)',
             'services_critical_passive_on_problem_hosts'        => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 2 AND is_passive_checked = 1 THEN 1 ELSE 0 END)',
             'services_critical_not_checked_on_problem_hosts'    => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 2 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)',
-            'services_unknown_handled_on_problem_hosts'         => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 3 AND acknowledged + in_downtime > 0 THEN 1 ELSE 0 END)',
-            'services_unknown_unhandled_on_problem_hosts'       => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 3 AND acknowledged + in_downtime = 0 THEN 1 ELSE 0 END)',
+            'services_unknown_handled_on_problem_hosts'         => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 3 AND handled > 0 THEN 1 ELSE 0 END)',
+            'services_unknown_unhandled_on_problem_hosts'       => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 3 AND handled = 0 THEN 1 ELSE 0 END)',
             'services_unknown_passive_on_problem_hosts'         => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 3 AND is_passive_checked = 1 THEN 1 ELSE 0 END)',
             'services_unknown_not_checked_on_problem_hosts'     => 'SUM(CASE WHEN object_type = \'service\' AND host_state != 0 AND host_state != 99 AND state = 3 AND is_active_checked = 0 AND is_passive_checked = 0 THEN 1 ELSE 0 END)'
         )
     );
 
-    protected function joinBaseTables()
+    /**
+     * The union
+     *
+     * @var Zend_Db_Select
+     */
+    protected $summaryQuery;
+
+    /**
+     * Subqueries used for the summary query
+     *
+     * @var IdoQuery[]
+     */
+    protected $subQueries = array();
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addFilter(Filter $filter)
     {
-        $hosts = $this->db->select()->from(
-            array('ho' => $this->prefix . 'objects'),
-            array()
-        )->join(
-            array('hs' => $this->prefix . 'hoststatus'),
-            'ho.object_id = hs.host_object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
-            array(
-                ''
-            )
-        )->join(
-            array('h' => $this->prefix . 'hosts'),
-            'hs.host_object_id = h.host_object_id',
-            array()
-        );
-        $services = clone $hosts;
-        $services->join(
-            array('s' => $this->prefix . 'services'),
-            's.host_object_id = h.host_object_id',
-            array()
-        )->join(
-            array('so' => $this->prefix . 'objects'),
-            'so.' . $this->object_id . ' = s.service_object_id AND so.is_active = 1',
-            array()
-        )->joinLeft(
-            array('ss' => $this->prefix . 'servicestatus'),
-            'so.' . $this->object_id . ' = ss.service_object_id',
-            array()
-        );
-        $hosts->columns(array(
-            'state'                         => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END',
-            'acknowledged'                  => 'hs.problem_has_been_acknowledged',
-            'in_downtime'                   => 'CASE WHEN (hs.scheduled_downtime_depth = 0) THEN 0 ELSE 1 END',
-            'host_state'                    => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END',
-            'host_problem'                  => 'CASE WHEN COALESCE(hs.current_state, 0) = 0 THEN 0 ELSE 1 END',
-            'is_passive_checked'            => 'CASE WHEN hs.active_checks_enabled = 0 AND hs.passive_checks_enabled = 1 THEN 1 ELSE 0 END',
-            'is_active_checked'             => 'hs.active_checks_enabled',
-            'is_processing_events'          => 'hs.event_handler_enabled',
-            'is_triggering_notifications'   => 'hs.notifications_enabled',
-            'is_allowed_to_flap'            => 'hs.flap_detection_enabled',
-            'is_flapping'                   => 'hs.is_flapping',
-            'object_type'                   => '(\'host\')'
-        ));
-        $services->columns(array(
-            'state'                         => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END',
-            'acknowledged'                  => 'ss.problem_has_been_acknowledged',
-            'in_downtime'                   => 'CASE WHEN (ss.scheduled_downtime_depth = 0) THEN 0 ELSE 1 END',
-            'host_state'                    => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END',
-            'host_problem'                  => 'CASE WHEN COALESCE(hs.current_state, 0) = 0 THEN 0 ELSE 1 END',
-            'is_passive_checked'            => 'CASE WHEN ss.active_checks_enabled = 0 AND ss.passive_checks_enabled = 1 THEN 1 ELSE 0 END',
-            'is_active_checked'             => 'ss.active_checks_enabled',
-            'is_processing_events'          => 'ss.event_handler_enabled',
-            'is_triggering_notifications'   => 'ss.notifications_enabled',
-            'is_allowed_to_flap'            => 'ss.flap_detection_enabled',
-            'is_flapping'                   => 'ss.is_flapping',
-            'object_type'                   => '(\'service\')'
-        ));
-        $union = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL);
-        $this->subHosts    = $hosts;
-        $this->subServices = $services;
-        $this->select->from(array('statussummary' => $union), array());
-        $this->joinedVirtualTables = array(
-            'services'             => true,
-            'servicestatussummary' => true,
-            'hoststatussummary'    => true
-        );
+        foreach ($this->subQueries as $sub) {
+            $sub->applyFilter(clone $filter);
+        }
+        return $this;
     }
 
-    public function whereToSql($col, $sign, $expression)
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
     {
-        if ($col === 'so.name1') {
-            $this->subServices->where('so.name1 ' . $sign . ' ?', $expression);
-            return '';
-            return 'sh.state_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
-        } else {
-            return parent::whereToSql($col, $sign, $expression);
+        // TODO(el): Allow to switch between hard and soft states
+        $hosts = $this->createSubQuery(
+            'Hoststatus',
+            array(
+                'handled'                       => 'host_handled',
+                'hostgroup_alias',
+                'hostgroup_name',
+                'host_problem',
+                'host_state'                    => new Zend_Db_Expr('NULL'),
+                'is_active_checked'             => 'host_active_checks_enabled',
+                'is_allowed_to_flap'            => 'host_flap_detection_enabled',
+                'is_flapping'                   => 'host_is_flapping',
+                'is_passive_checked'            => 'host_is_passive_checked',
+                'is_processing_events'          => 'host_event_handler_enabled',
+                'is_triggering_notifications'   => 'host_notifications_enabled',
+                'object_type',
+                'severity'                      => 'host_severity',
+                'state_change'                  => 'host_last_state_change',
+                'state'                         => 'host_state'
+            )
+        );
+        $this->subQueries[] = $hosts;
+        $services = $this->createSubQuery(
+            'Servicestatus',
+            array(
+                'handled'                       => 'service_handled',
+                'hostgroup_alias',
+                'hostgroup_name',
+                'host_problem',
+                'host_state'                    => 'host_hard_state',
+                'is_active_checked'             => 'service_active_checks_enabled',
+                'is_allowed_to_flap'            => 'service_flap_detection_enabled',
+                'is_flapping'                   => 'service_is_flapping',
+                'is_passive_checked'            => 'service_is_passive_checked',
+                'is_processing_events'          => 'service_event_handler_enabled',
+                'is_triggering_notifications'   => 'service_notifications_enabled',
+                'object_type',
+                'severity'                      => 'service_severity',
+                'state_change'                  => 'service_last_state_change',
+                'state'                         => 'service_state'
+            )
+        );
+        $this->subQueries[] = $services;
+        $this->summaryQuery = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL);
+        $this->select->from(array('statussummary' => $this->summaryQuery), array());
+        $this->joinedVirtualTables['hoststatussummary'] = true;
+        $this->joinedVirtualTables['servicestatussummary'] = true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function order($columnOrAlias, $dir = null)
+    {
+        if (! $this->hasAliasName($columnOrAlias)) {
+            foreach ($this->subQueries as $sub) {
+                $sub->requireColumn($columnOrAlias);
+            }
         }
+        return parent::order($columnOrAlias, $dir);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function where($condition, $value = null)
+    {
+        $this->requireColumn($condition);
+        foreach ($this->subQueries as $sub) {
+            $sub->where($condition, $value);
+        }
+        return $this;
     }
 }

From 9795617e4d2cbdae9134a2ef6205854260f4c38a Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 5 Jun 2015 12:42:32 +0200
Subject: [PATCH 2032/2920] defaults.less: new header styling

---
 public/css/icinga/defaults.less | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index 99e6b301b..3ea0fa83a 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -32,7 +32,13 @@
 .page-header(@borderSize: 2px; @fontSize: 2em; @textColor: @colorTextDarkDefault) {
   font-size: @fontSize;
   color: @textColor;
-  border-bottom: @borderSize solid @colorPetrol;
+  /* border-bottom: @borderSize solid @colorPetrol; */
+  background-color: #888;
+  color: white;
+  font-weight: normal;
+  padding: 0.2em 1em;
+  text-transform: uppercase;
+  font-size: 0.8em;
   a {
     text-decoration: none;
     color: inherit;

From 45d883dcf1a23f119bb4530a4463d3340a4e20b5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 12:42:55 +0200
Subject: [PATCH 2033/2920] monitoring: Add restrictable filter columns to the
 status summary

refs #9009
---
 Reftest.php                                   | 23 ++++++++++++++++
 .../Monitoring/DataView/StatusSummary.php     | 27 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 Reftest.php

diff --git a/Reftest.php b/Reftest.php
new file mode 100644
index 000000000..511f3452d
--- /dev/null
+++ b/Reftest.php
@@ -0,0 +1,23 @@
+<?php
+
+class Test
+{
+    protected $filters = array();
+
+    public function work()
+    {
+        foreach ($this->getFilters() as $key => &$value) {
+            $value = 1;
+        }
+    }
+
+    public function &getFilters()
+    {
+        return $this->filters;
+    }
+}
+
+$x = new Test();
+$b =& $x->getFilters();
+$b[1] = 0;
+var_dump($b, $x->getFilters());die;
diff --git a/modules/monitoring/library/Monitoring/DataView/StatusSummary.php b/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
index 6136ac05c..e725f76d1 100644
--- a/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/StatusSummary.php
@@ -96,4 +96,31 @@ class StatusSummary extends DataView
             'services_unknown_not_checked_on_problem_hosts'
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFilterColumns()
+    {
+        return array(
+            'host', 'host_alias', 'host_display_name', 'host_name',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'service_description', 'service_display_name',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        } else {
+            return in_array($column, $this->getFilterColumns());
+        }
+    }
 }

From 44742a83a87d56fbaf95c5f0dc6b99d16d7798d4 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 5 Jun 2015 12:43:03 +0200
Subject: [PATCH 2034/2920] main-content.less: remove exceptional header styles

---
 public/css/icinga/main-content.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 911e6292e..86a24c661 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -178,9 +178,11 @@ table.benchmark {
   width: 96%;
 }
 
+/*
 .dashboard h1 {
   font-size: 1em;
 }
+*/
 
 .dashboard h2 {
   font-size: 1em;
@@ -206,7 +208,6 @@ table.benchmark {
   h1 {
     border: none;
     margin-bottom: 0;
-    color: #666;
   }
 }
 

From b7afec8f3ced67c5c2d617c7f503d93423e13015 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 12:43:24 +0200
Subject: [PATCH 2035/2920] monitoring: Restrict the tactical overview

refs #9009
---
 .../application/controllers/TacticalController.php         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/controllers/TacticalController.php b/modules/monitoring/application/controllers/TacticalController.php
index d9da6d3d5..95440a309 100644
--- a/modules/monitoring/application/controllers/TacticalController.php
+++ b/modules/monitoring/application/controllers/TacticalController.php
@@ -20,8 +20,7 @@ class Monitoring_TacticalController extends MonitoringController
                 'url'   => Url::fromRequest()
             )
         )->extend(new DashboardAction())->activate('tactical_overview');
-
-        $this->view->statusSummary = $this->backend->select()->from(
+        $stats = $this->backend->select()->from(
             'statusSummary',
             array(
                 'hosts_up',
@@ -79,6 +78,8 @@ class Monitoring_TacticalController extends MonitoringController
                 'hosts_flapping',
                 'services_flapping'
             )
-        )->getQuery()->fetchRow();
+        );
+        $this->applyRestriction('monitoring/filter/objects', $stats);
+        $this->view->statusSummary = $stats->fetchRow();
     }
 }

From 21d3e64ff0fd9394c19858e491ba4143d4f9a091 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 5 Jun 2015 12:43:35 +0200
Subject: [PATCH 2036/2920] defaults.less: attempt to use more global variables

---
 public/css/icinga/defaults.less | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index 3ea0fa83a..e53d21da2 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -1,6 +1,13 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /* Color definitions */
+@colorMainLayout: #049baf;
+@colorMainBackground: #fff;
+@colorMainForeground: #666;
+@colorMainLink: #222;
+@colorSecondary: #f9f9f9;
+
+
 @colorGray: #f9f9f9;
 @colorLinkDefault: #049baf;
 @colorTextDefault: #666;
@@ -87,13 +94,12 @@ body {
 }
 
 a {
-  color: #333;
-  text-decoration: underline;
-}
+  @colorMainLink;
+  text-decoration: none;
 
-a:hover {
-  color: black;
-  text-decoration: underline;
+  :hover {
+    text-decoration: underline;
+  }
 }
 
 /* W3C Recommendation <http://www.w3.org/TR/CSS21/sample.html> (except h4) */

From edeb24792e668319ae0e427319f436bfd255a417 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 5 Jun 2015 12:49:07 +0200
Subject: [PATCH 2037/2920] CSS: move monitoring styles to monitoring module

---
 library/Icinga/Web/StyleSheet.php         |   1 -
 modules/monitoring/public/css/module.less | 906 ++++++++++++++++++++
 public/css/icinga/main-content.less       |  58 ++
 public/css/icinga/monitoring-colors.less  | 964 ----------------------
 4 files changed, 964 insertions(+), 965 deletions(-)
 delete mode 100644 public/css/icinga/monitoring-colors.less

diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index ab36d78c5..93c7d43ba 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -24,7 +24,6 @@ class StyleSheet
         'css/icinga/setup.less',
         'css/icinga/widgets.less',
         'css/icinga/pagination.less',
-        'css/icinga/monitoring-colors.less',
         'css/icinga/selection-toolbar.less',
         'css/icinga/login.less',
         'css/icinga/controls.less'
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 63afd2c3d..c985cc745 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -350,3 +350,909 @@ td.state {
         }
     }
 }
+
+/* Special tables and states */
+
+table.colors {
+  font-size: 0.8em;
+  width: 98%;
+  margin: 0 1%;
+}
+
+table.colors td {
+  text-align: center;
+  vertical-align: middle;
+  width:  10%;
+  height: 1.6em;
+  font-weight: normal;
+  border: 0.079em solid white;
+}
+
+
+
+table.action td.state {
+  font-size: 0.7em;
+  text-align: center;
+}
+
+table.action td.timesince {
+  width: 3.5em;
+}
+
+
+/* State row behaviour */
+
+tr.state img.icon {
+  margin-right: 2px;
+}
+
+tr.state a {
+  font-weight: bold;
+}
+
+tr.state a.active {
+}
+
+tr.state.new td.state {
+  font-weight: bold;
+}
+
+tr.state td.state strong {
+  font-size: 1.2em;
+}
+
+tr.state td.state {
+  width: 9em;
+  color: white;
+  border-bottom: none;
+}
+
+tr.state.handled td.state, tr.state.ok td.state, tr.state.up td.state, tr.state.pending td.state {
+  border-left-style: solid;
+  border-left-width: 1.5em;
+  padding-left: 0em;
+  padding-right: 0.5em;
+  color: black;
+  background-color: transparent;
+}
+
+tr[href].active {
+  background-color: #eee;
+  color: black;
+}
+
+tr.state.ok td.state, tr.state.up td.state {
+  border-left-color: @colorOk;
+}
+
+tr.state.warning td.state {
+  background-color: @colorWarning;
+}
+
+tr.state.warning.handled td.state {
+  border-left-color: @colorWarningHandled;
+}
+
+tr.state.critical td.state, tr.state.down td.state {
+  background-color: @colorCritical;
+}
+
+tr.state.critical.handled td.state, tr.state.down.handled td.state {
+  border-left-color: @colorCriticalHandled;
+}
+
+tr.state.unreachable td.state {
+  background-color: @colorUnreachable;
+}
+
+tr.state.unreachable.handled td.state {
+  border-left-color: @colorUnreachableHandled;
+}
+
+tr.state.unknown td.state {
+  background-color: @colorUnknown;
+}
+
+tr.state.unknown.handled td.state {
+  border-left-color: @colorUnknownHandled;
+}
+
+tr.state.pending td.state {
+  border-left-color: @colorPending;
+}
+
+tr.state.invalid td.state {
+  background-color: @colorInvalid;
+}
+
+tr.state.unreachable td.state {
+  background-color: @colorUnreachable;
+}
+
+tr.state.unreachable.handled td.state {
+  border-left-color: @colorUnreachableHandled;
+}
+
+tr.state.handled td.state {
+  color: inherit;
+  background-color: transparent !important;
+}
+
+/* HOVER colors */
+tr[href]:hover {
+  color: black;
+  background-color: #eee;
+}
+
+tr.state[href]:hover td.state {
+  background-color: #eee;
+}
+
+tr.state.ok[href]:hover, tr.state.up[href]:hover {
+  background-color: @colorOk;
+}
+
+tr.state.handled[href]:hover, tr.state.handled[href]:hover td.state {
+  color: #121212 !important;
+}
+
+tr.state.warning[href]:hover {
+  background-color: @colorWarning;
+}
+
+tr.state.warning.handled[href]:hover {
+  background-color: @colorWarningHandled;
+}
+
+tr.state.critical[href]:hover, tr.state.down[href]:hover {
+  background-color: @colorCritical;
+}
+
+tr.state.critical.handled[href]:hover, tr.state.down.handled[href]:hover {
+  background-color: @colorCriticalHandled;
+  color: #333;
+}
+
+tr.state.unknown[href]:hover {
+  background-color: @colorUnknown;
+}
+
+tr.state.unknown.handled[href]:hover {
+  background-color: @colorUnknownHandled;
+}
+
+tr.state.pending[href]:hover {
+  background-color: @colorPending;
+}
+
+tr.state.invalid[href]:hover {
+  background-color: @colorInvalid;
+}
+
+tr.state.unreachable[href]:hover {
+  background-color: @colorUnreachable;
+}
+
+tr.state.unreachable.handled[href]:hover {
+  background-color: @colorUnreachableHandled;
+}
+
+tr.state[href]:hover td.state {
+  background-color: inherit !important;
+}
+
+/* END of HOVER colors */
+
+/* END of special tables and states */
+
+
+/* Generic colors */
+
+a.critical {
+  color: @colorCritical;
+}
+
+/* END of Generic colors */
+
+
+/* Generic box element */
+
+.boxview a {
+  text-decoration: none;
+}
+
+.boxview > div.box {
+  text-align: center;
+  vertical-align: top;
+  display: inline-block;
+  padding: 0.4em;
+  margin: 0.4em;
+  border: 1px solid #d9d9d9;
+  background: #eee;
+}
+
+/* Box caption */
+.boxview div.box h2 {
+  margin-top: 0;
+  margin-bottom: 0.6em;
+  font-size: 0.8em;
+  color: @colorTextDefault;
+}
+
+.boxview div.box h2:first-child {
+  margin-top: 0.2em;
+  padding-bottom: 0.5em;
+  font-size: inherit;
+  color: @colorTextDefault;
+  border-bottom: 1px solid #d9d9d9;
+}
+
+.boxview div.box h2 > a {
+  color: inherit;
+  margin-bottom: 0.2em;
+}
+
+.boxview div.box h2 > a:hover {
+  text-decoration: underline;
+}
+
+.boxview div.box h2:first-child > a:hover {
+}
+
+.boxview div.box h3 {
+  line-height: 1.5em;
+  font-size: 0.9em;
+  color: #555;
+  border-bottom: 1px solid #d9d9d9;
+}
+
+/* Box body of contents */
+.boxview div.box.contents {
+  padding: 0.2em;
+}
+
+.boxview div.box.contents table {
+  width: 100%;
+}
+
+.boxview div.box.contents td {
+  width: 13em;
+  vertical-align: top;
+}
+
+/* Box separator */
+.boxview div.box-separator:first-child {
+  border-top-width: 0;
+}
+
+.boxview div.box-separator {
+  font-size: 0.8em;
+  padding: 0.4em 0 0.4em;
+  border: 1px solid #d9d9d9;
+
+  font-weight: bold;
+  letter-spacing: 0.1em;
+}
+
+/* Box entry */
+.boxview div.box.entry {
+  min-height: 2.7em;
+  margin: 0.2em;
+  font-size: 0.9em;
+  white-space: nowrap;
+
+  color: @colorTextDefault;
+}
+
+/* Any line of a box entry */
+.boxview div.box.entry a {
+  display: block;
+
+  color: inherit;
+}
+
+.boxview div.box.entry a:hover {
+  color: @colorTextDefault;
+}
+
+/* First line of a box entry */
+.boxview div.box.entry a:first-child {
+  font-size: 1em;
+}
+
+/* End of generic box element */
+
+
+/* Monitoring box element styles */
+
+/* Host- and Servicegroup element styles */
+
+div.box.entry.state_up, div.box.entry.state_ok {
+  border: 1px solid @colorOk;
+  border-left: 1em solid @colorOk;
+}
+
+div.box.entry.state_pending {
+  border: 1px solid @colorPending;
+  border-left: 1em solid @colorPending;
+}
+
+div.box.entry.state_down, div.box.entry.state_critical {
+  border: 1px solid @colorCritical;
+  border-left: 1em solid @colorCritical;
+  background-color: @colorCritical;
+  color: white;
+}
+
+div.box.entry.state_down a:hover, div.box.entry.state_critical a:hover {
+  color: #dcdcdc;
+}
+
+div.box.entry.state_warning {
+  border: 1px solid @colorWarning;
+  border-left: 1em solid @colorWarning;
+  background-color: @colorWarning;
+  color: white;
+}
+
+div.box.entry.state_warning a:hover {
+  color: #dcdcdc;
+}
+
+div.box.entry.state_unreachable, div.box.entry.state_unknown {
+  border: 1px solid @colorUnknown;
+  border-left: 1em solid @colorUnknown;
+  background-color: @colorUnknown;
+  color: white;
+}
+
+div.box.entry.state_unreachable a:hover, div.box.entry.state_unknown a:hover {
+  color: #dcdcdc;
+}
+
+div.box.entry.handled {
+  background-color: transparent;
+  color: inherit;
+}
+
+div.box.entry.handled a:hover {
+  color: @colorTextDefault;
+}
+
+/* Tactical overview element styles */
+
+.tactical > .boxview > div.box {
+  min-height: 20em;
+  min-width: 12.1em;
+}
+
+.tactical div.box.contents {
+  min-height: 14.5em;
+}
+
+div.box.contents.zero {
+  min-width: 11.1em;
+
+  background-color: transparent;
+}
+
+div.box.contents.zero span {
+  font-weight: bold;
+  line-height: 2em;
+
+  color: #666;
+}
+
+div.box.contents.zero h3 {
+  margin: 0;
+  font-size: 12em;
+  line-height: 1em;
+
+  color: #666;
+}
+
+div.box.ok_hosts.state_up {
+  border: 5px solid @colorOk;
+}
+
+div.box.ok_hosts.state_pending {
+  background-color: @colorPending;
+}
+
+div.box.problem_hosts.state_down {
+  border: 5px solid @colorCritical;
+}
+
+div.box.problem_hosts.state_down.handled {
+  background-color: @colorCriticalHandled;
+}
+
+div.box.problem_hosts.state_unreachable {
+  background-color: @colorUnreachable;
+}
+
+div.box.problem_hosts.state_unreachable.handled {
+  background-color: @colorUnreachableHandled;
+}
+
+div.box.ok_hosts div.box.entry, div.box.problem_hosts div.box.entry {
+  min-width: 11.1em;
+}
+
+div.box.monitoringfeatures div.box.contents {
+  padding: 0 2 0em;
+}
+
+div.box.monitoringfeatures {
+  border: 5px solid #d9d9d9;
+}
+
+div.box.monitoringfeatures div.box-separator {
+  color: white;
+  background-color: @colorOk;
+}
+
+div.box.monitoringfeatures div.feature-highlight {
+  background-color: @colorCritical;
+}
+
+div.box.monitoringfeatures a.feature-highlight {
+  font-weight: bold;
+}
+
+div.box.hostservicechecks {
+  border: 5px solid #d9d9d9;
+}
+
+/* Contactgroup element styles */
+
+div.box.contactgroup {
+  width: 18em;
+  padding: 0.8em;
+}
+
+div.box.contactgroup div.box.contents {
+  padding: 0.6em;
+}
+
+div.box.contactgroup div.box.entry {
+  overflow: hidden;
+  clear: left;
+}
+
+div.box.contactgroup div.box.entry img {
+  width: 80px;
+  height: 80px;
+  float: left;
+
+}
+
+div.box.contactgroup div.box.entry a {
+  margin-top: 0.4em;
+
+  font-weight: bold;
+}
+
+div.box.contactgroup div.box.entry p {
+  margin: 0.4em 0 0;
+}
+
+div.circular {
+  margin-top: 0.5em;
+  margin-left: 2em;
+  margin-right: 1em;
+  width: 80px;
+  height: 80px;
+  float: left;
+  background-size: 100% 100%;
+}
+
+/* End of monitoring box element styles */
+
+
+/* Monitoring pivot table styles */
+
+div.pivot-pagination {
+  margin: 1em;
+
+  table {
+    table-layout: fixed;
+    border-spacing: 1px;
+    border-collapse: separate;
+    border: 1px solid LightGrey;
+    border-radius: 0.3em;
+
+    td {
+      width: 16px;
+      height: 16px;
+      padding: 0;
+      background-color: #fbfbfb;
+
+      &:hover, &.active {
+        background-color: #e5e5e5;
+      }
+
+      a {
+        width: 16px;
+        height: 16px;
+        display: block;
+      }
+    }
+  }
+}
+
+table.joystick-pagination {
+  margin-top: -1.5em;
+
+  td {
+    width: 1.25em;
+    height: 1.3em;
+  }
+}
+
+table.pivot {
+  a {
+    text-decoration: none;
+    color: black;
+
+    &:hover {
+      color: @colorTextDefault;
+    }
+  }
+
+  & > thead {
+    th {
+      height: 6em;
+
+      div {
+        margin-right: -1.5em;
+        padding-left: 1.3em;
+
+        span {
+          width: 1.5em;
+          margin-right: 0.25em;
+          margin-top: 4em;
+          line-height: 2em;
+          white-space: nowrap;
+          display: block;
+          float: left;
+
+          transform: rotate(-45deg);
+          transform-origin: bottom left;
+          -o-transform: rotate(-45deg);
+          -o-transform-origin: bottom left;
+          -ms-transform: rotate(-45deg);
+          -ms-transform-origin: bottom left;
+          -moz-transform: rotate(-45deg);
+          -moz-transform-origin: bottom left;
+          -webkit-transform: rotate(-45deg);
+          -webkit-transform-origin: bottom left;
+          //filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
+
+          abbr {
+            border: 0; // Remove highlighting in firefox
+            font-size: 0.8em;
+          }
+        }
+      }
+    }
+  }
+
+  & > tbody {
+    th {
+      padding: 0 14px 0 0;
+      white-space: nowrap;
+
+      a {
+        font-size: 0.8em;
+      }
+    }
+
+    td {
+      padding: 2px;
+      min-width: 1.5em;
+      line-height: 1.5em;
+      text-align: center;
+
+      a {
+        width: 1.5em;
+        height: 1.5em;
+        display: block;
+        border-radius: 0.5em;
+
+        &.state_ok {
+          background-color: @colorOk;
+        }
+
+        &.state_pending {
+          background-color: @colorPending;
+        }
+
+        &.state_warning {
+          background-color: @colorWarning;
+
+          &.handled {
+            background-color: @colorWarningHandled;
+          }
+        }
+
+        &.state_critical {
+          background-color: @colorCritical;
+
+          &.handled {
+            background-color: @colorCriticalHandled;
+          }
+        }
+
+        &.state_unknown {
+          background-color: @colorUnknown;
+
+          &.handled {
+            background-color: @colorUnknownHandled;
+          }
+        }
+      }
+    }
+  }
+}
+
+/* End of monitoring pivot table styles */
+
+/* Monitoring timeline styles */
+
+div.timeline-legend {
+  float: left;
+  padding: 0.5em;
+  border: 1px solid #d9d9d9;
+  background-color: #eee;
+
+  h2 {
+    margin: 0;
+    margin-left: 0.5em;
+    line-height: 1.1em;
+  }
+
+  & > span {
+    display: inline-block;
+    padding: 0.5em;
+    margin: 0.5em;
+
+    span {
+      color: white;
+      font-size: 0.8em;
+      font-weight: bold;
+      white-space: nowrap;
+    }
+  }
+}
+
+div.timeline {
+  div.timeframe {
+    height: 7em;
+    margin-bottom: 1em;
+    clear: left;
+
+    span {
+      width: 8em;
+      margin-top: 2.3em;
+      margin-right: 1.5em;
+      display: block;
+      float: left;
+      text-align: center;
+
+      a {
+        color: @colorTextDefault;
+        font-size: 0.8em;
+        font-weight: bold;
+        text-decoration: none;
+        white-space: nowrap;
+
+        &:hover {
+          color: @colorTextDefault;
+          text-decoration: underline;
+
+        }
+      }
+    }
+
+    div.circle-box {
+      // width: inline-style;
+      height: 100%;
+      margin-right: 0.5em;
+      position: relative;
+      float: left;
+
+      div.outer-circle {
+        // width: inline-style;
+        // height: inline-style;
+        position: absolute;
+        top: 50%;
+        // margin-top: inline-style;
+
+        &.extrapolated {
+          border-width: 2px;
+          border-style: dotted;
+          //border-color: inline-style;
+          border-radius: 100%;
+          // background-color: inline-style;
+        }
+
+        a.inner-circle {
+          // width: inline-style;
+          // height: inline-style;
+          display: block;
+          position: absolute;
+          top: 50%;
+          left: 50%;
+          // margin-top: inline-style;
+          // margin-left: inline-style;
+          border-radius: 100%;
+          // background-color: inline-style;
+        }
+      }
+    }
+  }
+
+  hr {
+    border: 0;
+    height: 1px;
+    background-image: linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,0.3), rgba(0,0,0,0));
+    background-image: -o-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,0.3), rgba(0,0,0,0));
+    background-image: -ms-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,0.3), rgba(0,0,0,0));
+    background-image: -moz-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,0.3), rgba(0,0,0,0));
+    background-image: -webkit-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,0.3), rgba(0,0,0,0));
+  }
+}
+
+/* End of monitoring timeline styles */
+
+/* Monitoring groupsummary styles */
+
+.dashboard table.groupview {
+  margin-top: 0;
+}
+
+table.groupview {
+  width: 100%;
+  margin-top: 1em;
+  border-collapse: separate;
+  border-spacing: 0.1em;
+
+  th {
+    font-size: 0.9em;
+    text-align: left;
+    white-space: nowrap;
+  }
+
+  td {
+    &.groupname {
+      width: 60%;
+
+      a {
+        color: inherit;
+        text-decoration: none;
+
+        &:hover {
+          text-decoration: underline;
+        }
+      }
+    }
+
+    &.total {
+      width: 10%;
+    }
+
+    &.state {
+      width: 20%;
+      white-space: nowrap;
+
+      &.change {
+        width: 10%;
+        text-align: center;
+        border-left-width: 1.5em;
+        border-left-style: solid;
+        padding: 0.3em 0.5em 0.3em 0.5em;
+
+        strong {
+          font-size: 0.8em;
+        }
+
+        span.timesince {
+          font-size: 0.8em;
+        }
+
+        &.ok {
+          border-color: @colorOk;
+        }
+
+        &.pending {
+          border-color: @colorPending;
+        }
+
+        &.warning {
+          border-color: @colorWarningHandled;
+
+          &.unhandled {
+            color: white;
+            border-left-width: 0;
+            background-color: @colorWarning;
+          }
+        }
+
+        &.unknown {
+          border-color: @colorUnknownHandled;
+
+          &.unhandled {
+            color: white;
+            border-left-width: 0;
+            background-color: @colorUnknown;
+          }
+        }
+
+        &.critical {
+          border-color: @colorCriticalHandled;
+
+          &.unhandled {
+            color: white;
+            border-left-width: 0;
+            background-color: @colorCritical;
+          }
+        }
+      }
+
+      span.state {
+        &.handled {
+          margin-right: 2px;
+        }
+
+        a {
+          font-size: 0.9em;
+          color: white;
+          text-decoration: none;
+
+          &:hover {
+            text-decoration: underline;
+          }
+        }
+      }
+    }
+  }
+}
+
+/* End of monitoring groupsummary styles */
+
+/* compact table */
+table.statesummary {
+  text-align: left;
+  width: auto;
+  border-collapse: separate;
+
+  tr.state td.state {
+    width: auto;
+    font-weight: bold;
+  }
+
+  td {
+    font-size: 0.9em;
+    line-height: 1.2em;
+    padding-left: 0.2em;
+    margin: 0;
+  }
+
+  td.state {
+    padding: 0.2em;
+    min-width: 75px;
+    font-size: 0.75em;
+    text-align: center;
+  }
+
+  td.name {
+    font-weight: bold;
+  }
+
+  td a {
+    color: inherit;
+    text-decoration: none;
+  }
+}
+
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 86a24c661..bb8a50e3f 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -222,6 +222,64 @@ table.benchmark {
   background-color: #fbfcc5;
 }
 
+/* Action table */
+table.action {
+  font-size: 0.9em;
+  border-collapse: separate;
+  border-spacing: 1px;
+  width: 100%;
+  table-layout: fixed !important;
+  margin: 0;
+  color: @colorTextDefault;
+}
+
+table.action th {
+  text-align: left;
+  overflow: hidden;
+}
+
+table.action.wide td {
+  line-height: 2.5em;
+}
+
+table.action td {
+  padding: 0.3em 0.5em 0.3em 0.5em;
+  line-height: 1.5em;
+  overflow: hidden;
+}
+
+.dashboard table.action td {
+  line-height: 1.2em;
+  padding: 0.2 0.4em 0.2em 0.5em;
+}
+
+table.action td .pluginoutput {
+  font-size: 0.8em;
+  line-height: 1.2em;
+  padding: 0;
+  margin: 0;
+}
+
+table.action td a {
+  color: inherit;
+  text-decoration: none;
+}
+
+table.action td a:hover {
+  text-decoration: underline;
+}
+
+/* END of Action table */
+
+/* Table behaviour */
+
+tr[href] {
+  cursor: pointer;
+}
+
+/* End of table behaviour */
+
+
 div.content.users {
   table.user-list {
     th.user-remove {
diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
deleted file mode 100644
index 7f1499f02..000000000
--- a/public/css/icinga/monitoring-colors.less
+++ /dev/null
@@ -1,964 +0,0 @@
-/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-/* Special tables and states */
-
-table.colors {
-  font-size: 0.8em;
-  width: 98%;
-  margin: 0 1%;
-}
-
-table.colors td {
-  text-align: center;
-  vertical-align: middle;
-  width:  10%;
-  height: 1.6em;
-  font-weight: normal;
-  border: 0.079em solid white;
-}
-
-/* Action table */
-table.action {
-  font-size: 0.9em;
-  border-collapse: separate;
-  border-spacing: 1px;
-  width: 100%;
-  table-layout: fixed !important;
-  margin: 0;
-  color: @colorTextDefault;
-}
-
-table.action th {
-  text-align: left;
-  overflow: hidden;
-}
-
-table.action.wide td {
-  line-height: 2.5em;
-}
-
-table.action td {
-  padding: 0.3em 0.5em 0.3em 0.5em;
-  line-height: 1.5em;
-  overflow: hidden;
-}
-
-.dashboard table.action td {
-  line-height: 1.2em;
-  padding: 0.2 0.4em 0.2em 0.5em;
-}
-
-table.action td .pluginoutput {
-  font-size: 0.8em;
-  line-height: 1.2em;
-  padding: 0;
-  margin: 0;
-}
-
-table.action td a {
-  color: inherit;
-  text-decoration: none;
-}
-
-table.action td a:hover {
-  text-decoration: underline;
-}
-
-/* END of Action table */
-
-
-/* Table behaviour */
-
-tr[href] {
-  cursor: pointer;
-}
-
-/* End of table behaviour */
-
-
-table.action td.state {
-  font-size: 0.7em;
-  text-align: center;
-}
-
-table.action td.timesince {
-  width: 3.5em;
-}
-
-
-/* State row behaviour */
-
-tr.state img.icon {
-  margin-right: 2px;
-}
-
-tr.state a {
-  font-weight: bold;
-}
-
-tr.state a.active {
-}
-
-tr.state.new td.state {
-  font-weight: bold;
-}
-
-tr.state td.state strong {
-  font-size: 1.2em;
-}
-
-tr.state td.state {
-  width: 9em;
-  color: white;
-  border-bottom: none;
-}
-
-tr.state.handled td.state, tr.state.ok td.state, tr.state.up td.state, tr.state.pending td.state {
-  border-left-style: solid;
-  border-left-width: 1.5em;
-  padding-left: 0em;
-  padding-right: 0.5em;
-  color: black;
-  background-color: transparent;
-}
-
-tr[href].active {
-  background-color: #eee;
-  color: black;
-}
-
-tr.state.ok td.state, tr.state.up td.state {
-  border-left-color: @colorOk;
-}
-
-tr.state.warning td.state {
-  background-color: @colorWarning;
-}
-
-tr.state.warning.handled td.state {
-  border-left-color: @colorWarningHandled;
-}
-
-tr.state.critical td.state, tr.state.down td.state {
-  background-color: @colorCritical;
-}
-
-tr.state.critical.handled td.state, tr.state.down.handled td.state {
-  border-left-color: @colorCriticalHandled;
-}
-
-tr.state.unreachable td.state {
-  background-color: @colorUnreachable;
-}
-
-tr.state.unreachable.handled td.state {
-  border-left-color: @colorUnreachableHandled;
-}
-
-tr.state.unknown td.state {
-  background-color: @colorUnknown;
-}
-
-tr.state.unknown.handled td.state {
-  border-left-color: @colorUnknownHandled;
-}
-
-tr.state.pending td.state {
-  border-left-color: @colorPending;
-}
-
-tr.state.invalid td.state {
-  background-color: @colorInvalid;
-}
-
-tr.state.unreachable td.state {
-  background-color: @colorUnreachable;
-}
-
-tr.state.unreachable.handled td.state {
-  border-left-color: @colorUnreachableHandled;
-}
-
-tr.state.handled td.state {
-  color: inherit;
-  background-color: transparent !important;
-}
-
-/* HOVER colors */
-tr[href]:hover {
-  color: black;
-  background-color: #eee;
-}
-
-tr.state[href]:hover td.state {
-  background-color: #eee;
-}
-
-tr.state.ok[href]:hover, tr.state.up[href]:hover {
-  background-color: @colorOk;
-}
-
-tr.state.handled[href]:hover, tr.state.handled[href]:hover td.state {
-  color: #121212 !important;
-}
-
-tr.state.warning[href]:hover {
-  background-color: @colorWarning;
-}
-
-tr.state.warning.handled[href]:hover {
-  background-color: @colorWarningHandled;
-}
-
-tr.state.critical[href]:hover, tr.state.down[href]:hover {
-  background-color: @colorCritical;
-}
-
-tr.state.critical.handled[href]:hover, tr.state.down.handled[href]:hover {
-  background-color: @colorCriticalHandled;
-  color: #333;
-}
-
-tr.state.unknown[href]:hover {
-  background-color: @colorUnknown;
-}
-
-tr.state.unknown.handled[href]:hover {
-  background-color: @colorUnknownHandled;
-}
-
-tr.state.pending[href]:hover {
-  background-color: @colorPending;
-}
-
-tr.state.invalid[href]:hover {
-  background-color: @colorInvalid;
-}
-
-tr.state.unreachable[href]:hover {
-  background-color: @colorUnreachable;
-}
-
-tr.state.unreachable.handled[href]:hover {
-  background-color: @colorUnreachableHandled;
-}
-
-tr.state[href]:hover td.state {
-  background-color: inherit !important;
-}
-
-/* END of HOVER colors */
-
-/* END of special tables and states */
-
-
-/* Generic colors */
-
-a.critical {
-  color: @colorCritical;
-}
-
-/* END of Generic colors */
-
-
-/* Generic box element */
-
-.boxview a {
-  text-decoration: none;
-}
-
-.boxview > div.box {
-  text-align: center;
-  vertical-align: top;
-  display: inline-block;
-  padding: 0.4em;
-  margin: 0.4em;
-  border: 1px solid #d9d9d9;
-  background: #eee;
-}
-
-/* Box caption */
-.boxview div.box h2 {
-  margin-top: 0;
-  margin-bottom: 0.6em;
-  font-size: 0.8em;
-  color: @colorTextDefault;
-}
-
-.boxview div.box h2:first-child {
-  margin-top: 0.2em;
-  padding-bottom: 0.5em;
-  font-size: inherit;
-  color: @colorTextDefault;
-  border-bottom: 1px solid #d9d9d9;
-}
-
-.boxview div.box h2 > a {
-  color: inherit;
-  margin-bottom: 0.2em;
-}
-
-.boxview div.box h2 > a:hover {
-  text-decoration: underline;
-}
-
-.boxview div.box h2:first-child > a:hover {
-}
-
-.boxview div.box h3 {
-  line-height: 1.5em;
-  font-size: 0.9em;
-  color: #555;
-  border-bottom: 1px solid #d9d9d9;
-}
-
-/* Box body of contents */
-.boxview div.box.contents {
-  padding: 0.2em;
-}
-
-.boxview div.box.contents table {
-  width: 100%;
-}
-
-.boxview div.box.contents td {
-  width: 13em;
-  vertical-align: top;
-}
-
-/* Box separator */
-.boxview div.box-separator:first-child {
-  border-top-width: 0;
-}
-
-.boxview div.box-separator {
-  font-size: 0.8em;
-  padding: 0.4em 0 0.4em;
-  border: 1px solid #d9d9d9;
-
-  font-weight: bold;
-  letter-spacing: 0.1em;
-}
-
-/* Box entry */
-.boxview div.box.entry {
-  min-height: 2.7em;
-  margin: 0.2em;
-  font-size: 0.9em;
-  white-space: nowrap;
-
-  color: @colorTextDefault;
-}
-
-/* Any line of a box entry */
-.boxview div.box.entry a {
-  display: block;
-
-  color: inherit;
-}
-
-.boxview div.box.entry a:hover {
-  color: @colorTextDefault;
-}
-
-/* First line of a box entry */
-.boxview div.box.entry a:first-child {
-  font-size: 1em;
-}
-
-/* End of generic box element */
-
-
-/* Monitoring box element styles */
-
-/* Host- and Servicegroup element styles */
-
-div.box.entry.state_up, div.box.entry.state_ok {
-  border: 1px solid @colorOk;
-  border-left: 1em solid @colorOk;
-}
-
-div.box.entry.state_pending {
-  border: 1px solid @colorPending;
-  border-left: 1em solid @colorPending;
-}
-
-div.box.entry.state_down, div.box.entry.state_critical {
-  border: 1px solid @colorCritical;
-  border-left: 1em solid @colorCritical;
-  background-color: @colorCritical;
-  color: white;
-}
-
-div.box.entry.state_down a:hover, div.box.entry.state_critical a:hover {
-  color: #dcdcdc;
-}
-
-div.box.entry.state_warning {
-  border: 1px solid @colorWarning;
-  border-left: 1em solid @colorWarning;
-  background-color: @colorWarning;
-  color: white;
-}
-
-div.box.entry.state_warning a:hover {
-  color: #dcdcdc;
-}
-
-div.box.entry.state_unreachable, div.box.entry.state_unknown {
-  border: 1px solid @colorUnknown;
-  border-left: 1em solid @colorUnknown;
-  background-color: @colorUnknown;
-  color: white;
-}
-
-div.box.entry.state_unreachable a:hover, div.box.entry.state_unknown a:hover {
-  color: #dcdcdc;
-}
-
-div.box.entry.handled {
-  background-color: transparent;
-  color: inherit;
-}
-
-div.box.entry.handled a:hover {
-  color: @colorTextDefault;
-}
-
-/* Tactical overview element styles */
-
-.tactical > .boxview > div.box {
-  min-height: 20em;
-  min-width: 12.1em;
-}
-
-.tactical div.box.contents {
-  min-height: 14.5em;
-}
-
-div.box.contents.zero {
-  min-width: 11.1em;
-
-  background-color: transparent;
-}
-
-div.box.contents.zero span {
-  font-weight: bold;
-  line-height: 2em;
-
-  color: #666;
-}
-
-div.box.contents.zero h3 {
-  margin: 0;
-  font-size: 12em;
-  line-height: 1em;
-
-  color: #666;
-}
-
-div.box.ok_hosts.state_up {
-  border: 5px solid @colorOk;
-}
-
-div.box.ok_hosts.state_pending {
-  background-color: @colorPending;
-}
-
-div.box.problem_hosts.state_down {
-  border: 5px solid @colorCritical;
-}
-
-div.box.problem_hosts.state_down.handled {
-  background-color: @colorCriticalHandled;
-}
-
-div.box.problem_hosts.state_unreachable {
-  background-color: @colorUnreachable;
-}
-
-div.box.problem_hosts.state_unreachable.handled {
-  background-color: @colorUnreachableHandled;
-}
-
-div.box.ok_hosts div.box.entry, div.box.problem_hosts div.box.entry {
-  min-width: 11.1em;
-}
-
-div.box.monitoringfeatures div.box.contents {
-  padding: 0 2 0em;
-}
-
-div.box.monitoringfeatures {
-  border: 5px solid #d9d9d9;
-}
-
-div.box.monitoringfeatures div.box-separator {
-  color: white;
-  background-color: @colorOk;
-}
-
-div.box.monitoringfeatures div.feature-highlight {
-  background-color: @colorCritical;
-}
-
-div.box.monitoringfeatures a.feature-highlight {
-  font-weight: bold;
-}
-
-div.box.hostservicechecks {
-  border: 5px solid #d9d9d9;
-}
-
-/* Contactgroup element styles */
-
-div.box.contactgroup {
-  width: 18em;
-  padding: 0.8em;
-}
-
-div.box.contactgroup div.box.contents {
-  padding: 0.6em;
-}
-
-div.box.contactgroup div.box.entry {
-  overflow: hidden;
-  clear: left;
-}
-
-div.box.contactgroup div.box.entry img {
-  width: 80px;
-  height: 80px;
-  float: left;
-
-}
-
-div.box.contactgroup div.box.entry a {
-  margin-top: 0.4em;
-
-  font-weight: bold;
-}
-
-div.box.contactgroup div.box.entry p {
-  margin: 0.4em 0 0;
-}
-
-div.circular {
-  margin-top: 0.5em;
-  margin-left: 2em;
-  margin-right: 1em;
-  width: 80px;
-  height: 80px;
-  float: left;
-  background-size: 100% 100%;
-}
-
-/* End of monitoring box element styles */
-
-
-/* Monitoring pivot table styles */
-
-div.pivot-pagination {
-  margin: 1em;
-
-  table {
-    table-layout: fixed;
-    border-spacing: 1px;
-    border-collapse: separate;
-    border: 1px solid LightGrey;
-    border-radius: 0.3em;
-
-    td {
-      width: 16px;
-      height: 16px;
-      padding: 0;
-      background-color: #fbfbfb;
-
-      &:hover, &.active {
-        background-color: #e5e5e5;
-      }
-
-      a {
-        width: 16px;
-        height: 16px;
-        display: block;
-      }
-    }
-  }
-}
-
-table.joystick-pagination {
-  margin-top: -1.5em;
-
-  td {
-    width: 1.25em;
-    height: 1.3em;
-  }
-}
-
-table.pivot {
-  a {
-    text-decoration: none;
-    color: black;
-
-    &:hover {
-      color: @colorTextDefault;
-    }
-  }
-
-  & > thead {
-    th {
-      height: 6em;
-
-      div {
-        margin-right: -1.5em;
-        padding-left: 1.3em;
-
-        span {
-          width: 1.5em;
-          margin-right: 0.25em;
-          margin-top: 4em;
-          line-height: 2em;
-          white-space: nowrap;
-          display: block;
-          float: left;
-
-          transform: rotate(-45deg);
-          transform-origin: bottom left;
-          -o-transform: rotate(-45deg);
-          -o-transform-origin: bottom left;
-          -ms-transform: rotate(-45deg);
-          -ms-transform-origin: bottom left;
-          -moz-transform: rotate(-45deg);
-          -moz-transform-origin: bottom left;
-          -webkit-transform: rotate(-45deg);
-          -webkit-transform-origin: bottom left;
-          //filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
-
-          abbr {
-            border: 0; // Remove highlighting in firefox
-            font-size: 0.8em;
-          }
-        }
-      }
-    }
-  }
-
-  & > tbody {
-    th {
-      padding: 0 14px 0 0;
-      white-space: nowrap;
-
-      a {
-        font-size: 0.8em;
-      }
-    }
-
-    td {
-      padding: 2px;
-      min-width: 1.5em;
-      line-height: 1.5em;
-      text-align: center;
-
-      a {
-        width: 1.5em;
-        height: 1.5em;
-        display: block;
-        border-radius: 0.5em;
-
-        &.state_ok {
-          background-color: @colorOk;
-        }
-
-        &.state_pending {
-          background-color: @colorPending;
-        }
-
-        &.state_warning {
-          background-color: @colorWarning;
-
-          &.handled {
-            background-color: @colorWarningHandled;
-          }
-        }
-
-        &.state_critical {
-          background-color: @colorCritical;
-
-          &.handled {
-            background-color: @colorCriticalHandled;
-          }
-        }
-
-        &.state_unknown {
-          background-color: @colorUnknown;
-
-          &.handled {
-            background-color: @colorUnknownHandled;
-          }
-        }
-      }
-    }
-  }
-}
-
-/* End of monitoring pivot table styles */
-
-/* Monitoring timeline styles */
-
-div.timeline-legend {
-  float: left;
-  padding: 0.5em;
-  border: 1px solid #d9d9d9;
-  background-color: #eee;
-
-  h2 {
-    margin: 0;
-    margin-left: 0.5em;
-    line-height: 1.1em;
-  }
-
-  & > span {
-    display: inline-block;
-    padding: 0.5em;
-    margin: 0.5em;
-
-    span {
-      color: white;
-      font-size: 0.8em;
-      font-weight: bold;
-      white-space: nowrap;
-    }
-  }
-}
-
-div.timeline {
-  div.timeframe {
-    height: 7em;
-    margin-bottom: 1em;
-    clear: left;
-
-    span {
-      width: 8em;
-      margin-top: 2.3em;
-      margin-right: 1.5em;
-      display: block;
-      float: left;
-      text-align: center;
-
-      a {
-        color: @colorTextDefault;
-        font-size: 0.8em;
-        font-weight: bold;
-        text-decoration: none;
-        white-space: nowrap;
-
-        &:hover {
-          color: @colorTextDefault;
-          text-decoration: underline;
-
-        }
-      }
-    }
-
-    div.circle-box {
-      // width: inline-style;
-      height: 100%;
-      margin-right: 0.5em;
-      position: relative;
-      float: left;
-
-      div.outer-circle {
-        // width: inline-style;
-        // height: inline-style;
-        position: absolute;
-        top: 50%;
-        // margin-top: inline-style;
-
-        &.extrapolated {
-          border-width: 2px;
-          border-style: dotted;
-          //border-color: inline-style;
-          border-radius: 100%;
-          // background-color: inline-style;
-        }
-
-        a.inner-circle {
-          // width: inline-style;
-          // height: inline-style;
-          display: block;
-          position: absolute;
-          top: 50%;
-          left: 50%;
-          // margin-top: inline-style;
-          // margin-left: inline-style;
-          border-radius: 100%;
-          // background-color: inline-style;
-        }
-      }
-    }
-  }
-
-  hr {
-    border: 0;
-    height: 1px;
-    background-image: linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,0.3), rgba(0,0,0,0));
-    background-image: -o-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,0.3), rgba(0,0,0,0));
-    background-image: -ms-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,0.3), rgba(0,0,0,0));
-    background-image: -moz-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,0.3), rgba(0,0,0,0));
-    background-image: -webkit-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,0.3), rgba(0,0,0,0));
-  }
-}
-
-/* End of monitoring timeline styles */
-
-/* Monitoring groupsummary styles */
-
-.dashboard table.groupview {
-  margin-top: 0;
-}
-
-table.groupview {
-  width: 100%;
-  margin-top: 1em;
-  border-collapse: separate;
-  border-spacing: 0.1em;
-
-  th {
-    font-size: 0.9em;
-    text-align: left;
-    white-space: nowrap;
-  }
-
-  td {
-    &.groupname {
-      width: 60%;
-
-      a {
-        color: inherit;
-        text-decoration: none;
-
-        &:hover {
-          text-decoration: underline;
-        }
-      }
-    }
-
-    &.total {
-      width: 10%;
-    }
-
-    &.state {
-      width: 20%;
-      white-space: nowrap;
-
-      &.change {
-        width: 10%;
-        text-align: center;
-        border-left-width: 1.5em;
-        border-left-style: solid;
-        padding: 0.3em 0.5em 0.3em 0.5em;
-
-        strong {
-          font-size: 0.8em;
-        }
-
-        span.timesince {
-          font-size: 0.8em;
-        }
-
-        &.ok {
-          border-color: @colorOk;
-        }
-
-        &.pending {
-          border-color: @colorPending;
-        }
-
-        &.warning {
-          border-color: @colorWarningHandled;
-
-          &.unhandled {
-            color: white;
-            border-left-width: 0;
-            background-color: @colorWarning;
-          }
-        }
-
-        &.unknown {
-          border-color: @colorUnknownHandled;
-
-          &.unhandled {
-            color: white;
-            border-left-width: 0;
-            background-color: @colorUnknown;
-          }
-        }
-
-        &.critical {
-          border-color: @colorCriticalHandled;
-
-          &.unhandled {
-            color: white;
-            border-left-width: 0;
-            background-color: @colorCritical;
-          }
-        }
-      }
-
-      span.state {
-        &.handled {
-          margin-right: 2px;
-        }
-
-        a {
-          font-size: 0.9em;
-          color: white;
-          text-decoration: none;
-
-          &:hover {
-            text-decoration: underline;
-          }
-        }
-      }
-    }
-  }
-}
-
-/* End of monitoring groupsummary styles */
-
-/* compact table */
-table.statesummary {
-  text-align: left;
-  width: auto;
-  border-collapse: separate;
-
-  tr.state td.state {
-    width: auto;
-    font-weight: bold;
-  }
-
-  td {
-    font-size: 0.9em;
-    line-height: 1.2em;
-    padding-left: 0.2em;
-    margin: 0;
-  }
-
-  td.state {
-    padding: 0.2em;
-    min-width: 75px;
-    font-size: 0.75em;
-    text-align: center;
-  }
-
-  td.name {
-    font-weight: bold;
-  }
-
-  td a {
-    color: inherit;
-    text-decoration: none;
-  }
-}
-

From cd20ec385cf75ce8eaccf88507467e9e6760e61e Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 5 Jun 2015 12:59:18 +0200
Subject: [PATCH 2038/2920] header-elements.less: remove obsolete user style

---
 public/css/icinga/header-elements.less | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/public/css/icinga/header-elements.less b/public/css/icinga/header-elements.less
index 560fada6f..4ecfb0823 100644
--- a/public/css/icinga/header-elements.less
+++ b/public/css/icinga/header-elements.less
@@ -1,12 +1,5 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-#header div.user {
-  font-size: 1.1em;
-  margin-top: 0.8em;
-  margin-right: 2em;
-  float: right;
-}
-
 #logo {
   height: 3.6em;
   width: 13em;

From 7ebf185036a7bf00eeb65e40859634796e7f327c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 13:07:16 +0200
Subject: [PATCH 2039/2920] UserGroupBackendForm: Fix that autosubmit do not
 have any effect

refs #7343
---
 .../Config/UserGroup/UserGroupBackendForm.php | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/application/forms/Config/UserGroup/UserGroupBackendForm.php b/application/forms/Config/UserGroup/UserGroupBackendForm.php
index dd9875c9a..abcf1eaa4 100644
--- a/application/forms/Config/UserGroup/UserGroupBackendForm.php
+++ b/application/forms/Config/UserGroup/UserGroupBackendForm.php
@@ -13,6 +13,13 @@ use Icinga\Forms\ConfigForm;
  */
 class UserGroupBackendForm extends ConfigForm
 {
+    /**
+     * The backend to load when displaying the form for the first time
+     *
+     * @var string
+     */
+    protected $backendToLoad;
+
     /**
      * Initialize this form
      */
@@ -53,10 +60,7 @@ class UserGroupBackendForm extends ConfigForm
             throw new NotFoundError('No user group backend called "%s" found', $name);
         }
 
-        $data = $this->config->getSection($name)->toArray();
-        $data['type'] = $data['backend'];
-        $data['name'] = $name;
-        $this->populate($data);
+        $this->backendToLoad = $name;
         return $this;
     }
 
@@ -187,7 +191,8 @@ class UserGroupBackendForm extends ConfigForm
                 'autosubmit'        => true,
                 'label'             => $this->translate('Backend Type'),
                 'description'       => $this->translate('The type of this user group backend'),
-                'multiOptions'      => $backendTypes
+                'multiOptions'      => $backendTypes,
+                'value'             => $backendType
             )
         );
 
@@ -195,4 +200,17 @@ class UserGroupBackendForm extends ConfigForm
         $backendForm->createElements($formData);
         $this->addElements($backendForm->getElements());
     }
+
+    /**
+     * Populate the configuration of the backend to load
+     */
+    public function onRequest()
+    {
+        if ($this->backendToLoad) {
+            $data = $this->config->getSection($this->backendToLoad)->toArray();
+            $data['type'] = $data['backend'];
+            $data['name'] = $this->backendToLoad;
+            $this->populate($data);
+        }
+    }
 }

From f3b84b7ae8d84f7d7b7cfadadd5d7d24b8298588 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 14:14:22 +0200
Subject: [PATCH 2040/2920] monitoring: Restrict service summary when viewing a
 host or service

refs #9009
---
 .../library/Monitoring/Object/MonitoredObject.php          | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 626b5cd3d..4ff6ae6c9 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -479,12 +479,9 @@ abstract class MonitoredObject implements Filterable
      */
     public function fetchStats()
     {
-        $this->stats = $this->backend->select()->from('statusSummary', array(
+        $this->stats = $this->backend->select()->from('servicestatussummary', array(
             'services_total',
             'services_ok',
-            'services_problem',
-            'services_problem_handled',
-            'services_problem_unhandled',
             'services_critical',
             'services_critical_unhandled',
             'services_critical_handled',
@@ -497,7 +494,7 @@ abstract class MonitoredObject implements Filterable
             'services_pending',
         ))
             ->where('service_host_name', $this->host_name)
-            ->getQuery()
+            ->applyFilter($this->getFilter())
             ->fetchRow();
         return $this;
     }

From 52a0ad363f2a9e4ce26c64c63ac1327bd5668aec Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 14:40:17 +0200
Subject: [PATCH 2041/2920] monitoring: Remove unnecessary group call in the
 host comment query

refs #9009
---
 .../Backend/Ido/Query/HostcommentQuery.php        | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
index aafd7dbae..fa80ec18f 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
@@ -31,16 +31,16 @@ class HostcommentQuery extends IdoQuery
             'object_type'           => '(\'host\')'
         ),
         'hostgroups' => array(
-            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
-            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
-            'hostgroup_name'    => 'hgo.name1'
+            'hostgroup'             => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'       => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'        => 'hgo.name1'
         ),
         'hosts' => array(
             'host_alias'            => 'h.alias',
             'host_display_name'     => 'h.display_name COLLATE latin1_general_ci'
         ),
         'hoststatus' => array(
-            'host_state' => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END'
+            'host_state'            => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END'
         ),
         'servicegroups' => array(
             'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
@@ -48,9 +48,9 @@ class HostcommentQuery extends IdoQuery
             'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
         ),
         'services' => array(
-            'service'                => 'so.name2 COLLATE latin1_general_ci',
-            'service_description'    => 'so.name2',
-            'service_display_name'   => 's.display_name COLLATE latin1_general_ci',
+            'service'               => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'   => 'so.name2',
+            'service_display_name'  => 's.display_name COLLATE latin1_general_ci',
         )
     );
 
@@ -154,7 +154,6 @@ class HostcommentQuery extends IdoQuery
             'sgo.objecttype_id = ?',
             4
         );
-        $this->group('ho.name1');
     }
 
     /**

From c735ee799c1af3e7d01f36b3bfb5de7b70ef4e57 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 14:41:25 +0200
Subject: [PATCH 2042/2920] monitoring: Remove unnecessary group call in the
 host downtime query

refs #9009
---
 .../Backend/Ido/Query/HostdowntimeQuery.php   | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
index 91fe488d3..0e2b503d8 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
@@ -37,26 +37,26 @@ class HostdowntimeQuery extends IdoQuery
             'object_type'               => '(\'host\')'
         ),
         'hostgroups' => array(
-            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
-            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
-            'hostgroup_name'    => 'hgo.name1'
+            'hostgroup'                 => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'           => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'            => 'hgo.name1'
         ),
         'hosts' => array(
-            'host_alias'            => 'h.alias',
-            'host_display_name'     => 'h.display_name COLLATE latin1_general_ci'
+            'host_alias'                => 'h.alias',
+            'host_display_name'         => 'h.display_name COLLATE latin1_general_ci'
         ),
         'hoststatus' => array(
-            'host_state' => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END'
+            'host_state'                => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END'
         ),
         'servicegroups' => array(
-            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
-            'servicegroup_name'     => 'sgo.name1',
-            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
+            'servicegroup'              => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'         => 'sgo.name1',
+            'servicegroup_alias'        => 'sg.alias COLLATE latin1_general_ci'
         ),
         'services' => array(
-            'service'                => 'so.name2 COLLATE latin1_general_ci',
-            'service_description'    => 'so.name2',
-            'service_display_name'   => 's.display_name COLLATE latin1_general_ci',
+            'service'                   => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'       => 'so.name2',
+            'service_display_name'      => 's.display_name COLLATE latin1_general_ci',
         )
     );
 
@@ -160,7 +160,6 @@ class HostdowntimeQuery extends IdoQuery
             'sgo.objecttype_id = ?',
             4
         );
-        $this->group('ho.name1');
     }
 
     /**

From bbcd6e3a2b802887202f343562f01356689e9376 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 14:42:11 +0200
Subject: [PATCH 2043/2920] monitoring: Support restricting host groups of a
 host

refs #9009
---
 .../Backend/Ido/Query/HostgroupQuery.php      | 132 ++++++++++++++++--
 .../library/Monitoring/DataView/Hostgroup.php |  39 +++---
 2 files changed, 142 insertions(+), 29 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
index d41a9e00b..a9b8ec815 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
@@ -3,21 +3,49 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
+/**
+ * Query for host groups
+ */
 class HostgroupQuery extends IdoQuery
 {
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * {@inheritdoc}
+     */
     protected $columnMap = array(
         'hostgroups' => array(
-            'hostgroups'      => 'hgo.name1 COLLATE latin1_general_ci',
-            'hostgroup_name'  => 'hgo.name1',
-            'hostgroup_alias' => 'hg.alias',
-            'hostgroup_id'    => 'hg.hostgroup_id'
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
+        ),
+        'hostobjects' => array(
+            'host'                  => 'ho.name1 COLLATE latin1_general_ci',
+            'host_name'             => 'ho.name1'
         ),
         'hosts' => array(
-            'host'            => 'ho.name1 COLLATE latin1_general_ci',
-            'host_name'       => 'ho.name1'
+            'host_alias'            => 'h.alias',
+            'host_display_name'     => 'h.display_name COLLATE latin1_general_ci',
+        ),
+        'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1'
+        ),
+        'services' => array(
+            'service'                => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'    => 'so.name2',
+            'service_display_name'   => 's.display_name COLLATE latin1_general_ci'
         )
     );
 
+
+    /**
+     * {@inheritdoc}
+     */
     protected function joinBaseTables()
     {
         $this->select->from(
@@ -25,13 +53,23 @@ class HostgroupQuery extends IdoQuery
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hg.hostgroup_object_id = hgo.' . $this->object_id . ' AND hgo.is_active = 1',
+            'hgo.object_id = hg.hostgroup_object_id',
             array()
+        )->where(
+            'hgo.is_active = ?',
+            1
+        )
+        ->where(
+            'hgo.objecttype_id = ?',
+            3
         );
-        $this->joinedVirtualTables = array('hostgroups' => true);
+        $this->joinedVirtualTables['hostgroups'] = true;
     }
 
-    protected function joinHosts()
+    /**
+     * Join host objects
+     */
+    protected function joinHostobjects()
     {
         $this->select->join(
             array('hgm' => $this->prefix . 'hostgroup_members'),
@@ -39,8 +77,82 @@ class HostgroupQuery extends IdoQuery
             array()
         )->join(
             array('ho' => $this->prefix . 'objects'),
-            'hgm.host_object_id = ho.object_id AND ho.is_active = 1',
+            'hgm.host_object_id = ho.object_id',
+            array()
+        )->where(
+            'ho.is_active = ?',
+            1
+        )
+        ->where(
+            'ho.objecttype_id = ?',
+            1
+        );
+        $this->group('hgo.name1');
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $this->requireVirtualTable('hostobjects');
+        $this->select->join(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = ho.object_id',
             array()
         );
     }
+
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = s.service_object_id',
+            array()
+        )->join(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
+            array()
+        )->join(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id',
+            array()
+        )->where(
+            'sgo.is_active = ?',
+            1
+        )
+        ->where(
+            'sgo.objecttype_id = ?',
+            4
+        );
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $this->requireVirtualTable('hosts');
+        $this->select->join(
+            array('s' => $this->prefix . 'services'),
+            's.host_object_id = h.host_object_id',
+            array()
+        )->join(
+            array('so' => $this->prefix . 'objects'),
+            'so.object_id = s.service_object_id AND so.is_active = 1',
+            array()
+        )->where(
+            'so.is_active = ?',
+            1
+        )
+        ->where(
+            'so.objecttype_id = ?',
+            2
+        );
+        $this->group('hgo.name1');
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroup.php b/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
index c139d8977..ed4a8bd96 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
@@ -4,44 +4,45 @@
 namespace Icinga\Module\Monitoring\DataView;
 
 /**
- * View for hostgroups
+ * Host group data view
  */
 class Hostgroup extends DataView
 {
     /**
-     * Retrieve columns provided by this view
-     *
-     * @return array
+     * {@inheritdoc}
      */
     public function getColumns()
     {
         return array(
-            'hostgroup_name',
             'hostgroup_alias',
-            'hostgroup_id',
-            'host_name'
+            'hostgroup_name'
         );
     }
 
     /**
-     * Retrieve default sorting rules for particular columns. These involve sort order and potential additional to sort
-     *
-     * @return array
+     * {@inheritdoc}
      */
-    public function getSortRules()
+    public function getFilterColumns()
     {
         return array(
-            'hostgroup_name' => array(
-                'order' => self::SORT_ASC
-            ),
-            'hostgroup_alias' => array(
-                'order' => self::SORT_ASC
-            )
+            'host', 'host_alias', 'host_display_name', 'host_name',
+            'hostgroup',
+            'service', 'service_description', 'service_display_name',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
         );
     }
 
-    public function getFilterColumns()
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
     {
-        return array('hostgroup', 'host');
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        } else {
+            return parent::isValidFilterTarget($column);
+        }
     }
 }

From 80c80436cfa24308f362bc7747d08d2838f66fbf Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 14:42:49 +0200
Subject: [PATCH 2044/2920] monitoring: Support restricting service groups of a
 service

refs #9009
---
 .../Backend/Ido/Query/ServicegroupQuery.php   | 111 ++++++++++++++++--
 .../Monitoring/DataView/Servicegroup.php      |  40 ++++---
 2 files changed, 119 insertions(+), 32 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
index 125c07005..731a9994c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
@@ -5,21 +5,43 @@ namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 class ServicegroupQuery extends IdoQuery
 {
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * {@inheritdoc}
+     */
     protected $columnMap = array(
+        'hostgroups' => array(
+            'hostgroup'             => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'       => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'        => 'hgo.name1'
+        ),
+        'hosts' => array(
+            'host_alias'            => 'h.alias',
+            'host_display_name'     => 'h.display_name COLLATE latin1_general_ci',
+        ),
         'servicegroups' => array(
-            'servicegroup'       => 'sgo.name1 COLLATE latin1_general_ci',
-            'servicegroup_name'  => 'sgo.name1',
-            'servicegroup_alias' => 'sg.alias COLLATE latin1_general_ci'
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1'
+        ),
+        'serviceobjects' => array(
+            'host'                  => 'so.name1 COLLATE latin1_general_ci',
+            'host_name'             => 'so.name1',
+            'service'               => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'   => 'so.name2'
         ),
         'services' => array(
-            'host'                => 'so.name1 COLLATE latin1_general_ci',
-            'host_name'           => 'so.name1',
-            'service'             => 'so.name2 COLLATE latin1_general_ci',
-            'service_host_name'   => 'so.name1',
-            'service_description' => 'so.name2'
+            'service_display_name'  => 's.display_name COLLATE latin1_general_ci',
         )
     );
 
+    /**
+     * {@inheritdoc}
+     */
     protected function joinBaseTables()
     {
         $this->select->from(
@@ -27,15 +49,64 @@ class ServicegroupQuery extends IdoQuery
             array()
         )->join(
             array('sgo' => $this->prefix . 'objects'),
-            'sg.servicegroup_object_id = sgo.' . $this->object_id
-          . ' AND sgo.is_active = 1',
+            'sg.servicegroup_object_id = sgo.object_id',
             array()
+        )->where(
+            'sgo.is_active = ?',
+            1
+        )
+        ->where(
+            'sgo.objecttype_id = ?',
+            4
         );
-
         $this->joinedVirtualTables = array('servicegroups' => true);
     }
 
-    protected function joinServices()
+    /**
+     * Join host groups
+     */
+    protected function joinHostgroups()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = s.host_object_id',
+            array()
+        )->join(
+            array('hg' => $this->prefix . 'hostgroups'),
+            'hg.hostgroup_id = hgm.hostgroup_id',
+            array()
+        )->join(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hg.hostgroup_object_id',
+            array()
+        )->where(
+            'hgo.is_active = ?',
+            1
+        )
+        ->where(
+            'hgo.objecttype_id = ?',
+            3
+        );
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = s.host_object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join service objects
+     */
+    protected function joinServiceobjects()
     {
         $this->select->join(
             array('sgm' => $this->prefix . 'servicegroup_members'),
@@ -43,7 +114,21 @@ class ServicegroupQuery extends IdoQuery
             array()
         )->join(
             array('so' => $this->prefix . 'objects'),
-            'sgm.service_object_id = so.' . $this->object_id . ' AND so.is_active = 1',
+            'sgm.service_object_id = so.object_id',
+            array()
+        );
+        $this->group('sgo.name1');
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $this->requireVirtualTable('serviceobjects');
+        $this->select->join(
+            array('s' => $this->prefix . 'services'),
+            's.service_object_id = so.object_id',
             array()
         );
     }
diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroup.php b/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
index 82feabd88..a428caded 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroup.php
@@ -3,43 +3,45 @@
 
 namespace Icinga\Module\Monitoring\DataView;
 
+/**
+ * Service group view */
 class Servicegroup extends DataView
 {
     /**
-     * Retrieve columns provided by this view
-     *
-     * @return array
+     * {@inheritdoc}
      */
     public function getColumns()
     {
         return array(
-            'servicegroup_name',
             'servicegroup_alias',
-            'host_name',
-            'service_host_name',
-            'service_description'
+            'servicegroup_name'
         );
     }
 
     /**
-     * Retrieve default sorting rules for particular columns. These involve sort order and potential additional to sort
-     *
-     * @return array
+     * {@inheritdoc}
      */
-    public function getSortRules()
+    public function getFilterColumns()
     {
         return array(
-            'servicegroup_name' => array(
-                'order' => self::SORT_ASC
-            ),
-            'servicegroup_alias' => array(
-                'order' => self::SORT_ASC
-            )
+            'host', 'host_alias', 'host_display_name', 'host_name',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'service_description', 'service_display_name',
+            'servicegroup'
         );
     }
 
-    public function getFilterColumns()
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
     {
-        return array('servicegroup', 'host', 'service');
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        } else {
+            return parent::isValidFilterTarget($column);
+        }
     }
 }

From d830480655bac65ebb69582d6cea1cf6ddfa04a2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 14:43:38 +0200
Subject: [PATCH 2045/2920] monitoring: Add missing restrictable columns to
 host and service comments and downtimes

refs #9009
---
 .../Monitoring/DataView/Hostcomment.php       | 32 ++++++++++---------
 .../Monitoring/DataView/Hostdowntime.php      | 32 ++++++++++---------
 .../Monitoring/DataView/Servicecomment.php    | 32 ++++++++++---------
 .../Monitoring/DataView/Servicedowntime.php   | 32 ++++++++++---------
 4 files changed, 68 insertions(+), 60 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Hostcomment.php b/modules/monitoring/library/Monitoring/DataView/Hostcomment.php
index b751a82b9..d1afbdd74 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostcomment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostcomment.php
@@ -8,19 +8,6 @@ namespace Icinga\Module\Monitoring\DataView;
  */
 class Hostcomment extends DataView
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function isValidFilterTarget($column)
-    {
-        if ($column[0] === '_'
-            && preg_match('/^_(?:host|service)_/', $column)
-        ) {
-            return true;
-        }
-        return parent::isValidFilterTarget($column);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -47,8 +34,23 @@ class Hostcomment extends DataView
     public function getFilterColumns()
     {
         return array(
-            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
-            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+            'host', 'host_alias',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'service_description', 'service_display_name',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        }
+        return parent::isValidFilterTarget($column);
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Hostdowntime.php b/modules/monitoring/library/Monitoring/DataView/Hostdowntime.php
index f95f82da2..3b1c901b5 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostdowntime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostdowntime.php
@@ -8,19 +8,6 @@ namespace Icinga\Module\Monitoring\DataView;
  */
 class Hostdowntime extends DataView
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function isValidFilterTarget($column)
-    {
-        if ($column[0] === '_'
-            && preg_match('/^_(?:host|service)_/', $column)
-        ) {
-            return true;
-        }
-        return parent::isValidFilterTarget($column);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -52,8 +39,23 @@ class Hostdowntime extends DataView
     public function getFilterColumns()
     {
         return array(
-            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
-            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+            'host', 'host_alias',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'service_description', 'service_display_name',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        }
+        return parent::isValidFilterTarget($column);
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Servicecomment.php b/modules/monitoring/library/Monitoring/DataView/Servicecomment.php
index 64d193cfa..b3d11ad49 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicecomment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicecomment.php
@@ -8,19 +8,6 @@ namespace Icinga\Module\Monitoring\DataView;
  */
 class Servicecomment extends DataView
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function isValidFilterTarget($column)
-    {
-        if ($column[0] === '_'
-            && preg_match('/^_(?:host|service)_/', $column)
-        ) {
-            return true;
-        }
-        return parent::isValidFilterTarget($column);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -50,8 +37,23 @@ class Servicecomment extends DataView
     public function getFilterColumns()
     {
         return array(
-            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
-            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+            'host', 'host_alias',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        }
+        return parent::isValidFilterTarget($column);
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Servicedowntime.php b/modules/monitoring/library/Monitoring/DataView/Servicedowntime.php
index 1969aec44..0f14857d4 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicedowntime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicedowntime.php
@@ -5,19 +5,6 @@ namespace Icinga\Module\Monitoring\DataView;
 
 class Servicedowntime extends DataView
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function isValidFilterTarget($column)
-    {
-        if ($column[0] === '_'
-            && preg_match('/^_(?:host|service)_/', $column)
-        ) {
-            return true;
-        }
-        return parent::isValidFilterTarget($column);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -52,8 +39,23 @@ class Servicedowntime extends DataView
     public function getFilterColumns()
     {
         return array(
-            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
-            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+            'host', 'host_alias',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        }
+        return parent::isValidFilterTarget($column);
+    }
 }

From 5745790cdd70e5741afba9949ce75e08754c745d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 14:44:03 +0200
Subject: [PATCH 2046/2920] monitoring: Use new restriction when viewing a host

refs #9009
---
 modules/monitoring/application/controllers/HostController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index 464da200c..c006bbe8f 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -26,7 +26,7 @@ class Monitoring_HostController extends MonitoredObjectController
     {
         $host = new Host($this->backend, $this->params->getRequired('host'));
 
-        $this->applyRestriction('monitoring/hosts/filter', $host);
+        $this->applyRestriction('monitoring/filter/objects', $host);
 
         if ($host->fetch() === false) {
             $this->httpNotFound($this->translate('Host not found'));

From 5bc611f7722ad2595fc52cacaeee011801880002 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 14:44:35 +0200
Subject: [PATCH 2047/2920] monitoring: Use new restriction when viewing a
 service

refs #9009
---
 .../monitoring/application/controllers/ServiceController.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index 2886650c9..d9ed0d36b 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -28,7 +28,7 @@ class Monitoring_ServiceController extends MonitoredObjectController
             $this->backend, $this->params->getRequired('host'), $this->params->getRequired('service')
         );
 
-        $this->applyRestriction('monitoring/services/filter', $service);
+        $this->applyRestriction('monitoring/filter/objects', $service);
 
         if ($service->fetch() === false) {
             $this->httpNotFound($this->translate('Service not found'));

From dae35b9106a7cc7cb8e68cb4a8a1a2c8e981b828 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 14:47:01 +0200
Subject: [PATCH 2048/2920] monitoring: Restrict host and service groups when
 viewing a host or service

refs #9009
---
 .../Monitoring/Object/MonitoredObject.php     | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 4ff6ae6c9..a569341f6 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -308,12 +308,11 @@ abstract class MonitoredObject implements Filterable
      */
     public function fetchHostgroups()
     {
-        $hostGroups = $this->backend->select()->from('hostgroup', array(
-            'hostgroup_name',
-            'hostgroup_alias'
-        ))
-            ->where('host_name', $this->host);
-        $this->hostgroups = $hostGroups->getQuery()->fetchPairs();
+        $this->hostgroups = $this->backend->select()
+            ->from('hostgroup', array('hostgroup_name', 'hostgroup_alias'))
+            ->where('host_name', $this->host_name)
+            ->applyFilter($this->filter)
+            ->fetchPairs();
         return $this;
     }
 
@@ -407,13 +406,12 @@ abstract class MonitoredObject implements Filterable
      */
     public function fetchServicegroups()
     {
-        $serviceGroups = $this->backend->select()->from('servicegroup', array(
-                'servicegroup_name',
-                'servicegroup_alias'
-        ))
-            ->where('service_host_name', $this->host_name)
-            ->where('service_description', $this->service_description);
-        $this->servicegroups = $serviceGroups->getQuery()->fetchPairs();
+        $this->servicegroups = $this->backend->select()
+            ->from('servicegroup', array('servicegroup_name', 'servicegroup_alias'))
+            ->where('host_name', $this->host_name)
+            ->where('service_description', $this->service_description)
+            ->applyFilter($this->getFilter())
+            ->fetchPairs();
         return $this;
     }
 

From 447088af22319efc5d51fc5546644ce1488b8e90 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 14:52:46 +0200
Subject: [PATCH 2049/2920] Introduce form LdapUserGroupBackendForm

refs #7343
---
 .../UserGroup/LdapUserGroupBackendForm.php    | 304 ++++++++++++++++++
 1 file changed, 304 insertions(+)
 create mode 100644 application/forms/Config/UserGroup/LdapUserGroupBackendForm.php

diff --git a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
new file mode 100644
index 000000000..71af892f2
--- /dev/null
+++ b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
@@ -0,0 +1,304 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Forms\Config\UserGroup;
+
+use Icinga\Application\Config;
+use Icinga\Authentication\User\UserBackend;
+use Icinga\Authentication\UserGroup\LdapUserGroupBackend;
+use Icinga\Data\ConfigObject;
+use Icinga\Data\ResourceFactory;
+use Icinga\Protocol\Ldap\Connection;
+use Icinga\Web\Form;
+use Icinga\Web\Notification;
+
+/**
+ * Form for managing LDAP user group backends
+ */
+class LdapUserGroupBackendForm extends Form
+{
+    /**
+     * Initialize this form
+     */
+    public function init()
+    {
+        $this->setName('form_config_ldapusergroupbackend');
+    }
+
+    /**
+     * Create and add elements to this form
+     *
+     * @param   array   $formData
+     */
+    public function createElements(array $formData)
+    {
+        $resourceNames = $this->getLdapResourceNames();
+        $this->addElement(
+            'select',
+            'resource',
+            array(
+                'required'      => true,
+                'autosubmit'    => true,
+                'label'         => $this->translate('LDAP Connection'),
+                'description'   => $this->translate('The LDAP connection to use for this backend.'),
+                'multiOptions'  => array_combine($resourceNames, $resourceNames)
+            )
+        );
+        $resource = ResourceFactory::create(
+            isset($formData['resource']) && in_array($formData['resource'], $resourceNames)
+                ? $formData['resource']
+                : $resourceNames[0]
+        );
+
+        $userBackends = array('none' => $this->translate('None', 'usergroupbackend.ldap.user_backend'));
+        $userBackendNames = $this->getLdapUserBackendNames($resource);
+        if (! empty($userBackendNames)) {
+            $userBackends = array_merge($userBackends, array_combine($userBackendNames, $userBackendNames));
+        }
+        $this->addElement(
+            'select',
+            'user_backend',
+            array(
+                'required'      => true,
+                'autosubmit'    => true,
+                'label'         => $this->translate('User Backend'),
+                'description'   => $this->translate('The user backend to link with this user group backend.'),
+                'multiOptions'  => $userBackends
+            )
+        );
+
+        $groupBackend = new LdapUserGroupBackend($resource);
+        if ($formData['type'] === 'ldap') {
+            $defaults = $groupBackend->getOpenLdapDefaults();
+            $disabled = null; // MUST BE null, do NOT change this to false!
+        } else { // $formData['type'] === 'msldap'
+            $defaults = $groupBackend->getActiveDirectoryDefaults();
+            $disabled = true;
+        }
+
+        if (isset($formData['user_backend']) && $formData['user_backend'] !== 'none') {
+            $userBackend = UserBackend::create($formData['user_backend']);
+            $defaults->merge(array(
+                'user_base_dn'          => $userBackend->getBaseDn(),
+                'user_class'            => $userBackend->getUserClass(),
+                'user_name_attribute'   => $userBackend->getUserNameAttribute(),
+                'user_filter'           => $userBackend->getFilter()
+            ));
+            $disabled = true;
+        }
+
+        $this->createGroupConfigElements($defaults, $disabled);
+        $this->createUserConfigElements($defaults, $disabled);
+    }
+
+    /**
+     * Create and add all elements to this form required for the group configuration
+     *
+     * @param   ConfigObject    $defaults
+     * @param   null|bool       $disabled
+     */
+    protected function createGroupConfigElements(ConfigObject $defaults, $disabled)
+    {
+        $this->addElement(
+            'text',
+            'group_class',
+            array(
+                'preserveDefault'   => true,
+                'disabled'          => $disabled,
+                'label'             => $this->translate('LDAP Group Object Class'),
+                'description'       => $this->translate('The object class used for storing groups on the LDAP server.'),
+                'value'             => $defaults->group_class
+            )
+        );
+        $this->addElement(
+            'text',
+            'group_filter',
+            array(
+                'preserveDefault'   => true,
+                'allowEmpty'        => true,
+                'disabled'          => $disabled,
+                'label'             => $this->translate('LDAP Group Filter'),
+                'description'       => $this->translate(
+                    'An additional filter to use when looking up groups using the specified connection. '
+                    . 'Leave empty to not to use any additional filter rules.'
+                ),
+                'requirement'       => $this->translate(
+                    'The filter needs to be expressed as standard LDAP expression, without'
+                    . ' outer parentheses. (e.g. &(foo=bar)(bar=foo) or foo=bar)'
+                ),
+                'validators'        => array(
+                    array(
+                        'Callback',
+                        false,
+                        array(
+                            'callback'  => function ($v) {
+                                return strpos($v, '(') !== 0;
+                            },
+                            'messages'  => array(
+                                'callbackValue' => $this->translate('The filter must not be wrapped in parantheses.')
+                            )
+                        )
+                    )
+                ),
+                'value'             => $defaults->group_filter
+            )
+        );
+        $this->addElement(
+            'text',
+            'group_name_attribute',
+            array(
+                'preserveDefault'   => true,
+                'disabled'          => $disabled,
+                    'label'         => $this->translate('LDAP Group Name Attribute'),
+                'description'       => $this->translate(
+                    'The attribute name used for storing a group\'s name on the LDAP server.'
+                ),
+                'value'             => $defaults->group_name_attribute
+            )
+        );
+        $this->addElement(
+            'text',
+            'base_dn',
+            array(
+                'preserveDefault'   => true,
+                'disabled'          => $disabled,
+                'label'             => $this->translate('LDAP Group Base DN'),
+                'description'       => $this->translate(
+                    'The path where groups can be found on the LDAP server. Leave ' .
+                    'empty to select all users available using the specified connection.'
+                ),
+                'value'             => $defaults->base_dn
+            )
+        );
+    }
+
+    /**
+     * Create and add all elements to this form required for the user configuration
+     *
+     * @param   ConfigObject    $defaults
+     * @param   null|bool       $disabled
+     */
+    protected function createUserConfigElements(ConfigObject $defaults, $disabled)
+    {
+        $this->addElement(
+            'text',
+            'user_class',
+            array(
+                'preserveDefault'   => true,
+                'disabled'          => $disabled,
+                'label'             => $this->translate('LDAP User Object Class'),
+                'description'       => $this->translate('The object class used for storing users on the LDAP server.'),
+                'value'             => $defaults->user_class
+            )
+        );
+        $this->addElement(
+            'text',
+            'user_filter',
+            array(
+                'preserveDefault'   => true,
+                'allowEmpty'        => true,
+                'disabled'          => $disabled,
+                'label'             => $this->translate('LDAP User Filter'),
+                'description'       => $this->translate(
+                    'An additional filter to use when looking up users using the specified connection. '
+                    . 'Leave empty to not to use any additional filter rules.'
+                ),
+                'requirement'       => $this->translate(
+                    'The filter needs to be expressed as standard LDAP expression, without'
+                    . ' outer parentheses. (e.g. &(foo=bar)(bar=foo) or foo=bar)'
+                ),
+                'validators'        => array(
+                    array(
+                        'Callback',
+                        false,
+                        array(
+                            'callback'  => function ($v) {
+                                return strpos($v, '(') !== 0;
+                            },
+                            'messages'  => array(
+                                'callbackValue' => $this->translate('The filter must not be wrapped in parantheses.')
+                            )
+                        )
+                    )
+                ),
+                'value'             => $defaults->user_filter
+            )
+        );
+        $this->addElement(
+            'text',
+            'user_name_attribute',
+            array(
+                'preserveDefault'   => true,
+                'disabled'          => $disabled,
+                    'label'         => $this->translate('LDAP User Name Attribute'),
+                'description'       => $this->translate(
+                    'The attribute name used for storing a user\'s name on the LDAP server.'
+                ),
+                'value'             => $defaults->user_name_attribute
+            )
+        );
+        $this->addElement(
+            'text',
+            'user_base_dn',
+            array(
+                'preserveDefault'   => true,
+                'disabled'          => $disabled,
+                'label'             => $this->translate('LDAP User Base DN'),
+                'description'       => $this->translate(
+                    'The path where users can be found on the LDAP server. Leave ' .
+                    'empty to select all users available using the specified connection.'
+                ),
+                'value'             => $defaults->user_base_dn
+            )
+        );
+    }
+
+    /**
+     * Return the names of all configured LDAP resources
+     *
+     * @return  array
+     */
+    protected function getLdapResourceNames()
+    {
+        $names = array();
+        foreach (ResourceFactory::getResourceConfigs() as $name => $config) {
+            if (in_array(strtolower($config->type), array('ldap', 'msldap'))) {
+                $names[] = $name;
+            }
+        }
+
+        if (empty($names)) {
+            Notification::error(
+                $this->translate('No LDAP resources available. Please configure an LDAP resource first.')
+            );
+            $this->getResponse()->redirectAndExit('config/createresource');
+        }
+
+        return $names;
+    }
+
+    /**
+     * Return the names of all configured LDAP user backends
+     *
+     * @param   Connection  $resource
+     *
+     * @return  array
+     */
+    protected function getLdapUserBackendNames(Connection $resource)
+    {
+        $names = array();
+        foreach (Config::app('authentication') as $name => $config) {
+            if (in_array(strtolower($config->backend), array('ldap', 'msldap'))) {
+                $backendResource = ResourceFactory::create($config->resource);
+                if (
+                    $backendResource->getHostname() === $resource->getHostname()
+                    && $backendResource->getPort() === $resource->getPort()
+                ) {
+                    $names[] = $name;
+                }
+            }
+        }
+
+        return $names;
+    }
+}

From 5688f0cb857ce216dc831c747978c606ac1a2696 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 14:53:29 +0200
Subject: [PATCH 2050/2920] Allow to configure user group backends of type LDAP

refs #7343
---
 .../Config/UserGroup/UserGroupBackendForm.php | 41 ++++++++++++++-----
 .../UserGroup/LdapUserGroupBackend.php        |  2 +-
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/application/forms/Config/UserGroup/UserGroupBackendForm.php b/application/forms/Config/UserGroup/UserGroupBackendForm.php
index abcf1eaa4..68b3d2816 100644
--- a/application/forms/Config/UserGroup/UserGroupBackendForm.php
+++ b/application/forms/Config/UserGroup/UserGroupBackendForm.php
@@ -38,10 +38,17 @@ class UserGroupBackendForm extends ConfigForm
      */
     public function getBackendForm($type)
     {
-        if ($type === 'db') {
-            return new DbUserGroupBackendForm();
-        } else {
-            throw new InvalidArgumentException(sprintf($this->translate('Invalid backend type "%s" provided'), $type));
+        switch ($type)
+        {
+            case 'db':
+                return new DbUserGroupBackendForm();
+            case 'ldap':
+            case 'msldap':
+                return new LdapUserGroupBackendForm();
+            default:
+                throw new InvalidArgumentException(
+                    sprintf($this->translate('Invalid backend type "%s" provided'), $type)
+                );
         }
     }
 
@@ -165,7 +172,9 @@ class UserGroupBackendForm extends ConfigForm
 
         // TODO(jom): We did not think about how to configure custom group backends yet!
         $backendTypes = array(
-            'db'    => $this->translate('Database')
+            'db'        => $this->translate('Database'),
+            'ldap'      => $this->translate('LDAP'),
+            'msldap'    => $this->translate('ActiveDirectory')
         );
 
         $backendType = isset($formData['type']) ? $formData['type'] : null;
@@ -191,14 +200,11 @@ class UserGroupBackendForm extends ConfigForm
                 'autosubmit'        => true,
                 'label'             => $this->translate('Backend Type'),
                 'description'       => $this->translate('The type of this user group backend'),
-                'multiOptions'      => $backendTypes,
-                'value'             => $backendType
+                'multiOptions'      => $backendTypes
             )
         );
 
-        $backendForm = $this->getBackendForm($backendType);
-        $backendForm->createElements($formData);
-        $this->addElements($backendForm->getElements());
+        $this->addSubForm($this->getBackendForm($backendType)->create($formData), 'backend_form');
     }
 
     /**
@@ -213,4 +219,19 @@ class UserGroupBackendForm extends ConfigForm
             $this->populate($data);
         }
     }
+
+    /**
+     * Retrieve all form element values
+     *
+     * @param   bool    $suppressArrayNotation  Ignored
+     *
+     * @return  array
+     */
+    public function getValues($suppressArrayNotation = false)
+    {
+        $values = parent::getValues();
+        $values = array_merge($values, $values['backend_form']);
+        unset($values['backend_form']);
+        return $values;
+    }
 }
diff --git a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
index 60b94ec27..224013e9f 100644
--- a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
@@ -556,7 +556,7 @@ class LdapUserGroupBackend /*extends LdapRepository*/ implements UserGroupBacken
             $defaults = new ConfigObject();
         }
 
-        if ($config->user_backend) {
+        if ($config->user_backend && $config->user_backend !== 'none') {
             $userBackend = UserBackend::create($config->user_backend);
             if (! $userBackend instanceof LdapUserBackend) {
                 throw new ConfigurationError('User backend "%s" is not of type LDAP', $config->user_backend);

From 2e059a9bb7e12d96f7262f12043db52da0f01213 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 15:00:14 +0200
Subject: [PATCH 2051/2920] monitoring: Use soft states in the host group
 summary again

refs #9009
---
 .../Backend/Ido/Query/HostgroupsummaryQuery.php           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
index 045682cd6..7688d9292 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
@@ -92,8 +92,8 @@ class HostgroupsummaryQuery extends IdoQuery
                 'hostgroup_name',
                 'object_type',
                 'severity'      => 'host_severity',
-                'state'         => 'host_hard_state',
-                'state_change'  => 'host_last_hard_state_change'
+                'state'         => 'host_state',
+                'state_change'  => 'host_last_state_change'
             )
         );
         $this->subQueries[] = $hosts;
@@ -106,8 +106,8 @@ class HostgroupsummaryQuery extends IdoQuery
                 'hostgroup_name',
                 'object_type',
                 'severity'      => new Zend_Db_Expr('NULL'),
-                'state'         => 'service_hard_state',
-                'state_change'  => 'service_last_hard_state_change'
+                'state'         => 'service_state',
+                'state_change'  => 'service_last_state_change'
             )
         );
         $this->subQueries[] = $services;

From 4dc2eb9f4a2a0f1c240b274b379505798df34781 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 15:01:08 +0200
Subject: [PATCH 2052/2920] monitoring: Use soft states in the host status
 summary query again

refs #9009
---
 .../Backend/Ido/Query/HoststatussummaryQuery.php          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatussummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatussummaryQuery.php
index aed8c20ea..da065d184 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatussummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatussummaryQuery.php
@@ -16,12 +16,12 @@ class HoststatussummaryQuery extends IdoQuery
     protected $columnMap = array(
         'hoststatussummary' => array(
             'hosts_down'                    => 'SUM(CASE WHEN state = 1 THEN 1 ELSE 0 END)',
-            'hosts_down_handled'            => 'SUM(CASE WHEN state = 1 AND handled != 0 THEN 1 ELSE 0 END)',
+            'hosts_down_handled'            => 'SUM(CASE WHEN state = 1 AND handled = 1 THEN 1 ELSE 0 END)',
             'hosts_down_unhandled'          => 'SUM(CASE WHEN state = 1 AND handled = 0 THEN 1 ELSE 0 END)',
             'hosts_pending'                 => 'SUM(CASE WHEN state = 99 THEN 1 ELSE 0 END)',
             'hosts_total'                   => 'SUM(1)',
             'hosts_unreachable'             => 'SUM(CASE WHEN state = 2 THEN 1 ELSE 0 END)',
-            'hosts_unreachable_handled'     => 'SUM(CASE WHEN state = 2 AND handled != 0 THEN 1 ELSE 0 END)',
+            'hosts_unreachable_handled'     => 'SUM(CASE WHEN state = 2 AND handled = 1 THEN 1 ELSE 0 END)',
             'hosts_unreachable_unhandled'   => 'SUM(CASE WHEN state = 2 AND handled = 0 THEN 1 ELSE 0 END)',
             'hosts_up'                      => 'SUM(CASE WHEN state = 0 THEN 1 ELSE 0 END)'
         )
@@ -53,8 +53,8 @@ class HoststatussummaryQuery extends IdoQuery
             'Hoststatus',
             array(
                 'handled'       => 'host_handled',
-                'state'         => 'host_hard_state',
-                'state_change'  => 'host_last_hard_state_change'
+                'state'         => 'host_state',
+                'state_change'  => 'host_last_state_change'
             )
         );
         $this->select->from(

From 3425b71b4d6062bb80b0942a6bce76bb8c82f3a7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 15:01:45 +0200
Subject: [PATCH 2053/2920] monitoring: Restrict problem badges

The code should be placed somewhere else in the future.

refs #9009
---
 .../Web/Menu/MonitoringMenuItemRenderer.php   | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php b/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php
index 80ffb3d9c..c32c155af 100644
--- a/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php
+++ b/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php
@@ -3,7 +3,10 @@
 
 namespace Icinga\Module\Monitoring\Web\Menu;
 
-use Icinga\Web\Menu as Menu;
+use Icinga\Authentication\Manager;
+use Icinga\Data\Filter\Filter;
+use Icinga\Data\Filterable;
+use Icinga\Web\Menu;
 use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 use Icinga\Web\Menu\MenuItemRenderer;
 
@@ -13,16 +16,36 @@ class MonitoringMenuItemRenderer extends MenuItemRenderer
 
     protected $columns = array();
 
+    /**
+     * Apply a restriction on the given data view
+     *
+     * @param   string      $restriction    The name of restriction
+     * @param   Filterable  $filterable     The filterable to restrict
+     *
+     * @return  Filterable  The filterable
+     */
+    protected static function applyRestriction($restriction, Filterable $filterable)
+    {
+        $restrictions = Filter::matchAny();
+        foreach (Manager::getInstance()->getRestrictions($restriction) as $filter) {
+            $restrictions->addFilter(Filter::fromQueryString($filter));
+        }
+        $filterable->applyFilter($restrictions);
+        return $filterable;
+    }
+
     protected static function summary($column = null)
     {
         if (self::$summary === null) {
-            self::$summary = MonitoringBackend::instance()->select()->from(
+            $summary = MonitoringBackend::instance()->select()->from(
                 'statusSummary',
                 array(
                     'hosts_down_unhandled',
                     'services_critical_unhandled'
                 )
-            )->getQuery()->fetchRow();
+            );
+            static::applyRestriction('monitoring/filter/objects', $summary);
+            self::$summary = $summary->fetchRow();
         }
 
         if ($column === null) {

From 1d775842f9481c183190603e5e03f4624e6c9666 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 15:06:34 +0200
Subject: [PATCH 2054/2920] monitoring: Restrict the service grid

refs #9009
---
 modules/monitoring/application/controllers/ListController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 9e5ac6d33..4337b9f61 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -602,6 +602,7 @@ class Monitoring_ListController extends Controller
             'service_handled'
         ));
         $this->filterQuery($query);
+        $this->applyRestriction('monitoring/filter/objects', $query);
         $this->setupSortControl(array(
             'host_name'           => $this->translate('Hostname'),
             'service_description' => $this->translate('Service description')

From 66d76e7ad92ce38971763bc650c31de91f0e9a81 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 15:30:49 +0200
Subject: [PATCH 2055/2920] monitoring: Add host_notes to the host status query

refs #9009
---
 .../library/Monitoring/Backend/Ido/Query/HoststatusQuery.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index 7b0219f89..72f336075 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -31,6 +31,7 @@ class HoststatusQuery extends IdoQuery
             'host_icon_image_alt'   => 'h.icon_image_alt',
             'host_ipv4'             => 'INET_ATON(h.address)',
             'host_name'             => 'ho.name1',
+            'host_notes'            => 'h.notes',
             'host_notes_url'        => 'h.notes_url',
             'object_type'           => '(\'host\')'
         ),

From 6dedb48444701d65251a1b4427374edf8ef0a795 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 5 Jun 2015 15:37:31 +0200
Subject: [PATCH 2056/2920] Indicate that nothing was found in the docs when
 searching

refs #8847
---
 modules/doc/application/views/scripts/search/index.phtml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/doc/application/views/scripts/search/index.phtml b/modules/doc/application/views/scripts/search/index.phtml
index 3311c47a1..3d220392e 100644
--- a/modules/doc/application/views/scripts/search/index.phtml
+++ b/modules/doc/application/views/scripts/search/index.phtml
@@ -1,8 +1,8 @@
 <div class="content">
     <?php foreach (/** @var \Icinga\Module\Doc\Renderer\DocSearchRenderer[] $searches */ $searches as $title => $search): ?>
-        <?php if (! $search->isEmpty()): ?>
-            <h1><?= $this->escape($title) ?></h1>
-            <?= $search ?>
-        <?php endif ?>
+        <h1><?= $this->escape($title) ?></h1>
+        <?= $search->isEmpty()
+            ? $this->translate('No documentation found matching the filter')
+            : $search ?>
     <?php endforeach ?>
 </div>

From e9e97cb1b377ff94fae2bb4281354c88bcb4e7d9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 15:41:24 +0200
Subject: [PATCH 2057/2920] UserGroupBackendForm: Unset the `name' property,
 always

refs #7343
---
 .../forms/Config/UserGroup/UserGroupBackendForm.php      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/application/forms/Config/UserGroup/UserGroupBackendForm.php b/application/forms/Config/UserGroup/UserGroupBackendForm.php
index 68b3d2816..e8439ccaf 100644
--- a/application/forms/Config/UserGroup/UserGroupBackendForm.php
+++ b/application/forms/Config/UserGroup/UserGroupBackendForm.php
@@ -114,9 +114,12 @@ class UserGroupBackendForm extends ConfigForm
         }
 
         $backendConfig = $this->config->getSection($name);
-        if (isset($data['name']) && $data['name'] !== $name) {
-            $this->config->removeSection($name);
-            $name = $data['name'];
+        if (isset($data['name'])) {
+            if ($data['name'] !== $name) {
+                $this->config->removeSection($name);
+                $name = $data['name'];
+            }
+
             unset($data['name']);
         }
 

From e6837cf9e9612c3d837090eabb6be9505f851392 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 15:42:35 +0200
Subject: [PATCH 2058/2920] UsergroupbackendController: Do not persist empty
 configuration values

refs #7343
---
 application/controllers/UsergroupbackendController.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/application/controllers/UsergroupbackendController.php b/application/controllers/UsergroupbackendController.php
index cdb6826be..1a3c2f46e 100644
--- a/application/controllers/UsergroupbackendController.php
+++ b/application/controllers/UsergroupbackendController.php
@@ -52,7 +52,7 @@ class UsergroupbackendController extends Controller
         $form->setIniConfig(Config::app('groups'));
         $form->setOnSuccess(function (UserGroupBackendForm $form) {
             try {
-                $form->add($form->getValues());
+                $form->add(array_filter($form->getValues()));
             } catch (Exception $e) {
                 $form->error($e->getMessage());
                 return false;
@@ -85,7 +85,12 @@ class UsergroupbackendController extends Controller
         $form->setIniConfig(Config::app('groups'));
         $form->setOnSuccess(function (UserGroupBackendForm $form) use ($backendName) {
             try {
-                $form->edit($backendName, $form->getValues());
+                $form->edit($backendName, array_map(
+                    function ($v) {
+                        return $v !== '' ? $v : null;
+                    },
+                    $form->getValues()
+                ));
             } catch (Exception $e) {
                 $form->error($e->getMessage());
                 return false;

From 975edbe548ecacabee22fb871e21dd2b8312dc19 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 15:45:33 +0200
Subject: [PATCH 2059/2920] UserGroupBackendForm: Do not persist null values,
 really

Revert this once #9376 has been fixed.

refs #9376
---
 .../forms/Config/UserGroup/UserGroupBackendForm.php      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/application/forms/Config/UserGroup/UserGroupBackendForm.php b/application/forms/Config/UserGroup/UserGroupBackendForm.php
index e8439ccaf..cfd615e47 100644
--- a/application/forms/Config/UserGroup/UserGroupBackendForm.php
+++ b/application/forms/Config/UserGroup/UserGroupBackendForm.php
@@ -123,7 +123,14 @@ class UserGroupBackendForm extends ConfigForm
             unset($data['name']);
         }
 
-        $this->config->setSection($name, $backendConfig->merge($data));
+        $backendConfig->merge($data);
+        foreach ($backendConfig->toArray() as $k => $v) {
+            if ($v === null) {
+                unset($backendConfig->$k);
+            }
+        }
+
+        $this->config->setSection($name, $backendConfig);
         return $this;
     }
 

From 6597e7aba819ec1ca13c1812b0ad979eaa8a2678 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 15:48:05 +0200
Subject: [PATCH 2060/2920] monitoring: Add missing restrictable filter columns
 to the comment data view

refs #9009
---
 modules/monitoring/library/Monitoring/DataView/Comment.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index 9d7aa612e..e1beaabf8 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -50,8 +50,10 @@ class Comment extends DataView
     {
         return array(
             'comment_author ',
-            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
-            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+            'host', 'host_alias',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
         );
     }
 

From bb711f447d6e11308cabb65fa9658bd7fe53bc12 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 15:48:37 +0200
Subject: [PATCH 2061/2920] monitoring: Fix restrictable filter columns of the
 downtime view

refs #9009
---
 modules/monitoring/library/Monitoring/DataView/Downtime.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index c654716ba..29114180c 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -55,8 +55,10 @@ class Downtime extends DataView
     {
         return array(
             'downtime_author',
-            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
-            'service', 'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+            'host', 'host_alias',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
         );
     }
 

From d4b0841d4c5086e2c32891db3e12c6da25fdf91e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 15:48:58 +0200
Subject: [PATCH 2062/2920] monitoring: Add missing filter column to the host
 group summary view

refs #9009
---
 .../monitoring/library/Monitoring/DataView/Hostgroupsummary.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
index b576c685b..941f6dfbe 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
@@ -50,7 +50,7 @@ class Hostgroupsummary extends DataView
             'hosts_severity',
             'host', 'host_alias', 'host_display_name', 'host_name',
             'hostgroup',
-            'service', 'service_description',
+            'service', 'service_description', 'service_display_name',
             'servicegroup', 'servicegroup_alias', 'servicegroup_name'
         );
     }

From 382007a8bd5bc32fb82edab7261c0dee6d60556a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 15:49:26 +0200
Subject: [PATCH 2063/2920] monitoring: Add missing filter columns to the
 service status data view

refs #9009
---
 .../monitoring/library/Monitoring/DataView/ServiceStatus.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index 20f61d515..2674bbfb6 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -166,10 +166,12 @@ class ServiceStatus extends DataView
         return array(
             'host',
             'hostgroup',
+            'hostgroup_alias',
             'hostgroup_name',
             'service',
             'service_host',
             'servicegroup',
+            'servicegroup_alias',
             'servicegroup_name'
         );
     }

From d4a884b233432e7abd0952eba99b1df084fcdda2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 15:49:48 +0200
Subject: [PATCH 2064/2920] monitoring: Fix filter columns of the service group
 summary

refs #9009
---
 .../library/Monitoring/DataView/Servicegroupsummary.php     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
index 290c8f697..795162426 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
@@ -43,8 +43,10 @@ class Servicegroupsummary extends DataView
     {
         return array(
             'services_severity',
-            'host', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',
-            'service', 'servicegroup'
+            'host', 'host_alias', 'host_display_name', 'host_name',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'service_description', 'service_display_name',
+            'servicegroup'
         );
     }
 

From 6c07a4842b7d327235de605f2a2f3dd6b9fedb04 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 5 Jun 2015 15:50:11 +0200
Subject: [PATCH 2065/2920] monitoring: Fix controller function
 fetchHostStats()

refs #9009
---
 .../monitoring/application/controllers/ShowController.php    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 538a75132..cf71c7d32 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -80,12 +80,9 @@ class Monitoring_ShowController extends Controller
 
     protected function fetchHostStats()
     {
-        $this->view->stats = $this->backend->select()->from('statusSummary', array(
+        $this->view->stats = $this->backend->select()->from('servicestatussummary', array(
             'services_total',
             'services_ok',
-            'services_problem',
-            'services_problem_handled',
-            'services_problem_unhandled',
             'services_critical',
             'services_critical_unhandled',
             'services_critical_handled',

From 05b7c3aa6a57b355687ed94784e2a6d5e1e14d8a Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 5 Jun 2015 16:01:37 +0200
Subject: [PATCH 2066/2920] Replace <h1> w/ <h2>

refs #8847
---
 modules/doc/application/views/scripts/search/index.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/doc/application/views/scripts/search/index.phtml b/modules/doc/application/views/scripts/search/index.phtml
index 3d220392e..c613f04df 100644
--- a/modules/doc/application/views/scripts/search/index.phtml
+++ b/modules/doc/application/views/scripts/search/index.phtml
@@ -1,6 +1,6 @@
 <div class="content">
     <?php foreach (/** @var \Icinga\Module\Doc\Renderer\DocSearchRenderer[] $searches */ $searches as $title => $search): ?>
-        <h1><?= $this->escape($title) ?></h1>
+        <h2><?= $this->escape($title) ?></h2>
         <?= $search->isEmpty()
             ? $this->translate('No documentation found matching the filter')
             : $search ?>

From 24cb6bfc6e8ec3f9712e07524224670d8faebd64 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 16:01:52 +0200
Subject: [PATCH 2067/2920] Form: Preserve defaults for subforms as well

---
 library/Icinga/Web/Form.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 48f7acdb7..08cb02388 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -855,8 +855,19 @@ class Form extends Zend_Form
     public function populate(array $defaults)
     {
         $this->create($defaults);
+        $this->preserveDefaults($this, $defaults);
+        return parent::populate($defaults);
+    }
 
-        foreach ($this->getElements() as $name => $_) {
+    /**
+     * Recurse the given form and unset all unchanged default values
+     *
+     * @param   Zend_Form   $form
+     * @param   array       $defaults
+     */
+    protected function preserveDefaults(Zend_Form $form, array & $defaults)
+    {
+        foreach ($form->getElements() as $name => $_) {
             if (
                 array_key_exists($name, $defaults)
                 && array_key_exists($name . static::DEFAULT_SUFFIX, $defaults)
@@ -866,7 +877,9 @@ class Form extends Zend_Form
             }
         }
 
-        return parent::populate($defaults);
+        foreach ($form->getSubForms() as $_ => $subForm) {
+            $this->preserveDefaults($subForm, $defaults);
+        }
     }
 
     /**

From 797e9de6297007b8af806c41d47be2bf443db43f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 16:07:27 +0200
Subject: [PATCH 2068/2920] LdapUserGroupBackendForm: Do not disable group
 configuration..

..when no user backend has been linked and it's not a ActiveDirectory.

refs #7343
---
 .../Config/UserGroup/LdapUserGroupBackendForm.php      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
index 71af892f2..3e97f4dd4 100644
--- a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
+++ b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
@@ -70,10 +70,10 @@ class LdapUserGroupBackendForm extends Form
         $groupBackend = new LdapUserGroupBackend($resource);
         if ($formData['type'] === 'ldap') {
             $defaults = $groupBackend->getOpenLdapDefaults();
-            $disabled = null; // MUST BE null, do NOT change this to false!
+            $groupConfigDisabled = $userConfigDisabled = null; // MUST BE null, do NOT change this to false!
         } else { // $formData['type'] === 'msldap'
             $defaults = $groupBackend->getActiveDirectoryDefaults();
-            $disabled = true;
+            $groupConfigDisabled = $userConfigDisabled = true;
         }
 
         if (isset($formData['user_backend']) && $formData['user_backend'] !== 'none') {
@@ -84,11 +84,11 @@ class LdapUserGroupBackendForm extends Form
                 'user_name_attribute'   => $userBackend->getUserNameAttribute(),
                 'user_filter'           => $userBackend->getFilter()
             ));
-            $disabled = true;
+            $userConfigDisabled = true;
         }
 
-        $this->createGroupConfigElements($defaults, $disabled);
-        $this->createUserConfigElements($defaults, $disabled);
+        $this->createGroupConfigElements($defaults, $groupConfigDisabled);
+        $this->createUserConfigElements($defaults, $userConfigDisabled);
     }
 
     /**

From e910a5a254ba834d7db01925d0e259d21b57ced3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 16:16:35 +0200
Subject: [PATCH 2069/2920] LdapUserGroupBackendForm: Do not disable `base_dn'
 and `user_base_dn'

refs #7343
---
 .../Config/UserGroup/LdapUserGroupBackendForm.php     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
index 3e97f4dd4..5b6d42b89 100644
--- a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
+++ b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
@@ -76,6 +76,7 @@ class LdapUserGroupBackendForm extends Form
             $groupConfigDisabled = $userConfigDisabled = true;
         }
 
+        $dnDisabled = null; // MUST BE null
         if (isset($formData['user_backend']) && $formData['user_backend'] !== 'none') {
             $userBackend = UserBackend::create($formData['user_backend']);
             $defaults->merge(array(
@@ -84,11 +85,11 @@ class LdapUserGroupBackendForm extends Form
                 'user_name_attribute'   => $userBackend->getUserNameAttribute(),
                 'user_filter'           => $userBackend->getFilter()
             ));
-            $userConfigDisabled = true;
+            $userConfigDisabled = $dnDisabled = true;
         }
 
         $this->createGroupConfigElements($defaults, $groupConfigDisabled);
-        $this->createUserConfigElements($defaults, $userConfigDisabled);
+        $this->createUserConfigElements($defaults, $userConfigDisabled, $dnDisabled);
     }
 
     /**
@@ -161,7 +162,6 @@ class LdapUserGroupBackendForm extends Form
             'base_dn',
             array(
                 'preserveDefault'   => true,
-                'disabled'          => $disabled,
                 'label'             => $this->translate('LDAP Group Base DN'),
                 'description'       => $this->translate(
                     'The path where groups can be found on the LDAP server. Leave ' .
@@ -177,8 +177,9 @@ class LdapUserGroupBackendForm extends Form
      *
      * @param   ConfigObject    $defaults
      * @param   null|bool       $disabled
+     * @param   null|bool       $dnDisabled
      */
-    protected function createUserConfigElements(ConfigObject $defaults, $disabled)
+    protected function createUserConfigElements(ConfigObject $defaults, $disabled, $dnDisabled)
     {
         $this->addElement(
             'text',
@@ -242,7 +243,7 @@ class LdapUserGroupBackendForm extends Form
             'user_base_dn',
             array(
                 'preserveDefault'   => true,
-                'disabled'          => $disabled,
+                'disabled'          => $dnDisabled,
                 'label'             => $this->translate('LDAP User Base DN'),
                 'description'       => $this->translate(
                     'The path where users can be found on the LDAP server. Leave ' .

From 840069b436437920e66db2b93134921d76eb9769 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 16:34:28 +0200
Subject: [PATCH 2070/2920] LdapUserGroupBackendForm: Do not persist default
 values

...

refs #7343
---
 .../forms/Config/UserGroup/LdapUserGroupBackendForm.php    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
index 5b6d42b89..1ce6af713 100644
--- a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
+++ b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
@@ -105,6 +105,7 @@ class LdapUserGroupBackendForm extends Form
             'group_class',
             array(
                 'preserveDefault'   => true,
+                'ignore'            => $disabled,
                 'disabled'          => $disabled,
                 'label'             => $this->translate('LDAP Group Object Class'),
                 'description'       => $this->translate('The object class used for storing groups on the LDAP server.'),
@@ -117,6 +118,7 @@ class LdapUserGroupBackendForm extends Form
             array(
                 'preserveDefault'   => true,
                 'allowEmpty'        => true,
+                'ignore'            => $disabled,
                 'disabled'          => $disabled,
                 'label'             => $this->translate('LDAP Group Filter'),
                 'description'       => $this->translate(
@@ -149,6 +151,7 @@ class LdapUserGroupBackendForm extends Form
             'group_name_attribute',
             array(
                 'preserveDefault'   => true,
+                'ignore'            => $disabled,
                 'disabled'          => $disabled,
                     'label'         => $this->translate('LDAP Group Name Attribute'),
                 'description'       => $this->translate(
@@ -186,6 +189,7 @@ class LdapUserGroupBackendForm extends Form
             'user_class',
             array(
                 'preserveDefault'   => true,
+                'ignore'            => $disabled,
                 'disabled'          => $disabled,
                 'label'             => $this->translate('LDAP User Object Class'),
                 'description'       => $this->translate('The object class used for storing users on the LDAP server.'),
@@ -198,6 +202,7 @@ class LdapUserGroupBackendForm extends Form
             array(
                 'preserveDefault'   => true,
                 'allowEmpty'        => true,
+                'ignore'            => $disabled,
                 'disabled'          => $disabled,
                 'label'             => $this->translate('LDAP User Filter'),
                 'description'       => $this->translate(
@@ -230,6 +235,7 @@ class LdapUserGroupBackendForm extends Form
             'user_name_attribute',
             array(
                 'preserveDefault'   => true,
+                'ignore'            => $disabled,
                 'disabled'          => $disabled,
                     'label'         => $this->translate('LDAP User Name Attribute'),
                 'description'       => $this->translate(
@@ -243,6 +249,7 @@ class LdapUserGroupBackendForm extends Form
             'user_base_dn',
             array(
                 'preserveDefault'   => true,
+                'ignore'            => $dnDisabled,
                 'disabled'          => $dnDisabled,
                 'label'             => $this->translate('LDAP User Base DN'),
                 'description'       => $this->translate(

From c800f1e6aa6ce4f7daaa5c244c49ac52152b4153 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 16:40:17 +0200
Subject: [PATCH 2071/2920] UserGroupBackendForm: Do not translate LDAP and
 ActiveDirectory

refs #7343
---
 application/forms/Config/UserGroup/UserGroupBackendForm.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/forms/Config/UserGroup/UserGroupBackendForm.php b/application/forms/Config/UserGroup/UserGroupBackendForm.php
index cfd615e47..5bd0d9681 100644
--- a/application/forms/Config/UserGroup/UserGroupBackendForm.php
+++ b/application/forms/Config/UserGroup/UserGroupBackendForm.php
@@ -183,8 +183,8 @@ class UserGroupBackendForm extends ConfigForm
         // TODO(jom): We did not think about how to configure custom group backends yet!
         $backendTypes = array(
             'db'        => $this->translate('Database'),
-            'ldap'      => $this->translate('LDAP'),
-            'msldap'    => $this->translate('ActiveDirectory')
+            'ldap'      => 'LDAP',
+            'msldap'    => 'ActiveDirectory'
         );
 
         $backendType = isset($formData['type']) ? $formData['type'] : null;

From 76e748c483fb79efc134ef6b492b60131fec56c4 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 5 Jun 2015 17:12:32 +0200
Subject: [PATCH 2072/2920] Don't throw any exception

refs #8705
---
 library/Icinga/Application/Platform.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Application/Platform.php b/library/Icinga/Application/Platform.php
index a6e0d9604..cc72857f9 100644
--- a/library/Icinga/Application/Platform.php
+++ b/library/Icinga/Application/Platform.php
@@ -3,8 +3,6 @@
 
 namespace Icinga\Application;
 
-use Icinga\Exception\IcingaException;
-
 /**
  * Platform tests for icingaweb
  */
@@ -95,7 +93,7 @@ class Platform
 
             foreach ($osRelease as $osInfo) {
                 if (false === ($res = @preg_match('/(?<!.)[ \t]*#/ms', $osInfo))) {
-                    throw new IcingaException('Failed at preg_match()');
+                    return false;
                 }
                 if ($res === 1) {
                     continue;
@@ -107,7 +105,7 @@ class Platform
                     $osInfo,
                     $matches
                 ))) {
-                    throw new IcingaException('Failed at preg_match()');
+                    return false;
                 }
                 if (! ($res === 0 || $matches[2] === '' || $matches[2] === 'linux')) {
                     return $matches[2];
@@ -159,7 +157,7 @@ class Platform
 
         if ($reliable < 1) {
             if (false === ($procVersion = @file_get_contents('/proc/version'))) {
-                throw new IcingaException('Failed at file_get_contents(/proc/version)');
+                return false;
             }
             $procVersion = strtolower($procVersion);
             foreach (array(

From e66f8731afe445cf38a67d06ce858a2c56ebdb2f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 17:20:31 +0200
Subject: [PATCH 2073/2920] UserBackendConfigForm: Allow to configure user
 backends of type msldap

fixes #9355
---
 .../Config/UserBackend/LdapBackendForm.php    | 33 ++++++++++++-------
 .../forms/Config/UserBackendConfigForm.php    | 29 ++++++++++------
 .../UserBackend/LdapBackendFormTest.php       | 23 ++++++-------
 3 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/application/forms/Config/UserBackend/LdapBackendForm.php b/application/forms/Config/UserBackend/LdapBackendForm.php
index c520ec68f..ac2091398 100644
--- a/application/forms/Config/UserBackend/LdapBackendForm.php
+++ b/application/forms/Config/UserBackend/LdapBackendForm.php
@@ -8,7 +8,7 @@ use Icinga\Web\Form;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
 use Icinga\Exception\AuthenticationException;
-use Icinga\Authentication\User\LdapUserBackend;
+use Icinga\Authentication\User\UserBackend;
 
 /**
  * Form class for adding/modifying LDAP user backends
@@ -48,6 +48,8 @@ class LdapBackendForm extends Form
      */
     public function createElements(array $formData)
     {
+        $isAd = isset($formData['type']) ? $formData['type'] === 'msldap' : false;
+
         $this->addElement(
             'text',
             'name',
@@ -77,10 +79,13 @@ class LdapBackendForm extends Form
             'text',
             'user_class',
             array(
-                'required'      => true,
-                'label'         => $this->translate('LDAP User Object Class'),
-                'description'   => $this->translate('The object class used for storing users on the LDAP server.'),
-                'value'         => 'inetOrgPerson'
+                'preserveDefault'   => true,
+                'required'          => ! $isAd,
+                'ignore'            => $isAd,
+                'disabled'          => $isAd ?: null,
+                'label'             => $this->translate('LDAP User Object Class'),
+                'description'       => $this->translate('The object class used for storing users on the LDAP server.'),
+                'value'             => $isAd ? 'user' : 'inetOrgPerson'
             )
         );
         $this->addElement(
@@ -117,12 +122,15 @@ class LdapBackendForm extends Form
             'text',
             'user_name_attribute',
             array(
-                'required'      => true,
-                'label'         => $this->translate('LDAP User Name Attribute'),
-                'description'   => $this->translate(
+                'preserveDefault'   => true,
+                'required'          => ! $isAd,
+                'ignore'            => $isAd,
+                'disabled'          => $isAd ?: null,
+                'label'             => $this->translate('LDAP User Name Attribute'),
+                'description'       => $this->translate(
                     'The attribute name used for storing the user name on the LDAP server.'
                 ),
-                'value'         => 'uid'
+                'value'             => $isAd ? 'sAMAccountName' : 'uid'
             )
         );
         $this->addElement(
@@ -130,7 +138,7 @@ class LdapBackendForm extends Form
             'backend',
             array(
                 'disabled'  => true,
-                'value'     => 'ldap'
+                'value'     => $isAd ? 'msldap' : 'ldap'
             )
         );
         $this->addElement(
@@ -170,8 +178,7 @@ class LdapBackendForm extends Form
     public static function isValidUserBackend(Form $form)
     {
         try {
-            $ldapUserBackend = new LdapUserBackend(ResourceFactory::createResource($form->getResourceConfig()));
-            $ldapUserBackend->setConfig(new ConfigObject($form->getValues()));
+            $ldapUserBackend = UserBackend::create(null, new ConfigObject($form->getValues()));
             $ldapUserBackend->assertAuthenticationPossible();
         } catch (AuthenticationException $e) {
             if (($previous = $e->getPrevious()) !== null) {
@@ -193,6 +200,8 @@ class LdapBackendForm extends Form
      * Return the configuration for the chosen resource
      *
      * @return  ConfigObject
+     *
+     * @todo    Check whether it's possible to drop this (Or even all occurences!)
      */
     public function getResourceConfig()
     {
diff --git a/application/forms/Config/UserBackendConfigForm.php b/application/forms/Config/UserBackendConfigForm.php
index 0a30dd590..62a68e70b 100644
--- a/application/forms/Config/UserBackendConfigForm.php
+++ b/application/forms/Config/UserBackendConfigForm.php
@@ -60,16 +60,24 @@ class UserBackendConfigForm extends ConfigForm
      */
     public function getBackendForm($type)
     {
-        if ($type === 'db') {
-            $form = new DbBackendForm();
-            $form->setResources(isset($this->resources['db']) ? $this->resources['db'] : array());
-        } elseif ($type === 'ldap') {
-            $form = new LdapBackendForm();
-            $form->setResources(isset($this->resources['ldap']) ? $this->resources['ldap'] : array());
-        } elseif ($type === 'external') {
-            $form = new ExternalBackendForm();
-        } else {
-            throw new InvalidArgumentException(sprintf($this->translate('Invalid backend type "%s" provided'), $type));
+        switch ($type)
+        {
+            case 'db':
+                $form = new DbBackendForm();
+                $form->setResources(isset($this->resources['db']) ? $this->resources['db'] : array());
+                break;
+            case 'ldap':
+            case 'msldap':
+                $form = new LdapBackendForm();
+                $form->setResources(isset($this->resources['ldap']) ? $this->resources['ldap'] : array());
+                break;
+            case 'external':
+                $form = new ExternalBackendForm();
+                break;
+            default:
+                throw new InvalidArgumentException(
+                    sprintf($this->translate('Invalid backend type "%s" provided'), $type)
+                );
         }
 
         return $form;
@@ -296,6 +304,7 @@ class UserBackendConfigForm extends ConfigForm
         }
         if (isset($this->resources['ldap']) && ($backendType === 'ldap' || Platform::extensionLoaded('ldap'))) {
             $backendTypes['ldap'] = 'LDAP';
+            $backendTypes['msldap'] = 'ActiveDirectory';
         }
 
         $externalBackends = array_filter(
diff --git a/test/php/application/forms/Config/UserBackend/LdapBackendFormTest.php b/test/php/application/forms/Config/UserBackend/LdapBackendFormTest.php
index f7373a7ae..6fe63adf4 100644
--- a/test/php/application/forms/Config/UserBackend/LdapBackendFormTest.php
+++ b/test/php/application/forms/Config/UserBackend/LdapBackendFormTest.php
@@ -27,10 +27,9 @@ class LdapBackendFormTest extends BaseTestCase
      */
     public function testValidBackendIsValid()
     {
-        $this->setUpResourceFactoryMock();
-        Mockery::mock('overload:Icinga\Authentication\User\LdapUserBackend')
-            ->shouldReceive('assertAuthenticationPossible')->andReturnNull()
-            ->shouldReceive('setConfig')->andReturnNull();
+        $ldapUserBackendMock = Mockery::mock('overload:Icinga\Authentication\User\LdapUserBackend');
+        $ldapUserBackendMock->shouldReceive('assertAuthenticationPossible')->andReturnNull();
+        $this->setUpUserBackendMock($ldapUserBackendMock);
 
         // Passing array(null) is required to make Mockery call the constructor...
         $form = Mockery::mock('Icinga\Forms\Config\UserBackend\LdapBackendForm[getView]', array(null));
@@ -53,9 +52,9 @@ class LdapBackendFormTest extends BaseTestCase
      */
     public function testInvalidBackendIsNotValid()
     {
-        $this->setUpResourceFactoryMock();
-        Mockery::mock('overload:Icinga\Authentication\User\LdapUserBackend')
-            ->shouldReceive('assertAuthenticationPossible')->andThrow(new AuthenticationException);
+        $ldapUserBackendMock = Mockery::mock('overload:Icinga\Authentication\User\LdapUserBackend');
+        $ldapUserBackendMock->shouldReceive('assertAuthenticationPossible')->andThrow(new AuthenticationException);
+        $this->setUpUserBackendMock($ldapUserBackendMock);
 
         // Passing array(null) is required to make Mockery call the constructor...
         $form = Mockery::mock('Icinga\Forms\Config\UserBackend\LdapBackendForm[getView]', array(null));
@@ -72,12 +71,10 @@ class LdapBackendFormTest extends BaseTestCase
         );
     }
 
-    protected function setUpResourceFactoryMock()
+    protected function setUpUserBackendMock($ldapUserBackendMock)
     {
-        Mockery::mock('alias:Icinga\Data\ResourceFactory')
-            ->shouldReceive('createResource')
-            ->andReturn(Mockery::mock('Icinga\Protocol\Ldap\Connection'))
-            ->shouldReceive('getResourceConfig')
-            ->andReturn(new ConfigObject());
+        Mockery::mock('alias:Icinga\Authentication\User\UserBackend')
+            ->shouldReceive('create')
+            ->andReturn($ldapUserBackendMock);
     }
 }

From 2dd04bb6c96cabce1a8a9ed7e72f627ef6b582bd Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 5 Jun 2015 17:24:03 +0200
Subject: [PATCH 2074/2920] LdapUserGroupBackendForm: Do not disable
 `user_filter' and `group_filter'

refs #7343
---
 .../forms/Config/UserGroup/LdapUserGroupBackendForm.php     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
index 1ce6af713..c3c8baacf 100644
--- a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
+++ b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
@@ -118,8 +118,6 @@ class LdapUserGroupBackendForm extends Form
             array(
                 'preserveDefault'   => true,
                 'allowEmpty'        => true,
-                'ignore'            => $disabled,
-                'disabled'          => $disabled,
                 'label'             => $this->translate('LDAP Group Filter'),
                 'description'       => $this->translate(
                     'An additional filter to use when looking up groups using the specified connection. '
@@ -202,8 +200,8 @@ class LdapUserGroupBackendForm extends Form
             array(
                 'preserveDefault'   => true,
                 'allowEmpty'        => true,
-                'ignore'            => $disabled,
-                'disabled'          => $disabled,
+                'ignore'            => $dnDisabled,
+                'disabled'          => $dnDisabled,
                 'label'             => $this->translate('LDAP User Filter'),
                 'description'       => $this->translate(
                     'An additional filter to use when looking up users using the specified connection. '

From e15b144155dc9c989eefa57749409e2883f58b49 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 8 Jun 2015 11:16:59 +0200
Subject: [PATCH 2075/2920] Revert "Rename .fileNotReadable to .message-error"

This reverts commit 6b14195809ce51bdf6f1c803af165438e948bd72.
---
 public/css/icinga/layout-structure.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 5b5eee5ef..3a8713a38 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -331,7 +331,8 @@ html {
   position: absolute;
 }
 
-.message-error {
+/* TODO: replace this with .error */
+.fileNotReadable {
   padding: 0.5em;
   background-color: @colorCritical;
   font-weight: bold;

From 0b1bb54c26f5115367cf7e5655ec63bd6d74b1d5 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 5 Jun 2015 12:38:55 +0200
Subject: [PATCH 2076/2920] Rename .fileNotReadable to .message-error

refs #9247
---
 application/views/scripts/about/index.phtml | 2 +-
 public/css/icinga/layout-structure.less     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/application/views/scripts/about/index.phtml b/application/views/scripts/about/index.phtml
index 6a01e1bf9..e270a8eb9 100644
--- a/application/views/scripts/about/index.phtml
+++ b/application/views/scripts/about/index.phtml
@@ -16,7 +16,7 @@
 
     echo (
         0 === count($versionInfo)
-            ? '<p class="fileNotReadable">' . $this->translate(
+            ? '<p class="message-error">' . $this->translate(
                 'Can\'t determine Icinga Web 2\'s version'
             )
             : '<p>' . nl2br(implode("\n", $versionInfo), false)
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 3a8713a38..5b5eee5ef 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -331,8 +331,7 @@ html {
   position: absolute;
 }
 
-/* TODO: replace this with .error */
-.fileNotReadable {
+.message-error {
   padding: 0.5em;
   background-color: @colorCritical;
   font-weight: bold;

From 54b960addca31bba33684b552a575047534a63da Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 8 Jun 2015 12:39:31 +0200
Subject: [PATCH 2077/2920] RoleController: Fix link to add a new role

---
 application/views/scripts/role/list.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/scripts/role/list.phtml b/application/views/scripts/role/list.phtml
index 766ba26f3..568bbdf98 100644
--- a/application/views/scripts/role/list.phtml
+++ b/application/views/scripts/role/list.phtml
@@ -67,7 +67,7 @@
                 </tbody>
             </table>
         <?php endif ?>
-        <a data-base-target="_next" href="<?= $this->href('role/new') ?>">
+        <a data-base-target="_next" href="<?= $this->href('role/add') ?>">
             <?= $this->translate('Create a New Role') ?>
         </a>
     </div>

From ddba1d86fa0d82eae257067bfac78ccf371dd80b Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 8 Jun 2015 12:22:27 +0200
Subject: [PATCH 2078/2920] Fix spacing in ini files

refs #8706
---
 library/Icinga/File/Ini/IniEditor.php | 25 ++++++++++++-------------
 library/Icinga/File/Ini/IniWriter.php |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/library/Icinga/File/Ini/IniEditor.php b/library/Icinga/File/Ini/IniEditor.php
index 1f8202d9d..035e10037 100644
--- a/library/Icinga/File/Ini/IniEditor.php
+++ b/library/Icinga/File/Ini/IniEditor.php
@@ -313,14 +313,19 @@ class IniEditor
      */
     public function getText()
     {
-        $this->cleanUpWhitespaces();
-        return rtrim(implode(PHP_EOL, $this->text)) . PHP_EOL;
+        $this->normalizeSectionSpacing();
+
+        // trim leading and trailing whitespaces from generated file
+        $txt = trim(implode(PHP_EOL, $this->text)) . PHP_EOL;
+
+        // replace linebreaks, unless they preceed a comment or a section
+        return preg_replace("/\n[\n]*([^;\[])/", "\n$1", $txt);
     }
 
     /**
-     * Remove all unneeded line breaks between sections
+     * normalize section spacing according to the current settings
      */
-    private function cleanUpWhitespaces()
+    private function normalizeSectionSpacing()
     {
         $i = count($this->text) - 1;
         for (; $i > 0; $i--) {
@@ -328,24 +333,18 @@ class IniEditor
             if ($this->isSectionDeclaration($line) && $i > 0) {
                 $i--;
                 $line = $this->text[$i];
-                /*
-                 * Ignore comments that are glued to the section declaration
-                 */
+                // ignore comments that are glued to the section declaration
                 while ($i > 0 && $this->isComment($line)) {
                     $i--;
                     $line = $this->text[$i];
                 }
-                /*
-                 * Remove whitespaces between the sections
-                 */
+                // remove whitespaces between the sections
                 while ($i > 0 && preg_match('/^\s*$/', $line) === 1) {
                     $this->deleteLine($i);
                     $i--;
                     $line = $this->text[$i];
                 }
-                /*
-                 * Refresh section separators
-                 */
+                // refresh section separators
                 if ($i !== 0 && $this->sectionSeparators > 0) {
                     $this->insertAtLine($i + 1, str_repeat(PHP_EOL, $this->sectionSeparators - 1));
                 }
diff --git a/library/Icinga/File/Ini/IniWriter.php b/library/Icinga/File/Ini/IniWriter.php
index e43c226aa..5b565a6a0 100644
--- a/library/Icinga/File/Ini/IniWriter.php
+++ b/library/Icinga/File/Ini/IniWriter.php
@@ -60,7 +60,7 @@ class IniWriter extends Zend_Config_Writer_FileAbstract
     {
         if (file_exists($this->_filename)) {
             $oldconfig = new Zend_Config_Ini($this->_filename);
-            $content = file_get_contents($this->_filename);
+            $content = trim(file_get_contents($this->_filename));
         } else {
             $oldconfig = new Zend_Config(array());
             $content = '';

From 3600e1088c2c9d6d7e81a5aa3d4e114d0b0529cb Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 8 Jun 2015 13:10:21 +0200
Subject: [PATCH 2079/2920] Fix key and value sanitazion in ini writer

---
 library/Icinga/File/Ini/IniEditor.php         |  2 +-
 .../library/Icinga/File/Ini/IniWriterTest.php | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/File/Ini/IniEditor.php b/library/Icinga/File/Ini/IniEditor.php
index 035e10037..00bea8df4 100644
--- a/library/Icinga/File/Ini/IniEditor.php
+++ b/library/Icinga/File/Ini/IniEditor.php
@@ -620,6 +620,6 @@ class IniEditor
 
     private function sanitize($value)
     {
-        return str_replace('\n', '', $value);
+        return str_replace("\n", '', $value);
     }
 }
diff --git a/test/php/library/Icinga/File/Ini/IniWriterTest.php b/test/php/library/Icinga/File/Ini/IniWriterTest.php
index 2d9659675..fa9ad895f 100644
--- a/test/php/library/Icinga/File/Ini/IniWriterTest.php
+++ b/test/php/library/Icinga/File/Ini/IniWriterTest.php
@@ -719,6 +719,34 @@ EOD;
         );
     }
 
+    public function testWhetherLinebreaksAreRemoved()
+    {
+        $target = $this->writeConfigToTemporaryFile('');
+        $writer = new IniWriter(
+            array(
+                'config' => Config::fromArray(
+                    array(
+                        'section' => array(
+                            'foo' => 'linebreak
+in line',
+                            'linebreak
+inkey' => 'blarg'
+                        )
+                    )
+                ),
+                'filename' => $target
+            )
+        );
+
+        $rendered = $writer->render();
+        var_dump($rendered);
+        $this->assertEquals(
+            count(explode("\n", $rendered)),
+            4,
+            'generated config should not contain more than three line breaks'
+        );
+    }
+
     /**
      * Write a INI-configuration string to a temporary file and return its path
      *

From 6e045b62393b1c132718874469ce4e63c513bcbb Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 8 Jun 2015 13:19:46 +0200
Subject: [PATCH 2080/2920] Change version in modules/*/module.info to
 2.0.0-rc1

refs #7651
---
 modules/doc/module.info         | 2 +-
 modules/monitoring/module.info  | 2 +-
 modules/test/module.info        | 2 +-
 modules/translation/module.info | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/doc/module.info b/modules/doc/module.info
index 2c6f48ac9..32516de5b 100644
--- a/modules/doc/module.info
+++ b/modules/doc/module.info
@@ -1,4 +1,4 @@
 Module: doc
-Version: 2.0.0
+Version: 2.0.0-rc1
 Description: Documentation module
  Extracts, shows and exports documentation for Icinga Web 2 and its modules.
diff --git a/modules/monitoring/module.info b/modules/monitoring/module.info
index a807a5316..6e36c2838 100644
--- a/modules/monitoring/module.info
+++ b/modules/monitoring/module.info
@@ -1,5 +1,5 @@
 Module: monitoring
-Version: 2.0.0~alpha4
+Version: 2.0.0-rc1
 Description: Icinga monitoring module
  This is the core module for most Icingaweb users. It provides an
  abstraction layer for various Icinga data backends.
diff --git a/modules/test/module.info b/modules/test/module.info
index ed6adc1f2..b29ad31eb 100644
--- a/modules/test/module.info
+++ b/modules/test/module.info
@@ -1,5 +1,5 @@
 Module: test
-Version: 2.0.0~alpha4
+Version: 2.0.0-rc1
 Description: Translation module
  This module allows developers to run (unit) tests against Icinga Web 2 and
  any of its modules. Usually you do not need to enable this.
diff --git a/modules/translation/module.info b/modules/translation/module.info
index ebe121ebc..a8f4013c7 100644
--- a/modules/translation/module.info
+++ b/modules/translation/module.info
@@ -1,5 +1,5 @@
 Module: translation
-Version: 2.0.0~alpha4
+Version: 2.0.0-rc1
 Description: Translation module
  This module allows developers and translators to translate Icinga Web 2 and
  its modules for multiple languages. You do not need this module to run an

From e9d308eb620e1719087c1181b839330e3cc1e9c7 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 8 Jun 2015 13:26:30 +0200
Subject: [PATCH 2081/2920] Setup: add module.info

refs #7651
---
 modules/setup/module.info | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 modules/setup/module.info

diff --git a/modules/setup/module.info b/modules/setup/module.info
new file mode 100644
index 000000000..0faa4ed0f
--- /dev/null
+++ b/modules/setup/module.info
@@ -0,0 +1,4 @@
+Module: setup
+Version: 2.0.0-rc1
+Description: Setup module
+ Sets up Icinga Web 2.

From 07041fafc8f617254dc7243da5002db1563d5698 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 8 Jun 2015 13:27:45 +0200
Subject: [PATCH 2082/2920] UserController: Behave nicely when not any backend
 is available

---
 application/controllers/UserController.php | 4 ++++
 application/views/scripts/user/list.phtml  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index e944af52c..5abdaece8 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -28,6 +28,10 @@ class UserController extends AuthBackendController
             function ($b) { return $b->getName(); },
             $this->loadUserBackends('Icinga\Data\Selectable')
         );
+        if (empty($backendNames)) {
+            return;
+        }
+
         $this->view->backendSelection = new Form();
         $this->view->backendSelection->setAttrib('class', 'backend-selection');
         $this->view->backendSelection->setUidDisabled();
diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index 76a6f2b8b..df9a14a45 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -18,7 +18,7 @@ if (! $this->compact): ?>
 <div class="content users">
 <?php
 
-if ($backend === null) {
+if (! isset($backend)) {
     echo $this->translate('No backend found which is able to list users') . '</div>';
     return;
 } else {

From 91cee3a957cf0d272aa9cfcaad788c36e9828b3a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 8 Jun 2015 13:28:12 +0200
Subject: [PATCH 2083/2920] GroupController: Behave nicely when not any backend
 is available

---
 application/controllers/GroupController.php | 4 ++++
 application/views/scripts/group/list.phtml  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 8f2c33e62..395b2f243 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -28,6 +28,10 @@ class GroupController extends AuthBackendController
             function ($b) { return $b->getName(); },
             $this->loadUserGroupBackends('Icinga\Data\Selectable')
         );
+        if (empty($backendNames)) {
+            return;
+        }
+
         $this->view->backendSelection = new Form();
         $this->view->backendSelection->setAttrib('class', 'backend-selection');
         $this->view->backendSelection->setUidDisabled();
diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
index bcd9dca93..65c1591cd 100644
--- a/application/views/scripts/group/list.phtml
+++ b/application/views/scripts/group/list.phtml
@@ -18,7 +18,7 @@ if (! $this->compact): ?>
 <div class="content groups">
 <?php
 
-if ($backend === null) {
+if (! isset($backend)) {
     echo $this->translate('No backend found which is able to list groups') . '</div>';
     return;
 } else {

From 44e3dba36226451afb2a3f0954ae21bc3bb6c7ba Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 8 Jun 2015 16:19:03 +0200
Subject: [PATCH 2084/2920] Improve group and user view layout

Display header and hide filter and sort widgets when there are no entries to be sorted or filtered.
---
 application/views/scripts/group/show.phtml | 11 ++++++-----
 application/views/scripts/user/show.phtml  | 11 ++++++-----
 public/css/icinga/main-content.less        | 10 ++++++----
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/application/views/scripts/group/show.phtml b/application/views/scripts/group/show.phtml
index 636a449d4..8c8c91f51 100644
--- a/application/views/scripts/group/show.phtml
+++ b/application/views/scripts/group/show.phtml
@@ -30,8 +30,12 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
   <div class="group-header">
     <p class="group-name"><strong><?= $this->escape($group->group_name); ?></strong></p> <?= $editLink; ?>
     <p class="group-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $group->created_at === null ? '-' : $this->formatDateTime($group->created_at); ?></p>
-    <p class="group-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $group->last_modified === null ? '-' : $this->formatDateTime($group->last_modified); ?></p>
+    <p class="group-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $group->last_modified === null ? '-' : $this->formatDateTime($group->last_modified); ?></p> 
+    <h5><?= $this->translate('Members'); ?></h5>
   </div>
+</div>
+<div class="content members" data-base-target="_next">
+<?php if (count($members) > 0): ?>
  <?php if (! $this->compact): ?>
   <?= $this->sortBox; ?>
  <?php endif ?>
@@ -40,9 +44,6 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
  <?php if (! $this->compact): ?>
   <?= $this->filterEditor; ?>
  <?php endif ?>
-</div>
-<div class="content members" data-base-target="_next">
-<?php if (count($members) > 0): ?>
   <table data-base-target="_next" class="action member-list">
     <thead>
       <tr>
@@ -66,7 +67,7 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
     </tbody>
   </table>
 <?php else: ?>
-  <p><?= $this->translate('No group member found matching the filter'); ?></p>
+  <p><?= $this->translate('Group has no members.'); ?></p>
 <?php endif ?>
 <?php if ($extensible): ?>
   <?= $this->qlink($this->translate('Add a new member'), 'group/addmember', array(
diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index 82f4c53f9..f4e9dee6a 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -30,8 +30,12 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
     <p class="user-name"><strong><?= $this->escape($user->user_name); ?></strong></p> <?= $editLink; ?>
     <p class="user-state"><strong><?= $this->translate('State'); ?>:</strong> <?= $user->is_active === null ? '-' : ($user->is_active ? $this->translate('Active') : $this->translate('Inactive')); ?></p>
     <p class="user-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $user->created_at === null ? '-' : $this->formatDateTime($user->created_at); ?></p>
-    <p class="user-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $user->last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?></p>
+    <p class="user-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $user->last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?></p> 
+    <h5><?= $this->translate('Group Memberships'); ?></h5>
   </div>
+</div>
+<div class="content memberships" data-base-target="_next">
+ <?php if (count($memberships) > 0): ?>
  <?php if (! $this->compact): ?>
   <?= $this->sortBox; ?>
  <?php endif ?>
@@ -40,9 +44,6 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
  <?php if (! $this->compact): ?>
   <?= $this->filterEditor; ?>
  <?php endif ?>
-</div>
-<div class="content memberships" data-base-target="_next">
-<?php if (count($memberships) > 0): ?>
   <table data-base-target="_next" class="action membership-list">
     <thead>
       <tr>
@@ -80,7 +81,7 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
     </tbody>
   </table>
 <?php else: ?>
-  <p><?= $this->translate('No memberships found matching the filter'); ?></p>
+  <?= $this->translate('User has no group memberships.'); ?>
 <?php endif ?>
 <?php if ($showCreateMembershipLink): ?>
 <?= $this->qlink($this->translate('Create new membership'), 'user/createmembership', array(
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 18bc03a57..06269d271 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -236,8 +236,9 @@ div.content.users {
 }
 
 div.controls div.user-header {
-  border-bottom: 2px solid @colorPetrol;
-  margin-bottom: 1em;
+  h5 {
+    margin-bottom: 0em;
+  }
 
   .user-name {
     display: inline-block;
@@ -302,8 +303,9 @@ div.content.groups {
 }
 
 div.controls div.group-header {
-  border-bottom: 2px solid @colorPetrol;
-  margin-bottom: 1em;
+  h5 {
+    margin-bottom: 0em;
+  }
 
   .group-name {
     display: inline-block;

From c0ffe4d6908c9d31339f46efabdac41f444afbc2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 8 Jun 2015 17:07:34 +0200
Subject: [PATCH 2085/2920] Introduce class HostnotificationQuery

refs #9009
---
 .../Ido/Query/HostnotificationQuery.php       | 202 ++++++++++++++++++
 1 file changed, 202 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
new file mode 100644
index 000000000..78a6f53af
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
@@ -0,0 +1,202 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+/**
+ * Query for host notifications
+ */
+class HostnotificationQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'notifications' => array(
+            'notification_output'       => 'hn.output',
+            'notification_start_time'   => 'UNIX_TIMESTAMP(hn.start_time)',
+            'notification_state'        => 'hn.state',
+            'notification_object_id'    => 'hn.object_id',
+            'host'                      => 'ho.name1 COLLATE latin1_general_ci',
+            'host_name'                 => 'ho.name1',
+            'object_type'               => '(\'host\')'
+        ),
+        'contactnotifications' => array(
+            'contact'                   => 'cno.name1 COLLATE latin1_general_ci',
+            'notification_contact_name' => 'cno.name1',
+            'contact_object_id'         => 'cno.object_id'
+        ),
+        'acknowledgements' => array(
+            'acknowledgement_entry_time'    => 'UNIX_TIMESTAMP(a.entry_time)',
+            'acknowledgement_author_name'   => 'a.author_name',
+            'acknowledgement_comment_data'  => 'a.comment_data'
+        ),
+        'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
+        ),
+        'hosts' => array(
+            'host_alias'        => 'h.alias',
+            'host_display_name' => 'h.display_name COLLATE latin1_general_ci'
+        ),
+        'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
+        ),
+        'services' => array(
+            'service'               => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'   => 'so.name2',
+            'service_display_name'  => 's.display_name COLLATE latin1_general_ci'
+        )
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        $this->select->from(
+            array('hn' => $this->prefix . 'notifications'),
+            array()
+        )->join(
+            array('ho' => $this->prefix . 'objects'),
+            'ho.object_id = hn.object_id',
+            array()
+        )->where(
+            'ho.is_active = ?',
+            1
+        )->where(
+            'ho.objecttype_id = ?',
+            1
+        );
+        $this->joinedVirtualTables['notifications'] = true;
+    }
+
+    /**
+     * Join contact notifications
+     */
+    protected function joinContactnotifications()
+    {
+        $this->select->join(
+            array('cn' => $this->prefix . 'contactnotifications'),
+            'cn.notification_id = hn.notification_id',
+            array()
+        );
+        $this->select->join(
+            array('cno' => $this->prefix . 'objects'),
+            'cno.object_id = cn.contact_object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join acknowledgements
+     */
+    protected function joinAcknowledgements()
+    {
+        $this->select->joinLeft(
+            array('a' => $this->prefix . 'acknowledgements'),
+            'a.object_id = hn.object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join host groups
+     */
+    protected function joinHostgroups()
+    {
+        $this->select->join(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = ho.object_id',
+            array()
+        )->join(
+            array('hg' => $this->prefix . 'hostgroups'),
+            'hg.hostgroup_id = hgm.hostgroup_id',
+            array()
+        )->join(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hg.hostgroup_object_id',
+            array()
+        )->where(
+            'hgo.is_active = ?',
+            1
+        )
+        ->where(
+            'hgo.objecttype_id = ?',
+            3
+        );
+        $this->group(array('hn.notification_id', 'ho.name1'));
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $this->select->join(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = ho.object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = s.service_object_id',
+            array()
+        )->join(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sg.' . $this->servicegroup_id . ' = sgm.servicegroup_id',
+            array()
+        )->join(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id',
+            array()
+        )->where(
+            'sgo.is_active = ?',
+            1
+        )
+        ->where(
+            'sgo.objecttype_id = ?',
+            4
+        );
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $this->select->join(
+            array('s' => $this->prefix . 'services'),
+            's.host_object_id = h.host_object_id',
+            array()
+        )->join(
+            array('so' => $this->prefix . 'objects'),
+            'so.object_id = s.service_object_id',
+            array()
+        )->where(
+            'so.is_active = ?',
+            1
+        )
+        ->where(
+            'so.objecttype_id = ?',
+            2
+        );
+        $this->group(array('hn.notification_id', 'ho.name1'));
+    }
+}

From 70e3434f331d330457919c6258859b623b8eb2e1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 8 Jun 2015 17:07:55 +0200
Subject: [PATCH 2086/2920] Introduce class ServicenotificationQuery

refs #9009
---
 .../Ido/Query/ServicenotificationQuery.php    | 194 ++++++++++++++++++
 1 file changed, 194 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
new file mode 100644
index 000000000..aaf3d57bc
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
@@ -0,0 +1,194 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+/**
+ * Query for service notifications
+ */
+class ServicenotificationQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'notifications' => array(
+            'notification_output'       => 'sn.output',
+            'notification_start_time'   => 'UNIX_TIMESTAMP(sn.start_time)',
+            'notification_state'        => 'sn.state',
+            'notification_object_id'    => 'sn.object_id',
+            'host'                      => 'so.name1 COLLATE latin1_general_ci',
+            'host_name'                 => 'so.name1',
+            'object_type'               => '(\'service\')',
+            'service'                   => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'       => 'so.name2',
+            'service_host'              => 'so.name1 COLLATE latin1_general_ci',
+            'service_host_name'         => 'so.name1'
+        ),
+        'contactnotifications' => array(
+            'contact'                   => 'cno.name1 COLLATE latin1_general_ci',
+            'notification_contact_name' => 'cno.name1',
+            'contact_object_id'         => 'cno.object_id'
+        ),
+        'acknowledgements' => array(
+            'acknowledgement_entry_time'    => 'UNIX_TIMESTAMP(a.entry_time)',
+            'acknowledgement_author_name'   => 'a.author_name',
+            'acknowledgement_comment_data'  => 'a.comment_data'
+        ),
+        'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
+        ),
+        'hosts' => array(
+            'host_alias'        => 'h.alias',
+            'host_display_name' => 'h.display_name COLLATE latin1_general_ci'
+        ),
+        'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
+        ),
+        'services' => array(
+            'service_display_name'  => 's.display_name COLLATE latin1_general_ci'
+        )
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        $this->select->from(
+            array('sn' => $this->prefix . 'notifications'),
+            array()
+        )->join(
+            array('so' => $this->prefix . 'objects'),
+            'so.object_id = sn.object_id',
+            array()
+        )->where(
+            'so.is_active = ?',
+            1
+        )->where(
+            'so.objecttype_id = ?',
+            2
+        );
+        $this->joinedVirtualTables['notifications'] = true;
+    }
+
+    /**
+     * Join contact notifications
+     */
+    protected function joinContactnotifications()
+    {
+        $this->select->join(
+            array('cn' => $this->prefix . 'contactnotifications'),
+            'cn.notification_id = sn.notification_id',
+            array()
+        );
+        $this->select->join(
+            array('cno' => $this->prefix . 'objects'),
+            'cno.object_id = cn.contact_object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join acknowledgements
+     */
+    protected function joinAcknowledgements()
+    {
+        $this->select->joinLeft(
+            array('a' => $this->prefix . 'acknowledgements'),
+            'a.object_id = sn.object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join host groups
+     */
+    protected function joinHostgroups()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = s.host_object_id',
+            array()
+        )->join(
+            array('hg' => $this->prefix . 'hostgroups'),
+            'hg.hostgroup_id = hgm.hostgroup_id',
+            array()
+        )->join(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hg.hostgroup_object_id',
+            array()
+        )->where(
+            'hgo.is_active = ?',
+            1
+        )
+        ->where(
+            'hgo.objecttype_id = ?',
+            3
+        );
+        $this->group(array('sn.notification_id', 'so.name2', 'so.name1'));
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = s.host_object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->select->join(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = so.object_id',
+            array()
+        )->join(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sg.' . $this->servicegroup_id . ' = sgm.servicegroup_id',
+            array()
+        )->join(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id',
+            array()
+        )->where(
+            'sgo.is_active = ?',
+            1
+        )
+        ->where(
+            'sgo.objecttype_id = ?',
+            4
+        );
+        $this->group(array('sn.notification_id', 'so.name2', 'so.name1'));
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $this->select->join(
+            array('s' => $this->prefix . 'services'),
+            's.service_object_id = so.object_id',
+            array()
+        );
+    }
+}

From 9229e460d19bcbc19a1ebe07784760344a553889 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 8 Jun 2015 17:09:24 +0200
Subject: [PATCH 2087/2920] NotificationQuery: Use subqueries to fetch host-
 and service-notifications

refs #9009
---
 .../Backend/Ido/Query/NotificationQuery.php   | 195 +++++++++---------
 .../Monitoring/DataView/Notification.php      |  55 ++++-
 2 files changed, 143 insertions(+), 107 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index 0133dc637..ed8a1a911 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -3,136 +3,127 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
+use Zend_Db_Expr;
+use Zend_Db_Select;
+use Icinga\Data\Filter\Filter;
+
+/**
+ * Query for host and service notifications
+ */
 class NotificationQuery extends IdoQuery
 {
+    /**
+     * {@inheritdoc}
+     */
     protected $columnMap = array(
-        'notification' => array(
-            'notification_output'           => 'n.output',
-            'notification_start_time'       => 'UNIX_TIMESTAMP(n.start_time)',
-            'notification_state'            => 'n.state',
-            'notification_object_id'        => 'n.object_id'
-        ),
-        'objects' => array(
-            'host'                          => 'o.name1 COLLATE latin1_general_ci',
-            'host_name'                     => 'o.name1',
-            'service'                       => 'o.name2 COLLATE latin1_general_ci',
-            'service_description'           => 'o.name2'
-        ),
-        'contact' => array(
-            'contact'                       => 'c_o.name1 COLLATE latin1_general_ci',
-            'notification_contact_name'     => 'c_o.name1',
-            'contact_object_id'             => 'c_o.object_id'
-        ),
-        'command' => array(
-            'notification_command'          => 'cmd_o.name1'
-        ),
-        'acknowledgement' => array(
-            'acknowledgement_entry_time'    => 'UNIX_TIMESTAMP(a.entry_time)',
-            'acknowledgement_author_name'   => 'a.author_name',
-            'acknowledgement_comment_data'  => 'a.comment_data'
+        'notifications' => array(
+            'notification_state'            => 'n.notification_state',
+            'notification_start_time'       => 'n.notification_start_time',
+            'notification_contact_name'     => 'n.notification_contact_name',
+            'notification_output'           => 'n.notification_output',
+            'notification_object_id'        => 'n.notification_object_id',
+            'contact_object_id'             => 'n.contact_object_id',
+            'acknowledgement_entry_time'    => 'n.acknowledgement_entry_time',
+            'acknowledgement_author_name'   => 'n.acknowledgement_author_name',
+            'acknowledgement_comment_data'  => 'n.acknowledgement_comment_data',
+            'object_type'                   => 'n.object_type'
         ),
         'hosts' => array(
-            'host_display_name'             => 'CASE WHEN sh.display_name IS NOT NULL THEN sh.display_name ELSE h.display_name END'
+            'host_display_name' => 'n.host_display_name',
+            'host_name'         => 'n.host_name'
         ),
         'services' => array(
-            'service_display_name'          => 's.display_name'
+            'service_description'   => 'n.service_description',
+            'service_display_name'  => 'n.service_display_name',
+            'service_host_name'     => 'n.service_host_name'
         )
     );
 
     /**
-     * Fetch basic information about notifications
+     * The union
+     *
+     * @var Zend_Db_Select
+     */
+    protected $notificationQuery;
+
+    /**
+     * Subqueries used for the notification query
+     *
+     * @var IdoQuery[]
+     */
+    protected $subQueries = array();
+
+    /**
+     * {@inheritdoc}
      */
     protected function joinBaseTables()
     {
+        $this->notificationQuery = $this->db->select();
         $this->select->from(
-            array('n' => $this->prefix . 'notifications'),
+            array('n' => $this->notificationQuery),
             array()
         );
-        $this->joinedVirtualTables = array('notification' => true);
+        $this->joinedVirtualTables['notifications'] = true;
     }
 
     /**
-     * Fetch description of each affected host/service
+     * Join hosts
      */
-    protected function joinObjects()
-    {
-        $this->select->join(
-            array('o' => $this->prefix . 'objects'),
-            'n.object_id = o.object_id AND o.is_active = 1 AND o.objecttype_id IN (1, 2)',
-            array()
-        );
-    }
-
-    /**
-     * Fetch name of involved contacts and/or contact groups
-     */
-    protected function joinContact()
-    {
-        $this->select->join(
-            array('c' => $this->prefix . 'contactnotifications'),
-            'n.notification_id = c.notification_id',
-            array()
-        );
-        $this->select->join(
-            array('c_o' => $this->prefix . 'objects'),
-            'c.contact_object_id = c_o.object_id',
-            array()
-        );
-    }
-
-    /**
-     * Fetch name of the command which was used to send out a notification
-     */
-    protected function joinCommand()
-    {
-        $this->select->join(
-            array('cmd_c' => $this->prefix . 'contactnotifications'),
-            'n.notification_id = cmd_c.notification_id',
-            array()
-        );
-        $this->select->joinLeft(
-            array('cmd_m' => $this->prefix . 'contactnotificationmethods'),
-            'cmd_c.contactnotification_id = cmd_m.contactnotification_id',
-            array()
-        );
-        $this->select->joinLeft(
-            array('cmd_o' => $this->prefix . 'objects'),
-            'cmd_m.command_object_id = cmd_o.object_id',
-            array()
-        );
-    }
-
-    protected function joinAcknowledgement()
-    {
-        $this->select->joinLeft(
-            array('a' => $this->prefix . 'acknowledgements'),
-            'n.object_id = a.object_id',
-            array()
-        );
-    }
-
     protected function joinHosts()
     {
-        $this->select->joinLeft(
-            array('h' => $this->prefix . 'hosts'),
-            'h.host_object_id = o.object_id',
-            array()
+        $columns = array_keys($this->columnMap['notifications'] + $this->columnMap['hosts']);
+        foreach (array_keys($this->columnMap['services']) as $column) {
+            $columns[$column] = new Zend_Db_Expr('NULL');
+        }
+        $hosts = $this->createSubQuery('hostnotification', $columns);
+        $this->subQueries[] = $hosts;
+        $this->notificationQuery->union(array($hosts), Zend_Db_Select::SQL_UNION_ALL);
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $columns = array_keys(
+            $this->columnMap['notifications'] + $this->columnMap['hosts'] + $this->columnMap['services']
         );
+        $services = $this->createSubQuery('servicenotification', $columns);
+        $this->subQueries[] = $services;
+        $this->notificationQuery->union(array($services), Zend_Db_Select::SQL_UNION_ALL);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function order($columnOrAlias, $dir = null)
+    {
+        foreach ($this->subQueries as $sub) {
+            $sub->requireColumn($columnOrAlias);
+        }
+        return parent::order($columnOrAlias, $dir);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function where($condition, $value = null)
+    {
+        $this->requireColumn($condition);
+        foreach ($this->subQueries as $sub) {
+            $sub->where($condition, $value);
+        }
         return $this;
     }
 
-    protected function joinServices()
+    /**
+     * {@inheritdoc}
+     */
+    public function addFilter(Filter $filter)
     {
-        $this->select->joinLeft(
-            array('s' => $this->prefix . 'services'),
-            's.service_object_id = o.object_id',
-            array()
-        );
-        $this->select->joinLeft(
-            array('sh' => $this->prefix . 'hosts'),
-            'sh.host_object_id = s.host_object_id',
-            array()
-        );
+        foreach ($this->subQueries as $sub) {
+            $sub->applyFilter(clone $filter);
+        }
         return $this;
     }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php
index 48d8fd058..9c06fc2ef 100644
--- a/modules/monitoring/library/Monitoring/DataView/Notification.php
+++ b/modules/monitoring/library/Monitoring/DataView/Notification.php
@@ -5,6 +5,19 @@ namespace Icinga\Module\Monitoring\DataView;
 
 class Notification extends DataView
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_'
+            && preg_match('/^_(?:host|service)_/', $column)
+        ) {
+            return true;
+        }
+        return parent::isValidFilterTarget($column);
+    }
+
     /**
      * Retrieve columns provided by this view
      *
@@ -13,30 +26,62 @@ class Notification extends DataView
     public function getColumns()
     {
         return array(
-            'host_name',
-            'service_description',
             'notification_state',
             'notification_start_time',
             'notification_contact_name',
             'notification_output',
-            'notification_command',
+            'notification_object_id',
+            'contact_object_id',
+            'acknowledgement_entry_time',
+            'acknowledgement_author_name',
+            'acknowledgement_comment_data',
             'host_display_name',
-            'service_display_name'
+            'host_name',
+            'object_type',
+            'service_description',
+            'service_display_name',
+            'service_host_name'
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getSortRules()
     {
         return array(
             'notification_start_time' => array(
                 'order' => self::SORT_DESC,
                 'title' => 'Notification Start'
+            ),
+            'host_display_name' => array(
+                'columns' => array(
+                    'host_display_name',
+                    'service_display_name'
+                ),
+                'order' => self::SORT_ASC
+            ),
+            'service_display_name' => array(
+                'columns' => array(
+                    'service_display_name',
+                    'host_display_name'
+                ),
+                'order' => self::SORT_ASC
             )
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getFilterColumns()
     {
-        return array('host', 'service', 'contact');
+        return array(
+            'contact',
+            'host', 'host_alias',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+        );
     }
 }

From 2669d0e478e14c12c50176c65edf55de2ab84542 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 8 Jun 2015 17:10:16 +0200
Subject: [PATCH 2088/2920] monitoring: Restrict the notification overview

refs #9009
---
 modules/monitoring/application/controllers/ListController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 4337b9f61..3254fcc12 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -295,6 +295,7 @@ class Monitoring_ListController extends Controller
             'host_display_name',
             'service_display_name'
         ));
+        $this->applyRestriction('monitoring/filter/objects', $query);
         $this->filterQuery($query);
         $this->view->notifications = $query;
 

From 75c5aab1b965eb4f1d598acdf6f2984f95282e6f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 8 Jun 2015 17:23:36 +0200
Subject: [PATCH 2089/2920] NotificationQuery: Do not use a placeholder if it's
 possible to select a real value

refs #9009
---
 .../Backend/Ido/Query/HostnotificationQuery.php           | 3 ++-
 .../Monitoring/Backend/Ido/Query/NotificationQuery.php    | 8 +++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
index 78a6f53af..86930e12e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
@@ -53,7 +53,8 @@ class HostnotificationQuery extends IdoQuery
         'services' => array(
             'service'               => 'so.name2 COLLATE latin1_general_ci',
             'service_description'   => 'so.name2',
-            'service_display_name'  => 's.display_name COLLATE latin1_general_ci'
+            'service_display_name'  => 's.display_name COLLATE latin1_general_ci',
+            'service_host_name'     => 'so.name1'
         )
     );
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index ed8a1a911..f898c8699 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -3,7 +3,6 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
-use Zend_Db_Expr;
 use Zend_Db_Select;
 use Icinga\Data\Filter\Filter;
 
@@ -71,10 +70,9 @@ class NotificationQuery extends IdoQuery
      */
     protected function joinHosts()
     {
-        $columns = array_keys($this->columnMap['notifications'] + $this->columnMap['hosts']);
-        foreach (array_keys($this->columnMap['services']) as $column) {
-            $columns[$column] = new Zend_Db_Expr('NULL');
-        }
+        $columns = array_keys(
+            $this->columnMap['notifications'] + $this->columnMap['hosts'] + $this->columnMap['services']
+        );
         $hosts = $this->createSubQuery('hostnotification', $columns);
         $this->subQueries[] = $hosts;
         $this->notificationQuery->union(array($hosts), Zend_Db_Select::SQL_UNION_ALL);

From d9f68578eb0173bebf0b34cab4dc869d68ebee31 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 8 Jun 2015 17:43:12 +0200
Subject: [PATCH 2090/2920] Add doc/about.md

refs #9379
---
 doc/about.md | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 doc/about.md

diff --git a/doc/about.md b/doc/about.md
new file mode 100644
index 000000000..6074916ab
--- /dev/null
+++ b/doc/about.md
@@ -0,0 +1,40 @@
+# <a id="about"></a> About Icinga Web 2
+
+## <a id="about-installation"></a> Installation
+
+Icinga Web 2 can be installed easily from packages from the official package repositories.
+Setting it up is also easy with the web based setup wizard.
+
+See [here](installation#installation) for more information about installation.
+
+## <a id="about-configuration"></a> Configuration
+
+See [here](configuration#configuration) for more information about configuration.
+
+## <a id="about-authentication"></a> Authentication
+
+See [here](authentication#authentication) for more information about authentication.
+
+## <a id="about-authorization"></a> Authorization
+
+See [here](security#security) for more information about authorization.
+
+## <a id="about-preferences"></a> User preferences
+
+See [here](preferences#preferences) for more information about user preferences.
+
+## <a id="about-documentation"></a> Documentation
+
+With the documentation module you can read the documentation of the framework (and any module) directly in the user interface.
+
+The module can also export the documentation to PDF.
+
+## <a id="about-translation"></a> Translation
+
+With the translation module every piece of text in the user interface (of the framework itself and any module) can be translated to a language of your choise.
+
+Currently provided languages:
+
+* German
+* Italian
+* Portuguese

From 83c21f08e311a55ac0fd57772d9624591159354a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 8 Jun 2015 18:00:54 +0200
Subject: [PATCH 2091/2920] DowntimeQuery: Fix grouping

There was only one downtime for each host or service being fetched.

refs #9009
---
 .../Monitoring/Backend/Ido/Query/HostdowntimeQuery.php        | 4 ++--
 .../Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
index 0e2b503d8..ec9cd569b 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
@@ -107,7 +107,7 @@ class HostdowntimeQuery extends IdoQuery
             'hgo.objecttype_id = ?',
             3
         );
-        $this->group('ho.name1');
+        $this->group(array('sd.scheduleddowntime_id', 'ho.name1'));
     }
 
     /**
@@ -183,6 +183,6 @@ class HostdowntimeQuery extends IdoQuery
             'so.objecttype_id = ?',
             2
         );
-        $this->group('ho.name1');
+        $this->group(array('sd.scheduleddowntime_id', 'ho.name1'));
     }
 }
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
index 55b8e466c..6d528ba73 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
@@ -112,7 +112,7 @@ class ServicedowntimeQuery extends IdoQuery
             'hgo.objecttype_id = ?',
             3
         );
-        $this->group(array('so.name2', 'so.name1'));
+        $this->group(array('sd.scheduleddowntime_id', 'so.name2', 'so.name1'));
     }
 
     /**
@@ -166,7 +166,7 @@ class ServicedowntimeQuery extends IdoQuery
             'sgo.objecttype_id = ?',
             4
         );
-        $this->group(array('so.name2', 'so.name1'));
+        $this->group(array('sd.scheduleddowntime_id', 'so.name2', 'so.name1'));
     }
 
     /**

From a4ad4e237204923646417b09b65ebac3510ea8a9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 8 Jun 2015 18:01:16 +0200
Subject: [PATCH 2092/2920] CommentQuery: Fix grouping

There was only one comment for each host or service being fetched.

refs #9009
---
 .../library/Monitoring/Backend/Ido/Query/HostcommentQuery.php | 4 ++--
 .../Monitoring/Backend/Ido/Query/ServicecommentQuery.php      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
index fa80ec18f..080fdd905 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
@@ -101,7 +101,7 @@ class HostcommentQuery extends IdoQuery
             'hgo.objecttype_id = ?',
             3
         );
-        $this->group('ho.name1');
+        $this->group(array('c.comment_id', 'ho.name1'));
     }
 
     /**
@@ -177,6 +177,6 @@ class HostcommentQuery extends IdoQuery
             'so.objecttype_id = ?',
             2
         );
-        $this->group('ho.name1');
+        $this->group(array('c.comment_id', 'ho.name1'));
     }
 }
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
index 40b6e805f..005ef0184 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
@@ -106,7 +106,7 @@ class ServicecommentQuery extends IdoQuery
             'hgo.objecttype_id = ?',
             3
         );
-        $this->group(array('so.name2', 'so.name1'));
+        $this->group(array('c.comment_id', 'so.name2', 'so.name1'));
     }
 
     /**
@@ -160,7 +160,7 @@ class ServicecommentQuery extends IdoQuery
             'sgo.objecttype_id = ?',
             4
         );
-        $this->group(array('so.name2', 'so.name1'));
+        $this->group(array('c.comment_id', 'so.name2', 'so.name1'));
     }
 
     /**

From 17fa0d3f11d4f494e6456f5e5b2c6914d00deef6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Jun 2015 08:23:06 +0200
Subject: [PATCH 2093/2920] Revert "Improve group and user view layout"

This reverts commit 44e3dba36226451afb2a3f0954ae21bc3bb6c7ba.
Reason:
* Controls are controls, not content
* Controls must still be shown in case of a non-matching filter
---
 application/views/scripts/group/show.phtml | 11 +++++------
 application/views/scripts/user/show.phtml  | 11 +++++------
 public/css/icinga/main-content.less        | 10 ++++------
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/application/views/scripts/group/show.phtml b/application/views/scripts/group/show.phtml
index 8c8c91f51..636a449d4 100644
--- a/application/views/scripts/group/show.phtml
+++ b/application/views/scripts/group/show.phtml
@@ -30,12 +30,8 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
   <div class="group-header">
     <p class="group-name"><strong><?= $this->escape($group->group_name); ?></strong></p> <?= $editLink; ?>
     <p class="group-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $group->created_at === null ? '-' : $this->formatDateTime($group->created_at); ?></p>
-    <p class="group-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $group->last_modified === null ? '-' : $this->formatDateTime($group->last_modified); ?></p> 
-    <h5><?= $this->translate('Members'); ?></h5>
+    <p class="group-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $group->last_modified === null ? '-' : $this->formatDateTime($group->last_modified); ?></p>
   </div>
-</div>
-<div class="content members" data-base-target="_next">
-<?php if (count($members) > 0): ?>
  <?php if (! $this->compact): ?>
   <?= $this->sortBox; ?>
  <?php endif ?>
@@ -44,6 +40,9 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
  <?php if (! $this->compact): ?>
   <?= $this->filterEditor; ?>
  <?php endif ?>
+</div>
+<div class="content members" data-base-target="_next">
+<?php if (count($members) > 0): ?>
   <table data-base-target="_next" class="action member-list">
     <thead>
       <tr>
@@ -67,7 +66,7 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
     </tbody>
   </table>
 <?php else: ?>
-  <p><?= $this->translate('Group has no members.'); ?></p>
+  <p><?= $this->translate('No group member found matching the filter'); ?></p>
 <?php endif ?>
 <?php if ($extensible): ?>
   <?= $this->qlink($this->translate('Add a new member'), 'group/addmember', array(
diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index f4e9dee6a..82f4c53f9 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -30,12 +30,8 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
     <p class="user-name"><strong><?= $this->escape($user->user_name); ?></strong></p> <?= $editLink; ?>
     <p class="user-state"><strong><?= $this->translate('State'); ?>:</strong> <?= $user->is_active === null ? '-' : ($user->is_active ? $this->translate('Active') : $this->translate('Inactive')); ?></p>
     <p class="user-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $user->created_at === null ? '-' : $this->formatDateTime($user->created_at); ?></p>
-    <p class="user-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $user->last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?></p> 
-    <h5><?= $this->translate('Group Memberships'); ?></h5>
+    <p class="user-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $user->last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?></p>
   </div>
-</div>
-<div class="content memberships" data-base-target="_next">
- <?php if (count($memberships) > 0): ?>
  <?php if (! $this->compact): ?>
   <?= $this->sortBox; ?>
  <?php endif ?>
@@ -44,6 +40,9 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
  <?php if (! $this->compact): ?>
   <?= $this->filterEditor; ?>
  <?php endif ?>
+</div>
+<div class="content memberships" data-base-target="_next">
+<?php if (count($memberships) > 0): ?>
   <table data-base-target="_next" class="action membership-list">
     <thead>
       <tr>
@@ -81,7 +80,7 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
     </tbody>
   </table>
 <?php else: ?>
-  <?= $this->translate('User has no group memberships.'); ?>
+  <p><?= $this->translate('No memberships found matching the filter'); ?></p>
 <?php endif ?>
 <?php if ($showCreateMembershipLink): ?>
 <?= $this->qlink($this->translate('Create new membership'), 'user/createmembership', array(
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 06269d271..18bc03a57 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -236,9 +236,8 @@ div.content.users {
 }
 
 div.controls div.user-header {
-  h5 {
-    margin-bottom: 0em;
-  }
+  border-bottom: 2px solid @colorPetrol;
+  margin-bottom: 1em;
 
   .user-name {
     display: inline-block;
@@ -303,9 +302,8 @@ div.content.groups {
 }
 
 div.controls div.group-header {
-  h5 {
-    margin-bottom: 0em;
-  }
+  border-bottom: 2px solid @colorPetrol;
+  margin-bottom: 1em;
 
   .group-name {
     display: inline-block;

From 27d2af56166c0dfdd55fdd7b683d1ad791e01b5c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Jun 2015 08:31:05 +0200
Subject: [PATCH 2094/2920] UserController: Allow to quick search memberships

---
 application/controllers/UserController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 5abdaece8..54482dd7d 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -103,6 +103,7 @@ class UserController extends AuthBackendController
 
         $filterEditor = Widget::create('filterEditor')
             ->setQuery($memberships)
+            ->setSearchColumns(array('group_name'))
             ->preserveParams('limit', 'sort', 'dir', 'view', 'backend', 'user')
             ->ignoreParams('page')
             ->handleRequest($this->getRequest());

From fb52ee5a7c1948fe6eb32395edc4ce5c2669d521 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Jun 2015 08:31:21 +0200
Subject: [PATCH 2095/2920] GroupController: Allow to quick search members

---
 application/controllers/GroupController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 395b2f243..a4161981a 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -104,6 +104,7 @@ class GroupController extends AuthBackendController
 
         $filterEditor = Widget::create('filterEditor')
             ->setQuery($members)
+            ->setSearchColumns(array('user'))
             ->preserveParams('limit', 'sort', 'dir', 'view', 'backend', 'group')
             ->ignoreParams('page')
             ->handleRequest($this->getRequest());

From f2c7d5686a796c8fc3a08e5299d14da866deff40 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Jun 2015 09:17:15 +0200
Subject: [PATCH 2096/2920] Timeline: Fix url used to extend the timeline

---
 .../monitoring/application/views/scripts/timeline/index.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/timeline/index.phtml b/modules/monitoring/application/views/scripts/timeline/index.phtml
index d0cc8d34c..209eb0f1b 100644
--- a/modules/monitoring/application/views/scripts/timeline/index.phtml
+++ b/modules/monitoring/application/views/scripts/timeline/index.phtml
@@ -132,8 +132,8 @@ $extrapolatedCircleWidth = $timeline->getExtrapolatedCircleWidth($timeInfo[1][$g
 <?php endforeach ?>
         <a aria-hidden="true" id="end" href="<?= Url::fromRequest()->remove(
             array(
-                'raw_timestamp<',
-                'raw_timestamp>'
+                'timestamp<',
+                'timestamp>'
             )
         )->overwriteParams(
             array(

From eba862a290485bc2cab762b3c351554891c07564 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Jun 2015 09:21:12 +0200
Subject: [PATCH 2097/2920] view->url(): Clone $path if it's already of type
 Icinga\Web\Url

Avoids side effects in case of url params adjustments.

fixes #9351
---
 library/Icinga/Web/View/helpers/url.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/library/Icinga/Web/View/helpers/url.php b/library/Icinga/Web/View/helpers/url.php
index 39e8de951..06ace7f19 100644
--- a/library/Icinga/Web/View/helpers/url.php
+++ b/library/Icinga/Web/View/helpers/url.php
@@ -20,7 +20,12 @@ $this->addHelperFunction('url', function ($path = null, $params = null) {
     } else {
         $url = Url::fromPath($path);
     }
+
     if ($params !== null) {
+        if ($url === $path) {
+            $url = clone $url;
+        }
+
         $url->overwriteParams($params);
     }
 

From 27c73833f92e9d64e3454e2664a515d63fd49a98 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 9 Jun 2015 10:15:37 +0200
Subject: [PATCH 2098/2920] Translation module: fix typo

refs #7651
---
 modules/translation/module.info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/translation/module.info b/modules/translation/module.info
index a8f4013c7..098ad7981 100644
--- a/modules/translation/module.info
+++ b/modules/translation/module.info
@@ -4,4 +4,4 @@ Description: Translation module
  This module allows developers and translators to translate Icinga Web 2 and
  its modules for multiple languages. You do not need this module to run an
  internationalized web frontend. This is only for people who want to contribute
- translations or translate just their own moduls.
+ translations or translate just their own modules.

From 4cea9f15e9e9a42af8898aba6904f802e122394c Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 9 Jun 2015 10:27:54 +0200
Subject: [PATCH 2099/2920] Add heading to user and group view and fix layout

---
 application/views/scripts/group/show.phtml | 17 +++++++++--------
 application/views/scripts/user/show.phtml  | 17 +++++++++--------
 public/css/icinga/main-content.less        | 10 ++++++----
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/application/views/scripts/group/show.phtml b/application/views/scripts/group/show.phtml
index 636a449d4..20538a9b3 100644
--- a/application/views/scripts/group/show.phtml
+++ b/application/views/scripts/group/show.phtml
@@ -31,15 +31,16 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
     <p class="group-name"><strong><?= $this->escape($group->group_name); ?></strong></p> <?= $editLink; ?>
     <p class="group-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $group->created_at === null ? '-' : $this->formatDateTime($group->created_at); ?></p>
     <p class="group-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $group->last_modified === null ? '-' : $this->formatDateTime($group->last_modified); ?></p>
+    <h3><?= $this->translate('Members'); ?></h3>
+    <?php if (! $this->compact): ?>
+     <?= $this->sortBox; ?>
+    <?php endif ?>
+     <?= $this->limiter; ?>
+     <?= $this->paginator; ?>
+    <?php if (! $this->compact): ?>
+     <?= $this->filterEditor; ?>
+    <?php endif ?>
   </div>
- <?php if (! $this->compact): ?>
-  <?= $this->sortBox; ?>
- <?php endif ?>
-  <?= $this->limiter; ?>
-  <?= $this->paginator; ?>
- <?php if (! $this->compact): ?>
-  <?= $this->filterEditor; ?>
- <?php endif ?>
 </div>
 <div class="content members" data-base-target="_next">
 <?php if (count($members) > 0): ?>
diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index 82f4c53f9..64a9eaa02 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -31,15 +31,16 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
     <p class="user-state"><strong><?= $this->translate('State'); ?>:</strong> <?= $user->is_active === null ? '-' : ($user->is_active ? $this->translate('Active') : $this->translate('Inactive')); ?></p>
     <p class="user-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $user->created_at === null ? '-' : $this->formatDateTime($user->created_at); ?></p>
     <p class="user-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $user->last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?></p>
+    <h3><?= $this->translate('Group Memberships'); ?></h3>
+    <?php if (! $this->compact): ?>
+     <?= $this->sortBox; ?>
+    <?php endif ?>
+     <?= $this->limiter; ?>
+     <?= $this->paginator; ?>
+    <?php if (! $this->compact): ?>
+     <?= $this->filterEditor; ?>
+    <?php endif ?>
   </div>
- <?php if (! $this->compact): ?>
-  <?= $this->sortBox; ?>
- <?php endif ?>
-  <?= $this->limiter; ?>
-  <?= $this->paginator; ?>
- <?php if (! $this->compact): ?>
-  <?= $this->filterEditor; ?>
- <?php endif ?>
 </div>
 <div class="content memberships" data-base-target="_next">
 <?php if (count($memberships) > 0): ?>
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 18bc03a57..cc1eaf1ed 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -236,8 +236,9 @@ div.content.users {
 }
 
 div.controls div.user-header {
-  border-bottom: 2px solid @colorPetrol;
-  margin-bottom: 1em;
+  h5 {
+    margin-bottom: 0.8em;
+  }
 
   .user-name {
     display: inline-block;
@@ -302,8 +303,9 @@ div.content.groups {
 }
 
 div.controls div.group-header {
-  border-bottom: 2px solid @colorPetrol;
-  margin-bottom: 1em;
+  h5 {
+    margin-bottom: 0.8em;
+  }
 
   .group-name {
     display: inline-block;

From bcc128255c8b1065a0f9152ae58cbc5914e39c8e Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 9 Jun 2015 10:37:36 +0200
Subject: [PATCH 2100/2920] Remove unused CSS

---
 public/css/icinga/main-content.less | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index cc1eaf1ed..6f15533cc 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -236,10 +236,6 @@ div.content.users {
 }
 
 div.controls div.user-header {
-  h5 {
-    margin-bottom: 0.8em;
-  }
-
   .user-name {
     display: inline-block;
     margin: 0 0 0.3em;
@@ -303,10 +299,6 @@ div.content.groups {
 }
 
 div.controls div.group-header {
-  h5 {
-    margin-bottom: 0.8em;
-  }
-
   .group-name {
     display: inline-block;
     margin: 0 0 0.3em;

From ad643e3aa5fe74d1f8ff3d2486e9f995d5d03801 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 9 Jun 2015 10:39:32 +0200
Subject: [PATCH 2101/2920] Improve the setup module's description

refs #7651
---
 modules/setup/module.info | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/setup/module.info b/modules/setup/module.info
index 0faa4ed0f..d874ef76c 100644
--- a/modules/setup/module.info
+++ b/modules/setup/module.info
@@ -1,4 +1,6 @@
 Module: setup
 Version: 2.0.0-rc1
 Description: Setup module
- Sets up Icinga Web 2.
+ Web based wizard for setting up Icinga Web 2 and its modules.
+ This includes the data backends (e.g. relational database, LDAP),
+ the authentication method, where to store the user preferences and much more.

From db816e4a5cbd51fa5e624d0ed36141df0f072216 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Jun 2015 12:48:15 +0200
Subject: [PATCH 2102/2920] ServicegroupsummaryQuery: Fix that the service
 severity is not being fetched

---
 .../Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php
index 76b004272..765ca7f7a 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php
@@ -83,7 +83,7 @@ class ServicegroupsummaryQuery extends IdoQuery
                 'servicegroup_alias',
                 'servicegroup_name',
                 'object_type',
-                'severity'      => 'host_severity',
+                'severity'      => new Zend_Db_Expr('NULL'),
                 'state'         => 'host_state',
                 'state_change'  => 'host_last_state_change'
             )
@@ -97,7 +97,7 @@ class ServicegroupsummaryQuery extends IdoQuery
                 'servicegroup_alias',
                 'servicegroup_name',
                 'object_type',
-                'severity'      => new Zend_Db_Expr('NULL'),
+                'severity'      => 'service_severity',
                 'state'         => 'service_state',
                 'state_change'  => 'service_last_state_change'
             )

From 922bbad476ef5223db066d3ff565c2500e7edfa8 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 8 Jun 2015 17:43:12 +0200
Subject: [PATCH 2103/2920] doc/about.md: add introduction

refs #9379
---
 doc/about.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/about.md b/doc/about.md
index 6074916ab..42cf1530f 100644
--- a/doc/about.md
+++ b/doc/about.md
@@ -1,5 +1,8 @@
 # <a id="about"></a> About Icinga Web 2
 
+Icinga Web 2 is a powerful PHP framework for web applications that comes in a clean and reduced design.
+It's fast, responsive, accessible and easily extensible with modules.
+
 ## <a id="about-installation"></a> Installation
 
 Icinga Web 2 can be installed easily from packages from the official package repositories.

From 5412c6d9721abc5c3f3c2519a79b42a398a7810e Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 8 Jun 2015 17:43:12 +0200
Subject: [PATCH 2104/2920] doc/about.md: add section `The monitoring module'

refs #9379
---
 doc/about.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/about.md b/doc/about.md
index 42cf1530f..46a0cf3c6 100644
--- a/doc/about.md
+++ b/doc/about.md
@@ -3,6 +3,17 @@
 Icinga Web 2 is a powerful PHP framework for web applications that comes in a clean and reduced design.
 It's fast, responsive, accessible and easily extensible with modules.
 
+## <a id="about-monitoring"></a> The monitoring module
+
+This is the core module for most Icinga Web 2 users.
+
+It provides an intuitive user interface for monitoring with Icinga (1 and 2).
+Especially there are lots of list and detail views (e.g. for hosts and services)
+you can sort and filter depending on what you want to see.
+
+You can also control the monitoring process itself by sending external commands to Icinga.
+Most such actions (like rescheduling a check) can be done with just a single click.
+
 ## <a id="about-installation"></a> Installation
 
 Icinga Web 2 can be installed easily from packages from the official package repositories.

From 260a33c88b3e0313b68073949bb673581b891222 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 9 Jun 2015 14:54:50 +0200
Subject: [PATCH 2105/2920] Add introduction to section `Configuration'

refs #9379
---
 doc/about.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/about.md b/doc/about.md
index 46a0cf3c6..2fbffe661 100644
--- a/doc/about.md
+++ b/doc/about.md
@@ -23,6 +23,8 @@ See [here](installation#installation) for more information about installation.
 
 ## <a id="about-configuration"></a> Configuration
 
+Icinga Web 2 can be configured via the user interface and the .ini files (in /etc/icingaweb2).
+
 See [here](configuration#configuration) for more information about configuration.
 
 ## <a id="about-authentication"></a> Authentication

From ee7c91235a9a19e711bb8e95bb1362bdadc4f47a Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 9 Jun 2015 14:54:50 +0200
Subject: [PATCH 2106/2920] Add introduction to section `Authentication'

refs #9379
---
 doc/about.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/about.md b/doc/about.md
index 2fbffe661..9fd471be6 100644
--- a/doc/about.md
+++ b/doc/about.md
@@ -29,7 +29,11 @@ See [here](configuration#configuration) for more information about configuration
 
 ## <a id="about-authentication"></a> Authentication
 
-See [here](authentication#authentication) for more information about authentication.
+With Icinga Web 2 you can authenticate against relational databases, LDAP and more.
+These authentication methods can be configured easily (via the corresponding .ini file).
+
+See [here](authentication#authentication) for more information about authentication
+and how to configure authentication methods.
 
 ## <a id="about-authorization"></a> Authorization
 

From b8debcd257c6b37f724de6561687fbc7bb4af2ea Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 9 Jun 2015 14:54:50 +0200
Subject: [PATCH 2107/2920] Add introduction to section `User preferences'

refs #9379
---
 doc/about.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/about.md b/doc/about.md
index 9fd471be6..2c9aa9aaf 100644
--- a/doc/about.md
+++ b/doc/about.md
@@ -41,7 +41,12 @@ See [here](security#security) for more information about authorization.
 
 ## <a id="about-preferences"></a> User preferences
 
-See [here](preferences#preferences) for more information about user preferences.
+Besides the global configuration (like data/authentication backends)
+each user has individual configuration options like the interface's language or the current timezone.
+They can be stored either in a database or in .ini files.
+
+See [here](preferences#preferences) for more information about user preferences
+and how to configure where to store them.
 
 ## <a id="about-documentation"></a> Documentation
 

From 10592bb7c8141a52a969715517edaa9c655dde09 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 9 Jun 2015 16:09:36 +0200
Subject: [PATCH 2108/2920] Add documentation for security configuration

Add a doc page to explain configuring user and group permissions and general user and group handling.

refs #9377
---
 doc/security.md | 211 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 211 insertions(+)
 create mode 100644 doc/security.md

diff --git a/doc/security.md b/doc/security.md
new file mode 100644
index 000000000..071161cbd
--- /dev/null
+++ b/doc/security.md
@@ -0,0 +1,211 @@
+# <a id="security"></a> Security
+
+In certain situations it is useful to allow someone access to IW2, but
+to prevent him from doing certain actions or from seeing specific objects.
+For example, it might be a good idea, to allow the configuration of IW2 to
+a certain group of administrators to prevent misconfiguration or security-breaches.
+Another important use case is the creation groups of users that can only see the
+fraction of hosts and services of the monitoring environment they are in charge of.
+
+The following chapter will describe how to do the security configuration of IW2
+and how apply permissions and restrictions to users or groups of users.
+
+## Basics
+
+IW2 has powerful tools to configure those restrictions for each **user** or **group**.
+There are two general kinds of objects whose access can be managed in IW2:
+**actions** and **objects**.
+
+### Actions
+
+Actions are all the things an IW2 user can do, like changing a certain configuration,
+changing permissions or sending a command to the Icinga2-Core through the (Command Pipe)[http://docs.icinga.org/icinga2/latest/doc/module/icinga2/toc#!/icinga2/latest/doc/module/icinga2/chapter/getting-started#setting-up-external-command-pipe]. in the monitoring module. All actions must be be **allowed explicitly** using permissions.
+
+### Objects
+
+There are all kinds of different objects in IW2, like Hosts, Services, Notifications and many more. **By default, a user can see all objects that are available in IW2**, but it is possible to define filters to restrict what each user can see.
+
+
+### Users
+
+Anyone that can **log into IW2** is considered a user and can be referenced to by the
+**login name**, independently of which mechanism was used to authenticate that user.
+For example, there might be user called **jdoe**, which is authenticated
+using Active Directory, and one user **icingaadmin**, that is authenticated using a MySQL-Database as backend, both users can be referenced to using their the login **icingaadmin** or **jdoe** in configuration.
+
+IW2 users and groups are not configured by an IW2 configuration file, but provided by
+an authentication backend. This means that how creating and deleting users works depends entirely on the backend. For extended information on setting up authentication backends, please read the chapter [authentication](authentication.md#authentication).
+
+**ATTENTION !**
+
+It is important to distinct between the "contacts" defined in the Icinga2-Core
+configuration and the "users" that can access IW2. In this guide and for
+handling security in IW2 in general only the latter ones are of importance.
+
+
+### Groups
+
+If there is a big amounts of users to manage, it would be tedious to specify each user
+separately when referring to a bigger group of users at once. For this reasons, it
+is possible to group users in groups.
+
+Like with users, groups are identified solely by their unique group name, and provided
+by different kind of backend called "group backends". This means, that how groups are defined depends entirely on the used group backend. For extended information on setting up group backends, please read the chapter [authentication](authentication.md#authentication).
+
+
+TODO: example
+
+## Roles
+
+A role defines a set of **permissions** and **restrictions** in IW2, and assigns
+those to users and user groups. For example, a role **admins** could define that certain
+users have access to all configuration options, or another role **support**
+could define that a list of users or groups is restricted to see only hosts and services
+that match a specific query.
+
+Roles can be assigned to groups and users. In the end, the actual permission of a certain user
+will be determined by the sum of all roles that are assigned to the user, or to
+groups the user is part of.
+
+
+### Configuration
+
+Roles can be changed either through the icingaweb2 interface, by navigation
+to the page **Configuration > Authentication > Roles**, or through editing
+configuration file:
+
+
+        /etc/icingaweb2/roles.ini
+
+
+### Example
+
+    [winadmin]
+    users = "johndoe, janedoe"  
+    groups = "admin"
+    permissions = "config/application/*, monitoring/commands/schedule-check"
+    monitoring/hosts/filter = "host=*win*"
+    monitoring/services/filter = "host=*win*"
+
+
+
+### Syntax
+
+Each role is defined as a section, with the name of the role as section name. The following
+attributes can be defined for each role:
+
+
+| Key         | Value                                                            |
+|-----------  |------------------------------------------------------------------|
+| users       | A comma-separated list of user **login names** that are affected by this role   |
+| groups      | A comma-separated list of **groups names** that are affected by this role  |
+| permissions | A comma-separated list of permissions granted by this role       |
+| module/monitoring/host | A filter expression applied to all hosts              |
+| module/monitoring/serivce |  A fuilter expression applied to all services      |
+
+
+### Permissions
+
+Permissions can be used to allow users or groups certain **actions**. By default,
+all actions are **prohibited** and must be allowed explicitly by a role for any user.
+
+Each action in IW2 is denoted by a **namespaced key**, which is used to order and
+group those actions. All actions that affect the configuration of IW2, are in a
+namespace called **config**, while all configurations that affect authentication
+are in the namespace **config/authentication**
+
+**Wildcards** can be used to grant permission for all actions in a certain namespace.
+The permission **config/* ** would grant permission to all configuration actions,
+while just specifying a wildcard ** * ** would give permission for all actions.
+
+When multiple roles assign permissions to the same user, either directly or indirectly
+through a group, all permissions will be combined to get the users actual permission set.
+
+###### Global permissions
+
+| Keys | Permits |
+|------|---------|
+| *    |  Everything, including module-specific permissions |
+| config/* | All configuration actions |
+| config/application/* | Configuring IcingaWeb2 |
+| config/application/general | General settings, like logging or preferences |
+| config/application/resources | Change resources for retrieving data |
+| config/application/userbackend | Change backends for retrieving available users |
+| config/application/usergroupbackend | Change backends for retrieving available groups |
+| config/authentication/* | Configure IcingaWeb2 authentication mechanisms |
+| config/authentication/users/* | All user actions |
+| config/authentication/users/show  | Display avilable users |
+| config/authentication/users/add | Add a new user to the backend |
+| config/authentication/users/edit | Edit existing user in the backend |
+| config/authentication/users/remove | Remove existing user from the backend |
+| config/authentication/groups/* | All group actions |
+| config/authentication/groups/show | Display available groups |
+| config/authentication/groups/add | Add a new group to the backend |
+| config/authentication/groups/edit | Edit existing group in a backend |
+| config/authentication/groups/remove | Remove existing group from the backend |
+| config/authentication/roles/* | All role actions |
+| config/authentication/roles/add | Add a new role |
+| config/authentication/roles/show | Display available roles |
+| config/authentication/roles/edit | Change an existing role |
+| config/authentication/roles/remove | Remove an existing row |
+| config/modules | Enable or disable modules and module settings |
+
+
+###### Monitoring module permissions
+
+| Keys | Permits |
+|------|---------|
+| monitoring/command/* | Allow all commands |
+| monitoring/command/schedule-check | Allow scheduling host and service checks' |
+| monitoring/command/acknowledge-problem | Allow acknowledging host and service problems |
+| monitoring/command/remove-acknowledgement | Allow removing problem acknowledgements |
+| monitoring/command/comment/* | Allow adding and deleting host and service comments |
+| monitoring/command/comment/add | Allow commenting on hosts and services |
+| monitoring/command/downtime/delete | Allow deleting host and service downtimes' |
+| monitoring/command/process-check-result | Allow processing host and service check results |
+| monitoring/command/feature/instance | Allow processing commands for toggling features on an instance-wide basis |
+| monitoring/command/feature/object | Allow processing commands for toggling features on host and service objects |
+| monitoring/command/send-custom-notification | Allow sending custom notifications for hosts and services |
+
+### Restrictions
+
+Restrictions can be used to define what a user or group can see, by specifying
+a filter expression. This filter expression will be **implicitly** added as an AND-Clause
+to the used filter expression.
+
+Any URL filter **?foo=bar&baz=bar** in IW2, would therefore implicitly
+become ** ?(foo=bar&baz=bar)&( $RESTRICTION_FILTER )**, depending on the users current restrictions.
+
+##### Filter Expressions
+
+Any filter expression that is allowed in
+
+
+###### Monitoring module filters
+
+Restrictions can apply to services, hosts or custom keys defined by any module.
+The monitoring module provides the following restrictions:
+
+| Keys | Filters |
+|------|---------|
+| monitoring/hosts/filter | Restrict hosts view to the hosts that match the filter |
+| monitoring/services/filter | Restrict services view to the services that match the filter |
+
+Restrictions on hosts or services will automatically apply to all notifications, events
+or downtimes that belong to those objects.
+
+** ATTENTION ! **
+
+Specifying a host filter will **not** automatically apply to all services on that host. If this behavior is desired, it is always necessary to filter the host for those services too.
+
+## Modules
+
+When creating IW2 modules, it might be necessary to define new actions that can be granted or revoked to certain users. One example for this, is the monitoring module, that is the heart of the monitoring functionality of IW2.
+
+## Troubleshooting
+
+Q: I cannot see the menu for changing roles in Icinga Web 2
+
+A: Your user lacks the permission to change the authentication configuration,
+   add a new role in roles.ini that gives your current user
+   the permission to access **config/authentication/* **

From 85b3eaa2e3a041a32274efcf791e1de83ec3faee Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 9 Jun 2015 14:54:50 +0200
Subject: [PATCH 2109/2920] Add introduction to section `Authorization'

refs #9379
---
 doc/about.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/about.md b/doc/about.md
index 2c9aa9aaf..1a0135d03 100644
--- a/doc/about.md
+++ b/doc/about.md
@@ -37,7 +37,12 @@ and how to configure authentication methods.
 
 ## <a id="about-authorization"></a> Authorization
 
-See [here](security#security) for more information about authorization.
+In Icinga Web 2 there are permissions and restrictions to allow and deny (respectively)
+roles to view or to do certain things.
+These roles can be assigned to users and groups.
+
+See [here](security#security) for more information about authorization
+and how to configure roles.
 
 ## <a id="about-preferences"></a> User preferences
 

From 7cf0b82b63bce18815157dab0bd477e3ec768c08 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Mon, 8 Jun 2015 17:43:12 +0200
Subject: [PATCH 2110/2920] doc/about.md: typos and grammar

refs #9379
---
 doc/about.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/about.md b/doc/about.md
index 1a0135d03..48b4041ac 100644
--- a/doc/about.md
+++ b/doc/about.md
@@ -19,21 +19,21 @@ Most such actions (like rescheduling a check) can be done with just a single cli
 Icinga Web 2 can be installed easily from packages from the official package repositories.
 Setting it up is also easy with the web based setup wizard.
 
-See [here](installation#installation) for more information about installation.
+See [here](installation#installation) for more information about the installation.
 
 ## <a id="about-configuration"></a> Configuration
 
-Icinga Web 2 can be configured via the user interface and the .ini files (in /etc/icingaweb2).
+Icinga Web 2 can be configured via the user interface and .ini files.
 
-See [here](configuration#configuration) for more information about configuration.
+See [here](configuration#configuration) for more information about the configuration.
 
 ## <a id="about-authentication"></a> Authentication
 
 With Icinga Web 2 you can authenticate against relational databases, LDAP and more.
-These authentication methods can be configured easily (via the corresponding .ini file).
+These authentication methods can be easily configured (via the corresponding .ini file).
 
-See [here](authentication#authentication) for more information about authentication
-and how to configure authentication methods.
+See [here](authentication#authentication) for more information about
+the different authentication methods available and how to configure them.
 
 ## <a id="about-authorization"></a> Authorization
 
@@ -46,12 +46,12 @@ and how to configure roles.
 
 ## <a id="about-preferences"></a> User preferences
 
-Besides the global configuration (like data/authentication backends)
-each user has individual configuration options like the interface's language or the current timezone.
+Besides the global configuration each user has individual configuration options
+like the interface's language or the current timezone.
 They can be stored either in a database or in .ini files.
 
-See [here](preferences#preferences) for more information about user preferences
-and how to configure where to store them.
+See [here](preferences#preferences) for more information about a user's preferences
+and how to configure their storage type.
 
 ## <a id="about-documentation"></a> Documentation
 
@@ -61,7 +61,7 @@ The module can also export the documentation to PDF.
 
 ## <a id="about-translation"></a> Translation
 
-With the translation module every piece of text in the user interface (of the framework itself and any module) can be translated to a language of your choise.
+With the translation module every piece of text in the user interface (of the framework itself and any module) can be translated to a language of your choice.
 
 Currently provided languages:
 

From 6f208e90b54ee2c31b8449cc484ba5e73911531c Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 9 Jun 2015 18:10:02 +0200
Subject: [PATCH 2111/2920] Improve restriction and filter sections

Add more examples and fix a few typos and minor issues in the doc.

refs #9377
---
 doc/security.md | 97 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 74 insertions(+), 23 deletions(-)

diff --git a/doc/security.md b/doc/security.md
index 071161cbd..6652813b2 100644
--- a/doc/security.md
+++ b/doc/security.md
@@ -12,14 +12,14 @@ and how apply permissions and restrictions to users or groups of users.
 
 ## Basics
 
-IW2 has powerful tools to configure those restrictions for each **user** or **group**.
+IW2 permissions are managed by defining **roles** that grant permissions or restrictions to **users** and **group**.
 There are two general kinds of objects whose access can be managed in IW2:
 **actions** and **objects**.
 
 ### Actions
 
 Actions are all the things an IW2 user can do, like changing a certain configuration,
-changing permissions or sending a command to the Icinga2-Core through the (Command Pipe)[http://docs.icinga.org/icinga2/latest/doc/module/icinga2/toc#!/icinga2/latest/doc/module/icinga2/chapter/getting-started#setting-up-external-command-pipe]. in the monitoring module. All actions must be be **allowed explicitly** using permissions.
+changing permissions or sending a command to the Icinga2-Core through the <a href="http://docs.icinga.org/icinga2/latest/doc/module/icinga2/toc#!/icinga2/latest/doc/module/icinga2/chapter/getting-started#setting-up-external-command-pipe">Command Pipe</a> in the monitoring module. All actions must be be **allowed explicitly** using permissions.
 
 ### Objects
 
@@ -28,7 +28,7 @@ There are all kinds of different objects in IW2, like Hosts, Services, Notificat
 
 ### Users
 
-Anyone that can **log into IW2** is considered a user and can be referenced to by the
+Anyone that can **login** to IW2 is considered a user and can be referenced to by the
 **login name**, independently of which mechanism was used to authenticate that user.
 For example, there might be user called **jdoe**, which is authenticated
 using Active Directory, and one user **icingaadmin**, that is authenticated using a MySQL-Database as backend, both users can be referenced to using their the login **icingaadmin** or **jdoe** in configuration.
@@ -49,8 +49,7 @@ If there is a big amounts of users to manage, it would be tedious to specify eac
 separately when referring to a bigger group of users at once. For this reasons, it
 is possible to group users in groups.
 
-Like with users, groups are identified solely by their unique group name, and provided
-by different kind of backend called "group backends". This means, that how groups are defined depends entirely on the used group backend. For extended information on setting up group backends, please read the chapter [authentication](authentication.md#authentication).
+Like with users, groups are identified solely by their **name**, and provided by backends called **group backends**. Like with users, it depends entirely on the used backend how groups are created and managed. For extended information on setting up group backends, please read the chapter [authentication](authentication.md#authentication).
 
 
 TODO: example
@@ -80,14 +79,19 @@ configuration file:
 
 ### Example
 
+
     [winadmin]
-    users = "johndoe, janedoe"  
+    users = "jdoe, janedoe"  
     groups = "admin"
     permissions = "config/application/*, monitoring/commands/schedule-check"
     monitoring/hosts/filter = "host=*win*"
     monitoring/services/filter = "host=*win*"
 
 
+This example creates a role called **winadmin**, that grants the permission **config/application/* ** and ** monitoring/commands/schedule-check ** and additonally only
+allows the hosts and services that match the filter ** host=\*win* ** to be displayed. The users
+**jdoe** and **janedoe** and all members of the group **admin** will be affected
+by this role.
 
 ### Syntax
 
@@ -167,40 +171,87 @@ through a group, all permissions will be combined to get the users actual permis
 | monitoring/command/feature/object | Allow processing commands for toggling features on host and service objects |
 | monitoring/command/send-custom-notification | Allow sending custom notifications for hosts and services |
 
+
+
 ### Restrictions
 
 Restrictions can be used to define what a user or group can see, by specifying
-a filter expression. This filter expression will be **implicitly** added as an AND-Clause
-to the used filter expression.
+a filter expression. By default, when no filter is defined, a user will be able
+to see every object available. When a filter is specified for a certain object type
+the user will only be able to see objects applied
 
-Any URL filter **?foo=bar&baz=bar** in IW2, would therefore implicitly
-become ** ?(foo=bar&baz=bar)&( $RESTRICTION_FILTER )**, depending on the users current restrictions.
+The filter expression will be **implicitly** added as an **AND-Clause**
+to each query. Any URL filter **?foo=bar&baz=bar** in IW2, would therefore implicitly
+become ** ?(foo=bar&baz=bar)&($FILTER)**, depending on the users current restrictions.
 
-##### Filter Expressions
-
-Any filter expression that is allowed in
+When multiple roles assign restrictions to the same user, either directly or indirectly
+through a group, all filters will be combined using an **AND-Clause**, resulting in the final
+expression ** ?(foo=bar&baz=bar)&$ FILTER1 & $FILTER2 & $FILTER3** appended to each query.
 
 
-###### Monitoring module filters
+##### Monitoring module filters
 
-Restrictions can apply to services, hosts or custom keys defined by any module.
-The monitoring module provides the following restrictions:
+The monitoring module provides **hosts** and **services** as filterable objects:
 
-| Keys | Filters |
-|------|---------|
-| monitoring/hosts/filter | Restrict hosts view to the hosts that match the filter |
-| monitoring/services/filter | Restrict services view to the services that match the filter |
 
-Restrictions on hosts or services will automatically apply to all notifications, events
+| Keys                       | Restricts                                        |
+|----------------------------|--------------------------------------------------|
+| monitoring/hosts/filter    | Only display **hosts** that match this filter    |
+| monitoring/services/filter | Only display **services** that match this filter |
+
+
+Filters on hosts or services will automatically apply to all notifications, events
 or downtimes that belong to those objects.
 
+
 ** ATTENTION ! **
 
-Specifying a host filter will **not** automatically apply to all services on that host. If this behavior is desired, it is always necessary to filter the host for those services too.
+Unlike with notifications or downtimes, a host filter will **not** automatically apply to all services on that host. If this behavior is desired, it is always necessary to add the
+filter expression to both, **services and hosts**.
+
+
+##### Filter Expressions
+
+Any filter expression that is allowed in the filtered view, is also an allowed filter expression.
+This means, that it is possible to define negations, wildcards, and even nested
+filter expressions containing AND and OR-Clauses.
+
+The following examples will show some examples for more complex filters:
+
+###### Example 1: Negation
+
+    [onlywin]
+    groups = "windows-admins"
+    monitoring/hosts/filter = "host=*win*"
+    monitoring/services/filter = "host=*win*"
+
+Will display only hosts and services whose hosts contains the **win**.
+
+    [nowin]
+    groups = "unix-admins"  
+    monitoring/hosts/filter = "host!=*win*"
+    monitoring/services/filter = "host!=*win*"
+
+Will only match hosts and services whose host does **not** contain **win**
+
+Also notice that if a user that is member of both groups, **windows-admins** and **unix-admins**,
+he wont be able to see any hosts, as both filters will be applied and remove any object from the query.
+
+
+###### Example 2: Hostgroups
+
+    [only-unix]
+    groups = "unix-admins"  
+    monitoring/hosts/filter = "(hostgroup_name=bsd-servers|hostgroup_name=linux-servers)"
+    monitoring/services/filter = "(hostgroup_name=bsd-servers|hostgroup_name=linux-servers)"
+
+
+This role allows all members of the group unix-admins to only see hosts and services
+that are part of the host-group linux-servers or the host-group bsd-servers.
 
 ## Modules
 
-When creating IW2 modules, it might be necessary to define new actions that can be granted or revoked to certain users. One example for this, is the monitoring module, that is the heart of the monitoring functionality of IW2.
+When creating IW2 modules, it might be necessary to define new actions that can be granted or revoked to certain users. One example for this, is the monitoring module, that is the heart of the monitoring functionality of IW2.while
 
 ## Troubleshooting
 

From fa75243f02239fd3ee78d69294b27563a30bee09 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 9 Jun 2015 18:16:36 +0200
Subject: [PATCH 2112/2920] RPM: call usermod w/ valid options on openSUSE

fixes #9378
---
 icingaweb2.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index c7aa4cb8d..84c3e0b13 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -201,7 +201,7 @@ cp -prv packages/files/config/modules/setup %{buildroot}/%{configdir}/modules/
 
 %pre
 getent group icingacmd >/dev/null || groupadd -r icingacmd
-%if 0%{?suse_version}
+%if 0%{?suse_version} && 0%{?suse_version} < 01200
 usermod -A icingacmd,%{icingawebgroup} %{wwwuser}
 %else
 usermod -a -G icingacmd,%{icingawebgroup} %{wwwuser}

From 41ee39d48ff6c12301b8790b9a4bf812b9e671da Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 10 Jun 2015 13:08:57 +0200
Subject: [PATCH 2113/2920] EventHistoryQuery: Do not fetch columns which only
 exist in one subquery

Uses the same technique as the NotificationhistoryQuery for the output.
---
 .../application/controllers/ListController.php    |  2 --
 .../views/scripts/list/eventhistory.phtml         | 11 +----------
 .../application/views/scripts/show/history.phtml  | 15 ++-------------
 .../Backend/Ido/Query/EventHistoryQuery.php       |  9 ++-------
 .../Backend/Ido/Query/StatehistoryQuery.php       |  5 +----
 .../library/Monitoring/Object/MonitoredObject.php |  2 --
 6 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 3254fcc12..9a6f986b1 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -575,8 +575,6 @@ class Monitoring_ListController extends Controller
             'object_type',
             'timestamp',
             'state',
-            'attempt',
-            'max_attempts',
             'output',
             'type'
         ));
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 491dee8ff..2aedcd59b 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -23,6 +23,7 @@ if (count($history) === 0) {
     <?php foreach ($history as $event): ?>
     <?php
       $icon = 'help';
+      $msg = $event->output;
       $title = $event->type;
       $stateName = 'invalid';
       $isService = isset($event->service_description);
@@ -30,54 +31,44 @@ if (count($history) === 0) {
         case 'notify':
           $icon = 'bell';
           $title = $this->translate('Notification');
-          $msg = $event->output;
           break;
         case 'comment':
           $icon = 'comment';
           $title = $this->translate('Comment');
-          $msg = $event->output;
           break;
         case 'ack':
           $icon = 'ok';
           $title = $this->translate('Acknowledgement');
-          $msg = $event->output;
           break;
         case 'dt_comment':
           $icon = 'plug';
           $title = $this->translate('In Downtime');
-          $msg = $event->output;
           break;
         case 'flapping':
           $icon = 'flapping';
           $title = $this->translate('Flapping');
-          $msg = $event->output;
           break;
         case 'flapping_deleted':
           $icon = 'ok';
           $title = $this->translate('Flapping Stopped');
-          $msg = $event->output;
           break;
         case 'hard_state':
           $icon = $isService ? 'service' : 'host';
-          $msg = '[ ' . $event->attempt . '/' . $event->max_attempts . ' ] ' . $event->output;
           $stateName = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
           $title = $isService ? Service::getStateText($event->state, true) : Host::getStateText($event->state, true);
           break;
         case 'soft_state':
           $icon = 'lightbulb';
-          $msg = '[ ' . $event->attempt . '/' . $event->max_attempts . ' ] ' . $event->output;
           $stateName = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
           $title = $isService ? Service::getStateText($event->state, true) : Host::getStateText($event->state, true);
           break;
         case 'dt_start':
           $icon = 'starttime';
           $title = $this->translate('Downtime Start');
-          $msg = $event->output;
           break;
         case 'dt_end':
           $icon = 'endtime';
           $title = $this->translate('Downtime End');
-          $msg = $event->output;
           break;
         }
       ?>
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index 3777d0384..0a0205e72 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -49,6 +49,7 @@ function contactsLink($match, $view) {
     <?php foreach ($history as $event): ?>
     <?php
       $stateClass = 'invalid';
+      $msg = $this->escape($event->output);
       $isService = isset($event->service_description);
       switch ($event->type) {
         case 'notify':
@@ -59,70 +60,58 @@ function contactsLink($match, $view) {
           $msg = preg_replace_callback(
               '/^\[([^\]]+)\]/',
               function($match) use ($self) { return contactsLink($match, $self); },
-              $this->escape($event->output)
+              $msg
           );
           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;
       }
     ?>
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index 0c77e82a6..01652b070 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
@@ -37,9 +37,7 @@ class EventHistoryQuery extends IdoQuery
             'object_type'           => 'eh.object_type',
             'timestamp'             => 'eh.timestamp',
             'state'                 => 'eh.state',
-            'attempt'               => 'eh.attempt',
-            'max_attempts'          => 'eh.max_attempts',
-            'output'                => 'eh.output', // we do not want long_output
+            'output'                => 'eh.output',
             'type'                  => 'eh.type'
         ),
         'hostgroups' => array(
@@ -70,10 +68,7 @@ class EventHistoryQuery extends IdoQuery
             'type',
             'output',
             'state',
-            'state_type',
-            'object_type',
-            'attempt',
-            'max_attempts',
+            'object_type'
         );
         $this->subQueries = array(
             $this->createSubQuery('Statehistory', $columns),
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
index ff3c1055a..cf0740315 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
@@ -18,10 +18,7 @@ class StatehistoryQuery extends IdoQuery
             'object_id'             => 'sho.object_id',
             'type'                  => "(CASE WHEN sh.state_type = 1 THEN 'hard_state' ELSE 'soft_state' END)",
             'state'                 => 'sh.state',
-            'state_type'            => 'sh.state_type',
-            'output'                => 'sh.output',
-            'attempt'               => 'sh.current_check_attempt',
-            'max_attempts'          => 'sh.max_check_attempts',
+            'output'                => "('[ ' || sh.current_check_attempt || '/' || sh.max_check_attempts || ' ] ' || sh.output)",
 
             'host'                  => 'sho.name1 COLLATE latin1_general_ci',
             'service'               => 'sho.name2 COLLATE latin1_general_ci',
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 81fe6c069..fc4ad7e32 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -457,8 +457,6 @@ abstract class MonitoredObject implements Filterable
                 'service_display_name',
                 'timestamp',
                 'state',
-                'attempt',
-                'max_attempts',
                 'output',
                 'type'
         ))

From 51a3213fcaa06d6c1d86c2a68a4769b349282ae0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 10 Jun 2015 13:10:28 +0200
Subject: [PATCH 2114/2920] NotificationQuery: Add support for history related
 queries

refs #9009
---
 .../Ido/Query/HostnotificationQuery.php       | 54 +++++++++++++++++--
 .../Backend/Ido/Query/NotificationQuery.php   | 31 +++++++++++
 .../Ido/Query/ServicenotificationQuery.php    | 52 +++++++++++++++++-
 3 files changed, 132 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
index 86930e12e..631f5974b 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
@@ -26,6 +26,13 @@ class HostnotificationQuery extends IdoQuery
             'host_name'                 => 'ho.name1',
             'object_type'               => '(\'host\')'
         ),
+        'history' => array(
+            'type'      => "('notify')",
+            'timestamp' => 'UNIX_TIMESTAMP(hn.start_time)',
+            'object_id' => 'hn.object_id',
+            'state'     => 'hn.state',
+            'output'    => null
+        ),
         'contactnotifications' => array(
             'contact'                   => 'cno.name1 COLLATE latin1_general_ci',
             'notification_contact_name' => 'cno.name1',
@@ -63,6 +70,31 @@ class HostnotificationQuery extends IdoQuery
      */
     protected function joinBaseTables()
     {
+        switch ($this->ds->getDbType()) {
+            case 'mysql':
+                $concattedContacts = "GROUP_CONCAT("
+                    . "cno.name1 ORDER BY cno.name1 SEPARATOR ', '"
+                    . ") COLLATE latin1_general_ci";
+                break;
+            case 'pgsql':
+                // TODO: Find a way to order the contact alias list:
+                $concattedContacts = "ARRAY_TO_STRING(ARRAY_AGG(cno.name1), ', ')";
+                break;
+            case 'oracle':
+                // TODO: This is only valid for Oracle >= 11g Release 2
+                $concattedContacts = "LISTAGG(cno.name1, ', ') WITHIN GROUP (ORDER BY cno.name1)";
+                // Alternatives:
+                //
+                //   RTRIM(XMLAGG(XMLELEMENT(e, column_name, ',').EXTRACT('//text()')),
+                //
+                //   not supported and not documented but works since 10.1,
+                //   however it is NOT always present:
+                //   WM_CONCAT(c.alias)
+                break;
+        }
+
+        $this->columnMap['history']['output'] = "('[' || $concattedContacts || '] ' || hn.output)";
+
         $this->select->from(
             array('hn' => $this->prefix . 'notifications'),
             array()
@@ -80,6 +112,15 @@ class HostnotificationQuery extends IdoQuery
         $this->joinedVirtualTables['notifications'] = true;
     }
 
+    /**
+     * Join virtual table history
+     */
+    protected function joinHistory()
+    {
+        $this->requireVirtualTable('contactnotifications');
+        $this->group(array('hn.notification_id', 'ho.name1'));
+    }
+
     /**
      * Join contact notifications
      */
@@ -95,6 +136,7 @@ class HostnotificationQuery extends IdoQuery
             'cno.object_id = cn.contact_object_id',
             array()
         );
+        $this->group(array('cn.contactnotification_id', 'ho.name1'));
     }
 
     /**
@@ -134,7 +176,10 @@ class HostnotificationQuery extends IdoQuery
             'hgo.objecttype_id = ?',
             3
         );
-        $this->group(array('hn.notification_id', 'ho.name1'));
+
+        if (! $this->hasJoinedVirtualTable('contactnotifications')) {
+            $this->group(array('hn.notification_id', 'ho.name1'));
+        }
     }
 
     /**
@@ -184,7 +229,7 @@ class HostnotificationQuery extends IdoQuery
     {
         $this->select->join(
             array('s' => $this->prefix . 'services'),
-            's.host_object_id = h.host_object_id',
+            's.host_object_id = ho.object_id',
             array()
         )->join(
             array('so' => $this->prefix . 'objects'),
@@ -198,6 +243,9 @@ class HostnotificationQuery extends IdoQuery
             'so.objecttype_id = ?',
             2
         );
-        $this->group(array('hn.notification_id', 'ho.name1'));
+
+        if (! $this->hasJoinedVirtualTable('contactnotifications')) {
+            $this->group(array('hn.notification_id', 'ho.name1'));
+        }
     }
 }
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index f898c8699..135875d07 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -27,6 +27,13 @@ class NotificationQuery extends IdoQuery
             'acknowledgement_comment_data'  => 'n.acknowledgement_comment_data',
             'object_type'                   => 'n.object_type'
         ),
+        'history' => array(
+            'type'      => 'n.type',
+            'timestamp' => 'n.timestamp',
+            'object_id' => 'n.object_id',
+            'state'     => 'n.state',
+            'output'    => 'n.output'
+        ),
         'hosts' => array(
             'host_display_name' => 'n.host_display_name',
             'host_name'         => 'n.host_name'
@@ -52,6 +59,13 @@ class NotificationQuery extends IdoQuery
      */
     protected $subQueries = array();
 
+    /**
+     * Whether to additionally select all history columns
+     *
+     * @var bool
+     */
+    protected $fetchHistoryColumns = false;
+
     /**
      * {@inheritdoc}
      */
@@ -65,6 +79,17 @@ class NotificationQuery extends IdoQuery
         $this->joinedVirtualTables['notifications'] = true;
     }
 
+    /**
+     * Join history related columns and tables
+     */
+    protected function joinHistory()
+    {
+        // TODO: Ensure that one is selecting the history columns first...
+        $this->fetchHistoryColumns = true;
+        $this->requireVirtualTable('hosts');
+        $this->requireVirtualTable('services');
+    }
+
     /**
      * Join hosts
      */
@@ -73,6 +98,9 @@ class NotificationQuery extends IdoQuery
         $columns = array_keys(
             $this->columnMap['notifications'] + $this->columnMap['hosts'] + $this->columnMap['services']
         );
+        if ($this->fetchHistoryColumns) {
+            $columns = array_merge($columns, array_keys($this->columnMap['history']));
+        }
         $hosts = $this->createSubQuery('hostnotification', $columns);
         $this->subQueries[] = $hosts;
         $this->notificationQuery->union(array($hosts), Zend_Db_Select::SQL_UNION_ALL);
@@ -86,6 +114,9 @@ class NotificationQuery extends IdoQuery
         $columns = array_keys(
             $this->columnMap['notifications'] + $this->columnMap['hosts'] + $this->columnMap['services']
         );
+        if ($this->fetchHistoryColumns) {
+            $columns = array_merge($columns, array_keys($this->columnMap['history']));
+        }
         $services = $this->createSubQuery('servicenotification', $columns);
         $this->subQueries[] = $services;
         $this->notificationQuery->union(array($services), Zend_Db_Select::SQL_UNION_ALL);
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
index aaf3d57bc..3341a6e61 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
@@ -30,6 +30,13 @@ class ServicenotificationQuery extends IdoQuery
             'service_host'              => 'so.name1 COLLATE latin1_general_ci',
             'service_host_name'         => 'so.name1'
         ),
+        'history' => array(
+            'type'      => "('notify')",
+            'timestamp' => 'UNIX_TIMESTAMP(sn.start_time)',
+            'object_id' => 'sn.object_id',
+            'state'     => 'sn.state',
+            'output'    => null
+        ),
         'contactnotifications' => array(
             'contact'                   => 'cno.name1 COLLATE latin1_general_ci',
             'notification_contact_name' => 'cno.name1',
@@ -64,6 +71,31 @@ class ServicenotificationQuery extends IdoQuery
      */
     protected function joinBaseTables()
     {
+        switch ($this->ds->getDbType()) {
+            case 'mysql':
+                $concattedContacts = "GROUP_CONCAT("
+                    . "cno.name1 ORDER BY cno.name1 SEPARATOR ', '"
+                    . ") COLLATE latin1_general_ci";
+                break;
+            case 'pgsql':
+                // TODO: Find a way to order the contact alias list:
+                $concattedContacts = "ARRAY_TO_STRING(ARRAY_AGG(cno.name1), ', ')";
+                break;
+            case 'oracle':
+                // TODO: This is only valid for Oracle >= 11g Release 2
+                $concattedContacts = "LISTAGG(cno.name1, ', ') WITHIN GROUP (ORDER BY cno.name1)";
+                // Alternatives:
+                //
+                //   RTRIM(XMLAGG(XMLELEMENT(e, column_name, ',').EXTRACT('//text()')),
+                //
+                //   not supported and not documented but works since 10.1,
+                //   however it is NOT always present:
+                //   WM_CONCAT(c.alias)
+                break;
+        }
+
+        $this->columnMap['history']['output'] = "('[' || $concattedContacts || '] ' || sn.output)";
+
         $this->select->from(
             array('sn' => $this->prefix . 'notifications'),
             array()
@@ -81,6 +113,15 @@ class ServicenotificationQuery extends IdoQuery
         $this->joinedVirtualTables['notifications'] = true;
     }
 
+    /**
+     * Join virtual table history
+     */
+    protected function joinHistory()
+    {
+        $this->requireVirtualTable('contactnotifications');
+        $this->group(array('sn.notification_id', 'so.name2', 'so.name1'));
+    }
+
     /**
      * Join contact notifications
      */
@@ -96,6 +137,7 @@ class ServicenotificationQuery extends IdoQuery
             'cno.object_id = cn.contact_object_id',
             array()
         );
+        $this->group(array('cn.contactnotification_id', 'so.name2', 'so.name1'));
     }
 
     /**
@@ -136,7 +178,6 @@ class ServicenotificationQuery extends IdoQuery
             'hgo.objecttype_id = ?',
             3
         );
-        $this->group(array('sn.notification_id', 'so.name2', 'so.name1'));
     }
 
     /**
@@ -177,7 +218,10 @@ class ServicenotificationQuery extends IdoQuery
             'sgo.objecttype_id = ?',
             4
         );
-        $this->group(array('sn.notification_id', 'so.name2', 'so.name1'));
+
+        if (! $this->hasJoinedVirtualTable('contactnotifications')) {
+            $this->group(array('sn.notification_id', 'so.name2', 'so.name1'));
+        }
     }
 
     /**
@@ -190,5 +234,9 @@ class ServicenotificationQuery extends IdoQuery
             's.service_object_id = so.object_id',
             array()
         );
+
+        if (! $this->hasJoinedVirtualTable('contactnotifications')) {
+            $this->group(array('sn.notification_id', 'so.name2', 'so.name1'));
+        }
     }
 }

From e764bfb95dc540ec41bde6a779e6c652e1cf88e8 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 10 Jun 2015 14:29:44 +0200
Subject: [PATCH 2115/2920] Repair command links

fixes #9392
---
 .../views/scripts/show/components/notifications.phtml         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/notifications.phtml b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
index 5fea60cc1..9a9195862 100644
--- a/modules/monitoring/application/views/scripts/show/components/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/notifications.phtml
@@ -9,7 +9,7 @@
                 echo $this->qlink(
                     $this->translate('Send notification'),
                     'monitoring/host/send-custom-notification',
-                    array('host_name' => $object->getName()),
+                    array('host' => $object->getName()),
                     array(
                         'icon'              => 'bell',
                         'data-base-target'  => '_self',
@@ -23,7 +23,7 @@
                 echo $this->qlink(
                     $this->translate('Send notification'),
                     'monitoring/service/send-custom-notification',
-                    array('host_name' => $object->getHost()->getName(), 'service_description' => $object->getName()),
+                    array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
                     array(
                         'icon'              => 'bell',
                         'data-base-target'  => '_self',

From 0ccb765954265d9b27a98db41c9ba768e9b3601a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 10 Jun 2015 17:01:46 +0200
Subject: [PATCH 2116/2920] HostnotificationQuery: Fix grouping when *all*
 tables are being joined

refs #9009
---
 .../Backend/Ido/Query/HostnotificationQuery.php           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
index 631f5974b..b47463bcd 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
@@ -73,12 +73,12 @@ class HostnotificationQuery extends IdoQuery
         switch ($this->ds->getDbType()) {
             case 'mysql':
                 $concattedContacts = "GROUP_CONCAT("
-                    . "cno.name1 ORDER BY cno.name1 SEPARATOR ', '"
+                    . "DISTINCT cno.name1 ORDER BY cno.name1 SEPARATOR ', '"
                     . ") COLLATE latin1_general_ci";
                 break;
             case 'pgsql':
                 // TODO: Find a way to order the contact alias list:
-                $concattedContacts = "ARRAY_TO_STRING(ARRAY_AGG(cno.name1), ', ')";
+                $concattedContacts = "ARRAY_TO_STRING(ARRAY_AGG(DISTINCT cno.name1), ', ')";
                 break;
             case 'oracle':
                 // TODO: This is only valid for Oracle >= 11g Release 2
@@ -177,7 +177,7 @@ class HostnotificationQuery extends IdoQuery
             3
         );
 
-        if (! $this->hasJoinedVirtualTable('contactnotifications')) {
+        if (! $this->hasJoinedVirtualTable('contactnotifications') && !$this->hasJoinedVirtualTable('history')) {
             $this->group(array('hn.notification_id', 'ho.name1'));
         }
     }
@@ -244,7 +244,7 @@ class HostnotificationQuery extends IdoQuery
             2
         );
 
-        if (! $this->hasJoinedVirtualTable('contactnotifications')) {
+        if (! $this->hasJoinedVirtualTable('contactnotifications') && !$this->hasJoinedVirtualTable('history')) {
             $this->group(array('hn.notification_id', 'ho.name1'));
         }
     }

From 5ad93d138ca14323d4a27a0c1602b935a536833a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 10 Jun 2015 17:01:58 +0200
Subject: [PATCH 2117/2920] ServicenotificationQuery: Fix grouping when *all*
 tables are being joined

refs #9009
---
 .../Backend/Ido/Query/ServicenotificationQuery.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
index 3341a6e61..a6d6a4a26 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
@@ -74,12 +74,12 @@ class ServicenotificationQuery extends IdoQuery
         switch ($this->ds->getDbType()) {
             case 'mysql':
                 $concattedContacts = "GROUP_CONCAT("
-                    . "cno.name1 ORDER BY cno.name1 SEPARATOR ', '"
+                    . "DISTINCT cno.name1 ORDER BY cno.name1 SEPARATOR ', '"
                     . ") COLLATE latin1_general_ci";
                 break;
             case 'pgsql':
                 // TODO: Find a way to order the contact alias list:
-                $concattedContacts = "ARRAY_TO_STRING(ARRAY_AGG(cno.name1), ', ')";
+                $concattedContacts = "ARRAY_TO_STRING(ARRAY_AGG(DISTINCT cno.name1), ', ')";
                 break;
             case 'oracle':
                 // TODO: This is only valid for Oracle >= 11g Release 2
@@ -178,6 +178,10 @@ class ServicenotificationQuery extends IdoQuery
             'hgo.objecttype_id = ?',
             3
         );
+
+        if (! $this->hasJoinedVirtualTable('contactnotifications') && !$this->hasJoinedVirtualTable('history')) {
+            $this->group(array('sn.notification_id', 'so.name2', 'so.name1'));
+        }
     }
 
     /**
@@ -219,7 +223,7 @@ class ServicenotificationQuery extends IdoQuery
             4
         );
 
-        if (! $this->hasJoinedVirtualTable('contactnotifications')) {
+        if (! $this->hasJoinedVirtualTable('contactnotifications') && !$this->hasJoinedVirtualTable('history')) {
             $this->group(array('sn.notification_id', 'so.name2', 'so.name1'));
         }
     }
@@ -234,9 +238,5 @@ class ServicenotificationQuery extends IdoQuery
             's.service_object_id = so.object_id',
             array()
         );
-
-        if (! $this->hasJoinedVirtualTable('contactnotifications')) {
-            $this->group(array('sn.notification_id', 'so.name2', 'so.name1'));
-        }
     }
 }

From b235bb69823ff435da5a75353029e26352910208 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 10 Jun 2015 17:04:00 +0200
Subject: [PATCH 2118/2920] NotificationQuery: Select placeholder values when
 joining hosts, again

I've missed that our notification list-view detects based on a attribute's
value of which type a returned row is...

refs #9009
---
 .../Monitoring/Backend/Ido/Query/NotificationQuery.php      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index 135875d07..b13a338b0 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
+use Zend_Db_Expr;
 use Zend_Db_Select;
 use Icinga\Data\Filter\Filter;
 
@@ -96,8 +97,11 @@ class NotificationQuery extends IdoQuery
     protected function joinHosts()
     {
         $columns = array_keys(
-            $this->columnMap['notifications'] + $this->columnMap['hosts'] + $this->columnMap['services']
+            $this->columnMap['notifications'] + $this->columnMap['hosts']
         );
+        foreach ($this->columnMap['services'] as $column => $_) {
+            $columns[$column] = new Zend_Db_Expr('NULL');
+        }
         if ($this->fetchHistoryColumns) {
             $columns = array_merge($columns, array_keys($this->columnMap['history']));
         }

From 392047b2eeba64eab151f378accc510310bb521f Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 10 Jun 2015 17:19:49 +0200
Subject: [PATCH 2119/2920] Add support for command line arguments in the
 format --arg=<value>

refs #8472
---
 library/Icinga/Cli/Params.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Cli/Params.php b/library/Icinga/Cli/Params.php
index 9e30cf19e..85d5cd26f 100644
--- a/library/Icinga/Cli/Params.php
+++ b/library/Icinga/Cli/Params.php
@@ -47,7 +47,12 @@ class Params
                 $noOptionFlag = true;
             } elseif (!$noOptionFlag && substr($argv[$i], 0, 2) === '--') {
                 $key = substr($argv[$i], 2);
-                if (! isset($argv[$i + 1]) || substr($argv[$i + 1], 0, 2) === '--') {
+                $matches = array();
+                if (1 === preg_match(
+                    '/(?<!.)([^=]+)=(.*)(?!.)/ms', $key, $matches
+                )) {
+                    $this->params[$matches[1]] = $matches[2];
+                } elseif (! isset($argv[$i + 1]) || substr($argv[$i + 1], 0, 2) === '--') {
                     $this->params[$key] = true;
                 } elseif (array_key_exists($key, $this->params)) {
                     if (!is_array($this->params[$key])) {

From 98b2699e354fe32c38d091b63b5ea2c14b9e27a5 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 10 Jun 2015 17:20:27 +0200
Subject: [PATCH 2120/2920] Documentation: use command line arguments in the
 format --arg=<value>

refs #8472
---
 .../application/clicommands/ConferenceCommand.php      |  2 +-
 .../monitoring/application/clicommands/ListCommand.php | 10 +++++-----
 .../monitoring/application/clicommands/NrpeCommand.php |  4 ++--
 .../setup/application/clicommands/ConfigCommand.php    |  8 ++++----
 modules/test/application/clicommands/PhpCommand.php    |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/monitoring/application/clicommands/ConferenceCommand.php b/modules/monitoring/application/clicommands/ConferenceCommand.php
index c7c7f1292..d0062b1a9 100644
--- a/modules/monitoring/application/clicommands/ConferenceCommand.php
+++ b/modules/monitoring/application/clicommands/ConferenceCommand.php
@@ -20,7 +20,7 @@ class ConferenceCommand extends Command
      * Use this command in case you feel that you should be friendly. Should
      * be executed as follows:
      *
-     * icingacli monitoring conference welcome --watch 1
+     * icingacli monitoring conference welcome --watch=1
      */
     public function welcomeAction()
     {
diff --git a/modules/monitoring/application/clicommands/ListCommand.php b/modules/monitoring/application/clicommands/ListCommand.php
index 9fd892652..d9ecb0c9a 100644
--- a/modules/monitoring/application/clicommands/ListCommand.php
+++ b/modules/monitoring/application/clicommands/ListCommand.php
@@ -124,19 +124,19 @@ class ListCommand extends Command
      *   --verbose  Show detailled output
      *   --showsql  Dump generated SQL query (DB backend only)
      *
-     *   --format <csv|json|<custom>>
+     *   --format=<csv|json|<custom>>
      *     Dump columns in the given format. <custom> format allows $column$
-     *     placeholders, e.g. --format '$host$: $service$'
+     *     placeholders, e.g. --format='$host$: $service$'
      *
-     *   --<column> [filter]
+     *   --<column>[=filter]
      *     Filter given column by optional filter. Boolean (1/0) columns are
      *     true if no filter value is given.
      *
      * EXAMPLES
      *
      *   icingacli monitoring list --unhandled
-     *   icingacli monitoring list --host local* --service *disk*
-     *   icingacli monitoring list --format '$host$: $service$'
+     *   icingacli monitoring list --host=local* --service=*disk*
+     *   icingacli monitoring list --format='$host$: $service$'
      */
     public function statusAction()
     {
diff --git a/modules/monitoring/application/clicommands/NrpeCommand.php b/modules/monitoring/application/clicommands/NrpeCommand.php
index 190cdbe85..abb877553 100644
--- a/modules/monitoring/application/clicommands/NrpeCommand.php
+++ b/modules/monitoring/application/clicommands/NrpeCommand.php
@@ -27,8 +27,8 @@ class NrpeCommand extends Command
      *
      * EXAMPLE
      *
-     * icingacli monitoring nrpe 127.0.0.1 CheckMEM --ssl --MaxWarn 80% \
-     *   --MaxCrit 90% --type physical
+     * icingacli monitoring nrpe 127.0.0.1 CheckMEM --ssl --MaxWarn=80% \
+     *   --MaxCrit=90% --type=physical
      */
     public function checkAction()
     {
diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index eb5aaca83..a4a5da12e 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -29,7 +29,7 @@ class ConfigCommand extends Command
      *
      *  icingacli setup config directory
      *
-     *  icingacli setup config directory --mode 2775 --config /opt/icingaweb2/etc
+     *  icingacli setup config directory --mode=2775 --config=/opt/icingaweb2/etc
      */
     public function directoryAction()
     {
@@ -96,7 +96,7 @@ class ConfigCommand extends Command
      *
      *  --path=<urlpath>                    The URL path to Icinga Web 2 [/icingaweb2]
      *
-     *  --root/--document-root=<directory>  The directory from which the webserver will serve files [/path/to/icingaweb2/public]
+     *  --root|--document-root=<directory>  The directory from which the webserver will serve files [/path/to/icingaweb2/public]
      *
      *  --config=<directory>                Path to Icinga Web 2's configuration files [/etc/icingaweb2]
      *
@@ -106,9 +106,9 @@ class ConfigCommand extends Command
      *
      *  icingacli setup config webserver apache
      *
-     *  icingacli setup config webserver apache --path /icingaweb2 --document-root /usr/share/icingaweb2/public --config=/etc/icingaweb2
+     *  icingacli setup config webserver apache --path=/icingaweb2 --document-root=/usr/share/icingaweb2/public --config=/etc/icingaweb2
      *
-     *  icingacli setup config webserver apache --file /etc/apache2/conf.d/icingaweb2.conf
+     *  icingacli setup config webserver apache --file=/etc/apache2/conf.d/icingaweb2.conf
      *
      *  icingacli setup config webserver nginx
      */
diff --git a/modules/test/application/clicommands/PhpCommand.php b/modules/test/application/clicommands/PhpCommand.php
index c84000f70..59a79e0a1 100644
--- a/modules/test/application/clicommands/PhpCommand.php
+++ b/modules/test/application/clicommands/PhpCommand.php
@@ -41,7 +41,7 @@ class PhpCommand extends Command
      *
      *   icingacli test php unit --verbose
      *   icingacli test php unit --build
-     *   icingacli test php unit --include *SpecialTest
+     *   icingacli test php unit --include=*SpecialTest
      */
     public function unitAction()
     {
@@ -109,8 +109,8 @@ class PhpCommand extends Command
      *
      *   icingacli test php style --verbose
      *   icingacli test php style --build
-     *   icingacli test php style --include path/to/your/file
-     *   icingacli test php style --exclude *someFile* --exclude someOtherFile*
+     *   icingacli test php style --include=path/to/your/file
+     *   icingacli test php style --exclude=*someFile* --exclude=someOtherFile*
      */
     public function styleAction()
     {

From a9ea6a7c9a83116671b52176c17d144ffac1de13 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 10 Jun 2015 17:50:37 +0200
Subject: [PATCH 2121/2920] Don't use non-existent Format::timeSince()

fixes #9400
---
 modules/monitoring/application/clicommands/ListCommand.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/clicommands/ListCommand.php b/modules/monitoring/application/clicommands/ListCommand.php
index d9ecb0c9a..59a98ddf2 100644
--- a/modules/monitoring/application/clicommands/ListCommand.php
+++ b/modules/monitoring/application/clicommands/ListCommand.php
@@ -5,7 +5,7 @@ namespace Icinga\Module\Monitoring\Clicommands;
 
 use Icinga\Module\Monitoring\Backend;
 use Icinga\Module\Monitoring\Cli\CliUtils;
-use Icinga\Util\Format;
+use Icinga\Date\DateFormatter;
 use Icinga\Cli\Command;
 use Icinga\File\Csv;
 use Icinga\Module\Monitoring\Plugin\PerfdataSet;
@@ -299,7 +299,7 @@ class ListCommand extends Command
                 $leaf,
                 $screen->underline($row->service_description),
                 $screen->colorize($utils->objectStateFlags('service', $row) . $perf, 'lightblue'),
-                ucfirst(Format::timeSince($row->service_last_state_change))
+                ucfirst(DateFormatter::timeSince($row->service_last_state_change))
             );
             if ($this->isVerbose) {
                 $out .= $emptyLine . preg_replace(

From edd1c2a1f3038fc03cc39783f9bc51cde3964f2c Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 10 Jun 2015 18:43:54 +0200
Subject: [PATCH 2122/2920] Move monitoring permission documentation into a
 separate module

refs #9377
---
 doc/security.md             | 326 ++++++++++++++++++++----------------
 modules/doc/doc/security.md |  65 +++++++
 2 files changed, 242 insertions(+), 149 deletions(-)
 create mode 100644 modules/doc/doc/security.md

diff --git a/doc/security.md b/doc/security.md
index 6652813b2..1b61f8ab3 100644
--- a/doc/security.md
+++ b/doc/security.md
@@ -1,258 +1,286 @@
 # <a id="security"></a> Security
 
-In certain situations it is useful to allow someone access to IW2, but
-to prevent him from doing certain actions or from seeing specific objects.
-For example, it might be a good idea, to allow the configuration of IW2 to
-a certain group of administrators to prevent misconfiguration or security-breaches.
-Another important use case is the creation groups of users that can only see the
-fraction of hosts and services of the monitoring environment they are in charge of.
+Access control is a vital part of configuring Icinga Web 2 in a secure way.
+It is important that not every user that has access to Icinga Web 2 is able
+to do any action or see any host and service. For example, it is useful to allow
+only a small group of administrators to change the Icinga Web 2 configuration, to prevent misconfiguration or security breaches. Another important use case is the creation groups of
+users that can only see the fraction of hosts and services of the monitoring
+ environment they are in charge of.
 
-The following chapter will describe how to do the security configuration of IW2
+This chapter will describe how to do the security configuration of Icinga Web 2
 and how apply permissions and restrictions to users or groups of users.
 
 ## Basics
 
-IW2 permissions are managed by defining **roles** that grant permissions or restrictions to **users** and **group**.
-There are two general kinds of objects whose access can be managed in IW2:
-**actions** and **objects**.
+Icinga Web 2 access control is done by defining **roles** that relate permissions or restrictions to **users** and **group**.
+There are two general kinds of things to which access can be managed: actions and objects.
+
 
 ### Actions
 
-Actions are all the things an IW2 user can do, like changing a certain configuration,
-changing permissions or sending a command to the Icinga2-Core through the <a href="http://docs.icinga.org/icinga2/latest/doc/module/icinga2/toc#!/icinga2/latest/doc/module/icinga2/chapter/getting-started#setting-up-external-command-pipe">Command Pipe</a> in the monitoring module. All actions must be be **allowed explicitly** using permissions.
+Actions are all the things an Icinga Web 2 user can do, like changing a certain configuration,
+changing permissions or sending a command to the Icinga instance through the <a href="http://docs.icinga.org/icinga2/latest/doc/module/icinga2/toc#!/icinga2/latest/doc/module/icinga2/chapter/getting-started#setting-up-external-command-pipe">Command Pipe</a> in the monitoring module. All actions must be be **allowed explicitly** using permissions.
+
+A permission is a simple list of identifiers of actions a user is
+allowed to do. Permissions are described in greater detail in the
+section [Permissions](#permissions).
 
 ### Objects
 
-There are all kinds of different objects in IW2, like Hosts, Services, Notifications and many more. **By default, a user can see all objects that are available in IW2**, but it is possible to define filters to restrict what each user can see.
+There are all kinds of different objects in Icinga Web 2: Hosts, Services, Notifications, Downtimes and Events.
 
+By default, a user can **see everything**, but it is possible to **explicitly restrict** what each user can see using Restrictions.
+
+Restrictions are complex filter queries that describe what objects should be displayed to a user. Restrictions are described
+in greater detail in the section [Restrictions](#restrictions).
 
 ### Users
 
-Anyone that can **login** to IW2 is considered a user and can be referenced to by the
-**login name**, independently of which mechanism was used to authenticate that user.
-For example, there might be user called **jdoe**, which is authenticated
-using Active Directory, and one user **icingaadmin**, that is authenticated using a MySQL-Database as backend, both users can be referenced to using their the login **icingaadmin** or **jdoe** in configuration.
+Anyone who can **login** to Icinga Web 2 is considered a user and can be referenced to by the
+**user name** used during login.
+For example, there might be user called **jdoe** authenticated
+using Active Directory, and a user **icingaadmin** that is authenticated using a MySQL-Database as backend. Both can be referenced by using their the user names **icingaadmin** or **jdoe**, when referring to those users in the configuration.
 
-IW2 users and groups are not configured by an IW2 configuration file, but provided by
-an authentication backend. This means that how creating and deleting users works depends entirely on the backend. For extended information on setting up authentication backends, please read the chapter [authentication](authentication.md#authentication).
+Icinga Web 2 users and groups are not configured by a configuration file, but provided by
+an **authentication backend**. For extended information on setting up authentication backends and managing users, please read the chapter [authentication](authentication.md#authentication).
 
-**ATTENTION !**
 
-It is important to distinct between the "contacts" defined in the Icinga2-Core
-configuration and the "users" that can access IW2. In this guide and for
-handling security in IW2 in general only the latter ones are of importance.
+<div class="info-box">
+  Since Icinga Web 2, users in the Icinga configuration and the web authentication are separated, to allow
+  use of external authentication providers. This means that users and groups defined in the Icinga configuration are not available to Icinga Web 2. Instead it uses its own authentication
+  backend to fetch users and groups from, which must be configured separately.
+</div>
 
+#### Managing Users
+
+When using a [Database
+as authentication backend](authentication.md#authentication-configuration-db-authentication), it is possible to create, add and delete users directly in the frontend. This configuration
+can be found at **Configuration > Authentication > Users **.
 
 ### Groups
 
 If there is a big amounts of users to manage, it would be tedious to specify each user
-separately when referring to a bigger group of users at once. For this reasons, it
-is possible to group users in groups.
+separately when referring to a bigger group of users at once. Because of that, any user can be a member of multiple groups, and will inherit all permissions and restrictions.
 
-Like with users, groups are identified solely by their **name**, and provided by backends called **group backends**. Like with users, it depends entirely on the used backend how groups are created and managed. For extended information on setting up group backends, please read the chapter [authentication](authentication.md#authentication).
+Like users, groups are identified solely by their **name** that is provided by
+ a **group backend**. For extended information on setting up group backends,
+ please read the chapter [authentication](authentication.md#authentication).
 
 
-TODO: example
+#### Managing Groups
+
+When using a [Database as an authentication backend](#authentication.md#authentication-configuration-db-authentication),
+it is possible manage groups and group memberships directly in the frontend. This configuration
+can be found at **Configuration > Authentication > Groups **.
 
 ## Roles
 
-A role defines a set of **permissions** and **restrictions** in IW2, and assigns
-those to users and user groups. For example, a role **admins** could define that certain
+A role defines a set of **permissions** and **restrictions** and assigns
+those to **users** and **groups**. For example, a role **admins** could define that certain
 users have access to all configuration options, or another role **support**
 could define that a list of users or groups is restricted to see only hosts and services
 that match a specific query.
 
-Roles can be assigned to groups and users. In the end, the actual permission of a certain user
-will be determined by the sum of all roles that are assigned to the user, or to
-groups the user is part of.
-
+The actual permission of a certain user will be determined by merging the permissions and restrictions of the user itself and all the groups the user is part of. Permissions can
+be simply added up, while restrictions follow a slighty more complex pattern, that is described
+in the section [Stacking Filters](#stacking-filters).
 
 ### Configuration
 
 Roles can be changed either through the icingaweb2 interface, by navigation
-to the page **Configuration > Authentication > Roles**, or through editing
+to the page **Configuration > Authentication > Roles**, or through editing the
 configuration file:
 
 
         /etc/icingaweb2/roles.ini
 
 
-### Example
+#### Introducing Example
+
+To get you a quick start, here is an example of how a role definition could look like:
 
 
     [winadmin]
     users = "jdoe, janedoe"  
     groups = "admin"
     permissions = "config/application/*, monitoring/commands/schedule-check"
-    monitoring/hosts/filter = "host=*win*"
-    monitoring/services/filter = "host=*win*"
+    monitoring/filter/objects = "host=*win*"
 
 
-This example creates a role called **winadmin**, that grants the permission **config/application/* ** and ** monitoring/commands/schedule-check ** and additonally only
+This example creates a role called **winadmin**, that grants all permissions in **config/application/** and ** monitoring/commands/schedule-check ** and additionally only
 allows the hosts and services that match the filter ** host=\*win* ** to be displayed. The users
 **jdoe** and **janedoe** and all members of the group **admin** will be affected
 by this role.
 
-### Syntax
+
+#### Syntax
 
 Each role is defined as a section, with the name of the role as section name. The following
-attributes can be defined for each role:
+attributes can be defined for each role in a default Icinga Web 2 installation:
 
 
-| Key         | Value                                                            |
-|-----------  |------------------------------------------------------------------|
-| users       | A comma-separated list of user **login names** that are affected by this role   |
-| groups      | A comma-separated list of **groups names** that are affected by this role  |
-| permissions | A comma-separated list of permissions granted by this role       |
-| module/monitoring/host | A filter expression applied to all hosts              |
-| module/monitoring/serivce |  A fuilter expression applied to all services      |
+| Key                       | Value                                                                           |
+|---------------------------|---------------------------------------------------------------------------------|
+| users                     | A comma-separated list of user **user names** that are affected by this role    |
+| groups                    | A comma-separated list of **group names** that are affected by this role        |
+| permissions               | A comma-separated list of **permissions** granted by this role                  |
+| monitoring/filter/objects | A **filter expression** that restricts the access to services and hosts         |
 
 
-### Permissions
+
+## <a id="permissions"></a> Permissions
 
 Permissions can be used to allow users or groups certain **actions**. By default,
 all actions are **prohibited** and must be allowed explicitly by a role for any user.
 
-Each action in IW2 is denoted by a **namespaced key**, which is used to order and
-group those actions. All actions that affect the configuration of IW2, are in a
+Each action in Icinga Web 2 is denoted by a **namespaced key**, which is used to order and
+group those actions. All actions that affect the configuration of Icinga Web 2, are in a
 namespace called **config**, while all configurations that affect authentication
 are in the namespace **config/authentication**
 
 **Wildcards** can be used to grant permission for all actions in a certain namespace.
-The permission **config/* ** would grant permission to all configuration actions,
+The permission **config/ ** would grant permission to all configuration actions,
 while just specifying a wildcard ** * ** would give permission for all actions.
 
 When multiple roles assign permissions to the same user, either directly or indirectly
 through a group, all permissions will be combined to get the users actual permission set.
 
-###### Global permissions
+#### Global permissions
 
-| Keys | Permits |
-|------|---------|
-| *    |  Everything, including module-specific permissions |
-| config/* | All configuration actions |
-| config/application/* | Configuring IcingaWeb2 |
-| config/application/general | General settings, like logging or preferences |
-| config/application/resources | Change resources for retrieving data |
-| config/application/userbackend | Change backends for retrieving available users |
-| config/application/usergroupbackend | Change backends for retrieving available groups |
-| config/authentication/* | Configure IcingaWeb2 authentication mechanisms |
-| config/authentication/users/* | All user actions |
-| config/authentication/users/show  | Display avilable users |
-| config/authentication/users/add | Add a new user to the backend |
-| config/authentication/users/edit | Edit existing user in the backend |
-| config/authentication/users/remove | Remove existing user from the backend |
-| config/authentication/groups/* | All group actions |
-| config/authentication/groups/show | Display available groups |
-| config/authentication/groups/add | Add a new group to the backend |
-| config/authentication/groups/edit | Edit existing group in a backend |
-| config/authentication/groups/remove | Remove existing group from the backend |
-| config/authentication/roles/* | All role actions |
-| config/authentication/roles/add | Add a new role |
-| config/authentication/roles/show | Display available roles |
-| config/authentication/roles/edit | Change an existing role |
-| config/authentication/roles/remove | Remove an existing row |
-| config/modules | Enable or disable modules and module settings |
+| Name                                | Permits                                                         |
+|-------------------------------------|-----------------------------------------------------------------|
+| *                                   | Allow everything, including module-specific permissions         |
+| config/*                            | Allow all configuration actions                                 |
+| config/application/*                | Allow configuring IcingaWeb2                                    |
+| config/application/general          | Allow general settings, like logging or preferences             |
+| config/application/resources        | Allow changing resources for retrieving data                    |
+| config/application/userbackend      | Allow changing backends for retrieving available users          |
+| config/application/usergroupbackend | Allow changing backends for retrieving available groups         |
+| config/authentication/*             | Allow configuring IcingaWeb2 authentication mechanisms          |
+| config/authentication/users/*       | Allow all user actions                                          |
+| config/authentication/users/show    | Allow displaying avilable users                                 |
+| config/authentication/users/add     | Allow adding a new user to the backend                          |
+| config/authentication/users/edit    | Allow editing an existing user in the backend                   |
+| config/authentication/users/remove  | Allow removing an existing user from the backend                |
+| config/authentication/groups/*      | Allow all group actions                                         |
+| config/authentication/groups/show   | Allow displaying all available groups                           |
+| config/authentication/groups/add    | Allow adding a new group to the backend                         |
+| config/authentication/groups/edit   | Allow editing existing groups in a backend                      |
+| config/authentication/groups/remove | Allow removing existing groups from the backend                 |
+| config/authentication/roles/*       | Allow all role actions                                          |
+| config/authentication/roles/add     | Allow adding a new role                                         |
+| config/authentication/roles/show    | Allow displaying available roles                                |
+| config/authentication/roles/edit    | Allow changing an existing role                                 |
+| config/authentication/roles/remove  | Allow removing an existing row                                  |
+| config/modules                      | Allow enabling or disable modules and module changing settings  |
 
 
-###### Monitoring module permissions
+#### Monitoring module permissions
 
-| Keys | Permits |
-|------|---------|
-| monitoring/command/* | Allow all commands |
-| monitoring/command/schedule-check | Allow scheduling host and service checks' |
-| monitoring/command/acknowledge-problem | Allow acknowledging host and service problems |
-| monitoring/command/remove-acknowledgement | Allow removing problem acknowledgements |
-| monitoring/command/comment/* | Allow adding and deleting host and service comments |
-| monitoring/command/comment/add | Allow commenting on hosts and services |
-| monitoring/command/downtime/delete | Allow deleting host and service downtimes' |
-| monitoring/command/process-check-result | Allow processing host and service check results |
-| monitoring/command/feature/instance | Allow processing commands for toggling features on an instance-wide basis |
-| monitoring/command/feature/object | Allow processing commands for toggling features on host and service objects |
-| monitoring/command/send-custom-notification | Allow sending custom notifications for hosts and services |
+The built-in monitoring module defines an additional set of permissions, that
+are described in detail in [monitoring module documentation](/icingaweb2/doc/module/doc/chapter/monitoring-security#monitoring-security).
 
 
 
-### Restrictions
+## <a id="restrictions"></a> Restrictions
 
-Restrictions can be used to define what a user or group can see, by specifying
-a filter expression. By default, when no filter is defined, a user will be able
-to see every object available. When a filter is specified for a certain object type
-the user will only be able to see objects applied
-
-The filter expression will be **implicitly** added as an **AND-Clause**
-to each query. Any URL filter **?foo=bar&baz=bar** in IW2, would therefore implicitly
-become ** ?(foo=bar&baz=bar)&($FILTER)**, depending on the users current restrictions.
-
-When multiple roles assign restrictions to the same user, either directly or indirectly
-through a group, all filters will be combined using an **AND-Clause**, resulting in the final
-expression ** ?(foo=bar&baz=bar)&$ FILTER1 & $FILTER2 & $FILTER3** appended to each query.
+Restrictions can be used to define what a user or group can see by specifying
+a filter expression. By default, when no restrictions are defined, a user will be able
+to see every object available. When a restriction is specified for a certain object type
+the user will only be able to see objects applied.
 
 
-##### Monitoring module filters
+### Filterable Objects
 
-The monitoring module provides **hosts** and **services** as filterable objects:
+Each filter expression consists of two parts: The **key** that defines **which** objects
+to filter and the filter, that defines **what** to filter.
+
+In a default Icinga Web 2 installations, the only objects that are filterable
+are the objects provided by the monitoring module. The monitoring module provides
+**hosts** and **services** as filterable objects:
 
 
-| Keys                       | Restricts                                        |
-|----------------------------|--------------------------------------------------|
-| monitoring/hosts/filter    | Only display **hosts** that match this filter    |
-| monitoring/services/filter | Only display **services** that match this filter |
+| Keys                       | Restricts                                     |
+|----------------------------|-----------------------------------------------|
+| monitoring/filter/objects  | Applies host and service filters to all hosts |
 
 
-Filters on hosts or services will automatically apply to all notifications, events
-or downtimes that belong to those objects.
+A complete list of all available filter columns can be found in
+the [monitoring module documentation](/icingaweb2/doc/module/doc/chapter/monitoring-security#monitoring-security-restrictions).
 
-
-** ATTENTION ! **
-
-Unlike with notifications or downtimes, a host filter will **not** automatically apply to all services on that host. If this behavior is desired, it is always necessary to add the
-filter expression to both, **services and hosts**.
-
-
-##### Filter Expressions
+### Filter Expressions
 
 Any filter expression that is allowed in the filtered view, is also an allowed filter expression.
 This means, that it is possible to define negations, wildcards, and even nested
 filter expressions containing AND and OR-Clauses.
 
-The following examples will show some examples for more complex filters:
+The filter expression will be **implicitly** added as an **AND-Clause** to each query on the filtered objects. The following shows the filter expression **host = \*win* ** being applied on ** monitoring/filter/objects  **.
 
-###### Example 1: Negation
 
-    [onlywin]
+Regular filter query:
+
+    AND-- service_problem = 1
+     |
+     +--- service_handled = 0
+
+
+With our restriction applied, any user affected by this restrictions will see the
+results of this query instead:
+
+
+    AND-- host = *win*
+     |
+     +--AND-- service_problem = 1
+         |
+         +--- service_handled = 0
+
+
+#### <a id="stacking-filters"></a> Stacking Filters
+
+When multiple roles assign restrictions to the same user, either directly or indirectly
+through a group, all filters will be combined using an **OR-Clause**, resulting in the final
+expression:
+
+
+       AND --  OR-- $FILTER1
+        |    |
+        |    +-- $FILTER2
+        |    |
+        |    +-- $FILTER3
+        |
+        +--AND-- service_problem = 1
+            |
+            +--- service_handled = 0
+
+
+As a result, a user is be able to see hosts that are matched by **ANY** of
+the filter expressions. The following examples will show the usefulness of this behavior:
+
+#### Example 1: Negation
+
+    [winadmin]
     groups = "windows-admins"
-    monitoring/hosts/filter = "host=*win*"
-    monitoring/services/filter = "host=*win*"
+    monitoring/filter/objects = "host=*win*"
 
-Will display only hosts and services whose hosts contains the **win**.
+Will display only hosts and services whose host name contains  **win**.
 
-    [nowin]
+    [webadmin]
+    groups = "web-admins"  
+    monitoring/filter/objects = "host!=*win*"
+
+Will only match hosts and services whose host name does **not** contain **win**
+
+Notice that because of the behavior of two stacking filters, a user that is member of **windows-admins** and **web-admins**, will now be able to see both, Windows and non-Windows hosts and services.
+
+#### Example 2: Hostgroups
+
+    [unix-server]
     groups = "unix-admins"  
-    monitoring/hosts/filter = "host!=*win*"
-    monitoring/services/filter = "host!=*win*"
+    monitoring/filter/objects = "(hostgroup_name=bsd-servers|hostgroup_name=linux-servers)"
 
-Will only match hosts and services whose host does **not** contain **win**
-
-Also notice that if a user that is member of both groups, **windows-admins** and **unix-admins**,
-he wont be able to see any hosts, as both filters will be applied and remove any object from the query.
-
-
-###### Example 2: Hostgroups
-
-    [only-unix]
-    groups = "unix-admins"  
-    monitoring/hosts/filter = "(hostgroup_name=bsd-servers|hostgroup_name=linux-servers)"
-    monitoring/services/filter = "(hostgroup_name=bsd-servers|hostgroup_name=linux-servers)"
-
-
-This role allows all members of the group unix-admins to only see hosts and services
+This role allows all members of the group unix-admins to see hosts and services
 that are part of the host-group linux-servers or the host-group bsd-servers.
 
-## Modules
-
-When creating IW2 modules, it might be necessary to define new actions that can be granted or revoked to certain users. One example for this, is the monitoring module, that is the heart of the monitoring functionality of IW2.while
-
 ## Troubleshooting
 
 Q: I cannot see the menu for changing roles in Icinga Web 2
diff --git a/modules/doc/doc/security.md b/modules/doc/doc/security.md
new file mode 100644
index 000000000..b6bce4389
--- /dev/null
+++ b/modules/doc/doc/security.md
@@ -0,0 +1,65 @@
+# <a id="monitoring-security"></a> Security
+
+The monitoring module provides an additional set of restrictions and permissions
+that can be used for access control. The following sections will list those
+restrictions and permissions in detail:
+
+
+## Permissions
+
+The Icinga Web 2 monitoring plugin can send commands to the current Icinga2 instance
+through the command pipe. A user needs specific permissions to be able to send those  
+commands when using the monitoring plugin.
+
+
+| Name                                        | Permits                                                                     |
+|---------------------------------------------|-----------------------------------------------------------------------------|
+| monitoring/command/*                        | Allow all commands                                                          |
+| monitoring/command/schedule-check           | Allow scheduling host and service checks'                                   |
+| monitoring/command/acknowledge-problem      | Allow acknowledging host and service problems                               |
+| monitoring/command/remove-acknowledgement   | Allow removing problem acknowledgements                                     |
+| monitoring/command/comment/*                | Allow adding and deleting host and service comments                         |
+| monitoring/command/comment/add              | Allow commenting on hosts and services                                      |
+| monitoring/command/downtime/delete          | Allow deleting host and service downtimes'                                  |
+| monitoring/command/process-check-result     | Allow processing host and service check results                             |
+| monitoring/command/feature/instance         | Allow processing commands for toggling features on an instance-wide basis   |
+| monitoring/command/feature/object           | Allow processing commands for toggling features on host and service objects |
+| monitoring/command/send-custom-notification | Allow sending custom notifications for hosts and services                   |
+
+
+## <a id="monitoring-security-restrictions"></a> Restrictions
+
+The monitoring module allows filtering objects:
+
+
+| Keys                       | Restricts                                     |
+|----------------------------|-----------------------------------------------|
+| monitoring/filter/objects  | Applies a filter to all hosts and services    |
+
+
+This filter will affect all hosts and services. Furthermore, it will also
+affect all related objects, like notifications, downtimes or events. If a
+service is hidden, all notifications, downtimes on that service will be hidden too.
+
+
+### Filter Column Names
+
+The following filter column names are available in filter expressions:
+
+
+| Column                                               |
+|------------------------------------------------------|
+| host                                                 |
+| host_alias                                           |
+| host_display_name                                    |
+| host_name                                            |
+| hostgroup                                            |
+| hostgroup_alias                                      |
+| hostgroup_name                                       |
+| service                                              |
+| service_description                                  |
+| service_display_name                                 |
+| service_group                                        |
+| service_group_alias                                  |
+| service_group_name                                   |
+| + all custom variables prefixed with host or service |

From 4a591db4381f6e128cebebd1eae3d0860d9205f3 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 10 Jun 2015 19:01:33 +0200
Subject: [PATCH 2123/2920] Fix a few typos

refs #9377
---
 doc/security.md | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/doc/security.md b/doc/security.md
index 1b61f8ab3..da1162496 100644
--- a/doc/security.md
+++ b/doc/security.md
@@ -29,7 +29,7 @@ section [Permissions](#permissions).
 
 There are all kinds of different objects in Icinga Web 2: Hosts, Services, Notifications, Downtimes and Events.
 
-By default, a user can **see everything**, but it is possible to **explicitly restrict** what each user can see using Restrictions.
+By default, a user can **see everything**, but it is possible to **explicitly restrict** what each user can see using restrictions.
 
 Restrictions are complex filter queries that describe what objects should be displayed to a user. Restrictions are described
 in greater detail in the section [Restrictions](#restrictions).
@@ -42,7 +42,7 @@ For example, there might be user called **jdoe** authenticated
 using Active Directory, and a user **icingaadmin** that is authenticated using a MySQL-Database as backend. Both can be referenced by using their the user names **icingaadmin** or **jdoe**, when referring to those users in the configuration.
 
 Icinga Web 2 users and groups are not configured by a configuration file, but provided by
-an **authentication backend**. For extended information on setting up authentication backends and managing users, please read the chapter [authentication](authentication.md#authentication).
+an **authentication backend**. For extended information on setting up authentication backends and managing users, please read the chapter [Authentication](authentication.md#authentication).
 
 
 <div class="info-box">
@@ -59,12 +59,13 @@ can be found at **Configuration > Authentication > Users **.
 
 ### Groups
 
-If there is a big amounts of users to manage, it would be tedious to specify each user
-separately when referring to a bigger group of users at once. Because of that, any user can be a member of multiple groups, and will inherit all permissions and restrictions.
+If there is a big amount of users to manage, it would be tedious to specify each user
+separately when referring to a bigger group of users often. Because of that, it is possible to group users together into groups.
+A user can be member of multiple groups and will inherit all permissions and restrictions.
 
 Like users, groups are identified solely by their **name** that is provided by
  a **group backend**. For extended information on setting up group backends,
- please read the chapter [authentication](authentication.md#authentication).
+ please read the chapter [Authentication](authentication.md#authentication).
 
 
 #### Managing Groups
@@ -140,10 +141,10 @@ are in the namespace **config/authentication**
 
 **Wildcards** can be used to grant permission for all actions in a certain namespace.
 The permission **config/ ** would grant permission to all configuration actions,
-while just specifying a wildcard ** * ** would give permission for all actions.
+while just specifying a wildcard * would give permission for all actions.
 
-When multiple roles assign permissions to the same user, either directly or indirectly
-through a group, all permissions will be combined to get the users actual permission set.
+When multiple roles assign permissions to the same user (either directly or indirectly
+through a group) all permissions can simply be added together to get the users actual permission set.
 
 #### Global permissions
 
@@ -187,7 +188,7 @@ are described in detail in [monitoring module documentation](/icingaweb2/doc/mod
 Restrictions can be used to define what a user or group can see by specifying
 a filter expression. By default, when no restrictions are defined, a user will be able
 to see every object available. When a restriction is specified for a certain object type
-the user will only be able to see objects applied.
+the user will only be able to see objects matched by those filters.
 
 
 ### Filterable Objects
@@ -200,12 +201,14 @@ are the objects provided by the monitoring module. The monitoring module provide
 **hosts** and **services** as filterable objects:
 
 
-| Keys                       | Restricts                                     |
+| Keys                       | Restricsts                                     |
 |----------------------------|-----------------------------------------------|
 | monitoring/filter/objects  | Applies host and service filters to all hosts |
 
 
-A complete list of all available filter columns can be found in
+#### Filter Columns
+
+Filters operate on object attributes. A complete list of all available filter columns on hosts and services can be found in
 the [monitoring module documentation](/icingaweb2/doc/module/doc/chapter/monitoring-security#monitoring-security-restrictions).
 
 ### Filter Expressions
@@ -287,4 +290,4 @@ Q: I cannot see the menu for changing roles in Icinga Web 2
 
 A: Your user lacks the permission to change the authentication configuration,
    add a new role in roles.ini that gives your current user
-   the permission to access **config/authentication/* **
+   the permission to access **config/authentication/**

From 6e28a58739908ee85d3931f42372092abe79cb24 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 10 Jun 2015 19:06:59 +0200
Subject: [PATCH 2124/2920] Fix drawing in doc

refs #9377
---
 doc/security.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/security.md b/doc/security.md
index da1162496..201a6533c 100644
--- a/doc/security.md
+++ b/doc/security.md
@@ -245,11 +245,11 @@ through a group, all filters will be combined using an **OR-Clause**, resulting
 expression:
 
 
-       AND --  OR-- $FILTER1
-        |    |
-        |    +-- $FILTER2
-        |    |
-        |    +-- $FILTER3
+       AND-- OR-- $FILTER1
+        |     |
+        |     +-- $FILTER2
+        |     |
+        |     +-- $FILTER3
         |
         +--AND-- service_problem = 1
             |

From f9948f5513ee1588ed6d87cc3ba4dc45e067a4e8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 11 Jun 2015 12:34:40 +0200
Subject: [PATCH 2125/2920] HostnotificationQuery: Apply query optimization
 from NotificationhistoryQuery

refs #9009
---
 .../Backend/Ido/Query/HostnotificationQuery.php      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
index b47463bcd..12b4715c7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
@@ -65,6 +65,18 @@ class HostnotificationQuery extends IdoQuery
         )
     );
 
+    /**
+     * {@inheritdoc}
+     */
+    public function whereToSql($col, $sign, $expression)
+    {
+        if ($col === 'UNIX_TIMESTAMP(hn.start_time)') {
+            return 'hn.start_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
+        } else {
+            return parent::whereToSql($col, $sign, $expression);
+        }
+    }
+
     /**
      * {@inheritdoc}
      */

From ed66c1f2e410263f56aab347becf6348bc3b7e6b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 11 Jun 2015 12:34:55 +0200
Subject: [PATCH 2126/2920] ServicenotificationQuery: Apply query optimization
 from NotificationhistoryQuery

refs #9009
---
 .../Backend/Ido/Query/ServicenotificationQuery.php   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
index a6d6a4a26..9f4bc51b4 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
@@ -66,6 +66,18 @@ class ServicenotificationQuery extends IdoQuery
         )
     );
 
+    /**
+     * {@inheritdoc}
+     */
+    public function whereToSql($col, $sign, $expression)
+    {
+        if ($col === 'UNIX_TIMESTAMP(sn.start_time)') {
+            return 'sn.start_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
+        } else {
+            return parent::whereToSql($col, $sign, $expression);
+        }
+    }
+
     /**
      * {@inheritdoc}
      */

From 0ead8d48210046f6588093844035c40955c04344 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 11 Jun 2015 12:35:15 +0200
Subject: [PATCH 2127/2920] Introduce query HoststatehistoryQuery

refs #9009
---
 .../Ido/Query/HoststatehistoryQuery.php       | 196 ++++++++++++++++++
 1 file changed, 196 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php
new file mode 100644
index 000000000..e79acdab1
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php
@@ -0,0 +1,196 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+/**
+ * Query for host state history records
+ */
+class HoststatehistoryQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * Array to map type names to type ids for query optimization
+     *
+     * @var array
+     */
+    protected $types = array(
+        'soft_state' => 0,
+        'hard_state' => 1
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'statehistory' => array(
+            'host'          => 'ho.name1 COLLATE latin1_general_ci',
+            'host_name'     => 'ho.name1',
+            'object_type'   => '(\'host\')'
+        ),
+        'history' => array(
+            'type'      => "(CASE WHEN hh.state_type = 1 THEN 'hard_state' ELSE 'soft_state' END)",
+            'timestamp' => 'UNIX_TIMESTAMP(hh.state_time)',
+            'object_id' => 'hh.object_id',
+            'state'     => 'hh.state',
+            'output'    => "('[ ' || hh.current_check_attempt || '/' || hh.max_check_attempts || ' ] ' || hh.output)",
+        ),
+        'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
+        ),
+        'hosts' => array(
+            'host_alias'        => 'h.alias',
+            'host_display_name' => 'h.display_name COLLATE latin1_general_ci'
+        ),
+        'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
+        ),
+        'services' => array(
+            'service'               => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'   => 'so.name2',
+            'service_display_name'  => 's.display_name COLLATE latin1_general_ci',
+            'service_host_name'     => 'so.name1'
+        )
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    public function whereToSql($col, $sign, $expression)
+    {
+        if ($col === 'UNIX_TIMESTAMP(hh.state_time)') {
+            return 'hh.state_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
+        } elseif (
+            $col === $this->columnMap['history']['type']
+            && ! is_array($expression)
+            && array_key_exists($expression, $this->types)
+        ) {
+            return 'hh.state_type ' . $sign . ' ' . $this->types[$expression];
+        } else {
+            return parent::whereToSql($col, $sign, $expression);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        $this->select->from(
+            array('hh' => $this->prefix . 'statehistory'),
+            array()
+        )->join(
+            array('ho' => $this->prefix . 'objects'),
+            'ho.object_id = hh.object_id',
+            array()
+        )->where(
+            'ho.is_active = ?',
+            1
+        )->where(
+            'ho.objecttype_id = ?',
+            1
+        );
+        $this->joinedVirtualTables['statehistory'] = true;
+        $this->joinedVirtualTables['history'] = true;
+    }
+
+    /**
+     * Join host groups
+     */
+    protected function joinHostgroups()
+    {
+        $this->select->join(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = ho.object_id',
+            array()
+        )->join(
+            array('hg' => $this->prefix . 'hostgroups'),
+            'hg.hostgroup_id = hgm.hostgroup_id',
+            array()
+        )->join(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hg.hostgroup_object_id',
+            array()
+        )->where(
+            'hgo.is_active = ?',
+            1
+        )
+        ->where(
+            'hgo.objecttype_id = ?',
+            3
+        );
+        $this->select->group(array('hh.statehistory_id', 'ho.name1'));
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $this->select->join(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = ho.object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = s.service_object_id',
+            array()
+        )->join(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sg.' . $this->servicegroup_id . ' = sgm.servicegroup_id',
+            array()
+        )->join(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id',
+            array()
+        )->where(
+            'sgo.is_active = ?',
+            1
+        )
+        ->where(
+            'sgo.objecttype_id = ?',
+            4
+        );
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $this->select->join(
+            array('s' => $this->prefix . 'services'),
+            's.host_object_id = ho.object_id',
+            array()
+        )->join(
+            array('so' => $this->prefix . 'objects'),
+            'so.object_id = s.service_object_id',
+            array()
+        )->where(
+            'so.is_active = ?',
+            1
+        )
+        ->where(
+            'so.objecttype_id = ?',
+            2
+        );
+        $this->select->group(array('hh.statehistory_id', 'ho.name1'));
+    }
+}

From 5083301dea3f2f548951e5decd2f95ddd6c1c006 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 11 Jun 2015 12:35:29 +0200
Subject: [PATCH 2128/2920] Introduce query ServicestatehistoryQuery

refs #9009
---
 .../Ido/Query/ServicestatehistoryQuery.php    | 187 ++++++++++++++++++
 1 file changed, 187 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php
new file mode 100644
index 000000000..b00ac1653
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php
@@ -0,0 +1,187 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+/**
+ * Query for service state history records
+ */
+class ServicestatehistoryQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * Array to map type names to type ids for query optimization
+     *
+     * @var array
+     */
+    protected $types = array(
+        'soft_state' => 0,
+        'hard_state' => 1
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'statehistory' => array(
+            'host'                  => 'so.name1 COLLATE latin1_general_ci',
+            'host_name'             => 'so.name1',
+            'object_type'           => '(\'service\')',
+            'service'               => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'   => 'so.name2',
+            'service_host'          => 'so.name1 COLLATE latin1_general_ci',
+            'service_host_name'     => 'so.name1'
+        ),
+        'history' => array(
+            'type'      => "(CASE WHEN sh.state_type = 1 THEN 'hard_state' ELSE 'soft_state' END)",
+            'timestamp' => 'UNIX_TIMESTAMP(sh.state_time)',
+            'object_id' => 'sh.object_id',
+            'state'     => 'sh.state',
+            'output'    => "('[ ' || sh.current_check_attempt || '/' || sh.max_check_attempts || ' ] ' || sh.output)",
+        ),
+        'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
+        ),
+        'hosts' => array(
+            'host_alias'        => 'h.alias',
+            'host_display_name' => 'h.display_name COLLATE latin1_general_ci'
+        ),
+        'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
+        ),
+        'services' => array(
+            'service_display_name'  => 's.display_name COLLATE latin1_general_ci'
+        )
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    public function whereToSql($col, $sign, $expression)
+    {
+        if ($col === 'UNIX_TIMESTAMP(sh.state_time)') {
+            return 'sh.state_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
+        } elseif (
+            $col === $this->columnMap['history']['type']
+            && ! is_array($expression)
+            && array_key_exists($expression, $this->types)
+        ) {
+            return 'sh.state_type ' . $sign . ' ' . $this->types[$expression];
+        } else {
+            return parent::whereToSql($col, $sign, $expression);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        $this->select->from(
+            array('sh' => $this->prefix . 'statehistory'),
+            array()
+        )->join(
+            array('so' => $this->prefix . 'objects'),
+            'so.object_id = sh.object_id',
+            array()
+        )->where(
+            'so.is_active = ?',
+            1
+        )->where(
+            'so.objecttype_id = ?',
+            2
+        );
+        $this->joinedVirtualTables['statehistory'] = true;
+        $this->joinedVirtualTables['history'] = true;
+    }
+
+    /**
+     * Join host groups
+     */
+    protected function joinHostgroups()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = s.host_object_id',
+            array()
+        )->join(
+            array('hg' => $this->prefix . 'hostgroups'),
+            'hg.hostgroup_id = hgm.hostgroup_id',
+            array()
+        )->join(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hg.hostgroup_object_id',
+            array()
+        )->where(
+            'hgo.is_active = ?',
+            1
+        )
+        ->where(
+            'hgo.objecttype_id = ?',
+            3
+        );
+        $this->select->group(array('sh.statehistory_id', 'so.name1', 'so.name2'));
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = s.host_object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->select->join(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = so.object_id',
+            array()
+        )->join(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sg.' . $this->servicegroup_id . ' = sgm.servicegroup_id',
+            array()
+        )->join(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id',
+            array()
+        )->where(
+            'sgo.is_active = ?',
+            1
+        )
+        ->where(
+            'sgo.objecttype_id = ?',
+            4
+        );
+        $this->select->group(array('sh.statehistory_id', 'so.name1', 'so.name2'));
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $this->select->join(
+            array('s' => $this->prefix . 'services'),
+            's.service_object_id = so.object_id',
+            array()
+        );
+    }
+}

From f17e9162eb82e0cadc548c4b84a888f1d3f7a8ce Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 11 Jun 2015 12:36:10 +0200
Subject: [PATCH 2129/2920] StatehistoryQuery: Use subqueries for host and
 service state records

refs #9009
---
 .../Backend/Ido/Query/StatehistoryQuery.php   | 170 ++++++++++++++----
 1 file changed, 133 insertions(+), 37 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
index cf0740315..41f18572b 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
@@ -3,55 +3,151 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
+use Zend_Db_Expr;
+use Zend_Db_Select;
+use Icinga\Data\Filter\Filter;
+
+/**
+ * Query for host and service state history records
+ */
 class StatehistoryQuery extends IdoQuery
 {
-    protected $types = array(
-        'soft_state' => 0,
-        'hard_state' => 1
-    );
-
+    /**
+     * {@inheritdoc}
+     */
     protected $columnMap = array(
         'statehistory' => array(
-            'state_time'            => 'sh.state_time',
-            'timestamp'             => 'UNIX_TIMESTAMP(sh.state_time)',
-            'raw_timestamp'         => 'sh.state_time',
-            'object_id'             => 'sho.object_id',
-            'type'                  => "(CASE WHEN sh.state_type = 1 THEN 'hard_state' ELSE 'soft_state' END)",
-            'state'                 => 'sh.state',
-            'output'                => "('[ ' || sh.current_check_attempt || '/' || sh.max_check_attempts || ' ] ' || sh.output)",
-
-            'host'                  => 'sho.name1 COLLATE latin1_general_ci',
-            'service'               => 'sho.name2 COLLATE latin1_general_ci',
-            'host_name'             => 'sho.name1',
-            'service_description'   => 'sho.name2',
-            'object_type'           => "CASE WHEN sho.objecttype_id = 1 THEN 'host' ELSE 'service' END"
+            'object_type' => 'sth.object_type'
+        ),
+        'history' => array(
+            'type'      => 'sth.type',
+            'timestamp' => 'sth.timestamp',
+            'object_id' => 'sth.object_id',
+            'state'     => 'sth.state',
+            'output'    => 'sth.output'
+        ),
+        'hosts' => array(
+            'host_display_name' => 'sth.host_display_name',
+            'host_name'         => 'sth.host_name'
+        ),
+        'services' => array(
+            'service_description'   => 'sth.service_description',
+            'service_display_name'  => 'sth.service_display_name',
+            'service_host_name'     => 'sth.service_host_name'
         )
     );
 
-    public function whereToSql($col, $sign, $expression)
-    {
-        if ($col === 'UNIX_TIMESTAMP(sh.state_time)') {
-            return 'sh.state_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
-        } elseif ($col === $this->columnMap['statehistory']['type']
-            && is_array($expression) === false
-            && array_key_exists($expression, $this->types) === true
-        ) {
-                return 'sh.state_type ' . $sign . ' ' . $this->types[$expression];
-        } else {
-            return parent::whereToSql($col, $sign, $expression);
-        }
-    }
+    /**
+     * The union
+     *
+     * @var Zend_Db_Select
+     */
+    protected $stateHistoryQuery;
 
+    /**
+     * Subqueries used for the state history query
+     *
+     * @var IdoQuery[]
+     */
+    protected $subQueries = array();
+
+    /**
+     * Whether to additionally select all history columns
+     *
+     * @var bool
+     */
+    protected $fetchHistoryColumns = false;
+
+    /**
+     * {@inheritdoc}
+     */
     protected function joinBaseTables()
     {
+        $this->stateHistoryQuery = $this->db->select();
         $this->select->from(
-            array('sho' => $this->prefix . 'objects'),
-            array()
-        )->join(
-            array('sh' => $this->prefix . 'statehistory'),
-            'sho.' . $this->object_id . ' = sh.' . $this->object_id . ' AND sho.is_active = 1',
+            array('sth' => $this->stateHistoryQuery),
             array()
         );
-        $this->joinedVirtualTables = array('statehistory' => true);
+        $this->joinedVirtualTables['statehistory'] = true;
+    }
+
+    /**
+     * Join history related columns and tables
+     */
+    protected function joinHistory()
+    {
+        // TODO: Ensure that one is selecting the history columns first...
+        $this->fetchHistoryColumns = true;
+        $this->requireVirtualTable('hosts');
+        $this->requireVirtualTable('services');
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $columns = array_keys(
+            $this->columnMap['statehistory'] + $this->columnMap['hosts']
+        );
+        foreach ($this->columnMap['services'] as $column => $_) {
+            $columns[$column] = new Zend_Db_Expr('NULL');
+        }
+        if ($this->fetchHistoryColumns) {
+            $columns = array_merge($columns, array_keys($this->columnMap['history']));
+        }
+        $hosts = $this->createSubQuery('Hoststatehistory', $columns);
+        $this->subQueries[] = $hosts;
+        $this->stateHistoryQuery->union(array($hosts), Zend_Db_Select::SQL_UNION_ALL);
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $columns = array_keys(
+            $this->columnMap['statehistory'] + $this->columnMap['hosts'] + $this->columnMap['services']
+        );
+        if ($this->fetchHistoryColumns) {
+            $columns = array_merge($columns, array_keys($this->columnMap['history']));
+        }
+        $services = $this->createSubQuery('Servicestatehistory', $columns);
+        $this->subQueries[] = $services;
+        $this->stateHistoryQuery->union(array($services), Zend_Db_Select::SQL_UNION_ALL);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function order($columnOrAlias, $dir = null)
+    {
+        foreach ($this->subQueries as $sub) {
+            $sub->requireColumn($columnOrAlias);
+        }
+        return parent::order($columnOrAlias, $dir);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function where($condition, $value = null)
+    {
+        $this->requireColumn($condition);
+        foreach ($this->subQueries as $sub) {
+            $sub->where($condition, $value);
+        }
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addFilter(Filter $filter)
+    {
+        foreach ($this->subQueries as $sub) {
+            $sub->applyFilter(clone $filter);
+        }
+        return $this;
     }
 }

From 26e895aedb78ec6edd6b32c947663ce270c3ad1d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 11 Jun 2015 15:28:38 +0200
Subject: [PATCH 2130/2920] Introduce query HostcommenthistoryQuery

refs #9009
---
 .../Ido/Query/HostcommenthistoryQuery.php     | 180 ++++++++++++++++++
 1 file changed, 180 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php
new file mode 100644
index 000000000..259fe1c18
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php
@@ -0,0 +1,180 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+/**
+ * Query for host comment history records
+ */
+class HostcommenthistoryQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'commenthistory' => array(
+            'host'          => 'ho.name1 COLLATE latin1_general_ci',
+            'host_name'     => 'ho.name1',
+            'object_type'   => '(\'host\')'
+        ),
+        'history' => array(
+            'type'      => "(CASE hch.entry_type WHEN 1 THEN 'comment' WHEN 2 THEN 'dt_comment' WHEN 3 THEN 'flapping' WHEN 4 THEN 'ack' END)",
+            'timestamp' => 'UNIX_TIMESTAMP(hch.comment_time)',
+            'object_id' => 'hch.object_id',
+            'state'     => '(NULL)',
+            'output'    => "('[' || hch.author_name || '] ' || hch.comment_data)",
+        ),
+        'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
+        ),
+        'hosts' => array(
+            'host_alias'        => 'h.alias',
+            'host_display_name' => 'h.display_name COLLATE latin1_general_ci'
+        ),
+        'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
+        ),
+        'services' => array(
+            'service'               => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'   => 'so.name2',
+            'service_display_name'  => 's.display_name COLLATE latin1_general_ci',
+            'service_host_name'     => 'so.name1'
+        )
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    public function whereToSql($col, $sign, $expression)
+    {
+        if ($col === 'UNIX_TIMESTAMP(hch.comment_time)') {
+            return 'hch.comment_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
+        } else {
+            return parent::whereToSql($col, $sign, $expression);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        $this->select->from(
+            array('hch' => $this->prefix . 'commenthistory'),
+            array()
+        )->join(
+            array('ho' => $this->prefix . 'objects'),
+            'ho.object_id = hch.object_id',
+            array()
+        )->where(
+            'ho.is_active = ?',
+            1
+        )->where(
+            'ho.objecttype_id = ?',
+            1
+        );
+        $this->joinedVirtualTables['commenthistory'] = true;
+        $this->joinedVirtualTables['history'] = true;
+    }
+
+    /**
+     * Join host groups
+     */
+    protected function joinHostgroups()
+    {
+        $this->select->join(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = ho.object_id',
+            array()
+        )->join(
+            array('hg' => $this->prefix . 'hostgroups'),
+            'hg.hostgroup_id = hgm.hostgroup_id',
+            array()
+        )->join(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hg.hostgroup_object_id',
+            array()
+        )->where(
+            'hgo.is_active = ?',
+            1
+        )
+        ->where(
+            'hgo.objecttype_id = ?',
+            3
+        );
+        $this->select->group(array('hch.commenthistory_id', 'ho.name1'));
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $this->select->join(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = ho.object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = s.service_object_id',
+            array()
+        )->join(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sg.' . $this->servicegroup_id . ' = sgm.servicegroup_id',
+            array()
+        )->join(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id',
+            array()
+        )->where(
+            'sgo.is_active = ?',
+            1
+        )
+        ->where(
+            'sgo.objecttype_id = ?',
+            4
+        );
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $this->select->join(
+            array('s' => $this->prefix . 'services'),
+            's.host_object_id = ho.object_id',
+            array()
+        )->join(
+            array('so' => $this->prefix . 'objects'),
+            'so.object_id = s.service_object_id',
+            array()
+        )->where(
+            'so.is_active = ?',
+            1
+        )
+        ->where(
+            'so.objecttype_id = ?',
+            2
+        );
+        $this->select->group(array('hch.commenthistory_id', 'ho.name1'));
+    }
+}

From bf85fd62b5aea4036cd573805e29f19ac22aa186 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 11 Jun 2015 15:28:57 +0200
Subject: [PATCH 2131/2920] Introduce query ServicecommenthistoryQuery

refs #9009
---
 .../Ido/Query/ServicecommenthistoryQuery.php  | 171 ++++++++++++++++++
 1 file changed, 171 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php
new file mode 100644
index 000000000..b0aee8d4b
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php
@@ -0,0 +1,171 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+/**
+ * Query for service comment history records
+ */
+class ServicecommenthistoryQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'commenthistory' => array(
+            'host'                  => 'so.name1 COLLATE latin1_general_ci',
+            'host_name'             => 'so.name1',
+            'object_type'           => '(\'service\')',
+            'service'               => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'   => 'so.name2',
+            'service_host'          => 'so.name1 COLLATE latin1_general_ci',
+            'service_host_name'     => 'so.name1'
+        ),
+        'history' => array(
+            'type'      => "(CASE sch.entry_type WHEN 1 THEN 'comment' WHEN 2 THEN 'dt_comment' WHEN 3 THEN 'flapping' WHEN 4 THEN 'ack' END)",
+            'timestamp' => 'UNIX_TIMESTAMP(sch.comment_time)',
+            'object_id' => 'sch.object_id',
+            'state'     => '(NULL)',
+            'output'    => "('[' || sch.author_name || '] ' || sch.comment_data)",
+        ),
+        'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
+        ),
+        'hosts' => array(
+            'host_alias'        => 'h.alias',
+            'host_display_name' => 'h.display_name COLLATE latin1_general_ci'
+        ),
+        'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
+        ),
+        'services' => array(
+            'service_display_name'  => 's.display_name COLLATE latin1_general_ci'
+        )
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    public function whereToSql($col, $sign, $expression)
+    {
+        if ($col === 'UNIX_TIMESTAMP(sch.comment_time)') {
+            return 'sch.comment_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
+        } else {
+            return parent::whereToSql($col, $sign, $expression);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        $this->select->from(
+            array('sch' => $this->prefix . 'commenthistory'),
+            array()
+        )->join(
+            array('so' => $this->prefix . 'objects'),
+            'so.object_id = sch.object_id',
+            array()
+        )->where(
+            'so.is_active = ?',
+            1
+        )->where(
+            'so.objecttype_id = ?',
+            2
+        );
+        $this->joinedVirtualTables['commenthistory'] = true;
+        $this->joinedVirtualTables['history'] = true;
+    }
+
+    /**
+     * Join host groups
+     */
+    protected function joinHostgroups()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = s.host_object_id',
+            array()
+        )->join(
+            array('hg' => $this->prefix . 'hostgroups'),
+            'hg.hostgroup_id = hgm.hostgroup_id',
+            array()
+        )->join(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hg.hostgroup_object_id',
+            array()
+        )->where(
+            'hgo.is_active = ?',
+            1
+        )
+        ->where(
+            'hgo.objecttype_id = ?',
+            3
+        );
+        $this->select->group(array('sch.commenthistory_id', 'so.name1', 'so.name2'));
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = s.host_object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->select->join(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = so.object_id',
+            array()
+        )->join(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sg.' . $this->servicegroup_id . ' = sgm.servicegroup_id',
+            array()
+        )->join(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id',
+            array()
+        )->where(
+            'sgo.is_active = ?',
+            1
+        )
+        ->where(
+            'sgo.objecttype_id = ?',
+            4
+        );
+        $this->select->group(array('sch.commenthistory_id', 'so.name1', 'so.name2'));
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $this->select->join(
+            array('s' => $this->prefix . 'services'),
+            's.service_object_id = so.object_id',
+            array()
+        );
+    }
+}

From 7358eefed88f56806fcba5e37218c6bd9add2295 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 11 Jun 2015 15:29:36 +0200
Subject: [PATCH 2132/2920] CommenthistoryQuery: Use subqueries to fetch host
 and service comments

refs #9009
---
 .../Backend/Ido/Query/CommenthistoryQuery.php | 162 ++++++++++++++----
 1 file changed, 132 insertions(+), 30 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
index 6b2f821e9..b8fdd72a4 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
@@ -3,49 +3,151 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
+use Zend_Db_Expr;
+use Zend_Db_Select;
+use Icinga\Data\Filter\Filter;
+
+/**
+ * Query for host and service comment history records
+ */
 class CommenthistoryQuery extends IdoQuery
 {
+    /**
+     * {@inheritdoc}
+     */
     protected $columnMap = array(
         'commenthistory' => array(
-            'state_time'            => 'h.comment_time',
-            'timestamp'             => 'UNIX_TIMESTAMP(h.comment_time)',
-            'raw_timestamp'         => 'h.comment_time',
-            'object_id'             => 'h.object_id',
-            'type'                  => "(CASE h.entry_type WHEN 1 THEN 'comment' WHEN 2 THEN 'dt_comment' WHEN 3 THEN 'flapping' WHEN 4 THEN 'ack' END)",
-            'state'                 => '(NULL)',
-            'state_type'            => '(NULL)',
-            'output'                => "('[' || h.author_name || '] ' || h.comment_data)",
-            'attempt'               => '(NULL)',
-            'max_attempts'          => '(NULL)',
-
-            'host'                  => 'o.name1 COLLATE latin1_general_ci',
-            'service'               => 'o.name2 COLLATE latin1_general_ci',
-            'host_name'             => 'o.name1',
-            'service_description'   => 'o.name2',
-            'object_type'           => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
+            'object_type' => 'ch.object_type'
+        ),
+        'history' => array(
+            'type'      => 'ch.type',
+            'timestamp' => 'ch.timestamp',
+            'object_id' => 'ch.object_id',
+            'state'     => 'ch.state',
+            'output'    => 'ch.output'
+        ),
+        'hosts' => array(
+            'host_display_name' => 'ch.host_display_name',
+            'host_name'         => 'ch.host_name'
+        ),
+        'services' => array(
+            'service_description'   => 'ch.service_description',
+            'service_display_name'  => 'ch.service_display_name',
+            'service_host_name'     => 'ch.service_host_name'
         )
     );
 
-    public function whereToSql($col, $sign, $expression)
-    {
-        if ($col === 'UNIX_TIMESTAMP(h.comment_time)') {
-            return 'h.comment_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
-        } else {
-            return parent::whereToSql($col, $sign, $expression);
-        }
-    }
+    /**
+     * The union
+     *
+     * @var Zend_Db_Select
+     */
+    protected $commentHistoryQuery;
 
+    /**
+     * Subqueries used for the comment history query
+     *
+     * @var IdoQuery[]
+     */
+    protected $subQueries = array();
+
+    /**
+     * Whether to additionally select all history columns
+     *
+     * @var bool
+     */
+    protected $fetchHistoryColumns = false;
+
+    /**
+     * {@inheritdoc}
+     */
     protected function joinBaseTables()
     {
+        $this->commentHistoryQuery = $this->db->select();
         $this->select->from(
-            array('o' => $this->prefix . 'objects'),
-            array()
-        )->join(
-            array('h' => $this->prefix . 'commenthistory'),
-            'o.' . $this->object_id . ' = h.' . $this->object_id . ' AND o.is_active = 1 AND h.entry_type <> 2',
+            array('ch' => $this->commentHistoryQuery),
             array()
         );
-        $this->joinedVirtualTables = array('commenthistory' => true);
+        $this->joinedVirtualTables['commenthistory'] = true;
     }
 
+    /**
+     * Join history related columns and tables
+     */
+    protected function joinHistory()
+    {
+        // TODO: Ensure that one is selecting the history columns first...
+        $this->fetchHistoryColumns = true;
+        $this->requireVirtualTable('hosts');
+        $this->requireVirtualTable('services');
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $columns = array_keys(
+            $this->columnMap['commenthistory'] + $this->columnMap['hosts']
+        );
+        foreach ($this->columnMap['services'] as $column => $_) {
+            $columns[$column] = new Zend_Db_Expr('NULL');
+        }
+        if ($this->fetchHistoryColumns) {
+            $columns = array_merge($columns, array_keys($this->columnMap['history']));
+        }
+        $hosts = $this->createSubQuery('Hostcommenthistory', $columns);
+        $this->subQueries[] = $hosts;
+        $this->commentHistoryQuery->union(array($hosts), Zend_Db_Select::SQL_UNION_ALL);
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $columns = array_keys(
+            $this->columnMap['commenthistory'] + $this->columnMap['hosts'] + $this->columnMap['services']
+        );
+        if ($this->fetchHistoryColumns) {
+            $columns = array_merge($columns, array_keys($this->columnMap['history']));
+        }
+        $services = $this->createSubQuery('Servicecommenthistory', $columns);
+        $this->subQueries[] = $services;
+        $this->commentHistoryQuery->union(array($services), Zend_Db_Select::SQL_UNION_ALL);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function order($columnOrAlias, $dir = null)
+    {
+        foreach ($this->subQueries as $sub) {
+            $sub->requireColumn($columnOrAlias);
+        }
+        return parent::order($columnOrAlias, $dir);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function where($condition, $value = null)
+    {
+        $this->requireColumn($condition);
+        foreach ($this->subQueries as $sub) {
+            $sub->where($condition, $value);
+        }
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addFilter(Filter $filter)
+    {
+        foreach ($this->subQueries as $sub) {
+            $sub->applyFilter(clone $filter);
+        }
+        return $this;
+    }
 }

From 7ea9051d4368cfdf604e6f6697d4ba3062560faa Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 11 Jun 2015 16:15:29 +0200
Subject: [PATCH 2133/2920] Introduce query HostcommentdeletionQuery

refs #9009
---
 .../Query/HostcommentdeletionhistoryQuery.php | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentdeletionhistoryQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentdeletionhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentdeletionhistoryQuery.php
new file mode 100644
index 000000000..a9c8f5f82
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentdeletionhistoryQuery.php
@@ -0,0 +1,41 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+/**
+ * Query for host comment removal records
+ */
+class HostcommentdeletionhistoryQuery extends HostcommenthistoryQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function whereToSql($col, $sign, $expression)
+    {
+        if ($col === 'UNIX_TIMESTAMP(hch.deletion_time)') {
+            return 'hch.deletion_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
+        } else {
+            return parent::whereToSql($col, $sign, $expression);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        parent::joinBaseTables();
+        $this->select->where("hch.deletion_time > '1970-01-02 00:00:00'");
+        $this->columnMap['history']['timestamp'] = str_replace(
+            'comment_time',
+            'deletion_time',
+            $this->columnMap['history']['timestamp']
+        );
+        $this->columnMap['history']['type'] = str_replace(
+            'END)',
+            "END || '_deleted')",
+            $this->columnMap['history']['type']
+        );
+    }
+}

From b7a26c599d20c1937afcc3d319740d747862001e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 11 Jun 2015 16:15:50 +0200
Subject: [PATCH 2134/2920] Introduce query ServicecommentdeletionhistoryQuery

refs #9009
---
 .../ServicecommentdeletionhistoryQuery.php    | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentdeletionhistoryQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentdeletionhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentdeletionhistoryQuery.php
new file mode 100644
index 000000000..69e49e1ea
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentdeletionhistoryQuery.php
@@ -0,0 +1,41 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+/**
+ * Query for service comment removal records
+ */
+class ServicecommentdeletionhistoryQuery extends ServicecommenthistoryQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function whereToSql($col, $sign, $expression)
+    {
+        if ($col === 'UNIX_TIMESTAMP(sch.deletion_time)') {
+            return 'sch.deletion_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
+        } else {
+            return parent::whereToSql($col, $sign, $expression);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        parent::joinBaseTables();
+        $this->select->where("sch.deletion_time > '1970-01-02 00:00:00'");
+        $this->columnMap['history']['timestamp'] = str_replace(
+            'comment_time',
+            'deletion_time',
+            $this->columnMap['history']['timestamp']
+        );
+        $this->columnMap['history']['type'] = str_replace(
+            'END)',
+            "END || '_deleted')",
+            $this->columnMap['history']['type']
+        );
+    }
+}

From 51434c7255079a5c3d1a74bdc39eb1a57fe70ceb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 11 Jun 2015 16:16:17 +0200
Subject: [PATCH 2135/2920] CommentdeletionhistoryQuery: Use subqueries to
 fetch removed host and service comments

refs #9009
---
 .../Ido/Query/CommentdeletionhistoryQuery.php | 162 ++++++++++++++----
 1 file changed, 132 insertions(+), 30 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
index 9346ce09a..30be5c400 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
@@ -3,49 +3,151 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
+use Zend_Db_Expr;
+use Zend_Db_Select;
+use Icinga\Data\Filter\Filter;
+
+/**
+ * Query for host and service comment removal records
+ */
 class CommentdeletionhistoryQuery extends IdoQuery
 {
+    /**
+     * {@inheritdoc}
+     */
     protected $columnMap = array(
         'commenthistory' => array(
-            'state_time'            => 'h.deletion_time',
-            'timestamp'             => 'UNIX_TIMESTAMP(h.deletion_time)',
-            'raw_timestamp'         => 'h.deletion_time',
-            'object_id'             => 'h.object_id',
-            'type'                  => "(CASE h.entry_type WHEN 1 THEN 'comment_deleted' WHEN 2 THEN 'dt_comment_deleted' WHEN 3 THEN 'flapping_deleted' WHEN 4 THEN 'ack_deleted' END)",
-            'state'                 => '(NULL)',
-            'state_type'            => '(NULL)',
-            'output'                => "('[' || h.author_name || '] ' || h.comment_data)",
-            'attempt'               => '(NULL)',
-            'max_attempts'          => '(NULL)',
-
-            'host'                  => 'o.name1 COLLATE latin1_general_ci',
-            'service'               => 'o.name2 COLLATE latin1_general_ci',
-            'host_name'             => 'o.name1',
-            'service_description'   => 'o.name2',
-            'object_type'           => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
+            'object_type' => 'cdh.object_type'
+        ),
+        'history' => array(
+            'type'      => 'cdh.type',
+            'timestamp' => 'cdh.timestamp',
+            'object_id' => 'cdh.object_id',
+            'state'     => 'cdh.state',
+            'output'    => 'cdh.output'
+        ),
+        'hosts' => array(
+            'host_display_name' => 'cdh.host_display_name',
+            'host_name'         => 'cdh.host_name'
+        ),
+        'services' => array(
+            'service_description'   => 'cdh.service_description',
+            'service_display_name'  => 'cdh.service_display_name',
+            'service_host_name'     => 'cdh.service_host_name'
         )
     );
 
-    public function whereToSql($col, $sign, $expression)
-    {
-        if ($col === 'UNIX_TIMESTAMP(h.deletion_time)') {
-            return 'h.deletion_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
-        } else {
-            return parent::whereToSql($col, $sign, $expression);
-        }
-    }
+    /**
+     * The union
+     *
+     * @var Zend_Db_Select
+     */
+    protected $commentDeletionHistoryQuery;
 
+    /**
+     * Subqueries used for the comment history query
+     *
+     * @var IdoQuery[]
+     */
+    protected $subQueries = array();
+
+    /**
+     * Whether to additionally select all history columns
+     *
+     * @var bool
+     */
+    protected $fetchHistoryColumns = false;
+
+    /**
+     * {@inheritdoc}
+     */
     protected function joinBaseTables()
     {
+        $this->commentDeletionHistoryQuery = $this->db->select();
         $this->select->from(
-            array('o' => $this->prefix . 'objects'),
-            array()
-        )->join(
-            array('h' => $this->prefix . 'commenthistory'),
-            'o.' . $this->object_id . ' = h.' . $this->object_id . " AND o.is_active = 1 AND h.deletion_time > '1970-01-02 00:00:00' AND h.entry_type <> 2",
+            array('cdh' => $this->commentDeletionHistoryQuery),
             array()
         );
-        $this->joinedVirtualTables = array('commenthistory' => true);
+        $this->joinedVirtualTables['commenthistory'] = true;
     }
 
+    /**
+     * Join history related columns and tables
+     */
+    protected function joinHistory()
+    {
+        // TODO: Ensure that one is selecting the history columns first...
+        $this->fetchHistoryColumns = true;
+        $this->requireVirtualTable('hosts');
+        $this->requireVirtualTable('services');
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $columns = array_keys(
+            $this->columnMap['commenthistory'] + $this->columnMap['hosts']
+        );
+        foreach ($this->columnMap['services'] as $column => $_) {
+            $columns[$column] = new Zend_Db_Expr('NULL');
+        }
+        if ($this->fetchHistoryColumns) {
+            $columns = array_merge($columns, array_keys($this->columnMap['history']));
+        }
+        $hosts = $this->createSubQuery('Hostcommentdeletionhistory', $columns);
+        $this->subQueries[] = $hosts;
+        $this->commentDeletionHistoryQuery->union(array($hosts), Zend_Db_Select::SQL_UNION_ALL);
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $columns = array_keys(
+            $this->columnMap['commenthistory'] + $this->columnMap['hosts'] + $this->columnMap['services']
+        );
+        if ($this->fetchHistoryColumns) {
+            $columns = array_merge($columns, array_keys($this->columnMap['history']));
+        }
+        $services = $this->createSubQuery('Servicecommentdeletionhistory', $columns);
+        $this->subQueries[] = $services;
+        $this->commentDeletionHistoryQuery->union(array($services), Zend_Db_Select::SQL_UNION_ALL);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function order($columnOrAlias, $dir = null)
+    {
+        foreach ($this->subQueries as $sub) {
+            $sub->requireColumn($columnOrAlias);
+        }
+        return parent::order($columnOrAlias, $dir);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function where($condition, $value = null)
+    {
+        $this->requireColumn($condition);
+        foreach ($this->subQueries as $sub) {
+            $sub->where($condition, $value);
+        }
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addFilter(Filter $filter)
+    {
+        foreach ($this->subQueries as $sub) {
+            $sub->applyFilter(clone $filter);
+        }
+        return $this;
+    }
 }

From 5b18ff7965529ecaa4bdd2eb2ab3796b30da771c Mon Sep 17 00:00:00 2001
From: Paul Richards <paul@minimoo.org>
Date: Mon, 30 Mar 2015 21:42:29 +0100
Subject: [PATCH 2136/2920] Fix PHP warning on windows due to LC_MESSAGES not
 defined.

fixes #8912
---
 AUTHORS                            | 1 +
 library/Icinga/Util/Translator.php | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 8a0bc91d0..f56d6e24d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,6 +18,7 @@ Marius Hein <marius.hein@netways.de>
 Markus Frosch <markus@lazyfrosch.de>
 Matthias Jentsch <matthias.jentsch@netways.de>
 Michael Friedrich <michael.friedrich@netways.de>
+Paul Richards <paul@minimoo.org>
 Rene Moser <rene.moser@swisstxt.ch>
 Susanne Vestner-Ludwig <susanne.vestner-ludwig@inserteffect.com>
 Sylph Lin <sylph.lin@gmail.com>
diff --git a/library/Icinga/Util/Translator.php b/library/Icinga/Util/Translator.php
index 67825b63b..a4524cee7 100644
--- a/library/Icinga/Util/Translator.php
+++ b/library/Icinga/Util/Translator.php
@@ -5,6 +5,10 @@ namespace Icinga\Util;
 
 use Icinga\Exception\IcingaException;
 
+if (!defined('LC_MESSAGES')) {
+    define('LC_MESSAGES', 6);
+}
+
 /**
  * Helper class to ease internationalization when using gettext
  */

From 4607a85cf5745bb99a12f4b5e829447d82c09f6e Mon Sep 17 00:00:00 2001
From: Paul Richards <paul@minimoo.org>
Date: Mon, 30 Mar 2015 23:09:24 +0100
Subject: [PATCH 2137/2920] IIS: use 'config' folder within icingaweb root on
 windows

fixes #8916
---
 library/Icinga/Application/ApplicationBootstrap.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index e265b91ee..ce5997c50 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -138,7 +138,13 @@ abstract class ApplicationBootstrap
             if (array_key_exists('ICINGAWEB_CONFIGDIR', $_SERVER)) {
                 $configDir = $_SERVER['ICINGAWEB_CONFIGDIR'];
             } else {
-                $configDir = '/etc/icingaweb2';
+                // default configuration path. Use /etc/icingaweb2 on linux
+                // For config on windows - use config folder within php code
+                if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+                    $configDir = $baseDir . '/config';
+                } else {
+                    $configDir = '/etc/icingaweb2';
+                }
             }
         }
         $canonical = realpath($configDir);

From 1e0219f6975eb6f47870c74a0edd374b9e51c7eb Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 12 Jun 2015 10:38:11 +0200
Subject: [PATCH 2138/2920] Revert "IIS: use 'config' folder within icingaweb
 root on windows"

This reverts commit 4607a85cf5745bb99a12f4b5e829447d82c09f6e.
---
 library/Icinga/Application/ApplicationBootstrap.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index ce5997c50..e265b91ee 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -138,13 +138,7 @@ abstract class ApplicationBootstrap
             if (array_key_exists('ICINGAWEB_CONFIGDIR', $_SERVER)) {
                 $configDir = $_SERVER['ICINGAWEB_CONFIGDIR'];
             } else {
-                // default configuration path. Use /etc/icingaweb2 on linux
-                // For config on windows - use config folder within php code
-                if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-                    $configDir = $baseDir . '/config';
-                } else {
-                    $configDir = '/etc/icingaweb2';
-                }
+                $configDir = '/etc/icingaweb2';
             }
         }
         $canonical = realpath($configDir);

From 0bce5e83add6a830108bf95299e752a5604c5517 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 12 Jun 2015 10:38:25 +0200
Subject: [PATCH 2139/2920] Revert "Fix PHP warning on windows due to
 LC_MESSAGES not defined."

This reverts commit 5b18ff7965529ecaa4bdd2eb2ab3796b30da771c.
---
 AUTHORS                            | 1 -
 library/Icinga/Util/Translator.php | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index f56d6e24d..8a0bc91d0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,7 +18,6 @@ Marius Hein <marius.hein@netways.de>
 Markus Frosch <markus@lazyfrosch.de>
 Matthias Jentsch <matthias.jentsch@netways.de>
 Michael Friedrich <michael.friedrich@netways.de>
-Paul Richards <paul@minimoo.org>
 Rene Moser <rene.moser@swisstxt.ch>
 Susanne Vestner-Ludwig <susanne.vestner-ludwig@inserteffect.com>
 Sylph Lin <sylph.lin@gmail.com>
diff --git a/library/Icinga/Util/Translator.php b/library/Icinga/Util/Translator.php
index a4524cee7..67825b63b 100644
--- a/library/Icinga/Util/Translator.php
+++ b/library/Icinga/Util/Translator.php
@@ -5,10 +5,6 @@ namespace Icinga\Util;
 
 use Icinga\Exception\IcingaException;
 
-if (!defined('LC_MESSAGES')) {
-    define('LC_MESSAGES', 6);
-}
-
 /**
  * Helper class to ease internationalization when using gettext
  */

From 48870bb7e2ed392a6898591b20eace0c96f54993 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 12 Jun 2015 11:09:28 +0200
Subject: [PATCH 2140/2920] Don't use /etc/icingaweb2 as config path on Windows

fixes #8916
---
 library/Icinga/Application/ApplicationBootstrap.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index e265b91ee..53c2c70c7 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -134,18 +134,20 @@ abstract class ApplicationBootstrap
         $this->vendorDir = $baseDir . '/library/vendor';
         $this->libDir = realpath(__DIR__ . '/../..');
 
+        $this->setupAutoloader();
+
         if ($configDir === null) {
             if (array_key_exists('ICINGAWEB_CONFIGDIR', $_SERVER)) {
                 $configDir = $_SERVER['ICINGAWEB_CONFIGDIR'];
             } else {
-                $configDir = '/etc/icingaweb2';
+                $configDir = Platform::isWindows()
+                    ? $baseDir . DIRECTORY_SEPARATOR . 'config'
+                    : '/etc/icingaweb2';
             }
         }
         $canonical = realpath($configDir);
         $this->configDir = $canonical ? $canonical : $configDir;
 
-        $this->setupAutoloader();
-
         set_include_path(
             implode(
                 PATH_SEPARATOR,

From 9fe2d4928d2542348a0e6932951628588875396c Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 12 Jun 2015 12:28:30 +0200
Subject: [PATCH 2141/2920] Translator: fall back to LC_ALL if LC_MESSAGES is
 not defined

fixes #8912
---
 library/Icinga/Util/Translator.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Util/Translator.php b/library/Icinga/Util/Translator.php
index 67825b63b..03fd865cd 100644
--- a/library/Icinga/Util/Translator.php
+++ b/library/Icinga/Util/Translator.php
@@ -100,7 +100,11 @@ class Translator
     {
         $contextString = "{$context}\004{$text}";
 
-        $translation = dcgettext($domain, $contextString, LC_MESSAGES);
+        $translation = dcgettext(
+            $domain,
+            $contextString,
+            defined('LC_MESSAGES') ? LC_MESSAGES : LC_ALL
+        );
 
         if ($translation == $contextString) {
             return $text;
@@ -126,7 +130,13 @@ class Translator
     {
         $contextString = "{$context}\004{$textSingular}";
 
-        $translation = dcngettext($domain, $contextString, $textPlural, $number, LC_MESSAGES);
+        $translation = dcngettext(
+            $domain,
+            $contextString,
+            $textPlural,
+            $number,
+            defined('LC_MESSAGES') ? LC_MESSAGES : LC_ALL
+        );
 
         if ($translation == $contextString || $translation == $textPlural) {
             return ($number == 1 ? $textSingular : $textPlural);

From 18d3fcbbf7500fdd3ed618ac2bf71d9ebb8c4e9f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 12 Jun 2015 12:44:25 +0200
Subject: [PATCH 2142/2920] Introduce query HostdowntimestarthistoryQuery

refs #9009
---
 .../Query/HostdowntimestarthistoryQuery.php   | 189 ++++++++++++++++++
 1 file changed, 189 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
new file mode 100644
index 000000000..05b8307a5
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
@@ -0,0 +1,189 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+/**
+ * Query for host downtime start history records
+ */
+class HostdowntimestarthistoryQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'downtimehistory' => array(
+            'host'          => 'ho.name1 COLLATE latin1_general_ci',
+            'host_name'     => 'ho.name1',
+            'object_type'   => '(\'host\')'
+        ),
+        'history' => array(
+            'type'      => "('dt_start')",
+            'timestamp' => 'UNIX_TIMESTAMP(hdh.actual_start_time)',
+            'object_id' => 'hdh.object_id',
+            'state'     => '(NULL)',
+            'output'    => "('[' || hdh.author_name || '] ' || hdh.comment_data)",
+        ),
+        'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
+        ),
+        'hosts' => array(
+            'host_alias'        => 'h.alias',
+            'host_display_name' => 'h.display_name COLLATE latin1_general_ci'
+        ),
+        'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
+        ),
+        'services' => array(
+            'service'               => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'   => 'so.name2',
+            'service_display_name'  => 's.display_name COLLATE latin1_general_ci',
+            'service_host_name'     => 'so.name1'
+        )
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    public function whereToSql($col, $sign, $expression)
+    {
+        if ($col === 'UNIX_TIMESTAMP(hdh.actual_start_time)') {
+            return 'hdh.actual_start_time ' . $sign . ' ' . $this->timestampForSql(
+                $this->valueToTimestamp($expression)
+            );
+        } else {
+            return parent::whereToSql($col, $sign, $expression);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        $this->select->from(
+            array('hdh' => $this->prefix . 'downtimehistory'),
+            array()
+        )->join(
+            array('ho' => $this->prefix . 'objects'),
+            'ho.object_id = hdh.object_id',
+            array()
+        )->where(
+            'ho.is_active = ?',
+            1
+        )->where(
+            'ho.objecttype_id = ?',
+            1
+        );
+
+        if (@func_get_arg(0) === false) {
+            $this->select->where(
+                "hdh.actual_start_time > '1970-01-02 00:00:00'"
+            );
+        }
+
+        $this->joinedVirtualTables['downtimehistory'] = true;
+        $this->joinedVirtualTables['history'] = true;
+    }
+
+    /**
+     * Join host groups
+     */
+    protected function joinHostgroups()
+    {
+        $this->select->join(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = ho.object_id',
+            array()
+        )->join(
+            array('hg' => $this->prefix . 'hostgroups'),
+            'hg.hostgroup_id = hgm.hostgroup_id',
+            array()
+        )->join(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hg.hostgroup_object_id',
+            array()
+        )->where(
+            'hgo.is_active = ?',
+            1
+        )
+        ->where(
+            'hgo.objecttype_id = ?',
+            3
+        );
+        $this->select->group(array('hdh.downtimehistory_id', 'ho.name1'));
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $this->select->join(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = ho.object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = s.service_object_id',
+            array()
+        )->join(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sg.' . $this->servicegroup_id . ' = sgm.servicegroup_id',
+            array()
+        )->join(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id',
+            array()
+        )->where(
+            'sgo.is_active = ?',
+            1
+        )
+        ->where(
+            'sgo.objecttype_id = ?',
+            4
+        );
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $this->select->join(
+            array('s' => $this->prefix . 'services'),
+            's.host_object_id = ho.object_id',
+            array()
+        )->join(
+            array('so' => $this->prefix . 'objects'),
+            'so.object_id = s.service_object_id',
+            array()
+        )->where(
+            'so.is_active = ?',
+            1
+        )
+        ->where(
+            'so.objecttype_id = ?',
+            2
+        );
+        $this->select->group(array('hdh.downtimehistory_id', 'ho.name1'));
+    }
+}

From 7afa4dac9aef5b52a83b955fd473966ffc5a5fb3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 12 Jun 2015 12:44:35 +0200
Subject: [PATCH 2143/2920] Introduce query HostdowntimeendhistoryQuery

refs #9009
---
 .../Ido/Query/HostdowntimeendhistoryQuery.php | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeendhistoryQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeendhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeendhistoryQuery.php
new file mode 100644
index 000000000..8ef831f80
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeendhistoryQuery.php
@@ -0,0 +1,39 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+/**
+ * Query for host downtime end history records
+ */
+class HostdowntimeendhistoryQuery extends HostdowntimestarthistoryQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function whereToSql($col, $sign, $expression)
+    {
+        if ($col === 'UNIX_TIMESTAMP(hdh.actual_end_time)') {
+            return 'hdh.actual_end_time ' . $sign . ' ' . $this->timestampForSql(
+                $this->valueToTimestamp($expression)
+            );
+        } else {
+            return parent::whereToSql($col, $sign, $expression);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        parent::joinBaseTables(true);
+        $this->select->where("hdh.actual_end_time > '1970-01-02 00:00:00'");
+        $this->columnMap['history']['type'] = "('dt_end')";
+        $this->columnMap['history']['timestamp'] = str_replace(
+            'actual_start_time',
+            'actual_end_time',
+            $this->columnMap['history']['timestamp']
+        );
+    }
+}

From 3ed858269c52da8e41ead4c02d2baa93cef7d1c2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 12 Jun 2015 12:44:49 +0200
Subject: [PATCH 2144/2920] Introduce query ServicedowntimestarthistoryQuery

refs #9009
---
 .../ServicedowntimestarthistoryQuery.php      | 180 ++++++++++++++++++
 1 file changed, 180 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
new file mode 100644
index 000000000..7b1f1989a
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
@@ -0,0 +1,180 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+/**
+ * Query for service downtime start history records
+ */
+class ServicedowntimestarthistoryQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'downtimehistory' => array(
+            'host'                  => 'so.name1 COLLATE latin1_general_ci',
+            'host_name'             => 'so.name1',
+            'object_type'           => '(\'service\')',
+            'service'               => 'so.name2 COLLATE latin1_general_ci',
+            'service_description'   => 'so.name2',
+            'service_host'          => 'so.name1 COLLATE latin1_general_ci',
+            'service_host_name'     => 'so.name1'
+        ),
+        'history' => array(
+            'type'      => "('dt_start')",
+            'timestamp' => 'UNIX_TIMESTAMP(sdh.actual_start_time)',
+            'object_id' => 'sdh.object_id',
+            'state'     => '(NULL)',
+            'output'    => "('[' || sdh.author_name || '] ' || sdh.comment_data)",
+        ),
+        'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
+        ),
+        'hosts' => array(
+            'host_alias'        => 'h.alias',
+            'host_display_name' => 'h.display_name COLLATE latin1_general_ci'
+        ),
+        'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
+        ),
+        'services' => array(
+            'service_display_name'  => 's.display_name COLLATE latin1_general_ci'
+        )
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    public function whereToSql($col, $sign, $expression)
+    {
+        if ($col === 'UNIX_TIMESTAMP(sdh.actual_start_time)') {
+            return 'sdh.actual_start_time ' . $sign . ' ' . $this->timestampForSql(
+                $this->valueToTimestamp($expression)
+            );
+        } else {
+            return parent::whereToSql($col, $sign, $expression);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        $this->select->from(
+            array('sdh' => $this->prefix . 'downtimehistory'),
+            array()
+        )->join(
+            array('so' => $this->prefix . 'objects'),
+            'so.object_id = sdh.object_id',
+            array()
+        )->where(
+            'so.is_active = ?',
+            1
+        )->where(
+            'so.objecttype_id = ?',
+            2
+        );
+
+        if (@func_get_arg(0) === false) {
+            $this->select->where(
+                "sdh.actual_start_time > '1970-01-02 00:00:00'"
+            );
+        }
+
+        $this->joinedVirtualTables['downtimehistory'] = true;
+        $this->joinedVirtualTables['history'] = true;
+    }
+
+    /**
+     * Join host groups
+     */
+    protected function joinHostgroups()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = s.host_object_id',
+            array()
+        )->join(
+            array('hg' => $this->prefix . 'hostgroups'),
+            'hg.hostgroup_id = hgm.hostgroup_id',
+            array()
+        )->join(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hg.hostgroup_object_id',
+            array()
+        )->where(
+            'hgo.is_active = ?',
+            1
+        )
+        ->where(
+            'hgo.objecttype_id = ?',
+            3
+        );
+        $this->select->group(array('sdh.downtimehistory_id', 'so.name1', 'so.name2'));
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->join(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_object_id = s.host_object_id',
+            array()
+        );
+    }
+
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->select->join(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = so.object_id',
+            array()
+        )->join(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sg.' . $this->servicegroup_id . ' = sgm.servicegroup_id',
+            array()
+        )->join(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id',
+            array()
+        )->where(
+            'sgo.is_active = ?',
+            1
+        )
+        ->where(
+            'sgo.objecttype_id = ?',
+            4
+        );
+        $this->select->group(array('sdh.downtimehistory_id', 'so.name1', 'so.name2'));
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $this->select->join(
+            array('s' => $this->prefix . 'services'),
+            's.service_object_id = so.object_id',
+            array()
+        );
+    }
+}

From 95b5bba65c8b2b8ef5329be60c29c5e82d938ed7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 12 Jun 2015 12:45:02 +0200
Subject: [PATCH 2145/2920] Introduce query ServicedowntimeendhistoryQuery

refs #9009
---
 .../Query/ServicedowntimeendhistoryQuery.php  | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeendhistoryQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeendhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeendhistoryQuery.php
new file mode 100644
index 000000000..44303a9cd
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeendhistoryQuery.php
@@ -0,0 +1,39 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+/**
+ * Query for host downtime end history records
+ */
+class ServicedowntimeendhistoryQuery extends ServicedowntimestarthistoryQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function whereToSql($col, $sign, $expression)
+    {
+        if ($col === 'UNIX_TIMESTAMP(sdh.actual_end_time)') {
+            return 'sdh.actual_end_time ' . $sign . ' ' . $this->timestampForSql(
+                $this->valueToTimestamp($expression)
+            );
+        } else {
+            return parent::whereToSql($col, $sign, $expression);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        parent::joinBaseTables(true);
+        $this->select->where("sdh.actual_end_time > '1970-01-02 00:00:00'");
+        $this->columnMap['history']['type'] = "('dt_end')";
+        $this->columnMap['history']['timestamp'] = str_replace(
+            'actual_start_time',
+            'actual_end_time',
+            $this->columnMap['history']['timestamp']
+        );
+    }
+}

From dadb3853d72b2fa2a2e395eb964b269e17a54932 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 12 Jun 2015 12:45:49 +0200
Subject: [PATCH 2146/2920] DowntimestarthistoryQuery: Use subqueries to fetch
 host and service downtimes

refs #9009
---
 .../Ido/Query/DowntimestarthistoryQuery.php   | 166 ++++++++++++++----
 1 file changed, 134 insertions(+), 32 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
index 6f23fe174..e312480e7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
@@ -3,49 +3,151 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
+use Zend_Db_Expr;
+use Zend_Db_Select;
+use Icinga\Data\Filter\Filter;
+
+/**
+ * Query for host and service downtime start history records
+ */
 class DowntimestarthistoryQuery extends IdoQuery
 {
+    /**
+     * {@inheritdoc}
+     */
     protected $columnMap = array(
         'downtimehistory' => array(
-            'state_time'            => 'h.actual_start_time',
-            'timestamp'             => 'UNIX_TIMESTAMP(h.actual_start_time)',
-            'raw_timestamp'         => 'h.actual_start_time',
-            'object_id'             => 'h.object_id',
-            'type'                  => "('dt_start')",
-            'state'                 => '(NULL)',
-            'state_type'            => '(NULL)',
-            'output'                => "('[' || h.author_name || '] ' || h.comment_data)",
-            'attempt'               => '(NULL)',
-            'max_attempts'          => '(NULL)',
-
-            'host'                  => 'o.name1 COLLATE latin1_general_ci',
-            'service'               => 'o.name2 COLLATE latin1_general_ci',
-            'host_name'             => 'o.name1',
-            'service_description'   => 'o.name2',
-            'object_type'           => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
+            'object_type' => 'dsh.object_type'
+        ),
+        'history' => array(
+            'type'      => 'dsh.type',
+            'timestamp' => 'dsh.timestamp',
+            'object_id' => 'dsh.object_id',
+            'state'     => 'dsh.state',
+            'output'    => 'dsh.output'
+        ),
+        'hosts' => array(
+            'host_display_name' => 'dsh.host_display_name',
+            'host_name'         => 'dsh.host_name'
+        ),
+        'services' => array(
+            'service_description'   => 'dsh.service_description',
+            'service_display_name'  => 'dsh.service_display_name',
+            'service_host_name'     => 'dsh.service_host_name'
         )
     );
 
-    public function whereToSql($col, $sign, $expression)
-    {
-        if ($col === 'UNIX_TIMESTAMP(h.actual_start_time)') {
-            return 'h.actual_start_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
-        } else {
-            return parent::whereToSql($col, $sign, $expression);
-        }
-    }
+    /**
+     * The union
+     *
+     * @var Zend_Db_Select
+     */
+    protected $downtimeStartHistoryQuery;
 
+    /**
+     * Subqueries used for the downtime start history query
+     *
+     * @var IdoQuery[]
+     */
+    protected $subQueries = array();
+
+    /**
+     * Whether to additionally select all history columns
+     *
+     * @var bool
+     */
+    protected $fetchHistoryColumns = false;
+
+    /**
+     * {@inheritdoc}
+     */
     protected function joinBaseTables()
     {
+        $this->downtimeStartHistoryQuery = $this->db->select();
         $this->select->from(
-            array('o' => $this->prefix . 'objects'),
+            array('dsh' => $this->downtimeStartHistoryQuery),
             array()
-        )->join(
-            array('h' => $this->prefix . 'downtimehistory'),
-            'o.' . $this->object_id . ' = h.' . $this->object_id . ' AND o.is_active = 1',
-            array()
-        )->where('h.actual_start_time > ?', '1970-01-02 00:00:00');
-        $this->joinedVirtualTables = array('downtimehistory' => true);
+        );
+        $this->joinedVirtualTables['downtimehistory'] = true;
+    }
+
+    /**
+     * Join history related columns and tables
+     */
+    protected function joinHistory()
+    {
+        // TODO: Ensure that one is selecting the history columns first...
+        $this->fetchHistoryColumns = true;
+        $this->requireVirtualTable('hosts');
+        $this->requireVirtualTable('services');
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $columns = array_keys(
+            $this->columnMap['downtimehistory'] + $this->columnMap['hosts']
+        );
+        foreach ($this->columnMap['services'] as $column => $_) {
+            $columns[$column] = new Zend_Db_Expr('NULL');
+        }
+        if ($this->fetchHistoryColumns) {
+            $columns = array_merge($columns, array_keys($this->columnMap['history']));
+        }
+        $hosts = $this->createSubQuery('Hostdowntimestarthistory', $columns);
+        $this->subQueries[] = $hosts;
+        $this->downtimeStartHistoryQuery->union(array($hosts), Zend_Db_Select::SQL_UNION_ALL);
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $columns = array_keys(
+            $this->columnMap['downtimehistory'] + $this->columnMap['hosts'] + $this->columnMap['services']
+        );
+        if ($this->fetchHistoryColumns) {
+            $columns = array_merge($columns, array_keys($this->columnMap['history']));
+        }
+        $services = $this->createSubQuery('Servicedowntimestarthistory', $columns);
+        $this->subQueries[] = $services;
+        $this->downtimeStartHistoryQuery->union(array($services), Zend_Db_Select::SQL_UNION_ALL);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function order($columnOrAlias, $dir = null)
+    {
+        foreach ($this->subQueries as $sub) {
+            $sub->requireColumn($columnOrAlias);
+        }
+        return parent::order($columnOrAlias, $dir);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function where($condition, $value = null)
+    {
+        $this->requireColumn($condition);
+        foreach ($this->subQueries as $sub) {
+            $sub->where($condition, $value);
+        }
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addFilter(Filter $filter)
+    {
+        foreach ($this->subQueries as $sub) {
+            $sub->applyFilter(clone $filter);
+        }
+        return $this;
     }
 }
-

From c35be4023b39882c8276ea281b9c70f8016b8f26 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 12 Jun 2015 12:45:59 +0200
Subject: [PATCH 2147/2920] DowntimeendhistoryQuery: Use subqueries to fetch
 host and service downtimes

refs #9009
---
 .../Ido/Query/DowntimeendhistoryQuery.php     | 166 ++++++++++++++----
 1 file changed, 134 insertions(+), 32 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
index 42d23ce05..08b6cec01 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
@@ -3,49 +3,151 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
+use Zend_Db_Expr;
+use Zend_Db_Select;
+use Icinga\Data\Filter\Filter;
+
+/**
+ * Query for host and service downtime end history records
+ */
 class DowntimeendhistoryQuery extends IdoQuery
 {
+    /**
+     * {@inheritdoc}
+     */
     protected $columnMap = array(
         'downtimehistory' => array(
-            'state_time'            => 'h.actual_end_time',
-            'timestamp'             => 'UNIX_TIMESTAMP(h.actual_end_time)',
-            'raw_timestamp'         => 'h.actual_end_time',
-            'object_id'             => 'h.object_id',
-            'type'                  => "('dt_end')",
-            'state'                 => '(NULL)',
-            'state_type'            => '(NULL)',
-            'output'                => "('[' || h.author_name || '] ' || h.comment_data)",
-            'attempt'               => '(NULL)',
-            'max_attempts'          => '(NULL)',
-
-            'host'                  => 'o.name1 COLLATE latin1_general_ci',
-            'service'               => 'o.name2 COLLATE latin1_general_ci',
-            'host_name'             => 'o.name1',
-            'service_description'   => 'o.name2',
-            'object_type'           => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
+            'object_type' => 'deh.object_type'
+        ),
+        'history' => array(
+            'type'      => 'deh.type',
+            'timestamp' => 'deh.timestamp',
+            'object_id' => 'deh.object_id',
+            'state'     => 'deh.state',
+            'output'    => 'deh.output'
+        ),
+        'hosts' => array(
+            'host_display_name' => 'deh.host_display_name',
+            'host_name'         => 'deh.host_name'
+        ),
+        'services' => array(
+            'service_description'   => 'deh.service_description',
+            'service_display_name'  => 'deh.service_display_name',
+            'service_host_name'     => 'deh.service_host_name'
         )
     );
 
-    public function whereToSql($col, $sign, $expression)
-    {
-        if ($col === 'UNIX_TIMESTAMP(h.actual_end_time)') {
-            return 'h.actual_end_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
-        } else {
-            return parent::whereToSql($col, $sign, $expression);
-        }
-    }
+    /**
+     * The union
+     *
+     * @var Zend_Db_Select
+     */
+    protected $downtimeEndHistoryQuery;
 
+    /**
+     * Subqueries used for the downtime end history query
+     *
+     * @var IdoQuery[]
+     */
+    protected $subQueries = array();
+
+    /**
+     * Whether to additionally select all history columns
+     *
+     * @var bool
+     */
+    protected $fetchHistoryColumns = false;
+
+    /**
+     * {@inheritdoc}
+     */
     protected function joinBaseTables()
     {
+        $this->downtimeEndHistoryQuery = $this->db->select();
         $this->select->from(
-            array('o' => $this->prefix . 'objects'),
+            array('deh' => $this->downtimeEndHistoryQuery),
             array()
-        )->join(
-            array('h' => $this->prefix . 'downtimehistory'),
-            'o.' . $this->object_id . ' = h.' . $this->object_id . ' AND o.is_active = 1',
-            array()
-        )->where('h.actual_end_time > ?', '1970-01-02 00:00:00');
-        $this->joinedVirtualTables = array('downtimehistory' => true);
+        );
+        $this->joinedVirtualTables['downtimehistory'] = true;
+    }
+
+    /**
+     * Join history related columns and tables
+     */
+    protected function joinHistory()
+    {
+        // TODO: Ensure that one is selecting the history columns first...
+        $this->fetchHistoryColumns = true;
+        $this->requireVirtualTable('hosts');
+        $this->requireVirtualTable('services');
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $columns = array_keys(
+            $this->columnMap['downtimehistory'] + $this->columnMap['hosts']
+        );
+        foreach ($this->columnMap['services'] as $column => $_) {
+            $columns[$column] = new Zend_Db_Expr('NULL');
+        }
+        if ($this->fetchHistoryColumns) {
+            $columns = array_merge($columns, array_keys($this->columnMap['history']));
+        }
+        $hosts = $this->createSubQuery('Hostdowntimeendhistory', $columns);
+        $this->subQueries[] = $hosts;
+        $this->downtimeEndHistoryQuery->union(array($hosts), Zend_Db_Select::SQL_UNION_ALL);
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $columns = array_keys(
+            $this->columnMap['downtimehistory'] + $this->columnMap['hosts'] + $this->columnMap['services']
+        );
+        if ($this->fetchHistoryColumns) {
+            $columns = array_merge($columns, array_keys($this->columnMap['history']));
+        }
+        $services = $this->createSubQuery('Servicedowntimeendhistory', $columns);
+        $this->subQueries[] = $services;
+        $this->downtimeEndHistoryQuery->union(array($services), Zend_Db_Select::SQL_UNION_ALL);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function order($columnOrAlias, $dir = null)
+    {
+        foreach ($this->subQueries as $sub) {
+            $sub->requireColumn($columnOrAlias);
+        }
+        return parent::order($columnOrAlias, $dir);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function where($condition, $value = null)
+    {
+        $this->requireColumn($condition);
+        foreach ($this->subQueries as $sub) {
+            $sub->where($condition, $value);
+        }
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addFilter(Filter $filter)
+    {
+        foreach ($this->subQueries as $sub) {
+            $sub->applyFilter(clone $filter);
+        }
+        return $this;
     }
 }
-

From 528df1b26a47509b0ca50b15176b5ff2cf74f991 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 12 Jun 2015 12:52:07 +0200
Subject: [PATCH 2148/2920] EventHistory: Add support for object restrictions

refs #9009
---
 .../Backend/Ido/Query/EventHistoryQuery.php   | 126 ++++--------------
 .../Monitoring/DataView/EventHistory.php      |  16 ++-
 2 files changed, 38 insertions(+), 104 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index 01652b070..e14fc6e86 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
@@ -7,16 +7,19 @@ use Zend_Db_Select;
 use Icinga\Data\Filter\Filter;
 
 /**
- * Query for event history
+ * Query for event history records
  */
 class EventHistoryQuery extends IdoQuery
 {
+    /**
+     * {@inheritdoc}
+     */
+    protected $useSubqueryCount = true;
+
     /**
      * Subqueries used for the event history query
      *
      * @type    IdoQuery[]
-     *
-     * @see     EventHistoryQuery::joinBaseTables() For the used subqueries.
      */
     protected $subQueries = array();
 
@@ -30,33 +33,18 @@ class EventHistoryQuery extends IdoQuery
             'cnt_soft_state'        => "SUM(CASE eh.type WHEN 'hard_state' THEN 1 ELSE 0 END)",
             'cnt_downtime_start'    => "SUM(CASE eh.type WHEN 'dt_start' THEN 1 ELSE 0 END)",
             'cnt_downtime_end'      => "SUM(CASE eh.type WHEN 'dt_end' THEN 1 ELSE 0 END)",
-            'host'                  => 'eho.name1 COLLATE latin1_general_ci',
-            'service'               => 'eho.name2 COLLATE latin1_general_ci',
-            'host_name'             => 'eho.name1',
-            'service_description'   => 'eho.name2',
+            'host_name'             => 'eh.host_name',
+            'service_description'   => 'eh.service_description',
             'object_type'           => 'eh.object_type',
             'timestamp'             => 'eh.timestamp',
             'state'                 => 'eh.state',
             'output'                => 'eh.output',
-            'type'                  => 'eh.type'
-        ),
-        'hostgroups' => array(
-            'hostgroup'             => 'hgo.name1 COLLATE latin1_general_ci',
-            'hostgroup_name'        => 'hgo.name1'
-        ),
-        'hosts' => array(
-            'host_display_name'     => 'CASE WHEN sh.display_name IS NOT NULL THEN sh.display_name ELSE h.display_name END'
-        ),
-        'services' => array(
-            'service_display_name'  => 's.display_name'
+            'type'                  => 'eh.type',
+            'host_display_name'     => 'eh.host_display_name',
+            'service_display_name'  => 'eh.service_display_name'
         )
     );
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $useSubqueryCount = true;
-
     /**
      * {@inheritdoc}
      */
@@ -64,11 +52,15 @@ class EventHistoryQuery extends IdoQuery
     {
         $columns = array(
             'timestamp',
-            'object_id',
-            'type',
             'output',
+            'type',
             'state',
-            'object_type'
+            'object_type',
+            'object_id',
+            'host_name',
+            'service_description',
+            'host_display_name',
+            'service_display_name'
         );
         $this->subQueries = array(
             $this->createSubQuery('Statehistory', $columns),
@@ -76,19 +68,11 @@ class EventHistoryQuery extends IdoQuery
             $this->createSubQuery('Downtimeendhistory', $columns),
             $this->createSubQuery('Commenthistory', $columns),
             $this->createSubQuery('Commentdeletionhistory', $columns),
-            $this->createSubQuery('Notificationhistory', $columns)
+            $this->createSubQuery('Notification', $columns)
         );
         $sub = $this->db->select()->union($this->subQueries, Zend_Db_Select::SQL_UNION_ALL);
-
-        $this->select->from(
-            array('eho' => $this->prefix . 'objects'),
-            '*'
-        )->join(
-            array('eh' => $sub),
-            'eho.' . $this->object_id . ' = eh.' . $this->object_id . ' AND eho.is_active = 1',
-            array()
-        );
-        $this->joinedVirtualTables = array('eventhistory' => true);
+        $this->select->from(array('eh' => $sub), array());
+        $this->joinedVirtualTables['eventhistory'] = true;
     }
 
     /**
@@ -102,17 +86,6 @@ class EventHistoryQuery extends IdoQuery
         return parent::order($columnOrAlias, $dir);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function addFilter(Filter $filter)
-    {
-        foreach ($this->subQueries as $sub) {
-            $sub->applyFilter(clone $filter);
-        }
-        return $this;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -126,60 +99,13 @@ class EventHistoryQuery extends IdoQuery
     }
 
     /**
-     * Join host groups
-     *
-     * @return $this
+     * {@inheritdoc}
      */
-    protected function joinHostgroups()
+    public function addFilter(Filter $filter)
     {
-        $this->select->join(
-            array('hgm' => $this->prefix . 'hostgroup_members'),
-            'hgm.host_object_id = eho.object_id',
-            array()
-        )->join(
-            array('hg' => $this->prefix . 'hostgroups'),
-            'hgm.hostgroup_id = hg.' . $this->hostgroup_id,
-            array()
-        )->join(
-            array('hgo' => $this->prefix . 'objects'),
-            'hgo.' . $this->object_id. ' = hg.hostgroup_object_id' . ' AND hgo.is_active = 1',
-            array()
-        );
-        return $this;
-    }
-
-    /**
-     * Join hosts
-     *
-     * @return $this
-     */
-    protected function joinHosts()
-    {
-        $this->select->joinLeft(
-            array('h' => $this->prefix . 'hosts'),
-            'h.host_object_id = eho.object_id',
-            array()
-        );
-        return $this;
-    }
-
-    /**
-     * Join services
-     *
-     * @return $this
-     */
-    protected function joinServices()
-    {
-        $this->select->joinLeft(
-            array('s' => $this->prefix . 'services'),
-            's.service_object_id = eho.object_id',
-            array()
-        );
-        $this->select->joinLeft(
-            array('sh' => $this->prefix . 'hosts'),
-            'sh.host_object_id = s.host_object_id',
-            array()
-        );
+        foreach ($this->subQueries as $sub) {
+            $sub->applyFilter(clone $filter);
+        }
         return $this;
     }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/EventHistory.php b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
index c19a4a376..b826b535c 100644
--- a/modules/monitoring/library/Monitoring/DataView/EventHistory.php
+++ b/modules/monitoring/library/Monitoring/DataView/EventHistory.php
@@ -22,17 +22,17 @@ class EventHistory extends DataView
             'host_display_name',
             'service_description',
             'service_display_name',
-            'hostgroup_name',
             'object_type',
             'timestamp',
             'state',
-            'attempt',
-            'max_attempts',
             'output',
             'type'
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getSortRules()
     {
         return array(
@@ -43,8 +43,16 @@ class EventHistory extends DataView
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getFilterColumns()
     {
-        return array('host', 'service', 'hostgroup');
+        return array(
+            'host', 'host_alias',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+        );
     }
 }

From 76b17462f9826e0ea228166a273831ccfdf04125 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 12 Jun 2015 12:52:29 +0200
Subject: [PATCH 2149/2920] ListController: Restrict eventhistoryAction

refs 9009
---
 modules/monitoring/application/controllers/ListController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 9a6f986b1..25f184308 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -579,6 +579,7 @@ class Monitoring_ListController extends Controller
             'type'
         ));
 
+        $this->applyRestriction('monitoring/filter/objects', $query);
         $this->filterQuery($query);
         $this->view->history = $query;
 

From b58ffbe0341291fb19d351e8c6586ca1df9c24f9 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 12 Jun 2015 13:29:31 +0200
Subject: [PATCH 2150/2920] Revert "Translator: fall back to LC_ALL if
 LC_MESSAGES is not defined"

This reverts commit 9fe2d4928d2542348a0e6932951628588875396c.
---
 library/Icinga/Util/Translator.php | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/library/Icinga/Util/Translator.php b/library/Icinga/Util/Translator.php
index 03fd865cd..67825b63b 100644
--- a/library/Icinga/Util/Translator.php
+++ b/library/Icinga/Util/Translator.php
@@ -100,11 +100,7 @@ class Translator
     {
         $contextString = "{$context}\004{$text}";
 
-        $translation = dcgettext(
-            $domain,
-            $contextString,
-            defined('LC_MESSAGES') ? LC_MESSAGES : LC_ALL
-        );
+        $translation = dcgettext($domain, $contextString, LC_MESSAGES);
 
         if ($translation == $contextString) {
             return $text;
@@ -130,13 +126,7 @@ class Translator
     {
         $contextString = "{$context}\004{$textSingular}";
 
-        $translation = dcngettext(
-            $domain,
-            $contextString,
-            $textPlural,
-            $number,
-            defined('LC_MESSAGES') ? LC_MESSAGES : LC_ALL
-        );
+        $translation = dcngettext($domain, $contextString, $textPlural, $number, LC_MESSAGES);
 
         if ($translation == $contextString || $translation == $textPlural) {
             return ($number == 1 ? $textSingular : $textPlural);

From 7ea6eeb20de335fa6f035405356f1d82795be66b Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 12 Jun 2015 13:29:36 +0200
Subject: [PATCH 2151/2920] Revert "Don't use /etc/icingaweb2 as config path on
 Windows"

This reverts commit 48870bb7e2ed392a6898591b20eace0c96f54993.
---
 library/Icinga/Application/ApplicationBootstrap.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 53c2c70c7..e265b91ee 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -134,20 +134,18 @@ abstract class ApplicationBootstrap
         $this->vendorDir = $baseDir . '/library/vendor';
         $this->libDir = realpath(__DIR__ . '/../..');
 
-        $this->setupAutoloader();
-
         if ($configDir === null) {
             if (array_key_exists('ICINGAWEB_CONFIGDIR', $_SERVER)) {
                 $configDir = $_SERVER['ICINGAWEB_CONFIGDIR'];
             } else {
-                $configDir = Platform::isWindows()
-                    ? $baseDir . DIRECTORY_SEPARATOR . 'config'
-                    : '/etc/icingaweb2';
+                $configDir = '/etc/icingaweb2';
             }
         }
         $canonical = realpath($configDir);
         $this->configDir = $canonical ? $canonical : $configDir;
 
+        $this->setupAutoloader();
+
         set_include_path(
             implode(
                 PATH_SEPARATOR,

From e8cdcce61df3c47f5ba55621bd14e8aac8f5af5d Mon Sep 17 00:00:00 2001
From: Paul Richards <paul@minimoo.org>
Date: Mon, 30 Mar 2015 21:42:29 +0100
Subject: [PATCH 2152/2920] Fix PHP warning on Windows due to LC_MESSAGES not
 defined

Signed-off-by: Alexander A. Klimov <alexander.klimov@netways.de>
with the following changes:

Don't define LC_MESSAGES globally as only 2 methods would need that
Use LC_ALL rather than 6

fixes #8912
---
 AUTHORS                            |  1 +
 library/Icinga/Util/Translator.php | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 8a0bc91d0..f56d6e24d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,6 +18,7 @@ Marius Hein <marius.hein@netways.de>
 Markus Frosch <markus@lazyfrosch.de>
 Matthias Jentsch <matthias.jentsch@netways.de>
 Michael Friedrich <michael.friedrich@netways.de>
+Paul Richards <paul@minimoo.org>
 Rene Moser <rene.moser@swisstxt.ch>
 Susanne Vestner-Ludwig <susanne.vestner-ludwig@inserteffect.com>
 Sylph Lin <sylph.lin@gmail.com>
diff --git a/library/Icinga/Util/Translator.php b/library/Icinga/Util/Translator.php
index 67825b63b..03fd865cd 100644
--- a/library/Icinga/Util/Translator.php
+++ b/library/Icinga/Util/Translator.php
@@ -100,7 +100,11 @@ class Translator
     {
         $contextString = "{$context}\004{$text}";
 
-        $translation = dcgettext($domain, $contextString, LC_MESSAGES);
+        $translation = dcgettext(
+            $domain,
+            $contextString,
+            defined('LC_MESSAGES') ? LC_MESSAGES : LC_ALL
+        );
 
         if ($translation == $contextString) {
             return $text;
@@ -126,7 +130,13 @@ class Translator
     {
         $contextString = "{$context}\004{$textSingular}";
 
-        $translation = dcngettext($domain, $contextString, $textPlural, $number, LC_MESSAGES);
+        $translation = dcngettext(
+            $domain,
+            $contextString,
+            $textPlural,
+            $number,
+            defined('LC_MESSAGES') ? LC_MESSAGES : LC_ALL
+        );
 
         if ($translation == $contextString || $translation == $textPlural) {
             return ($number == 1 ? $textSingular : $textPlural);

From edd8f5738fb66dd9c1a46eef7c162d92dcdea0b1 Mon Sep 17 00:00:00 2001
From: Paul Richards <paul@minimoo.org>
Date: Mon, 30 Mar 2015 22:22:21 +0100
Subject: [PATCH 2153/2920] Windows: Fix webrouter on IIS

Signed-off-by: Alexander A. Klimov <alexander.klimov@netways.de>
with the following changes:

Remove unneeded whitespace

fixes #8914
---
 library/Icinga/Application/webrouter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Application/webrouter.php b/library/Icinga/Application/webrouter.php
index 905fa7dca..5a7d1c95c 100644
--- a/library/Icinga/Application/webrouter.php
+++ b/library/Icinga/Application/webrouter.php
@@ -31,7 +31,7 @@ $baseDir = $_SERVER['DOCUMENT_ROOT'];
 $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
 
 // Fix aliases
-$remove = dirname($_SERVER['PHP_SELF']);
+$remove = str_replace('\\', '/', dirname($_SERVER['PHP_SELF']));
 if (substr($ruri, 0, strlen($remove)) !== $remove) {
     return false;
 }

From 4996f569fe26b53eab12e76d9b1ea5413b73a810 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 12 Jun 2015 14:42:49 +0200
Subject: [PATCH 2154/2920] monitoring: Ensure that views and queries are all
 named using the same scheme

That's "SomesuperQuery" and not "SomeSuperQuery", according to most
of the existing queries.
---
 modules/monitoring/application/clicommands/ListCommand.php  | 2 +-
 .../application/controllers/AlertsummaryController.php      | 2 +-
 .../monitoring/application/controllers/ListController.php   | 6 +++---
 .../monitoring/application/controllers/ShowController.php   | 2 +-
 .../application/controllers/TacticalController.php          | 2 +-
 .../application/controllers/TimelineController.php          | 2 +-
 .../Query/{EventHistoryQuery.php => EventhistoryQuery.php}  | 0
 .../{StatusSummaryQuery.php => StatussummaryQuery.php}      | 0
 .../DataView/{EventHistory.php => Eventhistory.php}         | 0
 .../Monitoring/DataView/{HostStatus.php => Hoststatus.php}  | 0
 .../DataView/{ServiceStatus.php => Servicestatus.php}       | 0
 .../DataView/{StatusSummary.php => Statussummary.php}       | 0
 modules/monitoring/library/Monitoring/Object/Host.php       | 4 ++--
 modules/monitoring/library/Monitoring/Object/HostList.php   | 2 +-
 .../library/Monitoring/Object/MonitoredObject.php           | 2 +-
 modules/monitoring/library/Monitoring/Object/Service.php    | 2 +-
 .../monitoring/library/Monitoring/Object/ServiceList.php    | 2 +-
 .../Monitoring/Web/Controller/MonitoredObjectController.php | 2 +-
 .../Monitoring/Web/Menu/MonitoringMenuItemRenderer.php      | 2 +-
 19 files changed, 16 insertions(+), 16 deletions(-)
 rename modules/monitoring/library/Monitoring/Backend/Ido/Query/{EventHistoryQuery.php => EventhistoryQuery.php} (100%)
 rename modules/monitoring/library/Monitoring/Backend/Ido/Query/{StatusSummaryQuery.php => StatussummaryQuery.php} (100%)
 rename modules/monitoring/library/Monitoring/DataView/{EventHistory.php => Eventhistory.php} (100%)
 rename modules/monitoring/library/Monitoring/DataView/{HostStatus.php => Hoststatus.php} (100%)
 rename modules/monitoring/library/Monitoring/DataView/{ServiceStatus.php => Servicestatus.php} (100%)
 rename modules/monitoring/library/Monitoring/DataView/{StatusSummary.php => Statussummary.php} (100%)

diff --git a/modules/monitoring/application/clicommands/ListCommand.php b/modules/monitoring/application/clicommands/ListCommand.php
index 9fd892652..c3f4ab951 100644
--- a/modules/monitoring/application/clicommands/ListCommand.php
+++ b/modules/monitoring/application/clicommands/ListCommand.php
@@ -156,7 +156,7 @@ class ListCommand extends Command
             'service_perfdata',
             'service_last_state_change'
         );
-        $query = $this->getQuery('serviceStatus', $columns)
+        $query = $this->getQuery('servicestatus', $columns)
             ->order('host_name');
         echo $this->renderStatusQuery($query);
     }
diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 1dc3b137b..41bbca96b 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -251,7 +251,7 @@ class Monitoring_AlertsummaryController extends Controller
         $interval = $this->getInterval();
 
         $query = $this->backend->select()->from(
-            'eventHistory',
+            'eventhistory',
             array(
                 'timestamp'
             )
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 25f184308..fa8781006 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -180,7 +180,7 @@ class Monitoring_ListController extends Controller
             'current_check_attempt' => 'service_current_check_attempt',
             'max_check_attempts'    => 'service_max_check_attempts'
         ), $this->addColumns());
-        $query = $this->backend->select()->from('serviceStatus', $columns);
+        $query = $this->backend->select()->from('servicestatus', $columns);
         $this->filterQuery($query);
         $this->applyRestriction('monitoring/filter/objects', $query);
         $this->view->services = $query;
@@ -567,7 +567,7 @@ class Monitoring_ListController extends Controller
             $this->translate('List event records')
         );
 
-        $query = $this->backend->select()->from('eventHistory', array(
+        $query = $this->backend->select()->from('eventhistory', array(
             'host_name',
             'host_display_name',
             'service_description',
@@ -594,7 +594,7 @@ class Monitoring_ListController extends Controller
     {
         $this->addTitleTab('servicegrid', $this->translate('Service Grid'), $this->translate('Show the Service Grid'));
         $this->setAutorefreshInterval(15);
-        $query = $this->backend->select()->from('serviceStatus', array(
+        $query = $this->backend->select()->from('servicestatus', array(
             'host_name',
             'service_description',
             'service_state',
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index cf71c7d32..6c2c03c18 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -211,7 +211,7 @@ class Monitoring_ShowController extends Controller
                 )
             );
         }
-        if ($this->backend->hasQuery('eventHistory')) {
+        if ($this->backend->hasQuery('eventhistory')) {
             $tabs->add(
                 'history',
                 array(
diff --git a/modules/monitoring/application/controllers/TacticalController.php b/modules/monitoring/application/controllers/TacticalController.php
index 95440a309..fa2e7deec 100644
--- a/modules/monitoring/application/controllers/TacticalController.php
+++ b/modules/monitoring/application/controllers/TacticalController.php
@@ -21,7 +21,7 @@ class Monitoring_TacticalController extends MonitoringController
             )
         )->extend(new DashboardAction())->activate('tactical_overview');
         $stats = $this->backend->select()->from(
-            'statusSummary',
+            'statussummary',
             array(
                 'hosts_up',
                 'hosts_pending',
diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php
index 6d313083f..24bc71f30 100644
--- a/modules/monitoring/application/controllers/TimelineController.php
+++ b/modules/monitoring/application/controllers/TimelineController.php
@@ -30,7 +30,7 @@ class Monitoring_TimelineController extends Controller
         $detailUrl = Url::fromPath('monitoring/list/eventhistory');
 
         $timeline = new TimeLine(
-            $this->backend->select()->from('eventHistory',
+            $this->backend->select()->from('eventhistory',
                 array(
                     'name' => 'type',
                     'time' => 'timestamp'
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventhistoryQuery.php
similarity index 100%
rename from modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
rename to modules/monitoring/library/Monitoring/Backend/Ido/Query/EventhistoryQuery.php
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatussummaryQuery.php
similarity index 100%
rename from modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
rename to modules/monitoring/library/Monitoring/Backend/Ido/Query/StatussummaryQuery.php
diff --git a/modules/monitoring/library/Monitoring/DataView/EventHistory.php b/modules/monitoring/library/Monitoring/DataView/Eventhistory.php
similarity index 100%
rename from modules/monitoring/library/Monitoring/DataView/EventHistory.php
rename to modules/monitoring/library/Monitoring/DataView/Eventhistory.php
diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php
similarity index 100%
rename from modules/monitoring/library/Monitoring/DataView/HostStatus.php
rename to modules/monitoring/library/Monitoring/DataView/Hoststatus.php
diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
similarity index 100%
rename from modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
rename to modules/monitoring/library/Monitoring/DataView/Servicestatus.php
diff --git a/modules/monitoring/library/Monitoring/DataView/StatusSummary.php b/modules/monitoring/library/Monitoring/DataView/Statussummary.php
similarity index 100%
rename from modules/monitoring/library/Monitoring/DataView/StatusSummary.php
rename to modules/monitoring/library/Monitoring/DataView/Statussummary.php
diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index dd9b4c0c1..4940ffdf1 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -137,7 +137,7 @@ class Host extends MonitoredObject
         if ($this->backend->getType() === 'livestatus') {
             $columns[] = 'host_contacts';
         }
-        return $this->backend->select()->from('hostStatus', $columns)
+        return $this->backend->select()->from('hoststatus', $columns)
             ->where('host_name', $this->host);
     }
 
@@ -149,7 +149,7 @@ class Host extends MonitoredObject
     public function fetchServices()
     {
         $services = array();
-        foreach ($this->backend->select()->from('serviceStatus', array('service_description'))
+        foreach ($this->backend->select()->from('servicestatus', array('service_description'))
                 ->where('host_name', $this->host)
                 ->getQuery()
                 ->fetchAll() as $service) {
diff --git a/modules/monitoring/library/Monitoring/Object/HostList.php b/modules/monitoring/library/Monitoring/Object/HostList.php
index e48fcc415..76b37dc7c 100644
--- a/modules/monitoring/library/Monitoring/Object/HostList.php
+++ b/modules/monitoring/library/Monitoring/Object/HostList.php
@@ -12,7 +12,7 @@ use Icinga\Util\String;
  */
 class HostList extends ObjectList
 {
-    protected $dataViewName = 'hostStatus';
+    protected $dataViewName = 'hoststatus';
 
     protected $columns = array('host_name');
 
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index fc4ad7e32..08b348988 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -449,7 +449,7 @@ abstract class MonitoredObject implements Filterable
      */
     public function fetchEventhistory()
     {
-        $eventHistory = $this->backend->select()->from('eventHistory', array(
+        $eventHistory = $this->backend->select()->from('eventhistory', array(
                 'object_type',
                 'host_name',
                 'host_display_name',
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index cb5615df1..855e62882 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -105,7 +105,7 @@ class Service extends MonitoredObject
      */
     protected function getDataView()
     {
-        return $this->backend->select()->from('serviceStatus', array(
+        return $this->backend->select()->from('servicestatus', array(
             'host_icon_image',
             'host_icon_image_alt',
             'host_acknowledged',
diff --git a/modules/monitoring/library/Monitoring/Object/ServiceList.php b/modules/monitoring/library/Monitoring/Object/ServiceList.php
index f96876666..8336a35a1 100644
--- a/modules/monitoring/library/Monitoring/Object/ServiceList.php
+++ b/modules/monitoring/library/Monitoring/Object/ServiceList.php
@@ -16,7 +16,7 @@ class ServiceList extends ObjectList
 
     protected $serviceStateSummary;
 
-    protected $dataViewName = 'serviceStatus';
+    protected $dataViewName = 'servicestatus';
 
     protected $columns = array('host_name', 'service_description');
 
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 7ac509d7b..997a2b782 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -181,7 +181,7 @@ abstract class MonitoredObjectController extends Controller
                 )
             );
         }
-        if ($this->backend->hasQuery('eventHistory')) {
+        if ($this->backend->hasQuery('eventhistory')) {
             $tabs->add(
                 'history',
                 array(
diff --git a/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php b/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php
index c32c155af..132012ba9 100644
--- a/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php
+++ b/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php
@@ -38,7 +38,7 @@ class MonitoringMenuItemRenderer extends MenuItemRenderer
     {
         if (self::$summary === null) {
             $summary = MonitoringBackend::instance()->select()->from(
-                'statusSummary',
+                'statussummary',
                 array(
                     'hosts_down_unhandled',
                     'services_critical_unhandled'

From aac5d49eed69a661653a604c4f2671da3745e31d Mon Sep 17 00:00:00 2001
From: Paul Richards <paul@minimoo.org>
Date: Mon, 30 Mar 2015 23:09:24 +0100
Subject: [PATCH 2155/2920] IIS: use 'config' folder within icingaweb root
 instead of '/etc/icingaweb2' on Windows

Signed-off-by: Alexander A. Klimov <alexander.klimov@netways.de>
with the following changes:

Make use of Platform::isWindows()
Call ::setupAutoloader() before that

fixes #8916
---
 library/Icinga/Application/ApplicationBootstrap.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index e265b91ee..6f409789a 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -134,18 +134,20 @@ abstract class ApplicationBootstrap
         $this->vendorDir = $baseDir . '/library/vendor';
         $this->libDir = realpath(__DIR__ . '/../..');
 
+        $this->setupAutoloader();
+
         if ($configDir === null) {
             if (array_key_exists('ICINGAWEB_CONFIGDIR', $_SERVER)) {
                 $configDir = $_SERVER['ICINGAWEB_CONFIGDIR'];
             } else {
-                $configDir = '/etc/icingaweb2';
+                $configDir = Platform::isWindows()
+                    ? $baseDir . '/config'
+                    : '/etc/icingaweb2';
             }
         }
         $canonical = realpath($configDir);
         $this->configDir = $canonical ? $canonical : $configDir;
 
-        $this->setupAutoloader();
-
         set_include_path(
             implode(
                 PATH_SEPARATOR,

From b6a7b43dd06738b1e191e708e6d87fe5d0b88423 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 12 Jun 2015 14:46:46 +0200
Subject: [PATCH 2156/2920] MonitoringBackend: Enforce that views and queries
 are of a particular naming scheme

I'm adding this mainly to not to break support with modules which are
utilizing our queries.
---
 .../Monitoring/Backend/MonitoringBackend.php  | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
index df29a6b50..012b7c110 100644
--- a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
@@ -263,21 +263,21 @@ class MonitoringBackend implements Selectable, Queryable, ConnectionInterface
     /**
      * View name to class name resolution
      *
-     * @param   string $viewName
+     * @param   string  $view
      *
      * @return  string
-     * @throws  ProgrammingError When the view does not exist
+     *
+     * @throws  ProgrammingError    In case the view does not exist
      */
     protected function buildViewClassName($view)
     {
-        $class = '\\Icinga\\Module\\Monitoring\\DataView\\' . ucfirst($view);
-        if (!class_exists($class)) {
-            throw new ProgrammingError(
-                'DataView %s does not exist',
-                ucfirst($view)
-            );
+        $class = ucfirst(strtolower($view));
+        $classPath = '\\Icinga\\Module\\Monitoring\\DataView\\' . $class;
+        if (! class_exists($classPath)) {
+            throw new ProgrammingError('DataView %s does not exist', $class);
         }
-        return $class;
+
+        return $classPath;
     }
 
     /**
@@ -287,6 +287,8 @@ class MonitoringBackend implements Selectable, Queryable, ConnectionInterface
      * @param  array  $columns Optional column list
      *
      * @return Icinga\Data\QueryInterface
+     *
+     * @throws  ProgrammingError When the query does not exist for this backend
      */
     public function query($name, $columns = null)
     {
@@ -318,16 +320,15 @@ class MonitoringBackend implements Selectable, Queryable, ConnectionInterface
     /**
      * Query name to class name resolution
      *
-     * @param   string $query
+     * @param   string  $query
      *
      * @return  string
-     * @throws  ProgrammingError When the query does not exist for this backend
      */
     protected function buildQueryClassName($query)
     {
         $parts = preg_split('~\\\~', get_class($this));
         array_pop($parts);
-        array_push($parts, 'Query', ucfirst($query) . 'Query');
+        array_push($parts, 'Query', ucfirst(strtolower($query)) . 'Query');
         return implode('\\', $parts);
     }
 }

From eb93886cc7e4903bf200792adac8a45d00e460af Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 12 Jun 2015 14:58:20 +0200
Subject: [PATCH 2157/2920] ListController: Do not apply restrictions before
 the filter editor is being set up

Might cause the restrictions being shown to the user..

refs #9009
---
 modules/monitoring/application/controllers/ListController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index fa8781006..e8760e02b 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -295,8 +295,8 @@ class Monitoring_ListController extends Controller
             'host_display_name',
             'service_display_name'
         ));
-        $this->applyRestriction('monitoring/filter/objects', $query);
         $this->filterQuery($query);
+        $this->applyRestriction('monitoring/filter/objects', $query);
         $this->view->notifications = $query;
 
         $this->setupLimitControl();

From 470c4a54a344931131122ac2e396a05b7ad30d08 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 12 Jun 2015 16:27:13 +0200
Subject: [PATCH 2158/2920] Eventgrid: Add support for object restrictions

refs #9009
---
 .../Backend/Ido/Query/EventgridQuery.php      | 116 +++++++-----------
 .../library/Monitoring/DataView/Eventgrid.php |  21 +++-
 2 files changed, 56 insertions(+), 81 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
index 2dac92e3d..cae57b8e0 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
@@ -3,89 +3,55 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
-class EventgridQuery extends IdoQuery
+class EventgridQuery extends StatehistoryQuery
 {
-    protected $columnMap = array(
-        'statehistory' => array(
-            'day'                  => 'DATE(sh.state_time)',
-            'cnt_events'           => 'COUNT(*)',
-            'objecttype_id'        => 'sho.objecttype_id',
-            'cnt_up'               => 'SUM(CASE WHEN sho.objecttype_id = 1 AND sh.state = 0 THEN 1 ELSE 0 END)',
-            'cnt_down_hard'        => 'SUM(CASE WHEN sho.objecttype_id = 1 AND sh.state = 1 AND state_type = 1 THEN 1 ELSE 0 END)',
-            'cnt_down'             => 'SUM(CASE WHEN sho.objecttype_id = 1 AND sh.state = 1 THEN 1 ELSE 0 END)',
-            'cnt_unreachable_hard' => 'SUM(CASE WHEN sho.objecttype_id = 1 AND sh.state = 2 AND state_type = 1 THEN 1 ELSE 0 END)',
-            'cnt_unreachable'      => 'SUM(CASE WHEN sho.objecttype_id = 1 AND sh.state = 2 THEN 1 ELSE 0 END)',
-            'cnt_unknown_hard'     => 'SUM(CASE WHEN sho.objecttype_id = 2 AND sh.state = 3 AND state_type = 1 THEN 1 ELSE 0 END)',
-            'cnt_unknown'          => 'SUM(CASE WHEN sho.objecttype_id = 2 AND sh.state = 3 THEN 1 ELSE 0 END)',
-            'cnt_unknown_hard'     => 'SUM(CASE WHEN sho.objecttype_id = 2 AND sh.state = 3 AND state_type = 1 THEN 1 ELSE 0 END)',
-            'cnt_critical'         => 'SUM(CASE WHEN sho.objecttype_id = 2 AND sh.state = 2 THEN 1 ELSE 0 END)',
-            'cnt_critical_hard'    => 'SUM(CASE WHEN sho.objecttype_id = 2 AND sh.state = 2 AND state_type = 1 THEN 1 ELSE 0 END)',
-            'cnt_warning'          => 'SUM(CASE WHEN sho.objecttype_id = 2 AND sh.state = 1 THEN 1 ELSE 0 END)',
-            'cnt_warning_hard'     => 'SUM(CASE WHEN sho.objecttype_id = 2 AND sh.state = 1 AND state_type = 1 THEN 1 ELSE 0 END)',
-            'cnt_ok'               => 'SUM(CASE WHEN sho.objecttype_id = 2 AND sh.state = 0 THEN 1 ELSE 0 END)',
-            'host'                => 'sho.name1 COLLATE latin1_general_ci',
-            'service'             => 'sho.name2 COLLATE latin1_general_ci',
-            'host_name'           => 'sho.name1',
-            'service_description' => 'sho.name2',
-            'timestamp'           => 'UNIX_TIMESTAMP(sh.state_time)'
-        ),
-
-        'servicegroups' => array(
-            'servicegroup'      => 'sgo.name1 COLLATE latin1_general_ci',
-            'servicegroup_name' => 'sgo.name1'
-        ),
-
-        'hostgroups' => array(
-            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
-            'hostgroup_name'    => 'hgo.name1'
-        )
+    /**
+     * The columns additionally provided by this query
+     *
+     * @var array
+     */
+    protected $additionalColumns = array(
+        'day'                   => 'DATE(FROM_UNIXTIME(sth.timestamp))',
+        'cnt_up'                => "SUM(CASE WHEN sth.object_type = 'host' AND sth.state = 0 THEN 1 ELSE 0 END)",
+        'cnt_down_hard'         => "SUM(CASE WHEN sth.object_type = 'host' AND sth.state = 1 AND sth.type = 'hard_state' THEN 1 ELSE 0 END)",
+        'cnt_down'              => "SUM(CASE WHEN sth.object_type = 'host' AND sth.state = 1 THEN 1 ELSE 0 END)",
+        'cnt_unreachable_hard'  => "SUM(CASE WHEN sth.object_type = 'host' AND sth.state = 2 AND sth.type = 'hard_state' THEN 1 ELSE 0 END)",
+        'cnt_unreachable'       => "SUM(CASE WHEN sth.object_type = 'host' AND sth.state = 2 THEN 1 ELSE 0 END)",
+        'cnt_unknown_hard'      => "SUM(CASE WHEN sth.object_type = 'service' AND sth.state = 3 AND sth.type = 'hard_state' THEN 1 ELSE 0 END)",
+        'cnt_unknown'           => "SUM(CASE WHEN sth.object_type = 'service' AND sth.state = 3 THEN 1 ELSE 0 END)",
+        'cnt_unknown_hard'      => "SUM(CASE WHEN sth.object_type = 'service' AND sth.state = 3 AND sth.type = 'hard_state' THEN 1 ELSE 0 END)",
+        'cnt_critical'          => "SUM(CASE WHEN sth.object_type = 'service' AND sth.state = 2 THEN 1 ELSE 0 END)",
+        'cnt_critical_hard'     => "SUM(CASE WHEN sth.object_type = 'service' AND sth.state = 2 AND sth.type = 'hard_state' THEN 1 ELSE 0 END)",
+        'cnt_warning'           => "SUM(CASE WHEN sth.object_type = 'service' AND sth.state = 1 THEN 1 ELSE 0 END)",
+        'cnt_warning_hard'      => "SUM(CASE WHEN sth.object_type = 'service' AND sth.state = 1 AND sth.type = 'hard_state' THEN 1 ELSE 0 END)",
+        'cnt_ok'                => "SUM(CASE WHEN sth.object_type = 'service' AND sth.state = 0 THEN 1 ELSE 0 END)"
     );
 
+    /**
+     * {@inheritdoc}
+     */
     protected function joinBaseTables()
     {
-        $this->select->from(
-            array('sh' => $this->prefix . 'statehistory'),
-            array()
-        )->join(
-            array('sho' => $this->prefix . 'objects'),
-            'sh.object_id = sho.object_id AND sho.is_active = 1',
-            array()
-        )
-        ->group('DATE(sh.state_time)');
-        $this->joinedVirtualTables = array('statehistory' => true);
+        parent::joinBaseTables();
+        $this->requireVirtualTable('history');
+        $this->columnMap['statehistory'] += $this->additionalColumns;
+        $this->select->group(array('DATE(FROM_UNIXTIME(sth.timestamp))'));
     }
 
-    protected function joinHostgroups()
+    /**
+     * {@inheritdoc}
+     */
+    public function order($columnOrAlias, $dir = null)
     {
-        $this->select->join(
-            array('hgm' => $this->prefix . 'hostgroup_members'),
-            'hgm.host_object_id = sho.object_id',
-            array()
-        )->join(
-            array('hgs' => $this->prefix . 'hostgroups'),
-            'hgm.hostgroup_id = hgs.hostgroup_id',
-            array()
-        )->join(
-            array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hgs.hostgroup_object_id',
-            array()
-        );
-    }
+        if (array_key_exists($columnOrAlias, $this->additionalColumns)) {
+            $subQueries = $this->subQueries;
+            $this->subQueries = array();
+            parent::order($columnOrAlias, $dir);
+            $this->subQueries = $subQueries;
+        } else {
+            parent::order($columnOrAlias, $dir);
+        }
 
-    protected function joinServicegroups()
-    {
-        $this->select->join(
-            array('sgm' => $this->prefix . 'servicegroup_members'),
-            'sgm.service_object_id = sho.object_id',
-            array()
-        )->join(
-            array('sgs' => $this->prefix . 'servicegroups'),
-            'sgm.servicegroup_id = sgs.servicegroup_id',
-            array()
-        )->join(
-            array('sgo' => $this->prefix . 'objects'),
-            'sgo.object_id = sgs.servicegroup_object_id',
-            array()
-        );
+        return $this;
     }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
index b7c7e0b3a..e95ed5cf8 100644
--- a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
+++ b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
@@ -14,8 +14,6 @@ class Eventgrid extends DataView
     {
         return array(
             'day',
-            'cnt_events',
-            'objecttype_id',
             'cnt_up',
             'cnt_down_hard',
             'cnt_down',
@@ -29,13 +27,16 @@ class Eventgrid extends DataView
             'cnt_warning_hard',
             'cnt_ok',
             'host_name',
+            'host_display_name',
             'service_description',
-            'timestamp',
-            'servicegroup_name',
-            'hostgroup_name'
+            'service_display_name',
+            'timestamp'
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getSortRules()
     {
         return array(
@@ -45,8 +46,16 @@ class Eventgrid extends DataView
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getFilterColumns()
     {
-        return array('host', 'service', 'hostgroup', 'servicegroup');
+        return array(
+            'host', 'host_alias',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'service_host_name',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+        );
     }
 }

From d5ade9ae74a49453d81fa819c63fb9aca9b2cac9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 12 Jun 2015 16:27:34 +0200
Subject: [PATCH 2159/2920] ListController: Restrict the eventgridAction

refs #9009
---
 modules/monitoring/application/controllers/ListController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index e8760e02b..0576d6e24 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -378,6 +378,7 @@ class Monitoring_ListController extends Controller
         $this->params->remove(array('objecttype', 'from', 'to', 'state', 'btn_submit'));
         $this->view->filter = Filter::fromQuerystring((string) $this->params);
         $query->applyFilter($this->view->filter);
+        $this->applyRestriction('monitoring/filter/objects', $query);
         $this->view->summary = $query->getQuery()->fetchAll();
         $this->view->column = $form->getValue('state');
 //        $this->view->orientationBox = $orientationBox;

From ea85254cc5b243d8ed6bce3ab6e15221cc39aeb9 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 15 Jun 2015 11:09:41 +0200
Subject: [PATCH 2160/2920] Fix typos and formatting in documentation

refs #9377
---
 doc/security.md             | 158 ++++++++++++++++--------------------
 modules/doc/doc/security.md |   4 +-
 2 files changed, 74 insertions(+), 88 deletions(-)

diff --git a/doc/security.md b/doc/security.md
index 201a6533c..f975c5c9b 100644
--- a/doc/security.md
+++ b/doc/security.md
@@ -2,24 +2,28 @@
 
 Access control is a vital part of configuring Icinga Web 2 in a secure way.
 It is important that not every user that has access to Icinga Web 2 is able
-to do any action or see any host and service. For example, it is useful to allow
-only a small group of administrators to change the Icinga Web 2 configuration, to prevent misconfiguration or security breaches. Another important use case is the creation groups of
-users that can only see the fraction of hosts and services of the monitoring
- environment they are in charge of.
+to do any action or to see any host and service. For example, it is useful to allow
+only a small group of administrators to change the Icinga Web 2 configuration, 
+to prevent misconfiguration or security breaches. Another important use case is 
+creating groups of users which can only see the fraction of the monitoring 
+environment they are in charge of.
 
 This chapter will describe how to do the security configuration of Icinga Web 2
-and how apply permissions and restrictions to users or groups of users.
+and how to apply permissions and restrictions to users or groups of users.
 
 ## Basics
 
-Icinga Web 2 access control is done by defining **roles** that relate permissions or restrictions to **users** and **group**.
-There are two general kinds of things to which access can be managed: actions and objects.
+Icinga Web 2 access control is done by defining **roles** that associate permissions 
+and restrictions with **users** and **groups**. There are two general kinds of 
+things to which access can be managed: actions and objects.
 
 
 ### Actions
 
 Actions are all the things an Icinga Web 2 user can do, like changing a certain configuration,
-changing permissions or sending a command to the Icinga instance through the <a href="http://docs.icinga.org/icinga2/latest/doc/module/icinga2/toc#!/icinga2/latest/doc/module/icinga2/chapter/getting-started#setting-up-external-command-pipe">Command Pipe</a> in the monitoring module. All actions must be be **allowed explicitly** using permissions.
+changing permissions or sending a command to the Icinga instance through the 
+<a href="http://docs.icinga.org/icinga2/latest/doc/module/icinga2/toc#!/icinga2/latest/doc/module/icinga2/chapter/getting-started#setting-up-external-command-pipe">Command Pipe</a> 
+in the monitoring module. All actions must be be **allowed explicitly** using permissions.
 
 A permission is a simple list of identifiers of actions a user is
 allowed to do. Permissions are described in greater detail in the
@@ -39,7 +43,8 @@ in greater detail in the section [Restrictions](#restrictions).
 Anyone who can **login** to Icinga Web 2 is considered a user and can be referenced to by the
 **user name** used during login.
 For example, there might be user called **jdoe** authenticated
-using Active Directory, and a user **icingaadmin** that is authenticated using a MySQL-Database as backend. Both can be referenced by using their the user names **icingaadmin** or **jdoe**, when referring to those users in the configuration.
+using Active Directory, and a user **icingaadmin** that is authenticated using a MySQL-Database as backend. 
+In the configuration, both can be referenced to by using their user names **icingaadmin** or **jdoe**.
 
 Icinga Web 2 users and groups are not configured by a configuration file, but provided by
 an **authentication backend**. For extended information on setting up authentication backends and managing users, please read the chapter [Authentication](authentication.md#authentication).
@@ -60,7 +65,7 @@ can be found at **Configuration > Authentication > Users **.
 ### Groups
 
 If there is a big amount of users to manage, it would be tedious to specify each user
-separately when referring to a bigger group of users often. Because of that, it is possible to group users together into groups.
+separately when regularly referring to the same group of users. Because of that, it is possible to group users.
 A user can be member of multiple groups and will inherit all permissions and restrictions.
 
 Like users, groups are identified solely by their **name** that is provided by
@@ -71,7 +76,7 @@ Like users, groups are identified solely by their **name** that is provided by
 #### Managing Groups
 
 When using a [Database as an authentication backend](#authentication.md#authentication-configuration-db-authentication),
-it is possible manage groups and group memberships directly in the frontend. This configuration
+it is possible to manage groups and group memberships directly in the frontend. This configuration
 can be found at **Configuration > Authentication > Groups **.
 
 ## Roles
@@ -82,7 +87,8 @@ users have access to all configuration options, or another role **support**
 could define that a list of users or groups is restricted to see only hosts and services
 that match a specific query.
 
-The actual permission of a certain user will be determined by merging the permissions and restrictions of the user itself and all the groups the user is part of. Permissions can
+The actual permission of a certain user will be determined by merging the permissions 
+and restrictions of the user itself and all the groups the user is member of. Permissions can
 be simply added up, while restrictions follow a slighty more complex pattern, that is described
 in the section [Stacking Filters](#stacking-filters).
 
@@ -98,7 +104,7 @@ configuration file:
 
 #### Introducing Example
 
-To get you a quick start, here is an example of how a role definition could look like:
+To get you a quick start, here is an example of what a role definition could look like:
 
 
     [winadmin]
@@ -108,24 +114,24 @@ To get you a quick start, here is an example of how a role definition could look
     monitoring/filter/objects = "host=*win*"
 
 
-This example creates a role called **winadmin**, that grants all permissions in **config/application/** and ** monitoring/commands/schedule-check ** and additionally only
-allows the hosts and services that match the filter ** host=\*win* ** to be displayed. The users
+This example creates a role called **winadmin**, that grants all permissions in `config/application/*` and `monitoring/commands/schedule-check` and additionally only
+allows the hosts and services that match the filter `host=*win*` to be displayed. The users
 **jdoe** and **janedoe** and all members of the group **admin** will be affected
 by this role.
 
 
-#### Syntax
+#### <a id="syntax"></a> Syntax
 
 Each role is defined as a section, with the name of the role as section name. The following
 attributes can be defined for each role in a default Icinga Web 2 installation:
 
 
-| Key                       | Value                                                                           |
-|---------------------------|---------------------------------------------------------------------------------|
-| users                     | A comma-separated list of user **user names** that are affected by this role    |
-| groups                    | A comma-separated list of **group names** that are affected by this role        |
-| permissions               | A comma-separated list of **permissions** granted by this role                  |
-| monitoring/filter/objects | A **filter expression** that restricts the access to services and hosts         |
+ Directive                 | Description                                                                     
+---------------------------|-----------------------------------------------------------------------------
+ users                     | A comma-separated list of user **user names** that are affected by this role    
+ groups                    | A comma-separated list of **group names** that are affected by this role        
+ permissions               | A comma-separated list of **permissions** granted by this role                  
+ monitoring/filter/objects | A **filter expression** that restricts the access to services and hosts         
 
 
 
@@ -137,87 +143,75 @@ all actions are **prohibited** and must be allowed explicitly by a role for any
 Each action in Icinga Web 2 is denoted by a **namespaced key**, which is used to order and
 group those actions. All actions that affect the configuration of Icinga Web 2, are in a
 namespace called **config**, while all configurations that affect authentication
-are in the namespace **config/authentication**
+are in the namespace `config/authentication`
 
 **Wildcards** can be used to grant permission for all actions in a certain namespace.
-The permission **config/ ** would grant permission to all configuration actions,
-while just specifying a wildcard * would give permission for all actions.
+The permission `config/*` would grant permission to all configuration actions,
+while just specifying a wildcard `*` would give permission for all actions.
 
 When multiple roles assign permissions to the same user (either directly or indirectly
 through a group) all permissions can simply be added together to get the users actual permission set.
 
 #### Global permissions
 
-| Name                                | Permits                                                         |
-|-------------------------------------|-----------------------------------------------------------------|
-| *                                   | Allow everything, including module-specific permissions         |
-| config/*                            | Allow all configuration actions                                 |
-| config/application/*                | Allow configuring IcingaWeb2                                    |
-| config/application/general          | Allow general settings, like logging or preferences             |
-| config/application/resources        | Allow changing resources for retrieving data                    |
-| config/application/userbackend      | Allow changing backends for retrieving available users          |
-| config/application/usergroupbackend | Allow changing backends for retrieving available groups         |
-| config/authentication/*             | Allow configuring IcingaWeb2 authentication mechanisms          |
-| config/authentication/users/*       | Allow all user actions                                          |
-| config/authentication/users/show    | Allow displaying avilable users                                 |
-| config/authentication/users/add     | Allow adding a new user to the backend                          |
-| config/authentication/users/edit    | Allow editing an existing user in the backend                   |
-| config/authentication/users/remove  | Allow removing an existing user from the backend                |
-| config/authentication/groups/*      | Allow all group actions                                         |
-| config/authentication/groups/show   | Allow displaying all available groups                           |
-| config/authentication/groups/add    | Allow adding a new group to the backend                         |
-| config/authentication/groups/edit   | Allow editing existing groups in a backend                      |
-| config/authentication/groups/remove | Allow removing existing groups from the backend                 |
-| config/authentication/roles/*       | Allow all role actions                                          |
-| config/authentication/roles/add     | Allow adding a new role                                         |
-| config/authentication/roles/show    | Allow displaying available roles                                |
-| config/authentication/roles/edit    | Allow changing an existing role                                 |
-| config/authentication/roles/remove  | Allow removing an existing row                                  |
-| config/modules                      | Allow enabling or disable modules and module changing settings  |
+ Name                                | Permits                                                         
+-------------------------------------|-----------------------------------------------------------------
+ *                                   | Allow everything, including module-specific permissions         
+ config/*                            | Allow all configuration actions                                 
+ config/application/*                | Allow configuring IcingaWeb2                                    
+ config/application/general          | Allow general settings, like logging or preferences             
+ config/application/resources        | Allow changing resources for retrieving data                    
+ config/application/userbackend      | Allow changing backends for retrieving available users          
+ config/application/usergroupbackend | Allow changing backends for retrieving available groups         
+ config/authentication/*             | Allow configuring IcingaWeb2 authentication mechanisms          
+ config/authentication/users/*       | Allow all user actions                                          
+ config/authentication/users/show    | Allow displaying avilable users                                 
+ config/authentication/users/add     | Allow adding a new user to the backend                          
+ config/authentication/users/edit    | Allow editing an existing user in the backend                   
+ config/authentication/users/remove  | Allow removing an existing user from the backend                
+ config/authentication/groups/*      | Allow all group actions                                         
+ config/authentication/groups/show   | Allow displaying all available groups                           
+ config/authentication/groups/add    | Allow adding a new group to the backend                         
+ config/authentication/groups/edit   | Allow editing existing groups in a backend                      
+ config/authentication/groups/remove | Allow removing existing groups from the backend                 
+ config/authentication/roles/*       | Allow all role actions                                          
+ config/authentication/roles/add     | Allow adding a new role                                         
+ config/authentication/roles/show    | Allow displaying available roles                                
+ config/authentication/roles/edit    | Allow changing an existing role                                 
+ config/authentication/roles/remove  | Allow removing an existing row                                  
+ config/modules                      | Allow enabling or disabling modules  
 
 
 #### Monitoring module permissions
 
 The built-in monitoring module defines an additional set of permissions, that
-are described in detail in [monitoring module documentation](/icingaweb2/doc/module/doc/chapter/monitoring-security#monitoring-security).
-
+is described in detail in [monitoring module documentation](/icingaweb2/doc/module/doc/chapter/monitoring-security#monitoring-security).
 
 
 ## <a id="restrictions"></a> Restrictions
 
 Restrictions can be used to define what a user or group can see by specifying
-a filter expression. By default, when no restrictions are defined, a user will be able
-to see every object available. When a restriction is specified for a certain object type
-the user will only be able to see objects matched by those filters.
+a filter expression that applies to a defined set of data. By default, when no 
+restrictions are defined, a user will be able to see every information that is available. 
 
-
-### Filterable Objects
-
-Each filter expression consists of two parts: The **key** that defines **which** objects
-to filter and the filter, that defines **what** to filter.
-
-In a default Icinga Web 2 installations, the only objects that are filterable
-are the objects provided by the monitoring module. The monitoring module provides
-**hosts** and **services** as filterable objects:
-
-
-| Keys                       | Restricsts                                     |
-|----------------------------|-----------------------------------------------|
-| monitoring/filter/objects  | Applies host and service filters to all hosts |
-
-
-#### Filter Columns
-
-Filters operate on object attributes. A complete list of all available filter columns on hosts and services can be found in
-the [monitoring module documentation](/icingaweb2/doc/module/doc/chapter/monitoring-security#monitoring-security-restrictions).
+A restrictions is always specified for a certain **filter directive**, that defines what
+data the filter is applied to. The **filter directive** is a simple identifier, that was
+defined in an Icinga Web 2 module. The only filter directive that is available
+in a default installation, is the `monitoring/filter/objects` directive, defined by the monitoring module,
+that can be used to apply filter to hosts and services. This directive was previously 
+mentioned in the section [Syntax](#syntax).
 
 ### Filter Expressions
 
+Filters operate on columns. A complete list of all available filter columns on hosts and services can be found in
+the [monitoring module documentation](/icingaweb2/doc/module/doc/chapter/monitoring-security#monitoring-security-restrictions).
+
 Any filter expression that is allowed in the filtered view, is also an allowed filter expression.
 This means, that it is possible to define negations, wildcards, and even nested
 filter expressions containing AND and OR-Clauses.
 
-The filter expression will be **implicitly** added as an **AND-Clause** to each query on the filtered objects. The following shows the filter expression **host = \*win* ** being applied on ** monitoring/filter/objects  **.
+The filter expression will be **implicitly** added as an **AND-Clause** to each query on 
+the filtered data. The following shows the filter expression `host=*win*` being applied on `monitoring/filter/objects`.
 
 
 Regular filter query:
@@ -282,12 +276,4 @@ Notice that because of the behavior of two stacking filters, a user that is memb
     monitoring/filter/objects = "(hostgroup_name=bsd-servers|hostgroup_name=linux-servers)"
 
 This role allows all members of the group unix-admins to see hosts and services
-that are part of the host-group linux-servers or the host-group bsd-servers.
-
-## Troubleshooting
-
-Q: I cannot see the menu for changing roles in Icinga Web 2
-
-A: Your user lacks the permission to change the authentication configuration,
-   add a new role in roles.ini that gives your current user
-   the permission to access **config/authentication/**
+that are part of the host-group linux-servers or the host-group bsd-servers.
\ No newline at end of file
diff --git a/modules/doc/doc/security.md b/modules/doc/doc/security.md
index b6bce4389..023a66410 100644
--- a/modules/doc/doc/security.md
+++ b/modules/doc/doc/security.md
@@ -7,9 +7,9 @@ restrictions and permissions in detail:
 
 ## Permissions
 
-The Icinga Web 2 monitoring plugin can send commands to the current Icinga2 instance
+The Icinga Web 2 monitoring module can send commands to the current Icinga2 instance
 through the command pipe. A user needs specific permissions to be able to send those  
-commands when using the monitoring plugin.
+commands when using the monitoring module.
 
 
 | Name                                        | Permits                                                                     |

From 07ebf11a0751003c8038194472b44a0b869bf959 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 13:47:48 +0200
Subject: [PATCH 2161/2920] DataView\Contact: Add support for object
 restrictions

refs #9009
---
 .../Backend/Ido/Query/ContactQuery.php        | 159 +++++++++++++-----
 .../library/Monitoring/DataView/Contact.php   |  47 +++---
 2 files changed, 147 insertions(+), 59 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
index 3d23b8947..f3a74e380 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
@@ -3,8 +3,19 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
+/**
+ * Query for contacts
+ */
 class ContactQuery extends IdoQuery
 {
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * {@inheritdoc}
+     */
     protected $columnMap = array(
         'contacts' => array(
             'contact_id'                        => 'c.contact_id',
@@ -33,18 +44,33 @@ class ContactQuery extends IdoQuery
             'contact_notify_host_timeperiod'    => 'ht.alias COLLATE latin1_general_ci',
             'contact_notify_service_timeperiod' => 'st.alias COLLATE latin1_general_ci'
         ),
+        'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
+        ),
         'hosts' => array(
-            'host'      => 'ho.name1 COLLATE latin1_general_ci',
-            'host_name' => 'ho.name1'
+            'host'              => 'ho.name1 COLLATE latin1_general_ci',
+            'host_name'         => 'ho.name1',
+            'host_alias'        => 'h.alias',
+            'host_display_name' => 'h.display_name COLLATE latin1_general_ci'
+        ),
+        'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
         ),
         'services' => array(
             'service'               => 'so.name2 COLLATE latin1_general_ci',
             'service_description'   => 'so.name2',
-            'service_host'          => 'so.name1 COLLATE latin1_general_ci',
+            'service_display_name'  => 's.display_name COLLATE latin1_general_ci',
             'service_host_name'     => 'so.name1'
         )
     );
 
+    /**
+     * {@inheritdoc}
+     */
     protected function joinBaseTables()
     {
         $this->select->from(
@@ -52,46 +78,15 @@ class ContactQuery extends IdoQuery
             array()
         )->join(
             array('co' => $this->prefix . 'objects'),
-            'c.contact_object_id = co.' . $this->object_id . ' AND co.is_active = 1',
-            array()
-        );
-        $this->joinedVirtualTables = array('contacts' => true);
-    }
-
-    protected function joinHosts()
-    {
-        $this->select->join(
-            array('hc' => $this->prefix . 'host_contacts'),
-            'hc.contact_object_id = c.contact_object_id',
-            array()
-        )->join(
-            array('h' => $this->prefix . 'hosts'),
-            'hc.host_id = h.host_id',
-            array()
-        )->join(
-            array('ho' => $this->prefix . 'objects'),
-            'h.host_object_id = ho.' . $this->object_id . ' AND ho.is_active = 1',
-            array()
-        );
-    }
-
-    protected function joinServices()
-    {
-        $this->select->join(
-            array('sc' => $this->prefix . 'service_contacts'),
-            'sc.contact_object_id = c.contact_object_id',
-            array()
-        )->join(
-            array('s' => $this->prefix . 'services'),
-            'sc.service_id = s.service_id',
-            array()
-        )->join(
-            array('so' => $this->prefix . 'objects'),
-            's.service_object_id = so.' . $this->object_id . ' AND so.is_active = 1',
+            'co.object_id = c.contact_object_id AND co.is_active = 1',
             array()
         );
+        $this->joinedVirtualTables['contacts'] = true;
     }
 
+    /**
+     * Join timeperiods
+     */
     protected function joinTimeperiods()
     {
         $this->select->joinLeft(
@@ -105,4 +100,90 @@ class ContactQuery extends IdoQuery
             array()
         );
     }
+
+    /**
+     * Join host groups
+     */
+    protected function joinHostgroups()
+    {
+        $this->requireVirtualTable('hosts');
+        $this->select->joinLeft(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = ho.object_id',
+            array()
+        )->joinLeft(
+            array('hg' => $this->prefix . 'hostgroups'),
+            'hg.hostgroup_id = hgm.hostgroup_id',
+            array()
+        )->joinLeft(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
+            array()
+        );
+    }
+
+    /**
+     * Join hosts
+     */
+    protected function joinHosts()
+    {
+        $this->select->joinLeft(
+            array('hc' => $this->prefix . 'host_contacts'),
+            'hc.contact_object_id = c.contact_object_id',
+            array()
+        )->joinLeft(
+            array('h' => $this->prefix . 'hosts'),
+            'h.host_id = hc.host_id',
+            array()
+        )->joinLeft(
+            array('ho' => $this->prefix . 'objects'),
+            'ho.object_id = h.host_object_id AND ho.is_active = 1',
+            array()
+        )->group(
+            array('c.contact_id')
+        );
+    }
+
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->joinLeft(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = s.service_object_id',
+            array()
+        )->joinLeft(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sg.servicegroup_id = sgm.servicegroup_id',
+            array()
+        )->joinLeft(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
+            array()
+        );
+    }
+
+    /**
+     * Join services
+     */
+    protected function joinServices()
+    {
+        $this->select->joinLeft(
+            array('sc' => $this->prefix . 'service_contacts'),
+            'sc.contact_object_id = c.contact_object_id',
+            array()
+        )->joinLeft(
+            array('s' => $this->prefix . 'services'),
+            's.service_id = sc.service_id',
+            array()
+        )->joinLeft(
+            array('so' => $this->prefix . 'objects'),
+            'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
+            array()
+        )->group(
+            array('c.contact_id')
+        );
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Contact.php b/modules/monitoring/library/Monitoring/DataView/Contact.php
index 8116e11a4..af2ef597d 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contact.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contact.php
@@ -3,26 +3,32 @@
 
 namespace Icinga\Module\Monitoring\DataView;
 
-/**
- * Describes the data needed by the 'Contact' DataView
- */
 class Contact extends DataView
 {
     /**
-     * Retrieve columns provided by this view
-     *
-     * @return array
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_' && preg_match('/^_(?:host|service)_/', $column)) {
+            return true;
+        }
+
+        return parent::isValidFilterTarget($column);
+    }
+
+    /**
+     * {@inheritdoc}
      */
     public function getColumns()
     {
         return array(
+            'contact_object_id',
             'contact_id',
             'contact_name',
             'contact_alias',
             'contact_email',
             'contact_pager',
-            'contact_notify_hosts',
-            'contact_notify_services',
             'contact_has_host_notfications',
             'contact_has_service_notfications',
             'contact_can_submit_commands',
@@ -37,33 +43,34 @@ class Contact extends DataView
             'contact_notify_host_unreachable',
             'contact_notify_host_flapping',
             'contact_notify_host_downtime',
-            'contact_object_id',
-            'host_object_id',
-            'host_name',
-            'service_object_id',
-            'service_host_name',
-            'service_description',
             'contact_notify_host_timeperiod',
             'contact_notify_service_timeperiod'
         );
     }
 
     /**
-     * Retrieve default sorting rules for particular columns. These involve sort order and potential additional to sort
-     *
-     * @return array
+     * {@inheritdoc}
      */
     public function getSortRules()
     {
         return array(
-            'contact_alias' => array(
-                'order' => self::SORT_DESC
+            'contact_name' => array(
+                'order' => self::SORT_ASC
             )
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getFilterColumns()
     {
-        return array('contact', 'alias', 'email', 'host', 'service', 'service_host');
+        return array(
+            'contact',
+            'host', 'host_name', 'host_display_name', 'host_alias',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'service_description', 'service_display_name',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+        );
     }
 }

From aabdfec03ae3bfd0292e14c55c9195885c89dc51 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 13:48:13 +0200
Subject: [PATCH 2162/2920] ListController: Restrict the contacts view

refs #9009
---
 .../application/controllers/ListController.php    | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 0576d6e24..e8508cb83 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -312,25 +312,14 @@ class Monitoring_ListController extends Controller
 
         $query = $this->backend->select()->from('contact', array(
             'contact_name',
-            'contact_id',
             'contact_alias',
             'contact_email',
             'contact_pager',
             'contact_notify_service_timeperiod',
-            'contact_notify_service_recovery',
-            'contact_notify_service_warning',
-            'contact_notify_service_critical',
-            'contact_notify_service_unknown',
-            'contact_notify_service_flapping',
-            'contact_notify_service_downtime',
-            'contact_notify_host_timeperiod',
-            'contact_notify_host_recovery',
-            'contact_notify_host_down',
-            'contact_notify_host_unreachable',
-            'contact_notify_host_flapping',
-            'contact_notify_host_downtime',
+            'contact_notify_host_timeperiod'
         ));
         $this->filterQuery($query);
+        $this->applyRestriction('monitoring/filter/objects', $query);
         $this->view->contacts = $query;
 
         $this->setupLimitControl();

From b8efe314a00581c0c4f6c92c5e6d65d52ec84d5f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 13:59:46 +0200
Subject: [PATCH 2163/2920] DbQuery: Ignore wildcard only filters

This increases query performance vastly, since LIKE '%' comparisons
prevent the dbms from utilizing an index.
---
 library/Icinga/Data/Db/DbQuery.php                | 15 +++++++++++++++
 .../Monitoring/Backend/Ido/Query/IdoQuery.php     |  8 ++++++++
 2 files changed, 23 insertions(+)

diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index a151babf7..2f82b06b2 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -285,12 +285,27 @@ class DbQuery extends SimpleQuery
         if ($this->isTimestamp($col)) {
             $expression = $this->valueToTimestamp($expression);
         }
+
         if (is_array($expression) && $sign === '=') {
             // TODO: Should we support this? Doesn't work for blub*
             return $col . ' IN (' . $this->escapeForSql($expression) . ')';
         } elseif ($sign === '=' && strpos($expression, '*') !== false) {
+            if ($expression === '*') {
+                // We'll ignore such filters as it prevents index usage and because "*" means anything, anything means
+                // all whereas all means that whether we use a filter to match anything or no filter at all makes no
+                // difference, except for performance reasons...
+                return '';
+            }
+
             return $col . ' LIKE ' . $this->escapeForSql($this->escapeWildcards($expression));
         } elseif ($sign === '!=' && strpos($expression, '*') !== false) {
+            if ($expression === '*') {
+                // We'll ignore such filters as it prevents index usage and because "*" means nothing, so whether we're
+                // using a real column with a valid comparison here or just an expression which cannot be evaluated to
+                // true makes no difference, except for performance reasons...
+                return $this->escapeForSql(0);
+            }
+
             return $col . ' NOT LIKE ' . $this->escapeForSql($this->escapeWildcards($expression));
         } else {
             return $col . ' ' . $sign . ' ' . $this->escapeForSql($expression);
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index 1feff0f71..6d0f418da 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -267,6 +267,10 @@ abstract class IdoQuery extends DbQuery
     protected function requireFilterColumns(Filter $filter)
     {
         if ($filter instanceof FilterExpression) {
+            if ($filter->getExpression() === '*') {
+                return; // Wildcard only filters are ignored so stop early here to avoid joining a table for nothing
+            }
+
             $col = $filter->getColumn();
             $this->requireColumn($col);
 
@@ -328,6 +332,10 @@ abstract class IdoQuery extends DbQuery
 
     public function where($condition, $value = null)
     {
+        if ($value === '*') {
+            return $this; // Wildcard only filters are ignored so stop early here to avoid joining a table for nothing
+        }
+
         $this->requireColumn($condition);
         $col = $this->getMappedField($condition);
         if ($col === null) {

From 2fceac977191a9344b3c027b743a9285e26bb33a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 14:15:51 +0200
Subject: [PATCH 2164/2920] ListController: Fix contactgroup sorting

---
 .../application/controllers/ListController.php         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index e8508cb83..d43f5395c 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -392,6 +392,11 @@ class Monitoring_ListController extends Controller
         ));
         $this->filterQuery($query);
 
+        $this->setupSortControl(array(
+            'contactgroup_name'     => $this->translate('Contactgroup Name'),
+            'contactgroup_alias'    => $this->translate('Contactgroup Alias')
+        ), $query);
+
         // Fetch and prepare all contact groups:
         $contactgroups = $query->getQuery()->fetchAll();
         $groupData = array();
@@ -406,11 +411,6 @@ class Monitoring_ListController extends Controller
         }
         // TODO: Find a better naming
         $this->view->groupData = $groupData;
-
-        $this->setupSortControl(array(
-            'contactgroup_name'     => $this->translate('Contactgroup Name'),
-            'contactgroup_alias'    => $this->translate('Contactgroup Alias')
-        ), $query);
     }
 
     public function commentsAction()

From 548aec4233c7c233be232d2b8d449dc84bda95f8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 15:08:04 +0200
Subject: [PATCH 2165/2920] DataView\Contactgroup: Add support for object
 restrictions

refs #9009
---
 .../Backend/Ido/Query/ContactgroupQuery.php   | 155 +++++++++++++-----
 .../Monitoring/DataView/Contactgroup.php      |  41 +++--
 2 files changed, 140 insertions(+), 56 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
index 152e964f8..8394668a4 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
@@ -3,8 +3,19 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
+/**
+ * Query for contact groups
+ */
 class ContactgroupQuery extends IdoQuery
 {
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * {@inheritdoc}
+     */
     protected $columnMap = array(
         'contactgroups' => array(
             'contactgroup'          => 'cgo.name1 COLLATE latin1_general_ci',
@@ -12,11 +23,13 @@ class ContactgroupQuery extends IdoQuery
             'contactgroup_alias'    => 'cg.alias COLLATE latin1_general_ci'
         ),
         'contacts' => array(
+            'contact_id'                        => 'c.contact_id',
             'contact'                           => 'co.name1 COLLATE latin1_general_ci',
             'contact_name'                      => 'co.name1',
             'contact_alias'                     => 'c.alias COLLATE latin1_general_ci',
             'contact_email'                     => 'c.email_address COLLATE latin1_general_ci',
             'contact_pager'                     => 'c.pager_address',
+            'contact_object_id'                 => 'c.contact_object_id',
             'contact_has_host_notfications'     => 'c.host_notifications_enabled',
             'contact_has_service_notfications'  => 'c.service_notifications_enabled',
             'contact_can_submit_commands'       => 'c.can_submit_commands',
@@ -30,22 +43,35 @@ class ContactgroupQuery extends IdoQuery
             'contact_notify_host_down'          => 'c.notify_host_down',
             'contact_notify_host_unreachable'   => 'c.notify_host_unreachable',
             'contact_notify_host_flapping'      => 'c.notify_host_flapping',
-            'contact_notify_host_downtime'      => 'c.notify_host_downtime',
+            'contact_notify_host_downtime'      => 'c.notify_host_downtime'
+        ),
+        'hostgroups' => array(
+            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
+            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci',
+            'hostgroup_name'    => 'hgo.name1'
         ),
         'hosts' => array(
-            'host'      => 'ho.name1 COLLATE latin1_general_ci',
-            'host_name' => 'ho.name1'
+            'host'              => 'ho.name1 COLLATE latin1_general_ci',
+            'host_name'         => 'ho.name1',
+            'host_alias'        => 'h.alias',
+            'host_display_name' => 'h.display_name COLLATE latin1_general_ci'
+        ),
+        'servicegroups' => array(
+            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
+            'servicegroup_name'     => 'sgo.name1',
+            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
         ),
         'services' => array(
             'service'               => 'so.name2 COLLATE latin1_general_ci',
             'service_description'   => 'so.name2',
-            'service_host'          => 'so.name1 COLLATE latin1_general_ci',
+            'service_display_name'  => 's.display_name COLLATE latin1_general_ci',
             'service_host_name'     => 'so.name1'
         )
     );
 
-    protected $useSubqueryCount = true;
-
+    /**
+     * {@inheritdoc}
+     */
     protected function joinBaseTables()
     {
         $this->select->from(
@@ -53,81 +79,124 @@ class ContactgroupQuery extends IdoQuery
             array()
         )->join(
             array('cgo' => $this->prefix . 'objects'),
-            'cg.contactgroup_object_id = cgo.' . $this->object_id . ' AND cgo.is_active = 1',
+            'cgo.object_id = cg.contactgroup_object_id AND cgo.is_active = 1 AND cgo.objecttype_id = 11',
             array()
         );
-
-        $this->joinedVirtualTables = array('contactgroups' => true);
+        $this->joinedVirtualTables['contactgroups'] = true;
     }
 
+    /**
+     * Join contacts
+     */
     protected function joinContacts()
     {
-        $this->select->distinct()->join(
+        $this->select->joinLeft(
             array('cgm' => $this->prefix . 'contactgroup_members'),
             'cgm.contactgroup_id = cg.contactgroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('co' => $this->prefix . 'objects'),
-            'cgm.contact_object_id = co.object_id AND co.is_active = 1',
+            'co.object_id = cgm.contact_object_id AND co.is_active = 1 AND co.objecttype_id = 10',
             array()
-        )->join(
+        )->joinLeft(
             array('c' => $this->prefix . 'contacts'),
             'c.contact_object_id = co.object_id',
             array()
         );
+        $this->group(array('cg.contactgroup_id', 'c.contact_id'));
     }
 
+    /**
+     * Join host groups
+     */
+    protected function joinHostgroups()
+    {
+        $this->requireVirtualTable('hosts');
+        $this->select->joinLeft(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = ho.object_id',
+            array()
+        )->joinLeft(
+            array('hg' => $this->prefix . 'hostgroups'),
+            'hg.hostgroup_id = hgm.hostgroup_id',
+            array()
+        )->joinLeft(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
+            array()
+        );
+    }
+
+    /**
+     * Join hosts
+     */
     protected function joinHosts()
     {
-        $this->select->distinct()->join(
+        $this->select->joinLeft(
             array('hcg' => $this->prefix . 'host_contactgroups'),
             'hcg.contactgroup_object_id = cg.contactgroup_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('h' => $this->prefix . 'hosts'),
-            'hcg.host_id = h.host_id',
+            'h.host_id = hcg.host_id',
             array()
-        )->join(
+        )->joinLeft(
             array('ho' => $this->prefix . 'objects'),
-            'h.host_object_id = ho.' . $this->object_id . ' AND ho.is_active = 1',
+            'ho.object_id = h.host_object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
+            array()
+        );
+
+        if ($this->hasJoinedVirtualTable('contacts')) {
+            $this->group(array('cg.contactgroup_id', 'c.contact_id'));
+        } else {
+            $this->group(array('cg.contactgroup_id'));
+        }
+    }
+
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->requireVirtualTable('services');
+        $this->select->joinLeft(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = s.service_object_id',
+            array()
+        )->joinLeft(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sg.servicegroup_id = sgm.servicegroup_id',
+            array()
+        )->joinLeft(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
         );
     }
 
+    /**
+     * Join services
+     */
     protected function joinServices()
     {
-//        $scgSub = $this->db->select()->distinct()->from(
-//            $this->prefix . 'service_contactgroups',
-//            array('contactgroup_object_id', 'service_id')
-//        );
-
-            /*
-            This subselect is a workaround for a fucking stupid bug. Other tables
-            may be affected too. We absolutely need uniqueness here.
-
-            mysql> SELECT * FROM icinga_service_contactgroups WHERE
-                   contactgroup_object_id = 143 AND service_id = 2079564;
-            +-------------------------+-------------+------------+------------------------+
-            | service_contactgroup_id | instance_id | service_id | contactgroup_object_id |
-            +-------------------------+-------------+------------+------------------------+
-            |                 4904240 |           1 |    2079564 |                    143 |
-            |                 4904244 |           1 |    2079564 |                    143 |
-            +-------------------------+-------------+------------+------------------------+
-            */
-
-        $this->select->distinct()->join(
+        $this->select->joinLeft(
             array('scg' => $this->prefix . 'service_contactgroups'),
-            // array('scg' => $scgSub),
             'scg.contactgroup_object_id = cg.contactgroup_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('s' => $this->prefix . 'services'),
-            'scg.service_id = s.service_id',
+            's.service_id = scg.service_id',
             array()
-        )->join(
+        )->joinLeft(
             array('so' => $this->prefix . 'objects'),
-            's.service_object_id = so.' . $this->object_id . ' AND so.is_active = 1',
+            'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
         );
+
+        if ($this->hasJoinedVirtualTable('contacts')) {
+            $this->group(array('cg.contactgroup_id', 'c.contact_id'));
+        } else {
+            $this->group(array('cg.contactgroup_id'));
+        }
     }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
index 0c432c2dc..f95c5abd7 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
@@ -3,21 +3,30 @@
 
 namespace Icinga\Module\Monitoring\DataView;
 
-/**
- * Describes the data needed by the Contactgroup DataView
- */
 class Contactgroup extends DataView
 {
     /**
-     * Retrieve columns provided by this view
-     *
-     * @return array
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_' && preg_match('/^_(?:host|service)_/', $column)) {
+            return true;
+        }
+
+        return parent::isValidFilterTarget($column);
+    }
+
+    /**
+     * {@inheritdoc}
      */
     public function getColumns()
     {
         return array(
             'contactgroup_name',
             'contactgroup_alias',
+            'contact_object_id',
+            'contact_id',
             'contact_name',
             'contact_alias',
             'contact_email',
@@ -36,16 +45,13 @@ class Contactgroup extends DataView
             'contact_notify_host_unreachable',
             'contact_notify_host_flapping',
             'contact_notify_host_downtime',
-            'host_name',
-            'service_description',
-            'service_host_name'
+            'contact_notify_host_timeperiod',
+            'contact_notify_service_timeperiod'
         );
     }
 
     /**
-     * Retrieve default sorting rules for particular columns. These involve sort order and potential additional to sort
-     *
-     * @return array
+     * {@inheritdoc}
      */
     public function getSortRules()
     {
@@ -59,8 +65,17 @@ class Contactgroup extends DataView
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getFilterColumns()
     {
-        return array('contactgroup', 'contact', 'host', 'service', 'service_host');
+        return array(
+            'contactgroup', 'contact',
+            'host', 'host_name', 'host_display_name', 'host_alias',
+            'hostgroup', 'hostgroup_alias', 'hostgroup_name',
+            'service', 'service_description', 'service_display_name',
+            'servicegroup', 'servicegroup_alias', 'servicegroup_name'
+        );
     }
 }

From 53e6d4cadc17b343df7a8939b07abdac871ddb74 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 15:08:25 +0200
Subject: [PATCH 2166/2920] ListController: Restrict the contactgroups view

refs #9009
---
 modules/monitoring/application/controllers/ListController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index d43f5395c..230fac50e 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -388,8 +388,9 @@ class Monitoring_ListController extends Controller
             'contact_name',
             'contact_alias',
             'contact_email',
-            'contact_pager',
+            'contact_pager'
         ));
+        $this->applyRestriction('monitoring/filter/objects', $query);
         $this->filterQuery($query);
 
         $this->setupSortControl(array(
@@ -409,6 +410,7 @@ class Monitoring_ListController extends Controller
             }
             $groupData[$c->contactgroup_name]['contacts'][] = $c;
         }
+
         // TODO: Find a better naming
         $this->view->groupData = $groupData;
     }

From 09d9d0084486ecfc1d7b6bf7faa94897cad60920 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 15:10:58 +0200
Subject: [PATCH 2167/2920] ContactgroupQuery: Do not use Zend_Select::group()
 but self::group()

Avoids duplicate GROUP BY expressions.
---
 .../library/Monitoring/Backend/Ido/Query/ContactQuery.php   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
index f3a74e380..0c703b008 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
@@ -139,9 +139,8 @@ class ContactQuery extends IdoQuery
             array('ho' => $this->prefix . 'objects'),
             'ho.object_id = h.host_object_id AND ho.is_active = 1',
             array()
-        )->group(
-            array('c.contact_id')
         );
+        $this->group(array('c.contact_id'));
     }
 
     /**
@@ -182,8 +181,7 @@ class ContactQuery extends IdoQuery
             array('so' => $this->prefix . 'objects'),
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
-        )->group(
-            array('c.contact_id')
         );
+        $this->group(array('c.contact_id'));
     }
 }

From 1a08102531af2648deb4ed551cd04d5e5883ce2e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 15:14:09 +0200
Subject: [PATCH 2168/2920] ListController: Apply contactgroup restrictions
 after the filter editor

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

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 230fac50e..7399487ea 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -390,8 +390,8 @@ class Monitoring_ListController extends Controller
             'contact_email',
             'contact_pager'
         ));
-        $this->applyRestriction('monitoring/filter/objects', $query);
         $this->filterQuery($query);
+        $this->applyRestriction('monitoring/filter/objects', $query);
 
         $this->setupSortControl(array(
             'contactgroup_name'     => $this->translate('Contactgroup Name'),

From b83abc4dbc3f5725fa79285db00de6728cdb9bd4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 15:58:15 +0200
Subject: [PATCH 2169/2920] CommentController: Restrict display of single
 comments

refs #9009
---
 .../application/controllers/CommentController.php           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/CommentController.php b/modules/monitoring/application/controllers/CommentController.php
index 7ab331adc..59ad90fc7 100644
--- a/modules/monitoring/application/controllers/CommentController.php
+++ b/modules/monitoring/application/controllers/CommentController.php
@@ -25,7 +25,7 @@ class Monitoring_CommentController extends Controller
     {
         $commentId = $this->params->getRequired('comment_id');
 
-        $this->comment = $this->backend->select()->from('comment', array(
+        $query = $this->backend->select()->from('comment', array(
             'id'         => 'comment_internal_id',
             'objecttype' => 'object_type',
             'comment'    => 'comment_data',
@@ -38,8 +38,10 @@ class Monitoring_CommentController extends Controller
             'service_description',
             'host_display_name',
             'service_display_name'
-        ))->where('comment_internal_id', $commentId)->getQuery()->fetchRow();
+        ))->where('comment_internal_id', $commentId);
+        $this->applyRestriction('monitoring/filter/objects', $query);
 
+        $this->comment = $query->getQuery()->fetchRow();
         if ($this->comment === false) {
             $this->httpNotFound($this->translate('Comment not found'));
         }

From 8187135564116718f34393beed1205a2abcab03c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 15:58:54 +0200
Subject: [PATCH 2170/2920] CommentsController: Restrict display of comments

refs #9009
---
 .../application/controllers/CommentsController.php          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/CommentsController.php b/modules/monitoring/application/controllers/CommentsController.php
index 9b31755cc..a86b30310 100644
--- a/modules/monitoring/application/controllers/CommentsController.php
+++ b/modules/monitoring/application/controllers/CommentsController.php
@@ -30,7 +30,7 @@ class Monitoring_CommentsController extends Controller
             'comment_internal_id',
             (string)$this->params
         ));
-        $this->comments = $this->backend->select()->from('comment', array(
+        $query = $this->backend->select()->from('comment', array(
             'id'         => 'comment_internal_id',
             'objecttype' => 'object_type',
             'comment'    => 'comment_data',
@@ -43,8 +43,10 @@ class Monitoring_CommentsController extends Controller
             'service_description',
             'host_display_name',
             'service_display_name'
-        ))->addFilter($this->filter)->getQuery()->fetchAll();
+        ))->addFilter($this->filter);
+        $this->applyRestriction('monitoring/filter/objects', $query);
 
+        $this->comments = $query->getQuery()->fetchAll();
         if (false === $this->comments) {
             throw new Zend_Controller_Action_Exception($this->translate('Comment not found'));
         }

From 9a6e3a7042eeb19b5fc3451b18685613eac531b8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 15:59:50 +0200
Subject: [PATCH 2171/2920] DowntimeController: Restrict display of single
 comments

refs #9009
---
 .../application/controllers/DowntimeController.php          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/DowntimeController.php b/modules/monitoring/application/controllers/DowntimeController.php
index 49bcd9529..077f7e264 100644
--- a/modules/monitoring/application/controllers/DowntimeController.php
+++ b/modules/monitoring/application/controllers/DowntimeController.php
@@ -35,7 +35,7 @@ class Monitoring_DowntimeController extends Controller
     {
         $downtimeId = $this->params->getRequired('downtime_id');
 
-        $this->downtime = $this->backend->select()->from('downtime', array(
+        $query = $this->backend->select()->from('downtime', array(
             'id'              => 'downtime_internal_id',
             'objecttype'      => 'object_type',
             'comment'         => 'downtime_comment',
@@ -55,8 +55,10 @@ class Monitoring_DowntimeController extends Controller
             'service_description',
             'host_display_name',
             'service_display_name'
-        ))->where('downtime_internal_id', $downtimeId)->getQuery()->fetchRow();
+        ))->where('downtime_internal_id', $downtimeId);
+        $this->applyRestriction('monitoring/filter/objects', $query);
 
+        $this->downtime = $query->getQuery()->fetchRow();
         if ($this->downtime === false) {
             $this->httpNotFound($this->translate('Downtime not found'));
         }

From 8b749521bae833748e34f5bd4feefb7a90ab8876 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 16:00:19 +0200
Subject: [PATCH 2172/2920] DowntimesController: Restrict display of downtimes

refs #9009
---
 .../application/controllers/DowntimesController.php         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php
index a1d210cc8..35950acfe 100644
--- a/modules/monitoring/application/controllers/DowntimesController.php
+++ b/modules/monitoring/application/controllers/DowntimesController.php
@@ -39,7 +39,7 @@ class Monitoring_DowntimesController extends Controller
             'downtime_internal_id',
             (string)$this->params
         ));
-        $this->downtimes = $this->backend->select()->from('downtime', array(
+        $query = $this->backend->select()->from('downtime', array(
             'id'              => 'downtime_internal_id',
             'objecttype'      => 'object_type',
             'comment'         => 'downtime_comment',
@@ -59,8 +59,10 @@ class Monitoring_DowntimesController extends Controller
             'service_description',
             'host_display_name',
             'service_display_name'
-        ))->addFilter($this->filter)->getQuery()->fetchAll();
+        ))->addFilter($this->filter);
+        $this->applyRestriction('monitoring/filter/objects', $query);
 
+        $this->downtimes = $query->getQuery()->fetchAll();
         if (false === $this->downtimes) {
             throw new Zend_Controller_Action_Exception(
                 $this->translate('Downtime not found')

From 32c5d5a1eea5439f1d5ee50e9e0a16a97de960a6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 16:03:46 +0200
Subject: [PATCH 2173/2920] ShowController: Restrict the servicestatus summary

I doubt that this is necessary, since showing hosts and services by using
this controller is deprecated, but I've added it nonetheless..

refs #9009
---
 .../monitoring/application/controllers/ShowController.php   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 6c2c03c18..a3b748c7b 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -80,7 +80,7 @@ class Monitoring_ShowController extends Controller
 
     protected function fetchHostStats()
     {
-        $this->view->stats = $this->backend->select()->from('servicestatussummary', array(
+        $query = $this->backend->select()->from('servicestatussummary', array(
             'services_total',
             'services_ok',
             'services_critical',
@@ -93,7 +93,9 @@ class Monitoring_ShowController extends Controller
             'services_unknown_unhandled',
             'services_unknown_handled',
             'services_pending',
-        ))->where('service_host_name', $this->params->get('host'))->getQuery()->fetchRow();
+        ))->where('service_host_name', $this->params->get('host'));
+        $this->applyRestriction('monitoring/filter/objects', $query);
+        $this->view->stats = $query->getQuery()->fetchRow();
     }
 
     public function contactAction()

From efc52e334217ad49e44cee60f0559722afee2710 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 16:04:14 +0200
Subject: [PATCH 2174/2920] ShowController: Restrict the display of single
 contacts

refs #9009
---
 modules/monitoring/application/controllers/ShowController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index a3b748c7b..9475baff6 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -131,6 +131,7 @@ class Monitoring_ShowController extends Controller
             'contact_notify_host_downtime',
         ));
         $query->where('contact_name', $contactName);
+        $this->applyRestriction('monitoring/filter/objects', $query);
         $contact = $query->getQuery()->fetchRow();
 
         if ($contact) {
@@ -153,6 +154,7 @@ class Monitoring_ShowController extends Controller
             ));
 
             $notifications->where('contact_object_id', $contact->contact_object_id);
+            $this->applyRestriction('monitoring/filter/objects', $notifications);
             $this->view->notifications = $notifications;
             $this->setupLimitControl();
             $this->setupPaginationControl($this->view->notifications);

From ede8cc5e83a7a8f47793b17232035b66a9ef1c04 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 16:04:43 +0200
Subject: [PATCH 2175/2920] TimelineController: Restrict the displayed entries

refs #9009
---
 .../application/controllers/TimelineController.php    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php
index 24bc71f30..aa1e20b95 100644
--- a/modules/monitoring/application/controllers/TimelineController.php
+++ b/modules/monitoring/application/controllers/TimelineController.php
@@ -30,10 +30,13 @@ class Monitoring_TimelineController extends Controller
         $detailUrl = Url::fromPath('monitoring/list/eventhistory');
 
         $timeline = new TimeLine(
-            $this->backend->select()->from('eventhistory',
-                array(
-                    'name' => 'type',
-                    'time' => 'timestamp'
+            $this->applyRestriction(
+                'monitoring/filter/objects',
+                $this->backend->select()->from('eventhistory',
+                    array(
+                        'name' => 'type',
+                        'time' => 'timestamp'
+                    )
                 )
             ),
             array(

From a1e4e6e92b11c9b57037a65ff19e184c04ca19f4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 16:05:37 +0200
Subject: [PATCH 2176/2920] ObjectList: Implement interface Filterable

Allows to use instances of it for Controller::applyRestriction().

refs #9009
---
 .../library/Monitoring/Object/ObjectList.php  | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/ObjectList.php b/modules/monitoring/library/Monitoring/Object/ObjectList.php
index c4ecdddb2..f2e51daf2 100644
--- a/modules/monitoring/library/Monitoring/Object/ObjectList.php
+++ b/modules/monitoring/library/Monitoring/Object/ObjectList.php
@@ -6,10 +6,11 @@ namespace Icinga\Module\Monitoring\Object;
 use ArrayIterator;
 use Countable;
 use Icinga\Data\Filter\Filter;
+use Icinga\Data\Filterable;
 use IteratorAggregate;
 use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 
-abstract class ObjectList implements Countable, IteratorAggregate
+abstract class ObjectList implements Countable, IteratorAggregate, Filterable
 {
     /**
      * @var string
@@ -81,9 +82,29 @@ abstract class ObjectList implements Countable, IteratorAggregate
      */
     public function getFilter()
     {
+        if ($this->filter === null) {
+            $this->filter = Filter::matchAny();
+        }
+
         return $this->filter;
     }
 
+    public function applyFilter(Filter $filter)
+    {
+        $this->getFilter()->addFilter($filter);
+        return $this;
+    }
+
+    public function addFilter(Filter $filter)
+    {
+        $this->getFilter()->addFilter($filter);
+    }
+
+    public function where($condition, $value = null)
+    {
+        $this->getFilter()->addFilter(Filter::where($condition, $value));
+    }
+
     abstract protected function fetchObjects();
 
     /**

From ce48f63ac62664cb81d9e658e51107e73d725a56 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 16:05:56 +0200
Subject: [PATCH 2177/2920] HostsController: Restrict the display of multiple
 hosts

refs #9009
---
 modules/monitoring/application/controllers/HostsController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index eb9db57eb..5202ab087 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -28,6 +28,7 @@ class Monitoring_HostsController extends Controller
     {
         $hostList = new HostList($this->backend);
         $hostList->setFilter(Filter::fromQueryString((string) $this->params));
+        $this->applyRestriction('monitoring/filter/objects', $hostList);
         $this->hostList = $hostList;
         $this->getTabs()->add(
             'show',

From bd41839a19300179ba0ec8a0124052cafb5f24b1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 16:06:13 +0200
Subject: [PATCH 2178/2920] ServicesController: Restrict the display of
 multiple services

refs #9009
---
 .../monitoring/application/controllers/ServicesController.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 1e2bd8912..a8d7bf16b 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -30,6 +30,7 @@ class Monitoring_ServicesController extends Controller
         $serviceList->setFilter(Filter::fromQueryString(
             (string) $this->params->without(array('service_problem', 'service_handled', 'view'))
         ));
+        $this->applyRestriction('monitoring/filter/objects', $serviceList);
         $this->serviceList = $serviceList;
         $this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/services');
         $this->getTabs()->add(

From a32f505fddc020d4d478c8b1d41216c1cbca3f2f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 16:08:04 +0200
Subject: [PATCH 2179/2920] ObjectList: Fix that setFilter() violates interface
 Filterable

refs #9009
---
 modules/monitoring/library/Monitoring/Object/ObjectList.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/ObjectList.php b/modules/monitoring/library/Monitoring/Object/ObjectList.php
index f2e51daf2..669e8ff39 100644
--- a/modules/monitoring/library/Monitoring/Object/ObjectList.php
+++ b/modules/monitoring/library/Monitoring/Object/ObjectList.php
@@ -67,11 +67,11 @@ abstract class ObjectList implements Countable, IteratorAggregate, Filterable
     }
 
     /**
-     * @param $filter
+     * @param Filter $filter
      *
      * @return $this
      */
-    public function setFilter($filter)
+    public function setFilter(Filter $filter)
     {
         $this->filter = $filter;
         return $this;

From c6cf51b44c87e528b2837d4407d19520b4cff2b3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 16:24:57 +0200
Subject: [PATCH 2180/2920] NotificationQuery: Force that the host and service
 subqueries are instantiated

Quick and dirty. I do not have enough time for a more proper version...

refs #9009
---
 .../Monitoring/Backend/Ido/Query/NotificationQuery.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index b13a338b0..3745179a0 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -159,4 +159,14 @@ class NotificationQuery extends IdoQuery
         }
         return $this;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function columns(array $columns)
+    {
+        parent::columns($columns);
+        $this->requireVirtualTable('hosts');
+        $this->requireVirtualTable('services');
+    }
 }

From 5545b4a6056013bedd8f0cc9c25076d19f529822 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 16:25:48 +0200
Subject: [PATCH 2181/2920] AlertsummaryController: Fix filter columns

---
 .../application/controllers/AlertsummaryController.php    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index 41bbca96b..e8ae0828c 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -94,7 +94,7 @@ class Monitoring_AlertsummaryController extends Controller
 
         $query->setFilter(
             new Icinga\Data\Filter\FilterExpression(
-                'n.start_time',
+                'notification_start_time',
                 '>=',
                 $this->getBeginDate($interval)->format('Y-m-d H:i:s')
             )
@@ -142,7 +142,7 @@ class Monitoring_AlertsummaryController extends Controller
 
         $query->setFilter(
             new Icinga\Data\Filter\FilterExpression(
-                'n.start_time',
+                'notification_start_time',
                 '>=',
                 $beginDate->format('Y-m-d H:i:s')
             )
@@ -209,7 +209,7 @@ class Monitoring_AlertsummaryController extends Controller
 
         $query->setFilter(
             new Icinga\Data\Filter\FilterExpression(
-                'n.start_time',
+                'notification_start_time',
                 '>=',
                 $this->getBeginDate($interval)->format('Y-m-d H:i:s')
             )
@@ -324,7 +324,7 @@ class Monitoring_AlertsummaryController extends Controller
 
         $query->setFilter(
             new Icinga\Data\Filter\FilterExpression(
-                'n.start_time',
+                'notification_start_time',
                 '>=',
                 $this->getBeginDate($interval)->format('Y-m-d H:i:s')
             )

From 4db9629268031048f70d2c29e8ee9c01d78a325b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 16:26:07 +0200
Subject: [PATCH 2182/2920] AlertsummaryController: Apply object restrictions

refs #9009
---
 .../controllers/AlertsummaryController.php        | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index e8ae0828c..23cc17442 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -70,6 +70,7 @@ class Monitoring_AlertsummaryController extends Controller
                 'notification_state'
             )
         );
+        $this->applyRestriction('monitoring/filter/objects', $query);
         $this->view->notifications = $query;
 
         $this->setupLimitControl();
@@ -91,8 +92,9 @@ class Monitoring_AlertsummaryController extends Controller
                 'notification_start_time'
             )
         );
+        $this->applyRestriction('monitoring/filter/objects', $query);
 
-        $query->setFilter(
+        $query->addFilter(
             new Icinga\Data\Filter\FilterExpression(
                 'notification_start_time',
                 '>=',
@@ -139,8 +141,9 @@ class Monitoring_AlertsummaryController extends Controller
                 'notification_start_time'
             )
         );
+        $this->applyRestriction('monitoring/filter/objects', $query);
 
-        $query->setFilter(
+        $query->addFilter(
             new Icinga\Data\Filter\FilterExpression(
                 'notification_start_time',
                 '>=',
@@ -206,8 +209,9 @@ class Monitoring_AlertsummaryController extends Controller
                 'notification_start_time'
             )
         );
+        $this->applyRestriction('monitoring/filter/objects', $query);
 
-        $query->setFilter(
+        $query->addFilter(
             new Icinga\Data\Filter\FilterExpression(
                 'notification_start_time',
                 '>=',
@@ -256,6 +260,7 @@ class Monitoring_AlertsummaryController extends Controller
                 'timestamp'
             )
         );
+        $this->applyRestriction('monitoring/filter/objects', $query);
 
         $query->addFilter(
             new Icinga\Data\Filter\FilterExpression(
@@ -321,8 +326,9 @@ class Monitoring_AlertsummaryController extends Controller
                 'acknowledgement_entry_time'
             )
         );
+        $this->applyRestriction('monitoring/filter/objects', $query);
 
-        $query->setFilter(
+        $query->addFilter(
             new Icinga\Data\Filter\FilterExpression(
                 'notification_start_time',
                 '>=',
@@ -490,6 +496,7 @@ class Monitoring_AlertsummaryController extends Controller
                 'notification_state'
             )
         );
+        $this->applyRestriction('monitoring/filter/objects', $query);
 
         $query->order('notification_start_time', 'desc');
 

From 9876a53f8e6c56b475df4c930e95d6c26d5c7b3c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 16:53:13 +0200
Subject: [PATCH 2183/2920] DataView\Eventgrid: Allow to filter for custom
 variables

refs #9009
---
 .../library/Monitoring/DataView/Eventgrid.php        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
index e95ed5cf8..0dafe7405 100644
--- a/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
+++ b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
@@ -5,6 +5,18 @@ namespace Icinga\Module\Monitoring\DataView;
 
 class Eventgrid extends DataView
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_' && preg_match('/^_(?:host|service)_/', $column)) {
+            return true;
+        }
+
+        return parent::isValidFilterTarget($column);
+    }
+
     /**
      * Retrieve columns provided by this view
      *

From 7cbcb91fd7b89a2c3496d482d97187a3dad78fb2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 16:53:22 +0200
Subject: [PATCH 2184/2920] DataView\Eventhistory: Allow to filter for custom
 variables

refs #9009
---
 .../library/Monitoring/DataView/Eventhistory.php     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/Eventhistory.php b/modules/monitoring/library/Monitoring/DataView/Eventhistory.php
index b826b535c..223e1d7d1 100644
--- a/modules/monitoring/library/Monitoring/DataView/Eventhistory.php
+++ b/modules/monitoring/library/Monitoring/DataView/Eventhistory.php
@@ -5,6 +5,18 @@ namespace Icinga\Module\Monitoring\DataView;
 
 class EventHistory extends DataView
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function isValidFilterTarget($column)
+    {
+        if ($column[0] === '_' && preg_match('/^_(?:host|service)_/', $column)) {
+            return true;
+        }
+
+        return parent::isValidFilterTarget($column);
+    }
+
     /**
      * Retrieve columns provided by this view
      *

From 1637f4760ffec0c43c6fa42f6d7ecaf0cdb7c8fb Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 15 Jun 2015 17:23:52 +0200
Subject: [PATCH 2185/2920] Fix table formatting

refs #7595
---
 doc/resources.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/resources.md b/doc/resources.md
index 19cb84a57..a2bfb66af 100644
--- a/doc/resources.md
+++ b/doc/resources.md
@@ -73,7 +73,7 @@ Directive           | Description
 --------------------|------------
 **type**            | `ssh`
 **user**            | The username to use when connecting to the server.
-**private_key**    | The path to the private key of the user.
+**private_key**     | The path to the private key of the user.
 
 **Example:**
 

From 259a1d271c566b52c7fe9b9cd588378fccba1cb6 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 15 Jun 2015 23:29:11 +0200
Subject: [PATCH 2186/2920] monitoring/css: remove header reset

---
 modules/monitoring/public/css/module.less | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index c985cc745..2153d474f 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -1,18 +1,5 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-/*
-h1 {
-    font-size: 1em;
-}
-
-h2 {
-    font-size: 1em;
-}
-
-h3 {
-    font-size: 1em;
-}
-*/
 table.action.comments td p, table.action.downtimes td p {
   margin: 0;
   font-size: 0.8em;

From f33e3f77f9621956fe0d3b3823b6422141e97592 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 15 Jun 2015 23:30:09 +0200
Subject: [PATCH 2187/2920] monitoring/css: use monospace for plugin output

---
 modules/monitoring/public/css/module.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 2153d474f..56ec0518e 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -17,6 +17,7 @@ p.pluginoutput {
   font-size: 0.9em;
   width: 100%;
   white-space: pre-wrap;
+  font-family: monospace;
 }
 
 div.pluginoutput {

From f1cf1392bac5ceea7aa2650be634ac13fc5b7a9a Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 15 Jun 2015 23:30:40 +0200
Subject: [PATCH 2188/2920] monitoring/css: no more bold, fix hover colors

---
 modules/monitoring/public/css/module.less | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 56ec0518e..703d27ff3 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -375,7 +375,11 @@ tr.state img.icon {
 }
 
 tr.state a {
-  font-weight: bold;
+  color: #222;
+}
+
+tr.state:hover a {
+  color: inherit;
 }
 
 tr.state a.active {
@@ -486,6 +490,7 @@ tr.state.handled[href]:hover, tr.state.handled[href]:hover td.state {
 
 tr.state.warning[href]:hover {
   background-color: @colorWarning;
+  color: white;
 }
 
 tr.state.warning.handled[href]:hover {
@@ -494,6 +499,7 @@ tr.state.warning.handled[href]:hover {
 
 tr.state.critical[href]:hover, tr.state.down[href]:hover {
   background-color: @colorCritical;
+  color: white;
 }
 
 tr.state.critical.handled[href]:hover, tr.state.down.handled[href]:hover {
@@ -503,6 +509,7 @@ tr.state.critical.handled[href]:hover, tr.state.down.handled[href]:hover {
 
 tr.state.unknown[href]:hover {
   background-color: @colorUnknown;
+  color: white;
 }
 
 tr.state.unknown.handled[href]:hover {
@@ -515,6 +522,7 @@ tr.state.pending[href]:hover {
 
 tr.state.invalid[href]:hover {
   background-color: @colorInvalid;
+  color: white;
 }
 
 tr.state.unreachable[href]:hover {

From 5df2edee097e11cfa9ddf0a723f7505d809a5d77 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 15 Jun 2015 23:31:37 +0200
Subject: [PATCH 2189/2920] doc/style/guide: add action table

Problem: CSS in doc module is not "clean" as it has custom styling
---
 .../views/scripts/style/guide.phtml           | 38 +++++++++++++++----
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/modules/doc/application/views/scripts/style/guide.phtml b/modules/doc/application/views/scripts/style/guide.phtml
index 0be3d7563..3cfcc1ca9 100644
--- a/modules/doc/application/views/scripts/style/guide.phtml
+++ b/modules/doc/application/views/scripts/style/guide.phtml
@@ -1,13 +1,37 @@
 <div class="controls">
 <?= $this->tabs ?>
-<h1>Style Guide</h1>
 </div>
 
 <div class="content">
-<h1>H1 - header</h1>
-<h2>H2 - header</h2>
-<h3>H3 - header</h3>
-<h4>H4 - header</h4>
-<h5>H5 - header</h5>
-<h6>H6 - header</h6>
+<h1>Header h1</h1>
+<h2>Header h2</h2>
+<h3>Header h3</h3>
+<h4>Header h4</h4>
+<h5>Header h5</h5>
+<h6>Header h6</h6>
+
+<p>This is a paragraph. This is a paragraph. This is a paragraph. This is a paragraph. This is a paragraph. This is a paragraph. A <a href="#">link pointing somewhere</a>. This is a paragraph. This is a paragraph. This is a paragraph. This is a paragraph. This is a paragraph.</p>
+
+<table class="avp">
+<thead>
+  <tr>
+    <th>Table Head - th in thead</th>
+    <td>td in thead<td>
+  </tr>
+</thead>
+<tbody>
+  <tr>
+    <th>Tbody - th</th>
+    <td>Tbody - td</td>
+  </tr>
+  <tr>
+    <th>Tbody - th</th>
+    <td>Tbody - td</td>
+  </tr>
+  <tr>
+    <th>Tbody - th</th>
+    <td>Tbody - td</td>
+  </tr>
+</tbody>
+</table>
 </div>

From 11a6990ea8579c1991d933bdf1d82a154a86b5e4 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 15 Jun 2015 23:32:58 +0200
Subject: [PATCH 2190/2920] main-content.less: remove special header styling

---
 public/css/icinga/main-content.less | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 3b202cec4..9f50767fe 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -204,13 +204,6 @@ table.benchmark {
   color: inherit;
 }
 
-.controls {
-  h1 {
-    border: none;
-    margin-bottom: 0;
-  }
-}
-
 [class^="icon-"]:before, [class*=" icon-"]:before {
     text-decoration: none;
     margin-left: 0;

From bd124baa4db1cbe2546ebe49b74a8aba424c0a3b Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 15 Jun 2015 23:33:30 +0200
Subject: [PATCH 2191/2920] layout-structure: less custom style and sizing

---
 public/css/icinga/layout-structure.less | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 671e3362c..bf3e97cae 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -141,7 +141,6 @@ html {
 }
 
 .dashboard > div.container {
-  font-size: 0.9em;
   vertical-align: top;
   width: 48.5%;
   display: inline-block;
@@ -150,10 +149,6 @@ html {
   margin-left: 1%;
 }
 
-.content h3 {
-  font-size: 0.9em;
-}
-
 .container .controls .pagination {
   margin-left: 1.2em;
 }

From 5e61d36a3a329f1604b93198838a7cbdecd1c6f7 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 15 Jun 2015 23:34:03 +0200
Subject: [PATCH 2192/2920] defaults.less: make headers look different

---
 public/css/icinga/defaults.less | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index e53d21da2..0afa6333e 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -36,14 +36,13 @@
 
 /* Mixins */
 
-.page-header(@borderSize: 2px; @fontSize: 2em; @textColor: @colorTextDarkDefault) {
+.page-header(@borderSize: 2px; @fontSize: 2em; @textColor: @colorMainForeground) {
   font-size: @fontSize;
   color: @textColor;
-  /* border-bottom: @borderSize solid @colorPetrol; */
-  background-color: #888;
-  color: white;
+  border-left: 1em solid #888;
+  border-bottom: 3px solid #888;
   font-weight: normal;
-  padding: 0.2em 1em;
+  padding: 0.3em 1em;
   text-transform: uppercase;
   font-size: 0.8em;
   a {

From edf8bcca4b1bff6499ceb41f063eea24d814c443 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 15 Jun 2015 23:54:12 +0200
Subject: [PATCH 2193/2920] layout.phtml: use cleartype on mobile IE

---
 application/layouts/scripts/layout.phtml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml
index e00b9371d..e7a9d834b 100644
--- a/application/layouts/scripts/layout.phtml
+++ b/application/layouts/scripts/layout.phtml
@@ -26,6 +26,7 @@ $iframeClass = $isIframe ? ' iframe' : '';
   <meta content="width=320; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
   <meta name="google" value="notranslate">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta http-equiv="cleartype" content="on">
   <title><?= $this->title ? $this->escape($this->title) : 'Icinga Web' ?></title>
   <!-- TODO: viewport and scale settings make no sense for us, fix this -->
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">

From 56d67def0085676c0a5c16efe3af7436403ec7ef Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 00:18:31 +0200
Subject: [PATCH 2194/2920] Web/Menu: move "About" to config section

This is IMO never worth a main menu entry, at least not in it's current
implementation and look-a-like.
---
 library/Icinga/Web/Menu.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 45dd2dd9c..5bf8f76d0 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -264,6 +264,10 @@ class Menu implements RecursiveIterator
                 'permission'    => 'config/modules',
                 'priority'      => 890
             ));
+            $section->add(t('About'), array(
+                'url'       => 'about',
+                'priority'  => 895
+            ));
 
             $section = $this->add($auth->getUser()->getUsername(), array(
                 'icon'     => 'user',
@@ -279,11 +283,6 @@ class Menu implements RecursiveIterator
                 'priority' => 990,
                 'renderer' => 'ForeignMenuItemRenderer'
             ));
-
-            $this->add(t('About'), array(
-                'url'       => 'about',
-                'priority'  => 1000
-            ));
         }
     }
 

From 59ef6ff71a124befc52d34327e217b539fbdcfab Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 00:35:32 +0200
Subject: [PATCH 2195/2920] monitoring/show: choose fitting header tags

---
 .../application/views/scripts/show/components/comments.phtml  | 4 ++--
 .../views/scripts/show/components/customvars.phtml            | 2 +-
 .../application/views/scripts/show/components/output.phtml    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index 3d806c577..ded9d3836 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -75,11 +75,11 @@ if (isset($delCommentForm)) {
 
  ?>
 	    <li class="comment-item">
-	    	<h4>
+	    	<h3>
 		    	<span class="author"><?= $this->escape($comment->author) ?></span>
 		    	<?= $this->timeAgo($comment->timestamp) ?>
                 <?= $deleteButton ?>
-		    </h4>
+		    </h3>
 		    <p><span class="sr-only">(<?= $this->translate('Comment'); ?>): </span><?= str_replace(array('\r\n', '\n'), '<br>', $commentText) ?></p>
          </li>
  <?php endforeach ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/customvars.phtml b/modules/monitoring/application/views/scripts/show/components/customvars.phtml
index 50b82dbef..e58b0f168 100644
--- a/modules/monitoring/application/views/scripts/show/components/customvars.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/customvars.phtml
@@ -1,6 +1,6 @@
 <tr class="newsection">
     <td colspan="2">
-        <h4 class="customvar"><?= $this->translate('Custom variables') ?></h4>
+        <h2 class="customvar"><?= $this->translate('Custom variables') ?></h2>
     </td>
 </tr>
 <?php
diff --git a/modules/monitoring/application/views/scripts/show/components/output.phtml b/modules/monitoring/application/views/scripts/show/components/output.phtml
index 52b4c9a56..82230beae 100644
--- a/modules/monitoring/application/views/scripts/show/components/output.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/output.phtml
@@ -1,5 +1,5 @@
 <div class="pluginoutput">
-  <h4><?= $this->translate('Plugin Output') ?></h4>
+  <h2><?= $this->translate('Plugin Output') ?></h2>
   <?= $this->pluginOutput($object->output) ?>
   <?= $this->pluginOutput($object->long_output) ?>
 </div>

From 6ad9b5bc783ccc3b4db145e3a1ab4414c13abf57 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 00:36:34 +0200
Subject: [PATCH 2196/2920] defaults.less: remove .page-header mixin

Not flexible enough, mixins also lead to redundancy that could be
avoided otherwise. e.g.: tinystatesummary
---
 public/css/icinga/defaults.less | 76 +++++++++++++--------------------
 1 file changed, 30 insertions(+), 46 deletions(-)

diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index 0afa6333e..1d6b0c25c 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -34,26 +34,6 @@
 @colorFormNotificationWarning: #ffaa44;
 @colorFormNotificationError: #ff5566;
 
-/* Mixins */
-
-.page-header(@borderSize: 2px; @fontSize: 2em; @textColor: @colorMainForeground) {
-  font-size: @fontSize;
-  color: @textColor;
-  border-left: 1em solid #888;
-  border-bottom: 3px solid #888;
-  font-weight: normal;
-  padding: 0.3em 1em;
-  text-transform: uppercase;
-  font-size: 0.8em;
-  a {
-    text-decoration: none;
-    color: inherit;
-    &:hover {
-      text-decoration: underline;
-    }
-  }
-}
-
 /*** Base rules ***/
 * {
   font-size: 100%;
@@ -101,33 +81,10 @@ a {
   }
 }
 
-/* W3C Recommendation <http://www.w3.org/TR/CSS21/sample.html> (except h4) */
-h1 {
-    .page-header();
-}
-
-h2 {
-    font-size:  1.5em;
-}
-
-h3 {
-  .page-header(1px, 1.17em);
-}
-
-h4 {
-  font-size:    1em;
-}
-
-h5 {
-  .page-header(1px, .83em);
-}
-
-h6 {
-    font-size:  .75em;
-    color: @colorPetrol;
-}
-
 h1, h2, h3, h4, h5, h6 {
+  font-size: 1em;
+  padding: 0.3em 1em;
+
   a {
     text-decoration: none;
     color: inherit;
@@ -138,6 +95,33 @@ h1, h2, h3, h4, h5, h6 {
   }
 }
 
+h5 {
+  font-size: 0.83em;
+}
+
+h6 {
+  font-size: 0.75em;
+}
+
+h1 {
+  border-left: 1em solid #888;
+  border-bottom: 3px solid #888;
+  text-transform: uppercase;
+  font-weight: bold;
+}
+
+h2 {
+  border-left: 1em solid #888;
+  border-bottom: 1px solid #888;
+  text-transform: uppercase;
+  font-weight: normal;
+}
+
+h3 {
+  border-left: 1em solid #888;
+  border-bottom: 1px solid #888;
+}
+
 button {
   font-family: inherit;
 }

From 33025f1b6e27465df772b97def7ddd0df0f34cdc Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 00:49:59 +0200
Subject: [PATCH 2197/2920] monitoring/css: no special margin for tinystates

---
 modules/monitoring/public/css/module.less | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 703d27ff3..7534ea0ac 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -27,11 +27,6 @@ div.pluginoutput {
   padding: 0.2em;
 }
 
-div.pluginoutput h4 {
-  font-size: 0.875em;
-  margin: 0em;
-}
-
 div.pluginoutput pre {
   white-space: pre-wrap;
   border-left: 4px solid #d8d8d8;
@@ -83,10 +78,6 @@ div.contacts div.notification-periods {
 }
 
 .tinystatesummary {
-  .page-header();
-  font-size: 1em;
-  margin-bottom: 0.5em;
-
   .badges {
     display: inline-block;
     margin-bottom: 4px;
@@ -207,9 +198,10 @@ table.avp {
         }
     }
 
-    h4 {
+    h3 {
         font-weight: normal;
         color: white;
+        border: none;
         text-transform: uppercase;
         background-color: #aaa;
         display: block;

From a5a529bc991ceb1183f4bce7cd0b0eb70608c141 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 00:50:40 +0200
Subject: [PATCH 2198/2920] Tiny summaries: use header tag instead of div

---
 .../views/scripts/list/components/hostssummary.phtml          | 4 ++--
 .../views/scripts/list/components/servicesummary.phtml        | 4 ++--
 .../views/scripts/partials/host/servicesummary.phtml          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
index 1690bf0a7..58d410a0d 100644
--- a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
@@ -14,7 +14,7 @@ function urlAddFilterOptional($url, $filter, $optional) {
 $this->baseFilter = isset($this->baseFilter) ? $this->baseFilter : null;
 $selfUrl = 'monitoring/list/hosts';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
-?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
+?><h1 class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
   <?= $this->qlink(
       sprintf($this->translatePlural('%u Host', '%u Hosts', $this->stats->hosts_total), $this->stats->hosts_total),
       $selfUrl,
@@ -164,4 +164,4 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
     </span>
     <?php endif; ?>
   </span>
-</div>
+</h1>
diff --git a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
index 5776285ee..3406cb088 100644
--- a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
@@ -16,7 +16,7 @@ $this->baseFilter = isset($this->baseFilter) ? $this->baseFilter : null;
 
 $selfUrl = 'monitoring/list/services';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
-?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
+?><h1 class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
 <?= $this->qlink(
     sprintf($this->translatePlural(
         '%u Service', '%u Services', $this->stats->services_total),
@@ -143,4 +143,4 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
 </span>
 <?php endif ?>
 </span>
-</div>
+</h1>
diff --git a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
index b69682e1b..be146acbe 100644
--- a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml
@@ -13,7 +13,7 @@ function urlAddFilterOptional($url, $filter, $optional) {
 }
 
 $selfUrl = Url::fromPath('monitoring/list/services', array('host' => $object->host_name));
-?><div class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
+?><h2 class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
 <?php if ($object->stats->services_total): ?>
 <?= $this->qlink(
     sprintf(
@@ -147,4 +147,4 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
 </span>
 <?php endif ?>
 </span>
-</div>
+</h2>

From 64ac2ea4c86d8fb2b99c44c0bf084440e8a42bf1 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 00:51:25 +0200
Subject: [PATCH 2199/2920] comments, downtimes: these should never have
 used...

...that styling. Those are headers and have nothing to do with statesummaries
---
 .../monitoring/application/views/scripts/list/comments.phtml  | 4 +---
 .../monitoring/application/views/scripts/list/downtimes.phtml | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 551d0cbac..c4309f46e 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -4,9 +4,7 @@
   <div class="dontprint">
      <?= $this->render('list/components/selectioninfo.phtml'); ?>
   </div>
-  <div class="tinystatesummary">
-     <?= count($comments) ?> <?= $this->translate('Comments') ?>:
-  </div>
+  <h1><?= count($comments) ?> <?= $this->translate('Comments') ?></h1>
   <?= $this->sortBox; ?>
   <?= $this->limiter; ?>
   <?= $this->paginator; ?>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index d062274e7..99b1c0e77 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -8,9 +8,7 @@ if (! $this->compact): ?>
     <div class="dontprint">
         <?= $this->render('list/components/selectioninfo.phtml'); ?>
     </div>
-    <div class="tinystatesummary">
-        <?= count($downtimes) ?> <?= $this->translate('Downtimes') ?>
-    </div>
+    <h1><?= count($downtimes) ?> <?= $this->translate('Downtimes') ?></h1>
   <?= $this->sortBox; ?>
   <?= $this->limiter; ?>
   <?= $this->paginator; ?>

From 5cb4aba09b9cb1bb39494b5e13bfedda52a18c52 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 00:52:19 +0200
Subject: [PATCH 2200/2920] main-content.less: remove more font size
 definitions

---
 public/css/icinga/main-content.less | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 9f50767fe..293a574f1 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -73,7 +73,6 @@ table.avp {
   color: @colorTextDarkDefault;
   table-layout: auto;
   width: 100%;
-  font-size: 0.9em;
 }
 
 table.avp a {
@@ -107,10 +106,6 @@ table.avp.newsection, table.avp tr.newsection {
   padding: 0;
 }
 
-table.avp {
-  font-size: 0.8em;
-}
-
 table.avp a {
   color: @colorLinkDefault;
   text-decoration: none;
@@ -127,13 +122,10 @@ table.objectstate {
 }
 
 table.objectstate td {
-  font-size: 1.2em;
-  line-height: 1.5em;
   padding-left: 1em;
 }
 
 table.objectstate tr.state td.state {
-  font-size: 1em;
   width: 9em;
   text-align: center;
   padding-left: 0;
@@ -174,24 +166,9 @@ table.objectlist {
 table.benchmark {
   margin: 1em 1% 1em 1%;
   font-family: monospace;
-  font-size: 1em;
   width: 96%;
 }
 
-/*
-.dashboard h1 {
-  font-size: 1em;
-}
-*/
-
-.dashboard h2 {
-  font-size: 1em;
-}
-
-.dashboard h3 {
-  font-size: 1em;
-}
-
 .dashboard table.benchmark {
   font-size: 0.9em;
 }
@@ -217,7 +194,6 @@ table.benchmark {
 
 /* Action table */
 table.action {
-  font-size: 0.9em;
   border-collapse: separate;
   border-spacing: 1px;
   width: 100%;

From f4fc55e741fe977f1c11c9783bf1bf9221e0bfd7 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 00:52:52 +0200
Subject: [PATCH 2201/2920] layout-structure.less: reduce main containers font

...size
---
 public/css/icinga/layout-structure.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index bf3e97cae..784e871ca 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -96,6 +96,7 @@ html {
   box-sizing: border-box;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
+  font-size: 0.875em;
   width: 100%;
   height: 100%;
   overflow: auto;

From 96ac83230c7f68a803adc0818b9dc13d3643ab1b Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 01:15:32 +0200
Subject: [PATCH 2202/2920] customvars.phtml: no header if no vars

---
 .../application/views/scripts/show/components/customvars.phtml   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/views/scripts/show/components/customvars.phtml b/modules/monitoring/application/views/scripts/show/components/customvars.phtml
index e58b0f168..b3e4c334b 100644
--- a/modules/monitoring/application/views/scripts/show/components/customvars.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/customvars.phtml
@@ -1,3 +1,4 @@
+<?php if (empty($object->customvars)) return; ?>
 <tr class="newsection">
     <td colspan="2">
         <h2 class="customvar"><?= $this->translate('Custom variables') ?></h2>

From f18921c4067bd89e3515f4e344b592619445ccf3 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 01:28:12 +0200
Subject: [PATCH 2203/2920] monitoring/css: no special styling for h3

---
 modules/monitoring/public/css/module.less | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 7534ea0ac..39c8d157d 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -198,17 +198,6 @@ table.avp {
         }
     }
 
-    h3 {
-        font-weight: normal;
-        color: white;
-        border: none;
-        text-transform: uppercase;
-        background-color: #aaa;
-        display: block;
-        padding: 0.2em 1em 0.2em 1em;
-        font-size: 0.9em;
-    }
-
     .autosubmit-warning {
         display: none;
     }

From 7669fd88bc395fab16bee7ea4845eed9383d8e6a Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 01:28:38 +0200
Subject: [PATCH 2204/2920] ToggleObjectFeaturesCommandForm: use h2 instead of
 h4

---
 .../forms/Command/Object/ToggleObjectFeaturesCommandForm.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
index ad6196d44..6dfbd2670 100644
--- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
@@ -21,7 +21,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
         $this->setUseFormAutosubmit();
         $this->setTitle('Feature Commands');
         $this->setAttrib('class', 'inline object-features');
-        $this->loadDefaultDecorators()->getDecorator('description')->setTag('h4');
+        $this->loadDefaultDecorators()->getDecorator('description')->setTag('h2');
     }
 
     /**

From 796b1d7601853c924e5020abe5a8bfa5968b7eb5 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 01:30:00 +0200
Subject: [PATCH 2205/2920] forms.less: do not see the reason for in line hX

---
 public/css/icinga/forms.less | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 99ea074df..2c45b476f 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -260,9 +260,3 @@ form ul.descriptions {
     }
   }
 }
-
-form > div.header {
-  h1, h2, h3, h4, h5, h6 {
-    display: inline-block;
-  }
-}

From 9b34729a7aa783dd141b58f2dc143a8c7248fd3c Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 01:31:01 +0200
Subject: [PATCH 2206/2920] defaults.less: color definition cleanup

---
 public/css/icinga/defaults.less | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index 1d6b0c25c..edf265c46 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -10,20 +10,13 @@
 
 @colorGray: #f9f9f9;
 @colorLinkDefault: #049baf;
-@colorTextDefault: #666;
+@colorTextDefault: @colorMainForeground;
 @colorTextDarkDefault: #555;
-@colorPetrol: #049baf;
 @colorOk: #44bb77;
 @colorWarning: #ffaa44;
 @colorWarningHandled: #ffcc66;
 @colorCritical: #ff5566;
 @colorCriticalHandled: #ff99aa;
-/*
-@colorUnknown: #dd66ff;
-@colorUnknownHandled: #ee99ff;
-@colorUnreachable: #dd66ff;
-@colorUnreachableHandled: #ee99ff;
-*/
 @colorUnknown: #aa44ff;
 @colorUnknownHandled: #cc77ff;
 @colorUnreachable: #aa44ff;
@@ -34,6 +27,9 @@
 @colorFormNotificationWarning: #ffaa44;
 @colorFormNotificationError: #ff5566;
 
+/* deprecated */
+@colorPetrol: @colorMainLayout;
+
 /*** Base rules ***/
 * {
   font-size: 100%;

From 8c28bf857720873c0f2c7970f40038387fef3688 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 01:31:42 +0200
Subject: [PATCH 2207/2920] defaults.less: slightly adjust headers

---
 public/css/icinga/defaults.less | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index edf265c46..d1390e7fc 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -80,6 +80,8 @@ a {
 h1, h2, h3, h4, h5, h6 {
   font-size: 1em;
   padding: 0.3em 1em;
+  margin: 0.3em 0 0.5em 0;
+  color: @textColor;
 
   a {
     text-decoration: none;
@@ -107,8 +109,8 @@ h1 {
 }
 
 h2 {
-  border-left: 1em solid #888;
-  border-bottom: 1px solid #888;
+  border-left: 0.3em solid #666;
+  border-bottom: 1px solid #666;
   text-transform: uppercase;
   font-weight: normal;
 }

From 0d290441f2239f24de343b81d5991fbf0a7ef889 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 01:32:30 +0200
Subject: [PATCH 2208/2920] monitoring/css: fix header styling, try small-caps

---
 modules/monitoring/public/css/module.less | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 39c8d157d..17bd5f09f 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -176,6 +176,7 @@ table.avp {
     th {
         font-weight: normal;
         font-size: 0.9em;
+        font-variant: small-caps;
         padding-top: 0.2em;
         padding-bottom: 0.3em;
     }
@@ -206,6 +207,7 @@ table.avp {
         label {
             font-weight: normal;
             margin-right: 0;
+            font-variant: small-caps;
         }
 
         input {
@@ -271,6 +273,7 @@ td.state {
 .inline-comments {
     padding: 0;
     margin: 0;
+    font-size: 0.857em;
 
     .time-ago {
         font-style: italic;
@@ -282,7 +285,8 @@ td.state {
         margin-bottom: 8px;
     }
 
-    h4 {
+    h3 {
+        border: none;
         border-bottom: 1px solid gray;
         font-weight: normal;
         font-size: inherit;
@@ -290,19 +294,19 @@ td.state {
         margin: 0;
     }
 
-    h4 .author {
+    h3 .author {
         font-weight: bold;
     }
 
-    h4 form {
+    h3 form {
         display: none;
     }
 
-    h4 form {
+    h3 form {
         float: right;
     }
 
-    li:hover h4 {
+    li:hover h3 {
         background: #F9F9F9;
         position: relative;
 

From 6c98e87593cb7cc6b76cd580990efa3552655cd3 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 01:42:45 +0200
Subject: [PATCH 2209/2920] monitoring/css: revert small-caps

---
 modules/monitoring/public/css/module.less | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 17bd5f09f..6a869a5ce 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -176,7 +176,6 @@ table.avp {
     th {
         font-weight: normal;
         font-size: 0.9em;
-        font-variant: small-caps;
         padding-top: 0.2em;
         padding-bottom: 0.3em;
     }
@@ -207,7 +206,6 @@ table.avp {
         label {
             font-weight: normal;
             margin-right: 0;
-            font-variant: small-caps;
         }
 
         input {
@@ -1237,3 +1235,6 @@ table.statesummary {
   }
 }
 
+table.action .objectflags: {
+  float: right;
+}

From 686f73858ffa049e159484f2195a46a121da5b39 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 01:45:48 +0200
Subject: [PATCH 2210/2920] monitoring/list: move object flags to the right

---
 modules/monitoring/application/views/scripts/list/hosts.phtml | 2 +-
 .../monitoring/application/views/scripts/list/services.phtml  | 4 ++--
 modules/monitoring/public/css/module.less                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index fd6fd1a23..67508633d 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -54,7 +54,7 @@ if (count($hosts) === 0) {
       <!-- Host / Status / Output -->
       <td>
         <?= $this->iconImage()->host($host) ?>
-        <?= implode(' ', $this->hostFlags($host)) ?>
+        <span="objectflags"><?= implode(' ', $this->hostFlags($host)) ?></span>
         <?= $this->qlink(
           $host->host_display_name,
           $hostLink,
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index f152d635d..bad77424c 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -60,9 +60,8 @@ if (count($services) === 0) {
       </td>
 
       <td>
-        <div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 8) ?> </div>
         <?= $this->iconImage()->service($service) ?>
-        <?= implode(' ', $this->serviceFlags($service)); ?>
+        <span class="objectflags"><?= implode(' ', $this->serviceFlags($service)) ?></span>
         <?= $this->qlink(
           $service->service_display_name,
           $serviceLink,
@@ -78,6 +77,7 @@ if (count($services) === 0) {
           null,
           array('title' => sprintf($this->translate('Show detailed information for host %s'), $service->host_display_name))
         ); ?><?php endif ?><br>
+        <div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 8) ?> </div>
         <p class="pluginoutput"><?= $this->escape($this->ellipsis($service->service_output, 10000)); ?></p>
       </td>
 <?php foreach($this->addColumns as $col): ?>
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 6a869a5ce..88f9f4bde 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -1235,6 +1235,6 @@ table.statesummary {
   }
 }
 
-table.action .objectflags: {
+table.action .objectflags {
   float: right;
 }

From 0b6345acecb76c4f2cb778b730ff65e6dd2ae5dd Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 01:52:12 +0200
Subject: [PATCH 2211/2920] monitoring/css: less styles

---
 modules/monitoring/public/css/module.less | 32 +++--------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 88f9f4bde..c3a552426 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -1,14 +1,5 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-table.action.comments td p, table.action.downtimes td p {
-  margin: 0;
-  font-size: 0.8em;
-}
-
-table.action.comments td a, table.action.downtimes td a {
-  font-weight: bold;
-}
-
 .content.processinfo table.avp th {
   width: 16em;
 }
@@ -34,21 +25,7 @@ div.pluginoutput pre {
   font-size: 0.9em;
 }
 
-table.objecthistory td {
-  font-size: 0.8em;
-}
-
-table.objecthistory td.state {
-  font-size: 0.7em;
-}
-
-table.objectstate {
-  font-size: 0.8em;
-}
-
 table.objectstate td.state {
-  font-size: 0.92em;
-  line-height: 1.8em;
   padding-top: 0.5em;
   padding-bottom: 0.5em;
 }
@@ -87,7 +64,7 @@ div.contacts div.notification-periods {
 
   .state > a {
     color: white;
-    font-size: 0.8em;
+    font-size: 0.857em;
     padding: 2px 5px;
   }
 }
@@ -106,7 +83,6 @@ span.state.active {
 }
 
 span.state span.state {
-    font-size: 1em;
     margin: 0 -3px 0 5px;
 }
 
@@ -175,7 +151,7 @@ table.avp form.object-features div.header h4 {
 table.avp {
     th {
         font-weight: normal;
-        font-size: 0.9em;
+        font-size: 0.857em;
         padding-top: 0.2em;
         padding-bottom: 0.3em;
     }
@@ -189,7 +165,7 @@ table.avp {
     }
 
     a, button.link-like {
-        color: @colorPetrol;
+        color: @mainLayoutColor;
     }
 
     .go-ahead {
@@ -225,7 +201,7 @@ div.selection-info {
   padding-top: 0.4em;
   float: right;
   cursor: help;
-  font-size: 0.8em;
+  font-size: 0.857em;
 }
 
 .optionbox {

From 774483c7302f1d172bd5ce434e110f3fb00e37fa Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 01:55:57 +0200
Subject: [PATCH 2212/2920] main-content.less: remove obsolete style

---
 public/css/icinga/main-content.less | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 293a574f1..c7febf671 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -156,13 +156,6 @@ table.perfdata td {
   padding-right: 0.5em;
 }
 
-table.objectlist {
-  min-width: 28em;
-  th {
-    text-align: left;
-  }
-}
-
 table.benchmark {
   margin: 1em 1% 1em 1%;
   font-family: monospace;

From ea0c93c21baac3c7b8672abe42a48ae03684ed34 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 01:57:34 +0200
Subject: [PATCH 2213/2920] main-content.less: move even more CSS to monitoring

---
 modules/monitoring/public/css/module.less | 37 ++++++++++++++++++++
 public/css/icinga/main-content.less       | 41 -----------------------
 2 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index c3a552426..9d740b408 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -1214,3 +1214,40 @@ table.statesummary {
 table.action .objectflags {
   float: right;
 }
+
+table.objectstate {
+  border-collapse: separate;
+  border-spacing: 1px;
+}
+
+table.objectstate td {
+  padding-left: 1em;
+}
+
+table.objectstate tr.state td.state {
+  width: 9em;
+  text-align: center;
+  padding-left: 0;
+  border-radius: 0;
+}
+
+table.perfdata {
+  min-width: 24em;
+  font-size: 0.9em;
+}
+
+table.perfdata.perfdata-piecharts {
+  left: -2.6em;
+  position: relative;
+}
+
+table.perfdata th {
+  padding: 0;
+  text-align: left;
+  padding-right: 0.5em;
+}
+
+table.perfdata td {
+  white-space: nowrap;
+  padding-right: 0.5em;
+}
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index c7febf671..89dcd2572 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -115,47 +115,6 @@ table.avp a:hover {
   text-decoration: underline;
 }
 
-/* Definitively monitoring-only: */
-table.objectstate {
-  border-collapse: separate;
-  border-spacing: 1px;
-}
-
-table.objectstate td {
-  padding-left: 1em;
-}
-
-table.objectstate tr.state td.state {
-  width: 9em;
-  text-align: center;
-  padding-left: 0;
-  border-radius: 0;
-}
-
-table.objectstate tr.state.handled td.state {
-}
-
-table.perfdata {
-  min-width: 24em;
-  font-size: 0.9em;
-}
-
-table.perfdata.perfdata-piecharts {
-  left: -2.6em;
-  position: relative;
-}
-
-table.perfdata th {
-  padding: 0;
-  text-align: left;
-  padding-right: 0.5em;
-}
-
-table.perfdata td {
-  white-space: nowrap;
-  padding-right: 0.5em;
-}
-
 table.benchmark {
   margin: 1em 1% 1em 1%;
   font-family: monospace;

From e962b44b5ed37e260531d7a121fc90bc07a9e17c Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 02:11:16 +0200
Subject: [PATCH 2214/2920] user/show: get rid of useless styles...

...and use our default HTML tags/classes instead
---
 application/views/scripts/user/show.phtml | 69 ++++++++++++++---------
 public/css/icinga/main-content.less       | 14 +----
 2 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index 64a9eaa02..83b7c350e 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -5,7 +5,7 @@ use Icinga\Data\Reducible;
 use Icinga\Data\Selectable;
 
 $editLink = null;
-if ($this->hasPermission('config/authentication/users/edit') && $backend instanceof Updatable) {
+if (true || $this->hasPermission('config/authentication/users/edit') && $backend instanceof Updatable) {
     $editLink = $this->qlink(
         null,
         'user/edit',
@@ -24,25 +24,35 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
 ?>
 <div class="controls">
  <?php if (! $this->compact): ?>
-   <?= $tabs; ?>
+ <?= $tabs ?>
  <?php endif ?>
-  <div class="user-header">
-    <p class="user-name"><strong><?= $this->escape($user->user_name); ?></strong></p> <?= $editLink; ?>
-    <p class="user-state"><strong><?= $this->translate('State'); ?>:</strong> <?= $user->is_active === null ? '-' : ($user->is_active ? $this->translate('Active') : $this->translate('Inactive')); ?></p>
-    <p class="user-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $user->created_at === null ? '-' : $this->formatDateTime($user->created_at); ?></p>
-    <p class="user-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $user->last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?></p>
-    <h3><?= $this->translate('Group Memberships'); ?></h3>
-    <?php if (! $this->compact): ?>
-     <?= $this->sortBox; ?>
-    <?php endif ?>
-     <?= $this->limiter; ?>
-     <?= $this->paginator; ?>
-    <?php if (! $this->compact): ?>
-     <?= $this->filterEditor; ?>
-    <?php endif ?>
-  </div>
+
+ <h1><?= $this->escape($user->user_name); ?><span class="pull-right"><?= $editLink ?></span></h1>
 </div>
-<div class="content memberships" data-base-target="_next">
+<div class="content">
+ <table class="avp">
+  <tr>
+   <th><?= $this->translate('State'); ?>:</th>
+   <td><?= $user->is_active === null ? '-' : ($user->is_active ? $this->translate('Active') : $this->translate('Inactive')); ?></td>
+  </tr>
+  <tr>
+   <th><?= $this->translate('Created at'); ?>:</th>
+   <td><?= $user->created_at === null ? '-' : $this->formatDateTime($user->created_at); ?></td>
+  </tr>
+  <tr>
+   <th><?= $this->translate('Last modified'); ?>:</th>
+   <td><?= $user->last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?></td>
+  </tr>
+ </table>
+ <h3><?= $this->translate('Group Memberships'); ?></h3>
+    <?php if (! $this->compact): ?>
+     <?= $this->sortBox ?>
+    <?php endif ?>
+     <?= $this->limiter ?>
+     <?= $this->paginator ?>
+    <?php if (! $this->compact): ?>
+     <?= $this->filterEditor ?>
+    <?php endif ?>
 <?php if (count($memberships) > 0): ?>
   <table data-base-target="_next" class="action membership-list">
     <thead>
@@ -84,13 +94,18 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
   <p><?= $this->translate('No memberships found matching the filter'); ?></p>
 <?php endif ?>
 <?php if ($showCreateMembershipLink): ?>
-<?= $this->qlink($this->translate('Create new membership'), 'user/createmembership', array(
-  'backend'             => $backend->getName(),
-  'user'                => $user->user_name
-), array(
-  'icon'                => 'plus',
-  'data-base-target'    => '_next',
-  'class'               => 'membership-create'
-)); ?>
+<?= $this->qlink(
+    $this->translate('Create new membership'),
+    'user/createmembership',
+    array(
+        'backend'             => $backend->getName(),
+        'user'                => $user->user_name
+    ),
+    array(
+        'icon'                => 'plus',
+        'data-base-target'    => '_next',
+        'class'               => 'membership-create'
+    )
+) ?>
 <?php endif ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 89dcd2572..37756ae8d 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -201,6 +201,7 @@ tr[href] {
 /* End of table behaviour */
 
 
+/* TODO: get rid of most if not all styles below this line */
 div.content.users {
   table.user-list {
     th.user-remove {
@@ -224,19 +225,6 @@ div.content.users {
   }
 }
 
-div.controls div.user-header {
-  .user-name {
-    display: inline-block;
-    margin: 0 0 0.3em;
-    font-size: 2em;
-  }
-
-  .user-state, .user-created, .user-modified {
-    margin: 0 0 0.2em;
-    font-size: 0.8em;
-  }
-}
-
 div.content.memberships {
   table.membership-list {
     th.membership-cancel {

From 3f926b1568b521c82f24fbcae718854b3a27c82f Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 02:13:44 +0200
Subject: [PATCH 2215/2920] monitoring/css: reduce object state size

---
 modules/monitoring/public/css/module.less | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 9d740b408..6ce1184d5 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -348,10 +348,6 @@ tr.state.new td.state {
   font-weight: bold;
 }
 
-tr.state td.state strong {
-  font-size: 1.2em;
-}
-
 tr.state td.state {
   width: 9em;
   color: white;
@@ -1216,6 +1212,7 @@ table.action .objectflags {
 }
 
 table.objectstate {
+  font-size: 0.857em;
   border-collapse: separate;
   border-spacing: 1px;
 }

From 09c0ebcacdc0e28f13abfb571166398874201949 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 02:36:53 +0200
Subject: [PATCH 2216/2920] list/services: flip host/service for readability

Re-allow table.action to manually choose row action link if it should not
be the first one. This existed once but got lost.
---
 .../views/scripts/list/services.phtml         | 44 ++++++++++---------
 public/js/icinga/events.js                    |  7 ++-
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index bad77424c..e181216b1 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -6,15 +6,15 @@ $selfUrl = 'monitoring/list/services';
 
 if (! $this->compact): ?>
 <div class="controls separated">
-  <?= $this->tabs; ?>
+  <?= $this->tabs ?>
   <div class="dontprint">
-    <?= $this->render('list/components/selectioninfo.phtml'); ?>
-    <?= $this->render('list/components/servicesummary.phtml'); ?>
+    <?= $this->render('list/components/selectioninfo.phtml') ?>
+    <?= $this->render('list/components/servicesummary.phtml') ?>
   </div>
-  <?= $this->sortBox; ?>
-  <?= $this->limiter; ?>
-  <?= $this->paginator; ?>
-  <?= $this->filterEditor; ?>
+  <?= $this->sortBox ?>
+  <?= $this->limiter ?>
+  <?= $this->paginator ?>
+  <?= $this->filterEditor ?>
 </div>
 <?php endif ?>
 <div class="content">
@@ -48,7 +48,7 @@ if (count($services) === 0) {
 ?>
     <tr class="state <?= $serviceStateName ?><?= $service->service_handled ? ' handled' : '' ?>">
       <td class="state">
-        <strong><?= Service::getStateText($service->service_state, true); ?></strong>
+        <strong><?= Service::getStateText($service->service_state, true) ?></strong>
         <?php if ((int) $service->service_state !== 99): ?>
           <br />
           <?= $this->timeSince($service->service_last_state_change, $this->compact) ?>
@@ -62,23 +62,27 @@ if (count($services) === 0) {
       <td>
         <?= $this->iconImage()->service($service) ?>
         <span class="objectflags"><?= implode(' ', $this->serviceFlags($service)) ?></span>
-        <?= $this->qlink(
-          $service->service_display_name,
-          $serviceLink,
-          null,
-          array('title' => sprintf(
-            $this->translate('Show detailed information for service %s on host %s'),
-            $service->service_display_name,
-            $service->host_display_name
-          ))
-        ); ?><?php if ($this->showHost): ?> on <?= $this->qlink(
+<?php if ($this->showHost): ?><?= $this->qlink(
           $service->host_display_name . ($service->host_state != 0 ? ' (' . Host::getStateText($service->host_state, true) . ')' : ''),
           $hostLink,
           null,
           array('title' => sprintf($this->translate('Show detailed information for host %s'), $service->host_display_name))
-        ); ?><?php endif ?><br>
+        ) ?>: 
+<?php endif ?><?= $this->qlink(
+    $service->service_display_name,
+    $serviceLink,
+    null,
+    array(
+        'title' => sprintf(
+            $this->translate('Show detailed information for service %s on host %s'),
+            $service->service_display_name,
+            $service->host_display_name
+        ),
+        'class' => 'rowaction'
+    )
+) ?><br />
         <div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 8) ?> </div>
-        <p class="pluginoutput"><?= $this->escape($this->ellipsis($service->service_output, 10000)); ?></p>
+        <p class="pluginoutput"><?= $this->escape($this->ellipsis($service->service_output, 10000)) ?></p>
       </td>
 <?php foreach($this->addColumns as $col): ?>
       <td><?= $this->escape($service->$col) ?></td>
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 84354c960..6f226407b 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -42,10 +42,15 @@
 
             // Set first links href in a action table tr as row href:
             $('table.action tr', el).each(function(idx, el) {
-                var $a = $('a[href]', el).first();
+                var $a = $('a[href].rowaction', el).first();
                 if ($a.length) {
                     // TODO: Find out whether we leak memory on IE with this:
                     $(el).attr('href', $a.attr('href'));
+                    return;
+                }
+                $a = $('a[href]', el).first();
+                if ($a.length) {
+                    $(el).attr('href', $a.attr('href'));
                 }
             });
 

From b579c65038e41e157502f158294ecaa89187cffe Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 02:49:41 +0200
Subject: [PATCH 2217/2920] monitoring/css: more font cleanups

---
 modules/monitoring/public/css/module.less | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 6ce1184d5..0b4ed9467 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -5,7 +5,6 @@
 }
 
 p.pluginoutput {
-  font-size: 0.9em;
   width: 100%;
   white-space: pre-wrap;
   font-family: monospace;
@@ -22,7 +21,6 @@ div.pluginoutput pre {
   white-space: pre-wrap;
   border-left: 4px solid #d8d8d8;
   padding: 0.3em 0 0.3em 1em;
-  font-size: 0.9em;
 }
 
 table.objectstate td.state {
@@ -315,10 +313,8 @@ table.colors td {
   border: 0.079em solid white;
 }
 
-
-
-table.action td.state {
-  font-size: 0.7em;
+table.action td.state, table.objectstate td.state {
+  font-size: 0.857em;
   text-align: center;
 }
 
@@ -1212,7 +1208,6 @@ table.action .objectflags {
 }
 
 table.objectstate {
-  font-size: 0.857em;
   border-collapse: separate;
   border-spacing: 1px;
 }

From 988bc2cf4441c608d5f88d1ba6e9900aed886e7a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:09:54 +0200
Subject: [PATCH 2218/2920] ServicestatusQuery: Improve JOIN performance

refs #9009
---
 .../Backend/Ido/Query/ServicestatusQuery.php  | 25 +++----------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
index f336ce30d..1beae3917 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -212,14 +212,8 @@ class ServicestatusQuery extends IdoQuery
             array()
         )->join(
             array('s' => $this->prefix . 'services'),
-            's.service_object_id = so.object_id',
+            's.service_object_id = so.object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
-        )->where(
-            'so.is_active = ?',
-            1
-        )->where(
-            'so.objecttype_id = ?',
-            2
         );
         $this->joinedVirtualTables['services'] = true;
     }
@@ -239,14 +233,8 @@ class ServicestatusQuery extends IdoQuery
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id',
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
-        )->where(
-            'hgo.is_active = ?',
-            1
-        )->where(
-            'hgo.objecttype_id = ?',
-            3
         );
         $this->group(array('so.name2', 'so.name1'));
     }
@@ -290,15 +278,8 @@ class ServicestatusQuery extends IdoQuery
             array()
         )->join(
             array('sgo' => $this->prefix . 'objects'),
-            'sgo.object_id = sg.servicegroup_object_id',
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
-        )->where(
-            'sgo.is_active = ?',
-            1
-        )
-        ->where(
-            'sgo.objecttype_id = ?',
-            4
         );
         $this->group(array('so.name2', 'so.name1'));
     }

From 1a32d289b8cbf0629b383d7d532f88e3019efbea Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:10:16 +0200
Subject: [PATCH 2219/2920] HostcommenthistoryQuery: Improve JOIN performance

refs #9009
---
 .../Ido/Query/HostcommenthistoryQuery.php     | 35 +++----------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php
index 259fe1c18..60f91cb15 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php
@@ -73,14 +73,8 @@ class HostcommenthistoryQuery extends IdoQuery
             array()
         )->join(
             array('ho' => $this->prefix . 'objects'),
-            'ho.object_id = hch.object_id',
+            'ho.object_id = hch.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
             array()
-        )->where(
-            'ho.is_active = ?',
-            1
-        )->where(
-            'ho.objecttype_id = ?',
-            1
         );
         $this->joinedVirtualTables['commenthistory'] = true;
         $this->joinedVirtualTables['history'] = true;
@@ -101,15 +95,8 @@ class HostcommenthistoryQuery extends IdoQuery
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id',
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
-        )->where(
-            'hgo.is_active = ?',
-            1
-        )
-        ->where(
-            'hgo.objecttype_id = ?',
-            3
         );
         $this->select->group(array('hch.commenthistory_id', 'ho.name1'));
     }
@@ -142,15 +129,8 @@ class HostcommenthistoryQuery extends IdoQuery
             array()
         )->join(
             array('sgo' => $this->prefix . 'objects'),
-            'sgo.object_id = sg.servicegroup_object_id',
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
-        )->where(
-            'sgo.is_active = ?',
-            1
-        )
-        ->where(
-            'sgo.objecttype_id = ?',
-            4
         );
     }
 
@@ -165,15 +145,8 @@ class HostcommenthistoryQuery extends IdoQuery
             array()
         )->join(
             array('so' => $this->prefix . 'objects'),
-            'so.object_id = s.service_object_id',
+            'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
-        )->where(
-            'so.is_active = ?',
-            1
-        )
-        ->where(
-            'so.objecttype_id = ?',
-            2
         );
         $this->select->group(array('hch.commenthistory_id', 'ho.name1'));
     }

From 41f1d3307b2d56429f4e198ff8ed757623d2ca2a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:10:24 +0200
Subject: [PATCH 2220/2920] HostcommentQuery: Improve JOIN performance

refs #9009
---
 .../Backend/Ido/Query/HostcommentQuery.php    | 35 +++----------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
index 080fdd905..84e9072b9 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
@@ -64,14 +64,8 @@ class HostcommentQuery extends IdoQuery
             array()
         )->join(
             array('ho' => $this->prefix . 'objects'),
-            'ho.object_id = c.object_id',
+            'ho.object_id = c.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
             array()
-        )->where(
-            'ho.is_active = ?',
-            1
-        )->where(
-            'ho.objecttype_id = ?',
-            1
         );
         $this->joinedVirtualTables['comments'] = true;
     }
@@ -91,15 +85,8 @@ class HostcommentQuery extends IdoQuery
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id',
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
-        )->where(
-            'hgo.is_active = ?',
-            1
-        )
-        ->where(
-            'hgo.objecttype_id = ?',
-            3
         );
         $this->group(array('c.comment_id', 'ho.name1'));
     }
@@ -144,15 +131,8 @@ class HostcommentQuery extends IdoQuery
             array()
         )->join(
             array('sgo' => $this->prefix . 'objects'),
-            'sgo.object_id = sg.servicegroup_object_id',
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
-        )->where(
-            'sgo.is_active = ?',
-            1
-        )
-        ->where(
-            'sgo.objecttype_id = ?',
-            4
         );
     }
 
@@ -167,15 +147,8 @@ class HostcommentQuery extends IdoQuery
             array()
         )->join(
             array('so' => $this->prefix . 'objects'),
-            'so.object_id = s.service_object_id AND so.is_active = 1',
+            'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
-        )->where(
-            'so.is_active = ?',
-            1
-        )
-        ->where(
-            'so.objecttype_id = ?',
-            2
         );
         $this->group(array('c.comment_id', 'ho.name1'));
     }

From e73409eb6d440634204cf62f7cbcf33a42a376ca Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:10:32 +0200
Subject: [PATCH 2221/2920] HostdowntimeQuery: Improve JOIN performance

refs #9009
---
 .../Backend/Ido/Query/HostdowntimeQuery.php   | 35 +++----------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
index ec9cd569b..5b7bf667c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
@@ -70,14 +70,8 @@ class HostdowntimeQuery extends IdoQuery
             array()
         )->join(
             array('ho' => $this->prefix . 'objects'),
-            'sd.object_id = ho.object_id',
+            'sd.object_id = ho.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
             array()
-        )->where(
-            'ho.is_active = ?',
-            1
-        )->where(
-            'ho.objecttype_id = ?',
-            1
         );
         $this->joinedVirtualTables['downtimes'] = true;
     }
@@ -97,15 +91,8 @@ class HostdowntimeQuery extends IdoQuery
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id',
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
-        )->where(
-            'hgo.is_active = ?',
-            1
-        )
-        ->where(
-            'hgo.objecttype_id = ?',
-            3
         );
         $this->group(array('sd.scheduleddowntime_id', 'ho.name1'));
     }
@@ -150,15 +137,8 @@ class HostdowntimeQuery extends IdoQuery
             array()
         )->join(
             array('sgo' => $this->prefix . 'objects'),
-            'sgo.object_id = sg.servicegroup_object_id',
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
-        )->where(
-            'sgo.is_active = ?',
-            1
-        )
-        ->where(
-            'sgo.objecttype_id = ?',
-            4
         );
     }
 
@@ -173,15 +153,8 @@ class HostdowntimeQuery extends IdoQuery
             array()
         )->join(
             array('so' => $this->prefix . 'objects'),
-            'so.object_id = s.service_object_id AND so.is_active = 1',
+            'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
-        )->where(
-            'so.is_active = ?',
-            1
-        )
-        ->where(
-            'so.objecttype_id = ?',
-            2
         );
         $this->group(array('sd.scheduleddowntime_id', 'ho.name1'));
     }

From 0a98cb02559ae6e5769b58bfa3000f6e590cd01b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:10:42 +0200
Subject: [PATCH 2222/2920] HostdowntimestarthistoryQuery: Improve JOIN
 performance

refs #9009
---
 .../Query/HostdowntimestarthistoryQuery.php   | 35 +++----------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
index 05b8307a5..94b65c5fb 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
@@ -75,14 +75,8 @@ class HostdowntimestarthistoryQuery extends IdoQuery
             array()
         )->join(
             array('ho' => $this->prefix . 'objects'),
-            'ho.object_id = hdh.object_id',
+            'ho.object_id = hdh.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
             array()
-        )->where(
-            'ho.is_active = ?',
-            1
-        )->where(
-            'ho.objecttype_id = ?',
-            1
         );
 
         if (@func_get_arg(0) === false) {
@@ -110,15 +104,8 @@ class HostdowntimestarthistoryQuery extends IdoQuery
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id',
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
-        )->where(
-            'hgo.is_active = ?',
-            1
-        )
-        ->where(
-            'hgo.objecttype_id = ?',
-            3
         );
         $this->select->group(array('hdh.downtimehistory_id', 'ho.name1'));
     }
@@ -151,15 +138,8 @@ class HostdowntimestarthistoryQuery extends IdoQuery
             array()
         )->join(
             array('sgo' => $this->prefix . 'objects'),
-            'sgo.object_id = sg.servicegroup_object_id',
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
-        )->where(
-            'sgo.is_active = ?',
-            1
-        )
-        ->where(
-            'sgo.objecttype_id = ?',
-            4
         );
     }
 
@@ -174,15 +154,8 @@ class HostdowntimestarthistoryQuery extends IdoQuery
             array()
         )->join(
             array('so' => $this->prefix . 'objects'),
-            'so.object_id = s.service_object_id',
+            'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
-        )->where(
-            'so.is_active = ?',
-            1
-        )
-        ->where(
-            'so.objecttype_id = ?',
-            2
         );
         $this->select->group(array('hdh.downtimehistory_id', 'ho.name1'));
     }

From 55a6b79ee57bb9dbe76c382b89c34a3802e2a479 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:10:49 +0200
Subject: [PATCH 2223/2920] HostgroupQuery: Improve JOIN performance

refs #9009
---
 .../Backend/Ido/Query/HostgroupQuery.php      | 36 +++----------------
 1 file changed, 4 insertions(+), 32 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
index a9b8ec815..45f6a8ae1 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
@@ -53,15 +53,8 @@ class HostgroupQuery extends IdoQuery
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id',
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
-        )->where(
-            'hgo.is_active = ?',
-            1
-        )
-        ->where(
-            'hgo.objecttype_id = ?',
-            3
         );
         $this->joinedVirtualTables['hostgroups'] = true;
     }
@@ -77,15 +70,8 @@ class HostgroupQuery extends IdoQuery
             array()
         )->join(
             array('ho' => $this->prefix . 'objects'),
-            'hgm.host_object_id = ho.object_id',
+            'hgm.host_object_id = ho.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
             array()
-        )->where(
-            'ho.is_active = ?',
-            1
-        )
-        ->where(
-            'ho.objecttype_id = ?',
-            1
         );
         $this->group('hgo.name1');
     }
@@ -119,15 +105,8 @@ class HostgroupQuery extends IdoQuery
             array()
         )->join(
             array('sgo' => $this->prefix . 'objects'),
-            'sgo.object_id = sg.servicegroup_object_id',
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
-        )->where(
-            'sgo.is_active = ?',
-            1
-        )
-        ->where(
-            'sgo.objecttype_id = ?',
-            4
         );
     }
 
@@ -143,15 +122,8 @@ class HostgroupQuery extends IdoQuery
             array()
         )->join(
             array('so' => $this->prefix . 'objects'),
-            'so.object_id = s.service_object_id AND so.is_active = 1',
+            'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
-        )->where(
-            'so.is_active = ?',
-            1
-        )
-        ->where(
-            'so.objecttype_id = ?',
-            2
         );
         $this->group('hgo.name1');
     }

From 326013428eebd168c6394933b08c7825944958ff Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:10:55 +0200
Subject: [PATCH 2224/2920] HostnotificationQuery: Improve JOIN performance

refs #9009
---
 .../Ido/Query/HostnotificationQuery.php       | 35 +++----------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
index 12b4715c7..d4dea4ae1 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
@@ -112,14 +112,8 @@ class HostnotificationQuery extends IdoQuery
             array()
         )->join(
             array('ho' => $this->prefix . 'objects'),
-            'ho.object_id = hn.object_id',
+            'ho.object_id = hn.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
             array()
-        )->where(
-            'ho.is_active = ?',
-            1
-        )->where(
-            'ho.objecttype_id = ?',
-            1
         );
         $this->joinedVirtualTables['notifications'] = true;
     }
@@ -178,15 +172,8 @@ class HostnotificationQuery extends IdoQuery
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id',
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
-        )->where(
-            'hgo.is_active = ?',
-            1
-        )
-        ->where(
-            'hgo.objecttype_id = ?',
-            3
         );
 
         if (! $this->hasJoinedVirtualTable('contactnotifications') && !$this->hasJoinedVirtualTable('history')) {
@@ -222,15 +209,8 @@ class HostnotificationQuery extends IdoQuery
             array()
         )->join(
             array('sgo' => $this->prefix . 'objects'),
-            'sgo.object_id = sg.servicegroup_object_id',
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
-        )->where(
-            'sgo.is_active = ?',
-            1
-        )
-        ->where(
-            'sgo.objecttype_id = ?',
-            4
         );
     }
 
@@ -245,15 +225,8 @@ class HostnotificationQuery extends IdoQuery
             array()
         )->join(
             array('so' => $this->prefix . 'objects'),
-            'so.object_id = s.service_object_id',
+            'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
-        )->where(
-            'so.is_active = ?',
-            1
-        )
-        ->where(
-            'so.objecttype_id = ?',
-            2
         );
 
         if (! $this->hasJoinedVirtualTable('contactnotifications') && !$this->hasJoinedVirtualTable('history')) {

From b774b2565fdf9e7a2e42b4a58c8d18631bee8895 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:11:03 +0200
Subject: [PATCH 2225/2920] HoststatehistoryQuery: Improve JOIN performance

refs #9009
---
 .../Ido/Query/HoststatehistoryQuery.php       | 35 +++----------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php
index e79acdab1..c9176d67d 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php
@@ -89,14 +89,8 @@ class HoststatehistoryQuery extends IdoQuery
             array()
         )->join(
             array('ho' => $this->prefix . 'objects'),
-            'ho.object_id = hh.object_id',
+            'ho.object_id = hh.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
             array()
-        )->where(
-            'ho.is_active = ?',
-            1
-        )->where(
-            'ho.objecttype_id = ?',
-            1
         );
         $this->joinedVirtualTables['statehistory'] = true;
         $this->joinedVirtualTables['history'] = true;
@@ -117,15 +111,8 @@ class HoststatehistoryQuery extends IdoQuery
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id',
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
-        )->where(
-            'hgo.is_active = ?',
-            1
-        )
-        ->where(
-            'hgo.objecttype_id = ?',
-            3
         );
         $this->select->group(array('hh.statehistory_id', 'ho.name1'));
     }
@@ -158,15 +145,8 @@ class HoststatehistoryQuery extends IdoQuery
             array()
         )->join(
             array('sgo' => $this->prefix . 'objects'),
-            'sgo.object_id = sg.servicegroup_object_id',
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
-        )->where(
-            'sgo.is_active = ?',
-            1
-        )
-        ->where(
-            'sgo.objecttype_id = ?',
-            4
         );
     }
 
@@ -181,15 +161,8 @@ class HoststatehistoryQuery extends IdoQuery
             array()
         )->join(
             array('so' => $this->prefix . 'objects'),
-            'so.object_id = s.service_object_id',
+            'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
-        )->where(
-            'so.is_active = ?',
-            1
-        )
-        ->where(
-            'so.objecttype_id = ?',
-            2
         );
         $this->select->group(array('hh.statehistory_id', 'ho.name1'));
     }

From 4c3592a82e01403270fea726b38cea4095b1509f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:11:09 +0200
Subject: [PATCH 2226/2920] HoststatusQuery: Improve JOIN performance

refs #9009
---
 .../Backend/Ido/Query/HoststatusQuery.php     | 39 +++----------------
 1 file changed, 6 insertions(+), 33 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index 72f336075..fd2cd77e6 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -194,18 +194,12 @@ SQL;
     protected function joinBaseTables()
     {
         $this->select->from(
-            array('ho' => $this->prefix . 'objects'),
+            array('h' => $this->prefix . 'hosts'),
             array()
         )->join(
-            array('h' => $this->prefix . 'hosts'),
-            'h.host_object_id = ho.object_id',
+            array('ho' => $this->prefix . 'objects'),
+            'ho.object_id = h.host_object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
             array()
-        )->where(
-            'ho.is_active = ?',
-            1
-        )->where(
-            'ho.objecttype_id = ?',
-            1
         );
         $this->joinedVirtualTables['hosts'] = true;
     }
@@ -225,15 +219,8 @@ SQL;
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id',
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
-        )->where(
-            'hgo.is_active = ?',
-            1
-        )
-        ->where(
-            'hgo.objecttype_id = ?',
-            3
         );
         $this->group('ho.name1');
     }
@@ -314,15 +301,8 @@ SQL;
             array()
         )->join(
             array('sgo' => $this->prefix . 'objects'),
-            'sgo.object_id = sg.servicegroup_object_id',
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
-        )->where(
-            'sgo.is_active = ?',
-            1
-        )
-        ->where(
-            'sgo.objecttype_id = ?',
-            4
         );
         $this->group('ho.name1');
     }
@@ -339,15 +319,8 @@ SQL;
             array()
         )->join(
             array('so' => $this->prefix . 'objects'),
-            'so.object_id = s.service_object_id',
+            'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
-        )->where(
-            'so.is_active = ?',
-            1
-        )
-        ->where(
-            'so.objecttype_id = ?',
-            2
         );
         $this->group('ho.name1');
     }

From a6d1115d0f17a6ba626eda23d3b6d2e891052911 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:11:18 +0200
Subject: [PATCH 2227/2920] NotificationhistoryQuery: Improve JOIN performance

refs #9009
---
 .../Backend/Ido/Query/NotificationhistoryQuery.php       | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
index 8bbdc0751..1195161d3 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
@@ -26,15 +26,6 @@ class NotificationhistoryQuery extends IdoQuery
         )
     );
 
-    public function whereToSql($col, $sign, $expression)
-    {
-        if ($col === 'UNIX_TIMESTAMP(n.start_time)') {
-            return 'n.start_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
-        } else {
-            return parent::whereToSql($col, $sign, $expression);
-        }
-    }
-
     protected function joinBaseTables()
     {
         switch ($this->ds->getDbType()) {

From 104c8e7a2b03b09fe8f9cfea10aac7c253772718 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:11:29 +0200
Subject: [PATCH 2228/2920] ServicecommenthistoryQuery: Improve JOIN
 performance

refs #9009
---
 .../Ido/Query/ServicecommenthistoryQuery.php  | 26 +++----------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php
index b0aee8d4b..5500d0570 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php
@@ -74,14 +74,8 @@ class ServicecommenthistoryQuery extends IdoQuery
             array()
         )->join(
             array('so' => $this->prefix . 'objects'),
-            'so.object_id = sch.object_id',
+            'so.object_id = sch.object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
-        )->where(
-            'so.is_active = ?',
-            1
-        )->where(
-            'so.objecttype_id = ?',
-            2
         );
         $this->joinedVirtualTables['commenthistory'] = true;
         $this->joinedVirtualTables['history'] = true;
@@ -103,15 +97,8 @@ class ServicecommenthistoryQuery extends IdoQuery
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id',
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
-        )->where(
-            'hgo.is_active = ?',
-            1
-        )
-        ->where(
-            'hgo.objecttype_id = ?',
-            3
         );
         $this->select->group(array('sch.commenthistory_id', 'so.name1', 'so.name2'));
     }
@@ -144,15 +131,8 @@ class ServicecommenthistoryQuery extends IdoQuery
             array()
         )->join(
             array('sgo' => $this->prefix . 'objects'),
-            'sgo.object_id = sg.servicegroup_object_id',
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
-        )->where(
-            'sgo.is_active = ?',
-            1
-        )
-        ->where(
-            'sgo.objecttype_id = ?',
-            4
         );
         $this->select->group(array('sch.commenthistory_id', 'so.name1', 'so.name2'));
     }

From bf7e6b359139a1dd6bb9928983998d002018c7d3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:11:38 +0200
Subject: [PATCH 2229/2920] ServicecommentQuery: Improve JOIN performance

refs #9009
---
 .../Backend/Ido/Query/ServicecommentQuery.php | 26 +++----------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
index 005ef0184..e23316377 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
@@ -69,14 +69,8 @@ class ServicecommentQuery extends IdoQuery
             array()
         )->join(
             array('so' => $this->prefix . 'objects'),
-            'so.object_id = c.object_id',
+            'so.object_id = c.object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
-        )->where(
-            'so.is_active = ?',
-            1
-        )->where(
-            'so.objecttype_id = 2',
-            1
         );
         $this->joinedVirtualTables['comments'] = true;
     }
@@ -96,15 +90,8 @@ class ServicecommentQuery extends IdoQuery
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id',
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
-        )->where(
-            'hgo.is_active = ?',
-            1
-        )
-        ->where(
-            'hgo.objecttype_id = ?',
-            3
         );
         $this->group(array('c.comment_id', 'so.name2', 'so.name1'));
     }
@@ -150,15 +137,8 @@ class ServicecommentQuery extends IdoQuery
             array()
         )->join(
             array('sgo' => $this->prefix . 'objects'),
-            'sgo.object_id = sg.servicegroup_object_id',
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
-        )->where(
-            'sgo.is_active = ?',
-            1
-        )
-        ->where(
-            'sgo.objecttype_id = ?',
-            4
         );
         $this->group(array('c.comment_id', 'so.name2', 'so.name1'));
     }

From 39f692e24078755ac04744d4ef57d12e850862b8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:11:45 +0200
Subject: [PATCH 2230/2920] ServicedowntimeQuery: Improve JOIN performance

refs #9009
---
 .../Ido/Query/ServicedowntimeQuery.php        | 26 +++----------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
index 6d528ba73..2707101ae 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
@@ -75,14 +75,8 @@ class ServicedowntimeQuery extends IdoQuery
             array()
         )->join(
             array('so' => $this->prefix . 'objects'),
-            'sd.object_id = so.object_id',
+            'sd.object_id = so.object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
-        )->where(
-            'so.is_active = ?',
-            1
-        )->where(
-            'so.objecttype_id = 2',
-            1
         );
         $this->joinedVirtualTables['downtimes'] = true;
     }
@@ -102,15 +96,8 @@ class ServicedowntimeQuery extends IdoQuery
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id',
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
-        )->where(
-            'hgo.is_active = ?',
-            1
-        )
-        ->where(
-            'hgo.objecttype_id = ?',
-            3
         );
         $this->group(array('sd.scheduleddowntime_id', 'so.name2', 'so.name1'));
     }
@@ -156,15 +143,8 @@ class ServicedowntimeQuery extends IdoQuery
             array()
         )->join(
             array('sgo' => $this->prefix . 'objects'),
-            'sgo.object_id = sg.servicegroup_object_id',
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
-        )->where(
-            'sgo.is_active = ?',
-            1
-        )
-        ->where(
-            'sgo.objecttype_id = ?',
-            4
         );
         $this->group(array('sd.scheduleddowntime_id', 'so.name2', 'so.name1'));
     }

From c0552b092af0318f3dd99e6e1c674a6bc22b5474 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:11:54 +0200
Subject: [PATCH 2231/2920] ServicedowntimestarthistoryQuery: Improve JOIN
 performance

refs #9009
---
 .../ServicedowntimestarthistoryQuery.php      | 26 +++----------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
index 7b1f1989a..b60d13d5d 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
@@ -76,14 +76,8 @@ class ServicedowntimestarthistoryQuery extends IdoQuery
             array()
         )->join(
             array('so' => $this->prefix . 'objects'),
-            'so.object_id = sdh.object_id',
+            'so.object_id = sdh.object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
-        )->where(
-            'so.is_active = ?',
-            1
-        )->where(
-            'so.objecttype_id = ?',
-            2
         );
 
         if (@func_get_arg(0) === false) {
@@ -112,15 +106,8 @@ class ServicedowntimestarthistoryQuery extends IdoQuery
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id',
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
-        )->where(
-            'hgo.is_active = ?',
-            1
-        )
-        ->where(
-            'hgo.objecttype_id = ?',
-            3
         );
         $this->select->group(array('sdh.downtimehistory_id', 'so.name1', 'so.name2'));
     }
@@ -153,15 +140,8 @@ class ServicedowntimestarthistoryQuery extends IdoQuery
             array()
         )->join(
             array('sgo' => $this->prefix . 'objects'),
-            'sgo.object_id = sg.servicegroup_object_id',
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
-        )->where(
-            'sgo.is_active = ?',
-            1
-        )
-        ->where(
-            'sgo.objecttype_id = ?',
-            4
         );
         $this->select->group(array('sdh.downtimehistory_id', 'so.name1', 'so.name2'));
     }

From 8bf269c2b30ad065478faef218587d183a48964a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:12:00 +0200
Subject: [PATCH 2232/2920] ServicegroupQuery: Improve JOIN performance

refs #9009
---
 .../Backend/Ido/Query/ServicegroupQuery.php    | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
index 731a9994c..87cc12618 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
@@ -49,15 +49,8 @@ class ServicegroupQuery extends IdoQuery
             array()
         )->join(
             array('sgo' => $this->prefix . 'objects'),
-            'sg.servicegroup_object_id = sgo.object_id',
+            'sg.servicegroup_object_id = sgo.object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
-        )->where(
-            'sgo.is_active = ?',
-            1
-        )
-        ->where(
-            'sgo.objecttype_id = ?',
-            4
         );
         $this->joinedVirtualTables = array('servicegroups' => true);
     }
@@ -78,15 +71,8 @@ class ServicegroupQuery extends IdoQuery
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id',
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
-        )->where(
-            'hgo.is_active = ?',
-            1
-        )
-        ->where(
-            'hgo.objecttype_id = ?',
-            3
         );
     }
 

From 7d9b09fdc810ce6beda9f56a1e4cd901b8bea89d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:12:08 +0200
Subject: [PATCH 2233/2920] ServicenotificationQuery: Improve JOIN performance

refs #9009
---
 .../Ido/Query/ServicenotificationQuery.php    | 26 +++----------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
index 9f4bc51b4..a37d06707 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
@@ -113,14 +113,8 @@ class ServicenotificationQuery extends IdoQuery
             array()
         )->join(
             array('so' => $this->prefix . 'objects'),
-            'so.object_id = sn.object_id',
+            'so.object_id = sn.object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
-        )->where(
-            'so.is_active = ?',
-            1
-        )->where(
-            'so.objecttype_id = ?',
-            2
         );
         $this->joinedVirtualTables['notifications'] = true;
     }
@@ -180,15 +174,8 @@ class ServicenotificationQuery extends IdoQuery
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id',
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
-        )->where(
-            'hgo.is_active = ?',
-            1
-        )
-        ->where(
-            'hgo.objecttype_id = ?',
-            3
         );
 
         if (! $this->hasJoinedVirtualTable('contactnotifications') && !$this->hasJoinedVirtualTable('history')) {
@@ -224,15 +211,8 @@ class ServicenotificationQuery extends IdoQuery
             array()
         )->join(
             array('sgo' => $this->prefix . 'objects'),
-            'sgo.object_id = sg.servicegroup_object_id',
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
-        )->where(
-            'sgo.is_active = ?',
-            1
-        )
-        ->where(
-            'sgo.objecttype_id = ?',
-            4
         );
 
         if (! $this->hasJoinedVirtualTable('contactnotifications') && !$this->hasJoinedVirtualTable('history')) {

From 10a65f1e27e3dbce691032a489db96d8e5bbba83 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:12:16 +0200
Subject: [PATCH 2234/2920] ServicestatehistoryQuery: Improve JOIN performance

refs #9009
---
 .../Ido/Query/ServicestatehistoryQuery.php    | 26 +++----------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php
index b00ac1653..81e03646d 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php
@@ -90,14 +90,8 @@ class ServicestatehistoryQuery extends IdoQuery
             array()
         )->join(
             array('so' => $this->prefix . 'objects'),
-            'so.object_id = sh.object_id',
+            'so.object_id = sh.object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
-        )->where(
-            'so.is_active = ?',
-            1
-        )->where(
-            'so.objecttype_id = ?',
-            2
         );
         $this->joinedVirtualTables['statehistory'] = true;
         $this->joinedVirtualTables['history'] = true;
@@ -119,15 +113,8 @@ class ServicestatehistoryQuery extends IdoQuery
             array()
         )->join(
             array('hgo' => $this->prefix . 'objects'),
-            'hgo.object_id = hg.hostgroup_object_id',
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
-        )->where(
-            'hgo.is_active = ?',
-            1
-        )
-        ->where(
-            'hgo.objecttype_id = ?',
-            3
         );
         $this->select->group(array('sh.statehistory_id', 'so.name1', 'so.name2'));
     }
@@ -160,15 +147,8 @@ class ServicestatehistoryQuery extends IdoQuery
             array()
         )->join(
             array('sgo' => $this->prefix . 'objects'),
-            'sgo.object_id = sg.servicegroup_object_id',
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
-        )->where(
-            'sgo.is_active = ?',
-            1
-        )
-        ->where(
-            'sgo.objecttype_id = ?',
-            4
         );
         $this->select->group(array('sh.statehistory_id', 'so.name1', 'so.name2'));
     }

From d4f659c5444ed3f92defad7ab98fb60401fe757a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 08:13:28 +0200
Subject: [PATCH 2235/2920] Revert "NotificationhistoryQuery: Improve JOIN
 performance"

This reverts commit a6d1115d0f17a6ba626eda23d3b6d2e891052911.
Accidentally commited..
---
 .../Backend/Ido/Query/NotificationhistoryQuery.php       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
index 1195161d3..8bbdc0751 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
@@ -26,6 +26,15 @@ class NotificationhistoryQuery extends IdoQuery
         )
     );
 
+    public function whereToSql($col, $sign, $expression)
+    {
+        if ($col === 'UNIX_TIMESTAMP(n.start_time)') {
+            return 'n.start_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
+        } else {
+            return parent::whereToSql($col, $sign, $expression);
+        }
+    }
+
     protected function joinBaseTables()
     {
         switch ($this->ds->getDbType()) {

From a70524417e9a4912fe41ed68d12a6888a5e149f7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 09:39:37 +0200
Subject: [PATCH 2236/2920] HostcommenthistoryQuery: Fix invalid joins

refs #9009
---
 .../Ido/Query/HostcommenthistoryQuery.php        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php
index 60f91cb15..5202d6f79 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php
@@ -85,15 +85,15 @@ class HostcommenthistoryQuery extends IdoQuery
      */
     protected function joinHostgroups()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = ho.object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hg' => $this->prefix . 'hostgroups'),
             'hg.hostgroup_id = hgm.hostgroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hgo' => $this->prefix . 'objects'),
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
@@ -119,15 +119,15 @@ class HostcommenthistoryQuery extends IdoQuery
     protected function joinServicegroups()
     {
         $this->requireVirtualTable('services');
-        $this->select->join(
+        $this->select->joinLeft(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.service_object_id = s.service_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sg' => $this->prefix . 'servicegroups'),
             'sg.' . $this->servicegroup_id . ' = sgm.servicegroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sgo' => $this->prefix . 'objects'),
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
@@ -139,11 +139,11 @@ class HostcommenthistoryQuery extends IdoQuery
      */
     protected function joinServices()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('s' => $this->prefix . 'services'),
             's.host_object_id = ho.object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('so' => $this->prefix . 'objects'),
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()

From 9a020f0218ff2d5b94b147fbdae7871c7a4a3d02 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 09:39:47 +0200
Subject: [PATCH 2237/2920] HostcommentQuery: Fix invalid joins

refs #9009
---
 .../Backend/Ido/Query/HostcommentQuery.php       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
index 84e9072b9..d73d99ece 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
@@ -75,15 +75,15 @@ class HostcommentQuery extends IdoQuery
      */
     protected function joinHostgroups()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = ho.object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hg' => $this->prefix . 'hostgroups'),
             'hg.hostgroup_id = hgm.hostgroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hgo' => $this->prefix . 'objects'),
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
@@ -121,15 +121,15 @@ class HostcommentQuery extends IdoQuery
     protected function joinServicegroups()
     {
         $this->requireVirtualTable('services');
-        $this->select->join(
+        $this->select->joinLeft(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.service_object_id = s.service_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sg' => $this->prefix . 'servicegroups'),
             'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
             array()
-        )->join(
+        )->joinLeft(
             array('sgo' => $this->prefix . 'objects'),
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
@@ -141,11 +141,11 @@ class HostcommentQuery extends IdoQuery
      */
     protected function joinServices()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('s' => $this->prefix . 'services'),
             's.host_object_id = h.host_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('so' => $this->prefix . 'objects'),
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()

From ba9d4538f936d6547dfa31956d022c18e3e5ba37 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 09:39:56 +0200
Subject: [PATCH 2238/2920] HostdowntimeQuery: Fix invalid joins

refs #9009
---
 .../Backend/Ido/Query/HostdowntimeQuery.php      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
index 5b7bf667c..9132d9602 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
@@ -81,15 +81,15 @@ class HostdowntimeQuery extends IdoQuery
      */
     protected function joinHostgroups()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = ho.object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hg' => $this->prefix . 'hostgroups'),
             'hg.hostgroup_id = hgm.hostgroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hgo' => $this->prefix . 'objects'),
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
@@ -127,15 +127,15 @@ class HostdowntimeQuery extends IdoQuery
     protected function joinServicegroups()
     {
         $this->requireVirtualTable('services');
-        $this->select->join(
+        $this->select->joinLeft(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.service_object_id = s.service_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sg' => $this->prefix . 'servicegroups'),
             'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
             array()
-        )->join(
+        )->joinLeft(
             array('sgo' => $this->prefix . 'objects'),
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
@@ -147,11 +147,11 @@ class HostdowntimeQuery extends IdoQuery
      */
     protected function joinServices()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('s' => $this->prefix . 'services'),
             's.host_object_id = h.host_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('so' => $this->prefix . 'objects'),
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()

From fee6c2f330d7c1a64d78272c2fd5727329e3f673 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 09:40:10 +0200
Subject: [PATCH 2239/2920] HostdowntimestarthistoryQuery: Fix invalid joins

refs #9009
---
 .../Ido/Query/HostdowntimestarthistoryQuery.php  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
index 94b65c5fb..a3d87023b 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
@@ -94,15 +94,15 @@ class HostdowntimestarthistoryQuery extends IdoQuery
      */
     protected function joinHostgroups()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = ho.object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hg' => $this->prefix . 'hostgroups'),
             'hg.hostgroup_id = hgm.hostgroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hgo' => $this->prefix . 'objects'),
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
@@ -128,15 +128,15 @@ class HostdowntimestarthistoryQuery extends IdoQuery
     protected function joinServicegroups()
     {
         $this->requireVirtualTable('services');
-        $this->select->join(
+        $this->select->joinLeft(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.service_object_id = s.service_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sg' => $this->prefix . 'servicegroups'),
             'sg.' . $this->servicegroup_id . ' = sgm.servicegroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sgo' => $this->prefix . 'objects'),
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
@@ -148,11 +148,11 @@ class HostdowntimestarthistoryQuery extends IdoQuery
      */
     protected function joinServices()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('s' => $this->prefix . 'services'),
             's.host_object_id = ho.object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('so' => $this->prefix . 'objects'),
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()

From 6745b0b67756fddb3e3aef928dfa89dbe26e8bcb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 09:40:20 +0200
Subject: [PATCH 2240/2920] HostgroupQuery: Fix invalid joins

refs #9009
---
 .../Backend/Ido/Query/HostgroupQuery.php         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
index 45f6a8ae1..6351a20ef 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
@@ -64,11 +64,11 @@ class HostgroupQuery extends IdoQuery
      */
     protected function joinHostobjects()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.hostgroup_id = hg.hostgroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('ho' => $this->prefix . 'objects'),
             'hgm.host_object_id = ho.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
             array()
@@ -82,7 +82,7 @@ class HostgroupQuery extends IdoQuery
     protected function joinHosts()
     {
         $this->requireVirtualTable('hostobjects');
-        $this->select->join(
+        $this->select->joinLeft(
             array('h' => $this->prefix . 'hosts'),
             'h.host_object_id = ho.object_id',
             array()
@@ -95,15 +95,15 @@ class HostgroupQuery extends IdoQuery
     protected function joinServicegroups()
     {
         $this->requireVirtualTable('services');
-        $this->select->join(
+        $this->select->joinLeft(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.service_object_id = s.service_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sg' => $this->prefix . 'servicegroups'),
             'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
             array()
-        )->join(
+        )->joinLeft(
             array('sgo' => $this->prefix . 'objects'),
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
@@ -116,11 +116,11 @@ class HostgroupQuery extends IdoQuery
     protected function joinServices()
     {
         $this->requireVirtualTable('hosts');
-        $this->select->join(
+        $this->select->joinLeft(
             array('s' => $this->prefix . 'services'),
             's.host_object_id = h.host_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('so' => $this->prefix . 'objects'),
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()

From 379e80b21fc1a80dbc9404e4f4fd21f9b683100b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 09:40:30 +0200
Subject: [PATCH 2241/2920] HostnotificationQuery: Fix invalid joins

refs #9009
---
 .../Backend/Ido/Query/HostnotificationQuery.php  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
index d4dea4ae1..678c4b2fa 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
@@ -162,15 +162,15 @@ class HostnotificationQuery extends IdoQuery
      */
     protected function joinHostgroups()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = ho.object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hg' => $this->prefix . 'hostgroups'),
             'hg.hostgroup_id = hgm.hostgroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hgo' => $this->prefix . 'objects'),
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
@@ -199,15 +199,15 @@ class HostnotificationQuery extends IdoQuery
     protected function joinServicegroups()
     {
         $this->requireVirtualTable('services');
-        $this->select->join(
+        $this->select->joinLeft(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.service_object_id = s.service_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sg' => $this->prefix . 'servicegroups'),
             'sg.' . $this->servicegroup_id . ' = sgm.servicegroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sgo' => $this->prefix . 'objects'),
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
@@ -219,11 +219,11 @@ class HostnotificationQuery extends IdoQuery
      */
     protected function joinServices()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('s' => $this->prefix . 'services'),
             's.host_object_id = ho.object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('so' => $this->prefix . 'objects'),
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()

From 627e681e7486973a0f7af90b2b72dee71a19b142 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 09:40:40 +0200
Subject: [PATCH 2242/2920] HoststatehistoryQuery: Fix invalid joins

refs #9009
---
 .../Backend/Ido/Query/HoststatehistoryQuery.php  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php
index c9176d67d..227204ed5 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php
@@ -101,15 +101,15 @@ class HoststatehistoryQuery extends IdoQuery
      */
     protected function joinHostgroups()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = ho.object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hg' => $this->prefix . 'hostgroups'),
             'hg.hostgroup_id = hgm.hostgroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hgo' => $this->prefix . 'objects'),
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
@@ -135,15 +135,15 @@ class HoststatehistoryQuery extends IdoQuery
     protected function joinServicegroups()
     {
         $this->requireVirtualTable('services');
-        $this->select->join(
+        $this->select->joinLeft(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.service_object_id = s.service_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sg' => $this->prefix . 'servicegroups'),
             'sg.' . $this->servicegroup_id . ' = sgm.servicegroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sgo' => $this->prefix . 'objects'),
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
@@ -155,11 +155,11 @@ class HoststatehistoryQuery extends IdoQuery
      */
     protected function joinServices()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('s' => $this->prefix . 'services'),
             's.host_object_id = ho.object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('so' => $this->prefix . 'objects'),
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()

From 72e5c07da1a1fd4a7ce258e347b3808006ad6591 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 09:40:49 +0200
Subject: [PATCH 2243/2920] HoststatusQuery: Fix invalid joins

refs #9009
---
 .../Backend/Ido/Query/HoststatusQuery.php        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index fd2cd77e6..5165897c7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -209,15 +209,15 @@ SQL;
      */
     protected function joinHostgroups()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = ho.object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hg' => $this->prefix . 'hostgroups'),
             'hg.hostgroup_id = hgm.hostgroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hgo' => $this->prefix . 'objects'),
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
@@ -291,15 +291,15 @@ SQL;
     protected function joinServicegroups()
     {
         $this->requireVirtualTable('services');
-        $this->select->join(
+        $this->select->joinLeft(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.service_object_id = s.service_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sg' => $this->prefix . 'servicegroups'),
             'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
             array()
-        )->join(
+        )->joinLeft(
             array('sgo' => $this->prefix . 'objects'),
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
@@ -313,11 +313,11 @@ SQL;
     protected function joinServices()
     {
         $this->requireVirtualTable('hosts');
-        $this->select->join(
+        $this->select->joinLeft(
             array('s' => $this->prefix . 'services'),
             's.host_object_id = h.host_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('so' => $this->prefix . 'objects'),
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()

From 13cb52b3cbcaff3ba47e98e015e9a10a5282bd0c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 09:40:59 +0200
Subject: [PATCH 2244/2920] ServicecommenthistoryQuery: Fix invalid joins

refs #9009
---
 .../Backend/Ido/Query/ServicecommenthistoryQuery.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php
index 5500d0570..fbb5b9a13 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php
@@ -87,15 +87,15 @@ class ServicecommenthistoryQuery extends IdoQuery
     protected function joinHostgroups()
     {
         $this->requireVirtualTable('services');
-        $this->select->join(
+        $this->select->joinLeft(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = s.host_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hg' => $this->prefix . 'hostgroups'),
             'hg.hostgroup_id = hgm.hostgroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hgo' => $this->prefix . 'objects'),
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
@@ -121,15 +121,15 @@ class ServicecommenthistoryQuery extends IdoQuery
      */
     protected function joinServicegroups()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.service_object_id = so.object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sg' => $this->prefix . 'servicegroups'),
             'sg.' . $this->servicegroup_id . ' = sgm.servicegroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sgo' => $this->prefix . 'objects'),
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()

From 1983c499b0547a98a19b0b00ff9aa8b85f29e6db Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 09:41:11 +0200
Subject: [PATCH 2245/2920] ServicecommentQuery: Fix invalid joins

refs #9009
---
 .../Backend/Ido/Query/ServicecommentQuery.php        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
index e23316377..514e998fb 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
@@ -80,15 +80,15 @@ class ServicecommentQuery extends IdoQuery
     protected function joinHostgroups()
     {
         $this->requireVirtualTable('services');
-        $this->select->join(
+        $this->select->joinLeft(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = s.host_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hg' => $this->prefix . 'hostgroups'),
             'hg.hostgroup_id = hgm.hostgroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hgo' => $this->prefix . 'objects'),
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
@@ -127,15 +127,15 @@ class ServicecommentQuery extends IdoQuery
      */
     protected function joinServicegroups()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.service_object_id = so.object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sg' => $this->prefix . 'servicegroups'),
             'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
             array()
-        )->join(
+        )->joinLeft(
             array('sgo' => $this->prefix . 'objects'),
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()

From 0cc693810becd200172e2c06df139786e10b04d5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 09:41:26 +0200
Subject: [PATCH 2246/2920] ServicedowntimeQuery: Fix invalid joins

refs #9009
---
 .../Backend/Ido/Query/ServicedowntimeQuery.php       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
index 2707101ae..970d48728 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
@@ -86,15 +86,15 @@ class ServicedowntimeQuery extends IdoQuery
     protected function joinHostgroups()
     {
         $this->requireVirtualTable('services');
-        $this->select->join(
+        $this->select->joinLeft(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = s.host_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hg' => $this->prefix . 'hostgroups'),
             'hg.hostgroup_id = hgm.hostgroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hgo' => $this->prefix . 'objects'),
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
@@ -133,15 +133,15 @@ class ServicedowntimeQuery extends IdoQuery
      */
     protected function joinServicegroups()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.service_object_id = so.object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sg' => $this->prefix . 'servicegroups'),
             'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
             array()
-        )->join(
+        )->joinLeft(
             array('sgo' => $this->prefix . 'objects'),
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()

From 755da0c21090df1437245a7d05f0703151b6796b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 09:41:36 +0200
Subject: [PATCH 2247/2920] ServicedowntimestarthistoryQuery: Fix invalid joins

refs #9009
---
 .../Ido/Query/ServicedowntimestarthistoryQuery.php   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
index b60d13d5d..80c08f735 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
@@ -96,15 +96,15 @@ class ServicedowntimestarthistoryQuery extends IdoQuery
     protected function joinHostgroups()
     {
         $this->requireVirtualTable('services');
-        $this->select->join(
+        $this->select->joinLeft(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = s.host_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hg' => $this->prefix . 'hostgroups'),
             'hg.hostgroup_id = hgm.hostgroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hgo' => $this->prefix . 'objects'),
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
@@ -130,15 +130,15 @@ class ServicedowntimestarthistoryQuery extends IdoQuery
      */
     protected function joinServicegroups()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.service_object_id = so.object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sg' => $this->prefix . 'servicegroups'),
             'sg.' . $this->servicegroup_id . ' = sgm.servicegroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sgo' => $this->prefix . 'objects'),
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()

From 1dd21c2969462a913904e58781cc924fc1222074 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 09:41:43 +0200
Subject: [PATCH 2248/2920] ServicegroupQuery: Fix invalid joins

refs #9009
---
 .../Backend/Ido/Query/ServicegroupQuery.php        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
index 87cc12618..a0c9d9849 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
@@ -61,15 +61,15 @@ class ServicegroupQuery extends IdoQuery
     protected function joinHostgroups()
     {
         $this->requireVirtualTable('services');
-        $this->select->join(
+        $this->select->joinLeft(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = s.host_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hg' => $this->prefix . 'hostgroups'),
             'hg.hostgroup_id = hgm.hostgroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hgo' => $this->prefix . 'objects'),
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
@@ -82,7 +82,7 @@ class ServicegroupQuery extends IdoQuery
     protected function joinHosts()
     {
         $this->requireVirtualTable('services');
-        $this->select->join(
+        $this->select->joinLeft(
             array('h' => $this->prefix . 'hosts'),
             'h.host_object_id = s.host_object_id',
             array()
@@ -94,11 +94,11 @@ class ServicegroupQuery extends IdoQuery
      */
     protected function joinServiceobjects()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.' . $this->servicegroup_id . ' = sg.' . $this->servicegroup_id,
             array()
-        )->join(
+        )->joinLeft(
             array('so' => $this->prefix . 'objects'),
             'sgm.service_object_id = so.object_id',
             array()
@@ -112,7 +112,7 @@ class ServicegroupQuery extends IdoQuery
     protected function joinServices()
     {
         $this->requireVirtualTable('serviceobjects');
-        $this->select->join(
+        $this->select->joinLeft(
             array('s' => $this->prefix . 'services'),
             's.service_object_id = so.object_id',
             array()

From 7a5156b0ada3b00dd6fe5d1287b0e46d9360a332 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 09:41:52 +0200
Subject: [PATCH 2249/2920] ServicenotificationQuery: Fix invalid joins

refs #9009
---
 .../Backend/Ido/Query/ServicenotificationQuery.php   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
index a37d06707..9a99b6152 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
@@ -164,15 +164,15 @@ class ServicenotificationQuery extends IdoQuery
     protected function joinHostgroups()
     {
         $this->requireVirtualTable('services');
-        $this->select->join(
+        $this->select->joinLeft(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = s.host_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hg' => $this->prefix . 'hostgroups'),
             'hg.hostgroup_id = hgm.hostgroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hgo' => $this->prefix . 'objects'),
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
@@ -201,15 +201,15 @@ class ServicenotificationQuery extends IdoQuery
      */
     protected function joinServicegroups()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.service_object_id = so.object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sg' => $this->prefix . 'servicegroups'),
             'sg.' . $this->servicegroup_id . ' = sgm.servicegroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sgo' => $this->prefix . 'objects'),
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()

From c11bd6d7ee644531024b651008aca2456f8e080c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 09:42:04 +0200
Subject: [PATCH 2250/2920] ServicestatehistoryQuery: Fix invalid joins

refs #9009
---
 .../Backend/Ido/Query/ServicestatehistoryQuery.php   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php
index 81e03646d..1a467fc12 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php
@@ -103,15 +103,15 @@ class ServicestatehistoryQuery extends IdoQuery
     protected function joinHostgroups()
     {
         $this->requireVirtualTable('services');
-        $this->select->join(
+        $this->select->joinLeft(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = s.host_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hg' => $this->prefix . 'hostgroups'),
             'hg.hostgroup_id = hgm.hostgroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hgo' => $this->prefix . 'objects'),
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
@@ -137,15 +137,15 @@ class ServicestatehistoryQuery extends IdoQuery
      */
     protected function joinServicegroups()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.service_object_id = so.object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sg' => $this->prefix . 'servicegroups'),
             'sg.' . $this->servicegroup_id . ' = sgm.servicegroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sgo' => $this->prefix . 'objects'),
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()

From 73e9db3704c217e4db69f078391e57ea6b6b46c3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 09:42:13 +0200
Subject: [PATCH 2251/2920] ServicestatusQuery: Fix invalid joins

refs #9009
---
 .../Backend/Ido/Query/ServicestatusQuery.php         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
index 1beae3917..723043b71 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -223,15 +223,15 @@ class ServicestatusQuery extends IdoQuery
      */
     protected function joinHostgroups()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = s.host_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hg' => $this->prefix . 'hostgroups'),
             'hg.hostgroup_id = hgm.hostgroup_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hgo' => $this->prefix . 'objects'),
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
@@ -268,15 +268,15 @@ class ServicestatusQuery extends IdoQuery
      */
     protected function joinServicegroups()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.service_object_id = so.object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sg' => $this->prefix . 'servicegroups'),
             'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
             array()
-        )->join(
+        )->joinLeft(
             array('sgo' => $this->prefix . 'objects'),
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()

From 05e0568ef15d0bb492bdbfd152280fc281804dbd Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 09:42:24 +0200
Subject: [PATCH 2252/2920] StatusQuery: Fix invalid joins

refs #9009
---
 .../Backend/Ido/Query/StatusQuery.php         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index 7181e8b89..5a3bba9e5 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -434,7 +434,7 @@ class StatusQuery extends IdoQuery
             array('so' => $this->prefix . 'objects'),
             'so.' . $this->object_id . ' = s.service_object_id AND so.is_active = 1',
             array()
-        )->joinLeft(
+        )->join(
             array('ss' => $this->prefix . 'servicestatus'),
             'so.' . $this->object_id . ' = ss.service_object_id',
             array()
@@ -452,15 +452,15 @@ class StatusQuery extends IdoQuery
 
     protected function joinHostHostgroups()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = h.host_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hg' => $this->prefix . 'hostgroups'),
             'hgm.hostgroup_id = hg.' . $this->hostgroup_id,
             array()
-        )->join(
+        )->joinLeft(
             array('hgo' => $this->prefix . 'objects'),
             'hgo.' . $this->object_id . ' = hg.hostgroup_object_id AND hgo.is_active = 1',
             array()
@@ -477,15 +477,15 @@ class StatusQuery extends IdoQuery
 
     protected function joinServiceHostgroups()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('hgm' => $this->prefix . 'hostgroup_members'),
             'hgm.host_object_id = s.host_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('hg' => $this->prefix . 'hostgroups'),
             'hgm.hostgroup_id = hg.' . $this->hostgroup_id,
             array()
-        )->join(
+        )->joinLeft(
             array('hgo' => $this->prefix . 'objects'),
             'hgo.' . $this->object_id . ' = hg.hostgroup_object_id'
             . ' AND hgo.is_active = 1',
@@ -502,15 +502,15 @@ class StatusQuery extends IdoQuery
     protected function joinServicegroups()
     {
         $this->requireVirtualTable('services');
-        $this->select->join(
+        $this->select->joinLeft(
             array('sgm' => $this->prefix . 'servicegroup_members'),
             'sgm.service_object_id = s.service_object_id',
             array()
-        )->join(
+        )->joinLeft(
             array('sg' => $this->prefix . 'servicegroups'),
             'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
             array()
-        )->join(
+        )->joinLeft(
             array('sgo' => $this->prefix . 'objects'),
             'sgo.' . $this->object_id. ' = sg.servicegroup_object_id'
           . ' AND sgo.is_active = 1',

From 3cf7e93a105cf20aa992eda537ae3bc4dc231ca4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 11:39:15 +0200
Subject: [PATCH 2253/2920] Remove file Reftest.php

Looks like an accident.

refs #9009
---
 Reftest.php | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 Reftest.php

diff --git a/Reftest.php b/Reftest.php
deleted file mode 100644
index 511f3452d..000000000
--- a/Reftest.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-class Test
-{
-    protected $filters = array();
-
-    public function work()
-    {
-        foreach ($this->getFilters() as $key => &$value) {
-            $value = 1;
-        }
-    }
-
-    public function &getFilters()
-    {
-        return $this->filters;
-    }
-}
-
-$x = new Test();
-$b =& $x->getFilters();
-$b[1] = 0;
-var_dump($b, $x->getFilters());die;

From aa0b1d43ef5f4609f6a89e5002617ddc3b40a8d4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 11:43:58 +0200
Subject: [PATCH 2254/2920] Menu: Move about page into the system menu as
 sub-entry

---
 library/Icinga/Web/Menu.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 45dd2dd9c..a201b34fc 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -237,6 +237,10 @@ class Menu implements RecursiveIterator
                 'priority' => 700,
                 'renderer' => 'ProblemMenuItemRenderer'
             ));
+            $section->add(t('About'), array(
+                'url'       => 'about',
+                'priority'  => 701
+            ));
             if (Logger::writesToFile()) {
                 $section->add(t('Application Log'), array(
                     'url'      => 'list/applicationlog',
@@ -279,11 +283,6 @@ class Menu implements RecursiveIterator
                 'priority' => 990,
                 'renderer' => 'ForeignMenuItemRenderer'
             ));
-
-            $this->add(t('About'), array(
-                'url'       => 'about',
-                'priority'  => 1000
-            ));
         }
     }
 

From 7a1863850406ac4dc4dece75c6035fad390eb7fd Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 16 Jun 2015 11:48:40 +0200
Subject: [PATCH 2255/2920] Revert "Web/Menu: move "About" to config section"

Has been fixed in current master.
This reverts commit 56d67def0085676c0a5c16efe3af7436403ec7ef.
---
 library/Icinga/Web/Menu.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 5bf8f76d0..45dd2dd9c 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -264,10 +264,6 @@ class Menu implements RecursiveIterator
                 'permission'    => 'config/modules',
                 'priority'      => 890
             ));
-            $section->add(t('About'), array(
-                'url'       => 'about',
-                'priority'  => 895
-            ));
 
             $section = $this->add($auth->getUser()->getUsername(), array(
                 'icon'     => 'user',
@@ -283,6 +279,11 @@ class Menu implements RecursiveIterator
                 'priority' => 990,
                 'renderer' => 'ForeignMenuItemRenderer'
             ));
+
+            $this->add(t('About'), array(
+                'url'       => 'about',
+                'priority'  => 1000
+            ));
         }
     }
 

From 42a1d8e56daf3b5ee6d92befa6ef366d72cb66e9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 13:29:21 +0200
Subject: [PATCH 2256/2920] HostnotificationQuery: Ensure that notifications
 not sent to a contact are fetched

refs #9009
---
 .../Monitoring/Backend/Ido/Query/HostnotificationQuery.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
index 678c4b2fa..338680ef4 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
@@ -132,12 +132,12 @@ class HostnotificationQuery extends IdoQuery
      */
     protected function joinContactnotifications()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('cn' => $this->prefix . 'contactnotifications'),
             'cn.notification_id = hn.notification_id',
             array()
         );
-        $this->select->join(
+        $this->select->joinLeft(
             array('cno' => $this->prefix . 'objects'),
             'cno.object_id = cn.contact_object_id',
             array()

From bf70ec280268b231e2aec002ba73aebd53ac6eaa Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 13:29:31 +0200
Subject: [PATCH 2257/2920] ServicenotificationQuery: Ensure that notifications
 not sent to a contact are fetched

refs #9009
---
 .../Monitoring/Backend/Ido/Query/ServicenotificationQuery.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
index 9a99b6152..bf7e99259 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
@@ -133,12 +133,12 @@ class ServicenotificationQuery extends IdoQuery
      */
     protected function joinContactnotifications()
     {
-        $this->select->join(
+        $this->select->joinLeft(
             array('cn' => $this->prefix . 'contactnotifications'),
             'cn.notification_id = sn.notification_id',
             array()
         );
-        $this->select->join(
+        $this->select->joinLeft(
             array('cno' => $this->prefix . 'objects'),
             'cno.object_id = cn.contact_object_id',
             array()

From d5f7ee3c561dc82b292902b809de37997532d145 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 13:32:35 +0200
Subject: [PATCH 2258/2920] Behave nicely when showing notifications not sent
 out to any contact

I noticed that there is no output shown for the history views in case no
contact has been notified, but time is short atm...

refs #9009
refs #9430
---
 .../application/views/scripts/list/eventhistory.phtml         | 1 +
 .../application/views/scripts/list/notifications.phtml        | 4 ++++
 .../monitoring/application/views/scripts/show/history.phtml   | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 2aedcd59b..538702a64 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -31,6 +31,7 @@ if (count($history) === 0) {
         case 'notify':
           $icon = 'bell';
           $title = $this->translate('Notification');
+          $msg = $msg ?: $this->translate('This notification was not sent out to any contact.');
           break;
         case 'comment':
           $icon = 'comment';
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 3d1598a69..f94266210 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -52,6 +52,7 @@ if (count($notifications) === 0) {
                 <br>
                 <?php if (! $this->contact): ?>
                     <small>
+                    <?php if ($notification->notification_contact_name): ?>
                         <?= sprintf(
                             $this->translate('Sent to %s'),
                             $this->qlink(
@@ -60,6 +61,9 @@ if (count($notifications) === 0) {
                                 array('contact_name' => $notification->notification_contact_name)
                             )
                         ) ?>
+                    <?php else: ?>
+                        <?= $this->translate('This notification was not sent out to any contact.'); ?>
+                    <?php endif ?>
                     </small>
                 <?php endif ?>
             </td>
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index 0a0205e72..5c1a1d27c 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -57,11 +57,11 @@ function contactsLink($match, $view) {
           $title = $this->translate('Notification');
           $stateClass = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
 
-          $msg = preg_replace_callback(
+          $msg = $msg ? preg_replace_callback(
               '/^\[([^\]]+)\]/',
               function($match) use ($self) { return contactsLink($match, $self); },
               $msg
-          );
+          ) : $this->translate('This notification was not sent out to any contact.');
           break;
         case 'comment':
           $icon = 'comment';

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 2259/2920] 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 2260/2920] 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 2261/2920] 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 2262/2920] 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 2263/2920] 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 2264/2920] 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 2265/2920] 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 2266/2920] 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 2267/2920] 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 2268/2920] 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 2269/2920] 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 2270/2920] 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 d0a7c481c2bf136257ebb9dba184be0b0c8840e9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 17:16:59 +0200
Subject: [PATCH 2271/2920] MonitoredObjectController: Restrict the
 historyAction

refs #9009
---
 .../Monitoring/Web/Controller/MonitoredObjectController.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index e51609f4a..ac903207e 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -100,6 +100,7 @@ abstract class MonitoredObjectController extends Controller
     {
         $this->getTabs()->activate('history');
         $this->view->history = $this->object->fetchEventHistory()->eventhistory;
+        $this->applyRestriction('monitoring/filter/objects', $this->view->history);
 
         $this->setupLimitControl(50);
         $this->setupPaginationControl($this->view->history, 50);

From 670d6e93c76958a3fa83b951c559fe4f6cd5095a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 17:44:29 +0200
Subject: [PATCH 2272/2920] MonitoredObject: Ensure that the filter is applied
 to all queries

refs #9009
---
 .../monitoring/library/Monitoring/Object/Host.php  |  4 ++--
 .../library/Monitoring/Object/MonitoredObject.php  | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 4940ffdf1..3bb10d77e 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -151,8 +151,8 @@ class Host extends MonitoredObject
         $services = array();
         foreach ($this->backend->select()->from('servicestatus', array('service_description'))
                 ->where('host_name', $this->host)
-                ->getQuery()
-                ->fetchAll() as $service) {
+                ->applyFilter($this->getFilter())
+                ->getQuery() as $service) {
             $services[] = new Service($this->backend, $this->host, $service->service_description);
         }
         $this->services = $services;
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index 08b348988..ab7b6cdf9 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -155,7 +155,7 @@ abstract class MonitoredObject implements Filterable
     public function getFilter()
     {
         if ($this->filter === null) {
-            $this->filter = Filter::matchAny();
+            $this->filter = Filter::matchAll();
         }
         return $this->filter;
     }
@@ -261,7 +261,7 @@ abstract class MonitoredObject implements Filterable
         } else {
             $comments->where('host_name', $this->host_name);
         }
-        $this->comments = $comments->getQuery()->fetchAll();
+        $this->comments = $comments->applyFilter($this->getFilter())->getQuery()->fetchAll();
         return $this;
     }
 
@@ -297,7 +297,7 @@ abstract class MonitoredObject implements Filterable
             $downtimes
                 ->where('host_name', $this->host_name);
         }
-        $this->downtimes = $downtimes->getQuery()->fetchAll();
+        $this->downtimes = $downtimes->applyFilter($this->getFilter())->getQuery()->fetchAll();
         return $this;
     }
 
@@ -311,7 +311,7 @@ abstract class MonitoredObject implements Filterable
         $this->hostgroups = $this->backend->select()
             ->from('hostgroup', array('hostgroup_name', 'hostgroup_alias'))
             ->where('host_name', $this->host_name)
-            ->applyFilter($this->filter)
+            ->applyFilter($this->getFilter())
             ->fetchPairs();
         return $this;
     }
@@ -395,7 +395,7 @@ abstract class MonitoredObject implements Filterable
         } else {
             $contacts->where('host_name', $this->host_name);
         }
-        $this->contacts = $contacts->getQuery()->fetchAll();
+        $this->contacts = $contacts->applyFilter($this->getFilter())->getQuery()->fetchAll();
         return $this;
     }
 
@@ -438,7 +438,7 @@ abstract class MonitoredObject implements Filterable
         } else {
             $contactsGroups->where('host_name', $this->host_name);
         }
-        $this->contactgroups = $contactsGroups->getQuery()->fetchAll();
+        $this->contactgroups = $contactsGroups->applyFilter($this->getFilter())->getQuery()->fetchAll();
         return $this;
     }
 
@@ -464,7 +464,7 @@ abstract class MonitoredObject implements Filterable
         if ($this->type === self::TYPE_SERVICE) {
             $eventHistory->where('service_description', $this->service_description);
         }
-        $this->eventhistory = $eventHistory;
+        $this->eventhistory = $eventHistory->applyFilter($this->getFilter());
         return $this;
     }
 

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 2273/2920] 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 95cb6dea4bef28c2abce4d077e1111cd70dbade0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 18:13:04 +0200
Subject: [PATCH 2274/2920] Transfer changes from show/history.phtml to
 service/history.phtml

Was not recognised by git as host/history.phtml is the counterpart
for show/history.phtml in the tree.

refs #9009
---
 .../views/scripts/service/history.phtml       | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/service/history.phtml b/modules/monitoring/application/views/scripts/service/history.phtml
index dd6a0b3d9..ac443c370 100644
--- a/modules/monitoring/application/views/scripts/service/history.phtml
+++ b/modules/monitoring/application/views/scripts/service/history.phtml
@@ -43,79 +43,68 @@ function contactsLink($match, $view) {
     <?php foreach ($history as $event): ?>
     <?php
       $stateClass = 'invalid';
+      $msg = $this->escape($event->output);
       switch ($event->type) {
         case 'notify':
           $icon = 'notification';
           $title = $this->translate('Notification');
           $stateClass = Service::getStateText($event->state);
 
-          $msg = preg_replace_callback(
+          $msg = $msg ? preg_replace_callback(
               '/^\[([^\]]+)\]/',
               function($match) use ($self) { return contactsLink($match, $self); },
-              $this->escape($event->output)
-          );
+              $msg
+          ) : $this->translate('This notification was not sent out to any contact.');
           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;
       }
     ?>

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 2275/2920] 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 486fbd599b586dfbfc1826096be342dfe2c3641c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 17 Jun 2015 09:05:32 +0200
Subject: [PATCH 2276/2920] HoststatusQuery: Respect IDO schema version

refs #9009
fixes #9425
---
 .../Monitoring/Backend/Ido/Query/HoststatusQuery.php      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index 5165897c7..f3c3bef44 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -193,6 +193,14 @@ SQL;
      */
     protected function joinBaseTables()
     {
+        if (version_compare($this->getIdoVersion(), '1.10.0', '<')) {
+            $this->columnMap['hoststatus']['host_check_source'] = '(NULL)';
+        }
+
+        if (version_compare($this->getIdoVersion(), '1.13.0', '<')) {
+            $this->columnMap['hoststatus']['host_is_reachable'] = '(NULL)';
+        }
+
         $this->select->from(
             array('h' => $this->prefix . 'hosts'),
             array()

From 5c1cdbc1c8f6c26b542c96a924d21aa3e896723e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 17 Jun 2015 10:00:29 +0200
Subject: [PATCH 2277/2920] IdoQuery: Join hosts and services automatically if
 required for customvars

refs #9009
fixes #9426
---
 .../library/Monitoring/Backend/Ido/Query/IdoQuery.php     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index 6d0f418da..3ee32b40b 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -634,12 +634,14 @@ abstract class IdoQuery extends DbQuery
 
         $this->customVars[$customvar] = $alias;
 
-        // TODO: extend if we allow queries with only hosts / only services
-        //       ($leftcol s.host_object_id vs h.host_object_id
         if ($this->hasJoinedVirtualTable('services')) {
             $leftcol = 's.' . $type . '_object_id';
+        } elseif ($type === 'service') {
+            $this->requireVirtualTable('services');
+            $leftcol = 's.service_object_id';
         } else {
-            $leftcol = 'h.' . $type . '_object_id';
+            $this->requireVirtualTable('hosts');
+            $leftcol = 'h.host_object_id';
         }
 
         $joinOn = sprintf(

From 4d7283293366d321d7783a9505a7a60d3a16085d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 17 Jun 2015 10:11:59 +0200
Subject: [PATCH 2278/2920] MonitoredObject: Don't apply restrictions to
 comments and downtimes

They're already filtered by object_type and the object's name.

refs #9009
---
 .../monitoring/library/Monitoring/Object/MonitoredObject.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index ab7b6cdf9..c3d2c1da9 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -261,7 +261,7 @@ abstract class MonitoredObject implements Filterable
         } else {
             $comments->where('host_name', $this->host_name);
         }
-        $this->comments = $comments->applyFilter($this->getFilter())->getQuery()->fetchAll();
+        $this->comments = $comments->getQuery()->fetchAll();
         return $this;
     }
 
@@ -297,7 +297,7 @@ abstract class MonitoredObject implements Filterable
             $downtimes
                 ->where('host_name', $this->host_name);
         }
-        $this->downtimes = $downtimes->applyFilter($this->getFilter())->getQuery()->fetchAll();
+        $this->downtimes = $downtimes->getQuery()->fetchAll();
         return $this;
     }
 

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 2279/2920] 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 1ef643e00274ddcd3e951cd9a03188f99597d84f Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 17 Jun 2015 11:33:55 +0200
Subject: [PATCH 2280/2920] Improve service/host name layout in all views

refs #9361
---
 modules/monitoring/application/views/helpers/Link.php       | 6 +++---
 .../application/views/scripts/list/comments.phtml           | 6 +++---
 .../application/views/scripts/list/downtimes.phtml          | 2 +-
 .../views/scripts/partials/comment/comment-detail.phtml     | 6 +++---
 .../views/scripts/partials/service/objects-header.phtml     | 5 ++---
 .../monitoring/application/views/scripts/show/history.phtml | 6 +++---
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Link.php b/modules/monitoring/application/views/helpers/Link.php
index 8faf6e5fb..35c5a4cbc 100644
--- a/modules/monitoring/application/views/helpers/Link.php
+++ b/modules/monitoring/application/views/helpers/Link.php
@@ -51,7 +51,8 @@ class Zend_View_Helper_Link extends Zend_View_Helper_Abstract
     public function service($service, $serviceLinkText, $host, $hostLinkText)
     {
         return sprintf(
-            $this->view->translate('%s on %s', 'Service running on host'),
+            '%s: %s',
+            $this->host($host, $hostLinkText),
             $this->view->qlink(
                 $serviceLinkText,
                 'monitoring/service/show',
@@ -61,8 +62,7 @@ class Zend_View_Helper_Link extends Zend_View_Helper_Abstract
                     $service,
                     $host
                 ))
-            ),
-            $this->host($host, $hostLinkText)
+            )
         );
     }
 }
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index c4309f46e..43b94be66 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -37,9 +37,9 @@ if (count($comments) === 0) {
 
           <?= $this->qlink(
             sprintf(
-                $this->translate('%s on %s', 'Service running on host'),
-                $comment->service_display_name,
-                $comment->host_display_name
+                '%s: %s',
+                $comment->host_display_name,
+                $comment->service_display_name
             ),
             'monitoring/comment/show',
             array('comment_id' => $comment->id),
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 99b1c0e77..e0836aa26 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -54,7 +54,7 @@ if (count($downtimes) === 0) {
             }
         ?>
         <?= $this->qlink(
-            sprintf($this->translate('%s on %s', 'Service running on host'), $downtime->service_display_name, $downtime->host_display_name),
+            sprintf('%s: %s', $downtime->host_display_name, $downtime->service_display_name),
                 'monitoring/downtime/show',
                 array('downtime_id' => $downtime->id),
                 array('title' => sprintf(
diff --git a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
index 46de949d2..8583bfc59 100644
--- a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
+++ b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
@@ -1,9 +1,9 @@
 <?php if ($comment->objecttype === 'service'): ?>
     <?= $this->icon('service', $this->translate('Service')); ?>
     <?= sprintf(
-        $this->translate('%s on %s', 'Service running on host'),
-        $comment->service_display_name,
-        $comment->host_display_name
+        '%s: %s',
+        $comment->host_display_name,
+        $comment->service_display_name
     ) ?>
 <?php else: ?>
     <?= $this->icon('host', $this->translate('Host')); ?>
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index 176c43d92..ff39bcf22 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -18,9 +18,8 @@ $i = 0;
             <?= $this->iconImage()->service($service) ?>
             <?= implode(' ', $this->serviceFlags($service)) ?>
             <b>
-               <?= $this->escape($service->getName()); ?>
-               <?= $this->translate('on') ?>
-               <?= $this->escape($service->getHost()->getName()); ?><br>
+               <?= $this->escape($service->getHost()->getName()); ?>:
+               <?= $this->escape($service->getName()); ?> <br>
             </b>
             <?= $this->escape($service->service_output) ?>
             </td>
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index 3777d0384..c34faf2f3 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -143,7 +143,8 @@ $output = $this->tickets ? preg_replace_callback(
 ?>
         <?php if ($isService): ?>
           <?= sprintf(
-              $this->translate('%s on %s', 'Service running on host'),
+              '%s: %s',
+              $event->host_display_name,
               $hostContext ? $this->qlink(
                   $event->service_display_name,
                   'monitoring/show/service',
@@ -156,8 +157,7 @@ $output = $this->tickets ? preg_replace_callback(
                       $event->service_display_name,
                       $event->host_display_name
                   ))
-              ) : $this->escape($event->service_display_name),
-              $event->host_display_name
+              ) : $this->escape($event->service_display_name)
           ) ?>
         <?php else: ?>
           <?= $this->escape($event->host_name); ?>

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 2281/2920] 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 2282/2920] 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 2283/2920] 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());
     }
 
     /**

From 42e712402c3886ee9ca80ae8e8a0f80f61207fe1 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 17 Jun 2015 14:30:46 +0200
Subject: [PATCH 2284/2920] Move grey hover effect back into main module

refs #9361
---
 modules/monitoring/public/css/module.less |  9 ---------
 public/css/icinga/main-content.less       | 12 ++++++++++++
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 0b4ed9467..15f0e5a5f 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -359,11 +359,6 @@ tr.state.handled td.state, tr.state.ok td.state, tr.state.up td.state, tr.state.
   background-color: transparent;
 }
 
-tr[href].active {
-  background-color: #eee;
-  color: black;
-}
-
 tr.state.ok td.state, tr.state.up td.state {
   border-left-color: @colorOk;
 }
@@ -422,10 +417,6 @@ tr.state.handled td.state {
 }
 
 /* HOVER colors */
-tr[href]:hover {
-  color: black;
-  background-color: #eee;
-}
 
 tr.state[href]:hover td.state {
   background-color: #eee;
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 37756ae8d..697814df1 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -198,9 +198,21 @@ tr[href] {
   cursor: pointer;
 }
 
+tr[href].active {
+  background-color: #eee;
+  color: black;
+}
 /* End of table behaviour */
 
 
+/* HOVER colors */
+
+tr[href]:hover {
+  color: black;
+  background-color: #eee;
+}
+/* END of HOVER colors */
+
 /* TODO: get rid of most if not all styles below this line */
 div.content.users {
   table.user-list {

From 5b517a2cb0cbabe4aab4bc9dc2ac4ff7631291c8 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 17 Jun 2015 17:28:28 +0200
Subject: [PATCH 2285/2920] Improve table layout

Add alternating colors to table rows, to improve visibillity of the table.

refs #9361
---
 .../views/scripts/config/resource.phtml       |  2 +-
 .../scripts/form/reorder-authbackend.phtml    |  2 +-
 application/views/scripts/group/list.phtml    |  2 +-
 application/views/scripts/role/list.phtml     |  2 +-
 application/views/scripts/user/list.phtml     |  2 +-
 .../views/scripts/usergroupbackend/list.phtml |  2 +-
 public/css/icinga/main-content.less           | 21 +++++++++++++++++--
 7 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index d3d0e4d4f..36822b9f0 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -5,7 +5,7 @@
   <a href="<?= $this->href('/config/createresource'); ?>">
     <?= $this->icon('plus'); ?> <?= $this->translate('Create A New Resource'); ?>
   </a>
-  <table class="action" id="resource-edit-table">
+  <table class="action alternating" id="resource-edit-table">
     <thead>
       <th><?= $this->translate('Resource'); ?></th>
       <th style="width: 5em"><?= $this->translate('Remove'); ?></th>
diff --git a/application/views/scripts/form/reorder-authbackend.phtml b/application/views/scripts/form/reorder-authbackend.phtml
index 20d4e3696..02598e013 100644
--- a/application/views/scripts/form/reorder-authbackend.phtml
+++ b/application/views/scripts/form/reorder-authbackend.phtml
@@ -1,5 +1,5 @@
 <form id="<?= $form->getId(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
-  <table class="action">
+  <table class="action alternating">
     <thead>
       <th>Backend</th>
       <th style="width: 5em"><?= $this->translate('Remove'); ?></th>
diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
index 65c1591cd..1f693f152 100644
--- a/application/views/scripts/group/list.phtml
+++ b/application/views/scripts/group/list.phtml
@@ -27,7 +27,7 @@ if (! isset($backend)) {
 }
 
 if (count($groups) > 0): ?>
-<table data-base-target="_next" class="action group-list">
+<table data-base-target="_next" class="action group-list alternating">
   <thead>
     <tr>
       <th class="group-name"><?= $this->translate('Group'); ?></th>
diff --git a/application/views/scripts/role/list.phtml b/application/views/scripts/role/list.phtml
index 568bbdf98..e75c89356 100644
--- a/application/views/scripts/role/list.phtml
+++ b/application/views/scripts/role/list.phtml
@@ -6,7 +6,7 @@
         <?php /** @var \Icinga\Application\Config $roles */ if ($roles->isEmpty()): ?>
             <?= $this->translate('No roles found.') ?>
         <?php else: ?>
-            <table class="avp action" data-base-target="_next">
+            <table class="avp action alternating" data-base-target="_next">
                 <thead>
                 <tr>
                     <th><?= $this->translate('Name') ?></th>
diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index df9a14a45..3430f7f4b 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -27,7 +27,7 @@ if (! isset($backend)) {
 }
 
 if (count($users) > 0): ?>
-<table data-base-target="_next" class="action user-list">
+<table data-base-target="_next" class="action user-list alternating">
   <thead>
     <tr>
       <th class="user-name"><?= $this->translate('Username'); ?></th>
diff --git a/application/views/scripts/usergroupbackend/list.phtml b/application/views/scripts/usergroupbackend/list.phtml
index 58aa2deba..49b6d5372 100644
--- a/application/views/scripts/usergroupbackend/list.phtml
+++ b/application/views/scripts/usergroupbackend/list.phtml
@@ -11,7 +11,7 @@
   )
 ); ?>
 <?php if (count($backendNames) > 0): ?>
-<table class="action usergroupbackend-list">
+<table class="action usergroupbackend-list alternating">
   <thead>
     <tr>
       <th class="backend-name"><?= $this->translate('Backend'); ?></th>
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 697814df1..7b9c29821 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -202,14 +202,31 @@ tr[href].active {
   background-color: #eee;
   color: black;
 }
+
+table.alternating {
+  tr[href].active:nth-child(even), tr[href].active:nth-child(odd) {
+    background-color: #E5E5E5;
+    color: black;
+  }
+  tr[href]:nth-child(even) {
+    background-color: #FDFDFD;
+  }
+  tr[href]:nth-child(odd) {
+    background-color: #f5f5f5;
+  }
+  tr[href]:hover {
+    color: black;
+    background-color: #DDDDDD;
+  }
+}
 /* End of table behaviour */
 
 
 /* HOVER colors */
-
+ 
 tr[href]:hover {
   color: black;
-  background-color: #eee;
+  background-color: #DDDDDD;
 }
 /* END of HOVER colors */
 

From 386447b847b909978b54cdb902ca748a24d32e4c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 09:29:58 +0200
Subject: [PATCH 2286/2920] DbQuery: Add getter for GROUP BY clauses

Allows to override this in a child to provide group by clauses not
until they are actually required.

refs #9009
---
 library/Icinga/Data/Db/DbQuery.php | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index 2f82b06b2..28287df99 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -145,8 +145,9 @@ class DbQuery extends SimpleQuery
             }
         }
 
-        if ($this->group) {
-            $select->group($this->group);
+        $group = $this->getGroup();
+        if ($group) {
+            $select->group($group);
         }
 
         $select->columns($this->columns);
@@ -321,8 +322,9 @@ class DbQuery extends SimpleQuery
     {
         // TODO: there may be situations where we should clone the "select"
         $count = $this->dbSelect();
-        if ($this->group) {
-            $count->group($this->group);
+        $group = $this->getGroup();
+        if ($group) {
+            $count->group($group);
         }
         $this->applyFilterSql($count);
         if ($this->useSubqueryCount || $this->group) {
@@ -393,6 +395,16 @@ class DbQuery extends SimpleQuery
         return $this;
     }
 
+    /**
+     * Return the GROUP BY clause
+     *
+     * @return  string|array
+     */
+    public function getGroup()
+    {
+        return $this->group;
+    }
+
     /**
      * Return whether the given table has been joined
      *

From 1169793213fb124b67ff10be1205fb2abfdc8e95 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 09:36:04 +0200
Subject: [PATCH 2287/2920] IdoQuery: Add prototype for dynamic GROUP BY
 clauses

---
 library/Icinga/Data/Db/DbQuery.php            |  42 +-
 .../Monitoring/Backend/Ido/Query/IdoQuery.php | 360 +++++++++++++++++-
 2 files changed, 379 insertions(+), 23 deletions(-)

diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index 28287df99..c6809ea61 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -3,13 +3,14 @@
 
 namespace Icinga\Data\Db;
 
-use Icinga\Data\SimpleQuery;
-use Icinga\Data\Filter\FilterChain;
-use Icinga\Data\Filter\FilterOr;
-use Icinga\Data\Filter\FilterAnd;
-use Icinga\Data\Filter\FilterNot;
-use Icinga\Exception\QueryException;
 use Zend_Db_Select;
+use Icinga\Data\Filter\FilterAnd;
+use Icinga\Data\Filter\FilterChain;
+use Icinga\Data\Filter\FilterNot;
+use Icinga\Data\Filter\FilterOr;
+use Icinga\Data\SimpleQuery;
+use Icinga\Exception\ProgrammingError;
+use Icinga\Exception\QueryException;
 
 /**
  * Database query class
@@ -428,6 +429,35 @@ class DbQuery extends SimpleQuery
         return false;
     }
 
+    /**
+     * Return the alias used for joining the given table
+     *
+     * @param   string      $table
+     *
+     * @return  string|null         null in case no alias is being used
+     *
+     * @throws  ProgrammingError    In case the given table has not been joined
+     */
+    public function getJoinedTableAlias($table)
+    {
+        $fromPart = $this->select->getPart(Zend_Db_Select::FROM);
+        if (isset($fromPart[$table])) {
+            if ($fromPart[$table]['joinType'] === Zend_Db_Select::FROM) {
+                throw new ProgrammingError('Table "%s" has not been joined', $table);
+            }
+
+            return; // No alias in use
+        }
+
+        foreach ($fromPart as $alias => $options) {
+            if ($options['tableName'] === $table && $options['joinType'] !== Zend_Db_Select::FROM) {
+                return $alias;
+            }
+        }
+
+        throw new ProgrammingError('Table "%s" has not been joined', $table);
+    }
+
     /**
      * Add an INNER JOIN table and colums to the query
      *
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index 3ee32b40b..5b42ebd58 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -10,6 +10,7 @@ use Icinga\Data\Db\DbQuery;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Filter\FilterExpression;
 use Icinga\Exception\IcingaException;
+use Icinga\Exception\NotImplementedError;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Web\Session;
 
@@ -46,24 +47,31 @@ abstract class IdoQuery extends DbQuery
     /**
      * The prefix to use
      *
-     * @var String
+     * @var string
      */
     protected $prefix;
 
     /**
-     * The alias name for the index column
+     * An array to map aliases to table names
      *
-     * @var String
+     * @var array
      */
     protected $idxAliasColumn;
 
     /**
-     * The table containing the index column alias
+     * An array to map aliases to column names
      *
-     * @var String
+     * @var array
      */
     protected $idxAliasTable;
 
+    /**
+     * An array to map custom aliases to aliases
+     *
+     * @var array
+     */
+    protected $idxCustomAliases;
+
     /**
      * The column map containing all filterable columns
      *
@@ -111,53 +119,235 @@ abstract class IdoQuery extends DbQuery
     protected $joinedVirtualTables = array();
 
     /**
-     * The primary field name for the object table
+     * The primary key column for the instances table
+     *
+     * @var string
+     */
+    protected $instance_id = 'instance_id';
+
+    /**
+     * The primary key column for the objects table
      *
      * @var string
      */
     protected $object_id       = 'object_id';
 
     /**
-     * The primary field name for the IDO host table
+     * The primary key column for the acknowledgements table
      *
      * @var string
      */
-    protected $host_id         = 'host_id';
+    protected $acknowledgement_id = 'acknowledgement_id';
 
     /**
-     * The primary field name for the IDO hostgroup table
+     * The primary key column for the commenthistory table
      *
      * @var string
      */
-    protected $hostgroup_id    = 'hostgroup_id';
+    protected $commenthistory_id = 'commenthistory_id';
 
     /**
-     * The primary field name for the IDO service table
+     * The primary key column for the contactnotifications table
      *
      * @var string
      */
-    protected $service_id      = 'service_id';
+    protected $contactnotification_id = 'contactnotification_id';
 
     /**
-     * The primary field name for the IDO serviegroup table
+     * The primary key column for the downtimehistory table
+     *
+     * @var string
+     */
+    protected $downtimehistory_id = 'downtimehistory_id';
+
+    /**
+     * The primary key column for the flappinghistory table
+     *
+     * @var string
+     */
+    protected $flappinghistory_id = 'flappinghistory_id';
+
+    /**
+     * The primary key column for the notifications table
+     *
+     * @var string
+     */
+    protected $notification_id = 'notification_id';
+
+    /**
+     * The primary key column for the statehistory table
+     *
+     * @var string
+     */
+    protected $statehistory_id = 'statehistory_id';
+
+    /**
+     * The primary key column for the comments table
+     *
+     * @var string
+     */
+    protected $comment_id = 'comment_id';
+
+    /**
+     * The primary key column for the customvariablestatus table
+     *
+     * @var string
+     */
+    protected $customvariablestatus_id = 'customvariablestatus_id';
+
+    /**
+     * The primary key column for the hoststatus table
+     *
+     * @var string
+     */
+    protected $hoststatus_id = 'hoststatus_id';
+
+    /**
+     * The primary key column for the programstatus table
+     *
+     * @var string
+     */
+    protected $programstatus_id = 'programstatus_id';
+
+    /**
+     * The primary key column for the runtimevariables table
+     *
+     * @var string
+     */
+    protected $runtimevariable_id = 'runtimevariable_id';
+
+    /**
+     * The primary key column for the scheduleddowntime table
+     *
+     * @var string
+     */
+    protected $scheduleddowntime_id = 'scheduleddowntime_id';
+
+    /**
+     * The primary key column for the servicestatus table
+     *
+     * @var string
+     */
+    protected $servicestatus_id = 'servicestatus_id';
+
+    /**
+     * The primary key column for the contactstatus table
+     *
+     * @var string
+     */
+    protected $contactstatus_id = 'contactstatus_id';
+
+    /**
+     * The primary key column for the commands table
+     *
+     * @var string
+     */
+    protected $command_id = 'command_id';
+
+    /**
+     * The primary key column for the contactgroup_members table
+     *
+     * @var string
+     */
+    protected $contactgroup_member_id = 'contactgroup_member_id';
+
+    /**
+     * The primary key column for the contactgroups table
+     *
+     * @var string
+     */
+    protected $contactgroup_id = 'contactgroup_id';
+
+    /**
+     * The primary key column for the contacts table
+     *
+     * @var string
+     */
+    protected $contact_id = 'contact_id';
+
+    /**
+     * The primary key column for the customvariables table
+     *
+     * @var string
+     */
+    protected $customvariable_id = 'customvariable_id';
+
+    /**
+     * The primary key column for the host_contactgroups table
+     *
+     * @var string
+     */
+    protected $host_contactgroup_id = 'host_contactgroup_id';
+
+    /**
+     * The primary key column for the host_contacts table
+     *
+     * @var string
+     */
+    protected $host_contact_id = 'host_contact_id';
+
+    /**
+     * The primary key column for the hostgroup_members table
+     *
+     * @var string
+     */
+    protected $hostgroup_member_id = 'hostgroup_member_id';
+
+    /**
+     * The primary key column for the hostgroups table
+     *
+     * @var string
+     */
+    protected $hostgroup_id = 'hostgroup_id';
+
+    /**
+     * The primary key column for the hosts table
+     *
+     * @var string
+     */
+    protected $host_id = 'host_id';
+
+    /**
+     * The primary key column for the service_contactgroup table
+     *
+     * @var string
+     */
+    protected $service_contactgroup_id = 'service_contactgroup_id';
+
+    /**
+     * The primary key column for the service_contact table
+     *
+     * @var string
+     */
+    protected $service_contact_id = 'service_contact_id';
+
+    /**
+     * The primary key column for the servicegroup_members table
+     *
+     * @var string
+     */
+    protected $servicegroup_member_id = 'servicegroup_member_id';
+
+    /**
+     * The primary key column for the servicegroups table
      *
      * @var string
      */
     protected $servicegroup_id = 'servicegroup_id';
 
     /**
-     * The primary field name for the IDO contact table
+     * The primary key column for the services table
      *
      * @var string
      */
-    protected $contact_id      = 'contact_id';
+    protected $service_id = 'service_id';
 
     /**
-     * The primary field name for the IDO contactgroup table
+     * The primary key column for the timeperiods table
      *
      * @var string
      */
-    protected $contactgroup_id = 'contactgroup_id';
+    protected $timeperiod_id = 'timeperiod_id';
 
     /**
      * An array containing Column names that cause an aggregation of the query
@@ -483,6 +673,8 @@ abstract class IdoQuery extends DbQuery
             }
             if (is_int($alias)) {
                 $alias = $col;
+            } else {
+                $this->idxCustomAliases[$alias] = $col;
             }
 
             $resolvedColumns[$alias] = preg_replace('|\n|', ' ', $name);
@@ -688,6 +880,11 @@ abstract class IdoQuery extends DbQuery
         return $this->idxAliasColumn[$alias];
     }
 
+    public function customAliasToAlias($alias)
+    {
+        return $this->idxCustomAliases[$alias];
+    }
+
     /**
      * Create a sub query
      *
@@ -714,12 +911,55 @@ abstract class IdoQuery extends DbQuery
      */
     public function columns(array $columns)
     {
+        $this->idxCustomAliases = array();
         $this->columns = $this->resolveColumns($columns);
         // TODO: we need to refresh our select!
         // $this->select->columns($columns);
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function _getGroup()
+    {
+        throw new NotImplementedError('Does not work in its current state but will, probably, in the future');
+
+        // TODO: order by??
+        $group = parent::getGroup();
+        if (! empty($group) && $this->ds->getDbType() === 'pgsql') {
+            $group = is_array($group) ? $group : array($group);
+            foreach ($this->columns as $alias => $column) {
+                if ($column instanceof Zend_Db_Expr) {
+                    continue;
+                }
+
+                // TODO: What if $alias is neither a native nor a custom alias???
+                $table = $this->aliasToTableName(
+                    $this->hasAliasName($alias) ? $alias : $this->customAliasToAlias($alias)
+                );
+
+                // TODO: We cannot rely on the underlying select here, tables may be joined multiple times with
+                //       different aliases so the only way to get the correct alias here is to register such by ourself
+                //       for each virtual column (We may also inspect $column for the alias but this will probably lead
+                //       to false positives.. AND prevents custom implementations from providing their own "mapping")
+                if (($tableAlias = $this->getJoinedTableAlias($this->prefix . $table)) === null) {
+                    $tableAlias = $table;
+                }
+
+                // TODO: Same issue as with identifying table aliases; Our virtual tables are not named exactly how
+                //       they are in the IDO. We definitely need to register aliases explicitly (hint: DbRepository
+                //       is already providing such..)
+                $aliasedPk = $tableAlias . '.' . $this->getPrimaryKeyColumn($table);
+                if (! in_array($aliasedPk, $group)) {
+                    $group[] = $aliasedPk;
+                }
+            }
+        }
+
+        return $group;
+    }
+
     // TODO: Move this away, see note related to $idoVersion var
     protected function getIdoVersion()
     {
@@ -745,4 +985,90 @@ abstract class IdoQuery extends DbQuery
         }
         return self::$idoVersion;
     }
+
+    /**
+     * Return the name of the primary key column for the given table name
+     *
+     * @param   string  $table
+     *
+     * @return  string
+     *
+     * @throws ProgrammingError     In case $table is unknown
+     */
+    protected function getPrimaryKeyColumn($table)
+    {
+        // TODO: For god's sake, make this being a mapping
+        //       (instead of matching a ton of properties using a ridiculous long switch case)
+        switch ($table)
+        {
+            case 'instances':
+                return $this->instance_id;
+            case 'objects':
+                return $this->object_id;
+            case 'acknowledgements':
+                return $this->acknowledgement_id;
+            case 'commenthistory':
+                return $this->commenthistory_id;
+            case 'contactnotifiations':
+                return $this->contactnotification_id;
+            case 'downtimehistory':
+                return $this->downtimehistory_id;
+            case 'flappinghistory':
+                return $this->flappinghistory_id;
+            case 'notifications':
+                return $this->notification_id;
+            case 'statehistory':
+                return $this->statehistory_id;
+            case 'comments':
+                return $this->comment_id;
+            case 'customvariablestatus':
+                return $this->customvariablestatus_id;
+            case 'hoststatus':
+                return $this->hoststatus_id;
+            case 'programstatus':
+                return $this->programstatus_id;
+            case 'runtimevariables':
+                return $this->runtimevariable_id;
+            case 'scheduleddowntime':
+                return $this->scheduleddowntime_id;
+            case 'servicestatus':
+                return $this->servicestatus_id;
+            case 'contactstatus':
+                return $this->contactstatus_id;
+            case 'commands':
+                return $this->command_id;
+            case 'contactgroup_members':
+                return $this->contactgroup_member_id;
+            case 'contactgroups':
+                return $this->contactgroup_id;
+            case 'contacts':
+                return $this->contact_id;
+            case 'customvariables':
+                return $this->customvariable_id;
+            case 'host_contactgroups':
+                return $this->host_contactgroup_id;
+            case 'host_contacts':
+                return $this->host_contact_id;
+            case 'hostgroup_members':
+                return $this->hostgroup_member_id;
+            case 'hostgroups':
+                return $this->hostgroup_id;
+            case 'hosts':
+                return $this->host_id;
+            case 'service_contactgroups':
+                return $this->service_contactgroup_id;
+            case 'service_contacts':
+                return $this->service_contact_id;
+            case 'servicegroup_members':
+                return $this->servicegroup_member_id;
+            case 'servicegroups':
+                return $this->servicegroup_id;
+            case 'services':
+                return $this->service_id;
+            case 'timeperiods':
+                return $this->timeperiod_id;
+            default:
+                throw new ProgrammingError('Cannot provide a primary key column. Table "%s" is unknown', $table);
+        }
+    }
 }

From 9cfca36f46614491b95a2913721c77630e944ff4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 09:39:23 +0200
Subject: [PATCH 2288/2920] ContactQuery: PostgreSQL grouping..

refs #9009
---
 .../Backend/Ido/Query/ContactQuery.php        | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
index 0c703b008..cd72c4782 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
@@ -140,7 +140,6 @@ class ContactQuery extends IdoQuery
             'ho.object_id = h.host_object_id AND ho.is_active = 1',
             array()
         );
-        $this->group(array('c.contact_id'));
     }
 
     /**
@@ -182,6 +181,22 @@ class ContactQuery extends IdoQuery
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
         );
-        $this->group(array('c.contact_id'));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        $group = array();
+        if ($this->hasJoinedVirtualTable('hosts') || $this->hasJoinedVirtualTable('services')) {
+            $group = array('c.contact_id', 'co.object_id');
+            if ($this->hasJoinedVirtualTable('timeperiods')) {
+                $group[] = 'ht.timeperiod_id';
+                $group[] = 'st.timeperiod_id';
+            }
+        }
+
+        return $group;
     }
 }

From 535b740d0e9216ac37c3f79d66f80a6c9d48cac3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 10:09:50 +0200
Subject: [PATCH 2289/2920] ContactgroupQuery: PostgreSQL grouping...

refs #9009
---
 .../Backend/Ido/Query/ContactgroupQuery.php   | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
index 8394668a4..83934d811 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
@@ -103,7 +103,6 @@ class ContactgroupQuery extends IdoQuery
             'c.contact_object_id = co.object_id',
             array()
         );
-        $this->group(array('cg.contactgroup_id', 'c.contact_id'));
     }
 
     /**
@@ -145,12 +144,6 @@ class ContactgroupQuery extends IdoQuery
             'ho.object_id = h.host_object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
             array()
         );
-
-        if ($this->hasJoinedVirtualTable('contacts')) {
-            $this->group(array('cg.contactgroup_id', 'c.contact_id'));
-        } else {
-            $this->group(array('cg.contactgroup_id'));
-        }
     }
 
     /**
@@ -192,11 +185,29 @@ class ContactgroupQuery extends IdoQuery
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
         );
+    }
 
-        if ($this->hasJoinedVirtualTable('contacts')) {
-            $this->group(array('cg.contactgroup_id', 'c.contact_id'));
-        } else {
-            $this->group(array('cg.contactgroup_id'));
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        $group = array();
+        if ($this->hasJoinedVirtualTable('hosts') || $this->hasJoinedVirtualTable('services')) {
+            $group = array('cg.contactgroup_id', 'cgo.object_id');
+            if ($this->hasJoinedVirtualTable('contacts')) {
+                $group[] = 'c.contact_id';
+                $group[] = 'co.object_id';
+            }
+        } elseif ($this->hasJoinedVirtualTable('contacts')) {
+            $group = array(
+                'cg.contactgroup_id',
+                'cgo.object_id',
+                'c.contact_id',
+                'co.object_id'
+            );
         }
+
+        return $group;
     }
 }

From 6e40b79b0d381d85845df1d1101835da21de884b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 10:37:27 +0200
Subject: [PATCH 2290/2920] DataView\Downtime: Add missing columns host_ and
 service_state

---
 modules/monitoring/library/Monitoring/DataView/Downtime.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index 29114180c..605aca454 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -41,10 +41,12 @@ class Downtime extends DataView
             'downtime_start',
             'host_display_name',
             'host_name',
+            'host_state',
             'object_type',
             'service_description',
             'service_display_name',
-            'service_host_name'
+            'service_host_name',
+            'service_state'
         );
     }
 

From 72de85ab7bd1d2452461f7ba2b6122350863526b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 10:37:54 +0200
Subject: [PATCH 2291/2920] HostdowntimeQuery: PostgreSQL grouping...

refs #9009
---
 .../Backend/Ido/Query/HostdowntimeQuery.php   | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
index 9132d9602..63acc17fc 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
@@ -94,7 +94,6 @@ class HostdowntimeQuery extends IdoQuery
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
         );
-        $this->group(array('sd.scheduleddowntime_id', 'ho.name1'));
     }
 
     /**
@@ -156,6 +155,25 @@ class HostdowntimeQuery extends IdoQuery
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
         );
-        $this->group(array('sd.scheduleddowntime_id', 'ho.name1'));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        $group = array();
+        if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('servicegroups') || $this->hasJoinedVirtualTable('services')) {
+            $group = array('sd.scheduleddowntime_id', 'ho.object_id');
+            if ($this->hasJoinedVirtualTable('hosts')) {
+                $group[] = 'h.host_id';
+            }
+
+            if ($this->hasJoinedVirtualTable('hoststatus')) {
+                $group[] = 'hs.hoststatus_id';
+            }
+        }
+
+        return $group;
     }
 }

From 068c0b6ed269481038edc194f62b4031205ec6da Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 10:38:15 +0200
Subject: [PATCH 2292/2920] ServicedowntimeQuery: PostgreSQL grouping...

refs #9009
---
 .../Ido/Query/ServicedowntimeQuery.php        | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
index 970d48728..09162ea35 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
@@ -99,7 +99,6 @@ class ServicedowntimeQuery extends IdoQuery
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
         );
-        $this->group(array('sd.scheduleddowntime_id', 'so.name2', 'so.name1'));
     }
 
     /**
@@ -146,7 +145,6 @@ class ServicedowntimeQuery extends IdoQuery
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
         );
-        $this->group(array('sd.scheduleddowntime_id', 'so.name2', 'so.name1'));
     }
 
     /**
@@ -172,4 +170,33 @@ class ServicedowntimeQuery extends IdoQuery
             array()
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        $group = array();
+        if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('servicegroups')) {
+            $group = array('sd.scheduleddowntime_id', 'so.object_id');
+
+            if ($this->hasJoinedVirtualTable('hosts')) {
+                $group[] = 'h.host_id';
+            }
+
+            if ($this->hasJoinedVirtualTable('hoststatus')) {
+                $group[] = 'hs.hoststatus_id';
+            }
+
+            if ($this->hasJoinedVirtualTable('services')) {
+                $group[] = 's.service_id';
+            }
+
+            if ($this->hasJoinedVirtualTable('servicestatus')) {
+                $group[] = 'ss.servicestatus_id';
+            }
+        }
+
+        return $group;
+    }
 }

From 8ec494c96223b30a8f82e9506f9a8e026cd0029d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 10:58:59 +0200
Subject: [PATCH 2293/2920] HostnotificationQuery: PostgreSQL grouping...

refs #9009
---
 .../Ido/Query/HostnotificationQuery.php       | 37 +++++++++++++++----
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
index 338680ef4..f2bbe5f47 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
@@ -124,7 +124,6 @@ class HostnotificationQuery extends IdoQuery
     protected function joinHistory()
     {
         $this->requireVirtualTable('contactnotifications');
-        $this->group(array('hn.notification_id', 'ho.name1'));
     }
 
     /**
@@ -142,7 +141,6 @@ class HostnotificationQuery extends IdoQuery
             'cno.object_id = cn.contact_object_id',
             array()
         );
-        $this->group(array('cn.contactnotification_id', 'ho.name1'));
     }
 
     /**
@@ -175,10 +173,6 @@ class HostnotificationQuery extends IdoQuery
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
         );
-
-        if (! $this->hasJoinedVirtualTable('contactnotifications') && !$this->hasJoinedVirtualTable('history')) {
-            $this->group(array('hn.notification_id', 'ho.name1'));
-        }
     }
 
     /**
@@ -228,9 +222,36 @@ class HostnotificationQuery extends IdoQuery
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
         );
+    }
 
-        if (! $this->hasJoinedVirtualTable('contactnotifications') && !$this->hasJoinedVirtualTable('history')) {
-            $this->group(array('hn.notification_id', 'ho.name1'));
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        if (
+            $this->hasJoinedVirtualTable('history')
+            || $this->hasJoinedVirtualTable('services')
+            || $this->hasJoinedVirtualTable('hostgroups')
+        ) {
+            $group = array('hn.notification_id', 'ho.object_id');
+            if ($this->hasJoinedVirtualTable('contactnotifications') && !$this->hasJoinedVirtualTable('history')) {
+                $group[] = 'cno.object_id';
+            }
+        } elseif ($this->hasJoinedVirtualTable('contactnotifications')) {
+            $group = array('hn.notification_id', 'cno.object_id', 'ho.object_id');
         }
+
+        if (! empty($group)) {
+            if ($this->hasJoinedVirtualTable('hosts')) {
+                $group[] = 'h.host_id';
+            }
+
+            if ($this->hasJoinedVirtualTable('acknowledgements')) {
+                $group[] = 'a.acknowledgement_id';
+            }
+        }
+
+        return $group;
     }
 }

From 4f42da49a8aa5649e19d4f9e4f0b2c0c0f27c1ea Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 10:59:52 +0200
Subject: [PATCH 2294/2920] ServicenotificationQuery: PostgreSQL grouping...

refs #9009
---
 .../Ido/Query/ServicenotificationQuery.php    | 46 +++++++++++++++----
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
index bf7e99259..c5f68db85 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
@@ -125,7 +125,6 @@ class ServicenotificationQuery extends IdoQuery
     protected function joinHistory()
     {
         $this->requireVirtualTable('contactnotifications');
-        $this->group(array('sn.notification_id', 'so.name2', 'so.name1'));
     }
 
     /**
@@ -143,7 +142,6 @@ class ServicenotificationQuery extends IdoQuery
             'cno.object_id = cn.contact_object_id',
             array()
         );
-        $this->group(array('cn.contactnotification_id', 'so.name2', 'so.name1'));
     }
 
     /**
@@ -177,10 +175,6 @@ class ServicenotificationQuery extends IdoQuery
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
         );
-
-        if (! $this->hasJoinedVirtualTable('contactnotifications') && !$this->hasJoinedVirtualTable('history')) {
-            $this->group(array('sn.notification_id', 'so.name2', 'so.name1'));
-        }
     }
 
     /**
@@ -214,10 +208,6 @@ class ServicenotificationQuery extends IdoQuery
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
         );
-
-        if (! $this->hasJoinedVirtualTable('contactnotifications') && !$this->hasJoinedVirtualTable('history')) {
-            $this->group(array('sn.notification_id', 'so.name2', 'so.name1'));
-        }
     }
 
     /**
@@ -231,4 +221,40 @@ class ServicenotificationQuery extends IdoQuery
             array()
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        $group = array();
+        if (
+            $this->hasJoinedVirtualTable('history')
+            || $this->hasJoinedVirtualTable('hostgroups')
+            || $this->hasJoinedVirtualTable('servicegroups')
+        ) {
+            $group = array('sn.notification_id', 'so.object_id');
+            if ($this->hasJoinedVirtualTable('contactnotifications') && !$this->hasJoinedVirtualTable('history')) {
+                $group[] = 'cno.object_id';
+            }
+        } elseif ($this->hasJoinedVirtualTable('contactnotifications')) {
+            $group = array('sn.notification_id', 'cno.object_id', 'so.object_id');
+        }
+
+        if (! empty($group)) {
+            if ($this->hasJoinedVirtualTable('hosts')) {
+                $group[] = 'h.host_id';
+            }
+
+            if ($this->hasJoinedVirtualTable('services')) {
+                $group[] = 's.service_id';
+            }
+
+            if ($this->hasJoinedVirtualTable('acknowledgements')) {
+                $group[] = 'a.acknowledgement_id';
+            }
+        }
+
+        return $group;
+    }
 }

From 99b0d63e941171246a1f215f5f131e4006ee55e8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 11:17:14 +0200
Subject: [PATCH 2295/2920] HostcommentQuery: PostgreSQL grouping...

refs #9009
---
 .../Backend/Ido/Query/HostcommentQuery.php    | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
index d73d99ece..63b76fa22 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
@@ -88,7 +88,6 @@ class HostcommentQuery extends IdoQuery
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
         );
-        $this->group(array('c.comment_id', 'ho.name1'));
     }
 
     /**
@@ -150,6 +149,25 @@ class HostcommentQuery extends IdoQuery
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
         );
-        $this->group(array('c.comment_id', 'ho.name1'));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        $group = array();
+        if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('servicegroups')) {
+            $group = array('c.comment_id', 'ho.object_id');
+            if ($this->hasJoinedVirtualTable('hosts')) {
+                $group[] = 'h.host_id';
+            }
+
+            if ($this->hasJoinedVirtualTable('hoststatus')) {
+                $group[] = 'hs.hoststatus_id';
+            }
+        }
+
+        return $group;
     }
 }

From d66b7e85e745159bd49cc02001e16bd77c6fb531 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 11:17:36 +0200
Subject: [PATCH 2296/2920] ServicecommentQuery: PostgreSQL grouping...

refs #9009
---
 .../Backend/Ido/Query/ServicecommentQuery.php | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
index 514e998fb..d4eca1aa8 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommentQuery.php
@@ -93,7 +93,6 @@ class ServicecommentQuery extends IdoQuery
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
         );
-        $this->group(array('c.comment_id', 'so.name2', 'so.name1'));
     }
 
     /**
@@ -140,7 +139,6 @@ class ServicecommentQuery extends IdoQuery
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
         );
-        $this->group(array('c.comment_id', 'so.name2', 'so.name1'));
     }
 
     /**
@@ -166,4 +164,32 @@ class ServicecommentQuery extends IdoQuery
             array()
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        $group = array();
+        if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('servicegroups')) {
+            $group = array('c.comment_id', 'so.object_id');
+            if ($this->hasJoinedVirtualTable('hosts')) {
+                $group[] = 'h.host_id';
+            }
+
+            if ($this->hasJoinedVirtualTable('services')) {
+                $group[] = 's.service_id';
+            }
+
+            if ($this->hasJoinedVirtualTable('hoststatus')) {
+                $group[] = 'hs.hoststatus_id';
+            }
+
+            if ($this->hasJoinedVirtualTable('servicestatus')) {
+                $group[] = 'ss.servicestatus_id';
+            }
+        }
+
+        return $group;
+    }
 }

From 7e20b66aac89e450f8f9dfa5ac56b1d5f02cd500 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 11:27:43 +0200
Subject: [PATCH 2297/2920] defaults.less: remove left header borders...

...and adjust paddings/margins
---
 public/css/icinga/defaults.less | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index d1390e7fc..0f5f25c26 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -79,8 +79,8 @@ a {
 
 h1, h2, h3, h4, h5, h6 {
   font-size: 1em;
-  padding: 0.3em 1em;
-  margin: 0.3em 0 0.5em 0;
+  padding: 0.3em 0em;
+  margin: 0.7em 0 0.5em 0;
   color: @textColor;
 
   a {
@@ -102,21 +102,18 @@ h6 {
 }
 
 h1 {
-  border-left: 1em solid #888;
   border-bottom: 3px solid #888;
-  text-transform: uppercase;
+  font-variant: small-caps;
   font-weight: bold;
 }
 
 h2 {
-  border-left: 0.3em solid #666;
   border-bottom: 1px solid #666;
-  text-transform: uppercase;
+  font-variant: small-caps;
   font-weight: normal;
 }
 
 h3 {
-  border-left: 1em solid #888;
   border-bottom: 1px solid #888;
 }
 

From b128bef8f0f9e8c3d821a0f8115ce8b91f6042c4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 11:29:26 +0200
Subject: [PATCH 2298/2920] HostgroupQuery: PostgreSQL grouping...

refs #9009
---
 .../Backend/Ido/Query/HostgroupQuery.php          | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
index 6351a20ef..5144953c2 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
@@ -73,7 +73,6 @@ class HostgroupQuery extends IdoQuery
             'hgm.host_object_id = ho.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
             array()
         );
-        $this->group('hgo.name1');
     }
 
     /**
@@ -125,6 +124,18 @@ class HostgroupQuery extends IdoQuery
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
         );
-        $this->group('hgo.name1');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        $group = array();
+        if ($this->hasJoinedVirtualTable('hostobjects')) {
+            $group = array('hg.hostgroup_id', 'hgo.object_id');
+        }
+
+        return $group;
     }
 }

From c069414b1b8f44711e658cfc3b09d3885207961a Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 11:31:32 +0200
Subject: [PATCH 2299/2920] LdapQuery: fix forgotten connection property rename

---
 library/Icinga/Protocol/Ldap/Query.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Query.php b/library/Icinga/Protocol/Ldap/Query.php
index b54f8b15e..fe6539515 100644
--- a/library/Icinga/Protocol/Ldap/Query.php
+++ b/library/Icinga/Protocol/Ldap/Query.php
@@ -156,7 +156,7 @@ class Query extends SimpleQuery
     {
         $result = $this->fetchAll();
         $sorted = array();
-        $quotedDn = preg_quote($this->connection->getDN(), '/');
+        $quotedDn = preg_quote($this->ds->getDN(), '/');
         foreach ($result as $key => & $item) {
             $new_key = LdapUtils::implodeDN(
                 array_reverse(
@@ -170,7 +170,7 @@ class Query extends SimpleQuery
         unset($groups);
         ksort($sorted);
 
-        $tree = Root::forConnection($this->connection);
+        $tree = Root::forConnection($this->ds);
         $root_dn = $tree->getDN();
         foreach ($sorted as $sort_key => & $key) {
             if ($key === $root_dn) {

From b9479e7da45bcf06feea155efd2b38cb2da3de54 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 11:33:09 +0200
Subject: [PATCH 2300/2920] ServicegroupQuery: PostgreSQL grouping...

refs #9009
---
 .../Backend/Ido/Query/ServicegroupQuery.php        | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
index a0c9d9849..7c2aafc36 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
@@ -103,7 +103,6 @@ class ServicegroupQuery extends IdoQuery
             'sgm.service_object_id = so.object_id',
             array()
         );
-        $this->group('sgo.name1');
     }
 
     /**
@@ -118,4 +117,17 @@ class ServicegroupQuery extends IdoQuery
             array()
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        $group = array();
+        if ($this->hasJoinedVirtualTable('serviceobjects')) {
+            $group = array('sg.servicegroup_id', 'sgo.object_id');
+        }
+
+        return $group;
+    }
 }

From a4ab4db1ca6f4a3c9482107db16337fc182d6d9b Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 11:39:55 +0200
Subject: [PATCH 2301/2920] perfdata: occupy more space, highglight like output

---
 .../views/scripts/show/components/perfdata.phtml   | 14 +++++++++-----
 modules/monitoring/public/css/module.less          | 12 +++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/perfdata.phtml b/modules/monitoring/application/views/scripts/show/components/perfdata.phtml
index 086ee1235..0c59693ac 100644
--- a/modules/monitoring/application/views/scripts/show/components/perfdata.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/perfdata.phtml
@@ -1,7 +1,11 @@
 <?php if (! $object->perfdata) return ?>
-<tr>
-  <th><?= $this->translate('Performance data') ?></th>
-  <td>
-      <?= $this->perfdata($object->perfdata) ?>
-  </td>
+<tr class="newsection">
+ <td colspan="2">
+  <h2><?= $this->translate('Performance data') ?></h2>
+ </td>
+</tr>
+<tr>
+ <td colspan="2" class="performance-data">
+  <?= $this->perfdata($object->perfdata) ?>
+ </td>
 </tr>
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 15f0e5a5f..dda8f5d55 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -264,6 +264,7 @@ td.state {
         font-size: inherit;
         color: inherit;
         margin: 0;
+        padding-bottom: 0.1em;
     }
 
     h3 .author {
@@ -1214,14 +1215,15 @@ table.objectstate tr.state td.state {
   border-radius: 0;
 }
 
+table.avp td.performance-data {
+  padding: 0.3em 0 0.3em 1em;
+  border-left: 4px solid #d8d8d8;
+}
+
 table.perfdata {
   min-width: 24em;
   font-size: 0.9em;
-}
-
-table.perfdata.perfdata-piecharts {
-  left: -2.6em;
-  position: relative;
+  width: 100%;
 }
 
 table.perfdata th {

From 37103cf72d1674798db51ba254650ef150bfe2ce Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 11:52:58 +0200
Subject: [PATCH 2302/2920] HoststatusQuery: PostgreSQL grouping...

refs #9009
---
 .../Backend/Ido/Query/HoststatusQuery.php     | 39 +++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index f3c3bef44..30adf696f 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -230,7 +230,6 @@ SQL;
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
         );
-        $this->group('ho.name1');
     }
 
     /**
@@ -312,7 +311,6 @@ SQL;
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
         );
-        $this->group('ho.name1');
     }
 
     /**
@@ -330,7 +328,6 @@ SQL;
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
         );
-        $this->group('ho.name1');
     }
 
     /**
@@ -371,4 +368,40 @@ SQL;
             array()
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        $group = array();
+        if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('services')) {
+            $group = array('h.host_id', 'ho.object_id');
+            if ($this->hasJoinedVirtualTable('hoststatus')) {
+                $group[] = 'hs.hoststatus_id';
+            }
+
+            if ($this->hasJoinedVirtualTable('serviceproblemsummary')) {
+                $group[] = 'sps.unhandled_services_count';
+            }
+
+            if ($this->hasJoinedVirtualTable('lasthostackcomment')) {
+                $group[] = 'hlac.last_ack_data';
+            }
+
+            if ($this->hasJoinedVirtualTable('lasthostcomment')) {
+                $group[] = 'hlc.last_comment_data';
+            }
+
+            if ($this->hasJoinedVirtualTable('lasthostdowntimecomment')) {
+                $group[] = 'hldc.last_downtime_data';
+            }
+
+            if ($this->hasJoinedVirtualTable('lasthostflappingcomment')) {
+                $group[] = 'hlfc.last_flapping_data';
+            }
+        }
+
+        return $group;
+    }
 }

From e181c57a7081b54e15ce5b5ebbeb0dd58daf885c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 12:08:05 +0200
Subject: [PATCH 2303/2920] ServicestatusQuery: PostgreSQL grouping...

refs #9009
---
 .../Backend/Ido/Query/ServicestatusQuery.php  | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
index 723043b71..577ad16af 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -236,7 +236,6 @@ class ServicestatusQuery extends IdoQuery
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
         );
-        $this->group(array('so.name2', 'so.name1'));
     }
 
     /**
@@ -281,7 +280,6 @@ class ServicestatusQuery extends IdoQuery
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
         );
-        $this->group(array('so.name2', 'so.name1'));
     }
 
     /**
@@ -296,4 +294,28 @@ class ServicestatusQuery extends IdoQuery
             array()
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        $group = array();
+        if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('servicegroups')) {
+            $group = array('s.service_id', 'so.object_id');
+            if ($this->hasJoinedVirtualTable('hosts')) {
+                $group[] = 'h.host_id';
+            }
+
+            if ($this->hasJoinedVirtualTable('hoststatus')) {
+                $group[] = 'hs.hoststatus_id';
+            }
+
+            if ($this->hasJoinedVirtualTable('servicestatus')) {
+                $group[] = 'ss.servicestatus_id';
+            }
+        }
+
+        return $group;
+    }
 }

From b24b650a94be0b6619912ebef3655a4d40e2f035 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 12:34:30 +0200
Subject: [PATCH 2304/2920] HoststatusQuery: Group by host- and servicegroup
 pk's if required

refs #9009
---
 .../Backend/Ido/Query/HoststatusQuery.php     | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index 30adf696f..3feb37a9e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -400,6 +400,50 @@ SQL;
             if ($this->hasJoinedVirtualTable('lasthostflappingcomment')) {
                 $group[] = 'hlfc.last_flapping_data';
             }
+
+            if ($this->hasJoinedVirtualTable('hostgroups')) {
+                $selected = false;
+                foreach ($this->columns as $alias => $column) {
+                    if ($column instanceof Zend_Db_Expr) {
+                        continue;
+                    }
+
+                    $table = $this->aliasToTableName(
+                        $this->hasAliasName($alias) ? $alias : $this->customAliasToAlias($alias)
+                    );
+                    if ($table === 'hostgroups') {
+                        $selected = true;
+                        break;
+                    }
+                }
+
+                if ($selected) {
+                    $group[] = 'hg.hostgroup_id';
+                    $group[] = 'hgo.object_id';
+                }
+            }
+
+            if ($this->hasJoinedVirtualTable('servicegroups')) {
+                $selected = false;
+                foreach ($this->columns as $alias => $column) {
+                    if ($column instanceof Zend_Db_Expr) {
+                        continue;
+                    }
+
+                    $table = $this->aliasToTableName(
+                        $this->hasAliasName($alias) ? $alias : $this->customAliasToAlias($alias)
+                    );
+                    if ($table === 'servicegroups') {
+                        $selected = true;
+                        break;
+                    }
+                }
+
+                if ($selected) {
+                    $group[] = 'sg.servicegroup_id';
+                    $group[] = 'sgo.object_id';
+                }
+            }
         }
 
         return $group;

From 5ef56fc9b275994ed145232004a61ca1d2c993db Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 12:34:49 +0200
Subject: [PATCH 2305/2920] ServicestatusQuery: Group by host- and servicegroup
 pk's if required

refs #9009
---
 .../Backend/Ido/Query/ServicestatusQuery.php  | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
index 577ad16af..0a03f273d 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
+use Zend_Db_Expr;
+
 /**
  * Query for service status
  */
@@ -314,6 +316,50 @@ class ServicestatusQuery extends IdoQuery
             if ($this->hasJoinedVirtualTable('servicestatus')) {
                 $group[] = 'ss.servicestatus_id';
             }
+
+            if ($this->hasJoinedVirtualTable('hostgroups')) {
+                $selected = false;
+                foreach ($this->columns as $alias => $column) {
+                    if ($column instanceof Zend_Db_Expr) {
+                        continue;
+                    }
+
+                    $table = $this->aliasToTableName(
+                        $this->hasAliasName($alias) ? $alias : $this->customAliasToAlias($alias)
+                    );
+                    if ($table === 'hostgroups') {
+                        $selected = true;
+                        break;
+                    }
+                }
+
+                if ($selected) {
+                    $group[] = 'hg.hostgroup_id';
+                    $group[] = 'hgo.object_id';
+                }
+            }
+
+            if ($this->hasJoinedVirtualTable('servicegroups')) {
+                $selected = false;
+                foreach ($this->columns as $alias => $column) {
+                    if ($column instanceof Zend_Db_Expr) {
+                        continue;
+                    }
+
+                    $table = $this->aliasToTableName(
+                        $this->hasAliasName($alias) ? $alias : $this->customAliasToAlias($alias)
+                    );
+                    if ($table === 'servicegroups') {
+                        $selected = true;
+                        break;
+                    }
+                }
+
+                if ($selected) {
+                    $group[] = 'sg.servicegroup_id';
+                    $group[] = 'sgo.object_id';
+                }
+            }
         }
 
         return $group;

From a43cae9eb8534e529557158e9550489c64e0e61d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 12:35:21 +0200
Subject: [PATCH 2306/2920] HostgroupsummaryQuery: PostgreSQL grouping...

refs #9009
---
 .../Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
index 7688d9292..e3524fc58 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
@@ -113,7 +113,7 @@ class HostgroupsummaryQuery extends IdoQuery
         $this->subQueries[] = $services;
         $this->summaryQuery = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL);
         $this->select->from(array('statussummary' => $this->summaryQuery), array());
-        $this->group('hostgroup_name');
+        $this->group(array('hostgroup_name', 'hostgroup_alias'));
         $this->joinedVirtualTables['hoststatussummary'] = true;
     }
 

From b25d8e2f3469e3a985675003cd24423479776285 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 12:35:41 +0200
Subject: [PATCH 2307/2920] ServicegroupsummaryQuery: PostgreSQL grouping...

refs #9009
---
 .../Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php
index 765ca7f7a..f7519edc7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php
@@ -105,7 +105,7 @@ class ServicegroupsummaryQuery extends IdoQuery
         $this->subQueries[] = $services;
         $this->summaryQuery = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL);
         $this->select->from(array('statussummary' => $this->summaryQuery), array());
-        $this->group('servicegroup_name');
+        $this->group(array('servicegroup_name', 'servicegroup_alias'));
         $this->joinedVirtualTables['servicestatussummary'] = true;
     }
 

From 5c19c05a8ab28a8adbcb51d88a944d97385ffe9b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 13:18:21 +0200
Subject: [PATCH 2308/2920] HoststatehistoryQuery: PostgreSQL grouping...

refs #9009
---
 .../Ido/Query/HoststatehistoryQuery.php        | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php
index 227204ed5..8cb3b0964 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatehistoryQuery.php
@@ -114,7 +114,6 @@ class HoststatehistoryQuery extends IdoQuery
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
         );
-        $this->select->group(array('hh.statehistory_id', 'ho.name1'));
     }
 
     /**
@@ -164,6 +163,21 @@ class HoststatehistoryQuery extends IdoQuery
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
         );
-        $this->select->group(array('hh.statehistory_id', 'ho.name1'));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        $group = array();
+        if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('services')) {
+            $group = array('hh.statehistory_id', 'ho.object_id');
+            if ($this->hasJoinedVirtualTable('hosts')) {
+                $group[] = 'h.host_id';
+            }
+        }
+
+        return $group;
     }
 }

From b56114c82432786955a4115f8c5343ea7189a707 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 13:18:40 +0200
Subject: [PATCH 2309/2920] ServicestatehistoryQuery: PostgreSQL grouping...

refs #9009
---
 .../Ido/Query/ServicestatehistoryQuery.php    | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php
index 1a467fc12..4c8ce7082 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php
@@ -116,7 +116,6 @@ class ServicestatehistoryQuery extends IdoQuery
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
         );
-        $this->select->group(array('sh.statehistory_id', 'so.name1', 'so.name2'));
     }
 
     /**
@@ -150,7 +149,6 @@ class ServicestatehistoryQuery extends IdoQuery
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
         );
-        $this->select->group(array('sh.statehistory_id', 'so.name1', 'so.name2'));
     }
 
     /**
@@ -164,4 +162,21 @@ class ServicestatehistoryQuery extends IdoQuery
             array()
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        $group = array();
+        if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('servicegroups')) {
+            $group = array('sh.statehistory_id', 'so.object_id');
+            if ($this->hasJoinedVirtualTable('services')) {
+                $group[] = 'h.host_id';
+                $group[] = 's.service_id';
+            }
+        }
+
+        return $group;
+    }
 }

From f20193edb914e437055f287f6ee838d6edb2b0fa Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 13:18:52 +0200
Subject: [PATCH 2310/2920] HostcommenthistoryQuery: PostgreSQL grouping...

refs #9009
---
 .../Ido/Query/HostcommenthistoryQuery.php      | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php
index 5202d6f79..031c3f795 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php
@@ -98,7 +98,6 @@ class HostcommenthistoryQuery extends IdoQuery
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
         );
-        $this->select->group(array('hch.commenthistory_id', 'ho.name1'));
     }
 
     /**
@@ -148,6 +147,21 @@ class HostcommenthistoryQuery extends IdoQuery
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
         );
-        $this->select->group(array('hch.commenthistory_id', 'ho.name1'));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        $group = array();
+        if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('services')) {
+            $group = array('hch.commenthistory_id', 'ho.object_id');
+            if ($this->hasJoinedVirtualTable('hosts')) {
+                $group[] = 'h.host_id';
+            }
+        }
+
+        return $group;
     }
 }

From 11ed6d6cfac1cf13363f52dc1b85660ab391f980 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 13:19:01 +0200
Subject: [PATCH 2311/2920] ServicecommenthistoryQuery: PostgreSQL grouping...

refs #9009
---
 .../Ido/Query/ServicecommenthistoryQuery.php  | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php
index fbb5b9a13..e1388cc0f 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php
@@ -100,7 +100,6 @@ class ServicecommenthistoryQuery extends IdoQuery
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
         );
-        $this->select->group(array('sch.commenthistory_id', 'so.name1', 'so.name2'));
     }
 
     /**
@@ -134,7 +133,6 @@ class ServicecommenthistoryQuery extends IdoQuery
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
         );
-        $this->select->group(array('sch.commenthistory_id', 'so.name1', 'so.name2'));
     }
 
     /**
@@ -148,4 +146,21 @@ class ServicecommenthistoryQuery extends IdoQuery
             array()
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        $group = array();
+        if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('servicegroups')) {
+            $group = array('sch.commenthistory_id', 'so.object_id');
+            if ($this->hasJoinedVirtualTable('services')) {
+                $group[] = 'h.host_id';
+                $group[] = 's.service_id';
+            }
+        }
+
+        return $group;
+    }
 }

From dc66c24a1da418cb08fe360d37fe7a703ccbbfe1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 13:19:14 +0200
Subject: [PATCH 2312/2920] HostdowntimestarthistoryQuery: PostgreSQL
 grouping...

refs #9009
---
 .../Query/HostdowntimestarthistoryQuery.php    | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
index a3d87023b..63c08845c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
@@ -107,7 +107,6 @@ class HostdowntimestarthistoryQuery extends IdoQuery
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
         );
-        $this->select->group(array('hdh.downtimehistory_id', 'ho.name1'));
     }
 
     /**
@@ -157,6 +156,21 @@ class HostdowntimestarthistoryQuery extends IdoQuery
             'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
             array()
         );
-        $this->select->group(array('hdh.downtimehistory_id', 'ho.name1'));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        $group = array();
+        if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('services')) {
+            $group = array('hdh.downtimehistory_id', 'ho.object_id');
+            if ($this->hasJoinedVirtualTable('hosts')) {
+                $group[] = 'h.host_id';
+            }
+        }
+
+        return $group;
     }
 }

From 77fe09487031dd8119610130042c1a9f9cddc49d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 13:19:25 +0200
Subject: [PATCH 2313/2920] ServicedowntimestarthistoryQuery: PostgreSQL
 grouping...

refs #9009
---
 .../ServicedowntimestarthistoryQuery.php      | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
index 80c08f735..5cadcc01c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
@@ -109,7 +109,6 @@ class ServicedowntimestarthistoryQuery extends IdoQuery
             'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
             array()
         );
-        $this->select->group(array('sdh.downtimehistory_id', 'so.name1', 'so.name2'));
     }
 
     /**
@@ -143,7 +142,6 @@ class ServicedowntimestarthistoryQuery extends IdoQuery
             'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
             array()
         );
-        $this->select->group(array('sdh.downtimehistory_id', 'so.name1', 'so.name2'));
     }
 
     /**
@@ -157,4 +155,21 @@ class ServicedowntimestarthistoryQuery extends IdoQuery
             array()
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getGroup()
+    {
+        $group = array();
+        if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('servicegroups')) {
+            $group = array('sdh.downtimehistory_id', 'so.object_id');
+            if ($this->hasJoinedVirtualTable('services')) {
+                $group[] = 'h.host_id';
+                $group[] = 's.service_id';
+            }
+        }
+
+        return $group;
+    }
 }

From 55dd3747f7c8eb5a3acc9c9f6b7c1d40f89ab324 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 13:29:47 +0200
Subject: [PATCH 2314/2920] notifications: remove on click

This allows one to get rid of them faster in case access to the
underlying content is needed
---
 public/css/icinga/footer-elements.less | 4 ++++
 public/js/icinga/events.js             | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/public/css/icinga/footer-elements.less b/public/css/icinga/footer-elements.less
index d9c49f100..f3b248b69 100644
--- a/public/css/icinga/footer-elements.less
+++ b/public/css/icinga/footer-elements.less
@@ -26,6 +26,10 @@ div#footer {
   background-position: 1em center;
 }
 
+#notifications > li:hover {
+  cursor: pointer;
+}
+
 #notifications > li.info {
   background-color: @colorFormNotificationInfo;
 }
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 84354c960..5e49fbda9 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -105,6 +105,9 @@
             // We catch scroll events in our containers
             $('.container').on('scroll', { self: this }, this.icinga.events.onContainerScroll);
 
+            // Remove notifications on click
+            $(document).on('click', '#notifications li', function () { $(this).remove(); });
+
             // We want to catch each link click
             $(document).on('click', 'a', { self: this }, this.linkClicked);
             $(document).on('click', 'tr[href]', { self: this }, this.linkClicked);

From 2f62a4383a757d014bd04816eed676cbafa16c2e Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 17 Jun 2015 14:14:07 +0200
Subject: [PATCH 2315/2920] Layout: add showFullscreen parameter

refs #6729
---
 application/layouts/scripts/layout.phtml         |  3 ++-
 .../Icinga/Web/Controller/ActionController.php   |  1 +
 public/css/icinga/layout-structure.less          | 16 ++++++++++++++--
 public/js/icinga/ui.js                           | 12 +++++++-----
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml
index e00b9371d..794dc6e3b 100644
--- a/application/layouts/scripts/layout.phtml
+++ b/application/layouts/scripts/layout.phtml
@@ -14,6 +14,7 @@ if (array_key_exists('_dev', $_GET)) {
 $ie8jsfile  = 'js/icinga.ie8.js';
 $lang = Translator::splitLocaleCode()->language;
 $isIframe = $this->layout()->isIframe;
+$showFullscreen = $this->layout()->showFullscreen;
 $iframeClass = $isIframe ? ' iframe' : '';
 
 ?><!DOCTYPE html>
@@ -49,7 +50,7 @@ $iframeClass = $isIframe ? ' iframe' : '';
 </head>
 <body id="body">
 <pre id="responsive-debug"></pre>
-<div id="layout" class="default-layout">
+<div id="layout" class="default-layout<?php if ($showFullscreen): ?> fullscreen-layout<?php endif ?>">
 <?= $this->render('body.phtml') ?>
 </div>
 <!--[if IE 8]>
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index a60c82c8e..e2df27a3a 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -86,6 +86,7 @@ class ActionController extends Zend_Controller_Action
         $this->handlerBrowserWindows();
         $this->view->translationDomain = 'icinga';
         $this->_helper->layout()->isIframe = $request->getUrl()->shift('isIframe');
+        $this->_helper->layout()->showFullscreen = $request->getUrl()->shift('showFullscreen');
         $this->_helper->layout()->moduleName = false;
 
         $this->view->compact = $request->getParam('view') === 'compact';
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 5b5eee5ef..17306c128 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -81,13 +81,25 @@ html {
 
 /** Fullscreen layout **/
 #layout.fullscreen-layout {
-  #header, #sidebar, .controls > .tabs {
+  #header, #sidebar {
     display: none;
   }
 
+  .controls > ul.tabs {
+    margin-top: 0;
+    height: 1.5em;
+    background-color: @colorPetrol;
+    font-size: 0.8em;
+    padding: 0.2em 0 0;
+  }
+
+  .controls > ul.tabs > li > a {
+    line-height: 1.5em;
+  }
+
   #main {
     left: 0;
-    top: 0;
+    top: 0 !important;
   }
 }
 
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index b9e63aa11..b3ab6ee92 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -739,11 +739,13 @@
 
             if ('undefined' === typeof $parent) {
 
-                $('#header').css({height: 'auto'});
-                $('#main').css({top: $('#header').css('height')});
-                $('#sidebar').css({top: $('#header').height() + 'px'});
-                $('#header').css({height: $('#header').height() + 'px'});
-                $('#inner-layout').css({top: $('#header').css('height')});
+                if (! $('#layout').hasClass('fullscreen-layout')) {
+                    $('#header').css({height: 'auto'});
+                    $('#main').css({top: $('#header').css('height')});
+                    $('#sidebar').css({top: $('#header').height() + 'px'});
+                    $('#header').css({height: $('#header').height() + 'px'});
+                    $('#inner-layout').css({top: $('#header').css('height')});
+                }
                 $('.container').each(function (idx, container) {
                     self.fixControls($(container));
                 });

From 321924906f5bcb22af682f9e42662bf9139ffd43 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 13:11:36 +0200
Subject: [PATCH 2316/2920] layout-structure: font size for fullscreen tabs

---
 public/css/icinga/layout-structure.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 17306c128..8027aa644 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -89,7 +89,7 @@ html {
     margin-top: 0;
     height: 1.5em;
     background-color: @colorPetrol;
-    font-size: 0.8em;
+    font-size: 0.75em;
     padding: 0.2em 0 0;
   }
 

From 1f5db2f8c1d7b5e6ff5387e8ca8209721879835b Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 13:12:12 +0200
Subject: [PATCH 2317/2920] ActionController: introduce showCompact

Works like view=compact, it will allow us to "free" the "view" parameter
---
 library/Icinga/Web/Controller/ActionController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index e2df27a3a..d7156becc 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -90,6 +90,9 @@ class ActionController extends Zend_Controller_Action
         $this->_helper->layout()->moduleName = false;
 
         $this->view->compact = $request->getParam('view') === 'compact';
+        if ($request->getUrl()->shift('showCompact')) {
+            $this->view->compact = true;
+        }
         if ($this->rerenderLayout = $request->getUrl()->shift('renderLayout')) {
             $this->xhrLayout = 'body';
         }

From 1e61f55210258d2e08aee6f0a6c214efbf41d18f Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 13:17:54 +0200
Subject: [PATCH 2318/2920] dashboard: add compact support

---
 application/views/scripts/dashboard/index.phtml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/views/scripts/dashboard/index.phtml b/application/views/scripts/dashboard/index.phtml
index 7c3724dc6..8550d8a6b 100644
--- a/application/views/scripts/dashboard/index.phtml
+++ b/application/views/scripts/dashboard/index.phtml
@@ -1,5 +1,7 @@
 <div class="controls">
+<?php if (! $this->compact): ?>
 <?= $this->tabs ?>
+<?php endif ?>
 </div>
 <?php if ($this->dashboard): ?>
     <div class="dashboard content">
@@ -15,4 +17,4 @@
             ) ?>
         </p>
     </div>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>

From 7ee192e77441d3b8855b034c59b983cb6b8b552f Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 13:40:46 +0200
Subject: [PATCH 2319/2920] fullscreen: no more fixes controls and padding

---
 public/css/icinga/layout-structure.less | 4 ++++
 public/js/icinga/ui.js                  | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 8027aa644..587ddac5e 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -85,6 +85,10 @@ html {
     display: none;
   }
 
+  .container .controls {
+    padding: 0;
+  }
+
   .controls > ul.tabs {
     margin-top: 0;
     height: 1.5em;
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index b3ab6ee92..cd5290f32 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -706,7 +706,7 @@
         },
 
         initializeControls: function (parent) {
-            if ($(parent).closest('.dashboard').length) {
+            if ($(parent).closest('.dashboard').length || $('#layout').hasClass('fullscreen-layout')) {
                 return;
             }
 
@@ -736,6 +736,9 @@
 
         fixControls: function ($parent) {
             var self = this;
+            if ($('#layout').hasClass('fullscreen-layout')) {
+                return;
+            }
 
             if ('undefined' === typeof $parent) {
 

From f2425a97d5f8f5ca4321b27a99824552bfe26508 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 14:33:41 +0200
Subject: [PATCH 2320/2920] Select -1 as `state' for history queries not
 providing a valid state

PostgreSQL does not seem to be able to union null values with
integers...

refs #9009
---
 .../Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php    | 2 +-
 .../Backend/Ido/Query/HostdowntimestarthistoryQuery.php         | 2 +-
 .../Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php | 2 +-
 .../Backend/Ido/Query/ServicedowntimestarthistoryQuery.php      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php
index 031c3f795..1931b6638 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommenthistoryQuery.php
@@ -26,7 +26,7 @@ class HostcommenthistoryQuery extends IdoQuery
             'type'      => "(CASE hch.entry_type WHEN 1 THEN 'comment' WHEN 2 THEN 'dt_comment' WHEN 3 THEN 'flapping' WHEN 4 THEN 'ack' END)",
             'timestamp' => 'UNIX_TIMESTAMP(hch.comment_time)',
             'object_id' => 'hch.object_id',
-            'state'     => '(NULL)',
+            'state'     => '(-1)',
             'output'    => "('[' || hch.author_name || '] ' || hch.comment_data)",
         ),
         'hostgroups' => array(
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
index 63c08845c..118f7e526 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
@@ -26,7 +26,7 @@ class HostdowntimestarthistoryQuery extends IdoQuery
             'type'      => "('dt_start')",
             'timestamp' => 'UNIX_TIMESTAMP(hdh.actual_start_time)',
             'object_id' => 'hdh.object_id',
-            'state'     => '(NULL)',
+            'state'     => '(-1)',
             'output'    => "('[' || hdh.author_name || '] ' || hdh.comment_data)",
         ),
         'hostgroups' => array(
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php
index e1388cc0f..baa3d4d5a 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecommenthistoryQuery.php
@@ -30,7 +30,7 @@ class ServicecommenthistoryQuery extends IdoQuery
             'type'      => "(CASE sch.entry_type WHEN 1 THEN 'comment' WHEN 2 THEN 'dt_comment' WHEN 3 THEN 'flapping' WHEN 4 THEN 'ack' END)",
             'timestamp' => 'UNIX_TIMESTAMP(sch.comment_time)',
             'object_id' => 'sch.object_id',
-            'state'     => '(NULL)',
+            'state'     => '(-1)',
             'output'    => "('[' || sch.author_name || '] ' || sch.comment_data)",
         ),
         'hostgroups' => array(
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
index 5cadcc01c..deaa4ae9b 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
@@ -30,7 +30,7 @@ class ServicedowntimestarthistoryQuery extends IdoQuery
             'type'      => "('dt_start')",
             'timestamp' => 'UNIX_TIMESTAMP(sdh.actual_start_time)',
             'object_id' => 'sdh.object_id',
-            'state'     => '(NULL)',
+            'state'     => '(-1)',
             'output'    => "('[' || sdh.author_name || '] ' || sdh.comment_data)",
         ),
         'hostgroups' => array(

From dd81de39fd48df81f38a5e1d026846d3dcc5ed18 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 14:34:30 +0200
Subject: [PATCH 2321/2920] NotificationQuery: Do not fetch non-history related
 columns for history queries

refs #9009
---
 .../Backend/Ido/Query/NotificationQuery.php        | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index 3745179a0..e9085de90 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -96,14 +96,15 @@ class NotificationQuery extends IdoQuery
      */
     protected function joinHosts()
     {
-        $columns = array_keys(
-            $this->columnMap['notifications'] + $this->columnMap['hosts']
-        );
+        $columns = array_keys($this->columnMap['hosts']);
         foreach ($this->columnMap['services'] as $column => $_) {
             $columns[$column] = new Zend_Db_Expr('NULL');
         }
         if ($this->fetchHistoryColumns) {
             $columns = array_merge($columns, array_keys($this->columnMap['history']));
+            $columns[] = 'object_type';
+        } else {
+            $columns = array_merge($columns, array_keys($this->columnMap['notifications']));
         }
         $hosts = $this->createSubQuery('hostnotification', $columns);
         $this->subQueries[] = $hosts;
@@ -115,11 +116,12 @@ class NotificationQuery extends IdoQuery
      */
     protected function joinServices()
     {
-        $columns = array_keys(
-            $this->columnMap['notifications'] + $this->columnMap['hosts'] + $this->columnMap['services']
-        );
+        $columns = array_keys($this->columnMap['hosts'] + $this->columnMap['services']);
         if ($this->fetchHistoryColumns) {
             $columns = array_merge($columns, array_keys($this->columnMap['history']));
+            $columns[] = 'object_type';
+        } else {
+            $columns = array_merge($columns, array_keys($this->columnMap['notifications']));
         }
         $services = $this->createSubQuery('servicenotification', $columns);
         $this->subQueries[] = $services;

From 33927a3fb5276d5c58d8ea94776811e8a1be748d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 13:41:13 +0200
Subject: [PATCH 2322/2920] Bump version to v2.0.0-rc1

---
 VERSION         | 2 +-
 icingaweb2.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index a00bf2444..1ee76d11b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.0.0-beta3
+v2.0.0-rc1
diff --git a/icingaweb2.spec b/icingaweb2.spec
index 84c3e0b13..0549b7b50 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -1,6 +1,6 @@
 # Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+
 
-%define revision 3.beta3
+%define revision 4.rc1
 
 Name:           icingaweb2
 Version:        2.0.0

From 171b1d84ef66a060e2444a1478342f9beabc4d4f Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 14:57:58 +0200
Subject: [PATCH 2323/2920] object/show: make downtimes look like comments

refs #8281
---
 .../scripts/show/components/downtime.phtml    | 145 +++++++++++-------
 1 file changed, 88 insertions(+), 57 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 7ca246a43..46b0f5a3a 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -1,44 +1,63 @@
-<tr>
-    <th><?= $this->translate('Downtimes'); ?></th>
-    <td>
-        <?php if ($this->hasPermission('monitoring/command/downtime/schedule')) {
-            /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
-            if ($object->getType() === $object::TYPE_HOST) {
-                echo $this->qlink(
-                    $this->translate('Schedule downtime'),
-                    'monitoring/host/schedule-downtime',
-                    array('host' => $object->getName()),
-                    array(
-                        'icon'              => 'plug',
-                        'data-base-target'  => '_self',
-                        'title'             => $this->translate(
-                            'Schedule a downtime to suppress all problem notifications within a specific period of time'
-                        )
-                    )
-                );
-            } else {
-                echo $this->qlink(
-                    $this->translate('Schedule downtime'),
-                    'monitoring/service/schedule-downtime',
-                    array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
-                    array(
-                        'icon'              => 'plug',
-                        'data-base-target'  => '_self',
-                        'title'             => $this->translate(
-                            'Schedule a downtime to suppress all problem notifications within a specific period of time'
-                        )
-                    )
-                );
-            }
-        } else {
-            echo '&#45;';
-        } ?>
-    </td>
-</tr>
-
 <?php
 
-foreach ($object->downtimes as $downtime) {
+$addLink = '';
+
+if ($this->hasPermission('monitoring/command/downtime/schedule')) {
+    /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
+    if ($object->getType() === $object::TYPE_HOST) {
+        $addLink = $this->qlink(
+            $this->translate('Schedule downtime'),
+            'monitoring/host/schedule-downtime',
+            array('host' => $object->getName()),
+            array(
+                'icon'              => 'plug',
+                'data-base-target'  => '_self',
+                'title'             => $this->translate(
+                    'Schedule a downtime to suppress all problem notifications within a specific period of time'
+                )
+            )
+        );
+    } else {
+        $addLink = $this->qlink(
+            $this->translate('Schedule downtime'),
+            'monitoring/service/schedule-downtime',
+            array('host' => $object->getHost()->getName(), 'service' => $object->getName()),
+            array(
+                'icon'              => 'plug',
+                'data-base-target'  => '_self',
+                'title'             => $this->translate(
+                    'Schedule a downtime to suppress all problem notifications within a specific period of time'
+                )
+            )
+        );
+    }
+}
+
+if (empty($object->comments) && ! $addLink) {
+    return;
+}
+
+?>
+
+<tr>
+    <th><?php
+
+    echo $this->translate('Downtimes');
+
+    if (! empty($object->downtimes) && $addLink) {
+        echo '<br />' . $addLink;
+    }
+
+    ?></th>
+    <td data-base-target="_self">
+<?php if (empty($object->downtimes)): ?>
+<?= $addLink ?>
+<?php else: ?>
+    <ul class="inline-comments">
+
+<?php foreach ($object->downtimes as $downtime): ?>
+<?php
+
     // Ticket hook sample
     $commentText = $this->tickets ? preg_replace_callback(
         $this->tickets->getPattern(),
@@ -65,21 +84,33 @@ foreach ($object->downtimes as $downtime) {
         }
     }
 
-    ?>
-    <tr>
-        <th><?= $this->escape($downtime->author_name); ?> (<?= $this->timeAgo($downtime->entry_time); ?>)</th>
-        <td data-base-target="_self">
-            <?php if (isset($delDowntimeForm)) { // Form is unset if the current user lacks the respective permission
-                $delDowntimeForm = clone $delDowntimeForm;
-                $delDowntimeForm->populate(
-                    array(
-                        'downtime_id' => $downtime->id,
-                        'downtime_is_service' => $object->getType() === $object::TYPE_SERVICE
-                    )
-                );
-                echo $delDowntimeForm;
-            } ?>
-            <span class="sr-only"><?= $this->translate('Downtime'); ?></span><?= $state; ?> - <?= str_replace(array('\r\n', '\n'), '<br>', $commentText); ?>
-        </td>
-    </tr>
-<?php } // endforeach ?>
+
+// Form is unset if the current user lacks the respective permission
+if (isset($delDowntimeForm)) { 
+    $deleteButton = clone($delDowntimeForm);
+    $deleteButton->populate(
+        array(
+            'downtime_id' => $downtime->id,
+            'downtime_is_service' => $object->getType() === $object::TYPE_SERVICE
+        )
+    );
+} else {
+    $deleteButton = '';
+}
+
+?>
+
+        <li class="comment-item">
+            <h3>
+                <span class="author"><?= $this->escape($downtime->author_name) ?></span>
+                <?= $this->timeAgo($downtime->entry_time) ?>
+                <?= $deleteButton ?>
+            </h3>
+            <p>            <span class="sr-only"><?= $this->translate('Downtime'); ?></span><?= $state; ?> - <?= str_replace(array('\r\n', '\n'), '<br>', $commentText); ?></p>
+         </li>
+ <?php endforeach ?>
+    </ul>
+<?php endif ?>
+
+    </td>
+</tr>

From c085e9cfbdff80d61d06016f5aa5b48d5524b9fd Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 15:11:27 +0200
Subject: [PATCH 2324/2920] monitoring/css: try better monospace fonts

---
 modules/monitoring/public/css/module.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index dda8f5d55..8f77eef91 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -7,7 +7,7 @@
 p.pluginoutput {
   width: 100%;
   white-space: pre-wrap;
-  font-family: monospace;
+  font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', 'DejaVu Sans Mono', 'Courier New', Courier, monospace;
 }
 
 div.pluginoutput {
@@ -21,6 +21,7 @@ div.pluginoutput pre {
   white-space: pre-wrap;
   border-left: 4px solid #d8d8d8;
   padding: 0.3em 0 0.3em 1em;
+  font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', 'DejaVu Sans Mono', 'Courier New', Courier, monospace;
 }
 
 table.objectstate td.state {

From bf68edf65c835734cf2885299eb75fda4c3db4e2 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 15:13:48 +0200
Subject: [PATCH 2325/2920] monitoring/css: improve plugin output readability

---
 modules/monitoring/public/css/module.less | 7 +++++++
 public/css/icinga/main-content.less       | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 8f77eef91..c6dc3d18e 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -10,6 +10,13 @@ p.pluginoutput {
   font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', 'DejaVu Sans Mono', 'Courier New', Courier, monospace;
 }
 
+table.action td .pluginoutput {
+  font-size: 0.875em;
+  line-height: 1.2em;
+  padding: 0;
+  margin: 0;
+}
+
 div.pluginoutput {
   overflow: auto;
   color: #888;
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index bf1ee5c74..4464ab189 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -137,13 +137,6 @@ table.action td {
   padding: 0.2 0.4em 0.2em 0.5em;
 }
 
-table.action td .pluginoutput {
-  font-size: 0.8em;
-  line-height: 1.2em;
-  padding: 0;
-  margin: 0;
-}
-
 table.action td a {
   color: inherit;
   text-decoration: none;

From 382085e30cba3b6e1032f94c16b20b69ba8aac85 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 15:17:41 +0200
Subject: [PATCH 2326/2920] defaults.less: adjust h3-h6

---
 public/css/icinga/defaults.less | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index 0f5f25c26..f2db2ad50 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -82,6 +82,7 @@ h1, h2, h3, h4, h5, h6 {
   padding: 0.3em 0em;
   margin: 0.7em 0 0.5em 0;
   color: @textColor;
+  border-bottom: 1px dotted #aaa;
 
   a {
     text-decoration: none;
@@ -102,19 +103,20 @@ h6 {
 }
 
 h1 {
-  border-bottom: 3px solid #888;
+  border-bottom: 3px solid #666;
   font-variant: small-caps;
   font-weight: bold;
 }
 
 h2 {
-  border-bottom: 1px solid #666;
+  border-bottom: 1px solid #888;
   font-variant: small-caps;
   font-weight: normal;
 }
 
 h3 {
-  border-bottom: 1px solid #888;
+  font-weight: normal;
+  border-bottom: 1px solid #aaa;
 }
 
 button {

From 22feb08f44be98b6c416cc76e4fdcd97f89345bc Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 15:48:01 +0200
Subject: [PATCH 2327/2920] monitoring: Update security documentation

---
 doc/security.md                    | 20 ++++++++++----------
 modules/monitoring/doc/security.md | 25 ++++++++-----------------
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/doc/security.md b/doc/security.md
index f975c5c9b..5f010361e 100644
--- a/doc/security.md
+++ b/doc/security.md
@@ -108,14 +108,14 @@ To get you a quick start, here is an example of what a role definition could loo
 
 
     [winadmin]
-    users = "jdoe, janedoe"  
+    users = "jdoe, janedoe"
     groups = "admin"
     permissions = "config/application/*, monitoring/commands/schedule-check"
-    monitoring/filter/objects = "host=*win*"
+    monitoring/filter/objects = "host_name=*win*"
 
 
 This example creates a role called **winadmin**, that grants all permissions in `config/application/*` and `monitoring/commands/schedule-check` and additionally only
-allows the hosts and services that match the filter `host=*win*` to be displayed. The users
+allows the hosts and services that match the filter `host_name=*win*` to be displayed. The users
 **jdoe** and **janedoe** and all members of the group **admin** will be affected
 by this role.
 
@@ -210,8 +210,8 @@ Any filter expression that is allowed in the filtered view, is also an allowed f
 This means, that it is possible to define negations, wildcards, and even nested
 filter expressions containing AND and OR-Clauses.
 
-The filter expression will be **implicitly** added as an **AND-Clause** to each query on 
-the filtered data. The following shows the filter expression `host=*win*` being applied on `monitoring/filter/objects`.
+The filter expression will be **implicitly** added as an **AND-Clause** to each query on
+the filtered data. The following shows the filter expression `host_name=*win*` being applied on `monitoring/filter/objects`.
 
 
 Regular filter query:
@@ -225,7 +225,7 @@ With our restriction applied, any user affected by this restrictions will see th
 results of this query instead:
 
 
-    AND-- host = *win*
+    AND-- host_name = *win*
      |
      +--AND-- service_problem = 1
          |
@@ -257,13 +257,13 @@ the filter expressions. The following examples will show the usefulness of this
 
     [winadmin]
     groups = "windows-admins"
-    monitoring/filter/objects = "host=*win*"
+    monitoring/filter/objects = "host_name=*win*"
 
 Will display only hosts and services whose host name contains  **win**.
 
     [webadmin]
-    groups = "web-admins"  
-    monitoring/filter/objects = "host!=*win*"
+    groups = "web-admins"
+    monitoring/filter/objects = "host_name!=*win*"
 
 Will only match hosts and services whose host name does **not** contain **win**
 
@@ -276,4 +276,4 @@ Notice that because of the behavior of two stacking filters, a user that is memb
     monitoring/filter/objects = "(hostgroup_name=bsd-servers|hostgroup_name=linux-servers)"
 
 This role allows all members of the group unix-admins to see hosts and services
-that are part of the host-group linux-servers or the host-group bsd-servers.
\ No newline at end of file
+that are part of the host-group linux-servers or the host-group bsd-servers.
diff --git a/modules/monitoring/doc/security.md b/modules/monitoring/doc/security.md
index 023a66410..cdfe7215c 100644
--- a/modules/monitoring/doc/security.md
+++ b/modules/monitoring/doc/security.md
@@ -38,7 +38,7 @@ The monitoring module allows filtering objects:
 
 
 This filter will affect all hosts and services. Furthermore, it will also
-affect all related objects, like notifications, downtimes or events. If a
+affect all related objects, like notifications, downtimes and events. If a
 service is hidden, all notifications, downtimes on that service will be hidden too.
 
 
@@ -47,19 +47,10 @@ service is hidden, all notifications, downtimes on that service will be hidden t
 The following filter column names are available in filter expressions:
 
 
-| Column                                               |
-|------------------------------------------------------|
-| host                                                 |
-| host_alias                                           |
-| host_display_name                                    |
-| host_name                                            |
-| hostgroup                                            |
-| hostgroup_alias                                      |
-| hostgroup_name                                       |
-| service                                              |
-| service_description                                  |
-| service_display_name                                 |
-| service_group                                        |
-| service_group_alias                                  |
-| service_group_name                                   |
-| + all custom variables prefixed with host or service |
+| Column                                                       |
+|--------------------------------------------------------------|
+| host_name                                                    |
+| hostgroup_name                                               |
+| service_description                                          |
+| servicegroup_name                                            |
+| + all custom variables prefixed with `_host_` or `_service_` |

From 82ed9efd917c4efea435507c58fc9b93511f1cfc Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 15:48:23 +0200
Subject: [PATCH 2328/2920] Add instructions on how to upgrade to rc1

---
 doc/installation.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/doc/installation.md b/doc/installation.md
index 133f6cb98..9f021624e 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -252,3 +252,21 @@ affects environments that opted for not storing preferences, your new backend is
 
 Because Icinga Web 2 Beta 3 does not introduce any backward incompatible change you don't have to change your
 configuration files after upgrading to Icinga Web 2 Beta 3.
+
+## <a id="upgrading-to-rc1"></a> Upgrading to Icinga Web 2 Release Candidate 1
+
+The first release candidate of Icinga Web 2 introduces the following non-backward compatible changes:
+
+* The database schema has been adjusted and the tables `icingaweb_group` and
+  `icingaweb_group_membership` were altered to ensure referential integrity.
+  Please use the update script located in **etc/schema/upgrade** to update your
+  database schema
+* Users who are using PostgreSQL < v9.1 are required to upgrade their
+  environment to v9.1+ as this is the new minimum required version
+  for utilizing PostgreSQL as database backend
+* The restrictions `monitoring/hosts/filter` and `monitoring/services/filter`
+  provided by the monitoring module were merged together. The new
+  restriction is called `monitoring/filter/objects` and supports only a
+  predefined subset of filter columns. Please see the module's security
+  related documentation for more details.
+

From b154e13ad931e7fada28b5cf42a64b38718c9c3c Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 15:49:49 +0200
Subject: [PATCH 2329/2920] RoleForm: hide config/"all-but-*" for rc1

---
 application/forms/Security/RoleForm.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index ee5d312f0..114ddfc1f 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -21,8 +21,10 @@ class RoleForm extends ConfigForm
      * @var array
      */
     protected $providedPermissions = array(
-        '*'                                             => '*',
-        'config/*'                                      => 'config/*',
+        '*'                                             => 'Allow everything (*)',
+        'config/*'                                      => 'Allow config access (config/*)',
+/*
+        // [tg] seems excessive for me, hidden for rc1, tbd
         'config/application/*'                          => 'config/application/*',
         'config/application/general'                    => 'config/application/general',
         'config/application/resources'                  => 'config/application/resources',
@@ -45,6 +47,7 @@ class RoleForm extends ConfigForm
         'config/authentication/roles/edit'              => 'config/authentication/roles/edit',
         'config/authentication/roles/remove'            => 'config/authentication/roles/remove',
         'config/modules'                                => 'config/modules'
+*/
     );
 
     /**
@@ -63,7 +66,7 @@ class RoleForm extends ConfigForm
         foreach (Icinga::app()->getModuleManager()->getLoadedModules() as $module) {
             foreach ($module->getProvidedPermissions() as $permission) {
                 /** @var object $permission */
-                $this->providedPermissions[$permission->name] = $permission->name . ': ' . $permission->description;
+                $this->providedPermissions[$permission->name] = $permission->description . ' (' . $permission->name . ')';
             }
             foreach ($module->getProvidedRestrictions() as $restriction) {
                 /** @var object $restriction */

From cf2c2c3ee03dcd0db709f614cc698300d3b3bb69 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 15:55:58 +0200
Subject: [PATCH 2330/2920] security documentation: Cleanup permission lists

---
 doc/security.md | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/doc/security.md b/doc/security.md
index 5f010361e..5e9293e44 100644
--- a/doc/security.md
+++ b/doc/security.md
@@ -110,11 +110,11 @@ To get you a quick start, here is an example of what a role definition could loo
     [winadmin]
     users = "jdoe, janedoe"
     groups = "admin"
-    permissions = "config/application/*, monitoring/commands/schedule-check"
+    permissions = "config/*, monitoring/commands/schedule-check"
     monitoring/filter/objects = "host_name=*win*"
 
 
-This example creates a role called **winadmin**, that grants all permissions in `config/application/*` and `monitoring/commands/schedule-check` and additionally only
+This example creates a role called **winadmin**, that grants all permissions in `config/*` and `monitoring/commands/schedule-check` and additionally only
 allows the hosts and services that match the filter `host_name=*win*` to be displayed. The users
 **jdoe** and **janedoe** and all members of the group **admin** will be affected
 by this role.
@@ -142,8 +142,8 @@ all actions are **prohibited** and must be allowed explicitly by a role for any
 
 Each action in Icinga Web 2 is denoted by a **namespaced key**, which is used to order and
 group those actions. All actions that affect the configuration of Icinga Web 2, are in a
-namespace called **config**, while all configurations that affect authentication
-are in the namespace `config/authentication`
+namespace called **config**, while all configurations that affect modules
+are in the namespace `config/modules`
 
 **Wildcards** can be used to grant permission for all actions in a certain namespace.
 The permission `config/*` would grant permission to all configuration actions,
@@ -158,27 +158,6 @@ through a group) all permissions can simply be added together to get the users a
 -------------------------------------|-----------------------------------------------------------------
  *                                   | Allow everything, including module-specific permissions         
  config/*                            | Allow all configuration actions                                 
- config/application/*                | Allow configuring IcingaWeb2                                    
- config/application/general          | Allow general settings, like logging or preferences             
- config/application/resources        | Allow changing resources for retrieving data                    
- config/application/userbackend      | Allow changing backends for retrieving available users          
- config/application/usergroupbackend | Allow changing backends for retrieving available groups         
- config/authentication/*             | Allow configuring IcingaWeb2 authentication mechanisms          
- config/authentication/users/*       | Allow all user actions                                          
- config/authentication/users/show    | Allow displaying avilable users                                 
- config/authentication/users/add     | Allow adding a new user to the backend                          
- config/authentication/users/edit    | Allow editing an existing user in the backend                   
- config/authentication/users/remove  | Allow removing an existing user from the backend                
- config/authentication/groups/*      | Allow all group actions                                         
- config/authentication/groups/show   | Allow displaying all available groups                           
- config/authentication/groups/add    | Allow adding a new group to the backend                         
- config/authentication/groups/edit   | Allow editing existing groups in a backend                      
- config/authentication/groups/remove | Allow removing existing groups from the backend                 
- config/authentication/roles/*       | Allow all role actions                                          
- config/authentication/roles/add     | Allow adding a new role                                         
- config/authentication/roles/show    | Allow displaying available roles                                
- config/authentication/roles/edit    | Allow changing an existing role                                 
- config/authentication/roles/remove  | Allow removing an existing row                                  
  config/modules                      | Allow enabling or disabling modules  
 
 

From fb6de819edd73e05f0a9081f5bc2849b46d75286 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@netways.de>
Date: Thu, 18 Jun 2015 16:01:30 +0200
Subject: [PATCH 2331/2920] Add release hints and changelog script

We're using the same script and release hint docs in icinga2
and should share the same process.
---
 ChangeLog    | 129 ++++++++++++++++++++++++++++++++++++++++++++
 RELEASE.md   |  64 ++++++++++++++++++++++
 changelog.py | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 341 insertions(+)
 create mode 100644 ChangeLog
 create mode 100644 RELEASE.md
 create mode 100755 changelog.py

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000000000..4f1410b4a
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,129 @@
+## What's New in Version 2.0.0-rc1
+
+### Changes
+
+* Improve layout and look and feel in many ways
+* Add fullscreen mode (?showFullscreen)
+* User and group management
+* Comment and Downtime Detail View
+* Show icon_image in host/service views
+* Show Icinga program version in monitoring health
+
+#### Features
+
+* Feature 4139: Notify monitoring backend availability problems
+* Feature 4498: Allow to add columns to monitoring views via URL
+* Feature 6392: Resolve Icinga 2 runtime macros in action and notes URLs
+* Feature 6729: Fullscreen mode
+* Feature 7343: Fetch user groups from LDAP
+* Feature 7595: Remote connection resource configuration
+* Feature 7614: Right-align icons
+* Feature 7651: Add module information (module.info) to all core modules
+* Feature 8054: Host Groups should list number of hosts (as well as services)
+* Feature 8235: Show host and service notes in the host and service detail view
+* Feature 8247: Move notifications to the bottom of the page
+* Feature 8281: Improve layout of comments and downtimes in the host and service detail views
+* Feature 8310: Improve layout of performance data and check statistics in the host and service detail views
+* Feature 8565: Improve look and feel of the monitoring multi-select views
+* Feature 8613: IDO queries related to concrete objects should not depend on collations
+* Feature 8665: Show icon_image in the host and service detail views
+* Feature 8781: Automatically deselect rows when closing the detail area
+* Feature 8826: User and group management
+* Feature 8849: Show only three (or four) significant digits (e.g. in check execution time)
+* Feature 8877: Allow module developers to implement new/custom authentication methods
+* Feature 8886: Require mandatory parameters in controller actions and CLI commands
+* Feature 8902: Downtime detail view
+* Feature 8903: Comment detail view
+* Feature 9009: Apply host and service restrictions to related views as well
+* Feature 9203: Wizard: Validate that a resource is actually an IDO instance
+* Feature 9207: Show icinga program version in Monitoring Health
+* Feature 9223: Show the active ido endpoint in the monitoring health view
+* Feature 9284: Create a ServiceActionsHook
+* Feature 9300: Support icon_image_alt
+* Feature 9361: Refine UI for RC1
+* Feature 9377: Permission and restriction documentation
+* Feature 9379: Provide an about.md
+
+#### Bugfixes
+
+* Bug 6281: ShowController's hostAction() and serviceAction() do not respond with 400 for invalid/missing parameters and with 404 if the host or service wasn't found
+* Bug 6778: Duration and history time formatting isn't correct
+* Bug 6952: Unauthenticated users are provided helpful error messages
+* Bug 7151: Play nice with form-button-double-clickers
+* Bug 7165: Invalid host address leads to exception w/ PostgreSQL
+* Bug 7447: Commands sent over SSH are missing the -i option when using a ssh user aside from the webserver's user
+* Bug 7491: Switching from MySQL to PostgreSQL and vice versa doesn't change the port in the resource configuration
+* Bug 7642: Monitoring menu renderers should be moved to the monitoring module
+* Bug 7658: MenuItemRenderer is not so easy to extend
+* Bug 7876: Not all views can be added to the dashboard w/o breaking the layout
+* Bug 7931: Can't acknowledge multiple selected services which are in downtime
+* Bug 7997: Service-Detail-View tabs are changing their context when clicking the Host-Tab
+* Bug 7998: Navigating to the Services-Tab in the Service-Detail-View displays only the selected service
+* Bug 8006: Beautify command transport error exceptions
+* Bug 8205: List views should not show more than the five worst pies
+* Bug 8241: Take display_name into account when searching for host and service names
+* Bug 8334: Perfdata details partially hidden depending on the resolution
+* Bug 8339: Lib: SimpleQuery::paginate() must not fetch page and limit from request but use them from parameters
+* Bug 8343: Status summary does not respect restrictions
+* Bug 8363: Updating dashlets corrupts their URLs
+* Bug 8453: The filter column "_dev" is not allowed here
+* Bug 8472: Missing support for command line arguments in the format --arg=<value>
+* Bug 8474: Improve layout of dictionaries in the host and service detail views
+* Bug 8624: Delete multiple downtimes and comments at once
+* Bug 8696: Can't search for Icinga 2 custom variables
+* Bug 8705: Show all shell commands required to get ready in the setup wizard
+* Bug 8706: INI files should end with a newline character and should not contain superfluous newlines
+* Bug 8707: Wizard: setup seems to fail with just one DB user
+* Bug 8711: JS is logging "ugly" side exceptions
+* Bug 8731: Apply host restrictions to service views
+* Bug 8744: Performance data metrics with value 0 are not displayed
+* Bug 8747: Icinga 2 boolean variables not shown in the host and service detail views
+* Bug 8777: Server error: Service not found exception when service name begins or ends with whitespaces
+* Bug 8815: Only the first external command is sent over SSH when submitting commands for multiple selected hosts or services
+* Bug 8847: Missing indication that nothing was found in the docs when searching
+* Bug 8860: Host group view calculates states from service states; but states should be calculated from host states instead
+* Bug 8927: Tactical overview does not respect restrictions
+* Bug 8928: Host and service groups views do not respect restrictions
+* Bug 8929: Setup wizard does not validate whether the PostgreSQL user for creating the database owns the CREATE ROLE system privilege
+* Bug 8930: Error message about refused connection to the PostgreSQL database server displayed twice in the setup wizard
+* Bug 8934: Status text for ok/up becomes white when hovered
+* Bug 8941: Long plugin output makes the whole container horizontally scrollable instead of just the row containing the long plugin output
+* Bug 8950: Improve English for "The last one occured %s ago"
+* Bug 8953: LDAP encryption settings have no effect
+* Bug 8956: Can't login when creating the database connection for the preferences store fails
+* Bug 8957: Fall back on syslog if the logger's type directive is misconfigured
+* Bug 8958: Switching LDAP encryption to LDAPS doesn't change the port in the resource configuration
+* Bug 8960: Remove exclamation mark from the notification "Authentication order updated!"
+* Bug 8966: Show custom variables visually separated in the host and service detail views
+* Bug 8967: Remove right petrol border from plugin output in the host and service detail views
+* Bug 8972: Can't view Icinga Web 2's log file
+* Bug 8994: Uncaught exception on empty session.save_path()
+* Bug 9000: Only the first line of a stack trace is shown in the applications log view
+* Bug 9007: Misspelled host and service names in commands are not accepted by icinga
+* Bug 9008: Notification overview does not respect restrictions
+* Bug 9022: Browser title does not change in case of an error
+* Bug 9023: Toggling feature...
+* Bug 9025: A tooltip of the service grid's x-axe makes it difficult to click the title of the currently hovered column
+* Bug 9026: Add To Dashboard ... on the dashboard
+* Bug 9046: Detail View: Downtimes description misses space between duration and comment text
+* Bug 9056: Filter for host/servicegroup search doesn't work anymore
+* Bug 9057: contact_notify_host_timeperiod
+* Bug 9059: Can't initiate an ascending sort by host or service severity
+* Bug 9198: monitoring/command/feature/object does not grant the correct permissions
+* Bug 9202: The config\* permission does not permit to navigate to the configuration
+* Bug 9211: Empty filters are being rendered to SQL which leads to syntax errors
+* Bug 9214: Detect multitple icinga_instances entries and warn the user
+* Bug 9220: Centralize submission and apply handling of sort rules
+* Bug 9224: Allow anonymous LDAP binding
+* Bug 9281: Problem with Icingaweb 2 after PHP Upgrade 5.6.8 -> 5.6.9
+* Bug 9317: Web 2's ListController inherits from the monitoring module's base controller
+* Bug 9319: Downtimes overview does not respect restrictions
+* Bug 9350: Menu disappears in user group management view
+* Bug 9351: Timeline links are broken
+* Bug 9352: User list should be sorted
+* Bug 9353: Searching for users fails, at least with LDAP backend
+* Bug 9355: msldap seems not to be a first-class citizen
+* Bug 9378: Rpm calls usermod w/ invalid option on openSUSE
+* Bug 9384: Timeline+Role problem
+* Bug 9392: Command links seem to be broken
+
diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 000000000..e8bcfeec0
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,64 @@
+# Quality Assurance
+
+Review and test the changes and issues for this version.
+https://dev.icinga.org/projects/icingaweb2/roadmap
+
+# Release Workflow
+
+Update the [.mailmap](.mailmap) and [AUTHORS](AUTHORS) files:
+
+    $ git log --use-mailmap | grep ^Author: | cut -f2- -d' ' | sort | uniq > AUTHORS
+
+Update the version number in the [icingaweb2.spec] and [VERSION] files.
+
+Update the [ChangeLog](ChangeLog) file using
+the changelog.py script.
+
+Changelog:
+
+    $ ./changelog.py --version 2.0.0-rc1
+
+Wordpress:
+
+    $ ./changelog.py --version 2.0.0-rc1 --html --links
+
+Commit these changes to the "master" branch:
+
+    $ git commit -v -a -m "Release version <VERSION>"
+
+For minor releases: Cherry-pick this commit into the "support" branch.
+
+Create a signed tag (tags/v<VERSION>) on the "master" branch (for major
+releases) or the "support" branch (for minor releases).
+
+    $ git tag -m "Version <VERSION>" v<VERSION>
+
+Push the tag.
+
+    $ git push --tags
+
+For major releases: Create a new "support" branch:
+
+    $ git checkout master
+    $ git checkout -b support/2.x
+    $ git push -u origin support/2.x
+
+# External Dependencies
+
+## Build Server
+
+### Linux
+
+* Build the newly created git tag for Debian/RHEL/SuSE.
+* Provision the vagrant boxes and test the release packages.
+
+## Github Release
+
+Create a new release from the newly created git tag.
+https://github.com/Icinga/icingaweb2/releases
+
+## Announcement
+
+* Create a new blog post on www.icinga.org/blog
+* Send announcement mail to icinga-announce@lists.icinga.org
+* Social media: [Twitter](https://twitter.com/icinga), [Facebook](https://www.facebook.com/icinga), [G+](http://plus.google.com/+icinga), [Xing](https://www.xing.com/communities/groups/icinga-da4b-1060043), [LinkedIn](https://www.linkedin.com/groups/Icinga-1921830/about)
diff --git a/changelog.py b/changelog.py
new file mode 100755
index 000000000..c6fbf1e8a
--- /dev/null
+++ b/changelog.py
@@ -0,0 +1,148 @@
+#!/usr/bin/env python
+#/******************************************************************************
+# * Icinga 2                                                                   *
+# * Copyright (C) 2012-2015 Icinga Development Team (http://www.icinga.org)    *
+# *                                                                            *
+# * This program is free software; you can redistribute it and/or              *
+# * modify it under the terms of the GNU General Public License                *
+# * as published by the Free Software Foundation; either version 2             *
+# * of the License, or (at your option) any later version.                     *
+# *                                                                            *
+# * This program is distributed in the hope that it will be useful,            *
+# * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
+# * GNU General Public License for more details.                               *
+# *                                                                            *
+# * You should have received a copy of the GNU General Public License          *
+# * along with this program; if not, write to the Free Software Foundation     *
+# * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
+# ******************************************************************************/
+
+import urllib2, json, sys, string
+from argparse import ArgumentParser
+
+DESCRIPTION="update release changes"
+VERSION="1.0.0"
+ISSUE_URL= "https://dev.icinga.org/issues/"
+ISSUE_PROJECT="icingaweb2"
+
+arg_parser = ArgumentParser(description= "%s (Version: %s)" % (DESCRIPTION, VERSION))
+arg_parser.add_argument('-V', '--version', type=str, help="define version to query")
+arg_parser.add_argument('-p', '--project', type=str, help="add urls to issues")
+arg_parser.add_argument('-l', '--links', action='store_true', help="add urls to issues")
+arg_parser.add_argument('-H', '--html', action='store_true', help="print html output (defaults to markdown)")
+
+args = arg_parser.parse_args(sys.argv[1:])
+
+ftype = "md" if not args.html else "html"
+
+def format_header(text, lvl, ftype = ftype):
+   if ftype == "html":
+       return "<h%s>%s</h%s>" % (lvl, text, lvl)
+   if ftype == "md":
+       return "#" * lvl + " " + text
+
+def format_logentry(log_entry, args = args, issue_url = ISSUE_URL):
+   if args.links:
+       if args.html:
+           return "<li> {0} <a href=\"{3}{1}\">{1}</a>: {2}</li>".format(log_entry[0], log_entry[1], log_entry[2], issue_url)
+       else:
+           return "* {0} [{1}]({3}{1} \"{0} {1}\"): {2}".format(log_entry[0], log_entry[1], log_entry[2], issue_url)
+   else:
+       if args.html:
+           return "<li>%s %d: %s</li>" % log_entry
+       else:
+           return "* %s %d: %s" % log_entry
+
+
+version_name = args.version
+
+if args.project:
+    ISSUE_PROJECT=args.project
+
+rsp = urllib2.urlopen("https://dev.icinga.org/projects/%s/versions.json" % (ISSUE_PROJECT))
+versions_data = json.loads(rsp.read())
+
+version_id = None
+
+for version in versions_data["versions"]:
+    if version["name"] == version_name:
+        version_id = version["id"]
+        break
+
+if version_id == None:
+    print "Version '%s' not found." % (version_name)
+    sys.exit(1)
+
+changes = ""
+
+if "custom_fields" in version:
+    for field in version["custom_fields"]:
+        if field["id"] == 14:
+            changes = field["value"]
+            break
+
+    changes = string.join(string.split(changes, "\r\n"), "\n")
+
+print format_header("What's New in Version %s" % (version_name), 2)
+print ""
+
+if changes:
+    print format_header("Changes", 3)
+    print ""
+    print changes
+    print ""
+
+offset = 0
+
+log_entries = []
+
+while True:
+    # We could filter using &cf_13=1, however this doesn't currently work because the custom field isn't set
+    # for some of the older tickets:
+    rsp = urllib2.urlopen("https://dev.icinga.org/projects/%s/issues.json?offset=%d&status_id=closed&fixed_version_id=%d" % (ISSUE_PROJECT, offset, version_id))
+    issues_data = json.loads(rsp.read())
+    issues_count = len(issues_data["issues"])
+    offset = offset + issues_count
+
+    if issues_count == 0:
+        break
+
+    for issue in issues_data["issues"]:
+        ignore_issue = False
+
+        if "custom_fields" in issue:
+            for field in issue["custom_fields"]:
+                if field["id"] == 13 and "value" in field and field["value"] == "0":
+                    ignore_issue = True
+                    break
+
+            if ignore_issue:
+                continue
+
+        log_entries.append((issue["tracker"]["name"], issue["id"], issue["subject"].strip()))
+
+for p in range(2):
+    not_empty = False
+
+    for log_entry in log_entries:
+        if (p == 0 and log_entry[0] == "Feature") or (p == 1 and log_entry[0] != "Feature"):
+            not_empty = True
+
+    if not_empty:
+        print format_header("Features", 4) if p == 0 else format_header("Bugfixes", 4)
+        print ""
+	if args.html:
+            print "<ul>"
+
+    for log_entry in sorted(log_entries):
+        if (p == 0 and log_entry[0] == "Feature") or (p == 1 and log_entry[0] != "Feature"):
+            print format_logentry(log_entry)
+
+    if not_empty:
+	if args.html:
+            print "</ul>"
+
+        print ""
+
+sys.exit(0)

From 80802dbda278661f75213eafc72b2ba01a906028 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 16:38:46 +0200
Subject: [PATCH 2332/2920] defaults.less: fix missing link hover underline

---
 public/css/icinga/defaults.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less
index f2db2ad50..5b5a0f805 100644
--- a/public/css/icinga/defaults.less
+++ b/public/css/icinga/defaults.less
@@ -72,7 +72,7 @@ a {
   @colorMainLink;
   text-decoration: none;
 
-  :hover {
+  &:hover {
     text-decoration: underline;
   }
 }

From ffd27e84d62f8a5162df548286d7e230cd3d1eea Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 16:39:09 +0200
Subject: [PATCH 2333/2920] login.less: no text-variant for header

---
 public/css/icinga/login.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index 5bc21d940..a24265e88 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -50,6 +50,7 @@
     margin-left: 2.3em;
     border: none;
     color: @colorTextDefault;
+    font-variant: unset;
   }
 
   .form div.element {

From 76a32f769eb92160f51d76792647db45aacbf59a Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 16:39:34 +0200
Subject: [PATCH 2334/2920] main-content.less: larger default avp th column

---
 public/css/icinga/main-content.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 4464ab189..41939c1c6 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -46,7 +46,7 @@ table.avp a {
 table.avp > tbody > tr > th {
   text-align: left;
   margin: 0;
-  width: 10em;
+  width: 14em;
   vertical-align: top;
   line-height: 1.8em;
 }

From 1cabe955061be5bf4ada2c6246b93a5b9b8a60f8 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 16:41:58 +0200
Subject: [PATCH 2335/2920] setup.less: no underlined h1

---
 public/css/icinga/setup.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index 26c4b4e64..5e3e463e6 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -35,6 +35,7 @@
           color: white;
           font-size: 0.9em;
           text-align: center;
+          border-bottom: none;
         }
 
         table {

From fb9641fb3c0e888dec7bd6f69ee55c6217cba241 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 16:42:27 +0200
Subject: [PATCH 2336/2920] Controller: Validate restriction columns

---
 library/Icinga/Data/Filter/FilterChain.php    | 39 +++++++++++++++++++
 .../library/Monitoring/Controller.php         | 35 ++++++++++++++++-
 2 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Data/Filter/FilterChain.php b/library/Icinga/Data/Filter/FilterChain.php
index 19a170c19..51d511785 100644
--- a/library/Icinga/Data/Filter/FilterChain.php
+++ b/library/Icinga/Data/Filter/FilterChain.php
@@ -4,6 +4,7 @@
 namespace Icinga\Data\Filter;
 
 use Icinga\Exception\ProgrammingError;
+use Icinga\Exception\QueryException;
 
 /**
  * FilterChain
@@ -18,6 +19,8 @@ abstract class FilterChain extends Filter
 
     protected $operatorSymbol;
 
+    protected $allowedColumns;
+
     public function hasId($id)
     {
         foreach ($this->filters() as $filter) {
@@ -116,6 +119,12 @@ abstract class FilterChain extends Filter
         return $this->operatorSymbol;
     }
 
+    public function setAllowedFilterColumns(array $columns)
+    {
+        $this->allowedColumns = $columns;
+        return $this;
+    }
+
     public function listFilteredColumns()
     {
         $columns = array();
@@ -196,11 +205,41 @@ abstract class FilterChain extends Filter
 
     public function addFilter(Filter $filter)
     {
+        if (! empty($this->allowedColumns)) {
+            $this->validateFilterColumns($filter);
+        }
+
         $this->filters[] = $filter;
         $filter->setId($this->getId() . '-' . $this->count());
         return $this;
     }
 
+    protected function validateFilterColumns(Filter $filter)
+    {
+        if ($filter->isExpression()) {
+            $valid = false;
+            foreach ($this->allowedColumns as $column) {
+                if (is_callable($column)) {
+                    if (call_user_func($column, $filter->getColumn())) {
+                        $valid = true;
+                        break;
+                    }
+                } elseif ($filter->getColumn() === $column) {
+                    $valid = true;
+                    break;
+                }
+            }
+
+            if (! $valid) {
+                throw new QueryException('Invalid filter column provided: %s', $filter->getColumn());
+            }
+        } else {
+            foreach ($filter->filters() as $subFilter) {
+                $this->validateFilterColumns($subFilter);
+            }
+        }
+    }
+
     public function &filters()
     {
         return $this->filters;
diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php
index b6b65fc0c..c3449e01d 100644
--- a/modules/monitoring/library/Monitoring/Controller.php
+++ b/modules/monitoring/library/Monitoring/Controller.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\Module\Monitoring;
 
+use Icinga\Exception\ConfigurationError;
+use Icinga\Exception\QueryException;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Filterable;
 use Icinga\File\Csv;
@@ -52,16 +54,45 @@ class Controller extends IcingaWebController
      * Apply a restriction on the given data view
      *
      * @param   string      $restriction    The name of restriction
-     * @param   Filterable  $filterable     The filterable to restrict
+     * @param   Filterable  $view           The filterable to restrict
      *
      * @return  Filterable  The filterable
      */
     protected function applyRestriction($restriction, Filterable $view)
     {
         $restrictions = Filter::matchAny();
+        $restrictions->setAllowedFilterColumns(array(
+            'host_name',
+            'hostgroup_name',
+            'service_description',
+            'servicegroup_name',
+            function ($c) {
+                return preg_match('/^_(?:host|service)_/', $c);
+            }
+        ));
+
         foreach ($this->getRestrictions($restriction) as $filter) {
-            $restrictions->addFilter(Filter::fromQueryString($filter));
+            try {
+                $restrictions->addFilter(Filter::fromQueryString($filter));
+            } catch (QueryException $e) {
+                throw new ConfigurationError(
+                    $this->translate(
+                        'Cannot apply restriction %s using the filter %s. You can only use the following columns: %s'
+                    ),
+                    $restriction,
+                    $filter,
+                    implode(', ', array(
+                        'host_name',
+                        'hostgroup_name',
+                        'service_description',
+                        'servicegroup_name',
+                        '_(host|service)_<customvar-name>'
+                    )),
+                    $e
+                );
+            }
         }
+
         $view->applyFilter($restrictions);
         return $view;
     }

From f5554b6aa05567db1c3085f921ef47df743b666f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 16:43:12 +0200
Subject: [PATCH 2337/2920] IdoQuery: Handle non translated customvars properly

---
 .../library/Monitoring/Backend/Ido/Query/IdoQuery.php         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index 5b42ebd58..1ce089be5 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -872,7 +872,9 @@ abstract class IdoQuery extends DbQuery
 
     protected function getCustomvarColumnName($customvar)
     {
-        return $this->customVars[strtolower($customvar)] . '.varvalue';
+        if (isset($this->customVars[($customvar = strtolower($customvar))])) {
+            $this->customVars[strtolower($customvar)] . '.varvalue';
+        }
     }
 
     public function aliasToColumnName($alias)

From da8d0a46fd3c0741cafe2c42107d06f15cc6ba07 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 16:47:49 +0200
Subject: [PATCH 2338/2920] monitoring/object/show: adjust font sizes / width

---
 modules/monitoring/public/css/module.less | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index c6dc3d18e..0ab15222c 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -157,7 +157,7 @@ table.avp form.object-features div.header h4 {
 table.avp {
     th {
         font-weight: normal;
-        font-size: 0.857em;
+        font-size: 0.875em;
         padding-top: 0.2em;
         padding-bottom: 0.3em;
     }
@@ -188,6 +188,8 @@ table.avp {
         label {
             font-weight: normal;
             margin-right: 0;
+            width: 14em;
+            font-size: 0.875em;
         }
 
         input {

From 02f3c333ebe83aa7dc3bd0fef1945d5b52d0d58b Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 16:53:39 +0200
Subject: [PATCH 2339/2920] monitoring/object/show: reorder elements

---
 .../application/views/scripts/host/show.phtml       | 13 ++++++++-----
 .../application/views/scripts/service/show.phtml    | 13 ++++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/host/show.phtml b/modules/monitoring/application/views/scripts/host/show.phtml
index 3c100b440..07cb09d61 100644
--- a/modules/monitoring/application/views/scripts/host/show.phtml
+++ b/modules/monitoring/application/views/scripts/host/show.phtml
@@ -11,18 +11,21 @@
 
     <table class="avp newsection">
         <tbody>
-        <?= $this->render('show/components/notes.phtml') ?>
+        <tr><td colspan="2"><h2><?= $this->translate('Problem handling') ?></h2></td></tr>
         <?= $this->render('show/components/acknowledgement.phtml') ?>
         <?= $this->render('show/components/comments.phtml') ?>
-        <?= $this->render('show/components/notifications.phtml') ?>
         <?= $this->render('show/components/downtime.phtml') ?>
-        <?= $this->render('show/components/flapping.phtml') ?>
+        <?= $this->render('show/components/notes.phtml') ?>
         <?= $this->render('show/components/actions.phtml') ?>
+        <?= $this->render('show/components/flapping.phtml') ?>
         <?= $this->render('show/components/perfdata.phtml') ?>
-        <?= $this->render('show/components/checksource.phtml') ?>
-        <?= $this->render('show/components/command.phtml') ?>
         <?= $this->render('show/components/hostgroups.phtml') ?>
+        <tr><td colspan="2"><h2><?= $this->translate('Notifications') ?></h2></td></tr>
+        <?= $this->render('show/components/notifications.phtml') ?>
         <?= $this->render('show/components/contacts.phtml') ?>
+        <tr><td colspan="2"><h2><?= $this->translate('Check execution') ?></h2></td></tr>
+        <?= $this->render('show/components/command.phtml') ?>
+        <?= $this->render('show/components/checksource.phtml') ?>
         <?= $this->render('show/components/checkstatistics.phtml') ?>
         <?= $this->render('show/components/customvars.phtml') ?>
         <?= $this->render('show/components/flags.phtml') ?>
diff --git a/modules/monitoring/application/views/scripts/service/show.phtml b/modules/monitoring/application/views/scripts/service/show.phtml
index 57e42d842..03c6b213d 100644
--- a/modules/monitoring/application/views/scripts/service/show.phtml
+++ b/modules/monitoring/application/views/scripts/service/show.phtml
@@ -11,18 +11,21 @@
 
     <table class="avp newsection">
         <tbody>
-        <?= $this->render('show/components/notes.phtml') ?>
+        <tr><td colspan="2"><h2><?= $this->translate('Problem handling') ?></h2></td></tr>
         <?= $this->render('show/components/acknowledgement.phtml') ?>
         <?= $this->render('show/components/comments.phtml') ?>
-        <?= $this->render('show/components/notifications.phtml') ?>
         <?= $this->render('show/components/downtime.phtml') ?>
+        <?= $this->render('show/components/notes.phtml') ?>
+        <?= $this->render('show/components/actions.phtml') ?>
         <?= $this->render('show/components/flapping.phtml') ?>
         <?= $this->render('show/components/perfdata.phtml') ?>
-        <?= $this->render('show/components/checksource.phtml') ?>
-        <?= $this->render('show/components/actions.phtml') ?>
-        <?= $this->render('show/components/command.phtml') ?>
         <?= $this->render('show/components/servicegroups.phtml') ?>
+        <tr><td colspan="2"><h2><?= $this->translate('Notifications') ?></h2></td></tr>
+        <?= $this->render('show/components/notifications.phtml') ?>
         <?= $this->render('show/components/contacts.phtml') ?>
+        <tr><td colspan="2"><h2><?= $this->translate('Check execution') ?></h2></td></tr>
+        <?= $this->render('show/components/command.phtml') ?>
+        <?= $this->render('show/components/checksource.phtml') ?>
         <?= $this->render('show/components/checkstatistics.phtml') ?>
         <?= $this->render('show/components/customvars.phtml') ?>
         <?= $this->render('show/components/flags.phtml') ?>

From e394e1b1118f5a9c656cbe12c9bf915db7070fd4 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@netways.de>
Date: Thu, 18 Jun 2015 17:09:45 +0200
Subject: [PATCH 2340/2920] Update ChangeLog

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 4f1410b4a..53de85231 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 ### Changes
 
 * Improve layout and look and feel in many ways
+* Apply host, service and custom variable restrictions to all monitoring objects
 * Add fullscreen mode (?showFullscreen)
 * User and group management
 * Comment and Downtime Detail View

From 664d6ea513454795b9eb5a4ba4b92f34e75aad49 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 16:54:46 +0200
Subject: [PATCH 2341/2920] Provide database upgrade scripts for rc1

---
 doc/installation.md                           |  2 +-
 .../mysql-upgrades/2.0.0beta3-2.0.0rc1.sql    | 26 ++++++++
 .../pgsql-upgrades/2.0.0beta3-2.0.0rc1.sql    | 60 +++++++++++++++++++
 3 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 etc/schema/mysql-upgrades/2.0.0beta3-2.0.0rc1.sql
 create mode 100644 etc/schema/pgsql-upgrades/2.0.0beta3-2.0.0rc1.sql

diff --git a/doc/installation.md b/doc/installation.md
index 9f021624e..5defbd6e1 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -259,7 +259,7 @@ The first release candidate of Icinga Web 2 introduces the following non-backwar
 
 * The database schema has been adjusted and the tables `icingaweb_group` and
   `icingaweb_group_membership` were altered to ensure referential integrity.
-  Please use the update script located in **etc/schema/upgrade** to update your
+  Please use the upgrade script located in **etc/schema/** to update your
   database schema
 * Users who are using PostgreSQL < v9.1 are required to upgrade their
   environment to v9.1+ as this is the new minimum required version
diff --git a/etc/schema/mysql-upgrades/2.0.0beta3-2.0.0rc1.sql b/etc/schema/mysql-upgrades/2.0.0beta3-2.0.0rc1.sql
new file mode 100644
index 000000000..630dc6d57
--- /dev/null
+++ b/etc/schema/mysql-upgrades/2.0.0beta3-2.0.0rc1.sql
@@ -0,0 +1,26 @@
+# Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+
+
+DROP TABLE `icingaweb_group_membership`;
+DROP TABLE `icingaweb_group`;
+
+CREATE TABLE `icingaweb_group`(
+  `id`     int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name`   varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `parent` int(10) unsigned NULL DEFAULT NULL,
+  `ctime`  timestamp NULL DEFAULT NULL,
+  `mtime`  timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `idx_name` (`name`),
+  CONSTRAINT `fk_icingaweb_group_parent_id` FOREIGN KEY (`parent`)
+    REFERENCES `icingaweb_group` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `icingaweb_group_membership`(
+  `group_id`   int(10) unsigned NOT NULL,
+  `username`   varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `ctime`      timestamp NULL DEFAULT NULL,
+  `mtime`      timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`group_id`,`username`),
+  CONSTRAINT `fk_icingaweb_group_membership_icingaweb_group` FOREIGN KEY (`group_id`)
+    REFERENCES `icingaweb_group` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/etc/schema/pgsql-upgrades/2.0.0beta3-2.0.0rc1.sql b/etc/schema/pgsql-upgrades/2.0.0beta3-2.0.0rc1.sql
new file mode 100644
index 000000000..ba6d3b149
--- /dev/null
+++ b/etc/schema/pgsql-upgrades/2.0.0beta3-2.0.0rc1.sql
@@ -0,0 +1,60 @@
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+DROP TABLE "icingaweb_group_membership";
+DROP TABLE "icingaweb_group";
+
+CREATE OR REPLACE FUNCTION unix_timestamp(timestamp with time zone) RETURNS bigint AS '
+        SELECT EXTRACT(EPOCH FROM $1)::bigint AS result
+' LANGUAGE sql;
+
+CREATE TABLE "icingaweb_group" (
+  "id"     serial,
+  "name"   character varying(64) NOT NULL,
+  "parent" int NULL DEFAULT NULL,
+  "ctime"  timestamp NULL DEFAULT NULL,
+  "mtime"  timestamp NULL DEFAULT NULL
+);
+
+ALTER TABLE ONLY "icingaweb_group"
+  ADD CONSTRAINT pk_icingaweb_group
+  PRIMARY KEY (
+    "id"
+);
+
+CREATE UNIQUE INDEX idx_icingaweb_group
+  ON "icingaweb_group"
+  USING btree (
+    lower((name)::text)
+);
+
+ALTER TABLE ONLY "icingaweb_group"
+  ADD CONSTRAINT fk_icingaweb_group_parent_id
+  FOREIGN KEY (
+    "parent"
+  )
+  REFERENCES "icingaweb_group" (
+    "id"
+);
+
+CREATE TABLE "icingaweb_group_membership" (
+  "group_id"   int NOT NULL,
+  "username"   character varying(64) NOT NULL,
+  "ctime"      timestamp NULL DEFAULT NULL,
+  "mtime"      timestamp NULL DEFAULT NULL
+);
+
+ALTER TABLE ONLY "icingaweb_group_membership"
+  ADD CONSTRAINT pk_icingaweb_group_membership
+  FOREIGN KEY (
+    "group_id"
+  )
+  REFERENCES "icingaweb_group" (
+    "id"
+);
+
+CREATE UNIQUE INDEX idx_icingaweb_group_membership
+  ON "icingaweb_group_membership"
+  USING btree (
+    group_id,
+    lower((username)::text)
+);

From 51749450c4ec2826d0f33b219b6af7c57db115ec Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 17:19:59 +0200
Subject: [PATCH 2342/2920] Update AUTHORS

---
 AUTHORS | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index f56d6e24d..4d58967ff 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,11 +1,13 @@
+Alexander A. Klimov <alexander.klimov@netways.de>
 Alexander Fuhr <alexander.fuhr@netways.de>
-Alexander Klimov <alexander.klimov@netways.de>
 ayoubabid <ayoubabid@users.noreply.github.com>
 baufrecht <baufrecht@users.noreply.github.com>
+Bence Nagy <bence@underyx.me>
 Bernd Erk <bernd.erk@icinga.org>
 Boden Garman <boden.garman@spintel.net.au>
 Carlos Cesario <carloscesario@gmail.com>
 Chris Rüll <christopher.ruell@netways.de>
+Daniel Shirley <aditaa@ig2ad.com>
 Davide Demuru <davide.demuru@buongiorno.com>
 Eric Lippmann <eric.lippmann@netways.de>
 Goran Rakic <grakic@devbase.net>
@@ -19,9 +21,12 @@ Markus Frosch <markus@lazyfrosch.de>
 Matthias Jentsch <matthias.jentsch@netways.de>
 Michael Friedrich <michael.friedrich@netways.de>
 Paul Richards <paul@minimoo.org>
+rbelinsky <rbelinsky@dalet.com>
 Rene Moser <rene.moser@swisstxt.ch>
+rkcpi <thieme.sandra@gmail.com>
 Susanne Vestner-Ludwig <susanne.vestner-ludwig@inserteffect.com>
 Sylph Lin <sylph.lin@gmail.com>
 Thomas Gelf <thomas.gelf@netways.de>
+Tim Helfensdörfer <tim@visualappeal.de>
 Tom Ford <exptom@users.noreply.github.com>
 Ulf Lange <mopp@gmx.net>

From 892ab4ba1fe3985cf419f7c502bb4134df131d64 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 17:04:22 +0200
Subject: [PATCH 2343/2920] monitoring/perfdata: drop left border

---
 modules/monitoring/public/css/module.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 0ab15222c..070f6c4ff 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -1227,7 +1227,6 @@ table.objectstate tr.state td.state {
 
 table.avp td.performance-data {
   padding: 0.3em 0 0.3em 1em;
-  border-left: 4px solid #d8d8d8;
 }
 
 table.perfdata {

From fb921a9518a044581e302b69f56d4e6d87fe0c47 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 17:18:25 +0200
Subject: [PATCH 2344/2920] monitoring/details: more styling

---
 .../application/views/scripts/host/show.phtml        |  2 +-
 .../application/views/scripts/service/show.phtml     |  2 +-
 modules/monitoring/public/css/module.less            | 12 ++++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/host/show.phtml b/modules/monitoring/application/views/scripts/host/show.phtml
index 07cb09d61..a612ae1af 100644
--- a/modules/monitoring/application/views/scripts/host/show.phtml
+++ b/modules/monitoring/application/views/scripts/host/show.phtml
@@ -18,8 +18,8 @@
         <?= $this->render('show/components/notes.phtml') ?>
         <?= $this->render('show/components/actions.phtml') ?>
         <?= $this->render('show/components/flapping.phtml') ?>
-        <?= $this->render('show/components/perfdata.phtml') ?>
         <?= $this->render('show/components/hostgroups.phtml') ?>
+        <?= $this->render('show/components/perfdata.phtml') ?>
         <tr><td colspan="2"><h2><?= $this->translate('Notifications') ?></h2></td></tr>
         <?= $this->render('show/components/notifications.phtml') ?>
         <?= $this->render('show/components/contacts.phtml') ?>
diff --git a/modules/monitoring/application/views/scripts/service/show.phtml b/modules/monitoring/application/views/scripts/service/show.phtml
index 03c6b213d..1fac5752f 100644
--- a/modules/monitoring/application/views/scripts/service/show.phtml
+++ b/modules/monitoring/application/views/scripts/service/show.phtml
@@ -18,8 +18,8 @@
         <?= $this->render('show/components/notes.phtml') ?>
         <?= $this->render('show/components/actions.phtml') ?>
         <?= $this->render('show/components/flapping.phtml') ?>
-        <?= $this->render('show/components/perfdata.phtml') ?>
         <?= $this->render('show/components/servicegroups.phtml') ?>
+        <?= $this->render('show/components/perfdata.phtml') ?>
         <tr><td colspan="2"><h2><?= $this->translate('Notifications') ?></h2></td></tr>
         <?= $this->render('show/components/notifications.phtml') ?>
         <?= $this->render('show/components/contacts.phtml') ?>
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 070f6c4ff..03a93ae38 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -158,8 +158,13 @@ table.avp {
     th {
         font-weight: normal;
         font-size: 0.875em;
-        padding-top: 0.2em;
-        padding-bottom: 0.3em;
+        padding-top: 0.25em;
+    }
+
+    h2 {
+        font-size: 0.875em;
+        line-height: 1.2em;
+        padding-bottom: 0.1em;
     }
 
     td {
@@ -168,6 +173,9 @@ table.avp {
         th, td {
             padding: 0;
         }
+        td {
+            line-height: 1.5em;
+        }
     }
 
     a, button.link-like {

From e78a80f184c3623a0d94d1d83b70963b2d91f8b2 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 17:20:22 +0200
Subject: [PATCH 2345/2920] monitoring/object/show: default links for groups

---
 .../application/views/scripts/show/components/hostgroups.phtml | 3 +--
 .../views/scripts/show/components/servicegroups.phtml          | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml b/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
index f4b20147d..377b56f8d 100644
--- a/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
@@ -12,9 +12,8 @@ foreach ($object->hostgroups as $name => $alias) {
     );
 }
 printf(
-    "<tr><th>%s</th><td>%s %s</td></tr>\n",
+    "<tr><th>%s</th><td class=\"go-ahead\">%s</td></tr>\n",
     $this->translate('Hostgroups'),
-    $this->icon('host'),
     implode(', ', $list)
 );
 
diff --git a/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml b/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
index 93697ce89..09ff24835 100644
--- a/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
@@ -13,9 +13,8 @@ foreach ($object->servicegroups as $name => $alias) {
 }
 
 printf(
-    "<tr><th>%s</th><td>%s %s</td></tr>\n",
+    "<tr><th>%s</th><td class=\"go-ahead\">%s</td></tr>\n",
     $this->translate('Servicegroups'),
-    $this->icon('services'),
     implode(', ', $list)
 );
 

From 14340587fad4dcf4e9353d7fe4d83bb6c35f63aa Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 17:21:55 +0200
Subject: [PATCH 2346/2920] monitoring/css: fix inverted td style

---
 modules/monitoring/public/css/module.less | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 03a93ae38..18955040d 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -170,12 +170,10 @@ table.avp {
     td {
         color: #666;
         padding-bottom: 0.3em;
+        line-height: 1.5em;
         th, td {
             padding: 0;
         }
-        td {
-            line-height: 1.5em;
-        }
     }
 
     a, button.link-like {

From 7f6baea28d7e76a050623c36a6e85a92c9e19659 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 18 Jun 2015 17:29:16 +0200
Subject: [PATCH 2347/2920] module.less: quickfix for hostgroups

---
 modules/monitoring/public/css/module.less | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 18955040d..888925fa2 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -350,6 +350,11 @@ tr.state a {
   color: #222;
 }
 
+/* Hostgroup badge quickfix */
+tr.state span a {
+  color: inherit;
+}
+
 tr.state:hover a {
   color: inherit;
 }

From 9b14fffc338b27c66fc480458686841861328b20 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 18 Jun 2015 17:31:50 +0200
Subject: [PATCH 2348/2920] Add missing class attribute

---
 modules/monitoring/application/views/scripts/list/hosts.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 67508633d..15dbb5a6f 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -54,7 +54,7 @@ if (count($hosts) === 0) {
       <!-- Host / Status / Output -->
       <td>
         <?= $this->iconImage()->host($host) ?>
-        <span="objectflags"><?= implode(' ', $this->hostFlags($host)) ?></span>
+        <span class="objectflags"><?= implode(' ', $this->hostFlags($host)) ?></span>
         <?= $this->qlink(
           $host->host_display_name,
           $hostLink,

From d5ae13541553000a8501ac0b19e50bd2f3e9b19a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 19 Jun 2015 14:05:12 +0200
Subject: [PATCH 2349/2920] DbQuery: Add select() method to access
 self::$select publicly

---
 library/Icinga/Data/Db/DbQuery.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index c6809ea61..d25058235 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -125,6 +125,16 @@ class DbQuery extends SimpleQuery
         return clone $this->select;
     }
 
+    /**
+     * Return the underlying select
+     *
+     * @return  Zend_Db_Select
+     */
+    public function select()
+    {
+        return $this->select;
+    }
+
     /**
      * Get the select query
      *

From 3b05c625757b2c190086426484a6dcb45a3fb3e3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 19 Jun 2015 14:06:02 +0200
Subject: [PATCH 2350/2920] IdoQuery: Fix method addFilter()

---
 .../library/Monitoring/Backend/Ido/Query/IdoQuery.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index 1ce089be5..c5e9e5333 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -481,7 +481,7 @@ abstract class IdoQuery extends DbQuery
     public function addFilter(Filter $filter)
     {
         $this->requireFilterColumns($filter);
-        parent::addFilter($filter);
+        return parent::addFilter($filter);
     }
 
     /**

From 5166ede38f1d9f3d228f6bbe1cf5f3241b6b19ff Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 19 Jun 2015 14:08:32 +0200
Subject: [PATCH 2351/2920] Fix that ghost groups are shown in the host- and
 servicegroup summary

fixes #9454
refs #9458
---
 .../Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php      | 2 ++
 .../Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
index e3524fc58..b35f50a19 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
@@ -96,6 +96,7 @@ class HostgroupsummaryQuery extends IdoQuery
                 'state_change'  => 'host_last_state_change'
             )
         );
+        $hosts->select()->where('hgo.name1 IS NOT NULL'); // TODO(9458): Should be possible using our filters!
         $this->subQueries[] = $hosts;
         $services = $this->createSubQuery(
             'Servicestatus',
@@ -110,6 +111,7 @@ class HostgroupsummaryQuery extends IdoQuery
                 'state_change'  => 'service_last_state_change'
             )
         );
+        $services->select()->where('hgo.name1 IS NOT NULL'); // TODO(9458): Should be possible using our filters!
         $this->subQueries[] = $services;
         $this->summaryQuery = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL);
         $this->select->from(array('statussummary' => $this->summaryQuery), array());
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php
index f7519edc7..a4c763562 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupsummaryQuery.php
@@ -88,6 +88,7 @@ class ServicegroupsummaryQuery extends IdoQuery
                 'state_change'  => 'host_last_state_change'
             )
         );
+        $hosts->select()->where('sgo.name1 IS NOT NULL'); // TODO(9458): Should be possible using our filters!
         $this->subQueries[] = $hosts;
         $services = $this->createSubQuery(
             'Servicestatus',
@@ -102,6 +103,7 @@ class ServicegroupsummaryQuery extends IdoQuery
                 'state_change'  => 'service_last_state_change'
             )
         );
+        $services->select()->where('sgo.name1 IS NOT NULL'); // TODO(9458): Should be possible using our filters!
         $this->subQueries[] = $services;
         $this->summaryQuery = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL);
         $this->select->from(array('statussummary' => $this->summaryQuery), array());

From 44e7fcf2951c5094ea17e60fcc65b9aceceee968 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 19 Jun 2015 15:12:08 +0200
Subject: [PATCH 2352/2920] Improve the look of boxview headings

---
 .../views/scripts/list/contactgroups.phtml    |  6 +-
 .../components/hostservicechecks.phtml        |  4 +-
 .../components/monitoringfeatures.phtml       |  4 +-
 .../tactical/components/ok_hosts.phtml        | 66 ++++++++---------
 .../tactical/components/problem_hosts.phtml   | 72 ++++++++++---------
 modules/monitoring/public/css/module.less     | 30 ++++----
 6 files changed, 96 insertions(+), 86 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index 5e3b038a7..3030d4224 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -18,10 +18,12 @@ if (count($groupData) === 0) {
     <div class="boxview" data-base-target="_next">
 <?php foreach ($groupData as $groupName => $groupInfo): ?>
         <div class="box contactgroup">
-            <h2><?= $groupInfo['alias']; ?></h2>
+            <div class="box header">
+                <h2><?= $groupInfo['alias']; ?></h2>
 <?php if ($groupInfo['alias'] !== $groupName): ?>
-            <h2><?= $groupName; ?></h2>
+                <h2><?= $groupName; ?></h2>
 <?php endif ?>
+            </div>
             <div class="box contents">
 <?php foreach ($groupInfo['contacts'] as $c): ?>
                 <div class="box entry">
diff --git a/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml b/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml
index b85199962..af727bc12 100644
--- a/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml
@@ -1,5 +1,7 @@
 <div class="box hostservicechecks">
-    <h2><?= $this->translate('Host and Service Checks'); ?></h2>
+    <div class="box header">
+        <h2><?= $this->translate('Host and Service Checks'); ?></h2>
+    </div>
     <div class="box contents">
         <table>
             <thead>
diff --git a/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml b/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml
index a67e9057c..c3a16ae2a 100644
--- a/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml
@@ -1,5 +1,7 @@
 <div class="box monitoringfeatures">
-    <h2><?= $this->translate('Monitoring Features'); ?></h2>
+    <div class="box header">
+        <h2><?= $this->translate('Monitoring Features'); ?></h2>
+    </div>
     <div class="box contents">
 <?php if ($this->statusSummary->hosts_without_flap_detection || $this->statusSummary->services_without_flap_detection ||
     $this->statusSummary->hosts_flapping || $this->statusSummary->services_flapping): ?>
diff --git a/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml b/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml
index 8deebf19e..7f25b6e5f 100644
--- a/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml
@@ -9,42 +9,44 @@ $service_problems = (
 );
 ?>
 <div class="box ok_hosts state_<?= $this->statusSummary->hosts_up ? 'up' : 'pending'; ?>">
-<?php if ($this->statusSummary->hosts_up): ?>
-    <h2><?= $this->qlink(
-        sprintf(
-            $this->translatePlural('%u Host UP', '%u Hosts UP', $this->statusSummary->hosts_up),
-            $this->statusSummary->hosts_up
-        ),
-        'monitoring/list/hosts',
-        array('host_state' => 0),
-        array('title' => sprintf(
-            $this->translatePlural(
-                'List %u host that is currently in state UP',
-                'List %u hosts which are currently in state UP',
+    <div class="box header">
+    <?php if ($this->statusSummary->hosts_up): ?>
+        <h2><?= $this->qlink(
+            sprintf(
+                $this->translatePlural('%u Host UP', '%u Hosts UP', $this->statusSummary->hosts_up),
                 $this->statusSummary->hosts_up
             ),
-            $this->statusSummary->hosts_up
-        ))
-    ); ?></h2>
-<?php endif ?>
-<?php if ($this->statusSummary->hosts_pending): ?>
-    <h2><?= $this->qlink(
-        sprintf(
-            $this->translatePlural('%u Host PENDING', '%u Hosts PENDING', $this->statusSummary->hosts_pending),
-            $this->statusSummary->hosts_pending
-        ),
-        'monitoring/list/hosts',
-        array('host_state' => 99),
-        array('title' => sprintf(
-            $this->translatePlural(
-                'List %u host that is currently in state PENDING',
-                'List %u hosts which are currently in state PENDING',
+            'monitoring/list/hosts',
+            array('host_state' => 0),
+            array('title' => sprintf(
+                $this->translatePlural(
+                    'List %u host that is currently in state UP',
+                    'List %u hosts which are currently in state UP',
+                    $this->statusSummary->hosts_up
+                ),
+                $this->statusSummary->hosts_up
+            ))
+        ); ?></h2>
+    <?php endif ?>
+    <?php if ($this->statusSummary->hosts_pending): ?>
+        <h2><?= $this->qlink(
+            sprintf(
+                $this->translatePlural('%u Host PENDING', '%u Hosts PENDING', $this->statusSummary->hosts_pending),
                 $this->statusSummary->hosts_pending
             ),
-            $this->statusSummary->hosts_pending
-        ))
-    ); ?></h2>
-<?php endif ?>
+            'monitoring/list/hosts',
+            array('host_state' => 99),
+            array('title' => sprintf(
+                $this->translatePlural(
+                    'List %u host that is currently in state PENDING',
+                    'List %u hosts which are currently in state PENDING',
+                    $this->statusSummary->hosts_pending
+                ),
+                $this->statusSummary->hosts_pending
+            ))
+        ); ?></h2>
+    <?php endif ?>
+    </div>
 <?php if ($service_problems || $this->statusSummary->hosts_down || $this->statusSummary->hosts_unreachable): ?>
     <div class="box contents">
         <strong><?= $this->translate('Services'); ?></strong>
diff --git a/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml b/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml
index bab0cfc8e..faeb98668 100644
--- a/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml
+++ b/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml
@@ -4,46 +4,48 @@
         echo ' handled';
     }
 ?>">
-<?php if ($this->statusSummary->hosts_down): ?>
-    <h2><?= $this->qlink(
-        sprintf(
-            $this->translatePlural('%u Host DOWN', '%u Hosts DOWN', $this->statusSummary->hosts_down),
-            $this->statusSummary->hosts_down
-        ),
-        'monitoring/list/hosts',
-        array('host_state' => 1),
-        array('title' => sprintf(
-            $this->translatePlural(
-                'List %u host that is currently in state DOWN',
-                'List %u hosts which are currently in state DOWN',
+    <div class="box header">
+    <?php if ($this->statusSummary->hosts_down): ?>
+        <h2><?= $this->qlink(
+            sprintf(
+                $this->translatePlural('%u Host DOWN', '%u Hosts DOWN', $this->statusSummary->hosts_down),
                 $this->statusSummary->hosts_down
             ),
-            $this->statusSummary->hosts_down
-        ))
-    ); ?></h2>
-<?php endif ?>
-<?php if ($this->statusSummary->hosts_unreachable): ?>
-    <h2><?= $this->qlink(
-        sprintf(
-            $this->translatePlural(
-                '%u Host UNREACHABLE',
-                '%u Hosts UNREACHABLE',
+            'monitoring/list/hosts',
+            array('host_state' => 1),
+            array('title' => sprintf(
+                $this->translatePlural(
+                    'List %u host that is currently in state DOWN',
+                    'List %u hosts which are currently in state DOWN',
+                    $this->statusSummary->hosts_down
+                ),
+                $this->statusSummary->hosts_down
+            ))
+        ); ?></h2>
+    <?php endif ?>
+    <?php if ($this->statusSummary->hosts_unreachable): ?>
+        <h2><?= $this->qlink(
+            sprintf(
+                $this->translatePlural(
+                    '%u Host UNREACHABLE',
+                    '%u Hosts UNREACHABLE',
+                    $this->statusSummary->hosts_unreachable
+                ),
                 $this->statusSummary->hosts_unreachable
             ),
-            $this->statusSummary->hosts_unreachable
-        ),
-        'monitoring/list/hosts',
-        array('host_state' => 2),
-        array('title' => sprintf(
-            $this->translatePlural(
-                'List %u host that is currently in state UNREACHABLE',
-                'List %u hosts which are currently in state UNREACHABLE',
+            'monitoring/list/hosts',
+            array('host_state' => 2),
+            array('title' => sprintf(
+                $this->translatePlural(
+                    'List %u host that is currently in state UNREACHABLE',
+                    'List %u hosts which are currently in state UNREACHABLE',
+                    $this->statusSummary->hosts_unreachable
+                ),
                 $this->statusSummary->hosts_unreachable
-            ),
-            $this->statusSummary->hosts_unreachable
-        ))
-    ); ?></h2>
-<?php endif ?>
+            ))
+        ); ?></h2>
+    <?php endif ?>
+    </div>
     <div class="box contents">
         <strong><?= $this->translate('Services'); ?></strong>
         <?= $this->partial(
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 888925fa2..406031c19 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -531,39 +531,39 @@ a.critical {
   background: #eee;
 }
 
-/* Box caption */
-.boxview div.box h2 {
-  margin-top: 0;
-  margin-bottom: 0.6em;
+/* Box header */
+.boxview div.box.header {
+  padding-bottom: 0.5em;
+  margin-bottom: 0.5em;
+  border-bottom: 1px solid #888;
+}
+
+.boxview div.box.header h2 {
+  margin-top: 0.1em;
+  margin-bottom: 0;
   font-size: 0.8em;
+  border-bottom: none;
   color: @colorTextDefault;
 }
 
-.boxview div.box h2:first-child {
+.boxview div.box.header h2:first-child {
   margin-top: 0.2em;
-  padding-bottom: 0.5em;
   font-size: inherit;
   color: @colorTextDefault;
-  border-bottom: 1px solid #d9d9d9;
 }
 
-.boxview div.box h2 > a {
+.boxview div.box.header h2 > a {
   color: inherit;
-  margin-bottom: 0.2em;
 }
 
-.boxview div.box h2 > a:hover {
+.boxview div.box.header h2 > a:hover {
   text-decoration: underline;
 }
 
-.boxview div.box h2:first-child > a:hover {
-}
-
-.boxview div.box h3 {
+.boxview div.box.header h3 {
   line-height: 1.5em;
   font-size: 0.9em;
   color: #555;
-  border-bottom: 1px solid #d9d9d9;
 }
 
 /* Box body of contents */

From f5e30a84f1ca8d996cc69f818e0983e0d1bf9adf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 19 Jun 2015 15:44:43 +0200
Subject: [PATCH 2353/2920] Improve the look of headings in the setup wizard

---
 .../views/scripts/form/setup-welcome.phtml        |  4 +---
 public/css/icinga/setup.less                      | 15 +++++----------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/modules/setup/application/views/scripts/form/setup-welcome.phtml b/modules/setup/application/views/scripts/form/setup-welcome.phtml
index 9a4c631fa..585353a79 100644
--- a/modules/setup/application/views/scripts/form/setup-welcome.phtml
+++ b/modules/setup/application/views/scripts/form/setup-welcome.phtml
@@ -66,9 +66,7 @@ if (! (false === ($distro = Platform::getLinuxDistro(1)) || $distro === 'linux')
     </div>
   </form>
   <div class="note">
-    <div class="title">
-      <strong>Generating a New Setup Token</strong>
-    </div>
+    <h3>Generating a New Setup Token</h3>
     <div>
       <p><?=
         $this->translate(
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index 5e3e463e6..0cc291a78 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -103,8 +103,6 @@
     form {
       h2 {
         font-size: 2.0em;
-        color: @colorTextDefault;
-        border-bottom: 2px solid @colorPetrol;
       }
     }
   }
@@ -171,7 +169,7 @@
 form#setup_requirements {
   margin-top: 2em;
   padding-top: 0.5em;
-  border-top: 2px solid @colorPetrol;
+  border-top: 1px solid #888;
 
   div.buttons div.requirements-refresh {
     width: 25%;
@@ -198,6 +196,8 @@ form#setup_requirements {
 
     h2 {
       margin: 0 1em 0 0;
+      font-variant: normal;
+      border-bottom: 0;
     }
 
     table {
@@ -353,10 +353,7 @@ form#setup_requirements {
 
   h2 {
     font-size: 2.0em;
-    color: @colorTextDefault;
-    border-bottom: 2px solid @colorPetrol;
     margin-bottom: 2em;
-
   }
 
   div.info {
@@ -377,14 +374,12 @@ form#setup_requirements {
     font-size: 0.9em;
     border: 1px solid lightgrey;
 
-    div.title {
-      color: white;
+    h3 {
       padding: 0.2em;
       margin: -1em -1em 1em;
       text-align: center;
       color: @colorTextDefault;
-      border-bottom: 2px solid @colorPetrol;
-
+      background-color: #f6fafa;
     }
 
     img {

From d3dd88a925ea65646c405aaa67764c038843f0d0 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 22 Jun 2015 09:46:03 +0200
Subject: [PATCH 2354/2920] Add alternating table layout to module views

---
 application/views/scripts/config/modules.phtml                | 2 +-
 .../monitoring/application/views/scripts/config/index.phtml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/views/scripts/config/modules.phtml b/application/views/scripts/config/modules.phtml
index 2abf16fc6..9cf22c026 100644
--- a/application/views/scripts/config/modules.phtml
+++ b/application/views/scripts/config/modules.phtml
@@ -8,7 +8,7 @@
 </div>
 <?php endif ?>
 <div class="content">
-  <table class="action" data-base-target="_next">
+  <table class="action alternating" data-base-target="_next">
     <tbody>
     <?php foreach ($modules as $module): ?>
       <tr>
diff --git a/modules/monitoring/application/views/scripts/config/index.phtml b/modules/monitoring/application/views/scripts/config/index.phtml
index 201a09dae..c985805eb 100644
--- a/modules/monitoring/application/views/scripts/config/index.phtml
+++ b/modules/monitoring/application/views/scripts/config/index.phtml
@@ -9,7 +9,7 @@
       <?= $this->icon('plus'); ?> <?= $this->translate('Create New Monitoring Backend'); ?>
     </a>
   </p>
-  <table class="action">
+  <table class="action alternating">
     <thead>
       <th><?= $this->translate('Monitoring Backend'); ?></th>
       <th style="width: 5em"><?= $this->translate('Remove'); ?></th>
@@ -53,7 +53,7 @@
       <?= $this->icon('plus'); ?> <?= $this->translate('Create New Instance'); ?>
     </a>
   </p>
-  <table class="action">
+  <table class="action alternating">
     <thead>
       <th><?= $this->translate('Instance'); ?></th>
       <th style="width: 5em"><?= $this->translate('Remove'); ?></th>

From bb0ed20200bf88c8114751be2923a5126e51e7e0 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 22 Jun 2015 12:03:56 +0200
Subject: [PATCH 2355/2920] Assure to install icingacli in installation doc

Make sure that icingacli is installed when following the instructions in installation.md, since those commands are needed by later instructions.
---
 doc/installation.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/installation.md b/doc/installation.md
index 5defbd6e1..fe3adf5f4 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -90,21 +90,22 @@ The packages for RHEL/CentOS depend on other packages which are distributed as p
 ### <a id="installing-from-package-example"></a> Installing Icinga Web 2
 
 You can install Icinga Web 2 by using your distribution's package manager to install the `icingaweb2` package.
-Below is a list with examples for various distributions.
+Below is a list with examples for various distributions. The additional package `icingacli` is necessary
+for being able to follow further steps in this guide.
 
 Debian and Ubuntu:
 ````
-apt-get install icingaweb2
+apt-get install icingaweb2 icingacli
 ````
 
 RHEL, CentOS and Fedora:
 ````
-yum install icingaweb2
+yum install icingaweb2 icingacli
 ````
 
 SLES and openSUSE:
 ````
-zypper install icingaweb2
+zypper install icingaweb2 icingacli
 ````
 
 ### <a id="preparing-web-setup-from-package"></a> Preparing Web Setup

From d36f90d8cb0c9cb96b82524319eb402a0c9440b8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 22 Jun 2015 13:26:24 +0200
Subject: [PATCH 2356/2920] Navigation: Restructure authentication backend
 configuration

This moves the configuration tabs for user and group backends into
a dedicated menu entry called "Authentication". All tabs previously
available in this menu entry were moved into their own dedicated
menu entry as well to not to confuse users.

fixes #9398
---
 application/controllers/ConfigController.php  | 95 ++++++++-----------
 application/controllers/GroupController.php   | 19 ++++
 application/controllers/RoleController.php    | 20 ++++
 application/controllers/UserController.php    | 19 ++++
 .../UsergroupbackendController.php            | 39 ++------
 .../Web/Controller/AuthBackendController.php  | 64 +------------
 library/Icinga/Web/Menu.php                   | 17 +++-
 7 files changed, 125 insertions(+), 148 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 0f3d7d1ed..f077dfe02 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -22,55 +22,41 @@ use Icinga\Web\Widget;
 class ConfigController extends Controller
 {
     /**
-     * The first allowed config action according to the user's permissions
-     *
-     * @var string
+     * Create and return the tabs to display when showing application configuration
      */
-    protected $firstAllowedAction;
-
-    /**
-     * Initialize tabs and validate the user's permissions
-     *
-     * @throws SecurityException    If the user does not have any configuration permission
-     */
-    public function init()
+    public function createApplicationTabs()
     {
         $tabs = $this->getTabs();
-        $auth = $this->Auth();
-        $allowedActions = array();
-        if ($auth->hasPermission('config/application/general')) {
-            $tabs->add('general', array(
-                'title' => $this->translate('Adjust the general configuration of Icinga Web 2'),
-                'label' => $this->translate('General'),
-                'url'   => 'config/general'
-            ));
-            $allowedActions[] = 'general';
-        }
-        if ($auth->hasPermission('config/application/resources')) {
-            $tabs->add('resource', array(
-                'title' => $this->translate('Configure which resources are being utilized by Icinga Web 2'),
-                'label' => $this->translate('Resources'),
-                'url'   => 'config/resource'
-            ));
-            $allowedActions[] = 'resource';
-        }
-        if ($auth->hasPermission('config/application/userbackend')) {
-            $tabs->add('userbackend', array(
-                'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'),
-                'label' => $this->translate('Authentication'),
-                'url'   => 'config/userbackend'
-            ));
-            $allowedActions[] = 'userbackend';
-        }
-        if ($auth->hasPermission('config/application/usergroupbackend')) {
-            $tabs->add('usergroupbackend', array(
-                'title' => $this->translate('Configure how users are associated with groups by Icinga Web 2'),
-                'label' => $this->translate('User Groups'),
-                'url'   => 'usergroupbackend/list'
-            ));
-            $allowedActions[] = 'usergroupbackend';
-        }
-        $this->firstAllowedAction = array_shift($allowedActions);
+        $tabs->add('general', array(
+            'title' => $this->translate('Adjust the general configuration of Icinga Web 2'),
+            'label' => $this->translate('General'),
+            'url'   => 'config/general'
+        ));
+        $tabs->add('resource', array(
+            'title' => $this->translate('Configure which resources are being utilized by Icinga Web 2'),
+            'label' => $this->translate('Resources'),
+            'url'   => 'config/resource'
+        ));
+        return $tabs;
+    }
+
+    /**
+     * Create and return the tabs to display when showing authentication configuration
+     */
+    public function createAuthenticationTabs()
+    {
+        $tabs = $this->getTabs();
+        $tabs->add('userbackend', array(
+            'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'),
+            'label' => $this->translate('User Backends'),
+            'url'   => 'config/userbackend'
+        ));
+        $tabs->add('usergroupbackend', array(
+            'title' => $this->translate('Configure how users are associated with groups by Icinga Web 2'),
+            'label' => $this->translate('Usergroup Backends'),
+            'url'   => 'usergroupbackend/list'
+        ));
+        return $tabs;
     }
 
     public function devtoolsAction()
@@ -79,15 +65,11 @@ class ConfigController extends Controller
     }
 
     /**
-     * Forward or redirect to the first allowed configuration action
+     * Redirect to the general configuration
      */
     public function indexAction()
     {
-        if ($this->firstAllowedAction === null) {
-            throw new SecurityException($this->translate('No permission for application configuration'));
-        }
-
-        $this->redirectNow($this->getTabs()->get($this->firstAllowedAction)->getUrl());
+        $this->redirectNow('config/general');
     }
 
     /**
@@ -103,7 +85,7 @@ class ConfigController extends Controller
         $form->handleRequest();
 
         $this->view->form = $form;
-        $this->view->tabs->activate('general');
+        $this->createApplicationTabs()->activate('general');
     }
 
     /**
@@ -206,7 +188,7 @@ class ConfigController extends Controller
         $form->handleRequest();
 
         $this->view->form = $form;
-        $this->view->tabs->activate('userbackend');
+        $this->createAuthenticationTabs()->activate('userbackend');
         $this->render('userbackend/reorder');
     }
 
@@ -228,7 +210,6 @@ class ConfigController extends Controller
         $form->handleRequest();
 
         $this->view->form = $form;
-        $this->view->tabs->activate('userbackend');
         $this->render('userbackend/create');
     }
 
@@ -247,7 +228,6 @@ class ConfigController extends Controller
         $form->handleRequest();
 
         $this->view->form = $form;
-        $this->view->tabs->activate('userbackend');
         $this->render('userbackend/modify');
     }
 
@@ -286,7 +266,6 @@ class ConfigController extends Controller
         $form->handleRequest();
 
         $this->view->form = $form;
-        $this->view->tabs->activate('userbackend');
         $this->render('userbackend/remove');
     }
 
@@ -297,7 +276,7 @@ class ConfigController extends Controller
     {
         $this->assertPermission('config/application/resources');
         $this->view->resources = Config::app('resources', true)->keys();
-        $this->view->tabs->activate('resource');
+        $this->createApplicationTabs()->activate('resource');
     }
 
     /**
diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index fc881a3cf..ed30aac86 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -347,4 +347,23 @@ class GroupController extends AuthBackendController
 
         return $tabs;
     }
+
+    /**
+     * Create the tabs to display when listing groups
+     */
+    protected function createListTabs()
+    {
+        $tabs = $this->getTabs();
+        $tabs->add(
+            'group/list',
+            array(
+                'title'     => $this->translate('List groups of user group backends'),
+                'label'     => $this->translate('Usergroups'),
+                'icon'      => 'users',
+                'url'       => 'group/list'
+            )
+        );
+
+        return $tabs;
+    }
 }
diff --git a/application/controllers/RoleController.php b/application/controllers/RoleController.php
index 0384009ec..bae4cad88 100644
--- a/application/controllers/RoleController.php
+++ b/application/controllers/RoleController.php
@@ -152,4 +152,24 @@ class RoleController extends AuthBackendController
         $this->view->form = $confirmation;
         $this->render('form');
     }
+
+    /**
+     * Create the tabs to display when listing roles
+     */
+    protected function createListTabs()
+    {
+        $tabs = $this->getTabs();
+        $tabs->add(
+            'role/list',
+            array(
+                'title' => $this->translate(
+                    'Configure roles to permit or restrict users and groups accessing Icinga Web 2'
+                ),
+                'label' => $this->translate('Roles'),
+                'url'   => 'role/list'
+            )
+        );
+
+        return $tabs;
+    }
 }
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 4c6d5dfe9..eaff798df 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -306,4 +306,23 @@ class UserController extends AuthBackendController
 
         return $tabs;
     }
+
+    /**
+     * Create the tabs to display when listing users
+     */
+    protected function createListTabs()
+    {
+        $tabs = $this->getTabs();
+        $tabs->add(
+            'user/list',
+            array(
+                'title'     => $this->translate('List users of authentication backends'),
+                'label'     => $this->translate('Users'),
+                'icon'      => 'user',
+                'url'       => 'user/list'
+            )
+        );
+
+        return $tabs;
+    }
 }
diff --git a/application/controllers/UsergroupbackendController.php b/application/controllers/UsergroupbackendController.php
index d1c0efc63..477c1b28d 100644
--- a/application/controllers/UsergroupbackendController.php
+++ b/application/controllers/UsergroupbackendController.php
@@ -153,35 +153,16 @@ class UsergroupbackendController extends Controller
     protected function createListTabs()
     {
         $tabs = $this->getTabs();
-        if ($this->hasPermission('config/application/general')) {
-            $tabs->add('general', array(
-                'title' => $this->translate('Adjust the general configuration of Icinga Web 2'),
-                'label' => $this->translate('General'),
-                'url'   => 'config/general'
-            ));
-        }
-        if ($this->hasPermission('config/application/resources')) {
-            $tabs->add('resource', array(
-                'title' => $this->translate('Configure which resources are being utilized by Icinga Web 2'),
-                'label' => $this->translate('Resources'),
-                'url'   => 'config/resource'
-            ));
-        }
-        if ($this->hasPermission('config/application/userbackend')) {
-            $tabs->add('userbackend', array(
-                'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'),
-                'label' => $this->translate('Authentication'),
-                'url'   => 'config/userbackend'
-            ));
-        }
-        if ($this->hasPermission('config/application/usergroupbackend')) {
-            $tabs->add('usergroupbackend', array(
-                'title' => $this->translate('Configure how users are associated with groups by Icinga Web 2'),
-                'label' => $this->translate('User Groups'),
-                'url'   => 'usergroupbackend/list'
-            ));
-        }
-
+        $tabs->add('userbackend', array(
+            'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'),
+            'label' => $this->translate('User Backends'),
+            'url'   => 'config/userbackend'
+        ));
+        $tabs->add('usergroupbackend', array(
+            'title' => $this->translate('Configure how users are associated with groups by Icinga Web 2'),
+            'label' => $this->translate('Usergroup Backends'),
+            'url'   => 'usergroupbackend/list'
+        ));
         return $tabs;
     }
 }
diff --git a/library/Icinga/Web/Controller/AuthBackendController.php b/library/Icinga/Web/Controller/AuthBackendController.php
index 43ed78fd7..1fea0eb4f 100644
--- a/library/Icinga/Web/Controller/AuthBackendController.php
+++ b/library/Icinga/Web/Controller/AuthBackendController.php
@@ -3,13 +3,12 @@
 
 namespace Icinga\Web\Controller;
 
-use \Zend_Controller_Action_Exception;
+use Zend_Controller_Action_Exception;
 use Icinga\Application\Config;
 use Icinga\Authentication\User\UserBackend;
 use Icinga\Authentication\User\UserBackendInterface;
 use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Authentication\UserGroup\UserGroupBackendInterface;
-use Icinga\Security\SecurityException;
 use Icinga\Web\Controller;
 
 /**
@@ -18,19 +17,11 @@ use Icinga\Web\Controller;
 class AuthBackendController extends Controller
 {
     /**
-     * Redirect to the first permitted list action
+     * Redirect to this controller's list action
      */
-    final public function indexAction()
+    public function indexAction()
     {
-        if ($this->hasPermission('config/authentication/users/show')) {
-            $this->redirectNow('user/list');
-        } elseif ($this->hasPermission('config/authentication/groups/show')) {
-            $this->redirectNow('group/list');
-        } elseif ($this->hasPermission('config/authentication/roles/show')) {
-            $this->redirectNow('role/list');
-        } else {
-            throw new SecurityException($this->translate('No permission for authentication configuration'));
-        }
+        $this->redirectNow($this->getRequest()->getControllerName() . '/list');
     }
 
     /**
@@ -148,51 +139,4 @@ class AuthBackendController extends Controller
 
         return $backend;
     }
-
-    /**
-     * Create the tabs to list users and groups
-     */
-    protected function createListTabs()
-    {
-        $tabs = $this->getTabs();
-
-        if ($this->hasPermission('config/authentication/users/show')) {
-            $tabs->add(
-                'user/list',
-                array(
-                    'title'     => $this->translate('List users of authentication backends'),
-                    'label'     => $this->translate('Users'),
-                    'icon'      => 'user',
-                    'url'       => 'user/list'
-                )
-            );
-        }
-
-        if ($this->hasPermission('config/authentication/groups/show')) {
-            $tabs->add(
-                'group/list',
-                array(
-                    'title'     => $this->translate('List groups of user group backends'),
-                    'label'     => $this->translate('Groups'),
-                    'icon'      => 'users',
-                    'url'       => 'group/list'
-                )
-            );
-        }
-
-        if ($this->hasPermission('config/authentication/roles/show')) {
-            $tabs->add(
-                'role/list',
-                array(
-                    'title' => $this->translate(
-                        'Configure roles to permit or restrict users and groups accessing Icinga Web 2'
-                    ),
-                    'label' => $this->translate('Roles'),
-                    'url'   => 'role/list'
-                )
-            );
-        }
-
-        return $tabs;
-    }
 }
diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index a201b34fc..87be9ec40 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -259,10 +259,25 @@ class Menu implements RecursiveIterator
                 'priority'      => 810
             ));
             $section->add(t('Authentication'), array(
-                'url'           => 'user',
+                'url'           => 'config/userbackend',
                 'permission'    => 'config/authentication/*',
                 'priority'      => 820
             ));
+            $section->add(t('Roles'), array(
+                'url'           => 'role/list',
+                'permission'    => 'config/authentication/roles/show',
+                'priority'      => 830
+            ));
+            $section->add(t('Users'), array(
+                'url'           => 'user/list',
+                'permission'    => 'config/authentication/users/show',
+                'priority'      => 840
+            ));
+            $section->add(t('Usergroups'), array(
+                'url'           => 'group/list',
+                'permission'    => 'config/authentication/groups/show',
+                'priority'      => 850
+            ));
             $section->add(t('Modules'), array(
                 'url'           => 'config/modules',
                 'permission'    => 'config/modules',

From 6d48de6cf54481f445fcd77773a5d6d461195a66 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 22 Jun 2015 13:32:34 +0200
Subject: [PATCH 2357/2920] DbConnection: Do not accept configuration for table
 prefixes

fixes #9418
---
 library/Icinga/Data/Db/DbConnection.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php
index 471905907..95f3e9235 100644
--- a/library/Icinga/Data/Db/DbConnection.php
+++ b/library/Icinga/Data/Db/DbConnection.php
@@ -71,9 +71,6 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible
     public function __construct(ConfigObject $config = null)
     {
         $this->config = $config;
-        if (isset($config->prefix)) {
-            $this->tablePrefix = $config->prefix;
-        }
         $this->connect();
     }
 

From 2e375dd57cd298388b31844007ddb5b4594c0d19 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 22 Jun 2015 13:56:41 +0200
Subject: [PATCH 2358/2920] Do not bypass the view renderer when rendering
 benchmarks

fixes #9402
---
 library/Icinga/Web/Controller/ActionController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index d7156becc..571f0792f 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -505,7 +505,7 @@ class ActionController extends Zend_Controller_Action
      */
     protected function renderBenchmark()
     {
-        $this->render();
+        $this->_helper->viewRenderer->postDispatch();
         Benchmark::measure('Response ready');
         return Benchmark::renderToHtml();
     }

From eabcb6702f7d2e6359ff08632b8bd863ad90cc08 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 22 Jun 2015 16:16:56 +0200
Subject: [PATCH 2359/2920] Fix incorrect count of unhandled services in the
 statistics

fixes #9473
---
 .../Ido/Query/ServicestatussummaryQuery.php   | 27 ++++++++++---------
 .../Backend/Ido/Query/StatussummaryQuery.php  |  4 ---
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php
index 325203717..3215ca086 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php
@@ -17,25 +17,25 @@ class ServicestatussummaryQuery extends IdoQuery
     protected $columnMap = array(
         'servicestatussummary' => array(
             'services_critical'                             => 'SUM(CASE WHEN state = 2 THEN 1 ELSE 0 END)',
-            'services_critical_handled'                     => 'SUM(CASE WHEN state = 2 AND handled = 1 THEN 1 ELSE 0 END)',
-//            'services_critical_handled_last_state_change'   => 'MAX(CASE WHEN state = 2 AND handled = 1 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
-            'services_critical_unhandled'                   => 'SUM(CASE WHEN state = 2 AND handled = 0 THEN 1 ELSE 0 END)',
-//            'services_critical_unhandled_last_state_change' => 'MAX(CASE WHEN state = 2 AND handled = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
+            'services_critical_handled'                     => 'SUM(CASE WHEN state = 2 AND handled + host_problem > 0 THEN 1 ELSE 0 END)',
+//            'services_critical_handled_last_state_change'   => 'MAX(CASE WHEN state = 2 AND handled + host_problem > 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
+            'services_critical_unhandled'                   => 'SUM(CASE WHEN state = 2 AND handled + host_problem = 0 THEN 1 ELSE 0 END)',
+//            'services_critical_unhandled_last_state_change' => 'MAX(CASE WHEN state = 2 AND handled + host_problem = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
             'services_ok'                                   => 'SUM(CASE WHEN state = 0 THEN 1 ELSE 0 END)',
 //            'services_ok_last_state_change'                 => 'MAX(CASE WHEN state = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
             'services_pending'                              => 'SUM(CASE WHEN state = 99 THEN 1 ELSE 0 END)',
 //            'services_pending_last_state_change'            => 'MAX(CASE WHEN state = 99 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
             'services_total'                                => 'SUM(1)',
             'services_unknown'                              => 'SUM(CASE WHEN state = 3 THEN 1 ELSE 0 END)',
-            'services_unknown_handled'                      => 'SUM(CASE WHEN state = 3 AND handled = 1 THEN 1 ELSE 0 END)',
-//            'services_unknown_handled_last_state_change'    => 'MAX(CASE WHEN state = 3 AND handled = 1 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
-            'services_unknown_unhandled'                    => 'SUM(CASE WHEN state = 3 AND handled = 0 THEN 1 ELSE 0 END)',
-//            'services_unknown_unhandled_last_state_change'  => 'MAX(CASE WHEN state = 3 AND handled = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
+            'services_unknown_handled'                      => 'SUM(CASE WHEN state = 3 AND handled + host_problem > 0 THEN 1 ELSE 0 END)',
+//            'services_unknown_handled_last_state_change'    => 'MAX(CASE WHEN state = 3 AND handled + host_problem > 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
+            'services_unknown_unhandled'                    => 'SUM(CASE WHEN state = 3 AND handled + host_problem = 0 THEN 1 ELSE 0 END)',
+//            'services_unknown_unhandled_last_state_change'  => 'MAX(CASE WHEN state = 3 AND handled + host_problem = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
             'services_warning'                              => 'SUM(CASE WHEN state = 1 THEN 1 ELSE 0 END)',
-            'services_warning_handled'                      => 'SUM(CASE WHEN state = 1 AND handled = 1 THEN 1 ELSE 0 END)',
-//            'services_warning_handled_last_state_change'    => 'MAX(CASE WHEN state = 1 AND handled = 1 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
-            'services_warning_unhandled'                    => 'SUM(CASE WHEN state = 1 AND handled = 0 THEN 1 ELSE 0 END)',
-//            'services_warning_unhandled_last_state_change'  => 'MAX(CASE WHEN state = 1 AND handled = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)'
+            'services_warning_handled'                      => 'SUM(CASE WHEN state = 1 AND handled + host_problem > 0 THEN 1 ELSE 0 END)',
+//            'services_warning_handled_last_state_change'    => 'MAX(CASE WHEN state = 1 AND handled + host_problem > 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
+            'services_warning_unhandled'                    => 'SUM(CASE WHEN state = 1 AND handled + host_problem = 0 THEN 1 ELSE 0 END)',
+//            'services_warning_unhandled_last_state_change'  => 'MAX(CASE WHEN state = 1 AND handled + host_problem = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)'
         )
     );
 
@@ -66,7 +66,8 @@ class ServicestatussummaryQuery extends IdoQuery
             array(
                 'handled'       => 'service_handled',
                 'state'         => 'service_state',
-                'state_change'  => 'service_last_state_change'
+                'state_change'  => 'service_last_state_change',
+                'host_problem'
             )
         );
         $this->select->from(
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatussummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatussummaryQuery.php
index df30ba103..9d94e8149 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatussummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatussummaryQuery.php
@@ -151,8 +151,6 @@ We have to find a better solution here.
             'Hoststatus',
             array(
                 'handled'                       => 'host_handled',
-                'hostgroup_alias',
-                'hostgroup_name',
                 'host_problem',
                 'host_state'                    => new Zend_Db_Expr('NULL'),
                 'is_active_checked'             => 'host_active_checks_enabled',
@@ -172,8 +170,6 @@ We have to find a better solution here.
             'Servicestatus',
             array(
                 'handled'                       => 'service_handled',
-                'hostgroup_alias',
-                'hostgroup_name',
                 'host_problem',
                 'host_state'                    => 'host_hard_state',
                 'is_active_checked'             => 'service_active_checks_enabled',

From 67e31c730af109f3f1b1cc4fd9a4fe8788cea069 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 08:49:11 +0200
Subject: [PATCH 2360/2920] Fetch host and service statistics not until they
 are required

fixes #9472
---
 .../controllers/ListController.php            |  4 +-
 .../list/components/hostssummary.phtml        | 60 ++++++++++---------
 .../list/components/servicesummary.phtml      | 51 ++++++++--------
 3 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 7399487ea..fe65fe595 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -111,7 +111,7 @@ class Monitoring_ListController extends Controller
             'hosts_pending',
         ));
         $this->applyRestriction('monitoring/filter/objects', $stats);
-        $this->view->stats = $stats->fetchRow();
+        $this->view->stats = $stats;
         $this->setupLimitControl();
         $this->setupPaginationControl($this->view->hosts);
         $this->setupSortControl(array(
@@ -214,7 +214,7 @@ class Monitoring_ListController extends Controller
             'services_warning_unhandled'
         ));
         $this->applyRestriction('monitoring/filter/objects', $stats);
-        $this->view->stats = $stats->fetchRow();
+        $this->view->stats = $stats;
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
index 58d410a0d..22f84b583 100644
--- a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
@@ -12,23 +12,25 @@ function urlAddFilterOptional($url, $filter, $optional) {
     return $url->setQueryString($f->toQueryString());
 }
 $this->baseFilter = isset($this->baseFilter) ? $this->baseFilter : null;
+
+$stats = $stats->fetchRow();
 $selfUrl = 'monitoring/list/hosts';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
 ?><h1 class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
   <?= $this->qlink(
-      sprintf($this->translatePlural('%u Host', '%u Hosts', $this->stats->hosts_total), $this->stats->hosts_total),
+      sprintf($this->translatePlural('%u Host', '%u Hosts', $stats->hosts_total), $stats->hosts_total),
       $selfUrl,
       null,
       array('title' => sprintf(
-          $this->translatePlural('List %u host', 'List all %u hosts', $this->stats->hosts_total),
-          $this->stats->hosts_total
+          $this->translatePlural('List %u host', 'List all %u hosts', $stats->hosts_total),
+          $stats->hosts_total
       ))
   ) ?>&#58;
   <span class="badges">
-    <?php if ($this->stats->hosts_up): ?>
+    <?php if ($stats->hosts_up): ?>
     <span class="state ok<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 0))->getRelativeUrl() ? ' active' : ''; ?>">
         <?= $this->qlink(
-                $this->stats->hosts_up,
+                $stats->hosts_up,
                 urlAddFilterOptional(
                     $selfUrl,
                     Filter::where('host_state', 0),
@@ -39,19 +41,19 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
                     $this->translatePlural(
                         'List %u host that is currently in state UP',
                         'List %u hosts which are currently in state UP',
-                        $this->stats->hosts_up
+                        $stats->hosts_up
                     ),
-                    $this->stats->hosts_up
+                    $stats->hosts_up
                 )
             )
         ); ?>
     </span>
     <?php endif; ?>
 
-    <?php if ($this->stats->hosts_down_unhandled): ?>
+    <?php if ($stats->hosts_down_unhandled): ?>
     <span class="state critical<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 1, 'host_unhandled' => 1))->getRelativeUrl() ? ' active' : ''; ?>">
         <?= $this->qlink(
-            $this->stats->hosts_down_unhandled,
+            $stats->hosts_down_unhandled,
             urlAddFilterOptional(
                 $selfUrl,
                 Filter::matchAll(Filter::where('host_state', 1), Filter::where('host_unhandled', 1)),
@@ -62,17 +64,17 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
                 $this->translatePlural(
                     'List %u host that is currently in state DOWN',
                     'List %u hosts which are currently in state DOWN',
-                    $this->stats->hosts_down_unhandled
+                    $stats->hosts_down_unhandled
                 ),
-                $this->stats->hosts_down_unhandled
+                $stats->hosts_down_unhandled
             ))
         ); ?>
     <?php endif; ?>
 
-    <?php if ($this->stats->hosts_down_handled): ?>
+    <?php if ($stats->hosts_down_handled): ?>
     <span class="state handled critical<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 1, 'host_unhandled' =>0))->getRelativeUrl() ? ' active' : ''; ?>">
         <?= $this->qlink(
-            $this->stats->hosts_down_handled,
+            $stats->hosts_down_handled,
             urlAddFilterOptional(
                 $selfUrl,
                 Filter::matchAll(Filter::where('host_state', 1), Filter::where('host_unhandled', 0)),
@@ -83,22 +85,22 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
                 $this->translatePlural(
                     'List %u host that is currently in state DOWN (Acknowledged)',
                     'List %u hosts which are currently in state DOWN (Acknowledged)',
-                    $this->stats->hosts_down_handled
+                    $stats->hosts_down_handled
                 ),
-                $this->stats->hosts_down_handled
+                $stats->hosts_down_handled
             ))
         ); ?>
     </span>
     <?php endif; ?>
 
-    <?php if($this->stats->hosts_down): ?>
+    <?php if($stats->hosts_down): ?>
     </span>
     <?php endif; ?>
 
-    <?php if($this->stats->hosts_unreachable_unhandled): ?>
+    <?php if($stats->hosts_unreachable_unhandled): ?>
     <span class="state unknown<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 2, 'host_unhandled' => 1))->getRelativeUrl() ? ' active' : ''; ?>">
         <?= $this->qlink(
-            $this->stats->hosts_unreachable_unhandled,
+            $stats->hosts_unreachable_unhandled,
             urlAddFilterOptional(
                 $selfUrl,
                 Filter::matchAll(Filter::where('host_state', 2), Filter::where('host_unhandled', 1)),
@@ -109,17 +111,17 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
                 $this->translatePlural(
                     'List %u host that is currently in state UNREACHABLE',
                     'List %u hosts which are currently in state UNREACHABLE',
-                    $this->stats->hosts_unreachable_unhandled
+                    $stats->hosts_unreachable_unhandled
                 ),
-                $this->stats->hosts_unreachable_unhandled
+                $stats->hosts_unreachable_unhandled
             ))
         ); ?>
     <?php endif; ?>
 
-    <?php if($this->stats->hosts_unreachable_handled > 0): ?>
+    <?php if($stats->hosts_unreachable_handled > 0): ?>
     <span class="state handled unknown<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 2, 'host_unhandled' => 0))->getRelativeUrl() ? ' active' : '' ?>">
         <?= $this->qlink(
-            $this->stats->hosts_unreachable_handled,
+            $stats->hosts_unreachable_handled,
             urlAddFilterOptional(
                 $selfUrl,
                 Filter::matchAll(Filter::where('host_state', 2), Filter::where('host_unhandled', 0)),
@@ -130,22 +132,22 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
                 $this->translatePlural(
                     'List %u host that is currently in state UNREACHABLE (Acknowledged)',
                     'List %u hosts which are currently in state UNREACHABLE (Acknowledged)',
-                    $this->stats->hosts_unreachable_handled
+                    $stats->hosts_unreachable_handled
                 ),
-                $this->stats->hosts_unreachable_handled
+                $stats->hosts_unreachable_handled
             ))
         ); ?>
     </span>
     <?php endif; ?>
 
-    <?php if($this->stats->hosts_unreachable): ?>
+    <?php if($stats->hosts_unreachable): ?>
     </span>
     <?php endif; ?>
 
-    <?php if($this->stats->hosts_pending): ?>
+    <?php if($stats->hosts_pending): ?>
     <span class="state pending<?= $currentUrl === Url::fromPath($selfUrl, array('host_state' => 99))->getRelativeUrl() ? ' active' : ''; ?>">
         <?= $this->qlink(
-            $this->stats->hosts_pending,
+            $stats->hosts_pending,
             urlAddFilterOptional(
                 $selfUrl,
                 Filter::where('host_state', 99),
@@ -156,9 +158,9 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
                 $this->translatePlural(
                     'List %u host that is currently in state PENDING',
                     'List %u hosts which are currently in state PENDING',
-                    $this->stats->hosts_pending
+                    $stats->hosts_pending
                 ),
-                $this->stats->hosts_pending
+                $stats->hosts_pending
             ))
         ); ?>
     </span>
diff --git a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
index 3406cb088..9fd798a0d 100644
--- a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
@@ -14,36 +14,37 @@ function urlAddFilterOptional($url, $filter, $optional) {
 }
 $this->baseFilter = isset($this->baseFilter) ? $this->baseFilter : null;
 
+$stats = $stats->fetchRow();
 $selfUrl = 'monitoring/list/services';
 $currentUrl = Url::fromRequest()->getRelativeUrl();
 ?><h1 class="tinystatesummary" <?= $this->compact ? ' data-base-target="col1"' : ''; ?>>
 <?= $this->qlink(
     sprintf($this->translatePlural(
-        '%u Service', '%u Services', $this->stats->services_total),
-        $this->stats->services_total
+        '%u Service', '%u Services', $stats->services_total),
+        $stats->services_total
     ),
     $selfUrl,
     null,
     array('title' => sprintf(
-        $this->translatePlural('List %u service', 'List all %u services', $this->stats->services_total),
-        $this->stats->services_total
+        $this->translatePlural('List %u service', 'List all %u services', $stats->services_total),
+        $stats->services_total
     ))
 ) ?>&#58;
 <span class="badges">
-<?php if ($this->stats->services_ok): ?>
+<?php if ($stats->services_ok): ?>
 <span class="state ok<?= $currentUrl === Url::fromPath($selfUrl, array('service_state' => 0))->getRelativeUrl() ? ' active' : ''; ?>">
     <?=
         $this->qlink(
-            $this->stats->services_ok,
+            $stats->services_ok,
             urlAddFilterOptional($selfUrl, Filter::where('service_state', 0), $this->baseFilter),
             null,
             array('title' => sprintf(
                 $this->translatePlural(
                     'List %u service that is currently in state OK',
                     'List %u services which are currently in state OK',
-                    $this->stats->services_ok
+                    $stats->services_ok
                 ),
-                $this->stats->services_ok
+                $stats->services_ok
             ))
         );
     ?>
@@ -52,7 +53,7 @@ $currentUrl = Url::fromRequest()->getRelativeUrl();
 <?php
 foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $state) {
     $pre = 'services_' . $state;
-    if ($this->stats->$pre) {
+    if ($stats->$pre) {
         $handled = $pre . '_handled';
         $unhandled = $pre . '_unhandled';
         $paramsHandled = Filter::matchAll(
@@ -63,7 +64,7 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
             Filter::where('service_state', $stateId),
             Filter::where('service_handled', 0)
         );
-        if ($this->stats->$unhandled) {
+        if ($stats->$unhandled) {
             $compareUrl = Url::fromPath($selfUrl)->setQueryString($paramsUnhandled->toQueryString())->getRelativeUrl();
         } else {
             $compareUrl = Url::fromPath($selfUrl)->setQueryString($paramsUnhandled->toQueryString())->getRelativeUrl();
@@ -75,49 +76,49 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
             $active = '';
         }
 
-        echo '<span class="state ' . $state . $active . ($this->stats->$unhandled ? '' : ' handled') . '">';
-        if ($this->stats->$unhandled) {
+        echo '<span class="state ' . $state . $active . ($stats->$unhandled ? '' : ' handled') . '">';
+        if ($stats->$unhandled) {
 
             echo $this->qlink(
-                $this->stats->$unhandled,
+                $stats->$unhandled,
                 urlAddFilterOptional($selfUrl, $paramsUnhandled, $this->baseFilter),
                 null,
                 array('title' => sprintf(
                     $this->translatePlural(
                         'List %u service that is currently in state %s',
                         'List %u services which are currently in state %s',
-                        $this->stats->$unhandled
+                        $stats->$unhandled
                     ),
-                    $this->stats->$unhandled,
+                    $stats->$unhandled,
                     Service::getStateText($stateId, true)
                 ))
             );
         }
-        if ($this->stats->$handled) {
+        if ($stats->$handled) {
 
             if (Url::fromPath($selfUrl)->setQueryString($paramsHandled->toQueryString())->getRelativeUrl() === $currentUrl) {
                 $active = ' active';
             } else {
                 $active = '';
             }
-            if ($this->stats->$unhandled) {
+            if ($stats->$unhandled) {
                 echo '<span class="state handled ' . $state . $active . '">';
             }
             echo $this->qlink(
-                $this->stats->$handled,
+                $stats->$handled,
                 urlAddFilterOptional($selfUrl, $paramsHandled, $this->baseFilter),
                 null,
                 array('title' => sprintf(
                     $this->translatePlural(
                         'List %u service that is currently in state %s (Acknowledged)',
                         'List %u services which are currently in state %s (Acknowledged)',
-                        $this->stats->$handled
+                        $stats->$handled
                     ),
-                    $this->stats->$handled,
+                    $stats->$handled,
                     Service::getStateText($stateId, true)
                 ))
             );
-            if ($this->stats->$unhandled) {
+            if ($stats->$unhandled) {
                 echo "</span>\n";
             }
         }
@@ -125,19 +126,19 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $
     }
 }
 ?>
-<?php if ($this->stats->services_pending): ?>
+<?php if ($stats->services_pending): ?>
 <span class="state pending<?= $currentUrl === Url::fromPath($selfUrl, array('service_state' => 99))->getRelativeUrl() ? ' active' : ''; ?>">
     <?= $this->qlink(
-        $this->stats->services_pending,
+        $stats->services_pending,
         urlAddFilterOptional($selfUrl, Filter::where('service_state', 99), $this->baseFilter),
         null,
         array('title' => sprintf(
             $this->translatePlural(
                 'List %u service that is currently in state PENDING',
                 'List %u services which are currently in state PENDING',
-                $this->stats->services_pending
+                $stats->services_pending
             ),
-            $this->stats->services_pending
+            $stats->services_pending
         ))
     ); ?>
 </span>

From 15220da645074b7037e41ce96cb16894860f467a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 10:32:45 +0200
Subject: [PATCH 2361/2920] Automatically strip unnecessary parentheses from
 custom ldap filters

fixes #9348
---
 .../forms/Config/UserBackend/LdapBackendForm.php    | 13 +++++++++----
 .../Icinga/Authentication/User/LdapUserBackend.php  |  4 ++++
 .../UserGroup/LdapUserGroupBackend.php              |  4 ++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/application/forms/Config/UserBackend/LdapBackendForm.php b/application/forms/Config/UserBackend/LdapBackendForm.php
index ac2091398..df6e0a4c4 100644
--- a/application/forms/Config/UserBackend/LdapBackendForm.php
+++ b/application/forms/Config/UserBackend/LdapBackendForm.php
@@ -99,8 +99,8 @@ class LdapBackendForm extends Form
                     . 'Leave empty to not to use any additional filter rules.'
                 ),
                 'requirement'   => $this->translate(
-                    'The filter needs to be expressed as standard LDAP expression, without'
-                    . ' outer parentheses. (e.g. &(foo=bar)(bar=foo) or foo=bar)'
+                    'The filter needs to be expressed as standard LDAP expression.'
+                    . ' (e.g. &(foo=bar)(bar=foo) or foo=bar)'
                 ),
                 'validators'    => array(
                     array(
@@ -108,10 +108,15 @@ class LdapBackendForm extends Form
                         false,
                         array(
                             'callback'  => function ($v) {
-                                return strpos($v, '(') !== 0;
+                                // This is not meant to be a full syntax check. It will just
+                                // ensure that we can safely strip unnecessary parentheses.
+                                $v = trim($v);
+                                return ! $v || $v[0] !== '(' || (
+                                    strpos($v, ')(') !== false ? substr($v, -2) === '))' : substr($v, -1) === ')'
+                                );
                             },
                             'messages'  => array(
-                                'callbackValue' => $this->translate('The filter must not be wrapped in parantheses.')
+                                'callbackValue' => $this->translate('The filter is invalid. Please check your syntax.')
                             )
                         )
                     )
diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index 333969891..cec74a6e5 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -148,6 +148,10 @@ class LdapUserBackend extends LdapRepository implements UserBackendInterface
     public function setFilter($filter)
     {
         if (($filter = trim($filter))) {
+            if ($filter[0] === '(') {
+                $filter = substr($filter, 1, -1);
+            }
+
             $this->filter = $filter;
         }
 
diff --git a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
index 224013e9f..976af266f 100644
--- a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
@@ -356,6 +356,10 @@ class LdapUserGroupBackend /*extends LdapRepository*/ implements UserGroupBacken
     public function setUserFilter($filter)
     {
         if (($filter = trim($filter))) {
+            if ($filter[0] === '(') {
+                $filter = substr($filter, 1, -1);
+            }
+
             $this->userFilter = $filter;
         }
 

From 6d8c56a12fce6ee34e08408a6034a51749e3700e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 10:49:51 +0200
Subject: [PATCH 2362/2920] Ldap\Connection: Return false if nothing is found
 for fetchRow()

This should behave like DbConnection::fetchRow().

refs #8954
---
 library/Icinga/Authentication/User/LdapUserBackend.php | 2 +-
 library/Icinga/Protocol/Ldap/Connection.php            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index cec74a6e5..981ed9331 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -325,7 +325,7 @@ class LdapUserBackend extends LdapRepository implements UserBackendInterface
             throw new AuthenticationException('Connection not possible.', $e);
         }
 
-        if ($result === null) {
+        if ($result === false) {
             throw new AuthenticationException(
                 'No objects with objectClass "%s" in DN "%s" found. (Filter: %s)',
                 $this->userClass,
diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index c2758154a..f5ca017f3 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -235,7 +235,7 @@ class Connection implements Selectable
         $query->limit(1);
         $query->setUsePagedResults(false);
         $results = $this->fetchAll($query, $fields);
-        return array_shift($results);
+        return array_shift($results) ?: false;
     }
 
     /**

From 9d6d76a26dc4125b2005f89fa9a2bc46882b6514 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 12:41:50 +0200
Subject: [PATCH 2363/2920] Ldap\Connection: Return false if nothing is found
 for fetchOne()

This should behave like DbConnection::fetchOne().

refs #8954
---
 library/Icinga/Protocol/Ldap/Connection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index f5ca017f3..dce492817 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -143,7 +143,7 @@ class Connection implements Selectable
     public function fetchOne($query, $fields = array())
     {
         $row = (array) $this->fetchRow($query, $fields);
-        return array_shift($row);
+        return array_shift($row) ?: false;
     }
 
     public function hasDN($dn)

From 5fd2eb639ae4aa2a446fac3561ced7dd1d18ce32 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 14:08:50 +0200
Subject: [PATCH 2364/2920] LdapResourceForm: Display exact error messages to
 the user

---
 application/forms/Config/Resource/LdapResourceForm.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 6d9bf74d4..0fa0cb47b 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -156,13 +156,8 @@ class LdapResourceForm extends Form
     {
         try {
             $resource = ResourceFactory::createResource(new ConfigObject($form->getValues()));
-            if (false === $resource->testCredentials(
-                $form->getElement('bind_dn')->getValue(),
-                $form->getElement('bind_pw')->getValue()
-                )
-            ) {
-                throw new Exception(); // TODO: Get the exact error message
-            }
+            $resource->connect();
+            $resource->bind();
         } catch (Exception $e) {
             $msg = $form->translate('Connectivity validation failed, connection to the given resource not possible.');
             if (($error = $e->getMessage())) {

From 197861efdae912b74546409a47beb52459ef3f23 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 14:12:01 +0200
Subject: [PATCH 2365/2920] Ldap\Connection: Do not suppress errors for failed
 credential tests

---
 library/Icinga/Protocol/Ldap/Connection.php | 32 ++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index dce492817..56f43d460 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -32,6 +32,7 @@ class Connection implements Selectable
     const LDAP_NO_SUCH_OBJECT = 32;
     const LDAP_SIZELIMIT_EXCEEDED = 4;
     const LDAP_ADMINLIMIT_EXCEEDED = 11;
+    const LDAP_INVALID_CREDENTIALS = 49;
     const PAGE_SIZE = 1000;
 
     /**
@@ -557,23 +558,22 @@ class Connection implements Selectable
     {
         $this->connect();
 
-        $r = @ldap_bind($this->ds, $username, $password);
-        if ($r) {
-            Logger::debug(
-                'Successfully tested LDAP credentials (%s / %s)',
-                $username,
-                '***'
-            );
-            return true;
-        } else {
-            Logger::debug(
-                'Testing LDAP credentials (%s / %s) failed: %s',
-                $username,
-                '***',
-                ldap_error($this->ds)
-            );
-            return false;
+        $success = @ldap_bind($this->ds, $username, $password);
+        if (! $success) {
+            if (ldap_errno($this->ds) === self::LDAP_INVALID_CREDENTIALS) {
+                Logger::debug(
+                    'Testing LDAP credentials (%s / %s) failed: %s',
+                    $username,
+                    '***',
+                    ldap_error($this->ds)
+                );
+                return false;
+            }
+
+            throw new LdapException(ldap_error($this->ds));
         }
+
+        return true;
     }
 
     /**

From ac7a7e66747b99369bac8338c43206a991b1d470 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 15:05:03 +0200
Subject: [PATCH 2366/2920] Ldap\Connection: Add method fetchColumn()

---
 library/Icinga/Protocol/Ldap/Connection.php | 22 +++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 56f43d460..3931f59a5 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -147,6 +147,28 @@ class Connection implements Selectable
         return array_shift($row) ?: false;
     }
 
+    public function fetchColumn(Query $query, array $fields = null)
+    {
+        if ($fields === null) {
+            $fields = $query->getColumns();
+        }
+
+        $column = current($fields);
+        if (! $column) {
+            throw new ProgrammingError('You must request at least one attribute when fetching a single column');
+        }
+
+        $results = $this->fetchAll($query, array($column));
+        $values = array();
+        foreach ($results as $row) {
+            if (isset($row->$column)) {
+                $values[] = $row->$column;
+            }
+        }
+
+        return $values;
+    }
+
     public function hasDN($dn)
     {
         $this->connect();

From 759e243d90a1800e318b306c768c52b76fb3af30 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 15:05:47 +0200
Subject: [PATCH 2367/2920] Ldap\Connection: Add method fetchPairs()

---
 library/Icinga/Protocol/Ldap/Connection.php | 36 +++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 3931f59a5..7ed636485 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -169,6 +169,42 @@ class Connection implements Selectable
         return $values;
     }
 
+    public function fetchPairs(Query $query, array $fields = null)
+    {
+        if ($fields === null) {
+            $fields = $query->getColumns();
+        }
+
+        if (count($fields) < 2) {
+            throw new ProgrammingError('You are required to request at least two attributes');
+        }
+
+        $columns = $desiredColumnNames = array();
+        foreach ($fields as $alias => $column) {
+            if (is_int($alias)) {
+                $columns[] = $column;
+                $desiredColumnNames[] = $column;
+            } else {
+                $columns[$alias] = $column;
+                $desiredColumnNames[] = $alias;
+            }
+
+            if (count($desiredColumnNames) === 2) {
+                break;
+            }
+        }
+
+        $results = $this->fetchAll($query, $columns);
+        $pairs = array();
+        foreach ($results as $row) {
+            $colOne = $desiredColumnNames[0];
+            $colTwo = $desiredColumnNames[1];
+            $pairs[$row->$colOne] = $row->$colTwo;
+        }
+
+        return $pairs;
+    }
+
     public function hasDN($dn)
     {
         $this->connect();

From 56cb4c28c45149918b19c6f3156bdb6706399ffb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 15:11:11 +0200
Subject: [PATCH 2368/2920] Ldap\Connection: Rename method hasDN() to hasDn()

---
 library/Icinga/Protocol/Ldap/Connection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 7ed636485..038a45c42 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -205,7 +205,7 @@ class Connection implements Selectable
         return $pairs;
     }
 
-    public function hasDN($dn)
+    public function hasDn($dn)
     {
         $this->connect();
         $this->bind();

From 3f5cd4b670062c57c9e550f6e031a8a943be25f8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 15:16:53 +0200
Subject: [PATCH 2369/2920] Ldap\Connection: Rename method getDN() to getDn()

---
 library/Icinga/Protocol/Ldap/Connection.php | 2 +-
 library/Icinga/Protocol/Ldap/Query.php      | 2 +-
 library/Icinga/Protocol/Ldap/Root.php       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 038a45c42..966dd2667 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -113,7 +113,7 @@ class Connection implements Selectable
         return $this->port;
     }
 
-    public function getDN()
+    public function getDn()
     {
         return $this->root_dn;
     }
diff --git a/library/Icinga/Protocol/Ldap/Query.php b/library/Icinga/Protocol/Ldap/Query.php
index fe6539515..62433886a 100644
--- a/library/Icinga/Protocol/Ldap/Query.php
+++ b/library/Icinga/Protocol/Ldap/Query.php
@@ -156,7 +156,7 @@ class Query extends SimpleQuery
     {
         $result = $this->fetchAll();
         $sorted = array();
-        $quotedDn = preg_quote($this->ds->getDN(), '/');
+        $quotedDn = preg_quote($this->ds->getDn(), '/');
         foreach ($result as $key => & $item) {
             $new_key = LdapUtils::implodeDN(
                 array_reverse(
diff --git a/library/Icinga/Protocol/Ldap/Root.php b/library/Icinga/Protocol/Ldap/Root.php
index 769437a31..5f1fb545d 100644
--- a/library/Icinga/Protocol/Ldap/Root.php
+++ b/library/Icinga/Protocol/Ldap/Root.php
@@ -215,7 +215,7 @@ class Root
      */
     public function getDN()
     {
-        return $this->connection->getDN();
+        return $this->connection->getDn();
     }
 
     /**

From 87e31f497eca7de24f5281f012862bafb519a535 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 15:21:32 +0200
Subject: [PATCH 2370/2920] Ldap\Connection: Rename method deleteDN() to
 deleteDn()

---
 library/Icinga/Protocol/Ldap/Connection.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 966dd2667..abf52d66c 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -238,10 +238,10 @@ class Connection implements Selectable
                 throw new LdapException('Recursively deleting "%s" failed', $dn);
             }
         }
-        return $this->deleteDN($dn);
+        return $this->deleteDn($dn);
     }
 
-    public function deleteDN($dn)
+    public function deleteDn($dn)
     {
         $this->connect();
         $this->bind();

From c32f9ae7352f7bba72e438a57056133ed07325ba Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 15:56:29 +0200
Subject: [PATCH 2371/2920] Ldap\Connection: Drop parameter $fields from method
 fetchDn()

---
 library/Icinga/Protocol/Ldap/Connection.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index abf52d66c..a28e20bb1 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -265,14 +265,13 @@ class Connection implements Selectable
      * Fetch the distinguished name of the first result of the given query
      *
      * @param Query $query   The query returning the result set
-     * @param array $fields  The fields to fetch
      *
      * @return string        Returns the distinguished name, or false when the given query yields no results
      * @throws LdapException When the query result is empty and contains no DN to fetch
      */
-    public function fetchDn(Query $query, $fields = array())
+    public function fetchDn(Query $query)
     {
-        $rows = $this->fetchAll($query, $fields);
+        $rows = $this->fetchAll($query, array());
         if (count($rows) > 1) {
             throw new LdapException(
                 'Cannot fetch single DN for %s',

From 6ef0af89278491a6355e9d6f81eee191ab3e9af4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 16:56:34 +0200
Subject: [PATCH 2372/2920] Fix LdapResourceFormTest

---
 .../forms/Config/Resource/LdapResourceFormTest.php            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
index f382f8bb8..a20db214e 100644
--- a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
+++ b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
@@ -26,7 +26,7 @@ class LdapResourceFormTest extends BaseTestCase
     public function testValidLdapResourceIsValid()
     {
         $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('testCredentials')->once()->andReturn(true)->getMock()
+            Mockery::mock()->shouldReceive('connect')->once()->shouldReceive('bind')->once()->getMock()
         );
 
         // Passing array(null) is required to make Mockery call the constructor...
@@ -49,7 +49,7 @@ class LdapResourceFormTest extends BaseTestCase
     public function testInvalidLdapResourceIsNotValid()
     {
         $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('testCredentials')->once()->andThrow('\Exception')->getMock()
+            Mockery::mock()->shouldReceive('connect')->once()->shouldReceive('bind')->andThrow('\Exception')->getMock()
         );
 
         // Passing array(null) is required to make Mockery call the constructor...

From 77148b6892ac572eb3fa02ef6f790733e7aae68c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 16:59:55 +0200
Subject: [PATCH 2373/2920] IniWriterTest: Remove forgotten var_dump()

...
---
 test/php/library/Icinga/File/Ini/IniWriterTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/php/library/Icinga/File/Ini/IniWriterTest.php b/test/php/library/Icinga/File/Ini/IniWriterTest.php
index fa9ad895f..c38731cca 100644
--- a/test/php/library/Icinga/File/Ini/IniWriterTest.php
+++ b/test/php/library/Icinga/File/Ini/IniWriterTest.php
@@ -739,7 +739,6 @@ inkey' => 'blarg'
         );
 
         $rendered = $writer->render();
-        var_dump($rendered);
         $this->assertEquals(
             count(explode("\n", $rendered)),
             4,

From 778bf376b246d2c3d4ed609843b177fc8de39f03 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 17:06:35 +0200
Subject: [PATCH 2374/2920] Ldap\Connection: Add missing documentation

Part #1

refs #8954
---
 library/Icinga/Protocol/Ldap/Connection.php | 121 ++++++++++++++++++++
 1 file changed, 121 insertions(+)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index a28e20bb1..08590417d 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -29,10 +29,41 @@ use Icinga\Protocol\Ldap\Exception as LdapException;
  */
 class Connection implements Selectable
 {
+    /**
+     * Indicates that the target object cannot be found
+     *
+     * @var int
+     */
     const LDAP_NO_SUCH_OBJECT = 32;
+
+    /**
+     * Indicates that in a search operation, the size limit specified by the client or the server has been exceeded
+     *
+     * @var int
+     */
     const LDAP_SIZELIMIT_EXCEEDED = 4;
+
+    /**
+     * Indicates that an LDAP server limit set by an administrative authority has been exceeded
+     *
+     * @var int
+     */
     const LDAP_ADMINLIMIT_EXCEEDED = 11;
+
+    /**
+     * Indicates that during a bind operation one of the following occurred: The client passed either an incorrect DN
+     * or password, or the password is incorrect because it has expired, intruder detection has locked the account, or
+     * another similar reason.
+     *
+     * @var int
+     */
     const LDAP_INVALID_CREDENTIALS = 49;
+
+    /**
+     * The default page size to use for paged queries
+     *
+     * @var int
+     */
     const PAGE_SIZE = 1000;
 
     /**
@@ -56,7 +87,18 @@ class Connection implements Selectable
      */
     protected $encryption;
 
+    /**
+     * The LDAP link identifier being used
+     *
+     * @var resource
+     */
     protected $ds;
+
+    /**
+     * The ip address, hostname or ldap URI being used to connect with the LDAP server
+     *
+     * @var string
+     */
     protected $hostname;
     protected $port = 389;
     protected $bind_dn;
@@ -72,14 +114,23 @@ class Connection implements Selectable
      */
     protected $bound = false;
 
+    /**
+     * The current connection's root node
+     *
+     * @var Root
+     */
     protected $root;
 
     /**
+     * The properties and capabilities of the LDAP server
+     *
      * @var Capability
      */
     protected $capabilities;
 
     /**
+     * Whether discovery was successful or not
+     *
      * @var bool
      */
     protected $discoverySuccess = false;
@@ -103,21 +154,41 @@ class Connection implements Selectable
         $this->reqCert = (bool) $config->get('reqcert', $this->reqCert);
     }
 
+    /**
+     * Return the ip address, hostname or ldap URI being used to connect with the LDAP server
+     *
+     * @return  string
+     */
     public function getHostname()
     {
         return $this->hostname;
     }
 
+    /**
+     * Return the port being used to connect with the LDAP server
+     *
+     * @return  int
+     */
     public function getPort()
     {
         return $this->port;
     }
 
+    /**
+     * Return the distinguished name being used as the base path for queries which do not provide one theirselves
+     *
+     * @return  string
+     */
     public function getDn()
     {
         return $this->root_dn;
     }
 
+    /**
+     * Return the root node for this connection
+     *
+     * @return  Root
+     */
     public function root()
     {
         if ($this->root === null) {
@@ -136,6 +207,13 @@ class Connection implements Selectable
         return new Query($this);
     }
 
+    /**
+     * Fetch and return all rows of the given query's result set using an iterator
+     *
+     * @param   Query   $query  The query returning the result set
+     *
+     * @return  ArrayIterator
+     */
     public function query(Query $query)
     {
         return new ArrayIterator($this->fetchAll($query));
@@ -205,6 +283,13 @@ class Connection implements Selectable
         return $pairs;
     }
 
+    /**
+     * Return whether an entry identified by the given distinguished name exists
+     *
+     * @param   string  $dn
+     *
+     * @return  bool
+     */
     public function hasDn($dn)
     {
         $this->connect();
@@ -214,6 +299,15 @@ class Connection implements Selectable
         return ldap_count_entries($this->ds, $result) > 0;
     }
 
+    /**
+     * Delete a root entry and all of its children identified by the given distinguished name
+     *
+     * @param   string  $dn
+     *
+     * @return  bool
+     *
+     * @throws  LdapException   In case an error occured while deleting an entry
+     */
     public function deleteRecursively($dn)
     {
         $this->connect();
@@ -241,6 +335,15 @@ class Connection implements Selectable
         return $this->deleteDn($dn);
     }
 
+    /**
+     * Delete a single entry identified by the given distinguished name
+     *
+     * @param   string  $dn
+     *
+     * @return  bool
+     *
+     * @throws  LdapException   In case an error occured while deleting the entry
+     */
     public function deleteDn($dn)
     {
         $this->connect();
@@ -539,6 +642,16 @@ class Connection implements Selectable
         return $entries;
     }
 
+    /**
+     * Clean up the given attributes and return them as simple object
+     *
+     * Applies column aliases, aggregates multi-value attributes as array and sets null for each missing attribute.
+     *
+     * @param   array   $attributes
+     * @param   array   $requestedFields
+     *
+     * @return  object
+     */
     protected function cleanupAttributes($attributes, array $requestedFields)
     {
         // In case the result contains attributes with a differing case than the requested fields, it is
@@ -706,6 +819,11 @@ class Connection implements Selectable
         return $ds;
     }
 
+    /**
+     * Set up how to handle StartTLS connections
+     *
+     * @throws  LdapException   In case the LDAPRC environment variable cannot be set
+     */
     protected function prepareTlsEnvironment()
     {
         // TODO: allow variable known CA location (system VS Icinga)
@@ -883,6 +1001,9 @@ class Connection implements Selectable
         return $returnValue;
     }
 
+    /**
+     * Reset the environment variables set by self::prepareTlsEnvironment()
+     */
     public function __destruct()
     {
         putenv('LDAPRC');

From 02ee460c086921350e8da785db5d106d634c5fea Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 17:12:24 +0200
Subject: [PATCH 2375/2920] Ldap\Connection: Fix existing documentation

Part #1

refs #8954
---
 library/Icinga/Protocol/Ldap/Connection.php | 47 +++++++++------------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 08590417d..7e84c7be1 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -14,18 +14,7 @@ use Icinga\Exception\ProgrammingError;
 use Icinga\Protocol\Ldap\Exception as LdapException;
 
 /**
- * Backend class managing all the LDAP stuff for you.
- *
- * Usage example:
- *
- * <code>
- * $lconf = new Connection((object) array(
- *     'hostname' => 'localhost',
- *     'root_dn'  => 'dc=monitoring,dc=...',
- *     'bind_dn'  => 'cn=Mangager,dc=monitoring,dc=...',
- *     'bind_pw'  => '***'
- * ));
- * </code>
+ * Encapsulate LDAP connections and query creation
  */
 class Connection implements Selectable
 {
@@ -83,7 +72,7 @@ class Connection implements Selectable
     /**
      * Encryption for the connection if any
      *
-     * @var string|null
+     * @var string
      */
     protected $encryption;
 
@@ -108,7 +97,7 @@ class Connection implements Selectable
     protected $reqCert = true;
 
     /**
-     * Whether the bind on this connection was already performed
+     * Whether the bind on this connection has already been performed
      *
      * @var bool
      */
@@ -136,9 +125,9 @@ class Connection implements Selectable
     protected $discoverySuccess = false;
 
     /**
-     * Constructor
+     * Create a new connection object
      *
-     * @param ConfigObject $config
+     * @param   ConfigObject    $config
      */
     public function __construct(ConfigObject $config)
     {
@@ -365,12 +354,13 @@ class Connection implements Selectable
     }
 
     /**
-     * Fetch the distinguished name of the first result of the given query
+     * Fetch the distinguished name of the result of the given query
      *
-     * @param Query $query   The query returning the result set
+     * @param   Query   $query  The query returning the result set
      *
-     * @return string        Returns the distinguished name, or false when the given query yields no results
-     * @throws LdapException When the query result is empty and contains no DN to fetch
+     * @return  string          The distinguished name, or false when the given query yields no results
+     *
+     * @throws  LdapException   In case the query yields multiple results
      */
     public function fetchDn(Query $query)
     {
@@ -514,16 +504,17 @@ class Connection implements Selectable
     }
 
     /**
-     * Execute the given LDAP query while requesting pagination control to separate
-     * big responses into smaller chunks
+     * Run the given LDAP query and return the resulting entries
      *
-     * @param Query $query      The query to execute
-     * @param array $fields     The fields that will be fetched from the matches
-     * @param int   $pageSize   The maximum page size, defaults to Connection::PAGE_SIZE
+     * This utilizes paged search requests as defined in RFC 2696.
      *
-     * @return array            The matched entries
-     * @throws LdapException
-     * @throws ProgrammingError When executed without available page controls (check with pageControlAvailable() )
+     * @param   Query   $query      The query to fetch results with
+     * @param   array   $fields     Request these attributes instead of the ones registered in the given query
+     * @param   int     $pageSize   The maximum page size, defaults to self::PAGE_SIZE
+     *
+     * @return  array
+     *
+     * @throws  LdapException       In case an error occured while fetching the results
      */
     protected function runPagedQuery(Query $query, array $fields = null, $pageSize = null)
     {

From 9b0ac3000ab3b87ef69a871128712e48cc9a0ecf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 17:17:53 +0200
Subject: [PATCH 2376/2920] Ldap\Connection: Drop unused property $count

refs #8954
---
 library/Icinga/Protocol/Ldap/Connection.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 7e84c7be1..3661883e7 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -93,7 +93,6 @@ class Connection implements Selectable
     protected $bind_dn;
     protected $bind_pw;
     protected $root_dn;
-    protected $count;
     protected $reqCert = true;
 
     /**

From b25bf4838bec3b74cdf1aa191aeb8f526ad3ad4f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 17:22:26 +0200
Subject: [PATCH 2377/2920] Ldap\Connection: Re-organize some properties

lowerCamelCase, initialisation in __construct, and stuff..

refs #8954
---
 library/Icinga/Protocol/Ldap/Connection.php | 37 +++++++++++----------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 3661883e7..1d0fac11c 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -89,18 +89,18 @@ class Connection implements Selectable
      * @var string
      */
     protected $hostname;
-    protected $port = 389;
-    protected $bind_dn;
-    protected $bind_pw;
-    protected $root_dn;
-    protected $reqCert = true;
+    protected $port;
+    protected $bindDn;
+    protected $bindPw;
+    protected $rootDn;
+    protected $validateCertificate;
 
     /**
      * Whether the bind on this connection has already been performed
      *
      * @var bool
      */
-    protected $bound = false;
+    protected $bound;
 
     /**
      * The current connection's root node
@@ -121,7 +121,7 @@ class Connection implements Selectable
      *
      * @var bool
      */
-    protected $discoverySuccess = false;
+    protected $discoverySuccess;
 
     /**
      * Create a new connection object
@@ -131,15 +131,16 @@ class Connection implements Selectable
     public function __construct(ConfigObject $config)
     {
         $this->hostname = $config->hostname;
-        $this->bind_dn  = $config->bind_dn;
-        $this->bind_pw  = $config->bind_pw;
-        $this->root_dn  = $config->root_dn;
-        $this->port = $config->get('port', $this->port);
-        $this->encryption = $config->get('encryption');
+        $this->bindDn = $config->bind_dn;
+        $this->bindPw = $config->bind_pw;
+        $this->rootDn = $config->root_dn;
+        $this->port = $config->get('port', 389);
+        $this->validateCertificate = (bool) $config->get('reqcert', true);
+
+        $this->encryption = $config->encryption;
         if ($this->encryption !== null) {
             $this->encryption = strtolower($this->encryption);
         }
-        $this->reqCert = (bool) $config->get('reqcert', $this->reqCert);
     }
 
     /**
@@ -169,7 +170,7 @@ class Connection implements Selectable
      */
     public function getDn()
     {
-        return $this->root_dn;
+        return $this->rootDn;
     }
 
     /**
@@ -445,7 +446,7 @@ class Connection implements Selectable
 
         $results = @ldap_search(
             $this->ds,
-            $query->getBase() ?: $this->root_dn,
+            $query->getBase() ?: $this->rootDn,
             (string) $query,
             array_values($fields),
             0, // Attributes and values
@@ -459,7 +460,7 @@ class Connection implements Selectable
             throw new LdapException(
                 'LDAP query "%s" (base %s) failed. Error: %s',
                 $query,
-                $query->getBase() ?: $this->root_dn,
+                $query->getBase() ?: $this->rootDn,
                 ldap_error($this->ds)
             );
         } elseif (ldap_count_entries($this->ds, $results) === 0) {
@@ -524,7 +525,7 @@ class Connection implements Selectable
         $limit = $query->getLimit();
         $offset = $query->hasOffset() ? $query->getOffset() - 1 : 0;
         $queryString = (string) $query;
-        $base = $query->getBase() ?: $this->root_dn;
+        $base = $query->getBase() ?: $this->rootDn;
 
         if (empty($fields)) {
             $fields = $query->getColumns();
@@ -820,7 +821,7 @@ class Connection implements Selectable
         if (Platform::isWindows()) {
             putenv('LDAPTLS_REQCERT=never');
         } else {
-            if ($this->reqCert) {
+            if ($this->validateCertificate) {
                 $ldap_conf = $this->getConfigDir('ldap_ca.conf');
             } else {
                 $ldap_conf = $this->getConfigDir('ldap_nocert.conf');

From 7640284564d855bd63682aa3c5dfc062ad2a4952 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 17:23:47 +0200
Subject: [PATCH 2378/2920] Ldap\Connection: Add missing documentation

Part #2

refs #8954
---
 library/Icinga/Protocol/Ldap/Connection.php | 52 +++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 1d0fac11c..da8f06078 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -89,10 +89,40 @@ class Connection implements Selectable
      * @var string
      */
     protected $hostname;
+
+    /**
+     * The port being used to connect with the LDAP server
+     *
+     * @var int
+     */
     protected $port;
+
+    /**
+     * The distinguished name being used to bind to the LDAP server
+     *
+     * @var string
+     */
     protected $bindDn;
+
+    /**
+     * The password being used to bind to the LDAP server
+     *
+     * @var string
+     */
     protected $bindPw;
+
+    /**
+     * The distinguished name being used as the base path for queries which do not provide one theirselves
+     *
+     * @var string
+     */
     protected $rootDn;
+
+    /**
+     * Whether to load the configuration for strict certificate validation or the one for non-strict validation
+     *
+     * @var bool
+     */
     protected $validateCertificate;
 
     /**
@@ -214,6 +244,16 @@ class Connection implements Selectable
         return array_shift($row) ?: false;
     }
 
+    /**
+     * Fetch the first column of all rows of the result set as an array
+     *
+     * @param   Query   $query      The query returning the result set
+     * @param   array   $fields     Request these attributes instead of the ones registered in the given query
+     *
+     * @return  array
+     *
+     * @throws  ProgrammingError    In case no attribute is being requested
+     */
     public function fetchColumn(Query $query, array $fields = null)
     {
         if ($fields === null) {
@@ -236,6 +276,18 @@ class Connection implements Selectable
         return $values;
     }
 
+    /**
+     * Fetch all rows of the result set as an array of key-value pairs
+     *
+     * The first column is the key, the second column is the value.
+     *
+     * @param   Query   $query      The query returning the result set
+     * @param   array   $fields     Request these attributes instead of the ones registered in the given query
+     *
+     * @return  array
+     *
+     * @throws  ProgrammingError    In case there are less than two attributes being requested
+     */
     public function fetchPairs(Query $query, array $fields = null)
     {
         if ($fields === null) {

From 372ca8859e30888ef0e1e0b87dfd154dab4665b2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 17:27:30 +0200
Subject: [PATCH 2379/2920] Ldap\Connection: Some coding style fixes

refs #8954
---
 library/Icinga/Protocol/Ldap/Connection.php | 57 ++++++++++-----------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index da8f06078..256a9d3ef 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -213,6 +213,7 @@ class Connection implements Selectable
         if ($this->root === null) {
             $this->root = Root::forConnection($this);
         }
+
         return $this->root;
     }
 
@@ -359,20 +360,19 @@ class Connection implements Selectable
             if (ldap_errno($this->ds) === self::LDAP_NO_SUCH_OBJECT) {
                 return false;
             }
-            throw new LdapException(
-                'LDAP list for "%s" failed: %s',
-                $dn,
-                ldap_error($this->ds)
-            );
+
+            throw new LdapException('LDAP list for "%s" failed: %s', $dn, ldap_error($this->ds));
         }
+
         $children = ldap_get_entries($this->ds, $result);
         for ($i = 0; $i < $children['count']; $i++) {
             $result = $this->deleteRecursively($children[$i]['dn']);
-            if (!$result) {
-                //return result code, if delete fails
+            if (! $result) {
+                // TODO: return result code, if delete fails
                 throw new LdapException('Recursively deleting "%s" failed', $dn);
             }
         }
+
         return $this->deleteDn($dn);
     }
 
@@ -393,13 +393,10 @@ class Connection implements Selectable
         $result = @ldap_delete($this->ds, $dn);
         if ($result === false) {
             if (ldap_errno($this->ds) === self::LDAP_NO_SUCH_OBJECT) {
-                return false;
+                return false; // TODO: Isn't it a success if something i'd like to remove is not existing at all???
             }
-            throw new LdapException(
-                'LDAP delete for "%s" failed: %s',
-                $dn,
-                ldap_error($this->ds)
-            );
+
+            throw new LdapException('LDAP delete for "%s" failed: %s', $dn, ldap_error($this->ds));
         }
 
         return true;
@@ -418,10 +415,7 @@ class Connection implements Selectable
     {
         $rows = $this->fetchAll($query, array());
         if (count($rows) > 1) {
-            throw new LdapException(
-                'Cannot fetch single DN for %s',
-                $query
-            );
+            throw new LdapException('Cannot fetch single DN for %s', $query);
         }
         return key($rows);
     }
@@ -482,7 +476,7 @@ class Connection implements Selectable
         $limit = $query->getLimit();
         $offset = $query->hasOffset() ? $query->getOffset() - 1 : 0;
 
-        if (empty($fields)) {
+        if ($fields === null) {
             $fields = $query->getColumns();
         }
 
@@ -490,8 +484,8 @@ class Connection implements Selectable
         if ($serverSorting && $query->hasOrder()) {
             ldap_set_option($this->ds, LDAP_OPT_SERVER_CONTROLS, array(
                 array(
-                    'oid'           => Capability::LDAP_SERVER_SORT_OID,
-                    'value'         => $this->encodeSortRules($query->getOrder())
+                    'oid'   => Capability::LDAP_SERVER_SORT_OID,
+                    'value' => $this->encodeSortRules($query->getOrder())
                 )
             ));
         }
@@ -570,7 +564,7 @@ class Connection implements Selectable
      */
     protected function runPagedQuery(Query $query, array $fields = null, $pageSize = null)
     {
-        if (! isset($pageSize)) {
+        if ($pageSize === null) {
             $pageSize = static::PAGE_SIZE;
         }
 
@@ -579,7 +573,7 @@ class Connection implements Selectable
         $queryString = (string) $query;
         $base = $query->getBase() ?: $this->rootDn;
 
-        if (empty($fields)) {
+        if ($fields === null) {
             $fields = $query->getColumns();
         }
 
@@ -587,8 +581,8 @@ class Connection implements Selectable
         if ($serverSorting && $query->hasOrder()) {
             ldap_set_option($this->ds, LDAP_OPT_SERVER_CONTROLS, array(
                 array(
-                    'oid'           => Capability::LDAP_SERVER_SORT_OID,
-                    'value'         => $this->encodeSortRules($query->getOrder())
+                    'oid'   => Capability::LDAP_SERVER_SORT_OID,
+                    'value' => $this->encodeSortRules($query->getOrder())
                 )
             ));
         }
@@ -597,8 +591,8 @@ class Connection implements Selectable
         $cookie = '';
         $entries = array();
         do {
-            // do not set controlPageResult as a critical extension, since we still want the
-            // possibillity  server to return an answer in case the pagination extension is missing.
+            // Do not request the pagination control as a critical extension, as we want the
+            // server to return results even if the paged search request cannot be satisfied
             ldap_control_paged_result($this->ds, $pageSize, false, $cookie);
 
             $results = @ldap_search(
@@ -654,10 +648,11 @@ class Connection implements Selectable
                 // This applies no matter whether paged search requests are permitted or not. You're done once you
                 // got everything you were out for.
                 if ($serverSorting && count($entries) !== $limit) {
-
                     // The server does not support pagination, but still returned a response by ignoring the
                     // pagedResultsControl. We output a warning to indicate that the pagination control was ignored.
-                    Logger::warning('Unable to request paged LDAP results. Does the server allow paged search requests?');
+                    Logger::warning(
+                        'Unable to request paged LDAP results. Does the server allow paged search requests?'
+                    );
                 }
             }
 
@@ -821,14 +816,17 @@ class Connection implements Selectable
         }
 
         $ds = ldap_connect($hostname, $this->port);
+
         try {
             $this->capabilities = $this->discoverCapabilities($ds);
             $this->discoverySuccess = true;
         } catch (LdapException $e) {
             Logger::debug($e);
-            Logger::warning('LADP discovery failed, assuming default LDAP settings.');
+            Logger::warning('LADP discovery failed, assuming default LDAP capabilities.');
             $this->capabilities = new Capability(); // create empty default capabilities
+            $this->discoverySuccess = false;
         }
+
         if ($this->encryption === static::STARTTLS) {
             $force_tls = false;
             if ($this->capabilities->hasStartTls()) {
@@ -878,6 +876,7 @@ class Connection implements Selectable
             } else {
                 $ldap_conf = $this->getConfigDir('ldap_nocert.conf');
             }
+
             putenv('LDAPRC=' . $ldap_conf); // TODO: Does not have any effect
             if (getenv('LDAPRC') !== $ldap_conf) {
                 throw new LdapException('putenv failed');

From f234b3b76850cd8bdab33e44d8a5b00174e8a7c0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 17:37:10 +0200
Subject: [PATCH 2380/2920] Ldap\Connection: Re-organize some methods..

..and add some missing documentation.

refs #8954
---
 library/Icinga/Protocol/Ldap/Connection.php | 379 +++++++++++---------
 1 file changed, 204 insertions(+), 175 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index 256a9d3ef..f6a3cb453 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -217,6 +217,68 @@ class Connection implements Selectable
         return $this->root;
     }
 
+    /**
+     * Return the capabilities of the current connection
+     *
+     * @return  Capability
+     */
+    public function getCapabilities()
+    {
+        if ($this->capabilities === null) {
+            $this->connect(); // Populates $this->capabilities
+        }
+
+        return $this->capabilities;
+    }
+
+    /**
+     * Return whether discovery was successful or not
+     *
+     * @return  bool    true if the capabilities were successfully determined, false if the capabilities were guessed
+     */
+    public function discoverySuccessful()
+    {
+        return $this->discoverySuccess;
+    }
+
+    /**
+     * Establish a connection
+     *
+     * @throws  LdapException   In case the connection could not be established
+     */
+    public function connect()
+    {
+        if ($this->ds === null) {
+            $this->ds = $this->prepareNewConnection();
+        }
+    }
+
+    /**
+     * Perform a LDAP bind on the current connection
+     *
+     * @throws  LdapException   In case the LDAP bind was unsuccessful
+     */
+    public function bind()
+    {
+        if ($this->bound) {
+            return;
+        }
+
+        $success = @ldap_bind($this->ds, $this->bindDn, $this->bindPw);
+        if (! $success) {
+            throw new LdapException(
+                'LDAP connection to %s:%s (%s / %s) failed: %s',
+                $this->hostname,
+                $this->port,
+                $this->bindDn,
+                '***' /* $this->bindPw */,
+                ldap_error($this->ds)
+            );
+        }
+
+        $this->bound = true;
+    }
+
     /**
      * Provide a query on this connection
      *
@@ -239,10 +301,61 @@ class Connection implements Selectable
         return new ArrayIterator($this->fetchAll($query));
     }
 
-    public function fetchOne($query, $fields = array())
+    /**
+     * Count all rows of the given query's result set
+     *
+     * @param   Query   $query  The query returning the result set
+     *
+     * @return  int
+     */
+    public function count(Query $query)
     {
-        $row = (array) $this->fetchRow($query, $fields);
-        return array_shift($row) ?: false;
+        $this->connect();
+        $this->bind();
+
+        $res = $this->runQuery($query, array());
+        return count($res);
+    }
+
+    /**
+     * Retrieve an array containing all rows of the result set
+     *
+     * @param   Query   $query      The query returning the result set
+     * @param   array   $fields     Request these attributes instead of the ones registered in the given query
+     *
+     * @return  array
+     */
+    public function fetchAll(Query $query, array $fields = null)
+    {
+        $this->connect();
+        $this->bind();
+
+        if (
+            $query->getUsePagedResults()
+            && version_compare(PHP_VERSION, '5.4.0') >= 0
+            && $this->getCapabilities()->hasPagedResult()
+        ) {
+            return $this->runPagedQuery($query, $fields);
+        } else {
+            return $this->runQuery($query, $fields);
+        }
+    }
+
+    /**
+     * Fetch the first row of the result set
+     *
+     * @param   Query   $query      The query returning the result set
+     * @param   array   $fields     Request these attributes instead of the ones registered in the given query
+     *
+     * @return  mixed
+     */
+    public function fetchRow(Query $query, array $fields = null)
+    {
+        $clonedQuery = clone $query;
+        $clonedQuery->limit(1);
+        $clonedQuery->setUsePagedResults(false);
+        $results = $this->fetchAll($clonedQuery, $fields);
+        return array_shift($results) ?: false;
     }
 
     /**
@@ -277,6 +390,20 @@ class Connection implements Selectable
         return $values;
     }
 
+    /**
+     * Fetch the first column of the first row of the result set
+     *
+     * @param   Query   $query      The query returning the result set
+     * @param   array   $fields     Request these attributes instead of the ones registered in the given query
+     *
+     * @return  string
+     */
+    public function fetchOne(Query $query, array $fields = null)
+    {
+        $row = (array) $this->fetchRow($query, $fields);
+        return array_shift($row) ?: false;
+    }
+
     /**
      * Fetch all rows of the result set as an array of key-value pairs
      *
@@ -325,6 +452,38 @@ class Connection implements Selectable
         return $pairs;
     }
 
+    /**
+     * Test the given LDAP credentials by establishing a connection and attempting a LDAP bind
+     *
+     * @param   string  $bindDn
+     * @param   string  $bindPw
+     *
+     * @return  bool                Whether the given credentials are valid
+     *
+     * @throws  LdapException       In case an error occured while establishing the connection or attempting the bind
+     */
+    public function testCredentials($bindDn, $bindPw)
+    {
+        $this->connect();
+
+        $success = @ldap_bind($this->ds, $bindDn, $bindPw);
+        if (! $success) {
+            if (ldap_errno($this->ds) === self::LDAP_INVALID_CREDENTIALS) {
+                Logger::debug(
+                    'Testing LDAP credentials (%s / %s) failed: %s',
+                    $bindDn,
+                    '***',
+                    ldap_error($this->ds)
+                );
+                return false;
+            }
+
+            throw new LdapException(ldap_error($this->ds));
+        }
+
+        return true;
+    }
+
     /**
      * Return whether an entry identified by the given distinguished name exists
      *
@@ -417,52 +576,12 @@ class Connection implements Selectable
         if (count($rows) > 1) {
             throw new LdapException('Cannot fetch single DN for %s', $query);
         }
+
         return key($rows);
     }
 
     /**
-     * @param       $query
-     * @param array $fields
      *
-     * @return mixed
-     */
-    public function fetchRow($query, $fields = array())
-    {
-        $query = clone $query;
-        $query->limit(1);
-        $query->setUsePagedResults(false);
-        $results = $this->fetchAll($query, $fields);
-        return array_shift($results) ?: false;
-    }
-
-    /**
-     * @param Query $query
-     *
-     * @return int
-     */
-    public function count(Query $query)
-    {
-        $this->connect();
-        $this->bind();
-
-        // TODO: That's still not the best solution, this should probably not request any attributes
-        $res = $this->runQuery($query);
-        return count($res);
-    }
-
-    public function fetchAll(Query $query, $fields = array())
-    {
-        $this->connect();
-        $this->bind();
-
-        if ($this->pageControlAvailable($query)) {
-            return $this->runPagedQuery($query, $fields);
-        } else {
-            return $this->runQuery($query, $fields);
-        }
-    }
-
-    /**
      * Execute the given LDAP query and return the resulting entries
      *
      * @param Query $query      The query to execute
@@ -539,16 +658,6 @@ class Connection implements Selectable
         return $entries;
     }
 
-    /**
-     * Returns whether requesting the page control is available
-     */
-    protected function pageControlAvailable(Query $query)
-    {
-        return $this->capabilities->hasPagedResult() &&
-               $query->getUsePagedResults() &&
-               version_compare(PHP_VERSION, '5.4.0') >= 0;
-    }
-
     /**
      * Run the given LDAP query and return the resulting entries
      *
@@ -762,43 +871,8 @@ class Connection implements Selectable
         return $seq;
     }
 
-    public function testCredentials($username, $password)
-    {
-        $this->connect();
-
-        $success = @ldap_bind($this->ds, $username, $password);
-        if (! $success) {
-            if (ldap_errno($this->ds) === self::LDAP_INVALID_CREDENTIALS) {
-                Logger::debug(
-                    'Testing LDAP credentials (%s / %s) failed: %s',
-                    $username,
-                    '***',
-                    ldap_error($this->ds)
-                );
-                return false;
-            }
-
-            throw new LdapException(ldap_error($this->ds));
-        }
-
-        return true;
-    }
-
     /**
-     * @param null $sub
      *
-     * @return string
-     */
-    protected function getConfigDir($sub = null)
-    {
-        $dir = Config::$configDir . '/ldap';
-        if ($sub !== null) {
-            $dir .= '/' . $sub;
-        }
-        return $dir;
-    }
-
-    /**
      * Connect to the given ldap server and apply settings depending on the discovered capabilities
      *
      * @return resource        A positive LDAP link identifier
@@ -885,31 +959,7 @@ class Connection implements Selectable
     }
 
     /**
-     * Get the capabilities of the connected server
      *
-     * @return Capability   The capability object
-     */
-    public function getCapabilities()
-    {
-        if ($this->capabilities === null) {
-            $this->connect(); // Populates $this->capabilities
-        }
-
-        return $this->capabilities;
-    }
-
-    /**
-     * Whether service discovery was successful
-     *
-     * @return boolean  True when ldap settings were discovered, false when
-     *                   settings were guessed
-     */
-    public function discoverySuccessful()
-    {
-        return $this->discoverySuccess;
-    }
-
-    /**
      * Discover the capabilities of the given ldap-server
      *
      * @param  resource     $ds     The link identifier of the current ldap connection
@@ -959,88 +1009,67 @@ class Connection implements Selectable
     }
 
     /**
-     * Try to connect to the given ldap server
+     * Create an LDAP entry
      *
-     * @throws LdapException   When connecting is not possible
+     * @param   string  $dn             The distinguished name to use
+     * @param   array   $attributes     The entry's attributes
+     *
+     * @return  bool                    Whether the operation was successful
      */
-    public function connect()
+    public function addEntry($dn, array $attributes)
     {
-        if ($this->ds !== null) {
-            return;
-        }
-        $this->ds = $this->prepareNewConnection();
+        return ldap_add($this->ds, $dn, $attributes);
     }
 
     /**
-     * Try to bind to the current ldap domain using the provided bind_dn and bind_pw
+     * Modify an LDAP entry
      *
-     * @throws LdapException   When binding is not possible
+     * @param   string  $dn             The distinguished name to use
+     * @param   array   $attributes     The attributes to update the entry with
+     *
+     * @return  bool                    Whether the operation was successful
      */
-    public function bind()
+    public function modifyEntry($dn, array $attributes)
     {
-        if ($this->bound) {
-            return;
-        }
-
-        $r = @ldap_bind($this->ds, $this->bind_dn, $this->bind_pw);
-        if (! $r) {
-            throw new LdapException(
-                'LDAP connection to %s:%s (%s / %s) failed: %s',
-                $this->hostname,
-                $this->port,
-                $this->bind_dn,
-                '***' /* $this->bind_pw */,
-                ldap_error($this->ds)
-            );
-        }
-        $this->bound = true;
+        return ldap_modify($this->ds, $dn, $attributes);
     }
 
     /**
-     * Create an ldap entry
+     * Change the distinguished name of an LDAP entry
      *
-     * @param   string  $dn     DN to add
-     * @param   array   $entry  Entry description
+     * @param   string  $dn             The entry's current distinguished name
+     * @param   string  $newRdn         The new relative distinguished name
+     * @param   string  $newParentDn    The new parent or superior entry's distinguished name
      *
-     * @return bool             True on success
-     */
-    public function addEntry($dn, array $entry)
-    {
-        return ldap_add($this->ds, $dn, $entry);
-    }
-
-    /**
-     * Modify a ldap entry
+     * @return  resource                The resulting search result identifier
      *
-     * @param string $dn        DN of the entry to change
-     * @param array  $entry     Change values
-     *
-     * @return bool             True on success
-     */
-    public function modifyEntry($dn, array $entry)
-    {
-        return ldap_modify($this->ds, $dn, $entry);
-    }
-
-    /**
-     * Move entry to a new DN
-     *
-     * @param   string $dn          DN of the object
-     * @param   string $newRdn      Relative DN identifier
-     * @param   string $newParentDn Parent or superior entry
-     * @throws  LdapException       Thrown then rename failed
-     *
-     * @return bool                 True on success
+     * @throws  LdapException           In case an error occured
      */
     public function moveEntry($dn, $newRdn, $newParentDn)
     {
-        $returnValue = ldap_rename($this->ds, $dn, $newRdn, $newParentDn, false);
-
-        if ($returnValue === false) {
-            throw new LdapException('Could not move entry: ' . ldap_error($this->ds));
+        $result = ldap_rename($this->ds, $dn, $newRdn, $newParentDn, false);
+        if ($result === false) {
+            throw new LdapException('Could not move entry "%s" to "%s": %s', $dn, $newRdn, ldap_error($this->ds));
         }
 
-        return $returnValue;
+        return $result;
+    }
+
+    /**
+     * Return the LDAP specific configuration directory with the given relative path being appended
+     *
+     * @param   string  $sub
+     *
+     * @return  string
+     */
+    protected function getConfigDir($sub = null)
+    {
+        $dir = Config::$configDir . '/ldap';
+        if ($sub !== null) {
+            $dir .= '/' . $sub;
+        }
+
+        return $dir;
     }
 
     /**

From 7921e62a0c677bc46e18474b8e810ee80499bead Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 23 Jun 2015 17:38:19 +0200
Subject: [PATCH 2381/2920] Ldap\Connection: Fix existing documentation

Part #2

refs #8954
---
 library/Icinga/Protocol/Ldap/Connection.php | 24 ++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php
index f6a3cb453..bc5fac185 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/Connection.php
@@ -581,14 +581,14 @@ class Connection implements Selectable
     }
 
     /**
+     * Run the given LDAP query and return the resulting entries
      *
-     * Execute the given LDAP query and return the resulting entries
+     * @param   Query   $query      The query to fetch results with
+     * @param   array   $fields     Request these attributes instead of the ones registered in the given query
      *
-     * @param Query $query      The query to execute
-     * @param array $fields     The fields that will be fetched from the matches
+     * @return  array
      *
-     * @return array            The matched entries
-     * @throws LdapException
+     * @throws  LdapException       In case an error occured while fetching the results
      */
     protected function runQuery(Query $query, array $fields = null)
     {
@@ -872,11 +872,11 @@ class Connection implements Selectable
     }
 
     /**
+     * Prepare and establish a connection with the LDAP server
      *
-     * Connect to the given ldap server and apply settings depending on the discovered capabilities
+     * @return  resource        A positive LDAP link identifier
      *
-     * @return resource        A positive LDAP link identifier
-     * @throws LdapException   When the connection is not possible
+     * @throws  LdapException   In case the connection is not possible
      */
     protected function prepareNewConnection()
     {
@@ -959,13 +959,13 @@ class Connection implements Selectable
     }
 
     /**
+     * Discover the capabilities of the given LDAP server
      *
-     * Discover the capabilities of the given ldap-server
+     * @param   resource    $ds     The link identifier of the current LDAP connection
      *
-     * @param  resource     $ds     The link identifier of the current ldap connection
+     * @return  Capability
      *
-     * @return Capability           The capabilities
-     * @throws LdapException        When the capability query fails
+     * @throws  LdapException       In case the capability query has failed
      */
     protected function discoverCapabilities($ds)
     {

From c3ad7b211a1ae3bb9705aad0a4065fea1fcc7a3d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 24 Jun 2015 09:05:29 +0200
Subject: [PATCH 2382/2920] Ldap\Connection: Rename to LdapConnection

refs #8954
---
 .../forms/Config/Resource/LdapResourceForm.php   | 10 +++++-----
 .../UserGroup/LdapUserGroupBackendForm.php       |  6 +++---
 library/Icinga/Data/ResourceFactory.php          |  2 +-
 library/Icinga/Protocol/Ldap/Discovery.php       |  8 ++++----
 .../Ldap/{Connection.php => LdapConnection.php}  |  2 +-
 library/Icinga/Protocol/Ldap/Node.php            |  2 +-
 library/Icinga/Protocol/Ldap/Root.php            | 16 ++++++++--------
 library/Icinga/Repository/LdapRepository.php     |  8 ++++----
 .../library/Icinga/Protocol/Ldap/QueryTest.php   |  4 ++--
 9 files changed, 29 insertions(+), 29 deletions(-)
 rename library/Icinga/Protocol/Ldap/{Connection.php => LdapConnection.php} (99%)

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 0fa0cb47b..6821a8593 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -7,7 +7,7 @@ use Exception;
 use Icinga\Web\Form;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
-use Icinga\Protocol\Ldap\Connection;
+use Icinga\Protocol\Ldap\LdapConnection;
 
 /**
  * Form class for adding/modifying ldap resources
@@ -27,7 +27,7 @@ class LdapResourceForm extends Form
      */
     public function createElements(array $formData)
     {
-        $defaultPort = ! array_key_exists('encryption', $formData) || $formData['encryption'] !== Connection::LDAPS
+        $defaultPort = ! array_key_exists('encryption', $formData) || $formData['encryption'] !== LdapConnection::LDAPS
             ? 389
             : 636;
 
@@ -75,9 +75,9 @@ class LdapResourceForm extends Form
                     . ' none for unencrypted communication'
                 ),
                 'multiOptions'  => array(
-                    'none'                  => $this->translate('None', 'resource.ldap.encryption'),
-                    Connection::STARTTLS    => 'STARTTLS',
-                    Connection::LDAPS       => 'LDAPS'
+                    'none'                      => $this->translate('None', 'resource.ldap.encryption'),
+                    LdapConnection::STARTTLS    => 'STARTTLS',
+                    LdapConnection::LDAPS       => 'LDAPS'
                 )
             )
         );
diff --git a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
index c3c8baacf..6190ab404 100644
--- a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
+++ b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
@@ -8,7 +8,7 @@ use Icinga\Authentication\User\UserBackend;
 use Icinga\Authentication\UserGroup\LdapUserGroupBackend;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
-use Icinga\Protocol\Ldap\Connection;
+use Icinga\Protocol\Ldap\LdapConnection;
 use Icinga\Web\Form;
 use Icinga\Web\Notification;
 
@@ -286,11 +286,11 @@ class LdapUserGroupBackendForm extends Form
     /**
      * Return the names of all configured LDAP user backends
      *
-     * @param   Connection  $resource
+     * @param   LdapConnection  $resource
      *
      * @return  array
      */
-    protected function getLdapUserBackendNames(Connection $resource)
+    protected function getLdapUserBackendNames(LdapConnection $resource)
     {
         $names = array();
         foreach (Config::app('authentication') as $name => $config) {
diff --git a/library/Icinga/Data/ResourceFactory.php b/library/Icinga/Data/ResourceFactory.php
index add35baac..6a664759b 100644
--- a/library/Icinga/Data/ResourceFactory.php
+++ b/library/Icinga/Data/ResourceFactory.php
@@ -8,7 +8,7 @@ use Icinga\Util\ConfigAwareFactory;
 use Icinga\Exception\ConfigurationError;
 use Icinga\Data\Db\DbConnection;
 use Icinga\Protocol\Livestatus\Connection as LivestatusConnection;
-use Icinga\Protocol\Ldap\Connection as LdapConnection;
+use Icinga\Protocol\Ldap\LdapConnection;
 use Icinga\Protocol\File\FileReader;
 
 /**
diff --git a/library/Icinga/Protocol/Ldap/Discovery.php b/library/Icinga/Protocol/Ldap/Discovery.php
index 1d7acbab9..1fdcd6755 100644
--- a/library/Icinga/Protocol/Ldap/Discovery.php
+++ b/library/Icinga/Protocol/Ldap/Discovery.php
@@ -9,7 +9,7 @@ use Icinga\Protocol\Dns;
 class Discovery {
 
     /**
-     * @var Connection
+     * @var LdapConnection
      */
     private $connection;
 
@@ -21,9 +21,9 @@ class Discovery {
     private $discovered = false;
 
     /**
-     * @param Connection $conn  The ldap connection to use for the discovery
+     * @param   LdapConnection  $conn   The ldap connection to use for the discovery
      */
-    public function __construct(Connection $conn)
+    public function __construct(LdapConnection $conn)
     {
         $this->connection = $conn;
     }
@@ -147,7 +147,7 @@ class Discovery {
      */
     public static function discover($host, $port)
     {
-        $conn = new Connection(new ConfigObject(array(
+        $conn = new LdapConnection(new ConfigObject(array(
             'hostname' => $host,
             'port'     => $port
         )));
diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
similarity index 99%
rename from library/Icinga/Protocol/Ldap/Connection.php
rename to library/Icinga/Protocol/Ldap/LdapConnection.php
index bc5fac185..5d3d7ee4b 100644
--- a/library/Icinga/Protocol/Ldap/Connection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -16,7 +16,7 @@ use Icinga\Protocol\Ldap\Exception as LdapException;
 /**
  * Encapsulate LDAP connections and query creation
  */
-class Connection implements Selectable
+class LdapConnection implements Selectable
 {
     /**
      * Indicates that the target object cannot be found
diff --git a/library/Icinga/Protocol/Ldap/Node.php b/library/Icinga/Protocol/Ldap/Node.php
index d2ad2553d..a8f4ce314 100644
--- a/library/Icinga/Protocol/Ldap/Node.php
+++ b/library/Icinga/Protocol/Ldap/Node.php
@@ -14,7 +14,7 @@ namespace Icinga\Protocol\Ldap;
 class Node extends Root
 {
     /**
-     * @var Connection
+     * @var LdapConnection
      */
     protected $connection;
 
diff --git a/library/Icinga/Protocol/Ldap/Root.php b/library/Icinga/Protocol/Ldap/Root.php
index 5f1fb545d..23729d10f 100644
--- a/library/Icinga/Protocol/Ldap/Root.php
+++ b/library/Icinga/Protocol/Ldap/Root.php
@@ -22,7 +22,7 @@ class Root
     protected $rdn;
 
     /**
-     * @var Connection
+     * @var LdapConnection
      */
     protected $connection;
 
@@ -37,9 +37,9 @@ class Root
     protected $props = array();
 
     /**
-     * @param Connection $connection
+     * @param LdapConnection $connection
      */
-    protected function __construct(Connection $connection)
+    protected function __construct(LdapConnection $connection)
     {
         $this->connection = $connection;
     }
@@ -53,10 +53,10 @@ class Root
     }
 
     /**
-     * @param Connection $connection
+     * @param LdapConnection $connection
      * @return Root
      */
-    public static function forConnection(Connection $connection)
+    public static function forConnection(LdapConnection $connection)
     {
         $root = new Root($connection);
         return $root;
@@ -177,17 +177,17 @@ class Root
     }
 
     /**
-     * @param Connection $connection
+     * @param LdapConnection $connection
      * @return $this
      */
-    public function setConnection(Connection $connection)
+    public function setConnection(LdapConnection $connection)
     {
         $this->connection = $connection;
         return $this;
     }
 
     /**
-     * @return Connection
+     * @return LdapConnection
      */
     public function getConnection()
     {
diff --git a/library/Icinga/Repository/LdapRepository.php b/library/Icinga/Repository/LdapRepository.php
index 7cf00ae66..ac210516d 100644
--- a/library/Icinga/Repository/LdapRepository.php
+++ b/library/Icinga/Repository/LdapRepository.php
@@ -3,7 +3,7 @@
 
 namespace Icinga\Repository;
 
-use Icinga\Protocol\Ldap\Connection;
+use Icinga\Protocol\Ldap\LdapConnection;
 
 /**
  * Abstract base class for concrete LDAP repository implementations
@@ -18,7 +18,7 @@ abstract class LdapRepository extends Repository
     /**
      * The datasource being used
      *
-     * @var Connection
+     * @var LdapConnection
      */
     protected $ds;
 
@@ -40,9 +40,9 @@ abstract class LdapRepository extends Repository
     /**
      * Create a new LDAP repository object
      *
-     * @param   Connection  $ds     The data source to use
+     * @param   LdapConnection  $ds     The data source to use
      */
-    public function __construct(Connection $ds)
+    public function __construct(LdapConnection $ds)
     {
         parent::__construct($ds);
     }
diff --git a/test/php/library/Icinga/Protocol/Ldap/QueryTest.php b/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
index 44e47df78..101550b58 100644
--- a/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
+++ b/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
@@ -5,7 +5,7 @@ namespace Tests\Icinga\Protocol\Ldap;
 
 use Icinga\Data\ConfigObject;
 use Icinga\Test\BaseTestCase;
-use Icinga\Protocol\Ldap\Connection;
+use Icinga\Protocol\Ldap\LdapConnection;
 
 class QueryTest extends BaseTestCase
 {
@@ -20,7 +20,7 @@ class QueryTest extends BaseTestCase
             )
         );
 
-        $connection = new Connection($config);
+        $connection = new LdapConnection($config);
         return $connection->select();
     }
 

From 5dea14f04ba4f099affa61b8479aefc511cc793d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 24 Jun 2015 09:14:25 +0200
Subject: [PATCH 2383/2920] Ldap\Query: Rename to LdapQuery

refs #8954
---
 .../Icinga/Protocol/Ldap/LdapConnection.php   | 72 +++++++++----------
 .../Ldap/{Query.php => LdapQuery.php}         |  2 +-
 2 files changed, 37 insertions(+), 37 deletions(-)
 rename library/Icinga/Protocol/Ldap/{Query.php => LdapQuery.php} (99%)

diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index 5d3d7ee4b..188db07b0 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -282,21 +282,21 @@ class LdapConnection implements Selectable
     /**
      * Provide a query on this connection
      *
-     * @return  Query
+     * @return  LdapQuery
      */
     public function select()
     {
-        return new Query($this);
+        return new LdapQuery($this);
     }
 
     /**
      * Fetch and return all rows of the given query's result set using an iterator
      *
-     * @param   Query   $query  The query returning the result set
+     * @param   LdapQuery   $query  The query returning the result set
      *
      * @return  ArrayIterator
      */
-    public function query(Query $query)
+    public function query(LdapQuery $query)
     {
         return new ArrayIterator($this->fetchAll($query));
     }
@@ -304,11 +304,11 @@ class LdapConnection implements Selectable
     /**
      * Count all rows of the given query's result set
      *
-     * @param   Query   $query  The query returning the result set
+     * @param   LdapQuery   $query  The query returning the result set
      *
      * @return  int
      */
-    public function count(Query $query)
+    public function count(LdapQuery $query)
     {
         $this->connect();
         $this->bind();
@@ -320,12 +320,12 @@ class LdapConnection implements Selectable
     /**
      * Retrieve an array containing all rows of the result set
      *
-     * @param   Query   $query      The query returning the result set
-     * @param   array   $fields     Request these attributes instead of the ones registered in the given query
+     * @param   LdapQuery   $query      The query returning the result set
+     * @param   array       $fields     Request these attributes instead of the ones registered in the given query
      *
      * @return  array
      */
-    public function fetchAll(Query $query, array $fields = null)
+    public function fetchAll(LdapQuery $query, array $fields = null)
     {
         $this->connect();
         $this->bind();
@@ -344,12 +344,12 @@ class LdapConnection implements Selectable
     /**
      * Fetch the first row of the result set
      *
-     * @param   Query   $query      The query returning the result set
-     * @param   array   $fields     Request these attributes instead of the ones registered in the given query
+     * @param   LdapQuery   $query      The query returning the result set
+     * @param   array       $fields     Request these attributes instead of the ones registered in the given query
      *
      * @return  mixed
      */
-    public function fetchRow(Query $query, array $fields = null)
+    public function fetchRow(LdapQuery $query, array $fields = null)
     {
         $clonedQuery = clone $query;
         $clonedQuery->limit(1);
@@ -361,14 +361,14 @@ class LdapConnection implements Selectable
     /**
      * Fetch the first column of all rows of the result set as an array
      *
-     * @param   Query   $query      The query returning the result set
-     * @param   array   $fields     Request these attributes instead of the ones registered in the given query
+     * @param   LdapQuery   $query      The query returning the result set
+     * @param   array       $fields     Request these attributes instead of the ones registered in the given query
      *
      * @return  array
      *
-     * @throws  ProgrammingError    In case no attribute is being requested
+     * @throws  ProgrammingError        In case no attribute is being requested
      */
-    public function fetchColumn(Query $query, array $fields = null)
+    public function fetchColumn(LdapQuery $query, array $fields = null)
     {
         if ($fields === null) {
             $fields = $query->getColumns();
@@ -393,12 +393,12 @@ class LdapConnection implements Selectable
     /**
      * Fetch the first column of the first row of the result set
      *
-     * @param   Query   $query      The query returning the result set
-     * @param   array   $fields     Request these attributes instead of the ones registered in the given query
+     * @param   LdapQuery   $query      The query returning the result set
+     * @param   array       $fields     Request these attributes instead of the ones registered in the given query
      *
      * @return  string
      */
-    public function fetchOne(Query $query, array $fields = null)
+    public function fetchOne(LdapQuery $query, array $fields = null)
     {
         $row = (array) $this->fetchRow($query, $fields);
         return array_shift($row) ?: false;
@@ -409,14 +409,14 @@ class LdapConnection implements Selectable
      *
      * The first column is the key, the second column is the value.
      *
-     * @param   Query   $query      The query returning the result set
-     * @param   array   $fields     Request these attributes instead of the ones registered in the given query
+     * @param   LdapQuery   $query      The query returning the result set
+     * @param   array       $fields     Request these attributes instead of the ones registered in the given query
      *
      * @return  array
      *
-     * @throws  ProgrammingError    In case there are less than two attributes being requested
+     * @throws  ProgrammingError        In case there are less than two attributes being requested
      */
-    public function fetchPairs(Query $query, array $fields = null)
+    public function fetchPairs(LdapQuery $query, array $fields = null)
     {
         if ($fields === null) {
             $fields = $query->getColumns();
@@ -564,13 +564,13 @@ class LdapConnection implements Selectable
     /**
      * Fetch the distinguished name of the result of the given query
      *
-     * @param   Query   $query  The query returning the result set
+     * @param   LdapQuery   $query  The query returning the result set
      *
-     * @return  string          The distinguished name, or false when the given query yields no results
+     * @return  string              The distinguished name, or false when the given query yields no results
      *
-     * @throws  LdapException   In case the query yields multiple results
+     * @throws  LdapException       In case the query yields multiple results
      */
-    public function fetchDn(Query $query)
+    public function fetchDn(LdapQuery $query)
     {
         $rows = $this->fetchAll($query, array());
         if (count($rows) > 1) {
@@ -583,14 +583,14 @@ class LdapConnection implements Selectable
     /**
      * Run the given LDAP query and return the resulting entries
      *
-     * @param   Query   $query      The query to fetch results with
-     * @param   array   $fields     Request these attributes instead of the ones registered in the given query
+     * @param   LdapQuery   $query      The query to fetch results with
+     * @param   array       $fields     Request these attributes instead of the ones registered in the given query
      *
      * @return  array
      *
-     * @throws  LdapException       In case an error occured while fetching the results
+     * @throws  LdapException           In case an error occured while fetching the results
      */
-    protected function runQuery(Query $query, array $fields = null)
+    protected function runQuery(LdapQuery $query, array $fields = null)
     {
         $limit = $query->getLimit();
         $offset = $query->hasOffset() ? $query->getOffset() - 1 : 0;
@@ -663,15 +663,15 @@ class LdapConnection implements Selectable
      *
      * This utilizes paged search requests as defined in RFC 2696.
      *
-     * @param   Query   $query      The query to fetch results with
-     * @param   array   $fields     Request these attributes instead of the ones registered in the given query
-     * @param   int     $pageSize   The maximum page size, defaults to self::PAGE_SIZE
+     * @param   LdapQuery   $query      The query to fetch results with
+     * @param   array       $fields     Request these attributes instead of the ones registered in the given query
+     * @param   int         $pageSize   The maximum page size, defaults to self::PAGE_SIZE
      *
      * @return  array
      *
-     * @throws  LdapException       In case an error occured while fetching the results
+     * @throws  LdapException           In case an error occured while fetching the results
      */
-    protected function runPagedQuery(Query $query, array $fields = null, $pageSize = null)
+    protected function runPagedQuery(LdapQuery $query, array $fields = null, $pageSize = null)
     {
         if ($pageSize === null) {
             $pageSize = static::PAGE_SIZE;
diff --git a/library/Icinga/Protocol/Ldap/Query.php b/library/Icinga/Protocol/Ldap/LdapQuery.php
similarity index 99%
rename from library/Icinga/Protocol/Ldap/Query.php
rename to library/Icinga/Protocol/Ldap/LdapQuery.php
index 62433886a..52a628f63 100644
--- a/library/Icinga/Protocol/Ldap/Query.php
+++ b/library/Icinga/Protocol/Ldap/LdapQuery.php
@@ -10,7 +10,7 @@ use Icinga\Exception\NotImplementedError;
 /**
  * LDAP query class
  */
-class Query extends SimpleQuery
+class LdapQuery extends SimpleQuery
 {
     /**
      * This query's filters

From 3c47ef68263c263029b4d9fb6725914122c55a64 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 24 Jun 2015 09:19:41 +0200
Subject: [PATCH 2384/2920] Ldap\Exception: Rename to LdapException

refs #8954
---
 library/Icinga/Authentication/User/LdapUserBackend.php      | 2 +-
 library/Icinga/Protocol/Ldap/LdapConnection.php             | 2 +-
 .../Protocol/Ldap/{Exception.php => LdapException.php}      | 4 ++--
 library/Icinga/Protocol/Ldap/LdapQuery.php                  | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename library/Icinga/Protocol/Ldap/{Exception.php => LdapException.php} (74%)

diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index 981ed9331..948dcbe39 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -9,7 +9,7 @@ use Icinga\Exception\AuthenticationException;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Repository\LdapRepository;
 use Icinga\Repository\RepositoryQuery;
-use Icinga\Protocol\Ldap\Exception as LdapException;
+use Icinga\Protocol\Ldap\LdapException;
 use Icinga\Protocol\Ldap\Expression;
 use Icinga\User;
 
diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index 188db07b0..de7cc1e04 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -11,7 +11,7 @@ use Icinga\Data\ConfigObject;
 use Icinga\Data\Selectable;
 use Icinga\Data\Sortable;
 use Icinga\Exception\ProgrammingError;
-use Icinga\Protocol\Ldap\Exception as LdapException;
+use Icinga\Protocol\Ldap\LdapException;
 
 /**
  * Encapsulate LDAP connections and query creation
diff --git a/library/Icinga/Protocol/Ldap/Exception.php b/library/Icinga/Protocol/Ldap/LdapException.php
similarity index 74%
rename from library/Icinga/Protocol/Ldap/Exception.php
rename to library/Icinga/Protocol/Ldap/LdapException.php
index de7a10651..aec4a88db 100644
--- a/library/Icinga/Protocol/Ldap/Exception.php
+++ b/library/Icinga/Protocol/Ldap/LdapException.php
@@ -6,9 +6,9 @@ namespace Icinga\Protocol\Ldap;
 use Icinga\Exception\IcingaException;
 
 /**
- * Class Exception
+ * Class LdapException
  * @package Icinga\Protocol\Ldap
  */
-class Exception extends IcingaException
+class LdapException extends IcingaException
 {
 }
diff --git a/library/Icinga/Protocol/Ldap/LdapQuery.php b/library/Icinga/Protocol/Ldap/LdapQuery.php
index 52a628f63..1af5467d7 100644
--- a/library/Icinga/Protocol/Ldap/LdapQuery.php
+++ b/library/Icinga/Protocol/Ldap/LdapQuery.php
@@ -186,7 +186,7 @@ class LdapQuery extends SimpleQuery
      *
      * @return  string|false    The distinguished name or false in case it's not possible to fetch a result
      *
-     * @throws  Exception       In case the query returns multiple results
+     * @throws  LdapException   In case the query returns multiple results
      *                          (i.e. it's not possible to fetch a unique DN)
      */
     public function fetchDn()
@@ -199,12 +199,12 @@ class LdapQuery extends SimpleQuery
      *
      * @return  string
      *
-     * @throws  Exception   In case the objectClass filter does not exist
+     * @throws  LdapException   In case the objectClass filter does not exist
      */
     protected function renderFilter()
     {
         if (! isset($this->filters['objectClass'])) {
-            throw new Exception('Object class is mandatory');
+            throw new LdapException('Object class is mandatory');
         }
 
         $parts = array();

From 9595809dfab9fb2f2b4fece482bc0c9bff9a732d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 24 Jun 2015 14:33:11 +0200
Subject: [PATCH 2385/2920] SimpleQuery: Deep clone the filter when cloning the
 query

---
 library/Icinga/Data/Db/DbQuery.php  | 1 +
 library/Icinga/Data/SimpleQuery.php | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index d25058235..f269cd138 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -381,6 +381,7 @@ class DbQuery extends SimpleQuery
 
     public function __clone()
     {
+        parent::__clone();
         $this->select = clone $this->select;
     }
 
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 769481e13..1183ff327 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -550,4 +550,12 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
     {
         return $this->columns;
     }
+
+    /**
+     * Deep clone self::$filter
+     */
+    public function __clone()
+    {
+        $this->filter = clone $this->filter;
+    }
 }

From 98b01207cf8cd85b6b232301d6931421865ebdf4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 24 Jun 2015 14:37:07 +0200
Subject: [PATCH 2386/2920] Show intersecting ok-states as well in the default
 servicegrid view

fixes #9360
---
 library/Icinga/Data/PivotTable.php            | 128 ++++++++++++++----
 .../controllers/ListController.php            |  10 +-
 modules/monitoring/configuration.php          |   2 +-
 .../library/Monitoring/DataView/DataView.php  |   7 +-
 4 files changed, 112 insertions(+), 35 deletions(-)

diff --git a/library/Icinga/Data/PivotTable.php b/library/Icinga/Data/PivotTable.php
index 2131231f8..c76d1ec7b 100644
--- a/library/Icinga/Data/PivotTable.php
+++ b/library/Icinga/Data/PivotTable.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Data;
 
+use Icinga\Data\Filter\Filter;
 use Icinga\Data\SimpleQuery;
 use Icinga\Application\Icinga;
 use Icinga\Web\Paginator\Adapter\QueryAdapter;
@@ -45,6 +46,20 @@ class PivotTable
      */
     protected $yAxisColumn;
 
+    /**
+     * The filter being applied on the query for the x axis
+     *
+     * @var Filter
+     */
+    protected $xAxisFilter;
+
+    /**
+     * The filter being applied on the query for the y axis
+     *
+     * @var Filter
+     */
+    protected $yAxisFilter;
+
     /**
      * Create a new pivot table
      *
@@ -57,43 +72,31 @@ class PivotTable
         $this->baseQuery = $query;
         $this->xAxisColumn = $xAxisColumn;
         $this->yAxisColumn = $yAxisColumn;
-        $this->prepareQueries()->adjustSorting();
     }
 
     /**
-     * Prepare the queries used for the pre processing
+     * Set the filter to apply on the query for the x axis
+     *
+     * @param   Filter  $filter
      *
      * @return  $this
      */
-    protected function prepareQueries()
+    public function setXAxisFilter(Filter $filter = null)
     {
-        $this->xAxisQuery = clone $this->baseQuery;
-        $this->xAxisQuery->group($this->xAxisColumn);
-        $this->xAxisQuery->columns(array($this->xAxisColumn));
-        $this->xAxisQuery->setUseSubqueryCount();
-        $this->yAxisQuery = clone $this->baseQuery;
-        $this->yAxisQuery->group($this->yAxisColumn);
-        $this->yAxisQuery->columns(array($this->yAxisColumn));
-        $this->yAxisQuery->setUseSubqueryCount();
-
+        $this->xAxisFilter = $filter;
         return $this;
     }
 
     /**
-     * Set a default sorting for the x- and y-axis without losing any existing rules
+     * Set the filter to apply on the query for the y axis
+     *
+     * @param   Filter  $filter
      *
      * @return  $this
      */
-    protected function adjustSorting()
+    public function setYAxisFilter(Filter $filter = null)
     {
-        if (false === $this->xAxisQuery->hasOrder($this->xAxisColumn)) {
-            $this->xAxisQuery->order($this->xAxisColumn, 'ASC');
-        }
-
-        if (false === $this->yAxisQuery->hasOrder($this->yAxisColumn)) {
-            $this->yAxisQuery->order($this->yAxisColumn, 'ASC');
-        }
-
+        $this->yAxisFilter = $filter;
         return $this;
     }
 
@@ -119,6 +122,56 @@ class PivotTable
         return $default !== null ? $default : 0;
     }
 
+    /**
+     * Query horizontal (x) axis
+     *
+     * @return  SimpleQuery
+     */
+    protected function queryXAxis()
+    {
+        if ($this->xAxisQuery === null) {
+            $this->xAxisQuery = clone $this->baseQuery;
+            $this->xAxisQuery->group($this->xAxisColumn);
+            $this->xAxisQuery->columns(array($this->xAxisColumn));
+            $this->xAxisQuery->setUseSubqueryCount();
+
+            if ($this->xAxisFilter !== null) {
+                $this->xAxisQuery->addFilter($this->xAxisFilter);
+            }
+
+            if (! $this->xAxisQuery->hasOrder($this->xAxisColumn)) {
+                $this->xAxisQuery->order($this->xAxisColumn, 'asc');
+            }
+        }
+
+        return $this->xAxisQuery;
+    }
+
+    /**
+     * Query vertical (y) axis
+     *
+     * @return  SimpleQuery
+     */
+    protected function queryYAxis()
+    {
+        if ($this->yAxisQuery === null) {
+            $this->yAxisQuery = clone $this->baseQuery;
+            $this->yAxisQuery->group($this->yAxisColumn);
+            $this->yAxisQuery->columns(array($this->yAxisColumn));
+            $this->yAxisQuery->setUseSubqueryCount();
+
+            if ($this->yAxisFilter !== null) {
+                $this->yAxisQuery->addFilter($this->yAxisFilter);
+            }
+
+            if (! $this->yAxisQuery->hasOrder($this->yAxisColumn)) {
+                $this->yAxisQuery->order($this->yAxisColumn, 'asc');
+            }
+        }
+
+        return $this->yAxisQuery;
+    }
+
     /**
      * Return a pagination adapter for the x axis query
      *
@@ -141,9 +194,10 @@ class PivotTable
             }
         }
 
-        $this->xAxisQuery->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
+        $query = $this->queryXAxis();
+        $query->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
-        $paginator = new Zend_Paginator(new QueryAdapter($this->xAxisQuery));
+        $paginator = new Zend_Paginator(new QueryAdapter($query));
         $paginator->setItemCountPerPage($limit);
         $paginator->setCurrentPageNumber($page);
         return $paginator;
@@ -171,9 +225,10 @@ class PivotTable
             }
         }
 
-        $this->yAxisQuery->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
+        $query = $this->queryYAxis();
+        $query->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
-        $paginator = new Zend_Paginator(new QueryAdapter($this->yAxisQuery));
+        $paginator = new Zend_Paginator(new QueryAdapter($query));
         $paginator->setItemCountPerPage($limit);
         $paginator->setCurrentPageNumber($page);
         return $paginator;
@@ -186,10 +241,23 @@ class PivotTable
      */
     public function toArray()
     {
-        $pivot = array();
-        $xAxis = $this->xAxisQuery->fetchColumn();
-        $yAxis = $this->yAxisQuery->fetchColumn();
+        if (
+            ($this->xAxisFilter === null && $this->yAxisFilter === null)
+            || ($this->xAxisFilter !== null && $this->yAxisFilter !== null)
+        ) {
+            $xAxis = $this->queryXAxis()->fetchColumn();
+            $yAxis = $this->queryYAxis()->fetchColumn();
+        } else {
+            if ($this->xAxisFilter !== null) {
+                $xAxis = $this->queryXAxis()->fetchColumn();
+                $yAxis = $this->queryYAxis()->where($this->xAxisColumn, $xAxis)->fetchColumn();
+            } else { // $this->yAxisFilter !== null
+                $yAxis = $this->queryYAxis()->fetchColumn();
+                $xAxis = $this->queryXAxis()->where($this->yAxisColumn, $yAxis)->fetchColumn();
+            }
+        }
 
+        $pivot = array();
         if (!empty($xAxis) && !empty($yAxis)) {
             $this->baseQuery->where($this->xAxisColumn, $xAxis)->where($this->yAxisColumn, $yAxis);
 
@@ -199,7 +267,7 @@ class PivotTable
                 }
             }
 
-            foreach ($this->baseQuery->fetchAll() as $row) {
+            foreach ($this->baseQuery as $row) {
                 $pivot[$row->{$this->yAxisColumn}][$row->{$this->xAxisColumn}] = $row;
             }
         }
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index fe65fe595..d858751ec 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -586,6 +586,7 @@ class Monitoring_ListController extends Controller
     {
         $this->addTitleTab('servicegrid', $this->translate('Service Grid'), $this->translate('Show the Service Grid'));
         $this->setAutorefreshInterval(15);
+        $problems = (bool) $this->params->shift('problems', 0);
         $query = $this->backend->select()->from('servicestatus', array(
             'host_name',
             'service_description',
@@ -599,7 +600,12 @@ class Monitoring_ListController extends Controller
             'host_name'           => $this->translate('Hostname'),
             'service_description' => $this->translate('Service description')
         ), $query);
-        $pivot = $query->pivot('service_description', 'host_name');
+        $pivot = $query->pivot(
+            'service_description',
+            'host_name',
+            $problems ? Filter::where('service_problem', 1) : null,
+            $problems ? Filter::where('service_problem', 1) : null
+        );
         $this->view->pivot = $pivot;
         $this->view->horizontalPaginator = $pivot->paginateXAxis();
         $this->view->verticalPaginator   = $pivot->paginateYAxis();
@@ -618,7 +624,7 @@ class Monitoring_ListController extends Controller
             ->setQuery($dataView)
             ->preserveParams(
                 'limit', 'sort', 'dir', 'format', 'view', 'backend',
-                'stateType', 'addColumns', '_dev'
+                'stateType', 'addColumns', '_dev', 'problems'
             )
             ->ignoreParams('page')
             ->setSearchColumns($dataView->getSearchColumns())
diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index b83de5e23..8844c3247 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -112,7 +112,7 @@ $section->add($this->translate('Service Problems'), array(
     'priority'  => 60
 ));
 $section->add($this->translate('Service Grid'), array(
-    'url'       => 'monitoring/list/servicegrid?service_problem=1',
+    'url'       => 'monitoring/list/servicegrid?problems',
     'priority'  => 70
 ));
 $section->add($this->translate('Current Downtimes'), array(
diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index ba628f31c..0f892f42c 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -201,12 +201,15 @@ abstract class DataView implements QueryInterface, IteratorAggregate
      *
      * @param   string  $xAxisColumn    The column to use for the x axis
      * @param   string  $yAxisColumn    The column to use for the y axis
+     * @param   Filter  $xAxisFilter    The filter to apply on a query for the x axis
+     * @param   Filter  $yAxisFilter    The filter to apply on a query for the y axis
      *
      * @return  PivotTable
      */
-    public function pivot($xAxisColumn, $yAxisColumn)
+    public function pivot($xAxisColumn, $yAxisColumn, Filter $xAxisFilter = null, Filter $yAxisFilter = null)
     {
-        return new PivotTable($this->query, $xAxisColumn, $yAxisColumn);
+        $pivot = new PivotTable($this->query, $xAxisColumn, $yAxisColumn);
+        return $pivot->setXAxisFilter($xAxisFilter)->setYAxisFilter($yAxisFilter);
     }
 
     /**

From b741845d543a57337f9536f14ef24323fa3290c3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 24 Jun 2015 14:52:11 +0200
Subject: [PATCH 2387/2920] Show missing tabs for object command forms

fixes #9477
---
 .../views/scripts/partials/command/object-command-form.phtml   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml b/modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml
index dbcf0bc03..ab14b1b2a 100644
--- a/modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml
+++ b/modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml
@@ -1,4 +1,7 @@
 <div class="controls">
+  <?php if (! $this->compact): ?>
+    <?= $this->tabs; ?>
+  <?php endif ?>
   <?php if ($object->getType() === $object::TYPE_HOST): ?>
     <?= $this->render('partials/host/object-header.phtml'); ?>
     <?= $this->render('partials/host/servicesummary.phtml'); ?>

From 20fd3d6758926f738eb50bf202d490c2bbfdcb0f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 24 Jun 2015 15:11:33 +0200
Subject: [PATCH 2388/2920] Fix multiselect views of hosts and services

I've broke this with #9472.
---
 .../application/controllers/HostsController.php    |  2 +-
 .../application/controllers/ServicesController.php |  2 --
 .../library/Monitoring/Object/HostList.php         |  7 +++++--
 .../library/Monitoring/Object/ServiceList.php      | 14 ++++++++++----
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 5202ab087..740b5cb5c 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -117,7 +117,7 @@ class Monitoring_HostsController extends Controller
             $this->view->removeAckForm = $removeAckForm;
         }
 
-        $hostStates = (object)$this->hostList->getStateSummary();
+        $hostStates = $this->hostList->getStateSummary();
 
         $this->setAutorefreshInterval(15);
         $this->view->rescheduleAllLink = Url::fromRequest()->setPath('monitoring/hosts/reschedule-check');
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index a8d7bf16b..faebcd11c 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -84,7 +84,6 @@ class Monitoring_ServicesController extends Controller
         $this->view->objects = $this->serviceList;
         $this->view->stats = $this->serviceList->getServiceStateSummary();
         $this->view->serviceStates = true;
-        $this->view->hostStates = $this->serviceList->getHostStateSummary();
         $this->_helper->viewRenderer('partials/command/objects-command-form', null, true);
         return $form;
     }
@@ -145,7 +144,6 @@ class Monitoring_ServicesController extends Controller
         $this->view->addCommentLink = Url::fromRequest()->setPath('monitoring/services/add-comment');
         $this->view->deleteCommentLink = Url::fromRequest()->setPath('monitoring/services/delete-comment');
         $this->view->stats = $this->serviceList->getServiceStateSummary();
-        $this->view->hostStats = $this->serviceList->getHostStateSummary();
         $this->view->objects = $this->serviceList;
         $this->view->unhandledObjects = $this->serviceList->getUnhandledObjects();
         $this->view->problemObjects = $this->serviceList->getProblemObjects();
diff --git a/modules/monitoring/library/Monitoring/Object/HostList.php b/modules/monitoring/library/Monitoring/Object/HostList.php
index 76b37dc7c..2066b5150 100644
--- a/modules/monitoring/library/Monitoring/Object/HostList.php
+++ b/modules/monitoring/library/Monitoring/Object/HostList.php
@@ -3,8 +3,10 @@
 
 namespace Icinga\Module\Monitoring\Object;
 
+use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Filter\FilterOr;
+use Icinga\Data\SimpleQuery;
 use Icinga\Util\String;
 
 /**
@@ -33,7 +35,7 @@ class HostList extends ObjectList
     /**
      * Create a state summary of all hosts that can be consumed by hostssummary.phtml
      *
-     * @return object   The summary
+     * @return  SimpleQuery
      */
     public function getStateSummary()
     {
@@ -48,7 +50,8 @@ class HostList extends ObjectList
 
         $hostStates['hosts_total'] = count($this);
 
-        return (object)$hostStates;
+        $ds = new ArrayDatasource(array((object) $hostStates));
+        return $ds->select();
     }
 
     /**
diff --git a/modules/monitoring/library/Monitoring/Object/ServiceList.php b/modules/monitoring/library/Monitoring/Object/ServiceList.php
index 8336a35a1..0dffd9464 100644
--- a/modules/monitoring/library/Monitoring/Object/ServiceList.php
+++ b/modules/monitoring/library/Monitoring/Object/ServiceList.php
@@ -3,8 +3,10 @@
 
 namespace Icinga\Module\Monitoring\Object;
 
+use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Filter\FilterOr;
+use Icinga\Data\SimpleQuery;
 use Icinga\Util\String;
 
 /**
@@ -37,27 +39,31 @@ class ServiceList extends ObjectList
     /**
      * Create a state summary of all services that can be consumed by servicesummary.phtml
      *
-     * @return object   The summary
+     * @return  SimpleQuery
      */
     public function getServiceStateSummary()
     {
         if (! $this->serviceStateSummary) {
             $this->initStateSummaries();
         }
-        return (object)$this->serviceStateSummary;
+
+        $ds = new ArrayDatasource(array((object) $this->serviceStateSummary));
+        return $ds->select();
     }
 
     /**
      * Create a state summary of all hosts that can be consumed by hostsummary.phtml
      *
-     * @return object   The summary
+     * @return  SimpleQuery
      */
     public function getHostStateSummary()
     {
         if (! $this->hostStateSummary) {
             $this->initStateSummaries();
         }
-        return (object)$this->hostStateSummary;
+
+        $ds = new ArrayDatasource(array((object) $this->hostStateSummary));
+        return $ds->select();
     }
 
     /**

From 8448f4ade4e54e940fe34bde15d969c630a6d63f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 24 Jun 2015 15:27:39 +0200
Subject: [PATCH 2389/2920] Revert "Tabs: Merge the action's params into the
 current request url's params"

This reverts commit ba4dd255ec69a8e579f2c198c332e6f65e3e406b.

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

diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index 6b38f9096..aa5e7cda6 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -309,14 +309,13 @@ 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 ebe144c16a25010848072c090f3642a77b929119 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 24 Jun 2015 16:15:45 +0200
Subject: [PATCH 2390/2920] Form: Do not encode actions twice

---
 library/Icinga/Web/Form.php | 18 ++++++++++++++++++
 public/js/icinga/events.js  |  3 +--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 08cb02388..679091fde 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -1086,6 +1086,24 @@ class Form extends Zend_Form
         return $name;
     }
 
+    /**
+     * Set the action to submit this form against
+     *
+     * Note that if you'll pass a instance of URL, Url::getAbsoluteUrl('&') is called to set the action.
+     *
+     * @param   Url|string  $action
+     *
+     * @return  $this
+     */
+    public function setAction($action)
+    {
+        if ($action instanceof Url) {
+            $action = $action->getAbsoluteUrl('&');
+        }
+
+        return parent::setAction($action);
+    }
+
     /**
      * Set form description
      *
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 775b99eff..4d4ae736c 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -200,8 +200,7 @@
             var icinga = self.icinga;
             // .closest is not required unless subelements to trigger this
             var $form = $(event.currentTarget).closest('form');
-            var regex = new RegExp('&amp;', 'g');
-            var url = $form.attr('action').replace(regex, '&'); // WHY??
+            var url = $form.attr('action');
             var method = $form.attr('method');
             var $button = $('input[type=submit]:focus', $form).add('button[type=submit]:focus', $form);
             var $target;

From e3f13c8a44f6fe8dd65f0e9491fcd1eaf36c9040 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 10:13:15 +0200
Subject: [PATCH 2391/2920] UserController: Fix permission check for editing
 users

Eh...?
---
 application/views/scripts/user/show.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index 83b7c350e..f7ddff4a2 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -5,7 +5,7 @@ use Icinga\Data\Reducible;
 use Icinga\Data\Selectable;
 
 $editLink = null;
-if (true || $this->hasPermission('config/authentication/users/edit') && $backend instanceof Updatable) {
+if ($this->hasPermission('config/authentication/users/edit') && $backend instanceof Updatable) {
     $editLink = $this->qlink(
         null,
         'user/edit',

From af7426451ac094bde7f561210f8781686176ae97 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 11:27:28 +0200
Subject: [PATCH 2392/2920] UserController: Fix design for showing a user

---
 application/views/scripts/user/show.phtml | 85 +++++++++++------------
 public/css/icinga/main-content.less       | 16 ++++-
 2 files changed, 57 insertions(+), 44 deletions(-)

diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index f7ddff4a2..929737c71 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -23,38 +23,37 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
 
 ?>
 <div class="controls">
- <?php if (! $this->compact): ?>
- <?= $tabs ?>
- <?php endif ?>
-
- <h1><?= $this->escape($user->user_name); ?><span class="pull-right"><?= $editLink ?></span></h1>
+<?php if (! $this->compact): ?>
+  <?= $tabs; ?>
+<?php endif ?>
+  <h1><?= $this->escape($user->user_name); ?><span class="pull-right"><?= $editLink; ?></span></h1>
+  <table class="avp user-header">
+    <tr>
+      <th><?= $this->translate('State'); ?></th>
+      <td><?= $user->is_active === null ? '-' : ($user->is_active ? $this->translate('Active') : $this->translate('Inactive')); ?></td>
+    </tr>
+    <tr>
+      <th><?= $this->translate('Created at'); ?></th>
+      <td><?= $user->created_at === null ? '-' : $this->formatDateTime($user->created_at); ?></td>
+    </tr>
+    <tr>
+      <th><?= $this->translate('Last modified'); ?></th>
+      <td><?= $user->last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?></td>
+    </tr>
+  </table>
+  <h2><?= $this->translate('Group Memberships'); ?></h2>
+<?php if (! $this->compact): ?>
+  <?= $this->sortBox ?>
+<?php endif ?>
+  <?= $this->limiter ?>
+  <?= $this->paginator ?>
+<?php if (! $this->compact): ?>
+  <?= $this->filterEditor ?>
+<?php endif ?>
 </div>
-<div class="content">
- <table class="avp">
-  <tr>
-   <th><?= $this->translate('State'); ?>:</th>
-   <td><?= $user->is_active === null ? '-' : ($user->is_active ? $this->translate('Active') : $this->translate('Inactive')); ?></td>
-  </tr>
-  <tr>
-   <th><?= $this->translate('Created at'); ?>:</th>
-   <td><?= $user->created_at === null ? '-' : $this->formatDateTime($user->created_at); ?></td>
-  </tr>
-  <tr>
-   <th><?= $this->translate('Last modified'); ?>:</th>
-   <td><?= $user->last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?></td>
-  </tr>
- </table>
- <h3><?= $this->translate('Group Memberships'); ?></h3>
-    <?php if (! $this->compact): ?>
-     <?= $this->sortBox ?>
-    <?php endif ?>
-     <?= $this->limiter ?>
-     <?= $this->paginator ?>
-    <?php if (! $this->compact): ?>
-     <?= $this->filterEditor ?>
-    <?php endif ?>
+<div class="content memberships">
 <?php if (count($memberships) > 0): ?>
-  <table data-base-target="_next" class="action membership-list">
+  <table data-base-target="_next" class="action membership-list alternating">
     <thead>
       <tr>
         <th class="membership-group"><?= $this->translate('Group'); ?></th>
@@ -95,17 +94,17 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
 <?php endif ?>
 <?php if ($showCreateMembershipLink): ?>
 <?= $this->qlink(
-    $this->translate('Create new membership'),
-    'user/createmembership',
-    array(
-        'backend'             => $backend->getName(),
-        'user'                => $user->user_name
-    ),
-    array(
-        'icon'                => 'plus',
-        'data-base-target'    => '_next',
-        'class'               => 'membership-create'
-    )
-) ?>
+  $this->translate('Create New Membership'),
+  'user/createmembership',
+  array(
+    'backend'   => $backend->getName(),
+    'user'      => $user->user_name
+  ),
+  array(
+    'icon'              => 'plus',
+    'data-base-target'  => '_next',
+    'class'             => 'membership-create'
+  )
+); ?>
 <?php endif ?>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 41939c1c6..98493f1ea 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -186,7 +186,21 @@ tr[href]:hover {
 }
 /* END of HOVER colors */
 
-/* TODO: get rid of most if not all styles below this line */
+div.controls table.user-header {
+  th {
+    width: 9em;
+    line-height: 1.5em;
+    font-size: 0.9em;
+  }
+
+  td {
+    line-height: 1.5em;
+    font-size: 0.9em;
+  }
+}
+
+/* TODO: get rid of most if not all styles below this line,
+         by ensuring to not to make everything look ugly... */
 div.content.users {
   table.user-list {
     th.user-remove {

From f2ba70d5ab9a3f70a6bd180058637ae61dfbf5db Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 11:36:26 +0200
Subject: [PATCH 2393/2920] GroupController: Fix design for showing a group

---
 application/views/scripts/group/show.phtml | 34 +++++++++++++---------
 application/views/scripts/user/show.phtml  |  8 ++---
 public/css/icinga/main-content.less        | 13 ---------
 3 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/application/views/scripts/group/show.phtml b/application/views/scripts/group/show.phtml
index 20538a9b3..ed5c747d5 100644
--- a/application/views/scripts/group/show.phtml
+++ b/application/views/scripts/group/show.phtml
@@ -27,20 +27,26 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
  <?php if (! $this->compact): ?>
   <?= $tabs; ?>
  <?php endif ?>
-  <div class="group-header">
-    <p class="group-name"><strong><?= $this->escape($group->group_name); ?></strong></p> <?= $editLink; ?>
-    <p class="group-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $group->created_at === null ? '-' : $this->formatDateTime($group->created_at); ?></p>
-    <p class="group-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $group->last_modified === null ? '-' : $this->formatDateTime($group->last_modified); ?></p>
-    <h3><?= $this->translate('Members'); ?></h3>
-    <?php if (! $this->compact): ?>
-     <?= $this->sortBox; ?>
-    <?php endif ?>
-     <?= $this->limiter; ?>
-     <?= $this->paginator; ?>
-    <?php if (! $this->compact): ?>
-     <?= $this->filterEditor; ?>
-    <?php endif ?>
-  </div>
+  <h1><?= $this->escape($group->group_name); ?><span class="pull-right"><?= $editLink; ?></span></h1>
+  <table class="avp user-header">
+    <tr>
+      <th><?= $this->translate('Created at'); ?></th>
+      <td><?= $group->created_at === null ? '-' : $this->formatDateTime($group->created_at); ?></td>
+    </tr>
+    <tr>
+      <th><?= $this->translate('Last modified'); ?></th>
+      <td><?= $group->last_modified === null ? '-' : $this->formatDateTime($group->last_modified); ?></td>
+    </tr>
+  </table>
+  <h2><?= $this->translate('Members'); ?></h2>
+<?php if (! $this->compact): ?>
+  <?= $this->sortBox; ?>
+<?php endif ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+<?php if (! $this->compact): ?>
+  <?= $this->filterEditor; ?>
+<?php endif ?>
 </div>
 <div class="content members" data-base-target="_next">
 <?php if (count($members) > 0): ?>
diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index 929737c71..b592bd64c 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -43,12 +43,12 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
   </table>
   <h2><?= $this->translate('Group Memberships'); ?></h2>
 <?php if (! $this->compact): ?>
-  <?= $this->sortBox ?>
+  <?= $this->sortBox; ?>
 <?php endif ?>
-  <?= $this->limiter ?>
-  <?= $this->paginator ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
 <?php if (! $this->compact): ?>
-  <?= $this->filterEditor ?>
+  <?= $this->filterEditor; ?>
 <?php endif ?>
 </div>
 <div class="content memberships">
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 98493f1ea..72cffa19b 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -274,19 +274,6 @@ div.content.groups {
   }
 }
 
-div.controls div.group-header {
-  .group-name {
-    display: inline-block;
-    margin: 0 0 0.3em;
-    font-size: 2em;
-  }
-
-  .group-parent, .group-created, .group-modified {
-    margin: 0 0 0.2em;
-    font-size: 0.8em;
-  }
-}
-
 div.content.members {
   table.member-list {
     th.member-remove {

From d29d423cc9a54c7435e1b526d02318388f51f114 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 12:22:56 +0200
Subject: [PATCH 2394/2920] Eventhistory: Provide search columns for quick
 filters

fixes #9497
---
 .../library/Monitoring/DataView/Eventhistory.php          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/Eventhistory.php b/modules/monitoring/library/Monitoring/DataView/Eventhistory.php
index 223e1d7d1..67a0ce393 100644
--- a/modules/monitoring/library/Monitoring/DataView/Eventhistory.php
+++ b/modules/monitoring/library/Monitoring/DataView/Eventhistory.php
@@ -67,4 +67,12 @@ class EventHistory extends DataView
             'servicegroup', 'servicegroup_alias', 'servicegroup_name'
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSearchColumns()
+    {
+        return array('host', 'host_display_name', 'service', 'service_display_name', 'type');
+    }
 }

From 18497fee44c61810600d16fa92a4132e19491e18 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 12:24:52 +0200
Subject: [PATCH 2395/2920] Service overview: Allow to quick search for hosts

fixes #9498
---
 .../monitoring/library/Monitoring/DataView/Servicestatus.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
index 2674bbfb6..10d65c48a 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
@@ -191,6 +191,6 @@ class ServiceStatus extends DataView
      */
     public function getSearchColumns()
     {
-        return array('service', 'service_display_name');
+        return array('host', 'host_display_name', 'service', 'service_display_name');
     }
 }

From 5e90971f94c16ad5c4cbd325b3a548202b8368c6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 12:45:56 +0200
Subject: [PATCH 2396/2920] Hostgroup overview: Allow to quick filter for hosts

fixes #9499
---
 .../monitoring/library/Monitoring/DataView/Hostgroupsummary.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
index 941f6dfbe..9fd58fc31 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
@@ -60,7 +60,7 @@ class Hostgroupsummary extends DataView
      */
     public function getSearchColumns()
     {
-        return array('hostgroup', 'hostgroup_alias');
+        return array('host', 'host_display_name', 'hostgroup', 'hostgroup_alias');
     }
 
     /**

From e3b432d463103837bd742fc71cb16e96969948b4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 12:48:50 +0200
Subject: [PATCH 2397/2920] Servicegroup overview: Allow to quick filter for
 services

fixes #9500
---
 .../library/Monitoring/DataView/Servicegroupsummary.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
index 795162426..39fa74932 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
@@ -55,7 +55,7 @@ class Servicegroupsummary extends DataView
      */
     public function getSearchColumns()
     {
-        return array('servicegroup', 'servicegroup_alias');
+        return array('service', 'service_display_name', 'servicegroup', 'servicegroup_alias');
     }
 
     /**

From 8b4fb89a4b5328630c9bce6157b8cbbf5c2b9ee1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 12:59:57 +0200
Subject: [PATCH 2398/2920] Comment overview: Add support for quick searches

fixes #9502
---
 .../monitoring/library/Monitoring/DataView/Comment.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index e1beaabf8..18d518bd3 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -49,7 +49,7 @@ class Comment extends DataView
     public function getFilterColumns()
     {
         return array(
-            'comment_author ',
+            'comment_author',
             'host', 'host_alias',
             'hostgroup', 'hostgroup_alias', 'hostgroup_name',
             'service',
@@ -57,6 +57,14 @@ class Comment extends DataView
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getSearchColumns()
+    {
+        return array('host', 'host_display_name', 'service', 'service_display_name', 'comment_author');
+    }
+
     /**
      * {@inheritdoc}
      */

From a7498ca0d8423c5965d564d27e0d977629a908c9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 13:03:33 +0200
Subject: [PATCH 2399/2920] HostcommentQuery: Fix grouping when services are
 being joined

fixes #9503
---
 .../library/Monitoring/Backend/Ido/Query/HostcommentQuery.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
index 63b76fa22..d649f2739 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
@@ -157,7 +157,7 @@ class HostcommentQuery extends IdoQuery
     public function getGroup()
     {
         $group = array();
-        if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('servicegroups')) {
+        if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('services')) {
             $group = array('c.comment_id', 'ho.object_id');
             if ($this->hasJoinedVirtualTable('hosts')) {
                 $group[] = 'h.host_id';

From 2d4f956b480decc139ba629576366749d87286ba Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 13:12:54 +0200
Subject: [PATCH 2400/2920] Contactgroup overview: Add support for quick
 searches

fixes #9504
---
 .../library/Monitoring/DataView/Contactgroup.php          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
index f95c5abd7..4e5684d43 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
@@ -78,4 +78,12 @@ class Contactgroup extends DataView
             'servicegroup', 'servicegroup_alias', 'servicegroup_name'
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSearchColumns()
+    {
+        return array('contactgroup', 'contactgroup_alias', 'contact', 'contact_alias', 'contact_email');
+    }
 }

From 52761e3f37f70a3043642fe9b3b49a86a4dcbb6e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 13:17:36 +0200
Subject: [PATCH 2401/2920] Contact overview: Add support for quick searches

fixes #9505
---
 .../library/Monitoring/DataView/Contact.php      | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/Contact.php b/modules/monitoring/library/Monitoring/DataView/Contact.php
index af2ef597d..42c6806ac 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contact.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contact.php
@@ -73,4 +73,20 @@ class Contact extends DataView
             'servicegroup', 'servicegroup_alias', 'servicegroup_name'
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSearchColumns()
+    {
+        return array(
+            'contact',
+            'contact_alias',
+            'contact_email',
+            'host',
+            'host_display_name',
+            'service',
+            'service_display_name'
+        );
+    }
 }

From 8f6bf7ff33e73fc30643149dc50dd480178e40d8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 13:21:43 +0200
Subject: [PATCH 2402/2920] Notification overview: Add support for quick
 searches

fixes #9506
---
 .../library/Monitoring/DataView/Notification.php          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php
index 9c06fc2ef..7f17769b8 100644
--- a/modules/monitoring/library/Monitoring/DataView/Notification.php
+++ b/modules/monitoring/library/Monitoring/DataView/Notification.php
@@ -84,4 +84,12 @@ class Notification extends DataView
             'servicegroup', 'servicegroup_alias', 'servicegroup_name'
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSearchColumns()
+    {
+        return array('contact', 'host', 'host_display_name', 'service', 'service_display_name');
+    }
 }

From 86bdf813966f02d8c405f3cc93ffab22642c4840 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 13:24:35 +0200
Subject: [PATCH 2403/2920] Downtime overview: Add support for quick searches

fixes #8620
---
 .../monitoring/library/Monitoring/DataView/Downtime.php   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index 605aca454..c5324a22d 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -64,6 +64,14 @@ class Downtime extends DataView
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getSearchColumns()
+    {
+        return array('downtime_author', 'host', 'host_display_name', 'service', 'service_display_name');
+    }
+
     /**
      * {@inheritdoc}
      */

From d95874b84c4107289d91c35e6d06ddc430c924e8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 14:22:50 +0200
Subject: [PATCH 2404/2920] Setup: Provide a default user filter for
 ActiveDirectory backends

fixes #8703
---
 .../Config/UserBackend/LdapBackendForm.php      | 12 +++++++-----
 .../setup/application/forms/AuthBackendPage.php | 17 +++++++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/application/forms/Config/UserBackend/LdapBackendForm.php b/application/forms/Config/UserBackend/LdapBackendForm.php
index df6e0a4c4..2402c9a6a 100644
--- a/application/forms/Config/UserBackend/LdapBackendForm.php
+++ b/application/forms/Config/UserBackend/LdapBackendForm.php
@@ -92,17 +92,19 @@ class LdapBackendForm extends Form
             'text',
             'filter',
             array(
-                'allowEmpty'    => true,
-                'label'         => $this->translate('LDAP Filter'),
-                'description'   => $this->translate(
+                'preserveDefault'   => true,
+                'allowEmpty'        => true,
+                'value'             => $isAd ? '!(objectClass=computer)' : null,
+                'label'             => $this->translate('LDAP Filter'),
+                'description'       => $this->translate(
                     'An additional filter to use when looking up users using the specified connection. '
                     . 'Leave empty to not to use any additional filter rules.'
                 ),
-                'requirement'   => $this->translate(
+                'requirement'       => $this->translate(
                     'The filter needs to be expressed as standard LDAP expression.'
                     . ' (e.g. &(foo=bar)(bar=foo) or foo=bar)'
                 ),
-                'validators'    => array(
+                'validators'        => array(
                     array(
                         'Callback',
                         false,
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index bb68792a6..7590d2f73 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -78,6 +78,23 @@ class AuthBackendPage extends Form
                 'Before you are able to authenticate using the LDAP connection defined earlier you need to'
                 . ' provide some more information so that Icinga Web 2 is able to locate account details.'
             ));
+            $this->addElement(
+                'select',
+                'type',
+                array(
+                    'ignore'            => true,
+                    'required'          => true,
+                    'autosubmit'        => true,
+                    'label'             => $this->translate('Backend Type'),
+                    'description'       => $this->translate(
+                        'The type of the resource being used for this authenticaton provider'
+                    ),
+                    'multiOptions'      => array(
+                        'ldap'      => 'LDAP',
+                        'msldap'    => 'ActiveDirectory'
+                    )
+                )
+            );
         } else { // $this->config['type'] === 'external'
             $backendForm = new ExternalBackendForm();
             $backendForm->createElements($formData);

From 3dddee8b7d7ce480feb822406adc438ef487166e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 14:36:51 +0200
Subject: [PATCH 2405/2920] Setup: Fix authentication backend validation

This is a ridiculous dirty fix. We'll definitely need to
improve how we create authentication backends...

fixes #9509
---
 .../forms/Config/UserBackend/LdapBackendForm.php     | 12 ------------
 library/Icinga/Authentication/User/UserBackend.php   |  7 ++++++-
 modules/setup/application/forms/AuthBackendPage.php  | 10 +++++++++-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/application/forms/Config/UserBackend/LdapBackendForm.php b/application/forms/Config/UserBackend/LdapBackendForm.php
index 2402c9a6a..9151134c3 100644
--- a/application/forms/Config/UserBackend/LdapBackendForm.php
+++ b/application/forms/Config/UserBackend/LdapBackendForm.php
@@ -202,16 +202,4 @@ class LdapBackendForm extends Form
 
         return true;
     }
-
-    /**
-     * Return the configuration for the chosen resource
-     *
-     * @return  ConfigObject
-     *
-     * @todo    Check whether it's possible to drop this (Or even all occurences!)
-     */
-    public function getResourceConfig()
-    {
-        return ResourceFactory::getResourceConfig($this->getValue('resource'));
-    }
 }
diff --git a/library/Icinga/Authentication/User/UserBackend.php b/library/Icinga/Authentication/User/UserBackend.php
index 7afd561a7..2bd9e7cae 100644
--- a/library/Icinga/Authentication/User/UserBackend.php
+++ b/library/Icinga/Authentication/User/UserBackend.php
@@ -163,7 +163,12 @@ class UserBackend
                 $name
             );
         }
-        $resource = ResourceFactory::create($backendConfig->resource);
+
+        if ($backendConfig->resource instanceof ConfigObject) {
+            $resource = ResourceFactory::createResource($backendConfig->resource);
+        } else {
+            $resource = ResourceFactory::create($backendConfig->resource);
+        }
 
         switch ($backendType) {
             case 'db':
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index 7590d2f73..7564b577f 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -122,7 +122,15 @@ class AuthBackendPage extends Form
         }
 
         if (false === isset($data['skip_validation']) || $data['skip_validation'] == 0) {
-            if ($this->config['type'] === 'ldap' && false === LdapBackendForm::isValidUserBackend($this)) {
+            $self = clone $this;
+            $self->addElement(
+                'text',
+                'resource',
+                array(
+                    'value' => $this->getResourceConfig()
+                )
+            );
+            if ($this->config['type'] === 'ldap' && false === LdapBackendForm::isValidUserBackend($self)) {
                 $this->addSkipValidationCheckbox();
                 return false;
             }

From 39ea81ac7ba9d0c65ce49763bdd47050a63e44b8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 15:26:56 +0200
Subject: [PATCH 2406/2920] Setup: Also list existing accounts for
 ActiveDirectory auth backends

fixes #9511
---
 .../application/forms/AdminAccountPage.php    | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index a7bd8fc6c..fdd01a5de 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -4,12 +4,9 @@
 namespace Icinga\Module\Setup\Forms;
 
 use Exception;
-use LogicException;
-use Icinga\Web\Form;
+use Icinga\Authentication\User\UserBackend;
 use Icinga\Data\ConfigObject;
-use Icinga\Data\ResourceFactory;
-use Icinga\Authentication\User\DbUserBackend;
-use Icinga\Authentication\User\LdapUserBackend;
+use Icinga\Web\Form;
 
 /**
  * Wizard page to define the initial administrative account
@@ -95,7 +92,7 @@ class AdminAccountPage extends Form
             }
         }
 
-        if ($this->backendConfig['backend'] === 'db' || $this->backendConfig['backend'] === 'ldap') {
+        if (in_array($this->backendConfig['backend'], array('db', 'ldap', 'msldap'))) {
             $users = $this->fetchUsers();
             if (false === empty($users)) {
                 $choices['existing_user'] = $this->translate('Existing User');
@@ -260,24 +257,12 @@ class AdminAccountPage extends Form
      * Return the names of all users this backend currently provides
      *
      * @return  array
-     *
-     * @throws  LogicException  In case the backend to fetch users from is not supported
      */
     protected function fetchUsers()
     {
-        if ($this->backendConfig['backend'] === 'db') {
-            $backend = new DbUserBackend(ResourceFactory::createResource(new ConfigObject($this->resourceConfig)));
-        } elseif ($this->backendConfig['backend'] === 'ldap') {
-            $backend = new LdapUserBackend(ResourceFactory::createResource(new ConfigObject($this->resourceConfig)));
-            $backend->setConfig($this->backendConfig);
-        } else {
-            throw new LogicException(
-                sprintf(
-                    'Tried to fetch users from an unsupported authentication backend: %s',
-                    $this->backendConfig['backend']
-                )
-            );
-        }
+        $config = new ConfigObject($this->backendConfig);
+        $config->resource = $this->resourceConfig;
+        $backend = UserBackend::create(null, $config);
 
         try {
             return $backend->select(array('user_name'))->fetchColumn();

From ca112af9ad4834a5467aa62b6ab3b6356bbccb2d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 15:49:09 +0200
Subject: [PATCH 2407/2920] RepositoryQuery: Allow to ignore any default sort
 rules

---
 library/Icinga/Repository/RepositoryQuery.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index c5e9ac9ed..5b2765fe2 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -218,12 +218,13 @@ class RepositoryQuery implements QueryInterface, Iterator
      * If called without a specific column, the repository's defaul sort rules will be applied.
      * This notifies the repository about each column being required as filter column.
      *
-     * @param   string  $field      The name of the column by which to sort the query's result
-     * @param   string  $direction  The direction to use when sorting (asc or desc, default is asc)
+     * @param   string  $field          The name of the column by which to sort the query's result
+     * @param   string  $direction      The direction to use when sorting (asc or desc, default is asc)
+     * @param   bool    $ignoreDefault  Whether to ignore any default sort rules if $field is given
      *
      * @return  $this
      */
-    public function order($field = null, $direction = null)
+    public function order($field = null, $direction = null, $ignoreDefault = false)
     {
         $sortRules = $this->repository->getSortRules();
         if ($field === null) {
@@ -240,7 +241,7 @@ class RepositoryQuery implements QueryInterface, Iterator
             if ($direction !== null || !array_key_exists('order', $sortColumns)) {
                 $sortColumns['order'] = $direction ?: static::SORT_ASC;
             }
-        } elseif (array_key_exists($field, $sortRules)) {
+        } elseif (! $ignoreDefault && array_key_exists($field, $sortRules)) {
             $sortColumns = $sortRules[$field];
             if (! array_key_exists('columns', $sortColumns)) {
                 $sortColumns['columns'] = array($field);

From 6ff15acc1b743f14615e06ebbeef97753f09e80f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 15:50:15 +0200
Subject: [PATCH 2408/2920] LdapConnection: Fix that fetchColumn() returns
 results unordered

---
 library/Icinga/Protocol/Ldap/LdapConnection.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index de7cc1e04..af5ac5a9c 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -374,12 +374,13 @@ class LdapConnection implements Selectable
             $fields = $query->getColumns();
         }
 
-        $column = current($fields);
-        if (! $column) {
+        if (empty($fields)) {
             throw new ProgrammingError('You must request at least one attribute when fetching a single column');
         }
 
-        $results = $this->fetchAll($query, array($column));
+        $alias = key($fields);
+        $results = $this->fetchAll($query, array($alias => current($fields)));
+        $column = is_int($alias) ? current($fields) : $alias;
         $values = array();
         foreach ($results as $row) {
             if (isset($row->$column)) {

From f956d095977e57241a3f10b1bcf8104aaae4a9f7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 15:51:19 +0200
Subject: [PATCH 2409/2920] LdapConnection: Fetch attributes required for
 sorting the results

---
 library/Icinga/Protocol/Ldap/LdapConnection.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index af5ac5a9c..41b0bc917 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -608,6 +608,12 @@ class LdapConnection implements Selectable
                     'value' => $this->encodeSortRules($query->getOrder())
                 )
             ));
+        } elseif ($query->hasOrder()) {
+            foreach ($query->getOrder() as $rule) {
+                if (! in_array($rule[0], $fields)) {
+                    $fields[] = $rule[0];
+                }
+            }
         }
 
         $results = @ldap_search(
@@ -695,6 +701,12 @@ class LdapConnection implements Selectable
                     'value' => $this->encodeSortRules($query->getOrder())
                 )
             ));
+        } elseif ($query->hasOrder()) {
+            foreach ($query->getOrder() as $rule) {
+                if (! in_array($rule[0], $fields)) {
+                    $fields[] = $rule[0];
+                }
+            }
         }
 
         $count = 0;

From 4fc7b3eb1b52a40e601bee323617cff224fc022d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 15:52:09 +0200
Subject: [PATCH 2410/2920] Setup: Fix the sorting of existing LDAP users

---
 modules/setup/application/forms/AdminAccountPage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index fdd01a5de..25a9d6799 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -265,7 +265,7 @@ class AdminAccountPage extends Form
         $backend = UserBackend::create(null, $config);
 
         try {
-            return $backend->select(array('user_name'))->fetchColumn();
+            return $backend->select(array('user_name'))->order('user_name', 'asc', true)->fetchColumn();
         } catch (Exception $_) {
             // No need to handle anything special here. Error means no users found.
             return array();

From 4ba84903f1d9bef327127a2d5c357bb1fe491240 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 26 Jun 2015 13:07:21 +0200
Subject: [PATCH 2411/2920] Repository: Accept already resolved columns as well

If a column was aliased, one was required to use the alias when
selecting, sorting or filtering. This is now not necessary anymore
as it's now possible to use the actual column name as well.
---
 library/Icinga/Repository/DbRepository.php    | 203 ++++++++++++++----
 library/Icinga/Repository/Repository.php      | 154 ++++++++++---
 library/Icinga/Repository/RepositoryQuery.php |  29 +--
 3 files changed, 308 insertions(+), 78 deletions(-)

diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index 93f9ceaeb..0ef4d32e9 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -69,14 +69,28 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      *
      * @var array
      */
-    protected $statementTableMap;
+    protected $statementAliasTableMap;
 
     /**
      * A flattened array to map statement columns to aliases
      *
      * @var array
      */
-    protected $statementColumnMap;
+    protected $statementAliasColumnMap;
+
+    /**
+     * An array to map table names to statement columns
+     *
+     * @var array
+     */
+    protected $statementColumnTableMap;
+
+    /**
+     * A flattened array to map aliases to statement columns
+     *
+     * @var array
+     */
+    protected $statementColumnAliasMap;
 
     /**
      * List of columns where the COLLATE SQL-instruction has been removed
@@ -348,13 +362,13 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      *
      * @return  array
      */
-    protected function getStatementTableMap()
+    protected function getStatementAliasTableMap()
     {
-        if ($this->statementTableMap === null) {
+        if ($this->statementAliasTableMap === null) {
             $this->initializeStatementMaps();
         }
 
-        return $this->statementTableMap;
+        return $this->statementAliasTableMap;
     }
 
     /**
@@ -362,40 +376,87 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      *
      * @return  array
      */
-    protected function getStatementColumnMap()
+    protected function getStatementAliasColumnMap()
     {
-        if ($this->statementColumnMap === null) {
+        if ($this->statementAliasColumnMap === null) {
             $this->initializeStatementMaps();
         }
 
-        return $this->statementColumnMap;
+        return $this->statementAliasColumnMap;
     }
 
     /**
-     * Initialize $this->statementTableMap and $this->statementColumnMap
+     * Return an array to map table names to statement columns
+     *
+     * @return  array
+     */
+    protected function getStatementColumnTableMap()
+    {
+        if ($this->statementColumnTableMap === null) {
+            $this->initializeStatementMaps();
+        }
+
+        return $this->statementColumnTableMap;
+    }
+
+    /**
+     * Return a flattened array to map aliases to statement columns
+     *
+     * @return  array
+     */
+    protected function getStatementColumnAliasMap()
+    {
+        if ($this->statementColumnAliasMap === null) {
+            $this->initializeStatementMaps();
+        }
+
+        return $this->statementColumnAliasMap;
+    }
+
+    /**
+     * Initialize $this->statementAliasTableMap and $this->statementAliasColumnMap
      */
     protected function initializeStatementMaps()
     {
-        $this->statementTableMap = array();
-        $this->statementColumnMap = array();
+        $this->statementAliasTableMap = array();
+        $this->statementAliasColumnMap = array();
+        $this->statementColumnTableMap = array();
+        $this->statementColumnAliasMap = array();
         foreach ($this->getStatementColumns() as $table => $columns) {
             foreach ($columns as $alias => $column) {
                 $key = is_string($alias) ? $alias : $column;
-                if (array_key_exists($key, $this->statementTableMap)) {
-                    if ($this->statementTableMap[$key] !== null) {
-                        $existingTable = $this->statementTableMap[$key];
-                        $existingColumn = $this->statementColumnMap[$key];
-                        $this->statementTableMap[$existingTable . '.' . $key] = $existingTable;
-                        $this->statementColumnMap[$existingTable . '.' . $key] = $existingColumn;
-                        $this->statementTableMap[$key] = null;
-                        $this->statementColumnMap[$key] = null;
+                if (array_key_exists($key, $this->statementAliasTableMap)) {
+                    if ($this->statementAliasTableMap[$key] !== null) {
+                        $existingTable = $this->statementAliasTableMap[$key];
+                        $existingColumn = $this->statementAliasColumnMap[$key];
+                        $this->statementAliasTableMap[$existingTable . '.' . $key] = $existingTable;
+                        $this->statementAliasColumnMap[$existingTable . '.' . $key] = $existingColumn;
+                        $this->statementAliasTableMap[$key] = null;
+                        $this->statementAliasColumnMap[$key] = null;
                     }
 
-                    $this->statementTableMap[$table . '.' . $key] = $table;
-                    $this->statementColumnMap[$table . '.' . $key] = $column;
+                    $this->statementAliasTableMap[$table . '.' . $key] = $table;
+                    $this->statementAliasColumnMap[$table . '.' . $key] = $column;
                 } else {
-                    $this->statementTableMap[$key] = $table;
-                    $this->statementColumnMap[$key] = $column;
+                    $this->statementAliasTableMap[$key] = $table;
+                    $this->statementAliasColumnMap[$key] = $column;
+                }
+
+                if (array_key_exists($column, $this->statementColumnTableMap)) {
+                    if ($this->statementColumnTableMap[$column] !== null) {
+                        $existingTable = $this->statementColumnTableMap[$column];
+                        $existingAlias = $this->statementColumnAliasMap[$column];
+                        $this->statementColumnTableMap[$existingTable . '.' . $column] = $existingTable;
+                        $this->statementColumnAliasMap[$existingTable . '.' . $column] = $existingAlias;
+                        $this->statementColumnTableMap[$column] = null;
+                        $this->statementColumnAliasMap[$column] = null;
+                    }
+
+                    $this->statementColumnTableMap[$table . '.' . $column] = $table;
+                    $this->statementColumnAliasMap[$table . '.' . $column] = $key;
+                } else {
+                    $this->statementColumnTableMap[$column] = $table;
+                    $this->statementColumnAliasMap[$column] = $key;
                 }
             }
         }
@@ -529,6 +590,28 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
         return parent::resolveQueryColumnAlias($this->removeTablePrefix($this->clearTableAlias($table)), $alias);
     }
 
+    /**
+     * Return the alias for the given query column name or null in case the query column name does not exist
+     *
+     * @param   array|string    $table
+     * @param   string          $column
+     *
+     * @return  string|null
+     */
+    public function reassembleQueryColumnAlias($table, $column)
+    {
+        $alias = parent::reassembleQueryColumnAlias($this->removeTablePrefix($this->clearTableAlias($table)), $column);
+        if (
+            $alias === null
+            && !$this->validateQueryColumnAssociation($table, $column)
+            && ($tableName = $this->findTableName($column))
+        ) {
+            return parent::reassembleQueryColumnAlias($tableName, $column);
+        }
+
+        return $alias;
+    }
+
     /**
      * Return whether the given query column name or alias is available in the given table
      *
@@ -607,14 +690,35 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      */
     public function resolveStatementColumnAlias($table, $alias)
     {
-        $statementColumnMap = $this->getStatementColumnMap();
-        if (isset($statementColumnMap[$alias])) {
-            return $statementColumnMap[$alias];
+        $statementAliasColumnMap = $this->getStatementAliasColumnMap();
+        if (isset($statementAliasColumnMap[$alias])) {
+            return $statementAliasColumnMap[$alias];
         }
 
         $prefixedAlias = $this->removeTablePrefix($table) . '.' . $alias;
-        if (isset($statementColumnMap[$prefixedAlias])) {
-            return $statementColumnMap[$prefixedAlias];
+        if (isset($statementAliasColumnMap[$prefixedAlias])) {
+            return $statementAliasColumnMap[$prefixedAlias];
+        }
+    }
+
+    /**
+     * Return the alias for the given statement column name or null in case the statement column does not exist
+     *
+     * @param   string  $table
+     * @param   string  $column
+     *
+     * @return  string|null
+     */
+    public function reassembleStatementColumnAlias($table, $column)
+    {
+        $statementColumnAliasMap = $this->getStatementColumnAliasMap();
+        if (isset($statementColumnAliasMap[$column])) {
+            return $statementColumnAliasMap[$column];
+        }
+
+        $prefixedColumn = $this->removeTablePrefix($table) . '.' . $column;
+        if (isset($statementColumnAliasMap[$prefixedColumn])) {
+            return $statementColumnAliasMap[$prefixedColumn];
         }
     }
 
@@ -628,13 +732,20 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      */
     public function validateStatementColumnAssociation($table, $alias)
     {
-        $statementTableMap = $this->getStatementTableMap();
-        if (isset($statementTableMap[$alias])) {
-            return $statementTableMap[$alias] === $this->removeTablePrefix($table);
+        $tableName = $this->removeTablePrefix($table);
+
+        $statementAliasTableMap = $this->getStatementAliasTableMap();
+        if (isset($statementAliasTableMap[$alias])) {
+            return $statementAliasTableMap[$alias] === $tableName;
         }
 
-        $prefixedAlias = $this->removeTablePrefix($table) . '.' . $alias;
-        return isset($statementTableMap[$prefixedAlias]);
+        $statementColumnTableMap = $this->getStatementColumnTableMap();
+        if (isset($statementColumnTableMap[$alias])) {
+            return $statementColumnTableMap[$alias] === $tableName;
+        }
+
+        $prefixedAlias = $tableName . '.' . $alias;
+        return isset($statementAliasTableMap[$prefixedAlias]) || isset($statementColumnTableMap[$prefixedAlias]);
     }
 
     /**
@@ -648,7 +759,8 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     public function hasStatementColumn($table, $name)
     {
         if (
-            $this->resolveStatementColumnAlias($table, $name) === null
+            ($this->resolveStatementColumnAlias($table, $name) === null
+             && $this->reassembleStatementColumnAlias($table, $name) === null)
             || !$this->validateStatementColumnAssociation($table, $name)
         ) {
             return parent::hasStatementColumn($table, $name);
@@ -669,11 +781,15 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      */
     public function requireStatementColumn($table, $name)
     {
-        if (($column = $this->resolveStatementColumnAlias($table, $name)) === null) {
+        if (($column = $this->resolveStatementColumnAlias($table, $name)) !== null) {
+            $alias = $name;
+        } elseif (($alias = $this->reassembleStatementColumnAlias($table, $name)) !== null) {
+            $column = $name;
+        } else {
             return parent::requireStatementColumn($table, $name);
         }
 
-        if (! $this->validateStatementColumnAssociation($table, $name)) {
+        if (! $this->validateStatementColumnAssociation($table, $alias)) {
             throw new StatementException('Statement column "%s" not found in table "%s"', $name, $table);
         }
 
@@ -706,7 +822,9 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
             );
         }
 
-        $column = $this->resolveQueryColumnAlias($tableName, $name);
+        if (($column = $this->resolveQueryColumnAlias($tableName, $name)) === null) {
+            $column = $name;
+        }
 
         $prefixedTableName = $this->prependTablePrefix($tableName);
         if ($query->getQuery()->hasJoinedTable($prefixedTableName)) {
@@ -741,11 +859,16 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
             return $aliasTableMap[$column];
         }
 
+        $columnTableMap = $this->getColumnTableMap();
+        if (isset($columnTableMap[$column])) {
+            return $columnTableMap[$column];
+        }
+
         // TODO(jom): Elaborate whether it makes sense to throw ProgrammingError
         //            instead (duplicate aliases in different tables?)
-        foreach ($aliasTableMap as $alias => $table) {
-            if (strpos($alias, '.') !== false) {
-                list($_, $alias) = explode('.', $column, 2);
+        foreach ($aliasTableMap as $prefixedAlias => $table) {
+            if (strpos($prefixedAlias, '.') !== false) {
+                list($_, $alias) = explode('.', $prefixedAlias, 2);
                 if ($alias === $column) {
                     return $table;
                 }
diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index 98b3e0ab4..ada50e3f6 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -134,6 +134,20 @@ abstract class Repository implements Selectable
      */
     protected $aliasColumnMap;
 
+    /**
+     * An array to map table names to query columns
+     *
+     * @var array
+     */
+    protected $columnTableMap;
+
+    /**
+     * A flattened array to map aliases to query columns
+     *
+     * @var array
+     */
+    protected $columnAliasMap;
+
     /**
      * Create a new repository object
      *
@@ -144,6 +158,8 @@ abstract class Repository implements Selectable
         $this->ds = $ds;
         $this->aliasTableMap = array();
         $this->aliasColumnMap = array();
+        $this->columnTableMap = array();
+        $this->columnAliasMap = array();
 
         $this->init();
     }
@@ -347,6 +363,34 @@ abstract class Repository implements Selectable
         return $this->aliasColumnMap;
     }
 
+    /**
+     * Return an array to map table names to query columns
+     *
+     * @return  array
+     */
+    protected function getColumnTableMap()
+    {
+        if (empty($this->columnTableMap)) {
+            $this->initializeAliasMaps();
+        }
+
+        return $this->columnTableMap;
+    }
+
+    /**
+     * Return a flattened array to map aliases to query columns
+     *
+     * @return  array
+     */
+    protected function getColumnAliasMap()
+    {
+        if (empty($this->columnAliasMap)) {
+            $this->initializeAliasMaps();
+        }
+
+        return $this->columnAliasMap;
+    }
+
     /**
      * Initialize $this->aliasTableMap and $this->aliasColumnMap
      *
@@ -384,6 +428,23 @@ abstract class Repository implements Selectable
                     $this->aliasTableMap[$key] = $table;
                     $this->aliasColumnMap[$key] = $column;
                 }
+
+                if (array_key_exists($column, $this->columnTableMap)) {
+                    if ($this->columnTableMap[$column] !== null) {
+                        $existingTable = $this->columnTableMap[$column];
+                        $existingAlias = $this->columnAliasMap[$column];
+                        $this->columnTableMap[$existingTable . '.' . $column] = $existingTable;
+                        $this->columnAliasMap[$existingTable . '.' . $column] = $existingAlias;
+                        $this->columnTableMap[$column] = null;
+                        $this->columnAliasMap[$column] = null;
+                    }
+
+                    $this->columnTableMap[$table . '.' . $column] = $table;
+                    $this->columnAliasMap[$table . '.' . $column] = $key;
+                } else {
+                    $this->columnTableMap[$column] = $table;
+                    $this->columnAliasMap[$column] = $key;
+                }
             }
         }
     }
@@ -472,32 +533,35 @@ abstract class Repository implements Selectable
         }
 
         $tableRules = $conversionRules[$table];
+        if (($alias = $this->reassembleQueryColumnAlias($table, $name)) === null) {
+            $alias = $name;
+        }
 
         // Check for a conversion method for the alias/column first
-        if (array_key_exists($name, $tableRules) || in_array($name, $tableRules)) {
-            $methodName = $context . join('', array_map('ucfirst', explode('_', $name)));
+        if (array_key_exists($alias, $tableRules) || in_array($alias, $tableRules)) {
+            $methodName = $context . join('', array_map('ucfirst', explode('_', $alias)));
             if (method_exists($this, $methodName)) {
                 return $methodName;
             }
         }
 
         // The conversion method for the type is just a fallback, but it is required to exist if defined
-        if (isset($tableRules[$name])) {
-            $identifier = join('', array_map('ucfirst', explode('_', $tableRules[$name])));
+        if (isset($tableRules[$alias])) {
+            $identifier = join('', array_map('ucfirst', explode('_', $tableRules[$alias])));
             if (! method_exists($this, $context . $identifier)) {
                 // Do not throw an error in case at least one conversion method exists
                 if (! method_exists($this, ($context === 'persist' ? 'retrieve' : 'persist') . $identifier)) {
                     throw new ProgrammingError(
                         'Cannot find any conversion method for type "%s"'
                         . '. Add a proper conversion method or remove the type definition',
-                        $tableRules[$name]
+                        $tableRules[$alias]
                     );
                 }
 
                 Logger::debug(
                     'Conversion method "%s" for type definition "%s" does not exist in repository "%s".',
                     $context . $identifier,
-                    $tableRules[$name],
+                    $tableRules[$alias],
                     $this->getName()
                 );
             } else {
@@ -729,6 +793,27 @@ abstract class Repository implements Selectable
         }
     }
 
+    /**
+     * Return the alias for the given query column name or null in case the query column name does not exist
+     *
+     * @param   string  $table
+     * @param   string  $column
+     *
+     * @return  string|null
+     */
+    public function reassembleQueryColumnAlias($table, $column)
+    {
+        $columnAliasMap = $this->getColumnAliasMap();
+        if (isset($columnAliasMap[$column])) {
+            return $columnAliasMap[$column];
+        }
+
+        $prefixedColumn = $table . '.' . $column;
+        if (isset($columnAliasMap[$prefixedColumn])) {
+            return $columnAliasMap[$prefixedColumn];
+        }
+    }
+
     /**
      * Return whether the given alias or query column name is available in the given table
      *
@@ -744,8 +829,13 @@ abstract class Repository implements Selectable
             return $aliasTableMap[$alias] === $table;
         }
 
+        $columnTableMap = $this->getColumnTableMap();
+        if (isset($columnTableMap[$alias])) {
+            return $columnTableMap[$alias] === $table;
+        }
+
         $prefixedAlias = $table . '.' . $alias;
-        return isset($aliasTableMap[$prefixedAlias]);
+        return isset($aliasTableMap[$prefixedAlias]) || isset($columnTableMap[$prefixedAlias]);
     }
 
     /**
@@ -758,12 +848,13 @@ abstract class Repository implements Selectable
      */
     public function hasQueryColumn($table, $name)
     {
-        if (in_array($name, $this->getFilterColumns())) {
+        if ($this->resolveQueryColumnAlias($table, $name) !== null) {
+            $alias = $name;
+        } elseif (($alias = $this->reassembleQueryColumnAlias($table, $name)) === null) {
             return false;
         }
 
-        return $this->resolveQueryColumnAlias($table, $name) !== null
-            && $this->validateQueryColumnAssociation($table, $name);
+        return !in_array($alias, $this->getFilterColumns()) && $this->validateQueryColumnAssociation($table, $name);
     }
 
     /**
@@ -779,15 +870,19 @@ abstract class Repository implements Selectable
      */
     public function requireQueryColumn($table, $name, RepositoryQuery $query = null)
     {
-        if (in_array($name, $this->getFilterColumns())) {
-            throw new QueryException(t('Filter column "%s" cannot be queried'), $name);
-        }
-
-        if (($column = $this->resolveQueryColumnAlias($table, $name)) === null) {
+        if (($column = $this->resolveQueryColumnAlias($table, $name)) !== null) {
+            $alias = $name;
+        } elseif (($alias = $this->reassembleQueryColumnAlias($table, $name)) !== null) {
+            $column = $name;
+        } else {
             throw new QueryException(t('Query column "%s" not found'), $name);
         }
 
-        if (! $this->validateQueryColumnAssociation($table, $name)) {
+        if (in_array($alias, $this->getFilterColumns())) {
+            throw new QueryException(t('Filter column "%s" cannot be queried'), $name);
+        }
+
+        if (! $this->validateQueryColumnAssociation($table, $alias)) {
             throw new QueryException(t('Query column "%s" not found in table "%s"'), $name, $table);
         }
 
@@ -804,7 +899,8 @@ abstract class Repository implements Selectable
      */
     public function hasFilterColumn($table, $name)
     {
-        return $this->resolveQueryColumnAlias($table, $name) !== null
+        return ($this->resolveQueryColumnAlias($table, $name) !== null
+            || $this->reassembleQueryColumnAlias($table, $name) !== null)
             && $this->validateQueryColumnAssociation($table, $name);
     }
 
@@ -821,11 +917,15 @@ abstract class Repository implements Selectable
      */
     public function requireFilterColumn($table, $name, RepositoryQuery $query = null)
     {
-        if (($column = $this->resolveQueryColumnAlias($table, $name)) === null) {
+        if (($column = $this->resolveQueryColumnAlias($table, $name)) !== null) {
+            $alias = $name;
+        } elseif (($alias = $this->reassembleQueryColumnAlias($table, $name)) !== null) {
+            $column = $name;
+        } else {
             throw new QueryException(t('Filter column "%s" not found'), $name);
         }
 
-        if (! $this->validateQueryColumnAssociation($table, $name)) {
+        if (! $this->validateQueryColumnAssociation($table, $alias)) {
             throw new QueryException(t('Filter column "%s" not found in table "%s"'), $name, $table);
         }
 
@@ -857,15 +957,19 @@ abstract class Repository implements Selectable
      */
     public function requireStatementColumn($table, $name)
     {
-        if (in_array($name, $this->filterColumns)) {
-            throw new StatementException('Filter column "%s" cannot be referenced in a statement', $name);
-        }
-
-        if (($column = $this->resolveQueryColumnAlias($table, $name)) === null) {
+        if (($column = $this->resolveQueryColumnAlias($table, $name)) !== null) {
+            $alias = $name;
+        } elseif (($alias = $this->reassembleQueryColumnAlias($table, $name)) !== null) {
+            $column = $name;
+        } else {
             throw new StatementException('Statement column "%s" not found', $name);
         }
 
-        if (! $this->validateQueryColumnAssociation($table, $name)) {
+        if (in_array($alias, $this->getFilterColumns())) {
+            throw new StatementException('Filter column "%s" cannot be referenced in a statement', $name);
+        }
+
+        if (! $this->validateQueryColumnAssociation($table, $alias)) {
             throw new StatementException('Statement column "%s" not found in table "%s"', $name, $table);
         }
 
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index 5b2765fe2..cf0cd9fae 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -241,20 +241,23 @@ class RepositoryQuery implements QueryInterface, Iterator
             if ($direction !== null || !array_key_exists('order', $sortColumns)) {
                 $sortColumns['order'] = $direction ?: static::SORT_ASC;
             }
-        } elseif (! $ignoreDefault && array_key_exists($field, $sortRules)) {
-            $sortColumns = $sortRules[$field];
-            if (! array_key_exists('columns', $sortColumns)) {
-                $sortColumns['columns'] = array($field);
-            }
-            if ($direction !== null || !array_key_exists('order', $sortColumns)) {
-                $sortColumns['order'] = $direction ?: static::SORT_ASC;
-            }
         } else {
-            $sortColumns = array(
-                'columns'   => array($field),
-                'order'     => $direction
-            );
-        };
+            $alias = $this->repository->reassembleQueryColumnAlias($this->target, $field) ?: $field;
+            if (! $ignoreDefault && array_key_exists($alias, $sortRules)) {
+                $sortColumns = $sortRules[$alias];
+                if (! array_key_exists('columns', $sortColumns)) {
+                    $sortColumns['columns'] = array($alias);
+                }
+                if ($direction !== null || !array_key_exists('order', $sortColumns)) {
+                    $sortColumns['order'] = $direction ?: static::SORT_ASC;
+                }
+            } else {
+                $sortColumns = array(
+                    'columns'   => array($alias),
+                    'order'     => $direction
+                );
+            }
+        }
 
         $baseDirection = strtoupper($sortColumns['order']) === static::SORT_DESC ? static::SORT_DESC : static::SORT_ASC;
 

From 5d3eb5e8cb03deb87556f353a17d38667f637caa Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 26 Jun 2015 14:20:35 +0200
Subject: [PATCH 2412/2920] Repository: Allow to check for conversion rules of
 a specific column

---
 library/Icinga/Repository/DbRepository.php | 24 ++++++++++++++++++----
 library/Icinga/Repository/Repository.php   | 18 +++++++++++++---
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index 0ef4d32e9..be9a8b838 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -463,17 +463,33 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     }
 
     /**
-     * Return whether this repository is capable of converting values
+     * Return whether this repository is capable of converting values for the given table and optional column
      *
-     * This does not check whether any conversion for the given table is available, as it may be possible
-     * that columns from another table where joined in which would otherwise not being converted.
+     * This does not check whether any conversion for the given table is available if $column is not given, as it
+     * may be possible that columns from another table where joined in which would otherwise not being converted.
      *
      * @param   array|string    $table
+     * @param   string          $column
      *
      * @return  bool
      */
-    public function providesValueConversion($_)
+    public function providesValueConversion($table, $column = null)
     {
+        if ($column !== null) {
+            if ($this->validateQueryColumnAssociation($table, $column)) {
+                return parent::providesValueConversion(
+                    $this->removeTablePrefix($this->clearTableAlias($table)),
+                    $column
+                );
+            }
+
+            if (($tableName = $this->findTableName($column))) {
+                return parent::providesValueConversion($tableName, $column);
+            }
+
+            return false;
+        }
+
         $conversionRules = $this->getConversionRules();
         return !empty($conversionRules);
     }
diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index ada50e3f6..065548fb8 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -464,16 +464,28 @@ abstract class Repository implements Selectable
     }
 
     /**
-     * Return whether this repository is capable of converting values for the given table
+     * Return whether this repository is capable of converting values for the given table and optional column
      *
      * @param   string  $table
+     * @param   string  $column
      *
      * @return  bool
      */
-    public function providesValueConversion($table)
+    public function providesValueConversion($table, $column = null)
     {
         $conversionRules = $this->getConversionRules();
-        return !empty($conversionRules) && isset($conversionRules[$table]);
+        if (empty($conversionRules)) {
+            return false;
+        }
+
+        if (! isset($conversionRules[$table])) {
+            return false;
+        } elseif ($column === null) {
+            return true;
+        }
+
+        $alias = $this->reassembleQueryColumnAlias($table, $column) ?: $column;
+        return array_key_exists($alias, $conversionRules[$table]) || in_array($alias, $conversionRules[$table]);
     }
 
     /**

From 56c506c8afb9548d7387dde5aee30531cef0af4e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 26 Jun 2015 14:21:09 +0200
Subject: [PATCH 2413/2920] SimpleQuery: Do not report to have a limit if there
 is none

---
 library/Icinga/Data/SimpleQuery.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 1183ff327..9751a2756 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -380,7 +380,7 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
      */
     public function hasLimit()
     {
-        return $this->limitCount !== null;
+        return $this->limitCount !== null && $this->limitCount > 0;
     }
 
     /**

From 9055eb9cb700c08f053b9083712f0e389c1e105d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 26 Jun 2015 14:24:03 +0200
Subject: [PATCH 2414/2920] RepositoryQuery: Do not sort by converted columns
 for limited queries

A limited query with conversion rules makes it impossible to sort
the result.
---
 library/Icinga/Repository/RepositoryQuery.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index cf0cd9fae..79e85ff92 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -264,6 +264,16 @@ class RepositoryQuery implements QueryInterface, Iterator
         foreach ($sortColumns['columns'] as $column) {
             list($column, $specificDirection) = $this->splitOrder($column);
 
+            if ($this->hasLimit() && $this->repository->providesValueConversion($this->target, $column)) {
+                Logger::debug(
+                    'Cannot order by column "%s" in repository "%s". The query is'
+                    . ' limited and applies value conversion rules on the column',
+                    $column,
+                    $this->repository->getName()
+                );
+                continue;
+            }
+
             try {
                 $this->query->order(
                     $this->repository->requireFilterColumn($this->target, $column, $this),

From ae21baa41e55e50774b4e7d42e24686bf231c25f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 26 Jun 2015 14:54:15 +0200
Subject: [PATCH 2415/2920] Sortable: Allow to check for a particular sort rule

---
 library/Icinga/Data/SimpleQuery.php            | 18 ++++++++++++++++--
 library/Icinga/Data/Sortable.php               |  4 +++-
 library/Icinga/Repository/RepositoryQuery.php  |  6 ++++--
 .../library/Monitoring/DataView/DataView.php   |  6 ++++--
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 9751a2756..b20cb02ab 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -341,11 +341,25 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
     /**
      * Whether an order is set
      *
+     * @param   string  $column
+     *
      * @return bool
      */
-    public function hasOrder()
+    public function hasOrder($column = null)
     {
-        return !empty($this->order);
+        if (empty($this->order)) {
+            return false;
+        } elseif ($column === null) {
+            return true;
+        }
+
+        foreach ($this->order as $rule) {
+            if ($rule[0] === $column) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     /**
diff --git a/library/Icinga/Data/Sortable.php b/library/Icinga/Data/Sortable.php
index 9c837e3d3..9f4898d8e 100644
--- a/library/Icinga/Data/Sortable.php
+++ b/library/Icinga/Data/Sortable.php
@@ -36,9 +36,11 @@ interface Sortable
     /**
      * Whether an order is set
      *
+     * @param   string  $column
+     *
      * @return bool
      */
-    public function hasOrder();
+    public function hasOrder($column = null);
 
     /**
      * Get the order if any
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index 79e85ff92..e1294e50f 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -315,11 +315,13 @@ class RepositoryQuery implements QueryInterface, Iterator
     /**
      * Return whether any sort rules were applied to this query
      *
+     * @param   string  $column
+     *
      * @return  bool
      */
-    public function hasOrder()
+    public function hasOrder($column = null)
     {
-        return $this->query->hasOrder();
+        return $this->query->hasOrder($column);
     }
 
     /**
diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 0f892f42c..b472fec65 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -294,11 +294,13 @@ abstract class DataView implements QueryInterface, IteratorAggregate
     /**
      * Whether an order is set
      *
+     * @param   string  $column
+     *
      * @return bool
      */
-    public function hasOrder()
+    public function hasOrder($column = null)
     {
-        return $this->query->hasOrder();
+        return $this->query->hasOrder($column);
     }
 
     /**

From 0bcf7907d475e994ad0f292ff522ff570e44caf5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 26 Jun 2015 15:11:15 +0200
Subject: [PATCH 2416/2920] RepositoryQuery: Optimize value conversion in
 fetchColumn & -Pairs

---
 library/Icinga/Repository/RepositoryQuery.php | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index e1294e50f..d75165d3e 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -450,8 +450,10 @@ class RepositoryQuery implements QueryInterface, Iterator
             $columns = $this->getColumns();
             $aliases = array_keys($columns);
             $column = is_int($aliases[0]) ? $columns[0] : $aliases[0];
-            foreach ($results as & $value) {
-                $value = $this->repository->retrieveColumn($this->target, $column, $value);
+            if ($this->repository->providesValueConversion($this->target, $column)) {
+                foreach ($results as & $value) {
+                    $value = $this->repository->retrieveColumn($this->target, $column, $value);
+                }
             }
         }
 
@@ -475,15 +477,20 @@ class RepositoryQuery implements QueryInterface, Iterator
         if (! empty($results) && $this->repository->providesValueConversion($this->target)) {
             $columns = $this->getColumns();
             $aliases = array_keys($columns);
-            $newResults = array();
-            foreach ($results as $colOneValue => $colTwoValue) {
-                $colOne = $aliases[0] !== 0 ? $aliases[0] : $columns[0];
-                $colTwo = count($aliases) < 2 ? $colOne : ($aliases[1] !== 1 ? $aliases[1] : $columns[1]);
-                $colOneValue = $this->repository->retrieveColumn($this->target, $colOne, $colOneValue);
-                $newResults[$colOneValue] = $this->repository->retrieveColumn($this->target, $colTwo, $colTwoValue);
-            }
+            $colOne = $aliases[0] !== 0 ? $aliases[0] : $columns[0];
+            $colTwo = count($aliases) < 2 ? $colOne : ($aliases[1] !== 1 ? $aliases[1] : $columns[1]);
+            if (
+                $this->repository->providesValueConversion($this->target, $colOne)
+                || $this->repository->providesValueConversion($this->target, $colTwo)
+            ) {
+                $newResults = array();
+                foreach ($results as $colOneValue => $colTwoValue) {
+                    $colOneValue = $this->repository->retrieveColumn($this->target, $colOne, $colOneValue);
+                    $newResults[$colOneValue] = $this->repository->retrieveColumn($this->target, $colTwo, $colTwoValue);
+                }
 
-            $results = $newResults;
+                $results = $newResults;
+            }
         }
 
         return $results;

From 0fc8e6046c2efd2e528953cf1377f2750fa58c46 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 26 Jun 2015 15:13:31 +0200
Subject: [PATCH 2417/2920] RepositoryQuery: Update sort order when converting
 sort rules in fetchAll

---
 library/Icinga/Repository/RepositoryQuery.php | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index d75165d3e..b07a69400 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -509,7 +509,9 @@ class RepositoryQuery implements QueryInterface, Iterator
 
         $results = $this->query->fetchAll();
         if (! empty($results) && $this->repository->providesValueConversion($this->target)) {
+            $updateOrder = false;
             $columns = $this->getColumns();
+            $flippedColumns = array_flip($columns);
             foreach ($results as $row) {
                 foreach ($columns as $alias => $column) {
                     if (! is_string($alias)) {
@@ -518,6 +520,27 @@ class RepositoryQuery implements QueryInterface, Iterator
 
                     $row->$alias = $this->repository->retrieveColumn($this->target, $alias, $row->$alias);
                 }
+
+                foreach (($this->getOrder() ?: array()) as $rule) {
+                    if (! array_key_exists($rule[0], $flippedColumns) && property_exists($row, $rule[0])) {
+                        if ($this->repository->providesValueConversion($this->target, $rule[0])) {
+                            $updateOrder = true;
+                            $row->{$rule[0]} = $this->repository->retrieveColumn(
+                                $this->target,
+                                $rule[0],
+                                $row->{$rule[0]}
+                            );
+                        }
+                    } elseif (array_key_exists($rule[0], $flippedColumns)) {
+                        if ($this->repository->providesValueConversion($this->target, $rule[0])) {
+                            $updateOrder = true;
+                        }
+                    }
+                }
+            }
+
+            if ($updateOrder) {
+                uasort($results, array($this->query, 'compare'));
             }
         }
 

From cfd43f251e688ce71603f5d76412eaa1cb645e97 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 26 Jun 2015 15:13:46 +0200
Subject: [PATCH 2418/2920] Revert "Sortable: Allow to check for a particular
 sort rule"

This reverts commit ae21baa41e55e50774b4e7d42e24686bf231c25f.
---
 library/Icinga/Data/SimpleQuery.php            | 18 ++----------------
 library/Icinga/Data/Sortable.php               |  4 +---
 library/Icinga/Repository/RepositoryQuery.php  |  6 ++----
 .../library/Monitoring/DataView/DataView.php   |  6 ++----
 4 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index b20cb02ab..9751a2756 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -341,25 +341,11 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
     /**
      * Whether an order is set
      *
-     * @param   string  $column
-     *
      * @return bool
      */
-    public function hasOrder($column = null)
+    public function hasOrder()
     {
-        if (empty($this->order)) {
-            return false;
-        } elseif ($column === null) {
-            return true;
-        }
-
-        foreach ($this->order as $rule) {
-            if ($rule[0] === $column) {
-                return true;
-            }
-        }
-
-        return false;
+        return !empty($this->order);
     }
 
     /**
diff --git a/library/Icinga/Data/Sortable.php b/library/Icinga/Data/Sortable.php
index 9f4898d8e..9c837e3d3 100644
--- a/library/Icinga/Data/Sortable.php
+++ b/library/Icinga/Data/Sortable.php
@@ -36,11 +36,9 @@ interface Sortable
     /**
      * Whether an order is set
      *
-     * @param   string  $column
-     *
      * @return bool
      */
-    public function hasOrder($column = null);
+    public function hasOrder();
 
     /**
      * Get the order if any
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index b07a69400..bbe0ae251 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -315,13 +315,11 @@ class RepositoryQuery implements QueryInterface, Iterator
     /**
      * Return whether any sort rules were applied to this query
      *
-     * @param   string  $column
-     *
      * @return  bool
      */
-    public function hasOrder($column = null)
+    public function hasOrder()
     {
-        return $this->query->hasOrder($column);
+        return $this->query->hasOrder();
     }
 
     /**
diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index b472fec65..0f892f42c 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -294,13 +294,11 @@ abstract class DataView implements QueryInterface, IteratorAggregate
     /**
      * Whether an order is set
      *
-     * @param   string  $column
-     *
      * @return bool
      */
-    public function hasOrder($column = null)
+    public function hasOrder()
     {
-        return $this->query->hasOrder($column);
+        return $this->query->hasOrder();
     }
 
     /**

From 8c8198eeeaa513bb215ebec3f41fa739b42b7c3d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 29 Jun 2015 11:11:06 +0200
Subject: [PATCH 2419/2920] UserGroupBackendForm: Some small documentation
 fixes

---
 .../forms/Config/UserGroup/UserGroupBackendForm.php       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/application/forms/Config/UserGroup/UserGroupBackendForm.php b/application/forms/Config/UserGroup/UserGroupBackendForm.php
index 5bd0d9681..d47e1f4fa 100644
--- a/application/forms/Config/UserGroup/UserGroupBackendForm.php
+++ b/application/forms/Config/UserGroup/UserGroupBackendForm.php
@@ -32,9 +32,11 @@ class UserGroupBackendForm extends ConfigForm
     /**
      * Return a form object for the given backend type
      *
-     * @param   string      $type   The backend type for which to return a form
+     * @param   string  $type               The backend type for which to return a form
      *
      * @return  Form
+     *
+     * @throws  InvalidArgumentException    In case the given backend type is invalid
      */
     public function getBackendForm($type)
     {
@@ -74,6 +76,8 @@ class UserGroupBackendForm extends ConfigForm
     /**
      * Add a new user group backend
      *
+     * The backend to add is identified by the array-key `name'.
+     *
      * @param   array   $data
      *
      * @return  $this
@@ -171,7 +175,7 @@ class UserGroupBackendForm extends ConfigForm
                             'pattern'  => '/^[^\\[\\]:]+$/',
                             'messages' => array(
                                 'regexNotMatch' => $this->translate(
-                                    'The backend name cannot contain \'[\', \']\' or \':\'.'
+                                    'The name cannot contain \'[\', \']\' or \':\'.'
                                 )
                             )
                         )

From 766ff8ed839affcf0bb8a7dbb0f604ce28b9095d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 29 Jun 2015 12:01:43 +0200
Subject: [PATCH 2420/2920] InstanceConfigForm: Adjust how to process requests

fixes #7486
fixes #7488
fixes #7489
fixes #7490
refs #9516
---
 .../controllers/ConfigController.php          | 119 +++++---
 .../forms/Config/InstanceConfigForm.php       | 267 ++++++++++--------
 .../application/forms/Setup/InstancePage.php  |   4 -
 .../views/scripts/config/createinstance.phtml |   6 -
 .../views/scripts/config/editinstance.phtml   |   6 -
 .../views/scripts/config/removeinstance.phtml |   6 -
 6 files changed, 221 insertions(+), 187 deletions(-)
 delete mode 100644 modules/monitoring/application/views/scripts/config/createinstance.phtml
 delete mode 100644 modules/monitoring/application/views/scripts/config/editinstance.phtml
 delete mode 100644 modules/monitoring/application/views/scripts/config/removeinstance.phtml

diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index 33bf142f3..5187a5691 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -91,82 +91,113 @@ class Monitoring_ConfigController extends Controller
     }
 
     /**
-     * Display a confirmation form to remove the instance identified by the 'instance' parameter
+     * Remove a monitoring instance
      */
     public function removeinstanceAction()
     {
-        $config = $this->Config('instances');
-        $form = new ConfirmRemovalForm(array(
-            'onSuccess' => function ($form) use ($config) {
-                $instanceName = $form->getRequest()->getQuery('instance');
-                $configForm = new InstanceConfigForm();
-                $configForm->setIniConfig($config);
+        $instanceName = $this->params->getRequired('instance');
 
-                try {
-                    $configForm->remove($instanceName);
-                } catch (InvalidArgumentException $e) {
-                    Notification::error($e->getMessage());
-                    return;
-                }
-
-                if ($configForm->save()) {
-                    Notification::success(sprintf(
-                        $this->translate('Instance "%s" successfully removed.'),
-                        $instanceName
-                    ));
-                } else {
-                    return false;
-                }
-            }
-        ));
-        $form->setTitle($this->translate('Remove Existing Instance'));
+        $instanceForm = new InstanceConfigForm();
+        $instanceForm->setIniConfig($this->Config('instances'));
+        $form = new ConfirmRemovalForm();
+        $form->setRedirectUrl('monitoring/config');
+        $form->setTitle(sprintf($this->translate('Remove Monitoring Instance %s'), $instanceName));
         $form->addDescription($this->translate(
             'If you have still any environments or views referring to this instance, '
             . 'you won\'t be able to send commands anymore after deletion.'
         ));
-        $form->addElement(
-            'note',
-            'question',
-            array(
-                'value'         => $this->translate('Are you sure you want to remove this instance?'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'p'))
-                )
-            )
-        );
-        $form->setRedirectUrl('monitoring/config');
+        $form->setOnSuccess(function (ConfirmRemovalForm $form) use ($instanceName, $instanceForm) {
+            try {
+                $instanceForm->delete($instanceName);
+            } catch (Exception $e) {
+                $form->error($e->getMessage());
+                return false;
+            }
+
+            if ($instanceForm->save()) {
+                Notification::success(sprintf(t('Monitoring instance "%s" successfully removed'), $instanceName));
+                return true;
+            }
+
+            return false;
+        });
         $form->handleRequest();
 
         $this->view->form = $form;
+        $this->render('form');
     }
 
     /**
-     * Display a form to edit the instance identified by the 'instance' parameter of the request
+     * Edit a monitoring instance
      */
     public function editinstanceAction()
     {
+        $instanceName = $this->params->getRequired('instance');
+
         $form = new InstanceConfigForm();
-        $form->setTitle($this->translate('Edit Existing Instance'));
-        $form->setIniConfig($this->Config('instances'));
         $form->setRedirectUrl('monitoring/config');
-        $form->handleRequest();
+        $form->setTitle(sprintf($this->translate('Edit Monitoring Instance %s'), $instanceName));
+        $form->setIniConfig($this->Config('instances'));
+        $form->setOnSuccess(function (InstanceConfigForm $form) use ($instanceName) {
+            try {
+                $form->edit($instanceName, array_map(
+                    function ($v) {
+                        return $v !== '' ? $v : null;
+                    },
+                    $form->getValues()
+                ));
+            } catch (Exception $e) {
+                $form->error($e->getMessage());
+                return false;
+            }
+
+            if ($form->save()) {
+                Notification::success(sprintf(t('Monitoring instance "%s" successfully updated'), $instanceName));
+                return true;
+            }
+
+            return false;
+        });
+
+        try {
+            $form->load($instanceName);
+            $form->handleRequest();
+        } catch (NotFoundError $_) {
+            $this->httpNotFound(sprintf($this->translate('Monitoring instance "%s" not found'), $instanceName));
+        }
 
         $this->view->form = $form;
+        $this->render('form');
     }
 
     /**
-     * Display a form to create a new instance
+     * Create a new monitoring instance
      */
     public function createinstanceAction()
     {
         $form = new InstanceConfigForm();
-        $form->setTitle($this->translate('Add New Instance'));
-        $form->setIniConfig($this->Config('instances'));
         $form->setRedirectUrl('monitoring/config');
+        $form->setTitle($this->translate('Create New Monitoring Instance'));
+        $form->setIniConfig($this->Config('instances'));
+        $form->setOnSuccess(function (InstanceConfigForm $form) {
+            try {
+                $form->add(array_filter($form->getValues()));
+            } catch (Exception $e) {
+                $form->error($e->getMessage());
+                return false;
+            }
+
+            if ($form->save()) {
+                Notification::success(t('Monitoring instance successfully created'));
+                return true;
+            }
+
+            return false;
+        });
         $form->handleRequest();
 
         $this->view->form = $form;
+        $this->render('form');
     }
 
     /**
diff --git a/modules/monitoring/application/forms/Config/InstanceConfigForm.php b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
index c44e480ac..652279722 100644
--- a/modules/monitoring/application/forms/Config/InstanceConfigForm.php
+++ b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
@@ -4,22 +4,28 @@
 namespace Icinga\Module\Monitoring\Forms\Config;
 
 use InvalidArgumentException;
-use Icinga\Exception\ConfigurationError;
+use Icinga\Exception\IcingaException;
+use Icinga\Exception\NotFoundError;
 use Icinga\Forms\ConfigForm;
 use Icinga\Module\Monitoring\Command\Transport\LocalCommandFile;
 use Icinga\Module\Monitoring\Command\Transport\RemoteCommandFile;
 use Icinga\Module\Monitoring\Forms\Config\Instance\LocalInstanceForm;
 use Icinga\Module\Monitoring\Forms\Config\Instance\RemoteInstanceForm;
-use Icinga\Web\Notification;
 
 /**
- * Form for modifying/creating monitoring instances
+ * Form for managing monitoring instances
  */
 class InstanceConfigForm extends ConfigForm
 {
     /**
-     * (non-PHPDoc)
-     * @see Form::init() For the method documentation.
+     * The instance to load when displaying the form for the first time
+     *
+     * @var string
+     */
+    protected $instanceToLoad;
+
+    /**
+     * Initialize this form
      */
     public function init()
     {
@@ -28,11 +34,11 @@ class InstanceConfigForm extends ConfigForm
     }
 
     /**
-     * Get a form object for the given instance type
+     * Return a form object for the given instance type
      *
-     * @param   string $type                The instance type for which to return a form
+     * @param   string  $type               The instance type for which to return a form
      *
-     * @return  LocalInstanceForm|RemoteInstanceForm
+     * @return  Form
      *
      * @throws  InvalidArgumentException    In case the given instance type is invalid
      */
@@ -40,162 +46,157 @@ class InstanceConfigForm extends ConfigForm
     {
         switch (strtolower($type)) {
             case LocalCommandFile::TRANSPORT:
-                $form = new LocalInstanceForm();
-                break;
+                return new LocalInstanceForm();
             case RemoteCommandFile::TRANSPORT;
-                $form = new RemoteInstanceForm();
-                break;
+                return new RemoteInstanceForm();
             default:
                 throw new InvalidArgumentException(
-                    sprintf($this->translate('Invalid instance type "%s" given'), $type)
+                    sprintf($this->translate('Invalid monitoring instance type "%s" given'), $type)
                 );
         }
-        return $form;
+    }
+
+    /**
+     * Populate the form with the given instance's config
+     *
+     * @param   string  $name
+     *
+     * @return  $this
+     *
+     * @throws  NotFoundError   In case no instance with the given name is found
+     */
+    public function load($name)
+    {
+        if (! $this->config->hasSection($name)) {
+            throw new NotFoundError('No monitoring instance called "%s" found', $name);
+        }
+
+        $this->instanceToLoad = $name;
+        return $this;
     }
 
     /**
      * Add a new instance
      *
-     * The resource to add is identified by the array-key `name'.
+     * The instance to add is identified by the array-key `name'.
      *
-     * @param   array   $values             The values to extend the configuration with
+     * @param   array   $data
      *
      * @return  $this
      *
-     * @throws  InvalidArgumentException    In case the resource already exists
+     * @throws  InvalidArgumentException    In case $data does not contain a instance name
+     * @throws  IcingaException             In case a instance with the same name already exists
      */
-    public function add(array $values)
+    public function add(array $data)
     {
-        $name = isset($values['name']) ? $values['name'] : '';
-        if (! $name) {
-            throw new InvalidArgumentException($this->translate('Instance name missing'));
-        }
-        if ($this->config->hasSection($name)) {
-            throw new InvalidArgumentException($this->translate('Instance already exists'));
+        if (! isset($data['name'])) {
+            throw new InvalidArgumentException('Key \'name\' missing');
         }
 
-        unset($values['name']);
-        $this->config->setSection($name, $values);
+        $instanceName = $data['name'];
+        if ($this->config->hasSection($instanceName)) {
+            throw new IcingaException('A monitoring instance with the name "%s" does already exist', $instanceName);
+        }
+
+        unset($data['name']);
+        $this->config->setSection($instanceName, $data);
         return $this;
     }
 
     /**
      * Edit an existing instance
      *
-     * @param   string      $name           The name of the resource to edit
-     * @param   array       $values         The values to edit the configuration with
+     * @param   string  $name
+     * @param   array   $data
      *
-     * @return  array                       The edited resource configuration
+     * @return  $this
      *
-     * @throws  InvalidArgumentException    In case the resource name is missing or invalid
+     * @throws  NotFoundError   In case no instance with the given name is found
      */
-    public function edit($name, array $values)
+    public function edit($name, array $data)
     {
-        if (! $name) {
-            throw new InvalidArgumentException($this->translate('Old instance name missing'));
-        } elseif (! ($newName = isset($values['name']) ? $values['name'] : '')) {
-            throw new InvalidArgumentException($this->translate('New instance name missing'));
-        } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException($this->translate('Unknown instance name provided'));
+        if (! $this->config->hasSection($name)) {
+            throw new NotFoundError('No monitoring instance called "%s" found', $name);
         }
 
-        unset($values['name']);
-        $this->config->setSection($name, $values);
-        return $this->config->getSection($name);
+        $instanceConfig = $this->config->getSection($name);
+        if (isset($data['name'])) {
+            if ($data['name'] !== $name) {
+                $this->config->removeSection($name);
+                $name = $data['name'];
+            }
+
+            unset($data['name']);
+        }
+
+        $instanceConfig->merge($data);
+        foreach ($instanceConfig->toArray() as $k => $v) {
+            if ($v === null) {
+                unset($instanceConfig->$k);
+            }
+        }
+
+        $this->config->setSection($name, $instanceConfig);
+        return $this;
     }
 
     /**
      * Remove a instance
      *
-     * @param   string      $name           The name of the resource to remove
+     * @param   string  $name
      *
-     * @return  array                       The removed resource configuration
-     *
-     * @throws  InvalidArgumentException    In case the resource name is missing or invalid
+     * @return  $this
      */
-    public function remove($name)
+    public function delete($name)
     {
-        if (! $name) {
-            throw new InvalidArgumentException($this->translate('Instance name missing'));
-        } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException($this->translate('Unknown instance name provided'));
-        }
-
-        $instanceConfig = $this->config->getSection($name);
         $this->config->removeSection($name);
-        return $instanceConfig;
+        return $this;
     }
 
     /**
-     * @see     Form::onRequest()   For the method documentation.
-     * @throws  ConfigurationError  In case the instance name is missing or invalid
+     * Create and add elements to this form
+     *
+     * @param   array   $formData
      */
-    public function onRequest()
+    public function createElements(array $formData)
     {
-        $instanceName = $this->request->getQuery('instance');
-        if ($instanceName !== null) {
-            if (! $instanceName) {
-                throw new ConfigurationError($this->translate('Instance name missing'));
-            }
-            if (! $this->config->hasSection($instanceName)) {
-                throw new ConfigurationError($this->translate('Unknown instance name given'));
-            }
+        $this->addElement(
+            'text',
+            'name',
+            array(
+                'required'      => true,
+                'label'         => $this->translate('Instance Name'),
+                'description'   => $this->translate(
+                    'The name of this monitoring instance that is used to differentiate it from others'
+                ),
+                'validators'    => array(
+                    array(
+                        'Regex',
+                        false,
+                        array(
+                            'pattern'  => '/^[^\\[\\]:]+$/',
+                            'messages' => array(
+                                'regexNotMatch' => $this->translate(
+                                    'The name cannot contain \'[\', \']\' or \':\'.'
+                                )
+                            )
+                        )
+                    )
+                )
+            )
+        );
 
-            $instanceConfig = $this->config->getSection($instanceName)->toArray();
-            $instanceConfig['name'] = $instanceName;
+        $instanceTypes = array(
+            LocalCommandFile::TRANSPORT     => $this->translate('Local Command File'),
+            RemoteCommandFile::TRANSPORT    => $this->translate('Remote Command File')
+        );
 
-            if (isset($instanceConfig['resource'])) {
-                $instanceConfig['use_resource'] = true;
-            }
-
-            $this->populate($instanceConfig);
+        $instanceType = isset($formData['transport']) ? $formData['transport'] : null;
+        if ($instanceType === null) {
+            $instanceType = key($instanceTypes);
         }
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see Form::onSuccess() For the method documentation.
-     */
-    public function onSuccess()
-    {
-        $instanceName = $this->request->getQuery('instance');
-        try {
-            if ($instanceName === null) { // create new instance
-                $this->add($this->getValues());
-                $message = $this->translate('Instance "%s" created successfully.');
-            } else { // edit existing instance
-                $this->edit($instanceName, $this->getValues());
-                $message = $this->translate('Instance "%s" edited successfully.');
-            }
-        } catch (InvalidArgumentException $e) {
-            Notification::error($e->getMessage());
-            return;
-        }
-
-        if ($this->save()) {
-            Notification::success(sprintf($message, $this->getElement('name')->getValue()));
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * (non-PHPDoc)
-     * @see Form::createElements() For the method documentation.
-     */
-    public function createElements(array $formData = array())
-    {
-        $instanceType = isset($formData['transport']) ? $formData['transport'] : LocalCommandFile::TRANSPORT;
 
         $this->addElements(array(
-            array(
-                'text',
-                'name',
-                array(
-                    'required'  => true,
-                    'label'     => $this->translate('Instance Name')
-                )
-            ),
             array(
                 'select',
                 'transport',
@@ -203,15 +204,39 @@ class InstanceConfigForm extends ConfigForm
                     'required'      => true,
                     'autosubmit'    => true,
                     'label'         => $this->translate('Instance Type'),
-                    'multiOptions'  => array(
-                        LocalCommandFile::TRANSPORT     => $this->translate('Local Command File'),
-                        RemoteCommandFile::TRANSPORT    => $this->translate('Remote Command File')
-                    ),
-                    'value' => $instanceType
+                    'description'   => $this->translate('The type of transport to use for this monitoring instance'),
+                    'multiOptions'  => $instanceTypes
                 )
             )
         ));
 
-        $this->addElements($this->getInstanceForm($instanceType)->createElements($formData)->getElements());
+        $this->addSubForm($this->getInstanceForm($instanceType)->create($formData), 'instance_form');
+    }
+
+    /**
+     * Populate the configuration of the instance to load
+     */
+    public function onRequest()
+    {
+        if ($this->instanceToLoad) {
+            $data = $this->config->getSection($this->instanceToLoad)->toArray();
+            $data['name'] = $this->instanceToLoad;
+            $this->populate($data);
+        }
+    }
+
+    /**
+     * Retrieve all form element values
+     *
+     * @param   bool    $suppressArrayNotation  Ignored
+     *
+     * @return  array
+     */
+    public function getValues($suppressArrayNotation = false)
+    {
+        $values = parent::getValues();
+        $values = array_merge($values, $values['instance_form']);
+        unset($values['instance_form']);
+        return $values;
     }
 }
diff --git a/modules/monitoring/application/forms/Setup/InstancePage.php b/modules/monitoring/application/forms/Setup/InstancePage.php
index 25525ffaf..4dd6a5a09 100644
--- a/modules/monitoring/application/forms/Setup/InstancePage.php
+++ b/modules/monitoring/application/forms/Setup/InstancePage.php
@@ -19,10 +19,6 @@ class InstancePage extends Form
 
     public function createElements(array $formData)
     {
-        if (isset($formData['host'])) {
-            $formData['type'] = 'remote'; // This is necessary as the type element gets ignored by Form::getValues()
-        }
-
         $instanceConfigForm = new InstanceConfigForm();
         $instanceConfigForm->createElements($formData);
         $this->addElements($instanceConfigForm->getElements());
diff --git a/modules/monitoring/application/views/scripts/config/createinstance.phtml b/modules/monitoring/application/views/scripts/config/createinstance.phtml
deleted file mode 100644
index d2c7b6bdd..000000000
--- a/modules/monitoring/application/views/scripts/config/createinstance.phtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="controls">
-    <?= $tabs->showOnlyCloseButton() ?>
-</div>
-<div class="content">
-    <?= $form; ?>
-</div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/config/editinstance.phtml b/modules/monitoring/application/views/scripts/config/editinstance.phtml
deleted file mode 100644
index d2c7b6bdd..000000000
--- a/modules/monitoring/application/views/scripts/config/editinstance.phtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="controls">
-    <?= $tabs->showOnlyCloseButton() ?>
-</div>
-<div class="content">
-    <?= $form; ?>
-</div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/config/removeinstance.phtml b/modules/monitoring/application/views/scripts/config/removeinstance.phtml
deleted file mode 100644
index d2c7b6bdd..000000000
--- a/modules/monitoring/application/views/scripts/config/removeinstance.phtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="controls">
-    <?= $tabs->showOnlyCloseButton() ?>
-</div>
-<div class="content">
-    <?= $form; ?>
-</div>
\ No newline at end of file

From db20f2d05a6db699b5425efbbc3308d6950791e4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 29 Jun 2015 14:00:34 +0200
Subject: [PATCH 2421/2920] BackendConfigForm: Adjust how to process requests

refs #9516
---
 .../controllers/ConfigController.php          | 121 ++++++---
 .../forms/Config/BackendConfigForm.php        | 229 ++++++++++--------
 .../views/scripts/config/editbackend.phtml    |   6 -
 .../{createbackend.phtml => form.phtml}       |   4 +-
 .../views/scripts/config/removebackend.phtml  |   6 -
 .../views/scripts/config/security.phtml       |   6 -
 6 files changed, 212 insertions(+), 160 deletions(-)
 delete mode 100644 modules/monitoring/application/views/scripts/config/editbackend.phtml
 rename modules/monitoring/application/views/scripts/config/{createbackend.phtml => form.phtml} (50%)
 delete mode 100644 modules/monitoring/application/views/scripts/config/removebackend.phtml
 delete mode 100644 modules/monitoring/application/views/scripts/config/security.phtml

diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index 5187a5691..2622b9c54 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -1,10 +1,11 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use Icinga\Web\Notification;
 use Icinga\Data\ResourceFactory;
+use Icinga\Exception\ConfigurationError;
 use Icinga\Forms\ConfirmRemovalForm;
 use Icinga\Web\Controller;
+use Icinga\Web\Notification;
 use Icinga\Module\Monitoring\Forms\Config\BackendConfigForm;
 use Icinga\Module\Monitoring\Forms\Config\InstanceConfigForm;
 use Icinga\Module\Monitoring\Forms\Config\SecurityConfigForm;
@@ -25,33 +26,89 @@ class Monitoring_ConfigController extends Controller
     }
 
     /**
-     * Display a form to modify the backend identified by the 'backend' parameter of the request
+     * Edit a monitoring backend
      */
     public function editbackendAction()
     {
+        $backendName = $this->params->getRequired('backend');
+
         $form = new BackendConfigForm();
-        $form->setTitle($this->translate('Edit Existing Backend'));
+        $form->setRedirectUrl('monitoring/config');
+        $form->setTitle(sprintf($this->translate('Edit Monitoring Backend %s'), $backendName));
         $form->setIniConfig($this->Config('backends'));
         $form->setResourceConfig(ResourceFactory::getResourceConfigs());
-        $form->setRedirectUrl('monitoring/config');
-        $form->handleRequest();
+        $form->setOnSuccess(function (BackendConfigForm $form) use ($backendName) {
+            try {
+                $form->edit($backendName, array_map(
+                    function ($v) {
+                        return $v !== '' ? $v : null;
+                    },
+                    $form->getValues()
+                ));
+            } catch (Exception $e) {
+                $form->error($e->getMessage());
+                return false;
+            }
+
+            if ($form->save()) {
+                Notification::success(sprintf(t('Monitoring backend "%s" successfully updated'), $backendName));
+                return true;
+            }
+
+            return false;
+        });
+
+        try {
+            $form->load($backendName);
+            $form->handleRequest();
+        } catch (NotFoundError $_) {
+            $this->httpNotFound(sprintf($this->translate('Monitoring backend "%s" not found'), $backendName));
+        }
 
         $this->view->form = $form;
+        $this->render('form');
     }
 
     /**
-     * Display a form to create a new backend
+     * Create a new monitoring backend
      */
     public function createbackendAction()
     {
         $form = new BackendConfigForm();
-        $form->setTitle($this->translate('Add New Backend'));
-        $form->setIniConfig($this->Config('backends'));
-        $form->setResourceConfig(ResourceFactory::getResourceConfigs());
         $form->setRedirectUrl('monitoring/config');
+        $form->setTitle($this->translate('Create New Monitoring Backend'));
+        $form->setIniConfig($this->Config('backends'));
+
+        try {
+            $form->setResourceConfig(ResourceFactory::getResourceConfigs());
+        } catch (ConfigurationError $e) {
+            if ($this->hasPermission('config/application/resources')) {
+                Notification::error($e->getMessage());
+                $this->redirectNow('config/createresource');
+            }
+
+            throw $e; // No permission for resource configuration, show the error
+        }
+
+        $form->setOnSuccess(function (BackendConfigForm $form) {
+            try {
+                $form->add(array_filter($form->getValues()));
+            } catch (Exception $e) {
+                $form->error($e->getMessage());
+                return false;
+            }
+
+            if ($form->save()) {
+                Notification::success(t('Monitoring backend successfully created'));
+                return true;
+            }
+
+            return false;
+        });
         $form->handleRequest();
 
         $this->view->form = $form;
+        $this->render('form');
     }
 
     /**
@@ -59,35 +116,32 @@ class Monitoring_ConfigController extends Controller
      */
     public function removebackendAction()
     {
-        $config = $this->Config('backends');
-        $form = new ConfirmRemovalForm(array(
-            'onSuccess' => function ($form) use ($config) {
-                $backendName = $form->getRequest()->getQuery('backend');
-                $configForm = new BackendConfigForm();
-                $configForm->setIniConfig($config);
+        $backendName = $this->params->getRequired('backend');
 
-                try {
-                    $configForm->remove($backendName);
-                } catch (InvalidArgumentException $e) {
-                    Notification::error($e->getMessage());
-                    return;
-                }
-
-                if ($configForm->save()) {
-                    Notification::success(sprintf(
-                        $this->translate('Backend "%s" successfully removed.'),
-                        $backendName
-                    ));
-                } else {
-                    return false;
-                }
-            }
-        ));
-        $form->setTitle($this->translate('Remove Existing Backend'));
+        $backendForm = new BackendConfigForm();
+        $backendForm->setIniConfig($this->Config('backends'));
+        $form = new ConfirmRemovalForm();
         $form->setRedirectUrl('monitoring/config');
+        $form->setTitle(sprintf($this->translate('Remove Monitoring Backend %s'), $backendName));
+        $form->setOnSuccess(function (ConfirmRemovalForm $form) use ($backendName, $backendForm) {
+            try {
+                $backendForm->delete($backendName);
+            } catch (Exception $e) {
+                $form->error($e->getMessage());
+                return false;
+            }
+
+            if ($backendForm->save()) {
+                Notification::success(sprintf(t('Monitoring backend "%s" successfully removed'), $backendName));
+                return true;
+            }
+
+            return false;
+        });
         $form->handleRequest();
 
         $this->view->form = $form;
+        $this->render('form');
     }
 
     /**
@@ -211,5 +265,6 @@ class Monitoring_ConfigController extends Controller
 
         $this->view->form = $form;
         $this->view->tabs = $this->Module()->getConfigTabs()->activate('security');
+        $this->render('form');
     }
 }
diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index 1380b416d..3bed29a4f 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -4,17 +4,18 @@
 namespace Icinga\Module\Monitoring\Forms\Config;
 
 use Exception;
-use Icinga\Data\ConfigObject;
-use Icinga\Data\ResourceFactory;
-use Icinga\Web\Form;
 use InvalidArgumentException;
 use Icinga\Application\Config;
+use Icinga\Data\ConfigObject;
+use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;
+use Icinga\Exception\IcingaException;
+use Icinga\Exception\NotFoundError;
 use Icinga\Forms\ConfigForm;
-use Icinga\Web\Notification;
+use Icinga\Web\Form;
 
 /**
- * Form class for creating/modifying monitoring backends
+ * Form for managing monitoring backends
  */
 class BackendConfigForm extends ConfigForm
 {
@@ -25,6 +26,13 @@ class BackendConfigForm extends ConfigForm
      */
     protected $resources;
 
+    /**
+     * The backend to load when displaying the form for the first time
+     *
+     * @var string
+     */
+    protected $backendToLoad;
+
     /**
      * Initialize this form
      */
@@ -47,16 +55,15 @@ class BackendConfigForm extends ConfigForm
     {
         $resources = array();
         foreach ($resourceConfig as $name => $resource) {
-//            if ($resource->type === 'db' || $resource->type === 'livestatus') {
-//                $resources[$resource->type === 'db' ? 'ido' : 'livestatus'][$name] = $name;
-//            }
             if ($resource->type === 'db') {
                 $resources['ido'][$name] = $name;
             }
         }
 
         if (empty($resources)) {
-            throw new ConfigurationError($this->translate('Could not find any valid monitoring backend resources'));
+            throw new ConfigurationError($this->translate(
+                'Could not find any valid monitoring backend resources. Please configure a database resource first.'
+            ));
         }
 
         $this->resources = $resources;
@@ -64,146 +71,109 @@ class BackendConfigForm extends ConfigForm
     }
 
     /**
-     * Add a particular monitoring backend
+     * Populate the form with the given backend's config
      *
-     * The backend to add is identified by the array-key `name'.
-     *
-     * @param   array   $values             The values to extend the configuration with
+     * @param   string  $name
      *
      * @return  $this
      *
-     * @throws  InvalidArgumentException    In case the backend does already exist
+     * @throws  NotFoundError   In case no backend with the given name is found
      */
-    public function add(array $values)
+    public function load($name)
     {
-        $name = isset($values['name']) ? $values['name'] : '';
-        if (! $name) {
-            throw new InvalidArgumentException($this->translate('Monitoring backend name missing'));
-        } elseif ($this->config->hasSection($name)) {
-            throw new InvalidArgumentException($this->translate('Monitoring backend already exists'));
+        if (! $this->config->hasSection($name)) {
+            throw new NotFoundError('No monitoring backend called "%s" found', $name);
         }
 
-        unset($values['name']);
-        $this->config->setSection($name, $values);
+        $this->backendToLoad = $name;
         return $this;
     }
 
     /**
-     * Edit a particular monitoring backend
+     * Add a new monitoring backend
      *
-     * @param   string  $name               The name of the backend to edit
-     * @param   array   $values             The values to edit the configuration with
+     * The backend to add is identified by the array-key `name'.
      *
-     * @return  array                       The edited backend configuration
+     * @param   array   $data
      *
-     * @throws  InvalidArgumentException    In case the backend does not exist
+     * @return  $this
+     *
+     * @throws  InvalidArgumentException    In case $data does not contain a backend name
+     * @throws  IcingaException             In case a backend with the same name already exists
      */
-    public function edit($name, array $values)
+    public function add(array $data)
     {
-        if (! $name) {
-            throw new InvalidArgumentException($this->translate('Old monitoring backend name missing'));
-        } elseif (! ($newName = isset($values['name']) ? $values['name'] : '')) {
-            throw new InvalidArgumentException($this->translate('New monitoring backend name missing'));
-        } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException($this->translate('Unknown monitoring backend provided'));
+        if (! isset($data['name'])) {
+            throw new InvalidArgumentException('Key \'name\' missing');
         }
 
-        unset($values['name']);
-        $this->config->setSection($name, $values);
-        return $this->config->getSection($name);
+        $backendName = $data['name'];
+        if ($this->config->hasSection($backendName)) {
+            throw new IcingaException('A monitoring backend with the name "%s" does already exist', $backendName);
+        }
+
+        unset($data['name']);
+        $this->config->setSection($backendName, $data);
+        return $this;
     }
 
     /**
-     * Remove the given monitoring backend
+     * Edit a monitoring backend
      *
-     * @param   string      $name           The name of the backend to remove
+     * @param   string  $name
+     * @param   array   $data
      *
-     * @return  array                       The removed backend configuration
+     * @return  $this
      *
-     * @throws  InvalidArgumentException    In case the backend does not exist
+     * @throws  NotFoundError   In case no backend with the given name is found
      */
-    public function remove($name)
+    public function edit($name, array $data)
     {
-        if (! $name) {
-            throw new InvalidArgumentException($this->translate('Monitoring backend name missing'));
-        } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException($this->translate('Unknown monitoring backend provided'));
+        if (! $this->config->hasSection($name)) {
+            throw new NotFoundError('No monitoring backend called "%s" found', $name);
         }
 
         $backendConfig = $this->config->getSection($name);
-        $this->config->removeSection($name);
-        return $backendConfig;
-    }
-
-    /**
-     * Add or edit a monitoring backend and save the configuration
-     */
-    public function onSuccess()
-    {
-        $monitoringBackend = $this->request->getQuery('backend');
-        try {
-            if ($monitoringBackend === null) { // Create new backend
-                $this->add($this->getValues());
-                $message = $this->translate('Monitoring backend "%s" has been successfully created');
-            } else { // Edit existing backend
-                $this->edit($monitoringBackend, $this->getValues());
-                $message = $this->translate('Monitoring backend "%s" has been successfully changed');
+        if (isset($data['name'])) {
+            if ($data['name'] !== $name) {
+                $this->config->removeSection($name);
+                $name = $data['name'];
             }
-        } catch (InvalidArgumentException $e) {
-            Notification::error($e->getMessage());
-            return null;
+
+            unset($data['name']);
         }
 
-        if ($this->save()) {
-            Notification::success(sprintf($message, $this->getElement('name')->getValue()));
-        } else {
-            return false;
+        $backendConfig->merge($data);
+        foreach ($backendConfig->toArray() as $k => $v) {
+            if ($v === null) {
+                unset($backendConfig->$k);
+            }
         }
+
+        $this->config->setSection($name, $backendConfig);
+        return $this;
     }
 
     /**
-     * Populate the form in case a monitoring backend is being edited
+     * Remove a monitoring backend
      *
-     * @throws  ConfigurationError  In case the backend name is missing in the request or is invalid
+     * @param   string  $name
+     *
+     * @return  $this
      */
-    public function onRequest()
+    public function delete($name)
     {
-        $monitoringBackend = $this->request->getQuery('backend');
-        if ($monitoringBackend !== null) {
-            if ($monitoringBackend === '') {
-                throw new ConfigurationError($this->translate('Monitoring backend name missing'));
-            } elseif (! $this->config->hasSection($monitoringBackend)) {
-                throw new ConfigurationError($this->translate('Unknown monitoring backend provided'));
-            }
-
-            $backendConfig = $this->config->getSection($monitoringBackend)->toArray();
-            $backendConfig['name'] = $monitoringBackend;
-            $this->populate($backendConfig);
-        }
+        $this->config->removeSection($name);
+        return $this;
     }
 
     /**
-     * (non-PHPDoc)
-     * @see Form::createElements() For the method documentation.
+     * Create and add elements to this form
+     *
+     * @param   array   $formData
      */
     public function createElements(array $formData)
     {
-        $resourceType = isset($formData['type']) ? $formData['type'] : key($this->resources);
-
-        if ($resourceType === 'livestatus') {
-            throw new ConfigurationError(
-                'We\'ve disabled livestatus support for now because it\'s not feature complete yet'
-            );
-        }
-
-        $resourceTypes = array();
-        if ($resourceType === 'ido' || array_key_exists('ido', $this->resources)) {
-            $resourceTypes['ido'] = 'IDO Backend';
-        }
-//        if ($resourceType === 'livestatus' || array_key_exists('livestatus', $this->resources)) {
-//            $resourceTypes['livestatus'] = 'Livestatus';
-//        }
-
         $this->addElement(
             'checkbox',
             'disabled',
@@ -218,9 +188,41 @@ class BackendConfigForm extends ConfigForm
             array(
                 'required'      => true,
                 'label'         => $this->translate('Backend Name'),
-                'description'   => $this->translate('The identifier of this backend')
+                'description'   => $this->translate(
+                    'The name of this monitoring backend that is used to differentiate it from others'
+                ),
+                'validators'    => array(
+                    array(
+                        'Regex',
+                        false,
+                        array(
+                            'pattern'  => '/^[^\\[\\]:]+$/',
+                            'messages' => array(
+                                'regexNotMatch' => $this->translate(
+                                    'The name cannot contain \'[\', \']\' or \':\'.'
+                                )
+                            )
+                        )
+                    )
+                )
             )
         );
+
+        $resourceType = isset($formData['type']) ? $formData['type'] : null;
+
+        $resourceTypes = array();
+        if ($resourceType === 'ido' || array_key_exists('ido', $this->resources)) {
+            $resourceTypes['ido'] = 'IDO Backend';
+        }
+
+        if ($resourceType === null) {
+            $resourceType = key($resourceTypes);
+        } elseif ($resourceType === 'livestatus') {
+            throw new ConfigurationError(
+                'We\'ve disabled livestatus support for now because it\'s not feature complete yet'
+            );
+        }
+
         $this->addElement(
             'select',
             'type',
@@ -228,9 +230,10 @@ class BackendConfigForm extends ConfigForm
                 'required'      => true,
                 'autosubmit'    => true,
                 'label'         => $this->translate('Backend Type'),
-                'description'   => $this->translate('The data source used for retrieving monitoring information'),
-                'multiOptions'  => $resourceTypes,
-                'value'         => $resourceType
+                'description'   => $this->translate(
+                    'The type of data source used for retrieving monitoring information'
+                ),
+                'multiOptions'  => $resourceTypes
             )
         );
 
@@ -276,6 +279,18 @@ class BackendConfigForm extends ConfigForm
         );
     }
 
+    /**
+     * Populate the configuration of the backend to load
+     */
+    public function onRequest()
+    {
+        if ($this->backendToLoad) {
+            $data = $this->config->getSection($this->backendToLoad)->toArray();
+            $data['name'] = $this->backendToLoad;
+            $this->populate($data);
+        }
+    }
+
     /**
      * Validate the ido instance schema resource
      *
diff --git a/modules/monitoring/application/views/scripts/config/editbackend.phtml b/modules/monitoring/application/views/scripts/config/editbackend.phtml
deleted file mode 100644
index d2c7b6bdd..000000000
--- a/modules/monitoring/application/views/scripts/config/editbackend.phtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="controls">
-    <?= $tabs->showOnlyCloseButton() ?>
-</div>
-<div class="content">
-    <?= $form; ?>
-</div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/config/createbackend.phtml b/modules/monitoring/application/views/scripts/config/form.phtml
similarity index 50%
rename from modules/monitoring/application/views/scripts/config/createbackend.phtml
rename to modules/monitoring/application/views/scripts/config/form.phtml
index d2c7b6bdd..cbf06590d 100644
--- a/modules/monitoring/application/views/scripts/config/createbackend.phtml
+++ b/modules/monitoring/application/views/scripts/config/form.phtml
@@ -1,6 +1,6 @@
 <div class="controls">
-    <?= $tabs->showOnlyCloseButton() ?>
+  <?= $tabs->showOnlyCloseButton(); ?>
 </div>
 <div class="content">
-    <?= $form; ?>
+  <?= $form; ?>
 </div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/config/removebackend.phtml b/modules/monitoring/application/views/scripts/config/removebackend.phtml
deleted file mode 100644
index d2c7b6bdd..000000000
--- a/modules/monitoring/application/views/scripts/config/removebackend.phtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="controls">
-    <?= $tabs->showOnlyCloseButton() ?>
-</div>
-<div class="content">
-    <?= $form; ?>
-</div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/config/security.phtml b/modules/monitoring/application/views/scripts/config/security.phtml
deleted file mode 100644
index 71f2a341a..000000000
--- a/modules/monitoring/application/views/scripts/config/security.phtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="controls">
-    <?= $this->tabs ?>
-</div>
-<div class="content">
-    <?= $this->form ?>
-</div>

From a1b336f26b80aca28c4340a788066efe552e14ec Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 29 Jun 2015 15:03:46 +0200
Subject: [PATCH 2422/2920] IdoResourcePage: Some documentation and style fixes

---
 .../forms/Setup/IdoResourcePage.php           | 54 ++++++++++++-------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/modules/monitoring/application/forms/Setup/IdoResourcePage.php b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
index 3f6bb1564..7470e730a 100644
--- a/modules/monitoring/application/forms/Setup/IdoResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
@@ -4,12 +4,15 @@
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
 use Icinga\Data\ConfigObject;
-use Icinga\Module\Monitoring\Forms\Config\BackendConfigForm;
-use Icinga\Web\Form;
 use Icinga\Forms\Config\Resource\DbResourceForm;
+use Icinga\Web\Form;
+use Icinga\Module\Monitoring\Forms\Config\BackendConfigForm;
 
 class IdoResourcePage extends Form
 {
+    /**
+     * Initialize this form
+     */
     public function init()
     {
         $this->setName('setup_monitoring_ido');
@@ -19,6 +22,11 @@ class IdoResourcePage extends Form
         ));
     }
 
+    /**
+     * Create and add elements to this form
+     *
+     * @param   array   $formData
+     */
     public function createElements(array $formData)
     {
         $this->addElement(
@@ -31,6 +39,7 @@ class IdoResourcePage extends Form
         );
 
         if (isset($formData['skip_validation']) && $formData['skip_validation']) {
+            // In case another error occured and the checkbox was displayed before
             $this->addSkipValidationCheckbox();
         } else {
             $this->addElement(
@@ -43,32 +52,37 @@ class IdoResourcePage extends Form
             );
         }
 
-        $livestatusResourceForm = new DbResourceForm();
-        $this->addElements($livestatusResourceForm->createElements($formData)->getElements());
+        $dbResourceForm = new DbResourceForm();
+        $this->addElements($dbResourceForm->createElements($formData)->getElements());
         $this->getElement('name')->setValue('icinga_ido');
     }
 
-    public function isValid($data)
+    /**
+     * Return whether the given values are valid
+     *
+     * @param   array   $formData   The data to validate
+     *
+     * @return  bool
+     */
+    public function isValid($formData)
     {
-        if (false === parent::isValid($data)) {
+        if (! parent::isValid($formData)) {
             return false;
         }
 
-        if (false === isset($data['skip_validation']) || $data['skip_validation'] == 0) {
+        if (! isset($formData['skip_validation']) || !$formData['skip_validation']) {
             $configObject = new ConfigObject($this->getValues());
-            if (false === DbResourceForm::isValidResource($this, $configObject)) {
+            if (! DbResourceForm::isValidResource($this, $configObject)) {
                 $this->addSkipValidationCheckbox($this->translate(
-                    'Check this to not to validate connectivity with the given database server'
+                    'Check this to not to validate connectivity with the given database server.'
                 ));
                 return false;
-            } elseif (false === BackendConfigForm::isValidIdoSchema($this, $configObject)) {
+            } elseif (
+                ! BackendConfigForm::isValidIdoSchema($this, $configObject)
+                || !BackendConfigForm::isValidIdoInstance($this, $configObject)
+            ) {
                 $this->addSkipValidationCheckbox($this->translate(
-                    'Check this to not to validate the ido schema'
-                ));
-                return false;
-            } elseif (false === BackendConfigForm::isValidIdoInstance($this, $configObject)) {
-                $this->addSkipValidationCheckbox($this->translate(
-                    'Check this to not to validate the ido instance'
+                    'Check this to not to validate the IDO schema in the given database.'
                 ));
                 return false;
             }
@@ -78,13 +92,15 @@ class IdoResourcePage extends Form
     }
 
     /**
-     * Add a checkbox to the form by which the user can skip the connection validation
+     * Add a checkbox to the form by which the user can skip the resource validation
+     *
+     * @param   string  $description
      */
-    protected function addSkipValidationCheckbox($description = '')
+    protected function addSkipValidationCheckbox($description = null)
     {
         if (empty($description)) {
             $description = $this->translate(
-                'Proceed without any further (custom) validation'
+                'Proceed without any further (custom) validation.'
             );
         }
 

From a2b7b10df858d529f5032971f274064c66404360 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 29 Jun 2015 15:51:39 +0200
Subject: [PATCH 2423/2920] BackendConfigForm: Validate IDO resources

fixes #9519
---
 .../forms/Config/BackendConfigForm.php        | 116 ++++++++++++------
 1 file changed, 80 insertions(+), 36 deletions(-)

diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index 3bed29a4f..e6d2f2440 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -277,6 +277,11 @@ class BackendConfigForm extends ConfigForm
                 )
             )
         );
+
+        if (isset($formData['skip_validation']) && $formData['skip_validation']) {
+            // In case another error occured and the checkbox was displayed before
+            $this->addSkipValidationCheckbox();
+        }
     }
 
     /**
@@ -292,61 +297,100 @@ class BackendConfigForm extends ConfigForm
     }
 
     /**
-     * Validate the ido instance schema resource
+     * Return whether the given values are valid
      *
-     * @param   Form            $form
-     * @param   ConfigObject    $resourceConfig
+     * @param   array   $formData   The data to validate
      *
-     * @return  bool                                Whether validation succeeded or not
+     * @return  bool
      */
-    public static function isValidIdoSchema(Form $form, ConfigObject $resourceConfig)
+    public function isValid($formData)
     {
-        try {
-            $resource = ResourceFactory::createResource($resourceConfig);
-            $result = $resource->select()->from('icinga_dbversion', array('version'));
-            $result->fetchOne();
-        } catch (Exception $e) {
-            $form->addError(
-                $form->translate(
-                    'IDO schema validation failed, it looks like that the IDO schema is missing in the given database.'
-                )
-            );
+        if (! parent::isValid($formData)) {
             return false;
         }
+
+        $resourceConfig = ResourceFactory::getResourceConfig($this->getValue('resource'));
+        if (! self::isValidIdoSchema($this, $resourceConfig) || !self::isValidIdoInstance($this, $resourceConfig)) {
+            $this->addSkipValidationCheckbox();
+            return false;
+        }
+
         return true;
     }
 
     /**
-     * Validate the ido instance availability
+     * Add a checkbox to the form by which the user can skip the schema validation
+     */
+    protected function addSkipValidationCheckbox()
+    {
+        $this->addElement(
+            'checkbox',
+            'skip_validation',
+            array(
+                'order'         => 0,
+                'ignore'        => true,
+                'required'      => true,
+                'label'         => $this->translate('Skip Validation'),
+                'description'   => $this->translate(
+                    'Check this to not to validate the IDO schema of the chosen resource.'
+                )
+            )
+        );
+    }
+
+    /**
+     * Return whether the given resource contains a valid IDO schema
      *
      * @param   Form            $form
      * @param   ConfigObject    $resourceConfig
      *
-     * @return  bool                                Whether validation succeeded or not
+     * @return  bool
      */
-    public static function isValidIdoInstance(Form $form, ConfigObject $resourceConfig)
+    public static function isValidIdoSchema(Form $form, ConfigObject $resourceConfig)
     {
-        $resource = ResourceFactory::createResource($resourceConfig);
-        $result = $resource->select()->from('icinga_instances', array('instance_name'));
-        $instances = $result->fetchAll();
-
-        if (count($instances) === 1) {
-            return true;
-        } elseif (count($instances) > 1) {
-            $form->warning(
-                $form->translate(
-                    'IDO instance validation failed, because there are multiple instances available.'
-                )
-            );
+        try {
+            $db = ResourceFactory::createResource($resourceConfig);
+            $db->select()->from('icinga_dbversion', array('version'))->fetchOne();
+        } catch (Exception $_) {
+            $form->error($form->translate(
+                'Cannot find the IDO schema. Please verify that the given database '
+                . 'contains the schema and that the configured user has access to it.'
+            ));
             return false;
         }
 
-        $form->error(
-            $form->translate(
-                'IDO instance validation failed, because there is no IDO instance available.'
-            )
-        );
+        return true;
+    }
 
-        return false;
+    /**
+     * Return whether a single icinga instance is writing to the given resource
+     *
+     * @param   Form            $form
+     * @param   ConfigObject    $resourceConfig
+     *
+     * @return  bool                                True if it's a single instance, false if none
+     *                                              or multiple instances are writing to it
+     */
+    public static function isValidIdoInstance(Form $form, ConfigObject $resourceConfig)
+    {
+        $db = ResourceFactory::createResource($resourceConfig);
+        $rowCount = $db->select()->from('icinga_instances')->count();
+
+        if ($rowCount === 0) {
+            $form->error($form->translate(
+                'There is currently no icinga instance writing to the IDO. Make sure '
+                . 'that a icinga instance is configured and able to write to the IDO.'
+            ));
+            return false;
+        } elseif ($rowCount > 1) {
+            $form->warning($form->translate(
+                'There is currently more than one icinga instance writing to the IDO. You\'ll see all objects from all'
+                . ' instances without any differentation. If this is not desired, consider setting up a separate IDO'
+                . ' for each instance.'
+            ));
+            return false;
+        }
+
+        return true;
     }
 }

From 9c82a240830219ca2b74e8cc2d92a8f82b771215 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 29 Jun 2015 16:19:33 +0200
Subject: [PATCH 2424/2920] ServicestatussummaryQuery: Do not check a host's
 state twice

I was sure that this is necessary and that the query involved does
not handle this by itself, which it obviously does. I cannot find
another query I might have mistakenly associated with it though...
---
 .../Ido/Query/ServicestatussummaryQuery.php   | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php
index 3215ca086..325203717 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatussummaryQuery.php
@@ -17,25 +17,25 @@ class ServicestatussummaryQuery extends IdoQuery
     protected $columnMap = array(
         'servicestatussummary' => array(
             'services_critical'                             => 'SUM(CASE WHEN state = 2 THEN 1 ELSE 0 END)',
-            'services_critical_handled'                     => 'SUM(CASE WHEN state = 2 AND handled + host_problem > 0 THEN 1 ELSE 0 END)',
-//            'services_critical_handled_last_state_change'   => 'MAX(CASE WHEN state = 2 AND handled + host_problem > 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
-            'services_critical_unhandled'                   => 'SUM(CASE WHEN state = 2 AND handled + host_problem = 0 THEN 1 ELSE 0 END)',
-//            'services_critical_unhandled_last_state_change' => 'MAX(CASE WHEN state = 2 AND handled + host_problem = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
+            'services_critical_handled'                     => 'SUM(CASE WHEN state = 2 AND handled = 1 THEN 1 ELSE 0 END)',
+//            'services_critical_handled_last_state_change'   => 'MAX(CASE WHEN state = 2 AND handled = 1 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
+            'services_critical_unhandled'                   => 'SUM(CASE WHEN state = 2 AND handled = 0 THEN 1 ELSE 0 END)',
+//            'services_critical_unhandled_last_state_change' => 'MAX(CASE WHEN state = 2 AND handled = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
             'services_ok'                                   => 'SUM(CASE WHEN state = 0 THEN 1 ELSE 0 END)',
 //            'services_ok_last_state_change'                 => 'MAX(CASE WHEN state = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
             'services_pending'                              => 'SUM(CASE WHEN state = 99 THEN 1 ELSE 0 END)',
 //            'services_pending_last_state_change'            => 'MAX(CASE WHEN state = 99 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
             'services_total'                                => 'SUM(1)',
             'services_unknown'                              => 'SUM(CASE WHEN state = 3 THEN 1 ELSE 0 END)',
-            'services_unknown_handled'                      => 'SUM(CASE WHEN state = 3 AND handled + host_problem > 0 THEN 1 ELSE 0 END)',
-//            'services_unknown_handled_last_state_change'    => 'MAX(CASE WHEN state = 3 AND handled + host_problem > 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
-            'services_unknown_unhandled'                    => 'SUM(CASE WHEN state = 3 AND handled + host_problem = 0 THEN 1 ELSE 0 END)',
-//            'services_unknown_unhandled_last_state_change'  => 'MAX(CASE WHEN state = 3 AND handled + host_problem = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
+            'services_unknown_handled'                      => 'SUM(CASE WHEN state = 3 AND handled = 1 THEN 1 ELSE 0 END)',
+//            'services_unknown_handled_last_state_change'    => 'MAX(CASE WHEN state = 3 AND handled = 1 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
+            'services_unknown_unhandled'                    => 'SUM(CASE WHEN state = 3 AND handled = 0 THEN 1 ELSE 0 END)',
+//            'services_unknown_unhandled_last_state_change'  => 'MAX(CASE WHEN state = 3 AND handled = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
             'services_warning'                              => 'SUM(CASE WHEN state = 1 THEN 1 ELSE 0 END)',
-            'services_warning_handled'                      => 'SUM(CASE WHEN state = 1 AND handled + host_problem > 0 THEN 1 ELSE 0 END)',
-//            'services_warning_handled_last_state_change'    => 'MAX(CASE WHEN state = 1 AND handled + host_problem > 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
-            'services_warning_unhandled'                    => 'SUM(CASE WHEN state = 1 AND handled + host_problem = 0 THEN 1 ELSE 0 END)',
-//            'services_warning_unhandled_last_state_change'  => 'MAX(CASE WHEN state = 1 AND handled + host_problem = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)'
+            'services_warning_handled'                      => 'SUM(CASE WHEN state = 1 AND handled = 1 THEN 1 ELSE 0 END)',
+//            'services_warning_handled_last_state_change'    => 'MAX(CASE WHEN state = 1 AND handled = 1 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)',
+            'services_warning_unhandled'                    => 'SUM(CASE WHEN state = 1 AND handled = 0 THEN 1 ELSE 0 END)',
+//            'services_warning_unhandled_last_state_change'  => 'MAX(CASE WHEN state = 1 AND handled = 0 THEN UNIX_TIMESTAMP(last_state_change) ELSE NULL END)'
         )
     );
 
@@ -66,8 +66,7 @@ class ServicestatussummaryQuery extends IdoQuery
             array(
                 'handled'       => 'service_handled',
                 'state'         => 'service_state',
-                'state_change'  => 'service_last_state_change',
-                'host_problem'
+                'state_change'  => 'service_last_state_change'
             )
         );
         $this->select->from(

From e795665421334e087c57e267d4e3b47f9ce4a374 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 29 Jun 2015 17:08:31 +0200
Subject: [PATCH 2425/2920] Wizard: Issue a partial validation only if desired
 for a certain page

fixes #9306
---
 library/Icinga/Web/Wizard.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Wizard.php b/library/Icinga/Web/Wizard.php
index bede00313..1af211017 100644
--- a/library/Icinga/Web/Wizard.php
+++ b/library/Icinga/Web/Wizard.php
@@ -287,8 +287,10 @@ class Wizard
                     $this->setCurrentPage($this->getNewPage($requestedPage, $page));
                     $page->getResponse()->redirectAndExit($page->getRedirectUrl());
                 }
-            } else {
+            } elseif ($page->getValidatePartial()) {
                 $page->isValidPartial($requestData);
+            } else {
+                $page->populate($requestData);
             }
         } elseif (($pageData = $this->getPageData($page->getName())) !== null) {
             $page->populate($pageData);

From aec59d9941c5f216f03edbcfbc1fd33e97c635b0 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 29 Jun 2015 18:45:14 +0200
Subject: [PATCH 2426/2920] Use current filter to highlight active rows instead
 of storing active rows in JS

Clean up selection code and move it into separate behavior and parse filter query to fetch selectable rows.

refs #9054
refs #9346
---
 library/Icinga/Web/JavaScript.php             |   3 +-
 .../views/scripts/list/comments.phtml         |  13 +-
 .../views/scripts/list/downtimes.phtml        |  13 +-
 .../views/scripts/list/hosts.phtml            |   3 +-
 public/js/icinga/behavior/selection.js        | 341 ++++++++++++++++++
 public/js/icinga/events.js                    |  62 ----
 public/js/icinga/ui.js                        | 133 -------
 public/js/icinga/utils.js                     |   8 +
 8 files changed, 369 insertions(+), 207 deletions(-)
 create mode 100644 public/js/icinga/behavior/selection.js

diff --git a/library/Icinga/Web/JavaScript.php b/library/Icinga/Web/JavaScript.php
index 6a378559f..8a0edf565 100644
--- a/library/Icinga/Web/JavaScript.php
+++ b/library/Icinga/Web/JavaScript.php
@@ -26,7 +26,8 @@ class JavaScript
         'js/icinga/behavior/sparkline.js',
         'js/icinga/behavior/tristate.js',
         'js/icinga/behavior/navigation.js',
-        'js/icinga/behavior/form.js'
+        'js/icinga/behavior/form.js',
+        'js/icinga/behavior/selection.js'
     );
 
     protected static $vendorFiles = array(
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 43b94be66..7c3863d17 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -43,11 +43,14 @@ if (count($comments) === 0) {
             ),
             'monitoring/comment/show',
             array('comment_id' => $comment->id),
-            array('title' => sprintf(
-                $this->translate('Show detailed information for comment on %s for %s'),
-                $comment->service_display_name,
-                $comment->host_display_name
-          ))) ?>
+            array(
+                'title' => sprintf(
+                    $this->translate('Show detailed information for comment on %s for %s'),
+                    $comment->service_display_name,
+                    $comment->host_display_name
+                ),
+                'class' => 'rowaction'
+            )) ?>
         <?php else: ?>
           <?= $this->icon('host', $this->translate('Host')); ?>
 
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index e0836aa26..0c587a03f 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -57,11 +57,14 @@ if (count($downtimes) === 0) {
             sprintf('%s: %s', $downtime->host_display_name, $downtime->service_display_name),
                 'monitoring/downtime/show',
                 array('downtime_id' => $downtime->id),
-                array('title' => sprintf(
-                $this->translate('Show detailed information for downtime on %s for %s'),
-                $downtime->service_display_name,
-                $downtime->host_display_name
-        ))) ?>
+                array(
+                    'title' => sprintf(
+                        $this->translate('Show detailed information for downtime on %s for %s'),
+                        $downtime->service_display_name,
+                        $downtime->host_display_name
+                    ),
+                    'class' => 'rowaction'
+                )) ?>
           <br>
           <?= $this->icon('comment', $this->translate('Comment')); ?> [<?= $this->escape($downtime->author_name) ?>] <?= $this->escape($downtime->comment) ?>
           <br>
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 15dbb5a6f..0d033eaad 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -60,7 +60,8 @@ if (count($hosts) === 0) {
           $hostLink,
           null,
           array(
-            'title' => sprintf($this->translate('Show detailed information for host %s'), $host->host_display_name)
+            'title' => sprintf($this->translate('Show detailed information for host %s'), $host->host_display_name),
+            'class' => 'rowaction'
           )
         ); ?>
         <?php if (isset($host->host_unhandled_services) && $host->host_unhandled_services > 0): ?>
diff --git a/public/js/icinga/behavior/selection.js b/public/js/icinga/behavior/selection.js
new file mode 100644
index 000000000..a4f2a80b5
--- /dev/null
+++ b/public/js/icinga/behavior/selection.js
@@ -0,0 +1,341 @@
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+/**
+ * Icinga.Behavior.Selection
+ * 
+ * A multi selection that distincts between the rows using the row action URL filter
+ */
+(function(Icinga, $) {
+
+    "use strict";
+
+    var stripBrackets = function (str) {
+        return str.replace(/^[^\(]*\(/, '').replace(/\)[^\)]*$/, '');
+    };
+
+    var parseSelectionQuery = function(filterString) {
+        var selections = [];
+        $.each(stripBrackets(filterString).split('|'), function(i, row) {
+            var tuple = {};
+            $.each(stripBrackets(row).split('&'), function(i, keyValue) {
+                var s = keyValue.split('=');
+                tuple[s[0]] = decodeURIComponent(s[1]);
+            });
+            selections.push(tuple);
+        });
+        return selections;
+    };
+
+    var toQueryPart = function(id) {
+        var queries = [];
+        $.each(id, function(key, value) {
+            queries.push(key + '=' + encodeURIComponent(value));
+        });
+        return queries.join('&');
+    };
+
+    var Table = function(table, icinga) {
+        this.$el = $(table);
+        this.icinga = icinga;
+        
+        if (this.hasMultiselection()) {
+            if (! this.getMultiselectionKeys().length) {
+                icinga.logger.error('multiselect table has no data-icinga-multiselect-data');
+            }
+            if (! this.getMultiselectionUrl()) {
+                icinga.logger.error('multiselect table has no data-icinga-multiselect-url');
+            }
+        }
+    };
+
+    Table.prototype = {
+        rows: function() {
+            return this.$el.find('tr');
+        },
+
+        rowActions: function() {
+            return this.$el.find('tr a.rowaction');
+        },
+
+        selections: function() {
+            return this.$el.find('tr.active');
+        },
+
+        hasMultiselection: function() {
+            return this.$el.hasClass('multiselect');
+        },
+
+        getMultiselectionKeys: function() {
+            var data = this.$el.data('icinga-multiselect-data');
+            return (data && data.split(',')) || [];
+        },
+
+        getMultiselectionUrl: function() {
+            return this.$el.data('icinga-multiselect-url');
+        },
+
+        /**
+         * @param   row     {jQuery}    The row
+         *
+         * @returns         {Object}    An object containing all selection data in
+         *                              this row as key-value pairs
+         */
+        getRowData: function(row) {
+            var params = this.icinga.utils.parseUrl(row.attr('href')).params;
+            var tuple = {};
+            var keys = this.getMultiselectionKeys();
+            for (var i = 0; i < keys.length; i++) {
+                var key = keys[i];
+                if (params[key]) {
+                    tuple[key] = params[key];
+                }
+            }
+            return tuple;
+        },
+
+        /**
+         * If this table is currently used to control the selection
+         *
+         * @returns {Boolean}
+         */
+        active: function() {
+            var loc = this.icinga.utils.parseUrl(window.location.href);
+            if (!loc.hash) {
+                return false;
+            }
+            if (this.getMultiselectionUrl()) {
+                var multiUrl = this.getMultiselectionUrl();
+                return multiUrl === loc.hash.split('?')[0].substr(1);
+            } else {
+                return this.rowActions().filter('[href="' + loc.hash.substr(1) + '"]').length > 1;
+            }
+        },
+
+        loading: function() {
+            
+        },
+
+        clear: function() {
+            this.selections().removeClass('active');
+        },
+
+        select: function(filter) {
+            if (filter instanceof jQuery) {
+                filter.addClass('active');
+                return;
+            }
+            var self = this;
+            var url = this.getMultiselectionUrl();
+            this.rowActions()
+                .filter(
+                    function (i, el) {
+                        var params = self.getRowData($(el));
+                        if (self.icinga.utils.objectKeys(params).length !== self.icinga.utils.objectKeys(filter).length) {
+                            return false;
+                        }
+                        var equal = true;
+                        $.each(params, function(key, value) {
+                            if (filter[key] !== value) {
+                                equal = false;
+                            }
+                        });
+                        return equal;
+                    }
+                )
+                .closest('tr')
+                .addClass('active');
+        },
+
+        toggle: function(filter) {
+            if (filter instanceof jQuery) {
+                filter.toggleClass('active');
+                return;
+            }
+            this.icinga.logger.error('toggling by filter not implemented');
+        },
+
+        /**
+         * Add a new selection range to the closest table, using the selected row as
+         * range target.
+         *
+         * @param   row {jQuery}    The target of the selected range.
+         *
+         * @returns     {boolean}   If the selection was changed.
+         */
+        range: function(row) {
+            var from, to;
+            var selected = row.first().get(0);
+            this.rows().each(function(i, el) {
+                if ($(el).hasClass('active') || el === selected) {
+                    if (!from) {
+                        from = el;
+                    }
+                    to = el;
+                }
+            });
+            var inRange = false;
+            this.rows().each(function(i, el) {
+                if (el === from) {
+                    inRange = true;
+                }
+                if (inRange) {
+                    $(el).addClass('active');
+                }
+                if (el === to) {
+                    inRange = false;
+                }
+            });
+            return false;
+        },
+
+        selectUrl: function(url) {
+            this.rows().filter('[href="' + url + '"]').addClass('active');
+        },
+
+        toQuery: function() {
+            var self = this;
+            var selections = this.selections();
+            var queries = [];
+            if (selections.length === 1) {
+                return $(selections[0]).attr('href');
+            } else if (selections.length > 1 && self.hasMultiselection()) {
+                selections.each(function (i, el) {
+                    var parts = [];
+                    $.each(self.getRowData($(el)), function(key, value) {
+                        parts.push(encodeURIComponent(key) + '=' + encodeURIComponent(value));
+                    });
+                    queries.push('(' + parts.join('&') + ')');
+                });
+                return self.getMultiselectionUrl() + '?(' + queries.join('|') + ')';
+            } else {
+                return '';
+            }
+        }
+    };
+
+    Icinga.Behaviors = Icinga.Behaviors || {};
+
+    var Selection = function (icinga) {
+        Icinga.EventListener.call(this, icinga);
+        
+       /**
+        * The hash that is currently being loaded
+        *
+        * @var String
+        */
+        this.loadingHash = null;
+        
+        /**
+         * If currently loading
+         *
+         * @var Boolean
+         */
+        this.loading = false;
+
+        this.on('rendered', this.onRendered, this);
+        this.on('click', 'table.action tr[href]', this.onRowClicked, this);
+    };
+    Selection.prototype = new Icinga.EventListener();
+
+    Selection.prototype.toogleTableRowSelection = function ($tr) {
+        // multi selection
+        if ($tr.hasClass('active')) {
+            $tr.removeClass('active');
+        } else {
+            $tr.addClass('active');
+        }
+        return true;
+    };
+
+    Selection.prototype.tables = function(context) {
+        if (context) {
+            return $(context).find('table.action');
+        }
+        return $('table.action');
+    };
+
+    Selection.prototype.onRowClicked = function(event) {
+        var self = event.data.self;
+        var $tr = $(event.target).closest('tr');
+        var table = new Table($tr.closest('table.action')[0], self.icinga);
+
+        // allow form actions in table rows to pass through
+        if ($(event.target).closest('form').length) {
+            return;
+        }
+        event.stopPropagation();
+        event.preventDefault();
+
+        // update selection
+        if (table.hasMultiselection()) {
+            if (event.ctrlKey || event.metaKey) {
+                // add to selection
+                table.toggle($tr);
+            } else if (event.shiftKey) {
+                // range selection
+                table.range($tr);
+            } else {
+                table.clear();
+                table.select($tr);
+            }
+        } else {
+            table.clear();
+            table.select($tr);
+        }
+
+        // update history
+        var url = self.icinga.utils.parseUrl(window.location.href.split('#')[0]);
+        if (table.selections().length > 0) {
+            var query = table.toQuery();
+            self.icinga.loader.loadUrl(query, self.icinga.events.getLinkTargetFor($tr)); 
+            self.icinga.history.pushUrl(url.path + url.query + '#!' + query);
+        } else {
+            if (self.icinga.events.getLinkTargetFor($tr).attr('id') === 'col2') {
+                icinga.ui.layout1col();
+            }
+            self.icinga.history.pushUrl(url.path + url.query);
+        }
+        
+        // clear all inactive tables
+        this.tables().each(function () { 
+            var t = new Table(this, self.icinga)
+            if (! t.active()) {
+                t.clear();
+            }
+        });
+        
+        // update selection info
+        $('.selection-info-count').text(table.selections().size());
+        return false;
+    }
+
+    Selection.prototype.onRendered = function(evt) {
+        var container = evt.target;
+        var self = evt.data.self;
+        
+        if (self.tables(container).length < 1) {
+            return;
+        }
+
+        // draw all selections
+        self.tables().each(function(i, el) {
+            var table = new Table(el, self.icinga);
+            table.clear();
+            if (! table.active()) {
+                return;
+            }
+            var hash = self.icinga.utils.parseUrl(window.location.href).hash;
+            if (table.hasMultiselection()) {
+                $.each(parseSelectionQuery(hash), function(i, selection) {
+                    table.select(selection);
+                });
+            } else {
+                table.selectUrl(hash.substr(1));
+            }
+            $('.selection-info-count').text(table.selections().size());
+        });
+    };
+
+    Icinga.Behaviors.Selection = Selection;
+
+}) (Icinga, jQuery);
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 775b99eff..406a7e298 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -308,68 +308,6 @@
          * Handle table selection.
          */
         rowSelected: function(event) {
-            var self     = event.data.self;
-            var icinga   = self.icinga;
-            var $tr      = $(this);
-            var $table   = $tr.closest('table.multiselect');
-            var data     = self.icinga.ui.getSelectionKeys($table);
-            var url      = $table.data('icinga-multiselect-url');
-
-            if ($(event.target).closest('form').length) {
-                // allow form actions in table rows to pass through
-                return;
-            }
-            event.stopPropagation();
-            event.preventDefault();
-
-            if (!data) {
-                icinga.logger.error('multiselect table has no data-icinga-multiselect-data');
-                return;
-            }
-            if (!url) {
-                icinga.logger.error('multiselect table has no data-icinga-multiselect-url');
-                return;
-            }
-
-            // update selection
-            if (event.ctrlKey || event.metaKey) {
-                icinga.ui.toogleTableRowSelection($tr);
-                // multi selection
-            } else if (event.shiftKey) {
-                // range selection
-                icinga.ui.addTableRowRangeSelection($tr);
-            } else {
-                // single selection
-                icinga.ui.setTableRowSelection($tr);
-            }
-            // focus only the current table.
-            icinga.ui.focusTable($table[0]);
-
-            var $target = self.getLinkTargetFor($tr);
-
-            var $trs = $table.find('tr[href].active');
-            if ($trs.length > 1) {
-                var selectionData = icinga.ui.getSelectionSetData($trs, data);
-                var query = icinga.ui.selectionDataToQuery(selectionData);
-                icinga.loader.loadUrl(url + '?' + query, $target);
-                icinga.ui.storeSelectionData(selectionData);
-                icinga.ui.provideSelectionCount();
-            } else if ($trs.length === 1) {
-                // display a single row
-                $tr = $trs.first();
-                icinga.loader.loadUrl($tr.attr('href'), $target);
-                icinga.ui.storeSelectionData($tr.attr('href'));
-                icinga.ui.provideSelectionCount();
-            } else {
-                // display nothing
-                if ($target.attr('id') === 'col2') {
-                    icinga.ui.layout1col();
-                }
-                icinga.ui.storeSelectionData(null);
-                icinga.ui.provideSelectionCount();
-            }
-
-            return false;
         },
 
         /**
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index cd5290f32..e8909559f 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -298,73 +298,6 @@
             return $('#main > .container').length;
         },
 
-        /**
-         * Add the given table-row to the selection of the closest
-         * table and deselect all other rows of the closest table.
-         *
-         * @param $tr {jQuery}  The selected table row.
-         * @returns {boolean}   If the selection was changed.
-         */
-        setTableRowSelection: function ($tr) {
-            var $table   = $tr.closest('table.multiselect');
-            $table.find('tr[href].active').removeClass('active');
-            $tr.addClass('active');
-            return true;
-        },
-
-        /**
-         * Toggle the given table row to "on" when not selected, or to "off" when
-         * currently selected.
-         *
-         * @param $tr {jQuery}  The table row.
-         * @returns {boolean}   If the selection was changed.
-         */
-        toogleTableRowSelection: function ($tr) {
-            // multi selection
-            if ($tr.hasClass('active')) {
-                $tr.removeClass('active');
-            } else {
-                $tr.addClass('active');
-            }
-            return true;
-        },
-
-        /**
-         * Add a new selection range to the closest table, using the selected row as
-         * range target.
-         *
-         * @param $tr {jQuery}  The target of the selected range.
-         * @returns {boolean}   If the selection was changed.
-         */
-        addTableRowRangeSelection: function ($tr) {
-            var $table = $tr.closest('table.multiselect');
-            var $rows  = $table.find('tr[href]'),
-                from, to;
-            var selected = $tr.first().get(0);
-            $rows.each(function(i, el) {
-                if ($(el).hasClass('active') || el === selected) {
-                    if (!from) {
-                        from = el;
-                    }
-                    to = el;
-                }
-            });
-            var inRange = false;
-            $rows.each(function(i, el){
-                if (el === from) {
-                    inRange = true;
-                }
-                if (inRange) {
-                    $(el).addClass('active');
-                }
-                if (el === to) {
-                    inRange = false;
-                }
-            });
-            return false;
-        },
-
-
         /**
          * Read the data from a whole set of selections.
          *
@@ -383,72 +316,6 @@
             return selections;
         },
 
-        getSelectionKeys: function($selection)
-        {
-            var d = $selection.data('icinga-multiselect-data') && $selection.data('icinga-multiselect-data').split(',');
-            return d || [];
-        },
-
-        /**
-         * Read the data from the given selected object.
-         *
-         * @param $selection {jQuery}   The selected object.
-         * @param keys       {Array}    An array containing all valid keys.
-         * @param icinga     {Icinga}   The main icinga object.
-         * @returns {Object}    An object containing all key-value pairs associated with this selection.
-         */
-        getSelectionData: function($selection, keys, icinga)
-        {
-            var url    = $selection.attr('href');
-            var params = this.icinga.utils.parseUrl(url).params;
-            var tuple  = {};
-            for (var i = 0; i < keys.length; i++) {
-                var key = keys[i];
-                if (params[key]) {
-                    tuple[key] = params[key];
-                }
-            }
-            return tuple;
-        },
-
-        /**
-         * Convert a set of selection data to a single query.
-         *
-         * @param selectionData {Array} The selection data generated from getSelectionData
-         * @returns {String}    The formatted and uri-encoded query-string.
-         */
-        selectionDataToQuery: function (selectionData) {
-            var queries = [];
-
-            // create new url
-            if (selectionData.length < 2) {
-                this.icinga.logger.error('Something went wrong, we should never multiselect just one row');
-            } else {
-                $.each(selectionData, function(i, el){
-                    var parts = []
-                    $.each(el, function(key, value) {
-                        parts.push(encodeURIComponent(key) + '=' + encodeURIComponent(value));
-                    });
-                    queries.push('(' + parts.join('&') + ')');
-                });
-            }
-            return '(' + queries.join('|') + ')';
-        },
-
-        /**
-         * Create a single query-argument (not compatible to selectionDataToQuery)
-         *
-         * @param data
-         * @returns {string}
-         */
-        selectionDataToQueryComp: function(data) {
-            var queries = [];
-            $.each(data, function(key, value){
-                queries.push(key + '=' + encodeURIComponent(value));
-            });
-            return queries.join('&');
-        },
-
         /**
          * Store a set of selection-data to preserve it accross page-reloads
          *
diff --git a/public/js/icinga/utils.js b/public/js/icinga/utils.js
index 4b04b3d44..b447454e3 100644
--- a/public/js/icinga/utils.js
+++ b/public/js/icinga/utils.js
@@ -293,6 +293,14 @@
             return $element[0];
         },
 
+        objectKeys: Object.keys || function (obj) {
+            var keys = [];
+            $.each(obj, function (key) {
+                keys.push(key);
+            });
+            return keys;
+        },
+
         /**
          * Cleanup
          */

From 96677fb6c7faeb4c3792774e112cbff833968c7f Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 29 Jun 2015 18:51:32 +0200
Subject: [PATCH 2427/2920] Fix selection when clicking on regular links

refs #9054
refs #9346
---
 public/js/icinga/events.js | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 406a7e298..677c91af1 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -117,9 +117,6 @@
             $(document).on('click', 'a', { self: this }, this.linkClicked);
             $(document).on('click', 'tr[href]', { self: this }, this.linkClicked);
 
-            // Select a table row
-            $(document).on('click', 'table.multiselect tr[href]', { self: this }, this.rowSelected);
-
             // We catch all form submit events
             $(document).on('submit', 'form', { self: this }, this.submitForm);
 
@@ -304,12 +301,6 @@
             return false;
         },
 
-        /**
-         * Handle table selection.
-         */
-        rowSelected: function(event) {
-        },
-
         /**
          * Handle anchor, i.e. focus the element which is referenced by the anchor
          *
@@ -345,16 +336,16 @@
             // Special checks for link clicks in multiselect rows
             if (! $a.is('tr[href]') && $a.closest('tr[href]').length > 0 && $a.closest('table.multiselect').length > 0) {
 
-                // Forward clicks to ANY link with special key pressed to rowSelected
+                // ignoray clicks to ANY link with special key pressed
                 if (event.ctrlKey || event.metaKey || event.shiftKey)
                 {
-                    return self.rowSelected.call($a.closest('tr[href]'), event);
+                    return true;
                 }
 
-                // Forward inner links matching the row URL to rowSelected
+                // ignore inner links matching the row URL
                 if ($a.attr('href') === $a.closest('tr[href]').attr('href'))
                 {
-                    return self.rowSelected.call($a.closest('tr[href]'), event);
+                    return true;
                 }
             }
 
@@ -513,8 +504,6 @@
             $(window).off('beforeunload', this.onUnload);
             $(document).off('scroll', '.container', this.onContainerScroll);
             $(document).off('click', 'a', this.linkClicked);
-            $(document).off('click', 'table.action tr[href]', this.rowSelected);
-            $(document).off('click', 'table.action tr a', this.rowSelected);
             $(document).off('submit', 'form', this.submitForm);
             $(document).off('change', 'form select.autosubmit', this.submitForm);
             $(document).off('change', 'form input.autosubmit', this.submitForm);

From 3ea9e50c02263f3da55aea0d254afff3b0d6f30e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 30 Jun 2015 09:20:52 +0200
Subject: [PATCH 2428/2920] AdminAccountPage: Fetch the entire set of users
 only if necessary

refs #8704
---
 .../application/forms/AdminAccountPage.php    | 36 +++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 25a9d6799..aaf06da20 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -5,6 +5,8 @@ namespace Icinga\Module\Setup\Forms;
 
 use Exception;
 use Icinga\Authentication\User\UserBackend;
+use Icinga\Authentication\User\DbUserBackend;
+use Icinga\Authentication\User\LdapUserBackend;
 use Icinga\Data\ConfigObject;
 use Icinga\Web\Form;
 
@@ -204,7 +206,7 @@ class AdminAccountPage extends Form
             return false;
         }
 
-        if ($data['user_type'] === 'new_user' && array_search($data['new_user'], $this->fetchUsers()) !== false) {
+        if ($data['user_type'] === 'new_user' && !$this->hasUser($data['new_user'])) {
             $this->getElement('new_user')->addError($this->translate('Username already exists.'));
             return false;
         }
@@ -254,21 +256,41 @@ class AdminAccountPage extends Form
     }
 
     /**
-     * Return the names of all users this backend currently provides
+     * Return the names of all users the backend currently provides
      *
      * @return  array
      */
     protected function fetchUsers()
     {
-        $config = new ConfigObject($this->backendConfig);
-        $config->resource = $this->resourceConfig;
-        $backend = UserBackend::create(null, $config);
-
         try {
-            return $backend->select(array('user_name'))->order('user_name', 'asc', true)->fetchColumn();
+            return $this->createBackend()->select(array('user_name'))->order('user_name', 'asc', true)->fetchColumn();
         } catch (Exception $_) {
             // No need to handle anything special here. Error means no users found.
             return array();
         }
     }
+
+    /**
+     * Return whether the backend provides a user with the given name
+     *
+     * @param   string  $username
+     *
+     * @return  bool
+     */
+    protected function hasUser($username)
+    {
+        return $this->createBackend()->select()->where('user_name', $username)->count() > 1;
+    }
+
+    /**
+     * Create and return the backend
+     *
+     * @return  DbUserBackend|LdapUserBackend
+     */
+    protected function createBackend()
+    {
+        $config = new ConfigObject($this->backendConfig);
+        $config->resource = $this->resourceConfig;
+        return UserBackend::create(null, $config);
+    }
 }

From 2158b2701cace23dcac2c01a13e60f2b25c81f67 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 30 Jun 2015 10:53:02 +0200
Subject: [PATCH 2429/2920] forms.less: Fix scattered design of form elements
 without help

---
 public/css/icinga/forms.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 2c45b476f..91ae82682 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -232,7 +232,7 @@ select.grant-permissions {
 }
 
 label ~ input, label ~ select {
-  margin-left: 1.6em;
+  margin-left: 1.35em;
 }
 
 label + i ~ input, label + i ~ select {

From c787eadcfe2154b2c4534f5714d8133c4a199d22 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 30 Jun 2015 10:58:17 +0200
Subject: [PATCH 2430/2920] AdminAccountPage: Use a select input to choose how
 to define a user

refs #8704
---
 .../application/forms/AdminAccountPage.php    | 163 ++++++++----------
 1 file changed, 69 insertions(+), 94 deletions(-)

diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index aaf06da20..8f738fa5a 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -35,7 +35,9 @@ class AdminAccountPage extends Form
     public function init()
     {
         $this->setName('setup_admin_account');
-        $this->setViewScript('form/setup-admin-account.phtml');
+        $this->addDescription($this->translate(
+            'Now it\'s time to configure your first administrative account for Icinga Web 2.'
+        ));
     }
 
     /**
@@ -70,14 +72,53 @@ class AdminAccountPage extends Form
     public function createElements(array $formData)
     {
         $choices = array();
-
         if ($this->backendConfig['backend'] !== 'db') {
             $choices['by_name'] = $this->translate('By Name', 'setup.admin');
+            $choice = isset($formData['user_type']) ? $formData['user_type'] : 'by_name';
+        } else {
+            $choices['new_user'] = $this->translate('New User', 'setup.admin');
+            $choice = isset($formData['user_type']) ? $formData['user_type'] : 'new_user';
+        }
+
+        if (in_array($this->backendConfig['backend'], array('db', 'ldap', 'msldap'))) {
+            $users = $this->fetchUsers();
+            if (! empty($users)) {
+                $choices['existing_user'] = $this->translate('Existing User', 'setup.admin');
+            }
+        }
+
+        if (count($choices) > 1) {
+            $this->addDescription($this->translate(
+                'Below are several options you can choose from for how to define the desired account.'
+            ));
+            $this->addElement(
+                'select',
+                'user_type',
+                array(
+                    'required'      => true,
+                    'autosubmit'    => true,
+                    'label'         => $this->translate('Type Of Definition'),
+                    'multiOptions'  => $choices,
+                    'value'         => $choice
+                )
+            );
+        } else {
+            $this->addElement(
+                'hidden',
+                'user_type',
+                array(
+                    'required'  => true,
+                    'value'     => key($choices)
+                )
+            );
+        }
+
+        if ($choice === 'by_name') {
             $this->addElement(
                 'text',
                 'by_name',
                 array(
-                    'required'      => !isset($formData['user_type']) || $formData['user_type'] === 'by_name',
+                    'required'      => true,
                     'value'         => $this->getUsername(),
                     'label'         => $this->translate('Username'),
                     'description'   => $this->translate(
@@ -86,53 +127,35 @@ class AdminAccountPage extends Form
                     )
                 )
             );
-            if (! $this->request->isXmlHttpRequest()) {
-                // In case JS is disabled we must not provide client side validation as
-                // the user is required to input data even he has changed his mind
-                $this->getElement('by_name')->setAttrib('required', null);
-                $this->getElement('by_name')->setAttrib('aria-required', null);
-            }
         }
 
-        if (in_array($this->backendConfig['backend'], array('db', 'ldap', 'msldap'))) {
-            $users = $this->fetchUsers();
-            if (false === empty($users)) {
-                $choices['existing_user'] = $this->translate('Existing User');
-                $this->addElement(
-                    'select',
-                    'existing_user',
-                    array(
-                        'required'      => isset($formData['user_type']) && $formData['user_type'] === 'existing_user',
-                        'label'         => $this->translate('Username'),
-                        'description'   => sprintf(
-                            $this->translate(
-                                'Choose a user reported by the %s backend as the initial administrative account',
-                                'setup.admin'
-                            ),
-                            $this->backendConfig['backend'] === 'db'
-                                ? $this->translate('database', 'setup.admin.authbackend')
-                                : 'LDAP'
+        if ($choice === 'existing_user') {
+            $this->addElement(
+                'select',
+                'existing_user',
+                array(
+                    'required'      => true,
+                    'label'         => $this->translate('Username'),
+                    'description'   => sprintf(
+                        $this->translate(
+                            'Choose a user reported by the %s backend as the initial administrative account',
+                            'setup.admin'
                         ),
-                        'multiOptions'  => array_combine($users, $users)
-                    )
-                );
-                if (! $this->request->isXmlHttpRequest()) {
-                    // In case JS is disabled we must not provide client side validation as
-                    // the user is required to input data even he has changed his mind
-                    $this->getElement('existing_user')->setAttrib('required', null);
-                    $this->getElement('existing_user')->setAttrib('aria-required', null);
-                }
-            }
+                        $this->backendConfig['backend'] === 'db'
+                            ? $this->translate('database', 'setup.admin.authbackend')
+                            : 'LDAP'
+                    ),
+                    'multiOptions'  => array_combine($users, $users)
+                )
+            );
         }
 
-        if ($this->backendConfig['backend'] === 'db') {
-            $choices['new_user'] = $this->translate('New User');
-            $required = isset($formData['user_type']) && $formData['user_type'] === 'new_user';
+        if ($choice === 'new_user') {
             $this->addElement(
                 'text',
                 'new_user',
                 array(
-                    'required'      => $required,
+                    'required'      => true,
                     'label'         => $this->translate('Username'),
                     'description'   => $this->translate(
                         'Enter the username to be used when creating an initial administrative account'
@@ -143,7 +166,7 @@ class AdminAccountPage extends Form
                 'password',
                 'new_user_password',
                 array(
-                    'required'      => $required,
+                    'required'      => true,
                     'label'         => $this->translate('Password'),
                     'description'   => $this->translate('Enter the password to assign to the newly created account')
                 )
@@ -152,44 +175,16 @@ class AdminAccountPage extends Form
                 'password',
                 'new_user_2ndpass',
                 array(
-                    'required'      => $required,
+                    'required'      => true,
                     'label'         => $this->translate('Repeat password'),
-                    'description'   => $this->translate('Please repeat the password given above to avoid typing errors'),
+                    'description'   => $this->translate(
+                        'Please repeat the password given above to avoid typing errors'
+                    ),
                     'validators'    => array(
                         array('identical', false, array('new_user_password'))
                     )
                 )
             );
-            if (! $this->request->isXmlHttpRequest()) {
-                // In case JS is disabled we must not provide client side validation as
-                // the user is required to input data even he has changed his mind
-                foreach (array('new_user', 'new_user_password', 'new_user_2ndpass') as $elementName) {
-                    $this->getElement($elementName)->setAttrib('aria-required', null);
-                    $this->getElement($elementName)->setAttrib('required', null);
-                }
-            }
-        }
-
-        if (count($choices) > 1) {
-            $this->addElement(
-                'radio',
-                'user_type',
-                array(
-                    'required'      => true,
-                    'autosubmit'    => true,
-                    'value'         => key($choices),
-                    'multiOptions'  => $choices
-                )
-            );
-        } else {
-            $this->addElement(
-                'hidden',
-                'user_type',
-                array(
-                    'required'  => true,
-                    'value'     => key($choices)
-                )
-            );
         }
     }
 
@@ -214,26 +209,6 @@ class AdminAccountPage extends Form
         return true;
     }
 
-    /**
-     * Return whether the given values (possibly incomplete) are valid
-     *
-     * Unsets all empty text-inputs so that they are not being validated when auto-submitting the form.
-     *
-     * @param   array   $formData
-     *
-     * @return type
-     */
-    public function isValidPartial(array $formData)
-    {
-        foreach (array('by_name', 'new_user', 'new_user_password', 'new_user_2ndpass') as $elementName) {
-            if (isset($formData[$elementName]) && $formData[$elementName] === '') {
-                unset($formData[$elementName]);
-            }
-        }
-
-        return parent::isValidPartial($formData);
-    }
-
     /**
      * Return the name of the externally authenticated user
      *

From ae9fa38ac491ebe82ac8dea0cdfa6796701aa5eb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 30 Jun 2015 11:38:40 +0200
Subject: [PATCH 2431/2920] AdminAccountPage: Drop unused view script

refs #8704
---
 .../scripts/form/setup-admin-account.phtml    | 82 -------------------
 1 file changed, 82 deletions(-)
 delete mode 100644 modules/setup/application/views/scripts/form/setup-admin-account.phtml

diff --git a/modules/setup/application/views/scripts/form/setup-admin-account.phtml b/modules/setup/application/views/scripts/form/setup-admin-account.phtml
deleted file mode 100644
index 99e5692b3..000000000
--- a/modules/setup/application/views/scripts/form/setup-admin-account.phtml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-use Icinga\Web\Wizard;
-
-$radioElem = $form->getElement('user_type');
-$showRadioBoxes = strpos(strtolower(get_class($radioElem)), 'radio') !== false;
-
-?>
-<form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
-  <h1><?= $this->translate('Administration', 'setup.page.title'); ?></h1>
-  <ul class="descriptions">
-    <li><?= $this->translatePlural(
-      'Now it\'s time to configure your first administrative account for Icinga Web 2. Please follow the instructions below:',
-      'Now it\'s time to configure your first administrative account for Icinga Web 2. Below are several options you can choose from. Select one and follow its instructions:',
-      $showRadioBoxes ? count($radioElem->getMultiOptions()) : 1
-    ); ?></li>
-  </ul>
-  <?= $form->getElement('title'); ?>
-  <?= $form->getElement('description'); ?>
-<?php if (($byNameElem = $form->getElement('by_name')) !== null): ?>
-  <div>
-    <div class="instructions">
-      <?= $showRadioBoxes ? $byNameElem->setAttrib('data-related-radiobtn', 'by_name') : $byNameElem; ?>
-    </div>
-<?php if ($showRadioBoxes): ?>
-    <div class="radiobox">
-      <label>
-        <input type="radio" id="by_name" name="user_type" value="by_name"<?= $radioElem->getValue() === 'by_name' ? ' checked' : ''; ?> class="autosubmit" aria-required="true" required>
-        <?= $radioElem->getMultiOption('by_name'); ?>
-      </label>
-    </div>
-<?php endif ?>
-  </div>
-<?php endif ?>
-<?php if (($existingUserElem = $form->getElement('existing_user')) !== null): ?>
-  <div>
-    <div class="instructions">
-      <?= $showRadioBoxes ? $existingUserElem->setAttrib('data-related-radiobtn', 'existing_user') : $existingUserElem; ?>
-    </div>
-<?php if ($showRadioBoxes): ?>
-    <div class="radiobox">
-      <label>
-        <input type="radio" id="existing_user" name="user_type" value="existing_user"<?= $radioElem->getValue() === 'existing_user' ? ' checked' : ''; ?> class="autosubmit" aria-required="true" required>
-        <?= $radioElem->getMultiOption('existing_user'); ?>
-      </label>
-    </div>
-<?php endif ?>
-  </div>
-<?php endif ?>
-<?php if (($newUserElem = $form->getElement('new_user')) !== null): ?>
-  <div>
-    <div class="instructions">
-      <?= $showRadioBoxes ? $newUserElem->setAttrib('data-related-radiobtn', 'new_user') : $newUserElem; ?>
-      <?= $form->getElement('new_user_password'); ?>
-      <?= $form->getElement('new_user_2ndpass'); ?>
-    </div>
-<?php if ($showRadioBoxes): ?>
-    <div class="radiobox">
-      <label>
-        <input type="radio" id="new_user" name="user_type" value="new_user"<?= $radioElem->getValue() === 'new_user' ? ' checked' : ''; ?> class="autosubmit" aria-required="true" required>
-        <?= $radioElem->getMultiOption('new_user'); ?>
-      </label>
-    </div>
-<?php endif ?>
-  </div>
-<?php endif ?>
-<?php if (false === $showRadioBoxes): ?>
-  <?= $radioElem; ?>
-<?php endif ?>
-  <?= $form->getElement($form->getTokenElementName()); ?>
-  <?= $form->getElement($form->getUidElementName()); ?>
-  <div class="buttons">
-    <?php
-      $btn = clone $form->getElement(Wizard::BTN_NEXT);
-      $btn->setAttrib('class', 'double');
-      $btn->setAttrib('tabindex', -1);
-      echo $btn;
-    ?>
-    <?= $form->getElement(Wizard::BTN_PREV); ?>
-    <?= $form->getElement(Wizard::BTN_NEXT); ?>
-  </div>
-</form>
\ No newline at end of file

From 2dcbee27bcc9736ae8bac4d2da334c3a1bb0f35a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 30 Jun 2015 11:38:59 +0200
Subject: [PATCH 2432/2920] AdminAccountPage: Add missing form title

refs #8704
---
 modules/setup/application/forms/AdminAccountPage.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 8f738fa5a..5118ce291 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -35,6 +35,7 @@ class AdminAccountPage extends Form
     public function init()
     {
         $this->setName('setup_admin_account');
+        $this->setTitle($this->translate('Administration', 'setup.page.title'));
         $this->addDescription($this->translate(
             'Now it\'s time to configure your first administrative account for Icinga Web 2.'
         ));

From e0d588cda3a9f1bbd79e3473483f3033059f2385 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 30 Jun 2015 11:53:38 +0200
Subject: [PATCH 2433/2920] Fix look and feel of row selection

Always refresh all tables on render and click events, to display or remove active rows without any delay.

refs #9054
refs #9346
---
 public/js/icinga/behavior/selection.js | 98 ++++++++++----------------
 1 file changed, 36 insertions(+), 62 deletions(-)

diff --git a/public/js/icinga/behavior/selection.js b/public/js/icinga/behavior/selection.js
index a4f2a80b5..7efc60791 100644
--- a/public/js/icinga/behavior/selection.js
+++ b/public/js/icinga/behavior/selection.js
@@ -93,28 +93,6 @@
             return tuple;
         },
 
-        /**
-         * If this table is currently used to control the selection
-         *
-         * @returns {Boolean}
-         */
-        active: function() {
-            var loc = this.icinga.utils.parseUrl(window.location.href);
-            if (!loc.hash) {
-                return false;
-            }
-            if (this.getMultiselectionUrl()) {
-                var multiUrl = this.getMultiselectionUrl();
-                return multiUrl === loc.hash.split('?')[0].substr(1);
-            } else {
-                return this.rowActions().filter('[href="' + loc.hash.substr(1) + '"]').length > 1;
-            }
-        },
-
-        loading: function() {
-            
-        },
-
         clear: function() {
             this.selections().removeClass('active');
         },
@@ -210,6 +188,25 @@
             } else {
                 return '';
             }
+        },
+
+        refresh: function() {
+            this.clear();
+            var hash = this.icinga.utils.parseUrl(window.location.href).hash;
+            if (this.hasMultiselection()) {
+                var query = parseSelectionQuery(hash);
+                if (query.length > 1 && this.getMultiselectionUrl() === this.icinga.utils.parseUrl(hash.substr(1)).path) {
+                    // select all rows with matching filters
+                    var self = this;
+                    $.each(query, function(i, selection) {
+                        self.select(selection);
+                    });
+                }
+                if (query.length > 1) {
+                    return;
+                }
+            }
+            this.selectUrl(hash.substr(1));
         }
     };
 
@@ -237,16 +234,6 @@
     };
     Selection.prototype = new Icinga.EventListener();
 
-    Selection.prototype.toogleTableRowSelection = function ($tr) {
-        // multi selection
-        if ($tr.hasClass('active')) {
-            $tr.removeClass('active');
-        } else {
-            $tr.addClass('active');
-        }
-        return true;
-    };
-
     Selection.prototype.tables = function(context) {
         if (context) {
             return $(context).find('table.action');
@@ -275,6 +262,7 @@
                 // range selection
                 table.range($tr);
             } else {
+                // single selection
                 table.clear();
                 table.select($tr);
             }
@@ -285,25 +273,24 @@
 
         // update history
         var url = self.icinga.utils.parseUrl(window.location.href.split('#')[0]);
-        if (table.selections().length > 0) {
+        var count = table.selections().length;
+        var state = url.path + url.query;
+        if (count > 0) {
             var query = table.toQuery();
-            self.icinga.loader.loadUrl(query, self.icinga.events.getLinkTargetFor($tr)); 
-            self.icinga.history.pushUrl(url.path + url.query + '#!' + query);
+            self.icinga.loader.loadUrl(query, self.icinga.events.getLinkTargetFor($tr));
+            state +=  '#!' + query;
         } else {
             if (self.icinga.events.getLinkTargetFor($tr).attr('id') === 'col2') {
-                icinga.ui.layout1col();
+                self.icinga.ui.layout1col();
             }
-            self.icinga.history.pushUrl(url.path + url.query);
         }
+        self.icinga.history.pushUrl(state);
         
-        // clear all inactive tables
-        this.tables().each(function () { 
-            var t = new Table(this, self.icinga)
-            if (! t.active()) {
-                t.clear();
-            }
+        // re draw all table selections
+        self.tables().each(function () {
+            new Table(this, self.icinga).refresh();
         });
-        
+
         // update selection info
         $('.selection-info-count').text(table.selections().size());
         return false;
@@ -312,28 +299,15 @@
     Selection.prototype.onRendered = function(evt) {
         var container = evt.target;
         var self = evt.data.self;
-        
-        if (self.tables(container).length < 1) {
-            return;
-        }
 
         // draw all selections
         self.tables().each(function(i, el) {
-            var table = new Table(el, self.icinga);
-            table.clear();
-            if (! table.active()) {
-                return;
-            }
-            var hash = self.icinga.utils.parseUrl(window.location.href).hash;
-            if (table.hasMultiselection()) {
-                $.each(parseSelectionQuery(hash), function(i, selection) {
-                    table.select(selection);
-                });
-            } else {
-                table.selectUrl(hash.substr(1));
-            }
-            $('.selection-info-count').text(table.selections().size());
+            new Table(el, self.icinga).refresh();
         });
+
+        // update displayed selection count
+        var table = new Table(self.tables(container).first());
+        $(container).find('.selection-info-count').text(table.selections().size());
     };
 
     Icinga.Behaviors.Selection = Selection;

From 975a834bd45b476eed1047a392e452e1e0780f84 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 30 Jun 2015 12:28:41 +0200
Subject: [PATCH 2434/2920] Remove unused code and clean up

---
 public/js/icinga/events.js |  2 -
 public/js/icinga/loader.js | 36 --------------
 public/js/icinga/ui.js     | 97 +-------------------------------------
 3 files changed, 1 insertion(+), 134 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 677c91af1..e4ad54183 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -407,8 +407,6 @@
                                 icinga.ui.layout1col();
                             }
                             $('table tr[href].active').removeClass('active');
-                            icinga.ui.storeSelectionData(null);
-                            icinga.ui.loadSelectionData();
                             icinga.history.pushCurrentState();
                         }
                     }
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 082b41e87..5b345a308 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -504,42 +504,6 @@
                 this.icinga.ui.fixDebugVisibility().triggerWindowResize();
             }
             self.cacheLoadedIcons(req.$target);
-
-            if (active) {
-                var focusedUrl = this.icinga.ui.getFocusedContainerDataUrl();
-                var oldSelectionData = this.icinga.ui.loadSelectionData();
-                if (typeof oldSelectionData === 'string') {
-                    $('[href="' + oldSelectionData + '"]', req.$target).addClass('active');
-
-                } else if (oldSelectionData !== null) {
-                    var $container;
-                    if (!focusedUrl) {
-                        $container = $('document').first();
-                    } else {
-                        $container = $('.container[data-icinga-url="' + focusedUrl + '"]');
-                    }
-
-                    var $table = $container.find('table.action').first();
-                    var keys = self.icinga.ui.getSelectionKeys($table);
-
-                    // build map of selected queries
-                    var oldSelectionQueries = {};
-                    $.each(oldSelectionData, function(i, query){
-                        oldSelectionQueries[self.icinga.ui.selectionDataToQueryComp(query)] = true;
-                    });
-
-                    // set all new selections to active
-                    $table.find('tr[href]').filter(function(){
-                            var $tr = $(this);
-                            var rowData = self.icinga.ui.getSelectionData($tr, keys, self.icinga);
-                            var newSelectionQuery = self.icinga.ui.selectionDataToQueryComp(rowData);
-                            if (oldSelectionQueries[newSelectionQuery]) {
-                                return true;
-                            }
-                            return false;
-                        }).addClass('active');
-                }
-            }
         },
 
         /**
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index e8909559f..d2f9ab138 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -9,13 +9,6 @@
 
     'use strict';
 
-    // Stores the icinga-data-url of the last focused table.
-    var focusedTableDataUrl = null;
-
-    // The stored selection data, useful for preserving selections over
-    // multiple reload-cycles.
-    var selectionData = null;
-
     Icinga.UI = function (icinga) {
 
         this.icinga = icinga;
@@ -38,8 +31,7 @@
             this.fadeNotificationsAway();
         },
 
-        fadeNotificationsAway: function()
-        {
+        fadeNotificationsAway: function() {
             var icinga = this.icinga;
             $('#notifications li')
                 .not('.fading-out')
@@ -298,93 +290,6 @@
             return $('#main > .container').length;
         },
 
-        /**
-         * Read the data from a whole set of selections.
-         *
-         * @param $selections   {jQuery}    All selected rows in a jQuery-selector.
-         * @param keys          {Array}     An array containing all valid keys.
-         * @returns {Array} An array containing an object with the data for each selection.
-         */
-        getSelectionSetData: function($selections, keys) {
-            var selections = [];
-            var icinga = this.icinga;
-
-            // read all current selections
-            $selections.each(function(ind, selected) {
-                selections.push(icinga.ui.getSelectionData($(selected), keys, icinga));
-            });
-            return selections;
-        },
-
-        /**
-         * Store a set of selection-data to preserve it accross page-reloads
-         *
-         * @param data {Array|String|Null}  The selection-data be an Array of Objects,
-         *  containing the selection data (when multiple rows where selected), a
-         * String containing a single url (when only a single row was selected) or
-         * Null when nothing was selected.
-         */
-        storeSelectionData: function(data) {
-            selectionData = data;
-        },
-
-        /**
-         * Load the last stored set of selection-data
-         *
-         * @returns {Array|String|Null}   May be an Array of Objects, containing the selection data
-         * (when multiple rows where selected), a String containing a single url
-         * (when only a single row was selected) or Null when nothing was selected.
-         */
-        loadSelectionData: function() {
-            this.provideSelectionCount();
-            return selectionData;
-        },
-
-        /**
-         * Set the selections row count hint info
-         */
-        provideSelectionCount: function() {
-            var $count = $('.selection-info-count');
-
-            if (typeof selectionData === 'undefined' || selectionData === null) {
-                $count.text(0);
-                return;
-            }
-
-            if (typeof selectionData === 'string') {
-                $count.text(1);
-            } else if (selectionData.length > 1) {
-                $count.text(selectionData.length);
-            } else {
-                $count.text(0);
-            }
-        },
-
-        /**
-         * Focus the given table by deselecting all selections on all other tables.
-         *
-         * Focusing a table is important for environments with multiple tables like
-         * the dashboard. It should only be possible to select rows at one table at a time,
-         * when a user selects a row on a table all rows that are not child of the given table
-         * will be removed from the selection.
-         *
-         * @param table {htmlElement}   The table to focus.
-         */
-        focusTable: function (table) {
-            $('table').filter(function(){ return this !== table; }).find('tr[href]').removeClass('active');
-            var n = $(table).closest('div.container').attr('data-icinga-url');
-            focusedTableDataUrl = n;
-        },
-
-        /**
-         * Return the URL of the last focused table container.
-         *
-         * @returns {String}    The data-icinga-url of the last focused table, which should be unique in each site.
-         */
-        getFocusedContainerDataUrl: function() {
-            return focusedTableDataUrl;
-        },
-
         /**
          * Assign a unique ID to each .container without such
          *

From 6a7e3fe4404cf02b5f6ea7c5f1fdce791b55a2b9 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 30 Jun 2015 13:03:41 +0200
Subject: [PATCH 2435/2920] Document multi selection and use clearer names

refs #9054
---
 library/Icinga/Web/JavaScript.php             |   2 +-
 .../behavior/{selection.js => actiontable.js} | 149 ++++++++++++++----
 2 files changed, 116 insertions(+), 35 deletions(-)
 rename public/js/icinga/behavior/{selection.js => actiontable.js} (69%)

diff --git a/library/Icinga/Web/JavaScript.php b/library/Icinga/Web/JavaScript.php
index 8a0edf565..ed39c1b39 100644
--- a/library/Icinga/Web/JavaScript.php
+++ b/library/Icinga/Web/JavaScript.php
@@ -27,7 +27,7 @@ class JavaScript
         'js/icinga/behavior/tristate.js',
         'js/icinga/behavior/navigation.js',
         'js/icinga/behavior/form.js',
-        'js/icinga/behavior/selection.js'
+        'js/icinga/behavior/actiontable.js'
     );
 
     protected static $vendorFiles = array(
diff --git a/public/js/icinga/behavior/selection.js b/public/js/icinga/behavior/actiontable.js
similarity index 69%
rename from public/js/icinga/behavior/selection.js
rename to public/js/icinga/behavior/actiontable.js
index 7efc60791..d3df54614 100644
--- a/public/js/icinga/behavior/selection.js
+++ b/public/js/icinga/behavior/actiontable.js
@@ -1,18 +1,31 @@
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 /**
- * Icinga.Behavior.Selection
+ * Icinga.Behavior.ActionTable
  * 
- * A multi selection that distincts between the rows using the row action URL filter
+ * A multi selection that distincts between the table rows using the row action URL filter
  */
 (function(Icinga, $) {
 
     "use strict";
 
+    /**
+     * Remove one leading and trailing bracket and all text outside those brackets
+     *
+     * @param   str     {String}
+     * @returns         {string}
+     */
     var stripBrackets = function (str) {
         return str.replace(/^[^\(]*\(/, '').replace(/\)[^\)]*$/, '');
     };
 
+    /**
+     * Parse the filter query contained in the given url filter string
+     *
+     * @param   filterString    {String}
+     *
+     * @returns                 {Array}   An object containing each row filter
+     */
     var parseSelectionQuery = function(filterString) {
         var selections = [];
         $.each(stripBrackets(filterString).split('|'), function(i, row) {
@@ -26,15 +39,15 @@
         return selections;
     };
 
-    var toQueryPart = function(id) {
-        var queries = [];
-        $.each(id, function(key, value) {
-            queries.push(key + '=' + encodeURIComponent(value));
-        });
-        return queries.join('&');
-    };
-
-    var Table = function(table, icinga) {
+    /**
+     * Handle the selection of an action table
+     *
+     * @param   table   {HTMLElement}   The table
+     * @param           {Icinga}
+     *
+     * @constructor
+     */
+    var Selection = function(table, icinga) {
         this.$el = $(table);
         this.icinga = icinga;
         
@@ -48,37 +61,71 @@
         }
     };
 
-    Table.prototype = {
+    Selection.prototype = {
+
+        /**
+         * Return all rows as jQuery selector
+         *
+         * @returns         {jQuery}
+         */
         rows: function() {
             return this.$el.find('tr');
         },
 
+        /**
+         * Return all row action links as jQuery selector
+         *
+         * @returns         {jQuery}
+         */
         rowActions: function() {
             return this.$el.find('tr a.rowaction');
         },
 
+        /**
+         * Return all selected rows as jQuery selector
+         *
+         * @returns         {jQuery}
+         */
         selections: function() {
             return this.$el.find('tr.active');
         },
 
+        /**
+         * If this selection allows selecting multiple rows
+         *
+         * @returns         {Boolean}
+         */
         hasMultiselection: function() {
             return this.$el.hasClass('multiselect');
         },
 
+        /**
+         * Return all filter keys that are significant when applying the selection
+         *
+         * @returns         {Array}
+         */
         getMultiselectionKeys: function() {
             var data = this.$el.data('icinga-multiselect-data');
             return (data && data.split(',')) || [];
         },
 
+        /**
+         * Return the target URL that is used when multi selecting rows
+         *
+         * This URL may differ from the url that is used when applying single rows
+         *
+         * @returns         {String}
+         */
         getMultiselectionUrl: function() {
             return this.$el.data('icinga-multiselect-url');
         },
 
         /**
-         * @param   row     {jQuery}    The row
+         * Read all filter data from the given row
          *
-         * @returns         {Object}    An object containing all selection data in
-         *                              this row as key-value pairs
+         * @param   row     {jQuery}    The row element
+         *
+         * @returns         {Object}    An object containing all filter data in this row as key-value pairs
          */
         getRowData: function(row) {
             var params = this.icinga.utils.parseUrl(row.attr('href')).params;
@@ -93,10 +140,18 @@
             return tuple;
         },
 
+        /**
+         * Deselect all selected rows
+         */
         clear: function() {
             this.selections().removeClass('active');
         },
 
+        /**
+         * Add all rows that match the given filter to the selection
+         *
+         * @param filter {jQuery|Object}    Either an object containing filter variables or the actual row to select
+         */
         select: function(filter) {
             if (filter instanceof jQuery) {
                 filter.addClass('active');
@@ -124,21 +179,22 @@
                 .addClass('active');
         },
 
-        toggle: function(filter) {
-            if (filter instanceof jQuery) {
-                filter.toggleClass('active');
-                return;
-            }
-            this.icinga.logger.error('toggling by filter not implemented');
+        /**
+         * Toggle the selection of the row between on and off
+         *
+         * @param   row     {jQuery}    The row to toggle
+         */
+        toggle: function(row) {
+            row.toggleClass('active');
         },
 
         /**
          * Add a new selection range to the closest table, using the selected row as
          * range target.
          *
-         * @param   row {jQuery}    The target of the selected range.
+         * @param   row     {jQuery}    The target of the selected range.
          *
-         * @returns     {boolean}   If the selection was changed.
+         * @returns         {boolean}   If the selection was changed.
          */
         range: function(row) {
             var from, to;
@@ -166,10 +222,20 @@
             return false;
         },
 
+        /**
+         * Select rows that target the given url
+         *
+         * @param   url     {String}    The target url
+         */
         selectUrl: function(url) {
             this.rows().filter('[href="' + url + '"]').addClass('active');
         },
 
+        /**
+         * Convert all currently selected rows into an url query string
+         *
+         * @returns         {String}    The filter string
+         */
         toQuery: function() {
             var self = this;
             var selections = this.selections();
@@ -190,6 +256,9 @@
             }
         },
 
+        /**
+         * Refresh the displayed active columns using the current page location
+         */
         refresh: function() {
             this.clear();
             var hash = this.icinga.utils.parseUrl(window.location.href).hash;
@@ -212,7 +281,7 @@
 
     Icinga.Behaviors = Icinga.Behaviors || {};
 
-    var Selection = function (icinga) {
+    var ActionTable = function (icinga) {
         Icinga.EventListener.call(this, icinga);
         
        /**
@@ -232,19 +301,28 @@
         this.on('rendered', this.onRendered, this);
         this.on('click', 'table.action tr[href]', this.onRowClicked, this);
     };
-    Selection.prototype = new Icinga.EventListener();
+    ActionTable.prototype = new Icinga.EventListener();
 
-    Selection.prototype.tables = function(context) {
+    /**
+     * Return all active tables in this table, or in the context as jQuery selector
+     *
+     * @param   context   {HTMLElement}
+     * @returns           {jQuery}
+     */
+    ActionTable.prototype.tables = function(context) {
         if (context) {
             return $(context).find('table.action');
         }
         return $('table.action');
     };
 
-    Selection.prototype.onRowClicked = function(event) {
+    /**
+     * Handle clicks on table rows and update selection and history
+     */
+    ActionTable.prototype.onRowClicked = function (event) {
         var self = event.data.self;
         var $tr = $(event.target).closest('tr');
-        var table = new Table($tr.closest('table.action')[0], self.icinga);
+        var table = new Selection($tr.closest('table.action')[0], self.icinga);
 
         // allow form actions in table rows to pass through
         if ($(event.target).closest('form').length) {
@@ -288,28 +366,31 @@
         
         // re draw all table selections
         self.tables().each(function () {
-            new Table(this, self.icinga).refresh();
+            new Selection(this, self.icinga).refresh();
         });
 
         // update selection info
         $('.selection-info-count').text(table.selections().size());
         return false;
-    }
+    };
 
-    Selection.prototype.onRendered = function(evt) {
+    /**
+     * Ensure that
+     */
+    ActionTable.prototype.onRendered = function(evt) {
         var container = evt.target;
         var self = evt.data.self;
 
         // draw all selections
         self.tables().each(function(i, el) {
-            new Table(el, self.icinga).refresh();
+            new Selection(el, self.icinga).refresh();
         });
 
         // update displayed selection count
-        var table = new Table(self.tables(container).first());
+        var table = new Selection(self.tables(container).first());
         $(container).find('.selection-info-count').text(table.selections().size());
     };
 
-    Icinga.Behaviors.Selection = Selection;
+    Icinga.Behaviors.ActionTable = ActionTable;
 
 }) (Icinga, jQuery);

From 702a9c95230c77b758da4a28a9312bfc6f67d97d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 30 Jun 2015 13:22:54 +0200
Subject: [PATCH 2436/2920] Form: Show notifications and errors below any
 descriptions

They might be textually related to one or more descriptions.

refs #8983
---
 library/Icinga/Web/Form.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 679091fde..c450aaef6 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -1043,9 +1043,9 @@ class Form extends Zend_Form
                         ->addDecorator('HtmlTag', array('tag' => 'div', 'class' => 'header'));
                 }
 
-                $this->addDecorator('FormErrors', array('onlyCustomFormErrors' => true))
+                $this->addDecorator('FormDescriptions')
                     ->addDecorator('FormNotifications')
-                    ->addDecorator('FormDescriptions')
+                    ->addDecorator('FormErrors', array('onlyCustomFormErrors' => true))
                     ->addDecorator('FormElements')
                     //->addDecorator('HtmlTag', array('tag' => 'dl', 'class' => 'zend_form'))
                     ->addDecorator('Form');

From 0fcb054be44a752b106c234c55eb80ad0e7a0094 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 30 Jun 2015 14:07:12 +0200
Subject: [PATCH 2437/2920] Fix service selection in event history

Add rowaction class to all service rows, to make services selectable again.
---
 .../application/views/helpers/Link.php           | 16 ++++++++++------
 .../views/scripts/list/eventhistory.phtml        |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Link.php b/modules/monitoring/application/views/helpers/Link.php
index 35c5a4cbc..e37375d14 100644
--- a/modules/monitoring/application/views/helpers/Link.php
+++ b/modules/monitoring/application/views/helpers/Link.php
@@ -45,10 +45,11 @@ class Zend_View_Helper_Link extends Zend_View_Helper_Abstract
      * @param   string  $serviceLinkText    Text for the service link, e.g. the service's display name
      * @param   string  $host               Hostname
      * @param   string  $hostLinkText       Text for the host link, e.g. the host's display name
+     * @param   string  $class              An optional class to use for this link
      *
      * @return  string
      */
-    public function service($service, $serviceLinkText, $host, $hostLinkText)
+    public function service($service, $serviceLinkText, $host, $hostLinkText, $class = null)
     {
         return sprintf(
             '%s: %s',
@@ -57,11 +58,14 @@ class Zend_View_Helper_Link extends Zend_View_Helper_Abstract
                 $serviceLinkText,
                 'monitoring/service/show',
                 array('host' => $host, 'service' => $service),
-                array('title' => sprintf(
-                    $this->view->translate('Show detailed information for service %s on host %s'),
-                    $service,
-                    $host
-                ))
+                array(
+                    'title' => sprintf(
+                        $this->view->translate('Show detailed information for service %s on host %s'),
+                        $service,
+                        $host
+                    ),
+                    'class' => $class
+                )
             )
         );
     }
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 538702a64..ab9cb2331 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -82,7 +82,7 @@ if (count($history) === 0) {
         <td>
         <?php if ($isService): ?>
           <?= $this->link()->service(
-              $event->service_description, $event->service_display_name, $event->host_name, $event->host_display_name
+              $event->service_description, $event->service_display_name, $event->host_name, $event->host_display_name, 'rowaction'
           ) ?>
         <?php else: ?>
           <?= $this->link()->host($event->host_name, $event->host_display_name) ?>

From 147f6be714468c700b3c6987c9dc322c7a0ad9a2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 30 Jun 2015 14:25:33 +0200
Subject: [PATCH 2438/2920] Form: Fix notifications

* Coding style issues
* Notifications were not grouped by type
* Notifications of sub-forms were overwriting existing ones
---
 library/Icinga/Web/Form.php                   | 127 +++++++++++-------
 .../Web/Form/Decorator/FormNotifications.php  |  50 ++++---
 public/css/icinga/forms.less                  |  27 ++--
 3 files changed, 127 insertions(+), 77 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index c450aaef6..24f0e2657 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -39,26 +39,19 @@ class Form extends Zend_Form
     const DEFAULT_SUFFIX = '_default';
 
     /**
-     * The type of the notification for the error
+     * Identifier for notifications of type error
      */
-    const NOTIFICATION_ERROR    = 0;
+    const NOTIFICATION_ERROR = 0;
 
     /**
-     * The type of the notification for the warning
+     * Identifier for notifications of type warning
      */
-    const NOTIFICATION_WARNING  = 2;
+    const NOTIFICATION_WARNING = 1;
 
     /**
-     * The type of the notification for the info
+     * Identifier for notifications of type info
      */
-    const NOTIFICATION_INFO     = 4;
-
-    /**
-     * The notifications of the form
-     *
-     * @var array
-     */
-    protected $notifications = array();
+    const NOTIFICATION_INFO = 2;
 
     /**
      * Whether this form has been created
@@ -160,6 +153,13 @@ class Form extends Zend_Form
      */
     protected $descriptions;
 
+    /**
+     * The notifications of this form
+     *
+     * @var array
+     */
+    protected $notifications;
+
     /**
      * Whether the Autosubmit decorator should be applied to this form
      *
@@ -522,6 +522,50 @@ class Form extends Zend_Form
         return $this->descriptions;
     }
 
+    /**
+     * Set the notifications for this form
+     *
+     * @param   array   $notifications
+     *
+     * @return  $this
+     */
+    public function setNotifications(array $notifications)
+    {
+        $this->notifications = $notifications;
+        return $this;
+    }
+
+    /**
+     * Add a notification for this form
+     *
+     * If $notification is an array the second value should be
+     * an array as well containing additional HTML properties.
+     *
+     * @param   string|array    $notification
+     * @param   int             $type
+     *
+     * @return  $this
+     */
+    public function addNotification($notification, $type)
+    {
+        $this->notifications[$type][] = $notification;
+        return $this;
+    }
+
+    /**
+     * Return the notifications of this form
+     *
+     * @return  array
+     */
+    public function getNotifications()
+    {
+        if ($this->notifications === null) {
+            return array();
+        }
+
+        return $this->notifications;
+    }
+
     /**
      * Set whether the Autosubmit decorator should be applied to this form
      *
@@ -1264,55 +1308,48 @@ class Form extends Zend_Form
     }
 
     /**
-     * Return all form notifications
+     * Add a error notification and prevent the form from being successfully validated
      *
-     * @return array
-     */
-    public function getNotifications()
-    {
-        return $this->notifications;
-    }
-
-    /**
-     * Add a typed message to the notifications
+     * @param   string|array    $message    The notfication's message
      *
-     * @param string    $message    The message which would be displayed to the user
-     *
-     * @param int       $type       The type of the message notification
-     */
-    public function addNotification($message, $type = self::NOTIFICATION_ERROR)
-    {
-        $this->notifications[$message] = $type;
-        $this->markAsError();
-    }
-
-    /**
-     * Add a error message to notifications
-     *
-     * @param string $message
+     * @return  $this
      */
     public function error($message)
     {
-        $this->addNotification($message, $type = self::NOTIFICATION_ERROR);
+        $this->addNotification($message, self::NOTIFICATION_ERROR);
+        $this->markAsError();
+        return $this;
     }
 
     /**
-     * Add a warning message to notifications
+     * Add a warning notification and prevent the form from being successfully validated
      *
-     * @param string $message
+     * @param   string|array    $message    The notfication's message
+     *
+     * @return  $this
      */
     public function warning($message)
     {
-        $this->addNotification($message, $type = self::NOTIFICATION_WARNING);
+        $this->addNotification($message, self::NOTIFICATION_WARNING);
+        $this->markAsError();
+        return $this;
     }
 
     /**
-     * Add a info message to notifications
+     * Add a info notification
      *
-     * @param string $message
+     * @param   string|array    $message        The notfication's message
+     * @param   bool            $markAsError    Whether to prevent the form from being successfully validated or not
+     *
+     * @return  $this
      */
-    public function info($message)
+    public function info($message, $markAsError = true)
     {
-        $this->addNotification($message, $type = self::NOTIFICATION_INFO);
+        $this->addNotification($message, self::NOTIFICATION_INFO);
+        if ($markAsError) {
+            $this->markAsError();
+        }
+
+        return $this;
     }
 }
diff --git a/library/Icinga/Web/Form/Decorator/FormNotifications.php b/library/Icinga/Web/Form/Decorator/FormNotifications.php
index ed725e625..935c0ce41 100644
--- a/library/Icinga/Web/Form/Decorator/FormNotifications.php
+++ b/library/Icinga/Web/Form/Decorator/FormNotifications.php
@@ -4,15 +4,16 @@
 namespace Icinga\Web\Form\Decorator;
 
 use Zend_Form_Decorator_Abstract;
-use Icinga\Web\Form as Form;
+use Icinga\Exception\ProgrammingError;
+use Icinga\Web\Form;
 
 /**
- * Decorator to add a list of notifications at the top of a form
+ * Decorator to add a list of notifications at the top or bottom of a form
  */
 class FormNotifications extends Zend_Form_Decorator_Abstract
 {
     /**
-     * Render form descriptions
+     * Render form notifications
      *
      * @param   string      $content    The html rendered so far
      *
@@ -31,16 +32,27 @@ class FormNotifications extends Zend_Form_Decorator_Abstract
         }
 
         $notifications = $this->recurseForm($form);
-
         if (empty($notifications)) {
             return $content;
         }
 
         $html = '<ul class="form-notifications">';
+        foreach (array(Form::NOTIFICATION_ERROR, Form::NOTIFICATION_WARNING, Form::NOTIFICATION_INFO) as $type) {
+            if (isset($notifications[$type])) {
+                $html .= '<li><ul class="' . $this->getNotificationTypeName($type) . '">';
+                foreach ($notifications[$type] as $message) {
+                    if (is_array($message)) {
+                        list($message, $properties) = $message;
+                        $html .= '<li' . $view->propertiesToString($properties) . '>'
+                            . $view->escape($message)
+                            . '</li>';
+                    } else {
+                        $html .= '<li>' . $view->escape($message) . '</li>';
+                    }
+                }
 
-        asort($notifications);
-        foreach ($notifications as $message => $type) {
-            $html .= '<li class="'.self::getNotificationTypeName($type).'">' . $view->escape($message) . '</li>';
+                $html .= '</ul></li>';
+            }
         }
 
         switch ($this->getPlacement()) {
@@ -54,42 +66,44 @@ class FormNotifications extends Zend_Form_Decorator_Abstract
     /**
      * Recurse the given form and return the notifications for it and all of its subforms
      *
-     * @param   Form    $form       The form to recurse
+     * @param   Form    $form   The form to recurse
      *
-     * @return array
+     * @return  array
      */
     protected function recurseForm(Form $form)
     {
         $notifications = $form->getNotifications();
-
         foreach ($form->getSubForms() as $subForm) {
-            $notifications = $notifications + $this->recurseForm($subForm);
+            foreach ($this->recurseForm($subForm) as $type => $messages) {
+                foreach ($messages as $message) {
+                    $notifications[$type][] = $message;
+                }
+            }
         }
 
         return $notifications;
     }
 
     /**
-     * Get the readable type name of the notification
+     * Return the name for the given notification type
      *
-     * @param   $type       Type of the message
+     * @param   int     $type
      *
      * @return  string
+     *
+     * @throws  ProgrammingError    In case the given type is invalid
      */
-    public static function getNotificationTypeName($type)
+    protected function getNotificationTypeName($type)
     {
         switch ($type) {
             case Form::NOTIFICATION_ERROR:
                 return 'error';
-                break;
             case Form::NOTIFICATION_WARNING:
                 return 'warning';
-                break;
             case Form::NOTIFICATION_INFO:
                 return 'info';
-                break;
             default:
-                return 'unknown';
+                throw new ProgrammingError('Invalid notification type "%s" provided', $type);
         }
     }
 }
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 91ae82682..42f04d7f3 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -139,7 +139,6 @@ form div.element ul.errors {
   li {
     color: @colorCritical;
     font-weight: bold;
-    line-height: 1.5em;
   }
 }
 
@@ -160,33 +159,33 @@ form ul.form-errors {
   li {
     color: white;
     font-weight: bold;
-    line-height: 1.5em;
   }
 }
 
 form ul.form-notifications {
   .non-list-like-list;
   margin-bottom: 1em;
-  padding: 0em;
+  padding: 0;
 
-  li.info {
-    background: @colorFormNotificationInfo;
-  }
+  ul {
+    .non-list-like-list;
 
-  li.warning {
-    background: @colorFormNotificationWarning;
-  }
+    &.info {
+      background-color: @colorFormNotificationInfo;
+    }
 
-  li.error {
-    background: @colorFormNotificationError;
+    &.warning {
+      background-color: @colorFormNotificationWarning;
+    }
+
+    &.error {
+      background-color: @colorFormNotificationError;
+    }
   }
 
   li {
     color: white;
     font-weight: bold;
-    line-height: 1.5em;
-    padding: 0.5em;
-    margin-bottom: 0.5em;
   }
 }
 

From ea6f707bdff082a04dd0ca00adb8ff0e90ceae3f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 30 Jun 2015 14:28:27 +0200
Subject: [PATCH 2439/2920] FormDescriptions: Do not render a description for
 required fields

refs #8983
---
 .../Web/Form/Decorator/FormDescriptions.php   | 84 ++-----------------
 1 file changed, 5 insertions(+), 79 deletions(-)

diff --git a/library/Icinga/Web/Form/Decorator/FormDescriptions.php b/library/Icinga/Web/Form/Decorator/FormDescriptions.php
index c8ba16ead..c5d460df0 100644
--- a/library/Icinga/Web/Form/Decorator/FormDescriptions.php
+++ b/library/Icinga/Web/Form/Decorator/FormDescriptions.php
@@ -7,35 +7,10 @@ use Zend_Form_Decorator_Abstract;
 use Icinga\Web\Form;
 
 /**
- * Decorator to add a list of descriptions at the top of a form
- *
- * The description for required form elements is automatically being handled.
+ * Decorator to add a list of descriptions at the top or bottom of a form
  */
 class FormDescriptions extends Zend_Form_Decorator_Abstract
 {
-    /**
-     * A list of element class names to be ignored when detecting which message to use to describe required elements
-     *
-     * @var array
-     */
-    protected $blacklist;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($options = null)
-    {
-        parent::__construct($options);
-        $this->blacklist = array(
-            'Zend_Form_Element_Hidden',
-            'Zend_Form_Element_Submit',
-            'Zend_Form_Element_Button',
-            'Icinga\Web\Form\Element\Note',
-            'Icinga\Web\Form\Element\Button',
-            'Icinga\Web\Form\Element\CsrfCounterMeasure'
-        );
-    }
-
     /**
      * Render form descriptions
      *
@@ -55,18 +30,7 @@ class FormDescriptions extends Zend_Form_Decorator_Abstract
             return $content;
         }
 
-        $descriptions = $this->recurseForm($form, $entirelyRequired);
-        if ($entirelyRequired) {
-            $descriptions[] = $form->getView()->translate(
-                'All fields are required and must be filled in to complete the form.'
-            );
-        } elseif ($entirelyRequired === false) {
-            $descriptions[] = $form->getView()->translate(sprintf(
-                'Required fields are marked with %s and must be filled in to complete the form.',
-                $form->getRequiredCue()
-            ));
-        }
-
+        $descriptions = $this->recurseForm($form);
         if (empty($descriptions)) {
             return $content;
         }
@@ -92,53 +56,15 @@ class FormDescriptions extends Zend_Form_Decorator_Abstract
     /**
      * Recurse the given form and return the descriptions for it and all of its subforms
      *
-     * @param   Form    $form               The form to recurse
-     * @param   mixed   $entirelyRequired   Set by reference, true means all elements in the hierarchy are
-     *                                       required, false only a partial subset and null none at all
-     * @param   bool    $elementsPassed     Whether there were any elements passed during the recursion until now
+     * @param   Form    $form   The form to recurse
      *
      * @return  array
      */
-    protected function recurseForm(Form $form, & $entirelyRequired = null, $elementsPassed = false)
+    protected function recurseForm(Form $form)
     {
-        $requiredLabels = array();
-        if ($form->getRequiredCue() !== null) {
-            $partiallyRequired = $partiallyOptional = false;
-            foreach ($form->getElements() as $element) {
-                if (! in_array($element->getType(), $this->blacklist)) {
-                    if (! $element->isRequired()) {
-                        $partiallyOptional = true;
-                        if ($entirelyRequired) {
-                            $entirelyRequired = false;
-                        }
-                    } else {
-                        $partiallyRequired = true;
-                        if (($label = $element->getDecorator('label')) !== false) {
-                            $requiredLabels[] = $label;
-                        }
-                    }
-                }
-            }
-
-            if (! $elementsPassed) {
-                $elementsPassed = $partiallyRequired || $partiallyOptional;
-                if ($entirelyRequired === null && $partiallyRequired) {
-                    $entirelyRequired = ! $partiallyOptional;
-                }
-            } elseif ($entirelyRequired === null && $partiallyRequired) {
-                $entirelyRequired = false;
-            }
-        }
-
         $descriptions = array($form->getDescriptions());
         foreach ($form->getSubForms() as $subForm) {
-            $descriptions[] = $this->recurseForm($subForm, $entirelyRequired, $elementsPassed);
-        }
-
-        if ($entirelyRequired) {
-            foreach ($requiredLabels as $label) {
-                $label->setRequiredSuffix('');
-            }
+            $descriptions[] = $this->recurseForm($subForm);
         }
 
         return call_user_func_array('array_merge', $descriptions);

From d5ba40ac19fe2bdd35a92841b815fdb3cbc50fc0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 30 Jun 2015 15:02:58 +0200
Subject: [PATCH 2440/2920] Form: Add hint support

Hints are short messages displayed at the bottom of a form
used to describe specific aspects on how to interact with
the form.

refs #8983
---
 library/Icinga/Web/Form.php                   |  51 +++++++
 .../Icinga/Web/Form/Decorator/FormHints.php   | 142 ++++++++++++++++++
 public/css/icinga/forms.less                  |  10 ++
 3 files changed, 203 insertions(+)
 create mode 100644 library/Icinga/Web/Form/Decorator/FormHints.php

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 24f0e2657..326730ac3 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -160,6 +160,13 @@ class Form extends Zend_Form
      */
     protected $notifications;
 
+    /**
+     * The hints of this form
+     *
+     * @var array
+     */
+    protected $hints;
+
     /**
      * Whether the Autosubmit decorator should be applied to this form
      *
@@ -566,6 +573,49 @@ class Form extends Zend_Form
         return $this->notifications;
     }
 
+    /**
+     * Set the hints for this form
+     *
+     * @param   array   $hints
+     *
+     * @return  $this
+     */
+    public function setHints(array $hints)
+    {
+        $this->hints = $hints;
+        return $this;
+    }
+
+    /**
+     * Add a hint for this form
+     *
+     * If $hint is an array the second value should be an
+     * array as well containing additional HTML properties.
+     *
+     * @param   string|array    $hint
+     *
+     * @return  $this
+     */
+    public function addHint($hint)
+    {
+        $this->hints[] = $hint;
+        return $this;
+    }
+
+    /**
+     * Return the hints of this form
+     *
+     * @return  array
+     */
+    public function getHints()
+    {
+        if ($this->hints === null) {
+            return array();
+        }
+
+        return $this->hints;
+    }
+
     /**
      * Set whether the Autosubmit decorator should be applied to this form
      *
@@ -1091,6 +1141,7 @@ class Form extends Zend_Form
                     ->addDecorator('FormNotifications')
                     ->addDecorator('FormErrors', array('onlyCustomFormErrors' => true))
                     ->addDecorator('FormElements')
+                    ->addDecorator('FormHints')
                     //->addDecorator('HtmlTag', array('tag' => 'dl', 'class' => 'zend_form'))
                     ->addDecorator('Form');
             }
diff --git a/library/Icinga/Web/Form/Decorator/FormHints.php b/library/Icinga/Web/Form/Decorator/FormHints.php
new file mode 100644
index 000000000..91e906684
--- /dev/null
+++ b/library/Icinga/Web/Form/Decorator/FormHints.php
@@ -0,0 +1,142 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Web\Form\Decorator;
+
+use Zend_Form_Decorator_Abstract;
+use Icinga\Web\Form;
+
+/**
+ * Decorator to add a list of hints at the top or bottom of a form
+ *
+ * The hint for required form elements is automatically being handled.
+ */
+class FormHints extends Zend_Form_Decorator_Abstract
+{
+    /**
+     * A list of element class names to be ignored when detecting which message to use to describe required elements
+     *
+     * @var array
+     */
+    protected $blacklist;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct($options = null)
+    {
+        parent::__construct($options);
+        $this->blacklist = array(
+            'Zend_Form_Element_Hidden',
+            'Zend_Form_Element_Submit',
+            'Zend_Form_Element_Button',
+            'Icinga\Web\Form\Element\Note',
+            'Icinga\Web\Form\Element\Button',
+            'Icinga\Web\Form\Element\CsrfCounterMeasure'
+        );
+    }
+
+    /**
+     * Render form hints
+     *
+     * @param   string      $content    The html rendered so far
+     *
+     * @return  string                  The updated html
+     */
+    public function render($content = '')
+    {
+        $form = $this->getElement();
+        if (! $form instanceof Form) {
+            return $content;
+        }
+
+        $view = $form->getView();
+        if ($view === null) {
+            return $content;
+        }
+
+        $hints = $this->recurseForm($form, $entirelyRequired);
+        if ($entirelyRequired !== null) {
+            $hints[] = $form->getView()->translate(sprintf(
+                'Required fields are marked with %s and must be filled in to complete the form.',
+                $form->getRequiredCue()
+            ));
+        }
+
+        if (empty($hints)) {
+            return $content;
+        }
+
+        $html = '<ul class="hints">';
+        foreach ($hints as $hint) {
+            if (is_array($hint)) {
+                list($hint, $properties) = $hint;
+                $html .= '<li' . $view->propertiesToString($properties) . '>' . $view->escape($hint) . '</li>';
+            } else {
+                $html .= '<li>' . $view->escape($hint) . '</li>';
+            }
+        }
+
+        switch ($this->getPlacement()) {
+            case self::APPEND:
+                return $content . $html . '</ul>';
+            case self::PREPEND:
+                return $html . '</ul>' . $content;
+        }
+    }
+
+    /**
+     * Recurse the given form and return the hints for it and all of its subforms
+     *
+     * @param   Form    $form               The form to recurse
+     * @param   mixed   $entirelyRequired   Set by reference, true means all elements in the hierarchy are
+     *                                       required, false only a partial subset and null none at all
+     * @param   bool    $elementsPassed     Whether there were any elements passed during the recursion until now
+     *
+     * @return  array
+     */
+    protected function recurseForm(Form $form, & $entirelyRequired = null, $elementsPassed = false)
+    {
+        $requiredLabels = array();
+        if ($form->getRequiredCue() !== null) {
+            $partiallyRequired = $partiallyOptional = false;
+            foreach ($form->getElements() as $element) {
+                if (! in_array($element->getType(), $this->blacklist)) {
+                    if (! $element->isRequired()) {
+                        $partiallyOptional = true;
+                        if ($entirelyRequired) {
+                            $entirelyRequired = false;
+                        }
+                    } else {
+                        $partiallyRequired = true;
+                        if (($label = $element->getDecorator('label')) !== false) {
+                            $requiredLabels[] = $label;
+                        }
+                    }
+                }
+            }
+
+            if (! $elementsPassed) {
+                $elementsPassed = $partiallyRequired || $partiallyOptional;
+                if ($entirelyRequired === null && $partiallyRequired) {
+                    $entirelyRequired = ! $partiallyOptional;
+                }
+            } elseif ($entirelyRequired === null && $partiallyRequired) {
+                $entirelyRequired = false;
+            }
+        }
+
+        $hints = array($form->getHints());
+        foreach ($form->getSubForms() as $subForm) {
+            $hints[] = $this->recurseForm($subForm, $entirelyRequired, $elementsPassed);
+        }
+
+        if ($entirelyRequired) {
+            foreach ($requiredLabels as $label) {
+                $label->setRequiredSuffix('');
+            }
+        }
+
+        return call_user_func_array('array_merge', $hints);
+    }
+}
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 42f04d7f3..3323520db 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -259,3 +259,13 @@ form ul.descriptions {
     }
   }
 }
+
+form ul.hints {
+  .non-list-like-list;
+  padding: 0.5em 0.5em 0 0.5em;
+
+  li {
+    font-size: 0.8em;
+    padding-bottom: 0.5em;
+  }
+}
\ No newline at end of file

From b61c9708bb0d94639b63c1048e09aacafab22b06 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 30 Jun 2015 15:05:57 +0200
Subject: [PATCH 2441/2920] main-content.less: Use a more friendlier color for
 info boxes

refs #8983
---
 public/css/icinga/main-content.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 72cffa19b..c51ef8722 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -104,7 +104,7 @@ table.benchmark {
 .info-box {
   padding: 0.5em;
   border: 1px solid lightgrey;
-  background-color: #fbfcc5;
+  background-color: #f2f4fd;
 }
 
 /* Action table */

From 0dc604029ac314e1c9ef921bfd851ec3b32ebedf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 30 Jun 2015 15:10:17 +0200
Subject: [PATCH 2442/2920] AdminAccountPage: Do not put an element's
 description at the top of the form

---
 .../setup/application/forms/AdminAccountPage.php   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 5118ce291..26e274443 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -89,9 +89,6 @@ class AdminAccountPage extends Form
         }
 
         if (count($choices) > 1) {
-            $this->addDescription($this->translate(
-                'Below are several options you can choose from for how to define the desired account.'
-            ));
             $this->addElement(
                 'select',
                 'user_type',
@@ -99,6 +96,7 @@ class AdminAccountPage extends Form
                     'required'      => true,
                     'autosubmit'    => true,
                     'label'         => $this->translate('Type Of Definition'),
+                    'description'   => $this->translate('Choose how to define the desired account.'),
                     'multiOptions'  => $choices,
                     'value'         => $choice
                 )
@@ -124,7 +122,7 @@ class AdminAccountPage extends Form
                     'label'         => $this->translate('Username'),
                     'description'   => $this->translate(
                         'Define the initial administrative account by providing a username that reflects'
-                        . ' a user created later or one that is authenticated using external mechanisms'
+                        . ' a user created later or one that is authenticated using external mechanisms.'
                     )
                 )
             );
@@ -139,7 +137,7 @@ class AdminAccountPage extends Form
                     'label'         => $this->translate('Username'),
                     'description'   => sprintf(
                         $this->translate(
-                            'Choose a user reported by the %s backend as the initial administrative account',
+                            'Choose a user reported by the %s backend as the initial administrative account.',
                             'setup.admin'
                         ),
                         $this->backendConfig['backend'] === 'db'
@@ -159,7 +157,7 @@ class AdminAccountPage extends Form
                     'required'      => true,
                     'label'         => $this->translate('Username'),
                     'description'   => $this->translate(
-                        'Enter the username to be used when creating an initial administrative account'
+                        'Enter the username to be used when creating an initial administrative account.'
                     )
                 )
             );
@@ -169,7 +167,7 @@ class AdminAccountPage extends Form
                 array(
                     'required'      => true,
                     'label'         => $this->translate('Password'),
-                    'description'   => $this->translate('Enter the password to assign to the newly created account')
+                    'description'   => $this->translate('Enter the password to assign to the newly created account.')
                 )
             );
             $this->addElement(
@@ -179,7 +177,7 @@ class AdminAccountPage extends Form
                     'required'      => true,
                     'label'         => $this->translate('Repeat password'),
                     'description'   => $this->translate(
-                        'Please repeat the password given above to avoid typing errors'
+                        'Please repeat the password given above to avoid typing errors.'
                     ),
                     'validators'    => array(
                         array('identical', false, array('new_user_password'))

From f615db01fee36d1c1fa299a1da1257890343ea15 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 1 Jul 2015 14:24:48 +0200
Subject: [PATCH 2443/2920] WebWizard: Show db resource config right after
 choosing db as auth type

refs #8709
---
 .../library/Monitoring/MonitoringWizard.php   |  5 +-
 .../forms/DatabaseCreationPage.php            |  1 -
 .../application/forms/DbResourcePage.php      |  1 -
 modules/setup/library/Setup/WebWizard.php     | 71 ++++++++-----------
 4 files changed, 34 insertions(+), 44 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index 496809c33..5b52d6c0e 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -52,8 +52,9 @@ class MonitoringWizard extends Wizard implements SetupWizard
             $this->getDirection() === static::FORWARD
             && ($page->getName() === 'setup_monitoring_ido' || $page->getName() === 'setup_monitoring_livestatus')
         ) {
-            if ((($dbResourceData = $this->getPageData('setup_db_resource')) !== null
-                 && $dbResourceData['name'] === $request->getPost('name'))
+            if (
+                (($authDbResourceData = $this->getPageData('setup_auth_db_resource')) !== null
+                 && $authDbResourceData['name'] === $request->getPost('name'))
                 || (($ldapResourceData = $this->getPageData('setup_ldap_resource')) !== null
                     && $ldapResourceData['name'] === $request->getPost('name'))
             ) {
diff --git a/modules/setup/application/forms/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php
index f92fce1c3..6f011775b 100644
--- a/modules/setup/application/forms/DatabaseCreationPage.php
+++ b/modules/setup/application/forms/DatabaseCreationPage.php
@@ -38,7 +38,6 @@ class DatabaseCreationPage extends Form
      */
     public function init()
     {
-        $this->setName('setup_database_creation');
         $this->setTitle($this->translate('Database Setup', 'setup.page.title'));
         $this->addDescription($this->translate(
             'It seems that either the database you defined earlier does not yet exist and cannot be created'
diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php
index 8844ced4c..e860ae95b 100644
--- a/modules/setup/application/forms/DbResourcePage.php
+++ b/modules/setup/application/forms/DbResourcePage.php
@@ -18,7 +18,6 @@ class DbResourcePage extends Form
      */
     public function init()
     {
-        $this->setName('setup_db_resource');
         $this->setTitle($this->translate('Database Resource', 'setup.page.title'));
         $this->addDescription($this->translate(
             'Now please configure your database resource. Note that the database itself does not need to'
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 96d39e63f..f30131f9c 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -100,14 +100,14 @@ class WebWizard extends Wizard implements SetupWizard
         $this->addPage(new RequirementsPage());
         $this->addPage(new AuthenticationPage());
         $this->addPage(new PreferencesPage());
-        $this->addPage(new DbResourcePage());
+        $this->addPage(new DbResourcePage(array('name' => 'setup_auth_db_resource')));
+        $this->addPage(new DatabaseCreationPage(array('name' => 'setup_auth_db_creation')));
         $this->addPage(new LdapDiscoveryPage());
         //$this->addPage(new LdapDiscoveryConfirmPage());
         $this->addPage(new LdapResourcePage());
         $this->addPage(new AuthBackendPage());
         $this->addPage(new AdminAccountPage());
         $this->addPage(new GeneralConfigPage());
-        $this->addPage(new DatabaseCreationPage());
         $this->addPage(new SummaryPage(array('name' => 'setup_summary')));
 
         if (($modulePageData = $this->getPageData('setup_modules')) !== null) {
@@ -137,7 +137,7 @@ class WebWizard extends Wizard implements SetupWizard
         } elseif ($page->getName() === 'setup_authentication_backend') {
             $authData = $this->getPageData('setup_authentication_type');
             if ($authData['type'] === 'db') {
-                $page->setResourceConfig($this->getPageData('setup_db_resource'));
+                $page->setResourceConfig($this->getPageData('setup_auth_db_resource'));
             } elseif ($authData['type'] === 'ldap') {
                 $page->setResourceConfig($this->getPageData('setup_ldap_resource'));
 
@@ -152,34 +152,20 @@ class WebWizard extends Wizard implements SetupWizard
             $page->setBackendConfig($this->getPageData('setup_authentication_backend'));
             $authData = $this->getPageData('setup_authentication_type');
             if ($authData['type'] === 'db') {
-                $page->setResourceConfig($this->getPageData('setup_db_resource'));
+                $page->setResourceConfig($this->getPageData('setup_auth_db_resource'));
             } elseif ($authData['type'] === 'ldap') {
                 $page->setResourceConfig($this->getPageData('setup_ldap_resource'));
             }
-        } elseif ($page->getName() === 'setup_database_creation') {
+        } elseif ($page->getName() === 'setup_auth_db_creation') {
             $page->setDatabaseSetupPrivileges(
                 array_unique(array_merge($this->databaseCreationPrivileges, $this->databaseSetupPrivileges))
             );
             $page->setDatabaseUsagePrivileges($this->databaseUsagePrivileges);
-            $page->setResourceConfig($this->getPageData('setup_db_resource'));
+            $page->setResourceConfig($this->getPageData('setup_auth_db_resource'));
         } elseif ($page->getName() === 'setup_summary') {
             $page->setSubjectTitle('Icinga Web 2');
             $page->setSummary($this->getSetup()->getSummary());
-        } elseif ($page->getName() === 'setup_db_resource') {
-            $ldapData = $this->getPageData('setup_ldap_resource');
-            if ($ldapData !== null && $request->getPost('name') === $ldapData['name']) {
-                $page->addError(
-                    mt('setup', 'The given resource name must be unique and is already in use by the LDAP resource')
-                );
-            }
         } elseif ($page->getName() === 'setup_ldap_resource') {
-            $dbData = $this->getPageData('setup_db_resource');
-            if ($dbData !== null && $request->getPost('name') === $dbData['name']) {
-                $page->addError(
-                    mt('setup', 'The given resource name must be unique and is already in use by the database resource')
-                );
-            }
-
             $suggestion = $this->getPageData('setup_ldap_discovery');
             if (isset($suggestion['resource'])) {
                 $page->populate($suggestion['resource']);
@@ -192,6 +178,11 @@ class WebWizard extends Wizard implements SetupWizard
                 $pageData = & $this->getPageData();
                 unset($pageData['setup_admin_account']);
                 unset($pageData['setup_authentication_backend']);
+
+                if ($authData['type'] === 'db') {
+                    unset($pageData['setup_auth_db_resource']);
+                    unset($pageData['setup_auth_db_creation']);
+                }
             }
         }
     }
@@ -203,7 +194,7 @@ class WebWizard extends Wizard implements SetupWizard
     {
         $skip = false;
         $newPage = parent::getNewPage($requestedPage, $originPage);
-        if ($newPage->getName() === 'setup_db_resource') {
+        if ($newPage->getName() === 'setup_auth_db_resource') {
             $prefData = $this->getPageData('setup_preferences_type');
             $authData = $this->getPageData('setup_authentication_type');
             $skip = $prefData['store'] !== 'db' && $authData['type'] !== 'db';
@@ -215,8 +206,8 @@ class WebWizard extends Wizard implements SetupWizard
         } elseif ($newPage->getName() === 'setup_ldap_resource') {
             $authData = $this->getPageData('setup_authentication_type');
             $skip = $authData['type'] !== 'ldap';
-        } elseif ($newPage->getName() === 'setup_database_creation') {
-            if (($config = $this->getPageData('setup_db_resource')) !== null && ! $config['skip_validation']) {
+        } elseif ($newPage->getName() === 'setup_auth_db_creation') {
+            if (($config = $this->getPageData('setup_auth_db_resource')) !== null && !$config['skip_validation']) {
                 $db = new DbTool($config);
 
                 try {
@@ -290,22 +281,22 @@ class WebWizard extends Wizard implements SetupWizard
         $pageData = $this->getPageData();
         $setup = new Setup();
 
-        if (isset($pageData['setup_db_resource'])
-            && ! $pageData['setup_db_resource']['skip_validation']
-            && (false === isset($pageData['setup_database_creation'])
-                || ! $pageData['setup_database_creation']['skip_validation']
+        if (isset($pageData['setup_auth_db_resource'])
+            && !$pageData['setup_auth_db_resource']['skip_validation']
+            && (! isset($pageData['setup_auth_db_creation'])
+                || !$pageData['setup_auth_db_creation']['skip_validation']
             )
         ) {
             $setup->addStep(
                 new DatabaseStep(array(
                     'tables'            => $this->databaseTables,
                     'privileges'        => $this->databaseUsagePrivileges,
-                    'resourceConfig'    => $pageData['setup_db_resource'],
-                    'adminName'         => isset($pageData['setup_database_creation']['username'])
-                        ? $pageData['setup_database_creation']['username']
+                    'resourceConfig'    => $pageData['setup_auth_db_resource'],
+                    'adminName'         => isset($pageData['setup_auth_db_creation']['username'])
+                        ? $pageData['setup_auth_db_creation']['username']
                         : null,
-                    'adminPassword'     => isset($pageData['setup_database_creation']['password'])
-                        ? $pageData['setup_database_creation']['password']
+                    'adminPassword'     => isset($pageData['setup_auth_db_creation']['password'])
+                        ? $pageData['setup_auth_db_creation']['password']
                         : null,
                     'schemaPath'        => Config::module('setup')
                         ->get('schema', 'path', Icinga::app()->getBaseDir('etc' . DIRECTORY_SEPARATOR . 'schema'))
@@ -325,12 +316,12 @@ class WebWizard extends Wizard implements SetupWizard
 
         $adminAccountType = $pageData['setup_admin_account']['user_type'];
         $adminAccountData = array('username' => $pageData['setup_admin_account'][$adminAccountType]);
-        if ($adminAccountType === 'new_user' && ! $pageData['setup_db_resource']['skip_validation']
-            && (false === isset($pageData['setup_database_creation'])
-                || ! $pageData['setup_database_creation']['skip_validation']
+        if ($adminAccountType === 'new_user' && !$pageData['setup_auth_db_resource']['skip_validation']
+            && (! isset($pageData['setup_auth_db_creation'])
+                || !$pageData['setup_auth_db_creation']['skip_validation']
             )
         ) {
-            $adminAccountData['resourceConfig'] = $pageData['setup_db_resource'];
+            $adminAccountData['resourceConfig'] = $pageData['setup_auth_db_resource'];
             $adminAccountData['password'] = $pageData['setup_admin_account']['new_user_password'];
         }
         $authType = $pageData['setup_authentication_type']['type'];
@@ -338,17 +329,17 @@ class WebWizard extends Wizard implements SetupWizard
             new AuthenticationStep(array(
                 'adminAccountData'  => $adminAccountData,
                 'backendConfig'     => $pageData['setup_authentication_backend'],
-                'resourceName'      => $authType === 'db' ? $pageData['setup_db_resource']['name'] : (
+                'resourceName'      => $authType === 'db' ? $pageData['setup_auth_db_resource']['name'] : (
                     $authType === 'ldap' ? $pageData['setup_ldap_resource']['name'] : null
                 )
             ))
         );
 
-        if (isset($pageData['setup_db_resource']) || isset($pageData['setup_ldap_resource'])) {
+        if (isset($pageData['setup_auth_db_resource']) || isset($pageData['setup_ldap_resource'])) {
             $setup->addStep(
                 new ResourceStep(array(
-                    'dbResourceConfig'      => isset($pageData['setup_db_resource'])
-                        ? array_diff_key($pageData['setup_db_resource'], array('skip_validation' => null))
+                    'dbResourceConfig'      => isset($pageData['setup_auth_db_resource'])
+                        ? array_diff_key($pageData['setup_auth_db_resource'], array('skip_validation' => null))
                         : null,
                     'ldapResourceConfig'    => isset($pageData['setup_ldap_resource'])
                         ? array_diff_key($pageData['setup_ldap_resource'], array('skip_validation' => null))

From 87cdd49b1c1367de776d79213492bf492962e613 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 1 Jul 2015 14:25:43 +0200
Subject: [PATCH 2444/2920] AdminAccountPage: Fix username validation

---
 modules/setup/application/forms/AdminAccountPage.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 5118ce291..2d3e9d712 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -202,7 +202,7 @@ class AdminAccountPage extends Form
             return false;
         }
 
-        if ($data['user_type'] === 'new_user' && !$this->hasUser($data['new_user'])) {
+        if ($data['user_type'] === 'new_user' && $this->hasUser($data['new_user'])) {
             $this->getElement('new_user')->addError($this->translate('Username already exists.'));
             return false;
         }
@@ -255,7 +255,11 @@ class AdminAccountPage extends Form
      */
     protected function hasUser($username)
     {
-        return $this->createBackend()->select()->where('user_name', $username)->count() > 1;
+        try {
+            return $this->createBackend()->select()->where('user_name', $username)->count() > 1;
+        } catch (Exception $_) {
+            return null;
+        }
     }
 
     /**

From 5b908d85bb60b6ba0d4bc36b06bf1faa8714578e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 30 Jun 2015 14:25:33 +0200
Subject: [PATCH 2445/2920] Form: Fix notifications

* Coding style issues
* Notifications were not grouped by type
* Notifications of sub-forms were overwriting existing ones
(cherry picked from commit 147f6be714468c700b3c6987c9dc322c7a0ad9a2)
---
 library/Icinga/Web/Form.php                   | 127 +++++++++++-------
 .../Web/Form/Decorator/FormNotifications.php  |  50 ++++---
 public/css/icinga/forms.less                  |  27 ++--
 3 files changed, 127 insertions(+), 77 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 679091fde..e2ee66d0a 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -39,26 +39,19 @@ class Form extends Zend_Form
     const DEFAULT_SUFFIX = '_default';
 
     /**
-     * The type of the notification for the error
+     * Identifier for notifications of type error
      */
-    const NOTIFICATION_ERROR    = 0;
+    const NOTIFICATION_ERROR = 0;
 
     /**
-     * The type of the notification for the warning
+     * Identifier for notifications of type warning
      */
-    const NOTIFICATION_WARNING  = 2;
+    const NOTIFICATION_WARNING = 1;
 
     /**
-     * The type of the notification for the info
+     * Identifier for notifications of type info
      */
-    const NOTIFICATION_INFO     = 4;
-
-    /**
-     * The notifications of the form
-     *
-     * @var array
-     */
-    protected $notifications = array();
+    const NOTIFICATION_INFO = 2;
 
     /**
      * Whether this form has been created
@@ -160,6 +153,13 @@ class Form extends Zend_Form
      */
     protected $descriptions;
 
+    /**
+     * The notifications of this form
+     *
+     * @var array
+     */
+    protected $notifications;
+
     /**
      * Whether the Autosubmit decorator should be applied to this form
      *
@@ -522,6 +522,50 @@ class Form extends Zend_Form
         return $this->descriptions;
     }
 
+    /**
+     * Set the notifications for this form
+     *
+     * @param   array   $notifications
+     *
+     * @return  $this
+     */
+    public function setNotifications(array $notifications)
+    {
+        $this->notifications = $notifications;
+        return $this;
+    }
+
+    /**
+     * Add a notification for this form
+     *
+     * If $notification is an array the second value should be
+     * an array as well containing additional HTML properties.
+     *
+     * @param   string|array    $notification
+     * @param   int             $type
+     *
+     * @return  $this
+     */
+    public function addNotification($notification, $type)
+    {
+        $this->notifications[$type][] = $notification;
+        return $this;
+    }
+
+    /**
+     * Return the notifications of this form
+     *
+     * @return  array
+     */
+    public function getNotifications()
+    {
+        if ($this->notifications === null) {
+            return array();
+        }
+
+        return $this->notifications;
+    }
+
     /**
      * Set whether the Autosubmit decorator should be applied to this form
      *
@@ -1264,55 +1308,48 @@ class Form extends Zend_Form
     }
 
     /**
-     * Return all form notifications
+     * Add a error notification and prevent the form from being successfully validated
      *
-     * @return array
-     */
-    public function getNotifications()
-    {
-        return $this->notifications;
-    }
-
-    /**
-     * Add a typed message to the notifications
+     * @param   string|array    $message    The notfication's message
      *
-     * @param string    $message    The message which would be displayed to the user
-     *
-     * @param int       $type       The type of the message notification
-     */
-    public function addNotification($message, $type = self::NOTIFICATION_ERROR)
-    {
-        $this->notifications[$message] = $type;
-        $this->markAsError();
-    }
-
-    /**
-     * Add a error message to notifications
-     *
-     * @param string $message
+     * @return  $this
      */
     public function error($message)
     {
-        $this->addNotification($message, $type = self::NOTIFICATION_ERROR);
+        $this->addNotification($message, self::NOTIFICATION_ERROR);
+        $this->markAsError();
+        return $this;
     }
 
     /**
-     * Add a warning message to notifications
+     * Add a warning notification and prevent the form from being successfully validated
      *
-     * @param string $message
+     * @param   string|array    $message    The notfication's message
+     *
+     * @return  $this
      */
     public function warning($message)
     {
-        $this->addNotification($message, $type = self::NOTIFICATION_WARNING);
+        $this->addNotification($message, self::NOTIFICATION_WARNING);
+        $this->markAsError();
+        return $this;
     }
 
     /**
-     * Add a info message to notifications
+     * Add a info notification
      *
-     * @param string $message
+     * @param   string|array    $message        The notfication's message
+     * @param   bool            $markAsError    Whether to prevent the form from being successfully validated or not
+     *
+     * @return  $this
      */
-    public function info($message)
+    public function info($message, $markAsError = true)
     {
-        $this->addNotification($message, $type = self::NOTIFICATION_INFO);
+        $this->addNotification($message, self::NOTIFICATION_INFO);
+        if ($markAsError) {
+            $this->markAsError();
+        }
+
+        return $this;
     }
 }
diff --git a/library/Icinga/Web/Form/Decorator/FormNotifications.php b/library/Icinga/Web/Form/Decorator/FormNotifications.php
index ed725e625..935c0ce41 100644
--- a/library/Icinga/Web/Form/Decorator/FormNotifications.php
+++ b/library/Icinga/Web/Form/Decorator/FormNotifications.php
@@ -4,15 +4,16 @@
 namespace Icinga\Web\Form\Decorator;
 
 use Zend_Form_Decorator_Abstract;
-use Icinga\Web\Form as Form;
+use Icinga\Exception\ProgrammingError;
+use Icinga\Web\Form;
 
 /**
- * Decorator to add a list of notifications at the top of a form
+ * Decorator to add a list of notifications at the top or bottom of a form
  */
 class FormNotifications extends Zend_Form_Decorator_Abstract
 {
     /**
-     * Render form descriptions
+     * Render form notifications
      *
      * @param   string      $content    The html rendered so far
      *
@@ -31,16 +32,27 @@ class FormNotifications extends Zend_Form_Decorator_Abstract
         }
 
         $notifications = $this->recurseForm($form);
-
         if (empty($notifications)) {
             return $content;
         }
 
         $html = '<ul class="form-notifications">';
+        foreach (array(Form::NOTIFICATION_ERROR, Form::NOTIFICATION_WARNING, Form::NOTIFICATION_INFO) as $type) {
+            if (isset($notifications[$type])) {
+                $html .= '<li><ul class="' . $this->getNotificationTypeName($type) . '">';
+                foreach ($notifications[$type] as $message) {
+                    if (is_array($message)) {
+                        list($message, $properties) = $message;
+                        $html .= '<li' . $view->propertiesToString($properties) . '>'
+                            . $view->escape($message)
+                            . '</li>';
+                    } else {
+                        $html .= '<li>' . $view->escape($message) . '</li>';
+                    }
+                }
 
-        asort($notifications);
-        foreach ($notifications as $message => $type) {
-            $html .= '<li class="'.self::getNotificationTypeName($type).'">' . $view->escape($message) . '</li>';
+                $html .= '</ul></li>';
+            }
         }
 
         switch ($this->getPlacement()) {
@@ -54,42 +66,44 @@ class FormNotifications extends Zend_Form_Decorator_Abstract
     /**
      * Recurse the given form and return the notifications for it and all of its subforms
      *
-     * @param   Form    $form       The form to recurse
+     * @param   Form    $form   The form to recurse
      *
-     * @return array
+     * @return  array
      */
     protected function recurseForm(Form $form)
     {
         $notifications = $form->getNotifications();
-
         foreach ($form->getSubForms() as $subForm) {
-            $notifications = $notifications + $this->recurseForm($subForm);
+            foreach ($this->recurseForm($subForm) as $type => $messages) {
+                foreach ($messages as $message) {
+                    $notifications[$type][] = $message;
+                }
+            }
         }
 
         return $notifications;
     }
 
     /**
-     * Get the readable type name of the notification
+     * Return the name for the given notification type
      *
-     * @param   $type       Type of the message
+     * @param   int     $type
      *
      * @return  string
+     *
+     * @throws  ProgrammingError    In case the given type is invalid
      */
-    public static function getNotificationTypeName($type)
+    protected function getNotificationTypeName($type)
     {
         switch ($type) {
             case Form::NOTIFICATION_ERROR:
                 return 'error';
-                break;
             case Form::NOTIFICATION_WARNING:
                 return 'warning';
-                break;
             case Form::NOTIFICATION_INFO:
                 return 'info';
-                break;
             default:
-                return 'unknown';
+                throw new ProgrammingError('Invalid notification type "%s" provided', $type);
         }
     }
 }
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 91ae82682..42f04d7f3 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -139,7 +139,6 @@ form div.element ul.errors {
   li {
     color: @colorCritical;
     font-weight: bold;
-    line-height: 1.5em;
   }
 }
 
@@ -160,33 +159,33 @@ form ul.form-errors {
   li {
     color: white;
     font-weight: bold;
-    line-height: 1.5em;
   }
 }
 
 form ul.form-notifications {
   .non-list-like-list;
   margin-bottom: 1em;
-  padding: 0em;
+  padding: 0;
 
-  li.info {
-    background: @colorFormNotificationInfo;
-  }
+  ul {
+    .non-list-like-list;
 
-  li.warning {
-    background: @colorFormNotificationWarning;
-  }
+    &.info {
+      background-color: @colorFormNotificationInfo;
+    }
 
-  li.error {
-    background: @colorFormNotificationError;
+    &.warning {
+      background-color: @colorFormNotificationWarning;
+    }
+
+    &.error {
+      background-color: @colorFormNotificationError;
+    }
   }
 
   li {
     color: white;
     font-weight: bold;
-    line-height: 1.5em;
-    padding: 0.5em;
-    margin-bottom: 0.5em;
   }
 }
 

From 066b3d9e2898494026516f4cc787fdbc9fe0e67f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 1 Jul 2015 15:41:45 +0200
Subject: [PATCH 2446/2920] ApplicationConfigForm: Make preference options be
 global options

refs #8709
---
 application/controllers/PreferenceController.php     | 12 ++++++++----
 .../forms/Config/General/ApplicationConfigForm.php   |  7 +++----
 library/Icinga/Authentication/Manager.php            |  8 ++++++--
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/application/controllers/PreferenceController.php b/application/controllers/PreferenceController.php
index ac67f495b..a466ed48f 100644
--- a/application/controllers/PreferenceController.php
+++ b/application/controllers/PreferenceController.php
@@ -6,6 +6,7 @@ use Icinga\Web\Url;
 use Icinga\Web\Widget\Tab;
 use Icinga\Application\Config;
 use Icinga\Forms\PreferenceForm;
+use Icinga\Data\ConfigObject;
 use Icinga\User\Preferences\PreferencesStore;
 
 /**
@@ -38,13 +39,16 @@ class PreferenceController extends BasePreferenceController
      */
     public function indexAction()
     {
-        $storeConfig = Config::app()->getSection('preferences');
-
+        $config = Config::app()->getSection('global');
         $user = $this->getRequest()->getUser();
+
         $form = new PreferenceForm();
         $form->setPreferences($user->getPreferences());
-        if ($storeConfig->get('store', 'ini') !== 'none') {
-            $form->setStore(PreferencesStore::create($storeConfig, $user));
+        if ($config->get('config_backend', 'ini') !== 'none') {
+            $form->setStore(PreferencesStore::create(new ConfigObject(array(
+                'store'     => $config->get('config_backend', 'ini'),
+                'resource'  => $config->config_resource
+            )), $user));
         }
         $form->handleRequest();
 
diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php
index 64f8855c8..618178344 100644
--- a/application/forms/Config/General/ApplicationConfigForm.php
+++ b/application/forms/Config/General/ApplicationConfigForm.php
@@ -7,7 +7,6 @@ use Icinga\Application\Icinga;
 use Icinga\Data\ResourceFactory;
 use Icinga\Web\Form;
 
-
 /**
  * Form class to modify the general application configuration
  */
@@ -43,7 +42,7 @@ class ApplicationConfigForm extends Form
 
         $this->addElement(
             'select',
-            'preferences_store',
+            'global_config_backend',
             array(
                 'required'      => true,
                 'autosubmit'    => true,
@@ -55,7 +54,7 @@ class ApplicationConfigForm extends Form
                 )
             )
         );
-        if (isset($formData['preferences_store']) && $formData['preferences_store'] === 'db') {
+        if (isset($formData['global_config_backend']) && $formData['global_config_backend'] === 'db') {
             $backends = array();
             foreach (ResourceFactory::getResourceConfigs()->toArray() as $name => $resource) {
                 if ($resource['type'] === 'db') {
@@ -65,7 +64,7 @@ class ApplicationConfigForm extends Form
 
             $this->addElement(
                 'select',
-                'preferences_resource',
+                'global_config_resource',
                 array(
                     'required'      => true,
                     'multiOptions'  => $backends,
diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index fed012ab5..01173330a 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -6,6 +6,7 @@ namespace Icinga\Authentication;
 use Exception;
 use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Application\Config;
+use Icinga\Data\ConfigObject;
 use Icinga\Exception\IcingaException;
 use Icinga\Exception\NotReadableError;
 use Icinga\Application\Logger;
@@ -63,8 +64,11 @@ class Manager
             );
             $config = new Config();
         }
-        if ($config->get('preferences', 'store', 'ini') !== 'none') {
-            $preferencesConfig = $config->getSection('preferences');
+        if ($config->get('global', 'config_backend', 'ini') !== 'none') {
+            $preferencesConfig = new ConfigObject(array(
+                'store'     => $config->get('global', 'config_backend', 'ini'),
+                'resource'  => $config->get('global', 'config_resource')
+            ));
             try {
                 $preferencesStore = PreferencesStore::create(
                     $preferencesConfig,

From 7795ad4f95e1bf14c55a0c015942b3c87d16c1d0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 1 Jul 2015 16:02:40 +0200
Subject: [PATCH 2447/2920] WebWizard: Drop preferences page and include
 ApplicationConfigForm instead

refs #8709
---
 .../library/Monitoring/MonitoringWizard.php   |   6 +-
 .../application/forms/GeneralConfigPage.php   |  13 ++-
 .../application/forms/PreferencesPage.php     |  47 --------
 .../library/Setup/Steps/GeneralConfigStep.php |  15 +--
 modules/setup/library/Setup/WebWizard.php     | 105 +++++++++++++-----
 5 files changed, 99 insertions(+), 87 deletions(-)
 delete mode 100644 modules/setup/application/forms/PreferencesPage.php

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index 5b52d6c0e..19a29f60b 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -55,8 +55,10 @@ class MonitoringWizard extends Wizard implements SetupWizard
             if (
                 (($authDbResourceData = $this->getPageData('setup_auth_db_resource')) !== null
                  && $authDbResourceData['name'] === $request->getPost('name'))
-                || (($ldapResourceData = $this->getPageData('setup_ldap_resource')) !== null
-                    && $ldapResourceData['name'] === $request->getPost('name'))
+                || (($configDbResourceData = $this->getPageData('setup_config_db_resource')) !== null
+                    && $configDbResourceData['name'] === $request->getPost('name'))
+                    || (($ldapResourceData = $this->getPageData('setup_ldap_resource')) !== null
+                        && $ldapResourceData['name'] === $request->getPost('name'))
             ) {
                 $page->addError(mt('monitoring', 'The given resource name is already in use.'));
             }
diff --git a/modules/setup/application/forms/GeneralConfigPage.php b/modules/setup/application/forms/GeneralConfigPage.php
index c50d77293..922b1428f 100644
--- a/modules/setup/application/forms/GeneralConfigPage.php
+++ b/modules/setup/application/forms/GeneralConfigPage.php
@@ -3,8 +3,9 @@
 
 namespace Icinga\Module\Setup\Forms;
 
-use Icinga\Web\Form;
+use Icinga\Forms\Config\General\ApplicationConfigForm;
 use Icinga\Forms\Config\General\LoggingConfigForm;
+use Icinga\Web\Form;
 
 /**
  * Wizard page to define the application and logging configuration
@@ -28,7 +29,13 @@ class GeneralConfigPage extends Form
      */
     public function createElements(array $formData)
     {
-        $loggingForm = new LoggingConfigForm();
-        $this->addElements($loggingForm->createElements($formData)->getElements());
+        $appConfigForm = new ApplicationConfigForm();
+        $appConfigForm->createElements($formData);
+        $appConfigForm->removeElement('global_module_path');
+        $appConfigForm->removeElement('global_config_resource');
+        $this->addElements($appConfigForm->getElements());
+
+        $loggingConfigForm = new LoggingConfigForm();
+        $this->addElements($loggingConfigForm->createElements($formData)->getElements());
     }
 }
diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
deleted file mode 100644
index fdd5844cf..000000000
--- a/modules/setup/application/forms/PreferencesPage.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\Module\Setup\Forms;
-
-use Icinga\Web\Form;
-use Icinga\Application\Platform;
-
-/**
- * Wizard page to choose a preference backend
- */
-class PreferencesPage extends Form
-{
-    /**
-     * Initialize this page
-     */
-    public function init()
-    {
-        $this->setRequiredCue(null);
-        $this->setName('setup_preferences_type');
-        $this->setTitle($this->translate('Preferences', 'setup.page.title'));
-        $this->addDescription($this->translate('Please choose how Icinga Web 2 should store user preferences.'));
-    }
-
-    /**
-     * @see Form::createElements()
-     */
-    public function createElements(array $formData)
-    {
-        $storageTypes = array();
-        $storageTypes['ini'] = $this->translate('File System (INI Files)');
-        if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {
-            $storageTypes['db'] = $this->translate('Database');
-        }
-        $storageTypes['none'] = $this->translate('Don\'t Store Preferences');
-
-        $this->addElement(
-            'select',
-            'store',
-            array(
-                'required'      => true,
-                'label'         => $this->translate('User Preference Storage Type'),
-                'multiOptions'  => $storageTypes
-            )
-        );
-    }
-}
diff --git a/modules/setup/library/Setup/Steps/GeneralConfigStep.php b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
index 84ac446c1..86462bbb0 100644
--- a/modules/setup/library/Setup/Steps/GeneralConfigStep.php
+++ b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
@@ -23,13 +23,12 @@ class GeneralConfigStep extends Step
     {
         $config = array();
         foreach ($this->data['generalConfig'] as $sectionAndPropertyName => $value) {
-            list($section, $property) = explode('_', $sectionAndPropertyName);
+            list($section, $property) = explode('_', $sectionAndPropertyName, 2);
             $config[$section][$property] = $value;
         }
 
-        $config['preferences']['store'] = $this->data['preferencesStore'];
-        if (isset($this->data['preferencesResource'])) {
-            $config['preferences']['resource'] = $this->data['preferencesResource'];
+        if ($config['global']['config_backend'] === 'db') {
+            $config['global']['config_resource'] = $this->data['resourceName'];
         }
 
         try {
@@ -54,14 +53,10 @@ class GeneralConfigStep extends Step
         $generalHtml = ''
             . '<ul>'
             . '<li>' . sprintf(
-                $this->data['preferencesStore'] === 'ini' ? sprintf(
+                $this->data['generalConfig']['global_config_backend'] === 'ini' ? sprintf(
                     t('Preferences will be stored per user account in INI files at: %s'),
                     Config::resolvePath('preferences')
-                ) : (
-                    $this->data['preferencesStore'] === 'db' ? t('Preferences will be stored using a database.') : (
-                        t('Preferences will not be persisted across browser sessions.')
-                    )
-                )
+                ) : t('Preferences will be stored using a database.')
             ) . '</li>'
             . '</ul>';
 
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index f30131f9c..9296cb370 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -13,7 +13,6 @@ use Icinga\Module\Setup\Forms\ModulePage;
 use Icinga\Module\Setup\Forms\WelcomePage;
 use Icinga\Module\Setup\Forms\SummaryPage;
 use Icinga\Module\Setup\Forms\DbResourcePage;
-use Icinga\Module\Setup\Forms\PreferencesPage;
 use Icinga\Module\Setup\Forms\AuthBackendPage;
 use Icinga\Module\Setup\Forms\AdminAccountPage;
 use Icinga\Module\Setup\Forms\LdapDiscoveryPage;
@@ -99,7 +98,6 @@ class WebWizard extends Wizard implements SetupWizard
         $this->addPage(new ModulePage());
         $this->addPage(new RequirementsPage());
         $this->addPage(new AuthenticationPage());
-        $this->addPage(new PreferencesPage());
         $this->addPage(new DbResourcePage(array('name' => 'setup_auth_db_resource')));
         $this->addPage(new DatabaseCreationPage(array('name' => 'setup_auth_db_creation')));
         $this->addPage(new LdapDiscoveryPage());
@@ -108,6 +106,8 @@ class WebWizard extends Wizard implements SetupWizard
         $this->addPage(new AuthBackendPage());
         $this->addPage(new AdminAccountPage());
         $this->addPage(new GeneralConfigPage());
+        $this->addPage(new DbResourcePage(array('name' => 'setup_config_db_resource')));
+        $this->addPage(new DatabaseCreationPage(array('name' => 'setup_config_db_creation')));
         $this->addPage(new SummaryPage(array('name' => 'setup_summary')));
 
         if (($modulePageData = $this->getPageData('setup_modules')) !== null) {
@@ -125,15 +125,6 @@ class WebWizard extends Wizard implements SetupWizard
     {
         if ($page->getName() === 'setup_requirements') {
             $page->setWizard($this);
-        } elseif ($page->getName() === 'setup_preferences_type') {
-            $authData = $this->getPageData('setup_authentication_type');
-            if ($authData['type'] === 'db') {
-                $page->create()->getElement('store')->setValue('db');
-                $page->addDescription(mt(
-                    'setup',
-                    'Note that choosing "Database" causes Icinga Web 2 to use the same database as for authentication.'
-                ));
-            }
         } elseif ($page->getName() === 'setup_authentication_backend') {
             $authData = $this->getPageData('setup_authentication_type');
             if ($authData['type'] === 'db') {
@@ -156,20 +147,42 @@ class WebWizard extends Wizard implements SetupWizard
             } elseif ($authData['type'] === 'ldap') {
                 $page->setResourceConfig($this->getPageData('setup_ldap_resource'));
             }
-        } elseif ($page->getName() === 'setup_auth_db_creation') {
+        } elseif ($page->getName() === 'setup_auth_db_creation' || $page->getName() === 'setup_config_db_creation') {
             $page->setDatabaseSetupPrivileges(
                 array_unique(array_merge($this->databaseCreationPrivileges, $this->databaseSetupPrivileges))
             );
             $page->setDatabaseUsagePrivileges($this->databaseUsagePrivileges);
-            $page->setResourceConfig($this->getPageData('setup_auth_db_resource'));
+            $page->setResourceConfig(
+                $this->getPageData('setup_auth_db_resource') ?: $this->getPageData('setup_config_db_resource')
+            );
         } elseif ($page->getName() === 'setup_summary') {
             $page->setSubjectTitle('Icinga Web 2');
             $page->setSummary($this->getSetup()->getSummary());
+        } elseif ($page->getName() === 'setup_config_db_resource') {
+            $ldapData = $this->getPageData('setup_ldap_resource');
+            if ($ldapData !== null && $request->getPost('name') === $ldapData['name']) {
+                $page->error(
+                    mt('setup', 'The given resource name must be unique and is already in use by the LDAP resource')
+                );
+            }
         } elseif ($page->getName() === 'setup_ldap_resource') {
             $suggestion = $this->getPageData('setup_ldap_discovery');
             if (isset($suggestion['resource'])) {
                 $page->populate($suggestion['resource']);
             }
+        } elseif ($page->getName() === 'setup_general_config') {
+            $authData = $this->getPageData('setup_authentication_type');
+            if ($authData['type'] === 'db') {
+                $page->create()->getElement('global_config_backend')->setValue('db');
+                $page->info(
+                    mt(
+                        'setup',
+                        'Note that choosing "Database" as preference storage causes'
+                        . ' Icinga Web 2 to use the same database as for authentication.'
+                    ),
+                    false
+                );
+            }
         } elseif ($page->getName() === 'setup_authentication_type' && $this->getDirection() === static::FORWARD) {
             $authData = $this->getPageData($page->getName());
             if ($authData !== null && $request->getPost('type') !== $authData['type']) {
@@ -182,6 +195,9 @@ class WebWizard extends Wizard implements SetupWizard
                 if ($authData['type'] === 'db') {
                     unset($pageData['setup_auth_db_resource']);
                     unset($pageData['setup_auth_db_creation']);
+                } elseif ($request->getPost('type') === 'db') {
+                    unset($pageData['setup_config_db_resource']);
+                    unset($pageData['setup_config_db_creation']);
                 }
             }
         }
@@ -195,9 +211,8 @@ class WebWizard extends Wizard implements SetupWizard
         $skip = false;
         $newPage = parent::getNewPage($requestedPage, $originPage);
         if ($newPage->getName() === 'setup_auth_db_resource') {
-            $prefData = $this->getPageData('setup_preferences_type');
             $authData = $this->getPageData('setup_authentication_type');
-            $skip = $prefData['store'] !== 'db' && $authData['type'] !== 'db';
+            $skip = $authData['type'] !== 'db';
         } elseif ($newPage->getname() === 'setup_ldap_discovery') {
             $authData = $this->getPageData('setup_authentication_type');
             $skip = $authData['type'] !== 'ldap';
@@ -206,8 +221,16 @@ class WebWizard extends Wizard implements SetupWizard
         } elseif ($newPage->getName() === 'setup_ldap_resource') {
             $authData = $this->getPageData('setup_authentication_type');
             $skip = $authData['type'] !== 'ldap';
-        } elseif ($newPage->getName() === 'setup_auth_db_creation') {
-            if (($config = $this->getPageData('setup_auth_db_resource')) !== null && !$config['skip_validation']) {
+        } elseif ($newPage->getName() === 'setup_config_db_resource') {
+            $authData = $this->getPageData('setup_authentication_type');
+            $skip = $authData['type'] === 'db';
+        } elseif (in_array($newPage->getName(), array('setup_auth_db_creation', 'setup_config_db_creation'))) {
+            if (
+                ($newPage->getName() === 'setup_auth_db_creation' || $this->hasPageData('setup_config_db_resource'))
+                && (($config = $this->getPageData('setup_auth_db_resource')) !== null
+                    || ($config = $this->getPageData('setup_config_db_resource')) !== null)
+                    && !$config['skip_validation']
+            ) {
                 $db = new DbTool($config);
 
                 try {
@@ -281,7 +304,8 @@ class WebWizard extends Wizard implements SetupWizard
         $pageData = $this->getPageData();
         $setup = new Setup();
 
-        if (isset($pageData['setup_auth_db_resource'])
+        if (
+            isset($pageData['setup_auth_db_resource'])
             && !$pageData['setup_auth_db_resource']['skip_validation']
             && (! isset($pageData['setup_auth_db_creation'])
                 || !$pageData['setup_auth_db_creation']['skip_validation']
@@ -302,15 +326,39 @@ class WebWizard extends Wizard implements SetupWizard
                         ->get('schema', 'path', Icinga::app()->getBaseDir('etc' . DIRECTORY_SEPARATOR . 'schema'))
                 ))
             );
+        } elseif (
+            isset($pageData['setup_config_db_resource'])
+            && !$pageData['setup_config_db_resource']['skip_validation']
+            && (! isset($pageData['setup_config_db_creation'])
+                || !$pageData['setup_config_db_creation']['skip_validation']
+            )
+        ) {
+            $setup->addStep(
+                new DatabaseStep(array(
+                    'tables'            => $this->databaseTables,
+                    'privileges'        => $this->databaseUsagePrivileges,
+                    'resourceConfig'    => $pageData['setup_config_db_resource'],
+                    'adminName'         => isset($pageData['setup_config_db_creation']['username'])
+                        ? $pageData['setup_config_db_creation']['username']
+                        : null,
+                    'adminPassword'     => isset($pageData['setup_config_db_creation']['password'])
+                        ? $pageData['setup_config_db_creation']['password']
+                        : null,
+                    'schemaPath'        => Config::module('setup')
+                        ->get('schema', 'path', Icinga::app()->getBaseDir('etc' . DIRECTORY_SEPARATOR . 'schema'))
+                ))
+            );
         }
 
         $setup->addStep(
             new GeneralConfigStep(array(
-                'generalConfig'         => $pageData['setup_general_config'],
-                'preferencesStore'       => $pageData['setup_preferences_type']['store'],
-                'preferencesResource'   => isset($pageData['setup_db_resource']['name'])
-                    ? $pageData['setup_db_resource']['name']
-                    : null
+                'generalConfig' => $pageData['setup_general_config'],
+                'resourceName'  => isset($pageData['setup_auth_db_resource']['name'])
+                    ? $pageData['setup_auth_db_resource']['name']
+                    : (isset($pageData['setup_config_db_resource']['name'])
+                        ? $pageData['setup_config_db_resource']['name']
+                        : null
+                    )
             ))
         );
 
@@ -335,12 +383,19 @@ class WebWizard extends Wizard implements SetupWizard
             ))
         );
 
-        if (isset($pageData['setup_auth_db_resource']) || isset($pageData['setup_ldap_resource'])) {
+        if (
+            isset($pageData['setup_auth_db_resource'])
+            || isset($pageData['setup_config_db_resource'])
+            || isset($pageData['setup_ldap_resource'])
+        ) {
             $setup->addStep(
                 new ResourceStep(array(
                     'dbResourceConfig'      => isset($pageData['setup_auth_db_resource'])
                         ? array_diff_key($pageData['setup_auth_db_resource'], array('skip_validation' => null))
-                        : null,
+                        : (isset($pageData['setup_config_db_resource'])
+                            ? array_diff_key($pageData['setup_config_db_resource'], array('skip_validation' => null))
+                            : null
+                        ),
                     'ldapResourceConfig'    => isset($pageData['setup_ldap_resource'])
                         ? array_diff_key($pageData['setup_ldap_resource'], array('skip_validation' => null))
                         : null

From ac786619436371110dd2ca288ec3f83ce475aef5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 2 Jul 2015 09:23:09 +0200
Subject: [PATCH 2448/2920] WebWizard: Fix documentation

---
 modules/setup/library/Setup/WebWizard.php | 32 ++++++++++++++++++-----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 9296cb370..aaf1c1753 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -90,7 +90,7 @@ class WebWizard extends Wizard implements SetupWizard
     );
 
     /**
-     * @see Wizard::init()
+     * Register all pages and module wizards for this wizard
      */
     protected function init()
     {
@@ -119,7 +119,10 @@ class WebWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see Wizard::setupPage()
+     * Setup the given page that is either going to be displayed or validated
+     *
+     * @param   Form        $page       The page to setup
+     * @param   Request     $request    The current request
      */
     public function setupPage(Form $page, Request $request)
     {
@@ -204,7 +207,16 @@ class WebWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see Wizard::getNewPage()
+     * Return the new page to set as current page
+     *
+     * {@inheritdoc} Runs additional checks related to some registered pages.
+     *
+     * @param   string  $requestedPage      The name of the requested page
+     * @param   Form    $originPage         The origin page
+     *
+     * @return  Form                        The new page
+     *
+     * @throws  InvalidArgumentException    In case the requested page does not exist or is not permitted yet
      */
     protected function getNewPage($requestedPage, Form $originPage)
     {
@@ -268,7 +280,9 @@ class WebWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see Wizard::addButtons()
+     * Add buttons to the given page based on its position in the page-chain
+     *
+     * @param   Form    $page   The page to add the buttons to
      */
     protected function addButtons(Form $page)
     {
@@ -284,7 +298,7 @@ class WebWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see Wizard::clearSession()
+     * Clear the session being used by this wizard and drop the setup token
      */
     public function clearSession()
     {
@@ -297,7 +311,9 @@ class WebWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see SetupWizard::getSetup()
+     * Return the setup for this wizard
+     *
+     * @return  Setup
      */
     public function getSetup()
     {
@@ -415,7 +431,9 @@ class WebWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see SetupWizard::getRequirements()
+     * Return the requirements of this wizard
+     *
+     * @return  RequirementSet
      */
     public function getRequirements($skipModules = false)
     {

From d69ab427a617d276d4925ec4eedfc51ed6a0ecc1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 2 Jul 2015 09:42:59 +0200
Subject: [PATCH 2449/2920] MonitoringWizard: Fix documentation

---
 .../library/Monitoring/MonitoringWizard.php   | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index 19a29f60b..43cd578c6 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -25,7 +25,7 @@ use Icinga\Module\Setup\Requirement\PhpModuleRequirement;
 class MonitoringWizard extends Wizard implements SetupWizard
 {
     /**
-     * @see Wizard::init()
+     * Register all pages for this wizard
      */
     public function init()
     {
@@ -39,7 +39,10 @@ class MonitoringWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see Wizard::setupPage()
+     * Setup the given page that is either going to be displayed or validated
+     *
+     * @param   Form        $page       The page to setup
+     * @param   Request     $request    The current request
      */
     public function setupPage(Form $page, Request $request)
     {
@@ -66,7 +69,16 @@ class MonitoringWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see Wizard::getNewPage()
+     * Return the new page to set as current page
+     *
+     * {@inheritdoc} Runs additional checks related to some registered pages.
+     *
+     * @param   string  $requestedPage      The name of the requested page
+     * @param   Form    $originPage         The origin page
+     *
+     * @return  Form                        The new page
+     *
+     * @throws  InvalidArgumentException    In case the requested page does not exist or is not permitted yet
      */
     protected function getNewPage($requestedPage, Form $originPage)
     {
@@ -84,7 +96,9 @@ class MonitoringWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see Wizard::addButtons()
+     * Add buttons to the given page based on its position in the page-chain
+     *
+     * @param   Form    $page   The page to add the buttons to
      */
     protected function addButtons(Form $page)
     {
@@ -103,7 +117,9 @@ class MonitoringWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see SetupWizard::getSetup()
+     * Return the setup for this wizard
+     *
+     * @return  Setup
      */
     public function getSetup()
     {
@@ -135,7 +151,9 @@ class MonitoringWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see SetupWizard::getRequirements()
+     * Return the requirements of this wizard
+     *
+     * @return  RequirementSet
      */
     public function getRequirements()
     {

From 3b63868ed9798e6f97231aad7605fe6f887b3811 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 2 Jul 2015 09:45:00 +0200
Subject: [PATCH 2450/2920] MonitoringWizard: Prefer our form error
 implementation

---
 modules/monitoring/library/Monitoring/MonitoringWizard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index 43cd578c6..b91129d10 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -63,7 +63,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
                     || (($ldapResourceData = $this->getPageData('setup_ldap_resource')) !== null
                         && $ldapResourceData['name'] === $request->getPost('name'))
             ) {
-                $page->addError(mt('monitoring', 'The given resource name is already in use.'));
+                $page->error(mt('monitoring', 'The given resource name is already in use.'));
             }
         }
     }

From f0d76292098572dd042430c80f367e76d4075e4f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 2 Jul 2015 10:18:37 +0200
Subject: [PATCH 2451/2920] AuthBackendPage: Do only create a resource config
 if necessary

---
 modules/setup/application/forms/AuthBackendPage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index 7564b577f..2caab9122 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -121,7 +121,7 @@ class AuthBackendPage extends Form
             return false;
         }
 
-        if (false === isset($data['skip_validation']) || $data['skip_validation'] == 0) {
+        if ($this->config['type'] === 'ldap' && ( !isset($data['skip_validation']) || $data['skip_validation'] == 0)) {
             $self = clone $this;
             $self->addElement(
                 'text',
@@ -130,7 +130,7 @@ class AuthBackendPage extends Form
                     'value' => $this->getResourceConfig()
                 )
             );
-            if ($this->config['type'] === 'ldap' && false === LdapBackendForm::isValidUserBackend($self)) {
+            if (! LdapBackendForm::isValidUserBackend($self)) {
                 $this->addSkipValidationCheckbox();
                 return false;
             }

From 3e69ef7e9e7f90261cbc8ed9e729069549186d7f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 2 Jul 2015 10:23:27 +0200
Subject: [PATCH 2452/2920] WebWizard: Fix condition for page
 `setup_config_db_resource'

refs #8709
---
 modules/setup/library/Setup/WebWizard.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index aaf1c1753..f3cda15a4 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -235,7 +235,8 @@ class WebWizard extends Wizard implements SetupWizard
             $skip = $authData['type'] !== 'ldap';
         } elseif ($newPage->getName() === 'setup_config_db_resource') {
             $authData = $this->getPageData('setup_authentication_type');
-            $skip = $authData['type'] === 'db';
+            $configData = $this->getPageData('setup_general_config');
+            $skip = $authData['type'] === 'db' || $configData['global_config_backend'] !== 'db';
         } elseif (in_array($newPage->getName(), array('setup_auth_db_creation', 'setup_config_db_creation'))) {
             if (
                 ($newPage->getName() === 'setup_auth_db_creation' || $this->hasPageData('setup_config_db_resource'))

From e43abd37a11c9d112fe81c0399c1b9eb583a34e6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 2 Jul 2015 10:31:03 +0200
Subject: [PATCH 2453/2920] DbResourcePage: Drop hidden element `prefix'

That's not a valid configuration option anymore.
---
 modules/setup/application/forms/DbResourcePage.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php
index e860ae95b..562885ce8 100644
--- a/modules/setup/application/forms/DbResourcePage.php
+++ b/modules/setup/application/forms/DbResourcePage.php
@@ -55,14 +55,6 @@ class DbResourcePage extends Form
         $resourceForm = new DbResourceForm();
         $this->addElements($resourceForm->createElements($formData)->getElements());
         $this->getElement('name')->setValue('icingaweb_db');
-        $this->addElement(
-            'hidden',
-            'prefix',
-            array(
-                'required'  => true,
-                'value'     => 'icingaweb_'
-            )
-        );
     }
 
     /**

From 2b111686730cc24b3331977bc470de12ab6c00ee Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 2 Jul 2015 11:18:29 +0200
Subject: [PATCH 2454/2920] DatabaseCreationPage: Prefer our form error
 implementation

---
 modules/setup/application/forms/DatabaseCreationPage.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/setup/application/forms/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php
index 6f011775b..b3ecca3b9 100644
--- a/modules/setup/application/forms/DatabaseCreationPage.php
+++ b/modules/setup/application/forms/DatabaseCreationPage.php
@@ -155,7 +155,7 @@ class DatabaseCreationPage extends Form
                 $db->connectToHost(); // Are we able to login on the server?
             } catch (PDOException $e) {
                 // We are NOT able to login on the server..
-                $this->addError($e->getMessage());
+                $this->error($e->getMessage());
                 $this->addSkipValidationCheckbox();
                 return false;
             }
@@ -164,7 +164,7 @@ class DatabaseCreationPage extends Form
         // In case we are connected the credentials filled into this
         // form need to be granted to create databases, users...
         if (false === $db->checkPrivileges($this->databaseSetupPrivileges)) {
-            $this->addError(
+            $this->error(
                 $this->translate('The provided credentials cannot be used to create the database and/or the user.')
             );
             $this->addSkipValidationCheckbox();
@@ -173,7 +173,7 @@ class DatabaseCreationPage extends Form
 
         // ...and to grant all required usage privileges to others
         if (false === $db->isGrantable($this->databaseUsagePrivileges)) {
-            $this->addError(sprintf(
+            $this->error(sprintf(
                 $this->translate(
                     'The provided credentials cannot be used to grant all required privileges to the login "%s".'
                 ),

From f8034cfb9d339eb324e3dd4fdff53e2a0e871eba Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 2 Jul 2015 11:18:45 +0200
Subject: [PATCH 2455/2920] DbResourcePage: Prefer our form error
 implementation

---
 modules/setup/application/forms/DbResourcePage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php
index 562885ce8..e9967f350 100644
--- a/modules/setup/application/forms/DbResourcePage.php
+++ b/modules/setup/application/forms/DbResourcePage.php
@@ -75,7 +75,7 @@ class DbResourcePage extends Form
                 $db = new DbTool($this->getValues());
                 $db->checkConnectivity();
             } catch (PDOException $e) {
-                $this->addError($e->getMessage());
+                $this->error($e->getMessage());
                 $this->addSkipValidationCheckbox();
                 return false;
             }

From 9feb29d99b6b8c7d575c0ee3d1960c825c46cf82 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 2 Jul 2015 11:19:08 +0200
Subject: [PATCH 2456/2920] LdapDiscoveryPage: Prefer our form error
 implementation

---
 modules/setup/application/forms/LdapDiscoveryPage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/application/forms/LdapDiscoveryPage.php b/modules/setup/application/forms/LdapDiscoveryPage.php
index 588791e2c..4a825d7f1 100644
--- a/modules/setup/application/forms/LdapDiscoveryPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryPage.php
@@ -77,7 +77,7 @@ class LdapDiscoveryPage extends Form
             } catch (Exception $e) {
             }
 
-            $this->addError(
+            $this->error(
                 sprintf($this->translate('Could not find any LDAP servers on the domain "%s".'), $data['domain'])
             );
         } else {

From 2f05ca63321753175679310857b84619bac025bb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 2 Jul 2015 11:50:23 +0200
Subject: [PATCH 2457/2920] Wizard: Re-render passwords on the admin account
 and db creation page

That's not placeholders, actually, but this will be solved in a
different issue. (in a more generic way)

fixes #9545
---
 .../setup/application/forms/AdminAccountPage.php | 16 +++++++++-------
 .../application/forms/DatabaseCreationPage.php   |  5 +++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 2d3e9d712..90ccd6fe5 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -167,21 +167,23 @@ class AdminAccountPage extends Form
                 'password',
                 'new_user_password',
                 array(
-                    'required'      => true,
-                    'label'         => $this->translate('Password'),
-                    'description'   => $this->translate('Enter the password to assign to the newly created account')
+                    'required'          => true,
+                    'renderPassword'    => true,
+                    'label'             => $this->translate('Password'),
+                    'description'       => $this->translate('Enter the password to assign to the newly created account')
                 )
             );
             $this->addElement(
                 'password',
                 'new_user_2ndpass',
                 array(
-                    'required'      => true,
-                    'label'         => $this->translate('Repeat password'),
-                    'description'   => $this->translate(
+                    'required'          => true,
+                    'renderPassword'    => true,
+                    'label'             => $this->translate('Repeat password'),
+                    'description'       => $this->translate(
                         'Please repeat the password given above to avoid typing errors'
                     ),
-                    'validators'    => array(
+                    'validators'        => array(
                         array('identical', false, array('new_user_password'))
                     )
                 )
diff --git a/modules/setup/application/forms/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php
index b3ecca3b9..17cae3aca 100644
--- a/modules/setup/application/forms/DatabaseCreationPage.php
+++ b/modules/setup/application/forms/DatabaseCreationPage.php
@@ -107,8 +107,9 @@ class DatabaseCreationPage extends Form
             'password',
             'password',
             array(
-                'label'         => $this->translate('Password'),
-                'description'   => $this->translate('The password for the database user defined above')
+                'renderPassword'    => true,
+                'label'             => $this->translate('Password'),
+                'description'       => $this->translate('The password for the database user defined above')
             )
         );
 

From 0c1365753ecd3865390f83cf8252a306139c438d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 2 Jul 2015 16:58:37 +0200
Subject: [PATCH 2458/2920] DbTool: Properly escape database wildcards when
 checking privileges

fixes #9543
---
 modules/setup/library/Setup/Utils/DbTool.php | 40 ++++++++++++++++----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index ae2fcc38f..4f22a343a 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -351,6 +351,24 @@ class DbTool
         }
     }
 
+    /**
+     * Return the given table name with all wildcards being escaped
+     *
+     * @param   string  $tableName
+     *
+     * @return  string
+     *
+     * @throws  LogicException          In case there is no behaviour implemented for the current PDO driver
+     */
+    public function escapeTableWildcards($tableName)
+    {
+        if ($this->config['db'] === 'mysql') {
+            return str_replace(array('_', '%'), array('\_', '\%'), $tableName);
+        }
+
+        throw new LogicException('Unable to escape table wildcards.');
+    }
+
     /**
      * Return the given value escaped as string
      *
@@ -481,9 +499,12 @@ class DbTool
     {
         if ($this->config['db'] === 'mysql') {
             list($_, $host) = explode('@', $this->query('select current_user()')->fetchColumn());
-            $queryString = sprintf(
-                'GRANT %%s ON %s.%%s TO %s@%s',
-                $this->quoteIdentifier($this->config['dbname']),
+            $quotedDbName = $this->quoteIdentifier($this->config['dbname']);
+
+            $grant = 'GRANT %s';
+            $on = ' ON %s.%s';
+            $to = sprintf(
+                ' TO %s@%s',
                 $this->quoteIdentifier($username),
                 str_replace('%', '%%', $this->quoteIdentifier($host))
             );
@@ -499,15 +520,18 @@ class DbTool
             }
 
             if (false === empty($tablePrivileges)) {
+                $tableGrant = sprintf($grant, join(',', $tablePrivileges));
                 foreach ($context as $table) {
-                    $this->exec(
-                        sprintf($queryString, join(',', $tablePrivileges), $this->quoteIdentifier($table))
-                    );
+                    $this->exec($tableGrant . sprintf($on, $quotedDbName, $this->quoteIdentifier($table)) . $to);
                 }
             }
 
             if (false === empty($dbPrivileges)) {
-                $this->exec(sprintf($queryString, join(',', $dbPrivileges), '*'));
+                $this->exec(
+                    sprintf($grant, join(',', $dbPrivileges))
+                    . sprintf($on, $this->escapeTableWildcards($quotedDbName), '*')
+                    . $to
+                );
             }
         } elseif ($this->config['db'] === 'pgsql') {
             $dbPrivileges = array();
@@ -651,7 +675,7 @@ EOD;
                     . ' AND table_schema = :dbname'
                     . ' AND privilege_type IN (' . join(',', array_map(array($this, 'quote'), $dbPrivileges)) . ')'
                     . ($requireGrants ? " AND is_grantable = 'YES'" : ''),
-                    array(':grantee' => $grantee, ':dbname' => $this->config['dbname'])
+                    array(':grantee' => $grantee, ':dbname' => $this->escapeTableWildcards($this->config['dbname']))
                 );
                 $dbPrivilegesGranted = (int) $query->fetchObject()->matches === count($dbPrivileges);
             }

From 49d4be79ef841738dca582975dce33a178fb10c1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 2 Jul 2015 17:00:04 +0200
Subject: [PATCH 2459/2920] DbTool: Some coding style fixes

---
 modules/setup/library/Setup/Utils/DbTool.php | 39 ++++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index 4f22a343a..3318565a3 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -167,15 +167,15 @@ class DbTool
      */
     protected function assertHostAccess()
     {
-        if (false === isset($this->config['db'])) {
+        if (! isset($this->config['db'])) {
             throw new ConfigurationError('Can\'t connect to database server of unknown type');
-        } elseif (false === isset($this->config['host'])) {
+        } elseif (! isset($this->config['host'])) {
             throw new ConfigurationError('Can\'t connect to database server without a hostname or address');
-        } elseif (false === isset($this->config['port'])) {
+        } elseif (! isset($this->config['port'])) {
             throw new ConfigurationError('Can\'t connect to database server without a port');
-        } elseif (false === isset($this->config['username'])) {
+        } elseif (! isset($this->config['username'])) {
             throw new ConfigurationError('Can\'t connect to database server without a username');
-        } elseif (false === isset($this->config['password'])) {
+        } elseif (! isset($this->config['password'])) {
             throw new ConfigurationError('Can\'t connect to database server without a password');
         }
     }
@@ -187,7 +187,7 @@ class DbTool
      */
     protected function assertDatabaseAccess()
     {
-        if (false === isset($this->config['dbname'])) {
+        if (! isset($this->config['dbname'])) {
             throw new ConfigurationError('Can\'t connect to database without a valid database name');
         }
     }
@@ -512,21 +512,21 @@ class DbTool
             $dbPrivileges = array();
             $tablePrivileges = array();
             foreach (array_intersect($privileges, array_keys($this->mysqlGrantContexts)) as $privilege) {
-                if (false === empty($context) && $this->mysqlGrantContexts[$privilege] & static::TABLE_LEVEL) {
+                if (! empty($context) && $this->mysqlGrantContexts[$privilege] & static::TABLE_LEVEL) {
                     $tablePrivileges[] = $privilege;
                 } elseif ($this->mysqlGrantContexts[$privilege] & static::DATABASE_LEVEL) {
                     $dbPrivileges[] = $privilege;
                 }
             }
 
-            if (false === empty($tablePrivileges)) {
+            if (! empty($tablePrivileges)) {
                 $tableGrant = sprintf($grant, join(',', $tablePrivileges));
                 foreach ($context as $table) {
                     $this->exec($tableGrant . sprintf($on, $quotedDbName, $this->quoteIdentifier($table)) . $to);
                 }
             }
 
-            if (false === empty($dbPrivileges)) {
+            if (! empty($dbPrivileges)) {
                 $this->exec(
                     sprintf($grant, join(',', $dbPrivileges))
                     . sprintf($on, $this->escapeTableWildcards($quotedDbName), '*')
@@ -537,14 +537,14 @@ class DbTool
             $dbPrivileges = array();
             $tablePrivileges = array();
             foreach (array_intersect($privileges, array_keys($this->pgsqlGrantContexts)) as $privilege) {
-                if (false === empty($context) && $this->pgsqlGrantContexts[$privilege] & static::TABLE_LEVEL) {
+                if (! empty($context) && $this->pgsqlGrantContexts[$privilege] & static::TABLE_LEVEL) {
                     $tablePrivileges[] = $privilege;
                 } elseif ($this->pgsqlGrantContexts[$privilege] & static::DATABASE_LEVEL) {
                     $dbPrivileges[] = $privilege;
                 }
             }
 
-            if (false === empty($dbPrivileges)) {
+            if (! empty($dbPrivileges)) {
                 $this->exec(sprintf(
                     'GRANT %s ON DATABASE %s TO %s',
                     join(',', $dbPrivileges),
@@ -553,7 +553,7 @@ class DbTool
                 ));
             }
 
-            if (false === empty($tablePrivileges)) {
+            if (! empty($tablePrivileges)) {
                 foreach ($context as $table) {
                     $this->exec(sprintf(
                         'GRANT %s ON TABLE %s TO %s',
@@ -658,7 +658,7 @@ EOD;
             $dbPrivileges = array();
             $tablePrivileges = array();
             foreach ($mysqlPrivileges as $privilege) {
-                if (false === empty($context) && $this->mysqlGrantContexts[$privilege] & static::TABLE_LEVEL) {
+                if (! empty($context) && $this->mysqlGrantContexts[$privilege] & static::TABLE_LEVEL) {
                     $tablePrivileges[] = $privilege;
                 }
                 if ($this->mysqlGrantContexts[$privilege] & static::DATABASE_LEVEL) {
@@ -667,7 +667,7 @@ EOD;
             }
 
             $dbPrivilegesGranted = true;
-            if (false === empty($dbPrivileges)) {
+            if (! empty($dbPrivileges)) {
                 $query = $this->query(
                     'SELECT COUNT(*) as matches'
                     . ' FROM information_schema.schema_privileges'
@@ -682,9 +682,8 @@ EOD;
 
             $tablePrivilegesGranted = true;
             if (
-                false === empty($tablePrivileges) && (
-                    !$dbPrivilegesGranted || array_intersect($dbPrivileges, $tablePrivileges) != $tablePrivileges
-                )
+                !empty($tablePrivileges)
+                && (! $dbPrivilegesGranted || array_intersect($dbPrivileges, $tablePrivileges) != $tablePrivileges)
             ) {
                 $query = $this->query(
                     'SELECT COUNT(*) as matches'
@@ -739,7 +738,7 @@ EOD;
             $dbPrivileges = array();
             $tablePrivileges = array();
             foreach (array_intersect($privileges, array_keys($this->pgsqlGrantContexts)) as $privilege) {
-                if (false === empty($context) && $this->pgsqlGrantContexts[$privilege] & static::TABLE_LEVEL) {
+                if (! empty($context) && $this->pgsqlGrantContexts[$privilege] & static::TABLE_LEVEL) {
                     $tablePrivileges[] = $privilege;
                 }
                 if ($this->pgsqlGrantContexts[$privilege] & static::DATABASE_LEVEL) {
@@ -747,7 +746,7 @@ EOD;
                 }
             }
 
-            if (false === empty($dbPrivileges)) {
+            if (! empty($dbPrivileges)) {
                 foreach ($dbPrivileges as $dbPrivilege) {
                     $query = $this->query(
                         'SELECT has_database_privilege(:user, :dbname, :privilege) AS db_privilege_granted',
@@ -761,7 +760,7 @@ EOD;
                 }
             }
 
-            if (false === empty($tablePrivileges)) {
+            if (! empty($tablePrivileges)) {
                 foreach (array_intersect($context, $this->listTables()) as $table) {
                     foreach ($tablePrivileges as $tablePrivilege) {
                         $query = $this->query(

From 3aae1acc977106e9a0dd458b8cc864ebe3b26715 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 2 Jul 2015 17:02:12 +0200
Subject: [PATCH 2460/2920] WebWizard: Validate the db schema correctly

This was being validated successfully no matter whether the
schema actually existed or not...
---
 modules/setup/library/Setup/WebWizard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index f3cda15a4..1addf6283 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -248,7 +248,7 @@ class WebWizard extends Wizard implements SetupWizard
 
                 try {
                     $db->connectToDb(); // Are we able to login on the database?
-                    if (array_search(key($this->databaseTables), $db->listTables()) === false) {
+                    if (array_search(reset($this->databaseTables), $db->listTables()) === false) {
                         // In case the database schema does not yet exist the
                         // user needs the privileges to setup the database
                         $skip = $db->checkPrivileges($this->databaseSetupPrivileges, $this->databaseTables);

From ea5e4490767b68a4e860cc80243ee1a295a41503 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 1 Jul 2015 12:56:04 +0200
Subject: [PATCH 2461/2920] Note that the wheezy-packports repository is
 required for installing Web 2 on Debian wheezy

refs #9140
refs #9163
---
 doc/installation.md | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/doc/installation.md b/doc/installation.md
index fe3adf5f4..fb5ae69e4 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -35,14 +35,14 @@ Please contact your distribution packagers.
 You need to add the Icinga repository to your package management configuration for installing Icinga Web 2.
 Below is a list with examples for various distributions.
 
-Debian (debmon):
+**Debian (debmon)**:
 ````
 wget -O - http://debmon.org/debmon/repo.key 2>/dev/null | apt-key add -
 echo 'deb http://debmon.org/debmon debmon-wheezy main' >/etc/apt/sources.list.d/debmon.list
 apt-get update
 ````
 
-Ubuntu Trusty:
+**Ubuntu Trusty**:
 ````
 wget -O - http://packages.icinga.org/icinga.key | apt-key add -
 add-apt-repository 'deb http://packages.icinga.org/ubuntu icinga-trusty main'
@@ -51,59 +51,69 @@ apt-get update
 
 For other Ubuntu versions just replace trusty with your distribution's code name.
 
-RHEL and CentOS:
+**RHEL and CentOS**:
 ````
 rpm --import http://packages.icinga.org/icinga.key
 curl -o /etc/yum.repos.d/ICINGA-release.repo http://packages.icinga.org/epel/ICINGA-release.repo
 yum makecache
 ````
 
-Fedora:
+**Fedora**:
 ````
 rpm --import http://packages.icinga.org/icinga.key
 curl -o /etc/yum.repos.d/ICINGA-release.repo http://packages.icinga.org/fedora/ICINGA-release.repo
 yum makecache
 ````
 
-SLES 11:
+**SLES 11**:
 ````
 zypper ar http://packages.icinga.org/SUSE/ICINGA-release-11.repo
 zypper ref
 ````
 
-SLES 12:
+**SLES 12**:
 ````
 zypper ar http://packages.icinga.org/SUSE/ICINGA-release.repo
 zypper ref
 ````
 
-openSUSE:
+**openSUSE**:
 ````
 zypper ar http://packages.icinga.org/openSUSE/ICINGA-release.repo
 zypper ref
 ````
 
+#### <a id="package-repositories-rhel-notes"></a> RHEL/CentOS Notes
+
 The packages for RHEL/CentOS depend on other packages which are distributed as part of the
 [EPEL repository](http://fedoraproject.org/wiki/EPEL). Please make sure to enable this repository by following
 [these instructions](http://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F).
 
+#### <a id="package-repositories-wheezy-notes"></a> Debian wheezy Notes
+
+The packages for Debian wheezy depend on other packages which are distributed as part of the
+[wheezy-packports](http://backports.debian.org/) repository. Please make sure to enable this repository by following
+[these instructions](http://backports.debian.org/Instructions/).
+
 ### <a id="installing-from-package-example"></a> Installing Icinga Web 2
 
 You can install Icinga Web 2 by using your distribution's package manager to install the `icingaweb2` package.
 Below is a list with examples for various distributions. The additional package `icingacli` is necessary
 for being able to follow further steps in this guide.
 
-Debian and Ubuntu:
+**Debian and Ubuntu**:
 ````
 apt-get install icingaweb2 icingacli
 ````
+For Debian wheezy please read the [package repositories notes](#package-repositories-wheezy-notes).
 
-RHEL, CentOS and Fedora:
+**RHEL, CentOS and Fedora**:
 ````
 yum install icingaweb2 icingacli
 ````
+For RHEL/CentOS please read the [package repositories notes](#package-repositories-rhel-notes).
 
-SLES and openSUSE:
+**SLES and openSUSE**:
 ````
 zypper install icingaweb2 icingacli
 ````
@@ -158,12 +168,12 @@ mv icingaweb2 /usr/share/icingaweb2
 
 Use `icingacli` to generate web server configuration for either Apache or nginx.
 
-Apache:
+**Apache**:
 ````
 ./bin/icingacli setup config webserver apache --document-root /usr/share/icingaweb2/public
 ````
 
-nginx:
+**nginx**:
 ````
 ./bin/icingacli setup config webserver nginx --document-root /usr/share/icingaweb2/public
 ````
@@ -185,29 +195,29 @@ system group. The web server user and CLI user have to be added to this system g
 
 Add the system group `icingaweb2` in the first place.
 
-Fedora, RHEL, CentOS, SLES and OpenSUSE:
+**Fedora, RHEL, CentOS, SLES and OpenSUSE**:
 ````
 groupadd -r icingaweb2
 ````
 
-Debian and Ubuntu:
+**Debian and Ubuntu**:
 ````
 addgroup --system icingaweb2
 ````
 
 Add your web server's user to the system group `icingaweb2`:
 
-Fedora, RHEL and CentOS:
+**Fedora, RHEL and CentOS**:
 ````
 usermod -a -G icingaweb2 apache
 ````
 
-SLES and OpenSUSE:
+**SLES and OpenSUSE**:
 ````
 usermod -A icingaweb2 wwwrun
 ````
 
-Debian and Ubuntu:
+**Debian and Ubuntu**:
 ````
 usermod -a -G icingaweb2 www-data
 ````

From 9e92a36ae509c1ad3828338d84f2c0d2d43a4888 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 2 Jul 2015 09:26:59 +0200
Subject: [PATCH 2462/2920] RPM: Support Amazon Linux

---
 icingaweb2.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index 0549b7b50..47fcacc86 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -14,7 +14,7 @@ BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
 Packager:       Icinga Team <info@icinga.org>
 
-%if 0%{?fedora} || 0%{?rhel}
+%if 0%{?fedora} || 0%{?rhel} || 0%{?amzn}
 %define wwwconfigdir    %{_sysconfdir}/httpd/conf.d
 %define wwwuser         apache
 %if 0%{?rhel} == 5
@@ -44,6 +44,7 @@ Requires: apache2-mod_php5
 %endif
 %endif
 
+%{?amzn:Requires(pre):          shadow-utils}
 %{?fedora:Requires(pre):        shadow-utils}
 %{?rhel:Requires(pre):          shadow-utils}
 %{?suse_version:Requires(pre):  pwdutils}
@@ -73,6 +74,7 @@ Icinga Web 2
 %package common
 Summary:                        Common files for Icinga Web 2 and the Icinga CLI
 Group:                          Applications/System
+%{?amzn:Requires(pre):          shadow-utils}
 %{?fedora:Requires(pre):        shadow-utils}
 %{?rhel:Requires(pre):          shadow-utils}
 %{?suse_version:Requires(pre):  pwdutils}
@@ -86,6 +88,7 @@ Summary:                    Icinga Web 2 PHP library
 Group:                      Development/Libraries
 Requires:                   %{php} >= 5.3.0
 Requires:                   %{php}-gd %{php}-intl
+%{?amzn:Requires:           %{php}-pecl-imagick}
 %{?fedora:Requires:         php-pecl-imagick}
 %{?rhel:Requires:           php-pecl-imagick}
 %{?suse_version:Requires:   %{php}-gettext %{php}-json %{php}-openssl %{php}-posix}
@@ -99,6 +102,7 @@ Summary:                    Icinga CLI
 Group:                      Applications/System
 Requires:                   %{name}-common = %{version}-%{release}
 Requires:                   php-Icinga = %{version}-%{release}
+%{?amzn:Requires:           %{php_cli} >= 5.3.0 bash-completion}
 %{?fedora:Requires:         %{php_cli} >= 5.3.0 bash-completion}
 %{?rhel:Requires:           %{php_cli} >= 5.3.0 bash-completion}
 %{?suse_version:Requires:   %{php} >= 5.3.0}
@@ -224,10 +228,10 @@ rm -rf %{buildroot}
 %{basedir}/public
 %{wwwconfigdir}/icingaweb2.conf
 %attr(2775,root,%{icingawebgroup}) %dir %{logdir}
-%{docsdir}
-%docdir %{docsdir}
 %attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules/setup
 %attr(0660,root,%{icingawebgroup}) %config(noreplace) %{configdir}/modules/setup/config.ini
+%{docsdir}
+%docdir %{docsdir}
 
 
 %pre common

From a4d5f73db491a79e112248157dae4fbe54a50458 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 2 Jul 2015 09:27:29 +0200
Subject: [PATCH 2463/2920] RPM: Define Apache config as configuration file

fixes #9529
---
 icingaweb2.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index 47fcacc86..fa0fe7e69 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -226,7 +226,7 @@ rm -rf %{buildroot}
 %{basedir}/doc
 %{basedir}/modules
 %{basedir}/public
-%{wwwconfigdir}/icingaweb2.conf
+%config(noreplace) %{wwwconfigdir}/icingaweb2.conf
 %attr(2775,root,%{icingawebgroup}) %dir %{logdir}
 %attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules/setup
 %attr(0660,root,%{icingawebgroup}) %config(noreplace) %{configdir}/modules/setup/config.ini

From 195b080cffc3aacf417b4c9d87c9efeca0414b68 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 2 Jul 2015 09:48:19 +0200
Subject: [PATCH 2464/2920] RPM: Install php-ZendFramework on RHEL/CentOS 7 and
 drop support for RHEL/CentOS 5

The EPEL repository for RHEL/CentOS 7 does now include php-ZendFramework version 1. It had only version 2 some time ago.
Further, I removed "support" for RHEL/CentoOS 5.
---
 icingaweb2.spec | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index fa0fe7e69..99d5009d6 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -15,20 +15,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
 Packager:       Icinga Team <info@icinga.org>
 
 %if 0%{?fedora} || 0%{?rhel} || 0%{?amzn}
+%define php             php
+%define php_cli         php-cli
 %define wwwconfigdir    %{_sysconfdir}/httpd/conf.d
 %define wwwuser         apache
-%if 0%{?rhel} == 5
-%define php     php53
-%define php_cli php53-cli
-%else
-%define php     php
-%define php_cli php-cli
-%endif
-%if 0%{?rhel} == 6
-%define zend php-ZendFramework
-%else
-%define zend %{name}-vendor-Zend
-%endif
+%define zend            php-ZendFramework
 %endif
 
 %if 0%{?suse_version}
@@ -56,6 +47,7 @@ Requires:                       %{name}-vendor-JShrink
 Requires:                       %{name}-vendor-lessphp
 Requires:                       %{name}-vendor-Parsedown
 Requires:                       %{zend}
+Obsoletes:                      %{name}-vendor-zend
 
 
 %description

From ea6e1fa415996e8470c7f96a53bfdbab1edbd0ae Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 2 Jul 2015 09:51:43 +0200
Subject: [PATCH 2465/2920] Document RHEL/CentOS 7 Zend dependency change

---
 doc/installation.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/installation.md b/doc/installation.md
index fb5ae69e4..ceb283458 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -281,3 +281,9 @@ The first release candidate of Icinga Web 2 introduces the following non-backwar
   predefined subset of filter columns. Please see the module's security
   related documentation for more details.
 
+## <a id="upgrading-to-2.0.0"></a> Upgrading to Icinga Web 2 2.0.0
+
+* Icinga Web 2 installations from package on RHEL/CentOS 7 now depend on `php-ZendFramework` which is available through
+the [EPEL repository](http://fedoraproject.org/wiki/EPEL). Before, Zend was installed as Icinga Web 2 vendor library
+through the package `icingaweb2-vendor-zend`. After upgrading, please make sure to remove the package
+`icingaweb2-vendor-zend`.

From 764c67cc66d06be094a47d3c5e8e4236d562ccc9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 2 Jul 2015 11:42:58 +0200
Subject: [PATCH 2466/2920] Document that RHEL/CentOS 5 is not supported

---
 doc/installation.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/installation.md b/doc/installation.md
index ceb283458..708d45935 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -89,6 +89,9 @@ The packages for RHEL/CentOS depend on other packages which are distributed as p
 [EPEL repository](http://fedoraproject.org/wiki/EPEL). Please make sure to enable this repository by following
 [these instructions](http://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F).
 
+> Please note that installing Icinga Web 2 on **RHEL/CentOS 5** is not supported due to EOL versions of PHP and
+> PostgreSQL.
+
 #### <a id="package-repositories-wheezy-notes"></a> Debian wheezy Notes
 
 The packages for Debian wheezy depend on other packages which are distributed as part of the

From b2c22ebcf9b5f1ddfcbd145ac81bd742e3fc8797 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 2 Jul 2015 15:44:37 +0200
Subject: [PATCH 2467/2920] No longer package Zend as vendor library

All RPM installations now depend on php-ZendFramework which is avaiable through the EPEL repository.
---
 icingaweb2.spec | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index 99d5009d6..7cddee0d3 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -163,18 +163,6 @@ Requires:   %{php} >= 5.3.0
 Icinga Web 2 vendor library Parsedown
 
 
-%package vendor-Zend
-Version:    1.12.9
-Release:    1%{?dist}
-Summary:    Icinga Web 2 vendor library Zend Framework
-Group:      Development/Libraries
-License:    BSD
-Requires:   %{php} >= 5.3.0
-
-%description vendor-Zend
-Icinga Web 2 vendor library Zend
-
-
 %prep
 %setup -q
 
@@ -182,12 +170,12 @@ Icinga Web 2 vendor library Zend
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/{%{basedir}/{modules,library,public},%{bindir},%{configdir}/modules/setup,%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d,%{docsdir}}
+mkdir -p %{buildroot}/{%{basedir}/{modules,library/vendor,public},%{bindir},%{configdir}/modules/setup,%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d,%{docsdir}}
 cp -prv application doc %{buildroot}/%{basedir}
 cp -pv etc/bash_completion.d/icingacli %{buildroot}/%{_sysconfdir}/bash_completion.d/icingacli
 cp -prv modules/{monitoring,setup,doc,translation} %{buildroot}/%{basedir}/modules
 cp -prv library/Icinga %{buildroot}/%{phpdir}
-cp -prv library/vendor %{buildroot}/%{basedir}/library
+cp -prv library/vendor/{dompdf,HTMLPurifier,JShrink,lessphp,Parsedown} %{buildroot}/%{basedir}/library/vendor
 cp -prv public/{css,img,js,error_norewrite.html} %{buildroot}/%{basedir}/public
 cp -pv packages/files/apache/icingaweb2.conf %{buildroot}/%{wwwconfigdir}/icingaweb2.conf
 cp -pv packages/files/bin/icingacli %{buildroot}/%{bindir}
@@ -273,8 +261,3 @@ exit 0
 %files vendor-Parsedown
 %defattr(-,root,root)
 %{basedir}/library/vendor/Parsedown
-
-
-%files vendor-Zend
-%defattr(-,root,root)
-%{basedir}/library/vendor/Zend

From 56c4fdf8a11e5e4d0f0a1efbc45fd97c68c2cbcc Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 3 Jul 2015 10:10:32 +0200
Subject: [PATCH 2468/2920] Wizard: Fix db privilege checks, again

The wizard were not able to verify privileges if some or even all
privileges were granted on database level causing it to grant
redundant privileges on table level.
---
 modules/setup/library/Setup/Utils/DbTool.php | 59 ++++++++++++++++----
 1 file changed, 47 insertions(+), 12 deletions(-)

diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index 3318565a3..48922440e 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -667,24 +667,46 @@ EOD;
             }
 
             $dbPrivilegesGranted = true;
+            $tablePrivilegesGranted = true;
+
             if (! empty($dbPrivileges)) {
-                $query = $this->query(
-                    'SELECT COUNT(*) as matches'
+                $queryString = 'SELECT COUNT(*) as matches'
                     . ' FROM information_schema.schema_privileges'
                     . ' WHERE grantee = :grantee'
                     . ' AND table_schema = :dbname'
-                    . ' AND privilege_type IN (' . join(',', array_map(array($this, 'quote'), $dbPrivileges)) . ')'
-                    . ($requireGrants ? " AND is_grantable = 'YES'" : ''),
+                    . ' AND privilege_type IN (%s)'
+                    . ($requireGrants ? " AND is_grantable = 'YES'" : '');
+
+                $dbAndTableQuery = $this->query(
+                    sprintf($queryString, join(',', array_map(array($this, 'quote'), $dbPrivileges))),
                     array(':grantee' => $grantee, ':dbname' => $this->escapeTableWildcards($this->config['dbname']))
                 );
-                $dbPrivilegesGranted = (int) $query->fetchObject()->matches === count($dbPrivileges);
+                $grantedDbAndTablePrivileges = (int) $dbAndTableQuery->fetchObject()->matches;
+                if ($grantedDbAndTablePrivileges === count($dbPrivileges)) {
+                    $tableExclusivePrivileges = array_diff($tablePrivileges, $dbPrivileges);
+                    if (! empty($tableExclusivePrivileges)) {
+                        $tablePrivileges = $tableExclusivePrivileges;
+                        $tablePrivilegesGranted = false;
+                    }
+                } else {
+                    $tablePrivilegesGranted = false;
+                    $dbExclusivePrivileges = array_diff($dbPrivileges, $tablePrivileges);
+                    if (! empty($dbExclusivePrivileges)) {
+                        $dbExclusiveQuery = $this->query(
+                            sprintf($queryString, join(',', array_map(array($this, 'quote'), $dbExclusivePrivileges))),
+                            array(
+                                ':grantee'  => $grantee,
+                                ':dbname'   => $this->escapeTableWildcards($this->config['dbname'])
+                            )
+                        );
+                        $dbPrivilegesGranted = (int) $dbExclusiveQuery->fetchObject()->matches === count(
+                            $dbExclusivePrivileges
+                        );
+                    }
+                }
             }
 
-            $tablePrivilegesGranted = true;
-            if (
-                !empty($tablePrivileges)
-                && (! $dbPrivilegesGranted || array_intersect($dbPrivileges, $tablePrivileges) != $tablePrivileges)
-            ) {
+            if (! $tablePrivilegesGranted && !empty($tablePrivileges)) {
                 $query = $this->query(
                     'SELECT COUNT(*) as matches'
                     . ' FROM information_schema.table_privileges'
@@ -747,6 +769,7 @@ EOD;
             }
 
             if (! empty($dbPrivileges)) {
+                $dbExclusivesGranted = true;
                 foreach ($dbPrivileges as $dbPrivilege) {
                     $query = $this->query(
                         'SELECT has_database_privilege(:user, :dbname, :privilege) AS db_privilege_granted',
@@ -756,11 +779,23 @@ EOD;
                             ':privilege'    => $dbPrivilege . ($requireGrants ? ' WITH GRANT OPTION' : '')
                         )
                     );
-                    $privilegesGranted &= $query->fetchObject()->db_privilege_granted;
+                    if (! $query->fetchObject()->db_privilege_granted) {
+                        $privilegesGranted = false;
+                        if (! in_array($dbPrivilege, $tablePrivileges)) {
+                            $dbExclusivesGranted = false;
+                        }
+                    }
+                }
+
+                if ($privilegesGranted) {
+                    // Do not check privileges twice if they are already granted at database level
+                    $tablePrivileges = array_diff($tablePrivileges, $dbPrivileges);
+                } elseif ($dbExclusivesGranted) {
+                    $privilegesGranted = true;
                 }
             }
 
-            if (! empty($tablePrivileges)) {
+            if ($privilegesGranted && !empty($tablePrivileges)) {
                 foreach (array_intersect($context, $this->listTables()) as $table) {
                     foreach ($tablePrivileges as $tablePrivilege) {
                         $query = $this->query(

From caca219aa138ed1888dea37f3ce3ac739116b58f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 3 Jul 2015 13:06:10 +0200
Subject: [PATCH 2469/2920] DbRepository: Consider table aliases while handling
 statement columns

Usually not required as there are no aliases for statements possible
but since we cannot differentiate everywhere what type of column
we're processing it is safer to always handle such.

fixes #9553
---
 library/Icinga/Repository/DbRepository.php    | 67 +++++++++++--------
 library/Icinga/Repository/Repository.php      | 40 ++++++-----
 library/Icinga/Repository/RepositoryQuery.php | 21 +++---
 3 files changed, 75 insertions(+), 53 deletions(-)

diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index be9a8b838..a187d76c0 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -497,19 +497,24 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     /**
      * Return the name of the conversion method for the given alias or column name and context
      *
-     * @param   array|string    $table      The datasource's table
-     * @param   string          $name       The alias or column name for which to return a conversion method
-     * @param   string          $context    The context of the conversion: persist or retrieve
+     * If a query column or a filter column, which is part of a query filter, needs to be converted,
+     * you'll need to pass $query, otherwise the column is considered a statement column.
+     *
+     * @param   string              $table      The datasource's table
+     * @param   string              $name       The alias or column name for which to return a conversion method
+     * @param   string              $context    The context of the conversion: persist or retrieve
+     * @param   RepositoryQuery     $query      If given the column is considered a query column,
+     *                                          statement column otherwise
      *
      * @return  string
      *
      * @throws  ProgrammingError    In case a conversion rule is found but not any conversion method
      */
-    protected function getConverter($table, $name, $context)
+    protected function getConverter($table, $name, $context, RepositoryQuery $query = null)
     {
         if (
-            $this->validateQueryColumnAssociation($table, $name)
-            || $this->validateStatementColumnAssociation($table, $name)
+            ($query !== null && $this->validateQueryColumnAssociation($table, $name))
+            || ($query === null && $this->validateStatementColumnAssociation($table, $name))
         ) {
             $table = $this->removeTablePrefix($this->clearTableAlias($table));
         } else {
@@ -519,7 +524,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
             }
         }
 
-        return parent::getConverter($table, $name, $context);
+        return parent::getConverter($table, $name, $context, $query);
     }
 
     /**
@@ -650,7 +655,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      * Attempts to join the given column from a different table if its association to the given table cannot be
      * verified.
      *
-     * @param   string              $table  The table where to look for the column or alias
+     * @param   array|string        $table  The table where to look for the column or alias
      * @param   string              $name   The name or alias of the column to validate
      * @param   RepositoryQuery     $query  An optional query to pass as context,
      *                                      if not given no join will be attempted
@@ -662,7 +667,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     public function requireQueryColumn($table, $name, RepositoryQuery $query = null)
     {
         if ($query === null || $this->validateQueryColumnAssociation($table, $name)) {
-            return parent::requireQueryColumn($table, $name, $query);
+            return parent::requireQueryColumn($this->removeTablePrefix($this->clearTableAlias($table)), $name, $query);
         }
 
         return $this->joinColumn($name, $table, $query);
@@ -674,7 +679,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
      * Attempts to join the given column from a different table if its association to the given table cannot be
      * verified.
      *
-     * @param   string              $table  The table where to look for the column or alias
+     * @param   array|string        $table  The table where to look for the column or alias
      * @param   string              $name   The name or alias of the column to validate
      * @param   RepositoryQuery     $query  An optional query to pass as context,
      *                                      if not given the column is considered being used for a statement filter
@@ -690,7 +695,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
         }
 
         if ($this->validateQueryColumnAssociation($table, $name)) {
-            return parent::requireFilterColumn($table, $name, $query);
+            return parent::requireFilterColumn($this->removeTablePrefix($this->clearTableAlias($table)), $name, $query);
         }
 
         return $this->joinColumn($name, $table, $query);
@@ -699,8 +704,8 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     /**
      * Return the statement column name for the given alias or null in case the alias does not exist
      *
-     * @param   string  $table
-     * @param   string  $alias
+     * @param   array|string    $table
+     * @param   string          $alias
      *
      * @return  string|null
      */
@@ -711,7 +716,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
             return $statementAliasColumnMap[$alias];
         }
 
-        $prefixedAlias = $this->removeTablePrefix($table) . '.' . $alias;
+        $prefixedAlias = $this->removeTablePrefix($this->clearTableAlias($table)) . '.' . $alias;
         if (isset($statementAliasColumnMap[$prefixedAlias])) {
             return $statementAliasColumnMap[$prefixedAlias];
         }
@@ -720,8 +725,8 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     /**
      * Return the alias for the given statement column name or null in case the statement column does not exist
      *
-     * @param   string  $table
-     * @param   string  $column
+     * @param   array|string    $table
+     * @param   string          $column
      *
      * @return  string|null
      */
@@ -732,7 +737,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
             return $statementColumnAliasMap[$column];
         }
 
-        $prefixedColumn = $this->removeTablePrefix($table) . '.' . $column;
+        $prefixedColumn = $this->removeTablePrefix($this->clearTableAlias($table)) . '.' . $column;
         if (isset($statementColumnAliasMap[$prefixedColumn])) {
             return $statementColumnAliasMap[$prefixedColumn];
         }
@@ -741,14 +746,14 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     /**
      * Return whether the given alias or statement column name is available in the given table
      *
-     * @param   string  $table
-     * @param   string  $alias
+     * @param   array|string    $table
+     * @param   string          $alias
      *
      * @return  bool
      */
     public function validateStatementColumnAssociation($table, $alias)
     {
-        $tableName = $this->removeTablePrefix($table);
+        $tableName = $this->removeTablePrefix($this->clearTableAlias($table));
 
         $statementAliasTableMap = $this->getStatementAliasTableMap();
         if (isset($statementAliasTableMap[$alias])) {
@@ -767,8 +772,8 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     /**
      * Return whether the given column name or alias of the given table is a valid statement column
      *
-     * @param   string  $table  The table where to look for the column or alias
-     * @param   string  $name   The column name or alias to check
+     * @param   array|string    $table  The table where to look for the column or alias
+     * @param   string          $name   The column name or alias to check
      *
      * @return  bool
      */
@@ -779,7 +784,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
              && $this->reassembleStatementColumnAlias($table, $name) === null)
             || !$this->validateStatementColumnAssociation($table, $name)
         ) {
-            return parent::hasStatementColumn($table, $name);
+            return parent::hasStatementColumn($this->removeTablePrefix($this->clearTableAlias($table)), $name);
         }
 
         return true;
@@ -788,12 +793,12 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
     /**
      * Validate that the given column is a valid statement column and return it or the actual name if it's an alias
      *
-     * @param   string  $table      The table for which to require the column
-     * @param   string  $name       The name or alias of the column to validate
+     * @param   array|string    $table  The table for which to require the column
+     * @param   string          $name   The name or alias of the column to validate
      *
-     * @return  string              The given column's name
+     * @return  string                  The given column's name
      *
-     * @throws  StatementException  In case the given column is not a statement column
+     * @throws  StatementException      In case the given column is not a statement column
      */
     public function requireStatementColumn($table, $name)
     {
@@ -802,11 +807,15 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
         } elseif (($alias = $this->reassembleStatementColumnAlias($table, $name)) !== null) {
             $column = $name;
         } else {
-            return parent::requireStatementColumn($table, $name);
+            return parent::requireStatementColumn($this->removeTablePrefix($this->clearTableAlias($table)), $name);
         }
 
         if (! $this->validateStatementColumnAssociation($table, $alias)) {
-            throw new StatementException('Statement column "%s" not found in table "%s"', $name, $table);
+            throw new StatementException(
+                'Statement column "%s" not found in table "%s"',
+                $name,
+                $this->removeTablePrefix($this->clearTableAlias($table))
+            );
         }
 
         return $column;
diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index 065548fb8..4c6a0270b 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -491,15 +491,18 @@ abstract class Repository implements Selectable
     /**
      * Convert a value supposed to be transmitted to the data source
      *
-     * @param   string  $table      The table where to persist the value
-     * @param   string  $name       The alias or column name
-     * @param   mixed   $value      The value to convert
+     * @param   string              $table      The table where to persist the value
+     * @param   string              $name       The alias or column name
+     * @param   mixed               $value      The value to convert
+     * @param   RepositoryQuery     $query      An optional query to pass as context
+     *                                          (Directly passed through to $this->getConverter)
      *
-     * @return  mixed               If conversion was possible, the converted value, otherwise the unchanged value
+     * @return  mixed                           If conversion was possible, the converted value,
+     *                                          otherwise the unchanged value
      */
-    public function persistColumn($table, $name, $value)
+    public function persistColumn($table, $name, $value, RepositoryQuery $query = null)
     {
-        $converter = $this->getConverter($table, $name, 'persist');
+        $converter = $this->getConverter($table, $name, 'persist', $query);
         if ($converter !== null) {
             $value = $this->$converter($value);
         }
@@ -510,15 +513,18 @@ abstract class Repository implements Selectable
     /**
      * Convert a value which was fetched from the data source
      *
-     * @param   string  $table      The table the value has been fetched from
-     * @param   string  $name       The alias or column name
-     * @param   mixed   $value      The value to convert
+     * @param   string              $table      The table the value has been fetched from
+     * @param   string              $name       The alias or column name
+     * @param   mixed               $value      The value to convert
+     * @param   RepositoryQuery     $query      An optional query to pass as context
+     *                                          (Directly passed through to $this->getConverter)
      *
-     * @return  mixed               If conversion was possible, the converted value, otherwise the unchanged value
+     * @return  mixed                           If conversion was possible, the converted value,
+     *                                          otherwise the unchanged value
      */
-    public function retrieveColumn($table, $name, $value)
+    public function retrieveColumn($table, $name, $value, RepositoryQuery $query = null)
     {
-        $converter = $this->getConverter($table, $name, 'retrieve');
+        $converter = $this->getConverter($table, $name, 'retrieve', $query);
         if ($converter !== null) {
             $value = $this->$converter($value);
         }
@@ -529,15 +535,17 @@ abstract class Repository implements Selectable
     /**
      * Return the name of the conversion method for the given alias or column name and context
      *
-     * @param   string  $table      The datasource's table
-     * @param   string  $name       The alias or column name for which to return a conversion method
-     * @param   string  $context    The context of the conversion: persist or retrieve
+     * @param   string              $table      The datasource's table
+     * @param   string              $name       The alias or column name for which to return a conversion method
+     * @param   string              $context    The context of the conversion: persist or retrieve
+     * @param   RepositoryQuery     $query      An optional query to pass as context
+     *                                          (unused by the base implementation)
      *
      * @return  string
      *
      * @throws  ProgrammingError    In case a conversion rule is found but not any conversion method
      */
-    protected function getConverter($table, $name, $context)
+    protected function getConverter($table, $name, $context, RepositoryQuery $query = null)
     {
         $conversionRules = $this->getConversionRules();
         if (! isset($conversionRules[$table])) {
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index bbe0ae251..1ca5b6703 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -153,7 +153,7 @@ class RepositoryQuery implements QueryInterface, Iterator
     {
         $this->query->where(
             $this->repository->requireFilterColumn($this->target, $column, $this),
-            $this->repository->persistColumn($this->target, $column, $value)
+            $this->repository->persistColumn($this->target, $column, $value, $this)
         );
         return $this;
     }
@@ -401,7 +401,7 @@ class RepositoryQuery implements QueryInterface, Iterator
         if ($result !== false && $this->repository->providesValueConversion($this->target)) {
             $columns = $this->getColumns();
             $column = isset($columns[0]) ? $columns[0] : key($columns);
-            return $this->repository->retrieveColumn($this->target, $column, $result);
+            return $this->repository->retrieveColumn($this->target, $column, $result, $this);
         }
 
         return $result;
@@ -425,7 +425,7 @@ class RepositoryQuery implements QueryInterface, Iterator
                     $alias = $column;
                 }
 
-                $result->$alias = $this->repository->retrieveColumn($this->target, $alias, $result->$alias);
+                $result->$alias = $this->repository->retrieveColumn($this->target, $alias, $result->$alias, $this);
             }
         }
 
@@ -450,7 +450,7 @@ class RepositoryQuery implements QueryInterface, Iterator
             $column = is_int($aliases[0]) ? $columns[0] : $aliases[0];
             if ($this->repository->providesValueConversion($this->target, $column)) {
                 foreach ($results as & $value) {
-                    $value = $this->repository->retrieveColumn($this->target, $column, $value);
+                    $value = $this->repository->retrieveColumn($this->target, $column, $value, $this);
                 }
             }
         }
@@ -483,8 +483,13 @@ class RepositoryQuery implements QueryInterface, Iterator
             ) {
                 $newResults = array();
                 foreach ($results as $colOneValue => $colTwoValue) {
-                    $colOneValue = $this->repository->retrieveColumn($this->target, $colOne, $colOneValue);
-                    $newResults[$colOneValue] = $this->repository->retrieveColumn($this->target, $colTwo, $colTwoValue);
+                    $colOneValue = $this->repository->retrieveColumn($this->target, $colOne, $colOneValue, $this);
+                    $newResults[$colOneValue] = $this->repository->retrieveColumn(
+                        $this->target,
+                        $colTwo,
+                        $colTwoValue,
+                        $this
+                    );
                 }
 
                 $results = $newResults;
@@ -516,7 +521,7 @@ class RepositoryQuery implements QueryInterface, Iterator
                         $alias = $column;
                     }
 
-                    $row->$alias = $this->repository->retrieveColumn($this->target, $alias, $row->$alias);
+                    $row->$alias = $this->repository->retrieveColumn($this->target, $alias, $row->$alias, $this);
                 }
 
                 foreach (($this->getOrder() ?: array()) as $rule) {
@@ -591,7 +596,7 @@ class RepositoryQuery implements QueryInterface, Iterator
                     $alias = $column;
                 }
 
-                $row->$alias = $this->repository->retrieveColumn($this->target, $alias, $row->$alias);
+                $row->$alias = $this->repository->retrieveColumn($this->target, $alias, $row->$alias, $this);
             }
         }
 

From 3e5e6ec64ed4f0aaaca54397cc8c2ea5436ffc56 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 3 Jul 2015 13:36:24 +0200
Subject: [PATCH 2470/2920] ToggleInstanceFeaturesCommandForm: Only issue a
 command for changes

---
 .../Instance/ToggleInstanceFeaturesCommandForm.php  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index 9ef90718f..18f2f8aab 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -254,18 +254,19 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
         );
 
         foreach ($this->getValues() as $feature => $enabled) {
-            $toggleFeature = new ToggleInstanceFeatureCommand();
-            $toggleFeature
-                ->setFeature($feature)
-                ->setEnabled($enabled);
-            $this->getTransport($this->request)->send($toggleFeature);
-
             if ((bool) $this->status->{$feature} !== (bool) $enabled) {
+                $toggleFeature = new ToggleInstanceFeatureCommand();
+                $toggleFeature
+                    ->setFeature($feature)
+                    ->setEnabled($enabled);
+                $this->getTransport($this->request)->send($toggleFeature);
+
                 Notification::success(
                     $notifications[$feature][$enabled ? 0 : 1]
                 );
             }
         }
+
         return true;
     }
 }

From 74a916d72ad021d42ea4680c9529573c3eff9b04 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 3 Jul 2015 14:17:06 +0200
Subject: [PATCH 2471/2920] Hide feature commands which are not supported by
 Icinga 2 from the user

fixes #7930
---
 .../ToggleInstanceFeaturesCommandForm.php     | 142 +++++++++---------
 .../ToggleObjectFeaturesCommandForm.php       | 106 +++++++------
 .../Controller/MonitoredObjectController.php  |   1 +
 3 files changed, 134 insertions(+), 115 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index 18f2f8aab..d487647e2 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -8,7 +8,7 @@ use Icinga\Module\Monitoring\Forms\Command\CommandForm;
 use Icinga\Web\Notification;
 
 /**
- * Form for enabling or disabling features of Icinga objects, i.e. hosts or services
+ * Form for enabling or disabling features of Icinga instances
  */
 class ToggleInstanceFeaturesCommandForm extends CommandForm
 {
@@ -79,65 +79,68 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
         } else {
             $notificationDescription = null;
         }
+
         $toggleDisabled = $this->hasPermission('monitoring/command/feature/instance') ? null : '';
-        $this->addElements(array(
+
+        $this->addElement(
+            'checkbox',
+            ToggleInstanceFeatureCommand::FEATURE_ACTIVE_HOST_CHECKS,
             array(
-                'checkbox',
-                ToggleInstanceFeatureCommand::FEATURE_ACTIVE_HOST_CHECKS,
-                array(
-                    'label'         =>  $this->translate('Active Host Checks'),
-                    'autosubmit'    => true,
-                    'disabled'      => $toggleDisabled
-                )
-            ),
+                'label'         =>  $this->translate('Active Host Checks'),
+                'autosubmit'    => true,
+                'disabled'      => $toggleDisabled
+            )
+        );
+        $this->addElement(
+            'checkbox',
+            ToggleInstanceFeatureCommand::FEATURE_ACTIVE_SERVICE_CHECKS,
             array(
-                'checkbox',
-                ToggleInstanceFeatureCommand::FEATURE_ACTIVE_SERVICE_CHECKS,
-                array(
-                    'label'         =>  $this->translate('Active Service Checks'),
-                    'autosubmit'    => true,
-                    'disabled'      => $toggleDisabled
-                )
-            ),
+                'label'         =>  $this->translate('Active Service Checks'),
+                'autosubmit'    => true,
+                'disabled'      => $toggleDisabled
+            )
+        );
+        $this->addElement(
+            'checkbox',
+            ToggleInstanceFeatureCommand::FEATURE_EVENT_HANDLERS,
             array(
-                'checkbox',
-                ToggleInstanceFeatureCommand::FEATURE_EVENT_HANDLERS,
-                array(
-                    'label'         => $this->translate('Event Handlers'),
-                    'autosubmit'    => true,
-                    'disabled'      => $toggleDisabled
-                )
-            ),
+                'label'         => $this->translate('Event Handlers'),
+                'autosubmit'    => true,
+                'disabled'      => $toggleDisabled
+            )
+        );
+        $this->addElement(
+            'checkbox',
+            ToggleInstanceFeatureCommand::FEATURE_FLAP_DETECTION,
             array(
-                'checkbox',
-                ToggleInstanceFeatureCommand::FEATURE_FLAP_DETECTION,
-                array(
-                    'label'         => $this->translate('Flap Detection'),
-                    'autosubmit'    => true,
-                    'disabled'      => $toggleDisabled
-                )
-            ),
+                'label'         => $this->translate('Flap Detection'),
+                'autosubmit'    => true,
+                'disabled'      => $toggleDisabled
+            )
+        );
+        $this->addElement(
+            'checkbox',
+            ToggleInstanceFeatureCommand::FEATURE_NOTIFICATIONS,
             array(
-                'checkbox',
-                ToggleInstanceFeatureCommand::FEATURE_NOTIFICATIONS,
-                array(
-                    'label'         => $this->translate('Notifications'),
-                    'autosubmit'    => true,
-                    'description'   => $notificationDescription,
-                    'decorators'    => array(
-                        'ViewHelper',
-                        'Errors',
-                        array(
-                            'Description',
-                            array('tag' => 'span', 'class' => 'description', 'escape' => false)
-                        ),
-                        'Label',
-                        array('HtmlTag', array('tag' => 'div'))
+                'label'         => $this->translate('Notifications'),
+                'autosubmit'    => true,
+                'description'   => $notificationDescription,
+                'decorators'    => array(
+                    'ViewHelper',
+                    'Errors',
+                    array(
+                        'Description',
+                        array('tag' => 'span', 'class' => 'description', 'escape' => false)
                     ),
-                    'disabled'      => $toggleDisabled
-                )
-            ),
-            array(
+                    'Label',
+                    array('HtmlTag', array('tag' => 'div'))
+                ),
+                'disabled'      => $toggleDisabled
+            )
+        );
+
+        if (! preg_match('~^v2\.\d+\.\d+.*$~', $this->status->program_version)) {
+            $this->addElement(
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_HOST_OBSESSING,
                 array(
@@ -145,8 +148,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                     'autosubmit'    => true,
                     'disabled'      => $toggleDisabled
                 )
-            ),
-            array(
+            );
+            $this->addElement(
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_SERVICE_OBSESSING,
                 array(
@@ -154,8 +157,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                     'autosubmit'    => true,
                     'disabled'      => $toggleDisabled
                 )
-            ),
-            array(
+            );
+            $this->addElement(
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_PASSIVE_HOST_CHECKS,
                 array(
@@ -163,8 +166,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                     'autosubmit'    => true,
                     'disabled'      => $toggleDisabled
                 )
-            ),
-            array(
+            );
+            $this->addElement(
                 'checkbox',
                 ToggleInstanceFeatureCommand::FEATURE_PASSIVE_SERVICE_CHECKS,
                 array(
@@ -172,18 +175,18 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
                     'autosubmit'    => true,
                     'disabled'      => $toggleDisabled
                 )
-            ),
+            );
+        }
+
+        $this->addElement(
+            'checkbox',
+            ToggleInstanceFeatureCommand::FEATURE_PERFORMANCE_DATA,
             array(
-                'checkbox',
-                ToggleInstanceFeatureCommand::FEATURE_PERFORMANCE_DATA,
-                array(
-                    'label'         =>  $this->translate('Performance Data'),
-                    'autosubmit'    => true,
-                    'disabled'      => $toggleDisabled
-                )
+                'label'         =>  $this->translate('Performance Data'),
+                'autosubmit'    => true,
+                'disabled'      => $toggleDisabled
             )
-        ));
-        return $this;
+        );
     }
 
     /**
@@ -199,6 +202,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
         foreach ($this->getValues() as $feature => $enabled) {
             $this->getElement($feature)->setChecked($instanceStatus->{$feature});
         }
+
         return $this;
     }
 
diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
index 6dfbd2670..7b8ee9738 100644
--- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
@@ -31,26 +31,28 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
     public function createElements(array $formData = array())
     {
         $toggleDisabled = $this->hasPermission('monitoring/command/feature/object')  ? null : '';
-        $this->addElements(array(
+
+        $this->addElement(
+            'checkbox',
+            ToggleObjectFeatureCommand::FEATURE_ACTIVE_CHECKS,
             array(
-                'checkbox',
-                ToggleObjectFeatureCommand::FEATURE_ACTIVE_CHECKS,
-                array(
-                    'label'         => $this->translate('Active Checks'),
-                    'autosubmit'    => true,
-                    'disabled'      => $toggleDisabled
-                )
-            ),
-            array(
-                'checkbox',
-                ToggleObjectFeatureCommand::FEATURE_PASSIVE_CHECKS,
-                array(
-                    'label'         => $this->translate('Passive Checks'),
-                    'autosubmit'    => true,
-                    'disabled'      => $toggleDisabled
-                )
-            ),
+                'label'         => $this->translate('Active Checks'),
+                'autosubmit'    => true,
+                'disabled'      => $toggleDisabled
+            )
+        );
+        $this->addElement(
+            'checkbox',
+            ToggleObjectFeatureCommand::FEATURE_PASSIVE_CHECKS,
             array(
+                'label'         => $this->translate('Passive Checks'),
+                'autosubmit'    => true,
+                'disabled'      => $toggleDisabled
+            )
+        );
+
+        if (! preg_match('~^v2\.\d+\.\d+.*$~', $this->getIcingaVersion())) {
+            $this->addElement(
                 'checkbox',
                 ToggleObjectFeatureCommand::FEATURE_OBSESSING,
                 array(
@@ -58,36 +60,36 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                     'autosubmit'    => true,
                     'disabled'      => $toggleDisabled
                 )
-            ),
+            );
+        }
+
+        $this->addElement(
+            'checkbox',
+            ToggleObjectFeatureCommand::FEATURE_NOTIFICATIONS,
             array(
-                'checkbox',
-                ToggleObjectFeatureCommand::FEATURE_NOTIFICATIONS,
-                array(
-                    'label'         => $this->translate('Notifications'),
-                    'autosubmit'    => true,
-                    'disabled'      => $toggleDisabled
-                )
-            ),
-            array(
-                'checkbox',
-                ToggleObjectFeatureCommand::FEATURE_EVENT_HANDLER,
-                array(
-                    'label'         => $this->translate('Event Handler'),
-                    'autosubmit'    => true,
-                    'disabled'      => $toggleDisabled
-                )
-            ),
-            array(
-                'checkbox',
-                ToggleObjectFeatureCommand::FEATURE_FLAP_DETECTION,
-                array(
-                    'label'         => $this->translate('Flap Detection'),
-                    'autosubmit'    => true,
-                    'disabled'      => $toggleDisabled
-                )
+                'label'         => $this->translate('Notifications'),
+                'autosubmit'    => true,
+                'disabled'      => $toggleDisabled
             )
-        ));
-        return $this;
+        );
+        $this->addElement(
+            'checkbox',
+            ToggleObjectFeatureCommand::FEATURE_EVENT_HANDLER,
+            array(
+                'label'         => $this->translate('Event Handler'),
+                'autosubmit'    => true,
+                'disabled'      => $toggleDisabled
+            )
+        );
+        $this->addElement(
+            'checkbox',
+            ToggleObjectFeatureCommand::FEATURE_FLAP_DETECTION,
+            array(
+                'label'         => $this->translate('Flap Detection'),
+                'autosubmit'    => true,
+                'disabled'      => $toggleDisabled
+            )
+        );
     }
 
     /**
@@ -107,6 +109,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 $element->setDescription($this->translate('changed'));
             }
         }
+
         return $this;
     }
 
@@ -162,6 +165,17 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
                 }
             }
         }
+
         return true;
     }
+
+    /**
+     * Fetch and return the program version of the current instance
+     *
+     * @return  string
+     */
+    protected function getIcingaVersion()
+    {
+        return $this->getBackend()->select()->from('programstatus', array('program_version'))->fetchOne();
+    }
 }
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index ac903207e..7b8785a9c 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -76,6 +76,7 @@ abstract class MonitoredObjectController extends Controller
         $this->object->populate();
         $toggleFeaturesForm = new ToggleObjectFeaturesCommandForm();
         $toggleFeaturesForm
+            ->setBackend($this->backend)
             ->load($this->object)
             ->setObjects($this->object)
             ->handleRequest();

From cef9b58029c0528ac59e9b11a826d3e6c1876d75 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 3 Jul 2015 15:07:58 +0200
Subject: [PATCH 2472/2920] InstancePage: Show missing fields

fixes #9540
---
 .../application/forms/Setup/InstancePage.php          | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/forms/Setup/InstancePage.php b/modules/monitoring/application/forms/Setup/InstancePage.php
index 4dd6a5a09..d16646e3e 100644
--- a/modules/monitoring/application/forms/Setup/InstancePage.php
+++ b/modules/monitoring/application/forms/Setup/InstancePage.php
@@ -20,8 +20,13 @@ class InstancePage extends Form
     public function createElements(array $formData)
     {
         $instanceConfigForm = new InstanceConfigForm();
-        $instanceConfigForm->createElements($formData);
-        $this->addElements($instanceConfigForm->getElements());
-        $this->getElement('name')->setValue('icinga');
+        $this->addSubForm($instanceConfigForm, 'instance_form');
+        $instanceConfigForm->create($formData);
+        $instanceConfigForm->getElement('name')->setValue('icinga');
+    }
+
+    public function getValues($suppressArrayNotation = false)
+    {
+        return $this->getSubForm('instance_form')->getValues($suppressArrayNotation);
     }
 }

From c8c0e131841651fc3945e39d7f3a77c588c952df Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 3 Jul 2015 16:31:11 +0200
Subject: [PATCH 2473/2920] Wizard: Show a textarea on the finish page instead
 of multiple paragraphs

refs #7911
---
 .../library/Monitoring/BackendStep.php        | 39 +++++++++------
 .../library/Monitoring/InstanceStep.php       | 20 +++++---
 .../library/Monitoring/SecurityStep.php       | 20 +++++---
 .../views/scripts/index/parts/finish.phtml    | 27 ++++------
 modules/setup/library/Setup/Setup.php         |  7 ++-
 modules/setup/library/Setup/Step.php          |  4 +-
 .../Setup/Steps/AuthenticationStep.php        | 45 +++++++++++------
 .../library/Setup/Steps/DatabaseStep.php      | 12 +++--
 .../library/Setup/Steps/GeneralConfigStep.php | 16 ++++--
 .../library/Setup/Steps/ResourceStep.php      | 16 ++++--
 .../library/Setup/Utils/EnableModuleStep.php  |  8 +--
 .../setup/library/Setup/Utils/MakeDirStep.php |  8 +--
 public/css/icinga/setup.less                  | 50 ++++++-------------
 13 files changed, 146 insertions(+), 126 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/BackendStep.php b/modules/monitoring/library/Monitoring/BackendStep.php
index 47264c231..28d5a3db4 100644
--- a/modules/monitoring/library/Monitoring/BackendStep.php
+++ b/modules/monitoring/library/Monitoring/BackendStep.php
@@ -136,28 +136,35 @@ class BackendStep extends Step
 
     public function getReport()
     {
-        $report = '';
+        $report = array();
+
         if ($this->backendIniError === false) {
-            $message = mt('monitoring', 'Monitoring backend configuration has been successfully written to: %s');
-            $report .= '<p>' . sprintf($message, Config::resolvePath('modules/monitoring/backends.ini')) . '</p>';
-        } elseif ($this->backendIniError !== null) {
-            $message = mt(
-                'monitoring',
-                'Monitoring backend configuration could not be written to: %s; An error occured:'
-            );
-            $report .= '<p class="error">' . sprintf(
-                $message,
+            $report[] = sprintf(
+                mt('monitoring', 'Monitoring backend configuration has been successfully written to: %s'),
                 Config::resolvePath('modules/monitoring/backends.ini')
-            ) . '</p><p>' . $this->backendIniError->getMessage() . '</p>';
+            );
+        } elseif ($this->backendIniError !== null) {
+            $report[] = sprintf(
+                mt(
+                    'monitoring',
+                    'Monitoring backend configuration could not be written to: %s. An error occured:'
+                ),
+                Config::resolvePath('modules/monitoring/backends.ini')
+            );
+            $report[] = sprintf(mt('setup', 'ERROR: %s'), $this->backendIniError->getMessage());
         }
 
         if ($this->resourcesIniError === false) {
-            $message = mt('monitoring', 'Resource configuration has been successfully updated: %s');
-            $report .= '<p>' . sprintf($message, Config::resolvePath('resources.ini')) . '</p>';
+            $report[] = sprintf(
+                mt('monitoring', 'Resource configuration has been successfully updated: %s'),
+                Config::resolvePath('resources.ini')
+            );
         } elseif ($this->resourcesIniError !== null) {
-            $message = mt('monitoring', 'Resource configuration could not be udpated: %s; An error occured:');
-            $report .= '<p class="error">' . sprintf($message, Config::resolvePath('resources.ini')) . '</p>'
-                . '<p>' . $this->resourcesIniError->getMessage() . '</p>';
+            $report[] = sprintf(
+                mt('monitoring', 'Resource configuration could not be udpated: %s. An error occured:'),
+                Config::resolvePath('resources.ini')
+            );
+            $report[] = sprintf(mt('setup', 'ERROR: %s'), $this->resourcesIniError->getMessage());
         }
 
         return $report;
diff --git a/modules/monitoring/library/Monitoring/InstanceStep.php b/modules/monitoring/library/Monitoring/InstanceStep.php
index cb85d695d..8e39a9bf5 100644
--- a/modules/monitoring/library/Monitoring/InstanceStep.php
+++ b/modules/monitoring/library/Monitoring/InstanceStep.php
@@ -85,15 +85,21 @@ class InstanceStep extends Step
     public function getReport()
     {
         if ($this->error === false) {
-            $message = mt('monitoring', 'Monitoring instance configuration has been successfully created: %s');
-            return '<p>' . sprintf($message, Config::resolvePath('modules/monitoring/instances.ini')) . '</p>';
+            return array(sprintf(
+                mt('monitoring', 'Monitoring instance configuration has been successfully created: %s'),
+                Config::resolvePath('modules/monitoring/instances.ini')
+            ));
         } elseif ($this->error !== null) {
-            $message = mt(
-                'monitoring',
-                'Monitoring instance configuration could not be written to: %s; An error occured:'
+            return array(
+                sprintf(
+                    mt(
+                        'monitoring',
+                        'Monitoring instance configuration could not be written to: %s. An error occured:'
+                    ),
+                    Config::resolvePath('modules/monitoring/instances.ini')
+                ),
+                sprintf(mt('setup', 'ERROR: %s'), $this->error->getMessage())
             );
-            return '<p class="error">' . sprintf($message, Config::resolvePath('modules/monitoring/instances.ini'))
-                . '</p><p>' . $this->error->getMessage() . '</p>';
         }
     }
 }
diff --git a/modules/monitoring/library/Monitoring/SecurityStep.php b/modules/monitoring/library/Monitoring/SecurityStep.php
index b4ba5e19a..16f2dd4d4 100644
--- a/modules/monitoring/library/Monitoring/SecurityStep.php
+++ b/modules/monitoring/library/Monitoring/SecurityStep.php
@@ -63,15 +63,21 @@ class SecurityStep extends Step
     public function getReport()
     {
         if ($this->error === false) {
-            $message = mt('monitoring', 'Monitoring security configuration has been successfully created: %s');
-            return '<p>' . sprintf($message, Config::resolvePath('modules/monitoring/config.ini')) . '</p>';
+            return array(sprintf(
+                mt('monitoring', 'Monitoring security configuration has been successfully created: %s'),
+                Config::resolvePath('modules/monitoring/config.ini')
+            ));
         } elseif ($this->error !== null) {
-            $message = mt(
-                'monitoring',
-                'Monitoring security configuration could not be written to: %s; An error occured:'
+            return array(
+                sprintf(
+                    mt(
+                        'monitoring',
+                        'Monitoring security configuration could not be written to: %s. An error occured:'
+                    ),
+                    Config::resolvePath('modules/monitoring/config.ini')
+                ),
+                sprintf(mt('setup', 'ERROR: %s'), $this->error->getMessage())
             );
-            return '<p class="error">' . sprintf($message, Config::resolvePath('modules/monitoring/config.ini'))
-                . '</p><p>' . $this->error->getMessage() . '</p>';
         }
     }
 }
diff --git a/modules/setup/application/views/scripts/index/parts/finish.phtml b/modules/setup/application/views/scripts/index/parts/finish.phtml
index 0018d0d43..7066f7f2e 100644
--- a/modules/setup/application/views/scripts/index/parts/finish.phtml
+++ b/modules/setup/application/views/scripts/index/parts/finish.phtml
@@ -1,22 +1,10 @@
 <div id="setup-finish">
-  <div class="report">
-  <?php $firstLine = true; ?>
-  <?php foreach ($report as $entry): ?>
-    <?php if ($entry): ?>
-      <?php if (false === $firstLine): ?>
-        <div class="line-separator"></div>
-      <?php endif ?>
-      <?= $entry; ?>
-      <?php $firstLine = false; ?>
-    <?php endif ?>
-  <?php endforeach ?>
-  <?php if ($success): ?>
-    <p class="success"><?= $this->translate('Congratulations! Icinga Web 2 has been successfully set up.'); ?></p>
-  <?php else: ?>
-    <p class="failure"><?= $this->translate('Sorry! Failed to set up Icinga Web 2 successfully.'); ?></p>
-  <?php endif ?>
-  </div>
-  <div class="buttons">
+ <?php if ($success): ?>
+  <h2 class="success"><?= $this->translate('Congratulations! Icinga Web 2 has been successfully set up.'); ?></h2>
+ <?php else: ?>
+  <h2 class="failure"><?= $this->translate('Sorry! Failed to set up Icinga Web 2 successfully.'); ?></h2>
+ <?php endif ?>
+  <div class="buttons pull-right">
   <?php if ($success): ?>
     <?= $this->qlink(
         $this->translate('Login to Icinga Web 2'),
@@ -39,4 +27,7 @@
     ); ?>
   <?php endif ?>
   </div>
+  <textarea class="report" readonly><?= join("\n\n", array_map(function($a) {
+    return join("\n", $a);
+  }, $report)); ?></textarea>
 </div>
\ No newline at end of file
diff --git a/modules/setup/library/Setup/Setup.php b/modules/setup/library/Setup/Setup.php
index 02da366e8..fa508ed35 100644
--- a/modules/setup/library/Setup/Setup.php
+++ b/modules/setup/library/Setup/Setup.php
@@ -81,13 +81,16 @@ class Setup implements IteratorAggregate
     /**
      * Return a report of all actions that were run
      *
-     * @return  array       An array of HTML strings
+     * @return  array       An array of arrays of strings
      */
     public function getReport()
     {
         $reports = array();
         foreach ($this->steps as $step) {
-            $reports[] = $step->getReport();
+            $report = $step->getReport();
+            if (! empty($report)) {
+                $reports[] = $report;
+            }
         }
 
         return $reports;
diff --git a/modules/setup/library/Setup/Step.php b/modules/setup/library/Setup/Step.php
index 82abce751..7b2c947ea 100644
--- a/modules/setup/library/Setup/Step.php
+++ b/modules/setup/library/Setup/Step.php
@@ -23,9 +23,9 @@ abstract class Step
     abstract public function getSummary();
 
     /**
-     * Return a HTML representation of this step's configuration changes that were made
+     * Return a textual summary of all configuration changes made
      *
-     * @return  string
+     * @return  array
      */
     abstract public function getReport();
 }
diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
index 58d9d68d7..0f35e5c51 100644
--- a/modules/setup/library/Setup/Steps/AuthenticationStep.php
+++ b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -161,32 +161,45 @@ class AuthenticationStep extends Step
 
     public function getReport()
     {
-        $report = '';
+        $report = array();
+
         if ($this->authIniError === false) {
-            $message = mt('setup', 'Authentication configuration has been successfully written to: %s');
-            $report .= '<p>' . sprintf($message, Config::resolvePath('authentication.ini')) . '</p>';
+            $report[] = sprintf(
+                mt('setup', 'Authentication configuration has been successfully written to: %s'),
+                Config::resolvePath('authentication.ini')
+            );
         } elseif ($this->authIniError !== null) {
-            $message = mt('setup', 'Authentication configuration could not be written to: %s; An error occured:');
-            $report .= '<p class="error">' . sprintf($message, Config::resolvePath('authentication.ini')) . '</p>'
-                . '<p>' . $this->authIniError->getMessage() . '</p>';
+            $report[] = sprintf(
+                mt('setup', 'Authentication configuration could not be written to: %s. An error occured:'),
+                Config::resolvePath('authentication.ini')
+            );
+            $report[] = sprintf(mt('setup', 'ERROR: %s'), $this->authIniError->getMessage());
         }
 
         if ($this->dbError === false) {
-            $message = mt('setup', 'Account "%s" has been successfully created.');
-            $report .= '<p>' . sprintf($message, $this->data['adminAccountData']['username']) . '</p>';
+            $report[] = sprintf(
+                mt('setup', 'Account "%s" has been successfully created.'),
+                $this->data['adminAccountData']['username']
+            );
         } elseif ($this->dbError !== null) {
-            $message = mt('setup', 'Unable to create account "%s". An error occured:');
-            $report .= '<p class="error">' . sprintf($message, $this->data['adminAccountData']['username']) . '</p>'
-                . '<p>' . $this->dbError->getMessage() . '</p>';
+            $report[] = sprintf(
+                mt('setup', 'Unable to create account "%s". An error occured:'),
+                $this->data['adminAccountData']['username']
+            );
+            $report[] = sprintf(mt('setup', 'ERROR: %s'), $this->dbError->getMessage());
         }
 
         if ($this->permIniError === false) {
-            $message = mt('setup', 'Account "%s" has been successfully defined as initial administrator.');
-            $report .= '<p>' . sprintf($message, $this->data['adminAccountData']['username']) . '</p>';
+            $report[] = sprintf(
+                mt('setup', 'Account "%s" has been successfully defined as initial administrator.'),
+                $this->data['adminAccountData']['username']
+            );
         } elseif ($this->permIniError !== null) {
-            $message = mt('setup', 'Unable to define account "%s" as initial administrator. An error occured:');
-            $report .= '<p class="error">' . sprintf($message, $this->data['adminAccountData']['username']) . '</p>'
-                . '<p>' . $this->permIniError->getMessage() . '</p>';
+            $report[] = sprintf(
+                mt('setup', 'Unable to define account "%s" as initial administrator. An error occured:'),
+                $this->data['adminAccountData']['username']
+            );
+            $report[] = sprintf(mt('setup', 'ERROR: %s'), $this->permIniError->getMessage());
         }
 
         return $report;
diff --git a/modules/setup/library/Setup/Steps/DatabaseStep.php b/modules/setup/library/Setup/Steps/DatabaseStep.php
index fdbdc41f1..4e8b91fb8 100644
--- a/modules/setup/library/Setup/Steps/DatabaseStep.php
+++ b/modules/setup/library/Setup/Steps/DatabaseStep.php
@@ -247,12 +247,14 @@ class DatabaseStep extends Step
     public function getReport()
     {
         if ($this->error === false) {
-            return '<p>' . join('</p><p>', $this->messages) . '</p>'
-                . '<p>' . mt('setup', 'The database has been fully set up!') . '</p>';
+            $report = $this->messages;
+            $report[] = mt('setup', 'The database has been fully set up!');
+            return $report;
         } elseif ($this->error !== null) {
-            $message = mt('setup', 'Failed to fully setup the database. An error occured:');
-            return '<p>' . join('</p><p>', $this->messages) . '</p>'
-                . '<p class="error">' . $message . '</p><p>' . $this->error->getMessage() . '</p>';
+            $report = $this->messages;
+            $report[] = mt('setup', 'Failed to fully setup the database. An error occured:');
+            $report[] = sprintf(mt('setup', 'ERROR: %s'), $this->error->getMessage());
+            return $report;
         }
     }
 
diff --git a/modules/setup/library/Setup/Steps/GeneralConfigStep.php b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
index 86462bbb0..994517fd6 100644
--- a/modules/setup/library/Setup/Steps/GeneralConfigStep.php
+++ b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
@@ -102,12 +102,18 @@ class GeneralConfigStep extends Step
     public function getReport()
     {
         if ($this->error === false) {
-            $message = mt('setup', 'General configuration has been successfully written to: %s');
-            return '<p>' . sprintf($message, Config::resolvePath('config.ini')) . '</p>';
+            return array(sprintf(
+                mt('setup', 'General configuration has been successfully written to: %s'),
+                Config::resolvePath('config.ini')
+            ));
         } elseif ($this->error !== null) {
-            $message = mt('setup', 'General configuration could not be written to: %s; An error occured:');
-            return '<p class="error">' . sprintf($message, Config::resolvePath('config.ini')) . '</p>'
-                . '<p>' . $this->error->getMessage() . '</p>';
+            return array(
+                sprintf(
+                    mt('setup', 'General configuration could not be written to: %s. An error occured:'),
+                    Config::resolvePath('config.ini')
+                ),
+                sprintf(mt('setup', 'ERROR: %s'), $this->error->getMessage())
+            );
         }
     }
 }
diff --git a/modules/setup/library/Setup/Steps/ResourceStep.php b/modules/setup/library/Setup/Steps/ResourceStep.php
index 36f898f5c..f2f20c750 100644
--- a/modules/setup/library/Setup/Steps/ResourceStep.php
+++ b/modules/setup/library/Setup/Steps/ResourceStep.php
@@ -133,12 +133,18 @@ class ResourceStep extends Step
     public function getReport()
     {
         if ($this->error === false) {
-            $message = mt('setup', 'Resource configuration has been successfully written to: %s');
-            return '<p>' . sprintf($message, Config::resolvePath('resources.ini')) . '</p>';
+            return array(sprintf(
+                mt('setup', 'Resource configuration has been successfully written to: %s'),
+                Config::resolvePath('resources.ini')
+            ));
         } elseif ($this->error !== null) {
-            $message = mt('setup', 'Resource configuration could not be written to: %s; An error occured:');
-            return '<p class="error">' . sprintf($message, Config::resolvePath('resources.ini')) . '</p>'
-                . '<p>' . $this->error->getMessage() . '</p>';
+            return array(
+                sprintf(
+                    mt('setup', 'Resource configuration could not be written to: %s. An error occured:'),
+                    Config::resolvePath('resources.ini')
+                ),
+                sprintf(mt('setup', 'ERROR: %s'), $this->error->getMessage())
+            );
         }
     }
 }
diff --git a/modules/setup/library/Setup/Utils/EnableModuleStep.php b/modules/setup/library/Setup/Utils/EnableModuleStep.php
index 2cb88e2b1..7c29e59f7 100644
--- a/modules/setup/library/Setup/Utils/EnableModuleStep.php
+++ b/modules/setup/library/Setup/Utils/EnableModuleStep.php
@@ -53,13 +53,13 @@ class EnableModuleStep extends Step
         $okMessage = mt('setup', 'Module "%s" has been successfully enabled.');
         $failMessage = mt('setup', 'Module "%s" could not be enabled. An error occured:');
 
-        $report = '';
+        $report = array();
         foreach ($this->moduleNames as $moduleName) {
             if (isset($this->errors[$moduleName])) {
-                $report .= '<p class="error">' . sprintf($failMessage, $moduleName) . '</p>'
-                    . '<p>' . $this->errors[$moduleName]->getMessage() . '</p>';
+                $report[] = sprintf($failMessage, $moduleName);
+                $report[] = sprintf(mt('setup', 'ERROR: %s'), $this->errors[$moduleName]->getMessage());
             } else {
-                $report .= '<p>' . sprintf($okMessage, $moduleName) . '</p>';
+                $report[] = sprintf($okMessage, $moduleName);
             }
         }
 
diff --git a/modules/setup/library/Setup/Utils/MakeDirStep.php b/modules/setup/library/Setup/Utils/MakeDirStep.php
index 51397ad3d..5e486d561 100644
--- a/modules/setup/library/Setup/Utils/MakeDirStep.php
+++ b/modules/setup/library/Setup/Utils/MakeDirStep.php
@@ -53,14 +53,14 @@ class MakeDirStep extends Step
         $okMessage = mt('setup', 'Directory "%s" in "%s" has been successfully created.');
         $failMessage = mt('setup', 'Unable to create directory "%s" in "%s". An error occured:');
 
-        $report = '';
+        $report = array();
         foreach ($this->paths as $path) {
             if (array_key_exists($path, $this->errors)) {
                 if (is_array($this->errors[$path])) {
-                    $report .= '<p class="error">' . sprintf($failMessage, basename($path), dirname($path)) . '</p>'
-                        . '<p>' . $this->errors[$path]['message'] . '</p>';
+                    $report[] = sprintf($failMessage, basename($path), dirname($path));
+                    $report[] = sprintf(mt('setup', 'ERROR: %s'), $this->errors[$path]['message']);
                 } else {
-                    $report .= '<p>' . sprintf($okMessage, basename($path), dirname($path)) . '</p>';
+                    $report[] = sprintf($okMessage, basename($path), dirname($path));
                 }
             }
         }
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index 0cc291a78..b69d3f5e9 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -300,48 +300,28 @@ form#setup_requirements {
   }
 }
 
-.conspicuous-state-notification {
-  width: 66%;
-  margin: 0 auto;
-  padding: 0.5em;
-  color: white;
-  font-weight: bold;
-}
-
 #setup-finish {
-  div.report {
-    padding: 1em;
-    border: 1px solid lightgrey;
-    border-radius: 0em;
+  h2 {
+    padding: 0.5em;
+    border-bottom: 0;
+    font-variant: normal;
+    font-weight: bold;
+    color: white;
 
-    div.line-separator {
-      width: 50%;
-      height: 1px;
-      margin: 0 auto;
-      background-color: white;
+    &.success {
+      background-color: @colorOk;
     }
 
-    p {
-      margin: 1em;
-      color: #444;
-      text-align: center;
-
-      &.error {
-        color: red;
-      }
-
-      &.failure {
-        .conspicuous-state-notification;
-        background-color: @colorCritical;
-      }
-
-      &.success {
-        .conspicuous-state-notification;
-        background-color: @colorOk;
-      }
+    &.failure {
+      background-color: @colorCritical;
     }
   }
 
+  textarea.report {
+    width: 66%;
+    height: 25em;
+  }
+
   div.buttons {
     text-align: center;
   }

From 9b36027f420e7ca4b2ee071cc325e86e2891c6a7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 6 Jul 2015 09:17:58 +0200
Subject: [PATCH 2474/2920] Wizard: Make the "button" on the finish page a bit
 more prominent

refs #7911
---
 public/css/icinga/setup.less | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index b69d3f5e9..ef4614237 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -323,7 +323,12 @@ form#setup_requirements {
   }
 
   div.buttons {
+    margin-top: 0.5em;
     text-align: center;
+
+    a {
+      padding: 0.5em;
+    }
   }
 }
 

From aa88c3ba1b274b3a5d150c3ce01ce5f65c48e660 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 6 Jul 2015 13:35:46 +0200
Subject: [PATCH 2475/2920] layout-structure.less: Add clearfix class

---
 public/css/icinga/layout-structure.less | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 7d1c415f6..2b4228b5f 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -389,6 +389,14 @@ html {
   width: 1px;
 }
 
+.clearfix:after {
+  content: ".";
+  visibility: hidden;
+  display: block;
+  height: 0;
+  clear: both;
+}
+
 .multi-commands {
   padding-top: 0em;
   font-size: 0.9em;

From d27434fbb57a60f0af3bdbdec6ed81eeb64bd0dd Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 6 Jul 2015 13:36:26 +0200
Subject: [PATCH 2476/2920] Wizard: Use a pointer as cursor for button-like
 anchors

---
 public/css/icinga/setup.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index ef4614237..05e16b767 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -143,6 +143,7 @@
     &:hover, &:focus, &:active {
       background-color: #666;
       border-color: #666;
+      cursor: pointer;
 
       &[disabled="1"] {
         background-color: #aaa;

From 107c9ff533956a2de8f653b12154943b68845610 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 6 Jul 2015 13:37:37 +0200
Subject: [PATCH 2477/2920] Wizard: Use a unordered list to show requirements
 instead of nested tables

fixes #9533
---
 .../library/Setup/RequirementsRenderer.php    | 47 +++++---------
 public/css/icinga/setup.less                  | 62 +++++++++++--------
 2 files changed, 51 insertions(+), 58 deletions(-)

diff --git a/modules/setup/library/Setup/RequirementsRenderer.php b/modules/setup/library/Setup/RequirementsRenderer.php
index b768a1e86..8ad3ef5f6 100644
--- a/modules/setup/library/Setup/RequirementsRenderer.php
+++ b/modules/setup/library/Setup/RequirementsRenderer.php
@@ -9,53 +9,34 @@ class RequirementsRenderer extends RecursiveIteratorIterator
 {
     public function beginIteration()
     {
-        $this->tags[] = '<table class="requirements">';
-        $this->tags[] = '<tbody>';
+        $this->tags[] = '<ul class="requirements">';
     }
 
     public function endIteration()
     {
-        $this->tags[] = '</tbody>';
-        $this->tags[] = '</table>';
+        $this->tags[] = '</ul>';
     }
 
     public function beginChildren()
     {
-        $this->tags[] = '<tr>';
+        $this->tags[] = '<li>';
         $currentSet = $this->getSubIterator();
-        $state = $currentSet->getState() ? 'fulfilled' : (
-            $currentSet->isOptional() ? 'not-available' : 'missing'
-        );
-        $colSpanRequired = $this->hasSingleRequirements($this->getSubIterator($this->getDepth() - 1));
-        $this->tags[] = '<td class="set-state ' . $state . '"' . ($colSpanRequired ? ' colspan=3' : '') . '>';
-        $this->beginIteration();
+        $state = $currentSet->getState() ? 'fulfilled' : ($currentSet->isOptional() ? 'not-available' : 'missing');
+        $this->tags[] = '<ul class="set-state ' . $state . '">';
     }
 
     public function endChildren()
     {
-        $this->endIteration();
-        $this->tags[] = '</td>';
-        $this->tags[] = '</tr>';
-    }
-
-    protected function hasSingleRequirements(RequirementSet $requirements)
-    {
-        $set = $requirements->getAll();
-        foreach ($set as $entry) {
-            if ($entry instanceof Requirement) {
-                return true;
-            }
-        }
-
-        return false;
+        $this->tags[] = '</ul>';
+        $this->tags[] = '</li>';
     }
 
     public function render()
     {
         foreach ($this as $requirement) {
-            $this->tags[] = '<tr>';
-            $this->tags[] = '<td class="title"><h2>' . $requirement->getTitle() . '</h2></td>';
-            $this->tags[] = '<td class="desc">';
+            $this->tags[] = '<li class="clearfix">';
+            $this->tags[] = '<div class="title"><h3>' . $requirement->getTitle() . '</h3></div>';
+            $this->tags[] = '<div class="description">';
             $descriptions = $requirement->getDescriptions();
             if (count($descriptions) > 1) {
                 $this->tags[] = '<ul>';
@@ -66,11 +47,11 @@ class RequirementsRenderer extends RecursiveIteratorIterator
             } elseif (! empty($descriptions)) {
                 $this->tags[] = $descriptions[0];
             }
-            $this->tags[] = '</td>';
-            $this->tags[] = '<td class="state ' . ($requirement->getState() ? 'fulfilled' : (
+            $this->tags[] = '</div>';
+            $this->tags[] = '<div class="state ' . ($requirement->getState() ? 'fulfilled' : (
                 $requirement->isOptional() ? 'not-available' : 'missing'
-            )) . '">' . $requirement->getStateText() . '</td>';
-            $this->tags[] = '</tr>';
+            )) . '">' . $requirement->getStateText() . '</div>';
+            $this->tags[] = '</li>';
         }
 
         return implode("\n", $this->tags);
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index 05e16b767..3f5d78d5f 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -183,43 +183,55 @@ form#setup_requirements {
   }
 }
 
-#setup > table.requirements {
-  font-size: 0.9em;
-}
+#setup ul.requirements {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
 
-#setup table.requirements {
-  margin: -1em;
-  border-spacing: 1em;
-  border-collapse: separate;
+  ul.set-state {
+    border: 1px dashed black;
+  }
 
-  td {
-    padding: 0;
+  li {
+    margin-bottom: 1em;
 
-    h2 {
-      margin: 0 1em 0 0;
-      font-variant: normal;
-      border-bottom: 0;
-    }
-
-    table {
-      font-size: 102%; // Just a hack for webkit, remove this in case you can't see any difference or make it work without it
-    }
-
-    ul {
+    & > ul {
       margin: 0;
-      padding-left: 1em;
-      list-style-type: square;
+      padding: 0;
+      list-style-type: none;
     }
 
-    &.title {
+    div {
+      float: left;
+      padding-top: 0.4em;
+      box-sizing: border-box;
+      -moz-box-sizing: border-box;
+      -webkit-box-sizing: border-box;
+    }
+
+    div.title {
       width: 25%;
+
+      h3 {
+        padding: 0;
+        margin: 0 1em 0 0;
+        border-bottom: 0;
+      }
     }
 
-    &.desc {
+    div.description {
       width: 50%;
+      border-left: 0.4em solid transparent;
+      border-right: 0.4em solid transparent;
+
+      ul {
+        margin: 0;
+        padding-left: 1em;
+        list-style-type: square;
+      }
     }
 
-    &.state {
+    div.state {
       width: 25%;
       color: white;
       padding: 0.4em;

From 68bd24147cd3a4ca69c2941e9ba35e0bd11a08f1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 6 Jul 2015 13:41:31 +0200
Subject: [PATCH 2478/2920] setup.less: Remove border from requirement sets

---
 public/css/icinga/setup.less | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index 3f5d78d5f..9ec689538 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -188,10 +188,6 @@ form#setup_requirements {
   padding: 0;
   list-style-type: none;
 
-  ul.set-state {
-    border: 1px dashed black;
-  }
-
   li {
     margin-bottom: 1em;
 

From 9d2f0be24c7bb5fcf2e1d64aa32758aeb71faa8e Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 6 Jul 2015 14:43:32 +0200
Subject: [PATCH 2479/2920] Identify perfdata containing html markup properly

refs #9036
---
 modules/monitoring/application/views/helpers/PluginOutput.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
index d494a7810..8f96ac67b 100644
--- a/modules/monitoring/application/views/helpers/PluginOutput.php
+++ b/modules/monitoring/application/views/helpers/PluginOutput.php
@@ -27,13 +27,13 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
         '@@@@@@',
     );
 
-    public function pluginOutput($output)
+    public function pluginOutput($output, $raw = false)
     {
         if (empty($output)) {
             return '';
         }
         $output = preg_replace('~<br[^>]+>~', "\n", $output);
-        if (preg_match('~<\w+[^>^\\\]{,60}>~', $output)) {
+        if (preg_match('~<\w+[^>^\\\]{0,60}>~', $output)) {
             // HTML
             $output = preg_replace('~<table~', '<table style="font-size: 0.75em"',
                 $this->getPurifier()->purify($output)

From 7bda4ce42be506e97b0f505e927f145329ee7432 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 6 Jul 2015 15:36:43 +0200
Subject: [PATCH 2480/2920] Do not escape certain HTML markup for plugin output

Use specialized escape functions for plugin output that allow certain HTML formatting to be allowed.

refs #9036
---
 .../monitoring/application/views/helpers/PluginOutput.php  | 7 +++++--
 .../monitoring/application/views/scripts/list/hosts.phtml  | 2 +-
 .../application/views/scripts/list/notifications.phtml     | 2 +-
 .../application/views/scripts/list/services.phtml          | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
index 8f96ac67b..0a328b126 100644
--- a/modules/monitoring/application/views/helpers/PluginOutput.php
+++ b/modules/monitoring/application/views/helpers/PluginOutput.php
@@ -40,11 +40,14 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
             );
         } else {
             // Plaintext
-            $output = '<pre class="pluginoutput">' . preg_replace(
+            $output = preg_replace(
                 self::$txtPatterns,
                 self::$txtReplacements,
                 $this->view->escape($output)
-            ) . '</pre>';
+            );
+        }
+        if (! $raw) {
+            $output = '<pre class="pluginoutput">' . $output . '</pre>';
         }
         $output = $this->fixLinks($output);
         return $output;
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 0d033eaad..b697c8f6a 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -90,7 +90,7 @@ if (count($hosts) === 0) {
           )
         ) ?>)</span>
         <?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>
       <?php foreach($this->addColumns as $col): ?>
       <td><?= $this->escape($host->$col) ?></td>
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index f94266210..06a9e80a0 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -48,7 +48,7 @@ if (count($notifications) === 0) {
                     <?= $this->link()->host($notification->host_name, $notification->host_display_name) ?>
                 <?php endif ?>
                 <br>
-                <?= $this->escape($this->ellipsis($notification->notification_output, 10000)) ?>
+                <?= $this->pluginOutput($this->ellipsis($notification->notification_output, 10000), true) ?>
                 <br>
                 <?php if (! $this->contact): ?>
                     <small>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 15f702d10..887757537 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -82,7 +82,7 @@ if (count($services) === 0) {
     )
 ) ?><br />
         <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>
 <?php foreach($this->addColumns as $col): ?>
       <td><?= $this->escape($service->$col) ?></td>

From b50510169470c1de8306d51d5ba9e3535dfaf872 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 6 Jul 2015 15:47:04 +0200
Subject: [PATCH 2481/2920] Comply to coding guidelines

---
 modules/monitoring/application/views/helpers/Perfdata.php     | 2 +-
 modules/monitoring/application/views/helpers/PluginOutput.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 83a05d2e0..8957027c6 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -22,7 +22,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
         $pieChartData = PerfdataSet::fromString($perfdataStr)->asArray();
         uasort(
             $pieChartData,
-            function($a, $b) {
+            function ($a, $b) {
                 return $a->worseThan($b) ? -1 : ($b->worseThan($a) ? 1 : 0);
             }
         );
diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
index 0a328b126..12a9b6e97 100644
--- a/modules/monitoring/application/views/helpers/PluginOutput.php
+++ b/modules/monitoring/application/views/helpers/PluginOutput.php
@@ -35,7 +35,9 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
         $output = preg_replace('~<br[^>]+>~', "\n", $output);
         if (preg_match('~<\w+[^>^\\\]{0,60}>~', $output)) {
             // HTML
-            $output = preg_replace('~<table~', '<table style="font-size: 0.75em"',
+            $output = preg_replace(
+                '~<table~',
+                '<table style="font-size: 0.75em"',
                 $this->getPurifier()->purify($output)
             );
         } else {

From b4fe91bb2f95678352324ecc6e3226021e96359d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 6 Jul 2015 16:43:49 +0200
Subject: [PATCH 2482/2920] Revert "Ajax onFailure: Write component URL to
 container"

This reverts commit ae68e8aec42703c988ca2d5f2620e8a23ac4e4b1.

fixes #9042
fixes #9544
---
 public/js/icinga/loader.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 5b345a308..ad6f2d5e0 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -453,6 +453,8 @@
                     var $el = $(el);
                     if ($el.hasClass('dashboard')) {
                         return;
+                    } else {
+
                     }
                     var url = $el.data('icingaUrl');
                     targets[i].data('icingaUrl', url);
@@ -559,7 +561,7 @@
                 } else {
                     // Request wasn't for a container, so it's usually the body
                     // or the full layout. Push request URL to history:
-                    this.icinga.history.pushCurrentState();
+                    this.icinga.history.pushUrl(req.url);
                 }
             }
 
@@ -589,8 +591,6 @@
 
             req.failure = true;
 
-            req.$target.data('icingaUrl', req.url);
-
             /*
              * Test if a manual actions comes in and autorefresh is active: Stop refreshing
              */

From 3098c21c1734118c3916f3309de5815058c32013 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 6 Jul 2015 16:56:44 +0200
Subject: [PATCH 2483/2920] loader.js: Push failed requests to history

The commit ae68e8aec42703c988ca2d5f2620e8a23ac4e4b1 reverted
earlier seems to be supposed to do exactly what this one does now.
Prior, the commits ae68e8aec42703c988ca2d5f2620e8a23ac4e4b1 and
8bb0e4e0a0ba9d3924a16f3f569ee38cbda0291c were effectively
neutralizing each other. Quick tests of how Web 2 handles failing
requests while interacting with the browser's history were successful.
If this change breaks something else (again?), leave me a note and do
*not* fix it straight away..
---
 public/js/icinga/loader.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index ad6f2d5e0..b2e8061e2 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -116,7 +116,6 @@
             req.complete(this.onComplete);
             req.autorefresh = autorefresh;
             req.action = action;
-            req.failure = false;
             req.addToHistory = true;
 
             if (id) {
@@ -553,7 +552,7 @@
             // Update history when necessary. Don't do so for requests triggered
             // by history or autorefresh events
             if (! req.autorefresh && req.addToHistory) {
-                if (req.$target.hasClass('container') && ! req.failure) {
+                if (req.$target.hasClass('container')) {
                     // We only want to care about top-level containers
                     if (req.$target.parent().closest('.container').length === 0) {
                         this.icinga.history.pushCurrentState();
@@ -589,8 +588,6 @@
         onFailure: function (req, textStatus, errorThrown) {
             var url = req.url;
 
-            req.failure = true;
-
             /*
              * Test if a manual actions comes in and autorefresh is active: Stop refreshing
              */

From 17bb725f84d41396f43619da3e77829c0b4f0d94 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 6 Jul 2015 17:14:36 +0200
Subject: [PATCH 2484/2920] Don't use HTMLPurifier in list views to improve
 performance

refs #9036
---
 .../monitoring/application/views/helpers/PluginOutput.php | 8 ++------
 .../monitoring/application/views/scripts/list/hosts.phtml | 2 +-
 .../application/views/scripts/list/notifications.phtml    | 2 +-
 .../application/views/scripts/list/services.phtml         | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
index 12a9b6e97..6585ae913 100644
--- a/modules/monitoring/application/views/helpers/PluginOutput.php
+++ b/modules/monitoring/application/views/helpers/PluginOutput.php
@@ -27,7 +27,7 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
         '@@@@@@',
     );
 
-    public function pluginOutput($output, $raw = false)
+    public function pluginOutput($output)
     {
         if (empty($output)) {
             return '';
@@ -48,11 +48,7 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
                 $this->view->escape($output)
             );
         }
-        if (! $raw) {
-            $output = '<pre class="pluginoutput">' . $output . '</pre>';
-        }
-        $output = $this->fixLinks($output);
-        return $output;
+        return '<pre class="pluginoutput">' . $this->fixLinks($output) . '</pre>';
     }
 
     protected function fixLinks($html)
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index b697c8f6a..0d033eaad 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -90,7 +90,7 @@ if (count($hosts) === 0) {
           )
         ) ?>)</span>
         <?php endif ?>
-        <p class="pluginoutput"><?= $this->pluginOutput($this->ellipsis($host->host_output, 10000), true) ?></p>
+        <p class="pluginoutput"><?= $this->escape($this->ellipsis($host->host_output, 10000)) ?></p>
       </td>
       <?php foreach($this->addColumns as $col): ?>
       <td><?= $this->escape($host->$col) ?></td>
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 06a9e80a0..f94266210 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -48,7 +48,7 @@ if (count($notifications) === 0) {
                     <?= $this->link()->host($notification->host_name, $notification->host_display_name) ?>
                 <?php endif ?>
                 <br>
-                <?= $this->pluginOutput($this->ellipsis($notification->notification_output, 10000), true) ?>
+                <?= $this->escape($this->ellipsis($notification->notification_output, 10000)) ?>
                 <br>
                 <?php if (! $this->contact): ?>
                     <small>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 887757537..15f702d10 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -82,7 +82,7 @@ if (count($services) === 0) {
     )
 ) ?><br />
         <div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 5) ?> </div>
-        <p class="pluginoutput"><?= $this->pluginOutput($this->ellipsis($service->service_output, 10000), true) ?></p>
+        <p class="pluginoutput"><?= $this->escape($this->ellipsis($service->service_output, 10000)) ?></p>
       </td>
 <?php foreach($this->addColumns as $col): ?>
       <td><?= $this->escape($service->$col) ?></td>

From 4f884b1529b91c84b0c7fce5ceb7ba1914e08e19 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 7 Jul 2015 10:16:12 +0200
Subject: [PATCH 2485/2920] Revert "Don't use HTMLPurifier in list views to
 improve performance"

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

refs #9036
---
 .../monitoring/application/views/helpers/PluginOutput.php | 8 ++++++--
 .../monitoring/application/views/scripts/list/hosts.phtml | 2 +-
 .../application/views/scripts/list/notifications.phtml    | 2 +-
 .../application/views/scripts/list/services.phtml         | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
index 6585ae913..12a9b6e97 100644
--- a/modules/monitoring/application/views/helpers/PluginOutput.php
+++ b/modules/monitoring/application/views/helpers/PluginOutput.php
@@ -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)) {
             return '';
@@ -48,7 +48,11 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
                 $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)
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 0d033eaad..b697c8f6a 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -90,7 +90,7 @@ if (count($hosts) === 0) {
           )
         ) ?>)</span>
         <?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>
       <?php foreach($this->addColumns as $col): ?>
       <td><?= $this->escape($host->$col) ?></td>
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index f94266210..06a9e80a0 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -48,7 +48,7 @@ if (count($notifications) === 0) {
                     <?= $this->link()->host($notification->host_name, $notification->host_display_name) ?>
                 <?php endif ?>
                 <br>
-                <?= $this->escape($this->ellipsis($notification->notification_output, 10000)) ?>
+                <?= $this->pluginOutput($this->ellipsis($notification->notification_output, 10000), true) ?>
                 <br>
                 <?php if (! $this->contact): ?>
                     <small>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 15f702d10..887757537 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -82,7 +82,7 @@ if (count($services) === 0) {
     )
 ) ?><br />
         <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>
 <?php foreach($this->addColumns as $col): ?>
       <td><?= $this->escape($service->$col) ?></td>

From f5089dab1a1662230823b48bd376fa69d7b61d33 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 7 Jul 2015 14:07:55 +0200
Subject: [PATCH 2486/2920] DbUserGroupBackend: Use is_numeric() instead of
 is_int()

Using MySQL fetchColumn() returns integers for id fields, using MariaDB
though, fetchColumn() returns strings..

fixes #9572
---
 .../Icinga/Authentication/UserGroup/DbUserGroupBackend.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
index e59b03258..0fd3fda14 100644
--- a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
@@ -229,12 +229,12 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
      */
     protected function persistGroupId($groupName)
     {
-        if (! $groupName || empty($groupName) || is_int($groupName)) {
+        if (! $groupName || empty($groupName) || is_numeric($groupName)) {
             return $groupName;
         }
 
         if (is_array($groupName)) {
-            if (is_int($groupName[0])) {
+            if (is_numeric($groupName[0])) {
                 return $groupName; // In case the array contains mixed types...
             }
 

From fc8b51c4be6b30755dbdc4393d8dac381cc683fc Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 7 Jul 2015 15:50:40 +0200
Subject: [PATCH 2487/2920] ObjectList: Register columns to select even if
 we're only counting

We should never apply any pseudo optimizations on a higher level if
already the lower level applies them, as the optimization might not
be valid in every circumstance.

fixes #9573
---
 .../monitoring/library/Monitoring/Object/ObjectList.php  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Object/ObjectList.php b/modules/monitoring/library/Monitoring/Object/ObjectList.php
index 669e8ff39..0b9575a22 100644
--- a/modules/monitoring/library/Monitoring/Object/ObjectList.php
+++ b/modules/monitoring/library/Monitoring/Object/ObjectList.php
@@ -124,9 +124,14 @@ abstract class ObjectList implements Countable, IteratorAggregate, Filterable
     public function count()
     {
         if ($this->count === null) {
-            $this->count = (int) $this->backend->select()->from($this->dataViewName)->applyFilter($this->filter)
-                ->getQuery()->count();
+            $this->count = (int) $this->backend
+                ->select()
+                ->from($this->dataViewName, $this->columns)
+                ->applyFilter($this->filter)
+                ->getQuery()
+                ->count();
         }
+
         return $this->count;
     }
 

From 39df25f043f457ebe2ea678eb4f0282207ae11e7 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 8 Jul 2015 15:16:32 +0200
Subject: [PATCH 2488/2920] Fix HTML detection in PluginOutput

refs #9036
---
 modules/monitoring/application/views/helpers/PluginOutput.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
index 12a9b6e97..4b401a795 100644
--- a/modules/monitoring/application/views/helpers/PluginOutput.php
+++ b/modules/monitoring/application/views/helpers/PluginOutput.php
@@ -32,8 +32,8 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
         if (empty($output)) {
             return '';
         }
-        $output = preg_replace('~<br[^>]+>~', "\n", $output);
-        if (preg_match('~<\w+[^>^\\\]{0,60}>~', $output)) {
+        $output = preg_replace('~<br[^>]*>~', "\n", $output);
+        if (strlen($output) > strlen(strip_tags($output))) {
             // HTML
             $output = preg_replace(
                 '~<table~',

From a8ac42089727474e756ab5cb620d343bac262061 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Jul 2015 09:51:39 +0200
Subject: [PATCH 2489/2920] LdapConnection: Establish a connection lazily

---
 .../Config/Resource/LdapResourceForm.php      |   1 -
 library/Icinga/Protocol/Ldap/Discovery.php    |  25 ----
 .../Icinga/Protocol/Ldap/LdapConnection.php   | 136 ++++++++++--------
 .../Config/Resource/LdapResourceFormTest.php  |   4 +-
 4 files changed, 82 insertions(+), 84 deletions(-)

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 6821a8593..604e34199 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -156,7 +156,6 @@ class LdapResourceForm extends Form
     {
         try {
             $resource = ResourceFactory::createResource(new ConfigObject($form->getValues()));
-            $resource->connect();
             $resource->bind();
         } catch (Exception $e) {
             $msg = $form->translate('Connectivity validation failed, connection to the given resource not possible.');
diff --git a/library/Icinga/Protocol/Ldap/Discovery.php b/library/Icinga/Protocol/Ldap/Discovery.php
index 1fdcd6755..94a7f3ee6 100644
--- a/library/Icinga/Protocol/Ldap/Discovery.php
+++ b/library/Icinga/Protocol/Ldap/Discovery.php
@@ -13,13 +13,6 @@ class Discovery {
      */
     private $connection;
 
-    /**
-     * If discovery was already performed
-     *
-     * @var bool
-     */
-    private $discovered = false;
-
     /**
      * @param   LdapConnection  $conn   The ldap connection to use for the discovery
      */
@@ -28,17 +21,6 @@ class Discovery {
         $this->connection = $conn;
     }
 
-    /**
-     * Execute the discovery on the underlying connection
-     */
-    private function execDiscovery()
-    {
-        if (! $this->discovered) {
-            $this->connection->connect();
-            $this->discovered = true;
-        }
-    }
-
     /**
      * Suggests a resource configuration of hostname, port and root_dn
      * based on the discovery
@@ -47,10 +29,6 @@ class Discovery {
      */
     public function suggestResourceSettings()
     {
-        if (! $this->discovered) {
-            $this->execDiscovery();
-        }
-
         return array(
             'hostname' => $this->connection->getHostname(),
             'port' => $this->connection->getPort(),
@@ -66,7 +44,6 @@ class Discovery {
      */
     public function suggestBackendSettings()
     {
-        $this->execDiscovery();
         if ($this->isAd()) {
             return array(
                 'base_dn' => $this->connection->getCapabilities()->getDefaultNamingContext(),
@@ -89,7 +66,6 @@ class Discovery {
      */
     public function isAd()
     {
-        $this->execDiscovery();
         return $this->connection->getCapabilities()->hasAdOid();
     }
 
@@ -100,7 +76,6 @@ class Discovery {
      */
     public function isSuccess()
     {
-        $this->execDiscovery();
         return $this->connection->discoverySuccessful();
     }
 
diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index 41b0bc917..277e4cb66 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -147,7 +147,7 @@ class LdapConnection implements Selectable
     protected $capabilities;
 
     /**
-     * Whether discovery was successful or not
+     * Whether discovery was successful
      *
      * @var bool
      */
@@ -217,6 +217,22 @@ class LdapConnection implements Selectable
         return $this->root;
     }
 
+    /**
+     * Return the LDAP link identifier being used
+     *
+     * Establishes a connection if necessary.
+     *
+     * @return  resource
+     */
+    public function getConnection()
+    {
+        if ($this->ds === null) {
+            $this->ds = $this->prepareNewConnection();
+        }
+
+        return $this->ds;
+    }
+
     /**
      * Return the capabilities of the current connection
      *
@@ -232,12 +248,16 @@ class LdapConnection implements Selectable
     }
 
     /**
-     * Return whether discovery was successful or not
+     * Return whether discovery was successful
      *
      * @return  bool    true if the capabilities were successfully determined, false if the capabilities were guessed
      */
     public function discoverySuccessful()
     {
+        if ($this->discoverySuccess === null) {
+            $this->getCapabilities(); // Initializes self::$discoverySuccess
+        }
+
         return $this->discoverySuccess;
     }
 
@@ -245,12 +265,12 @@ class LdapConnection implements Selectable
      * Establish a connection
      *
      * @throws  LdapException   In case the connection could not be established
+     *
+     * @deprecated              The connection is established lazily now
      */
     public function connect()
     {
-        if ($this->ds === null) {
-            $this->ds = $this->prepareNewConnection();
-        }
+        $this->getConnection();
     }
 
     /**
@@ -264,7 +284,9 @@ class LdapConnection implements Selectable
             return;
         }
 
-        $success = @ldap_bind($this->ds, $this->bindDn, $this->bindPw);
+        $ds = $this->getConnection();
+
+        $success = @ldap_bind($ds, $this->bindDn, $this->bindPw);
         if (! $success) {
             throw new LdapException(
                 'LDAP connection to %s:%s (%s / %s) failed: %s',
@@ -272,7 +294,7 @@ class LdapConnection implements Selectable
                 $this->port,
                 $this->bindDn,
                 '***' /* $this->bindPw */,
-                ldap_error($this->ds)
+                ldap_error($ds)
             );
         }
 
@@ -310,7 +332,6 @@ class LdapConnection implements Selectable
      */
     public function count(LdapQuery $query)
     {
-        $this->connect();
         $this->bind();
 
         $res = $this->runQuery($query, array());
@@ -327,7 +348,6 @@ class LdapConnection implements Selectable
      */
     public function fetchAll(LdapQuery $query, array $fields = null)
     {
-        $this->connect();
         $this->bind();
 
         if (
@@ -465,21 +485,20 @@ class LdapConnection implements Selectable
      */
     public function testCredentials($bindDn, $bindPw)
     {
-        $this->connect();
-
-        $success = @ldap_bind($this->ds, $bindDn, $bindPw);
+        $ds = $this->getConnection();
+        $success = @ldap_bind($ds, $bindDn, $bindPw);
         if (! $success) {
-            if (ldap_errno($this->ds) === self::LDAP_INVALID_CREDENTIALS) {
+            if (ldap_errno($ds) === self::LDAP_INVALID_CREDENTIALS) {
                 Logger::debug(
                     'Testing LDAP credentials (%s / %s) failed: %s',
                     $bindDn,
                     '***',
-                    ldap_error($this->ds)
+                    ldap_error($ds)
                 );
                 return false;
             }
 
-            throw new LdapException(ldap_error($this->ds));
+            throw new LdapException(ldap_error($ds));
         }
 
         return true;
@@ -494,11 +513,11 @@ class LdapConnection implements Selectable
      */
     public function hasDn($dn)
     {
-        $this->connect();
         $this->bind();
 
-        $result = ldap_read($this->ds, $dn, '(objectClass=*)', array('objectClass'));
-        return ldap_count_entries($this->ds, $result) > 0;
+        $ds = $this->getConnection();
+        $result = ldap_read($ds, $dn, '(objectClass=*)', array('objectClass'));
+        return ldap_count_entries($ds, $result) > 0;
     }
 
     /**
@@ -512,19 +531,19 @@ class LdapConnection implements Selectable
      */
     public function deleteRecursively($dn)
     {
-        $this->connect();
         $this->bind();
 
-        $result = @ldap_list($this->ds, $dn, '(objectClass=*)', array('objectClass'));
+        $ds = $this->getConnection();
+        $result = @ldap_list($ds, $dn, '(objectClass=*)', array('objectClass'));
         if ($result === false) {
-            if (ldap_errno($this->ds) === self::LDAP_NO_SUCH_OBJECT) {
+            if (ldap_errno($ds) === self::LDAP_NO_SUCH_OBJECT) {
                 return false;
             }
 
-            throw new LdapException('LDAP list for "%s" failed: %s', $dn, ldap_error($this->ds));
+            throw new LdapException('LDAP list for "%s" failed: %s', $dn, ldap_error($ds));
         }
 
-        $children = ldap_get_entries($this->ds, $result);
+        $children = ldap_get_entries($ds, $result);
         for ($i = 0; $i < $children['count']; $i++) {
             $result = $this->deleteRecursively($children[$i]['dn']);
             if (! $result) {
@@ -547,16 +566,16 @@ class LdapConnection implements Selectable
      */
     public function deleteDn($dn)
     {
-        $this->connect();
         $this->bind();
 
-        $result = @ldap_delete($this->ds, $dn);
+        $ds = $this->getConnection();
+        $result = @ldap_delete($ds, $dn);
         if ($result === false) {
-            if (ldap_errno($this->ds) === self::LDAP_NO_SUCH_OBJECT) {
+            if (ldap_errno($ds) === self::LDAP_NO_SUCH_OBJECT) {
                 return false; // TODO: Isn't it a success if something i'd like to remove is not existing at all???
             }
 
-            throw new LdapException('LDAP delete for "%s" failed: %s', $dn, ldap_error($this->ds));
+            throw new LdapException('LDAP delete for "%s" failed: %s', $dn, ldap_error($ds));
         }
 
         return true;
@@ -600,9 +619,11 @@ class LdapConnection implements Selectable
             $fields = $query->getColumns();
         }
 
+        $ds = $this->getConnection();
+
         $serverSorting = false;//$this->capabilities->hasOid(Capability::LDAP_SERVER_SORT_OID);
         if ($serverSorting && $query->hasOrder()) {
-            ldap_set_option($this->ds, LDAP_OPT_SERVER_CONTROLS, array(
+            ldap_set_option($ds, LDAP_OPT_SERVER_CONTROLS, array(
                 array(
                     'oid'   => Capability::LDAP_SERVER_SORT_OID,
                     'value' => $this->encodeSortRules($query->getOrder())
@@ -617,7 +638,7 @@ class LdapConnection implements Selectable
         }
 
         $results = @ldap_search(
-            $this->ds,
+            $ds,
             $query->getBase() ?: $this->rootDn,
             (string) $query,
             array_values($fields),
@@ -625,7 +646,7 @@ class LdapConnection implements Selectable
             $serverSorting && $limit ? $offset + $limit : 0
         );
         if ($results === false) {
-            if (ldap_errno($this->ds) === self::LDAP_NO_SUCH_OBJECT) {
+            if (ldap_errno($ds) === self::LDAP_NO_SUCH_OBJECT) {
                 return array();
             }
 
@@ -633,25 +654,25 @@ class LdapConnection implements Selectable
                 'LDAP query "%s" (base %s) failed. Error: %s',
                 $query,
                 $query->getBase() ?: $this->rootDn,
-                ldap_error($this->ds)
+                ldap_error($ds)
             );
-        } elseif (ldap_count_entries($this->ds, $results) === 0) {
+        } elseif (ldap_count_entries($ds, $results) === 0) {
             return array();
         }
 
         $count = 0;
         $entries = array();
-        $entry = ldap_first_entry($this->ds, $results);
+        $entry = ldap_first_entry($ds, $results);
         do {
             $count += 1;
             if (! $serverSorting || $offset === 0 || $offset < $count) {
-                $entries[ldap_get_dn($this->ds, $entry)] = $this->cleanupAttributes(
-                    ldap_get_attributes($this->ds, $entry), array_flip($fields)
+                $entries[ldap_get_dn($ds, $entry)] = $this->cleanupAttributes(
+                    ldap_get_attributes($ds, $entry), array_flip($fields)
                 );
             }
         } while (
             (! $serverSorting || $limit === 0 || $limit !== count($entries))
-            && ($entry = ldap_next_entry($this->ds, $entry))
+            && ($entry = ldap_next_entry($ds, $entry))
         );
 
         if (! $serverSorting && $query->hasOrder()) {
@@ -693,9 +714,11 @@ class LdapConnection implements Selectable
             $fields = $query->getColumns();
         }
 
+        $ds = $this->getConnection();
+
         $serverSorting = false;//$this->capabilities->hasOid(Capability::LDAP_SERVER_SORT_OID);
         if ($serverSorting && $query->hasOrder()) {
-            ldap_set_option($this->ds, LDAP_OPT_SERVER_CONTROLS, array(
+            ldap_set_option($ds, LDAP_OPT_SERVER_CONTROLS, array(
                 array(
                     'oid'   => Capability::LDAP_SERVER_SORT_OID,
                     'value' => $this->encodeSortRules($query->getOrder())
@@ -715,10 +738,10 @@ class LdapConnection implements Selectable
         do {
             // Do not request the pagination control as a critical extension, as we want the
             // server to return results even if the paged search request cannot be satisfied
-            ldap_control_paged_result($this->ds, $pageSize, false, $cookie);
+            ldap_control_paged_result($ds, $pageSize, false, $cookie);
 
             $results = @ldap_search(
-                $this->ds,
+                $ds,
                 $base,
                 $queryString,
                 array_values($fields),
@@ -726,7 +749,7 @@ class LdapConnection implements Selectable
                 $serverSorting && $limit ? $offset + $limit : 0
             );
             if ($results === false) {
-                if (ldap_errno($this->ds) === self::LDAP_NO_SUCH_OBJECT) {
+                if (ldap_errno($ds) === self::LDAP_NO_SUCH_OBJECT) {
                     break;
                 }
 
@@ -734,37 +757,37 @@ class LdapConnection implements Selectable
                     'LDAP query "%s" (base %s) failed. Error: %s',
                     $queryString,
                     $base,
-                    ldap_error($this->ds)
+                    ldap_error($ds)
                 );
-            } elseif (ldap_count_entries($this->ds, $results) === 0) {
+            } elseif (ldap_count_entries($ds, $results) === 0) {
                 if (in_array(
-                    ldap_errno($this->ds),
+                    ldap_errno($ds),
                     array(static::LDAP_SIZELIMIT_EXCEEDED, static::LDAP_ADMINLIMIT_EXCEEDED)
                 )) {
                     Logger::warning(
                         'Unable to request more than %u results. Does the server allow paged search requests? (%s)',
                         $count,
-                        ldap_error($this->ds)
+                        ldap_error($ds)
                     );
                 }
 
                 break;
             }
 
-            $entry = ldap_first_entry($this->ds, $results);
+            $entry = ldap_first_entry($ds, $results);
             do {
                 $count += 1;
                 if (! $serverSorting || $offset === 0 || $offset < $count) {
-                    $entries[ldap_get_dn($this->ds, $entry)] = $this->cleanupAttributes(
-                        ldap_get_attributes($this->ds, $entry), array_flip($fields)
+                    $entries[ldap_get_dn($ds, $entry)] = $this->cleanupAttributes(
+                        ldap_get_attributes($ds, $entry), array_flip($fields)
                     );
                 }
             } while (
                 (! $serverSorting || $limit === 0 || $limit !== count($entries))
-                && ($entry = ldap_next_entry($this->ds, $entry))
+                && ($entry = ldap_next_entry($ds, $entry))
             );
 
-            if (false === @ldap_control_paged_result_response($this->ds, $results, $cookie)) {
+            if (false === @ldap_control_paged_result_response($ds, $results, $cookie)) {
                 // If the page size is greater than or equal to the sizeLimit value, the server should ignore the
                 // control as the request can be satisfied in a single page: https://www.ietf.org/rfc/rfc2696.txt
                 // This applies no matter whether paged search requests are permitted or not. You're done once you
@@ -785,11 +808,11 @@ class LdapConnection implements Selectable
             // A sequence of paged search requests is abandoned by the client sending a search request containing a
             // pagedResultsControl with the size set to zero (0) and the cookie set to the last cookie returned by
             // the server: https://www.ietf.org/rfc/rfc2696.txt
-            ldap_control_paged_result($this->ds, 0, false, $cookie);
-            ldap_search($this->ds, $base, $queryString); // Returns no entries, due to the page size
+            ldap_control_paged_result($ds, 0, false, $cookie);
+            ldap_search($ds, $base, $queryString); // Returns no entries, due to the page size
         } else {
             // Reset the paged search request so that subsequent requests succeed
-            ldap_control_paged_result($this->ds, 0);
+            ldap_control_paged_result($ds, 0);
         }
 
         if (! $serverSorting && $query->hasOrder()) {
@@ -1031,7 +1054,7 @@ class LdapConnection implements Selectable
      */
     public function addEntry($dn, array $attributes)
     {
-        return ldap_add($this->ds, $dn, $attributes);
+        return ldap_add($this->getConnection(), $dn, $attributes);
     }
 
     /**
@@ -1044,7 +1067,7 @@ class LdapConnection implements Selectable
      */
     public function modifyEntry($dn, array $attributes)
     {
-        return ldap_modify($this->ds, $dn, $attributes);
+        return ldap_modify($this->getConnection(), $dn, $attributes);
     }
 
     /**
@@ -1060,9 +1083,10 @@ class LdapConnection implements Selectable
      */
     public function moveEntry($dn, $newRdn, $newParentDn)
     {
-        $result = ldap_rename($this->ds, $dn, $newRdn, $newParentDn, false);
+        $ds = $this->getConnection();
+        $result = ldap_rename($ds, $dn, $newRdn, $newParentDn, false);
         if ($result === false) {
-            throw new LdapException('Could not move entry "%s" to "%s": %s', $dn, $newRdn, ldap_error($this->ds));
+            throw new LdapException('Could not move entry "%s" to "%s": %s', $dn, $newRdn, ldap_error($ds));
         }
 
         return $result;
diff --git a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
index a20db214e..859288256 100644
--- a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
+++ b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
@@ -26,7 +26,7 @@ class LdapResourceFormTest extends BaseTestCase
     public function testValidLdapResourceIsValid()
     {
         $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('connect')->once()->shouldReceive('bind')->once()->getMock()
+            Mockery::mock()->shouldReceive('bind')->once()->getMock()
         );
 
         // Passing array(null) is required to make Mockery call the constructor...
@@ -49,7 +49,7 @@ class LdapResourceFormTest extends BaseTestCase
     public function testInvalidLdapResourceIsNotValid()
     {
         $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('connect')->once()->shouldReceive('bind')->andThrow('\Exception')->getMock()
+            Mockery::mock()->shouldReceive('bind')->andThrow('\Exception')->getMock()
         );
 
         // Passing array(null) is required to make Mockery call the constructor...

From 23f7570ce0e0597635acf28989fa13497b86a52d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Jul 2015 10:45:10 +0200
Subject: [PATCH 2490/2920] LdapConnection: Don't run a discovery when
 preparing a new connection

fixes #9179
---
 .../Icinga/Protocol/Ldap/LdapConnection.php   | 99 +++++++++++--------
 1 file changed, 59 insertions(+), 40 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index 277e4cb66..3661e160d 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -153,6 +153,13 @@ class LdapConnection implements Selectable
      */
     protected $discoverySuccess;
 
+    /**
+     * Whether the current connection is encrypted
+     *
+     * @var bool
+     */
+    protected $encryptionSuccess;
+
     /**
      * Create a new connection object
      *
@@ -241,7 +248,15 @@ class LdapConnection implements Selectable
     public function getCapabilities()
     {
         if ($this->capabilities === null) {
-            $this->connect(); // Populates $this->capabilities
+            try {
+                $this->capabilities = $this->discoverCapabilities($this->getConnection());
+                $this->discoverySuccess = true;
+            } catch (LdapException $e) {
+                Logger::debug($e);
+                Logger::warning('LADP discovery failed, assuming default LDAP capabilities.');
+                $this->capabilities = new Capability(); // create empty default capabilities
+                $this->discoverySuccess = false;
+            }
         }
 
         return $this->capabilities;
@@ -261,6 +276,20 @@ class LdapConnection implements Selectable
         return $this->discoverySuccess;
     }
 
+    /**
+     * Return whether the current connection is encrypted
+     *
+     * @return  bool
+     */
+    public function isEncrypted()
+    {
+        if ($this->encryptionSuccess === null) {
+            return false;
+        }
+
+        return $this->encryptionSuccess;
+    }
+
     /**
      * Establish a connection
      *
@@ -276,7 +305,7 @@ class LdapConnection implements Selectable
     /**
      * Perform a LDAP bind on the current connection
      *
-     * @throws  LdapException   In case the LDAP bind was unsuccessful
+     * @throws  LdapException   In case the LDAP bind was unsuccessful or insecure
      */
     public function bind()
     {
@@ -299,6 +328,12 @@ class LdapConnection implements Selectable
         }
 
         $this->bound = true;
+
+        if ($this->encryptionSuccess === false && $this->getCapabilities()->hasStartTls()) {
+            // Alert the user about the unencrypted connection if there is really an error. If the server
+            // does not support it, don't do anything as authentication is completely broken otherwise.
+            throw new LdapException('LDAP STARTTLS failed. An error occured. Please see the log for more details');
+        }
     }
 
     /**
@@ -910,7 +945,7 @@ class LdapConnection implements Selectable
     /**
      * Prepare and establish a connection with the LDAP server
      *
-     * @return  resource        A positive LDAP link identifier
+     * @return  resource        A LDAP link identifier
      *
      * @throws  LdapException   In case the connection is not possible
      */
@@ -927,46 +962,30 @@ class LdapConnection implements Selectable
 
         $ds = ldap_connect($hostname, $this->port);
 
-        try {
-            $this->capabilities = $this->discoverCapabilities($ds);
-            $this->discoverySuccess = true;
-        } catch (LdapException $e) {
-            Logger::debug($e);
-            Logger::warning('LADP discovery failed, assuming default LDAP capabilities.');
-            $this->capabilities = new Capability(); // create empty default capabilities
-            $this->discoverySuccess = false;
-        }
-
-        if ($this->encryption === static::STARTTLS) {
-            $force_tls = false;
-            if ($this->capabilities->hasStartTls()) {
-                if (@ldap_start_tls($ds)) {
-                    Logger::debug('LDAP STARTTLS succeeded');
-                } else {
-                    Logger::error('LDAP STARTTLS failed: %s', ldap_error($ds));
-                    throw new LdapException('LDAP STARTTLS failed: %s', ldap_error($ds));
-                }
-            } elseif ($force_tls) {
-                throw new LdapException('STARTTLS is required but not announced by %s', $this->hostname);
-            } else {
-                Logger::warning('LDAP STARTTLS enabled but not announced');
-            }
-        }
-
-        // ldap_rename requires LDAPv3:
-        if ($this->capabilities->hasLdapV3()) {
-            if (! ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3)) {
-                throw new LdapException('LDAPv3 is required');
-            }
-        } else {
-            // TODO: remove this -> FORCING v3 for now
-            ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
-            Logger::warning('No LDAPv3 support detected');
-        }
+        // Usage of ldap_rename, setting LDAP_OPT_REFERRALS to 0 or using STARTTLS requires LDAPv3.
+        // If this does not work we're probably not in a PHP 5.3+ environment as it is VERY
+        // unlikely that the server complains about it by itself prior to a bind request
+        ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
 
         // Not setting this results in "Operations error" on AD when using the whole domain as search base
         ldap_set_option($ds, LDAP_OPT_REFERRALS, 0);
-        // ldap_set_option($ds, LDAP_OPT_DEREF, LDAP_DEREF_NEVER);
+
+        if ($this->encryption === static::STARTTLS) {
+            if (($this->encryptionSuccess = @ldap_start_tls($ds))) {
+                Logger::debug('LDAP STARTTLS succeeded');
+            } else {
+                Logger::error('LDAP STARTTLS failed: %s', ldap_error($ds));
+
+                // ldap_start_tls seems to corrupt the connection though if I understand
+                // https://tools.ietf.org/html/rfc4511#section-4.14.2 correctly, this shouldn't happen
+                $ds = ldap_connect($hostname, $this->port);
+                ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
+                ldap_set_option($ds, LDAP_OPT_REFERRALS, 0);
+            }
+        } elseif ($this->encryption === static::LDAPS) {
+            $this->encryptionSuccess = true;
+        }
+
         return $ds;
     }
 

From e5f62f017fe243ca1c31dcfcbdda36379e9e207b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Jul 2015 14:26:39 +0200
Subject: [PATCH 2491/2920] DeleteCommentCommandForm: Show a trash icon instead

The "cancel" icon is, like its name implies, supposed to abort/close
something..
---
 .../forms/Command/Object/DeleteCommentCommandForm.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
index ce95d24b9..1c8144475 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
@@ -72,7 +72,7 @@ class DeleteCommentCommandForm extends CommandForm
                 'escape'        => false,
                 'type'          => 'submit',
                 'class'         => 'link-like',
-                'label'         => $this->getView()->icon('cancel'),
+                'label'         => $this->getView()->icon('trash'),
                 'title'         => $this->translate('Delete this comment'),
                 'decorators'    => array('ViewHelper')
             )

From 5ded76536e30b201097c9108701c5563423c7d08 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Jul 2015 14:30:07 +0200
Subject: [PATCH 2492/2920] downtimes-header: Use the correct property to
 access a service's name

Seems to me that no-one has ever selected multiple service downtimes..
---
 .../views/scripts/partials/downtime/downtimes-header.phtml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index d3dc665a9..2819f1961 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -13,7 +13,7 @@
           <td class="name oneline">
             <?php if ($downtime->isService): ?>
                 <?= $this->icon('service', $this->translate('Service')) ?>
-                <b><?= $downtime->service ?> on <?= $downtime->host_name ?>.</b>
+                <b><?= $downtime->host_name ?>: <?= $downtime->service_description ?></b>
             <?php else: ?>
                  <?= $this->icon('host', $this->translate('Host')) ?>
                 <b><?= $downtime->host_name ?>.</b>

From bba57d2bbc9fe1a247cbb91381d4930a853b318f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Jul 2015 14:32:08 +0200
Subject: [PATCH 2493/2920] downtimes-header: Use <strong> instead of <b>

---
 .../views/scripts/partials/downtime/downtimes-header.phtml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index 2819f1961..4d8aca6c2 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -13,10 +13,10 @@
           <td class="name oneline">
             <?php if ($downtime->isService): ?>
                 <?= $this->icon('service', $this->translate('Service')) ?>
-                <b><?= $downtime->host_name ?>: <?= $downtime->service_description ?></b>
+                <strong><?= $downtime->host_name ?>: <?= $downtime->service_description ?></strong>
             <?php else: ?>
                  <?= $this->icon('host', $this->translate('Host')) ?>
-                <b><?= $downtime->host_name ?>.</b>
+                <strong><?= $downtime->host_name ?>.</strong>
             <?php endif; ?>
 
             <?php if ($downtime->is_flexible): ?>

From 006d2cb53767ad9a1882238dc19cb1efce59e3c5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Jul 2015 14:39:30 +0200
Subject: [PATCH 2494/2920] downtimes-header: Be more efficient when listing
 downtimes

---
 .../partials/downtime/downtimes-header.phtml     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index 4d8aca6c2..402fbc71c 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -2,7 +2,7 @@
     <tbody>
     <?php $i = 0; foreach ($downtimes as $downtime):
         if (++ $i > 5) {
-            continue;
+            break;
         } ?>
         <tr class="state <?= $downtime->stateText ?>">
           <td class="state">
@@ -68,18 +68,18 @@
         </tr>
     <?php endforeach; ?>
     </tbody>
-  </table>
+</table>
 
-  <p>
-    <?php if ($i > 5): ?>
+<?php if (count($downtimes) > 5): ?>
+<p>
     <?= $this->qlink(
         sprintf($this->translate('show all %d downtimes'), $i),
         $listAllLink,
         null,
         array(
-            'icon' => $i > 5 ? 'down-open' : '',
-            'data-base-target' => "_next"
+            'icon'              => 'down-open',
+            'data-base-target'  => "_next"
         )
     ) ?>
-    <?php endif ?>
-  </p>
+</p>
+<?php endif ?>
\ No newline at end of file

From e8f16d112de9be279158d08853c3e4dd5226fc3a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Jul 2015 14:43:36 +0200
Subject: [PATCH 2495/2920] downtimes-header: We're listing downtimes rather
 than showing them

---
 .../views/scripts/partials/downtime/downtimes-header.phtml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index 402fbc71c..0174837f0 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -73,7 +73,7 @@
 <?php if (count($downtimes) > 5): ?>
 <p>
     <?= $this->qlink(
-        sprintf($this->translate('show all %d downtimes'), $i),
+        sprintf($this->translate('List all %d downtimes'), $i),
         $listAllLink,
         null,
         array(

From 4fd5c43c70d0411034f01616124a8dc0ad9cb7d7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Jul 2015 14:44:24 +0200
Subject: [PATCH 2496/2920] downtimes-header: Show a line-break between an
 object's name and..

..a downtime's description
---
 .../views/scripts/partials/downtime/downtimes-header.phtml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index 0174837f0..48b8ac9ff 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -16,9 +16,9 @@
                 <strong><?= $downtime->host_name ?>: <?= $downtime->service_description ?></strong>
             <?php else: ?>
                  <?= $this->icon('host', $this->translate('Host')) ?>
-                <strong><?= $downtime->host_name ?>.</strong>
+                <strong><?= $downtime->host_name ?></strong>
             <?php endif; ?>
-
+                <br>
             <?php if ($downtime->is_flexible): ?>
               <?php if ($downtime->is_in_effect): ?>
                 <?= sprintf(

From 9ca1a6dea647b60322bdd8a36f9da08601af6cd6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Jul 2015 15:11:59 +0200
Subject: [PATCH 2497/2920] downtimes-header: Add links for hosts and services

---
 .../scripts/partials/downtime/downtimes-header.phtml  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index 48b8ac9ff..1f84b2381 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -1,4 +1,4 @@
- <table class="action">
+ <table class="action" data-base-target="_next">
     <tbody>
     <?php $i = 0; foreach ($downtimes as $downtime):
         if (++ $i > 5) {
@@ -13,10 +13,15 @@
           <td class="name oneline">
             <?php if ($downtime->isService): ?>
                 <?= $this->icon('service', $this->translate('Service')) ?>
-                <strong><?= $downtime->host_name ?>: <?= $downtime->service_description ?></strong>
+                <strong><?= $this->link()->service(
+                    $downtime->service_description,
+                    $downtime->service_display_name,
+                    $downtime->host_name,
+                    $downtime->host_display_name
+                ); ?></strong>
             <?php else: ?>
                  <?= $this->icon('host', $this->translate('Host')) ?>
-                <strong><?= $downtime->host_name ?></strong>
+                <strong><?= $this->link()->host($downtime->host_name, $downtime->host_display_name); ?></strong>
             <?php endif; ?>
                 <br>
             <?php if ($downtime->is_flexible): ?>

From 52bde67653299ad1cfc2e9220ad58eff63b23be5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Jul 2015 15:12:56 +0200
Subject: [PATCH 2498/2920] Link: Show the link's label in its title as well

---
 modules/monitoring/application/views/helpers/Link.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Link.php b/modules/monitoring/application/views/helpers/Link.php
index e37375d14..fcbba2662 100644
--- a/modules/monitoring/application/views/helpers/Link.php
+++ b/modules/monitoring/application/views/helpers/Link.php
@@ -34,7 +34,7 @@ class Zend_View_Helper_Link extends Zend_View_Helper_Abstract
             $linkText,
             'monitoring/host/show',
             array('host' => $host),
-            array('title' => sprintf($this->view->translate('Show detailed information for host %s'), $host))
+            array('title' => sprintf($this->view->translate('Show detailed information for host %s'), $linkText))
         );
     }
 
@@ -61,8 +61,8 @@ class Zend_View_Helper_Link extends Zend_View_Helper_Abstract
                 array(
                     'title' => sprintf(
                         $this->view->translate('Show detailed information for service %s on host %s'),
-                        $service,
-                        $host
+                        $serviceLinkText,
+                        $hostLinkText
                     ),
                     'class' => $class
                 )

From 3091b8cf5cf668b79cd626fde01be3ad4ba1554b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Jul 2015 15:16:16 +0200
Subject: [PATCH 2499/2920] downtimes/show.phtml: Do not show an
 (inappropriate) icon in the title

---
 .../monitoring/application/views/scripts/downtimes/show.phtml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/downtimes/show.phtml b/modules/monitoring/application/views/scripts/downtimes/show.phtml
index 1c508bbc9..4a5fcf1fe 100644
--- a/modules/monitoring/application/views/scripts/downtimes/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtimes/show.phtml
@@ -8,7 +8,7 @@
 </p>
 </div>
 <div class="content multi-commands">
-    <h3><?= $this->icon('reschedule') ?> <?= $this->translate('Commands') ?> </h3>
+    <h3><?= $this->translate('Commands') ?> </h3>
     <?= $this->qlink(
         sprintf(
             $this->translate('Remove all %d scheduled downtimes'),

From 831581471cf221a75b8bca526d44256ad8dc7633 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Jul 2015 15:17:25 +0200
Subject: [PATCH 2500/2920] downtimes/show.phtml: Drop redundant link title

Such a title has not any advantage as it contains the same content
as the link label.
---
 .../monitoring/application/views/scripts/downtimes/show.phtml  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/downtimes/show.phtml b/modules/monitoring/application/views/scripts/downtimes/show.phtml
index 4a5fcf1fe..5adc984fa 100644
--- a/modules/monitoring/application/views/scripts/downtimes/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtimes/show.phtml
@@ -17,8 +17,7 @@
         $removeAllLink,
         null,
         array(
-            'icon' => 'trash',
-            'title' => $this->translate('Remove all selected downtimes.')
+            'icon' => 'trash'
         )
     ) ?>
 </div>

From ac8a2d1673040c06a59b78761b20ee4f9b3e648e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Jul 2015 15:41:42 +0200
Subject: [PATCH 2501/2920] downtimes-header: Show proper times for fixed
 downtimes not yet started

---
 .../scripts/partials/downtime/downtimes-header.phtml      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index 1f84b2381..918add162 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -62,10 +62,10 @@
                   $this->isService
                     ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
                     : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
-                    $this->formatDate($downtime->start),
-                    $this->formatTime($downtime->start),
-                    $this->formatDate($downtime->end),
-                    $this->formatTime($downtime->end)
+                    $this->formatDate($downtime->scheduled_start),
+                    $this->formatTime($downtime->scheduled_start),
+                    $this->formatDate($downtime->scheduled_end),
+                    $this->formatTime($downtime->scheduled_end)
                 ); ?>
               <?php endif ?>
             <?php endif ?>

From d0a588ef588b22a017e563c2e9174241e9bb327c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Jul 2015 15:43:07 +0200
Subject: [PATCH 2502/2920] downtimes-header: Do not access a non-existent
 property, again

I don't get it..
---
 .../scripts/partials/downtime/downtimes-header.phtml      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index 918add162..eb2d3ec17 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -27,7 +27,7 @@
             <?php if ($downtime->is_flexible): ?>
               <?php if ($downtime->is_in_effect): ?>
                 <?= sprintf(
-                  $this->isService
+                  $downtime->isService
                     ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
                     : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
                     $this->formatDate($downtime->start),
@@ -38,7 +38,7 @@
                 ); ?>
               <?php else: ?>
                 <?= sprintf(
-                  $this->isService
+                  $downtime->isService
                     ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
                     : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
                     $this->formatDateTime($downtime->scheduled_start),
@@ -49,7 +49,7 @@
             <?php else: ?>
               <?php if ($downtime->is_in_effect): ?>
                 <?= sprintf(
-                  $this->isService
+                  $downtime->isService
                     ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
                     : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
                     $this->formatDate($downtime->start),
@@ -59,7 +59,7 @@
                 ); ?>
               <?php else: ?>
                 <?= sprintf(
-                  $this->isService
+                  $downtime->isService
                     ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
                     : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
                     $this->formatDate($downtime->scheduled_start),

From 3db81a8d0f59626562612aeea3f47c9fe1734484 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Jul 2015 15:46:24 +0200
Subject: [PATCH 2503/2920] downtimes-header: Do not show links with a bold
 font

---
 .../views/scripts/partials/downtime/downtimes-header.phtml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index eb2d3ec17..2e657d63c 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -13,15 +13,15 @@
           <td class="name oneline">
             <?php if ($downtime->isService): ?>
                 <?= $this->icon('service', $this->translate('Service')) ?>
-                <strong><?= $this->link()->service(
+                <?= $this->link()->service(
                     $downtime->service_description,
                     $downtime->service_display_name,
                     $downtime->host_name,
                     $downtime->host_display_name
-                ); ?></strong>
+                ); ?>
             <?php else: ?>
                  <?= $this->icon('host', $this->translate('Host')) ?>
-                <strong><?= $this->link()->host($downtime->host_name, $downtime->host_display_name); ?></strong>
+                <?= $this->link()->host($downtime->host_name, $downtime->host_display_name); ?>
             <?php endif; ?>
                 <br>
             <?php if ($downtime->is_flexible): ?>

From c90da0378d8bd2e69bda4948c410c7645b161a58 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 13 Jul 2015 12:17:00 +0200
Subject: [PATCH 2504/2920] downtimes overview: Fix detail links

---
 .../views/scripts/list/downtimes.phtml        | 47 +++++++++++--------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 0c587a03f..9b937548c 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -46,25 +46,34 @@ if (count($downtimes) === 0) {
           <?= $this->timeUntil($downtime->is_in_effect ? $downtime->end : $downtime->start, $this->compact) ?>
         </td>
         <td>
-        <?php
-            if ($isService) {
-                echo $this->icon('service');
-            } else {
-                echo $this->icon('host');
-            }
-        ?>
-        <?= $this->qlink(
-            sprintf('%s: %s', $downtime->host_display_name, $downtime->service_display_name),
-                'monitoring/downtime/show',
-                array('downtime_id' => $downtime->id),
-                array(
-                    'title' => sprintf(
-                        $this->translate('Show detailed information for downtime on %s for %s'),
-                        $downtime->service_display_name,
-                        $downtime->host_display_name
-                    ),
-                    'class' => 'rowaction'
-                )) ?>
+        <?php if ($isService): ?>
+          <?= $this->icon('service', $this->translate('Service')); ?> <?= $this->qlink(
+            $this->escape($downtime->host_display_name) . ': ' . $this->escape($downtime->service_display_name),
+            'monitoring/downtime/show',
+            array('downtime_id' => $downtime->id),
+            array(
+              'title' => sprintf(
+                $this->translate('Show this downtime\'s details for service %s on host %s'),
+                $downtime->service_display_name,
+                $downtime->host_display_name
+              ),
+              'class' => 'rowaction'
+            )
+          ); ?>
+        <?php else: ?>
+          <?= $this->icon('host', $this->translate('host')); ?> <?= $this->qlink(
+            $this->escape($downtime->host_display_name),
+            'monitoring/downtime/show',
+            array('downtime_id' => $downtime->id),
+            array(
+              'title' => sprintf(
+                $this->translate('Show this donwtime\'s details for host %s'),
+                $downtime->host_display_name
+              ),
+              'class' => 'rowaction'
+            )
+          ); ?>
+        <?php endif ?>
           <br>
           <?= $this->icon('comment', $this->translate('Comment')); ?> [<?= $this->escape($downtime->author_name) ?>] <?= $this->escape($downtime->comment) ?>
           <br>

From d6f756c670a8d0d279abba75721285f2247922f8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 13 Jul 2015 12:51:12 +0200
Subject: [PATCH 2505/2920] downtimes overview: Improve link titles

---
 .../monitoring/application/views/scripts/list/downtimes.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 9b937548c..af6c0d290 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -53,7 +53,7 @@ if (count($downtimes) === 0) {
             array('downtime_id' => $downtime->id),
             array(
               'title' => sprintf(
-                $this->translate('Show this downtime\'s details for service %s on host %s'),
+                $this->translate('Show detailed information for this downtime scheduled for service %s on host %s'),
                 $downtime->service_display_name,
                 $downtime->host_display_name
               ),
@@ -67,7 +67,7 @@ if (count($downtimes) === 0) {
             array('downtime_id' => $downtime->id),
             array(
               'title' => sprintf(
-                $this->translate('Show this donwtime\'s details for host %s'),
+                $this->translate('Show detailed information for this downtime scheduled for host %s'),
                 $downtime->host_display_name
               ),
               'class' => 'rowaction'

From 8b4c2c459a92d1bebc6114a13cc4690e95491223 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 13 Jul 2015 12:51:50 +0200
Subject: [PATCH 2506/2920] comments overview: Improve link titles

---
 .../views/scripts/list/comments.phtml         | 46 ++++++++-----------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 7c3863d17..00f2aeefc 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -24,44 +24,38 @@ if (count($comments) === 0) {
          data-icinga-multiselect-url="/icingaweb2/monitoring/comments/show"
          data-icinga-multiselect-data="comment_id">
     <tbody>
-    <?php foreach ($comments as $comment):
-        $this->comment = $comment; ?>
-
+    <?php foreach ($comments as $comment): ?>
       <tr class="state invalid">
         <td class="state" style="width: 12em;">
-          <?= $this->render('partials/comment/comment-description.phtml'); ?>
+          <?= $this->partial('partials/comment/comment-description.phtml', array('comment' => $comment)); ?>
         </td>
         <td>
         <?php if ($comment->objecttype === 'service'): ?>
-          <?= $this->icon('service', $this->translate('Service')); ?>
-
-          <?= $this->qlink(
-            sprintf(
-                '%s: %s',
-                $comment->host_display_name,
-                $comment->service_display_name
-            ),
+          <?= $this->icon('service', $this->translate('Service')); ?> <?= $this->qlink(
+            $this->escape($comment->host_display_name) . ': ' . $this->escape($comment->service_display_name),
             'monitoring/comment/show',
             array('comment_id' => $comment->id),
             array(
-                'title' => sprintf(
-                    $this->translate('Show detailed information for comment on %s for %s'),
-                    $comment->service_display_name,
-                    $comment->host_display_name
-                ),
-                'class' => 'rowaction'
-            )) ?>
+              'title' => sprintf(
+                $this->translate('Show detailed information for this comment about service %s on host %s'),
+                $comment->service_display_name,
+                $comment->host_display_name
+              ),
+              'class' => 'rowaction'
+            )
+          ); ?>
         <?php else: ?>
-          <?= $this->icon('host', $this->translate('Host')); ?>
-
-          <?= $this->qlink(
-            $comment->host_display_name,
+          <?= $this->icon('host', $this->translate('Host')); ?> <?= $this->qlink(
+            $this->escape($comment->host_display_name),
             'monitoring/comment/show',
             array('comment_id' => $comment->id),
-            array('title' => sprintf(
-                $this->translate('Show detailed information for comment on %s'),
+            array(
+              'title' => sprintf(
+                $this->translate('Show detailed information for this comment about host %s'),
                 $comment->host_display_name
-          ))) ?>
+              )
+            )
+          ); ?>
         <?php endif ?>
           <br>
           <?= $this->icon('comment', $this->translate('Comment')); ?> <?= isset($comment->author)

From 6599940e6cad8cf7edd88eef064a5e01e2d40a2d Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 14 Jul 2015 12:30:16 +0200
Subject: [PATCH 2507/2920] Introduce Interface for inspecting ldap connections

refs #9605
---
 library/Icinga/Data/Inspectable.php           | 26 +++++++
 .../{Capability.php => LdapCapabilities.php}  | 32 ++++++++-
 .../Icinga/Protocol/Ldap/LdapConnection.php   | 68 ++++++++++++++++---
 3 files changed, 115 insertions(+), 11 deletions(-)
 create mode 100644 library/Icinga/Data/Inspectable.php
 rename library/Icinga/Protocol/Ldap/{Capability.php => LdapCapabilities.php} (87%)

diff --git a/library/Icinga/Data/Inspectable.php b/library/Icinga/Data/Inspectable.php
new file mode 100644
index 000000000..1e037113a
--- /dev/null
+++ b/library/Icinga/Data/Inspectable.php
@@ -0,0 +1,26 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Data;
+
+
+/**
+ * An object for which the user can retrieve status information
+ */
+interface Inspectable
+{
+    /**
+     * Get information about this objects state
+     *
+     * @return array    An array of strings that describe the state in a human-readable form, each array element
+     *                  represents one fact about this object
+     */
+    public function getInfo();
+
+    /**
+     * If this object is working in its current configuration
+     *
+     * @return Bool     True if the object is working, false if not
+     */
+    public function isHealthy();
+}
diff --git a/library/Icinga/Protocol/Ldap/Capability.php b/library/Icinga/Protocol/Ldap/LdapCapabilities.php
similarity index 87%
rename from library/Icinga/Protocol/Ldap/Capability.php
rename to library/Icinga/Protocol/Ldap/LdapCapabilities.php
index e467884d3..bb3b01751 100644
--- a/library/Icinga/Protocol/Ldap/Capability.php
+++ b/library/Icinga/Protocol/Ldap/LdapCapabilities.php
@@ -9,7 +9,7 @@ namespace Icinga\Protocol\Ldap;
  * Provides information about the available encryption mechanisms (StartTLS), the supported
  * LDAP protocol (v2/v3), vendor-specific extensions or protocols controls and extensions.
  */
-class Capability
+class LdapCapabilities
 {
 
     const LDAP_SERVER_START_TLS_OID = '1.3.6.1.4.1.1466.20037';
@@ -127,7 +127,7 @@ class Capability
     }
 
     /**
-     * Return if the capability object contains support for StartTLS
+     * Return if the capability object contains support for paged results
      *
      * @return      bool Whether StartTLS is supported
      */
@@ -208,4 +208,32 @@ class Capability
         }
         return$this->attributes->namingContexts;
     }
+
+    public function getVendor()
+    {
+        // AD doesn't include the vendor entry
+        if ($this->hasAdOid()) {
+            return 'Microsoft Active Directory';
+        }
+
+        if (! isset($this->attributes->vendorName)) {
+            // OpenLDAP doesn't include the vendor entry
+            // TODO: bad, remove this and add proper OpenLDAP version checking
+            return 'OpenLDAP';
+        }
+        return $this->attributes->vendorName;
+    }
+
+    public function getVersion()
+    {
+        // AD doesn't include the version string
+        if ($this->hasAdOid()) {
+            // TODO: query AD version from cn=schema,cn=configuration,dc=yourdomain,dc=com attribute:ObjectVersion
+        }
+
+        if (! isset($this->attributes->vendorVersion)) {
+            return 'unknown';
+        }
+        return $this->attributes->vendorVersion;
+    }
 }
diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index 3661e160d..db1cfb6cc 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -3,11 +3,13 @@
 
 namespace Icinga\Protocol\Ldap;
 
+use Exception;
 use ArrayIterator;
 use Icinga\Application\Config;
 use Icinga\Application\Logger;
 use Icinga\Application\Platform;
 use Icinga\Data\ConfigObject;
+use Icinga\Data\Inspectable;
 use Icinga\Data\Selectable;
 use Icinga\Data\Sortable;
 use Icinga\Exception\ProgrammingError;
@@ -16,7 +18,7 @@ use Icinga\Protocol\Ldap\LdapException;
 /**
  * Encapsulate LDAP connections and query creation
  */
-class LdapConnection implements Selectable
+class LdapConnection implements Selectable, Inspectable
 {
     /**
      * Indicates that the target object cannot be found
@@ -142,7 +144,7 @@ class LdapConnection implements Selectable
     /**
      * The properties and capabilities of the LDAP server
      *
-     * @var Capability
+     * @var LdapCapabilities
      */
     protected $capabilities;
 
@@ -160,6 +162,16 @@ class LdapConnection implements Selectable
      */
     protected $encryptionSuccess;
 
+    /**
+     * @var array
+     */
+    protected $info = null;
+
+    /**
+     * @var Boolean
+     */
+    protected $healthy = null;
+
     /**
      * Create a new connection object
      *
@@ -243,7 +255,7 @@ class LdapConnection implements Selectable
     /**
      * Return the capabilities of the current connection
      *
-     * @return  Capability
+     * @return  LdapCapabilities
      */
     public function getCapabilities()
     {
@@ -254,7 +266,7 @@ class LdapConnection implements Selectable
             } catch (LdapException $e) {
                 Logger::debug($e);
                 Logger::warning('LADP discovery failed, assuming default LDAP capabilities.');
-                $this->capabilities = new Capability(); // create empty default capabilities
+                $this->capabilities = new LdapCapabilities(); // create empty default capabilities
                 $this->discoverySuccess = false;
             }
         }
@@ -660,7 +672,7 @@ class LdapConnection implements Selectable
         if ($serverSorting && $query->hasOrder()) {
             ldap_set_option($ds, LDAP_OPT_SERVER_CONTROLS, array(
                 array(
-                    'oid'   => Capability::LDAP_SERVER_SORT_OID,
+                    'oid'   => LdapCapabilities::LDAP_SERVER_SORT_OID,
                     'value' => $this->encodeSortRules($query->getOrder())
                 )
             ));
@@ -755,7 +767,7 @@ class LdapConnection implements Selectable
         if ($serverSorting && $query->hasOrder()) {
             ldap_set_option($ds, LDAP_OPT_SERVER_CONTROLS, array(
                 array(
-                    'oid'   => Capability::LDAP_SERVER_SORT_OID,
+                    'oid'   => LdapCapabilities::LDAP_SERVER_SORT_OID,
                     'value' => $this->encodeSortRules($query->getOrder())
                 )
             ));
@@ -1018,7 +1030,7 @@ class LdapConnection implements Selectable
      *
      * @param   resource    $ds     The link identifier of the current LDAP connection
      *
-     * @return  Capability
+     * @return  LdapCapabilities
      *
      * @throws  LdapException       In case the capability query has failed
      */
@@ -1059,8 +1071,7 @@ class LdapConnection implements Selectable
                 ldap_error($ds)
             );
         }
-
-        return new Capability($this->cleanupAttributes(ldap_get_attributes($ds, $entry), array_flip($fields)));
+        return new LdapCapabilities($this->cleanupAttributes(ldap_get_attributes($ds, $entry), array_flip($fields)));
     }
 
     /**
@@ -1128,6 +1139,45 @@ class LdapConnection implements Selectable
         return $dir;
     }
 
+    protected function logInfo($message)
+    {
+        Logger::debug($message);
+        if (! isset($this->info)) {
+            $this->info = array();
+        }
+        $this->info[] = $message;
+    }
+
+    /**
+     * Get information about this objects state
+     *
+     * @return array    An array of strings that describe the state in a human-readable form, each array element
+     *                  represents one fact about this object
+     */
+    public function getInfo()
+    {
+        if (! isset($this->info)) {
+            $this->getConnection();
+        }
+        return $this->info;
+    }
+
+    /**
+     * If this object is working in its current configuration
+     *
+     * @return Bool     True if the object is working, false if not
+     */
+    public function isHealthy()
+    {
+        if (! isset($this->healthy)) {
+            try {
+                $this->testConnectionHealth();
+            } catch (Exception $e) {
+            }
+        }
+        return $this->healthy;
+    }
+
     /**
      * Reset the environment variables set by self::prepareTlsEnvironment()
      */

From 40d432100bc71fd096cef7f9a169fb4ae573dbae Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 14 Jul 2015 18:29:58 +0200
Subject: [PATCH 2508/2920] Add a function to test the connection health

refs #9605
---
 .../Icinga/Protocol/Ldap/LdapConnection.php   | 69 +++++++++++++++----
 1 file changed, 57 insertions(+), 12 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index db1cfb6cc..f99db5363 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -983,24 +983,69 @@ class LdapConnection implements Selectable, Inspectable
         ldap_set_option($ds, LDAP_OPT_REFERRALS, 0);
 
         if ($this->encryption === static::STARTTLS) {
-            if (($this->encryptionSuccess = @ldap_start_tls($ds))) {
-                Logger::debug('LDAP STARTTLS succeeded');
-            } else {
-                Logger::error('LDAP STARTTLS failed: %s', ldap_error($ds));
-
-                // ldap_start_tls seems to corrupt the connection though if I understand
-                // https://tools.ietf.org/html/rfc4511#section-4.14.2 correctly, this shouldn't happen
-                $ds = ldap_connect($hostname, $this->port);
-                ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
-                ldap_set_option($ds, LDAP_OPT_REFERRALS, 0);
+            $this->encrypted = true;
+            $this->logInfo('Connect using STARTTLS');
+            if (! $this->validateCertificate) {
+                $this->logInfo('Skipping certificate validation');
             }
-        } elseif ($this->encryption === static::LDAPS) {
-            $this->encryptionSuccess = true;
+
+            $ret = ldap_start_tls($ds);
+            var_dump($ret);
+            if ($ret) {
+            } else {
+                throw new LdapException('LDAP STARTTLS failed: %s', ldap_error($ds));
+            }
+
+        } elseif ($this->encryption !== static::LDAPS) {
+            $this->encrypted = false;
+            $this->logInfo('Connect without encryption');
         }
 
         return $ds;
     }
 
+    /**
+     * Test if needed aspects of the LDAP connection are working as expected
+     *
+     * Extended information about the
+     *
+     * @throws \Icinga\Protocol\Ldap\LdapException  When a critical aspect of the health test fails
+     */
+    public function testConnectionHealth()
+    {
+        $this->healthy = false;
+        $this->info = array();
+
+        // Try to connect to the server with the given connection parameters
+        $ds = $this->prepareNewConnection();
+
+        // Try a bind-command with the given user credentials, this must not fail
+        $success = @ldap_bind($ds, $this->bindDn, $this->bindPw);
+        $msg = sprintf('LDAP bind to %s:%s (%s / %s)', $this->hostname, $this->port, $this->bindDn, '***' /* $this->bindPw */);
+        if (! $success) {
+            throw new LdapException('%s failed: %s', $msg, ldap_error($ds));
+        }
+        $this->logInfo(sprintf($msg . ' successful'));
+
+        // Try to execute a schema discovery, this may fail if schema discovery is not supported
+        try {
+            $cap = LdapCapabilities::discoverCapabilities($this, $ds);
+            $infos []= $cap->getVendor();
+
+            $version = $cap->getVersion();
+            if (isset($version)) {
+                $infos []= $version;
+            }
+            $infos []= 'Supports STARTTLS: ' . ($cap->hasStartTls() ? 'True' : 'False');
+            $infos []= 'Default naming context: ' . $cap->getDefaultNamingContext();
+            $this->info['Discovery Results:'] =  $infos;
+        } catch (Exception $e) {
+            $this->logInfo('Schema discovery not possible: ', $e->getMessage());
+        }
+
+        $this->healthy = true;
+    }
+
     /**
      * Set up how to handle StartTLS connections
      *

From 3ddb8ca1bd730f6048a2bc099657ffd74331b403 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 14 Jul 2015 18:32:44 +0200
Subject: [PATCH 2509/2920] Add abillity to discover AD version and vendor name
 to discovery

refs #9605
---
 .../Authentication/User/LdapUserBackend.php   |   4 +-
 library/Icinga/Protocol/Ldap/Discovery.php    |   2 +-
 .../Icinga/Protocol/Ldap/LdapCapabilities.php | 122 ++++++++++++++++--
 .../Icinga/Protocol/Ldap/LdapConnection.php   |  58 +--------
 4 files changed, 120 insertions(+), 66 deletions(-)

diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index 948dcbe39..c6efd0673 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -218,7 +218,7 @@ class LdapUserBackend extends LdapRepository implements UserBackendInterface
             throw new ProgrammingError('It is required to set a attribute name where to find a user\'s name first');
         }
 
-        if ($this->ds->getCapabilities()->hasAdOid()) {
+        if ($this->ds->getCapabilities()->isActiveDirectory()) {
             $isActiveAttribute = 'userAccountControl';
             $createdAtAttribute = 'whenCreated';
             $lastModifiedAttribute = 'whenChanged';
@@ -254,7 +254,7 @@ class LdapUserBackend extends LdapRepository implements UserBackendInterface
             throw new ProgrammingError('It is required to set the objectClass where to look for users first');
         }
 
-        if ($this->ds->getCapabilities()->hasAdOid()) {
+        if ($this->ds->getCapabilities()->isActiveDirectory()) {
             $stateConverter = 'user_account_control';
         } else {
             $stateConverter = 'shadow_expire';
diff --git a/library/Icinga/Protocol/Ldap/Discovery.php b/library/Icinga/Protocol/Ldap/Discovery.php
index 94a7f3ee6..0d3873d96 100644
--- a/library/Icinga/Protocol/Ldap/Discovery.php
+++ b/library/Icinga/Protocol/Ldap/Discovery.php
@@ -66,7 +66,7 @@ class Discovery {
      */
     public function isAd()
     {
-        return $this->connection->getCapabilities()->hasAdOid();
+        return $this->connection->getCapabilities()->isActiveDirectory();
     }
 
     /**
diff --git a/library/Icinga/Protocol/Ldap/LdapCapabilities.php b/library/Icinga/Protocol/Ldap/LdapCapabilities.php
index bb3b01751..ba9bca3b8 100644
--- a/library/Icinga/Protocol/Ldap/LdapCapabilities.php
+++ b/library/Icinga/Protocol/Ldap/LdapCapabilities.php
@@ -11,7 +11,6 @@ namespace Icinga\Protocol\Ldap;
  */
 class LdapCapabilities
 {
-
     const LDAP_SERVER_START_TLS_OID = '1.3.6.1.4.1.1466.20037';
 
     const LDAP_PAGED_RESULT_OID_STRING = '1.2.840.113556.1.4.319';
@@ -141,11 +140,22 @@ class LdapCapabilities
      *
      * @return      boolean
      */
-    public function hasAdOid()
+    public function isActiveDirectory()
     {
         return isset($this->oids[self::LDAP_CAP_ACTIVE_DIRECTORY_OID]);
     }
 
+    /**
+     * Whether the ldap server is an OpenLDAP server
+     *
+     * @return bool
+     */
+    public function isOpenLdap()
+    {
+        return isset($this->attributes->structuralObjectClass) &&
+            $this->attributes->structuralObjectClass === 'OpenLDAProotDSE';
+    }
+
     /**
      * Return if the capability objects contains support for LdapV3, defaults to true if discovery failed
      *
@@ -211,29 +221,119 @@ class LdapCapabilities
 
     public function getVendor()
     {
-        // AD doesn't include the vendor entry
-        if ($this->hasAdOid()) {
+        /*
+         rfc #3045 specifies that the name of the server MAY be included in the attribute 'verndorName',
+         AD and OpenLDAP don't do this, but for all all other vendors we follow the standard and
+         just hope for the best.
+        */
+
+        if ($this->isActiveDirectory()) {
             return 'Microsoft Active Directory';
         }
 
-        if (! isset($this->attributes->vendorName)) {
-            // OpenLDAP doesn't include the vendor entry
-            // TODO: bad, remove this and add proper OpenLDAP version checking
+        if ($this->isOpenLdap()) {
             return 'OpenLDAP';
         }
+
+        if (! isset($this->attributes->vendorName)) {
+            return null;
+        }
         return $this->attributes->vendorName;
     }
 
     public function getVersion()
     {
-        // AD doesn't include the version string
-        if ($this->hasAdOid()) {
-            // TODO: query AD version from cn=schema,cn=configuration,dc=yourdomain,dc=com attribute:ObjectVersion
+        /*
+         rfc #3045 specifies that the version of the server MAY be included in the attribute 'vendorVersion',
+         but AD and OpenLDAP don't do this. For OpenLDAP there is no way to query the server versions, but for all
+         all other vendors we follow the standard and just hope for the best.
+        */
+
+        if ($this->isActiveDirectory()) {
+            return $this->getAdObjectVersionName();
         }
 
         if (! isset($this->attributes->vendorVersion)) {
-            return 'unknown';
+            return null;
         }
         return $this->attributes->vendorVersion;
     }
+
+    /**
+     * Discover the capabilities of the given LDAP server
+     *
+     * @param   LdapConnection  $connection The ldap connection to use
+     * @param   int             $ds         The link identifier of the current LDAP connection
+     *
+     * @return  LdapCapabilities
+     *
+     * @throws  LdapException       In case the capability query has failed
+     */
+    public static function discoverCapabilities(LdapConnection $connection, $ds)
+    {
+        $fields = array(
+            'defaultNamingContext',
+            'namingContexts',
+            'vendorName',
+            'vendorVersion',
+            'supportedSaslMechanisms',
+            'dnsHostName',
+            'schemaNamingContext',
+            'supportedLDAPVersion', // => array(3, 2)
+            'supportedCapabilities',
+            'supportedControl',
+            'supportedExtension',
+            'objectVersion',
+            '+'
+        );
+
+        $result = @ldap_read($ds, '', (string) $connection->select()->from('*', $fields), $fields);
+        if (! $result) {
+            throw new LdapException(
+                'Capability query failed (%s:%d): %s. Check if hostname and port of the'
+                . ' ldap resource are correct and if anonymous access is permitted.',
+                $connection->getHostname(),
+                $connection->getPort(),
+                ldap_error($ds)
+            );
+        }
+
+        $entry = ldap_first_entry($ds, $result);
+        if ($entry === false) {
+            throw new LdapException(
+                'Capabilities not available (%s:%d): %s. Discovery of root DSE probably not permitted.',
+                $connection->getHostname(),
+                $connection->getPort(),
+                ldap_error($ds)
+            );
+        }
+        $cap = new LdapCapabilities(
+            $connection->cleanupAttributes(
+                ldap_get_attributes($ds, $entry),
+                array_flip($fields)
+            )
+        );
+
+        return $cap;
+    }
+
+    /**
+     * Determine the active directory version using the available capabillities
+     *
+     * @return null|string  The server version description or null when unknown
+     */
+    protected function getAdObjectVersionName()
+    {
+        if (isset($this->oids[self::LDAP_CAP_ACTIVE_DIRECTORY_W8_OID])) {
+            return 'Windows Server 2012 (or newer)';
+        }
+        if (isset($this->oids[self::LDAP_CAP_ACTIVE_DIRECTORY_V61_R2_OID])) {
+            return 'Windows Server 2008 R2 (or newer)';
+        }
+        if (isset($this->oids[self::LDAP_CAP_ACTIVE_DIRECTORY_V60_OID])) {
+            return 'Windows Server 2008 (or newer)';
+        }
+        return null;
+
+    }
 }
diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index f99db5363..6ac69906c 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -882,7 +882,7 @@ class LdapConnection implements Selectable, Inspectable
      *
      * @return  object
      */
-    protected function cleanupAttributes($attributes, array $requestedFields)
+    public function cleanupAttributes($attributes, array $requestedFields)
     {
         // In case the result contains attributes with a differing case than the requested fields, it is
         // necessary to create another array to map attributes case insensitively to their requested counterparts.
@@ -1058,67 +1058,21 @@ class LdapConnection implements Selectable, Inspectable
             putenv('LDAPTLS_REQCERT=never');
         } else {
             if ($this->validateCertificate) {
-                $ldap_conf = $this->getConfigDir('ldap_ca.conf');
+                // $ldap_conf = $this->getConfigDir('ldap_ca.conf');
             } else {
-                $ldap_conf = $this->getConfigDir('ldap_nocert.conf');
+                // $ldap_conf = $this->getConfigDir('ldap_nocert.conf');
+                putenv('LDAPTLS_REQCERT=never');
             }
 
+            /*
             putenv('LDAPRC=' . $ldap_conf); // TODO: Does not have any effect
             if (getenv('LDAPRC') !== $ldap_conf) {
                 throw new LdapException('putenv failed');
             }
+            */
         }
     }
 
-    /**
-     * Discover the capabilities of the given LDAP server
-     *
-     * @param   resource    $ds     The link identifier of the current LDAP connection
-     *
-     * @return  LdapCapabilities
-     *
-     * @throws  LdapException       In case the capability query has failed
-     */
-    protected function discoverCapabilities($ds)
-    {
-        $fields = array(
-            'defaultNamingContext',
-            'namingContexts',
-            'vendorName',
-            'vendorVersion',
-            'supportedSaslMechanisms',
-            'dnsHostName',
-            'schemaNamingContext',
-            'supportedLDAPVersion', // => array(3, 2)
-            'supportedCapabilities',
-            'supportedControl',
-            'supportedExtension',
-            '+'
-        );
-
-        $result = @ldap_read($ds, '', (string) $this->select()->from('*', $fields), $fields);
-        if (! $result) {
-            throw new LdapException(
-                'Capability query failed (%s:%d): %s. Check if hostname and port of the'
-                . ' ldap resource are correct and if anonymous access is permitted.',
-                $this->hostname,
-                $this->port,
-                ldap_error($ds)
-            );
-        }
-
-        $entry = ldap_first_entry($ds, $result);
-        if ($entry === false) {
-            throw new LdapException(
-                'Capabilities not available (%s:%d): %s. Discovery of root DSE probably not permitted.',
-                $this->hostname,
-                $this->port,
-                ldap_error($ds)
-            );
-        }
-        return new LdapCapabilities($this->cleanupAttributes(ldap_get_attributes($ds, $entry), array_flip($fields)));
-    }
-
     /**
      * Create an LDAP entry
      *

From f4d8bfc309c88abfe282df2c4dc8303da76dfb51 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 14 Jul 2015 18:36:26 +0200
Subject: [PATCH 2510/2920] Display connection test info when inspecting
 LdapConnections

refs #9605
---
 library/Icinga/Protocol/Ldap/LdapConnection.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index 6ac69906c..479b8e78b 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -969,6 +969,10 @@ class LdapConnection implements Selectable, Inspectable
 
         $hostname = $this->hostname;
         if ($this->encryption === static::LDAPS) {
+            $this->logInfo('Connect using LDAPS');
+            if (! $this->validateCertificate) {
+                $this->logInfo('Skipping certificate validation');
+            }
             $hostname = 'ldaps://' . $hostname;
         }
 
@@ -1156,7 +1160,7 @@ class LdapConnection implements Selectable, Inspectable
     public function getInfo()
     {
         if (! isset($this->info)) {
-            $this->getConnection();
+            $this->testConnectionHealth();
         }
         return $this->info;
     }

From 9a90e2a183e631d5fa47940897e129e4febee22f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 15 Jul 2015 08:50:39 +0200
Subject: [PATCH 2511/2920] Wizard: Be less hysteric to not to make users upset

fixes #9620
---
 .../monitoring/application/forms/Config/BackendConfigForm.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index e6d2f2440..504ec9a59 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -377,7 +377,7 @@ class BackendConfigForm extends ConfigForm
         $rowCount = $db->select()->from('icinga_instances')->count();
 
         if ($rowCount === 0) {
-            $form->error($form->translate(
+            $form->warning($form->translate(
                 'There is currently no icinga instance writing to the IDO. Make sure '
                 . 'that a icinga instance is configured and able to write to the IDO.'
             ));

From 84899e3e5689b25eea08a06ae3a4f0425a4d27e7 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 15 Jul 2015 09:56:18 +0200
Subject: [PATCH 2512/2920] Revert some unneeded changes

refs #9605
---
 library/Icinga/Protocol/Ldap/LdapConnection.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index 479b8e78b..4b3ab867f 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -1062,18 +1062,15 @@ class LdapConnection implements Selectable, Inspectable
             putenv('LDAPTLS_REQCERT=never');
         } else {
             if ($this->validateCertificate) {
-                // $ldap_conf = $this->getConfigDir('ldap_ca.conf');
+                $ldap_conf = $this->getConfigDir('ldap_ca.conf');
             } else {
-                // $ldap_conf = $this->getConfigDir('ldap_nocert.conf');
-                putenv('LDAPTLS_REQCERT=never');
+                $ldap_conf = $this->getConfigDir('ldap_nocert.conf');
             }
 
-            /*
             putenv('LDAPRC=' . $ldap_conf); // TODO: Does not have any effect
             if (getenv('LDAPRC') !== $ldap_conf) {
                 throw new LdapException('putenv failed');
             }
-            */
         }
     }
 

From 212111511a72aaa90161c3ab1811a1283f0e8b89 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 15 Jul 2015 10:32:54 +0200
Subject: [PATCH 2513/2920] Fix violations of coding guidelines

---
 .../Icinga/Protocol/Ldap/LdapCapabilities.php  |  2 --
 .../Icinga/Protocol/Ldap/LdapConnection.php    | 18 +++++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/LdapCapabilities.php b/library/Icinga/Protocol/Ldap/LdapCapabilities.php
index ba9bca3b8..e98c57818 100644
--- a/library/Icinga/Protocol/Ldap/LdapCapabilities.php
+++ b/library/Icinga/Protocol/Ldap/LdapCapabilities.php
@@ -313,7 +313,6 @@ class LdapCapabilities
                 array_flip($fields)
             )
         );
-
         return $cap;
     }
 
@@ -334,6 +333,5 @@ class LdapCapabilities
             return 'Windows Server 2008 (or newer)';
         }
         return null;
-
     }
 }
diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index 4b3ab867f..382b61e2d 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -397,8 +397,7 @@ class LdapConnection implements Selectable, Inspectable
     {
         $this->bind();
 
-        if (
-            $query->getUsePagedResults()
+        if ($query->getUsePagedResults()
             && version_compare(PHP_VERSION, '5.4.0') >= 0
             && $this->getCapabilities()->hasPagedResult()
         ) {
@@ -714,7 +713,8 @@ class LdapConnection implements Selectable, Inspectable
             $count += 1;
             if (! $serverSorting || $offset === 0 || $offset < $count) {
                 $entries[ldap_get_dn($ds, $entry)] = $this->cleanupAttributes(
-                    ldap_get_attributes($ds, $entry), array_flip($fields)
+                    ldap_get_attributes($ds, $entry),
+                    array_flip($fields)
                 );
             }
         } while (
@@ -826,7 +826,8 @@ class LdapConnection implements Selectable, Inspectable
                 $count += 1;
                 if (! $serverSorting || $offset === 0 || $offset < $count) {
                     $entries[ldap_get_dn($ds, $entry)] = $this->cleanupAttributes(
-                        ldap_get_attributes($ds, $entry), array_flip($fields)
+                        ldap_get_attributes($ds, $entry),
+                        array_flip($fields)
                     );
                 }
             } while (
@@ -932,6 +933,7 @@ class LdapConnection implements Selectable, Inspectable
      * @param   array   $sortRules
      *
      * @return  string
+     * @throws ProgrammingError
      *
      * @todo    Produces an invalid stream, obviously
      */
@@ -1025,7 +1027,13 @@ class LdapConnection implements Selectable, Inspectable
 
         // Try a bind-command with the given user credentials, this must not fail
         $success = @ldap_bind($ds, $this->bindDn, $this->bindPw);
-        $msg = sprintf('LDAP bind to %s:%s (%s / %s)', $this->hostname, $this->port, $this->bindDn, '***' /* $this->bindPw */);
+        $msg = sprintf(
+            'LDAP bind to %s:%s (%s / %s)',
+            $this->hostname,
+            $this->port,
+            $this->bindDn,
+            '***' /* $this->bindPw */
+        );
         if (! $success) {
             throw new LdapException('%s failed: %s', $msg, ldap_error($ds));
         }

From 3b8b5b0022285da1c93dc634d211bf00b401d009 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 15 Jul 2015 11:14:59 +0200
Subject: [PATCH 2514/2920] Revert accidentally commited unneded changes

---
 library/Icinga/Protocol/Ldap/LdapConnection.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index 382b61e2d..e1cacb7a0 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -994,11 +994,7 @@ class LdapConnection implements Selectable, Inspectable
             if (! $this->validateCertificate) {
                 $this->logInfo('Skipping certificate validation');
             }
-
-            $ret = ldap_start_tls($ds);
-            var_dump($ret);
-            if ($ret) {
-            } else {
+            if (! ldap_start_tls($ds)) {
                 throw new LdapException('LDAP STARTTLS failed: %s', ldap_error($ds));
             }
 

From 7daa97a166875a9c17d86b609ba3667411ce810d Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 15 Jul 2015 11:31:56 +0200
Subject: [PATCH 2515/2920] Clean up unneded code

Remove the now useless error handling cases in case encryption wasn't successful.

refs #9608
---
 library/Icinga/Protocol/Ldap/LdapConnection.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index e1cacb7a0..f97b68881 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -340,12 +340,6 @@ class LdapConnection implements Selectable, Inspectable
         }
 
         $this->bound = true;
-
-        if ($this->encryptionSuccess === false && $this->getCapabilities()->hasStartTls()) {
-            // Alert the user about the unencrypted connection if there is really an error. If the server
-            // does not support it, don't do anything as authentication is completely broken otherwise.
-            throw new LdapException('LDAP STARTTLS failed. An error occured. Please see the log for more details');
-        }
     }
 
     /**

From af58d6964bedb76c45bc7766794ba6a8db2685b1 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 15 Jul 2015 11:46:22 +0200
Subject: [PATCH 2516/2920] Fix isEncrypted function broken by refactaring

refs #9608
---
 library/Icinga/Protocol/Ldap/LdapConnection.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index f97b68881..099c25006 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -160,7 +160,7 @@ class LdapConnection implements Selectable, Inspectable
      *
      * @var bool
      */
-    protected $encryptionSuccess;
+    protected $encrypted = null;
 
     /**
      * @var array
@@ -295,11 +295,11 @@ class LdapConnection implements Selectable, Inspectable
      */
     public function isEncrypted()
     {
-        if ($this->encryptionSuccess === null) {
+        if ($this->encrypted === null) {
             return false;
         }
 
-        return $this->encryptionSuccess;
+        return $this->encrypted;
     }
 
     /**

From f3c8f2229faee287de0b1ec84440b1988623f84b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 15 Jul 2015 15:15:15 +0200
Subject: [PATCH 2517/2920] ErrorLabeller: Provide localized output for the
 MimeType validator

refs #8758
---
 library/Icinga/Web/Form/ErrorLabeller.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Web/Form/ErrorLabeller.php b/library/Icinga/Web/Form/ErrorLabeller.php
index f66260149..803e1d80d 100644
--- a/library/Icinga/Web/Form/ErrorLabeller.php
+++ b/library/Icinga/Web/Form/ErrorLabeller.php
@@ -6,6 +6,7 @@ namespace Icinga\Web\Form;
 use BadMethodCallException;
 use Zend_Translate_Adapter;
 use Zend_Validate_NotEmpty;
+use Zend_Validate_File_MimeType;
 use Icinga\Web\Form\Validator\DateTimeValidator;
 use Icinga\Web\Form\Validator\ReadablePathValidator;
 use Icinga\Web\Form\Validator\WritablePathValidator;
@@ -42,10 +43,15 @@ class ErrorLabeller extends Zend_Translate_Adapter
         $label = $element->getLabel() ?: $element->getName();
 
         return array(
-            Zend_Validate_NotEmpty::IS_EMPTY    => sprintf(t('%s is required and must not be empty'), $label),
-            WritablePathValidator::NOT_WRITABLE     => sprintf(t('%s is not writable', 'config.path'), $label),
-            WritablePathValidator::DOES_NOT_EXIST   => sprintf(t('%s does not exist', 'config.path'), $label),
-            ReadablePathValidator::NOT_READABLE     => sprintf(t('%s is not readable', 'config.path'), $label),
+            Zend_Validate_NotEmpty::IS_EMPTY            => sprintf(t('%s is required and must not be empty'), $label),
+            Zend_Validate_File_MimeType::FALSE_TYPE     => sprintf(
+                t('%s (%%value%%) has a false MIME type of "%%type%%"'),
+                $label
+            ),
+            Zend_Validate_File_MimeType::NOT_DETECTED   => sprintf(t('%s (%%value%%) has no MIME type'), $label),
+            WritablePathValidator::NOT_WRITABLE         => sprintf(t('%s is not writable', 'config.path'), $label),
+            WritablePathValidator::DOES_NOT_EXIST       => sprintf(t('%s does not exist', 'config.path'), $label),
+            ReadablePathValidator::NOT_READABLE         => sprintf(t('%s is not readable', 'config.path'), $label),
             DateTimeValidator::INVALID_DATETIME_FORMAT  => sprintf(
                 t('%s not in the expected format: %%value%%'),
                 $label

From c1d9cde312d2a7306819c013aad41d28b3365e1b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 15 Jul 2015 15:25:40 +0200
Subject: [PATCH 2518/2920] js: Properly submit multipart/form-data

This is not IE <10 compatible. Fix follows. ;-)

refs #8758
---
 public/js/icinga/events.js | 23 ++++++++++++++++++-----
 public/js/icinga/loader.js | 14 +++++++++++++-
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 00a0ff9f4..2ba666f47 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -199,6 +199,7 @@
             var $form = $(event.currentTarget).closest('form');
             var url = $form.attr('action');
             var method = $form.attr('method');
+            var encoding = $form.attr('enctype');
             var $button = $('input[type=submit]:focus', $form).add('button[type=submit]:focus', $form);
             var $target;
             var data;
@@ -230,6 +231,10 @@
                 method = method.toUpperCase();
             }
 
+            if (typeof encoding === 'undefined') {
+                encoding = 'application/x-www-form-urlencoded';
+            }
+
             if ($button.length === 0) {
                 $button = $('input[type=submit]', $form).add('button[type=submit]', $form).first();
             }
@@ -266,14 +271,22 @@
 
                 url = icinga.utils.addUrlParams(url, dataObj);
             } else {
-                data = $form.serializeArray();
+                if (encoding === 'multipart/form-data') {
+                    data = new FormData($form[0]);
+                } else {
+                    data = $form.serializeArray();
+                }
 
                 if (typeof autosubmit === 'undefined' || ! autosubmit) {
                     if ($button.length && $button.attr('name') !== 'undefined') {
-                        data.push({
-                            name: $button.attr('name'),
-                            value: $button.attr('value')
-                        });
+                        if (data instanceof FormData) {
+                            data.append($button.attr('name'), $button.attr('value'));
+                        } else {
+                            data.push({
+                                name: $button.attr('name'),
+                                value: $button.attr('value')
+                            });
+                        }
                     }
                 }
             }
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index b2e8061e2..e7645f313 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -100,13 +100,25 @@
                 headers['X-Icinga-WindowId'] = 'undefined';
             }
 
+            // This is jQuery's default content type
+            var contentType = 'application/x-www-form-urlencoded; charset=UTF-8';
+
+            var isFormData = data instanceof FormData;
+            if (isFormData) {
+                // Setting false is mandatory as the form's data
+                // won't be recognized by the server otherwise
+                contentType = false;
+            }
+
             var self = this;
             var req = $.ajax({
                 type   : method,
                 url    : url,
                 data   : data,
                 headers: headers,
-                context: self
+                context: self,
+                contentType: contentType,
+                processData: ! isFormData
             });
 
             req.$target = $target;

From 774d6ce94aa38c2e6f09c317fd6f4609ab1a9e7b Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 15 Jul 2015 15:34:11 +0200
Subject: [PATCH 2519/2920] Fix invalid function call in getCapabilities caused
 by refactoring

---
 library/Icinga/Protocol/Ldap/LdapCapabilities.php | 5 +++--
 library/Icinga/Protocol/Ldap/LdapConnection.php   | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/LdapCapabilities.php b/library/Icinga/Protocol/Ldap/LdapCapabilities.php
index e98c57818..1ee64eaba 100644
--- a/library/Icinga/Protocol/Ldap/LdapCapabilities.php
+++ b/library/Icinga/Protocol/Ldap/LdapCapabilities.php
@@ -263,14 +263,15 @@ class LdapCapabilities
      * Discover the capabilities of the given LDAP server
      *
      * @param   LdapConnection  $connection The ldap connection to use
-     * @param   int             $ds         The link identifier of the current LDAP connection
      *
      * @return  LdapCapabilities
      *
      * @throws  LdapException       In case the capability query has failed
      */
-    public static function discoverCapabilities(LdapConnection $connection, $ds)
+    public static function discoverCapabilities(LdapConnection $connection)
     {
+        $ds = $connection->getConnection();
+
         $fields = array(
             'defaultNamingContext',
             'namingContexts',
diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index 099c25006..319293e2a 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -261,7 +261,7 @@ class LdapConnection implements Selectable, Inspectable
     {
         if ($this->capabilities === null) {
             try {
-                $this->capabilities = $this->discoverCapabilities($this->getConnection());
+                $this->capabilities = LdapCapabilities::discoverCapabilities($this);
                 $this->discoverySuccess = true;
             } catch (LdapException $e) {
                 Logger::debug($e);
@@ -1031,7 +1031,7 @@ class LdapConnection implements Selectable, Inspectable
 
         // Try to execute a schema discovery, this may fail if schema discovery is not supported
         try {
-            $cap = LdapCapabilities::discoverCapabilities($this, $ds);
+            $cap = LdapCapabilities::discoverCapabilities($this);
             $infos []= $cap->getVendor();
 
             $version = $cap->getVersion();

From 11360f36e4aadbf19bf1bbc0a7d52990595020e7 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 15 Jul 2015 13:28:01 +0200
Subject: [PATCH 2520/2920] Fix grammar errors in backend titles

---
 application/controllers/ConfigController.php           | 2 +-
 application/controllers/UsergroupbackendController.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index f077dfe02..206d3c88b 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -53,7 +53,7 @@ class ConfigController extends Controller
         ));
         $tabs->add('usergroupbackend', array(
             'title' => $this->translate('Configure how users are associated with groups by Icinga Web 2'),
-            'label' => $this->translate('Usergroup Backends'),
+            'label' => $this->translate('User Group Backends'),
             'url'   => 'usergroupbackend/list'
         ));
         return $tabs;
diff --git a/application/controllers/UsergroupbackendController.php b/application/controllers/UsergroupbackendController.php
index 477c1b28d..961c72132 100644
--- a/application/controllers/UsergroupbackendController.php
+++ b/application/controllers/UsergroupbackendController.php
@@ -160,7 +160,7 @@ class UsergroupbackendController extends Controller
         ));
         $tabs->add('usergroupbackend', array(
             'title' => $this->translate('Configure how users are associated with groups by Icinga Web 2'),
-            'label' => $this->translate('Usergroup Backends'),
+            'label' => $this->translate('User Group Backends'),
             'url'   => 'usergroupbackend/list'
         ));
         return $tabs;

From 6d4d99aa62817d855cf710f7fc5f58065f645322 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 15 Jul 2015 15:49:34 +0200
Subject: [PATCH 2521/2920] js: Use window.FormData instead of just FormData

refs #8758
---
 public/js/icinga/events.js | 4 ++--
 public/js/icinga/loader.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 2ba666f47..54ea46725 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -272,14 +272,14 @@
                 url = icinga.utils.addUrlParams(url, dataObj);
             } else {
                 if (encoding === 'multipart/form-data') {
-                    data = new FormData($form[0]);
+                    data = new window.FormData($form[0]);
                 } else {
                     data = $form.serializeArray();
                 }
 
                 if (typeof autosubmit === 'undefined' || ! autosubmit) {
                     if ($button.length && $button.attr('name') !== 'undefined') {
-                        if (data instanceof FormData) {
+                        if (encoding === 'multipart/form-data') {
                             data.append($button.attr('name'), $button.attr('value'));
                         } else {
                             data.push({
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index e7645f313..5677eb629 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -103,7 +103,7 @@
             // This is jQuery's default content type
             var contentType = 'application/x-www-form-urlencoded; charset=UTF-8';
 
-            var isFormData = data instanceof FormData;
+            var isFormData = data instanceof window.FormData;
             if (isFormData) {
                 // Setting false is mandatory as the form's data
                 // won't be recognized by the server otherwise

From 6762ef053e3f49d1896497efcff7b40b9023bcc9 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 15 Jul 2015 17:30:39 +0200
Subject: [PATCH 2522/2920] Upgrade Inspection API

Reduce code duplication and stateffullnes by using InspectionException to indicate that an error was thrown, and only using one inspect function.

refs #9630
---
 library/Icinga/Data/Inspectable.php           |  15 +-
 .../Icinga/Protocol/Ldap/LdapConnection.php   | 153 +++++++-----------
 2 files changed, 61 insertions(+), 107 deletions(-)

diff --git a/library/Icinga/Data/Inspectable.php b/library/Icinga/Data/Inspectable.php
index 1e037113a..700f9050b 100644
--- a/library/Icinga/Data/Inspectable.php
+++ b/library/Icinga/Data/Inspectable.php
@@ -2,7 +2,7 @@
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data;
-
+use Icinga\Exception\InspectionException;
 
 /**
  * An object for which the user can retrieve status information
@@ -12,15 +12,8 @@ interface Inspectable
     /**
      * Get information about this objects state
      *
-     * @return array    An array of strings that describe the state in a human-readable form, each array element
-     *                  represents one fact about this object
+     * @return Inspection
+     * @throws InspectionException  When inspection of the object was not possible
      */
-    public function getInfo();
-
-    /**
-     * If this object is working in its current configuration
-     *
-     * @return Bool     True if the object is working, false if not
-     */
-    public function isHealthy();
+    public function inspect();
 }
diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index 319293e2a..7a315c4d8 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -10,8 +10,10 @@ use Icinga\Application\Logger;
 use Icinga\Application\Platform;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\Inspectable;
+use Icinga\Data\Inspection;
 use Icinga\Data\Selectable;
 use Icinga\Data\Sortable;
+use Icinga\Exception\InspectionException;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Protocol\Ldap\LdapException;
 
@@ -162,16 +164,6 @@ class LdapConnection implements Selectable, Inspectable
      */
     protected $encrypted = null;
 
-    /**
-     * @var array
-     */
-    protected $info = null;
-
-    /**
-     * @var Boolean
-     */
-    protected $healthy = null;
-
     /**
      * Create a new connection object
      *
@@ -953,21 +945,27 @@ class LdapConnection implements Selectable, Inspectable
     /**
      * Prepare and establish a connection with the LDAP server
      *
-     * @return  resource        A LDAP link identifier
+     * @param   Inspection  $info   Optional inspection to fill with diagnosis info
      *
-     * @throws  LdapException   In case the connection is not possible
+     * @return  resource            A LDAP link identifier
+     *
+     * @throws  LdapException       In case the connection is not possible
      */
-    protected function prepareNewConnection()
+    protected function prepareNewConnection(Inspection $info = null)
     {
+        if (! isset($info)) {
+            $info = new Inspection('');
+        }
+
         if ($this->encryption === static::STARTTLS || $this->encryption === static::LDAPS) {
             $this->prepareTlsEnvironment();
         }
 
         $hostname = $this->hostname;
         if ($this->encryption === static::LDAPS) {
-            $this->logInfo('Connect using LDAPS');
+            $info->write('Connect using LDAPS');
             if (! $this->validateCertificate) {
-                $this->logInfo('Skipping certificate validation');
+                $info->write('Skip certificate validation');
             }
             $hostname = 'ldaps://' . $hostname;
         }
@@ -984,9 +982,9 @@ class LdapConnection implements Selectable, Inspectable
 
         if ($this->encryption === static::STARTTLS) {
             $this->encrypted = true;
-            $this->logInfo('Connect using STARTTLS');
+            $info->write('Connect using STARTTLS');
             if (! $this->validateCertificate) {
-                $this->logInfo('Skipping certificate validation');
+                $info->write('Skip certificate validation');
             }
             if (! ldap_start_tls($ds)) {
                 throw new LdapException('LDAP STARTTLS failed: %s', ldap_error($ds));
@@ -994,60 +992,12 @@ class LdapConnection implements Selectable, Inspectable
 
         } elseif ($this->encryption !== static::LDAPS) {
             $this->encrypted = false;
-            $this->logInfo('Connect without encryption');
+            $info->write('Connect without encryption');
         }
 
         return $ds;
     }
 
-    /**
-     * Test if needed aspects of the LDAP connection are working as expected
-     *
-     * Extended information about the
-     *
-     * @throws \Icinga\Protocol\Ldap\LdapException  When a critical aspect of the health test fails
-     */
-    public function testConnectionHealth()
-    {
-        $this->healthy = false;
-        $this->info = array();
-
-        // Try to connect to the server with the given connection parameters
-        $ds = $this->prepareNewConnection();
-
-        // Try a bind-command with the given user credentials, this must not fail
-        $success = @ldap_bind($ds, $this->bindDn, $this->bindPw);
-        $msg = sprintf(
-            'LDAP bind to %s:%s (%s / %s)',
-            $this->hostname,
-            $this->port,
-            $this->bindDn,
-            '***' /* $this->bindPw */
-        );
-        if (! $success) {
-            throw new LdapException('%s failed: %s', $msg, ldap_error($ds));
-        }
-        $this->logInfo(sprintf($msg . ' successful'));
-
-        // Try to execute a schema discovery, this may fail if schema discovery is not supported
-        try {
-            $cap = LdapCapabilities::discoverCapabilities($this);
-            $infos []= $cap->getVendor();
-
-            $version = $cap->getVersion();
-            if (isset($version)) {
-                $infos []= $version;
-            }
-            $infos []= 'Supports STARTTLS: ' . ($cap->hasStartTls() ? 'True' : 'False');
-            $infos []= 'Default naming context: ' . $cap->getDefaultNamingContext();
-            $this->info['Discovery Results:'] =  $infos;
-        } catch (Exception $e) {
-            $this->logInfo('Schema discovery not possible: ', $e->getMessage());
-        }
-
-        $this->healthy = true;
-    }
-
     /**
      * Set up how to handle StartTLS connections
      *
@@ -1137,43 +1087,54 @@ class LdapConnection implements Selectable, Inspectable
         return $dir;
     }
 
-    protected function logInfo($message)
-    {
-        Logger::debug($message);
-        if (! isset($this->info)) {
-            $this->info = array();
-        }
-        $this->info[] = $message;
-    }
-
     /**
-     * Get information about this objects state
+     * Test if needed aspects of the LDAP connection are working as expected
      *
-     * @return array    An array of strings that describe the state in a human-readable form, each array element
-     *                  represents one fact about this object
+     * @return  Inspection          Information about the tested connection
+     *
+     * @throws  InspectionException When inspection failed
      */
-    public function getInfo()
+    public function inspect()
     {
-        if (! isset($this->info)) {
-            $this->testConnectionHealth();
-        }
-        return $this->info;
-    }
+        $insp = new Inspection('Ldap Connection');
 
-    /**
-     * If this object is working in its current configuration
-     *
-     * @return Bool     True if the object is working, false if not
-     */
-    public function isHealthy()
-    {
-        if (! isset($this->healthy)) {
-            try {
-                $this->testConnectionHealth();
-            } catch (Exception $e) {
+        // Try to connect to the server with the given connection parameters
+        try {
+            $ds = $this->prepareNewConnection($insp);
+        } catch (Exception $e) {
+            throw new InspectionException($e->getMessage(), $insp);
+        }
+
+        // Try a bind-command with the given user credentials, this must not fail
+        $success = @ldap_bind($ds, $this->bindDn, $this->bindPw);
+        $msg = sprintf(
+            'LDAP bind to %s:%s (%s / %s)',
+            $this->hostname,
+            $this->port,
+            $this->bindDn,
+            '***' /* $this->bindPw */
+        );
+        if (! $success) {
+            $insp->error(sprintf('%s failed: %s', $msg, ldap_error($ds)));
+        }
+        $insp->write(sprintf($msg . ' successful'));
+
+        // Try to execute a schema discovery this may fail if schema discovery is not supported
+        try {
+            $cap = LdapCapabilities::discoverCapabilities($this);
+            $discovery = new Inspection('Discovery Results');
+            $discovery->write($cap->getVendor());
+            $version = $cap->getVersion();
+            if (isset($version)) {
+                $discovery->write($version);
             }
+            $discovery->write('Supports STARTTLS: ' . ($cap->hasStartTls() ? 'True' : 'False'));
+            $discovery->write('Default naming context: ' . $cap->getDefaultNamingContext());
+            $insp->write($discovery);
+        } catch (Exception $e) {
+            $insp->write('Schema discovery not possible: ' . $e->getMessage());
         }
-        return $this->healthy;
+        return $insp;
     }
 
     /**

From 276aa43aa26382b973ceab15847d98ab9b81fe93 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 15 Jul 2015 18:36:19 +0200
Subject: [PATCH 2523/2920] Upgrdae Inspection API again

Do not use InspectionException any more to reduce complexity of nested inspections, but keep error states
in the Inspection object itself.

refs #9630
---
 library/Icinga/Data/Inspectable.php             |  9 +++++----
 library/Icinga/Protocol/Ldap/LdapConnection.php | 10 ++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/library/Icinga/Data/Inspectable.php b/library/Icinga/Data/Inspectable.php
index 700f9050b..8b37d9503 100644
--- a/library/Icinga/Data/Inspectable.php
+++ b/library/Icinga/Data/Inspectable.php
@@ -2,18 +2,19 @@
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Data;
-use Icinga\Exception\InspectionException;
 
 /**
  * An object for which the user can retrieve status information
+ *
+ * This interface is useful for providing summaries or diagnostic information about objects
+ * to users.
  */
 interface Inspectable
 {
     /**
-     * Get information about this objects state
+     * Inspect this object to gain extended information about its health
      *
-     * @return Inspection
-     * @throws InspectionException  When inspection of the object was not possible
+     * @return Inspection           The inspection result
      */
     public function inspect();
 }
diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index 7a315c4d8..fb20a59ef 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -1088,11 +1088,9 @@ class LdapConnection implements Selectable, Inspectable
     }
 
     /**
-     * Test if needed aspects of the LDAP connection are working as expected
+     * Inspect if this LDAP Connection is working as expected
      *
-     * @return  Inspection          Information about the tested connection
-     *
-     * @throws  InspectionException When inspection failed
+     * @return  Inspection  Inspection result
      */
     public function inspect()
     {
@@ -1102,7 +1100,7 @@ class LdapConnection implements Selectable, Inspectable
         try {
             $ds = $this->prepareNewConnection($insp);
         } catch (Exception $e) {
-            throw new InspectionException($e->getMessage(), $insp);
+            return $insp->error($e->getMessage());
         }
 
         // Try a bind-command with the given user credentials, this must not fail
@@ -1115,7 +1113,7 @@ class LdapConnection implements Selectable, Inspectable
             '***' /* $this->bindPw */
         );
         if (! $success) {
-            $insp->error(sprintf('%s failed: %s', $msg, ldap_error($ds)));
+            return $insp->error(sprintf('%s failed: %s', $msg, ldap_error($ds)));
         }
         $insp->write(sprintf($msg . ' successful'));
 

From cf8b760adedc66a4252af7ba6ce84b24a76326ab Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 15 Jul 2015 19:32:12 +0200
Subject: [PATCH 2524/2920] Use Inspection API in LdapResourceForm

refs #9630
---
 .../Config/Resource/LdapResourceForm.php      | 22 +++++++++----------
 .../Icinga/Protocol/Ldap/LdapConnection.php   |  5 ++++-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index 604e34199..b385610a8 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -154,19 +154,17 @@ class LdapResourceForm extends Form
      */
     public static function isValidResource(Form $form)
     {
-        try {
-            $resource = ResourceFactory::createResource(new ConfigObject($form->getValues()));
-            $resource->bind();
-        } catch (Exception $e) {
-            $msg = $form->translate('Connectivity validation failed, connection to the given resource not possible.');
-            if (($error = $e->getMessage())) {
-                $msg .= ' (' . $error . ')';
-            }
-
-            $form->addError($msg);
-            return false;
+        $result = ResourceFactory::createResource(new ConfigObject($form->getValues()))->inspect();
+        if ($result->hasError()) {
+            $form->addError(sprintf(
+                '%s (%s)',
+                $form->translate('Connectivity validation failed, connection to the given resource not possible.'),
+                $result->getError()
+            ));
         }
 
-        return true;
+        // TODO: display diagnostics in $result->toArray() to the user
+
+        return ! $result->hasError();
     }
 }
diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index fb20a59ef..2e97b8c9b 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -945,7 +945,7 @@ class LdapConnection implements Selectable, Inspectable
     /**
      * Prepare and establish a connection with the LDAP server
      *
-     * @param   Inspection  $info   Optional inspection to fill with diagnosis info
+     * @param   Inspection  $info   Optional inspection to fill with diagnostic info
      *
      * @return  resource            A LDAP link identifier
      *
@@ -1090,6 +1090,9 @@ class LdapConnection implements Selectable, Inspectable
     /**
      * Inspect if this LDAP Connection is working as expected
      *
+     * Check if connection, bind and encryption is working as expected and get additional
+     * information about the used
+     *
      * @return  Inspection  Inspection result
      */
     public function inspect()

From 59c4f8d056ad6eb03a6d95655e725ed82f20e42f Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 15 Jul 2015 19:35:25 +0200
Subject: [PATCH 2525/2920] Use Inspection API in User Backend Form

refs #9630
---
 .../Config/UserBackend/LdapBackendForm.php    | 26 ++++-----
 .../Authentication/User/LdapUserBackend.php   | 53 ++++++++++++++++---
 2 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/application/forms/Config/UserBackend/LdapBackendForm.php b/application/forms/Config/UserBackend/LdapBackendForm.php
index 9151134c3..6427fbf34 100644
--- a/application/forms/Config/UserBackend/LdapBackendForm.php
+++ b/application/forms/Config/UserBackend/LdapBackendForm.php
@@ -4,6 +4,8 @@
 namespace Icinga\Forms\Config\UserBackend;
 
 use Exception;
+use Icinga\Authentication\User\LdapUserBackend;
+use Icinga\Data\Inspection;
 use Icinga\Web\Form;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
@@ -184,22 +186,16 @@ class LdapBackendForm extends Form
      */
     public static function isValidUserBackend(Form $form)
     {
-        try {
-            $ldapUserBackend = UserBackend::create(null, new ConfigObject($form->getValues()));
-            $ldapUserBackend->assertAuthenticationPossible();
-        } catch (AuthenticationException $e) {
-            if (($previous = $e->getPrevious()) !== null) {
-                $form->addError($previous->getMessage());
-            } else {
-                $form->addError($e->getMessage());
-            }
-
-            return false;
-        } catch (Exception $e) {
-            $form->addError(sprintf($form->translate('Unable to validate authentication: %s'), $e->getMessage()));
-            return false;
+        /**
+         * @var $result Inspection
+         */
+        $result = UserBackend::create(null, new ConfigObject($form->getValues()))->inspect();
+        if ($result->hasError()) {
+            $form->addError($result->getError());
         }
 
-        return true;
+        // TODO: display diagnostics in $result->toArray() to the user
+
+        return ! $result->hasError();
     }
 }
diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index c6efd0673..ecaa08ef4 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -5,6 +5,8 @@ namespace Icinga\Authentication\User;
 
 use DateTime;
 use Icinga\Data\ConfigObject;
+use Icinga\Data\Inspectable;
+use Icinga\Data\Inspection;
 use Icinga\Exception\AuthenticationException;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Repository\LdapRepository;
@@ -13,7 +15,7 @@ use Icinga\Protocol\Ldap\LdapException;
 use Icinga\Protocol\Ldap\Expression;
 use Icinga\User;
 
-class LdapUserBackend extends LdapRepository implements UserBackendInterface
+class LdapUserBackend extends LdapRepository implements UserBackendInterface, Inspectable
 {
     /**
      * The base DN to use for a query
@@ -315,24 +317,32 @@ class LdapUserBackend extends LdapRepository implements UserBackendInterface
      *  <li>The specified userClass has the property specified by userNameAttribute</li>
      * </ul>
      *
+     * @param   Inspection  $info           Optional inspection to fill with diagnostic info
+     *
      * @throws  AuthenticationException     When authentication is not possible
      */
-    public function assertAuthenticationPossible()
+    public function assertAuthenticationPossible(Inspection $insp = null)
     {
+        if (! isset($insp)) {
+            $insp = new Inspection('');
+        }
         try {
             $result = $this->select()->fetchRow();
         } catch (LdapException $e) {
             throw new AuthenticationException('Connection not possible.', $e);
         }
+        $insp->write('Connection possible.');
 
+        $msg = sprintf(
+            'objects with objectClass "%s" in DN "%s" (Filter: %s)',
+            $this->userClass,
+            $this->baseDn ?: $this->ds->getDn(),
+            $this->filter ?: 'None'
+        );
         if ($result === false) {
-            throw new AuthenticationException(
-                'No objects with objectClass "%s" in DN "%s" found. (Filter: %s)',
-                $this->userClass,
-                $this->baseDn ?: $this->ds->getDn(),
-                $this->filter ?: 'None'
-            );
+            throw new AuthenticationException('No ' . $msg . 'found');
         }
+        $insp->write($msg . ' exist');
 
         if (! isset($result->user_name)) {
             throw new AuthenticationException(
@@ -377,4 +387,31 @@ class LdapUserBackend extends LdapRepository implements UserBackendInterface
             );
         }
     }
+
+    /**
+     * Inspect if this LDAP User Backend is working as expected
+     *
+     * @return  Inspection  Inspection result
+     */
+    public function inspect()
+    {
+        $result = new Inspection('Ldap User Backend');
+
+        // inspect the used connection to get more diagnostic info in case the connection is not working
+        $result->write($this->ds->inspect());
+
+        try {
+            $this->assertAuthenticationPossible($result);
+            $result->write('User count: ' . $this->select()->count());
+        } catch (AuthenticationException $e) {
+            if (($previous = $e->getPrevious()) !== null) {
+                $result->error($previous->getMessage());
+            } else {
+                $result->error($e->getMessage());
+            }
+        } catch (Exception $e) {
+            $result->error(sprintf('Unable to validate authentication: %s', $e->getMessage()));
+        }
+        return $result;
+    }
 }

From d192410435250d30686f39a555480325dde80152 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 16 Jul 2015 11:23:48 +0200
Subject: [PATCH 2526/2920] Introduce GET parameter _disableLayout to ...
 disable the entire layout

refs #8758
---
 library/Icinga/Web/Controller/ActionController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 571f0792f..750c101f3 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -96,6 +96,9 @@ class ActionController extends Zend_Controller_Action
         if ($this->rerenderLayout = $request->getUrl()->shift('renderLayout')) {
             $this->xhrLayout = 'body';
         }
+        if ($request->getUrl()->shift('_disableLayout')) {
+            $this->_helper->layout()->disableLayout();
+        }
 
         if ($this->requiresLogin()) {
             $this->redirectToLogin(Url::fromRequest());

From 549f36f82c1074af601bd3d4b0284404fcd9db55 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 16 Jul 2015 11:27:02 +0200
Subject: [PATCH 2527/2920] Form: Do not create a new instance of Url when
 setting the action

We're shifting parameters and by creating a new instance we'll lose
such changes.

refs #8758
---
 library/Icinga/Web/Form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index e2ee66d0a..188f8e09c 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -615,7 +615,7 @@ class Form extends Zend_Form
                 // TODO(el): Re-evalute this necessity. JavaScript could use the container's URL if there's no action set.
                 // We MUST set an action as JS gets confused otherwise, if
                 // this form is being displayed in an additional column
-                $this->setAction(Url::fromRequest()->without(array_keys($this->getElements())));
+                $this->setAction($this->getRequest()->getUrl()->without(array_keys($this->getElements())));
             }
 
             $this->created = true;

From 2164bb86c886b4041b2016c12883385c6a144560 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 16 Jul 2015 11:27:31 +0200
Subject: [PATCH 2528/2920] Tabs: Do not create a new instance of Url when
 rendering the refresh url

We're shifting parameters and by creating a new instance we'll lose
such changes.

refs #8758
---
 library/Icinga/Web/Widget/Tabs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index aa5e7cda6..220393aff 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -309,7 +309,7 @@ EOT;
 
     private function renderRefreshTab()
     {
-        $url = Url::fromRequest()->without('renderLayout');
+        $url = Icinga::app()->getFrontController()->getRequest()->getUrl();
         $tab = $this->get($this->getActiveName());
 
         if ($tab !== null) {

From 6b8e5da76d0e7a5219ce8b58fd4118d0c93a3bea Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 16 Jul 2015 11:34:15 +0200
Subject: [PATCH 2529/2920] Move all assertion functions into the inspect
 functions

Reduce code duplication and add class Inspection

refs #9630
---
 .../Authentication/User/LdapUserBackend.php   |  73 +++++-----
 library/Icinga/Data/Inspection.php            | 127 ++++++++++++++++++
 2 files changed, 161 insertions(+), 39 deletions(-)
 create mode 100644 library/Icinga/Data/Inspection.php

diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index ecaa08ef4..e8ae9a579 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -308,49 +308,14 @@ class LdapUserBackend extends LdapRepository implements UserBackendInterface, In
     }
 
     /**
-     * Probe the backend to test if authentication is possible
-     *
-     * Try to bind to the backend and fetch a single user to check if:
-     * <ul>
-     *  <li>Connection credentials are correct and the bind is possible</li>
-     *  <li>At least one user exists</li>
-     *  <li>The specified userClass has the property specified by userNameAttribute</li>
-     * </ul>
-     *
+
      * @param   Inspection  $info           Optional inspection to fill with diagnostic info
      *
      * @throws  AuthenticationException     When authentication is not possible
      */
     public function assertAuthenticationPossible(Inspection $insp = null)
     {
-        if (! isset($insp)) {
-            $insp = new Inspection('');
-        }
-        try {
-            $result = $this->select()->fetchRow();
-        } catch (LdapException $e) {
-            throw new AuthenticationException('Connection not possible.', $e);
-        }
-        $insp->write('Connection possible.');
 
-        $msg = sprintf(
-            'objects with objectClass "%s" in DN "%s" (Filter: %s)',
-            $this->userClass,
-            $this->baseDn ?: $this->ds->getDn(),
-            $this->filter ?: 'None'
-        );
-        if ($result === false) {
-            throw new AuthenticationException('No ' . $msg . 'found');
-        }
-        $insp->write($msg . ' exist');
-
-        if (! isset($result->user_name)) {
-            throw new AuthenticationException(
-                'UserNameAttribute "%s" not existing in objectClass "%s"',
-                $this->userNameAttribute,
-                $this->userClass
-            );
-        }
     }
 
     /**
@@ -389,7 +354,15 @@ class LdapUserBackend extends LdapRepository implements UserBackendInterface, In
     }
 
     /**
-     * Inspect if this LDAP User Backend is working as expected
+     * Inspect if this LDAP User Backend is working as expected by probing the backend
+     * and testing if thea uthentication is possible
+     *
+     * Try to bind to the backend and fetch a single user to check if:
+     * <ul>
+     *  <li>Connection credentials are correct and the bind is possible</li>
+     *  <li>At least one user exists</li>
+     *  <li>The specified userClass has the property specified by userNameAttribute</li>
+     * </ul>
      *
      * @return  Inspection  Inspection result
      */
@@ -399,9 +372,31 @@ class LdapUserBackend extends LdapRepository implements UserBackendInterface, In
 
         // inspect the used connection to get more diagnostic info in case the connection is not working
         $result->write($this->ds->inspect());
-
         try {
-            $this->assertAuthenticationPossible($result);
+            try {
+                $res = $this->select()->fetchRow();
+            } catch (LdapException $e) {
+                throw new AuthenticationException('Connection not possible.', $e);
+            }
+            $result->write('Connection possible.');
+            $msg = sprintf(
+                'objects with objectClass "%s" in DN "%s" (Filter: %s)',
+                $this->userClass,
+                $this->baseDn ?: $this->ds->getDn(),
+                $this->filter ?: 'None'
+            );
+            if ($res === false) {
+                throw new AuthenticationException('No ' . $msg . 'found');
+            }
+            $result->write($msg . ' exist');
+            if (! isset($res->user_name)) {
+                throw new AuthenticationException(
+                    'UserNameAttribute "%s" not existing in objectClass "%s"',
+                    $this->userNameAttribute,
+                    $this->userClass
+                );
+            }
+
             $result->write('User count: ' . $this->select()->count());
         } catch (AuthenticationException $e) {
             if (($previous = $e->getPrevious()) !== null) {
diff --git a/library/Icinga/Data/Inspection.php b/library/Icinga/Data/Inspection.php
new file mode 100644
index 000000000..eea91617e
--- /dev/null
+++ b/library/Icinga/Data/Inspection.php
@@ -0,0 +1,127 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Data;
+
+use Icinga\Application\Logger;
+use Icinga\Exception\ProgrammingError;
+
+/**
+ * Contains information about an object in the form of human-readable log entries and indicates if the object has errors
+ */
+class Inspection
+{
+    /**
+     * @var array
+     */
+    protected $log = array();
+
+    /**
+     * @var string
+     */
+    protected $description;
+
+    /**
+     * @var string|Inspection
+     */
+    protected $error;
+
+    /**
+     * @param $description     Describes the object that is being inspected
+     */
+    public function __construct($description)
+    {
+        $this->description = $description;
+    }
+
+    /**
+     * Get the name of this Inspection
+     *
+     * @return mixed
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+     * Append the given log entry or nested inspection
+     *
+     * @throws  ProgrammingError            When called after erroring
+     *
+     * @param $entry    string|Inspection   A log entry or nested inspection
+     */
+    public function write($entry)
+    {
+        if (isset($this->error)) {
+            throw new ProgrammingError('Inspection object used after error');
+        }
+        if ($entry instanceof Inspection) {
+            $this->log[$entry->description] = $entry->toArray();
+        } else {
+            $this->log[] = $entry;
+        }
+    }
+
+    /**
+     * Append the given log entry and fail this inspection with the given error
+     *
+     * @param   $entry  string|Inspection   A log entry or nested inspection
+     *
+     * @throws  ProgrammingError            When called multiple times
+     *
+     * @return  this                        fluent interface
+     */
+    public function error($entry)
+    {
+        if (isset($this->error)) {
+            throw new ProgrammingError('Inspection object used after error');
+        }
+        $this->write($entry);
+        $this->error = $entry;
+        return $this;
+    }
+
+    /**
+     * If the inspection resulted in an error
+     *
+     * @return bool
+     */
+    public function hasError()
+    {
+        return isset($this->error);
+    }
+
+    /**
+     * The error that caused the inspection to fail
+     *
+     * @return Inspection|string
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * Convert the inspection to an array
+     *
+     * @return array     An array of strings that describe the state in a human-readable form, each array element
+     *                   represents one log entry about this object.
+     */
+    public function toArray()
+    {
+        return $this->log;
+    }
+
+    /**
+     * Return a text representation of the inspection log entries
+     */
+    public function __toString()
+    {
+        return sprintf(
+            'Inspection: description: "%s" error: "%s"',
+            $this->description,
+            $this->error
+        );
+    }
+}

From da5ceb0e73b37fd738e372d732e5c2784629932c Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 16 Jul 2015 12:22:34 +0200
Subject: [PATCH 2530/2920] Fix broken unit tests

Fix unit tests that were broken by API changes to the resource form classes and contemplate life choices.

refs #9630
---
 .../Config/Resource/LdapResourceFormTest.php  | 29 ++++++++++++---
 .../UserBackend/LdapBackendFormTest.php       | 35 ++++++++++++++++---
 2 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
index 859288256..bef49edca 100644
--- a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
+++ b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
@@ -26,14 +26,16 @@ class LdapResourceFormTest extends BaseTestCase
     public function testValidLdapResourceIsValid()
     {
         $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('bind')->once()->getMock()
+            Mockery::mock()->shouldReceive('inspect')->andReturn(self::createInspector(false))->getMock()
         );
 
         // Passing array(null) is required to make Mockery call the constructor...
         $form = Mockery::mock('Icinga\Forms\Config\Resource\LdapResourceForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
-            ->andReturnUsing(function ($s) { return $s; });
+            ->andReturnUsing(function ($s) {
+                return $s;
+            });
         $form->setTokenDisabled();
 
         $this->assertTrue(
@@ -49,14 +51,16 @@ class LdapResourceFormTest extends BaseTestCase
     public function testInvalidLdapResourceIsNotValid()
     {
         $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('bind')->andThrow('\Exception')->getMock()
+            Mockery::mock()->shouldReceive('inspect')->andReturn(self::createInspector(true))->getMock()
         );
 
         // Passing array(null) is required to make Mockery call the constructor...
         $form = Mockery::mock('Icinga\Forms\Config\Resource\LdapResourceForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
-            ->andReturnUsing(function ($s) { return $s; });
+            ->andReturnUsing(function ($s) {
+                return $s;
+            });
         $form->setTokenDisabled();
 
         $this->assertFalse(
@@ -72,4 +76,21 @@ class LdapResourceFormTest extends BaseTestCase
             ->with(Mockery::type('Icinga\Data\ConfigObject'))
             ->andReturn($resourceMock);
     }
+
+    public static function createInspector($error = false, $log = array('log'))
+    {
+        if (! $error) {
+            $calls = array(
+                'hasError' => false,
+                'toArray' => $log
+            );
+        } else {
+            $calls = array(
+                'hasError' => true,
+                'getError' => 'Error',
+                'toArray' => $log
+            );
+        }
+        return Mockery::mock('Icinga\Data\Inspection', $calls);
+    }
 }
diff --git a/test/php/application/forms/Config/UserBackend/LdapBackendFormTest.php b/test/php/application/forms/Config/UserBackend/LdapBackendFormTest.php
index 6fe63adf4..c5bb8c9af 100644
--- a/test/php/application/forms/Config/UserBackend/LdapBackendFormTest.php
+++ b/test/php/application/forms/Config/UserBackend/LdapBackendFormTest.php
@@ -12,6 +12,7 @@ use Icinga\Data\ConfigObject;
 use Icinga\Test\BaseTestCase;
 use Icinga\Forms\Config\UserBackend\LdapBackendForm;
 use Icinga\Exception\AuthenticationException;
+use Tests\Icinga\Forms\Config\Resource\LdapResourceFormTest;
 
 class LdapBackendFormTest extends BaseTestCase
 {
@@ -27,15 +28,18 @@ class LdapBackendFormTest extends BaseTestCase
      */
     public function testValidBackendIsValid()
     {
-        $ldapUserBackendMock = Mockery::mock('overload:Icinga\Authentication\User\LdapUserBackend');
-        $ldapUserBackendMock->shouldReceive('assertAuthenticationPossible')->andReturnNull();
+        $ldapUserBackendMock = Mockery::mock('overload:Icinga\Authentication\User\LdapUserBackend')
+            ->shouldReceive('inspect')
+            ->andReturn(self::createInspector(false))->getMock();
         $this->setUpUserBackendMock($ldapUserBackendMock);
 
         // Passing array(null) is required to make Mockery call the constructor...
         $form = Mockery::mock('Icinga\Forms\Config\UserBackend\LdapBackendForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
-            ->andReturnUsing(function ($s) { return $s; });
+            ->andReturnUsing(function ($s) {
+                return $s;
+            });
         $form->setTokenDisabled();
         $form->setResources(array('test_ldap_backend'));
         $form->populate(array('resource' => 'test_ldap_backend'));
@@ -52,7 +56,9 @@ class LdapBackendFormTest extends BaseTestCase
      */
     public function testInvalidBackendIsNotValid()
     {
-        $ldapUserBackendMock = Mockery::mock('overload:Icinga\Authentication\User\LdapUserBackend');
+        $ldapUserBackendMock = Mockery::mock('overload:Icinga\Authentication\User\LdapUserBackend')
+            ->shouldReceive('inspect')
+            ->andReturn(self::createInspector(true))->getMock();
         $ldapUserBackendMock->shouldReceive('assertAuthenticationPossible')->andThrow(new AuthenticationException);
         $this->setUpUserBackendMock($ldapUserBackendMock);
 
@@ -60,7 +66,9 @@ class LdapBackendFormTest extends BaseTestCase
         $form = Mockery::mock('Icinga\Forms\Config\UserBackend\LdapBackendForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
-            ->andReturnUsing(function ($s) { return $s; });
+            ->andReturnUsing(function ($s) {
+                return $s;
+            });
         $form->setTokenDisabled();
         $form->setResources(array('test_ldap_backend'));
         $form->populate(array('resource' => 'test_ldap_backend'));
@@ -77,4 +85,21 @@ class LdapBackendFormTest extends BaseTestCase
             ->shouldReceive('create')
             ->andReturn($ldapUserBackendMock);
     }
+
+    public static function createInspector($error = false, $log = array('log'))
+    {
+        if (! $error) {
+            $calls = array(
+                'hasError' => false,
+                'toArray' => $log
+            );
+        } else {
+            $calls = array(
+                'hasError' => true,
+                'getError' => 'Error',
+                'toArray' => $log
+            );
+        }
+        return Mockery::mock('Icinga\Data\Inspection', $calls);
+    }
 }

From ffe672c252fbd9f6e7cb0dd9f59a85371768655d Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 16 Jul 2015 13:38:35 +0200
Subject: [PATCH 2531/2920] Improve message texts and scalabillity

Always start uppercase and don't use count() function until we've got a more scalable implementation in the LdapConnection.

refs #9630
---
 .../Authentication/User/LdapUserBackend.php      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index e8ae9a579..4a83a1c94 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -376,19 +376,18 @@ class LdapUserBackend extends LdapRepository implements UserBackendInterface, In
             try {
                 $res = $this->select()->fetchRow();
             } catch (LdapException $e) {
-                throw new AuthenticationException('Connection not possible.', $e);
+                throw new AuthenticationException('Connection not possible', $e);
             }
-            $result->write('Connection possible.');
-            $msg = sprintf(
-                'objects with objectClass "%s" in DN "%s" (Filter: %s)',
+            $result->write('Searching for: ' . sprintf(
+                'objectClass "%s" in DN "%s" (Filter: %s)',
                 $this->userClass,
                 $this->baseDn ?: $this->ds->getDn(),
                 $this->filter ?: 'None'
-            );
+            ));
             if ($res === false) {
-                throw new AuthenticationException('No ' . $msg . 'found');
+                throw new AuthenticationException('Error, no users found in backend');
             }
-            $result->write($msg . ' exist');
+            $result->write('Users found in backend');
             if (! isset($res->user_name)) {
                 throw new AuthenticationException(
                     'UserNameAttribute "%s" not existing in objectClass "%s"',
@@ -397,7 +396,8 @@ class LdapUserBackend extends LdapRepository implements UserBackendInterface, In
                 );
             }
 
-            $result->write('User count: ' . $this->select()->count());
+            // (mj) don't do this until we have a more scalable count() implementation
+            // $result->write('User count: ' . $this->select()->count());
         } catch (AuthenticationException $e) {
             if (($previous = $e->getPrevious()) !== null) {
                 $result->error($previous->getMessage());

From c55ba6dff4541255504adc787ac1b99f0134fed3 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 16 Jul 2015 13:51:35 +0200
Subject: [PATCH 2532/2920] fix coding guideline violations

---
 library/Icinga/Protocol/Ldap/LdapConnection.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index 2e97b8c9b..38440e029 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -703,8 +703,7 @@ class LdapConnection implements Selectable, Inspectable
                     array_flip($fields)
                 );
             }
-        } while (
-            (! $serverSorting || $limit === 0 || $limit !== count($entries))
+        } while ((! $serverSorting || $limit === 0 || $limit !== count($entries))
             && ($entry = ldap_next_entry($ds, $entry))
         );
 

From f4054d575bc3f1f2ad596218408e0e19d559246c Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 16 Jul 2015 15:29:45 +0200
Subject: [PATCH 2533/2920] Add Inspection API to db connection

refs #9641
---
 .../forms/Config/Resource/DbResourceForm.php  | 15 +++----
 library/Icinga/Data/Db/DbConnection.php       | 43 ++++++++++++++++++-
 2 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
index 0ee64eda3..75d935361 100644
--- a/application/forms/Config/Resource/DbResourceForm.php
+++ b/application/forms/Config/Resource/DbResourceForm.php
@@ -129,16 +129,13 @@ class DbResourceForm extends Form
      */
     public static function isValidResource(Form $form)
     {
-        try {
-            $resource = ResourceFactory::createResource(new ConfigObject($form->getValues()));
-            $resource->getConnection()->getConnection();
-        } catch (Exception $e) {
-            $form->addError(
-                $form->translate('Connectivity validation failed, connection to the given resource not possible.')
-            );
-            return false;
+        $result = ResourceFactory::createResource(new ConfigObject($form->getValues()))->inspect();
+        if ($result->hasError()) {
+            $form->addError(sprintf($form->translate('Connectivity validation failed: %s'), $result->getError()));
         }
 
-        return true;
+        // TODO: display diagnostics in $result->toArray() to the user
+
+        return ! $result->hasError();
     }
 }
diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php
index 95f3e9235..ba7a3c6f0 100644
--- a/library/Icinga/Data/Db/DbConnection.php
+++ b/library/Icinga/Data/Db/DbConnection.php
@@ -3,6 +3,9 @@
 
 namespace Icinga\Data\Db;
 
+use Exception;
+use Icinga\Data\Inspectable;
+use Icinga\Data\Inspection;
 use PDO;
 use Iterator;
 use Zend_Db;
@@ -23,7 +26,7 @@ use Icinga\Exception\ProgrammingError;
 /**
  * Encapsulate database connections and query creation
  */
-class DbConnection implements Selectable, Extensible, Updatable, Reducible
+class DbConnection implements Selectable, Extensible, Updatable, Reducible, Inspectable
 {
     /**
      * Connection config
@@ -435,4 +438,42 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible
             return $column . ' ' . $sign . ' ' . $this->dbAdapter->quote($value);
         }
     }
+
+    public function inspect()
+    {
+        $insp = new Inspection('Db Connection');
+        try {
+            $this->getDbAdapter()->getConnection();
+            $config = $this->dbAdapter->getConfig();
+            $insp->write(sprintf(
+                'Connection to %s as %s on %s:%s successful',
+                $config['dbname'],
+                $config['username'],
+                $config['host'],
+                $config['port']
+            ));
+            switch ($this->dbType) {
+                case 'mysql':
+                    $rows = $this->dbAdapter->query(
+                        'SHOW VARIABLES WHERE variable_name ' .
+                        'IN (\'version\', \'protocol_version\', \'version_compile_os\');'
+                    )->fetchAll();
+                    $sqlinsp = new Inspection('MySQL');
+                    foreach ($rows as $row) {
+                        $sqlinsp->write($row->variable_name . ': ' . $row->value);
+                    }
+                    $insp->write($sqlinsp);
+                    break;
+                case 'pgsql':
+                    $row = $this->dbAdapter->query('SELECT version();')->fetchAll();
+                    $sqlinsp = new Inspection('PostgreSQL');
+                    $sqlinsp->write($row[0]->version);
+                    $insp->write($sqlinsp);
+                    break;
+            }
+        } catch (Exception $e) {
+            return $insp->error(sprintf('Connection failed %s', $e->getMessage()));
+        }
+        return $insp;
+    }
 }

From 31618ce2cf815bd3f5ddb916881b28b4255991c1 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 16 Jul 2015 16:15:27 +0200
Subject: [PATCH 2534/2920] Fix unit DB Form unit tests broken by inspection

refs #9641
---
 .../Config/Resource/DbResourceFormTest.php    | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/test/php/application/forms/Config/Resource/DbResourceFormTest.php b/test/php/application/forms/Config/Resource/DbResourceFormTest.php
index 3cf23a70a..6aa51dbff 100644
--- a/test/php/application/forms/Config/Resource/DbResourceFormTest.php
+++ b/test/php/application/forms/Config/Resource/DbResourceFormTest.php
@@ -26,7 +26,7 @@ class DbResourceFormTest extends BaseTestCase
     public function testValidDbResourceIsValid()
     {
         $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('getConnection')->atMost()->twice()->andReturn(Mockery::self())->getMock()
+            Mockery::mock()->shouldReceive('inspect')->andReturn(self::createInspector(false))->getMock()
         );
 
         $this->assertTrue(
@@ -42,7 +42,7 @@ class DbResourceFormTest extends BaseTestCase
     public function testInvalidDbResourceIsNotValid()
     {
         $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('getConnection')->once()->andThrow('\Exception')->getMock()
+            Mockery::mock()->shouldReceive('inspect')->andReturn(self::createInspector(true))->getMock()
         );
 
         $this->assertFalse(
@@ -58,4 +58,21 @@ class DbResourceFormTest extends BaseTestCase
             ->with(Mockery::type('Icinga\Data\ConfigObject'))
             ->andReturn($resourceMock);
     }
+
+    public static function createInspector($error = false, $log = array('log'))
+    {
+        if (! $error) {
+            $calls = array(
+                'hasError' => false,
+                'toArray' => $log
+            );
+        } else {
+            $calls = array(
+                'hasError' => true,
+                'getError' => 'Error',
+                'toArray' => $log
+            );
+        }
+        return Mockery::mock('Icinga\Data\Inspection', $calls);
+    }
 }

From e357960d1ed74bb29227377c2804a6024f3d78bf Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 16 Jul 2015 16:16:55 +0200
Subject: [PATCH 2535/2920] Add Inspection API to DB backend

refs #9641
---
 .../Config/UserBackend/DbBackendForm.php      | 17 +++++-------
 .../Authentication/User/DbUserBackend.php     | 26 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/application/forms/Config/UserBackend/DbBackendForm.php b/application/forms/Config/UserBackend/DbBackendForm.php
index f096f3e35..c09ec166c 100644
--- a/application/forms/Config/UserBackend/DbBackendForm.php
+++ b/application/forms/Config/UserBackend/DbBackendForm.php
@@ -105,18 +105,15 @@ class DbBackendForm extends Form
      */
     public static function isValidUserBackend(Form $form)
     {
-        try {
-            $dbUserBackend = new DbUserBackend(ResourceFactory::createResource($form->getResourceConfig()));
-            if ($dbUserBackend->select()->where('is_active', true)->count() < 1) {
-                $form->addError($form->translate('No active users found under the specified database backend'));
-                return false;
-            }
-        } catch (Exception $e) {
-            $form->addError(sprintf($form->translate('Using the specified backend failed: %s'), $e->getMessage()));
-            return false;
+        $backend = new DbUserBackend(ResourceFactory::createResource($form->getResourceConfig()));
+        $result = $backend->inspect();
+        if ($result->hasError()) {
+            $form->addError(sprintf($form->translate('Using the specified backend failed: %s'), $result->getError()));
         }
 
-        return true;
+        // TODO: display diagnostics in $result->toArray() to the user
+
+        return ! $result->hasError();
     }
 
     /**
diff --git a/library/Icinga/Authentication/User/DbUserBackend.php b/library/Icinga/Authentication/User/DbUserBackend.php
index 0e5dad5fa..3c28a2fdd 100644
--- a/library/Icinga/Authentication/User/DbUserBackend.php
+++ b/library/Icinga/Authentication/User/DbUserBackend.php
@@ -4,13 +4,15 @@
 namespace Icinga\Authentication\User;
 
 use Exception;
+use Icinga\Data\Inspectable;
+use Icinga\Data\Inspection;
 use PDO;
 use Icinga\Data\Filter\Filter;
 use Icinga\Exception\AuthenticationException;
 use Icinga\Repository\DbRepository;
 use Icinga\User;
 
-class DbUserBackend extends DbRepository implements UserBackendInterface
+class DbUserBackend extends DbRepository implements UserBackendInterface, Inspectable
 {
     /**
      * The algorithm to use when hashing passwords
@@ -246,4 +248,26 @@ class DbUserBackend extends DbRepository implements UserBackendInterface
     {
         return crypt($password, self::HASH_ALGORITHM . ($salt !== null ? $salt : $this->generateSalt()));
     }
+
+    /**
+     * Inspect this object to gain extended information about its health
+     *
+     * @return Inspection           The inspection result
+     */
+    public function inspect()
+    {
+        $insp = new Inspection('Db User Backend');
+        $insp->write($this->ds->inspect());
+        try {
+            $users = $this->select()->where('is_active', true)->count();
+            if ($users > 1) {
+                $insp->write(sprintf('%s active users', $users));
+            } else {
+                return $insp->error('0 active users', $users);
+            }
+        } catch (Exception $e) {
+            $insp->error(sprintf('Query failed: %s', $e->getMessage()));
+        }
+        return $insp;
+    }
 }

From 6d209ee20316015490b91a84ab60435ba2ca541d Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 16 Jul 2015 16:22:13 +0200
Subject: [PATCH 2536/2920] Fix unit DB Form unit tests broken by inspection

refs #9641
---
 .../Config/UserBackend/DbBackendFormTest.php  | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/test/php/application/forms/Config/UserBackend/DbBackendFormTest.php b/test/php/application/forms/Config/UserBackend/DbBackendFormTest.php
index d58ff8a33..f1fe7b84d 100644
--- a/test/php/application/forms/Config/UserBackend/DbBackendFormTest.php
+++ b/test/php/application/forms/Config/UserBackend/DbBackendFormTest.php
@@ -28,8 +28,8 @@ class DbBackendFormTest extends BaseTestCase
     {
         $this->setUpResourceFactoryMock();
         Mockery::mock('overload:Icinga\Authentication\User\DbUserBackend')
-            ->shouldReceive('select->where->count')
-            ->andReturn(2);
+            ->shouldReceive('inspect')
+            ->andReturn(self::createInspector(false));
 
         // Passing array(null) is required to make Mockery call the constructor...
         $form = Mockery::mock('Icinga\Forms\Config\UserBackend\DbBackendForm[getView]', array(null));
@@ -54,8 +54,8 @@ class DbBackendFormTest extends BaseTestCase
     {
         $this->setUpResourceFactoryMock();
         Mockery::mock('overload:Icinga\Authentication\User\DbUserBackend')
-            ->shouldReceive('count')
-            ->andReturn(0);
+            ->shouldReceive('inspect')
+            ->andReturn(self::createInspector(true));
 
         // Passing array(null) is required to make Mockery call the constructor...
         $form = Mockery::mock('Icinga\Forms\Config\UserBackend\DbBackendForm[getView]', array(null));
@@ -80,4 +80,21 @@ class DbBackendFormTest extends BaseTestCase
             ->shouldReceive('getResourceConfig')
             ->andReturn(new ConfigObject());
     }
+
+    public static function createInspector($error = false, $log = array('log'))
+    {
+        if (! $error) {
+            $calls = array(
+                'hasError' => false,
+                'toArray' => $log
+            );
+        } else {
+            $calls = array(
+                'hasError' => true,
+                'getError' => 'Error',
+                'toArray' => $log
+            );
+        }
+        return Mockery::mock('Icinga\Data\Inspection', $calls);
+    }
 }

From 9ba4189617fa8bcfa2c38fbd6c20e628ab7c66d4 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 16 Jul 2015 16:27:28 +0200
Subject: [PATCH 2537/2920] fix coding guideline violations

---
 .../forms/Config/UserBackend/DbBackendFormTest.php        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/php/application/forms/Config/UserBackend/DbBackendFormTest.php b/test/php/application/forms/Config/UserBackend/DbBackendFormTest.php
index f1fe7b84d..cc6919c93 100644
--- a/test/php/application/forms/Config/UserBackend/DbBackendFormTest.php
+++ b/test/php/application/forms/Config/UserBackend/DbBackendFormTest.php
@@ -35,7 +35,9 @@ class DbBackendFormTest extends BaseTestCase
         $form = Mockery::mock('Icinga\Forms\Config\UserBackend\DbBackendForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
-            ->andReturnUsing(function ($s) { return $s; });
+            ->andReturnUsing(function ($s) {
+                return $s;
+            });
         $form->setTokenDisabled();
         $form->setResources(array('test_db_backend'));
         $form->populate(array('resource' => 'test_db_backend'));
@@ -61,7 +63,9 @@ class DbBackendFormTest extends BaseTestCase
         $form = Mockery::mock('Icinga\Forms\Config\UserBackend\DbBackendForm[getView]', array(null));
         $form->shouldReceive('getView->escape')
             ->with(Mockery::type('string'))
-            ->andReturnUsing(function ($s) { return $s; });
+            ->andReturnUsing(function ($s) {
+                return $s;
+            });
         $form->setTokenDisabled();
         $form->setResources(array('test_db_backend'));
         $form->populate(array('resource' => 'test_db_backend'));

From 547802785501ed0e68b63f272460ad6014d7e28a Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 16 Jul 2015 16:52:56 +0200
Subject: [PATCH 2538/2920] Bring back user count in ldap backend inspection

We already use count later in the wizard anyways.

refs #9630
---
 library/Icinga/Authentication/User/LdapUserBackend.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index 4a83a1c94..df2c0a8e0 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -387,7 +387,7 @@ class LdapUserBackend extends LdapRepository implements UserBackendInterface, In
             if ($res === false) {
                 throw new AuthenticationException('Error, no users found in backend');
             }
-            $result->write('Users found in backend');
+            $result->write(sprintf('%d users found in backend', $this->select()->count()));
             if (! isset($res->user_name)) {
                 throw new AuthenticationException(
                     'UserNameAttribute "%s" not existing in objectClass "%s"',
@@ -395,9 +395,6 @@ class LdapUserBackend extends LdapRepository implements UserBackendInterface, In
                     $this->userClass
                 );
             }
-
-            // (mj) don't do this until we have a more scalable count() implementation
-            // $result->write('User count: ' . $this->select()->count());
         } catch (AuthenticationException $e) {
             if (($previous = $e->getPrevious()) !== null) {
                 $result->error($previous->getMessage());

From 95bcb95cb5fad5b7973bb44e1e5b8250fd907693 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Jul 2015 10:13:48 +0200
Subject: [PATCH 2539/2920] events.js: Prevent default form submission as late
 as possible

---
 public/js/icinga/events.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 54ea46725..51f9846f9 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -239,9 +239,6 @@
                 $button = $('input[type=submit]', $form).add('button[type=submit]', $form).first();
             }
 
-            event.stopPropagation();
-            event.preventDefault();
-
             if ($button.length) {
                 // Activate spinner
                 if ($button.hasClass('spinner')) {
@@ -297,6 +294,8 @@
 
             icinga.loader.loadUrl(url, $target, data, method);
 
+            event.stopPropagation();
+            event.preventDefault();
             return false;
         },
 

From be88683c19d2cce1df0b810fc821dfbc873ce228 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Jul 2015 10:14:55 +0200
Subject: [PATCH 2540/2920] layout.phtml: Add hidden iframe for non-xhr file
 uploads

refs #8758
---
 application/layouts/scripts/layout.phtml | 1 +
 public/css/icinga/layout-structure.less  | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml
index cbfce7714..1d766b505 100644
--- a/application/layouts/scripts/layout.phtml
+++ b/application/layouts/scripts/layout.phtml
@@ -54,6 +54,7 @@ $iframeClass = $isIframe ? ' iframe' : '';
 <div id="layout" class="default-layout<?php if ($showFullscreen): ?> fullscreen-layout<?php endif ?>">
 <?= $this->render('body.phtml') ?>
 </div>
+<iframe id="fileupload-frame-target" name="fileupload-frame-target"></iframe>
 <!--[if IE 8]>
 <script type="text/javascript" src="<?= $this->href($ie8jsfile) ?>"></script>
 <![endif]-->
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 2b4228b5f..3f9d4858e 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -47,6 +47,10 @@ html {
   }
 }
 
+#fileupload-frame-target {
+  display: none;
+}
+
 #responsive-debug {
   font-size: 0.9em;
   font-family: Courier new, monospace;

From 37b87eb284c08530457d93c611eba582fd4fa82a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 20 Jul 2015 10:52:28 +0200
Subject: [PATCH 2541/2920] js: Add fallback in case XHR file uploads are not
 possible

refs #8758
---
 public/js/icinga/events.js | 11 +++++++++++
 public/js/icinga/loader.js | 29 +++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 51f9846f9..a1048095b 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -269,6 +269,17 @@
                 url = icinga.utils.addUrlParams(url, dataObj);
             } else {
                 if (encoding === 'multipart/form-data') {
+                    if (typeof window.FormData === 'undefined') {
+                        icinga.loader.submitFormToIframe($form, url, $target);
+
+                        // Disable all form controls to prevent resubmission as early as possible.
+                        // (This relies on native form submission, so using setTimeout is the only possible solution)
+                        setTimeout(function () {
+                            $form.find(':input:not(:disabled)').prop('disabled', true);
+                        }, 0);
+                        return true;
+                    }
+
                     data = new window.FormData($form[0]);
                 } else {
                     data = $form.serializeArray();
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 5677eb629..3a3e1a4bf 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -140,6 +140,35 @@
             return req;
         },
 
+        /**
+         * Mimic XHR form submission by using an iframe
+         *
+         * @param {object} $form    The form being submitted
+         * @param {string} action   The form's action URL
+         * @param {object} $target  The target container
+         */
+        submitFormToIframe: function ($form, action, $target) {
+            var self = this;
+
+            $form.prop('action', self.icinga.utils.addUrlParams(action, {
+                '_disableLayout': true
+            }));
+            $form.prop('target', 'fileupload-frame-target');
+            $('#fileupload-frame-target').on('load', function (event) {
+                var $frame = $(event.target);
+
+                // Fetch the frame's new content, paste it into the target..
+                self.renderContentToContainer(
+                    $frame.contents().find('body').html(),
+                    $target,
+                    'replace'
+                );
+                $frame.prop('src', 'about:blank'); // ..and clear the frame's dom
+
+                $frame.off('load'); // Unbind the event as it's set on demand
+            });
+        },
+
         /**
          * Create an URL relative to the Icinga base Url, still unused
          *

From 33aa78d8b787a983f64e6d53112d7509faa3785f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 20 Jul 2015 16:40:24 +0200
Subject: [PATCH 2542/2920] Puppet: Support Apache 2.4

refs #9453
---
 .../templates/icingaweb.conf.erb              | 45 ++++++++++++-------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/.puppet/profiles/icingaweb2_dev/templates/icingaweb.conf.erb b/.puppet/profiles/icingaweb2_dev/templates/icingaweb.conf.erb
index d19dbe9ee..c8b23e97a 100644
--- a/.puppet/profiles/icingaweb2_dev/templates/icingaweb.conf.erb
+++ b/.puppet/profiles/icingaweb2_dev/templates/icingaweb.conf.erb
@@ -1,23 +1,38 @@
-Alias /<%= @web_path %> /vagrant/public
+Alias /<%= @web_path %> "/vagrant/public"
 
-<Directory "/vagrant/public/">
-    Options FollowSymLinks
+<Directory "/vagrant/public">
+    Options SymLinksIfOwnerMatch
     AllowOverride None
-    Order allow,deny
-    Allow from all
 
-    # SetEnv ICINGAWEB_CONFIGDIR <%= @config %>
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        <RequireAll>
+            Require all granted
+        </RequireAll>
+    </IfModule>
+
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order allow,deny
+        Allow from all
+    </IfModule>
+
+    SetEnv ICINGAWEB_CONFIGDIR <%= @config %>
 
     EnableSendfile Off
 
-    RewriteEngine on
-    RewriteBase /<%= @web_path %>/
-    RewriteCond %{REQUEST_FILENAME} -s [OR]
-    RewriteCond %{REQUEST_FILENAME} -l [OR]
-    RewriteCond %{REQUEST_FILENAME} -d
-    RewriteRule ^.*$ - [NC,L]
-    RewriteRule ^.*$ index.php [NC,L]
+    <IfModule mod_rewrite.c>
+        RewriteEngine on
+        RewriteBase /<%= @web_path %>/
+        RewriteCond %{REQUEST_FILENAME} -s [OR]
+        RewriteCond %{REQUEST_FILENAME} -l [OR]
+        RewriteCond %{REQUEST_FILENAME} -d
+        RewriteRule ^.*$ - [NC,L]
+        RewriteRule ^.*$ index.php [NC,L]
+    </IfModule>
 
-    php_value xdebug.idekey PHPSTORM
+    <IfModule !mod_rewrite.c>
+        DirectoryIndex error_norewrite.html
+        ErrorDocument 404 /error_norewrite.html
+    </IfModule>
 </Directory>
-

From b74b10a6d01cd499dc8db2a909f6952996c9e1ce Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 20 Jul 2015 16:44:48 +0200
Subject: [PATCH 2543/2920] Puppet: Disable api feature of Icinga 2

refs #9453
---
 .puppet/modules/icinga2/manifests/init.pp      | 4 ++++
 .puppet/profiles/icinga2_dev/manifests/init.pp | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.puppet/modules/icinga2/manifests/init.pp b/.puppet/modules/icinga2/manifests/init.pp
index 0545ba7c5..26c7300a5 100644
--- a/.puppet/modules/icinga2/manifests/init.pp
+++ b/.puppet/modules/icinga2/manifests/init.pp
@@ -39,4 +39,8 @@ class icinga2 {
   }
 
   icinga2::feature { [ 'statusdata', 'command', 'compatlog' ]: }
+
+  icinga2::feature { 'api':
+    ensure => absent,
+  }
 }
diff --git a/.puppet/profiles/icinga2_dev/manifests/init.pp b/.puppet/profiles/icinga2_dev/manifests/init.pp
index a6ee98683..7082fe935 100644
--- a/.puppet/profiles/icinga2_dev/manifests/init.pp
+++ b/.puppet/profiles/icinga2_dev/manifests/init.pp
@@ -1,6 +1,6 @@
 # Class: icinga2_dev
 #
-#   This class installs Icinga 2 w/ MySQL and provides Icinga 2 test configuration.
+#   This class installs Icinga 2 w/ MySQL and PostgreSQL and provides Icinga 2 test configuration.
 #
 # Requires:
 #
@@ -19,7 +19,8 @@ class icinga2_dev {
   include monitoring_test_config
 
   icinga2::config { [
-    'conf.d/test-config', 'conf.d/commands', 'constants' ]:
+    'conf.d/test-config', 'conf.d/commands', 'constants',
+  ]:
     source => 'puppet:///modules/icinga2_dev',
   }
 

From 7f8c589cdbfada93a5d7784520eb0b7ac26c810c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 20 Jul 2015 16:45:21 +0200
Subject: [PATCH 2544/2920] Puppet: Fix epel to use the major release version
 of the OS

refs #9453
---
 .puppet/modules/epel/manifests/init.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.puppet/modules/epel/manifests/init.pp b/.puppet/modules/epel/manifests/init.pp
index 9ec1ba692..2792ff918 100644
--- a/.puppet/modules/epel/manifests/init.pp
+++ b/.puppet/modules/epel/manifests/init.pp
@@ -15,10 +15,10 @@
 class epel {
 
   yumrepo { 'epel':
-    mirrorlist => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=${::architecture}",
+    mirrorlist => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-${::operatingsystemmajrelease}&arch=${::architecture}",
     enabled    => '1',
     gpgcheck   => '0',
-    descr      => "Extra Packages for Enterprise Linux 6 - ${::architecture}"
+    descr      => "Extra Packages for Enterprise Linux ${::operatingsystemmajrelease} - ${::architecture}"
   }
 }
 

From 2ac27e33253e118146357c1cfa4c60ff0a31ecad Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 20 Jul 2015 16:46:25 +0200
Subject: [PATCH 2545/2920] Puppet: Fix icinga_packages to use the major
 release version of the OS

refs #9453
---
 .puppet/modules/icinga_packages/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.puppet/modules/icinga_packages/manifests/init.pp b/.puppet/modules/icinga_packages/manifests/init.pp
index 7e3e8d188..b6e46960a 100644
--- a/.puppet/modules/icinga_packages/manifests/init.pp
+++ b/.puppet/modules/icinga_packages/manifests/init.pp
@@ -8,7 +8,7 @@
 #
 class icinga_packages {
   yumrepo { 'icinga_packages':
-    baseurl   => 'http://packages.icinga.org/epel/6/snapshot/',
+    baseurl   => "http://packages.icinga.org/epel/${::operatingsystemmajrelease}/snapshot/",
     enabled   => '1',
     gpgcheck  => '1',
     gpgkey    => 'http://packages.icinga.org/icinga.key',

From af4dbadd3681419e8313509921ce8e5601ea45a0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 20 Jul 2015 16:47:29 +0200
Subject: [PATCH 2546/2920] Puppet: Use mariadb on RHEL/CentOS >= 7

refs #9453
---
 .puppet/modules/mysql/manifests/init.pp    | 34 +++++++++++++++++-----
 .puppet/modules/mysql/templates/my.cnf.erb |  4 +--
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/.puppet/modules/mysql/manifests/init.pp b/.puppet/modules/mysql/manifests/init.pp
index a235a540c..612211755 100644
--- a/.puppet/modules/mysql/manifests/init.pp
+++ b/.puppet/modules/mysql/manifests/init.pp
@@ -1,6 +1,6 @@
 # Class: mysql
 #
-#   This class installs the mysql server and client software.
+#   This class installs the MySQL server and client software on a RHEL or CentOS
 #
 # Parameters:
 #
@@ -16,21 +16,39 @@ class mysql {
 
   Exec { path => '/usr/bin' }
 
+  if versioncmp($::operatingsystemmajrelease, '7') >= 0 {
+    $client_package_name = 'mariadb'
+    $server_package_name = 'mariadb-server'
+    $server_service_name = 'mariadb'
+    $cnf                 = '/etc/my.cnf.d/server.cnf'
+    $log_error           = '/var/log/mariadb/mariadb.log'
+    $pid_file            = '/var/run/mariadb/mariadb.pid'
+  } else {
+    $client_package_name = 'mysql'
+    $server_package_name = 'mysql-server'
+    $server_service_name = 'mysqld'
+    $cnf                 = '/etc/my.cnf'
+    $log_error           = '/var/log/mysqld.log'
+    $pid_file            = '/var/run/mysqld/mysqld.pid'
+  }
+
   package { [
-    'mysql', 'mysql-server'
+    $client_package_name, $server_package_name,
   ]:
       ensure => latest,
   }
 
-  service { 'mysqld':
-    ensure  => running,
+  service { $server_service_name:
+    alias   => 'mysqld',
     enable  => true,
-    require => Package['mysql-server']
+    ensure  => running,
+    require => Package[$server_package_name],
   }
 
-  file { '/etc/my.cnf':
+  file { $cnf:
     content => template('mysql/my.cnf.erb'),
-    require => Package['mysql-server'],
-    notify  => Service['mysqld']
+    notify  => Service['mysqld'],
+    recurse => true,
+    require => Package[$server_package_name],
   }
 }
diff --git a/.puppet/modules/mysql/templates/my.cnf.erb b/.puppet/modules/mysql/templates/my.cnf.erb
index d26583ee3..7f819af73 100644
--- a/.puppet/modules/mysql/templates/my.cnf.erb
+++ b/.puppet/modules/mysql/templates/my.cnf.erb
@@ -104,8 +104,8 @@ innodb_file_per_table
 innodb_log_file_size = 64M
 
 [mysqld_safe]
-log-error=/var/log/mysqld.log
-pid-file=/var/run/mysqld/mysqld.pid
+log-error=<%= @log_error %>
+pid-file=<%= @pid_file %>
 
 # Increase the amount of open files allowed per process. Warning: Make
 # sure you have set the global system limit high enough! The high value

From a9bb42029c1c84262ab432b09a94639e0b72f88d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 20 Jul 2015 16:48:02 +0200
Subject: [PATCH 2547/2920] Puppet: Don't fail on createlang for PostgreSQL
 databases

refs #9453
---
 .puppet/modules/pgsql/manifests/database/create.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.puppet/modules/pgsql/manifests/database/create.pp b/.puppet/modules/pgsql/manifests/database/create.pp
index 97fcb163d..004b4c077 100644
--- a/.puppet/modules/pgsql/manifests/database/create.pp
+++ b/.puppet/modules/pgsql/manifests/database/create.pp
@@ -25,7 +25,7 @@ define pgsql::database::create ($username, $password) {
     unless  => "psql -tAc \"SELECT 1 FROM pg_roles WHERE rolname='${username}'\" | grep -q 1",
     command => "psql -c \"CREATE ROLE ${username} WITH LOGIN PASSWORD '${password}';\" && \
 createdb -O ${username} -E UTF8 -T template0 ${name} && \
-createlang plpgsql ${name}",
+(createlang plpgsql ${name} || true)",
     user    => 'postgres',
     require => Class['pgsql']
   }

From cd4caf769b57933521f5fff72cf1e154ff67a110 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 20 Jul 2015 16:48:40 +0200
Subject: [PATCH 2548/2920] Puppet: Fix indent in puppet.sh

refs #9453
---
 .puppet/manifests/puppet.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.puppet/manifests/puppet.sh b/.puppet/manifests/puppet.sh
index 225ce7398..01463be51 100644
--- a/.puppet/manifests/puppet.sh
+++ b/.puppet/manifests/puppet.sh
@@ -3,7 +3,7 @@
 set -e
 
 if which puppet >/dev/null 2>&1; then
-  exit 0
+    exit 0
 fi
 
 RELEASEVER=$(rpm -q --qf "%{VERSION}" $(rpm -q --whatprovides redhat-release))
@@ -20,7 +20,7 @@ esac
 
 echo "Adding puppet repository.."
 rpm --import "https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs"
-rpm -ivh $PUPPET >/dev/null
+rpm -Uvh $PUPPET >/dev/null
 
 echo "Installing puppet.."
 yum install -y puppet >/dev/null

From 9dc4dbf24bac008ff27b48194b2f8214bd8d2997 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 20 Jul 2015 16:49:17 +0200
Subject: [PATCH 2549/2920] Vagrant: Use CentOS 7 base boxes

refs #9453
---
 Vagrantfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 28ac3897d..198016789 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -22,13 +22,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision :shell, :path => ".puppet/manifests/puppet.sh"
 
   config.vm.provider :virtualbox do |v, override|
-    override.vm.box = "puppetlabs/centos-6.6-64-puppet"
+    override.vm.box = "puppetlabs/centos-7.0-64-puppet"
 
     v.customize ["modifyvm", :id, "--memory", "1024"]
   end
 
   config.vm.provider :parallels do |p, override|
-    override.vm.box = "parallels/centos-6.5"
+    override.vm.box = "parallels/centos-7.1"
 
     p.name = "Icinga Web 2 Development"
 

From 570dada0d802e339875c402c0fc677a7db697f71 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Jul 2015 14:15:12 +0200
Subject: [PATCH 2550/2920] js: Manually submit the form if it's being
 automatically submitted...

...in case we're submitting a multipart/form-data form using the iframe
fallback. The form wouldn't be submitted otherwise.

refs #8758
---
 public/js/icinga/events.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index a1048095b..000ecf103 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -192,7 +192,6 @@
          *
          */
         submitForm: function (event, autosubmit) {
-            //return false;
             var self   = event.data.self;
             var icinga = self.icinga;
             // .closest is not required unless subelements to trigger this
@@ -277,7 +276,21 @@
                         setTimeout(function () {
                             $form.find(':input:not(:disabled)').prop('disabled', true);
                         }, 0);
-                        return true;
+
+                        if (! typeof autosubmit === 'undefined' && autosubmit) {
+                            if ($button.length) {
+                                // We're autosubmitting the form so the button has not been clicked, however,
+                                // to be really safe, we're disabling the button explicitly, just in case..
+                                $button.prop('disabled', true);
+                            }
+
+                            $form[0].submit(); // This should actually not trigger the onSubmit event, let's hope that this is true for all browsers..
+                            event.stopPropagation();
+                            event.preventDefault();
+                            return false;
+                        } else {
+                            return true;
+                        }
                     }
 
                     data = new window.FormData($form[0]);

From 0a9a06674979dcabf186af32df2cc375711e84f7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Jul 2015 15:13:56 +0200
Subject: [PATCH 2551/2920] Form: Do not create a new instance of Url when
 returning the redirect url

We're shifting parameters and by creating a new instance we'll lose
such changes.

refs #8758
---
 library/Icinga/Web/Form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 188f8e09c..816ea0469 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -277,7 +277,7 @@ class Form extends Zend_Form
     public function getRedirectUrl()
     {
         if ($this->redirectUrl === null) {
-            $url = Url::fromRequest(array(), $this->getRequest());
+            $url = $this->getRequest()->getUrl();
             // Be sure to remove all form dependent params because we do not want to submit it again
             $this->redirectUrl = $url->without(array_keys($this->getElements()));
         }

From fc481e527bc021144205e9fea88397bdf5ce60bc Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Jul 2015 15:22:24 +0200
Subject: [PATCH 2552/2920] Form: Process request parameter _frameUpload

This parameter is being used to flag a request as form submission issued
by utilizing an iframe. Appending it to a form's action causes no redirection
to take place in case of successful submission and a reduced but still valid
layout to be printed in any way. Redirection must be handled by the client
regarding the meta tag "redirectUrl".

refs #8758
---
 application/layouts/scripts/wrapped.phtml | 10 ++++++++++
 library/Icinga/Web/Form.php               | 10 +++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 application/layouts/scripts/wrapped.phtml

diff --git a/application/layouts/scripts/wrapped.phtml b/application/layouts/scripts/wrapped.phtml
new file mode 100644
index 000000000..25a7cf2e4
--- /dev/null
+++ b/application/layouts/scripts/wrapped.phtml
@@ -0,0 +1,10 @@
+<html>
+  <head>
+  <?php if (isset($this->layout()->redirectUrl)): ?>
+    <meta name="redirectUrl" content="<?= $this->layout()->redirectUrl; ?>">
+  <?php endif ?>
+  </head>
+  <body>
+    <?= $this->render('inline.phtml'); ?>
+  </body>
+</html>
\ No newline at end of file
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 816ea0469..1e5487f7c 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -946,12 +946,20 @@ class Form extends Zend_Form
 
         $formData = $this->getRequestData();
         if ($this->getUidDisabled() || $this->wasSent($formData)) {
+            if (($frameUpload = (bool) $request->getUrl()->shift('_frameUpload', false))) {
+                $this->getView()->layout()->setLayout('wrapped');
+            }
+
             $this->populate($formData); // Necessary to get isSubmitted() to work
             if (! $this->getSubmitLabel() || $this->isSubmitted()) {
                 if ($this->isValid($formData)
                     && (($this->onSuccess !== null && false !== call_user_func($this->onSuccess, $this))
                         || ($this->onSuccess === null && false !== $this->onSuccess()))) {
-                    $this->getResponse()->redirectAndExit($this->getRedirectUrl());
+                    if (! $frameUpload) {
+                        $this->getResponse()->redirectAndExit($this->getRedirectUrl());
+                    }
+
+                    $this->getView()->layout()->redirectUrl = $this->getRedirectUrl();
                 }
             } elseif ($this->getValidatePartial()) {
                 // The form can't be processed but we may want to show validation errors though

From 4522cf5090ef7a514466637f8cae7dbb4c2f67b3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 21 Jul 2015 15:27:01 +0200
Subject: [PATCH 2553/2920] Add missing return to
 IdoQuery::getCustomvarColumnName()

Some filter combinations still seem to not work properly.

refs #9692
---
 .../Monitoring/Backend/Ido/Query/IdoQuery.php        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index c5e9e5333..3f3918a13 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -496,6 +496,7 @@ abstract class IdoQuery extends DbQuery
                 in_array($filter->getColumn(), $this->columnsWithoutCollation)
                 && strpos($filter->getColumn(), 'LOWER') !== 0
             ) {
+                $filter->setColumn('LOWER(' . $filter->getColumn() . ')');
                 $filter->setColumn('LOWER(' . $filter->getColumn() . ')');
                 $expression = $filter->getExpression();
                 if (is_array($expression)) {
@@ -855,7 +856,6 @@ abstract class IdoQuery extends DbQuery
     protected function customvarNameToTypeName($customvar)
     {
         $customvar = strtolower($customvar);
-        // TODO: Improve this:
         if (! preg_match('~^_(host|service)_([a-zA-Z0-9_]+)$~', $customvar, $m)) {
             throw new ProgrammingError(
                 'Got invalid custom var: "%s"',
@@ -870,11 +870,19 @@ abstract class IdoQuery extends DbQuery
         return array_key_exists($name, $this->joinedVirtualTables);
     }
 
+    /**
+     * Get the query column of a custom variable or null in case the custom variable has not been joined
+     *
+     * @param   string $customvar
+     *
+     * @return  null|string
+     */
     protected function getCustomvarColumnName($customvar)
     {
         if (isset($this->customVars[($customvar = strtolower($customvar))])) {
-            $this->customVars[strtolower($customvar)] . '.varvalue';
+            return $this->customVars[$customvar] . '.varvalue';
         }
+        return null;
     }
 
     public function aliasToColumnName($alias)

From 9471c3c574d12943524dc70f8b942d902f2d746e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Jul 2015 15:43:47 +0200
Subject: [PATCH 2554/2920] js: Make use of the _frameUpload parameter when
 submitting a form..

..to an iframe. This ensures that stuff like notifications are immediately
visible to the user after successful form submission.

refs #8758
---
 public/js/icinga/loader.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 3a3e1a4bf..0af0863e3 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -151,20 +151,26 @@
             var self = this;
 
             $form.prop('action', self.icinga.utils.addUrlParams(action, {
-                '_disableLayout': true
+                '_frameUpload': true
             }));
             $form.prop('target', 'fileupload-frame-target');
             $('#fileupload-frame-target').on('load', function (event) {
                 var $frame = $(event.target);
+                var $contents = $frame.contents();
 
-                // Fetch the frame's new content, paste it into the target..
-                self.renderContentToContainer(
-                    $frame.contents().find('body').html(),
-                    $target,
-                    'replace'
-                );
-                $frame.prop('src', 'about:blank'); // ..and clear the frame's dom
+                var $redirectMeta = $contents.find('meta[name="redirectUrl"]');
+                if ($redirectMeta.length) {
+                    self.loadUrl($redirectMeta.attr('content'), $target);
+                } else {
+                    // Fetch the frame's new content and paste it into the target
+                    self.renderContentToContainer(
+                        $contents.find('body').html(),
+                        $target,
+                        'replace'
+                    );
+                }
 
+                $frame.prop('src', 'about:blank'); // Clear the frame's dom
                 $frame.off('load'); // Unbind the event as it's set on demand
             });
         },

From 6c9819204dbdd9ccd138733ac88ca7ebce5b0886 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Jul 2015 16:33:24 +0200
Subject: [PATCH 2555/2920] Form: Only work with a single type when handling
 redirect urls

$form->setRedirectUrl('some/url') still works, but $form->getRedirectUrl()
will only return instances of Icinga\Web\Url now.
---
 library/Icinga/Web/Form.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 1e5487f7c..78ae1f587 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -84,7 +84,7 @@ class Form extends Zend_Form
     /**
      * The url to redirect to upon success
      *
-     * @var string|Url
+     * @var Url
      */
     protected $redirectUrl;
 
@@ -262,9 +262,17 @@ class Form extends Zend_Form
      * @param   string|Url  $url    The url to redirect to
      *
      * @return  $this
+     *
+     * @throws  ProgrammingError    In case $url is neither a string nor a instance of Icinga\Web\Url
      */
     public function setRedirectUrl($url)
     {
+        if (is_string($url)) {
+            $url = Url::fromPath($url, array(), $this->getRequest());
+        } elseif (! $url instanceof Url) {
+            throw new ProgrammingError('$url must be a string or instance of Icinga\Web\Url');
+        }
+
         $this->redirectUrl = $url;
         return $this;
     }
@@ -272,7 +280,7 @@ class Form extends Zend_Form
     /**
      * Return the url to redirect to upon success
      *
-     * @return  string|Url
+     * @return  Url
      */
     public function getRedirectUrl()
     {

From 7c89887773c649a7d916274d39ba7d1c2449a47f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Jul 2015 16:35:56 +0200
Subject: [PATCH 2556/2920] Form: Provide an absolute url as redirect url for
 successful frame uploads

refs #8758
---
 library/Icinga/Web/Form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 78ae1f587..4e587a148 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -967,7 +967,7 @@ class Form extends Zend_Form
                         $this->getResponse()->redirectAndExit($this->getRedirectUrl());
                     }
 
-                    $this->getView()->layout()->redirectUrl = $this->getRedirectUrl();
+                    $this->getView()->layout()->redirectUrl = $this->getRedirectUrl()->getAbsoluteUrl();
                 }
             } elseif ($this->getValidatePartial()) {
                 // The form can't be processed but we may want to show validation errors though

From 93fbb0231c9ab5027f323226e2c79d6ceb5ec817 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Jul 2015 16:37:21 +0200
Subject: [PATCH 2557/2920] loader.js: Split processRedirectHeader() to allow
 partly reuse

refs #8758
---
 public/js/icinga/loader.js | 46 +++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 0af0863e3..9d518d39d 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -326,16 +326,34 @@
                 }
             }
 
+            this.redirectToUrl(redirect, req.$target, req.getResponseHeader('X-Icinga-Rerender-Layout'));
+            return true;
+        },
+
+        /**
+         * Redirect to the given url
+         *
+         * @param {string}  url
+         * @param {object}  $target
+         * @param {boolean} rerenderLayout
+         */
+        redirectToUrl: function (url, $target, rerenderLayout) {
+            var icinga = this.icinga;
+
+            if (typeof rerenderLayout === 'undefined') {
+                rerenderLayout = false;
+            }
+
             icinga.logger.debug(
-                'Got redirect for ', req.$target, ', URL was ' + redirect
+                'Got redirect for ', $target, ', URL was ' + url
             );
 
-            if (req.getResponseHeader('X-Icinga-Rerender-Layout')) {
-                var parts = redirect.split(/#!/);
-                redirect = parts.shift();
-                var redirectionUrl = this.addUrlFlag(redirect, 'renderLayout');
+            if (rerenderLayout) {
+                var parts = url.split(/#!/);
+                url = parts.shift();
+                var redirectionUrl = this.addUrlFlag(url, 'renderLayout');
                 var r = this.loadUrl(redirectionUrl, $('#layout'));
-                r.url = redirect;
+                r.url = url;
                 if (parts.length) {
                     r.loadNext = parts;
                 } else if (!! document.location.hash) {
@@ -345,28 +363,24 @@
                         r.loadNext = parts;
                     }
                 }
-
             } else {
-
-                if (redirect.match(/#!/)) {
-                    var parts = redirect.split(/#!/);
+                if (url.match(/#!/)) {
+                    var parts = url.split(/#!/);
                     icinga.ui.layout2col();
                     this.loadUrl(parts.shift(), $('#col1'));
                     this.loadUrl(parts.shift(), $('#col2'));
                 } else {
-
-                    if (req.$target.attr('id') === 'col2') { // TODO: multicol
-                        if ($('#col1').data('icingaUrl').split('?')[0] === redirect.split('?')[0]) {
+                    if ($target.attr('id') === 'col2') { // TODO: multicol
+                        if ($('#col1').data('icingaUrl').split('?')[0] === url.split('?')[0]) {
                             icinga.ui.layout1col();
-                            req.$target = $('#col1');
+                            $target = $('#col1');
                             delete(this.requests['col2']);
                         }
                     }
 
-                    this.loadUrl(redirect, req.$target);
+                    this.loadUrl(url, $target);
                 }
             }
-            return true;
         },
 
         cacheLoadedIcons: function($container) {

From 5e1ea958b4f364c6ca8d7be49bb8383046b4679f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Jul 2015 16:38:52 +0200
Subject: [PATCH 2558/2920] js: Correctly process the redirectUrl-meta tag for
 successful frame uploads

refs #8758
---
 public/js/icinga/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 9d518d39d..232ecbc7e 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -160,7 +160,7 @@
 
                 var $redirectMeta = $contents.find('meta[name="redirectUrl"]');
                 if ($redirectMeta.length) {
-                    self.loadUrl($redirectMeta.attr('content'), $target);
+                    self.redirectToUrl($redirectMeta.attr('content'), $target);
                 } else {
                     // Fetch the frame's new content and paste it into the target
                     self.renderContentToContainer(

From 163911ffd7e5f93e240a4616a4fb0d0575281f45 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 21 Jul 2015 16:47:17 +0200
Subject: [PATCH 2559/2920] Indicate empty icinga_programstatus table as
 problem

fixes #9695
---
 .../BackendAvailabilityMenuItemRenderer.php   | 43 ++++++++++++-------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Web/Menu/BackendAvailabilityMenuItemRenderer.php b/modules/monitoring/library/Monitoring/Web/Menu/BackendAvailabilityMenuItemRenderer.php
index 186351a40..4359d5da5 100644
--- a/modules/monitoring/library/Monitoring/Web/Menu/BackendAvailabilityMenuItemRenderer.php
+++ b/modules/monitoring/library/Monitoring/Web/Menu/BackendAvailabilityMenuItemRenderer.php
@@ -3,41 +3,50 @@
 
 namespace Icinga\Module\Monitoring\Web\Menu;
 
-use Icinga\Web\Menu as Menu;
-use Icinga\Module\Monitoring\Backend\MonitoringBackend;
+use Icinga\Web\Menu;
 use Icinga\Web\Menu\MenuItemRenderer;
+use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 
 class BackendAvailabilityMenuItemRenderer extends MenuItemRenderer
 {
     /**
-     * Checks whether the monitoring backend is running or not
+     * Get whether or not the monitoring backend is currently running
      *
-     * @return mixed
+     * @return bool
      */
     protected function isCurrentlyRunning()
     {
-        return MonitoringBackend::instance()->select()->from(
-            'programstatus',
-            array(
-                'is_currently_running'
+        $programStatus = MonitoringBackend::instance()
+            ->select()
+            ->from(
+                'programstatus',
+                array('is_currently_running')
             )
-        )->getQuery()->fetchRow()->is_currently_running;
+            ->fetchRow();
+        return $programStatus !== false ? (bool) $programStatus : false;
     }
 
     /**
-     * @see MenuItemRenderer::render()
+     * {@inheritdoc}
      */
     public function render(Menu $menu)
     {
         return $this->getBadge() . $this->createLink($menu);
     }
 
+    /**
+     * Get the problem badge HTML
+     *
+     * @return string
+     */
     protected function getBadge()
     {
-        if (! (bool)$this->isCurrentlyRunning()) {
+        if (! $this->isCurrentlyRunning()) {
             return sprintf(
-                '<div title="%s" class="badge-container"><span class="badge badge-critical">%s</span></div>',
-                mt('monitoring', 'monitoring backend is not running'),
+                '<div title="%s" class="badge-container"><span class="badge badge-critical">%d</span></div>',
+                sprintf(
+                    mt('monitoring', 'Monitoring backend %s is not running'), MonitoringBackend::instance()->getName()
+                ),
                 1
             );
         }
@@ -51,10 +60,12 @@ class BackendAvailabilityMenuItemRenderer extends MenuItemRenderer
      */
     public function getSummary()
     {
-        if (! (bool)$this->isCurrentlyRunning()) {
+        if (! $this->isCurrentlyRunning()) {
             return array(
-                'problems' => 1,
-                'title' => mt('monitoring', 'monitoring backend is not running')
+                'problems'  => 1,
+                'title'     => sprintf(
+                    mt('monitoring', 'Monitoring backend %s is not running'), MonitoringBackend::instance()->getName()
+                )
             );
         }
         return null;

From 8f2849f32a1bd92330a74fb7b2c628d4b207478f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Jul 2015 16:48:56 +0200
Subject: [PATCH 2560/2920] Form: Improve code readability..

..and avoid the necessity to provide another mock when testing
Form::handleRequest().

refs #8758
---
 library/Icinga/Web/Form.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 4e587a148..f41672b28 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -965,9 +965,9 @@ class Form extends Zend_Form
                         || ($this->onSuccess === null && false !== $this->onSuccess()))) {
                     if (! $frameUpload) {
                         $this->getResponse()->redirectAndExit($this->getRedirectUrl());
+                    } else {
+                        $this->getView()->layout()->redirectUrl = $this->getRedirectUrl()->getAbsoluteUrl();
                     }
-
-                    $this->getView()->layout()->redirectUrl = $this->getRedirectUrl()->getAbsoluteUrl();
                 }
             } elseif ($this->getValidatePartial()) {
                 // The form can't be processed but we may want to show validation errors though

From b4214dcf328b8ccd66dc87516fd42135b2e16dc4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 21 Jul 2015 16:49:59 +0200
Subject: [PATCH 2561/2920] FormTest: getRedirectUrl now returns an instance of
 Icinga\Web\Url

---
 test/php/library/Icinga/Web/FormTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/php/library/Icinga/Web/FormTest.php b/test/php/library/Icinga/Web/FormTest.php
index 0fff50a3f..df17c4118 100644
--- a/test/php/library/Icinga/Web/FormTest.php
+++ b/test/php/library/Icinga/Web/FormTest.php
@@ -92,7 +92,8 @@ class FormTest extends BaseTestCase
 
     public function testWhetherAnExplicitlySetRedirectUrlIsUsedForRedirection()
     {
-        $this->getResponseMock()->shouldReceive('redirectAndExit')->atLeast()->once()->with('special/route');
+        $this->getResponseMock()->shouldReceive('redirectAndExit')->atLeast()->once()
+            ->with(Mockery::on(function ($url) { return $url->getRelativeUrl() === 'special/route'; }));
 
         $form = new SuccessfulForm();
         $form->setTokenDisabled();

From ce2b6862528df32516d68adac7baae81534a5bf0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 21 Jul 2015 16:54:23 +0200
Subject: [PATCH 2562/2920] Add file and line of logged menu item renderer
 exceptions

fixes #9696
---
 library/Icinga/Web/MenuRenderer.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/MenuRenderer.php b/library/Icinga/Web/MenuRenderer.php
index 4dec9404e..7b6ad9856 100644
--- a/library/Icinga/Web/MenuRenderer.php
+++ b/library/Icinga/Web/MenuRenderer.php
@@ -118,7 +118,13 @@ class MenuRenderer extends RecursiveIteratorIterator
             try {
                 return $child->getRenderer()->render($child);
             } catch (Exception $e) {
-                Logger::error('Could not invoke custom renderer. Exception: '. $e->getMessage());
+                Logger::error(
+                    'Could not invoke custom menu renderer. %s in %s:%d with message: %s',
+                    get_class($e),
+                    $e->getFile(),
+                    $e->getLine(),
+                    $e->getMessage()
+                );
             }
         }
 

From 45ef285e3ded3547898ed52e752c0344d4cf0bdb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 21 Jul 2015 17:32:17 +0200
Subject: [PATCH 2563/2920] RPM: Let php-Icinga require Zend and Zend's MySQL
 and PostgreSQL adapters

This installs both the MySQL and PostgreSQL libs even if the user only wants to use either MySQL or PostgreSQL. But the depencies installed--mysql-libs and postgresql-libs respectively--are so minimal that this is a good trade off for managing our dependencies atm.

fixes #9314
---
 icingaweb2.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index 7cddee0d3..e3513e979 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -46,8 +46,6 @@ Requires:                       %{name}-vendor-HTMLPurifier
 Requires:                       %{name}-vendor-JShrink
 Requires:                       %{name}-vendor-lessphp
 Requires:                       %{name}-vendor-Parsedown
-Requires:                       %{zend}
-Obsoletes:                      %{name}-vendor-zend
 
 
 %description
@@ -84,6 +82,10 @@ Requires:                   %{php}-gd %{php}-intl
 %{?fedora:Requires:         php-pecl-imagick}
 %{?rhel:Requires:           php-pecl-imagick}
 %{?suse_version:Requires:   %{php}-gettext %{php}-json %{php}-openssl %{php}-posix}
+Requires:                   %{zend}
+Obsoletes:                  %{name}-vendor-zend
+Requires:                   %{zend}-Db-Adapter-Pdo-Mysql
+Requires:                   %{zend}-Db-Adapter-Pdo-Pgsql
 
 %description -n php-Icinga
 Icinga Web 2 PHP library

From c0de2e6ee3d386c81ae073b7efe01c6fa926c58e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 22 Jul 2015 08:39:24 +0200
Subject: [PATCH 2564/2920] Form: Add missing use statement for the
 ProgrammingError exception

---
 library/Icinga/Web/Form.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index f41672b28..39cc5ecbb 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -3,13 +3,13 @@
 
 namespace Icinga\Web;
 
-use LogicException;
 use Zend_Config;
 use Zend_Form;
 use Zend_Form_Element;
 use Zend_View_Interface;
 use Icinga\Application\Icinga;
 use Icinga\Authentication\Manager;
+use Icinga\Exception\ProgrammingError;
 use Icinga\Security\SecurityException;
 use Icinga\Util\Translator;
 use Icinga\Web\Form\ErrorLabeller;
@@ -222,12 +222,12 @@ class Form extends Zend_Form
      *
      * @return  $this
      *
-     * @throws  LogicException          If the callback is not callable
+     * @throws  ProgrammingError        If the callback is not callable
      */
     public function setOnSuccess($onSuccess)
     {
         if (! is_callable($onSuccess)) {
-            throw new LogicException('The option `onSuccess\' is not callable');
+            throw new ProgrammingError('The option `onSuccess\' is not callable');
         }
         $this->onSuccess = $onSuccess;
         return $this;

From bf82bd4ce1827361a039cbebb272df81584044e5 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 22 Jul 2015 10:53:42 +0200
Subject: [PATCH 2565/2920] ModuleActionController: fix forward/X-Icinga-Module

---
 library/Icinga/Web/Controller/ModuleActionController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Controller/ModuleActionController.php b/library/Icinga/Web/Controller/ModuleActionController.php
index 9286ff679..071236cdd 100644
--- a/library/Icinga/Web/Controller/ModuleActionController.php
+++ b/library/Icinga/Web/Controller/ModuleActionController.php
@@ -73,6 +73,6 @@ class ModuleActionController extends ActionController
     public function postDispatchXhr()
     {
         parent::postDispatchXhr();
-        $this->getResponse()->setHeader('X-Icinga-Module', $this->moduleName);
+        $this->getResponse()->setHeader('X-Icinga-Module', $this->moduleName, true);
     }
 }

From d44547e46977ace54e6a0c471e961276555513c2 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 22 Jul 2015 10:57:14 +0200
Subject: [PATCH 2566/2920] forms.less: textarea should look like other inputs

---
 public/css/icinga/forms.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 38289877e..c6df47ca6 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -25,7 +25,7 @@ label {
   font-weight: bold;
 }
 
-input, select {
+input, select, textarea {
   box-sizing: border-box;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;

From c5d68995ecc396e8b6666f0bd30c4d267c11a5d7 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 22 Jul 2015 11:03:01 +0200
Subject: [PATCH 2567/2920] forms.less: top-align field lables and related...

...items like icons. They used to be bottom-aligned, resulting in
slightly confusing form layouts when text areas where involved.
---
 public/css/icinga/forms.less | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index c6df47ca6..cfb26f801 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -200,6 +200,14 @@ form label {
   width: 10em;
 }
 
+form div.element > * {
+  vertical-align: top;
+}
+
+form dt {
+  vertical-align: top;
+}
+
 select, input[type=text], textarea {
   width: 20em;
   display: inline-block;

From 3ed13366a80abab42934bffee961a8fddb059670 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 22 Jul 2015 09:05:18 +0200
Subject: [PATCH 2568/2920] Remove duplicate line in IdoQuery

I introduced this w/ 4522cf5090ef7a514466637f8cae7dbb4c2f67b3.
---
 .../monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index 3f3918a13..52485d9cb 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -496,7 +496,6 @@ abstract class IdoQuery extends DbQuery
                 in_array($filter->getColumn(), $this->columnsWithoutCollation)
                 && strpos($filter->getColumn(), 'LOWER') !== 0
             ) {
-                $filter->setColumn('LOWER(' . $filter->getColumn() . ')');
                 $filter->setColumn('LOWER(' . $filter->getColumn() . ')');
                 $expression = $filter->getExpression();
                 if (is_array($expression)) {

From 15cb24c6dc38090f2b3d84503bc795d10ce1821b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 22 Jul 2015 12:00:59 +0200
Subject: [PATCH 2569/2920] Throw an exception in
 IdoQuery::getCustomvarColumnName() in case the custom variable has not been
 joined

Queries extending IdoQuery and using the method getCustomvarColumnName() must be notified in case the custom variable has not been joined.

refs #9692
---
 library/Icinga/Exception/QueryException.php          |  2 +-
 .../Monitoring/Backend/Ido/Query/IdoQuery.php        | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/library/Icinga/Exception/QueryException.php b/library/Icinga/Exception/QueryException.php
index bfe98855a..abfd7402d 100644
--- a/library/Icinga/Exception/QueryException.php
+++ b/library/Icinga/Exception/QueryException.php
@@ -4,7 +4,7 @@
 namespace Icinga\Exception;
 
 /**
- * Exception thrown if a query contains invalid parameters
+ * Exception thrown if a query encountered an error
  */
 class QueryException extends IcingaException
 {
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index 52485d9cb..b79229f8f 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -12,6 +12,7 @@ use Icinga\Data\Filter\FilterExpression;
 use Icinga\Exception\IcingaException;
 use Icinga\Exception\NotImplementedError;
 use Icinga\Exception\ProgrammingError;
+use Icinga\Exception\QueryException;
 use Icinga\Web\Session;
 
 /**
@@ -870,18 +871,19 @@ abstract class IdoQuery extends DbQuery
     }
 
     /**
-     * Get the query column of a custom variable or null in case the custom variable has not been joined
+     * Get the query column of a already joined custom variable
      *
      * @param   string $customvar
      *
-     * @return  null|string
+     * @return  string
+     * @throws  QueryException If the custom variable has not been joined
      */
     protected function getCustomvarColumnName($customvar)
     {
-        if (isset($this->customVars[($customvar = strtolower($customvar))])) {
-            return $this->customVars[$customvar] . '.varvalue';
+        if (! isset($this->customVars[($customvar = strtolower($customvar))])) {
+            throw new QueryException('Custom variable %s has not been joined', $customvar);
         }
-        return null;
+        return $this->customVars[$customvar] . '.varvalue';
     }
 
     public function aliasToColumnName($alias)

From a199d36207ddf00a377c9653f7c8d21a648f3acc Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 22 Jul 2015 12:45:10 +0200
Subject: [PATCH 2570/2920] Stylesheet: Disable extendend @import statements
 provided by LESS

fixes #9687
---
 library/Icinga/Web/LessCompiler.php | 14 +++++++++++---
 library/Icinga/Web/StyleSheet.php   |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Web/LessCompiler.php b/library/Icinga/Web/LessCompiler.php
index 33c0f8e83..13205f73c 100644
--- a/library/Icinga/Web/LessCompiler.php
+++ b/library/Icinga/Web/LessCompiler.php
@@ -8,7 +8,6 @@ use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use RegexIterator;
 use RecursiveRegexIterator;
-use Zend_Controller_Front;
 use Icinga\Application\Icinga;
 use lessc;
 
@@ -31,8 +30,6 @@ class LessCompiler
      */
     private $lessc;
 
-    private $baseUrl;
-
     private $source;
 
     /**
@@ -44,6 +41,17 @@ class LessCompiler
         $this->lessc = new lessc();
     }
 
+    /**
+     * Disable the extendend import functionality
+     *
+     * @return  $this
+     */
+    public function disableExtendedImport()
+    {
+        $this->lessc->importDisabled = true;
+        return $this;
+    }
+
     public function compress()
     {
         $this->lessc->setPreserveComments(false);
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index 5f92e83a7..2e8ecea2c 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -99,6 +99,7 @@ class StyleSheet
         }
 
         $less = new LessCompiler();
+        $less->disableExtendedImport();
         foreach ($lessFiles as $file) {
             $less->addFile($file);
         }

From 0f2351ff1db67ba4f97a60234a437a9dded20b16 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 22 Jul 2015 13:29:44 +0200
Subject: [PATCH 2571/2920] js: Fix XHR loading of URLs in case window.FormData
 is not supported

refs #8758
---
 public/js/icinga/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 232ecbc7e..da23ebea8 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -103,7 +103,7 @@
             // This is jQuery's default content type
             var contentType = 'application/x-www-form-urlencoded; charset=UTF-8';
 
-            var isFormData = data instanceof window.FormData;
+            var isFormData = typeof window.FormData !== 'undefined' && data instanceof window.FormData;
             if (isFormData) {
                 // Setting false is mandatory as the form's data
                 // won't be recognized by the server otherwise

From ab8e7751884dcd6d76597742ec8b3687630aade5 Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus@lazyfrosch.de>
Date: Tue, 2 Jun 2015 15:53:00 +0200
Subject: [PATCH 2572/2920] Fix duplicate headers on forward() inside a
 controller

This avoids that the JS loader flattening arrays.

refs #9349
---
 library/Icinga/Web/Controller/ActionController.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 750c101f3..808c9127e 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -458,11 +458,11 @@ class ActionController extends Zend_Controller_Action
             foreach ($notifications->getMessages() as $m) {
                 $notificationList[] = rawurlencode($m->type . ' ' . $m->message);
             }
-            $resp->setHeader('X-Icinga-Notification', implode('&', $notificationList));
+            $resp->setHeader('X-Icinga-Notification', implode('&', $notificationList), true);
         }
 
         if ($this->reloadCss) {
-            $resp->setHeader('X-Icinga-CssReload', 'now');
+            $resp->setHeader('X-Icinga-CssReload', 'now', true);
         }
 
         if ($this->view->title) {
@@ -472,18 +472,18 @@ class ActionController extends Zend_Controller_Action
             }
             $resp->setHeader(
                 'X-Icinga-Title',
-                rawurlencode($this->view->title . ' :: Icinga Web')
+                rawurlencode($this->view->title . ' :: Icinga Web', true)
             );
         } else {
-            $resp->setHeader('X-Icinga-Title', rawurlencode('Icinga Web'));
+            $resp->setHeader('X-Icinga-Title', rawurlencode('Icinga Web'), true);
         }
 
         if ($this->rerenderLayout) {
-            $this->getResponse()->setHeader('X-Icinga-Container', 'layout');
+            $this->getResponse()->setHeader('X-Icinga-Container', 'layout', true);
         }
 
         if ($this->autorefreshInterval !== null) {
-            $resp->setHeader('X-Icinga-Refresh', $this->autorefreshInterval);
+            $resp->setHeader('X-Icinga-Refresh', $this->autorefreshInterval, true);
         }
     }
 

From 52e352751e382f89735b66beaffce52b9955bb00 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 22 Jul 2015 13:31:12 +0200
Subject: [PATCH 2573/2920] Revert "ModuleActionController: fix
 forward/X-Icinga-Module"

This reverts commit bf82bd4ce1827361a039cbebb272df81584044e5.

We have a not merged branch for this.

refs #9349
---
 library/Icinga/Web/Controller/ModuleActionController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Controller/ModuleActionController.php b/library/Icinga/Web/Controller/ModuleActionController.php
index 071236cdd..9286ff679 100644
--- a/library/Icinga/Web/Controller/ModuleActionController.php
+++ b/library/Icinga/Web/Controller/ModuleActionController.php
@@ -73,6 +73,6 @@ class ModuleActionController extends ActionController
     public function postDispatchXhr()
     {
         parent::postDispatchXhr();
-        $this->getResponse()->setHeader('X-Icinga-Module', $this->moduleName, true);
+        $this->getResponse()->setHeader('X-Icinga-Module', $this->moduleName);
     }
 }

From 13d954a956598e5f2cd33ede9f3ff68d7ea5cf47 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 22 Jul 2015 13:36:25 +0200
Subject: [PATCH 2574/2920] Fix rawurlencode call

---
 library/Icinga/Web/Controller/ActionController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 808c9127e..0fb71f816 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -472,7 +472,8 @@ class ActionController extends Zend_Controller_Action
             }
             $resp->setHeader(
                 'X-Icinga-Title',
-                rawurlencode($this->view->title . ' :: Icinga Web', true)
+                rawurlencode($this->view->title . ' :: Icinga Web'),
+                true
             );
         } else {
             $resp->setHeader('X-Icinga-Title', rawurlencode('Icinga Web'), true);

From 63c51c01e0fa20e5e3bcd24a6965a1d4277066c2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 22 Jul 2015 13:40:50 +0200
Subject: [PATCH 2575/2920] monitoring: Auto-refresh tactical overview every 15
 seconds

fixes #9626
---
 .../monitoring/application/controllers/TacticalController.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/application/controllers/TacticalController.php b/modules/monitoring/application/controllers/TacticalController.php
index fa2e7deec..fce4664f0 100644
--- a/modules/monitoring/application/controllers/TacticalController.php
+++ b/modules/monitoring/application/controllers/TacticalController.php
@@ -9,6 +9,7 @@ class Monitoring_TacticalController extends MonitoringController
 {
     public function indexAction()
     {
+        $this->setAutorefreshInterval(15);
         $this->getTabs()->add(
             'tactical_overview',
             array(

From a75b1a35c6f22dbecd55f6ee38fb09bd1aa9baa1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 22 Jul 2015 13:47:52 +0200
Subject: [PATCH 2576/2920] monitoring: Don't fail when selecting custom
 variables while having a group by clause

refs #9692
---
 .../Monitoring/Backend/Ido/Query/IdoQuery.php        | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index b79229f8f..de89d23bb 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -891,9 +891,19 @@ abstract class IdoQuery extends DbQuery
         return $this->idxAliasColumn[$alias];
     }
 
+    /**
+     * Get the alias of a column expression as defined in the {@link $columnMap} property.
+     *
+     * @param   string $alias Potential custom alias
+     *
+     * @return  string
+     */
     public function customAliasToAlias($alias)
     {
-        return $this->idxCustomAliases[$alias];
+        if (isset($this->idxCustomAliases[$alias])) {
+            return $this->idxCustomAliases[$alias];
+        }
+        return $alias;
     }
 
     /**

From 910dee199f24887c4da10d136d11f56b7c1748b5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 22 Jul 2015 14:21:53 +0200
Subject: [PATCH 2577/2920] Fix form test

---
 test/php/library/Icinga/Web/FormTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/php/library/Icinga/Web/FormTest.php b/test/php/library/Icinga/Web/FormTest.php
index df17c4118..662b1421f 100644
--- a/test/php/library/Icinga/Web/FormTest.php
+++ b/test/php/library/Icinga/Web/FormTest.php
@@ -239,7 +239,7 @@ class FormTest extends BaseTestCase
     }
 
     /**
-     * @expectedException   LogicException
+     * @expectedException \Icinga\Exception\ProgrammingError
      */
     public function testWhetherTheOnSuccessOptionMustBeCallable()
     {

From aa567f8cd788ba8ad0a980321191e79e4f8a23f9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 22 Jul 2015 14:56:02 +0200
Subject: [PATCH 2578/2920] Introduce
 ModuleActionController::$requiresModulePermission

refs #9644
---
 .../Web/Controller/ModuleActionController.php | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/library/Icinga/Web/Controller/ModuleActionController.php b/library/Icinga/Web/Controller/ModuleActionController.php
index 9286ff679..d4cbda86d 100644
--- a/library/Icinga/Web/Controller/ModuleActionController.php
+++ b/library/Icinga/Web/Controller/ModuleActionController.php
@@ -24,6 +24,17 @@ class ModuleActionController extends ActionController
      */
     protected $moduleName;
 
+    /**
+     * Whether the module permission is required to access to module
+     *
+     * Note that module permissions do not have any effect if the controller does not require authentication.
+     *
+     * @var bool
+     *
+     * @see $requiresAuthentication For enabling/disabling whether the controller requires authentication.
+     */
+    protected $requiresModulePermission = true;
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Controller\ActionController For the method documentation.
@@ -43,6 +54,29 @@ class ModuleActionController extends ActionController
     {
     }
 
+    /**
+     * Get whether the module permission is required to access to module
+     *
+     * @return bool
+     */
+    public function getRequiresModulePermission()
+    {
+        return $this->requiresModulePermission;
+    }
+
+    /**
+     * Set whether the module permission is required to access to module
+     *
+     * @param   bool $required
+     *
+     * @return  $this
+     */
+    public function setRequiresModulePermission($required)
+    {
+        $this->requiresModulePermission = (bool) $required;
+        return $this;
+    }
+
     public function Config($file = null)
     {
         if ($file === null) {

From 5dcc307e878e41132245cd1cd87d1671f461970c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 22 Jul 2015 14:59:35 +0200
Subject: [PATCH 2579/2920] Add namespace for module permissions to the module
 manager

refs #9644
---
 library/Icinga/Application/Modules/Manager.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php
index e3e5ec6f2..9de86db18 100644
--- a/library/Icinga/Application/Modules/Manager.php
+++ b/library/Icinga/Application/Modules/Manager.php
@@ -24,6 +24,13 @@ use Icinga\Exception\NotReadableError;
  */
 class Manager
 {
+    /**
+     * Namespace for module permissions
+     *
+     * @var string
+     */
+    const MODULE_PERMISSION_NS = 'module/';
+
     /**
      * Array of all installed module's base directories
      *

From bf590ed3801e659b4dff6d38db7026b048f1990c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 22 Jul 2015 15:01:54 +0200
Subject: [PATCH 2580/2920] Provide module permissions automatically

refs #9644
---
 application/forms/Security/RoleForm.php | 46 +++++++++++++++----------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 114ddfc1f..970a0cc01 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -63,25 +63,35 @@ class RoleForm extends ConfigForm
     public function init()
     {
         $helper = new Zend_Form_Element('bogus');
-        foreach (Icinga::app()->getModuleManager()->getLoadedModules() as $module) {
-            foreach ($module->getProvidedPermissions() as $permission) {
-                /** @var object $permission */
-                $this->providedPermissions[$permission->name] = $permission->description . ' (' . $permission->name . ')';
-            }
-            foreach ($module->getProvidedRestrictions() as $restriction) {
-                /** @var object $restriction */
-                $name = $helper->filterName($restriction->name); // Zend only permits alphanumerics, the underscore,
-                                                                 // the circumflex and any ASCII character in range
-                                                                 // \x7f to \xff (127 to 255)
-                while (isset($this->providedRestrictions[$name])) {
-                    // Because Zend_Form_Element::filterName() replaces any not permitted character with the empty
-                    // string we may have duplicate names, e.g. 're/striction' and 'restriction'
-                    $name .= '_';
+        $mm = Icinga::app()->getModuleManager();
+        foreach ($mm->listInstalledModules() as $moduleName) {
+            $modulePermission = $mm::MODULE_PERMISSION_NS . $moduleName;
+            $this->providedPermissions[$modulePermission] = sprintf(
+                $this->translate('Allow access to module %s') . ' (%s)',
+                $moduleName,
+                $modulePermission
+            );
+            if ($mm->hasEnabled($moduleName)) {
+                $module = $mm->getModule($moduleName);
+                foreach ($module->getProvidedPermissions() as $permission) {
+                    /** @var object $permission */
+                    $this->providedPermissions[$permission->name] = $permission->description . ' (' . $permission->name . ')';
+                }
+                foreach ($module->getProvidedRestrictions() as $restriction) {
+                    /** @var object $restriction */
+                    $name = $helper->filterName($restriction->name); // Zend only permits alphanumerics, the underscore,
+                    // the circumflex and any ASCII character in range
+                    // \x7f to \xff (127 to 255)
+                    while (isset($this->providedRestrictions[$name])) {
+                        // Because Zend_Form_Element::filterName() replaces any not permitted character with the empty
+                        // string we may have duplicate names, e.g. 're/striction' and 'restriction'
+                        $name .= '_';
+                    }
+                    $this->providedRestrictions[$name] = array(
+                        'description' => $restriction->description,
+                        'name'        => $restriction->name
+                    );
                 }
-                $this->providedRestrictions[$name] = array(
-                    'description'   => $restriction->description,
-                    'name'          => $restriction->name
-                );
             }
         }
     }

From 1d3a0f63eb8f9391b77eeea8a81069287b55f71e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 23 Jul 2015 12:25:30 +0200
Subject: [PATCH 2581/2920] BackendConfigForm: Fix that skipping the schema
 validation is not possible

fixes #9719
---
 .../application/forms/Config/BackendConfigForm.php  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index 504ec9a59..ade94128d 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -309,10 +309,15 @@ class BackendConfigForm extends ConfigForm
             return false;
         }
 
-        $resourceConfig = ResourceFactory::getResourceConfig($this->getValue('resource'));
-        if (! self::isValidIdoSchema($this, $resourceConfig) || !self::isValidIdoInstance($this, $resourceConfig)) {
-            $this->addSkipValidationCheckbox();
-            return false;
+        if (($el = $this->getElement('skip_validation')) === null || false === $el->isChecked()) {
+            $resourceConfig = ResourceFactory::getResourceConfig($this->getValue('resource'));
+            if (! self::isValidIdoSchema($this, $resourceConfig) || !self::isValidIdoInstance($this, $resourceConfig)) {
+                if ($el === null) {
+                    $this->addSkipValidationCheckbox();
+                }
+
+                return false;
+            }
         }
 
         return true;

From 3ffe657f716e6642e7413687834db1878e22d459 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 23 Jul 2015 12:37:23 +0200
Subject: [PATCH 2582/2920] Puppet: Use future parser

---
 Vagrantfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Vagrantfile b/Vagrantfile
index 198016789..11b5e2b9c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -47,5 +47,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     puppet.module_path = [ ".puppet/modules", ".puppet/profiles" ]
     puppet.manifests_path = ".puppet/manifests"
     puppet.manifest_file = "site.pp"
+    puppet.options = "--parser=future"
   end
 end

From 67af7b51350b7d3e9ae6e7a0bbfcb9891577cbcc Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 23 Jul 2015 12:39:12 +0200
Subject: [PATCH 2583/2920] Puppet: Don't install icinga2-debuginfo

---
 .puppet/modules/icinga2/manifests/init.pp      | 8 ++------
 .puppet/profiles/icinga2_dev/manifests/init.pp | 6 +++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.puppet/modules/icinga2/manifests/init.pp b/.puppet/modules/icinga2/manifests/init.pp
index 26c7300a5..e5b77ad75 100644
--- a/.puppet/modules/icinga2/manifests/init.pp
+++ b/.puppet/modules/icinga2/manifests/init.pp
@@ -15,7 +15,7 @@ class icinga2 {
   include icinga_packages
 
   package { [
-    'icinga2', 'icinga2-doc', 'icinga2-debuginfo'
+    'icinga2', 'icinga2-doc'
   ]:
     ensure  => latest,
     require => Class['icinga_packages'],
@@ -35,12 +35,8 @@ class icinga2 {
     links  => follow,
     owner  => 'icinga',
     group  => 'icinga',
-    mode   => 6750,
+    mode   => '6750',
   }
 
   icinga2::feature { [ 'statusdata', 'command', 'compatlog' ]: }
-
-  icinga2::feature { 'api':
-    ensure => absent,
-  }
 }
diff --git a/.puppet/profiles/icinga2_dev/manifests/init.pp b/.puppet/profiles/icinga2_dev/manifests/init.pp
index 7082fe935..322480594 100644
--- a/.puppet/profiles/icinga2_dev/manifests/init.pp
+++ b/.puppet/profiles/icinga2_dev/manifests/init.pp
@@ -19,11 +19,15 @@ class icinga2_dev {
   include monitoring_test_config
 
   icinga2::config { [
-    'conf.d/test-config', 'conf.d/commands', 'constants',
+    'conf.d/test-config', 'conf.d/commands', 'constants'
   ]:
     source => 'puppet:///modules/icinga2_dev',
   }
 
+  icinga2::feature { 'api':
+    ensure => absent,
+  }
+
   icinga2::feature { 'ido-pgsql':
     ensure  => absent,
     require => Class['icinga2_pgsql'],

From af6def7d7f5e57dd9974cb70507083e7fb948151 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 23 Jul 2015 12:39:36 +0200
Subject: [PATCH 2584/2920] Puppet: Use strings for file modes

---
 .puppet/modules/icingaweb2/manifests/config/general.pp | 2 +-
 .puppet/modules/icingaweb2/manifests/config/module.pp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.puppet/modules/icingaweb2/manifests/config/general.pp b/.puppet/modules/icingaweb2/manifests/config/general.pp
index 8ccea172f..200a4f79e 100644
--- a/.puppet/modules/icingaweb2/manifests/config/general.pp
+++ b/.puppet/modules/icingaweb2/manifests/config/general.pp
@@ -10,7 +10,7 @@ define icingaweb2::config::general (
      content => template("${source}/${name}.ini.erb"),
      owner   => 'root',
      group   => $web_group,
-     mode    => 0660,
+     mode    => '0660',
      replace => $replace,
   }
 }
diff --git a/.puppet/modules/icingaweb2/manifests/config/module.pp b/.puppet/modules/icingaweb2/manifests/config/module.pp
index 19db02250..90d98d083 100644
--- a/.puppet/modules/icingaweb2/manifests/config/module.pp
+++ b/.puppet/modules/icingaweb2/manifests/config/module.pp
@@ -20,7 +20,7 @@ define icingaweb2::config::module (
      source  => "${source}/modules/${module}/${name}.ini",
      owner   => 'root',
      group   => $web_group,
-     mode    => 0660,
+     mode    => '0660',
      replace => $replace,
   }
 }

From b4861fe689d2086919359305c3618f27942c0156 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 23 Jul 2015 12:40:12 +0200
Subject: [PATCH 2585/2920] Puppet: Set date.timezone for PHP in a separate INI
 file

---
 .puppet/modules/php/manifests/init.pp         | 17 ++-------------
 .puppet/modules/php/manifests/phpd.pp         | 21 +++++++++++++++++++
 .../modules/php/templates/timezone.ini.erb    |  1 +
 3 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 .puppet/modules/php/manifests/phpd.pp
 create mode 100644 .puppet/modules/php/templates/timezone.ini.erb

diff --git a/.puppet/modules/php/manifests/init.pp b/.puppet/modules/php/manifests/init.pp
index dd6df83b3..788ad5df1 100644
--- a/.puppet/modules/php/manifests/init.pp
+++ b/.puppet/modules/php/manifests/init.pp
@@ -20,24 +20,11 @@ class php {
 
   package { 'php':
     ensure  => latest,
-    require => Package['apache'],
-    notify  => Service['apache']
-  }
-  # TODO(el): Always executed. Should be a resource
-  -> exec { 'php-timezone':
-    command => 'sed -re $\'s#^;?(date\\.timezone =).*$#\\1 "UTC"#\' -i /etc/php.ini',
     notify  => Service['apache'],
+    require => Package['apache'],
   }
 
-  file { '/etc/php.d/error_reporting.ini':
-    content => template('php/error_reporting.ini.erb'),
+  php::phpd { ['error_reporting', 'timezone', 'xdebug_settings' ]:
     require => Package['php'],
-    notify  => Service['apache']
-  }
-
-  file { '/etc/php.d/xdebug_settings.ini':
-    content => template('php/xdebug_settings.ini.erb'),
-    require => Package['php'],
-    notify  => Service['apache']
   }
 }
diff --git a/.puppet/modules/php/manifests/phpd.pp b/.puppet/modules/php/manifests/phpd.pp
new file mode 100644
index 000000000..4d59223cb
--- /dev/null
+++ b/.puppet/modules/php/manifests/phpd.pp
@@ -0,0 +1,21 @@
+# define: php::phpd
+#
+#   Provision php.d config
+#
+# Parameters:
+#
+# Actions:
+#
+# Requires:
+#
+# Sample Usage:
+#
+define php::phpd {
+
+  include php
+
+  file { "/etc/php.d/$name.ini":
+    content => template("php/$name.ini.erb"),
+    notify  => Service['apache'],
+  }
+}
diff --git a/.puppet/modules/php/templates/timezone.ini.erb b/.puppet/modules/php/templates/timezone.ini.erb
new file mode 100644
index 000000000..51e82763b
--- /dev/null
+++ b/.puppet/modules/php/templates/timezone.ini.erb
@@ -0,0 +1 @@
+date.timezone = "UTC"

From 593f90f330a2ab66ea1acd6896dd72ef9a5825fd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 23 Jul 2015 12:40:51 +0200
Subject: [PATCH 2586/2920] Puppet: Fix that the LDAP server is empty when
 using CentOS 7

---
 .puppet/modules/openldap/manifests/init.pp         | 14 +++++++++++++-
 .../profiles/icingaweb2_dev/files/openldap/db.ldif |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.puppet/modules/openldap/manifests/init.pp b/.puppet/modules/openldap/manifests/init.pp
index 069c4a157..11cc2b42a 100644
--- a/.puppet/modules/openldap/manifests/init.pp
+++ b/.puppet/modules/openldap/manifests/init.pp
@@ -20,6 +20,18 @@ class openldap {
 
   service { 'slapd':
     ensure  => running,
-    require => Package['openldap-servers']
+    require => Package['openldap-servers'],
+  }
+
+  if versioncmp($::operatingsystemmajrelease, '7') >= 0 {
+    ['core', 'cosine', 'inetorgperson', 'nis', 'misc', 'openldap'].each |String $schema| {
+      exec { "slapd-schema-${schema}":
+        command => "ldapadd -Y EXTERNAL -H ldapi:// -f /etc/openldap/schema/${schema}.ldif",
+        group   => 'root',
+        require => Package['openldap-servers'],
+        unless  => "test -n \"$(find /etc/openldap/slapd.d/cn=config/cn=schema/ -name cn={*}${schema}.ldif -print -quit)\"",
+        user    => 'root',
+      }
+    }
   }
 }
diff --git a/.puppet/profiles/icingaweb2_dev/files/openldap/db.ldif b/.puppet/profiles/icingaweb2_dev/files/openldap/db.ldif
index eab9b7bac..03263f9c3 100644
--- a/.puppet/profiles/icingaweb2_dev/files/openldap/db.ldif
+++ b/.puppet/profiles/icingaweb2_dev/files/openldap/db.ldif
@@ -6,7 +6,7 @@ olcRootPW: {SSHA}N/2WMqT8q7cElh7KUQz+p9TJbjmKv/u9
 replace: olcRootDN
 olcRootDN: cn=admin,cn=config
 
-dn: olcDatabase={2}bdb,cn=config
+dn: olcDatabase={2}hdb,cn=config
 changetype: modify
 replace: olcRootPW
 olcRootPW: {SSHA}MxMpLBo2/TSymoIBf/Sb5iQac7Wwiur5

From b000ae3a37f959ae9937f4ad8d8237753df649a6 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 23 Jul 2015 12:50:02 +0200
Subject: [PATCH 2587/2920] Do not require permissions if authentication is not
 required

refs #9644
---
 library/Icinga/Web/Controller/ActionController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 571f0792f..dc7a7e21e 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -152,7 +152,7 @@ class ActionController extends Zend_Controller_Action
      */
     public function assertPermission($permission)
     {
-        if (! $this->Auth()->hasPermission($permission)) {
+        if ($this->requiresAuthentication && ! $this->Auth()->hasPermission($permission)) {
             throw new SecurityException('No permission for %s', $permission);
         }
     }

From 7c5b4de087303693a95553af110dd1efdc207508 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 23 Jul 2015 12:50:42 +0200
Subject: [PATCH 2588/2920] Fix coding style in RoleForm.php

---
 application/forms/Security/RoleForm.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 970a0cc01..19307262d 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -75,13 +75,14 @@ class RoleForm extends ConfigForm
                 $module = $mm->getModule($moduleName);
                 foreach ($module->getProvidedPermissions() as $permission) {
                     /** @var object $permission */
-                    $this->providedPermissions[$permission->name] = $permission->description . ' (' . $permission->name . ')';
+                    $this->providedPermissions[$permission->name] = $permission->description
+                        . ' (' . $permission->name . ')';
                 }
                 foreach ($module->getProvidedRestrictions() as $restriction) {
                     /** @var object $restriction */
-                    $name = $helper->filterName($restriction->name); // Zend only permits alphanumerics, the underscore,
-                    // the circumflex and any ASCII character in range
+                    // Zend only permits alphanumerics, the underscore, the circumflex and any ASCII character in range
                     // \x7f to \xff (127 to 255)
+                    $name = $helper->filterName($restriction->name);
                     while (isset($this->providedRestrictions[$name])) {
                         // Because Zend_Form_Element::filterName() replaces any not permitted character with the empty
                         // string we may have duplicate names, e.g. 're/striction' and 'restriction'

From b4f4ce4406f8603d7e2e489a9c7b4514e70b4fa9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 23 Jul 2015 12:51:10 +0200
Subject: [PATCH 2589/2920] Require the module's permission for every module
 automatically

Module permissions are not required if authentication is disabled on the controller.

refs #9644
---
 .../Web/Controller/ModuleActionController.php | 36 ++-----------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/library/Icinga/Web/Controller/ModuleActionController.php b/library/Icinga/Web/Controller/ModuleActionController.php
index d4cbda86d..b6d2274eb 100644
--- a/library/Icinga/Web/Controller/ModuleActionController.php
+++ b/library/Icinga/Web/Controller/ModuleActionController.php
@@ -5,6 +5,7 @@ namespace Icinga\Web\Controller;
 
 use Icinga\Application\Config;
 use Icinga\Application\Icinga;
+use Icinga\Application\Modules\Manager;
 
 /**
  * Base class for module action controllers
@@ -24,17 +25,6 @@ class ModuleActionController extends ActionController
      */
     protected $moduleName;
 
-    /**
-     * Whether the module permission is required to access to module
-     *
-     * Note that module permissions do not have any effect if the controller does not require authentication.
-     *
-     * @var bool
-     *
-     * @see $requiresAuthentication For enabling/disabling whether the controller requires authentication.
-     */
-    protected $requiresModulePermission = true;
-
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Controller\ActionController For the method documentation.
@@ -45,6 +35,7 @@ class ModuleActionController extends ActionController
         $this->_helper->layout()->moduleName = $this->moduleName;
         $this->view->translationDomain = $this->moduleName;
         $this->moduleInit();
+        $this->assertPermission(Manager::MODULE_PERMISSION_NS . $this->moduleName);
     }
 
     /**
@@ -54,29 +45,6 @@ class ModuleActionController extends ActionController
     {
     }
 
-    /**
-     * Get whether the module permission is required to access to module
-     *
-     * @return bool
-     */
-    public function getRequiresModulePermission()
-    {
-        return $this->requiresModulePermission;
-    }
-
-    /**
-     * Set whether the module permission is required to access to module
-     *
-     * @param   bool $required
-     *
-     * @return  $this
-     */
-    public function setRequiresModulePermission($required)
-    {
-        $this->requiresModulePermission = (bool) $required;
-        return $this;
-    }
-
     public function Config($file = null)
     {
         if ($file === null) {

From e8e01257e6dc1409fcedaef2c17c34e0733becce Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 23 Jul 2015 12:53:08 +0200
Subject: [PATCH 2590/2920] Change interface of SearchDashboard to allow
 setting a user before calling ::search()

Because search dashlets are provided by modules, the authenticated user's module permissions have to be validated before loading search dashlets provided by modules.

refs #9644
---
 library/Icinga/Web/Widget/SearchDashboard.php | 75 +++++++++----------
 1 file changed, 36 insertions(+), 39 deletions(-)

diff --git a/library/Icinga/Web/Widget/SearchDashboard.php b/library/Icinga/Web/Widget/SearchDashboard.php
index c1f234d2a..c394e32fa 100644
--- a/library/Icinga/Web/Widget/SearchDashboard.php
+++ b/library/Icinga/Web/Widget/SearchDashboard.php
@@ -12,6 +12,11 @@ use Icinga\Web\Url;
  */
 class SearchDashboard extends Dashboard
 {
+    /**
+     * Name for the search pane
+     *
+     * @var string
+     */
     const SEARCH_PANE = 'search';
 
     /**
@@ -19,13 +24,39 @@ class SearchDashboard extends Dashboard
      *
      * @param   string $searchString
      *
-     * @return  Dashboard|SearchDashboard
+     * @return  $this
      */
-    public static function search($searchString = '')
+    public function search($searchString = '')
     {
-        $dashboard = new static('searchDashboard');
-        $dashboard->loadSearchDashlets($searchString);
-        return $dashboard;
+        $pane = $this->createPane(self::SEARCH_PANE)->getPane(self::SEARCH_PANE)->setTitle(t('Search'));
+        $this->activate(self::SEARCH_PANE);
+
+        $manager = Icinga::app()->getModuleManager();
+        $searchUrls = array();
+
+        foreach ($manager->getLoadedModules() as $module) {
+            if ($this->getUser()->can($manager::MODULE_PERMISSION_NS . $module->getName())) {
+                $moduleSearchUrls = $module->getSearchUrls();
+                if (! empty($moduleSearchUrls)) {
+                    if ($searchString === '') {
+                        $pane->add(t('Ready to search'), 'search/hint');
+                        return $this;
+                    }
+                    $searchUrls = array_merge($searchUrls, $moduleSearchUrls);
+                }
+            }
+        }
+
+        usort($searchUrls, array($this, 'compareSearchUrls'));
+
+        foreach (array_reverse($searchUrls) as $searchUrl) {
+            $pane->addDashlet(
+                $searchUrl->title . ': ' . $searchString,
+                Url::fromPath($searchUrl->url, array('q' => $searchString))
+            );
+        }
+
+        return $this;
     }
 
     /**
@@ -43,40 +74,6 @@ class SearchDashboard extends Dashboard
         return parent::render();
     }
 
-    /**
-     * Loads search dashlets
-     *
-     * @param string $searchString
-     */
-    protected function loadSearchDashlets($searchString)
-    {
-        $pane = $this->createPane(self::SEARCH_PANE)->getPane(self::SEARCH_PANE)->setTitle(t('Search'));
-        $this->activate(self::SEARCH_PANE);
-
-        $manager = Icinga::app()->getModuleManager();
-        $searchUrls = array();
-
-        foreach ($manager->getLoadedModules() as $module) {
-            $moduleSearchUrls = $module->getSearchUrls();
-            if (! empty($moduleSearchUrls)) {
-                if ($searchString === '') {
-                    $pane->add(t('Ready to search'), 'search/hint');
-                    return;
-                }
-                $searchUrls = array_merge($searchUrls, $moduleSearchUrls);
-            }
-        }
-
-        usort($searchUrls, array($this, 'compareSearchUrls'));
-
-        foreach (array_reverse($searchUrls) as $searchUrl) {
-            $pane->addDashlet(
-                $searchUrl->title . ': ' . $searchString,
-                Url::fromPath($searchUrl->url, array('q' => $searchString))
-            );
-        }
-    }
-
     /**
      * Compare search URLs based on their priority
      *

From fd77c3083804e1967d5830435dbcd0d0f5b491c2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 23 Jul 2015 12:57:23 +0200
Subject: [PATCH 2591/2920] Don't load module dashboards if the authenticated
 user lacks the module permission

refs #9644
---
 library/Icinga/Web/Widget/Dashboard.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/Web/Widget/Dashboard.php b/library/Icinga/Web/Widget/Dashboard.php
index 1d6a882f1..0bb7ce2e5 100644
--- a/library/Icinga/Web/Widget/Dashboard.php
+++ b/library/Icinga/Web/Widget/Dashboard.php
@@ -70,13 +70,13 @@ class Dashboard extends AbstractWidget
     {
         $manager = Icinga::app()->getModuleManager();
         foreach ($manager->getLoadedModules() as $module) {
-            /** @var $module \Icinga\Application\Modules\Module */
-            $this->mergePanes($module->getPaneItems());
+            if ($this->getUser()->can($manager::MODULE_PERMISSION_NS . $module->getName())) {
+                $this->mergePanes($module->getPaneItems());
+            }
 
         }
-        if ($this->user !== null) {
-            $this->loadUserDashboards();
-        }
+
+        $this->loadUserDashboards();
 
         return $this;
     }
@@ -90,11 +90,11 @@ class Dashboard extends AbstractWidget
     {
         $output = array();
         foreach ($this->panes as $pane) {
-            if ($pane->isUserWidget() === true) {
+            if ($pane->isUserWidget()) {
                 $output[$pane->getName()] = $pane->toArray();
             }
             foreach ($pane->getDashlets() as $dashlet) {
-                if ($dashlet->isUserWidget() === true) {
+                if ($dashlet->isUserWidget()) {
                     $output[$pane->getName() . '.' . $dashlet->getTitle()] = $dashlet->toArray();
                 }
             }

From cccb34e98c88d657305ad324e5e012f1d8e80893 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 23 Jul 2015 12:58:53 +0200
Subject: [PATCH 2592/2920] Pass authenticated user to the SearchDashboard

refs #9644
---
 application/controllers/SearchController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/controllers/SearchController.php b/application/controllers/SearchController.php
index 3816eb3e8..aa5cfaf9d 100644
--- a/application/controllers/SearchController.php
+++ b/application/controllers/SearchController.php
@@ -12,7 +12,9 @@ class SearchController extends ActionController
 {
     public function indexAction()
     {
-        $this->view->dashboard = SearchDashboard::search($this->params->get('q'));
+        $searchDashboard = new SearchDashboard();
+        $searchDashboard->setUser($this->Auth()->getUser());
+        $this->view->dashboard = $searchDashboard->search($this->params->get('q'));
 
         // NOTE: This renders the dashboard twice. Remove this once we can catch exceptions thrown in view scripts.
         $this->view->dashboard->render();

From a34ad0227f85c988f04b37c113b9715c07db969c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 23 Jul 2015 12:59:30 +0200
Subject: [PATCH 2593/2920] Don't load module menu entries if the authenticated
 user lacks the module permission

refs #9644
---
 library/Icinga/Web/Menu.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 87be9ec40..9b62afbdd 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -206,13 +206,14 @@ class Menu implements RecursiveIterator
      */
     public static function load()
     {
-        /** @var $menu \Icinga\Web\Menu */
         $menu = new static('menu');
         $menu->addMainMenuItems();
+        $auth = Manager::getInstance();
         $manager = Icinga::app()->getModuleManager();
         foreach ($manager->getLoadedModules() as $module) {
-            /** @var $module \Icinga\Application\Modules\Module */
-            $menu->mergeSubMenus($module->getMenuItems());
+            if ($auth->hasPermission($manager::MODULE_PERMISSION_NS . $module->getName())) {
+                $menu->mergeSubMenus($module->getMenuItems());
+            }
         }
         return $menu->order();
     }

From b38b3b35b70c06f86325e0e5a61e3561c47c0e0e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 23 Jul 2015 13:00:23 +0200
Subject: [PATCH 2594/2920] Provide a test user in the DashboardTest

refs #9644
---
 test/php/library/Icinga/Web/Widget/DashboardTest.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/php/library/Icinga/Web/Widget/DashboardTest.php b/test/php/library/Icinga/Web/Widget/DashboardTest.php
index 09b25adc4..181dec0a9 100644
--- a/test/php/library/Icinga/Web/Widget/DashboardTest.php
+++ b/test/php/library/Icinga/Web/Widget/DashboardTest.php
@@ -8,11 +8,11 @@ namespace Tests\Icinga\Web;
 require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php');
 
 use Mockery;
-use Icinga\Application\Icinga;
+use Icinga\Test\BaseTestCase;
+use Icinga\User;
 use Icinga\Web\Widget\Dashboard;
 use Icinga\Web\Widget\Dashboard\Pane;
 use Icinga\Web\Widget\Dashboard\Dashlet;
-use Icinga\Test\BaseTestCase;
 
 class DashletWithMockedView extends Dashlet
 {
@@ -52,6 +52,7 @@ class DashboardTest extends BaseTestCase
         $moduleMock->shouldReceive('getPaneItems')->andReturn(array(
             'test-pane' => new Pane('Test Pane')
         ));
+        $moduleMock->shouldReceive('getName')->andReturn('test');
 
         $moduleManagerMock = Mockery::mock('Icinga\Application\Modules\Manager');
         $moduleManagerMock->shouldReceive('getLoadedModules')->andReturn(array(
@@ -130,7 +131,10 @@ class DashboardTest extends BaseTestCase
      */
     public function testLoadPaneItemsProvidedByEnabledModules()
     {
+        $user = new User('test');
+        $user->setPermissions(array('*' => '*'));
         $dashboard = new Dashboard();
+        $dashboard->setUser($user);
         $dashboard->load();
 
         $this->assertCount(

From 75147d6c626de83e7747a83d823f7a55fbcfe900 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 23 Jul 2015 13:01:05 +0200
Subject: [PATCH 2595/2920] Provide a test user in the SearchDashboardTest

refs #9644
---
 .../Icinga/Web/Widget/SearchDashboardTest.php | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php b/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
index 2db7be54f..6f5063946 100644
--- a/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
+++ b/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
@@ -5,6 +5,7 @@ namespace Tests\Icinga\Web;
 
 use Mockery;
 use Icinga\Test\BaseTestCase;
+use Icinga\User;
 use Icinga\Web\Widget\SearchDashboard;
 
 class SearchDashboardTest extends BaseTestCase
@@ -19,6 +20,7 @@ class SearchDashboardTest extends BaseTestCase
         $moduleMock->shouldReceive('getSearchUrls')->andReturn(array(
             $searchUrl
         ));
+        $moduleMock->shouldReceive('getName')->andReturn('test');
 
         $moduleManagerMock = Mockery::mock('Icinga\Application\Modules\Manager');
         $moduleManagerMock->shouldReceive('getLoadedModules')->andReturn(array(
@@ -34,14 +36,22 @@ class SearchDashboardTest extends BaseTestCase
      */
     public function testWhetherRenderThrowsAnExceptionWhenHasNoDashlets()
     {
-        $dashboard = SearchDashboard::search('pending');
+        $user = new User('test');
+        $user->setPermissions(array('*' => '*'));
+        $dashboard = new SearchDashboard();
+        $dashboard->setUser($user);
+        $dashboard = $dashboard->search('pending');
         $dashboard->getPane('search')->removeDashlets();
         $dashboard->render();
     }
 
     public function testWhetherSearchLoadsSearchDashletsFromModules()
     {
-        $dashboard = SearchDashboard::search('pending');
+        $user = new User('test');
+        $user->setPermissions(array('*' => '*'));
+        $dashboard = new SearchDashboard();
+        $dashboard->setUser($user);
+        $dashboard = $dashboard->search('pending');
 
         $result = $dashboard->getPane('search')->hasDashlet('Hosts: pending');
 
@@ -50,7 +60,11 @@ class SearchDashboardTest extends BaseTestCase
 
     public function testWhetherSearchProvidesHintWhenSearchStringIsEmpty()
     {
-        $dashboard = SearchDashboard::search();
+        $user = new User('test');
+        $user->setPermissions(array('*' => '*'));
+        $dashboard = new SearchDashboard();
+        $dashboard->setUser($user);
+        $dashboard = $dashboard->search();
 
         $result = $dashboard->getPane('search')->hasDashlet('Ready to search');
 

From 727a2d71411f781dd9cb1286accda249fb81db72 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 23 Jul 2015 13:48:49 +0200
Subject: [PATCH 2596/2920] Paginator: relax requirements to Paginatable

* we need no full query interface here
* introduced new interface "Paginatable"

fixes #9483
---
 library/Icinga/Data/Paginatable.php     | 9 +++++++++
 library/Icinga/Data/QueryInterface.php  | 4 +---
 library/Icinga/Web/Widget/Paginator.php | 8 ++++----
 3 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 library/Icinga/Data/Paginatable.php

diff --git a/library/Icinga/Data/Paginatable.php b/library/Icinga/Data/Paginatable.php
new file mode 100644
index 000000000..d9a6de397
--- /dev/null
+++ b/library/Icinga/Data/Paginatable.php
@@ -0,0 +1,9 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Data;
+
+use Countable;
+
+interface Paginatable extends Limitable, Countable {};
+
diff --git a/library/Icinga/Data/QueryInterface.php b/library/Icinga/Data/QueryInterface.php
index 5a6d5d5ab..6ae6c16ca 100644
--- a/library/Icinga/Data/QueryInterface.php
+++ b/library/Icinga/Data/QueryInterface.php
@@ -3,6 +3,4 @@
 
 namespace Icinga\Data;
 
-use Countable;
-
-interface QueryInterface extends Fetchable, Filterable, Limitable, Sortable, Countable {};
+interface QueryInterface extends Fetchable, Filterable, Paginatable, Sortable {};
diff --git a/library/Icinga/Web/Widget/Paginator.php b/library/Icinga/Web/Widget/Paginator.php
index dc014e371..b0c5b6c15 100644
--- a/library/Icinga/Web/Widget/Paginator.php
+++ b/library/Icinga/Web/Widget/Paginator.php
@@ -3,7 +3,7 @@
 
 namespace Icinga\Web\Widget;
 
-use Icinga\Data\QueryInterface;
+use Icinga\Data\Paginatable;
 use Icinga\Exception\ProgrammingError;
 
 /**
@@ -14,7 +14,7 @@ class Paginator extends AbstractWidget
     /**
      * The query the paginator widget is created for
      *
-     * @var QueryInterface
+     * @var Paginatable
      */
     protected $query;
 
@@ -28,11 +28,11 @@ class Paginator extends AbstractWidget
     /**
      * Set the query to create the paginator widget for
      *
-     * @param   QueryInterface      $query
+     * @param   Paginatable      $query
      *
      * @return  $this
      */
-    public function setQuery(QueryInterface $query)
+    public function setQuery(Paginatable $query)
     {
         $this->query = $query;
         return $this;

From 4e3da3a6eb5f5608f67fd9f6a137513d9bc705bf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 23 Jul 2015 16:18:09 +0200
Subject: [PATCH 2597/2920] UserBackendConfigForm: Adjust how to process
 requests...

...and use sub-forms, finally.

refs #9602
---
 application/controllers/ConfigController.php  | 126 ++++--
 .../Config/UserBackend/DbBackendForm.php      |  68 +---
 .../Config/UserBackend/LdapBackendForm.php    |  62 +--
 .../forms/Config/UserBackendConfigForm.php    | 376 ++++++++++--------
 .../forms/Config/UserBackendReorderForm.php   |  14 +-
 .../{userbackend/create.phtml => form.phtml}  |   0
 .../scripts/config/userbackend/modify.phtml   |   6 -
 .../scripts/config/userbackend/remove.phtml   |   6 -
 .../application/forms/AuthBackendPage.php     |  36 +-
 9 files changed, 370 insertions(+), 324 deletions(-)
 rename application/views/scripts/config/{userbackend/create.phtml => form.phtml} (100%)
 delete mode 100644 application/views/scripts/config/userbackend/modify.phtml
 delete mode 100644 application/views/scripts/config/userbackend/remove.phtml

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 206d3c88b..e9fbbd7ef 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -5,6 +5,8 @@ use Icinga\Application\Config;
 use Icinga\Application\Icinga;
 use Icinga\Application\Modules\Module;
 use Icinga\Data\ResourceFactory;
+use Icinga\Exception\ConfigurationError;
+use Icinga\Exception\NotFoundError;
 use Icinga\Forms\Config\UserBackendConfigForm;
 use Icinga\Forms\Config\UserBackendReorderForm;
 use Icinga\Forms\Config\GeneralConfigForm;
@@ -193,80 +195,130 @@ class ConfigController extends Controller
     }
 
     /**
-     * Action for creating a new user backend
+     * Create a new user backend
      */
     public function createuserbackendAction()
     {
         $this->assertPermission('config/application/userbackend');
         $form = new UserBackendConfigForm();
+        $form->setRedirectUrl('config/userbackend');
         $form->setTitle($this->translate('Create New User Backend'));
         $form->addDescription($this->translate(
             'Create a new backend for authenticating your users. This backend'
             . ' will be added at the end of your authentication order.'
         ));
         $form->setIniConfig(Config::app('authentication'));
-        $form->setResourceConfig(ResourceFactory::getResourceConfigs());
-        $form->setRedirectUrl('config/userbackend');
+
+        try {
+            $form->setResourceConfig(ResourceFactory::getResourceConfigs());
+        } catch (ConfigurationError $e) {
+            if ($this->hasPermission('config/application/resources')) {
+                Notification::error($e->getMessage());
+                $this->redirectNow('config/createresource');
+            }
+
+            throw $e; // No permission for resource configuration, show the error
+        }
+
+        $form->setOnSuccess(function (UserBackendConfigForm $form) {
+            try {
+                $form->add(array_filter($form->getValues()));
+            } catch (Exception $e) {
+                $form->error($e->getMessage());
+                return false;
+            }
+
+            if ($form->save()) {
+                Notification::success(t('User backend successfully created'));
+                return true;
+            }
+
+            return false;
+        });
         $form->handleRequest();
 
         $this->view->form = $form;
-        $this->render('userbackend/create');
+        $this->render('form');
     }
 
     /**
-     * Action for editing user backends
+     * Edit a user backend
      */
     public function edituserbackendAction()
     {
         $this->assertPermission('config/application/userbackend');
+        $backendName = $this->params->getRequired('backend');
+
         $form = new UserBackendConfigForm();
-        $form->setTitle($this->translate('Edit User Backend'));
-        $form->setIniConfig(Config::app('authentication'));
-        $form->setResourceConfig(ResourceFactory::getResourceConfigs());
-        $form->setRedirectUrl('config/userbackend');
         $form->setAction(Url::fromRequest());
-        $form->handleRequest();
+        $form->setRedirectUrl('config/userbackend');
+        $form->setTitle(sprintf($this->translate('Edit User Backend %s'), $backendName));
+        $form->setIniConfig(Config::app('authentication'));
+        $form->setOnSuccess(function (UserBackendConfigForm $form) use ($backendName) {
+            try {
+                $form->edit($backendName, array_map(
+                    function ($v) {
+                        return $v !== '' ? $v : null;
+                    },
+                    $form->getValues()
+                ));
+            } catch (Exception $e) {
+                $form->error($e->getMessage());
+                return false;
+            }
+
+            if ($form->save()) {
+                Notification::success(sprintf(t('User backend "%s" successfully updated'), $backendName));
+                return true;
+            }
+
+            return false;
+        });
+
+        try {
+            $form->load($backendName);
+            $form->setResourceConfig(ResourceFactory::getResourceConfigs());
+            $form->handleRequest();
+        } catch (NotFoundError $_) {
+            $this->httpNotFound(sprintf($this->translate('User backend "%s" not found'), $backendName));
+        }
 
         $this->view->form = $form;
-        $this->render('userbackend/modify');
+        $this->render('form');
     }
 
     /**
-     * Action for removing a user backend
+     * Display a confirmation form to remove the backend identified by the 'backend' parameter
      */
     public function removeuserbackendAction()
     {
         $this->assertPermission('config/application/userbackend');
-        $form = new ConfirmRemovalForm(array(
-            'onSuccess' => function ($form) {
-                $configForm = new UserBackendConfigForm();
-                $configForm->setIniConfig(Config::app('authentication'));
-                $authBackend = $form->getRequest()->getQuery('backend');
+        $backendName = $this->params->getRequired('backend');
 
-                try {
-                    $configForm->remove($authBackend);
-                } catch (InvalidArgumentException $e) {
-                    Notification::error($e->getMessage());
-                    return false;
-                }
-
-                if ($configForm->save()) {
-                    Notification::success(sprintf(
-                        t('User backend "%s" has been successfully removed'),
-                        $authBackend
-                    ));
-                } else {
-                    return false;
-                }
-            }
-        ));
-        $form->setTitle($this->translate('Remove User Backend'));
+        $backendForm = new UserBackendConfigForm();
+        $backendForm->setIniConfig(Config::app('authentication'));
+        $form = new ConfirmRemovalForm();
         $form->setRedirectUrl('config/userbackend');
-        $form->setAction(Url::fromRequest());
+        $form->setTitle(sprintf($this->translate('Remove User Backend %s'), $backendName));
+        $form->setOnSuccess(function (ConfirmRemovalForm $form) use ($backendName, $backendForm) {
+            try {
+                $backendForm->delete($backendName);
+            } catch (Exception $e) {
+                $form->error($e->getMessage());
+                return false;
+            }
+
+            if ($backendForm->save()) {
+                Notification::success(sprintf(t('User backend "%s" successfully removed'), $backendName));
+                return true;
+            }
+
+            return false;
+        });
         $form->handleRequest();
 
         $this->view->form = $form;
-        $this->render('userbackend/remove');
+        $this->render('form');
     }
 
     /**
diff --git a/application/forms/Config/UserBackend/DbBackendForm.php b/application/forms/Config/UserBackend/DbBackendForm.php
index c09ec166c..49426c073 100644
--- a/application/forms/Config/UserBackend/DbBackendForm.php
+++ b/application/forms/Config/UserBackend/DbBackendForm.php
@@ -3,11 +3,7 @@
 
 namespace Icinga\Forms\Config\UserBackend;
 
-use Exception;
 use Icinga\Web\Form;
-use Icinga\Data\ConfigObject;
-use Icinga\Data\ResourceFactory;
-use Icinga\Authentication\User\DbUserBackend;
 
 /**
  * Form class for adding/modifying database user backends
@@ -43,7 +39,9 @@ class DbBackendForm extends Form
     }
 
     /**
-     * @see Form::createElements()
+     * Create and add elements to this form
+     *
+     * @param   array   $formData
      */
     public function createElements(array $formData)
     {
@@ -56,6 +54,20 @@ class DbBackendForm extends Form
                 'description'   => $this->translate(
                     'The name of this authentication provider that is used to differentiate it from others'
                 ),
+                'validators'    => array(
+                    array(
+                        'Regex',
+                        false,
+                        array(
+                            'pattern'  => '/^[^\\[\\]:]+$/',
+                            'messages' => array(
+                                'regexNotMatch' => $this->translate(
+                                    'The name cannot contain \'[\', \']\' or \':\'.'
+                                )
+                            )
+                        )
+                    )
+                )
             )
         );
         $this->addElement(
@@ -67,7 +79,7 @@ class DbBackendForm extends Form
                 'description'   => $this->translate(
                     'The database connection to use for authenticating with this provider'
                 ),
-                'multiOptions'  => false === empty($this->resources)
+                'multiOptions'  => !empty($this->resources)
                     ? array_combine($this->resources, $this->resources)
                     : array()
             )
@@ -80,49 +92,5 @@ class DbBackendForm extends Form
                 'value'     => 'db'
             )
         );
-
-        return $this;
-    }
-
-    /**
-     * Validate that the selected resource is a valid database user backend
-     *
-     * @see Form::onSuccess()
-     */
-    public function onSuccess()
-    {
-        if (false === static::isValidUserBackend($this)) {
-            return false;
-        }
-    }
-
-    /**
-     * Validate the configuration by creating a backend and requesting the user count
-     *
-     * @param   Form    $form   The form to fetch the configuration values from
-     *
-     * @return  bool            Whether validation succeeded or not
-     */
-    public static function isValidUserBackend(Form $form)
-    {
-        $backend = new DbUserBackend(ResourceFactory::createResource($form->getResourceConfig()));
-        $result = $backend->inspect();
-        if ($result->hasError()) {
-            $form->addError(sprintf($form->translate('Using the specified backend failed: %s'), $result->getError()));
-        }
-
-        // TODO: display diagnostics in $result->toArray() to the user
-
-        return ! $result->hasError();
-    }
-
-    /**
-     * Return the configuration for the chosen resource
-     *
-     * @return  ConfigObject
-     */
-    public function getResourceConfig()
-    {
-        return ResourceFactory::getResourceConfig($this->getValue('resource'));
     }
 }
diff --git a/application/forms/Config/UserBackend/LdapBackendForm.php b/application/forms/Config/UserBackend/LdapBackendForm.php
index 6427fbf34..b5b2c966f 100644
--- a/application/forms/Config/UserBackend/LdapBackendForm.php
+++ b/application/forms/Config/UserBackend/LdapBackendForm.php
@@ -3,14 +3,7 @@
 
 namespace Icinga\Forms\Config\UserBackend;
 
-use Exception;
-use Icinga\Authentication\User\LdapUserBackend;
-use Icinga\Data\Inspection;
 use Icinga\Web\Form;
-use Icinga\Data\ConfigObject;
-use Icinga\Data\ResourceFactory;
-use Icinga\Exception\AuthenticationException;
-use Icinga\Authentication\User\UserBackend;
 
 /**
  * Form class for adding/modifying LDAP user backends
@@ -46,7 +39,9 @@ class LdapBackendForm extends Form
     }
 
     /**
-     * @see Form::createElements()
+     * Create and add elements to this form
+     *
+     * @param   array   $formData
      */
     public function createElements(array $formData)
     {
@@ -60,6 +55,20 @@ class LdapBackendForm extends Form
                 'label'         => $this->translate('Backend Name'),
                 'description'   => $this->translate(
                     'The name of this authentication provider that is used to differentiate it from others.'
+                ),
+                'validators'    => array(
+                    array(
+                        'Regex',
+                        false,
+                        array(
+                            'pattern'  => '/^[^\\[\\]:]+$/',
+                            'messages' => array(
+                                'regexNotMatch' => $this->translate(
+                                    'The name cannot contain \'[\', \']\' or \':\'.'
+                                )
+                            )
+                        )
+                    )
                 )
             )
         );
@@ -72,7 +81,7 @@ class LdapBackendForm extends Form
                 'description'   => $this->translate(
                     'The LDAP connection to use for authenticating with this provider.'
                 ),
-                'multiOptions'  => false === empty($this->resources)
+                'multiOptions'  => !empty($this->resources)
                     ? array_combine($this->resources, $this->resources)
                     : array()
             )
@@ -162,40 +171,5 @@ class LdapBackendForm extends Form
                 )
             )
         );
-        return $this;
-    }
-
-    /**
-     * Validate that the selected resource is a valid ldap user backend
-     *
-     * @see Form::onSuccess()
-     */
-    public function onSuccess()
-    {
-        if (false === static::isValidUserBackend($this)) {
-            return false;
-        }
-    }
-
-    /**
-     * Validate the configuration by creating a backend and requesting the user count
-     *
-     * @param   Form    $form   The form to fetch the configuration values from
-     *
-     * @return  bool            Whether validation succeeded or not
-     */
-    public static function isValidUserBackend(Form $form)
-    {
-        /**
-         * @var $result Inspection
-         */
-        $result = UserBackend::create(null, new ConfigObject($form->getValues()))->inspect();
-        if ($result->hasError()) {
-            $form->addError($result->getError());
-        }
-
-        // TODO: display diagnostics in $result->toArray() to the user
-
-        return ! $result->hasError();
     }
 }
diff --git a/application/forms/Config/UserBackendConfigForm.php b/application/forms/Config/UserBackendConfigForm.php
index 62a68e70b..0afc54a44 100644
--- a/application/forms/Config/UserBackendConfigForm.php
+++ b/application/forms/Config/UserBackendConfigForm.php
@@ -4,26 +4,38 @@
 namespace Icinga\Forms\Config;
 
 use InvalidArgumentException;
-use Icinga\Forms\ConfigForm;
-use Icinga\Web\Notification;
 use Icinga\Application\Config;
-use Icinga\Application\Platform;
-use Icinga\Data\ConfigObject;
-use Icinga\Data\ResourceFactory;
+use Icinga\Authentication\User\UserBackend;
 use Icinga\Exception\ConfigurationError;
+use Icinga\Exception\IcingaException;
+use Icinga\Exception\NotFoundError;
+use Icinga\Data\ConfigObject;
+use Icinga\Data\Inspectable;
+use Icinga\Forms\ConfigForm;
+use Icinga\Forms\Config\UserBackend\ExternalBackendForm;
 use Icinga\Forms\Config\UserBackend\DbBackendForm;
 use Icinga\Forms\Config\UserBackend\LdapBackendForm;
-use Icinga\Forms\Config\UserBackend\ExternalBackendForm;
+use Icinga\Web\Form;
 
+/**
+ * Form for managing user backends
+ */
 class UserBackendConfigForm extends ConfigForm
 {
     /**
-     * The available resources split by type
+     * The available user backend resources split by type
      *
      * @var array
      */
     protected $resources;
 
+    /**
+     * The backend to load when displaying the form for the first time
+     *
+     * @var string
+     */
+    protected $backendToLoad;
+
     /**
      * Initialize this form
      */
@@ -36,15 +48,39 @@ class UserBackendConfigForm extends ConfigForm
     /**
      * Set the resource configuration to use
      *
-     * @param   Config      $resources      The resource configuration
+     * @param   Config  $resourceConfig     The resource configuration
      *
      * @return  $this
+     *
+     * @throws  ConfigurationError          In case there are no valid resources for authentication available
      */
     public function setResourceConfig(Config $resourceConfig)
     {
         $resources = array();
         foreach ($resourceConfig as $name => $resource) {
-            $resources[strtolower($resource->type)][] = $name;
+            if (in_array($resource->type, array('db', 'ldap'))) {
+                $resources[$resource->type][] = $name;
+            }
+        }
+
+        if (empty($resources)) {
+            $externalBackends = $this->config->toArray();
+            array_walk(
+                $externalBackends,
+                function (& $authBackendCfg) {
+                    if (! isset($authBackendCfg['backend']) || $authBackendCfg['backend'] !== 'external') {
+                        $authBackendCfg = null;
+                    }
+                }
+            );
+            if (count(array_filter($externalBackends)) > 0 && (
+                $this->backendToLoad === null || !isset($externalBackends[$this->backendToLoad])
+            )) {
+                throw new ConfigurationError($this->translate(
+                    'Could not find any valid user backend resources.'
+                    . ' Please configure a resource for authentication first.'
+                ));
+            }
         }
 
         $this->resources = $resources;
@@ -54,9 +90,11 @@ class UserBackendConfigForm extends ConfigForm
     /**
      * Return a form object for the given backend type
      *
-     * @param   string      $type   The backend type for which to return a form
+     * @param   string      $type           The backend type for which to return a form
      *
      * @return  Form
+     *
+     * @throws  InvalidArgumentException    In case the given backend type is invalid
      */
     public function getBackendForm($type)
     {
@@ -84,81 +122,103 @@ class UserBackendConfigForm extends ConfigForm
     }
 
     /**
-     * Add a particular user backend
+     * Populate the form with the given backend's config
      *
-     * The backend to add is identified by the array-key `name'.
-     *
-     * @param   array   $values             The values to extend the configuration with
+     * @param   string  $name
      *
      * @return  $this
      *
-     * @throws  InvalidArgumentException    In case the backend does already exist
+     * @throws  NotFoundError   In case no backend with the given name is found
      */
-    public function add(array $values)
+    public function load($name)
     {
-        $name = isset($values['name']) ? $values['name'] : '';
-        if (! $name) {
-            throw new InvalidArgumentException($this->translate('User backend name missing'));
-        } elseif ($this->config->hasSection($name)) {
-            throw new InvalidArgumentException($this->translate('User backend already exists'));
+        if (! $this->config->hasSection($name)) {
+            throw new NotFoundError('No user backend called "%s" found', $name);
         }
 
-        unset($values['name']);
-        $this->config->setSection($name, $values);
+        $this->backendToLoad = $name;
         return $this;
     }
 
     /**
-     * Edit a particular user backend
+     * Add a new user backend
      *
-     * @param   string  $name               The name of the backend to edit
-     * @param   array   $values             The values to edit the configuration with
+     * The backend to add is identified by the array-key `name'.
      *
-     * @return  array                       The edited backend configuration
+     * @param   array   $data
      *
-     * @throws  InvalidArgumentException    In case the backend does not exist
+     * @return  $this
+     *
+     * @throws  InvalidArgumentException    In case $data does not contain a backend name
+     * @throws  IcingaException             In case a backend with the same name already exists
      */
-    public function edit($name, array $values)
+    public function add(array $data)
     {
-        if (! $name) {
-            throw new InvalidArgumentException($this->translate('Old user backend name missing'));
-        } elseif (! ($newName = isset($values['name']) ? $values['name'] : '')) {
-            throw new InvalidArgumentException($this->translate('New user backend name missing'));
-        } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException($this->translate('Unknown user backend provided'));
+        if (! isset($data['name'])) {
+            throw new InvalidArgumentException('Key \'name\' missing');
         }
 
-        $backendConfig = $this->config->getSection($name);
-        if ($newName !== $name) {
-            // Only remove the old entry if it has changed as the order gets screwed when editing backend names
-            $this->config->removeSection($name);
+        $backendName = $data['name'];
+        if ($this->config->hasSection($backendName)) {
+            throw new IcingaException(
+                $this->translate('A user backend with the name "%s" does already exist'),
+                $backendName
+            );
         }
 
-        unset($values['name']);
-        $this->config->setSection($newName, $backendConfig->merge($values));
-        return $backendConfig;
+        unset($data['name']);
+        $this->config->setSection($backendName, $data);
+        return $this;
     }
 
     /**
-     * Remove the given user backend
+     * Edit a user backend
      *
-     * @param   string      $name           The name of the backend to remove
+     * @param   string  $name
+     * @param   array   $data
      *
-     * @return  array                       The removed backend configuration
+     * @return  $this
      *
-     * @throws  InvalidArgumentException    In case the backend does not exist
+     * @throws  NotFoundError   In case no backend with the given name is found
      */
-    public function remove($name)
+    public function edit($name, array $data)
     {
-        if (! $name) {
-            throw new InvalidArgumentException($this->translate('user backend name missing'));
-        } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException($this->translate('Unknown user backend provided'));
+        if (! $this->config->hasSection($name)) {
+            throw new NotFoundError('No user backend called "%s" found', $name);
         }
 
         $backendConfig = $this->config->getSection($name);
+        if (isset($data['name'])) {
+            if ($data['name'] !== $name) {
+                $this->config->removeSection($name);
+                $name = $data['name'];
+            }
+
+            unset($data['name']);
+        }
+
+        $backendConfig->merge($data);
+        foreach ($backendConfig->toArray() as $k => $v) {
+            if ($v === null) {
+                unset($backendConfig->$k);
+            }
+        }
+
+        $this->config->setSection($name, $backendConfig);
+        return $this;
+    }
+
+    /**
+     * Remove a user backend
+     *
+     * @param   string  $name
+     *
+     * @return  $this
+     */
+    public function delete($name)
+    {
         $this->config->removeSection($name);
-        return $backendConfig;
+        return $this;
     }
 
     /**
@@ -169,14 +229,12 @@ class UserBackendConfigForm extends ConfigForm
      *
      * @return  $this
      *
-     * @throws  InvalidArgumentException    In case the backend does not exist
+     * @throws  NotFoundError               In case no backend with the given name is found
      */
     public function move($name, $position)
     {
-        if (! $name) {
-            throw new InvalidArgumentException($this->translate('User backend name missing'));
-        } elseif (! $this->config->hasSection($name)) {
-            throw new InvalidArgumentException($this->translate('Unknown user backend provided'));
+        if (! $this->config->hasSection($name)) {
+            throw new NotFoundError('No user backend called "%s" found', $name);
         }
 
         $backendOrder = $this->config->keys();
@@ -194,105 +252,9 @@ class UserBackendConfigForm extends ConfigForm
     }
 
     /**
-     * Add or edit an user backend and save the configuration
+     * Create and add elements to this form
      *
-     * Performs a connectivity validation using the submitted values. A checkbox is
-     * added to the form to skip the check if it fails and redirection is aborted.
-     *
-     * @see Form::onSuccess()
-     */
-    public function onSuccess()
-    {
-        if (($el = $this->getElement('force_creation')) === null || false === $el->isChecked()) {
-            $backendForm = $this->getBackendForm($this->getElement('type')->getValue());
-            if (false === $backendForm::isValidUserBackend($this)) {
-                $this->addElement($this->getForceCreationCheckbox());
-                return false;
-            }
-        }
-
-        $authBackend = $this->request->getQuery('backend');
-        try {
-            if ($authBackend === null) { // create new backend
-                $this->add($this->getValues());
-                $message = $this->translate('User backend "%s" has been successfully created');
-            } else { // edit existing backend
-                $this->edit($authBackend, $this->getValues());
-                $message = $this->translate('User backend "%s" has been successfully changed');
-            }
-        } catch (InvalidArgumentException $e) {
-            Notification::error($e->getMessage());
-            return;
-        }
-
-        if ($this->save()) {
-            Notification::success(sprintf($message, $this->getElement('name')->getValue()));
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Populate the form in case an user backend is being edited
-     *
-     * @see Form::onRequest()
-     *
-     * @throws  ConfigurationError      In case the backend name is missing in the request or is invalid
-     */
-    public function onRequest()
-    {
-        $authBackend = $this->request->getQuery('backend');
-        if ($authBackend !== null) {
-            if ($authBackend === '') {
-                throw new ConfigurationError($this->translate('User backend name missing'));
-            } elseif (! $this->config->hasSection($authBackend)) {
-                throw new ConfigurationError($this->translate('Unknown user backend provided'));
-            } elseif ($this->config->getSection($authBackend)->backend === null) {
-                throw new ConfigurationError(
-                    sprintf($this->translate('Backend "%s" has no `backend\' setting'), $authBackend)
-                );
-            }
-
-            $configValues = $this->config->getSection($authBackend)->toArray();
-            $configValues['type'] = $configValues['backend'];
-            $configValues['name'] = $authBackend;
-            $this->populate($configValues);
-        } elseif (empty($this->resources)) {
-            $externalBackends = array_filter(
-                $this->config->toArray(),
-                function ($authBackendCfg) {
-                    return isset($authBackendCfg['backend']) && $authBackendCfg['backend'] === 'external';
-                }
-            );
-
-            if (false === empty($externalBackends)) {
-                throw new ConfigurationError($this->translate('Could not find any resources for authentication'));
-            }
-        }
-    }
-
-    /**
-     * Return a checkbox to be displayed at the beginning of the form
-     * which allows the user to skip the connection validation
-     *
-     * @return  Zend_Form_Element
-     */
-    protected function getForceCreationCheckbox()
-    {
-        return $this->createElement(
-            'checkbox',
-            'force_creation',
-            array(
-                'order'         => 0,
-                'ignore'        => true,
-                'label'         => $this->translate('Force Changes'),
-                'description'   => $this->translate('Check this box to enforce changes without connectivity validation')
-            )
-        );
-    }
-
-    /**
-     * @see Form::createElements()
+     * @param   array   $formData
      */
     public function createElements(array $formData)
     {
@@ -302,7 +264,7 @@ class UserBackendConfigForm extends ConfigForm
         if (isset($this->resources['db'])) {
             $backendTypes['db'] = $this->translate('Database');
         }
-        if (isset($this->resources['ldap']) && ($backendType === 'ldap' || Platform::extensionLoaded('ldap'))) {
+        if (isset($this->resources['ldap'])) {
             $backendTypes['ldap'] = 'LDAP';
             $backendTypes['msldap'] = 'ActiveDirectory';
         }
@@ -336,21 +298,107 @@ class UserBackendConfigForm extends ConfigForm
             )
         );
 
-        if (isset($formData['force_creation']) && $formData['force_creation']) {
+        if (isset($formData['skip_validation']) && $formData['skip_validation']) {
             // In case another error occured and the checkbox was displayed before
-            $this->addElement($this->getForceCreationCheckbox());
+            $this->addSkipValidationCheckbox();
         }
 
-        $this->addElements($this->getBackendForm($backendType)->createElements($formData)->getElements());
+        $this->addSubForm($this->getBackendForm($backendType)->create($formData), 'backend_form');
     }
 
     /**
-     * Return the configuration for the chosen resource
-     *
-     * @return  ConfigObject
+     * Populate the configuration of the backend to load
      */
-    public function getResourceConfig()
+    public function onRequest()
     {
-        return ResourceFactory::getResourceConfig($this->getValue('resource'));
+        if ($this->backendToLoad) {
+            $data = $this->config->getSection($this->backendToLoad)->toArray();
+            $data['name'] = $this->backendToLoad;
+            $data['type'] = $data['backend'];
+            $this->populate($data);
+        }
+    }
+
+    /**
+     * Retrieve all form element values
+     *
+     * @param   bool    $suppressArrayNotation  Ignored
+     *
+     * @return  array
+     */
+    public function getValues($suppressArrayNotation = false)
+    {
+        $values = parent::getValues();
+        $values = array_merge($values, $values['backend_form']);
+        unset($values['backend_form']);
+        return $values;
+    }
+
+    /**
+     * Return whether the given values are valid
+     *
+     * @param   array   $formData   The data to validate
+     *
+     * @return  bool
+     */
+    public function isValid($formData)
+    {
+        if (! parent::isValid($formData)) {
+            return false;
+        }
+
+        if (($el = $this->getElement('skip_validation')) === null || false === $el->isChecked()) {
+            $backendForm = $this->getBackendForm($this->getValue('type'));
+            if (! static::isValidUserBackend($this)) {
+                if ($el === null) {
+                    $this->addSkipValidationCheckbox();
+                }
+
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Validate the configuration by creating a backend and running its inspection checks
+     *
+     * @param   Form    $form   The form to fetch the configuration values from
+     *
+     * @return  bool            Whether inspection succeeded or not
+     */
+    public static function isValidUserBackend(Form $form)
+    {
+        $backend = UserBackend::create(null, new ConfigObject($form->getValues()));
+        if ($backend instanceof Inspectable) {
+            $inspection = $backend->inspect();
+            if ($inspection->hasError()) {
+                $form->error($inspection->getError());
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Add a checkbox to the form by which the user can skip the connection validation
+     */
+    protected function addSkipValidationCheckbox()
+    {
+        $this->addElement(
+            'checkbox',
+            'skip_validation',
+            array(
+                'order'         => 0,
+                'ignore'        => true,
+                'required'      => true,
+                'label'         => $this->translate('Skip Validation'),
+                'description'   => $this->translate(
+                    'Check this box to enforce changes without validating that authentication is possible.'
+                )
+            )
+        );
     }
 }
diff --git a/application/forms/Config/UserBackendReorderForm.php b/application/forms/Config/UserBackendReorderForm.php
index 9069e73e3..359f515b1 100644
--- a/application/forms/Config/UserBackendReorderForm.php
+++ b/application/forms/Config/UserBackendReorderForm.php
@@ -3,9 +3,9 @@
 
 namespace Icinga\Forms\Config;
 
-use InvalidArgumentException;
-use Icinga\Web\Notification;
 use Icinga\Forms\ConfigForm;
+use Icinga\Exception\NotFoundError;
+use Icinga\Web\Notification;
 
 class UserBackendReorderForm extends ConfigForm
 {
@@ -29,7 +29,9 @@ class UserBackendReorderForm extends ConfigForm
     }
 
     /**
-     * @see Form::createElements()
+     * Create and add elements to this form
+     *
+     * @param   array   $formData
      */
     public function createElements(array $formData)
     {
@@ -39,8 +41,6 @@ class UserBackendReorderForm extends ConfigForm
 
     /**
      * Update the user backend order and save the configuration
-     *
-     * @see Form::onSuccess()
      */
     public function onSuccess()
     {
@@ -55,8 +55,8 @@ class UserBackendReorderForm extends ConfigForm
                 } else {
                     return false;
                 }
-            } catch (InvalidArgumentException $e) {
-                Notification::error($e->getMessage());
+            } catch (NotFoundError $_) {
+                 Notification::error(sprintf($this->translate('User backend "%s" not found'), $backendName));
             }
         }
     }
diff --git a/application/views/scripts/config/userbackend/create.phtml b/application/views/scripts/config/form.phtml
similarity index 100%
rename from application/views/scripts/config/userbackend/create.phtml
rename to application/views/scripts/config/form.phtml
diff --git a/application/views/scripts/config/userbackend/modify.phtml b/application/views/scripts/config/userbackend/modify.phtml
deleted file mode 100644
index 338d6807e..000000000
--- a/application/views/scripts/config/userbackend/modify.phtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="controls">
-    <?= $this->tabs->showOnlyCloseButton() ?>
-</div>
-<div class="content">
-    <?= $form; ?>
-</div>
diff --git a/application/views/scripts/config/userbackend/remove.phtml b/application/views/scripts/config/userbackend/remove.phtml
deleted file mode 100644
index a53f51721..000000000
--- a/application/views/scripts/config/userbackend/remove.phtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="controls">
-    <?= $this->tabs->showOnlyCloseButton() ?>
-</div>
-<div class="content">
-    <?= $form; ?>
-</div>
\ No newline at end of file
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index 2caab9122..06a2fec2c 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -3,11 +3,12 @@
 
 namespace Icinga\Module\Setup\Forms;
 
-use Icinga\Web\Form;
+use Icinga\Data\ConfigObject;
+use Icinga\Forms\Config\UserBackendConfigForm;
 use Icinga\Forms\Config\UserBackend\DbBackendForm;
 use Icinga\Forms\Config\UserBackend\LdapBackendForm;
 use Icinga\Forms\Config\UserBackend\ExternalBackendForm;
-use Icinga\Data\ConfigObject;
+use Icinga\Web\Form;
 
 /**
  * Wizard page to define authentication backend specific details
@@ -66,14 +67,14 @@ class AuthBackendPage extends Form
             $this->setRequiredCue(null);
             $backendForm = new DbBackendForm();
             $backendForm->setRequiredCue(null);
-            $backendForm->createElements($formData)->removeElement('resource');
+            $backendForm->create($formData)->removeElement('resource');
             $this->addDescription($this->translate(
                 'As you\'ve chosen to use a database for authentication all you need '
                 . 'to do now is defining a name for your first authentication backend.'
             ));
         } elseif ($this->config['type'] === 'ldap') {
             $backendForm = new LdapBackendForm();
-            $backendForm->createElements($formData)->removeElement('resource');
+            $backendForm->create($formData)->removeElement('resource');
             $this->addDescription($this->translate(
                 'Before you are able to authenticate using the LDAP connection defined earlier you need to'
                 . ' provide some more information so that Icinga Web 2 is able to locate account details.'
@@ -97,15 +98,30 @@ class AuthBackendPage extends Form
             );
         } else { // $this->config['type'] === 'external'
             $backendForm = new ExternalBackendForm();
-            $backendForm->createElements($formData);
+            $backendForm->create($formData);
             $this->addDescription($this->translate(
                 'You\'ve chosen to authenticate using a web server\'s mechanism so it may be necessary'
                 . ' to adjust usernames before any permissions, restrictions, etc. are being applied.'
             ));
         }
 
-        $this->addElements($backendForm->getElements());
-        $this->getElement('name')->setValue('icingaweb2');
+        $backendForm->getElement('name')->setValue('icingaweb2');
+        $this->addSubForm($backendForm, 'backend_form');
+    }
+
+    /**
+     * Retrieve all form element values
+     *
+     * @param   bool    $suppressArrayNotation  Ignored
+     *
+     * @return  array
+     */
+    public function getValues($suppressArrayNotation = false)
+    {
+        $values = parent::getValues();
+        $values = array_merge($values, $values['backend_form']);
+        unset($values['backend_form']);
+        return $values;
     }
 
     /**
@@ -117,11 +133,11 @@ class AuthBackendPage extends Form
      */
     public function isValid($data)
     {
-        if (false === parent::isValid($data)) {
+        if (! parent::isValid($data)) {
             return false;
         }
 
-        if ($this->config['type'] === 'ldap' && ( !isset($data['skip_validation']) || $data['skip_validation'] == 0)) {
+        if ($this->config['type'] === 'ldap' && (! isset($data['skip_validation']) || $data['skip_validation'] == 0)) {
             $self = clone $this;
             $self->addElement(
                 'text',
@@ -130,7 +146,7 @@ class AuthBackendPage extends Form
                     'value' => $this->getResourceConfig()
                 )
             );
-            if (! LdapBackendForm::isValidUserBackend($self)) {
+            if (! UserBackendConfigForm::isValidUserBackend($self)) {
                 $this->addSkipValidationCheckbox();
                 return false;
             }

From 666c401a4064cf4c36a5f1e83946fcf9bcac6b42 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 23 Jul 2015 16:18:35 +0200
Subject: [PATCH 2598/2920] BackendConfigForm: Translate exceptions shown to
 the user

---
 .../application/forms/Config/BackendConfigForm.php           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php
index 504ec9a59..d2fe4e938 100644
--- a/modules/monitoring/application/forms/Config/BackendConfigForm.php
+++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php
@@ -109,7 +109,10 @@ class BackendConfigForm extends ConfigForm
 
         $backendName = $data['name'];
         if ($this->config->hasSection($backendName)) {
-            throw new IcingaException('A monitoring backend with the name "%s" does already exist', $backendName);
+            throw new IcingaException(
+                $this->translate('A monitoring backend with the name "%s" does already exist'),
+                $backendName
+            );
         }
 
         unset($data['name']);

From 0448323697bf86701c47fe8acec32f71fd50acba Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 23 Jul 2015 16:18:44 +0200
Subject: [PATCH 2599/2920] InstanceConfigForm: Translate exceptions shown to
 the user

---
 .../application/forms/Config/InstanceConfigForm.php          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Config/InstanceConfigForm.php b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
index 652279722..27e1e410d 100644
--- a/modules/monitoring/application/forms/Config/InstanceConfigForm.php
+++ b/modules/monitoring/application/forms/Config/InstanceConfigForm.php
@@ -95,7 +95,10 @@ class InstanceConfigForm extends ConfigForm
 
         $instanceName = $data['name'];
         if ($this->config->hasSection($instanceName)) {
-            throw new IcingaException('A monitoring instance with the name "%s" does already exist', $instanceName);
+            throw new IcingaException(
+                $this->translate('A monitoring instance with the name "%s" does already exist'),
+                $instanceName
+            );
         }
 
         unset($data['name']);

From 073243364dc64db54305ef92c25ff68e9f203b01 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 23 Jul 2015 16:49:19 +0200
Subject: [PATCH 2600/2920] forms.less: Re-introduce class control-groups

refs #9602
---
 public/css/icinga/forms.less | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index cfb26f801..ec0550739 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -190,7 +190,8 @@ form ul.form-notifications {
 }
 
 form div.element {
-  margin: 0.5em 0;
+  margin-top: 0.5em;
+  margin-bottom: 0.5em;
 }
 
 form label {
@@ -277,3 +278,18 @@ form ul.hints {
     padding-bottom: 0.5em;
   }
 }
+
+.control-group {
+  & > * {
+    float: left;
+    margin-right: 0.5em;
+  }
+
+  &:after {
+    content: ".";
+    visibility: hidden;
+    display: block;
+    height: 0;
+    clear: both;
+  }
+}
\ No newline at end of file

From 44643a6c4b63b5f16bf112238603fdee9b5a16d1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 23 Jul 2015 16:49:50 +0200
Subject: [PATCH 2601/2920] PreferenceForm: Improve button placement

---
 application/forms/PreferenceForm.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
index d098cb781..409feb751 100644
--- a/application/forms/PreferenceForm.php
+++ b/application/forms/PreferenceForm.php
@@ -205,10 +205,7 @@ class PreferenceForm extends Form
                 array(
                     'ignore'        => true,
                     'label'         => $this->translate('Save to the Preferences'),
-                    'decorators'    => array(
-                        'ViewHelper',
-                        array('HtmlTag', array('tag' => 'div'))
-                    )
+                    'decorators'    => array('ViewHelper')
                 )
             );
         }
@@ -219,10 +216,7 @@ class PreferenceForm extends Form
             array(
                 'ignore'        => true,
                 'label'         => $this->translate('Save for the current Session'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'div'))
-                )
+                'decorators'    => array('ViewHelper')
             )
         );
 

From 8ed816002bdfb92008f04822e6ced9912e3e9a89 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 23 Jul 2015 17:33:29 +0200
Subject: [PATCH 2602/2920] forms.less: Remove redundant margin from form
 elements in control groups

refs #9602
---
 public/css/icinga/forms.less | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index ec0550739..d45f14a28 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -285,6 +285,11 @@ form ul.hints {
     margin-right: 0.5em;
   }
 
+  div.element {
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+
   &:after {
     content: ".";
     visibility: hidden;

From f06be5c9bc7f66f202a4482ff1bb1ea83856f105 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 23 Jul 2015 17:34:09 +0200
Subject: [PATCH 2603/2920] LdapConnection: Let self::bind() return $this

---
 library/Icinga/Protocol/Ldap/LdapConnection.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index 38440e029..841e855da 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -314,7 +314,7 @@ class LdapConnection implements Selectable, Inspectable
     public function bind()
     {
         if ($this->bound) {
-            return;
+            return $this;
         }
 
         $ds = $this->getConnection();
@@ -332,6 +332,7 @@ class LdapConnection implements Selectable, Inspectable
         }
 
         $this->bound = true;
+        return $this;
     }
 
     /**

From 760c7e4374f08f7d51c756e312bb7a68022fe2d7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 23 Jul 2015 17:42:02 +0200
Subject: [PATCH 2604/2920] LdapBackendForm: Allow to discover a connection's
 default settings

refs #9602
---
 .../Config/UserBackend/LdapBackendForm.php    | 71 +++++++++++++++++--
 1 file changed, 64 insertions(+), 7 deletions(-)

diff --git a/application/forms/Config/UserBackend/LdapBackendForm.php b/application/forms/Config/UserBackend/LdapBackendForm.php
index b5b2c966f..fbdfb5c00 100644
--- a/application/forms/Config/UserBackend/LdapBackendForm.php
+++ b/application/forms/Config/UserBackend/LdapBackendForm.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Forms\Config\UserBackend;
 
+use Icinga\Data\ResourceFactory;
 use Icinga\Web\Form;
 
 /**
@@ -86,6 +87,60 @@ class LdapBackendForm extends Form
                     : array()
             )
         );
+
+        $baseDn = null;
+        $hasAdOid = false;
+        if (! $isAd && !empty($this->resources)) {
+            $this->addElement(
+                'button',
+                'discovery_btn',
+                array(
+                    'type'              => 'submit',
+                    'value'             => 'discovery_btn',
+                    'label'             => $this->translate('Discover', 'A button to discover LDAP capabilities'),
+                    'title'             => $this->translate(
+                        'Push to fill in the chosen connection\'s default settings.'
+                    ),
+                    'decorators'        => array(
+                        array('ViewHelper', array('separator' => '')),
+                        array('HtmlTag', array('tag' => 'div', 'class' => 'element'))
+                    ),
+                    'formnovalidate'    => 'formnovalidate'
+                )
+            );
+            $this->addDisplayGroup(
+                array('resource', 'discovery_btn'),
+                'connection_discovery',
+                array(
+                    'decorators' => array(
+                        'FormElements',
+                        array('HtmlTag', array('tag' => 'div', 'class' => 'control-group'))
+                    )
+                )
+            );
+
+            if ($this->getElement('discovery_btn')->isChecked()) {
+                $connection = ResourceFactory::create(
+                    isset($formData['resource']) ? $formData['resource'] : reset($this->resources)
+                );
+                $capabilities = $connection->bind()->getCapabilities();
+                $baseDn = $capabilities->getDefaultNamingContext();
+                $hasAdOid = $capabilities->isActiveDirectory();
+            }
+        }
+
+        if ($isAd || $hasAdOid) {
+            // ActiveDirectory defaults
+            $userClass = 'user';
+            $filter = '!(objectClass=computer)';
+            $userNameAttribute = 'sAMAccountName';
+        } else {
+            // OpenLDAP defaults
+            $userClass = 'inetOrgPerson';
+            $filter = null;
+            $userNameAttribute = 'uid';
+        }
+
         $this->addElement(
             'text',
             'user_class',
@@ -96,7 +151,7 @@ class LdapBackendForm extends Form
                 'disabled'          => $isAd ?: null,
                 'label'             => $this->translate('LDAP User Object Class'),
                 'description'       => $this->translate('The object class used for storing users on the LDAP server.'),
-                'value'             => $isAd ? 'user' : 'inetOrgPerson'
+                'value'             => $userClass
             )
         );
         $this->addElement(
@@ -105,7 +160,7 @@ class LdapBackendForm extends Form
             array(
                 'preserveDefault'   => true,
                 'allowEmpty'        => true,
-                'value'             => $isAd ? '!(objectClass=computer)' : null,
+                'value'             => $filter,
                 'label'             => $this->translate('LDAP Filter'),
                 'description'       => $this->translate(
                     'An additional filter to use when looking up users using the specified connection. '
@@ -148,7 +203,7 @@ class LdapBackendForm extends Form
                 'description'       => $this->translate(
                     'The attribute name used for storing the user name on the LDAP server.'
                 ),
-                'value'             => $isAd ? 'sAMAccountName' : 'uid'
+                'value'             => $userNameAttribute
             )
         );
         $this->addElement(
@@ -163,12 +218,14 @@ class LdapBackendForm extends Form
             'text',
             'base_dn',
             array(
-                'required'      => false,
-                'label'         => $this->translate('LDAP Base DN'),
-                'description'   => $this->translate(
+                'preserveDefault'   => true,
+                'required'          => false,
+                'label'             => $this->translate('LDAP Base DN'),
+                'description'       => $this->translate(
                     'The path where users can be found on the LDAP server. Leave ' .
                     'empty to select all users available using the specified connection.'
-                )
+                ),
+                'value'             => $baseDn
             )
         );
     }

From ce1cab53c8dbeb19659a83b449f32f7427c0ac86 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 24 Jul 2015 10:11:31 +0200
Subject: [PATCH 2605/2920] css: Move button styles from the setup module into
 the framework

---
 public/css/icinga/forms.less | 46 ++++++++++++++++++++++++++++++++----
 public/css/icinga/setup.less | 28 ----------------------
 2 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index d45f14a28..2173532ec 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -44,10 +44,19 @@ input[type=submit] {
   font-weight: bold;
   text-align: center;
   color: #fff;
-  border: 2px solid #ddd;
+  border: 1px solid;
   border-color: @colorPetrol;
   background: @colorPetrol;
   outline: 0;
+
+  &[disabled] {
+    background-color: #666;
+    border-color: black;
+  }
+
+  &:hover[disabled], &:active[disabled], &:focus[disabled] {
+    background-color: #666;
+  }
 }
 
 input[type=submit]:hover, a.button:hover, input[type=submit]:focus {
@@ -87,10 +96,6 @@ button::-moz-focus-inner {
   outline: 0;
 }
 
-button {
-  cursor: pointer;
-}
-
 select::-moz-focus-inner {
   border: 0;
   outline: 0;
@@ -297,4 +302,35 @@ form ul.hints {
     height: 0;
     clear: both;
   }
+}
+
+button, .button-like {
+  font-size: 0.9em;
+  font-weight: bold;
+  outline: 0;
+  color: #fff;
+  padding: 0.2em;
+  border: 1px solid;
+  border-color: @colorPetrol;
+  background: @colorPetrol;
+
+  &[disabled] {
+    background-color: #666;
+    border-color: black;
+  }
+
+  &:hover, &:focus, &:active {
+    background-color: #333;
+    border-color: #333;
+    cursor: pointer;
+
+    &[disabled] {
+      background-color: #666;
+    }
+  }
+}
+
+a.button-like {
+  cursor: default;
+  text-decoration: none;
 }
\ No newline at end of file
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index 9ec689538..94fc0ea19 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -127,29 +127,6 @@
   }
 
   button, .button-like {
-    font-size: 0.9em;
-    font-weight: bold;
-    outline: 0;
-    color: #fff;
-    border: 2px solid;
-    border-color: @colorPetrol;
-    background: @colorPetrol;
-
-    &[disabled="1"] {
-      background-color: #aaa;
-      border: 1px solid black;
-    }
-
-    &:hover, &:focus, &:active {
-      background-color: #666;
-      border-color: #666;
-      cursor: pointer;
-
-      &[disabled="1"] {
-        background-color: #aaa;
-      }
-    }
-
     &.finish, &.login {
       min-width: 25em;
       color: #fffafa;
@@ -160,11 +137,6 @@
       }
     }
   }
-
-  a.button-like {
-    cursor: default;
-    text-decoration: none;
-  }
 }
 
 form#setup_requirements {

From 3b4bb6d8909ef4ed00022da711f302a29179c601 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 24 Jul 2015 10:13:26 +0200
Subject: [PATCH 2606/2920] ifont: Add new icons up|down|right|left-small

---
 application/fonts/fontello-ifont/LICENSE.txt  |   9 +
 application/fonts/fontello-ifont/README.txt   |  24 +-
 application/fonts/fontello-ifont/config.json  |  24 ++
 .../fonts/fontello-ifont/css/ifont-codes.css  |   6 +-
 .../fontello-ifont/css/ifont-embedded.css     |  18 +-
 .../fontello-ifont/css/ifont-ie7-codes.css    |   6 +-
 .../fonts/fontello-ifont/css/ifont-ie7.css    |   6 +-
 .../fonts/fontello-ifont/css/ifont.css        |  24 +-
 application/fonts/fontello-ifont/demo.html    | 290 +++++++++++-------
 9 files changed, 258 insertions(+), 149 deletions(-)

diff --git a/application/fonts/fontello-ifont/LICENSE.txt b/application/fonts/fontello-ifont/LICENSE.txt
index 152fb787d..7e9af2aa8 100644
--- a/application/fonts/fontello-ifont/LICENSE.txt
+++ b/application/fonts/fontello-ifont/LICENSE.txt
@@ -46,3 +46,12 @@ Font license info
    Homepage:  http://fontello.com
 
 
+## Typicons
+
+   (c) Stephen Hutchings 2012
+
+   Author:    Stephen Hutchings
+   License:   SIL (http://scripts.sil.org/OFL)
+   Homepage:  http://typicons.com/
+
+
diff --git a/application/fonts/fontello-ifont/README.txt b/application/fonts/fontello-ifont/README.txt
index 43e23f283..a91438a9a 100644
--- a/application/fonts/fontello-ifont/README.txt
+++ b/application/fonts/fontello-ifont/README.txt
@@ -11,7 +11,7 @@ webfont pack. Details available in LICENSE.txt file.
 - If your project is open-source, usually, it will be ok to make LICENSE.txt
   file publically available in your repository.
 
-- Fonts, used in Fontello, don't require to make clickable links on your site.
+- Fonts, used in Fontello, don't require a clickable link on your site.
   But any kind of additional authors crediting is welcome.
 ================================================================================
 
@@ -29,8 +29,8 @@ Comments on archive content
 
 - LICENSE.txt - license info about source fonts, used to build your one.
 
-- config.json - keeps your settings. You can import it back to fontello anytime,
-  to continue your work
+- config.json - keeps your settings. You can import it back into fontello
+  anytime, to continue your work
 
 
 Why so many CSS files ?
@@ -38,17 +38,17 @@ Why so many CSS files ?
 
 Because we like to fit all your needs :)
 
-- basic file, <your_font_name>.css - is usually enougth, in contains @font-face
-  and character codes definition
+- basic file, <your_font_name>.css - is usually enough, it contains @font-face
+  and character code definitions
 
 - *-ie7.css - if you need IE7 support, but still don't wish to put char codes
   directly into html
 
 - *-codes.css and *-ie7-codes.css - if you like to use your own @font-face
-  rules, but still wish to benefit of css generation. That can be very
-  convenient for automated assets build systems. When you need to update font -
-  no needs to manually edit files, just override old version with archive
-  content. See fontello source codes for example.
+  rules, but still wish to benefit from css generation. That can be very
+  convenient for automated asset build systems. When you need to update font -
+  no need to manually edit files, just override old version with archive
+  content. See fontello source code for examples.
 
 - *-embedded.css - basic css file, but with embedded WOFF font, to avoid
   CORS issues in Firefox and IE9+, when fonts are hosted on the separate domain.
@@ -63,11 +63,11 @@ Because we like to fit all your needs :)
 Attention for server setup
 --------------------------
 
-You MUST setup server to reply with proper `mime-types` for font files. In other
-case, some browsers will fail to show fonts.
+You MUST setup server to reply with proper `mime-types` for font files -
+otherwise some browsers will fail to show fonts.
 
 Usually, `apache` already has necessary settings, but `nginx` and other
-webservers should be tuned. Here is list of mime types for our file extentions:
+webservers should be tuned. Here is list of mime types for our file extensions:
 
 - `application/vnd.ms-fontobject` - eot
 - `application/x-font-woff` - woff
diff --git a/application/fonts/fontello-ifont/config.json b/application/fonts/fontello-ifont/config.json
index e9a58cc1a..3a7894589 100644
--- a/application/fonts/fontello-ifont/config.json
+++ b/application/fonts/fontello-ifont/config.json
@@ -672,6 +672,30 @@
       "code": 59492,
       "src": "entypo"
     },
+    {
+      "uid": "c16a63e911bc47b46dc2a7129d2f0c46",
+      "css": "down-small",
+      "code": 59509,
+      "src": "typicons"
+    },
+    {
+      "uid": "58b78b6ca784d5c3db5beefcd9e18061",
+      "css": "left-small",
+      "code": 59510,
+      "src": "typicons"
+    },
+    {
+      "uid": "877a233d7fdca8a1d82615b96ed0d7a2",
+      "css": "right-small",
+      "code": 59511,
+      "src": "typicons"
+    },
+    {
+      "uid": "62bc6fe2a82e4864e2b94d4c0985ee0c",
+      "css": "up-small",
+      "code": 59512,
+      "src": "typicons"
+    },
     {
       "uid": "b90d80c250a9bbdd6cd3fe00e6351710",
       "css": "ok",
diff --git a/application/fonts/fontello-ifont/css/ifont-codes.css b/application/fonts/fontello-ifont/css/ifont-codes.css
index ed241ebe9..78c477ddb 100644
--- a/application/fonts/fontello-ifont/css/ifont-codes.css
+++ b/application/fonts/fontello-ifont/css/ifont-codes.css
@@ -115,4 +115,8 @@
 .icon-chart-bar:before { content: '\e871'; } /* '' */
 .icon-beaker:before { content: '\e872'; } /* '' */
 .icon-magic:before { content: '\e873'; } /* '' */
-.icon-spin6:before { content: '\e874'; } /* '' */
\ No newline at end of file
+.icon-spin6:before { content: '\e874'; } /* '' */
+.icon-down-small:before { content: '\e875'; } /* '' */
+.icon-left-small:before { content: '\e876'; } /* '' */
+.icon-right-small:before { content: '\e877'; } /* '' */
+.icon-up-small:before { content: '\e878'; } /* '' */
\ No newline at end of file
diff --git a/application/fonts/fontello-ifont/css/ifont-embedded.css b/application/fonts/fontello-ifont/css/ifont-embedded.css
index e35b001b2..c069e28e6 100644
--- a/application/fonts/fontello-ifont/css/ifont-embedded.css
+++ b/application/fonts/fontello-ifont/css/ifont-embedded.css
@@ -1,15 +1,15 @@
 @font-face {
   font-family: 'ifont';
-  src: url('../font/ifont.eot?57837527');
-  src: url('../font/ifont.eot?57837527#iefix') format('embedded-opentype'),
-       url('../font/ifont.svg?57837527#ifont') format('svg');
+  src: url('../font/ifont.eot?12843713');
+  src: url('../font/ifont.eot?12843713#iefix') format('embedded-opentype'),
+       url('../font/ifont.svg?12843713#ifont') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 @font-face {
   font-family: 'ifont';
-  src: url('data:application/octet-stream;base64,d09GRgABAAAAAEcsAA4AAAAAdGQAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABRAAAAEQAAABWPilJgWNtYXAAAAGIAAAAOgAAAUrQhRm3Y3Z0IAAAAcQAAAAKAAAACgAAAABmcGdtAAAB0AAABZQAAAtwiJCQWWdhc3AAAAdkAAAACAAAAAgAAAAQZ2x5ZgAAB2wAADjXAABbDomYRs1oZWFkAABARAAAADUAAAA2BelT4GhoZWEAAEB8AAAAIAAAACQIbgTPaG10eAAAQJwAAACbAAAB2JmFAABsb2NhAABBOAAAAO4AAADuYshNFG1heHAAAEIoAAAAIAAAACABLQ16bmFtZQAAQkgAAAF5AAACqcQUfvlwb3N0AABDxAAAAwAAAATU+6FVOnByZXAAAEbEAAAAZQAAAHvdawOFeJxjYGSuYJzAwMrAwVTFtIeBgaEHQjM+YDBkZGJgYGJgZWbACgLSXFMYHF4wvChhDvqfxRDFHMEwHSjMCJIDAPFdDCh4nGNgYGBmgGAZBkYGEHAB8hjBfBYGDSDNBqQZGZgYGF6U/P8PUvCCAURLMELVAwEjG8OIBwDk6wciAAAAAAAAAAAAAAAAAAB4nK1WaXMTRxCd1WHLNj6CDxI2gVnGcox2VpjLCBDG7EoW4BzylexCjl1Ldu6LT/wG/ZpekVSRb/y0vB4d2GAnVVQoSv2m9+1M9+ueXpPQksReWI+k3HwpprY2aWTnSUg3bFqO4kPZ2QspU0z+LoiCaLXUvu04JCISgap1hSWC2PfI0iTjQ48yWrYlvWpSbulJd9kaD+qt+vbT0FGO3QklNZuhQ+uRLanCqBJFMu2RkjYtw9VfSVrh5yvMfNUMJYLoJJLGm2EMj+Rn44xWGa3GdhxFkU2WG0WKRDM8iCKPslpin1wxQUD5oBlSXvk0onyEH5EVe5TTCnHJdprf9yU/6R3OvyTieouyJQf+QHZkB3unK/ki0toK46adbEehivB0fSfEI5uT6p/sUV7TaOB2RaYnzQiWyleQWPkJZfYPyWrhfMqXPBrVkoOcCFovc2Jf8g60HkdMiWsmyILujk6IoO6XnKHYY/q4+OO9XSwXIQTIOJb1jkq4EEYpYbOaJG0EOYiSskWV1HpHTJzyOi3iLWG/Tu3oS2e0Sag7MZ6th46tnKjkeDSp00ymTu2k5tGUBlFKOhM85tcBlB/RJK+2sZrEyqNpbDNjJJFQoIVzaSqIZSeWNAXRPJrRm7thmmvXokWaPFDPPXpPb26Fmzs9p+3AP2v8Z3UqpoO9MJ2eDshKfJp2uUnRun56hn8m8UPWAiqRLTbDlMVDtn4H5eVjS47CawNs957zK+h99kTIpIH4G/AeL9UpBUyFmFVQC9201rUsy9RqVotUZOq7IU0rX9ZpAk05Dn1jX8Y4/q+ZGUtMCd/vxOnZEZeeufYlyDSH3GZdj+Z1arFdgM5sz+k0y/Z9nebYfqDTPNvzOh1ha+t0lO2HOi2w/UinY2wvaEGT7jsEchGBXMAGEoGwdRAI20sIhK1CIGwXEQjbIgJhu4RA2H6MQNguIxC2l7Wsmn4qaRw7E8sARYgDoznuyGVuKldTyaUSrotGpzbkKXKrpKJ4Vv0rA/3ikTesgbVAukTW/IpJrnxUleOPrmh508S5Ao5Vf3tzXJ8TD2W/WPhT8L/amqqkV6x5ZHIVeSPQk+NE1yYVj67p8rmqR9f/i4oOa4F+A6UQC0VZlg2+mZDwUafTUA1c5RAzGzMP1/W6Zc3P4fybGCEL6H78NxQaC9yDTllJWe1gr9XXj2W5twflsCdYkmK+zOtb4YuMzEr7RWYpez7yecAVMCqVYasNXK3gzXsS85DpTfJMELcVZYOkjceZILGBYx4wb76TICRMXbWB2imcsIG8YMwp2O+EQ1RvlOVwe6F9Ho2Uf2tX7MgZFU0Q+G32Rtjrs1DyW6yBhCe/1NdAVSFNxbipgEsj5YZq8GFcrdtGMk6gr6jYDcuyig8fR9x3So5lIPlIEatHRz+tvUKd1Ln9yihu3zv9CIJBaWL+9r6Z4qCUd7WSZVZtA1O3GpVT15rDxasO3c2j7nvH2Sdy1jTddE/c9L6mVbeDg7lZEO3bHJSlTC6o68MOG6jLzaXQ6mVckt52DzAsMKDfoRUb/1f3cfg8V6oKo+NIvZ2oH6PPYgzyDzh/R/UF6OcxTLmGlOd7lxOfbtzD2TJdxV2sn+LfwKy15mbpGnBD0w2Yh6xaHbrKDXynBjo90tyO9BDwse4K8QBgE8Bi8InuWsbzKYDxfMYcH+Bz5jBoMofBFnMYbDNnDWCHOQx2mcNgjzkMvmDOOsCXzGEQModBxBwGT5gTADxlDoOvmMPga+Yw+IY59wG+ZQ6DmDkMEuYw2Nd0ayhzixd0F6htUBXowPQTFvewONRUGbK/44Vhf28Qs38wiKk/aro9pP7EC0P92SCm/mIQU3/VdGdI/Y0Xhvq7QUz9wyCmPtMvxnKZwV9GvkuFA8ouNp/z98T7B8IaQLYAAQAB//8AD3iclbwNYFTVmTB8n3P/78zc+btz7ySZTOYvM2ESJnEyPzEJQwiBxIAxQKCAiKiACEgtpcAqWAu8vtrXEsva6qpV06J1u9oqYG39unXfLevuul3X9d2Fdt9uae3Pi/artVvbz/KS6/ecc++EoLVamNx7zz1/z/Occ56/85zLqRz3zu/5s7yH83MtXCc3n7uCu5r7KPdJbpKzBoz/cXDfx7ddd+XE0oV93e2ZWNgjqHPbWyOGJKdT2Vy5VLG6i2YQ0zk3XcU0vCufptvBSfeBk/5D5efBHy9P82n5sJtP0yw/njCPWXHAq5mY9QibZhJW3H7w/XJg84WKs0pdnDGr8fu3m5iMbMdm4iBtozdrGy1h//OsHJLZRsvTi/3dP7UQKDPvOY4jOEZP82HeiyPUxinPZFM6ITgMhpROprLlUk20inFSrJHuYlzkDSmVrSFkfGj5Qju6cLngDcWzvUkx27F0dLQrJad62mKGJp249anbhL3f2D24cGxsYbxnsNKTaiTReBR/ZrbUW+uHU6tvxTJkHye98847W4VOfjkX5IpcHzfErcI5EhzQr1ozMbywdmk5YchEmtsObBSrJQQDqsWqFDHAATGHIOJLUoP5UKkW44IFFMpSBcfOkApQI6ZIhzibq5RLObO7WAOrmJspsmRt75K5A7BIyA8ms608OUgRGxoHwRtIIGZSpjAyvrhhTkBO92QTAR2mX5jYPYE/uJPBf+JmWFgrLLl07Vy+tTU51CYsGnbz1/NDHR1/ZzaCLxIYs68cHBsbREr0lLJmNNZIzECjRpAWPYMxMtlHK0zYv1pzK7n563ulQ/+rvQBD/IKxQMQXjYKbjWMFOFa/4yfJC5zISccFDua2i1C1wIIN9rGHnoK7H9bg8ke+Cp99xCl7mm8hP+M8WFYGLNsq5+RcNVe1qpbMtzz4+i8efP31B3/x+oOv7/rCL37xhddfZ1fO7edhfpJvZnVVHutCJBlMB5PlZLA7yE/aT5+xn4YrzsBLZ+ynYPwMXGE/7dTjOH4SXuJ4rAcUvmo5GQnx+3915gzNmtVukItw2rPhkM+rCTy2nwy6My6YFCPYTxmCySC8DM8PFqavKwzCt+1j5As23qevI09OX9c5ONjJ+246c9NHp69jvQuM10zhPFKw7RzyGt+A1tPRbPq9Ei8g8qUCSHGoQRUfdDDxgXKGpMMJupOWWZwPyaLJm36QUp2QreLyd3mIHOkukheNuElCqcBnjUSImLHo4oR5/p/Y2gV+SXJVcinwZuLrWuicFtfOBVXNmjT1Sd2EyehGv0GijVFi+OsPdx1ny/S4mViawB+0WcFzGtayIuf8Bpj6OY7h8zTiU2D4zOEGKD79lzRH/B6JMHyyOi7EYqWKD8TEe8RdD4wxxqGP5iHwPLKzGZ6JF1wlxRYw/wg+b3gr6clUxfcG4qNGJw3/JAI1aYWDDLVQs471EoYRcO+fOU7ZCV6gpa2tJQ7LTReJDgcpjpMQl6383+LYSCgJ+rhhbhu3i67xj+9YPzrYX834NAEkilM6ZXQX+VI2l4rgQzgiySaFXUcM4qJlpFMFUi5Vy1l6KUAOMS1axXC6Ug6Wct1SJGi0RiQsxM+DbsQ1l5LL3WWW0x1JZSkduouUKSCzMGHputUbJpKpxKJFg583ouryRabZmC0W8ib5p+xQLbM5m24rwdaxSqHy232E7ONhedul6WIsIIBH5r2RivBJ/moloXR2pez/6BjogI7BvNjzcfhRugOWLQG4SZai1uKNPtGwgqauGWZXy1f0RP+cdUne7Jrn533r545tgUa7s+ESmCiHw932Vy65bocZjfd2ZE4S4Lfm44a1aCv57mUknShC12AXFHENyZSWwvNISx6fqWQNcxY3yIUHAtW4aYQCuldTJIFwMjKHapkueBnce66eRpq6szzl3JGWOG3mA7vQ+RGHZsDJIMOmU6cyr776Y34B3n/841ejePvd737HrzTC5/SMfo4nPN5958IGRI3/iobP+eK+c0b0v4wozNv21Lr5G665xv6i+7Bw3efWzb9h61Z792tGSt2vKPsB6FVNGa9FMsqWM2ZK2yZJ29RM5MwWNWWxNbCVvxJx1blmroObR9dAeW42aYYUuqaBzXqdUOjjEHZSkHKS1XdlIjIzuaUawJOHfj648x9++uIOfvDn/+39nned3E2cxK6T8GhX59XZwSzJ19qu7uyyJzCZG8xmB3OYOnVRHjmIb4edTHpzx+1p/iz5DlvPacSmzNW4cTpuSwfn9ZQ627MtZsAjExw3XNIpKU4qYbzTRV6xqhXkXn7kWzLysEq1km2tZ8FMmZkHQ6aMIEeFN0HBeCrf20Haatkb8U8oVLp+cSkfaIzxPcmK4ulYPepTG2FVvr+NdPQU7PvcMr9z71+7QjPO/5ehXTF+6Fv/8K1D4/8Sz7OiYLoPb/673ih5A//OdyTbl0YL7cmB1nqRT7kPV7j3H352XzB4y5HN37hjbOyOb9TlzNNMP1yJ8mKQypnWWeqX1Y3CAzmYNUtlq79rhove4SVZTl/Q6iym1UWSDu82+bOuhlW2f1Ke0cCc5AUdrJzHWX9RNjQ3dwC+uX+GxW3bFrfeJ4FFL0rn49vinDuHH8Y5rHEpHPExOoeXDhQzDX6Ro3O4G1dhOY3LUAbDXZSIQtDBIxJE6Kk8DNPFmaasPI0E4HEuRJiACmO6O5eWu+k93B0mf3Ftm0QIARDs/5COibp8TFF82zRlm6LhD16xn3tJFiVF0g4shHkvCYqkiJ7/8YmpfOMdjflHcret/RTZcXOjSjyaJk0vluRjonhcjfCcomnKNKeNHihCTpNEIAO3Fe3vCRoqFmQQftvfPz7e3w8fsyfpuF6McxG1fsR5qNRVx7n1As7i++J8MV58nQaylJuhQp0IH4A0EWah53EIIPDgksDLKNDtIK3Kn3wPzp/t6xsf7+uDnfZhcuBAN+IvitiVQ4Lv+yV8HEQ9GvXYJ9hcLnAl1KO7OtstQlmUifKLyrBsDrUOC1cowUs2VxAqVarQMuWj2IpTlg9iQZOfas7nmztir/0gkRUMj+CNxo3gug0NQqOmC4oylMEV3wre3wA052HkBy+/Ar/E1QWnMPW3Ia1UM8KZWMoMJmJ61DeSGiwMxEut21pLpzti098nxuPWvZaj838H9bACtwBlsfLMosGiRmGla8aQLYQYR0TW+TSqfChx8RmFarY0nw4a8k9UK8o5qj23QLKKOjSdjNSySlKFmke1Z3/rLs2Ie3YoYjbV2zDc3JOPa8pmT8BnKh9L7KdKkG//NR4z5rkGTm/wxKKCcg2+tX9rP7Dlnq3Qi0rThsFPeGKmZ4csREM6vGV79aihKLu84bjnk/PXGnEDjl6jxQ3tmmuwI+2aoyaURrdsoXNPmrE5HfnYxLWjxoG6RrWrrcUKOLKR6hqoY+bwrxUVBZilCVpJxwbMuemqm76gKRZN0geb7ftPkf7pk7Dp9GmIm/r5DUzn4R9ht/dNDYycGj49PH32MHtz2I8mCjAt0VGyTAiwG31lIn985/fIH6MoMwzkj0GZ6uGmDEHK4OmaKQdx3SBAvF8N2r80ZdmvTWr2L0PhKHnRIk9aAfuX9rWWxnsmNT/4IRyYS+fpNLa5BtdmG5unxQ6fwMZeJzjUVUS4Ylqmq3JRuw+FUQ6tKKoNYM9oNlWDbJzXDO185Ikv7hjl1y6L9gdCSrTS3zG+ee/GiSzfX4kq6X5r2Vr7AZQ9QOfn+o88tGtoaNdDH9l8rIZlrf7gnL0Le7cuLRSWbu0d2p0P9XYpoXknYMS+n85/2IxXjmf4/yWO5TLuGu5jaC9s33TVyqrEMzrwKA3poFCNFoEsI3dApb6Srd+rzkMJDdb5zDqsESvCxs+tKlkmpirVcCVnipKJI0+VnyyOPNWOZtK0pMz/uem9XxtonZ5uH/frPlz9AgghX1QkgiBrXpMHgRDNpzXyAkHmqoqS5BFRR47I8JdzOrz3GW0lu8nvFfWFhA/EhccFiEw/RyQFVig68RJFtp+UddLLKzKswJXn4ekbxSuQ4USbLWe6oL+jNeX3yaIuSFJjpD8imR7VZ9QMMYr9+/TBiGCoXtkT1AwtRFkeiANttjSYhaA/F9JJ1hdWgrIGXinDrsfdZy9oisuvzzLbKYorpofy67mJpgbDJ1N+LaLtR1lVGrkVIw+KVxMXRiXcnROD9bVBL0FnwSAfoypkBJ6Et15DWXjqsCbbe1hncKesTX75y9StMv0azin7X5moJVdjMa/y04B5BWyOW2enMhcAtD/75TfsO1mxNYkIeYM9PStj4VKUk985h3PkdaZXjXKruc3cx7nbuNupXnXwU7ftuXHLxqtWXdHTJFB9GJmxDgVSsUST6b+5VlxIpqwz/pbLVum06S5aOOq5bI6+Ql0xW2Hv4mCZcgu0OrqxLOI0yaZTMs4SEw2WGrCUDjQVtsrIKnMy7SLdApATI3ILQYKIVexPJlFmN4WExuPQFBCDw3JYtj9ZE3iFCJXO0fGlXd2yUCmMLitkRWVoCHloYdlooSLwZkPn5eOjhR4eZ0sNPoXVhoNiYPqGxtjcUjUfwVt3z5yGubFGc05PN94i+eq9lZDS4QdBBdhbgfuH7RVrRAEZoB9eHbZ/eB1IsN6MMWhSP/S0KRlB+F4riTW2jzd3dnQuyuMtpIhtc0Q52Nk8nk/2mx2dzWMdTU186/dEIaPmvJdHR2NJIzoST9qfiI1aRpJeYE9SRsnVqBPs+EAIFmTeHCiLvCyC/1j6p5cTwtwELh/ycF74f+D/40LPww/hW2ji3EdZODJvOlxxYBo7rl6q+hZrUKZDZGVrZD5I2bIhl7JSuSBQOwb5VTZFS8uVXFauoNFXIDh+koG2LurMsrOkqWjDBxw8LET/ilmkZZqu85xZZbaP2W2WckVWQLJoYWwdDclKNo0N0zQa3TgXUlJKMmWcIGYn4DPOnpKVk+QiNlFGfd3C2rIp0xmEs0SOE6NqylgPa+ayktlNG2pBiKpSC48agUQbLGMpBCKHNm43TjO0ANCMl4txoYWnzgnKl6sptq5wNlbK2ApeELpSFs3gCqKLeBlSJF3B6VfB9zLOSJ4yb5rOUeSoTyDbCWYFW0KIzWqcIHkqVdOinpFsOVem0p3ZgLkilkghNDXoNtmtalaQlaIpkqZpXACVYhlJwleqWRRGtF368wOiFkGK4bNEqZ6tZCntK1IEh6gAVbaSMMcyJBOe3PXCzp0vnP2HHdLN34IQKDzyVT4YCePaF7w8jpogaKisgYJTVRAEIkggEUUVBVHkQfGCGJNR7VNwdhBZ5QXkyQRrIfsTUaoZehj1WyBARJVAWMXaoqTxiiCLPJFUbEtUBZHniSiALnv8QoDHRgWFgqFgbzzyciEk8l4vYCFvQxPPK2JY5D2Cz4MdSYIiqMKyoiASCaGJagiDKCAQAjD1UJPlkCCruLAFomOa4HogxI+WKxrNIgiaBtiC6JUJr/CqbEqSqCgBwcB2sHFe5wXQRCWoEarZopwBjfBeXPxAED6eyB7shygGj1o9oXijUop3fCdEeZVHCHgf0Sk9BMySEAhCsZIVUfYiJQlB9BkkMl5DVHyJXqKiEFOQWlhaU33qDTuXgRd82EIEsBGeAuJFBETQAHtA8DUcI0LFjZdiKHj8QFTM8+w6+frJXexi/ycoRMLhU3jRA14shCwdcUbaApG8osRrgCMMFEskM1BySQRpj5xKFiRFkwVREr10ZmCmV0W6iIgEHyS8Lkv4nleJrPES6IKGLYqImCbIsgyqqMgK0omn5MQZofG8TkTsSBRkgpLIj0QkiLyOBXiZx6kGMPcKnGs4hpJfw/HFaaarhoeA1EjAQnh40eD5ABJaUERFAI+lixQhwavogg6ax5AVEJHsOBAhXhMEVAMIr1Eie0lADSNSAkKioaCg44kkD4h+keBs9CDFBTpyuqqLKuDUJHQEBR4Xikj8Gh1XpADOPwv1CxwBP9E0tMJ4waOKdILgIGBJOmlxYmF1xBDTOIUAR5nYvshKHF/s3A90PeDcIEgO2ihB3UaXCC3FZhbSRIwpQVVXvUQIyKiDvvPO74UunmrS0nGd2eiOxKe6YpZqxGi70EvEkOMgdO5bOz11/T0wPgCP7159OJWr9E1YI+v/Zc0+OLJl9Oa4X939+Max9ERfPh3cRX0A79jvbIW3sf0Etm8Iro4rpZFvVcOuYA7XgFmGhsxTaQxvaJL9ihxQVI3seJWIGo7/TURXnvXoZMN/ikhN0+ObvlkHPqDAd3pAVnzwz4qmI2Fsu0I4ccbvcGFfyj/gXUL3odJNYQ8vzm2vvmsf6D3poJMuB/9wOvyu9CSzRtnl1OxHebusscvpP1igUH/QBo7TJ3r57/a36SMM4vWl6bP0mUTxCub5F2mCr+CVq/vjST/8ktORthqjbd3erlsy2jlPzHPOg4rRW2iG/KOOz/iLUfODjj3W74N/dOoTZ+xRASxA3YvcZ/htL1p0XuYb1v6KmjJxD/X7etz+4Xqyj/NhfQ/bRwgaTvdM1MImI6GywrEoWY1WnulxwXHrLiD7Wd+eC7BTitYA+4YFGgMUy2uwXneRcGBxfEv/h/86mcNsJwa7SlU+t2tLdRAw+L+yr0XQ7Ws9nnWeuAZt0OaJedd5YNK+zuOBL+C7dR6P/T18jQVirN2/Ibv4haxdf71dilJVrTeO7ZKt2CRtyANt9vfcxh/S4Ab7Gk27CpGEObQnz1Ua7Tvm7p18nSy+0C5qi6ncTONuu/xf0Zbs72GbTusP0bYe8mxbhxNgjn1a09yenGZdeO+rw0ttSJWYjJI5t1lKBvKZGRQ9lBbYAEWcfAV7Oo2PCCY8rDkNX6XF6767g+T/cHFst9Eza24Fnd2GclC+CHT+YCQf6YscbWsZjuePGv1GPhKBbUY/XiJQipmYPGrvac5ANgZ3Ho2wwpgVsT9nur7CO/gy+aXTnzMfZKhPpqTrMkzmZoaALxtYtTeSN80v0XYzzXDnl0zsptfEbqE3btj3GAhEf+RL+TiCBEcjDCb7c8ZMf2uwv2bsL8zwYzss1nuJ52cbR2syzfYeF27aMmzHnihScCcitd5Fut3NoJhRUI62OX39C38Q+RHFLXwBt/psbaG+MbqZEwlWWZdIS4ab/blIZA7ejyIGzfmj2HM+AgcoZkjb7UafOcfpPw8dMRe4Gb/rWuxvIfbXodL+ZFTs6l5ValLnZKqm1V2sLVDNOby4zv/8qAnmsuxRjjCHRI5894UXxgNzjcA5S9WCyzBBt8HoZlBHcBxTHl2WTVM/Z4VpclkwjHkmMntZ95AM5ofC0XO6aUVo1WXBiIVFo+EQq8mrNGtugOYE5tIMFaEnM3hEuS5OeWZu0lCIMw+ppu+GCVBm4VAN6AYA9Wa5k4Y6sViMwKPiN8c1w8/2rWKe8W9KujQgwglkTu6z+Nwylm+CqIjfXKbF2QYX5TVYQJovwf+eldAltwTn7q9/k1/O85zFYOxoCTMYcS5l3wUKCzdwYaeEp75Bcwb2JxGyZd8UA+J8SfrmOPI6JAg8euHRiGvLKLAITC+mibrsOVEcwPJYArkk3CBLzpM+K9eZC47tP4RzoTt4gc/OgzR1610QGH1QTkdms+9mtstWn6IM6gj1xbMZetZz2BM3To8gT59ExjGJYI6cRtlw2DMrA7nNrAzKxT9Mudktz8g5/iwJztIh6jgk3wVx8mL4pk8aFDYKokH6L4biop7rvTF6waeRXrSvmBdcv2mQBibMIhX1mLh7aSbcaerDw3SCMErgTKLNEdVpnDyMo0fhqGPmwoE/Zie/g+MzxfvYntEiTnt2Xmc+16jwzhzKpd34leqF7Y+ZPRCqmdW3vYGRgW6OkpqAFif186L0l/c7Tpb9zN2yX1Oo3wUTI/d89/PC4X+7C1L5fuP5jbeMH9kyQPq3Hz561009/KLnI3CPU4u6dJxa+6nqsV9ruP4I+fyL90l3UUde5PlFta13f/Hwjl5hcPPnL79l4/MRzsXpKbT9A5zKhRAv7dmE5dXQVEGcSjmgMRqoqGfTaNTLRivdw+MpzOQHXfaVS9fWbhovTr8Cjy5Zt+KucSA/YH7ImxaTwV0PPfXg7gHYsHbUXlcsju+8AR4tjt89fuWVqx/Zidm7Hzxx/96aNLr9Me4iuvqRe1yCMMxpMlH1q9N1lrv3A2lof5tRDwY/LN0YwT6YVDRe4ilS471cgMtxVyKMq2uJiJfRiXliS1m6/Cp06iGQJKUT2WghptVdYb6sqiHjG6o2u39SWidommNFqrmzvwJhG4V8nMADXq9O+pvpOMYqHauztaVLl9aykA0GR+RPKsOSKWWHL21IJfhGXW9QMg2eQrFLbcyA3KDrjSSVaOgtjm/ZsmWsQoK0jYaYFtBC+ea2oUI0Whhqu7QjFF65bNlKqVHsuPQj85s6as3+FsPvjzQHfL7GWEOMJKxYo88XaI74/UaLPzaQj83/SHVDLUPaejde8Bldjfze4JJcAenR3toSDdTH7IJ6Xl8BNNSDp6FB1bofCSkFb2nKMWeyyhlFO7v804/dNU4m7vjK7atuqfsi3nruVpI6RzVzLHESC393xacnyPjhLx7Gkp9e8QnXtt11kvlO/5WfIr/gwmhJLOVupL7TLcuGS/lokO1RBxmjn4lIoxsmYZRNEotmqvF0e4WaUhbzMc5kVOkIlpifiplYF2VSh3eN7tlnmYeyXoCJiOeOsA2EI88hQzvdlRNVZC5eMxAQlKgc1ATDr4q5rskNlysSCrNIwjOnUJjjSUQMv6yMrb/78G5ZpjK5ocFYNEZGh40GIcSbRkCWdx8mh6cfoVzrOVM/hX08pxn2/8yP+nkj4A14vbFMzCvpihdr8/7R/MojCd5ElhlQ42u3rI2rAeShJp+8e9Vt3ytihuHz6nr3fV+5r1vXeYn3GZjZfcqVl3g5SJ5m9FSeoWQkfyIZPzwh/hSc6vbMkww26Xiwbs+8G673dP/eXpxYqKd5jV/BUS1sCc7lkUW1OTLgXA7LdBrXgKpjwPYOUzkZmWKlSpUZtrfNdrV1oPE+1DQuZ3OzdG0qinNUY7SK5r09Uerh3f3iltGWeKXaf/0RMBIhOPpnh/0mCQXtB6gzOjC5eN5hMSAUJIk8hSpEQfy+/ejWyy5dBwsv7a0Nsw274Th0vjg8ugU8ldiRLe67fV/3jZrUBDNH5exhCSsGBPI0uy+yH4Pm0a10a5TtjT5NDiKuOa4bx/SSjkbN1YEoInGg8QoF6p4so9HPkES0zWKFaW9mLmjQHVNEKA7k4NGbJ1nn9gPsNvlnj6HOZgLyXYL3yS2f3wx0F/EfZwPn+/o+F+ItR1zg/9H+yegWsn2EAkk2O3ra71HfP4nSYABh7I8Zzr6Y7OpC9RGmShlaF3V7v0qV5RpYdHiCuGDTqVKWOl/dlyb5nMf+VxTqbkwUSnbo9Jxcv/AYigHqJQRFOdZagkrmhKQRUn+zcD3VQuyXUVWYcibNFJ1A+OIZe+/C9ZriUSWfrGA1uANrC0QR3DfruTou28h3kN4Mlw5dZjGdJgshSV/wSqCSTV8h1JIcNFBwFFEOzELZiYp1UYZNpA4dwq9o7wKfSIRIFNmYiRom4oqrAHEtkJCoqwKsXwh3XAS5vdeBHDr+MKb1OIIpnDc8rrg0N0x5aynXYvllQvelrGQwSbekcBwkXCsmdW+3vitdnYkrdAWD1e0ors4TU5KG+dD5N06jUKZSAS/whKak6TNeTnfEzr9BtyRHSq2Z1tKpSiaNYKOxdQXp3zZFC1186Zgu09Lkn5rzFbZXX3FveQ41jQv4XIjdauJaELdursr1MU/Ux7n0QGLDiiVDtf7enkqpsy2ViMcao7Nju/yIO6re9C836w7vuvNlNiFp/IGJdk4FZpWvunmUTtXuD0mnqam/O3bs7+pXeOD48VPHjsETU1Onjh8/Wd9apNcH2KtTU1OhD0PJqampzLFjxzJT0yenztFL5hh0TbHGptgGYBbzpqa2zXr1x8jMeOtu/hHUExTUFKie0NIQ8khUb6rWwyZbZ/wqcWhFPQlyVJOqFk1m30csZy/olBskCVvtg2is96FVvc+cgPu8TQeuoKwksbhBVb+0neSXJP1aPTDynH3QMOah8Q37qhP/abYuWQ9HXr6bGAEpJK/f308a5hoapzL+T/kNPzMLqCdyIc5ya8BYNLRgoFYtZJtjDdGIoQnAqdQnmS63Xoh9ootzPtDAGHxP7zyzxV1zAMfNsc0vhMvToJowljt5Eu6kK5RGGehn7fj+/fwae9N+Go0QYDEJAeYMdGMSdFiwf78dHxgeHnGr0NenhochPjIyfXJ4mBysV6NX+9V6PRrXMOwUc+Iydgqd/GU4JiHE9hbuWe43NC7jR3/76O3XdTdEAjhANM6bxr5R3i/SkbLoE8/C4XDMZCduUaZjhCNGYyAkupXE/Kw5JgOpNkR13yyNaXQIVKmiEkVf0k21CipWjPOhkLRQWFuoFbMm6b4aUEcG05VZfAW2htzSaTLLPB9V5vHGJumKqNI5whqgAAVn183mWN33rVopXlQX3nJjxp/s6OkAGjLh3r+niKskb7hFEHyDHkkciJiSLPi2SJovbA0KPmlcEDOKT14pKlhQ9tCC3iFNkgbCUUnmaUHwhc1B0ScuE6JBxSdhSdi0QtJiZAjESLPH65E7eBjimzV5xQpZa+ZLARDySjAYswSykMRUfO2WziustPCewl7Ne6E0rHei1X/S3EHaWnCJkjV46cvn//l6BEYPW02tklcIDgpFj9Tf5FOklZK3KAhL/KKodHijpg8U+d0lNaW/kZX0XOKUjEd8TWEvUex/GVMVvz5fJ6StqRXAU4I2QjDtV9QxVQ34aE5cLaGkbbMgR7N8AZV0Y55TK0ezvKWcU0nFSsqFStjoTCVlxtek4fzdgjJ1WUKi5ySc8EucpK0Xz83cH5ybzjx0JqcTcPsBk5MxIzY3Sd/yvcvJql2rIKbIWzRPuE0S/eM+Wb68oVGVhcA+xRtosq6QAtJiUxCVNs2vbEYxq4lbFN1qdcoql0cbVYUP7kMO6o+Z46JfHjEEoU9XNyNndUduL80NxCNNRdQEI+Mg9vuUpbGAJl+vevtFaSAu6jhk/liTH7wyK9vQmJgre2Vj3CnqVxRWVFwYw6KXs4Kcs4/Eh5Anj6PunJDcfSSmwReA7rFTU4YShinyzP7pphRAOztOaCAvmrZIhzIaQoxAVRqbhLojpRX+50NeyXNpqTsQyyh9lfaR+zqawpqiCDIPzS0xvcuvCJohGYZMAkoiGwdeAD2/YymERI8ka/F4wisHomRB2JvjyUP+Lj2WiAkaHzGaOu4baa/ErEAooftLpR6vhPZ3m9YW95NoQPGkGlOKqHh4Ey7fkfcSkYd4WxyUAGn1SGENFRiFyXwabxXmGlHOr+Wu5nZwf8bdxkUGQvtv2f3RHddedeVYNdnETDCcUHGI1ENq3GgaC5VkurUeDjJGngwC23CzTNlIu9zGYVglN4YF+QqdSqhL09nEtttpJD3OLx3CklVh5E3Ng1wpx+MDJT7dZ8ym0cio8t0BM25Nh5yjDW+ZFf/oK6L8NemFszRaZwU8EWpOJpYHVQWAzzQtTd2yYWVRkdGKI2KloIhI7azhUxQp6PXJmog6otxi/zre2dx2WpUp1VHHlRcvXQGS2h7zJwKwQR/INymE3BooRadvZb3y+/BmBrKvBOSvyeefIv1x67Xzj8ESPSg0+QJAImbIlzxCN0kl3eppRJ4GnfOXLi6sipmKt5EHcyh3pf1r3xKzCL+2ioJBTJ5q1l7F/kzcLyqt87pqLbIegAuxqhfGZxnVMXMZZzyEDzce4QgNUUWSl7upnY7PqGBFumn0A93GzPFp3nnGWt3lDyBwX27d6hEB6P46ISNrrsx9GcfETS6bv4y4O+XV4oeg2Ft99iT4Pboq6mAI9q/hY319v/XoXi/q5NBlv+xTBK9X9/y2733oMK/1T6JDNUIVyxqRuw0aWJKmyVzVoYUOMwTApCV/ABUe/0K+l8cRRgNBIP3tX8pu2559cM6laC0gKXipL//F7NYbP5gCB/v61goanSiCwK/t67vvob6+NbiuQZTkNTTpnk25gHc3amArqF4yOtRbKmQd/KUPOQ8cf2GzezKtLF54pqpI97vTH0CDSRotR5Vnew/aJA/Un2a/1ZQPMQt+4vqxNGXNBRtn8sIjo8HTjDc7++F9SIPrKQ2uXjrQX7nE2ROXHGfH7D1t6wPS4WAyaMQBaVID6Ebxl5ZkkTnqXGMjF0zXXXaUcXVTxk73Y+J/EM7DLhZoYIzYXkUh8DJRFPvOc02C+LQkwC80pVJqtbvQqijTck/k1A7zmNmh5J5E+j1rP89ot4DR7g8/2xtJcPpXXkPTDLJpATIvcQX2OP2rwtBggYQZEFdFYhA3rtLqeztb2ZkOi5uHOkFvysNRnYD5rREV5Lso4i3mzy4AjWVLpyindRTybCWF8p+Gpc6n6kCpBgnqnNz5wi4Yv6zL72tcuSjakkthmuz9W7jt9p/fkcvv+POmDK+ggiIQ3iv4DNkIyP7VG+H2n0Pg57eTfWOHltZ2zolVinPT/RFeHDt036Ex+9Vrjm4QrsnKolcFool+UTeVWCycLx6ZwJwNR9mexg0MjyzK5pSzlzsDrMRgzV4MKz0OCvzZGaA0GkVzMUzjh7618Y6f3w7rne4VAbwaEEXgZwNw2aENPQiBQ8unGAyt3BKk5WWVlBOTPptoZTTRyvNJRUYmU3VoVnQco0wPaOGZ6pV1ozeZy6xGpRw9sLr1xLau4uKVkSYieWmgFM8D6ie6sGgMtp44dWLrqfEh0as0qYIo8EgmpSmycnGx696bEsG1RwcXLQXfyAQ8evmhpeollkjPPQgC8BI2EhejoUDbroVI+qWHfrBwd043taSHFyWKrAaCaF2ijvLFztLto+353F7OtU8dXCO41jagfbrusrSpcvzsuVOfOVBCRItxQnXKP0IH+CAKGBLcufLzq6C/XAmH/Q3x9vzKe1avvmfl1q9vIduPbX9/2pDKB9FlnOzr3Xjp3FXxRMGjhSSld+NNm3tGlh568MAY/BFyTe/646T677tdWm3lT/IrOC/y50GkVSVp+DQaAy6WmPM3Rb0bxdZkNuhsgUQCImUxdIOE7omVa4IbqVQDJ0bJMuI8TKvJLgj1tqn2XeTU5xpLy7cvLzWSx/LN51AJPtecjxW6MiFy6AYx0ZEQtx4AM1HKb1C6kqo6pxf+8nGYE+vvSaV6+mP26ceb86g69+Wbo8WJ9bdfMXEkoHlQZ01FPFrgyMTYHetWddV5hYMHjbtvC2sSeTcOfwrc8PcfEtYPA53rM4QuVwYozyDLp/7P+nH8+vH5MM+8hdkcn3WPx1/wCQT9rtHvB8N/XDfv38/cAPupK4HU7BXMpQBPsqMNnEB9wvwUO6fhxXXAzvZ1xcMB7Nbx7ZXpf9Z1Ei46s5ueOelad3R0Bx3Jy2KzqafqFD0zAm+tMRP2A+Rg/YSrV9qfMKfPmnG2cTnQnklEYI9V8a/0RyE9tyZPnjqVMNfYe5xjukIgeBbNojX0QNcar3S2YwCgy0xE9ZWBijlZQxxE5mf9KeJAz7VeytW4ERpHtnCgvzcW9iqEE5GA1RxCFKGBsZKJPDQcueBnQyXCYpvGuWw66Xpgk8XKPBawa/IWpMsg55z9fwPeHFg5UIaIqp5UQ/iXWb/Q7qKeWHg5HVd5uUnRfF4m/CoZeLm1JGaUaHXKvnOKfLR7qjvQEVgZ+OsFKxe0VOBIvQn721udBgbXgy6EpRgyZ1eAVjKLZWxBgclH7DsfgUIJmwhMBDpmzux1ch0oK9qiM7EqbAdaR/FuGWiYoLXr7CxWK8m6/5g/67F/QiO99ldXrar1pAwa4RqUBEXih+Nr4fB+I6FCswd+6dfsVz04laRQvGtgbU9LVkCm4tVE3eAfvuqjS348yTzEr3pmnyEscO0IT1pmdqWfIKOknwagOnmpILKthpmQHXomMIEW49lhSUbmE1KQ5fFGqqe2alWVwoBAehAOCigcXhv/8VUP+4JoPXoV0eCzLT1rB7riIQlh8KCeEtfwYvgnf7xk5lsKZ/kyZ3C9uIa6Yz53DbH4GKd7VAFlybBEtGjpAQEa3lihRsJFhSwsRR1Dm9ihHgegYMd/ejz8hlBjTPEKHh4FQnRFZveVEUVi9EJoAlbk5zes/12OHvlxYQuGrdwPPTHPbxITixcHTGSy/jPr2jrku2aX0VTrz/3br2G89vcol/ZzQS6FmrD2bFeuCYlJ5VI2R/eP6RchqlTaJujBUzklRVC/q7ANyIqICAiJDHVnVDpAQAJPrbwtdeTlI6nbVi75EQg/sr8Z8CzeGDADQ12eAHzfM2a/bf+H/faYxzMGCmRBGfNA76EFvQupZ3Vh74JDO++4Ay7DohsXeXUS0rqGAt8Nhz91//2fCmeN2+4nD91qODT/a/5y5uttRppbPpn6ZcLMz0sq9TgqxxlINUyciOfcE7FkpWG/YfYZ9sci8Xzza80jEZg0yOp4nmQHMlKX/f14xH4jgi8jI81nm/OAyY9FXJn010LG7bOEdJqbov3yH9CvRV9S5gmVEs1KfwhwTiMIZrPRGAApQrsfad7PMiIfBGczexkIYr0+mhV3oKfr5fdsLy5NY83YmTJHc6+bNuw4LfJRN4qPOl+tCLmcWRjsyE7CDNLdNsOf0U3qtYRH45b9bfZFAxg0E3D8+nvI3Tcw3k8lz3GnT+T1XtTtpOMZy42lc+UKEozx7ItgSDKxx0+ZOnayfO9yKM/uH/ZQh3rQdTP3TZDxedsvhmE7ja2YkWuExtbJTK5FvQLV0cPYAfUvi+9G3D0xfByaGWovX4wzNdUe3c46nLqou8333LN5e9zt723+z8nfcQGuiP2lG/X6/nUujaYvHf6gCmaVaXI0vDNNbciKs3HrBi6ws/d8yNRPTdIdMViA//elRJnIon2rfStWFdMCEeGzoa7wHSw8+GaRQJv9W78Jp04ZAZQpiv02ZOaIwMOg/W0sO0cMCDDm9++8kVo7P9ks6nWZv5nFHRboXnvanJH5yZn9zlkf07Ho0Vx+lkrAVIBNRsD+CRuKdJrdKMxpvzlru2DjMMug11POzdTt503yiW3scZujEzDakUtRL/Yz/lmOeXgXntxsHcTQeXY+cQYMFiuRkl03WIEd44oTuFNXbld1Xb1d0Z8KRLONEStOE97RfDJWWhw12mRNlq9UiLDmK3PXjhQ+h4XRRmFXWBQvpRIhzdfl0wJgeBoLy8P+VFcmoBdVYbEUUO5J9a7i3L1tJ45I4ZIIc4NHYuP9R2OGDs5ECXX0/sEooQMfGEVFedAr2ODr2G8Xix9YUE1qArUh5qENXTUtKc2XKRkidCOUxXBSDo6iEYdTlsrOtzSy6dbKe3LTKZymcvZnsWjLwuErfvazBbtWFZf3rzO8r9NTJK/7QmghrBzYPVGcwKpDy9+V0diQSD2pTczLwotPFid2D/ROlAJe9W5R5VHQTqpefwUAMGN+38QdrRU/ZkmKIBFyt+L1l0Fb6cj0J/gnyI/Qrna/c4PzLEDFY5WaNAFkSXK3nOuuATG+8sYbXzm8Y/HEtbeeOHHuBDn8jW/sI2+SH71pP/Hm6tH+E8Cd+Oq+7373sdfr8lnYg/NddHTcIFo0qINH6Fdt6HzqBLYrKOfYYgQ3vlXY83/vHObPGtqQ/bCkSwfOboPF9A78QlXx/QYn0Qi/9vwb5Bv/5dVUWkY68Np2LOKUMDXHhhE+ymI9LG4+jlWp2QorzN5DoeAq/TmrWJIpw6XGACp8KCuyTuDixbaAxWwBekyX35T6bx0xNAKWw2FVTXSFeslqQfq/v8Cl3ilIWzzULjDgwFYhXoiDsGhr8+uUCez5+5uYSdB7TQgcG4Hfj+/P7xGJWJYCwppQ+L2mgjZSehHzXT8hw8WLuOScs/2LCtl4EI0ywTVoyq5Bo1JnAYtKmzHJctUk/plh60MgSIYYUmij/Tu8Zm0e7V5VbATyZRflFfDYunQt9UznB6E8YwpBCB6/ZACo1Xb6nEODkRvurf49+YvKhyTA7HhZGhduaOy8Cg3apXa3nC5XadQn3byhij298/8rEjmzYs2V57e8uOnFRY1Xrpk4E+lvI+aZg2fMXhT5/ZEzE2uubFyEudfba9esOBPJ95o/OnAm4tgX30F97GlORdu3xg1xH6H2xYolCwcrqbBXcuwLZHdUJzPfo5BVjYhU1zFppB/Ud5osyh/pHorMYqjClOL0xHeabU7l2BE9qLR39QCqbuth6yy17cW+1/tioiYPqQ3jtxc9nlXn7y0WW0SN1z0ZD6iR1Zd9QTjnMXMTP9g3Z88/LFpwVbp8bcJzwxXprfOoRnc3XH+RPvcJAW6w195QVHOSJuczey8P5kMH79MqqiQZEoj29NhtMWhovCoczszdsHVUO3TDxoH5mY2lMPJd+52TfIW8zb4Nozxj+lWq982HYGs1G6pWqhbFCETZJIhbjrlB5Od22f/v6l3C7o13CRtHVgvwRTBocsPd5FpMrtp51y77B4FVN8P43o2BzYGR1efgHCbtp/Zea2yhyXW72PifRN70NuNNIZc3WZQbFYDuXCPvtaiSF6jAfY+/Idz8jW/cLSBjOnHrlrHFOw4//uab5O2zj7300r4nTtgn+peufhMm3uRce/j3QieTfS1cHnUHega7vTURC0vUHq46JiOLR6XeU1Qo2BHsctA5kg3drtSulsViqR1SRvfZ1lKplVzNrLnpSa9ErmZftJiSNfLOmlLr+YOZCuASU9eo6h2lVriTFrf3YPFXZ53VBu/0WxWm6FQqoVA9bm0tOyte43YgL9u4ZG5Y4llsBT1vi1Y6DVxMlyo5vOHap9+tIU6UEQ2SRsMAmWq5lEOZTT/JlqVHS2ciVGX3sy7ZC35kupVVI0yk0w16nLmTTlgXOdgRO1mBVFXXDcsX93n0qGZ6DS0Ukk095o2R3Zct3EYChtasqaHocJMYgeSGsZHKlkULvOwrG39hXJqI+bxm1Ix1jrY1Xdu7auZTXTCOenRiZ6JaAv/gaNSXDeqBhBrWvGA/QCRJkcicq/wBNd8WiuV8GQWKkeKckNGe9Xp72sfWNlpWvhk2xfO+y/JxfXCpGcmMLejumZjxZ61htsN89k2D6y4rNzD6hWfRL828dpUS+2odJQauYxTODglFZ1u0yCiMC73cTRUkM+L4Sgs88/9diPJyXevNMBMJPEPAaEjxQrNmBEjlkuHLdgd88pyQpoRCqon/AgYf91mGrlcyUIKTsY7hib5rm3JLCzEzbEq61pS81PgLSscp74KRrb3zxzYkISI2kdV1ItovhUtaypeLhdryasDfWZgjicQrELDv14xQIhCHrC86OuivVJDSHU2XrkJONnh5JhKqdBV8sfbLfPk4bGrOmw1RWLuEb+/xebLtRmgOpzDf0ZXut9EaZ76mNEz3VBcv6O/p7sznUs1Rg8aUKGyjuUBQs0dRm6KfsjDB+Y4h+0Jg/Y2OsqpCY4Hom0o9Cx9y9Q+GRboGC6Q40PXr+teS/qoyUiHFpUWyOFNJkWyxzS70Lu8h/WM4hAOra2RwYgjmoiAiqXxqd2M2SmKp+MZkFxSGCoXP1D+TdBkuu9FSyf5xYyZTypA2+MEc2kQ/6RmcW6utrdXsHWYi0ZFI/DQUI9E2U0oxHnSC9/MKV6Hf53PP5TnOA+eUGHN2pCRqXVJBgNZmNp1iZ+Gd0xBOyDAaWP7VC5b02GPz9z01AMvFVECyv9qxaznk4el0IVOAjP0tPRww9Z9JGb/4s/TA3EtSsKh6+YLVVTg28LV98+2vioGUCCvaJz7Rbl9Bq6RhSDdT/p9K+P5nqUsKA9hEhXNi3yh/28d0oDTbZRrmVnBXc9u4PdxBbpJ7mPsSd5zGvn3ty1OPPHjkrttvu3nXji3Xrls1PjpU6yl2ZBONhq4QPzubiSsCFX86uWc952Y9I6tIJ+kz/brO+5SxPsR76+I2P6hMmabpvhfMiqejTPuUWlbxN6LuV/E34qRIv2rHVRVeVe0H1IqKPzfjlEJTyrCbcm6nnSL2q859sn7DFmv4MHz+av5svvn81XRJ8lPxthdYrdudq1P1++95dd97np0rRNgr93eSFVLtFY5f1fayj7S8hXO4vp/xe34tOenuH2rPtmeawl76XceLbMmkYzzWz1ZYbnr2p3f4NUbg/K+c7+UEWUzZ+6Zm2ZQmBEaYd5ldQa/nYMLd48cLPTegcQm0LJdT2bqkrzvZ6GGy1fmKKFC3ZTVFpbifiiDUlYhJQ7TwZa4AckrnmWpbpR9AvfA+4wShY/FKxuu8J32ecVjcMQLL74L8yMhi09QmQOo4cODAXHHisCQtPbCyc8PingRRJ6TLXjn1yqiEb+WNp97h/m2TLKlYdgskoANS14sTyz0h5BsBz/J7Y7GYrk9ostTeRUpzJFmbuE/s7YFoKhPFt+LocjK2VMS394qrV5N1q0RadMtOsmMrLcr0paf5CtIgxM6hJSN+eg6tlYXfoAJJt53ihH40jwoR+iUgKnPZx1EM9sXVihUH8jfxls1PbIbemw5D7/rbR8bvfrT8b/s+8shNI2Rgx/0TDeFQVxGRXj44zwoqwi3ixq9u2rYu+e09lx1a30+GbvzYHfQLQCsf3LmYh0KwfdfAik9PoPQJKiY920HhO4l6hYcLcCb9Nmgw4HwbVKVBy+z0Rnc4SfXVZJAe43gSuvoe+sgnXrhJ2PvtP9sCXxuct86mJzPgGvvleYPgfHxgxeqH+mAvPLnzhXfZfyh/n9Hk2fYfNhsGx9Zbe/j8hnOwwLXr+nDKD8IC+3nO9fk7bdAYXh/7jinq5OGQX/eoogBUJ4dgOsj+nIbxqZWmNk3CpsPkReyA/NMkTa23X8WpFJ8+Sfqn97O+cGmtgCdPTe8nB2f8yR/nKceMI7yxBuZLajUdRQ+oa6ZGt9fjQI/e+SHJl9MRfqIl2ze9v68tAQ0ZFt4PcRb8nrn/XvjMl4bzxcUwcgk8d8ZRAs60vgnwm9/Uv531N+wbqjxncDEug3K1ROMASl0dbZlELBpQ2Lez6GHQ1pnDt+6Rg1bLD50wH1rAuYN18Z3cd7T/KJS16W4trn1U08hLeN+hTaP0Dwar1eC/3XhjKnnjjUkyBxNBfGk/QXPwj+hf6j+6xa9NFzWsGKc18X5lgNYKVD/LaqVutO/ARBVfQsHNYd/PuoV/m1/N/I4t7Bu4UiaXJSxKin70hLqMiGVmqHWQzcjlCmqnqLHyH7nX3nrPpP4pJajFBhpMRZe0G6Trb4ae7eNzuxbaP334WRgeK81ZEVA/o9/1OTj0kBaSgrIV7Y95td32D7d/rHn3+l/t/vzNRej79JOftM9vNbn/H+0cY9cAeJxjYGRgYADiAqfiC/H8Nl8ZuJlfAEUYLnLKmoJpjs+s/3/+z2TZzxwB5HIwMIFEAUhqDBIAAAB4nGNgZGBgDvqfxRDFysrA8P8ly34GoAgKKAMAdwEFRnicY37BwMAMwoIMDCz6QHoBEBtCaXQMVMfKCqQjoXpeoMrBaUGomgVI6iIh5jN+gfCZrCGYMRWCwWKnkOgFUDMi0dhIdjOuQZJbADEPzm6CygtC2HBzkDHUTWA5QTQ7YGIvsGOwmxfgkIeaC7Z3AYIG6QG7EchmkQPSQPexlCEwXL8JVE4fyS3ZSHEUCVUPDQu4fqS4AABubUHfAAAAAAAA0gESAagBvgHcAfgCCAI2Ap4DBAOqBCAEhgUQBYIF/AZ2BswHOgegB8oIIAjUCTIKDgziDRINTA3ADeAOAA4eDj4Oag6WDsIO7g8mD14PlA/MEDAQghDSETQRahGiEgwSThKgEygTchQaFGgUjhUEFVYVvBYgFogXPBeOGAYZZhoGGoIbUhvWHFIc1B1wHdQeFh6MHyIfhh/WIA4gcCDqITIheCHYIjIibCLKIwQjQiN6I9AkGCRyJK4lHCVIJYQl6iZqJqAnLidqJ5Yn6iiKKSwprCoGKvQrRCvGLBYsSCxqLKAs2C1ALYcAAAABAAAAdgH4AA8AAAAAAAIAAAAQAHMAAAA0C3AAAAAAeJx1kjlOw0AYhd9kQySCAiQamr8BBSE5i0STChQRCgokijRUjvEWOZ5oPEHKBbgDB+BanIXnybAV2PL4e+9f5h/LAI7wAYXddcVnxwptqh03sIeJ5yb9G88t8sxzGz3ce+5QzT13cYknzz0c45UdVGufaok3zwpd1fTcwKE68Nykf+q5RT7z3MaJGnju0L/13MVcPXju4Vy9T/V6a/I0s9KfXsh4OLqSxVY0rbwMCwk3NtOmkmtJdGnjotBBpFd5LR7jdFOExrFb5rGpcl3KKBg6fReXsQlt/Fx3rF7SsbWJJEavZOZ7ydroZRzZILN2PRkMfu+BKTTW2MIgR4oMFoI+3Qu+xxhixI8vWDBDmLnLylEiREEnxIYVmYtU1Nd8EqqSbsyMghwg4rpi1VfkkbGUlQXrzS//h+bMqDvmTgunCDjLT/yO8dLlhG6n5+8ZK7yw95iuZXY9jXG7C3+Qv3MJz13HlnQi+oE7vaU7wYD3P+f4BH7deQMAAAB4nG1TZ7fcNBDd+9Z1XwmhdxJ6M53QCaQACSWh9yLLY1usLBmV3bz365G8fsAHfI6lO3Om39Fib7H7Vov//zaLBfawRIIUGXIUKLHCPg5wiCOcwW04i9txB+7EXbgb9+Be3If78QAexEN4GI/gHM7jUTyGx/EEnsRTeBrP4Fk8h+dR4QW8iJfwMl7Bq3gNr+MC3sCbeAtv4x28i/fwPi7iA3yIS7iMK7iKj/AxPsE1XMen+Ayf4wvcwE18ia/wNb7Bt/gO3+MH/Iif8DN+wa/4Db/jDzDU4GhAaNGhh8CfWENigILGiL9gYOHgsSkbZvtaM9Mk3pJJ42H39DrjTHGSySi9TQehvD1otWzIVDSM7rho9FZJzZrMj/FadsKl3Ndki4Y5VjNLacd8R7kVjgY2HlhtXKXYQJUfj/4VYpxyoI6NvVa0rH2XOmbXNmuFdGSWum2TWut1OjLrqLBc2OBs007qmlIutW/SVoYeipoZ3jPjptKqRphQWrwKSa2LoDSi63doMtEjqdVOF2EezONdTvYRxQC16Ga/gHahIpgCBHDGkBUnVLVeyopJt/8f+WDGdmBSJoPe0NlZ02sjTrRyTJ76b8g4wZnMT7QeKqHSWmq+LiZJe1fKWELtZR1b5utyo6WfRrk/o1jQasZxZoN3tBwEz0k1TgxUWhdmE9FRSBOU7JTJUzHbGlK8z60UgWZbhEXYCE42n0E6MVQEXqgam7acwFabZjUhuhXWJcyFV45uudSZwMkh18NAyu0y5bOUBJrcKh47fVKTlEU84gQPmXPBSGgVpXQ0InhQI1zearMNe5oaGuVxOZ3BRC7pmJaOdUn47WGczkRe9C7/kZKIkl4PlAjV6qQnOWaW4soUYX3GUaguM7QVqllNW1RJEZqdigrjPDoFc8XhVXR5yBtVq0Ah76nxkvb4NuSwrnS9H2ob6ZlRpCe3IYsik4UOWci7puPdwwtD8clWtCIsiVblLv8oaK6EGWKzMux4VhNbh4c6sE7wNIa8sFj8Db5cdxl4nGPw3sFwIihiIyNjX+QGxp0cDBwMyQUbGVidNjIwaEFoDhR6JwMDAycyi5nBZaMKY0dgxAaHjoiNzCkuG9VAvF0cDQyMLA4dySERICWRQLCRgUdrB+P/1g0svRuZGFwAB9MiuAAAAA==') format('woff'),
-       url('data:application/octet-stream;base64,AAEAAAAOAIAAAwBgT1MvMj4pSYEAAADsAAAAVmNtYXDQhRm3AAABRAAAAUpjdnQgAAAAAAAAaGwAAAAKZnBnbYiQkFkAAGh4AAALcGdhc3AAAAAQAABoZAAAAAhnbHlmiZhGzQAAApAAAFsOaGVhZAXpU+AAAF2gAAAANmhoZWEIbgTPAABd2AAAACRobXR4mYUAAAAAXfwAAAHYbG9jYWLITRQAAF/UAAAA7m1heHABLQ16AABgxAAAACBuYW1lxBR++QAAYOQAAAKpcG9zdPuhVToAAGOQAAAE1HByZXDdawOFAABz6AAAAHsAAQN4AZAABQAIAnoCvAAAAIwCegK8AAAB4AAxAQIAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABA6ADodANS/2oAWgNYAJcAAAABAAAAAAAAAAAAAwAAAAMAAAAcAAEAAAAAAEQAAwABAAAAHAAEACgAAAAGAAQAAQACAADodP//AAAAAOgA//8AABgBAAEAAAAAAAAAAAEGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAA//kD6AMLAA8AHwAvAD8ATwBfAG8AfwCPABdAFIuDfHNrY1tUTEM7MyskHBMLBAktKyUVFAYHIyImJzU0NhczMhYRFRQGJyMiJic1NDY3MzIWARUUBgcjIiYnNTQ2FzMyFgEVFAYrASImJzU0NjsBMhYBFRQGJyMiJic1NDY3MzIWARUUBgcjIiY9ATQ2FzMyFgEVFAYrASImJzU0NjsBMhYBFRQGJyMiJj0BNDY3MzIWExUUBisBIiY9ATQ2OwEyFgEeIBayFx4BIBayFiAgFrIXHgEgFrIWIAFlIBayFx4BIBayFx7+nCAWshceASAWshYgAWUgFrIXHgEgFrIXHgFmIBayFiAgFrIXHv6cIBayFx4BIBayFx4BZiAWshYgIBayFx4BIBayFiAgFrIXHppsFh4BIBVsFiABHgEGaxYgAR4XaxceASD+zWwWHgEgFWwWIAEeAiRrFiAgFmsWICD+zGsWIAEeF2sXHgEg/s1sFh4BIBVsFiABHgIkaxYgIBZrFiAg/sxrFiABHhdrFx4BIAEIaxYgIBZrFiAgAAAAAgAA/7EDEwMMAB8AKAAItSYiDgICLSslFAYjISImNTQ+BRcyHgIyPgIzMh4FAxQGIiY+AR4BAxJSQ/4YQ1IEDBIeJjohBSYsTEpKMCIHIjgoHBQKBrR+sIAEeLh2QkNOTkMeOEI2OCIaAhgeGBgeGBYmNDo+PAHWWH5+sIACfAAG////agQvA1IAEQAyADsARABWAF8AEUAOXVlUR0M+OTUgFAcCBi0rAQYHIyImNzQzMh4BNzI3BhUUARQGIyEiJic0PgUzMh4CPgE/ATY3Mh4EFwEUBiImNDYyFgEUBi4BPgIWBRQGJyMmJzY1NCcWMzI+ARcyJxQGIiY0NjIWAUtaOkstQAFFBCpCISYlAwKDUkP+GERQAQQMECAmOiEGJC5IUEYZKRAHIzgmIBAOAf3GVHZUVHZUAYl+sIACfLR6AUM+Lks5Wi0DJSUhRCgERUdUdlRUdlQBXgNELCzFFhoBDRUQTv5bQk5OQh44Qjg0JhYYHBoCFhAaCgIWJjQ4QhwCjztUVHZUVP7vWX4CerZ4BoTTKy4BRANBThAVDRgYAY87VFR2VFQAAAABAAD/9gOPAsYABQAGswQAAS0rBQE3FwEXAWD+sp6wAZCfCgFNoK4BkaAAAAEAAP/XAx8C5QALAAazBwEBLSslBycHJzcnNxc3FwcDH5zq65zq6pzr6pzqdJ3r653q6p3r653qAAAAAAEAAP+fA48DHQALAAazCQMBLSsBFSERIxEhNSERMxEDj/6x3/6xAU/fAc7f/rABUN8BT/6xAAAAAQAAAAADjwHOAAMABrMBAAEtKzc1IRUSA33v398AAAADAAD/nwOPAx0ACwARABUACrcTEg0MCgQDLSsBIREUBiMhIiY1ESEFFSE1ITUBESERAdABv0Iu/WMuQgG+/rICnf5CAb79YwKt/WMvQkIvAw1w33Bv/WMBT/6xAAQAAP/5A6EDUgAIABEAJwA/AA1ACjgsHRYPDAYDBC0rJTQuAQYeAT4BNzQuAQ4BFj4BNxUUBgchIiYnNTQ2MyEXFjI/ASEyFgMWDwEGIi8BJjc2OwE1NDY3MzIWBxUzMgLKFB4WAhIiEJEUIBICFhwYRiAW/MsXHgEgFgEDSyFWIUwBAxYgtgoS+goeCvoRCQoXjxYOjw4WAY8YZA8UAhgaGAIUDw8UAhgaGAIUjLMWHgEgFbMWIEwgIEwgASgXEfoKCvoRFxX6DxQBFg76AAAEAAD/sQOhAy4ACAARACkAQAANQAo8MR0VDwsGAgQtKyU0Jg4BHgEyNjc0Jg4CFjI2NxUUBiMhIiYnNTQ2FzMeATsBMjY3MzIWAwYrARUUBgcjIiYnNSMiJj8BNjIfARYCyhQeFgISIhCRFCASAhYcGEYgFvzLFx4BIBbuDDYjjyI2De4WILYJGI8UD48PFAGPFxMR+goeCvoSHQ4WAhIgFBQQDhYCEiAUFI2zFiAgFrMWIAEfKCgfHgFSFvoPFAEWDvosEfoKCvoRAAAGAAD/agPCA1IABgAPADsARwBrAHQAEUAOc25eSkI8NyQNCgQBBi0rJTQjIhQzMgM0JiciFRQzMhMVBgcWFRQGBw4BFRQeBRcUIyIuAjU0NzUmNTQ3NS4BJzQ2FzIXMhMjNjURNCczBhURFCUVBiMiLgM9ATM1IyInIgc1MzU0JzMGFTMVIiYrARUUMzIBFAYuAj4BFgFMXFhgVCEiIEVFQpYUGAlSRRYWGiYyLioWAssmRD4kZiYjKDQBak42Ljb1fAICfAMBUig5IzIcEAQBCwcDDBU2BH8DXwggCC8wIv7aLEAsASxCKgU4cwHgIywBUUsBAXAHBhgXRmQNBRQXERYOChQWMB+qDiA8KVwhAxYwPQ8DDV4tTmgBGv4vGTEBVDUTEzP+qjFjbhYYHjosJMQCAQNqKh4UF0VqAsxJAiMgMgEwQjABMgAAAAcAAP9qBL8DUgADAAcACwAPABMAFwBCABNAEDceFhQSEA4MCggGBAIABy0rBTc1Byc3JwcBNzUHJzcnByc3NQcnNycHARUUBg8BBiIvASYiDwEGIi8BLgEnNTQ2PwE1NDY/ATYyHwEeAR0BFx4BBwFl1tYk4uLhA0HW1iTh4eIY1tYk9vb2A1UUE/oOJA76AwID+g4kDfoTFAEYFPIYE/oNHg36FBjyFBgBPWuwXD9gYWH+omuwXD9gYWFDXJVcP2lqav526RQiCX0ICH0BAX0ICH0JIhTpFSQIaN8WIgprBgZrCSQV32gJIhcABAAA/2oDWwNSAA4AHQAsAD0ADUAKNS0mIRYSCAMELSsBMjY3FRQOAi4BJzUeARMyNjcVFA4BIi4BJzUeATcyNjcVFA4CLgEnNR4BEzIeAQcVFA4BIi4BJzU0PgEBrYTmQnLI5MpuA0LmhYTmQnLI5MpuA0LmhYTmQnLI5MpuA0LmhXTEdgJyyOTKbgN0xAGlMC9fJkImAio+KF8vMP5UMC9fJ0ImJkInXy8w1jAvXyZCJgIqPihfLzACgyZCJ0cnQiYmQidHJ0ImAAAABwAA/7ED6ALDAAgAEQAjACwANQA+AFAAE0AQTEI9ODQvKyYfFhALBwIHLSs3NCYiBh4CNhM0JiIOAR4BNhc3Ni4BBg8BDgEHBh4BNjc2JiU0JiIOAR4BNgE0JiIOAR4BNhc0JiIOAR4BNhcUBwYjISInJjU0PgIyHgLWKjosAig+Jm0oPiYELjYw6zkDEBocAzghNggLLFhKDQkaAVYqPCgCLDgu/pgoPiYELjYw9ig+JgQuNjCvTwoU/PIUCk9QhLzIvIRQzx4qKjwoAiwBFh4qKjwoAizw1Q4aBgwQ1QMsIStMGC4rIUAlHioqPCgCLAGBHioqPCgCLE8eKio8KAIs3pF8ERF7kma4iE5OiLgAAAAAAQAA/7ED6AMLAFUABrNCAwEtKyUVFAYrASImPQE0NhczNSEVMzIWFxUUBisBIiYnNTQ2FzM1IRUzMhYdARQGKwEiJic1NDYXMzU0NhchNSMiJic1NDY7ATIWFxUUBicjFSEyFgcVMzIWA+ggFrIWICAWNf7jNRceASAWshceASAWNf7jNRYgIBayFx4BIBY1Kh4BHTUXHgEgFrIXHgEgFjUBHR0sATUXHpqzFiAgFrMWIAFrax4XsxYgIBazFiABa2seF7MWICAWsxYgAWsdLAFrHhezFiAgFrMWIAFrKh5rHgAABAAA/2oDnwNSAAoAIgA+AE4ADUAKTEAyJBkPBQAELSsBMy8BJjUjDwEGBwEUDwEGIi8BJjY7ARE0NjsBMhYVETMyFgUVITUTNj8BNSMGKwEVIzUhFQMGDwEVNzY7ATUTFSM1MycjBzMVIzUzEzMTApliKAYCAgIBAQT+2gayBQ4HsggIDWsKCGsICmsICgHS/rrOBwUGCAYKgkMBPc4ECAYIBQuLdaEqGogaKqAngFqBAm56GgkCCwoKBv1GBgeyBQWzCRUDAAgKCgj9AApKgjIBJwoGBQECQIAy/tgECgcBAQJCAfU8PFBQPDwBcf6PAAAAAAQAAP9qA58DUgAKACIAMgBPAA1ACkQ0MCQZDwUABC0rJTMvASY1Iw8BBgcFFA8BBiIvASY2OwERNDY7ATIWFREzMhYFFSM1MycjBzMVIzUzEzMTAxUhNRM2PwE1BwYnBisBFSM1IRUDDwEVNzY7ATUCmWIoBgICAgEBBP7aBrIFDgeyCAgNawoIawgKawgKAgShKhqIGiqgJ4BagQv+us4HBQYEAwEGCoJDAT3ODAYIBQuLM3oaCQILCgkHfwYHsgUFswkVAwAICgoI/QAKkTs7UFA7OwFy/o4CgoIzAScKBQUCAQEBAkCAMv7ZDwYBAQFCAAAC////rAPoAwsALgA0AAi1MC8rFwItKwEyFhQGBxUUBgcmJw4BFhcOAR4CFw4BJicuBDY3IyImNzU0NjMhMiUyFhcDEQYHFRYDoR0qKh0sHOncICYEFAsEDBgeFBFcYBkEGgoOBAgIRCQ2ATQlAQzzAQEdKgFI3NDSAe0qPCgB1h0qAcISCjQ+FBMkHCIWESAcDhgNSCJCLkAeNCVrJTTXLBz92QIUqBeXFwAAAgAA/8MDjwMuAEEARwAItUVCMgoCLSsBFAYnIxQHFxYUBiIvAQcOAyMRIxEiLgIvAQcGIyImND8BJjUjIi4BNjczNScmNDYyHwEhNzYyFgYPARUzMhYBITQ2MhYDjxYOfSV0ChQeC24IBSYiOhlHHTgqHgoIZgsQDRYIcSB9DxQCGA19YQsWHAthAddgCxwYBAhhfQ8U/vX+m2iUagE6DhYBYEJ1CxwWC24HBBgSDgH0/gwOGBQICHQMEx4Lfz9aFB4UAaRhCh4UCmFhChQeCmGkFgE0SmhoAAAAAAYAAP/5A+gDCwADAAcACwAbACsAOwARQA43MCgfFxAKCAYEAgAGLSslITUhJyE1ISUzNSMBFRQGByEiJic1NDYXITIWExUUBichIiYnNTQ2NyEyFhMVFAYHISImJzU0NjMhMhYCOwFm/prWAjz9xAFl19cBHhYO/GAPFAEWDgOgDxQBFg78YA8UARYOA6APFAEWDvxgDxQBFg4DoA8UQEjWR9dH/eiODxQBFg6ODxYBFAEOjw4WARQPjw8UARYBEI8PFAEWDo8OFhYAAAH/+f+xAxgCwwAUAAazEQcBLSsBFgcBERQHBiMiLwEmNREBJjYzITIDDwkR/u0WBwcPCo8K/u0SExgCyhcCrRcQ/u3+YhcKAwuPCg8BDwETEC0AAAL//f+xA1kDUgAoADQACLUyLA0EAi0rARQOAiIuAjc0Njc2FhcWBgcOARUUHgIyPgI3NCYnLgE+ARceAQERFAYiJjcRNDYyFgNZRHKgrKJuSgNaURg8EBIIGDY8LFBmeGRUJgM8NhgIIzwXUVr+myo6LAEqPCgBXleedEREdJ5XZrI+EggYFzwRKXhDOmpMLi5MajpEdioSOjAIEj20AUj+mh0qKh0BZh0qKgAD//n/sQOpAwsAUQBhAHEACrdsZV1VNwYDLSsBFgcDDgEHISImJyY/ATY3NCY1Nj8BPgE3NiY2PwE+ATc2Jjc2PwE+ATc0Jj4BPwI+AT8BPgIXFTYzITIWBwMOAQchIgYXFjMhMjY3EzYnFgUGFhchMjY/ATYmJyEiBg8BBhYXITI2PwE2JgchIgYHA5MWDJoKQCX9/StQDw4NAQECBAEEEg0YBQIEBAcKDBYDAQQCAgoNChoDBAIIBgoJBQYGCwUUFBAVBwGpKSwMmBQoNP4bDwwFDkMCAxAeBKgEARX9ugIGCAFTCA4CDAIIB/6tBw4COgMIBwFTBw4DCwMIB/6tCAwEAkcgKP4HJDABPCwlIg8NBwUOBAYGGhU8FQYWCwkNFD4UBRgEBwoNDkIVBBQJDAcLEQoUChIICgIEAQVAKP4GQiYBEQ8nEg4CJg0TCBEHCgEMBiQHCgEMBrMHCgEMBiQHDAEKCAAEAAD/agPoA1IACAAYABsAOAANQAotIBsZFA0HAAQtKwUhESMiJjc1Izc1NCYnISIGFxUUFjchMjYTMycFERQGByEiJic1ISImJxE0NjchMhYHFRYfAR4BFQGtAfTpFiAB1o4KB/53BwwBCggBiQcKj6enAR4gFv3pFx4B/tEXHgEgFgJfFiABDAjkEBZPAWYeF+ihJAcKAQwGJAcMAQr+kafu/okXHgEgFlkgFQLuFx4BIBa3BwjkEDQYAAf/+v+xA+oCwwAIAEoAWABmAHMAgACGABNAEIOBgHdtaGRdVk84GwQABy0rATIWDgEuAjYXBRYGDwEGIiclBwYjFgcOAQcGIyInJjc+ATc2MzIXNj8BJyYnBiMiJy4BJyY2NzYzMhceARcWBx8BJTYyHwEeAQcFNiYnJiMiBwYWFxYzMgM+AScmIyIHDgEXFjMyExc1ND8BJwcGDwEGIx8BAScFFQcfAhYfAQU3JQcGBwIYDhYCEiASBBqzARsQBRFHBxMH/n8+BAMIAgQ2L0pQTDAzBwQ2LkpRLiYFCERECAUmLlFKLjYEAxYZL01QSi44AwIIBz4BgQcTB0cRBRD9aRocLTQ3KhUaHC0zOCkZLRwaFik4My0cGhUqN5c2EggsDwEECQEBeDYBmkf+U1kFBAYEAg8B4kf+3mMBBgFeFhwWAhIgEiLeCygIJAQE2CUCHBorUB0vLC9FKlAdLxIIBSgpBQcRLx1QKiE8FiwvHU4sGxsDJdgFBCQJJwxNGEocIRQYSB4h/nUcShcUIRxKFxQBdyEHFAsEGg4CBAkBghIBQSTwQDUFAwcFAQ+yI+RNAgIAAAAAA//9/7EDWQMLAAwBuwH3ABK/Ad4BvAEyAJgABgAAAAMALSsBMh4BFA4BIi4CPgEBDgEHMj4BNT4BNzYXJj4CPwEGJjUUBzQmBjUuBC8BJiIOARUmIhQOASIHNicmBzY0JzMuAicuAQYUHwEWBh4BBwYPAQYWFxYUBiIPAQYmJyYnJgcmJyYHMiYHPgEjNj8BNicWNzY/ATYyFjMWNCcyJyYnJgcGFyIPAQYvASYnIgc2JiM2JyYiDwEGHgEyFxYHIgYiBhYHLgEnFi8BIgYiJyY3NBcnBgcyPwE2NTYXNxcmBwYHFgcnLgEnIgcGBx4CFDcWBzIXFhcWBycmBhYzIg8BBh8BBhY3Bh8DHgIXBhYHIgY1HgIUFjc2Jy4CNTMyHwEGHgIzHgEHMh4EHwMWMj8BNhYXFjciHwEeARUeARc2NQYWMzY1Bi8BJjQmNhcyNi4CJwYmJxQGFSM2ND8BNi8BJgciBw4DJicuATQ/ATYnNj8BNjsBMjYmLwEWNhcWNycmNxY3HgIfARY2NxYXHgE+ASY1JzUuATY3NDY/ATYnMjcnJiI3Nic+ATMWNzYnPgE3FjYmPgEXNzYjFjc2JzYmJzYyNTYnJgM2NyYiLwE2Ji8BJi8BJg8BIg8BFSYnIi8BJgYHBg8BJjYmBg8BBjYGFQ4BFS4BNx4BFxYHBgcGFxQGFgGtdMZycsboyG4GerwBEgEIAwECBAMRFRMKAQwEDAMBBwYEBAoFBgQBCAEGAQQEBAIEBgEGAggJBQQFBQMBCAwBBRwHAgIBCAEOAQIHCQMEBAEEAgMBBwoCBAUNBAIUDhMECAYBAgECBQkCARMJAgQGBQYKAwgEBwUDAgYJBAYBBQkEBQMDAgUEAQ4HCw8EEAMDAQgECAEIAwEIBAQEAwMEAgQSBQMMDAEDAwIMGRsDAwgFEwUDCwQNCwEEAgYECAQJBFEyBAUCBgUDARgKAQIHBQQDBAQEAQIBAQECCgcHEgQHCQQDCAQCDgEBAgIOAgQCAg8IAwQDAgMFAQQKCgEECAQFDAcCAwgDCQcWBgYFCAgQBBQKAQIEAgYDDgMEAQoFCBEKAgICAgEFAgQBCgIDDAMCCAECCAMBAwIHCwQBAgIIFAMICgECAQQCAwUCAQIBBAECAgQYAwkDAQEBAw0CDgQCAwEEAwUCBggEAgIBCAQEBwgFBwwEBAICAgYBBQQDAgMFBwQDAhIBBAICBQwCCQICCggFCQIIBAIKCQ0JaXJRAQwBDQEEAxUBAwUCAwICAQUMCAMEBQEKAQMBAQQIBAoBBwYCCgIEAQwBAQICBAsPAQIJCgEDC3TE6sR0dMTqxHT+3QEIAgYGAQQIAwULAQwCAgQMAQoHAgMEAgQBAgYMBQYDCgEGBAEBAgICAQMDAgEDCAQCBgIDAwQFBAYHBAYICgcEBQYFDAMBAgQCAQMMCQ4DBAUHCAUDEQIDDgcGDAMBAwkCBwoDBgEOBAoEAQIFAgIGCgQHBwcBCQUIBwgDAgcDAgQCBgIEBQoDAw4CBQEBAgUEBwIBCggPAQMCAgcEAw4DAgQDBwMGBAQBAS1PBAEIBAMEBg8KAgYEBQQFDgkUCwIBBhoCARcFBAYDBRQDAxAFAgEECAUIBAELFw4FDAICBAQMCA4EDgEKCxQHCAEFAw0CAQIBEgMKBAQJBQYCAwoDAgMFDAIQCRMDAwQEBgIECgcOAQUCBAEEAgIQBQ8FAgUDAgsCCAQEAgIEGA4JDgUJAQQGAQIDAQEBBAMGBwYFAg8KAQQBAgMBAgMIBRcEAggIAwQPAgoKBQECAwQLCQUCAgICBgIKBwYFBAQEAwEECgQGAQcCAQcGBQMEAQEBBQQC/g0VVQICBQQGAg8BAQIBAgEBAwIKAwMEAQIDAgYHAw4GAgEFBAIIAQIIAwMCAgUcCBEJDgkMAgQQBwAB////+QQwAwsAGwAGsw4DAS0rJRQGByEiJjc0NjcmNTQ2MzIWFzYzMhYVFAceAQQvfFr9oWeUAVBAAah2WI4iJzY7VBdIXs9ZfAGSaEp6Hg8JdqhkTiNUOyojEXQAAAAB//7/agH4AwsAIAAGsxQEAS0rARYHAQYjJy4BNxMHBiMiJyY3Ez4BOwEyFhUUBwM3NjMyAe4KBv7SBxAICQoCbuICBQoHCgNwAg4ItwsOAmDdBQILAhYLDf16DgEDEAgBwzgBBwgNAc0ICg4KBAb+/jYCAAUAAP+xA+gDCwAPAB8ALwA/AE8AD0AMS0M7MysjGxMLAwUtKzcVFAYrASImPQE0NjsBMhY3FRQGKwEiJj0BNDY7ATIWNxEUBisBIiY1ETQ2OwEyFjcRFAYrASImNRE0NjsBMhYTERQGKwEiJjURNDY7ATIWjwoIawgKCghrCArWCghrCAoKCGsICtYKB2wHCgoHbAcK1woIawgKCghrCArWCghrCAoKCGsICi5rCAoKCGsICgpAswgKCgizCAoKh/6+CAoKCAFCCAoKzv3oCAoKCAIYCAoKARb8yggKCggDNggKCgAAAAABAAAAAAI8Ae0ADgAGswoEAS0rARQPAQYiLwEmNDYzITIWAjsK+gscC/oLFg4B9A4WAckOC/oLC/oLHBYWAAAAAf//AAACOwHJAA4ABrMKAgEtKyUUBichIi4BPwE2Mh8BFgI7FA/+DA8UAgz6Ch4K+gqrDhYBFB4L+goK+gsAAAEAAAAAAWcCfAANAAazCwMBLSsBERQGIi8BJjQ/ATYyFgFlFCAJ+goK+gscGAJY/gwOFgv6CxwL+gsWAAEAAAAAAUECfQAOAAazCwQBLSsBFA8BBiImNRE0PgEfARYBQQr6CxwWFhwL+goBXg4L+gsWDgH0DxQCDPoKAAABAAD/5wO2AikAFAAGswoCAS0rCQEGIicBJjQ/ATYyFwkBNjIfARYUA6v+YgoeCv5iCwtcCx4KASgBKAscDFwLAY/+YwsLAZ0LHgpcCwv+2AEoCwtcCxwAAQAA/8ACdANDABQABrMPAgEtKwkBBiIvASY0NwkBJjQ/ATYyFwEWFAJq/mILHAxcCwsBKP7YCwtcCx4KAZ4KAWn+YQoKXQscCwEpASgLHAtdCgr+YgscAAEAAAAAA7YCRgAUAAazDwIBLSslBwYiJwkBBiIvASY0NwE2MhcBFhQDq1wLHgr+2P7YCxwMXAsLAZ4LHAsBngtrXAoKASn+1woKXAseCgGeCgr+YgscAAABAAD/wAKYA0MAFAAGsw8HAS0rCQIWFA8BBiInASY0NwE2Mh8BFhQCjf7YASgLC1wLHAv+YgsLAZ4KHgpcCwKq/tj+1woeCl0KCgGfCh4KAZ4KCl0KHgAAAQAA/7EDgwLnAB4ABrMaCwEtKwEUDwEGIi8BERQGByMiJjURBwYiLwEmNDcBNjIXARYDgxUqFTsVpCgfRx4qpBQ8FCoVFQFrFDwVAWsVATQcFioVFaT+dx0kASYcAYmkFRUqFTsVAWsVFf6VFgAAAAEAAP+IAzUC7QAeAAazGgQBLSsBFAcBBiIvASY0PwEhIiY9ATQ2FyEnJjQ/ATYyFwEWAzUU/pUWOhUqFhaj/ncdJCQdAYmjFhYqFToWAWsUAToeFP6UFBQqFTwVoyoeRx4qAaQVPBQqFRX+lRQAAAABAAD/iANZAu0AHQAGsxMLAS0rARUUBiMhFxYUDwEGIicBJjQ3ATYyHwEWFA8BITIWA1kkHf53pBUVKhU7Ff6UFBQBbBU6FioVFaQBiR0kAV5HHiqkFDwUKxQUAWwVOhYBaxUVKhU6FqQoAAABAAD/zwODAwsAHgAGsxMEAS0rARQHAQYiJwEmND8BNjIfARE0NjczMhYVETc2Mh8BFgODFf6VFjoV/pUVFSkWOhWkKh5HHSqkFTsVKhUBgh4U/pQVFQFsFDsWKRUVpAGJHSoBLBz+d6QVFSoVAAAAAQAA/7EDWgMLAEMABrMsCQEtKwEHFzc2Fh0BFAYrASInJj8BJwcXFgcGKwEiJic1NDYfATcnBwYjIicmPQE0NjsBMhYPARc3JyY2OwEyFgcVFAcGIyInAszGxlAQLRQQ+hcJChFRxsZQEQkKF/oPFAEsEVDGxlALDgcHFhYO+hcTEVDGxlERExf6DxYBFgcHDgsCJMbGUBITGPoOFhcVEVHGxlERFRcWDvoYExJQxsZQCwMJGPoOFi0QUcbGURAtFg76GAkDCwACAAD/sQNaAwsAGAAwAAi1LSEUCAItKwEUDwEXFhQGByMiJic1ND4BHwE3NjIfARYBFRQOAS8BBwYiLwEmND8BJyY0NjczMhYBpQW5UAoUD/oPFAEWHAtQuQYOBkAFAbQUIAlQuQYOBkAFBbpRChQP+g8WAQUIBblRCh4UARYO+g8UAgxQuQYGPwYB2/oPFAIMULkGBj8GDga5UQoeFAEWAAAAAAIAAP+5A1IDAwAXADAACLUsHxMIAi0rARUUBiYvAQcGIi8BJjQ/AScmNDY7ATIWARQPARcWFAYrASImNzU0NhYfATc2Mh8BFgGtFhwLUbkFEAU/Bga5UAsWDvoOFgGlBrlQCxYO+g4WARQeClG5Bg4GPwYBOvoOFgIJUboFBUAFEAW5UAscFhYBaQcGuVALHBYWDvoOFgIJUboFBUAFAAABAAD/agPoA1IARAAGszMRAS0rARQPAQYiJj0BIxUzMhYUDwEGIi8BJjQ2OwE1IxUUBiIvASY0PwE2MhYdATM1IyImND8BNjIfARYUBisBFTM1NDYyHwEWA+gLjgseFNdIDhYLjwoeCo8LFg5I1xQeC44LC44LHhTXSA4WC48LHAuPCxYOSNcUHguOCwFeDguPCxYOSNcUHguOCwuOCx4U10gOFguPCxwLjwsWDkjXFB4LjgsLjgseFNdIDhYLjwoAAAAAAQAAAAAD6AIRACAABrMUBAEtKwEUDwEGIiY9ASEVFAYiLwEmND8BNjIWHQEhNTQ2Mh8BFgPoC44LHhT9xBQeCo8LC48KHhQCPBQeC44LAV4OC48LFg5ISA4WC48LHAuPCxYOSEgOFguPCgAAAQAA/2oBigNSACAABrMcDAEtKwEUBicjETMyHgEPAQYiLwEmNDY7AREjIiY2PwE2Mh8BFgGJFg5HRw8UAgyPCh4KjwoUD0hIDhYCCY8LHAuPCwKfDhYB/cQUHguOCwuOCx4UAjwUHguOCwuOCwAAAAP///9qA6EDDQAjACwARQAKtz0vKicaCAMtKwEVFAYnIxUUBicjIiY3NSMiJic1NDY7ATU0NjsBMhYXFTMyFhc0LgEGHgE+AQEUBiIvAQYjIi4CPgQeAhcUBxcWAjsKB30MBiQHDAF9BwoBDAZ9CggkBwoBfQcKSJTMlgSO1IwBIio8FL9ke1CSaEACPGyOpIxwOANFvxUBlCQHDAF9BwwBCgh9CggkBwp9CAoKCH0KGWeSApbKmAaM/podKhW/RT5qkKKObjoEQmaWTXtkvxUAAAAAA////7ADWQMQAAkAEgAjAAq3IBcMCgQCAy0rATQnARYzMj4CBQEmIyIOAQcUJRQOAi4DPgQeAgLcMP5bTFo+cFAy/dIBpUtcU4xQAQLcRHKgrKJwRgJCdJ6wnHZAAWBaSv5cMjJQcmkBpTJQkFBbW1igckYCQnactJp4PgZKbKYAAAAAA////2oDoQMNAA8AGAAxAAq3KRsWEwsDAy0rARUUBichIiYnNTQ2MyEyFhc0LgEGHgE+AQEUBiIvAQYjIi4CPgQeAhcUBxcWAjsKB/6+BwoBDAYBQgcKSJTMlgSO1IwBIio8FL9ke1CSaEACPGyOpIxwOANFvxUBlCQHDAEKCCQHCgoZZ5IClsqYBoz+mh0qFb9FPmqQoo5uOgRCZpZNe2S/FQADAAD/sAI+AwwAEAAnAFsACrdYPiAVDAIDLSsBFAYiJjc0JiMiJjQ2MzIeARc0LgIiDgIHFB8CFhczNjc+ATc2NxQHDgIHFhUUBxYVFAcWFRQGIw4CJiciJjc0NyY1NDcmNTQ3LgInJjU0PgMeAgGbDAwOAjwdCAoKCBw2LFgmPkxMTD4mASYREUgHfwhHBhYGJkc5GSIgAxoODhkIJBkLLjIwCRokAQcZDg4aAiIgGToyUGhoaE42AhEICgoIGRwKEAoSKh0oRC4YGC5EKDksEhNVUVFVBhoFLDlXPxssPh0PHxQPDxUdEA0NGhwZHAIgFxwaDQ0QHRUPDxQfDxxAKhw/VzdgPiQCKDpkAAAAAAP//f+xA18DCwAUACEALgAKtyslHxgQAwMtKwEVFAYrASImPQE0NjsBNTQ2OwEyFhc0LgEOAx4CPgE3FA4BIi4CPgEyHgEB9AoIsggKCgh9CgckCAroUoqmjFACVIiqhlZ7csboyG4Gerz0un4CIvoHCgoHJAgKxAgKCsxTilQCUI6ijlACVIpTdcR0dMTqxHR0xAAEAAD/0QOhAusAEwAvAEwAbQANQApoUUc0KhgRAwQtKwERFAYmLwEjIiYnNTQ2NzM3NjIWExQGBwYjIiY3ND4DLgIvASY3NDYXMhceARcUBgcGIyImNzQ3Njc+ATQmJyYnJjU0NjMyFx4BFxQGBwYjIiY3ND8BNjc+AS4BJyYnLgEnJjU0NjMyFx4BAa0WHAu6kg8UARYOkroKHhTXMCcFCQ4WAQwWEBAECBgHEQoEFA8JBScwj2BNCAYPFgEVIAspLi4pCyAVFA8HCE5ekI52BwcPFgEWGRkURU4CSkcUGQQSAxYUEAcHdo4Cjv2gDhYCCboWDtYPFAG6ChT+wSpKDwMUEAwQDAwcJBwMBg4IDA8WAQMPSipVkiADFg4WCxAJHlpoWh4JEAsWDhYDIZBWgNgyAxYOFA0MDg4zmKqYMw4OAwYDDRQOFgMz1gAAAAACAAAAAAKDArEAEwAvAAi1KhgRAwItKwERFAYmLwEjIiYnNTQ2NzM3NjIWExQGBwYjIiY3ND4DLgIvASY3NDYXMhceAQGtFhwLupIPFAEWDpK6Ch4U1zAnBQkOFgEMFhAQBAgYBxEKBBQPCQUnMAKO/aAOFgIJuhYO1g8UAboKFP7BKkoPAxQQDBAMDBwkHAwGDggMDxYBAw9KAAABAAAAAAGtArEAEwAGsxEDAS0rAREUBiYvASMiJic1NDY3Mzc2MhYBrRYcC7qSDxQBFg6SugoeFAKO/aAOFgIJuhYO1g8UAboKFAAAAwAA/7EDCgNTAAsAQwBLAAq3SEU+KQcBAy0rEwcmPQE0PgEWHQEUAQcVFAYHIicHFjMyNjc1ND4BFhcVFAYHFTMyFg4BIyEiJj4BOwE1JicHBiIvASY0NwE2Mh8BFhQnARE0NhcyFpc4GBYcFgJ2ymhKHx42NzxnkgEUIBIBpHmODxYCEhH+mw4WAhIQj0Y9jgUQBC4GBgKwBg4GLgXZ/qVqSTlcAUM5Oj5HDxQCGA1HHgEvykdKaAELNhySaEcPFAIYDUd8tg1KFhwWFhwWSgcmjgYGLgUQBAKxBgYuBRBF/qYBHUpqAUIAAAAC////sQKDA1MAJwAzAAi1MSwaCgItKwEVFAYHFTMyHgEGIyEiLgE2OwE1LgE3NTQ+ARYHFRQWMjYnNTQ+ARYnERQOASYnETQ2HgECg6R6jw8UAhgN/psPFAIYDY95pgEWHBYBlMyWAhYcFo9olmYBaJRqAclHfLYNShYcFhYcFkoNtnxHDxQCGA1HaJKSaEcPFAIYyf7jSmgCbEgBHUpqAmYAAAIAAP/5A1kCxAAYAEAACLU8HBQEAi0rARQHAQYiJj0BIyImJzU0NjczNTQ2FhcBFjcRFAYrASImNycmPwE+ARczMjY3ETQmJyMiNCY2LwEmPwE+ARczMhYClQv+0QseFPoPFAEWDvoUHgsBLwvEXkOyBwwBAQEBAgEICLIlNAE2JLQGCgICAQEBAgEICLJDXgFeDgv+0AoUD6EWDtYPFAGhDhYCCf7QCrX+eENeCggLCQYNBwgBNiQBiCU0AQQCCAQLCQYNBwgBXgAAAAIAAP/5A2sCwwAnAEAACLU8LA4HAi0rJRQWDwEOAQcjIiY1ETQ2OwEyFhUXFg8BDgEnIyIGBxEUFhczMh4CARQHAQYiJj0BIyImPQE0NjczNTQ2FhcBFgFlAgECAQgIskNeXkOyCAoBAQECAQgIsiU0ATYktAYCBgICBgv+0QscFvoOFhYO+hYcCwEvCy4CEgUOCQQBXkMBiENeCggLCQYNBwgBNiT+eCU0AQQCCAEsDgv+0AoUD6EWDtYPFAGhDhYCCf7QCgAABAAA/2oDoQNTAAMAEwAjAEcADUAKNCcfFw8HAgAELSsXIREhNzU0JisBIgYdARQWOwEyNiU1NCYrASIGHQEUFjsBMjY3ERQGIyEiJjURNDY7ATU0NhczMhYdATM1NDYXMzIWFxUzMhZHAxL87tcKCCQICgoIJAgKAawKCCMICgoIIwgK1ywc/O4dKiodSDQlJCU01jYkIyU0AUcdKk8CPGuhCAoKCKEICgoIoQgKCgihCAoKLP01HSoqHQLLHSo2JDYBNCU2NiQ2ATQlNioAAA8AAP9qA6EDUwADAAcACwAPABMAFwAbAB8AIwAzADcAOwA/AE8AcwAjQCBgU0tEPjw6ODY0LygiIB4cGhgWFBIQDgwKCAYEAgAPLSsXMzUjFzM1IyczNSMXMzUjJzM1IwEzNSMnMzUjATM1IyczNSMDNTQmJyMiBgcVFBY3MzI2ATM1IyczNSMXMzUjNzU0JicjIgYdARQWNzMyNjcRFAYjISImNRE0NjsBNTQ2FzMyFh0BMzU0NhczMhYXFTMyFkehocWyssWhocWyssWhoQGbs7PWsrIBrKGh1rOzxAwGJAcKAQwGJAcKAZuhodazs9ahoRIKCCMICgoIIwgK1ywc/O4dKiodSDQlJCU01jYkIyU0AUcdKk+hoaEksrKyJKH9xKH6of3EoSSyATChBwoBDAahBwwBCv4msiShoaFroQcKAQwGoQcMAQos/TUdKiodAssdKjYkNgE0JTY2JDYBNCU2KgAAAAMAAP92A6ADCwAIABQALgAKtx8ZEgsGAgMtKzc0Jg4BHgEyNiUBBiIvASY0NwEeASUUBw4BJyImNDY3MhYXFhQPARUXNj8BNjIW1hQeFgISIhABav6DFToWOxUVAXwWVAGYDBuCT2iSkmggRhkJCaNsAipLIQ8KHQ4WAhIgFBT6/oMUFD0UOxYBfDdU3RYlS14BktCQAhQQBhIHXn08AhktFAoACQAA/7EDWQLEAAMAEwAXABsAHwAvAD8AQwBHABdAFEVEQUA+Ny4mHRwZGBUUCgQBAAktKzcVIzUlMhYdARQGKwEiJj0BNDY/ARUhNRMVIzUBFSE1AzIWBxUUBicjIiY3NTQ2FwEyFgcVFAYHIyImJzU0NhcFFSM1ExUhNcTEAYkOFhYOjw4WFg7o/h59fQNZ/mV9DxYBFBCODxYBFBAB9A4WARQPjw8UARYOAUF9ff4eQEdHSBYOjw4WFg6PDxQB1kdHAR5ISP3ER0cCgxQQjg8WARQQjg8WAf7iFA+PDxQBFg6PDhYBR0dHAR5ISAAABgAA/3IELwNJAAgAEgAbAHsAtwDzABFADuDCpYZjMxkVEAsGAgYtKwE0JiIGFBYyNgU0Jg4BFxQWMjYDNCYiBh4BMjYHFRQGDwEGBxYXFhQHDgEjIi8BBgcGBwYrASImNScmJwcGIicmNTQ3PgE3Ji8BLgE9ATQ2PwE2NyYnJjQ3PgEzMh8BNjc2NzY7ATIWHwEWFzc2MhcWFRQPAQYHFh8BHgEBFRQHBgcWFRQHBiMiLwEGIicOAQciJyY1NDcmJyY9ATQ3NjcmNTQ/ATYzMhYXNxc2PwEyFxYVFAcWFxYRFRQHBgcWFRQHBiMiJicGIicOASInJjU0NyYnJj0BNDc2NyY1ND8BNjMyFhc2Mhc2PwEyFxYVFAcWFxYB9FR2VFR2VAGtLDgsASo6LAEsOCwBKjos2AgFVgYMEx8EBA1CCwYFQBUWBgcEDWgGCg0TF0IEDQZQBAUkCA0HVQUICAVWBwsTHwQEDEQKBgZAExgGBwMNaAYKAQ0TFkIFDQVRBBgRCA0GVQUIAWVTBgocAkQBBRUdCwwLBywDAUQDHQoHU1MHCh0DNBABBCoIEREcFwQCQwIcCQdTUwYKHAJEAQUqCAsMCwcsBEQDHQoHU1MHCh0DNBABBCoIDAoMHBcEAkMCHAkHUwFeO1RUdlRU4x0sAigfHSoqAlkdKio7KirNZwYKAQ4TFxslBgwEEUIEMgsGPBsNCAZVBgwyBARLDwUFCCwMGBYNAQgHZwYKAQ4TFxslBgwEEUIEMgoIPBoNCAZVBgsxBARLDwUFHhUNGxMMAgj+z04JCA8OPw4CAigbJQEBCzQBKAICDj8ODwgJTgkJEA0/DgICHgk0DAEBKBcBJwICDj8NEAkCM04JCQ8OPw4CAic0DAEBDDQnAgIOPw4PCQlOCQgQDT8OAgIeCTQMAgIoFwEnAgIOPw0QCAACAAD/sQNaAwoACABoAAi1USAGAgItKwE0JiIOARYyNiUVFAYPAQYHFhcWFAcOASciLwEGBwYHBisBIiY1JyYnBwYiJyYnJjQ3PgE3Ji8BLgEnNTQ2PwE2NyYnJjQ3PgEzMh8BNjc2NzY7ATIWHwEWFzc2MhcWFxYUDwEWHwEeAQI7UnhSAlZ0VgEcCAdoCgsTKAYFD1ANBwdNGRoJBwQQfAgMEBsXTwYQBkYWBAUIKAoPCGYHCAEKBWgIDhclBgUPUA0HCE0YGgkIAxF8BwwBDxwWUAUPB0gUBAQ7DglmBwoBXjtUVHZUVHh8BwwBEB4VGzIGDgYVUAEFPA0ITBwQCgdnCQw8BQZAHgUOBgwyDxwbDwEMB3wHDAEQGRogLQcMBxRQBTwNCEwcDwgIZwkMPAUFQxwFDgZNHBsPAQwAAAH////5AxIDCwBQAAazIAYBLSslFAYHBgcGIyIuAS8BJicuAScmLwEuAS8BJjc0NzY3PgEzMhcWFx4CFx4CFRQOAgcUHwEeATUeARcyFh8BFjcyPgI3Mh4BHwEWFxYXFgMSDAYLOTQzEBwkCDs2K0iYLBsTCggIBAcDAR0fHA4wDwgEChQGFBQHAhAIICYeAQMEAQ4qbkwBEgULBgcKHh4gDAcQGAJBEwwnAwKeDzAOHCAcBAoDFRQbLJhIKzYcFxASIA4PNDQ4DAYMAgMoCigeDwIYEAgLIhoiCAUICwMWAU1uKgwCBQMBHigeAQgQAiULBhMKBAAACAAA/2oDWQNSABMAGgAjAFoAXwBuAHkAgAAVQBJ9e3ZvbmJdW043IRsVFA8HCC0rAR4BFREUBgchIiYnETQ2NyEyFhcHFTMmLwEmExEjIiYnNSERARYXNjMyFxYHFCMHBiMiJicGBwYjIi8BNCcmNz4BNzYXFhU2NzY3LgE3NjsBMhcWBwYHFQYHFgE2Nw4BEwYXNjc0NzY3Ij0BJzQnAzY3Ii8BJicGBwYFJiMWMzI3AzMQFh4X/RIXHgEgFgH0FjYPStIFB68GxugXHgH+UwGsEh0hIFIRCQgBAQMkG0wie2BVMggHDgMGAgU2LggFAR0fJhQNCAgGEQwNBwoFAQEBBx/+8R4vHSjXCQcBAwQBAgEBB0ZMUwEGCSscDyAQAWAOQCobCAICfhA0GP1+Fx4BIBYDfBceARYQJtIQB68H/LACPB4X6fymAUsOEQQbDRABAhUWEg0hkgQGAQIGDhc4GgUIAQEvP0xGLlYcFggMGgMBFkQnW/7xDUsWMgHxFzIEFAIWAwIBAQEMCP6NHg8FCCU9MD4fBw4QAQAAAAAEAAD/agNZA1IAEwAaACMAUQANQAonJCEbFRQPBwQtKwEeARURFAYHISImJxE0NjchMhYXBxUzJi8BJhMRIyImJzUhERMVMxMzEzY3NjUzFx4BFxMzEzM1IxUzBwYPASMnLgEnAyMDBwYPASMnJi8BMzUDMxAWHhf9EhceASAWAfQWNg9K0gUHrwbG6BceAf5TOydcWEgEAQEDAQECAkhZWyenMjcDAQEDAQECAlE/UQIBAQICAgEDNzICfhA0GP1+Fx4BIBYDfBceARYQJtIQB68H/LACPB4X6fymAfQ7/o8BDwsOCQUOARQE/vEBcTs79QsODAwCEgUBMP7QDQgEDAwOC/U7AAAEAAD/agNZA1IAEwAaACMAUQANQAo9JSEbFRQPBwQtKwEeARURFAYHISImJxE0NjchMhYXBxUzJi8BJhMRIyImJzUhETcVMzUjNz4CBzMUHgIfASMVMzUjJzczNSMVMwcOAQ8BIycmLwEzNSMVMxcHAzMQFh4X/RIXHgEgFgH0FjYPStIFB68GxugXHgH+U6idKjoDBAYBAQQCBAI8K6Mma2wmnCk5AggBAQEDAwY7KqImam0CfhA0GP1+Fx4BIBYDfBceARYQJtIQB68H/LACPB4X6fymgzs7WgQKBgECBgQEA1o7O5ieOztZBAoDAQUGB1k7O5ieAAYAAP9qA1kDUgATABoAIwAzAEMAUwARQA5KRDo0LiYhGxUUDwcGLSsBHgEVERQGByEiJicRNDY3ITIWFwcVMyYvASYTESMiJic1IRETNDYzITIWHQEUBiMhIiY1BTIWHQEUBiMhIiY9ATQ2MwUyFh0BFAYjISImPQE0NjMDMxAWHhf9EhceASAWAfQWNg9K0gUHrwbG6BceAf5TjwoIAYkICgoI/ncICgGbCAoKCP53CAoKCAGJCAoKCP53CAoKCAJ+EDQY/X4XHgEgFgN8Fx4BFhAm0hAHrwf8sAI8Hhfp/KYB4wcKCgckCAoKCFkKCCQICgoIJAgKjwoIJAgKCggkCAoABgAA/7EDEgMLAA8AHwAvADsAQwBnABFADl9MQDw2MSsjGxMLAwYtKwERFAYrASImNRE0NjsBMhYXERQGKwEiJjURNDY7ATIWFxEUBisBIiY1ETQ2OwEyFhMRIREUHgEzITI+AQEzJyYnIwYHBRUUBisBERQGIyEiJicRIyImPQE0NjsBNz4BNzMyFh8BMzIWAR4KCCQICgoIJAgKjwoIJAgKCggkCAqOCgckCAoKCCQHCkj+DAgIAgHQAggI/on6GwQFsQYEAesKCDY0Jf4wJTQBNQgKCgisJwksFrIWLAgnrQgKAbf+vwgKCggBQQgKCgj+vwgKCggBQQgKCgj+vwgKCggBQQgKCv5kAhH97wwUCgoUAmVBBQEBBVMkCAr97y5EQi4CEwoIJAgKXRUcAR4UXQoAAAAAAgAA/2oD6ALDABcAPQAItToiCwACLSsBIg4BBxQWHwEHBgc2PwEXFjMyPgIuAQEUDgEjIicGBwYHIyImJzUmNiI/ATY/AT4CPwEuASc0PgEgHgEB9HLGdAFQSTAPDRpVRRgfJyJyxnQCeMIBgIbmiCcqbpMbJAMIDgICBAIDDAQNFAcUEAcPWGQBhuYBEOaGAnxOhEw+cikcNjItIzwVAwVOhJiETv7iYaRgBGEmBwUMCQECCgUPBQ4WCBwcEyoyklRhpGBgpAABAAD/aQPoAsMAJgAGsyILAS0rARQOASMiJwYHBgcGJic1JjYmPwE2PwE+Aj8BLgEnND4CMzIeAQPohuaIJypukxskCg4DAgQCAwwEDRQHFBAHD1hkAVCEvGSI5oYBXmGkYARhJggEAQwKAQIIBAMPBQ4WCBwcEyoyklRJhGA4YKQAAAACAAD/sAPoAsMAJQBLAAi1STYiCgItKwEUDgEjIicGBwYHIyImNSY0NjU/AjYHNz4CNy4BJzQ+ATIeARcUBgceAR8BFh8DFAcOAScmJyYnBiMiJxYzMjY3PgEnNCceAQMSarRrMDJGVRUbAgYMAQIBBAMDARwFDg4ERU4BarTWtGrWUEQFDAgbCQQFBAMBAgoIGxVVRjIwl3AgEVqkQkVMAQ1IVAGlTYRMCTEXBQQKBwEEBAEDBgMDAR4FGBIQKHRDToRMTITcQ3YnDhYKIQsDBQYKAQIICgEEBRcxCUoDMi80hkorKid4AAAAAAMAAP+wA+gCwwAVADsAYAAKt1xJIxYJAAMtKwEiDgEHFBYfAQc2PwEXFjMyPgE0LgEnMh4CDgEnIicGBwYHIyImNSY0NjU/AjYHNz4CNy4BJzQ+AQEeAR8BFh8DFAcOAScmJyYnBiMiJxYzMjY3PgEnNCceARQGAYlVllYBPDU2ExMPGR4rKlWUWFiUVWq2aAJssmwwMkZVFRsCBgwBAgEEAwMBHAUODgRFTgFqtAI2BQwIGwkEBQQDAQIKCBsVVUYyMJdwIBFapEJFTAENSFRQAnw6ZDktVh4gLgsKEgYIOmRwZjhITIScgk4BCTEXBQQKBwEEBAEDBgMDAR4FGBIQKHRDToRM/XQOFgohCwMFBgoBAggKAQQFFzEJSgMyLzSGSisqJ3iHdgAAAAMAAP9qA8QDUwAMABoAQgAKtzYhFA0KBgMtKwU0IyImNzQiFRQWNzIlISYRNC4CIg4CFRAFFAYrARQGIiY1IyImNT4ENzQ2NyY1ND4BFhUUBx4BFxQeAwH9CSEwARI6KAn+jALWlRo0UmxSNBoCpiod+lR2VPodKhwuMCQSAoRpBSAsIAVqggEWIDQqYAgwIQkJKToBqagBKRw8OCIiODwc/teoHSo7VFQ7Kh0YMlRehk9UkhAKCxceAiIVCwoQklROiFxWMAAAAgAA/2oDxANTAAwANAAItSgTCgYCLSsFNCMiJjc0IhUUFjcyJRQGKwEUBiImNSMiJjU+BDc0NjcmNTQ+ARYVFAceARcUHgMB/QkhMAESOigJAccqHfpUdlT6HSocLjAkEgKEaQUgLCAFaoIBFiA0KmAIMCEJCSk6AakdKjtUVDsqHRgyVF6GT1SSEAoLFx4CIhULChCSVE6IXFYwAAAAAAIAAP/5ATADCwAPAB8ACLUbEwsEAi0rJRUUBgcjIiY9ATQ2FzMyFhMDDgEnIyImJwMmNjsBMhYBHhYOjw4WFg6PDxQRDwEWDo8OFgEPARQPsw4Wmn0PFAEWDn0OFgEUAj7+Uw4WARQPAa0OFhYAAAAE////sQOhAwsAAwAMABUAPQANQAowHhMQCwQCAAQtKxchNSE1ITUjIiY9ASEBNC4BDgEWPgE3FRQGByMVFAYjISImJzUjIiY3NTQ2FzMRNDYzITIWHwEeAQcVMzIW1gH0/gwB9FkWIP6bAoMUIBICFhwYRgwGfSAW/egWHgF9BwwBQCskIBUBdxc2D1UPGAEjLT4Hj9bWIBZZ/ncPFAIYGhgEEBHoBwoBWRYgIBZZDAboLEABATAWIBgOVRA2Fo8+AAAABQAA//kD5AMLAAYADwA5AD4ASAAPQAxDQDw6HBMMCAIABS0rJTcnBxUzFQEmDwEGFj8BNhMVFAYjISImNRE0NjchMhceAQ8BBicmIyEiBgcRFBYXITI2PQE0PwE2FgMXASM1AQcnNzYyHwEWFAHwQFVANQEVCQnECRIJxAkkXkP+MENeXkMB0CMeCQMHGwgKDQz+MCU0ATYkAdAlNAUkCBg3of6JoQJvM6EzECwQVRC9QVVBHzYBkgkJxAkSCcQJ/r5qQ15eQwHQQl4BDgQTBhwIBAM0Jf4wJTQBNiRGBwUkCAgBj6D+iaABLjShMxAQVBAsAAEAAP+xA+gDLwAsAAazKBgBLSsBFAcBBiImNzUjIg4FFRQXFBYHFAYiJy4CJyY1NDc2ITM1NDYWFwEWA+gL/uMLHBgCfTdWVj44IhQDBAEKEQYECAYDRx5aAY59FCAJAR0LAe0PCv7iCxYOjwYSHjBAWjgfJgQSBggMCgUOFAOfXW9L4Y8OFgIJ/uILAAAAAAEAAP+xA+gDLgArAAazIwcBLSslFA8CBgcGIiYnNDY3NjU0LgUrARUUBiInASY0NwE2MhYHFTMgFxYD6EcGBwMFBhIIAQIBAxQiOD5WVjd9FCAJ/uMLCwEdCxwYAn0Bjloe4V2fDREIBAoMCAUUAyYfOFpAMB4SBo8OFgsBHgoeCgEeChQPj+FLAAAAAgAA/7ED6AM1ABQAOgAItTMcDQQCLSslFRQHBiMiJwEmNDcBNhYdAQcGFBcFFA4CDwEGIyInJjc2Jy4BJxUUBwYjIicBJjQ3ATYXFh0BFhcWAWUWBwcPCv7jCwsBHREs3QsLA2ASGhwIDAQLAwIOARhTJHZbFQgGDwr+4gsLAR4QFxXmaV72JxcKAwsBHgoeCgEeERMXJ94LHAvzIFRGRhAWCgEED99cKCwHjBcKAwsBHgoeCgEeEQoJF5MPbGEAAwAA//kD6AJ9ABEAIgAzAAq3MCcbFA8CAy0rASYnFhUUBiImNTQ3BgceASA2ATQmByIGFRQeATY1NDYzMjYFFAcGBCAkJyY0NzYsAQQXFgOhVYAiktCSIoBVS+ABBOD+uRALRmQQFhBEMAsQAdkLTv74/tr++E4LC04BCAEmAQhOCwE6hEE6Q2iSkmhDOkGEcoiIAUkLEAFkRQwOAhIKMEQQzBMTgZqagRMmFICaAp5+FAAAAgAA/70DTQMLAAgAHQAItRcNBwICLSsTNCYOAR4CNgEUBwEGIicBLgE9ATQ2NzMyFhcBFvoqOiwCKD4mAlUU/u4WOxT+cRUeKh3pHUgVAY8UAlgeKgImQCQGMP7ZHhX+7hUVAY8VSB3oHSoBHhX+cRUAAAADAAD/vQQkAwsACAAdADQACrctIhcNBwIDLSsTNCYOAR4CNgEUBwEGIicBLgE9ATQ2NzMyFhcBFhcUBwEGIyImJwE2NCcBLgEjMzIWFwEW+io6LAIoPiYCVRT+7hY7FP5xFR4qHekdSBUBjxTXFf7uFh0UGhABBhUV/nEVSB19HUgVAY8VAlgeKgImQCQGMP7ZHhX+7hUVAY8VSB3oHSoBHhX+cRUdHhX+7hUQEQEGFTsVAY8VHh4V/nEVAAEAAP/5AoMDUwAjAAazEwcBLSsBMhYXERQGByEiJicRNDYXMzU0Nh4BBxQGByMiJjU0JiIGFxUCTRceASAW/ekXHgEgFhGUzJYCFA8kDhZUdlQBAaUeF/6+Fh4BIBUBQhYgAbNnlAKQaQ8UARYOO1RUO7MAAQAA//kDoQMMACUABrMkFwEtKwEVFAYHIyImPQE0Jg4BBxUzMhYXERQGByEiJicRNDYXITU0PgEWA6EWDiQOFlJ4UgE1Fx4BIBb96RceASAWAXeS0JACEY8PFAEWDo87VAJQPWweF/6+Fh4BIBUBQhYgAWxnkgKWAAAAAAIAAP/5AoMDCwAHAB8ACLUYDAQAAi0rEyE1NCYOARcFERQGByEiJicRNDYXMzU0NjIWBxUzMhazAR1UdlQBAdAgFv3pFx4BIBYRlMyWAhIXHgGlbDtUAlA9of6+Fh4BIBUBQhYgAWxmlJRmbB4AAAACAAD/+AOTAsUAEAAyAAi1IxoOAwItKwERFAYnIzUjFSMiJicRCQEWNwcGByMiJwkBBiMmLwEmNjcBNjIfATU0NjsBMhYdARceAQMSFg7Wj9YPFAEBQQFBAXwiBQcCBwX+fv5+BwYHBSMEAgUBkRIwE4gKCGsICnoFAgEo/vUPFgHW1hQQAQ8BCP74ASQpBQEDAUL+vgQCBSkFEAQBTg8Pcm0ICgoI42YFDgAAAgAA//kBZgMLAB4ALgAItSojFgQCLSslFRQGByEiJic1NDY3MzUjIiYnNTQ2NzMyFhcRMzIWAxUUBgcjIiY9ATQ2OwEyFgFlFBD+4w8UARYOIyMPFAEWDtYPFAEjDxZIFg6PDhYWDo8PFGRHDxQBFg5HDxQB1hYORw8UARYO/r8WAnVrDxQBFg5rDhYWAAAAAgAA//gCOQLDAA8AOgAItTUcCwMCLSslFRQGJyMiJj0BNDYXMzIWExQOAwcOARUUBgcjIiY9ATQ2Nz4BNCYiBwYHBiMiLwEuATc2MzIeAgGJDgiGCQ4OCYYIDrAQGCYaFRceDgmGCAxKKiEcNEYYFCgHCgcHWwgCBFmqLVpILpWGCQ4BDAqGCQ4BDAFFHjQiIBIKDTANChABFAsaLlITDyIwJBAOMgkERgYQCJQiOlYAAAAAAv///2oDoQMNAAgAIQAItRkLBgMCLSsBNC4BBh4BPgEBFAYiLwEGIyIuAj4EHgIXFAcXFgKDlMyWBI7UjAEiLDoUv2R7UJJoQAI8bI6kjHA4A0W/FQGCZ5IClsqYBoz+mh0qFb9FPmqQoo5uOgRCZpZNe2S/FQAAAwAA/9IEHgLqAAgAMABLAAq3QTchCgQAAy0rPQEzMjcWFwYjAzUzMh4CFRQWOwE1NDYfARYVFAYPAgYmJzUHBjUjIi4CNTQmIyU2OwE1NDYfARYVFAYPAgYmJzUjIhUjIgcm5RwYH0NHT+XlQXRWMlI8XBQM6ggEAgLqDRIBBANVQHZUMlQ7ATVEUlwUDOoIBAIC6g0SAQQDVRoZICKtClQ9JgHKrTJUdkA6VDQQDAmQBQkDCAECjwkMDzYBAQEyVHY/O1SIJTYPDAmQBggEBgICkAgMDzUBClUAAAEAAP+sA6wC4AAXAAazBAABLSsBMhYQBiMiJzcWMzI2ECYiBgczByczPgECFKru7qqObkZUYn60tPq0Ao64uHwC8ALg8P6s8FhKPLQBALSufMzMpuoAAAACAAD/sQR3AwsABQAfAAi1GxEDAQItKwUVIREzEQEVFAYvAQEGIi8BBycBNjIfAQEnJjY7ATIWBHf7iUcD6BQKRP6fBg4GguhrAUYGDgaCAQNDCQgN8wcKB0gDWvzuArjyDAoJRP6fBgaC6WwBRgYGggEDQwkWCgADAAD/agRvA1MACwAXAD8ACrc0HRcTCAADLSsBFhcUBisBFAYiJicXMjQHIiY1NCIVFBYBFhQHAQYmLwEmND8BJjU+BDc0NjcmNTQ+ARYXFAceARc3NhYXA2UihSwc+lR2UgGOCQkgMBI6AlgEBvvrBRAELwQGaAscLjAkFAGCagQeLh4BBEVqHeoFEAQBd8dwHSo7VFQ6YRIBMCEJCSk6A30FEAT8dwUCBTUGEARZEhMYMlRehk9UkhAKCxceAiIVCwoKSDTKBQIFAAAEAAD/agRvA1MADAAXACcATwANQApFLiYeEQ0KBgQtKwU0IyImNTQiFRQWNzIJAS4BJyIOAgcUBRQGKwEUBiImJzchJic3FhMXFhQHAQYmLwEmND8BJjU+BDc0NjcmNTQ+ARYXFAceARc3NhYCRAkgMBI6KAn+1QHpF2ZKM1YyGgECpywc+lR2UgFTAaZcIz4itS8EBvvrBRAELwQGaAscLjAkFAGCagQeLh4BBEVqHeoFEGAIMCEJCSk6AQESAagxQAEiODwc1/odKjtUVDpIaZc3xwKZNgUQBPx3BQIFNQYQBFkSExgyVF6GT1SSEAoLFx4CIhULCgpINMoFAgAAAQAA/2oD6ANSAB0ABrMUCgEtKwEWFA8BFwcOAScHIzU3JjY/ARc3NjIeAQ8BFzc2MgPTFRXfU1lb/GjKZcpFGltZVN8VPCgCFt+D3xY6AlUUPBXfVFlbGkXKZcpn/lpZU98VKjoW4ILfFQAABQAA/8MD6AKxAAkAGgA+AEQAVwAPQAxTS0NCNiITDAYABS0rJTcuATc0NwYHFgE0JgciBhUUHgE2NTQ2MzI2NxQVBgIPAQYjIicmNTQ3LgEnJjQ3PgEzMhc3NjMyFh8BFgcWExQGBxMWFxQHBgcOASM3PgE3Jic3HgEXFgE2KzA4ASKAVV4BahALRmQQFhBEMAsQyjvqOxwFCgdECRlQhjILC1b8lzIyHwUKAw4LJAsBCRVYSZ0E+gsWJ1TcfCl3yEVBXSM1YiALaU8jaj1DOkGEkAFnCxABZEUMDgISCjBEEHUEAWn+WmkyCScGCgcqJHhNESoSg5gKNgkGBhQGAQX+/U6AHAEZGl0TEyQtYGpKCoRpZEA/JGQ0EwAC//7/xAM2AvgADgAdAAi1Fg8JAgItKz8BESU3JhI3NjcXBgcOAQEFBxYCBwYHJzY3PgEnB7p0/uxYdAR2ZIwEZEhYBAGiARRYdAR2YJACYkhYBFZyjHT+3BBWegFQeGQQZhBIWPoB+hBWev6weGIUaBBIWPpcdAABAAD/xAOsAvgAFwAGsxIAAS0rATIWFzMHJzMuASIGFBYzMjcXBiMiJhA2AZio7gR6uLiQBLT6tLR+aE5Gbo6o8PAC+Oimzs58rLT+tDxMWPABVPAAAAAABP////kELwLDAA8AHwAqADIADUAKLSslIBwTBgAELSs3IiY1ETQ2MyEyFhcRFAYjAREUFjchMjY1ETQmJyEiBgEzFRQGByEiJjc1BTI0KwEiFDPoJTQ0JQJfJTQBNiT9jwwGAl8ICgoI/aEHCgL/WTQl/IMkNgECRAkJWQkJiDQlAYklNDQl/nclNAHi/ncHDAEKCAGJBwoBDP30NhYeASAVNjYSEgAAAwAA/7EDWgNSAAgAPgBuAAq3ZEstEwYDAy0rNzQuAQYUFj4BATQmJyM0Nic0JicOAgcGDwEOAg8BDgEnIxEzMh4EFxY7ATI1NCc+ATQnNjU0Jic+ATcUBxYVFAcWFRQHFAYrASImJyYrASImNRE0NjsBNjc2Nz4CNzYzMh4BFRQHMzIWjxYcFhYcFgKDLBzENgEiNw4OFBcNHg0LDhgKFgwUChISBxYOHAwcAnZJQ2sCEBQKHQoJEhhHGwUVASFgTkg2aEVBDKEdKiodmRQ5IBwNDBYYFhwvSigbYjpWZA8UAhgaGAIUAVAdKgEgciA3NAEPQkoYDSYRDhAgCRMKDAH+mwIGBggGAildDxAJKigSHCcNJAgBMhUyKRIUKyYMDDgrTloaFxcqHQFlHioNSSoeDkJMFhUkTkEzOFQAAAADAAD/agNZAwsACAA/AHEACrdjSTUZBgMDLSsTNC4BBhQWPgEBNCYjPgEnNCc2NCYnNjU0JisBIg8BBg8CBicjETMyHgUXFhceAhcyNic0JiczMjY1MxQGJyMWFRQOASMiJy4DJyYnJicjIiY1ETQ2OwEyNz4BNzMyFh0BFhUUBxYVFAcWjxYcFhYcFgKDGBIIDAEdChQQAjYxR0l2EA0HKRIKCBISCRYWFhYQFAMeDRcUDg42JAE0AcQcLEdUO2IbJ0wuHBYTFgYOChshORSZHSoqHaEMQUhqOj9OYCEBFQUbAlgPFAIYGhgCFP7OEzQKIg0nHBIoKgkQDy8uKQYFAgwEAgH+mgoUEiAQHgEmDRhKQg82NiByICwbOVYBNzRCTSQVEjYwLg0cK0kNKh4BZR0qFhkYAVpLAys4DQsmKxQSKQAI////sQNbAy4ACAARABoAIwAsADUAPgBHABVAEkZBPDgzLyonIh0YFBALBgIILSslFAYuAjYyFhcUBiIuAT4BFgEUBiImPgEyFgEUBiIuAT4BFgEUDgEuATYeASUUBiIuATYyFgEUBiIuATYyFicUBi4CPgEWARUwQi4CMkAw8So8KAIsOC7+qzZINgIyTDICRiQ2IgImMij+LjpSOAI8Tj4BAUBYPgJCVEQBLR4uHgIiKiJ2GiYYAhwiHmQhMAEuRC4ujR4qKjwoAiwBSSU0NEo0NP7hGiQkNCQCKAHcKTgCPE48AjhCLT4+Wj4+/m4WICAsICDkEhwCGCgWBiIAAQAA/7QDDwMIADYABrMJAgEtKyUUBiMiJwEmNDYyFwEWFAYiJwEmIgYWFwEWMzI2NzQnASYjIgYUHwEWFAYiLwEmNTQ2MzIXARYDD1hBSzj+Tj98sEABUgUiEAb+rix0UgEqAbEjLiQuAST+vA4TEBYO5QYkDwXlI0AtMSIBRTdNQVg3AbJAr3w//q4FECIFAVMrVHUr/k8jLiQuIwFEDhYiD+QGECIF5SIxLkAk/rw2AAAADwAA//kELwJ8AAsAFwAjAC8AOwBHAFMAXwBrAHcAgwCPAJ8AowCzACNAIK+noaCckoyGgHp0bmhiXFZQSkQ+ODIsJiAaFA4IAg8tKzcVFCsBIj0BNDsBMjcVFCsBIj0BNDsBMicVFCsBIj0BNDsBMgEVFCMhIj0BNDMhMiUVFCsBIj0BNDsBMicVFCsBIj0BNDsBMhcVFCsBIj0BNDsBMicVFCsBIj0BNDsBMhcVFCsBIj0BNDsBMhcVFCsBIj0BNDsBMgEVFCsBIj0BNDsBMhcVFCsBIj0BNDsBMhcVFCsBIj0BNDsBNTQ7ATITESERAREUBiMhIiY1ETQ2MyEyFtYJNQkJNQlICX0JCX0JSAk1CQk1CQI8Cf4eCQkB4gn+mwk2CQk2CUgJNQkJNQnWCDYJCTYIRwk1CQk1CdYJNQkJNQnXCTYJCTYJ/uIJNgkJNgmPCTYJCTYJjwl9CQk+CTYJR/xfA+gqHfxfHSoqHQOhHijGNQkJNQmGNQkJNQmGNgkJNgn+2TUJCTUJhjUJCTUJhjYJCTYJmDUJCTUJhjYJCTYJmDUJCTUJmDUJCTUJARU2CQk2CQk2CQk2CQnECQk1CYYJ/lMB9P4MAfT+DB0qKh0B9B4qKgAAAAADAAD/+QNaAsQADwAfAC8ACrcrJBsTDAQDLSslFRQGByEiJic1NDY3ITIWAxUUBichIiYnNTQ2FyEyFgMVFAYHISImJzU0NhchMhYDWRQQ/O8PFAEWDgMRDxYBFBD87w8UARYOAxEPFgEUEPzvDxQBFg4DEQ8WZEcPFAEWDkcPFAEWARBIDhYBFA9IDhYBFAEORw8UARYORw8WARQAAAAABAAAAAAEXwMLAAoAIAA6AFIADUAKSzszIRoLBgAELSshIiYnND4BFgcUBjciLgEiBg8BIiYnNDc+AhYXFhUUBjciJy4BByIOAyMiJjU0Nz4BHgEXFhUUBjciJy4BJAYHBiMiJic0NzYkDAEXFhUUBgI7C1ABRixIAVKMASpISEYWFgpUAQYsgoKCLQVUjgYGTIJVL2BGOCACCVQGSdLW0koGVI4GB2TW/wDUZQcGCVQBBmgBIAEsASJnBVRSCxIYAhwQC1KXHBwcDg5UCgcGKzACNCkGBwpUmAU6OAEYIiQYVAoHBUpSAk5MBQcKVJcFWFgCXFYFVAoHBmhyAm5qBgcKVAAC//7/sQM2AwsAEgAwAAi1IRUPCAItKyUGIyIuATc0Nw4BBxQeAjcyNjcOASMiLgI3ND4CNzYWBw4BBxQeATcyNzYXHgECwB4fZqxmATpwjgE6XoZIUJClNdR8V6BwSAJAbppUGRMSMDIBUoxSQj0XEQgEewVkrmVrXCG+d0mEXjwCRG1xiER0nldVnHJGAwEuESt0QFOKVAEdChEIFgAAA//+/7EDxANSAAsAEAAWAAq3ExEQDAoEAy0rCQEOAQciLgI+ATMTIRQGBxMhETIeAQGtATA7nld1xnAEeL55aAGvQj1c/lN1xHQBYf7QPUIBdMTqxHT+U1ieOwF4Aa1yxgAAAAIAAP+xBHcDCwAFAAsACLUKBwMBAi0rBRUhETMRARMhERMBBHf7iUcDWo78YPoBQQdIA1r87gI7/gwBQgFB/r8AAAAABQAA/7EEdwMLAAMABwANABEAFQAPQAwTEg8OCwkFBAEABS0rAREjEQERIxEBFSERMxEBESMRJREjEQFljwFljgLK+4lHAsuPAWWPAV7+4gEeAR79xAI8/X1IA1r87gH0/lMBrdb9fQKDAAAAAgAA/7EDcwMLABcAHgAItRwZDgMCLSslFgYHISImNwE1IyImPgEzITIeAQYrARUPASEDNSMVA1QfJjv9fTsoIAEZJA4WAhIQAR4PFAIYDSSalwGNo0cqMkYBSDEBut8WHBYWHBbfJfABAfPzAAAAAAYAAP/AA6EDUgADABQAHAAkACwANAARQA40MCwoJCAcGBAIAgAGLSsBNycHJRQHAQYiLwEmNDcBNjIfARYlFw8BLwE/AR8BDwEvAT8BARcPAS8BPwEBFw8BLwE/AQKYpDykATUK/TMKHgpvCgoCzgoeCm4K/Q82NhERNzcR1G1tIiFtbSECKTc3ERE2NhH+rDY2ERE2NhECDqM8pGgPCv0yCgpvCh4KAs4KCm8KWxARNzcREDeRIiFtbSEibf6IERA3NxARNwEuEBE3NxEQNwAB//n/ewP4A1gAJQAGsx8BAS0rJQYkJyYCNz4BNzYWFx4BBwYHBgIXFiQ3PgEnJiQHNTYEFxYCBwYDV5f+apSPDoEIEQocQBkWCA4GCmkGZ3oBOGxQLTBD/uSftwFHTjQpUxAJjQ6MlQGEngoSBhEHFxg8HAwKdv7ebHEddl7vdpZ6MgE7iq1//vxqFgAAAAABAAAAAQAAcEJz0F8PPPUACwPoAAAAANEJHTUAAAAA0QjzBf/5/2kEvwNYAAAACAACAAAAAAAAAAEAAANS/2oAWgUFAAD/6QS/AAEAAAAAAAAAAAAAAAAAAAB2A+gAAAPoAAADEQAABC8AAAOgAAADMQAAA6AAAAOgAAADoAAAA6AAAAOgAAAD6AAABQUAAANZAAAD6AAAA+gAAAOgAAADoAAAA+gAAAOgAAAD6AAAAxEAAANZAAADoAAAA+gAAAPoAAADWQAABC8AAAH0AAAD6AAAAjsAAAI7AAABZQAAAWUAAAPoAAACygAAA+gAAALKAAADoAAAA1kAAANZAAADoAAAA1kAAANZAAADWQAAA+gAAAPoAAABrAAAA6AAAANZAAADoAAAAjsAAANZAAADoAAAAoIAAAGsAAADEQAAAoIAAANZAAADoAAAA6AAAAOgAAADoAAAA1kAAAQvAAADWQAAAxEAAANZAAADWQAAA1kAAANZAAADEQAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAAWUAAAOgAAAD6AAAA+gAAAPoAAAD6AAAA+gAAANZAAAELwAAAoIAAAOgAAACggAAA6AAAAFlAAACOwAAA6AAAAQeAAADrAAABHYAAAR2AAAEdgAAA+gAAAPoAAADNAAAA6wAAAQvAAADWQAAA1kAAANrAAADEQAABC8AAANZAAAEdgAAA1kAAAPoAAAEdgAABHYAAAOgAAADoAAAA+gAAAAAAAAA0gESAagBvgHcAfgCCAI2Ap4DBAOqBCAEhgUQBYIF/AZ2BswHOgegB8oIIAjUCTIKDgziDRINTA3ADeAOAA4eDj4Oag6WDsIO7g8mD14PlA/MEDAQghDSETQRahGiEgwSThKgEygTchQaFGgUjhUEFVYVvBYgFogXPBeOGAYZZhoGGoIbUhvWHFIc1B1wHdQeFh6MHyIfhh/WIA4gcCDqITIheCHYIjIibCLKIwQjQiN6I9AkGCRyJK4lHCVIJYQl6iZqJqAnLidqJ5Yn6iiKKSwprCoGKvQrRCvGLBYsSCxqLKAs2C1ALYcAAAABAAAAdgH4AA8AAAAAAAIAAAAQAHMAAAA0C3AAAAAAAAAAEgDeAAEAAAAAAAAANQAAAAEAAAAAAAEABQA1AAEAAAAAAAIABwA6AAEAAAAAAAMABQBBAAEAAAAAAAQABQBGAAEAAAAAAAUACwBLAAEAAAAAAAYABQBWAAEAAAAAAAoAKwBbAAEAAAAAAAsAEwCGAAMAAQQJAAAAagCZAAMAAQQJAAEACgEDAAMAAQQJAAIADgENAAMAAQQJAAMACgEbAAMAAQQJAAQACgElAAMAAQQJAAUAFgEvAAMAAQQJAAYACgFFAAMAAQQJAAoAVgFPAAMAAQQJAAsAJgGlQ29weXJpZ2h0IChDKSAyMDE1IGJ5IG9yaWdpbmFsIGF1dGhvcnMgQCBmb250ZWxsby5jb21pZm9udFJlZ3VsYXJpZm9udGlmb250VmVyc2lvbiAxLjBpZm9udEdlbmVyYXRlZCBieSBzdmcydHRmIGZyb20gRm9udGVsbG8gcHJvamVjdC5odHRwOi8vZm9udGVsbG8uY29tAEMAbwBwAHkAcgBpAGcAaAB0ACAAKABDACkAIAAyADAAMQA1ACAAYgB5ACAAbwByAGkAZwBpAG4AYQBsACAAYQB1AHQAaABvAHIAcwAgAEAAIABmAG8AbgB0AGUAbABsAG8ALgBjAG8AbQBpAGYAbwBuAHQAUgBlAGcAdQBsAGEAcgBpAGYAbwBuAHQAaQBmAG8AbgB0AFYAZQByAHMAaQBvAG4AIAAxAC4AMABpAGYAbwBuAHQARwBlAG4AZQByAGEAdABlAGQAIABiAHkAIABzAHYAZwAyAHQAdABmACAAZgByAG8AbQAgAEYAbwBuAHQAZQBsAGwAbwAgAHAAcgBvAGoAZQBjAHQALgBoAHQAdABwADoALwAvAGYAbwBuAHQAZQBsAGwAbwAuAGMAbwBtAAAAAAIAAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAQIBAwEEAQUBBgEHAQgBCQEKAQsBDAENAQ4BDwEQAREBEgETARQBFQEWARcBGAEZARoBGwEcAR0BHgEfASABIQEiASMBJAElASYBJwEoASkBKgErASwBLQEuAS8BMAExATIBMwE0ATUBNgE3ATgBOQE6ATsBPAE9AT4BPwFAAUEBQgFDAUQBRQFGAUcBSAFJAUoBSwFMAU0BTgFPAVABUQFSAVMBVAFVAVYBVwFYAVkBWgFbAVwBXQFeAV8BYAFhAWIBYwFkAWUBZgFnAWgBaQFqAWsBbAFtAW4BbwFwAXEBcgFzAXQBdQF2CWRhc2hib2FyZAR1c2VyBXVzZXJzAm9rBmNhbmNlbARwbHVzBW1pbnVzDGZvbGRlci1lbXB0eQhkb3dubG9hZAZ1cGxvYWQDZ2l0BWN1YmVzCGRhdGFiYXNlBWdhdWdlB3NpdGVtYXAMc29ydC1uYW1lLXVwDnNvcnQtbmFtZS1kb3duCW1lZ2FwaG9uZQNidWcFdGFza3MGZmlsdGVyA29mZgRib29rBXBhc3RlCHNjaXNzb3JzBWdsb2JlBWNsb3VkBWZsYXNoCGJhcmNoYXJ0CGRvd24tZGlyBnVwLWRpcghsZWZ0LWRpcglyaWdodC1kaXIJZG93bi1vcGVuCnJpZ2h0LW9wZW4HdXAtb3BlbglsZWZ0LW9wZW4GdXAtYmlnCXJpZ2h0LWJpZwhsZWZ0LWJpZwhkb3duLWJpZw9yZXNpemUtZnVsbC1hbHQLcmVzaXplLWZ1bGwMcmVzaXplLXNtYWxsBG1vdmURcmVzaXplLWhvcml6b250YWwPcmVzaXplLXZlcnRpY2FsB3pvb20taW4FYmxvY2sIem9vbS1vdXQJbGlnaHRidWxiBWNsb2NrCXZvbHVtZS11cAt2b2x1bWUtZG93bgp2b2x1bWUtb2ZmBG11dGUDbWljB2VuZHRpbWUJc3RhcnR0aW1lDmNhbGVuZGFyLWVtcHR5CGNhbGVuZGFyBndyZW5jaAdzbGlkZXJzCHNlcnZpY2VzB3NlcnZpY2UFcGhvbmUIZmlsZS1wZGYJZmlsZS13b3JkCmZpbGUtZXhjZWwIZG9jLXRleHQFdHJhc2gNY29tbWVudC1lbXB0eQdjb21tZW50BGNoYXQKY2hhdC1lbXB0eQRiZWxsCGJlbGwtYWx0DWF0dGVudGlvbi1hbHQFcHJpbnQEZWRpdAdmb3J3YXJkBXJlcGx5CXJlcGx5LWFsbANleWUDdGFnBHRhZ3MNbG9jay1vcGVuLWFsdAlsb2NrLW9wZW4EbG9jawRob21lBGluZm8EaGVscAZzZWFyY2gIZmxhcHBpbmcGcmV3aW5kCmNoYXJ0LWxpbmUIYmVsbC1vZmYOYmVsbC1vZmYtZW1wdHkEcGx1ZwdleWUtb2ZmCnJlc2NoZWR1bGUCY3cEaG9zdAl0aHVtYnMtdXALdGh1bWJzLWRvd24Hc3Bpbm5lcgZhdHRhY2gIa2V5Ym9hcmQEbWVudQR3aWZpBG1vb24JY2hhcnQtcGllCmNoYXJ0LWFyZWEJY2hhcnQtYmFyBmJlYWtlcgVtYWdpYwVzcGluNgAAAAEAAf//AA8AAAAAAAAAAAAAAACwACwgsABVWEVZICBLuAAOUUuwBlNaWLA0G7AoWWBmIIpVWLACJWG5CAAIAGNjI2IbISGwAFmwAEMjRLIAAQBDYEItsAEssCBgZi2wAiwgZCCwwFCwBCZasigBCkNFY0VSW1ghIyEbilggsFBQWCGwQFkbILA4UFghsDhZWSCxAQpDRWNFYWSwKFBYIbEBCkNFY0UgsDBQWCGwMFkbILDAUFggZiCKimEgsApQWGAbILAgUFghsApgGyCwNlBYIbA2YBtgWVlZG7ABK1lZI7AAUFhlWVktsAMsIEUgsAQlYWQgsAVDUFiwBSNCsAYjQhshIVmwAWAtsAQsIyEjISBksQViQiCwBiNCsQEKQ0VjsQEKQ7AAYEVjsAMqISCwBkMgiiCKsAErsTAFJbAEJlFYYFAbYVJZWCNZISCwQFNYsAErGyGwQFkjsABQWGVZLbAFLLAHQyuyAAIAQ2BCLbAGLLAHI0IjILAAI0JhsAJiZrABY7ABYLAFKi2wBywgIEUgsAtDY7gEAGIgsABQWLBAYFlmsAFjYESwAWAtsAgssgcLAENFQiohsgABAENgQi2wCSywAEMjRLIAAQBDYEItsAosICBFILABKyOwAEOwBCVgIEWKI2EgZCCwIFBYIbAAG7AwUFiwIBuwQFlZI7AAUFhlWbADJSNhRESwAWAtsAssICBFILABKyOwAEOwBCVgIEWKI2EgZLAkUFiwABuwQFkjsABQWGVZsAMlI2FERLABYC2wDCwgsAAjQrILCgNFWCEbIyFZKiEtsA0ssQICRbBkYUQtsA4ssAFgICCwDENKsABQWCCwDCNCWbANQ0qwAFJYILANI0JZLbAPLCCwEGJmsAFjILgEAGOKI2GwDkNgIIpgILAOI0IjLbAQLEtUWLEEZERZJLANZSN4LbARLEtRWEtTWLEEZERZGyFZJLATZSN4LbASLLEAD0NVWLEPD0OwAWFCsA8rWbAAQ7ACJUKxDAIlQrENAiVCsAEWIyCwAyVQWLEBAENgsAQlQoqKIIojYbAOKiEjsAFhIIojYbAOKiEbsQEAQ2CwAiVCsAIlYbAOKiFZsAxDR7ANQ0dgsAJiILAAUFiwQGBZZrABYyCwC0NjuAQAYiCwAFBYsEBgWWawAWNgsQAAEyNEsAFDsAA+sgEBAUNgQi2wEywAsQACRVRYsA8jQiBFsAsjQrAKI7AAYEIgYLABYbUQEAEADgBCQopgsRIGK7ByKxsiWS2wFCyxABMrLbAVLLEBEystsBYssQITKy2wFyyxAxMrLbAYLLEEEystsBkssQUTKy2wGiyxBhMrLbAbLLEHEystsBwssQgTKy2wHSyxCRMrLbAeLACwDSuxAAJFVFiwDyNCIEWwCyNCsAojsABgQiBgsAFhtRAQAQAOAEJCimCxEgYrsHIrGyJZLbAfLLEAHistsCAssQEeKy2wISyxAh4rLbAiLLEDHistsCMssQQeKy2wJCyxBR4rLbAlLLEGHistsCYssQceKy2wJyyxCB4rLbAoLLEJHistsCksIDywAWAtsCosIGCwEGAgQyOwAWBDsAIlYbABYLApKiEtsCsssCorsCoqLbAsLCAgRyAgsAtDY7gEAGIgsABQWLBAYFlmsAFjYCNhOCMgilVYIEcgILALQ2O4BABiILAAUFiwQGBZZrABY2AjYTgbIVktsC0sALEAAkVUWLABFrAsKrABFTAbIlktsC4sALANK7EAAkVUWLABFrAsKrABFTAbIlktsC8sIDWwAWAtsDAsALABRWO4BABiILAAUFiwQGBZZrABY7ABK7ALQ2O4BABiILAAUFiwQGBZZrABY7ABK7AAFrQAAAAAAEQ+IzixLwEVKi2wMSwgPCBHILALQ2O4BABiILAAUFiwQGBZZrABY2CwAENhOC2wMiwuFzwtsDMsIDwgRyCwC0NjuAQAYiCwAFBYsEBgWWawAWNgsABDYbABQ2M4LbA0LLECABYlIC4gR7AAI0KwAiVJiopHI0cjYSBYYhshWbABI0KyMwEBFRQqLbA1LLAAFrAEJbAEJUcjRyNhsAlDK2WKLiMgIDyKOC2wNiywABawBCWwBCUgLkcjRyNhILAEI0KwCUMrILBgUFggsEBRWLMCIAMgG7MCJgMaWUJCIyCwCEMgiiNHI0cjYSNGYLAEQ7ACYiCwAFBYsEBgWWawAWNgILABKyCKimEgsAJDYGQjsANDYWRQWLACQ2EbsANDYFmwAyWwAmIgsABQWLBAYFlmsAFjYSMgILAEJiNGYTgbI7AIQ0awAiWwCENHI0cjYWAgsARDsAJiILAAUFiwQGBZZrABY2AjILABKyOwBENgsAErsAUlYbAFJbACYiCwAFBYsEBgWWawAWOwBCZhILAEJWBkI7ADJWBkUFghGyMhWSMgILAEJiNGYThZLbA3LLAAFiAgILAFJiAuRyNHI2EjPDgtsDgssAAWILAII0IgICBGI0ewASsjYTgtsDkssAAWsAMlsAIlRyNHI2GwAFRYLiA8IyEbsAIlsAIlRyNHI2EgsAUlsAQlRyNHI2GwBiWwBSVJsAIlYbkIAAgAY2MjIFhiGyFZY7gEAGIgsABQWLBAYFlmsAFjYCMuIyAgPIo4IyFZLbA6LLAAFiCwCEMgLkcjRyNhIGCwIGBmsAJiILAAUFiwQGBZZrABYyMgIDyKOC2wOywjIC5GsAIlRlJYIDxZLrErARQrLbA8LCMgLkawAiVGUFggPFkusSsBFCstsD0sIyAuRrACJUZSWCA8WSMgLkawAiVGUFggPFkusSsBFCstsD4ssDUrIyAuRrACJUZSWCA8WS6xKwEUKy2wPyywNiuKICA8sAQjQoo4IyAuRrACJUZSWCA8WS6xKwEUK7AEQy6wKystsEAssAAWsAQlsAQmIC5HI0cjYbAJQysjIDwgLiM4sSsBFCstsEEssQgEJUKwABawBCWwBCUgLkcjRyNhILAEI0KwCUMrILBgUFggsEBRWLMCIAMgG7MCJgMaWUJCIyBHsARDsAJiILAAUFiwQGBZZrABY2AgsAErIIqKYSCwAkNgZCOwA0NhZFBYsAJDYRuwA0NgWbADJbACYiCwAFBYsEBgWWawAWNhsAIlRmE4IyA8IzgbISAgRiNHsAErI2E4IVmxKwEUKy2wQiywNSsusSsBFCstsEMssDYrISMgIDywBCNCIzixKwEUK7AEQy6wKystsEQssAAVIEewACNCsgABARUUEy6wMSotsEUssAAVIEewACNCsgABARUUEy6wMSotsEYssQABFBOwMiotsEcssDQqLbBILLAAFkUjIC4gRoojYTixKwEUKy2wSSywCCNCsEgrLbBKLLIAAEErLbBLLLIAAUErLbBMLLIBAEErLbBNLLIBAUErLbBOLLIAAEIrLbBPLLIAAUIrLbBQLLIBAEIrLbBRLLIBAUIrLbBSLLIAAD4rLbBTLLIAAT4rLbBULLIBAD4rLbBVLLIBAT4rLbBWLLIAAEArLbBXLLIAAUArLbBYLLIBAEArLbBZLLIBAUArLbBaLLIAAEMrLbBbLLIAAUMrLbBcLLIBAEMrLbBdLLIBAUMrLbBeLLIAAD8rLbBfLLIAAT8rLbBgLLIBAD8rLbBhLLIBAT8rLbBiLLA3Ky6xKwEUKy2wYyywNyuwOystsGQssDcrsDwrLbBlLLAAFrA3K7A9Ky2wZiywOCsusSsBFCstsGcssDgrsDsrLbBoLLA4K7A8Ky2waSywOCuwPSstsGossDkrLrErARQrLbBrLLA5K7A7Ky2wbCywOSuwPCstsG0ssDkrsD0rLbBuLLA6Ky6xKwEUKy2wbyywOiuwOystsHAssDorsDwrLbBxLLA6K7A9Ky2wciyzCQQCA0VYIRsjIVlCK7AIZbADJFB4sAEVMC0AS7gAyFJYsQEBjlmwAbkIAAgAY3CxAAVCsQAAKrEABUKxAAgqsQAFQrEACCqxAAVCuQAAAAkqsQAFQrkAAAAJKrEDAESxJAGIUViwQIhYsQNkRLEmAYhRWLoIgAABBECIY1RYsQMARFlZWVmxAAwquAH/hbAEjbECAEQA') format('truetype');
+  src: url('data:application/octet-stream;base64,d09GRgABAAAAAEfwAA4AAAAAdfwAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABRAAAAEQAAABWPilJfGNtYXAAAAGIAAAAOgAAAUrQiRm3Y3Z0IAAAAcQAAAAKAAAACgAAAABmcGdtAAAB0AAABZQAAAtwiJCQWWdhc3AAAAdkAAAACAAAAAgAAAAQZ2x5ZgAAB2wAADl0AABcXCxnaL9oZWFkAABA4AAAADUAAAA2B4amFGhoZWEAAEEYAAAAIAAAACQIbgTTaG10eAAAQTgAAAChAAAB6KMeAABsb2NhAABB3AAAAPYAAAD2vt+o2m1heHAAAELUAAAAIAAAACABMQ16bmFtZQAAQvQAAAF5AAACqcQUfvlwb3N0AABEcAAAAxUAAAUH6ocNSnByZXAAAEeIAAAAZQAAAHvdawOFeJxjYGTOZ5zAwMrAwVTFtIeBgaEHQjM+YDBkZGJgYGJgZWbACgLSXFMYHF4wvKhgDvqfxRDFHMEwHSjMCJIDAO6+DCN4nGNgYGBmgGAZBkYGEHAB8hjBfBYGDSDNBqQZGZgYGF5U/P8PUvCCAURLMELVAwEjG8OIBwDpXwcmAAAAAAAAAAAAAAAAAAB4nK1WaXMTRxCd1WHLNj6CDxI2gVnGcox2VpjLCBDG7EoW4BzylexCjl1Ldu6LT/wG/ZpekVSRb/y0vB4d2GAnVVQoSv2m9+1M9+ueXpPQksReWI+k3HwpprY2aWTnSUg3bFqO4kPZ2QspU0z+LoiCaLXUvu04JCISgap1hSWC2PfI0iTjQ48yWrYlvWpSbulJd9kaD+qt+vbT0FGO3QklNZuhQ+uRLanCqBJFMu2RkjYtw9VfSVrh5yvMfNUMJYLoJJLGm2EMj+Rn44xWGa3GdhxFkU2WG0WKRDM8iCKPslpin1wxQUD5oBlSXvk0onyEH5EVe5TTCnHJdprf9yU/6R3OvyTieouyJQf+QHZkB3unK/ki0toK46adbEehivB0fSfEI5uT6p/sUV7TaOB2RaYnzQiWyleQWPkJZfYPyWrhfMqXPBrVkoOcCFovc2Jf8g60HkdMiWsmyILujk6IoO6XnKHYY/q4+OO9XSwXIQTIOJb1jkq4EEYpYbOaJG0EOYiSskWV1HpHTJzyOi3iLWG/Tu3oS2e0Sag7MZ6th46tnKjkeDSp00ymTu2k5tGUBlFKOhM85tcBlB/RJK+2sZrEyqNpbDNjJJFQoIVzaSqIZSeWNAXRPJrRm7thmmvXokWaPFDPPXpPb26Fmzs9p+3AP2v8Z3UqpoO9MJ2eDshKfJp2uUnRun56hn8m8UPWAiqRLTbDlMVDtn4H5eVjS47CawNs957zK+h99kTIpIH4G/AeL9UpBUyFmFVQC9201rUsy9RqVotUZOq7IU0rX9ZpAk05Dn1jX8Y4/q+ZGUtMCd/vxOnZEZeeufYlyDSH3GZdj+Z1arFdgM5sz+k0y/Z9nebYfqDTPNvzOh1ha+t0lO2HOi2w/UinY2wvaEGT7jsEchGBXMAGEoGwdRAI20sIhK1CIGwXEQjbIgJhu4RA2H6MQNguIxC2l7Wsmn4qaRw7E8sARYgDoznuyGVuKldTyaUSrotGpzbkKXKrpKJ4Vv0rA/3ikTesgbVAukTW/IpJrnxUleOPrmh508S5Ao5Vf3tzXJ8TD2W/WPhT8L/amqqkV6x5ZHIVeSPQk+NE1yYVj67p8rmqR9f/i4oOa4F+A6UQC0VZlg2+mZDwUafTUA1c5RAzGzMP1/W6Zc3P4fybGCEL6H78NxQaC9yDTllJWe1gr9XXj2W5twflsCdYkmK+zOtb4YuMzEr7RWYpez7yecAVMCqVYasNXK3gzXsS85DpTfJMELcVZYOkjceZILGBYx4wb76TICRMXbWB2imcsIG8YMwp2O+EQ1RvlOVwe6F9Ho2Uf2tX7MgZFU0Q+G32Rtjrs1DyW6yBhCe/1NdAVSFNxbipgEsj5YZq8GFcrdtGMk6gr6jYDcuyig8fR9x3So5lIPlIEatHRz+tvUKd1Ln9yihu3zv9CIJBaWL+9r6Z4qCUd7WSZVZtA1O3GpVT15rDxasO3c2j7nvH2Sdy1jTddE/c9L6mVbeDg7lZEO3bHJSlTC6o68MOG6jLzaXQ6mVckt52DzAsMKDfoRUb/1f3cfg8V6oKo+NIvZ2oH6PPYgzyDzh/R/UF6OcxTLmGlOd7lxOfbtzD2TJdxV2sn+LfwKy15mbpGnBD0w2Yh6xaHbrKDXynBjo90tyO9BDwse4K8QBgE8Bi8InuWsbzKYDxfMYcH+Bz5jBoMofBFnMYbDNnDWCHOQx2mcNgjzkMvmDOOsCXzGEQModBxBwGT5gTADxlDoOvmMPga+Yw+IY59wG+ZQ6DmDkMEuYw2Nd0ayhzixd0F6htUBXowPQTFvewONRUGbK/44Vhf28Qs38wiKk/aro9pP7EC0P92SCm/mIQU3/VdGdI/Y0Xhvq7QUz9wyCmPtMvxnKZwV9GvkuFA8ouNp/z98T7B8IaQLYAAQAB//8AD3iclXwNYFTVmej9zv2dOzN3/u7cO0kmk/nLTJgMkziZn5iEEEIgMWAMECggIipgDEgtRWAVrAWeT7uWWGqrq1ZNi9btaquAtfV1674tdbtu13V9u9Du65bW/izaV+tubZ/yyPV959w7SdBaLUzuveeev+/7zjnf3/nO5Vwc987b/Fnezfm4Jq6NW8hdxl3JfZT7BDfJmX36nx/c9/Ft11w+tnxxd0drOhpyC675rc1hXZJTyUy2XKqYHUUjgOmsk65iGt6VT9OtYKe7wU7/ofIL4I+Xp/m0fMjJp2mWH4sbx8wY4NWIz3mELTMJM2Y98H45sHW24pxSF2bMafy+7QYmw9uxmRhI2+jN3EZLWP84J4ekt9Hy9GJ9/08tBMrMe47jCI7RU3yI9+AItXDK05mkRggOgy6lEslMudQrmsUYKfaSjmJM5HUpmelFyPjgysVWZPFKwROMZboSYia/fHi4PSknO1uiuiqduOXJW4W939jdv3hkZHGss7/SmawnkVgEf0am1NXbA6fW3oJlyD5OeueddyaENn4lF+CKXDc3wK3BORLo065YNza4uPficlyXiTS/FdgoVksIBlSLVSmsgw1iFkHEl6QXFkKlWowJJlAoSxUcO10qQC8xRDrEmWylXMoaHcVeMIvZmSLL1nctm98HS4RcfyLTzJODFLGBURA8/jhiJqULQ6NL6+b55VRnJu7XYPr5sd1j+IM7GPwnboLFvYVlF6+fzzc3JwZahCWDTv5GfiCf/65RD96wf8S6vH9kpB8p0VnKGJFoPTH89SpBWnT2R8lkN60wZv1m3S3kpq/vlQ79r9YCDPCLRvxhbyQCTjaOFeBY/Z6fJM9zIicdFziY3ypC1QQTNlnHHnwS7npIhUsf/ip85mG77Gm+ifyCc2NZGbBss5yVs9Vs1ayaMt/0wGu/euC11x741WsPvLbrC7/61Rdee41dOaefh/hJvpHVdfFYF8KJQCqQKCcCHQF+0nrqjPUUXHYGXjxjPQmjZ+Ay6ym7Hsfxk/Aix2M9oPBVy4lwkN//mzNnaNacdgNcmFOfCQW9HlXgsf1EwJlxgYQYxn7KEEgE4CV4rr8wfU2hH75tHSNfsPA+fQ15Yvqatv7+Nt57w5kbPjp9DetdYLxmCueRgm1nkdd4+9TOfKPh80i8gMiXCiDFoBeq+KCBgQ+UMyRsTtCRMI3iQkgUDd7wgZRsg0wVl7/DQ+RwR5G8oMcMEkz6P6PHg8SIRpbGjfP/wNYu8MsSaxLLgTfiX1eD59SYei7gUs1JQ5vUDJiMbPbpJFIfIbqv9nDncbZMjxvx5XH8QYsZOKdiLTN8zqeDoZ3jGD5PIT4Fhs88ro/i03NRY9jnlgjDJ6PhQixWqvhADLyHnfXAGGMMumkeAs8jO5vhmXjBVVJsAuOP4PO6p5KaTFa8ryM+rsik7ptEoCbNUIChFmzUsF5c1/3O/dPHKTvBCzS1tDTFYKXhIJG3keI4CXGZ4P8Wx0ZCSdDNDXLbuF10jX98x8bh/p5q2qsKIFGcUkm9o8iXMtlkGB9CYUk2KOwaYhATTT2VLJByqVrO0EsBsohp0SyGUpVyoJTtkMIBvTksYSF+AXQgrtmkXO4os5yOcDJD6dBRpEwBmYUByzes3TSWSMaXLOn/vB5xrVxiGPWZYiFnkH/IDPSmt2ZSLSWYGKkUKr/bR8g+Hla2XJwqRv0CuGXeE64In+CvVOJKW3vS+rd8Xx7y/Tmx8+Pwk1QeViwDuEGWIubSzV5RNwOGpupGe9NXtHjPvA0J3mhf4OO9G+ePjEO91VZ3EYyVQ6EO6ysXXbPDiMS68umTBPiJXEw3l0yQ719CUvEitPe3QxHXkExpKTyHtOTxmUrWEGdy/Vyoz1+NGXrQr3lURRIIJyNzqJbpgpfBuWdraaSpM8uT9h1pidNmIbALnR8xaAScDDJsOXUq/corP+UX4f2nP30lgrff//73/Go9dE5La+d4wuPdey6kQ0T/r0jonDfmPadH/kuPwIJtT25YuOmqq6wvOg+LN3xuw8LrJias3a/qSdd+RdkPQK+upP5qOK2MnzGS6jZJ2uZKh8+Mu5ImWwMT/OWIq8Y1cnluAV0D5fmZhBFU6JoGNus1QqGPQchOQdJOVt+VicjM5JZ6AZ449Mv+nd/7+Qs7+P5f/rf3e951cjexE7tOwiPtbVdm+jMk19tyZVu7NYbJbH8m05/F1KkL8shBfDtoZ9KbM25P8WfJd9h6TiE2Za6XG6Xjtrx/QWeprTXTZPjdMsFxwyWdlGKkEsI7XeQVs1pB7uVDviUjD6tUK5nmWhbMlJl50GXKCLJUeBMUjKdyXXnS0pu5Hv+EQqX9Vxfz/voo35moKO782mGvqx7W5HpaSL6zYN3rlPm9c//aZap+/r909bLRQ9/63rcOjf5TLMeKguE8vPGvWr3k8f8rn0+0Lo8UWhN9zbUin3QeLnPuP/7MvkDg5iNbv3H7yMjt36jJmaeYfrga5UU/lTPNc9QvswOFB3Iwc47KVnvXCBe8w0uinJrV6kym1YUTNu82+LOOhlW2flae0cDs5KwOVs7hrL8gGxob84Bv7pthcdu2xcz3SWDRC9K52LYY58zhh3AOq1wSR3yEzuHlfcV0nU/k6BzuwFVYTuEylEF3FiWiELDxCAcQeioPQ3RxpigrTyEBeJwLYSagQpjuyKbkDnoPdYTIX1zdIhFCAATr36RjoiYfUxTvNlXZpqj4g5etZ1+URUmR1AOLYcGLgiIpovvPb5zK1d9en3s4e+v6T5IdN9W7iFtVpemlknxMFI+7wjynqKoyzanDB4qQVSURSN+tResHgoqKBemH3/X0jI729MDHrEk6rhfiXEStH3EeKLXXcG6exVl8X5wvxIuv0UCWsjNUqBHhA5Amwhz03DYBBB4cEngYBTpspF3yJ96D82e6u0dHu7thp3WYHDjQgfiLInZlk+CHPgkf+1GPRj32cTaXC1wJ9ej2tlaTUBZloPyiMiyTRa3DxBVK8JLJFoRKlSq0TPkoNuOU5QNY0OCnGnO5xnz01R/FM4LuFjyRmB7YsKlOqFc1QVEG0rjim8HzW4DGHAz96KWX4de4uuAUpv42qJZ69VA6mjQC8agW8Q4l+wt9sVLztubS6Xx0+odEf8y8x7R1/u+gHlbgFqEsVp5e0l9UKax0zeiyiRDjiMgan0KVDyUuPqNQzZQW0kFD/olqRTlLtecmSFRRh6aTkVpWCapQ86j27G/epeox9w5FzCS76gYbO3MxVdnq9nsN5WPx/VQJ8u6/ym1E3VfB6U3uaERQrsK31u+s+8fvnoAuVJo29d/ojhruHbIQCWrwpuXRIrqi7PKEYu5PLFyvx3Q4epUa09WrrsKO1KuOGlAaHh+nc0+asTlt+djAtaLGgbpGtb2lyfTbspHqGqhjZvGvGRUFmKMJmgnbBsw66aqTntUUiwbphq3WfadIz/RJ2HL6NMQM7fwmpvPwD7Pb+6b6hk4Nnh6cPnuYvTnsQxMFmJZoK1kG+NmNvjKQP77zNvLHCMoMHfljQKZ6uCFDgDJ4umbKAVw3CBDvcwWsXxuy7FMnVevXwVCEvGCSJ0y/9WvralPl3ZOqD3wQ8s+n83Qa21yHa7OFzdNi3iuwsdcIDnUVEa4YpuGoXNTuQ2GURSuKagPYM5pN1QAb53UDOx9+/Is7hvn1KyI9/qASqfTkR7fu3TyW4XsqESXVY65Yb92Psgfo/Nz4kQd3DQzsevAjW4/1YlmzJzBv7+KuieWFwvKJroHduWBXuxJccAKGrPvo/IeteOV4hv9f4liu4K7iPob2wvYtV6yuSjyjA4/SkA4K1WgRyDJyB1TqK5navWo/lNBgXcisw15ihtn4OVUl08BUpRqqZA1RMnDkqfKTwZGn2tFMmpaU+c8anvvUvubp6dZRn+bF1S+AEPRGRCIIsuoxeBAIUb1qPS8QZK4uUZLcIurIYRn+cl7ec6/eUrIafB5RW0x4f0x4TIDw9LNEUmCVohEPUWTrCVkjXbwiwypceW6evlE8AhmMt1hyuh168s1Jn1cWNUGS6sM9Yclwu7x6ry5GsH+v1h8WdJdHdgdUXQ1SlgdiX4sl9Wcg4MsGNZLxhpSArIJHSrPrcefZA6ri8OuzzHaK4IrppPx6fryhTvfKlF+LaPtRVpVCbsXIg+LVwIVRCXVkxUBtbdBLwF4wyMeoChmGJ+DNV1EWnjqsytYe1hncIauTX/4ydatMv4pzyvpnJmrJlVjMo/zcb1wGW2Pm2an0LIDWZ778unUHK7YuHiavs6dnZCxcinDyO+dwjrzG9Kphbi23lfs4dyt3G9WrDn7y1j3Xj2++Ys1lnQ0C1YeRGWtQIBVTNJj+m23GhWTIGuNv2UyVTpuOoomjns1k6SvUFTMV9i4GpiE3QbOtG8siTpNMKinjLDHQYOkFltKApkJmGVllVqZdpJoAsmJYbiJIELGK/ckkwuymoFB/HBr8YmBQDsnWJ3oFXiFCpW14dHl7hyxUCsMrChlRGRhAHlpYMVyoCLxR13bp6HChk8fZ0gufxGqDAdE/fV19dH6pmgvjraNzXt38aL0xr7MDb+Fc9Z5KUMn7QHAB7K3AfYPWqnWigAzQB68MWj++BiTYaEQZNMkfu1uUtCD8oJlE61tHG9vybUtyeAsqYss8UQ60NY7mEj1Gvq1xJN/QwDf/QBTSrqzn0shwNKFHhmIJ68bosKkn6AX2JGSUXPUawY4PBGFR+o2+ssjLIviOpX5+KSHMTeDwITfngf8B/5cLPgc/hm+hiXMvZeHIvOlwxYBp7Lh6qepb7IUyHSIz00sWgpQp63IpI5ULArVjkF9lkrS0XMlm5AoafQWC4yfpaOuizizbS5qKNnzAwcNC9K+YQVqm6DrPGlVm+xgdRilbZAUkkxbG1tGQrGRS2DBNo9GNcyEpJSVDxglitAE+4+wpmVlJLmITZdTXTawtGzKdQThL5BjRq4aM9bBmNiMZHbShJoSoKjXxqBFItMEylkIgsmjjduA0QwsAzXi5GBOaeOqcoHy5mmTrCmdjpYyt4AWhK2XQDK4guoiXLoVTFZx+FXwv44zkKfOm6SxFjvoEMm1gVLAlhNioxgiSp1I1TOoZyZSzZSrdmQ2YLWKJJELTCx0Gu1WNCrJSNEVSNI0LoFIsI0n4SjWDwoi2S38+QNTCSDF8lijVM5UMpX1FCuMQFaDKVhLmmLpkwBO7nt+58/mz39sh3fQtCILCI1/lA+EQrn3Bw+OoCYKKyhooOFUFQSCCBBJRXKIgijwoHhCjMqp9Cs4OIrt4AXkywVrI/kSUaroWQv0WCBDRRSDkwtqipPKKIIs8kVzYlugSRJ4nogCa7PYJfh4bFRQKhoK98cjLhaDIezyAhTx1DTyviCGRdwteN3YkCYrgElYUBZFICE1ERRhEAYEQgKmHqiwHBdmFC1sgGqYJrgdCfGi5otEsgqCqgC2IHpnwCu+SDUkSFcUv6NgONs5rvACqqARUQjVblDOgEt6Dix8IwscT2Y39EEXnUasnFG9USvGO74QI7+IRAt5LNEoPAbMkBIJQrGRFlD1ISUIQfQaJjNcgFV+ih7hQiClILSyturyu63auAA94sYUwYCM8BcSDCIigAvaA4Ks4RoSKGw/FUHD7gLgwz73r5Gsnd7GL9e+gEAmHT+FFN3iwELJ0xBlpC0TyiBKvAo4wUCyRzEDJJRGkPXIqWZAUVRZESfTQmYGZHhfSRUQk+ADhNVnC97yLyCovgSao2KKIiKmCLMvgEhVZQTrxlJw4I1Se14iIHYmCTFAS+ZCIBJHXsAAv8zjVAOZfhnMNx1DyqTi+OM00l+4mINUTMBEeXtR53o+EFhRREcBtaiJFSPAomqCB6tZlBUQkOw5EkFcFAdUAwquUyB7id4UQKQEhUVFQ0PFEkvtFn0hwNrqR4gIdOc2liS7AqUnoCAo8LhSR+FQ6rkgBnH8m6hc4Aj6iqmiF8YLbJdIJgoOAJemkxYmF1RFDTOMUAhxlYnnDq3F8sXMf0PWAc4MgOWijBHUbTSK0FJtZSBMxqgRcmstDBL+MOug777wttPNUk5aOa8xGtyU+1RUzVCNG24VewrocA6Ft3/rpqWvvhtE+eGz32sPJbKV7zBza+E/r9sGR8eGbYj7X7sc2j6TGunOpwC7qA3jHemcC3sL249i+Ljg6rpRCvlUNOYI51AvMMtRlnkpjeF2VrJdlv+JSyY5XiKji+N9ANOUZt0Y2/buI1DTc3umbNOD9CnynE2TFC/+oqBoSxrIqhBNn/A6z+1K+Ps8yug+Vagi5eXF+a/Vd+0DvSQfsdDnwh9Ohd6UnmTXKLqfmPsrbZZVdTv/BAoXag9p3nD7Ry3+3vk0foR+vL06fpc8kglcwzr9AE3wFr1zNH0964NechrRVGW1r9nbNklHPuaPuc25UjN5EM+TvNXzGX5SaH3TssX43/L1dn9hjjwpgAWpe5G7dZ3nQovMw37D6V9SUibmp39ft9A/Xkn2cF+u72T5CQLe7Z6IWtuhxFyscjZC1aOUZbgccp+4isp/17Z6FnVK0F7BvWKQyQLG8Chs1BwkbFtu39B/818k8Zjsx2F1U5XO6Nl02Ajr/V9bVCLp1tdu9wR1ToQVa3FHPBjdMWte43fAFfLfB7bZ+gK+xQJS1+zdkF7+YteurtUtRqrpqjWO7ZAKbpA25ocX6gdP4gypcZ12lqlcgkjCP9uS+QqV9R529k6+TpbPtoraYzM407rTL/xVtyfoBtmm3/iBt60H3tg04AeZZp1XV6clu1oH33hq81IZ0EYNRMus0S8lAPj2DopvSAhugiJOvYE+n8RHBhIdUu+Er1FjNd3eQ/AcXw3br3XPmVsDebSgH5AtA5w+Gc+Hu8NGWpsFY7qjeo+fCYdim9+AlDKWogcmj1p7GNGSicMfRMCuMWWHrc4bjK7ydL5Nf2/3Z80GG2mRKOC7DRHZmCPiyjlW7wjnD+BJtN90Id3zJwG66DOwWumK6dbeOQPSEv5SLIUhwNMxgsj6nz/S3DvtrxP5CDD+2w2K+l3g+tnG0Lt1o7XHgpi3DduyJIgV3IFIbHaRbnQyKGQXlaIvd1z/xB5EfUdxCs7jVZmsT9Y3RzZxwoMq6RFoy3KzPhcPz8H4UMWjMHcWec2E4QDFD2m7Xu415dv85yEcd4Gb8ruuxv8XYX95F+5NRsat5ValJnZWpmlZzsTZBNWvz4hr/86EmmM2wRznMHBJZ8v3nnx/1z9f950yXGliBCboNRjeD8oFRTLk1WTYM7ZwZoskVgRDmGcjsZc1N0pgfDEXOaYYZplVXBMImFo2Egqwm76JZ8/00xz+fZrgQejKDR4Rr55Sn5yd0hdjzkGr6TpgAZRY21YBuAFBvljNpqBOLxQg8In5zVNV9bN8q6h79pqRJfSKcQObkPIvPrmD5BoiK+M0VaoxtcFFegwWkhRL87zkJTXJKcM7++jf5lTzPmQzGfFOIwYhzKfMuUFi4gQM7JTz1DRozsD+BkK34pugXF0rSN0eR1yFB4JHZRz2mrqDAIjBdmCauFc+KYh+WxxLIJeE6WbKftDm59lywbf8BnAsdgVk+uwBS1K03KzC6oZwKz2XfjWyXrTZFGdRh6otnM/Ss+7A7pp8eQp4+iYxjEsEcOo2y4bB7TgZymzkZlIt/mHJzW56Rc/xZEpijQ9RwSLwL4sSF8E2f1ClsFESd9FwIxQU913pj9IJPIb1oX1EPOH7TAA1MmEMq6jFx9tIMuMPQBgfpBGGUwJlEmyMuu3HyEI4ehaOGmQMH/pid/A6OzxTvZXtGSzj1mQVtuWy9wttzKJty4leqs9sfM3sgVDOrbXsDIwPdHCW9Alqc1M+L0l/ebztZ9jN3y35VoX4XTAzd/f3PC4f/5U5I5nr05zbfPHpkvI/0bD989M4bOvklz4XhbrsWdenYtfZT1WO/WnftEfL5F+6V7qSOvPBzS3on7vri4R1dQv/Wz1968+bnwpyD05No+/s5FxdEvNRn4qZHRVMFcSplgcZooKKeSaFRL+vNdA+PpzCTH7Vbly9f33vDaHH6ZXhk2YZVd44C+RHzQ96wlPTvevDJB3b3wab1w9aGYnF053XwSHH0rtHLL1/78E7M3v3Aifv29krD2x/lLqCrD7nHRQjDvAYDVb8aXee4ez+Qhta3GfWg/8PSjRHsg0lF4yWeJL28h/NzWe5yhHFtbzzsYXRinthShi6/Cp16CCRJakTWm4hhdlSYL6uqy/iGqs3On5TSCJrmWJFq7uyvQNhGIR8jcL/Ho5GeRjqO0Up+baZ3+fLlvRnIBAJD8ieUQcmQMoMX1yXjfL2m1SnpOneh2O6qT4Ncp2n1JBmv6yqOjo+Pj1RIgLZRF1X9ajDX2DJQiEQKAy0X54Oh1StWrJbqxfzFH1nYkO9t9DXpPl+40e/11kfroiRuRuu9Xn9j2OfTm3zRvlx04Ueqm3rTpKVr86zP6Erk9zqX4ApIj9bmpoi/Nmaz6nltBdBQD56GBlVrfiSkFLypKsfsySqnFfXsyk89eucoGbv9K7etubnmi3jz2VtI8hzVzLHESSz8/VWfGiOjh794GEt+atWNjm276yTznf4zP0V+xYXQkljOXU99p+MrBku5SIDtUQcYo5+JSKMbJiGUTRKLZurl6fYKNaVM5mOcyajSESwxPxUzsS7IpA7vXrpnn2EeyloBJiKePcI2EI48iwztdHtWdCFz8Rh+v6BE5IAq6D6XmG2f3HSpIqEwC8fd8wqFee54WPfJysjGuw7vlmUqk+vq9CUjZHhQrxOCvKH7ZXn3YXJ4+mHKtZ41tFPYx7Oqbv3P3LCP1/0ev8cTTUc9kqZ4sDbvG86tPhLnDWSZflds/fj6mMuPPNTgE3etufUHRczQvR5N67j3K/d2aBov8V4dMztOOfISLwfJU4yeytOUjORPJOOHJ8SfglPNnnmCwSYdD9TsmXfD9Z7u39uLHQv1FK/yqziqhS3DuTy0pHeeDDiXQzKdxr1A1TFge4fJrIxMsVKlygzb22a72hrQeB9qGpcz2Tm6NhXFWaoxmkXjns4I9fDufmF8uClWqfZcewT0eBCO/tlhn0GCAet+6oz2Ty5dcFj0CwVJIk+iClEQf2g9MnHJxRtg8cVdvYNsw24wBm0vDA6Pg7sSPTLuvNv3de+wQU0wY1jOHJawol8gT7H7EutRaByeoFujbG/0KXIQcc1yHTimF+XrVUcHoojEgMYrFKh7soxGP0MS0TaKFaa9GdmATndMEaEYkINHb5pknVv3s9vknz2KOpsByHcJ3ifHP78V6C7i388Fzvv1fQ7E40cc4P/e+tnwONk+RIEkW2097W3U90+iNOhDGHuiur0vJju6UG2EqVKG1kXN3q9SZbkXTDo8AVywqWQpQ52vzkuDfM5t/TMKdScmCiU7tLlPblx8DMUA9RKCohxrLkElfUJSCam9WbyRaiHWS6gqTNmTZopOIHzxtLV38UZVcbskr6xgNbgdawtEEZw3G7kaLtvId5DeDJe8JrOYToOFkKRmvRKoZNNXCLUkB3QUHEWUA3NQtqNiHZRhC6lBh/Ar6rvAJxIhEkU2aqCGibjiKkBcCyQoai4BNi6G2y+A3NprQw75P4xpLY5gCucNjysuxQ1S3lrKNpk+mdB9KTMRSNAtKRwHCdeKQd3bze9KV2fiCh3BYHbYiqv9xJSkQT54/vXTKJSpVMALPK4qKfqMl9P56PnX6ZbkUKk53Vw6VUmnEGw0ti4jPdumaKELL/npMi1N/qExV2F79RXnluNQ05jFZzZ2q4FrQtw6uCrXzTxRH+dSffFNq5YN9PZ0dVZKbS3JeCxaH5kb2+VD3FH1pn/ZOXd4150vswlJ4w8MtHMqMKd81cmjdKp2fEg6TU1999ix79aucP/x46eOHYPHp6ZOHT9+sra1SK/3s1enpqaCH4aSU1NT6WPHjqWnpk9OnaOX9DFon2KNTbENwAzmTU1tm/Pqj5GZ8dbd/MOoJyioKVA9oaku6Jao3lSthU02z/hVYtCMehJkqSZVLRrMvg+b9l7QKSdIEiasg2isd6NVvc8Yg3s9DQcuo6wkvrTO5frSdpJblvCptcDIc9ZBXV+Axjfsq479u9G8bCMceekuovuloLxxfw+pm6+rnIvxf8pv+JlZQD2Ri3GWm336koFFfb3VQqYxWhcJ66oAnIv6JFPl5tnYJ7o4FwINjMH39M4zW9wxB3DcbNt8NlyeBtWEsNzJk3AHXaE0ykA7a8X27+fXWVv202gEP4tJ8DNnoBOToMGi/futWN/g4JBThb4+NTgIsaGh6ZODg+RgrRq9Wq/U6tG4hkG7mB2XsVNo4y/BMQkitjdzz3C/pXEZP/nbR267pqMu7McBonHeNPaN8n6RjpRJn3gWDodjJttxizIdIxwxGgMh0a0k5mfNMhlItSGq+2ZoTKNNoEoVlSj6km6qVVCxYpwPhaSJwtpErZg1SffVgDoymK7M4iuwNeSWdpMZ5vmoMo83NklXRJXOEdYABSgwt24my+q+b9VK8YK68KYTM/5EvjMPNGTCuf9AEddInlCTIHj73ZLYFzYkWfCOS6o3ZPYLXmlUENOKV14tKlhQdtOCngFVkvpCEUnmaUHwhox+0SuuECIBxSthSdiySlKjZADEcKPb45bzPAzwjaq8apWsNvIlPwg5JRCImgJZTKIufO2UzimstPCewh7VM1saNtrR6j9rzJOWJlyiZB1eunO5f7wWgdFCZkOz5BEC/ULRLfU0eBVpteQpCsIynygqeU/E8IIiv7ukqvTUs5Lui+ySsbC3IeQhivVPIy7Fpy3UCGlpaAZwl6CFEEz7FNeIy+X30pyYq4SStsWELM3y+l2kA/PsWlma5Sll7UourKTMVsJGZyopM74mFefvOMrUFXGJnpOwwy9xkjZfODezf3Bu2vPQnpx2wO0HTE7GjNjcJN0r964ka3atgagij6vuUIsk+ka9snxpXb1LFvz7FI+/wbxM8ktLDUFUWlSfshXFrCqOK5rZbJdVLo3UuxQ+sA85qC9qjIo+eUgXhG7NtRU5qzNye2muPxZuKKImGB4FscerLI/6Vflal6dHlPpiooZD5os2+MAjs7J19fH5skfWR+2iPkVhRcXFUSx6KSvI2ftIfBB58ijqznHJ2UdiGnwB6B47NWUoYZgiz+yfDkoBtLNjhAbyommLdCijIcQIVKWxSag7Ulrhfz7okdwXlzr80bTSXWkdujffEFIVRZB5aGyKau0+RVB1Sddl4lfimRjwAmi5HcshKLolWY3F4h7ZHyGLQp4sTx70tWvReFRQ+bDekL93qLUSNf3BuOYrlTo9EtrfLWpLzEcifsWdrE8qouLmDbh0R85DRB5iLTFQ/KTZLYVUVGAUJvNpvFWIq0c5v567ktvB/Rl3KxfuC+6/efdHd1x9xeUj1UQDM8FwQsUgXAupcaJpTFSS6dZ6KMAYeSIAbMPNNGQ95XAbm2GVnBgW5Ct0KqEuTWcT226nkfQ4vzQISWaFkTe5ALKlLI8PlPh0nzGTQiOjynf4jZg5HbSPNrxpVHzDL4vy16Tnz9JonVXweLAxEV8ZcCkAfLphefLmTauLioxWHBErBUVEamd0r6JIAY9XVkXUEeUm6z9jbY0tp10ypTrquPLS5atAcrVGfXE/bNL6cg0KIbf4S5HpW1iv/D68Gf7My375a/L5J0lPzHz1/KOwTAsIDV4/kLAR9CaO0E1SSTM765GnQdvC5UsLa6KG4qnnwRjIXm79p3eZUYT/NIuCTgyeatYexfp0zCcqzQvae5tkzQ+zsaqz47OC6pjZtD0ewocbj1CYhqgiycsd1E7HZ1Swwh00+oFuY2b5FG8/Y62O8gcQuDu7Ye2QAHR/nZChdZdnv4xj4iRXLFxBnJ3yavFDUOzNbmsSfG7NJWqgC9Z/wse6u3/n1jwe1Mmh3XrJqwgej+b+Xff70GFB859Eh2qYKpa9RO7QaWBJiiazVZsWGswQAJOm/AFUeOwLuS4eRxgNBIH0tH4ps2175oF5F6O1gKTgpe7cFzMT138wBQ52d68XVDpRBIFf391974Pd3etwXYMoyeto0jmbMot3B2pgq6heMjzQVSpkbPylDzkPbH9ho3MyrSzOPlNVpOPd6Q+gwSSNlqPKs7UHbZL7a09z36rKh5gFP3P8WKqybtbGmZx9ZDR4ivFmez+8G2lwLaXBlcv7eioX2Xviku3smLunbX5AOhRIBPQYIE16ATpQ/KUkWWSOOsfYyAZSNZcdZVwdlLHT/ZjYH4TzsIMFGhhDlkdRCLxEFMW641yDID4lCfArVamUmq12tCrKtNzjWVfeOGbklewTSL9nrOcY7RYx2v3hZ2szCUz/xqOrqk62LELmJa7CHqd/UxjoL5AQA+KKcBRi+hVqbW9ngp3pMLkFqBN0Jd0c1QmY3xpRQb6LIt5k/uwC0Fi2VJJyWlshz1SSKP9pWOpCqg6UeiFOnZM7n98Fo5e0+7z1q5dEmrJJTJO9fwu33vbL27O5HZ9tSPMKKigC4T2CV5d1v+xbuxlu+yX4f3kb2TdyaHnvznnRSnF+qifMiyOH7j00Yr1y1dFNwlUZWfS4gKiiT9QMJRoN5YpHxjBn01G2p3EdwyODsjlp7+XOACsxWDMXwkqPgwJ/dgYolUbRXAjT6KFvbb79l7fBRrt7RQCPCkQR+LkAXHJoUydCYNPySQZDM7cMaXlJJWnHpM8lWhlNtPJCUpGRyVRtmhVtxyjTA5p4pnplnOhN5jLrpVKOHlidOLGtvbh0dbiBSB4aKMXzgPqJJiwZgYkTp05MnBodED1Kg0sQBR7JpDSEVy8ttt9zQzyw/mj/kuXgHRqDRy49tNx1kSnScw+CALyEjcTESNDfsmsxkn75oR8t3p3VDDXh5kWJIquCIJoXuYb5YlvptuHWXHYv59inNq5hXGub0D7dcEnKcHH83LlTmzlQQkSLMUJ1yj9CB/ggCugS3LH682ugp1wJhXx1sdbc6rvXrr179cTXx8n2Y9vfnzak8kF0GSX7ujZfPH9NLF5wq0FJ6dp8w9bOoeWHHjgwAn+EXNO7/jip/vtuh1YT/El+FedB/tyPtKokdK9KY8DFEnP+Jql3o9icyATsLZCwX6Qshm6Q0D2xcq/gRCr1gh2jZOoxHqZdiXYIdrW4rDvJqc/Vl1ZuX1mqJ4/mGs+hEnyuMRcttKeD5NB1YjwfFycOgBEv5TYp7QmXa14X/OVjMC/a05lMdvZErdOPNeZQde7ONUaKYxtvu2zsiF91o86aDLtV/5Gxkds3rGmv8QobDxp33xJSJfJuHP4UuOHvPiSsHwY6x2cI7Y4MUJ5Glk/9n7Xj+LXj8yGeeQszWT7jHI+f9QkEfI7R7wPdd1wz7tvP3AD7qSuB9FqrmEsBnmBHGziB+oT5KXZOw4PrgJ3ta4+F/Nit7dsr0/+s6wRccGY3NXPStebo6AjYkpfFZlNP1Sl6ZgTeXGfErfvJwdoJV4+0P25MnzVibOOyrzUdD8Mes+Jb7YtAan6vPHnqVNxYZ+2xj+kK/sBZNIvW0QNd6zzS2XwfQLsRj2ir/RVjshdxEJmf9eeIAz3XejHXyw3ROLLFfT1d0ZBHIZyIBKxmEaIwDYyVDOShofCsnw2VCJNtGmczqYTjgU0UKwtYwK7Bm5Aqg5y19/91eKNvdV8Zwi7XSVcQ/9IbF1vt1BMLL6ViLl5uUFSvhwm/Shpeai6JaSVSnbLumCIf7Zjq8Of9q/1/vWj1oqYKHKk1YX17wm6gfyNoQkiKInN2BGglvVTGFhSYfNi642EolLAJ/5g/P3Nmr43Lo6xoiczEqrAdaA3Fu6mjYYLWrr2zWK0kav5j/qzb+hmN9NpfXbOmtzOp0wjXgCQoEj8YWw+H9+txFzS64dc+1XrFjVNJCsba+9Z3NmUEZCoeVdR0/qErPrrsp5PMQ/yKe+4ZwgLXivCkZGZX+ggySvppAKqTlwoi22qYCdmhZwLjaDGeHZRkZD5BBVkeryc7e9esqVIYEEg3wkEBhcPrYz+94iFvAK1HjyLqfKapc31feywoIQxu1FNiKl503+RPl818S+EsX+Z0rgvXUEfU66whFh9jd48qoCzppogWLT0gQMMbK9RIuKCQiaWoY2gLO9RjAxTI/7vbzW8K1kcVj+DmUSBEVqV3Xx5WJEYvhMZvhn953cbfZ+mRHwe2QMjM/tgddf82PrZ0qd9AJus7s6ElL985t4zqMj/r234V47Vvo1zazwW4JGrC6jPt2QYkJpVLmSzdP6ZfhKhSaRunB0/lpBRG/a7CNiArIiIgxNPUnVHJg4AEnlp9a/LIS0eSt65e9hMQfmJ90+9eutlv+Afa3X74oXvEesv6N+utEbd7BBTIgDLihq5Di7oWU8/q4q5Fh3befjtcgkU3L/FoJKi2D/i/Hwp98r77PhnK6LfeRx68Rbdp/tf8pczX24g0N70y9cuEmJ+XVGpxVLYzkGqYOBHPOSdiyWrdet3o1q2PhWO5xlcbh8IwqZO1sRzJ9KWlduuHsbD1ehhfhocazzbmAJMfCzsy6a+FtNNnCek0P0n75T+gX5O+pMwTKiWalfoQ4JxGEIxGvd4PUph2P9S4n2WEPwjORvbSH8B63TQrZkNP18vbbC8uRWPN2JkyW3OvmTbsOC3yUSeKjzpfzTC5lFkY7MhO3AjQ3Tbdl9YM6rWER2Km9W32RQPoN+Jw/Nq7yV3XMd5PJc9xu0/k9R7U7aTjadOJpXPkChKM8ewLYEgwscdPGRp2snLvSijP7R/2UId6wHEzd4+R0QXbL4RhO42tmJFrhMbWyUyuRTwC1dFD2AH1L4vvRtw5MXwcGhlqL12IMzXVHtnOOpy6oLutd9+9dXvM6e8t/rPku5yfK2J/qXqttn+dTaHpS4c/4AKjyjQ5Gt6ZojZkxd64dQIX2Nl7Pmhopybpjhgswv/7kqJMZNG6xboFq4opgYjwmWB76HYWHnyTSKDF+p3PgFOndD/KFMV6C9LzROCh3/o2lp0n+gUY8fl2Xk+tnZ9tFbWazN/K4g4LdK89ZczI/MTMfuecj+mY9GguP0clYCrAFt1v/YwNRSrFbhTmlM+Ys12weZBl0Osp+2Zo1nMGuXEbe9xm6wSMduRi1It9jH+Wo27egSc7VwfRNZ6dT5wBg8VKJGXHDVZgx7hiBO7QlNtcmua6TdGe9Ecy9WEzRhOe4VwiWloa0VtkVZYvV4iw7ivz1w8VPoeF0UZhV1gSKyXjQdXb7lX9oLvrCytDvmR72q8VXcJSya/cnexawzl723YckcIlEOY6t8TG+4/GDB2ciRLKd/3BKKEDHxhFRXnQy9jga9hvO4sfWFRNqAK1IRagDV01TCnFlykZwnQjlMVwUg6OohGHU5bK9rc0MqnmyntyU0mcpnLmF9FI0+LBy37xi0W71hRX9mzQPa/RUySveYNoIazu2z1WHMOqAyvflVFfF08+oY4tyMALTxTHdvd1jZX8HtddootHQTvp8vgqAIAZC7vHbm+u+DBLUgSJkLsUj68M6mpbpj/OP05+gna1850bnGd+Kh6r1KTxI0uSO+RsRy8Q/Suvv/6VwzuWjl19y4kT506Qw9/4xj7yBvnJG9bjb6wd7jkB3Imv7vv+9x99rSafhT0430Vbxw2gRYM6eJh+1YbOpzZgu4Jyli1GcOJbhT3/745B/qyuDlgPSZp04Ow2WErvwC92Kd7f4iQa4teff5184788qouWkQ68uh2L2CUM1bZhhI+yWA+TW4hjVWo0Qwqz91AoOEp/1iyWZMpwqTGACh/KiowduHihLWAyW4Ae0+W3JP9bPopGwEo47HLF24NdZK0g/b9f4VJvE6RxN7ULdDgwIcQKMRCWTDS+RpnAnr+7gZkEXVcFwbYR+P34/vwekYhlyS+sC4beayqoQ6UXMN/xEzJcPIhL1j7bv6SQiQXQKBMcg6bsGDQu6ixgUWkzJlm2msA/I2R+CATJAEMKbbR/hVfNrcMda4r1QL7soLwKHt2Q6k0+3fZBKM+YQhCExy7qA2q1nT5n02Dounuqf0f+ovIhCTA3XpbGhesqO69Cg3ap3S2nylUa9Uk3b6hiT+/8/wqHz6xad/n58Re2vLCk/vJ1Y2fCPS3EOHPwjNGFIr8nfGZs3eX1SzD3Wmv9ulVnwrku4ycHzoRt++I7qI89xbnQ9u3lBriPUPti1bLF/ZVkyCPZ9gWyO6qTGe9RyKp6WKrpmDTSD2o7TSblj3QPRWYxVCFKcXriO8U2p7LsiB5UWts7AVW3jTAxR217ofu17qioygOuutHbim73mvP3FItNospr7rQbXOG1l3xBOOc2smM/2jdvz/eWLLoiVb467r7ustTEAqrR3QXXXqDP3SjAddb664qurKTKufTeSwO54MF71YpLknQJRGt65NYo1NVfEQql52+aGFYPXbe5b2F6cymEfNd65yRfIW+xb8MoTxs+F9X7FkKguZoJVitVk2IEomwQxC3L3CDys7us/7N2l7B7853C5qG1AnwRdJrcdBe5GpNrdt65y/qRf81NMLp3s3+rf2jtOTiHSevJvVfr4zS5YRcb/5PIm95ivCno8CaTcqMC0J1r5L0mVfL8Fbj3sdeFm77xjbsEZEwnbhkfWbrj8GNvvEHeOvvoiy/ue/yEdaJn+do3YOwNzrGH3xbamOxr4nKoO9Az2K3N8WhIovZw1TYZWTwq9Z6iQsGOYJcD9pFs6HCkdrUsFkutkNQ7zjaXSs3kSmbNTU96JHIl+6LFlKySd9aVms8fTFcAl5hrnct1e6kZ7qDFrT1Y/JU5Z7XBM/1mhSk6lUowWItbW8/OivdyO5CXbV42PyTxLLaCnrdFK50GLqZKlSzecO3T79YQO8qIBkmjYYBMtVzKosymn2TL0KOlMxGqsvNZl8ysH5luZfUSJtLpBj3O3Ek7rIsczEdPViBZ1TTd9Ma8bi2iGh5dDQZlQ4t6omT3JYu3Eb+uNqquYGSwQQxDYtPIUGV8ySIP+8rGX+gXx6NejxExom3DLQ1Xd62Z+VQXjKIeHd8Zr5bA1z8c8WYCmj/uCqkesO4nkqRIZN4VPr8r1xKMZr1pBYrh4ryg3prxeDpbR9bXm2auEbbEct5LcjGtf7kRTo8s6ugcm/FnrWO2w0L2TYNrLinXMfqF5tAvxbx2lRL7ah0lBq5jFM42CUV7W7TIKIwLvdxBFSQjbPtKCzzz/81GeTmu9UaYiQSeIWAkqHigUdX9pHLR4CW7/V55XlBVgkGXgf/8Oh/zmrqmVdJQgpPR/OBY99UN2eWFqBEyJE1tSFys/wWl45Rn0dBE18KRTQkIiw1kbY2I1ouhkpr0ZqPBlpzL72srzJNE4hEIWPepejDuj0HGGxnu91UqSOl8w8VrkJP1X5oOByvtBW+09RJvLgZbGnNGXQTWL+NbO73uTKsenMf2VA/zJ51vvdXPfE1piO6pLl3U09nRnsskGiPsW2kK22i2v/aHUojGGcaYL955YFkzD/QEhgbsG4cwpxblsTQvQ0MZuvKgO99HsnY5X04iD9Ccnpbp/ygNl/BHPu0YddYXetf34g9ahq8dhqHx4SE7HuIzjTlWAiZirAEpaX3PeUW8zbSJkvXdWhZcO5+20ftwCZsodwzbsajvnOB9vMJV6Df6nLN5tgPBPinGHB5JiVqYVBigxZlJJdl5ePtEhB02jEaWb+2iZZ3WyMJ9T/bBSjHpl6yv5nethBw8lSqkC5C2vqWF/Ib2CyntE3+R6pt/URKWVC9dtLYKx/q+tm+h9VXRnxRhVevYja3WZbRKCgY0I+n7uYTvf5G8qNCHTVQ4O/6N8rh9TA9KsZ2mQW4VdyW3jdvDHeQmuYe4L3HHafzb17489fADR+687dabdu0Yv3rDmtHhgd7OYj4Tr9c1hfjY+UxcFaj80wk+5zk75xnZRSpBn+kXdt6njPkh3psXtvlBZco0Tfe+YE5MHWXcp1xlF/6GXPtd+BuyU6THZcVcLnjFZd3vqrjw52ScUmhKGXRS9u20XcR6xb5P1m7YYi8+DJ6/kj+bazx/JV2W/FSs5XlW6zb7alf94Xte3fueZ/sKYfbK+Z1khVzWKtu3annYh1rejOVytT2Nt/n15KSzh6g+05puCHnotx0vsCcTtgFZO19hOum5n9/h1+n+87+xv5kTYHFl75uaY1ca4B9iHmZ2Ba2Wgwlnnx8v9OyAysXRulxJ5euy7o5EvZvJV/tLokBdl9UkleQ+KoZQXyIGDdPCl9kCyEmNZ+ptlTKI2fdpOxAdi1fSHvs96XaPwtL8EKy8E3JDQ0sNQx0DKX/gwIH54thhSVp+YHXbpqWdceIaky55+dTLwxK+lTefeof7ly2y5MKy4xCHPCSvFcdWuoMREvW7V94TjUY1bUyVpdZ2UponyerYvWJXJ0SS6Qi+FYdXkpHlIr69R1y7lmxYI9Ki4zvJjglalOlMT/EVpEGQnUVLhH30LFozC8FBJZJuPcUI/XAeFST0a0BU7rIPpOjsq6sVMwbkb2JNWx/fCl03HIaujbcNjd71SPlf9n3k4RuGSN+O+8bqQsH2IiK9sn+BGVCEm8XNX92ybUPi23suObSxhwxc/7Hb6VeAVj+wcykPhUDrrr5VnxpDCRRQDHq+g8JH+bqb83MG/T5owG9/H9RFA5fZCY6OUILqrIkAPcrxBLR3P/iRG5+/Qdj77T8bh6/1L9hg0dMZcJX10oJ+sD9AsGrtg92wF57Y+fy7bECUwU+r8lwbEJsNgW3vrT98ftM5WOTYdt045fthkfUc5/j97TZoHK+XfcsU9fJQ0Ke5XaIAVC+HQCrA/uyG8amZprZMwpbD5AXsgPzDJE1ttF7BqRSbPkl6pvezvnBprYInTk3vJwdnfMof5ynHjCG80TrmT2o2bGUPqHuml26xx4Aev/NBgi+nwvxYU6Z7en93Sxzq0izEH2IsAD593z3w6S8N5opLYegiePaMrQicaX4D4Le/rX0/62/Yd1R5TueiXBpla4nGApTa8y3peDTiV9j3s+iB0OaZA7jOsYNm0wdtsBCawL6DeeGd3Hu05yiU1ekONaZ+VFXJi3jfoU6jBhAIVKuBf7n++mTi+usTZB4mAvjSepzm4B/RvtRzdNynThdVrBijNfF+uZ/W8lc/w2olr7dux0QVX0LByWHf0LqZf4tfy3yPTew7uFI6myEsUop++IS6jYhppKmFkEnL5QpqqKi18h+5x5q4e1L7pBJQo311hqJJ6nXStTdB5/bR+e2LrZ8/9AwMjpTmrfK7Pq3d+Tk49KAalAKyGemJetTd1o+3f6xx98bf7P78TUXo/tQTn7DOTxizZ/IVMoVzRjquCTX70fmgGvu2FjvlC2/7fL/7nS+W9+2N5eJ7fTlY78vTN/mYbw/8OfPn3rjHN9vmbeRq+4y3Cs5357IJ51tu9FQK9kFW1WrFZlv6bDwXhz302e5td+3cP22PwihRmrHxpXsq7Kw1/UoMPWkNQ76cH6u1xnx7rRsNtJR1+PO9PrKqBvqeWD4Gu335uXiz8/jMbnKgC1D9ip0WpxNJwIo53954LraXAkWmGJzYfDhOoiZtHtvl/j8O6aMreJxjYGRgYADiOt1w23h+m68M3MwvgCIMF68f84fQc+T///yfybKfOQLI5WBgAokCAGJpDX8AAAB4nGNgZGBgDvqfxRDFysrA8P8ly34GoAgKqAIAdwUFSnicY37BwMAMwoIMDCz6QHoBEBtCaXQMVMfKCqQjoXpeoMrBaUGomgVI6iIh5jN+gfCZrCGYMRWCwWKnkOgFUDMi0dhIdjOuQZJbADEPzm6CygtC2HBzkDHUTWA5QTQ7YGIvsGOwmxfgkIeaC7Z3AYIG6QG7EchmkQPSQPexlCEwXL8JVE6fAdXPgggxsHqoOFw/UlwwcQBxGxQD2QC1qEOAAAAAAAAAAADSARIBqAG+AdwB+AIIAjYCngMEA6oEIASGBRAFggX8BnYGzAc6B6AHygggCNQJMgoODOINEg1MDcAN4A4ADh4OPg5qDpYOwg7uDyYPXg+UD8wQMBCCENIRNBFqEaISDBJOEqATKBNyFBoUaBSOFQQVVhW8FiAWiBc8F44YBhlmGgYaghtSG9YcUhzUHXAd1B4WHowfIh+GH9YgDiBwIOohMiF4IdgiMiJsIsojBCNCI3oj0CQYJHIkriUcJUglhCXqJmomoCcuJ2onlifqKIopLCmuKggq9itGK8gsGCxKLGwsoizaLUItii20LdwuBi4uAAAAAQAAAHoB+AAPAAAAAAACAAAAEABzAAAANAtwAAAAAHicdZI5TsNAGIXfZEMkggIkGpq/AQUhOYtEkwoUEQoKJIo0VI7xFjmeaDxBygW4AwfgWpyF58mwFdjy+HvvX+YfywCO8AGF3XXFZ8cKbaodN7CHiecm/RvPLfLMcxs93HvuUM09d3GJJ889HOOVHVRrn2qJN88KXdX03MChOvDcpH/quUU+89zGiRp47tC/9dzFXD147uFcvU/1emvyNLPSn17IeDi6ksVWNK28DAsJNzbTppJrSXRp46LQQaRXeS0e43RThMaxW+axqXJdyigYOn0Xl7EJbfxcd6xe0rG1iSRGr2Tme8na6GUc2SCzdj0ZDH7vgSk01tjCIEeKDBaCPt0LvscYYsSPL1gwQ5i5y8pRIkRBJ8SGFZmLVNTXfBKqkm7MjIIcIOK6YtVX5JGxlJUF680v/4fmzKg75k4Lpwg4y0/8jvHS5YRup+fvGSu8sPeYrmV2PY1xuwt/kL9zCc9dx5Z0IvqBO72lO8GA9z/n+AR+3XkDAAAAeJxtU2eX5DQQnNpx3nAcOecMJnNkjpxzziDbbVuMbBmFmZ359UiyF/iA37NU3a9b3eoqrY5W81es/v87rFY4whoRYiRIkSFHgWOc4BRnuIRrcBnX4jpcjxtwI27CzbgFt+I23I47cCfuwt24B/fiPtyPB/AgHsLDeASP4jE8jhJP4Ek8hafxDJ7Fc3geV/ACXsRLeBmv4FW8htdxFW/gTbyFt/EO3sV7eB8f4EN8hI/xCT7FZ/gcX+BLfIWv8Q2+xXf4Hj/gR/yEn/ELfsVv+B1/gKFCjQaEFh16cPyJDQQGjJCY8BcUNAwsttjhHHsc8obpvpJMNZHVpGK/6CO5SWo21iSiSVgdD3y0+qSVoiFV0jCZfdbI3SgkaxI7+W3dcRPXtiKdNcywimmKO2Y7SjU3NLDpREtlypENVNrp7F/Dn5MP1LGplyOtK9vFhumNTlouDKm1bNuoknITT0wbynTNtUvWcSdkRXEtpG3iVrg7ZBVTdc+UCa2VDVeuNb9lglrjQa54188ohMiJxmL2eZi6cL/nId4jf0DFuyXPofkoD8IBDlxSpPmBytYKUTJhjv9jnyxYD0yIaJBburx4eqn4QY6GiYv8LSnDaybSg5RDyce4ErLeZMGS1uTCt1BZUfkr15t8K4UNozxekG+oWLCf2WANrQdepzQ2hg+Ua+Nm49GZK+Oc7ILJCzPZKRrrPtWCO5p15oSw5TXpdAFxYChzvFA5NW0ewE6qpgiIzp1c3Fzq0tC5iY1ynJzWchhoNHOldLEiR5Mp/DL7o4qEyPziJ3jKjHFBXI7eiifFXQY13KStVDun01jRJPZ5WF2IWNOe1oZ1kfv1qZ9OIM9n5/9YkUdRLweK+NjKqCcxJZq8ZDInn2niY5co2vGxKYKKSsHdZUNTbpxnF2Dp2L2KLnV1vatwFNY9NVbQUb1zNbTJTW+HSnt6FuTpSbWrMpJK3A2Zq7uh/fzw3FBstOMtdyKRYz7XnzgtnTBFbHE6jScVsY17qAPreB37I68UQY1BZkVQaIDHs2wDzpySA1it/gasnoioAAAAeJxj8N7BcCIoYiMjY1/kBsadHAwcDMkFGxlYnTYyMGhBaA4UeicDAwMnMouZwWWjCmNHYMQGh46IjcwpLhvVQLxdHA0MjCwOHckhESAlkUCwkYFHawfj/9YNLL0bmRhcAAfTIrgAAAA=') format('woff'),
+       url('data:application/octet-stream;base64,AAEAAAAOAIAAAwBgT1MvMj4pSXwAAADsAAAAVmNtYXDQiRm3AAABRAAAAUpjdnQgAAAAAAAAagQAAAAKZnBnbYiQkFkAAGoQAAALcGdhc3AAAAAQAABp/AAAAAhnbHlmLGdovwAAApAAAFxcaGVhZAeGphQAAF7sAAAANmhoZWEIbgTTAABfJAAAACRobXR4ox4AAAAAX0gAAAHobG9jYb7fqNoAAGEwAAAA9m1heHABMQ16AABiKAAAACBuYW1lxBR++QAAYkgAAAKpcG9zdOqHDUoAAGT0AAAFB3ByZXDdawOFAAB1gAAAAHsAAQNvAZAABQAIAnoCvAAAAIwCegK8AAAB4AAxAQIAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABA6ADoeANS/2oAWgNYAJcAAAABAAAAAAAAAAAAAwAAAAMAAAAcAAEAAAAAAEQAAwABAAAAHAAEACgAAAAGAAQAAQACAADoeP//AAAAAOgA//8AABgBAAEAAAAAAAAAAAEGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAA//kD6AMLAA8AHwAvAD8ATwBfAG8AfwCPABdAFIuDfHNrY1tUTEM7MyskHBMLBAktKyUVFAYHIyImJzU0NhczMhYRFRQGJyMiJic1NDY3MzIWARUUBgcjIiYnNTQ2FzMyFgEVFAYrASImJzU0NjsBMhYBFRQGJyMiJic1NDY3MzIWARUUBgcjIiY9ATQ2FzMyFgEVFAYrASImJzU0NjsBMhYBFRQGJyMiJj0BNDY3MzIWExUUBisBIiY9ATQ2OwEyFgEeIBayFx4BIBayFiAgFrIXHgEgFrIWIAFlIBayFx4BIBayFx7+nCAWshceASAWshYgAWUgFrIXHgEgFrIXHgFmIBayFiAgFrIXHv6cIBayFx4BIBayFx4BZiAWshYgIBayFx4BIBayFiAgFrIXHppsFh4BIBVsFiABHgEGaxYgAR4XaxceASD+zWwWHgEgFWwWIAEeAiRrFiAgFmsWICD+zGsWIAEeF2sXHgEg/s1sFh4BIBVsFiABHgIkaxYgIBZrFiAg/sxrFiABHhdrFx4BIAEIaxYgIBZrFiAgAAAAAgAA/7EDEwMMAB8AKAAItSYiDgICLSslFAYjISImNTQ+BRcyHgIyPgIzMh4FAxQGIiY+AR4BAxJSQ/4YQ1IEDBIeJjohBSYsTEpKMCIHIjgoHBQKBrR+sIAEeLh2QkNOTkMeOEI2OCIaAhgeGBgeGBYmNDo+PAHWWH5+sIACfAAG////agQvA1IAEQAyADsARABWAF8AEUAOXVlUR0M+OTUgFAcCBi0rAQYHIyImNzQzMh4BNzI3BhUUARQGIyEiJic0PgUzMh4CPgE/ATY3Mh4EFwEUBiImNDYyFgEUBi4BPgIWBRQGJyMmJzY1NCcWMzI+ARcyJxQGIiY0NjIWAUtaOkstQAFFBCpCISYlAwKDUkP+GERQAQQMECAmOiEGJC5IUEYZKRAHIzgmIBAOAf3GVHZUVHZUAYl+sIACfLR6AUM+Lks5Wi0DJSUhRCgERUdUdlRUdlQBXgNELCzFFhoBDRUQTv5bQk5OQh44Qjg0JhYYHBoCFhAaCgIWJjQ4QhwCjztUVHZUVP7vWX4CerZ4BoTTKy4BRANBThAVDRgYAY87VFR2VFQAAAABAAD/9gOPAsYABQAGswQAAS0rBQE3FwEXAWD+sp6wAZCfCgFNoK4BkaAAAAEAAP/XAx8C5QALAAazBwEBLSslBycHJzcnNxc3FwcDH5zq65zq6pzr6pzqdJ3r653q6p3r653qAAAAAAEAAP+fA48DHQALAAazCQMBLSsBFSERIxEhNSERMxEDj/6x3/6xAU/fAc7f/rABUN8BT/6xAAAAAQAAAAADjwHOAAMABrMBAAEtKzc1IRUSA33v398AAAADAAD/nwOPAx0ACwARABUACrcTEg0MCgQDLSsBIREUBiMhIiY1ESEFFSE1ITUBESERAdABv0Iu/WMuQgG+/rICnf5CAb79YwKt/WMvQkIvAw1w33Bv/WMBT/6xAAQAAP/5A6EDUgAIABEAJwA/AA1ACjgsHRYPDAYDBC0rJTQuAQYeAT4BNzQuAQ4BFj4BNxUUBgchIiYnNTQ2MyEXFjI/ASEyFgMWDwEGIi8BJjc2OwE1NDY3MzIWBxUzMgLKFB4WAhIiEJEUIBICFhwYRiAW/MsXHgEgFgEDSyFWIUwBAxYgtgoS+goeCvoRCQoXjxYOjw4WAY8YZA8UAhgaGAIUDw8UAhgaGAIUjLMWHgEgFbMWIEwgIEwgASgXEfoKCvoRFxX6DxQBFg76AAAEAAD/sQOhAy4ACAARACkAQAANQAo8MR0VDwsGAgQtKyU0Jg4BHgEyNjc0Jg4CFjI2NxUUBiMhIiYnNTQ2FzMeATsBMjY3MzIWAwYrARUUBgcjIiYnNSMiJj8BNjIfARYCyhQeFgISIhCRFCASAhYcGEYgFvzLFx4BIBbuDDYjjyI2De4WILYJGI8UD48PFAGPFxMR+goeCvoSHQ4WAhIgFBQQDhYCEiAUFI2zFiAgFrMWIAEfKCgfHgFSFvoPFAEWDvosEfoKCvoRAAAGAAD/agPCA1IABgAPADsARwBrAHQAEUAOc25eSkI8NyQNCgQBBi0rJTQjIhQzMgM0JiciFRQzMhMVBgcWFRQGBw4BFRQeBRcUIyIuAjU0NzUmNTQ3NS4BJzQ2FzIXMhMjNjURNCczBhURFCUVBiMiLgM9ATM1IyInIgc1MzU0JzMGFTMVIiYrARUUMzIBFAYuAj4BFgFMXFhgVCEiIEVFQpYUGAlSRRYWGiYyLioWAssmRD4kZiYjKDQBak42Ljb1fAICfAMBUig5IzIcEAQBCwcDDBU2BH8DXwggCC8wIv7aLEAsASxCKgU4cwHgIywBUUsBAXAHBhgXRmQNBRQXERYOChQWMB+qDiA8KVwhAxYwPQ8DDV4tTmgBGv4vGTEBVDUTEzP+qjFjbhYYHjosJMQCAQNqKh4UF0VqAsxJAiMgMgEwQjABMgAAAAcAAP9qBL8DUgADAAcACwAPABMAFwBCABNAEDceFhQSEA4MCggGBAIABy0rBTc1Byc3JwcBNzUHJzcnByc3NQcnNycHARUUBg8BBiIvASYiDwEGIi8BLgEnNTQ2PwE1NDY/ATYyHwEeAR0BFx4BBwFl1tYk4uLhA0HW1iTh4eIY1tYk9vb2A1UUE/oOJA76AwID+g4kDfoTFAEYFPIYE/oNHg36FBjyFBgBPWuwXD9gYWH+omuwXD9gYWFDXJVcP2lqav526RQiCX0ICH0BAX0ICH0JIhTpFSQIaN8WIgprBgZrCSQV32gJIhcABAAA/2oDWwNSAA4AHQAsAD0ADUAKNS0mIRYSCAMELSsBMjY3FRQOAi4BJzUeARMyNjcVFA4BIi4BJzUeATcyNjcVFA4CLgEnNR4BEzIeAQcVFA4BIi4BJzU0PgEBrYTmQnLI5MpuA0LmhYTmQnLI5MpuA0LmhYTmQnLI5MpuA0LmhXTEdgJyyOTKbgN0xAGlMC9fJkImAio+KF8vMP5UMC9fJ0ImJkInXy8w1jAvXyZCJgIqPihfLzACgyZCJ0cnQiYmQidHJ0ImAAAABwAA/7ED6ALDAAgAEQAjACwANQA+AFAAE0AQTEI9ODQvKyYfFhALBwIHLSs3NCYiBh4CNhM0JiIOAR4BNhc3Ni4BBg8BDgEHBh4BNjc2JiU0JiIOAR4BNgE0JiIOAR4BNhc0JiIOAR4BNhcUBwYjISInJjU0PgIyHgLWKjosAig+Jm0oPiYELjYw6zkDEBocAzghNggLLFhKDQkaAVYqPCgCLDgu/pgoPiYELjYw9ig+JgQuNjCvTwoU/PIUCk9QhLzIvIRQzx4qKjwoAiwBFh4qKjwoAizw1Q4aBgwQ1QMsIStMGC4rIUAlHioqPCgCLAGBHioqPCgCLE8eKio8KAIs3pF8ERF7kma4iE5OiLgAAAAAAQAA/7ED6AMLAFUABrNCAwEtKyUVFAYrASImPQE0NhczNSEVMzIWFxUUBisBIiYnNTQ2FzM1IRUzMhYdARQGKwEiJic1NDYXMzU0NhchNSMiJic1NDY7ATIWFxUUBicjFSEyFgcVMzIWA+ggFrIWICAWNf7jNRceASAWshceASAWNf7jNRYgIBayFx4BIBY1Kh4BHTUXHgEgFrIXHgEgFjUBHR0sATUXHpqzFiAgFrMWIAFrax4XsxYgIBazFiABa2seF7MWICAWsxYgAWsdLAFrHhezFiAgFrMWIAFrKh5rHgAABAAA/2oDnwNSAAoAIgA+AE4ADUAKTEAyJBkPBQAELSsBMy8BJjUjDwEGBwEUDwEGIi8BJjY7ARE0NjsBMhYVETMyFgUVITUTNj8BNSMGKwEVIzUhFQMGDwEVNzY7ATUTFSM1MycjBzMVIzUzEzMTApliKAYCAgIBAQT+2gayBQ4HsggIDWsKCGsICmsICgHS/rrOBwUGCAYKgkMBPc4ECAYIBQuLdaEqGogaKqAngFqBAm56GgkCCwoKBv1GBgeyBQWzCRUDAAgKCgj9AApKgjIBJwoGBQECQIAy/tgECgcBAQJCAfU8PFBQPDwBcf6PAAAAAAQAAP9qA58DUgAKACIAMgBPAA1ACkQ0MCQZDwUABC0rJTMvASY1Iw8BBgcFFA8BBiIvASY2OwERNDY7ATIWFREzMhYFFSM1MycjBzMVIzUzEzMTAxUhNRM2PwE1BwYnBisBFSM1IRUDDwEVNzY7ATUCmWIoBgICAgEBBP7aBrIFDgeyCAgNawoIawgKawgKAgShKhqIGiqgJ4BagQv+us4HBQYEAwEGCoJDAT3ODAYIBQuLM3oaCQILCgkHfwYHsgUFswkVAwAICgoI/QAKkTs7UFA7OwFy/o4CgoIzAScKBQUCAQEBAkCAMv7ZDwYBAQFCAAAC////rAPoAwsALgA0AAi1MC8rFwItKwEyFhQGBxUUBgcmJw4BFhcOAR4CFw4BJicuBDY3IyImNzU0NjMhMiUyFhcDEQYHFRYDoR0qKh0sHOncICYEFAsEDBgeFBFcYBkEGgoOBAgIRCQ2ATQlAQzzAQEdKgFI3NDSAe0qPCgB1h0qAcISCjQ+FBMkHCIWESAcDhgNSCJCLkAeNCVrJTTXLBz92QIUqBeXFwAAAgAA/8MDjwMuAEEARwAItUVCMgoCLSsBFAYnIxQHFxYUBiIvAQcOAyMRIxEiLgIvAQcGIyImND8BJjUjIi4BNjczNScmNDYyHwEhNzYyFgYPARUzMhYBITQ2MhYDjxYOfSV0ChQeC24IBSYiOhlHHTgqHgoIZgsQDRYIcSB9DxQCGA19YQsWHAthAddgCxwYBAhhfQ8U/vX+m2iUagE6DhYBYEJ1CxwWC24HBBgSDgH0/gwOGBQICHQMEx4Lfz9aFB4UAaRhCh4UCmFhChQeCmGkFgE0SmhoAAAAAAYAAP/5A+gDCwADAAcACwAbACsAOwARQA43MCgfFxAKCAYEAgAGLSslITUhJyE1ISUzNSMBFRQGByEiJic1NDYXITIWExUUBichIiYnNTQ2NyEyFhMVFAYHISImJzU0NjMhMhYCOwFm/prWAjz9xAFl19cBHhYO/GAPFAEWDgOgDxQBFg78YA8UARYOA6APFAEWDvxgDxQBFg4DoA8UQEjWR9dH/eiODxQBFg6ODxYBFAEOjw4WARQPjw8UARYBEI8PFAEWDo8OFhYAAAH/+f+xAxgCwwAUAAazEQcBLSsBFgcBERQHBiMiLwEmNREBJjYzITIDDwkR/u0WBwcPCo8K/u0SExgCyhcCrRcQ/u3+YhcKAwuPCg8BDwETEC0AAAL//f+xA1kDUgAoADQACLUyLA0EAi0rARQOAiIuAjc0Njc2FhcWBgcOARUUHgIyPgI3NCYnLgE+ARceAQERFAYiJjcRNDYyFgNZRHKgrKJuSgNaURg8EBIIGDY8LFBmeGRUJgM8NhgIIzwXUVr+myo6LAEqPCgBXleedEREdJ5XZrI+EggYFzwRKXhDOmpMLi5MajpEdioSOjAIEj20AUj+mh0qKh0BZh0qKgAD//n/sQOpAwsAUQBhAHEACrdsZV1VNwYDLSsBFgcDDgEHISImJyY/ATY3NCY1Nj8BPgE3NiY2PwE+ATc2Jjc2PwE+ATc0Jj4BPwI+AT8BPgIXFTYzITIWBwMOAQchIgYXFjMhMjY3EzYnFgUGFhchMjY/ATYmJyEiBg8BBhYXITI2PwE2JgchIgYHA5MWDJoKQCX9/StQDw4NAQECBAEEEg0YBQIEBAcKDBYDAQQCAgoNChoDBAIIBgoJBQYGCwUUFBAVBwGpKSwMmBQoNP4bDwwFDkMCAxAeBKgEARX9ugIGCAFTCA4CDAIIB/6tBw4COgMIBwFTBw4DCwMIB/6tCAwEAkcgKP4HJDABPCwlIg8NBwUOBAYGGhU8FQYWCwkNFD4UBRgEBwoNDkIVBBQJDAcLEQoUChIICgIEAQVAKP4GQiYBEQ8nEg4CJg0TCBEHCgEMBiQHCgEMBrMHCgEMBiQHDAEKCAAEAAD/agPoA1IACAAYABsAOAANQAotIBsZFA0HAAQtKwUhESMiJjc1Izc1NCYnISIGFxUUFjchMjYTMycFERQGByEiJic1ISImJxE0NjchMhYHFRYfAR4BFQGtAfTpFiAB1o4KB/53BwwBCggBiQcKj6enAR4gFv3pFx4B/tEXHgEgFgJfFiABDAjkEBZPAWYeF+ihJAcKAQwGJAcMAQr+kafu/okXHgEgFlkgFQLuFx4BIBa3BwjkEDQYAAf/+v+xA+oCwwAIAEoAWABmAHMAgACGABNAEIOBgHdtaGRdVk84GwQABy0rATIWDgEuAjYXBRYGDwEGIiclBwYjFgcOAQcGIyInJjc+ATc2MzIXNj8BJyYnBiMiJy4BJyY2NzYzMhceARcWBx8BJTYyHwEeAQcFNiYnJiMiBwYWFxYzMgM+AScmIyIHDgEXFjMyExc1ND8BJwcGDwEGIx8BAScFFQcfAhYfAQU3JQcGBwIYDhYCEiASBBqzARsQBRFHBxMH/n8+BAMIAgQ2L0pQTDAzBwQ2LkpRLiYFCERECAUmLlFKLjYEAxYZL01QSi44AwIIBz4BgQcTB0cRBRD9aRocLTQ3KhUaHC0zOCkZLRwaFik4My0cGhUqN5c2EggsDwEECQEBeDYBmkf+U1kFBAYEAg8B4kf+3mMBBgFeFhwWAhIgEiLeCygIJAQE2CUCHBorUB0vLC9FKlAdLxIIBSgpBQcRLx1QKiE8FiwvHU4sGxsDJdgFBCQJJwxNGEocIRQYSB4h/nUcShcUIRxKFxQBdyEHFAsEGg4CBAkBghIBQSTwQDUFAwcFAQ+yI+RNAgIAAAAAA//9/7EDWQMLAAwBuwH3ABK/Ad4BvAEyAJgABgAAAAMALSsBMh4BFA4BIi4CPgEBDgEHMj4BNT4BNzYXJj4CPwEGJjUUBzQmBjUuBC8BJiIOARUmIhQOASIHNicmBzY0JzMuAicuAQYUHwEWBh4BBwYPAQYWFxYUBiIPAQYmJyYnJgcmJyYHMiYHPgEjNj8BNicWNzY/ATYyFjMWNCcyJyYnJgcGFyIPAQYvASYnIgc2JiM2JyYiDwEGHgEyFxYHIgYiBhYHLgEnFi8BIgYiJyY3NBcnBgcyPwE2NTYXNxcmBwYHFgcnLgEnIgcGBx4CFDcWBzIXFhcWBycmBhYzIg8BBh8BBhY3Bh8DHgIXBhYHIgY1HgIUFjc2Jy4CNTMyHwEGHgIzHgEHMh4EHwMWMj8BNhYXFjciHwEeARUeARc2NQYWMzY1Bi8BJjQmNhcyNi4CJwYmJxQGFSM2ND8BNi8BJgciBw4DJicuATQ/ATYnNj8BNjsBMjYmLwEWNhcWNycmNxY3HgIfARY2NxYXHgE+ASY1JzUuATY3NDY/ATYnMjcnJiI3Nic+ATMWNzYnPgE3FjYmPgEXNzYjFjc2JzYmJzYyNTYnJgM2NyYiLwE2Ji8BJi8BJg8BIg8BFSYnIi8BJgYHBg8BJjYmBg8BBjYGFQ4BFS4BNx4BFxYHBgcGFxQGFgGtdMZycsboyG4GerwBEgEIAwECBAMRFRMKAQwEDAMBBwYEBAoFBgQBCAEGAQQEBAIEBgEGAggJBQQFBQMBCAwBBRwHAgIBCAEOAQIHCQMEBAEEAgMBBwoCBAUNBAIUDhMECAYBAgECBQkCARMJAgQGBQYKAwgEBwUDAgYJBAYBBQkEBQMDAgUEAQ4HCw8EEAMDAQgECAEIAwEIBAQEAwMEAgQSBQMMDAEDAwIMGRsDAwgFEwUDCwQNCwEEAgYECAQJBFEyBAUCBgUDARgKAQIHBQQDBAQEAQIBAQECCgcHEgQHCQQDCAQCDgEBAgIOAgQCAg8IAwQDAgMFAQQKCgEECAQFDAcCAwgDCQcWBgYFCAgQBBQKAQIEAgYDDgMEAQoFCBEKAgICAgEFAgQBCgIDDAMCCAECCAMBAwIHCwQBAgIIFAMICgECAQQCAwUCAQIBBAECAgQYAwkDAQEBAw0CDgQCAwEEAwUCBggEAgIBCAQEBwgFBwwEBAICAgYBBQQDAgMFBwQDAhIBBAICBQwCCQICCggFCQIIBAIKCQ0JaXJRAQwBDQEEAxUBAwUCAwICAQUMCAMEBQEKAQMBAQQIBAoBBwYCCgIEAQwBAQICBAsPAQIJCgEDC3TE6sR0dMTqxHT+3QEIAgYGAQQIAwULAQwCAgQMAQoHAgMEAgQBAgYMBQYDCgEGBAEBAgICAQMDAgEDCAQCBgIDAwQFBAYHBAYICgcEBQYFDAMBAgQCAQMMCQ4DBAUHCAUDEQIDDgcGDAMBAwkCBwoDBgEOBAoEAQIFAgIGCgQHBwcBCQUIBwgDAgcDAgQCBgIEBQoDAw4CBQEBAgUEBwIBCggPAQMCAgcEAw4DAgQDBwMGBAQBAS1PBAEIBAMEBg8KAgYEBQQFDgkUCwIBBhoCARcFBAYDBRQDAxAFAgEECAUIBAELFw4FDAICBAQMCA4EDgEKCxQHCAEFAw0CAQIBEgMKBAQJBQYCAwoDAgMFDAIQCRMDAwQEBgIECgcOAQUCBAEEAgIQBQ8FAgUDAgsCCAQEAgIEGA4JDgUJAQQGAQIDAQEBBAMGBwYFAg8KAQQBAgMBAgMIBRcEAggIAwQPAgoKBQECAwQLCQUCAgICBgIKBwYFBAQEAwEECgQGAQcCAQcGBQMEAQEBBQQC/g0VVQICBQQGAg8BAQIBAgEBAwIKAwMEAQIDAgYHAw4GAgEFBAIIAQIIAwMCAgUcCBEJDgkMAgQQBwAB////+QQwAwsAGwAGsw4DAS0rJRQGByEiJjc0NjcmNTQ2MzIWFzYzMhYVFAceAQQvfFr9oWeUAVBAAah2WI4iJzY7VBdIXs9ZfAGSaEp6Hg8JdqhkTiNUOyojEXQAAAAB//7/agH4AwsAIAAGsxQEAS0rARYHAQYjJy4BNxMHBiMiJyY3Ez4BOwEyFhUUBwM3NjMyAe4KBv7SBxAICQoCbuICBQoHCgNwAg4ItwsOAmDdBQILAhYLDf16DgEDEAgBwzgBBwgNAc0ICg4KBAb+/jYCAAUAAP+xA+gDCwAPAB8ALwA/AE8AD0AMS0M7MysjGxMLAwUtKzcVFAYrASImPQE0NjsBMhY3FRQGKwEiJj0BNDY7ATIWNxEUBisBIiY1ETQ2OwEyFjcRFAYrASImNRE0NjsBMhYTERQGKwEiJjURNDY7ATIWjwoIawgKCghrCArWCghrCAoKCGsICtYKB2wHCgoHbAcK1woIawgKCghrCArWCghrCAoKCGsICi5rCAoKCGsICgpAswgKCgizCAoKh/6+CAoKCAFCCAoKzv3oCAoKCAIYCAoKARb8yggKCggDNggKCgAAAAABAAAAAAI8Ae0ADgAGswoEAS0rARQPAQYiLwEmNDYzITIWAjsK+gscC/oLFg4B9A4WAckOC/oLC/oLHBYWAAAAAf//AAACOwHJAA4ABrMKAgEtKyUUBichIi4BPwE2Mh8BFgI7FA/+DA8UAgz6Ch4K+gqrDhYBFB4L+goK+gsAAAEAAAAAAWcCfAANAAazCwMBLSsBERQGIi8BJjQ/ATYyFgFlFCAJ+goK+gscGAJY/gwOFgv6CxwL+gsWAAEAAAAAAUECfQAOAAazCwQBLSsBFA8BBiImNRE0PgEfARYBQQr6CxwWFhwL+goBXg4L+gsWDgH0DxQCDPoKAAABAAD/5wO2AikAFAAGswoCAS0rCQEGIicBJjQ/ATYyFwkBNjIfARYUA6v+YgoeCv5iCwtcCx4KASgBKAscDFwLAY/+YwsLAZ0LHgpcCwv+2AEoCwtcCxwAAQAA/8ACdANDABQABrMPAgEtKwkBBiIvASY0NwkBJjQ/ATYyFwEWFAJq/mILHAxcCwsBKP7YCwtcCx4KAZ4KAWn+YQoKXQscCwEpASgLHAtdCgr+YgscAAEAAAAAA7YCRgAUAAazDwIBLSslBwYiJwkBBiIvASY0NwE2MhcBFhQDq1wLHgr+2P7YCxwMXAsLAZ4LHAsBngtrXAoKASn+1woKXAseCgGeCgr+YgscAAABAAD/wAKYA0MAFAAGsw8HAS0rCQIWFA8BBiInASY0NwE2Mh8BFhQCjf7YASgLC1wLHAv+YgsLAZ4KHgpcCwKq/tj+1woeCl0KCgGfCh4KAZ4KCl0KHgAAAQAA/7EDgwLnAB4ABrMaCwEtKwEUDwEGIi8BERQGByMiJjURBwYiLwEmNDcBNjIXARYDgxUqFTsVpCgfRx4qpBQ8FCoVFQFrFDwVAWsVATQcFioVFaT+dx0kASYcAYmkFRUqFTsVAWsVFf6VFgAAAAEAAP+IAzUC7QAeAAazGgQBLSsBFAcBBiIvASY0PwEhIiY9ATQ2FyEnJjQ/ATYyFwEWAzUU/pUWOhUqFhaj/ncdJCQdAYmjFhYqFToWAWsUAToeFP6UFBQqFTwVoyoeRx4qAaQVPBQqFRX+lRQAAAABAAD/iANZAu0AHQAGsxMLAS0rARUUBiMhFxYUDwEGIicBJjQ3ATYyHwEWFA8BITIWA1kkHf53pBUVKhU7Ff6UFBQBbBU6FioVFaQBiR0kAV5HHiqkFDwUKxQUAWwVOhYBaxUVKhU6FqQoAAABAAD/zwODAwsAHgAGsxMEAS0rARQHAQYiJwEmND8BNjIfARE0NjczMhYVETc2Mh8BFgODFf6VFjoV/pUVFSkWOhWkKh5HHSqkFTsVKhUBgh4U/pQVFQFsFDsWKRUVpAGJHSoBLBz+d6QVFSoVAAAAAQAA/7EDWgMLAEMABrMsCQEtKwEHFzc2Fh0BFAYrASInJj8BJwcXFgcGKwEiJic1NDYfATcnBwYjIicmPQE0NjsBMhYPARc3JyY2OwEyFgcVFAcGIyInAszGxlAQLRQQ+hcJChFRxsZQEQkKF/oPFAEsEVDGxlALDgcHFhYO+hcTEVDGxlERExf6DxYBFgcHDgsCJMbGUBITGPoOFhcVEVHGxlERFRcWDvoYExJQxsZQCwMJGPoOFi0QUcbGURAtFg76GAkDCwACAAD/sQNaAwsAGAAwAAi1LSEUCAItKwEUDwEXFhQGByMiJic1ND4BHwE3NjIfARYBFRQOAS8BBwYiLwEmND8BJyY0NjczMhYBpQW5UAoUD/oPFAEWHAtQuQYOBkAFAbQUIAlQuQYOBkAFBbpRChQP+g8WAQUIBblRCh4UARYO+g8UAgxQuQYGPwYB2/oPFAIMULkGBj8GDga5UQoeFAEWAAAAAAIAAP+5A1IDAwAXADAACLUsHxMIAi0rARUUBiYvAQcGIi8BJjQ/AScmNDY7ATIWARQPARcWFAYrASImNzU0NhYfATc2Mh8BFgGtFhwLUbkFEAU/Bga5UAsWDvoOFgGlBrlQCxYO+g4WARQeClG5Bg4GPwYBOvoOFgIJUboFBUAFEAW5UAscFhYBaQcGuVALHBYWDvoOFgIJUboFBUAFAAABAAD/agPoA1IARAAGszMRAS0rARQPAQYiJj0BIxUzMhYUDwEGIi8BJjQ2OwE1IxUUBiIvASY0PwE2MhYdATM1IyImND8BNjIfARYUBisBFTM1NDYyHwEWA+gLjgseFNdIDhYLjwoeCo8LFg5I1xQeC44LC44LHhTXSA4WC48LHAuPCxYOSNcUHguOCwFeDguPCxYOSNcUHguOCwuOCx4U10gOFguPCxwLjwsWDkjXFB4LjgsLjgseFNdIDhYLjwoAAAAAAQAAAAAD6AIRACAABrMUBAEtKwEUDwEGIiY9ASEVFAYiLwEmND8BNjIWHQEhNTQ2Mh8BFgPoC44LHhT9xBQeCo8LC48KHhQCPBQeC44LAV4OC48LFg5ISA4WC48LHAuPCxYOSEgOFguPCgAAAQAA/2oBigNSACAABrMcDAEtKwEUBicjETMyHgEPAQYiLwEmNDY7AREjIiY2PwE2Mh8BFgGJFg5HRw8UAgyPCh4KjwoUD0hIDhYCCY8LHAuPCwKfDhYB/cQUHguOCwuOCx4UAjwUHguOCwuOCwAAAAP///9qA6EDDQAjACwARQAKtz0vKicaCAMtKwEVFAYnIxUUBicjIiY3NSMiJic1NDY7ATU0NjsBMhYXFTMyFhc0LgEGHgE+AQEUBiIvAQYjIi4CPgQeAhcUBxcWAjsKB30MBiQHDAF9BwoBDAZ9CggkBwoBfQcKSJTMlgSO1IwBIio8FL9ke1CSaEACPGyOpIxwOANFvxUBlCQHDAF9BwwBCgh9CggkBwp9CAoKCH0KGWeSApbKmAaM/podKhW/RT5qkKKObjoEQmaWTXtkvxUAAAAAA////7ADWQMQAAkAEgAjAAq3IBcMCgQCAy0rATQnARYzMj4CBQEmIyIOAQcUJRQOAi4DPgQeAgLcMP5bTFo+cFAy/dIBpUtcU4xQAQLcRHKgrKJwRgJCdJ6wnHZAAWBaSv5cMjJQcmkBpTJQkFBbW1igckYCQnactJp4PgZKbKYAAAAAA////2oDoQMNAA8AGAAxAAq3KRsWEwsDAy0rARUUBichIiYnNTQ2MyEyFhc0LgEGHgE+AQEUBiIvAQYjIi4CPgQeAhcUBxcWAjsKB/6+BwoBDAYBQgcKSJTMlgSO1IwBIio8FL9ke1CSaEACPGyOpIxwOANFvxUBlCQHDAEKCCQHCgoZZ5IClsqYBoz+mh0qFb9FPmqQoo5uOgRCZpZNe2S/FQADAAD/sAI+AwwAEAAnAFsACrdYPiAVDAIDLSsBFAYiJjc0JiMiJjQ2MzIeARc0LgIiDgIHFB8CFhczNjc+ATc2NxQHDgIHFhUUBxYVFAcWFRQGIw4CJiciJjc0NyY1NDcmNTQ3LgInJjU0PgMeAgGbDAwOAjwdCAoKCBw2LFgmPkxMTD4mASYREUgHfwhHBhYGJkc5GSIgAxoODhkIJBkLLjIwCRokAQcZDg4aAiIgGToyUGhoaE42AhEICgoIGRwKEAoSKh0oRC4YGC5EKDksEhNVUVFVBhoFLDlXPxssPh0PHxQPDxUdEA0NGhwZHAIgFxwaDQ0QHRUPDxQfDxxAKhw/VzdgPiQCKDpkAAAAAAP//f+xA18DCwAUACEALgAKtyslHxgQAwMtKwEVFAYrASImPQE0NjsBNTQ2OwEyFhc0LgEOAx4CPgE3FA4BIi4CPgEyHgEB9AoIsggKCgh9CgckCAroUoqmjFACVIiqhlZ7csboyG4Gerz0un4CIvoHCgoHJAgKxAgKCsxTilQCUI6ijlACVIpTdcR0dMTqxHR0xAAEAAD/0QOhAusAEwAvAEwAbQANQApoUUc0KhgRAwQtKwERFAYmLwEjIiYnNTQ2NzM3NjIWExQGBwYjIiY3ND4DLgIvASY3NDYXMhceARcUBgcGIyImNzQ3Njc+ATQmJyYnJjU0NjMyFx4BFxQGBwYjIiY3ND8BNjc+AS4BJyYnLgEnJjU0NjMyFx4BAa0WHAu6kg8UARYOkroKHhTXMCcFCQ4WAQwWEBAECBgHEQoEFA8JBScwj2BNCAYPFgEVIAspLi4pCyAVFA8HCE5ekI52BwcPFgEWGRkURU4CSkcUGQQSAxYUEAcHdo4Cjv2gDhYCCboWDtYPFAG6ChT+wSpKDwMUEAwQDAwcJBwMBg4IDA8WAQMPSipVkiADFg4WCxAJHlpoWh4JEAsWDhYDIZBWgNgyAxYOFA0MDg4zmKqYMw4OAwYDDRQOFgMz1gAAAAACAAAAAAKDArEAEwAvAAi1KhgRAwItKwERFAYmLwEjIiYnNTQ2NzM3NjIWExQGBwYjIiY3ND4DLgIvASY3NDYXMhceAQGtFhwLupIPFAEWDpK6Ch4U1zAnBQkOFgEMFhAQBAgYBxEKBBQPCQUnMAKO/aAOFgIJuhYO1g8UAboKFP7BKkoPAxQQDBAMDBwkHAwGDggMDxYBAw9KAAABAAAAAAGtArEAEwAGsxEDAS0rAREUBiYvASMiJic1NDY3Mzc2MhYBrRYcC7qSDxQBFg6SugoeFAKO/aAOFgIJuhYO1g8UAboKFAAAAwAA/7EDCgNTAAsAQwBLAAq3SEU+KQcBAy0rEwcmPQE0PgEWHQEUAQcVFAYHIicHFjMyNjc1ND4BFhcVFAYHFTMyFg4BIyEiJj4BOwE1JicHBiIvASY0NwE2Mh8BFhQnARE0NhcyFpc4GBYcFgJ2ymhKHx42NzxnkgEUIBIBpHmODxYCEhH+mw4WAhIQj0Y9jgUQBC4GBgKwBg4GLgXZ/qVqSTlcAUM5Oj5HDxQCGA1HHgEvykdKaAELNhySaEcPFAIYDUd8tg1KFhwWFhwWSgcmjgYGLgUQBAKxBgYuBRBF/qYBHUpqAUIAAAAC////sQKDA1MAJwAzAAi1MSwaCgItKwEVFAYHFTMyHgEGIyEiLgE2OwE1LgE3NTQ+ARYHFRQWMjYnNTQ+ARYnERQOASYnETQ2HgECg6R6jw8UAhgN/psPFAIYDY95pgEWHBYBlMyWAhYcFo9olmYBaJRqAclHfLYNShYcFhYcFkoNtnxHDxQCGA1HaJKSaEcPFAIYyf7jSmgCbEgBHUpqAmYAAAIAAP/5A1kCxAAYAEAACLU8HBQEAi0rARQHAQYiJj0BIyImJzU0NjczNTQ2FhcBFjcRFAYrASImNycmPwE+ARczMjY3ETQmJyMiNCY2LwEmPwE+ARczMhYClQv+0QseFPoPFAEWDvoUHgsBLwvEXkOyBwwBAQEBAgEICLIlNAE2JLQGCgICAQEBAgEICLJDXgFeDgv+0AoUD6EWDtYPFAGhDhYCCf7QCrX+eENeCggLCQYNBwgBNiQBiCU0AQQCCAQLCQYNBwgBXgAAAAIAAP/5A2sCwwAnAEAACLU8LA4HAi0rJRQWDwEOAQcjIiY1ETQ2OwEyFhUXFg8BDgEnIyIGBxEUFhczMh4CARQHAQYiJj0BIyImPQE0NjczNTQ2FhcBFgFlAgECAQgIskNeXkOyCAoBAQECAQgIsiU0ATYktAYCBgICBgv+0QscFvoOFhYO+hYcCwEvCy4CEgUOCQQBXkMBiENeCggLCQYNBwgBNiT+eCU0AQQCCAEsDgv+0AoUD6EWDtYPFAGhDhYCCf7QCgAABAAA/2oDoQNTAAMAEwAjAEcADUAKNCcfFw8HAgAELSsXIREhNzU0JisBIgYdARQWOwEyNiU1NCYrASIGHQEUFjsBMjY3ERQGIyEiJjURNDY7ATU0NhczMhYdATM1NDYXMzIWFxUzMhZHAxL87tcKCCQICgoIJAgKAawKCCMICgoIIwgK1ywc/O4dKiodSDQlJCU01jYkIyU0AUcdKk8CPGuhCAoKCKEICgoIoQgKCgihCAoKLP01HSoqHQLLHSo2JDYBNCU2NiQ2ATQlNioAAA8AAP9qA6EDUwADAAcACwAPABMAFwAbAB8AIwAzADcAOwA/AE8AcwAjQCBgU0tEPjw6ODY0LygiIB4cGhgWFBIQDgwKCAYEAgAPLSsXMzUjFzM1IyczNSMXMzUjJzM1IwEzNSMnMzUjATM1IyczNSMDNTQmJyMiBgcVFBY3MzI2ATM1IyczNSMXMzUjNzU0JicjIgYdARQWNzMyNjcRFAYjISImNRE0NjsBNTQ2FzMyFh0BMzU0NhczMhYXFTMyFkehocWyssWhocWyssWhoQGbs7PWsrIBrKGh1rOzxAwGJAcKAQwGJAcKAZuhodazs9ahoRIKCCMICgoIIwgK1ywc/O4dKiodSDQlJCU01jYkIyU0AUcdKk+hoaEksrKyJKH9xKH6of3EoSSyATChBwoBDAahBwwBCv4msiShoaFroQcKAQwGoQcMAQos/TUdKiodAssdKjYkNgE0JTY2JDYBNCU2KgAAAAMAAP92A6ADCwAIABQALgAKtx8ZEgsGAgMtKzc0Jg4BHgEyNiUBBiIvASY0NwEeASUUBw4BJyImNDY3MhYXFhQPARUXNj8BNjIW1hQeFgISIhABav6DFToWOxUVAXwWVAGYDBuCT2iSkmggRhkJCaNsAipLIQ8KHQ4WAhIgFBT6/oMUFD0UOxYBfDdU3RYlS14BktCQAhQQBhIHXn08AhktFAoACQAA/7EDWQLEAAMAEwAXABsAHwAvAD8AQwBHABdAFEVEQUA+Ny4mHRwZGBUUCgQBAAktKzcVIzUlMhYdARQGKwEiJj0BNDY/ARUhNRMVIzUBFSE1AzIWBxUUBicjIiY3NTQ2FwEyFgcVFAYHIyImJzU0NhcFFSM1ExUhNcTEAYkOFhYOjw4WFg7o/h59fQNZ/mV9DxYBFBCODxYBFBAB9A4WARQPjw8UARYOAUF9ff4eQEdHSBYOjw4WFg6PDxQB1kdHAR5ISP3ER0cCgxQQjg8WARQQjg8WAf7iFA+PDxQBFg6PDhYBR0dHAR5ISAAABgAA/3IELwNJAAgAEgAbAHsAtwDzABFADuDCpYZjMxkVEAsGAgYtKwE0JiIGFBYyNgU0Jg4BFxQWMjYDNCYiBh4BMjYHFRQGDwEGBxYXFhQHDgEjIi8BBgcGBwYrASImNScmJwcGIicmNTQ3PgE3Ji8BLgE9ATQ2PwE2NyYnJjQ3PgEzMh8BNjc2NzY7ATIWHwEWFzc2MhcWFRQPAQYHFh8BHgEBFRQHBgcWFRQHBiMiLwEGIicOAQciJyY1NDcmJyY9ATQ3NjcmNTQ/ATYzMhYXNxc2PwEyFxYVFAcWFxYRFRQHBgcWFRQHBiMiJicGIicOASInJjU0NyYnJj0BNDc2NyY1ND8BNjMyFhc2Mhc2PwEyFxYVFAcWFxYB9FR2VFR2VAGtLDgsASo6LAEsOCwBKjos2AgFVgYMEx8EBA1CCwYFQBUWBgcEDWgGCg0TF0IEDQZQBAUkCA0HVQUICAVWBwsTHwQEDEQKBgZAExgGBwMNaAYKAQ0TFkIFDQVRBBgRCA0GVQUIAWVTBgocAkQBBRUdCwwLBywDAUQDHQoHU1MHCh0DNBABBCoIEREcFwQCQwIcCQdTUwYKHAJEAQUqCAsMCwcsBEQDHQoHU1MHCh0DNBABBCoIDAoMHBcEAkMCHAkHUwFeO1RUdlRU4x0sAigfHSoqAlkdKio7KirNZwYKAQ4TFxslBgwEEUIEMgsGPBsNCAZVBgwyBARLDwUFCCwMGBYNAQgHZwYKAQ4TFxslBgwEEUIEMgoIPBoNCAZVBgsxBARLDwUFHhUNGxMMAgj+z04JCA8OPw4CAigbJQEBCzQBKAICDj8ODwgJTgkJEA0/DgICHgk0DAEBKBcBJwICDj8NEAkCM04JCQ8OPw4CAic0DAEBDDQnAgIOPw4PCQlOCQgQDT8OAgIeCTQMAgIoFwEnAgIOPw0QCAACAAD/sQNaAwoACABoAAi1USAGAgItKwE0JiIOARYyNiUVFAYPAQYHFhcWFAcOASciLwEGBwYHBisBIiY1JyYnBwYiJyYnJjQ3PgE3Ji8BLgEnNTQ2PwE2NyYnJjQ3PgEzMh8BNjc2NzY7ATIWHwEWFzc2MhcWFxYUDwEWHwEeAQI7UnhSAlZ0VgEcCAdoCgsTKAYFD1ANBwdNGRoJBwQQfAgMEBsXTwYQBkYWBAUIKAoPCGYHCAEKBWgIDhclBgUPUA0HCE0YGgkIAxF8BwwBDxwWUAUPB0gUBAQ7DglmBwoBXjtUVHZUVHh8BwwBEB4VGzIGDgYVUAEFPA0ITBwQCgdnCQw8BQZAHgUOBgwyDxwbDwEMB3wHDAEQGRogLQcMBxRQBTwNCEwcDwgIZwkMPAUFQxwFDgZNHBsPAQwAAAH////5AxIDCwBQAAazIAYBLSslFAYHBgcGIyIuAS8BJicuAScmLwEuAS8BJjc0NzY3PgEzMhcWFx4CFx4CFRQOAgcUHwEeATUeARcyFh8BFjcyPgI3Mh4BHwEWFxYXFgMSDAYLOTQzEBwkCDs2K0iYLBsTCggIBAcDAR0fHA4wDwgEChQGFBQHAhAIICYeAQMEAQ4qbkwBEgULBgcKHh4gDAcQGAJBEwwnAwKeDzAOHCAcBAoDFRQbLJhIKzYcFxASIA4PNDQ4DAYMAgMoCigeDwIYEAgLIhoiCAUICwMWAU1uKgwCBQMBHigeAQgQAiULBhMKBAAACAAA/2oDWQNSABMAGgAjAFoAXwBuAHkAgAAVQBJ9e3ZvbmJdW043IRsVFA8HCC0rAR4BFREUBgchIiYnETQ2NyEyFhcHFTMmLwEmExEjIiYnNSERARYXNjMyFxYHFCMHBiMiJicGBwYjIi8BNCcmNz4BNzYXFhU2NzY3LgE3NjsBMhcWBwYHFQYHFgE2Nw4BEwYXNjc0NzY3Ij0BJzQnAzY3Ii8BJicGBwYFJiMWMzI3AzMQFh4X/RIXHgEgFgH0FjYPStIFB68GxugXHgH+UwGsEh0hIFIRCQgBAQMkG0wie2BVMggHDgMGAgU2LggFAR0fJhQNCAgGEQwNBwoFAQEBBx/+8R4vHSjXCQcBAwQBAgEBB0ZMUwEGCSscDyAQAWAOQCobCAICfhA0GP1+Fx4BIBYDfBceARYQJtIQB68H/LACPB4X6fymAUsOEQQbDRABAhUWEg0hkgQGAQIGDhc4GgUIAQEvP0xGLlYcFggMGgMBFkQnW/7xDUsWMgHxFzIEFAIWAwIBAQEMCP6NHg8FCCU9MD4fBw4QAQAAAAAEAAD/agNZA1IAEwAaACMAUQANQAonJCEbFRQPBwQtKwEeARURFAYHISImJxE0NjchMhYXBxUzJi8BJhMRIyImJzUhERMVMxMzEzY3NjUzFx4BFxMzEzM1IxUzBwYPASMnLgEnAyMDBwYPASMnJi8BMzUDMxAWHhf9EhceASAWAfQWNg9K0gUHrwbG6BceAf5TOydcWEgEAQEDAQECAkhZWyenMjcDAQEDAQECAlE/UQIBAQICAgEDNzICfhA0GP1+Fx4BIBYDfBceARYQJtIQB68H/LACPB4X6fymAfQ7/o8BDwsOCQUOARQE/vEBcTs79QsODAwCEgUBMP7QDQgEDAwOC/U7AAAEAAD/agNZA1IAEwAaACMAUQANQAo9JSEbFRQPBwQtKwEeARURFAYHISImJxE0NjchMhYXBxUzJi8BJhMRIyImJzUhETcVMzUjNz4CBzMUHgIfASMVMzUjJzczNSMVMwcOAQ8BIycmLwEzNSMVMxcHAzMQFh4X/RIXHgEgFgH0FjYPStIFB68GxugXHgH+U6idKjoDBAYBAQQCBAI8K6Mma2wmnCk5AggBAQEDAwY7KqImam0CfhA0GP1+Fx4BIBYDfBceARYQJtIQB68H/LACPB4X6fymgzs7WgQKBgECBgQEA1o7O5ieOztZBAoDAQUGB1k7O5ieAAYAAP9qA1kDUgATABoAIwAzAEMAUwARQA5KRDo0LiYhGxUUDwcGLSsBHgEVERQGByEiJicRNDY3ITIWFwcVMyYvASYTESMiJic1IRETNDYzITIWHQEUBiMhIiY1BTIWHQEUBiMhIiY9ATQ2MwUyFh0BFAYjISImPQE0NjMDMxAWHhf9EhceASAWAfQWNg9K0gUHrwbG6BceAf5TjwoIAYkICgoI/ncICgGbCAoKCP53CAoKCAGJCAoKCP53CAoKCAJ+EDQY/X4XHgEgFgN8Fx4BFhAm0hAHrwf8sAI8Hhfp/KYB4wcKCgckCAoKCFkKCCQICgoIJAgKjwoIJAgKCggkCAoABgAA/7EDEgMLAA8AHwAvADsAQwBnABFADl9MQDw2MSsjGxMLAwYtKwERFAYrASImNRE0NjsBMhYXERQGKwEiJjURNDY7ATIWFxEUBisBIiY1ETQ2OwEyFhMRIREUHgEzITI+AQEzJyYnIwYHBRUUBisBERQGIyEiJicRIyImPQE0NjsBNz4BNzMyFh8BMzIWAR4KCCQICgoIJAgKjwoIJAgKCggkCAqOCgckCAoKCCQHCkj+DAgIAgHQAggI/on6GwQFsQYEAesKCDY0Jf4wJTQBNQgKCgisJwksFrIWLAgnrQgKAbf+vwgKCggBQQgKCgj+vwgKCggBQQgKCgj+vwgKCggBQQgKCv5kAhH97wwUCgoUAmVBBQEBBVMkCAr97y5EQi4CEwoIJAgKXRUcAR4UXQoAAAAAAgAA/2oD6ALDABcAPQAItToiCwACLSsBIg4BBxQWHwEHBgc2PwEXFjMyPgIuAQEUDgEjIicGBwYHIyImJzUmNiI/ATY/AT4CPwEuASc0PgEgHgEB9HLGdAFQSTAPDRpVRRgfJyJyxnQCeMIBgIbmiCcqbpMbJAMIDgICBAIDDAQNFAcUEAcPWGQBhuYBEOaGAnxOhEw+cikcNjItIzwVAwVOhJiETv7iYaRgBGEmBwUMCQECCgUPBQ4WCBwcEyoyklRhpGBgpAABAAD/aQPoAsMAJgAGsyILAS0rARQOASMiJwYHBgcGJic1JjYmPwE2PwE+Aj8BLgEnND4CMzIeAQPohuaIJypukxskCg4DAgQCAwwEDRQHFBAHD1hkAVCEvGSI5oYBXmGkYARhJggEAQwKAQIIBAMPBQ4WCBwcEyoyklRJhGA4YKQAAAACAAD/sAPoAsMAJQBLAAi1STYiCgItKwEUDgEjIicGBwYHIyImNSY0NjU/AjYHNz4CNy4BJzQ+ATIeARcUBgceAR8BFh8DFAcOAScmJyYnBiMiJxYzMjY3PgEnNCceAQMSarRrMDJGVRUbAgYMAQIBBAMDARwFDg4ERU4BarTWtGrWUEQFDAgbCQQFBAMBAgoIGxVVRjIwl3AgEVqkQkVMAQ1IVAGlTYRMCTEXBQQKBwEEBAEDBgMDAR4FGBIQKHRDToRMTITcQ3YnDhYKIQsDBQYKAQIICgEEBRcxCUoDMi80hkorKid4AAAAAAMAAP+wA+gCwwAVADsAYAAKt1xJIxYJAAMtKwEiDgEHFBYfAQc2PwEXFjMyPgE0LgEnMh4CDgEnIicGBwYHIyImNSY0NjU/AjYHNz4CNy4BJzQ+AQEeAR8BFh8DFAcOAScmJyYnBiMiJxYzMjY3PgEnNCceARQGAYlVllYBPDU2ExMPGR4rKlWUWFiUVWq2aAJssmwwMkZVFRsCBgwBAgEEAwMBHAUODgRFTgFqtAI2BQwIGwkEBQQDAQIKCBsVVUYyMJdwIBFapEJFTAENSFRQAnw6ZDktVh4gLgsKEgYIOmRwZjhITIScgk4BCTEXBQQKBwEEBAEDBgMDAR4FGBIQKHRDToRM/XQOFgohCwMFBgoBAggKAQQFFzEJSgMyLzSGSisqJ3iHdgAAAAMAAP9qA8QDUwAMABoAQgAKtzYhFA0KBgMtKwU0IyImNzQiFRQWNzIlISYRNC4CIg4CFRAFFAYrARQGIiY1IyImNT4ENzQ2NyY1ND4BFhUUBx4BFxQeAwH9CSEwARI6KAn+jALWlRo0UmxSNBoCpiod+lR2VPodKhwuMCQSAoRpBSAsIAVqggEWIDQqYAgwIQkJKToBqagBKRw8OCIiODwc/teoHSo7VFQ7Kh0YMlRehk9UkhAKCxceAiIVCwoQklROiFxWMAAAAgAA/2oDxANTAAwANAAItSgTCgYCLSsFNCMiJjc0IhUUFjcyJRQGKwEUBiImNSMiJjU+BDc0NjcmNTQ+ARYVFAceARcUHgMB/QkhMAESOigJAccqHfpUdlT6HSocLjAkEgKEaQUgLCAFaoIBFiA0KmAIMCEJCSk6AakdKjtUVDsqHRgyVF6GT1SSEAoLFx4CIhULChCSVE6IXFYwAAAAAAIAAP/5ATADCwAPAB8ACLUbEwsEAi0rJRUUBgcjIiY9ATQ2FzMyFhMDDgEnIyImJwMmNjsBMhYBHhYOjw4WFg6PDxQRDwEWDo8OFgEPARQPsw4Wmn0PFAEWDn0OFgEUAj7+Uw4WARQPAa0OFhYAAAAE////sQOhAwsAAwAMABUAPQANQAowHhMQCwQCAAQtKxchNSE1ITUjIiY9ASEBNC4BDgEWPgE3FRQGByMVFAYjISImJzUjIiY3NTQ2FzMRNDYzITIWHwEeAQcVMzIW1gH0/gwB9FkWIP6bAoMUIBICFhwYRgwGfSAW/egWHgF9BwwBQCskIBUBdxc2D1UPGAEjLT4Hj9bWIBZZ/ncPFAIYGhgEEBHoBwoBWRYgIBZZDAboLEABATAWIBgOVRA2Fo8+AAAABQAA//kD5AMLAAYADwA5AD4ASAAPQAxDQDw6HBMMCAIABS0rJTcnBxUzFQEmDwEGFj8BNhMVFAYjISImNRE0NjchMhceAQ8BBicmIyEiBgcRFBYXITI2PQE0PwE2FgMXASM1AQcnNzYyHwEWFAHwQFVANQEVCQnECRIJxAkkXkP+MENeXkMB0CMeCQMHGwgKDQz+MCU0ATYkAdAlNAUkCBg3of6JoQJvM6EzECwQVRC9QVVBHzYBkgkJxAkSCcQJ/r5qQ15eQwHQQl4BDgQTBhwIBAM0Jf4wJTQBNiRGBwUkCAgBj6D+iaABLjShMxAQVBAsAAEAAP+xA+gDLwAsAAazKBgBLSsBFAcBBiImNzUjIg4FFRQXFBYHFAYiJy4CJyY1NDc2ITM1NDYWFwEWA+gL/uMLHBgCfTdWVj44IhQDBAEKEQYECAYDRx5aAY59FCAJAR0LAe0PCv7iCxYOjwYSHjBAWjgfJgQSBggMCgUOFAOfXW9L4Y8OFgIJ/uILAAAAAAEAAP+xA+gDLgArAAazIwcBLSslFA8CBgcGIiYnNDY3NjU0LgUrARUUBiInASY0NwE2MhYHFTMgFxYD6EcGBwMFBhIIAQIBAxQiOD5WVjd9FCAJ/uMLCwEdCxwYAn0Bjloe4V2fDREIBAoMCAUUAyYfOFpAMB4SBo8OFgsBHgoeCgEeChQPj+FLAAAAAgAA/7ED6AM1ABQAOgAItTMcDQQCLSslFRQHBiMiJwEmNDcBNhYdAQcGFBcFFA4CDwEGIyInJjc2Jy4BJxUUBwYjIicBJjQ3ATYXFh0BFhcWAWUWBwcPCv7jCwsBHREs3QsLA2ASGhwIDAQLAwIOARhTJHZbFQgGDwr+4gsLAR4QFxXmaV72JxcKAwsBHgoeCgEeERMXJ94LHAvzIFRGRhAWCgEED99cKCwHjBcKAwsBHgoeCgEeEQoJF5MPbGEAAwAA//kD6AJ9ABEAIgAzAAq3MCcbFA8CAy0rASYnFhUUBiImNTQ3BgceASA2ATQmByIGFRQeATY1NDYzMjYFFAcGBCAkJyY0NzYsAQQXFgOhVYAiktCSIoBVS+ABBOD+uRALRmQQFhBEMAsQAdkLTv74/tr++E4LC04BCAEmAQhOCwE6hEE6Q2iSkmhDOkGEcoiIAUkLEAFkRQwOAhIKMEQQzBMTgZqagRMmFICaAp5+FAAAAgAA/70DTQMLAAgAHQAItRcNBwICLSsTNCYOAR4CNgEUBwEGIicBLgE9ATQ2NzMyFhcBFvoqOiwCKD4mAlUU/u4WOxT+cRUeKh3pHUgVAY8UAlgeKgImQCQGMP7ZHhX+7hUVAY8VSB3oHSoBHhX+cRUAAAADAAD/vQQkAwsACAAdADQACrctIhcNBwIDLSsTNCYOAR4CNgEUBwEGIicBLgE9ATQ2NzMyFhcBFhcUBwEGIyImJwE2NCcBLgEjMzIWFwEW+io6LAIoPiYCVRT+7hY7FP5xFR4qHekdSBUBjxTXFf7uFh0UGhABBhUV/nEVSB19HUgVAY8VAlgeKgImQCQGMP7ZHhX+7hUVAY8VSB3oHSoBHhX+cRUdHhX+7hUQEQEGFTsVAY8VHh4V/nEVAAEAAP/5AoMDUwAjAAazEwcBLSsBMhYXERQGByEiJicRNDYXMzU0Nh4BBxQGByMiJjU0JiIGFxUCTRceASAW/ekXHgEgFhGUzJYCFA8kDhZUdlQBAaUeF/6+Fh4BIBUBQhYgAbNnlAKQaQ8UARYOO1RUO7MAAQAA//kDoQMMACUABrMkFwEtKwEVFAYHIyImPQE0Jg4BBxUzMhYXERQGByEiJicRNDYXITU0PgEWA6EWDiQOFlJ4UgE1Fx4BIBb96RceASAWAXeS0JACEY8PFAEWDo87VAJQPWweF/6+Fh4BIBUBQhYgAWxnkgKWAAAAAAIAAP/5AoMDCwAHAB8ACLUYDAQAAi0rEyE1NCYOARcFERQGByEiJicRNDYXMzU0NjIWBxUzMhazAR1UdlQBAdAgFv3pFx4BIBYRlMyWAhIXHgGlbDtUAlA9of6+Fh4BIBUBQhYgAWxmlJRmbB4AAAACAAD/+AOTAsUAEAAyAAi1IxoOAwItKwERFAYnIzUjFSMiJicRCQEWNwcGByMiJwkBBiMmLwEmNjcBNjIfATU0NjsBMhYdARceAQMSFg7Wj9YPFAEBQQFBAXwiBQcCBwX+fv5+BwYHBSMEAgUBkRIwE4gKCGsICnoFAgEo/vUPFgHW1hQQAQ8BCP74ASQpBQEDAUL+vgQCBSkFEAQBTg8Pcm0ICgoI42YFDgAAAgAA//kBZgMLAB4ALgAItSojFgQCLSslFRQGByEiJic1NDY3MzUjIiYnNTQ2NzMyFhcRMzIWAxUUBgcjIiY9ATQ2OwEyFgFlFBD+4w8UARYOIyMPFAEWDtYPFAEjDxZIFg6PDhYWDo8PFGRHDxQBFg5HDxQB1hYORw8UARYO/r8WAnVrDxQBFg5rDhYWAAAAAgAA//gCOQLDAA8AOgAItTUcCwMCLSslFRQGJyMiJj0BNDYXMzIWExQOAwcOARUUBgcjIiY9ATQ2Nz4BNCYiBwYHBiMiLwEuATc2MzIeAgGJDgiGCQ4OCYYIDrAQGCYaFRceDgmGCAxKKiEcNEYYFCgHCgcHWwgCBFmqLVpILpWGCQ4BDAqGCQ4BDAFFHjQiIBIKDTANChABFAsaLlITDyIwJBAOMgkERgYQCJQiOlYAAAAAAv///2oDoQMNAAgAIQAItRkLBgMCLSsBNC4BBh4BPgEBFAYiLwEGIyIuAj4EHgIXFAcXFgKDlMyWBI7UjAEiLDoUv2R7UJJoQAI8bI6kjHA4A0W/FQGCZ5IClsqYBoz+mh0qFb9FPmqQoo5uOgRCZpZNe2S/FQAAAwAA/9IEHgLqAAgAMABLAAq3QTchCgQAAy0rPQEzMjcWFwYjAzUzMh4CFRQWOwE1NDYfARYVFAYPAgYmJzUHBjUjIi4CNTQmIyU2OwE1NDYfARYVFAYPAgYmJzUjIhUjIgcm5RwYH0NHT+XlQXRWMlI8XBQM6ggEAgLqDRIBBANVQHZUMlQ7ATVEUlwUDOoIBAIC6g0SAQQDVRoZICKtClQ9JgHKrTJUdkA6VDQQDAmQBQkDCAECjwkMDzYBAQEyVHY/O1SIJTYPDAmQBggEBgICkAgMDzUBClUAAAEAAP+sA6wC4AAXAAazBAABLSsBMhYQBiMiJzcWMzI2ECYiBgczByczPgECFKru7qqObkZUYn60tPq0Ao64uHwC8ALg8P6s8FhKPLQBALSufMzMpuoAAAACAAD/sQR3AwsABQAfAAi1GxEDAQItKwUVIREzEQEVFAYvAQEGIi8BBycBNjIfAQEnJjY7ATIWBHf7iUcD6BQKRP6fBg4GguhrAUYGDgaCAQNDCQgN8wcKB0gDWvzuArjyDAoJRP6fBgaC6WwBRgYGggEDQwkWCgADAAD/agRvA1MACwAXAD8ACrc0HRcTCAADLSsBFhcUBisBFAYiJicXMjQHIiY1NCIVFBYBFhQHAQYmLwEmND8BJjU+BDc0NjcmNTQ+ARYXFAceARc3NhYXA2UihSwc+lR2UgGOCQkgMBI6AlgEBvvrBRAELwQGaAscLjAkFAGCagQeLh4BBEVqHeoFEAQBd8dwHSo7VFQ6YRIBMCEJCSk6A30FEAT8dwUCBTUGEARZEhMYMlRehk9UkhAKCxceAiIVCwoKSDTKBQIFAAAEAAD/agRvA1MADAAXACcATwANQApFLiYeEQ0KBgQtKwU0IyImNTQiFRQWNzIJAS4BJyIOAgcUBRQGKwEUBiImJzchJic3FhMXFhQHAQYmLwEmND8BJjU+BDc0NjcmNTQ+ARYXFAceARc3NhYCRAkgMBI6KAn+1QHpF2ZKM1YyGgECpywc+lR2UgFTAaZcIz4itS8EBvvrBRAELwQGaAscLjAkFAGCagQeLh4BBEVqHeoFEGAIMCEJCSk6AQESAagxQAEiODwc1/odKjtUVDpIaZc3xwKZNgUQBPx3BQIFNQYQBFkSExgyVF6GT1SSEAoLFx4CIhULCgpINMoFAgAAAQAA/2oD6ANSAB0ABrMUCgEtKwEWFA8BFwcOAScHIzU3JjY/ARc3NjIeAQ8BFzc2MgPTFRXfU1lb/GjKZcpFGltZVN8VPCgCFt+D3xY6AlUUPBXfVFlbGkXKZcpn/lpZU98VKjoW4ILfFQAABQAA/8MD6AKxAAkAGgA+AEQAVwAPQAxTS0NCNiITDAYABS0rJTcuATc0NwYHFgE0JgciBhUUHgE2NTQ2MzI2NxQVBgIPAQYjIicmNTQ3LgEnJjQ3PgEzMhc3NjMyFh8BFgcWExQGBxMWFxQHBgcOASM3PgE3Jic3HgEXFgE2KzA4ASKAVV4BahALRmQQFhBEMAsQyjvqOxwFCgdECRlQhjILC1b8lzIyHwUKAw4LJAsBCRVYSZ0E+gsWJ1TcfCl3yEVBXSM1YiALaU8jaj1DOkGEkAFnCxABZEUMDgISCjBEEHUEAWn+WmkyCScGCgcqJHhNESoSg5gKNgkGBhQGAQX+/U6AHAEZGl0TEyQtYGpKCoRpZEA/JGQ0EwAC//7/xAM2AvgADgAdAAi1Fg8JAgItKz8BESU3JhI3NjcXBgcOAQEFBxYCBwYHJzY3PgEnB7p0/uxYdAR2ZIwEZEhYBAGiARRYdAR2YJACYkhYBFZyjHT+3BBWegFQeGQQZhBIWPoB+hBWev6weGIUaBBIWPpcdAABAAD/xAOsAvgAFwAGsxIAAS0rATIWFzMHJzMuASIGFBYzMjcXBiMiJhA2AZio7gR6uLiQBLT6tLR+aE5Gbo6o8PAC+Oimzs58rLT+tDxMWPABVPAAAAAABP////kELwLDAA8AHwAqADIADUAKLSslIBwTBgAELSs3IiY1ETQ2MyEyFhcRFAYjAREUFjchMjY1ETQmJyEiBgEzFRQGByEiJjc1BTI0KwEiFDPoJTQ0JQJfJTQBNiT9jwwGAl8ICgoI/aEHCgL/WTQl/IMkNgECRAkJWQkJiDQlAYklNDQl/nclNAHi/ncHDAEKCAGJBwoBDP30NhYeASAVNjYSEgAAAwAA/7EDWgNSAAgAPgBuAAq3ZEstEwYDAy0rNzQuAQYUFj4BATQmJyM0Nic0JicOAgcGDwEOAg8BDgEnIxEzMh4EFxY7ATI1NCc+ATQnNjU0Jic+ATcUBxYVFAcWFRQHFAYrASImJyYrASImNRE0NjsBNjc2Nz4CNzYzMh4BFRQHMzIWjxYcFhYcFgKDLBzENgEiNw4OFBcNHg0LDhgKFgwUChISBxYOHAwcAnZJQ2sCEBQKHQoJEhhHGwUVASFgTkg2aEVBDKEdKiodmRQ5IBwNDBYYFhwvSigbYjpWZA8UAhgaGAIUAVAdKgEgciA3NAEPQkoYDSYRDhAgCRMKDAH+mwIGBggGAildDxAJKigSHCcNJAgBMhUyKRIUKyYMDDgrTloaFxcqHQFlHioNSSoeDkJMFhUkTkEzOFQAAAADAAD/agNZAwsACAA/AHEACrdjSTUZBgMDLSsTNC4BBhQWPgEBNCYjPgEnNCc2NCYnNjU0JisBIg8BBg8CBicjETMyHgUXFhceAhcyNic0JiczMjY1MxQGJyMWFRQOASMiJy4DJyYnJicjIiY1ETQ2OwEyNz4BNzMyFh0BFhUUBxYVFAcWjxYcFhYcFgKDGBIIDAEdChQQAjYxR0l2EA0HKRIKCBISCRYWFhYQFAMeDRcUDg42JAE0AcQcLEdUO2IbJ0wuHBYTFgYOChshORSZHSoqHaEMQUhqOj9OYCEBFQUbAlgPFAIYGhgCFP7OEzQKIg0nHBIoKgkQDy8uKQYFAgwEAgH+mgoUEiAQHgEmDRhKQg82NiByICwbOVYBNzRCTSQVEjYwLg0cK0kNKh4BZR0qFhkYAVpLAys4DQsmKxQSKQAIAAD/jgPEA1IACAARABoAIwAsADUAPgBIABVAEkZBPDgzMComIR0YFQ8LBgIILSslFAYiJjQ2MhYFFAYiLgE2HgEBFA4BLgE2HgEBFAYiJjQ2HgEBFAYiJjQ2MhYBFA4BJj4BHgEBFAYiJjQ2MhYFFAYuATc0NjIWASYqOyoqOiwBFCg+JgQuNjD+dCo8KAIsOC4CnCo7Kio8KP3nNEo0NEo0Ao0qOiwCKD4m/p0+Wj4+Wj4BKEpnSgFIaEpIHSoqOyoqkR0qKjosAigBah4oAiw4LgYi/sgdKio6LAIoAg0lNDRKNDT+xR4oAiw4LgYiAWctPj5aPj6gNEoBSDUzSkoAAAEAAP+0Aw8DCAA2AAazCQIBLSslFAYjIicBJjQ2MhcBFhQGIicBJiIGFhcBFjMyNjc0JwEmIyIGFB8BFhQGIi8BJjU0NjMyFwEWAw9YQUs4/k4/fLBAAVIFIhAG/q4sdFIBKgGxIy4kLgEk/rwOExAWDuUGJA8F5SNALTEiAUU3TUFYNwGyQK98P/6uBRAiBQFTK1R1K/5PIy4kLiMBRA4WIg/kBhAiBeUiMS5AJP68NgAAAA8AAP/5BC8CfAALABcAIwAvADsARwBTAF8AawB3AIMAjwCfAKMAswAjQCCvp6GgnJKMhoB6dG5oYlxWUEpEPjgyLCYgGhQOCAIPLSs3FRQrASI9ATQ7ATI3FRQrASI9ATQ7ATInFRQrASI9ATQ7ATIBFRQjISI9ATQzITIlFRQrASI9ATQ7ATInFRQrASI9ATQ7ATIXFRQrASI9ATQ7ATInFRQrASI9ATQ7ATIXFRQrASI9ATQ7ATIXFRQrASI9ATQ7ATIBFRQrASI9ATQ7ATIXFRQrASI9ATQ7ATIXFRQrASI9ATQ7ATU0OwEyExEhEQERFAYjISImNRE0NjMhMhbWCTUJCTUJSAl9CQl9CUgJNQkJNQkCPAn+HgkJAeIJ/psJNgkJNglICTUJCTUJ1gg2CQk2CEcJNQkJNQnWCTUJCTUJ1wk2CQk2Cf7iCTYJCTYJjwk2CQk2CY8JfQkJPgk2CUf8XwPoKh38Xx0qKh0DoR4oxjUJCTUJhjUJCTUJhjYJCTYJ/tk1CQk1CYY1CQk1CYY2CQk2CZg1CQk1CYY2CQk2CZg1CQk1CZg1CQk1CQEVNgkJNgkJNgkJNgkJxAkJNQmGCf5TAfT+DAH0/gwdKiodAfQeKioAAAAAAwAA//kDWgLEAA8AHwAvAAq3KyQbEwwEAy0rJRUUBgchIiYnNTQ2NyEyFgMVFAYnISImJzU0NhchMhYDFRQGByEiJic1NDYXITIWA1kUEPzvDxQBFg4DEQ8WARQQ/O8PFAEWDgMRDxYBFBD87w8UARYOAxEPFmRHDxQBFg5HDxQBFgEQSA4WARQPSA4WARQBDkcPFAEWDkcPFgEUAAAAAAQAAAAABF8DCwAKACAAOgBSAA1ACks7MyEaCwYABC0rISImJzQ+ARYHFAY3Ii4BIgYPASImJzQ3PgIWFxYVFAY3IicuAQciDgMjIiY1NDc+AR4BFxYVFAY3IicuASQGBwYjIiYnNDc2JAwBFxYVFAYCOwtQAUYsSAFSjAEqSEhGFhYKVAEGLIKCgi0FVI4GBkyCVS9gRjggAglUBknS1tJKBlSOBgdk1v8A1GUHBglUAQZoASABLAEiZwVUUgsSGAIcEAtSlxwcHA4OVAoHBiswAjQpBgcKVJgFOjgBGCIkGFQKBwVKUgJOTAUHClSXBVhYAlxWBVQKBwZocgJuagYHClQAAv/+/7EDNgMLABIAMAAItSEVDwgCLSslBiMiLgE3NDcOAQcUHgI3MjY3DgEjIi4CNzQ+Ajc2FgcOAQcUHgE3Mjc2Fx4BAsAeH2asZgE6cI4BOl6GSFCQpTXUfFegcEgCQG6aVBkTEjAyAVKMUkI9FxEIBHsFZK5la1whvndJhF48AkRtcYhEdJ5XVZxyRgMBLhErdEBTilQBHQoRCBYAAAP//v+xA8QDUgALABAAFgAKtxMREAwKBAMtKwkBDgEHIi4CPgEzEyEUBgcTIREyHgEBrQEwO55XdcZwBHi+eWgBr0I9XP5TdcR0AWH+0D1CAXTE6sR0/lNYnjsBeAGtcsYAAAACAAD/sQR3AwsABQALAAi1CgcDAQItKwUVIREzEQETIRETAQR3+4lHA1qO/GD6AUEHSANa/O4CO/4MAUIBQf6/AAAAAAUAAP+xBHcDCwADAAcADQARABUAD0AMExIPDgsJBQQBAAUtKwERIxEBESMRARUhETMRAREjESURIxEBZY8BZY4CyvuJRwLLjwFljwFe/uIBHgEe/cQCPP19SANa/O4B9P5TAa3W/X0CgwAAAAIAAP+xA3MDCwAXAB4ACLUcGQ4DAi0rJRYGByEiJjcBNSMiJj4BMyEyHgEGKwEVDwEhAzUjFQNUHyY7/X07KCABGSQOFgISEAEeDxQCGA0kmpcBjaNHKjJGAUgxAbrfFhwWFhwW3yXwAQHz8wAAAAAGAAD/wAOhA1IAAwAUABwAJAAsADQAEUAONDAsKCQgHBgQCAIABi0rATcnByUUBwEGIi8BJjQ3ATYyHwEWJRcPAS8BPwEfAQ8BLwE/AQEXDwEvAT8BARcPAS8BPwECmKQ8pAE1Cv0zCh4KbwoKAs4KHgpuCv0PNjYRETc3EdRtbSIhbW0hAik3NxERNjYR/qw2NhERNjYRAg6jPKRoDwr9MgoKbwoeCgLOCgpvClsQETc3ERA3kSIhbW0hIm3+iBEQNzcQETcBLhARNzcREDcAAf/5/3sD+ANYACUABrMfAQEtKyUGJCcmAjc+ATc2FhceAQcGBwYCFxYkNz4BJyYkBzU2BBcWAgcGA1eX/mqUjw6BCBEKHEAZFggOBgppBmd6AThsUC0wQ/7kn7cBR040KVMQCY0OjJUBhJ4KEgYRBxcYPBwMCnb+3mxxHXZe73aWejIBO4qtf/78ahYAAAAAAQAAAAACCAKhABUABrMOBAEtKwEWFA8BJyY0NjIfARE0NjIWFRE3NjIB+Q8P9fUPHiwPeB4qIHgPKgFaDywP9fUPLB4PdwGLFR4eFf51dw8AAAAAAQAAAAAChgJiABQABrMPCgEtKwEyFhQGJyEXFhQGIi8BNzYyFhQPAQJTFR4eFf51dw8eLA/19Q8sHg93AZMgKiABdw8sHg/19Q8eLA92AAAB//8AAAKGAmIAFQAGswYBAS0rATYyHwEHBiImND8BISIuATY3IScmNAFIDyoQ9fUPKx4PeP51Fh4CIhQBi3gPAlMPD/X1Dx4sD3ceLB4Bdg8sAAABAAAAAAIIAqEAFAAGswoAAS0rARcWFAYiLwERFAYuATURBwYiJjQ3AQT1Dx4qD3ggKh54DyweDwKh9Q8sHg94/nUVIAIcFwGLeA8eLA8AAAEAAAABAAB+LVc9Xw889QALA+gAAAAA0dfGTwAAAADR15wf//n/aQS/A1gAAAAIAAIAAAAAAAAAAQAAA1L/agBaBQUAAP/pBL8AAQAAAAAAAAAAAAAAAAAAAHoD6AAAA+gAAAMRAAAELwAAA6AAAAMxAAADoAAAA6AAAAOgAAADoAAAA6AAAAPoAAAFBQAAA1kAAAPoAAAD6AAAA6AAAAOgAAAD6AAAA6AAAAPoAAADEQAAA1kAAAOgAAAD6AAAA+gAAANZAAAELwAAAfQAAAPoAAACOwAAAjsAAAFlAAABZQAAA+gAAALKAAAD6AAAAsoAAAOgAAADWQAAA1kAAAOgAAADWQAAA1kAAANZAAAD6AAAA+gAAAGsAAADoAAAA1kAAAOgAAACOwAAA1kAAAOgAAACggAAAawAAAMRAAACggAAA1kAAAOgAAADoAAAA6AAAAOgAAADWQAABC8AAANZAAADEQAAA1kAAANZAAADWQAAA1kAAAMRAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAABZQAAA6AAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA1kAAAQvAAACggAAA6AAAAKCAAADoAAAAWUAAAI7AAADoAAABB4AAAOsAAAEdgAABHYAAAR2AAAD6AAAA+gAAAM0AAADrAAABC8AAANZAAADWQAAA+gAAAMRAAAELwAAA1kAAAR2AAADWQAAA+gAAAR2AAAEdgAAA6AAAAOgAAAD6AAAAggAAAKGAAAChgAAAggAAAAAAAAA0gESAagBvgHcAfgCCAI2Ap4DBAOqBCAEhgUQBYIF/AZ2BswHOgegB8oIIAjUCTIKDgziDRINTA3ADeAOAA4eDj4Oag6WDsIO7g8mD14PlA/MEDAQghDSETQRahGiEgwSThKgEygTchQaFGgUjhUEFVYVvBYgFogXPBeOGAYZZhoGGoIbUhvWHFIc1B1wHdQeFh6MHyIfhh/WIA4gcCDqITIheCHYIjIibCLKIwQjQiN6I9AkGCRyJK4lHCVIJYQl6iZqJqAnLidqJ5Yn6iiKKSwprioIKvYrRivILBgsSixsLKIs2i1CLYottC3cLgYuLgAAAAEAAAB6AfgADwAAAAAAAgAAABAAcwAAADQLcAAAAAAAAAASAN4AAQAAAAAAAAA1AAAAAQAAAAAAAQAFADUAAQAAAAAAAgAHADoAAQAAAAAAAwAFAEEAAQAAAAAABAAFAEYAAQAAAAAABQALAEsAAQAAAAAABgAFAFYAAQAAAAAACgArAFsAAQAAAAAACwATAIYAAwABBAkAAABqAJkAAwABBAkAAQAKAQMAAwABBAkAAgAOAQ0AAwABBAkAAwAKARsAAwABBAkABAAKASUAAwABBAkABQAWAS8AAwABBAkABgAKAUUAAwABBAkACgBWAU8AAwABBAkACwAmAaVDb3B5cmlnaHQgKEMpIDIwMTUgYnkgb3JpZ2luYWwgYXV0aG9ycyBAIGZvbnRlbGxvLmNvbWlmb250UmVndWxhcmlmb250aWZvbnRWZXJzaW9uIDEuMGlmb250R2VuZXJhdGVkIGJ5IHN2ZzJ0dGYgZnJvbSBGb250ZWxsbyBwcm9qZWN0Lmh0dHA6Ly9mb250ZWxsby5jb20AQwBvAHAAeQByAGkAZwBoAHQAIAAoAEMAKQAgADIAMAAxADUAIABiAHkAIABvAHIAaQBnAGkAbgBhAGwAIABhAHUAdABoAG8AcgBzACAAQAAgAGYAbwBuAHQAZQBsAGwAbwAuAGMAbwBtAGkAZgBvAG4AdABSAGUAZwB1AGwAYQByAGkAZgBvAG4AdABpAGYAbwBuAHQAVgBlAHIAcwBpAG8AbgAgADEALgAwAGkAZgBvAG4AdABHAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAHMAdgBnADIAdAB0AGYAIABmAHIAbwBtACAARgBvAG4AdABlAGwAbABvACAAcAByAG8AagBlAGMAdAAuAGgAdAB0AHAAOgAvAC8AZgBvAG4AdABlAGwAbABvAC4AYwBvAG0AAAAAAgAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB6AAABAgEDAQQBBQEGAQcBCAEJAQoBCwEMAQ0BDgEPARABEQESARMBFAEVARYBFwEYARkBGgEbARwBHQEeAR8BIAEhASIBIwEkASUBJgEnASgBKQEqASsBLAEtAS4BLwEwATEBMgEzATQBNQE2ATcBOAE5AToBOwE8AT0BPgE/AUABQQFCAUMBRAFFAUYBRwFIAUkBSgFLAUwBTQFOAU8BUAFRAVIBUwFUAVUBVgFXAVgBWQFaAVsBXAFdAV4BXwFgAWEBYgFjAWQBZQFmAWcBaAFpAWoBawFsAW0BbgFvAXABcQFyAXMBdAF1AXYBdwF4AXkBeglkYXNoYm9hcmQEdXNlcgV1c2VycwJvawZjYW5jZWwEcGx1cwVtaW51cwxmb2xkZXItZW1wdHkIZG93bmxvYWQGdXBsb2FkA2dpdAVjdWJlcwhkYXRhYmFzZQVnYXVnZQdzaXRlbWFwDHNvcnQtbmFtZS11cA5zb3J0LW5hbWUtZG93bgltZWdhcGhvbmUDYnVnBXRhc2tzBmZpbHRlcgNvZmYEYm9vawVwYXN0ZQhzY2lzc29ycwVnbG9iZQVjbG91ZAVmbGFzaAhiYXJjaGFydAhkb3duLWRpcgZ1cC1kaXIIbGVmdC1kaXIJcmlnaHQtZGlyCWRvd24tb3BlbgpyaWdodC1vcGVuB3VwLW9wZW4JbGVmdC1vcGVuBnVwLWJpZwlyaWdodC1iaWcIbGVmdC1iaWcIZG93bi1iaWcPcmVzaXplLWZ1bGwtYWx0C3Jlc2l6ZS1mdWxsDHJlc2l6ZS1zbWFsbARtb3ZlEXJlc2l6ZS1ob3Jpem9udGFsD3Jlc2l6ZS12ZXJ0aWNhbAd6b29tLWluBWJsb2NrCHpvb20tb3V0CWxpZ2h0YnVsYgVjbG9jawl2b2x1bWUtdXALdm9sdW1lLWRvd24Kdm9sdW1lLW9mZgRtdXRlA21pYwdlbmR0aW1lCXN0YXJ0dGltZQ5jYWxlbmRhci1lbXB0eQhjYWxlbmRhcgZ3cmVuY2gHc2xpZGVycwhzZXJ2aWNlcwdzZXJ2aWNlBXBob25lCGZpbGUtcGRmCWZpbGUtd29yZApmaWxlLWV4Y2VsCGRvYy10ZXh0BXRyYXNoDWNvbW1lbnQtZW1wdHkHY29tbWVudARjaGF0CmNoYXQtZW1wdHkEYmVsbAhiZWxsLWFsdA1hdHRlbnRpb24tYWx0BXByaW50BGVkaXQHZm9yd2FyZAVyZXBseQlyZXBseS1hbGwDZXllA3RhZwR0YWdzDWxvY2stb3Blbi1hbHQJbG9jay1vcGVuBGxvY2sEaG9tZQRpbmZvBGhlbHAGc2VhcmNoCGZsYXBwaW5nBnJld2luZApjaGFydC1saW5lCGJlbGwtb2ZmDmJlbGwtb2ZmLWVtcHR5BHBsdWcHZXllLW9mZgpyZXNjaGVkdWxlAmN3BGhvc3QJdGh1bWJzLXVwC3RodW1icy1kb3duB3NwaW5uZXIGYXR0YWNoCGtleWJvYXJkBG1lbnUEd2lmaQRtb29uCWNoYXJ0LXBpZQpjaGFydC1hcmVhCWNoYXJ0LWJhcgZiZWFrZXIFbWFnaWMFc3BpbjYKZG93bi1zbWFsbApsZWZ0LXNtYWxsC3JpZ2h0LXNtYWxsCHVwLXNtYWxsAAAAAAEAAf//AA8AAAAAAAAAAAAAAACwACwgsABVWEVZICBLuAAOUUuwBlNaWLA0G7AoWWBmIIpVWLACJWG5CAAIAGNjI2IbISGwAFmwAEMjRLIAAQBDYEItsAEssCBgZi2wAiwgZCCwwFCwBCZasigBCkNFY0VSW1ghIyEbilggsFBQWCGwQFkbILA4UFghsDhZWSCxAQpDRWNFYWSwKFBYIbEBCkNFY0UgsDBQWCGwMFkbILDAUFggZiCKimEgsApQWGAbILAgUFghsApgGyCwNlBYIbA2YBtgWVlZG7ABK1lZI7AAUFhlWVktsAMsIEUgsAQlYWQgsAVDUFiwBSNCsAYjQhshIVmwAWAtsAQsIyEjISBksQViQiCwBiNCsQEKQ0VjsQEKQ7AAYEVjsAMqISCwBkMgiiCKsAErsTAFJbAEJlFYYFAbYVJZWCNZISCwQFNYsAErGyGwQFkjsABQWGVZLbAFLLAHQyuyAAIAQ2BCLbAGLLAHI0IjILAAI0JhsAJiZrABY7ABYLAFKi2wBywgIEUgsAtDY7gEAGIgsABQWLBAYFlmsAFjYESwAWAtsAgssgcLAENFQiohsgABAENgQi2wCSywAEMjRLIAAQBDYEItsAosICBFILABKyOwAEOwBCVgIEWKI2EgZCCwIFBYIbAAG7AwUFiwIBuwQFlZI7AAUFhlWbADJSNhRESwAWAtsAssICBFILABKyOwAEOwBCVgIEWKI2EgZLAkUFiwABuwQFkjsABQWGVZsAMlI2FERLABYC2wDCwgsAAjQrILCgNFWCEbIyFZKiEtsA0ssQICRbBkYUQtsA4ssAFgICCwDENKsABQWCCwDCNCWbANQ0qwAFJYILANI0JZLbAPLCCwEGJmsAFjILgEAGOKI2GwDkNgIIpgILAOI0IjLbAQLEtUWLEEZERZJLANZSN4LbARLEtRWEtTWLEEZERZGyFZJLATZSN4LbASLLEAD0NVWLEPD0OwAWFCsA8rWbAAQ7ACJUKxDAIlQrENAiVCsAEWIyCwAyVQWLEBAENgsAQlQoqKIIojYbAOKiEjsAFhIIojYbAOKiEbsQEAQ2CwAiVCsAIlYbAOKiFZsAxDR7ANQ0dgsAJiILAAUFiwQGBZZrABYyCwC0NjuAQAYiCwAFBYsEBgWWawAWNgsQAAEyNEsAFDsAA+sgEBAUNgQi2wEywAsQACRVRYsA8jQiBFsAsjQrAKI7AAYEIgYLABYbUQEAEADgBCQopgsRIGK7ByKxsiWS2wFCyxABMrLbAVLLEBEystsBYssQITKy2wFyyxAxMrLbAYLLEEEystsBkssQUTKy2wGiyxBhMrLbAbLLEHEystsBwssQgTKy2wHSyxCRMrLbAeLACwDSuxAAJFVFiwDyNCIEWwCyNCsAojsABgQiBgsAFhtRAQAQAOAEJCimCxEgYrsHIrGyJZLbAfLLEAHistsCAssQEeKy2wISyxAh4rLbAiLLEDHistsCMssQQeKy2wJCyxBR4rLbAlLLEGHistsCYssQceKy2wJyyxCB4rLbAoLLEJHistsCksIDywAWAtsCosIGCwEGAgQyOwAWBDsAIlYbABYLApKiEtsCsssCorsCoqLbAsLCAgRyAgsAtDY7gEAGIgsABQWLBAYFlmsAFjYCNhOCMgilVYIEcgILALQ2O4BABiILAAUFiwQGBZZrABY2AjYTgbIVktsC0sALEAAkVUWLABFrAsKrABFTAbIlktsC4sALANK7EAAkVUWLABFrAsKrABFTAbIlktsC8sIDWwAWAtsDAsALABRWO4BABiILAAUFiwQGBZZrABY7ABK7ALQ2O4BABiILAAUFiwQGBZZrABY7ABK7AAFrQAAAAAAEQ+IzixLwEVKi2wMSwgPCBHILALQ2O4BABiILAAUFiwQGBZZrABY2CwAENhOC2wMiwuFzwtsDMsIDwgRyCwC0NjuAQAYiCwAFBYsEBgWWawAWNgsABDYbABQ2M4LbA0LLECABYlIC4gR7AAI0KwAiVJiopHI0cjYSBYYhshWbABI0KyMwEBFRQqLbA1LLAAFrAEJbAEJUcjRyNhsAlDK2WKLiMgIDyKOC2wNiywABawBCWwBCUgLkcjRyNhILAEI0KwCUMrILBgUFggsEBRWLMCIAMgG7MCJgMaWUJCIyCwCEMgiiNHI0cjYSNGYLAEQ7ACYiCwAFBYsEBgWWawAWNgILABKyCKimEgsAJDYGQjsANDYWRQWLACQ2EbsANDYFmwAyWwAmIgsABQWLBAYFlmsAFjYSMgILAEJiNGYTgbI7AIQ0awAiWwCENHI0cjYWAgsARDsAJiILAAUFiwQGBZZrABY2AjILABKyOwBENgsAErsAUlYbAFJbACYiCwAFBYsEBgWWawAWOwBCZhILAEJWBkI7ADJWBkUFghGyMhWSMgILAEJiNGYThZLbA3LLAAFiAgILAFJiAuRyNHI2EjPDgtsDgssAAWILAII0IgICBGI0ewASsjYTgtsDkssAAWsAMlsAIlRyNHI2GwAFRYLiA8IyEbsAIlsAIlRyNHI2EgsAUlsAQlRyNHI2GwBiWwBSVJsAIlYbkIAAgAY2MjIFhiGyFZY7gEAGIgsABQWLBAYFlmsAFjYCMuIyAgPIo4IyFZLbA6LLAAFiCwCEMgLkcjRyNhIGCwIGBmsAJiILAAUFiwQGBZZrABYyMgIDyKOC2wOywjIC5GsAIlRlJYIDxZLrErARQrLbA8LCMgLkawAiVGUFggPFkusSsBFCstsD0sIyAuRrACJUZSWCA8WSMgLkawAiVGUFggPFkusSsBFCstsD4ssDUrIyAuRrACJUZSWCA8WS6xKwEUKy2wPyywNiuKICA8sAQjQoo4IyAuRrACJUZSWCA8WS6xKwEUK7AEQy6wKystsEAssAAWsAQlsAQmIC5HI0cjYbAJQysjIDwgLiM4sSsBFCstsEEssQgEJUKwABawBCWwBCUgLkcjRyNhILAEI0KwCUMrILBgUFggsEBRWLMCIAMgG7MCJgMaWUJCIyBHsARDsAJiILAAUFiwQGBZZrABY2AgsAErIIqKYSCwAkNgZCOwA0NhZFBYsAJDYRuwA0NgWbADJbACYiCwAFBYsEBgWWawAWNhsAIlRmE4IyA8IzgbISAgRiNHsAErI2E4IVmxKwEUKy2wQiywNSsusSsBFCstsEMssDYrISMgIDywBCNCIzixKwEUK7AEQy6wKystsEQssAAVIEewACNCsgABARUUEy6wMSotsEUssAAVIEewACNCsgABARUUEy6wMSotsEYssQABFBOwMiotsEcssDQqLbBILLAAFkUjIC4gRoojYTixKwEUKy2wSSywCCNCsEgrLbBKLLIAAEErLbBLLLIAAUErLbBMLLIBAEErLbBNLLIBAUErLbBOLLIAAEIrLbBPLLIAAUIrLbBQLLIBAEIrLbBRLLIBAUIrLbBSLLIAAD4rLbBTLLIAAT4rLbBULLIBAD4rLbBVLLIBAT4rLbBWLLIAAEArLbBXLLIAAUArLbBYLLIBAEArLbBZLLIBAUArLbBaLLIAAEMrLbBbLLIAAUMrLbBcLLIBAEMrLbBdLLIBAUMrLbBeLLIAAD8rLbBfLLIAAT8rLbBgLLIBAD8rLbBhLLIBAT8rLbBiLLA3Ky6xKwEUKy2wYyywNyuwOystsGQssDcrsDwrLbBlLLAAFrA3K7A9Ky2wZiywOCsusSsBFCstsGcssDgrsDsrLbBoLLA4K7A8Ky2waSywOCuwPSstsGossDkrLrErARQrLbBrLLA5K7A7Ky2wbCywOSuwPCstsG0ssDkrsD0rLbBuLLA6Ky6xKwEUKy2wbyywOiuwOystsHAssDorsDwrLbBxLLA6K7A9Ky2wciyzCQQCA0VYIRsjIVlCK7AIZbADJFB4sAEVMC0AS7gAyFJYsQEBjlmwAbkIAAgAY3CxAAVCsQAAKrEABUKxAAgqsQAFQrEACCqxAAVCuQAAAAkqsQAFQrkAAAAJKrEDAESxJAGIUViwQIhYsQNkRLEmAYhRWLoIgAABBECIY1RYsQMARFlZWVmxAAwquAH/hbAEjbECAEQA') format('truetype');
 }
 /* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
 /* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
@@ -17,7 +17,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'ifont';
-    src: url('../font/ifont.svg?57837527#ifont') format('svg');
+    src: url('../font/ifont.svg?12843713#ifont') format('svg');
   }
 }
 */
@@ -168,4 +168,8 @@
 .icon-chart-bar:before { content: '\e871'; } /* '' */
 .icon-beaker:before { content: '\e872'; } /* '' */
 .icon-magic:before { content: '\e873'; } /* '' */
-.icon-spin6:before { content: '\e874'; } /* '' */
\ No newline at end of file
+.icon-spin6:before { content: '\e874'; } /* '' */
+.icon-down-small:before { content: '\e875'; } /* '' */
+.icon-left-small:before { content: '\e876'; } /* '' */
+.icon-right-small:before { content: '\e877'; } /* '' */
+.icon-up-small:before { content: '\e878'; } /* '' */
\ No newline at end of file
diff --git a/application/fonts/fontello-ifont/css/ifont-ie7-codes.css b/application/fonts/fontello-ifont/css/ifont-ie7-codes.css
index 1f3c43354..4f30af4af 100644
--- a/application/fonts/fontello-ifont/css/ifont-ie7-codes.css
+++ b/application/fonts/fontello-ifont/css/ifont-ie7-codes.css
@@ -115,4 +115,8 @@
 .icon-chart-bar { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe871;&nbsp;'); }
 .icon-beaker { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe872;&nbsp;'); }
 .icon-magic { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe873;&nbsp;'); }
-.icon-spin6 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe874;&nbsp;'); }
\ No newline at end of file
+.icon-spin6 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe874;&nbsp;'); }
+.icon-down-small { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe875;&nbsp;'); }
+.icon-left-small { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe876;&nbsp;'); }
+.icon-right-small { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe877;&nbsp;'); }
+.icon-up-small { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe878;&nbsp;'); }
\ No newline at end of file
diff --git a/application/fonts/fontello-ifont/css/ifont-ie7.css b/application/fonts/fontello-ifont/css/ifont-ie7.css
index 18b372d2b..c0047b50a 100644
--- a/application/fonts/fontello-ifont/css/ifont-ie7.css
+++ b/application/fonts/fontello-ifont/css/ifont-ie7.css
@@ -126,4 +126,8 @@
 .icon-chart-bar { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe871;&nbsp;'); }
 .icon-beaker { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe872;&nbsp;'); }
 .icon-magic { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe873;&nbsp;'); }
-.icon-spin6 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe874;&nbsp;'); }
\ No newline at end of file
+.icon-spin6 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe874;&nbsp;'); }
+.icon-down-small { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe875;&nbsp;'); }
+.icon-left-small { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe876;&nbsp;'); }
+.icon-right-small { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe877;&nbsp;'); }
+.icon-up-small { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe878;&nbsp;'); }
\ No newline at end of file
diff --git a/application/fonts/fontello-ifont/css/ifont.css b/application/fonts/fontello-ifont/css/ifont.css
index 80f91f8b2..971bf44b3 100644
--- a/application/fonts/fontello-ifont/css/ifont.css
+++ b/application/fonts/fontello-ifont/css/ifont.css
@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'ifont';
-  src: url('../font/ifont.eot?6491776');
-  src: url('../font/ifont.eot?6491776#iefix') format('embedded-opentype'),
-       url('../font/ifont.woff?6491776') format('woff'),
-       url('../font/ifont.ttf?6491776') format('truetype'),
-       url('../font/ifont.svg?6491776#ifont') format('svg');
+  src: url('../font/ifont.eot?54745533');
+  src: url('../font/ifont.eot?54745533#iefix') format('embedded-opentype'),
+       url('../font/ifont.woff?54745533') format('woff'),
+       url('../font/ifont.ttf?54745533') format('truetype'),
+       url('../font/ifont.svg?54745533#ifont') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -14,7 +14,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'ifont';
-    src: url('../font/ifont.svg?6491776#ifont') format('svg');
+    src: url('../font/ifont.svg?54745533#ifont') format('svg');
   }
 }
 */
@@ -35,7 +35,7 @@
   /* For safety - reset parent styles, that can break glyph codes*/
   font-variant: normal;
   text-transform: none;
-     
+ 
   /* fix buttons height, for twitter bootstrap */
   line-height: 1em;
  
@@ -46,6 +46,10 @@
   /* you can be more comfortable with increased icons size */
   /* font-size: 120%; */
  
+  /* Font smoothing. That was taken from TWBS */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+ 
   /* Uncomment for 3D effect */
   /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
 }
@@ -166,4 +170,8 @@
 .icon-chart-bar:before { content: '\e871'; } /* '' */
 .icon-beaker:before { content: '\e872'; } /* '' */
 .icon-magic:before { content: '\e873'; } /* '' */
-.icon-spin6:before { content: '\e874'; } /* '' */
\ No newline at end of file
+.icon-spin6:before { content: '\e874'; } /* '' */
+.icon-down-small:before { content: '\e875'; } /* '' */
+.icon-left-small:before { content: '\e876'; } /* '' */
+.icon-right-small:before { content: '\e877'; } /* '' */
+.icon-up-small:before { content: '\e878'; } /* '' */
\ No newline at end of file
diff --git a/application/fonts/fontello-ifont/demo.html b/application/fonts/fontello-ifont/demo.html
index dff2d3250..5cfd8dbf8 100644
--- a/application/fonts/fontello-ifont/demo.html
+++ b/application/fonts/fontello-ifont/demo.html
@@ -227,8 +227,54 @@ body {
 .i-code {
   display: none;
 }
-</style>
-    <link rel="stylesheet" href="css/ifont.css">
+@font-face {
+      font-family: 'ifont';
+      src: url('./font/ifont.eot?11424534');
+      src: url('./font/ifont.eot?11424534#iefix') format('embedded-opentype'),
+           url('./font/ifont.woff?11424534') format('woff'),
+           url('./font/ifont.ttf?11424534') format('truetype'),
+           url('./font/ifont.svg?11424534#ifont') format('svg');
+      font-weight: normal;
+      font-style: normal;
+    }
+     
+     
+    .demo-icon
+    {
+      font-family: "ifont";
+      font-style: normal;
+      font-weight: normal;
+      speak: none;
+     
+      display: inline-block;
+      text-decoration: inherit;
+      width: 1em;
+      margin-right: .2em;
+      text-align: center;
+      /* opacity: .8; */
+     
+      /* For safety - reset parent styles, that can break glyph codes*/
+      font-variant: normal;
+      text-transform: none;
+     
+      /* fix buttons height, for twitter bootstrap */
+      line-height: 1em;
+     
+      /* Animation center compensation - margins should be symmetric */
+      /* remove if not needed */
+      margin-left: .2em;
+     
+      /* You can be more comfortable with increased icons size */
+      /* font-size: 120%; */
+     
+      /* Font smoothing. That was taken from TWBS */
+      -webkit-font-smoothing: antialiased;
+      -moz-osx-font-smoothing: grayscale;
+     
+      /* Uncomment for 3D effect */
+      /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
+    }
+     </style>
     <link rel="stylesheet" href="css/animation.css"><!--[if IE 7]><link rel="stylesheet" href="css/ifont-ie7.css"><![endif]-->
     <script>
       function toggleCodes(on) {
@@ -255,181 +301,187 @@ body {
     </div>
     <div id="icons" class="container">
       <div class="row">
-        <div title="Code: 0xe800" class="the-icons span3"><i class="icon-dashboard"></i> <span class="i-name">icon-dashboard</span><span class="i-code">0xe800</span></div>
-        <div title="Code: 0xe801" class="the-icons span3"><i class="icon-user"></i> <span class="i-name">icon-user</span><span class="i-code">0xe801</span></div>
-        <div title="Code: 0xe802" class="the-icons span3"><i class="icon-users"></i> <span class="i-name">icon-users</span><span class="i-code">0xe802</span></div>
-        <div title="Code: 0xe803" class="the-icons span3"><i class="icon-ok"></i> <span class="i-name">icon-ok</span><span class="i-code">0xe803</span></div>
+        <div title="Code: 0xe800" class="the-icons span3"><i class="demo-icon icon-dashboard">&#xe800;</i> <span class="i-name">icon-dashboard</span><span class="i-code">0xe800</span></div>
+        <div title="Code: 0xe801" class="the-icons span3"><i class="demo-icon icon-user">&#xe801;</i> <span class="i-name">icon-user</span><span class="i-code">0xe801</span></div>
+        <div title="Code: 0xe802" class="the-icons span3"><i class="demo-icon icon-users">&#xe802;</i> <span class="i-name">icon-users</span><span class="i-code">0xe802</span></div>
+        <div title="Code: 0xe803" class="the-icons span3"><i class="demo-icon icon-ok">&#xe803;</i> <span class="i-name">icon-ok</span><span class="i-code">0xe803</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe804" class="the-icons span3"><i class="icon-cancel"></i> <span class="i-name">icon-cancel</span><span class="i-code">0xe804</span></div>
-        <div title="Code: 0xe805" class="the-icons span3"><i class="icon-plus"></i> <span class="i-name">icon-plus</span><span class="i-code">0xe805</span></div>
-        <div title="Code: 0xe806" class="the-icons span3"><i class="icon-minus"></i> <span class="i-name">icon-minus</span><span class="i-code">0xe806</span></div>
-        <div title="Code: 0xe807" class="the-icons span3"><i class="icon-folder-empty"></i> <span class="i-name">icon-folder-empty</span><span class="i-code">0xe807</span></div>
+        <div title="Code: 0xe804" class="the-icons span3"><i class="demo-icon icon-cancel">&#xe804;</i> <span class="i-name">icon-cancel</span><span class="i-code">0xe804</span></div>
+        <div title="Code: 0xe805" class="the-icons span3"><i class="demo-icon icon-plus">&#xe805;</i> <span class="i-name">icon-plus</span><span class="i-code">0xe805</span></div>
+        <div title="Code: 0xe806" class="the-icons span3"><i class="demo-icon icon-minus">&#xe806;</i> <span class="i-name">icon-minus</span><span class="i-code">0xe806</span></div>
+        <div title="Code: 0xe807" class="the-icons span3"><i class="demo-icon icon-folder-empty">&#xe807;</i> <span class="i-name">icon-folder-empty</span><span class="i-code">0xe807</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe808" class="the-icons span3"><i class="icon-download"></i> <span class="i-name">icon-download</span><span class="i-code">0xe808</span></div>
-        <div title="Code: 0xe809" class="the-icons span3"><i class="icon-upload"></i> <span class="i-name">icon-upload</span><span class="i-code">0xe809</span></div>
-        <div title="Code: 0xe80a" class="the-icons span3"><i class="icon-git"></i> <span class="i-name">icon-git</span><span class="i-code">0xe80a</span></div>
-        <div title="Code: 0xe80b" class="the-icons span3"><i class="icon-cubes"></i> <span class="i-name">icon-cubes</span><span class="i-code">0xe80b</span></div>
+        <div title="Code: 0xe808" class="the-icons span3"><i class="demo-icon icon-download">&#xe808;</i> <span class="i-name">icon-download</span><span class="i-code">0xe808</span></div>
+        <div title="Code: 0xe809" class="the-icons span3"><i class="demo-icon icon-upload">&#xe809;</i> <span class="i-name">icon-upload</span><span class="i-code">0xe809</span></div>
+        <div title="Code: 0xe80a" class="the-icons span3"><i class="demo-icon icon-git">&#xe80a;</i> <span class="i-name">icon-git</span><span class="i-code">0xe80a</span></div>
+        <div title="Code: 0xe80b" class="the-icons span3"><i class="demo-icon icon-cubes">&#xe80b;</i> <span class="i-name">icon-cubes</span><span class="i-code">0xe80b</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe80c" class="the-icons span3"><i class="icon-database"></i> <span class="i-name">icon-database</span><span class="i-code">0xe80c</span></div>
-        <div title="Code: 0xe80d" class="the-icons span3"><i class="icon-gauge"></i> <span class="i-name">icon-gauge</span><span class="i-code">0xe80d</span></div>
-        <div title="Code: 0xe80e" class="the-icons span3"><i class="icon-sitemap"></i> <span class="i-name">icon-sitemap</span><span class="i-code">0xe80e</span></div>
-        <div title="Code: 0xe80f" class="the-icons span3"><i class="icon-sort-name-up"></i> <span class="i-name">icon-sort-name-up</span><span class="i-code">0xe80f</span></div>
+        <div title="Code: 0xe80c" class="the-icons span3"><i class="demo-icon icon-database">&#xe80c;</i> <span class="i-name">icon-database</span><span class="i-code">0xe80c</span></div>
+        <div title="Code: 0xe80d" class="the-icons span3"><i class="demo-icon icon-gauge">&#xe80d;</i> <span class="i-name">icon-gauge</span><span class="i-code">0xe80d</span></div>
+        <div title="Code: 0xe80e" class="the-icons span3"><i class="demo-icon icon-sitemap">&#xe80e;</i> <span class="i-name">icon-sitemap</span><span class="i-code">0xe80e</span></div>
+        <div title="Code: 0xe80f" class="the-icons span3"><i class="demo-icon icon-sort-name-up">&#xe80f;</i> <span class="i-name">icon-sort-name-up</span><span class="i-code">0xe80f</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe810" class="the-icons span3"><i class="icon-sort-name-down"></i> <span class="i-name">icon-sort-name-down</span><span class="i-code">0xe810</span></div>
-        <div title="Code: 0xe811" class="the-icons span3"><i class="icon-megaphone"></i> <span class="i-name">icon-megaphone</span><span class="i-code">0xe811</span></div>
-        <div title="Code: 0xe812" class="the-icons span3"><i class="icon-bug"></i> <span class="i-name">icon-bug</span><span class="i-code">0xe812</span></div>
-        <div title="Code: 0xe813" class="the-icons span3"><i class="icon-tasks"></i> <span class="i-name">icon-tasks</span><span class="i-code">0xe813</span></div>
+        <div title="Code: 0xe810" class="the-icons span3"><i class="demo-icon icon-sort-name-down">&#xe810;</i> <span class="i-name">icon-sort-name-down</span><span class="i-code">0xe810</span></div>
+        <div title="Code: 0xe811" class="the-icons span3"><i class="demo-icon icon-megaphone">&#xe811;</i> <span class="i-name">icon-megaphone</span><span class="i-code">0xe811</span></div>
+        <div title="Code: 0xe812" class="the-icons span3"><i class="demo-icon icon-bug">&#xe812;</i> <span class="i-name">icon-bug</span><span class="i-code">0xe812</span></div>
+        <div title="Code: 0xe813" class="the-icons span3"><i class="demo-icon icon-tasks">&#xe813;</i> <span class="i-name">icon-tasks</span><span class="i-code">0xe813</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe814" class="the-icons span3"><i class="icon-filter"></i> <span class="i-name">icon-filter</span><span class="i-code">0xe814</span></div>
-        <div title="Code: 0xe815" class="the-icons span3"><i class="icon-off"></i> <span class="i-name">icon-off</span><span class="i-code">0xe815</span></div>
-        <div title="Code: 0xe816" class="the-icons span3"><i class="icon-book"></i> <span class="i-name">icon-book</span><span class="i-code">0xe816</span></div>
-        <div title="Code: 0xe817" class="the-icons span3"><i class="icon-paste"></i> <span class="i-name">icon-paste</span><span class="i-code">0xe817</span></div>
+        <div title="Code: 0xe814" class="the-icons span3"><i class="demo-icon icon-filter">&#xe814;</i> <span class="i-name">icon-filter</span><span class="i-code">0xe814</span></div>
+        <div title="Code: 0xe815" class="the-icons span3"><i class="demo-icon icon-off">&#xe815;</i> <span class="i-name">icon-off</span><span class="i-code">0xe815</span></div>
+        <div title="Code: 0xe816" class="the-icons span3"><i class="demo-icon icon-book">&#xe816;</i> <span class="i-name">icon-book</span><span class="i-code">0xe816</span></div>
+        <div title="Code: 0xe817" class="the-icons span3"><i class="demo-icon icon-paste">&#xe817;</i> <span class="i-name">icon-paste</span><span class="i-code">0xe817</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe818" class="the-icons span3"><i class="icon-scissors"></i> <span class="i-name">icon-scissors</span><span class="i-code">0xe818</span></div>
-        <div title="Code: 0xe819" class="the-icons span3"><i class="icon-globe"></i> <span class="i-name">icon-globe</span><span class="i-code">0xe819</span></div>
-        <div title="Code: 0xe81a" class="the-icons span3"><i class="icon-cloud"></i> <span class="i-name">icon-cloud</span><span class="i-code">0xe81a</span></div>
-        <div title="Code: 0xe81b" class="the-icons span3"><i class="icon-flash"></i> <span class="i-name">icon-flash</span><span class="i-code">0xe81b</span></div>
+        <div title="Code: 0xe818" class="the-icons span3"><i class="demo-icon icon-scissors">&#xe818;</i> <span class="i-name">icon-scissors</span><span class="i-code">0xe818</span></div>
+        <div title="Code: 0xe819" class="the-icons span3"><i class="demo-icon icon-globe">&#xe819;</i> <span class="i-name">icon-globe</span><span class="i-code">0xe819</span></div>
+        <div title="Code: 0xe81a" class="the-icons span3"><i class="demo-icon icon-cloud">&#xe81a;</i> <span class="i-name">icon-cloud</span><span class="i-code">0xe81a</span></div>
+        <div title="Code: 0xe81b" class="the-icons span3"><i class="demo-icon icon-flash">&#xe81b;</i> <span class="i-name">icon-flash</span><span class="i-code">0xe81b</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe81c" class="the-icons span3"><i class="icon-barchart"></i> <span class="i-name">icon-barchart</span><span class="i-code">0xe81c</span></div>
-        <div title="Code: 0xe81d" class="the-icons span3"><i class="icon-down-dir"></i> <span class="i-name">icon-down-dir</span><span class="i-code">0xe81d</span></div>
-        <div title="Code: 0xe81e" class="the-icons span3"><i class="icon-up-dir"></i> <span class="i-name">icon-up-dir</span><span class="i-code">0xe81e</span></div>
-        <div title="Code: 0xe81f" class="the-icons span3"><i class="icon-left-dir"></i> <span class="i-name">icon-left-dir</span><span class="i-code">0xe81f</span></div>
+        <div title="Code: 0xe81c" class="the-icons span3"><i class="demo-icon icon-barchart">&#xe81c;</i> <span class="i-name">icon-barchart</span><span class="i-code">0xe81c</span></div>
+        <div title="Code: 0xe81d" class="the-icons span3"><i class="demo-icon icon-down-dir">&#xe81d;</i> <span class="i-name">icon-down-dir</span><span class="i-code">0xe81d</span></div>
+        <div title="Code: 0xe81e" class="the-icons span3"><i class="demo-icon icon-up-dir">&#xe81e;</i> <span class="i-name">icon-up-dir</span><span class="i-code">0xe81e</span></div>
+        <div title="Code: 0xe81f" class="the-icons span3"><i class="demo-icon icon-left-dir">&#xe81f;</i> <span class="i-name">icon-left-dir</span><span class="i-code">0xe81f</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe820" class="the-icons span3"><i class="icon-right-dir"></i> <span class="i-name">icon-right-dir</span><span class="i-code">0xe820</span></div>
-        <div title="Code: 0xe821" class="the-icons span3"><i class="icon-down-open"></i> <span class="i-name">icon-down-open</span><span class="i-code">0xe821</span></div>
-        <div title="Code: 0xe822" class="the-icons span3"><i class="icon-right-open"></i> <span class="i-name">icon-right-open</span><span class="i-code">0xe822</span></div>
-        <div title="Code: 0xe823" class="the-icons span3"><i class="icon-up-open"></i> <span class="i-name">icon-up-open</span><span class="i-code">0xe823</span></div>
+        <div title="Code: 0xe820" class="the-icons span3"><i class="demo-icon icon-right-dir">&#xe820;</i> <span class="i-name">icon-right-dir</span><span class="i-code">0xe820</span></div>
+        <div title="Code: 0xe821" class="the-icons span3"><i class="demo-icon icon-down-open">&#xe821;</i> <span class="i-name">icon-down-open</span><span class="i-code">0xe821</span></div>
+        <div title="Code: 0xe822" class="the-icons span3"><i class="demo-icon icon-right-open">&#xe822;</i> <span class="i-name">icon-right-open</span><span class="i-code">0xe822</span></div>
+        <div title="Code: 0xe823" class="the-icons span3"><i class="demo-icon icon-up-open">&#xe823;</i> <span class="i-name">icon-up-open</span><span class="i-code">0xe823</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe824" class="the-icons span3"><i class="icon-left-open"></i> <span class="i-name">icon-left-open</span><span class="i-code">0xe824</span></div>
-        <div title="Code: 0xe825" class="the-icons span3"><i class="icon-up-big"></i> <span class="i-name">icon-up-big</span><span class="i-code">0xe825</span></div>
-        <div title="Code: 0xe826" class="the-icons span3"><i class="icon-right-big"></i> <span class="i-name">icon-right-big</span><span class="i-code">0xe826</span></div>
-        <div title="Code: 0xe827" class="the-icons span3"><i class="icon-left-big"></i> <span class="i-name">icon-left-big</span><span class="i-code">0xe827</span></div>
+        <div title="Code: 0xe824" class="the-icons span3"><i class="demo-icon icon-left-open">&#xe824;</i> <span class="i-name">icon-left-open</span><span class="i-code">0xe824</span></div>
+        <div title="Code: 0xe825" class="the-icons span3"><i class="demo-icon icon-up-big">&#xe825;</i> <span class="i-name">icon-up-big</span><span class="i-code">0xe825</span></div>
+        <div title="Code: 0xe826" class="the-icons span3"><i class="demo-icon icon-right-big">&#xe826;</i> <span class="i-name">icon-right-big</span><span class="i-code">0xe826</span></div>
+        <div title="Code: 0xe827" class="the-icons span3"><i class="demo-icon icon-left-big">&#xe827;</i> <span class="i-name">icon-left-big</span><span class="i-code">0xe827</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe828" class="the-icons span3"><i class="icon-down-big"></i> <span class="i-name">icon-down-big</span><span class="i-code">0xe828</span></div>
-        <div title="Code: 0xe829" class="the-icons span3"><i class="icon-resize-full-alt"></i> <span class="i-name">icon-resize-full-alt</span><span class="i-code">0xe829</span></div>
-        <div title="Code: 0xe82a" class="the-icons span3"><i class="icon-resize-full"></i> <span class="i-name">icon-resize-full</span><span class="i-code">0xe82a</span></div>
-        <div title="Code: 0xe82b" class="the-icons span3"><i class="icon-resize-small"></i> <span class="i-name">icon-resize-small</span><span class="i-code">0xe82b</span></div>
+        <div title="Code: 0xe828" class="the-icons span3"><i class="demo-icon icon-down-big">&#xe828;</i> <span class="i-name">icon-down-big</span><span class="i-code">0xe828</span></div>
+        <div title="Code: 0xe829" class="the-icons span3"><i class="demo-icon icon-resize-full-alt">&#xe829;</i> <span class="i-name">icon-resize-full-alt</span><span class="i-code">0xe829</span></div>
+        <div title="Code: 0xe82a" class="the-icons span3"><i class="demo-icon icon-resize-full">&#xe82a;</i> <span class="i-name">icon-resize-full</span><span class="i-code">0xe82a</span></div>
+        <div title="Code: 0xe82b" class="the-icons span3"><i class="demo-icon icon-resize-small">&#xe82b;</i> <span class="i-name">icon-resize-small</span><span class="i-code">0xe82b</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe82c" class="the-icons span3"><i class="icon-move"></i> <span class="i-name">icon-move</span><span class="i-code">0xe82c</span></div>
-        <div title="Code: 0xe82d" class="the-icons span3"><i class="icon-resize-horizontal"></i> <span class="i-name">icon-resize-horizontal</span><span class="i-code">0xe82d</span></div>
-        <div title="Code: 0xe82e" class="the-icons span3"><i class="icon-resize-vertical"></i> <span class="i-name">icon-resize-vertical</span><span class="i-code">0xe82e</span></div>
-        <div title="Code: 0xe82f" class="the-icons span3"><i class="icon-zoom-in"></i> <span class="i-name">icon-zoom-in</span><span class="i-code">0xe82f</span></div>
+        <div title="Code: 0xe82c" class="the-icons span3"><i class="demo-icon icon-move">&#xe82c;</i> <span class="i-name">icon-move</span><span class="i-code">0xe82c</span></div>
+        <div title="Code: 0xe82d" class="the-icons span3"><i class="demo-icon icon-resize-horizontal">&#xe82d;</i> <span class="i-name">icon-resize-horizontal</span><span class="i-code">0xe82d</span></div>
+        <div title="Code: 0xe82e" class="the-icons span3"><i class="demo-icon icon-resize-vertical">&#xe82e;</i> <span class="i-name">icon-resize-vertical</span><span class="i-code">0xe82e</span></div>
+        <div title="Code: 0xe82f" class="the-icons span3"><i class="demo-icon icon-zoom-in">&#xe82f;</i> <span class="i-name">icon-zoom-in</span><span class="i-code">0xe82f</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe830" class="the-icons span3"><i class="icon-block"></i> <span class="i-name">icon-block</span><span class="i-code">0xe830</span></div>
-        <div title="Code: 0xe831" class="the-icons span3"><i class="icon-zoom-out"></i> <span class="i-name">icon-zoom-out</span><span class="i-code">0xe831</span></div>
-        <div title="Code: 0xe832" class="the-icons span3"><i class="icon-lightbulb"></i> <span class="i-name">icon-lightbulb</span><span class="i-code">0xe832</span></div>
-        <div title="Code: 0xe833" class="the-icons span3"><i class="icon-clock"></i> <span class="i-name">icon-clock</span><span class="i-code">0xe833</span></div>
+        <div title="Code: 0xe830" class="the-icons span3"><i class="demo-icon icon-block">&#xe830;</i> <span class="i-name">icon-block</span><span class="i-code">0xe830</span></div>
+        <div title="Code: 0xe831" class="the-icons span3"><i class="demo-icon icon-zoom-out">&#xe831;</i> <span class="i-name">icon-zoom-out</span><span class="i-code">0xe831</span></div>
+        <div title="Code: 0xe832" class="the-icons span3"><i class="demo-icon icon-lightbulb">&#xe832;</i> <span class="i-name">icon-lightbulb</span><span class="i-code">0xe832</span></div>
+        <div title="Code: 0xe833" class="the-icons span3"><i class="demo-icon icon-clock">&#xe833;</i> <span class="i-name">icon-clock</span><span class="i-code">0xe833</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe834" class="the-icons span3"><i class="icon-volume-up"></i> <span class="i-name">icon-volume-up</span><span class="i-code">0xe834</span></div>
-        <div title="Code: 0xe835" class="the-icons span3"><i class="icon-volume-down"></i> <span class="i-name">icon-volume-down</span><span class="i-code">0xe835</span></div>
-        <div title="Code: 0xe836" class="the-icons span3"><i class="icon-volume-off"></i> <span class="i-name">icon-volume-off</span><span class="i-code">0xe836</span></div>
-        <div title="Code: 0xe837" class="the-icons span3"><i class="icon-mute"></i> <span class="i-name">icon-mute</span><span class="i-code">0xe837</span></div>
+        <div title="Code: 0xe834" class="the-icons span3"><i class="demo-icon icon-volume-up">&#xe834;</i> <span class="i-name">icon-volume-up</span><span class="i-code">0xe834</span></div>
+        <div title="Code: 0xe835" class="the-icons span3"><i class="demo-icon icon-volume-down">&#xe835;</i> <span class="i-name">icon-volume-down</span><span class="i-code">0xe835</span></div>
+        <div title="Code: 0xe836" class="the-icons span3"><i class="demo-icon icon-volume-off">&#xe836;</i> <span class="i-name">icon-volume-off</span><span class="i-code">0xe836</span></div>
+        <div title="Code: 0xe837" class="the-icons span3"><i class="demo-icon icon-mute">&#xe837;</i> <span class="i-name">icon-mute</span><span class="i-code">0xe837</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe838" class="the-icons span3"><i class="icon-mic"></i> <span class="i-name">icon-mic</span><span class="i-code">0xe838</span></div>
-        <div title="Code: 0xe839" class="the-icons span3"><i class="icon-endtime"></i> <span class="i-name">icon-endtime</span><span class="i-code">0xe839</span></div>
-        <div title="Code: 0xe83a" class="the-icons span3"><i class="icon-starttime"></i> <span class="i-name">icon-starttime</span><span class="i-code">0xe83a</span></div>
-        <div title="Code: 0xe83b" class="the-icons span3"><i class="icon-calendar-empty"></i> <span class="i-name">icon-calendar-empty</span><span class="i-code">0xe83b</span></div>
+        <div title="Code: 0xe838" class="the-icons span3"><i class="demo-icon icon-mic">&#xe838;</i> <span class="i-name">icon-mic</span><span class="i-code">0xe838</span></div>
+        <div title="Code: 0xe839" class="the-icons span3"><i class="demo-icon icon-endtime">&#xe839;</i> <span class="i-name">icon-endtime</span><span class="i-code">0xe839</span></div>
+        <div title="Code: 0xe83a" class="the-icons span3"><i class="demo-icon icon-starttime">&#xe83a;</i> <span class="i-name">icon-starttime</span><span class="i-code">0xe83a</span></div>
+        <div title="Code: 0xe83b" class="the-icons span3"><i class="demo-icon icon-calendar-empty">&#xe83b;</i> <span class="i-name">icon-calendar-empty</span><span class="i-code">0xe83b</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe83c" class="the-icons span3"><i class="icon-calendar"></i> <span class="i-name">icon-calendar</span><span class="i-code">0xe83c</span></div>
-        <div title="Code: 0xe83d" class="the-icons span3"><i class="icon-wrench"></i> <span class="i-name">icon-wrench</span><span class="i-code">0xe83d</span></div>
-        <div title="Code: 0xe83e" class="the-icons span3"><i class="icon-sliders"></i> <span class="i-name">icon-sliders</span><span class="i-code">0xe83e</span></div>
-        <div title="Code: 0xe83f" class="the-icons span3"><i class="icon-services"></i> <span class="i-name">icon-services</span><span class="i-code">0xe83f</span></div>
+        <div title="Code: 0xe83c" class="the-icons span3"><i class="demo-icon icon-calendar">&#xe83c;</i> <span class="i-name">icon-calendar</span><span class="i-code">0xe83c</span></div>
+        <div title="Code: 0xe83d" class="the-icons span3"><i class="demo-icon icon-wrench">&#xe83d;</i> <span class="i-name">icon-wrench</span><span class="i-code">0xe83d</span></div>
+        <div title="Code: 0xe83e" class="the-icons span3"><i class="demo-icon icon-sliders">&#xe83e;</i> <span class="i-name">icon-sliders</span><span class="i-code">0xe83e</span></div>
+        <div title="Code: 0xe83f" class="the-icons span3"><i class="demo-icon icon-services">&#xe83f;</i> <span class="i-name">icon-services</span><span class="i-code">0xe83f</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe840" class="the-icons span3"><i class="icon-service"></i> <span class="i-name">icon-service</span><span class="i-code">0xe840</span></div>
-        <div title="Code: 0xe841" class="the-icons span3"><i class="icon-phone"></i> <span class="i-name">icon-phone</span><span class="i-code">0xe841</span></div>
-        <div title="Code: 0xe842" class="the-icons span3"><i class="icon-file-pdf"></i> <span class="i-name">icon-file-pdf</span><span class="i-code">0xe842</span></div>
-        <div title="Code: 0xe843" class="the-icons span3"><i class="icon-file-word"></i> <span class="i-name">icon-file-word</span><span class="i-code">0xe843</span></div>
+        <div title="Code: 0xe840" class="the-icons span3"><i class="demo-icon icon-service">&#xe840;</i> <span class="i-name">icon-service</span><span class="i-code">0xe840</span></div>
+        <div title="Code: 0xe841" class="the-icons span3"><i class="demo-icon icon-phone">&#xe841;</i> <span class="i-name">icon-phone</span><span class="i-code">0xe841</span></div>
+        <div title="Code: 0xe842" class="the-icons span3"><i class="demo-icon icon-file-pdf">&#xe842;</i> <span class="i-name">icon-file-pdf</span><span class="i-code">0xe842</span></div>
+        <div title="Code: 0xe843" class="the-icons span3"><i class="demo-icon icon-file-word">&#xe843;</i> <span class="i-name">icon-file-word</span><span class="i-code">0xe843</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe844" class="the-icons span3"><i class="icon-file-excel"></i> <span class="i-name">icon-file-excel</span><span class="i-code">0xe844</span></div>
-        <div title="Code: 0xe845" class="the-icons span3"><i class="icon-doc-text"></i> <span class="i-name">icon-doc-text</span><span class="i-code">0xe845</span></div>
-        <div title="Code: 0xe846" class="the-icons span3"><i class="icon-trash"></i> <span class="i-name">icon-trash</span><span class="i-code">0xe846</span></div>
-        <div title="Code: 0xe847" class="the-icons span3"><i class="icon-comment-empty"></i> <span class="i-name">icon-comment-empty</span><span class="i-code">0xe847</span></div>
+        <div title="Code: 0xe844" class="the-icons span3"><i class="demo-icon icon-file-excel">&#xe844;</i> <span class="i-name">icon-file-excel</span><span class="i-code">0xe844</span></div>
+        <div title="Code: 0xe845" class="the-icons span3"><i class="demo-icon icon-doc-text">&#xe845;</i> <span class="i-name">icon-doc-text</span><span class="i-code">0xe845</span></div>
+        <div title="Code: 0xe846" class="the-icons span3"><i class="demo-icon icon-trash">&#xe846;</i> <span class="i-name">icon-trash</span><span class="i-code">0xe846</span></div>
+        <div title="Code: 0xe847" class="the-icons span3"><i class="demo-icon icon-comment-empty">&#xe847;</i> <span class="i-name">icon-comment-empty</span><span class="i-code">0xe847</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe848" class="the-icons span3"><i class="icon-comment"></i> <span class="i-name">icon-comment</span><span class="i-code">0xe848</span></div>
-        <div title="Code: 0xe849" class="the-icons span3"><i class="icon-chat"></i> <span class="i-name">icon-chat</span><span class="i-code">0xe849</span></div>
-        <div title="Code: 0xe84a" class="the-icons span3"><i class="icon-chat-empty"></i> <span class="i-name">icon-chat-empty</span><span class="i-code">0xe84a</span></div>
-        <div title="Code: 0xe84b" class="the-icons span3"><i class="icon-bell"></i> <span class="i-name">icon-bell</span><span class="i-code">0xe84b</span></div>
+        <div title="Code: 0xe848" class="the-icons span3"><i class="demo-icon icon-comment">&#xe848;</i> <span class="i-name">icon-comment</span><span class="i-code">0xe848</span></div>
+        <div title="Code: 0xe849" class="the-icons span3"><i class="demo-icon icon-chat">&#xe849;</i> <span class="i-name">icon-chat</span><span class="i-code">0xe849</span></div>
+        <div title="Code: 0xe84a" class="the-icons span3"><i class="demo-icon icon-chat-empty">&#xe84a;</i> <span class="i-name">icon-chat-empty</span><span class="i-code">0xe84a</span></div>
+        <div title="Code: 0xe84b" class="the-icons span3"><i class="demo-icon icon-bell">&#xe84b;</i> <span class="i-name">icon-bell</span><span class="i-code">0xe84b</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe84c" class="the-icons span3"><i class="icon-bell-alt"></i> <span class="i-name">icon-bell-alt</span><span class="i-code">0xe84c</span></div>
-        <div title="Code: 0xe84d" class="the-icons span3"><i class="icon-attention-alt"></i> <span class="i-name">icon-attention-alt</span><span class="i-code">0xe84d</span></div>
-        <div title="Code: 0xe84e" class="the-icons span3"><i class="icon-print"></i> <span class="i-name">icon-print</span><span class="i-code">0xe84e</span></div>
-        <div title="Code: 0xe84f" class="the-icons span3"><i class="icon-edit"></i> <span class="i-name">icon-edit</span><span class="i-code">0xe84f</span></div>
+        <div title="Code: 0xe84c" class="the-icons span3"><i class="demo-icon icon-bell-alt">&#xe84c;</i> <span class="i-name">icon-bell-alt</span><span class="i-code">0xe84c</span></div>
+        <div title="Code: 0xe84d" class="the-icons span3"><i class="demo-icon icon-attention-alt">&#xe84d;</i> <span class="i-name">icon-attention-alt</span><span class="i-code">0xe84d</span></div>
+        <div title="Code: 0xe84e" class="the-icons span3"><i class="demo-icon icon-print">&#xe84e;</i> <span class="i-name">icon-print</span><span class="i-code">0xe84e</span></div>
+        <div title="Code: 0xe84f" class="the-icons span3"><i class="demo-icon icon-edit">&#xe84f;</i> <span class="i-name">icon-edit</span><span class="i-code">0xe84f</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe850" class="the-icons span3"><i class="icon-forward"></i> <span class="i-name">icon-forward</span><span class="i-code">0xe850</span></div>
-        <div title="Code: 0xe851" class="the-icons span3"><i class="icon-reply"></i> <span class="i-name">icon-reply</span><span class="i-code">0xe851</span></div>
-        <div title="Code: 0xe852" class="the-icons span3"><i class="icon-reply-all"></i> <span class="i-name">icon-reply-all</span><span class="i-code">0xe852</span></div>
-        <div title="Code: 0xe853" class="the-icons span3"><i class="icon-eye"></i> <span class="i-name">icon-eye</span><span class="i-code">0xe853</span></div>
+        <div title="Code: 0xe850" class="the-icons span3"><i class="demo-icon icon-forward">&#xe850;</i> <span class="i-name">icon-forward</span><span class="i-code">0xe850</span></div>
+        <div title="Code: 0xe851" class="the-icons span3"><i class="demo-icon icon-reply">&#xe851;</i> <span class="i-name">icon-reply</span><span class="i-code">0xe851</span></div>
+        <div title="Code: 0xe852" class="the-icons span3"><i class="demo-icon icon-reply-all">&#xe852;</i> <span class="i-name">icon-reply-all</span><span class="i-code">0xe852</span></div>
+        <div title="Code: 0xe853" class="the-icons span3"><i class="demo-icon icon-eye">&#xe853;</i> <span class="i-name">icon-eye</span><span class="i-code">0xe853</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe854" class="the-icons span3"><i class="icon-tag"></i> <span class="i-name">icon-tag</span><span class="i-code">0xe854</span></div>
-        <div title="Code: 0xe855" class="the-icons span3"><i class="icon-tags"></i> <span class="i-name">icon-tags</span><span class="i-code">0xe855</span></div>
-        <div title="Code: 0xe856" class="the-icons span3"><i class="icon-lock-open-alt"></i> <span class="i-name">icon-lock-open-alt</span><span class="i-code">0xe856</span></div>
-        <div title="Code: 0xe857" class="the-icons span3"><i class="icon-lock-open"></i> <span class="i-name">icon-lock-open</span><span class="i-code">0xe857</span></div>
+        <div title="Code: 0xe854" class="the-icons span3"><i class="demo-icon icon-tag">&#xe854;</i> <span class="i-name">icon-tag</span><span class="i-code">0xe854</span></div>
+        <div title="Code: 0xe855" class="the-icons span3"><i class="demo-icon icon-tags">&#xe855;</i> <span class="i-name">icon-tags</span><span class="i-code">0xe855</span></div>
+        <div title="Code: 0xe856" class="the-icons span3"><i class="demo-icon icon-lock-open-alt">&#xe856;</i> <span class="i-name">icon-lock-open-alt</span><span class="i-code">0xe856</span></div>
+        <div title="Code: 0xe857" class="the-icons span3"><i class="demo-icon icon-lock-open">&#xe857;</i> <span class="i-name">icon-lock-open</span><span class="i-code">0xe857</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe858" class="the-icons span3"><i class="icon-lock"></i> <span class="i-name">icon-lock</span><span class="i-code">0xe858</span></div>
-        <div title="Code: 0xe859" class="the-icons span3"><i class="icon-home"></i> <span class="i-name">icon-home</span><span class="i-code">0xe859</span></div>
-        <div title="Code: 0xe85a" class="the-icons span3"><i class="icon-info"></i> <span class="i-name">icon-info</span><span class="i-code">0xe85a</span></div>
-        <div title="Code: 0xe85b" class="the-icons span3"><i class="icon-help"></i> <span class="i-name">icon-help</span><span class="i-code">0xe85b</span></div>
+        <div title="Code: 0xe858" class="the-icons span3"><i class="demo-icon icon-lock">&#xe858;</i> <span class="i-name">icon-lock</span><span class="i-code">0xe858</span></div>
+        <div title="Code: 0xe859" class="the-icons span3"><i class="demo-icon icon-home">&#xe859;</i> <span class="i-name">icon-home</span><span class="i-code">0xe859</span></div>
+        <div title="Code: 0xe85a" class="the-icons span3"><i class="demo-icon icon-info">&#xe85a;</i> <span class="i-name">icon-info</span><span class="i-code">0xe85a</span></div>
+        <div title="Code: 0xe85b" class="the-icons span3"><i class="demo-icon icon-help">&#xe85b;</i> <span class="i-name">icon-help</span><span class="i-code">0xe85b</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe85c" class="the-icons span3"><i class="icon-search"></i> <span class="i-name">icon-search</span><span class="i-code">0xe85c</span></div>
-        <div title="Code: 0xe85d" class="the-icons span3"><i class="icon-flapping"></i> <span class="i-name">icon-flapping</span><span class="i-code">0xe85d</span></div>
-        <div title="Code: 0xe85e" class="the-icons span3"><i class="icon-rewind"></i> <span class="i-name">icon-rewind</span><span class="i-code">0xe85e</span></div>
-        <div title="Code: 0xe85f" class="the-icons span3"><i class="icon-chart-line"></i> <span class="i-name">icon-chart-line</span><span class="i-code">0xe85f</span></div>
+        <div title="Code: 0xe85c" class="the-icons span3"><i class="demo-icon icon-search">&#xe85c;</i> <span class="i-name">icon-search</span><span class="i-code">0xe85c</span></div>
+        <div title="Code: 0xe85d" class="the-icons span3"><i class="demo-icon icon-flapping">&#xe85d;</i> <span class="i-name">icon-flapping</span><span class="i-code">0xe85d</span></div>
+        <div title="Code: 0xe85e" class="the-icons span3"><i class="demo-icon icon-rewind">&#xe85e;</i> <span class="i-name">icon-rewind</span><span class="i-code">0xe85e</span></div>
+        <div title="Code: 0xe85f" class="the-icons span3"><i class="demo-icon icon-chart-line">&#xe85f;</i> <span class="i-name">icon-chart-line</span><span class="i-code">0xe85f</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe860" class="the-icons span3"><i class="icon-bell-off"></i> <span class="i-name">icon-bell-off</span><span class="i-code">0xe860</span></div>
-        <div title="Code: 0xe861" class="the-icons span3"><i class="icon-bell-off-empty"></i> <span class="i-name">icon-bell-off-empty</span><span class="i-code">0xe861</span></div>
-        <div title="Code: 0xe862" class="the-icons span3"><i class="icon-plug"></i> <span class="i-name">icon-plug</span><span class="i-code">0xe862</span></div>
-        <div title="Code: 0xe863" class="the-icons span3"><i class="icon-eye-off"></i> <span class="i-name">icon-eye-off</span><span class="i-code">0xe863</span></div>
+        <div title="Code: 0xe860" class="the-icons span3"><i class="demo-icon icon-bell-off">&#xe860;</i> <span class="i-name">icon-bell-off</span><span class="i-code">0xe860</span></div>
+        <div title="Code: 0xe861" class="the-icons span3"><i class="demo-icon icon-bell-off-empty">&#xe861;</i> <span class="i-name">icon-bell-off-empty</span><span class="i-code">0xe861</span></div>
+        <div title="Code: 0xe862" class="the-icons span3"><i class="demo-icon icon-plug">&#xe862;</i> <span class="i-name">icon-plug</span><span class="i-code">0xe862</span></div>
+        <div title="Code: 0xe863" class="the-icons span3"><i class="demo-icon icon-eye-off">&#xe863;</i> <span class="i-name">icon-eye-off</span><span class="i-code">0xe863</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe864" class="the-icons span3"><i class="icon-reschedule"></i> <span class="i-name">icon-reschedule</span><span class="i-code">0xe864</span></div>
-        <div title="Code: 0xe865" class="the-icons span3"><i class="icon-cw"></i> <span class="i-name">icon-cw</span><span class="i-code">0xe865</span></div>
-        <div title="Code: 0xe866" class="the-icons span3"><i class="icon-host"></i> <span class="i-name">icon-host</span><span class="i-code">0xe866</span></div>
-        <div title="Code: 0xe867" class="the-icons span3"><i class="icon-thumbs-up"></i> <span class="i-name">icon-thumbs-up</span><span class="i-code">0xe867</span></div>
+        <div title="Code: 0xe864" class="the-icons span3"><i class="demo-icon icon-reschedule">&#xe864;</i> <span class="i-name">icon-reschedule</span><span class="i-code">0xe864</span></div>
+        <div title="Code: 0xe865" class="the-icons span3"><i class="demo-icon icon-cw">&#xe865;</i> <span class="i-name">icon-cw</span><span class="i-code">0xe865</span></div>
+        <div title="Code: 0xe866" class="the-icons span3"><i class="demo-icon icon-host">&#xe866;</i> <span class="i-name">icon-host</span><span class="i-code">0xe866</span></div>
+        <div title="Code: 0xe867" class="the-icons span3"><i class="demo-icon icon-thumbs-up">&#xe867;</i> <span class="i-name">icon-thumbs-up</span><span class="i-code">0xe867</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe868" class="the-icons span3"><i class="icon-thumbs-down"></i> <span class="i-name">icon-thumbs-down</span><span class="i-code">0xe868</span></div>
-        <div title="Code: 0xe869" class="the-icons span3"><i class="icon-spinner"></i> <span class="i-name">icon-spinner</span><span class="i-code">0xe869</span></div>
-        <div title="Code: 0xe86a" class="the-icons span3"><i class="icon-attach"></i> <span class="i-name">icon-attach</span><span class="i-code">0xe86a</span></div>
-        <div title="Code: 0xe86b" class="the-icons span3"><i class="icon-keyboard"></i> <span class="i-name">icon-keyboard</span><span class="i-code">0xe86b</span></div>
+        <div title="Code: 0xe868" class="the-icons span3"><i class="demo-icon icon-thumbs-down">&#xe868;</i> <span class="i-name">icon-thumbs-down</span><span class="i-code">0xe868</span></div>
+        <div title="Code: 0xe869" class="the-icons span3"><i class="demo-icon icon-spinner">&#xe869;</i> <span class="i-name">icon-spinner</span><span class="i-code">0xe869</span></div>
+        <div title="Code: 0xe86a" class="the-icons span3"><i class="demo-icon icon-attach">&#xe86a;</i> <span class="i-name">icon-attach</span><span class="i-code">0xe86a</span></div>
+        <div title="Code: 0xe86b" class="the-icons span3"><i class="demo-icon icon-keyboard">&#xe86b;</i> <span class="i-name">icon-keyboard</span><span class="i-code">0xe86b</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe86c" class="the-icons span3"><i class="icon-menu"></i> <span class="i-name">icon-menu</span><span class="i-code">0xe86c</span></div>
-        <div title="Code: 0xe86d" class="the-icons span3"><i class="icon-wifi"></i> <span class="i-name">icon-wifi</span><span class="i-code">0xe86d</span></div>
-        <div title="Code: 0xe86e" class="the-icons span3"><i class="icon-moon"></i> <span class="i-name">icon-moon</span><span class="i-code">0xe86e</span></div>
-        <div title="Code: 0xe86f" class="the-icons span3"><i class="icon-chart-pie"></i> <span class="i-name">icon-chart-pie</span><span class="i-code">0xe86f</span></div>
+        <div title="Code: 0xe86c" class="the-icons span3"><i class="demo-icon icon-menu">&#xe86c;</i> <span class="i-name">icon-menu</span><span class="i-code">0xe86c</span></div>
+        <div title="Code: 0xe86d" class="the-icons span3"><i class="demo-icon icon-wifi">&#xe86d;</i> <span class="i-name">icon-wifi</span><span class="i-code">0xe86d</span></div>
+        <div title="Code: 0xe86e" class="the-icons span3"><i class="demo-icon icon-moon">&#xe86e;</i> <span class="i-name">icon-moon</span><span class="i-code">0xe86e</span></div>
+        <div title="Code: 0xe86f" class="the-icons span3"><i class="demo-icon icon-chart-pie">&#xe86f;</i> <span class="i-name">icon-chart-pie</span><span class="i-code">0xe86f</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe870" class="the-icons span3"><i class="icon-chart-area"></i> <span class="i-name">icon-chart-area</span><span class="i-code">0xe870</span></div>
-        <div title="Code: 0xe871" class="the-icons span3"><i class="icon-chart-bar"></i> <span class="i-name">icon-chart-bar</span><span class="i-code">0xe871</span></div>
-        <div title="Code: 0xe872" class="the-icons span3"><i class="icon-beaker"></i> <span class="i-name">icon-beaker</span><span class="i-code">0xe872</span></div>
-        <div title="Code: 0xe873" class="the-icons span3"><i class="icon-magic"></i> <span class="i-name">icon-magic</span><span class="i-code">0xe873</span></div>
+        <div title="Code: 0xe870" class="the-icons span3"><i class="demo-icon icon-chart-area">&#xe870;</i> <span class="i-name">icon-chart-area</span><span class="i-code">0xe870</span></div>
+        <div title="Code: 0xe871" class="the-icons span3"><i class="demo-icon icon-chart-bar">&#xe871;</i> <span class="i-name">icon-chart-bar</span><span class="i-code">0xe871</span></div>
+        <div title="Code: 0xe872" class="the-icons span3"><i class="demo-icon icon-beaker">&#xe872;</i> <span class="i-name">icon-beaker</span><span class="i-code">0xe872</span></div>
+        <div title="Code: 0xe873" class="the-icons span3"><i class="demo-icon icon-magic">&#xe873;</i> <span class="i-name">icon-magic</span><span class="i-code">0xe873</span></div>
       </div>
       <div class="row">
-        <div title="Code: 0xe874" class="the-icons span3"><i class="icon-spin6 animate-spin"></i> <span class="i-name">icon-spin6</span><span class="i-code">0xe874</span></div>
+        <div title="Code: 0xe874" class="the-icons span3"><i class="demo-icon icon-spin6 animate-spin">&#xe874;</i> <span class="i-name">icon-spin6</span><span class="i-code">0xe874</span></div>
+        <div title="Code: 0xe875" class="the-icons span3"><i class="demo-icon icon-down-small">&#xe875;</i> <span class="i-name">icon-down-small</span><span class="i-code">0xe875</span></div>
+        <div title="Code: 0xe876" class="the-icons span3"><i class="demo-icon icon-left-small">&#xe876;</i> <span class="i-name">icon-left-small</span><span class="i-code">0xe876</span></div>
+        <div title="Code: 0xe877" class="the-icons span3"><i class="demo-icon icon-right-small">&#xe877;</i> <span class="i-name">icon-right-small</span><span class="i-code">0xe877</span></div>
+      </div>
+      <div class="row">
+        <div title="Code: 0xe878" class="the-icons span3"><i class="demo-icon icon-up-small">&#xe878;</i> <span class="i-name">icon-up-small</span><span class="i-code">0xe878</span></div>
       </div>
     </div>
     <div class="container footer">Generated by <a href="http://fontello.com">fontello.com</a></div>

From 624309774baea6a326c55173606bdc4758251b9b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 24 Jul 2015 10:14:18 +0200
Subject: [PATCH 2607/2920] Fix style of buttons used for reordering user
 backends

---
 .../views/scripts/form/reorder-authbackend.phtml     |  8 ++++----
 public/css/icinga/forms.less                         | 12 ++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/application/views/scripts/form/reorder-authbackend.phtml b/application/views/scripts/form/reorder-authbackend.phtml
index 02598e013..be73f1787 100644
--- a/application/views/scripts/form/reorder-authbackend.phtml
+++ b/application/views/scripts/form/reorder-authbackend.phtml
@@ -33,7 +33,7 @@
         </td>
         <td data-base-target="_self">
 <?php if ($i > 0): ?>
-          <button type="submit" name="backend_newpos" value="<?= sprintf(
+          <button type="submit" name="backend_newpos" class="icon-only" value="<?= sprintf(
             '%s|%s',
             $backendNames[$i],
             $i - 1
@@ -43,11 +43,11 @@
             $this->translate('Move user backend %s upwards'),
             $backendNames[$i]
           ); ?>">
-            <?= $this->icon('up-big'); ?>
+            <?= $this->icon('up-small'); ?>
           </button>
 <?php endif; ?>
 <?php if ($i + 1 < count($backendNames)): ?>
-          <button type="submit" name="backend_newpos" value="<?= sprintf(
+          <button type="submit" name="backend_newpos" class="icon-only" value="<?= sprintf(
             '%s|%s',
             $backendNames[$i],
             $i + 1
@@ -57,7 +57,7 @@
             $this->translate('Move user backend %s downwards'),
             $backendNames[$i]
           ); ?>">
-            <?= $this->icon('down-big'); ?>
+            <?= $this->icon('down-small'); ?>
           </button>
 <?php endif; ?>
         </td>
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 2173532ec..e31081f53 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -328,6 +328,18 @@ button, .button-like {
       background-color: #666;
     }
   }
+
+  &.icon-only {
+    font-size: 1.5em;
+    padding: 0;
+    border: none;
+    color: inherit;
+    background-color: transparent;
+
+    &:hover, &:focus, &:active {
+      color: #666;
+    }
+  }
 }
 
 a.button-like {

From 216b762d12bba51d07f403806d01545e7071ca75 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 24 Jul 2015 10:28:14 +0200
Subject: [PATCH 2608/2920] Wizard: Fix layout of form hints

---
 public/css/icinga/setup.less | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index 94fc0ea19..cae83a430 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -117,15 +117,6 @@
     left: -1337px;
   }
 
-  #btn_prev {
-    margin-right: 1em;
-    font-size: 0.9em;
-  }
-
-  #btn_next {
-    font-size: 0.9em;
-  }
-
   button, .button-like {
     &.finish, &.login {
       min-width: 25em;
@@ -139,6 +130,11 @@
   }
 }
 
+#setup div.buttons + ul.hints {
+  margin-top: -1.5em;
+  margin-bottom: 1.5em;
+}
+
 form#setup_requirements {
   margin-top: 2em;
   padding-top: 0.5em;

From f8f8a4c84844f1b9c06a0df4f9eadb5edc98fa94 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 24 Jul 2015 10:51:33 +0200
Subject: [PATCH 2609/2920] Drop DbBackendFormTest

It's redundant now, we should test the inspection code directly instead.
---
 .../Config/UserBackend/DbBackendFormTest.php  | 104 ------------------
 1 file changed, 104 deletions(-)
 delete mode 100644 test/php/application/forms/Config/UserBackend/DbBackendFormTest.php

diff --git a/test/php/application/forms/Config/UserBackend/DbBackendFormTest.php b/test/php/application/forms/Config/UserBackend/DbBackendFormTest.php
deleted file mode 100644
index cc6919c93..000000000
--- a/test/php/application/forms/Config/UserBackend/DbBackendFormTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Tests\Icinga\Forms\Config\UserBackend;
-
-// Necessary as some of these tests disable phpunit's preservation
-// of the global state (e.g. autoloaders are in the global state)
-require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php');
-
-use Mockery;
-use Icinga\Data\ConfigObject;
-use Icinga\Test\BaseTestCase;
-use Icinga\Forms\Config\UserBackend\DbBackendForm;
-
-class DbBackendFormTest extends BaseTestCase
-{
-    public function tearDown()
-    {
-        parent::tearDown();
-        Mockery::close(); // Necessary because some tests run in a separate process
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testValidBackendIsValid()
-    {
-        $this->setUpResourceFactoryMock();
-        Mockery::mock('overload:Icinga\Authentication\User\DbUserBackend')
-            ->shouldReceive('inspect')
-            ->andReturn(self::createInspector(false));
-
-        // Passing array(null) is required to make Mockery call the constructor...
-        $form = Mockery::mock('Icinga\Forms\Config\UserBackend\DbBackendForm[getView]', array(null));
-        $form->shouldReceive('getView->escape')
-            ->with(Mockery::type('string'))
-            ->andReturnUsing(function ($s) {
-                return $s;
-            });
-        $form->setTokenDisabled();
-        $form->setResources(array('test_db_backend'));
-        $form->populate(array('resource' => 'test_db_backend'));
-
-        $this->assertTrue(
-            DbBackendForm::isValidUserBackend($form),
-            'DbBackendForm claims that a valid user backend with users is not valid'
-        );
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testInvalidBackendIsNotValid()
-    {
-        $this->setUpResourceFactoryMock();
-        Mockery::mock('overload:Icinga\Authentication\User\DbUserBackend')
-            ->shouldReceive('inspect')
-            ->andReturn(self::createInspector(true));
-
-        // Passing array(null) is required to make Mockery call the constructor...
-        $form = Mockery::mock('Icinga\Forms\Config\UserBackend\DbBackendForm[getView]', array(null));
-        $form->shouldReceive('getView->escape')
-            ->with(Mockery::type('string'))
-            ->andReturnUsing(function ($s) {
-                return $s;
-            });
-        $form->setTokenDisabled();
-        $form->setResources(array('test_db_backend'));
-        $form->populate(array('resource' => 'test_db_backend'));
-
-        $this->assertFalse(
-            DbBackendForm::isValidUserBackend($form),
-            'DbBackendForm claims that an invalid user backend without users is valid'
-        );
-    }
-
-    protected function setUpResourceFactoryMock()
-    {
-        Mockery::mock('alias:Icinga\Data\ResourceFactory')
-            ->shouldReceive('createResource')
-            ->andReturn(Mockery::mock('Icinga\Data\Db\DbConnection'))
-            ->shouldReceive('getResourceConfig')
-            ->andReturn(new ConfigObject());
-    }
-
-    public static function createInspector($error = false, $log = array('log'))
-    {
-        if (! $error) {
-            $calls = array(
-                'hasError' => false,
-                'toArray' => $log
-            );
-        } else {
-            $calls = array(
-                'hasError' => true,
-                'getError' => 'Error',
-                'toArray' => $log
-            );
-        }
-        return Mockery::mock('Icinga\Data\Inspection', $calls);
-    }
-}

From 75a48a3b35a70eee643093b777c2a1ac33164f04 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 24 Jul 2015 10:51:46 +0200
Subject: [PATCH 2610/2920] Drop LdapBackendFormTest

It's redundant now, we should test the inspection code directly instead.
---
 .../UserBackend/LdapBackendFormTest.php       | 105 ------------------
 1 file changed, 105 deletions(-)
 delete mode 100644 test/php/application/forms/Config/UserBackend/LdapBackendFormTest.php

diff --git a/test/php/application/forms/Config/UserBackend/LdapBackendFormTest.php b/test/php/application/forms/Config/UserBackend/LdapBackendFormTest.php
deleted file mode 100644
index c5bb8c9af..000000000
--- a/test/php/application/forms/Config/UserBackend/LdapBackendFormTest.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Tests\Icinga\Forms\Config\UserBackend;
-
-// Necessary as some of these tests disable phpunit's preservation
-// of the global state (e.g. autoloaders are in the global state)
-require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php');
-
-use Mockery;
-use Icinga\Data\ConfigObject;
-use Icinga\Test\BaseTestCase;
-use Icinga\Forms\Config\UserBackend\LdapBackendForm;
-use Icinga\Exception\AuthenticationException;
-use Tests\Icinga\Forms\Config\Resource\LdapResourceFormTest;
-
-class LdapBackendFormTest extends BaseTestCase
-{
-    public function tearDown()
-    {
-        parent::tearDown();
-        Mockery::close(); // Necessary because some tests run in a separate process
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testValidBackendIsValid()
-    {
-        $ldapUserBackendMock = Mockery::mock('overload:Icinga\Authentication\User\LdapUserBackend')
-            ->shouldReceive('inspect')
-            ->andReturn(self::createInspector(false))->getMock();
-        $this->setUpUserBackendMock($ldapUserBackendMock);
-
-        // Passing array(null) is required to make Mockery call the constructor...
-        $form = Mockery::mock('Icinga\Forms\Config\UserBackend\LdapBackendForm[getView]', array(null));
-        $form->shouldReceive('getView->escape')
-            ->with(Mockery::type('string'))
-            ->andReturnUsing(function ($s) {
-                return $s;
-            });
-        $form->setTokenDisabled();
-        $form->setResources(array('test_ldap_backend'));
-        $form->populate(array('resource' => 'test_ldap_backend'));
-
-        $this->assertTrue(
-            LdapBackendForm::isValidUserBackend($form),
-            'LdapBackendForm claims that a valid user backend with users is not valid'
-        );
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testInvalidBackendIsNotValid()
-    {
-        $ldapUserBackendMock = Mockery::mock('overload:Icinga\Authentication\User\LdapUserBackend')
-            ->shouldReceive('inspect')
-            ->andReturn(self::createInspector(true))->getMock();
-        $ldapUserBackendMock->shouldReceive('assertAuthenticationPossible')->andThrow(new AuthenticationException);
-        $this->setUpUserBackendMock($ldapUserBackendMock);
-
-        // Passing array(null) is required to make Mockery call the constructor...
-        $form = Mockery::mock('Icinga\Forms\Config\UserBackend\LdapBackendForm[getView]', array(null));
-        $form->shouldReceive('getView->escape')
-            ->with(Mockery::type('string'))
-            ->andReturnUsing(function ($s) {
-                return $s;
-            });
-        $form->setTokenDisabled();
-        $form->setResources(array('test_ldap_backend'));
-        $form->populate(array('resource' => 'test_ldap_backend'));
-
-        $this->assertFalse(
-            LdapBackendForm::isValidUserBackend($form),
-            'LdapBackendForm claims that an invalid user backend without users is valid'
-        );
-    }
-
-    protected function setUpUserBackendMock($ldapUserBackendMock)
-    {
-        Mockery::mock('alias:Icinga\Authentication\User\UserBackend')
-            ->shouldReceive('create')
-            ->andReturn($ldapUserBackendMock);
-    }
-
-    public static function createInspector($error = false, $log = array('log'))
-    {
-        if (! $error) {
-            $calls = array(
-                'hasError' => false,
-                'toArray' => $log
-            );
-        } else {
-            $calls = array(
-                'hasError' => true,
-                'getError' => 'Error',
-                'toArray' => $log
-            );
-        }
-        return Mockery::mock('Icinga\Data\Inspection', $calls);
-    }
-}

From b3e6b2755c4e0fea99ceda036deadf6caddeb404 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 24 Jul 2015 11:45:49 +0200
Subject: [PATCH 2611/2920] UserBackendConfigForm: Replace isValid- with
 inspectUserBackend()

refs #7588
---
 .../forms/Config/UserBackendConfigForm.php    | 24 +++++++++----------
 .../application/forms/AuthBackendPage.php     |  4 +++-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/application/forms/Config/UserBackendConfigForm.php b/application/forms/Config/UserBackendConfigForm.php
index 0afc54a44..d811cc16b 100644
--- a/application/forms/Config/UserBackendConfigForm.php
+++ b/application/forms/Config/UserBackendConfigForm.php
@@ -11,6 +11,7 @@ use Icinga\Exception\IcingaException;
 use Icinga\Exception\NotFoundError;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\Inspectable;
+use Icinga\Data\Inspection;
 use Icinga\Forms\ConfigForm;
 use Icinga\Forms\Config\UserBackend\ExternalBackendForm;
 use Icinga\Forms\Config\UserBackend\DbBackendForm;
@@ -348,8 +349,9 @@ class UserBackendConfigForm extends ConfigForm
         }
 
         if (($el = $this->getElement('skip_validation')) === null || false === $el->isChecked()) {
-            $backendForm = $this->getBackendForm($this->getValue('type'));
-            if (! static::isValidUserBackend($this)) {
+            $inspection = static::inspectUserBackend($this);
+            if ($inspection && $inspection->hasError()) {
+                $this->error($inspection->getError());
                 if ($el === null) {
                     $this->addSkipValidationCheckbox();
                 }
@@ -362,24 +364,20 @@ class UserBackendConfigForm extends ConfigForm
     }
 
     /**
-     * Validate the configuration by creating a backend and running its inspection checks
+     * Create a user backend by using the given form's values and return its inspection results
      *
-     * @param   Form    $form   The form to fetch the configuration values from
+     * Returns null for non-inspectable backends.
      *
-     * @return  bool            Whether inspection succeeded or not
+     * @param   Form    $form
+     *
+     * @return  Inspection|null
      */
-    public static function isValidUserBackend(Form $form)
+    public static function inspectUserBackend(Form $form)
     {
         $backend = UserBackend::create(null, new ConfigObject($form->getValues()));
         if ($backend instanceof Inspectable) {
-            $inspection = $backend->inspect();
-            if ($inspection->hasError()) {
-                $form->error($inspection->getError());
-                return false;
-            }
+            return $backend->inspect();
         }
-
-        return true;
     }
 
     /**
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index 06a2fec2c..ceeb08ed7 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -146,7 +146,9 @@ class AuthBackendPage extends Form
                     'value' => $this->getResourceConfig()
                 )
             );
-            if (! UserBackendConfigForm::isValidUserBackend($self)) {
+            $inspection = UserBackendConfigForm::inspectUserBackend($self);
+            if ($inspection && $inspection->hasError()) {
+                $this->error($inspection->getError());
                 $this->addSkipValidationCheckbox();
                 return false;
             }

From 8d7f32cac1c1ea9cf6874aaf6ee1dfcca467079f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 24 Jul 2015 13:34:11 +0200
Subject: [PATCH 2612/2920] Fix static call of SearchDashboard::search()

refs #9644
---
 application/views/scripts/layout/menu.phtml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/application/views/scripts/layout/menu.phtml b/application/views/scripts/layout/menu.phtml
index fe931c9d4..ee2ab0081 100644
--- a/application/views/scripts/layout/menu.phtml
+++ b/application/views/scripts/layout/menu.phtml
@@ -1,8 +1,11 @@
 <?php
-use Icinga\Web\Widget\SearchDashboard;
-?>
 
-<? if (SearchDashboard::search('dummy')->getPane('search')->hasDashlets()): ?>
+use Icinga\Web\Widget\SearchDashboard;
+
+$searchDashboard = new SearchDashboard();
+$searchDashboard->setUser($this->Auth()->getUser());
+
+if ($searchDashboard->search('dummy')->getPane('search')->hasDashlets()): ?>
     <form action="<?= $this->href('search') ?>" method="get" role="search">
         <input
             type="text" name="q" id="search" class="search" placeholder="<?= $this->translate('Search') ?> &hellip;"
@@ -13,4 +16,4 @@ use Icinga\Web\Widget\SearchDashboard;
 <nav>
     <h1 id="navigation" class="sr-only"><?= t('Navigation'); ?></h1>
     <?= $menuRenderer; ?>
-</nav>
\ No newline at end of file
+</nav>

From e1357c13868aa79993b3ebb193a36f06262dbb79 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 24 Jul 2015 13:34:47 +0200
Subject: [PATCH 2613/2920] Require config/modules permission for listing and
 showing modules

refs #9644
---
 application/controllers/ConfigController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 206d3c88b..b9b79d446 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -93,6 +93,7 @@ class ConfigController extends Controller
      */
     public function modulesAction()
     {
+        $this->assertPermission('config/modules');
         // Overwrite tabs created in init
         // @TODO(el): This seems not natural to me. Module configuration should have its own controller.
         $this->view->tabs = Widget::create('tabs')
@@ -118,6 +119,7 @@ class ConfigController extends Controller
 
     public function moduleAction()
     {
+        $this->assertPermission('config/modules');
         $app = Icinga::app();
         $manager = $app->getModuleManager();
         $name = $this->getParam('name');

From ccc809853a32b42dbeed41446ba4394a86cb9476 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 24 Jul 2015 13:46:17 +0200
Subject: [PATCH 2614/2920] UserBackendConfigForm: Allow to manually validate
 the configuration

refs #7588
---
 .../forms/Config/UserBackendConfigForm.php    | 83 +++++++++++++++++++
 public/css/icinga/main-content.less           |  9 ++
 2 files changed, 92 insertions(+)

diff --git a/application/forms/Config/UserBackendConfigForm.php b/application/forms/Config/UserBackendConfigForm.php
index d811cc16b..5ee4674bb 100644
--- a/application/forms/Config/UserBackendConfigForm.php
+++ b/application/forms/Config/UserBackendConfigForm.php
@@ -44,6 +44,7 @@ class UserBackendConfigForm extends ConfigForm
     {
         $this->setName('form_config_authbackend');
         $this->setSubmitLabel($this->translate('Save Changes'));
+        $this->setValidatePartial(true);
     }
 
     /**
@@ -399,4 +400,86 @@ class UserBackendConfigForm extends ConfigForm
             )
         );
     }
+
+    /**
+     * Run the configured backend's inspection checks and show the result, if necessary
+     *
+     * This will only run any validation if the user pushed the 'backend_validation' button.
+     *
+     * @param   array   $formData
+     *
+     * @return  bool
+     */
+    public function isValidPartial(array $formData)
+    {
+        if ($this->getElement('backend_validation')->isChecked() && parent::isValid($formData)) {
+            $inspection = static::inspectUserBackend($this);
+            if ($inspection !== null) {
+                $join = function ($e) use (& $join) {
+                    return is_string($e) ? $e : join("\n", array_map($join, $e));
+                };
+                $this->addElement(
+                    'note',
+                    'inspection_output',
+                    array(
+                        'order'         => 0,
+                        'value'         => '<strong>' . $this->translate('Validation Log') . "</strong>\n\n"
+                            . join("\n", array_map($join, $inspection->toArray())),
+                        'decorators'    => array(
+                            'ViewHelper',
+                            array('HtmlTag', array('tag' => 'pre', 'class' => 'log-output')),
+                        )
+                    )
+                );
+
+                if ($inspection->hasError()) {
+                    $this->warning(sprintf(
+                        $this->translate('Failed to successfully validate the configuration: %s'),
+                        $inspection->getError()
+                    ));
+                    return false;
+                }
+            }
+
+            $this->info($this->translate('The configuration has been successfully validated.'));
+        }
+
+        return true;
+    }
+
+    /**
+     * Add a submit button to this form and one to manually validate the configuration
+     *
+     * Calls parent::addSubmitButton() to add the submit button.
+     *
+     * @return  $this
+     */
+    public function addSubmitButton()
+    {
+        parent::addSubmitButton()
+            ->getElement('btn_submit')
+            ->setDecorators(array('ViewHelper'));
+
+        $this->addElement(
+            'submit',
+            'backend_validation',
+            array(
+                'ignore'        => true,
+                'label'         => $this->translate('Validate Configuration'),
+                'decorators'    => array('ViewHelper')
+            )
+        );
+        $this->addDisplayGroup(
+            array('btn_submit', 'backend_validation'),
+            'submit_validation',
+            array(
+                'decorators' => array(
+                    'FormElements',
+                    array('HtmlTag', array('tag' => 'div', 'class' => 'control-group'))
+                )
+            )
+        );
+
+        return $this;
+    }
 }
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index c51ef8722..d0f182913 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -12,6 +12,15 @@ p code {
   padding: 0.3em;
 }
 
+pre.log-output {
+  padding: 0.5em;
+  margin-top: 0;
+  margin-bottom: 2em;
+  max-height: 12em;
+  overflow: auto;
+  border: 1px solid #ddd;
+}
+
 a {
   color: #39a;
 }

From ec1ddd82b3b152a1c41325f359b27d5b7f92a5c6 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 24 Jul 2015 14:19:17 +0200
Subject: [PATCH 2615/2920] Move Module::__construct to the top of the function
 list

refs #9664
---
 library/Icinga/Application/Modules/Module.php | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index 54e23d02c..43862dc99 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -102,7 +102,7 @@ class Module
     /**
      * Module metadata (version...)
      *
-     * @var stdClass
+     * @var object
      */
     private $metadata;
 
@@ -199,6 +199,30 @@ class Module
      */
     protected $userGroupBackends = array();
 
+    /**
+     * Create a new module object
+     *
+     * @param ApplicationBootstrap  $app
+     * @param string                $name
+     * @param string                $basedir
+     */
+    public function __construct(ApplicationBootstrap $app, $name, $basedir)
+    {
+        $this->app            = $app;
+        $this->name           = $name;
+        $this->basedir        = $basedir;
+        $this->cssdir         = $basedir . '/public/css';
+        $this->jsdir          = $basedir . '/public/js';
+        $this->libdir         = $basedir . '/library';
+        $this->configdir      = $app->getConfigDir('modules/' . $name);
+        $this->localedir      = $basedir . '/application/locale';
+        $this->formdir        = $basedir . '/application/forms';
+        $this->controllerdir  = $basedir . '/application/controllers';
+        $this->runScript      = $basedir . '/run.php';
+        $this->configScript   = $basedir . '/configuration.php';
+        $this->metadataFile   = $basedir . '/module.info';
+    }
+
     /**
      * Provide a search URL
      *
@@ -280,30 +304,6 @@ class Module
         return $this->menuItems[$name];
     }
 
-    /**
-     * Create a new module object
-     *
-     * @param ApplicationBootstrap  $app
-     * @param string                $name
-     * @param string                $basedir
-     */
-    public function __construct(ApplicationBootstrap $app, $name, $basedir)
-    {
-        $this->app            = $app;
-        $this->name           = $name;
-        $this->basedir        = $basedir;
-        $this->cssdir         = $basedir . '/public/css';
-        $this->jsdir          = $basedir . '/public/js';
-        $this->libdir         = $basedir . '/library';
-        $this->configdir      = $app->getConfigDir('modules/' . $name);
-        $this->localedir      = $basedir . '/application/locale';
-        $this->formdir        = $basedir . '/application/forms';
-        $this->controllerdir  = $basedir . '/application/controllers';
-        $this->runScript      = $basedir . '/run.php';
-        $this->configScript   = $basedir . '/configuration.php';
-        $this->metadataFile   = $basedir . '/module.info';
-    }
-
     /**
      * Register module
      *

From 444fdadf13c0bded00b6eb82a7f10cbbdf4942af Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 24 Jul 2015 14:23:48 +0200
Subject: [PATCH 2616/2920] Allow to get unloaded modules via
 Manager::getModule()

refs #9644
---
 .../Icinga/Application/Modules/Manager.php    | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php
index 9de86db18..8a3970841 100644
--- a/library/Icinga/Application/Modules/Manager.php
+++ b/library/Icinga/Application/Modules/Manager.php
@@ -408,22 +408,25 @@ class Manager
     }
 
     /**
-     * Return the module instance of the given module when it is loaded
+     * Get a module
      *
-     * @param   string $name        The module name to return
+     * @param   string  $name           Name of the module
+     * @param   bool    $assertLoaded   Whether or not to throw an exception if the module hasn't been loaded
      *
      * @return  Module
-     * @throws  ProgrammingError    When the module hasn't been loaded
+     * @throws  ProgrammingError        If the module hasn't been loaded
      */
-    public function getModule($name)
+    public function getModule($name, $assertLoaded = true)
     {
-        if (!$this->hasLoaded($name)) {
-            throw new ProgrammingError(
-                'Cannot access module %s as it hasn\'t been loaded',
-                $name
-            );
+        if ($this->hasLoaded($name)) {
+            return $this->loadedModules[$name];
+        } elseif (! (bool) $assertLoaded) {
+            return new Module($this->app, $name, $this->getModuleDir($name));
         }
-        return $this->loadedModules[$name];
+        throw new ProgrammingError(
+            'Can\'t access module %s because it hasn\'t been loaded',
+            $name
+        );
     }
 
     /**

From 2c4b6eb91575ca639063368a9a96603fc10ec504 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 24 Jul 2015 14:24:11 +0200
Subject: [PATCH 2617/2920] ResourceConfigForm: Replace isValid- with
 inspectResource()

refs #7588
---
 .../forms/Config/Resource/DbResourceForm.php  | 38 +-------
 .../Config/Resource/LdapResourceForm.php      | 42 +-------
 .../forms/Config/ResourceConfigForm.php       | 32 ++++++-
 .../forms/Setup/IdoResourcePage.php           | 11 ++-
 .../application/forms/LdapResourcePage.php    |  9 +-
 .../Config/Resource/DbResourceFormTest.php    | 78 ---------------
 .../Config/Resource/LdapResourceFormTest.php  | 96 -------------------
 .../Resource/LivestatusResourceFormTest.php   | 62 ------------
 8 files changed, 48 insertions(+), 320 deletions(-)
 delete mode 100644 test/php/application/forms/Config/Resource/DbResourceFormTest.php
 delete mode 100644 test/php/application/forms/Config/Resource/LdapResourceFormTest.php
 delete mode 100644 test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php

diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
index 75d935361..3339b59bf 100644
--- a/application/forms/Config/Resource/DbResourceForm.php
+++ b/application/forms/Config/Resource/DbResourceForm.php
@@ -3,10 +3,7 @@
 
 namespace Icinga\Forms\Config\Resource;
 
-use Exception;
 use Icinga\Web\Form;
-use Icinga\Data\ConfigObject;
-use Icinga\Data\ResourceFactory;
 use Icinga\Application\Platform;
 
 /**
@@ -23,7 +20,9 @@ class DbResourceForm extends Form
     }
 
     /**
-     * @see Form::createElements()
+     * Create and add elements to this form
+     *
+     * @param   array   $formData   The data sent by the user
      */
     public function createElements(array $formData)
     {
@@ -107,35 +106,4 @@ class DbResourceForm extends Form
 
         return $this;
     }
-
-    /**
-     * Validate that the current configuration points to a valid resource
-     *
-     * @see Form::onSuccess()
-     */
-    public function onSuccess()
-    {
-        if (false === static::isValidResource($this)) {
-            return false;
-        }
-    }
-
-    /**
-     * Validate the resource configuration by trying to connect with it
-     *
-     * @param   Form    $form   The form to fetch the configuration values from
-     *
-     * @return  bool            Whether validation succeeded or not
-     */
-    public static function isValidResource(Form $form)
-    {
-        $result = ResourceFactory::createResource(new ConfigObject($form->getValues()))->inspect();
-        if ($result->hasError()) {
-            $form->addError(sprintf($form->translate('Connectivity validation failed: %s'), $result->getError()));
-        }
-
-        // TODO: display diagnostics in $result->toArray() to the user
-
-        return ! $result->hasError();
-    }
 }
diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index b385610a8..c6e452d2c 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -3,10 +3,7 @@
 
 namespace Icinga\Forms\Config\Resource;
 
-use Exception;
 use Icinga\Web\Form;
-use Icinga\Data\ConfigObject;
-use Icinga\Data\ResourceFactory;
 use Icinga\Protocol\Ldap\LdapConnection;
 
 /**
@@ -23,7 +20,9 @@ class LdapResourceForm extends Form
     }
 
     /**
-     * @see Form::createElements()
+     * Create and add elements to this form
+     *
+     * @param   array   $formData   The data sent by the user
      */
     public function createElements(array $formData)
     {
@@ -132,39 +131,4 @@ class LdapResourceForm extends Form
 
         return $this;
     }
-
-    /**
-     * Validate that the current configuration points to a valid resource
-     *
-     * @see Form::onSuccess()
-     */
-    public function onSuccess()
-    {
-        if (false === static::isValidResource($this)) {
-            return false;
-        }
-    }
-
-    /**
-     * Validate the resource configuration by trying to connect with it
-     *
-     * @param   Form    $form   The form to fetch the configuration values from
-     *
-     * @return  bool            Whether validation succeeded or not
-     */
-    public static function isValidResource(Form $form)
-    {
-        $result = ResourceFactory::createResource(new ConfigObject($form->getValues()))->inspect();
-        if ($result->hasError()) {
-            $form->addError(sprintf(
-                '%s (%s)',
-                $form->translate('Connectivity validation failed, connection to the given resource not possible.'),
-                $result->getError()
-            ));
-        }
-
-        // TODO: display diagnostics in $result->toArray() to the user
-
-        return ! $result->hasError();
-    }
 }
diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php
index 5d6626d02..8b5f91c40 100644
--- a/application/forms/Config/ResourceConfigForm.php
+++ b/application/forms/Config/ResourceConfigForm.php
@@ -4,15 +4,20 @@
 namespace Icinga\Forms\Config;
 
 use InvalidArgumentException;
-use Icinga\Web\Notification;
+use Icinga\Application\Platform;
+use Icinga\Exception\ConfigurationError;
+use Icinga\Data\ConfigObject;
+use Icinga\Data\Inspectable;
+use Icinga\Data\Inspection;
+use Icinga\Data\ResourceFactory;
 use Icinga\Forms\ConfigForm;
 use Icinga\Forms\Config\Resource\DbResourceForm;
 use Icinga\Forms\Config\Resource\FileResourceForm;
 use Icinga\Forms\Config\Resource\LdapResourceForm;
 use Icinga\Forms\Config\Resource\LivestatusResourceForm;
 use Icinga\Forms\Config\Resource\SshResourceForm;
-use Icinga\Application\Platform;
-use Icinga\Exception\ConfigurationError;
+use Icinga\Web\Form;
+use Icinga\Web\Notification;
 
 class ResourceConfigForm extends ConfigForm
 {
@@ -141,7 +146,9 @@ class ResourceConfigForm extends ConfigForm
         $resourceForm = $this->getResourceForm($this->getElement('type')->getValue());
 
         if (($el = $this->getElement('force_creation')) === null || false === $el->isChecked()) {
-            if (method_exists($resourceForm, 'isValidResource') && false === $resourceForm::isValidResource($this)) {
+            $inspection = static::inspectResource($this);
+            if ($inspection !== null && $inspection->hasError()) {
+                $this->error($inspection->getError());
                 $this->addElement($this->getForceCreationCheckbox());
                 return false;
             }
@@ -255,4 +262,21 @@ class ResourceConfigForm extends ConfigForm
 
         $this->addElements($this->getResourceForm($resourceType)->createElements($formData)->getElements());
     }
+
+    /**
+     * Create a resource by using the given form's values and return its inspection results
+     *
+     * @param   Form    $form
+     *
+     * @return  Inspection
+     */
+    public static function inspectResource(Form $form)
+    {
+        if ($form->getValue('type') !== 'ssh') {
+            $resource = ResourceFactory::createResource(new ConfigObject($form->getValues()));
+            if ($resource instanceof Inspectable) {
+                return $resource->inspect();
+            }
+        }
+    }
 }
diff --git a/modules/monitoring/application/forms/Setup/IdoResourcePage.php b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
index 7470e730a..ea244d057 100644
--- a/modules/monitoring/application/forms/Setup/IdoResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
@@ -4,6 +4,7 @@
 namespace Icinga\Module\Monitoring\Forms\Setup;
 
 use Icinga\Data\ConfigObject;
+use Icinga\Forms\Config\ResourceConfigForm;
 use Icinga\Forms\Config\Resource\DbResourceForm;
 use Icinga\Web\Form;
 use Icinga\Module\Monitoring\Forms\Config\BackendConfigForm;
@@ -71,13 +72,17 @@ class IdoResourcePage extends Form
         }
 
         if (! isset($formData['skip_validation']) || !$formData['skip_validation']) {
-            $configObject = new ConfigObject($this->getValues());
-            if (! DbResourceForm::isValidResource($this, $configObject)) {
+            $inspection = ResourceConfigForm::inspectResource($this);
+            if ($inspection !== null && $inspection->hasError()) {
+                $this->error($inspection->getError());
                 $this->addSkipValidationCheckbox($this->translate(
                     'Check this to not to validate connectivity with the given database server.'
                 ));
                 return false;
-            } elseif (
+            }
+
+            $configObject = new ConfigObject($this->getValues());
+            if (
                 ! BackendConfigForm::isValidIdoSchema($this, $configObject)
                 || !BackendConfigForm::isValidIdoInstance($this, $configObject)
             ) {
diff --git a/modules/setup/application/forms/LdapResourcePage.php b/modules/setup/application/forms/LdapResourcePage.php
index e7342185e..316b66f31 100644
--- a/modules/setup/application/forms/LdapResourcePage.php
+++ b/modules/setup/application/forms/LdapResourcePage.php
@@ -4,6 +4,7 @@
 namespace Icinga\Module\Setup\Forms;
 
 use Icinga\Web\Form;
+use Icinga\Forms\Config\ResourceConfigForm;
 use Icinga\Forms\Config\Resource\LdapResourceForm;
 
 /**
@@ -65,12 +66,14 @@ class LdapResourcePage extends Form
      */
     public function isValid($data)
     {
-        if (false === parent::isValid($data)) {
+        if (! parent::isValid($data)) {
             return false;
         }
 
-        if (false === isset($data['skip_validation']) || $data['skip_validation'] == 0) {
-            if (false === LdapResourceForm::isValidResource($this)) {
+        if (! isset($data['skip_validation']) || $data['skip_validation'] == 0) {
+            $inspection = ResourceConfigForm::inspectResource($this);
+            if ($inspection !== null && $inspection->hasError()) {
+                $this->error($inspection->getError());
                 $this->addSkipValidationCheckbox();
                 return false;
             }
diff --git a/test/php/application/forms/Config/Resource/DbResourceFormTest.php b/test/php/application/forms/Config/Resource/DbResourceFormTest.php
deleted file mode 100644
index 6aa51dbff..000000000
--- a/test/php/application/forms/Config/Resource/DbResourceFormTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Tests\Icinga\Forms\Config\Resource;
-
-// Necessary as some of these tests disable phpunit's preservation
-// of the global state (e.g. autoloaders are in the global state)
-require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php');
-
-use Mockery;
-use Icinga\Test\BaseTestCase;
-use Icinga\Forms\Config\Resource\DbResourceForm;
-
-class DbResourceFormTest extends BaseTestCase
-{
-    public function tearDown()
-    {
-        parent::tearDown();
-        Mockery::close(); // Necessary because some tests run in a separate process
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testValidDbResourceIsValid()
-    {
-        $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('inspect')->andReturn(self::createInspector(false))->getMock()
-        );
-
-        $this->assertTrue(
-            DbResourceForm::isValidResource(new DbResourceForm()),
-            'ResourceForm claims that a valid db resource is not valid'
-        );
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testInvalidDbResourceIsNotValid()
-    {
-        $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('inspect')->andReturn(self::createInspector(true))->getMock()
-        );
-
-        $this->assertFalse(
-            DbResourceForm::isValidResource(new DbResourceForm()),
-            'ResourceForm claims that an invalid db resource is valid'
-        );
-    }
-
-    protected function setUpResourceFactoryMock($resourceMock)
-    {
-        Mockery::mock('alias:Icinga\Data\ResourceFactory')
-            ->shouldReceive('createResource')
-            ->with(Mockery::type('Icinga\Data\ConfigObject'))
-            ->andReturn($resourceMock);
-    }
-
-    public static function createInspector($error = false, $log = array('log'))
-    {
-        if (! $error) {
-            $calls = array(
-                'hasError' => false,
-                'toArray' => $log
-            );
-        } else {
-            $calls = array(
-                'hasError' => true,
-                'getError' => 'Error',
-                'toArray' => $log
-            );
-        }
-        return Mockery::mock('Icinga\Data\Inspection', $calls);
-    }
-}
diff --git a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
deleted file mode 100644
index bef49edca..000000000
--- a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Tests\Icinga\Forms\Config\Resource;
-
-// Necessary as some of these tests disable phpunit's preservation
-// of the global state (e.g. autoloaders are in the global state)
-require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php');
-
-use Mockery;
-use Icinga\Test\BaseTestCase;
-use Icinga\Forms\Config\Resource\LdapResourceForm;
-
-class LdapResourceFormTest extends BaseTestCase
-{
-    public function tearDown()
-    {
-        parent::tearDown();
-        Mockery::close(); // Necessary because some tests run in a separate process
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testValidLdapResourceIsValid()
-    {
-        $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('inspect')->andReturn(self::createInspector(false))->getMock()
-        );
-
-        // Passing array(null) is required to make Mockery call the constructor...
-        $form = Mockery::mock('Icinga\Forms\Config\Resource\LdapResourceForm[getView]', array(null));
-        $form->shouldReceive('getView->escape')
-            ->with(Mockery::type('string'))
-            ->andReturnUsing(function ($s) {
-                return $s;
-            });
-        $form->setTokenDisabled();
-
-        $this->assertTrue(
-            LdapResourceForm::isValidResource($form->create()),
-            'ResourceForm claims that a valid ldap resource is not valid'
-        );
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testInvalidLdapResourceIsNotValid()
-    {
-        $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('inspect')->andReturn(self::createInspector(true))->getMock()
-        );
-
-        // Passing array(null) is required to make Mockery call the constructor...
-        $form = Mockery::mock('Icinga\Forms\Config\Resource\LdapResourceForm[getView]', array(null));
-        $form->shouldReceive('getView->escape')
-            ->with(Mockery::type('string'))
-            ->andReturnUsing(function ($s) {
-                return $s;
-            });
-        $form->setTokenDisabled();
-
-        $this->assertFalse(
-            LdapResourceForm::isValidResource($form->create()),
-            'ResourceForm claims that an invalid ldap resource is valid'
-        );
-    }
-
-    protected function setUpResourceFactoryMock($resourceMock)
-    {
-        Mockery::mock('alias:Icinga\Data\ResourceFactory')
-            ->shouldReceive('createResource')
-            ->with(Mockery::type('Icinga\Data\ConfigObject'))
-            ->andReturn($resourceMock);
-    }
-
-    public static function createInspector($error = false, $log = array('log'))
-    {
-        if (! $error) {
-            $calls = array(
-                'hasError' => false,
-                'toArray' => $log
-            );
-        } else {
-            $calls = array(
-                'hasError' => true,
-                'getError' => 'Error',
-                'toArray' => $log
-            );
-        }
-        return Mockery::mock('Icinga\Data\Inspection', $calls);
-    }
-}
diff --git a/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php b/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php
deleted file mode 100644
index a634752de..000000000
--- a/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Tests\Icinga\Forms\Config\Resource;
-
-// Necessary as some of these tests disable phpunit's preservation
-// of the global state (e.g. autoloaders are in the global state)
-require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php');
-
-use Mockery;
-use Icinga\Test\BaseTestCase;
-use Icinga\Forms\Config\Resource\LivestatusResourceForm;
-
-class LivestatusResourceFormTest extends BaseTestCase
-{
-    public function tearDown()
-    {
-        parent::tearDown();
-        Mockery::close(); // Necessary because some tests run in a separate process
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testValidLivestatusResourceIsValid()
-    {
-        $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('connect')->andReturn(Mockery::self())
-                ->shouldReceive('disconnect')->getMock()
-        );
-
-        $this->assertTrue(
-            LivestatusResourceForm::isValidResource(new LivestatusResourceForm()),
-            'ResourceForm claims that a valid livestatus resource is not valid'
-        );
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testInvalidLivestatusResourceIsNotValid()
-    {
-        $this->setUpResourceFactoryMock(
-            Mockery::mock()->shouldReceive('connect')->once()->andThrow('\Exception')->getMock()
-        );
-
-        $this->assertFalse(
-            LivestatusResourceForm::isValidResource(new LivestatusResourceForm()),
-            'ResourceForm claims that an invalid livestatus resource is valid'
-        );
-    }
-
-    protected function setUpResourceFactoryMock($resourceMock)
-    {
-        Mockery::mock('alias:Icinga\Data\ResourceFactory')
-            ->shouldReceive('createResource')
-            ->with(Mockery::type('Icinga\Data\ConfigObject'))
-            ->andReturn($resourceMock);
-    }
-}

From 519d025de5569ecc6e398b8a2f28660a400cd83b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 24 Jul 2015 14:24:48 +0200
Subject: [PATCH 2618/2920] Allow to get permissions and restrictions from
 unloaded modules

refs #9644
---
 library/Icinga/Application/Modules/Module.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index 43862dc99..d96e6e962 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -113,6 +113,13 @@ class Module
      */
     private $triedToLaunchConfigScript = false;
 
+    /**
+     * Whether the module's namespace has been registered on our autoloader
+     *
+     * @var bool
+     */
+    protected $registeredAutoloader = false;
+
     /**
      * Whether this module has been registered
      *
@@ -855,6 +862,10 @@ class Module
      */
     protected function registerAutoloader()
     {
+        if ($this->registeredAutoloader) {
+            return $this;
+        }
+
         $moduleName = ucfirst($this->getName());
 
         $moduleLibraryDir = $this->getLibDir(). '/'. $moduleName;
@@ -867,6 +878,8 @@ class Module
             $this->app->getLoader()->registerNamespace('Icinga\\Module\\' . $moduleName. '\\Forms',  $moduleFormDir);
         }
 
+        $this->registeredAutoloader = true;
+
         return $this;
     }
 
@@ -1011,7 +1024,7 @@ class Module
      */
     protected function launchConfigScript()
     {
-        if ($this->triedToLaunchConfigScript || !$this->registered) {
+        if ($this->triedToLaunchConfigScript) {
             return;
         }
         $this->triedToLaunchConfigScript = true;
@@ -1019,6 +1032,7 @@ class Module
          || ! is_readable($this->configScript)) {
             return;
         }
+        $this->registerAutoloader();
         include($this->configScript);
     }
 

From df81fd502d21130deb1791c9c293e71b6f0ef68d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 24 Jul 2015 14:31:02 +0200
Subject: [PATCH 2619/2920] ResourceConfigForm: Allow to manually validate the
 configuration

refs #7588
---
 .../forms/Config/ResourceConfigForm.php       | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php
index 8b5f91c40..51e1b1bff 100644
--- a/application/forms/Config/ResourceConfigForm.php
+++ b/application/forms/Config/ResourceConfigForm.php
@@ -28,6 +28,7 @@ class ResourceConfigForm extends ConfigForm
     {
         $this->setName('form_config_resource');
         $this->setSubmitLabel($this->translate('Save Changes'));
+        $this->setValidatePartial(true);
     }
 
     /**
@@ -279,4 +280,86 @@ class ResourceConfigForm extends ConfigForm
             }
         }
     }
+
+    /**
+     * Run the configured resource's inspection checks and show the result, if necessary
+     *
+     * This will only run any validation if the user pushed the 'resource_validation' button.
+     *
+     * @param   array   $formData
+     *
+     * @return  bool
+     */
+    public function isValidPartial(array $formData)
+    {
+        if ($this->getElement('resource_validation')->isChecked() && parent::isValid($formData)) {
+            $inspection = static::inspectResource($this);
+            if ($inspection !== null) {
+                $join = function ($e) use (& $join) {
+                    return is_string($e) ? $e : join("\n", array_map($join, $e));
+                };
+                $this->addElement(
+                    'note',
+                    'inspection_output',
+                    array(
+                        'order'         => 0,
+                        'value'         => '<strong>' . $this->translate('Validation Log') . "</strong>\n\n"
+                            . join("\n", array_map($join, $inspection->toArray())),
+                        'decorators'    => array(
+                            'ViewHelper',
+                            array('HtmlTag', array('tag' => 'pre', 'class' => 'log-output')),
+                        )
+                    )
+                );
+
+                if ($inspection->hasError()) {
+                    $this->warning(sprintf(
+                        $this->translate('Failed to successfully validate the configuration: %s'),
+                        $inspection->getError()
+                    ));
+                    return false;
+                }
+            }
+
+            $this->info($this->translate('The configuration has been successfully validated.'));
+        }
+
+        return true;
+    }
+
+    /**
+     * Add a submit button to this form and one to manually validate the configuration
+     *
+     * Calls parent::addSubmitButton() to add the submit button.
+     *
+     * @return  $this
+     */
+    public function addSubmitButton()
+    {
+        parent::addSubmitButton()
+            ->getElement('btn_submit')
+            ->setDecorators(array('ViewHelper'));
+
+        $this->addElement(
+            'submit',
+            'resource_validation',
+            array(
+                'ignore'        => true,
+                'label'         => $this->translate('Validate Configuration'),
+                'decorators'    => array('ViewHelper')
+            )
+        );
+        $this->addDisplayGroup(
+            array('btn_submit', 'resource_validation'),
+            'submit_validation',
+            array(
+                'decorators' => array(
+                    'FormElements',
+                    array('HtmlTag', array('tag' => 'div', 'class' => 'control-group'))
+                )
+            )
+        );
+
+        return $this;
+    }
 }

From f0fc8b8e901ab741071ca5c15cdae6f287bbff50 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@netways.de>
Date: Fri, 24 Jul 2015 14:33:06 +0200
Subject: [PATCH 2620/2920] Vagrant: slapd must be running, add provision hint
 to docs

For some reason the initial ldap provisioning might fail even
after ensuring that slapd is running. Yet another `vagrant provision`
will fix the issue.

refs #9453
---
 .puppet/modules/openldap/manifests/init.pp | 2 +-
 doc/vagrant.md                             | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.puppet/modules/openldap/manifests/init.pp b/.puppet/modules/openldap/manifests/init.pp
index 11cc2b42a..62b9d1e34 100644
--- a/.puppet/modules/openldap/manifests/init.pp
+++ b/.puppet/modules/openldap/manifests/init.pp
@@ -28,7 +28,7 @@ class openldap {
       exec { "slapd-schema-${schema}":
         command => "ldapadd -Y EXTERNAL -H ldapi:// -f /etc/openldap/schema/${schema}.ldif",
         group   => 'root',
-        require => Package['openldap-servers'],
+        require => [ Package['openldap-servers'], Service['slapd'] ],
         unless  => "test -n \"$(find /etc/openldap/slapd.d/cn=config/cn=schema/ -name cn={*}${schema}.ldif -print -quit)\"",
         user    => 'root',
       }
diff --git a/doc/vagrant.md b/doc/vagrant.md
index b1b98b436..148e6aeb8 100644
--- a/doc/vagrant.md
+++ b/doc/vagrant.md
@@ -24,6 +24,8 @@ vagrant up
 > you'll download a plain CentOS base box and Vagrant will automatically
 > provision the environment on the first go.
 
+If the LDAP schema import fails, rerun `vagrant provision`.
+
 After you should be able to browse [localhost:8080/icingaweb2](http://localhost:8080/icingaweb2).
 
 ## Log into Icinga Web 2

From bba7cb14633c092a6fd5a8478f453f78489ca439 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@netways.de>
Date: Fri, 24 Jul 2015 14:34:13 +0200
Subject: [PATCH 2621/2920] Vagrant: Use centos71 base box from icinga.org

refs #9453
---
 Vagrantfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 11b5e2b9c..7d026fc83 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -22,9 +22,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision :shell, :path => ".puppet/manifests/puppet.sh"
 
   config.vm.provider :virtualbox do |v, override|
-    override.vm.box = "puppetlabs/centos-7.0-64-puppet"
+    override.vm.box = "centos-71-x64-vbox"
+    override.vm.box_url = "http://boxes.icinga.org/centos-71-x64-vbox.box"
 
     v.customize ["modifyvm", :id, "--memory", "1024"]
+    v.customize ["modifyvm", :id, "--cpus", "2"]
   end
 
   config.vm.provider :parallels do |p, override|

From 149a974a448c34b0d795d91327e9fcca14920049 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 24 Jul 2015 15:06:25 +0200
Subject: [PATCH 2622/2920] Fix coding style in Module.php

refs #9644
---
 library/Icinga/Application/Modules/Module.php | 231 +++++++++---------
 1 file changed, 113 insertions(+), 118 deletions(-)

diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index d96e6e962..ad1ec1f5d 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -114,7 +114,7 @@ class Module
     private $triedToLaunchConfigScript = false;
 
     /**
-     * Whether the module's namespace has been registered on our autoloader
+     * Whether the module's namespaces have been registered on our autoloader
      *
      * @var bool
      */
@@ -233,25 +233,27 @@ class Module
     /**
      * Provide a search URL
      *
-     * @param string    $title
-     * @param string    $url
-     * @param int       $priority
+     * @param   string    $title
+     * @param   string    $url
+     * @param   int       $priority
+     *
+     * @return  $this
      */
     public function provideSearchUrl($title, $url, $priority = 0)
     {
-        $searchUrl = (object) array(
+        $this->searchUrls[] = (object) array(
             'title'     => (string) $title,
             'url'       => (string) $url,
             'priority'  => (int) $priority
         );
 
-        $this->searchUrls[] = $searchUrl;
+        return $this;
     }
 
     /**
-     * Return this module's search urls
+     * Get this module's search urls
      *
-     * @return  array
+     * @return array
      */
     public function getSearchUrls()
     {
@@ -260,7 +262,7 @@ class Module
     }
 
     /**
-     * Get all Menu Items
+     * Get all pane items
      *
      * @return array
      */
@@ -273,8 +275,9 @@ class Module
     /**
      * Add a pane to dashboard
      *
-     * @param $name
-     * @return Pane
+     * @param   string $name
+     *
+     * @return  Pane
      */
     protected function dashboard($name)
     {
@@ -283,7 +286,7 @@ class Module
     }
 
     /**
-     * Get all Menu Items
+     * Get all menu items
      *
      * @return array
      */
@@ -294,11 +297,12 @@ class Module
     }
 
     /**
-     * Add a menu Section to the Sidebar menu
+     * Add or get a menu section
      *
-     * @param $name
-     * @param array $properties
-     * @return mixed
+     * @param   string  $name
+     * @param   array   $properties
+     *
+     * @return  Menu
      */
     protected function menuSection($name, array $properties = array())
     {
@@ -334,16 +338,16 @@ class Module
             );
             return false;
         }
-
         $this->registerWebIntegration();
         $this->registered = true;
+
         return true;
     }
 
     /**
-     * Return whether this module has been registered
+     * Get whether this module has been registered
      *
-     * @return  bool
+     * @return bool
      */
     public function isRegistered()
     {
@@ -353,9 +357,9 @@ class Module
     /**
      * Test for an enabled module by name
      *
-     * @param string $name
+     * @param   string $name
      *
-     * @return boolean
+     * @return  bool
      */
     public static function exists($name)
     {
@@ -363,7 +367,7 @@ class Module
     }
 
     /**
-     * Get module by name
+     * Get a module by name
      *
      * @param string $name
      * @param bool   $autoload
@@ -425,7 +429,7 @@ class Module
     }
 
     /**
-     * Getter for module name
+     * Get the module name
      *
      * @return string
      */
@@ -435,7 +439,7 @@ class Module
     }
 
     /**
-     * Getter for module version
+     * Get the module version
      *
      * @return string
      */
@@ -445,7 +449,7 @@ class Module
     }
 
     /**
-     * Get module description
+     * Get the module description
      *
      * @return string
      */
@@ -455,7 +459,7 @@ class Module
     }
 
     /**
-     * Get module title (short description)
+     * Get the module title (short description)
      *
      * @return string
      */
@@ -465,9 +469,9 @@ class Module
     }
 
     /**
-     * Getter for module version
+     * Get the module dependencies
      *
-     * @return Array
+     * @return array
      */
     public function getDependencies()
     {
@@ -562,7 +566,7 @@ class Module
     }
 
     /**
-     * Getter for css file name
+     * Get the module's CSS directory
      *
      * @return string
      */
@@ -572,17 +576,7 @@ class Module
     }
 
     /**
-     * Getter for base directory
-     *
-     * @return string
-     */
-    public function getBaseDir()
-    {
-        return $this->basedir;
-    }
-
-    /**
-     * Get the controller directory
+     * Get the module's controller directory
      *
      * @return string
      */
@@ -592,7 +586,17 @@ class Module
     }
 
     /**
-     * Getter for library directory
+     * Get the module's base directory
+     *
+     * @return string
+     */
+    public function getBaseDir()
+    {
+        return $this->basedir;
+    }
+
+    /**
+     * Get the module's library directory
      *
      * @return string
      */
@@ -602,7 +606,7 @@ class Module
     }
 
     /**
-     * Getter for configuration directory
+     * Get the module's configuration directory
      *
      * @return string
      */
@@ -612,7 +616,7 @@ class Module
     }
 
     /**
-     * Getter for form directory
+     * Get the module's form directory
      *
      * @return string
      */
@@ -622,11 +626,11 @@ class Module
     }
 
     /**
-     * Getter for module config object
+     * Get the module config
      *
-     * @param string $file
+     * @param   string $file
      *
-     * @return Config
+     * @return  Config
      */
     public function getConfig($file = 'config')
     {
@@ -634,9 +638,7 @@ class Module
     }
 
     /**
-     * Retrieve provided permissions
-     *
-     * @param string $name Permission name
+     * Get provided permissions
      *
      * @return array
      */
@@ -647,9 +649,8 @@ class Module
     }
 
     /**
-     * Retrieve provided restrictions
+     * Get provided restrictions
      *
-     * @param  string  $name Restriction name
      * @return array
      */
     public function getProvidedRestrictions()
@@ -659,24 +660,11 @@ class Module
     }
 
     /**
-     * Whether the given permission name is supported
+     * Whether the module provides the given restriction
      *
-     * @param string $name Permission name
+     * @param   string $name Restriction name
      *
-     * @return bool
-     */
-    public function providesPermission($name)
-    {
-        $this->launchConfigScript();
-        return array_key_exists($name, $this->permissionList);
-    }
-
-    /**
-     * Whether the given restriction name is supported
-     *
-     * @param string $name Restriction name
-     *
-     * @return bool
+     * @return  bool
      */
     public function providesRestriction($name)
     {
@@ -685,9 +673,22 @@ class Module
     }
 
     /**
-     * Retrieve this modules configuration tabs
+     * Whether the module provides the given permission
      *
-     * @return Icinga\Web\Widget\Tabs
+     * @param   string $name Permission name
+     *
+     * @return  bool
+     */
+    public function providesPermission($name)
+    {
+        $this->launchConfigScript();
+        return array_key_exists($name, $this->permissionList);
+    }
+
+    /**
+     * Get the module configuration tabs
+     *
+     * @return \Icinga\Web\Widget\Tabs
      */
     public function getConfigTabs()
     {
@@ -705,9 +706,9 @@ class Module
     }
 
     /**
-     * Whether this module provides a setup wizard
+     * Whether the module provides a setup wizard
      *
-     * @return  bool
+     * @return bool
      */
     public function providesSetupWizard()
     {
@@ -721,9 +722,9 @@ class Module
     }
 
     /**
-     * Return this module's setup wizard
+     * Get the module's setup wizard
      *
-     * @return  SetupWizard
+     * @return SetupWizard
      */
     public function getSetupWizard()
     {
@@ -731,9 +732,9 @@ class Module
     }
 
     /**
-     * Return this module's user backends
+     * Get the module's user backends
      *
-     * @return  array
+     * @return array
      */
     public function getUserBackends()
     {
@@ -742,9 +743,9 @@ class Module
     }
 
     /**
-     * Return this module's user group backends
+     * Get the module's user group backends
      *
-     * @return  array
+     * @return array
      */
     public function getUserGroupBackends()
     {
@@ -755,10 +756,10 @@ class Module
     /**
      * Provide a named permission
      *
-     * @param string $name Unique permission name
-     * @param string $name Permission description
+     * @param   string $name        Unique permission name
+     * @param   string $description Permission description
      *
-     * @return void
+     * @throws  IcingaException     If the permission is already provided
      */
     protected function providePermission($name, $description)
     {
@@ -777,10 +778,10 @@ class Module
     /**
      * Provide a named restriction
      *
-     * @param string $name        Unique restriction name
-     * @param string $description Restriction description
+     * @param   string $name        Unique restriction name
+     * @param   string $description Restriction description
      *
-     * @return void
+     * @throws  IcingaException     If the restriction is already provided
      */
     protected function provideRestriction($name, $description)
     {
@@ -799,15 +800,16 @@ class Module
     /**
      * Provide a module config tab
      *
-     * @param string $name   Unique tab name
-     * @param string $config Tab config
+     * @param   string  $name       Unique tab name
+     * @param   array   $config     Tab config
      *
-     * @return $this
+     * @return  $this
+     * @throws  ProgrammingError    If $config lacks the key 'url'
      */
     protected function provideConfigTab($name, $config = array())
     {
         if (! array_key_exists('url', $config)) {
-            throw new ProgrammingError('A module config tab MUST provide and "url"');
+            throw new ProgrammingError('A module config tab MUST provide a "url"');
         }
         $config['url'] = $this->getName() . '/' . ltrim($config['url'], '/');
         $this->configTabs[$name] = $config;
@@ -817,7 +819,7 @@ class Module
     /**
      * Provide a setup wizard
      *
-     * @param   string  $className      The name of the class
+     * @param   string $className The name of the class
      *
      * @return  $this
      */
@@ -830,8 +832,8 @@ class Module
     /**
      * Provide a user backend capable of authenticating users
      *
-     * @param   string  $identifier     The identifier of the new backend type
-     * @param   string  $className      The name of the class
+     * @param   string $identifier  The identifier of the new backend type
+     * @param   string $className   The name of the class
      *
      * @return  $this
      */
@@ -844,8 +846,8 @@ class Module
     /**
      * Provide a user group backend
      *
-     * @param   string  $identifier     The identifier of the new backend type
-     * @param   string  $className      The name of the class
+     * @param   string $identifier  The identifier of the new backend type
+     * @param   string $className   The name of the class
      *
      * @return  $this
      */
@@ -856,7 +858,7 @@ class Module
     }
 
     /**
-     * Register new namespaces on the autoloader
+     * Register module namespaces on the autoloader
      *
      * @return $this
      */
@@ -897,7 +899,7 @@ class Module
     }
 
     /**
-     * return bool Whether this module has translations
+     * Get whether the module has translations
      */
     public function hasLocales()
     {
@@ -907,7 +909,7 @@ class Module
     /**
      * List all available locales
      *
-     * return array Locale list
+     * @return array Locale list
      */
     public function listLocales()
     {
@@ -954,10 +956,9 @@ class Module
     }
 
     /**
-     * Add routes for static content and any route added via addRoute() to the route chain
+     * Add routes for static content and any route added via {@link addRoute()} to the route chain
      *
-     * @return  $this
-     * @see     addRoute()
+     * @return $this
      */
     protected function registerRoutes()
     {
@@ -1006,14 +1007,14 @@ class Module
     /**
      * Include a php script if it is readable
      *
-     * @param string $file File to include
+     * @param   string $file File to include
      *
-     * @return $this
+     * @return  $this
      */
     protected function includeScript($file)
     {
-        if (file_exists($file) && is_readable($file) === true) {
-            include($file);
+        if (file_exists($file) && is_readable($file)) {
+            include $file;
         }
 
         return $this;
@@ -1021,29 +1022,27 @@ class Module
 
     /**
      * Run module config script
+     *
+     * @return $this
      */
     protected function launchConfigScript()
     {
         if ($this->triedToLaunchConfigScript) {
-            return;
+            return $this;
         }
         $this->triedToLaunchConfigScript = true;
-        if (! file_exists($this->configScript)
-         || ! is_readable($this->configScript)) {
-            return;
-        }
         $this->registerAutoloader();
-        include($this->configScript);
+        return $this->includeScript($this->configScript);
     }
 
     /**
      * Register hook
      *
-     * @param string $name
-     * @param string $class
-     * @param string $key
+     * @param   string $name
+     * @param   string $class
+     * @param   string $key
      *
-     * @return $this
+     * @return  $this
      */
     protected function registerHook($name, $class, $key = null)
     {
@@ -1072,12 +1071,8 @@ class Module
     }
 
     /**
-     * Translate a string with the global mt()
-     *
-     * @param $string
-     * @param null $context
-     *
-     * @return mixed|string
+     * (non-PHPDoc)
+     * @see Translator::translate() For the function documentation.
      */
     protected function translate($string, $context = null)
     {

From 8358e9165c49f7134feafeb5e3449ee9f464f04f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 24 Jul 2015 15:11:21 +0200
Subject: [PATCH 2623/2920] Don't require the module permission for the default
 module

refs #9644
---
 library/Icinga/Web/Controller/ModuleActionController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Controller/ModuleActionController.php b/library/Icinga/Web/Controller/ModuleActionController.php
index b6d2274eb..21a40900e 100644
--- a/library/Icinga/Web/Controller/ModuleActionController.php
+++ b/library/Icinga/Web/Controller/ModuleActionController.php
@@ -35,7 +35,9 @@ class ModuleActionController extends ActionController
         $this->_helper->layout()->moduleName = $this->moduleName;
         $this->view->translationDomain = $this->moduleName;
         $this->moduleInit();
-        $this->assertPermission(Manager::MODULE_PERMISSION_NS . $this->moduleName);
+        if ($this->getFrontController()->getDefaultModule() !== $this->moduleName) {
+            $this->assertPermission(Manager::MODULE_PERMISSION_NS . $this->moduleName);
+        }
     }
 
     /**

From 998610bafafc25f80cefa9c60dda67feb21d8587 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 24 Jul 2015 15:46:12 +0200
Subject: [PATCH 2624/2920] ProgramstatusQuery: Provide a(nother) fallback for
 older IDO installations

fixes #9168
---
 .../Monitoring/Backend/Ido/Query/ProgramstatusQuery.php        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
index d1e0b71b4..f84b41ca5 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ProgramstatusQuery.php
@@ -60,5 +60,8 @@ class ProgramstatusQuery extends IdoQuery
         if (version_compare($this->getIdoVersion(), '1.11.8', '<')) {
             $this->columnMap['programstatus']['program_version'] = '(NULL)';
         }
+        if (version_compare($this->getIdoVersion(), '1.8', '<')) {
+            $this->columnMap['programstatus']['disable_notif_expire_time'] = '(NULL)';
+        }
     }
 }

From c1a3d205bc5f6a1430c88bef8f94a38bbd9fa4bb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 24 Jul 2015 15:58:32 +0200
Subject: [PATCH 2625/2920] Show more details about unhandled exceptions in the
 CLI

fixes #9646
---
 library/Icinga/Cli/Loader.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Cli/Loader.php b/library/Icinga/Cli/Loader.php
index e6dcd9151..316a8062e 100644
--- a/library/Icinga/Cli/Loader.php
+++ b/library/Icinga/Cli/Loader.php
@@ -265,7 +265,14 @@ class Loader
             if ($obj && $obj instanceof Command && $obj->showTrace()) {
                 echo $this->formatTrace($e->getTrace());
             }
-            $this->fail($e->getMessage());
+
+            $this->fail(sprintf(
+                '%s in %s:%d with message: %s',
+                get_class($e),
+                $e->getFile(),
+                $e->getLine(),
+                $e->getMessage()
+            ));
         }
     }
 

From a51f0ad65e71d8ec5c1115947b897dd06f3df877 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 24 Jul 2015 16:13:08 +0200
Subject: [PATCH 2626/2920] Roles: Include permissions and restrictions of
 unloaded modules too

Because we now have module permissions it makes sense to allow an admin to configure permissions and restrictions from a module
before allowing access to it.

refs #9644
---
 application/forms/Security/RoleForm.php | 41 ++++++++++++-------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 19307262d..dba7ebe9f 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -71,28 +71,27 @@ class RoleForm extends ConfigForm
                 $moduleName,
                 $modulePermission
             );
-            if ($mm->hasEnabled($moduleName)) {
-                $module = $mm->getModule($moduleName);
-                foreach ($module->getProvidedPermissions() as $permission) {
-                    /** @var object $permission */
-                    $this->providedPermissions[$permission->name] = $permission->description
-                        . ' (' . $permission->name . ')';
-                }
-                foreach ($module->getProvidedRestrictions() as $restriction) {
-                    /** @var object $restriction */
-                    // Zend only permits alphanumerics, the underscore, the circumflex and any ASCII character in range
-                    // \x7f to \xff (127 to 255)
-                    $name = $helper->filterName($restriction->name);
-                    while (isset($this->providedRestrictions[$name])) {
-                        // Because Zend_Form_Element::filterName() replaces any not permitted character with the empty
-                        // string we may have duplicate names, e.g. 're/striction' and 'restriction'
-                        $name .= '_';
-                    }
-                    $this->providedRestrictions[$name] = array(
-                        'description' => $restriction->description,
-                        'name'        => $restriction->name
-                    );
+
+            $module = $mm->getModule($moduleName, false);
+            foreach ($module->getProvidedPermissions() as $permission) {
+                /** @var object $permission */
+                $this->providedPermissions[$permission->name] = $permission->description
+                    . ' (' . $permission->name . ')';
+            }
+            foreach ($module->getProvidedRestrictions() as $restriction) {
+                /** @var object $restriction */
+                // Zend only permits alphanumerics, the underscore, the circumflex and any ASCII character in range
+                // \x7f to \xff (127 to 255)
+                $name = $helper->filterName($restriction->name);
+                while (isset($this->providedRestrictions[$name])) {
+                    // Because Zend_Form_Element::filterName() replaces any not permitted character with the empty
+                    // string we may have duplicate names, e.g. 're/striction' and 'restriction'
+                    $name .= '_';
                 }
+                $this->providedRestrictions[$name] = array(
+                    'description' => $restriction->description,
+                    'name'        => $restriction->name
+                );
             }
         }
     }

From 982e226db0b095801c5822e6c9b13a337cde1d3e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 24 Jul 2015 16:19:20 +0200
Subject: [PATCH 2627/2920] IcingaException: Add utility method to format
 exceptions as one-liner

---
 library/Icinga/Application/Logger.php        |  9 ++-------
 library/Icinga/Cli/Loader.php                |  9 ++-------
 library/Icinga/Exception/IcingaException.php | 20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/library/Icinga/Application/Logger.php b/library/Icinga/Application/Logger.php
index 26241b3d5..aa03b49fc 100644
--- a/library/Icinga/Application/Logger.php
+++ b/library/Icinga/Application/Logger.php
@@ -8,6 +8,7 @@ use Icinga\Data\ConfigObject;
 use Icinga\Application\Logger\Writer\FileWriter;
 use Icinga\Application\Logger\Writer\SyslogWriter;
 use Icinga\Exception\ConfigurationError;
+use Icinga\Exception\IcingaException;
 
 /**
  * Logger
@@ -226,13 +227,7 @@ class Logger
                 $messages = array();
                 $error = $message;
                 do {
-                    $messages[] = sprintf(
-                        '%s in %s:%d with message: %s',
-                        get_class($error),
-                        $error->getFile(),
-                        $error->getLine(),
-                        $error->getMessage()
-                    );
+                    $messages[] = IcingaException::describe($error);
                 } while ($error = $error->getPrevious());
                 $message = implode(' <- ', $messages);
             }
diff --git a/library/Icinga/Cli/Loader.php b/library/Icinga/Cli/Loader.php
index 316a8062e..debf52be9 100644
--- a/library/Icinga/Cli/Loader.php
+++ b/library/Icinga/Cli/Loader.php
@@ -4,6 +4,7 @@
 namespace Icinga\Cli;
 
 use Icinga\Application\ApplicationBootstrap as App;
+use Icinga\Exception\IcingaException;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Cli\Params;
 use Icinga\Cli\Screen;
@@ -266,13 +267,7 @@ class Loader
                 echo $this->formatTrace($e->getTrace());
             }
 
-            $this->fail(sprintf(
-                '%s in %s:%d with message: %s',
-                get_class($e),
-                $e->getFile(),
-                $e->getLine(),
-                $e->getMessage()
-            ));
+            $this->fail(IcingaException::describe($e));
         }
     }
 
diff --git a/library/Icinga/Exception/IcingaException.php b/library/Icinga/Exception/IcingaException.php
index ab6591b01..bdc6833a3 100644
--- a/library/Icinga/Exception/IcingaException.php
+++ b/library/Icinga/Exception/IcingaException.php
@@ -25,4 +25,24 @@ class IcingaException extends Exception
         }
         parent::__construct(vsprintf($message, $args), 0, $exc);
     }
+
+    /**
+     * Return the given exception formatted as one-liner
+     *
+     * The format used is: %class% in %path%:%line% with message: %message%
+     *
+     * @param   Exception   $exception
+     *
+     * @return  string
+     */
+    public static function describe(Exception $exception)
+    {
+        return sprintf(
+            '%s in %s:%d with message: %s',
+            get_class($exception),
+            $exception->getFile(),
+            $exception->getLine(),
+            $exception->getMessage()
+        );
+    }
 }

From 86ad6c48ffc83002c04a7c64fad84e7e7e70e1c8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 27 Jul 2015 08:52:33 +0200
Subject: [PATCH 2628/2920] Form: Automatically remove query parameters only
 for GET forms

refs #9421
---
 application/controllers/ConfigController.php  |  1 -
 .../UsergroupbackendController.php            |  1 -
 library/Icinga/Web/Form.php                   | 28 +++++++++++--------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index e9fbbd7ef..543a84217 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -250,7 +250,6 @@ class ConfigController extends Controller
         $backendName = $this->params->getRequired('backend');
 
         $form = new UserBackendConfigForm();
-        $form->setAction(Url::fromRequest());
         $form->setRedirectUrl('config/userbackend');
         $form->setTitle(sprintf($this->translate('Edit User Backend %s'), $backendName));
         $form->setIniConfig(Config::app('authentication'));
diff --git a/application/controllers/UsergroupbackendController.php b/application/controllers/UsergroupbackendController.php
index 961c72132..4c641586c 100644
--- a/application/controllers/UsergroupbackendController.php
+++ b/application/controllers/UsergroupbackendController.php
@@ -78,7 +78,6 @@ class UsergroupbackendController extends Controller
         $backendName = $this->params->getRequired('backend');
 
         $form = new UserGroupBackendForm();
-        $form->setAction(Url::fromRequest());
         $form->setRedirectUrl('usergroupbackend/list');
         $form->setTitle(sprintf($this->translate('Edit User Group Backend %s'), $backendName));
         $form->setIniConfig(Config::app('groups'));
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index dc3eaf1cc..46c661405 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -292,9 +292,11 @@ class Form extends Zend_Form
     public function getRedirectUrl()
     {
         if ($this->redirectUrl === null) {
-            $url = $this->getRequest()->getUrl();
-            // Be sure to remove all form dependent params because we do not want to submit it again
-            $this->redirectUrl = $url->without(array_keys($this->getElements()));
+            $this->redirectUrl = $this->getRequest()->getUrl();
+            if ($this->getMethod() === 'get') {
+                // Be sure to remove all form dependent params because we do not want to submit it again
+                $this->redirectUrl = $this->redirectUrl->without(array_keys($this->getElements()));
+            }
         }
 
         return $this->redirectUrl;
@@ -658,22 +660,26 @@ class Form extends Zend_Form
      */
     public function create(array $formData = array())
     {
-        if (false === $this->created) {
+        if (! $this->created) {
             $this->createElements($formData);
             $this->addFormIdentification()
                 ->addCsrfCounterMeasure()
                 ->addSubmitButton();
 
+            // Use Form::getAttrib() instead of Form::getAction() here because we want to explicitly check against
+            // null. Form::getAction() would return the empty string '' if the action is not set.
+            // For not setting the action attribute use Form::setAction(''). This is required for for the
+            // accessibility's enable/disable auto-refresh mechanic
             if ($this->getAttrib('action') === null) {
-                // Use Form::getAttrib() instead of Form::getAction() here because we want to explicitly check against
-                // null. Form::getAction() would return the empty string '' if the action is not set.
-                // For not setting the action attribute use Form::setAction(''). This is required for for the
-                // accessibility's enable/disable auto-refresh mechanic
+                $action = $this->getRequest()->getUrl();
+                if ($this->getMethod() === 'get') {
+                    $action = $action->without(array_keys($this->getElements()));
+                }
 
                 // TODO(el): Re-evalute this necessity. JavaScript could use the container's URL if there's no action set.
                 // We MUST set an action as JS gets confused otherwise, if
                 // this form is being displayed in an additional column
-                $this->setAction($this->getRequest()->getUrl()->without(array_keys($this->getElements())));
+                $this->setAction($action);
             }
 
             $this->created = true;
@@ -920,7 +926,7 @@ class Form extends Zend_Form
      */
     public function addFormIdentification()
     {
-        if (false === $this->uidDisabled && $this->getElement($this->uidElementName) === null) {
+        if (! $this->uidDisabled && $this->getElement($this->uidElementName) === null) {
             $this->addElement(
                 'hidden',
                 $this->uidElementName,
@@ -942,7 +948,7 @@ class Form extends Zend_Form
      */
     public function addCsrfCounterMeasure()
     {
-        if (false === $this->tokenDisabled && $this->getElement($this->tokenElementName) === null) {
+        if (! $this->tokenDisabled && $this->getElement($this->tokenElementName) === null) {
             $this->addElement(new CsrfCounterMeasure($this->tokenElementName));
         }
 

From a14da1c55849ae642f263a55639a8ae3e3d37187 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 21 Jul 2015 14:01:31 +0200
Subject: [PATCH 2629/2920] Make sure to log inspection messages into message
 log too

refs #9641
---
 library/Icinga/Data/Inspection.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Data/Inspection.php b/library/Icinga/Data/Inspection.php
index eea91617e..f06c73135 100644
--- a/library/Icinga/Data/Inspection.php
+++ b/library/Icinga/Data/Inspection.php
@@ -59,6 +59,7 @@ class Inspection
         if ($entry instanceof Inspection) {
             $this->log[$entry->description] = $entry->toArray();
         } else {
+            Logger::debug($entry);
             $this->log[] = $entry;
         }
     }
@@ -77,7 +78,8 @@ class Inspection
         if (isset($this->error)) {
             throw new ProgrammingError('Inspection object used after error');
         }
-        $this->write($entry);
+        Logger::error($entry);
+        $this->log[] = $entry;
         $this->error = $entry;
         return $this;
     }

From f2d253f508850c3f87ed7999d381ec2eeb7fa15e Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 27 Jul 2015 10:34:17 +0200
Subject: [PATCH 2630/2920] Assure that rows are refreshed correctly on reload

Assure that all links are initialized when the selection is applied after a request. Move action table code into the actiontable behavior.

refs #8623
---
 public/js/icinga/behavior/actiontable.js | 14 ++++++++++++++
 public/js/icinga/events.js               | 14 --------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/public/js/icinga/behavior/actiontable.js b/public/js/icinga/behavior/actiontable.js
index d3df54614..6f6521314 100644
--- a/public/js/icinga/behavior/actiontable.js
+++ b/public/js/icinga/behavior/actiontable.js
@@ -381,6 +381,20 @@
         var container = evt.target;
         var self = evt.data.self;
 
+        // Set first links href in a action table tr as row href:
+        $('table.action tr', container).each(function(idx, el) {
+            var $a = $('a[href].rowaction', el).first();
+            if ($a.length) {
+                // TODO: Find out whether we leak memory on IE with this:
+                $(el).attr('href', $a.attr('href'));
+                return;
+            }
+            $a = $('a[href]', el).first();
+            if ($a.length) {
+                $(el).attr('href', $a.attr('href'));
+            }
+        });
+
         // draw all selections
         self.tables().each(function(i, el) {
             new Selection(el, self.icinga).refresh();
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 000ecf103..9d4e80b15 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -40,20 +40,6 @@
                 icinga.loader.loadUrl(url, $(el)).autorefresh = true;
             });
 
-            // Set first links href in a action table tr as row href:
-            $('table.action tr', el).each(function(idx, el) {
-                var $a = $('a[href].rowaction', el).first();
-                if ($a.length) {
-                    // TODO: Find out whether we leak memory on IE with this:
-                    $(el).attr('href', $a.attr('href'));
-                    return;
-                }
-                $a = $('a[href]', el).first();
-                if ($a.length) {
-                    $(el).attr('href', $a.attr('href'));
-                }
-            });
-
             $('td.state span.timesince').attr('title', null);
 
             var moduleName = el.data('icingaModule');

From ec5bebea95ce46842b6436355f7dd6e987940020 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 27 Jul 2015 11:30:44 +0200
Subject: [PATCH 2631/2920] doc/installation: Add upgrading note about module
 permissions

refs #9644
---
 doc/installation.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/installation.md b/doc/installation.md
index 708d45935..83939b143 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -290,3 +290,9 @@ The first release candidate of Icinga Web 2 introduces the following non-backwar
 the [EPEL repository](http://fedoraproject.org/wiki/EPEL). Before, Zend was installed as Icinga Web 2 vendor library
 through the package `icingaweb2-vendor-zend`. After upgrading, please make sure to remove the package
 `icingaweb2-vendor-zend`.
+
+* Icinga Web 2 version 2.0.0 requires permissions for accessing modules. Those permissions are automatically generated
+for each installed module in the format `module/<moduleName>`. Administrators have to grant the module permissions to
+users and/or user groups in the roles configuration for permitting access to specific modules.
+In addition, restrictions provided by modules are now configurable for each installed module too. Before,
+a module had to be enabled before having the possibility to configure restrictions.

From 4ab457a0623822bc314173165703401184ef4167 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 27 Jul 2015 11:40:36 +0200
Subject: [PATCH 2632/2920] css: Introduce rules to hide non-js elements if js
 is enabled and vice versa

---
 public/css/icinga/layout-structure.less | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 3f9d4858e..47adbca7c 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -405,3 +405,13 @@ html {
   padding-top: 0em;
   font-size: 0.9em;
 }
+
+// Hide non-javascript elements if javascript is enabled
+html.js *.no-js {
+  .sr-only;
+}
+
+// Hide javascript elements if javascript is disabled
+html.no-js *.js {
+  .sr-only;
+}
\ No newline at end of file

From 4d9aa54814616c455de849e5013ca4b8ffbe7c4f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 27 Jul 2015 11:43:47 +0200
Subject: [PATCH 2633/2920] SortBox: Utilize a separate form for each control

refs #9421
---
 library/Icinga/Web/Controller.php     | 10 +++---
 library/Icinga/Web/Widget/SortBox.php | 47 +++++++++++++++++----------
 public/css/icinga/controls.less       | 10 ++++--
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index a8d0545cf..86ef520c9 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -37,13 +37,13 @@ class Controller extends ModuleActionController
             return;
         }
 
-        if (($sort = $request->getPost('sort'))) {
+        if (($sort = $request->getPost('sort')) || ($direction = $request->getPost('dir'))) {
             $url = Url::fromRequest();
-            $url->setParam('sort', $sort);
-            if (($dir = $request->getPost('dir'))) {
-                $url->setParam('dir', $dir);
+            if ($sort) {
+                $url->setParam('sort', $sort);
+                $url->remove('dir');
             } else {
-                $url->removeParam('dir');
+                $url->setParam('dir', $direction);
             }
 
             $this->redirectNow($url);
diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 022efdf32..fa80b6c3e 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -127,43 +127,56 @@ class SortBox extends AbstractWidget
      */
     public function render()
     {
-        $form = new Form();
-        $form->setTokenDisabled();
-        $form->setName($this->name);
-        $form->setAttrib('class', 'sort-control inline');
-
-        $form->addElement(
+        $columnForm = new Form();
+        $columnForm->setTokenDisabled();
+        $columnForm->setName($this->name . '-column');
+        $columnForm->setAttrib('class', 'inline');
+        $columnForm->addElement(
             'select',
             'sort',
             array(
                 'autosubmit'    => true,
                 'label'         => $this->view()->translate('Sort by'),
-                'multiOptions'  => $this->sortFields
+                'multiOptions'  => $this->sortFields,
+                'decorators'    => array(
+                    array('ViewHelper'),
+                    array('Label')
+                )
             )
         );
-        $form->getElement('sort')->setDecorators(array(
-            array('ViewHelper'),
-            array('Label')
-        ));
-        $form->addElement(
+
+        $orderForm = new Form();
+        $orderForm->setTokenDisabled();
+        $orderForm->setName($this->name . '-order');
+        $orderForm->setAttrib('class', 'inline');
+        $orderForm->addElement(
             'select',
             'dir',
             array(
                 'autosubmit'    => true,
+                'label'         => $this->view()->translate('Direction', 'sort direction'),
                 'multiOptions'  => array(
-                    'asc'       => 'Asc',
-                    'desc'      => 'Desc',
+                    'asc'       => $this->view()->translate('Ascending', 'sort direction'),
+                    'desc'      => $this->view()->translate('Descending', 'sort direction')
                 ),
                 'decorators'    => array(
-                    array('ViewHelper')
+                    array('ViewHelper'),
+                    array('Label', array('class' => 'no-js'))
                 )
             )
         );
 
         if ($this->request) {
-            $form->populate($this->request->getParams());
+            $url = $this->request->getUrl();
+            if ($url->hasParam('sort')) {
+                $columnForm->populate(array('sort' => $url->getParam('sort')));
+            }
+
+            if ($url->hasParam('dir')) {
+                $orderForm->populate(array('dir' => $url->getParam('dir')));
+            }
         }
 
-        return $form;
+        return '<div class="sort-control">' . $columnForm . $orderForm . '</div>';
     }
 }
diff --git a/public/css/icinga/controls.less b/public/css/icinga/controls.less
index b8e82b795..06178146b 100644
--- a/public/css/icinga/controls.less
+++ b/public/css/icinga/controls.less
@@ -1,6 +1,6 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-form.sort-control {
+div.sort-control {
   .dontprint;
   float: right;
 
@@ -15,7 +15,13 @@ form.sort-control {
   }
 
   select[name=dir] {
-    width: 5em;
+    width: 8em;
     margin-left: 0;
   }
 }
+
+html.no-js div.sort-control form {
+  display: table;
+  margin-left: auto;
+  margin-top: 0.25em;
+}

From de29d6600533b3e4a9c9f68459cbdc8644a0c33e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 27 Jul 2015 15:07:43 +0200
Subject: [PATCH 2634/2920] doc/security: Add note about module permissions

refs #9644
---
 doc/security.md | 58 ++++++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/doc/security.md b/doc/security.md
index 5e9293e44..3b8731a7d 100644
--- a/doc/security.md
+++ b/doc/security.md
@@ -3,9 +3,9 @@
 Access control is a vital part of configuring Icinga Web 2 in a secure way.
 It is important that not every user that has access to Icinga Web 2 is able
 to do any action or to see any host and service. For example, it is useful to allow
-only a small group of administrators to change the Icinga Web 2 configuration, 
-to prevent misconfiguration or security breaches. Another important use case is 
-creating groups of users which can only see the fraction of the monitoring 
+only a small group of administrators to change the Icinga Web 2 configuration,
+to prevent misconfiguration or security breaches. Another important use case is
+creating groups of users which can only see the fraction of the monitoring
 environment they are in charge of.
 
 This chapter will describe how to do the security configuration of Icinga Web 2
@@ -13,16 +13,16 @@ and how to apply permissions and restrictions to users or groups of users.
 
 ## Basics
 
-Icinga Web 2 access control is done by defining **roles** that associate permissions 
-and restrictions with **users** and **groups**. There are two general kinds of 
+Icinga Web 2 access control is done by defining **roles** that associate permissions
+and restrictions with **users** and **groups**. There are two general kinds of
 things to which access can be managed: actions and objects.
 
 
 ### Actions
 
 Actions are all the things an Icinga Web 2 user can do, like changing a certain configuration,
-changing permissions or sending a command to the Icinga instance through the 
-<a href="http://docs.icinga.org/icinga2/latest/doc/module/icinga2/toc#!/icinga2/latest/doc/module/icinga2/chapter/getting-started#setting-up-external-command-pipe">Command Pipe</a> 
+changing permissions or sending a command to the Icinga instance through the
+<a href="http://docs.icinga.org/icinga2/latest/doc/module/icinga2/toc#!/icinga2/latest/doc/module/icinga2/chapter/getting-started#setting-up-external-command-pipe">Command Pipe</a>
 in the monitoring module. All actions must be be **allowed explicitly** using permissions.
 
 A permission is a simple list of identifiers of actions a user is
@@ -43,7 +43,7 @@ in greater detail in the section [Restrictions](#restrictions).
 Anyone who can **login** to Icinga Web 2 is considered a user and can be referenced to by the
 **user name** used during login.
 For example, there might be user called **jdoe** authenticated
-using Active Directory, and a user **icingaadmin** that is authenticated using a MySQL-Database as backend. 
+using Active Directory, and a user **icingaadmin** that is authenticated using a MySQL-Database as backend.
 In the configuration, both can be referenced to by using their user names **icingaadmin** or **jdoe**.
 
 Icinga Web 2 users and groups are not configured by a configuration file, but provided by
@@ -87,7 +87,7 @@ users have access to all configuration options, or another role **support**
 could define that a list of users or groups is restricted to see only hosts and services
 that match a specific query.
 
-The actual permission of a certain user will be determined by merging the permissions 
+The actual permission of a certain user will be determined by merging the permissions
 and restrictions of the user itself and all the groups the user is member of. Permissions can
 be simply added up, while restrictions follow a slighty more complex pattern, that is described
 in the section [Stacking Filters](#stacking-filters).
@@ -126,12 +126,12 @@ Each role is defined as a section, with the name of the role as section name. Th
 attributes can be defined for each role in a default Icinga Web 2 installation:
 
 
- Directive                 | Description                                                                     
+ Directive                 | Description
 ---------------------------|-----------------------------------------------------------------------------
- users                     | A comma-separated list of user **user names** that are affected by this role    
- groups                    | A comma-separated list of **group names** that are affected by this role        
- permissions               | A comma-separated list of **permissions** granted by this role                  
- monitoring/filter/objects | A **filter expression** that restricts the access to services and hosts         
+ users                     | A comma-separated list of user **user names** that are affected by this role
+ groups                    | A comma-separated list of **group names** that are affected by this role
+ permissions               | A comma-separated list of **permissions** granted by this role
+ monitoring/filter/objects | A **filter expression** that restricts the access to services and hosts
 
 
 
@@ -149,35 +149,39 @@ are in the namespace `config/modules`
 The permission `config/*` would grant permission to all configuration actions,
 while just specifying a wildcard `*` would give permission for all actions.
 
+Access to modules is restricted to users who have the related module permission granted. Icinga Web 2 provides
+a module permission in the format `module/<moduleName>` for each installed module.
+
 When multiple roles assign permissions to the same user (either directly or indirectly
-through a group) all permissions can simply be added together to get the users actual permission set.
+through a group) all permissions are added together to get the users actual permission set.
 
-#### Global permissions
+### Global Permissions
 
- Name                                | Permits                                                         
--------------------------------------|-----------------------------------------------------------------
- *                                   | Allow everything, including module-specific permissions         
- config/*                            | Allow all configuration actions                                 
- config/modules                      | Allow enabling or disabling modules  
+Name                | Permits
+--------------- ----|--------------------------------------------------------
+*                   | Allow everything, including module-specific permissions
+config/*            | Allow all configuration actions
+config/modules      | Allow enabling or disabling modules
+module/<moduleName> | Allow access to module <moduleName>
 
 
-#### Monitoring module permissions
+### Monitoring Module Permissions
 
 The built-in monitoring module defines an additional set of permissions, that
-is described in detail in [monitoring module documentation](/icingaweb2/doc/module/doc/chapter/monitoring-security#monitoring-security).
+is described in detail in the [monitoring module documentation](/icingaweb2/doc/module/doc/chapter/monitoring-security#monitoring-security).
 
 
 ## <a id="restrictions"></a> Restrictions
 
 Restrictions can be used to define what a user or group can see by specifying
-a filter expression that applies to a defined set of data. By default, when no 
-restrictions are defined, a user will be able to see every information that is available. 
+a filter expression that applies to a defined set of data. By default, when no
+restrictions are defined, a user will be able to see every information that is available.
 
 A restrictions is always specified for a certain **filter directive**, that defines what
 data the filter is applied to. The **filter directive** is a simple identifier, that was
 defined in an Icinga Web 2 module. The only filter directive that is available
 in a default installation, is the `monitoring/filter/objects` directive, defined by the monitoring module,
-that can be used to apply filter to hosts and services. This directive was previously 
+that can be used to apply filter to hosts and services. This directive was previously
 mentioned in the section [Syntax](#syntax).
 
 ### Filter Expressions
@@ -251,7 +255,7 @@ Notice that because of the behavior of two stacking filters, a user that is memb
 #### Example 2: Hostgroups
 
     [unix-server]
-    groups = "unix-admins"  
+    groups = "unix-admins"
     monitoring/filter/objects = "(hostgroup_name=bsd-servers|hostgroup_name=linux-servers)"
 
 This role allows all members of the group unix-admins to see hosts and services

From 07fb82357bbd47ee865dcf1e535af0a37f16c0ef Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 27 Jul 2015 15:19:32 +0200
Subject: [PATCH 2635/2920] doc: Make documentation for all installed modules
 avaiable

Before, only documentation of enabled modules was available.

refs #9644
---
 .../controllers/ModuleController.php          | 32 ++++++++-----------
 .../views/scripts/index/index.phtml           |  2 +-
 .../views/scripts/module/index.phtml          |  2 +-
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php
index eb9f4dcf1..3210de3f6 100644
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@@ -49,24 +49,24 @@ class Doc_ModuleController extends DocController
     {
         $moduleManager = Icinga::app()->getModuleManager();
         $modules = array();
-        foreach ($moduleManager->listEnabledModules() as $module) {
+        foreach ($moduleManager->listInstalledModules() as $module) {
             $path = $this->getPath($module, $moduleManager->getModuleDir($module, '/doc'), true);
             if ($path !== null) {
-                $modules[] = $moduleManager->getModule($module);
+                $modules[] = $moduleManager->getModule($module, false);
             }
         }
         $this->view->modules = $modules;
     }
 
     /**
-     * Assert that the given module is enabled
+     * Assert that the given module is installed
      *
-     * @param   $moduleName
+     * @param   string $moduleName
      *
-     * @throws  Zend_Controller_Action_Exception    If the required parameter 'moduleName' is empty or either if the
-     *                                              given module is neither installed nor enabled
+     * @throws  Zend_Controller_Action_Exception    If the required parameter 'moduleName' is empty or if the
+     *                                              given module is not installed
      */
-    protected function assertModuleEnabled($moduleName)
+    protected function assertModuleInstalled($moduleName)
     {
         if (empty($moduleName)) {
             throw new Zend_Controller_Action_Exception(
@@ -81,23 +81,17 @@ class Doc_ModuleController extends DocController
                 404
             );
         }
-        if (! $moduleManager->hasEnabled($moduleName)) {
-            throw new Zend_Controller_Action_Exception(
-                sprintf($this->translate('Module \'%s\' is not enabled'), $moduleName),
-                404
-            );
-        }
     }
 
     /**
      * View the toc of a module's documentation
      *
-     * @see assertModuleEnabled()
+     * @see assertModuleInstalled()
      */
     public function tocAction()
     {
         $module = $this->getParam('moduleName');
-        $this->assertModuleEnabled($module);
+        $this->assertModuleInstalled($module);
         $this->view->moduleName = $module;
         try {
             $this->renderToc(
@@ -116,12 +110,12 @@ class Doc_ModuleController extends DocController
      *
      * @throws  Zend_Controller_Action_Exception    If the required parameter 'chapterId' is missing or if an error in
      *                                              the documentation module's library occurs
-     * @see     assertModuleEnabled()
+     * @see     assertModuleInstalled()
      */
     public function chapterAction()
     {
         $module = $this->getParam('moduleName');
-        $this->assertModuleEnabled($module);
+        $this->assertModuleInstalled($module);
         $chapter = $this->getParam('chapter');
         if ($chapter === null) {
             throw new Zend_Controller_Action_Exception(
@@ -145,12 +139,12 @@ class Doc_ModuleController extends DocController
     /**
      * View a module's documentation as PDF
      *
-     * @see assertModuleEnabled()
+     * @see assertModuleInstalled()
      */
     public function pdfAction()
     {
         $module = $this->getParam('moduleName');
-        $this->assertModuleEnabled($module);
+        $this->assertModuleInstalled($module);
         $this->renderPdf(
             $this->getPath($module, Icinga::app()->getModuleManager()->getModuleDir($module, '/doc')),
             $module,
diff --git a/modules/doc/application/views/scripts/index/index.phtml b/modules/doc/application/views/scripts/index/index.phtml
index 67ee52ac1..af9ff087a 100644
--- a/modules/doc/application/views/scripts/index/index.phtml
+++ b/modules/doc/application/views/scripts/index/index.phtml
@@ -14,7 +14,7 @@
             $this->translate('Module documentations'),
             'doc/module/',
             null,
-            array('title' => $this->translate('List all modifications for which documentation is available'))
+            array('title' => $this->translate('List all modules for which documentation is available'))
         ); ?></li>
     </ul>
 </div>
diff --git a/modules/doc/application/views/scripts/module/index.phtml b/modules/doc/application/views/scripts/module/index.phtml
index a4d9276cc..d80e05cb3 100644
--- a/modules/doc/application/views/scripts/module/index.phtml
+++ b/modules/doc/application/views/scripts/module/index.phtml
@@ -4,7 +4,7 @@
 </div>
 <div class="content">
     <ul>
-    <?php foreach ($modules as $module): ?>
+    <?php foreach ($modules as $module): /** @var \Icinga\Application\Modules\Module $module */ ?>
         <li><?= $this->qlink(
             $module->getTitle(),
             'doc/module/toc',

From 2c8235d4869e99e458732989b9f3f2c4e8a0547f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 27 Jul 2015 16:25:41 +0200
Subject: [PATCH 2636/2920] lib: Introduce IcingaException::create()

refs #9644
---
 library/Icinga/Exception/IcingaException.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/library/Icinga/Exception/IcingaException.php b/library/Icinga/Exception/IcingaException.php
index ab6591b01..62c7942be 100644
--- a/library/Icinga/Exception/IcingaException.php
+++ b/library/Icinga/Exception/IcingaException.php
@@ -4,6 +4,7 @@
 namespace Icinga\Exception;
 
 use Exception;
+use ReflectionClass;
 
 class IcingaException extends Exception
 {
@@ -25,4 +26,17 @@ class IcingaException extends Exception
         }
         parent::__construct(vsprintf($message, $args), 0, $exc);
     }
+
+    /**
+     * Create the exception from an array of arguments
+     *
+     * @param   array   $args
+     *
+     * @return  static
+     */
+    public static function create(array $args)
+    {
+        $e = new ReflectionClass(get_called_class());
+        return $e->newInstanceArgs($args);
+    }
 }

From 78285b95a3bf530594221d7f06115b01a5ba5da1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 10:40:02 +0200
Subject: [PATCH 2637/2920] Make Controller::httpNotFound() variadic

refs #9644
---
 library/Icinga/Web/Controller.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index a8d0545cf..2b114e9c2 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -53,13 +53,14 @@ class Controller extends ModuleActionController
     /**
      * Immediately respond w/ HTTP 404
      *
-     * @param   $message
+     * @param   string  $message    Exception message or exception format string
+     * @param   mixed   ...$arg     Format string argument
      *
      * @throws  HttpNotFoundException
      */
     public function httpNotFound($message)
     {
-        throw new HttpNotFoundException($message);
+        throw HttpNotFoundException::create(func_get_args());
     }
 
     /**

From a68c05da7f0832afb4329fc4326d10274fb09794 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 10:43:17 +0200
Subject: [PATCH 2638/2920] lib: Require a message when throwing
 IcingaExceptions

refs #9644
---
 library/Icinga/Exception/IcingaException.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Exception/IcingaException.php b/library/Icinga/Exception/IcingaException.php
index 62c7942be..a3ccec3f4 100644
--- a/library/Icinga/Exception/IcingaException.php
+++ b/library/Icinga/Exception/IcingaException.php
@@ -15,7 +15,7 @@ class IcingaException extends Exception
      *
      * If there is at least one exception, the last one will be also used for the exception chaining.
      */
-    public function __construct($message = '')
+    public function __construct($message)
     {
         $args = array_slice(func_get_args(), 1);
         $exc = null;

From b84650dd4b8b3ff63dbed8d38c64b26cbafa0a80 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 10:45:00 +0200
Subject: [PATCH 2639/2920] Document variadic function
 IcingaException::__construct properly

refs #9644
---
 library/Icinga/Exception/IcingaException.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Exception/IcingaException.php b/library/Icinga/Exception/IcingaException.php
index a3ccec3f4..e0c954f31 100644
--- a/library/Icinga/Exception/IcingaException.php
+++ b/library/Icinga/Exception/IcingaException.php
@@ -9,11 +9,12 @@ use ReflectionClass;
 class IcingaException extends Exception
 {
     /**
-     * @param string $message   format string for vsprintf()
-     * Any futher args:         args for vsprintf()
-     * @see vsprintf
+     * Create a new exception
      *
-     * If there is at least one exception, the last one will be also used for the exception chaining.
+     * @param   string  $message    Exception message or exception format string
+     * @param   mixed   ...$arg     Format string argument
+     *
+     * If there is at least one exception, the last one will be used for exception chaining.
      */
     public function __construct($message)
     {

From b36b44702316e23d8831a535a12d146c9dde05bc Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 11:33:33 +0200
Subject: [PATCH 2640/2920] Use Controller::httpNotFound() in
 applicationlog/list

refs #9449
---
 application/controllers/ListController.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index 5e937d91b..9a20755c9 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -1,15 +1,14 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use Icinga\Web\Controller;
-use Icinga\Web\Url;
-use Icinga\Web\Widget\Tabextension\DashboardAction;
-use Icinga\Web\Widget\Tabextension\OutputFormat;
 use Icinga\Application\Config;
 use Icinga\Application\Logger;
 use Icinga\Data\ConfigObject;
 use Icinga\Protocol\File\FileReader;
-use \Zend_Controller_Action_Exception as ActionError;
+use Icinga\Web\Controller;
+use Icinga\Web\Url;
+use Icinga\Web\Widget\Tabextension\DashboardAction;
+use Icinga\Web\Widget\Tabextension\OutputFormat;
 
 /**
  * Class ListController
@@ -40,7 +39,7 @@ class ListController extends Controller
     public function applicationlogAction()
     {
         if (! Logger::writesToFile()) {
-            throw new ActionError('Site not found', 404);
+            $this->httpNotFound('Page not found');
         }
 
         $this->addTitleTab('application log');

From cdc218243015cd613aab7d065702037f324ff4a8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 28 Jul 2015 11:40:27 +0200
Subject: [PATCH 2641/2920] Introduce interface SortRules

refs #6644
---
 library/Icinga/Data/SortRules.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 library/Icinga/Data/SortRules.php

diff --git a/library/Icinga/Data/SortRules.php b/library/Icinga/Data/SortRules.php
new file mode 100644
index 000000000..cba77fe0b
--- /dev/null
+++ b/library/Icinga/Data/SortRules.php
@@ -0,0 +1,14 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Data;
+
+interface SortRules
+{
+    /**
+     * Return some sort rules
+     *
+     * @return  array
+     */
+    public function getSortRules();
+}

From 05af310e4c7fc8afc38d248a98a9ff41c570e1d8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 28 Jul 2015 11:41:07 +0200
Subject: [PATCH 2642/2920] RepositoryQuery: Implement interface SortRules

refs #6644
---
 library/Icinga/Repository/RepositoryQuery.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index 1ca5b6703..8b5727164 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -9,12 +9,13 @@ use Icinga\Application\Benchmark;
 use Icinga\Application\Logger;
 use Icinga\Data\QueryInterface;
 use Icinga\Data\Filter\Filter;
+use Icinga\Data\SortRules;
 use Icinga\Exception\QueryException;
 
 /**
  * Query class supposed to mediate between a repository and its datasource's query
  */
-class RepositoryQuery implements QueryInterface, Iterator
+class RepositoryQuery implements QueryInterface, SortRules, Iterator
 {
     /**
      * The repository being used
@@ -212,6 +213,16 @@ class RepositoryQuery implements QueryInterface, Iterator
         return $this->query->getFilter();
     }
 
+    /**
+     * Return the sort rules being applied on this query
+     *
+     * @return  array
+     */
+    public function getSortRules()
+    {
+        return $this->repository->getSortRules();
+    }
+
     /**
      * Add a sort rule for this query
      *
@@ -226,7 +237,7 @@ class RepositoryQuery implements QueryInterface, Iterator
      */
     public function order($field = null, $direction = null, $ignoreDefault = false)
     {
-        $sortRules = $this->repository->getSortRules();
+        $sortRules = $this->getSortRules();
         if ($field === null) {
             // Use first available sort rule as default
             if (empty($sortRules)) {

From 1f6bc8ea4750c5e8a42ea258e42c3700e3a0675c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 28 Jul 2015 11:41:25 +0200
Subject: [PATCH 2643/2920] DataView: Implement interface SortRules

refs #6644
---
 modules/monitoring/library/Monitoring/DataView/DataView.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 0f892f42c..6a2b8a226 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -5,6 +5,7 @@ namespace Icinga\Module\Monitoring\DataView;
 
 use IteratorAggregate;
 use Icinga\Data\QueryInterface;
+use Icinga\Data\SortRules;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Filter\FilterMatch;
 use Icinga\Data\PivotTable;
@@ -18,7 +19,7 @@ use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 /**
  * A read-only view of an underlying query
  */
-abstract class DataView implements QueryInterface, IteratorAggregate
+abstract class DataView implements QueryInterface, SortRules, IteratorAggregate
 {
     /**
      * The query used to populate the view

From d0dd4b09a0d758b62ff2d896047177e3b1b2a234 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 28 Jul 2015 11:42:13 +0200
Subject: [PATCH 2644/2920] Repository: It's "sort rules" in general, not
 "default sort rules"

---
 library/Icinga/Repository/Repository.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index 4c6a0270b..7ca12a43d 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -78,7 +78,7 @@ abstract class Repository implements Selectable
     protected $filterColumns;
 
     /**
-     * The default sort rules to be applied on a query
+     * The sort rules to be applied on a query
      *
      * This may be initialized by concrete repository implementations, in the following format
      * <pre><code>
@@ -284,7 +284,7 @@ abstract class Repository implements Selectable
     }
 
     /**
-     * Return the default sort rules to be applied on a query
+     * Return the sort rules to be applied on a query
      *
      * Calls $this->initializeSortRules() in case $this->sortRules is null.
      *

From 247c0f3952dd43b6c21b7085aa2a7ce9e3352dd3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 28 Jul 2015 11:42:40 +0200
Subject: [PATCH 2645/2920] DataView\Customvar: Fix sort rules

refs #6644
---
 .../monitoring/library/Monitoring/DataView/Customvar.php    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Customvar.php b/modules/monitoring/library/Monitoring/DataView/Customvar.php
index d62ff3f51..c6f0ff187 100644
--- a/modules/monitoring/library/Monitoring/DataView/Customvar.php
+++ b/modules/monitoring/library/Monitoring/DataView/Customvar.php
@@ -36,8 +36,10 @@ class Customvar extends DataView
     {
         return array(
             'varname' => array(
-                'varname'  => self::SORT_ASC,
-                'varvalue' => self::SORT_ASC,
+                'columns' => array(
+                    'varname',
+                    'varvalue'
+                )
             )
         );
     }

From d56b31fe5ee289f955b45c471140118c6c87c3de Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 28 Jul 2015 11:42:55 +0200
Subject: [PATCH 2646/2920] DataView\Eventhistory: Fix sort rules

refs #6644
---
 .../monitoring/library/Monitoring/DataView/Eventhistory.php    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Eventhistory.php b/modules/monitoring/library/Monitoring/DataView/Eventhistory.php
index 67a0ce393..ad6c384cb 100644
--- a/modules/monitoring/library/Monitoring/DataView/Eventhistory.php
+++ b/modules/monitoring/library/Monitoring/DataView/Eventhistory.php
@@ -49,8 +49,7 @@ class EventHistory extends DataView
     {
         return array(
             'timestamp' => array(
-                'columns'   => array('timestamp'),
-                'order'     => 'DESC'
+                'order' => self::SORT_DESC
             )
         );
     }

From d40c3f0a29554c90f6c968081cf3bc75d68dc3cc Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 11:49:18 +0200
Subject: [PATCH 2647/2920] Remove unnecessary use in FormTriStateCheckbox

refs #9449
---
 application/views/helpers/FormTriStateCheckbox.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/application/views/helpers/FormTriStateCheckbox.php b/application/views/helpers/FormTriStateCheckbox.php
index 61089cc51..293da78d8 100644
--- a/application/views/helpers/FormTriStateCheckbox.php
+++ b/application/views/helpers/FormTriStateCheckbox.php
@@ -1,8 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Zend_View_Helper_FormElement;
-
 /**
  * Helper to generate a "datetime" element
  */

From e70fb76d3174ab7ef18128ad04a70af4769f7e84 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 11:54:00 +0200
Subject: [PATCH 2648/2920] doc: Remove unnecessary use in IcingawebController

refs #9449
---
 modules/doc/application/controllers/IcingawebController.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/doc/application/controllers/IcingawebController.php b/modules/doc/application/controllers/IcingawebController.php
index 31819239a..8af8b97ff 100644
--- a/modules/doc/application/controllers/IcingawebController.php
+++ b/modules/doc/application/controllers/IcingawebController.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Zend_Controller_Action_Exception;
 use Icinga\Application\Icinga;
 use Icinga\Module\Doc\DocController;
 
@@ -25,10 +24,7 @@ class Doc_IcingawebController extends DocController
                 return $path;
             }
         }
-        throw new Zend_Controller_Action_Exception(
-            $this->translate('Documentation for Icinga Web 2 is not available'),
-            404
-        );
+        $this->httpNotFound($this->translate('Documentation for Icinga Web 2 is not available'));
     }
 
     /**

From b3f463a7a50955f93d5d78e00b244abfe0a38ff7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 11:54:55 +0200
Subject: [PATCH 2649/2920] doc: Remove unnecessary use in ModuleController

refs #9449
---
 modules/doc/application/controllers/ModuleController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php
index eb9f4dcf1..753da45cc 100644
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Zend_Controller_Action_Exception;
 use Icinga\Application\Icinga;
 use Icinga\Module\Doc\DocController;
 use Icinga\Module\Doc\Exception\DocException;

From d850cffa42122e7b988f0f61dc0e543786a03b03 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 11:55:27 +0200
Subject: [PATCH 2650/2920] doc: Remove unnecessary use in SearchController

refs #9449
---
 modules/doc/application/controllers/SearchController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/doc/application/controllers/SearchController.php b/modules/doc/application/controllers/SearchController.php
index 5df4ffeb3..e896c31f6 100644
--- a/modules/doc/application/controllers/SearchController.php
+++ b/modules/doc/application/controllers/SearchController.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Zend_Controller_Action_Exception;
 use Icinga\Application\Icinga;
 use Icinga\Module\Doc\DocController;
 use Icinga\Module\Doc\DocParser;

From ec07da6c5e0f8967a1fc5b6c99a24826fbd22824 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 11:56:48 +0200
Subject: [PATCH 2651/2920] monitoring: Remove unnecessary use w/ backlash in
 DeleteCommentsCommandForm

refs #9449
---
 .../forms/Command/Object/DeleteCommentsCommandForm.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php
index 805002922..1a51431f3 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php
@@ -4,7 +4,7 @@
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
 use Icinga\Module\Monitoring\Command\Object\DeleteCommentCommand;
-use \Icinga\Module\Monitoring\Forms\Command\CommandForm;
+use Icinga\Module\Monitoring\Forms\Command\CommandForm;
 use Icinga\Web\Notification;
 
 /**

From f7b35b04f48e70ffda152f956070d1e67aee59cd Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 28 Jul 2015 12:03:50 +0200
Subject: [PATCH 2652/2920] SortBox: Properly apply sort rules and show the
 user the default

refs #6644
---
 library/Icinga/Web/Widget/SortBox.php | 55 +++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index fa80b6c3e..9d0945394 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -3,10 +3,11 @@
 
 namespace Icinga\Web\Widget;
 
+use Icinga\Application\Icinga;
+use Icinga\Data\Sortable;
+use Icinga\Data\SortRules;
 use Icinga\Web\Form;
 use Icinga\Web\Request;
-use Icinga\Data\Sortable;
-use Icinga\Application\Icinga;
 
 /**
  * SortBox widget
@@ -113,13 +114,41 @@ class SortBox extends AbstractWidget
             if ($request === null) {
                 $request = Icinga::app()->getFrontController()->getRequest();
             }
-            if ($sort = $request->getParam('sort')) {
+
+            if (($sort = $request->getParam('sort'))) {
                 $this->query->order($sort, $request->getParam('dir'));
+            } elseif (($dir = $request->getParam('dir'))) {
+                $this->query->order(null, $dir);
             }
         }
+
         return $this;
     }
 
+    /**
+     * Return the default sort rule for the query
+     *
+     * @param   string  $column     An optional column
+     *
+     * @return  array               An array of two values: $column, $direction
+     */
+    protected function getSortDefaults($column = null)
+    {
+        $direction = null;
+        if ($this->query !== null && $this->query instanceof SortRules) {
+            $sortRules = $this->query->getSortRules();
+            if ($column === null) {
+                $column = key($sortRules);
+            }
+
+            if ($column !== null && isset($sortRules[$column]['order'])) {
+                $direction = strtoupper($sortRules[$column]['order']) === Sortable::SORT_DESC ? 'desc' : 'asc';
+            }
+        }
+
+        return array($column, $direction);
+    }
+
     /**
      * Render this SortBox as HTML
      *
@@ -166,17 +195,29 @@ class SortBox extends AbstractWidget
             )
         );
 
+        $column = null;
         if ($this->request) {
             $url = $this->request->getUrl();
             if ($url->hasParam('sort')) {
-                $columnForm->populate(array('sort' => $url->getParam('sort')));
-            }
+                $column = $url->getParam('sort');
 
-            if ($url->hasParam('dir')) {
-                $orderForm->populate(array('dir' => $url->getParam('dir')));
+                if ($url->hasParam('dir')) {
+                    $direction = $url->getParam('dir');
+                } else {
+                    list($_, $direction) = $this->getSortDefaults($column);
+                }
+            } elseif ($url->hasParam('dir')) {
+                $direction = $url->getParam('dir');
+                list($column, $_) = $this->getSortDefaults();
             }
         }
 
+        if ($column === null) {
+            list($column, $direction) = $this->getSortDefaults();
+        }
+
+        $columnForm->populate(array('sort' => $column));
+        $orderForm->populate(array('dir' => $direction));
         return '<div class="sort-control">' . $columnForm . $orderForm . '</div>';
     }
 }

From e231ef8061dd655882fc5241a6844b5b1f74f83d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 28 Jul 2015 12:04:16 +0200
Subject: [PATCH 2653/2920] SortBox: Fix some documenation and code style
 issues

---
 library/Icinga/Web/Widget/SortBox.php | 44 +++++++++++++++------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 9d0945394..7a09c2f36 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -12,22 +12,17 @@ use Icinga\Web\Request;
 /**
  * SortBox widget
  *
- * The "SortBox" Widget allows you to create a generic sort input for sortable views. It automatically creates a form
- * containing a select box with all sort options and a dropbox with the sort direction. It also handles automatic
- * submission of sorting changes and draws an additional submit button when JavaScript is disabled.
+ * The "SortBox" Widget allows you to create a generic sort input for sortable views. It automatically creates a select
+ * box with all sort options and a dropbox with the sort direction. It also handles automatic submission of sorting
+ * changes and draws an additional submit button when JavaScript is disabled.
  *
- * The constructor takes an string for the component name and an array containing the select options, where the key is
+ * The constructor takes a string for the component name and an array containing the select options, where the key is
  * the value to be submitted and the value is the label that will be shown. You then should call setRequest in order
  * to  make sure the form is correctly populated when a request with a sort parameter is being made.
  *
- * Example:
- *  <pre><code>
- *      $this->view->sortControl = new SortBox(
- *          $this->getRequest()->getActionName(),
- *          $columns
- *      );
- *      $this->view->sortControl->setRequest($this->getRequest());
- *  </code></pre>
+ * Call setQuery in case you'll do not want to handle URL parameters manually, but to automatically apply the user's
+ * chosen sort rules on the given sortable query. This will also allow the SortBox to display the user the correct
+ * default sort rules if the given query provides already some sort rules.
  */
 class SortBox extends AbstractWidget
 {
@@ -39,25 +34,25 @@ class SortBox extends AbstractWidget
     protected $sortFields;
 
     /**
-     * The name of the form that will be created
+     * The name used to uniquely identfy the forms being created
      *
      * @var string
      */
     protected $name;
 
     /**
-     * A request object used for initial form population
+     * The request to fetch sort rules from
      *
      * @var Request
      */
     protected $request;
 
     /**
-     * What to apply sort parameters on
+     * The query to apply sort rules on
      *
      * @var Sortable
      */
-    protected $query = null;
+    protected $query;
 
     /**
      * Create a SortBox with the entries from $sortFields
@@ -85,9 +80,9 @@ class SortBox extends AbstractWidget
     }
 
     /**
-     * Apply the parameters from the given request on this SortBox
+     * Set the request to fetch sort rules from
      *
-     * @param   Request     $request    The request to use for populating the form
+     * @param   Request     $request
      *
      * @return  $this
      */
@@ -98,9 +93,11 @@ class SortBox extends AbstractWidget
     }
 
     /**
-     * @param Sortable $query
+     * Set the query to apply sort rules on
      *
-     * @return $this
+     * @param   Sortable    $query
+     *
+     * @return  $this
      */
     public function setQuery(Sortable $query)
     {
@@ -108,6 +105,13 @@ class SortBox extends AbstractWidget
         return $this;
     }
 
+    /**
+     * Apply the sort rules from the given or current request on the query
+     *
+     * @param   Request     $request
+     *
+     * @return  $this
+     */
     public function handleRequest(Request $request = null)
     {
         if ($this->query !== null) {

From 4536eacd6627d8209f3bd991828a6712843c7f03 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 12:05:31 +0200
Subject: [PATCH 2654/2920] monitoring: Rename TransportException to
 CommandTransportException

---
 ...TransportException.php => CommandTransportException.php} | 0
 .../Monitoring/Command/Transport/LocalCommandFile.php       | 6 +++---
 .../Monitoring/Command/Transport/RemoteCommandFile.php      | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename modules/monitoring/library/Monitoring/Command/Exception/{TransportException.php => CommandTransportException.php} (100%)

diff --git a/modules/monitoring/library/Monitoring/Command/Exception/TransportException.php b/modules/monitoring/library/Monitoring/Command/Exception/CommandTransportException.php
similarity index 100%
rename from modules/monitoring/library/Monitoring/Command/Exception/TransportException.php
rename to modules/monitoring/library/Monitoring/Command/Exception/CommandTransportException.php
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
index a26999f18..20044dff1 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
@@ -7,7 +7,7 @@ use Exception;
 use RuntimeException;
 use Icinga\Application\Logger;
 use Icinga\Exception\ConfigurationError;
-use Icinga\Module\Monitoring\Command\Exception\TransportException;
+use Icinga\Module\Monitoring\Command\Exception\CommandTransportException;
 use Icinga\Module\Monitoring\Command\IcingaCommand;
 use Icinga\Module\Monitoring\Command\Renderer\IcingaCommandFileCommandRenderer;
 use Icinga\Util\File;
@@ -104,7 +104,7 @@ class LocalCommandFile implements CommandTransportInterface
      * @param   int|null        $now
      *
      * @throws  ConfigurationError
-     * @throws  TransportException
+     * @throws  CommandTransportException
      */
     public function send(IcingaCommand $command, $now = null)
     {
@@ -129,7 +129,7 @@ class LocalCommandFile implements CommandTransportInterface
                 // Assume RuntimeException thrown by SplFileObject in the format: __METHOD__ . "({$filename}): Message"
                 $message = substr($message, $pos + 1);
             }
-            throw new TransportException(
+            throw new CommandTransportException(
                 'Can\'t send external Icinga command to the local command file "%s": %s',
                 $this->path,
                 $message
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
index 77d85c083..2edf00ae0 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
@@ -6,7 +6,7 @@ namespace Icinga\Module\Monitoring\Command\Transport;
 use Icinga\Application\Logger;
 use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;
-use Icinga\Module\Monitoring\Command\Exception\TransportException;
+use Icinga\Module\Monitoring\Command\Exception\CommandTransportException;
 use Icinga\Module\Monitoring\Command\IcingaCommand;
 use Icinga\Module\Monitoring\Command\Renderer\IcingaCommandFileCommandRenderer;
 
@@ -224,7 +224,7 @@ class RemoteCommandFile implements CommandTransportInterface
      * @param   int|null        $now
      *
      * @throws  ConfigurationError
-     * @throws  TransportException
+     * @throws  CommandTransportException
      */
     public function send(IcingaCommand $command, $now = null)
     {
@@ -260,7 +260,7 @@ class RemoteCommandFile implements CommandTransportInterface
         );
         exec($ssh, $output, $status);
         if ($status !== 0) {
-            throw new TransportException(
+            throw new CommandTransportException(
                 'Can\'t send external Icinga command: %s',
                 implode(' ', $output)
             );

From b2fb0a836ff78308b591fb9ec1ea0e8e65b24280 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 12:14:01 +0200
Subject: [PATCH 2655/2920] monitoring: Move CommandTransportException to the
 monitoring's exception namespace

---
 .../library/Monitoring/Command/Transport/LocalCommandFile.php | 2 +-
 .../Monitoring/Command/Transport/RemoteCommandFile.php        | 2 +-
 .../{Command => }/Exception/CommandTransportException.php     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename modules/monitoring/library/Monitoring/{Command => }/Exception/CommandTransportException.php (62%)

diff --git a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
index 20044dff1..50b87aed5 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
@@ -7,9 +7,9 @@ use Exception;
 use RuntimeException;
 use Icinga\Application\Logger;
 use Icinga\Exception\ConfigurationError;
-use Icinga\Module\Monitoring\Command\Exception\CommandTransportException;
 use Icinga\Module\Monitoring\Command\IcingaCommand;
 use Icinga\Module\Monitoring\Command\Renderer\IcingaCommandFileCommandRenderer;
+use Icinga\Module\Monitoring\Exception\CommandTransportException;
 use Icinga\Util\File;
 
 /**
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
index 2edf00ae0..383970b76 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
@@ -6,9 +6,9 @@ namespace Icinga\Module\Monitoring\Command\Transport;
 use Icinga\Application\Logger;
 use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;
-use Icinga\Module\Monitoring\Command\Exception\CommandTransportException;
 use Icinga\Module\Monitoring\Command\IcingaCommand;
 use Icinga\Module\Monitoring\Command\Renderer\IcingaCommandFileCommandRenderer;
+use Icinga\Module\Monitoring\Exception\CommandTransportException;
 
 /**
  * A remote Icinga command file
diff --git a/modules/monitoring/library/Monitoring/Command/Exception/CommandTransportException.php b/modules/monitoring/library/Monitoring/Exception/CommandTransportException.php
similarity index 62%
rename from modules/monitoring/library/Monitoring/Command/Exception/CommandTransportException.php
rename to modules/monitoring/library/Monitoring/Exception/CommandTransportException.php
index 2b4e63bb5..6ffe4677d 100644
--- a/modules/monitoring/library/Monitoring/Command/Exception/CommandTransportException.php
+++ b/modules/monitoring/library/Monitoring/Exception/CommandTransportException.php
@@ -1,13 +1,13 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Module\Monitoring\Command\Exception;
+namespace Icinga\Module\Monitoring\Exception;
 
 use Icinga\Exception\IcingaException;
 
 /**
  * Exception thrown if a command was not sent
  */
-class TransportException extends IcingaException
+class CommandTransportException extends IcingaException
 {
 }

From 901e6754eb607145c48d50892e82e2e138617d18 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 12:16:58 +0200
Subject: [PATCH 2656/2920] monitoring: Define
 CommandTransportInterface::send()

---
 .../Command/Transport/CommandTransportInterface.php   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
index fd332204e..bc496a00b 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransportInterface.php
@@ -3,9 +3,20 @@
 
 namespace Icinga\Module\Monitoring\Command\Transport;
 
+use Icinga\Module\Monitoring\Command\IcingaCommand;
+
 /**
  * Interface for Icinga command transports
  */
 interface CommandTransportInterface
 {
+    /**
+     * Send an Icinga command over the Icinga command transport
+     *
+     * @param   IcingaCommand   $command    The command to send
+     * @param   int|null        $now        Timestamp of the command or null for now
+     *
+     * @throws  \Icinga\Module\Monitoring\Exception\CommandTransportException If sending the Icinga command failed
+     */
+    public function send(IcingaCommand $command, $now = null);
 }

From 36a5ec3e17e987400154969415163664209cea60 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 12:20:03 +0200
Subject: [PATCH 2657/2920] monitoring: Fix PHPDoc in CommandForm

---
 modules/monitoring/application/forms/Command/CommandForm.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/CommandForm.php b/modules/monitoring/application/forms/Command/CommandForm.php
index 41a46f110..ca30dba74 100644
--- a/modules/monitoring/application/forms/Command/CommandForm.php
+++ b/modules/monitoring/application/forms/Command/CommandForm.php
@@ -16,7 +16,7 @@ abstract class CommandForm extends Form
     /**
      * Monitoring backend
      *
-     * @var Backend
+     * @var MonitoringBackend
      */
     protected $backend;
 
@@ -36,7 +36,7 @@ abstract class CommandForm extends Form
     /**
      * Get the monitoring backend
      *
-     * @return Backend
+     * @return MonitoringBackend
      */
     public function getBackend()
     {

From f6ec028627a4cc968ed4aab9495ca6e7b1c9c9ee Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 12:20:17 +0200
Subject: [PATCH 2658/2920] monitoring: Fix PHPDoc in DeleteCommentsCommandForm

---
 .../Command/Object/DeleteCommentsCommandForm.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php
index 805002922..f6fe05d8f 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php
@@ -20,8 +20,7 @@ class DeleteCommentsCommandForm extends CommandForm
     protected $comments;
 
     /**
-     * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
+     * {@inheritdoc}
      */
     public function init()
     {
@@ -29,8 +28,7 @@ class DeleteCommentsCommandForm extends CommandForm
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     * {@inheritdoc}
      */
     public function createElements(array $formData = array())
     {
@@ -45,8 +43,7 @@ class DeleteCommentsCommandForm extends CommandForm
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
+     * {@inheritdoc}
      */
     public function getSubmitLabel()
     {
@@ -54,8 +51,7 @@ class DeleteCommentsCommandForm extends CommandForm
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     * {@inheritdoc}
      */
     public function onSuccess()
     {
@@ -76,9 +72,9 @@ class DeleteCommentsCommandForm extends CommandForm
     /**
      * Set the comments to be deleted upon success
      *
-     * @param array $comments
+     * @param   array $comments
      *
-     * @return this             fluent interface
+     * @return  $this
      */
     public function setComments(array $comments)
     {

From c8d065b3e0197b8c96dba436a5c04cebca704568 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 28 Jul 2015 12:40:17 +0200
Subject: [PATCH 2659/2920] Accept DbUserBackends with only one single user

fixes #9739
---
 library/Icinga/Authentication/User/DbUserBackend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/User/DbUserBackend.php b/library/Icinga/Authentication/User/DbUserBackend.php
index 3c28a2fdd..48662a987 100644
--- a/library/Icinga/Authentication/User/DbUserBackend.php
+++ b/library/Icinga/Authentication/User/DbUserBackend.php
@@ -260,7 +260,7 @@ class DbUserBackend extends DbRepository implements UserBackendInterface, Inspec
         $insp->write($this->ds->inspect());
         try {
             $users = $this->select()->where('is_active', true)->count();
-            if ($users > 1) {
+            if ($users >= 1) {
                 $insp->write(sprintf('%s active users', $users));
             } else {
                 return $insp->error('0 active users', $users);

From 9bd31f70e23c11b840f3e94904a4f77b5cdc890d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 12:44:27 +0200
Subject: [PATCH 2660/2920] monitoring: Remove unnecessary use w/ backlash in
 DeleteDowntimeCommandForm

refs #9449
---
 .../forms/Command/Object/DeleteDowntimeCommandForm.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
index 31ec778fa..395f90ad4 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -4,7 +4,7 @@
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
 use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand;
-use \Icinga\Module\Monitoring\Forms\Command\CommandForm;
+use Icinga\Module\Monitoring\Forms\Command\CommandForm;
 use Icinga\Web\Notification;
 
 /**
@@ -20,7 +20,7 @@ class DeleteDowntimeCommandForm extends CommandForm
     {
         $this->setAttrib('class', 'inline');
     }
-    
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::createElements() For the method documentation.
@@ -57,7 +57,7 @@ class DeleteDowntimeCommandForm extends CommandForm
         );
         return $this;
     }
-    
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::addSubmitButton() For the method documentation.
@@ -79,7 +79,7 @@ class DeleteDowntimeCommandForm extends CommandForm
         );
         return $this;
     }
-   
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::onSuccess() For  the method documentation.
@@ -90,7 +90,7 @@ class DeleteDowntimeCommandForm extends CommandForm
         $cmd->setDowntimeId($this->getElement('downtime_id')->getValue());
         $cmd->setIsService($this->getElement('downtime_is_service')->getValue());
         $this->getTransport($this->request)->send($cmd);
-    
+
         $redirect = $this->getElement('redirect')->getValue();
         if (! empty($redirect)) {
             $this->setRedirectUrl($redirect);

From 455d2cee6953cd61260a9b78d788bb67f4667ad0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 13:31:12 +0200
Subject: [PATCH 2661/2920] monitoring: Use @inheritdoc in
 DeleteCommentCommandForm

---
 .../Command/Object/DeleteCommentCommandForm.php      | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
index 1c8144475..691b7dbed 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php
@@ -13,8 +13,7 @@ use Icinga\Web\Notification;
 class DeleteCommentCommandForm extends CommandForm
 {
     /**
-     * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
+     * {@inheritdoc}
      */
     public function init()
     {
@@ -22,8 +21,7 @@ class DeleteCommentCommandForm extends CommandForm
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     * {@inheritdoc}
      */
     public function createElements(array $formData = array())
     {
@@ -59,8 +57,7 @@ class DeleteCommentCommandForm extends CommandForm
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::addSubmitButton() For the method documentation.
+     * {@inheritdoc}
      */
     public function addSubmitButton()
     {
@@ -81,8 +78,7 @@ class DeleteCommentCommandForm extends CommandForm
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     * {@inheritdoc}
      */
     public function onSuccess()
     {

From 72c3337be8a24e07997f2a7479ede15e3b936c1f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 13:31:43 +0200
Subject: [PATCH 2662/2920] monitoring: Use @inheritdoc in
 DeleteDowntimeCommandForm

---
 .../Object/DeleteDowntimeCommandForm.php      | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
index 31ec778fa..efdc72250 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -13,17 +13,15 @@ use Icinga\Web\Notification;
 class DeleteDowntimeCommandForm extends CommandForm
 {
     /**
-     * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
+     * {@inheritdoc}
      */
     public function init()
     {
         $this->setAttrib('class', 'inline');
     }
-    
+
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     * {@inheritdoc}
      */
     public function createElements(array $formData = array())
     {
@@ -57,10 +55,9 @@ class DeleteDowntimeCommandForm extends CommandForm
         );
         return $this;
     }
-    
+
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::addSubmitButton() For the method documentation.
+     * {@inheritdoc}
      */
     public function addSubmitButton()
     {
@@ -79,10 +76,9 @@ class DeleteDowntimeCommandForm extends CommandForm
         );
         return $this;
     }
-   
+
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::onSuccess() For  the method documentation.
+     * {@inheritdoc}
      */
     public function onSuccess()
     {
@@ -90,7 +86,7 @@ class DeleteDowntimeCommandForm extends CommandForm
         $cmd->setDowntimeId($this->getElement('downtime_id')->getValue());
         $cmd->setIsService($this->getElement('downtime_is_service')->getValue());
         $this->getTransport($this->request)->send($cmd);
-    
+
         $redirect = $this->getElement('redirect')->getValue();
         if (! empty($redirect)) {
             $this->setRedirectUrl($redirect);

From 5d01dca291f2675163b1e2806b1bf858c606f63b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 13:32:24 +0200
Subject: [PATCH 2663/2920] monitoring: Fix PHPDoc in
 DeleteDowntimesCommandForm

---
 .../Object/DeleteDowntimesCommandForm.php     | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
index 4a19cac96..472ca8f9e 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
@@ -18,10 +18,9 @@ class DeleteDowntimesCommandForm extends CommandForm
      * @var array
      */
     protected $downtimes;
-    
+
     /**
-     * (non-PHPDoc)
-     * @see \Zend_Form::init() For the method documentation.
+     * {@inheritdoc}
      */
     public function init()
     {
@@ -29,8 +28,7 @@ class DeleteDowntimesCommandForm extends CommandForm
     }
 
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::createElements() For the method documentation.
+     * {@inheritdoc}
      */
     public function createElements(array $formData = array())
     {
@@ -43,19 +41,17 @@ class DeleteDowntimesCommandForm extends CommandForm
         ));
         return $this;
     }
- 
+
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
+     * {@inheritdoc}
      */
     public function getSubmitLabel()
     {
         return $this->translatePlural('Remove', 'Remove All', count($this->downtimes));
     }
-    
+
     /**
-     * (non-PHPDoc)
-     * @see \Icinga\Web\Form::onSuccess() For the method documentation.
+     * {@inheritdoc}
      */
     public function onSuccess()
     {
@@ -72,13 +68,13 @@ class DeleteDowntimesCommandForm extends CommandForm
         Notification::success($this->translate('Deleting downtime.'));
         return true;
     }
-    
+
     /**
      * Set the downtimes to be deleted upon success
      *
-     * @param type $downtimes
+     * @param   array $downtimes
      *
-     * @return $this
+     * @return  $this
      */
     public function setDowntimes(array $downtimes)
     {

From dd7d078704254e7994a750187293d2a083fc82df Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 13:32:45 +0200
Subject: [PATCH 2664/2920] monitoring: Fix PHPDoc in DeleteCommentCommand

---
 .../Monitoring/Command/Object/DeleteCommentCommand.php    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php b/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
index 75f2ffb8e..f3cbbc4cb 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/DeleteCommentCommand.php
@@ -60,13 +60,13 @@ class DeleteCommentCommand extends IcingaCommand
     /**
      * Set whether the command affects a service
      *
-     * @param boolean $value    The value, defaults to true
+     * @param   bool $isService
      *
-     * @return this             fluent interface
+     * @return  $this
      */
-    public function setIsService($value = true)
+    public function setIsService($isService = true)
     {
-        $this->isService = (bool) $value;
+        $this->isService = (bool) $isService;
         return $this;
     }
 }

From 919c7c52cfaab754b6ae864d6e03ba62a0c62ca0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 13:33:07 +0200
Subject: [PATCH 2665/2920] monitoring: Fix PHPDoc in DeleteDowntimeCommand

---
 .../Command/Object/DeleteDowntimeCommand.php        | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php b/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
index a2c593f26..2be50ed18 100644
--- a/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
+++ b/modules/monitoring/library/Monitoring/Command/Object/DeleteDowntimeCommand.php
@@ -27,17 +27,20 @@ class DeleteDowntimeCommand extends IcingaCommand
     /**
      * Set if this command affects a service
      *
-     * @param type $value
+     * @param   bool $isService
+     *
+     * @return  $this
      */
-    public function setIsService($value = true)
+    public function setIsService($isService = true)
     {
-        $this->isService = (bool) $value;
+        $this->isService = (bool) $isService;
+        return $this;
     }
-    
+
     /**
      * Return whether the command affects a service
      *
-     * @return type
+     * @return bool
      */
     public function getIsService()
     {

From 0a01eb66b1f42a334ff4c1baa71d7847e2877618 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 13:34:39 +0200
Subject: [PATCH 2666/2920] monitoring: Remove unnecessary use w/ backslash in
 DeleteDowntimesCommandForm

refs #9449
---
 .../Command/Object/DeleteDowntimesCommandForm.php      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
index 4a19cac96..3d13866ec 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
@@ -4,7 +4,7 @@
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
 use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand;
-use \Icinga\Module\Monitoring\Forms\Command\CommandForm;
+use Icinga\Module\Monitoring\Forms\Command\CommandForm;
 use Icinga\Web\Notification;
 
 /**
@@ -18,7 +18,7 @@ class DeleteDowntimesCommandForm extends CommandForm
      * @var array
      */
     protected $downtimes;
-    
+
     /**
      * (non-PHPDoc)
      * @see \Zend_Form::init() For the method documentation.
@@ -43,7 +43,7 @@ class DeleteDowntimesCommandForm extends CommandForm
         ));
         return $this;
     }
- 
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::getSubmitLabel() For the method documentation.
@@ -52,7 +52,7 @@ class DeleteDowntimesCommandForm extends CommandForm
     {
         return $this->translatePlural('Remove', 'Remove All', count($this->downtimes));
     }
-    
+
     /**
      * (non-PHPDoc)
      * @see \Icinga\Web\Form::onSuccess() For the method documentation.
@@ -72,7 +72,7 @@ class DeleteDowntimesCommandForm extends CommandForm
         Notification::success($this->translate('Deleting downtime.'));
         return true;
     }
-    
+
     /**
      * Set the downtimes to be deleted upon success
      *

From 7df1b3aa0f626ba6cd4ab3c1a8f7b8f80f151b30 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 13:35:52 +0200
Subject: [PATCH 2667/2920] monitoring: Fix use statements in EventOverviewForm

refs #9449
---
 modules/monitoring/application/forms/EventOverviewForm.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/forms/EventOverviewForm.php b/modules/monitoring/application/forms/EventOverviewForm.php
index bb230232f..b835b77e0 100644
--- a/modules/monitoring/application/forms/EventOverviewForm.php
+++ b/modules/monitoring/application/forms/EventOverviewForm.php
@@ -3,9 +3,7 @@
 
 namespace Icinga\Module\Monitoring\Forms;
 
-use Icinga\Data\Filter\FilterNot;
 use Icinga\Web\Url;
-use \Zend_Form;
 use Icinga\Web\Form;
 use Icinga\Data\Filter\Filter;
 
@@ -15,7 +13,7 @@ use Icinga\Data\Filter\Filter;
 class EventOverviewForm extends Form
 {
     /**
-     * Initialize this form
+     * {@inheritdoc}
      */
     public function init()
     {
@@ -28,7 +26,7 @@ class EventOverviewForm extends Form
     }
 
     /**
-     * @see Form::createElements()
+     * {@inheritdoc}
      */
     public function createElements(array $formData)
     {

From a8765bc4ea866690632586ed1cfd727b67313dae Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 13:36:51 +0200
Subject: [PATCH 2668/2920] monitoring: Remove unnecessary use in
 StatehistoryForm

refs #9449
---
 modules/monitoring/application/forms/StatehistoryForm.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/forms/StatehistoryForm.php b/modules/monitoring/application/forms/StatehistoryForm.php
index 730e3f43b..f6c148d8c 100644
--- a/modules/monitoring/application/forms/StatehistoryForm.php
+++ b/modules/monitoring/application/forms/StatehistoryForm.php
@@ -3,7 +3,6 @@
 
 namespace Icinga\Module\Monitoring\Forms;
 
-use \Zend_Form;
 use Icinga\Web\Form;
 use Icinga\Data\Filter\Filter;
 
@@ -13,7 +12,7 @@ use Icinga\Data\Filter\Filter;
 class StatehistoryForm extends Form
 {
     /**
-     * Initialize this form
+     * {@inheritdoc}
      */
     public function init()
     {
@@ -56,7 +55,7 @@ class StatehistoryForm extends Form
     }
 
     /**
-     * @see Form::createElements()
+     * {@inheritdoc}
      */
     public function createElements(array $formData)
     {

From fe73d6de834aa7cb407e8fc239afb09f903316d3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 13:46:32 +0200
Subject: [PATCH 2669/2920] Remove superfluous whitespaces in IcingaException

refs #9644
---
 library/Icinga/Exception/IcingaException.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Exception/IcingaException.php b/library/Icinga/Exception/IcingaException.php
index 1869e75ca..3fdd5aa12 100644
--- a/library/Icinga/Exception/IcingaException.php
+++ b/library/Icinga/Exception/IcingaException.php
@@ -40,7 +40,7 @@ class IcingaException extends Exception
         $e = new ReflectionClass(get_called_class());
         return $e->newInstanceArgs($args);
     }
-    
+
     /**
      * Return the given exception formatted as one-liner
      *

From 9846dfb2e2576181f7f18c74fe85eebeeec6573d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 13:47:06 +0200
Subject: [PATCH 2670/2920] doc: Use Controller:httpNotFound() in
 ModuleController

refs #9644
---
 .../application/controllers/ModuleController.php   | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php
index 9b8d1d1cf..0608e0ad6 100644
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@@ -35,10 +35,7 @@ class Doc_ModuleController extends DocController
         if ($suppressErrors) {
             return null;
         }
-        throw new Zend_Controller_Action_Exception(
-            sprintf($this->translate('Documentation for module \'%s\' is not available'), $module),
-            404
-        );
+        $this->httpNotFound($this->translate('Documentation for module \'%s\' is not available'), $module);
     }
 
     /**
@@ -75,10 +72,7 @@ class Doc_ModuleController extends DocController
         }
         $moduleManager = Icinga::app()->getModuleManager();
         if (! $moduleManager->hasInstalled($moduleName)) {
-            throw new Zend_Controller_Action_Exception(
-                sprintf($this->translate('Module \'%s\' is not installed'), $moduleName),
-                404
-            );
+            $this->httpNotFound($this->translate('Module \'%s\' is not installed'), $moduleName);
         }
     }
 
@@ -100,7 +94,7 @@ class Doc_ModuleController extends DocController
                 array('moduleName' => $module)
             );
         } catch (DocException $e) {
-            throw new Zend_Controller_Action_Exception($e->getMessage(), 404);
+            $this->httpNotFound($e->getMessage());
         }
     }
 
@@ -131,7 +125,7 @@ class Doc_ModuleController extends DocController
                 array('moduleName' => $module)
             );
         } catch (DocException $e) {
-            throw new Zend_Controller_Action_Exception($e->getMessage(), 404);
+            $this->httpNotFound($e->getMessage());
         }
     }
 

From 9a758f3ed9d961e41de8ca1eaf098b084299a1bd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 13:47:25 +0200
Subject: [PATCH 2671/2920] doc: Use Controller::httpNotFound() in
 SearchController

refs #9644
---
 modules/doc/application/controllers/SearchController.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/doc/application/controllers/SearchController.php b/modules/doc/application/controllers/SearchController.php
index e896c31f6..5d71681eb 100644
--- a/modules/doc/application/controllers/SearchController.php
+++ b/modules/doc/application/controllers/SearchController.php
@@ -92,9 +92,6 @@ class Doc_SearchController extends DocController
                 return $path;
             }
         }
-        throw new Zend_Controller_Action_Exception(
-            $this->translate('Documentation for Icinga Web 2 is not available'),
-            404
-        );
+        $this->httpNotFound($this->translate('Documentation for Icinga Web 2 is not available'));
     }
 }

From 47925d0fa095aa3d277d3de808e960a34b9546e1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 13:58:23 +0200
Subject: [PATCH 2672/2920] lib: Make BaseTestCase abstract

Else phpunit tries to run the "test" though it shouldn't :)
---
 library/Icinga/Test/BaseTestCase.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Test/BaseTestCase.php b/library/Icinga/Test/BaseTestCase.php
index 9fdc72a57..43f2e6224 100644
--- a/library/Icinga/Test/BaseTestCase.php
+++ b/library/Icinga/Test/BaseTestCase.php
@@ -32,7 +32,7 @@ namespace Icinga\Test {
     /**
      * Class BaseTestCase
      */
-    class BaseTestCase extends PHPUnit_Framework_TestCase implements DbTest
+    abstract class BaseTestCase extends PHPUnit_Framework_TestCase implements DbTest
     {
         /**
          * Path to application/

From 794e4a1e1edf8ce51d1ef35704596ffc6ec4f3b7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 13:59:39 +0200
Subject: [PATCH 2673/2920] doc: Use Params::getRequired() in
 IcingawebController

refs #9644
---
 .../application/controllers/IcingawebController.php    | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/doc/application/controllers/IcingawebController.php b/modules/doc/application/controllers/IcingawebController.php
index 8af8b97ff..9fccd32fa 100644
--- a/modules/doc/application/controllers/IcingawebController.php
+++ b/modules/doc/application/controllers/IcingawebController.php
@@ -38,17 +38,11 @@ class Doc_IcingawebController extends DocController
     /**
      * View a chapter of Icinga Web 2's documentation
      *
-     * @throws Zend_Controller_Action_Exception If the required parameter 'chapterId' is missing
+     * @throws \Icinga\Exception\MissingParameterException If the required parameter 'chapter' is missing
      */
     public function chapterAction()
     {
-        $chapter = $this->getParam('chapter');
-        if ($chapter === null) {
-            throw new Zend_Controller_Action_Exception(
-                sprintf($this->translate('Missing parameter %s'), 'chapter'),
-                404
-            );
-        }
+        $chapter = $this->params->getRequired('chapter');
         $this->renderChapter(
             $this->getPath(),
             $chapter,

From 5c5dea616db7a5c6cecd360efdf0e583e4482526 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 13:59:59 +0200
Subject: [PATCH 2674/2920] doc: Use Params::getRequired() in ModuleController

refs #9644
---
 .../controllers/ModuleController.php          | 51 ++++++++-----------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php
index 0608e0ad6..6faf7cc12 100644
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@@ -10,16 +10,15 @@ class Doc_ModuleController extends DocController
     /**
      * Get the path to a module documentation
      *
-     * @param   string  $module                     The name of the module
-     * @param   string  $default                    The default path
-     * @param   bool    $suppressErrors             Whether to not throw an exception if the module documentation is not
-     *                                              available
+     * @param   string  $module         The name of the module
+     * @param   string  $default        The default path
+     * @param   bool    $suppressErrors Whether to not throw an exception if the module documentation is not available
      *
-     * @return  string|null                         Path to the documentation or null if the module documentation is not
-     *                                              available and errors are suppressed
+     * @return  string|null             Path to the documentation or null if the module documentation is not available
+     *                                  and errors are suppressed
      *
-     * @throws  Zend_Controller_Action_Exception    If the module documentation is not available and errors are not
-     *                                              suppressed
+     * @throws  \Icinga\Exception\Http\HttpNotFoundException    If the module documentation is not available and errors
+     *                                                          are not suppressed
      */
     protected function getPath($module, $default, $suppressErrors = false)
     {
@@ -59,17 +58,10 @@ class Doc_ModuleController extends DocController
      *
      * @param   string $moduleName
      *
-     * @throws  Zend_Controller_Action_Exception    If the required parameter 'moduleName' is empty or if the
-     *                                              given module is not installed
+     * @throws  \Icinga\Exception\Http\HttpNotFoundException If the given module is not installed
      */
     protected function assertModuleInstalled($moduleName)
     {
-        if (empty($moduleName)) {
-            throw new Zend_Controller_Action_Exception(
-                sprintf($this->translate('Missing parameter \'%s\''), 'moduleName'),
-                404
-            );
-        }
         $moduleManager = Icinga::app()->getModuleManager();
         if (! $moduleManager->hasInstalled($moduleName)) {
             $this->httpNotFound($this->translate('Module \'%s\' is not installed'), $moduleName);
@@ -79,11 +71,13 @@ class Doc_ModuleController extends DocController
     /**
      * View the toc of a module's documentation
      *
-     * @see assertModuleInstalled()
+     * @throws  \Icinga\Exception\MissingParameterException     If the required parameter 'moduleName' is empty
+     * @throws  \Icinga\Exception\Http\HttpNotFoundException    If the given module is not installed
+     * @see     assertModuleInstalled()
      */
     public function tocAction()
     {
-        $module = $this->getParam('moduleName');
+        $module = $this->params->getRequired('moduleName');
         $this->assertModuleInstalled($module);
         $this->view->moduleName = $module;
         try {
@@ -101,21 +95,16 @@ class Doc_ModuleController extends DocController
     /**
      * View a chapter of a module's documentation
      *
-     * @throws  Zend_Controller_Action_Exception    If the required parameter 'chapterId' is missing or if an error in
-     *                                              the documentation module's library occurs
+     * @throws  \Icinga\Exception\MissingParameterException     If one of the required parameters 'moduleName' and
+     *                                                          'chapter' is empty
+     * @throws  \Icinga\Exception\Http\HttpNotFoundException    If the given module is not installed
      * @see     assertModuleInstalled()
      */
     public function chapterAction()
     {
-        $module = $this->getParam('moduleName');
+        $module = $this->params->getRequired('moduleName');
         $this->assertModuleInstalled($module);
-        $chapter = $this->getParam('chapter');
-        if ($chapter === null) {
-            throw new Zend_Controller_Action_Exception(
-                sprintf($this->translate('Missing parameter %s'), 'chapter'),
-                404
-            );
-        }
+        $chapter = $this->params->getRequired('chapter');
         $this->view->moduleName = $module;
         try {
             $this->renderChapter(
@@ -132,11 +121,13 @@ class Doc_ModuleController extends DocController
     /**
      * View a module's documentation as PDF
      *
-     * @see assertModuleInstalled()
+     * @throws  \Icinga\Exception\MissingParameterException     If the required parameter 'moduleName' is empty
+     * @throws  \Icinga\Exception\Http\HttpNotFoundException    If the given module is not installed
+     * @see     assertModuleInstalled()
      */
     public function pdfAction()
     {
-        $module = $this->getParam('moduleName');
+        $module = $this->params->getRequired('moduleName');
         $this->assertModuleInstalled($module);
         $this->renderPdf(
             $this->getPath($module, Icinga::app()->getModuleManager()->getModuleDir($module, '/doc')),

From 5411efd546f92a9516e999f1475f6f2ea3f707b0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 28 Jul 2015 15:07:23 +0200
Subject: [PATCH 2675/2920] LdapBackendForm: Fail gracefully if the discovery
 is not possible

---
 .../forms/Config/UserBackend/LdapBackendForm.php  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/application/forms/Config/UserBackend/LdapBackendForm.php b/application/forms/Config/UserBackend/LdapBackendForm.php
index fbdfb5c00..ac6765598 100644
--- a/application/forms/Config/UserBackend/LdapBackendForm.php
+++ b/application/forms/Config/UserBackend/LdapBackendForm.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Forms\Config\UserBackend;
 
+use Exception;
 use Icinga\Data\ResourceFactory;
 use Icinga\Web\Form;
 
@@ -123,9 +124,17 @@ class LdapBackendForm extends Form
                 $connection = ResourceFactory::create(
                     isset($formData['resource']) ? $formData['resource'] : reset($this->resources)
                 );
-                $capabilities = $connection->bind()->getCapabilities();
-                $baseDn = $capabilities->getDefaultNamingContext();
-                $hasAdOid = $capabilities->isActiveDirectory();
+
+                try {
+                    $capabilities = $connection->bind()->getCapabilities();
+                    $baseDn = $capabilities->getDefaultNamingContext();
+                    $hasAdOid = $capabilities->isActiveDirectory();
+                } catch (Exception $e) {
+                    $this->warning(sprintf(
+                        $this->translate('Failed to discover the chosen LDAP connection: %s'),
+                        $e->getMessage()
+                    ));
+                }
             }
         }
 

From 8dbd671b0dbee3feef16ae9d77633be420e3935b Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 27 Jul 2015 10:49:35 +0200
Subject: [PATCH 2676/2920] Conform to coding guidelines, update docstrings and
 cleanup unused code

refs #8623
---
 public/js/icinga/behavior/actiontable.js | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/public/js/icinga/behavior/actiontable.js b/public/js/icinga/behavior/actiontable.js
index 6f6521314..71ca95051 100644
--- a/public/js/icinga/behavior/actiontable.js
+++ b/public/js/icinga/behavior/actiontable.js
@@ -43,7 +43,7 @@
      * Handle the selection of an action table
      *
      * @param   table   {HTMLElement}   The table
-     * @param           {Icinga}
+     * @param   icinga  {Icinga}
      *
      * @constructor
      */
@@ -158,7 +158,6 @@
                 return;
             }
             var self = this;
-            var url = this.getMultiselectionUrl();
             this.rowActions()
                 .filter(
                     function (i, el) {
@@ -283,14 +282,7 @@
 
     var ActionTable = function (icinga) {
         Icinga.EventListener.call(this, icinga);
-        
-       /**
-        * The hash that is currently being loaded
-        *
-        * @var String
-        */
-        this.loadingHash = null;
-        
+
         /**
          * If currently loading
          *
@@ -364,7 +356,7 @@
         }
         self.icinga.history.pushUrl(state);
         
-        // re draw all table selections
+        // redraw all table selections
         self.tables().each(function () {
             new Selection(this, self.icinga).refresh();
         });
@@ -375,13 +367,13 @@
     };
 
     /**
-     * Ensure that
+     * Render the selection and prepare selection rows
      */
     ActionTable.prototype.onRendered = function(evt) {
         var container = evt.target;
         var self = evt.data.self;
 
-        // Set first links href in a action table tr as row href:
+        // initialize all rows with the correct link, to assure that
         $('table.action tr', container).each(function(idx, el) {
             var $a = $('a[href].rowaction', el).first();
             if ($a.length) {
@@ -395,12 +387,12 @@
             }
         });
 
-        // draw all selections
+        // draw all active selections that have disappeared on reload
         self.tables().each(function(i, el) {
             new Selection(el, self.icinga).refresh();
         });
 
-        // update displayed selection count
+        // update displayed selection counter
         var table = new Selection(self.tables(container).first());
         $(container).find('.selection-info-count').text(table.selections().size());
     };

From cbb9ef10a26fec293df7fe89f73c114cec42eb41 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 28 Jul 2015 15:21:14 +0200
Subject: [PATCH 2677/2920] Remove single selections correctly when going back
 in the history

---
 public/js/icinga/behavior/actiontable.js | 7 +++++++
 public/js/icinga/events.js               | 1 -
 public/js/icinga/ui.js                   | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/public/js/icinga/behavior/actiontable.js b/public/js/icinga/behavior/actiontable.js
index 71ca95051..b3b409491 100644
--- a/public/js/icinga/behavior/actiontable.js
+++ b/public/js/icinga/behavior/actiontable.js
@@ -397,6 +397,13 @@
         $(container).find('.selection-info-count').text(table.selections().size());
     };
 
+    ActionTable.prototype.clearAll = function () {
+        var self = this;
+        this.tables().each(function () {
+            new Selection(this, self.icinga).clear();
+        });
+    };
+
     Icinga.Behaviors.ActionTable = ActionTable;
 
 }) (Icinga, jQuery);
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 9d4e80b15..3ea40b3d7 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -427,7 +427,6 @@
                             } else {
                                 icinga.ui.layout1col();
                             }
-                            $('table tr[href].active').removeClass('active');
                             icinga.history.pushCurrentState();
                         }
                     }
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index d2f9ab138..4ab802ca7 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -241,6 +241,9 @@
             $('#layout').removeClass('twocols');
             this.closeContainer($('#col2'));
             this.disableCloseButtons();
+
+            // one-column layouts never have any selection active
+            this.icinga.behaviors.actiontable.clearAll();
         },
 
         closeContainer: function($c) {

From 07849e0fea0be6949f192ea0d874d21764c74800 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 17:08:55 +0200
Subject: [PATCH 2678/2920] lib: Rename Authentication/Manager to
 Authentication/Auth

refs #9660
---
 application/forms/PreferenceForm.php                      | 4 ++--
 application/layouts/scripts/body.phtml                    | 2 +-
 library/Icinga/Application/Web.php                        | 8 ++++----
 library/Icinga/Authentication/{Manager.php => Auth.php}   | 4 ++--
 library/Icinga/Web/Controller/ActionController.php        | 8 ++++----
 library/Icinga/Web/Form.php                               | 8 ++++----
 library/Icinga/Web/Menu.php                               | 6 +++---
 library/Icinga/Web/Menu/PermittedMenuItemFilter.php       | 4 ++--
 library/Icinga/Web/View.php                               | 8 ++++----
 library/Icinga/Web/View/helpers/generic.php               | 4 ++--
 .../Monitoring/Web/Menu/MonitoringMenuItemRenderer.php    | 4 ++--
 11 files changed, 30 insertions(+), 30 deletions(-)
 rename library/Icinga/Authentication/{Manager.php => Auth.php} (99%)

diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
index 409feb751..b329ae1d4 100644
--- a/application/forms/PreferenceForm.php
+++ b/application/forms/PreferenceForm.php
@@ -6,7 +6,7 @@ namespace Icinga\Forms;
 use Exception;
 use DateTimeZone;
 use Icinga\Application\Logger;
-use Icinga\Authentication\Manager;
+use Icinga\Authentication\Auth;
 use Icinga\User\Preferences;
 use Icinga\User\Preferences\PreferencesStore;
 use Icinga\Util\TimezoneDetect;
@@ -123,7 +123,7 @@ class PreferenceForm extends Form
      */
     public function onRequest()
     {
-        $auth = Manager::getInstance();
+        $auth = Auth::getInstance();
         $values = $auth->getUser()->getPreferences()->get('icingaweb');
 
         if (! isset($values['language'])) {
diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index 5da1e4322..0fa60b284 100644
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -2,7 +2,7 @@
 
 use Icinga\Web\Url;
 use Icinga\Web\Notification;
-use Icinga\Authentication\Manager as Auth;
+use Icinga\Authentication\Auth;
 
 
 if (Auth::getInstance()->isAuthenticated()):
diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 0add09089..1bc524726 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -12,7 +12,7 @@ use Zend_Layout;
 use Zend_Paginator;
 use Zend_View_Helper_PaginationControl;
 use Icinga\Application\Logger;
-use Icinga\Authentication\Manager;
+use Icinga\Authentication\Auth;
 use Icinga\User;
 use Icinga\Util\TimezoneDetect;
 use Icinga\Util\Translator;
@@ -179,7 +179,7 @@ class Web extends ApplicationBootstrap
      */
     private function setupUser()
     {
-        $auth = Manager::getInstance();
+        $auth = Auth::getInstance();
         if ($auth->isAuthenticated()) {
             $this->user = $auth->getUser();
         }
@@ -282,7 +282,7 @@ class Web extends ApplicationBootstrap
      */
     protected function detectTimezone()
     {
-        $auth = Manager::getInstance();
+        $auth = Auth::getInstance();
         if (! $auth->isAuthenticated()
             || ($timezone = $auth->getUser()->getPreferences()->getValue('icingaweb', 'timezone')) === null
         ) {
@@ -303,7 +303,7 @@ class Web extends ApplicationBootstrap
      */
     protected function detectLocale()
     {
-        $auth = Manager::getInstance();
+        $auth = Auth::getInstance();
         if ($auth->isAuthenticated()
             && ($locale = $auth->getUser()->getPreferences()->getValue('icingaweb', 'language')) !== null
         ) {
diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Auth.php
similarity index 99%
rename from library/Icinga/Authentication/Manager.php
rename to library/Icinga/Authentication/Auth.php
index 01173330a..c68f4cd80 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Auth.php
@@ -15,7 +15,7 @@ use Icinga\User\Preferences;
 use Icinga\User\Preferences\PreferencesStore;
 use Icinga\Web\Session;
 
-class Manager
+class Auth
 {
     /**
      * Singleton instance
@@ -44,7 +44,7 @@ class Manager
     public static function getInstance()
     {
         if (self::$instance === null) {
-            self::$instance = new static();
+            self::$instance = new self();
         }
         return self::$instance;
     }
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 2c4373a5c..c98a20a69 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -6,7 +6,7 @@ namespace Icinga\Web\Controller;
 use Exception;
 use Icinga\Application\Benchmark;
 use Icinga\Application\Config;
-use Icinga\Authentication\Manager;
+use Icinga\Authentication\Auth;
 use Icinga\Exception\Http\HttpMethodNotAllowedException;
 use Icinga\Exception\IcingaException;
 use Icinga\Exception\ProgrammingError;
@@ -52,7 +52,7 @@ class ActionController extends Zend_Controller_Action
     /**
      * Authentication manager
      *
-     * @var Manager|null
+     * @var Auth|null
      */
     private $auth;
 
@@ -124,12 +124,12 @@ class ActionController extends Zend_Controller_Action
     /**
      * Get the authentication manager
      *
-     * @return Manager
+     * @return Auth
      */
     public function Auth()
     {
         if ($this->auth === null) {
-            $this->auth = Manager::getInstance();
+            $this->auth = Auth::getInstance();
         }
         return $this->auth;
     }
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 46c661405..626ac49af 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -8,7 +8,7 @@ use Zend_Form;
 use Zend_Form_Element;
 use Zend_View_Interface;
 use Icinga\Application\Icinga;
-use Icinga\Authentication\Manager;
+use Icinga\Authentication\Auth;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Security\SecurityException;
 use Icinga\Util\Translator;
@@ -179,7 +179,7 @@ class Form extends Zend_Form
     /**
      * Authentication manager
      *
-     * @var Manager|null
+     * @var Auth|null
      */
     private $auth;
 
@@ -1344,12 +1344,12 @@ class Form extends Zend_Form
     /**
      * Get the authentication manager
      *
-     * @return Manager
+     * @return Auth
      */
     public function Auth()
     {
         if ($this->auth === null) {
-            $this->auth = Manager::getInstance();
+            $this->auth = Auth::getInstance();
         }
         return $this->auth;
     }
diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 9b62afbdd..3ad8d347f 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -7,7 +7,7 @@ use RecursiveIterator;
 use Icinga\Application\Config;
 use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
-use Icinga\Authentication\Manager;
+use Icinga\Authentication\Auth;
 use Icinga\Data\ConfigObject;
 use Icinga\Exception\ConfigurationError;
 use Icinga\Exception\ProgrammingError;
@@ -208,7 +208,7 @@ class Menu implements RecursiveIterator
     {
         $menu = new static('menu');
         $menu->addMainMenuItems();
-        $auth = Manager::getInstance();
+        $auth = Auth::getInstance();
         $manager = Icinga::app()->getModuleManager();
         foreach ($manager->getLoadedModules() as $module) {
             if ($auth->hasPermission($manager::MODULE_PERMISSION_NS . $module->getName())) {
@@ -223,7 +223,7 @@ class Menu implements RecursiveIterator
      */
     protected function addMainMenuItems()
     {
-        $auth = Manager::getInstance();
+        $auth = Auth::getInstance();
 
         if ($auth->isAuthenticated()) {
 
diff --git a/library/Icinga/Web/Menu/PermittedMenuItemFilter.php b/library/Icinga/Web/Menu/PermittedMenuItemFilter.php
index 7224c3589..829506c0b 100644
--- a/library/Icinga/Web/Menu/PermittedMenuItemFilter.php
+++ b/library/Icinga/Web/Menu/PermittedMenuItemFilter.php
@@ -3,7 +3,7 @@
 namespace Icinga\Web\Menu;
 
 use RecursiveFilterIterator;
-use Icinga\Authentication\Manager;
+use Icinga\Authentication\Auth;
 use Icinga\Web\Menu;
 
 class PermittedMenuItemFilter extends RecursiveFilterIterator
@@ -18,7 +18,7 @@ class PermittedMenuItemFilter extends RecursiveFilterIterator
         $item = $this->current();
         /** @var Menu $item */
         if (($permission = $item->getPermission()) !== null) {
-            $auth = Manager::getInstance();
+            $auth = Auth::getInstance();
             if (! $auth->isAuthenticated()) {
                 // Don't accept menu item because user is not authenticated and the menu item requires a permission
                 return false;
diff --git a/library/Icinga/Web/View.php b/library/Icinga/Web/View.php
index 79f6f7d70..766516768 100644
--- a/library/Icinga/Web/View.php
+++ b/library/Icinga/Web/View.php
@@ -5,7 +5,7 @@ namespace Icinga\Web;
 
 use Closure;
 use Zend_View_Abstract;
-use Icinga\Authentication\Manager;
+use Icinga\Authentication\Auth;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Util\Translator;
 
@@ -39,7 +39,7 @@ class View extends Zend_View_Abstract
     /**
      * Authentication manager
      *
-     * @var \Icinga\Authentication\Manager|null
+     * @var Auth|null
      */
     private $auth;
 
@@ -164,12 +164,12 @@ class View extends Zend_View_Abstract
     /**
      * Get the authentication manager
      *
-     * @return Manager
+     * @return Auth
      */
     public function Auth()
     {
         if ($this->auth === null) {
-            $this->auth = Manager::getInstance();
+            $this->auth = Auth::getInstance();
         }
         return $this->auth;
     }
diff --git a/library/Icinga/Web/View/helpers/generic.php b/library/Icinga/Web/View/helpers/generic.php
index 08d1e2130..59fa90443 100644
--- a/library/Icinga/Web/View/helpers/generic.php
+++ b/library/Icinga/Web/View/helpers/generic.php
@@ -3,11 +3,11 @@
 
 namespace Icinga\Web\View;
 
-use Icinga\Authentication\Manager;
+use Icinga\Authentication\Auth;
 use Icinga\Web\Widget;
 
 $this->addHelperFunction('auth', function () {
-    return Manager::getInstance();
+    return Auth::getInstance();
 });
 
 $this->addHelperFunction('widget', function ($name, $options = null) {
diff --git a/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php b/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php
index 132012ba9..df901b165 100644
--- a/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php
+++ b/modules/monitoring/library/Monitoring/Web/Menu/MonitoringMenuItemRenderer.php
@@ -3,7 +3,7 @@
 
 namespace Icinga\Module\Monitoring\Web\Menu;
 
-use Icinga\Authentication\Manager;
+use Icinga\Authentication\Auth;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Filterable;
 use Icinga\Web\Menu;
@@ -27,7 +27,7 @@ class MonitoringMenuItemRenderer extends MenuItemRenderer
     protected static function applyRestriction($restriction, Filterable $filterable)
     {
         $restrictions = Filter::matchAny();
-        foreach (Manager::getInstance()->getRestrictions($restriction) as $filter) {
+        foreach (Auth::getInstance()->getRestrictions($restriction) as $filter) {
             $restrictions->addFilter(Filter::fromQueryString($filter));
         }
         $filterable->applyFilter($restrictions);

From 1de1f119d627d7f486143eeabe73b545254840aa Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 28 Jul 2015 17:54:08 +0200
Subject: [PATCH 2679/2920] Fix range selection in IE

Cancel selectstart event on all selectable rows in the action table.

fixes #8768
---
 public/js/icinga/behavior/actiontable.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/js/icinga/behavior/actiontable.js b/public/js/icinga/behavior/actiontable.js
index b3b409491..3f1cf1f9e 100644
--- a/public/js/icinga/behavior/actiontable.js
+++ b/public/js/icinga/behavior/actiontable.js
@@ -373,8 +373,11 @@
         var container = evt.target;
         var self = evt.data.self;
 
-        // initialize all rows with the correct link, to assure that
+        // initialize all rows with the correct link
         $('table.action tr', container).each(function(idx, el) {
+            // IE will not ignore user-select unless we cancel selectstart
+            $(el).on('selectstart', false);
+
             var $a = $('a[href].rowaction', el).first();
             if ($a.length) {
                 // TODO: Find out whether we leak memory on IE with this:

From 2a4e614b5e6be565ce0bc4cb0d46bbaeebb0122e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 28 Jul 2015 19:55:26 +0200
Subject: [PATCH 2680/2920] Fix code style in AuthChain

refs #9660
---
 library/Icinga/Authentication/AuthChain.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/library/Icinga/Authentication/AuthChain.php b/library/Icinga/Authentication/AuthChain.php
index 7354825a2..e62d832aa 100644
--- a/library/Icinga/Authentication/AuthChain.php
+++ b/library/Icinga/Authentication/AuthChain.php
@@ -43,7 +43,7 @@ class AuthChain implements Iterator
     /**
      * Rewind the chain
      *
-     * @return  ConfigObject
+     * @return ConfigObject
      */
     public function rewind()
     {
@@ -64,7 +64,7 @@ class AuthChain implements Iterator
     /**
      * Return the key of the current user backend config
      *
-     * @return  string
+     * @return string
      */
     public function key()
     {
@@ -74,7 +74,7 @@ class AuthChain implements Iterator
     /**
      * Move forward to the next user backend config
      *
-     * @return  ConfigObject
+     * @return ConfigObject
      */
     public function next()
     {
@@ -84,17 +84,17 @@ class AuthChain implements Iterator
     /**
      * Check if the current user backend is valid, i.e. it's enabled and the config is valid
      *
-     * @return  bool
+     * @return bool
      */
     public function valid()
     {
-        if (!$this->config->valid()) {
+        if (! $this->config->valid()) {
             // Stop when there are no more backends to check
             return false;
         }
 
         $backendConfig = $this->config->current();
-        if ((bool) $backendConfig->get('disabled', false) === true) {
+        if ((bool) $backendConfig->get('disabled', false)) {
             $this->next();
             return $this->valid();
         }

From 4d44a0625c35fe9d9779150bca8e805395663c1f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 09:25:14 +0200
Subject: [PATCH 2681/2920] lib: Move UserBackendInterface::authenticate() to
 new interface Authenticatable

refs #9660
---
 .../Icinga/Authentication/Authenticatable.php | 21 +++++++++++++++++++
 .../User/UserBackendInterface.php             | 16 ++------------
 2 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 library/Icinga/Authentication/Authenticatable.php

diff --git a/library/Icinga/Authentication/Authenticatable.php b/library/Icinga/Authentication/Authenticatable.php
new file mode 100644
index 000000000..8c53e2e34
--- /dev/null
+++ b/library/Icinga/Authentication/Authenticatable.php
@@ -0,0 +1,21 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Authentication;
+
+use Icinga\User;
+
+interface Authenticatable
+{
+    /**
+     * Authenticate a user
+     *
+     * @param   User    $user
+     * @param   string  $password
+     *
+     * @return  bool
+     *
+     * @throws  \Icinga\Exception\AuthenticationException If authentication errors
+     */
+    public function authenticate(User $user, $password);
+}
diff --git a/library/Icinga/Authentication/User/UserBackendInterface.php b/library/Icinga/Authentication/User/UserBackendInterface.php
index cfb2e3753..6903e880d 100644
--- a/library/Icinga/Authentication/User/UserBackendInterface.php
+++ b/library/Icinga/Authentication/User/UserBackendInterface.php
@@ -3,13 +3,13 @@
 
 namespace Icinga\Authentication\User;
 
-use Icinga\Exception\AuthenticationException;
+use Icinga\Authentication\Authenticatable;
 use Icinga\User;
 
 /**
  * Interface for user backends
  */
-interface UserBackendInterface
+interface UserBackendInterface extends Authenticatable
 {
     /**
      * Set this backend's name
@@ -26,16 +26,4 @@ interface UserBackendInterface
      * @return  string
      */
     public function getName();
-
-    /**
-     * Authenticate the given user
-     *
-     * @param   User        $user
-     * @param   string      $password
-     *
-     * @return  bool                        True on success, false on failure
-     *
-     * @throws  AuthenticationException     In case authentication is not possible due to an error
-     */
-    public function authenticate(User $user, $password);
 }

From 83aafe8cda20848af1b92859f9f52b21687e66e3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 29 Jul 2015 09:26:53 +0200
Subject: [PATCH 2682/2920] Allow to discover LDAP connections in the wizard as
 well

...
---
 .../Authentication/User/UserBackend.php       |  7 +----
 .../application/forms/AuthBackendPage.php     | 31 +++++++------------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/library/Icinga/Authentication/User/UserBackend.php b/library/Icinga/Authentication/User/UserBackend.php
index 2bd9e7cae..898de5909 100644
--- a/library/Icinga/Authentication/User/UserBackend.php
+++ b/library/Icinga/Authentication/User/UserBackend.php
@@ -164,12 +164,7 @@ class UserBackend
             );
         }
 
-        if ($backendConfig->resource instanceof ConfigObject) {
-            $resource = ResourceFactory::createResource($backendConfig->resource);
-        } else {
-            $resource = ResourceFactory::create($backendConfig->resource);
-        }
-
+        $resource = ResourceFactory::create($backendConfig->resource);
         switch ($backendType) {
             case 'db':
                 $backend = new DbUserBackend($resource);
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index ceeb08ed7..4eb4ca504 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -3,7 +3,8 @@
 
 namespace Icinga\Module\Setup\Forms;
 
-use Icinga\Data\ConfigObject;
+use Icinga\Application\Config;
+use Icinga\Data\ResourceFactory;
 use Icinga\Forms\Config\UserBackendConfigForm;
 use Icinga\Forms\Config\UserBackend\DbBackendForm;
 use Icinga\Forms\Config\UserBackend\LdapBackendForm;
@@ -40,22 +41,18 @@ class AuthBackendPage extends Form
      */
     public function setResourceConfig(array $config)
     {
+        $resourceConfig = new Config();
+        $resourceConfig->setSection($config['name'], $config);
+        ResourceFactory::setConfig($resourceConfig);
+
         $this->config = $config;
         return $this;
     }
 
     /**
-     * Return the resource configuration as Config object
+     * Create and add elements to this form
      *
-     * @return  ConfigObject
-     */
-    public function getResourceConfig()
-    {
-        return new ConfigObject($this->config);
-    }
-
-    /**
-     * @see Form::createElements()
+     * @param   array   $formData
      */
     public function createElements(array $formData)
     {
@@ -74,7 +71,9 @@ class AuthBackendPage extends Form
             ));
         } elseif ($this->config['type'] === 'ldap') {
             $backendForm = new LdapBackendForm();
-            $backendForm->create($formData)->removeElement('resource');
+            $backendForm->setResources(array($this->config['name']));
+            $backendForm->create($formData);
+            $backendForm->getElement('resource')->setIgnore(true);
             $this->addDescription($this->translate(
                 'Before you are able to authenticate using the LDAP connection defined earlier you need to'
                 . ' provide some more information so that Icinga Web 2 is able to locate account details.'
@@ -139,13 +138,7 @@ class AuthBackendPage extends Form
 
         if ($this->config['type'] === 'ldap' && (! isset($data['skip_validation']) || $data['skip_validation'] == 0)) {
             $self = clone $this;
-            $self->addElement(
-                'text',
-                'resource',
-                array(
-                    'value' => $this->getResourceConfig()
-                )
-            );
+            $self->getSubForm('backend_form')->getElement('resource')->setIgnore(false);
             $inspection = UserBackendConfigForm::inspectUserBackend($self);
             if ($inspection && $inspection->hasError()) {
                 $this->error($inspection->getError());

From e8af4295b14bb1d026c71629c47a9066e1b1318b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 29 Jul 2015 10:52:32 +0200
Subject: [PATCH 2683/2920] Allow to manually validate the configuration in the
 wizard as well

It's a mess...
---
 .../forms/Setup/IdoResourcePage.php           | 47 ++++++++++++++++++
 .../library/Monitoring/MonitoringWizard.php   | 13 +++++
 .../application/forms/AuthBackendPage.php     | 49 +++++++++++++++++++
 .../application/forms/DbResourcePage.php      | 30 ++++++++++++
 .../application/forms/LdapResourcePage.php    | 47 ++++++++++++++++++
 modules/setup/library/Setup/WebWizard.php     | 21 ++++++++
 6 files changed, 207 insertions(+)

diff --git a/modules/monitoring/application/forms/Setup/IdoResourcePage.php b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
index ea244d057..e0b74c3ac 100644
--- a/modules/monitoring/application/forms/Setup/IdoResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
@@ -21,6 +21,7 @@ class IdoResourcePage extends Form
         $this->addDescription($this->translate(
             'Please fill out the connection details below to access the IDO database of your monitoring environment.'
         ));
+        $this->setValidatePartial(true);
     }
 
     /**
@@ -96,6 +97,52 @@ class IdoResourcePage extends Form
         return true;
     }
 
+    /**
+     * Run the configured backend's inspection checks and show the result, if necessary
+     *
+     * This will only run any validation if the user pushed the 'backend_validation' button.
+     *
+     * @param   array   $formData
+     *
+     * @return  bool
+     */
+    public function isValidPartial(array $formData)
+    {
+        if (isset($formData['backend_validation']) && parent::isValid($formData)) {
+            $inspection = ResourceConfigForm::inspectResource($this);
+            if ($inspection !== null) {
+                $join = function ($e) use (& $join) {
+                    return is_string($e) ? $e : join("\n", array_map($join, $e));
+                };
+                $this->addElement(
+                    'note',
+                    'inspection_output',
+                    array(
+                        'order'         => 0,
+                        'value'         => '<strong>' . $this->translate('Validation Log') . "</strong>\n\n"
+                            . join("\n", array_map($join, $inspection->toArray())),
+                        'decorators'    => array(
+                            'ViewHelper',
+                            array('HtmlTag', array('tag' => 'pre', 'class' => 'log-output')),
+                        )
+                    )
+                );
+
+                if ($inspection->hasError()) {
+                    $this->warning(sprintf(
+                        $this->translate('Failed to successfully validate the configuration: %s'),
+                        $inspection->getError()
+                    ));
+                    return false;
+                }
+            }
+
+            $this->info($this->translate('The configuration has been successfully validated.'));
+        }
+
+        return true;
+    }
+
     /**
      * Add a checkbox to the form by which the user can skip the resource validation
      *
diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index b91129d10..0a224610c 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -114,6 +114,19 @@ class MonitoringWizard extends Wizard implements SetupWizard
                 mt('monitoring', 'Setup the monitoring module for Icinga Web 2', 'setup.summary.btn.finish')
             );
         }
+
+        if ($page->getName() === 'setup_monitoring_ido') {
+            $page->addElement(
+                'submit',
+                'backend_validation',
+                array(
+                    'ignore'        => true,
+                    'label'         => t('Validate Configuration'),
+                    'decorators'    => array('ViewHelper')
+                )
+            );
+            $page->getDisplayGroup('buttons')->addElement($page->getElement('backend_validation'));
+        }
     }
 
     /**
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index 4eb4ca504..4c37a2967 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -30,6 +30,7 @@ class AuthBackendPage extends Form
     {
         $this->setName('setup_authentication_backend');
         $this->setTitle($this->translate('Authentication Backend', 'setup.page.title'));
+        $this->setValidatePartial(true);
     }
 
     /**
@@ -150,6 +151,54 @@ class AuthBackendPage extends Form
         return true;
     }
 
+    /**
+     * Run the configured backend's inspection checks and show the result, if necessary
+     *
+     * This will only run any validation if the user pushed the 'backend_validation' button.
+     *
+     * @param   array   $formData
+     *
+     * @return  bool
+     */
+    public function isValidPartial(array $formData)
+    {
+        if (isset($formData['backend_validation']) && parent::isValid($formData)) {
+            $self = clone $this;
+            $self->getSubForm('backend_form')->getElement('resource')->setIgnore(false);
+            $inspection = UserBackendConfigForm::inspectUserBackend($self);
+            if ($inspection !== null) {
+                $join = function ($e) use (& $join) {
+                    return is_string($e) ? $e : join("\n", array_map($join, $e));
+                };
+                $this->addElement(
+                    'note',
+                    'inspection_output',
+                    array(
+                        'order'         => 0,
+                        'value'         => '<strong>' . $this->translate('Validation Log') . "</strong>\n\n"
+                            . join("\n", array_map($join, $inspection->toArray())),
+                        'decorators'    => array(
+                            'ViewHelper',
+                            array('HtmlTag', array('tag' => 'pre', 'class' => 'log-output')),
+                        )
+                    )
+                );
+
+                if ($inspection->hasError()) {
+                    $this->warning(sprintf(
+                        $this->translate('Failed to successfully validate the configuration: %s'),
+                        $inspection->getError()
+                    ));
+                    return false;
+                }
+            }
+
+            $this->info($this->translate('The configuration has been successfully validated.'));
+        }
+
+        return true;
+    }
+
     /**
      * Add a checkbox to this form by which the user can skip the authentication validation
      */
diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php
index e9967f350..a0faf932d 100644
--- a/modules/setup/application/forms/DbResourcePage.php
+++ b/modules/setup/application/forms/DbResourcePage.php
@@ -23,6 +23,7 @@ class DbResourcePage extends Form
             'Now please configure your database resource. Note that the database itself does not need to'
             . ' exist at this time as it is going to be created once the wizard is about to be finished.'
         ));
+        $this->setValidatePartial(true);
     }
 
     /**
@@ -84,6 +85,35 @@ class DbResourcePage extends Form
         return true;
     }
 
+    /**
+     * Check whether it's possible to connect to the database server
+     *
+     * This will only run the check if the user pushed the 'backend_validation' button.
+     *
+     * @param   array   $formData
+     *
+     * @return  bool
+     */
+    public function isValidPartial(array $formData)
+    {
+        if (isset($formData['backend_validation']) && parent::isValid($formData)) {
+            try {
+                $db = new DbTool($this->getValues());
+                $db->checkConnectivity();
+            } catch (PDOException $e) {
+                $this->warning(sprintf(
+                    $this->translate('Failed to successfully validate the configuration: %s'),
+                    $e->getMessage()
+                ));
+                return false;
+            }
+
+            $this->info($this->translate('The configuration has been successfully validated.'));
+        }
+
+        return true;
+    }
+
     /**
      * Add a checkbox to the form by which the user can skip the connection validation
      */
diff --git a/modules/setup/application/forms/LdapResourcePage.php b/modules/setup/application/forms/LdapResourcePage.php
index 316b66f31..2c558dfbb 100644
--- a/modules/setup/application/forms/LdapResourcePage.php
+++ b/modules/setup/application/forms/LdapResourcePage.php
@@ -23,6 +23,7 @@ class LdapResourcePage extends Form
             'Now please configure your AD/LDAP resource. This will later '
             . 'be used to authenticate users logging in to Icinga Web 2.'
         ));
+        $this->setValidatePartial(true);
     }
 
     /**
@@ -82,6 +83,52 @@ class LdapResourcePage extends Form
         return true;
     }
 
+    /**
+     * Run the configured backend's inspection checks and show the result, if necessary
+     *
+     * This will only run any validation if the user pushed the 'backend_validation' button.
+     *
+     * @param   array   $formData
+     *
+     * @return  bool
+     */
+    public function isValidPartial(array $formData)
+    {
+        if (isset($formData['backend_validation']) && parent::isValid($formData)) {
+            $inspection = ResourceConfigForm::inspectResource($this);
+            if ($inspection !== null) {
+                $join = function ($e) use (& $join) {
+                    return is_string($e) ? $e : join("\n", array_map($join, $e));
+                };
+                $this->addElement(
+                    'note',
+                    'inspection_output',
+                    array(
+                        'order'         => 0,
+                        'value'         => '<strong>' . $this->translate('Validation Log') . "</strong>\n\n"
+                            . join("\n", array_map($join, $inspection->toArray())),
+                        'decorators'    => array(
+                            'ViewHelper',
+                            array('HtmlTag', array('tag' => 'pre', 'class' => 'log-output')),
+                        )
+                    )
+                );
+
+                if ($inspection->hasError()) {
+                    $this->warning(sprintf(
+                        $this->translate('Failed to successfully validate the configuration: %s'),
+                        $inspection->getError()
+                    ));
+                    return false;
+                }
+            }
+
+            $this->info($this->translate('The configuration has been successfully validated.'));
+        }
+
+        return true;
+    }
+
     /**
      * Add a checkbox to the form by which the user can skip the connection validation
      */
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 1addf6283..cd1df67f4 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -296,6 +296,27 @@ class WebWizard extends Wizard implements SetupWizard
         } elseif ($index === count($pages) - 1) {
             $page->getElement(static::BTN_NEXT)->setLabel(mt('setup', 'Setup Icinga Web 2', 'setup.summary.btn.finish'));
         }
+
+        $authData = $this->getPageData('setup_authentication_type');
+        $veto = $page->getName() === 'setup_authentication_backend' && $authData['type'] === 'db';
+        if (! $veto && in_array($page->getName(), array(
+            'setup_authentication_backend',
+            'setup_auth_db_resource',
+            'setup_config_db_resource',
+            'setup_ldap_resource',
+            'setup_monitoring_ido'
+        ))) {
+            $page->addElement(
+                'submit',
+                'backend_validation',
+                array(
+                    'ignore'        => true,
+                    'label'         => t('Validate Configuration'),
+                    'decorators'    => array('ViewHelper')
+                )
+            );
+            $page->getDisplayGroup('buttons')->addElement($page->getElement('backend_validation'));
+        }
     }
 
     /**

From 2e8b7425a12b0671630e2e5fb7f4a5ecbb6eefe7 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 29 Jul 2015 11:41:17 +0200
Subject: [PATCH 2684/2920] Make servicegroup table an action table

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

diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index ba160af42..fc336aca5 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -15,7 +15,7 @@ if (count($servicegroups) === 0) {
     return;
 }
 ?>
-  <table class="groupview" data-base-target="_next">
+  <table class="groupview action" data-base-target="_next">
     <thead>
       <th><?= $this->translate('Last Problem'); ?></th>
       <th><?= $this->translate('Service Group'); ?></th>

From ecdc03a2d73bd533ae9f4186056fe1427a0dd798 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 29 Jul 2015 11:41:53 +0200
Subject: [PATCH 2685/2920] Fix selection lost after pushing refresh

Remove old row action code that interfered with action table behavior.

refs #8623
---
 public/js/icinga/loader.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index da23ebea8..32722cb6b 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -587,8 +587,6 @@
                         if (req.$target[0].id === 'col1') {
                             self.icinga.behaviors.navigation.resetActive();
                         }
-                    } else if ($(el).closest('table.action').length) {
-                        $(el).closest('table.action').find('.active').removeClass('active');
                     }
                 });
 
@@ -604,8 +602,6 @@
                         }
                         // Interrupt .each, only on menu item shall be active
                         return false;
-                    } else if ($(el).closest('table.action').length) {
-                        $el.addClass('active');
                     }
                 });
             }

From 22bcc790ef8bdae6b853ec6c6c9625c2424a6857 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 29 Jul 2015 12:30:39 +0200
Subject: [PATCH 2686/2920] Wizard: Prevent the width of header steps from
 exceeding 100% in total

---
 .../setup/application/views/scripts/index/index.phtml  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/setup/application/views/scripts/index/index.phtml b/modules/setup/application/views/scripts/index/index.phtml
index a55cfa198..cc087554e 100644
--- a/modules/setup/application/views/scripts/index/index.phtml
+++ b/modules/setup/application/views/scripts/index/index.phtml
@@ -80,7 +80,10 @@ if ($notifications->hasMessages()) {
               $pos < $maxProgress ? ' visited' : ($currentPos > 2 ? ' active' : '')
             ); ?>
             <?php if ($page === $firstPage): ?>
-            <div class="line left<?= $stateClass; ?>" style="float: left; width: <?= $lineWidth; ?>%; margin-right: 0"></div>
+            <div class="line left<?= $stateClass; ?>" style="float: left; width: <?= sprintf(
+                '%.2F',
+                100 - (count($configPagesLeft) - 1) * $lineWidth
+            ); ?>%; margin-right: 0"></div>
             <?php elseif ($page === $lastPage): ?>
             <div class="line<?= $stateClass; ?>" style="float: left; width: <?= $lineWidth; ?>%; margin-right: -0.1em;"></div>
             <?php else: ?>
@@ -109,7 +112,10 @@ if ($notifications->hasMessages()) {
             <?php if ($page === $firstPage): ?>
             <div class="line<?= $stateClass; ?>" style="float: left; width: <?= $lineWidth; ?>%; margin-left: -0.1em;"></div>
             <?php elseif ($page === $lastPage): ?>
-            <div class="line right<?= $stateClass; ?>" style="float: left; width: <?= $lineWidth; ?>%; margin-left: 0;"></div>
+            <div class="line right<?= $stateClass; ?>" style="float: left; width: <?= sprintf(
+                '%.2F',
+                100 - (count($configPagesRight) - 1) * $lineWidth
+            ); ?>%; margin-left: 0;"></div>
             <?php else: ?>
             <div class="line<?= $stateClass; ?>" style="float: left; width: <?= $lineWidth; ?>%;"></div>
             <?php endif ?>

From 84f35bc79af4509c9e1730f21ba0567e60f7e3c5 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 29 Jul 2015 12:34:49 +0200
Subject: [PATCH 2687/2920] Fix last push url in history

Fix issue in history that caused some states to be swallowed by pushUrl, after going back and then trying to update to the previous state.
---
 public/js/icinga/history.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/js/icinga/history.js b/public/js/icinga/history.js
index a3f45e93d..db83dda87 100644
--- a/public/js/icinga/history.js
+++ b/public/js/icinga/history.js
@@ -139,8 +139,10 @@
                 icinga.logger.debug('History state', event.originalEvent.state);
             }
 
-            self.applyLocationBar();
+            // keep the last pushed url in sync with history changes
+            self.lastPushUrl = location.href;
 
+            self.applyLocationBar();
         },
 
         applyLocationBar: function (onload) {

From 13edbf901dfc70b74de2c8c27596454df1373077 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 29 Jul 2015 13:44:26 +0200
Subject: [PATCH 2688/2920] UserBackend: Implement interface ConfigAwareFactory

refs #9609
---
 .../Application/ApplicationBootstrap.php      | 19 +++++++
 library/Icinga/Application/Cli.php            |  1 +
 library/Icinga/Application/Web.php            |  1 +
 .../Authentication/User/UserBackend.php       | 51 +++++++++++++++++--
 4 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index 6f409789a..a8d185023 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -7,6 +7,7 @@ use ErrorException;
 use Exception;
 use LogicException;
 use Icinga\Application\Modules\Manager as ModuleManager;
+use Icinga\Authentication\User\UserBackend;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;
@@ -544,6 +545,24 @@ abstract class ApplicationBootstrap
         return $this;
     }
 
+    /**
+     * Set up the user backend factory
+     *
+     * @return  $this
+     */
+    protected function setupUserBackendFactory()
+    {
+        try {
+            UserBackend::setConfig(Config::app('authentication'));
+        } catch (NotReadableError $e) {
+            Logger::error(
+                new IcingaException('Cannot load user backend configuration. An exception was thrown:', $e)
+            );
+        }
+
+        return $this;
+    }
+
     /**
      * Detect the timezone
      *
diff --git a/library/Icinga/Application/Cli.php b/library/Icinga/Application/Cli.php
index 4f83c7537..7d2376950 100644
--- a/library/Icinga/Application/Cli.php
+++ b/library/Icinga/Application/Cli.php
@@ -43,6 +43,7 @@ class Cli extends ApplicationBootstrap
             ->setupLogger()
             ->setupResourceFactory()
             ->setupModuleManager()
+            ->setupUserBackendFactory()
             ->loadSetupModuleIfNecessary();
     }
 
diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 0add09089..ffd653235 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -99,6 +99,7 @@ class Web extends ApplicationBootstrap
             ->setupZendMvc()
             ->setupFormNamespace()
             ->setupModuleManager()
+            ->setupUserBackendFactory()
             ->loadSetupModuleIfNecessary()
             ->loadEnabledModules()
             ->setupRoute()
diff --git a/library/Icinga/Authentication/User/UserBackend.php b/library/Icinga/Authentication/User/UserBackend.php
index 2bd9e7cae..63b5bbcd7 100644
--- a/library/Icinga/Authentication/User/UserBackend.php
+++ b/library/Icinga/Authentication/User/UserBackend.php
@@ -9,11 +9,12 @@ use Icinga\Application\Icinga;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;
+use Icinga\Util\ConfigAwareFactory;
 
 /**
  * Factory for user backends
  */
-class UserBackend
+class UserBackend implements ConfigAwareFactory
 {
     /**
      * The default user backend types provided by Icinga Web 2
@@ -34,6 +35,48 @@ class UserBackend
      */
     protected static $customBackends;
 
+    /**
+     * User backend configuration
+     *
+     * @var Config
+     */
+    private static $backends;
+
+    /**
+     * Set user backend configuration
+     *
+     * @param   Config  $config
+     */
+    public static function setConfig($config)
+    {
+        self::$backends = $config;
+    }
+
+    /**
+     * Return the configuration of all existing user backends
+     *
+     * @return  Config
+     */
+    public static function getBackendConfigs()
+    {
+        self::assertBackendsExist();
+        return self::$backends;
+    }
+
+    /**
+     * Check if any user backends exist. If not, throw an error.
+     *
+     * @throws  ConfigurationError
+     */
+    private static function assertBackendsExist()
+    {
+        if (self::$backends === null) {
+            throw new ConfigurationError(
+                'User backends not set up. Please contact your Icinga Web administrator'
+            );
+        }
+    }
+
     /**
      * Register all custom user backends from all loaded modules
      */
@@ -110,9 +153,9 @@ class UserBackend
     public static function create($name, ConfigObject $backendConfig = null)
     {
         if ($backendConfig === null) {
-            $authConfig = Config::app('authentication');
-            if ($authConfig->hasSection($name)) {
-                $backendConfig = $authConfig->getSection($name);
+            self::assertBackendsExist();
+            if (self::$backends->hasSection($name)) {
+                $backendConfig = self::$backends->getSection($name);
             } else {
                 throw new ConfigurationError('User backend "%s" does not exist', $name);
             }

From 155bcc5db76b48e3fd6eb81a069f531c2ccec3fe Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 29 Jul 2015 13:45:18 +0200
Subject: [PATCH 2689/2920] LdapUserGroupBackendForm: Fetch config from the
 factory, not the app

refs #9609
---
 .../forms/Config/UserGroup/LdapUserGroupBackendForm.php        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
index 6190ab404..68b4de702 100644
--- a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
+++ b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
@@ -3,7 +3,6 @@
 
 namespace Icinga\Forms\Config\UserGroup;
 
-use Icinga\Application\Config;
 use Icinga\Authentication\User\UserBackend;
 use Icinga\Authentication\UserGroup\LdapUserGroupBackend;
 use Icinga\Data\ConfigObject;
@@ -293,7 +292,7 @@ class LdapUserGroupBackendForm extends Form
     protected function getLdapUserBackendNames(LdapConnection $resource)
     {
         $names = array();
-        foreach (Config::app('authentication') as $name => $config) {
+        foreach (UserBackend::getBackendConfigs() as $name => $config) {
             if (in_array(strtolower($config->backend), array('ldap', 'msldap'))) {
                 $backendResource = ResourceFactory::create($config->resource);
                 if (

From 745e30259dc73e84321ab776164d1822f9212897 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 14:11:54 +0200
Subject: [PATCH 2690/2920] lib: Implement AuthChain::authenticate()

Right now the LoginController has all the authentication which is kind of a mess. Further, the upcoming basic access authentication has to reuse this code.
Thus AuthChain::authenticate() is introduced to handle both cases.

refs #9660
---
 library/Icinga/Authentication/AuthChain.php | 175 ++++++++++++++++++--
 1 file changed, 161 insertions(+), 14 deletions(-)

diff --git a/library/Icinga/Authentication/AuthChain.php b/library/Icinga/Authentication/AuthChain.php
index e62d832aa..5d3028047 100644
--- a/library/Icinga/Authentication/AuthChain.php
+++ b/library/Icinga/Authentication/AuthChain.php
@@ -4,40 +4,181 @@
 namespace Icinga\Authentication;
 
 use Iterator;
-use Icinga\Data\ConfigObject;
-use Icinga\Authentication\User\UserBackend;
-use Icinga\Authentication\User\UserBackendInterface;
 use Icinga\Application\Config;
 use Icinga\Application\Logger;
+use Icinga\Authentication\User\ExternalBackend;
+use Icinga\Authentication\User\UserBackend;
+use Icinga\Authentication\User\UserBackendInterface;
+use Icinga\Data\ConfigObject;
+use Icinga\Exception\AuthenticationException;
 use Icinga\Exception\ConfigurationError;
+use Icinga\Exception\NotReadableError;
+use Icinga\User;
 
 /**
  * Iterate user backends created from config
  */
-class AuthChain implements Iterator
+class AuthChain implements Authenticatable, Iterator
 {
+    /**
+     * Authentication config file
+     *
+     * @var string
+     */
+    const AUTHENTICATION_CONFIG = 'authentication';
+
+    /**
+     * Error code if the authentication configuration was not readable
+     *
+     * @var int
+     */
+    const EPERM = 1;
+
+    /**
+     * Error code if the authentication configuration is empty
+     */
+    const EEMPTY = 2;
+
+    /**
+     * Error code if all authentication methods failed
+     *
+     * @var int
+     */
+    const EFAIL = 3;
+
+    /**
+     * Error code if not all authentication methods were available
+     *
+     * @var int
+     */
+    const ENOTALL = 4;
+
+    /**
+     * External user backends are excluded by the iterator
+     *
+     * @var int
+     */
+    const IT_MODE_NOT_EXTERNAL = 1;
+
     /**
      * User backends configuration
      *
      * @var Config
      */
-    private $config;
+    protected $config;
 
     /**
      * The consecutive user backend while looping
      *
      * @var UserBackendInterface
      */
-    private $currentBackend;
+    protected $currentBackend;
+
+    /**
+     * Last error code
+     *
+     * @var int|null
+     */
+    protected $error;
+
+    /**
+     * Mode of iteration
+     *
+     * @var int
+     */
+    protected $iteratorMode;
 
     /**
      * Create a new authentication chain from config
      *
      * @param Config $config User backends configuration
      */
-    public function __construct(Config $config)
+    public function __construct(Config $config = null)
     {
-        $this->config = $config;
+        if ($config === null) {
+            try {
+                $this->config = Config::app(static::AUTHENTICATION_CONFIG);
+            } catch (NotReadableError $e) {
+                $this->config = new Config();
+                $this->error = static::EPERM;
+            }
+        } else {
+            $this->config = $config;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function authenticate(User $user, $password)
+    {
+        $this->error = null;
+        $backendsTried = 0;
+        $backendsWithError = 0;
+        foreach ($this as $backend) {
+            ++$backendsTried;
+            try {
+                $authenticated = $backend->authenticate($user, $password);
+            } catch (AuthenticationException $e) {
+                Logger::error($e);
+                ++$backendsWithError;
+                continue;
+            }
+            if ($authenticated) {
+                return true;
+            }
+        }
+        if ($backendsTried === 0) {
+            $this->error = static::EEMPTY;
+        } elseif ($backendsTried === $backendsWithError) {
+            $this->error = static::EFAIL;
+        } elseif ($backendsWithError) {
+            $this->error = static::ENOTALL;
+        }
+        return false;
+    }
+
+    /**
+     * Get the last error code
+     *
+     * @return int|null
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * Whether authentication had errors
+     *
+     * @return bool
+     */
+    public function hasError()
+    {
+        return $this->error !== null;
+    }
+
+    /**
+     * Get the iterator mode
+     *
+     * @return int
+     */
+    public function getIteratorMode()
+    {
+        return $this->iteratorMode;
+    }
+
+    /**
+     * Set the iterator mode
+     *
+     * @param   int $iteratorMode
+     *
+     * @return  $this
+     */
+    public function setIteratorMode($iteratorMode)
+    {
+        $this->iteratorMode = (int) $iteratorMode;
+        return $this;
     }
 
     /**
@@ -52,7 +193,7 @@ class AuthChain implements Iterator
     }
 
     /**
-     * Return the current user backend
+     * Get the current user backend
      *
      * @return UserBackendInterface
      */
@@ -62,7 +203,7 @@ class AuthChain implements Iterator
     }
 
     /**
-     * Return the key of the current user backend config
+     * Get the key of the current user backend config
      *
      * @return string
      */
@@ -82,7 +223,8 @@ class AuthChain implements Iterator
     }
 
     /**
-     * Check if the current user backend is valid, i.e. it's enabled and the config is valid
+     * Check whether the current user backend is valid, i.e. it's enabled, not an external user backend and whether its
+     * config is valid
      *
      * @return bool
      */
@@ -105,15 +247,20 @@ class AuthChain implements Iterator
         } catch (ConfigurationError $e) {
             Logger::error(
                 new ConfigurationError(
-                    'Cannot create authentication backend "%s". An exception was thrown:',
-                    $name,
-                    $e
+                    'Can\'t create authentication backend "%s". An exception was thrown:',  $name,  $e
                 )
             );
             $this->next();
             return $this->valid();
         }
 
+        if ($this->iteratorMode === static::IT_MODE_NOT_EXTERNAL
+            && $backend instanceof ExternalBackend
+        ) {
+            $this->next();
+            return $this->valid();
+        }
+
         $this->currentBackend = $backend;
         return true;
     }

From ae4b7144cddde288f15a5e170c48d15f658b4b8f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 14:14:19 +0200
Subject: [PATCH 2691/2920] lib: Implement Auth::getAuthChain()

Saves one use statement for auth chain usages.

refs #9660
---
 library/Icinga/Authentication/Auth.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Authentication/Auth.php b/library/Icinga/Authentication/Auth.php
index c68f4cd80..99cfc9e99 100644
--- a/library/Icinga/Authentication/Auth.php
+++ b/library/Icinga/Authentication/Auth.php
@@ -4,12 +4,12 @@
 namespace Icinga\Authentication;
 
 use Exception;
-use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Application\Config;
+use Icinga\Application\Logger;
+use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Data\ConfigObject;
 use Icinga\Exception\IcingaException;
 use Icinga\Exception\NotReadableError;
-use Icinga\Application\Logger;
 use Icinga\User;
 use Icinga\User\Preferences;
 use Icinga\User\Preferences\PreferencesStore;
@@ -49,6 +49,16 @@ class Auth
         return self::$instance;
     }
 
+    /**
+     * Get the auth chain
+     *
+     * @return AuthChain
+     */
+    public function getAuthChain()
+    {
+        return new AuthChain();
+    }
+
     public function setAuthenticated(User $user, $persist = true)
     {
         $username = $user->getUsername();

From db78f810ff9afd632a7ae1df5a7e6fd5f53982a5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 14:15:11 +0200
Subject: [PATCH 2692/2920] lib: Add log in functionality to the LoginForm

refs #9660
---
 .../forms/Authentication/LoginForm.php        | 96 ++++++++++++++++++-
 1 file changed, 93 insertions(+), 3 deletions(-)

diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index d4f0e8745..21e19b09b 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -3,16 +3,24 @@
 
 namespace Icinga\Forms\Authentication;
 
+use Icinga\Authentication\Auth;
+use Icinga\Authentication\User\ExternalBackend;
+use Icinga\User;
 use Icinga\Web\Form;
 use Icinga\Web\Url;
 
 /**
- * Class LoginForm
+ * Form for user authentication
  */
 class LoginForm extends Form
 {
     /**
-     * Initialize this login form
+     * Redirect URL
+     */
+    const REDIRECT_URL = 'dashboard';
+
+    /**
+     * {@inheritdoc}
      */
     public function init()
     {
@@ -22,7 +30,7 @@ class LoginForm extends Form
     }
 
     /**
-     * @see Form::createElements()
+     * {@inheritdoc}
      */
     public function createElements(array $formData)
     {
@@ -54,4 +62,86 @@ class LoginForm extends Form
             )
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRedirectUrl()
+    {
+        $redirect = null;
+        if ($this->created) {
+            $redirect = $this->getElement('redirect')->getValue();
+        }
+        if (empty($redirect)) {
+            $redirect = static::REDIRECT_URL;
+        }
+        return Url::fromPath($redirect);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function onSuccess()
+    {
+        $auth = Auth::getInstance();
+        $authChain = $auth->getAuthChain();
+        $authChain->setIteratorMode($authChain::IT_MODE_NOT_EXTERNAL);
+        $user = new User($this->getElement('username')->getValue());
+        $password = $this->getElement('password')->getValue();
+        $authenticated = $authChain->authenticate($user, $password);
+        if ($authenticated) {
+            $auth->setAuthenticated($user);
+            return true;
+        }
+        switch ($authChain->getError()) {
+            case $authChain::EEMPTY:
+                $this->addError($this->translate(
+                    'No authentication methods available.'
+                    . ' Did you create authentication.ini when setting up Icinga Web 2?'
+                ));
+                break;
+            case $authChain::EFAIL:
+                $this->addError($this->translate(
+                    'All configured authentication methods failed.'
+                    . ' Please check the system log or Icinga Web 2 log for more information.'
+                ));
+                break;
+            case $authChain::ENOTALL:
+                $this->addError($this->translate(
+                    'Please note that not all authentication methods were available.'
+                    . ' Check the system log or Icinga Web 2 log for more information.'
+                ));
+                // Move to default
+            default:
+                $this->getElement('password')->addError($this->translate('Incorrect username or password'));
+                break;
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function onRequest()
+    {
+        $auth = Auth::getInstance();
+        $onlyExternal = true;
+        $user = new User('');
+        foreach ($auth->getAuthChain() as $backend) {
+            if ($backend instanceof ExternalBackend) {
+                if ($backend->authenticate($user)) {
+                    $auth->setAuthenticated($user);
+                    $this->getResponse()->redirectAndExit($this->getRedirectUrl());
+                }
+            } else {
+                $onlyExternal = false;
+            }
+        }
+        if ($onlyExternal) {
+            $this->addError($this->translate(
+                'You\'re currently not authenticated using any of the web server\'s authentication mechanisms.'
+                . ' Make sure you\'ll configure such, otherwise you\'ll not be able to login.'
+            ));
+        }
+    }
 }

From c5c7b401332f29819e1f8694adafcdc35780ec73 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 14:16:14 +0200
Subject: [PATCH 2693/2920] Remove info box about external auth requirement in
 the login view script

The LoginForm will add the info.

refs #9660
---
 application/views/scripts/authentication/login.phtml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index 1bd7dc562..34a631778 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -17,11 +17,6 @@
       '<a href="' . $this->href('setup') . '" title="' . $this->translate('Icinga Web 2 Setup-Wizard') . '">',
       '</a>'
     ); ?></p>
-    <?php elseif ($requiresExternalAuth): ?>
-    <p class="info-box"><?= $this->icon('info'); ?><?= $this->translate(
-      'You\'re currently not authenticated using any of the web server\'s authentication mechanisms.'
-      . ' Make sure you\'ll configure such, otherwise you\'ll not be able to login.'
-    ); ?></p>
     <?php endif ?>
     <?= $this->form ?>
     <div class="footer">Icinga Web 2 &copy; 2013-2015<br><a href="https://www.icinga.org"><?= $this->translate('The Icinga Project'); ?></a></div>

From 23fcd39503acf1ab00fa4432ad28f08ef44b562e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 14:17:07 +0200
Subject: [PATCH 2694/2920] Relax auth controller complexity

refs #9660
---
 .../controllers/AuthenticationController.php  | 131 ++----------------
 1 file changed, 13 insertions(+), 118 deletions(-)

diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index 4d6fe9928..84efb9e09 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -6,20 +6,14 @@
 use Icinga\Application\Config;
 use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
-use Icinga\Authentication\AuthChain;
-use Icinga\Authentication\User\ExternalBackend;
-use Icinga\Exception\AuthenticationException;
-use Icinga\Exception\ConfigurationError;
-use Icinga\Exception\NotReadableError;
 use Icinga\Forms\Authentication\LoginForm;
-use Icinga\User;
-use Icinga\Web\Controller\ActionController;
+use Icinga\Web\Controller;
 use Icinga\Web\Url;
 
 /**
  * Application wide controller for authentication
  */
-class AuthenticationController extends ActionController
+class AuthenticationController extends Controller
 {
     /**
      * This controller does not require authentication
@@ -34,118 +28,19 @@ class AuthenticationController extends ActionController
     public function loginAction()
     {
         $icinga = Icinga::app();
-        if ($icinga->setupTokenExists() && $icinga->requiresSetup()) {
+        if (($requiresSetup = $icinga->requiresSetup()) && $icinga->setupTokenExists()) {
             $this->redirectNow(Url::fromPath('setup'));
         }
-
-        $triedOnlyExternalAuth = null;
-        $auth = $this->Auth();
-        $this->view->form = $form = new LoginForm();
-        $this->view->title = $this->translate('Icingaweb Login');
-
-        try {
-            $redirectUrl = $this->view->form->getValue('redirect');
-            if ($redirectUrl) {
-                $redirectUrl = Url::fromPath($redirectUrl);
-            } else {
-                $redirectUrl = Url::fromPath('dashboard');
-            }
-
-            if ($auth->isAuthenticated()) {
-                $this->rerenderLayout()->redirectNow($redirectUrl);
-            }
-
-            try {
-                $config = Config::app('authentication');
-            } catch (NotReadableError $e) {
-                throw new ConfigurationError(
-                    $this->translate('Could not read your authentication.ini, no authentication methods are available.'),
-                    0,
-                    $e
-                );
-            }
-
-            $chain = new AuthChain($config);
-            $request = $this->getRequest();
-            if ($request->isPost() && $this->view->form->isValid($request->getPost())) {
-                $user = new User($this->view->form->getValue('username'));
-                $password = $this->view->form->getValue('password');
-                $backendsTried = 0;
-                $backendsWithError = 0;
-
-                $redirectUrl = $form->getValue('redirect');
-
-                if ($redirectUrl) {
-                    $redirectUrl = Url::fromPath($redirectUrl);
-                } else {
-                    $redirectUrl = Url::fromPath('dashboard');
-                }
-
-                foreach ($chain as $backend) {
-                    if ($backend instanceof ExternalBackend) {
-                        continue;
-                    }
-                    ++$backendsTried;
-                    try {
-                        $authenticated = $backend->authenticate($user, $password);
-                    } catch (AuthenticationException $e) {
-                        Logger::error($e);
-                        ++$backendsWithError;
-                        continue;
-                    }
-                    if ($authenticated === true) {
-                        $auth->setAuthenticated($user);
-                        $this->rerenderLayout()->redirectNow($redirectUrl);
-                    }
-                }
-                if ($backendsTried === 0) {
-                    $this->view->form->addError(
-                        $this->translate(
-                            'No authentication methods available. Did you create'
-                            . ' authentication.ini when setting up Icinga Web 2?'
-                         )
-                    );
-                } else if ($backendsTried === $backendsWithError) {
-                    $this->view->form->addError(
-                        $this->translate(
-                            'All configured authentication methods failed.'
-                            . ' Please check the system log or Icinga Web 2 log for more information.'
-                        )
-                    );
-                } elseif ($backendsWithError) {
-                    $this->view->form->addError(
-                        $this->translate(
-                            'Please note that not all authentication methods were available.'
-                            . ' Check the system log or Icinga Web 2 log for more information.'
-                        )
-                    );
-                }
-                if ($backendsTried > 0 && $backendsTried !== $backendsWithError) {
-                    $this->view->form->getElement('password')->addError($this->translate('Incorrect username or password'));
-                }
-            } elseif ($request->isGet()) {
-                $user = new User('');
-                foreach ($chain as $backend) {
-                    $triedOnlyExternalAuth = $triedOnlyExternalAuth === null;
-                    if ($backend instanceof ExternalBackend) {
-                        $authenticated  = $backend->authenticate($user);
-                        if ($authenticated === true) {
-                            $auth->setAuthenticated($user);
-                            $this->rerenderLayout()->redirectNow(
-                                Url::fromPath(Url::fromRequest()->getParam('redirect', 'dashboard'))
-                            );
-                        }
-                    } else {
-                        $triedOnlyExternalAuth = false;
-                    }
-                }
-            }
-        } catch (Exception $e) {
-            $this->view->form->addError($e->getMessage());
+        $form = new LoginForm();
+        if ($this->Auth()->isAuthenticated()) {
+            $this->redirectNow($form->getRedirectUrl());
         }
-
-        $this->view->requiresExternalAuth = $triedOnlyExternalAuth && ! $auth->isAuthenticated();
-        $this->view->requiresSetup = Icinga::app()->requiresSetup();
+        if (! $requiresSetup) {
+            $form->handleRequest();
+        }
+        $this->view->form = $form;
+        $this->view->title = $this->translate('Icinga Web 2 Login');
+        $this->view->requiresSetup = $requiresSetup;
     }
 
     /**
@@ -160,7 +55,7 @@ class AuthenticationController extends ActionController
         $isRemoteUser = $auth->getUser()->isRemoteUser();
         $auth->removeAuthorization();
         if ($isRemoteUser === true) {
-            $this->_response->setHttpResponseCode(401);
+            $this->getResponse()->setHttpResponseCode(401);
         } else {
             $this->redirectToLogin();
         }

From 57bdd2686eef611afbe0b8db863e8fbf95b41cfe Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 29 Jul 2015 14:18:43 +0200
Subject: [PATCH 2695/2920] AuthBackendPage: Fix that the chosen LDAP type is
 not re-populated

---
 modules/setup/application/forms/AuthBackendPage.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index ceeb08ed7..c9116fbb5 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -93,7 +93,8 @@ class AuthBackendPage extends Form
                     'multiOptions'      => array(
                         'ldap'      => 'LDAP',
                         'msldap'    => 'ActiveDirectory'
-                    )
+                    ),
+                    'value'             => isset($formData['backend']) ? $formData['backend'] : null
                 )
             );
         } else { // $this->config['type'] === 'external'

From a31c79904301d9346c9d687ff278d08fac858f76 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 14:20:39 +0200
Subject: [PATCH 2696/2920] lib: Introduce Response::getRequest()

refs #9660
---
 library/Icinga/Web/Response.php | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Response.php b/library/Icinga/Web/Response.php
index b2ad0de47..2ba017bf8 100644
--- a/library/Icinga/Web/Response.php
+++ b/library/Icinga/Web/Response.php
@@ -8,6 +8,26 @@ use Icinga\Application\Icinga;
 
 class Response extends Zend_Controller_Response_Http
 {
+    /**
+     * Request
+     *
+     * @var Request
+     */
+    protected $request;
+
+    /**
+     * Get the request
+     *
+     * @return Request
+     */
+    public function getRequest()
+    {
+        if ($this->request === null) {
+            $this->request = Icinga::app()->getFrontController()->getRequest();
+        }
+        return $this->request;
+    }
+
     public function redirectAndExit($url)
     {
         if (! $url instanceof Url) {
@@ -15,7 +35,7 @@ class Response extends Zend_Controller_Response_Http
         }
         $url->getParams()->setSeparator('&');
 
-        if (Icinga::app()->getFrontController()->getRequest()->isXmlHttpRequest()) {
+        if ($this->getRequest()->isXmlHttpRequest()) {
             $this->setHeader('X-Icinga-Redirect', rawurlencode($url->getAbsoluteUrl()));
         } else {
             $this->setRedirect($url->getAbsoluteUrl());

From 91720810cca9abecbb094ac4433d58ab5ea2a0b9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 14:22:45 +0200
Subject: [PATCH 2697/2920] lib: Document Response::redirectAndExit()

refs #9660
---
 library/Icinga/Web/Response.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Response.php b/library/Icinga/Web/Response.php
index 2ba017bf8..13e88e32b 100644
--- a/library/Icinga/Web/Response.php
+++ b/library/Icinga/Web/Response.php
@@ -28,10 +28,15 @@ class Response extends Zend_Controller_Response_Http
         return $this->request;
     }
 
+    /**
+     * Redirect to the given URL and exit immediately
+     *
+     * @param string|Url $url
+     */
     public function redirectAndExit($url)
     {
         if (! $url instanceof Url) {
-            $url = Url::fromPath($url);
+            $url = Url::fromPath((string) $url);
         }
         $url->getParams()->setSeparator('&');
 

From 3a85dc7f3929fa3b2c2212c8357c1e2a6600fd42 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 29 Jul 2015 14:32:26 +0200
Subject: [PATCH 2698/2920] Display the table on single-selection rows as
 active without any delay

refs #8623
---
 public/js/icinga/events.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 3ea40b3d7..e29b7d0e7 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -354,18 +354,16 @@
                 return true;
             }
 
-            // Special checks for link clicks in multiselect rows
-            if (! $a.is('tr[href]') && $a.closest('tr[href]').length > 0 && $a.closest('table.multiselect').length > 0) {
+            // Special checks for link clicks in action tables
+            if (! $a.is('tr[href]') && $a.closest('table.action').length > 0) {
 
                 // ignoray clicks to ANY link with special key pressed
-                if (event.ctrlKey || event.metaKey || event.shiftKey)
-                {
+                if ($a.closest('table.multiselect').length > 0 && (event.ctrlKey || event.metaKey || event.shiftKey)) {
                     return true;
                 }
 
                 // ignore inner links matching the row URL
-                if ($a.attr('href') === $a.closest('tr[href]').attr('href'))
-                {
+                if ($a.attr('href') === $a.closest('tr[href]').attr('href')) {
                     return true;
                 }
             }

From aaae7e03b45890fccbe3b5c313cb105f5a6b4d73 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 14:39:45 +0200
Subject: [PATCH 2699/2920] lib: Introduce Response::setRerenderLayout()

Instead of handling response headers based on flags in our controllers, this should happen in the request for usage w/o controllers.

refs #9660
---
 library/Icinga/Web/Response.php | 49 +++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/library/Icinga/Web/Response.php b/library/Icinga/Web/Response.php
index 13e88e32b..140dc770f 100644
--- a/library/Icinga/Web/Response.php
+++ b/library/Icinga/Web/Response.php
@@ -15,6 +15,13 @@ class Response extends Zend_Controller_Response_Http
      */
     protected $request;
 
+    /**
+     * Whether to send the rerender layout header on XHR
+     *
+     * @var bool
+     */
+    protected $rerenderLayout = false;
+
     /**
      * Get the request
      *
@@ -28,6 +35,39 @@ class Response extends Zend_Controller_Response_Http
         return $this->request;
     }
 
+    /**
+     * Get whether to send the rerender layout header on XHR
+     *
+     * @return bool
+     */
+    public function getRerenderLayout()
+    {
+        return $this->rerenderLayout;
+    }
+
+    /**
+     * Get whether to send the rerender layout header on XHR
+     *
+     * @param   bool $rerenderLayout
+     *
+     * @return  $this
+     */
+    public function setRerenderLayout($rerenderLayout = true)
+    {
+        $this->rerenderLayout = (bool) $rerenderLayout;
+        return $this;
+    }
+
+    /**
+     * Prepare the request before sending
+     */
+    protected function prepare()
+    {
+        if ($this->getRequest()->isXmlHttpRequest() && $this->getRerenderLayout()) {
+            $this->setHeader('X-Icinga-Rerender-Layout', 'yes');
+        }
+    }
+
     /**
      * Redirect to the given URL and exit immediately
      *
@@ -54,4 +94,13 @@ class Response extends Zend_Controller_Response_Http
         $this->sendHeaders();
         exit;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function sendHeaders()
+    {
+        $this->prepare();
+        return parent::sendHeaders();
+    }
 }

From 4dab67ef5b7cec9ff9cd8638ea75be07b0683d30 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 29 Jul 2015 14:44:09 +0200
Subject: [PATCH 2700/2920] Introduce wizard page UserGroupBackendPage

refs #9609
---
 .../forms/UserGroupBackendPage.php            | 127 ++++++++++++++++++
 1 file changed, 127 insertions(+)
 create mode 100644 modules/setup/application/forms/UserGroupBackendPage.php

diff --git a/modules/setup/application/forms/UserGroupBackendPage.php b/modules/setup/application/forms/UserGroupBackendPage.php
new file mode 100644
index 000000000..1d8858689
--- /dev/null
+++ b/modules/setup/application/forms/UserGroupBackendPage.php
@@ -0,0 +1,127 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Setup\Forms;
+
+use Icinga\Application\Config;
+use Icinga\Authentication\User\UserBackend;
+use Icinga\Data\ResourceFactory;
+use Icinga\Forms\Config\UserGroup\LdapUserGroupBackendForm;
+use Icinga\Web\Form;
+
+/**
+ * Wizard page to define user group backend specific details
+ */
+class UserGroupBackendPage extends Form
+{
+    /**
+     * The resource configuration to use
+     *
+     * @var array
+     */
+    protected $resourceConfig;
+
+    /**
+     * The user backend configuration to use
+     *
+     * @var array
+     */
+    protected $backendConfig;
+
+    /**
+     * Initialize this page
+     */
+    public function init()
+    {
+        $this->setName('setup_usergroup_backend');
+        $this->setTitle($this->translate('User Group Backend', 'setup.page.title'));
+    }
+
+    /**
+     * Set the resource configuration to use
+     *
+     * @param   array   $config
+     *
+     * @return  $this
+     */
+    public function setResourceConfig(array $config)
+    {
+        $this->resourceConfig = $config;
+        return $this;
+    }
+
+    /**
+     * Set the user backend configuration to use
+     *
+     * @param   array   $config
+     *
+     * @return  $this
+     */
+    public function setBackendConfig(array $config)
+    {
+        $this->backendConfig = $config;
+        return $this;
+    }
+
+    /**
+     * Return the resource configuration as Config object
+     *
+     * @return  Config
+     */
+    protected function createResourceConfiguration()
+    {
+        $config = new Config();
+        $config->setSection($this->resourceConfig['name'], $this->resourceConfig);
+        return $config;
+    }
+
+    /**
+     * Return the user backend configuration as Config object
+     *
+     * @return  Config
+     */
+    protected function createBackendConfiguration()
+    {
+        $config = new Config();
+        $backendConfig = $this->backendConfig;
+        $backendConfig['resource'] = $this->resourceConfig['name'];
+        $config->setSection($this->backendConfig['name'], $backendConfig);
+        return $config;
+    }
+
+    /**
+     * Create and add elements to this form
+     *
+     * @param   array   $formData
+     */
+    public function createElements(array $formData)
+    {
+        // LdapUserGroupBackendForm requires these factories to provide valid configurations
+        ResourceFactory::setConfig($this->createResourceConfiguration());
+        UserBackend::setConfig($this->createBackendConfiguration());
+
+        $formData['type'] = 'ldap';
+        $formData['user_backend'] = $this->backendConfig['name']; // We're forcing the linkage anyway..
+        $backendForm = new LdapUserGroupBackendForm();
+        $backendForm->create($formData);
+        $userBackendOptions = $backendForm->getElement('user_backend')->getMultiOptions();
+        unset($userBackendOptions['none']);
+        $backendForm->getElement('user_backend')->setMultiOptions($userBackendOptions);
+        $this->addSubForm($backendForm, 'backend_form');
+    }
+
+    /**
+     * Retrieve all form element values
+     *
+     * @param   bool    $suppressArrayNotation  Ignored
+     *
+     * @return  array
+     */
+    public function getValues($suppressArrayNotation = false)
+    {
+        $values = parent::getValues();
+        $values = array_merge($values, $values['backend_form']);
+        unset($values['backend_form']);
+        return $values;
+    }
+}

From f72304a2fade42298db05d807e82b1cd1cd22532 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 29 Jul 2015 14:44:28 +0200
Subject: [PATCH 2701/2920] Wizard: Allow to configure a user group backend for
 LDAP user backends

refs #9609
---
 modules/setup/library/Setup/WebWizard.php | 24 +++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 1addf6283..6c73a933f 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -22,6 +22,7 @@ use Icinga\Module\Setup\Forms\RequirementsPage;
 use Icinga\Module\Setup\Forms\GeneralConfigPage;
 use Icinga\Module\Setup\Forms\AuthenticationPage;
 use Icinga\Module\Setup\Forms\DatabaseCreationPage;
+use Icinga\Module\Setup\Forms\UserGroupBackendPage;
 use Icinga\Module\Setup\Steps\DatabaseStep;
 use Icinga\Module\Setup\Steps\GeneralConfigStep;
 use Icinga\Module\Setup\Steps\ResourceStep;
@@ -104,6 +105,7 @@ class WebWizard extends Wizard implements SetupWizard
         //$this->addPage(new LdapDiscoveryConfirmPage());
         $this->addPage(new LdapResourcePage());
         $this->addPage(new AuthBackendPage());
+        $this->addPage(new UserGroupBackendPage());
         $this->addPage(new AdminAccountPage());
         $this->addPage(new GeneralConfigPage());
         $this->addPage(new DbResourcePage(array('name' => 'setup_config_db_resource')));
@@ -139,9 +141,20 @@ class WebWizard extends Wizard implements SetupWizard
                 if (isset($suggestions['backend'])) {
                     $page->populate($suggestions['backend']);
                 }
+
+                if ($this->getDirection() === static::FORWARD) {
+                    $backendConfig = $this->getPageData('setup_authentication_backend');
+                    if ($backendConfig !== null && $request->getPost('name') !== $backendConfig['name']) {
+                        $pageData = & $this->getPageData();
+                        unset($pageData['setup_usergroup_backend']);
+                    }
+                }
             }
         /*} elseif ($page->getName() === 'setup_ldap_discovery_confirm') {
             $page->setResourceConfig($this->getPageData('setup_ldap_discovery'));*/
+        } elseif ($page->getName() === 'setup_usergroup_backend') {
+            $page->setResourceConfig($this->getPageData('setup_ldap_resource'));
+            $page->setBackendConfig($this->getPageData('setup_authentication_backend'));
         } elseif ($page->getName() === 'setup_admin_account') {
             $page->setBackendConfig($this->getPageData('setup_authentication_backend'));
             $authData = $this->getPageData('setup_authentication_type');
@@ -173,6 +186,14 @@ class WebWizard extends Wizard implements SetupWizard
             if (isset($suggestion['resource'])) {
                 $page->populate($suggestion['resource']);
             }
+
+            if ($this->getDirection() === static::FORWARD) {
+                $resourceConfig = $this->getPageData('setup_ldap_resource');
+                if ($resourceConfig !== null && $request->getPost('name') !== $resourceConfig['name']) {
+                    $pageData = & $this->getPageData();
+                    unset($pageData['setup_usergroup_backend']);
+                }
+            }
         } elseif ($page->getName() === 'setup_general_config') {
             $authData = $this->getPageData('setup_authentication_type');
             if ($authData['type'] === 'db') {
@@ -233,6 +254,9 @@ class WebWizard extends Wizard implements SetupWizard
         } elseif ($newPage->getName() === 'setup_ldap_resource') {
             $authData = $this->getPageData('setup_authentication_type');
             $skip = $authData['type'] !== 'ldap';
+        } elseif ($newPage->getName() === 'setup_usergroup_backend') {
+            $backendConfig = $this->getPageData('setup_authentication_backend');
+            $skip = $backendConfig['backend'] !== 'ldap';
         } elseif ($newPage->getName() === 'setup_config_db_resource') {
             $authData = $this->getPageData('setup_authentication_type');
             $configData = $this->getPageData('setup_general_config');

From 4cc95c91ef87607ce6bc89a5fdf6444618926070 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 29 Jul 2015 15:07:41 +0200
Subject: [PATCH 2702/2920] AdminAccountPage: Fix user backend creation

Missed to adjust this as part of 83aafe8c
---
 modules/setup/application/forms/AdminAccountPage.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 191f27b8b..86d77d6e8 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -4,10 +4,12 @@
 namespace Icinga\Module\Setup\Forms;
 
 use Exception;
+use Icinga\Application\Config;
 use Icinga\Authentication\User\UserBackend;
 use Icinga\Authentication\User\DbUserBackend;
 use Icinga\Authentication\User\LdapUserBackend;
 use Icinga\Data\ConfigObject;
+use Icinga\Data\ResourceFactory;
 use Icinga\Web\Form;
 
 /**
@@ -271,8 +273,12 @@ class AdminAccountPage extends Form
      */
     protected function createBackend()
     {
+        $resourceConfig = new Config();
+        $resourceConfig->setSection($this->resourceConfig['name'], $this->resourceConfig);
+        ResourceFactory::setConfig($resourceConfig);
+
         $config = new ConfigObject($this->backendConfig);
-        $config->resource = $this->resourceConfig;
+        $config->resource = $this->resourceConfig['name'];
         return UserBackend::create(null, $config);
     }
 }

From 432efcb089195d8238ad6d8b3f8835db70b796ff Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 15:08:36 +0200
Subject: [PATCH 2703/2920] lib: Handle Response::setRerenderLayout() correctly

The header is different if it's not a redirect.

refs #9660
---
 library/Icinga/Web/Response.php | 66 +++++++++++++++++++++++++++------
 1 file changed, 54 insertions(+), 12 deletions(-)

diff --git a/library/Icinga/Web/Response.php b/library/Icinga/Web/Response.php
index 140dc770f..f29442a46 100644
--- a/library/Icinga/Web/Response.php
+++ b/library/Icinga/Web/Response.php
@@ -8,6 +8,13 @@ use Icinga\Application\Icinga;
 
 class Response extends Zend_Controller_Response_Http
 {
+    /**
+     * Redirect URL
+     *
+     * @var Url|null
+     */
+    protected $redirectUrl;
+
     /**
      * Request
      *
@@ -22,6 +29,37 @@ class Response extends Zend_Controller_Response_Http
      */
     protected $rerenderLayout = false;
 
+    /**
+     * Get the redirect URL
+     *
+     * @return Url|null
+     */
+    protected function getRedirectUrl()
+    {
+        return $this->redirectUrl;
+    }
+
+    /**
+     * Set the redirect URL
+     *
+     * Unlike {@link setRedirect()} this method only sets a redirect URL on the response for later usage.
+     * {@link prepare()} will take care of the correct redirect handling and HTTP headers on XHR and "normal" browser
+     * requests.
+     *
+     * @param   string|Url $redirectUrl
+     *
+     * @return  $this
+     */
+    protected function setRedirectUrl($redirectUrl)
+    {
+        if (! $redirectUrl instanceof Url) {
+            $redirectUrl = Url::fromPath((string) $redirectUrl);
+        }
+        $redirectUrl->getParams()->setSeparator('&');
+        $this->redirectUrl = $redirectUrl;
+        return $this;
+    }
+
     /**
      * Get the request
      *
@@ -63,8 +101,21 @@ class Response extends Zend_Controller_Response_Http
      */
     protected function prepare()
     {
-        if ($this->getRequest()->isXmlHttpRequest() && $this->getRerenderLayout()) {
-            $this->setHeader('X-Icinga-Rerender-Layout', 'yes');
+        $redirectUrl = $this->getRedirectUrl();
+        if ($this->getRequest()->isXmlHttpRequest()) {
+            if ($redirectUrl !== null) {
+                $this->setHeader('X-Icinga-Redirect', rawurlencode($redirectUrl->getAbsoluteUrl()), true);
+                if ($this->getRerenderLayout()) {
+                    $this->setHeader('X-Icinga-Rerender-Layout', 'yes', true);
+                }
+            }
+            if ($this->getRerenderLayout()) {
+                $this->setHeader('X-Icinga-Container', 'layout', true);
+            }
+        } else {
+            if ($redirectUrl !== null) {
+                $this->setRedirect($redirectUrl->getAbsoluteUrl());
+            }
         }
     }
 
@@ -75,16 +126,7 @@ class Response extends Zend_Controller_Response_Http
      */
     public function redirectAndExit($url)
     {
-        if (! $url instanceof Url) {
-            $url = Url::fromPath((string) $url);
-        }
-        $url->getParams()->setSeparator('&');
-
-        if ($this->getRequest()->isXmlHttpRequest()) {
-            $this->setHeader('X-Icinga-Redirect', rawurlencode($url->getAbsoluteUrl()));
-        } else {
-            $this->setRedirect($url->getAbsoluteUrl());
-        }
+        $this->setRedirectUrl($url);
 
         $session = Session::getSession();
         if ($session->hasChanged()) {

From 257a9f9d1dbedc05e6173f77e14fe9043fccec77 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 15:09:29 +0200
Subject: [PATCH 2704/2920] Set Response::rerenderLayout() in the LoginForm

refs #9660
---
 application/forms/Authentication/LoginForm.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index 21e19b09b..8c53142dd 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -91,6 +91,7 @@ class LoginForm extends Form
         $authenticated = $authChain->authenticate($user, $password);
         if ($authenticated) {
             $auth->setAuthenticated($user);
+            $this->getResponse()->setRerenderLayout(true);
             return true;
         }
         switch ($authChain->getError()) {
@@ -131,7 +132,7 @@ class LoginForm extends Form
             if ($backend instanceof ExternalBackend) {
                 if ($backend->authenticate($user)) {
                     $auth->setAuthenticated($user);
-                    $this->getResponse()->redirectAndExit($this->getRedirectUrl());
+                    $this->getResponse()->setRerenderLayout(true)->redirectAndExit($this->getRedirectUrl());
                 }
             } else {
                 $onlyExternal = false;

From 6db79a72d57fb009f86d65d7326a1ec2dda9822b Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 29 Jul 2015 15:10:32 +0200
Subject: [PATCH 2705/2920] Display the rows in the auth backend configuration
 as active without any delay

refs #8623
---
 application/views/scripts/form/reorder-authbackend.phtml | 3 ++-
 public/js/icinga/behavior/actiontable.js                 | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/application/views/scripts/form/reorder-authbackend.phtml b/application/views/scripts/form/reorder-authbackend.phtml
index be73f1787..2e6619551 100644
--- a/application/views/scripts/form/reorder-authbackend.phtml
+++ b/application/views/scripts/form/reorder-authbackend.phtml
@@ -16,7 +16,8 @@
             array('backend' => $backendNames[$i]),
             array(
                 'icon'  => 'edit',
-                'title' => sprintf($this->translate('Edit user backend %s'), $backendNames[$i])
+                'class' => 'rowaction',
+                'title' => sprintf($this->translate('rEdit user backend %s'), $backendNames[$i])
             )
           ); ?>
         </td>
diff --git a/public/js/icinga/behavior/actiontable.js b/public/js/icinga/behavior/actiontable.js
index 3f1cf1f9e..51a91e1d8 100644
--- a/public/js/icinga/behavior/actiontable.js
+++ b/public/js/icinga/behavior/actiontable.js
@@ -313,13 +313,16 @@
      */
     ActionTable.prototype.onRowClicked = function (event) {
         var self = event.data.self;
-        var $tr = $(event.target).closest('tr');
+        var $target = $(event.target);
+        var $tr = $target.closest('tr');
         var table = new Selection($tr.closest('table.action')[0], self.icinga);
 
-        // allow form actions in table rows to pass through
-        if ($(event.target).closest('form').length) {
+        // some rows may contain form actions that trigger a different action, pass those through
+        if (!$target.hasClass('rowaction') && $target.closest('form').length &&
+            ($target.closest('a').length || $target.closest('button').length)) {
             return;
         }
+
         event.stopPropagation();
         event.preventDefault();
 

From 1b5c5deace00f505fd75063ea5d13db5a876a2c4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 15:44:32 +0200
Subject: [PATCH 2706/2920] lib: Rename remote user to external user

We renamed our backend. Code now reflects this.

refs #9660
---
 .../controllers/AuthenticationController.php  |  6 ++++--
 library/Icinga/Authentication/Auth.php        |  4 ++--
 .../Authentication/User/ExternalBackend.php   |  2 +-
 library/Icinga/User.php                       | 20 +++++++++----------
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index 84efb9e09..9431b7fbc 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -52,9 +52,11 @@ class AuthenticationController extends Controller
         if (! $auth->isAuthenticated()) {
             $this->redirectToLogin();
         }
-        $isRemoteUser = $auth->getUser()->isRemoteUser();
+        // Get info whether the user is externally authenticated before removing authorization which destroys the
+        // session and the user object
+        $isExternalUser = $auth->getUser()->isExternalUser();
         $auth->removeAuthorization();
-        if ($isRemoteUser === true) {
+        if ($isExternalUser) {
             $this->getResponse()->setHttpResponseCode(401);
         } else {
             $this->redirectToLogin();
diff --git a/library/Icinga/Authentication/Auth.php b/library/Icinga/Authentication/Auth.php
index 99cfc9e99..2aaa9e0ac 100644
--- a/library/Icinga/Authentication/Auth.php
+++ b/library/Icinga/Authentication/Auth.php
@@ -147,8 +147,8 @@ class Auth
     public function authenticateFromSession()
     {
         $this->user = Session::getSession()->get('user');
-        if ($this->user !== null && $this->user->isRemoteUser() === true) {
-            list($originUsername, $field) = $this->user->getRemoteUserInformation();
+        if ($this->user !== null && $this->user->isExternalUser() === true) {
+            list($originUsername, $field) = $this->user->getExternalUserInformation();
             if (! array_key_exists($field, $_SERVER) || $_SERVER[$field] !== $originUsername) {
                 $this->removeAuthorization();
             }
diff --git a/library/Icinga/Authentication/User/ExternalBackend.php b/library/Icinga/Authentication/User/ExternalBackend.php
index 413c0553b..c6dbbfb51 100644
--- a/library/Icinga/Authentication/User/ExternalBackend.php
+++ b/library/Icinga/Authentication/User/ExternalBackend.php
@@ -72,7 +72,7 @@ class ExternalBackend implements UserBackendInterface
     {
         if (isset($_SERVER['REMOTE_USER'])) {
             $username = $_SERVER['REMOTE_USER'];
-            $user->setRemoteUserInformation($username, 'REMOTE_USER');
+            $user->setExternalUserInformation($username, 'REMOTE_USER');
 
             if ($this->stripUsernameRegexp) {
                 $stripped = preg_replace($this->stripUsernameRegexp, '', $username);
diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index c322a04d0..73f4217cd 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -66,7 +66,7 @@ class User
      *
      * @var array
      */
-    protected $remoteUserInformation = array();
+    protected $externalUserInformation = array();
 
     /**
      * Set of permissions
@@ -380,34 +380,34 @@ class User
     }
 
     /**
-     * Set additional remote user information
+     * Set additional external user information
      *
      * @param stirng    $username
      * @param string    $field
      */
-    public function setRemoteUserInformation($username, $field)
+    public function setExternalUserInformation($username, $field)
     {
-        $this->remoteUserInformation = array($username, $field);
+        $this->externalUserInformation = array($username, $field);
     }
 
     /**
-     * Get additional remote user information
+     * Get additional external user information
      *
      * @return array
      */
-    public function getRemoteUserInformation()
+    public function getExternalUserInformation()
     {
-        return $this->remoteUserInformation;
+        return $this->externalUserInformation;
     }
 
     /**
-     * Return true if user has remote user information set
+     * Return true if user has external user information set
      *
      * @return bool
      */
-    public function isRemoteUser()
+    public function isExternalUser()
     {
-        return ! empty($this->remoteUserInformation);
+        return ! empty($this->externalUserInformation);
     }
 
     /**

From 37ef87b9ab321ea3bd722e1e42c0a097b302ccf1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 15:46:40 +0200
Subject: [PATCH 2707/2920] lib: Fix PHPDoc in ExternalBackend

refs #9660
---
 .../Authentication/User/ExternalBackend.php   | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/library/Icinga/Authentication/User/ExternalBackend.php b/library/Icinga/Authentication/User/ExternalBackend.php
index c6dbbfb51..62b1ea40e 100644
--- a/library/Icinga/Authentication/User/ExternalBackend.php
+++ b/library/Icinga/Authentication/User/ExternalBackend.php
@@ -36,11 +36,7 @@ class ExternalBackend implements UserBackendInterface
     }
 
     /**
-     * Set this backend's name
-     *
-     * @param   string  $name
-     *
-     * @return  $this
+     * {@inheritdoc}
      */
     public function setName($name)
     {
@@ -49,24 +45,16 @@ class ExternalBackend implements UserBackendInterface
     }
 
     /**
-     * Return this backend's name
-     *
-     * @return  string
+     * {@inheritdoc}
      */
     public function getName()
     {
         return $this->name;
     }
 
+
     /**
-     * Authenticate the given user
-     *
-     * @param   User        $user
-     * @param   string      $password
-     *
-     * @return  bool                        True on success, false on failure
-     *
-     * @throws  AuthenticationException     In case authentication is not possible due to an error
+     * {@inheritdoc}
      */
     public function authenticate(User $user, $password = null)
     {

From e7c748609749c704663549f8e439cf0dcace4019 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 15:46:53 +0200
Subject: [PATCH 2708/2920] lib: Fix PHPDoc in User

refs #9660
---
 library/Icinga/User.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index 73f4217cd..d936eca58 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -57,7 +57,7 @@ class User
     protected $additionalInformation = array();
 
     /**
-     * Information if the user is external authenticated
+     * Information if the user is externally authenticated
      *
      * Keys:
      *
@@ -382,7 +382,7 @@ class User
     /**
      * Set additional external user information
      *
-     * @param stirng    $username
+     * @param string    $username
      * @param string    $field
      */
     public function setExternalUserInformation($username, $field)

From 96e3111f5850a535b1314ebbaf00b24aed82094b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 15:52:56 +0200
Subject: [PATCH 2709/2920] lib: Reorder functions in Auth

refs #9660
---
 library/Icinga/Authentication/Auth.php | 131 +++++++++++++------------
 1 file changed, 67 insertions(+), 64 deletions(-)

diff --git a/library/Icinga/Authentication/Auth.php b/library/Icinga/Authentication/Auth.php
index 2aaa9e0ac..74eb0ad96 100644
--- a/library/Icinga/Authentication/Auth.php
+++ b/library/Icinga/Authentication/Auth.php
@@ -32,6 +32,9 @@ class Auth
     private $user;
 
 
+    /**
+     * @see getInstance()
+     */
     private function __construct()
     {
     }
@@ -59,6 +62,21 @@ class Auth
         return new AuthChain();
     }
 
+    /**
+     * Whether the user is authenticated
+     *
+     * @param  bool $ignoreSession True to prevent session authentication
+     *
+     * @return bool
+     */
+    public function isAuthenticated($ignoreSession = false)
+    {
+        if ($this->user === null && ! $ignoreSession) {
+            $this->authenticateFromSession();
+        }
+        return is_object($this->user);
+    }
+
     public function setAuthenticated(User $user, $persist = true)
     {
         $username = $user->getUsername();
@@ -131,58 +149,14 @@ class Auth
     }
 
     /**
-     * Writes the current user to the session
+     * Getter for groups belonged to authenticated user
+     *
+     * @return  array
+     * @see     User::getGroups
      */
-    public function persistCurrentUser()
+    public function getGroups()
     {
-        Session::getSession()->set('user', $this->user)->refreshId();
-    }
-
-    /**
-     * Try to authenticate the user with the current session
-     *
-     * Authentication for externally-authenticated users will be revoked if the username changed or external
-     * authentication is no longer in effect
-     */
-    public function authenticateFromSession()
-    {
-        $this->user = Session::getSession()->get('user');
-        if ($this->user !== null && $this->user->isExternalUser() === true) {
-            list($originUsername, $field) = $this->user->getExternalUserInformation();
-            if (! array_key_exists($field, $_SERVER) || $_SERVER[$field] !== $originUsername) {
-                $this->removeAuthorization();
-            }
-        }
-    }
-
-    /**
-     * Whether the user is authenticated
-     *
-     * @param  bool $ignoreSession True to prevent session authentication
-     *
-     * @return bool
-     */
-    public function isAuthenticated($ignoreSession = false)
-    {
-        if ($this->user === null && ! $ignoreSession) {
-            $this->authenticateFromSession();
-        }
-        return is_object($this->user);
-    }
-
-    /**
-     * Whether an authenticated user has a given permission
-     *
-     * @param  string  $permission  Permission name
-     *
-     * @return bool                 True if the user owns the given permission, false if not or if not authenticated
-     */
-    public function hasPermission($permission)
-    {
-        if (! $this->isAuthenticated()) {
-            return false;
-        }
-        return $this->user->can($permission);
+        return $this->user->getGroups();
     }
 
     /**
@@ -202,15 +176,6 @@ class Auth
         return $this->user->getRestrictions($restriction);
     }
 
-    /**
-     * Purges the current authorization information and session
-     */
-    public function removeAuthorization()
-    {
-        $this->user = null;
-        Session::getSession()->purge();
-    }
-
     /**
      * Returns the current user or null if no user is authenticated
      *
@@ -222,13 +187,51 @@ class Auth
     }
 
     /**
-     * Getter for groups belonged to authenticated user
+     * Try to authenticate the user with the current session
      *
-     * @return  array
-     * @see     User::getGroups
+     * Authentication for externally-authenticated users will be revoked if the username changed or external
+     * authentication is no longer in effect
      */
-    public function getGroups()
+    public function authenticateFromSession()
     {
-        return $this->user->getGroups();
+        $this->user = Session::getSession()->get('user');
+        if ($this->user !== null && $this->user->isExternalUser() === true) {
+            list($originUsername, $field) = $this->user->getExternalUserInformation();
+            if (! array_key_exists($field, $_SERVER) || $_SERVER[$field] !== $originUsername) {
+                $this->removeAuthorization();
+            }
+        }
+    }
+
+    /**
+     * Whether an authenticated user has a given permission
+     *
+     * @param  string  $permission  Permission name
+     *
+     * @return bool                 True if the user owns the given permission, false if not or if not authenticated
+     */
+    public function hasPermission($permission)
+    {
+        if (! $this->isAuthenticated()) {
+            return false;
+        }
+        return $this->user->can($permission);
+    }
+
+    /**
+     * Writes the current user to the session
+     */
+    public function persistCurrentUser()
+    {
+        Session::getSession()->set('user', $this->user)->refreshId();
+    }
+
+    /**
+     * Purges the current authorization information and session
+     */
+    public function removeAuthorization()
+    {
+        $this->user = null;
+        Session::getSession()->purge();
     }
 }

From 3ca85f9daa77af8e68267233eb2044d5a02f7a7c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 15:56:45 +0200
Subject: [PATCH 2710/2920] lib: Add Auth::getRequest()

Basic auth will require the request.

refs #9660
---
 library/Icinga/Authentication/Auth.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/library/Icinga/Authentication/Auth.php b/library/Icinga/Authentication/Auth.php
index 74eb0ad96..ffdddeb67 100644
--- a/library/Icinga/Authentication/Auth.php
+++ b/library/Icinga/Authentication/Auth.php
@@ -5,6 +5,7 @@ namespace Icinga\Authentication;
 
 use Exception;
 use Icinga\Application\Config;
+use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
 use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Data\ConfigObject;
@@ -24,6 +25,13 @@ class Auth
      */
     private static $instance;
 
+    /**
+     * Request
+     *
+     * @var \Icinga\Web\Request
+     */
+    protected $request;
+
     /**
      * Authenticated user
      *
@@ -159,6 +167,19 @@ class Auth
         return $this->user->getGroups();
     }
 
+    /**
+     * Get the request
+     *
+     * @return \Icinga\Web\Request
+     */
+    public function getRequest()
+    {
+        if ($this->request === null) {
+            $this->request = Icinga::app()->getFrontController()->getRequest();
+        }
+        return $this->request;
+    }
+
     /**
      * Get applied restrictions matching a given restriction name
      *

From a159e8195f8fe9cdc9f647541fc1e6ccc4701345 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 29 Jul 2015 16:17:14 +0200
Subject: [PATCH 2711/2920] Wizard: Fix that auto-submitting a form does not
 have any effect

I already said it's a mess...
---
 modules/monitoring/application/forms/Setup/IdoResourcePage.php | 3 +++
 modules/setup/application/forms/AuthBackendPage.php            | 3 +++
 modules/setup/application/forms/DbResourcePage.php             | 3 +++
 modules/setup/application/forms/LdapResourcePage.php           | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/modules/monitoring/application/forms/Setup/IdoResourcePage.php b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
index e0b74c3ac..2bb4de3a9 100644
--- a/modules/monitoring/application/forms/Setup/IdoResourcePage.php
+++ b/modules/monitoring/application/forms/Setup/IdoResourcePage.php
@@ -138,6 +138,9 @@ class IdoResourcePage extends Form
             }
 
             $this->info($this->translate('The configuration has been successfully validated.'));
+        } elseif (! isset($formData['backend_validation'])) {
+            // This is usually done by isValid(Partial), but as we're not calling any of these...
+            $this->populate($formData);
         }
 
         return true;
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index dfd185a70..3edfb6afd 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -195,6 +195,9 @@ class AuthBackendPage extends Form
             }
 
             $this->info($this->translate('The configuration has been successfully validated.'));
+        } elseif (! isset($formData['backend_validation'])) {
+            // This is usually done by isValid(Partial), but as we're not calling any of these...
+            $this->populate($formData);
         }
 
         return true;
diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php
index a0faf932d..dd52730d3 100644
--- a/modules/setup/application/forms/DbResourcePage.php
+++ b/modules/setup/application/forms/DbResourcePage.php
@@ -109,6 +109,9 @@ class DbResourcePage extends Form
             }
 
             $this->info($this->translate('The configuration has been successfully validated.'));
+        } elseif (! isset($formData['backend_validation'])) {
+            // This is usually done by isValid(Partial), but as we're not calling any of these...
+            $this->populate($formData);
         }
 
         return true;
diff --git a/modules/setup/application/forms/LdapResourcePage.php b/modules/setup/application/forms/LdapResourcePage.php
index 2c558dfbb..aacfcb207 100644
--- a/modules/setup/application/forms/LdapResourcePage.php
+++ b/modules/setup/application/forms/LdapResourcePage.php
@@ -124,6 +124,9 @@ class LdapResourcePage extends Form
             }
 
             $this->info($this->translate('The configuration has been successfully validated.'));
+        } elseif (! isset($formData['backend_validation'])) {
+            // This is usually done by isValid(Partial), but as we're not calling any of these...
+            $this->populate($formData);
         }
 
         return true;

From c3a057dbdbc66d83e00d38b9e3b963ed19b36fd4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 16:18:30 +0200
Subject: [PATCH 2712/2920] lib: Add AuthChain::setSkipExternalBackends() in
 favor of setIteratorMode()

There's only one mode.

refs #9660
---
 .../forms/Authentication/LoginForm.php        |  3 +-
 library/Icinga/Authentication/AuthChain.php   | 31 +++++++------------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index 8c53142dd..9965a6c12 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -85,7 +85,7 @@ class LoginForm extends Form
     {
         $auth = Auth::getInstance();
         $authChain = $auth->getAuthChain();
-        $authChain->setIteratorMode($authChain::IT_MODE_NOT_EXTERNAL);
+        $authChain->setSkipExternalBackends(true);
         $user = new User($this->getElement('username')->getValue());
         $password = $this->getElement('password')->getValue();
         $authenticated = $authChain->authenticate($user, $password);
@@ -107,6 +107,7 @@ class LoginForm extends Form
                     . ' Please check the system log or Icinga Web 2 log for more information.'
                 ));
                 break;
+            /** @noinspection PhpMissingBreakStatementInspection */
             case $authChain::ENOTALL:
                 $this->addError($this->translate(
                     'Please note that not all authentication methods were available.'
diff --git a/library/Icinga/Authentication/AuthChain.php b/library/Icinga/Authentication/AuthChain.php
index 5d3028047..84e2a3eac 100644
--- a/library/Icinga/Authentication/AuthChain.php
+++ b/library/Icinga/Authentication/AuthChain.php
@@ -53,13 +53,6 @@ class AuthChain implements Authenticatable, Iterator
      */
     const ENOTALL = 4;
 
-    /**
-     * External user backends are excluded by the iterator
-     *
-     * @var int
-     */
-    const IT_MODE_NOT_EXTERNAL = 1;
-
     /**
      * User backends configuration
      *
@@ -82,11 +75,11 @@ class AuthChain implements Authenticatable, Iterator
     protected $error;
 
     /**
-     * Mode of iteration
+     * Whether external user backends should be skipped on iteration
      *
-     * @var int
+     * @var bool
      */
-    protected $iteratorMode;
+    protected $skipExternalBackends = false;
 
     /**
      * Create a new authentication chain from config
@@ -159,25 +152,25 @@ class AuthChain implements Authenticatable, Iterator
     }
 
     /**
-     * Get the iterator mode
+     * Get whether to skip external user backends on iteration
      *
-     * @return int
+     * @return bool
      */
-    public function getIteratorMode()
+    public function getSkipExternalBackends()
     {
-        return $this->iteratorMode;
+        return $this->skipExternalBackends;
     }
 
     /**
-     * Set the iterator mode
+     * Set whether to skip external user backends on iteration
      *
-     * @param   int $iteratorMode
+     * @param   bool $skipExternalBackends
      *
      * @return  $this
      */
-    public function setIteratorMode($iteratorMode)
+    public function setSkipExternalBackends($skipExternalBackends = true)
     {
-        $this->iteratorMode = (int) $iteratorMode;
+        $this->skipExternalBackends = (bool) $skipExternalBackends;
         return $this;
     }
 
@@ -254,7 +247,7 @@ class AuthChain implements Authenticatable, Iterator
             return $this->valid();
         }
 
-        if ($this->iteratorMode === static::IT_MODE_NOT_EXTERNAL
+        if ($this->getSkipExternalBackends()
             && $backend instanceof ExternalBackend
         ) {
             $this->next();

From fb7666e6bd7e88c54054db3d6bf393dbc595f595 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 29 Jul 2015 16:26:39 +0200
Subject: [PATCH 2713/2920] LdapUserGroupBackend: Adjust usage of
 LdapCapabilities::hasAdOid()

Usage search ftw..
---
 .../Icinga/Authentication/UserGroup/LdapUserGroupBackend.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
index 976af266f..8015b04a0 100644
--- a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
+++ b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
@@ -437,7 +437,7 @@ class LdapUserGroupBackend /*extends LdapRepository*/ implements UserGroupBacken
             throw new ProgrammingError('It is required to set a attribute name where to find a group\'s name first');
         }
 
-        if ($this->ds->getCapabilities()->hasAdOid()) {
+        if ($this->ds->getCapabilities()->isActiveDirectory()) {
             $createdAtAttribute = 'whenCreated';
             $lastModifiedAttribute = 'whenChanged';
         } else {

From db48a944e34f7b14e539af9a38c7e4fc8cb1f004 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 16:27:48 +0200
Subject: [PATCH 2714/2920] lib: Introduce Web::getRequest()

Basic auth will need the request before we set up the front controller.

refs #9660
---
 library/Icinga/Application/Web.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 1bc524726..5f626db30 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -136,6 +136,16 @@ class Web extends ApplicationBootstrap
         return $this->frontController;
     }
 
+    /**
+     * Get the request
+     *
+     * @return Request
+     */
+    public function getRequest()
+    {
+        return $this->request;
+    }
+
     /**
      * Getter for view
      *

From 226caac4f90e35c8b5b6adf9b24f8f5079cd8e9a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 29 Jul 2015 16:28:41 +0200
Subject: [PATCH 2715/2920] Wizard: Clear user group stage data on a auth
 backend type switch as well

refs #9609
---
 modules/setup/library/Setup/WebWizard.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 72faa801a..dec5c0e1b 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -150,6 +150,14 @@ class WebWizard extends Wizard implements SetupWizard
                     }
                 }
             }
+
+            if ($this->getDirection() === static::FORWARD) {
+                $backendConfig = $this->getPageData('setup_authentication_backend');
+                if ($backendConfig !== null && $request->getPost('backend') !== $backendConfig['backend']) {
+                    $pageData = & $this->getPageData();
+                    unset($pageData['setup_usergroup_backend']);
+                }
+            }
         /*} elseif ($page->getName() === 'setup_ldap_discovery_confirm') {
             $page->setResourceConfig($this->getPageData('setup_ldap_discovery'));*/
         } elseif ($page->getName() === 'setup_usergroup_backend') {

From ba8d05af8577dfd4d8205a419029359b9a0e6230 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 29 Jul 2015 17:13:06 +0200
Subject: [PATCH 2716/2920] Wizard: Allow to choose a group for initial
 administrative access

refs #9609
---
 .../application/forms/AdminAccountPage.php    | 143 ++++++++++++++++--
 modules/setup/library/Setup/WebWizard.php     |   1 +
 2 files changed, 134 insertions(+), 10 deletions(-)

diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 86d77d6e8..5551ff8d4 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -8,6 +8,8 @@ use Icinga\Application\Config;
 use Icinga\Authentication\User\UserBackend;
 use Icinga\Authentication\User\DbUserBackend;
 use Icinga\Authentication\User\LdapUserBackend;
+use Icinga\Authentication\UserGroup\UserGroupBackend;
+use Icinga\Authentication\UserGroup\LdapUserGroupBackend;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
 use Icinga\Web\Form;
@@ -25,12 +27,19 @@ class AdminAccountPage extends Form
     protected $resourceConfig;
 
     /**
-     * The backend configuration to use
+     * The user backend configuration to use
      *
      * @var array
      */
     protected $backendConfig;
 
+    /**
+     * The user group backend configuration to use
+     *
+     * @var array
+     */
+    protected $groupConfig;
+
     /**
      * Initialize this page
      */
@@ -39,7 +48,7 @@ class AdminAccountPage extends Form
         $this->setName('setup_admin_account');
         $this->setTitle($this->translate('Administration', 'setup.page.title'));
         $this->addDescription($this->translate(
-            'Now it\'s time to configure your first administrative account for Icinga Web 2.'
+            'Now it\'s time to configure your first administrative account or group for Icinga Web 2.'
         ));
     }
 
@@ -57,7 +66,7 @@ class AdminAccountPage extends Form
     }
 
     /**
-     * Set the backend configuration to use
+     * Set the user backend configuration to use
      *
      * @param   array   $config
      *
@@ -69,6 +78,19 @@ class AdminAccountPage extends Form
         return $this;
     }
 
+    /**
+     * Set the user group backend configuration to use
+     *
+     * @param   array   $config
+     *
+     * @return  $this
+     */
+    public function setGroupConfig(array $config = null)
+    {
+        $this->groupConfig = $config;
+        return $this;
+    }
+
     /**
      * @see Form::createElements()
      */
@@ -78,6 +100,13 @@ class AdminAccountPage extends Form
         if ($this->backendConfig['backend'] !== 'db') {
             $choices['by_name'] = $this->translate('By Name', 'setup.admin');
             $choice = isset($formData['user_type']) ? $formData['user_type'] : 'by_name';
+
+            if (in_array($this->backendConfig['backend'], array('ldap', 'msldap'))) {
+                $groups = $this->fetchGroups();
+                if (! empty($groups)) {
+                    $choices['user_group'] = $this->translate('User Group', 'setup.admin');
+                }
+            }
         } else {
             $choices['new_user'] = $this->translate('New User', 'setup.admin');
             $choice = isset($formData['user_type']) ? $formData['user_type'] : 'new_user';
@@ -130,6 +159,23 @@ class AdminAccountPage extends Form
             );
         }
 
+        if ($choice === 'user_group') {
+            $this->addElement(
+                'select',
+                'user_group',
+                array(
+                    'required'      => true,
+                    'label'         => $this->translate('Group Name'),
+                    'description'   => $this->translate(
+                        'Choose a user group reported by the LDAP backend'
+                        . ' to permit its members administrative access.',
+                        'setup.admin'
+                    ),
+                    'multiOptions'  => array_combine($groups, $groups)
+                )
+            );
+        }
+
         if ($choice === 'existing_user') {
             $this->addElement(
                 'select',
@@ -236,14 +282,18 @@ class AdminAccountPage extends Form
     }
 
     /**
-     * Return the names of all users the backend currently provides
+     * Return the names of all users the user backend currently provides
      *
      * @return  array
      */
     protected function fetchUsers()
     {
         try {
-            return $this->createBackend()->select(array('user_name'))->order('user_name', 'asc', true)->fetchColumn();
+            return $this
+                ->createUserBackend()
+                ->select(array('user_name'))
+                ->order('user_name', 'asc', true)
+                ->fetchColumn();
         } catch (Exception $_) {
             // No need to handle anything special here. Error means no users found.
             return array();
@@ -251,7 +301,7 @@ class AdminAccountPage extends Form
     }
 
     /**
-     * Return whether the backend provides a user with the given name
+     * Return whether the user backend provides a user with the given name
      *
      * @param   string  $username
      *
@@ -260,18 +310,22 @@ class AdminAccountPage extends Form
     protected function hasUser($username)
     {
         try {
-            return $this->createBackend()->select()->where('user_name', $username)->count() > 1;
+            return $this
+                ->createUserBackend()
+                ->select()
+                ->where('user_name', $username)
+                ->count() > 1;
         } catch (Exception $_) {
-            return null;
+            return false;
         }
     }
 
     /**
-     * Create and return the backend
+     * Create and return the user backend
      *
      * @return  DbUserBackend|LdapUserBackend
      */
-    protected function createBackend()
+    protected function createUserBackend()
     {
         $resourceConfig = new Config();
         $resourceConfig->setSection($this->resourceConfig['name'], $this->resourceConfig);
@@ -281,4 +335,73 @@ class AdminAccountPage extends Form
         $config->resource = $this->resourceConfig['name'];
         return UserBackend::create(null, $config);
     }
+
+    /**
+     * Return the names of all user groups the user group backend currently provides
+     *
+     * @return  array
+     */
+    protected function fetchGroups()
+    {
+        try {
+            return $this
+                ->createUserGroupBackend()
+                ->select(array('group_name'))
+                ->fetchColumn();
+        } catch (Exception $_) {
+            // No need to handle anything special here. Error means no groups found.
+            return array();
+        }
+    }
+
+    /**
+     * Return whether the user group backend provides a user group with the given name
+     *
+     * @param   string  $groupname
+     *
+     * @return  bool
+     */
+    protected function hasGroup($groupname)
+    {
+        try {
+            return $this
+                ->createUserGroupBackend()
+                ->select()
+                ->where('group_name', $groupname)
+                ->count() > 1;
+        } catch (Exception $_) {
+            return false;
+        }
+    }
+
+    /**
+     * Create and return the user group backend
+     *
+     * @return  LdapUserGroupBackend
+     */
+    protected function createUserGroupBackend()
+    {
+        $resourceConfig = new Config();
+        $resourceConfig->setSection($this->resourceConfig['name'], $this->resourceConfig);
+        ResourceFactory::setConfig($resourceConfig);
+
+        $backendConfig = new Config();
+        $backendConfig->setSection($this->backendConfig['name'], array_merge(
+            $this->backendConfig,
+            array('resource' => $this->resourceConfig['name'])
+        ));
+        UserBackend::setConfig($backendConfig);
+
+        if (empty($this->groupConfig)) {
+            $groupConfig = new ConfigObject(array(
+                'backend'       => $this->backendConfig['backend'], // _Should_ be "db" or "msldap"
+                'resource'      => $this->resourceConfig['name'],
+                'user_backend'  => $this->backendConfig['name'] // Gets ignored if 'backend' is "db"
+            ));
+        } else {
+            $groupConfig = new ConfigObject($this->groupConfig);
+        }
+
+        return UserGroupBackend::create(null, $groupConfig);
+    }
 }
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index dec5c0e1b..5da1739c9 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -165,6 +165,7 @@ class WebWizard extends Wizard implements SetupWizard
             $page->setBackendConfig($this->getPageData('setup_authentication_backend'));
         } elseif ($page->getName() === 'setup_admin_account') {
             $page->setBackendConfig($this->getPageData('setup_authentication_backend'));
+            $page->setGroupConfig($this->getPageData('setup_usergroup_backend'));
             $authData = $this->getPageData('setup_authentication_type');
             if ($authData['type'] === 'db') {
                 $page->setResourceConfig($this->getPageData('setup_auth_db_resource'));

From ba906d2fca5aa48d19197e4ae7154dbe0731fde1 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 29 Jul 2015 17:13:18 +0200
Subject: [PATCH 2717/2920] FilterEditor: allow to set custom filter columns

---
 library/Icinga/Web/Widget/FilterEditor.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 42561aeee..1b04bc71e 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -540,11 +540,17 @@ class FilterEditor extends AbstractWidget
         );
     }
 
+    public function setColumns(array $columns)
+    {
+        $this->cachedColumnSelect = $this->arrayForSelect($columns);
+        return $this;
+    }
+
     protected function selectColumn(Filter $filter = null)
     {
         $active = $filter === null ? null : $filter->getColumn();
 
-        if ($this->query === null) {
+        if ($this->cachedColumnSelect === null && $this->query === null) {
             return sprintf(
                 '<input type="text" name="%s" value="%s" />',
                 $this->elementId('column', $filter),

From 9858d79aaa0e280cf775623f56e1cec30697608d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 29 Jul 2015 17:18:41 +0200
Subject: [PATCH 2718/2920] AdminAccountPage: Do not allow to choose a group..

Does not work currently :(

refs #9609
refs #9772
---
 modules/setup/application/forms/AdminAccountPage.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 5551ff8d4..a5dd90866 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -12,6 +12,8 @@ use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Authentication\UserGroup\LdapUserGroupBackend;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
+use Icinga\Data\Selectable;
+use Icinga\Exception\NotImplementedError;
 use Icinga\Web\Form;
 
 /**
@@ -402,6 +404,11 @@ class AdminAccountPage extends Form
             $groupConfig = new ConfigObject($this->groupConfig);
         }
 
-        return UserGroupBackend::create(null, $groupConfig);
+        $backend = UserGroupBackend::create(null, $groupConfig);
+        if (! $backend instanceof Selectable) {
+            throw new NotImplementedError('Unsupported, until #9772 has been resolved');
+        }
+
+        return $backend;
     }
 }

From 3e7cc299ec648acf76263c979bf44f80108dace4 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 29 Jul 2015 17:18:52 +0200
Subject: [PATCH 2719/2920] Fix issue that caused the refresh button to remove
 side bar

Do not apply base target globally for all toolbar elements, but specifically for those that should remove side-bars.

refs #8623
refs #6436
---
 application/controllers/ConfigController.php     | 12 ++++++++----
 application/controllers/RoleController.php       |  3 ++-
 application/views/scripts/config/resource.phtml  |  2 +-
 .../scripts/config/userbackend/reorder.phtml     |  2 +-
 application/views/scripts/role/list.phtml        |  2 +-
 library/Icinga/Web/Widget/Tab.php                | 16 ++++++++++++++++
 6 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index cb2c31855..30f46db50 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -32,12 +32,14 @@ class ConfigController extends Controller
         $tabs->add('general', array(
             'title' => $this->translate('Adjust the general configuration of Icinga Web 2'),
             'label' => $this->translate('General'),
-            'url'   => 'config/general'
+            'url'   => 'config/general',
+            'baseTarget' => '_main'
         ));
         $tabs->add('resource', array(
             'title' => $this->translate('Configure which resources are being utilized by Icinga Web 2'),
             'label' => $this->translate('Resources'),
-            'url'   => 'config/resource'
+            'url'   => 'config/resource',
+            'baseTarget' => '_main'
         ));
         return $tabs;
     }
@@ -51,12 +53,14 @@ class ConfigController extends Controller
         $tabs->add('userbackend', array(
             'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'),
             'label' => $this->translate('User Backends'),
-            'url'   => 'config/userbackend'
+            'url'   => 'config/userbackend',
+            'baseTarget' => '_main'
         ));
         $tabs->add('usergroupbackend', array(
             'title' => $this->translate('Configure how users are associated with groups by Icinga Web 2'),
             'label' => $this->translate('User Group Backends'),
-            'url'   => 'usergroupbackend/list'
+            'url'   => 'usergroupbackend/list',
+            'baseTarget' => '_main'
         ));
         return $tabs;
     }
diff --git a/application/controllers/RoleController.php b/application/controllers/RoleController.php
index bae4cad88..971a7efc9 100644
--- a/application/controllers/RoleController.php
+++ b/application/controllers/RoleController.php
@@ -166,7 +166,8 @@ class RoleController extends AuthBackendController
                     'Configure roles to permit or restrict users and groups accessing Icinga Web 2'
                 ),
                 'label' => $this->translate('Roles'),
-                'url'   => 'role/list'
+                'url'   => 'role/list',
+                'baseTarget' => '_main'
             )
         );
 
diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index 36822b9f0..3e34c308d 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -1,4 +1,4 @@
-<div class="controls" data-base-target="_main">
+<div class="controls">
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">
diff --git a/application/views/scripts/config/userbackend/reorder.phtml b/application/views/scripts/config/userbackend/reorder.phtml
index 64a6fc594..08b5f19be 100644
--- a/application/views/scripts/config/userbackend/reorder.phtml
+++ b/application/views/scripts/config/userbackend/reorder.phtml
@@ -1,4 +1,4 @@
-<div class="controls" data-base-target="_main">
+<div class="controls">
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">
diff --git a/application/views/scripts/role/list.phtml b/application/views/scripts/role/list.phtml
index e75c89356..a4f597767 100644
--- a/application/views/scripts/role/list.phtml
+++ b/application/views/scripts/role/list.phtml
@@ -1,4 +1,4 @@
-<div class="controls" data-base-target="_main">
+<div class="controls">
     <?= $tabs ?>
 </div>
 <div class="content">
diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index 5132114f4..890928ef0 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -91,6 +91,13 @@ class Tab extends AbstractWidget
      */
     private $targetBlank = false;
 
+    /**
+     * Data base target that determines if the link will be opened in a side-bar or in the main container
+     *
+     * @var null
+     */
+    private $baseTarget = null;
+
     /**
      * Sets an icon image for this tab
      *
@@ -210,6 +217,11 @@ class Tab extends AbstractWidget
         $this->targetBlank =  $value;
     }
 
+    public function setBaseTarget($value)
+    {
+        $this->baseTarget = $value;
+    }
+
     /**
      * Create a new Tab with the given properties
      *
@@ -274,6 +286,10 @@ class Tab extends AbstractWidget
             }
         }
 
+        if ($this->baseTarget !== null) {
+            $tagParams['data-base-target'] = $this->baseTarget;
+        }
+
         if ($this->icon !== null) {
             if (strpos($this->icon, '.') === false) {
                 $caption = $view->icon($this->icon) . $caption;

From ce2a196c4a56bb8dabec8f33007493513f0453dc Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 17:22:10 +0200
Subject: [PATCH 2720/2920] lib/Web: Set up request before setting up the user

refs #9660
---
 library/Icinga/Application/Web.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 5f626db30..8b2cd9296 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -91,11 +91,11 @@ class Web extends ApplicationBootstrap
             ->setupResourceFactory()
             ->setupSession()
             ->setupNotifications()
+            ->setupRequest()
             ->setupUser()
             ->setupTimezone()
             ->setupLogger()
             ->setupInternationalization()
-            ->setupRequest()
             ->setupZendMvc()
             ->setupFormNamespace()
             ->setupModuleManager()
@@ -191,7 +191,9 @@ class Web extends ApplicationBootstrap
     {
         $auth = Auth::getInstance();
         if ($auth->isAuthenticated()) {
-            $this->user = $auth->getUser();
+            $user = $auth->getUser();
+            $this->request->setUser($user);
+            $this->user = $user;
         }
         return $this;
     }
@@ -219,16 +221,13 @@ class Web extends ApplicationBootstrap
     }
 
     /**
-     * Inject dependencies into request
+     * Set the request
      *
      * @return $this
      */
     private function setupRequest()
     {
         $this->request = new Request();
-        if ($this->user instanceof User) {
-            $this->request->setUser($this->user);
-        }
         return $this;
     }
 

From cf8c680482591b0201ac1c48e4003140872eafa3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 29 Jul 2015 17:22:55 +0200
Subject: [PATCH 2721/2920] lib: Add basic access authentication (WIP)

refs #9660
---
 library/Icinga/Authentication/Auth.php | 44 ++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Authentication/Auth.php b/library/Icinga/Authentication/Auth.php
index ffdddeb67..e9be6b50f 100644
--- a/library/Icinga/Authentication/Auth.php
+++ b/library/Icinga/Authentication/Auth.php
@@ -79,10 +79,10 @@ class Auth
      */
     public function isAuthenticated($ignoreSession = false)
     {
-        if ($this->user === null && ! $ignoreSession) {
+        if ($this->user === null && ! $this->authHttp() && ! $ignoreSession) {
             $this->authenticateFromSession();
         }
-        return is_object($this->user);
+        return $this->user !== null;
     }
 
     public function setAuthenticated(User $user, $persist = true)
@@ -175,7 +175,7 @@ class Auth
     public function getRequest()
     {
         if ($this->request === null) {
-            $this->request = Icinga::app()->getFrontController()->getRequest();
+            $this->request = Icinga::app()->getRequest();
         }
         return $this->request;
     }
@@ -224,6 +224,44 @@ class Auth
         }
     }
 
+    /**
+     * Attempt to authenticate a user using HTTP authentication
+     *
+     * Supports only the Basic HTTP authentication scheme. This will not challenge the client if authorization is
+     * missing or invalid yet. XHR will be ignored.
+     *
+     * @return bool
+     */
+    protected function authHttp()
+    {
+        if ($this->getRequest()->isXmlHttpRequest()) {
+            return false;
+        }
+        $header = $this->getRequest()->getHeader('Authorization');
+        if (empty($header)) {
+            return false;
+        }
+        list($scheme) = explode(' ', $header, 2);
+        if ($scheme !== 'Basic') {
+            return false;
+        }
+        $authorization = substr($header, strlen('Basic '));
+        $credentials = base64_decode($authorization);
+        $credentials = array_filter(explode(':', $credentials));
+        if (count($credentials) !== 2) {
+            // Deny empty username and/or password
+            return false;
+        }
+        $user = new User($credentials[0]);
+        $password = $credentials[1];
+        if ($this->getAuthChain()->setSkipExternalBackends(true)->authenticate($user, $password)) {
+            $this->setAuthenticated($user, false);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     /**
      * Whether an authenticated user has a given permission
      *

From ff5142896b59470ab0cf7c2d3d02baee7f20c251 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 30 Jul 2015 09:04:33 +0200
Subject: [PATCH 2722/2920] AuthenticationStep: We're creating the roles.ini,
 ultimately

---
 modules/setup/library/Setup/Steps/AuthenticationStep.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
index 0f35e5c51..266a162c6 100644
--- a/modules/setup/library/Setup/Steps/AuthenticationStep.php
+++ b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -32,7 +32,7 @@ class AuthenticationStep extends Step
             $success &= $this->createAccount();
         }
 
-        $success &= $this->defineInitialAdmin();
+        $success &= $this->createRolesIni();
         return $success;
     }
 
@@ -60,7 +60,7 @@ class AuthenticationStep extends Step
         return true;
     }
 
-    protected function defineInitialAdmin()
+    protected function createRolesIni()
     {
         $config = array();
         $config['admins'] = array(

From 9f0e48a0a180fe0ec519407b36c091d2bee32114 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 09:28:05 +0200
Subject: [PATCH 2723/2920] Don't send the X-Icinga-Module header more than
 once

fixes #9349
---
 library/Icinga/Web/Controller/ModuleActionController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Controller/ModuleActionController.php b/library/Icinga/Web/Controller/ModuleActionController.php
index 21a40900e..60990d5d8 100644
--- a/library/Icinga/Web/Controller/ModuleActionController.php
+++ b/library/Icinga/Web/Controller/ModuleActionController.php
@@ -77,6 +77,6 @@ class ModuleActionController extends ActionController
     public function postDispatchXhr()
     {
         parent::postDispatchXhr();
-        $this->getResponse()->setHeader('X-Icinga-Module', $this->moduleName);
+        $this->getResponse()->setHeader('X-Icinga-Module', $this->moduleName, true);
     }
 }

From 775f8cced63b8ac88c74740a61d249d5290a86ad Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 09:31:58 +0200
Subject: [PATCH 2724/2920] lib: Introduce User::$isHttpUser

refs #9660
---
 library/Icinga/User.php | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index d936eca58..31bb8812e 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -96,6 +96,13 @@ class User
      */
     protected $preferences;
 
+    /**
+     * Whether the user is authenticated using a HTTP authentication mechanism
+     *
+     * @var bool
+     */
+    protected $isHttpUser = false;
+
     /**
      * Creates a user object given the provided information
      *
@@ -410,6 +417,29 @@ class User
         return ! empty($this->externalUserInformation);
     }
 
+    /**
+     * Get whether the user is authenticated using a HTTP authentication mechanism
+     *
+     * @return bool
+     */
+    public function getIsHttpUser()
+    {
+        return $this->isHttpUser;
+    }
+
+    /**
+     * Set whether the user is authenticated using a HTTP authentication mechanism
+     *
+     * @param   bool $isHttpUser
+     *
+     * @return  $this
+     */
+    public function setIsHttpUser($isHttpUser = true)
+    {
+        $this->isHttpUser = (bool) $isHttpUser;
+        return $this;
+    }
+
     /**
      * Whether the user has a given permission
      *

From 36ff2d8914a00bf8085615d30f341e801ac7b7bb Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 09:32:24 +0200
Subject: [PATCH 2725/2920] lib: Set User::$isHttpUser in Auth

refs #9660
---
 library/Icinga/Authentication/Auth.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/Icinga/Authentication/Auth.php b/library/Icinga/Authentication/Auth.php
index e9be6b50f..7fee5b536 100644
--- a/library/Icinga/Authentication/Auth.php
+++ b/library/Icinga/Authentication/Auth.php
@@ -256,6 +256,7 @@ class Auth
         $password = $credentials[1];
         if ($this->getAuthChain()->setSkipExternalBackends(true)->authenticate($user, $password)) {
             $this->setAuthenticated($user, false);
+            $user->setIsHttpUser(true);
             return true;
         } else {
             return false;

From db505281ee12e526e1dbe776daea3e16b242cb87 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 09:33:04 +0200
Subject: [PATCH 2726/2920] lib: Disable CSRF token on HTTP authenticated users
 and not XHR

refs #9660
---
 library/Icinga/Web/Form.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 626ac49af..1c106e017 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -948,10 +948,18 @@ class Form extends Zend_Form
      */
     public function addCsrfCounterMeasure()
     {
-        if (! $this->tokenDisabled && $this->getElement($this->tokenElementName) === null) {
-            $this->addElement(new CsrfCounterMeasure($this->tokenElementName));
+        if (! $this->tokenDisabled) {
+            $request = $this->getRequest();
+            if (! $request->isXmlHttpRequest()
+                && ($user = $request->getUser()) !== null
+                && $user->getIsHttpUser()
+            ) {
+                return $this;
+            }
+            if ($this->getElement($this->tokenElementName) === null) {
+                $this->addElement(new CsrfCounterMeasure($this->tokenElementName));
+            }
         }
-
         return $this;
     }
 

From c5761243c13e79ac73822b0ccdc04ebe4943dd6c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 30 Jul 2015 11:35:28 +0200
Subject: [PATCH 2727/2920] Wizard: Apply initial administrative rights for
 groups

refs #9609
---
 .../Setup/Steps/AuthenticationStep.php        | 56 ++++++++++++++-----
 modules/setup/library/Setup/WebWizard.php     | 20 ++++---
 2 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
index 266a162c6..decf3b454 100644
--- a/modules/setup/library/Setup/Steps/AuthenticationStep.php
+++ b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -62,14 +62,24 @@ class AuthenticationStep extends Step
 
     protected function createRolesIni()
     {
-        $config = array();
-        $config['admins'] = array(
-            'users'         => $this->data['adminAccountData']['username'],
-            'permissions'   => '*'
-        );
+        if (isset($this->data['adminAccountData']['username'])) {
+            $config = array(
+                'users'         => $this->data['adminAccountData']['username'],
+                'permissions'   => '*'
+            );
+
+            if ($this->data['backendConfig']['backend'] === 'db') {
+                $config['groups'] = mt('setup', 'Administrators', 'setup.role.name');
+            }
+        } else { // isset($this->data['adminAccountData']['groupname'])
+            $config = array(
+                'groups'        => $this->data['adminAccountData']['groupname'],
+                'permissions'   => '*'
+            );
+        }
 
         try {
-            Config::fromArray($config)
+            Config::fromArray(array(mt('setup', 'Administrators', 'setup.role.name') => $config))
                 ->setConfigFile(Config::resolvePath('roles.ini'))
                 ->saveIni();
         } catch (Exception $e) {
@@ -147,13 +157,20 @@ class AuthenticationStep extends Step
             . '</tbody>'
             . '</table>';
 
-        $adminHtml = '<p>' . (isset($this->data['adminAccountData']['resourceConfig']) ? sprintf(
-            mt('setup', 'Administrative rights will initially be granted to a new account called "%s".'),
-            $this->data['adminAccountData']['username']
-        ) : sprintf(
-            mt('setup', 'Administrative rights will initially be granted to an existing account called "%s".'),
-            $this->data['adminAccountData']['username']
-        )) . '</p>';
+        if (isset($this->data['adminAccountData']['username'])) {
+            $adminHtml = '<p>' . (isset($this->data['adminAccountData']['resourceConfig']) ? sprintf(
+                mt('setup', 'Administrative rights will initially be granted to a new account called "%s".'),
+                $this->data['adminAccountData']['username']
+            ) : sprintf(
+                mt('setup', 'Administrative rights will initially be granted to an existing account called "%s".'),
+                $this->data['adminAccountData']['username']
+            )) . '</p>';
+        } else { // isset($this->data['adminAccountData']['groupname'])
+            $adminHtml = '<p>' . sprintf(
+                mt('setup', 'Administrative rights will initially be granted to members of the user group "%s".'),
+                $this->data['adminAccountData']['groupname']
+            ) . '</p>';
+        }
 
         return $pageTitle . '<div class="topic">' . $backendDesc . $backendTitle . $backendHtml . '</div>'
             . '<div class="topic">' . $adminTitle . $adminHtml . '</div>';
@@ -190,14 +207,23 @@ class AuthenticationStep extends Step
         }
 
         if ($this->permIniError === false) {
-            $report[] = sprintf(
+            $report[] = isset($this->data['adminAccountData']['username']) ? sprintf(
                 mt('setup', 'Account "%s" has been successfully defined as initial administrator.'),
                 $this->data['adminAccountData']['username']
+            ) : sprintf(
+                mt('setup', 'The members of the user group "%s" were successfully defined as initial administrators.'),
+                $this->data['adminAccountData']['groupname']
             );
         } elseif ($this->permIniError !== null) {
-            $report[] = sprintf(
+            $report[] = isset($this->data['adminAccountData']['username']) ? sprintf(
                 mt('setup', 'Unable to define account "%s" as initial administrator. An error occured:'),
                 $this->data['adminAccountData']['username']
+            ) : sprintf(
+                mt(
+                    'setup',
+                    'Unable to define the members of the user group "%s" as initial administrators. An error occured:'
+                ),
+                $this->data['adminAccountData']['groupname']
             );
             $report[] = sprintf(mt('setup', 'ERROR: %s'), $this->permIniError->getMessage());
         }
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 5da1739c9..48b524b48 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -434,14 +434,18 @@ class WebWizard extends Wizard implements SetupWizard
         );
 
         $adminAccountType = $pageData['setup_admin_account']['user_type'];
-        $adminAccountData = array('username' => $pageData['setup_admin_account'][$adminAccountType]);
-        if ($adminAccountType === 'new_user' && !$pageData['setup_auth_db_resource']['skip_validation']
-            && (! isset($pageData['setup_auth_db_creation'])
-                || !$pageData['setup_auth_db_creation']['skip_validation']
-            )
-        ) {
-            $adminAccountData['resourceConfig'] = $pageData['setup_auth_db_resource'];
-            $adminAccountData['password'] = $pageData['setup_admin_account']['new_user_password'];
+        if ($adminAccountType === 'user_group') {
+            $adminAccountData = array('groupname' => $pageData['setup_admin_account'][$adminAccountType]);
+        } else {
+            $adminAccountData = array('username' => $pageData['setup_admin_account'][$adminAccountType]);
+            if ($adminAccountType === 'new_user' && !$pageData['setup_auth_db_resource']['skip_validation']
+                && (! isset($pageData['setup_auth_db_creation'])
+                    || !$pageData['setup_auth_db_creation']['skip_validation']
+                )
+            ) {
+                $adminAccountData['resourceConfig'] = $pageData['setup_auth_db_resource'];
+                $adminAccountData['password'] = $pageData['setup_admin_account']['new_user_password'];
+            }
         }
         $authType = $pageData['setup_authentication_type']['type'];
         $setup->addStep(

From 3aae37aff332ecdcfdcf01f8171f2ac2055d7655 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 12:02:42 +0200
Subject: [PATCH 2728/2920] Don't redirect on external auth

refs #9660
---
 .../forms/Authentication/LoginForm.php        |  9 ++-----
 library/Icinga/Authentication/Auth.php        | 26 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index 9965a6c12..f7bae3d1b 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -128,14 +128,9 @@ class LoginForm extends Form
     {
         $auth = Auth::getInstance();
         $onlyExternal = true;
-        $user = new User('');
+        // TODO(el): This may be set on the auth chain once iterated. See Auth::authExternal().
         foreach ($auth->getAuthChain() as $backend) {
-            if ($backend instanceof ExternalBackend) {
-                if ($backend->authenticate($user)) {
-                    $auth->setAuthenticated($user);
-                    $this->getResponse()->setRerenderLayout(true)->redirectAndExit($this->getRedirectUrl());
-                }
-            } else {
+            if (! $backend instanceof ExternalBackend) {
                 $onlyExternal = false;
             }
         }
diff --git a/library/Icinga/Authentication/Auth.php b/library/Icinga/Authentication/Auth.php
index 7fee5b536..826875b6a 100644
--- a/library/Icinga/Authentication/Auth.php
+++ b/library/Icinga/Authentication/Auth.php
@@ -7,6 +7,7 @@ use Exception;
 use Icinga\Application\Config;
 use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
+use Icinga\Authentication\User\ExternalBackend;
 use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Data\ConfigObject;
 use Icinga\Exception\IcingaException;
@@ -79,7 +80,11 @@ class Auth
      */
     public function isAuthenticated($ignoreSession = false)
     {
-        if ($this->user === null && ! $this->authHttp() && ! $ignoreSession) {
+        if ($this->user === null
+            && ! $this->authHttp()
+            && ! $this->authExternal()
+            && ! $ignoreSession
+        ) {
             $this->authenticateFromSession();
         }
         return $this->user !== null;
@@ -224,6 +229,25 @@ class Auth
         }
     }
 
+    /**
+     * Attempt to authenticate a user from external user backends
+     *
+     * @return bool
+     */
+    protected function authExternal()
+    {
+        $user = new User('');
+        foreach ($this->getAuthChain() as $userBackend) {
+            if ($userBackend instanceof ExternalBackend) {
+                if ($userBackend->authenticate($user)) {
+                    $this->setAuthenticated($user);
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     /**
      * Attempt to authenticate a user using HTTP authentication
      *

From c23c7a5fa95129460dfbb96419a8e4e48ffa0b3b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 12:03:33 +0200
Subject: [PATCH 2729/2920] lib: Add Request::getIsApiRequest()

If the Accept header is set to application/json it's an API request.

refs #9660
---
 library/Icinga/Web/Request.php | 65 ++++++++++++++++++++++++----------
 1 file changed, 47 insertions(+), 18 deletions(-)

diff --git a/library/Icinga/Web/Request.php b/library/Icinga/Web/Request.php
index 90551b33c..6fb078c96 100644
--- a/library/Icinga/Web/Request.php
+++ b/library/Icinga/Web/Request.php
@@ -7,24 +7,46 @@ use Zend_Controller_Request_Http;
 use Icinga\User;
 
 /**
- * Request to handle special attributes
+ * A request
  */
 class Request extends Zend_Controller_Request_Http
 {
     /**
-     * User object
+     * User if authenticated
      *
-     * @var User
+     * @var User|null
      */
-    private $user;
+    protected $user;
 
     /**
+     * Unique identifier
+     *
      * @var string
      */
-    private $uniqueId;
+    protected $uniqueId;
 
-    private $url;
+    /**
+     * Request URL
+     *
+     * @var Url
+     */
+    protected $url;
 
+    /**
+     * Get whether the request seems to be an API request
+     *
+     * @return bool
+     */
+    public function getIsApiRequest()
+    {
+        return $this->getHeader('Accept') === 'application/json';
+    }
+
+    /**
+     * Get the request URL
+     *
+     * @return Url
+     */
     public function getUrl()
     {
         if ($this->url === null) {
@@ -34,31 +56,38 @@ class Request extends Zend_Controller_Request_Http
     }
 
     /**
-     * Setter for user
+     * Get the user if authenticated
      *
-     * @param User $user
-     */
-    public function setUser(User $user)
-    {
-        $this->user = $user;
-    }
-
-    /**
-     * Getter for user
-     *
-     * @return User
+     * @return User|null
      */
     public function getUser()
     {
         return $this->user;
     }
 
+    /**
+     * Set the authenticated user
+     *
+     * @param   User $user
+     *
+     * @return  $this
+     */
+    public function setUser(User $user)
+    {
+        $this->user = $user;
+        return $this;
+    }
+
     /**
      * Makes an ID unique to this request, to prevent id collisions in different containers
      *
      * Call this whenever an ID might show up multiple times in different containers. This function is useful
      * for ensuring unique ids on sites, even if we combine the HTML of different requests into one site,
      * while still being able to reference elements uniquely in the same request.
+     *
+     * @param   string  $id
+     *
+     * @return  string  The id suffixed w/ an identifier unique to this request
      */
     public function protectId($id)
     {

From 9aa1599a18ccd9add36274391384ab623f369ed2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 12:04:22 +0200
Subject: [PATCH 2730/2920] Form: Disable CSRF counter measure only on API
 requests

refs #9660
---
 library/Icinga/Web/Form.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 1c106e017..1b1584ccf 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -951,8 +951,7 @@ class Form extends Zend_Form
         if (! $this->tokenDisabled) {
             $request = $this->getRequest();
             if (! $request->isXmlHttpRequest()
-                && ($user = $request->getUser()) !== null
-                && $user->getIsHttpUser()
+                && $request->getIsApiRequest()
             ) {
                 return $this;
             }

From 47079b723d615eb436c02e9a187e8a87109c27ce Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 30 Jul 2015 13:22:51 +0200
Subject: [PATCH 2731/2920] Wizard: Apply user group backend configuration

refs #9609
---
 .../library/Setup/Steps/UserGroupStep.php     | 209 ++++++++++++++++++
 modules/setup/library/Setup/WebWizard.php     |  21 ++
 2 files changed, 230 insertions(+)
 create mode 100644 modules/setup/library/Setup/Steps/UserGroupStep.php

diff --git a/modules/setup/library/Setup/Steps/UserGroupStep.php b/modules/setup/library/Setup/Steps/UserGroupStep.php
new file mode 100644
index 000000000..32d84250f
--- /dev/null
+++ b/modules/setup/library/Setup/Steps/UserGroupStep.php
@@ -0,0 +1,209 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Setup\Steps;
+
+use Exception;
+use Icinga\Application\Config;
+use Icinga\Authentication\UserGroup\DbUserGroupBackend;
+use Icinga\Data\ConfigObject;
+use Icinga\Data\ResourceFactory;
+use Icinga\Exception\IcingaException;
+use Icinga\Module\Setup\Step;
+
+class UserGroupStep extends Step
+{
+    protected $data;
+
+    protected $groupError;
+
+    protected $memberError;
+
+    protected $groupIniError;
+
+    public function __construct(array $data)
+    {
+        $this->data = $data;
+    }
+
+    public function apply()
+    {
+        $success &= $this->createGroupsIni();
+        if (isset($this->data['resourceConfig'])) {
+            $success &= $this->createUserGroup();
+            if ($success) {
+                $success &= $this->createMembership();
+            }
+        }
+
+        return $success;
+    }
+
+    protected function createGroupsIni()
+    {
+        $config = array();
+        if (isset($this->data['groupConfig'])) {
+            $backendConfig = $this->data['groupConfig'];
+            $backendName = $backendConfig['name'];
+            unset($backendConfig['name']);
+            $config[$backendName] = $backendConfig;
+        } else {
+            $backendConfig = array(
+                'backend'   => $this->data['backendConfig']['backend'], // "db" or "msldap"
+                'resource'  => $this->data['resourceName']
+            );
+
+            if ($backendConfig['backend'] === 'msldap') {
+                $backendConfig['user_backend'] = $this->data['backendConfig']['name'];
+            }
+
+            $config[$this->data['backendConfig']['name']] = $backendConfig;
+        }
+
+        try {
+            Config::fromArray($config)
+                ->setConfigFile(Config::resolvePath('groups.ini'))
+                ->saveIni();
+        } catch (Exception $e) {
+            $this->groupIniError = $e;
+            return false;
+        }
+
+        $this->groupIniError = false;
+        return true;
+    }
+
+    protected function createUserGroup()
+    {
+        try {
+            $backend = new DbUserGroupBackend(
+                ResourceFactory::createResource(new ConfigObject($this->data['resourceConfig']))
+            );
+
+            $groupName = mt('setup', 'Administrators', 'setup.role.name');
+            if ($backend->select()->where('group_name', $groupName)->count() === 0) {
+                $backend->insert('group', array(
+                    'group_name'    => $groupName
+                ));
+                $this->groupError = false;
+            }
+        } catch (Exception $e) {
+            $this->groupError = $e;
+            return false;
+        }
+
+        return true;
+    }
+
+    protected function createMembership()
+    {
+        try {
+            $backend = new DbUserGroupBackend(
+                ResourceFactory::createResource(new ConfigObject($this->data['resourceConfig']))
+            );
+
+            $groupName = mt('setup', 'Administrators', 'setup.role.name');
+            $userName = $this->data['username'];
+            if ($backend
+                ->select()
+                ->from('group_membership')
+                ->where('group_name', $groupName)
+                ->where('user_name', $userName)
+                ->count() === 0
+            ) {
+                $backend->insert('group_membership', array(
+                    'group_name'    => $groupName,
+                    'user_name'     => $userName
+                ));
+                $this->memberError = false;
+            }
+        } catch (Exception $e) {
+            $this->memberError = $e;
+            return false;
+        }
+
+        return true;
+    }
+
+    public function getSummary()
+    {
+        if (! isset($this->data['groupConfig'])) {
+            return; // It's not necessary to show the user something he didn't configure..
+        }
+
+        $pageTitle = '<h2>' . mt('setup', 'User Groups', 'setup.page.title') . '</h2>';
+        $backendTitle = '<h3>' . mt('setup', 'User Group Backend', 'setup.page.title') . '</h3>';
+
+        $backendHtml = ''
+            . '<table>'
+            . '<tbody>'
+            . '<tr>'
+            . '<td><strong>' . t('Backend Name') . '</strong></td>'
+            . '<td>' . $this->data['groupConfig']['name'] . '</td>'
+            . '</tr>'
+            . '<tr>'
+            . '<td><strong>' . mt('setup', 'Group Object Class') . '</strong></td>'
+            . '<td>' . $this->data['groupConfig']['group_class'] . '</td>'
+            . '</tr>'
+            . '<tr>'
+            . '<td><strong>' . mt('setup', 'Custom Filter') . '</strong></td>'
+            . '<td>' . trim($this->data['groupConfig']['group_filter']) ?: t('None', 'auth.ldap.filter') . '</td>'
+            . '</tr>'
+            . '<tr>'
+            . '<td><strong>' . mt('setup', 'Group Name Attribute') . '</strong></td>'
+            . '<td>' . $this->data['groupConfig']['group_name_attribute'] . '</td>'
+            . '</tr>'
+            . '</tbody>'
+            . '</table>';
+
+        return $pageTitle . '<div class="topic">' . $backendTitle . $backendHtml . '</div>';
+    }
+
+    public function getReport()
+    {
+        $report = array();
+
+        if ($this->groupIniError === false) {
+            $report[] = sprintf(
+                mt('setup', 'User Group Backend configuration has been successfully written to: %s'),
+                Config::resolvePath('groups.ini')
+            );
+        } elseif ($this->groupIniError !== null) {
+            $report[] = sprintf(
+                mt('setup', 'User Group Backend configuration could not be written to: %s. An error occured:'),
+                Config::resolvePath('groups.ini')
+            );
+            $report[] = sprintf(mt('setup', 'ERROR: %s'), IcingaException::describe($this->groupIniError));
+        }
+
+        if ($this->groupError === false) {
+            $report[] = sprintf(
+                mt('setup', 'User Group "%s" has been successfully created.'),
+                mt('setup', 'Administrators', 'setup.role.name')
+            );
+        } elseif ($this->groupError !== null) {
+            $report[] = sprintf(
+                mt('setup', 'Unable to create user group "%s". An error occured:'),
+                mt('setup', 'Administrators', 'setup.role.name')
+            );
+            $report[] = sprintf(mt('setup', 'ERROR: %s'), IcingaException::describe($this->groupError));
+        }
+
+        if ($this->memberError === false) {
+            $report[] = sprintf(
+                mt('setup', 'Account "%s" has been successfully added as member to user group "%s".'),
+                $this->data['username'],
+                mt('setup', 'Administrators', 'setup.role.name')
+            );
+        } elseif ($this->memberError !== null) {
+            $report[] = sprintf(
+                mt('setup', 'Unable to add account "%s" as member to user group "%s". An error occured:'),
+                $this->data['username'],
+                mt('setup', 'Administrators', 'setup.role.name')
+            );
+            $report[] = sprintf(mt('setup', 'ERROR: %s'), IcingaException::describe($this->memberError));
+        }
+
+        return $report;
+    }
+}
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 48b524b48..b6f311a67 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -27,6 +27,7 @@ use Icinga\Module\Setup\Steps\DatabaseStep;
 use Icinga\Module\Setup\Steps\GeneralConfigStep;
 use Icinga\Module\Setup\Steps\ResourceStep;
 use Icinga\Module\Setup\Steps\AuthenticationStep;
+use Icinga\Module\Setup\Steps\UserGroupStep;
 use Icinga\Module\Setup\Utils\EnableModuleStep;
 use Icinga\Module\Setup\Utils\DbTool;
 use Icinga\Module\Setup\Requirement\OSRequirement;
@@ -458,6 +459,26 @@ class WebWizard extends Wizard implements SetupWizard
             ))
         );
 
+        if ($authType !== 'external') {
+            $setup->addStep(
+                new UserGroupStep(array(
+                    'backendConfig'     => $pageData['setup_authentication_backend'],
+                    'groupConfig'       => isset($pageData['setup_usergroup_backend'])
+                        ? $pageData['setup_usergroup_backend']
+                        : null,
+                    'resourceName'      => $authType === 'db'
+                        ? $pageData['setup_auth_db_resource']['name']
+                        : $pageData['setup_ldap_resource']['name'],
+                    'resourceConfig'    => $authType === 'db'
+                        ? $pageData['setup_auth_db_resource']
+                        : null,
+                    'username'          => $authType === 'db'
+                        ? $pageData['setup_admin_account'][$adminAccountType]
+                        : null
+                ))
+            );
+        }
+
         if (
             isset($pageData['setup_auth_db_resource'])
             || isset($pageData['setup_config_db_resource'])

From f3a8981aa338bcfa50c676f3ded82e104139e70a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 30 Jul 2015 13:31:23 +0200
Subject: [PATCH 2732/2920] UserGroupStep: Fix c&p mistake

refs #9609
---
 modules/setup/library/Setup/Steps/UserGroupStep.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/library/Setup/Steps/UserGroupStep.php b/modules/setup/library/Setup/Steps/UserGroupStep.php
index 32d84250f..f60b4b4a2 100644
--- a/modules/setup/library/Setup/Steps/UserGroupStep.php
+++ b/modules/setup/library/Setup/Steps/UserGroupStep.php
@@ -28,7 +28,7 @@ class UserGroupStep extends Step
 
     public function apply()
     {
-        $success &= $this->createGroupsIni();
+        $success = $this->createGroupsIni();
         if (isset($this->data['resourceConfig'])) {
             $success &= $this->createUserGroup();
             if ($success) {

From d545e1f7d1d365f53f4d266779f413386aac31db Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 13:42:59 +0200
Subject: [PATCH 2733/2920] lib: Don't write the empty notifications array into
 the session

I combined this w/ introducing some constants for notification types and PHPDoc.

refs #9660
---
 library/Icinga/Web/Notification.php | 251 ++++++++++++++++++----------
 1 file changed, 167 insertions(+), 84 deletions(-)

diff --git a/library/Icinga/Web/Notification.php b/library/Icinga/Web/Notification.php
index 1dc35e981..89ef157e3 100644
--- a/library/Icinga/Web/Notification.php
+++ b/library/Icinga/Web/Notification.php
@@ -17,86 +17,72 @@ use Icinga\Web\Session;
  */
 class Notification
 {
+    /**
+     * Notification type info
+     *
+     * @var string
+     */
+    const INFO = 'info';
+
+    /**
+     * Notification type error
+     *
+     * @var string
+     */
+    const ERROR = 'error';
+
+    /**
+     * Notification type success
+     *
+     * @var string
+     */
+    const SUCCESS = 'success';
+
+    /**
+     * Notification type warning
+     *
+     * @var string
+     */
+    const WARNING = 'warning';
+
+    /**
+     * Name of the session key for notification messages
+     *
+     * @var string
+     */
+    const SESSION_KEY = 'session';
+
+    /**
+     * Singleton instance
+     *
+     * @var self
+     */
     protected static $instance;
 
+    /**
+     * Whether the platform is CLI
+     *
+     * @var bool
+     */
     protected $isCli = false;
 
-    protected $session;
-
+    /**
+     * Notification messages
+     *
+     * @var array
+     */
     protected $messages = array();
 
-    public static function info($msg)
-    {
-        self::getInstance()->addMessage($msg, 'info');
-    }
-
-    public static function success($msg)
-    {
-        self::getInstance()->addMessage($msg, 'success');
-    }
-
-    public static function warning($msg)
-    {
-        self::getInstance()->addMessage($msg, 'warning');
-    }
-
-    public static function error($msg)
-    {
-        self::getInstance()->addMessage($msg, 'error');
-    }
-
-    protected function addMessage($message, $type = 'info')
-    {
-        if (! in_array(
-            $type,
-            array(
-                'info',
-                'error',
-                'warning',
-                'success'
-            )
-        )) {
-            throw new ProgrammingError(
-                '"%s" is not a valid notification type',
-                $type
-            );
-        }
-
-        if ($this->isCli) {
-            $msg = sprintf('[%s] %s', $type, $message);
-            switch ($type) {
-                case 'info':
-                case 'success':
-                    Logger::info($msg);
-                    break;
-                case 'warning':
-                    Logger::warn($msg);
-                    break;
-                case 'error':
-                    Logger::error($msg);
-                    break;
-            }
-            return;
-        }
-
-        $this->messages[] = (object) array(
-            'type'    => $type,
-            'message' => $message,
-        );
-    }
-
-    public function hasMessages()
-    {
-        return false === empty($this->messages);
-    }
-
-    public function getMessages()
-    {
-        $messages = $this->messages;
-        $this->messages = array();
-        return $messages;
-    }
+    /**
+     * Session
+     *
+     * @var Session
+     */
+    protected $session;
 
+    /**
+     * Create the notification instance
+     */
     final private function __construct()
     {
         if (Platform::isCli()) {
@@ -105,33 +91,130 @@ class Notification
         }
 
         $this->session = Session::getSession();
-
-        $stored = $this->session->get('messages');
-        if (is_array($stored)) {
-            $this->messages = $stored;
-            $this->session->set('messages', array());
+        $messages = $this->session->get(self::SESSION_KEY);
+        if (is_array($messages)) {
+            $this->messages = $messages;
+            $this->session->delete(self::SESSION_KEY);
             $this->session->write();
         }
     }
 
+    /**
+     * Get the Notification instance
+     *
+     * @return Notification
+     */
     public static function getInstance()
     {
         if (self::$instance === null) {
-            self::$instance = new Notification();
+            self::$instance = new self();
         }
         return self::$instance;
     }
 
+    /**
+     * Add info notification
+     *
+     * @param string $msg
+     */
+    public static function info($msg)
+    {
+        self::getInstance()->addMessage($msg, self::INFO);
+    }
+
+    /**
+     * Add error notification
+     *
+     * @param string $msg
+     */
+    public static function error($msg)
+    {
+        self::getInstance()->addMessage($msg, self::ERROR);
+    }
+
+    /**
+     * Add success notification
+     *
+     * @param string $msg
+     */
+    public static function success($msg)
+    {
+        self::getInstance()->addMessage($msg, self::SUCCESS);
+    }
+
+    /**
+     * Add warning notification
+     *
+     * @param string $msg
+     */
+    public static function warning($msg)
+    {
+        self::getInstance()->addMessage($msg, self::WARNING);
+    }
+
+    /**
+     * Add a notification message
+     *
+     * @param   string $message
+     * @param   string $type
+     */
+    protected function addMessage($message, $type = self::INFO)
+    {
+        if ($this->isCli) {
+            $msg = sprintf('[%s] %s', $type, $message);
+            switch ($type) {
+                case self::INFO:
+                case self::SUCCESS:
+                    Logger::info($msg);
+                    break;
+                case self::ERROR:
+                    Logger::error($msg);
+                    break;
+                case self::WARNING:
+                    Logger::warning($msg);
+                    break;
+            }
+        } else {
+            $this->messages[] = (object) array(
+                'type'    => $type,
+                'message' => $message,
+            );
+        }
+    }
+
+    /**
+     * Get the notification messages
+     *
+     * @return array
+     */
+    public function getMessages()
+    {
+        $messages = $this->messages;
+        $this->messages = array();
+        return $messages;
+    }
+
+    /**
+     * Get whether notification messages have been added
+     *
+     * @return bool
+     */
+    public function hasMessages()
+    {
+        return ! empty($this->messages);
+    }
+
+    /**
+     * Destroy the notification instance
+     */
     final public function __destruct()
     {
         if ($this->isCli) {
             return;
         }
-        if ($this->session->get('messages') !== $this->messages) {
-            $this->session->set('messages', $this->messages);
+        if ($this->hasMessages() && $this->session->get('messages') !== $this->messages) {
+            $this->session->set(self::SESSION_KEY, $this->messages);
+            $this->session->write();
         }
-        $this->session->write();
-
-        unset($this->session);
     }
 }

From 81aad9d6a61790bd4d3730162208798443c3fce9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 13:45:39 +0200
Subject: [PATCH 2734/2920] Rename Notifiation::getMessages() to popMessages()

Because the call to popMessages()--before getMessages()--automatically resets the notification messages on the instance, popMessages() is a much better name for the method.

refs #9660
---
 application/layouts/scripts/body.phtml                    | 2 +-
 library/Icinga/Web/Controller/ActionController.php        | 2 +-
 library/Icinga/Web/Notification.php                       | 4 ++--
 modules/setup/application/views/scripts/index/index.phtml | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index 0fa60b284..92caaf2f3 100644
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -51,7 +51,7 @@ if (Auth::getInstance()->isAuthenticated()):
    <ul id="notifications"><?php
 $notifications = Notification::getInstance();
 if ($notifications->hasMessages()) {
-    foreach ($notifications->getMessages() as $m) {
+    foreach ($notifications->popMessages() as $m) {
         echo '<li class="' . $m->type . '">' . $this->escape($m->message) . '</li>';
     }
 }
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index c98a20a69..5d1055321 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -455,7 +455,7 @@ class ActionController extends Zend_Controller_Action
         $notifications = Notification::getInstance();
         if ($notifications->hasMessages()) {
             $notificationList = array();
-            foreach ($notifications->getMessages() as $m) {
+            foreach ($notifications->popMessages() as $m) {
                 $notificationList[] = rawurlencode($m->type . ' ' . $m->message);
             }
             $resp->setHeader('X-Icinga-Notification', implode('&', $notificationList), true);
diff --git a/library/Icinga/Web/Notification.php b/library/Icinga/Web/Notification.php
index 89ef157e3..c4ab724da 100644
--- a/library/Icinga/Web/Notification.php
+++ b/library/Icinga/Web/Notification.php
@@ -183,11 +183,11 @@ class Notification
     }
 
     /**
-     * Get the notification messages
+     * Pop the notification messages
      *
      * @return array
      */
-    public function getMessages()
+    public function popMessages()
     {
         $messages = $this->messages;
         $this->messages = array();
diff --git a/modules/setup/application/views/scripts/index/index.phtml b/modules/setup/application/views/scripts/index/index.phtml
index a55cfa198..d77d95ddc 100644
--- a/modules/setup/application/views/scripts/index/index.phtml
+++ b/modules/setup/application/views/scripts/index/index.phtml
@@ -19,7 +19,7 @@ $maxProgress = @max(array_keys(array_filter(
 
 $notifications = Notification::getInstance();
 if ($notifications->hasMessages()) {
-    foreach ($notifications->getMessages() as $m) {
+    foreach ($notifications->popMessages() as $m) {
         echo '<li class="' . $m->type . '">' . $this->escape($m->message) . '</li>';
     }
 }
@@ -135,4 +135,4 @@ if ($notifications->hasMessages()) {
     <?= $this->render('index/parts/wizard.phtml'); ?>
 <?php endif ?>
   </div>
-</div>
\ No newline at end of file
+</div>

From 42d698a6b3c05dbe37ac115b18c7de383906c09b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 13:47:54 +0200
Subject: [PATCH 2735/2920] lib: Add Web::getResponse()

Use this method for retrieving the response object outside a controller.

refs #9660
---
 library/Icinga/Application/Web.php | 31 +++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 8b2cd9296..4ab52b4e9 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -55,6 +55,13 @@ class Web extends ApplicationBootstrap
      */
     private $request;
 
+    /**
+     * Response
+     *
+     * @var Response
+     */
+    protected $response;
+
     /**
      * Session object
      *
@@ -92,6 +99,7 @@ class Web extends ApplicationBootstrap
             ->setupSession()
             ->setupNotifications()
             ->setupRequest()
+            ->setupResponse()
             ->setupUser()
             ->setupTimezone()
             ->setupLogger()
@@ -146,6 +154,16 @@ class Web extends ApplicationBootstrap
         return $this->request;
     }
 
+    /**
+     * Get the response
+     *
+     * @return Response
+     */
+    public function getResponse()
+    {
+        return $this->response;
+    }
+
     /**
      * Getter for view
      *
@@ -161,7 +179,7 @@ class Web extends ApplicationBootstrap
      */
     public function dispatch()
     {
-        $this->frontController->dispatch($this->request, new Response());
+        $this->frontController->dispatch($this->getRequest(), $this->getResponse());
     }
 
     /**
@@ -231,6 +249,17 @@ class Web extends ApplicationBootstrap
         return $this;
     }
 
+    /**
+     * Set the response
+     *
+     * @return $this
+     */
+    protected function setupResponse()
+    {
+        $this->response = new Response();
+        return $this;
+    }
+
     /**
      * Instantiate front controller
      *

From 1479cb4956b4343e5ffbf6ef1e1b73a358be3ed0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 30 Jul 2015 13:51:43 +0200
Subject: [PATCH 2736/2920] setup.less: Reduce button style complexity and
 remove unecessary styles

---
 public/css/icinga/setup.less | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index cae83a430..0134642f5 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -117,16 +117,8 @@
     left: -1337px;
   }
 
-  button, .button-like {
-    &.finish, &.login {
-      min-width: 25em;
-      color: #fffafa;
-      background: @colorPetrol;
-
-      &:hover, &:focus, &:active {
-        background: #666;
-      }
-    }
+  button.finish, a.button-like.login {
+    min-width: 25em;
   }
 }
 

From 6c086951dd2412042055901382ca2e2234e1a76f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 30 Jul 2015 13:52:36 +0200
Subject: [PATCH 2737/2920] forms.less: Place button-like styles before
 link-like styles

---
 public/css/icinga/forms.less | 90 +++++++++++++++++++-----------------
 1 file changed, 47 insertions(+), 43 deletions(-)

diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index e31081f53..603e075ac 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -107,6 +107,53 @@ form.inline {
   display: inline;
 }
 
+button, .button-like {
+  font-size: 0.9em;
+  font-weight: bold;
+  outline: 0;
+  color: #fff;
+  padding: 0.2em;
+  border: 1px solid;
+  border-color: @colorPetrol;
+  background: @colorPetrol;
+
+  &[disabled] {
+    background-color: #666;
+    border-color: black;
+  }
+
+  &:hover, &:focus, &:active {
+    background-color: #333;
+    border-color: #333;
+    cursor: pointer;
+
+    &[disabled] {
+      background-color: #666;
+    }
+  }
+
+  &.icon-only {
+    font-size: 1.5em;
+    padding: 0;
+    border: none;
+    color: inherit;
+    background-color: transparent;
+
+    &:hover, &:focus, &:active {
+      color: #666;
+    }
+  }
+}
+
+.button-like {
+  display: inline-block;
+}
+
+a.button-like {
+  cursor: default;
+  text-decoration: none;
+}
+
 form.link-like input[type="submit"], form.link-like button[type="submit"], input.link-like, button.link-like {
   color: @colorLinkDefault;
   font-weight: normal;
@@ -302,47 +349,4 @@ form ul.hints {
     height: 0;
     clear: both;
   }
-}
-
-button, .button-like {
-  font-size: 0.9em;
-  font-weight: bold;
-  outline: 0;
-  color: #fff;
-  padding: 0.2em;
-  border: 1px solid;
-  border-color: @colorPetrol;
-  background: @colorPetrol;
-
-  &[disabled] {
-    background-color: #666;
-    border-color: black;
-  }
-
-  &:hover, &:focus, &:active {
-    background-color: #333;
-    border-color: #333;
-    cursor: pointer;
-
-    &[disabled] {
-      background-color: #666;
-    }
-  }
-
-  &.icon-only {
-    font-size: 1.5em;
-    padding: 0;
-    border: none;
-    color: inherit;
-    background-color: transparent;
-
-    &:hover, &:focus, &:active {
-      color: #666;
-    }
-  }
-}
-
-a.button-like {
-  cursor: default;
-  text-decoration: none;
 }
\ No newline at end of file

From c594d6db33005b203b6915bde751555cf469c699 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 13:59:18 +0200
Subject: [PATCH 2738/2920] Challenge client on invalid basic access auth
 credentials

refs #9660
---
 library/Icinga/Authentication/Auth.php | 49 ++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/Authentication/Auth.php b/library/Icinga/Authentication/Auth.php
index 826875b6a..0cddf1441 100644
--- a/library/Icinga/Authentication/Auth.php
+++ b/library/Icinga/Authentication/Auth.php
@@ -33,6 +33,13 @@ class Auth
      */
     protected $request;
 
+    /**
+     * Response
+     *
+     * @var \Icinga\Web\Response
+     */
+    protected $response;
+
     /**
      * Authenticated user
      *
@@ -185,6 +192,19 @@ class Auth
         return $this->request;
     }
 
+    /**
+     * Get the response
+     *
+     * @return \Icinga\Web\Response
+     */
+    public function getResponse()
+    {
+        if ($this->response === null) {
+            $this->response = Icinga::app()->getResponse();
+        }
+        return $this->response;
+    }
+
     /**
      * Get applied restrictions matching a given restriction name
      *
@@ -251,8 +271,7 @@ class Auth
     /**
      * Attempt to authenticate a user using HTTP authentication
      *
-     * Supports only the Basic HTTP authentication scheme. This will not challenge the client if authorization is
-     * missing or invalid yet. XHR will be ignored.
+     * Supports only the Basic HTTP authentication scheme. XHR will be ignored.
      *
      * @return bool
      */
@@ -261,20 +280,22 @@ class Auth
         if ($this->getRequest()->isXmlHttpRequest()) {
             return false;
         }
-        $header = $this->getRequest()->getHeader('Authorization');
-        if (empty($header)) {
+        if (($header = $this->getRequest()->getHeader('Authorization')) === false) {
             return false;
         }
+        if (empty($header)) {
+            $this->challengeHttp();
+        }
         list($scheme) = explode(' ', $header, 2);
         if ($scheme !== 'Basic') {
-            return false;
+            $this->challengeHttp();
         }
         $authorization = substr($header, strlen('Basic '));
         $credentials = base64_decode($authorization);
         $credentials = array_filter(explode(':', $credentials));
         if (count($credentials) !== 2) {
             // Deny empty username and/or password
-            return false;
+            $this->challengeHttp();
         }
         $user = new User($credentials[0]);
         $password = $credentials[1];
@@ -283,10 +304,24 @@ class Auth
             $user->setIsHttpUser(true);
             return true;
         } else {
-            return false;
+            $this->challengeHttp();
         }
     }
 
+    /**
+     * Challenge client immediately for HTTP authentication
+     *
+     * Sends the response w/ the 401 Unauthorized status code and WWW-Authenticate header.
+     */
+    protected function challengeHttp()
+    {
+        $response = $this->getResponse();
+        $response->setHttpResponseCode(401);
+        $response->setHeader('WWW-Authenticate', 'Basic realm="Icinga Web 2"');
+        $response->sendHeaders();
+        exit();
+    }
+
     /**
      * Whether an authenticated user has a given permission
      *

From 55ad2dd65f285fa343aed0c8211d78535e59e943 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 13:59:47 +0200
Subject: [PATCH 2739/2920] Don't fail if password contains a colon on basic
 auth

refs #9660
---
 library/Icinga/Authentication/Auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Authentication/Auth.php b/library/Icinga/Authentication/Auth.php
index 0cddf1441..8ff11b091 100644
--- a/library/Icinga/Authentication/Auth.php
+++ b/library/Icinga/Authentication/Auth.php
@@ -292,7 +292,7 @@ class Auth
         }
         $authorization = substr($header, strlen('Basic '));
         $credentials = base64_decode($authorization);
-        $credentials = array_filter(explode(':', $credentials));
+        $credentials = array_filter(explode(':', $credentials, 2));
         if (count($credentials) !== 2) {
             // Deny empty username and/or password
             $this->challengeHttp();

From 9060e8a0349c6f32a1c08c33964c1a28b1a8a43a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 14:02:44 +0200
Subject: [PATCH 2740/2920] lib: Only call Icinga::app()->getRequest() for
 getting the request outside of a controller

Saves a call to getFrontController().

refs #9660
---
 library/Icinga/Data/PivotTable.php         | 2 +-
 library/Icinga/Data/SimpleQuery.php        | 2 +-
 library/Icinga/Test/BaseTestCase.php       | 2 +-
 library/Icinga/Web/Form.php                | 2 +-
 library/Icinga/Web/Form/Element/Button.php | 2 +-
 library/Icinga/Web/Response.php            | 2 +-
 library/Icinga/Web/Url.php                 | 2 +-
 library/Icinga/Web/Widget/SortBox.php      | 2 +-
 library/Icinga/Web/Widget/Tabs.php         | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/library/Icinga/Data/PivotTable.php b/library/Icinga/Data/PivotTable.php
index c76d1ec7b..cf703ae9c 100644
--- a/library/Icinga/Data/PivotTable.php
+++ b/library/Icinga/Data/PivotTable.php
@@ -111,7 +111,7 @@ class PivotTable
      */
     protected function getPaginationParameter($axis, $param, $default = null)
     {
-        $request = Icinga::app()->getFrontController()->getRequest();
+        $request = Icinga::app()->getRequest();
 
         $value = $request->getParam($param, '');
         if (strpos($value, ',') > 0) {
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 9751a2756..bbc23a15f 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -435,7 +435,7 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
 
         if ($itemsPerPage === null || $pageNumber === null) {
             // Detect parameters from request
-            $request = Icinga::app()->getFrontController()->getRequest();
+            $request = Icinga::app()->getRequest();
             if ($itemsPerPage === null) {
                 $itemsPerPage = $request->getParam('limit', 25);
             }
diff --git a/library/Icinga/Test/BaseTestCase.php b/library/Icinga/Test/BaseTestCase.php
index 43f2e6224..9f7404ae9 100644
--- a/library/Icinga/Test/BaseTestCase.php
+++ b/library/Icinga/Test/BaseTestCase.php
@@ -180,7 +180,7 @@ namespace Icinga\Test {
          */
         public function getRequestMock()
         {
-            return Icinga::app()->getFrontController()->getRequest();
+            return Icinga::app()->getRequest();
         }
 
         /**
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 1b1584ccf..7bb0e7a48 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -1252,7 +1252,7 @@ class Form extends Zend_Form
     public function getRequest()
     {
         if ($this->request === null) {
-            $this->request = Icinga::app()->getFrontController()->getRequest();
+            $this->request = Icinga::app()->getRequest();
         }
 
         return $this->request;
diff --git a/library/Icinga/Web/Form/Element/Button.php b/library/Icinga/Web/Form/Element/Button.php
index dda6479fb..f62cfde21 100644
--- a/library/Icinga/Web/Form/Element/Button.php
+++ b/library/Icinga/Web/Form/Element/Button.php
@@ -75,6 +75,6 @@ class Button extends FormElement
      */
     protected function getRequest()
     {
-        return Icinga::app()->getFrontController()->getRequest();
+        return Icinga::app()->getRequest();
     }
 }
diff --git a/library/Icinga/Web/Response.php b/library/Icinga/Web/Response.php
index f29442a46..b11ecd78e 100644
--- a/library/Icinga/Web/Response.php
+++ b/library/Icinga/Web/Response.php
@@ -68,7 +68,7 @@ class Response extends Zend_Controller_Response_Http
     public function getRequest()
     {
         if ($this->request === null) {
-            $this->request = Icinga::app()->getFrontController()->getRequest();
+            $this->request = Icinga::app()->getRequest();
         }
         return $this->request;
     }
diff --git a/library/Icinga/Web/Url.php b/library/Icinga/Web/Url.php
index 3a12b5d77..7c3829537 100644
--- a/library/Icinga/Web/Url.php
+++ b/library/Icinga/Web/Url.php
@@ -102,7 +102,7 @@ class Url
         if ($app->isCli()) {
             return new FakeRequest();
         } else {
-            return $app->getFrontController()->getRequest();
+            return $app->getRequest();
         }
     }
 
diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 7a09c2f36..c9d38f2b7 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -116,7 +116,7 @@ class SortBox extends AbstractWidget
     {
         if ($this->query !== null) {
             if ($request === null) {
-                $request = Icinga::app()->getFrontController()->getRequest();
+                $request = Icinga::app()->getRequest();
             }
 
             if (($sort = $request->getParam('sort'))) {
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index 220393aff..95dfdb389 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -309,7 +309,7 @@ EOT;
 
     private function renderRefreshTab()
     {
-        $url = Icinga::app()->getFrontController()->getRequest()->getUrl();
+        $url = Icinga::app()->getRequest()->getUrl();
         $tab = $this->get($this->getActiveName());
 
         if ($tab !== null) {

From 8c71d560508bad2a65ae2011dd781823210eaa46 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 30 Jul 2015 14:13:06 +0200
Subject: [PATCH 2741/2920] forms.less: Fix link-like styles for buttons and
 inputs, again

---
 public/css/icinga/forms.less | 9 ++++++++-
 public/css/icinga/setup.less | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 603e075ac..467fea827 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -166,9 +166,16 @@ form.link-like input[type="submit"], form.link-like button[type="submit"], input
 
 form.link-like input[type="submit"]:hover,
 form.link-like input[type="submit"]:focus,
+form.link-like input[type="submit"]:active,
 form.link-like button[type="submit"]:hover,
 form.link-like button[type="submit"]:focus,
-input.link-like:hover, button.link-like:focus {
+form.link-like button[type="submit"]:active,
+input.link-like:hover,
+input.link-like:focus,
+input.link-like:active,
+button.link-like:hover,
+button.link-like:focus,
+button.link-like:active {
   text-decoration: underline;
   background: none;
   color: @colorLinkDefault;
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index 0134642f5..cbe4d96fd 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -292,7 +292,7 @@ form#setup_requirements {
   }
 
   div.buttons {
-    margin-top: 0.5em;
+    margin-top: 0;
     text-align: center;
 
     a {

From 0155599a1a818f3b71af8a3c5efc3c4e64e9fbc5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 30 Jul 2015 14:13:52 +0200
Subject: [PATCH 2742/2920] Wizard: Use <pre> instead of <textarea> for
 displaying the setup's log

---
 .../setup/application/views/scripts/index/parts/finish.phtml  | 4 ++--
 public/css/icinga/setup.less                                  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/setup/application/views/scripts/index/parts/finish.phtml b/modules/setup/application/views/scripts/index/parts/finish.phtml
index 7066f7f2e..a56c07c3a 100644
--- a/modules/setup/application/views/scripts/index/parts/finish.phtml
+++ b/modules/setup/application/views/scripts/index/parts/finish.phtml
@@ -27,7 +27,7 @@
     ); ?>
   <?php endif ?>
   </div>
-  <textarea class="report" readonly><?= join("\n\n", array_map(function($a) {
+  <pre class="log-output"><?= join("\n\n", array_map(function($a) {
     return join("\n", $a);
-  }, $report)); ?></textarea>
+  }, $report)); ?></pre>
 </div>
\ No newline at end of file
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index cbe4d96fd..1f71be9e0 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -286,9 +286,10 @@ form#setup_requirements {
     }
   }
 
-  textarea.report {
+  pre.log-output {
     width: 66%;
     height: 25em;
+    max-height: none;
   }
 
   div.buttons {

From eb4e56fbc0ff826edb2b18ebba4f03dff19dfc52 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 30 Jul 2015 14:14:43 +0200
Subject: [PATCH 2743/2920] AuthenticationStep: Do not report a success if
 nothing has changed

---
 modules/setup/library/Setup/Steps/AuthenticationStep.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
index decf3b454..7c98bbbc7 100644
--- a/modules/setup/library/Setup/Steps/AuthenticationStep.php
+++ b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -104,13 +104,13 @@ class AuthenticationStep extends Step
                     'password'  => $this->data['adminAccountData']['password'],
                     'is_active' => true
                 ));
+                $this->dbError = false;
             }
         } catch (Exception $e) {
             $this->dbError = $e;
             return false;
         }
 
-        $this->dbError = false;
         return true;
     }
 

From feed927fd28205b6cf5acb3b6fb1abc8bdd10a28 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 14:50:05 +0200
Subject: [PATCH 2744/2920] Let external auth win over session auth and session
 auth over http auth

refs #9660
---
 library/Icinga/Authentication/Auth.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/library/Icinga/Authentication/Auth.php b/library/Icinga/Authentication/Auth.php
index 8ff11b091..9b1360a60 100644
--- a/library/Icinga/Authentication/Auth.php
+++ b/library/Icinga/Authentication/Auth.php
@@ -87,14 +87,13 @@ class Auth
      */
     public function isAuthenticated($ignoreSession = false)
     {
-        if ($this->user === null
-            && ! $this->authHttp()
-            && ! $this->authExternal()
-            && ! $ignoreSession
-        ) {
+        if ($this->user === null && ! $ignoreSession) {
             $this->authenticateFromSession();
         }
-        return $this->user !== null;
+        if ($this->user === null && ! $this->authExternal()) {
+            return $this->authHttp();
+        }
+        return true;
     }
 
     public function setAuthenticated(User $user, $persist = true)

From 87deda86be19e42617a6f2eadef5f0dbfe9ac7f6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 30 Jul 2015 14:51:51 +0200
Subject: [PATCH 2745/2920] AuthBackendPage: Fix that re-populating the chosen
 LDAP type has no effect

...
---
 modules/setup/application/forms/AuthBackendPage.php | 8 +++++++-
 modules/setup/library/Setup/WebWizard.php           | 8 +++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index 3edfb6afd..01cd7176d 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -71,6 +71,12 @@ class AuthBackendPage extends Form
                 . 'to do now is defining a name for your first authentication backend.'
             ));
         } elseif ($this->config['type'] === 'ldap') {
+            $type = null;
+            if (! isset($formData['type']) && isset($formData['backend'])) {
+                $type = $formData['backend'];
+                $formData['type'] = $type;
+            }
+
             $backendForm = new LdapBackendForm();
             $backendForm->setResources(array($this->config['name']));
             $backendForm->create($formData);
@@ -94,7 +100,7 @@ class AuthBackendPage extends Form
                         'ldap'      => 'LDAP',
                         'msldap'    => 'ActiveDirectory'
                     ),
-                    'value'             => isset($formData['backend']) ? $formData['backend'] : null
+                    'value'             => $type
                 )
             );
         } else { // $this->config['type'] === 'external'
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index b6f311a67..00956d108 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -138,9 +138,11 @@ class WebWizard extends Wizard implements SetupWizard
             } elseif ($authData['type'] === 'ldap') {
                 $page->setResourceConfig($this->getPageData('setup_ldap_resource'));
 
-                $suggestions = $this->getPageData('setup_ldap_discovery');
-                if (isset($suggestions['backend'])) {
-                    $page->populate($suggestions['backend']);
+                if (! $this->hasPageData('setup_authentication_backend')) {
+                    $suggestions = $this->getPageData('setup_ldap_discovery');
+                    if (isset($suggestions['backend'])) {
+                        $page->populate($suggestions['backend']);
+                    }
                 }
 
                 if ($this->getDirection() === static::FORWARD) {

From 171be7a436bb4a6e30488fd3e811f2cad93df133 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 30 Jul 2015 15:05:19 +0200
Subject: [PATCH 2746/2920] AuthenticationStep: Fix that the backend type
 'msldap' is shown as external

---
 .../library/Setup/Steps/AuthenticationStep.php     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
index 7c98bbbc7..4510f6a21 100644
--- a/modules/setup/library/Setup/Steps/AuthenticationStep.php
+++ b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -124,7 +124,9 @@ class AuthenticationStep extends Step
         $backendDesc = '<p>' . sprintf(
             mt('setup', 'Users will authenticate using %s.', 'setup.summary.auth'),
             $authType === 'db' ? mt('setup', 'a database', 'setup.summary.auth.type') : (
-                $authType === 'ldap' ? 'LDAP' : mt('setup', 'webserver authentication', 'setup.summary.auth.type')
+                $authType === 'ldap' || $authType === 'msldap' ? 'LDAP' : (
+                    mt('setup', 'webserver authentication', 'setup.summary.auth.type')
+                )
             )
         ) . '</p>';
 
@@ -135,18 +137,20 @@ class AuthenticationStep extends Step
             . '<td><strong>' . t('Backend Name') . '</strong></td>'
             . '<td>' . $this->data['backendConfig']['name'] . '</td>'
             . '</tr>'
-            . ($authType === 'ldap' ? (
+            . ($authType === 'ldap' || $authType === 'msldap' ? (
                 '<tr>'
                 . '<td><strong>' . mt('setup', 'User Object Class') . '</strong></td>'
-                . '<td>' . $this->data['backendConfig']['user_class'] . '</td>'
+                . '<td>' . ($authType === 'msldap' ? 'user' : $this->data['backendConfig']['user_class']) . '</td>'
                 . '</tr>'
                 . '<tr>'
                 . '<td><strong>' . mt('setup', 'Custom Filter') . '</strong></td>'
-                . '<td>' . trim($this->data['backendConfig']['filter']) ?: t('None', 'auth.ldap.filter') . '</td>'
+                . '<td>' . (trim($this->data['backendConfig']['filter']) ?: t('None', 'auth.ldap.filter')) . '</td>'
                 . '</tr>'
                 . '<tr>'
                 . '<td><strong>' . mt('setup', 'User Name Attribute') . '</strong></td>'
-                . '<td>' . $this->data['backendConfig']['user_name_attribute'] . '</td>'
+                . '<td>' . ($authType === 'msldap'
+                    ? 'sAMAccountName'
+                    : $this->data['backendConfig']['user_name_attribute']) . '</td>'
                 . '</tr>'
             ) : ($authType === 'external' ? (
                 '<tr>'

From cf91478b65c8e0da3a889e23a12a3b195bff843b Mon Sep 17 00:00:00 2001
From: xert <xert@users.noreply.github.com>
Date: Fri, 26 Jun 2015 16:26:05 +0200
Subject: [PATCH 2747/2920] Use /usr/bin/env php in the icingacli for source
 installations

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
---
 bin/icingacli | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/icingacli b/bin/icingacli
index 19d786af7..1922c9706 100755
--- a/bin/icingacli
+++ b/bin/icingacli
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 

From 9cd419d3308b22eb0740453f63a3839eaf252b29 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 30 Jul 2015 15:28:13 +0200
Subject: [PATCH 2748/2920] UserGroupBackendPage: Add missing page description

refs #9609
---
 modules/setup/application/forms/UserGroupBackendPage.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/setup/application/forms/UserGroupBackendPage.php b/modules/setup/application/forms/UserGroupBackendPage.php
index 1d8858689..6c986bf0a 100644
--- a/modules/setup/application/forms/UserGroupBackendPage.php
+++ b/modules/setup/application/forms/UserGroupBackendPage.php
@@ -35,6 +35,10 @@ class UserGroupBackendPage extends Form
     {
         $this->setName('setup_usergroup_backend');
         $this->setTitle($this->translate('User Group Backend', 'setup.page.title'));
+        $this->addDescription($this->translate(
+            'To allow Icinga Web 2 to associate users and groups, you\'ll need to provide some further information'
+            . ' about the LDAP Connection that is already going to be used to locate account details.'
+        ));
     }
 
     /**

From 219dcdda370432e0bd111e9cfe2fe265bc5a6ec9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 15:47:35 +0200
Subject: [PATCH 2749/2920] translation: Set config on the translation helper

Installations from package will provide a config for the translation module which defines the appropriate gettext tools paths.

refs #9615
---
 .../clicommands/CompileCommand.php            |  4 +--
 .../clicommands/RefreshCommand.php            |  4 +--
 .../Translation/Cli/TranslationCommand.php    | 17 ++++++++-
 .../Util/GettextTranslationHelper.php         | 35 +++++++++++++++++--
 4 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/modules/translation/application/clicommands/CompileCommand.php b/modules/translation/application/clicommands/CompileCommand.php
index 036769175..e13b8b9f5 100644
--- a/modules/translation/application/clicommands/CompileCommand.php
+++ b/modules/translation/application/clicommands/CompileCommand.php
@@ -38,7 +38,7 @@ class CompileCommand extends TranslationCommand
     {
         $locale = $this->validateLocaleCode($this->params->shift());
 
-        $helper = new GettextTranslationHelper($this->app, $locale);
+        $helper = $this->getTranslationHelper($locale);
         $helper->compileIcingaTranslation();
     }
 
@@ -61,7 +61,7 @@ class CompileCommand extends TranslationCommand
         $module = $this->validateModuleName($this->params->shift());
         $locale = $this->validateLocaleCode($this->params->shift());
 
-        $helper = new GettextTranslationHelper($this->app, $locale);
+        $helper = $this->getTranslationHelper($locale);
         $helper->compileModuleTranslation($module);
     }
 }
diff --git a/modules/translation/application/clicommands/RefreshCommand.php b/modules/translation/application/clicommands/RefreshCommand.php
index 67cbf0296..7320b9651 100644
--- a/modules/translation/application/clicommands/RefreshCommand.php
+++ b/modules/translation/application/clicommands/RefreshCommand.php
@@ -38,7 +38,7 @@ class RefreshCommand extends TranslationCommand
     {
         $locale = $this->validateLocaleCode($this->params->shift());
 
-        $helper = new GettextTranslationHelper($this->app, $locale);
+        $helper = $this->getTranslationHelper($locale);
         $helper->updateIcingaTranslations();
     }
 
@@ -61,7 +61,7 @@ class RefreshCommand extends TranslationCommand
         $module = $this->validateModuleName($this->params->shift());
         $locale = $this->validateLocaleCode($this->params->shift());
 
-        $helper = new GettextTranslationHelper($this->app, $locale);
+        $helper = $this->getTranslationHelper($locale);
         $helper->updateModuleTranslations($module);
     }
 }
diff --git a/modules/translation/library/Translation/Cli/TranslationCommand.php b/modules/translation/library/Translation/Cli/TranslationCommand.php
index e11d03d29..48f7d6ed2 100644
--- a/modules/translation/library/Translation/Cli/TranslationCommand.php
+++ b/modules/translation/library/Translation/Cli/TranslationCommand.php
@@ -6,12 +6,27 @@ namespace Icinga\Module\Translation\Cli;
 use Exception;
 use Icinga\Cli\Command;
 use Icinga\Exception\IcingaException;
+use Icinga\Module\Translation\Util\GettextTranslationHelper;
 
 /**
  * Base class for translation commands
  */
 class TranslationCommand extends Command
 {
+    /**
+     * Get the gettext translation helper
+     *
+     * @param   string $locale
+     *
+     * @return  GettextTranslationHelper
+     */
+    public function getTranslationHelper($locale)
+    {
+        $helper = new GettextTranslationHelper($this->app, $locale);
+        $helper->setConfig($this->Config());
+        return $helper;
+    }
+
     /**
      * Check whether the given locale code is valid
      *
@@ -46,7 +61,7 @@ class TranslationCommand extends Command
     {
         $enabledModules = $this->app->getModuleManager()->listEnabledModules();
 
-        if (!in_array($name, $enabledModules)) {
+        if (! in_array($name, $enabledModules)) {
             throw new IcingaException(
                 'Module with name \'%s\' not found or is not enabled',
                 $name
diff --git a/modules/translation/library/Translation/Util/GettextTranslationHelper.php b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
index cbeaa2d6b..53f9aff17 100644
--- a/modules/translation/library/Translation/Util/GettextTranslationHelper.php
+++ b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
@@ -4,10 +4,11 @@
 namespace Icinga\Module\Translation\Util;
 
 use Exception;
+use Icinga\Application\ApplicationBootstrap;
+use Icinga\Application\Config;
+use Icinga\Application\Modules\Manager;
 use Icinga\Exception\IcingaException;
 use Icinga\Util\File;
-use Icinga\Application\Modules\Manager;
-use Icinga\Application\ApplicationBootstrap;
 
 /**
  * This class provides some useful utility functions to handle gettext translations
@@ -19,6 +20,13 @@ class GettextTranslationHelper
      */
     const FILE_ENCODING = 'UTF-8';
 
+    /**
+     * Config
+     *
+     * @var Config
+     */
+    protected $config;
+
     /**
      * The source files to parse
      *
@@ -105,6 +113,29 @@ class GettextTranslationHelper
         $this->locale = $locale;
     }
 
+    /**
+     * Get the config
+     *
+     * @return Config
+     */
+    public function getConfig()
+    {
+        return $this->config;
+    }
+
+    /**
+     * Set the config
+     *
+     * @param   Config $config
+     *
+     * @return  $this
+     */
+    public function setConfig(Config $config)
+    {
+        $this->config = $config;
+        return $this;
+    }
+
     /**
      * Update the translation table for the main application
      */

From 5ca0e981c4a1f3c5ade5a88ea332e5330203fe87 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 30 Jul 2015 15:49:04 +0200
Subject: [PATCH 2750/2920] UserGroupBackendPage: Ensure that all required
 fields exist

refs #9609
---
 .../UserGroup/DbUserGroupBackendForm.php      | 35 +++++++++++++++++++
 .../UserGroup/LdapUserGroupBackendForm.php    | 35 +++++++++++++++++++
 .../Config/UserGroup/UserGroupBackendForm.php | 35 -------------------
 .../forms/UserGroupBackendPage.php            |  1 +
 4 files changed, 71 insertions(+), 35 deletions(-)

diff --git a/application/forms/Config/UserGroup/DbUserGroupBackendForm.php b/application/forms/Config/UserGroup/DbUserGroupBackendForm.php
index 9f1915968..9d7545fe7 100644
--- a/application/forms/Config/UserGroup/DbUserGroupBackendForm.php
+++ b/application/forms/Config/UserGroup/DbUserGroupBackendForm.php
@@ -26,6 +26,32 @@ class DbUserGroupBackendForm extends Form
      */
     public function createElements(array $formData)
     {
+        $this->addElement(
+            'text',
+            'name',
+            array(
+                'required'      => true,
+                'label'         => $this->translate('Backend Name'),
+                'description'   => $this->translate(
+                    'The name of this user group backend that is used to differentiate it from others'
+                ),
+                'validators'    => array(
+                    array(
+                        'Regex',
+                        false,
+                        array(
+                            'pattern'  => '/^[^\\[\\]:]+$/',
+                            'messages' => array(
+                                'regexNotMatch' => $this->translate(
+                                    'The name cannot contain \'[\', \']\' or \':\'.'
+                                )
+                            )
+                        )
+                    )
+                )
+            )
+        );
+
         $resourceNames = $this->getDatabaseResourceNames();
         $this->addElement(
             'select',
@@ -37,6 +63,15 @@ class DbUserGroupBackendForm extends Form
                 'multiOptions'  => empty($resourceNames) ? array() : array_combine($resourceNames, $resourceNames)
             )
         );
+
+        $this->addElement(
+            'hidden',
+            'backend',
+            array(
+                'disabled'  => true, // Prevents the element from being submitted, see #7717
+                'value'     => 'db'
+            )
+        );
     }
 
     /**
diff --git a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
index 68b4de702..a426393c6 100644
--- a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
+++ b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
@@ -31,6 +31,32 @@ class LdapUserGroupBackendForm extends Form
      */
     public function createElements(array $formData)
     {
+        $this->addElement(
+            'text',
+            'name',
+            array(
+                'required'      => true,
+                'label'         => $this->translate('Backend Name'),
+                'description'   => $this->translate(
+                    'The name of this user group backend that is used to differentiate it from others'
+                ),
+                'validators'    => array(
+                    array(
+                        'Regex',
+                        false,
+                        array(
+                            'pattern'  => '/^[^\\[\\]:]+$/',
+                            'messages' => array(
+                                'regexNotMatch' => $this->translate(
+                                    'The name cannot contain \'[\', \']\' or \':\'.'
+                                )
+                            )
+                        )
+                    )
+                )
+            )
+        );
+
         $resourceNames = $this->getLdapResourceNames();
         $this->addElement(
             'select',
@@ -89,6 +115,15 @@ class LdapUserGroupBackendForm extends Form
 
         $this->createGroupConfigElements($defaults, $groupConfigDisabled);
         $this->createUserConfigElements($defaults, $userConfigDisabled, $dnDisabled);
+
+        $this->addElement(
+            'hidden',
+            'backend',
+            array(
+                'disabled'  => true, // Prevents the element from being submitted, see #7717
+                'value'     => $formData['type']
+            )
+        );
     }
 
     /**
diff --git a/application/forms/Config/UserGroup/UserGroupBackendForm.php b/application/forms/Config/UserGroup/UserGroupBackendForm.php
index d47e1f4fa..7f57408c7 100644
--- a/application/forms/Config/UserGroup/UserGroupBackendForm.php
+++ b/application/forms/Config/UserGroup/UserGroupBackendForm.php
@@ -158,32 +158,6 @@ class UserGroupBackendForm extends ConfigForm
      */
     public function createElements(array $formData)
     {
-        $this->addElement(
-            'text',
-            'name',
-            array(
-                'required'      => true,
-                'label'         => $this->translate('Backend Name'),
-                'description'   => $this->translate(
-                    'The name of this user group backend that is used to differentiate it from others'
-                ),
-                'validators'    => array(
-                    array(
-                        'Regex',
-                        false,
-                        array(
-                            'pattern'  => '/^[^\\[\\]:]+$/',
-                            'messages' => array(
-                                'regexNotMatch' => $this->translate(
-                                    'The name cannot contain \'[\', \']\' or \':\'.'
-                                )
-                            )
-                        )
-                    )
-                )
-            )
-        );
-
         // TODO(jom): We did not think about how to configure custom group backends yet!
         $backendTypes = array(
             'db'        => $this->translate('Database'),
@@ -196,15 +170,6 @@ class UserGroupBackendForm extends ConfigForm
             $backendType = key($backendTypes);
         }
 
-        $this->addElement(
-            'hidden',
-            'backend',
-            array(
-                'disabled'  => true, // Prevents the element from being submitted, see #7717
-                'value'     => $backendType
-            )
-        );
-
         $this->addElement(
             'select',
             'type',
diff --git a/modules/setup/application/forms/UserGroupBackendPage.php b/modules/setup/application/forms/UserGroupBackendPage.php
index 6c986bf0a..fbc2d44f0 100644
--- a/modules/setup/application/forms/UserGroupBackendPage.php
+++ b/modules/setup/application/forms/UserGroupBackendPage.php
@@ -110,6 +110,7 @@ class UserGroupBackendPage extends Form
         $backendForm->create($formData);
         $userBackendOptions = $backendForm->getElement('user_backend')->getMultiOptions();
         unset($userBackendOptions['none']);
+        $backendForm->getElement('name')->setValue('icingaweb2');
         $backendForm->getElement('user_backend')->setMultiOptions($userBackendOptions);
         $this->addSubForm($backendForm, 'backend_form');
     }

From 16a964cb209fc377888d84c89b02fc8ee4868610 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 30 Jul 2015 15:51:07 +0200
Subject: [PATCH 2751/2920] UserGroupStep: Do not produce invalid HTML

refs #9609
---
 modules/setup/library/Setup/Steps/UserGroupStep.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/library/Setup/Steps/UserGroupStep.php b/modules/setup/library/Setup/Steps/UserGroupStep.php
index f60b4b4a2..ab58c1880 100644
--- a/modules/setup/library/Setup/Steps/UserGroupStep.php
+++ b/modules/setup/library/Setup/Steps/UserGroupStep.php
@@ -147,7 +147,7 @@ class UserGroupStep extends Step
             . '</tr>'
             . '<tr>'
             . '<td><strong>' . mt('setup', 'Custom Filter') . '</strong></td>'
-            . '<td>' . trim($this->data['groupConfig']['group_filter']) ?: t('None', 'auth.ldap.filter') . '</td>'
+            . '<td>' . (trim($this->data['groupConfig']['group_filter']) ?: t('None', 'auth.ldap.filter')) . '</td>'
             . '</tr>'
             . '<tr>'
             . '<td><strong>' . mt('setup', 'Group Name Attribute') . '</strong></td>'

From 7160eb600a8619930c04df56702ed6658712e248 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 15:51:41 +0200
Subject: [PATCH 2752/2920] translation: Load msgmerge path from config or
 default to /usr/bin/env msgmerge

refs #9615
---
 .../library/Translation/Util/GettextTranslationHelper.php  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/translation/library/Translation/Util/GettextTranslationHelper.php b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
index 53f9aff17..d4742e7d0 100644
--- a/modules/translation/library/Translation/Util/GettextTranslationHelper.php
+++ b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
@@ -242,7 +242,12 @@ class GettextTranslationHelper
     private function updateTranslationTable()
     {
         if (is_file($this->tablePath)) {
-            shell_exec(sprintf('/usr/bin/msgmerge --update %s %s 2>&1', $this->tablePath, $this->templatePath));
+            shell_exec(sprintf(
+                '%s --update %s %s 2>&1',
+                $this->getConfig()->get('translation', 'msgmerge', '/usr/bin/env php'),
+                $this->tablePath,
+                $this->templatePath
+            ));
         } else {
             if ((!is_dir(dirname($this->tablePath)) && !@mkdir(dirname($this->tablePath), 0755, true)) ||
                 !rename($this->templatePath, $this->tablePath)) {

From c9c97f3c61d9175c1008ce9b2c54d35f9df9f21b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 15:53:13 +0200
Subject: [PATCH 2753/2920] translation: Load xgettext path from config or
 default to /usr/bin/env xgettext

refs #9615
---
 .../library/Translation/Util/GettextTranslationHelper.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/translation/library/Translation/Util/GettextTranslationHelper.php b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
index d4742e7d0..5e8c8d82c 100644
--- a/modules/translation/library/Translation/Util/GettextTranslationHelper.php
+++ b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
@@ -269,7 +269,7 @@ class GettextTranslationHelper
             implode(
                 ' ',
                 array(
-                    '/usr/bin/xgettext',
+                    $this->getConfig()->get('translation', 'xgettext', '/usr/bin/env xgettext'),
                     '--language=PHP',
                     '--keyword=translate',
                     '--keyword=translate:1,2c',

From d4c7261562c3afeb922c02897423212b38b8f03e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 15:53:39 +0200
Subject: [PATCH 2754/2920] translation: Fix msgmerge default

refs #9615
---
 .../library/Translation/Util/GettextTranslationHelper.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/translation/library/Translation/Util/GettextTranslationHelper.php b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
index 5e8c8d82c..0993803bc 100644
--- a/modules/translation/library/Translation/Util/GettextTranslationHelper.php
+++ b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
@@ -244,7 +244,7 @@ class GettextTranslationHelper
         if (is_file($this->tablePath)) {
             shell_exec(sprintf(
                 '%s --update %s %s 2>&1',
-                $this->getConfig()->get('translation', 'msgmerge', '/usr/bin/env php'),
+                $this->getConfig()->get('translation', 'msgmerge', '/usr/bin/env msgmerge'),
                 $this->tablePath,
                 $this->templatePath
             ));

From 8d137aa5752cb478a13c17d69d0272c61af3ab06 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 15:55:05 +0200
Subject: [PATCH 2755/2920] translation: Load msgfmt path from config or
 default to /usr/bin/env msgfmt

refs #9615
---
 .../library/Translation/Util/GettextTranslationHelper.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/translation/library/Translation/Util/GettextTranslationHelper.php b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
index 0993803bc..c36d54aa2 100644
--- a/modules/translation/library/Translation/Util/GettextTranslationHelper.php
+++ b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
@@ -450,7 +450,7 @@ class GettextTranslationHelper
             implode(
                 ' ',
                 array(
-                    '/usr/bin/msgfmt',
+                    $this->getConfig()->get('translation', 'msgfmt', '/usr/bin/env msgfmt'),
                     '-o ' . $targetPath,
                     $this->tablePath
                 )

From a8415caf24e741b2ba2777237b6a54a366d52588 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 30 Jul 2015 15:57:06 +0200
Subject: [PATCH 2756/2920] AuthenticationPage: Show the external-auth note as
 info form-notification

---
 .../setup/application/forms/AuthenticationPage.php  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
index 4f455de1e..370e4bb95 100644
--- a/modules/setup/application/forms/AuthenticationPage.php
+++ b/modules/setup/application/forms/AuthenticationPage.php
@@ -31,11 +31,14 @@ class AuthenticationPage extends Form
     public function createElements(array $formData)
     {
         if (isset($formData['type']) && $formData['type'] === 'external' && !isset($_SERVER['REMOTE_USER'])) {
-            $this->addDescription($this->translate(
-                'You\'re currently not authenticated using any of the web server\'s authentication '
-                . 'mechanisms. Make sure you\'ll configure such, otherwise you\'ll not be able to '
-                . 'log into Icinga Web 2.'
-            ));
+            $this->info(
+                $this->translate(
+                    'You\'re currently not authenticated using any of the web server\'s authentication '
+                    . 'mechanisms. Make sure you\'ll configure such, otherwise you\'ll not be able to '
+                    . 'log into Icinga Web 2.'
+                ),
+                false
+            );
         }
 
         $backendTypes = array();

From b9f16b844b8eb5bf293bdea870abad3a5e2e9b11 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 15:57:21 +0200
Subject: [PATCH 2757/2920] translation: Add config file for packages

refs #9615
---
 packages/files/config/modules/translation/config.ini | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/files/config/modules/translation/config.ini

diff --git a/packages/files/config/modules/translation/config.ini b/packages/files/config/modules/translation/config.ini
new file mode 100644
index 000000000..5bdf37b0c
--- /dev/null
+++ b/packages/files/config/modules/translation/config.ini
@@ -0,0 +1,4 @@
+[translation]
+msgmerge = /usr/bin/msgmerge
+xgettext = /usr/bin/xgettext
+msgfmt = /usr/bin/msgfmt

From c57bc30e675a697a2fb0ad295e3236b252086c35 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 30 Jul 2015 16:00:04 +0200
Subject: [PATCH 2758/2920] AuthBackendPage: Don't crash while validating an
 external backend's config

---
 modules/setup/application/forms/AuthBackendPage.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index 01cd7176d..24ca72b8d 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -171,7 +171,10 @@ class AuthBackendPage extends Form
     {
         if (isset($formData['backend_validation']) && parent::isValid($formData)) {
             $self = clone $this;
-            $self->getSubForm('backend_form')->getElement('resource')->setIgnore(false);
+            if (($resourceElement = $self->getSubForm('backend_form')->getElement('resource')) !== null) {
+                $resourceElement->setIgnore(false);
+            }
+
             $inspection = UserBackendConfigForm::inspectUserBackend($self);
             if ($inspection !== null) {
                 $join = function ($e) use (& $join) {

From cc0dfedb3160f33e03e18b2e4580817c1e0ea62d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 30 Jul 2015 16:32:00 +0200
Subject: [PATCH 2759/2920] RPM: Install translation config

refs #9615
---
 icingaweb2.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index e3513e979..3ea135589 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -172,7 +172,7 @@ Icinga Web 2 vendor library Parsedown
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/{%{basedir}/{modules,library/vendor,public},%{bindir},%{configdir}/modules/setup,%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d,%{docsdir}}
+mkdir -p %{buildroot}/{%{basedir}/{modules,library/vendor,public},%{bindir},%{configdir}/modules,%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d,%{docsdir}}
 cp -prv application doc %{buildroot}/%{basedir}
 cp -pv etc/bash_completion.d/icingacli %{buildroot}/%{_sysconfdir}/bash_completion.d/icingacli
 cp -prv modules/{monitoring,setup,doc,translation} %{buildroot}/%{basedir}/modules
@@ -183,7 +183,7 @@ cp -pv packages/files/apache/icingaweb2.conf %{buildroot}/%{wwwconfigdir}/icinga
 cp -pv packages/files/bin/icingacli %{buildroot}/%{bindir}
 cp -pv packages/files/public/index.php %{buildroot}/%{basedir}/public
 cp -prv etc/schema %{buildroot}/%{docsdir}
-cp -prv packages/files/config/modules/setup %{buildroot}/%{configdir}/modules/
+cp -prv packages/files/config/modules/{setup,translation} %{buildroot}/%{configdir}/modules
 
 %pre
 getent group icingacmd >/dev/null || groupadd -r icingacmd
@@ -212,6 +212,8 @@ rm -rf %{buildroot}
 %attr(2775,root,%{icingawebgroup}) %dir %{logdir}
 %attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules/setup
 %attr(0660,root,%{icingawebgroup}) %config(noreplace) %{configdir}/modules/setup/config.ini
+%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules/translation
+%attr(0660,root,%{icingawebgroup}) %config(noreplace) %{configdir}/modules/translation/config.ini
 %{docsdir}
 %docdir %{docsdir}
 

From 9b051cd7ce47e151a6b473c06011d9865e1e81f6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 31 Jul 2015 08:29:59 +0200
Subject: [PATCH 2760/2920] reorder-authbackend.phtml: Fix hover styles of
 icon-only buttons

---
 .../scripts/form/reorder-authbackend.phtml    |  4 ++--
 public/css/icinga/forms.less                  | 21 ++++++++-----------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/application/views/scripts/form/reorder-authbackend.phtml b/application/views/scripts/form/reorder-authbackend.phtml
index 2e6619551..3ced989e2 100644
--- a/application/views/scripts/form/reorder-authbackend.phtml
+++ b/application/views/scripts/form/reorder-authbackend.phtml
@@ -34,7 +34,7 @@
         </td>
         <td data-base-target="_self">
 <?php if ($i > 0): ?>
-          <button type="submit" name="backend_newpos" class="icon-only" value="<?= sprintf(
+          <button type="submit" name="backend_newpos" class="link-like icon-only" value="<?= sprintf(
             '%s|%s',
             $backendNames[$i],
             $i - 1
@@ -48,7 +48,7 @@
           </button>
 <?php endif; ?>
 <?php if ($i + 1 < count($backendNames)): ?>
-          <button type="submit" name="backend_newpos" class="icon-only" value="<?= sprintf(
+          <button type="submit" name="backend_newpos" class="link-like icon-only" value="<?= sprintf(
             '%s|%s',
             $backendNames[$i],
             $i + 1
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 467fea827..82a5f5184 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -131,18 +131,6 @@ button, .button-like {
       background-color: #666;
     }
   }
-
-  &.icon-only {
-    font-size: 1.5em;
-    padding: 0;
-    border: none;
-    color: inherit;
-    background-color: transparent;
-
-    &:hover, &:focus, &:active {
-      color: #666;
-    }
-  }
 }
 
 .button-like {
@@ -162,6 +150,15 @@ form.link-like input[type="submit"], form.link-like button[type="submit"], input
   padding: 0;
   font-size: 1em;
   cursor: pointer;
+
+  &.icon-only {
+    color: inherit;
+    font-size: 1.5em;
+
+    &:hover, &:focus, &:active {
+      color: #666;
+    }
+  }
 }
 
 form.link-like input[type="submit"]:hover,

From c32b7497014cd6cb21d240d43957a3b5159bc7a4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 31 Jul 2015 11:03:12 +0200
Subject: [PATCH 2761/2920] DatabaseStep: Fix schema checks

The step to setup the database considered any table of foreign schemas
as one of our own schema, causing it to never create our schema for
non-empty databases.

fixes #9799
---
 modules/setup/library/Setup/Steps/DatabaseStep.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/setup/library/Setup/Steps/DatabaseStep.php b/modules/setup/library/Setup/Steps/DatabaseStep.php
index 4e8b91fb8..41b3ebb41 100644
--- a/modules/setup/library/Setup/Steps/DatabaseStep.php
+++ b/modules/setup/library/Setup/Steps/DatabaseStep.php
@@ -65,7 +65,7 @@ class DatabaseStep extends Step
             $db->reconnect($this->data['resourceConfig']['dbname']);
         }
 
-        if (array_search(key($this->data['tables']), $db->listTables()) !== false) {
+        if (array_search(reset($this->data['tables']), $db->listTables()) !== false) {
             $this->log(mt('setup', 'Database schema already exists...'));
         } else {
             $this->log(mt('setup', 'Creating database schema...'));
@@ -116,7 +116,7 @@ class DatabaseStep extends Step
             $db->reconnect($this->data['resourceConfig']['dbname']);
         }
 
-        if (array_search(key($this->data['tables']), $db->listTables()) !== false) {
+        if (array_search(reset($this->data['tables']), $db->listTables()) !== false) {
             $this->log(mt('setup', 'Database schema already exists...'));
         } else {
             $this->log(mt('setup', 'Creating database schema...'));
@@ -163,7 +163,7 @@ class DatabaseStep extends Step
 
         try {
             $db->connectToDb();
-            if (array_search(key($this->data['tables']), $db->listTables()) === false) {
+            if (array_search(reset($this->data['tables']), $db->listTables()) === false) {
                 if ($resourceConfig['username'] !== $this->data['resourceConfig']['username']) {
                     $message = sprintf(
                         mt(

From b8293b1fddad92c07e10e1a4661d8087fdc842c9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 31 Jul 2015 11:04:00 +0200
Subject: [PATCH 2762/2920] WebWizard: Be less error-prone while calling
 array_search

---
 modules/setup/library/Setup/WebWizard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 00956d108..ef84e556d 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -284,7 +284,7 @@ class WebWizard extends Wizard implements SetupWizard
 
                 try {
                     $db->connectToDb(); // Are we able to login on the database?
-                    if (array_search(reset($this->databaseTables), $db->listTables()) === false) {
+                    if (array_search(reset($this->databaseTables), $db->listTables(), true) === false) {
                         // In case the database schema does not yet exist the
                         // user needs the privileges to setup the database
                         $skip = $db->checkPrivileges($this->databaseSetupPrivileges, $this->databaseTables);

From 7305edc74c9b74d8b2c86a5fdf8f96eba917dbb6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 31 Jul 2015 11:04:17 +0200
Subject: [PATCH 2763/2920] DbTool: Be less error-prone while calling
 array_search

---
 modules/setup/library/Setup/Utils/DbTool.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index 48922440e..bf3465458 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -816,7 +816,7 @@ EOD;
             // as the chances are very high that the database is created later causing the current user being
             // the owner with ALL privileges. (Which in turn can be granted to others.)
 
-            if (array_search('CREATE', $privileges) !== false) {
+            if (array_search('CREATE', $privileges, true) !== false) {
                 $query = $this->query(
                     'select rolcreatedb from pg_roles where rolname = :user',
                     array(':user' => $username !== null ? $username : $this->config['username'])
@@ -825,7 +825,7 @@ EOD;
             }
         }
 
-        if (array_search('CREATEROLE', $privileges) !== false) {
+        if (array_search('CREATEROLE', $privileges, true) !== false) {
             $query = $this->query(
                 'select rolcreaterole from pg_roles where rolname = :user',
                 array(':user' => $username !== null ? $username : $this->config['username'])
@@ -833,7 +833,7 @@ EOD;
             $privilegesGranted &= $query->fetchColumn() !== false;
         }
 
-        if (array_search('SUPER', $privileges) !== false) {
+        if (array_search('SUPER', $privileges, true) !== false) {
             $query = $this->query(
                 'select rolsuper from pg_roles where rolname = :user',
                 array(':user' => $username !== null ? $username : $this->config['username'])

From 073c61903a28f69c88f6f87850a266dda7ba483a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 31 Jul 2015 11:04:26 +0200
Subject: [PATCH 2764/2920] DatabaseStep: Be less error-prone while calling
 array_search

---
 modules/setup/library/Setup/Steps/DatabaseStep.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/setup/library/Setup/Steps/DatabaseStep.php b/modules/setup/library/Setup/Steps/DatabaseStep.php
index 41b3ebb41..9392fb294 100644
--- a/modules/setup/library/Setup/Steps/DatabaseStep.php
+++ b/modules/setup/library/Setup/Steps/DatabaseStep.php
@@ -65,7 +65,7 @@ class DatabaseStep extends Step
             $db->reconnect($this->data['resourceConfig']['dbname']);
         }
 
-        if (array_search(reset($this->data['tables']), $db->listTables()) !== false) {
+        if (array_search(reset($this->data['tables']), $db->listTables(), true) !== false) {
             $this->log(mt('setup', 'Database schema already exists...'));
         } else {
             $this->log(mt('setup', 'Creating database schema...'));
@@ -116,7 +116,7 @@ class DatabaseStep extends Step
             $db->reconnect($this->data['resourceConfig']['dbname']);
         }
 
-        if (array_search(reset($this->data['tables']), $db->listTables()) !== false) {
+        if (array_search(reset($this->data['tables']), $db->listTables(), true) !== false) {
             $this->log(mt('setup', 'Database schema already exists...'));
         } else {
             $this->log(mt('setup', 'Creating database schema...'));
@@ -163,7 +163,7 @@ class DatabaseStep extends Step
 
         try {
             $db->connectToDb();
-            if (array_search(reset($this->data['tables']), $db->listTables()) === false) {
+            if (array_search(reset($this->data['tables']), $db->listTables(), true) === false) {
                 if ($resourceConfig['username'] !== $this->data['resourceConfig']['username']) {
                     $message = sprintf(
                         mt(

From 24cb123f47c3f92e4c110d83ea059b91851be590 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 31 Jul 2015 11:04:36 +0200
Subject: [PATCH 2765/2920] Tabs: Be less error-prone while calling
 array_search

---
 library/Icinga/Web/Widget/Tabs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index 95dfdb389..f82754898 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -242,7 +242,7 @@ EOT;
     {
         if ($this->has($name)) {
             unset($this->tabs[$name]);
-            if (($dropdownIndex = array_search($name, $this->dropdownTabs)) !== false) {
+            if (($dropdownIndex = array_search($name, $this->dropdownTabs, true)) !== false) {
                 array_splice($this->dropdownTabs, $dropdownIndex, 2);
             }
         }

From 449a19c3a30911b30486f4b885456f8abb0d0f63 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 31 Jul 2015 11:04:43 +0200
Subject: [PATCH 2766/2920] Session: Be less error-prone while calling
 array_search

---
 library/Icinga/Web/Session/Session.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Session/Session.php b/library/Icinga/Web/Session/Session.php
index 266a06d84..48c065743 100644
--- a/library/Icinga/Web/Session/Session.php
+++ b/library/Icinga/Web/Session/Session.php
@@ -70,8 +70,8 @@ abstract class Session extends SessionNamespace
     public function getNamespace($identifier)
     {
         if (!isset($this->namespaces[$identifier])) {
-            if (in_array($identifier, $this->removedNamespaces)) {
-                unset($this->removedNamespaces[array_search($identifier, $this->removedNamespaces)]);
+            if (in_array($identifier, $this->removedNamespaces, true)) {
+                unset($this->removedNamespaces[array_search($identifier, $this->removedNamespaces, true)]);
             }
 
             $this->namespaces[$identifier] = new SessionNamespace();

From 53458317429616491ea91916f8af87f723d88a83 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 31 Jul 2015 11:04:51 +0200
Subject: [PATCH 2767/2920] SessionNamespace: Be less error-prone while calling
 array_search

---
 library/Icinga/Web/Session/SessionNamespace.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Web/Session/SessionNamespace.php b/library/Icinga/Web/Session/SessionNamespace.php
index 281d09bea..bda22fd80 100644
--- a/library/Icinga/Web/Session/SessionNamespace.php
+++ b/library/Icinga/Web/Session/SessionNamespace.php
@@ -101,8 +101,8 @@ class SessionNamespace implements IteratorAggregate
     {
         $this->values[$key] = $value;
 
-        if (in_array($key, $this->removed)) {
-            unset($this->removed[array_search($key, $this->removed)]);
+        if (in_array($key, $this->removed, true)) {
+            unset($this->removed[array_search($key, $this->removed, true)]);
         }
 
         return $this;
@@ -112,8 +112,8 @@ class SessionNamespace implements IteratorAggregate
     {
         $this->values[$key] = & $value;
 
-        if (in_array($key, $this->removed)) {
-            unset($this->removed[array_search($key, $this->removed)]);
+        if (in_array($key, $this->removed, true)) {
+            unset($this->removed[array_search($key, $this->removed, true)]);
         }
 
         return $this;

From 6c105b867e66112d0c317cb2ecfa2457eab4bda1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 31 Jul 2015 11:05:09 +0200
Subject: [PATCH 2768/2920] Form: Be less error-prone while calling
 array_search

---
 library/Icinga/Web/Form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 7bb0e7a48..2730f6998 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -840,7 +840,7 @@ class Form extends Zend_Form
             }
 
             $decorators = $el->getDecorators();
-            $pos = array_search('Zend_Form_Decorator_ViewHelper', array_keys($decorators)) + 1;
+            $pos = array_search('Zend_Form_Decorator_ViewHelper', array_keys($decorators), true) + 1;
             $el->setDecorators(
                 array_slice($decorators, 0, $pos, true)
                 + array('autosubmit' => $autosubmitDecorator)

From 16e54d3987c8c85c8e460763bf6c921e9281a00c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 31 Jul 2015 11:05:23 +0200
Subject: [PATCH 2769/2920] DbQuery: Be less error-prone while calling
 array_search

---
 library/Icinga/Data/Db/DbQuery.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index f269cd138..aa8acf601 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -150,7 +150,7 @@ class DbQuery extends SimpleQuery
             && $this->getDatasource()->getDbType() === 'pgsql'
             && $select->getPart(Zend_Db_Select::DISTINCT) === true) {
             foreach ($this->getOrder() as $fieldAndDirection) {
-                if (array_search($fieldAndDirection[0], $this->columns) === false) {
+                if (array_search($fieldAndDirection[0], $this->columns, true) === false) {
                     $this->columns[] = $fieldAndDirection[0];
                 }
             }

From c5b5d3c9c383637eefbe3c4ac90bd8f9d8990568 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 31 Jul 2015 11:06:01 +0200
Subject: [PATCH 2770/2920] SetupException: Provide a default exception message

---
 modules/setup/library/Setup/Exception/SetupException.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/setup/library/Setup/Exception/SetupException.php b/modules/setup/library/Setup/Exception/SetupException.php
index b8c860f39..49d0a6f9c 100644
--- a/modules/setup/library/Setup/Exception/SetupException.php
+++ b/modules/setup/library/Setup/Exception/SetupException.php
@@ -12,4 +12,11 @@ use Icinga\Exception\IcingaException;
  */
 class SetupException extends IcingaException
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct()
+    {
+        parent::__construct('Setup abortion');
+    }
 }

From 834017f6e539fd09a153a0a5c2cf1b7cea3862b1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 31 Jul 2015 11:30:26 +0200
Subject: [PATCH 2771/2920] translation: Always use the correct path to the
 Icinga library in the translation helper

refs #9615
---
 .../Translation/Util/GettextTranslationHelper.php      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/translation/library/Translation/Util/GettextTranslationHelper.php b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
index c36d54aa2..c3a6d206e 100644
--- a/modules/translation/library/Translation/Util/GettextTranslationHelper.php
+++ b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
@@ -79,6 +79,13 @@ class GettextTranslationHelper
      */
     private $moduleDir;
 
+    /**
+     * Path to the Icinga library
+     *
+     * @var string
+     */
+    protected $libDir;
+
     /**
      * The path to the file catalog
      *
@@ -110,6 +117,7 @@ class GettextTranslationHelper
     {
         $this->moduleMgr = $bootstrap->getModuleManager()->loadEnabledModules();
         $this->appDir = $bootstrap->getApplicationDir();
+        $this->libDir = $bootstrap->getLibraryDir('Icinga');
         $this->locale = $locale;
     }
 
@@ -396,7 +404,7 @@ class GettextTranslationHelper
                 $this->getSourceFileNames($this->moduleDir, $catalog);
             } else {
                 $this->getSourceFileNames($this->appDir, $catalog);
-                $this->getSourceFileNames(realpath($this->appDir . '/../library/Icinga'), $catalog);
+                $this->getSourceFileNames($this->libDir, $catalog);
             }
         } catch (Exception $error) {
             throw $error;

From fe41d312ca77c1b17aac8902d16ae42c8aa57cc5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 31 Jul 2015 13:12:41 +0200
Subject: [PATCH 2772/2920] RepositoryQuery: Do not bypass the query's own
 iterator

refs #9661
---
 library/Icinga/Repository/RepositoryQuery.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index 8b5727164..aca7c1776 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -5,6 +5,7 @@ namespace Icinga\Repository;
 
 use Iterator;
 use IteratorAggregate;
+use Traversable;
 use Icinga\Application\Benchmark;
 use Icinga\Application\Logger;
 use Icinga\Data\QueryInterface;
@@ -581,7 +582,12 @@ class RepositoryQuery implements QueryInterface, SortRules, Iterator
                 $this->order();
             }
 
-            $iterator = $this->repository->getDataSource()->query($this->query);
+            if ($this->query instanceof Traversable) {
+                $iterator = $this->query;
+            } else {
+                $iterator = $this->repository->getDataSource()->query($this->query);
+            }
+
             if ($iterator instanceof IteratorAggregate) {
                 $this->iterator = $iterator->getIterator();
             } else {

From 99c69cc461663156369ee6e3bf643529c1f94c98 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 31 Jul 2015 13:51:39 +0200
Subject: [PATCH 2773/2920] SimpleQuery: Add support for peek aheads

refs #9661
---
 library/Icinga/Data/SimpleQuery.php           | 90 ++++++++++++++++++-
 library/Icinga/Repository/RepositoryQuery.php | 23 +++++
 .../library/Monitoring/DataView/DataView.php  | 23 +++++
 3 files changed, 134 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index bbc23a15f..ae6506e27 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -10,6 +10,7 @@ use Icinga\Application\Icinga;
 use Icinga\Application\Benchmark;
 use Icinga\Data\Filter\Filter;
 use Icinga\Exception\IcingaException;
+use Icinga\Exception\ProgrammingError;
 use Icinga\Web\Paginator\Adapter\QueryAdapter;
 
 class SimpleQuery implements QueryInterface, Queryable, Iterator
@@ -28,6 +29,13 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
      */
     protected $iterator;
 
+    /**
+     * The current position of this query's iterator
+     *
+     * @var int
+     */
+    protected $iteratorPosition;
+
     /**
      * The target you are going to query
      *
@@ -83,6 +91,20 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
      */
     protected $limitOffset;
 
+    /**
+     * Whether to peek ahead for more results
+     *
+     * @var bool
+     */
+    protected $peekAhead;
+
+    /**
+     * Whether the query did not yield all available results
+     *
+     * @var bool
+     */
+    protected $hasMore;
+
     protected $filter;
 
     /**
@@ -136,6 +158,7 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
         }
 
         $this->iterator->rewind();
+        $this->iteratorPosition = 0;
         Benchmark::measure('Query result iteration started');
     }
 
@@ -156,7 +179,15 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
      */
     public function valid()
     {
-        if (! $this->iterator->valid()) {
+        $valid = $this->iterator->valid();
+        if ($valid && $this->peekAhead && $this->hasLimit() && $this->iteratorPosition + 1 === $this->getLimit()) {
+            $this->hasMore = true;
+            $valid = false; // We arrived at the last result, which is the requested extra row, so stop the iteration
+        } elseif (! $valid) {
+            $this->hasMore = false;
+        }
+
+        if (! $valid) {
             Benchmark::measure('Query result iteration finished');
             return false;
         }
@@ -180,6 +211,7 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
     public function next()
     {
         $this->iterator->next();
+        $this->iteratorPosition += 1;
     }
 
     /**
@@ -358,6 +390,36 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
         return $this->order;
     }
 
+    /**
+     * Set whether this query should peek ahead for more results
+     *
+     * Enabling this causes the current query limit to be increased by one. The potential extra row being yielded will
+     * be removed from the result set. Note that this only applies when fetching multiple results of limited queries.
+     *
+     * @return  $this
+     */
+    public function peekAhead($state = true)
+    {
+        $this->peekAhead = (bool) $state;
+        return $this;
+    }
+
+    /**
+     * Return whether this query did not yield all available results
+     *
+     * @return  bool
+     *
+     * @throws  ProgrammingError    In case the query did not run yet
+     */
+    public function hasMore()
+    {
+        if ($this->hasMore === null) {
+            throw new ProgrammingError('Query did not run. Cannot determine whether there are more results.');
+        }
+
+        return $this->hasMore;
+    }
+
     /**
      * Set a limit count and offset to the query
      *
@@ -390,7 +452,7 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
      */
     public function getLimit()
     {
-        return $this->limitCount;
+        return $this->peekAhead && $this->hasLimit() ? $this->limitCount + 1 : $this->limitCount;
     }
 
     /**
@@ -460,6 +522,14 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
         Benchmark::measure('Fetching all results started');
         $results = $this->ds->fetchAll($this);
         Benchmark::measure('Fetching all results finished');
+
+        if ($this->peekAhead && $this->hasLimit() && count($results) === $this->getLimit()) {
+            $this->hasMore = true;
+            array_pop($results);
+        } else {
+            $this->hasMore = false;
+        }
+
         return $results;
     }
 
@@ -486,6 +556,14 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
         Benchmark::measure('Fetching one column started');
         $values = $this->ds->fetchColumn($this);
         Benchmark::measure('Fetching one column finished');
+
+        if ($this->peekAhead && $this->hasLimit() && count($values) === $this->getLimit()) {
+            $this->hasMore = true;
+            array_pop($values);
+        } else {
+            $this->hasMore = false;
+        }
+
         return $values;
     }
 
@@ -514,6 +592,14 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
         Benchmark::measure('Fetching pairs started');
         $pairs = $this->ds->fetchPairs($this);
         Benchmark::measure('Fetching pairs finished');
+
+        if ($this->peekAhead && $this->hasLimit() && count($pairs) === $this->getLimit()) {
+            $this->hasMore = true;
+            array_pop($pairs);
+        } else {
+            $this->hasMore = false;
+        }
+
         return $pairs;
     }
 
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index aca7c1776..163bb40ff 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -344,6 +344,29 @@ class RepositoryQuery implements QueryInterface, SortRules, Iterator
         return $this->query->getOrder();
     }
 
+    /**
+     * Set whether this query should peek ahead for more results
+     *
+     * Enabling this causes the current query limit to be increased by one. The potential extra row being yielded will
+     * be removed from the result set. Note that this only applies when fetching multiple results of limited queries.
+     *
+     * @return  $this
+     */
+    public function peekAhead($state = true)
+    {
+        return $this->query->peekAhead($state);
+    }
+
+    /**
+     * Return whether this query did not yield all available results
+     *
+     * @return  bool
+     */
+    public function hasMore()
+    {
+        return $this->query->hasMore();
+    }
+
     /**
      * Limit this query's results
      *
diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 6a2b8a226..49f14a2e9 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -410,6 +410,29 @@ abstract class DataView implements QueryInterface, SortRules, IteratorAggregate
         return $this->query->count();
     }
 
+    /**
+     * Set whether the query should peek ahead for more results
+     *
+     * Enabling this causes the current query limit to be increased by one. The potential extra row being yielded will
+     * be removed from the result set. Note that this only applies when fetching multiple results of limited queries.
+     *
+     * @return  $this
+     */
+    public function peekAhead($state = true)
+    {
+        return $this->query->peekAhead($state);
+    }
+
+    /**
+     * Return whether the query did not yield all available results
+     *
+     * @return  bool
+     */
+    public function hasMore()
+    {
+        return $this->query->hasMore();
+    }
+
     /**
      * Set a limit count and offset
      *

From 5a3401cc28c579214fcfa0a9e4ac90827f26a6c9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 31 Jul 2015 15:15:13 +0200
Subject: [PATCH 2774/2920] monitoring: Reduce amount of default quick search
 columns

Entering an arbitrary pattern in the quick search field will now only search
for a host's and service's display name or a group's / contact's alias.

fixes #9751
---
 .../monitoring/library/Monitoring/DataView/Comment.php |  2 +-
 .../monitoring/library/Monitoring/DataView/Contact.php | 10 +---------
 .../library/Monitoring/DataView/Contactgroup.php       |  2 +-
 .../library/Monitoring/DataView/Downtime.php           |  2 +-
 .../library/Monitoring/DataView/Eventhistory.php       |  2 +-
 .../library/Monitoring/DataView/Hostgroupsummary.php   |  2 +-
 .../library/Monitoring/DataView/Hoststatus.php         |  2 +-
 .../library/Monitoring/DataView/Notification.php       |  2 +-
 .../Monitoring/DataView/Servicegroupsummary.php        |  2 +-
 .../library/Monitoring/DataView/Servicestatus.php      |  2 +-
 10 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/Comment.php b/modules/monitoring/library/Monitoring/DataView/Comment.php
index 18d518bd3..9b3be8061 100644
--- a/modules/monitoring/library/Monitoring/DataView/Comment.php
+++ b/modules/monitoring/library/Monitoring/DataView/Comment.php
@@ -62,7 +62,7 @@ class Comment extends DataView
      */
     public function getSearchColumns()
     {
-        return array('host', 'host_display_name', 'service', 'service_display_name', 'comment_author');
+        return array('host_display_name', 'service_display_name');
     }
 
     /**
diff --git a/modules/monitoring/library/Monitoring/DataView/Contact.php b/modules/monitoring/library/Monitoring/DataView/Contact.php
index 42c6806ac..d64a80e86 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contact.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contact.php
@@ -79,14 +79,6 @@ class Contact extends DataView
      */
     public function getSearchColumns()
     {
-        return array(
-            'contact',
-            'contact_alias',
-            'contact_email',
-            'host',
-            'host_display_name',
-            'service',
-            'service_display_name'
-        );
+        return array('contact_alias');
     }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
index 4e5684d43..8560b55fb 100644
--- a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php
@@ -84,6 +84,6 @@ class Contactgroup extends DataView
      */
     public function getSearchColumns()
     {
-        return array('contactgroup', 'contactgroup_alias', 'contact', 'contact_alias', 'contact_email');
+        return array('contactgroup_alias');
     }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index c5324a22d..767fc577d 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -69,7 +69,7 @@ class Downtime extends DataView
      */
     public function getSearchColumns()
     {
-        return array('downtime_author', 'host', 'host_display_name', 'service', 'service_display_name');
+        return array('host_display_name', 'service_display_name');
     }
 
     /**
diff --git a/modules/monitoring/library/Monitoring/DataView/Eventhistory.php b/modules/monitoring/library/Monitoring/DataView/Eventhistory.php
index ad6c384cb..a99790a38 100644
--- a/modules/monitoring/library/Monitoring/DataView/Eventhistory.php
+++ b/modules/monitoring/library/Monitoring/DataView/Eventhistory.php
@@ -72,6 +72,6 @@ class EventHistory extends DataView
      */
     public function getSearchColumns()
     {
-        return array('host', 'host_display_name', 'service', 'service_display_name', 'type');
+        return array('host_display_name', 'service_display_name');
     }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
index 9fd58fc31..7f10d072e 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroupsummary.php
@@ -60,7 +60,7 @@ class Hostgroupsummary extends DataView
      */
     public function getSearchColumns()
     {
-        return array('host', 'host_display_name', 'hostgroup', 'hostgroup_alias');
+        return array('hostgroup_alias');
     }
 
     /**
diff --git a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php
index a9d6be771..9c2848618 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php
@@ -84,7 +84,7 @@ class HostStatus extends DataView
      */
     public function getSearchColumns()
     {
-        return array('host', 'host_display_name');
+        return array('host_display_name');
     }
 
     /**
diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php
index 7f17769b8..5c2500843 100644
--- a/modules/monitoring/library/Monitoring/DataView/Notification.php
+++ b/modules/monitoring/library/Monitoring/DataView/Notification.php
@@ -90,6 +90,6 @@ class Notification extends DataView
      */
     public function getSearchColumns()
     {
-        return array('contact', 'host', 'host_display_name', 'service', 'service_display_name');
+        return array('host_display_name', 'service_display_name');
     }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
index 39fa74932..205aa56de 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicegroupsummary.php
@@ -55,7 +55,7 @@ class Servicegroupsummary extends DataView
      */
     public function getSearchColumns()
     {
-        return array('service', 'service_display_name', 'servicegroup', 'servicegroup_alias');
+        return array('servicegroup_alias');
     }
 
     /**
diff --git a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
index 10d65c48a..a4516a93a 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
@@ -191,6 +191,6 @@ class ServiceStatus extends DataView
      */
     public function getSearchColumns()
     {
-        return array('host', 'host_display_name', 'service', 'service_display_name');
+        return array('host_display_name', 'service_display_name');
     }
 }

From 451be1e97f9bdbe45a153fb3346eccd9a21ff7e8 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 31 Jul 2015 15:31:41 +0200
Subject: [PATCH 2775/2920] monitoring/hooks: Add TicketHook::createLinks()

Instead of calling preg_replace_callback w/o error handling in our view scripts, TicketHook::createLinks() will take care of that.

refs #9611
---
 library/Icinga/Web/Hook/TicketHook.php | 93 +++++++++++++++++++++++++-
 1 file changed, 91 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Hook/TicketHook.php b/library/Icinga/Web/Hook/TicketHook.php
index 1e1171165..265a0641e 100644
--- a/library/Icinga/Web/Hook/TicketHook.php
+++ b/library/Icinga/Web/Hook/TicketHook.php
@@ -3,6 +3,12 @@
 
 namespace Icinga\Web\Hook;
 
+use ErrorException;
+use Exception;
+use Icinga\Application\Icinga;
+use Icinga\Application\Logger;
+use Icinga\Exception\IcingaException;
+
 /**
  * Icinga Web Ticket Hook base class
  *
@@ -15,6 +21,13 @@ namespace Icinga\Web\Hook;
  */
 abstract class TicketHook
 {
+    /**
+     * Last error, if any
+     *
+     * @var string|null
+     */
+    protected $lastError;
+
     /**
      * Constructor must live without arguments right now
      *
@@ -28,15 +41,91 @@ abstract class TicketHook
 
     /**
      * Overwrite this function if you want to do some initialization stuff
-     *
-     * @return void
      */
     protected function init()
     {
     }
 
+    /**
+     * Set the hook as failed w/ the given message
+     *
+     * @param   string  $message    Error message or error format string
+     * @param   mixed   ...$arg     Format string argument
+     */
+    private function fail($message)
+    {
+        $args = array_slice(func_get_args(), 1);
+        $lastError = vsprintf($message, $args);
+        Logger::debug($lastError);
+        $this->lastError = $lastError;
+    }
+
+    /**
+     * Get the last error, if any
+     *
+     * @return string|null
+     */
+    public function getLastError()
+    {
+        return $this->lastError;
+    }
+
+    /**
+     * Get the pattern
+     *
+     * @return string
+     */
     abstract public function getPattern();
 
+    /**
+     * Create a link for each matched element in the subject text
+     *
+     * @param   array $match    Array of matched elements according to {@link getPattern()}
+     *
+     * @return  string          Replacement string
+     */
     abstract public function createLink($match);
 
+    /**
+     * Create links w/ {@link createLink()} in the given text that matches to the subject from {@link getPattern()}
+     *
+     * In case of errors a debug message is recorded to the log and any subsequent call to {@link createLinks()} will
+     * be a no-op.
+     *
+     * @param   string $text
+     *
+     * @return  string
+     */
+    final public function createLinks($text)
+    {
+        if ($this->lastError !== null) {
+            return $text;
+        }
+
+        try {
+            $pattern = $this->getPattern();
+        } catch (Exception $e) {
+            $this->fail('Can\'t create ticket links: Retrieving the pattern failed: %s', IcingaException::describe($e));
+            return $text;
+        }
+        if (empty($pattern)) {
+            $this->fail('Can\'t create ticket links: Pattern is empty');
+            return $text;
+        }
+        try {
+            $text = preg_replace_callback(
+                $pattern,
+                array($this, 'createLink'),
+                $text
+            );
+        } catch (ErrorException $e) {
+            $this->fail('Can\'t create ticket links: Pattern is invalid: %s', IcingaException::describe($e));
+            return $text;
+        } catch (Exception $e) {
+            $this->fail('Can\'t create ticket links: %s', IcingaException::describe($e));
+            return $text;
+        }
+
+        return $text;
+    }
 }

From dafa722cec8055fa83d8edc9ddc6a5b9d62696d1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 31 Jul 2015 15:56:13 +0200
Subject: [PATCH 2776/2920] Hide non-essential form fields when configuring
 LDAP user group backends

resolves #9780
---
 .../UserGroup/LdapUserGroupBackendForm.php    | 29 +++++--------------
 .../forms/UserGroupBackendPage.php            | 25 ++++++++++++----
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
index a426393c6..0e7b63b5b 100644
--- a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
+++ b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
@@ -75,10 +75,12 @@ class LdapUserGroupBackendForm extends Form
                 : $resourceNames[0]
         );
 
-        $userBackends = array('none' => $this->translate('None', 'usergroupbackend.ldap.user_backend'));
         $userBackendNames = $this->getLdapUserBackendNames($resource);
         if (! empty($userBackendNames)) {
-            $userBackends = array_merge($userBackends, array_combine($userBackendNames, $userBackendNames));
+            $userBackends = array_combine($userBackendNames, $userBackendNames);
+            $userBackends['none'] = $this->translate('None', 'usergroupbackend.ldap.user_backend');
+        } else {
+            $userBackends = array('none' => $this->translate('None', 'usergroupbackend.ldap.user_backend'));
         }
         $this->addElement(
             'select',
@@ -101,20 +103,10 @@ class LdapUserGroupBackendForm extends Form
             $groupConfigDisabled = $userConfigDisabled = true;
         }
 
-        $dnDisabled = null; // MUST BE null
-        if (isset($formData['user_backend']) && $formData['user_backend'] !== 'none') {
-            $userBackend = UserBackend::create($formData['user_backend']);
-            $defaults->merge(array(
-                'user_base_dn'          => $userBackend->getBaseDn(),
-                'user_class'            => $userBackend->getUserClass(),
-                'user_name_attribute'   => $userBackend->getUserNameAttribute(),
-                'user_filter'           => $userBackend->getFilter()
-            ));
-            $userConfigDisabled = $dnDisabled = true;
-        }
-
         $this->createGroupConfigElements($defaults, $groupConfigDisabled);
-        $this->createUserConfigElements($defaults, $userConfigDisabled, $dnDisabled);
+        if (count($userBackends) === 1 || (isset($formData['user_backend']) && $formData['user_backend'] === 'none')) {
+            $this->createUserConfigElements($defaults, $userConfigDisabled);
+        }
 
         $this->addElement(
             'hidden',
@@ -212,9 +204,8 @@ class LdapUserGroupBackendForm extends Form
      *
      * @param   ConfigObject    $defaults
      * @param   null|bool       $disabled
-     * @param   null|bool       $dnDisabled
      */
-    protected function createUserConfigElements(ConfigObject $defaults, $disabled, $dnDisabled)
+    protected function createUserConfigElements(ConfigObject $defaults, $disabled)
     {
         $this->addElement(
             'text',
@@ -234,8 +225,6 @@ class LdapUserGroupBackendForm extends Form
             array(
                 'preserveDefault'   => true,
                 'allowEmpty'        => true,
-                'ignore'            => $dnDisabled,
-                'disabled'          => $dnDisabled,
                 'label'             => $this->translate('LDAP User Filter'),
                 'description'       => $this->translate(
                     'An additional filter to use when looking up users using the specified connection. '
@@ -281,8 +270,6 @@ class LdapUserGroupBackendForm extends Form
             'user_base_dn',
             array(
                 'preserveDefault'   => true,
-                'ignore'            => $dnDisabled,
-                'disabled'          => $dnDisabled,
                 'label'             => $this->translate('LDAP User Base DN'),
                 'description'       => $this->translate(
                     'The path where users can be found on the LDAP server. Leave ' .
diff --git a/modules/setup/application/forms/UserGroupBackendPage.php b/modules/setup/application/forms/UserGroupBackendPage.php
index fbc2d44f0..272949d54 100644
--- a/modules/setup/application/forms/UserGroupBackendPage.php
+++ b/modules/setup/application/forms/UserGroupBackendPage.php
@@ -104,15 +104,30 @@ class UserGroupBackendPage extends Form
         ResourceFactory::setConfig($this->createResourceConfiguration());
         UserBackend::setConfig($this->createBackendConfiguration());
 
-        $formData['type'] = 'ldap';
-        $formData['user_backend'] = $this->backendConfig['name']; // We're forcing the linkage anyway..
         $backendForm = new LdapUserGroupBackendForm();
+        $formData['type'] = 'ldap';
         $backendForm->create($formData);
-        $userBackendOptions = $backendForm->getElement('user_backend')->getMultiOptions();
-        unset($userBackendOptions['none']);
         $backendForm->getElement('name')->setValue('icingaweb2');
-        $backendForm->getElement('user_backend')->setMultiOptions($userBackendOptions);
         $this->addSubForm($backendForm, 'backend_form');
+
+        $backendForm->addElement(
+            'hidden',
+            'resource',
+            array(
+                'required'      => true,
+                'value'         => $this->resourceConfig['name'],
+                'decorators'    => array('ViewHelper')
+            )
+        );
+        $backendForm->addElement(
+            'hidden',
+            'user_backend',
+            array(
+                'required'      => true,
+                'value'         => $this->backendConfig['name'],
+                'decorators'    => array('ViewHelper')
+            )
+        );
     }
 
     /**

From cc1b26be0ce794e58c8b7da1a8057379a6b8c66f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 31 Jul 2015 15:56:49 +0200
Subject: [PATCH 2777/2920] Revert "Vagrant: slapd must be running, add
 provision hint to docs"

This reverts commit f0fc8b8e901ab741071ca5c15cdae6f287bbff50.

I'll fix this by introducing dependencies for the schema import.

refs #9453
---
 .puppet/modules/openldap/manifests/init.pp | 2 +-
 doc/vagrant.md                             | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.puppet/modules/openldap/manifests/init.pp b/.puppet/modules/openldap/manifests/init.pp
index 62b9d1e34..11cc2b42a 100644
--- a/.puppet/modules/openldap/manifests/init.pp
+++ b/.puppet/modules/openldap/manifests/init.pp
@@ -28,7 +28,7 @@ class openldap {
       exec { "slapd-schema-${schema}":
         command => "ldapadd -Y EXTERNAL -H ldapi:// -f /etc/openldap/schema/${schema}.ldif",
         group   => 'root',
-        require => [ Package['openldap-servers'], Service['slapd'] ],
+        require => Package['openldap-servers'],
         unless  => "test -n \"$(find /etc/openldap/slapd.d/cn=config/cn=schema/ -name cn={*}${schema}.ldif -print -quit)\"",
         user    => 'root',
       }
diff --git a/doc/vagrant.md b/doc/vagrant.md
index 148e6aeb8..b1b98b436 100644
--- a/doc/vagrant.md
+++ b/doc/vagrant.md
@@ -24,8 +24,6 @@ vagrant up
 > you'll download a plain CentOS base box and Vagrant will automatically
 > provision the environment on the first go.
 
-If the LDAP schema import fails, rerun `vagrant provision`.
-
 After you should be able to browse [localhost:8080/icingaweb2](http://localhost:8080/icingaweb2).
 
 ## Log into Icinga Web 2

From df38e127e157259ee7e2581bcc9a3376e332d501 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 31 Jul 2015 16:23:22 +0200
Subject: [PATCH 2778/2920] Puppet: Require php in phpd not vice versa

refs #9453
---
 .puppet/modules/php/manifests/init.pp | 4 +---
 .puppet/modules/php/manifests/phpd.pp | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.puppet/modules/php/manifests/init.pp b/.puppet/modules/php/manifests/init.pp
index 788ad5df1..d9d111b71 100644
--- a/.puppet/modules/php/manifests/init.pp
+++ b/.puppet/modules/php/manifests/init.pp
@@ -24,7 +24,5 @@ class php {
     require => Package['apache'],
   }
 
-  php::phpd { ['error_reporting', 'timezone', 'xdebug_settings' ]:
-    require => Package['php'],
-  }
+  php::phpd { ['error_reporting', 'timezone', 'xdebug_settings' ]: }
 }
diff --git a/.puppet/modules/php/manifests/phpd.pp b/.puppet/modules/php/manifests/phpd.pp
index 4d59223cb..dab28aec1 100644
--- a/.puppet/modules/php/manifests/phpd.pp
+++ b/.puppet/modules/php/manifests/phpd.pp
@@ -17,5 +17,6 @@ define php::phpd {
   file { "/etc/php.d/$name.ini":
     content => template("php/$name.ini.erb"),
     notify  => Service['apache'],
+    require => Package['php'],
   }
 }

From 9379faf9ebc0cc7a6f43a40405a688f55e17bfcd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 31 Jul 2015 16:23:51 +0200
Subject: [PATCH 2779/2920] Puppet: Add openldap::schema for installing a
 schema

refs #9453
---
 .puppet/modules/openldap/manifests/schema.pp | 24 ++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .puppet/modules/openldap/manifests/schema.pp

diff --git a/.puppet/modules/openldap/manifests/schema.pp b/.puppet/modules/openldap/manifests/schema.pp
new file mode 100644
index 000000000..a98239379
--- /dev/null
+++ b/.puppet/modules/openldap/manifests/schema.pp
@@ -0,0 +1,24 @@
+# define: openldap::schema
+#
+#   Install a schema.
+#
+# Parameters:
+#
+# Actions:
+#
+# Requires:
+#
+# Sample Usage:
+#
+define openldap::schema {
+
+  include openldap
+
+  exec { "openldap-schema-${name}":
+    command => "ldapadd -Y EXTERNAL -H ldapi:// -f /etc/openldap/schema/${name}.ldif",
+    group   => 'root',
+    require => Service['slapd'],
+    unless  => "test -n \"$(find /etc/openldap/slapd.d/cn=config/cn=schema/ -name cn={*}${name}.ldif -print -quit)\"",
+    user    => 'root',
+  }
+}

From 222b91dfd1e5451b25d47a80b524fa0900faa9d9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 31 Jul 2015 16:24:21 +0200
Subject: [PATCH 2780/2920] Puppet: Fix that openldap core schemas are not
 correctly installed on Red Hat Linux 7

refs #9453
---
 .puppet/modules/openldap/manifests/init.pp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.puppet/modules/openldap/manifests/init.pp b/.puppet/modules/openldap/manifests/init.pp
index 11cc2b42a..a0480632e 100644
--- a/.puppet/modules/openldap/manifests/init.pp
+++ b/.puppet/modules/openldap/manifests/init.pp
@@ -24,14 +24,11 @@ class openldap {
   }
 
   if versioncmp($::operatingsystemmajrelease, '7') >= 0 {
-    ['core', 'cosine', 'inetorgperson', 'nis', 'misc', 'openldap'].each |String $schema| {
-      exec { "slapd-schema-${schema}":
-        command => "ldapadd -Y EXTERNAL -H ldapi:// -f /etc/openldap/schema/${schema}.ldif",
-        group   => 'root',
-        require => Package['openldap-servers'],
-        unless  => "test -n \"$(find /etc/openldap/slapd.d/cn=config/cn=schema/ -name cn={*}${schema}.ldif -print -quit)\"",
-        user    => 'root',
-      }
-    }
+    openldap::schema{ 'core': }
+    -> openldap::schema{ 'cosine': }
+    -> openldap::schema{ 'inetorgperson': }
+    -> openldap::schema{ 'nis': }
+    -> openldap::schema{ 'misc': }
+    -> openldap::schema{ 'openldap': }
   }
 }

From c06ef8dfed4cb03215871850bc060db0f49eed2d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 3 Aug 2015 10:38:24 +0200
Subject: [PATCH 2781/2920] Puppet: Use hiera variables in
 icingaweb2::config::general

---
 .puppet/modules/icingaweb2/manifests/config/general.pp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.puppet/modules/icingaweb2/manifests/config/general.pp b/.puppet/modules/icingaweb2/manifests/config/general.pp
index 200a4f79e..2a10ac1c8 100644
--- a/.puppet/modules/icingaweb2/manifests/config/general.pp
+++ b/.puppet/modules/icingaweb2/manifests/config/general.pp
@@ -1,6 +1,11 @@
 define icingaweb2::config::general (
   $source,
   $config    = hiera('icingaweb2::config'),
+  $log       = hiera('icingaweb2::log'),
+  $web_path  = hiera('icingaweb2::web_path'),
+  $db_user   = hiera('icingaweb2::db_user'),
+  $db_pass   = hiera('icingaweb2::db_pass'),
+  $db_name   = hiera('icingaweb2::db_name'),
   $web_group = hiera('icingaweb2::group'),
   $replace   = true
 ) {

From 6481e9756553b972d994646f1ab2961ccf00997e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 3 Aug 2015 10:39:42 +0200
Subject: [PATCH 2782/2920] Add createTicketLinks() view helper

refs #9611
---
 .../views/helpers/CreateTicketLinks.php       | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 application/views/helpers/CreateTicketLinks.php

diff --git a/application/views/helpers/CreateTicketLinks.php b/application/views/helpers/CreateTicketLinks.php
new file mode 100644
index 000000000..be92c1f26
--- /dev/null
+++ b/application/views/helpers/CreateTicketLinks.php
@@ -0,0 +1,23 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+/**
+ * Helper for creating ticket links from ticket hooks
+ */
+class Zend_View_Helper_CreateTicketLinks extends Zend_View_Helper_Abstract
+{
+    /**
+     * Create ticket links form ticket hooks
+     *
+     * @param   string $text
+     *
+     * @return  string
+     * @see     \Icinga\Web\Hook\TicketHook::createLinks()
+     */
+    public function createTicketLinks($text)
+    {
+        $tickets = $this->view->tickets;
+        /** @var \Icinga\Web\Hook\TicketHook $tickets */
+        return isset($tickets) ? $tickets->createLinks($text) : $text;
+    }
+}

From 498585d8af0b9c35116d74a6225e17a0c1562ca6 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 3 Aug 2015 10:43:42 +0200
Subject: [PATCH 2783/2920] monitoring: Use createTicketLinks helper when
 showing a host's history

refs #9611
---
 .../application/views/scripts/host/history.phtml     | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/host/history.phtml b/modules/monitoring/application/views/scripts/host/history.phtml
index 36d43ee95..2ad6f428c 100644
--- a/modules/monitoring/application/views/scripts/host/history.phtml
+++ b/modules/monitoring/application/views/scripts/host/history.phtml
@@ -116,15 +116,7 @@ function contactsLink($match, $view) {
           <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;
-
-?>
+        <td>
         <?php if ($isService): ?>
           <?= sprintf(
               $this->translate('%s on %s', 'Service running on host'),
@@ -148,7 +140,7 @@ $output = $this->tickets ? preg_replace_callback(
         <?php endif ?>
           <br>
           <div>
-            <?= $this->icon($icon, $title); ?> <?= empty($msg) ? '' : $msg; ?>
+            <?= $this->icon($icon, $title); ?> <?= $this->createTicketLinks($msg) ?>
           </div>
         </td>
       </tr>

From e555e3e3b22752296048f92e7f8ef7778a920be1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 3 Aug 2015 10:44:53 +0200
Subject: [PATCH 2784/2920] monitoring: Use createTicketLinks helper when
 showing a service's history

refs #9611
---
 .../views/scripts/service/history.phtml            | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/service/history.phtml b/modules/monitoring/application/views/scripts/service/history.phtml
index ac443c370..b600e9fb9 100644
--- a/modules/monitoring/application/views/scripts/service/history.phtml
+++ b/modules/monitoring/application/views/scripts/service/history.phtml
@@ -114,15 +114,7 @@ function contactsLink($match, $view) {
           <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;
-
-?>
+        <td>
           <?= sprintf(
               $this->translate('%s on %s', 'Service running on host'),
               $this->escape($event->service_display_name),
@@ -130,11 +122,11 @@ $output = $this->tickets ? preg_replace_callback(
           ) ?>
           <br>
           <div>
-            <?= $this->icon($icon, $title); ?> <?= empty($msg) ? '' : $msg; ?>
+            <?= $this->icon($icon, $title); ?> <?= $this->createTicketLinks($msg) ?>
           </div>
         </td>
       </tr>
 <?php endforeach; ?>
     </tbody>
   </table>
-</div>
\ No newline at end of file
+</div>

From b6caeb6c179bab82a4054e426cb2f2e387154ea7 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 3 Aug 2015 10:53:51 +0200
Subject: [PATCH 2785/2920] monitoring: Use createTicketLinks helper when
 showing comments of an object

refs #9611
---
 .../views/scripts/show/components/comments.phtml     | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index ded9d3836..3db9de338 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -52,16 +52,8 @@ if (empty($object->comments) && ! $addLink) {
  <?php foreach ($object->comments as $comment): ?>
  <?php
 
-// Ticket hook sample
-$commentText = $this->tickets ? preg_replace_callback(
-    $this->tickets->getPattern(),
-    array($this->tickets, 'createLink'),
-    $this->escape($comment->comment)
-) : $this->escape($comment->comment);
-
-
 // Form is unset if the current user lacks the respective permission
-if (isset($delCommentForm)) { 
+if (isset($delCommentForm)) {
     $deleteButton = clone($delCommentForm);
     $deleteButton->populate(
         array(
@@ -80,7 +72,7 @@ if (isset($delCommentForm)) {
 		    	<?= $this->timeAgo($comment->timestamp) ?>
                 <?= $deleteButton ?>
 		    </h3>
-		    <p><span class="sr-only">(<?= $this->translate('Comment'); ?>): </span><?= str_replace(array('\r\n', '\n'), '<br>', $commentText) ?></p>
+		    <p><span class="sr-only">(<?= $this->translate('Comment'); ?>): </span><?= str_replace(array('\r\n', '\n'), '<br>', $this->createTicketLinks($comment->comment)) ?></p>
          </li>
  <?php endforeach ?>
     </ul>

From a379a448d9f412781b91f655c0210afc9411459e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 3 Aug 2015 10:58:57 +0200
Subject: [PATCH 2786/2920] monitoring: Fix code style in the
 show/components/comments.phtml view script

refs #9611
---
 .../scripts/show/components/comments.phtml    | 72 +++++++++----------
 1 file changed, 32 insertions(+), 40 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index 3db9de338..37a832358 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -1,7 +1,5 @@
 <?php
-
-$addLink = '';
-
+$addLink = false;
 if ($this->hasPermission('monitoring/command/comment/add')) {
     /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
     if ($object->getType() === $object::TYPE_HOST) {
@@ -28,55 +26,49 @@ if ($this->hasPermission('monitoring/command/comment/add')) {
         );
     }
 }
-
 if (empty($object->comments) && ! $addLink) {
     return;
 }
-
 ?>
 <tr>
     <th><?php
-
     echo $this->translate('Comments');
-
     if (! empty($object->comments) && $addLink) {
         echo '<br />' . $addLink;
     }
-
     ?></th>
     <td data-base-target="_self">
-<?php if (empty($object->comments)): ?>
-<?= $addLink ?>
-<?php else: ?>
-    <ul class="inline-comments">
- <?php foreach ($object->comments as $comment): ?>
- <?php
-
-// Form is unset if the current user lacks the respective permission
-if (isset($delCommentForm)) {
-    $deleteButton = clone($delCommentForm);
-    $deleteButton->populate(
-        array(
-            'comment_id' => $comment->id,
-            'comment_is_service' => isset($comment->service_description)
-        )
-    );
-} else {
-    $deleteButton = '';
-}
-
- ?>
-	    <li class="comment-item">
-	    	<h3>
-		    	<span class="author"><?= $this->escape($comment->author) ?></span>
-		    	<?= $this->timeAgo($comment->timestamp) ?>
+    <?php if (empty($object->comments)):
+        echo $addLink;
+    else: ?>
+        <ul class="inline-comments">
+        <?php foreach ($object->comments as $comment):
+        // Form is unset if the current user lacks the respective permission
+        if (isset($delCommentForm)) {
+            $deleteButton = clone($delCommentForm);
+            $deleteButton->populate(
+                array(
+                    'comment_id' => $comment->id,
+                    'comment_is_service' => isset($comment->service_description)
+                )
+            );
+        } else {
+            $deleteButton = '';
+        }
+        ?>
+        <li class="comment-item">
+            <h3>
+                <span class="author"><?= $this->escape($comment->author) ?></span>
+                <?= $this->timeAgo($comment->timestamp) ?>
                 <?= $deleteButton ?>
-		    </h3>
-		    <p><span class="sr-only">(<?= $this->translate('Comment'); ?>): </span><?= str_replace(array('\r\n', '\n'), '<br>', $this->createTicketLinks($comment->comment)) ?></p>
-         </li>
- <?php endforeach ?>
-    </ul>
-<?php endif ?>
-
+            </h3>
+            <p>
+                <span class="sr-only">(<?= $this->translate('Comment') ?>): </span>
+                <?= str_replace(array('\r\n', '\n'), '<br>', $this->createTicketLinks($comment->comment)) ?>
+            </p>
+        </li>
+        <?php endforeach ?>
+        </ul>
+    <?php endif ?>
     </td>
 </tr>

From d5e2f92aa9b9b36cd1368108c9f40f7bb98e7442 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 3 Aug 2015 11:00:46 +0200
Subject: [PATCH 2787/2920] monitoring: Use createTicketLinks helper when
 showing downtimes of an object

refs #9611
---
 .../views/scripts/show/components/downtime.phtml      | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 46b0f5a3a..70f16bb18 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -58,13 +58,6 @@ if (empty($object->comments) && ! $addLink) {
 <?php foreach ($object->downtimes as $downtime): ?>
 <?php
 
-    // Ticket hook sample
-    $commentText = $this->tickets ? preg_replace_callback(
-        $this->tickets->getPattern(),
-        array($this->tickets, 'createLink'),
-        $this->escape($downtime->comment)
-    ) : $this->escape($downtime->comment);
-
     if ((bool) $downtime->is_in_effect) {
         $state = sprintf(
             $this->translate('in downtime %s', 'Last format parameter represents the time in downtime'),
@@ -86,7 +79,7 @@ if (empty($object->comments) && ! $addLink) {
 
 
 // Form is unset if the current user lacks the respective permission
-if (isset($delDowntimeForm)) { 
+if (isset($delDowntimeForm)) {
     $deleteButton = clone($delDowntimeForm);
     $deleteButton->populate(
         array(
@@ -106,7 +99,7 @@ if (isset($delDowntimeForm)) {
                 <?= $this->timeAgo($downtime->entry_time) ?>
                 <?= $deleteButton ?>
             </h3>
-            <p>            <span class="sr-only"><?= $this->translate('Downtime'); ?></span><?= $state; ?> - <?= str_replace(array('\r\n', '\n'), '<br>', $commentText); ?></p>
+            <p>            <span class="sr-only"><?= $this->translate('Downtime'); ?></span><?= $state; ?> - <?= str_replace(array('\r\n', '\n'), '<br>', $this->createTicketLinks($downtime->comment)); ?></p>
          </li>
  <?php endforeach ?>
     </ul>

From 177fafaa56a2c97894e75504eeacd2181671a16a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 3 Aug 2015 11:05:48 +0200
Subject: [PATCH 2788/2920] lib: Fix TicketHook's PHPDoc

refs #9611
---
 library/Icinga/Web/Hook/TicketHook.php | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/library/Icinga/Web/Hook/TicketHook.php b/library/Icinga/Web/Hook/TicketHook.php
index 265a0641e..74af1a91f 100644
--- a/library/Icinga/Web/Hook/TicketHook.php
+++ b/library/Icinga/Web/Hook/TicketHook.php
@@ -5,19 +5,13 @@ namespace Icinga\Web\Hook;
 
 use ErrorException;
 use Exception;
-use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
 use Icinga\Exception\IcingaException;
 
 /**
- * Icinga Web Ticket Hook base class
+ * Base class for ticket hooks
  *
- * Extend this class if you want to integrate your ticketing solution nicely into
- * Icinga Web
- *
- * @copyright  Copyright (c) 2013 Icinga-Web Team <info@icinga.org>
- * @author     Icinga-Web Team <info@icinga.org>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU General Public License
+ * Extend this class if you want to integrate your ticketing solution Icinga Web 2
  */
 abstract class TicketHook
 {
@@ -29,10 +23,9 @@ abstract class TicketHook
     protected $lastError;
 
     /**
-     * Constructor must live without arguments right now
+     * Create a new ticket hook
      *
-     * Therefore the constructor is final, we might change our opinion about
-     * this one far day
+     * @see init() For hook initialization.
      */
     final public function __construct()
     {
@@ -40,7 +33,7 @@ abstract class TicketHook
     }
 
     /**
-     * Overwrite this function if you want to do some initialization stuff
+     * Overwrite this function for hook initialization, e.g. loading the hook's config
      */
     protected function init()
     {

From 863330e50d3aa79baed55915f237bb028e10be70 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 3 Aug 2015 12:37:09 +0200
Subject: [PATCH 2789/2920] components/downtime: Add downtime end time
 information in view

fixes #8845
---
 .../views/scripts/show/components/downtime.phtml           | 7 ++++++-
 modules/monitoring/public/css/module.less                  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 46b0f5a3a..e4341d45a 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -103,7 +103,12 @@ if (isset($delDowntimeForm)) {
         <li class="comment-item">
             <h3>
                 <span class="author"><?= $this->escape($downtime->author_name) ?></span>
-                <?= $this->timeAgo($downtime->entry_time) ?>
+                <span class="info">
+                <? printf($this->translate('Added %s.'), $this->timeAgo($downtime->entry_time)) ?>
+                <? if ($downtime->is_in_effect) {
+                    printf($this->translate('Expires %s.'),  $this->timeUntil($downtime->end));
+                } ?>
+                </span>
                 <?= $deleteButton ?>
             </h3>
             <p>            <span class="sr-only"><?= $this->translate('Downtime'); ?></span><?= $state; ?> - <?= str_replace(array('\r\n', '\n'), '<br>', $commentText); ?></p>
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 406031c19..0aa5ddb66 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -263,7 +263,7 @@ td.state {
     margin: 0;
     font-size: 0.857em;
 
-    .time-ago {
+    .info {
         font-style: italic;
         color: #919191;
     }

From 139baffdc61f05f8093d71b52fb4610aed1d681b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 3 Aug 2015 12:58:58 +0200
Subject: [PATCH 2790/2920] lib: Make Dashboard::$tabs protected

The SearchDashboard has to override Dashboard::getTabs() in order to set up the correct tab.
---
 library/Icinga/Web/Widget/Dashboard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/Icinga/Web/Widget/Dashboard.php b/library/Icinga/Web/Widget/Dashboard.php
index 0bb7ce2e5..758ec8267 100644
--- a/library/Icinga/Web/Widget/Dashboard.php
+++ b/library/Icinga/Web/Widget/Dashboard.php
@@ -36,7 +36,7 @@ class Dashboard extends AbstractWidget
      *
      * @var Tabs
      */
-    private $tabs;
+    protected $tabs;
 
     /**
      * The parameter that will be added to identify panes

From ea5db51213eede39e19ae30617eee7429a7c26e9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 3 Aug 2015 13:00:03 +0200
Subject: [PATCH 2791/2920] Fix "Try to get an inexistent pane." when clicking
 on the "Search" tab

---
 library/Icinga/Web/Widget/SearchDashboard.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/library/Icinga/Web/Widget/SearchDashboard.php b/library/Icinga/Web/Widget/SearchDashboard.php
index c394e32fa..0ca759919 100644
--- a/library/Icinga/Web/Widget/SearchDashboard.php
+++ b/library/Icinga/Web/Widget/SearchDashboard.php
@@ -19,6 +19,25 @@ class SearchDashboard extends Dashboard
      */
     const SEARCH_PANE = 'search';
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabs()
+    {
+        if ($this->tabs === null) {
+            $this->tabs = new Tabs();
+            $this->tabs->add(
+                'search',
+                array(
+                    'title' => t('Show Search', 'dashboard.pane.tooltip'),
+                    'label' => t('Search'),
+                    'url'   => Url::fromRequest()
+                )
+            );
+        }
+        return $this->tabs;
+    }
+
     /**
      * Load all available search dashlets from modules
      *

From 95ea0e616dc418feda46cd4adb2022a94eaef8e3 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 3 Aug 2015 13:05:41 +0200
Subject: [PATCH 2792/2920] components/downtime: Add the missing php script tag

refs #8845
---
 .../application/views/scripts/show/components/downtime.phtml  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index e4341d45a..889ec0508 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -104,8 +104,8 @@ if (isset($delDowntimeForm)) {
             <h3>
                 <span class="author"><?= $this->escape($downtime->author_name) ?></span>
                 <span class="info">
-                <? printf($this->translate('Added %s.'), $this->timeAgo($downtime->entry_time)) ?>
-                <? if ($downtime->is_in_effect) {
+                <?php printf($this->translate('Added %s.'), $this->timeAgo($downtime->entry_time)) ?>
+                <?php if ($downtime->is_in_effect) {
                     printf($this->translate('Expires %s.'),  $this->timeUntil($downtime->end));
                 } ?>
                 </span>

From 1652f1e1ae0f8a8da7ea5a2882dde70920e924b9 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 3 Aug 2015 13:38:49 +0200
Subject: [PATCH 2793/2920] Revert "components/downtime: Add the missing php
 script tag"

This reverts commit 95ea0e616dc418feda46cd4adb2022a94eaef8e3.

refs #8845
---
 .../application/views/scripts/show/components/downtime.phtml  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 889ec0508..e4341d45a 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -104,8 +104,8 @@ if (isset($delDowntimeForm)) {
             <h3>
                 <span class="author"><?= $this->escape($downtime->author_name) ?></span>
                 <span class="info">
-                <?php printf($this->translate('Added %s.'), $this->timeAgo($downtime->entry_time)) ?>
-                <?php if ($downtime->is_in_effect) {
+                <? printf($this->translate('Added %s.'), $this->timeAgo($downtime->entry_time)) ?>
+                <? if ($downtime->is_in_effect) {
                     printf($this->translate('Expires %s.'),  $this->timeUntil($downtime->end));
                 } ?>
                 </span>

From 8860181bcc884846c9c72174dfbb9171d3c36d32 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 3 Aug 2015 13:40:32 +0200
Subject: [PATCH 2794/2920] Revert "components/downtime: Add downtime end time
 information in view"

This reverts commit 863330e50d3aa79baed55915f237bb028e10be70.

refs #8845
---
 .../views/scripts/show/components/downtime.phtml           | 7 +------
 modules/monitoring/public/css/module.less                  | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index e4341d45a..46b0f5a3a 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -103,12 +103,7 @@ if (isset($delDowntimeForm)) {
         <li class="comment-item">
             <h3>
                 <span class="author"><?= $this->escape($downtime->author_name) ?></span>
-                <span class="info">
-                <? printf($this->translate('Added %s.'), $this->timeAgo($downtime->entry_time)) ?>
-                <? if ($downtime->is_in_effect) {
-                    printf($this->translate('Expires %s.'),  $this->timeUntil($downtime->end));
-                } ?>
-                </span>
+                <?= $this->timeAgo($downtime->entry_time) ?>
                 <?= $deleteButton ?>
             </h3>
             <p>            <span class="sr-only"><?= $this->translate('Downtime'); ?></span><?= $state; ?> - <?= str_replace(array('\r\n', '\n'), '<br>', $commentText); ?></p>
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 0aa5ddb66..406031c19 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -263,7 +263,7 @@ td.state {
     margin: 0;
     font-size: 0.857em;
 
-    .info {
+    .time-ago {
         font-style: italic;
         color: #919191;
     }

From a63b69f4a1588a56aa5169b913036b4ec3e2f9f1 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 3 Aug 2015 13:44:41 +0200
Subject: [PATCH 2795/2920] components/downtime: Add downtime end time
 information in view

fixes #8845
---
 .../application/views/scripts/show/components/downtime.phtml  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 46b0f5a3a..f6d9647bd 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -67,8 +67,8 @@ if (empty($object->comments) && ! $addLink) {
 
     if ((bool) $downtime->is_in_effect) {
         $state = sprintf(
-            $this->translate('in downtime %s', 'Last format parameter represents the time in downtime'),
-            $this->timeSince($downtime->start)
+            $this->translate('expires %s', 'Last format parameter represents the downtime expire time'),
+            $this->timeUntil($downtime->end)
         );
     } else {
         if ((bool) $downtime->is_fixed) {

From 6a17d7cb26d31a32817344922f27388477e44226 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 3 Aug 2015 13:19:49 +0200
Subject: [PATCH 2796/2920] Do not target next pane in multiview detail
 controls

fixes #9815
---
 modules/monitoring/application/views/scripts/hosts/show.phtml   | 2 +-
 .../monitoring/application/views/scripts/services/show.phtml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 1abc2d21d..3dbb0673f 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -1,4 +1,4 @@
-<div data-base-target='_next' class="controls">
+<div class="controls">
     <?php if (! $this->compact): ?>
         <?= $tabs; ?>
     <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index fc2e87ad2..d2ad21bca 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -1,4 +1,4 @@
-<div data-base-target='_next' class="controls">
+<div class="controls">
 
     <?php if (! $this->compact): ?>
         <?= $tabs; ?>

From dbc2f98053f7957a55024f6a0ecb177dfb59fb94 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 3 Aug 2015 14:09:55 +0200
Subject: [PATCH 2797/2920] SimpleQuery: Initialize self::$iteratorPosition as
 late as possible

refs #9632
---
 library/Icinga/Data/SimpleQuery.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index ae6506e27..33745a822 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -158,7 +158,7 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
         }
 
         $this->iterator->rewind();
-        $this->iteratorPosition = 0;
+        $this->iteratorPosition = null;
         Benchmark::measure('Query result iteration started');
     }
 
@@ -190,6 +190,8 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
         if (! $valid) {
             Benchmark::measure('Query result iteration finished');
             return false;
+        } elseif ($this->iteratorPosition === null) {
+            $this->iteratorPosition = 0;
         }
 
         return true;

From 9a0e47a3e1ed081461db1252d7c00a27933883e2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 3 Aug 2015 14:49:33 +0200
Subject: [PATCH 2798/2920] SimpleQuery: Add method hasResult()

refs #9632
---
 library/Icinga/Data/SimpleQuery.php                    | 10 ++++++++++
 library/Icinga/Repository/RepositoryQuery.php          | 10 ++++++++++
 .../library/Monitoring/DataView/DataView.php           | 10 ++++++++++
 3 files changed, 30 insertions(+)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 33745a822..2dcecfc9c 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -422,6 +422,16 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
         return $this->hasMore;
     }
 
+    /**
+     * Return whether this query will or has yielded any result
+     *
+     * @return  bool
+     */
+    public function hasResult()
+    {
+        return $this->iteratorPosition !== null || $this->fetchRow() !== false;
+    }
+
     /**
      * Set a limit count and offset to the query
      *
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index 163bb40ff..c975654db 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -367,6 +367,16 @@ class RepositoryQuery implements QueryInterface, SortRules, Iterator
         return $this->query->hasMore();
     }
 
+    /**
+     * Return whether this query will or has yielded any result
+     *
+     * @return  bool
+     */
+    public function hasResult()
+    {
+        return $this->query->hasResult();
+    }
+
     /**
      * Limit this query's results
      *
diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 49f14a2e9..11543351c 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -433,6 +433,16 @@ abstract class DataView implements QueryInterface, SortRules, IteratorAggregate
         return $this->query->hasMore();
     }
 
+    /**
+     * Return whether this query will or has yielded any result
+     *
+     * @return  bool
+     */
+    public function hasResult()
+    {
+        return $this->query->hasResult();
+    }
+
     /**
      * Set a limit count and offset
      *

From 0809caa86b4986692f5983be2add711fbc54cafd Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 3 Aug 2015 15:03:02 +0200
Subject: [PATCH 2799/2920] monitoring: Fix indent in the
 show/components/comments.phtml view script

refs #9611
---
 .../scripts/show/components/comments.phtml    | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index 37a832358..f2df26aef 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -43,30 +43,30 @@ if (empty($object->comments) && ! $addLink) {
     else: ?>
         <ul class="inline-comments">
         <?php foreach ($object->comments as $comment):
-        // Form is unset if the current user lacks the respective permission
-        if (isset($delCommentForm)) {
-            $deleteButton = clone($delCommentForm);
-            $deleteButton->populate(
-                array(
-                    'comment_id' => $comment->id,
-                    'comment_is_service' => isset($comment->service_description)
-                )
-            );
-        } else {
-            $deleteButton = '';
-        }
-        ?>
-        <li class="comment-item">
-            <h3>
-                <span class="author"><?= $this->escape($comment->author) ?></span>
-                <?= $this->timeAgo($comment->timestamp) ?>
-                <?= $deleteButton ?>
-            </h3>
-            <p>
-                <span class="sr-only">(<?= $this->translate('Comment') ?>): </span>
-                <?= str_replace(array('\r\n', '\n'), '<br>', $this->createTicketLinks($comment->comment)) ?>
-            </p>
-        </li>
+            // Form is unset if the current user lacks the respective permission
+            if (isset($delCommentForm)) {
+                $deleteButton = clone($delCommentForm);
+                $deleteButton->populate(
+                    array(
+                        'comment_id' => $comment->id,
+                        'comment_is_service' => isset($comment->service_description)
+                    )
+                );
+            } else {
+                $deleteButton = '';
+            }
+            ?>
+            <li class="comment-item">
+                <h3>
+                    <span class="author"><?= $this->escape($comment->author) ?></span>
+                    <?= $this->timeAgo($comment->timestamp) ?>
+                    <?= $deleteButton ?>
+                </h3>
+                <p>
+                    <span class="sr-only">(<?= $this->translate('Comment') ?>): </span>
+                    <?= str_replace(array('\r\n', '\n'), '<br>', $this->createTicketLinks($comment->comment)) ?>
+                </p>
+            </li>
         <?php endforeach ?>
         </ul>
     <?php endif ?>

From d8e6418e94af71b5185e69848ee79883ce1351e4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 3 Aug 2015 15:03:31 +0200
Subject: [PATCH 2800/2920] monitoring: Fix code style in the
 show/components/downtime.phtml view script

refs #9611
---
 .../scripts/show/components/downtime.phtml    | 116 ++++++++----------
 1 file changed, 52 insertions(+), 64 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 70f16bb18..e892a71ab 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -1,7 +1,5 @@
 <?php
-
-$addLink = '';
-
+$addLink = false;
 if ($this->hasPermission('monitoring/command/downtime/schedule')) {
     /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */
     if ($object->getType() === $object::TYPE_HOST) {
@@ -32,78 +30,68 @@ if ($this->hasPermission('monitoring/command/downtime/schedule')) {
         );
     }
 }
-
 if (empty($object->comments) && ! $addLink) {
     return;
 }
-
 ?>
-
 <tr>
     <th><?php
-
     echo $this->translate('Downtimes');
-
     if (! empty($object->downtimes) && $addLink) {
         echo '<br />' . $addLink;
     }
-
     ?></th>
     <td data-base-target="_self">
-<?php if (empty($object->downtimes)): ?>
-<?= $addLink ?>
-<?php else: ?>
-    <ul class="inline-comments">
-
-<?php foreach ($object->downtimes as $downtime): ?>
-<?php
-
-    if ((bool) $downtime->is_in_effect) {
-        $state = sprintf(
-            $this->translate('in downtime %s', 'Last format parameter represents the time in downtime'),
-            $this->timeSince($downtime->start)
-        );
-    } else {
-        if ((bool) $downtime->is_fixed) {
-            $state = sprintf(
-                $this->translate('scheduled %s', 'Last format parameter represents the time scheduled'),
-                $this->timeUntil($downtime->start)
-            );
-        } else {
-            $state = sprintf(
-                $this->translate('scheduled flexible %s', 'Last format parameter represents the time scheduled'),
-                $this->timeUntil($downtime->start)
-            );
-        }
-    }
-
-
-// Form is unset if the current user lacks the respective permission
-if (isset($delDowntimeForm)) {
-    $deleteButton = clone($delDowntimeForm);
-    $deleteButton->populate(
-        array(
-            'downtime_id' => $downtime->id,
-            'downtime_is_service' => $object->getType() === $object::TYPE_SERVICE
-        )
-    );
-} else {
-    $deleteButton = '';
-}
-
-?>
-
-        <li class="comment-item">
-            <h3>
-                <span class="author"><?= $this->escape($downtime->author_name) ?></span>
-                <?= $this->timeAgo($downtime->entry_time) ?>
-                <?= $deleteButton ?>
-            </h3>
-            <p>            <span class="sr-only"><?= $this->translate('Downtime'); ?></span><?= $state; ?> - <?= str_replace(array('\r\n', '\n'), '<br>', $this->createTicketLinks($downtime->comment)); ?></p>
-         </li>
- <?php endforeach ?>
-    </ul>
-<?php endif ?>
-
+    <?php if (empty($object->downtimes)):
+        echo $addLink;
+    else: ?>
+        <ul class="inline-comments">
+        <?php foreach ($object->downtimes as $downtime):
+            if ((bool) $downtime->is_in_effect) {
+                $state = sprintf(
+                    $this->translate('in downtime %s', 'Last format parameter represents the time in downtime'),
+                    $this->timeSince($downtime->start)
+                );
+            } else {
+                if ((bool) $downtime->is_fixed) {
+                    $state = sprintf(
+                        $this->translate('scheduled %s', 'Last format parameter represents the time scheduled'),
+                        $this->timeUntil($downtime->start)
+                    );
+                } else {
+                    $state = sprintf(
+                        $this->translate('scheduled flexible %s', 'Last format parameter represents the time scheduled'),
+                        $this->timeUntil($downtime->start)
+                    );
+                }
+            }
+            // Form is unset if the current user lacks the respective permission
+            if (isset($delDowntimeForm)) {
+                $deleteButton = clone($delDowntimeForm);
+                $deleteButton->populate(
+                    array(
+                        'downtime_id' => $downtime->id,
+                        'downtime_is_service' => $object->getType() === $object::TYPE_SERVICE
+                    )
+                );
+            } else {
+                $deleteButton = '';
+            }
+            ?>
+            <li class="comment-item">
+                <h3>
+                    <span class="author"><?= $this->escape($downtime->author_name) ?></span>
+                    <?= $this->timeAgo($downtime->entry_time) ?>
+                    <?= $deleteButton ?>
+                </h3>
+                <p>
+                    <span class="sr-only"><?= $this->translate('Downtime') ?></span>
+                    <?= $state ?> -
+                    <?= str_replace(array('\r\n', '\n'), '<br>', $this->createTicketLinks($downtime->comment)) ?>
+                </p>
+             </li>
+        <?php endforeach ?>
+        </ul>
+    <?php endif ?>
     </td>
 </tr>

From 39d29c79d2e0fc568699a1a1ba31d2ec7b7f1c63 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 3 Aug 2015 15:06:22 +0200
Subject: [PATCH 2801/2920] Hostgroup Overview: Use $query->hasResult() instead
 of $query->count()

refs #9632
---
 .../views/scripts/list/hostgroups.phtml       | 70 ++++++++++---------
 1 file changed, 38 insertions(+), 32 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index f1a3e2004..27527591c 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -13,11 +13,10 @@ if (! $this->compact): ?>
 <div class="content">
 <?php
 
-if (count($hostgroups) === 0) {
-    echo $this->translate('No hostgroups found matching the filter') . '</div>';
-    return;
-}
-?>
+$firstRow = true;
+foreach ($hostgroups as $h): ?>
+<?php if ($firstRow): ?>
+  <?php $firstRow = false; ?>
   <table class="groupview action" data-base-target="_next">
     <thead>
       <th><?= $this->translate('Last Problem'); ?></th>
@@ -28,32 +27,35 @@ if (count($hostgroups) === 0) {
       <th><?= $this->translate('Service States'); ?></th>
     </thead>
     <tbody>
-    <?php foreach ($hostgroups as $h):
-        if ($h->hosts_down_unhandled) {
-            $handled = false;
-            $state = Host::STATE_DOWN;
-            $lastStateChange = $h->hosts_down_last_state_change_unhandled;
-        } elseif ($h->hosts_unreachable_unhandled) {
-            $handled = false;
-            $state = Host::STATE_UNREACHABLE;
-            $lastStateChange = $h->hosts_unreachable_last_state_change_unhandled;
-        } else {
-            $handled = true;
-            if ($h->hosts_down_handled) {
-                $state = Host::STATE_DOWN;
-                $lastStateChange = $h->hosts_down_last_state_change_handled;
-            } elseif ($h->hosts_unreachable_handled) {
-                $state = Host::STATE_UNREACHABLE;
-                $lastStateChange = $h->hosts_unreachable_last_state_change_handled;
-            } elseif ($h->hosts_up) {
-                $state = Host::STATE_UP;
-                $lastStateChange = $h->hosts_up_last_state_change;
-            } else {
-                $state = Host::STATE_PENDING;
-                $lastStateChange = $h->hosts_pending_last_state_change;
-            }
-        }
-    ?>
+<?php endif ?>
+<?php
+
+if ($h->hosts_down_unhandled) {
+    $handled = false;
+    $state = Host::STATE_DOWN;
+    $lastStateChange = $h->hosts_down_last_state_change_unhandled;
+} elseif ($h->hosts_unreachable_unhandled) {
+    $handled = false;
+    $state = Host::STATE_UNREACHABLE;
+    $lastStateChange = $h->hosts_unreachable_last_state_change_unhandled;
+} else {
+    $handled = true;
+    if ($h->hosts_down_handled) {
+        $state = Host::STATE_DOWN;
+        $lastStateChange = $h->hosts_down_last_state_change_handled;
+    } elseif ($h->hosts_unreachable_handled) {
+        $state = Host::STATE_UNREACHABLE;
+        $lastStateChange = $h->hosts_unreachable_last_state_change_handled;
+    } elseif ($h->hosts_up) {
+        $state = Host::STATE_UP;
+        $lastStateChange = $h->hosts_up_last_state_change;
+    } else {
+        $state = Host::STATE_PENDING;
+        $lastStateChange = $h->hosts_pending_last_state_change;
+    }
+}
+
+?>
       <tr class="state <?= Host::getStateText($state) ?><?= $handled ? ' handled' : '' ?>" href="<?=
         $this->href('monitoring/list/hosts', array('hostgroup_name' => $h->hostgroup_name))
       ?>">
@@ -461,7 +463,11 @@ if (count($hostgroups) === 0) {
         <?php endif ?>
         </td>
       </tr>
-    <?php endforeach ?>
+<?php endforeach ?>
+<?php if ($hostgroups->hasResult()): ?>
     </tbody>
   </table>
+<?php else: ?>
+  <?= $this->translate('No hostgroups found matching the filter'); ?>
+<?php endif ?>
 </div>

From c0b82eff945816f2b311a4be20b7172985e7ce65 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 3 Aug 2015 15:18:40 +0200
Subject: [PATCH 2802/2920] Servicegroup Overview: Use $query->hasResult()
 instead of $query->count()

refs #9632
---
 .../views/scripts/list/servicegroups.phtml      | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index fc336aca5..41e52b833 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -10,11 +10,10 @@
 <div class="content">
 <?php
 
-if (count($servicegroups) === 0) {
-    echo $this->translate('No servicegroups found matching the filter') . '</div>';
-    return;
-}
-?>
+$firstRow = true;
+foreach ($servicegroups as $s): ?>
+<?php if ($firstRow): ?>
+  <?php $firstRow = false; ?>
   <table class="groupview action" data-base-target="_next">
     <thead>
       <th><?= $this->translate('Last Problem'); ?></th>
@@ -23,7 +22,7 @@ if (count($servicegroups) === 0) {
       <th><?= $this->translate('Service States'); ?></th>
     </thead>
     <tbody>
-    <?php foreach ($servicegroups as $s): ?>
+<?php endif ?>
       <tr href="<?= $this->href('monitoring/list/services', array('servicegroup_name' => $s->servicegroup_name)); ?>">
        <?php if ($s->services_critical_last_state_change_unhandled): ?>
         <td class="state change critical unhandled">
@@ -298,7 +297,11 @@ if (count($servicegroups) === 0) {
         <?php endif ?>
         </td>
       </tr>
-    <?php endforeach ?>
+<?php endforeach ?>
+<?php if ($servicegroups->hasResult()): ?>
     </tbody>
   </table>
+<?php else: ?>
+  <?= $this->translate('No servicegroups found matching the filter'); ?>
+<?php endif ?>
 </div>

From e1b3c4281825b9697830429bc19cd0b7647b6497 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 3 Aug 2015 15:22:14 +0200
Subject: [PATCH 2803/2920] Host Overview: Use $query->hasResult() instead of
 $query->count()

refs #9632
---
 .../application/views/scripts/list/hosts.phtml        | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index b697c8f6a..4ff367fd8 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -15,14 +15,6 @@ if (! $this->compact): ?>
 </div>
 <?php endif ?>
 <div class="content">
-<?php
-
-if (count($hosts) === 0) {
-    echo $this->translate('No hosts found matching the filter') . '</div>';
-    return;
-}
-?>
-
 <table
     data-base-target="_next"
     class="action multiselect"
@@ -99,4 +91,7 @@ if (count($hosts) === 0) {
   <?php endforeach ?>
   </tbody>
 </table>
+<?php if (! $hosts->hasResult()): ?>
+  <?= $this->translate('No hosts found matching the filter'); ?>
+<?php endif ?>
 </div>

From 028342adfe6e5d289289fe39a70b606b6499f13d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 3 Aug 2015 15:24:10 +0200
Subject: [PATCH 2804/2920] Services Overview: Use $query->hasResult() instead
 of $query->count()

refs #9632
---
 .../application/views/scripts/list/services.phtml      | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 887757537..d5f68bbe5 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -18,13 +18,6 @@ if (! $this->compact): ?>
 </div>
 <?php endif ?>
 <div class="content">
-<?php
-
-if (count($services) === 0) {
-    echo $this->translate('No services found matching the filter') . '</div>';
-    return;
-}
-?>
 <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") ?>"
@@ -91,4 +84,7 @@ if (count($services) === 0) {
 <?php endforeach ?>
   </tbody>
 </table>
+<?php if (! $services->hasResult()): ?>
+  <?= $this->translate('No services found matching the filter'); ?>
+<?php endif ?>
 </div>

From 29fd849ccaf74c7f9c2c0512bab10bbbbae3faca Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 3 Aug 2015 15:35:07 +0200
Subject: [PATCH 2805/2920] Contact Overview: Use $query->hasResult() instead
 of $query->count()

refs #9632
---
 .../application/views/scripts/list/contacts.phtml    | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 78910cead..6775fb480 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -8,14 +8,7 @@
 </div>
 <?php endif ?>
 <div data-base-target="_next" class="content contacts">
-<?php
-
-if (count($contacts) === 0) {
-    echo $this->translate('No contacts found matching the filter') . '</div>';
-    return;
-}
-?>
-<?php foreach ($contacts as $contact): ?>
+    <?php foreach ($contacts as $contact): ?>
         <div class="contact">
             <?= $this->img('/static/gravatar', array('email' => $contact->contact_email)); ?>
             <strong><?= $this->qlink(
@@ -59,4 +52,7 @@ if (count($contacts) === 0) {
     if (true): /* The following piece of HTML MUST be nested in <?php */ ?>
     <div style="clear: both;"></div>
     <?php endif; ?>
+    <?php if (! $contacts->hasResult()): ?>
+        <?= $this->translate('No contacts found matching the filter'); ?>
+    <?php endif ?>
 </div>

From 6f0b51ed8fbf894ae2a94e251f07cb61fd02e812 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 3 Aug 2015 15:35:17 +0200
Subject: [PATCH 2806/2920] Notification Overview: Use $query->hasResult()
 instead of $query->count()

refs #9632
---
 .../application/views/scripts/list/notifications.phtml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 06a9e80a0..877a810c6 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -12,13 +12,6 @@ if (! $this->compact): ?>
 </div>
 <?php endif ?>
 <div class="content">
-<?php
-
-if (count($notifications) === 0) {
-    echo $this->translate('No notifications found matching the filter') . '</div>';
-    return;
-}
-?>
     <table data-base-target="_next" class="action">
     <tbody>
     <?php foreach ($notifications as $notification):
@@ -71,4 +64,7 @@ if (count($notifications) === 0) {
     <?php endforeach ?>
     </tbody>
     </table>
+<?php if (! $notifications->hasResult()): ?>
+  <?= $this->translate('No notifications found matching the filter'); ?>
+<?php endif ?>
 </div>

From d9539b2ad1773bbbb4a842096ad7f0673c290f87 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 3 Aug 2015 15:45:54 +0200
Subject: [PATCH 2807/2920] Downtime Overview: Use $query->hasResult() instead
 of $query->count()

refs #9632
---
 .../application/views/scripts/list/downtimes.phtml    | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index af6c0d290..a2feafa52 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -16,14 +16,6 @@ if (! $this->compact): ?>
 </div>
 <?php endif ?>
 <div class="content">
-<?php
-
-if (count($downtimes) === 0) {
-    echo $this->translate('No downtimes found matching the filter,'
-            . ' maybe the downtime already expired.') . '</div>';
-    return;
-}
-?>
   <table data-base-target="_next"
          class="action multiselect"
          data-icinga-multiselect-url="/icingaweb2/monitoring/downtimes/show"
@@ -143,4 +135,7 @@ if (count($downtimes) === 0) {
 <?php endforeach ?>
     </tbody>
   </table>
+<?php if (! $downtimes->hasResult()): ?>
+  <?= $this->translate('No downtimes found matching the filter, maybe the downtime already expired.'); ?>
+<?php endif ?>
 </div>

From 57e0ce1b530d69d83254ff733345f2f27f07a54c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 3 Aug 2015 15:49:12 +0200
Subject: [PATCH 2808/2920] Comment Overview: Use $query->hasResult() instead
 of $query->count()

refs #9632
---
 .../application/views/scripts/list/comments.phtml      | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 00f2aeefc..ba05fb115 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -12,13 +12,6 @@
 </div>
 <?php endif ?>
 <div class="content">
-<?php
-
-if (count($comments) === 0) {
-    echo $this->translate('No comments found matching the filter') . '</div>';
-    return;
-}
-?>
   <table data-base-target="_next"
          class="action comments multiselect"
          data-icinga-multiselect-url="/icingaweb2/monitoring/comments/show"
@@ -91,4 +84,7 @@ if (count($comments) === 0) {
 <?php endforeach ?>
     </tbody>
   </table>
+<?php if (! $comments->hasResult()): ?>
+  <?= $this->translate('No comments found matching the filter'); ?>
+<?php endif ?>
 </div>

From f03b9e57699cbe187749ec45007299889e9a1a64 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 3 Aug 2015 16:06:21 +0200
Subject: [PATCH 2809/2920] Eventgrid: Use $query->hasResult() instead of
 $query->count()

* and do not use fetchAll()
* and do not use <? short tags
* and do not use curly braces if not absolutely necessary..

refs #9632
---
 .../controllers/ListController.php            |  2 +-
 .../views/scripts/list/eventgrid.phtml        | 30 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index d858751ec..3625043a6 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -368,7 +368,7 @@ class Monitoring_ListController extends Controller
         $this->view->filter = Filter::fromQuerystring((string) $this->params);
         $query->applyFilter($this->view->filter);
         $this->applyRestriction('monitoring/filter/objects', $query);
-        $this->view->summary = $query->getQuery()->fetchAll();
+        $this->view->summary = $query;
         $this->view->column = $form->getValue('state');
 //        $this->view->orientationBox = $orientationBox;
         $this->view->orientation = $orientation;
diff --git a/modules/monitoring/application/views/scripts/list/eventgrid.phtml b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
index 20016f9f4..37024b841 100644
--- a/modules/monitoring/application/views/scripts/list/eventgrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
@@ -15,11 +15,6 @@ if (! $this->compact): ?>
 <div class="content" data-base-target="_next">
 <?php
 
-if (count($summary) === 0) {
-    echo $this->translate('No state changes in the selected time period.') . '</div>';
-    return;
-}
-
 $settings = array(
     'cnt_up' => array(
         'tooltip' => $this->translate('%d hosts ok on %s'),
@@ -60,14 +55,6 @@ $settings = array(
     )
 );
 
-$from = intval($form->getValue('from', strtotime('3 months ago')));
-$to = intval($form->getValue('to', time()));
-
-// don't display more than ten years, or else this will get really slow
-if ($to - $from > 315360000) {
-    $from = $to - 315360000;
-}
-
 $data = array();
 foreach ($summary as $entry) {
     $day = $entry->day;
@@ -90,6 +77,19 @@ foreach ($summary as $entry) {
     );
 }
 
+if (! $summary->hasResult()) {
+    echo $this->translate('No state changes in the selected time period.') . '</div>';
+    return;
+}
+
+$from = intval($form->getValue('from', strtotime('3 months ago')));
+$to = intval($form->getValue('to', time()));
+
+// don't display more than ten years, or else this will get really slow
+if ($to - $from > 315360000) {
+    $from = $to - 315360000;
+}
+
 $f = new DateTime();
 $f->setTimestamp($from);
 $t = new DateTime();
@@ -117,11 +117,11 @@ for ($i = 0; $i < $diff->days; $i += $step) {
 }
 ?>
 <div style="width: 33.5em;">
-<? foreach (array_reverse($grids) as $key => $grid) { ?>
+<?php foreach (array_reverse($grids) as $key => $grid): ?>
     <div style=" <?= $this->orientation === 'horizontal' ? '' : 'display: inline-block; vertical-align: top; top; margin: 0.5em;' ?>">
         <?= $grid; ?>
         <?= $this->orientation === 'horizontal' ? '<br />' : '' ?>
     </div>
-<? } ?>
+<?php endforeach ?>
     </div>
 </div>

From 8a5b5390da9f39d9a67bc01b849826025a9b874f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 3 Aug 2015 16:09:42 +0200
Subject: [PATCH 2810/2920] Event Overview: Use $query->hasResult() instead of
 $query->count()

refs #9632
---
 .../application/views/scripts/list/eventhistory.phtml    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index ab9cb2331..ca44df469 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -12,12 +12,6 @@ if (! $this->compact): ?>
 </div>
 <?php endif ?>
 <div class="content">
-<?php
-if (count($history) === 0) {
-    echo $this->translate('No history events found matching the filter') . '</div>';
-    return;
-}
-?>
   <table data-base-target="_next" class="action">
     <tbody>
     <?php foreach ($history as $event): ?>
@@ -96,4 +90,7 @@ if (count($history) === 0) {
     <?php endforeach ?>
     </tbody>
   </table>
+<?php if (! $history->hasResult()): ?>
+  <?= $this->translate('No history events found matching the filter'); ?>
+<?php endif ?>
 </div>

From 7388db32416114a67f214f2cf0c1bd01ae8e045b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 3 Aug 2015 16:18:37 +0200
Subject: [PATCH 2811/2920] Groups: Use $query->hasResult() intead of
 $query->count()

refs #9632
---
 application/views/scripts/group/list.phtml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
index 1f693f152..8c8a8a2a0 100644
--- a/application/views/scripts/group/list.phtml
+++ b/application/views/scripts/group/list.phtml
@@ -26,7 +26,10 @@ if (! isset($backend)) {
     $reducible = $this->hasPermission('config/authentication/groups/remove') && $backend instanceof Reducible;
 }
 
-if (count($groups) > 0): ?>
+$firstRow = true;
+foreach ($groups as $group): ?>
+  <?php if ($firstRow): ?>
+    <?php $firstRow = false; ?>
 <table data-base-target="_next" class="action group-list alternating">
   <thead>
     <tr>
@@ -37,7 +40,7 @@ if (count($groups) > 0): ?>
     </tr>
   </thead>
   <tbody>
-  <?php foreach ($groups as $group): ?>
+  <?php endif ?>
     <tr>
       <td class="group-name"><?= $this->qlink($group->group_name, 'group/show', array(
         'backend'   => $backend->getName(),
@@ -62,7 +65,8 @@ if (count($groups) > 0): ?>
       </td>
      <?php endif ?>
     </tr>
-  <?php endforeach ?>
+<?php endforeach ?>
+<?php if ($groups->hasResult()): ?>
   </tbody>
 </table>
 <?php else: ?>

From d78f69368cad2c06cd5cb6393276c4c3723ee406 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 3 Aug 2015 16:19:00 +0200
Subject: [PATCH 2812/2920] Users: Use $query->hasResult() instead of
 $query->count()

refs #9632
---
 application/views/scripts/user/list.phtml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index 3430f7f4b..5d8d7b017 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -26,7 +26,10 @@ if (! isset($backend)) {
     $reducible = $this->hasPermission('config/authentication/users/remove') && $backend instanceof Reducible;
 }
 
-if (count($users) > 0): ?>
+$firstRow = true;
+foreach ($users as $user): ?>
+  <?php if ($firstRow): ?>
+    <?php $firstRow = false; ?>
 <table data-base-target="_next" class="action user-list alternating">
   <thead>
     <tr>
@@ -37,7 +40,7 @@ if (count($users) > 0): ?>
     </tr>
   </thead>
   <tbody>
-  <?php foreach ($users as $user): ?>
+  <?php endif ?>
     <tr>
       <td class="user-name"><?= $this->qlink($user->user_name, 'user/show', array(
         'backend'   => $backend->getName(),
@@ -62,7 +65,8 @@ if (count($users) > 0): ?>
       </td>
      <?php endif ?>
     </tr>
-  <?php endforeach ?>
+<?php endforeach ?>
+<?php if ($users->hasResult()): ?>
   </tbody>
 </table>
 <?php else: ?>

From 3b36009122aa10e9f405848db6f249465c0424e0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 3 Aug 2015 16:28:25 +0200
Subject: [PATCH 2813/2920] Group: Use $query->hasResult() instead of
 $query->count()

refs #9632
---
 application/views/scripts/group/show.phtml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/application/views/scripts/group/show.phtml b/application/views/scripts/group/show.phtml
index ed5c747d5..725f22a27 100644
--- a/application/views/scripts/group/show.phtml
+++ b/application/views/scripts/group/show.phtml
@@ -49,7 +49,12 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
 <?php endif ?>
 </div>
 <div class="content members" data-base-target="_next">
-<?php if (count($members) > 0): ?>
+<?php
+
+$firstRow = true;
+foreach ($members as $member): ?>
+<?php if ($firstRow): ?>
+  <?php $firstRow = false; ?>
   <table data-base-target="_next" class="action member-list">
     <thead>
       <tr>
@@ -60,7 +65,7 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
       </tr>
     </thead>
     <tbody>
-    <?php foreach ($members as $member): ?>
+  <?php endif ?>
       <tr>
         <td class="member-name"><?= $this->escape($member->user_name); ?></td>
        <?php if (isset($removeForm)): ?>
@@ -69,7 +74,8 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
         </td>
        <?php endif ?>
       </tr>
-    <?php endforeach ?>
+<?php endforeach ?>
+<?php if ($members->hasResult()): ?>
     </tbody>
   </table>
 <?php else: ?>

From 7bd8b4b19a6e4157f885a8c12db2b9caa79c4397 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 3 Aug 2015 16:28:43 +0200
Subject: [PATCH 2814/2920] User: Use $query->hasResult() instead of
 $query->count()

refs #9632
---
 application/views/scripts/user/show.phtml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index b592bd64c..a5b9850e1 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -52,7 +52,12 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
 <?php endif ?>
 </div>
 <div class="content memberships">
-<?php if (count($memberships) > 0): ?>
+<?php
+
+$firstRow = true;
+foreach ($memberships as $membership): ?>
+<?php if ($firstRow): ?>
+  <?php $firstRow = false; ?>
   <table data-base-target="_next" class="action membership-list alternating">
     <thead>
       <tr>
@@ -61,7 +66,7 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
       </tr>
     </thead>
     <tbody>
-    <?php foreach ($memberships as $membership): ?>
+<?php endif ?>
       <tr>
         <td class="membership-group">
          <?php if ($this->hasPermission('config/authentication/groups/show') && $membership->backend instanceof Selectable): ?>
@@ -86,7 +91,8 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
        <?php endif ?>
         </td>
       </tr>
-    <?php endforeach ?>
+<?php endforeach ?>
+<?php if ($memberships->hasResult()): ?>
     </tbody>
   </table>
 <?php else: ?>

From 54590bfaf175c4736db605c4bf7c3e18da4d4f14 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 3 Aug 2015 16:34:50 +0200
Subject: [PATCH 2815/2920] Host History: Use $query->hasResult() instead of
 $query->count()

refs #9632
---
 .../views/scripts/host/history.phtml          | 41 ++++++++-----------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/host/history.phtml b/modules/monitoring/application/views/scripts/host/history.phtml
index 36d43ee95..cd030f263 100644
--- a/modules/monitoring/application/views/scripts/host/history.phtml
+++ b/modules/monitoring/application/views/scripts/host/history.phtml
@@ -2,6 +2,19 @@
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
+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) . ']';
+}
+
 $self = $this;
 
 if (! $this->compact): ?>
@@ -16,29 +29,6 @@ if (! $this->compact): ?>
 </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): ?>
@@ -152,7 +142,10 @@ $output = $this->tickets ? preg_replace_callback(
           </div>
         </td>
       </tr>
-<?php endforeach; ?>
+    <?php endforeach; ?>
     </tbody>
   </table>
+<?php if (! $history->hasResult()): ?>
+  <?= $this->translate('No history events found matching the filter'); ?>
+<?php endif ?>
 </div>

From 2de761d8ec34913733e72706a6d217833bece005 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 3 Aug 2015 16:35:17 +0200
Subject: [PATCH 2816/2920] Service History: Use $query->hasResult() instead of
 $query->count()

refs #9632
---
 .../views/scripts/service/history.phtml       | 41 ++++++++-----------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/service/history.phtml b/modules/monitoring/application/views/scripts/service/history.phtml
index ac443c370..98e9bb408 100644
--- a/modules/monitoring/application/views/scripts/service/history.phtml
+++ b/modules/monitoring/application/views/scripts/service/history.phtml
@@ -1,6 +1,19 @@
 <?php
 use Icinga\Module\Monitoring\Object\Service;
 
+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) . ']';
+}
+
 $self = $this;
 
 if (! $this->compact): ?>
@@ -15,29 +28,6 @@ if (! $this->compact): ?>
 </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): ?>
@@ -134,7 +124,10 @@ $output = $this->tickets ? preg_replace_callback(
           </div>
         </td>
       </tr>
-<?php endforeach; ?>
+    <?php endforeach; ?>
     </tbody>
   </table>
+<?php if (! $history->hasResult()): ?>
+  <?= $this->translate('No history events found matching the filter'); ?>
+<?php endif ?>
 </div>
\ No newline at end of file

From ceb32679d8247a4eec3afaf2240023da529907d3 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 3 Aug 2015 16:52:50 +0200
Subject: [PATCH 2817/2920] RemoteInstanceForm: Fix the unhandled exception if
 no ...

..resources are available

* Now we only can use the ssh identity, if there is at least one ssh identity
resource exists

fixes #9517
---
 .../Config/Instance/RemoteInstanceForm.php    | 44 ++++++++++++++-----
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
index 244bf66d1..e290866cc 100644
--- a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php
@@ -52,24 +52,46 @@ class RemoteInstanceForm extends Form
         return $this;
     }
 
+    /**
+     * Check whether ssh identity resources exists or not
+     *
+     * @return boolean
+     */
+    public function hasResources()
+    {
+        $resourceConfig = ResourceFactory::getResourceConfigs();
+
+        foreach ($resourceConfig as $name => $resource) {
+            if ($resource->type === 'ssh') {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * (non-PHPDoc)
      * @see Form::createElements() For the method documentation.
      */
     public function createElements(array $formData = array())
     {
-        $useResource = isset($formData['use_resource']) ? $formData['use_resource'] : $this->getValue('use_resource');
+        $useResource = false;
 
-        $this->addElement(
-            'checkbox',
-            'use_resource',
-            array(
-                'label'         => $this->translate('Use SSH Identity'),
-                'description'   => $this->translate('Make use of the ssh identity resource'),
-                'autosubmit'    => true,
-                'ignore'        => true
-            )
-        );
+        if ($this->hasResources()) {
+            $useResource = isset($formData['use_resource'])
+                ? $formData['use_resource'] : $this->getValue('use_resource');
+
+            $this->addElement(
+                'checkbox',
+                'use_resource',
+                array(
+                    'label'         => $this->translate('Use SSH Identity'),
+                    'description'   => $this->translate('Make use of the ssh identity resource'),
+                    'autosubmit'    => true,
+                    'ignore'        => true
+                )
+            );
+        }
 
         if ($useResource) {
 

From 5ae21fd1965cb43b63f81d1c1ac7b7ff9dd9ac78 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 4 Aug 2015 12:48:53 +0200
Subject: [PATCH 2818/2920] doc: Set parameters from route explicitly

refs #9817
---
 modules/doc/library/Doc/DocController.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/modules/doc/library/Doc/DocController.php b/modules/doc/library/Doc/DocController.php
index 36abe6b10..10a9b1d40 100644
--- a/modules/doc/library/Doc/DocController.php
+++ b/modules/doc/library/Doc/DocController.php
@@ -9,6 +9,21 @@ use Icinga\Web\Controller;
 
 class DocController extends Controller
 {
+    /**
+     * {@inheritdoc}
+     */
+    protected function moduleInit()
+    {
+        // Our UrlParams object does not take parameters from custom routes into account which is why we have to set
+        // them explicitly
+        if ($this->hasParam('chapter')) {
+            $this->params->set('chapter', $this->getParam('chapter'));
+        }
+        if ($this->hasParam('moduleName')) {
+            $this->params->set('moduleName', $this->getParam('moduleName'));
+        }
+    }
+
     /**
      * Render a chapter
      *

From d88c628b6b7af6a16343ff1a52a7b5c5fb1e7d5b Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 4 Aug 2015 13:14:46 +0200
Subject: [PATCH 2819/2920] Escape section names before applying regex

refs #9530
---
 library/Icinga/File/Ini/IniEditor.php         |  4 +-
 .../library/Icinga/File/Ini/IniWriterTest.php | 37 +++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/File/Ini/IniEditor.php b/library/Icinga/File/Ini/IniEditor.php
index 00bea8df4..349fe5a79 100644
--- a/library/Icinga/File/Ini/IniEditor.php
+++ b/library/Icinga/File/Ini/IniEditor.php
@@ -143,7 +143,7 @@ class IniEditor
             if ($this->isSectionDeclaration($l)) {
                 return -1;
             }
-            if (preg_match('/^\s*' . $formatted . '\[\]\s*=/', $l) === 1) {
+            if (preg_match('/^\s*' . preg_quote($formatted, '/') . '\[\]\s*=/', $l) === 1) {
                 return $line;
             }
             if ($this->isPropertyDeclaration($l, array_merge($key, array($index)))) {
@@ -507,7 +507,7 @@ class IniEditor
     private function isSectionDeclaration($lineContent, $section = null)
     {
         if (isset($section)) {
-            return preg_match('/^\s*\[\s*' . $section . '\s*[\]:]/', $lineContent) === 1;
+            return preg_match('/^\s*\[\s*' . preg_quote(trim($section), '/') . '\s*[\]:]/', $lineContent) === 1;
         } else {
             return preg_match('/^\s*\[/', $lineContent) === 1;
         }
diff --git a/test/php/library/Icinga/File/Ini/IniWriterTest.php b/test/php/library/Icinga/File/Ini/IniWriterTest.php
index c38731cca..ee9c1719b 100644
--- a/test/php/library/Icinga/File/Ini/IniWriterTest.php
+++ b/test/php/library/Icinga/File/Ini/IniWriterTest.php
@@ -746,6 +746,43 @@ inkey' => 'blarg'
         );
     }
 
+    public function testSectionNameEscaping()
+    {
+        $config = <<<'EOD'
+[section 1]
+foo                 = 1337
+
+[section (with special chars)]
+foo                 = "baz"
+
+[section/as/arbitrary/path]
+foo                 = "nope"
+
+[section.with.dots.in.it]
+foo                 = "bar"
+EOD;
+        $target = $this->writeConfigToTemporaryFile($config);
+        $writer = new IniWriter(
+            array(
+                'config' => Config::fromArray(
+                    array(
+                        'section 1' => array('foo' => 1337),
+                        'section (with special chars)' => array('foo' => 'baz'),
+                        'section/as/arbitrary/path' => array('foo' => 'nope'),
+                        'section.with.dots.in.it' => array('foo' => 'bar')
+                    )
+                ),
+                'filename' => $target
+            )
+        );
+
+        $this->assertEquals(
+            trim($config),
+            trim($writer->render()),
+            'IniWriter does not handle special chars in section names properly.'
+        );
+    }
+
     /**
      * Write a INI-configuration string to a temporary file and return its path
      *

From 7095ad5bc72686305a738c329332a278f5ee1b11 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 4 Aug 2015 13:23:30 +0200
Subject: [PATCH 2820/2920] Improve ini editor and dashlet input validation

---
 application/forms/Dashboard/DashletForm.php | 16 +++++++++++++++-
 library/Icinga/File/Ini/IniEditor.php       |  4 ++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/application/forms/Dashboard/DashletForm.php b/application/forms/Dashboard/DashletForm.php
index d25001a23..1e31a938d 100644
--- a/application/forms/Dashboard/DashletForm.php
+++ b/application/forms/Dashboard/DashletForm.php
@@ -77,7 +77,21 @@ class DashletForm extends Form
             array(
                 'required'      => true,
                 'label'         => $this->translate('Dashlet Title'),
-                'description'   => $this->translate('Enter a title for the dashlet.')
+                'description'   => $this->translate('Enter a title for the dashlet.'),
+                'validators'    =>  array(
+                    array(
+                        'Regex',
+                        false,
+                        array(
+                            'pattern'  => '/^[^\\[\\]]+$/',
+                            'messages' => array(
+                                'regexNotMatch' => $this->translate(
+                                    'The name cannot contain \'[\' or \']\'.'
+                                )
+                            )
+                        )
+                    )
+                )
             )
         );
         $this->addElement(
diff --git a/library/Icinga/File/Ini/IniEditor.php b/library/Icinga/File/Ini/IniEditor.php
index 349fe5a79..6878e4166 100644
--- a/library/Icinga/File/Ini/IniEditor.php
+++ b/library/Icinga/File/Ini/IniEditor.php
@@ -2,6 +2,7 @@
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\File\Ini;
+use Icinga\Exception\ConfigurationError;
 
 /**
  * Edit the sections and keys of an ini in-place
@@ -176,6 +177,9 @@ class IniEditor
      */
     public function setSection($section, $extend = null)
     {
+        if (false !== strpos($section, '[') || false !== strpos($section, ']')) {
+            throw new ConfigurationError('Brackets not allowed in section: %s', $section);
+        }
         if (isset($extend)) {
             $decl = '[' . $section . ' : ' . $extend . ']';
         } else {

From 1c5bf36538fe359b49857163a727f32d45fb6deb Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Tue, 4 Aug 2015 13:25:17 +0200
Subject: [PATCH 2821/2920] Host(s)-/Service(s)Controller: Set the form backend

refs #9672
---
 modules/monitoring/application/controllers/HostController.php    | 1 +
 modules/monitoring/application/controllers/HostsController.php   | 1 +
 modules/monitoring/application/controllers/ServiceController.php | 1 +
 .../monitoring/application/controllers/ServicesController.php    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index a7659726e..ffc7fcdd3 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -167,6 +167,7 @@ class Monitoring_HostController extends MonitoredObjectController
         $this->assertPermission('monitoring/command/process-check-result');
 
         $form = new ProcessCheckResultCommandForm();
+        $form->setBackend($this->backend);
         $form->setTitle($this->translate('Submit Passive Host Check Result'));
         $this->handleCommandForm($form);
     }
diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 740b5cb5c..9a753adec 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -226,6 +226,7 @@ class Monitoring_HostsController extends Controller
         $this->assertPermission('monitoring/command/process-check-result');
 
         $form = new ProcessCheckResultCommandForm();
+        $form->setBackend($this->backend);
         $form->setTitle($this->translate('Submit Passive Host Check Results'));
         $this->handleCommandForm($form);
     }
diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php
index d9ed0d36b..cf7c4807c 100644
--- a/modules/monitoring/application/controllers/ServiceController.php
+++ b/modules/monitoring/application/controllers/ServiceController.php
@@ -122,6 +122,7 @@ class Monitoring_ServiceController extends MonitoredObjectController
         $this->assertPermission('monitoring/command/process-check-result');
 
         $form = new ProcessCheckResultCommandForm();
+        $form->setBackend($this->backend);
         $form->setTitle($this->translate('Submit Passive Service Check Result'));
         $this->handleCommandForm($form);
     }
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index faebcd11c..18c427f86 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -242,6 +242,7 @@ class Monitoring_ServicesController extends Controller
         $this->assertPermission('monitoring/command/process-check-result');
 
         $form = new ProcessCheckResultCommandForm();
+        $form->setBackend($this->backend);
         $form->setTitle($this->translate('Submit Passive Service Check Results'));
         $this->handleCommandForm($form);
     }

From dfbcc066a7157dda58427787aa577282c7b2417e Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Tue, 4 Aug 2015 13:28:32 +0200
Subject: [PATCH 2822/2920] MonitoringBackend: Implement the getProgramVersion
 method

refs #9672
---
 .../library/Monitoring/Backend/MonitoringBackend.php   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
index 012b7c110..6ee534b17 100644
--- a/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
@@ -331,4 +331,14 @@ class MonitoringBackend implements Selectable, Queryable, ConnectionInterface
         array_push($parts, 'Query', ucfirst(strtolower($query)) . 'Query');
         return implode('\\', $parts);
     }
+
+    /**
+     * Fetch and return the program version of the current instance
+     *
+     * @return string
+     */
+    public function getProgramVersion()
+    {
+        return $this->select()->from('programstatus', array('program_version'))->fetchOne();
+    }
 }

From 18f382e85e51e54cc9506a4e9d6fc94685216085 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Tue, 4 Aug 2015 13:30:46 +0200
Subject: [PATCH 2823/2920] ProcessCheckResultCommandForm: Use
 getHostMultiOptions method

refs #9672
---
 .../Object/ProcessCheckResultCommandForm.php  | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
index ec80a539f..6b566bbd6 100644
--- a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
@@ -52,11 +52,7 @@ class ProcessCheckResultCommandForm extends ObjectsCommandForm
                 'required'      => true,
                 'label'         => $this->translate('Status'),
                 'description'   => $this->translate('The state this check result should report'),
-                'multiOptions'  => $object->getType() === $object::TYPE_HOST ? array(
-                    ProcessCheckResultCommand::HOST_UP          => $this->translate('UP', 'icinga.state'),
-                    ProcessCheckResultCommand::HOST_DOWN        => $this->translate('DOWN', 'icinga.state'),
-                    ProcessCheckResultCommand::HOST_UNREACHABLE => $this->translate('UNREACHABLE', 'icinga.state')
-                ) : array(
+                'multiOptions'  => $object->getType() === $object::TYPE_HOST ? $this->getHostMultiOptions() : array(
                     ProcessCheckResultCommand::SERVICE_OK       => $this->translate('OK', 'icinga.state'),
                     ProcessCheckResultCommand::SERVICE_WARNING  => $this->translate('WARNING', 'icinga.state'),
                     ProcessCheckResultCommand::SERVICE_CRITICAL => $this->translate('CRITICAL', 'icinga.state'),
@@ -115,4 +111,23 @@ class ProcessCheckResultCommandForm extends ObjectsCommandForm
 
         return true;
     }
+
+    /**
+     * Returns the available host options based on the program version
+     *
+     * @return array
+     */
+    protected function getHostMultiOptions()
+    {
+        $options =  array(
+            ProcessCheckResultCommand::HOST_UP => $this->translate('UP', 'icinga.state'),
+            ProcessCheckResultCommand::HOST_DOWN => $this->translate('DOWN', 'icinga.state')
+        );
+
+        if (! preg_match('~^v2\.\d+\.\d+.*$~', $this->getBackend()->getProgramVersion())) {
+            $options[ProcessCheckResultCommand::HOST_UNREACHABLE] = $this->translate('UNREACHABLE', 'icinga.state');
+        }
+
+        return $options;
+    }
 }

From b5ae4599fd790eba178edcba644c3513501e2e0c Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Tue, 4 Aug 2015 13:54:30 +0200
Subject: [PATCH 2824/2920] ProcessCheckResultCommandForm: Use substr instead
 of pregmatch

refs #9672
---
 .../forms/Command/Object/ProcessCheckResultCommandForm.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
index 6b566bbd6..0239ab657 100644
--- a/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php
@@ -124,7 +124,7 @@ class ProcessCheckResultCommandForm extends ObjectsCommandForm
             ProcessCheckResultCommand::HOST_DOWN => $this->translate('DOWN', 'icinga.state')
         );
 
-        if (! preg_match('~^v2\.\d+\.\d+.*$~', $this->getBackend()->getProgramVersion())) {
+        if (substr($this->getBackend()->getProgramVersion(), 0, 2) !== 'v2') {
             $options[ProcessCheckResultCommand::HOST_UNREACHABLE] = $this->translate('UNREACHABLE', 'icinga.state');
         }
 

From c3fe14a205d5e4ecf91fc006a8744f38a965fa4f Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Tue, 4 Aug 2015 14:34:30 +0200
Subject: [PATCH 2825/2920] Modules/Manager: Fix that non-existent modules can
 be disabled

fixes #9374
---
 library/Icinga/Application/Modules/Manager.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php
index 8a3970841..f3bf4e016 100644
--- a/library/Icinga/Application/Modules/Manager.php
+++ b/library/Icinga/Application/Modules/Manager.php
@@ -281,7 +281,10 @@ class Manager
     public function disableModule($name)
     {
         if (! $this->hasEnabled($name)) {
-            return $this;
+            throw new ConfigurationError(
+                'Cannot disable module "%s". Module is not installed.',
+                $name
+            );
         }
 
         if (! is_writable($this->enableDir)) {

From ac31fb00c9a2b7261171e82575856900004d6af6 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Tue, 4 Aug 2015 15:08:30 +0200
Subject: [PATCH 2826/2920] dashboard/index: Fix the suggestion to enable
 modules

fixes #9790
---
 application/views/scripts/dashboard/index.phtml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/application/views/scripts/dashboard/index.phtml b/application/views/scripts/dashboard/index.phtml
index 8550d8a6b..1d561146f 100644
--- a/application/views/scripts/dashboard/index.phtml
+++ b/application/views/scripts/dashboard/index.phtml
@@ -11,10 +11,16 @@
     <div class="content">
         <h1><?= $this->escape($this->translate('Welcome to Icinga Web!')) ?></h1>
         <p>
-            <?= sprintf(
+        <?php if (! $this->hasPermission('config/modules')) {
+            echo $this->escape($this->translate(
+                'Currently there is no dashlet available. Please contact the administrator.'
+            ));
+        } else {
+            printf(
                 $this->escape($this->translate('Currently there is no dashlet available. This might change once you enabled some of the available %s.')),
                 $this->qlink($this->translate('modules'), 'config/modules')
-            ) ?>
+            );
+        } ?>
         </p>
     </div>
 <?php endif ?>

From b8ac2fccd48b2d48ed7b22d20ab0cf79464dc2ae Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 4 Aug 2015 15:12:47 +0200
Subject: [PATCH 2827/2920] Comment Overview: Provide a show more link when in
 compact view

refs #6677
---
 .../application/views/scripts/list/comments.phtml    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index ba05fb115..ccd95fabf 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -17,7 +17,7 @@
          data-icinga-multiselect-url="/icingaweb2/monitoring/comments/show"
          data-icinga-multiselect-data="comment_id">
     <tbody>
-    <?php foreach ($comments as $comment): ?>
+    <?php foreach ($comments->peekAhead($this->compact) as $comment): ?>
       <tr class="state invalid">
         <td class="state" style="width: 12em;">
           <?= $this->partial('partials/comment/comment-description.phtml', array('comment' => $comment)); ?>
@@ -86,5 +86,15 @@
   </table>
 <?php if (! $comments->hasResult()): ?>
   <?= $this->translate('No comments found matching the filter'); ?>
+<?php elseif ($comments->hasMore()): ?>
+  <?= $this->qlink(
+    $this->translate('Show More'),
+    $this->url()->without(array('view', 'limit')),
+    null,
+    array(
+      'data-base-target'    => '_next',
+      'class'               => 'pull-right'
+    )
+  ); ?>
 <?php endif ?>
 </div>

From 6017dce1cc47c87bc37a0b310b4d1bbc8ea5c011 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 4 Aug 2015 15:13:02 +0200
Subject: [PATCH 2828/2920] Contact Overview: Provide a show more link when in
 compact view

refs #6677
---
 .../application/views/scripts/list/contacts.phtml    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 6775fb480..211f0c649 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -8,7 +8,7 @@
 </div>
 <?php endif ?>
 <div data-base-target="_next" class="content contacts">
-    <?php foreach ($contacts as $contact): ?>
+    <?php foreach ($contacts->peekAhead($this->compact) as $contact): ?>
         <div class="contact">
             <?= $this->img('/static/gravatar', array('email' => $contact->contact_email)); ?>
             <strong><?= $this->qlink(
@@ -54,5 +54,15 @@
     <?php endif; ?>
     <?php if (! $contacts->hasResult()): ?>
         <?= $this->translate('No contacts found matching the filter'); ?>
+    <?php elseif ($contacts->hasMore()): ?>
+        <?= $this->qlink(
+            $this->translate('Show More'),
+            $this->url()->without(array('view', 'limit')),
+            null,
+            array(
+                'data-base-target'  => '_next',
+                'class'             => 'pull-right'
+            )
+        ); ?>
     <?php endif ?>
 </div>

From 5ec85df92317716b9304f4537cdbd6c13bd0ade8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 4 Aug 2015 15:13:17 +0200
Subject: [PATCH 2829/2920] Downtime Overview: Provide a show more link when in
 compact view

refs #6677
---
 .../application/views/scripts/list/downtimes.phtml   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index a2feafa52..50afd18bd 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -2,6 +2,8 @@
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
+$downtimes->peekAhead($this->compact);
+
 if (! $this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
@@ -137,5 +139,15 @@ if (! $this->compact): ?>
   </table>
 <?php if (! $downtimes->hasResult()): ?>
   <?= $this->translate('No downtimes found matching the filter, maybe the downtime already expired.'); ?>
+<?php elseif ($downtimes->hasMore()): ?>
+  <?= $this->qlink(
+    $this->translate('Show More'),
+    $this->url()->without(array('view', 'limit')),
+    null,
+    array(
+      'data-base-target'    => '_next',
+      'class'               => 'pull-right'
+    )
+  ); ?>
 <?php endif ?>
 </div>

From 916a88542a2cf8eb2dc3a5e807b7d9c94537320d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 4 Aug 2015 15:13:43 +0200
Subject: [PATCH 2830/2920] Event Overview: Provide a show more link when in
 compact view

refs #6677
---
 .../views/scripts/list/eventhistory.phtml            | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index ca44df469..d5bac69fb 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -2,6 +2,8 @@
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
+$history->peekAhead($this->compact);
+
 if (! $this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
@@ -92,5 +94,15 @@ if (! $this->compact): ?>
   </table>
 <?php if (! $history->hasResult()): ?>
   <?= $this->translate('No history events found matching the filter'); ?>
+<?php elseif ($history->hasMore()): ?>
+  <?= $this->qlink(
+    $this->translate('Show More'),
+    $this->url()->without(array('view', 'limit')),
+    null,
+    array(
+      'data-base-target'    => '_next',
+      'class'               => 'pull-right'
+    )
+  ); ?>
 <?php endif ?>
 </div>

From 66bf3d2eb972321ec42e270b1667981e8872512f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 4 Aug 2015 15:14:01 +0200
Subject: [PATCH 2831/2920] Hostgroup Overview: Provide a show more link when
 in compact view

refs #6677
---
 .../application/views/scripts/list/hostgroups.phtml  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index 27527591c..5c9eb7167 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -13,6 +13,7 @@ if (! $this->compact): ?>
 <div class="content">
 <?php
 
+$hostgroups->peekAhead($this->compact);
 $firstRow = true;
 foreach ($hostgroups as $h): ?>
 <?php if ($firstRow): ?>
@@ -467,6 +468,17 @@ if ($h->hosts_down_unhandled) {
 <?php if ($hostgroups->hasResult()): ?>
     </tbody>
   </table>
+<?php if ($hostgroups->hasMore()): ?>
+  <?= $this->qlink(
+    $this->translate('Show More'),
+    $this->url()->without(array('view', 'limit')),
+    null,
+    array(
+      'data-base-target'    => '_next',
+      'class'               => 'pull-right'
+    )
+  ); ?>
+<?php endif ?>
 <?php else: ?>
   <?= $this->translate('No hostgroups found matching the filter'); ?>
 <?php endif ?>

From 28e1b3119c002a757cb246b0bb7617342144b5ce Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 4 Aug 2015 15:14:10 +0200
Subject: [PATCH 2832/2920] Remove unused "extends"-code

---
 library/Icinga/File/Ini/IniEditor.php | 9 ++-------
 library/Icinga/File/Ini/IniWriter.php | 5 +----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/library/Icinga/File/Ini/IniEditor.php b/library/Icinga/File/Ini/IniEditor.php
index 6878e4166..e48fef3d6 100644
--- a/library/Icinga/File/Ini/IniEditor.php
+++ b/library/Icinga/File/Ini/IniEditor.php
@@ -173,18 +173,13 @@ class IniEditor
      * Create the section if it does not exist and set the properties
      *
      * @param string $section   The section name
-     * @param array $extend     The section that should be extended by this section
      */
-    public function setSection($section, $extend = null)
+    public function setSection($section)
     {
         if (false !== strpos($section, '[') || false !== strpos($section, ']')) {
             throw new ConfigurationError('Brackets not allowed in section: %s', $section);
         }
-        if (isset($extend)) {
-            $decl = '[' . $section . ' : ' . $extend . ']';
-        } else {
-            $decl = '[' . $section . ']';
-        }
+        $decl = '[' . $section . ']';
         $line = $this->getSectionLine($section);
         if ($line !== -1) {
             $this->deleteLine($line);
diff --git a/library/Icinga/File/Ini/IniWriter.php b/library/Icinga/File/Ini/IniWriter.php
index 5b565a6a0..f7df9b023 100644
--- a/library/Icinga/File/Ini/IniWriter.php
+++ b/library/Icinga/File/Ini/IniWriter.php
@@ -151,10 +151,7 @@ class IniWriter extends Zend_Config_Writer_FileAbstract
             if ($value instanceof Zend_Config) {
                 // The value is a nested Zend_Config, handle it recursively
                 if ($section === null) {
-                    // Update the section declaration
-                    $extends = $newconfig->getExtends();
-                    $extend = array_key_exists($key, $extends) ? $extends[$key] : null;
-                    $editor->setSection($key, $extend);
+                    $editor->setSection($key);
                 }
                 if ($oldvalue === null) {
                     $oldvalue = new Zend_Config(array());

From 723ff76c17670daa6469bc81943b0724b150a557 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 4 Aug 2015 15:15:08 +0200
Subject: [PATCH 2833/2920] Host Overview: Provide a show more link when in
 compact view

refs #6677
---
 .../application/views/scripts/list/hosts.phtml       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 4ff367fd8..4d9e2bbce 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -1,6 +1,8 @@
 <?php
 use Icinga\Module\Monitoring\Object\Host;
 
+$hosts->peekAhead($this->compact);
+
 if (! $this->compact): ?>
 <div class="controls separated">
   <?= $this->tabs; ?>
@@ -93,5 +95,15 @@ if (! $this->compact): ?>
 </table>
 <?php if (! $hosts->hasResult()): ?>
   <?= $this->translate('No hosts found matching the filter'); ?>
+<?php elseif ($hosts->hasMore()): ?>
+  <?= $this->qlink(
+    $this->translate('Show More'),
+    $this->url()->without(array('view', 'limit')),
+    null,
+    array(
+      'data-base-target'    => '_next',
+      'class'               => 'pull-right'
+    )
+  ); ?>
 <?php endif ?>
 </div>

From 792dc177dda93252af124aae6a1b1bccf0fac549 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 4 Aug 2015 15:15:22 +0200
Subject: [PATCH 2834/2920] Notification Overview: Provide a show more link
 when in compact view

refs #6677
---
 .../views/scripts/list/notifications.phtml           | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 877a810c6..292faa577 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -2,6 +2,8 @@
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
+$notifications->peekAhead($this->compact);
+
 if (! $this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
@@ -66,5 +68,15 @@ if (! $this->compact): ?>
     </table>
 <?php if (! $notifications->hasResult()): ?>
   <?= $this->translate('No notifications found matching the filter'); ?>
+<?php elseif ($notifications->hasMore()): ?>
+  <?= $this->qlink(
+    $this->translate('Show More'),
+    $this->url()->without(array('view', 'limit')),
+    null,
+    array(
+      'data-base-target'    => '_next',
+      'class'               => 'pull-right'
+    )
+  ); ?>
 <?php endif ?>
 </div>

From 4481224549c37b03fb0d0172a193455048c16c21 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 4 Aug 2015 15:16:16 +0200
Subject: [PATCH 2835/2920] Servicegroup Overview: Provide a show more link
 when in compact view

refs #6677
---
 .../views/scripts/list/servicegroups.phtml           | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index 41e52b833..3ff3d112d 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -10,6 +10,7 @@
 <div class="content">
 <?php
 
+$servicegroups->peekAhead($this->compact);
 $firstRow = true;
 foreach ($servicegroups as $s): ?>
 <?php if ($firstRow): ?>
@@ -301,6 +302,17 @@ foreach ($servicegroups as $s): ?>
 <?php if ($servicegroups->hasResult()): ?>
     </tbody>
   </table>
+<?php if ($servicegroups->hasMore()): ?>
+  <?= $this->qlink(
+    $this->translate('Show More'),
+    $this->url()->without(array('view', 'limit')),
+    null,
+    array(
+      'data-base-target'    => '_next',
+      'class'               => 'pull-right'
+    )
+  ); ?>
+<?php endif ?>
 <?php else: ?>
   <?= $this->translate('No servicegroups found matching the filter'); ?>
 <?php endif ?>

From bc91c38a85ded400ed64cd6f5cd329514f7a7973 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 4 Aug 2015 15:16:31 +0200
Subject: [PATCH 2836/2920] Service Overview: Provide a show more link when in
 compact view

refs #6677
---
 .../application/views/scripts/list/services.phtml     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index d5f68bbe5..e21f3801e 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -3,6 +3,7 @@ use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
 $selfUrl = 'monitoring/list/services';
+$services->peekAhead($this->compact);
 
 if (! $this->compact): ?>
 <div class="controls separated">
@@ -86,5 +87,15 @@ if (! $this->compact): ?>
 </table>
 <?php if (! $services->hasResult()): ?>
   <?= $this->translate('No services found matching the filter'); ?>
+<?php elseif ($services->hasMore()): ?>
+  <?= $this->qlink(
+    $this->translate('Show More'),
+    $this->url()->without(array('view', 'limit')),
+    null,
+    array(
+      'data-base-target'    => '_next',
+      'class'               => 'pull-right'
+    )
+  ); ?>
 <?php endif ?>
 </div>

From bc14e227ece26aea302af523c3b9b6523534b2b9 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 4 Aug 2015 15:17:21 +0200
Subject: [PATCH 2837/2920] Remove unused unit tests for extending sections

---
 .../library/Icinga/File/Ini/IniWriterTest.php | 214 ------------------
 1 file changed, 214 deletions(-)

diff --git a/test/php/library/Icinga/File/Ini/IniWriterTest.php b/test/php/library/Icinga/File/Ini/IniWriterTest.php
index ee9c1719b..c83995715 100644
--- a/test/php/library/Icinga/File/Ini/IniWriterTest.php
+++ b/test/php/library/Icinga/File/Ini/IniWriterTest.php
@@ -300,220 +300,6 @@ EOD
         );
     }
 
-    public function testWhetherSimplePropertiesOfExtendingSectionsAreInserted()
-    {
-        $this->markTestSkipped(
-            'Implementation has changed. There is no "Extend" functionality anymore in our Config object'
-        );
-        $target = $this->writeConfigToTemporaryFile('');
-        $config = Config::fromArray(
-            array(
-                'foo' => array('key1' => '1'),
-                'bar' => array('key2' => '2')
-            )
-        );
-        $config->setExtend('bar', 'foo');
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
-        $writer->write();
-
-        $newConfig = Config::fromIni($target);
-        $this->assertInstanceOf(
-            get_class($newConfig),
-            $newConfig->get('foo'),
-            'IniWriter does not insert extended sections'
-        );
-        $this->assertInstanceOf(
-            get_class($newConfig),
-            $newConfig->get('bar'),
-            'IniWriter does not insert extending sections'
-        );
-        $this->assertEquals(
-            '2',
-            $newConfig->get('bar')->get('key2'),
-            'IniWriter does not insert simple properties into extending sections'
-        );
-        $this->assertEquals(
-            '1',
-            $newConfig->get('foo')->get('key1'),
-            'IniWriter does not properly define extending sections'
-        );
-    }
-
-    /**
-     * @depends testWhetherSimplePropertiesOfExtendingSectionsAreInserted
-     */
-    public function testWhetherSimplePropertiesOfExtendingSectionsAreUpdated()
-    {
-        $this->markTestSkipped(
-            'Implementation has changed. There is no "Extend" functionality anymore in our Config object'
-        );
-        $target = $this->writeConfigToTemporaryFile(<<<'EOD'
-[foo]
-key1 = "1"
-
-[bar : foo]
-key2 = "2"
-EOD
-        );
-        $config = Config::fromArray(
-            array(
-                'foo' => array('key1' => '1'),
-                'bar' => array('key2' => '22')
-            )
-        );
-        $config->setExtend('bar', 'foo');
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
-        $writer->write();
-
-        $newConfig = Config::fromIni($target);
-        $this->assertEquals(
-            '22',
-            $newConfig->get('bar')->get('key2'),
-            'IniWriter does not update simple properties of extending sections'
-        );
-    }
-
-    /**
-     * @depends testWhetherSimplePropertiesOfExtendingSectionsAreInserted
-     */
-    public function testWhetherSimplePropertiesOfExtendingSectionsAreDeleted()
-    {
-        $this->markTestSkipped(
-            'Implementation has changed. There is no "Extend" functionality anymore in our Config object'
-        );
-        $target = $this->writeConfigToTemporaryFile(<<<'EOD'
-[foo]
-key1 = "1"
-
-[bar : foo]
-key2 = "2"
-EOD
-        );
-        $config = Config::fromArray(
-            array(
-                'foo' => array('key1' => '1'),
-                'bar' => array()
-            )
-        );
-        $config->setExtend('bar', 'foo');
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
-        $writer->write();
-
-        $newConfig = Config::fromIni($target);
-        $this->assertNull(
-            $newConfig->get('bar')->get('key2'),
-            'IniWriter does not delete simple properties of extending sections'
-        );
-    }
-
-    public function testWhetherNestedPropertiesOfExtendingSectionsAreInserted()
-    {
-        $this->markTestSkipped(
-            'Implementation has changed. There is no "Extend" functionality anymore in our Config object'
-        );
-        $target = $this->writeConfigToTemporaryFile('');
-        $config = Config::fromArray(
-            array(
-                'foo' => array('a' => array('b' => 'c')),
-                'bar' => array('d' => array('e' => 'f'))
-            )
-        );
-        $config->setExtend('bar', 'foo');
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
-        $writer->write();
-
-        $newConfig = Config::fromIni($target);
-        $this->assertInstanceOf(
-            get_class($newConfig),
-            $newConfig->get('foo'),
-            'IniWriter does not insert extended sections'
-        );
-        $this->assertInstanceOf(
-            get_class($newConfig),
-            $newConfig->get('bar'),
-            'IniWriter does not insert extending sections'
-        );
-        $this->assertInstanceOf(
-            get_class($newConfig),
-            $newConfig->get('bar')->get('d'),
-            'IniWriter does not insert nested properties into extending sections'
-        );
-        $this->assertEquals(
-            'f',
-            $newConfig->get('bar')->get('d')->get('e'),
-            'IniWriter does not insert nested properties into extending sections'
-        );
-        $this->assertEquals(
-            'c',
-            $newConfig->get('bar')->get('a')->get('b'),
-            'IniWriter does not properly define extending sections with nested properties'
-        );
-    }
-
-    /**
-     * @depends testWhetherNestedPropertiesOfExtendingSectionsAreInserted
-     */
-    public function testWhetherNestedPropertiesOfExtendingSectionsAreUpdated()
-    {
-        $target = $this->writeConfigToTemporaryFile(<<<'EOD'
-[foo]
-a.b = "c"
-
-[bar : foo]
-d.e = "f"
-EOD
-        );
-        $config = Config::fromArray(
-            array(
-                'foo' => array('a' => array('b' => 'c')),
-                'bar' => array('d' => array('e' => 'ff'))
-            )
-        );
-        $config->setExtend('bar', 'foo');
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
-        $writer->write();
-
-        $newConfig = Config::fromIni($target);
-        $this->assertEquals(
-            'ff',
-            $newConfig->get('bar')->get('d')->get('e'),
-            'IniWriter does not update nested properties of extending sections'
-        );
-    }
-
-    /**
-     * @depends testWhetherNestedPropertiesOfExtendingSectionsAreInserted
-     */
-    public function testWhetherNestedPropertiesOfExtendingSectionsAreDeleted()
-    {
-        $this->markTestSkipped(
-            'Implementation has changed. There is no "Extend" functionality anymore in our Config object'
-        );
-        $target = $this->writeConfigToTemporaryFile(<<<'EOD'
-[foo]
-a.b = "c"
-
-[bar : foo]
-d.e = "f"
-EOD
-        );
-        $config = Config::fromArray(
-            array(
-                'foo' => array('a' => array('b' => 'c')),
-                'bar' => array()
-            )
-        );
-        $config->setExtend('bar', 'foo');
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
-        $writer->write();
-
-        $newConfig = Config::fromIni($target);
-        $this->assertNull(
-            $newConfig->get('bar')->get('d'),
-            'IniWriter does not delete nested properties of extending sections'
-        );
-    }
-
     public function testWhetherSectionOrderIsUpdated()
     {
         $config = <<<'EOD'

From 15ac59268c3ebb29de47adf38ef8ff1471a2c4c9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 4 Aug 2015 15:25:01 +0200
Subject: [PATCH 2838/2920] Put a small margin around show more links

refs #6677
---
 .../monitoring/application/views/scripts/list/comments.phtml  | 2 +-
 .../monitoring/application/views/scripts/list/contacts.phtml  | 2 +-
 .../monitoring/application/views/scripts/list/downtimes.phtml | 2 +-
 .../application/views/scripts/list/eventhistory.phtml         | 2 +-
 .../application/views/scripts/list/hostgroups.phtml           | 2 +-
 modules/monitoring/application/views/scripts/list/hosts.phtml | 2 +-
 .../application/views/scripts/list/notifications.phtml        | 2 +-
 .../application/views/scripts/list/servicegroups.phtml        | 2 +-
 .../monitoring/application/views/scripts/list/services.phtml  | 2 +-
 public/css/icinga/pagination.less                             | 4 ++++
 10 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index ccd95fabf..3287f08e9 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -93,7 +93,7 @@
     null,
     array(
       'data-base-target'    => '_next',
-      'class'               => 'pull-right'
+      'class'               => 'pull-right show-more'
     )
   ); ?>
 <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 211f0c649..3e10197fb 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -61,7 +61,7 @@
             null,
             array(
                 'data-base-target'  => '_next',
-                'class'             => 'pull-right'
+                'class'             => 'pull-right show-more'
             )
         ); ?>
     <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 50afd18bd..7848efcd8 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -146,7 +146,7 @@ if (! $this->compact): ?>
     null,
     array(
       'data-base-target'    => '_next',
-      'class'               => 'pull-right'
+      'class'               => 'pull-right show-more'
     )
   ); ?>
 <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index d5bac69fb..47375c054 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -101,7 +101,7 @@ if (! $this->compact): ?>
     null,
     array(
       'data-base-target'    => '_next',
-      'class'               => 'pull-right'
+      'class'               => 'pull-right show-more'
     )
   ); ?>
 <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index 5c9eb7167..1e0b251ba 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -475,7 +475,7 @@ if ($h->hosts_down_unhandled) {
     null,
     array(
       'data-base-target'    => '_next',
-      'class'               => 'pull-right'
+      'class'               => 'pull-right show-more'
     )
   ); ?>
 <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 4d9e2bbce..8938d5703 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -102,7 +102,7 @@ if (! $this->compact): ?>
     null,
     array(
       'data-base-target'    => '_next',
-      'class'               => 'pull-right'
+      'class'               => 'pull-right show-more'
     )
   ); ?>
 <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 292faa577..30b3c5875 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -75,7 +75,7 @@ if (! $this->compact): ?>
     null,
     array(
       'data-base-target'    => '_next',
-      'class'               => 'pull-right'
+      'class'               => 'pull-right show-more'
     )
   ); ?>
 <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index 3ff3d112d..eab74364a 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -309,7 +309,7 @@ foreach ($servicegroups as $s): ?>
     null,
     array(
       'data-base-target'    => '_next',
-      'class'               => 'pull-right'
+      'class'               => 'pull-right show-more'
     )
   ); ?>
 <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index e21f3801e..b12e3176c 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -94,7 +94,7 @@ if (! $this->compact): ?>
     null,
     array(
       'data-base-target'    => '_next',
-      'class'               => 'pull-right'
+      'class'               => 'pull-right show-more'
     )
   ); ?>
 <?php endif ?>
diff --git a/public/css/icinga/pagination.less b/public/css/icinga/pagination.less
index 97acd31bc..b7dc6c606 100644
--- a/public/css/icinga/pagination.less
+++ b/public/css/icinga/pagination.less
@@ -62,3 +62,7 @@ ul.pagination {
   cursor: default;
 }
 
+a.show-more {
+  display: block;
+  margin: 0.5em;
+}
\ No newline at end of file

From 7403c678937239b47f1bc10ed626c55a436974ab Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 4 Aug 2015 15:28:18 +0200
Subject: [PATCH 2839/2920] monitoring: Default to Filter::matchAll() in the
 ObjectList

refs #9574
---
 modules/monitoring/library/Monitoring/Object/ObjectList.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Object/ObjectList.php b/modules/monitoring/library/Monitoring/Object/ObjectList.php
index 0b9575a22..f65f4f109 100644
--- a/modules/monitoring/library/Monitoring/Object/ObjectList.php
+++ b/modules/monitoring/library/Monitoring/Object/ObjectList.php
@@ -83,7 +83,7 @@ abstract class ObjectList implements Countable, IteratorAggregate, Filterable
     public function getFilter()
     {
         if ($this->filter === null) {
-            $this->filter = Filter::matchAny();
+            $this->filter = Filter::matchAll();
         }
 
         return $this->filter;

From 10e50842b2994fc214328b705c0bbf0b77687158 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 4 Aug 2015 15:28:51 +0200
Subject: [PATCH 2840/2920] monitoring: Apply restrictions before filtering for
 multiple hosts

refs #9574
---
 modules/monitoring/application/controllers/HostsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 9a753adec..675e639b2 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -27,8 +27,8 @@ class Monitoring_HostsController extends Controller
     public function init()
     {
         $hostList = new HostList($this->backend);
-        $hostList->setFilter(Filter::fromQueryString((string) $this->params));
         $this->applyRestriction('monitoring/filter/objects', $hostList);
+        $hostList->addFilter(Filter::fromQueryString((string) $this->params));
         $this->hostList = $hostList;
         $this->getTabs()->add(
             'show',

From cdd13bc3891f9571f3ea8e3a1492a31016dcf474 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 4 Aug 2015 15:30:07 +0200
Subject: [PATCH 2841/2920] monitoring: Apply restrictions before filtering for
 multiple services

refs #9574
---
 .../monitoring/application/controllers/ServicesController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index 18c427f86..ba56c6144 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -27,10 +27,10 @@ class Monitoring_ServicesController extends Controller
     public function init()
     {
         $serviceList = new ServiceList($this->backend);
-        $serviceList->setFilter(Filter::fromQueryString(
+        $this->applyRestriction('monitoring/filter/objects', $serviceList);
+        $serviceList->addFilter(Filter::fromQueryString(
             (string) $this->params->without(array('service_problem', 'service_handled', 'view'))
         ));
-        $this->applyRestriction('monitoring/filter/objects', $serviceList);
         $this->serviceList = $serviceList;
         $this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/services');
         $this->getTabs()->add(

From 064e821383ce9d687499a33870007954e37d1d53 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 4 Aug 2015 16:25:34 +0200
Subject: [PATCH 2842/2920] lib: Fix wrong count for queries having a group by
 clause

fixes #9828
---
 library/Icinga/Data/Db/DbQuery.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index aa8acf601..8bf57867e 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -333,10 +333,6 @@ class DbQuery extends SimpleQuery
     {
         // TODO: there may be situations where we should clone the "select"
         $count = $this->dbSelect();
-        $group = $this->getGroup();
-        if ($group) {
-            $count->group($group);
-        }
         $this->applyFilterSql($count);
         if ($this->useSubqueryCount || $this->group) {
             $count->columns($this->columns);

From 0e14cb48da1e484512b5934d4b4fcd9708cf819b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 4 Aug 2015 16:28:45 +0200
Subject: [PATCH 2843/2920] monitoring: Ignore restrictions if user has the
 wildcard restriction

resolves #9830
---
 modules/monitoring/library/Monitoring/Controller.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php
index c3449e01d..9d9e486cd 100644
--- a/modules/monitoring/library/Monitoring/Controller.php
+++ b/modules/monitoring/library/Monitoring/Controller.php
@@ -72,6 +72,9 @@ class Controller extends IcingaWebController
         ));
 
         foreach ($this->getRestrictions($restriction) as $filter) {
+            if ($filter === '*') {
+                return $view;
+            }
             try {
                 $restrictions->addFilter(Filter::fromQueryString($filter));
             } catch (QueryException $e) {

From ebd103f7ee39fd234ad191516acee3132d89bdcd Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Tue, 4 Aug 2015 16:43:33 +0200
Subject: [PATCH 2844/2920] js/icinga/utils: Implement fixedEncodeURIComponent
 method

* FYI: https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent

refs #9347
---
 public/js/icinga/utils.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/public/js/icinga/utils.js b/public/js/icinga/utils.js
index b447454e3..659be9ea9 100644
--- a/public/js/icinga/utils.js
+++ b/public/js/icinga/utils.js
@@ -307,6 +307,19 @@
         destroy: function () {
             this.urlHelper = null;
             this.icinga = null;
+        },
+
+        /**
+         * Encode the parenthesis too
+         *
+         * @param str {String} A component of a URI
+         *
+         * @returns {String} Encoded component
+         */
+        fixedEncodeURIComponent: function (str) {
+            return encodeURIComponent(str).replace(/[()]/g, function(c) {
+                return '%' + c.charCodeAt(0).toString(16);
+            });
         }
     };
 

From 3d846ea2705621a2008683b4484c5b40230cb35d Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Tue, 4 Aug 2015 16:45:22 +0200
Subject: [PATCH 2845/2920] js/actiontable: Fix the wrong parentheses encoding
 in multiselect

fixes #9347
---
 public/js/icinga/behavior/actiontable.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/js/icinga/behavior/actiontable.js b/public/js/icinga/behavior/actiontable.js
index 51a91e1d8..96c86ee04 100644
--- a/public/js/icinga/behavior/actiontable.js
+++ b/public/js/icinga/behavior/actiontable.js
@@ -239,13 +239,14 @@
             var self = this;
             var selections = this.selections();
             var queries = [];
+            var utils = this.icinga.utils;
             if (selections.length === 1) {
                 return $(selections[0]).attr('href');
             } else if (selections.length > 1 && self.hasMultiselection()) {
                 selections.each(function (i, el) {
                     var parts = [];
                     $.each(self.getRowData($(el)), function(key, value) {
-                        parts.push(encodeURIComponent(key) + '=' + encodeURIComponent(value));
+                        parts.push(utils.fixedEncodeURIComponent(key) + '=' + utils.fixedEncodeURIComponent(value));
                     });
                     queries.push('(' + parts.join('&') + ')');
                 });

From a0d5509f191ef79094b3841b8927ab249528efda Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 5 Aug 2015 10:54:14 +0200
Subject: [PATCH 2846/2920] DbQuery: Drop attribute $maxCount

It's not used anywhere and completely useless the way it's implemented.
---
 library/Icinga/Data/Db/DbQuery.php | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index 8bf57867e..b3f53cb1b 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -47,16 +47,6 @@ class DbQuery extends SimpleQuery
      */
     protected $useSubqueryCount = false;
 
-    /**
-     * Set the count maximum
-     *
-     * If the count maximum is set, count queries will not count more than that many rows. You should set this
-     * property only for really heavy queries.
-     *
-     * @var int
-     */
-    protected $maxCount;
-
     /**
      * Count query result
      *
@@ -339,9 +329,6 @@ class DbQuery extends SimpleQuery
             $columns = array('cnt' => 'COUNT(*)');
             return $this->db->select()->from($count, $columns);
         }
-        if ($this->maxCount !== null) {
-            return $this->db->select()->from($count->limit($this->maxCount));
-        }
 
         $count->columns(array('cnt' => 'COUNT(*)'));
         return $count;

From aa7adee21f4c97661b83140f57ba5ff40d7f18d2 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 5 Aug 2015 14:37:33 +0200
Subject: [PATCH 2847/2920] views/donwtime(s|-header): Fix that the Downtimes
 show "Starts in" ...

... for objects with non-problem state

refs #9266
---
 .../application/views/scripts/list/downtimes.phtml   |  6 ++++++
 .../scripts/partials/downtime/downtime-header.phtml  | 12 +++++++++---
 .../scripts/partials/downtime/downtimes-header.phtml |  6 ++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 7848efcd8..6a231b785 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -35,9 +35,15 @@ if (! $this->compact): ?>
     ?>
       <tr class="state <?= $stateName; ?><?= $downtime->is_in_effect ? ' handled' : ''; ?>">
         <td class="state">
+        <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
+          <strong><?= $this->translate('Started'); ?></strong>
+          <br>
+          Ends <?= $this->timeUntil($downtime->end, $this->compact) ?>
+        <?php else: ?>
           <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
           <br>
           <?= $this->timeUntil($downtime->is_in_effect ? $downtime->end : $downtime->start, $this->compact) ?>
+        <?php endif; ?>
         </td>
         <td>
         <?php if ($isService): ?>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
index 85bd06b5c..c80f8d473 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
@@ -1,9 +1,15 @@
 <table class="action">
   <tr class="state <?= $stateName; ?><?= $downtime->is_in_effect ? ' handled' : ''; ?>">
     <td class="state">
-      <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
-      <br>
-      <?= $this->timeUntil($downtime->is_in_effect ? $downtime->end : $downtime->start, $this->compact) ?>
+        <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
+            <strong><?= $this->translate('Started'); ?></strong>
+            <br>
+            Ends <?= $this->timeUntil($downtime->end, $this->compact) ?>
+        <?php else: ?>
+            <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
+            <br>
+            <?= $this->timeUntil($downtime->is_in_effect ? $downtime->end : $downtime->start, $this->compact) ?>
+        <?php endif; ?>
     </td>
     <td>
       <small>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index 2e657d63c..390a9954a 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -6,9 +6,15 @@
         } ?>
         <tr class="state <?= $downtime->stateText ?>">
           <td class="state">
+          <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
+            <strong><?= $this->translate('Started'); ?></strong>
+            <br>
+            Ends <?= $this->timeUntil($downtime->end, $this->compact) ?>
+          <?php else: ?>
             <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
             <br>
             <?= $this->timeUntil($downtime->is_in_effect ? $downtime->end : $downtime->start, $this->compact) ?>
+          <?php endif; ?>
           </td>
           <td class="name oneline">
             <?php if ($downtime->isService): ?>

From e2e169246229e7c66b0ef4f8fc98c5c1b15b3d1e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 5 Aug 2015 15:54:45 +0200
Subject: [PATCH 2848/2920] Wizard: Use IcingaException::describe() in the
 finish's log where appropriate

fixes #9791
---
 modules/monitoring/library/Monitoring/BackendStep.php    | 5 +++--
 modules/monitoring/library/Monitoring/InstanceStep.php   | 3 ++-
 modules/monitoring/library/Monitoring/SecurityStep.php   | 3 ++-
 modules/setup/library/Setup/Steps/AuthenticationStep.php | 7 ++++---
 modules/setup/library/Setup/Steps/DatabaseStep.php       | 3 ++-
 modules/setup/library/Setup/Steps/GeneralConfigStep.php  | 3 ++-
 modules/setup/library/Setup/Steps/ResourceStep.php       | 3 ++-
 modules/setup/library/Setup/Utils/EnableModuleStep.php   | 3 ++-
 8 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/BackendStep.php b/modules/monitoring/library/Monitoring/BackendStep.php
index 28d5a3db4..a6d03b0e5 100644
--- a/modules/monitoring/library/Monitoring/BackendStep.php
+++ b/modules/monitoring/library/Monitoring/BackendStep.php
@@ -6,6 +6,7 @@ namespace Icinga\Module\Monitoring;
 use Exception;
 use Icinga\Module\Setup\Step;
 use Icinga\Application\Config;
+use Icinga\Exception\IcingaException;
 
 class BackendStep extends Step
 {
@@ -151,7 +152,7 @@ class BackendStep extends Step
                 ),
                 Config::resolvePath('modules/monitoring/backends.ini')
             );
-            $report[] = sprintf(mt('setup', 'ERROR: %s'), $this->backendIniError->getMessage());
+            $report[] = sprintf(mt('setup', 'ERROR: %s'), IcingaException::describe($this->backendIniError));
         }
 
         if ($this->resourcesIniError === false) {
@@ -164,7 +165,7 @@ class BackendStep extends Step
                 mt('monitoring', 'Resource configuration could not be udpated: %s. An error occured:'),
                 Config::resolvePath('resources.ini')
             );
-            $report[] = sprintf(mt('setup', 'ERROR: %s'), $this->resourcesIniError->getMessage());
+            $report[] = sprintf(mt('setup', 'ERROR: %s'), IcingaException::describe($this->resourcesIniError));
         }
 
         return $report;
diff --git a/modules/monitoring/library/Monitoring/InstanceStep.php b/modules/monitoring/library/Monitoring/InstanceStep.php
index 8e39a9bf5..7aa1ef760 100644
--- a/modules/monitoring/library/Monitoring/InstanceStep.php
+++ b/modules/monitoring/library/Monitoring/InstanceStep.php
@@ -6,6 +6,7 @@ namespace Icinga\Module\Monitoring;
 use Exception;
 use Icinga\Module\Setup\Step;
 use Icinga\Application\Config;
+use Icinga\Exception\IcingaException;
 
 class InstanceStep extends Step
 {
@@ -98,7 +99,7 @@ class InstanceStep extends Step
                     ),
                     Config::resolvePath('modules/monitoring/instances.ini')
                 ),
-                sprintf(mt('setup', 'ERROR: %s'), $this->error->getMessage())
+                sprintf(mt('setup', 'ERROR: %s'), IcingaException::describe($this->error))
             );
         }
     }
diff --git a/modules/monitoring/library/Monitoring/SecurityStep.php b/modules/monitoring/library/Monitoring/SecurityStep.php
index 16f2dd4d4..cf22990cf 100644
--- a/modules/monitoring/library/Monitoring/SecurityStep.php
+++ b/modules/monitoring/library/Monitoring/SecurityStep.php
@@ -6,6 +6,7 @@ namespace Icinga\Module\Monitoring;
 use Exception;
 use Icinga\Module\Setup\Step;
 use Icinga\Application\Config;
+use Icinga\Exception\IcingaException;
 
 class SecurityStep extends Step
 {
@@ -76,7 +77,7 @@ class SecurityStep extends Step
                     ),
                     Config::resolvePath('modules/monitoring/config.ini')
                 ),
-                sprintf(mt('setup', 'ERROR: %s'), $this->error->getMessage())
+                sprintf(mt('setup', 'ERROR: %s'), IcingaException::describe($this->error))
             );
         }
     }
diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
index 4510f6a21..5c46e84a2 100644
--- a/modules/setup/library/Setup/Steps/AuthenticationStep.php
+++ b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -7,6 +7,7 @@ use Exception;
 use Icinga\Application\Config;
 use Icinga\Data\ConfigObject;
 use Icinga\Data\ResourceFactory;
+use Icinga\Exception\IcingaException;
 use Icinga\Authentication\User\DbUserBackend;
 use Icinga\Module\Setup\Step;
 
@@ -194,7 +195,7 @@ class AuthenticationStep extends Step
                 mt('setup', 'Authentication configuration could not be written to: %s. An error occured:'),
                 Config::resolvePath('authentication.ini')
             );
-            $report[] = sprintf(mt('setup', 'ERROR: %s'), $this->authIniError->getMessage());
+            $report[] = sprintf(mt('setup', 'ERROR: %s'), IcingaException::describe($this->authIniError));
         }
 
         if ($this->dbError === false) {
@@ -207,7 +208,7 @@ class AuthenticationStep extends Step
                 mt('setup', 'Unable to create account "%s". An error occured:'),
                 $this->data['adminAccountData']['username']
             );
-            $report[] = sprintf(mt('setup', 'ERROR: %s'), $this->dbError->getMessage());
+            $report[] = sprintf(mt('setup', 'ERROR: %s'), IcingaException::describe($this->dbError));
         }
 
         if ($this->permIniError === false) {
@@ -229,7 +230,7 @@ class AuthenticationStep extends Step
                 ),
                 $this->data['adminAccountData']['groupname']
             );
-            $report[] = sprintf(mt('setup', 'ERROR: %s'), $this->permIniError->getMessage());
+            $report[] = sprintf(mt('setup', 'ERROR: %s'), IcingaException::describe($this->permIniError));
         }
 
         return $report;
diff --git a/modules/setup/library/Setup/Steps/DatabaseStep.php b/modules/setup/library/Setup/Steps/DatabaseStep.php
index 9392fb294..faf324ab6 100644
--- a/modules/setup/library/Setup/Steps/DatabaseStep.php
+++ b/modules/setup/library/Setup/Steps/DatabaseStep.php
@@ -5,6 +5,7 @@ namespace Icinga\Module\Setup\Steps;
 
 use Exception;
 use PDOException;
+use Icinga\Exception\IcingaException;
 use Icinga\Module\Setup\Step;
 use Icinga\Module\Setup\Utils\DbTool;
 use Icinga\Module\Setup\Exception\SetupException;
@@ -253,7 +254,7 @@ class DatabaseStep extends Step
         } elseif ($this->error !== null) {
             $report = $this->messages;
             $report[] = mt('setup', 'Failed to fully setup the database. An error occured:');
-            $report[] = sprintf(mt('setup', 'ERROR: %s'), $this->error->getMessage());
+            $report[] = sprintf(mt('setup', 'ERROR: %s'), IcingaException::describe($this->error));
             return $report;
         }
     }
diff --git a/modules/setup/library/Setup/Steps/GeneralConfigStep.php b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
index 994517fd6..7924d87d0 100644
--- a/modules/setup/library/Setup/Steps/GeneralConfigStep.php
+++ b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
@@ -6,6 +6,7 @@ namespace Icinga\Module\Setup\Steps;
 use Exception;
 use Icinga\Application\Logger;
 use Icinga\Application\Config;
+use Icinga\Exception\IcingaException;
 use Icinga\Module\Setup\Step;
 
 class GeneralConfigStep extends Step
@@ -112,7 +113,7 @@ class GeneralConfigStep extends Step
                     mt('setup', 'General configuration could not be written to: %s. An error occured:'),
                     Config::resolvePath('config.ini')
                 ),
-                sprintf(mt('setup', 'ERROR: %s'), $this->error->getMessage())
+                sprintf(mt('setup', 'ERROR: %s'), IcingaException::describe($this->error))
             );
         }
     }
diff --git a/modules/setup/library/Setup/Steps/ResourceStep.php b/modules/setup/library/Setup/Steps/ResourceStep.php
index f2f20c750..de46a229d 100644
--- a/modules/setup/library/Setup/Steps/ResourceStep.php
+++ b/modules/setup/library/Setup/Steps/ResourceStep.php
@@ -5,6 +5,7 @@ namespace Icinga\Module\Setup\Steps;
 
 use Exception;
 use Icinga\Application\Config;
+use Icinga\Exception\IcingaException;
 use Icinga\Module\Setup\Step;
 
 class ResourceStep extends Step
@@ -143,7 +144,7 @@ class ResourceStep extends Step
                     mt('setup', 'Resource configuration could not be written to: %s. An error occured:'),
                     Config::resolvePath('resources.ini')
                 ),
-                sprintf(mt('setup', 'ERROR: %s'), $this->error->getMessage())
+                sprintf(mt('setup', 'ERROR: %s'), IcingaException::describe($this->error))
             );
         }
     }
diff --git a/modules/setup/library/Setup/Utils/EnableModuleStep.php b/modules/setup/library/Setup/Utils/EnableModuleStep.php
index 7c29e59f7..88f48ff80 100644
--- a/modules/setup/library/Setup/Utils/EnableModuleStep.php
+++ b/modules/setup/library/Setup/Utils/EnableModuleStep.php
@@ -5,6 +5,7 @@ namespace Icinga\Module\Setup\Utils;
 
 use Exception;
 use Icinga\Application\Icinga;
+use Icinga\Exception\IcingaException;
 use Icinga\Module\Setup\Step;
 
 class EnableModuleStep extends Step
@@ -57,7 +58,7 @@ class EnableModuleStep extends Step
         foreach ($this->moduleNames as $moduleName) {
             if (isset($this->errors[$moduleName])) {
                 $report[] = sprintf($failMessage, $moduleName);
-                $report[] = sprintf(mt('setup', 'ERROR: %s'), $this->errors[$moduleName]->getMessage());
+                $report[] = sprintf(mt('setup', 'ERROR: %s'), IcingaException::describe($this->errors[$moduleName]));
             } else {
                 $report[] = sprintf($okMessage, $moduleName);
             }

From 35ea3cc9eea672de3bee9ca394003ed451e74b4c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 5 Aug 2015 16:20:03 +0200
Subject: [PATCH 2849/2920] Wizard: Make it unambiguous what the first database
 configuration is for

fixes #9654
---
 .../setup/application/forms/DbResourcePage.php   |  4 ----
 modules/setup/library/Setup/WebWizard.php        | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php
index dd52730d3..6da2d03fc 100644
--- a/modules/setup/application/forms/DbResourcePage.php
+++ b/modules/setup/application/forms/DbResourcePage.php
@@ -19,10 +19,6 @@ class DbResourcePage extends Form
     public function init()
     {
         $this->setTitle($this->translate('Database Resource', 'setup.page.title'));
-        $this->addDescription($this->translate(
-            'Now please configure your database resource. Note that the database itself does not need to'
-            . ' exist at this time as it is going to be created once the wizard is about to be finished.'
-        ));
         $this->setValidatePartial(true);
     }
 
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index ef84e556d..daa7f399a 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -163,6 +163,14 @@ class WebWizard extends Wizard implements SetupWizard
             }
         /*} elseif ($page->getName() === 'setup_ldap_discovery_confirm') {
             $page->setResourceConfig($this->getPageData('setup_ldap_discovery'));*/
+        } elseif ($page->getName() === 'setup_auth_db_resource') {
+            $page->addDescription($this->translate(
+                'Now please configure the database resource where to store users and user groups.'
+            ));
+            $page->addDescription($this->translate(
+                'Note that the database itself does not need to exist at this time as'
+                . ' it is going to be created once the wizard is about to be finished.'
+            ));
         } elseif ($page->getName() === 'setup_usergroup_backend') {
             $page->setResourceConfig($this->getPageData('setup_ldap_resource'));
             $page->setBackendConfig($this->getPageData('setup_authentication_backend'));
@@ -187,6 +195,14 @@ class WebWizard extends Wizard implements SetupWizard
             $page->setSubjectTitle('Icinga Web 2');
             $page->setSummary($this->getSetup()->getSummary());
         } elseif ($page->getName() === 'setup_config_db_resource') {
+            $page->addDescription($this->translate(
+                'Now please configure the database resource where to store user preferences.'
+            ));
+            $page->addDescription($this->translate(
+                'Note that the database itself does not need to exist at this time as'
+                . ' it is going to be created once the wizard is about to be finished.'
+            ));
+
             $ldapData = $this->getPageData('setup_ldap_resource');
             if ($ldapData !== null && $request->getPost('name') === $ldapData['name']) {
                 $page->error(

From f8e2dc850cce5df87deae3fdb2844fe2c6487e87 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Wed, 5 Aug 2015 14:21:46 +0200
Subject: [PATCH 2850/2920] Drop IniEditor and clean up IniWriter

Replace the ini editor code with a new parser implementation that manipulates a DOM. Do not support capabillities that are no longer needed, like nested configurations, section inheritance, section-less properties.
---
 library/Icinga/Application/Config.php         |   7 +-
 library/Icinga/File/Ini/Dom/Comment.php       |  20 +
 library/Icinga/File/Ini/Dom/Directive.php     |  76 +++
 library/Icinga/File/Ini/Dom/Document.php      |  81 +++
 library/Icinga/File/Ini/Dom/Section.php       | 108 +++
 library/Icinga/File/Ini/IniEditor.php         | 624 ------------------
 library/Icinga/File/Ini/IniParser.php         | 217 ++++++
 library/Icinga/File/Ini/IniWriter.php         | 257 +++-----
 .../controllers/ModuleController.php          |   1 +
 .../library/Icinga/File/Ini/IniWriterTest.php | 496 ++++----------
 10 files changed, 754 insertions(+), 1133 deletions(-)
 create mode 100644 library/Icinga/File/Ini/Dom/Comment.php
 create mode 100644 library/Icinga/File/Ini/Dom/Directive.php
 create mode 100644 library/Icinga/File/Ini/Dom/Document.php
 create mode 100644 library/Icinga/File/Ini/Dom/Section.php
 delete mode 100644 library/Icinga/File/Ini/IniEditor.php
 create mode 100644 library/Icinga/File/Ini/IniParser.php

diff --git a/library/Icinga/Application/Config.php b/library/Icinga/Application/Config.php
index 02851b975..0538f01d4 100644
--- a/library/Icinga/Application/Config.php
+++ b/library/Icinga/Application/Config.php
@@ -359,11 +359,7 @@ class Config implements Countable, Iterator, Selectable
      */
     protected function getIniWriter($filePath = null, $fileMode = null)
     {
-        return new IniWriter(array(
-            'config' => $this,
-            'filename' => $filePath,
-            'filemode' => $fileMode
-        ));
+        return new IniWriter($this, $filePath, $fileMode);
     }
 
     /**
@@ -418,7 +414,6 @@ class Config implements Countable, Iterator, Selectable
                 static::resolvePath('modules/' . $modulename . '/' . $configname . '.ini')
             );
         }
-
         return $moduleConfigs[$configname];
     }
 
diff --git a/library/Icinga/File/Ini/Dom/Comment.php b/library/Icinga/File/Ini/Dom/Comment.php
new file mode 100644
index 000000000..9cd9e416f
--- /dev/null
+++ b/library/Icinga/File/Ini/Dom/Comment.php
@@ -0,0 +1,20 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\File\Ini\Dom;
+
+class Comment
+{
+    /**
+     * @var string
+     */
+    public $content;
+
+    /**
+     * @return string
+     */
+    public function render()
+    {
+        return ';' . $this->content;
+    }
+}
diff --git a/library/Icinga/File/Ini/Dom/Directive.php b/library/Icinga/File/Ini/Dom/Directive.php
new file mode 100644
index 000000000..9d090ee63
--- /dev/null
+++ b/library/Icinga/File/Ini/Dom/Directive.php
@@ -0,0 +1,76 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\File\Ini\Dom;
+
+class Directive
+{
+    /**
+     * @var string
+     */
+    protected $key;
+
+    /**
+     * @var string
+     */
+    protected $value;
+
+    /**
+     * @var array
+     */
+    public $commentsPre;
+
+    /**
+     * @var string
+     */
+    public $commentPost;
+
+    /**
+     * @param   string    $key
+     *
+     * @throws  Exception
+     */
+    public function __construct($key)
+    {
+        $this->key = trim(str_replace("\n", ' ', $key));
+        if (strlen($this->key) < 1) {
+            throw new Exception(sprintf('Ini parser error: empty key.'));
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+
+    /**
+     * @param string    $value
+     */
+    public function setValue($value)
+    {
+        $this->value = trim(str_replace("\n", ' ', $value));
+    }
+
+    /**
+     * @return string
+     */
+    public function render()
+    {
+        $str = '';
+        if (! empty ($this->commentsPre)) {
+            $comments = array();
+            foreach ($this->commentsPre as $comment) {
+                $comments[] = $comment->render();
+            }
+            $str = implode(PHP_EOL, $comments) . PHP_EOL;
+        }
+        $str .= sprintf('%s = "%s"', $this->key, $this->value);
+        if (isset ($this->commentPost)) {
+            $str .= ' ' . $this->commentPost->render();
+        }
+        return $str;
+    }
+}
diff --git a/library/Icinga/File/Ini/Dom/Document.php b/library/Icinga/File/Ini/Dom/Document.php
new file mode 100644
index 000000000..eca296f2a
--- /dev/null
+++ b/library/Icinga/File/Ini/Dom/Document.php
@@ -0,0 +1,81 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\File\Ini\Dom;
+
+class Document
+{
+    /**
+     * @var array
+     */
+    protected $sections = array();
+
+    /**
+     * @var array
+     */
+    public $commentsDangling;
+
+    /**
+     * @param Section $section
+     */
+    public function addSection(Section $section)
+    {
+        $this->sections[$section->getName()] = $section;
+    }
+
+    /**
+     * @param   string  $name
+     *
+     * @return  bool
+     */
+    public function hasSection($name)
+    {
+        return isset($this->sections[$name]);
+    }
+
+    /**
+     * @param   string  $name
+     *
+     * @return Section
+     */
+    public function getSection($name)
+    {
+        return $this->sections[$name];
+    }
+
+    /**
+     * @param string  $name
+     * @param Section $section
+     *
+     * @return Section
+     */
+    public function setSection($name, Section $section)
+    {
+        return $this->sections[$name] = $section;
+    }
+
+    /**
+     * @param string $name
+     */
+    public function removeSection($name)
+    {
+        unset ($this->sections[$name]);
+    }
+
+    /**
+     * @return string
+     */
+    public function render()
+    {
+        foreach ($this->sections as $section) {
+            $sections []=  $section->render();
+        }
+        $str = implode(PHP_EOL, $sections);
+        if (! empty($this->commentsDangling)) {
+            foreach ($this->commentsDangling as $comment) {
+                $str .= PHP_EOL . $comment->render();
+            }
+        }
+        return $str;
+    }
+}
diff --git a/library/Icinga/File/Ini/Dom/Section.php b/library/Icinga/File/Ini/Dom/Section.php
new file mode 100644
index 000000000..0ae9b689c
--- /dev/null
+++ b/library/Icinga/File/Ini/Dom/Section.php
@@ -0,0 +1,108 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\File\Ini\Dom;
+
+class Section
+{
+    /**
+     * @var string
+     *
+    protected $name;
+
+    /**
+     * @var array
+     */
+    protected $directives = array();
+
+    /**
+     * @var array
+     */
+    public $commentsPre;
+
+    /**
+     * @var string
+     */
+    public $commentPost;
+
+    /**
+     * @param   string      $name
+     *
+     * @throws  Exception
+     */
+    public function __construct($name)
+    {
+        $this->name = trim(str_replace("\n", ' ', $name));
+        if (strlen($this->name) < 1) {
+            throw new Exception(sprintf('Ini parser error: empty section identifier'));
+        }
+    }
+
+    /**
+     * @param Directive $directive
+     */
+    public function addDirective(Directive $directive)
+    {
+        $this->directives[$directive->getKey()] = $directive;
+    }
+
+    /**
+     * @param string    $key
+     */
+    public function removeDirective($key)
+    {
+        unset ($this->directives[$key]);
+    }
+
+    /**
+     * @param   string  $key
+     *
+     * @return  bool
+     */
+    public function hasDirective($key)
+    {
+        return isset($this->directives[$key]);
+    }
+
+    /**
+     * @param $key  string
+     *
+     * @return Directive
+     */
+    public function getDirective($key)
+    {
+        return $this->directives[$key];
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function render()
+    {
+        $dirs = '';
+        $i = 0;
+        foreach ($this->directives as $directive) {
+            $dirs .= (($i++ > 0 && ! empty($directive->commentsPre)) ? PHP_EOL : '') . $directive->render() . PHP_EOL;
+        }
+        $cms = '';
+        if (! empty($this->commentsPre)) {
+            foreach ($this->commentsPre as $comment) {
+                $comments[] = $comment->render();
+            }
+            $cms = implode(PHP_EOL, $comments) . PHP_EOL;
+        }
+        $post = '';
+        if (isset($this->commentPost)) {
+            $post = ' ' . $this->commentPost->render();
+        }
+        return $cms . sprintf('[%s]', $this->name) . $post . PHP_EOL . $dirs;
+    }
+}
diff --git a/library/Icinga/File/Ini/IniEditor.php b/library/Icinga/File/Ini/IniEditor.php
deleted file mode 100644
index e48fef3d6..000000000
--- a/library/Icinga/File/Ini/IniEditor.php
+++ /dev/null
@@ -1,624 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\File\Ini;
-use Icinga\Exception\ConfigurationError;
-
-/**
- * Edit the sections and keys of an ini in-place
- */
-class IniEditor
-{
-    /**
-     * The text that is edited
-     *
-     * @var array
-     */
-    private $text;
-
-    /**
-     * The symbol that is used to separate keys
-     *
-     * @var string
-     */
-    private $nestSeparator = '.';
-
-    /**
-     * The indentation level of the comments
-     *
-     * @var string
-     */
-    private $commentIndentation;
-
-    /**
-     * The indentation level of the values
-     *
-     * @var string
-     */
-    private $valueIndentation;
-
-    /**
-     * The number of new lines between sections
-     *
-     * @var number
-     */
-    private $sectionSeparators;
-
-    /**
-     * Create a new IniEditor
-     *
-     * @param string $content   The content of the ini as string
-     * @param array  $options   Optional formatting options used when changing the ini file
-     *                          * valueIndentation:     The indentation level of the values
-     *                          * commentIndentation:   The indentation level of the comments
-     *                          * sectionSeparators:    The amount of newlines between sections
-     */
-    public function __construct(
-        $content,
-        array $options = array()
-    ) {
-        $this->text = explode(PHP_EOL, $content);
-        $this->valueIndentation = array_key_exists('valueIndentation', $options)
-            ? $options['valueIndentation'] : 19;
-        $this->commentIndentation = array_key_exists('commentIndentation', $options)
-            ? $options['commentIndentation'] : 43;
-        $this->sectionSeparators = array_key_exists('sectionSeparators', $options)
-            ? $options['sectionSeparators'] : 1;
-    }
-
-    /**
-     * Set the value of the given key.
-     *
-     * @param array $key         The key to set
-     * @param string $value      The value to set
-     * @param array $section     The section to insert to.
-     */
-    public function set(array $key, $value, $section = null)
-    {
-        $line = $this->getKeyLine($key, $section);
-        if ($line === -1) {
-            $this->insert($key, $value, $section);
-        } else {
-            $content = $this->formatKeyValuePair($key, $value);
-            $this->updateLine($line, $content);
-        }
-    }
-
-    /**
-     * Reset the value of the given array element
-     *
-     * @param array $key        The key of the array value
-     * @param array $section    The section of the array.
-     */
-    public function resetArrayElement(array $key, $section = null)
-    {
-        $line = $this->getArrayElement($key, $section);
-        if ($line !== -1) {
-            $this->deleteLine($line);
-        }
-    }
-
-    /**
-     * Set the value for an array element
-     *
-     * @param array $key            The key of the property
-     * @param string $value         The value of the property
-     * @param array $section        The section to use
-     */
-    public function setArrayElement(array $key, $value, $section = null)
-    {
-        $line = $this->getArrayElement($key, $section);
-        if ($line !== -1) {
-            if (isset($section)) {
-                $this->updateLine($line, $this->formatKeyValuePair($key, $value));
-            } else {
-                /*
-                 * Move into new section to avoid ambiguous configurations
-                 */
-                $section = $key[0];
-                unset($key[0]);
-                $this->deleteLine($line);
-                $this->setSection($section);
-                $this->insert($key, $value, $section);
-            }
-        } else {
-            $this->insert($key, $value, $section);
-        }
-    }
-
-    /**
-     * Get the line of an array element
-     *
-     * @param array $key            The key of the property.
-     * @param mixed $section        The section to use
-     *
-     * @return int                  The line of the array element.
-     */
-    private function getArrayElement(array $key, $section = null)
-    {
-        $line = isset($section) ? $this->getSectionLine($section) + 1 : 0;
-        $index = array_pop($key);
-        $formatted = $this->formatKey($key);
-        for (; $line < count($this->text); $line++) {
-            $l = $this->text[$line];
-            if ($this->isSectionDeclaration($l)) {
-                return -1;
-            }
-            if (preg_match('/^\s*' . preg_quote($formatted, '/') . '\[\]\s*=/', $l) === 1) {
-                return $line;
-            }
-            if ($this->isPropertyDeclaration($l, array_merge($key, array($index)))) {
-                return $line;
-            }
-        }
-        return -1;
-    }
-
-    /**
-     * When it exists, set the key back to null
-     *
-     * @param array $key          The key to reset
-     * @param array $section      The section of the key
-     */
-    public function reset(array $key, $section = null)
-    {
-        $line = $this->getKeyLine($key, $section);
-        if ($line === -1) {
-            return;
-        }
-        $this->deleteLine($line);
-    }
-
-    /**
-     * Create the section if it does not exist and set the properties
-     *
-     * @param string $section   The section name
-     */
-    public function setSection($section)
-    {
-        if (false !== strpos($section, '[') || false !== strpos($section, ']')) {
-            throw new ConfigurationError('Brackets not allowed in section: %s', $section);
-        }
-        $decl = '[' . $section . ']';
-        $line = $this->getSectionLine($section);
-        if ($line !== -1) {
-            $this->deleteLine($line);
-            $this->insertAtLine($line, $decl);
-        } else {
-            $line = $this->getLastLine();
-            $this->insertAtLine($line, $decl);
-        }
-    }
-
-    /**
-     * Refresh the section order of the ini file
-     *
-     * @param array $order  An array containing the section names in the new order
-     *                      Example: array(0 => 'FirstSection', 1 => 'SecondSection')
-     */
-    public function refreshSectionOrder(array $order)
-    {
-        $sections = $this->createSectionMap($this->text);
-        /*
-         * Move section-less properties to the start of the ordered text
-         */
-        $orderedText = array();
-        foreach ($sections['[section-less]'] as $line) {
-            array_push($orderedText, $line);
-        }
-        /*
-         * Reorder the sections
-         */
-        $len = count($order);
-        for ($i = 0; $i < $len; $i++) {
-            if (array_key_exists($i, $order)) {
-                /*
-                 * Append the lines of the section to the end of the
-                 * ordered text
-                 */
-                foreach ($sections[$order[$i]] as $line) {
-                    array_push($orderedText, $line);
-                }
-            }
-        }
-        $this->text = $orderedText;
-    }
-
-    /**
-     * Create a map of sections to lines of a given ini file
-     *
-     * @param array $text           The text split up in lines
-     *
-     * @return array $sectionMap    A map containing all sections as arrays of lines. The array of section-less
-     *                              lines will be available using they key '[section-less]' which is no valid
-     *                              section declaration because it contains brackets.
-     */
-    private function createSectionMap($text)
-    {
-        $sections = array('[section-less]' => array());
-        $section = '[section-less]';
-        $len = count($text);
-        for ($i = 0; $i < $len; $i++) {
-            if ($this->isSectionDeclaration($text[$i])) {
-                $newSection = $this->getSectionFromDeclaration($this->text[$i]);
-                $sections[$newSection] = array();
-
-                /*
-                 * Remove comments 'glued' to the new section from the old
-                 * section array and put them into the new section.
-                 */
-                $j = $i - 1;
-                $comments = array();
-                while ($j >= 0 && $this->isComment($this->text[$j])) {
-                    array_push($comments, array_pop($sections[$section]));
-                    $j--;
-                }
-                $comments = array_reverse($comments);
-                foreach ($comments as $comment) {
-                    array_push($sections[$newSection], $comment);
-                }
-
-                $section = $newSection;
-            }
-            array_push($sections[$section], $this->text[$i]);
-        }
-        return $sections;
-    }
-
-    /**
-     * Extract the section name from a section declaration
-     *
-     * @param String $declaration    The section declaration
-     *
-     * @return string   The section name
-     */
-    private function getSectionFromDeclaration($declaration)
-    {
-        $tmp = preg_split('/(\[|\]|:)/', $declaration);
-        return trim($tmp[1]);
-    }
-
-    /**
-     * Remove a section declaration
-     *
-     * @param string $section  The section name
-     */
-    public function removeSection($section)
-    {
-        $line = $this->getSectionLine($section);
-        if ($line !== -1) {
-            $this->deleteLine($line);
-        }
-    }
-
-    /**
-     * Insert the key at the end of the corresponding section
-     *
-     * @param array $key        The key to insert
-     * @param mixed $value      The value to insert
-     * @param array $section    The key to insert
-     */
-    private function insert(array $key, $value, $section = null)
-    {
-        $line = $this->getSectionEnd($section);
-        $content = $this->formatKeyValuePair($key, $value);
-        $this->insertAtLine($line, $content);
-    }
-
-    /**
-     * Get the edited text
-     *
-     * @return string The edited text
-     */
-    public function getText()
-    {
-        $this->normalizeSectionSpacing();
-
-        // trim leading and trailing whitespaces from generated file
-        $txt = trim(implode(PHP_EOL, $this->text)) . PHP_EOL;
-
-        // replace linebreaks, unless they preceed a comment or a section
-        return preg_replace("/\n[\n]*([^;\[])/", "\n$1", $txt);
-    }
-
-    /**
-     * normalize section spacing according to the current settings
-     */
-    private function normalizeSectionSpacing()
-    {
-        $i = count($this->text) - 1;
-        for (; $i > 0; $i--) {
-            $line = $this->text[$i];
-            if ($this->isSectionDeclaration($line) && $i > 0) {
-                $i--;
-                $line = $this->text[$i];
-                // ignore comments that are glued to the section declaration
-                while ($i > 0 && $this->isComment($line)) {
-                    $i--;
-                    $line = $this->text[$i];
-                }
-                // remove whitespaces between the sections
-                while ($i > 0 && preg_match('/^\s*$/', $line) === 1) {
-                    $this->deleteLine($i);
-                    $i--;
-                    $line = $this->text[$i];
-                }
-                // refresh section separators
-                if ($i !== 0 && $this->sectionSeparators > 0) {
-                    $this->insertAtLine($i + 1, str_repeat(PHP_EOL, $this->sectionSeparators - 1));
-                }
-            }
-        }
-    }
-
-    /**
-     * Insert the text at line $lineNr
-     *
-     * @param $lineNr   The line nr the inserted line should have
-     * @param $toInsert The text that will be inserted
-     */
-    private function insertAtLine($lineNr, $toInsert)
-    {
-        $this->text = IniEditor::insertIntoArray($this->text, $lineNr, $toInsert);
-    }
-
-    /**
-     * Update the line $lineNr
-     *
-     * @param int       $lineNr     The line number of the target line
-     * @param string    $content    The new line content
-     */
-    private function updateLine($lineNr, $content)
-    {
-        $comment = $this->getComment($this->text[$lineNr]);
-        $comment = trim($comment);
-        if (strlen($comment) > 0) {
-            $comment = ' ; ' . $comment;
-            $content = str_pad($content, $this->commentIndentation) . $comment;
-        }
-        $this->text[$lineNr] = $content;
-    }
-
-    /**
-     * Get the comment from the given line
-     *
-     * @param $lineContent  The content of the line
-     *
-     * @return string       The extracted comment
-     */
-    private function getComment($lineContent)
-    {
-        /*
-         * Remove all content in double quotes that is not behind a semicolon, recognizing
-         * escaped double quotes inside the string
-         */
-        $cleaned = preg_replace('/^[^;"]*"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"/s', '', $lineContent);
-
-        $matches = explode(';', $cleaned, 2);
-        return array_key_exists(1, $matches) ? $matches[1] : '';
-    }
-
-    /**
-     * Delete the line $lineNr
-     *
-     * @param $lineNr The lineNr starting at 0
-     */
-    private function deleteLine($lineNr)
-    {
-        $this->text = $this->removeFromArray($this->text, $lineNr);
-    }
-
-    /**
-     * Format a key-value pair to an INI file-entry
-     *
-     * @param array     $key            The key to format
-     * @param string    $value          The value to format
-     *
-     * @return string                   The formatted key-value pair
-     */
-    private function formatKeyValuePair(array $key, $value)
-    {
-        return str_pad($this->formatKey($key), $this->valueIndentation) . ' = ' . $this->formatValue($value);
-    }
-
-    /**
-     * Format a key to an INI key
-     *
-     * @param   array $key        the key array to format
-     *
-     * @return  string
-     */
-    private function formatKey(array $key)
-    {
-        foreach ($key as $i => $separator) {
-            $key[$i] = $this->sanitize($separator);
-        }
-        return implode($this->nestSeparator, $key);
-    }
-
-    /**
-     * Get the first line after the given $section
-     *
-     * @param $section  The name of the section
-     *
-     * @return int      The line number of the section
-     */
-    private function getSectionEnd($section = null)
-    {
-        $i = 0;
-        $started = isset($section) ? false : true;
-        foreach ($this->text as $line) {
-            if ($started && $this->isSectionDeclaration($line)) {
-                if ($i === 0) {
-                    return $i;
-                }
-                /*
-                 * ignore all comments 'glued' to the next section, to allow section
-                 * comments in front of sections
-                 */
-                while ($i > 0 && $this->isComment($this->text[$i - 1])) {
-                    $i--;
-                }
-                return $i;
-            } elseif ($this->isSectionDeclaration($line, $section)) {
-                $started = true;
-            }
-            $i++;
-        }
-        if (!$started) {
-            return -1;
-        }
-        return $i;
-    }
-
-    /**
-     * Check if the given line contains only a comment
-     */
-    private function isComment($line)
-    {
-        return preg_match('/^\s*;/', $line) === 1;
-    }
-
-    /**
-     * Check if the line contains the property declaration for a key
-     *
-     * @param string $lineContent   The content of the line
-     * @param array $key            The key this declaration is supposed to have
-     *
-     * @return boolean              True, when the lineContent is a property declaration
-     */
-    private function isPropertyDeclaration($lineContent, array $key)
-    {
-        return preg_match(
-            '/^\s*' . preg_quote($this->formatKey($key), '/') . '\s*=\s*/',
-            $lineContent
-        ) === 1;
-    }
-
-    /**
-     * Check if the given line contains a section declaration
-     *
-     * @param $lineContent      The content of the line
-     * @param string $section   The optional section name that will be assumed
-     *
-     * @return bool             True, when the lineContent is a section declaration
-     */
-    private function isSectionDeclaration($lineContent, $section = null)
-    {
-        if (isset($section)) {
-            return preg_match('/^\s*\[\s*' . preg_quote(trim($section), '/') . '\s*[\]:]/', $lineContent) === 1;
-        } else {
-            return preg_match('/^\s*\[/', $lineContent) === 1;
-        }
-    }
-
-    /**
-     * Get the line where the section begins
-     *
-     * @param $section  The section
-     *
-     * @return int      The line number
-     */
-    private function getSectionLine($section)
-    {
-        $i = 0;
-        foreach ($this->text as $line) {
-            if ($this->isSectionDeclaration($line, $section)) {
-                return $i;
-            }
-            $i++;
-        }
-        return -1;
-    }
-
-    /**
-     * Get the line number where the given key occurs
-     *
-     * @param array $keys   The key and its parents
-     * @param $section      The section of the key
-     *
-     * @return int          The line number
-     */
-    private function getKeyLine(array $keys, $section = null)
-    {
-        $key = implode($this->nestSeparator, $keys);
-        $inSection = isset($section) ? false : true;
-        $i = 0;
-        foreach ($this->text as $line) {
-            if ($inSection && $this->isSectionDeclaration($line)) {
-                return -1;
-            }
-            if ($inSection && $this->isPropertyDeclaration($line, $keys)) {
-                return $i;
-            }
-            if (!$inSection && $this->isSectionDeclaration($line, $section)) {
-                $inSection = true;
-            }
-            $i++;
-        }
-        return -1;
-    }
-
-    /**
-     * Get the last line number occurring in the text
-     *
-     * @return  The line number of the last line
-     */
-    private function getLastLine()
-    {
-        return count($this->text);
-    }
-
-    /**
-     * Insert a new element into a specific position of an array
-     *
-     * @param $array    The array to use
-     * @param $pos      The target position
-     * @param $element  The element to insert
-     *
-     * @return array    The changed array
-     */
-    private static function insertIntoArray($array, $pos, $element)
-    {
-        array_splice($array, $pos, 0, $element);
-        return $array;
-    }
-
-    /**
-     * Remove an element from an array
-     *
-     * @param $array    The array to use
-     * @param $pos      The position to remove
-     *
-     * @return array    The altered array
-     */
-    private function removeFromArray($array, $pos)
-    {
-        unset($array[$pos]);
-        return array_values($array);
-    }
-
-    /**
-     * Prepare a value for INI
-     *
-     * @param $value    The value of the string
-     *
-     * @return string   The formatted value
-     *
-     * @throws Zend_Config_Exception
-     */
-    private function formatValue($value)
-    {
-        if (is_integer($value) || is_float($value)) {
-            return $value;
-        } elseif (is_bool($value)) {
-            return ($value ? 'true' : 'false');
-        }
-        return '"' . str_replace('"', '\"', $this->sanitize($value)) . '"';
-    }
-
-    private function sanitize($value)
-    {
-        return str_replace("\n", '', $value);
-    }
-}
diff --git a/library/Icinga/File/Ini/IniParser.php b/library/Icinga/File/Ini/IniParser.php
new file mode 100644
index 000000000..4f9813689
--- /dev/null
+++ b/library/Icinga/File/Ini/IniParser.php
@@ -0,0 +1,217 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\File\Ini;
+
+use Icinga\File\Ini\Dom\Section;
+use Icinga\File\Ini\Dom\Comment;
+use Icinga\File\Ini\Dom\Document;
+use Icinga\File\Ini\Dom\Directive;
+use Icinga\Application\Logger;
+use Icinga\Exception\ConfigurationError;
+
+class IniParser
+{
+    const LINE_START = 0;
+    const SECTION = 1;
+    const DIRECTIVE_KEY = 4;
+    const DIRECTIVE_VALUE_START = 5;
+    const DIRECTIVE_VALUE = 6;
+    const DIRECTIVE_VALUE_QUOTED = 7;
+    const COMMENT = 8;
+    const COMMENT_END = 9;
+    const LINE_END = 10;
+
+    private static function throwParseError($message, $line)
+    {
+        throw new ConfigurationError(sprintf('Ini parser error: %s. (l. %d)', $message, $line));
+    }
+
+    /**
+     * Read the ini file contained in a string and return a mutable DOM that can be used
+     * to change the content of an INI file.
+     *
+     * @param $str                  A string containing the whole ini file
+     *
+     * @return Document             The mutable DOM object.
+     * @throws ConfigurationError   In case the file is not parseable
+     */
+    public static function parseIni($str)
+    {
+        $doc = new Document();
+        $sec = null;
+        $dir = null;
+        $coms = array();
+        $state = self::LINE_START;
+        $token = '';
+        $line = 0;
+
+        for ($i = 0; $i < strlen($str); $i++) {
+            $s = $str[$i];
+            switch ($state) {
+                case self::LINE_START:
+                    if (ctype_space($s)) {
+                        continue;
+                    }
+                    switch ($s) {
+                        case '[':
+                            $state = self::SECTION;
+                            break;
+                        case ';':
+                            $state = self::COMMENT;
+                            break;
+                        default:
+                            $state = self::DIRECTIVE_KEY;
+                            $token = $s;
+                            break;
+                    }
+                    break;
+
+                case self::SECTION:
+                    if ($s === "\n") {
+                        self::throwParseError('Unterminated SECTION', $line);
+                    } if ($s !== ']') {
+                        $token .= $s;
+                    } else {
+                        $sec = new Section($token);
+                        $sec->commentsPre = $coms;
+                        $doc->addSection($sec);
+                        $dir = null;
+                        $coms = array();
+
+                        $state = self::LINE_END;
+                        $token = '';
+                    }
+                    break;
+
+                case self::DIRECTIVE_KEY:
+                    if ($s !== '=') {
+                        $token .= $s;
+                    } else {
+                        $dir = new Directive($token);
+                        $dir->commentsPre = $coms;
+
+                        if (isset($sec)) {
+                            $sec->addDirective($dir);
+                        } else {
+                            Logger::warning(sprintf(
+                                'Ini parser warning: section-less directive "%s" ignored. (l. %d)',
+                                $token,
+                                $line
+                            ));
+                        }
+
+                        $coms = array();
+                        $state = self::DIRECTIVE_VALUE_START;
+                        $token = '';
+                    }
+                    break;
+
+                case self::DIRECTIVE_VALUE_START:
+                    if (ctype_space($s)) {
+                        continue;
+                    } elseif ($s === '"') {
+                        $state = self::DIRECTIVE_VALUE_QUOTED;
+                    } else {
+                        $state = self::DIRECTIVE_VALUE;
+                        $token = $s;
+                    }
+                    break;
+
+                case self::DIRECTIVE_VALUE:
+                    if ($s === "\n" || $s === ";") {
+                        $dir->setValue($token);
+                        $token = '';
+
+                        if ($s === "\n") {
+                            $state = self::LINE_START;
+                            $line ++;
+                        } elseif ($s === ';') {
+                            $state = self::COMMENT;
+                        }
+                    } else {
+                        $token .= $s;
+                    }
+                    break;
+
+                case self::DIRECTIVE_VALUE_QUOTED:
+                    if ($s === "\n") {
+                        self::throwParseError('Unterminated DIRECTIVE_VALUE_QUOTED', $line);
+                    } elseif ($s !== '"') {
+                        $token .= $s;
+                    } else {
+                        $dir->setValue($token);
+                        $token = '';
+                        $state = self::LINE_END;
+                    }
+                    break;
+
+                case self::COMMENT:
+                case self::COMMENT_END:
+                    if ($s !== "\n") {
+                        $token .= $s;
+                    } else {
+                        $com = new Comment();
+                        $com->content = $token;
+                        $token = '';
+
+                        // Comments at the line end belong to the current line's directive or section. Comments
+                        // on empty lines belong to the next directive that shows up.
+                        if ($state === self::COMMENT_END) {
+                            if (isset($dir)) {
+                                $dir->commentPost = $com;
+                            } else {
+                                $sec->commentPost = $com;
+                            }
+                        } else {
+                            $coms[] = $com;
+                        }
+                        $state = self::LINE_START;
+                        $line ++;
+                    }
+                    break;
+
+                case self::LINE_END:
+                    if ($s === "\n") {
+                        $state = self::LINE_START;
+                        $line ++;
+                    } elseif ($s === ';') {
+                        $state = self::COMMENT_END;
+                    }
+                    break;
+            }
+        }
+
+        // process the last token
+        switch ($state) {
+            case self::COMMENT:
+            case self::COMMENT_END:
+                $com = new Comment();
+                $com->content = $token;
+                if ($state === self::COMMENT_END) {
+                    if (isset($dir)) {
+                        $dir->commentPost = $com;
+                    } else {
+                        $sec->commentPost = $com;
+                    }
+                } else {
+                    $coms[] = $com;
+                }
+                break;
+
+            case self::DIRECTIVE_VALUE:
+                $dir->setValue($token);
+                $sec->addDirective($dir);
+                break;
+
+            case self::DIRECTIVE_VALUE_QUOTED:
+            case self::DIRECTIVE_KEY:
+            case self::SECTION:
+                self::throwParseError('File ended in unterminated state ' . $state, $line);
+        }
+        if (! empty($coms)) {
+            $doc->commentsDangling = $coms;
+        }
+        return $doc;
+    }
+}
diff --git a/library/Icinga/File/Ini/IniWriter.php b/library/Icinga/File/Ini/IniWriter.php
index f7df9b023..f6ad56680 100644
--- a/library/Icinga/File/Ini/IniWriter.php
+++ b/library/Icinga/File/Ini/IniWriter.php
@@ -3,16 +3,19 @@
 
 namespace Icinga\File\Ini;
 
-use Zend_Config;
-use Zend_Config_Ini;
+use Icinga\Application\Logger;
+use Icinga\Data\ConfigObject;
+use Icinga\Exception\ProgrammingError;
+use Icinga\File\Ini\Dom\Directive;
+use Icinga\File\Ini\Dom\Document;
+use Icinga\File\Ini\Dom\Section;
 use Zend_Config_Exception;
-use Zend_Config_Writer_FileAbstract;
 use Icinga\Application\Config;
 
 /**
  * A INI file adapter that respects the file structure and the comments of already existing ini files
  */
-class IniWriter extends Zend_Config_Writer_FileAbstract
+class IniWriter
 {
     /**
      * Stores the options
@@ -21,148 +24,137 @@ class IniWriter extends Zend_Config_Writer_FileAbstract
      */
     protected $options;
 
+    /**
+     * The configuration object to write
+     *
+     * @var Config
+     */
+    protected $config;
+
     /**
      * The mode to set on new files
      *
      * @var int
      */
-    public static $fileMode = 0660;
+    protected $fileMode;
+
+    /**
+     * The path to write to
+     *
+     * @var string
+     */
+    protected $filename;
 
     /**
      * Create a new INI writer
      *
-     * @param array $options   Supports all options of Zend_Config_Writer and additional options:
-     *                          * filemode:             The mode to set on new files
-     *                          * valueIndentation:     The indentation level of the values
-     *                          * commentIndentation:   The indentation level of the comments
-     *                          * sectionSeparators:    The amount of newlines between sections
+     * @param Config    $config    The configuration to write
+     * @param string    $filename  The file name to write to
+     * @param int       $filemode  Octal file persmissions
      *
      * @link http://framework.zend.com/apidoc/1.12/files/Config.Writer.html#\Zend_Config_Writer
      */
-    public function __construct(array $options = null)
+    public function __construct(Config $config, $filename, $filemode = 0660, $options = array())
     {
-        if (isset($options['config']) && $options['config'] instanceof Config) {
-            // As this class inherits from Zend_Config_Writer_FileAbstract we must
-            // not pass the config directly as it needs to be of type Zend_Config
-            $options['config'] = new Zend_Config($options['config']->toArray(), true);
-        }
-
+        $this->config = $config;
+        $this->filename = $filename;
+        $this->fileMode = $filemode;
         $this->options = $options;
-        parent::__construct($options);
     }
 
     /**
-     * Render the Zend_Config into a config file string
+     * Render the Zend_Config into a config filestring
      *
      * @return  string
      */
     public function render()
     {
-        if (file_exists($this->_filename)) {
-            $oldconfig = new Zend_Config_Ini($this->_filename);
-            $content = trim(file_get_contents($this->_filename));
+        if (file_exists($this->filename)) {
+            $oldconfig = Config::fromIni($this->filename);
+            $content = trim(file_get_contents($this->filename));
         } else {
-            $oldconfig = new Zend_Config(array());
+            $oldconfig = Config::fromArray(array());
             $content = '';
         }
-
-        $newconfig = $this->_config;
-        $editor = new IniEditor($content, $this->options);
-        $this->diffConfigs($oldconfig, $newconfig, $editor);
-        $this->updateSectionOrder($newconfig, $editor);
-        return $editor->getText();
+        $doc = IniParser::parseIni($content);
+        $this->diffPropertyUpdates($this->config, $doc);
+        $this->diffPropertyDeletions($oldconfig, $this->config, $doc);
+        $doc = $this->updateSectionOrder($this->config, $doc);
+        return $doc->render();
     }
 
     /**
      * Write configuration to file and set file mode in case it does not exist yet
      *
      * @param string $filename
-     * @param Zend_Config $config
      * @param bool $exclusiveLock
+     *
+     * @throws Zend_Config_Exception
      */
-    public function write($filename = null, Zend_Config $config = null, $exclusiveLock = null)
+    public function write($filename = null, $exclusiveLock = false)
     {
-        $filePath = $filename !== null ? $filename : $this->_filename;
+        $filePath = isset($filename) ? $filename : $this->filename;
         $setMode = false === file_exists($filePath);
 
-        parent::write($filename, $config, $exclusiveLock);
+        if (file_put_contents($filePath, $this->render(), $exclusiveLock ? LOCK_EX : 0) === false) {
+            throw new Zend_Config_Exception('Could not write to file "' . $filePath . '"');
+        }
 
         if ($setMode) {
-            $mode = isset($this->options['filemode']) ? $this->options['filemode'] : static::$fileMode;
-            if (is_int($mode) && false === @chmod($filePath, $mode)) {
+            // file was newly created
+            $mode = $this->fileMode;
+            if (is_int($this->fileMode) && false === @chmod($filePath, $this->fileMode)) {
                 throw new Zend_Config_Exception(sprintf('Failed to set file mode "%o" on file "%s"', $mode, $filePath));
             }
         }
     }
 
-    /**
-     * Create a property diff and apply the changes to the editor
-     *
-     * @param   Zend_Config     $oldconfig      The config representing the state before the change
-     * @param   Zend_Config     $newconfig      The config representing the state after the change
-     * @param   IniEditor       $editor         The editor that should be used to edit the old config file
-     * @param   array           $parents        The parent keys that should be respected when editing the config
-     */
-    protected function diffConfigs(
-        Zend_Config $oldconfig,
-        Zend_Config $newconfig,
-        IniEditor $editor,
-        array $parents = array()
-    ) {
-        $this->diffPropertyUpdates($oldconfig, $newconfig, $editor, $parents);
-        $this->diffPropertyDeletions($oldconfig, $newconfig, $editor, $parents);
-    }
-
     /**
      * Update the order of the sections in the ini file to match the order of the new config
+     *
+     * @return Document     A new document with the changed section order applied
      */
-    protected function updateSectionOrder(Zend_Config $newconfig, IniEditor $editor)
+    protected function updateSectionOrder(Config $newconfig, Document $oldDoc)
     {
-        $order = array();
-        foreach ($newconfig as $key => $value) {
-            if ($value instanceof Zend_Config) {
-                array_push($order, $key);
-            }
+        $doc = new Document();
+        $doc->commentsDangling = $oldDoc->commentsDangling;
+        foreach ($newconfig->toArray() as $section => $directives) {
+            $doc->addSection($oldDoc->getSection($section));
         }
-        $editor->refreshSectionOrder($order);
+        return $doc;
     }
 
     /**
      * Search for created and updated properties and use the editor to create or update these entries
      *
-     * @param Zend_Config   $oldconfig  The config representing the state before the change
-     * @param Zend_Config   $newconfig  The config representing the state after the change
-     * @param IniEditor     $editor     The editor that should be used to edit the old config file
-     * @param array         $parents    The parent keys that should be respected when editing the config
+     * @param Config     $newconfig  The config representing the state after the change
+     * @param Document   $doc
+     *
+     * @throws ProgrammingError
      */
-    protected function diffPropertyUpdates(
-        Zend_Config $oldconfig,
-        Zend_Config $newconfig,
-        IniEditor $editor,
-        array $parents = array()
-    ) {
-        // The current section. This value is null when processing the section-less root element
-        $section = empty($parents) ? null : $parents[0];
-        // Iterate over all properties in the new configuration file and search for changes
-        foreach ($newconfig as $key => $value) {
-            $oldvalue = $oldconfig->get($key);
-            $nextParents = array_merge($parents, array($key));
-            $keyIdentifier = empty($parents) ? array($key) : array_slice($nextParents, 1, null, true);
-            if ($value instanceof Zend_Config) {
-                // The value is a nested Zend_Config, handle it recursively
-                if ($section === null) {
-                    $editor->setSection($key);
-                }
-                if ($oldvalue === null) {
-                    $oldvalue = new Zend_Config(array());
-                }
-                $this->diffConfigs($oldvalue, $value, $editor, $nextParents);
+    protected function diffPropertyUpdates(Config $newconfig, Document $doc)
+    {
+        foreach ($newconfig->toArray() as $section => $directives) {
+            if (! is_array($directives)) {
+                Logger::warning('Section-less property ' . (string)$directives . ' was ignored.');
+                continue;
+            }
+            if (!$doc->hasSection($section)) {
+                $domSection = new Section($section);
+                $doc->addSection($domSection);
             } else {
-                // The value is a plain value, use the editor to set it
-                if (is_numeric($key)) {
-                    $editor->setArrayElement($keyIdentifier, $value, $section);
+                $domSection = $doc->getSection($section);
+            }
+            foreach ($directives as $key => $value) {
+                if ($value instanceof ConfigObject) {
+                    throw new ProgrammingError('Cannot diff recursive configs');
+                }
+                if ($domSection->hasDirective($key)) {
+                    $domSection->getDirective($key)->setValue($value);
                 } else {
-                    $editor->set($keyIdentifier, $value, $section);
+                    $dir = new Directive($key);
+                    $dir->setValue($value);
+                    $domSection->addDirective($dir);
                 }
             }
         }
@@ -171,68 +163,35 @@ class IniWriter extends Zend_Config_Writer_FileAbstract
     /**
      * Search for deleted properties and use the editor to delete these entries
      *
-     * @param Zend_Config   $oldconfig  The config representing the state before the change
-     * @param Zend_Config   $newconfig  The config representing the state after the change
-     * @param IniEditor     $editor     The editor that should be used to edit the old config file
-     * @param array         $parents    The parent keys that should be respected when editing the config
+     * @param Config    $oldconfig  The config representing the state before the change
+     * @param Config    $newconfig  The config representing the state after the change
+     * @param Document  $doc
+     *
+     * @throws ProgrammingError
      */
-    protected function diffPropertyDeletions(
-        Zend_Config $oldconfig,
-        Zend_Config $newconfig,
-        IniEditor $editor,
-        array $parents = array()
-    ) {
-        // The current section. This value is null when processing the section-less root element
-        $section = empty($parents) ? null : $parents[0];
-
-        // Iterate over all properties in the old configuration file and search for deleted properties
-        foreach ($oldconfig as $key => $value) {
-            if ($newconfig->get($key) === null) {
-                $nextParents = array_merge($parents, array($key));
-                $keyIdentifier = empty($parents) ? array($key) : array_slice($nextParents, 1, null, true);
-                foreach ($this->getPropertyIdentifiers($value, $keyIdentifier) as $propertyIdentifier) {
-                    $editor->reset($propertyIdentifier, $section);
+    protected function diffPropertyDeletions(Config $oldconfig, Config $newconfig, Document $doc)
+    {
+        // Iterate over all properties in the old configuration file and remove those that don't
+        // exist in the new config
+        foreach ($oldconfig->toArray() as $section => $directives) {
+            if (! is_array($directives)) {
+                Logger::warning('Section-less property ' . (string)$directives . ' was ignored.');
+                continue;
+            }
+            $newSection = $newconfig->getSection($section);
+            if (isset($newSection)) {
+                $oldDomSection = $doc->getSection($section);
+                foreach ($directives as $key => $value) {
+                    if ($value instanceof ConfigObject) {
+                        throw new ProgrammingError('Cannot diff recursive configs');
+                    }
+                    if (null === $newSection->get($key) && $oldDomSection->hasDirective($key)) {
+                        $oldDomSection->removeDirective($key);
+                    }
                 }
+            } else {
+                $doc->removeSection($section);
             }
         }
     }
-
-    /**
-     * Return all possible combinations of property identifiers for the given value
-     *
-     * @param   mixed   $value  The value to return all combinations for
-     * @param   array   $key    The root property identifier, if any
-     *
-     * @return  array           All property combinations that are possible
-     *
-     * @todo                    Cannot handle array properties yet (e.g. a.b[]='c')
-     */
-    protected function getPropertyIdentifiers($value, array $key = null)
-    {
-        $combinations = array();
-        $rootProperty = $key !== null ? $key : array();
-
-        if ($value instanceof Zend_Config) {
-            foreach ($value as $subProperty => $subValue) {
-                $combinations = array_merge(
-                    $combinations,
-                    $this->getPropertyIdentifiers($subValue, array_merge($rootProperty, array($subProperty)))
-                );
-            }
-        } elseif (is_string($value)) {
-            $combinations[] = $rootProperty;
-        }
-
-        return $combinations;
-    }
-
-    /**
-     * Getter for filename
-     *
-     * @return string
-     */
-    public function getFilename()
-    {
-        return $this->_filename;
-    }
 }
diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php
index 6faf7cc12..f9e9a2e2a 100644
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@@ -4,6 +4,7 @@
 use Icinga\Application\Icinga;
 use Icinga\Module\Doc\DocController;
 use Icinga\Module\Doc\Exception\DocException;
+use Icinga\File\Ini\Parser;
 
 class Doc_ModuleController extends DocController
 {
diff --git a/test/php/library/Icinga/File/Ini/IniWriterTest.php b/test/php/library/Icinga/File/Ini/IniWriterTest.php
index c83995715..a45e33e7b 100644
--- a/test/php/library/Icinga/File/Ini/IniWriterTest.php
+++ b/test/php/library/Icinga/File/Ini/IniWriterTest.php
@@ -31,86 +31,28 @@ class IniWriterTest extends BaseTestCase
     public function testWhetherPointInSectionIsNotNormalized()
     {
         $writer = new IniWriter(
-            array(
-                'config' => Config::fromArray(
-                        array(
-                            'section' => array(
-                                'foo.bar' => 1337
-                            ),
-                            'section.with.multiple.dots' => array(
-                                'some more' => array(
-                                    'nested stuff' => 'With more values'
-                                )
-                            )
-                        )
+            Config::fromArray(
+                array(
+                    'section' => array(
+                        'foo.bar' => 1337
                     ),
-                'filename' => $this->tempFile
-            )
+                    'section.with.multiple.dots' => array(
+                        'some more.nested stuff' => 'With more values'
+                    )
+                )
+            ),
+            $this->tempFile
         );
         $writer->write();
         $config = Config::fromIni($this->tempFile)->toArray();
         $this->assertTrue(array_key_exists('section.with.multiple.dots', $config), 'Section names not normalized');
     }
 
-    public function testWhetherSimplePropertiesAreInsertedInEmptyFiles()
-    {
-        $this->markTestSkipped('Implementation has changed. Section-less properties are not supported anymore');
-        $target = $this->writeConfigToTemporaryFile('');
-        $config = Config::fromArray(array('key' => 'value'));
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
-        $writer->write();
-
-        $newConfig = Config::fromIni($target);
-        $this->assertEquals('value', $newConfig->get('key'), 'IniWriter does not insert in empty files');
-    }
-
-    public function testWhetherSimplePropertiesAreInsertedInExistingFiles()
-    {
-        $this->markTestSkipped('Implementation has changed. Section-less properties are not supported anymore');
-        $target = $this->writeConfigToTemporaryFile('key1 = "1"');
-        $config = Config::fromArray(array('key2' => '2'));
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
-        $writer->write();
-
-        $newConfig = Config::fromIni($target);
-        $this->assertEquals('2', $newConfig->get('key2'), 'IniWriter does not insert in existing files');
-    }
-
-    /**
-     * @depends testWhetherSimplePropertiesAreInsertedInExistingFiles
-     */
-    public function testWhetherSimplePropertiesAreUpdated()
-    {
-        $this->markTestSkipped('Implementation has changed. Section-less properties are not supported anymore');
-        $target = $this->writeConfigToTemporaryFile('key = "value"');
-        $config = Config::fromArray(array('key' => 'eulav'));
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
-        $writer->write();
-
-        $newConfig = Config::fromIni($target);
-        $this->assertEquals('eulav', $newConfig->get('key'), 'IniWriter does not update simple properties');
-    }
-
-    /**
-     * @depends testWhetherSimplePropertiesAreInsertedInExistingFiles
-     */
-    public function testWhetherSimplePropertiesAreDeleted()
-    {
-        $this->markTestSkipped('Implementation has changed. Section-less properties are not supported anymore');
-        $target = $this->writeConfigToTemporaryFile('key = "value"');
-        $config = new Config();
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
-        $writer->write();
-
-        $newConfig = Config::fromIni($target);
-        $this->assertNull($newConfig->get('key'), 'IniWriter does not delete simple properties');
-    }
-
     public function testWhetherNestedPropertiesAreInserted()
     {
         $target = $this->writeConfigToTemporaryFile('');
         $config = Config::fromArray(array('a' => array('b' => 'c')));
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
+        $writer = new IniWriter($config, $target);
         $writer->write();
 
         $newConfig = Config::fromIni($target);
@@ -126,236 +68,54 @@ class IniWriterTest extends BaseTestCase
         );
     }
 
-    /**
-     * @depends testWhetherNestedPropertiesAreInserted
-     */
-    public function testWhetherNestedPropertiesAreUpdated()
-    {
-        $this->markTestSkipped('Implementation has changed. Section-less properties are not supported anymore');
-        $target = $this->writeConfigToTemporaryFile('a.b = "c"');
-        $config = Config::fromArray(array('a' => array('b' => 'cc')));
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
-        $writer->write();
-
-        $newConfig = Config::fromIni($target);
-        $this->assertInstanceOf(
-            get_class($newConfig),
-            $newConfig->get('a'),
-            'IniWriter does not update nested properties'
-        );
-        $this->assertEquals(
-            'cc',
-            $newConfig->get('a')->get('b'),
-            'IniWriter does not update nested properties'
-        );
-    }
-
-    /**
-     * @depends testWhetherNestedPropertiesAreInserted
-     */
-    public function testWhetherNestedPropertiesAreDeleted()
-    {
-        $this->markTestSkipped('Implementation has changed. Section-less properties are not supported anymore');
-        $target = $this->writeConfigToTemporaryFile('a.b = "c"');
-        $config = new Config();
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
-        $writer->write();
-
-        $newConfig = Config::fromIni($target);
-        $this->assertNull(
-            $newConfig->get('a'),
-            'IniWriter does not delete nested properties'
-        );
-    }
-
-    public function testWhetherSimpleSectionPropertiesAreInserted()
-    {
-        $target = $this->writeConfigToTemporaryFile('');
-        $config = Config::fromArray(array('section' => array('key' => 'value')));
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
-        $writer->write();
-
-        $newConfig = Config::fromIni($target);
-        $this->assertInstanceOf(
-            'Icinga\Data\ConfigObject',
-            $newConfig->getSection('section'),
-            'IniWriter does not insert sections'
-        );
-        $this->assertEquals(
-            'value',
-            $newConfig->getSection('section')->get('key'),
-            'IniWriter does not insert simple section properties'
-        );
-    }
-
-    /**
-     * @depends testWhetherSimpleSectionPropertiesAreInserted
-     */
-    public function testWhetherSimpleSectionPropertiesAreUpdated()
-    {
-        $target = $this->writeConfigToTemporaryFile(<<<'EOD'
-[section]
-key = "value"
-EOD
-        );
-        $config = Config::fromArray(array('section' => array('key' => 'eulav')));
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
-        $writer->write();
-
-        $newConfig = Config::fromIni($target);
-        $this->assertEquals(
-            'eulav',
-            $newConfig->getSection('section')->get('key'),
-            'IniWriter does not update simple section properties'
-        );
-    }
-
-    /**
-     * @depends testWhetherSimpleSectionPropertiesAreInserted
-     */
-    public function testWhetherSimpleSectionPropertiesAreDeleted()
-    {
-        $target = $this->writeConfigToTemporaryFile(<<<'EOD'
-[section]
-key = "value"
-EOD
-        );
-        $config = Config::fromArray(array('section' => array()));
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
-        $writer->write();
-
-        $newConfig = Config::fromIni($target);
-        $this->assertNull(
-            $newConfig->getSection('section')->get('key'),
-            'IniWriter does not delete simple section properties'
-        );
-    }
-
-    public function testWhetherNestedSectionPropertiesAreInserted()
-    {
-        $this->markTestSkipped('Implementation has changed. Config::fromIni cannot handle nested properties anymore');
-        $target = $this->writeConfigToTemporaryFile('');
-        $config = Config::fromArray(array('section' => array('a' => array('b' => 'c'))));
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
-        $writer->write();
-
-        $newConfig = Config::fromIni($target);
-        $this->assertInstanceOf(
-            get_class($newConfig),
-            $newConfig->get('section'),
-            'IniWriter does not insert sections'
-        );
-        $this->assertInstanceOf(
-            get_class($newConfig),
-            $newConfig->get('section')->get('a'),
-            'IniWriter does not insert nested section properties'
-        );
-        $this->assertEquals(
-            'c',
-            $newConfig->get('section')->get('a')->get('b'),
-            'IniWriter does not insert nested section properties'
-        );
-    }
-
-    /**
-     * @depends testWhetherNestedSectionPropertiesAreInserted
-     */
-    public function testWhetherNestedSectionPropertiesAreUpdated()
-    {
-        $target = $this->writeConfigToTemporaryFile(<<<'EOD'
-[section]
-a.b = "c"
-EOD
-        );
-        $config = Config::fromArray(array('section' => array('a' => array('b' => 'cc'))));
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
-        $writer->write();
-
-        $newConfig = Config::fromIni($target);
-        $this->assertEquals(
-            'cc',
-            $newConfig->get('section')->get('a')->get('b'),
-            'IniWriter does not update nested section properties'
-        );
-    }
-
-    /**
-     * @depends testWhetherNestedSectionPropertiesAreInserted
-     */
-    public function testWhetherNestedSectionPropertiesAreDeleted()
-    {
-        $target = $this->writeConfigToTemporaryFile(<<<'EOD'
-[section]
-a.b = "c"
-EOD
-        );
-        $config = Config::fromArray(array('section' => array()));
-        $writer = new IniWriter(array('config' => $config, 'filename' => $target));
-        $writer->write();
-
-        $newConfig = Config::fromIni($target);
-        $this->assertNull(
-            $newConfig->get('section')->get('a'),
-            'IniWriter does not delete nested section properties'
-        );
-    }
-
     public function testWhetherSectionOrderIsUpdated()
     {
         $config = <<<'EOD'
 [one]
-key1                = "1"
-key2                = "2"
+key1 = "1"
+key2 = "2"
 
 [two]
-a.b                 = "c"
-d.e                 = "f"
+a.b = "c"
+d.e = "f"
 
 [three]
-key                 = "value"
-foo.bar             = "raboof"
+key = "value"
+foo.bar = "raboof"
 EOD;
 
         $reverted = <<<'EOD'
 [three]
-key                 = "value"
-foo.bar             = "raboof"
+key = "value"
+foo.bar = "raboof"
 
 [two]
-a.b                 = "c"
-d.e                 = "f"
+a.b = "c"
+d.e = "f"
 
 [one]
-key1                = "1"
-key2                = "2"
+key1 = "1"
+key2 = "2"
 EOD;
         $target = $this->writeConfigToTemporaryFile($config);
         $writer = new IniWriter(
-            array(
-                'config'    => Config::fromArray(
-                    array(
-                        'three' => array(
-                            'foo' => array(
-                                'bar' => 'raboof'
-                            ),
-                            'key' => 'value'
-                        ),
-                        'two'   => array(
-                            'd' => array(
-                                'e' => 'f'
-                            ),
-                            'a' => array(
-                                'b' => 'c'
-                            )
-                        ),
-                        'one'   => array(
-                            'key2' => '2',
-                            'key1' => '1'
-                        )
+            Config::fromArray(
+                array(
+                    'three' => array(
+                        'foo.bar' => 'raboof',
+                        'key' => 'value'
+                    ),
+                    'two' => array(
+                        'd.e' => 'f',
+                        'a.b' => 'c'
+                    ),
+                    'one' => array(
+                        'key2' => '2',
+                        'key1' => '1'
                     )
-                ),
-                'filename'  => $target
-            )
+                )
+            ),
+            $target
         );
 
         $this->assertEquals(
@@ -384,15 +144,13 @@ EOD;
 EOD;
         $target = $this->writeConfigToTemporaryFile($config);
         $writer = new IniWriter(
-            array(
-                'config' => Config::fromArray(
-                    array(
-                        'two' => array(),
-                        'one' => array()
-                    )
-                ),
-                'filename'  => $target
-            )
+            Config::fromArray(
+                array(
+                    'two' => array(),
+                    'one' => array()
+                )
+            ),
+            $target
         );
 
         $this->assertEquals(
@@ -407,14 +165,14 @@ EOD;
     {
         $config = <<<'EOD'
 ; some interesting comment
-key                 = "value"
-; another interesting comment
+[blarg]
+key = "value"
+
+; some dangling comment
 ; boring comment
 EOD;
         $target = $this->writeConfigToTemporaryFile($config);
-        $writer = new IniWriter(
-            array('config' => Config::fromArray(array('key' => 'value')), 'filename' => $target)
-        );
+        $writer = new IniWriter(Config::fromArray(array('blarg' => array('key' => 'value'))), $target);
 
         $this->assertEquals(
             trim($config),
@@ -426,26 +184,24 @@ EOD;
     public function testWhetherCommentsOnPropertyLinesArePreserved()
     {
         $config = <<<'EOD'
-foo                 = 1337                  ; I know what a " and a ' is
-bar                 = 7331                  ; I; tend; to; overact; !1!1!!11!111!                                      ;
-key                 = "value"               ; some comment for a small sized property
-xxl                 = "very loooooooooooooooooooooong" ; my value is very lo...
+[blarg]
+foo = "1337" ; I know what a " and a ' is
+bar = "7331" ; I; tend; to; overact; !1!1!!11!111!                                      ;
+key = "value" ; some comment for a small sized property
+xxl = "very loooooooooooooooooooooong" ; my value is very lo...
 EOD;
         $target = $this->writeConfigToTemporaryFile($config);
         $writer = new IniWriter(
-            array(
-                'config' => Config::fromArray(
-                    array(
-                        'foo' => 1337,
-                        'bar' => 7331,
-                        'key' => 'value',
-                        'xxl' => 'very loooooooooooooooooooooong'
-                    )
-                ),
-                'filename' => $target
-            )
+            Config::fromArray(
+                array('blarg' => array(
+                    'foo' => 1337,
+                    'bar' => 7331,
+                    'key' => 'value',
+                    'xxl' => 'very loooooooooooooooooooooong'
+                ))
+            ),
+            $target
         );
-
         $this->assertEquals(
             trim($config),
             trim($writer->render()),
@@ -458,12 +214,10 @@ EOD;
         $config = <<<'EOD'
 [section]
 ; some interesting comment, in a section
-key                 = "value"
+key = "value"
 EOD;
         $target = $this->writeConfigToTemporaryFile($config);
-        $writer = new IniWriter(
-            array('config' => Config::fromArray(array('section' => array('key' => 'value'))), 'filename' => $target)
-        );
+        $writer = new IniWriter(Config::fromArray(array('section' => array('key' => 'value'))), $target);
 
         $this->assertEquals(
             trim($config),
@@ -476,26 +230,24 @@ EOD;
     {
         $config = <<<'EOD'
 [section]
-foo                 = 1337                  ; I know what a " and a ' is
-bar                 = 7331                  ; I; tend; to; overact; !1!1!!11!111!                                      ;
-key                 = "value"               ; some comment for a small sized property
-xxl                 = "very loooooooooooooooooooooong" ; my value is very lo...
+foo = "1337" ; I know what a " and a ' is
+bar = "7331" ; I; tend; to; overact; !1!1!!11!111!                                      ;
+key = "value" ; some comment for a small sized property
+xxl = "very loooooooooooooooooooooong" ; my value is very lo...
 EOD;
         $target = $this->writeConfigToTemporaryFile($config);
         $writer = new IniWriter(
-            array(
-                'config' => Config::fromArray(
-                    array(
-                        'section' => array(
-                            'foo' => 1337,
-                            'bar' => 7331,
-                            'key' => 'value',
-                            'xxl' => 'very loooooooooooooooooooooong'
-                        )
+            Config::fromArray(
+                array(
+                    'section' => array(
+                        'foo' => 1337,
+                        'bar' => 7331,
+                        'key' => 'value',
+                        'xxl' => 'very loooooooooooooooooooooong'
                     )
-                ),
-                'filename' => $target
-            )
+                )
+            ),
+            $target
         );
 
         $this->assertEquals(
@@ -509,19 +261,17 @@ EOD;
     {
         $target = $this->writeConfigToTemporaryFile('');
         $writer = new IniWriter(
-            array(
-                'config' => Config::fromArray(
-                    array(
-                        'section' => array(
-                            'foo' => 'linebreak
+            Config::fromArray(
+                array(
+                    'section' => array(
+                        'foo' => 'linebreak
 in line',
-                            'linebreak
+                        'linebreak
 inkey' => 'blarg'
-                        )
                     )
-                ),
-                'filename' => $target
-            )
+                )
+            ),
+            $target
         );
 
         $rendered = $writer->render();
@@ -536,30 +286,28 @@ inkey' => 'blarg'
     {
         $config = <<<'EOD'
 [section 1]
-foo                 = 1337
+foo = "1337"
 
 [section (with special chars)]
-foo                 = "baz"
+foo = "baz"
 
 [section/as/arbitrary/path]
-foo                 = "nope"
+foo = "nope"
 
 [section.with.dots.in.it]
-foo                 = "bar"
+foo = "bar"
 EOD;
         $target = $this->writeConfigToTemporaryFile($config);
         $writer = new IniWriter(
-            array(
-                'config' => Config::fromArray(
-                    array(
-                        'section 1' => array('foo' => 1337),
-                        'section (with special chars)' => array('foo' => 'baz'),
-                        'section/as/arbitrary/path' => array('foo' => 'nope'),
-                        'section.with.dots.in.it' => array('foo' => 'bar')
-                    )
-                ),
-                'filename' => $target
-            )
+            Config::fromArray(
+                array(
+                    'section 1' => array('foo' => 1337),
+                    'section (with special chars)' => array('foo' => 'baz'),
+                    'section/as/arbitrary/path' => array('foo' => 'nope'),
+                    'section.with.dots.in.it' => array('foo' => 'bar')
+                )
+            ),
+            $target
         );
 
         $this->assertEquals(
@@ -569,6 +317,46 @@ EOD;
         );
     }
 
+    public function testSectionDeleted()
+    {
+        $config = <<<'EOD'
+[section 1]
+guarg = "1"
+
+[section 2]
+foo = "1337"
+foo2 = "baz"
+foo3 = "nope"
+foo4 = "bar"
+
+[section 3]
+guard = "2"
+EOD;
+        $deleted = <<<'EOD'
+[section 1]
+guarg = "1"
+
+[section 3]
+guard = "2"
+EOD;
+
+        $target = $this->writeConfigToTemporaryFile($config);
+        $writer = new IniWriter(
+            Config::fromArray(array(
+                'section 1' => array('guarg' => 1),
+                'section 3' => array('guard' => 2)
+            )),
+            $target
+        );
+
+        $this->assertEquals(
+            trim($deleted),
+            trim($writer->render()),
+            'IniWriter does not delete sections properly'
+        );
+    }
+
+
     /**
      * Write a INI-configuration string to a temporary file and return its path
      *

From c891b9d3564b71aad9cc96c1f8183f6767dfc01d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 07:54:03 +0200
Subject: [PATCH 2851/2920] HostgroupsummaryQuery: Fix group statement
 ambiguity

---
 .../Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
index b35f50a19..ce5e0f85b 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupsummaryQuery.php
@@ -115,7 +115,7 @@ class HostgroupsummaryQuery extends IdoQuery
         $this->subQueries[] = $services;
         $this->summaryQuery = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL);
         $this->select->from(array('statussummary' => $this->summaryQuery), array());
-        $this->group(array('hostgroup_name', 'hostgroup_alias'));
+        $this->group(array('statussummary.hostgroup_name', 'statussummary.hostgroup_alias'));
         $this->joinedVirtualTables['hoststatussummary'] = true;
     }
 

From 7662545c2a325fb86fa56ded9211a94d99cc07d2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 09:39:23 +0200
Subject: [PATCH 2852/2920] SimpleQuery: Provide a getter for the current
 iterator position

refs #8615
---
 library/Icinga/Data/SimpleQuery.php                    | 10 ++++++++++
 library/Icinga/Repository/RepositoryQuery.php          | 10 ++++++++++
 .../library/Monitoring/DataView/DataView.php           | 10 ++++++++++
 3 files changed, 30 insertions(+)

diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 2dcecfc9c..ecfaa3aaa 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -143,6 +143,16 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
         return $this->ds;
     }
 
+    /**
+     * Return the current position of this query's iterator
+     *
+     * @return  int
+     */
+    public function getIteratorPosition()
+    {
+        return $this->iteratorPosition;
+    }
+
     /**
      * Start or rewind the iteration
      */
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
index c975654db..98ed6e81f 100644
--- a/library/Icinga/Repository/RepositoryQuery.php
+++ b/library/Icinga/Repository/RepositoryQuery.php
@@ -605,6 +605,16 @@ class RepositoryQuery implements QueryInterface, SortRules, Iterator
         return $this->query->count();
     }
 
+    /**
+     * Return the current position of this query's iterator
+     *
+     * @return  int
+     */
+    public function getIteratorPosition()
+    {
+        return $this->query->getIteratorPosition();
+    }
+
     /**
      * Start or rewind the iteration
      */
diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 11543351c..31ca426d5 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -69,6 +69,16 @@ abstract class DataView implements QueryInterface, SortRules, IteratorAggregate
         return $this->getQuery();
     }
 
+    /**
+     * Return the current position of the result set's iterator
+     *
+     * @return  int
+     */
+    public function getIteratorPosition()
+    {
+        return $this->query->getIteratorPosition();
+    }
+
     /**
      * Get the query name this data view relies on
      *

From 8cf3b99335fe138db262dfcf3b1adb72339383de Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 10:23:44 +0200
Subject: [PATCH 2853/2920] Eventhistory Overview: Remove pagination and
 provide a load more link instead

refs #8615
---
 .../controllers/ListController.php            |  1 -
 .../views/scripts/list/eventhistory.phtml     | 33 ++++++++++++++++---
 public/css/icinga/pagination.less             |  7 +++-
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 3625043a6..7c749a2a3 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -576,7 +576,6 @@ class Monitoring_ListController extends Controller
         $this->view->history = $query;
 
         $this->setupLimitControl();
-        $this->setupPaginationControl($this->view->history);
         $this->setupSortControl(array(
             'timestamp' => $this->translate('Occurence')
         ), $query);
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 47375c054..e01528583 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -2,21 +2,29 @@
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
-$history->peekAhead($this->compact);
+$url = $this->url();
+$limit = (int) $url->getParam('limit', 25);
+if (! $url->hasParam('page') || ($page = (int) $url->getParam('page')) < 1) {
+    $page = 1;
+}
+
+$history->limit($limit * $page);
 
 if (! $this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
   <?= $this->sortBox; ?>
   <?= $this->limiter; ?>
-  <?= $this->paginator; ?>
+  <a class="load-more-hint" href="#load-more">
+    <?= $this->translate('Scroll to the bottom of this page to load additional events'); ?>
+  </a>
   <?= $this->filterEditor; ?>
 </div>
 <?php endif ?>
 <div class="content">
   <table data-base-target="_next" class="action">
     <tbody>
-    <?php foreach ($history as $event): ?>
+    <?php foreach ($history->peekAhead() as $event): ?>
     <?php
       $icon = 'help';
       $msg = $event->output;
@@ -71,6 +79,9 @@ if (! $this->compact): ?>
       ?>
       <tr class="state <?= $stateName; ?>">
         <td class="state">
+        <?php if ($history->getIteratorPosition() % $limit === 0): ?>
+          <a name="page-<?= $history->getIteratorPosition() / $limit + 1; ?>"></a>
+        <?php endif ?>
           <strong><?= $this->escape($title); ?></strong>
           <br>
           <?= $this->timeAgo($event->timestamp, $this->compact); ?>
@@ -95,14 +106,28 @@ if (! $this->compact): ?>
 <?php if (! $history->hasResult()): ?>
   <?= $this->translate('No history events found matching the filter'); ?>
 <?php elseif ($history->hasMore()): ?>
+ <?php if ($this->compact): ?>
   <?= $this->qlink(
     $this->translate('Show More'),
-    $this->url()->without(array('view', 'limit')),
+    $url->without(array('view', 'limit')),
     null,
     array(
       'data-base-target'    => '_next',
       'class'               => 'pull-right show-more'
     )
   ); ?>
+ <?php else: ?>
+  <?= $this->qlink(
+    $this->translate('Load More'),
+    $url->setAnchor('page-' . ($page + 1)),
+    array(
+      'page'    => $page + 1,
+    ),
+    array(
+      'name'    => 'load-more',
+      'class'   => 'pull-right load-more'
+    )
+  ); ?>
+ <?php endif ?>
 <?php endif ?>
 </div>
diff --git a/public/css/icinga/pagination.less b/public/css/icinga/pagination.less
index b7dc6c606..a3a74c47c 100644
--- a/public/css/icinga/pagination.less
+++ b/public/css/icinga/pagination.less
@@ -62,7 +62,12 @@ ul.pagination {
   cursor: default;
 }
 
-a.show-more {
+a.show-more, a.load-more {
   display: block;
   margin: 0.5em;
+}
+
+a.load-more-hint {
+  display: inline-block;
+  margin-left: 1em;
 }
\ No newline at end of file

From 5ccd4a9ef8084d6e47d0d99f587da78a9e8c5155 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 10:24:56 +0200
Subject: [PATCH 2854/2920] js: Do not handle anchor jumps, the browser is able
 to do it by itself

refs #8615
---
 public/js/icinga/events.js | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index e29b7d0e7..368ef6931 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -322,21 +322,6 @@
             return false;
         },
 
-        /**
-         * Handle anchor, i.e. focus the element which is referenced by the anchor
-         *
-         * @param {string} query jQuery selector
-         */
-        handleAnchor: function(query) {
-            var $element = $(query);
-            if ($element.length > 0) {
-                if (typeof $element.attr('tabindex') === 'undefined') {
-                    $element.attr('tabindex', -1);
-                }
-                $element.focus();
-            }
-        },
-
         /**
          * Someone clicked a link or tr[href]
          */
@@ -397,17 +382,15 @@
                 return;
             }
 
+            // This is an anchor only
+            if (href.substr(0, 1) === '#' && href.length > 1 && href.substr(1, 1) !== '!') {
+                return;
+            }
+
             // Handle all other links as XHR requests
             event.stopPropagation();
             event.preventDefault();
 
-            // This is an anchor only
-            if (href.substr(0, 1) === '#' && href.length > 1
-                && href.substr(1, 1) !== '!') {
-                self.handleAnchor(href);
-                return;
-            }
-
             // activate spinner indicator
             if ($a.hasClass('spinner')) {
                 $a.addClass('active');

From 528382098e479d689ab081494cf63562bdafd80a Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 6 Aug 2015 10:46:40 +0200
Subject: [PATCH 2855/2920] db: Respect group by for count queries, really

Missed that Johannes introduced DbQuery::getGroup().

refs #9828
---
 library/Icinga/Data/Db/DbQuery.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index 8bf57867e..9d1ef1ad2 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -334,8 +334,12 @@ class DbQuery extends SimpleQuery
         // TODO: there may be situations where we should clone the "select"
         $count = $this->dbSelect();
         $this->applyFilterSql($count);
-        if ($this->useSubqueryCount || $this->group) {
+        $group = $this->getGroup();
+        if ($this->useSubqueryCount || $group) {
             $count->columns($this->columns);
+            if ($group) {
+                $count->group($group);
+            }
             $columns = array('cnt' => 'COUNT(*)');
             return $this->db->select()->from($count, $columns);
         }

From de24f5f4b67e5e2ef5dc2108543c51e96d2d4776 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 10:57:41 +0200
Subject: [PATCH 2856/2920] Revert "js: Do not handle anchor jumps, the browser
 is able to do it by itself"

This reverts commit 5ccd4a9ef8084d6e47d0d99f587da78a9e8c5155.

refs #8615
---
 public/js/icinga/events.js | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 368ef6931..e29b7d0e7 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -322,6 +322,21 @@
             return false;
         },
 
+        /**
+         * Handle anchor, i.e. focus the element which is referenced by the anchor
+         *
+         * @param {string} query jQuery selector
+         */
+        handleAnchor: function(query) {
+            var $element = $(query);
+            if ($element.length > 0) {
+                if (typeof $element.attr('tabindex') === 'undefined') {
+                    $element.attr('tabindex', -1);
+                }
+                $element.focus();
+            }
+        },
+
         /**
          * Someone clicked a link or tr[href]
          */
@@ -382,15 +397,17 @@
                 return;
             }
 
-            // This is an anchor only
-            if (href.substr(0, 1) === '#' && href.length > 1 && href.substr(1, 1) !== '!') {
-                return;
-            }
-
             // Handle all other links as XHR requests
             event.stopPropagation();
             event.preventDefault();
 
+            // This is an anchor only
+            if (href.substr(0, 1) === '#' && href.length > 1
+                && href.substr(1, 1) !== '!') {
+                self.handleAnchor(href);
+                return;
+            }
+
             // activate spinner indicator
             if ($a.hasClass('spinner')) {
                 $a.addClass('active');

From 5c80486b23e7097f72cf07df163062c59e5139e2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 10:58:15 +0200
Subject: [PATCH 2857/2920] js: Properly handle anchor tags with names

refs #8615
---
 public/js/icinga/events.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index e29b7d0e7..1d9680ea0 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -325,11 +325,18 @@
         /**
          * Handle anchor, i.e. focus the element which is referenced by the anchor
          *
-         * @param {string} query jQuery selector
+         * @param {string} element  The name or id of the element to focus
          */
-        handleAnchor: function(query) {
-            var $element = $(query);
-            if ($element.length > 0) {
+        handleAnchor: function(element) {
+            var $element = $('#' + element);
+            if (! $element.length) {
+                // The name attribute is actually deprecated, on anchor tags,
+                // but we'll possibly handle links from another source
+                // (module etc) so that's used as a fallback
+                $element = $('[name="' + element + '"]');
+            }
+
+            if ($element.length) {
                 if (typeof $element.attr('tabindex') === 'undefined') {
                     $element.attr('tabindex', -1);
                 }
@@ -404,7 +411,7 @@
             // This is an anchor only
             if (href.substr(0, 1) === '#' && href.length > 1
                 && href.substr(1, 1) !== '!') {
-                self.handleAnchor(href);
+                self.handleAnchor(href.substr(1));
                 return;
             }
 

From bdc61a5f628ce6e8e647d440edc7fe914b0cec8a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 11:49:16 +0200
Subject: [PATCH 2858/2920] js: Introduce new function ui.focusElement()

refs #8615
---
 public/js/icinga/ui.js | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index 4ab802ca7..897a82d06 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -122,6 +122,40 @@
             return this;
         },
 
+        /**
+         * Focus the given element and scroll to its position
+         *
+         * @param   {string}    element     The name or id of the element to focus
+         * @param   {object}    $container  Optional, the container containing the element
+         */
+        focusElement: function(element, $container) {
+            var $element = $('#' + element);
+
+            if (! $element.length) {
+                // The name attribute is actually deprecated, on anchor tags,
+                // but we'll possibly handle links from another source
+                // (module etc) so that's used as a fallback
+                $element = $('[name="' + element.replace(/'/, '\\\'') + '"]');
+            }
+
+            if ($element.length) {
+                if (typeof $element.attr('tabindex') === 'undefined') {
+                    $element.attr('tabindex', -1);
+                }
+
+                if (typeof $container === 'undefined') {
+                    $container = $element.closest('.container');
+                }
+
+                $element.focus();
+
+                if ($container.length) {
+                    $container.scrollTop(0);
+                    $container.scrollTop($element.first().position().top);
+                }
+            }
+        },
+
         moveToLeft: function () {
             var col2 = this.cutContainer($('#col2'));
             var kill = this.cutContainer($('#col1'));

From 153f3ba2f95af858e3427aa74a010ba5785389aa Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 11:51:57 +0200
Subject: [PATCH 2859/2920] js: Drop function events.handleAnchor() and
 ui.scrollContainerToAnchor()

There is ui.focusElement() now which handles ids as well.

refs #8615
---
 public/js/icinga/events.js | 26 ++------------------------
 public/js/icinga/loader.js |  2 +-
 public/js/icinga/ui.js     | 12 ------------
 3 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 1d9680ea0..c74c9e97a 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -322,28 +322,6 @@
             return false;
         },
 
-        /**
-         * Handle anchor, i.e. focus the element which is referenced by the anchor
-         *
-         * @param {string} element  The name or id of the element to focus
-         */
-        handleAnchor: function(element) {
-            var $element = $('#' + element);
-            if (! $element.length) {
-                // The name attribute is actually deprecated, on anchor tags,
-                // but we'll possibly handle links from another source
-                // (module etc) so that's used as a fallback
-                $element = $('[name="' + element + '"]');
-            }
-
-            if ($element.length) {
-                if (typeof $element.attr('tabindex') === 'undefined') {
-                    $element.attr('tabindex', -1);
-                }
-                $element.focus();
-            }
-        },
-
         /**
          * Someone clicked a link or tr[href]
          */
@@ -411,7 +389,7 @@
             // This is an anchor only
             if (href.substr(0, 1) === '#' && href.length > 1
                 && href.substr(1, 1) !== '!') {
-                self.handleAnchor(href.substr(1));
+                icinga.ui.focusElement(href.substr(1));
                 return;
             }
 
@@ -441,7 +419,7 @@
 
                 formerUrl = $target.data('icingaUrl');
                 if (typeof formerUrl !== 'undefined' && formerUrl.split(/#/)[0] === href.split(/#/)[0]) {
-                    icinga.ui.scrollContainerToAnchor($target, href.split(/#/)[1]);
+                    icinga.ui.focusElement(href.split(/#/)[1], $target);
                     $target.data('icingaUrl', href);
                     if (formerUrl !== href) {
                         icinga.history.pushCurrentState();
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 32722cb6b..56e2f8532 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -560,7 +560,7 @@
                 oldNotifications.appendTo($('#notifications'));
             }
             if (url.match(/#/)) {
-                this.icinga.ui.scrollContainerToAnchor(req.$target, url.split(/#/)[1]);
+                this.icinga.ui.focusElement(url.split(/#/)[1], req.$target);
             }
             if (newBody) {
                 this.icinga.ui.fixDebugVisibility().triggerWindowResize();
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index 897a82d06..b9cff23fd 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -193,18 +193,6 @@
             $col.data('icingaModule', backup['data']['data-icinga-module']);
         },
 
-        scrollContainerToAnchor: function ($container, anchorName) {
-            // TODO: Generic issue -> we probably should escape attribute value selectors!?
-            var $anchor = $("a[name='" + anchorName.replace(/'/, '\\\'') + "']", $container);
-            if ($anchor.length) {
-                $container.scrollTop(0);
-                $container.scrollTop($anchor.first().position().top);
-                this.icinga.logger.debug('Scrolling ', $container, ' to ', anchorName);
-            } else {
-                this.icinga.logger.info('Anchor "' + anchorName + '" not found in ', $container);
-            }
-        },
-
         triggerWindowResize: function () {
             this.onWindowResize({data: {self: this}});
         },

From ea3e0bc013e62874ad5017e4ba74be453f0dfede Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 11:52:35 +0200
Subject: [PATCH 2860/2920] Eventhistory Overview: Use id attribues as the name
 attribute is deprecated

refs #8615
---
 .../application/views/scripts/list/eventhistory.phtml         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index e01528583..c414c859c 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -80,7 +80,7 @@ if (! $this->compact): ?>
       <tr class="state <?= $stateName; ?>">
         <td class="state">
         <?php if ($history->getIteratorPosition() % $limit === 0): ?>
-          <a name="page-<?= $history->getIteratorPosition() / $limit + 1; ?>"></a>
+          <a id="page-<?= $history->getIteratorPosition() / $limit + 1; ?>"></a>
         <?php endif ?>
           <strong><?= $this->escape($title); ?></strong>
           <br>
@@ -124,7 +124,7 @@ if (! $this->compact): ?>
       'page'    => $page + 1,
     ),
     array(
-      'name'    => 'load-more',
+      'id'      => 'load-more',
       'class'   => 'pull-right load-more'
     )
   ); ?>

From b9e0a80479c8ee368242f5fad78560300a56c0b7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 12:50:17 +0200
Subject: [PATCH 2861/2920] EventHistory Overview: Show the load more link as
 button and centered

refs #8615
---
 .../application/views/scripts/list/eventhistory.phtml       | 6 +++---
 public/css/icinga/pagination.less                           | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index c414c859c..8cf9dadb9 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -117,7 +117,7 @@ if (! $this->compact): ?>
     )
   ); ?>
  <?php else: ?>
-  <?= $this->qlink(
+  <div class="load-more-container"><?= $this->qlink(
     $this->translate('Load More'),
     $url->setAnchor('page-' . ($page + 1)),
     array(
@@ -125,9 +125,9 @@ if (! $this->compact): ?>
     ),
     array(
       'id'      => 'load-more',
-      'class'   => 'pull-right load-more'
+      'class'   => 'pull-right load-more button-like'
     )
-  ); ?>
+  ); ?></div>
  <?php endif ?>
 <?php endif ?>
 </div>
diff --git a/public/css/icinga/pagination.less b/public/css/icinga/pagination.less
index a3a74c47c..35e0e7edd 100644
--- a/public/css/icinga/pagination.less
+++ b/public/css/icinga/pagination.less
@@ -70,4 +70,10 @@ a.show-more, a.load-more {
 a.load-more-hint {
   display: inline-block;
   margin-left: 1em;
+}
+
+div.load-more-container {
+  display: table;
+  margin: 0 auto;
+  margin-top: 0.5em;
 }
\ No newline at end of file

From b8b649f1792b8598560e07e34107ea4b6d0e85a4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 13:08:36 +0200
Subject: [PATCH 2862/2920] js: Require a container in ui.focusElement()

refs #8615
---
 public/js/icinga/events.js |  2 +-
 public/js/icinga/ui.js     | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index c74c9e97a..4bbba72fc 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -389,7 +389,7 @@
             // This is an anchor only
             if (href.substr(0, 1) === '#' && href.length > 1
                 && href.substr(1, 1) !== '!') {
-                icinga.ui.focusElement(href.substr(1));
+                icinga.ui.focusElement(href.substr(1), $a.closest('.container'));
                 return;
             }
 
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index b9cff23fd..5d65e1277 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -126,16 +126,16 @@
          * Focus the given element and scroll to its position
          *
          * @param   {string}    element     The name or id of the element to focus
-         * @param   {object}    $container  Optional, the container containing the element
+         * @param   {object}    $container  The container containing the element
          */
         focusElement: function(element, $container) {
-            var $element = $('#' + element);
+            var $element = $('#' + element, $container);
 
             if (! $element.length) {
                 // The name attribute is actually deprecated, on anchor tags,
                 // but we'll possibly handle links from another source
                 // (module etc) so that's used as a fallback
-                $element = $('[name="' + element.replace(/'/, '\\\'') + '"]');
+                $element = $('[name="' + element.replace(/'/, '\\\'') + '"]', $container);
             }
 
             if ($element.length) {
@@ -143,16 +143,9 @@
                     $element.attr('tabindex', -1);
                 }
 
-                if (typeof $container === 'undefined') {
-                    $container = $element.closest('.container');
-                }
-
                 $element.focus();
-
-                if ($container.length) {
-                    $container.scrollTop(0);
-                    $container.scrollTop($element.first().position().top);
-                }
+                $container.scrollTop(0);
+                $container.scrollTop($element.first().position().top);
             }
         },
 

From 63650518eed66be3f00ccdd56c08b53fdf264ab1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 13:09:24 +0200
Subject: [PATCH 2863/2920] Host history: Remove pagination and provide a load
 more link instead

refs #8615
---
 .../views/scripts/host/history.phtml          | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/host/history.phtml b/modules/monitoring/application/views/scripts/host/history.phtml
index f70d2d156..82b6f752d 100644
--- a/modules/monitoring/application/views/scripts/host/history.phtml
+++ b/modules/monitoring/application/views/scripts/host/history.phtml
@@ -17,6 +17,14 @@ function contactsLink($match, $view) {
 
 $self = $this;
 
+$url = $this->url();
+$limit = (int) $url->getParam('limit', 25);
+if (! $url->hasParam('page') || ($page = (int) $url->getParam('page')) < 1) {
+    $page = 1;
+}
+
+$history->limit($limit * $page);
+
 if (! $this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
@@ -24,14 +32,16 @@ if (! $this->compact): ?>
   <h1><?= $this->translate('This Host\'s Event History'); ?></h1>
   <?= $this->sortBox; ?>
   <?= $this->limiter; ?>
-  <?= $this->paginator; ?>
+  <a class="load-more-hint" href="#load-more">
+    <?= $this->translate('Scroll to the bottom of this page to load additional events'); ?>
+  </a>
   <?= $this->filterEditor; ?>
 </div>
 <?php endif ?>
 <div class="content">
   <table data-base-target="_next" class="action objecthistory">
     <tbody>
-    <?php foreach ($history as $event): ?>
+    <?php foreach ($history->peekAhead() as $event): ?>
     <?php
       $stateClass = 'invalid';
       $msg = $this->escape($event->output);
@@ -102,6 +112,9 @@ if (! $this->compact): ?>
     ?>
       <tr class="state <?= $stateClass; ?>">
         <td class="state">
+        <?php if ($history->getIteratorPosition() % $limit === 0): ?>
+          <a id="page-<?= $history->getIteratorPosition() / $limit + 1; ?>"></a>
+        <?php endif ?>
           <strong><?= $this->escape($title); ?></strong>
           <br>
           <?= date('d.m. H:i', $event->timestamp); ?>
@@ -139,5 +152,17 @@ if (! $this->compact): ?>
   </table>
 <?php if (! $history->hasResult()): ?>
   <?= $this->translate('No history events found matching the filter'); ?>
+<?php elseif ($history->hasMore()): ?>
+  <div class="load-more-container"><?= $this->qlink(
+    $this->translate('Load More'),
+    $url->setAnchor('page-' . ($page + 1)),
+    array(
+      'page'    => $page + 1,
+    ),
+    array(
+      'id'      => 'load-more',
+      'class'   => 'pull-right load-more button-like'
+    )
+  ); ?></div>
 <?php endif ?>
 </div>

From 9dad63b5129d29cb74990691eb65c29d677ac3d9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 13:09:35 +0200
Subject: [PATCH 2864/2920] Service history: Remove pagination and provide a
 load more link instead

refs #8615
---
 .../views/scripts/service/history.phtml       | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/service/history.phtml b/modules/monitoring/application/views/scripts/service/history.phtml
index 49c5f9993..75e0e608f 100644
--- a/modules/monitoring/application/views/scripts/service/history.phtml
+++ b/modules/monitoring/application/views/scripts/service/history.phtml
@@ -16,6 +16,14 @@ function contactsLink($match, $view) {
 
 $self = $this;
 
+$url = $this->url();
+$limit = (int) $url->getParam('limit', 25);
+if (! $url->hasParam('page') || ($page = (int) $url->getParam('page')) < 1) {
+    $page = 1;
+}
+
+$history->limit($limit * $page);
+
 if (! $this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
@@ -23,14 +31,16 @@ if (! $this->compact): ?>
   <h1><?= $this->translate('This Service\'s Event History'); ?></h1>
   <?= $this->sortBox; ?>
   <?= $this->limiter; ?>
-  <?= $this->paginator; ?>
+  <a class="load-more-hint" href="#load-more">
+    <?= $this->translate('Scroll to the bottom of this page to load additional events'); ?>
+  </a>
   <?= $this->filterEditor; ?>
 </div>
 <?php endif ?>
 <div class="content">
   <table data-base-target="_next" class="action objecthistory">
     <tbody>
-    <?php foreach ($history as $event): ?>
+    <?php foreach ($history->peekAhead() as $event): ?>
     <?php
       $stateClass = 'invalid';
       $msg = $this->escape($event->output);
@@ -100,6 +110,9 @@ if (! $this->compact): ?>
     ?>
       <tr class="state <?= $stateClass; ?>">
         <td class="state">
+        <?php if ($history->getIteratorPosition() % $limit === 0): ?>
+          <a id="page-<?= $history->getIteratorPosition() / $limit + 1; ?>"></a>
+        <?php endif ?>
           <strong><?= $this->escape($title); ?></strong>
           <br>
           <?= date('d.m. H:i', $event->timestamp); ?>
@@ -121,5 +134,17 @@ if (! $this->compact): ?>
   </table>
 <?php if (! $history->hasResult()): ?>
   <?= $this->translate('No history events found matching the filter'); ?>
+<?php elseif ($history->hasMore()): ?>
+  <div class="load-more-container"><?= $this->qlink(
+    $this->translate('Load More'),
+    $url->setAnchor('page-' . ($page + 1)),
+    array(
+      'page'    => $page + 1,
+    ),
+    array(
+      'id'      => 'load-more',
+      'class'   => 'pull-right load-more button-like'
+    )
+  ); ?></div>
 <?php endif ?>
 </div>

From 4c00d5effc6a599ceda18974e845283077410bf1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 13:21:50 +0200
Subject: [PATCH 2865/2920] Wizard: Fix invalid call to self::translate()

refs #9654
---
 modules/setup/library/Setup/WebWizard.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index daa7f399a..0a0aa090b 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -164,10 +164,12 @@ class WebWizard extends Wizard implements SetupWizard
         /*} elseif ($page->getName() === 'setup_ldap_discovery_confirm') {
             $page->setResourceConfig($this->getPageData('setup_ldap_discovery'));*/
         } elseif ($page->getName() === 'setup_auth_db_resource') {
-            $page->addDescription($this->translate(
+            $page->addDescription(mt(
+                'setup',
                 'Now please configure the database resource where to store users and user groups.'
             ));
-            $page->addDescription($this->translate(
+            $page->addDescription(mt(
+                'setup',
                 'Note that the database itself does not need to exist at this time as'
                 . ' it is going to be created once the wizard is about to be finished.'
             ));
@@ -195,10 +197,12 @@ class WebWizard extends Wizard implements SetupWizard
             $page->setSubjectTitle('Icinga Web 2');
             $page->setSummary($this->getSetup()->getSummary());
         } elseif ($page->getName() === 'setup_config_db_resource') {
-            $page->addDescription($this->translate(
+            $page->addDescription(mt(
+                'setup',
                 'Now please configure the database resource where to store user preferences.'
             ));
-            $page->addDescription($this->translate(
+            $page->addDescription(mt(
+                'setup',
                 'Note that the database itself does not need to exist at this time as'
                 . ' it is going to be created once the wizard is about to be finished.'
             ));

From 59ef54314a94068cee58583d3c30ef3032c1eea7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 15:08:41 +0200
Subject: [PATCH 2866/2920] Extend the Web bootstrapper from the EmbeddedWeb
 bootstrapper

In a embedded web environment we may also need a request and response.

refs #9702
---
 library/Icinga/Application/EmbeddedWeb.php | 63 ++++++++++++++++++-
 library/Icinga/Application/Web.php         | 71 ++--------------------
 2 files changed, 68 insertions(+), 66 deletions(-)

diff --git a/library/Icinga/Application/EmbeddedWeb.php b/library/Icinga/Application/EmbeddedWeb.php
index 0408d182e..b2d8ec046 100644
--- a/library/Icinga/Application/EmbeddedWeb.php
+++ b/library/Icinga/Application/EmbeddedWeb.php
@@ -5,6 +5,9 @@ namespace Icinga\Application;
 
 require_once dirname(__FILE__) . '/ApplicationBootstrap.php';
 
+use Icinga\Web\Request;
+use Icinga\Web\Response;
+
 /**
  * Use this if you want to make use of Icinga functionality in other web projects
  *
@@ -16,6 +19,40 @@ require_once dirname(__FILE__) . '/ApplicationBootstrap.php';
  */
 class EmbeddedWeb extends ApplicationBootstrap
 {
+    /**
+     * Request object
+     *
+     * @var Request
+     */
+    protected $request;
+
+    /**
+     * Response
+     *
+     * @var Response
+     */
+    protected $response;
+
+    /**
+     * Get the request
+     *
+     * @return  Request
+     */
+    public function getRequest()
+    {
+        return $this->request;
+    }
+
+    /**
+     * Get the response
+     *
+     * @return  Response
+     */
+    public function getResponse()
+    {
+        return $this->response;
+    }
+
     /**
      * Embedded bootstrap parts
      *
@@ -26,10 +63,34 @@ class EmbeddedWeb extends ApplicationBootstrap
     {
         return $this
             ->setupZendAutoloader()
-            ->loadConfig()
             ->setupErrorHandling()
+            ->loadConfig()
+            ->setupRequest()
+            ->setupResponse()
             ->setupTimezone()
             ->setupModuleManager()
             ->loadEnabledModules();
     }
+
+    /**
+     * Set the request
+     *
+     * @return  $this
+     */
+    protected function setupRequest()
+    {
+        $this->request = new Request();
+        return $this;
+    }
+
+    /**
+     * Set the response
+     *
+     * @return  $this
+     */
+    protected function setupResponse()
+    {
+        $this->response = new Response();
+        return $this;
+    }
 }
diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 9494ea326..8386efc6b 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -3,7 +3,7 @@
 
 namespace Icinga\Application;
 
-require_once __DIR__ . '/ApplicationBootstrap.php';
+require_once __DIR__ . '/EmbeddedWeb.php';
 
 use Zend_Controller_Action_HelperBroker;
 use Zend_Controller_Front;
@@ -11,14 +11,11 @@ use Zend_Controller_Router_Route;
 use Zend_Layout;
 use Zend_Paginator;
 use Zend_View_Helper_PaginationControl;
-use Icinga\Application\Logger;
 use Icinga\Authentication\Auth;
 use Icinga\User;
 use Icinga\Util\TimezoneDetect;
 use Icinga\Util\Translator;
 use Icinga\Web\Notification;
-use Icinga\Web\Request;
-use Icinga\Web\Response;
 use Icinga\Web\Session;
 use Icinga\Web\Session\Session as BaseSession;
 use Icinga\Web\View;
@@ -28,11 +25,11 @@ use Icinga\Web\View;
  *
  * Usage example:
  * <code>
- * use Icinga\Application\EmbeddedWeb;
- * EmbeddedWeb::start();
+ * use Icinga\Application\Web;
+ * Web::start();
  * </code>
  */
-class Web extends ApplicationBootstrap
+class Web extends EmbeddedWeb
 {
     /**
      * View object
@@ -48,20 +45,6 @@ class Web extends ApplicationBootstrap
      */
     private $frontController;
 
-    /**
-     * Request object
-     *
-     * @var Request
-     */
-    private $request;
-
-    /**
-     * Response
-     *
-     * @var Response
-     */
-    protected $response;
-
     /**
      * Session object
      *
@@ -145,26 +128,6 @@ class Web extends ApplicationBootstrap
         return $this->frontController;
     }
 
-    /**
-     * Get the request
-     *
-     * @return Request
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * Get the response
-     *
-     * @return Response
-     */
-    public function getResponse()
-    {
-        return $this->response;
-    }
-
     /**
      * Getter for view
      *
@@ -211,7 +174,7 @@ class Web extends ApplicationBootstrap
         $auth = Auth::getInstance();
         if ($auth->isAuthenticated()) {
             $user = $auth->getUser();
-            $this->request->setUser($user);
+            $this->getRequest()->setUser($user);
             $this->user = $user;
         }
         return $this;
@@ -239,28 +202,6 @@ class Web extends ApplicationBootstrap
         return $this;
     }
 
-    /**
-     * Set the request
-     *
-     * @return $this
-     */
-    private function setupRequest()
-    {
-        $this->request = new Request();
-        return $this;
-    }
-
-    /**
-     * Set the response
-     *
-     * @return $this
-     */
-    protected function setupResponse()
-    {
-        $this->response = new Response();
-        return $this;
-    }
-
     /**
      * Instantiate front controller
      *
@@ -269,7 +210,7 @@ class Web extends ApplicationBootstrap
     private function setupFrontController()
     {
         $this->frontController = Zend_Controller_Front::getInstance();
-        $this->frontController->setRequest($this->request);
+        $this->frontController->setRequest($this->getRequest());
         $this->frontController->setControllerDirectory($this->getApplicationDir('/controllers'));
         $this->frontController->setParams(
             array(

From 51aa22d429abc0280dc753576ae09b485ec583ca Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 15:10:33 +0200
Subject: [PATCH 2867/2920] Module: Allow to define additional CSS/LESS files

refs #9702
---
 library/Icinga/Application/Modules/Module.php | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index ad1ec1f5d..58a3f7929 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -162,6 +162,13 @@ class Module
      */
     private $app;
 
+    /**
+     * The CSS/LESS files this module provides
+     *
+     * @var array
+     */
+    protected $cssFiles = array();
+
     /**
      * Routes to add to the route chain
      *
@@ -388,6 +395,19 @@ class Module
         return $manager->getModule($name);
     }
 
+    /**
+     * Provide an additional CSS/LESS file
+     *
+     * @param   string  $path   The path to the file, relative to self::$cssdir
+     *
+     * @return  $this
+     */
+    protected function provideCssFile($path)
+    {
+        $this->cssFiles[] = $this->cssdir . DIRECTORY_SEPARATOR . $path;
+        return $this;
+    }
+
     /**
      * Test if module provides css
      *
@@ -395,7 +415,12 @@ class Module
      */
     public function hasCss()
     {
-        return file_exists($this->getCssFilename());
+        if (file_exists($this->getCssFilename())) {
+            return true;
+        }
+
+        $this->launchConfigScript();
+        return !empty($this->cssFiles);
     }
 
     /**
@@ -408,6 +433,18 @@ class Module
         return $this->cssdir . '/module.less';
     }
 
+    /**
+     * Return the CSS/LESS files this module provides
+     *
+     * @return  array
+     */
+    public function getCssFiles()
+    {
+        $files = $this->cssFiles;
+        $files[] = $this->getCssFilename();
+        return $files;
+    }
+
     /**
      * Test if module provides js
      *

From 712d545f4801d3c943e1b4e6a7408445252ffc45 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 15:10:54 +0200
Subject: [PATCH 2868/2920] Module: Allow to define additional Javascript files

refs #9702
---
 library/Icinga/Application/Modules/Module.php | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index 58a3f7929..7910bcda7 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -169,6 +169,13 @@ class Module
      */
     protected $cssFiles = array();
 
+    /**
+     * The Javascript files this module provides
+     *
+     * @var array
+     */
+    protected $jsFiles = array();
+
     /**
      * Routes to add to the route chain
      *
@@ -445,6 +452,19 @@ class Module
         return $files;
     }
 
+    /**
+     * Provide an additional Javascript file
+     *
+     * @param   string  $path   The path to the file, relative to self::$jsdir
+     *
+     * @return  $this
+     */
+    protected function provideJsFile($path)
+    {
+        $this->jsFiles[] = $this->jsdir . DIRECTORY_SEPARATOR . $path;
+        return $this;
+    }
+
     /**
      * Test if module provides js
      *
@@ -452,7 +472,12 @@ class Module
      */
     public function hasJs()
     {
-        return file_exists($this->getJsFilename());
+        if (file_exists($this->getJsFilename())) {
+            return true;
+        }
+
+        $this->launchConfigScript();
+        return !empty($this->jsFiles);
     }
 
     /**
@@ -465,6 +490,18 @@ class Module
         return $this->jsdir . '/module.js';
     }
 
+    /**
+     * Return the Javascript files this module provides
+     *
+     * @return  array
+     */
+    public function getJsFiles()
+    {
+        $files = $this->jsFiles;
+        $files[] = $this->getJsFilename();
+        return $files;
+    }
+
     /**
      * Get the module name
      *

From 9cea83242c59b48baf8390d763d2de477425985c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 15:14:29 +0200
Subject: [PATCH 2869/2920] StyleSheet: Load all available module stylesheets

refs #9702
---
 library/Icinga/Web/LessCompiler.php | 15 +++++++++++----
 library/Icinga/Web/StyleSheet.php   |  6 +++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/library/Icinga/Web/LessCompiler.php b/library/Icinga/Web/LessCompiler.php
index 13205f73c..eae3f565c 100644
--- a/library/Icinga/Web/LessCompiler.php
+++ b/library/Icinga/Web/LessCompiler.php
@@ -93,14 +93,21 @@ class LessCompiler
     public function addModule($name, $module)
     {
         if ($module->hasCss()) {
-            $this->source .= "\n/* CSS: modules/$name/module.less */\n"
+            $contents = array();
+            foreach ($module->getCssFiles() as $path) {
+                if (file_exists($path)) {
+                    $contents[] = "/* CSS: modules/$name/$path */\n" . file_get_contents($path);
+                }
+            }
+
+            $this->source .= ''
                 . '.icinga-module.module-'
                 . $name
                 . " {\n"
-                . file_get_contents($module->getCssFilename())
-                . "}\n\n"
-            ;
+                . join("\n\n", $contents)
+                . "}\n\n";
         }
+
         return $this;
     }
 
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index 2e8ecea2c..af807c6e4 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -76,7 +76,11 @@ class StyleSheet
         $files = $lessFiles;
         foreach ($app->getModuleManager()->getLoadedModules() as $name => $module) {
             if ($module->hasCss()) {
-                $files[] = $module->getCssFilename();
+                foreach ($module->getCssFiles() as $path) {
+                    if (file_exists($path)) {
+                        $files[] = $path;
+                    }
+                }
             }
         }
 

From c7cc9e66df0a9dbb38cfc7c64061a8ad927f58a7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 15:15:02 +0200
Subject: [PATCH 2870/2920] JavaScript: Load all available module javascript
 files

refs #9702
---
 library/Icinga/Web/JavaScript.php | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/library/Icinga/Web/JavaScript.php b/library/Icinga/Web/JavaScript.php
index ed39c1b39..8cce31bb0 100644
--- a/library/Icinga/Web/JavaScript.php
+++ b/library/Icinga/Web/JavaScript.php
@@ -42,17 +42,6 @@ class JavaScript
         'js/vendor/jquery.tipsy'
     );
 
-    public static function listModuleFiles()
-    {
-        $list = array();
-        foreach (Icinga::app()->getModuleManager()->getLoadedModules() as $name => $module) {
-            if ($module->hasJs()) {
-                $list[] = 'js/' . $name . '/module.js';
-            }
-        }
-        return $list;
-    }
-
     public static function sendMinified()
     {
         return self::send(true);
@@ -86,7 +75,11 @@ class JavaScript
 
         foreach (Icinga::app()->getModuleManager()->getLoadedModules() as $name => $module) {
             if ($module->hasJs()) {
-                $jsFiles[] = $module->getJsFilename();
+                foreach ($module->getJsFiles() as $path) {
+                    if (file_exists($path)) {
+                        $jsFiles[] = $path;
+                    }
+                }
             }
         }
         $files = array_merge($vendorFiles, $jsFiles);
@@ -114,7 +107,7 @@ class JavaScript
         }
 
         foreach ($jsFiles as $file) {
-            $js .= file_get_contents($file);
+            $js .= file_get_contents($file) . "\n\n\n";
         }
 
         if ($minified) {

From 2a1f0132bc7179188e836c4cfe15a077b71af4f9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 6 Aug 2015 15:40:20 +0200
Subject: [PATCH 2871/2920] Wizard: Properly process automatic submissions of
 the general config page

fixes #9855
---
 modules/setup/library/Setup/WebWizard.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 0a0aa090b..e3831e673 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -229,7 +229,10 @@ class WebWizard extends Wizard implements SetupWizard
         } elseif ($page->getName() === 'setup_general_config') {
             $authData = $this->getPageData('setup_authentication_type');
             if ($authData['type'] === 'db') {
-                $page->create()->getElement('global_config_backend')->setValue('db');
+                $page
+                    ->create($this->getRequestData($page, $request))
+                    ->getElement('global_config_backend')
+                    ->setValue('db');
                 $page->info(
                     mt(
                         'setup',

From 9b373e9d109910adb4ea03844be731bd49413d22 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 6 Aug 2015 17:21:52 +0200
Subject: [PATCH 2872/2920] Fix issue that caused IniWriter to fail on empty
 configs

---
 library/Icinga/File/Ini/Dom/Document.php | 1 +
 library/Icinga/File/Ini/Dom/Section.php  | 2 +-
 library/Icinga/File/Ini/IniWriter.php    | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/File/Ini/Dom/Document.php b/library/Icinga/File/Ini/Dom/Document.php
index eca296f2a..e9f2a5a4f 100644
--- a/library/Icinga/File/Ini/Dom/Document.php
+++ b/library/Icinga/File/Ini/Dom/Document.php
@@ -67,6 +67,7 @@ class Document
      */
     public function render()
     {
+        $sections = array();
         foreach ($this->sections as $section) {
             $sections []=  $section->render();
         }
diff --git a/library/Icinga/File/Ini/Dom/Section.php b/library/Icinga/File/Ini/Dom/Section.php
index 0ae9b689c..960003394 100644
--- a/library/Icinga/File/Ini/Dom/Section.php
+++ b/library/Icinga/File/Ini/Dom/Section.php
@@ -7,7 +7,7 @@ class Section
 {
     /**
      * @var string
-     *
+     */
     protected $name;
 
     /**
diff --git a/library/Icinga/File/Ini/IniWriter.php b/library/Icinga/File/Ini/IniWriter.php
index f6ad56680..ab024bf62 100644
--- a/library/Icinga/File/Ini/IniWriter.php
+++ b/library/Icinga/File/Ini/IniWriter.php
@@ -178,8 +178,9 @@ class IniWriter
                 Logger::warning('Section-less property ' . (string)$directives . ' was ignored.');
                 continue;
             }
-            $newSection = $newconfig->getSection($section);
-            if (isset($newSection)) {
+
+            if ($newconfig->hasSection($section)) {
+                $newSection = $newconfig->getSection($section);
                 $oldDomSection = $doc->getSection($section);
                 foreach ($directives as $key => $value) {
                     if ($value instanceof ConfigObject) {

From eebd8be7466142389f86f673b9398f839062c5fd Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 6 Aug 2015 17:39:46 +0200
Subject: [PATCH 2873/2920] Prevent configuration changes that would break PHP
 lib ini parser

---
 library/Icinga/File/Ini/Dom/Section.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/library/Icinga/File/Ini/Dom/Section.php b/library/Icinga/File/Ini/Dom/Section.php
index 960003394..64779cc62 100644
--- a/library/Icinga/File/Ini/Dom/Section.php
+++ b/library/Icinga/File/Ini/Dom/Section.php
@@ -3,6 +3,8 @@
 
 namespace Icinga\File\Ini\Dom;
 
+use Icinga\Exception\ConfigurationError;
+
 class Section
 {
     /**
@@ -33,8 +35,11 @@ class Section
     public function __construct($name)
     {
         $this->name = trim(str_replace("\n", ' ', $name));
+        if (false !== strpos($name, ';') || false !== strpos($name, ']')) {
+            throw new ConfigurationError(sprintf('Ini file error: invalid char in title: %s', $name));
+        }
         if (strlen($this->name) < 1) {
-            throw new Exception(sprintf('Ini parser error: empty section identifier'));
+            throw new ConfigurationError(sprintf('Ini file error: empty section identifier'));
         }
     }
 

From 308c8ccf79a145d2c26109919bbdb9c923d419ed Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 7 Aug 2015 09:26:50 +0200
Subject: [PATCH 2874/2920] Fix issue that caused exceptions when using
 sections with trailing or leading whitespaces

Trim all incoming section identifier to prevent ambiguities between parsd sections and input sections.
---
 library/Icinga/File/Ini/Dom/Document.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/File/Ini/Dom/Document.php b/library/Icinga/File/Ini/Dom/Document.php
index e9f2a5a4f..2f606a1f5 100644
--- a/library/Icinga/File/Ini/Dom/Document.php
+++ b/library/Icinga/File/Ini/Dom/Document.php
@@ -30,7 +30,7 @@ class Document
      */
     public function hasSection($name)
     {
-        return isset($this->sections[$name]);
+        return isset($this->sections[trim($name)]);
     }
 
     /**
@@ -40,7 +40,7 @@ class Document
      */
     public function getSection($name)
     {
-        return $this->sections[$name];
+        return $this->sections[trim($name)];
     }
 
     /**
@@ -51,7 +51,7 @@ class Document
      */
     public function setSection($name, Section $section)
     {
-        return $this->sections[$name] = $section;
+        return $this->sections[trim($name)] = $section;
     }
 
     /**
@@ -59,7 +59,7 @@ class Document
      */
     public function removeSection($name)
     {
-        unset ($this->sections[$name]);
+        unset ($this->sections[trim($name)]);
     }
 
     /**

From aa3cc9847ddf77e2444d3cae8f2965f34b2e6802 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Fri, 7 Aug 2015 12:55:19 +0200
Subject: [PATCH 2875/2920] Fix issue that bricked the dashboard when quotes in
 dashlets

Escape more special chars in IniWriter, support reading escaped readers in IniParser and add tests for all important escape cases.
---
 library/Icinga/File/Ini/Dom/Directive.php     | 27 +++++++-
 library/Icinga/File/Ini/Dom/Section.php       | 19 +++---
 library/Icinga/File/Ini/IniParser.php         | 22 ++++++-
 .../library/Icinga/File/Ini/IniParserTest.php | 63 +++++++++++++++++++
 .../library/Icinga/File/Ini/IniWriterTest.php | 57 +++++++++++++----
 5 files changed, 165 insertions(+), 23 deletions(-)
 create mode 100644 test/php/library/Icinga/File/Ini/IniParserTest.php

diff --git a/library/Icinga/File/Ini/Dom/Directive.php b/library/Icinga/File/Ini/Dom/Directive.php
index 9d090ee63..97bc6d37c 100644
--- a/library/Icinga/File/Ini/Dom/Directive.php
+++ b/library/Icinga/File/Ini/Dom/Directive.php
@@ -32,7 +32,7 @@ class Directive
      */
     public function __construct($key)
     {
-        $this->key = trim(str_replace("\n", ' ', $key));
+        $this->key = trim($key);
         if (strlen($this->key) < 1) {
             throw new Exception(sprintf('Ini parser error: empty key.'));
         }
@@ -46,12 +46,20 @@ class Directive
         return $this->key;
     }
 
+    /**
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
     /**
      * @param string    $value
      */
     public function setValue($value)
     {
-        $this->value = trim(str_replace("\n", ' ', $value));
+        $this->value = trim($value);
     }
 
     /**
@@ -67,10 +75,23 @@ class Directive
             }
             $str = implode(PHP_EOL, $comments) . PHP_EOL;
         }
-        $str .= sprintf('%s = "%s"', $this->key, $this->value);
+        $str .= sprintf('%s = "%s"', $this->sanitizeKey($this->key), $this->sanitizeValue($this->value));
         if (isset ($this->commentPost)) {
             $str .= ' ' . $this->commentPost->render();
         }
         return $str;
     }
+
+    protected function sanitizeKey($str)
+    {
+        return trim(str_replace(PHP_EOL, ' ', $str));
+    }
+
+    protected function sanitizeValue($str)
+    {
+        $str = trim($str);
+        $str = str_replace('\\', '\\\\', $str);
+        $str = str_replace('"', '\\"', $str);
+        return str_replace(PHP_EOL, ' ', $str);
+    }
 }
diff --git a/library/Icinga/File/Ini/Dom/Section.php b/library/Icinga/File/Ini/Dom/Section.php
index 64779cc62..e46d4f8ca 100644
--- a/library/Icinga/File/Ini/Dom/Section.php
+++ b/library/Icinga/File/Ini/Dom/Section.php
@@ -29,15 +29,10 @@ class Section
 
     /**
      * @param   string      $name
-     *
-     * @throws  Exception
      */
     public function __construct($name)
     {
-        $this->name = trim(str_replace("\n", ' ', $name));
-        if (false !== strpos($name, ';') || false !== strpos($name, ']')) {
-            throw new ConfigurationError(sprintf('Ini file error: invalid char in title: %s', $name));
-        }
+        $this->name = trim($name);
         if (strlen($this->name) < 1) {
             throw new ConfigurationError(sprintf('Ini file error: empty section identifier'));
         }
@@ -108,6 +103,16 @@ class Section
         if (isset($this->commentPost)) {
             $post = ' ' . $this->commentPost->render();
         }
-        return $cms . sprintf('[%s]', $this->name) . $post . PHP_EOL . $dirs;
+        return $cms . sprintf('[%s]', $this->sanitize($this->name)) . $post . PHP_EOL . $dirs;
+    }
+
+    protected function sanitize($str)
+    {
+        $str = trim($str);
+        $str = str_replace('\\', '\\\\', $str);
+        $str = str_replace('"', '\\"', $str);
+        $str = str_replace(']', '\\]', $str);
+        $str = str_replace(';', '\\;', $str);
+        return str_replace(PHP_EOL, ' ', $str);
     }
 }
diff --git a/library/Icinga/File/Ini/IniParser.php b/library/Icinga/File/Ini/IniParser.php
index 4f9813689..20ff6271d 100644
--- a/library/Icinga/File/Ini/IniParser.php
+++ b/library/Icinga/File/Ini/IniParser.php
@@ -14,6 +14,7 @@ class IniParser
 {
     const LINE_START = 0;
     const SECTION = 1;
+    const ESCAPE = 2;
     const DIRECTIVE_KEY = 4;
     const DIRECTIVE_VALUE_START = 5;
     const DIRECTIVE_VALUE = 6;
@@ -43,6 +44,7 @@ class IniParser
         $dir = null;
         $coms = array();
         $state = self::LINE_START;
+        $escaping = null;
         $token = '';
         $line = 0;
 
@@ -67,10 +69,19 @@ class IniParser
                     }
                     break;
 
+                case self::ESCAPE:
+                    $token .= $s;
+                    $state = $escaping;
+                    $escaping = null;
+                    break;
+
                 case self::SECTION:
                     if ($s === "\n") {
                         self::throwParseError('Unterminated SECTION', $line);
-                    } if ($s !== ']') {
+                    } elseif ($s === '\\') {
+                        $state = self::ESCAPE;
+                        $escaping = self::SECTION;
+                    } elseif ($s !== ']') {
                         $token .= $s;
                     } else {
                         $sec = new Section($token);
@@ -119,6 +130,11 @@ class IniParser
                     break;
 
                 case self::DIRECTIVE_VALUE:
+                    /*
+                        Escaping non-quoted values is not supported by php_parse_ini, it might
+                        be reasonable to include in case we are switching completely our own
+                        parser implementation
+                    */
                     if ($s === "\n" || $s === ";") {
                         $dir->setValue($token);
                         $token = '';
@@ -137,6 +153,9 @@ class IniParser
                 case self::DIRECTIVE_VALUE_QUOTED:
                     if ($s === "\n") {
                         self::throwParseError('Unterminated DIRECTIVE_VALUE_QUOTED', $line);
+                    } elseif ($s === '\\') {
+                        $state = self::ESCAPE;
+                        $escaping = self::DIRECTIVE_VALUE_QUOTED;
                     } elseif ($s !== '"') {
                         $token .= $s;
                     } else {
@@ -204,6 +223,7 @@ class IniParser
                 $sec->addDirective($dir);
                 break;
 
+            case self::ESCAPE:
             case self::DIRECTIVE_VALUE_QUOTED:
             case self::DIRECTIVE_KEY:
             case self::SECTION:
diff --git a/test/php/library/Icinga/File/Ini/IniParserTest.php b/test/php/library/Icinga/File/Ini/IniParserTest.php
new file mode 100644
index 000000000..bf9143e86
--- /dev/null
+++ b/test/php/library/Icinga/File/Ini/IniParserTest.php
@@ -0,0 +1,63 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Tests\Icinga\Config;
+
+use Icinga\File\Ini\Dom\Document;
+use Icinga\File\Ini\IniWriter;
+use Icinga\Test\BaseTestCase;
+use Icinga\Application\Config;
+use Icinga\File\Ini\IniParser;
+
+class IniParserTest extends BaseTestCase
+{
+    protected $tempFile;
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->tempFile = tempnam(sys_get_temp_dir(), 'icinga-ini-parser-test');
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+        unlink($this->tempFile);
+    }
+
+    public function testSectionNameEscaping()
+    {
+        $config = <<<'EOD'
+[title with \]bracket]
+key1 = "1"
+key2 = "2"
+
+[title with \"quote]
+key1 = "1"
+key2 = "2"
+EOD;
+        $doc = IniParser::parseIni($config);
+        $this->assertTrue(
+            $doc->hasSection('title with ]bracket'),
+            'IniParser does not recognize escaped bracket in section'
+        );
+        $this->assertTrue(
+            $doc->hasSection('title with "quote'),
+            'IniParser does not recognize escaped quote in section'
+        );
+    }
+
+    public function testDirectiveValueEscaping()
+    {
+        $config = <<<'EOD'
+[section]
+key1 = "key with escaped \"quote"
+EOD;
+        $doc = IniParser::parseIni($config);
+        $this->assertEquals(
+            'key with escaped "quote',
+            $doc->getSection('section')->getDirective('key1')->getValue(),
+            'IniParser does not recognize escaped bracket in section'
+        );
+    }
+}
diff --git a/test/php/library/Icinga/File/Ini/IniWriterTest.php b/test/php/library/Icinga/File/Ini/IniWriterTest.php
index a45e33e7b..18ca34046 100644
--- a/test/php/library/Icinga/File/Ini/IniWriterTest.php
+++ b/test/php/library/Icinga/File/Ini/IniWriterTest.php
@@ -285,26 +285,30 @@ inkey' => 'blarg'
     public function testSectionNameEscaping()
     {
         $config = <<<'EOD'
-[section 1]
-foo = "1337"
+[section [brackets\]]
+foo = "bar"
 
-[section (with special chars)]
-foo = "baz"
+[section \;comment]
+foo = "bar"
 
-[section/as/arbitrary/path]
-foo = "nope"
+[section \"quotes\"]
+foo = "bar"
 
-[section.with.dots.in.it]
+[section with \\]
+foo = "bar"
+
+[section with newline]
 foo = "bar"
 EOD;
         $target = $this->writeConfigToTemporaryFile($config);
         $writer = new IniWriter(
             Config::fromArray(
                 array(
-                    'section 1' => array('foo' => 1337),
-                    'section (with special chars)' => array('foo' => 'baz'),
-                    'section/as/arbitrary/path' => array('foo' => 'nope'),
-                    'section.with.dots.in.it' => array('foo' => 'bar')
+                    'section [brackets]' => array('foo' => 'bar'),
+                    'section ;comment' => array('foo' => 'bar'),
+                    'section "quotes"' => array('foo' => 'bar'),
+                    'section with \\' => array('foo' => 'bar'),
+                    'section with' . PHP_EOL . 'newline' => array('foo' => 'bar')
                 )
             ),
             $target
@@ -317,6 +321,36 @@ EOD;
         );
     }
 
+    public function testDirectiveValueEscaping()
+    {
+        $config = <<<'EOD'
+[section]
+key1 = "value with \"quotes\""
+key2 = "value with \\"
+key3 = "value with newline"
+
+EOD;
+        $target = $this->writeConfigToTemporaryFile($config);
+        $writer = new IniWriter(
+            Config::fromArray(
+                array(
+                    'section' => array(
+                        'key1' => 'value with "quotes"',
+                        'key2' => 'value with \\',
+                        'key3' => 'value with' . PHP_EOL . 'newline'
+                    )
+                )
+            ),
+            $target
+        );
+
+        $this->assertEquals(
+            trim($config),
+            trim($writer->render()),
+            'IniWriter does not handle special chars in directives properly.'
+        );
+    }
+
     public function testSectionDeleted()
     {
         $config = <<<'EOD'
@@ -356,7 +390,6 @@ EOD;
         );
     }
 
-
     /**
      * Write a INI-configuration string to a temporary file and return its path
      *

From 6560975fe2e3963bdfbad5ce0304d210798eb1b7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 7 Aug 2015 15:35:13 +0200
Subject: [PATCH 2876/2920] Host overview: Do not select
 `host_unhandled_services'

It's implemented as horribly slow subquery.

refs #9864
---
 modules/monitoring/application/controllers/ListController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 7c749a2a3..9a7199580 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -85,7 +85,6 @@ class Monitoring_ListController extends Controller
             'host_last_check',
             'host_last_state_change' => $stateChangeColumn,
             'host_notifications_enabled',
-            'host_unhandled_services',
             'host_action_url',
             'host_notes_url',
             'host_last_comment',

From 03d4386763197f3d754beb42ad5f75043cee0033 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 7 Aug 2015 15:36:24 +0200
Subject: [PATCH 2877/2920] Introduce HostservicestatussummaryQuery class

refs #9864
---
 .../Query/HostservicestatussummaryQuery.php   | 108 ++++++++++++++++++
 .../Backend/Ido/Query/HoststatusQuery.php     |   5 +-
 .../DataView/Hostservicestatussummary.php     |  21 ++++
 3 files changed, 132 insertions(+), 2 deletions(-)
 create mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/HostservicestatussummaryQuery.php
 create mode 100644 modules/monitoring/library/Monitoring/DataView/Hostservicestatussummary.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostservicestatussummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostservicestatussummaryQuery.php
new file mode 100644
index 000000000..5f49d07e3
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostservicestatussummaryQuery.php
@@ -0,0 +1,108 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
+
+use Icinga\Data\Filter\Filter;
+
+class HostservicestatussummaryQuery extends IdoQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $allowCustomVars = true;
+
+    /**
+     * The HoststatusQuery
+     *
+     * @var HoststatusQuery
+     */
+    protected $hostQuery;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $columnMap = array(
+        'statussummary' => array(
+            'host_name'                 => 'so.name1',
+            'unhandled_service_count'   => 'SUM(
+                CASE
+                    WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0
+                    THEN 0
+                    ELSE 1
+                END
+            )'
+        )
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function joinBaseTables()
+    {
+        $this->hostQuery = $this->createSubQuery('Hoststatus', array('object_id'));
+        $this->hostQuery->setIsSubQuery(); // TODO: Why is this necessary???
+
+        $this->select->from(
+            array('so' => $this->prefix . 'objects'),
+            array()
+        )->join(
+            array('s' => $this->prefix . 'services'),
+            's.service_object_id = so.object_id',
+            array()
+        )->join(
+            array('ss' => $this->prefix . 'servicestatus'),
+            'ss.service_object_id = so.object_id AND ss.current_state > 0',
+            array()
+        )->join(
+            array('hs' => $this->prefix . 'hoststatus'),
+            'hs.host_object_id = s.host_object_id',
+            array()
+        )->join(
+            array('h' => $this->hostQuery),
+            'h.object_id = s.host_object_id',
+            array()
+        );
+
+        $this->select->where('so.is_active = 1');
+        $this->select->group('so.name1');
+        $this->select->having($this->getMappedField('unhandled_service_count') . ' > 0');
+        $this->joinedVirtualTables['statussummary'] = true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addFilter(Filter $filter)
+    {
+        $this->hostQuery->addFilter($filter);
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function order($columnOrAlias, $dir = null)
+    {
+        $this->hostQuery->order($columnOrAlias, $dir);
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function where($condition, $value = null)
+    {
+        $this->hostQuery->where($condition, $value);
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function limit($count = null, $offset = null)
+    {
+        $this->hostQuery->limit($count, $offset);
+        return $this;
+    }
+}
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index 3feb37a9e..37d20e165 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -33,7 +33,8 @@ class HoststatusQuery extends IdoQuery
             'host_name'             => 'ho.name1',
             'host_notes'            => 'h.notes',
             'host_notes_url'        => 'h.notes_url',
-            'object_type'           => '(\'host\')'
+            'object_type'           => '(\'host\')',
+            'object_id'             => 'ho.object_id'
         ),
         'hoststatus' => array(
             'host_acknowledged'                     => 'hs.problem_has_been_acknowledged',
@@ -448,4 +449,4 @@ SQL;
 
         return $group;
     }
-}
+}
\ No newline at end of file
diff --git a/modules/monitoring/library/Monitoring/DataView/Hostservicestatussummary.php b/modules/monitoring/library/Monitoring/DataView/Hostservicestatussummary.php
new file mode 100644
index 000000000..c6b7224f8
--- /dev/null
+++ b/modules/monitoring/library/Monitoring/DataView/Hostservicestatussummary.php
@@ -0,0 +1,21 @@
+<?php
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+namespace Icinga\Module\Monitoring\DataView;
+
+class Hostservicestatussummary extends Hoststatus
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getColumns()
+    {
+        return array_merge(
+            parent::getColumns(),
+            array(
+                'host_name',
+                'unhandled_service_count'
+            )
+        );
+    }
+}

From a4fdb30067ef8e6d3084018d360ab673a6fc244e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 7 Aug 2015 15:37:35 +0200
Subject: [PATCH 2878/2920] Host Overview: Use a dedicated query to fetch
 service summaries

refs #9864
---
 .../application/controllers/ListController.php    | 15 +++++++++++++++
 .../application/views/scripts/list/hosts.phtml    | 10 +++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 9a7199580..a06a09d8c 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -120,6 +120,21 @@ class Monitoring_ListController extends Controller
             'host_address'      => $this->translate('Address'),
             'host_last_check'   => $this->translate('Last Check')
         ), $query);
+
+        $summary = $this->backend->select()->from('Hostservicestatussummary', array(
+            'host_name',
+            'unhandled_service_count'
+        ));
+        $summary->addFilter($query->getFilter());
+        $this->setupSortControl(array(
+            'host_severity'     => $this->translate('Severity'),
+            'host_state'        => $this->translate('Current State'),
+            'host_display_name' => $this->translate('Hostname'),
+            'host_address'      => $this->translate('Address'),
+            'host_last_check'   => $this->translate('Last Check')
+        ), $summary);
+        $summary->limit($query->getLimit(), $query->getOffset());
+        $this->view->summary = $summary->fetchPairs();
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 8938d5703..62ca65121 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -58,11 +58,11 @@ if (! $this->compact): ?>
             'class' => 'rowaction'
           )
         ); ?>
-        <?php if (isset($host->host_unhandled_services) && $host->host_unhandled_services > 0): ?>
+        <?php if (isset($summary[$host->host_name])): ?>
         <span> (<?= $this->qlink(
           sprintf(
-            $this->translatePlural('%u unhandled service', '%u unhandled services', $host->host_unhandled_services),
-            $host->host_unhandled_services
+            $this->translatePlural('%u unhandled service', '%u unhandled services', $summary[$host->host_name]),
+            $summary[$host->host_name]
           ),
           'monitoring/list/services',
           array(
@@ -76,9 +76,9 @@ if (! $this->compact): ?>
               $this->translatePlural(
                 'List %s unhandled service problem on host %s',
                 'List %s unhandled service problems on host %s',
-                $host->host_unhandled_services
+                $summary[$host->host_name]
               ),
-              $host->host_unhandled_services,
+              $summary[$host->host_name],
               $host->host_name
             )
           )

From 282aaa6e5b80e3e10717a7c489b71a7b273922d1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 10 Aug 2015 10:00:02 +0200
Subject: [PATCH 2879/2920] Load additional static files for modules, really

Since we're only processing the config script upon calling
Module::hasJs/Css() if no module.js or module.css exists,
we need to ensure that it's processed when calling
Module::getJS/CssFiles().

refs #9702
---
 library/Icinga/Application/Modules/Module.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index 7910bcda7..9ec35b565 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -447,6 +447,7 @@ class Module
      */
     public function getCssFiles()
     {
+        $this->launchConfigScript();
         $files = $this->cssFiles;
         $files[] = $this->getCssFilename();
         return $files;
@@ -497,6 +498,7 @@ class Module
      */
     public function getJsFiles()
     {
+        $this->launchConfigScript();
         $files = $this->jsFiles;
         $files[] = $this->getJsFilename();
         return $files;

From f0cabf059a615eefd2fa662a064b5206516db974 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 10 Aug 2015 10:20:49 +0200
Subject: [PATCH 2880/2920] view/downtimes: Add missing translate

refs #9266
---
 .../monitoring/application/views/scripts/list/downtimes.phtml   | 2 +-
 .../views/scripts/partials/downtime/downtime-header.phtml       | 2 +-
 .../views/scripts/partials/downtime/downtimes-header.phtml      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 6a231b785..1ff615094 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -38,7 +38,7 @@ if (! $this->compact): ?>
         <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
           <strong><?= $this->translate('Started'); ?></strong>
           <br>
-          Ends <?= $this->timeUntil($downtime->end, $this->compact) ?>
+          <?= sprintf($this->translate('Ends %s'),  $this->timeUntil($downtime->end, $this->compact)) ?>
         <?php else: ?>
           <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
           <br>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
index c80f8d473..ebb45ccb0 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
@@ -4,7 +4,7 @@
         <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
             <strong><?= $this->translate('Started'); ?></strong>
             <br>
-            Ends <?= $this->timeUntil($downtime->end, $this->compact) ?>
+            <?= sprintf($this->translate('Ends %s'), $this->timeUntil($downtime->end, $this->compact)) ?>
         <?php else: ?>
             <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
             <br>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index 390a9954a..4eb1b87eb 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -9,7 +9,7 @@
           <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
             <strong><?= $this->translate('Started'); ?></strong>
             <br>
-            Ends <?= $this->timeUntil($downtime->end, $this->compact) ?>
+            <?= sprintf($this->translate('Ends %s'), $this->timeUntil($downtime->end, $this->compact)) ?>
           <?php else: ?>
             <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
             <br>

From c88f0c7e37a62c08831c65846bc06fcfdabce3d4 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 10 Aug 2015 10:58:21 +0200
Subject: [PATCH 2881/2920] downtime/views: Use ends instead of started ...

refs #9266
---
 .../application/views/scripts/list/downtimes.phtml         | 4 ++--
 .../views/scripts/partials/downtime/downtime-header.phtml  | 4 ++--
 .../views/scripts/partials/downtime/downtimes-header.phtml | 4 ++--
 .../views/scripts/show/components/downtime.phtml           | 7 ++++++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 1ff615094..b588af952 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -36,9 +36,9 @@ if (! $this->compact): ?>
       <tr class="state <?= $stateName; ?><?= $downtime->is_in_effect ? ' handled' : ''; ?>">
         <td class="state">
         <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
-          <strong><?= $this->translate('Started'); ?></strong>
+          <strong><?= $this->translate('Ends'); ?></strong>
           <br>
-          <?= sprintf($this->translate('Ends %s'),  $this->timeUntil($downtime->end, $this->compact)) ?>
+          <?= $this->timeUntil($downtime->end, $this->compact) ?>
         <?php else: ?>
           <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
           <br>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
index ebb45ccb0..e722532b8 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
@@ -2,9 +2,9 @@
   <tr class="state <?= $stateName; ?><?= $downtime->is_in_effect ? ' handled' : ''; ?>">
     <td class="state">
         <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
-            <strong><?= $this->translate('Started'); ?></strong>
+            <strong><?= $this->translate('Ends'); ?></strong>
             <br>
-            <?= sprintf($this->translate('Ends %s'), $this->timeUntil($downtime->end, $this->compact)) ?>
+            <?= $this->timeUntil($downtime->end, $this->compact) ?>
         <?php else: ?>
             <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
             <br>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index 4eb1b87eb..83766b8b6 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -7,9 +7,9 @@
         <tr class="state <?= $downtime->stateText ?>">
           <td class="state">
           <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
-            <strong><?= $this->translate('Started'); ?></strong>
+            <strong><?= $this->translate('Ends'); ?></strong>
             <br>
-            <?= sprintf($this->translate('Ends %s'), $this->timeUntil($downtime->end, $this->compact)) ?>
+            <?= $this->timeUntil($downtime->end, $this->compact) ?>
           <?php else: ?>
             <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
             <br>
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index fb3d86df8..2228c35cd 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -53,7 +53,12 @@ if (empty($object->comments) && ! $addLink) {
                     $this->timeUntil($downtime->end)
                 );
             } else {
-                if ((bool) $downtime->is_fixed) {
+                if ($downtime->start <= time() && ! (bool) $downtime->is_in_effect) {
+                    $state = sprintf(
+                        $this->translate('ends %s', 'Last format parameter represents the end time'),
+                        $this->timeUntil($downtime->end)
+                    );
+                } elseif ((bool) $downtime->is_fixed) {
                     $state = sprintf(
                         $this->translate('scheduled %s', 'Last format parameter represents the time scheduled'),
                         $this->timeUntil($downtime->start)

From cb0b3c8754b0e8b1dc96b240f5f40a084b0503c2 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 10 Aug 2015 11:31:27 +0200
Subject: [PATCH 2882/2920] monitoring: Let PHP flush the writer buffer to the
 command file

refs #9570
---
 .../library/Monitoring/Command/Transport/LocalCommandFile.php    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
index 50b87aed5..00756da9d 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
@@ -122,7 +122,6 @@ class LocalCommandFile implements CommandTransportInterface
         try {
             $file = new File($this->path, $this->openMode);
             $file->fwrite($commandString . "\n");
-            $file->fflush();
         } catch (Exception $e) {
             $message = $e->getMessage();
             if ($e instanceof RuntimeException && ($pos = strrpos($message, ':')) !== false) {

From 18dae78d80e623235ebdab652341d1dee7b2dda6 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 10 Aug 2015 12:14:49 +0200
Subject: [PATCH 2883/2920] MonitoredObject: Add scheduled_end

refs #9266
---
 modules/monitoring/library/Monitoring/Object/MonitoredObject.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
index c3d2c1da9..5f278c92e 100644
--- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
+++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -279,6 +279,7 @@ abstract class MonitoredObject implements Filterable
             'author_name'       => 'downtime_author_name',
             'start'             => 'downtime_start',
             'scheduled_start'   => 'downtime_scheduled_start',
+            'scheduled_end'     => 'downtime_scheduled_end',
             'end'               => 'downtime_end',
             'duration'          => 'downtime_duration',
             'is_flexible'       => 'downtime_is_flexible',

From 073d695c941010ff843073d27e0e2303e5332963 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 10 Aug 2015 12:15:26 +0200
Subject: [PATCH 2884/2920] downtime/views: Fix the wrong time for flexible
 downtime

refs #9266
---
 .../monitoring/application/views/scripts/list/downtimes.phtml   | 2 +-
 .../views/scripts/partials/downtime/downtime-header.phtml       | 2 +-
 .../views/scripts/partials/downtime/downtimes-header.phtml      | 2 +-
 .../application/views/scripts/show/components/downtime.phtml    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index b588af952..1125aa9ba 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -38,7 +38,7 @@ if (! $this->compact): ?>
         <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
           <strong><?= $this->translate('Ends'); ?></strong>
           <br>
-          <?= $this->timeUntil($downtime->end, $this->compact) ?>
+          <?= $this->timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, $this->compact) ?>
         <?php else: ?>
           <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
           <br>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
index e722532b8..13bf8fe95 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
@@ -4,7 +4,7 @@
         <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
             <strong><?= $this->translate('Ends'); ?></strong>
             <br>
-            <?= $this->timeUntil($downtime->end, $this->compact) ?>
+            <?= $this->timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, $this->compact) ?>
         <?php else: ?>
             <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
             <br>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index 83766b8b6..16e0daee7 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -9,7 +9,7 @@
           <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
             <strong><?= $this->translate('Ends'); ?></strong>
             <br>
-            <?= $this->timeUntil($downtime->end, $this->compact) ?>
+            <?= $this->timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, $this->compact) ?>
           <?php else: ?>
             <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
             <br>
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 2228c35cd..7c7448626 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -56,7 +56,7 @@ if (empty($object->comments) && ! $addLink) {
                 if ($downtime->start <= time() && ! (bool) $downtime->is_in_effect) {
                     $state = sprintf(
                         $this->translate('ends %s', 'Last format parameter represents the end time'),
-                        $this->timeUntil($downtime->end)
+                        $this->timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end)
                     );
                 } elseif ((bool) $downtime->is_fixed) {
                     $state = sprintf(

From 72cf023bf8284404487531ea101bf43cffd06c6b Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 10 Aug 2015 12:32:15 +0200
Subject: [PATCH 2885/2920] donwtime/view: Fix condition statement

refs #9266
---
 .../application/views/scripts/show/components/downtime.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 7c7448626..03df6ed6e 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -53,7 +53,7 @@ if (empty($object->comments) && ! $addLink) {
                     $this->timeUntil($downtime->end)
                 );
             } else {
-                if ($downtime->start <= time() && ! (bool) $downtime->is_in_effect) {
+                if ($downtime->start <= time()) {
                     $state = sprintf(
                         $this->translate('ends %s', 'Last format parameter represents the end time'),
                         $this->timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end)

From d09ad2641f39ad7e3bb4e527fc6e8673dda6a380 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 10 Aug 2015 13:22:05 +0200
Subject: [PATCH 2886/2920] Remove CSS rule for class "timesince"

It's not used anywhere.
---
 modules/monitoring/public/css/module.less | 8 --------
 public/js/icinga/events.js                | 2 --
 2 files changed, 10 deletions(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 406031c19..3aabe1f51 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -335,10 +335,6 @@ table.action td.state, table.objectstate td.state {
   text-align: center;
 }
 
-table.action td.timesince {
-  width: 3.5em;
-}
-
 
 /* State row behaviour */
 
@@ -1117,10 +1113,6 @@ table.groupview {
           font-size: 0.8em;
         }
 
-        span.timesince {
-          font-size: 0.8em;
-        }
-
         &.ok {
           border-color: @colorOk;
         }
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 4bbba72fc..09781e6f8 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -40,8 +40,6 @@
                 icinga.loader.loadUrl(url, $(el)).autorefresh = true;
             });
 
-            $('td.state span.timesince').attr('title', null);
-
             var moduleName = el.data('icingaModule');
             if (moduleName) {
                 if (icinga.hasModule(moduleName)) {

From b902913220d05e1d4a277706de3e86ef563b747c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 10 Aug 2015 13:18:27 +0200
Subject: [PATCH 2887/2920] doc: Support setext-style only headers

Setext-style used to work before too but only if an atx-style header comes first.
---
 modules/doc/library/Doc/DocParser.php | 46 ++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/modules/doc/library/Doc/DocParser.php b/modules/doc/library/Doc/DocParser.php
index a35ebc05b..038ae3e02 100644
--- a/modules/doc/library/Doc/DocParser.php
+++ b/modules/doc/library/Doc/DocParser.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Module\Doc;
 
+use CachingIterator;
 use LogicException;
 use SplStack;
 use Icinga\Data\Tree\SimpleTree;
@@ -15,6 +16,20 @@ use Icinga\Module\Doc\Exception\DocException;
  */
 class DocParser
 {
+    /**
+     * Internal identifier for Atx-style headers
+     *
+     * @var int
+     */
+    const HEADER_ATX = 1;
+
+    /**
+     * Internal identifier for Setext-style headers
+     *
+     * @var int
+     */
+    const HEADER_SETEXT = 2;
+
     /**
      * Path to the documentation
      *
@@ -70,11 +85,11 @@ class DocParser
      * Extract atx- or setext-style headers from the given lines
      *
      * @param   string $line
-     * @param   string $lastLine
+     * @param   string $nextLine
      *
      * @return  array|null An array containing the header and the header level or null if there's nothing to extract
      */
-    protected function extractHeader($line, $lastLine)
+    protected function extractHeader($line, $nextLine)
     {
         if (! $line) {
             return null;
@@ -90,13 +105,14 @@ class DocParser
             if (! $header) {
                 return null;
             }
+            $headerStyle = static::HEADER_ATX;
         } elseif (
-            $line
-            && ($line[0] === '=' || $line[0] === '-')
-            && preg_match('/^[=-]+\s*$/', $line, $match) === 1
+            $nextLine
+            && ($nextLine[0] === '=' || $nextLine[0] === '-')
+            && preg_match('/^[=-]+\s*$/', $nextLine, $match) === 1
         ) {
             // Setext
-            $header = trim($lastLine);
+            $header = trim($line);
             if (! $header) {
                 return null;
             }
@@ -105,6 +121,7 @@ class DocParser
             } else {
                 $level = 2;
             }
+            $headerStyle = static::HEADER_SETEXT;
         }
         if ($header === null) {
             return null;
@@ -117,7 +134,7 @@ class DocParser
         } else {
             $id = null;
         }
-        return array($header, $id, $level);
+        return array($header, $id, $level, $headerStyle);
     }
 
     /**
@@ -133,10 +150,13 @@ class DocParser
             /** @var $fileInfo \SplFileInfo */
             $file = $fileInfo->openFile();
             $lastLine = null;
-            foreach ($file as $line) {
-                $header = $this->extractHeader($line, $lastLine);
+            $cachingIterator = new CachingIterator($file, CachingIterator::TOSTRING_USE_CURRENT);
+            for ($cachingIterator->rewind(); $line = $cachingIterator->valid(); $cachingIterator->next()) {
+                $fileIterator = $cachingIterator->getInnerIterator();
+                $line = $cachingIterator->current();
+                $header = $this->extractHeader($line, $fileIterator->valid() ? $fileIterator->current() : null);
                 if ($header !== null) {
-                    list($title, $id, $level) = $header;
+                    list($title, $id, $level, $headerStyle) = $header;
                     while (! $stack->isEmpty() && $stack->top()->getLevel() >= $level) {
                         $stack->pop();
                     }
@@ -169,14 +189,16 @@ class DocParser
                         $tree->addChild($section, $stack->top());
                     }
                     $stack->push($section);
+                    if ($headerStyle === static::HEADER_SETEXT) {
+                        $cachingIterator->next();
+                        continue;
+                    }
                 } else {
                     if ($stack->isEmpty()) {
                         throw new LogicException('Heading required');
                     }
                     $stack->top()->appendContent($line);
                 }
-                // Save last line for setext-style headers
-                $lastLine = $line;
             }
         }
         return $tree;

From 5ef8f95e5b2ecd21f9ea739fdff149929e22ea7c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 10 Aug 2015 13:22:16 +0200
Subject: [PATCH 2888/2920] doc: Replace whitespaces with - for section IDs

Fixes jQuery selector issues when jumping to an anchor.
---
 modules/doc/library/Doc/DocSection.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/doc/library/Doc/DocSection.php b/modules/doc/library/Doc/DocSection.php
index 4121fd69e..a8efc6fc3 100644
--- a/modules/doc/library/Doc/DocSection.php
+++ b/modules/doc/library/Doc/DocSection.php
@@ -88,6 +88,14 @@ class DocSection extends TreeNode
         return $this->content;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function setId($id)
+    {
+        return parent::setId(str_replace(' ', '-', (string) $id));
+    }
+
     /**
      * Set the header level
      *

From d90790e86d0a113be0bc5b48ab5691b0059ae824 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 10 Aug 2015 13:23:14 +0200
Subject: [PATCH 2889/2920] doc: Support header-less sections

---
 modules/doc/library/Doc/DocParser.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/modules/doc/library/Doc/DocParser.php b/modules/doc/library/Doc/DocParser.php
index 038ae3e02..bffe86db0 100644
--- a/modules/doc/library/Doc/DocParser.php
+++ b/modules/doc/library/Doc/DocParser.php
@@ -145,11 +145,11 @@ class DocParser
     public function getDocTree()
     {
         $tree = new SimpleTree();
-        $stack = new SplStack();
         foreach ($this->docIterator as $fileInfo) {
             /** @var $fileInfo \SplFileInfo */
             $file = $fileInfo->openFile();
             $lastLine = null;
+            $stack = new SplStack();
             $cachingIterator = new CachingIterator($file, CachingIterator::TOSTRING_USE_CURRENT);
             for ($cachingIterator->rewind(); $line = $cachingIterator->valid(); $cachingIterator->next()) {
                 $fileIterator = $cachingIterator->getInnerIterator();
@@ -195,7 +195,20 @@ class DocParser
                     }
                 } else {
                     if ($stack->isEmpty()) {
-                        throw new LogicException('Heading required');
+                        $title = ucfirst($file->getBasename('.' . pathinfo($file->getFilename(), PATHINFO_EXTENSION)));
+                        $id = $title;
+                        if ($tree->getNode($id) !== null) {
+                            $id = uniqid($id);
+                        }
+                        $section = new DocSection();
+                        $section
+                            ->setId($id)
+                            ->setTitle($title)
+                            ->setLevel(1)
+                            ->setNoFollow(true);
+                        $section->setChapter($section);
+                        $tree->addChild($section);
+                        $stack->push($section);
                     }
                     $stack->top()->appendContent($line);
                 }

From 6d24e09479e954a14b89d43e742cb7e1ad15227d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 10 Aug 2015 13:24:59 +0200
Subject: [PATCH 2890/2920] events.js: Some code style fixes in function
 applyHandlers

refs #9869
---
 public/js/icinga/events.js | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 09781e6f8..9eed7f566 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -30,37 +30,38 @@
         },
 
         // TODO: What's this?
-        applyHandlers: function (evt) {
-            var el = $(evt.target), self = evt.data.self;
+        applyHandlers: function (event) {
+            var $target = $(event.target);
+            var self = event.data.self;
             var icinga = self.icinga;
 
-            $('.dashboard > div', el).each(function(idx, el) {
-                var url = $(el).data('icingaUrl');
-                if (typeof url === 'undefined') return;
-                icinga.loader.loadUrl(url, $(el)).autorefresh = true;
+            $('.dashboard > div', $target).each(function(idx, el) {
+                var $element = $(el);
+                var $url = $element.data('icingaUrl');
+                if (typeof $url !== 'undefined') {
+                    icinga.loader.loadUrl($url, $element).autorefresh = true;
+                }
             });
 
-            var moduleName = el.data('icingaModule');
+            var moduleName = $target.data('icingaModule');
             if (moduleName) {
                 if (icinga.hasModule(moduleName)) {
-                    var module = icinga.module(moduleName);
-                    // NOT YET, the applyOnloadDings: module.applyEventHandlers(mod);
+                    icinga.module(moduleName);
                 }
             }
 
-            $('.icinga-module', el).each(function(idx, mod) {
+            $('.icinga-module', $target).each(function(idx, mod) {
                 var $mod = $(mod);
                 moduleName = $mod.data('icingaModule');
                 if (icinga.hasModule(moduleName)) {
-                    var module = icinga.module(moduleName);
-                    // NOT YET, the applyOnloadDings: module.applyEventHandlers(mod);
+                    icinga.module(moduleName);
                 }
             });
 
-            var searchField = $('#menu input.search', el);
+            var $searchField = $('#menu input.search', $target);
             // Remember initial search field value if any
-            if (searchField.length && searchField.val().length) {
-                self.searchValue = searchField.val();
+            if ($searchField.length && $searchField.val().length) {
+                self.searchValue = $searchField.val();
             }
 
             if (icinga.ui.isOneColLayout()) {

From b0a75dd89bb6c7f494d8aee2d126271326198ff0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 10 Aug 2015 13:25:08 +0200
Subject: [PATCH 2891/2920] lib: Fix PHPDoc in ConfigObject

---
 library/Icinga/Data/ConfigObject.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Data/ConfigObject.php b/library/Icinga/Data/ConfigObject.php
index de00e5b5e..230d7e979 100644
--- a/library/Icinga/Data/ConfigObject.php
+++ b/library/Icinga/Data/ConfigObject.php
@@ -173,8 +173,10 @@ class ConfigObject extends ArrayDatasource implements Iterator, ArrayAccess
     /**
      * Add a new property or section
      *
-     * @param   string  $key    The name of the new property or section
-     * @param   mixed   $value  The value to set for the new property or section
+     * @param   string  $key        The name of the new property or section
+     * @param   mixed   $value      The value to set for the new property or section
+     *
+     * @throws  ProgrammingError    If the key is null
      */
     public function offsetSet($key, $value)
     {
@@ -254,7 +256,7 @@ class ConfigObject extends ArrayDatasource implements Iterator, ArrayAccess
     /**
      * Merge the given data with this config
      *
-     * @param   array|Config    $data   An array or a config
+     * @param   array|ConfigObject $data An array or a config
      *
      * @return  $this
      */

From 1363ea4370b8f92fc3b6e79abb4cafd71949dc0f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 10 Aug 2015 14:02:19 +0200
Subject: [PATCH 2892/2920] Menu: Defer construction of the Url object to
 Menu::getUrl()

Before, the Url object was constructed in Menu::setUrl() which lead to an exception when parsing a module's configuration.php from our CLI.

refs #9375
---
 library/Icinga/Web/Menu.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 3ad8d347f..7992364b9 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -43,7 +43,7 @@ class Menu implements RecursiveIterator
     /**
      * The url of this menu
      *
-     * @var string
+     * @var string|null
      */
     protected $url;
 
@@ -404,21 +404,20 @@ class Menu implements RecursiveIterator
      */
     public function setUrl($url)
     {
-        if ($url instanceof Url) {
-            $this->url = $url;
-        } else {
-            $this->url = Url::fromPath($url);
-        }
+        $this->url = $url;
         return $this;
     }
 
     /**
      * Return the url of this menu
      *
-     * @return  Url
+     * @return Url|null
      */
     public function getUrl()
     {
+        if ($this->url !== null && ! $this->url instanceof Url) {
+            $this->url = Url::fromPath($this->url);
+        }
         return $this->url;
     }
 

From aa4e3c5a22100ed76e0bb537a1c49730110a76be Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 10 Aug 2015 14:05:08 +0200
Subject: [PATCH 2893/2920] Dashboard: Defer construction of the Url object to
 Dashlet::getUrl()

Before, the Url object was constructed in Dashlet::setUrl() and Dashlet::__construct8) which lead to an exception when parsing a module's configuration.php from our CLI.

refs #9375
---
 .../Icinga/Web/Widget/Dashboard/Dashlet.php   | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/library/Icinga/Web/Widget/Dashboard/Dashlet.php b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
index d972cc5d6..06d6851e2 100644
--- a/library/Icinga/Web/Widget/Dashboard/Dashlet.php
+++ b/library/Icinga/Web/Widget/Dashboard/Dashlet.php
@@ -20,7 +20,7 @@ class Dashlet extends UserWidget
     /**
      * The url of this Dashlet
      *
-     * @var \Icinga\Web\Url
+     * @var Url|null
      */
     private $url;
 
@@ -74,16 +74,13 @@ EOD;
     {
         $this->title = $title;
         $this->pane = $pane;
-        if ($url instanceof Url) {
-            $this->url = $url;
-        } elseif ($url) {
-            $this->url = Url::fromPath($url);
-        } else {
+        if (! $url) {
             throw new IcingaException(
                 'Cannot create dashboard dashlet "%s" without valid URL',
                 $title
             );
         }
+        $this->url = $url;
     }
 
     /**
@@ -107,10 +104,13 @@ EOD;
     /**
      * Retrieve the dashlets url
      *
-     * @return Url
+     * @return Url|null
      */
     public function getUrl()
     {
+        if ($this->url !== null && ! $this->url instanceof Url) {
+            $this->url = Url::fromPath($this->url);
+        }
         return $this->url;
     }
 
@@ -123,11 +123,7 @@ EOD;
      */
     public function setUrl($url)
     {
-        if ($url instanceof Url) {
-            $this->url = $url;
-        } else {
-            $this->url = Url::fromPath($url);
-        }
+        $this->url = $url;
         return $this;
     }
 
@@ -159,7 +155,7 @@ EOD;
     public function toArray()
     {
         $array = array(
-            'url'   => $this->url->getRelativeUrl(),
+            'url'   => $this->getUrl()->getRelativeUrl(),
             'title' => $this->getTitle()
         );
         if ($this->getDisabled() === true) {
@@ -178,9 +174,9 @@ EOD;
         }
 
         $view = $this->view();
-        $url = clone($this->url);
+        $url = $this->getUrl();
         $url->setParam('view', 'compact');
-        $iframeUrl = clone($url);
+        $iframeUrl = clone $url;
         $iframeUrl->setParam('isIframe');
 
         $searchTokens = array(

From 0468bddc8337194292d71443410486b25d076d1d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 10 Aug 2015 14:46:58 +0200
Subject: [PATCH 2894/2920] js: Ensure that rendered events of modules are
 called on page-load

fixes #9869
---
 public/js/icinga.js        | 57 ++++++++++++++++++++++++++--------
 public/js/icinga/events.js | 63 +++++++++++++++++++++++++++-----------
 2 files changed, 89 insertions(+), 31 deletions(-)

diff --git a/public/js/icinga.js b/public/js/icinga.js
index e1f1f8fdd..1f1127714 100644
--- a/public/js/icinga.js
+++ b/public/js/icinga.js
@@ -112,38 +112,69 @@
 
         /**
          * Load a given module by name
+         *
+         * @param   {string}    name
+         *
+         * @return  {boolean}
          */
         loadModule: function (name) {
 
-            if (this.hasModule(name)) {
+            if (this.isLoadedModule(name)) {
                 this.logger.error('Cannot load module ' + name + ' twice');
-                return;
+                return false;
             }
 
-            this.modules[name] = new Icinga.Module(this, name);
+            if (! this.hasModule(name)) {
+                this.logger.error('Cannot find module ' + name);
+                return false;
+            }
+
+            this.modules[name] = new Icinga.Module(
+                this,
+                name,
+                Icinga.availableModules[name]
+            );
+            return true;
         },
 
         /**
-         * Whether a module matching the given name exists
+         * Whether a module matching the given name exists or is loaded
+         *
+         * @param   {string}    name
+         *
+         * @return  {boolean}
          */
         hasModule: function (name) {
-            return 'undefined' !==  typeof this.modules[name] ||
+            return this.isLoadedModule(name) ||
                 'undefined' !== typeof Icinga.availableModules[name];
         },
 
+        /**
+         * Return whether the given module is loaded
+         *
+         * @param   {string}    name    The name of the module
+         *
+         * @returns {Boolean}
+         */
+        isLoadedModule: function (name) {
+            return 'undefined' !==  typeof this.modules[name];
+        },
+
         /**
          * Get a module by name
+         *
+         * @param   {string}    name
+         *
+         * @return  {object}
          */
         module: function (name) {
 
-            if ('undefined' === typeof this.modules[name]) {
-                if ('undefined' !== typeof Icinga.availableModules[name]) {
-                    this.modules[name] = new Icinga.Module(
-                        this,
-                        name,
-                        Icinga.availableModules[name]
-                    );
-                }
+            if (this.hasModule(name) && !this.isLoadedModule(name)) {
+                this.modules[name] = new Icinga.Module(
+                    this,
+                    name,
+                    Icinga.availableModules[name]
+                );
             }
 
             return this.modules[name];
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 9eed7f566..71408d712 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -13,6 +13,7 @@
         this.icinga = icinga;
 
         this.searchValue = '';
+        this.initializeModules = true;
     };
 
     Icinga.Events.prototype = {
@@ -35,6 +36,46 @@
             var self = event.data.self;
             var icinga = self.icinga;
 
+            if (self.initializeModules) {
+                var loaded = false;
+                var moduleName = $target.data('icingaModule');
+                if (moduleName) {
+                    if (icinga.hasModule(moduleName) && !icinga.isLoadedModule(moduleName)) {
+                        loaded |= icinga.loadModule(moduleName);
+                    }
+                }
+
+                $('.icinga-module', $target).each(function(idx, mod) {
+                    moduleName = $(mod).data('icingaModule');
+                    if (icinga.hasModule(moduleName) && !icinga.isLoadedModule(moduleName)) {
+                        loaded |= icinga.loadModule(moduleName);
+                    }
+                });
+
+                if (loaded) {
+                    // Modules may register their own handler for the 'renderend' event
+                    // so we need to ensure that it is called the first time they are
+                    // initialized
+                    event.stopImmediatePropagation();
+                    self.initializeModules = false;
+
+                    var $container = $target.closest('.container');
+                    if (! $container.length) {
+                        // The page obviously got loaded for the first time,
+                        // so we'll trigger the event for all containers
+                        $container = $('.container');
+                    }
+
+                    $container.trigger('rendered');
+
+                    // But since we're listening on this event by ourself, we'll have
+                    // to abort our own processing as we'll process it twice otherwise
+                    return false;
+                }
+            } else {
+                self.initializeModules = true;
+            }
+
             $('.dashboard > div', $target).each(function(idx, el) {
                 var $element = $(el);
                 var $url = $element.data('icingaUrl');
@@ -43,21 +84,6 @@
                 }
             });
 
-            var moduleName = $target.data('icingaModule');
-            if (moduleName) {
-                if (icinga.hasModule(moduleName)) {
-                    icinga.module(moduleName);
-                }
-            }
-
-            $('.icinga-module', $target).each(function(idx, mod) {
-                var $mod = $(mod);
-                moduleName = $mod.data('icingaModule');
-                if (icinga.hasModule(moduleName)) {
-                    icinga.module(moduleName);
-                }
-            });
-
             var $searchField = $('#menu input.search', $target);
             // Remember initial search field value if any
             if ($searchField.length && $searchField.val().length) {
@@ -75,13 +101,14 @@
          * Global default event handlers
          */
         applyGlobalDefaults: function () {
+            // Apply element-specific behavior whenever the layout is rendered
+            // Note: It is important that this is the first handler for this event!
+            $(document).on('rendered', { self: this }, this.applyHandlers);
+
             $.each(self.icinga.behaviors, function (name, behavior) {
                 behavior.bind($(document));
             });
 
-            // Apply element-specific behavior whenever the layout is rendered
-            $(document).on('rendered', { self: this }, this.applyHandlers);
-
             // We catch resize events
             $(window).on('resize', { self: this.icinga.ui }, this.icinga.ui.onWindowResize);
 

From fe805c82ca1093b4cc143e8a3974cceb287397df Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 10 Aug 2015 14:49:27 +0200
Subject: [PATCH 2895/2920] Support multi line values in INI files

---
 library/Icinga/File/Ini/IniParser.php             | 12 +++++++++---
 .../php/library/Icinga/File/Ini/IniParserTest.php | 15 +++++++++++++++
 .../php/library/Icinga/File/Ini/IniWriterTest.php |  8 +++-----
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/library/Icinga/File/Ini/IniParser.php b/library/Icinga/File/Ini/IniParser.php
index 20ff6271d..85ab20e18 100644
--- a/library/Icinga/File/Ini/IniParser.php
+++ b/library/Icinga/File/Ini/IniParser.php
@@ -23,6 +23,14 @@ class IniParser
     const COMMENT_END = 9;
     const LINE_END = 10;
 
+    /**
+     * Cancel the parsing with an error
+     *
+     * @param $message  The error description
+     * @param $line     The line in which the error occured
+     *
+     * @throws ConfigurationError
+     */
     private static function throwParseError($message, $line)
     {
         throw new ConfigurationError(sprintf('Ini parser error: %s. (l. %d)', $message, $line));
@@ -151,9 +159,7 @@ class IniParser
                     break;
 
                 case self::DIRECTIVE_VALUE_QUOTED:
-                    if ($s === "\n") {
-                        self::throwParseError('Unterminated DIRECTIVE_VALUE_QUOTED', $line);
-                    } elseif ($s === '\\') {
+                    if ($s === '\\') {
                         $state = self::ESCAPE;
                         $escaping = self::DIRECTIVE_VALUE_QUOTED;
                     } elseif ($s !== '"') {
diff --git a/test/php/library/Icinga/File/Ini/IniParserTest.php b/test/php/library/Icinga/File/Ini/IniParserTest.php
index bf9143e86..6d8822870 100644
--- a/test/php/library/Icinga/File/Ini/IniParserTest.php
+++ b/test/php/library/Icinga/File/Ini/IniParserTest.php
@@ -60,4 +60,19 @@ EOD;
             'IniParser does not recognize escaped bracket in section'
         );
     }
+
+    public function testMultilineValues()
+    {
+        $config = <<<'EOD'
+[section]
+key1 = "with some
+newline in the value"
+EOD;
+        $doc = IniParser::parseIni($config);
+        $this->assertEquals(
+            2,
+            count(explode("\n", $doc->getSection('section')->getDirective('key1')->getValue())),
+            'IniParser does not recognize multi-line values'
+        );
+    }
 }
diff --git a/test/php/library/Icinga/File/Ini/IniWriterTest.php b/test/php/library/Icinga/File/Ini/IniWriterTest.php
index 18ca34046..a78e96229 100644
--- a/test/php/library/Icinga/File/Ini/IniWriterTest.php
+++ b/test/php/library/Icinga/File/Ini/IniWriterTest.php
@@ -257,7 +257,7 @@ EOD;
         );
     }
 
-    public function testWhetherLinebreaksAreRemoved()
+    public function testWhetherLinebreaksAreProcessed()
     {
         $target = $this->writeConfigToTemporaryFile('');
         $writer = new IniWriter(
@@ -277,7 +277,7 @@ inkey' => 'blarg'
         $rendered = $writer->render();
         $this->assertEquals(
             count(explode("\n", $rendered)),
-            4,
+            5,
             'generated config should not contain more than three line breaks'
         );
     }
@@ -327,7 +327,6 @@ EOD;
 [section]
 key1 = "value with \"quotes\""
 key2 = "value with \\"
-key3 = "value with newline"
 
 EOD;
         $target = $this->writeConfigToTemporaryFile($config);
@@ -336,8 +335,7 @@ EOD;
                 array(
                     'section' => array(
                         'key1' => 'value with "quotes"',
-                        'key2' => 'value with \\',
-                        'key3' => 'value with' . PHP_EOL . 'newline'
+                        'key2' => 'value with \\'
                     )
                 )
             ),

From 438f2650dbbb6d8e01460caa9a39203bce09af10 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 10 Aug 2015 15:13:59 +0200
Subject: [PATCH 2896/2920] Conform to coding guidelines

Use exclusively getters and setters for accessing class variables. Add better documentation to INI parser and writer classes.
---
 library/Icinga/File/Ini/Dom/Comment.php   |  19 +++-
 library/Icinga/File/Ini/Dom/Directive.php | 104 ++++++++++++++++++----
 library/Icinga/File/Ini/Dom/Document.php  |  42 ++++++++-
 library/Icinga/File/Ini/Dom/Section.php   |  74 ++++++++++++---
 library/Icinga/File/Ini/IniParser.php     |  19 ++--
 library/Icinga/File/Ini/IniWriter.php     |   5 +-
 6 files changed, 221 insertions(+), 42 deletions(-)

diff --git a/library/Icinga/File/Ini/Dom/Comment.php b/library/Icinga/File/Ini/Dom/Comment.php
index 9cd9e416f..a1f6c04d2 100644
--- a/library/Icinga/File/Ini/Dom/Comment.php
+++ b/library/Icinga/File/Ini/Dom/Comment.php
@@ -3,14 +3,31 @@
 
 namespace Icinga\File\Ini\Dom;
 
+/**
+ * A single comment-line in an INI file
+ */
 class Comment
 {
     /**
+     * The comment text
+     *
      * @var string
      */
-    public $content;
+    protected $content;
 
     /**
+     * Set the text content of this comment
+     *
+     * @param $content
+     */
+    public function setContent($content)
+    {
+        $this->content = $content;
+    }
+
+    /**
+     * Render this comment into INI markup
+     *
      * @return string
      */
     public function render()
diff --git a/library/Icinga/File/Ini/Dom/Directive.php b/library/Icinga/File/Ini/Dom/Directive.php
index 97bc6d37c..0014d25bb 100644
--- a/library/Icinga/File/Ini/Dom/Directive.php
+++ b/library/Icinga/File/Ini/Dom/Directive.php
@@ -3,42 +3,57 @@
 
 namespace Icinga\File\Ini\Dom;
 
+use Icinga\Exception\ConfigurationError;
+
+/**
+ * A key value pair in a Section
+ */
 class Directive
 {
     /**
+     * The value of this configuration directive
+     *
      * @var string
      */
     protected $key;
 
     /**
+     * The immutable name of this configuration directive
+     *
      * @var string
      */
     protected $value;
 
     /**
-     * @var array
-     */
-    public $commentsPre;
-
-    /**
-     * @var string
-     */
-    public $commentPost;
-
-    /**
-     * @param   string    $key
+     * Comments added one line before this directive
      *
-     * @throws  Exception
+     * @var Comment[]   The comment lines
+     */
+    protected $commentsPre = null;
+
+    /**
+     * Comment added at the end of the same line
+     *
+     * @var Comment
+     */
+    protected $commentPost = null;
+
+    /**
+     * @param   string    $key  The name of this configuration directive
+     *
+     * @throws  ConfigurationError
      */
     public function __construct($key)
     {
         $this->key = trim($key);
         if (strlen($this->key) < 1) {
-            throw new Exception(sprintf('Ini parser error: empty key.'));
+            throw new ConfigurationError(sprintf('Ini error: empty directive key.'));
         }
     }
 
     /**
+     * Return the name of this directive
+     *
      * @return string
      */
     public function getKey()
@@ -47,7 +62,9 @@ class Directive
     }
 
     /**
-     * @return string
+     * Return the value of this configuration directive
+     *
+     * @return  string
      */
     public function getValue()
     {
@@ -55,7 +72,9 @@ class Directive
     }
 
     /**
-     * @param string    $value
+     * Set the value of this configuration directive
+     *
+     * @param   string      $value
      */
     public function setValue($value)
     {
@@ -63,7 +82,39 @@ class Directive
     }
 
     /**
-     * @return string
+     * Set the comments to be rendered on the line before this directive
+     *
+     * @param   Comment[]   $comments
+     */
+    public function setCommentsPre(array $comments)
+    {
+        $this->commentsPre = $comments;
+    }
+
+    /**
+     * Return the comments to be rendered on the line before this directive
+     *
+     * @return Comment[]
+     */
+    public function getCommentsPre()
+    {
+        return $this->commentsPre;
+    }
+
+    /**
+     * Set the comment rendered on the same line of this directive
+     *
+     * @param   Comment     $comment
+     */
+    public function setCommentPost(Comment $comment)
+    {
+        $this->commentPost = $comment;
+    }
+
+    /**
+     * Render this configuration directive into INI markup
+     *
+     * @return  string
      */
     public function render()
     {
@@ -82,16 +133,35 @@ class Directive
         return $str;
     }
 
+    /**
+     * Assure that the given identifier contains no newlines and pending or trailing whitespaces
+     *
+     * @param   $str    The string to sanitize
+     *
+     * @return string
+     */
     protected function sanitizeKey($str)
     {
         return trim(str_replace(PHP_EOL, ' ', $str));
     }
 
+    /**
+     * Escape the significant characters in directive values, normalize line breaks and assure that
+     * the character contains no linebreaks
+     *
+     * @param   $str    The string to sanitize
+     *
+     * @return mixed|string
+     */
     protected function sanitizeValue($str)
     {
         $str = trim($str);
         $str = str_replace('\\', '\\\\', $str);
         $str = str_replace('"', '\\"', $str);
-        return str_replace(PHP_EOL, ' ', $str);
+
+        // line breaks in the value should always match the current system EOL sequence
+        // to assure editable configuration files
+        $str = preg_replace("/(\r\n)|(\n)/", PHP_EOL, $str);
+        return $str;
     }
 }
diff --git a/library/Icinga/File/Ini/Dom/Document.php b/library/Icinga/File/Ini/Dom/Document.php
index 2f606a1f5..69b628916 100644
--- a/library/Icinga/File/Ini/Dom/Document.php
+++ b/library/Icinga/File/Ini/Dom/Document.php
@@ -6,16 +6,22 @@ namespace Icinga\File\Ini\Dom;
 class Document
 {
     /**
-     * @var array
+     * The sections of this INI file
+     *
+     * @var Section[]
      */
     protected $sections = array();
 
     /**
-     * @var array
+     * The comemnts at file end that belong to no particular section
+     *
+     * @var Comment[]
      */
-    public $commentsDangling;
+    protected $commentsDangling;
 
     /**
+     * Append a section to the end of this INI file
+     *
      * @param Section $section
      */
     public function addSection(Section $section)
@@ -24,6 +30,8 @@ class Document
     }
 
     /**
+     * Return whether this INI file has the section with the given key
+     *
      * @param   string  $name
      *
      * @return  bool
@@ -34,6 +42,8 @@ class Document
     }
 
     /**
+     * Return the section with the given name
+     *
      * @param   string  $name
      *
      * @return Section
@@ -44,6 +54,8 @@ class Document
     }
 
     /**
+     * Set the section with the given name
+     *
      * @param string  $name
      * @param Section $section
      *
@@ -55,6 +67,8 @@ class Document
     }
 
     /**
+     * Remove the section with the given name
+     *
      * @param string $name
      */
     public function removeSection($name)
@@ -63,6 +77,28 @@ class Document
     }
 
     /**
+     * Set the dangling comments at file end that belong to no particular directive
+     *
+     * @param Comment[] $comments
+     */
+    public function setCommentsDangling(array $comments)
+    {
+        $this->commentsDangling = $comments;
+    }
+
+    /**
+     * Get the dangling comments at file end that belong to no particular directive
+     *
+     * @return array
+     */
+    public function getCommentsDangling()
+    {
+        return $this->commentsDangling;
+    }
+
+    /**
+     * Render this document into the corresponding INI markup
+     *
      * @return string
      */
     public function render()
diff --git a/library/Icinga/File/Ini/Dom/Section.php b/library/Icinga/File/Ini/Dom/Section.php
index e46d4f8ca..dbc9188cb 100644
--- a/library/Icinga/File/Ini/Dom/Section.php
+++ b/library/Icinga/File/Ini/Dom/Section.php
@@ -5,30 +5,43 @@ namespace Icinga\File\Ini\Dom;
 
 use Icinga\Exception\ConfigurationError;
 
+/**
+ * A section in an INI file
+ */
 class Section
 {
     /**
+     * The immutable name of this section
+     *
      * @var string
      */
     protected $name;
 
     /**
-     * @var array
+     * All configuration directives of this section
+     *
+     * @var Directive[]
      */
     protected $directives = array();
 
     /**
-     * @var array
+     * Comments added one line before this section
+     *
+     * @var Comment[]
      */
-    public $commentsPre;
+    protected $commentsPre;
 
     /**
+     * Comment added at the end of the same line
+     *
      * @var string
      */
-    public $commentPost;
+    protected $commentPost;
 
     /**
-     * @param   string      $name
+     * @param   string  $name       The immutable name of this section
+     *
+     * @throws  ConfigurationError  When the section name is empty
      */
     public function __construct($name)
     {
@@ -39,7 +52,9 @@ class Section
     }
 
     /**
-     * @param Directive $directive
+     * Append a directive to the end of this section
+     *
+     * @param   Directive   $directive  The directive to append
      */
     public function addDirective(Directive $directive)
     {
@@ -47,7 +62,9 @@ class Section
     }
 
     /**
-     * @param string    $key
+     * Remove the directive with the given name
+     *
+     * @param   string      $key        They name of the directive to remove
      */
     public function removeDirective($key)
     {
@@ -55,7 +72,9 @@ class Section
     }
 
     /**
-     * @param   string  $key
+     * Return whether this section has a directive with the given key
+     *
+     * @param   string  $key            The name of the directive
      *
      * @return  bool
      */
@@ -65,6 +84,8 @@ class Section
     }
 
     /**
+     * Get the directive with the given key
+     *
      * @param $key  string
      *
      * @return Directive
@@ -75,7 +96,9 @@ class Section
     }
 
     /**
-     * @return string
+     * Return the name of this section
+     *
+     * @return string   The name
      */
     public function getName()
     {
@@ -83,6 +106,28 @@ class Section
     }
 
     /**
+     * Set the comments to be rendered on the line before this section
+     *
+     * @param   Comment[]   $comments
+     */
+    public function setCommentsPre(array $comments)
+    {
+        $this->commentsPre = $comments;
+    }
+
+    /**
+     * Set the comment rendered on the same line of this section
+     *
+     * @param   Comment     $comment
+     */
+    public function setCommentPost(Comment $comment)
+    {
+        $this->commentPost = $comment;
+    }
+
+    /**
+     * Render this section into INI markup
+     *
      * @return string
      */
     public function render()
@@ -90,7 +135,9 @@ class Section
         $dirs = '';
         $i = 0;
         foreach ($this->directives as $directive) {
-            $dirs .= (($i++ > 0 && ! empty($directive->commentsPre)) ? PHP_EOL : '') . $directive->render() . PHP_EOL;
+            $comments = $directive->getCommentsPre();
+            $dirs .= (($i++ > 0 && ! empty($comments)) ? PHP_EOL : '')
+                    . $directive->render() . PHP_EOL;
         }
         $cms = '';
         if (! empty($this->commentsPre)) {
@@ -106,6 +153,13 @@ class Section
         return $cms . sprintf('[%s]', $this->sanitize($this->name)) . $post . PHP_EOL . $dirs;
     }
 
+    /**
+     * Escape the significant characters in sections and normalize line breaks
+     *
+     * @param   $str    The string to sanitize
+     *
+     * @return  mixed
+     */
     protected function sanitize($str)
     {
         $str = trim($str);
diff --git a/library/Icinga/File/Ini/IniParser.php b/library/Icinga/File/Ini/IniParser.php
index 85ab20e18..43c96836d 100644
--- a/library/Icinga/File/Ini/IniParser.php
+++ b/library/Icinga/File/Ini/IniParser.php
@@ -93,7 +93,7 @@ class IniParser
                         $token .= $s;
                     } else {
                         $sec = new Section($token);
-                        $sec->commentsPre = $coms;
+                        $sec->setCommentsPre($coms);
                         $doc->addSection($sec);
                         $dir = null;
                         $coms = array();
@@ -108,8 +108,7 @@ class IniParser
                         $token .= $s;
                     } else {
                         $dir = new Directive($token);
-                        $dir->commentsPre = $coms;
-
+                        $dir->setCommentsPre($coms);
                         if (isset($sec)) {
                             $sec->addDirective($dir);
                         } else {
@@ -177,16 +176,16 @@ class IniParser
                         $token .= $s;
                     } else {
                         $com = new Comment();
-                        $com->content = $token;
+                        $com->setContent($token);
                         $token = '';
 
                         // Comments at the line end belong to the current line's directive or section. Comments
                         // on empty lines belong to the next directive that shows up.
                         if ($state === self::COMMENT_END) {
                             if (isset($dir)) {
-                                $dir->commentPost = $com;
+                                $dir->setCommentPost($com);
                             } else {
-                                $sec->commentPost = $com;
+                                $sec->setCommentPost($com);
                             }
                         } else {
                             $coms[] = $com;
@@ -212,12 +211,12 @@ class IniParser
             case self::COMMENT:
             case self::COMMENT_END:
                 $com = new Comment();
-                $com->content = $token;
+                $com->setContent($token);
                 if ($state === self::COMMENT_END) {
                     if (isset($dir)) {
-                        $dir->commentPost = $com;
+                        $dir->setCommentPost($com);
                     } else {
-                        $sec->commentPost = $com;
+                        $sec->setCommentPost($com);
                     }
                 } else {
                     $coms[] = $com;
@@ -236,7 +235,7 @@ class IniParser
                 self::throwParseError('File ended in unterminated state ' . $state, $line);
         }
         if (! empty($coms)) {
-            $doc->commentsDangling = $coms;
+            $doc->setCommentsDangling($coms);
         }
         return $doc;
     }
diff --git a/library/Icinga/File/Ini/IniWriter.php b/library/Icinga/File/Ini/IniWriter.php
index ab024bf62..8bf8241aa 100644
--- a/library/Icinga/File/Ini/IniWriter.php
+++ b/library/Icinga/File/Ini/IniWriter.php
@@ -117,7 +117,10 @@ class IniWriter
     protected function updateSectionOrder(Config $newconfig, Document $oldDoc)
     {
         $doc = new Document();
-        $doc->commentsDangling = $oldDoc->commentsDangling;
+        $dangling = $oldDoc->getCommentsDangling();
+        if (isset($dangling)) {
+            $doc->setCommentsDangling($dangling);
+        }
         foreach ($newconfig->toArray() as $section => $directives) {
             $doc->addSection($oldDoc->getSection($section));
         }

From 4e3fbb1341486cced581e7dea1eb463f90ccf0e1 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 10 Aug 2015 13:18:27 +0200
Subject: [PATCH 2897/2920] doc: Support setext-style only headers

Setext-style used to work before too but only if an atx-style header comes first.
---
 modules/doc/library/Doc/DocParser.php | 46 ++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/modules/doc/library/Doc/DocParser.php b/modules/doc/library/Doc/DocParser.php
index a35ebc05b..038ae3e02 100644
--- a/modules/doc/library/Doc/DocParser.php
+++ b/modules/doc/library/Doc/DocParser.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Module\Doc;
 
+use CachingIterator;
 use LogicException;
 use SplStack;
 use Icinga\Data\Tree\SimpleTree;
@@ -15,6 +16,20 @@ use Icinga\Module\Doc\Exception\DocException;
  */
 class DocParser
 {
+    /**
+     * Internal identifier for Atx-style headers
+     *
+     * @var int
+     */
+    const HEADER_ATX = 1;
+
+    /**
+     * Internal identifier for Setext-style headers
+     *
+     * @var int
+     */
+    const HEADER_SETEXT = 2;
+
     /**
      * Path to the documentation
      *
@@ -70,11 +85,11 @@ class DocParser
      * Extract atx- or setext-style headers from the given lines
      *
      * @param   string $line
-     * @param   string $lastLine
+     * @param   string $nextLine
      *
      * @return  array|null An array containing the header and the header level or null if there's nothing to extract
      */
-    protected function extractHeader($line, $lastLine)
+    protected function extractHeader($line, $nextLine)
     {
         if (! $line) {
             return null;
@@ -90,13 +105,14 @@ class DocParser
             if (! $header) {
                 return null;
             }
+            $headerStyle = static::HEADER_ATX;
         } elseif (
-            $line
-            && ($line[0] === '=' || $line[0] === '-')
-            && preg_match('/^[=-]+\s*$/', $line, $match) === 1
+            $nextLine
+            && ($nextLine[0] === '=' || $nextLine[0] === '-')
+            && preg_match('/^[=-]+\s*$/', $nextLine, $match) === 1
         ) {
             // Setext
-            $header = trim($lastLine);
+            $header = trim($line);
             if (! $header) {
                 return null;
             }
@@ -105,6 +121,7 @@ class DocParser
             } else {
                 $level = 2;
             }
+            $headerStyle = static::HEADER_SETEXT;
         }
         if ($header === null) {
             return null;
@@ -117,7 +134,7 @@ class DocParser
         } else {
             $id = null;
         }
-        return array($header, $id, $level);
+        return array($header, $id, $level, $headerStyle);
     }
 
     /**
@@ -133,10 +150,13 @@ class DocParser
             /** @var $fileInfo \SplFileInfo */
             $file = $fileInfo->openFile();
             $lastLine = null;
-            foreach ($file as $line) {
-                $header = $this->extractHeader($line, $lastLine);
+            $cachingIterator = new CachingIterator($file, CachingIterator::TOSTRING_USE_CURRENT);
+            for ($cachingIterator->rewind(); $line = $cachingIterator->valid(); $cachingIterator->next()) {
+                $fileIterator = $cachingIterator->getInnerIterator();
+                $line = $cachingIterator->current();
+                $header = $this->extractHeader($line, $fileIterator->valid() ? $fileIterator->current() : null);
                 if ($header !== null) {
-                    list($title, $id, $level) = $header;
+                    list($title, $id, $level, $headerStyle) = $header;
                     while (! $stack->isEmpty() && $stack->top()->getLevel() >= $level) {
                         $stack->pop();
                     }
@@ -169,14 +189,16 @@ class DocParser
                         $tree->addChild($section, $stack->top());
                     }
                     $stack->push($section);
+                    if ($headerStyle === static::HEADER_SETEXT) {
+                        $cachingIterator->next();
+                        continue;
+                    }
                 } else {
                     if ($stack->isEmpty()) {
                         throw new LogicException('Heading required');
                     }
                     $stack->top()->appendContent($line);
                 }
-                // Save last line for setext-style headers
-                $lastLine = $line;
             }
         }
         return $tree;

From 82d36e11cc7cf53f699730e5d5b97a83af5a95de Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 10 Aug 2015 13:22:16 +0200
Subject: [PATCH 2898/2920] doc: Replace whitespaces with - for section IDs

Fixes jQuery selector issues when jumping to an anchor.
---
 modules/doc/library/Doc/DocSection.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/doc/library/Doc/DocSection.php b/modules/doc/library/Doc/DocSection.php
index 4121fd69e..a8efc6fc3 100644
--- a/modules/doc/library/Doc/DocSection.php
+++ b/modules/doc/library/Doc/DocSection.php
@@ -88,6 +88,14 @@ class DocSection extends TreeNode
         return $this->content;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function setId($id)
+    {
+        return parent::setId(str_replace(' ', '-', (string) $id));
+    }
+
     /**
      * Set the header level
      *

From f1a63a36f56d30fbe93f041a3c0988f29f42efea Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 10 Aug 2015 13:23:14 +0200
Subject: [PATCH 2899/2920] doc: Support header-less sections

---
 modules/doc/library/Doc/DocParser.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/modules/doc/library/Doc/DocParser.php b/modules/doc/library/Doc/DocParser.php
index 038ae3e02..bffe86db0 100644
--- a/modules/doc/library/Doc/DocParser.php
+++ b/modules/doc/library/Doc/DocParser.php
@@ -145,11 +145,11 @@ class DocParser
     public function getDocTree()
     {
         $tree = new SimpleTree();
-        $stack = new SplStack();
         foreach ($this->docIterator as $fileInfo) {
             /** @var $fileInfo \SplFileInfo */
             $file = $fileInfo->openFile();
             $lastLine = null;
+            $stack = new SplStack();
             $cachingIterator = new CachingIterator($file, CachingIterator::TOSTRING_USE_CURRENT);
             for ($cachingIterator->rewind(); $line = $cachingIterator->valid(); $cachingIterator->next()) {
                 $fileIterator = $cachingIterator->getInnerIterator();
@@ -195,7 +195,20 @@ class DocParser
                     }
                 } else {
                     if ($stack->isEmpty()) {
-                        throw new LogicException('Heading required');
+                        $title = ucfirst($file->getBasename('.' . pathinfo($file->getFilename(), PATHINFO_EXTENSION)));
+                        $id = $title;
+                        if ($tree->getNode($id) !== null) {
+                            $id = uniqid($id);
+                        }
+                        $section = new DocSection();
+                        $section
+                            ->setId($id)
+                            ->setTitle($title)
+                            ->setLevel(1)
+                            ->setNoFollow(true);
+                        $section->setChapter($section);
+                        $tree->addChild($section);
+                        $stack->push($section);
                     }
                     $stack->top()->appendContent($line);
                 }

From 542d7e2db3b74c994abf43695caaf3e887e66d29 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 11 Aug 2015 11:29:25 +0200
Subject: [PATCH 2900/2920] HostcommentQuery: Fix services join

---
 .../library/Monitoring/Backend/Ido/Query/HostcommentQuery.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
index d649f2739..6fae0c658 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
@@ -142,7 +142,7 @@ class HostcommentQuery extends IdoQuery
     {
         $this->select->joinLeft(
             array('s' => $this->prefix . 'services'),
-            's.host_object_id = h.host_object_id',
+            's.host_object_id = ho.object_id',
             array()
         )->joinLeft(
             array('so' => $this->prefix . 'objects'),

From 589f0de063e1d97a6ebdfe808d759e0b4a9894a4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 11 Aug 2015 11:29:48 +0200
Subject: [PATCH 2901/2920] HostdowntimeQuery: Fix services join

---
 .../library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
index 63acc17fc..2776bcdc2 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
@@ -148,7 +148,7 @@ class HostdowntimeQuery extends IdoQuery
     {
         $this->select->joinLeft(
             array('s' => $this->prefix . 'services'),
-            's.host_object_id = h.host_object_id',
+            's.host_object_id = ho.object_id',
             array()
         )->joinLeft(
             array('so' => $this->prefix . 'objects'),

From 95da3772ce4677d4d2e44b4823301bc686bf1777 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 11 Aug 2015 13:48:08 +0200
Subject: [PATCH 2902/2920] Rename HostservicestatussummaryQuery...

...to HostserviceproblemsummaryQuery.

refs #9864
---
 ...estatussummaryQuery.php => HostserviceproblemsummaryQuery.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename modules/monitoring/library/Monitoring/Backend/Ido/Query/{HostservicestatussummaryQuery.php => HostserviceproblemsummaryQuery.php} (100%)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostservicestatussummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostserviceproblemsummaryQuery.php
similarity index 100%
rename from modules/monitoring/library/Monitoring/Backend/Ido/Query/HostservicestatussummaryQuery.php
rename to modules/monitoring/library/Monitoring/Backend/Ido/Query/HostserviceproblemsummaryQuery.php

From 41a1c7ce98295b820225bb0855a1adc820fa5dd4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 11 Aug 2015 13:48:41 +0200
Subject: [PATCH 2903/2920] Drop DataView\Hostservicestatussummary

It's unnecessary bloat.

refs #9864
---
 .../DataView/Hostservicestatussummary.php     | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 modules/monitoring/library/Monitoring/DataView/Hostservicestatussummary.php

diff --git a/modules/monitoring/library/Monitoring/DataView/Hostservicestatussummary.php b/modules/monitoring/library/Monitoring/DataView/Hostservicestatussummary.php
deleted file mode 100644
index c6b7224f8..000000000
--- a/modules/monitoring/library/Monitoring/DataView/Hostservicestatussummary.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\Module\Monitoring\DataView;
-
-class Hostservicestatussummary extends Hoststatus
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getColumns()
-    {
-        return array_merge(
-            parent::getColumns(),
-            array(
-                'host_name',
-                'unhandled_service_count'
-            )
-        );
-    }
-}

From 78fdf85c7e782ea7ddd53cfa8519183401d511b3 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 11 Aug 2015 13:51:30 +0200
Subject: [PATCH 2904/2920] ReFacTOR HostserviceproblemsummaryQuery

refs #9864
---
 .../Query/HostserviceproblemsummaryQuery.php  | 132 +++++++++++-------
 1 file changed, 82 insertions(+), 50 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostserviceproblemsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostserviceproblemsummaryQuery.php
index 5f49d07e3..b2fca387c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostserviceproblemsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostserviceproblemsummaryQuery.php
@@ -3,9 +3,7 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
-use Icinga\Data\Filter\Filter;
-
-class HostservicestatussummaryQuery extends IdoQuery
+class HostserviceproblemsummaryQuery extends IdoQuery
 {
     /**
      * {@inheritdoc}
@@ -13,18 +11,27 @@ class HostservicestatussummaryQuery extends IdoQuery
     protected $allowCustomVars = true;
 
     /**
-     * The HoststatusQuery
+     * The HoststatusQuery in use
      *
      * @var HoststatusQuery
      */
-    protected $hostQuery;
+    protected $hostStatusQuery;
 
     /**
      * {@inheritdoc}
      */
     protected $columnMap = array(
-        'statussummary' => array(
+        'services' => array(
             'host_name'                 => 'so.name1',
+            'service_description'       => 'so.name2'
+        ),
+        'hostgroups' => array(
+            'hostgroup_name'            => 'hgo.name1'
+        ),
+        'servicegroups' => array(
+            'servicegroup_name'         => 'sgo.name1'
+        ),
+        'problemsummary' => array(
             'unhandled_service_count'   => 'SUM(
                 CASE
                     WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0
@@ -35,14 +42,26 @@ class HostservicestatussummaryQuery extends IdoQuery
         )
     );
 
+    /**
+     * Set the HoststatusQuery to use
+     *
+     * @param   HoststatusQuery     $query
+     *
+     * @return  $this
+     */
+    public function setHoststatusQuery(HoststatusQuery $query)
+    {
+        $this->hostStatusQuery = clone $query;
+        $this->hostStatusQuery->setIsSubQuery();
+        $this->hostStatusQuery->columns(array('object_id'));
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */
     protected function joinBaseTables()
     {
-        $this->hostQuery = $this->createSubQuery('Hoststatus', array('object_id'));
-        $this->hostQuery->setIsSubQuery(); // TODO: Why is this necessary???
-
         $this->select->from(
             array('so' => $this->prefix . 'objects'),
             array()
@@ -50,7 +69,59 @@ class HostservicestatussummaryQuery extends IdoQuery
             array('s' => $this->prefix . 'services'),
             's.service_object_id = so.object_id',
             array()
-        )->join(
+        );
+
+        $this->select->group(array('so.name1'));
+        $this->select->where('so.is_active = 1');
+        $this->joinedVirtualTables['services'] = true;
+    }
+
+    /**
+     * Join host groups
+     */
+    protected function joinHostgroups()
+    {
+        $this->select->joinLeft(
+            array('hgm' => $this->prefix . 'hostgroup_members'),
+            'hgm.host_object_id = s.host_object_id',
+            array()
+        )->joinLeft(
+            array('hg' => $this->prefix . 'hostgroups'),
+            'hg.hostgroup_id = hgm.hostgroup_id',
+            array()
+        )->joinLeft(
+            array('hgo' => $this->prefix . 'objects'),
+            'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
+            array()
+        );
+    }
+
+    /**
+     * Join service groups
+     */
+    protected function joinServicegroups()
+    {
+        $this->select->joinLeft(
+            array('sgm' => $this->prefix . 'servicegroup_members'),
+            'sgm.service_object_id = so.object_id',
+            array()
+        )->joinLeft(
+            array('sg' => $this->prefix . 'servicegroups'),
+            'sgm.servicegroup_id = sg.servicegroup_id',
+            array()
+        )->joinLeft(
+            array('sgo' => $this->prefix . 'objects'),
+            'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
+            array()
+        );
+    }
+
+    /**
+     * Join the statussummary
+     */
+    protected function joinProblemsummary()
+    {
+        $this->select->join(
             array('ss' => $this->prefix . 'servicestatus'),
             'ss.service_object_id = so.object_id AND ss.current_state > 0',
             array()
@@ -59,50 +130,11 @@ class HostservicestatussummaryQuery extends IdoQuery
             'hs.host_object_id = s.host_object_id',
             array()
         )->join(
-            array('h' => $this->hostQuery),
+            array('h' => $this->hostStatusQuery),
             'h.object_id = s.host_object_id',
             array()
         );
 
-        $this->select->where('so.is_active = 1');
-        $this->select->group('so.name1');
         $this->select->having($this->getMappedField('unhandled_service_count') . ' > 0');
-        $this->joinedVirtualTables['statussummary'] = true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addFilter(Filter $filter)
-    {
-        $this->hostQuery->addFilter($filter);
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function order($columnOrAlias, $dir = null)
-    {
-        $this->hostQuery->order($columnOrAlias, $dir);
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function where($condition, $value = null)
-    {
-        $this->hostQuery->where($condition, $value);
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function limit($count = null, $offset = null)
-    {
-        $this->hostQuery->limit($count, $offset);
-        return $this;
     }
 }

From 00d143cb140610bbc9e913d28f1612ba74fca4c2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 11 Aug 2015 13:52:21 +0200
Subject: [PATCH 2905/2920] Fetch the service problem summary of a host with
 less redundant code

refs #9864
---
 .../application/controllers/ListController.php | 15 ++-------------
 .../Backend/Ido/Query/HoststatusQuery.php      | 18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index a06a09d8c..e200266ad 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -121,19 +121,8 @@ class Monitoring_ListController extends Controller
             'host_last_check'   => $this->translate('Last Check')
         ), $query);
 
-        $summary = $this->backend->select()->from('Hostservicestatussummary', array(
-            'host_name',
-            'unhandled_service_count'
-        ));
-        $summary->addFilter($query->getFilter());
-        $this->setupSortControl(array(
-            'host_severity'     => $this->translate('Severity'),
-            'host_state'        => $this->translate('Current State'),
-            'host_display_name' => $this->translate('Hostname'),
-            'host_address'      => $this->translate('Address'),
-            'host_last_check'   => $this->translate('Last Check')
-        ), $summary);
-        $summary->limit($query->getLimit(), $query->getOffset());
+        $summary = $query->getQuery()->queryServiceProblemSummary();
+        $this->applyRestriction('monitoring/filter/objects', $summary);
         $this->view->summary = $summary->fetchPairs();
     }
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index 37d20e165..c164a8bcf 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -449,4 +449,20 @@ SQL;
 
         return $group;
     }
-}
\ No newline at end of file
+
+    /**
+     * Query the service problem summary for all hosts of this query's result set
+     *
+     * @return  HostserviceproblemsummaryQuery
+     */
+    public function queryServiceProblemSummary()
+    {
+        return $this->createSubQuery('Hostserviceproblemsummary')
+            ->setHostStatusQuery($this)
+            ->columns(array(
+                'host_name',
+                'unhandled_service_count'
+            )
+        );
+    }
+}

From b9ea25506e7d55b0435554b2d283071896525108 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 11 Aug 2015 14:12:52 +0200
Subject: [PATCH 2906/2920] HoststatusQuery: Remove obsolete code to join
 service problems

---
 .../Backend/Ido/Query/HoststatusQuery.php     | 42 -------------------
 1 file changed, 42 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index c164a8bcf..a7b237851 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -148,9 +148,6 @@ class HoststatusQuery extends IdoQuery
             'servicegroup_name'     => 'sgo.name1',
             'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
         ),
-        'serviceproblemsummary' => array(
-            'host_unhandled_services' => 'sps.unhandled_services_count'
-        ),
         'services' => array(
             'service'                => 'so.name2 COLLATE latin1_general_ci',
             'service_description'    => 'so.name2',
@@ -331,45 +328,6 @@ SQL;
         );
     }
 
-    /**
-     * Join service problem summary
-     */
-    protected function joinServiceproblemsummary()
-    {
-        $select = <<<'SQL'
-SELECT
-    SUM(
-        CASE WHEN(ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0
-        THEN 0
-        ELSE 1
-        END
-    ) AS unhandled_services_count,
-    SUM(
-        CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0) ) > 0
-        THEN 1
-        ELSE 0
-        END
-    ) AS handled_services_count,
-    s.host_object_id
-FROM
-    icinga_servicestatus ss
-    JOIN icinga_objects o ON o.object_id = ss.service_object_id
-    JOIN icinga_services s ON s.service_object_id = o.object_id
-    JOIN icinga_hoststatus hs ON hs.host_object_id = s.host_object_id
-WHERE
-    o.is_active = 1
-    AND o.objecttype_id = 2
-    AND ss.current_state > 0
-GROUP BY
-    s.host_object_id
-SQL;
-        $this->select->joinLeft(
-            array('sps' => new Zend_Db_Expr('(' . $select . ')')),
-            'sps.host_object_id = ho.object_id',
-            array()
-        );
-    }
-
     /**
      * {@inheritdoc}
      */

From 737521e92120ba8c276babe374ee7ca82992e5c4 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 11 Aug 2015 14:05:23 +0200
Subject: [PATCH 2907/2920] Fix browser history hanging when both panes are
 pointing to the same site

fixes #9040
---
 public/js/icinga/history.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/icinga/history.js b/public/js/icinga/history.js
index db83dda87..a94e5aaab 100644
--- a/public/js/icinga/history.js
+++ b/public/js/icinga/history.js
@@ -174,7 +174,7 @@
                         redirect.val() + '#!' + parts[1]
                     );
                 } else {
-                    if ($('#col2').data('icingaUrl') !== main) {
+                    if ($('#col2').data('icingaUrl') !== parts[1]) {
                         icinga.loader.loadUrl(
                             parts[1],
                             $('#col2')

From fb3c98c5852822cf8d45018980f2b1348a1a0b35 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 11 Aug 2015 15:02:31 +0200
Subject: [PATCH 2908/2920] Remove some more obsolete code to join service
 problems

---
 .../Backend/Ido/Query/StatusQuery.php         | 40 -------------------
 .../Monitoring/DataView/Hoststatus.php        |  1 -
 2 files changed, 41 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index 5a3bba9e5..1dbb38eb7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -311,10 +311,6 @@ class StatusQuery extends IdoQuery
                 END'
         ),
 
-        'serviceproblemsummary' => array(
-            'host_unhandled_services' => 'sps.unhandled_services_count'
-        ),
-
         'lasthostcommentgeneric' => array(
             'host_last_comment' => 'hlcg.last_comment_data'
         ),
@@ -528,42 +524,6 @@ class StatusQuery extends IdoQuery
         return $this;
     }
 
-    protected function joinServiceproblemsummary()
-    {
-        $select = <<<'SQL'
-SELECT
-    SUM(
-        CASE WHEN(ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0
-        THEN 0
-        ELSE 1
-        END
-    ) AS unhandled_services_count,
-    SUM(
-        CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0) ) > 0
-        THEN 1
-        ELSE 0
-        END
-    ) AS handled_services_count,
-    s.host_object_id
-FROM
-    icinga_servicestatus ss
-    JOIN icinga_objects o ON o.object_id = ss.service_object_id
-    JOIN icinga_services s ON s.service_object_id = o.object_id
-    JOIN icinga_hoststatus hs ON hs.host_object_id = s.host_object_id
-WHERE
-    o.is_active = 1
-    AND o.objecttype_id = 2
-    AND ss.current_state > 0
-GROUP BY
-    s.host_object_id
-SQL;
-        $this->select->joinLeft(
-            array('sps' => new Zend_Db_Expr('(' . $select . ')')),
-            'sps.host_object_id = hs.host_object_id',
-            array()
-        );
-    }
-
     /**
      * Create a subquery to join comments into status query
      * @param   int     $entryType
diff --git a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php
index 9c2848618..4fb049c93 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php
@@ -33,7 +33,6 @@ class HostStatus extends DataView
             'host_check_command',
             'host_perfdata',
             'host_check_source',
-            'host_unhandled_services',
             'host_passive_checks_enabled',
             'host_passive_checks_enabled_changed',
             'host_obsessing',

From e1cec6a849b7eb1ada02145cab66dc7a5107a518 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 11 Aug 2015 15:07:03 +0200
Subject: [PATCH 2909/2920] Drop everything related to join last comments in
 list views

refs #8616
---
 .../controllers/HostController.php            |   3 -
 .../controllers/HostsController.php           |   4 -
 .../controllers/ListController.php            |   6 -
 .../controllers/ServicesController.php        |   4 -
 .../application/views/helpers/HostFlags.php   |   5 +-
 .../views/helpers/ServiceFlags.php            |  12 +-
 .../Backend/Ido/Query/HoststatusQuery.php     | 107 -------------
 .../Backend/Ido/Query/StatusQuery.php         | 149 ------------------
 .../Monitoring/DataView/Hoststatus.php        |   4 -
 .../Monitoring/DataView/Servicestatus.php     |   5 -
 10 files changed, 3 insertions(+), 296 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index ffc7fcdd3..1016092cf 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -98,9 +98,6 @@ class Monitoring_HostController extends MonitoredObjectController
             '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',
diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 675e639b2..9d5da9e50 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -57,9 +57,7 @@ class Monitoring_HostsController extends Controller
             'host_handled',
             'host_acknowledged',
             'host_in_downtime',
-            'host_last_ack',
             'host_is_flapping',
-            'host_last_comment',
             'host_output',
             'host_notifications_enabled',
             'host_active_checks_enabled',
@@ -96,9 +94,7 @@ class Monitoring_HostsController extends Controller
             'host_handled',
             'host_acknowledged',
             'host_in_downtime',
-            'host_last_ack',
             'host_is_flapping',
-            'host_last_comment',
             'host_output',
             'host_notifications_enabled',
             'host_active_checks_enabled',
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index e200266ad..3cbb9fca6 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -87,9 +87,6 @@ class Monitoring_ListController extends Controller
             'host_notifications_enabled',
             'host_action_url',
             'host_notes_url',
-            'host_last_comment',
-            'host_last_ack',
-            'host_last_downtime',
             'host_active_checks_enabled',
             'host_passive_checks_enabled',
             'host_current_check_attempt',
@@ -175,9 +172,6 @@ class Monitoring_ListController extends Controller
             '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',
diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php
index ba56c6144..d67880565 100644
--- a/modules/monitoring/application/controllers/ServicesController.php
+++ b/modules/monitoring/application/controllers/ServicesController.php
@@ -68,8 +68,6 @@ class Monitoring_ServicesController extends Controller
             'service_in_downtime',
             'service_is_flapping',
             'service_output',
-            'service_last_ack',
-            'service_last_comment',
             'service_notifications_enabled',
             'service_active_checks_enabled',
             'service_passive_checks_enabled'
@@ -115,8 +113,6 @@ class Monitoring_ServicesController extends Controller
             'service_acknowledged',
             'service_in_downtime',
             'service_is_flapping',
-            'service_last_comment',
-            'service_last_ack',
             'service_notifications_enabled',
             'service_active_checks_enabled',
             'service_passive_checks_enabled'
diff --git a/modules/monitoring/application/views/helpers/HostFlags.php b/modules/monitoring/application/views/helpers/HostFlags.php
index 97e6fbf3d..6e416691f 100644
--- a/modules/monitoring/application/views/helpers/HostFlags.php
+++ b/modules/monitoring/application/views/helpers/HostFlags.php
@@ -31,9 +31,6 @@ class Zend_View_Helper_HostFlags extends Zend_View_Helper_Abstract
                 $icons[] = $this->view->icon('eye-off', $this->view->translate('Active Checks Disabled'));
             }
         }
-        if (isset($host->host_last_comment) && $host->host_last_comment !== null) {
-            $icons[] = $this->view->icon('comment', $this->view->translate('Last Comment: ') . $host->host_last_comment);
-        }
         return $icons;
     }
-} 
\ No newline at end of file
+}
diff --git a/modules/monitoring/application/views/helpers/ServiceFlags.php b/modules/monitoring/application/views/helpers/ServiceFlags.php
index 7e71bebda..91b245cb2 100644
--- a/modules/monitoring/application/views/helpers/ServiceFlags.php
+++ b/modules/monitoring/application/views/helpers/ServiceFlags.php
@@ -9,12 +9,10 @@ class Zend_View_Helper_ServiceFlags extends Zend_View_Helper_Abstract
             $icons[] = $this->view->icon('attention-alt', $this->view->translate('Unhandled'));
         }
         if ($service->service_acknowledged && !$service->service_in_downtime) {
-            $icons[] = $this->view->icon('ok', $this->view->translate('Acknowledged') . (
-                $service->service_last_ack ? ': ' . $service->service_last_ack : ''
-            ));
+            $icons[] = $this->view->icon('ok', $this->view->translate('Acknowledged'));
         }
         if ($service->service_is_flapping) {
-            $icons[] = $this->view->icon('flapping', $this->view->translate('Flapping')) ;
+            $icons[] = $this->view->icon('flapping', $this->view->translate('Flapping'));
         }
         if (!$service->service_notifications_enabled) {
             $icons[] = $this->view->icon('bell-off-empty', $this->view->translate('Notifications Disabled'));
@@ -22,12 +20,6 @@ class Zend_View_Helper_ServiceFlags extends Zend_View_Helper_Abstract
         if ($service->service_in_downtime) {
             $icons[] = $this->view->icon('plug', $this->view->translate('In Downtime'));
         }
-        if (isset($service->service_last_comment) && $service->service_last_comment !== null) {
-            $icons[] = $this->view->icon(
-                'comment',
-                $this->view->translate('Last Comment: ') . $service->service_last_comment
-            );
-        }
         if (!$service->service_active_checks_enabled) {
             if (!$service->service_passive_checks_enabled) {
                 $icons[] = $this->view->icon('eye-off', $this->view->translate('Active And Passive Checks Disabled'));
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index a7b237851..968d5607e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -131,18 +131,6 @@ class HoststatusQuery extends IdoQuery
             'host_status_update_time'   => 'hs.status_update_time',
             'host_unhandled'            => 'CASE WHEN (hs.problem_has_been_acknowledged + hs.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END'
         ),
-        'lasthostackcomment' => array(
-            'host_last_ack' => 'hlac.last_ack_data'
-        ),
-        'lasthostcomment' => array(
-            'host_last_comment' => 'hlc.last_comment_data'
-        ),
-        'lasthostdowntimecomment' => array(
-            'host_last_downtime' => 'hldc.last_downtime_data'
-        ),
-        'lasthostflappingcomment' => array(
-            'host_last_flapping' => 'hlfc.last_flapping_data'
-        ),
         'servicegroups' => array(
             'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
             'servicegroup_name'     => 'sgo.name1',
@@ -155,37 +143,6 @@ class HoststatusQuery extends IdoQuery
         )
     );
 
-    /**
-     * Create a sub query to join comments into status query
-     *
-     * @param   int     $entryType
-     * @param   string  $alias
-     *
-     * @return  Zend_Db_Expr
-     */
-    protected function createLastCommentSubQuery($entryType, $alias)
-    {
-        $sql = <<<SQL
-SELECT
-  c.object_id,
-  '[' || c.author_name || '] ' || c.comment_data AS $alias
-FROM
-  icinga_comments c
-INNER JOIN
-  (
-    SELECT
-      MAX(comment_id) AS comment_id,
-      object_id
-    FROM
-      icinga_comments
-    WHERE
-      entry_type = $entryType
-    GROUP BY object_id
-  ) ec ON ec.comment_id = c.comment_id
-SQL;
-        return new Zend_Db_Expr('(' . $sql . ')');
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -242,54 +199,6 @@ SQL;
         );
     }
 
-    /**
-     * Join last host acknowledgement comment
-     */
-    protected function joinLasthostackcomment()
-    {
-        $this->select->joinLeft(
-            array('hlac' => $this->createLastCommentSubQuery(4, 'last_ack_data')),
-            'hlac.object_id = ho.object_id',
-            array()
-        );
-    }
-
-    /**
-     * Join last host comment
-     */
-    protected function joinLasthostcomment()
-    {
-        $this->select->joinLeft(
-            array('hlc' => $this->createLastCommentSubQuery(1, 'last_comment_data')),
-            'hlc.object_id = ho.object_id',
-            array()
-        );
-    }
-
-    /**
-     * Join last host downtime comment
-     */
-    protected function joinLasthostdowntimeComment()
-    {
-        $this->select->joinLeft(
-            array('hldc' => $this->createLastCommentSubQuery(2, 'last_downtime_data')),
-            'hldc.object_id = ho.object_id',
-            array()
-        );
-    }
-
-    /**
-     * Join last host flapping comment
-     */
-    protected function joinLasthostflappingcomment()
-    {
-        $this->select->joinLeft(
-            array('hlfc' => $this->createLastCommentSubQuery(3, 'last_flapping_data')),
-            'hlfc.object_id = ho.object_id',
-            array()
-        );
-    }
-
     /**
      * Join service groups
      */
@@ -344,22 +253,6 @@ SQL;
                 $group[] = 'sps.unhandled_services_count';
             }
 
-            if ($this->hasJoinedVirtualTable('lasthostackcomment')) {
-                $group[] = 'hlac.last_ack_data';
-            }
-
-            if ($this->hasJoinedVirtualTable('lasthostcomment')) {
-                $group[] = 'hlc.last_comment_data';
-            }
-
-            if ($this->hasJoinedVirtualTable('lasthostdowntimecomment')) {
-                $group[] = 'hldc.last_downtime_data';
-            }
-
-            if ($this->hasJoinedVirtualTable('lasthostflappingcomment')) {
-                $group[] = 'hlfc.last_flapping_data';
-            }
-
             if ($this->hasJoinedVirtualTable('hostgroups')) {
                 $selected = false;
                 foreach ($this->columns as $alias => $column) {
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index 1dbb38eb7..1a929a006 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -3,8 +3,6 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
-use Zend_Db_Expr;
-
 class StatusQuery extends IdoQuery
 {
     /**
@@ -310,38 +308,6 @@ class StatusQuery extends IdoQuery
                     ELSE 0
                 END'
         ),
-
-        'lasthostcommentgeneric' => array(
-            'host_last_comment' => 'hlcg.last_comment_data'
-        ),
-
-        'lasthostcommentdowntime' => array(
-            'host_last_downtime' => 'hlcd.last_downtime_data'
-        ),
-
-        'lasthostcommentflapping' => array(
-            'host_last_flapping' => 'hlcf.last_flapping_data'
-        ),
-
-        'lasthostcommentack' => array(
-            'host_last_ack' => 'hlca.last_ack_data'
-        ),
-
-        'lastservicecommentgeneric' => array(
-            'service_last_comment' => 'slcg.last_comment_data'
-        ),
-
-        'lastservicecommentdowntime' => array(
-            'service_last_downtime' => 'slcd.last_downtime_data'
-        ),
-
-        'lastservicecommentflapping' => array(
-            'service_last_flapping' => 'slcf.last_flapping_data'
-        ),
-
-        'lastservicecommentack' => array(
-            'service_last_ack' => 'slca.last_ack_data'
-        )
     );
 
     protected function joinBaseTables()
@@ -523,119 +489,4 @@ class StatusQuery extends IdoQuery
 
         return $this;
     }
-
-    /**
-     * Create a subquery to join comments into status query
-     * @param   int     $entryType
-     * @param   string  $fieldName
-     * @return  Zend_Db_Expr
-     */
-    protected function getLastCommentSubQuery($entryType, $fieldName)
-    {
-        $sub = '(SELECT'
-            . ' c.object_id,'
-            . " '[' || c.author_name || '] ' || c.comment_data AS $fieldName"
-            . ' FROM icinga_comments c JOIN ('
-            . ' SELECT MAX(comment_id) AS comment_id, object_id FROM icinga_comments'
-            . ' WHERE entry_type = ' . $entryType . ' GROUP BY object_id'
-            . ' ) lc ON c.comment_id = lc.comment_id)';
-
-        return new Zend_Db_Expr($sub);
-    }
-
-    /**
-     * Join last host comment
-     */
-    protected function joinLasthostcommentgeneric()
-    {
-        $this->select->joinLeft(
-            array('hlcg' => $this->getLastCommentSubQuery(1, 'last_comment_data')),
-            'hlcg.object_id = hs.host_object_id',
-            array()
-        );
-    }
-
-    /**
-     * Join last host downtime comment
-     */
-    protected function joinLasthostcommentdowntime()
-    {
-        $this->select->joinLeft(
-            array('hlcd' => $this->getLastCommentSubQuery(2, 'last_downtime_data')),
-            'hlcd.object_id = hs.host_object_id',
-            array()
-        );
-    }
-
-    /**
-     * Join last host flapping comment
-     */
-    protected function joinLastHostcommentflapping()
-    {
-        $this->select->joinLeft(
-            array('hlcf' => $this->getLastCommentSubQuery(3, 'last_flapping_data')),
-            'hlcf.object_id = hs.host_object_id',
-            array()
-        );
-    }
-
-    /**
-     * Join last host acknowledgement comment
-     */
-    protected function joinLasthostcommentack()
-    {
-        $this->select->joinLeft(
-            array('hlca' => $this->getLastCommentSubQuery(4, 'last_ack_data')),
-            'hlca.object_id = hs.host_object_id',
-            array()
-        );
-    }
-
-    /**
-     * Join last service comment
-     */
-    protected function joinLastservicecommentgeneric()
-    {
-        $this->select->joinLeft(
-            array('slcg' => $this->getLastCommentSubQuery(1, 'last_comment_data')),
-            'slcg.object_id = ss.service_object_id',
-            array()
-        );
-    }
-
-    /**
-     * Join last service downtime comment
-     */
-    protected function joinLastservicecommentdowntime()
-    {
-        $this->select->joinLeft(
-            array('slcd' => $this->getLastCommentSubQuery(2, 'last_downtime_data')),
-            'slcd.object_id = ss.service_object_id',
-            array()
-        );
-    }
-
-    /**
-     * Join last service flapping comment
-     */
-    protected function joinLastservicecommentflapping()
-    {
-        $this->select->joinLeft(
-            array('slcf' => $this->getLastCommentSubQuery(3, 'last_flapping_data')),
-            'slcf.object_id = ss.service_object_id',
-            array()
-        );
-    }
-
-    /**
-     * Join last service acknowledgement comment
-     */
-    protected function joinLastservicecommentack()
-    {
-        $this->select->joinLeft(
-            array('slca' => $this->getLastCommentSubQuery(4, 'last_ack_data')),
-            'slca.object_id = ss.service_object_id',
-            array()
-        );
-    }
 }
diff --git a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php
index 4fb049c93..c9f98ec43 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hoststatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hoststatus.php
@@ -51,10 +51,6 @@ class HostStatus extends DataView
             'host_current_notification_number',
             'host_percent_state_change',
             'host_is_flapping',
-            'host_last_comment',
-            'host_last_downtime',
-            'host_last_ack',
-            'host_last_flapping',
             'host_action_url',
             'host_notes_url',
             'host_percent_state_change',
diff --git a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
index a4516a93a..00997bced 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
@@ -49,10 +49,6 @@ class ServiceStatus extends DataView
             'service_notifications_enabled_changed',
             'service_action_url',
             'service_notes_url',
-            'service_last_comment',
-            'service_last_downtime',
-            'service_last_flapping',
-            'service_last_ack',
             'service_last_check',
             'service_next_check',
             'service_attempt',
@@ -69,7 +65,6 @@ class ServiceStatus extends DataView
             'host_unhandled_service_count',
             'host_action_url',
             'host_notes_url',
-            'host_last_comment',
             'host_display_name',
             'host_alias',
             'host_ipv4',

From 9b25ffa5665e9ba049a635c8ecca4e37fead749c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 11 Aug 2015 15:28:37 +0200
Subject: [PATCH 2910/2920] Perfdata: Do not show "xx more..." if there is
 nothing to show

---
 .../application/views/helpers/Perfdata.php          | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 8957027c6..090aff03e 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -89,12 +89,15 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
             }
         }
         if ($limit > 0) {
-            $count = max(count($table), count($results));
-            $table = array_slice($table, 0, $limit);
-            $results = array_slice($results, 0, $limit);
+            $count = $compact ? count($results) : count($table);
             if ($count > $limit) {
-                $mess = sprintf($this->view->translate('%d more ...'), $count - $limit);
-                $results[] = '<span title="' . $mess . '">...</span>';
+                if ($compact) {
+                    $results = array_slice($results, 0, $limit);
+                    $title = sprintf($this->view->translate('%d more ...'), $count - $limit);
+                    $results[] = '<span title="' . $title . '">...</span>';
+                } else {
+                    $table = array_slice($table, 0, $limit);
+                }
             }
         }
         if ($compact) {

From ad8f16c185aa00198149d3086256464fc4db98bd Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Tue, 11 Aug 2015 16:37:05 +0200
Subject: [PATCH 2911/2920] Cookie: Set the rigth license line header

refs #7383
---
 library/Icinga/Web/Cookie.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Cookie.php b/library/Icinga/Web/Cookie.php
index 888425151..9b10c7f8c 100644
--- a/library/Icinga/Web/Cookie.php
+++ b/library/Icinga/Web/Cookie.php
@@ -1,6 +1,5 @@
 <?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
+/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 namespace Icinga\Web;
 

From 6ba86619bcdcd6e6f7bb764ed55721264bf60653 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 11 Aug 2015 17:41:24 +0200
Subject: [PATCH 2912/2920] Assure that the history is updated when calling
 'rendered'

fixes #9819
---
 public/js/icinga/loader.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 56e2f8532..a6f1de885 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -636,6 +636,8 @@
                 }
             }
 
+            req.$target.trigger('rendered');
+
             this.icinga.ui.refreshDebug();
         },
 
@@ -795,9 +797,6 @@
                 }, 0);
             }
 
-            // TODO: this.icinga.events.refreshContainer(container);
-            $container.trigger('rendered');
-
             if (scrollPos !== false) {
                 $container.scrollTop(scrollPos);
             }

From 5ae5b5e8d38c5a9b3e216f0d3c3a66aadf709509 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 12 Aug 2015 13:39:30 +0200
Subject: [PATCH 2913/2920] ServicestatusQuery: Add missing query columns

refs #7344
---
 .../Backend/Ido/Query/ServicestatusQuery.php  | 102 ++++++++++++++----
 .../Monitoring/DataView/Servicestatus.php     |   1 +
 2 files changed, 82 insertions(+), 21 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
index 0a03f273d..e04cabfda 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -32,6 +32,7 @@ class ServicestatusQuery extends IdoQuery
             'host_icon_image'       => 'h.icon_image',
             'host_icon_image_alt'   => 'h.icon_image_alt',
             'host_ipv4'             => 'INET_ATON(h.address)',
+            'host_notes'            => 'h.notes',
             'host_notes_url'        => 'h.notes_url'
         ),
         'hoststatus' => array(
@@ -45,6 +46,7 @@ class ServicestatusQuery extends IdoQuery
             'host_check_latency'                    => 'hs.latency',
             'host_check_source'                     => 'hs.check_source',
             'host_check_type'                       => 'hs.check_type',
+            'host_check_timeperiod_object_id'       => 'hs.check_timeperiod_object_id',
             'host_current_check_attempt'            => 'hs.current_check_attempt',
             'host_current_notification_number'      => 'hs.current_notification_number',
             'host_event_handler'                    => 'hs.event_handler',
@@ -87,6 +89,10 @@ class ServicestatusQuery extends IdoQuery
             'host_process_performance_data'         => 'hs.process_performance_data',
             'host_retry_check_interval'             => 'hs.retry_check_interval',
             'host_scheduled_downtime_depth'         => 'hs.scheduled_downtime_depth',
+            'host_state'                            => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END',
+            'host_state_type'                       => 'hs.state_type',
+            'host_status_update_time'               => 'hs.status_update_time',
+            'host_unhandled'                        => 'CASE WHEN (hs.problem_has_been_acknowledged + hs.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END',
             'host_severity'                         => 'CASE WHEN hs.current_state = 0
             THEN
                 CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL
@@ -122,11 +128,7 @@ class ServicestatusQuery extends IdoQuery
             CASE WHEN hs.state_type = 1
                 THEN 8
                 ELSE 0
-            END',
-            'host_state'                => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END',
-            'host_state_type'           => 'hs.state_type',
-            'host_status_update_time'   => 'hs.status_update_time',
-            'host_unhandled'            => 'CASE WHEN (hs.problem_has_been_acknowledged + hs.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END'
+            END'
         ),
         'services' => array(
             'host'                      => 'so.name1 COLLATE latin1_general_ci',
@@ -140,7 +142,8 @@ class ServicestatusQuery extends IdoQuery
             'service_host_name'         => 'so.name1',
             'service_icon_image'        => 's.icon_image',
             'service_icon_image_alt'    => 's.icon_image_alt',
-            'service_notes_url'         => 's.notes_url'
+            'service_notes_url'         => 's.notes_url',
+            'service_notes'             => 's.notes'
         ),
         'servicegroups' => array(
             'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
@@ -148,17 +151,67 @@ class ServicestatusQuery extends IdoQuery
             'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
         ),
         'servicestatus' => array(
-            'service_active_checks_enabled'     => 'ss.active_checks_enabled',
-            'service_event_handler_enabled'     => 'ss.event_handler_enabled',
-            'service_flap_detection_enabled'    => 'ss.flap_detection_enabled',
-            'service_handled'                   => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0 THEN 1 ELSE 0 END',
-            'service_hard_state'                => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE CASE WHEN ss.state_type = 1 THEN ss.current_state ELSE ss.last_hard_state END END',
-            'service_is_flapping'               => 'ss.is_flapping',
-            'service_is_passive_checked'        => 'CASE WHEN ss.active_checks_enabled = 0 AND ss.passive_checks_enabled = 1 THEN 1 ELSE 0 END',
-            'service_last_hard_state_change'    => 'UNIX_TIMESTAMP(ss.last_hard_state_change)',
-            'service_last_state_change'         => 'UNIX_TIMESTAMP(ss.last_state_change)',
-            'service_notifications_enabled'     => 'ss.notifications_enabled',
-            'service_severity'                  => 'CASE WHEN ss.current_state = 0
+            'service_state_type'                        => 'ss.state_type',
+            'service_output'                            => 'ss.output',
+            'service_long_output'                       => 'ss.long_output',
+            'service_perfdata'                          => 'ss.perfdata',
+            'service_check_source'                      => 'ss.check_source',
+            'service_acknowledged'                      => 'ss.problem_has_been_acknowledged',
+            'service_check_command'                     => 'ss.check_command',
+            'service_last_time_ok'                      => 'ss.last_time_ok',
+            'service_last_time_warning'                 => 'ss.last_time_warning',
+            'service_last_time_critical'                => 'ss.last_time_critical',
+            'service_last_time_unknown'                 => 'ss.last_time_unknown',
+            'service_current_check_attempt'             => 'ss.current_check_attempt',
+            'service_max_check_attempts'                => 'ss.max_check_attempts',
+            'service_attempt'                           => 'ss.current_check_attempt || \'/\' || ss.max_check_attempts',
+            'service_last_check'                        => 'UNIX_TIMESTAMP(ss.last_check)',
+            'service_next_check'                        => 'UNIX_TIMESTAMP(ss.next_check)',
+            'service_check_type'                        => 'ss.check_type',
+            'service_last_hard_state_change'            => 'UNIX_TIMESTAMP(ss.last_hard_state_change)',
+            'service_last_hard_state'                   => 'ss.last_hard_state',
+            'service_last_notification'                 => 'UNIX_TIMESTAMP(ss.last_notification)',
+            'service_next_notification'                 => 'UNIX_TIMESTAMP(ss.next_notification)',
+            'service_no_more_notifications'             => 'ss.no_more_notifications',
+            'service_problem_has_been_acknowledged'     => 'ss.problem_has_been_acknowledged',
+            'service_acknowledgement_type'              => 'ss.acknowledgement_type',
+            'service_current_notification_number'       => 'ss.current_notification_number',
+            'service_percent_state_change'              => 'ss.percent_state_change',
+            'service_check_latency'                     => 'ss.latency',
+            'service_check_execution_time'              => 'ss.execution_time',
+            'service_scheduled_downtime_depth'          => 'ss.scheduled_downtime_depth',
+            'service_failure_prediction_enabled'        => 'ss.failure_prediction_enabled',
+            'service_process_performance_data'          => 'ss.process_performance_data',
+            'service_modified_service_attributes'       => 'ss.modified_service_attributes',
+            'service_event_handler'                     => 'ss.event_handler',
+            'service_normal_check_interval'             => 'ss.normal_check_interval',
+            'service_retry_check_interval'              => 'ss.retry_check_interval',
+            'service_check_timeperiod_object_id'        => 'ss.check_timeperiod_object_id',
+            'service_status_update_time'                => 'ss.status_update_time',
+            'service_passive_checks_enabled'            => 'ss.passive_checks_enabled',
+            'service_is_reachable'                      => 'ss.is_reachable',
+            'service_passive_checks_enabled_changed'    => 'CASE WHEN ss.passive_checks_enabled=s.passive_checks_enabled THEN 0 ELSE 1 END',
+            'service_active_checks_enabled'             => 'ss.active_checks_enabled',
+            'service_active_checks_enabled_changed'     => 'CASE WHEN ss.active_checks_enabled=s.active_checks_enabled THEN 0 ELSE 1 END',
+            'service_event_handler_enabled'             => 'ss.event_handler_enabled',
+            'service_event_handler_enabled_changed'     => 'CASE WHEN ss.event_handler_enabled=s.event_handler_enabled THEN 0 ELSE 1 END',
+            'service_flap_detection_enabled'            => 'ss.flap_detection_enabled',
+            'service_flap_detection_enabled_changed'    => 'CASE WHEN ss.flap_detection_enabled=s.flap_detection_enabled THEN 0 ELSE 1 END',
+            'service_obsessing'                         => 'ss.obsess_over_service',
+            'service_obsessing_changed'                 => 'CASE WHEN ss.obsess_over_service=s.obsess_over_service THEN 0 ELSE 1 END',
+            'service_handled'                           => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0 THEN 1 ELSE 0 END',
+            'service_hard_state'                        => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE CASE WHEN ss.state_type = 1 THEN ss.current_state ELSE ss.last_hard_state END END',
+            'service_is_flapping'                       => 'ss.is_flapping',
+            'service_is_passive_checked'                => 'CASE WHEN ss.active_checks_enabled = 0 AND ss.passive_checks_enabled = 1 THEN 1 ELSE 0 END',
+            'service_last_hard_state_change'            => 'UNIX_TIMESTAMP(ss.last_hard_state_change)',
+            'service_last_state_change'                 => 'UNIX_TIMESTAMP(ss.last_state_change)',
+            'service_notifications_enabled'             => 'ss.notifications_enabled',
+            'service_notifications_enabled_changed'     => 'CASE WHEN ss.notifications_enabled=s.notifications_enabled THEN 0 ELSE 1 END',
+            'service_in_downtime'                       => 'CASE WHEN (ss.scheduled_downtime_depth = 0 OR ss.scheduled_downtime_depth IS NULL) THEN 0 ELSE 1 END',
+            'service_state'                             => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END',
+            'service_unhandled'                         => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) = 0 THEN 1 ELSE 0 END',
+            'service_problem'                           => 'CASE WHEN COALESCE(ss.current_state, 0) = 0 THEN 0 ELSE 1 END',
+            'service_severity'                          => 'CASE WHEN ss.current_state = 0
             THEN
                 CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL
                      THEN 16
@@ -198,9 +251,7 @@ class ServicestatusQuery extends IdoQuery
             CASE WHEN ss.state_type = 1
                 THEN 8
                 ELSE 0
-            END',
-            'service_state'                     => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END',
-            'service_unhandled'                 => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) = 0 THEN 1 ELSE 0 END',
+            END'
         )
     );
 
@@ -209,6 +260,15 @@ class ServicestatusQuery extends IdoQuery
      */
     protected function joinBaseTables()
     {
+        if (version_compare($this->getIdoVersion(), '1.10.0', '<')) {
+            $this->columnMap['hoststatus']['host_check_source'] = '(NULL)';
+            $this->columnMap['servicestatus']['service_check_source'] = '(NULL)';
+        }
+        if (version_compare($this->getIdoVersion(), '1.13.0', '<')) {
+            $this->columnMap['hoststatus']['host_is_reachable'] = '(NULL)';
+            $this->columnMap['servicestatus']['service_is_reachable'] = '(NULL)';
+        }
+
         $this->select->from(
             array('so' => $this->prefix . 'objects'),
             array()
@@ -275,7 +335,7 @@ class ServicestatusQuery extends IdoQuery
             array()
         )->joinLeft(
             array('sg' => $this->prefix . 'servicegroups'),
-            'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
+            'sg.servicegroup_id = sgm.servicegroup_id',
             array()
         )->joinLeft(
             array('sgo' => $this->prefix . 'objects'),
diff --git a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
index 00997bced..c8072572c 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
@@ -48,6 +48,7 @@ class ServiceStatus extends DataView
             'service_notifications_enabled',
             'service_notifications_enabled_changed',
             'service_action_url',
+            'service_notes',
             'service_notes_url',
             'service_last_check',
             'service_next_check',

From dc7d3a9c924b90f0ea433f54e22583eeccce9c17 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 12 Aug 2015 13:40:17 +0200
Subject: [PATCH 2914/2920] ServicestatusQuery: Respect an already set group
 clause

refs #7344
---
 .../Backend/Ido/Query/ServicestatusQuery.php           | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
index e04cabfda..ce988e944 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -362,9 +362,15 @@ class ServicestatusQuery extends IdoQuery
      */
     public function getGroup()
     {
-        $group = array();
+        $group = parent::getGroup() ?: array();
+        if (! is_array($group)) {
+            $group = array($group);
+        }
+
         if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('servicegroups')) {
-            $group = array('s.service_id', 'so.object_id');
+            $group[] = 's.service_id';
+            $group[] = 'so.object_id';
+
             if ($this->hasJoinedVirtualTable('hosts')) {
                 $group[] = 'h.host_id';
             }

From 2b049eb6f9389f1619114e026c4abd8715c92ab7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 12 Aug 2015 13:41:15 +0200
Subject: [PATCH 2915/2920] Drop the StatusQuery

refs #7344
---
 .../Backend/Ido/Query/StatusQuery.php         | 492 ------------------
 .../Monitoring/DataView/Servicestatus.php     |  15 -
 2 files changed, 507 deletions(-)
 delete mode 100644 modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
deleted file mode 100644
index 1a929a006..000000000
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ /dev/null
@@ -1,492 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\Module\Monitoring\Backend\Ido\Query;
-
-class StatusQuery extends IdoQuery
-{
-    /**
-     * This mode represents whether we are in HostStatus or ServiceStatus
-     *
-     * Implemented for `distinct as workaround
-     *
-     * @TODO Subject to change, see #7344
-     *
-     * @var string
-     */
-    protected $mode;
-
-    /**
-     * Sets the mode of the current query
-     *
-     * @TODO Subject to change, see #7344
-     *
-     * @param string $mode
-     */
-    public function setMode($mode)
-    {
-        $this->mode = $mode;
-    }
-
-    protected $allowCustomVars = true;
-
-    protected $columnMap = array(
-        'hosts' => array(
-            'host'                  => 'ho.name1 COLLATE latin1_general_ci',
-            'host_name'             => 'ho.name1',
-            'host_display_name'     => 'h.display_name COLLATE latin1_general_ci',
-            'host_alias'            => 'h.alias',
-            'host_address'          => 'h.address',
-            'host_ipv4'             => 'INET_ATON(h.address)',
-            'host_icon_image'       => 'h.icon_image',
-            'host_icon_image_alt'   => 'h.icon_image_alt',
-            'host_action_url'       => 'h.action_url',
-            'host_notes'            => 'h.notes',
-            'host_notes_url'        => 'h.notes_url'
-        ),
-        'hoststatus' => array(
-            'host_state'                  => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE hs.current_state END',
-            'host_hard_state'             => 'CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 99 ELSE CASE WHEN hs.state_type = 1 THEN hs.current_state ELSE hs.last_hard_state END END',
-            'host_output'                 => 'hs.output',
-            'host_long_output'            => 'hs.long_output',
-            'host_perfdata'               => 'hs.perfdata',
-            'host_check_source'           => 'hs.check_source',
-            'host_acknowledged'           => 'hs.problem_has_been_acknowledged',
-            'host_in_downtime'            => 'CASE WHEN (hs.scheduled_downtime_depth = 0) THEN 0 ELSE 1 END',
-            'host_handled'                => 'CASE WHEN (hs.problem_has_been_acknowledged + hs.scheduled_downtime_depth) > 0 THEN 1 ELSE 0 END',
-            'host_unhandled'              => 'CASE WHEN (hs.problem_has_been_acknowledged + hs.scheduled_downtime_depth) = 0 THEN 1 ELSE 0 END',
-            'host_last_state_change'      => 'UNIX_TIMESTAMP(hs.last_state_change)',
-            'host_last_hard_state'        => 'hs.last_hard_state',
-            'host_last_hard_state_change' => 'UNIX_TIMESTAMP(hs.last_hard_state_change)',
-            'host_check_command'          => 'hs.check_command',
-            'host_last_check'             => 'UNIX_TIMESTAMP(hs.last_check)',
-            'host_next_check'             => 'CASE hs.should_be_scheduled WHEN 1 THEN UNIX_TIMESTAMP(hs.next_check) ELSE NULL END',
-            'host_check_execution_time'   => 'hs.execution_time',
-            'host_check_latency'          => 'hs.latency',
-            'host_problem'                => 'CASE WHEN COALESCE(hs.current_state, 0) = 0 THEN 0 ELSE 1 END',
-
-            'host_notifications_enabled'  => 'hs.notifications_enabled',
-
-            'host_notifications_enabled_changed'  => 'CASE WHEN hs.notifications_enabled=h.notifications_enabled
-                THEN 0 ELSE 1 END',
-
-            'host_last_time_up'           => 'UNIX_TIMESTAMP(hs.last_time_up)',
-            'host_last_time_down'         => 'UNIX_TIMESTAMP(hs.last_time_down)',
-            'host_last_time_unreachable'  => 'UNIX_TIMESTAMP(hs.last_time_unreachable)',
-            'host_current_check_attempt'  => 'hs.current_check_attempt',
-            'host_max_check_attempts'     => 'hs.max_check_attempts',
-            'host_attempt'                => 'hs.current_check_attempt || \'/\' || hs.max_check_attempts',
-            'host_check_type' => 'hs.check_type',
-            'host_state_type' => 'hs.state_type',
-            'host_last_notification' => 'UNIX_TIMESTAMP(hs.last_notification)',
-            'host_next_notification' => 'UNIX_TIMESTAMP(hs.next_notification)',
-            'host_no_more_notifications' => 'hs.no_more_notifications',
-            'host_problem_has_been_acknowledged' => 'hs.problem_has_been_acknowledged',
-            'host_acknowledgement_type' => 'hs.acknowledgement_type',
-            'host_current_notification_number' => 'hs.current_notification_number',
-            'host_passive_checks_enabled' => 'hs.passive_checks_enabled',
-
-            'host_passive_checks_enabled_changed' => 'CASE WHEN hs.passive_checks_enabled=h.passive_checks_enabled
-                THEN 0 ELSE 1 END',
-
-            'host_active_checks_enabled' => 'hs.active_checks_enabled',
-
-            'host_active_checks_enabled_changed' => 'CASE WHEN hs.active_checks_enabled=h.active_checks_enabled
-                THEN 0 ELSE 1 END',
-
-            'host_event_handler_enabled' => 'hs.event_handler_enabled',
-
-            'host_event_handler_enabled_changed' => 'CASE WHEN hs.event_handler_enabled=h.event_handler_enabled
-                THEN 0 ELSE 1 END',
-
-            'host_flap_detection_enabled' => 'hs.flap_detection_enabled',
-
-            'host_flap_detection_enabled_changed' => 'CASE WHEN hs.flap_detection_enabled=h.flap_detection_enabled
-                THEN 0 ELSE 1 END',
-
-            'host_is_flapping' => 'hs.is_flapping',
-            'host_percent_state_change' => 'hs.percent_state_change',
-            'host_scheduled_downtime_depth' => 'hs.scheduled_downtime_depth',
-            'host_failure_prediction_enabled' => 'hs.failure_prediction_enabled',
-            'host_process_performance_data' => 'hs.process_performance_data',
-
-            'host_obsessing' => 'hs.obsess_over_host',
-
-            'host_obsessing_changed' => 'CASE WHEN hs.obsess_over_host=h.obsess_over_host
-                THEN 0 ELSE 1 END',
-
-            'host_modified_host_attributes' => 'hs.modified_host_attributes',
-            'host_event_handler' => 'hs.event_handler',
-            'host_normal_check_interval' => 'hs.normal_check_interval',
-            'host_retry_check_interval' => 'hs.retry_check_interval',
-            'host_check_timeperiod_object_id' => 'hs.check_timeperiod_object_id',
-            'host_status_update_time' => 'hs.status_update_time',
-            'host_is_reachable' => 'hs.is_reachable',
-            'host_severity' => 'CASE WHEN hs.current_state = 0
-            THEN
-                CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL
-                     THEN 16
-                     ELSE 0
-                END
-                +
-                CASE WHEN hs.problem_has_been_acknowledged = 1
-                     THEN 2
-                     ELSE
-                        CASE WHEN hs.scheduled_downtime_depth > 0
-                            THEN 1
-                            ELSE 4
-                        END
-                END
-            ELSE
-                CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 16
-                     WHEN hs.current_state = 1 THEN 32
-                     WHEN hs.current_state = 2 THEN 64
-                     ELSE 256
-                END
-                +
-                CASE WHEN hs.problem_has_been_acknowledged = 1
-                     THEN 2
-                     ELSE
-                        CASE WHEN hs.scheduled_downtime_depth > 0
-                            THEN 1
-                            ELSE 4
-                        END
-                END
-            END
-            +
-            CASE WHEN hs.state_type = 1
-                THEN 8
-                ELSE 0
-            END'
-        ),
-        'hostgroups' => array(
-            'hostgroup'         => 'hgo.name1 COLLATE latin1_general_ci',
-            'hostgroup_name'    => 'hgo.name1',
-            'hostgroup_alias'   => 'hg.alias COLLATE latin1_general_ci'
-        ),
-        'servicegroups' => array(
-            'servicegroup'          => 'sgo.name1 COLLATE latin1_general_ci',
-            'servicegroup_name'     => 'sgo.name1',
-            'servicegroup_alias'    => 'sg.alias COLLATE latin1_general_ci'
-        ),
-        'services' => array(
-            'service_host'           => 'so.name1 COLLATE latin1_general_ci',
-            'service_host_name'      => 'so.name1',
-            'service'                => 'so.name2 COLLATE latin1_general_ci',
-            'service_description'    => 'so.name2',
-            'service_display_name'   => 's.display_name COLLATE latin1_general_ci',
-            'service_icon_image'     => 's.icon_image',
-            'service_icon_image_alt' => 's.icon_image_alt',
-            'service_action_url'     => 's.action_url',
-            'service_notes'          => 's.notes',
-            'service_notes_url'      => 's.notes_url',
-            'object_type'            => '(\'service\')'
-        ),
-        'servicestatus' => array(
-            'handled'        => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0 THEN 1 ELSE 0 END',
-            'unhandled'      => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) = 0 THEN 1 ELSE 0 END',
-            'problems'       => 'CASE WHEN ss.current_state = 0 THEN 0 ELSE 1 END',
-            'service_state'          => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE ss.current_state END',
-            'service_hard_state'     => 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE CASE WHEN ss.state_type = 1 THEN ss.current_state ELSE ss.last_hard_state END END',
-            'service_state_type'     => 'ss.state_type',
-            'service_output'         => 'ss.output',
-            'service_long_output'    => 'ss.long_output',
-            'service_perfdata'       => 'ss.perfdata',
-            'service_check_source'   => 'ss.check_source',
-            'service_acknowledged'   => 'ss.problem_has_been_acknowledged',
-            'service_in_downtime'    => 'CASE WHEN (ss.scheduled_downtime_depth = 0 OR ss.scheduled_downtime_depth IS NULL) THEN 0 ELSE 1 END',
-            'service_handled'        => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0 THEN 1 ELSE 0 END',
-            'service_unhandled'      => 'CASE WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) = 0 THEN 1 ELSE 0 END',
-            'service_last_state_change'      => 'UNIX_TIMESTAMP(ss.last_state_change)',
-            'service_check_command'          => 'ss.check_command',
-            'service_last_time_ok'           => 'ss.last_time_ok',
-            'service_last_time_warning'      => 'ss.last_time_warning',
-            'service_last_time_critical'     => 'ss.last_time_critical',
-            'service_last_time_unknown'      => 'ss.last_time_unknown',
-            'service_current_check_attempt' => 'ss.current_check_attempt',
-            'service_max_check_attempts' => 'ss.max_check_attempts',
-            'service_attempt' => 'ss.current_check_attempt || \'/\' || ss.max_check_attempts',
-            'service_last_check' => 'UNIX_TIMESTAMP(ss.last_check)',
-            'service_next_check' => 'UNIX_TIMESTAMP(ss.next_check)',
-            'service_check_type' => 'ss.check_type',
-            'service_last_hard_state_change' => 'UNIX_TIMESTAMP(ss.last_hard_state_change)',
-            'service_last_hard_state' => 'ss.last_hard_state',
-            'service_last_notification' => 'UNIX_TIMESTAMP(ss.last_notification)',
-            'service_next_notification' => 'UNIX_TIMESTAMP(ss.next_notification)',
-            'service_no_more_notifications' => 'ss.no_more_notifications',
-
-            'service_notifications_enabled' => 'ss.notifications_enabled',
-
-            'service_notifications_enabled_changed' => 'CASE WHEN ss.notifications_enabled=s.notifications_enabled
-                THEN 0 ELSE 1 END',
-
-            'service_problem_has_been_acknowledged' => 'ss.problem_has_been_acknowledged',
-            'service_acknowledgement_type' => 'ss.acknowledgement_type',
-            'service_current_notification_number' => 'ss.current_notification_number',
-
-            'service_passive_checks_enabled' => 'ss.passive_checks_enabled',
-
-            'service_passive_checks_enabled_changed' => 'CASE WHEN ss.passive_checks_enabled=s.passive_checks_enabled
-                THEN 0 ELSE 1 END',
-
-            'service_active_checks_enabled' => 'ss.active_checks_enabled',
-
-            'service_active_checks_enabled_changed' => 'CASE WHEN ss.active_checks_enabled=s.active_checks_enabled
-                THEN 0 ELSE 1 END',
-
-            'service_event_handler_enabled' => 'ss.event_handler_enabled',
-
-            'service_event_handler_enabled_changed' => 'CASE WHEN ss.event_handler_enabled=s.event_handler_enabled
-                THEN 0 ELSE 1 END',
-
-
-            'service_flap_detection_enabled' => 'ss.flap_detection_enabled',
-
-            'service_flap_detection_enabled_changed' => 'CASE WHEN ss.flap_detection_enabled=s.flap_detection_enabled
-                THEN 0 ELSE 1 END',
-
-            'service_is_flapping' => 'ss.is_flapping',
-            'service_percent_state_change' => 'ss.percent_state_change',
-            'service_check_latency' => 'ss.latency',
-            'service_check_execution_time' => 'ss.execution_time',
-            'service_scheduled_downtime_depth' => 'ss.scheduled_downtime_depth',
-            'service_failure_prediction_enabled' => 'ss.failure_prediction_enabled',
-            'service_process_performance_data' => 'ss.process_performance_data',
-
-            'service_obsessing' => 'ss.obsess_over_service',
-
-            'service_obsessing_changed' => 'CASE WHEN ss.obsess_over_service=s.obsess_over_service
-                THEN 0 ELSE 1 END',
-
-            'service_modified_service_attributes' => 'ss.modified_service_attributes',
-            'service_event_handler' => 'ss.event_handler',
-            'service_normal_check_interval' => 'ss.normal_check_interval',
-            'service_retry_check_interval' => 'ss.retry_check_interval',
-            'service_check_timeperiod_object_id' => 'ss.check_timeperiod_object_id',
-            'service_status_update_time' => 'ss.status_update_time',
-            'service_problem'  => 'CASE WHEN ss.current_state = 0 THEN 0 ELSE 1 END',
-            'service_is_reachable' => 'ss.is_reachable',
-            'service_severity'  => 'CASE WHEN ss.current_state = 0
-                THEN
-                    CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL
-                         THEN 16
-                         ELSE 0
-                    END
-                    +
-                    CASE WHEN ss.problem_has_been_acknowledged = 1
-                         THEN 2
-                         ELSE
-                            CASE WHEN ss.scheduled_downtime_depth > 0
-                                THEN 1
-                                ELSE 4
-                            END
-                    END
-                ELSE
-                    CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 16
-                         WHEN ss.current_state = 1 THEN 32
-                         WHEN ss.current_state = 2 THEN 128
-                         WHEN ss.current_state = 3 THEN 64
-                         ELSE 256
-                    END
-                    +
-                    CASE WHEN hs.current_state > 0
-                         THEN 1024
-                         ELSE
-                             CASE WHEN ss.problem_has_been_acknowledged = 1
-                                  THEN 512
-                                  ELSE
-                                     CASE WHEN ss.scheduled_downtime_depth > 0
-                                         THEN 256
-                                         ELSE 2048
-                                     END
-                             END
-                         END
-                END
-                +
-                CASE WHEN ss.state_type = 1
-                    THEN 8
-                    ELSE 0
-                END'
-        ),
-    );
-
-    protected function joinBaseTables()
-    {
-        if (version_compare($this->getIdoVersion(), '1.10.0', '<')) {
-            $this->columnMap['hoststatus']['host_check_source'] = '(NULL)';
-            $this->columnMap['servicestatus']['service_check_source'] = '(NULL)';
-        }
-        if (version_compare($this->getIdoVersion(), '1.13.0', '<')) {
-            $this->columnMap['hoststatus']['host_is_reachable'] = '(NULL)';
-            $this->columnMap['servicestatus']['service_is_reachable'] = '(NULL)';
-        }
-        $this->select->from(array('ho' => $this->prefix . 'objects'), array())
-        ->join(
-            array('hs' => $this->prefix . 'hoststatus'),
-            'ho.object_id = hs.host_object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
-            array()
-        )->join(
-            array('h' => $this->prefix . 'hosts'),
-            'hs.host_object_id = h.host_object_id',
-            array()
-        );
-        $this->joinedVirtualTables = array(
-            'hosts'      => true,
-            'hoststatus' => true,
-        );
-    }
-
-    // Tuning experiments
-    public function whereToSql($col, $sign, $expression)
-    {
-        switch ($col) {
-
-            case 'CASE WHEN ss.current_state = 0 THEN 0 ELSE 1 END':
-                if ($sign !== '=') break;
-
-                if ($expression) {
-                    return 'ss.current_state > 0';
-                } else {
-                    return 'ss.current_state = 0';
-               }
-               break;
-
-            case 'CASE WHEN hs.current_state = 0 THEN 0 ELSE 1 END':
-                if ($sign !== '=') break;
-
-                if ($expression) {
-                    return 'hs.current_state > 0';
-                } else {
-                    return 'hs.current_state = 0';
-               }
-               break;
-
-           case 'CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL THEN 99 ELSE CASE WHEN ss.state_type = 1 THEN ss.current_state ELSE ss.last_hard_state END END':
-               if ($sign !== '=') break;
-               if ($expression == 99) {
-                   return 'ss.has_been_checked = 0 OR ss.has_been_checked IS NULL';
-               }
-               if (in_array($expression, array(0, 1, 2, 3))) {
-                  return sprintf('((ss.state_type = 1 AND ss.current_state = %d) OR (ss.state_type = 0 AND ss.last_hard_state = %d))', $expression, $expression);
-               }
-               break;
-
-        }
-
-        return parent::whereToSql($col, $sign, $expression);
-    }
-
-    protected function joinStatus()
-    {
-        $this->requireVirtualTable('services');
-    }
-
-    protected function joinServiceStatus()
-    {
-        $this->requireVirtualTable('services');
-    }
-
-    protected function joinServices()
-    {
-        $this->select->join(
-            array('s' => $this->prefix . 'services'),
-            's.host_object_id = h.host_object_id',
-            array()
-        )->join(
-            array('so' => $this->prefix . 'objects'),
-            'so.' . $this->object_id . ' = s.service_object_id AND so.is_active = 1',
-            array()
-        )->join(
-            array('ss' => $this->prefix . 'servicestatus'),
-            'so.' . $this->object_id . ' = ss.service_object_id',
-            array()
-        );
-    }
-
-    protected function joinHostgroups()
-    {
-        if ($this->hasJoinedVirtualTable('services')) {
-            return $this->joinServiceHostgroups();
-        } else {
-            return $this->joinHostHostgroups();
-        }
-    }
-
-    protected function joinHostHostgroups()
-    {
-        $this->select->joinLeft(
-            array('hgm' => $this->prefix . 'hostgroup_members'),
-            'hgm.host_object_id = h.host_object_id',
-            array()
-        )->joinLeft(
-            array('hg' => $this->prefix . 'hostgroups'),
-            'hgm.hostgroup_id = hg.' . $this->hostgroup_id,
-            array()
-        )->joinLeft(
-            array('hgo' => $this->prefix . 'objects'),
-            'hgo.' . $this->object_id . ' = hg.hostgroup_object_id AND hgo.is_active = 1',
-            array()
-            );
-
-        // @TODO Subject to change, see #7344
-        if ($this->mode === 'host' || $this->mode === 'service') {
-            $this->useSubqueryCount = true;
-            $this->distinct();
-        }
-
-        return $this;
-    }
-
-    protected function joinServiceHostgroups()
-    {
-        $this->select->joinLeft(
-            array('hgm' => $this->prefix . 'hostgroup_members'),
-            'hgm.host_object_id = s.host_object_id',
-            array()
-        )->joinLeft(
-            array('hg' => $this->prefix . 'hostgroups'),
-            'hgm.hostgroup_id = hg.' . $this->hostgroup_id,
-            array()
-        )->joinLeft(
-            array('hgo' => $this->prefix . 'objects'),
-            'hgo.' . $this->object_id . ' = hg.hostgroup_object_id'
-            . ' AND hgo.is_active = 1',
-            array()
-        );
-        // @TODO Subject to change, see #7344
-        if ($this->mode === 'service') {
-            $this->distinct();
-            $this->useSubqueryCount = true;
-        }
-        return $this;
-    }
-
-    protected function joinServicegroups()
-    {
-        $this->requireVirtualTable('services');
-        $this->select->joinLeft(
-            array('sgm' => $this->prefix . 'servicegroup_members'),
-            'sgm.service_object_id = s.service_object_id',
-            array()
-        )->joinLeft(
-            array('sg' => $this->prefix . 'servicegroups'),
-            'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
-            array()
-        )->joinLeft(
-            array('sgo' => $this->prefix . 'objects'),
-            'sgo.' . $this->object_id. ' = sg.servicegroup_object_id'
-          . ' AND sgo.is_active = 1',
-            array()
-        );
-
-        // @TODO Subject to change, see #7344
-        if ($this->mode === 'host' || $this->mode === 'service') {
-            $this->distinct();
-        }
-        if ($this->mode === 'host') {
-            $this->useSubqueryCount = true;
-        }
-
-        return $this;
-    }
-}
diff --git a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
index c8072572c..698568cec 100644
--- a/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/Servicestatus.php
@@ -5,16 +5,6 @@ namespace Icinga\Module\Monitoring\DataView;
 
 class ServiceStatus extends DataView
 {
-    /**
-     * Sets the mode for `distinct as workaround
-     *
-     * @TODO Subject to change, see #7344
-     */
-    public function init()
-    {
-        $this->query->setMode('service');
-    }
-
     /**
      * Retrieve columns provided by this view
      *
@@ -107,11 +97,6 @@ class ServiceStatus extends DataView
         );
     }
 
-    public static function getQueryName()
-    {
-        return 'status';
-    }
-
     public function getSortRules()
     {
         return array(

From 71cb484299a866c5d6e5ec17991d9b89b6add809 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 12 Aug 2015 16:47:31 +0200
Subject: [PATCH 2916/2920] Show the full layout for anonymous clients

fixes #9892
---
 application/layouts/scripts/body.phtml | 93 +++++++++++++-------------
 1 file changed, 47 insertions(+), 46 deletions(-)

diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index 92caaf2f3..18fc18872 100644
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -4,59 +4,60 @@ use Icinga\Web\Url;
 use Icinga\Web\Notification;
 use Icinga\Authentication\Auth;
 
+$moduleName = $this->layout()->moduleName;
+if ($moduleName) {
+    $moduleClass = ' icinga-module module-' . $moduleName;
+} else {
+    $moduleClass = '';
+}
 
-if (Auth::getInstance()->isAuthenticated()):
-    $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 . '"';
+}
 
-    $refresh = '';
-    if ($this->layout()->autorefreshInterval) {
-        $refresh = ' data-icinga-refresh="' . $this->layout()->autorefreshInterval . '"';
-    }
 ?>
- <div id="header">
-   <div id="logo" data-base-target="_main">
-       <?= $this->qlink(
-           '',
-           '/dashboard',
-           null,
-           array(
-               'icon'           => '../logo_icinga-inv.png',
-               'aria-hidden'    => 'true',
-               'tabindex'       => -1
-           )
-       ); ?>
-   </div>
- </div>
-
-<?php if (!$this->layout()->isIframe): ?>
- <div id="sidebar">
-  <?php echo $this->render('parts/navigation.phtml') ?>
- </div>
+<div id="header">
+  <div id="logo">
+  <?php if (Auth::getInstance()->isAuthenticated()): ?>
+    <?= $this->qlink(
+      '',
+      '/dashboard',
+      null,
+      array(
+        'icon'              => '../logo_icinga-inv.png',
+        'data-base-target'  => '_main',
+        'aria-hidden'       => 'true',
+        'tabindex'          => -1
+      )
+    ); ?>
+  <?php else: ?>
+    <?= $this->icon('../logo_icinga-inv.png'); ?>
+  <?php endif ?>
+  </div>
+</div>
+<?php if (! $this->layout()->isIframe): ?>
+<div id="sidebar">
+  <?= $this->render('parts/navigation.phtml'); ?>
+</div>
 <?php endif ?>
- <div id="main" role="main">
-  <div id="col1" class="container<?= $moduleClass ?>"<?php if ($moduleName): ?> data-icinga-module="<?= $moduleName ?>" <?php endif ?> data-icinga-url="<?= Url::fromRequest()->without('renderLayout') ?>"<?= $refresh ?> style="display: block">
-   <?= $this->render('inline.phtml') ?>
+<div id="main" role="main">
+  <div id="col1" class="container<?= $moduleClass ?>"<?php if ($moduleName): ?> data-icinga-module="<?= $moduleName ?>" <?php endif ?> data-icinga-url="<?= Url::fromRequest()->without('renderLayout'); ?>"<?= $refresh; ?> style="display: block">
+    <?= $this->render('inline.phtml') ?>
   </div>
   <div id="col2" class="container">
   </div>
   <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->popMessages() as $m) {
-        echo '<li class="' . $m->type . '">' . $this->escape($m->message) . '</li>';
+</div>
+<div id="footer">
+  <ul id="notifications"><?php
+
+    $notifications = Notification::getInstance();
+    if ($notifications->hasMessages()) {
+        foreach ($notifications->popMessages() as $m) {
+            echo '<li class="' . $m->type . '">' . $this->escape($m->message) . '</li>';
+        }
     }
-}
-   ?></ul>
- </div>
-<?php else: ?>
-<?= $this->render('inline.phtml') ?>
-<?php endif ?>
+  ?></ul>
+</div>
\ No newline at end of file

From fa1e3a763d027348b8085fb8914abce9a9a8375b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 13 Aug 2015 08:12:30 +0200
Subject: [PATCH 2917/2920] Do not show the full layout on the login page

...

refs #9892
---
 application/controllers/AuthenticationController.php | 11 ++++++-----
 application/layouts/scripts/layout.phtml             |  4 ++--
 library/Icinga/Web/Controller/ActionController.php   |  9 ++++++++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index 9431b7fbc..f6c79e3aa 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -3,9 +3,7 @@
 
 # namespace Icinga\Application\Controllers;
 
-use Icinga\Application\Config;
 use Icinga\Application\Icinga;
-use Icinga\Application\Logger;
 use Icinga\Forms\Authentication\LoginForm;
 use Icinga\Web\Controller;
 use Icinga\Web\Url;
@@ -16,12 +14,15 @@ use Icinga\Web\Url;
 class AuthenticationController extends Controller
 {
     /**
-     * This controller does not require authentication
-     *
-     * @var bool
+     * {@inheritdoc}
      */
     protected $requiresAuthentication = false;
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $innerLayout = 'inline';
+
     /**
      * Log into the application
      */
diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml
index 1d766b505..efe1aa9cc 100644
--- a/application/layouts/scripts/layout.phtml
+++ b/application/layouts/scripts/layout.phtml
@@ -1,6 +1,5 @@
 <?php
 
-use Icinga\Web\JavaScript;
 use Icinga\Util\Translator;
 
 if (array_key_exists('_dev', $_GET)) {
@@ -16,6 +15,7 @@ $lang = Translator::splitLocaleCode()->language;
 $isIframe = $this->layout()->isIframe;
 $showFullscreen = $this->layout()->showFullscreen;
 $iframeClass = $isIframe ? ' iframe' : '';
+$innerLayoutScript = $this->layout()->innerLayout . '.phtml';
 
 ?><!DOCTYPE html>
 <!--[if IE 8]>
@@ -52,7 +52,7 @@ $iframeClass = $isIframe ? ' iframe' : '';
 <body id="body">
 <pre id="responsive-debug"></pre>
 <div id="layout" class="default-layout<?php if ($showFullscreen): ?> fullscreen-layout<?php endif ?>">
-<?= $this->render('body.phtml') ?>
+<?= $this->render($innerLayoutScript); ?>
 </div>
 <iframe id="fileupload-frame-target" name="fileupload-frame-target"></iframe>
 <!--[if IE 8]>
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 5d1055321..70fab8b12 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -3,7 +3,6 @@
 
 namespace Icinga\Web\Controller;
 
-use Exception;
 use Icinga\Application\Benchmark;
 use Icinga\Application\Config;
 use Icinga\Authentication\Auth;
@@ -49,6 +48,13 @@ class ActionController extends Zend_Controller_Action
 
     private $xhrLayout = 'inline';
 
+    /**
+     * The inner layout (inside the body) to use
+     *
+     * @var string
+     */
+    protected $innerLayout = 'body';
+
     /**
      * Authentication manager
      *
@@ -418,6 +424,7 @@ class ActionController extends Zend_Controller_Action
 
         $req = $this->getRequest();
         $layout = $this->_helper->layout();
+        $layout->innerLayout = $this->innerLayout;
 
         if ($user = $req->getUser()) {
             // Cast preference app.show_benchmark to bool because preferences loaded from a preferences storage are

From 2332b94f0b8b5603180c8f33ce3a7c61a612cc5e Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 13 Aug 2015 11:19:08 +0200
Subject: [PATCH 2918/2920] Request: Add getResponse() to retrieve the Response

refs #7383
---
 library/Icinga/Web/Request.php | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/library/Icinga/Web/Request.php b/library/Icinga/Web/Request.php
index 6fb078c96..b4d7e92d4 100644
--- a/library/Icinga/Web/Request.php
+++ b/library/Icinga/Web/Request.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Web;
 
+use Icinga\Application\Icinga;
 use Zend_Controller_Request_Http;
 use Icinga\User;
 
@@ -32,6 +33,13 @@ class Request extends Zend_Controller_Request_Http
      */
     protected $url;
 
+    /**
+     * Response
+     *
+     * @var Response
+     */
+    protected $response;
+
     /**
      * Get whether the request seems to be an API request
      *
@@ -78,6 +86,20 @@ class Request extends Zend_Controller_Request_Http
         return $this;
     }
 
+    /**
+     * Get the response
+     *
+     * @return Response
+     */
+    public function getResponse()
+    {
+        if ($this->response === null) {
+            $this->response = Icinga::app()->getResponse();
+        }
+
+        return $this->response;
+    }
+
     /**
      * Makes an ID unique to this request, to prevent id collisions in different containers
      *
@@ -96,4 +118,10 @@ class Request extends Zend_Controller_Request_Http
         }
         return $id . '-' . $this->uniqueId;
     }
+
+    public function hasCookieSupport()
+    {
+        $cookie = new Cookie($this);
+        return $cookie->isSupported();
+    }
 }

From 813154f6ef336ffa858138ad94f98c32ee6106d3 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 13 Aug 2015 11:19:48 +0200
Subject: [PATCH 2919/2920] Cookie: Make it no static and use the request

refs #7383
---
 library/Icinga/Web/Cookie.php | 61 ++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/library/Icinga/Web/Cookie.php b/library/Icinga/Web/Cookie.php
index 9b10c7f8c..7010bb999 100644
--- a/library/Icinga/Web/Cookie.php
+++ b/library/Icinga/Web/Cookie.php
@@ -5,8 +5,6 @@ namespace Icinga\Web;
 
 /**
  * Helper Class Cookie
- *
- * @package Icinga\Web
  */
 class Cookie
 {
@@ -15,64 +13,67 @@ class Cookie
      */
     const CHECK_COOKIE = '_chc';
 
+    /**
+     * The request
+     *
+     * @var Request
+     */
+    protected $request;
+
+    /**
+     * Create a new cookie
+     *
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
     /**
      * Check whether cookies are supported or not
      *
      * @return bool
      */
-    public static function isSupported()
+    public function isSupported()
     {
         if (! empty($_COOKIE)) {
-            self::cleanupCheck();
+            $this->cleanupCheck();
             return true;
         }
 
-        if (isset($_REQUEST['_checkCookie']) && empty($_COOKIE)) {
+        $url = $this->request->getUrl();
+
+        if ($url->hasParam('_checkCookie') && empty($_COOKIE)) {
             return false;
         }
 
-        if (! isset($_REQUEST['_checkCookie'])) {
-            self::provideCheck();
+        if (! $url->hasParam('_checkCookie')) {
+            $this->provideCheck();
         }
 
         return false;
     }
 
-    /**
-     * Redirect to a given uri
-     *
-     * @param string $uri
-     */
-    public static function redirect($uri)
-    {
-        header('location: ' . $uri);
-        exit(0);
-    }
-
     /**
      * Prepare check to detect cookie support
      */
-    public static function provideCheck()
+    public function provideCheck()
     {
         setcookie(self::CHECK_COOKIE, '1');
 
-        if (parse_url($_SERVER['REQUEST_URI'], PHP_URL_QUERY)) {
-            $requestUri = $_SERVER['REQUEST_URI'] . '&_checkCookie=1';
-        } else {
-            $requestUri = $_SERVER['REQUEST_URI'] . '?_checkCookie=1';
-        }
-
-        self::redirect($requestUri);
+        $requestUri = $this->request->getUrl()->addParams(array('_checkCookie' => 1));
+        $this->request->getResponse()->redirectAndExit($requestUri);
     }
 
     /**
      * Cleanup the cookie support check
      */
-    public static function cleanupCheck()
+    public function cleanupCheck()
     {
-        if (isset($_REQUEST['_checkCookie']) && isset($_COOKIE[self::CHECK_COOKIE])) {
-            $requestUri = preg_replace('/([&|\?]_checkCookie=1)/', '', $_SERVER['REQUEST_URI']);
-            self::redirect($requestUri);
+        if ($this->request->getUrl()->hasParam('_checkCookie') && isset($_COOKIE[self::CHECK_COOKIE])) {
+            $requestUri =$this->request->getUrl()->without('_checkCookie');
+            $this->request->getResponse()->redirectAndExit($requestUri);
         }
     }
 }

From d468c59e32af20c00ef55b2e7fc52f06b9abd2a8 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Thu, 13 Aug 2015 11:21:05 +0200
Subject: [PATCH 2920/2920] AuthenticationController: Add cookie detection to
 login action

refs #7383
---
 application/controllers/AuthenticationController.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php
index 9431b7fbc..f19b53fc5 100644
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@@ -8,6 +8,7 @@ use Icinga\Application\Icinga;
 use Icinga\Application\Logger;
 use Icinga\Forms\Authentication\LoginForm;
 use Icinga\Web\Controller;
+use Icinga\Web\Cookie;
 use Icinga\Web\Url;
 
 /**
@@ -36,6 +37,11 @@ class AuthenticationController extends Controller
             $this->redirectNow($form->getRedirectUrl());
         }
         if (! $requiresSetup) {
+            if (! $this->getRequest()->hasCookieSupport()) {
+                echo $this->translate("Cookies must be enabled to run this application.\n");
+                $this->getResponse()->setHttpResponseCode(403)->sendHeaders();
+                exit();
+            }
             $form->handleRequest();
         }
         $this->view->form = $form;